diff -Nru r-base-3.2.3/ChangeLog r-base-3.3.1/ChangeLog
--- r-base-3.2.3/ChangeLog	2010-03-17 14:43:02.000000000 +0000
+++ r-base-3.3.1/ChangeLog	2016-01-29 23:15:10.000000000 +0000
@@ -0,0 +1,8 @@
+	* News are in
+	  - the source    doc/NEWS.Rd
+	  - installed R's doc/NEWS and doc/NEWS.pdf
+
+	* Details about single subversion (svn) commits are available, e.g., by
+
+	svn log https://svn.r-project.org/R/trunk
+
diff -Nru r-base-3.2.3/config.site r-base-3.3.1/config.site
--- r-base-3.2.3/config.site	2015-09-08 22:15:18.000000000 +0000
+++ r-base-3.3.1/config.site	2016-03-16 23:04:44.000000000 +0000
@@ -276,8 +276,11 @@
 ## if both shared and static libcurl libraries were built.
 ## CURL_LIBS=`curl-config --static-libs`
 
-## Path to the version of pkg-config to be used for locating cairographics.
+## Path to the version of pkg-config to be used for locating cairographics,
+## and possibly jpeg, libpng and libtiff.
 ## PKGCONF=
+## search path for pkg-config
+## PKG_CONFIG_PATH=
 
 ## OpenMP settings.
 ## The configure code is conservative about enabling OpenMP 
diff -Nru r-base-3.2.3/configure r-base-3.3.1/configure
--- r-base-3.2.3/configure	2015-12-02 23:16:46.000000000 +0000
+++ r-base-3.3.1/configure	2016-06-13 22:16:32.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for R 3.2.3.
+# Generated by GNU Autoconf 2.69 for R 3.3.1.
 #
 # Report bugs to <https://bugs.r-project.org>.
 #
@@ -198,7 +198,15 @@
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -556,155 +564,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -729,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='R'
 PACKAGE_TARNAME='R'
-PACKAGE_VERSION='3.2.3'
-PACKAGE_STRING='R 3.2.3'
+PACKAGE_VERSION='3.3.1'
+PACKAGE_STRING='R 3.3.1'
 PACKAGE_BUGREPORT='https://bugs.r-project.org'
 PACKAGE_URL='https://www.r-project.org'
 
@@ -844,25 +705,18 @@
 BUILD_TZONE_FALSE
 BUILD_TZONE_TRUE
 R_PROFILING
+BITMAP_LIBS
+BITMAP_CPPFLAGS
 CURL_LIBS
 CURL_CPPFLAGS
 CURL_CONFIG
 BUILD_TRE_FALSE
 BUILD_TRE_TRUE
-BUILD_PCRE_FALSE
-BUILD_PCRE_TRUE
-BUILD_XZ_FALSE
-BUILD_XZ_TRUE
-BUILD_BZLIB_FALSE
-BUILD_BZLIB_TRUE
 USE_MMAP_ZLIB_FALSE
 USE_MMAP_ZLIB_TRUE
-BUILD_ZLIB_FALSE
-BUILD_ZLIB_TRUE
 TIRPC_CPPFLAGS
 BUILD_XDR_FALSE
 BUILD_XDR_TRUE
-BITMAP_LIBS
 use_tcltk
 TK_CONFIG
 TCL_CONFIG
@@ -923,8 +777,6 @@
 USE_EXPORTFILES_TRUE
 SHLIB_EXT
 SHLIB_LIBADD
-BUILD_CYGWIN_FALSE
-BUILD_CYGWIN_TRUE
 DYLIB_UNDEFINED_ALLOWED_FALSE
 DYLIB_UNDEFINED_ALLOWED_TRUE
 INTERNET_LIBS
@@ -959,14 +811,18 @@
 BUILD_R
 BUILD_CC
 LIBTOOL_DEPS
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
+AWK
 RANLIB
 STRIP
+ac_ct_AR
+DLLTOOL
 OBJDUMP
 NM
 ac_ct_DUMPBIN
@@ -999,6 +855,8 @@
 LDFLAGS
 CFLAGS
 CC
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKGCONF
 REALPATH
 NOTANGLE
@@ -1027,7 +885,6 @@
 YFLAGS
 YACC
 LN_S
-AWK
 AUTOHEADER
 AUTOMAKE
 AUTOCONF
@@ -1173,11 +1030,7 @@
 with_libpng
 with_jpeglib
 with_libtiff
-with_system_zlib
-with_system_bzlib
-with_system_pcre
 with_system_tre
-with_system_xz
 with_valgrind_instrumentation
 with_system_valgrind_headers
 with_internal_tzcode
@@ -1188,13 +1041,16 @@
 enable_shared
 with_pic
 enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
 enable_long_double
 enable_openmp
 with_x
 enable_largefile
 enable_nls
 enable_threads
-with_gnu_ld
 enable_rpath
 with_libpth_prefix
 with_included_gettext
@@ -1240,6 +1096,9 @@
 R_SHELL
 YACC
 YFLAGS
+PKGCONF
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 CC
 CFLAGS
 LDFLAGS
@@ -1254,6 +1113,7 @@
 CXXCPP
 OBJC
 OBJCFLAGS
+LT_SYS_LIBRARY_PATH
 CXX1X
 CXX1XSTD
 CXX1XFLAGS
@@ -1803,7 +1663,7 @@
   # 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 R 3.2.3 to adapt to many kinds of systems.
+\`configure' configures R 3.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1878,7 +1738,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of R 3.2.3:";;
+     short | recursive ) echo "Configuration of R 3.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1909,11 +1769,15 @@
                           byte-compile base and recommended packages [yes]
   --enable-static[=PKGS]  (libtool) build static libraries [default=no]
   --enable-shared[=PKGS]  (libtool) build shared libraries [default=yes]
-
+  --enable-fast-install[=PKGS]
+                          (libtool) optimize for fast installation
+                          [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-long-double    use long double type [yes]
   --disable-openmp        do not use OpenMP
   --disable-largefile     omit support for large files
   --disable-nls           do not use Native Language Support
+
   --disable-rpath         do not hardcode runtime library paths
 
 Optional Packages:
@@ -1935,11 +1799,7 @@
   --with-libpng           use libpng library (if available) [yes]
   --with-jpeglib          use jpeglib library (if available) [yes]
   --with-libtiff          use libtiff library (if available) [yes]
-  --with-system-zlib      use system zlib library (if available) [yes]
-  --with-system-bzlib     use system bzlib library (if available) [yes]
-  --with-system-pcre      use system PCRE library (if available) [yes]
   --with-system-tre       use system tre library (if available) [no]
-  --with-system-xz        use system xz (lzma) library (if available) [yes]
   --with-valgrind-instrumentation
                           Level of additional instrumentation for Valgrind
                           (0/1/2) [0]
@@ -1949,8 +1809,14 @@
   --with-recommended-packages
                           use/install recommended R packages [yes]
   --with-ICU              use ICU library (if available) [yes]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
+  --with-pic[=PKGS]       (libtool) try to use only PIC/non-PIC objects
+                          [default=use both]
+  --with-aix-soname=aix|svr4|both
+                          (libtool( shared library versioning (aka "SONAME")
+                          variant to provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
   --with-x                use the X Window System
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libpth-prefix[=DIR]  search for libpth in DIR/include and DIR/lib
@@ -2018,6 +1884,11 @@
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
+  PKGCONF     path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's default search path
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -2033,6 +1904,8 @@
   CXXCPP      C++ preprocessor
   OBJC        Objective C compiler command
   OBJCFLAGS   Objective C compiler flags
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   CXX1X       C++11 compiler command
   CXX1XSTD    special flag for compiling and for linking C++11 code, e.g.
               -std=c++11
@@ -2116,7 +1989,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-R configure 3.2.3
+R configure 3.3.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3268,7 +3141,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by R $as_me 3.2.3, which was
+It was created by R $as_me 3.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3777,13 +3650,13 @@
 ## exclude some unsupported OSes
 case "${host_os}" in
    ## Darwin 1.3.1 was OS X 10.0, 1.4.1 was 10.1, 5 is 10.2 etc
-   ## with 13 being 10.9.  We no longer support < 10.4 (Tiger)
-   ## http://en.wikipedia.org/wiki/Darwin_OS
+   ## with 13 being 10.9.  We no longer support < 10.6 (Snow Leopard)
+   ## https://en.wikipedia.org/wiki/Darwin_OS
    darwin1.*)
-     as_fn_error $? "The earliest supported OS X is 10.4.
+     as_fn_error $? "The earliest supported OS X is 10.6.
      ;;
-  darwin567*" "$LINENO" 5
-     as_fn_error $? "The earliest supported OS X is 10.4.
+  darwin56789*" "$LINENO" 5
+     as_fn_error $? "The earliest supported OS X is 10.6.
      ;;
   aix123*|aix4.01*" "$LINENO" 5
     ## These need a form of linking we no longer support
@@ -3927,7 +3800,7 @@
 if test "${enable_R_framework+set}" = set; then :
   enableval=$enable_R_framework; want_R_framework="${enableval}"
 else
-  want_R_framework=yes
+  want_R_framework=no
 fi
 
 ## Can only build frameworks on Darwin.
@@ -4088,7 +3961,7 @@
 if test "x${want_lto}" != xno; then
   LTO=-flto
 fi
-if test "x${want_lto}" == xyes; then
+if test "x${want_lto}" = xyes; then
   LTOALL=-flto
 fi
 
@@ -4270,45 +4143,6 @@
 fi
 
 
-# Check whether --with-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib; if test "${withval}" = no; then
-  use_system_zlib=no
-else
-  use_system_zlib=yes
-fi
-
-else
-  use_system_zlib=yes
-fi
-
-
-# Check whether --with-system-bzlib was given.
-if test "${with_system_bzlib+set}" = set; then :
-  withval=$with_system_bzlib; if test "${withval}" = no; then
-  use_system_bzlib=no
-else
-  use_system_bzlib=yes
-fi
-
-else
-  use_system_bzlib=yes
-fi
-
-
-# Check whether --with-system-pcre was given.
-if test "${with_system_pcre+set}" = set; then :
-  withval=$with_system_pcre; if test "${withval}" = no; then
-  use_system_pcre=no
-else
-  use_system_pcre=yes
-fi
-
-else
-  use_system_pcre=yes
-fi
-
-
 # Check whether --with-system-tre was given.
 if test "${with_system_tre+set}" = set; then :
   withval=$with_system_tre; if test "${withval}" = no; then
@@ -4322,19 +4156,6 @@
 fi
 
 
-# Check whether --with-system-xz was given.
-if test "${with_system_xz+set}" = set; then :
-  withval=$with_system_xz; if test "${withval}" = no; then
-  use_system_xz=no
-else
-  use_system_xz=yes
-fi
-
-else
-  use_system_xz=yes
-fi
-
-
 ## Valgrind instrumentation
 
 # Check whether --with-valgrind-instrumentation was given.
@@ -4587,48 +4408,6 @@
 fi
 
 
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
@@ -5917,6 +5696,9 @@
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8640,14 +8422,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -8670,8 +8452,78 @@
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
 
 
 
@@ -8685,7 +8537,6 @@
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
@@ -8856,14 +8707,21 @@
 
 
 
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -8877,7 +8735,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -8888,7 +8746,7 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -8899,32 +8757,32 @@
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -8967,33 +8825,38 @@
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -9004,19 +8867,22 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9060,7 +8926,7 @@
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  for ac_prog in dumpbin "link -dump"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -9115,9 +8981,18 @@
   fi
 fi
 
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -9134,13 +9009,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:9137: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:9140: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:9143: output\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -9157,7 +9032,7 @@
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -9186,13 +9061,18 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -9211,6 +9091,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -9237,22 +9122,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -9270,7 +9156,7 @@
 
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
@@ -9288,30 +9174,6 @@
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -9343,6 +9205,80 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
 if ${lt_cv_ld_reload_flag+:} false; then :
@@ -9359,9 +9295,14 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -9489,13 +9430,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix[4-9]*)
@@ -9526,12 +9467,13 @@
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -9557,7 +9499,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9569,11 +9511,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -9594,8 +9536,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9617,8 +9559,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -9671,11 +9613,29 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -9691,9 +9651,162 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; then :
@@ -9709,7 +9822,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9729,11 +9842,15 @@
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_AR"; then
+if test -z "$AR"; then
   ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AR+:} false; then :
@@ -9749,7 +9866,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
+    ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9768,6 +9885,10 @@
 $as_echo "no" >&6; }
 fi
 
+
+  test -n "$ac_ct_AR" && break
+done
+
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -9779,16 +9900,72 @@
 esac
     AR=$ac_ct_AR
   fi
-else
-  AR="$ac_cv_prog_AR"
 fi
 
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
 
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
 
 
 
@@ -10001,16 +10178,23 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
 
 
 
@@ -10031,6 +10215,53 @@
 
 
 
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+
+
+
+
 
 
 
@@ -10079,7 +10310,7 @@
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[ABCDEGRST]'
   fi
   ;;
@@ -10112,14 +10343,44 @@
   symcode='[ABCDGIRSTW]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -10137,24 +10398,29 @@
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -10180,8 +10446,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -10196,6 +10462,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -10207,7 +10485,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -10215,7 +10493,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -10233,19 +10511,19 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -10262,7 +10540,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -10282,6 +10560,12 @@
 $as_echo "ok" >&6; }
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
 
 
 
@@ -10304,20 +10588,533 @@
 
 
 
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
 else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -10798,7 +11595,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
@@ -10810,7 +11607,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -10821,6 +11624,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -10848,39 +11652,74 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[012][,.]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
       _lt_dar_single_mod='$single_module'
     fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
     else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -10888,6 +11727,41 @@
     ;;
   esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
 for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
@@ -10903,678 +11777,86 @@
 
 
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+func_stripname_cnf ()
+{
+  case $2 in
+  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+  esac
+} # func_stripname_cnf
 
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-  test -n "$ac_ct_CXX" && break
-done
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
+# Set options
 
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
+        enable_dlopen=no
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
 else
-  GXX=
+  enable_shared=yes
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
 
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-  _lt_caught_CXX_error=yes
-fi
-
-
-
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
-$as_echo "$F77" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
-$as_echo "$ac_ct_F77" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_F77" && break
-done
-
-  if test "x$ac_ct_F77" = x; then
-    F77=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    F77=$ac_ct_F77
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-if ${ac_cv_f77_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-if ac_fn_f77_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-if ${ac_cv_prog_f77_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  FFLAGS=-g
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_f77_try_compile "$LINENO"; then :
-  ac_cv_prog_f77_g=yes
-else
-  ac_cv_prog_f77_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
-$as_echo "$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-if test $ac_compiler_gnu = yes; then
-  G77=yes
-else
-  G77=
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
 
 
 
 
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
     *)
-      enable_shared=no
+      pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
   pic_mode=default
 fi
 
 
-test -z "$pic_mode" && pic_mode=default
-
 
 
 
@@ -11590,14 +11872,14 @@
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -11611,11 +11893,63 @@
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
 
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -11644,6 +11978,11 @@
 
 
 
+
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -11659,7 +11998,7 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
@@ -11693,60 +12032,30 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -11755,15 +12064,8 @@
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -11778,22 +12080,22 @@
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -11816,13 +12118,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -11844,22 +12146,22 @@
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -11882,13 +12184,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -11909,7 +12211,7 @@
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11971,8 +12273,13 @@
 
 lt_prog_compiler_no_builtin_flag=
 
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@ -11982,7 +12289,7 @@
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -11992,15 +12299,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11995: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11999: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -12012,7 +12319,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
     :
@@ -12029,20 +12336,19 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     lt_prog_compiler_wl='-Wl,'
     lt_prog_compiler_static='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
+      lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
@@ -12053,8 +12359,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -12070,6 +12376,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -12078,6 +12389,12 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -12120,12 +12437,21 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
@@ -12133,11 +12459,30 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
 
     hpux9* | hpux10* | hpux11*)
       lt_prog_compiler_wl='-Wl,'
@@ -12152,7 +12497,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      lt_prog_compiler_static='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -12161,9 +12506,9 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -12182,7 +12527,19 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -12194,25 +12551,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -12244,7 +12616,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -12264,7 +12636,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
       fi
@@ -12293,7 +12665,7 @@
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
@@ -12301,13 +12673,17 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -12321,7 +12697,7 @@
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -12331,15 +12707,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12334: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12338: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -12351,7 +12727,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -12368,6 +12744,11 @@
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -12378,7 +12759,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -12387,7 +12768,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -12397,13 +12778,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
@@ -12436,16 +12817,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12439: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12443: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -12491,16 +12872,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12494: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12498: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -12523,8 +12904,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -12536,9 +12917,9 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -12566,7 +12947,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -12582,9 +12962,9 @@
   # included in the symbol list
   include_expsyms=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
   exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -12599,7 +12979,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -12607,30 +12987,57 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
 
   ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -12642,15 +13049,16 @@
     case $host_os in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -12660,7 +13068,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -12676,7 +13084,7 @@
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -12686,61 +13094,97 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -12751,39 +13195,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
-	xlf*)
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -12797,8 +13249,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -12816,8 +13268,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -12829,7 +13281,7 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -12844,9 +13296,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -12863,15 +13315,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs" = no; then
+    if test no = "$ld_shlibs"; then
       runpath_var=
       hardcode_libdir_flag_spec=
       export_dynamic_flag_spec=
@@ -12887,7 +13339,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -12895,32 +13347,57 @@
       ;;
 
     aix[4-9]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -12939,13 +13416,21 @@
       hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -12964,35 +13449,48 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec='${wl}-bexpall'
+      export_dynamic_flag_spec='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13005,34 +13503,47 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13045,33 +13556,57 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -13080,7 +13615,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -13100,20 +13635,65 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -13123,19 +13703,24 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
   link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
+  allow_undefined_flag=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
@@ -13170,41 +13755,40 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
+      export_dynamic_flag_spec='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
+	export_dynamic_flag_spec='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -13212,33 +13796,72 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
@@ -13249,7 +13872,7 @@
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+	  export_dynamic_flag_spec='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -13260,35 +13883,58 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo(void) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -13303,7 +13949,7 @@
     newsos6)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
@@ -13311,27 +13957,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs=no
@@ -13342,33 +13980,53 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -13379,24 +14037,24 @@
 
     solaris*)
       no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -13406,11 +14064,11 @@
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 	fi
@@ -13420,10 +14078,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -13472,43 +14130,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
+      no_undefined_flag='$wl-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
+      export_dynamic_flag_spec='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -13523,10 +14181,10 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -13534,7 +14192,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
@@ -13560,7 +14218,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -13571,44 +14229,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
@@ -13766,52 +14430,61 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -13821,14 +14494,20 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -13845,56 +14524,108 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -13904,27 +14635,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -13936,16 +14667,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -13961,37 +14693,84 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -14001,8 +14780,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -14012,11 +14791,11 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -14034,12 +14813,13 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -14064,13 +14844,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -14087,14 +14870,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -14102,8 +14886,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -14112,20 +14896,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -14136,16 +14922,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -14164,8 +14950,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -14174,22 +14960,47 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14202,22 +15013,31 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -14235,12 +15055,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -14249,8 +15069,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -14259,58 +15079,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -14318,11 +15148,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -14332,20 +15162,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -14366,24 +15196,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -14398,19 +15228,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -14420,20 +15250,40 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -14525,15 +15375,15 @@
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
+   test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
+  if test no != "$hardcode_direct" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
@@ -14548,12 +15398,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -14563,7 +15413,7 @@
 
 
 
-  if test "x$enable_dlopen" != xyes; then
+  if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -14573,23 +15423,23 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -14627,10 +15477,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
-    lt_cv_dlopen="dyld"
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
@@ -14638,10 +15488,18 @@
 
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
+  lt_cv_dlopen=shl_load
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -14680,11 +15538,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
+  lt_cv_dlopen=dlopen
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -14723,7 +15581,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -14762,7 +15620,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -14801,7 +15659,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
@@ -14822,21 +15680,21 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -14844,13 +15702,13 @@
 if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14853 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14891,7 +15749,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -14900,7 +15764,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -14913,7 +15781,7 @@
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -14933,20 +15801,20 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14949 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14987,7 +15855,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -14996,7 +15870,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -15009,7 +15887,7 @@
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -15030,9 +15908,9 @@
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -15076,7 +15954,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -15104,7 +15982,7 @@
 
 
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -15112,13 +15990,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
-    test "$enable_shared" = yes && enable_static=no
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -15126,8 +16004,12 @@
     ;;
 
   aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -15137,7 +16019,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
@@ -15151,8 +16033,147 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC="$lt_save_CC"
+CC=$lt_save_CC
+
+      if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+else
+  _lt_caught_CXX_error=yes
+fi
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -15169,7 +16190,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -15179,6 +16199,8 @@
 module_expsym_cmds_CXX=
 link_all_deplibs_CXX=unknown
 old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
 no_undefined_flag_CXX=
 whole_archive_flag_spec_CXX=
 enable_shared_with_static_runtimes_CXX=no
@@ -15194,7 +16216,7 @@
 # the CXX compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="int some_variable = 0;"
 
@@ -15234,6 +16256,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -15251,41 +16274,42 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   compiler_CXX=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
   if test -n "$compiler"; then
     # We don't want -fno-exception when compiling C++ code, so set the
     # no_builtin_flag separately
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
     else
       lt_prog_compiler_no_builtin_flag_CXX=
     fi
 
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       # Set up default GNU C++ configuration
 
 
 
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -15299,7 +16323,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -15310,7 +16334,7 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -15321,32 +16345,32 @@
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -15382,22 +16406,22 @@
 
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      if test yes = "$with_gnu_ld"; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
 
         # If archive_cmds runs LD, not CC, wlarc should be empty
         # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
         #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
+        wlarc='$wl'
 
         # ancient GNU ld didn't support --whole-archive et. al.
         if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 	  $GREP 'no-whole-archive' > /dev/null; then
-          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
         else
           whole_archive_flag_spec_CXX=
         fi
@@ -15416,7 +16440,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -15434,18 +16458,30 @@
         ld_shlibs_CXX=no
         ;;
       aix[4-9]*)
-        if test "$host_cpu" = ia64; then
+        if test ia64 = "$host_cpu"; then
           # On IA64, the linker does run time linking by default, so we don't
           # have to do anything special.
           aix_use_runtimelinking=no
           exp_sym_flag='-Bexport'
-          no_entry_flag=""
+          no_entry_flag=
         else
           aix_use_runtimelinking=no
 
           # Test if we are trying to use run time linking or normal
           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
           case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	    for ld_flag in $LDFLAGS; do
 	      case $ld_flag in
@@ -15455,6 +16491,13 @@
 	        ;;
 	      esac
 	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
 	    ;;
           esac
 
@@ -15473,13 +16516,21 @@
         hardcode_direct_absolute_CXX=yes
         hardcode_libdir_separator_CXX=':'
         link_all_deplibs_CXX=yes
-        file_list_spec_CXX='${wl}-f,'
+        file_list_spec_CXX='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          hardcode_direct_CXX=no
+          hardcode_direct_absolute_CXX=no
+          ;;
+        esac
 
-        if test "$GXX" = yes; then
+        if test yes = "$GXX"; then
           case $host_os in aix4.[012]|aix4.[012].*)
           # We only want to do this on AIX 4.2 and lower, the check
           # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -15497,36 +16548,50 @@
 	  fi
           esac
           shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
 	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
         else
           # not using gcc
-          if test "$host_cpu" = ia64; then
+          if test ia64 = "$host_cpu"; then
 	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	  # chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
           else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
 	    else
-	      shared_flag='${wl}-bM:SRE'
+	      shared_flag='$wl-bM:SRE'
 	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
           fi
         fi
 
-        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        export_dynamic_flag_spec_CXX='$wl-bexpall'
         # It seems that -bexpall does not export symbols beginning with
         # underscore (_), so it is better to generate a list of symbols to
 	# export.
         always_export_symbols_CXX=yes
-        if test "$aix_use_runtimelinking" = yes; then
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
           # Warning - without using the other runtime loading flags (-brtl),
           # -berok will link without error, but may produce a broken library.
-          allow_undefined_flag_CXX='-berok'
+          # The "-G" linker flag allows undefined symbols.
+          no_undefined_flag_CXX='-bernotok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15539,35 +16604,48 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
 
-          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
 
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
         else
-          if test "$host_cpu" = ia64; then
-	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+          if test ia64 = "$host_cpu"; then
+	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
 	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15580,34 +16658,58 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
 
-	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
-	    no_undefined_flag_CXX=' ${wl}-bernotok'
-	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec_CXX='$convenience'
+	    no_undefined_flag_CXX=' $wl-bernotok'
+	    allow_undefined_flag_CXX=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
 	    archive_cmds_need_lc_CXX=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -15617,7 +16719,7 @@
 	  allow_undefined_flag_CXX=unsupported
 	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -15633,51 +16735,104 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-        # as there is no search path for DLLs.
-        hardcode_libdir_flag_spec_CXX='-L$libdir'
-        allow_undefined_flag_CXX=unsupported
-        always_export_symbols_CXX=no
-        enable_shared_with_static_runtimes_CXX=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          ld_shlibs_CXX=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
 
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
   hardcode_automatic_CXX=yes
   hardcode_shlibpath_var_CXX=unsupported
-  whole_archive_flag_spec_CXX=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
   link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+       if test yes != "$lt_cv_apple_cc_single_mod"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 
   else
@@ -15686,6 +16841,34 @@
 
 	;;
 
+      os2*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+	hardcode_minus_L_CXX=yes
+	allow_undefined_flag_CXX=unsupported
+	shrext_cmds=.dll
+	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	enable_shared_with_static_runtimes_CXX=yes
+	;;
+
       dgux*)
         case $cc_basename in
           ec++*)
@@ -15720,13 +16903,15 @@
         ld_shlibs_CXX=yes
         ;;
 
-      gnu*)
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
         ;;
 
       hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
         hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
+        export_dynamic_flag_spec_CXX='$wl-E'
         hardcode_direct_CXX=yes
         hardcode_minus_L_CXX=yes # Not in the search PATH,
 				             # but as the default
@@ -15738,7 +16923,7 @@
             ld_shlibs_CXX=no
             ;;
           aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             # Commands to make compiler produce verbose output that lists
             # what "hidden" libraries, object files and flags are used when
             # linking a shared library.
@@ -15747,11 +16932,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            if test yes = "$GXX"; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               ld_shlibs_CXX=no
@@ -15761,15 +16946,15 @@
         ;;
 
       hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        if test no = "$with_gnu_ld"; then
+	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
 	  hardcode_libdir_separator_CXX=:
 
           case $host_cpu in
             hppa*64*|ia64*)
               ;;
             *)
-	      export_dynamic_flag_spec_CXX='${wl}-E'
+	      export_dynamic_flag_spec_CXX='$wl-E'
               ;;
           esac
         fi
@@ -15795,13 +16980,13 @@
           aCC*)
 	    case $host_cpu in
 	      hppa*64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      ia64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      *)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	    esac
 	    # Commands to make compiler produce verbose output that lists
@@ -15812,20 +16997,20 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
 	        case $host_cpu in
 	          hppa*64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -15840,22 +17025,22 @@
       interix[3-9]*)
 	hardcode_direct_CXX=no
 	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}-E'
+	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='$wl-E'
 	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 	# Instead, shared libraries are loaded at an image base (0x10000000 by
 	# default) and relocated if they conflict, which is a slow very memory
 	# consuming and fragmenting process.  To avoid this, we pick a random,
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -15864,22 +17049,22 @@
 	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	      else
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	      fi
 	    fi
 	    link_all_deplibs_CXX=yes
 	    ;;
         esac
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
         hardcode_libdir_separator_CXX=:
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -15887,8 +17072,8 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
 	    # linking a shared library.
@@ -15897,10 +17082,10 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -15914,59 +17099,59 @@
 	    # earlier do not add the objects themselves.
 	    case `$CC -V 2>&1` in
 	      *"Version 7."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	      *)  # Version 8.0 or newer
 	        tmp_idyn=
 	        case $host_cpu in
 		  ia64*) tmp_idyn=' -i_dynamic';;
 		esac
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	    esac
 	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
 	    ;;
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
 	      prelink_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      old_archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
 	      archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
 	    esac
 
-	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 
 	    runpath_var=LD_RUN_PATH
 	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -15980,18 +17165,18 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
 	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
@@ -15999,16 +17184,16 @@
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	      compiler_needs_object_CXX=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -16060,24 +17245,19 @@
         ld_shlibs_CXX=yes
 	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
-
-      openbsd*)
+      openbsd* | bitrig*)
 	if test -f /usr/libexec/ld.so; then
 	  hardcode_direct_CXX=yes
 	  hardcode_shlibpath_var_CXX=no
 	  hardcode_direct_absolute_CXX=yes
 	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='${wl}-E'
-	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='$wl-E'
+	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -16091,9 +17271,9 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
 	    hardcode_libdir_separator_CXX=:
 
 	    # Archives containing C++ object files must be created using
@@ -16111,17 +17291,17 @@
           cxx*)
 	    case $host in
 	      osf3*)
-	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 		;;
 	      *)
 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 		;;
 	    esac
@@ -16136,27 +17316,27 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
 	      case $host in
 	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	        *)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	      esac
 
-	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 	      hardcode_libdir_separator_CXX=:
 
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -16192,13 +17372,13 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             archive_cmds_need_lc_CXX=yes
 	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	    hardcode_libdir_flag_spec_CXX='-R$libdir'
 	    hardcode_shlibpath_var_CXX=no
@@ -16206,14 +17386,14 @@
 	      solaris2.[0-5] | solaris2.[0-5].*) ;;
 	      *)
 		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
+		# but understands '-z linker_flag'.
 	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	        ;;
 	    esac
 	    link_all_deplibs_CXX=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -16223,42 +17403,42 @@
 	    ;;
           gcx*)
 	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 
 	    # The C++ compiler must be used to create the archive.
 	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 	    ;;
           *)
 	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
-	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
 	      case $host_os in
 		solaris2.[0-5] | solaris2.[0-5].*) ;;
 		*)
-		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		  ;;
 	      esac
 	    fi
@@ -16267,48 +17447,52 @@
         ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='${wl}-z,text'
+      no_undefined_flag_CXX='$wl-z,text'
       archive_cmds_need_lc_CXX=no
       hardcode_shlibpath_var_CXX=no
       runpath_var='LD_RUN_PATH'
 
       case $cc_basename in
         CC*)
-	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
       esac
       ;;
 
       sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
+	# Note: We CANNOT use -z defs as we might desire, because we do not
 	# link with -lc, and that would cause any symbols used from libc to
 	# always be unresolved, which means just about no library would
 	# ever link correctly.  If we're not using GNU ld we use -z text
 	# though, which does catch some bad symbols but isn't as heavy-handed
 	# as -z defs.
-	no_undefined_flag_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	no_undefined_flag_CXX='$wl-z,text'
+	allow_undefined_flag_CXX='$wl-z,nodefs'
 	archive_cmds_need_lc_CXX=no
 	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
 	hardcode_libdir_separator_CXX=':'
 	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	export_dynamic_flag_spec_CXX='$wl-Bexport'
 	runpath_var='LD_RUN_PATH'
 
 	case $cc_basename in
           CC*)
-	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+              '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+              '"$reload_cmds_CXX"
 	    ;;
 	  *)
-	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    ;;
 	esac
       ;;
@@ -16340,10 +17524,10 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
-    test "$ld_shlibs_CXX" = no && can_build_shared=no
+    test no = "$ld_shlibs_CXX" && can_build_shared=no
 
-    GCC_CXX="$GXX"
-    LD_CXX="$LD"
+    GCC_CXX=$GXX
+    LD_CXX=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -16366,6 +17550,14 @@
 };
 _LT_EOF
 
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -16379,29 +17571,38 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case $prev$p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
        # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
 	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
+	     compiler_lib_search_path_CXX=$prev$p
 	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
 	   fi
 	   ;;
 	 # The "-l" case would never come before the object being
@@ -16409,13 +17610,15 @@
 	 esac
        else
 	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
+	   postdeps_CXX=$prev$p
 	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	   postdeps_CXX="${postdeps_CXX} $prev$p"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -16424,15 +17627,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
+	   predep_objects_CXX=$p
 	 else
 	   predep_objects_CXX="$predep_objects_CXX $p"
 	 fi
        else
 	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
+	   postdep_objects_CXX=$p
 	 else
 	   postdep_objects_CXX="$postdep_objects_CXX $p"
 	 fi
@@ -16451,6 +17654,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
@@ -16461,51 +17665,6 @@
   postdep_objects_CXX=
   postdeps_CXX=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 
 
@@ -16514,7 +17673,7 @@
 esac
  compiler_lib_search_dirs_CXX=
 if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 
 
@@ -16551,21 +17710,20 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
+  if test yes = "$GXX"; then
     lt_prog_compiler_wl_CXX='-Wl,'
     lt_prog_compiler_static_CXX='-static'
 
     case $host_os in
     aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static_CXX='-Bstatic'
       fi
+      lt_prog_compiler_pic_CXX='-fPIC'
       ;;
 
     amigaos*)
@@ -16576,8 +17734,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -16592,6 +17750,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_CXX='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -16602,6 +17765,11 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -16636,7 +17804,7 @@
     case $host_os in
       aix[4-9]*)
 	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	  # AIX 5 now supports IA64 processor
 	  lt_prog_compiler_static_CXX='-Bstatic'
 	else
@@ -16651,6 +17819,11 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -16671,14 +17844,14 @@
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -16707,7 +17880,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -16715,7 +17888,7 @@
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    # old Intel C++ for x86_64, which still supported -KPIC.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
@@ -16740,8 +17913,8 @@
 	    lt_prog_compiler_pic_CXX=
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-qpic'
 	    lt_prog_compiler_static_CXX='-qstaticlink'
@@ -16803,7 +17976,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
@@ -16860,7 +18033,7 @@
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_CXX=
     ;;
@@ -16868,10 +18041,17 @@
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
@@ -16885,7 +18065,7 @@
   lt_cv_prog_compiler_pic_works_CXX=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -16895,15 +18075,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16898: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16902: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_CXX=yes
@@ -16915,7 +18095,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -16929,6 +18109,8 @@
 
 
 
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -16939,7 +18121,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -16948,7 +18130,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_CXX=yes
@@ -16958,13 +18140,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -16994,16 +18176,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16997: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17001: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -17046,16 +18228,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17049: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17053: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -17078,8 +18260,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -17091,9 +18273,9 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -17106,31 +18288,45 @@
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   case $host_os in
   aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
+    export_symbols_cmds_CXX=$ltdll_cmds
+    ;;
   cygwin* | mingw* | cegcc*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
 
 with_gnu_ld_CXX=$with_gnu_ld
 
@@ -17147,7 +18343,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc_CXX=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds_CXX in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -17158,44 +18354,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-	pic_flag=$lt_prog_compiler_pic_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
       ;;
     esac
   fi
@@ -17263,15 +18465,13 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -17288,56 +18488,108 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -17347,27 +18599,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -17379,16 +18631,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -17404,37 +18657,83 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -17444,8 +18743,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17454,11 +18753,11 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -17476,12 +18775,13 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -17506,13 +18806,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -17529,14 +18832,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -17544,8 +18848,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -17554,20 +18858,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -17578,16 +18884,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -17606,8 +18912,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -17616,22 +18922,47 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_CXX='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -17644,22 +18975,31 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -17677,12 +19017,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -17691,8 +19031,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -17701,58 +19041,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -17760,11 +19110,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -17774,20 +19124,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -17808,24 +19158,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -17840,19 +19190,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -17862,20 +19212,34 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
 
 
 
@@ -17916,15 +19280,15 @@
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
    test -n "$runpath_var_CXX" ||
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+   test yes = "$hardcode_automatic_CXX"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct_CXX" != no &&
+  if test no != "$hardcode_direct_CXX" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+     test no != "$hardcode_minus_L_CXX"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action_CXX=relink
   else
@@ -17939,12 +19303,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
 $as_echo "$hardcode_action_CXX" >&6; }
 
-if test "$hardcode_action_CXX" = relink ||
-   test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+   test yes = "$inherit_rpath_CXX"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -17958,6 +19322,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -17966,7 +19331,7 @@
   lt_cv_path_LD=$lt_save_path_LD
   lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -17981,6 +19346,9 @@
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
 
 archive_cmds_need_lc_F77=no
 allow_undefined_flag_F77=
@@ -17990,7 +19358,6 @@
 hardcode_direct_F77=no
 hardcode_direct_absolute_F77=no
 hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
 hardcode_libdir_separator_F77=
 hardcode_minus_L_F77=no
 hardcode_automatic_F77=no
@@ -17999,6 +19366,8 @@
 module_expsym_cmds_F77=
 link_all_deplibs_F77=unknown
 old_archive_cmds_F77=$old_archive_cmds
+reload_flag_F77=$reload_flag
+reload_cmds_F77=$reload_cmds
 no_undefined_flag_F77=
 whole_archive_flag_spec_F77=
 enable_shared_with_static_runtimes_F77=no
@@ -18014,7 +19383,7 @@
 # the F77 compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -18060,20 +19429,15 @@
 
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   compiler_F77=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
   GCC=$G77
   if test -n "$compiler"; then
@@ -18084,21 +19448,25 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix[4-9]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -18108,12 +19476,12 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
-    GCC_F77="$G77"
-    LD_F77="$LD"
+    GCC_F77=$G77
+    LD_F77=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -18123,20 +19491,19 @@
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     lt_prog_compiler_wl_F77='-Wl,'
     lt_prog_compiler_static_F77='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static_F77='-Bstatic'
       fi
+      lt_prog_compiler_pic_F77='-fPIC'
       ;;
 
     amigaos*)
@@ -18147,8 +19514,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -18164,6 +19531,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_F77='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -18172,6 +19544,12 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_F77=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -18214,12 +19592,21 @@
       lt_prog_compiler_pic_F77='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl_F77='-Xlinker '
+      if test -n "$lt_prog_compiler_pic_F77"; then
+        lt_prog_compiler_pic_F77="-Xcompiler $lt_prog_compiler_pic_F77"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static_F77='-Bstatic'
       else
@@ -18227,10 +19614,29 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_F77='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl_F77='-Wl,-Wl,,'
+        lt_prog_compiler_pic_F77='-PIC'
+        lt_prog_compiler_static_F77='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_F77='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -18246,7 +19652,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+      lt_prog_compiler_static_F77='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -18255,9 +19661,9 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-KPIC'
@@ -18276,7 +19682,19 @@
 	lt_prog_compiler_pic_F77='--shared'
 	lt_prog_compiler_static_F77='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl_F77='-Wl,-Wl,,'
+	lt_prog_compiler_pic_F77='-PIC'
+	lt_prog_compiler_static_F77='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-fPIC'
+	lt_prog_compiler_static_F77='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -18288,25 +19706,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-qpic'
 	lt_prog_compiler_static_F77='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic_F77='-KPIC'
 	  lt_prog_compiler_static_F77='-Bstatic'
 	  lt_prog_compiler_wl_F77='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_F77='-KPIC'
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  lt_prog_compiler_pic_F77='-fPIC'
+	  lt_prog_compiler_static_F77='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  lt_prog_compiler_pic_F77='-fpic'
 	  lt_prog_compiler_static_F77='-Bstatic'
-	  lt_prog_compiler_wl_F77=''
 	  ;;
 	esac
 	;;
@@ -18338,7 +19771,7 @@
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl_F77='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl_F77='-Wl,';;
@@ -18358,7 +19791,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic_F77='-Kconform_pic'
 	lt_prog_compiler_static_F77='-Bstatic'
       fi
@@ -18387,7 +19820,7 @@
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_F77=
     ;;
@@ -18395,10 +19828,17 @@
     lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_F77" >&5
-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_F77+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_F77=$lt_prog_compiler_pic_F77
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_F77" >&6; }
+lt_prog_compiler_pic_F77=$lt_cv_prog_compiler_pic_F77
 
 #
 # Check to make sure the PIC flag actually works.
@@ -18412,7 +19852,7 @@
   lt_cv_prog_compiler_pic_works_F77=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+   lt_compiler_flag="$lt_prog_compiler_pic_F77"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -18422,15 +19862,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18425: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18429: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_F77=yes
@@ -18442,7 +19882,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_F77"; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -18456,6 +19896,8 @@
 
 
 
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -18466,7 +19908,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_F77=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -18475,7 +19917,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_F77=yes
@@ -18485,13 +19927,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_F77"; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -18521,16 +19963,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18524: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18528: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
@@ -18573,16 +20015,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18580: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
@@ -18605,8 +20047,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_F77" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -18618,9 +20060,9 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -18645,7 +20087,6 @@
   hardcode_direct_F77=no
   hardcode_direct_absolute_F77=no
   hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
   hardcode_libdir_separator_F77=
   hardcode_minus_L_F77=no
   hardcode_shlibpath_var_F77=unsupported
@@ -18661,9 +20102,9 @@
   # included in the symbol list
   include_expsyms_F77=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
   exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -18678,7 +20119,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -18686,30 +20127,57 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
 
   ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec_F77='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      whole_archive_flag_spec_F77=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec_F77=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -18721,15 +20189,16 @@
     case $host_os in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs_F77=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -18739,7 +20208,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds_F77=''
         ;;
       m68k)
@@ -18755,7 +20224,7 @@
 	allow_undefined_flag_F77=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs_F77=no
       fi
@@ -18765,61 +20234,97 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec_F77='-L$libdir'
+      export_dynamic_flag_spec_F77='$wl--export-all-symbols'
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_F77='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds_F77='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs_F77=no
       fi
       ;;
 
+    haiku*)
+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs_F77=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      allow_undefined_flag_F77=unsupported
+      shrext_cmds=.dll
+      archive_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes_F77=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${wl}-E'
+      hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
+      export_dynamic_flag_spec_F77='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_F77='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -18830,39 +20335,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec_F77=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object_F77=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec_F77='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object_F77=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
-	xlf*)
+	tcc*)
+	  export_dynamic_flag_spec_F77='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec_F77=
-	  hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-	  archive_cmds_F77='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
+	  archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -18876,8 +20389,8 @@
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -18895,8 +20408,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_F77=no
       fi
@@ -18908,7 +20421,7 @@
 	ld_shlibs_F77=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -18923,9 +20436,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
+	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs_F77=no
 	  fi
@@ -18942,15 +20455,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_F77=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs_F77" = no; then
+    if test no = "$ld_shlibs_F77"; then
       runpath_var=
       hardcode_libdir_flag_spec_F77=
       export_dynamic_flag_spec_F77=
@@ -18966,7 +20479,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_F77=unsupported
@@ -18974,32 +20487,57 @@
       ;;
 
     aix[4-9]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds_F77='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -19018,13 +20556,21 @@
       hardcode_direct_absolute_F77=yes
       hardcode_libdir_separator_F77=':'
       link_all_deplibs_F77=yes
-      file_list_spec_F77='${wl}-f,'
+      file_list_spec_F77='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct_F77=no
+	hardcode_direct_absolute_F77=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -19043,102 +20589,152 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec_F77='${wl}-bexpall'
+      export_dynamic_flag_spec_F77='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag_F77='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat > conftest.$ac_ext <<_ACEOF
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__F77+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
 if ac_fn_f77_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__F77=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__F77"; then
+    lt_cv_aix_libpath__F77=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__F77"; then
+    lt_cv_aix_libpath__F77=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__F77
+fi
 
-        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        hardcode_libdir_flag_spec_F77='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec_F77='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat > conftest.$ac_ext <<_ACEOF
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__F77+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
 if ac_fn_f77_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__F77=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__F77"; then
+    lt_cv_aix_libpath__F77=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__F77"; then
+    lt_cv_aix_libpath__F77=/usr/lib:/lib
+  fi
 
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__F77
+fi
+
+	 hardcode_libdir_flag_spec_F77='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77='$convenience'
+	  no_undefined_flag_F77=' $wl-bernotok'
+	  allow_undefined_flag_F77=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec_F77='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_F77='$convenience'
+	  fi
 	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  archive_expsym_cmds_F77='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -19147,7 +20743,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds_F77=''
         ;;
       m68k)
@@ -19167,20 +20763,65 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec_F77=' '
+	allow_undefined_flag_F77=unsupported
+	always_export_symbols_F77=yes
+	file_list_spec_F77='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds_F77='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds_F77='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, F77)='true'
+	enable_shared_with_static_runtimes_F77=yes
+	exclude_expsyms_F77='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds_F77='chmod 644 $oldlib'
+	postlink_cmds_F77='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec_F77=' '
+	allow_undefined_flag_F77=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds_F77='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes_F77=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -19190,19 +20831,24 @@
   hardcode_direct_F77=no
   hardcode_automatic_F77=yes
   hardcode_shlibpath_var_F77=unsupported
-  whole_archive_flag_spec_F77=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_F77='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    compiler_needs_object_F77=yes
+  else
+    whole_archive_flag_spec_F77=''
+  fi
   link_all_deplibs_F77=yes
-  allow_undefined_flag_F77="$_lt_dar_allow_undefined"
+  allow_undefined_flag_F77=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_F77="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_F77="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs_F77=no
@@ -19237,41 +20883,40 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	archive_cmds_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
       hardcode_libdir_separator_F77=:
       hardcode_direct_F77=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
+      export_dynamic_flag_spec_F77='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
 	hardcode_libdir_separator_F77=:
 	hardcode_direct_F77=yes
 	hardcode_direct_absolute_F77=yes
-	export_dynamic_flag_spec_F77='${wl}-E'
+	export_dynamic_flag_spec_F77='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L_F77=yes
@@ -19279,33 +20924,33 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_F77='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_F77='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_F77='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
 	hardcode_libdir_separator_F77=:
 
 	case $host_cpu in
@@ -19316,7 +20961,7 @@
 	*)
 	  hardcode_direct_F77=yes
 	  hardcode_direct_absolute_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
+	  export_dynamic_flag_spec_F77='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -19327,34 +20972,59 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat > conftest.$ac_ext <<_ACEOF
-int foo(void) {}
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat > conftest.$ac_ext <<_ACEOF
+
+      subroutine foo
+      end
 _ACEOF
 if ac_fn_f77_try_link "$LINENO"; then :
-  archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
       else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc_F77='no'
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
       hardcode_libdir_separator_F77=:
       inherit_rpath_F77=yes
       link_all_deplibs_F77=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs_F77=yes
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -19369,7 +21039,7 @@
     newsos6)
       archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
       hardcode_libdir_separator_F77=:
       hardcode_shlibpath_var_F77=no
       ;;
@@ -19377,27 +21047,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct_F77=yes
 	hardcode_shlibpath_var_F77=no
 	hardcode_direct_absolute_F77=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_F77='${wl}-E'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_F77='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs_F77=no
@@ -19408,33 +21070,53 @@
       hardcode_libdir_flag_spec_F77='-L$libdir'
       hardcode_minus_L_F77=yes
       allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes_F77=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	allow_undefined_flag_F77=' $wl-expect_unresolved $wl\*'
+	archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc_F77='no'
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
       hardcode_libdir_separator_F77=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag_F77=' $wl-expect_unresolved $wl\*'
+	archive_cmds_F77='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -19445,24 +21127,24 @@
 
     solaris*)
       no_undefined_flag_F77=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds_F77='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_F77='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds_F77='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds_F77='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -19472,11 +21154,11 @@
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec_F77='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
 	fi
@@ -19486,10 +21168,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -19538,43 +21220,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_F77='${wl}-z,text'
+      no_undefined_flag_F77='$wl-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds_F77='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      no_undefined_flag_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
+      no_undefined_flag_F77='$wl-z,text'
+      allow_undefined_flag_F77='$wl-z,nodefs'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec_F77='$wl-R,$libdir'
       hardcode_libdir_separator_F77=':'
       link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
+      export_dynamic_flag_spec_F77='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds_F77='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -19589,10 +21271,10 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec_F77='${wl}-Blargedynsym'
+	export_dynamic_flag_spec_F77='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -19600,7 +21282,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5
 $as_echo "$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
+test no = "$ld_shlibs_F77" && can_build_shared=no
 
 with_gnu_ld_F77=$with_gnu_ld
 
@@ -19617,7 +21299,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc_F77=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds_F77 in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -19628,44 +21310,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_F77+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-	pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_F77
+	  pic_flag=$lt_prog_compiler_pic_F77
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+	  allow_undefined_flag_F77=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_F77" >&5
-$as_echo "$archive_cmds_need_lc_F77" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc_F77=no
+	  else
+	    lt_cv_archive_cmds_need_lc_F77=yes
+	  fi
+	  allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_F77" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_F77" >&6; }
+      archive_cmds_need_lc_F77=$lt_cv_archive_cmds_need_lc_F77
       ;;
     esac
   fi
@@ -19733,15 +21421,13 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -19758,56 +21444,108 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -19817,27 +21555,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -19849,16 +21587,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -19874,37 +21613,83 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -19914,8 +21699,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -19924,11 +21709,11 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -19946,12 +21731,13 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -19976,13 +21762,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -19999,14 +21788,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -20014,8 +21804,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -20024,20 +21814,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -20048,16 +21840,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -20076,8 +21868,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -20086,44 +21878,78 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_F77='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_F77\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_F77\""
-  cat > conftest.$ac_ext <<_ACEOF
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_F77\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_F77\""
+    cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
 if ac_fn_f77_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -20141,12 +21967,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -20155,8 +21981,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -20165,58 +21991,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -20224,11 +22060,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -20238,20 +22074,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -20272,24 +22108,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -20304,19 +22140,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -20326,20 +22162,34 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
 
 
 
@@ -20380,15 +22230,15 @@
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" ||
    test -n "$runpath_var_F77" ||
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
+   test yes = "$hardcode_automatic_F77"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct_F77" != no &&
+  if test no != "$hardcode_direct_F77" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" &&
+     test no != "$hardcode_minus_L_F77"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action_F77=relink
   else
@@ -20403,12 +22253,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5
 $as_echo "$hardcode_action_F77" >&6; }
 
-if test "$hardcode_action_F77" = relink ||
-   test "$inherit_rpath_F77" = yes; then
+if test relink = "$hardcode_action_F77" ||
+   test yes = "$inherit_rpath_F77"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -20422,8 +22272,9 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -20441,6 +22292,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -20520,6 +22373,8 @@
     ## changes DYLD_LIBRARY_PATH), because they override the system
     ## look-up sequence. Such automatic override has proven to break things
     ## like system frameworks (e.g. ImageIO or OpenGL framework).
+    ## Not so bad in later versions of Darwin,
+    ## where DYLD_FALLBACK_LIBRARY_PATH is used (see below).
     ;;
   *)
     for arg in ${LDFLAGS}; do
@@ -20541,8 +22396,9 @@
 
 ## Record name of environment variable which tells the dynamic linker
 ## where to find shlibs (typically, 'LD_LIBRARY_PATH').
-## Used in etc/ldpaths: override what libtool thinks on OS X
+## Used in etc/ldpaths: As from R 3.0.0 override what libtool thinks on OS X
 ## http://hublog.hubmed.org/archives/001192.html suggests this was in 10.4
+## However, as from 10.11 this variable is not passed down to shells.
 case "${host_os}" in
   darwin*)
     Rshlibpath_var=DYLD_FALLBACK_LIBRARY_PATH
@@ -20570,7 +22426,7 @@
 ## This actually comes from libtool.m4.
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -20611,7 +22467,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
 $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
 if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then :
-  LIBM="-lmw"
+  LIBM=-lmw
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
@@ -20693,7 +22549,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
 $as_echo "$ac_cv_lib_m_cos" >&6; }
 if test "x$ac_cv_lib_m_cos" = xyes; then :
-  LIBM="-lm"
+  LIBM=-lm
 fi
 
   ;;
@@ -20751,13 +22607,27 @@
 
 case "${host_os}" in
   darwin*)
-    ## OS X <= 10.2 dlcompat, >= 10.3 included dlcompat in libSystem
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-$as_echo_n "checking for library containing dlopen... " >&6; }
-if ${ac_cv_search_dlopen+:} false; then :
+    ## OS X >= 10.3 include dlcompat in libSystem
+    ## This is ancient history
+    ## SI says we want '-lcc_dynamic' on Darwin, although currently
+    ## https://developer.apple.com/documentation/MacOSX/ has nothing
+    ## official.  Bill Northcott <w.northcott@unsw.edu.au> points out
+    ## that it is only needed for GCC 3.x (and earlier) ...
+    if test "${GCC}" = yes; then
+      case "${CC_VERSION}" in
+        2.*|3.*)
+	  as_fn_error $? "Your gcc is too old." "$LINENO" 5
+      esac
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20776,137 +22646,28 @@
   return 0;
 }
 _ACEOF
-for ac_lib in '' dl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_dlopen=$ac_res
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_dlopen+:} false; then :
-  break
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-done
-if ${ac_cv_search_dlopen+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
 
-else
-  ac_cv_search_dlopen=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-$as_echo "$ac_cv_search_dlopen" >&6; }
-ac_res=$ac_cv_search_dlopen
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  LIBS="-ldl $LIBS"
 
-else
-  as_fn_error $? "Your OS X is too old." "$LINENO" 5
 fi
 
-    ## SI says we want '-lcc_dynamic' on Darwin, although currently
-    ## http://developer.apple.com/documentation/MacOSX/ has nothing
-    ## official.  Bill Northcott <w.northcott@unsw.edu.au> points out
-    ## that it is only needed for GCC 3.x (and earlier) ...
-    if test "${GCC}" = yes; then
-      case "${CC_VERSION}" in
-        2.*|3.*)
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcc_dynamic" >&5
-$as_echo_n "checking for main in -lcc_dynamic... " >&6; }
-if ${ac_cv_lib_cc_dynamic_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcc_dynamic  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cc_dynamic_main=yes
-else
-  ac_cv_lib_cc_dynamic_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cc_dynamic_main" >&5
-$as_echo "$ac_cv_lib_cc_dynamic_main" >&6; }
-if test "x$ac_cv_lib_cc_dynamic_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCC_DYNAMIC 1
-_ACEOF
-
-  LIBS="-lcc_dynamic $LIBS"
-
-fi
- ;;
-      esac
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-    ;;
-esac
+    ;;
+esac
 
 ## Readline.
 if test "${use_readline}" = yes; then
@@ -23296,7 +25057,7 @@
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_verb"
-(eval echo $as_me:23299: \"$ac_link\") >&5
+(eval echo $as_me:25060: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -23371,7 +25132,7 @@
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_cv_prog_c_v"
-(eval echo $as_me:23374: \"$ac_link\") >&5
+(eval echo $as_me:25135: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -25711,10 +27472,6 @@
       fi
     fi
     ;;
-  cygwin*|mingw*|windows*|winnt)
-    $as_echo "#define HAVE_NO_SYMBOL_UNDERSCORE 1" >>confdefs.h
-
-    ;;
   darwin*)
     $as_echo "#define HAVE_NO_SYMBOL_UNDERSCORE 1" >>confdefs.h
 
@@ -26038,6 +27795,10 @@
         ;;
     esac
     ;;
+  mingw*|windows*|winnt)
+    $as_echo "#define HAVE_NO_SYMBOL_UNDERSCORE 1" >>confdefs.h
+
+    ;;
   openbsd*)
     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
       $as_echo "#define HAVE_NO_SYMBOL_UNDERSCORE 1" >>confdefs.h
@@ -26322,7 +28083,6 @@
 
 ## Step 3.  Individual platform overrides.
 dylib_undefined_allowed=yes
-is_cygwin=no
 case "${host_os}" in
   aix*)
     use_exportfiles=yes
@@ -26353,71 +28113,26 @@
       shlib_cxxldflags="-shared ${shlib_cxxldflags}"
     fi
     ;;
-  cygwin*)
-    ## All Windows code is PIC
-    cpicflags=
-    cxxpicflags=
-    fpicflags=
-    fcpicflags=
-    SHLIB_EXT=".dll"
-    dylib_undefined_allowed=no
-    is_cygwin=yes
-    main_ldflags="${wl}--large-address-aware ${wl}--stack=0xA00000"
-    ;;
   darwin*)
     darwin_pic="-fPIC"
     dylib_undefined_allowed=no
     darwin_dylib_ldflags="-dynamiclib"
-    ## Want '-mdynamic-no-pic' for GCC 3, says Jan de Leeuw.
-    if test "${GCC}" = yes; then
-      case "${CC_VERSION}" in
-        3.*)
-          separator=""
-test -z "${separator}" && separator=" "
-if test -z "${main_ldflags}"; then
-  main_ldflags="-mdynamic-no-pic"
-else
-  main_ldflags="${main_ldflags}${separator}-mdynamic-no-pic"
-fi ;;
-      esac
-    fi
-    ## some linkers are broken and need to be set to a specific
-    ## OS X version to work better
-    case "${host_os}" in
-       darwin8*)
-          # this is the 'old' way and it doesn't work with recent gcc as the driver
-	  # prepends its own version
-	  ### darwin_min_flag='Wl,-macosx_version_min -Wl,10.4'
-	  # this is the 'new' way, but it's not clear which driver version
-	  # started to support it (Xcode 2.5 is known to work and 2.4 should)
-	  # A work-around for older Xcode is to set MACOSX_DEPLOYMENT_TARGET
-	  # environment variable. It has its own problems, but we may as well
-	  # honor it, assuming that it fixes things.
-	  if test -z "${MACOSX_DEPLOYMENT_TARGET}"; then
-	      darwin_min_flag='-mmacosx-version-min=10.4'
-	  fi
-	  ;;
-       *)
-	  darwin_min_flag=''
-	  ;;
-    esac
-    case "${host_os}" in
-      ## * recent ld has -single_module so it doesn't need -fno-common
-      ##   we have to use dylib instead of a bundle
-      ## * dylib+single_module+flat_namespace=pretty much what other platforms call .so
-      ##   but there can be no multiple symbols (due to flat namespace)
-      ## * since 10.3 we can also use -undefined dynamic_lookup which allows us to
-      ##   use two-level namespace and still have undefined symbols
-      *)
-        ## FIXME: strictly speaking it should be "yes" but libRblas still
-	## needs -lgfortran because the sharing is a one-way street
-        ## dylib_undefined_allowed=yes
+    shlib_ldflags="-dynamiclib -Wl,-headerpad_max_install_names -undefined dynamic_lookup -single_module -multiply_defined suppress"
+    ## * recent ld has -single_module so it doesn't need -fno-common
+    ##   we have to use dylib instead of a bundle
+    ## * dylib+single_module+flat_namespace=pretty much what other platforms call .so
+    ##   but there can be no multiple symbols (due to flat namespace)
+    ## * since 10.3 we can also use -undefined dynamic_lookup which allows us to
+    ##   use two-level namespace and still have undefined symbols
+
+    ## FIXME: strictly speaking it should be "yes" but libRblas still
+    ## needs -lgfortran because the sharing is a one-way street
+    ## dylib_undefined_allowed=yes
 
-	## we have to test this in case an outdated linker or non-Apple compiler is used
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linker supports dynamic lookup" >&5
+    ## we have to test this in case an outdated linker or non-Apple compiler is used
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linker supports dynamic lookup" >&5
 $as_echo_n "checking whether linker supports dynamic lookup... " >&6; }
-	shlib_ldflags="-dynamiclib -Wl,-headerpad_max_install_names ${darwin_min_flag} -undefined dynamic_lookup -single_module -multiply_defined suppress"
-	if ${r_cv_has_dynlookup+:} false; then :
+    if ${r_cv_has_dynlookup+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -26440,35 +28155,31 @@
 
 fi
 
-	if test -n "${FORCE_FLAT_NAMESPACE}"; then
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Use of flat namespace is requested by user." >&5
+    if test -n "${FORCE_FLAT_NAMESPACE}"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Use of flat namespace is requested by user." >&5
 $as_echo "$as_me: WARNING: Use of flat namespace is requested by user." >&2;}
-	   r_cv_has_dynlookup=forced-no
-	fi
-	if test "${r_cv_has_dynlookup}" != "yes"; then
-	   shlib_ldflags="-dynamiclib -flat_namespace -undefined suppress -single_module -multiply_defined suppress"
-	   dylib_undefined_allowed=yes
-	fi
+       r_cv_has_dynlookup=forced-no
+    fi
+    if test "${r_cv_has_dynlookup}" != "yes"; then
+       shlib_ldflags="-dynamiclib -flat_namespace -undefined suppress -single_module -multiply_defined suppress"
+       dylib_undefined_allowed=yes
+    fi
 
-	## we use the same method for shlib and dylib now
-	darwin_dylib_ldflags="${shlib_ldflags}"
-	## side note: we could use flat namespace instead, but there is an exception:
-	## * libRblas must be 2-level, dyn lookup because of xerbla which is undefined
-        ;;
-    esac
+    ## we use the same method for shlib and dylib now
+    darwin_dylib_ldflags="${shlib_ldflags}"
+    ## side note: we could use flat namespace instead, but there is an exception:
+    ## * libRblas must be 2-level, dyn lookup because of xerbla which is undefined
     cpicflags="${darwin_pic}"
     cxxpicflags="${darwin_pic}"
+    ## OS X does not have a Fortran compiler, so this is speculative
     fpicflags="${darwin_pic}"
     shlib_cxxldflags="${shlib_ldflags}"
-    if test "${ac_cv_lib_cc_dynamic_main}" = yes; then
-      ## Could also try grepping LIBS for '-lcc_dynamic' ...
-      SHLIB_LIBADD="-lcc_dynamic"
-    fi
     ;;
   freebsd*)
     ## maybe this needs to depend on the compiler:
     ## -export-dynamic used to work, but does not with clang.
     ## Seems FreeBSD has used the GNU linker since at least 3.0 (Oct 1998)
+    ## We could also use -rdynamic, which seems to work with clang and gcc.
     main_ldflags="-Wl,--export-dynamic"
     shlib_ldflags="-shared"
     ;;
@@ -26576,6 +28287,22 @@
       main_ldflags="${wl}-export-dynamic"
       shlib_ldflags="-shared -fPIC"
     fi
+    case "${host_cpu}" in
+      powerpc*)
+	## GCC -fpic limits to 2**16 on OpenBSD powerpc.
+	## Error message without -fPIC:
+	##   relocation truncated to fit: R_PPC_GOT16...
+        if test "${GCC}" = yes; then
+          cpicflags="-fPIC"
+        fi
+        if test "${G77}" = yes; then
+          fpicflags="-fPIC"
+        fi
+        if test "${GXX}" = yes; then
+          cxxpicflags="-fPIC"
+        fi
+        ;;
+    esac
     ;;
   osf*)
     cpicflags=
@@ -26650,19 +28377,19 @@
   else
      MAIN_LD="${main_ld}"
   fi
-  separator=""
+fi
+separator=""
 test -z "${separator}" && separator=" "
 if test -z "${MAIN_LDFLAGS}"; then
   MAIN_LDFLAGS="${main_ldflags}"
 else
   MAIN_LDFLAGS="${MAIN_LDFLAGS}${separator}${main_ldflags}"
 fi
-fi
 
 : ${CPICFLAGS="${cpicflags}"}
 if test -z "${CPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5
@@ -26675,7 +28402,7 @@
 : ${FPICFLAGS="${fpicflags}"}
 if test -z "${FPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine FPICFLAGS." >&5
@@ -26688,7 +28415,7 @@
 : ${CXXPICFLAGS="${cxxpicflags}"}
 if test -z "${CXXPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       warn_cxxpicflags="I could not determine CXXPICFLAGS."
@@ -26819,14 +28546,6 @@
   DYLIB_UNDEFINED_ALLOWED_FALSE=
 fi
 
- if test "x${is_cygwin}" = xyes; then
-  BUILD_CYGWIN_TRUE=
-  BUILD_CYGWIN_FALSE='#'
-else
-  BUILD_CYGWIN_TRUE='#'
-  BUILD_CYGWIN_FALSE=
-fi
-
 
 
 
@@ -27384,7 +29103,7 @@
 ## FreeBSD 7.3 lacks nearbyintl/rintl (nearbyint appeared in 5.2)
 ## Apparently rint was once broken on HP-UX: undefine HAVE_RINT for such platforms
 ## Cygwin and FreeBSD lacked powl (FreeBSD 10 seems to have it).
-## Cygwin has rintl but not nearbyintl
+## Cygwin had rintl but not nearbyintl
 for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl
 do
 as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh`
@@ -27569,10 +29288,11 @@
 fi
 
 
-## Functions from draft C11 extensions, some of which are already in glibc
+## Functions from ISO/IEC TS 18661-4:2015 C11 extensions.
 ## For now, do not define _GNU_SOURCE here.
-## All but pown have long been in libsunmath
-for ac_func in atanpi atan2pi cospi exp10 pown sinpi tanpi
+## All but pown have long been in Solaris' libsunmath
+## OS X has __cospi __sinpi __tanpi
+for ac_func in atanpi atan2pi cospi exp10 pown sinpi tanpi __cospi __sinpi __tanpi
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -27580,7 +29300,7 @@
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
- #define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+ #define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
 #include <math.h>
 #ifdef HAVE_SUNMATH_H
 #include <sunmath.h>
@@ -27858,6 +29578,56 @@
 if test "${ac_cv_have_decl_popen}" = "no"; then
    as_fn_error $? "Building R requires the 'popen' system call" "$LINENO" 5
 fi
+for ac_func in getline
+do
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5
+$as_echo_n "checking whether $ac_func exists and is declared... " >&6; }
+if eval \${$as_ac_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+#ifndef $ac_func
+  char *p = (char *) $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_ac_Symbol=yes"
+else
+  eval "$as_ac_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Symbol'};$as_echo "$as_val"'` = yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
 ## Windows has neither setenv nor unsetenv
 for ac_func in setenv unsetenv
 do
@@ -32694,6 +34464,7 @@
       case "${host_os}" in
         darwin*)
           ## This is for static OS X build
+	  ## FIXME: doing that unconditionally is really not a good idea
           CAIRO_LIBS=`"${PKGCONF}" --static --libs ${modlist}`
           CAIROX11_LIBS=`"${PKGCONF}" --static --libs ${xmodlist}`
           ;;
@@ -33174,6 +34945,7 @@
   if test "${have_tcltk}" = yes; then
     ## Part 2.  Check for tk.h.
     found_tk_h=no
+    found_tk_by_config=no
     if test -n "${TK_CONFIG}"; then
       . ${TK_CONFIG}
       ## TK_INCLUDE_SPEC (if set) is what we want.
@@ -33187,6 +34959,7 @@
 fi
 
 
+	found_tk_by_config=yes
 	CPPFLAGS="${r_save_CPPFLAGS}"
       fi
       if test "${found_tk_h}" = no; then
@@ -33259,8 +35032,12 @@
     fi
   fi
 fi
+## TK_XINCLUDES should be empty for Aqua Tk, so earlier test was wrong
+## Our code does not include any X headers, but tk.h may ....
+## That is true even on OS X, but Aqua Tk has a private version of
+## X11 headers, and we want that one and not the XQuartz one.
 if test "${have_tcltk}" = yes; then
-  if test -n "${TK_XINCLUDES}"; then
+  if test "${found_tk_by_config}" = yes; then
     TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} ${TK_XINCLUDES}"
   else
     TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} ${X_CFLAGS}"
@@ -33268,7 +35045,6 @@
 fi
 
 
-
 if test -z "${TCLTK_LIBS}"; then
   ## We have to do the work.
   if test "${have_tcltk}" = yes; then
@@ -33562,70 +35338,95 @@
   $as_echo_n "(cached) " >&6
 else
   if test "${ac_cv_header_netdb_h}" = yes \
+     && test "${ac_cv_header_arpa_inet_h}" = yes \
      && test "${ac_cv_header_netinet_in_h}" = yes \
      && test "${ac_cv_header_sys_socket_h}" = yes \
      && test "${ac_cv_search_connect}" != no \
      && test "${ac_cv_search_gethostbyname}" !=  no; then
   r_cv_bsd_networking=yes
 else
-  r_cv_bsd_networking=no
+  as_fn_error $? "BSD networking functions are required" "$LINENO" 5
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_bsd_networking" >&5
 $as_echo "$r_cv_bsd_networking" >&6; }
-if test "${r_cv_bsd_networking}" = yes; then
 
-$as_echo "#define HAVE_BSD_NETWORKING 1" >>confdefs.h
 
+## XDR headers and library routines.
+ac_fn_c_check_header_mongrel "$LINENO" "rpc/types.h" "ac_cv_header_rpc_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_rpc_types_h" = xyes; then :
+
+fi
 
-$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
 
+if test "${ac_cv_header_rpc_types_h}" = yes ; then
+  ac_fn_c_check_header_compile "$LINENO" "rpc/xdr.h" "ac_cv_header_rpc_xdr_h" "#include <rpc/types.h>
+"
+if test "x$ac_cv_header_rpc_xdr_h" = xyes; then :
 
-$as_echo "#define HAVE_INTERNET 1" >>confdefs.h
+fi
 
 
-$as_echo "#define SUPPORT_LIBXML 1" >>confdefs.h
+fi
+if test "${ac_cv_header_rpc_types_h}" = yes && \
+   test "${ac_cv_header_rpc_xdr_h}" = yes && \
+   test "${ac_cv_search_xdr_string}" != no ; then
+  r_xdr=yes
+else
+  r_xdr=no
+fi
+TIRPC_CPPFLAGS=
+if test "${r_xdr}" = no ; then
+  ## No RPC headers, so try for TI-RPC headers: need /usr/include/tirpc
+  ## on include path to find /usr/include/tirpc/netconfig.h
+  save_CPPFLAGS=${CPPFLAGS}
+  CPPFLAGS="${CPPFLAGS} -I/usr/include/tirpc"
+  ac_fn_c_check_header_mongrel "$LINENO" "tirpc/rpc/types.h" "ac_cv_header_tirpc_rpc_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_tirpc_rpc_types_h" = xyes; then :
 
 fi
 
 
-## Bitmap headers and libraries.
-BITMAP_LIBS=
-if test "${use_jpeglib}" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jpeglib version >= 6b" >&5
-$as_echo_n "checking if jpeglib version >= 6b... " >&6; }
-if ${r_cv_header_jpeglib_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <jpeglib.h>
-#if (JPEG_LIB_VERSION >= 62)
-  yes
-#endif
+  if test "${ac_cv_header_tirpc_rpc_types_h}" = yes ; then
+    ac_fn_c_check_header_compile "$LINENO" "tirpc/rpc/xdr.h" "ac_cv_header_tirpc_rpc_xdr_h" "#include <tirpc/rpc/types.h>
+"
+if test "x$ac_cv_header_tirpc_rpc_xdr_h" = xyes; then :
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-  r_cv_header_jpeglib_h=yes
-else
-  r_cv_header_jpeglib_h=no
 fi
-rm -f conftest*
 
+
+  fi
+  if test "${ac_cv_header_tirpc_rpc_types_h}" = yes && \
+       test "${ac_cv_header_tirpc_rpc_xdr_h}" = yes &&
+       test "${ac_cv_search_xdr_string}" != no ; then
+    TIRPC_CPPFLAGS=-I/usr/include/tirpc
+    r_xdr=yes
+  fi
+  CPPFLAGS="${save_CPPFLAGS}"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDR support" >&5
+$as_echo_n "checking for XDR support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${r_xdr}" >&5
+$as_echo "${r_xdr}" >&6; }
+ if test "x${r_xdr}" = xno; then
+  BUILD_XDR_TRUE=
+  BUILD_XDR_FALSE='#'
+else
+  BUILD_XDR_TRUE='#'
+  BUILD_XDR_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_jpeglib_h" >&5
-$as_echo "$r_cv_header_jpeglib_h" >&6; }
 
-  have_jpeg=${r_cv_header_jpeglib_h}
-  if test "${have_jpeg}" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5
-$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then :
+
+
+
+## zlib headers and libraries.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateInit2_ in -lz" >&5
+$as_echo_n "checking for inflateInit2_ in -lz... " >&6; }
+if ${ac_cv_lib_z_inflateInit2_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg ${LIBS} $LIBS"
+LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -33635,7 +35436,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char jpeg_destroy_compress ();
+char inflateInit2_ ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -33647,48 +35448,149 @@
 int
 main ()
 {
-return jpeg_destroy_compress ();
+return inflateInit2_ ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_jpeg_jpeg_destroy_compress=yes
+  ac_cv_lib_z_inflateInit2_=yes
 else
-  ac_cv_lib_jpeg_jpeg_destroy_compress=no
+  ac_cv_lib_z_inflateInit2_=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then :
-  have_jpeg=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateInit2_" >&5
+$as_echo "$ac_cv_lib_z_inflateInit2_" >&6; }
+if test "x$ac_cv_lib_z_inflateInit2_" = xyes; then :
+  have_zlib=yes
 else
-  have_jpeg=no
+  have_zlib=no
 fi
 
-  fi
-  if test "${have_jpeg}" = yes; then
-    BITMAP_LIBS="-ljpeg"
+if test "${have_zlib}" = yes; then
+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+  have_zlib=yes
+else
+  have_zlib=no
+fi
 
-$as_echo "#define HAVE_JPEG 1" >>confdefs.h
 
-  fi
 fi
-if test "${use_libpng}" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
-$as_echo_n "checking for main in -lz... " >&6; }
-if ${ac_cv_lib_z_main+:} false; then :
+if test "${have_zlib}" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if zlib version >= 1.2.5" >&5
+$as_echo_n "checking if zlib version >= 1.2.5... " >&6; }
+if ${r_cv_header_zlib_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  r_cv_header_zlib_h=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <string.h>
+#include <zlib.h>
+int main() {
+#ifdef ZLIB_VERSION
+/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
+   version on the master site zlib.net */
+  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
+#else
+  exit(1);
+#endif
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_header_zlib_h=yes
+else
+  r_cv_header_zlib_h=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_zlib_h" >&5
+$as_echo "$r_cv_header_zlib_h" >&6; }
+
+  have_zlib=${r_cv_header_zlib_h}
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether zlib support suffices" >&5
+$as_echo_n "checking whether zlib support suffices... " >&6; }
+if test "${have_zlib}" != yes; then
+  as_fn_error $? "zlib library and headers are required" "$LINENO" 5
+else
+  LIBS="-lz ${LIBS}"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking mmap support for zlib" >&5
+$as_echo_n "checking mmap support for zlib... " >&6; }
+if ${r_cv_zlib_mmap+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  r_cv_zlib_mmap=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+caddr_t hello() {
+  exit(mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0));
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_zlib_mmap=no
+else
+  r_cv_zlib_mmap=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_zlib_mmap" >&5
+$as_echo "$r_cv_zlib_mmap" >&6; }
+
+fi
+ if test "x${have_zlib}" = xno && test "x${r_cv_zlib_mmap}" = xyes; then
+  USE_MMAP_ZLIB_TRUE=
+  USE_MMAP_ZLIB_FALSE='#'
+else
+  USE_MMAP_ZLIB_TRUE='#'
+  USE_MMAP_ZLIB_FALSE=
+fi
+
+
+
+## bzlib headers and libraries.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzlibVersion in -lbz2" >&5
+$as_echo_n "checking for BZ2_bzlibVersion in -lbz2... " >&6; }
+if ${ac_cv_lib_bz2_BZ2_bzlibVersion+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
+LIBS="-lbz2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzlibVersion ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -33700,64 +35602,115 @@
 int
 main ()
 {
-return main ();
+return BZ2_bzlibVersion ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_main=yes
+  ac_cv_lib_bz2_BZ2_bzlibVersion=yes
 else
-  ac_cv_lib_z_main=no
+  ac_cv_lib_bz2_BZ2_bzlibVersion=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_main" >&5
-$as_echo "$ac_cv_lib_z_main" >&6; }
-if test "x$ac_cv_lib_z_main" = xyes; then :
-  have_png=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzlibVersion" >&5
+$as_echo "$ac_cv_lib_bz2_BZ2_bzlibVersion" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzlibVersion" = xyes; then :
+  have_bzlib=yes
 else
-  have_png=no
+  have_bzlib=no
 fi
 
-  if test "${have_png}" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpng version >= 1.2.7" >&5
-$as_echo_n "checking if libpng version >= 1.2.7... " >&6; }
-if ${r_cv_header_png_h+:} false; then :
+if test "${have_bzlib}" = yes; then
+  for ac_header in bzlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_bzlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BZLIB_H 1
+_ACEOF
+ have_bzlib=yes
+else
+  have_bzlib=no
+fi
+
+done
+
+fi
+if test "x${have_bzlib}" = xyes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bzip2 version >= 1.0.6" >&5
+$as_echo_n "checking if bzip2 version >= 1.0.6... " >&6; }
+if ${r_cv_have_bzlib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+r_save_LIBS="${LIBS}"
+LIBS="-lbz2 ${LIBS}"
+if test "$cross_compiling" = yes; then :
+  r_cv_have_bzlib=no
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <png.h>
-#if (PNG_LIBPNG_VER >= 10207)
-  yes
+
+#ifdef HAVE_BZLIB_H
+#include <bzlib.h>
 #endif
+int main() {
+    char *ver = BZ2_bzlibVersion();
+    exit(strcmp(ver, "1.0.6") < 0);
+}
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-  r_cv_header_png_h=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_have_bzlib=yes
 else
-  r_cv_header_png_h=no
+  r_cv_have_bzlib=no
 fi
-rm -f conftest*
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+LIBS="${r_save_LIBS}"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_png_h" >&5
-$as_echo "$r_cv_header_png_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_bzlib" >&5
+$as_echo "$r_cv_have_bzlib" >&6; }
+fi
+if test "x${r_cv_have_bzlib}" = xno; then
+  have_bzlib=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bzip2 support suffices" >&5
+$as_echo_n "checking whether bzip2 support suffices... " >&6; }
+if test "x${have_bzlib}" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  LIBS="-lbz2 ${LIBS}"
+else
+  as_fn_error $? "bzip2 library and headers are required" "$LINENO" 5
+fi
 
-    have_png=${r_cv_header_png_h}
-  fi
-  if test "${have_png}" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_write_struct in -lpng" >&5
-$as_echo_n "checking for png_create_write_struct in -lpng... " >&6; }
-if ${ac_cv_lib_png_png_create_write_struct+:} false; then :
+
+## LZMA headers and libraries from xz-utils
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_version_number in -llzma" >&5
+$as_echo_n "checking for lzma_version_number in -llzma... " >&6; }
+if ${ac_cv_lib_lzma_lzma_version_number+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng -lz ${LIBS} $LIBS"
+LIBS="-llzma  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -33767,7 +35720,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char png_create_write_struct ();
+char lzma_version_number ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -33779,38 +35732,819 @@
 int
 main ()
 {
-return png_create_write_struct ();
+return lzma_version_number ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_png_png_create_write_struct=yes
+  ac_cv_lib_lzma_lzma_version_number=yes
 else
-  ac_cv_lib_png_png_create_write_struct=no
+  ac_cv_lib_lzma_lzma_version_number=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_write_struct" >&5
-$as_echo "$ac_cv_lib_png_png_create_write_struct" >&6; }
-if test "x$ac_cv_lib_png_png_create_write_struct" = xyes; then :
-  have_png=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_version_number" >&5
+$as_echo "$ac_cv_lib_lzma_lzma_version_number" >&6; }
+if test "x$ac_cv_lib_lzma_lzma_version_number" = xyes; then :
+  have_lzma=yes
 else
-  have_png=no
+  have_lzma=no
 fi
 
-  fi
-  if test "${have_png}" = yes; then
-    BITMAP_LIBS="${BITMAP_LIBS} -lpng -lz"
+if test "${have_lzma}" = yes; then
+  for ac_header in lzma.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
+if test "x$ac_cv_header_lzma_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LZMA_H 1
+_ACEOF
+ have_lzma=yes
+else
+  have_lzma=no
+fi
+
+done
+
+fi
+if test "x${have_lzma}" = xyes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lzma version >= 5.0.3" >&5
+$as_echo_n "checking if lzma version >= 5.0.3... " >&6; }
+if ${r_cv_have_lzma+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+r_save_LIBS="${LIBS}"
+LIBS="-llzma ${LIBS}"
+if test "$cross_compiling" = yes; then :
+  r_cv_have_lzma=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_LZMA_H
+#include <lzma.h>
+#endif
+#include <stdlib.h>
+int main() {
+    unsigned int ver = lzma_version_number();
+    // This is 10000000*major + 10000*minor + 10*revision + [012]
+    // I.e. xyyyzzzs and 5.1.2 would be 50010020
+    exit(ver < 50000030);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_have_lzma=yes
+else
+  r_cv_have_lzma=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+LIBS="${r_save_LIBS}"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_lzma" >&5
+$as_echo "$r_cv_have_lzma" >&6; }
+fi
+if test "x${r_cv_have_lzma}" = xno; then
+  have_lzma=no
+fi
+if test "x${have_lzma}" = xyes; then
+
+$as_echo "#define HAVE_LZMA 1" >>confdefs.h
+
+  LIBS="-llzma ${LIBS}"
+else
+  as_fn_error $? "\"liblzma library and headers are required\"" "$LINENO" 5
+fi
+
+
+## PCRE headers and libraries.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_fullinfo in -lpcre" >&5
+$as_echo_n "checking for pcre_fullinfo in -lpcre... " >&6; }
+if ${ac_cv_lib_pcre_pcre_fullinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_fullinfo ();
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return pcre_fullinfo ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pcre_pcre_fullinfo=yes
+else
+  ac_cv_lib_pcre_pcre_fullinfo=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_fullinfo" >&5
+$as_echo "$ac_cv_lib_pcre_pcre_fullinfo" >&6; }
+if test "x$ac_cv_lib_pcre_pcre_fullinfo" = xyes; then :
+  have_pcre=yes
+else
+  have_pcre=no
+fi
+
+if test "${have_pcre}" = yes; then
+  for ac_header in pcre.h pcre/pcre.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+  if test "${ac_cv_header_pcre_h}" = no \
+    && test "${ac_cv_header_pcre_pcre_h}" = no; then
+    have_pcre=no
+  fi
+fi
+if test "x${have_pcre}" = xyes; then
+r_save_LIBS="${LIBS}"
+LIBS="-lpcre ${LIBS}"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PCRE version >= 8.10, < 10.0 and has UTF-8 support" >&5
+$as_echo_n "checking if PCRE version >= 8.10, < 10.0 and has UTF-8 support... " >&6; }
+if ${r_cv_have_pcre810+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  r_cv_have_pcre810=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
+#ifdef HAVE_PCRE_H
+#include <pcre.h>
+#endif
+#endif
+int main() {
+#ifdef PCRE_MAJOR
+#if PCRE_MAJOR > 8
+  exit(1);
+#elif PCRE_MAJOR == 8 && PCRE_MINOR >= 10
+{
+    int ans;
+    int res = pcre_config(PCRE_CONFIG_UTF8, &ans);
+    if (res || ans != 1) exit(1); else exit(0);
+}
+#else
+  exit(1);
+#endif
+#else
+  exit(1);
+#endif
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_have_pcre810=yes
+else
+  r_cv_have_pcre810=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_pcre810" >&5
+$as_echo "$r_cv_have_pcre810" >&6; }
+fi
+if test "x${r_cv_have_pcre810}" != xyes; then
+  have_pcre=no
+  LIBS="${r_save_LIBS}"
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PCRE version >= 8.32" >&5
+$as_echo_n "checking if PCRE version >= 8.32... " >&6; }
+if ${r_cv_have_pcre832+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  r_cv_have_pcre832=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
+#ifdef HAVE_PCRE_H
+#include <pcre.h>
+#endif
+#endif
+int main() {
+#if PCRE_MAJOR == 8 && PCRE_MINOR >= 32
+  exit(0);
+#else
+  exit(1);
+#endif
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_have_pcre832=yes
+else
+  r_cv_have_pcre832=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_pcre832" >&5
+$as_echo "$r_cv_have_pcre832" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether PCRE support suffices" >&5
+$as_echo_n "checking whether PCRE support suffices... " >&6; }
+if test "x${r_cv_have_pcre810}" != xyes; then
+  as_fn_error $? "pcre >= 8.10 library and headers are required" "$LINENO" 5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+if test "x${r_cv_have_pcre832}" != xyes; then
+  warn_pcre_version="pcre < 8.32 is deprecated"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${warn_pcre_version}" >&5
+$as_echo "$as_me: WARNING: ${warn_pcre_version}" >&2;}
+fi
+
+
+## tre headers and libraries.
+if test "x${use_system_tre}" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tre_regncompb in -ltre" >&5
+$as_echo_n "checking for tre_regncompb in -ltre... " >&6; }
+if ${ac_cv_lib_tre_tre_regncompb+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltre  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tre_regncompb ();
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return tre_regncompb ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_tre_tre_regncompb=yes
+else
+  ac_cv_lib_tre_tre_regncompb=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tre_tre_regncompb" >&5
+$as_echo "$ac_cv_lib_tre_tre_regncompb" >&6; }
+if test "x$ac_cv_lib_tre_tre_regncompb" = xyes; then :
+  have_tre=yes
+else
+  have_tre=no
+fi
+
+  if test "${have_tre}" = yes; then
+    for ac_header in tre/tre.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "tre/tre.h" "ac_cv_header_tre_tre_h" "$ac_includes_default"
+if test "x$ac_cv_header_tre_tre_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TRE_TRE_H 1
+_ACEOF
+ have_tre=yes
+else
+  have_tre=no
+fi
+
+done
+
+  fi
+if test "x${have_tre}" = xyes; then
+
+$as_echo "#define HAVE_TRE 1" >>confdefs.h
+
+  LIBS="-ltre ${LIBS}"
+fi
+else
+  have_tre="no"
+fi
+ if test x${have_tre} != xyes; then
+  BUILD_TRE_TRUE=
+  BUILD_TRE_FALSE='#'
+else
+  BUILD_TRE_TRUE='#'
+  BUILD_TRE_FALSE=
+fi
+
+
+
+## libcurl
+## curl-config might not match the installed libcurl,
+## so we allow the user to set CURL_CPPFLAGS, CURL_LIBS
+## and check the version directly rather than by curl-config --checkfor
+# Extract the first word of "curl-config", so it can be a program name with args.
+set dummy curl-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CURL_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CURL_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+CURL_CONFIG=$ac_cv_path_CURL_CONFIG
+if test -n "$CURL_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+$as_echo "$CURL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -n "${CURL_CONFIG}"; then
+  echo "checking libcurl version ..." \
+    `${CURL_CONFIG} --version | sed -e 's,^[^0-9]*,,'`
+  if test -z "${CURL_CPPFLAGS}"; then
+    CURL_CPPFLAGS=`${CURL_CONFIG} --cflags`
+  fi
+  ## This should be correct for a static-only build, user will
+  ## need to override to specify static linking (see config.site)
+  if test -z "${CURL_LIBS}"; then
+    CURL_LIBS=`${CURL_CONFIG} --libs`
+  fi
+fi
+r_save_CPPFLAGS="${CPPLAGS}"
+CPPFLAGS="${CURL_CPPFLAGS} ${CPPFLAGS}"
+r_save_LIBS="${LIBS}"
+LIBS="${CURL_LIBS} ${LIBS}"
+for ac_header in curl/curl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
+if test "x$ac_cv_header_curl_curl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CURL_CURL_H 1
+_ACEOF
+ have_libcurl=yes
+else
+  have_libcurl=no
+fi
+
+done
+
+
+if test "x${have_libcurl}" = "xyes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0" >&5
+$as_echo_n "checking if libcurl is version 7 and >= 7.28.0... " >&6; }
+if ${r_cv_have_curl728+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  r_cv_have_curl728=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <curl/curl.h>
+int main()
+{
+#ifdef LIBCURL_VERSION_MAJOR
+#if LIBCURL_VERSION_MAJOR > 7
+  exit(1);
+#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
+  exit(0);
+#else
+  exit(1);
+#endif
+#else
+  exit(1);
+#endif
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_have_curl728=yes
+else
+  r_cv_have_curl728=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_curl728" >&5
+$as_echo "$r_cv_have_curl728" >&6; }
+fi
+if test "x${r_cv_have_curl728}" = xno; then
+  have_libcurl=no
+fi
+
+if test "x${have_libcurl}" = "xyes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libcurl supports https" >&5
+$as_echo_n "checking if libcurl supports https... " >&6; }
+if ${r_cv_have_curl_https+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  r_cv_have_curl_https=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <string.h>
+#include <curl/curl.h>
+int main()
+{
+    curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+    const char * const *p  = data->protocols;
+    int found = 0;
+    for (; *p; p++)
+	if(strcmp(*p, "https") == 0) {found = 1; break;}
+    exit(found ? 0 : 1);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  r_cv_have_curl_https=yes
+else
+  r_cv_have_curl_https=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_curl_https" >&5
+$as_echo "$r_cv_have_curl_https" >&6; }
+fi
+if test "x${r_cv_have_curl_https}" = xno; then
+  have_libcurl=no
+fi
+if test "x${have_libcurl}" = xyes; then
+
+$as_echo "#define HAVE_LIBCURL 1" >>confdefs.h
+
+  CPPFLAGS="${r_save_CPPFLAGS}"
+  LIBS="${r_save_LIBS}"
+
+
+else
+  as_fn_error $? "libcurl >= 7.28.0 library and headers are required with support for https" "$LINENO" 5
+fi
+
+
+
+## Bitmap headers and libraries.
+if test -n "${PKGCONF}"; then
+BITMAP_CPPFLAGS=
+BITMAP_LIBS=
+if test "${use_jpeglib}" = yes; then
+   save_CPPFLAGS=${CPPFLAGS}
+  ## jpeglib does not support pkg-config, although some OSes add it.
+  ## This is untested.
+  if "${PKGCONF}" --exists jpeg; then
+    JPG_CPPFLAGS=`"${PKGCONF}" --cflags jpeg`
+    JPG_LIBS=`"${PKGCONF}" --libs jpeg`
+    CPPFLAGS="${CPPFLAGS} ${JPG_CPPFLAGS}"
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jpeglib version >= 6b" >&5
+$as_echo_n "checking if jpeglib version >= 6b... " >&6; }
+if ${r_cv_header_jpeglib_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <jpeglib.h>
+#if (JPEG_LIB_VERSION >= 62)
+  yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  r_cv_header_jpeglib_h=yes
+else
+  r_cv_header_jpeglib_h=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_jpeglib_h" >&5
+$as_echo "$r_cv_header_jpeglib_h" >&6; }
+
+  CPPFLAGS=${save_CPPFLAGS}
+  have_jpeg=${r_cv_header_jpeglib_h}
+  if test "${have_jpeg}" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg ${JPG_LIBS} ${LIBS} $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_destroy_compress ();
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return jpeg_destroy_compress ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jpeg_jpeg_destroy_compress=yes
+else
+  ac_cv_lib_jpeg_jpeg_destroy_compress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then :
+  have_jpeg=yes
+else
+  have_jpeg=no
+fi
+
+  fi
+  if test "${have_jpeg}" = yes; then
+    if test -n "${JPG_LIBS}"; then
+      BITMAP_LIBS="${JPG_LIBS}"
+    else
+      BITMAP_LIBS=-ljpeg
+    fi
+
+$as_echo "#define HAVE_JPEG 1" >>confdefs.h
+
+  fi
+fi
+if test "${use_libpng}" = yes; then
+  if "${PKGCONF}" --exists libpng; then
+    save_CPPFLAGS=${CPPFLAGS}
+    PNG_CPPFLAGS=`"${PKGCONF}" --cflags libpng`
+    CPPFLAGS="${CPPFLAGS} ${PNG_CPPFLAGS}"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpng version >= 1.2.7" >&5
+$as_echo_n "checking if libpng version >= 1.2.7... " >&6; }
+if ${r_cv_header_png_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <png.h>
+#if (PNG_LIBPNG_VER >= 10207)
+  yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  r_cv_header_png_h=yes
+else
+  r_cv_header_png_h=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_png_h" >&5
+$as_echo "$r_cv_header_png_h" >&6; }
+
+    have_png=${r_cv_header_png_h}
+    CPPFLAGS=${save_CPPFLAGS}
+    if test "${have_png}" = yes; then
+      PNG_LIBS=`"${PKGCONF}" --libs libpng`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_write_struct in -lpng" >&5
+$as_echo_n "checking for png_create_write_struct in -lpng... " >&6; }
+if ${ac_cv_lib_png_png_create_write_struct+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng ${PNG_LIBS} ${LIBS} $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_create_write_struct ();
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return png_create_write_struct ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_png_png_create_write_struct=yes
+else
+  ac_cv_lib_png_png_create_write_struct=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_write_struct" >&5
+$as_echo "$ac_cv_lib_png_png_create_write_struct" >&6; }
+if test "x$ac_cv_lib_png_png_create_write_struct" = xyes; then :
+  have_png=yes
+else
+  have_png=no
+fi
+
+      if test "${have_png}" = no; then
+        PNG_LIBS=`"${PKGCONF}" --static --libs libpng`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_write_struct in -lpng" >&5
+$as_echo_n "checking for png_create_write_struct in -lpng... " >&6; }
+if ${ac_cv_lib_png_png_create_write_struct+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng ${PNG_LIBS} ${LIBS} $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_create_write_struct ();
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return png_create_write_struct ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_png_png_create_write_struct=yes
+else
+  ac_cv_lib_png_png_create_write_struct=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_write_struct" >&5
+$as_echo "$ac_cv_lib_png_png_create_write_struct" >&6; }
+if test "x$ac_cv_lib_png_png_create_write_struct" = xyes; then :
+  have_png=yes
+else
+  have_png=no
+fi
+
+      fi
+    fi
+    if test "${have_png}" = yes; then
+      BITMAP_CPPFLAGS="${BITMAP_CPPFLAGS} ${PNG_CPPFLAGS}"
+      BITMAP_LIBS="${BITMAP_LIBS} ${PNG_LIBS}"
 
 $as_echo "#define HAVE_PNG 1" >>confdefs.h
 
+    fi
   fi
 fi
 if test "${use_libtiff}" = yes; then
-  for ac_header in tiffio.h
+  mod=
+  ## pkg-config support was introduced in libtiff 4.0.0
+  ## I guess the module name might change in future, so
+  ## program defensively here.
+  if "${PKGCONF}" --exists libtiff-4; then
+    mod=libtiff-4
+  fi
+  if test -n "${mod}"; then
+    save_CPPFLAGS=${CPPFLAGS}
+    TIF_CPPFLAGS=`"${PKGCONF}" --cflags ${mod}`
+    CPPFLAGS="${CPPFLAGS} ${TIF_CPPFLAGS}"
+    for ac_header in tiffio.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
 if test "x$ac_cv_header_tiffio_h" = xyes; then :
@@ -33822,15 +36556,16 @@
 
 done
 
-  if test "x${ac_cv_header_tiffio_h}" = xyes ; then
-    # may need to resolve jpeg routines
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
+    CPPFLAGS=${save_CPPFLAGS}
+    if test "x${ac_cv_header_tiffio_h}" = xyes ; then
+      TIF_LIBS=`"${PKGCONF}" --libs ${mod}`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
 $as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
 if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff ${BITMAP_LIBS} $LIBS"
+LIBS="-ltiff ${TIF_LIBS} ${BITMAP_LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -33874,21 +36609,15 @@
   have_tiff=no
 fi
 
-    if test "x${have_tiff}" = xyes; then
-
-$as_echo "#define HAVE_TIFF 1" >>confdefs.h
-
-      BITMAP_LIBS="-ltiff ${BITMAP_LIBS}"
-    else
-      # tiff 4.0.x may need lzma too: SU's static build does
-      unset ac_cv_lib_tiff_TIFFOpen
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
+      if test "x${have_tiff}" = xno; then
+        TIF_LIBS=`"${PKGCONF}" --static --libs ${mod}`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
 $as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
 if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff -llzma ${BITMAP_LIBS} -llzma $LIBS"
+LIBS="-ltiff ${TIF_LIBS} ${BITMAP_LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -33932,13 +36661,13 @@
   have_tiff=no
 fi
 
+      fi
       if test "x${have_tiff}" = xyes; then
 
 $as_echo "#define HAVE_TIFF 1" >>confdefs.h
 
-        BITMAP_LIBS="-ltiff -llzma ${BITMAP_LIBS}"
-      else
-        have_tiff=no
+        BITMAP_LIBS="${TIF_LIBS} ${BITMAP_LIBS}"
+        BITMAP_CPPFLAGS="${BITMAP_CPPFLAGS} ${TIF_CPPFLAGS}"
       fi
     fi
   fi
@@ -33946,82 +36675,44 @@
 
 
 
-## XDR headers and library routines.
-ac_fn_c_check_header_mongrel "$LINENO" "rpc/types.h" "ac_cv_header_rpc_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_rpc_types_h" = xyes; then :
-
-fi
-
-
-if test "${ac_cv_header_rpc_types_h}" = yes ; then
-  ac_fn_c_check_header_compile "$LINENO" "rpc/xdr.h" "ac_cv_header_rpc_xdr_h" "#include <rpc/types.h>
-"
-if test "x$ac_cv_header_rpc_xdr_h" = xyes; then :
-
-fi
-
-
-fi
-if test "${ac_cv_header_rpc_types_h}" = yes && \
-   test "${ac_cv_header_rpc_xdr_h}" = yes && \
-   test "${ac_cv_search_xdr_string}" != no ; then
-  r_xdr=yes
 else
-  r_xdr=no
-fi
-TIRPC_CPPFLAGS=
-if test "${r_xdr}" = no ; then
-  ## No RPC headers, so try for TI-RPC headers: need /usr/include/tirpc
-  ## on include path to find /usr/include/tirpc/netconfig.h
-  save_CPPFLAGS=${CPPFLAGS}
-  CPPFLAGS="${CPPFLAGS} -I/usr/include/tirpc"
-  ac_fn_c_check_header_mongrel "$LINENO" "tirpc/rpc/types.h" "ac_cv_header_tirpc_rpc_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_tirpc_rpc_types_h" = xyes; then :
-
-fi
-
-
-  if test "${ac_cv_header_tirpc_rpc_types_h}" = yes ; then
-    ac_fn_c_check_header_compile "$LINENO" "tirpc/rpc/xdr.h" "ac_cv_header_tirpc_rpc_xdr_h" "#include <tirpc/rpc/types.h>
-"
-if test "x$ac_cv_header_tirpc_rpc_xdr_h" = xyes; then :
-
-fi
-
+BITMAP_CPPFLAGS=
+BITMAP_LIBS=
+if test "${use_jpeglib}" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jpeglib version >= 6b" >&5
+$as_echo_n "checking if jpeglib version >= 6b... " >&6; }
+if ${r_cv_header_jpeglib_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <jpeglib.h>
+#if (JPEG_LIB_VERSION >= 62)
+  yes
+#endif
 
-  fi
-  if test "${ac_cv_header_tirpc_rpc_types_h}" = yes && \
-       test "${ac_cv_header_tirpc_rpc_xdr_h}" = yes &&
-       test "${ac_cv_search_xdr_string}" != no ; then
-    TIRPC_CPPFLAGS=-I/usr/include/tirpc
-    r_xdr=yes
-  fi
-  CPPFLAGS="${save_CPPFLAGS}"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDR support" >&5
-$as_echo_n "checking for XDR support... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${r_xdr}" >&5
-$as_echo "${r_xdr}" >&6; }
- if test "x${r_xdr}" = xno; then
-  BUILD_XDR_TRUE=
-  BUILD_XDR_FALSE='#'
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  r_cv_header_jpeglib_h=yes
 else
-  BUILD_XDR_TRUE='#'
-  BUILD_XDR_FALSE=
+  r_cv_header_jpeglib_h=no
 fi
+rm -f conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_jpeglib_h" >&5
+$as_echo "$r_cv_header_jpeglib_h" >&6; }
 
-
-
-## zlib headers and libraries.
-if test "x${use_system_zlib}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateInit2_ in -lz" >&5
-$as_echo_n "checking for inflateInit2_ in -lz... " >&6; }
-if ${ac_cv_lib_z_inflateInit2_+:} false; then :
+  have_jpeg=${r_cv_header_jpeglib_h}
+  if test "${have_jpeg}" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
+LIBS="-ljpeg ${LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -34031,7 +36722,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char inflateInit2_ ();
+char jpeg_destroy_compress ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -34043,162 +36734,48 @@
 int
 main ()
 {
-return inflateInit2_ ();
+return jpeg_destroy_compress ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_inflateInit2_=yes
+  ac_cv_lib_jpeg_jpeg_destroy_compress=yes
 else
-  ac_cv_lib_z_inflateInit2_=no
+  ac_cv_lib_jpeg_jpeg_destroy_compress=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateInit2_" >&5
-$as_echo "$ac_cv_lib_z_inflateInit2_" >&6; }
-if test "x$ac_cv_lib_z_inflateInit2_" = xyes; then :
-  have_zlib=yes
-else
-  have_zlib=no
-fi
-
-  if test "${have_zlib}" = yes; then
-    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
-  have_zlib=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then :
+  have_jpeg=yes
 else
-  have_zlib=no
+  have_jpeg=no
 fi
 
-
   fi
-  if test "${have_zlib}" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if zlib version >= 1.2.5" >&5
-$as_echo_n "checking if zlib version >= 1.2.5... " >&6; }
-if ${r_cv_header_zlib_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  r_cv_header_zlib_h=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <string.h>
-#include <zlib.h>
-int main() {
-#ifdef ZLIB_VERSION
-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
-   version on the master site zlib.net */
-  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
-#else
-  exit(1);
-#endif
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  r_cv_header_zlib_h=yes
-else
-  r_cv_header_zlib_h=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+  if test "${have_jpeg}" = yes; then
+    BITMAP_LIBS="-ljpeg"
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_zlib_h" >&5
-$as_echo "$r_cv_header_zlib_h" >&6; }
+$as_echo "#define HAVE_JPEG 1" >>confdefs.h
 
-    have_zlib=${r_cv_header_zlib_h}
   fi
-else
-  have_zlib="no"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether zlib support needs to be compiled" >&5
-$as_echo_n "checking whether zlib support needs to be compiled... " >&6; }
-if test "${have_zlib}" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  LIBS="-lz ${LIBS}"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking mmap support for zlib" >&5
-$as_echo_n "checking mmap support for zlib... " >&6; }
-if ${r_cv_zlib_mmap+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  r_cv_zlib_mmap=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-caddr_t hello() {
-  exit(mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0));
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  r_cv_zlib_mmap=no
-else
-  r_cv_zlib_mmap=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_zlib_mmap" >&5
-$as_echo "$r_cv_zlib_mmap" >&6; }
-
-fi
- if test "x${have_zlib}" = xno; then
-  BUILD_ZLIB_TRUE=
-  BUILD_ZLIB_FALSE='#'
-else
-  BUILD_ZLIB_TRUE='#'
-  BUILD_ZLIB_FALSE=
-fi
-
- if test "x${have_zlib}" = xno && test "x${r_cv_zlib_mmap}" = xyes; then
-  USE_MMAP_ZLIB_TRUE=
-  USE_MMAP_ZLIB_FALSE='#'
-else
-  USE_MMAP_ZLIB_TRUE='#'
-  USE_MMAP_ZLIB_FALSE=
 fi
-
-
-
-## bzlib headers and libraries.
-if test "x${use_system_bzlib}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzlibVersion in -lbz2" >&5
-$as_echo_n "checking for BZ2_bzlibVersion in -lbz2... " >&6; }
-if ${ac_cv_lib_bz2_BZ2_bzlibVersion+:} false; then :
+if test "${use_libpng}" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
+$as_echo_n "checking for main in -lz... " >&6; }
+if ${ac_cv_lib_z_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbz2  $LIBS"
+LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char BZ2_bzlibVersion ();
+
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -34210,128 +36787,64 @@
 int
 main ()
 {
-return BZ2_bzlibVersion ();
+return main ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_bz2_BZ2_bzlibVersion=yes
+  ac_cv_lib_z_main=yes
 else
-  ac_cv_lib_bz2_BZ2_bzlibVersion=no
+  ac_cv_lib_z_main=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzlibVersion" >&5
-$as_echo "$ac_cv_lib_bz2_BZ2_bzlibVersion" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzlibVersion" = xyes; then :
-  have_bzlib=yes
-else
-  have_bzlib=no
-fi
-
-  if test "${have_bzlib}" = yes; then
-    for ac_header in bzlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_bzlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BZLIB_H 1
-_ACEOF
- have_bzlib=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_main" >&5
+$as_echo "$ac_cv_lib_z_main" >&6; }
+if test "x$ac_cv_lib_z_main" = xyes; then :
+  have_png=yes
 else
-  have_bzlib=no
+  have_png=no
 fi
 
-done
-
-  fi
-else
-  have_bzlib=no
-fi
-if test "x${have_bzlib}" = xyes; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bzip2 version >= 1.0.6" >&5
-$as_echo_n "checking if bzip2 version >= 1.0.6... " >&6; }
-if ${r_cv_have_bzlib+:} false; then :
+  if test "${have_png}" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpng version >= 1.2.7" >&5
+$as_echo_n "checking if libpng version >= 1.2.7... " >&6; }
+if ${r_cv_header_png_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-r_save_LIBS="${LIBS}"
-LIBS="-lbz2 ${LIBS}"
-if test "$cross_compiling" = yes; then :
-  r_cv_have_bzlib=no
-else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <png.h>
+#if (PNG_LIBPNG_VER >= 10207)
+  yes
 #endif
-int main() {
-    char *ver = BZ2_bzlibVersion();
-    exit(strcmp(ver, "1.0.6") < 0);
-}
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  r_cv_have_bzlib=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  r_cv_header_png_h=yes
 else
-  r_cv_have_bzlib=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  r_cv_header_png_h=no
 fi
+rm -f conftest*
 
-LIBS="${r_save_LIBS}"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_bzlib" >&5
-$as_echo "$r_cv_have_bzlib" >&6; }
-fi
-if test "x${r_cv_have_bzlib}" = xno; then
-  have_bzlib=no
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bzip2 support needs to be compiled" >&5
-$as_echo_n "checking whether bzip2 support needs to be compiled... " >&6; }
-if test "x${have_bzlib}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  LIBS="-lbz2 ${LIBS}"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
- if test "x${have_bzlib}" = xno; then
-  BUILD_BZLIB_TRUE=
-  BUILD_BZLIB_FALSE='#'
-else
-  BUILD_BZLIB_TRUE='#'
-  BUILD_BZLIB_FALSE=
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_header_png_h" >&5
+$as_echo "$r_cv_header_png_h" >&6; }
 
-
-
-## LZMA headers and libraries from xz-utils
-if test "x${use_system_xz}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_version_number in -llzma" >&5
-$as_echo_n "checking for lzma_version_number in -llzma... " >&6; }
-if ${ac_cv_lib_lzma_lzma_version_number+:} false; then :
+    have_png=${r_cv_header_png_h}
+  fi
+  if test "${have_png}" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_write_struct in -lpng" >&5
+$as_echo_n "checking for png_create_write_struct in -lpng... " >&6; }
+if ${ac_cv_lib_png_png_create_write_struct+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-llzma  $LIBS"
+LIBS="-lpng -lz ${LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -34341,7 +36854,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char lzma_version_number ();
+char png_create_write_struct ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -34353,127 +36866,58 @@
 int
 main ()
 {
-return lzma_version_number ();
+return png_create_write_struct ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lzma_lzma_version_number=yes
+  ac_cv_lib_png_png_create_write_struct=yes
 else
-  ac_cv_lib_lzma_lzma_version_number=no
+  ac_cv_lib_png_png_create_write_struct=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_version_number" >&5
-$as_echo "$ac_cv_lib_lzma_lzma_version_number" >&6; }
-if test "x$ac_cv_lib_lzma_lzma_version_number" = xyes; then :
-  have_lzma=yes
-else
-  have_lzma=no
-fi
-
-  if test "${have_lzma}" = yes; then
-    for ac_header in lzma.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
-if test "x$ac_cv_header_lzma_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LZMA_H 1
-_ACEOF
- have_lzma=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_write_struct" >&5
+$as_echo "$ac_cv_lib_png_png_create_write_struct" >&6; }
+if test "x$ac_cv_lib_png_png_create_write_struct" = xyes; then :
+  have_png=yes
 else
-  have_lzma=no
+  have_png=no
 fi
 
-done
-
   fi
-if test "x${have_lzma}" = xyes; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lzma version >= 5.0.3" >&5
-$as_echo_n "checking if lzma version >= 5.0.3... " >&6; }
-if ${r_cv_have_lzma+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-r_save_LIBS="${LIBS}"
-LIBS="-llzma ${LIBS}"
-if test "$cross_compiling" = yes; then :
-  r_cv_have_lzma=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef HAVE_LZMA_H
-#include <lzma.h>
-#endif
-#include <stdlib.h>
-int main() {
-    unsigned int ver = lzma_version_number();
-    // This is 10000000*major + 10000*minor + 10*revision + [012]
-    // I.e. xyyyzzzs and 5.1.2 would be 50010020
-    exit(ver < 50000030);
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  r_cv_have_lzma=yes
-else
-  r_cv_have_lzma=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+  if test "${have_png}" = yes; then
+    BITMAP_LIBS="${BITMAP_LIBS} -lpng -lz"
 
-LIBS="${r_save_LIBS}"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+$as_echo "#define HAVE_PNG 1" >>confdefs.h
 
+  fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_lzma" >&5
-$as_echo "$r_cv_have_lzma" >&6; }
-fi
-if test "x${r_cv_have_lzma}" = xno; then
-  have_lzma=no
-fi
-if test "x${have_lzma}" = xyes; then
-
-$as_echo "#define HAVE_LZMA 1" >>confdefs.h
+if test "${use_libtiff}" = yes; then
+  for ac_header in tiffio.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TIFFIO_H 1
+_ACEOF
 
-  LIBS="-llzma ${LIBS}"
-fi
-else
-  have_lzma="no"
-fi
- if test x${have_lzma} != xyes; then
-  BUILD_XZ_TRUE=
-  BUILD_XZ_FALSE='#'
-else
-  BUILD_XZ_TRUE='#'
-  BUILD_XZ_FALSE=
 fi
 
+done
 
-
-## PCRE headers and libraries.
-if test "x${use_system_pcre}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_fullinfo in -lpcre" >&5
-$as_echo_n "checking for pcre_fullinfo in -lpcre... " >&6; }
-if ${ac_cv_lib_pcre_pcre_fullinfo+:} false; then :
+  if test "x${ac_cv_header_tiffio_h}" = xyes ; then
+    # may need to resolve jpeg routines
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcre  $LIBS"
+LIBS="-ltiff ${BITMAP_LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -34483,7 +36927,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char pcre_fullinfo ();
+char TIFFOpen ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -34495,135 +36939,43 @@
 int
 main ()
 {
-return pcre_fullinfo ();
+return TIFFOpen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pcre_pcre_fullinfo=yes
+  ac_cv_lib_tiff_TIFFOpen=yes
 else
-  ac_cv_lib_pcre_pcre_fullinfo=no
+  ac_cv_lib_tiff_TIFFOpen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_fullinfo" >&5
-$as_echo "$ac_cv_lib_pcre_pcre_fullinfo" >&6; }
-if test "x$ac_cv_lib_pcre_pcre_fullinfo" = xyes; then :
-  have_pcre=yes
-else
-  have_pcre=no
-fi
-
-  if test "${have_pcre}" = yes; then
-    for ac_header in pcre.h pcre/pcre.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    if test "${ac_cv_header_pcre_h}" = no \
-	&& test "${ac_cv_header_pcre_pcre_h}" = no; then
-      have_pcre=no
-    fi
-  fi
-else
-  have_pcre=no
-fi
-r_save_LIBS="${LIBS}"
-if test "x${have_pcre}" = xyes; then
-LIBS="-lpcre ${LIBS}"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PCRE version >= 8.10, < 10.0 and has UTF-8 support" >&5
-$as_echo_n "checking if PCRE version >= 8.10, < 10.0 and has UTF-8 support... " >&6; }
-if ${r_cv_have_pcre810+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  r_cv_have_pcre810=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef HAVE_PCRE_PCRE_H
-#include <pcre/pcre.h>
-#else
-#ifdef HAVE_PCRE_H
-#include <pcre.h>
-#endif
-#endif
-int main() {
-#ifdef PCRE_MAJOR
-#if PCRE_MAJOR > 8
-  exit(1);
-#elif PCRE_MAJOR == 8 && PCRE_MINOR >= 10
-{
-    int ans;
-    int res = pcre_config(PCRE_CONFIG_UTF8, &ans);
-    if (res || ans != 1) exit(1); else exit(0);
-}
-#else
-  exit(1);
-#endif
-#else
-  exit(1);
-#endif
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  r_cv_have_pcre810=yes
-else
-  r_cv_have_pcre810=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_pcre810" >&5
-$as_echo "$r_cv_have_pcre810" >&6; }
-fi
-if test "x${r_cv_have_pcre810}" != xyes; then
-  have_pcre=no
-  LIBS="${r_save_LIBS}"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether PCRE support needs to be compiled" >&5
-$as_echo_n "checking whether PCRE support needs to be compiled... " >&6; }
-if test "x${r_cv_have_pcre810}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
- if test "x${r_cv_have_pcre810}" != xyes; then
-  BUILD_PCRE_TRUE=
-  BUILD_PCRE_FALSE='#'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then :
+  have_tiff=yes
 else
-  BUILD_PCRE_TRUE='#'
-  BUILD_PCRE_FALSE=
+  have_tiff=no
 fi
 
+    if test "x${have_tiff}" = xyes; then
 
+$as_echo "#define HAVE_TIFF 1" >>confdefs.h
 
-## tre headers and libraries.
-if test "x${use_system_tre}" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tre_regncompb in -ltre" >&5
-$as_echo_n "checking for tre_regncompb in -ltre... " >&6; }
-if ${ac_cv_lib_tre_tre_regncompb+:} false; then :
+      BITMAP_LIBS="-ltiff ${BITMAP_LIBS}"
+    else
+      # tiff 4.0.x may need lzma too: SU's static build does
+      unset ac_cv_lib_tiff_TIFFOpen
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltre  $LIBS"
+LIBS="-ltiff -llzma ${BITMAP_LIBS} -llzma $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -34633,7 +36985,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char tre_regncompb ();
+char TIFFOpen ();
 #ifdef F77_DUMMY_MAIN
 
 #  ifdef __cplusplus
@@ -34645,185 +36997,43 @@
 int
 main ()
 {
-return tre_regncompb ();
+return TIFFOpen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_tre_tre_regncompb=yes
+  ac_cv_lib_tiff_TIFFOpen=yes
 else
-  ac_cv_lib_tre_tre_regncompb=no
+  ac_cv_lib_tiff_TIFFOpen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tre_tre_regncompb" >&5
-$as_echo "$ac_cv_lib_tre_tre_regncompb" >&6; }
-if test "x$ac_cv_lib_tre_tre_regncompb" = xyes; then :
-  have_tre=yes
-else
-  have_tre=no
-fi
-
-  if test "${have_tre}" = yes; then
-    for ac_header in tre/tre.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "tre/tre.h" "ac_cv_header_tre_tre_h" "$ac_includes_default"
-if test "x$ac_cv_header_tre_tre_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TRE_TRE_H 1
-_ACEOF
- have_tre=yes
-else
-  have_tre=no
-fi
-
-done
-
-  fi
-if test "x${have_tre}" = xyes; then
-
-$as_echo "#define HAVE_TRE 1" >>confdefs.h
-
-  LIBS="-ltre ${LIBS}"
-fi
-else
-  have_tre="no"
-fi
- if test x${have_tre} != xyes; then
-  BUILD_TRE_TRUE=
-  BUILD_TRE_FALSE='#'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then :
+  have_tiff=yes
 else
-  BUILD_TRE_TRUE='#'
-  BUILD_TRE_FALSE=
+  have_tiff=no
 fi
 
+      if test "x${have_tiff}" = xyes; then
 
+$as_echo "#define HAVE_TIFF 1" >>confdefs.h
 
-## libcurl
-## curl-config might not match the installed libcurl,
-## so we allow the user to set CURL_CPPFLAGS, CURL_LIBS
-## and check the version directly rather than by curl-config --checkfor
-# Extract the first word of "curl-config", so it can be a program name with args.
-set dummy curl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CURL_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CURL_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CURL_CONFIG=$ac_cv_path_CURL_CONFIG
-if test -n "$CURL_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
-$as_echo "$CURL_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -n "${CURL_CONFIG}"; then
-  echo `${CURL_CONFIG} --version`
-  if test -z "${CURL_CPPFLAGS}"; then
-    CURL_CPPFLAGS=`${CURL_CONFIG} --cflags`
-  fi
-  ## This should be correct for a static-only build, user will
-  ## need to override to specify static linking (see config.site)
-  if test -z "${CURL_LIBS}"; then
-    CURL_LIBS=`${CURL_CONFIG} --libs`
+        BITMAP_LIBS="-ltiff -llzma ${BITMAP_LIBS}"
+      else
+        have_tiff=no
+      fi
+    fi
   fi
 fi
-r_save_CPPFLAGS="${CPPLAGS}"
-CPPFLAGS="${CURL_CPPFLAGS} ${CPPFLAGS}"
-r_save_LIBS="${LIBS}"
-LIBS="${CURL_LIBS} ${LIBS}"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libcurl version >= 7.28.0" >&5
-$as_echo_n "checking if libcurl version >= 7.28.0... " >&6; }
-if ${r_cv_have_curl728+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  r_cv_have_curl728=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <curl/curl.h>
-int main()
-{
-#ifdef LIBCURL_VERSION_MAJOR
-#if LIBCURL_VERSION_MAJOR > 7
-  exit(0);
-#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
-  exit(0);
-#else
-  exit(1);
-#endif
-#else
-  exit(1);
-#endif
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  r_cv_have_curl728=yes
-else
-  r_cv_have_curl728=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_curl728" >&5
-$as_echo "$r_cv_have_curl728" >&6; }
-if test "x${r_cv_have_curl728}" != xyes; then
-  ac_cv_have_curl_curl_h=0
-  CURL_CPPFLAGS=
-  CURL_LIBS=
-else
-  for ac_header in curl/curl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
-if test "x$ac_cv_header_curl_curl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CURL_CURL_H 1
-_ACEOF
 
-fi
 
-done
 
 fi
-CPPFLAGS="${r_save_CPPFLAGS}"
-LIBS="${r_save_LIBS}"
-
-
 
 ## POSIX times.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether leap seconds are treated according to POSIX" >&5
@@ -35499,9 +37709,11 @@
 
 #include "confdefs.h"
 #include <stdlib.h>
+/* This might get optimized out if not used */
 extern void * __libc_stack_end;
 
 int main () {
+    if(!__libc_stack_end) exit(1);
     exit(0);
 }
 
@@ -35868,230 +38080,16 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
-ac_ext=${ac_fc_srcext-f}
+      ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FC"; then
-  ac_cv_prog_FC="$FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$FC" && break
-  done
-fi
-if test -z "$FC"; then
-  ac_ct_FC=$FC
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_FC"; then
-  ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FC=$ac_cv_prog_ac_ct_FC
-if test -n "$ac_ct_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
-$as_echo "$ac_ct_FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_FC" && break
-done
-
-  if test "x$ac_ct_FC" = x; then
-    FC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FC=$ac_ct_FC
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
-if ${ac_cv_fc_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_fc_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
-$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FCFLAGS=${FCFLAGS+set}
-ac_save_FCFLAGS=$FCFLAGS
-FCFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
-$as_echo_n "checking whether $FC accepts -g... " >&6; }
-if ${ac_cv_prog_fc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  FCFLAGS=-g
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_cv_prog_fc_g=yes
-else
-  ac_cv_prog_fc_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
-$as_echo "$ac_cv_prog_fc_g" >&6; }
-if test "$ac_test_FCFLAGS" = set; then
-  FCFLAGS=$ac_save_FCFLAGS
-elif test $ac_cv_prog_fc_g = yes; then
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-g -O2"
-  else
-    FCFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-O2"
-  else
-    FCFLAGS=
-  fi
-fi
 
-if test $ac_compiler_gnu = yes; then
-  GFC=yes
-else
-  GFC=
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
   _lt_disable_FC=yes
 fi
 
-
-
-      ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
 archive_cmds_need_lc_FC=no
 allow_undefined_flag_FC=
 always_export_symbols_FC=no
@@ -36100,7 +38098,6 @@
 hardcode_direct_FC=no
 hardcode_direct_absolute_FC=no
 hardcode_libdir_flag_spec_FC=
-hardcode_libdir_flag_spec_ld_FC=
 hardcode_libdir_separator_FC=
 hardcode_minus_L_FC=no
 hardcode_automatic_FC=no
@@ -36109,6 +38106,8 @@
 module_expsym_cmds_FC=
 link_all_deplibs_FC=unknown
 old_archive_cmds_FC=$old_archive_cmds
+reload_flag_FC=$reload_flag
+reload_cmds_FC=$reload_cmds
 no_undefined_flag_FC=
 whole_archive_flag_spec_FC=
 enable_shared_with_static_runtimes_FC=no
@@ -36124,7 +38123,7 @@
 # the FC compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -36170,22 +38169,17 @@
 
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
   compiler_FC=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
   if test -n "$compiler"; then
@@ -36196,21 +38190,25 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix[4-9]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -36220,12 +38218,12 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
-    GCC_FC="$ac_cv_fc_compiler_gnu"
-    LD_FC="$LD"
+    GCC_FC=$ac_cv_fc_compiler_gnu
+    LD_FC=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -36247,6 +38245,14 @@
       end
 _LT_EOF
 
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -36260,29 +38266,38 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case $prev$p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
        # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
 	   if test -z "$compiler_lib_search_path_FC"; then
-	     compiler_lib_search_path_FC="${prev}${p}"
+	     compiler_lib_search_path_FC=$prev$p
 	   else
-	     compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}"
+	     compiler_lib_search_path_FC="${compiler_lib_search_path_FC} $prev$p"
 	   fi
 	   ;;
 	 # The "-l" case would never come before the object being
@@ -36290,13 +38305,15 @@
 	 esac
        else
 	 if test -z "$postdeps_FC"; then
-	   postdeps_FC="${prev}${p}"
+	   postdeps_FC=$prev$p
 	 else
-	   postdeps_FC="${postdeps_FC} ${prev}${p}"
+	   postdeps_FC="${postdeps_FC} $prev$p"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -36305,15 +38322,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$predep_objects_FC"; then
-	   predep_objects_FC="$p"
+	   predep_objects_FC=$p
 	 else
 	   predep_objects_FC="$predep_objects_FC $p"
 	 fi
        else
 	 if test -z "$postdep_objects_FC"; then
-	   postdep_objects_FC="$p"
+	   postdep_objects_FC=$p
 	 else
 	   postdep_objects_FC="$postdep_objects_FC $p"
 	 fi
@@ -36332,6 +38349,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 
@@ -36341,7 +38359,7 @@
 esac
  compiler_lib_search_dirs_FC=
 if test -n "${compiler_lib_search_path_FC}"; then
- compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 
 
@@ -36360,20 +38378,19 @@
 lt_prog_compiler_pic_FC=
 lt_prog_compiler_static_FC=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     lt_prog_compiler_wl_FC='-Wl,'
     lt_prog_compiler_static_FC='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static_FC='-Bstatic'
       fi
+      lt_prog_compiler_pic_FC='-fPIC'
       ;;
 
     amigaos*)
@@ -36384,8 +38401,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -36401,6 +38418,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic_FC='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_FC='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -36409,6 +38431,12 @@
       lt_prog_compiler_pic_FC='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_FC=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -36451,12 +38479,21 @@
       lt_prog_compiler_pic_FC='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl_FC='-Xlinker '
+      if test -n "$lt_prog_compiler_pic_FC"; then
+        lt_prog_compiler_pic_FC="-Xcompiler $lt_prog_compiler_pic_FC"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       lt_prog_compiler_wl_FC='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static_FC='-Bstatic'
       else
@@ -36464,10 +38501,29 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_FC='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl_FC='-Wl,-Wl,,'
+        lt_prog_compiler_pic_FC='-PIC'
+        lt_prog_compiler_static_FC='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_FC='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_FC='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -36483,7 +38539,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_FC='${wl}-a ${wl}archive'
+      lt_prog_compiler_static_FC='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -36492,9 +38548,9 @@
       lt_prog_compiler_static_FC='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl_FC='-Wl,'
 	lt_prog_compiler_pic_FC='-KPIC'
@@ -36513,7 +38569,19 @@
 	lt_prog_compiler_pic_FC='--shared'
 	lt_prog_compiler_static_FC='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl_FC='-Wl,-Wl,,'
+	lt_prog_compiler_pic_FC='-PIC'
+	lt_prog_compiler_static_FC='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl_FC='-Wl,'
+	lt_prog_compiler_pic_FC='-fPIC'
+	lt_prog_compiler_static_FC='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl_FC='-Wl,'
@@ -36525,25 +38593,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_FC='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl_FC='-Wl,'
 	lt_prog_compiler_pic_FC='-qpic'
 	lt_prog_compiler_static_FC='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_FC='-KPIC'
+	  lt_prog_compiler_static_FC='-Bstatic'
+	  lt_prog_compiler_wl_FC=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic_FC='-KPIC'
+	  lt_prog_compiler_static_FC='-Bstatic'
+	  lt_prog_compiler_wl_FC='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic_FC='-KPIC'
 	  lt_prog_compiler_static_FC='-Bstatic'
 	  lt_prog_compiler_wl_FC='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_FC='-KPIC'
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl_FC='-Wl,'
+	  lt_prog_compiler_pic_FC='-fPIC'
+	  lt_prog_compiler_static_FC='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl_FC='-Wl,'
+	  lt_prog_compiler_pic_FC='-fpic'
 	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC=''
 	  ;;
 	esac
 	;;
@@ -36575,7 +38658,7 @@
       lt_prog_compiler_pic_FC='-KPIC'
       lt_prog_compiler_static_FC='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl_FC='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl_FC='-Wl,';;
@@ -36595,7 +38678,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic_FC='-Kconform_pic'
 	lt_prog_compiler_static_FC='-Bstatic'
       fi
@@ -36624,7 +38707,7 @@
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_FC=
     ;;
@@ -36632,10 +38715,17 @@
     lt_prog_compiler_pic_FC="$lt_prog_compiler_pic_FC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_FC" >&5
-$as_echo "$lt_prog_compiler_pic_FC" >&6; }
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_FC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_FC=$lt_prog_compiler_pic_FC
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_FC" >&5
+$as_echo "$lt_cv_prog_compiler_pic_FC" >&6; }
+lt_prog_compiler_pic_FC=$lt_cv_prog_compiler_pic_FC
 
 #
 # Check to make sure the PIC flag actually works.
@@ -36649,7 +38739,7 @@
   lt_cv_prog_compiler_pic_works_FC=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_FC"
+   lt_compiler_flag="$lt_prog_compiler_pic_FC"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -36659,15 +38749,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:36662: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:36666: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_FC=yes
@@ -36679,7 +38769,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_FC"; then
     case $lt_prog_compiler_pic_FC in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;;
@@ -36693,6 +38783,8 @@
 
 
 
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -36703,7 +38795,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_FC=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -36712,7 +38804,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_FC=yes
@@ -36722,13 +38814,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_FC" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_FC"; then
     :
 else
     lt_prog_compiler_static_FC=
@@ -36758,16 +38850,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:36761: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:36765: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_FC=yes
@@ -36810,16 +38902,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:36813: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:36817: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_FC=yes
@@ -36842,8 +38934,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_FC" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -36855,9 +38947,9 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -36882,7 +38974,6 @@
   hardcode_direct_FC=no
   hardcode_direct_absolute_FC=no
   hardcode_libdir_flag_spec_FC=
-  hardcode_libdir_flag_spec_ld_FC=
   hardcode_libdir_separator_FC=
   hardcode_minus_L_FC=no
   hardcode_shlibpath_var_FC=unsupported
@@ -36898,9 +38989,9 @@
   # included in the symbol list
   include_expsyms_FC=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
   exclude_expsyms_FC='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -36915,7 +39006,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -36923,30 +39014,57 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
 
   ld_shlibs_FC=yes
-  if test "$with_gnu_ld" = yes; then
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec_FC='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec_FC='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      whole_archive_flag_spec_FC=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec_FC=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -36958,15 +39076,16 @@
     case $host_os in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs_FC=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -36976,7 +39095,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds_FC=''
         ;;
       m68k)
@@ -36992,7 +39111,7 @@
 	allow_undefined_flag_FC=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs_FC=no
       fi
@@ -37002,61 +39121,97 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec_FC='-L$libdir'
+      export_dynamic_flag_spec_FC='$wl--export-all-symbols'
       allow_undefined_flag_FC=unsupported
       always_export_symbols_FC=no
       enable_shared_with_static_runtimes_FC=yes
-      export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_FC='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds_FC='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs_FC=no
       fi
       ;;
 
+    haiku*)
+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs_FC=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_FC='-L$libdir'
+      hardcode_minus_L_FC=yes
+      allow_undefined_flag_FC=unsupported
+      shrext_cmds=.dll
+      archive_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes_FC=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct_FC=no
       hardcode_shlibpath_var_FC=no
-      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_FC='${wl}-E'
+      hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
+      export_dynamic_flag_spec_FC='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_FC='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_FC='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -37067,39 +39222,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec_FC=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object_FC=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec_FC='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object_FC=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
-	xlf*)
+	tcc*)
+	  export_dynamic_flag_spec_FC='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec_FC=
-	  hardcode_libdir_flag_spec_ld_FC='-rpath $libdir'
-	  archive_cmds_FC='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
+	  archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -37113,8 +39276,8 @@
 	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -37132,8 +39295,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_FC=no
       fi
@@ -37145,7 +39308,7 @@
 	ld_shlibs_FC=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -37160,9 +39323,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-	    archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
+	    archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs_FC=no
 	  fi
@@ -37179,15 +39342,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_FC=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs_FC" = no; then
+    if test no = "$ld_shlibs_FC"; then
       runpath_var=
       hardcode_libdir_flag_spec_FC=
       export_dynamic_flag_spec_FC=
@@ -37203,7 +39366,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_FC=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_FC=unsupported
@@ -37211,32 +39374,57 @@
       ;;
 
     aix[4-9]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds_FC='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -37255,13 +39443,21 @@
       hardcode_direct_absolute_FC=yes
       hardcode_libdir_separator_FC=':'
       link_all_deplibs_FC=yes
-      file_list_spec_FC='${wl}-f,'
+      file_list_spec_FC='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct_FC=no
+	hardcode_direct_absolute_FC=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -37280,102 +39476,152 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec_FC='${wl}-bexpall'
+      export_dynamic_flag_spec_FC='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols_FC=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag_FC='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat > conftest.$ac_ext <<_ACEOF
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__FC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
 if ac_fn_fc_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__FC"; then
+    lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__FC"; then
+    lt_cv_aix_libpath__FC=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__FC
+fi
 
-        hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec_FC='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_FC="-z nodefs"
-	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat > conftest.$ac_ext <<_ACEOF
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__FC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
 if ac_fn_fc_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__FC"; then
+    lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__FC"; then
+    lt_cv_aix_libpath__FC=/usr/lib:/lib
+  fi
+
+fi
 
-	 hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
+  aix_libpath=$lt_cv_aix_libpath__FC
+fi
+
+	 hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_FC=' ${wl}-bernotok'
-	  allow_undefined_flag_FC=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_FC='$convenience'
+	  no_undefined_flag_FC=' $wl-bernotok'
+	  allow_undefined_flag_FC=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec_FC='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_FC='$convenience'
+	  fi
 	  archive_cmds_need_lc_FC=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  archive_expsym_cmds_FC='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -37384,7 +39630,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds_FC=''
         ;;
       m68k)
@@ -37404,20 +39650,65 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec_FC=' '
-      allow_undefined_flag_FC=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_FC='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds_FC='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_FC='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_FC=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec_FC=' '
+	allow_undefined_flag_FC=unsupported
+	always_export_symbols_FC=yes
+	file_list_spec_FC='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds_FC='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, FC)='true'
+	enable_shared_with_static_runtimes_FC=yes
+	exclude_expsyms_FC='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds_FC='chmod 644 $oldlib'
+	postlink_cmds_FC='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec_FC=' '
+	allow_undefined_flag_FC=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds_FC='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds_FC='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes_FC=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -37427,19 +39718,24 @@
   hardcode_direct_FC=no
   hardcode_automatic_FC=yes
   hardcode_shlibpath_var_FC=unsupported
-  whole_archive_flag_spec_FC=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    compiler_needs_object_FC=yes
+  else
+    whole_archive_flag_spec_FC=''
+  fi
   link_all_deplibs_FC=yes
-  allow_undefined_flag_FC="$_lt_dar_allow_undefined"
+  allow_undefined_flag_FC=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_FC="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_FC="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs_FC=no
@@ -37474,41 +39770,40 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds_FC='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_FC='-R$libdir'
       hardcode_direct_FC=yes
       hardcode_shlibpath_var_FC=no
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
       hardcode_libdir_separator_FC=:
       hardcode_direct_FC=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-E'
+      export_dynamic_flag_spec_FC='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_FC='+b $libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
 	hardcode_libdir_separator_FC=:
 	hardcode_direct_FC=yes
 	hardcode_direct_absolute_FC=yes
-	export_dynamic_flag_spec_FC='${wl}-E'
+	export_dynamic_flag_spec_FC='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L_FC=yes
@@ -37516,33 +39811,33 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_FC='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_FC='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
 	hardcode_libdir_separator_FC=:
 
 	case $host_cpu in
@@ -37553,7 +39848,7 @@
 	*)
 	  hardcode_direct_FC=yes
 	  hardcode_direct_absolute_FC=yes
-	  export_dynamic_flag_spec_FC='${wl}-E'
+	  export_dynamic_flag_spec_FC='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -37564,34 +39859,59 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat > conftest.$ac_ext <<_ACEOF
-int foo(void) {}
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat > conftest.$ac_ext <<_ACEOF
+
+      subroutine foo
+      end
 _ACEOF
 if ac_fn_fc_try_link "$LINENO"; then :
-  archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
       else
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc_FC='no'
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
       hardcode_libdir_separator_FC=:
       inherit_rpath_FC=yes
       link_all_deplibs_FC=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs_FC=yes
+	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -37606,7 +39926,7 @@
     newsos6)
       archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct_FC=yes
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
       hardcode_libdir_separator_FC=:
       hardcode_shlibpath_var_FC=no
       ;;
@@ -37614,27 +39934,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct_FC=yes
 	hardcode_shlibpath_var_FC=no
 	hardcode_direct_absolute_FC=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_FC='${wl}-E'
+	  archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec_FC='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_FC='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs_FC=no
@@ -37645,33 +39957,53 @@
       hardcode_libdir_flag_spec_FC='-L$libdir'
       hardcode_minus_L_FC=yes
       allow_undefined_flag_FC=unsupported
-      archive_cmds_FC='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes_FC=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*'
+	archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag_FC=' -expect_unresolved \*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc_FC='no'
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
       hardcode_libdir_separator_FC=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*'
+	archive_cmds_FC='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag_FC=' -expect_unresolved \*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds_FC='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_FC='-rpath $libdir'
@@ -37682,24 +40014,24 @@
 
     solaris*)
       no_undefined_flag_FC=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_FC='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds_FC='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_FC='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds_FC='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -37709,11 +40041,11 @@
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec_FC='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract'
 	fi
@@ -37723,10 +40055,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_FC='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -37775,43 +40107,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_FC='${wl}-z,text'
+      no_undefined_flag_FC='$wl-z,text'
       archive_cmds_need_lc_FC=no
       hardcode_shlibpath_var_FC=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      no_undefined_flag_FC='${wl}-z,text'
-      allow_undefined_flag_FC='${wl}-z,nodefs'
+      no_undefined_flag_FC='$wl-z,text'
+      allow_undefined_flag_FC='$wl-z,nodefs'
       archive_cmds_need_lc_FC=no
       hardcode_shlibpath_var_FC=no
-      hardcode_libdir_flag_spec_FC='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec_FC='$wl-R,$libdir'
       hardcode_libdir_separator_FC=':'
       link_all_deplibs_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-Bexport'
+      export_dynamic_flag_spec_FC='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -37826,10 +40158,10 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec_FC='${wl}-Blargedynsym'
+	export_dynamic_flag_spec_FC='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -37837,7 +40169,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5
 $as_echo "$ld_shlibs_FC" >&6; }
-test "$ld_shlibs_FC" = no && can_build_shared=no
+test no = "$ld_shlibs_FC" && can_build_shared=no
 
 with_gnu_ld_FC=$with_gnu_ld
 
@@ -37854,7 +40186,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc_FC=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds_FC in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -37865,44 +40197,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_FC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_FC
-	pic_flag=$lt_prog_compiler_pic_FC
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_FC
-        allow_undefined_flag_FC=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_FC
+	  pic_flag=$lt_prog_compiler_pic_FC
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_FC
+	  allow_undefined_flag_FC=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc_FC=no
-        else
-	  archive_cmds_need_lc_FC=yes
-        fi
-        allow_undefined_flag_FC=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_FC" >&5
-$as_echo "$archive_cmds_need_lc_FC" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc_FC=no
+	  else
+	    lt_cv_archive_cmds_need_lc_FC=yes
+	  fi
+	  allow_undefined_flag_FC=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_FC" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_FC" >&6; }
+      archive_cmds_need_lc_FC=$lt_cv_archive_cmds_need_lc_FC
       ;;
     esac
   fi
@@ -37970,15 +40308,13 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -37995,56 +40331,108 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -38054,27 +40442,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -38086,16 +40474,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -38111,37 +40500,83 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -38151,8 +40586,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -38161,11 +40596,11 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -38183,12 +40618,13 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -38213,13 +40649,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -38236,14 +40675,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -38251,8 +40691,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -38261,20 +40701,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -38285,16 +40727,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -38313,8 +40755,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -38323,44 +40765,78 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_FC='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_FC\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_FC\""
-  cat > conftest.$ac_ext <<_ACEOF
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_FC\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_FC\""
+    cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
 if ac_fn_fc_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -38378,12 +40854,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -38392,8 +40868,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -38402,58 +40878,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -38461,11 +40947,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -38475,20 +40961,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -38509,24 +40995,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -38541,19 +41027,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -38563,20 +41049,34 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
 
 
 
@@ -38617,15 +41117,15 @@
 hardcode_action_FC=
 if test -n "$hardcode_libdir_flag_spec_FC" ||
    test -n "$runpath_var_FC" ||
-   test "X$hardcode_automatic_FC" = "Xyes" ; then
+   test yes = "$hardcode_automatic_FC"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct_FC" != no &&
+  if test no != "$hardcode_direct_FC" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no &&
-     test "$hardcode_minus_L_FC" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" &&
+     test no != "$hardcode_minus_L_FC"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action_FC=relink
   else
@@ -38640,12 +41140,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5
 $as_echo "$hardcode_action_FC" >&6; }
 
-if test "$hardcode_action_FC" = relink ||
-   test "$inherit_rpath_FC" = yes; then
+if test relink = "$hardcode_action_FC" ||
+   test yes = "$inherit_rpath_FC"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -38659,8 +41159,9 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -38965,7 +41466,7 @@
 : ${FCPICFLAGS="${fcpicflags}"}
 if test -z "${FCPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine FCPICFLAGS." >&5
@@ -43330,9 +45831,6 @@
 $as_echo "#define HAVE_ICONV_H 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_INTERNET 1" >>confdefs.h
-
-
 $as_echo "#define HAVE_JPEG 1" >>confdefs.h
 
 
@@ -43342,9 +45840,6 @@
 $as_echo "#define HAVE_POSIX_SETJMP 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
-
-
 $as_echo "#define HAVE_TCLTK 1" >>confdefs.h
 
 
@@ -43357,9 +45852,6 @@
 
 $as_echo "#define R_PROFILING 1" >>confdefs.h
 
-
-$as_echo "#define SUPPORT_LIBXML 1" >>confdefs.h
-
     ;;
 esac
 
@@ -43367,7 +45859,7 @@
 
 ac_config_headers="$ac_config_headers src/include/config.h"
 
-ac_config_files="$ac_config_files Makeconf Makefile doc/Makefile doc/html/Makefile doc/manual/Makefile etc/Makefile etc/Makeconf etc/Renviron etc/javaconf etc/ldpaths m4/Makefile po/Makefile share/Makefile src/Makefile src/appl/Makefile src/extra/Makefile src/extra/blas/Makefile src/extra/bzip2/Makefile src/extra/intl/Makefile src/extra/pcre/Makefile src/extra/tre/Makefile src/extra/tzone/Makefile src/extra/xdr/Makefile src/extra/xz/Makefile src/extra/zlib/Makefile src/include/Makefile src/include/Rmath.h0 src/include/R_ext/Makefile src/library/Recommended/Makefile src/library/Makefile src/library/base/DESCRIPTION src/library/base/Makefile src/library/compiler/DESCRIPTION src/library/compiler/Makefile src/library/datasets/DESCRIPTION src/library/datasets/Makefile src/library/graphics/DESCRIPTION src/library/graphics/Makefile src/library/graphics/src/Makefile src/library/grDevices/DESCRIPTION src/library/grDevices/Makefile src/library/grDevices/src/Makefile src/library/grDevices/src/cairo/Makefile src/library/grid/DESCRIPTION src/library/grid/Makefile src/library/grid/src/Makefile src/library/methods/DESCRIPTION src/library/methods/Makefile src/library/methods/src/Makefile src/library/parallel/DESCRIPTION src/library/parallel/Makefile src/library/parallel/src/Makefile src/library/profile/Makefile src/library/stats/DESCRIPTION src/library/stats/Makefile src/library/stats/src/Makefile src/library/stats4/DESCRIPTION src/library/stats4/Makefile src/library/splines/DESCRIPTION src/library/splines/Makefile src/library/splines/src/Makefile src/library/tcltk/DESCRIPTION src/library/tcltk/Makefile src/library/tcltk/src/Makefile src/library/tools/DESCRIPTION src/library/tools/Makefile src/library/tools/src/Makefile src/library/translations/DESCRIPTION src/library/translations/Makefile src/library/utils/DESCRIPTION src/library/utils/Makefile src/library/utils/src/Makefile src/main/Makefile src/modules/Makefile src/modules/X11/Makefile src/modules/internet/Makefile src/modules/lapack/Makefile src/nmath/Makefile src/nmath/standalone/Makefile src/scripts/Makefile src/scripts/R.sh src/scripts/Rcmd src/scripts/f77_f2c src/scripts/javareconf src/scripts/mkinstalldirs src/scripts/pager src/scripts/rtags src/unix/Makefile tests/Makefile tests/Embedding/Makefile tests/Examples/Makefile tools/Makefile"
+ac_config_files="$ac_config_files Makeconf Makefile doc/Makefile doc/html/Makefile doc/manual/Makefile etc/Makefile etc/Makeconf etc/Renviron etc/javaconf etc/ldpaths m4/Makefile po/Makefile share/Makefile src/Makefile src/appl/Makefile src/extra/Makefile src/extra/blas/Makefile src/extra/intl/Makefile src/extra/tre/Makefile src/extra/tzone/Makefile src/extra/xdr/Makefile src/include/Makefile src/include/Rmath.h0 src/include/R_ext/Makefile src/library/Recommended/Makefile src/library/Makefile src/library/base/DESCRIPTION src/library/base/Makefile src/library/compiler/DESCRIPTION src/library/compiler/Makefile src/library/datasets/DESCRIPTION src/library/datasets/Makefile src/library/graphics/DESCRIPTION src/library/graphics/Makefile src/library/graphics/src/Makefile src/library/grDevices/DESCRIPTION src/library/grDevices/Makefile src/library/grDevices/src/Makefile src/library/grDevices/src/cairo/Makefile src/library/grid/DESCRIPTION src/library/grid/Makefile src/library/grid/src/Makefile src/library/methods/DESCRIPTION src/library/methods/Makefile src/library/methods/src/Makefile src/library/parallel/DESCRIPTION src/library/parallel/Makefile src/library/parallel/src/Makefile src/library/profile/Makefile src/library/stats/DESCRIPTION src/library/stats/Makefile src/library/stats/src/Makefile src/library/stats4/DESCRIPTION src/library/stats4/Makefile src/library/splines/DESCRIPTION src/library/splines/Makefile src/library/splines/src/Makefile src/library/tcltk/DESCRIPTION src/library/tcltk/Makefile src/library/tcltk/src/Makefile src/library/tools/DESCRIPTION src/library/tools/Makefile src/library/tools/src/Makefile src/library/translations/DESCRIPTION src/library/translations/Makefile src/library/utils/DESCRIPTION src/library/utils/Makefile src/library/utils/src/Makefile src/main/Makefile src/modules/Makefile src/modules/X11/Makefile src/modules/internet/Makefile src/modules/lapack/Makefile src/nmath/Makefile src/nmath/standalone/Makefile src/scripts/Makefile src/scripts/R.sh src/scripts/Rcmd src/scripts/f77_f2c src/scripts/javareconf src/scripts/mkinstalldirs src/scripts/pager src/scripts/rtags src/unix/Makefile tests/Makefile tests/Embedding/Makefile tests/Examples/Makefile tools/Makefile"
 
 
 ac_config_commands="$ac_config_commands stamp-h"
@@ -43532,10 +46024,6 @@
   as_fn_error $? "conditional \"DYLIB_UNDEFINED_ALLOWED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_CYGWIN_TRUE}" && test -z "${BUILD_CYGWIN_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_CYGWIN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${USE_EXPORTFILES_TRUE}" && test -z "${USE_EXPORTFILES_FALSE}"; then
   as_fn_error $? "conditional \"USE_EXPORTFILES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -43572,26 +46060,10 @@
   as_fn_error $? "conditional \"BUILD_XDR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_ZLIB_TRUE}" && test -z "${BUILD_ZLIB_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_ZLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${USE_MMAP_ZLIB_TRUE}" && test -z "${USE_MMAP_ZLIB_FALSE}"; then
   as_fn_error $? "conditional \"USE_MMAP_ZLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_BZLIB_TRUE}" && test -z "${BUILD_BZLIB_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_BZLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_XZ_TRUE}" && test -z "${BUILD_XZ_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_XZ\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_PCRE_TRUE}" && test -z "${BUILD_PCRE_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_PCRE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${BUILD_TRE_TRUE}" && test -z "${BUILD_TRE_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_TRE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -44009,7 +46481,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by R $as_me 3.2.3, which was
+This file was extended by R $as_me 3.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -44076,7 +46548,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-R config.status 3.2.3
+R config.status 3.3.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -44204,278 +46676,309 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-LD_F77='`$ECHO "X$LD_F77" | $Xsed -e "$delay_single_quote_subst"`'
-LD_FC='`$ECHO "X$LD_FC" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_F77='`$ECHO "X$old_archive_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_FC='`$ECHO "X$old_archive_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_F77='`$ECHO "X$compiler_F77" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_FC='`$ECHO "X$compiler_FC" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_F77='`$ECHO "X$GCC_F77" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_FC='`$ECHO "X$GCC_FC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_F77='`$ECHO "X$lt_prog_compiler_no_builtin_flag_F77" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_FC='`$ECHO "X$lt_prog_compiler_no_builtin_flag_FC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_F77='`$ECHO "X$lt_prog_compiler_wl_F77" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_FC='`$ECHO "X$lt_prog_compiler_wl_FC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_F77='`$ECHO "X$lt_prog_compiler_pic_F77" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_FC='`$ECHO "X$lt_prog_compiler_pic_FC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_F77='`$ECHO "X$lt_prog_compiler_static_F77" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_FC='`$ECHO "X$lt_prog_compiler_static_FC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_F77='`$ECHO "X$lt_cv_prog_compiler_c_o_F77" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_FC='`$ECHO "X$lt_cv_prog_compiler_c_o_FC" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_F77='`$ECHO "X$archive_cmds_need_lc_F77" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_FC='`$ECHO "X$archive_cmds_need_lc_FC" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_F77='`$ECHO "X$enable_shared_with_static_runtimes_F77" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_FC='`$ECHO "X$enable_shared_with_static_runtimes_FC" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_F77='`$ECHO "X$export_dynamic_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_FC='`$ECHO "X$export_dynamic_flag_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_F77='`$ECHO "X$whole_archive_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_FC='`$ECHO "X$whole_archive_flag_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_F77='`$ECHO "X$compiler_needs_object_F77" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_FC='`$ECHO "X$compiler_needs_object_FC" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_F77='`$ECHO "X$old_archive_from_new_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_FC='`$ECHO "X$old_archive_from_new_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_F77='`$ECHO "X$old_archive_from_expsyms_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_FC='`$ECHO "X$old_archive_from_expsyms_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_F77='`$ECHO "X$archive_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_FC='`$ECHO "X$archive_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_F77='`$ECHO "X$archive_expsym_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_FC='`$ECHO "X$archive_expsym_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_F77='`$ECHO "X$module_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_FC='`$ECHO "X$module_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_F77='`$ECHO "X$module_expsym_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_FC='`$ECHO "X$module_expsym_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_F77='`$ECHO "X$with_gnu_ld_F77" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_FC='`$ECHO "X$with_gnu_ld_FC" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_F77='`$ECHO "X$allow_undefined_flag_F77" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_FC='`$ECHO "X$allow_undefined_flag_FC" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_F77='`$ECHO "X$no_undefined_flag_F77" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_FC='`$ECHO "X$no_undefined_flag_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_F77='`$ECHO "X$hardcode_libdir_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_FC='`$ECHO "X$hardcode_libdir_flag_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_F77='`$ECHO "X$hardcode_libdir_flag_spec_ld_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_FC='`$ECHO "X$hardcode_libdir_flag_spec_ld_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_F77='`$ECHO "X$hardcode_libdir_separator_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_FC='`$ECHO "X$hardcode_libdir_separator_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_F77='`$ECHO "X$hardcode_direct_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_FC='`$ECHO "X$hardcode_direct_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_F77='`$ECHO "X$hardcode_direct_absolute_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_FC='`$ECHO "X$hardcode_direct_absolute_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_F77='`$ECHO "X$hardcode_minus_L_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_FC='`$ECHO "X$hardcode_minus_L_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_F77='`$ECHO "X$hardcode_shlibpath_var_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_FC='`$ECHO "X$hardcode_shlibpath_var_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_F77='`$ECHO "X$hardcode_automatic_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_FC='`$ECHO "X$hardcode_automatic_FC" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_F77='`$ECHO "X$inherit_rpath_F77" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_FC='`$ECHO "X$inherit_rpath_FC" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_F77='`$ECHO "X$link_all_deplibs_F77" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_FC='`$ECHO "X$link_all_deplibs_FC" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_F77='`$ECHO "X$fix_srcfile_path_F77" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_FC='`$ECHO "X$fix_srcfile_path_FC" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_F77='`$ECHO "X$always_export_symbols_F77" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_FC='`$ECHO "X$always_export_symbols_FC" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_F77='`$ECHO "X$export_symbols_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_FC='`$ECHO "X$export_symbols_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_F77='`$ECHO "X$exclude_expsyms_F77" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_FC='`$ECHO "X$exclude_expsyms_FC" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_F77='`$ECHO "X$include_expsyms_F77" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_FC='`$ECHO "X$include_expsyms_FC" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_F77='`$ECHO "X$prelink_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_FC='`$ECHO "X$prelink_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_F77='`$ECHO "X$file_list_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_FC='`$ECHO "X$file_list_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_F77='`$ECHO "X$hardcode_action_F77" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_FC='`$ECHO "X$hardcode_action_FC" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_F77='`$ECHO "X$compiler_lib_search_dirs_F77" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_FC='`$ECHO "X$compiler_lib_search_dirs_FC" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_F77='`$ECHO "X$predep_objects_F77" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_FC='`$ECHO "X$predep_objects_FC" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_F77='`$ECHO "X$postdep_objects_F77" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_FC='`$ECHO "X$postdep_objects_FC" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_F77='`$ECHO "X$predeps_F77" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_FC='`$ECHO "X$predeps_FC" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_F77='`$ECHO "X$postdeps_F77" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_FC='`$ECHO "X$postdeps_FC" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_F77='`$ECHO "X$compiler_lib_search_path_F77" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_FC='`$ECHO "X$compiler_lib_search_path_FC" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+LD_F77='`$ECHO "$LD_F77" | $SED "$delay_single_quote_subst"`'
+LD_FC='`$ECHO "$LD_FC" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_F77='`$ECHO "$reload_flag_F77" | $SED "$delay_single_quote_subst"`'
+reload_flag_FC='`$ECHO "$reload_flag_FC" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_F77='`$ECHO "$reload_cmds_F77" | $SED "$delay_single_quote_subst"`'
+reload_cmds_FC='`$ECHO "$reload_cmds_FC" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_F77='`$ECHO "$old_archive_cmds_F77" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_FC='`$ECHO "$old_archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_F77='`$ECHO "$compiler_F77" | $SED "$delay_single_quote_subst"`'
+compiler_FC='`$ECHO "$compiler_FC" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_F77='`$ECHO "$GCC_F77" | $SED "$delay_single_quote_subst"`'
+GCC_FC='`$ECHO "$GCC_FC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_F77='`$ECHO "$lt_prog_compiler_no_builtin_flag_F77" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_FC='`$ECHO "$lt_prog_compiler_no_builtin_flag_FC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_F77='`$ECHO "$lt_prog_compiler_pic_F77" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_FC='`$ECHO "$lt_prog_compiler_pic_FC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_F77='`$ECHO "$lt_prog_compiler_wl_F77" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_FC='`$ECHO "$lt_prog_compiler_wl_FC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_F77='`$ECHO "$lt_prog_compiler_static_F77" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_FC='`$ECHO "$lt_prog_compiler_static_FC" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_F77='`$ECHO "$lt_cv_prog_compiler_c_o_F77" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_FC='`$ECHO "$lt_cv_prog_compiler_c_o_FC" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_F77='`$ECHO "$archive_cmds_need_lc_F77" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_FC='`$ECHO "$archive_cmds_need_lc_FC" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_F77='`$ECHO "$enable_shared_with_static_runtimes_F77" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_FC='`$ECHO "$enable_shared_with_static_runtimes_FC" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_F77='`$ECHO "$export_dynamic_flag_spec_F77" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_FC='`$ECHO "$export_dynamic_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_F77='`$ECHO "$whole_archive_flag_spec_F77" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_FC='`$ECHO "$whole_archive_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_F77='`$ECHO "$compiler_needs_object_F77" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_FC='`$ECHO "$compiler_needs_object_FC" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_F77='`$ECHO "$old_archive_from_new_cmds_F77" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_FC='`$ECHO "$old_archive_from_new_cmds_FC" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_F77='`$ECHO "$old_archive_from_expsyms_cmds_F77" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_FC='`$ECHO "$old_archive_from_expsyms_cmds_FC" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_F77='`$ECHO "$archive_cmds_F77" | $SED "$delay_single_quote_subst"`'
+archive_cmds_FC='`$ECHO "$archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_F77='`$ECHO "$archive_expsym_cmds_F77" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_FC='`$ECHO "$archive_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_F77='`$ECHO "$module_cmds_F77" | $SED "$delay_single_quote_subst"`'
+module_cmds_FC='`$ECHO "$module_cmds_FC" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_F77='`$ECHO "$module_expsym_cmds_F77" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_FC='`$ECHO "$module_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_F77='`$ECHO "$with_gnu_ld_F77" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_FC='`$ECHO "$with_gnu_ld_FC" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_F77='`$ECHO "$allow_undefined_flag_F77" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_FC='`$ECHO "$allow_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_F77='`$ECHO "$no_undefined_flag_F77" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_FC='`$ECHO "$no_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_F77='`$ECHO "$hardcode_libdir_flag_spec_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_FC='`$ECHO "$hardcode_libdir_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_F77='`$ECHO "$hardcode_libdir_separator_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_FC='`$ECHO "$hardcode_libdir_separator_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_F77='`$ECHO "$hardcode_direct_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_FC='`$ECHO "$hardcode_direct_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_F77='`$ECHO "$hardcode_direct_absolute_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_FC='`$ECHO "$hardcode_direct_absolute_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_F77='`$ECHO "$hardcode_minus_L_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_FC='`$ECHO "$hardcode_minus_L_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_F77='`$ECHO "$hardcode_shlibpath_var_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_FC='`$ECHO "$hardcode_shlibpath_var_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_F77='`$ECHO "$hardcode_automatic_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_FC='`$ECHO "$hardcode_automatic_FC" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_F77='`$ECHO "$inherit_rpath_F77" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_FC='`$ECHO "$inherit_rpath_FC" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_F77='`$ECHO "$link_all_deplibs_F77" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_FC='`$ECHO "$link_all_deplibs_FC" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_F77='`$ECHO "$always_export_symbols_F77" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_FC='`$ECHO "$always_export_symbols_FC" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_F77='`$ECHO "$export_symbols_cmds_F77" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_FC='`$ECHO "$export_symbols_cmds_FC" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_F77='`$ECHO "$exclude_expsyms_F77" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_FC='`$ECHO "$exclude_expsyms_FC" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_F77='`$ECHO "$include_expsyms_F77" | $SED "$delay_single_quote_subst"`'
+include_expsyms_FC='`$ECHO "$include_expsyms_FC" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_F77='`$ECHO "$prelink_cmds_F77" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_FC='`$ECHO "$prelink_cmds_FC" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_F77='`$ECHO "$postlink_cmds_F77" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_FC='`$ECHO "$postlink_cmds_FC" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_F77='`$ECHO "$file_list_spec_F77" | $SED "$delay_single_quote_subst"`'
+file_list_spec_FC='`$ECHO "$file_list_spec_FC" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_F77='`$ECHO "$hardcode_action_F77" | $SED "$delay_single_quote_subst"`'
+hardcode_action_FC='`$ECHO "$hardcode_action_FC" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_F77='`$ECHO "$compiler_lib_search_dirs_F77" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_FC='`$ECHO "$compiler_lib_search_dirs_FC" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_F77='`$ECHO "$predep_objects_F77" | $SED "$delay_single_quote_subst"`'
+predep_objects_FC='`$ECHO "$predep_objects_FC" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_F77='`$ECHO "$postdep_objects_F77" | $SED "$delay_single_quote_subst"`'
+postdep_objects_FC='`$ECHO "$postdep_objects_FC" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_F77='`$ECHO "$predeps_F77" | $SED "$delay_single_quote_subst"`'
+predeps_FC='`$ECHO "$predeps_FC" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_F77='`$ECHO "$postdeps_F77" | $SED "$delay_single_quote_subst"`'
+postdeps_FC='`$ECHO "$postdeps_FC" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_F77='`$ECHO "$compiler_lib_search_path_F77" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_FC='`$ECHO "$compiler_lib_search_path_FC" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -44488,8 +46991,13 @@
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
+archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -44497,16 +47005,19 @@
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 lt_prog_compiler_pic \
+lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
+MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -44520,9 +47031,7 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
-fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -44530,6 +47039,7 @@
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib \
@@ -44542,18 +47052,21 @@
 LD_CXX \
 LD_F77 \
 LD_FC \
+reload_flag_CXX \
+reload_flag_F77 \
+reload_flag_FC \
 compiler_CXX \
 compiler_F77 \
 compiler_FC \
 lt_prog_compiler_no_builtin_flag_CXX \
 lt_prog_compiler_no_builtin_flag_F77 \
 lt_prog_compiler_no_builtin_flag_FC \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_wl_F77 \
-lt_prog_compiler_wl_FC \
 lt_prog_compiler_pic_CXX \
 lt_prog_compiler_pic_F77 \
 lt_prog_compiler_pic_FC \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_wl_F77 \
+lt_prog_compiler_wl_FC \
 lt_prog_compiler_static_CXX \
 lt_prog_compiler_static_F77 \
 lt_prog_compiler_static_FC \
@@ -44581,15 +47094,9 @@
 hardcode_libdir_flag_spec_CXX \
 hardcode_libdir_flag_spec_F77 \
 hardcode_libdir_flag_spec_FC \
-hardcode_libdir_flag_spec_ld_CXX \
-hardcode_libdir_flag_spec_ld_F77 \
-hardcode_libdir_flag_spec_ld_FC \
 hardcode_libdir_separator_CXX \
 hardcode_libdir_separator_F77 \
 hardcode_libdir_separator_FC \
-fix_srcfile_path_CXX \
-fix_srcfile_path_F77 \
-fix_srcfile_path_FC \
 exclude_expsyms_CXX \
 exclude_expsyms_F77 \
 exclude_expsyms_FC \
@@ -44617,9 +47124,9 @@
 compiler_lib_search_path_CXX \
 compiler_lib_search_path_F77 \
 compiler_lib_search_path_FC; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -44641,11 +47148,16 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
+postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
+reload_cmds_CXX \
+reload_cmds_F77 \
+reload_cmds_FC \
 old_archive_cmds_CXX \
 old_archive_cmds_F77 \
 old_archive_cmds_FC \
@@ -44672,10 +47184,13 @@
 export_symbols_cmds_FC \
 prelink_cmds_CXX \
 prelink_cmds_F77 \
-prelink_cmds_FC; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+prelink_cmds_FC \
+postlink_cmds_CXX \
+postlink_cmds_F77 \
+postlink_cmds_FC; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -44683,26 +47198,17 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
 
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'
 
@@ -44742,14 +47248,10 @@
     "src/appl/Makefile") CONFIG_FILES="$CONFIG_FILES src/appl/Makefile" ;;
     "src/extra/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/Makefile" ;;
     "src/extra/blas/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/blas/Makefile" ;;
-    "src/extra/bzip2/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/bzip2/Makefile" ;;
     "src/extra/intl/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/intl/Makefile" ;;
-    "src/extra/pcre/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/pcre/Makefile" ;;
     "src/extra/tre/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/tre/Makefile" ;;
     "src/extra/tzone/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/tzone/Makefile" ;;
     "src/extra/xdr/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/xdr/Makefile" ;;
-    "src/extra/xz/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/xz/Makefile" ;;
-    "src/extra/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/extra/zlib/Makefile" ;;
     "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
     "src/include/Rmath.h0") CONFIG_FILES="$CONFIG_FILES src/include/Rmath.h0" ;;
     "src/include/R_ext/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/R_ext/Makefile" ;;
@@ -45420,54 +47922,53 @@
   case $ac_file$ac_mode in
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags="CXX F77 FC "
+available_tags='CXX F77 FC '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -45487,6 +47988,18 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -45536,9 +48049,11 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
@@ -45546,13 +48061,30 @@
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
 # The archiver.
 AR=$lt_AR
+
+# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -45561,6 +48093,9 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
 # A C compiler.
 LTCC=$lt_CC
 
@@ -45573,20 +48108,29 @@
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
@@ -45594,6 +48138,9 @@
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -45650,6 +48197,9 @@
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -45669,8 +48219,11 @@
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -45689,6 +48242,10 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -45701,12 +48258,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -45756,20 +48313,16 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -45793,9 +48346,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -45811,6 +48361,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -45835,13 +48388,72 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -45850,219 +48462,17 @@
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -46074,6 +48484,10 @@
 # The linker used to build libraries.
 LD=$lt_LD_CXX
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_CXX
 
@@ -46086,12 +48500,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic_CXX
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_CXX
 
@@ -46141,20 +48555,16 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct_CXX
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute_CXX
 
@@ -46178,9 +48588,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_CXX
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_CXX
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
 
@@ -46196,6 +48603,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_CXX
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_CXX
 
@@ -46227,6 +48637,10 @@
 # The linker used to build libraries.
 LD=$lt_LD_F77
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_F77
+reload_cmds=$lt_reload_cmds_F77
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_F77
 
@@ -46239,12 +48653,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic_F77
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_F77
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_F77
 
@@ -46294,20 +48708,16 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct_F77
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute_F77
 
@@ -46331,9 +48741,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_F77
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_F77
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
 
@@ -46349,6 +48756,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_F77
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_F77
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_F77
 
@@ -46380,6 +48790,10 @@
 # The linker used to build libraries.
 LD=$lt_LD_FC
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_FC
+reload_cmds=$lt_reload_cmds_FC
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_FC
 
@@ -46392,12 +48806,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_FC
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_FC
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic_FC
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_FC
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_FC
 
@@ -46447,20 +48861,16 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_FC
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_FC
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct_FC
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute_FC
 
@@ -46484,9 +48894,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_FC
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_FC
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_FC
 
@@ -46502,6 +48909,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_FC
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_FC
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_FC
 
@@ -46633,42 +49043,6 @@
   r_external_libs="${r_external_libs}${separator}LAPACK(${r_lapack})"
 fi
 fi
-if test "${have_zlib}" = yes; then
-  separator=", "
-test -z "${separator}" && separator=" "
-if test -z "${r_external_libs}"; then
-  r_external_libs="zlib"
-else
-  r_external_libs="${r_external_libs}${separator}zlib"
-fi
-fi
-if test "${have_bzlib}" = yes; then
-  separator=", "
-test -z "${separator}" && separator=" "
-if test -z "${r_external_libs}"; then
-  r_external_libs="bzlib"
-else
-  r_external_libs="${r_external_libs}${separator}bzlib"
-fi
-fi
-if test "${have_lzma}" = yes; then
-  separator=", "
-test -z "${separator}" && separator=" "
-if test -z "${r_external_libs}"; then
-  r_external_libs="lzma"
-else
-  r_external_libs="${r_external_libs}${separator}lzma"
-fi
-fi
-if test "${have_pcre}" = yes; then
-  separator=", "
-test -z "${separator}" && separator=" "
-if test -z "${r_external_libs}"; then
-  r_external_libs="PCRE"
-else
-  r_external_libs="${r_external_libs}${separator}PCRE"
-fi
-fi
 if test "${have_tre}" = yes; then
   separator=", "
 test -z "${separator}" && separator=" "
@@ -46909,7 +49283,7 @@
   Fortran 77 compiler:       ${r_f77_compiler}
 
   C++ compiler:              ${r_cxx_compiler}
-  C++ 11 compiler:           ${r_cxx1x_compiler}
+  C++11 compiler:            ${r_cxx1x_compiler}
   Fortran 90/95 compiler:    ${r_f95_compiler}
   Obj-C compiler:	     ${r_objc_compiler}
 
@@ -46933,7 +49307,7 @@
   Fortran 77 compiler:       ${r_f77_compiler}
 
   C++ compiler:              ${r_cxx_compiler}
-  C++ 11 compiler:           ${r_cxx1x_compiler}
+  C++11 compiler:            ${r_cxx1x_compiler}
   Fortran 90/95 compiler:    ${r_f95_compiler}
   Obj-C compiler:	     ${r_objc_compiler}
 
@@ -46979,6 +49353,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${warn_tcltk_version}" >&5
 $as_echo "$as_me: WARNING: ${warn_tcltk_version}" >&2;}
 fi
+if test -n "${warn_pcre_version}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${warn_pcre_version}" >&5
+$as_echo "$as_me: WARNING: ${warn_pcre_version}" >&2;}
+fi
 if test -n "${warn_info}"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${warn_info}" >&5
 $as_echo "$as_me: WARNING: ${warn_info}" >&2;}
diff -Nru r-base-3.2.3/configure.ac r-base-3.3.1/configure.ac
--- r-base-3.2.3/configure.ac	2015-09-08 22:15:17.000000000 +0000
+++ r-base-3.3.1/configure.ac	2016-03-16 23:04:40.000000000 +0000
@@ -2,7 +2,7 @@
 ###
 ### Process this file with autoconf to produce a configure script.
 ###
-### Copyright (C) 1998-2015 R Core Team
+### Copyright (C) 1998-2016 R Core Team
 ###
 ### This file is part of R.
 ###
@@ -18,7 +18,7 @@
 ###
 ### You should have received a copy of the GNU General Public License
 ### along with R; if not, a copy is available at
-### http://www.r-project.org/Licenses/
+### https://www.r-project.org/Licenses/
 
 AC_PREREQ(2.62)
 
@@ -76,13 +76,13 @@
 ## exclude some unsupported OSes
 case "${host_os}" in
    ## Darwin 1.3.1 was OS X 10.0, 1.4.1 was 10.1, 5 is 10.2 etc
-   ## with 13 being 10.9.  We no longer support < 10.4 (Tiger)
-   ## http://en.wikipedia.org/wiki/Darwin_OS
+   ## with 13 being 10.9.  We no longer support < 10.6 (Snow Leopard)
+   ## https://en.wikipedia.org/wiki/Darwin_OS
    darwin1.*)
-     AC_MSG_ERROR([The earliest supported OS X is 10.4.]
+     AC_MSG_ERROR([The earliest supported OS X is 10.6.]
      ;; 
-  darwin[[567]]*)
-     AC_MSG_ERROR([The earliest supported OS X is 10.4.]
+  darwin[[56789]]*)
+     AC_MSG_ERROR([The earliest supported OS X is 10.6.]
      ;; 
   aix[123]*|aix4.[01]*)
     ## These need a form of linking we no longer support
@@ -224,7 +224,7 @@
 [AS_HELP_STRING([--enable-R-framework@<:@=DIR@:>@],[OS X only: build R framework (if possible), and specify
                  its installation prefix @<:@yes, /Library/Frameworks@:>@])],
 [want_R_framework="${enableval}"],
-[want_R_framework=yes])
+[want_R_framework=no])
 ## Can only build frameworks on Darwin.
 if test "${want_R_framework}" != no; then
   case "${host_os}" in
@@ -327,7 +327,7 @@
 if test "x${want_lto}" != xno; then
   LTO=-flto
 fi
-if test "x${want_lto}" == xyes; then
+if test "x${want_lto}" = xyes; then
   LTOALL=-flto
 fi
 AC_SUBST(LTO)
@@ -416,26 +416,10 @@
 [AS_HELP_STRING([--with-libtiff],[use libtiff library (if available) @<:@yes@:>@])],
 [R_ARG_USE(libtiff)],
 [use_libtiff=yes])
-AC_ARG_WITH([system-zlib],
-[AS_HELP_STRING([--with-system-zlib],[use system zlib library (if available) @<:@yes@:>@])],
-[R_ARG_USE_SYSTEM(zlib)],
-[use_system_zlib=yes])
-AC_ARG_WITH([system-bzlib],
-[AS_HELP_STRING([--with-system-bzlib],[use system bzlib library (if available) @<:@yes@:>@])],
-[R_ARG_USE_SYSTEM(bzlib)],
-[use_system_bzlib=yes])
-AC_ARG_WITH([system-pcre],
-[AS_HELP_STRING([--with-system-pcre],[use system PCRE library (if available) @<:@yes@:>@])],
-[R_ARG_USE_SYSTEM(pcre)],
-[use_system_pcre=yes])
 AC_ARG_WITH([system-tre],
 [AS_HELP_STRING([--with-system-tre],[use system tre library (if available) @<:@no@:>@])],
 [R_ARG_USE_SYSTEM(tre)],
 [use_system_tre=no])
-AC_ARG_WITH([system-xz],
-[AS_HELP_STRING([--with-system-xz],[use system xz (lzma) library (if available) @<:@yes@:>@])],
-[R_ARG_USE_SYSTEM(xz)],
-[use_system_xz=yes])
 
 ## Valgrind instrumentation
 AC_ARG_WITH([valgrind-instrumentation],
@@ -591,7 +575,6 @@
 R_MISSING_PROG(AUTOCONF, autoconf)
 R_MISSING_PROG(AUTOMAKE, automake)
 R_MISSING_PROG(AUTOHEADER, autoheader)
-AC_PROG_AWK
 AC_PROG_LN_S
 AC_PROG_YACC
 R_PROG_AR
@@ -629,6 +612,9 @@
 ## cairographics needs pkg-config
 AC_PATH_PROG(PKGCONF, pkg-config , [], 
 	     [$PATH:/usr/local/bin:/ext/bin:/ext:/sw/bin:/opt/bin])
+AC_ARG_VAR([PKGCONF], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's default search path])
 
 AC_PROG_CC
 
@@ -695,6 +681,8 @@
     ## changes DYLD_LIBRARY_PATH), because they override the system
     ## look-up sequence. Such automatic override has proven to break things
     ## like system frameworks (e.g. ImageIO or OpenGL framework).
+    ## Not so bad in later versions of Darwin, 
+    ## where DYLD_FALLBACK_LIBRARY_PATH is used (see below).
     ;;
   *)
     for arg in ${LDFLAGS}; do
@@ -710,8 +698,9 @@
 
 ## Record name of environment variable which tells the dynamic linker
 ## where to find shlibs (typically, 'LD_LIBRARY_PATH').
-## Used in etc/ldpaths: override what libtool thinks on OS X
+## Used in etc/ldpaths: As from R 3.0.0 override what libtool thinks on OS X
 ## http://hublog.hubmed.org/archives/001192.html suggests this was in 10.4
+## However, as from 10.11 this variable is not passed down to shells.
 case "${host_os}" in
   darwin*)
     Rshlibpath_var=DYLD_FALLBACK_LIBRARY_PATH
@@ -745,16 +734,16 @@
 AC_CHECK_LIB(m, sin)
 case "${host_os}" in
   darwin*)
-    ## OS X <= 10.2 dlcompat, >= 10.3 included dlcompat in libSystem
-    AC_SEARCH_LIBS(dlopen, dl,,[AC_MSG_ERROR([Your OS X is too old.])])
+    ## OS X >= 10.3 include dlcompat in libSystem
+    ## This is ancient history
     ## SI says we want '-lcc_dynamic' on Darwin, although currently
-    ## http://developer.apple.com/documentation/MacOSX/ has nothing
+    ## https://developer.apple.com/documentation/MacOSX/ has nothing
     ## official.  Bill Northcott <w.northcott@unsw.edu.au> points out
     ## that it is only needed for GCC 3.x (and earlier) ...
     if test "${GCC}" = yes; then
       case "${CC_VERSION}" in
         2.*|3.*)
-          AC_CHECK_LIB(cc_dynamic, main) ;;
+	  AC_MSG_ERROR([Your gcc is too old.])
       esac
     fi
     ;;
@@ -1014,9 +1003,6 @@
       fi
     fi
     ;;
-  cygwin*|mingw*|windows*|winnt)
-    AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)
-    ;;
   darwin*)
     AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)
     ;;
@@ -1133,6 +1119,9 @@
         ;;
     esac
     ;;
+  mingw*|windows*|winnt)
+    AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)
+    ;;
   openbsd*)
     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
       AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)
@@ -1297,7 +1286,6 @@
 
 ## Step 3.  Individual platform overrides.
 dylib_undefined_allowed=yes
-is_cygwin=no
 case "${host_os}" in
   aix*)
     use_exportfiles=yes
@@ -1328,64 +1316,25 @@
       shlib_cxxldflags="-shared ${shlib_cxxldflags}"
     fi 
     ;;
-  cygwin*)
-    ## All Windows code is PIC
-    cpicflags=
-    cxxpicflags=
-    fpicflags=
-    fcpicflags=
-    SHLIB_EXT=".dll"
-    dylib_undefined_allowed=no
-    is_cygwin=yes
-    main_ldflags="${wl}--large-address-aware ${wl}--stack=0xA00000"
-    ;;
   darwin*)
     darwin_pic="-fPIC"
     dylib_undefined_allowed=no
     darwin_dylib_ldflags="-dynamiclib"
-    ## Want '-mdynamic-no-pic' for GCC 3, says Jan de Leeuw.
-    if test "${GCC}" = yes; then
-      case "${CC_VERSION}" in
-        3.*)
-          R_SH_VAR_ADD(main_ldflags, [-mdynamic-no-pic]) ;;
-      esac
-    fi
-    ## some linkers are broken and need to be set to a specific
-    ## OS X version to work better
-    case "${host_os}" in
-       darwin8*)
-          # this is the 'old' way and it doesn't work with recent gcc as the driver
-	  # prepends its own version
-	  ### darwin_min_flag='Wl,-macosx_version_min -Wl,10.4'
-	  # this is the 'new' way, but it's not clear which driver version
-	  # started to support it (Xcode 2.5 is known to work and 2.4 should)
-	  # A work-around for older Xcode is to set MACOSX_DEPLOYMENT_TARGET
-	  # environment variable. It has its own problems, but we may as well
-	  # honor it, assuming that it fixes things.
-	  if test -z "${MACOSX_DEPLOYMENT_TARGET}"; then
-	      darwin_min_flag='-mmacosx-version-min=10.4'
-	  fi
-	  ;;
-       *)
-	  darwin_min_flag=''
-	  ;;
-    esac
-    case "${host_os}" in
-      ## * recent ld has -single_module so it doesn't need -fno-common
-      ##   we have to use dylib instead of a bundle
-      ## * dylib+single_module+flat_namespace=pretty much what other platforms call .so
-      ##   but there can be no multiple symbols (due to flat namespace)
-      ## * since 10.3 we can also use -undefined dynamic_lookup which allows us to
-      ##   use two-level namespace and still have undefined symbols
-      *)
-        ## FIXME: strictly speaking it should be "yes" but libRblas still
-	## needs -lgfortran because the sharing is a one-way street
-        ## dylib_undefined_allowed=yes
-
-	## we have to test this in case an outdated linker or non-Apple compiler is used
-	AC_MSG_CHECKING([whether linker supports dynamic lookup])
-	shlib_ldflags="-dynamiclib -Wl,-headerpad_max_install_names ${darwin_min_flag} -undefined dynamic_lookup -single_module -multiply_defined suppress"
-	AC_CACHE_VAL([r_cv_has_dynlookup],[
+    shlib_ldflags="-dynamiclib -Wl,-headerpad_max_install_names -undefined dynamic_lookup -single_module -multiply_defined suppress"
+    ## * recent ld has -single_module so it doesn't need -fno-common
+    ##   we have to use dylib instead of a bundle
+    ## * dylib+single_module+flat_namespace=pretty much what other platforms call .so
+    ##   but there can be no multiple symbols (due to flat namespace)
+    ## * since 10.3 we can also use -undefined dynamic_lookup which allows us to
+    ##   use two-level namespace and still have undefined symbols
+
+    ## FIXME: strictly speaking it should be "yes" but libRblas still
+    ## needs -lgfortran because the sharing is a one-way street
+    ## dylib_undefined_allowed=yes
+
+    ## we have to test this in case an outdated linker or non-Apple compiler is used
+    AC_MSG_CHECKING([whether linker supports dynamic lookup])
+    AC_CACHE_VAL([r_cv_has_dynlookup],[
 [cat > conftest.c <<EOF
   void dummy() { }
 EOF]
@@ -1400,34 +1349,30 @@
 fi
 rm -f libconftest${DYLIB_EXT} conftest.c
 ])
-	if test -n "${FORCE_FLAT_NAMESPACE}"; then
-	   AC_MSG_WARN([Use of flat namespace is requested by user.])
-	   r_cv_has_dynlookup=forced-no
-	fi
-	if test "${r_cv_has_dynlookup}" != "yes"; then
-	   shlib_ldflags="-dynamiclib -flat_namespace -undefined suppress -single_module -multiply_defined suppress"
-	   dylib_undefined_allowed=yes
-	fi
+    if test -n "${FORCE_FLAT_NAMESPACE}"; then
+       AC_MSG_WARN([Use of flat namespace is requested by user.])
+       r_cv_has_dynlookup=forced-no
+    fi
+    if test "${r_cv_has_dynlookup}" != "yes"; then
+       shlib_ldflags="-dynamiclib -flat_namespace -undefined suppress -single_module -multiply_defined suppress"
+       dylib_undefined_allowed=yes
+    fi
 	
-	## we use the same method for shlib and dylib now
-	darwin_dylib_ldflags="${shlib_ldflags}"
-	## side note: we could use flat namespace instead, but there is an exception:
-	## * libRblas must be 2-level, dyn lookup because of xerbla which is undefined
-        ;;
-    esac
+    ## we use the same method for shlib and dylib now
+    darwin_dylib_ldflags="${shlib_ldflags}"
+    ## side note: we could use flat namespace instead, but there is an exception:
+    ## * libRblas must be 2-level, dyn lookup because of xerbla which is undefined
     cpicflags="${darwin_pic}"
     cxxpicflags="${darwin_pic}"
+    ## OS X does not have a Fortran compiler, so this is speculative
     fpicflags="${darwin_pic}"
     shlib_cxxldflags="${shlib_ldflags}"
-    if test "${ac_cv_lib_cc_dynamic_main}" = yes; then
-      ## Could also try grepping LIBS for '-lcc_dynamic' ...
-      SHLIB_LIBADD="-lcc_dynamic"
-    fi
     ;;
   freebsd*)
     ## maybe this needs to depend on the compiler:
     ## -export-dynamic used to work, but does not with clang.
     ## Seems FreeBSD has used the GNU linker since at least 3.0 (Oct 1998)
+    ## We could also use -rdynamic, which seems to work with clang and gcc.
     main_ldflags="-Wl,--export-dynamic"
     shlib_ldflags="-shared"
     ;;
@@ -1535,6 +1480,22 @@
       main_ldflags="${wl}-export-dynamic"
       shlib_ldflags="-shared -fPIC"
     fi
+    case "${host_cpu}" in 
+      powerpc*)
+	## GCC -fpic limits to 2**16 on OpenBSD powerpc.
+	## Error message without -fPIC:
+	##   relocation truncated to fit: R_PPC_GOT16...
+        if test "${GCC}" = yes; then
+          cpicflags="-fPIC"
+        fi  
+        if test "${G77}" = yes; then
+          fpicflags="-fPIC"
+        fi
+        if test "${GXX}" = yes; then
+          cxxpicflags="-fPIC"
+        fi
+        ;;
+    esac
     ;;
   osf*)
     cpicflags=
@@ -1609,13 +1570,13 @@
   else
      MAIN_LD="${main_ld}"
   fi
-  R_SH_VAR_ADD(MAIN_LDFLAGS, [${main_ldflags}])
 fi
+R_SH_VAR_ADD(MAIN_LDFLAGS, [${main_ldflags}])
 
 : ${CPICFLAGS="${cpicflags}"}
 if test -z "${CPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       AC_MSG_WARN([I could not determine CPICFLAGS.])
@@ -1627,7 +1588,7 @@
 : ${FPICFLAGS="${fpicflags}"}
 if test -z "${FPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       AC_MSG_WARN([I could not determine FPICFLAGS.])
@@ -1639,7 +1600,7 @@
 : ${CXXPICFLAGS="${cxxpicflags}"}
 if test -z "${CXXPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       warn_cxxpicflags="I could not determine CXXPICFLAGS."
@@ -1742,7 +1703,6 @@
 AC_SUBST(INTERNET_LIBS)
 
 AM_CONDITIONAL(DYLIB_UNDEFINED_ALLOWED, [test "x${dylib_undefined_allowed}" = xyes])
-AM_CONDITIONAL(BUILD_CYGWIN, [test "x${is_cygwin}" = xyes])
 
 AC_SUBST(MAIN_LD)
 AC_SUBST(MAIN_LDFLAGS)
@@ -1873,7 +1833,7 @@
 ## FreeBSD 7.3 lacks nearbyintl/rintl (nearbyint appeared in 5.2)
 ## Apparently rint was once broken on HP-UX: undefine HAVE_RINT for such platforms
 ## Cygwin and FreeBSD lacked powl (FreeBSD 10 seems to have it).
-## Cygwin has rintl but not nearbyintl
+## Cygwin had rintl but not nearbyintl
 R_CHECK_FUNCS([expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl], [#include <math.h>])
 ## va_copy is C99: required as from R 2.13.0
 R_CHECK_FUNCS([va_copy], [#include <stdarg.h>])
@@ -1887,11 +1847,12 @@
 AC_CHECK_HEADERS(sunmath.h)
 AC_CHECK_LIB(sunmath, cospi)
 
-## Functions from draft C11 extensions, some of which are already in glibc
+## Functions from ISO/IEC TS 18661-4:2015 C11 extensions.
 ## For now, do not define _GNU_SOURCE here.
-## All but pown have long been in libsunmath
-AC_CHECK_FUNCS([atanpi atan2pi cospi exp10 pown sinpi tanpi], 
-[#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+## All but pown have long been in Solaris' libsunmath
+## OS X has __cospi __sinpi __tanpi
+AC_CHECK_FUNCS([atanpi atan2pi cospi exp10 pown sinpi tanpi __cospi __sinpi __tanpi], 
+[#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
 #include <math.h>
 #ifdef HAVE_SUNMATH_H
 #include <sunmath.h>
@@ -1910,6 +1871,7 @@
 if test "${ac_cv_have_decl_popen}" = "no"; then
    AC_MSG_ERROR([Building R requires the 'popen' system call])
 fi
+R_CHECK_FUNCS([getline], [#include <stdio.h>])
 ## Windows has neither setenv nor unsetenv
 R_CHECK_FUNCS([setenv unsetenv], [#include <stdlib.h>])
 R_CHECK_FUNCS([getrlimit getrusage getpriority], [#include <sys/resource.h>])
@@ -2319,9 +2281,6 @@
 ## BSD networking.
 R_BSD_NETWORKING
 
-## Bitmap headers and libraries.
-R_BITMAPS
-
 ## XDR headers and library routines.
 R_XDR
 
@@ -2341,55 +2300,15 @@
 R_TRE
 
 ## libcurl
-## curl-config might not match the installed libcurl,
-## so we allow the user to set CURL_CPPFLAGS, CURL_LIBS
-## and check the version directly rather than by curl-config --checkfor
-AC_PATH_PROG(CURL_CONFIG, curl-config)
-if test -n "${CURL_CONFIG}"; then
-  echo `${CURL_CONFIG} --version`
-  if test -z "${CURL_CPPFLAGS}"; then
-    CURL_CPPFLAGS=`${CURL_CONFIG} --cflags`
-  fi
-  ## This should be correct for a static-only build, user will
-  ## need to override to specify static linking (see config.site)
-  if test -z "${CURL_LIBS}"; then
-    CURL_LIBS=`${CURL_CONFIG} --libs`
-  fi
+R_LIBCURL
+
+
+## Bitmap headers and libraries.
+if test -n "${PKGCONF}"; then
+R_BITMAPS2
+else
+R_BITMAPS
 fi
-r_save_CPPFLAGS="${CPPLAGS}"
-CPPFLAGS="${CURL_CPPFLAGS} ${CPPFLAGS}"
-r_save_LIBS="${LIBS}"
-LIBS="${CURL_LIBS} ${LIBS}"
-AC_CACHE_CHECK([if libcurl version >= 7.28.0], [r_cv_have_curl728],
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <curl/curl.h>
-int main() 
-{
-#ifdef LIBCURL_VERSION_MAJOR
-#if LIBCURL_VERSION_MAJOR > 7
-  exit(0);
-#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
-  exit(0);
-#else
-  exit(1);
-#endif
-#else
-  exit(1);
-#endif
-}
-]])], [r_cv_have_curl728=yes], [r_cv_have_curl728=no], [r_cv_have_curl728=no])])
-if test "x${r_cv_have_curl728}" != xyes; then
-  ac_cv_have_curl_curl_h=0
-  CURL_CPPFLAGS=
-  CURL_LIBS=
-else
-  AC_CHECK_HEADERS(curl/curl.h)
-fi
-CPPFLAGS="${r_save_CPPFLAGS}"
-LIBS="${r_save_LIBS}"
-AC_SUBST(CURL_CPPFLAGS)
-AC_SUBST(CURL_LIBS)
 
 ## POSIX times.
 R_SYS_POSIX_LEAPSECONDS
@@ -2442,9 +2361,11 @@
     [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include "confdefs.h"
 #include <stdlib.h>
+/* This might get optimized out if not used */
 extern void * __libc_stack_end;
 
 int main () {
+    if(!__libc_stack_end) exit(1);
     exit(0);
 }
   ]])], [r_cv_libc_stack_end=yes], [r_cv_libc_stack_end=no], 
@@ -2616,7 +2537,7 @@
 : ${FCPICFLAGS="${fcpicflags}"}
 if test -z "${FCPICFLAGS}"; then
   case "${host_os}" in
-    aix*|cygwin*|irix*|mingw*|osf*)
+    aix*|irix*|mingw*|osf*)
       ;;
     *)
       AC_MSG_WARN([I could not determine FCPICFLAGS.])
@@ -2750,21 +2671,16 @@
     AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
     AC_DEFINE(HAVE_ICONVLIST, 1, [Define if you have the `iconvlist' function.])
     AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the <iconv.h> header file.])
-    AC_DEFINE(HAVE_INTERNET, 1, [Define if you have support for ftp/http
-                                 access.])
     AC_DEFINE(HAVE_JPEG, 1,[Define if you have the JPEG headers and libraries.])
     AC_DEFINE(HAVE_PNG, 1, [Define if you have the PNG headers and libraries.])
     AC_DEFINE(HAVE_POSIX_SETJMP, 1, [Define if you have POSIX.1 compatible
                                      sigsetjmp/siglongjmp.])
-    AC_DEFINE(HAVE_SOCKETS, 1, [Define if you have support for sockets.])
     AC_DEFINE(HAVE_TCLTK, 1, [Define if you have the Tcl/Tk headers and 
                               libraries and want Tcl/Tk support to be built.] )
     AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.])
     AC_DEFINE(HAVE_TIMES, 1, [Define to 1 if you have the `times' function.])
     want_R_profiling=yes
     AC_DEFINE(R_PROFILING, 1, [Define this to enable R-level profiling.])
-    AC_DEFINE(SUPPORT_LIBXML, 1, [Define if you provide support for the libxml
-                                  ftp/http functions.])
     ;;
 esac
 
@@ -2789,14 +2705,10 @@
   src/appl/Makefile
   src/extra/Makefile
   src/extra/blas/Makefile
-  src/extra/bzip2/Makefile
   src/extra/intl/Makefile
-  src/extra/pcre/Makefile
   src/extra/tre/Makefile
   src/extra/tzone/Makefile
   src/extra/xdr/Makefile
-  src/extra/xz/Makefile
-  src/extra/zlib/Makefile
   src/include/Makefile
   src/include/Rmath.h0
   src/include/R_ext/Makefile
@@ -2926,18 +2838,6 @@
   esac
   R_SH_VAR_ADD(r_external_libs, [LAPACK(${r_lapack})], [, ])
 fi
-if test "${have_zlib}" = yes; then
-  R_SH_VAR_ADD(r_external_libs, [zlib], [, ])
-fi
-if test "${have_bzlib}" = yes; then
-  R_SH_VAR_ADD(r_external_libs, [bzlib], [, ])
-fi
-if test "${have_lzma}" = yes; then
-  R_SH_VAR_ADD(r_external_libs, [lzma], [, ])
-fi
-if test "${have_pcre}" = yes; then
-  R_SH_VAR_ADD(r_external_libs, [PCRE], [, ])
-fi
 if test "${have_tre}" = yes; then
   R_SH_VAR_ADD(r_external_libs, [tre], [, ])
 fi
@@ -3023,7 +2923,7 @@
   Fortran 77 compiler:       ${r_f77_compiler}
 
   C++ compiler:              ${r_cxx_compiler}
-  C++ 11 compiler:           ${r_cxx1x_compiler}
+  C++11 compiler:            ${r_cxx1x_compiler}
   Fortran 90/95 compiler:    ${r_f95_compiler}
   Obj-C compiler:	     ${r_objc_compiler}
 
@@ -3061,6 +2961,9 @@
 if test -n "${warn_tcltk_version}"; then
   AC_MSG_WARN([${warn_tcltk_version}])
 fi
+if test -n "${warn_pcre_version}"; then
+  AC_MSG_WARN([${warn_pcre_version}])
+fi
 if test -n "${warn_info}"; then
   AC_MSG_WARN([${warn_info}])
 fi
diff -Nru r-base-3.2.3/debian/changelog r-base-3.3.1/debian/changelog
--- r-base-3.2.3/debian/changelog	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/changelog	2016-06-22 15:50:24.000000000 +0000
@@ -1,3 +1,150 @@
+r-base (3.3.1-1.xenial.0) xenial; urgency=medium
+
+  * PPA build for Ubuntu 16.04 ("xenial")
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 22 Jun 2016 10:46:47 -0500
+
+r-base (3.3.1-1) unstable; urgency=medium
+
+  * New upstream version released this morning
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 21 Jun 2016 05:16:41 -0500
+
+r-base (3.3.0.20160615-1) unstable; urgency=medium
+
+  * Initial rc build (r70789) of R 3.3.1 expected for June 23
+  
+  * debian/control: Set Standards-Version: to current version 
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 15 Jun 2016 20:04:57 -0500
+
+r-base (3.3.0-2) unstable; urgency=medium
+
+  * debian/control: Add libicu-dev to Depends: for r-base-dev
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 19 May 2016 07:35:03 -0500
+
+r-base (3.3.0-1) unstable; urgency=medium
+
+  * New upstream version released this morning
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 03 May 2016 06:05:36 -0500
+
+r-base (3.2.5.20160429-1) unstable; urgency=medium
+
+  * Second rc build (r70561) of R 3.3.0 expected for May 03
+
+  * debian/control: Remove remaining use of gcc-4.9 on mips	(Closes: #818781)
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 29 Apr 2016 06:22:06 -0500
+
+r-base (3.2.5.20160428-1) unstable; urgency=low
+
+  * Initial rc build (r70556) of R 3.3.0 expected for May 03
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 28 Apr 2016 06:42:20 -0500
+
+r-base (3.2.5-1) unstable; urgency=low
+
+  * New upstream release made today (as the version scheme in
+    3.2.4-revised created issues for some systems)
+    
+  * debian/updated_x11_logo.patch: Applied again to src/modules/X11/ files
+    devX11.c and rlogo_icon.h to provide the new R logo
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 14 Apr 2016 11:58:11 -0500
+
+r-base (3.2.4.20160412-1) unstable; urgency=low
+
+  * Fourth beta build (r70470) of R 3.3.0 expected for May 03
+  
+  * debian/rules: Remove gcc-4.9 invocation for mips	(Closes: #818781)
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 12 Apr 2016 22:06:54 -0500
+
+r-base (3.2.4.20160411-1) unstable; urgency=low
+
+  * Third beta build (r70465) of R 3.3.0 expected for May 03
+  
+  * debian/control: Remove use of gcc-4.9 on mips	(Closes: #818781)
+
+  * debian/r-core.shlibs: Removed			(Closes: #819343)
+  * debian/r-mathlib.shlibs: Ditto
+  
+ -- Dirk Eddelbuettel <edd@debian.org>  Mon, 11 Apr 2016 22:13:07 -0500
+
+r-base (3.2.4.20160406-1) unstable; urgency=medium
+
+  * Second beta build (r70427) of R 3.3.0 now expected for May 03
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 06 Apr 2016 09:00:27 -0500
+
+r-base (3.2.4.20160331-1) unstable; urgency=medium
+
+  * Initial beta build (r70404) of R 3.3.0 expected for April 14
+  
+  * debian/r-cran.mk: Also remove LICENSE		(Closes: #819344)
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 31 Mar 2016 19:43:27 -0500
+
+r-base (3.2.4-revised-1) unstable; urgency=medium
+
+  * New upstream release this afternoon
+  
+  * debian/updated_x11_logo.patch: Applied again to src/modules/X11/ files
+    devX11.c and rlogo_icon.h to provide the new R logo
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 16 Mar 2016 16:40:51 -0500
+
+r-base (3.2.4-1) unstable; urgency=medium
+
+  * New upstream version released this morning
+
+  * debian/updated_x11_logo.patch: Applied again to src/modules/X11/ files
+    devX11.c and rlogo_icon.h to provide the new R logo
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 10 Mar 2016 06:04:56 -0600
+
+r-base (3.2.3.20160306-1) unstable; urgency=medium
+
+  * Second rc build (r70278) of R 3.2.4 expected for March 10
+
+  * debian/rules: Do not install bash_completion in /etc (Closes: #816531)
+
+  * debian/updated_x11_logo.patch: Applied again to src/modules/X11/ files
+    devX11.c and rlogo_icon.h to provide the new R logo
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 04 Mar 2016 06:29:56 -0600
+
+r-base (3.2.3.20160303-1) unstable; urgency=low
+
+  * Initial rc build (r70270) of R 3.2.4 expected for March 10
+
+  * debian/rules: Adding 'R_TEXI2DVICMD=emulation' to cope with texinfo 6.1
+
+  * debian/updated_x11_logo.patch: Applied again to src/modules/X11/ files
+    devX11.c and rlogo_icon.h to provide the new R logo
+
+  * debian/rules: Commented-out make check with does not find packages
+  
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 03 Mar 2016 21:01:10 -0600
+
+r-base (3.2.3-6) unstable; urgency=low
+
+  * Rebuilding to now use openjdk-8-jdk (rather than openjdk-7-jdk) as
+    keep in sync with the change at the default-jdk package
+
+  * debian/rules: Added explicit 'cd doc/manual && $(MAKE) html)' 
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 18 Feb 2016 07:00:11 -0600
+
+r-base (3.2.3-5) unstable; urgency=low
+
+  * debian/icon-class-patch/R.desktop: Add trailing ';' in Categories
+    (with thanks to Pino Toscano)			(Closes: #812475)
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 24 Jan 2016 21:04:36 -0600
+
 r-base (3.2.3-4) unstable; urgency=low
 
   * debian/r-base-core.postinst: Don't run mktexlsr
diff -Nru r-base-3.2.3/debian/control r-base-3.3.1/debian/control
--- r-base-3.2.3/debian/control	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/control	2016-06-22 15:50:24.000000000 +0000
@@ -2,8 +2,8 @@
 Section: gnu-r
 Priority: optional
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
-Standards-Version: 3.9.6
-Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.6-dev, tk8.6-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, libcurl4-openssl-dev | libcurl4-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff5-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], mpack, bash-completion, gcc-4.9 [mips]
+Standards-Version: 3.9.7
+Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.6-dev, tk8.6-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, libcurl4-openssl-dev | libcurl4-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff5-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], mpack, bash-completion
 Homepage: http://www.r-project.org/
 
 Package: r-base
@@ -45,7 +45,7 @@
 
 Package: r-base-core
 Architecture: any
-Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0), ca-certificates, gcc-4.9 [mips]
+Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0), ca-certificates
 Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0), r-gnome (<= 2.3.1), r-cran-rcompgen (<= 0.1-17-1), r-base-latex (<= 2.9.2-4)
 Provides:  r-gnome, r-cran-rcompgen, r-base-latex, r-api-3
 Conflicts:  r-gnome, r-cran-rcompgen, r-base-latex
@@ -83,7 +83,7 @@
 
 Package: r-base-dev
 Architecture: all
-Depends: ${misc:Depends}, r-base-core (>= ${source:Version}), build-essential, gcc, g++, gfortran, libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev, libncurses5-dev, libreadline-dev, libjpeg-dev, libpcre3-dev, libpng-dev, zlib1g-dev, libbz2-dev, liblzma-dev, cdbs
+Depends: ${misc:Depends}, r-base-core (>= ${source:Version}), build-essential, gcc, g++, gfortran, libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev, libncurses5-dev, libreadline-dev, libjpeg-dev, libpcre3-dev, libpng-dev, zlib1g-dev, libbz2-dev, liblzma-dev, libicu-dev, cdbs
 Suggests: debhelper, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo
 Description: GNU R installation of auxiliary GNU R packages 
  R is a system for statistical computation and graphics.  It consists 
diff -Nru r-base-3.2.3/debian/icon-class-patch/R.desktop r-base-3.3.1/debian/icon-class-patch/R.desktop
--- r-base-3.2.3/debian/icon-class-patch/R.desktop	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/icon-class-patch/R.desktop	2016-06-22 15:50:24.000000000 +0000
@@ -7,4 +7,4 @@
 Icon=rlogo_icon
 Terminal=true
 StartupNotify=false
-Categories=Graphics;Science;Math
+Categories=Graphics;Science;Math;
diff -Nru r-base-3.2.3/debian/R r-base-3.3.1/debian/R
--- r-base-3.2.3/debian/R	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/R	1970-01-01 00:00:00.000000000 +0000
@@ -1,493 +0,0 @@
-### Copyright (C) 2005-2011 Deepayan Sarkar <Deepayan.Sarkar@R-project.org>
-###
-### This file provides programmable completion for R under the bash
-### shell.  It is made available under the terms of the GNU General
-### Public License, version 2, or at your option, any later version,
-### incorporated herein by reference.
-###
-### This program is distributed in the hope that it will be
-### useful, but WITHOUT ANY WARRANTY; without even the implied
-### warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-### PURPOSE.  See the GNU General Public License, available at
-### http://www.gnu.org/licenses/gpl.txt, for more details.
-
-
-### NOTE: This does NOT provide completion for commands within R, only
-### for R's command-line options.  For example,
-###
-### R CMD build --f[TAB]
-###
-### will complete to --force and so on. In other words, this is
-### potentially useful (for the most part) to package developers, not
-### regular users.
-
-### NEWS: Updated for R 2.4.0 (October 2006)
-
-### BUGS: As it stands, this is far from perfect.  Known bugs include:
-###
-### (1) file/directory name completion doesn't work when there is a ~
-### (1) in the name.  Fortunately, in such situations, one can always
-### (1) fall back to standard completion by using M-/ instead of TAB
-###
-### (2) Not all mutually exclusive options are properly handled
-###
-### (3) Doesn't test for the existence of R before defining the
-### (3) completion function (not strictly a bug, but definitely not a
-### (3) good feature)
-
-
-### INSTALLATION AND USAGE: You need to first install and enable bash
-### completion on your system to use this script.  See
-###
-### http://www.caliban.org/bash/index.shtml#completion
-###
-### to learn more about bash completion.  On a modern Debian system,
-### all the necessary files are already installed by the bash package.
-### To enable it, just uncomment the following lines in your .bashrc
-###
-### # if [ "$PS1" -a -f /etc/bash_completion ]; then
-### #     . /etc/bash_completion
-### # fi
-###
-### or to try it out in your current shell, type
-###
-### . /etc/bash_completion
-###
-### Once you are using bash completion, you can enable completion for
-### R by similarly sourcing this file.  For permanent use, place it in
-### your $BASH_COMPLETION_DIR (/etc/bash_completion.d in Debian).  If
-### you don't have access to do that, copy the contents of this file
-### in it's entirety to your ~/.bash_completion, which is sourced by
-### the bash_completion script.
-
-
-
-
-_R()
-{
-    local cur loneOpts helpOpts stdOpts argOpts versOpts cmds cmd furtherOpts
-    local fileNames dirNames i lastToken
-    # local IFS=$'\t\n'
-
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-
-    loneOpts='--version RHOME'
-    versOpts='-v --version' # only on commands
-    helpOpts='-h --help'
-
-    stdOpts='--save --no-save --no-environ --no-site-file            \
-    --no-init-file --restore --no-restore-data --no-restore-history  \
-    --no-restore --vanilla --no-readline -q --quiet --silent --slave \
-    --interactive --verbose -d -g --args -f -e'
-
-    ## these should end with a '=' and not be followed by a space.
-    ## Unfortunately, I haven't figured out how to make that work.
-    ## -nospace doesn't suppress the space, and if I add = at the end,
-    ## they get completed as "--debugger\= " etc.  Anyway, they are
-    ## kept separate in anticipation of some future fix...
-
-    argOpts='--min-vsize --max-vsize --min-nsize --max-nsize \
-    --encoding --max-ppsize --debugger --debugger-args \
-    --gui --arch --file'
-
-    cmds='BATCH COMPILE SHLIB INSTALL REMOVE build check LINK Rprof \
-    Rdconv Rd2pdf Rd2txt Stangle Sweave Rdiff config javareconf rtags'
-
-
-
-
-    fileNames='' # possible to have files in certain commands (e.g. BATCH)
-    dirNames=''
-
-
-    if [[ $COMP_CWORD -eq 1 ]] ; then
-	COMPREPLY=(
-	    $( compgen -W "CMD $loneOpts $helpOpts $stdOpts" -- $cur )
-	    $( compgen -o nospace -W "$argOpts" -- $cur )
-	)
-	return 0
-    fi
-
-    ## certain tokens preclude further activity
-    if [[ ${COMP_WORDS[$COMP_CWORD-1]} == @(-v|--version|RHOME|-h|--help) ]] ; then
-	return 0
-    fi
-
-    ## more complicated stuff
-    ## keep last token for use later
-    lastToken=${COMP_WORDS[$COMP_CWORD-1]}
-
-
-    ## if [[ $COMP_CWORD -gt 1 ]] && (implied)
-    if [[ ${COMP_WORDS[1]} == "CMD" ]] ; then
-
-	if [[ $COMP_CWORD -eq 2 ]] ; then
-	    COMPREPLY=(
-		$( compgen -W "$cmds" -- $cur )
-	    )
-	    return 0
-	else
-
-	    ## COMP_CWORD >= 3.  cmd=${COMP_WORDS[2]} is (hopefully)
-	    ## one of $cmds.  At this point, all further options
-	    ## (except -v|-h|RHOME etc handled above) will be assumed
-	    ## repeatable (except for duplicates and exclusives, to be
-	    ## handled later).  In the next step, possible completions
-	    ## for each cmd will be derived.
-
-	    ## A largely similar derivation is also needed for the
-	    ## case when ${COMP_WORDS[2]} is not CMD.  A similar
-	    ## completion list will be derived in that case.
-	    ## Afterwards, things will be removed from these as
-	    ## needed, before the final COMPREPLY is computed.
-
-	    cmd=${COMP_WORDS[2]}
-	    case $cmd in
-		BATCH)
-
-		    ## if last word is a filename (not starting with
-		    ## -) then no more options are allowed, but can be
-		    ## followed by any file (outfile)
-
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken != -* ]] ; then
-
-			furtherOpts=""
-			fileNames=$( compgen -f -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts $stdOpts $argOpts --no-timing"
-			fileNames=$( compgen -f -X '!*.@(R|r|S|s)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    fi
-		    ;;
-
-		COMPILE)
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken != -* ]] ; then
-
-			furtherOpts=""
-			fileNames=$( compgen -f -X '!*.@(c|cc|cpp|C|f)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts -D"
-			fileNames=$( compgen -f -X '!*.@(c|cc|cpp|C|f)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    fi
-		    ;;
-
-		SHLIB)
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken != -* ]] ; then
-
-			furtherOpts=""
-			fileNames=$( compgen -f -X '!*.@(a|o)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts -o --output -c --clean \
- --preclean -n --dry-run"
-			fileNames=$( compgen -f -X '!*.@(a|o)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    fi
-
-		    ;;
-
-		INSTALL)
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken == @(-l|--library) ]] ; then
-
-			furtherOpts=""
-			dirNames=$( compgen -d -- "$cur" )
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts                \
---configure-args --configure-vars -c --clean --preclean -d --debug -l  	\
---library --no-configure --no-docs --html --no-html --latex --example	\
---fake --no-lock --lock --pkglock --build --install-tests --no-R,	\
---no-libs --no-data --no-help --no-demo --no-exec --no-inst		\
---no-multiarch --libs-only --data-compress --resave-data		\
---compact-docs --with-keep.source --without-keep.source --byte-compile	\
---no-clean-on-error"
-			fileNames=$( compgen -f -X '!*.@(tar.gz|tgz)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    fi
-		    ;;
-
-		REMOVE)
-		    furtherOpts="$versOpts $helpOpts -l --library"
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken == @(-l|--library) ]] ; then
-			dirNames=$( compgen -d -- "$cur" )
-		    fi
-		    ;;
-
-		build)
-
-		    furtherOpts="$versOpts $helpOpts \
---force --keep-empty-dirs --no-vignettes --no-manual --resave-data \
---no-resave-data --compact-vignettes"
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-		check)
-
-		    furtherOpts="$versOpts $helpOpts           \
--l --library -o --outdir				       \
---no-clean --no-codoc --no-examples --no-install --no-tests    \
---no-manual --no-vignettes --no-rebuild-vignettes --use-gct    \
---use-valgrind --timings --install-args --check-subdirs	       \
---extra-arch --multiarch --no-multiarch --force-multiarch"
-
-		    fileNames=$( compgen -f -X '!*.@(tar.gz|tgz)' -- "$cur" )
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-		LINK)
-		    furtherOpts="$versOpts $helpOpts"
-		    ;;
-
-		Rprof)
-		    furtherOpts="$versOpts $helpOpts --total --self --min%total --min%self"
-		    fileNames=$( compgen -f -- "$cur" )
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-		Rdconv)
-
-		    furtherOpts="$versOpts $helpOpts -t --type \
-		    --encoding --package -o --output --os --OS"
-
-		    fileNames=$( compgen -f -X '!*.@(Rd)' -- "$cur" )
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-		Rd2pdf)
-
-		    furtherOpts="$versOpts $helpOpts --batch            \
-		    --no-clean --no-preview --encoding --outputEncoding \
-                    --os --OS -o --output --force --title               \
-		    --no-index --no-description --internals"
-
-		    fileNames=$( compgen -f -X '!*.@(Rd)' -- "$cur" )
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-		Rd2txt)
-		    furtherOpts="$versOpts $helpOpts -t --type --encoding --package -o --output --os --OS"
-		    fileNames=$( compgen -f -X '!*.@(Rd)' -- "$cur" )
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-		Sweave)
-
-		    ## if last word is a filename (not starting with
-		    ## -) then nothing more is allowed
-
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken != -* ]] ; then
-
-			return 0
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts --driver --encoding --options --pdf"
-			fileNames=$( compgen -f -X '!*.@(Rnw|rnw|Snw|snw)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    fi
-		    ;;
-
-		Stangle)
-
-		    ## if last word is a filename (not starting with
-		    ## -) then nothing more is allowed
-
-		    if [[ $COMP_CWORD -gt 3 ]] && \
-			[[ $lastToken != -* ]] ; then
-
-			return 0
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts --encoding --options"
-			fileNames=$( compgen -f -X '!*.@(Rnw|rnw|Snw|snw)' -- "$cur" )
-			dirNames=$( compgen -d -- "$cur" )
-
-		    fi
-		    ;;
-
-		config)
-
-		    if [[ $COMP_CWORD -gt 3 ]] ; then
-
-			return 0
-
-		    else
-
-			furtherOpts="$versOpts $helpOpts --ldflags  --cppflags  \
-BLAS_LIBS CC CFLAGS CPICFLAGS CPP CPPFLAGS CXX CXXCPP CXXFLAGS			\
-CXXPICFLAGS DYLIB_EXT DYLIB_LD DYLIB_LDFLAGS F77 FFLAGS FLIBS			\
-FPICFLAGS FC FCFLAGS FCPICFLAGS JAR JAVA JAVAC JAVAH JAVA_HOME			\
-JAVA_LIBS JAVA_CPPFLAGS LAPACK_LIBS LIBnn LDFLAGS OBJC OBJCFLAGS MAKE		\
-SAFE_FFLAGS SHLIB_CFLAGS SHLIB_CXXLD SHLIB_CXXLDFLAGS SHLIB_EXT			\
-SHLIB_FFLAGS SHLIB_LD SHLIB_LDFLAGS SHLIB_FCLD, SHLIB_FCLDFLAGS			\
-TCLTK_CPPFLAGS TCLTK_LIBS"
-
-		    fi
-		    ;;
-
-
-		javareconf)
-		    furtherOpts="$versOpts $helpOpts -n --dry-run -e"
-		    ;;
-
-
-		rtags)
-		    furtherOpts="$versOpts $helpOpts -o --output --no-c --no-R \
-                                --no-Rd -a --append -V --verbose"
-		    dirNames=$( compgen -d -- "$cur" )
-		    ;;
-
-	    esac
-
-	fi
-
-    elif [[ $lastToken == "<" ]] ; then
-
-	## R [options] < <need .R file here>
-	furtherOpts=""
-	fileNames=$( compgen -f -X '!*.@(R|r|S|s)' -- "$cur" )
-	dirNames=$( compgen -d -- "$cur" )
-
-    elif [[ $lastToken == ">" ]] ; then
-
-	## R [options] > <need output file here>
-	furtherOpts=""
-	fileNames=$( compgen -f -- "$cur" )
-	dirNames=$( compgen -d -- "$cur" )
-
-    else
-
-	case $lastToken in
-
-	    -g|--gui)
-		furtherOpts="X11 Tk"
-		;;
-	    -d|--debugger) ## allow commands
-		furtherOpts=$( compgen -c -- "$cur" )
-		;;
-
-	    *) ## NOT 'R CMD <something> ': see comments above
-		furtherOpts="$versOpts $helpOpts $stdOpts $argOpts" ;;
-
-	esac
-    fi
-
-    ## need some removal,
-
-    ## take out options already given
-    for (( i=1; i<=$COMP_CWORD-1; ++i )) ; do
-
-	opt=${COMP_WORDS[$i]}
-
-	case $opt in
-	    --*)    optBase=${opt/=*/} ;;
-	    -*)     optBase=${opt:0:2} ;;
-	esac
-
-	## can't seem to do this using case
-	if [[ $opt == "<" ]] ; then
-	    ## no more args allowed
-	    furtherOpts=""
-	elif [[ $opt == ">" ]] ; then
-	    ## no more args allowed
-	    furtherOpts=""
-	fi
-
-
-	allOpts=" $furtherOpts "
-	allOpts=${allOpts/ ${optBase} / }
-
-	#echo $allOpts
-
-        ## take out alternatives and mutually exclusives
-	case $optBase in
-
-# not working
-# 	    "<") ## only filenames allowed
-# 		echo "-----------"
-# 		allOpts=">" ;;
-# 	    ">") ## only filenames allowed
-# 		allOpts="<" ;;
-
-	    -q|--quiet|--silent)
-		allOpts=${allOpts/ -q / }
-		allOpts=${allOpts/ --quiet / }
-		allOpts=${allOpts/ --silent / }
-		#echo $allOpts
-
-		;;
-	    --save|--no-save)
-		allOpts=${allOpts/ --save / }
-		allOpts=${allOpts/ --no-save / }
-		;;
-	    --vanilla)
-		allOpts=${allOpts/ --no-save / }
-		allOpts=${allOpts/ --no-restore / }
-		allOpts=${allOpts/ --no-site-file / }
-		allOpts=${allOpts/ --no-init-file / }
-		allOpts=${allOpts/ --no-environ / }
-		;;
-	    -d)               allOpts=${allOpts/ --debugger / } ;;
-	    --debugger)       allOpts=${allOpts/ -d / } ;;
-	    --restore)        allOpts=${allOpts/ --no-restore / } ;;
-	    --no-restore)     allOpts=${allOpts/ --restore / } ;;
-	    -g|--gui)
-		allOpts=${allOpts/ -g / }
-		allOpts=${allOpts/ --gui / }
-		;;
-
- 	    BATCH)
-		allOpts=${allOpts/ --restore / }
-		allOpts=${allOpts/ --save / }
-		allOpts=${allOpts/ --no-readline / }
-		;;
-
-	esac
-
-    done
-
-    ## and finally:
-
-    COMPREPLY=(
-	$( compgen -W "$allOpts $fileNames $dirNames" -- $cur )
-    )
-    return 0
-
-
-}
-
-
-complete -F _R -o filenames R
-
-## Add more aliases here, e.g.
-
-# for e in R-2.4 R-devel R-patched; do complete -F _R -o filenames ${e}; done
-
-
-
-### Local variables:
-### mode: shell-script
-### End:
diff -Nru r-base-3.2.3/debian/r-base-core.shlibs r-base-3.3.1/debian/r-base-core.shlibs
--- r-base-3.2.3/debian/r-base-core.shlibs	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/r-base-core.shlibs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libR 1 r-base-core (>= 2.9.2)
diff -Nru r-base-3.2.3/debian/r-base-core.shlibs.hidden r-base-3.3.1/debian/r-base-core.shlibs.hidden
--- r-base-3.2.3/debian/r-base-core.shlibs.hidden	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/debian/r-base-core.shlibs.hidden	2016-06-22 15:50:24.000000000 +0000
@@ -0,0 +1 @@
+libR 1 r-base-core (>= 2.9.2)
diff -Nru r-base-3.2.3/debian/r-cran.mk r-base-3.3.1/debian/r-cran.mk
--- r-base-3.2.3/debian/r-cran.mk	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/r-cran.mk	2016-06-22 15:50:24.000000000 +0000
@@ -117,7 +117,8 @@
                 ## remove extra files which are present in some packages
 		rm -vf $(debRlib)/R.css 			\
 			$(debRlib)/$(cranNameOrig)/COPYING 	\
-			$(debRlib)/$(cranNameOrig)/LICENSE.txt
+			$(debRlib)/$(cranNameOrig)/LICENSE.txt	\
+			$(debRlib)/$(cranNameOrig)/LICENSE
                 ## if we have an overrides file for lintian, install it
 		if test -f debian/overrides; then 		\
 			install -d $(lintiandir) ; 		\
diff -Nru r-base-3.2.3/debian/r-mathlib.shlibs r-base-3.3.1/debian/r-mathlib.shlibs
--- r-base-3.2.3/debian/r-mathlib.shlibs	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/r-mathlib.shlibs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libRmath 1 r-mathlib (>= 2.0)
diff -Nru r-base-3.2.3/debian/r-mathlib.shlibs.hidden r-base-3.3.1/debian/r-mathlib.shlibs.hidden
--- r-base-3.2.3/debian/r-mathlib.shlibs.hidden	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/debian/r-mathlib.shlibs.hidden	2016-06-22 15:50:24.000000000 +0000
@@ -0,0 +1 @@
+libRmath 1 r-mathlib (>= 2.0)
diff -Nru r-base-3.2.3/debian/rules r-base-3.3.1/debian/rules
--- r-base-3.2.3/debian/rules	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/debian/rules	2016-06-22 15:50:24.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file for the Debian GNU/Linux r-base package
 # Copyright 1997-2003  Douglas Bates <bates@stat.wisc.edu> 
-# Copyright 1998-2014  Dirk Eddelbuettel <edd@debian.org>
+# Copyright 1998-2016  Dirk Eddelbuettel <edd@debian.org>
 #
 # $Id: rules,v 1.3 2007/05/06 17:13:23 edd Exp edd $
 
@@ -76,11 +76,12 @@
 fortrancompiler	= F77=gfortran
 f95compiler     = gfortran
 # edd 10 Jan 2016  mips currently needs gcc-4.9 (cf #810357) and big thanks to Sébastien Villemot
-ifeq ($(arch),mips)
-compiler	= "gcc-4.9 -std=gnu99"
-else
+# edd 12 Apr 2016  mips treatment removed again after kernel fix on 
+#ifeq ($(arch),mips)
+#compiler	= "gcc-4.9 -std=gnu99"
+#else
 compiler	= "gcc -std=gnu99"
-endif
+#endif
 cxxcompiler	= g++
 
 # edd 31 Mar 2014
@@ -243,6 +244,7 @@
 	#autoconf
 
 	dh_testdir
+	R_TEXI2DVICMD=emulation				\
 	R_PAPERSIZE=letter				\
 	R_BROWSER=xdg-open				\
 	R_GZIPCMD="/bin/gzip -n"			\
@@ -352,21 +354,23 @@
         ## edd 25 Jan 2004 make docs and make html are made in make-arch
         ## edd 05 Feb 2004 finally, this works in pre-1.9.0 with Kurt's
         ##		   R_CMD_BUILD_HELP_OPTS
-	$(MAKE) docs
+	$(MAKE) -k docs
+	(cd doc/manual && $(MAKE) html)
 #	$(MAKE) html
 #	$(MAKE) help
 	$(MAKE) info
 	(cd doc/manual && \
 		$(MAKE) refman.pdf R-admin.pdf R-data.pdf R-exts.pdf \
 			R-FAQ.pdf R-intro.pdf R-ints.pdf R-lang.pdf)
-	$(MAKE) pdf
-	$(MAKE) vignettes
+	$(MAKE) -k pdf
+	$(MAKE) -k vignettes
 	touch make-indep-stamp
 
 make: make-stamp
 make-stamp: make-arch make-indep 
 
-check: make-arch check-stamp
+#check: make-arch check-stamp
+check: make-stamp check-stamp
 check-stamp: 
 	@echo "*** check ***"
 #ifneq	($(arch),arm)
@@ -573,10 +577,10 @@
         #install -m 0644 debian/R.bash_completion	\
         #	debian/$(corepackage)/etc/bash_completion.d/R
         # edd 24 Mar 2014  now installs via dh_bash-completion
-	#dh_bash-completion	
+	dh_bash-completion	
 	# edd 12 Jan 2016  new location
-	install -m 0644 debian/R.bash-completion \
-		debian/$(corepackage)/usr/share/bash-completion/completions/R
+	#install -m 0644 debian/R.bash-completion \
+	#	debian/$(corepackage)/usr/share/bash-completion/completions/R
 
         # edd 02 May 2007  add libR.conf for ld.so
         # edd 13 Sep 2009  no more under Policy 3.8.3
diff -Nru r-base-3.2.3/doc/COPYRIGHTS r-base-3.3.1/doc/COPYRIGHTS
--- r-base-3.2.3/doc/COPYRIGHTS	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/COPYRIGHTS	2016-03-16 23:04:41.000000000 +0000
@@ -29,7 +29,7 @@
 This applies only to the header files
 
 src/include/R.h
-src/include/Rdefines.h
+4src/include/Rdefines.h
 src/include/Rgraphics.h
 src/include/Rinternals.h
 src/include/Rmath.h
@@ -285,23 +285,23 @@
 src/modules/lapack/dlapack.f, cmplx.f, dlamc.f
 
   Extracted from
-  *  -- LAPACK computational routine (version 3.5.0) --
+  *  -- LAPACK computational routine (version 3.6.0) --
   *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
   *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-  *     September 2012
+  *     Novemeber 2015
 
   where the version number, providers and date vary by subroutine.
 
-  LAPACK 3.5.0 contains a LICENSE file, copied to src/modules/lapack
+  LAPACK 3.6.0 contains a LICENSE file, copied to src/modules/lapack
   (but many of these routines were originally copied from earlier
   versions of LAPACK).  For binary distributions it is reproduced here:
 
-  Copyright (c) 1992-2011 The University of Tennessee and The University
+  Copyright (c) 1992-2015 The University of Tennessee and The University
                           of Tennessee Research Foundation.  All rights
                           reserved.
-  Copyright (c) 2000-2011 The University of California Berkeley. All
+  Copyright (c) 2000-2015 The University of California Berkeley. All
                           rights reserved.
-  Copyright (c) 2006-2012 The University of Colorado Denver.  All rights
+  Copyright (c) 2006-2015 The University of Colorado Denver.  All rights
                           reserved.
 
   $COPYRIGHT$
@@ -326,8 +326,8 @@
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.
 
-   The copyright holders provide no reassurances that the source code
-   provided does not infringe any patent, copyright, or any other
+  The copyright holders provide no reassurances that the source code
+  provided does not infringe any patent, copyright, or any other
   intellectual property rights of third parties.  The copyright holders
   disclaim any liability to any recipient for claims brought against
   recipient by any third party for infringement of that parties
@@ -351,12 +351,6 @@
 
 	See the file src/extra/xdr/copyrght.txt
 
-
-src/extra/zlib/README, *.c, *.h
-
-  Taken from zlib-1.2.8 (C) 1995-2013 Jean-loup Gailly and Mark Adler
-  See src/extra/zlib/README for the licence.
-
 src/main/connections.c, src/main/gzio.h
 
   Contain code derived from the zlib 1.2.3 distribution
@@ -368,16 +362,11 @@
   in the zlib 1.2.3 distribution with updates taken from 1.2.5.
 
 
-src/extra/pcre/LICENCE
-src/extra/pcre/*.[ch]
 src/main/valid_utf8.h
 
-   Copyright (c) 1997-2013 University of Cambridge
-   All rights reserved.
-   Copyright(c) 2009-2013 Zoltan Herczeg
+   Copyright (c) 1997-2012 University of Cambridge
 
-See file src/extra/pcre/LICENCE.  For binary builds of R that requires
-us to include
+For binary builds of R that requires us to include
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
@@ -407,20 +396,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 
-src/extra/bzip2/LICENSE
-src/extra/bzip2/blocksort.c
-src/extra/bzip2/bzlib.c
-src/extra/bzip2/bzlib.h
-src/extra/bzip2/bzlib_private.h
-src/extra/bzip2/compress.c
-src/extra/bzip2/crctable.c
-src/extra/bzip2/decompress.c
-src/extra/bzip2/huffman.c
-src/extra/bzip2/randtable.c
-
-   copyright (C) 1996-2010 Julian R Seward.
-
-
 src/extra/tre/LICENSE
 src/extra/tre/*.[ch]
 
@@ -586,3 +561,25 @@
 
 src/appl/lbfgsb.c is based on the work of Zhu, Byrd, Lu-Chen and
 Nocedal, which does not state any copyright.
+
+src/main/radixsort.c is largely based on code from the data.table package,
+
+   Copyright (C) 2006--2015  Matt Dowle and Arun Srinivasan
+
+doc/html/Rlogo.svg
+doc/html/Rlogo.pdf
+doc/html/logo.jpg
+doc/html/favicon.ico
+src/modules/X11/rlogo_icon.h
+src/gnuwin32/front-ends/R.ico
+src/gnuwin32/installer/R.bmp
+
+   Copyright (C) 2015-2016 The R Foundation
+   
+   You can distribute the logo under the terms of the Creative
+   Commons Attribution-ShareAlike 4.0 International license (CC-BY-SA
+   4.0) or (at your option) the GNU General Public License version 2
+   (GPL-2).
+
+   The design of the current logo is based on the previous logo that
+   was included in the R source from 1998 to 2016.
diff -Nru r-base-3.2.3/doc/CRAN_mirrors.csv r-base-3.3.1/doc/CRAN_mirrors.csv
--- r-base-3.2.3/doc/CRAN_mirrors.csv	2015-12-08 23:15:09.000000000 +0000
+++ r-base-3.3.1/doc/CRAN_mirrors.csv	2016-03-16 23:04:41.000000000 +0000
@@ -1,6 +1,6 @@
 Name,Country,City,URL,Host,Maintainer,OK,CountryCode,Comment
-"0-Cloud [https]",0-Cloud,0-Cloud,https://cran.rstudio.com/,"Rstudio, automatic redirection to servers worldwide","winston # stdout.org",1,us,"secure_mirror_from_master"
-0-Cloud,0-Cloud,0-Cloud,http://cran.rstudio.com/,"Rstudio, automatic redirection to servers worldwide","winston # stdout.org",1,us,"secure_mirror_from_master"
+"0-Cloud [https]",0-Cloud,0-Cloud,https://cloud.r-project.org/,"Automatic redirection to servers worldwide, currently sponsored by Rstudio","winston # stdout.org",1,us,"secure_mirror_from_master"
+0-Cloud,0-Cloud,0-Cloud,http://cloud.r-project.org/,"Automatic redirection to servers worldwide, currently sponsored by Rstudio","winston # stdout.org",1,us,"secure_mirror_from_master"
 Algeria,Algeria,Algiers,http://cran.usthb.dz/,"University of Science and Technology Houari Boumediene","Boukala m c <mboukala # usthb.dz>",1,dz
 "Argentina (La Plata)",Argentina,"La Plata",http://mirror.fcaglp.unlp.edu.ar/CRAN/,"Universidad Nacional de La Plata","esuarez # Fcaglp.unlp.edu.ar",1,ar
 "Australia (Canberra)",Australia,Canberra,http://cran.csiro.au/,CSIRO,"Bill.Venables # CSIRO.au, ServiceDesk2 # CSIRO.au",1,au
@@ -8,6 +8,7 @@
 "Austria [https]",Austria,Wien,https://cran.wu.ac.at/,"Wirtschaftsuniversität Wien","CRAN # R-project.org",1,at
 Austria,Austria,Wien,http://cran.wu.ac.at/,"Wirtschaftsuniversität Wien","CRAN # R-project.org",1,at
 "Belgium (Antwerp)",Belgium,Antwerp,http://www.freestatistics.org/cran/,"K.U.Leuven Association","patrick # wessa.net",1,be
+"Belgium (Ghent) [https]",Belgium,Ghent,https://lib.ugent.be/CRAN/,"Ghent University Library","Patrick Hochstenbach <Patrick.Hochstenbach # UGent.be>",1,be
 "Belgium (Ghent)",Belgium,Ghent,http://lib.ugent.be/CRAN/,"Ghent University Library","Patrick Hochstenbach <Patrick.Hochstenbach # UGent.be>",1,be
 "Brazil (BA)",Brazil,Ilheus,http://nbcgib.uesc.br/mirrors/cran/,"Center for Comp. Biol. at Universidade Estadual de Santa Cruz","eduardo # nbcgib.uesc.br",1,br
 "Brazil (PR)",Brazil,Curitiba,http://cran-r.c3sl.ufpr.br/,"Universidade Federal do Parana","Paulo Justiniano Ribeiro Junior <paulojus # ufpr.br>",1,br
@@ -29,11 +30,10 @@
 "Colombia (Cali) [https]",Colombia,Cali,https://www.icesi.edu.co/CRAN/,"Icesi University","adminred # Icesi.edu.co",1,co,"secure_mirror_from_master"
 "Colombia (Cali)",Colombia,Cali,http://www.icesi.edu.co/CRAN/,"Icesi University","adminred # Icesi.edu.co",1,co,"secure_mirror_from_master"
 "Czech Republic","Czech Republic","Prague",http://mirrors.nic.cz/R/,"CZ.NIC, Prague","mirrors # nic.cz",1,cz
-Denmark,Denmark,Aalborg,http://mirrors.dotsrc.org/cran/,"dotsrc.org, Aalborg","mirror # dotsrc.org",1,dk
 Ecuador,Ecuador,Guayaquil,http://cran.espol.edu.ec/,"Escuela Superior Politecnica del Litoral","jrodrig # espol.edu.ec",1,ec,"secure_mirror_from_master"
 "El Salvador","El Salvador","San Salvador",http://cran.salud.gob.sv/,"Ministry of Health (Ministerio de Salud)","mirror # salud.gob.sv",1,sv
 "Estonia",Estonia,Tartu,http://ftp.eenet.ee/pub/cran/,"EENet","eenet # eenet.ee",1,ee,"secure_mirror_from_master"
-"France (Lyon 1)",France,Lyon,http://cran.univ-lyon1.fr/,"Dept. of Biometry & Evol. Biology, University of Lyon","Jean Thioulouse <Jean.Thioulouse # univ-lyon1.fr>",1,fr
+"France (Lyon 1) [https]",France,Lyon,https://pbil.univ-lyon1.fr/CRAN/,"Dept. of Biometry & Evol. Biology, University of Lyon","Jean Thioulouse <Jean.Thioulouse # univ-lyon1.fr>",1,fr,"secure_mirror_from_master"
 "France (Lyon 2) [https]",France,Lyon,https://mirror.ibcp.fr/pub/CRAN/,"CNRS IBCP, Lyon","alexis.michon # ibcp.fr",1,fr,"secure_mirror_from_master"
 "France (Lyon 2)",France,Lyon,http://mirror.ibcp.fr/pub/CRAN/,"CNRS IBCP, Lyon","alexis.michon # ibcp.fr",1,fr,"secure_mirror_from_master"
 "France (Marseille)",France,Marseille,"http://cran.biotools.fr/","IBDM, Marseille","andrew.saurin # univ-amu.fr",1,fr
@@ -54,10 +54,11 @@
 Iran,Iran,Mashhad,http://cran.um.ac.ir/,"Ferdowsi University of Mashhad","Majid Sarmad <sarmad # um.ac.ir>",1,ir
 Ireland,Ireland,Dublin,http://ftp.heanet.ie/mirrors/cran.r-project.org/,"HEAnet,Dublin","mirrors # heanet.ie",1,ie
 "Italy (Milano)",Italy,Milano,http://cran.mirror.garr.it/mirrors/CRAN/,"Garr Mirror, Milano","mirror-service # garr.it",1,it
-"Italy (Padua) [https]",Italy,Padua,http://cran.stat.unipd.it/,"University of Padua","cran # stat.unipd.it",1,it
+"Italy (Padua) [https]",Italy,Padua,https://cran.stat.unipd.it/,"University of Padua","cran # stat.unipd.it",1,it
 "Italy (Padua)",Italy,Padua,http://cran.stat.unipd.it/,"University of Padua","cran # stat.unipd.it",1,it
 "Italy (Palermo)",Italy,Palermo,http://dssm.unipa.it/CRAN/,"Universita degli Studi di Palermo","angelo.mineo # unipa.it, apontillo # gmail.com",1,it
-"Japan (Tokyo)",Japan,Tokyo,http://cran.ism.ac.jp/,"Institute of Statistical Mathematics, Tokyo","Junji Nakano <nakanoj # ism.ac.jp>",1,jp,"secure_mirror_from_master"
+"Japan (Tokyo) [https]",Japan,Tokyo,https://cran.ism.ac.jp/,"The Institute of Statistical Mathematics, Tokyo","Junji Nakano <nakanoj # ism.ac.jp>",1,jp,"secure_mirror_from_master"
+"Japan (Tokyo)",Japan,Tokyo,http://cran.ism.ac.jp/,"The Institute of Statistical Mathematics, Tokyo","Junji Nakano <nakanoj # ism.ac.jp>",1,jp,"secure_mirror_from_master"
 "Japan (Yamagata)",Japan,Yamagata,http://ftp.yz.yamagata-u.ac.jp/pub/cran/,"Yamagata University","ftp-admin # ftp.yz.yamagata-u.ac.jp",1,jp
 "Korea (Seoul 1)",Korea,Seoul,http://cran.nexr.com/,"NexR Corporation, Seoul","mining # nexr.com",1,kr
 "Korea (Seoul 2)",Korea,Seoul,http://healthstat.snu.ac.kr/CRAN/,"Graduate School of Public Health, Seoul National University, Seoul","Sunghow # gmail.com",1,kr,"secure_mirror_from_master"
@@ -69,11 +70,12 @@
 "Mexico (Queretaro)",Mexico,Queretaro,http://cran.jellyfish.lol/,"Jellyfish Foundation","Marco Galicia <galprasmarco # gmail.com>",1,mx
 "Netherlands (Amsterdam)",Netherlands,Amsterdam,http://cran.xl-mirror.nl/,"XL-Data, Amsterdam","werner # xl-mirror.nl",1,nl
 "Netherlands (Utrecht)",Netherlands,Utrecht,http://cran-mirror.cs.uu.nl/,"Utrecht University","webmaster # cs.uu.nl",1,nl
+"New Zealand [https]","New Zealand",Auckland,https://cran.stat.auckland.ac.nz/,"University of Auckland","w.schmidt # auckland.ac.nz",1,nz
 "New Zealand","New Zealand",Auckland,http://cran.stat.auckland.ac.nz/,"University of Auckland","w.schmidt # auckland.ac.nz",1,nz
 Norway,Norway,Bergen,http://cran.uib.no/,"University of Bergen","sundrift # It.uib.no",1,no
 Philippines,Philippines,"Quezon City",http://cran.stat.upd.edu.ph/,"University of the Philippines and PREGINET","Edward Santos <edward.p.santos # upd.edu.ph>, ops # pregi.net",1,ph
 Poland,Poland,Wroclaw,http://r.meteo.uni.wroc.pl/,"University of Wroclaw","Paweł Netzel <netzel # meteo.uni.wroc.pl>",1,pl,"maintainer_address_bounces"
-"Portugal (Lisbon)",Portugal,Lisbon,http://cran.radicaldevelop.com/,"RadicalDevelop, Lda","geral # radicaldevelop.com",0,pt
+"Portugal (Lisbon)",Portugal,Lisbon,http://cran.radicaldevelop.com/,"RadicalDevelop, Lda","geral # radicaldevelop.com",1,pt
 "Portugal (Porto)",Portugal,Porto,http://cran.dcc.fc.up.pt/,"University of Porto","labcc # labcc.dcc.fc.up.pt",0,pt
 "Russia (Moscow) [https]",Russia,Moscow,https://cran.gis-lab.info/,GIS-Lab.info,"sim # gis-lab.info",1,ru
 "Russia (Moscow)",Russia,Moscow,http://cran.gis-lab.info/,GIS-Lab.info,"sim # gis-lab.info",1,ru
@@ -83,7 +85,8 @@
 "South Africa (Johannesburg)","South Africa",Johannesburg,http://cran.mirror.ac.za/,"TENET, Johannesburg","Patrick Holahan <patrickh # tenet.ac.za>",1,za
 "Spain (A Coruña) [https]","Spain","A Coruña",https://ftp.cixug.es/CRAN/,"Oficina de software libre (CIXUG)","<osl # cixug.es>",1,es,"secure_mirror_from_master"
 "Spain (A Coruña)","Spain","A Coruña",http://ftp.cixug.es/CRAN/,"Oficina de software libre (CIXUG)","<osl # cixug.es>",1,es,"secure_mirror_from_master"
-"Spain (Madrid)",Spain,Madrid,http://cran.es.r-project.org/,"Spanish National Research Network, Madrid","Jose Manuel Macias <jmanuel.macias # rediris.es>",1,es,"secure_mirror_from_master"
+"Spain (Madrid) [https]",Spain,Madrid,https://cran.rediris.es/,"Spanish National Research Network, Madrid","Jose Manuel Macias <jmanuel.macias # rediris.es>",1,es,"secure_mirror_from_master"
+"Spain (Madrid)",Spain,Madrid,http://cran.rediris.es/,"Spanish National Research Network, Madrid","Jose Manuel Macias <jmanuel.macias # rediris.es>",1,es,"secure_mirror_from_master"
 Sweden,Sweden,Umeå,http://ftp.acc.umu.se/mirror/CRAN/,"Academic Computer Club, Umeå University","<ftp-adm # acc.umu.se>",1,se
 "Switzerland [https]",Switzerland,Zürich,https://stat.ethz.ch/CRAN/,"ETH Zürich","Martin.Maechler # R-project.org",1,ch,"secure_mirror_from_master"
 Switzerland,Switzerland,Zürich,http://stat.ethz.ch/CRAN/,"ETH Zürich","Martin.Maechler # R-project.org",1,ch,"secure_mirror_from_master"
@@ -99,10 +102,9 @@
 "UK (London 1)",UK,London,http://cran.ma.imperial.ac.uk/,"Imperial College London","s.rochford # imperial.ac.uk",1,uk
 "UK (London 2)",UK,"London",http://mirror.mdx.ac.uk/R/,"Middlesex University London","Louis Slabbert <l.slabbert # mdx.ac.uk>",1,uk
 "UK (St Andrews)",UK,"St Andrews",http://star-www.st-andrews.ac.uk/cran/,"St Andrews University","Lee Kelvin <lsk9 # St-andrews.ac.uk>",1,uk,"maintainer_address_bounces"
-"USA (CA 1) [https]",USA,Berkeley,https://cran.cnr.Berkeley.edu/,"University of California, Berkeley, CA","casterln # nature.berkeley.edu",1,us,"secure_mirror_from_master"
-"USA (CA 1)",USA,Berkeley,http://cran.cnr.Berkeley.edu/,"University of California, Berkeley, CA","casterln # nature.berkeley.edu",1,us,"secure_mirror_from_master"
+"USA (CA 1) [https]",USA,Berkeley,https://cran.cnr.berkeley.edu/,"University of California, Berkeley, CA","casterln # nature.berkeley.edu",1,us,"secure_mirror_from_master"
+"USA (CA 1)",USA,Berkeley,http://cran.cnr.berkeley.edu/,"University of California, Berkeley, CA","casterln # nature.berkeley.edu",1,us,"secure_mirror_from_master"
 "USA (CA 2)",USA,"Los Angeles",http://cran.stat.ucla.edu/,"University of California, Los Angeles, CA","Jose Hales-Garcia <jose # stat.ucla.edu>",1,us
-"USA (CO)",USA,Denver,http://cran.mirrorcatalogs.com/,"Qarea Inc.","Gregory Edigarov <admin # mirrorcatalogs.com>",1,us,"secure_mirror_from_master"
 "USA (IA)",USA,Ames,http://mirror.las.iastate.edu/CRAN/,"Iowa State University, Ames, IA","statit # iastate.edu",1,us
 "USA (IN)",USA,Bloomington,http://ftp.ussg.iu.edu/CRAN/,"Indiana University","rtadmin # indiana.edu",1,us
 "USA (KS) [https]",USA,Lawrence,https://rweb.crmda.ku.edu/cran/,"University of Kansas, Lawrence, KS","Paul Johnson <pauljohn # ku.edu>",1,us,"secure_mirror_from_master"
@@ -117,7 +119,7 @@
 "USA (OH 1)",USA,Cleveland,http://cran.case.edu/,"Case Western Reserve University, Cleveland, OH","""Alberto H. Santana"" <ahs4 # case.edu>",1,us
 "USA (OH 2)",USA,Dayton,http://iis.stat.wright.edu/CRAN/,"Wright State University, Dayton, OH","Long Qu <long.qu # wright.edu>",1,us
 "USA (OR)",USA,Corvallis,http://ftp.osuosl.org/pub/cran/,"Oregon State University","support # Osuosl.org",1,us
-"USA (PA 1)",USA,Pittsburgh,http://lib.stat.cmu.edu/R/CRAN/,"Statlib, Carnegie Mellon University, Pittsburgh, PA",,0,us
+"USA (PA 1)",USA,Pittsburgh,http://lib.stat.cmu.edu/R/CRAN/,"Statlib, Carnegie Mellon University, Pittsburgh, PA","Carl Skipper <remarks # stat.cmu.edu>",1,us
 "USA (PA 2)",USA,Pittsburgh,http://cran.mirrors.hoobly.com/,"Hoobly Classifieds, Pittsburgh, PA","Peter Grigor <pgrigor # hoobly.com>",1,us
 "USA (TN) [https]",USA,"Oak Ridge",https://mirrors.nics.utk.edu/cran/,"National Institute for Computational Sciences, Oak Ridge, TN","help # nics.utk.edu",1,us
 "USA (TN)",USA,"Oak Ridge",http://mirrors.nics.utk.edu/cran/,"National Institute for Computational Sciences, Oak Ridge, TN","help # nics.utk.edu",1,us
diff -Nru r-base-3.2.3/doc/FAQ r-base-3.3.1/doc/FAQ
--- r-base-3.2.3/doc/FAQ	2015-12-10 08:01:26.000000000 +0000
+++ r-base-3.3.1/doc/FAQ	2016-06-21 07:08:01.000000000 +0000
@@ -1,6 +1,6 @@
 R FAQ
 Frequently Asked Questions on R
-Version 3.2.2015-12-04
+Version 2016-04-24
 Kurt Hornik
 
 
@@ -100,6 +100,7 @@
   7.41 Why does summary() report strange results for the R^2 estimate when I fit a linear model with no intercept?
   7.42 Why is R apparently not releasing memory?
   7.43 How can I enable secure https downloads in R?
+  7.44 How can I get CRAN package binaries for outdated versions of R?
 8 R Programming
   8.1 How should I write summary methods?
   8.2 How can I debug dynamically loaded code?
@@ -122,7 +123,7 @@
 1.1 Legalese
 ============
 
-This document is copyright © 1998-2015 by Kurt Hornik.
+This document is copyright © 1998-2016 by Kurt Hornik.
 
    This document is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by the
@@ -155,13 +156,13 @@
 1.3 Citing this document
 ========================
 
-In publications, please refer to this FAQ as Hornik (2015), "The R FAQ",
+In publications, please refer to this FAQ as Hornik (2016), "The R FAQ",
 and give the above, _official_ URL:
 
      @Misc{,
        author        = {Kurt Hornik},
        title         = {{R} {FAQ}},
-       year          = {2015},
+       year          = {2016},
        url           = {https://CRAN.R-project.org/doc/FAQ/R-FAQ.html}
      }
 
@@ -256,12 +257,15 @@
 2.3 What is the current version of R?
 =====================================
 
-The current released version is 3.2.3.  Based on this
-'major.minor.patchlevel' numbering scheme, there are two development
-versions of R, a patched version of the current release ('r-patched')
-and one working towards the next minor or eventually major ('r-devel')
-releases of R, respectively.  Version r-patched is for bug fixes mostly.
-New features are typically introduced in r-devel.
+R uses a 'major.minor.patchlevel' numbering scheme.  Based on this,
+there are the current release version of R ('r-release') as well as two
+development versions of R, a patched version of the current release
+('r-patched') and one working towards the next minor or eventually major
+('r-devel') releases of R, respectively.  New features are typically
+introduced in r-devel, while r-patched is for bug fixes mostly.
+
+   See <https://CRAN.R-project.org/sources.html> for the current
+versions of r-release, r-patched and r-devel.
 
 2.4 How can R be obtained?
 ==========================
@@ -369,9 +373,9 @@
 ----------------------------------
 
 The 'bin/macosx' directory of a CRAN site contains a standard Apple
-installer package to run on OS X 10.6 ('Snow Leopard') and later.  Once
+installer package to run on OS X 10.9 ('Mavericks') and later.  Once
 downloaded and executed, the installer will install the current release
-of R and an R.app OS X GUI.  This port of R for OS X is maintained by
+of R and R.app, the OS X GUI.  This port of R for OS X is maintained by
 Simon Urbanek <Simon.Urbanek@R-project.org> (and previously by Stefano
 Iacus).  The "R for Mac OS X FAQ
 (https://CRAN.R-project.org/bin/macosx/RMacOSX-FAQ.html) has more
@@ -526,9 +530,11 @@
        author       = {{R Core Team}},
        organization = {R Foundation for Statistical Computing},
        address      = {Vienna, Austria},
-       year         = 2015,
+       year         = YEAR,
        url          = {https://www.R-project.org}
      }
+where YEAR is the release year of the version of R used and can
+determined as 'R.version$year'.
 
    Citation strings (or BibTeX entries) for R and R packages can also be
 obtained by 'citation()'.
@@ -628,6 +634,9 @@
 OS X, and MS Windows).  CRAN also provides access to documentation on R,
 existing mailing lists and the R Bug Tracking system.
 
+   Since March 2016, "old" material is made available from a central
+CRAN archive server (<https://CRAN-archive.R-project.org/>).
+
    Please always use the URL of the master site when referring to CRAN.
 
 2.11 Can I use R for commercial purposes?
@@ -1230,8 +1239,8 @@
 "CGIwithR: Facilities for Processing Web Forms Using R" was published in
 the Journal of Statistical Software
 (<http://www.jstatsoft.org/v08/i10/>).  The package is now maintained by
-Duncan Temple Lang <duncan@wald.ucdavis.edu> and has a web page at
-<http://www.omegahat.org/CGIwithR/>.
+Duncan Temple Lang <duncan@wald.ucdavis.edu>.  and has a web page at
+<http://www.omegahat.net/CGIwithR/>.
 
    Jeff Horner is working on the R/Apache Integration Project which
 embeds the R interpreter inside Apache 2 (and beyond).  A tutorial and
@@ -1408,12 +1417,12 @@
 5.1.3 Add-on packages from Omegahat
 -----------------------------------
 
-The Omega Project for Statistical Computing (http://www.omegahat.org/)
+The Omega Project for Statistical Computing (http://www.omegahat.net/)
 provides a variety of open-source software for statistical applications,
 with special emphasis on web-based software, Java, the Java virtual
 machine, and distributed computing.  A CRAN style R package repository
-is available via <http://www.omegahat.org/R/>.  See
-<http://www.omegahat.org/> for information on most R packages available
+is available via <http://www.omegahat.net/R/>.  See
+<http://www.omegahat.net/> for information on most R packages available
 from the Omega project.
 
 5.1.4 Add-on packages from Bioconductor
@@ -2638,8 +2647,10 @@
 recommend that you use these methods.  The requisite code to add to
 '.Rprofile' or 'Rprofile.site' is:
 
-     options(download.file.method = "wininet", url.method = "wininet")     (Windows)
-     options(download.file.method = "libcurl", url.method = "libcurl")     (Linux and OS X)
+     options(download.file.method = "wininet", url.method = "wininet")
+     (Windows)
+     options(download.file.method = "libcurl", url.method = "libcurl")
+     (Linux and OS X)
 
 (Method '"wininet"' is the default on Windows as from R 3.2.2.)
 
@@ -2650,6 +2661,20 @@
 have been compiled without HTTPS support, but this is unlikely.  As from
 R 3.3.0 '"libcurl"' with HTTPS support is required except on Windows.
 
+7.44 How can I get CRAN package binaries for outdated versions of R?
+====================================================================
+
+Since March 2016, Windows and OS X binaries of CRAN packages for old
+versions of R (released more than 5 years ago) are made available from a
+central CRAN archive server instead of the CRAN mirrors.  To get these,
+one should set the CRAN "mirror" element of the 'repos' option
+accordingly, by something like
+     local({r <- getOption("repos")
+            r["CRAN"] <- "http://CRAN-archive.R-project.org"
+            options(repos = r)
+           })
+(see '?options' for more information).
+
 8 R Programming
 ***************
 
diff -Nru r-base-3.2.3/doc/html/about.html r-base-3.3.1/doc/html/about.html
--- r-base-3.2.3/doc/html/about.html	2014-12-11 23:15:05.000000000 +0000
+++ r-base-3.3.1/doc/html/about.html	2016-03-16 23:04:42.000000000 +0000
@@ -8,7 +8,7 @@
 
 <body>
 
-<h1>About <img class="toplogo" src="logo.jpg" alt="[R logo]"></h1>
+<h1>About <img class="toplogo" src="Rlogo.svg" alt="[R logo]"></h1>
 
 <hr width="100%">
 
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/doc/html/favicon.ico and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/doc/html/favicon.ico differ
diff -Nru r-base-3.2.3/doc/html/index-default.html r-base-3.3.1/doc/html/index-default.html
--- r-base-3.2.3/doc/html/index-default.html	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/html/index-default.html	2016-03-16 23:04:42.000000000 +0000
@@ -8,7 +8,7 @@
 <body>
 
 <h1>Statistical Data Analysis
-<img class="toplogo" src="logo.jpg" alt="[R logo]"> 
+<img class="toplogo" src="Rlogo.svg" alt="[R logo]"> 
 </h1>
 
 <hr width="100%">
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/doc/html/logo.jpg and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/doc/html/logo.jpg differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/doc/html/logosm.jpg and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/doc/html/logosm.jpg differ
diff -Nru r-base-3.2.3/doc/html/Makefile.in r-base-3.3.1/doc/html/Makefile.in
--- r-base-3.2.3/doc/html/Makefile.in	2013-09-01 22:05:04.000000000 +0000
+++ r-base-3.3.1/doc/html/Makefile.in	2016-03-16 23:04:41.000000000 +0000
@@ -11,12 +11,14 @@
 include $(top_builddir)/Makeconf
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+## logo.jpg is not used in R >= 3.3.0.
+## Rlogo.pdf is only used to make NEWS.pdf
 INSTFILES = \
-	NEWS.2.html R.css Search.html SearchOn.html \
-	favicon.ico left.jpg logo.jpg logosm.jpg right.jpg up.jpg \
+	NEWS.2.html R.css Rlogo.svg Rlogo.pdf Search.html SearchOn.html \
+	favicon.ico left.jpg logo.jpg right.jpg up.jpg \
 	about.html packages-head-utf8.html
 NON_SVN_INSTFILES = resources.html NEWS.html
-DISTFILES = Makefile.in $(INSTFILES) index-default.html
+DISTFILES = Makefile.in $(INSTFILES) index-default.html Notes
 OBJECTS = index.html
 ## <FIXME>
 ## We really should not create packages.html in *this* directory.
diff -Nru r-base-3.2.3/doc/html/NEWS.2.html r-base-3.3.1/doc/html/NEWS.2.html
--- r-base-3.2.3/doc/html/NEWS.2.html	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/html/NEWS.2.html	2016-03-16 23:04:41.000000000 +0000
@@ -15,7 +15,7 @@
 </p>
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.15.3</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.15.3</h3>
 
 
 
@@ -292,7 +292,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.15.2</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.15.2</h3>
 
 
 
@@ -876,7 +876,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.15.1</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.15.1</h3>
 
 
 
@@ -1292,7 +1292,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.15.0</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.15.0</h3>
 
 
 
@@ -1877,7 +1877,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.14.2</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.14.2</h3>
 
 
 
@@ -2081,7 +2081,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.14.1</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.14.1</h3>
 
 
 
@@ -2297,7 +2297,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.14.0</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.14.0</h3>
 
 
 
@@ -3495,7 +3495,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.13.2</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.13.2</h3>
 
 
 
@@ -3693,7 +3693,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.13.1</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.13.1</h3>
 
 
 
@@ -4003,7 +4003,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.13.0</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.13.0</h3>
 
 
 
@@ -5020,7 +5020,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.12.2 patched</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.12.2 patched</h3>
 
 
 
@@ -5084,7 +5084,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.12.2</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.12.2</h3>
 
 
 
@@ -5375,7 +5375,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.12.1</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.12.1</h3>
 
 
 
@@ -5612,7 +5612,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.12.0</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.12.0</h3>
 
 
 
@@ -6515,7 +6515,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.11.1 patched</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.11.1 patched</h3>
 
 
 
@@ -6667,7 +6667,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.11.1</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.11.1</h3>
 
 
 
@@ -6846,7 +6846,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.11.0</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.11.0</h3>
 
 
 
@@ -7615,7 +7615,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.10.1 patched</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.10.1 patched</h3>
 
 
 
@@ -7805,7 +7805,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.10.1</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.10.1</h3>
 
 
 
@@ -8071,7 +8071,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R VERSION 2.10.0</h3>
+<h3><img class="toplogo" src="../help/figures/../../html/Rlogo.svg" alt="[R logo]" /> CHANGES IN R VERSION 2.10.0</h3>
 
 
 
diff -Nru r-base-3.2.3/doc/html/NEWS.html r-base-3.3.1/doc/html/NEWS.html
--- r-base-3.2.3/doc/html/NEWS.html	2015-12-10 08:06:20.000000000 +0000
+++ r-base-3.3.1/doc/html/NEWS.html	2016-06-21 07:13:46.000000000 +0000
@@ -7,7 +7,1052 @@
 
 <h2>R News</h2>
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.2.3</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.3.1</h3>
+
+
+
+<h4>BUG FIXES</h4>
+
+
+<ul>
+<li> <p><code>R CMD INSTALL</code> and hence <code>install.packages()</code>
+gave an internal error installing a package called
+<span class="pkg">description</span> from a tarball on a case-insensitive file system.
+</p>
+</li>
+<li> <p><code>match(x, t)</code> (and hence <code>x %in% t</code>) failed
+when <code>x</code> was of length one, and either <code>character</code> and <code>x</code>
+and <code>t</code> only differed in their <code>Encoding</code> or when
+<code>x</code> and <code>t</code> where <code>complex</code> with <code>NA</code>s or <code>NaN</code>s.
+(<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16885">PR#16885</a>.)
+</p>
+</li>
+<li> <p><code>unloadNamespace(ns)</code> also works again when <code>ns</code> is a
+&lsquo;namespace&rsquo;, as from <code>getNamespace()</code>.
+</p>
+</li>
+<li> <p><code>rgamma(1,Inf)</code> or <code>rgamma(1, 0,0)</code> no longer give
+<code>NaN</code> but the correct limit.
+</p>
+</li>
+<li> <p><code>length(baseenv())</code> is correct now.
+</p>
+</li>
+<li> <p><code>pretty(d, ..)</code> for date-time <code>d</code> rarely failed
+when <code>"halfmonth"</code> time steps were tried (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16923">PR#16923</a>) and
+on &lsquo;inaccurate&rsquo; platforms such as 32-bit windows or
+a configuration with <code>--disable-long-double</code>; see comment
+#15 of <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16761">PR#16761</a>.
+</p>
+</li>
+<li><p> In <code>text.default(x, y, labels)</code>, the rarely(?) used
+default for <code>labels</code> is now correct also for the case of a
+2-column matrix <code>x</code> and missing <code>y</code>.
+</p>
+</li>
+<li> <p><code>as.factor(c(a = 1L))</code> preserves <code>names()</code> again
+as in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> &lt; 3.1.0.
+</p>
+</li>
+<li> <p><code>strtrim(""[0], 0[0])</code> now works.
+</p>
+</li>
+<li><p> Use of <code>Ctrl-C</code> to terminate a reverse incremental
+search started by <code>Ctrl-R</code> in the <code>readline</code>-based Unix
+terminal interface is now supported for <code>readline</code> &gt;= 6.3
+(<code>Ctrl-G</code> always worked).  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16603">PR#16603</a>)
+</p>
+</li>
+<li> <p><code>diff(&lt;difftime&gt;)</code> now keeps the <code>"units"</code>
+attribute, as subtraction already did, <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16940">PR#16940</a>.
+</p>
+</li></ul>
+
+
+
+
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.3.0</h3>
+
+
+
+<h4>SIGNIFICANT USER-VISIBLE CHANGES</h4>
+
+
+<ul>
+<li> <p><code>nchar(x, *)</code>'s argument <code>keepNA</code> governing how
+the result for <code>NA</code>s in <code>x</code> is determined, gets a new
+default <code>keepNA = NA</code> which returns <code>NA</code> where
+<code>x</code> is <code>NA</code>, except for <code>type = "width"</code> which still
+returns <code>2</code>, the formatting / printing width of <code>NA</code>.
+</p>
+</li>
+<li><p> All builds have support for <span class="samp">https:</span> URLs in the
+default methods for <code>download.file()</code>, <code>url()</code> and code
+making use of them.
+</p>
+<p>Unfortunately that cannot guarantee that any particular
+<span class="samp">https:</span> URL can be accessed.  For example, server and client
+have to successfully negotiate a cryptographic protocol (TLS/SSL,
+...) and the server's identity has to be verifiable <em>via</em>
+the available certificates.  Different access methods may allow
+different protocols or use private certificate bundles: we
+encountered a <span class="samp">https:</span> CRAN mirror which could be accessed by
+one browser but not by another nor by <code>download.file()</code> on
+the same Linux machine.
+</p>
+</li></ul>
+
+
+
+
+<h4>NEW FEATURES</h4>
+
+
+<ul>
+<li><p> The <code>print</code> method for <code>methods()</code> gains a
+<code>byclass</code> argument.
+</p>
+</li>
+<li><p> New functions <code>validEnc()</code> and <code>validUTF8()</code> to
+give access to the validity checks for inputs used by
+<code>grep()</code> and friends.
+</p>
+</li>
+<li><p> Experimental new functionality for S3 method checking, notably
+<code>isS3method()</code>.
+</p>
+<p>Also, the names of the <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> &lsquo;language elements&rsquo; are exported
+as character vector <code>tools::langElts</code>.
+</p>
+</li>
+<li> <p><code>str(x)</code> now displays <code>"Time-Series"</code> also for
+matrix (multivariate) time-series, i.e. when <code>is.ts(x)</code> is true.
+</p>
+</li>
+<li><p> (Windows only)  The GUI menu item to install local packages
+now accepts &lsquo;<span class="file">*.tar.gz</span>&rsquo; files as well as &lsquo;<span class="file">*.zip</span>&rsquo; files
+(but defaults to the latter).
+</p>
+</li>
+<li><p> New programmeR's utility function <code>chkDots()</code>.
+</p>
+</li>
+<li> <p><code>D()</code> now signals an error when given invalid input,
+rather than silently returning <code>NA</code>.  (Request of John Nash.)
+</p>
+</li>
+<li> <p><code>formula</code> objects are slightly more &ldquo;first class&rdquo;:
+e.g., <code>formula()</code> or <code>new("formula", y ~ x)</code> are now
+valid.  Similarly, for <code>"table"</code>, <code>"ordered"</code> and
+<code>"summary.table"</code>.  Packages defining S4 classes with the above
+S3/S4 classes as slots should be reinstalled.
+
+
+</p>
+</li>
+<li><p> New function <code>strrep()</code> for repeating the elements of a
+character vector.
+</p>
+</li>
+<li> <p><code>rapply()</code> preserves attributes on the list when
+<code>how = "replace"</code>.
+</p>
+</li>
+<li><p> New S3 generic function <code>sigma()</code> with methods for
+extracting the estimated standard deviation aka &ldquo;residual
+standard deviation&rdquo; from a fitted model.
+</p>
+</li>
+<li> <p><code>news()</code> now displays <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> and package news files within
+the HTML help system if it is available.  If no news file is found,
+a visible <code>NULL</code> is returned to the console.
+</p>
+</li>
+<li> <p><code>as.raster(x)</code> now also accepts <code>raw</code> arrays
+<code>x</code> assuming values in <code>0:255</code>.
+</p>
+</li>
+<li><p> Subscripting of matrix/array objects of type
+<code>"expression"</code> is now supported.
+</p>
+</li>
+<li> <p><code>type.convert("i")</code> now returns a factor instead of a
+complex value with zero real part and missing imaginary part.
+</p>
+</li>
+<li><p> Graphics devices <code>cairo_pdf()</code> and <code>cairo_ps()</code>
+now allow non-default values of the cairographics &lsquo;fallback
+resolution&rsquo; to be set.
+</p>
+<p>This now defaults to 300 on all platforms: that is the default
+documented by cairographics, but apparently was not used by all
+system installations.
+</p>
+</li>
+<li> <p><code>file()</code> gains an explicit <code>method</code> argument
+rather than implicitly using
+<code>getOption("url.method", "default")</code>.
+</p>
+</li>
+<li><p> Thanks to a patch from Tomas Kalibera, <code>x[x != 0]</code> is
+now typically faster than <code>x[which(x != 0)]</code> (in the case
+where <code>x</code> has no NAs, the two are equivalent).
+</p>
+</li>
+<li> <p><code>read.table()</code> now always uses the names for a named
+<code>colClasses</code> argument (previously names were only used when
+<code>colClasses</code> was too short). (In part, wish of <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16478">PR#16478</a>.)
+</p>
+</li>
+<li><p> (Windows only) <code>download.file()</code> with default
+<code>method = "auto"</code> and a <span class="samp">ftps://</span> URL chooses
+<code>"libcurl"</code> if that is available.
+</p>
+</li>
+<li><p> The out-of-the box Bioconductor mirror has been changed to
+one using <span class="samp">https://</span>: use <code>chooseBioCmirror()</code> to choose
+a <span class="samp">http://</span> mirror if required.
+</p>
+</li>
+<li><p> The data frame and formula methods for <code>aggregate()</code>
+gain a <code>drop</code> argument.
+</p>
+</li>
+<li> <p><code>available.packages()</code> gains a <code>repos</code> argument.
+</p>
+</li>
+<li><p> The undocumented switching of methods for <code>url()</code> on
+<span class="samp">https:</span> and <span class="samp">ftps:</span> URLs is confined to
+<code>method = "default"</code> (and documented).
+</p>
+</li>
+<li> <p><code>smoothScatter()</code> gains a <code>ret.selection</code> argument.
+</p>
+</li>
+<li> <p><code>qr()</code> no longer has a <code>...</code> argument to pass
+additional arguments to methods.
+</p>
+</li>
+<li> <p><code>[</code> has a method for class <code>"table"</code>.
+</p>
+</li>
+<li><p> It is now possible (again) to <code>replayPlot()</code> a
+display list snapshot that was created by <code>recordPlot()</code>
+in a different <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> session.
+</p>
+<p>It is still not a good idea to use snapshots as a persistent
+storage format for <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> plots, but it is now not completely silly to
+use a snapshot as a format for transferring an R plot between two
+R sessions.
+</p>
+<p>The underlying changes mean that packages providing graphics
+devices (e.g., <a href="https://CRAN.R-project.org/package=Cairo"><span class="pkg">Cairo</span></a>, <a href="https://CRAN.R-project.org/package=RSvgDevice"><span class="pkg">RSvgDevice</span></a>,
+<a href="https://CRAN.R-project.org/package=cairoDevice"><span class="pkg">cairoDevice</span></a>, <a href="https://CRAN.R-project.org/package=tikzDevice"><span class="pkg">tikzDevice</span></a>) will need to be
+reinstalled.
+</p>
+<p>Code for restoring snapshots was contributed by Jeroen Ooms
+and JJ Allaire.
+</p>
+<p>Some testing code is available at
+<a href="https://github.com/pmur002/R-display-list">https://github.com/pmur002/R-display-list</a>.
+</p>
+</li>
+<li> <p><code>tools::undoc(dir = D)</code> and <code>codoc(dir = D)</code> now
+also work when <code>D</code> is a directory whose <code>normalizePath()</code>ed
+version does not end in the package name, e.g. from a symlink.
+</p>
+</li>
+<li> <p><code>abbreviate()</code> has more support for multi-byte
+character sets &ndash; it no longer removes bytes within characters and
+knows about Latin vowels with accents.  It is still only
+really suitable for (most) European languages, and still warns on
+non-ASCII input.
+</p>
+<p><code>abbreviate(use.classes = FALSE)</code> is now implemented, and
+that is more suitable for non-European languages.
+</p>
+</li>
+<li> <p><code>match(x, table)</code> is faster (sometimes by an order of
+magnitude) when <code>x</code> is of length one and <code>incomparables</code>
+is unchanged, thanks to Peter Haverty (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16491">PR#16491</a>).
+</p>
+</li>
+<li><p> More consistent, partly not back-compatible behavior of
+<code>NA</code> and <code>NaN</code> coercion to complex numbers, operations
+less often resulting in complex <code>NA</code> (<code>NA_complex_</code>).
+</p>
+</li>
+<li> <p><code>lengths()</code> considers methods for <code>length</code> and
+<code>[[</code> on <code>x</code>, so it should work automatically on any
+objects for which appropriate methods on those generics are
+defined.
+</p>
+</li>
+<li><p> The logic for selecting the default screen device on OS X
+has been simplified: it is now <code>quartz()</code> if that is
+available even if environment variable <span class="env">DISPLAY</span> has been set
+by the user.
+</p>
+<p>The choice can easily be overridden <em>via</em> environment
+variable <span class="env">R_INTERACTIVE_DEVICE</span>.
+</p>
+</li>
+<li><p> On Unix-like platforms which support the <code>getline</code> C
+library function, <code>system(*,intern = TRUE)</code> no longer
+truncates (output) lines longer than 8192 characters, thanks to
+Karl Millar. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16544">PR#16544</a>)
+</p>
+</li>
+<li> <p><code>rank()</code> gains a <code>ties.method = "last"</code> option,
+for convenience (and symmetry).
+</p>
+
+
+</li>
+<li> <p><code>regmatches(invert = NA)</code> can now be used to extract
+both non-matched and matched substrings.
+</p>
+</li>
+<li> <p><code>data.frame()</code> gains argument <code>fix.empty.names</code>;
+<code>as.data.frame.list()</code> gets new <code>cut.names</code>,
+<code>col.names</code> and <code>fix.empty.names</code>.
+</p>
+</li>
+<li> <p><code>plot(x ~ x, *)</code> now warns that it is the same as
+<code>plot(x ~ 1, *)</code>.
+</p>
+</li>
+<li> <p><code>recordPlot()</code> has new arguments <code>load</code> and
+<code>attach</code> to allow package names to be stored as part of a
+recorded plot.  <code>replayPlot()</code> has new argument
+<code>reloadPkgs</code> to load/attach any package names that were
+stored as part of a recorded plot.
+</p>
+</li>
+<li><p> S4 dispatch works within calls to <code>.Internal()</code>. This
+means explicit S4 generics are no longer needed for
+<code>unlist()</code> and <code>as.vector()</code>.
+</p>
+</li>
+<li><p> Only font family names starting with <span class="samp">"Hershey"</span> (and
+not <span class="samp">"Her"</span> as before) are given special treatment by the
+graphics engine.
+</p>
+</li>
+<li><p> S4 values are automatically coerced to vector (via
+<code>as.vector</code>) when subassigned into atomic vectors.
+</p>
+</li>
+<li> <p><code>findInterval()</code> gets a <code>left.open</code> option.
+</p>
+</li>
+<li><p> The version of LAPACK included in the sources has been
+updated to 3.6.0, including those &lsquo;deprecated&rsquo; routines
+which were previously included.  <em>Ca</em> 40 double-complex
+routines have been added at the request of a package maintainer.
+</p>
+<p>As before, the details of what is included are in
+&lsquo;<span class="file">src/modules/lapack/README</span>&rsquo; and this now gives information on
+earlier additions.
+</p>
+</li>
+<li> <p><code>tapply()</code> has been made considerably more efficient
+without changing functionality, thanks to proposals from Peter
+Haverty and Suharto Anggono.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16640">PR#16640</a>)
+</p>
+</li>
+<li> <p><code>match.arg(arg)</code> (the one-argument case) is faster; so
+is <code>sort.int()</code>.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16640">PR#16640</a>)
+</p>
+</li>
+<li><p> The <code>format</code> method for <code>object_size</code> objects now
+also accepts &ldquo;binary&rdquo; units such as <code>"KiB"</code> and e.g.,
+<code>"Tb"</code>.  (Partly from <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16649">PR#16649</a>.)
+</p>
+</li>
+<li><p> Profiling now records calls of the form <code>foo::bar</code> and
+some similar cases directly rather than as calls to
+<code>&lt;Anonymous&gt;</code>.  Contributed by Winston Chang.
+</p>
+</li>
+<li><p> New string utilities <code>startsWith(x, prefix)</code> and
+<code>endsWith(x, suffix)</code>.  Also provide speedups for some
+<code>grepl("^...",*)</code> uses (related to proposals in <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16490">PR#16490</a>).
+</p>
+</li>
+<li><p> Reference class finalizers run at exit, as well as on
+garbage collection.
+</p>
+</li>
+<li><p> Avoid <span class="pkg">parallel</span> dependency on <span class="pkg">stats</span> for port
+choice and random number seeds.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16668">PR#16668</a>)
+</p>
+</li>
+<li><p> The radix sort algorithm and implementation from
+<a href="https://CRAN.R-project.org/package=data.table"><span class="pkg">data.table</span></a> (<code>forder</code>) replaces the previous radix
+(counting) sort and adds a new method for <code>order()</code>.
+Contributed by Matt Dowle and Arun Srinivasan, the new algorithm
+supports logical, integer (even with large values), real, and
+character vectors.  It outperforms all other methods, but there
+are some caveats (see <code>?sort</code>).
+</p>
+</li>
+<li><p> The <code>order()</code> function gains a <code>method</code> argument
+for choosing between <code>"shell"</code> and <code>"radix"</code>.
+</p>
+</li>
+<li><p> New function <code>grouping()</code> returns a permutation that
+stably rearranges data so that identical values are adjacent.  The
+return value includes extra partitioning information on the
+groups.  The implementation came included with the new radix sort.
+</p>
+</li>
+<li> <p><code>rhyper(nn, m, n, k)</code> no longer returns <code>NA</code> when
+one of the three parameters exceeds the maximal integer.
+</p>
+</li>
+<li> <p><code>switch()</code> now warns when no alternatives are provided.
+</p>
+</li>
+<li> <p><code>parallel::detectCores()</code> now has default <code>logical
+	= TRUE</code> on all platforms &ndash; as this was the default on Windows,
+this change only affects Sparc Solaris.
+</p>
+<p>Option <code>logical = FALSE</code> is now supported on Linux and recent
+versions of OS X (for the latter, thanks to a suggestion of Kyaw
+Sint).
+</p>
+</li>
+<li> <p><code>hist()</code> for <code>"Date"</code> or <code>"POSIXt"</code> objects
+would sometimes give misleading labels on the breaks, as they
+were set to the day before the start of the period being
+displayed.  The display format has been changed, and the shift of the
+start day has been made conditional on <code>right = TRUE</code> (the
+default).  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16679">PR#16679</a>)
+</p>
+</li>
+<li> <p><span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> now uses a new version of the logo (donated to the R
+Foundation by RStudio).  It is defined in &lsquo;<span class="file">.svg</span>&rsquo; format, so
+will resize without unnecessary degradation when displayed on
+HTML pages&mdash;there is also a vector PDF version.  Thanks to
+Dirk Eddelbuettel for producing the corresponding X11 icon.
+</p>
+</li>
+<li><p> New function <code>.traceback()</code> returns the stack trace
+which <code>traceback()</code> prints.
+</p>
+</li>
+<li> <p><code>lengths()</code> dispatches internally.
+</p>
+</li>
+<li> <p><code>dotchart()</code> gains a <code>pt.cex</code> argument to control
+the size of points separately from the size of plot labels.
+Thanks to Michael Friendly and Milan Bouchet-Valat for ideas
+and patches.
+</p>
+</li>
+<li> <p><code>as.roman(ch)</code> now correctly deals with more diverse
+character vectors <code>ch</code>; also arithmetic with the resulting
+roman numbers works in more cases.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16779">PR#16779</a>)
+</p>
+</li>
+<li> <p><code>prcomp()</code> gains a new option <code>rank.</code> allowing to
+directly aim for less than <code>min(n,p)</code> PC's.  The
+<code>summary()</code> and its <code>print()</code> method have been amended,
+notably for this case.
+</p>
+</li>
+<li> <p><code>gzcon()</code> gains a new option <code>text</code>, which marks
+the connection as text-oriented (so e.g. <code>pushBack()</code>
+works).  It is still always opened in binary mode.
+</p>
+</li>
+<li><p> The <code>import()</code> namespace directive now accepts an
+argument <code>except</code> which names symbols to exclude from the
+imports. The <code>except</code> expression should evaluate to a
+character vector (after substituting symbols for strings). See
+Writing R Extensions.
+</p>
+</li>
+<li><p> New convenience function <code>Rcmd()</code> in package
+<span class="pkg">tools</span> for invoking <code>R CMD</code> tools from within <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span>.
+</p>
+</li>
+<li><p> New functions <code>makevars_user()</code> and
+<code>makevars_site()</code> in package <span class="pkg">tools</span> to determine the
+location of the user and site specific &lsquo;<span class="file">Makevars</span>&rsquo; files for
+customizing package compilation.
+</p>
+</li></ul>
+
+
+
+
+<h4>UTILITIES</h4>
+
+
+<ul>
+<li> <p><code>R CMD check</code> has a new option
+<span class="option">--ignore-vignettes</span> for use with non-Sweave vignettes
+whose <span class="samp">VignetteBuilder</span> package is not available.
+</p>
+</li>
+<li> <p><code>R CMD check</code> now by default checks code usage
+(<em>via</em> <a href="https://CRAN.R-project.org/package=codetools"><span class="pkg">codetools</span></a>) with only the base package
+attached.  Functions from default packages other than <span class="pkg">base</span>
+which are used in the package code but not imported are reported
+as undefined globals, with a suggested addition to the
+<code>NAMESPACE</code> file.
+</p>
+</li>
+<li> <p><code>R CMD check --as-cran</code> now also checks DOIs in
+package &lsquo;<span class="file">CITATION</span>&rsquo; and Rd files.
+</p>
+</li>
+<li> <p><code>R CMD Rdconv</code> and <code>R CMD Rd2pdf</code> each have
+a new option <span class="option">--RdMacros=pkglist</span> which allows Rd macros
+to be specified before processing.
+</p>
+</li></ul>
+
+
+
+
+<h4>DEPRECATED AND DEFUNCT</h4>
+
+
+<ul>
+<li><p> The previously included versions of <code>zlib</code>,
+<code>bzip2</code>, <code>xz</code> and PCRE have been removed, so suitable
+external (usually system) versions are required (see the
+&lsquo;R Installation and Administration&rsquo; manual).
+</p>
+</li>
+<li><p> The unexported and undocumented Windows-only devices
+<code>cairo_bmp()</code>, <code>cairo_png()</code> and <code>cairo_tiff()</code>
+have been removed.  (These devices should be used as
+e.g. <code>bmp(type = "cairo")</code>.)
+</p>
+</li>
+<li><p> (Windows only)  Function <code>setInternet2()</code> has no effect
+and will be removed in due course.  The choice between methods
+<code>"internal"</code> and <code>"wininet"</code> is now made by the
+<code>method</code> arguments of <code>url()</code> and <code>download.file()</code>
+and their defaults can be set <em>via</em> options.  The
+out-of-the-box default remains <code>"wininet"</code> (as it has been
+since <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.2.2).
+</p>
+</li>
+<li> <p><code>[&lt;-</code> with an S4 value into a list currently embeds the
+S4 object into its own list such that the end result is roughly
+equivalent to using <code>[[&lt;-</code>.  That behavior is deprecated.  In
+the future, the S4 value will be coerced to a list with
+<code>as.list()</code>.
+</p>
+</li>
+<li><p> Package <span class="pkg">tools</span>' functions
+<code>package.dependencies()</code>, <code>pkgDepends()</code>, etc are
+deprecated now, mostly in favor of <code>package_dependencies()</code>
+which is both more flexible and efficient.
+</p>
+</li></ul>
+
+
+
+
+<h4>INSTALLATION and INCLUDED SOFTWARE</h4>
+
+
+<ul>
+<li><p> Support for very old versions of <code>valgrind</code>
+(e.g., 3.3.0) has been removed.
+</p>
+</li>
+<li><p> The included <code>libtool</code> script (generated by
+<code>configure</code>) has been updated to version 2.4.6 (from 2.2.6a).
+</p>
+</li>
+<li> <p><code>libcurl</code> version 7.28.0 or later with support for the
+<code>https</code> protocol is required for installation (except on
+Windows).
+</p>
+</li>
+<li><p> BSD networking is now required (except on Windows) and so
+<code>capabilities("http/ftp")</code> is always true.
+</p>
+</li>
+<li> <p><code>configure</code> uses <code>pkg-config</code> for PNG, TIFF
+and JPEG where this is available.  This should work better with
+multiple installs and with those using static libraries.
+</p>
+</li>
+<li><p> The minimum supported version of OS X is 10.6 (&lsquo;Snow
+Leopard&rsquo;): even that has been unsupported by Apple since 2012.
+</p>
+</li>
+<li><p> The <code>configure</code> default on OS X is
+<span class="option">--disable-R-framework</span>: enable this if you intend to
+install under &lsquo;<span class="file">/Library/Frameworks</span>&rsquo; and use with <code>R.app</code>.
+</p>
+</li>
+<li><p> The minimum preferred version of PCRE has since <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.0.0
+been 8.32 (released in Nov 2012).  Versions 8.10 to 8.31 are now
+deprecated (with warnings from <code>configure</code>), but will
+still be accepted until <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.4.0.
+</p>
+</li>
+<li> <p><code>configure</code> looks for C functions <code>__cospi</code>,
+<code>__sinpi</code> and <code>__tanpi</code> and uses these if <code>cospi</code>
+<em>etc</em> are not found.  (OS X is the main instance.)
+</p>
+</li>
+<li><p> (Windows) R is now built using <code>gcc</code>
+4.9.3.  This build will require recompilation of at least those packages
+that include C++ code, and possibly others.  A build of R-devel using
+the older toolchain will be temporarily available for comparison
+purposes.
+</p>
+<p>During the transition, the environment variable
+<span class="env">R_COMPILED_BY</span> has been defined to indicate which toolchain
+was used to compile R (and hence, which should be used to compile
+code in packages).  The <code>COMPILED_BY</code> variable described below
+will be a permanent replacement for this.
+</p>
+</li>
+<li><p> (Windows) A <code>make</code> and <code>R CMD config</code> variable
+named <code>COMPILED_BY</code> has been added.  This indicates
+which toolchain was used to compile R (and hence, which should be
+used to compile code in packages).
+</p>
+</li></ul>
+
+
+
+
+<h4>PACKAGE INSTALLATION</h4>
+
+
+<ul>
+<li><p> The <code>make</code> macro <code>AWK</code> which used to be made
+available to files such as &lsquo;<span class="file">src/Makefile</span>&rsquo; is no longer set.
+</p>
+</li></ul>
+
+
+
+
+<h4>C-LEVEL FACILITIES</h4>
+
+
+<ul>
+<li><p> The API call <code>logspace_sum</code> introduced in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.2.0 is
+now remapped as an entry point to <code>Rf_logspace_sum</code>, and its
+first argument has gained a <code>const</code> qualifier.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16470">PR#16470</a>)
+</p>
+<p>Code using it will need to be reinstalled.
+</p>
+<p>Similarly, entry point <code>log1pexp</code> also defined in
+&lsquo;<span class="file">Rmath.h</span>&rsquo; is remapped there to <code>Rf_log1pexp</code>
+</p>
+</li>
+<li> <p><code>R_GE_version</code> has been increased to <code>11</code>.
+</p>
+</li>
+<li><p> New API call <code>R_orderVector1</code>, a faster
+one-argument version of <code>R_orderVector</code>.
+</p>
+</li>
+<li><p> When <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> headers such as &lsquo;<span class="file">R.h</span>&rsquo; and &lsquo;<span class="file">Rmath.h</span>&rsquo; are
+called from C++ code in packages they include the C++ versions of
+system headers such as &lsquo;<span class="file">&lt;cmath&gt;</span>&rsquo; rather than the legacy
+headers such as &lsquo;<span class="file">&lt;math.h&gt;</span>&rsquo;.  (Headers &lsquo;<span class="file">Rinternals.h</span>&rsquo; and
+&lsquo;<span class="file">Rinterface.h</span>&rsquo; already did, and inclusion of system headers
+can still be circumvented by defining <code>NO_C_HEADERS</code>,
+including as from this version for those two headers.)
+</p>
+<p>The manual has long said that <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> headers should <b>not</b> be
+included within an <code>extern "C"</code> block, and almost all the
+packages affected by this change were doing so.
+</p>
+</li>
+<li><p> Including header &lsquo;<span class="file">S.h</span>&rsquo; from C++ code would fail on some
+platforms, and so gives a compilation error on all.
+</p>
+</li>
+<li><p> The deprecated header &lsquo;<span class="file">Rdefines.h</span>&rsquo; is now compatible
+with defining <code>R_NO_REMAP</code>.
+</p>
+</li>
+<li><p> The connections API now includes a function
+<code>R_GetConnection()</code> which allows packages implementing
+connections to convert R <code>connection</code> objects to
+<code>Rconnection</code> handles used in the API. Code which previously
+used the low-level R-internal <code>getConnection()</code> entry point
+should switch to the official API.
+</p>
+</li></ul>
+
+
+
+
+<h4>BUG FIXES</h4>
+
+
+<ul>
+<li><p> C-level <code>asChar(x)</code> is fixed for when <code>x</code> is not a
+vector, and it returns <code>"TRUE"</code>/<code>"FALSE"</code> instead of
+<code>"T"</code>/<code>"F"</code> for logical vectors.
+</p>
+</li>
+<li><p> The first arguments of <code>.colSums()</code> etc (with an
+initial dot) are now named <code>x</code> rather than <code>X</code> (matching
+<code>colSums()</code>): thus error messages are corrected.
+</p>
+</li>
+<li><p> A <code>coef()</code> method for class <code>"maov"</code> has been
+added to allow <code>vcov()</code> to work with multivariate
+results. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16380">PR#16380</a>)
+</p>
+</li>
+<li> <p><code>method = "libcurl"</code> connections signal errors rather
+than retrieving HTTP error pages (where the ISP reports the
+error).
+</p>
+</li>
+<li> <p><code>xpdrows.data.frame()</code> was not checking for unique
+row names; in particular, this affected assignment to non-existing
+rows via numerical indexing. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16570">PR#16570</a>)
+</p>
+</li>
+<li> <p><code>tail.matrix()</code> did not work for zero rows matrices,
+and could produce row &ldquo;labels&rdquo; such as <code>"[1e+05,]"</code>.
+</p>
+</li>
+<li><p> Data frames with a column named <code>"stringsAsFactors"</code>
+now format and print correctly.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16580">PR#16580</a>)
+</p>
+</li>
+<li> <p><code>cor()</code> is now guaranteed to return a value with
+absolute value less than or equal to 1. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16638">PR#16638</a>)
+</p>
+</li>
+<li><p> Array subsetting now keeps <code>names(dim(.))</code>.
+</p>
+</li>
+<li><p> Blocking socket connection selection recovers more
+gracefully on signal interrupts.
+</p>
+</li>
+<li><p> The <code>data.frame</code> method of <code>rbind()</code> construction
+<code>row.names</code> works better in borderline integer cases, but
+may change the names assigned.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16666">PR#16666</a>)
+</p>
+</li>
+<li><p> (X11 only)  <code>getGraphicsEvent()</code> miscoded buttons and
+missed mouse motion events.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16700">PR#16700</a>)
+</p>
+</li>
+<li> <p><code>methods(round)</code> now also lists <code>round.POSIXt</code>.
+</p>
+</li>
+<li> <p><code>tar()</code> now works with the default <code>files = NULL</code>.
+(<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16716">PR#16716</a>)
+</p>
+</li>
+<li><p> Jumps to outer contexts, for example in error recovery, now
+make intermediate jumps to contexts where <code>on.exit()</code> actions
+are established instead of trying to run all <code>on.exit()</code>
+actions before jumping to the final target. This unwinds the stack
+gradually, releases resources held on the stack, and significantly
+reduces the chance of a segfault when running out of C stack
+space. Error handlers established using
+<code>withCallingHandlers()</code> and <code>options("error")</code>
+specifications are ignored when handling a C stack overflow error
+as attempting one of these would trigger a cascade of C stack
+overflow errors.  (These changes resolve <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16753">PR#16753</a>.)
+</p>
+</li>
+<li><p> The spacing could be wrong when printing a complex array.
+(Report and patch by Lukas Stadler.)
+</p>
+</li>
+<li> <p><code>pretty(d, n, min.n, *)</code> for date-time objects <code>d</code>
+works again in border cases with large <code>min.n</code>, returns a
+<code>labels</code> attribute also for small-range dates and in such cases
+its returned length is closer to the desired <code>n</code>.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16761">PR#16761</a>)
+Additionally, it finally does cover the range of <code>d</code>, as it
+always claimed.
+</p>
+</li>
+<li> <p><code>tsp(x) &lt;- NULL</code> did not handle correctly objects
+inheriting from both <code>"ts"</code> and <code>"mts"</code>.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16769">PR#16769</a>)
+</p>
+</li>
+<li> <p><code>install.packages()</code> could give false errors when
+<code>options("pkgType")</code> was <code>"binary"</code>.  (Reported by
+Jose Claudio Faria.)
+</p>
+</li>
+<li><p> A bug fix in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.0.2 fixed problems with <code>locator()</code>
+in X11, but introduced problems in Windows.  Now both should be
+fixed.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=15700">PR#15700</a>)
+</p>
+</li>
+<li> <p><code>download.file()</code> with <code>method = "wininet"</code>
+incorrectly warned of download file length difference when
+reported length was unknown. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16805">PR#16805</a>)
+</p>
+</li>
+<li> <p><code>diag(NULL, 1)</code> crashed because of missed type
+checking.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16853">PR#16853</a>)
+</p>
+</li></ul>
+
+
+
+
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.2.4 patched</h3>
+
+
+
+<h4>BUG FIXES</h4>
+
+
+<ul>
+<li> <p><code>format.POSIXlt()</code> behaved incorrectly in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.2.4.
+E.g. the output of
+<code>format(as.POSIXlt(paste0(1940:2000,"-01-01"), tz = "CET"),
+	usetz = TRUE)</code> ended in two <code>"CEST"</code> time formats.
+</p>
+</li></ul>
+
+
+
+
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.2.4</h3>
+
+
+
+<h4>NEW FEATURES</h4>
+
+
+<ul>
+<li> <p><code>install.packages()</code> and related functions now give a
+more informative warning when an attempt is made to install a base
+package.
+</p>
+</li>
+<li> <p><code>summary(x)</code> now prints with less rounding when
+<code>x</code> contains infinite values. (Request of <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16620">PR#16620</a>.)
+</p>
+</li>
+<li> <p><code>provideDimnames()</code> gets an optional <code>unique</code> argument.
+</p>
+</li>
+<li> <p><code>shQuote()</code> gains <code>type = "cmd2"</code> for quoting
+in <code>cmd.exe</code> in Windows.  (Response to <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16636">PR#16636</a>.)
+</p>
+</li>
+<li><p> The <code>data.frame</code> method of <code>rbind()</code> gains an
+optional argument <code>stringsAsFactors</code> (instead of only
+depending on <code>getOption("stringsAsFactors")</code>).
+</p>
+</li>
+<li> <p><code>smooth(x, *)</code> now also works for long vectors.
+</p>
+</li>
+<li> <p><code>tools::texi2dvi()</code> has a workaround for problems with
+the <code>texi2dvi</code> script supplied by <span class="pkg">texinfo 6.1</span>.
+</p>
+<p>It extracts more error messages from the LaTeX logs when in
+emulation mode.
+</p>
+</li></ul>
+
+
+
+
+<h4>UTILITIES</h4>
+
+
+<ul>
+<li> <p><code>R CMD check</code> will leave a log file
+&lsquo;<span class="file">build_vignettes.log</span>&rsquo; from the re-building of vignettes in
+the &lsquo;<span class="file">.Rcheck</span>&rsquo; directory if there is a problem, and always if
+environment variable <span class="env">_R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_</span> is
+set to a true value.
+</p>
+</li></ul>
+
+
+
+
+<h4>DEPRECATED AND DEFUNCT</h4>
+
+
+<ul>
+<li><p> Use of <span class="samp">SUPPORT_OPENMP</span> from header &lsquo;<span class="file">Rconfig.h</span>&rsquo; is
+deprecated in favour of the standard OpenMP define <span class="samp">_OPENMP</span>.
+</p>
+<p>(This has been the recommendation in the manual for a while now.)
+</p>
+</li>
+<li><p> The <code>make</code> macro <code>AWK</code> which is long unused by
+<span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> itself but recorded in file &lsquo;<span class="file">etc/Makeconf</span>&rsquo; is deprecated
+and will be removed in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.3.0.
+</p>
+</li>
+<li><p> The C header file &lsquo;<span class="file">S.h</span>&rsquo; is no longer documented: its
+use should be replaced by &lsquo;<span class="file">R.h</span>&rsquo;.
+</p>
+</li></ul>
+
+
+
+
+<h4>BUG FIXES</h4>
+
+
+<ul>
+<li> <p><code>kmeans(x, centers = &lt;1-row&gt;)</code> now works. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16623">PR#16623</a>)
+</p>
+</li>
+<li> <p><code>Vectorize()</code> now checks for clashes in argument names.
+(<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16577">PR#16577</a>)
+</p>
+</li>
+<li> <p><code>file.copy(overwrite = FALSE)</code> would signal a successful
+copy when none had taken place.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16576">PR#16576</a>)
+</p>
+</li>
+<li> <p><code>ngettext()</code> now uses the same default domain as
+<code>gettext()</code>.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=14605">PR#14605</a>)
+</p>
+</li>
+<li> <p><code>array(.., dimnames = *)</code> now warns about
+non-<code>list</code> dimnames and, from <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.3.0, will signal the same
+error for invalid dimnames as <code>matrix()</code> has always done.
+</p>
+</li>
+<li> <p><code>addmargins()</code> now adds dimnames for the extended
+margins in all cases, as always documented.
+</p>
+</li>
+<li> <p><code>heatmap()</code> evaluated its <code>add.expr</code> argument
+in the wrong environment.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16583">PR#16583</a>)
+</p>
+</li>
+<li> <p><code>require()</code> etc now give the correct entry of
+<code>lib.loc</code> in the warning about an old version of a package
+masking a newer required one.
+</p>
+</li>
+<li><p> The internal deparser did not add parentheses when
+necessary,  e.g. before <code>[]</code> or <code>[[]]</code>.  (Reported by
+Lukas Stadler; additional fixes included as well).
+</p>
+</li>
+<li> <p><code>as.data.frame.vector(*, row.names=*)</code> no longer
+produces &lsquo;corrupted&rsquo; data frames from row names of incorrect
+length, but rather warns about them.  This will become an error.
+</p>
+</li>
+<li> <p><code>url</code> connections with <code>method = "libcurl"</code> are
+destroyed properly. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16681">PR#16681</a>)
+</p>
+</li>
+<li> <p><code>withCallingHandler()</code> now (again) handles warnings
+even during S4 generic's argument evaluation.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16111">PR#16111</a>)
+</p>
+</li>
+<li> <p><code>deparse(..., control = "quoteExpressions")</code>
+incorrectly quoted empty expressions.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16686">PR#16686</a>)
+</p>
+</li>
+<li> <p><code>format()</code>ting datetime objects (<code>"POSIX[cl]?t"</code>)
+could segfault or recycle wrongly.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16685">PR#16685</a>)
+</p>
+</li>
+<li> <p><code>plot.ts(&lt;matrix&gt;, las = 1)</code> now does use <code>las</code>.
+</p>
+</li>
+<li> <p><code>saveRDS(*, compress = "gzip")</code> now works as
+documented.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16653">PR#16653</a>)
+</p>
+</li>
+<li><p> (Windows only) The <code>Rgui</code> front end did not
+always initialize the console properly, and could cause
+<span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> to crash.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16698">PR#16698</a>)
+</p>
+</li>
+<li> <p><code>dummy.coef.lm()</code> now works in more cases, thanks to a
+proposal by Werner Stahel (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16665">PR#16665</a>).  In addition, it now works
+for multivariate linear models (<code>"mlm"</code>, <code>manova</code>)
+thanks to a proposal by Daniel Wollschlaeger.
+</p>
+</li>
+<li><p> The <code>as.hclust()</code> method for <code>"dendrogram"</code>s
+failed often when there were ties in the heights.
+</p>
+</li>
+<li> <p><code>reorder()</code> and <code>midcache.dendrogram()</code> now are
+non-recursive and hence applicable to somewhat deeply nested
+dendrograms, thanks to a proposal by Suharto Anggono in <a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16424">PR#16424</a>.
+</p>
+</li>
+<li> <p><code>cor.test()</code> now calculates very small p values
+more accurately (affecting the result only in extreme not
+statistically relevant cases).  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16704">PR#16704</a>)
+</p>
+</li>
+<li> <p><code>smooth(*, do.ends=TRUE)</code> did not always work correctly
+in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> versions between 3.0.0 and 3.2.3.
+</p>
+</li>
+<li> <p><code>pretty(D)</code> for date-time objects <code>D</code> now also
+works well if <code>range(D)</code> is (much) smaller than a second.  In
+the case of only one unique value in <code>D</code>, the pretty range
+now is more symmetric around that value than previously.
+<br />
+Similarly, <code>pretty(dt)</code> no longer returns a length 5 vector
+with duplicated entries for <code>Date</code> objects <code>dt</code> which
+span only a few days.
+</p>
+</li>
+<li><p> The figures in help pages such as <code>?points</code> were
+accidentally damaged, and did not appear in <span style="font-family: Courier New, Courier; color: #666666;"><b>R</b></span> 3.2.3.
+(<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16708">PR#16708</a>)
+</p>
+</li>
+<li> <p><code>available.packages()</code> sometimes deleted the wrong
+file when cleaning up temporary files.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16712">PR#16712</a>)
+</p>
+</li>
+<li><p> The <code>X11()</code> device sometimes froze on Red Hat
+Enterprise Linux 6. It now waits for <code>MapNotify</code> events
+instead of <code>Expose</code> events, thanks to Siteshwar
+Vashisht. (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16497">PR#16497</a>)
+</p>
+</li>
+<li> <p><code>[dpqr]nbinom(*, size=Inf, mu=.)</code> now works as limit
+case, for &lsquo;dpq&rsquo; as the Poisson.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16727">PR#16727</a>)<br />
+<code>pnbinom()</code> no longer loops infinitely in border cases.
+</p>
+</li>
+<li> <p><code>approxfun(*, method="constant")</code> and hence <code>ecdf()</code>
+which calls the former now correctly &ldquo;predict&rdquo; <code>NaN</code>
+values as <code>NaN</code>.
+</p>
+</li>
+<li> <p><code>summary.data.frame()</code> now displays <code>NA</code>s in
+<code>Date</code> columns in all cases.  (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16709">PR#16709</a>)
+</p>
+</li></ul>
+
+
+
+
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.2.3</h3>
 
 
 
@@ -259,7 +1304,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.2.2</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.2.2</h3>
 
 
 
@@ -476,7 +1521,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.2.1</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.2.1</h3>
 
 
 
@@ -638,7 +1683,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.2.0</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.2.0</h3>
 
 
 
@@ -1411,7 +2456,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.1.3</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.1.3</h3>
 
 
 
@@ -1690,7 +2735,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.1.2</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.1.2</h3>
 
 
 
@@ -1946,7 +2991,7 @@
 </li>
 <li> <p><code>sub()</code> and <code>gsub()</code> did not handle regular
 expressions like <code>"\s{2,}"</code> properly if the text
-contained <code>NA</code> or non-ascii elements in a UTF-8
+contained <code>NA</code> or non-ASCII elements in a UTF-8
 locale.  Part of this was due to a bug in the TRE library.
 (<a href="https://bugs.R-project.org/bugzilla3/show_bug.cgi?id=16009">PR#16009</a>)
 </p>
@@ -1991,7 +3036,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.1.1</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.1.1</h3>
 
 
 
@@ -2317,7 +3362,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.1.0</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.1.0</h3>
 
 
 
@@ -3106,7 +4151,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.0.3</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.0.3</h3>
 
 
 
@@ -3482,7 +4527,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.0.2</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.0.2</h3>
 
 
 
@@ -4154,7 +5199,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.0.1</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.0.1</h3>
 
 
 
@@ -4385,7 +5430,7 @@
 
 
 
-<h3><img src="../help/figures/../../html/logo.jpg" alt="../../html/logo.jpg" /> CHANGES IN R 3.0.0</h3>
+<h3><img src="../help/figures/../../html/Rlogo.svg" class="toplogo" alt="[R logo]" /> CHANGES IN R 3.0.0</h3>
 
 
 
diff -Nru r-base-3.2.3/doc/html/Notes r-base-3.3.1/doc/html/Notes
--- r-base-3.2.3/doc/html/Notes	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/doc/html/Notes	2016-03-16 23:04:41.000000000 +0000
@@ -0,0 +1,18 @@
+The 'new' R logo was added in early 2016.
+
+Rlogo.svg is the master copy, and is copyighted.  See its text comment
+and doc/COPYRIGHTS for its licence.
+
+Rlogo.pdf is a conversion to scalable PDF, done by rsvg-convert.
+
+logo.jpg is an update to the new logo of a 100x76 file: it is no
+longer used within R (but is used by some packages).
+
+favicon.ico contains 16x16 and 32x32 PNG files (with transparent
+backgrounds and anti-aliasing) converted from Rlogo.svg in Photoshop,
+and bundled by 
+
+icotool -c -o favicon.ico icon_16x16.png icon_32x32.png
+
+on Linux. These are 32-bit full-colour PNGs (and smaller than the
+previous version with a palette).
diff -Nru r-base-3.2.3/doc/html/packages-head-utf8.html r-base-3.3.1/doc/html/packages-head-utf8.html
--- r-base-3.2.3/doc/html/packages-head-utf8.html	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/html/packages-head-utf8.html	2016-03-16 23:04:42.000000000 +0000
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="R.css">
 </head><body>
-<h1>Package Index <img class="toplogo" src="logo.jpg" alt="[R logo]"></h1>
+<h1>Package Index <img class="toplogo" src="Rlogo.svg" alt="[R logo]"></h1>
 
 <hr>
 
diff -Nru r-base-3.2.3/doc/html/R-admin.html r-base-3.3.1/doc/html/R-admin.html
--- r-base-3.2.3/doc/html/R-admin.html	2015-12-10 08:12:12.000000000 +0000
+++ r-base-3.3.1/doc/html/R-admin.html	2016-06-21 07:20:40.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<!-- This manual is for R, version 3.2.3 (2015-12-10).
+<!-- This manual is for R, version 3.3.1 (2016-06-21).
 
-Copyright (C) 2001-2015 R Core Team
+Copyright (C) 2001-2016 R Core Team
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -222,6 +222,7 @@
       <li><a name="toc-Customizing-package-compilation-1" href="#Customizing-package-compilation">6.3.3 Customizing package compilation</a></li>
       <li><a name="toc-Multiple-sub_002darchitectures-1" href="#Multiple-sub_002darchitectures">6.3.4 Multiple sub-architectures</a></li>
       <li><a name="toc-Byte_002dcompilation-1" href="#Byte_002dcompilation">6.3.5 Byte-compilation</a></li>
+      <li><a name="toc-External-software-1" href="#External-software">6.3.6 External software</a></li>
     </ul></li>
     <li><a name="toc-Updating-packages-1" href="#Updating-packages">6.4 Updating packages</a></li>
     <li><a name="toc-Removing-packages-1" href="#Removing-packages">6.5 Removing packages</a></li>
@@ -295,14 +296,11 @@
     </ul></li>
     <li><a name="toc-OS-X-2" href="#OS-X">C.3 OS X</a>
     <ul class="no-bullet">
-      <li><a name="toc-Mavericks-and-later-1" href="#Mavericks-and-later">C.3.1 Mavericks and later</a></li>
-      <li><a name="toc-Lion-and-Mountain-Lion-1" href="#Lion-and-Mountain-Lion">C.3.2 Lion and Mountain Lion</a></li>
-      <li><a name="toc-Snow-Leopard-1" href="#Snow-Leopard">C.3.3 Snow Leopard</a></li>
-      <li><a name="toc-El-Capitan-1" href="#El-Capitan">C.3.4 El Capitan</a></li>
-      <li><a name="toc-Tcl_002fTk-headers-and-libraries-1" href="#Tcl_002fTk-headers-and-libraries">C.3.5 Tcl/Tk headers and libraries</a></li>
-      <li><a name="toc-Java" href="#Java-_0028OS-X_0029">C.3.6 Java</a></li>
-      <li><a name="toc-Frameworks-1" href="#Frameworks">C.3.7 Frameworks</a></li>
-      <li><a name="toc-Building-R_002eapp-1" href="#Building-R_002eapp">C.3.8 Building R.app</a></li>
+      <li><a name="toc-El-Capitan-1" href="#El-Capitan">C.3.1 El Capitan</a></li>
+      <li><a name="toc-Tcl_002fTk-headers-and-libraries-1" href="#Tcl_002fTk-headers-and-libraries">C.3.2 Tcl/Tk headers and libraries</a></li>
+      <li><a name="toc-Java" href="#Java-_0028OS-X_0029">C.3.3 Java</a></li>
+      <li><a name="toc-Frameworks-1" href="#Frameworks">C.3.4 Frameworks</a></li>
+      <li><a name="toc-Building-R_002eapp-1" href="#Building-R_002eapp">C.3.5 Building R.app</a></li>
     </ul></li>
     <li><a name="toc-Solaris-1" href="#Solaris">C.4 Solaris</a>
     <ul class="no-bullet">
@@ -310,7 +308,7 @@
     </ul></li>
     <li><a name="toc-AIX-1" href="#AIX">C.5 AIX</a></li>
     <li><a name="toc-FreeBSD-1" href="#FreeBSD">C.6 FreeBSD</a></li>
-    <li><a name="toc-OpenBSD" href="#OpenBSD">C.7 OpenBSD</a></li>
+    <li><a name="toc-OpenBSD-1" href="#OpenBSD">C.7 OpenBSD</a></li>
     <li><a name="toc-Cygwin-1" href="#Cygwin">C.8 Cygwin</a></li>
     <li><a name="toc-New-platforms-1" href="#New-platforms">C.9 New platforms</a></li>
   </ul></li>
@@ -335,9 +333,9 @@
 
 <p>This is a guide to installation and administration for R.
 </p>
-<p>This manual is for R, version 3.2.3 (2015-12-10).
+<p>This manual is for R, version 3.3.1 (2016-06-21).
 </p>
-<p>Copyright &copy; 2001&ndash;2015 R Core Team
+<p>Copyright &copy; 2001&ndash;2016 R Core Team
 </p>
 <blockquote>
 <p>Permission is granted to make and distribute verbatim copies of this
@@ -928,13 +926,13 @@
 <code>libdir</code>.  The C header files can be installed to the value of
 <code>rincludedir</code>: note that as the headers are not installed into a
 subdirectory you probably want something like
-<code>rincludedir=/usr/local/include/R-3.2.3</code>.
+<code>rincludedir=/usr/local/include/R-3.3.1</code>.
 </p>
 <p>If you want the R home to be something other than
 <samp><var>libdir</var>/R</samp>, use <samp>rhome</samp>: for example
 </p>
 <div class="example">
-<pre class="example">make install rhome=/usr/local/lib64/R-3.2.3
+<pre class="example">make install rhome=/usr/local/lib64/R-3.3.1
 </pre></div>
 
 <p>will use a version-specific R home on a non-Debian Linux 64-bit
@@ -1098,8 +1096,8 @@
 <p>Sub-architectures are also used on Windows, but by selecting executables
 within the appropriate <samp>bin</samp> directory,
 <samp><var>R_HOME</var>/bin/i386</samp> or <samp><var>R_HOME</var>/bin/x64</samp>.  For
-backwards compatibility with R &lt; 2.12.0, there are executables
-<samp><var>R_HOME</var>/bin/R.exe</samp> or <samp><var>R_HOME</var>/bin/Rscript.exe</samp>:
+backwards compatibility there are executables
+<samp><var>R_HOME</var>/bin/R.exe</samp> and <samp><var>R_HOME</var>/bin/Rscript.exe</samp>:
 these will run an executable from one of the subdirectories, which one
 being taken first from the
 <a name="index-R_005fARCH-1"></a>
@@ -1114,12 +1112,12 @@
 <a name="Multilib-1"></a>
 <h4 class="subsection">2.6.1 Multilib</h4>
 
-<p>On Linux<a name="DOCF9" href="#FOOT9"><sup>9</sup></a>, there is an alternative mechanism for mixing 32-bit and 64-bit
-libraries known as <em>multilib</em>. If a Linux distribution supports
-multilib, then parallel builds of R may be installed in the
-sub-directories <samp>lib</samp> (32-bit) and <samp>lib64</samp> (64-bit).  The
-build to be run may then be selected using the <code>setarch</code>
-command. For example, a 32-bit build may be run by
+<p>For some Linux distributions<a name="DOCF9" href="#FOOT9"><sup>9</sup></a>, there is an alternative mechanism for mixing
+32-bit and 64-bit libraries known as <em>multilib</em>. If the Linux
+distribution supports multilib, then parallel builds of R may be
+installed in the sub-directories <samp>lib</samp> (32-bit) and <samp>lib64</samp>
+(64-bit).  The build to be run may then be selected using the
+<code>setarch</code> command. For example, a 32-bit build may be run by
 </p>
 <div class="example">
 <pre class="example">setarch i686 R
@@ -1136,8 +1134,8 @@
 version of R installed (since this tells the package installation
 code the architecture needed).
 </p>
-<p>At present there is a potential problem with packages using Java, as
-the post-install for a &lsquo;<samp>i686</samp>&rsquo; RPM on &lsquo;<samp>x86_64</samp>&rsquo; Linux
+<p>There is a potential problem with packages using Java, as the
+post-install for a &lsquo;<samp>i686</samp>&rsquo; RPM on &lsquo;<samp>x86_64</samp>&rsquo; Linux
 reconfigures Java and will find the &lsquo;<samp>x86_64</samp>&rsquo; Java.  If you know
 where a 32-bit Java is installed you may be able to run (as root)
 </p>
@@ -1167,10 +1165,9 @@
 </p>
 <p>One that may be useful when working on R itself is the option
 <samp>--disable-byte-compiled-packages</samp>, which ensures that the base
-and recommended packages are lazyloaded but not byte-compiled.
-(Alternatively the (make or environment) variable
-<code>R_NO_BASE_COMPILE</code> can be set to a non-empty value for the duration
-of the build.)
+and recommended packages are not byte-compiled.  (Alternatively the
+(make or environment) variable <code>R_NO_BASE_COMPILE</code> can be set to a
+non-empty value for the duration of the build.)
 </p>
 <p>Option <samp>--with-internal-tzcode</samp> makes use of R&rsquo;s own code and
 copy of the Olson database for managing timezones.  This will be
@@ -1190,8 +1187,8 @@
 <h4 class="subsection">2.7.1 OpenMP Support</h4>
 
 <p>By default <code>configure</code> searches for suitable
-options<a name="DOCF11" href="#FOOT11"><sup>11</sup></a> for OpenMP support for the C, C++98, FORTRAN
-77 and Fortran compilers.
+options<a name="DOCF11" href="#FOOT11"><sup>11</sup></a> for OpenMP support for the C, C++98, FORTRAN 77 and
+Fortran compilers.
 </p>
 <p>Only the C result is currently used for R itself, and only if
 <code>MAIN_LD</code>/<code>DYLIB_LD</code> were not specified.  This can be
@@ -1213,17 +1210,18 @@
 
 <p>Setting to an empty value will disable OpenMP for that compiler (and
 configuring with <samp>--disable-openmp</samp> will disable all detection of
-OpenMP).  Note that the <code>configure</code> detection test is to compile
-and link a standalone OpenMP program, which is not the same as compiling
-a shared object and loading it into the C program of R&rsquo;s executable.
-Note that overridden values are not tested.
+OpenMP).  The <code>configure</code> detection test is to compile and link
+a standalone OpenMP program, which is not the same as compiling a shared
+object and loading it into the C program of R&rsquo;s executable.  Note
+that overridden values are not tested.
 </p>
 <hr>
 <a name="Testing-a-Unix_002dalike-Installation"></a>
 <a name="Testing-an-Installation"></a>
 <h3 class="section">2.8 Testing an Installation</h3>
 
-<p>Full testing is possible only if the test files have been installed with
+<p>Full post-installation testing is possible only if the test files have
+been installed with
 </p>
 <div class="example">
 <pre class="example">make install-tests
@@ -1288,10 +1286,6 @@
 <pre class="example">testInstalledBasic(&quot;internet&quot;)
 </pre></div>
 
-<p>(On Windows that runs the tests using whichever of internal or WinInet
-internet functions has been selected for that session: to test both run
-this twice selecting both options using <code>setInternet2</code>.)
-</p>
 <p>These tests work best if <code>diff</code> (in <samp>Rtools*.exe</samp> for
 Windows users) is in the path.
 </p>
@@ -1322,10 +1316,12 @@
 &lsquo;<samp>ix86</samp>&rsquo; and &lsquo;<samp>x86_64</samp>&rsquo; <acronym>CPU</acronym>s.
 </p>
 <p>Your file system must allow long file names (as is likely except
-perhaps for some network-mounted systems).
+perhaps for some network-mounted systems).  If it doesn&rsquo;t also support
+conversion to short name equivalents (a.k.a. DOS 8.3 names), then R
+<em>must</em> be installed in a path that does not contain spaces.
 </p>
 <p>Installation is <em>via</em> the installer
-<samp>R-3.2.3-win.exe</samp>.  Just double-click on the icon and
+<samp>R-3.3.1-win.exe</samp>.  Just double-click on the icon and
 follow the instructions.  When installing on a 64-bit version of Windows
 the options will include 32- or 64-bit versions of R (and the default is
 to install both).  You can uninstall R from the Control Panel.
@@ -1392,12 +1388,12 @@
 
 <p>You need to collect the following sets of files:
 </p><ul>
-<li> Get the R source code tarball <samp>R-3.2.3.tar.gz</samp> from
+<li> Get the R source code tarball <samp>R-3.3.1.tar.gz</samp> from
 <acronym>CRAN</acronym>.  Open a command window (or another shell) at directory
 <var>R_HOME</var>, and run
 
 <div class="example">
-<pre class="example">tar -xf R-3.2.3.tar.gz
+<pre class="example">tar -xf R-3.3.1.tar.gz
 </pre></div>
 
 <p>to create the source tree in <var>R_HOME</var>.  <strong>Beware</strong>: do use
@@ -1406,7 +1402,7 @@
 lot of messages which can be suppressed by
 </p>
 <div class="example">
-<pre class="example">tar --no-same-owner -xf R-3.2.3.tar.gz
+<pre class="example">tar --no-same-owner -xf R-3.3.1.tar.gz
 </pre></div>
 
 <a name="index-TAR_005fOPTIONS-1"></a>
@@ -1430,14 +1426,15 @@
 </li><li> The binary distributions of external software.  Download
 
 <div class="example">
-<pre class="example">https://www.stats.ox.ac.uk/pub/Rtools/goodies/multilib/local320.zip
+<pre class="example">https://www.stats.ox.ac.uk/pub/Rtools/goodies/multilib/local323.zip
 </pre></div>
 
-<p>create an empty directory, say <samp>c:/R/extsoft</samp>, and unpack it in
+<p>(or a more recent version if appropriate), create an empty directory, 
+say <samp>c:/R/extsoft</samp>, and unpack it in
 that directory by e.g.
 </p>
 <div class="example">
-<pre class="example">unzip local320.zip -d c:/R/extsoft
+<pre class="example">unzip local323.zip -d c:/R/extsoft
 </pre></div>
 
 </li><li> Make a local copy of the configuration rules by
@@ -1458,11 +1455,11 @@
 </li></ul>
 
 <p>The following additional item is normally installed by
-<samp>Rtools31.exe</samp>.  If instead you choose to do a completely manual
+<samp>Rtools*.exe</samp>.  If instead you choose to do a completely manual
 build you will also need
 </p>
 <ul>
-<li> The Tcl/Tk support files are contained in <samp>Rtools31.exe</samp> and
+<li> The Tcl/Tk support files are contained in <samp>Rtools*.exe</samp> and
 available as <samp>.zip</samp> files from
 <a href="https://www.stats.ox.ac.uk/pub/Rtools">https://www.stats.ox.ac.uk/pub/Rtools</a>.  Please make sure you
 install the right version: there is a 32-bit version and a 64-bit
@@ -1722,7 +1719,7 @@
 installation (in double quotes if it contains spaces or backslashes).
 </p>
 <p>Both methods create an executable with a standard name such as
-<samp>R-3.2.3-win.exe</samp>, so please rename it to indicate that
+<samp>R-3.3.1-win.exe</samp>, so please rename it to indicate that
 it is customized.  If you intend to <em>distribute</em> a customized
 installer please do check that license requirements are met &ndash; note that
 the installer will state that the contents are distributed under GPL
@@ -1781,21 +1778,21 @@
 </pre></div>
 
 <p>which will result in a file with a name like
-<samp>R-3.2.3-win32.msi</samp>.  This can be double-clicked to be
+<samp>R-3.3.1-win32.msi</samp>.  This can be double-clicked to be
 installed, but those who need it will know what to do with it (usually
 by running <code>msiexec /i</code> with additional options).  Properties
 that users might want to set from the <code>msiexec</code> command line
 include &lsquo;<samp>ALLUSERS</samp>&rsquo;, &lsquo;<samp>INSTALLDIR</samp>&rsquo; (something like
-<samp>c:\Program Files\R\R-3.2.3</samp>) and &lsquo;<samp>RMENU</samp>&rsquo; (the path
+<samp>c:\Program Files\R\R-3.3.1</samp>) and &lsquo;<samp>RMENU</samp>&rsquo; (the path
 to the &lsquo;<samp>R</samp>&rsquo; folder on the start menu) and &lsquo;<samp>STARTDIR</samp>&rsquo; (the
 starting directory for R shortcuts, defaulting to something like
 <samp>c:\Users\name\Documents\R</samp>).
 </p>
 <p>The MSI installer can be built both from a 32-bit build of R
-(<samp>R-3.2.3-win32.msi</samp>) and from a 64-bit build of R
-(<samp>R-3.2.3-win64.msi</samp>, optionally including 32-bit files
+(<samp>R-3.3.1-win32.msi</samp>) and from a 64-bit build of R
+(<samp>R-3.3.1-win64.msi</samp>, optionally including 32-bit files
 by setting the macro <code>HOME32</code>, when the name is
-<samp>R-3.2.3-win.msi</samp>).  Unlike the main installer, a 64-bit
+<samp>R-3.3.1-win.msi</samp>).  Unlike the main installer, a 64-bit
 MSI installer can only be run on 64-bit Windows.
 </p>
 <p>Thanks to David del Campo (Dept of Statistics, University of Oxford)
@@ -1863,19 +1860,12 @@
 
 
 <p>The front page of a <acronym>CRAN</acronym> site has a link &lsquo;Download R for OS
-X&rsquo;. Click on that, then download the file <samp>R-3.2.3.pkg</samp>
+X&rsquo;. Click on that, then download the file <samp>R-3.3.1.pkg</samp>
 and install it. This runs on OS X 10.9 and later (Mavericks, Yosemite,
-El Capitan<a name="DOCF13" href="#FOOT13"><sup>13</sup></a>, &hellip;).
-</p>
-<p>There may be<a name="DOCF14" href="#FOOT14"><sup>14</sup></a> a
-separate installer package <samp>R-3.2.3-snowleopard.pkg</samp>,
-which runs on OS X 10.6 and later (Snow Leopard, Lion, Mountain Lion,
-Mavericks, Yosemite, &hellip;); it is a 64-bit (&lsquo;<samp>x86_64</samp>&rsquo;) build
-which should run on all Macs from mid-2008 on.
+El Capitan, &hellip;).
 </p>
 <p>Installers for R-patched and R-devel are usually available from
-<a href="https://r.research.att.com">https://r.research.att.com</a>, including a
-<samp>R-3-2-branch-snowleopard-signed.pkg</samp> build for R-patched.
+<a href="https://r.research.att.com">https://r.research.att.com</a>.
 </p>
 <p>For some older versions of the OS you can in principle (it is little
 tested) install R from the sources.
@@ -1930,11 +1920,12 @@
 can be viewed from <small>R.APP</small>&rsquo;s &lsquo;Help&rsquo; menu.
 </p>
 
-<p>You can run command-line R from a Terminal<a name="DOCF15" href="#FOOT15"><sup>15</sup></a> so these
-can be typed as commands like any other Unix-alike: see the next chapter
-of this manual.  There are some small differences which may surprise
-users of R on other platforms, notably the default location of the
-personal library directory (under <samp>~/Library/R</samp>,
+<p>You can run command-line R and <code>Rscript</code> from a
+Terminal<a name="DOCF13" href="#FOOT13"><sup>13</sup></a> so these can be
+typed as commands like any other Unix-alike: see the next chapter of
+this manual.  There are some small differences which may surprise users
+of R on other platforms, notably the default location of the personal
+library directory (under <samp>~/Library/R</samp>,
 e.g. <samp>~/Library/R/3.3/library</samp>), and that warnings, messages and
 other output to <samp>stderr</samp> are highlighted in bold.
 </p>
@@ -1942,21 +1933,15 @@
 preferences are stored, so if it fails when launched for the very first
 time, try it again (the first attempt will store some preferences).
 </p>
-<p>Users of <small>R.APP</small> under Mavericks and later need to be aware of the &lsquo;App
-Nap&rsquo; feature
+<p>Users of <small>R.APP</small> need to be aware of the &lsquo;App Nap&rsquo; feature
 (<a href="https://developer.apple.com/library/mac/releasenotes/MacOSX/WhatsNewInOSX/Articles/MacOSX10_9.html">https://developer.apple.com/library/mac/releasenotes/MacOSX/WhatsNewInOSX/Articles/MacOSX10_9.html</a>)
 which can cause R tasks to appear to run very slowly when not
-producing output in the console.  Here are three ways to avoid it:
+producing output in the console.  Here are ways to avoid it:
 </p>
 <ul>
 <li> Ensure that the console is completely visible (or at least the activity
 indicator at the top right corner is visible).
 
-</li><li> Call &lsquo;<samp>Get Info</samp>&rsquo; on the application (e.g. from Finder). This may
-have two tick boxes in the &lsquo;General&rsquo; panel: click the one named &lsquo;Prevent
-App Nap&rsquo; if it is not already ticked.  (This only available for builds
-made prior to Mavericks.)
-
 </li><li> In a Terminal, run
 <div class="example">
 <pre class="example">defaults write org.R-project.R NSAppSleepDisabled -bool YES
@@ -1985,7 +1970,7 @@
 <samp>/usr/local/bin</samp> should also be removed.
 </p>
 <p>If you want to get rid of R more completely using a Terminal, simply
-run (use <samp>/usr/local/bin</samp> on El Capitan):
+run (use <samp>/usr/local/bin</samp> as from El Capitan):
 </p>
 <div class="example">
 <pre class="example">sudo rm -rf /Library/Frameworks/R.framework /Applications/R.app \
@@ -2013,6 +1998,8 @@
 
 <p>These are paths relative to <samp>/</samp>, the root of the file system.
 </p>
+
+
 <hr>
 <a name="Multiple-versions"></a>
 <a name="Multiple-versions-1"></a>
@@ -2028,7 +2015,7 @@
 </p>
 <p>A version of R can be run directly from the command-line as e.g.
 </p><div class="example">
-<pre class="example">/Library/Frameworks/R.framework/Versions/3.2/Resources/bin/R
+<pre class="example">/Library/Frameworks/R.framework/Versions/3.3/Resources/bin/R
 </pre></div>
 
 <p>However, <small>R.APP</small> will always run the &lsquo;current&rsquo; version, that is the last
@@ -2146,7 +2133,7 @@
 </p>
 <p>R comes with a single library, <samp><var>R_HOME</var>/library</samp> which is
 the value of the R object &lsquo;<samp>.Library</samp>&rsquo; containing the standard and
-recommended<a name="DOCF16" href="#FOOT16"><sup>16</sup></a>  packages.
+recommended<a name="DOCF14" href="#FOOT14"><sup>14</sup></a>  packages.
 Both sites and users can create others and make use of them (or not) in
 an R session.  At the lowest level &lsquo;<samp>.libPaths()</samp>&rsquo; can be used to
 add paths to the collection of libraries or to report the current
@@ -2157,7 +2144,7 @@
 <p>R will automatically make use of a site-specific library
 <samp><var>R_HOME</var>/site-library</samp> if this exists (it does not in a
 vanilla R installation).  This location can be overridden by
-setting<a name="DOCF17" href="#FOOT17"><sup>17</sup></a> &lsquo;<samp>.Library.site</samp>&rsquo; in
+setting<a name="DOCF15" href="#FOOT15"><sup>15</sup></a> &lsquo;<samp>.Library.site</samp>&rsquo; in
 <samp><var>R_HOME</var>/etc/Rprofile.site</samp>, or (not recommended) by setting
 the
 <a name="index-R_005fLIBS_005fSITE"></a>
@@ -2204,7 +2191,7 @@
 <p>For most users it suffices to call
 &lsquo;<samp>install.packages(<var>pkgname</var>)</samp>&rsquo; or its GUI equivalent if the
 intention is to install a <acronym>CRAN</acronym> package and internet access is
-available.<a name="DOCF18" href="#FOOT18"><sup>18</sup></a>  On most systems &lsquo;<samp>install.packages()</samp>&rsquo;
+available.<a name="DOCF16" href="#FOOT16"><sup>16</sup></a>  On most systems &lsquo;<samp>install.packages()</samp>&rsquo;
 will allow packages to be selected from a list box (typically with
 several thousand items).
 </p>
@@ -2252,7 +2239,7 @@
 </p>
 <p><code>install.packages</code> can look in several repositories, specified as a
 character vector by the argument <code>repos</code>: these can include a
-<acronym>CRAN</acronym> mirror, Bioconductor, Omegahat, R-forge, rforge.net,
+<acronym>CRAN</acronym> mirror, Bioconductor, R-forge, rforge.net,
 local archives, local files, &hellip;).  Function
 <code>setRepositories()</code> can select amongst those repositories that the
 R installation is aware of.
@@ -2298,13 +2285,16 @@
 the path: it should work to have both 32- and 64-bit Gtk+ <samp>bin</samp>
 directories in the path on a 64-bit version of R.
 </p>
-<p><code>R CMD INSTALL</code> works in Windows to install source packages.  No
-additional tools are needed if the package does not contain compiled
-code, and <code>install.packages(type=&quot;source&quot;)</code> will work for such
-packages (and for those with compiled code if the tools (see <a href="#The-Windows-toolset">The Windows toolset</a>) are in the path).  We have seen occasional permission
-problems after unpacking source packages on some systems: these have
-been circumvented by setting the environment variable
-<code>R_INSTALL_TAR</code> to &lsquo;<samp>tar.exe</samp>&rsquo;.
+<p><code>R CMD INSTALL</code> works in Windows to install source packages.
+No additional tools are needed if the package does not contain
+compiled code, and <code>install.packages(type=&quot;source&quot;)</code> will work
+for such packages (and for those with compiled code if the tools (see
+<a href="#The-Windows-toolset">The Windows toolset</a>) are on the path, and the variables
+<code>BINPREF</code> and <code>BINPREF64</code> are set properly; see the
+discussion below).  We have seen occasional permission problems after
+unpacking source packages on some systems: these have been
+circumvented by setting the environment variable <code>R_INSTALL_TAR</code>
+to &lsquo;<samp>tar.exe</samp>&rsquo;.
 <a name="index-R_005fINSTALL_005fTAR"></a>
 </p>
 <p>If you have only a source package that is known to work with current
@@ -2319,7 +2309,7 @@
 architecture was successfully installed.  The exceptions are packages
 with a non-empty <samp>configure.win</samp> script or which make use of
 <samp>src/Makefile.win</samp>.  If <samp>configure.win</samp> does something
-appropriate to both architectures use<a name="DOCF19" href="#FOOT19"><sup>19</sup></a> option
+appropriate to both architectures use<a name="DOCF17" href="#FOOT17"><sup>17</sup></a> option
 <samp>--force-biarch</samp>: otherwise <code>R CMD INSTALL
 --merge-multiarch</code> can be applied to a source tarball to merge separate
 32- and 64-bit installs.  (This can only be applied to a tarball, and
@@ -2332,14 +2322,22 @@
 </p>
 
 <a name="index-LOCAL_005fSOFT"></a>
-<p>There is provision to make use of a system-wide library of installed
-external software by setting the <code>make</code> variable
-<code>LOCAL_SOFT</code>, to give an equivalent of <samp>/usr/local</samp> on a
-Unix-alike.  This can be set in <samp>src/gnuwin/MkRules.local</samp> when
-R is built from sources (see the comments in
-<samp>src/gnuwin/MkRules.dist</samp>), or in file<a name="DOCF20" href="#FOOT20"><sup>20</sup></a>  <samp>etc/i386/Makeconf</samp> or <samp>etc/x64/Makeconf</samp> for an
-installed version of R.  The version used by <acronym>CRAN</acronym> can be
-installed as described in <a href="#Building-from-source">Building from source</a>.
+<a name="index-BINPREF"></a>
+<a name="index-BINPREF64"></a>
+<p>Packages with compiled code may need to have paths to the compilers
+set explicitly, and there is provision to make use of a system-wide
+library of installed external software. The compiler paths are set
+using the <code>make</code> variables <code>BINPREF</code> (and in some cases
+<code>BINPREF64</code>).  The library location is set using <code>make</code>
+variable <code>LOCAL_SOFT</code>, to give an equivalent of <samp>/usr/local</samp>
+on a Unix-alike.  All of these can be set in
+<samp>src/gnuwin32/MkRules.local</samp> when R is built from sources (see
+the comments in <samp>src/gnuwin32/MkRules.dist</samp>), or in
+file<a name="DOCF18" href="#FOOT18"><sup>18</sup></a>
+<samp>etc/i386/Makeconf</samp> or <samp>etc/x64/Makeconf</samp> for an installed
+version of R.  In the latter case only <code>BINPREF</code> is used, with
+the 64 bit path used in <samp>etc/x64/Makeconf</samp>. The version used by
+<acronym>CRAN</acronym> can be installed as described in <a href="#Building-from-source">Building from source</a>.
 </p>
 
 <hr>
@@ -2366,11 +2364,7 @@
 to do so for those with, if <code>make</code> is available.
 </p>
 <p>Note that most binary packages including compiled code are tied to a
-particular series (e.g. R 3.2.x or 3.1.x) of R.
-</p>
-<p>You should not attempt to mix-and-match binary packages built for the
-&lsquo;Snow Leopard&rsquo; and &lsquo;Mavericks&rsquo; <acronym>CRAN</acronym> distributions: doing so is
-likely to lead to crashes or failures to load.
+particular series (e.g. R 3.2.x or 3.3.x) of R.
 </p>
 <p>Installing source packages which do not contain compiled code should
 work with no additional tools. For others you will need the
@@ -2379,7 +2373,7 @@
 </p>
 <p>Package <a href="https://CRAN.R-project.org/package=rJava"><strong>rJava</strong></a> and those which depend on it need a Java runtime
 installed and several packages need X11 installed, including those using
-Tk.  For Mountain Lion and later see <a href="#OS-X">OS X</a> and <a href="#Java-_0028OS-X_0029">Java (OS X)</a>.
+Tk.  See <a href="#OS-X">OS X</a> and <a href="#Java-_0028OS-X_0029">Java (OS X)</a>.
 </p>
 <p>Tcl/Tk extensions <code>BWidget</code> and <code>Tktable</code> are part of the
 Tcl/Tk contained in the R installer.  These are required by a number
@@ -2395,13 +2389,14 @@
 <p>The default compilers specified in
 <samp>/Library/Frameworks/R.framework/Resources/etc/Makeconf</samp> depend on
 the version of OS X under which R was installed, and are appropriate
-to the latest version of the command-line tools for that version
-of OS X.  The settings can be changed, either by editing that file or in
-a file such as <samp>~/.R/Makevars</samp> (see the next section).  Entries
-which may need to be changed include &lsquo;<samp>CC</samp>&rsquo;, &lsquo;<samp>CXX</samp>&rsquo;, &lsquo;<samp>FC</samp>&rsquo;,
-&lsquo;<samp>F77</samp>&rsquo;, &lsquo;<samp>FLIBS</samp>&rsquo; and the corresponding flags, and perhaps
-&lsquo;<samp>CXXCPP</samp>&rsquo;, &lsquo;<samp>DYLIB_LD</samp>&rsquo;, &lsquo;<samp>MAIN_LD</samp>&rsquo;, &lsquo;<samp>SHLIB_CXXLD</samp>&rsquo;,
-&lsquo;<samp>SHLIB_FCLD</samp>&rsquo; and &lsquo;<samp>SHLIB_LD</samp>&rsquo;.
+for the latest version of the &lsquo;Command Line Tools&rsquo; for that version of
+OS X and the recommended version of Fortran (see <a href="#OS-X">OS X</a>).  The
+settings can be changed, either by editing that file or in a file such
+as <samp>~/.R/Makevars</samp> (see the next section).  Entries which may need
+to be changed include &lsquo;<samp>CC</samp>&rsquo;, &lsquo;<samp>CXX</samp>&rsquo;, &lsquo;<samp>FC</samp>&rsquo;, &lsquo;<samp>F77</samp>&rsquo;,
+&lsquo;<samp>FLIBS</samp>&rsquo; and the corresponding flags, and perhaps &lsquo;<samp>CXXCPP</samp>&rsquo;,
+&lsquo;<samp>DYLIB_LD</samp>&rsquo;, &lsquo;<samp>MAIN_LD</samp>&rsquo;, &lsquo;<samp>SHLIB_CXXLD</samp>&rsquo;, &lsquo;<samp>SHLIB_FCLD</samp>&rsquo;
+and &lsquo;<samp>SHLIB_LD</samp>&rsquo;.
 </p>
 <p>So for example you could select <code>clang</code> for both C and C++ with
 extensive checking by having in <samp>~/.R/Makevars</samp>
@@ -2412,11 +2407,6 @@
 CXXFLAGS=-mtune=native -g -O2 -Wall -pedantic -Wconversion
 </pre></div>
 
-<p>and for a version of <code>gfortran-4.2</code> we needed
-</p><div class="example">
-<pre class="example">FLIBS=-lgfortran
-</pre></div>
-
 
 <hr>
 <a name="Customizing-package-compilation"></a>
@@ -2528,8 +2518,7 @@
 <code>install.packages(type = &quot;source&quot;, INSTALL_opts =
 &quot;--byte-compile&quot;)</code>.
 </p>
-<p>Not all contributed packages work correctly when byte-compiled (for
-example because they interfere with the sealing of namespaces).  For
+<p>Not all contributed packages work correctly when byte-compiled.  For
 most packages (especially those which make extensive use of compiled
 code) the speed-up is small.  Unless a package is used frequently the
 time spent in byte-compilation can outweigh the time saved in execution:
@@ -2540,6 +2529,65 @@
 &lsquo;<samp>ByteCompile</samp>&rsquo; field in the <samp>DESCRIPTION</samp> file.
 </p>
 <hr>
+<a name="External-software"></a>
+<a name="External-software-1"></a>
+<h4 class="subsection">6.3.6 External software</h4>
+
+<p>Some R packages contain compiled code which links to external
+software libraries.  Unless the external library is statically linked
+(which is done as much as possible for binary packages on Windows and OS
+X), the libraries have to be found when the package is loaded and not
+just when it is installed.  How this should be done depends on the OS
+(and in some cases the version).
+</p>
+<p>For Unix-alikes except OS X the primary mechanism is the <code>ld.so</code>
+cache controlled by <code>ldconfig</code>: external dynamic libraries
+recorded in that cache will be found.  Standard library locations will
+be covered by the cache, and well-designed software will add its
+locations (as for example <strong>openmpi</strong> does on Fedora).  The secondary
+mechanism is to consult the environment variable <code>LD_LIBRARY_PATH</code>.
+Now the R script controls that variable, and sets it to the
+concatenation of <code>R_LD_LIBRARY_PATH</code>, <code>R_JAVA_LD_LIBRARY_PATH</code>
+and the environment value of <code>LD_LIBRARY_PATH</code>.  The first two have
+defaults which are normally set when R is installed (but can be
+overridden in the environment) so <code>LD_LIBRARY_PATH</code> is the best
+choice for a user to set.
+</p>
+<p>On OS X the primary mechanism is to embed the absolute path to dependent
+dynamic libraries into an object when it is compiled.  Few R packages
+arrange to do so, but it can be edited<a name="DOCF19" href="#FOOT19"><sup>19</sup></a> <em>via</em> <code>install_name_tool</code> &mdash;
+that only deals with direct dependencies and those would also need to be
+compiled to include the absolute paths of their dependencies.  If the
+choice of absolute path is to be deferred to load time, how they are
+resolved is described in <code>man dyld</code>: the role of
+<code>LD_LIBRARY_PATH</code> is replaced on OS X by <code>DYLD_LIBRARY_PATH</code> and
+latterly <code>DYLD_FALLBACK_LIBRARY_PATH</code>.  Running <code>R CMD otool
+-L</code> on the package shared object will show where (if anywhere) its
+dependencies are resolved. <code>DYLD_FALLBACK_LIBRARY_PATH</code> is preferred
+(and it is that which is manipulated by the R script), but as from
+10.11 (&lsquo;El Capitan&rsquo;) the default behaviour had been changed for security
+reasons to discard these environment variables when invoking a shell
+script (and <samp>R</samp> is a shell script).  That makes the only portable
+option to set <code>R_LD_LIBRARY_PATH</code> in the environment, something like
+</p>
+<div class="example">
+<pre class="example">export R_LD_LIBRARY_PATH=&quot;`R RHOME`/lib:/opt/local/lib&quot;
+</pre></div>
+
+<p>The precise rules for where Windows looks for DLLs are complex and
+depend on the version of Windows.  But for present purposes the main
+solution is to put the directories containing the DLLs the package
+links to (and any those DLLs link to) on the <code>PATH</code>.  64-bit
+versions of Windows will ignore 32-bit DLLs from 64-bit R and
+<em>vice versa</em>.
+</p>
+<p>The danger with any of the methods which involve setting environment
+variables is of inadvertently masking a system library.  This is less
+for <code>DYLD_FALLBACK_LIBRARY_PATH</code> and for <em>appending</em> to
+<code>PATH</code> on Windows (as it should already contain the system library
+paths).
+</p>
+<hr>
 <a name="Updating-packages"></a>
 <a name="Updating-packages-1"></a>
 <h3 class="section">6.4 Updating packages</h3>
@@ -2596,8 +2644,7 @@
                   lib = file.path(&quot;path&quot;, &quot;to&quot;, &quot;library&quot;))
 </pre></div>
 
-<p>Finally, in most installations one can just remove the package directory
-from the library.
+<p>Finally, one can just remove the package directory from the library.
 </p>
 
 <hr>
@@ -2609,11 +2656,12 @@
 <p>Utilities such as <code>install.packages</code> can be pointed at any
 <acronym>CRAN</acronym>-style repository, and R users may want to set up their
 own.  The &lsquo;base&rsquo; of a repository is a URL such as
-<a href="http://www.omegahat.org/R/">http://www.omegahat.org/R/</a>: this must be an URL scheme that
-<code>download.packages</code> supports (which also includes &lsquo;<samp>ftp://</samp>&rsquo; and
-&lsquo;<samp>file://</samp>&rsquo; and on most systems &lsquo;<samp>https://</samp>&rsquo;).  Under that base
-URL there should be directory trees for one or more of the following
-types of package distributions:
+<a href="http://www.stats.ox.ac.uk/pub/RWin">http://www.stats.ox.ac.uk/pub/RWin</a>: this must be an URL scheme
+that <code>download.packages</code> supports (which also includes
+&lsquo;<samp>ftp://</samp>&rsquo; and &lsquo;<samp>file://</samp>&rsquo; and (from R 3.3.0 and perhaps
+earlier) &lsquo;<samp>https://</samp>&rsquo;).  Under that base URL there should be
+directory trees for one or more of the following types of package
+distributions:
 </p>
 <ul>
 <li> <code>&quot;source&quot;</code>: located at <samp>src/contrib</samp> and containing
@@ -2630,11 +2678,6 @@
 <samp>bin/macosx/mavericks/contrib/<var>3.y</var></samp> for the CRAN build for
 &lsquo;Mavericks&rsquo; (and later) for R versions <var>3.y.z</var>, containing
 <samp>.tgz</samp> files.
-
-</li><li> <code>&quot;mac.binary&quot;</code>: located at
-<samp>bin/macosx/contrib/<var>3.y</var></samp> for a CRAN build for
-&lsquo;Snow Leopard&rsquo; (and later) for R versions <var>3.y.z</var>, containing
-<samp>.tgz</samp> files.
 </li></ul>
 
 <p>Each terminal directory must also contain a <samp>PACKAGES</samp> file.  This
@@ -2794,7 +2837,7 @@
 <a name="Locales-under-Unix_002dalikes-1"></a>
 <h4 class="subsection">7.1.1 Locales under Unix-alikes</h4>
 
-<p>Modern Linux uses the XPG<a name="DOCF21" href="#FOOT21"><sup>21</sup></a> locale specifications which have the form
+<p>Modern Linux uses the XPG<a name="DOCF20" href="#FOOT20"><sup>20</sup></a> locale specifications which have the form
 &lsquo;<samp>en_GB</samp>&rsquo;, &lsquo;<samp>en_GB.UTF-8</samp>&rsquo;, &lsquo;<samp>aa_ER.UTF-8@saaho</samp>&rsquo;,
 &lsquo;<samp>de_AT.iso885915@euro</samp>&rsquo;, the components being in the order listed
 above.  (See <code>man locale</code> and <code>locale -a</code> for more
@@ -2855,7 +2898,7 @@
 <a name="index-LC_005fALL"></a>
 <a name="index-LC_005fMESSAGES"></a>
 <a name="index-LANG"></a>
-<code>LANGUAGE</code> and then<a name="DOCF22" href="#FOOT22"><sup>22</sup></a>
+<code>LANGUAGE</code> and then<a name="DOCF21" href="#FOOT21"><sup>21</sup></a>
 by the environment variables <code>LC_ALL</code>, <code>LC_MESSAGES</code> and
 <code>LANG</code>. (The last three are normally used to set the locale and so
 should not be needed, but the first is only used to select the language
@@ -2869,7 +2912,7 @@
 <p>It is usually possible to change the language once R is running
 <em>via</em> (not Windows) <code>Sys.setlocale(&quot;LC_MESSAGES&quot;,
 &quot;new_locale&quot;)</code>, or by setting an environment variable such as
-<code>LANGUAGE</code>, <em>provided</em><a name="DOCF23" href="#FOOT23"><sup>23</sup></a> the language you are changing to can be output in
+<code>LANGUAGE</code>, <em>provided</em><a name="DOCF22" href="#FOOT22"><sup>22</sup></a> the language you are changing to can be output in
 the current character set.  But this is OS-specific, and has been known
 to stop working on an OS upgrade.
 </p>
@@ -2908,7 +2951,7 @@
 specific translation catalogue exists but does not contain a
 translation, the less specific catalogues are consulted.  For example,
 R has catalogues for &lsquo;<samp>en_GB</samp>&rsquo; that translate the Americanisms
-(e.g., &lsquo;<samp>gray</samp>&rsquo;) in the standard messages into English.<a name="DOCF24" href="#FOOT24"><sup>24</sup></a>  Two other examples: there are catalogues
+(e.g., &lsquo;<samp>gray</samp>&rsquo;) in the standard messages into English.<a name="DOCF23" href="#FOOT23"><sup>23</sup></a>  Two other examples: there are catalogues
 for &lsquo;<samp>es</samp>&rsquo;, which is Spanish as written in Spain and these will by
 default also be used in Spanish-speaking Latin American countries, and
 also for &lsquo;<samp>pt_BR</samp>&rsquo;, which are used for Brazilian locales but not for
@@ -2924,7 +2967,7 @@
 quotes.
 </p>
 <p>If no suitable translation catalogue is found or a particular message is
-not translated in any suitable catalogue, &lsquo;English&rsquo;<a name="DOCF25" href="#FOOT25"><sup>25</sup></a> is used.
+not translated in any suitable catalogue, &lsquo;English&rsquo;<a name="DOCF24" href="#FOOT24"><sup>24</sup></a> is used.
 </p>
 <p>See <a href="https://developer.r-project.org/Translations30.html">https://developer.r-project.org/Translations30.html</a> for how to
 prepare and install translation catalogues.
@@ -2942,8 +2985,8 @@
 64-bit is.
 </p>
 <p>All current versions of R use 32-bit integers and
-<acronym>ISO</acronym>/<acronym>IEC</acronym>&nbsp;60559<a name="DOCF26" href="#FOOT26"><sup>26</sup></a> double-precision reals, and so compute to
-the same precision<a name="DOCF27" href="#FOOT27"><sup>27</sup></a> and with the same limits on the sizes of
+<acronym>ISO</acronym>/<acronym>IEC</acronym>&nbsp;60559<a name="DOCF25" href="#FOOT25"><sup>25</sup></a> double-precision reals, and so compute to
+the same precision<a name="DOCF26" href="#FOOT26"><sup>26</sup></a> and with the same limits on the sizes of
 numerical quantities.  The principal difference is in the size of the
 pointers.
 </p>
@@ -2965,7 +3008,7 @@
 around one third (around 1Gb).
 </p>
 </li><li> Only 64-bit builds support &lsquo;long vectors&rsquo;, those with <em>2^{31}</em> or
-more elements (each of which needs 16GB of storage for a numeric
+more elements (which needs at least 16GB of storage for each numeric
 vector).
 
 </li><li> Most 32-bit OSes by default limit file sizes to 2GB (and this may also
@@ -2984,9 +3027,9 @@
 &lsquo;<samp>x86_64</samp>&rsquo; <em>vs</em> &lsquo;<samp>ix86</samp>&rsquo;, the 64-bit CPU has features
 (such as SSE2 instructions) which are guaranteed to be present but are
 optional on the 32-bit CPU, and also has more general-purpose registers.
-This means that on chips like a desktop Intel Core 2 Duo the vanilla
-64-bit version of R has been around 10% faster on both Linux and OS
-X.  (Laptop CPUs are usually relatively slower in 64-bit mode.)
+This means that on chips like a desktop Intel i7 the vanilla 64-bit
+version of R has been around 10% faster on both Linux and OS X.
+(Laptop CPUs are usually relatively slower in 64-bit mode.)
 </li></ul>
 
 <p>So, for speed you may want to use a 32-bit build (especially on a
@@ -3006,7 +3049,7 @@
 <h2 class="chapter">9 The standalone Rmath library</h2>
 
 <p>The routines supporting the distribution and
-special<a name="DOCF28" href="#FOOT28"><sup>28</sup></a> functions in R
+special<a name="DOCF27" href="#FOOT27"><sup>27</sup></a> functions in R
 and a few others are declared in C header file <samp>Rmath.h</samp>.  These
 can be compiled into a standalone library for linking to other
 applications.  (Note that they are not a separate library when R is
@@ -3018,7 +3061,7 @@
 Unix-alike if that is separate from the sources).
 </p>
 <p><samp>Rmath.h</samp> contains &lsquo;<samp>R_VERSION_STRING</samp>&rsquo;, which is a character
-string containing the current R version, for example <code>&quot;3.2.0&quot;</code>.
+string containing the current R version, for example <code>&quot;3.3.0&quot;</code>.
 </p>
 <p>There is full access to R&rsquo;s handling of <code>NaN</code>, <code>Inf</code> and
 <code>-Inf</code> via special versions of the macros and functions
@@ -3101,7 +3144,7 @@
 not be able to run it unless you add the directory containing
 <a name="index-LD_005fLIBRARY_005fPATH"></a>
 <samp>libRmath.so</samp> to the <code>LD_LIBRARY_PATH</code> environment variable
-(<samp>libRmath.dylib</samp>, <code>DYLD_LIBRARY_PATH</code> on OS X).
+(<samp>libRmath.dylib</samp>, <code>DYLD_FALLBACK_LIBRARY_PATH</code> on OS X).
 </p>
 <p>The targets
 </p>
@@ -3134,7 +3177,7 @@
 <a name="Windows-1"></a>
 <h3 class="section">9.2 Windows</h3>
 
-<p>You need to set up<a name="DOCF29" href="#FOOT29"><sup>29</sup></a> almost all the
+<p>You need to set up<a name="DOCF28" href="#FOOT28"><sup>28</sup></a> almost all the
 tools to make R and then run (in a Unix-like shell)
 </p>
 <div class="example">
@@ -3161,7 +3204,7 @@
 <pre class="example">make -f Makefile.win shared implib
 </pre></div>
 
-<p>To use the routines in your own C or C++ programs using MinGW, include
+<p>To use the routines in your own C or C++ programs using MinGW-w64, include
 </p>
 <div class="example">
 <pre class="example">#define MATHLIB_STANDALONE
@@ -3174,7 +3217,7 @@
 able to force static or dynamic linking  <em>via</em>
 </p>
 <div class="example">
-<pre class="example">-Wl,-Bstatic -lRmath -Wl,dynamic
+<pre class="example">-Wl,-Bstatic -lRmath -Wl,Bdynamic
 -Wl,-Bdynamic -lRmath
 </pre></div>
 
@@ -3184,7 +3227,7 @@
 linked).
 </p>
 <p>It is possible to link to <samp>Rmath.dll</samp> using other compilers, either
-directly or via an import library: if you make a MinGW import library as
+directly or via an import library: if you make a MinGW-w64 import library as
 above, you will create a file <samp>Rmath.def</samp> which can be used
 (possibly after editing) to create an import library for other systems
 such as Visual C++.
@@ -3198,7 +3241,7 @@
 </pre></div>
 
 <p>to ensure that the constants like <code>NA_REAL</code> are linked correctly.
-(Auto-import will probably work with MinGW, but it is better to be
+(Auto-import will probably work with MinGW-w64, but it is better to be
 sure. This is likely to also work with VC++, Borland and similar
 compilers.)
 </p>
@@ -3225,45 +3268,69 @@
 <h3 class="section">A.1 Essential programs and libraries</h3>
 
 <p>You need a means of compiling C and FORTRAN 90 (see <a href="#Using-FORTRAN">Using FORTRAN</a>).  Your C compiler should be
-<acronym>ISO</acronym>/<acronym>IEC</acronym>&nbsp;60059<a name="DOCF30" href="#FOOT30"><sup>30</sup></a>, POSIX 1003.1 and C99-compliant.<a name="DOCF31" href="#FOOT31"><sup>31</sup></a>  R tries to choose suitable flags for
+<acronym>ISO</acronym>/<acronym>IEC</acronym>&nbsp;60059<a name="DOCF29" href="#FOOT29"><sup>29</sup></a>, POSIX 1003.1 and C99-compliant.<a name="DOCF30" href="#FOOT30"><sup>30</sup></a>  R tries to choose suitable flags for
 the C compilers it knows about, but you may have to set <code>CC</code> or
 <code>CFLAGS</code> suitably.  For many versions of <code>gcc</code> with
 <code>glibc</code> this means including
-<samp>-std=gnu99</samp><a name="DOCF32" href="#FOOT32"><sup>32</sup></a>.  If the compiler is detected as
-<code>gcc</code>&nbsp;<code>4.x</code>, <samp>-std=gnu99</samp> will be appended to
-<code>CC</code> unless it conflicts with a setting of <code>CFLAGS</code>.  (Note
-that options essential to run the compiler even for linking, such as
-those to set the architecture, should be specified as part of <code>CC</code>
-rather than in <code>CFLAGS</code>.)
+<samp>-std=gnu99</samp><a name="DOCF31" href="#FOOT31"><sup>31</sup></a>.  (Note that options essential to
+run the compiler even for linking, such as those to set the
+architecture, should be specified as part of <code>CC</code> rather than in
+<code>CFLAGS</code>.)
 </p>
 <p>Unless you do not want to view graphs on-screen (or use OS X) you need
 &lsquo;<samp>X11</samp>&rsquo; installed, including its headers and client libraries. For
-recent Fedora distributions it means (at least) RPMs &lsquo;<samp>libX11</samp>&rsquo;,
-&lsquo;<samp>libX11-devel</samp>&rsquo;, &lsquo;<samp>libXt</samp>&rsquo; and &lsquo;<samp>libXt-devel</samp>&rsquo;.  On Debian we
-recommend the meta-package &lsquo;<samp>xorg-dev</samp>&rsquo;.  If you really do not want
-these you will need to explicitly configure R without X11, using
-<samp>--with-x=no</samp>.
+recent Fedora/RedHat distributions it means (at least) RPMs
+&lsquo;<samp>libX11</samp>&rsquo;, &lsquo;<samp>libX11-devel</samp>&rsquo;, &lsquo;<samp>libXt</samp>&rsquo; and &lsquo;<samp>libXt-devel</samp>&rsquo;.
+On Debian/Ubuntu we recommend the meta-package &lsquo;<samp>xorg-dev</samp>&rsquo;.  If you
+really do not want these you will need to explicitly configure R
+without X11, using <samp>--with-x=no</samp>.
 </p>
 <p>The command-line editing (and command completion) depends on the
-<acronym>GNU</acronym> <code>readline</code> library: version 4.2 or later is needed
-for all the features to be enabled.  Otherwise you will need to
-configure with <samp>--with-readline=no</samp> (or equivalent).
+<acronym>GNU</acronym> <code>readline</code> library (including its headers): version
+4.2 or later is needed for all the features to be enabled.  Otherwise
+you will need to configure with <samp>--with-readline=no</samp> (or
+equivalent).
 </p>
 <p>A suitably comprehensive <code>iconv</code> function is essential.  The R
 usage requires <code>iconv</code> to be able to translate between
 <code>&quot;latin1&quot;</code> and <code>&quot;UTF-8&quot;</code>, to recognize <code>&quot;&quot;</code> (as the
 current encoding) and <code>&quot;ASCII&quot;</code>, and to translate to and from the
 Unicode wide-character formats <code>&quot;UCS-[24][BL]E&quot;</code> &mdash; this is true
-by default for <code>glibc</code><a name="DOCF33" href="#FOOT33"><sup>33</sup></a> but not of most commercial Unixes.  However, you
+by default for <code>glibc</code><a name="DOCF32" href="#FOOT32"><sup>32</sup></a> but not of most commercial Unixes.  However, you
 can make use of <acronym>GNU</acronym> <code>libiconv</code> (as used on OS X: see
 <a href="https://www.gnu.org/software/libiconv/">https://www.gnu.org/software/libiconv/</a>).
 </p>
-<p>The OS needs to have enough support<a name="DOCF34" href="#FOOT34"><sup>34</sup></a> for wide-character
+<p>The OS needs to have enough support<a name="DOCF33" href="#FOOT33"><sup>33</sup></a> for wide-character
 types: this is checked at configuration.  A small number of POSIX
-functions<a name="DOCF35" href="#FOOT35"><sup>35</sup></a> are essential, and others<a name="DOCF36" href="#FOOT36"><sup>36</sup></a> will be used if available.
+functions<a name="DOCF34" href="#FOOT34"><sup>34</sup></a> are essential, and others<a name="DOCF35" href="#FOOT35"><sup>35</sup></a> will be used if available.
+</p>
+<p>Installations of <code>zlib</code> (version 1.2.5 or later), <code>libbz2</code>
+(version 1.0.6 or later: called <strong>bzip2-libs</strong>/<strong>bzip2-devel</strong> or
+<strong>libbz2-1.0</strong>/<strong>libbz2-dev</strong> by some Linux distributions),
+<code>liblzma</code><a name="DOCF36" href="#FOOT36"><sup>36</sup></a> version 5.0.3 or
+later are required.
+</p>
+<p>PCRE<a name="DOCF37" href="#FOOT37"><sup>37</sup></a> (version 8.32 or later, although versions 8.10&ndash;8.31 will
+be accepted with a deprecation warning) is required (or just its library
+and headers if packaged separately).  PCRE must be built with UTF-8
+support (not the default, and checked by <code>configure</code>) and
+support for Unicode properties is assumed by some R packages.  JIT
+support is desirable for the best performance: support for this and
+Unicode properties can be checked at run-time by calling
+<code>pcre_config()</code>.  If building PCRE for use with R a suitable
+<code>configure</code> command might be
+</p><div class="example">
+<pre class="example">/configure --enable-utf --enable-unicode-properties --enable-jit --disable-cpp
+</pre></div>
+<p>The <samp>--enable-jit</samp> flag is supported for most common CPUs.
+</p>
+<p>Library <code>libcurl</code> (version 7.28.0 or later) is required.
+Information on <code>libcurl</code> is found from the <code>curl-config</code>
+script: if that is missing or needs to be overridden<a name="DOCF38" href="#FOOT38"><sup>38</sup></a> there are macros to do so described in file
+<samp>config.site</samp>.
 </p>
 <p>A <code>tar</code> program is needed to unpack the sources and packages
-(including the recommended packages).  A version<a name="DOCF37" href="#FOOT37"><sup>37</sup></a> that can
+(including the recommended packages).  A version<a name="DOCF39" href="#FOOT39"><sup>39</sup></a> that can
 automagically detect compressed archives is preferred for use with
 <code>untar()</code>: the configure script looks for <code>gtar</code> and
 <code>gnutar</code> before
@@ -3283,10 +3350,15 @@
 <samp>texinfo.tex</samp> installed (which is part of the <acronym>GNU</acronym>
 <strong>texinfo</strong> distribution but is often made part of the TeX package
 in re-distributions) as well as
-<code>texi2dvi</code>.<a name="DOCF38" href="#FOOT38"><sup>38</sup></a>
+<code>texi2dvi</code>.<a name="DOCF40" href="#FOOT40"><sup>40</sup></a>
 Further, the versions of <code>texi2dvi</code> and <samp>texinfo.tex</samp> need
 to be compatible: we have seen problems with older TeX distributions.
 </p>
+<a name="index-Subversion-1"></a>
+<p>If you want to build from the R Subversion repository then
+<code>texi2any</code> is highly recommended as it is used to create files
+which are in the tarball but not stored in the Subversion repository.
+</p>
 <a name="index-Vignettes"></a>
 <p>The PDF documentation (including <samp>doc/NEWS.pdf</samp>) and building
 vignettes needs <code>pdftex</code> and <code>pdflatex</code>.  We require
@@ -3301,19 +3373,13 @@
 may need to change R&rsquo;s defaults: see <a href="#Making-the-manuals">Making the manuals</a>).  Note
 that package <strong>hyperref</strong> (currently) requires packages
 <strong>kvoptions</strong>, <strong>ltxcmds</strong> and <strong>refcount</strong>.  For distributions
-based on TeXLive the simplest approach may be to install collections
+based on TeX Live the simplest approach may be to install collections
 <strong>collection-latex</strong>, <strong>collection-fontsrecommended</strong>,
 <strong>collection-latexrecommended</strong>, <strong>collection-fontsextra</strong> and
 <strong>collection-latexextra</strong> (assuming they are not installed by
 default): Fedora uses names like <strong>texlive-collection-fontsextra</strong> and
 Debian/Ubuntu like <strong>texlive-fonts-extra</strong>.
 </p>
-
-<a name="index-Subversion-1"></a>
-<p>If you want to build from the R Subversion repository then
-<code>texi2any</code> is highly recommended as it is used to create files
-in the tarball but not under Subversion.
-</p>
 <a name="index-PATH"></a>
 <p>The essential programs should be in your <code>PATH</code> at the time
 <code>configure</code> is run: this will capture the full paths.
@@ -3338,18 +3404,18 @@
 &lsquo;<samp>pangocairo</samp>&rsquo; package is installed (and if not, &lsquo;<samp>cairo</samp>&rsquo;) and if
 additional flags are needed for the &lsquo;<samp>cairo-xlib</samp>&rsquo; package, then if
 suitable code can be compiled.  These tests will fail if
-<code>pkg-config</code> is not installed<a name="DOCF39" href="#FOOT39"><sup>39</sup></a>, and are likely to fail if <code>cairo</code> was built
+<code>pkg-config</code> is not installed<a name="DOCF41" href="#FOOT41"><sup>41</sup></a>, and are likely to fail if <code>cairo</code> was built
 statically (unusual).  Most systems with <code>Gtk+</code> 2.8 or later
 installed will have suitable libraries
 </p>
 <p>For the best font experience with these devices you need suitable fonts
 installed: Linux users will want the <code>urw-fonts</code> package.  On
 platforms which have it available, the <code>msttcorefonts</code>
-package<a name="DOCF40" href="#FOOT40"><sup>40</sup></a> provides
+package<a name="DOCF42" href="#FOOT42"><sup>42</sup></a> provides
 TrueType versions of Monotype fonts such as Arial and Times New Roman.
 Another useful set of fonts is the &lsquo;liberation&rsquo; TrueType fonts available
 at
-<a href="https://fedorahosted.org/liberation-fonts/">https://fedorahosted.org/liberation-fonts/</a>,<a name="DOCF41" href="#FOOT41"><sup>41</sup></a> which cover the Latin, Greek and Cyrillic alphabets
+<a href="https://fedorahosted.org/liberation-fonts/">https://fedorahosted.org/liberation-fonts/</a>,<a name="DOCF43" href="#FOOT43"><sup>43</sup></a> which cover the Latin, Greek and Cyrillic alphabets
 plus a fair range of signs.  These share metrics with Arial, Times New
 Roman and Courier New, and contain fonts rather similar to the first two
 (<a href="https://en.wikipedia.org/wiki/Liberation_fonts">https://en.wikipedia.org/wiki/Liberation_fonts</a>).  Then there
@@ -3376,17 +3442,6 @@
 into <code>libtiff</code> such as <code>lzma</code>, <code>jbig</code> and <code>jpeg12</code>,
 and these may need also to be present.
 </p>
-<p>If you have them installed (including the appropriate headers and of
-suitable versions), system versions of <code>zlib</code> (version 1.2.5 or
-later),, <code>libbz2</code> (version 1.0.6 or later: called
-<strong>bzip2-libs</strong>/<strong>bzip2-devel</strong> or <strong>libbz2-1.0</strong>/<strong>libbz2-dev</strong>
-by some Linux distributions) and PCRE (version 8.10 or later, preferably
-8.32 or later<a name="DOCF42" href="#FOOT42"><sup>42</sup></a>): will be used,
-otherwise versions in the R sources will be compiled in.  The
-external versions can be avoided by configure options
-<samp>--without-system-zlib</samp>, <samp>--without-system-bzlib</samp> and
-<samp>--without-system-pcre</samp>.
-</p>
 <p>Option <samp>--with-system-tre</samp> is also available: it needs a recent
 version of TRE. (The current sources are in the <code>git</code> repository
 at <a href="https://github.com/laurikari/tre/">https://github.com/laurikari/tre/</a>, but at the time of writing
@@ -3425,15 +3480,6 @@
 very old or broken version of ICU be found this can be suppressed by
 <samp>--without-ICU</samp>.
 </p>
-<p>If <code>libcurl</code> version 7.28.0 or later is available (including its
-development files), it will be linked in to support
-<code>curlGetHeaders</code> and the <code>&quot;libcurl&quot;</code> methods of
-<code>download.file</code> and <code>url</code>.  This is recommended as it gives
-access to &lsquo;<samp>https://</samp>&rsquo; and &lsquo;<samp>ftps://</samp>&rsquo; URLs.  Information on
-<code>libcurl</code> is found from the <code>curl-config</code> script: if that
-is missing or needs to be overridden<a name="DOCF43" href="#FOOT43"><sup>43</sup></a>
-there are macros described in file <samp>config.site</samp>.
-</p>
 <p>The <code>bitmap</code> and <code>dev2bitmap</code> devices and function
 <code>embedFonts()</code> use ghostscript
 (<a href="http://www.ghostscript.com/">http://www.ghostscript.com/</a>).  This should either be in your
@@ -3471,7 +3517,7 @@
 versions of Tcl/Tk installed, specifying the paths to the correct config
 files may be necessary to avoid confusion between them.
 </p>
-<p>Versions of Tcl/Tk up to 8.5.18 and 8.6.4 have been tested (including
+<p>Versions of Tcl/Tk up to 8.5.19 and 8.6.4 have been tested (including
 most versions of 8.4.x, but not recently).
 </p>
 <p>Note that the <samp>tk.h</samp> header includes<a name="DOCF44" href="#FOOT44"><sup>44</sup></a> X11 headers, so you will need X11 and its
@@ -3498,16 +3544,17 @@
 &lsquo;<samp>x86_64</samp>&rsquo; Linux is
 </p>
 <div class="example">
-<pre class="example">JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.51-4.b16.fc21.x86_64/jre
+<pre class="example">JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.71-1.b15.fc22.x86_64/jre
 R_JAVA_LD_LIBRARY_PATH=${JAVA_HOME}/lib/amd64/server
 </pre></div>
 
-<p>Note that this unfortunately depends on the exact version of the JRE/JDK
+<p>Unfortunately this depends on the exact version of the JRE/JDK
 installed, and so may need updating if the Java installation is updated.
 This can be done by running <code>R CMD javareconf</code> which updates
-settings in both <samp>etc/Makeconf</samp> and
+settings in both <samp><var>R_HOME</var>/etc/Makeconf</samp> and
 <samp><var>R_HOME</var>/etc/ldpaths</samp>. See <code>R CMD javareconf --help</code> for
-details.
+details: note that this needs to be done by the account owning the R
+installation.
 </p>
 <p>Another way of overriding those settings is to set the environment variable
 <a name="index-R_005fJAVA_005fLD_005fLIBRARY_005fPATH-1"></a>
@@ -3520,7 +3567,7 @@
 </pre></div>
 
 <p>It may be possible to avoid this by specifying an invariant link as the
-path. For example, on that system any of
+path when configuring. For example, on that system any of
 </p>
 <div class="example">
 <pre class="example">JAVA_HOME=/usr/lib/jvm/java
@@ -3605,9 +3652,9 @@
 </p>
 <p>Some enhanced <acronym>BLAS</acronym>es are compiler-system-specific
 (<code>sunperf</code> on Solaris<a name="DOCF45" href="#FOOT45"><sup>45</sup></a>, <code>libessl</code> on IBM,
-<code>Accelerate</code> on OS X).  The correct incantation for
-these is usually found <em>via</em> <samp>--with-blas</samp> with no value on
-the appropriate platforms.
+<code>Accelerate</code> on OS X).  The correct incantation for these is often
+found <em>via</em> <samp>--with-blas</samp> with no value on the appropriate
+platforms.
 </p>
 <p>Some of the external <acronym>BLAS</acronym>es are multi-threaded.  One issue is
 that R profiling (which uses the <code>SIGPROF</code> signal) may cause
@@ -4026,7 +4073,8 @@
 by option <samp>--with-system-valgrind-headers</samp>: they will be used if
 present (on Linux they may be in a separate package such as
 <strong>valgrind-devel</strong>).  Note though that there is no guarantee that the
-code in R will be compatible with future <code>valgrind</code> headers.
+code in R will be compatible with very old<a name="DOCF48" href="#FOOT48"><sup>48</sup></a> or future <code>valgrind</code>
+headers.
 </p>
 <p>If you need to re-configure R with different options you may need to run
 <code>make clean</code> or even <code>make distclean</code> before doing so.
@@ -4229,7 +4277,7 @@
 <code>epcf90</code>,
 <code>g77</code>, <code>f77</code>, <code>xlf</code>, <code>frt</code>,
 <code>pgf77</code>, <code>cf77</code>, <code>fort77</code>, <code>fl32</code>,
-<code>af77</code> (in that order)<a name="DOCF48" href="#FOOT48"><sup>48</sup></a>, and use whichever is found first; if none is found,
+<code>af77</code> (in that order)<a name="DOCF49" href="#FOOT49"><sup>49</sup></a>, and use whichever is found first; if none is found,
 R cannot be compiled.
 However, if <code>CC</code> is <code>gcc</code>, the matching FORTRAN compiler
 (<code>g77</code> for <code>gcc</code>&nbsp;3 and <code>gfortran</code> for
@@ -4258,7 +4306,7 @@
 </p>
 <p>Some of the FORTRAN code makes use of <code>COMPLEX*16</code> variables, which
 is a Fortran 90 extension.  This is checked for at configure
-time<a name="DOCF49" href="#FOOT49"><sup>49</sup></a>, but you may need to avoid
+time<a name="DOCF50" href="#FOOT50"><sup>50</sup></a>, but you may need to avoid
 compiler flags asserting FORTRAN 77 compliance.
 </p>
 <p>Compiling the version of LAPACK in the R sources also requires some
@@ -4477,7 +4525,7 @@
 </p>
 <p>When X11 was designed, most displays were around 75dpi, whereas today
 they are of the order of 100dpi or more.  If you find that X11()
-is reporting<a name="DOCF50" href="#FOOT50"><sup>50</sup></a> missing font sizes, especially larger ones, it is likely
+is reporting<a name="DOCF51" href="#FOOT51"><sup>51</sup></a> missing font sizes, especially larger ones, it is likely
 that you are not using scalable fonts and have not installed the 100dpi
 versions of the X11 fonts.  The names and details differ by system, but
 will likely have something like Fedora&rsquo;s
@@ -4595,7 +4643,7 @@
 the best possible performance on the machine on which R is being
 installed: if the compilation is for a site-wide installation, it may
 still be desirable to use something like
-<samp>-mtume=core2</samp>.<a name="DOCF51" href="#FOOT51"><sup>51</sup></a> It is also possible to increase the
+<samp>-mtume=core2</samp>.<a name="DOCF52" href="#FOOT52"><sup>52</sup></a> It is also possible to increase the
 optimization levels to <samp>-O3</samp>: however for many versions of the
 compilers this has caused problems in at least one <acronym>CRAN</acronym>
 package.
@@ -4671,7 +4719,7 @@
 R packages only the variant using <code>libcxxabi</code> was successful.
 </p>
 <p>Most builds of <code>clang</code> have no OpenMP support.  Builds of
-version 3.7.0 or later may.<a name="DOCF52" href="#FOOT52"><sup>52</sup></a>
+version 3.7.0 or later may.<a name="DOCF53" href="#FOOT53"><sup>53</sup></a>
 </p>
 <hr>
 <a name="Intel-compilers"></a>
@@ -4770,42 +4818,39 @@
 <h3 class="section">C.3 OS X</h3>
 <a name="index-OS-X-2"></a>
 
-<p>To build R you need to have installed Apple&rsquo;s &lsquo;Command Line Tools&rsquo;
-(on some versions installing Xcode suffices).  You also need
-<code>readline</code> (or to configure using <samp>--without-readline</samp>), and
-a Fortran compiler.  Those and other binary components are available
-from <a href="https://r.research.att.com/libs">https://r.research.att.com/libs</a>.
+<p>The instructions here are for &lsquo;<samp>x86_64</samp>&rsquo; builds on 10.9
+(Mavericks) or later.  In principle<a name="DOCF54" href="#FOOT54"><sup>54</sup></a> R can be
+built for 10.6 to 10.8 but these has not been tested recently.
 </p>
-<p>An X sub-system is required unless configuring using
-<samp>--without-x</samp>: see <a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a>.  (Note
-that XQuartz will likely need to be re-installed after an OS upgrade.)
-To build R you need Apple&rsquo;s &lsquo;Command Line Tools&rsquo;: these can be
+<p>To build R you need Apple&rsquo;s &lsquo;Command Line Tools&rsquo;: these can be
 (re-)installed by <code>xcode-select --install</code>.  (If you have a
 fresh OS installation, running e.g. <code>make</code> in a terminal will
 offer the installation of the command-line tools.  If you have installed
 Xcode, this provides the command-line tools.  The tools will need to be
 reinstalled when OS X is upgraded, as upgrading partially removes them.)
 </p>
-<p>The instructions here are for &lsquo;<samp>x86_64</samp>&rsquo; builds on 10.6 (Snow
-Leopard) or later.  In principle R can be built for 10.4.x, 10.5.x
-and for PowerPC or 32-bit Intel Macs but these has not been tested
-recently.
+<p>You need <code>readline</code><a name="DOCF55" href="#FOOT55"><sup>55</sup></a> and a Fortran compiler.  Those and other binary
+components are available from <a href="https://r.research.att.com/libs">https://r.research.att.com/libs</a>:
+you are likely to need <code>pcre</code> and <code>xz</code> (recent OS X provides
+libraries but not headers for these).
+</p>
+<p>An X sub-system is required unless configuring using
+<samp>--without-x</samp>: see <a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a>.
 </p>
 <p>To use the <code>quartz()</code> graphics device you need to configure with
 <samp>--with-aqua</samp> (which is the default): <code>quartz()</code> then
 becomes the default device when running R at the console and X11
 would only be used for the command-line-R data editor/viewer and one
-version of Tcl/Tk.  (This needs an Objective-C compiler<a name="DOCF53" href="#FOOT53"><sup>53</sup></a> which can compile the source code of
+version of Tcl/Tk.  (This needs an Objective-C compiler<a name="DOCF56" href="#FOOT56"><sup>56</sup></a> which can compile the source code of
 <code>quartz()</code>.)
 </p>
 <p>Use <samp>--without-aqua</samp> if you want a standard Unix-alike build:
 apart from disabling <code>quartz()</code> and the ability to use the build
 with <small>R.APP</small>, it also changes the default location of the personal
-library (see <code>?.libPaths</code>).  Also use
-<samp>--disable-R-framework</samp> to install in the standard layout.
+library (see <code>?.libPaths</code>).
 </p>
-<p>Various compilers can be used.  The current <acronym>CRAN</acronym> &lsquo;Mavericks&rsquo;
-distribution of R is built using
+<p>Various compilers can be used.  The current <acronym>CRAN</acronym> distribution
+of R is built using
 </p>
 <div class="example">
 <pre class="example">CC=clang
@@ -4822,46 +4867,7 @@
 
 <p>with <code>clang</code> and <code>clang++</code> from the &lsquo;Command Line
 Tools&rsquo; and the Fortran compiler from
-<a href="https://r.research.att.com/libs/gfortran-4.8.2-darwin13.tar.bz2">https://r.research.att.com/libs/gfortran-4.8.2-darwin13.tar.bz2</a>.<a name="DOCF54" href="#FOOT54"><sup>54</sup></a>  Apple&rsquo;s builds of <code>clang</code>
-currently have no OpenMP support.
-</p>
-<p>The <acronym>CRAN</acronym> &lsquo;Snow Leopard&rsquo; distribution of R was built using
-</p>
-<ul>
-<li> <code>gcc</code>
-from an Xcode distribution prior to version 5.  This is a version of gcc
-4.2.1 with an LLVM backend.
-
-</li><li> <code>gfortran</code>
-from
-<a href="http://cran.r-project.org/bin/macosx/tools/gfortran-4.2.3.pkg">http://cran.r-project.org/bin/macosx/tools/gfortran-4.2.3.pkg</a>.
-Note that this installs into <samp>/usr/local/bin</samp>, so make sure that is
-on your path.  Other compilers from
-<a href="http://r.research.att.com/tools/">http://r.research.att.com/tools/</a> can also be used.
-
-</li><li> <code>clang</code>
-from the Xcode distribution, to compile the Objective-C parts of the
-<code>quartz()</code> device. 
-</li></ul>
-
-<p>To use these, have in <samp>config.site</samp> something like
-</p>
-<div class="example">
-<pre class="example">CC=&quot;llvm-gcc-4.2&quot;
-CXX=&quot;llvm-g++-4.2&quot;
-F77=&quot;gfortran-4.2 -arch x86_64&quot;
-FC=$F77
-OBJC=&quot;clang&quot;
-</pre></div>
-
-<p>Full names help to ensure that the intended compilers are used.  In
-particular <code>gcc</code> is a copy of <code>llvm-gcc-4.2</code> for Xcode &lt;
-5 but of <code>clang</code> in Xcode 5.  The recommended Fortran compiler
-defaults to 32-bit, so <code>-arch x86_64</code> is needed.  (For a 32-bit
-build, use <code>-arch i386</code> for all compiler commands.)
-</p>
-<p>The OpenMP support in this version of <code>gcc</code> is problematic, so
-the <acronym>CRAN</acronym> build is configured with <samp>--disable-openmp</samp>.
+<a href="https://r.research.att.com/libs/gfortran-4.8.2-darwin13.tar.bz2">https://r.research.att.com/libs/gfortran-4.8.2-darwin13.tar.bz2</a>.<a name="DOCF57" href="#FOOT57"><sup>57</sup></a>
 </p>
 <p>Other builds of <code>gfortran</code> are available: see
 <a href="https://gcc.gnu.org/wiki/GFortranBinaries">https://gcc.gnu.org/wiki/GFortranBinaries</a> and
@@ -4872,20 +4878,14 @@
 <p>More recent and complete distributions of <code>clang</code> are usually
 available from <a href="http://llvm.org/releases/">http://llvm.org/releases/</a>.  In particular, these
 include support for the &lsquo;Address Sanitizer&rsquo; (not included by Apple until
-Xcode 7) and for OpenMP<a name="DOCF55" href="#FOOT55"><sup>55</sup></a> in version 3.7.0 and later.
+Xcode 7) and for OpenMP<a name="DOCF58" href="#FOOT58"><sup>58</sup></a> in version 3.7.0 and later.
 </p>
 <p>Pre-compiled versions of many of the <a href="#Useful-libraries-and-programs">Useful libraries and programs</a>
 are available from <a href="https://r.research.att.com/libs/">https://r.research.att.com/libs/</a>.  You will
-most likely want at least <code>pcre</code>, <code>xz</code>, <code>jpeg</code>
-and <code>readline</code> (and perhaps <code>tiff</code>).
-<code>pkg-config</code> is not provided by Apple and useful for many packages:
-it will also be used if present when configuring the <code>X11()</code>
-device.
-</p>
-<p>Recent versions of OS X ship with <code>zlib</code> version 1.2.8 and
-<code>bzlib</code> version 1.0.6, sufficient for the default
-<code>configure</code> checks.  Mavericks has a recent enough version of
-<code>libcurl</code>: Snow Leopard does not.
+most likely want at least <code>jpeg</code> and <code>tiff</code>.
+<code>pkg-config</code> is not provided by Apple and used for many packages:
+it will also be used if present when configuring the <code>X11()</code> and
+bitmap devices.
 </p>
 <p>Support for <code>cairo</code> (without <code>Pango</code>) can be enabled in two
 ways: both need <code>pkg-config</code> available.  XQuartz ships <code>cairo</code>
@@ -4910,18 +4910,17 @@
 </pre></div>
 
 <p>to provide potentially higher-performance versions of the <acronym>BLAS</acronym>
-and LAPACK routines.  (Use of <code>Accelerate</code> with
-<samp>--with-lapack</samp> does not work on Snow Leopard: it may work there
-without.)<a name="DOCF56" href="#FOOT56"><sup>56</sup></a>
+and LAPACK routines.<a name="DOCF59" href="#FOOT59"><sup>59</sup></a>
 </p>
 <p>Looking at the top of
 <samp>/Library/Frameworks/R.framework/Resources/etc/Makeconf</samp>
 will show the compilers and configuration options used for the
-<acronym>CRAN</acronym> binary package for R: at the time of writing
+<acronym>CRAN</acronym> binary package for R: at the time of writing the
+non-default options
 </p><div class="example">
-<pre class="example">--enable-memory-profiling
+<pre class="example">--enable-memory-profiling --enable-R-framework
 </pre></div>
-<p>was used for &lsquo;Mavericks&rsquo;.
+<p>were used.
 </p>
 <p>Configure option <samp>--with-internal-tzcode</samp> is the default on OS X,
 as the system implementation of time zones does not work correctly for
@@ -4948,117 +4947,12 @@
 some upgrades but not others).
 </p>
 
-<hr>
-<a name="Mavericks-and-later"></a>
-<a name="Mavericks-and-later-1"></a>
-<h4 class="subsection">C.3.1 Mavericks and later</h4>
-
-<p>For these versions Apple makes available compilers based on
-<code>clang</code>, and C++ headers and runtime are from LLVM&rsquo;s
-&lsquo;<samp>libc++</samp>&rsquo; project, as part of the &lsquo;Command Line Tools&rsquo; (sometimes
-called &lsquo;Command Line Developer Tools&rsquo;) and of Xcode (you only need one
-or the other).
-</p>
-<p>These tools can be (re-)installed by <code>xcode-select --install</code>.
-(If you have a fresh installation of Mavericks or later, running e.g.
-<code>make</code> in a terminal will offer the installation of the
-command-line tools, or perhaps use the versions from Xcode.  However,
-after an OS update, you are advised to re-install them.)
-</p>
-<p>To use the compilers from the command-line tools with the recommended
-Fortran compiler, have in <samp>config.site</samp> something like
-</p>
-<div class="example">
-<pre class="example">CC=clang
-CXX=clang++
-F77=gfortran-4.8
-FC=$F77
-OBJC=clang
-</pre></div>
-
-<p>More recent and complete distributions of <code>clang</code> are usually
-available from <a href="http://llvm.org/releases/">http://llvm.org/releases/</a>.  In particular, these
-include support for the &lsquo;Address Sanitizer&rsquo; (not included by Apple until
-Xcode 7) and for OpenMP in versions 3.7.0 and later.
-</p>
-
-<p>See the comments under Mountain Lion about X11 and GTK.
-</p>
-<p>If you upgrade the OS you should re-install any of XQuartz, the &lsquo;Command
-Line Tools&rsquo; and Java which you have installed.  (Upgrading may partially
-remove previous versions which can be confusing.)
-</p>
-<p>There are some warnings using the recommended <code>gfortran</code> build
-under Yosemite.
-</p>
-
-<hr>
-<a name="Lion-and-Mountain-Lion"></a>
-<a name="Lion-and-Mountain-Lion-1"></a>
-<h4 class="subsection">C.3.2 Lion and Mountain Lion</h4>
-
-<p>&lsquo;Command-line Tools for Xcode&rsquo; used to be part of the Apple Developer
-Tools (&lsquo;Xcode&rsquo;) but for these versions needs to be installed separately.
-They can be downloaded from
-<a href="http://developer.apple.com/devcenter/mac/">http://developer.apple.com/devcenter/mac/</a> (you will need to
-register there: that allows you to download older versions available for
-your OS) or from within some versions of Xcode you can install the
-command-line tools from the &lsquo;<samp>Downloads</samp>&rsquo; pane in the
-&lsquo;<samp>Preferences</samp>&rsquo;.
-</p>
-<p>The X11 system used with Mountain Lion is XQuartz (see above): Lion
-included an X11 system.
-</p>
-<p>To build the graphics devices depending on cairographics, the XQuartz
-path for <code>pkg-config</code> files needs to be known to
-<code>pkg-config</code> when <code>configure</code> is run: this usually means
-adding it to the <code>PKG_CONFIG_PATH</code> environment variable, e.g.
-</p>
-<div class="example">
-<pre class="example">export PKG_CONFIG_PATH= \
-  /opt/X11/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
-</pre></div>
-
-<p>or putting
-</p><div class="example">
-<pre class="example">PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
-</pre></div>
-
-<p>in <samp>config.site</samp>.
-</p>
-<p>For some pre-compiled software, for example the GTK framework,
-<samp>/opt/X11/include</samp> may need to be added to the include paths.
-</p>
-<p>If you install the command-line tools for Xcode 4.6.3 you will get the
-compilers used for the CRAN binary distribution: those for Xcode 5 can
-be installed afterwards.
-</p>
-
-<hr>
-<a name="Snow-Leopard"></a>
-<a name="Snow-Leopard-1"></a>
-<h4 class="subsection">C.3.3 Snow Leopard</h4>
 
-<p>A quirk on Snow Leopard is that the X11 libraries are not in the default
-linking path, so something like &lsquo;<samp>LIBS=-L/usr/X11/lib</samp>&rsquo; may be
-required in <samp>config.site</samp>, or you can use the <code>configure</code>
-options <samp>--x-includes=/usr/X11/include
---x-libraries=/usr/X11/lib</samp> .
-</p>
-<p>The <acronym>CRAN</acronym> binaries were built using Xcode 4.2, a version
-available only to subscribing developers.  It is believed that 3.2.6 (the
-last public free version for Snow Leopard) will work.
-</p>
 <hr>
 <a name="El-Capitan"></a>
 <a name="El-Capitan-1"></a>
-<h4 class="subsection">C.3.4 El Capitan</h4>
+<h4 class="subsection">C.3.1 El Capitan</h4>
 
-
-<p>El Capitan was released at the end of September 2015, and experience to
-date is with systems which have been updated from Yosemite or earlier.
-Upgraded systems need the Command Line Tools reinstalled.
-</p>
 <p>There are problems resulting from the new-to-El-Capitan restriction that
 only Apple is allowed to install software under <samp>/usr</samp>: this
 affects <em>inter alia</em> <code>MacTeX</code> and <code>XQuartz</code>.  For
@@ -5077,11 +4971,10 @@
 <p>although the linked versions under <samp>/usr/X11</samp> will be found (if the
 link is present).
 </p>
-
 <hr>
 <a name="Tcl_002fTk-headers-and-libraries"></a>
 <a name="Tcl_002fTk-headers-and-libraries-1"></a>
-<h4 class="subsection">C.3.5 Tcl/Tk headers and libraries</h4>
+<h4 class="subsection">C.3.2 Tcl/Tk headers and libraries</h4>
 
 <p>If you plan to use the <code>tcltk</code> package for R, you need to
 install a distribution of Tcl/Tk.  There are two alternatives.  If you
@@ -5096,17 +4989,16 @@
 <pre class="example">--with-tcl-config=/usr/local/lib/tclConfig.sh 
 --with-tk-config=/usr/local/lib/tkConfig.sh
 </pre></div>
-<p>Note that this requires a fully-updated X11 installation (XQuartz for
-Mountain Lion and later).
+<p>Note that this requires a matching XQuartz installation.
 </p>
 <p>There is also a native (&lsquo;Aqua&rsquo;) version of Tcl/Tk which produces widgets
 in the native OS X style: this will not work with <small>R.APP</small> because of
 conflicts over the OS X menu, but for those only using command-line R
 this provides a much more intuitive interface to Tk for experienced Mac
 users.  Most versions of OS X come with Aqua Tcl/Tk libraries, but these
-are not recent versions of Tcl/Tk (8.5.9 in Mountain Lion and later).
-It is better to install Tcl/Tk 8.6.x from the sources or a binary
-distribution from
+are not at all recent versions of Tcl/Tk (8.5.9 in El Capitan, which is
+not even the latest patched version in that series).  It is better to
+install Tcl/Tk 8.6.x from the sources or a binary distribution from
 <a href="https://www.activestate.com/activetcl/downloads">https://www.activestate.com/activetcl/downloads</a>.  Configure R
 with
 </p><div class="example">
@@ -5127,20 +5019,19 @@
 <hr>
 <a name="Java-_0028OS-X_0029"></a>
 <a name="Java"></a>
-<h4 class="subsection">C.3.6 Java</h4>
+<h4 class="subsection">C.3.3 Java</h4>
 
-<p>The situation with Java support on OS X is messy.<a name="DOCF57" href="#FOOT57"><sup>57</sup></a>
+<p>The situation with Java support on OS X is messy.<a name="DOCF60" href="#FOOT60"><sup>60</sup></a>
 </p>
-<p>Snow Leopard and Lion shipped with a Java 6 runtime (JRE).  Mountain
-Lion and later do not come with an installed JRE, and an OS X upgrade
-removes one if already installed: it is intended to be installed at
-first use.  Check if a JRE is installed by running <code>java
+<p>OS X no longer comes with an installed Java runtime (JRE), and an OS X
+upgrade removes one if already installed: it is intended to be installed
+at first use.  Check if a JRE is installed by running <code>java
 -version</code> in a <code>Terminal</code> window: if Java is not installed this
 should prompt you to install it.  You can also install directly the
 latest Java from Oracle (currently from
 <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a>).
 </p>
-<p>You may need to install what Apple calls &lsquo;legacy Java&rsquo;<a name="DOCF58" href="#FOOT58"><sup>58</sup></a> to suppress pop-up messages
+<p>You may need to install what Apple calls &lsquo;legacy Java&rsquo;<a name="DOCF61" href="#FOOT61"><sup>61</sup></a> to suppress pop-up messages
 even if you have a current version installed.
 </p>
 <p>To see what compatible versions of Java are currently installed, run
@@ -5165,7 +5056,7 @@
 </pre></div>
 <p>The Oracle JDK can be specified explicitly by something like
 </p><div class="example">
-<pre class="example">JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_51.jdk/Contents/Home
+<pre class="example">JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_72.jdk/Contents/Home
 JAVA_CPPFLAGS=&quot;-I/${JAVA_HOME}/include -I/${JAVA_HOME}/include/darwin&quot;
 JAVA_LD_LIBRARY_PATH=&quot;${JAVA_HOME}/jre/lib/server&quot;
 JAVA_LIBS=&quot;-L/${JAVA_HOME}/jre/lib/server -ljvm&quot; 
@@ -5179,17 +5070,17 @@
 <hr>
 <a name="Frameworks"></a>
 <a name="Frameworks-1"></a>
-<h4 class="subsection">C.3.7 Frameworks</h4>
+<h4 class="subsection">C.3.4 Frameworks</h4>
 
 <p>The <acronym>CRAN</acronym> build of R is installed as a framework, which is
-selected by the default option
+selected by the option
 </p>
 <div class="example">
 <pre class="example">./configure --enable-R-framework
 </pre></div>
 
 <p>(This is intended to be used with an Apple toolchain: other compilers may
-not support frameworks correctly.)
+not support frameworks correctly. It was the default prior to R 3.3.0.)
 </p>
 <p>It is only needed if you want to build R for use with the <small>R.APP</small>
 console, and implies <samp>--enable-R-shlib</samp> to build R as a
@@ -5197,7 +5088,8 @@
 as a framework called <samp>R.framework</samp>.  The default installation path
 for <samp>R.framework</samp> is <samp>/Library/Frameworks</samp> but this can be
 changed at configure time by specifying the flag
-<samp>--enable-R-framework[=<var>DIR</var>]</samp> or at install time as
+<samp>--enable-R-framework[=<var>DIR</var>]</samp> (or <samp>--prefix</samp>) or at
+install time <em>via</em>
 </p>
 <div class="example">
 <pre class="example">make prefix=/where/you/want/R.framework/to/go install
@@ -5211,7 +5103,7 @@
 <hr>
 <a name="Building-R_002eapp"></a>
 <a name="Building-R_002eapp-1"></a>
-<h4 class="subsection">C.3.8 Building R.app</h4>
+<h4 class="subsection">C.3.5 Building R.app</h4>
 
 <p>Note that building the <small>R.APP</small> GUI console is a separate project, using
 Xcode.  Before compiling <small>R.APP</small> make sure the current version of R
@@ -5265,9 +5157,7 @@
 <p>A large selection of Open Source software can be installed from
 <a href="https://www.opencsw.org">https://www.opencsw.org</a>, by default installed under
 <samp>/opt/csw</samp>.  Solaris 10 ships with <code>bzlib</code> version 1.0.6
-(sufficient for the default <samp>--with-system-bzlib</samp>) but
-<code>zlib</code> version 1.2.3 (too old for <samp>--with-system-zlib</samp>):
-OpenCSW has 1.2.8.
+(sufficient) but <code>zlib</code> version 1.2.3 (too old): OpenCSW has 1.2.8.
 </p>
 <p>You will need <acronym>GNU</acronym> <code>libiconv</code> and <code>readline</code>: the
 Solaris version of <code>iconv</code> is not sufficiently powerful.
@@ -5297,7 +5187,7 @@
 you find time-zone abbreviations being given odd values (as has been
 seen on 64-bit builds without it).
 </p>
-<p>When using the Oracle compilers<a name="DOCF59" href="#FOOT59"><sup>59</sup></a> do <em>not</em> specify <samp>-fast</samp>, as this
+<p>When using the Oracle compilers<a name="DOCF62" href="#FOOT62"><sup>62</sup></a> do <em>not</em> specify <samp>-fast</samp>, as this
 disables <acronym>IEEE</acronym> arithmetic and <code>make check</code> will fail.
 </p>
 <p>It has been reported that some Solaris installations need
@@ -5498,7 +5388,7 @@
 LDFLAGS=&quot;-L/opt/csw/gcc4/lib -L/opt/csw/lib -L/usr/local/lib&quot;
 </pre></div>
 
-<p>(<code>-L/opt/csw/lib</code> is needed since TeXLive was built using
+<p>(<code>-L/opt/csw/lib</code> is needed since TeX Live was built using
 32-bit <code>gcc</code>, and we need <samp>/opt/csw/lib</samp> in
 <code>R_LD_LIBRARY_PATH</code>.)
 </p>
@@ -5672,17 +5562,12 @@
 R 3.0.2 at the time of writing.  Davor Cubranic reported some success
 on x86_64 FreeBSD 10.2 for R 3.2.2.
 </p>
-<p>It appears that versions of FreeBSD using <code>clang</code> as the compiler
-(the default as from 10.0) need
-</p><div class="example">
-<pre class="example">MAIN_LDFLAGS=-Wl,--export-dynamic
-</pre></div>
-<p>for R releases up to 3.2.2.
-</p>
 <p>Use of ICU for collation and the <code>configure</code> option
 <samp>--with-internal-tzcode</samp> are desirable workarounds.
 </p>
+<hr>
 <a name="OpenBSD"></a>
+<a name="OpenBSD-1"></a>
 <h3 class="section">C.7 OpenBSD</h3>
 <a name="index-OpenBSD"></a>
 
@@ -5696,54 +5581,11 @@
 <a name="Cygwin-1"></a>
 <h3 class="section">C.8 Cygwin</h3>
 
-<p>The Cygwin emulation layer on Windows can be treated as a Unix-alike OS.
-This is unsupported, but experiments have been conducted and a few
-workarounds added.  Cygwin has not been tested for R 3.0.0 or later.
-</p>
-<p>The 64-bit version is completely unsupported.  The 32-bit version has
-never worked well enough to pass R&rsquo;s <code>make check</code>.
-</p>
-<p>R requires C99 complex type support, which is available as from
-Cygwin 1.7.8 (March 2011).  However, the (then) implementation of
-<code>cacos</code> gave incorrect results, so we undefine <code>HAVE_CACOS</code>
-in <samp>src/main/complex.c</samp> on that platform.  It has been reported
-that some C99 long double mathematical functions are missing, so
-configuring with <samp>--disable-long-double</samp> was required.
-</p>
-<p>Only building as a shared library can possibly work,<a name="DOCF60" href="#FOOT60"><sup>60</sup></a> so use e.g.
-</p>
-<div class="example">
-<pre class="example">./configure --disable-nls --enable-R-shlib FLIBS=-lgfortran
-make
-</pre></div>
-
-<p>Enabling NLS does work if required, although adding
-<samp>--with-included-gettext</samp> is preferable.  You will see many
-warnings about the use of auto-import.  Setting &lsquo;<samp>FLIBS</samp>&rsquo; explicitly
-seems needed currently as the auto-detection gives an incorrect value.
-</p>
-<p>You will need the <strong>tetex-extra</strong> Cygwin package to build
-<samp>NEWS.pdf</samp> and the vignettes.
-</p>
-<p>Note that this gives you a command-line application using <code>readline</code>
-for command editing.  The &lsquo;<samp>X11</samp>&rsquo; graphics device will work if a
-suitable X server is running, and the standard Unix-alike ways of
-installing source packages work.  There was a bug in the
-<samp>/usr/lib/tkConfig.sh</samp> script in the version we looked at, which
-needs to have
-</p>
-<div class="example">
-<pre class="example">TK_LIB_SPEC='-ltk84'
-</pre></div>
-
-<p>The overhead of using shell scripts makes this noticeably slower than a
-native build of R on Windows.
+<p>The 32-bit version has never worked well enough to pass R&rsquo;s
+<code>make check</code>, and residual support from earlier experiments was
+removed in R 3.3.0.
 </p>
-<p>Even when R could be built, not all the tests passed: there were
-incorrect results from wide-character regular expressions code and from
-sourcing CR-delimited files.
-</p>
-<p>Do not use Cygwin&rsquo;s BLAS library: it is known to give incorrect results.
+<p>The 64-bit version is completely unsupported.
 </p>
 <hr>
 <a name="New-platforms"></a>
@@ -5822,7 +5664,7 @@
 </p>
 <p>We have found that the build process for R is quite sensitive to
 the choice of tools: please follow our instructions <strong>exactly</strong>,
-even to the choice of particular versions of the tools.<a name="DOCF61" href="#FOOT61"><sup>61</sup></a>  The build process for add-on packages is somewhat more
+even to the choice of particular versions of the tools.<a name="DOCF63" href="#FOOT63"><sup>63</sup></a>  The build process for add-on packages is somewhat more
 forgiving, but we recommend using the exact toolset at first, and only
 substituting other tools once you are familiar with the process.
 </p>
@@ -5831,10 +5673,10 @@
 the R mailing lists unless you have followed all the prescriptions.</em>
 </p>
 <p>We have collected most of the necessary tools (unfortunately not all,
-due to license or size limitations) into an executable installer
-named<a name="DOCF62" href="#FOOT62"><sup>62</sup></a>  <samp>Rtools31.exe</samp>,
-available from <a href="https://CRAN.R-project.org/bin/windows/Rtools/">https://CRAN.R-project.org/bin/windows/Rtools/</a>. You
-should download and run it, choosing the default &ldquo;Package authoring
+due to license or size limitations) into an executable installer named
+<samp>Rtools*.exe</samp>, available from
+<a href="https://CRAN.R-project.org/bin/windows/Rtools/">https://CRAN.R-project.org/bin/windows/Rtools/</a>. You should
+download and run it, choosing the default &ldquo;Package authoring
 installation&rdquo; to build add-on packages, or the &ldquo;full installation&rdquo; if
 you intend to build R.
 </p>
@@ -5875,7 +5717,7 @@
 
 <p>It is essential that the directory containing the command line tools
 comes first or second in the path: there are typically like-named
-tools<a name="DOCF63" href="#FOOT63"><sup>63</sup></a> in other directories, and they will <strong>not</strong>
+tools<a name="DOCF64" href="#FOOT64"><sup>64</sup></a> in other directories, and they will <strong>not</strong>
 work. The ordering of the other directories is less important, but if in
 doubt, use the order above.
 </p>
@@ -5910,7 +5752,7 @@
 <p>The <samp>Rtools*.exe</samp> installer does <em>not</em> include any version of
 LaTeX.
 </p>
-<p>It is also possible to use the TeXLive distribution from
+<p>It is also possible to use the TeX Live distribution from
 <a href="https://www.tug.org/texlive/">https://www.tug.org/texlive/</a>.
 </p>
 <a name="index-R_005fRD4PDF-2"></a>
@@ -5924,7 +5766,7 @@
 <a name="The-Inno-Setup-installer-1"></a>
 <h3 class="section">D.2 The Inno Setup installer</h3>
 
-<p>To make the installer package (<samp>R-3.2.3-win.exe</samp>) we
+<p>To make the installer package (<samp>R-3.3.1-win.exe</samp>) we
 currently require the Unicode version of Inno Setup 5.3.7 or later from
 <a href="http://jrsoftware.org/">http://jrsoftware.org/</a>. This is <em>not</em> included in
 <samp>Rtools*.exe</samp>.
@@ -5976,13 +5818,13 @@
 <p>Technically you need more than just a compiler so the set of tools is
 referred to as a &lsquo;toolchain&rsquo;.
 </p>
-<p>The preferred toolchain is part of <code>Rtools31.exe</code>: this uses a beta
+<p>The preferred toolchain is part of <code>Rtools*.exe</code>: this uses a beta
 version of <code>gcc 4.6.3</code> and version 2.0.1 of the MinGW-w64
 project&rsquo;s runtime.
 </p>
 <p>This toolchain uses <em>multilib</em>: that is there is a single front-end
 such as <code>gcc.exe</code> for each of the compilers and 32-bit (the
-default) and 64-bit compilation are selected by the flags<a name="DOCF64" href="#FOOT64"><sup>64</sup></a>  <samp>-m32</samp> and <samp>-m64</samp>
+default) and 64-bit compilation are selected by the flags<a name="DOCF65" href="#FOOT65"><sup>65</sup></a>  <samp>-m32</samp> and <samp>-m64</samp>
 respectively.  The tools are all 32-bit Windows executables and should
 be able to run on any current version of Windows&mdash;however you do need a
 64-bit version of Windows to build 64-bit R as the build process runs
@@ -6019,7 +5861,7 @@
 </p>
 <p>There is a version of the <code>file</code> command that identifies the
 type of files, and is used by <code>Rcmd check</code> if available.  The
-binary distribution is included in <samp>Rtools31.exe</samp>.
+binary distribution is included in <samp>Rtools*.exe</samp>.
 </p>
 <p>The file <samp>xzutils.zip</samp> contains the program <code>xz</code> which can
 be used to (de)compress files with that form of compression.
@@ -6150,7 +5992,7 @@
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-index_cp_letter-O">O</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Obtaining-R">Obtaining R</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Obtaining-R">Obtaining R</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-OpenBSD">OpenBSD</a>:</td><td>&nbsp;</td><td valign="top"><a href="#FreeBSD">FreeBSD</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-OpenBSD">OpenBSD</a>:</td><td>&nbsp;</td><td valign="top"><a href="#OpenBSD">OpenBSD</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-OS-X">OS X</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Installing-R-under-Unix_002dalikes">Installing R under Unix-alikes</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-OS-X-1">OS X</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Installing-R-under-OS-X">Installing R under OS X</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-OS-X-2">OS X</a>:</td><td>&nbsp;</td><td valign="top"><a href="#OS-X">OS X</a></td></tr>
@@ -6240,6 +6082,8 @@
 <tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Environment-variable-index_en_letter-B">B</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-BINPREF"><code>BINPREF</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Windows-packages">Windows packages</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-BINPREF64"><code>BINPREF64</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Windows-packages">Windows packages</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BLAS_005fLIBS"><code>BLAS_LIBS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#BLAS">BLAS</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Environment-variable-index_en_letter-C">C</a></th><td></td><td></td></tr>
@@ -6379,140 +6223,141 @@
 <p>with possible values
 &lsquo;<samp>i386</samp>&rsquo;, &lsquo;<samp>x64</samp>&rsquo;, &lsquo;<samp>32</samp>&rsquo; and &lsquo;<samp>64</samp>&rsquo;.</p>
 <h3><a name="FOOT9" href="#DOCF9">(9)</a></h3>
-<p>mainly on RedHat and Fedora, whose layout is described
-here.</p>
+<p>mainly on RedHat and Fedora, whose
+layout is described here.</p>
 <h3><a name="FOOT10" href="#DOCF10">(10)</a></h3>
 <p>How to prepare such a directory is described in file
 <samp>src/extra/tzone/Notes</samp> in the R sources.</p>
 <h3><a name="FOOT11" href="#DOCF11">(11)</a></h3>
 <p>for example, <samp>-fopenmp</samp>, <samp>-xopenmp</samp> or
-<samp>-qopenmp</samp>.  This includes for 2015 versions of <code>clang</code>
-and the Intel C compiler.</p>
+<samp>-qopenmp</samp>.  This includes for <code>clang</code> 3.7.x and the
+Intel C compiler.</p>
 <h3><a name="FOOT12" href="#DOCF12">(12)</a></h3>
 <p>Suitable distributions include
 Strawberry Perl, <a href="http://strawberryperl.com/">http://strawberryperl.com/</a> and ActivePerl,
 <a href="https://www.activestate.com/activeperl">https://www.activestate.com/activeperl</a>.</p>
 <h3><a name="FOOT13" href="#DOCF13">(13)</a></h3>
-<p>for R 3.2.1 and earlier, the installer will
-attempt unsuccessfully to install <code>R</code> and <code>Rscript</code> in
-<samp>/usr/bin</samp>.</p>
+<p>The installer as puts links to <code>R</code> and
+<code>Rscript</code> in <samp>/usr/bin</samp> (Mavericks, Yosemite) or
+<samp>/usr/local/bin</samp> (El Capitan and later). If these are missing, you
+can run directly the versions in
+<samp>/Library/Frameworks/R.framework/Resources/</samp>.</p>
 <h3><a name="FOOT14" href="#DOCF14">(14)</a></h3>
-<p>There was for R 3.2.1 but not for R 3.2.2.</p>
-<h3><a name="FOOT15" href="#DOCF15">(15)</a></h3>
-<p>The installer as
-from R 3.2.2 puts links to <code>R</code> and <code>Rscript</code> in
-<samp>/usr/bin</samp> (Mavericks, Yosemite) or <samp>/usr/local/bin</samp> (El
-Capitan and later). If these are missing, you can run directly the
-versions in <samp>/Library/Frameworks/R.framework/Resources/</samp>.</p>
-<h3><a name="FOOT16" href="#DOCF16">(16)</a></h3>
 <p>unless they were excluded in the build.</p>
-<h3><a name="FOOT17" href="#DOCF17">(17)</a></h3>
+<h3><a name="FOOT15" href="#DOCF15">(15)</a></h3>
 <p>its binding is locked once the startup files have been
 read, so users cannot easily change it.</p>
-<h3><a name="FOOT18" href="#DOCF18">(18)</a></h3>
+<h3><a name="FOOT16" href="#DOCF16">(16)</a></h3>
 <p>If a proxy needs to be set, see
 <code>?download.file</code>.</p>
-<h3><a name="FOOT19" href="#DOCF19">(19)</a></h3>
+<h3><a name="FOOT17" href="#DOCF17">(17)</a></h3>
 <p>for a small number of
 <acronym>CRAN</acronym> packages where this is known to be safe and is needed by
 the autobuilder this is the default.  Look at the source of
 <samp>tools:::.install_packages</samp> for the list.  It can also be specified
 in the package&rsquo;s <samp>DESCRIPTION</samp> file.</p>
+<h3><a name="FOOT18" href="#DOCF18">(18)</a></h3>
+<p>or by adding it in a file such as
+<samp>etc/i386/Makevars.site</samp>, which does not exist by default.</p>
+<h3><a name="FOOT19" href="#DOCF19">(19)</a></h3>
+<p>They need to have been
+created using <samp>-headerpad_max_install_names</samp>, which is the
+default for an R package.</p>
 <h3><a name="FOOT20" href="#DOCF20">(20)</a></h3>
-<p>or by adding it in
-a file such as <samp>etc/i386/Makevars.site</samp>, which does not exist by
-default.</p>
-<h3><a name="FOOT21" href="#DOCF21">(21)</a></h3>
 <p>&lsquo;X/Open Portability Guide&rsquo;, which has
 had several versions.</p>
-<h3><a name="FOOT22" href="#DOCF22">(22)</a></h3>
+<h3><a name="FOOT21" href="#DOCF21">(21)</a></h3>
 <p>On some systems setting
 <code>LC_ALL</code> or <code>LC_MESSAGES</code> to &lsquo;<samp>C</samp>&rsquo; disables <code>LANGUAGE</code>.</p>
-<h3><a name="FOOT23" href="#DOCF23">(23)</a></h3>
+<h3><a name="FOOT22" href="#DOCF22">(22)</a></h3>
 <p>If you try changing from French
 to Russian except in a UTF-8 locale, you will most likely find messages
 change to English.</p>
-<h3><a name="FOOT24" href="#DOCF24">(24)</a></h3>
+<h3><a name="FOOT23" href="#DOCF23">(23)</a></h3>
 <p>the
 language written in England: some people living in the USA appropriate
 this name for their language.</p>
-<h3><a name="FOOT25" href="#DOCF25">(25)</a></h3>
+<h3><a name="FOOT24" href="#DOCF24">(24)</a></h3>
 <p>with
 Americanisms.</p>
-<h3><a name="FOOT26" href="#DOCF26">(26)</a></h3>
+<h3><a name="FOOT25" href="#DOCF25">(25)</a></h3>
 <p>also known as
 <acronym>IEEE</acronym>&nbsp;754</p>
-<h3><a name="FOOT27" href="#DOCF27">(27)</a></h3>
+<h3><a name="FOOT26" href="#DOCF26">(26)</a></h3>
 <p>at least when storing quantities: the on-FPU
 precision is allowed to vary</p>
-<h3><a name="FOOT28" href="#DOCF28">(28)</a></h3>
+<h3><a name="FOOT27" href="#DOCF27">(27)</a></h3>
 <p>e.g. Bessel, beta and gamma functions</p>
-<h3><a name="FOOT29" href="#DOCF29">(29)</a></h3>
+<h3><a name="FOOT28" href="#DOCF28">(28)</a></h3>
 <p>including copying <samp>MkRules.dist</samp> to
 <samp>MkRule.local</samp> and selecting the architecture.</p>
-<h3><a name="FOOT30" href="#DOCF30">(30)</a></h3>
+<h3><a name="FOOT29" href="#DOCF29">(29)</a></h3>
 <p>also known as
 <acronym>IEEE</acronym>&nbsp;754</p>
-<h3><a name="FOOT31" href="#DOCF31">(31)</a></h3>
+<h3><a name="FOOT30" href="#DOCF30">(30)</a></h3>
 <p>Note
 that C11 compilers need not be C99-compliant: R requires support for
 <code>double complex</code> and variable-length arrays which are optional in
 C11 but is mandatory in C99.</p>
-<h3><a name="FOOT32" href="#DOCF32">(32)</a></h3>
+<h3><a name="FOOT31" href="#DOCF31">(31)</a></h3>
 <p><samp>-std=c99</samp> excludes POSIX
 functionality, but <samp>config.h</samp> will turn on all <acronym>GNU</acronym>
 extensions to include the POSIX functionality.  The default mode for GCC
-5 is <samp>-std=gnu11</samp>.</p>
-<h3><a name="FOOT33" href="#DOCF33">(33)</a></h3>
+5.1 and later is <samp>-std=gnu11</samp>.</p>
+<h3><a name="FOOT32" href="#DOCF32">(32)</a></h3>
 <p>However, it is possible to break
 the default behaviour of <code>glibc</code> by re-specifying the <code>gconv</code>
 modules to be loaded.</p>
-<h3><a name="FOOT34" href="#DOCF34">(34)</a></h3>
+<h3><a name="FOOT33" href="#DOCF33">(33)</a></h3>
 <p>specifically, the C99
 functionality of headers <samp>wchar.h</samp> and <samp>wctype.h</samp>, types
 <code>wctans_t</code> and <code>mbstate_t</code> and functions <code>mbrtowc</code>,
 <code>mbstowcs</code>, <code>wcrtomb</code>, <code>wcscoll</code>, <code>wcstombs</code>,
 <code>wctrans</code>, <code>wctype</code>, and <code>iswctype</code>.</p>
-<h3><a name="FOOT35" href="#DOCF35">(35)</a></h3>
+<h3><a name="FOOT34" href="#DOCF34">(34)</a></h3>
 <p>including the <code>opendir</code>, <code>readdir</code>,
 <code>closedir</code>, <code>popen</code>, <code>stat</code>, <code>glob</code>, <code>access</code>,
 <code>getcwd</code> and <code>chdir</code> system calls, and either <code>putenv</code> or
 <code>setenv</code>.</p>
-<h3><a name="FOOT36" href="#DOCF36">(36)</a></h3>
+<h3><a name="FOOT35" href="#DOCF35">(35)</a></h3>
 <p>such as
 <code>realpath</code>, <code>symlink</code>.</p>
+<h3><a name="FOOT36" href="#DOCF36">(36)</a></h3>
+<p>most often distributed as part of <code>xz</code>:
+possible names in Linux distributions include
+<code>xz-devel</code>/<code>xz-libs</code> and <code>liblzma-dev</code>.</p>
 <h3><a name="FOOT37" href="#DOCF37">(37)</a></h3>
+<p>sometimes known as PCRE1, and not PCRE2 which started at
+version 10.0.</p>
+<h3><a name="FOOT38" href="#DOCF38">(38)</a></h3>
+<p>for
+example to specify static linking with a build which has both shared and
+static libraries.</p>
+<h3><a name="FOOT39" href="#DOCF39">(39)</a></h3>
 <p>Such as
 <acronym>GNU</acronym> <code>tar</code> 1.15 or later, <code>bsdtar</code> (from
 <a href="https://github.com/libarchive/libarchive/">https://github.com/libarchive/libarchive/</a>, as used by FreeBSD and OS
 X 10.6 and later) or <code>tar</code> from the Heirloom Toolchest
 (<a href="http://heirloom.sourceforge.net/tools.html">http://heirloom.sourceforge.net/tools.html</a>).</p>
-<h3><a name="FOOT38" href="#DOCF38">(38)</a></h3>
+<h3><a name="FOOT40" href="#DOCF40">(40)</a></h3>
 <p><code>texi2dvi</code> is normally a shell
 script.  Some versions (including that from <strong>texinfo</strong> 5.2 and 6.0)
-need to be run under <code>bash</code> rather than a Bourne shell.</p>
-<h3><a name="FOOT39" href="#DOCF39">(39)</a></h3>
+need to be run under <code>bash</code> rather than a Bourne shell,
+especially on Solaris. Some of the issues which have been observed with
+broken versions of <code>texi2dvi</code> can be circumvented by setting the
+environment variable <code>R_TEXI2DVICMD</code> to the value <code>emulation</code>.</p>
+<h3><a name="FOOT41" href="#DOCF41">(41)</a></h3>
 <p>If necessary the path to
 <code>pkg-config</code> can be specified by setting <code>PKGCONF</code> in
 <samp>config.site</samp>, on the <code>configure</code> command line or in the
 environment.</p>
-<h3><a name="FOOT40" href="#DOCF40">(40)</a></h3>
+<h3><a name="FOOT42" href="#DOCF42">(42)</a></h3>
 <p>also known as <code>ttf-mscorefonts-installer</code> in the
 Debian/Ubuntu world: see also
 <a href="https://en.wikipedia.org/wiki/Core_fonts_for_the_Web">https://en.wikipedia.org/wiki/Core_fonts_for_the_Web</a>.</p>
-<h3><a name="FOOT41" href="#DOCF41">(41)</a></h3>
+<h3><a name="FOOT43" href="#DOCF43">(43)</a></h3>
 <p><code>ttf-liberation</code>
 in Debian/Ubuntu.</p>
-<h3><a name="FOOT42" href="#DOCF42">(42)</a></h3>
-<p>sometimes known as PCRE1, and not PCRE2, which
-started at version 10.0. PCRE must be built with UTF-8 support (not the
-default, and checked by <code>configure</code>) and support for Unicode
-properties is assumed by some R packages. JIT support is desirable
-for the best performance: support for this and Unicode properties can be
-checked at run-time by calling <code>pcre_config()</code>.</p>
-<h3><a name="FOOT43" href="#DOCF43">(43)</a></h3>
-<p>for example to specify
-static linking with a build which has both shared and static libraries.</p>
 <h3><a name="FOOT44" href="#DOCF44">(44)</a></h3>
 <p>This is true even for
 the &lsquo;Aqua&rsquo; version of Tk on OS X, but distributions of that include a
@@ -6527,61 +6372,66 @@
 <p>We have measured 15&ndash;20% on &lsquo;<samp>i686</samp>&rsquo; Linux
 and around 10% on &lsquo;<samp>x86_64</samp>&rsquo; Linux.</p>
 <h3><a name="FOOT48" href="#DOCF48">(48)</a></h3>
+<p>We believe that
+versions 3.4.0 to 3.10.1 are compatible.</p>
+<h3><a name="FOOT49" href="#DOCF49">(49)</a></h3>
 <p>On HP-UX <code>fort77</code> is the
 <acronym>POSIX</acronym> compliant FORTRAN compiler, and comes after
 <code>g77</code>.</p>
-<h3><a name="FOOT49" href="#DOCF49">(49)</a></h3>
+<h3><a name="FOOT50" href="#DOCF50">(50)</a></h3>
 <p>as well as its equivalence to the <code>Rcomplex</code>
 structure defined in <samp>R_ext/Complex.h</samp>.</p>
-<h3><a name="FOOT50" href="#DOCF50">(50)</a></h3>
+<h3><a name="FOOT51" href="#DOCF51">(51)</a></h3>
 <p>for example, <code>X11 font at size 14 could not
 be loaded</code>.</p>
-<h3><a name="FOOT51" href="#DOCF51">(51)</a></h3>
+<h3><a name="FOOT52" href="#DOCF52">(52)</a></h3>
 <p>or <code>-mtune=corei7</code> for Intel Core
 i3/15/17 with <code>gcc &gt;= 4.6.0</code>.</p>
-<h3><a name="FOOT52" href="#DOCF52">(52)</a></h3>
+<h3><a name="FOOT53" href="#DOCF53">(53)</a></h3>
 <p>This also needs the OpenMP runtime,
 which is usually distributed separately, e.g. at
 <a href="http://llvm.org/releases">http://llvm.org/releases</a>.</p>
-<h3><a name="FOOT53" href="#DOCF53">(53)</a></h3>
+<h3><a name="FOOT54" href="#DOCF54">(54)</a></h3>
+<p>It will be necessary to
+install later versions of software such as <code>libcurl</code>.</p>
+<h3><a name="FOOT55" href="#DOCF55">(55)</a></h3>
+<p>Apple provides a partial emulation of
+GNU readline 4.2 based on the NetBSD <code>editline</code> library.  That is
+not recommended but for the time being R&rsquo;s installation scripts will
+make use of it.</p>
+<h3><a name="FOOT56" href="#DOCF56">(56)</a></h3>
 <p>These
 days that is defined by Apple&rsquo;s implementation of <code>clang</code>, so it is
 strongly recommended to use that.</p>
-<h3><a name="FOOT54" href="#DOCF54">(54)</a></h3>
+<h3><a name="FOOT57" href="#DOCF57">(57)</a></h3>
 <p>This
 is a tarball which needs to be unpacked in the Terminal by e.g.
 <code>sudo tar -zxf gfortran-4.8.2-darwin13.tar.bz2 -C /</code>. It does
 not run on Core 2 Duo Macs.</p>
-<h3><a name="FOOT55" href="#DOCF55">(55)</a></h3>
+<h3><a name="FOOT58" href="#DOCF58">(58)</a></h3>
 <p>This also needs the OpenMP runtime,
 which is distributed separately at that site.</p>
-<h3><a name="FOOT56" href="#DOCF56">(56)</a></h3>
-<p>It is reported that for some non-Apple toolchains
-<code>CPPFLAGS</code> needed to contain <code>-D__ACCELERATE__</code>.</p>
-<h3><a name="FOOT57" href="#DOCF57">(57)</a></h3>
+<h3><a name="FOOT59" href="#DOCF59">(59)</a></h3>
+<p>It is reported that for some non-Apple
+toolchains <code>CPPFLAGS</code> needed to contain <code>-D__ACCELERATE__</code>.</p>
+<h3><a name="FOOT60" href="#DOCF60">(60)</a></h3>
 <p>For more
 details see <a href="http://www.macstrategy.com/article.php?3">http://www.macstrategy.com/article.php?3</a>.</p>
-<h3><a name="FOOT58" href="#DOCF58">(58)</a></h3>
+<h3><a name="FOOT61" href="#DOCF61">(61)</a></h3>
 <p>e.g.
 <code>Java For OS X 2015-001</code> from
 <a href="https://support.apple.com/kb/DL1572">https://support.apple.com/kb/DL1572</a>.</p>
-<h3><a name="FOOT59" href="#DOCF59">(59)</a></h3>
+<h3><a name="FOOT62" href="#DOCF62">(62)</a></h3>
 <p>including <code>gcc</code> for
 Sparc from Oracle.</p>
-<h3><a name="FOOT60" href="#DOCF60">(60)</a></h3>
-<p>Windows
-DLLs need to have all links resolved at build time and so cannot resolve
-against <samp>R.bin</samp>.</p>
-<h3><a name="FOOT61" href="#DOCF61">(61)</a></h3>
+<h3><a name="FOOT63" href="#DOCF63">(63)</a></h3>
 <p>For
 example, the Cygwin version of <code>make 3.81</code> fails to work
 correctly.</p>
-<h3><a name="FOOT62" href="#DOCF62">(62)</a></h3>
-<p>for R 3.0.0 and later.</p>
-<h3><a name="FOOT63" href="#DOCF63">(63)</a></h3>
+<h3><a name="FOOT64" href="#DOCF64">(64)</a></h3>
 <p>such as <code>sort</code>, <code>find</code> and perhaps
 <code>make</code>.</p>
-<h3><a name="FOOT64" href="#DOCF64">(64)</a></h3>
+<h3><a name="FOOT65" href="#DOCF65">(65)</a></h3>
 <p>these
 flags apply to the compilers: some of the tools use different flags.
 32-bit builds are the default.</p>
diff -Nru r-base-3.2.3/doc/html/R.css r-base-3.3.1/doc/html/R.css
--- r-base-3.2.3/doc/html/R.css	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/html/R.css	2016-03-16 23:04:42.000000000 +0000
@@ -58,6 +58,7 @@
 }
 		
 img.toplogo {
+    width: 4em;
     vertical-align: middle;
 }
 
diff -Nru r-base-3.2.3/doc/html/resources.html r-base-3.3.1/doc/html/resources.html
--- r-base-3.2.3/doc/html/resources.html	2015-12-10 08:01:23.000000000 +0000
+++ r-base-3.3.1/doc/html/resources.html	2016-06-21 07:07:58.000000000 +0000
@@ -98,6 +98,7 @@
 }
 		
 img.toplogo {
+    width: 4em;
     vertical-align: middle;
 }
 
@@ -148,7 +149,7 @@
 
 
 <h1>Other Resources
-<img class="toplogo" src="logo.jpg" alt="[R logo]">
+<img class="toplogo" src="Rlogo.svg" alt="[R logo]">
 </h1>
 <hr width="100%">
 <a name="Top"></a>
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/doc/html/Rlogo.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/doc/html/Rlogo.pdf differ
diff -Nru r-base-3.2.3/doc/html/Rlogo.svg r-base-3.3.1/doc/html/Rlogo.svg
--- r-base-3.2.3/doc/html/Rlogo.svg	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/doc/html/Rlogo.svg	2016-03-16 23:04:41.000000000 +0000
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2015-2016 The R Foundation
+
+You can distribute this logo under the terms of the Creative
+Commons Attribution-ShareAlike 4.0 International license (CC-BY-SA
+4.0) or (at your option) the GNU General Public License version 2
+(GPL-2).
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, a copy is available at
+https://www.R-project.org/Licenses/
+
+The text of the CC BY-SA 4.0 license is available at
+https://creativecommons.org/licenses/by-sa/4.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid" width="724" height="561" viewBox="0 0 724 561">
+  <defs>
+    <linearGradient id="gradientFill-1" x1="0" x2="1" y1="0" y2="1" gradientUnits="objectBoundingBox" spreadMethod="pad">
+      <stop offset="0" stop-color="rgb(203,206,208)" stop-opacity="1"/>
+      <stop offset="1" stop-color="rgb(132,131,139)" stop-opacity="1"/>
+    </linearGradient>
+    <linearGradient id="gradientFill-2" x1="0" x2="1" y1="0" y2="1" gradientUnits="objectBoundingBox" spreadMethod="pad">
+      <stop offset="0" stop-color="rgb(39,109,195)" stop-opacity="1"/>
+      <stop offset="1" stop-color="rgb(22,92,170)" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path d="M361.453,485.937 C162.329,485.937 0.906,377.828 0.906,244.469 C0.906,111.109 162.329,3.000 361.453,3.000 C560.578,3.000 722.000,111.109 722.000,244.469 C722.000,377.828 560.578,485.937 361.453,485.937 ZM416.641,97.406 C265.289,97.406 142.594,171.314 142.594,262.484 C142.594,353.654 265.289,427.562 416.641,427.562 C567.992,427.562 679.687,377.033 679.687,262.484 C679.687,147.971 567.992,97.406 416.641,97.406 Z" fill="url(#gradientFill-1)" fill-rule="evenodd"/>
+  <path d="M550.000,377.000 C550.000,377.000 571.822,383.585 584.500,390.000 C588.899,392.226 596.510,396.668 602.000,402.500 C607.378,408.212 610.000,414.000 610.000,414.000 L696.000,559.000 L557.000,559.062 L492.000,437.000 C492.000,437.000 478.690,414.131 470.500,407.500 C463.668,401.969 460.755,400.000 454.000,400.000 C449.298,400.000 420.974,400.000 420.974,400.000 L421.000,558.974 L298.000,559.026 L298.000,152.938 L545.000,152.938 C545.000,152.938 657.500,154.967 657.500,262.000 C657.500,369.033 550.000,377.000 550.000,377.000 ZM496.500,241.024 L422.037,240.976 L422.000,310.026 L496.500,310.002 C496.500,310.002 531.000,309.895 531.000,274.877 C531.000,239.155 496.500,241.024 496.500,241.024 Z" fill="url(#gradientFill-2)" fill-rule="evenodd"/>
+</svg>
diff -Nru r-base-3.2.3/doc/html/Search.html r-base-3.3.1/doc/html/Search.html
--- r-base-3.2.3/doc/html/Search.html	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/html/Search.html	2016-03-16 23:04:42.000000000 +0000
@@ -8,7 +8,7 @@
 </head>
 
 <body>
-<h1>Search Engine <img class="toplogo" src="logo.jpg" alt="[R logo]"></h1>
+<h1>Search Engine <img class="toplogo" src="Rlogo.svg" alt="[R logo]"></h1>
 
 <div align="center">
 <a href="index.html"><img class="arrow" src="up.jpg" alt="[Top]"></a>
diff -Nru r-base-3.2.3/doc/html/SearchOn.html r-base-3.3.1/doc/html/SearchOn.html
--- r-base-3.2.3/doc/html/SearchOn.html	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/html/SearchOn.html	2016-03-16 23:04:42.000000000 +0000
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<h1>Search Engine <img class="toplogo" src="logo.jpg" alt="[R logo]"></h1>
+<h1>Search Engine <img class="toplogo" src="Rlogo.svg" alt="[R logo]"></h1>
 
 <div align="center">
 <a href="index.html"><img class="arrow" src="up.jpg" alt="[Top]"></a>
@@ -72,13 +72,14 @@
   <ul>
     <li><a href="Search?category=attribute">attribute</a>:  Data Attributes</li>
     <li><a href="Search?category=chron">chron</a>:  Dates and Times</li>
-    <li><a href="Search?category=classes">classes</a>:  Data Types (not OO)</li>
-    <ul>
-      <li><a href="Search?category=NA">NA</a>:  Missing Values </li>
-      <li><a href="Search?category=category">category</a>:  Categorical Data</li>
-      <li><a href="Search?category=character">character</a>:  Character Data ("String") Operations</li>
-      <li><a href="Search?category=complex">complex</a>:  Complex Numbers</li>
-    </ul>
+    <li><a href="Search?category=classes">classes</a>:  Data Types (not OO)
+      <ul>
+	<li><a href="Search?category=NA">NA</a>:  Missing Values </li>
+	<li><a href="Search?category=category">category</a>:  Categorical Data</li>
+	<li><a href="Search?category=character">character</a>:  Character Data ("String") Operations</li>
+	<li><a href="Search?category=complex">complex</a>:  Complex Numbers</li>
+      </ul>
+    </li>
     <li><a href="Search?category=data">data</a>:  Environments, Scoping, Packages</li>
     <li><a href="Search?category=datasets">datasets</a>:  Datasets available by data()</li>
     <li><a href="Search?category=list">list</a>:  Lists</li>
@@ -114,10 +115,11 @@
 <dd>
   <ul>
     <li><a href="Search?category=arith">arith</a>:  Basic Arithmetic and Sorting</li>
-    <li><a href="Search?category=array">array</a>:  Matrices and Arrays</li>
-    <ul>
-      <li><a href="Search?category=algebra">algebra</a>:  Linear Algebra</li>
-    </ul>
+    <li><a href="Search?category=array">array</a>:  Matrices and Arrays
+      <ul>
+	<li><a href="Search?category=algebra">algebra</a>:  Linear Algebra</li>
+      </ul>
+    </li>
     <li><a href="Search?category=graphs">graphs</a>:  Graphs (not
       graphics), i.e nodes &amp; edges, e.g. dendrograms</li>
     <li><a href="Search?category=logic">logic</a>:  Logical Operators</li>
@@ -131,12 +133,13 @@
 <dt>Programming, Input/Ouput, and Miscellaneous</dt>
 <dd>
   <ul>
-    <li><a href="Search?category=IO">IO</a>:   Input/output</li>
-    <ul>
-      <li><a href="Search?category=connection">connection</a>:  Input/Output Connections</li>
-      <li><a href="Search?category=database">database</a>:  Interfaces to databases</li>
-      <li><a href="Search?category=file">file</a>:  Input/Output Files</li>
-    </ul>
+    <li><a href="Search?category=IO">IO</a>:   Input/output
+      <ul>
+	<li><a href="Search?category=connection">connection</a>:  Input/Output Connections</li>
+	<li><a href="Search?category=database">database</a>:  Interfaces to databases</li>
+	<li><a href="Search?category=file">file</a>:  Input/Output Files</li>
+      </ul>
+    </li>
     <li><a href="Search?category=debugging">debugging</a>:  Debugging Tools</li>
     <li><a href="Search?category=documentation">documentation</a>:  Documentation</li>
     <li><a href="Search?category=environment">environment</a>:  Session Environment</li>
@@ -146,10 +149,11 @@
     <li><a href="Search?category=methods">methods</a>:  Methods and Generic Functions</li>
     <li><a href="Search?category=misc">misc</a>:  Miscellaneous</li>
     <li><a href="Search?category=print">print</a>:  Printing</li>
-    <li><a href="Search?category=programming">programming</a>:  Programming</li>
-    <ul>
-      <li><a href="Search?category=interface">interface</a>:  Interfaces to Other Languages</li>
-    </ul>
+    <li><a href="Search?category=programming">programming</a>:  Programming
+      <ul>
+	<li><a href="Search?category=interface">interface</a>:  Interfaces to Other Languages</li>
+      </ul>
+    </li>
     <li><a href="Search?category=utilities">utilities</a>:  Utilities</li>
   </ul>
 </dd>
@@ -162,21 +166,24 @@
     <li><a href="Search?category=design">design</a>:  Designed Experiments</li>
     <li><a href="Search?category=distribution">distribution</a>:  Probability Distributions and Random Numbers</li>
     <li><a href="Search?category=htest">htest</a>:  Statistical Inference</li>
-    <li><a href="Search?category=models">models</a>:  Statistical Models</li>
-    <ul>
-      <li><a href="Search?category=regression">regression</a>:  Regression</li>
+    <li><a href="Search?category=models">models</a>:  Statistical Models
       <ul>
-	<li><a href="Search?category=nonlinear">nonlinear</a>:
-	  Non-linear Regression </li> 
+	<li><a href="Search?category=regression">regression</a>:  Regression
+	  <ul>
+	    <li><a href="Search?category=nonlinear">nonlinear</a>:
+	      Non-linear Regression </li> 
+	  </ul>
+	</li>
       </ul>
-    </ul>
+    </li>
     <li><a href="Search?category=multivariate">multivariate</a>:  Multivariate Techniques</li>
     <li><a href="Search?category=nonparametric">nonparametric</a>:  Nonparametric Statistics </li>
     <li><a href="Search?category=robust">robust</a>:  Robust/Resistant Techniques</li>
-    <li><a href="Search?category=smooth">smooth</a>:  Curve (and Surface) Smoothing</li>
-    <ul>
-      <li><a href="Search?category=loess">loess</a>:  Loess Objects</li>
-    </ul>
+    <li><a href="Search?category=smooth">smooth</a>:  Curve (and Surface) Smoothing
+      <ul>
+	<li><a href="Search?category=loess">loess</a>:  Loess Objects</li>
+      </ul>
+    </li>
     <li><a href="Search?category=survey">survey</a>:  Complex survey samples</li>
     <li><a href="Search?category=survival">survival</a>:  Survival Analysis</li>
     <li><a href="Search?category=tree">tree</a>:  Regression and Classification Trees</li>
diff -Nru r-base-3.2.3/doc/manual/Makefile.in r-base-3.3.1/doc/manual/Makefile.in
--- r-base-3.2.3/doc/manual/Makefile.in	2015-08-25 22:19:14.000000000 +0000
+++ r-base-3.3.1/doc/manual/Makefile.in	2016-03-16 23:04:43.000000000 +0000
@@ -39,10 +39,12 @@
 TEXI2HTML = $(MAKEINFO) $(MAKEINFO_HTML_OPTS)
 TEXI2TEXT = $(MAKEINFO) $(MAKEINFO_TEXT_OPTS)
 ## some broken versions of texi2dvi need C collation.
-TEXI2DVI0 = @TEXI2DVI@
 TEXI2DVI = LC_COLLATE=C @TEXI2DVI@ --texinfo="@set UseExternalXrefs "
 TEXI2PDF = $(TEXI2DVI) --pdf
 PDFLATEX = @PDFLATEX@
+## These are used to check if there is a non-empty path to the
+## texi2dvi script, and as it uses pdftex if that was detected.
+TEXI2DVI0 = @TEXI2DVI@
 PDFTEX = @PDFTEX@
 
 BATCHPDFLATEX = $(PDFLATEX) -interaction=nonstopmode
@@ -101,14 +103,14 @@
 	$(MAKEINFO) --enable-encoding -D UseExternalXrefs -I$(srcdir) $<
 
 .texi.pdf:
-	@if test -z "$(PDFTEX)"; then \
-	  $(ECHO) "ERROR: 'pdftex' needed but missing on your system."; \
-	  exit 1; \
-	fi
 	@if test -z "$(TEXI2DVI0)"; then \
 	  $(ECHO) "ERROR: 'texi2dvi' needed but missing on your system."; \
 	  exit 1; \
 	fi
+	@if test -z "$(PDFTEX)"; then \
+	  $(ECHO) "ERROR: 'pdftex' needed but missing on your system."; \
+	  exit 1; \
+	fi
 	TEXINPUTS="$(srcdir):$$TEXINPUTS" $(TEXI2PDF) $<
 
 ## It seems ebook-convert converts the directory, 
@@ -391,8 +393,8 @@
 	  *-pkg.tex refman.i?? refman.tex fullrefman.i?? fullrefman.tex \
 	  version.tex version.texi
 	-@rm -f stamp-*
+	-@rm -f *.epub *.mobi rw-FAQ rw-FAQ.html
 distclean: clean
-	-@rm -f *.epub *.mobi rw-FAQ rw-FAQ.html rw-FAQ.pdf
 	-@rm -f Makefile
 maintainer-clean: distclean
 
@@ -467,7 +469,6 @@
 
 rw-FAQ.pdf: rw-FAQ.texi $(top_srcdir)/VERSION
 	@$(SED) $(SEDVER) $< > tmp.texi
-	@$(TEXI2DVI) --pdf tmp.texi
-	@$(TEXI2DVI) --pdf tmp.texi
+	@$(TEXI2PDF) tmp.texi
 	@mv tmp.pdf $@
 	@rm tmp.*
diff -Nru r-base-3.2.3/doc/manual/R-admin.texi r-base-3.3.1/doc/manual/R-admin.texi
--- r-base-3.2.3/doc/manual/R-admin.texi	2015-12-08 23:15:09.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-admin.texi	2016-06-14 22:15:06.000000000 +0000
@@ -848,8 +848,8 @@
 Sub-architectures are also used on Windows, but by selecting executables
 within the appropriate @file{bin} directory,
 @file{@var{R_HOME}/bin/i386} or @file{@var{R_HOME}/bin/x64}.  For
-backwards compatibility with @R{} < 2.12.0, there are executables
-@file{@var{R_HOME}/bin/R.exe} or @file{@var{R_HOME}/bin/Rscript.exe}:
+backwards compatibility there are executables
+@file{@var{R_HOME}/bin/R.exe} and @file{@var{R_HOME}/bin/Rscript.exe}:
 these will run an executable from one of the subdirectories, which one
 being taken first from the
 @enindex R_ARCH
@@ -866,13 +866,13 @@
 @node Multilib,  , Sub-architectures, Sub-architectures
 @subsection Multilib
 
-On Linux@footnote{mainly on RedHat and Fedora, whose layout is described
-here.}, there is an alternative mechanism for mixing 32-bit and 64-bit
-libraries known as @emph{multilib}. If a Linux distribution supports
-multilib, then parallel builds of @R{} may be installed in the
-sub-directories @file{lib} (32-bit) and @file{lib64} (64-bit).  The
-build to be run may then be selected using the @command{setarch}
-command. For example, a 32-bit build may be run by
+For some Linux distributions@footnote{mainly on RedHat and Fedora, whose
+layout is described here.}, there is an alternative mechanism for mixing
+32-bit and 64-bit libraries known as @emph{multilib}. If the Linux
+distribution supports multilib, then parallel builds of @R{} may be
+installed in the sub-directories @file{lib} (32-bit) and @file{lib64}
+(64-bit).  The build to be run may then be selected using the
+@command{setarch} command. For example, a 32-bit build may be run by
 
 @example
 setarch i686 R
@@ -889,8 +889,8 @@
 version of @R{} installed (since this tells the package installation
 code the architecture needed).
 
-At present there is a potential problem with packages using Java, as
-the post-install for a @cputype{i686} RPM on @cputype{x86_64} Linux
+There is a potential problem with packages using Java, as the
+post-install for a @cputype{i686} RPM on @cputype{x86_64} Linux
 reconfigures Java and will find the @cputype{x86_64} Java.  If you know
 where a 32-bit Java is installed you may be able to run (as root)
 
@@ -919,10 +919,9 @@
 
 One that may be useful when working on @R{} itself is the option
 @option{--disable-byte-compiled-packages}, which ensures that the base
-and recommended packages are lazyloaded but not byte-compiled.
-(Alternatively the (make or environment) variable
-@env{R_NO_BASE_COMPILE} can be set to a non-empty value for the duration
-of the build.)
+and recommended packages are not byte-compiled.  (Alternatively the
+(make or environment) variable @env{R_NO_BASE_COMPILE} can be set to a
+non-empty value for the duration of the build.)
 
 Option @option{--with-internal-tzcode} makes use of @R{}'s own code and
 copy of the Olson database for managing timezones.  This will be
@@ -945,9 +944,9 @@
 
 By default @command{configure} searches for suitable
 options@footnote{for example, @option{-fopenmp}, @option{-xopenmp} or
-@option{-qopenmp}.  This includes for 2015 versions of @command{clang}
-and the Intel C compiler.} for OpenMP support for the C, C++98, FORTRAN
-77 and Fortran compilers.
+@option{-qopenmp}.  This includes for @command{clang} 3.7.x and the
+Intel C compiler.} for OpenMP support for the C, C++98, FORTRAN 77 and
+Fortran compilers.
 
 Only the C result is currently used for @R{} itself, and only if
 @code{MAIN_LD}/@code{DYLIB_LD} were not specified.  This can be
@@ -970,15 +969,16 @@
 @noindent
 Setting to an empty value will disable OpenMP for that compiler (and
 configuring with @option{--disable-openmp} will disable all detection of
-OpenMP).  Note that the @command{configure} detection test is to compile
-and link a standalone OpenMP program, which is not the same as compiling
-a shared object and loading it into the C program of @R{}'s executable.
-Note that overridden values are not tested.
+OpenMP).  The @command{configure} detection test is to compile and link
+a standalone OpenMP program, which is not the same as compiling a shared
+object and loading it into the C program of @R{}'s executable.  Note
+that overridden values are not tested.
 
 @node Testing a Unix-alike Installation,  , Other Options, Installing R under Unix-alikes
 @section Testing an Installation
 
-Full testing is possible only if the test files have been installed with
+Full post-installation testing is possible only if the test files have
+been installed with
 
 @example
 make install-tests
@@ -1046,11 +1046,6 @@
 testInstalledBasic("internet")
 @end example
 
-@noindent
-(On Windows that runs the tests using whichever of internal or WinInet
-internet functions has been selected for that session: to test both run
-this twice selecting both options using @code{setInternet2}.)
-
 These tests work best if @command{diff} (in @file{Rtools*.exe} for
 Windows users) is in the path.
 
@@ -1080,7 +1075,9 @@
 @cputype{ix86} and @cputype{x86_64} @acronym{CPU}s.
 
 Your file system must allow long file names (as is likely except
-perhaps for some network-mounted systems).
+perhaps for some network-mounted systems).  If it doesn't also support
+conversion to short name equivalents (a.k.a. DOS 8.3 names), then R
+@emph{must} be installed in a path that does not contain spaces.
 
 Installation is @emph{via} the installer
 @file{@value{RWVERSION}-win.exe}.  Just double-click on the icon and
@@ -1207,15 +1204,16 @@
 The binary distributions of external software.  Download
 
 @example
-https://www.stats.ox.ac.uk/pub/Rtools/goodies/multilib/local320.zip
+https://www.stats.ox.ac.uk/pub/Rtools/goodies/multilib/local323.zip
 @end example
 
 @noindent
-create an empty directory, say @file{c:/R/extsoft}, and unpack it in
+(or a more recent version if appropriate), create an empty directory, 
+say @file{c:/R/extsoft}, and unpack it in
 that directory by e.g.@:
 
 @example
-unzip local320.zip -d c:/R/extsoft
+unzip local323.zip -d c:/R/extsoft
 @end example
 
 @item
@@ -1238,13 +1236,13 @@
 @end itemize
 
 The following additional item is normally installed by
-@file{Rtools31.exe}.  If instead you choose to do a completely manual
+@file{Rtools*.exe}.  If instead you choose to do a completely manual
 build you will also need
 
 @itemize
 
 @item
-The Tcl/Tk support files are contained in @file{Rtools31.exe} and
+The Tcl/Tk support files are contained in @file{Rtools*.exe} and
 available as @file{.zip} files from
 @uref{https://www.stats.ox.ac.uk/pub/Rtools}.  Please make sure you
 install the right version: there is a 32-bit version and a 64-bit
@@ -1650,19 +1648,10 @@
 The front page of a @acronym{CRAN} site has a link `Download R for OS
 X'. Click on that, then download the file @file{R-@value{VERSIONno}.pkg}
 and install it. This runs on OS X 10.9 and later (Mavericks, Yosemite,
-El Capitan@footnote{for @R{} 3.2.1 and earlier, the installer will
-attempt unsuccessfully to install @command{R} and @command{Rscript} in
-@file{/usr/bin}.}, @dots{}).
-
-There may be@footnote{There was for R 3.2.1 but not for R 3.2.2.} a
-separate installer package @file{R-@value{VERSIONno}-snowleopard.pkg},
-which runs on OS X 10.6 and later (Snow Leopard, Lion, Mountain Lion,
-Mavericks, Yosemite, @dots{}); it is a 64-bit (@cputype{x86_64}) build
-which should run on all Macs from mid-2008 on.
+El Capitan, @dots{}).
 
 Installers for R-patched and R-devel are usually available from
-@uref{https://r.research.att.com}, including a
-@file{R-3-2-branch-snowleopard-signed.pkg} build for R-patched.
+@uref{https://r.research.att.com}.
 
 For some older versions of the OS you can in principle (it is little
 tested) install @R{} from the sources.
@@ -1720,15 +1709,16 @@
 can be viewed from @Rapp{}'s `Help' menu.
 
 
-You can run command-line @R{} from a Terminal@footnote{The installer as
-from @R{} 3.2.2 puts links to @command{R} and @command{Rscript} in
-@file{/usr/bin} (Mavericks, Yosemite) or @file{/usr/local/bin} (El
-Capitan and later). If these are missing, you can run directly the
-versions in @file{/Library/Frameworks/R.framework/Resources/}.} so these
-can be typed as commands like any other Unix-alike: see the next chapter
-of this manual.  There are some small differences which may surprise
-users of @R{} on other platforms, notably the default location of the
-personal library directory (under @file{~/Library/R},
+You can run command-line @R{} and @command{Rscript} from a
+Terminal@footnote{The installer as puts links to @command{R} and
+@command{Rscript} in @file{/usr/bin} (Mavericks, Yosemite) or
+@file{/usr/local/bin} (El Capitan and later). If these are missing, you
+can run directly the versions in
+@file{/Library/Frameworks/R.framework/Resources/}.} so these can be
+typed as commands like any other Unix-alike: see the next chapter of
+this manual.  There are some small differences which may surprise users
+of @R{} on other platforms, notably the default location of the personal
+library directory (under @file{~/Library/R},
 e.g. @file{~/Library/R/3.3/library}), and that warnings, messages and
 other output to @file{stderr} are highlighted in bold.
 
@@ -1737,11 +1727,10 @@
 preferences are stored, so if it fails when launched for the very first
 time, try it again (the first attempt will store some preferences).
 
-Users of @Rapp{} under Mavericks and later need to be aware of the `App
-Nap' feature
+Users of @Rapp{} need to be aware of the `App Nap' feature
 (@uref{https://developer.apple.com/library/mac/releasenotes/MacOSX/WhatsNewInOSX/Articles/MacOSX10_9.html})
 which can cause @R{} tasks to appear to run very slowly when not
-producing output in the console.  Here are three ways to avoid it:
+producing output in the console.  Here are ways to avoid it:
 
 @itemize
 @item
@@ -1749,12 +1738,6 @@
 indicator at the top right corner is visible).
 
 @item
-Call @samp{Get Info} on the application (e.g.@: from Finder). This may
-have two tick boxes in the `General' panel: click the one named `Prevent
-App Nap' if it is not already ticked.  (This only available for builds
-made prior to Mavericks.)
-
-@item
 In a Terminal, run
 @example
 defaults write org.R-project.R NSAppSleepDisabled -bool YES
@@ -1782,7 +1765,7 @@
 @file{/usr/local/bin} should also be removed.
 
 If you want to get rid of @R{} more completely using a Terminal, simply
-run (use @file{/usr/local/bin} on El Capitan):
+run (use @file{/usr/local/bin} as from El Capitan):
 
 @example
 sudo rm -rf /Library/Frameworks/R.framework /Applications/R.app \
@@ -1810,6 +1793,18 @@
 
 @noindent
 These are paths relative to @file{/}, the root of the file system.
+@c Maybe too dangerous for naive users.
+@c file.remove removes empty directories on Unix.
+@c The second could be uninstalled by an @R{} script like
+
+@c @example
+@c lis <- system2("pkgutil", "--files org.r-project.x86_64.texinfo", stdout = TRUE)
+@c setwd("/")
+@c file.remove(rev(lis))
+@c @end example
+
+@c @noindent
+@c run as the owner of @file{/usr/local}.
 
 @node Multiple versions,  , Uninstalling under OS X, Installing R under OS X
 @section Multiple versions
@@ -1824,7 +1819,7 @@
 
 A version of @R{} can be run directly from the command-line as e.g.@:
 @example
-/Library/Frameworks/R.framework/Versions/3.2/Resources/bin/R
+/Library/Frameworks/R.framework/Versions/3.3/Resources/bin/R
 @end example
 
 @noindent
@@ -1988,6 +1983,7 @@
 * Customizing package compilation::  
 * Multiple sub-architectures::  
 * Byte-compilation::            
+* External software::           
 @end menu
 
 
@@ -2065,7 +2061,7 @@
 
 @code{install.packages} can look in several repositories, specified as a
 character vector by the argument @code{repos}: these can include a
-@acronym{CRAN} mirror, Bioconductor, Omegahat, R-forge, rforge.net,
+@acronym{CRAN} mirror, Bioconductor, R-forge, rforge.net,
 local archives, local files, @dots{}).  Function
 @code{setRepositories()} can select amongst those repositories that the
 @R{} installation is aware of.
@@ -2109,14 +2105,16 @@
 the path: it should work to have both 32- and 64-bit Gtk+ @file{bin}
 directories in the path on a 64-bit version of @R{}.
 
-@command{R CMD INSTALL} works in Windows to install source packages.  No
-additional tools are needed if the package does not contain compiled
-code, and @code{install.packages(type="source")} will work for such
-packages (and for those with compiled code if the tools (see @ref{The
-Windows toolset}) are in the path).  We have seen occasional permission
-problems after unpacking source packages on some systems: these have
-been circumvented by setting the environment variable
-@env{R_INSTALL_TAR} to @samp{tar.exe}.
+@command{R CMD INSTALL} works in Windows to install source packages.
+No additional tools are needed if the package does not contain
+compiled code, and @code{install.packages(type="source")} will work
+for such packages (and for those with compiled code if the tools (see
+@ref{The Windows toolset}) are on the path, and the variables
+@code{BINPREF} and @code{BINPREF64} are set properly; see the
+discussion below).  We have seen occasional permission problems after
+unpacking source packages on some systems: these have been
+circumvented by setting the environment variable @env{R_INSTALL_TAR}
+to @samp{tar.exe}.
 @enindex R_INSTALL_TAR
 
 If you have only a source package that is known to work with current
@@ -2148,16 +2146,24 @@
 
 
 @enindex LOCAL_SOFT
-There is provision to make use of a system-wide library of installed
-external software by setting the @command{make} variable
-@code{LOCAL_SOFT}, to give an equivalent of @file{/usr/local} on a
-Unix-alike.  This can be set in @file{src/gnuwin/MkRules.local} when
-@R{} is built from sources (see the comments in
-@file{src/gnuwin/MkRules.dist}), or in file@footnote{or by adding it in
-a file such as @file{etc/i386/Makevars.site}, which does not exist by
-default.}  @file{etc/i386/Makeconf} or @file{etc/x64/Makeconf} for an
-installed version of @R{}.  The version used by @acronym{CRAN} can be
-installed as described in @ref{Building from source}.
+@enindex BINPREF
+@enindex BINPREF64
+Packages with compiled code may need to have paths to the compilers
+set explicitly, and there is provision to make use of a system-wide
+library of installed external software. The compiler paths are set
+using the @command{make} variables @code{BINPREF} (and in some cases
+@code{BINPREF64}).  The library location is set using @command{make}
+variable @code{LOCAL_SOFT}, to give an equivalent of @file{/usr/local}
+on a Unix-alike.  All of these can be set in
+@file{src/gnuwin32/MkRules.local} when @R{} is built from sources (see
+the comments in @file{src/gnuwin32/MkRules.dist}), or in
+file@footnote{or by adding it in a file such as
+@file{etc/i386/Makevars.site}, which does not exist by default.}
+@file{etc/i386/Makeconf} or @file{etc/x64/Makeconf} for an installed
+version of @R{}.  In the latter case only @code{BINPREF} is used, with
+the 64 bit path used in @file{etc/x64/Makeconf}. The version used by
+@acronym{CRAN} can be installed as described in @ref{Building from
+source}.
 
 
 @node OS X packages, Customizing package compilation, Windows packages, Installing packages
@@ -2182,11 +2188,7 @@
 to do so for those with, if @command{make} is available.
 
 Note that most binary packages including compiled code are tied to a
-particular series (e.g.@: @R{} 3.2.x or 3.1.x) of @R{}.
-
-You should not attempt to mix-and-match binary packages built for the
-`Snow Leopard' and `Mavericks' @acronym{CRAN} distributions: doing so is
-likely to lead to crashes or failures to load.
+particular series (e.g.@: @R{} 3.2.x or 3.3.x) of @R{}.
 
 Installing source packages which do not contain compiled code should
 work with no additional tools. For others you will need the
@@ -2195,7 +2197,7 @@
 
 Package @CRANpkg{rJava} and those which depend on it need a Java runtime
 installed and several packages need X11 installed, including those using
-Tk.  For Mountain Lion and later see @ref{OS X} and @ref{Java (OS X)}.
+Tk.  See @ref{OS X} and @ref{Java (OS X)}.
 
 Tcl/Tk extensions @code{BWidget} and @code{Tktable} are part of the
 Tcl/Tk contained in the @R{} installer.  These are required by a number
@@ -2211,13 +2213,14 @@
 The default compilers specified in
 @file{/Library/Frameworks/R.framework/Resources/etc/Makeconf} depend on
 the version of OS X under which @R{} was installed, and are appropriate
-to the latest version of the command-line tools for that version
-of OS X.  The settings can be changed, either by editing that file or in
-a file such as @file{~/.R/Makevars} (see the next section).  Entries
-which may need to be changed include @samp{CC}, @samp{CXX}, @samp{FC},
-@samp{F77}, @samp{FLIBS} and the corresponding flags, and perhaps
-@samp{CXXCPP}, @samp{DYLIB_LD}, @samp{MAIN_LD}, @samp{SHLIB_CXXLD},
-@samp{SHLIB_FCLD} and @samp{SHLIB_LD}.
+for the latest version of the `Command Line Tools' for that version of
+OS X and the recommended version of Fortran (see @ref{OS X}).  The
+settings can be changed, either by editing that file or in a file such
+as @file{~/.R/Makevars} (see the next section).  Entries which may need
+to be changed include @samp{CC}, @samp{CXX}, @samp{FC}, @samp{F77},
+@samp{FLIBS} and the corresponding flags, and perhaps @samp{CXXCPP},
+@samp{DYLIB_LD}, @samp{MAIN_LD}, @samp{SHLIB_CXXLD}, @samp{SHLIB_FCLD}
+and @samp{SHLIB_LD}.
 
 So for example you could select @command{clang} for both C and C++ with
 extensive checking by having in @file{~/.R/Makevars}
@@ -2228,12 +2231,6 @@
 CXXFLAGS=-mtune=native -g -O2 -Wall -pedantic -Wconversion
 @end example
 
-@noindent
-and for a version of @command{gfortran-4.2} we needed
-@example
-FLIBS=-lgfortran
-@end example
-
 
 @node Customizing package compilation, Multiple sub-architectures, OS X packages, Installing packages
 @subsection Customizing package compilation
@@ -2331,7 +2328,7 @@
 --merge-multiarch} to build and merge the two architectures, starting
 with a source tarball.
 
-@node Byte-compilation,  , Multiple sub-architectures, Installing packages
+@node Byte-compilation, External software, Multiple sub-architectures, Installing packages
 @subsection Byte-compilation
 
 The base and recommended packages are byte-compiled by default.  Other
@@ -2340,8 +2337,7 @@
 @code{install.packages(type = "source", INSTALL_opts =
 "--byte-compile")}.
 
-Not all contributed packages work correctly when byte-compiled (for
-example because they interfere with the sealing of namespaces).  For
+Not all contributed packages work correctly when byte-compiled.  For
 most packages (especially those which make extensive use of compiled
 code) the speed-up is small.  Unless a package is used frequently the
 time spent in byte-compilation can outweigh the time saved in execution:
@@ -2351,6 +2347,65 @@
 Byte-compilation can be controlled on a per-package basis by the
 @samp{ByteCompile} field in the @file{DESCRIPTION} file.
 
+@node External software,  , Byte-compilation, Installing packages
+@subsection External software
+
+Some @R{} packages contain compiled code which links to external
+software libraries.  Unless the external library is statically linked
+(which is done as much as possible for binary packages on Windows and OS
+X), the libraries have to be found when the package is loaded and not
+just when it is installed.  How this should be done depends on the OS
+(and in some cases the version).
+
+For Unix-alikes except OS X the primary mechanism is the @code{ld.so}
+cache controlled by @command{ldconfig}: external dynamic libraries
+recorded in that cache will be found.  Standard library locations will
+be covered by the cache, and well-designed software will add its
+locations (as for example @pkg{openmpi} does on Fedora).  The secondary
+mechanism is to consult the environment variable @env{LD_LIBRARY_PATH}.
+Now the @R{} script controls that variable, and sets it to the
+concatenation of @env{R_LD_LIBRARY_PATH}, @env{R_JAVA_LD_LIBRARY_PATH}
+and the environment value of @env{LD_LIBRARY_PATH}.  The first two have
+defaults which are normally set when @R{} is installed (but can be
+overridden in the environment) so @env{LD_LIBRARY_PATH} is the best
+choice for a user to set.
+
+On OS X the primary mechanism is to embed the absolute path to dependent
+dynamic libraries into an object when it is compiled.  Few @R{} packages
+arrange to do so, but it can be edited@footnote{They need to have been
+created using @option{-headerpad_max_install_names}, which is the
+default for an @R{} package.} @emph{via} @command{install_name_tool} ---
+that only deals with direct dependencies and those would also need to be
+compiled to include the absolute paths of their dependencies.  If the
+choice of absolute path is to be deferred to load time, how they are
+resolved is described in @command{man dyld}: the role of
+@env{LD_LIBRARY_PATH} is replaced on OS X by @env{DYLD_LIBRARY_PATH} and
+latterly @env{DYLD_FALLBACK_LIBRARY_PATH}.  Running @command{R CMD otool
+-L} on the package shared object will show where (if anywhere) its
+dependencies are resolved. @env{DYLD_FALLBACK_LIBRARY_PATH} is preferred
+(and it is that which is manipulated by the @R{} script), but as from
+10.11 (`El Capitan') the default behaviour had been changed for security
+reasons to discard these environment variables when invoking a shell
+script (and @file{R} is a shell script).  That makes the only portable
+option to set @env{R_LD_LIBRARY_PATH} in the environment, something like
+
+@example
+export R_LD_LIBRARY_PATH="`R RHOME`/lib:/opt/local/lib"
+@end example
+
+The precise rules for where Windows looks for DLLs are complex and
+depend on the version of Windows.  But for present purposes the main
+solution is to put the directories containing the DLLs the package
+links to (and any those DLLs link to) on the @env{PATH}.  64-bit
+versions of Windows will ignore 32-bit DLLs from 64-bit @R{} and
+@emph{vice versa}.
+
+The danger with any of the methods which involve setting environment
+variables is of inadvertently masking a system library.  This is less
+for @env{DYLD_FALLBACK_LIBRARY_PATH} and for @emph{appending} to
+@env{PATH} on Windows (as it should already contain the system library
+paths).
+
 @node Updating packages, Removing packages, Installing packages, Add-on packages
 @section Updating packages
 @findex update.packages
@@ -2404,8 +2459,7 @@
                   lib = file.path("path", "to", "library"))
 @end example
 
-Finally, in most installations one can just remove the package directory
-from the library.
+Finally, one can just remove the package directory from the library.
 
 
 @node Setting up a package repository, Checking installed source packages, Removing packages, Add-on packages
@@ -2415,11 +2469,12 @@
 Utilities such as @code{install.packages} can be pointed at any
 @acronym{CRAN}-style repository, and @R{} users may want to set up their
 own.  The `base' of a repository is a URL such as
-@uref{http://www.omegahat.org/R/}: this must be an URL scheme that
-@code{download.packages} supports (which also includes @samp{ftp://} and
-@samp{file://} and on most systems @samp{https://}).  Under that base
-URL there should be directory trees for one or more of the following
-types of package distributions:
+@uref{http://www.stats.ox.ac.uk/pub/RWin}: this must be an URL scheme
+that @code{download.packages} supports (which also includes
+@samp{ftp://} and @samp{file://} and (from @R{} 3.3.0 and perhaps
+earlier) @samp{https://}).  Under that base URL there should be
+directory trees for one or more of the following types of package
+distributions:
 
 @itemize
 @item 
@@ -2439,12 +2494,6 @@
 @file{bin/macosx/mavericks/contrib/@var{3.y}} for the CRAN build for
 `Mavericks' (and later) for @R{} versions @var{3.y.z}, containing
 @file{.tgz} files.
-
-@item 
-@code{"mac.binary"}: located at
-@file{bin/macosx/contrib/@var{3.y}} for a CRAN build for
-`Snow Leopard' (and later) for @R{} versions @var{3.y.z}, containing
-@file{.tgz} files.
 @end itemize
 
 Each terminal directory must also contain a @file{PACKAGES} file.  This
@@ -2797,7 +2846,7 @@
 
 @item
 Only 64-bit builds support `long vectors', those with @math{2^{31}} or
-more elements (each of which needs 16GB of storage for a numeric
+more elements (which needs at least 16GB of storage for each numeric
 vector).
 
 @item
@@ -2819,9 +2868,9 @@
 @cputype{x86_64} @emph{vs} @cputype{ix86}, the 64-bit CPU has features
 (such as SSE2 instructions) which are guaranteed to be present but are
 optional on the 32-bit CPU, and also has more general-purpose registers.
-This means that on chips like a desktop Intel Core 2 Duo the vanilla
-64-bit version of @R{} has been around 10% faster on both Linux and OS
-X.  (Laptop CPUs are usually relatively slower in 64-bit mode.)
+This means that on chips like a desktop Intel i7 the vanilla 64-bit
+version of @R{} has been around 10% faster on both Linux and OS X.
+(Laptop CPUs are usually relatively slower in 64-bit mode.)
 @end itemize
 
 So, for speed you may want to use a 32-bit build (especially on a
@@ -2851,7 +2900,7 @@
 Unix-alike if that is separate from the sources).
 
 @file{Rmath.h} contains @samp{R_VERSION_STRING}, which is a character
-string containing the current @R{} version, for example @code{"3.2.0"}.
+string containing the current @R{} version, for example @code{"3.3.0"}.
 
 There is full access to @R{}'s handling of @code{NaN}, @code{Inf} and
 @code{-Inf} via special versions of the macros and functions
@@ -2942,7 +2991,7 @@
 not be able to run it unless you add the directory containing
 @enindex LD_LIBRARY_PATH
 @file{libRmath.so} to the @env{LD_LIBRARY_PATH} environment variable
-(@file{libRmath.dylib}, @env{DYLD_LIBRARY_PATH} on OS X).
+(@file{libRmath.dylib}, @env{DYLD_FALLBACK_LIBRARY_PATH} on OS X).
 
 The targets
 
@@ -3003,7 +3052,7 @@
 make -f Makefile.win shared implib
 @end example
 
-To use the routines in your own C or C++ programs using MinGW, include
+To use the routines in your own C or C++ programs using MinGW-w64, include
 
 @example
 #define MATHLIB_STANDALONE
@@ -3017,7 +3066,7 @@
 able to force static or dynamic linking  @emph{via}
 
 @example
--Wl,-Bstatic -lRmath -Wl,dynamic
+-Wl,-Bstatic -lRmath -Wl,Bdynamic
 -Wl,-Bdynamic -lRmath
 @end example
 
@@ -3028,7 +3077,7 @@
 linked).
 
 It is possible to link to @file{Rmath.dll} using other compilers, either
-directly or via an import library: if you make a MinGW import library as
+directly or via an import library: if you make a MinGW-w64 import library as
 above, you will create a file @file{Rmath.def} which can be used
 (possibly after editing) to create an import library for other systems
 such as Visual C++.
@@ -3043,7 +3092,7 @@
 
 @noindent
 to ensure that the constants like @code{NA_REAL} are linked correctly.
-(Auto-import will probably work with MinGW, but it is better to be
+(Auto-import will probably work with MinGW-w64, but it is better to be
 sure. This is likely to also work with VC++, Borland and similar
 compilers.)
 
@@ -3083,25 +3132,24 @@
 @option{-std=gnu99}@footnote{@option{-std=c99} excludes POSIX
 functionality, but @file{config.h} will turn on all @acronym{GNU}
 extensions to include the POSIX functionality.  The default mode for GCC
-5 is @option{-std=gnu11}.}.  If the compiler is detected as
-@command{gcc}@tie{}@code{4.x}, @option{-std=gnu99} will be appended to
-@code{CC} unless it conflicts with a setting of @code{CFLAGS}.  (Note
-that options essential to run the compiler even for linking, such as
-those to set the architecture, should be specified as part of @code{CC}
-rather than in @code{CFLAGS}.)
+5.1 and later is @option{-std=gnu11}.}.  (Note that options essential to
+run the compiler even for linking, such as those to set the
+architecture, should be specified as part of @code{CC} rather than in
+@code{CFLAGS}.)
 
 Unless you do not want to view graphs on-screen (or use OS X) you need
 @samp{X11} installed, including its headers and client libraries. For
-recent Fedora distributions it means (at least) RPMs @samp{libX11},
-@samp{libX11-devel}, @samp{libXt} and @samp{libXt-devel}.  On Debian we
-recommend the meta-package @samp{xorg-dev}.  If you really do not want
-these you will need to explicitly configure @R{} without X11, using
-@option{--with-x=no}.
+recent Fedora/RedHat distributions it means (at least) RPMs
+@samp{libX11}, @samp{libX11-devel}, @samp{libXt} and @samp{libXt-devel}.
+On Debian/Ubuntu we recommend the meta-package @samp{xorg-dev}.  If you
+really do not want these you will need to explicitly configure @R{}
+without X11, using @option{--with-x=no}.
 
 The command-line editing (and command completion) depends on the
-@acronym{GNU} @code{readline} library: version 4.2 or later is needed
-for all the features to be enabled.  Otherwise you will need to
-configure with @option{--with-readline=no} (or equivalent).
+@acronym{GNU} @code{readline} library (including its headers): version
+4.2 or later is needed for all the features to be enabled.  Otherwise
+you will need to configure with @option{--with-readline=no} (or
+equivalent).
 
 A suitably comprehensive @code{iconv} function is essential.  The @R{}
 usage requires @code{iconv} to be able to translate between
@@ -3126,6 +3174,41 @@
 @code{setenv}.} are essential, and others@footnote{such as
 @code{realpath}, @code{symlink}.} will be used if available.
 
+@c PCRE[1] 8.32 is from Nov 2012
+@c zlib 1.2.5 is from July 2010, bzip2 1.0.6 from Sept 2010
+@c xz 5.0.3 is from May 2011
+@c libcurl 7.28.0 was released in Oct 2012
+Installations of @code{zlib} (version 1.2.5 or later), @code{libbz2}
+(version 1.0.6 or later: called @pkg{bzip2-libs}/@pkg{bzip2-devel} or
+@pkg{libbz2-1.0}/@pkg{libbz2-dev} by some Linux distributions),
+@code{liblzma}@footnote{most often distributed as part of @code{xz}:
+possible names in Linux distributions include
+@code{xz-devel}/@code{xz-libs} and @code{liblzma-dev}.} version 5.0.3 or
+later are required.
+
+PCRE@footnote{sometimes known as PCRE1, and not PCRE2 which started at
+version 10.0.} (version 8.32 or later, although versions 8.10--8.31 will
+be accepted with a deprecation warning) is required (or just its library
+and headers if packaged separately).  PCRE must be built with UTF-8
+support (not the default, and checked by @command{configure}) and
+support for Unicode properties is assumed by some @R{} packages.  JIT
+support is desirable for the best performance: support for this and
+Unicode properties can be checked at run-time by calling
+@code{pcre_config()}.  If building PCRE for use with @R{} a suitable
+@command{configure} command might be
+@example
+/configure --enable-utf --enable-unicode-properties --enable-jit --disable-cpp
+@end example
+@noindent  
+The @option{--enable-jit} flag is supported for most common CPUs.
+
+Library @code{libcurl} (version 7.28.0 or later) is required.
+Information on @code{libcurl} is found from the @command{curl-config}
+script: if that is missing or needs to be overridden@footnote{for
+example to specify static linking with a build which has both shared and
+static libraries.} there are macros to do so described in file
+@file{config.site}.
+
 A @command{tar} program is needed to unpack the sources and packages
 (including the recommended packages).  A version@footnote{Such as
 @acronym{GNU} @command{tar} 1.15 or later, @command{bsdtar} (from
@@ -3153,10 +3236,18 @@
 in re-distributions) as well as
 @command{texi2dvi}.@footnote{@command{texi2dvi} is normally a shell
 script.  Some versions (including that from @pkg{texinfo} 5.2 and 6.0)
-need to be run under @command{bash} rather than a Bourne shell.}
+need to be run under @command{bash} rather than a Bourne shell,
+especially on Solaris. Some of the issues which have been observed with
+broken versions of @command{texi2dvi} can be circumvented by setting the
+environment variable @env{R_TEXI2DVICMD} to the value @code{emulation}.}
 Further, the versions of @command{texi2dvi} and @file{texinfo.tex} need
 to be compatible: we have seen problems with older @TeX{} distributions.
 
+@cindex Subversion
+If you want to build from the @R{} Subversion repository then
+@command{texi2any} is highly recommended as it is used to create files
+which are in the tarball but not stored in the Subversion repository.
+
 @cindex Vignettes
 The PDF documentation (including @file{doc/NEWS.pdf}) and building
 vignettes needs @command{pdftex} and @command{pdflatex}.  We require
@@ -3171,19 +3262,13 @@
 may need to change @R{}'s defaults: @pxref{Making the manuals}).  Note
 that package @pkg{hyperref} (currently) requires packages
 @pkg{kvoptions}, @pkg{ltxcmds} and @pkg{refcount}.  For distributions
-based on TeXLive the simplest approach may be to install collections
+based on TeX Live the simplest approach may be to install collections
 @pkg{collection-latex}, @pkg{collection-fontsrecommended},
 @pkg{collection-latexrecommended}, @pkg{collection-fontsextra} and
 @pkg{collection-latexextra} (assuming they are not installed by
 default): Fedora uses names like @pkg{texlive-collection-fontsextra} and
 Debian/Ubuntu like @pkg{texlive-fonts-extra}.
 
-
-@cindex Subversion
-If you want to build from the @R{} Subversion repository then
-@command{texi2any} is highly recommended as it is used to create files
-in the tarball but not under Subversion.
-
 @enindex PATH
 The essential programs should be in your @env{PATH} at the time
 @command{configure} is run: this will capture the full paths.
@@ -3250,23 +3335,6 @@
 into @code{libtiff} such as @code{lzma}, @code{jbig} and @code{jpeg12},
 and these may need also to be present.
 
-@c PCRE[1] 8.10 is from June 2010, 8.32 from Nov 2012
-If you have them installed (including the appropriate headers and of
-suitable versions), system versions of @code{zlib} (version 1.2.5 or
-later),, @code{libbz2} (version 1.0.6 or later: called
-@pkg{bzip2-libs}/@pkg{bzip2-devel} or @pkg{libbz2-1.0}/@pkg{libbz2-dev}
-by some Linux distributions) and PCRE (version 8.10 or later, preferably
-8.32 or later@footnote{sometimes known as PCRE1, and not PCRE2, which
-started at version 10.0. PCRE must be built with UTF-8 support (not the
-default, and checked by @command{configure}) and support for Unicode
-properties is assumed by some @R{} packages. JIT support is desirable
-for the best performance: support for this and Unicode properties can be
-checked at run-time by calling @code{pcre_config()}.}): will be used,
-otherwise versions in the @R{} sources will be compiled in.  The
-external versions can be avoided by configure options
-@option{--without-system-zlib}, @option{--without-system-bzlib} and
-@option{--without-system-pcre}.
-
 Option @option{--with-system-tre} is also available: it needs a recent
 version of TRE. (The current sources are in the @command{git} repository
 at @url{https://github.com/laurikari/tre/}, but at the time of writing
@@ -3306,17 +3374,6 @@
 very old or broken version of ICU be found this can be suppressed by
 @option{--without-ICU}.
 
-@c 7.28.0 was released in Oct 2012.
-If @code{libcurl} version 7.28.0 or later is available (including its
-development files), it will be linked in to support
-@code{curlGetHeaders} and the @code{"libcurl"} methods of
-@code{download.file} and @code{url}.  This is recommended as it gives
-access to @samp{https://} and @samp{ftps://} URLs.  Information on
-@code{libcurl} is found from the @command{curl-config} script: if that
-is missing or needs to be overridden@footnote{for example to specify
-static linking with a build which has both shared and static libraries.}
-there are macros described in file @file{config.site}.
-
 The @code{bitmap} and @code{dev2bitmap} devices and function
 @code{embedFonts()} use ghostscript
 (@uref{http://www.ghostscript.com/}).  This should either be in your
@@ -3355,7 +3412,7 @@
 versions of Tcl/Tk installed, specifying the paths to the correct config
 files may be necessary to avoid confusion between them.
 
-Versions of Tcl/Tk up to 8.5.18 and 8.6.4 have been tested (including
+Versions of Tcl/Tk up to 8.5.19 and 8.6.4 have been tested (including
 most versions of 8.4.x, but not recently).
 
 Note that the @file{tk.h} header includes@footnote{This is true even for
@@ -3382,16 +3439,17 @@
 @cputype{x86_64} Linux is
 
 @example
-JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.51-4.b16.fc21.x86_64/jre
+JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.71-1.b15.fc22.x86_64/jre
 R_JAVA_LD_LIBRARY_PATH=$@{JAVA_HOME@}/lib/amd64/server
 @end example
 
-Note that this unfortunately depends on the exact version of the JRE/JDK
+Unfortunately this depends on the exact version of the JRE/JDK
 installed, and so may need updating if the Java installation is updated.
 This can be done by running @code{R CMD javareconf} which updates
-settings in both @file{etc/Makeconf} and
+settings in both @file{@var{R_HOME}/etc/Makeconf} and
 @file{@var{R_HOME}/etc/ldpaths}. See @code{R CMD javareconf --help} for
-details.
+details: note that this needs to be done by the account owning the @R{}
+installation.
 
 Another way of overriding those settings is to set the environment variable
 @enindex R_JAVA_LD_LIBRARY_PATH
@@ -3404,7 +3462,7 @@
 @end example
 
 It may be possible to avoid this by specifying an invariant link as the
-path. For example, on that system any of
+path when configuring. For example, on that system any of
 
 @example
 JAVA_HOME=/usr/lib/jvm/java
@@ -3491,9 +3549,9 @@
 Some enhanced @acronym{BLAS}es are compiler-system-specific
 (@code{sunperf} on Solaris@footnote{Using the Oracle Solaris Studio
 @command{cc} and @command{f95} compilers}, @code{libessl} on IBM,
-@code{Accelerate} on OS X).  The correct incantation for
-these is usually found @emph{via} @option{--with-blas} with no value on
-the appropriate platforms.
+@code{Accelerate} on OS X).  The correct incantation for these is often
+found @emph{via} @option{--with-blas} with no value on the appropriate
+platforms.
 
 Some of the external @acronym{BLAS}es are multi-threaded.  One issue is
 that @R{} profiling (which uses the @code{SIGPROF} signal) may cause
@@ -3922,7 +3980,9 @@
 by option @option{--with-system-valgrind-headers}: they will be used if
 present (on Linux they may be in a separate package such as
 @pkg{valgrind-devel}).  Note though that there is no guarantee that the
-code in @R{} will be compatible with future @command{valgrind} headers.
+code in @R{} will be compatible with very old@footnote{We believe that
+versions 3.4.0 to 3.10.1 are compatible.} or future @command{valgrind}
+headers.
 
 If you need to re-configure @R{} with different options you may need to run
 @code{make clean} or even @code{make distclean} before doing so.
@@ -4337,6 +4397,7 @@
 * Solaris::                     
 * AIX::                         
 * FreeBSD::                     
+* OpenBSD::                     
 * Cygwin::                      
 * New platforms::               
 @end menu
@@ -4655,15 +4716,11 @@
 @section OS X
 @cindex OS X
 
-To build @R{} you need to have installed Apple's `Command Line Tools'
-(on some versions installing Xcode suffices).  You also need
-@code{readline} (or to configure using @option{--without-readline}), and
-a Fortran compiler.  Those and other binary components are available
-from @uref{https://r.research.att.com/libs}.
+The instructions here are for @cputype{x86_64} builds on 10.9
+(Mavericks) or later.  In principle@footnote{It will be necessary to
+install later versions of software such as @code{libcurl}.} @R{} can be
+built for 10.6 to 10.8 but these has not been tested recently.
 
-An X sub-system is required unless configuring using
-@option{--without-x}: see @uref{https://xquartz.macosforge.org/}.  (Note
-that XQuartz will likely need to be re-installed after an OS upgrade.)
 To build @R{} you need Apple's `Command Line Tools': these can be
 (re-)installed by @command{xcode-select --install}.  (If you have a
 fresh OS installation, running e.g.@: @command{make} in a terminal will
@@ -4671,10 +4728,16 @@
 Xcode, this provides the command-line tools.  The tools will need to be
 reinstalled when OS X is upgraded, as upgrading partially removes them.)
 
-The instructions here are for @cputype{x86_64} builds on 10.6 (Snow
-Leopard) or later.  In principle @R{} can be built for 10.4.x, 10.5.x
-and for PowerPC or 32-bit Intel Macs but these has not been tested
-recently.
+You need @code{readline}@footnote{Apple provides a partial emulation of
+GNU readline 4.2 based on the NetBSD @code{editline} library.  That is
+not recommended but for the time being @R{}'s installation scripts will
+make use of it.} and a Fortran compiler.  Those and other binary
+components are available from @uref{https://r.research.att.com/libs}:
+you are likely to need @code{pcre} and @code{xz} (recent OS X provides
+libraries but not headers for these).
+
+An X sub-system is required unless configuring using
+@option{--without-x}: see @uref{https://xquartz.macosforge.org/}.
 
 To use the @code{quartz()} graphics device you need to configure with
 @option{--with-aqua} (which is the default): @code{quartz()} then
@@ -4688,11 +4751,10 @@
 Use @option{--without-aqua} if you want a standard Unix-alike build:
 apart from disabling @code{quartz()} and the ability to use the build
 with @Rapp{}, it also changes the default location of the personal
-library (see @code{?.libPaths}).  Also use
-@option{--disable-R-framework} to install in the standard layout.
+library (see @code{?.libPaths}).
 
-Various compilers can be used.  The current @acronym{CRAN} `Mavericks'
-distribution of @R{} is built using
+Various compilers can be used.  The current @acronym{CRAN} distribution
+of @R{} is built using
 
 @example
 CC=clang
@@ -4713,47 +4775,7 @@
 @uref{https://r.research.att.com/libs/gfortran-4.8.2-darwin13.tar.bz2}.@footnote{This
 is a tarball which needs to be unpacked in the Terminal by e.g.@:
 @command{sudo tar -zxf gfortran-4.8.2-darwin13.tar.bz2 -C /}. It does
-not run on Core 2 Duo Macs.}  Apple's builds of @command{clang}
-currently have no OpenMP support.
-
-The @acronym{CRAN} `Snow Leopard' distribution of @R{} was built using
-
-@itemize
-@item @command{gcc}
-from an Xcode distribution prior to version 5.  This is a version of gcc
-4.2.1 with an LLVM backend.
-
-@item @command{gfortran}
-from
-@uref{http://cran.r-project.org/bin/macosx/tools/gfortran-4.2.3.pkg}.
-Note that this installs into @file{/usr/local/bin}, so make sure that is
-on your path.  Other compilers from
-@uref{http://r.research.att.com/tools/} can also be used.
-
-@item @command{clang}
-from the Xcode distribution, to compile the Objective-C parts of the
-@code{quartz()} device. 
-@end itemize
-
-To use these, have in @file{config.site} something like
-
-@example
-CC="llvm-gcc-4.2"
-CXX="llvm-g++-4.2"
-F77="gfortran-4.2 -arch x86_64"
-FC=$F77
-OBJC="clang"
-@end example
-
-@noindent
-Full names help to ensure that the intended compilers are used.  In
-particular @command{gcc} is a copy of @command{llvm-gcc-4.2} for Xcode <
-5 but of @command{clang} in Xcode 5.  The recommended Fortran compiler
-defaults to 32-bit, so @code{-arch x86_64} is needed.  (For a 32-bit
-build, use @code{-arch i386} for all compiler commands.)
-
-The OpenMP support in this version of @command{gcc} is problematic, so
-the @acronym{CRAN} build is configured with @option{--disable-openmp}.
+not run on Core 2 Duo Macs.}
 
 Other builds of @command{gfortran} are available: see
 @uref{https://gcc.gnu.org/wiki/GFortranBinaries} and
@@ -4770,16 +4792,10 @@
 
 Pre-compiled versions of many of the @ref{Useful libraries and programs}
 are available from @uref{https://r.research.att.com/libs/}.  You will
-most likely want at least @code{pcre}, @code{xz}, @code{jpeg}
-and @code{readline} (and perhaps @code{tiff}).
-@code{pkg-config} is not provided by Apple and useful for many packages:
-it will also be used if present when configuring the @code{X11()}
-device.
-
-Recent versions of OS X ship with @code{zlib} version 1.2.8 and
-@code{bzlib} version 1.0.6, sufficient for the default
-@command{configure} checks.  Mavericks has a recent enough version of
-@code{libcurl}: Snow Leopard does not.
+most likely want at least @code{jpeg} and @code{tiff}.
+@code{pkg-config} is not provided by Apple and used for many packages:
+it will also be used if present when configuring the @code{X11()} and
+bitmap devices.
 
 Support for @code{cairo} (without @code{Pango}) can be enabled in two
 ways: both need @code{pkg-config} available.  XQuartz ships @code{cairo}
@@ -4806,20 +4822,19 @@
 
 @noindent
 to provide potentially higher-performance versions of the @acronym{BLAS}
-and LAPACK routines.  (Use of @code{Accelerate} with
-@option{--with-lapack} does not work on Snow Leopard: it may work there
-without.)@footnote{It is reported that for some non-Apple toolchains
-@code{CPPFLAGS} needed to contain @code{-D__ACCELERATE__}.}
+and LAPACK routines.@footnote{It is reported that for some non-Apple
+toolchains @code{CPPFLAGS} needed to contain @code{-D__ACCELERATE__}.}
 
 Looking at the top of
 @file{/Library/Frameworks/R.framework/Resources/etc/Makeconf}
 will show the compilers and configuration options used for the
-@acronym{CRAN} binary package for @R{}: at the time of writing
+@acronym{CRAN} binary package for @R{}: at the time of writing the
+non-default options
 @example
---enable-memory-profiling
+--enable-memory-profiling --enable-R-framework
 @end example
 @noindent
-was used for `Mavericks'.
+were used.
 
 Configure option @option{--with-internal-tzcode} is the default on OS X,
 as the system implementation of time zones does not work correctly for
@@ -4845,10 +4860,8 @@
 and may need to re-install XQuartz and Java (this has been needed for
 some upgrades but not others).
 
- @menu
-* Mavericks and later::         
-* Lion and Mountain Lion::      
-* Snow Leopard::                
+
+@menu
 * El Capitan::                  
 * Tcl/Tk headers and libraries::  
 * Java (OS X)::                 
@@ -4856,113 +4869,9 @@
 * Building R.app::              
 @end menu
 
-@node Mavericks and later, Lion and Mountain Lion, OS X, OS X
-@subsection Mavericks and later
-
-For these versions Apple makes available compilers based on
-@command{clang}, and C++ headers and runtime are from LLVM's
-@samp{libc++} project, as part of the `Command Line Tools' (sometimes
-called `Command Line Developer Tools') and of Xcode (you only need one
-or the other).
-
-These tools can be (re-)installed by @command{xcode-select --install}.
-(If you have a fresh installation of Mavericks or later, running e.g.@:
-@command{make} in a terminal will offer the installation of the
-command-line tools, or perhaps use the versions from Xcode.  However,
-after an OS update, you are advised to re-install them.)
-
-To use the compilers from the command-line tools with the recommended
-Fortran compiler, have in @file{config.site} something like
-
-@example
-CC=clang
-CXX=clang++
-F77=gfortran-4.8
-FC=$F77
-OBJC=clang
-@end example
-
-More recent and complete distributions of @command{clang} are usually
-available from @uref{http://llvm.org/releases/}.  In particular, these
-include support for the `Address Sanitizer' (not included by Apple until
-Xcode 7) and for OpenMP in versions 3.7.0 and later.
-
-
-See the comments under Mountain Lion about X11 and GTK.
-
-If you upgrade the OS you should re-install any of XQuartz, the `Command
-Line Tools' and Java which you have installed.  (Upgrading may partially
-remove previous versions which can be confusing.)
-
-There are some warnings using the recommended @command{gfortran} build
-under Yosemite.
-
-
-@node Lion and Mountain Lion, Snow Leopard, Mavericks and later, OS X
-@subsection Lion and Mountain Lion
-
-`Command-line Tools for Xcode' used to be part of the Apple Developer
-Tools (`Xcode') but for these versions needs to be installed separately.
-They can be downloaded from
-@uref{http://developer.apple.com/devcenter/mac/} (you will need to
-register there: that allows you to download older versions available for
-your OS) or from within some versions of Xcode you can install the
-command-line tools from the @samp{Downloads} pane in the
-@samp{Preferences}.
-
-The X11 system used with Mountain Lion is XQuartz (see above): Lion
-included an X11 system.
-
-To build the graphics devices depending on cairographics, the XQuartz
-path for @command{pkg-config} files needs to be known to
-@command{pkg-config} when @command{configure} is run: this usually means
-adding it to the @env{PKG_CONFIG_PATH} environment variable, e.g.
-
-@example
-export PKG_CONFIG_PATH= \
-  /opt/X11/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
-@end example
-
-@noindent
-or putting
-@example
-PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
-@end example
-
-@noindent
-in @file{config.site}.
-
-For some pre-compiled software, for example the GTK framework,
-@file{/opt/X11/include} may need to be added to the include paths.
-
-If you install the command-line tools for Xcode 4.6.3 you will get the
-compilers used for the CRAN binary distribution: those for Xcode 5 can
-be installed afterwards.
-
-
-@node Snow Leopard, El Capitan, Lion and Mountain Lion, OS X
-@subsection Snow Leopard
-
-A quirk on Snow Leopard is that the X11 libraries are not in the default
-linking path, so something like @samp{LIBS=-L/usr/X11/lib} may be
-required in @file{config.site}, or you can use the @command{configure}
-options @option{--x-includes=/usr/X11/include
---x-libraries=/usr/X11/lib} .
-
-The @acronym{CRAN} binaries were built using Xcode 4.2, a version
-available only to subscribing developers.  It is believed that 3.2.6 (the
-last public free version for Snow Leopard) will work.
-
-@node El Capitan, Tcl/Tk headers and libraries, Snow Leopard, OS X
+@node El Capitan, Tcl/Tk headers and libraries, OS X, OS X
 @subsection El Capitan
 
-@c Claimed that XQuartz does not install out-of-the-box:
-@c http://forums.macrumors.com/threads/os-x-el-capitan-working-not-working-apps.1890772/
-
-El Capitan was released at the end of September 2015, and experience to
-date is with systems which have been updated from Yosemite or earlier.
-Upgraded systems need the Command Line Tools reinstalled.
-
 There are problems resulting from the new-to-El-Capitan restriction that
 only Apple is allowed to install software under @file{/usr}: this
 affects @emph{inter alia} @code{MacTeX} and @code{XQuartz}.  For
@@ -4982,15 +4891,6 @@
 although the linked versions under @file{/usr/X11} will be found (if the
 link is present).
 
-@c It may be necessary for a clean installation for @code{XQuartz} to
-@c replace @file{/usr/X11} by @file{/opt/X11} in file
-@c @file{/usr/local/lib/tkConfig.sh}, and to use
-@c @command{install_name_tool} to adjust
-@c @file{/usr/local/lib/libtk8.6.dylib} to link to libraries under
-@c @file{/opt/X11} rather than @file{/usr/X11}.  Updated installations seem
-@c to preserve @file{/usr/X11}, but there are packages assuming
-@c @file{/usr/X11R6}, a link that no longer exists.
-
 @node Tcl/Tk headers and libraries, Java (OS X), El Capitan, OS X
 @subsection Tcl/Tk headers and libraries
 
@@ -5007,17 +4907,16 @@
 --with-tcl-config=/usr/local/lib/tclConfig.sh 
 --with-tk-config=/usr/local/lib/tkConfig.sh
 @end example
-Note that this requires a fully-updated X11 installation (XQuartz for
-Mountain Lion and later).
+Note that this requires a matching XQuartz installation.
 
 There is also a native (`Aqua') version of Tcl/Tk which produces widgets
 in the native OS X style: this will not work with @Rapp{} because of
 conflicts over the OS X menu, but for those only using command-line @R{}
 this provides a much more intuitive interface to Tk for experienced Mac
 users.  Most versions of OS X come with Aqua Tcl/Tk libraries, but these
-are not recent versions of Tcl/Tk (8.5.9 in Mountain Lion and later).
-It is better to install Tcl/Tk 8.6.x from the sources or a binary
-distribution from
+are not at all recent versions of Tcl/Tk (8.5.9 in El Capitan, which is
+not even the latest patched version in that series).  It is better to
+install Tcl/Tk 8.6.x from the sources or a binary distribution from
 @uref{https://www.activestate.com/activetcl/downloads}.  Configure @R{}
 with
 @example
@@ -5042,10 +4941,9 @@
 The situation with Java support on OS X is messy.@footnote{For more
 details see @uref{http://www.macstrategy.com/article.php?3}.}
 
-Snow Leopard and Lion shipped with a Java 6 runtime (JRE).  Mountain
-Lion and later do not come with an installed JRE, and an OS X upgrade
-removes one if already installed: it is intended to be installed at
-first use.  Check if a JRE is installed by running @command{java
+OS X no longer comes with an installed Java runtime (JRE), and an OS X
+upgrade removes one if already installed: it is intended to be installed
+at first use.  Check if a JRE is installed by running @command{java
 -version} in a @command{Terminal} window: if Java is not installed this
 should prompt you to install it.  You can also install directly the
 latest Java from Oracle (currently from
@@ -5079,7 +4977,7 @@
 @noindent
 The Oracle JDK can be specified explicitly by something like
 @example
-JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_51.jdk/Contents/Home
+JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_72.jdk/Contents/Home
 JAVA_CPPFLAGS="-I/$@{JAVA_HOME@}/include -I/$@{JAVA_HOME@}/include/darwin"
 JAVA_LD_LIBRARY_PATH="$@{JAVA_HOME@}/jre/lib/server"
 JAVA_LIBS="-L/$@{JAVA_HOME@}/jre/lib/server -ljvm" 
@@ -5094,14 +4992,14 @@
 @subsection Frameworks
 
 The @acronym{CRAN} build of @R{} is installed as a framework, which is
-selected by the default option
+selected by the option
 
 @example
 ./configure --enable-R-framework
 @end example
 
 (This is intended to be used with an Apple toolchain: other compilers may
-not support frameworks correctly.)
+not support frameworks correctly. It was the default prior to @R{} 3.3.0.)
 
 It is only needed if you want to build @R{} for use with the @Rapp{}
 console, and implies @option{--enable-R-shlib} to build @R{} as a
@@ -5109,7 +5007,8 @@
 as a framework called @file{R.framework}.  The default installation path
 for @file{R.framework} is @file{/Library/Frameworks} but this can be
 changed at configure time by specifying the flag
-@option{--enable-R-framework[=@var{DIR}]} or at install time as
+@option{--enable-R-framework[=@var{DIR}]} (or @option{--prefix}) or at
+install time @emph{via}
 
 @example
 make prefix=/where/you/want/R.framework/to/go install
@@ -5174,9 +5073,7 @@
 A large selection of Open Source software can be installed from
 @uref{https://www.opencsw.org}, by default installed under
 @file{/opt/csw}.  Solaris 10 ships with @code{bzlib} version 1.0.6
-(sufficient for the default @option{--with-system-bzlib}) but
-@code{zlib} version 1.2.3 (too old for @option{--with-system-zlib}):
-OpenCSW has 1.2.8.
+(sufficient) but @code{zlib} version 1.2.3 (too old): OpenCSW has 1.2.8.
 
 You will need @acronym{GNU} @code{libiconv} and @code{readline}: the
 Solaris version of @code{iconv} is not sufficiently powerful.
@@ -5420,7 +5317,7 @@
 @end example
 
 @noindent
-(@code{-L/opt/csw/lib} is needed since TeXLive was built using
+(@code{-L/opt/csw/lib} is needed since TeX Live was built using
 32-bit @code{gcc}, and we need @file{/opt/csw/lib} in
 @code{R_LD_LIBRARY_PATH}.)
 
@@ -5585,7 +5482,7 @@
 environment can be found in the ``R on AIX'' project on R-Forge
 (@uref{https://R-Forge.R-project.org/@/projects/@/aix/}).
 
-@node FreeBSD, Cygwin, AIX, Platform notes
+@node FreeBSD, OpenBSD, AIX, Platform notes
 @section FreeBSD
 @cindex FreeBSD
 
@@ -5595,17 +5492,10 @@
 @R{} 3.0.2 at the time of writing.  Davor Cubranic reported some success
 on x86_64 FreeBSD 10.2 for @R{} 3.2.2.
 
-It appears that versions of FreeBSD using @command{clang} as the compiler
-(the default as from 10.0) need
-@example
-MAIN_LDFLAGS=-Wl,--export-dynamic
-@end example
-@noindent
-for @R{} releases up to 3.2.2.
-
 Use of ICU for collation and the @command{configure} option
 @option{--with-internal-tzcode} are desirable workarounds.
 
+@node OpenBSD, Cygwin, FreeBSD, Platform notes
 @section OpenBSD
 @cindex OpenBSD
 
@@ -5614,60 +5504,14 @@
 (and patches applied) are at
 @uref{http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/math/R/}.
 
-@node Cygwin, New platforms, FreeBSD, Platform notes
+@node Cygwin, New platforms, OpenBSD, Platform notes
 @section Cygwin
 
-The Cygwin emulation layer on Windows can be treated as a Unix-alike OS.
-This is unsupported, but experiments have been conducted and a few
-workarounds added.  Cygwin has not been tested for @R{} 3.0.0 or later.
-
-The 64-bit version is completely unsupported.  The 32-bit version has
-never worked well enough to pass @R{}'s @command{make check}.
-
-@R{} requires C99 complex type support, which is available as from
-Cygwin 1.7.8 (March 2011).  However, the (then) implementation of
-@code{cacos} gave incorrect results, so we undefine @code{HAVE_CACOS}
-in @file{src/main/complex.c} on that platform.  It has been reported
-that some C99 long double mathematical functions are missing, so
-configuring with @option{--disable-long-double} was required.
-
-Only building as a shared library can possibly work,@footnote{Windows
-DLLs need to have all links resolved at build time and so cannot resolve
-against @file{R.bin}.} so use e.g.@:
-
-@example
-./configure --disable-nls --enable-R-shlib FLIBS=-lgfortran
-make
-@end example
-
-@noindent
-Enabling NLS does work if required, although adding
-@option{--with-included-gettext} is preferable.  You will see many
-warnings about the use of auto-import.  Setting @samp{FLIBS} explicitly
-seems needed currently as the auto-detection gives an incorrect value.
-
-You will need the @pkg{tetex-extra} Cygwin package to build
-@file{NEWS.pdf} and the vignettes.
-
-Note that this gives you a command-line application using @code{readline}
-for command editing.  The @samp{X11} graphics device will work if a
-suitable X server is running, and the standard Unix-alike ways of
-installing source packages work.  There was a bug in the
-@file{/usr/lib/tkConfig.sh} script in the version we looked at, which
-needs to have
-
-@example
-TK_LIB_SPEC='-ltk84'
-@end example
-
-The overhead of using shell scripts makes this noticeably slower than a
-native build of @R{} on Windows.
-
-Even when @R{} could be built, not all the tests passed: there were
-incorrect results from wide-character regular expressions code and from
-sourcing CR-delimited files.
+The 32-bit version has never worked well enough to pass @R{}'s
+@command{make check}, and residual support from earlier experiments was
+removed in @R{} 3.3.0.
 
-Do not use Cygwin's BLAS library: it is known to give incorrect results.
+The 64-bit version is completely unsupported.
 
 @node New platforms,  , Cygwin, Platform notes
 @section New platforms
@@ -5754,10 +5598,10 @@
 the @R{} mailing lists unless you have followed all the prescriptions.}
 
 We have collected most of the necessary tools (unfortunately not all,
-due to license or size limitations) into an executable installer
-named@footnote{for @R{} 3.0.0 and later.}  @file{Rtools31.exe},
-available from @uref{https://CRAN.R-project.org/@/bin/@/windows/@/Rtools/}. You
-should download and run it, choosing the default ``Package authoring
+due to license or size limitations) into an executable installer named
+@file{Rtools*.exe}, available from
+@uref{https://CRAN.R-project.org/@/bin/@/windows/@/Rtools/}. You should
+download and run it, choosing the default ``Package authoring
 installation'' to build add-on packages, or the ``full installation'' if
 you intend to build @R{}.
 
@@ -5846,7 +5690,7 @@
 The @file{Rtools*.exe} installer does @emph{not} include any version of
 @LaTeX{}.
 
-It is also possible to use the TeXLive distribution from
+It is also possible to use the TeX Live distribution from
 @uref{https://www.tug.org/texlive/}.
 
 @enindex R_RD4PDF
@@ -5930,7 +5774,7 @@
 Technically you need more than just a compiler so the set of tools is
 referred to as a `toolchain'.
 
-The preferred toolchain is part of @code{Rtools31.exe}: this uses a beta
+The preferred toolchain is part of @code{Rtools*.exe}: this uses a beta
 version of @command{gcc 4.6.3} and version 2.0.1 of the MinGW-w64
 project's runtime.
 
@@ -5973,7 +5817,7 @@
 
 There is a version of the @command{file} command that identifies the
 type of files, and is used by @command{Rcmd check} if available.  The
-binary distribution is included in @file{Rtools31.exe}.
+binary distribution is included in @file{Rtools*.exe}.
 
 The file @file{xzutils.zip} contains the program @command{xz} which can
 be used to (de)compress files with that form of compression.
diff -Nru r-base-3.2.3/doc/manual/R-data.texi r-base-3.3.1/doc/manual/R-data.texi
--- r-base-3.2.3/doc/manual/R-data.texi	2015-07-31 22:15:15.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-data.texi	2016-03-16 23:04:43.000000000 +0000
@@ -138,13 +138,13 @@
 There are packages to allow functionality developed in languages such as
 @code{Java}, @code{perl} and @code{python} to be directly integrated
 with @R{} code, making the use of facilities in these languages even
-more appropriate.  (See the @CRANpkg{rJava} package from @acronym{CRAN} and
-the @pkg{SJava}, @pkg{RSPerl} and @pkg{RSPython} packages from the
-Omegahat project, @uref{http://www.omegahat.org}.)
+more appropriate.  (See the @CRANpkg{rJava} package from @acronym{CRAN}
+and the @pkg{SJava}, @pkg{RSPerl} and @pkg{RSPython} packages from the
+Omegahat project, @uref{http://www.omegahat.net}.)
 
 
 @cindex Unix tools
-@cindex AWK
+@cindex awk
 @cindex perl
 It is also worth remembering that @R{} like @Sl{} comes from the Unix
 tradition of small re-usable tools, and it can be rewarding to use tools
@@ -184,10 +184,11 @@
 possible, and @ref{Importing from other statistical systems} discusses
 what facilities are available to access such files directly from @R{}.
 For Excel spreadsheets, the available methods are summarized in
-@ref{Reading Excel spreadsheets}.  For ODS spreadsheets from Open
-Office, see the Omegahat package@footnote{Currently not available from
-that repository but as a source package for download from
-@url{http://www.omegahat.org/ROpenOffice/}.} @pkg{ROpenOffice}.
+@ref{Reading Excel spreadsheets}.  
+@c For ODS spreadsheets from Open
+@c Office, see the Omegahat package@footnote{Currently not available from
+@c that repository but as a source package for download from
+@c @url{http://www.omegahat.net/ROpenOffice/}.} @pkg{ROpenOffice}.
 
 In a few cases, data have been stored in a binary form for compactness
 and speed of access.  One application of this that we have seen several
@@ -435,12 +436,12 @@
 although it does not require it.
 
 The @CRANpkg{XML} package provides general facilities for reading and
-writing @acronym{XML} documents within @R{}.  A description of the
-facilities of the @CRANpkg{XML} package is outside the scope of this
-document: see the package's Web page at
-@uref{http://www.omegahat.org/RSXML} for details and examples.  Package
-@CRANpkg{StatDataML} on @acronym{CRAN} is one example building on
-@CRANpkg{XML}.
+writing @acronym{XML} documents within @R{}. 
+@c A description of the facilities of the @CRANpkg{XML} package is outside
+@c the scope of this document: see the package's Web page at
+@c @uref{http://www.omegahat.net/RSXML} for details and examples.
+Package @CRANpkg{StatDataML} on @acronym{CRAN} is one example building
+on @CRANpkg{XML}.
 
 NB: @CRANpkg{XML} is available as a binary package for Windows, normally
 from the `CRAN extras' repository (which is selected by default on
diff -Nru r-base-3.2.3/doc/manual/R-defs.texi r-base-3.3.1/doc/manual/R-defs.texi
--- r-base-3.2.3/doc/manual/R-defs.texi	2015-08-25 22:19:14.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-defs.texi	2016-02-14 23:15:05.000000000 +0000
@@ -44,7 +44,7 @@
 
 @c -- edit these here alone -- in order keep consistency
 @macro Rcopyright{year}
-Copyright @copyright{} \year\--2015 R Core Team
+Copyright @copyright{} \year\--2016 R Core Team
 @end macro
 
 @macro permission{}
diff -Nru r-base-3.2.3/doc/manual/resources.texi r-base-3.3.1/doc/manual/resources.texi
--- r-base-3.2.3/doc/manual/resources.texi	2015-07-31 22:15:15.000000000 +0000
+++ r-base-3.3.1/doc/manual/resources.texi	2016-03-16 23:04:43.000000000 +0000
@@ -24,7 +24,7 @@
 @lowersections
 @html
 <h1>Other Resources
-<img class="toplogo" src="logo.jpg" alt="[R logo]">
+<img class="toplogo" src="Rlogo.svg" alt="[R logo]">
 </h1>
 <hr width="100%">
 @end html
diff -Nru r-base-3.2.3/doc/manual/R-exts.texi r-base-3.3.1/doc/manual/R-exts.texi
--- r-base-3.2.3/doc/manual/R-exts.texi	2015-12-03 23:15:23.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-exts.texi	2016-04-17 22:15:04.000000000 +0000
@@ -270,11 +270,11 @@
 @cindex configure file
 @cindex cleanup file
 
-The optional files @file{configure} and @file{cleanup} are (Bourne
-shell) script files which are, respectively, executed before and
-(provided that option @option{--clean} was given) after installation on
-Unix-alikes, see @ref{Configure and cleanup}.  The analogues on Windows
-are @file{configure.win} and @file{cleanup.win}.
+The optional files @file{configure} and @file{cleanup} are (Bourne)
+shell scripts which are, respectively, executed before and (if option
+@option{--clean} was given) after installation on Unix-alikes, see
+@ref{Configure and cleanup}.  The analogues on Windows are
+@file{configure.win} and @file{cleanup.win}.
 
 For the conventions for files @file{NEWS} and @file{ChangeLog} in the
 @acronym{GNU} project see
@@ -624,7 +624,7 @@
 One can add subject classifications for the content of the package using
 the fields @samp{Classification/ACM} or @samp{Classification/ACM-2012}
 (using the Computing Classification System of the Association for
-Computing Machinery, @uref{http://www.acm.org/class/}; the former refers
+Computing Machinery, @uref{http://www.acm.org/about/class/}; the former refers
 to the 1998 version), @samp{Classification/JEL} (the Journal of Economic
 Literature Classification System,
 @uref{https://www.aeaweb.org/@/econlit/@/jelCodes.php}, or
@@ -648,15 +648,20 @@
 codes.
 
 @c DESCRIPTION field RdMacros
-As of @R{} 3.2.0, an @samp{RdMacros} field can be used to hold a
-comma-separated list of packages from which the current package will import
-Rd macro definitions.  These will be imported after the system macros,
-in the order listed in the @samp{RdMacros} field, before any macro
-definitions in the current package are loaded.  Macro definitions in
-individual @file{.Rd} files in the @file{man} directory are loaded
-last, and are local to later parts of that file.  In case of any
-duplicates, the last loaded definition will be used@footnote{Duplicate
-definitions may trigger a warning:  see @ref{User-defined macros}.}
+An @samp{RdMacros} field can be used to hold a comma-separated list of
+packages from which the current package will import @file{Rd} macro
+definitions.  These will be imported after the system macros, in the
+order listed in the @samp{RdMacros} field, before any macro definitions
+in the current package are loaded.  Macro definitions in individual
+@file{.Rd} files in the @file{man} directory are loaded last, and are
+local to later parts of that file.  In case of duplicates, the last
+loaded definition will be used@footnote{Duplicate definitions may
+trigger a warning: see @ref{User-defined macros}.}  Both @command{R CMD
+Rd2pdf} and @command{R CMD Rdconv} have an optional flag
+@option{--RdMacros=pkglist}.  The option is also a comma-separated list
+of package names, and has priority over the value given in
+@file{DESCRIPTION}.  Packages using @file{Rd} macros should depend on
+@R{} 3.2.0 or later.
 
 @c DESCRIPTION field Built
 @c DESCRIPTION field Packaged
@@ -1008,6 +1013,12 @@
 give an error if the suggested package is not available, simply use
 e.g.@: @code{rgl::plot3d}.
 
+Note that the recommendation to use suggested packages conditionally in
+tests does also apply to packages used to manage test suites: a
+notorious example was @pkg{testthat} which in version 1.0.0 contained
+illegal C++ code and hence could not be installed on standards-compliant
+platforms.
+
 As noted above, packages in @samp{Enhances} @emph{must} be used
 conditionally and hence objects within them should always be accessed
 @emph{via} @code{::}.
@@ -1487,7 +1498,13 @@
 comments later on about the Windows port of @R{}.
 
 If your package needs some system-dependent configuration before
-installation you can include an executable (Bourne shell) script
+installation you can include an executable (Bourne@footnote{The script
+should only assume a POSIX-compliant @command{/bin/sh} -- see
+@uref{http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html}.
+In particular @command{bash} extensions must not be used, and not all
+@R{} platforms have a @command{bash} command, let alone one at
+@file{/bin/bash}.  All known shells used with @R{} support the use of
+backticks, but not all support @samp{$(@var{cmd})}.}) shell script
 @file{configure} in your package which (if present) is executed by
 @code{R CMD INSTALL} before any other action is performed.  This can be
 a script created by the Autoconf mechanism, but may also be a script
@@ -1670,8 +1687,7 @@
 variable, but that the secondary object is automatically resolved.
 Another example is when a package installs support files that are
 required at run time, and their location is substituted into an @R{}
-data structure at installation time. (This happens with the Java Archive
-files in the Omegahat @pkg{SJava} package.)
+data structure at installation time.
 @vindex R_LIBRARY_DIR
 @vindex R_PACKAGE_DIR
 @vindex R_PACKAGE_NAME
@@ -1816,8 +1832,10 @@
 library also contains LAPACK.
 
 [@code{libRlapack} includes all the double-precision LAPACK routines
-current in 2003: a list of which routines are included is in file
-@file{src/modules/lapack/README}.]
+which were current in 2003: a list of which routines are included is in
+file @file{src/modules/lapack/README}. Note that an external LAPACK/BLAS
+library need not do so, as some were `deprecated' (and not compiled by
+default) in LAPACK 3.6.0 in late 2015.]
 
 For portability, the macros @code{BLAS_LIBS} and @code{FLIBS} should
 always be included @emph{after} @code{LAPACK_LIBS} (and in that order).
@@ -1894,14 +1912,21 @@
 $(SHLIB): mylibs
 
 mylibs:
-	(cd subdir; make)
+	(cd subdir; $(MAKE))
 @end example
 
 @noindent
-Be careful to create all the necessary dependencies, as there is a no
+Be careful to create all the necessary dependencies, as there is no
 guarantee that the dependencies of @code{all} will be run in a
 particular order (and some of the @acronym{CRAN} build machines use
-multiple CPUs and parallel makes).
+multiple CPUs and parallel makes).  In particular,
+
+@example
+all: mylibs
+@end example
+
+@noindent
+does @strong{not} suffice.
 
 Note that on Windows it is required that @file{Makevars[.win]} does
 create a DLL: this is needed as it is the only reliable way to ensure
@@ -2015,9 +2040,12 @@
 Include the appropriate macro in @code{PKG_CFLAGS}, @code{PKG_CPPFLAGS}
 and so on, and also in @code{PKG_LIBS}.  C/C++ code that needs to be
 conditioned on the use of OpenMP can be used inside @code{#ifdef
-_OPENMP}: note that some toolchains used for @R{} (including most of
-those using @command{clang}@footnote{Some builds of @command{clang} 3.7
-have support for OpenMP 3.1}) have no OpenMP support at all, not even
+_OPENMP}: note that some toolchains used for @R{} (including many of
+those using @command{clang}@footnote{Some builds of @command{clang}
+3.7.0 have support for OpenMP 3.1 (this is built by default as from
+3.8.0), but even if the compiler has, the @code{libomp} library may not
+be installed.  At the time of writing Apple builds of @command{clang}
+for OS X had no support.})  have no OpenMP support at all, not even
 @file{omp.h}.
 
 For example, a package with C code written for OpenMP should have in
@@ -2128,17 +2156,17 @@
 POSIX threads are not normally used on Windows, which has its own native
 concepts of threads.  However, there are two projects implementing
 @code{pthreads} on top of Windows, @code{pthreads-w32} and
-@code{winpthreads} (a recent part of the MinGW-w64 project).
+@code{winpthreads} (part of the MinGW-w64 project).
 
 Whether Windows toolchains implement @code{pthreads} is up to the
-toolchain provider: the currently recommended toolchain does by default
-provide it.  A @command{make} variable @code{SHLIB_PTHREAD_FLAGS} is
-available: this should be included in both @code{PKG_CPPFLAGS} (or the
-Fortran or F9x equivalents) and @code{PKG_LIBS}.
+toolchain provider.  A @command{make} variable
+@code{SHLIB_PTHREAD_FLAGS} is available: this should be included in both
+@code{PKG_CPPFLAGS} (or the Fortran or F9x equivalents) and
+@code{PKG_LIBS}.
 
 The presence of a working @code{pthreads} implementation cannot be
 unambiguously determined without testing for yourself: however, that
-@samp{_REENTRANT} is defined@footnote{some Windows toolchains have the
+@samp{_REENTRANT} is defined@footnote{some Windows toolchains had the
 typo @samp{_REENTRANCE} instead.} in C/C++ code is a good indication.
 
 See also the comments on thread-safety and performance under OpenMP: on
@@ -2401,11 +2429,21 @@
 considerably from the standard).  Some compilers have a concept of
 `C++03' (`essentially a bug fix') or `C++ Technical Report 1' (TR1), an
 optional addition to the `C++03' revision which was published in 2007.
-A revised standard was published in 2011 and compilers with fairly
+A revised standard was published in 2011 and compilers with pretty much
 complete implementations are becoming available.  C++11 added all of the
 C99 features which are not otherwise implemented in C++, and C++
-compilers commonly accept C99 extensions to C++98. A minor update to
-C++11 (sometimes known as C++14) was approved in August 2014.
+compilers commonly accept C99 extensions to C++98.  A minor update to
+C++11 (often known as C++14) was approved in August 2014.
+
+What standard a C++ compiler aims to support can be hard to determine.
+As from version 6 (to be released in 2016), @command{g++} will default
+to C++14: earlier versions aim to support C++03 with many extensions
+(including support for TR1).  @command{clang} with its
+native@footnote{Some distributions, notably Debian, have supplied a
+build of @command{clang} with @command{g++}'s headers and library.
+Conversely, Apple's command named @command{g++} is based on
+@command{clang} using @code{libcxx}.}  @code{libcxx} headers and library
+includes many C++11 features, and does not support TR1.
 
 Since version 3.1.0, @R{} has provided support for C++11 in packages in
 addition to C++98.  This support is not uniform across platforms as it
@@ -2485,10 +2523,10 @@
 essential that it selects the correct compiler, @emph{via} something like
 
 @example
-CXX1X=`"$@{R_HOME@}/bin/R" CMD config CXX11X`
-CXX1XSTD=`"$@{R_HOME@}/bin/R" CMD config CXX11XSTD`
+CXX1X=`"$@{R_HOME@}/bin/R" CMD config CXX1X`
+CXX1XSTD=`"$@{R_HOME@}/bin/R" CMD config CXX1XSTD`
 CXX="$(CXX1X) $(CXX1XSTD)"
-CXXFLAGS=`"$@{R_HOME@}/bin/R" CMD config CXX11XFLAGS`
+CXXFLAGS=`"$@{R_HOME@}/bin/R" CMD config CXX1XFLAGS`
 AC_LANG(C++)
 @end example
 
@@ -2810,8 +2848,8 @@
 Complete checking of a package which contains a file @file{README.md}
 needs @command{pandoc} installed: see
 @uref{http://johnmacfarlane.net/@/pandoc/@/installing.html}.  This
-should be reasonably current: @acronym{CRAN} used version 1.12.4.1 to
-process these files at the time of writing
+should be reasonably current: at the time of writing @acronym{CRAN} used
+version 1.12.4.2 to process these files.
 
 You do need to ensure that the package is checked in a suitable locale
 if it contains non-@acronym{ASCII} characters.  Such packages are likely
@@ -3449,6 +3487,19 @@
 selectively rather than @code{import} is good practice and recommended
 notably when importing from packages with more than a dozen exports.
 
+To import every symbol from a package but for a few exceptions,
+pass the @code{except} argument to @code{import}. The directive
+
+@example
+import(foo, except=c(bar, baz))
+@end example
+
+@noindent
+imports every symbol from @pkg{foo} except @code{bar} and
+@code{baz}. The value of @code{except} should evaluate to something
+coercible to a character vector, after substituting each symbol for
+its corresponding string.
+
 It is possible to export variables from a namespace which it has
 imported from other namespaces: this has to be done explicitly and not
 @emph{via} @code{exportPattern}.
@@ -3731,11 +3782,6 @@
 @code{F_bkde} and so on, and so avoid clashes with @R{} code in the
 namespace.
 
-
-@c More information about this symbol lookup, along with some approaches
-@c for customizing it, is available from
-@c @uref{http://www.omegahat.org/@/examples/@/RDotCall}.
-
 @node An example, Namespaces with S4 classes and methods, useDynLib, Package namespaces
 @subsection An example
 
@@ -4011,6 +4057,11 @@
 @end example
 
 @noindent
+and ensure that you use the value of environment variable @env{MAKE}
+(and not just @command{make}) in your scripts.  (On some platforms GNU
+make is available under a name such as @command{gmake}, and there
+@code{SystemRequirements} is used to set @env{MAKE}.)
+
 If you only need GNU make for parts of the package which are rarely
 needed (for example to create bibliography files under
 @file{vignettes}), use a file called @file{GNUmakefile} rather than
@@ -4024,13 +4075,13 @@
 expressions in Makefiles (which are passed to the shell for processing).
 Some @R{} platforms use strict@footnote{For example, @command{test}
 options @option{-a} and @option{-e} are not portable, and not supported
-in the AT&T Bourne shell used on Solaris, even though they are in the
-POSIX standard.} Bourne shells: the @R{} toolset on Windows and some
-Unix-alike OSes use @command{ash}
-(@uref{https://en.wikipedia.org/@/wiki/@/Almquist_shell}), a rather
-minimal shell with few builtins.  Beware of assuming that all the POSIX
-command-line utilities are available, especially on Windows where only a
-minimal set is provided for use with @R{}.
+in the AT&T Bourne shell used on Solaris 10/11, even though they are in
+the 2008 POSIX standard.  Nor does Solaris support @samp{$(@var{cmd})}.}
+Bourne shells: the @R{} toolset on Windows and some Unix-alike OSes use
+@command{ash} (@uref{https://en.wikipedia.org/@/wiki/@/Almquist_shell}),
+a rather minimal shell with few builtins.  Beware of assuming that all
+the POSIX command-line utilities are available, especially on Windows
+where only a minimal set is provided for use with @R{}.
 @ifset UseExternalXrefs
 (@xref{The command line tools, , The command line tools,
 R-admin, R Installation and Administration}.)
@@ -4211,15 +4262,20 @@
 The @command{ar} utility is often used in makefiles to make static
 libraries.  Its modifier @code{u} is defined by POSIX but is disabled in
 GNU @command{ar} on some recent Linux distributions which use
-`deterministic mode'.  The safe way to make a static library is to first
+`deterministic mode'.  The safest way to make a static library is to first
 remove any existing file of that name then use @command{ar -cr} and then
 @command{ranlib} if needed (which is system-dependent: on most
 systems@footnote{some versions of OS X did not.} @command{ar} always
-maintains a symbol table).
+maintains a symbol table).  The POSIX standard says options should be
+preceded by a hyphen (as in @option{-cr}), although most OSes accept
+them without.
+@c flowWorkspace failed on OS X in Mar 2016 because a wildcard spec was empty
+Note that on some systems @command{ar -cr} must have at least one file
+specified.
 
 @item
 Some people have a need to set a locale.  Locale names are not portable,
-and e.g.@: @samp{fr_FR.utf8} is common used on Linux but not accepted on
+and e.g.@: @samp{fr_FR.utf8} is commonly used on Linux but not accepted on
 either Solaris or OS X.  @samp{fr_FR.UTF-8} is more portable, being
 accepted on recent Linux, AIX, FreeBSD, OS X and Solaris (at least).
 However, some Linux distributions micro-package, so locales defined by
@@ -4449,6 +4505,15 @@
 @uref{http://en.cppreference.com/w/} and compare what is defined in the
 various standards.
 
+Both the compiler and OS (@emph{via} system header files, which differ
+by architecture even for nominally the same OS) affect the compilability
+of C/C++ code.  Compilers from the GCC, @command{clang}, Intel and
+Solaris Studio suites are routinely used with @R{}, and both
+@command{clang} and Solaris have more than one implementation of C++
+headers and library.  The range of possibilities makes comprehensive
+empirical checking impossible, and regrettably compilers are patchy at
+best on warning about non-standard code.
+
 @itemize
 @item
 Mathematical functions such as @code{sqrt} are defined in C++ for
@@ -4457,13 +4522,21 @@
 and possibly more.  This means that calling @code{sqrt} on an integer
 type may have `overloading ambiguity' as it could be promoted to any of
 the supported floating-point types: this is commonly seen on Solaris,
-but for @code{pow} also seen on OS X.  (C++11 requires additional
-overloads for integer types.)
+but for @code{pow} also seen on OS X.  (C++98 has an overload for
+@code{std::pow(<double>, <int>)}, but this may not be visible from the
+main namespace.  C++11 requires additional overloads for integer types,
+and ambiguous overloads are more common in C++11 (and later) compiler
+modes.)
 
 A not-uncommonly-seen problem is to mistakenly call @code{floor(x/y)} or
 @code{ceil(x/y)} for @code{int} arguments @code{x} and @code{y}.  Since
 @code{x/y} does integer division, the result is an @code{int} and
-`overloading ambiguity' may be reported.
+`overloading ambiguity' may be reported.  Some people have (pointlessly)
+called @code{floor} and @code{ceil} on integer arguments, which may have
+an `overloading ambiguity'.
+
+A surprising common misuse is things like @code{pow(10, -3)}: this
+should be the constant @code{1e-3}.
 
 @item
 Function @code{fabs} is defined only for floating-point types, except in
@@ -4472,7 +4545,7 @@
 @file{<stdlib.h>} for @code{int} and in C++98's @file{<cstdlib>} for
 integer types, overloaded in @file{<cmath>} for floating-point types.
 C++11 has additional overloads for @code{std::abs} in @file{<cmath>} for
-integer types.  The effect of calling @code{abs} for a floating-point
+integer types.  The effect of calling @code{abs} with a floating-point
 type is implementation-specific: it may truncate to an integer.
 
 @item
@@ -4483,11 +4556,23 @@
 currently in use on @R{} platforms: use @R{}'s versions such as
 @code{ISNAN} and @code{R_FINITE} instead.
 
+If you must use them in C++11, beware that some
+compilers@footnote{E.g. @command{gcc 5.3} in C++11 mode.} provide both
+@code{std::isnan} and @code{::isnan}, so using
+
+@example
+using namespace std;
+@end example
+
+@noindent
+may cause `overloading ambiguity' and you must use @code{std::isnan}
+@emph{etc} explicitly.
+
 It is an error (and make little sense, although has been seen) to call
 these functions for integer arguments.
 
 @item
-The GNU compilers have a large number of non-portable extensions.  For
+The GNU compilers support a large number of non-portable extensions.  For
 example, @code{INFINITY} (which is in C99 but not C++98), for which @R{}
 provides the portable @code{R_PosInf} (and @code{R_NegInf} for
 @code{-INFINITY}).  And @code{NAN} is just one NaN value: in @R{} code
@@ -4499,19 +4584,29 @@
 @uref{https://gcc.gnu.org/@/onlinedocs/@/gcc/@/C_002b_002b-Extensions.html}.
 
 @item
-Including C headers in C++ code is not portable.  Including the C
-header @file{math.h} in C++ code often causes conflicts with
-@file{cmath} which may be included by other headers.  This is
-particularly problematic with C++11 compilers, as functions like
-@code{sqrt} and @code{isnan} are defined for @code{double} arguments in
-@file{math.h} and for a range of types including @code{double} in
-@file{cmath}.
+Including C-style headers in C++ code is not portable.  Including the
+legacy header@footnote{which often is the same as the header included by
+the C compiler, but some compilers have wrappers for some of the C
+headers.} @file{math.h} in C++ code may conflict with @file{cmath} which
+may be included by other headers.  This is particularly problematic with
+C++11 compilers, as functions like @code{sqrt} and @code{isnan} are
+defined for @code{double} arguments in @file{math.h} and for a range of
+types including @code{double} in @file{cmath}.  Similar issues have been
+seen for @file{stdlib.h} and @file{cstdlib}.  Historically, including
+the C++ version first was a sufficient workaround but for some 2016
+compilers only one can be included.
 
 @item
 Variable-length arrays are C99, not supported by C++98 nor by the C++
 compilers in use with @R{} on some platforms.
 
 @item
+The @code{restrict} qualifier is C99/C11 but not part of C++11 and not
+supported by some C++ compilers used with @R{}.
+@c but package treatSens attempted to use it.
+@c http://stackoverflow.com/questions/6434549/does-c11-add-the-c99-restrict-specifier-if-not-why-not
+
+@item
 Be careful to include the headers which define the functions you use.
 Some compilers/OSes include other system headers in their headers which
 are not required by the standards, and so code may compile on such
@@ -4519,7 +4614,11 @@
 @code{<random>} which is indirectly included by @code{<algorithm>} by
 @command{g++}.  Another frequent issue is the C header @code{<time.h>}
 which is included by other headers on Linux and Windows but not OS X nor
-Solaris.)
+Solaris.)  Another common issue is that @code{malloc}, @code{calloc},
+@code{realloc} and @code{free} are defined by C99 in the header
+@file{stdlib.h} and (in the @code{std::} namespace) by C++ header
+@file{cstdlib}.  Some earlier implementations used a header
+@file{malloc.h}, but that is not portable and does not exist on OS X.
 
 @item
 For C++ code, be careful to specify namespaces where needed.  Many
@@ -4542,7 +4641,9 @@
 as @code{CS}, @code{DS}, @code{ES}, @code{FS}, @code{GS} and @code{SS}
 (and more with longer abbreviations) defined on i586/x64 Solaris in
 @file{<sys/regset.h>} and often included indirectly by @file{<stdlib.h>}
-and other core headers.
+and other core headers.  Further examples are @code{ERR}, @code{zero}
+and @code{I} (which is defined in Solaris' @file{<complex.h>} as a
+compiler intrinsic for the imaginary unit).
 
 @item
 @code{typedef}s in OS headers can conflict with those in the package: an
@@ -5446,18 +5547,18 @@
 
 Finally, there is @code{\donttest}, used (at the beginning of a separate
 line) to mark code that should be run by @code{example()} but not by
-@code{R CMD check} (by default: as from @R{} 3.2.0 the option
-@option{--run-donttest} can be used).  This should be needed only
-occasionally but can be used for code which might fail in circumstances
-that are hard to test for, for example in some locales.  (Use
-e.g. @code{capabilities()} or @code{nzchar(Sys.which("someprogram"))} to
-test for features needed in the examples wherever possible, and you can
-also use @code{try()} or @code{tryCatch()}.  Use @code{interactive()} to
-condition examples which need someone to interact with.)  Note that code
-included in @code{\donttest} must be correct @R{} code, and any packages
-used should be declared in the @file{DESCRIPTION} file.  It is good
-practice to include a comment in the @code{\donttest} section explaining
-why it is needed.
+@code{R CMD check} (by default: the option @option{--run-donttest} can
+be used).  This should be needed only occasionally but can be used for
+code which might fail in circumstances that are hard to test for, for
+example in some locales.  (Use e.g. @code{capabilities()} or
+@code{nzchar(Sys.which("someprogram"))} to test for features needed in
+the examples wherever possible, and you can also use @code{try()} or
+@code{tryCatch()}.  Use @code{interactive()} to condition examples which
+need someone to interact with.)  Note that code included in
+@code{\donttest} must be correct @R{} code, and any packages used should
+be declared in the @file{DESCRIPTION} file.  It is good practice to
+include a comment in the @code{\donttest} section explaining why it is
+needed.
 
 @findex \keyword
 @item \keyword@{@var{key}@}
@@ -6035,8 +6136,8 @@
 expert form), the following could be used:
 
 @example
-\if@{html@}@{\figure@{logo.jpg@}@{Our logo@}@}
-\if@{latex@}@{\figure@{logo.jpg@}@{options: width=0.5in@}@}
+\if@{html@}@{\figure@{Rlogo.svg@}@{options: width=100 alt="R logo"@}@}
+\if@{latex@}@{\figure@{Rlogo.pdf@}@{options: width=0.5in@}@}
 @end example
 
 The files containing the figures should be stored in the directory
@@ -7748,13 +7849,11 @@
 @command{AddressSanitizer} (`ASan') is a tool with similar aims to the
 memory checker in @command{valgrind}.  It is available with suitable
 builds@footnote{currently only on @cputype{ix86}/@cputype{x86_64} Linux
-and OS X (including the builds in Xcode 7 beta but not earlier Apple
-releases).  On some platforms, e.g.@: Fedora, the runtime library,
-@pkg{libasan}, needs to be installed separately. OS X users can install
-a suitable @command{clang} from the sources,
-@url{http://llvm.org/releases/} or possibly distributions such as
-MacPorts or Homebrew.} of @command{gcc} and @command{clang} on common
-Linux and OS X platforms.  See
+and OS X (including the builds in Xcode 7 but not earlier Apple
+releases).  On some platforms the runtime library, @pkg{libasan}, needs
+to be installed separately, and for checking C++ you may also need
+@pkg{libubsan}.} of @command{gcc} and @command{clang} on common Linux
+and OS X platforms.  See
 @uref{http://clang.llvm.org/@/docs/@/UsersManual.html#controlling-code-generation},
 @uref{http://clang.llvm.org/@/docs/@/AddressSanitizer.html} and
 @uref{https://code.google.com/@/p/@/address-sanitizer/}.
@@ -7809,10 +7908,10 @@
 into the @R{} executable.  However this check can be enabled on a
 per-package basis by using a @file{~/.R/Makevars} file like
 @example
-CC = gcc-4.9 -std=gnu99 -fsanitize=address -fno-omit-frame-pointer
-CXX = g++-4.9 -fsanitize=address -fno-omit-frame-pointer
-F77 = gfortran-4.9 -fsanitize=address
-FC = gfortran-4.9 -fsanitize=address
+CC = gcc -std=gnu99 -fsanitize=address -fno-omit-frame-pointer
+CXX = g++ -fsanitize=address -fno-omit-frame-pointer
+F77 = gfortran -fsanitize=address
+FC = gfortran -fsanitize=address
 @end example
 (Note that @code{-fsanitize=address} has to be part of the compiler
 specification to ensure it is used for linking.  These settings will not
@@ -7895,14 +7994,15 @@
 might be @code{NA_INTEGER}.
 
 `UBSanitizer' is a tool for C/C++ source code selected by
-@option{-fsanitize=undefined} in suitable builds of @command{clang}, and
-GCC as from 4.9.0.  Its (main) runtime library is linked into each
-package's DLL, so it is less often needed to be included in
-@env{MAIN_LDFLAGS}.
+@option{-fsanitize=undefined} in suitable builds@footnote{On some
+platforms the runtime library, @pkg{libubsan}, needs to be installed
+separately.} of @command{clang} and GCC.  Its (main) runtime library is
+linked into each package's DLL, so it is less often needed to be
+included in @env{MAIN_LDFLAGS}.
 
 Some versions have greatly increased compilation times on a few
 files@footnote{e.g.@: @file{src/main/dotcode.c} and parts of the
-@pkg{Matrix} sources with @command{clang} 3.7.0).}.
+@pkg{Matrix} sources with @command{clang} 3.7.0 amd later.}.
 
 This sanitizer can be combined with the Address Sanitizer by
 @option{-fsanitize=undefined,address} (where both are supported).
@@ -7950,15 +8050,20 @@
 could try building @R{} with something like
 @example
 MAIN_LD="clang++ -fsanitize=undefined"
+@end example
+@noindent
+and perhaps for @command{clang} 3.7.x
+@example
 R_OPENMP_CFLAGS="-fopenmp=libomp"
 @end example
+@noindent
 or add @code{-lclang_rt.asan_cxx-x86_64}@footnote{This includes the C++
 UBSAN handlers, despite its name.} or similar to @code{LD_FLAGS}).
 
 See @uref{https://gcc.gnu.org/@/onlinedocs/@/gcc/@/Debugging-Options.html} (or
 the manual for your version of GCC, installed or @emph{via}
 @uref{https://gcc.gnu.org/@/onlinedocs/}) for the options supported by
-GCC: 5.2.0 supports
+GCC: 5.3 supports
 @example
 -fsanitize=alignment,bool,bounds,enum,float-cast-overflow,
 integer-divide-by-zero,non-null-attribute,null,object-size,
@@ -7976,6 +8081,13 @@
 and @code{vptr} checks produced many warnings on GCC's own C++ headers,
 so should be disabled.
 
+GCC 6 will add
+@example
+-fsanitize=bounds-strict
+@end example
+@noindent
+an extension of @code{bounds} to `flexible array member-like arrays'.
+
 
 Other useful flags include
 @example
@@ -8873,14 +8985,6 @@
 		as.integer(m), as.integer(n))$p
 @end example
 
-
-@c These tools are not currently operational.
-@c Additionally, there are (experimental) tools that can be used to
-@c automate the generation of the code to register the routines for a
-@c collection of C files. See the @code{GccTranslationUnit} module on the
-@c Omegahat Web site at @uref{http://www.omegahat.org/GccTranslationUnit/}
-@c for more information.
-
 @menu
 * Speed considerations::        
 * Linking to native routines in other packages::  
@@ -9242,13 +9346,29 @@
 contained calls to C++ I/O upset @R{}'s own C I/O (for example by
 resetting buffers on open files).
 
-Most @R{} header files can be included within C++ programs, and they
+Most @R{} header files can be included within C++ programs but they
 should @strong{not} be included within an @code{extern "C"} block (as
-they include C++ system headers).  It may not be possible to include
-some @R{} headers as they in turn include C header files that may cause
-conflicts---if this happens, define @samp{NO_C_HEADERS} before including
-the @R{} headers, and include C++ versions (such as @samp{cmath}) of the
-appropriate headers yourself before the @R{} headers.
+they include system headers@footnote{Even including C system headers in
+such a block has caused compilation errors.}).  It may not be possible
+to include some @R{} headers as they in turn include system header files
+that may cause conflicts---if this happens, try defining
+@samp{NO_C_HEADERS} before including the @R{} headers, and include C++
+versions (such as @samp{cmath} and @samp{cstdlib}) of the appropriate
+headers yourself before the @R{} headers. (Headers @file{R.h} and
+@file{Rmath.h} support @samp{NO_C_HEADERS}: the legacy header @file{S.h}
+does not.  Header @file{Rinternals.h} does as from @R{} 3.3.0.)
+
+By default header @file{Rmath.h} includes @file{math.h} or @file{cmath}.
+Header @file{R.h} includes
+
+@example
+limits.h math.h stddef.h stdio.h stdlib.h string.h
+@end example
+
+@noindent
+or their C++ equivalents directly or indirectly, and either
+@file{stddef.h} or @file{cstddef} needs to be included before @file{R.h}
+if @samp{NO_C_HEADERS} is defined.
 
 @node Fortran I/O, Linking to other packages, Interfacing C++ code, System and foreign language interfaces
 @section Fortran I/O
@@ -9505,7 +9625,8 @@
 a set of functions and macros defined in the header file
 @file{Rinternals.h} or some @Sl{}-compatibility macros@footnote{That is,
 similar to those defined in @Sl{} version 4 from the 1990s: these are
-not kept up to date and are not recommended for new projects.} defined
+not kept up to date and are not recommended for new projects.  Prior to
+@R{} 3.3.0 it was not compatible with defining @code{R_NO_REMAP}.} defined
 in @file{Rdefines.h}.  See @ref{Interface functions .Call and .External}
 for details on @code{.Call} and @code{.External}.
 
@@ -11245,8 +11366,9 @@
 that your code compiles without @samp{USE_RINTERNALS} defined, as this
 provides a stricter test that the accessors have been used correctly.
 Note too that the use of @samp{USE_RINTERNALS} when the header is
-included in C++ code is not supported: doing so uses C99 features which
-are not necessarily in C++.
+included in C++ code is not supported: doing so may use C99 features
+which are not necessarily supported by the C++ compiler.  Nor is use
+with @file{Rdefines.h} supported.
 
 @node Character encoding issues,  , Vector accessor functions, System and foreign language interfaces
 @section Character encoding issues
@@ -11361,19 +11483,8 @@
 there that can be included too, but many of the features they contain
 should be regarded as undocumented and unstable.
 
-An alternative is to include the header file @file{S.h}, which may be
-useful when porting code from @Sl{}.  This includes rather less than
-@file{R.h}, and has some extra compatibility definitions (for example
-the @code{S_complex} type from @Sl{}).
-
-The defines used for compatibility with @Sl{} sometimes causes
-conflicts (notably with Windows headers), and the known
-problematic defines can be removed by defining @code{STRICT_R_HEADERS}.
-
 Most of these header files, including all those included by @file{R.h},
-can be used from C++ code.  Some others need to be included within an
-@code{extern "C"} declaration, and for clarity this is advisable for all
-@R{} header files.
+can be used from C++ code.
 
 @quotation Note
 Because @R{} re-maps many of its external names to avoid clashes with
@@ -12125,26 +12236,35 @@
 
 This might be provided by your platform@footnote{It is an optional C11
 extension.}, in which case it is not included in @file{Rmath.h}, but is
-in @file{math.h} which @file{Rmath.h} includes.
+in @file{math.h} which @file{Rmath.h} includes.  (Ensure that
+neither @file{math.h} nor @file{cmath} is included before
+@file{Rmath.h} or define
+@example
+#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+@end example
+@noindent
+before the first inclusion.)
 @end deftypefun
 
 @deftypefun double sinpi (double @var{x})
 Computes @code{sin(pi * x)} accurately, notably for (half) integer @var{x}.
 
-This might be provided by your platform, in which case it is not included
-in @file{Rmath.h}, but is in @file{math.h} which @file{Rmath.h} includes.
+This might be provided by your platform, in which case it is not
+included in @file{Rmath.h}, but is in @file{math.h} which @file{Rmath.h}
+includes (but see the comments for @code{cospi}).
 @end deftypefun
 
 @deftypefun double tanpi (double @var{x})
 Computes @code{tan(pi * x)} accurately, notably for (half) integer @var{x}.
 
 This might be provided by your platform, in which case it is not included
-in @file{Rmath.h}, but is in @file{math.h} which @file{Rmath.h} includes.
+in @file{Rmath.h}, but is in @file{math.h} which @file{Rmath.h} includes
+(but see the comments for @code{cospi}).
 @end deftypefun
 
 @deftypefun double logspace_add (double @var{logx}, double @var{logy})
 @deftypefunx double logspace_sub (double @var{logx}, double @var{logy})
-@deftypefunx double logspace_sum (double* @var{logx}, int @var{n})
+@deftypefunx double logspace_sum (const double* @var{logx}, int @var{n})
 Compute the log of a sum or difference from logs of terms, i.e., ``x +
 y'' as @code{log (exp(@var{logx}) + exp(@var{logy}))} and ``x - y'' as
 @code{log (exp(@var{logx}) - exp(@var{logy}))},
@@ -12434,16 +12554,21 @@
 The following is declared in header file @file{Rinternals.h}.
 
 @deftypefun void  R_orderVector (int* @var{indx}, int @var{n}, SEXP @var{arglist}, Rboolean @var{nalast}, Rboolean @var{decreasing})
+@deftypefunx void R_orderVector1 (int* @var{indx}, int @var{n}, SEXP @var{x}, Rboolean @var{nalast}, Rboolean @var{decreasing})
 
-This corresponds to @R{}'s @code{order(..., na.last, decreasing)}.
+@code{R_orderVector()} corresponds to @R{}'s @code{order(..., na.last, decreasing)}.
 More specifically, @code{indx <- order(x, y, na.last, decreasing)} corresponds to
 @code{R_orderVector(indx, n, Rf_lang2(x, y), nalast, decreasing)} and for
 three vectors, @code{Rf_lang3(x,y,z)} is used as @var{arglist}.
 
-Note that  @code{R_orderVector()} assumes the vector @code{indx}
-to be allocated to length @eqn{\ge n, >= n}.  On return, @code{indx[]}
-contains a permutation of @code{0:(n-1)}, i.e., 0-based C indices (and not
-1-based @R{} indices, as @R{}'s @code{order()}).
+Both @code{R_orderVector} and @code{R_orderVector1} assume the vector
+@code{indx} to be allocated to length @eqn{\ge n, >= n}.  On return,
+@code{indx[]} contains a permutation of @code{0:(n-1)}, i.e., 0-based C
+indices (and not 1-based @R{} indices, as @R{}'s @code{order()}).
+
+When ordering only one vector, @code{R_orderVector1} is faster and
+corresponds (but is 0-based) to @R{}'s @code{indx <- order(x, na.last,
+decreasing)}.  It was added in @R{} 3.3.0.
 @end deftypefun
 
 All other sort routines are declared in header file
@@ -12513,6 +12638,7 @@
 @end deftypefun
 
 @deftypefun int findInterval (double* @var{xt}, int @var{n}, double @var{x}, Rboolean @var{rightmost_closed}, Rboolean @var{all_inside}, int @var{ilo}, int* @var{mflag})
+@deftypefunx int findInterval2(double* @var{xt}, int @var{n}, double @var{x}, Rboolean @var{rightmost_closed}, Rboolean @var{all_inside}, Rboolean @var{left_open}, int @var{ilo}, int* @var{mflag})
 Given the ordered vector @var{xt} of length @var{n}, return the interval
 or index of @var{x} in @code{@var{xt}[]}, typically max(@math{i}; @eqn{1
 \le i \le @var{n}, 1 <= i <= @var{n}} & @math{@var{xt}[i]} @eqn{\le, <=}
@@ -12528,6 +12654,12 @@
 result of @code{findInterval()} and @var{x} is a value of a sequence which
 is increasing or decreasing for subsequent calls.
 
+@code{findInterval2()} is a generalization of @code{findInterval()},
+with an extra @code{Rboolean} argument @var{left_open}.  Setting
+@code{left_open = TRUE} basically replaces all left-closed right-open
+intervals @eqn{[s, t)} by left-open ones @eqn{(s, t]}, see the help page
+of @R{} function @code{findInterval} for details.
+
 There is also an @code{F77_CALL(interv)()} version of
 @code{findInterval()} with the same arguments, but all pointers.
 @end deftypefun
@@ -12639,12 +12771,8 @@
 The macro @code{WORDS_BIGENDIAN} is defined on
 big-endian@footnote{@uref{https://en.wikipedia.org/@/wiki/@/Endianness}.}
 systems (e.g.@: most OSes on Sparc and PowerPC hardware) and not on
-little-endian systems (such as @code{i686} and @code{x86_64} on all
-OSes, and Linux on Alpha and Itanium).  It can be useful when
-manipulating binary files.  The macro @code{SUPPORT_OPENMP} is defined
-on suitable systems and can be used in conjunction with the
-@code{SUPPORT_OPENMP_*} macros in packages that want to make use of
-OpenMP.
+little-endian systems (nowadays all the commoner @R{} platforms).  It
+can be useful when manipulating binary files.
 
 Header file @file{Rversion.h} (@strong{not} included by @file{R.h})
 defines a macro @code{R_VERSION} giving the version number encoded as an
@@ -12667,8 +12795,8 @@
 version includes the patchlevel (as in @samp{2.2}).
 
 Packages which use @code{alloca} need to ensure it is defined: as it is
-neither C99 nor POSIX there is no standard way to do so.  As from @R{}
-3.2.2 one can use
+part of neither C nor POSIX there is no standard way to do so.  As
+from @R{} 3.2.2 one can use
 
 @example
 #include <Rconfig.h> // for HAVE_ALLOCA_H
@@ -12692,11 +12820,11 @@
 @section Inlining C functions
 @findex R_INLINE
 
-The C99 keyword @code{inline} should be recognized by all compilers now
-used to build @R{}.  Portable code which might be used with earlier
-versions of @R{} can be written using the macro @code{R_INLINE} (defined
-in file @file{Rconfig.h} included by @file{R.h}), as for example from
-package @CRANpkg{cluster}
+The C99 keyword @code{inline} should be recognized by all compilers
+nowadays used to build @R{}.  Portable code which might be used with
+earlier versions of @R{} can be written using the macro @code{R_INLINE}
+(defined in file @file{Rconfig.h} included by @file{R.h}), as for
+example from package @CRANpkg{cluster}
 
 @example
 #include <R.h>
@@ -13722,9 +13850,9 @@
 Recent versions have usage restrictions.
 
 @item
-Another (D)COM server, @code{RDCOMServer}, is available from
-@uref{http://www.omegahat.org/}.  Its philosophy is discussed in
-@uref{http://www.omegahat.org/@/RDCOMServer/@/Docs/@/Paradigm.html} and is
+Another (D)COM server, @code{RDCOMServer}, may be available from Omegahat,
+@uref{http://www.omegahat.net/}.  Its philosophy is discussed in
+@uref{http://www.omegahat.net/@/RDCOMServer/@/Docs/@/Paradigm.html} and is
 very different from the purpose of this section.
 @end itemize
 @node Calling R.dll directly, Finding R_HOME, Using (D)COM, Embedding R under Windows
diff -Nru r-base-3.2.3/doc/manual/R-FAQ.texi r-base-3.3.1/doc/manual/R-FAQ.texi
--- r-base-3.2.3/doc/manual/R-FAQ.texi	2015-12-04 23:15:10.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-FAQ.texi	2016-06-14 22:15:06.000000000 +0000
@@ -4,14 +4,9 @@
 @setfilename R-FAQ.info
 @settitle R FAQ
 @setchapternewpage on
-@set FAQ_YEAR 2015
-@set FAQ_DATE @value{FAQ_YEAR}-12-04
-@set REL_YEAR 2015
-@set REL_MAJOR 3
-@set REL_MINOR 2
-@set REL_PATCHLEVEL 3
-@set REL_VERSION @value{REL_MAJOR}.@value{REL_MINOR}.@value{REL_PATCHLEVEL}
-@set FAQ_VERSION @value{REL_MAJOR}.@value{REL_MINOR}.@value{FAQ_DATE}
+@set FAQ_YEAR 2016
+@set FAQ_DATE @value{FAQ_YEAR}-04-24
+@set FAQ_VERSION @value{FAQ_DATE}
 @documentlanguage en
 @documentencoding ISO-8859-1
 @c %**end of header
@@ -177,7 +172,7 @@
 @@Misc@{,
   author        = @{Kurt Hornik@},
   title         = @{@{R@} @{FAQ@}@},
-  year          = @{@value{REL_YEAR}@},
+  year          = @{@value{FAQ_YEAR}@},
   url           = @{https://CRAN.R-project.org/doc/FAQ/R-FAQ.html@}
 @}
 @end group
@@ -315,12 +310,15 @@
 @node What is the current version of R?, How can R be obtained?, What machines does R run on?, R Basics
 @section What is the current version of R?
  
-The current released version is @value{REL_VERSION}.  Based on this
-`major.minor.patchlevel' numbering scheme, there are two development
-versions of R, a patched version of the current release (`r-patched')
-and one working towards the next minor or eventually major (`r-devel')
-releases of R, respectively.  Version r-patched is for bug fixes mostly.
-New features are typically introduced in r-devel.
+R uses a `major.minor.patchlevel' numbering scheme.  Based on this,
+there are the current release version of R (`r-release') as well as two
+development versions of R, a patched version of the current release
+(`r-patched') and one working towards the next minor or eventually major
+(`r-devel') releases of R, respectively.  New features are typically
+introduced in r-devel, while r-patched is for bug fixes mostly.
+
+See @url{https://CRAN.R-project.org/sources.html} for the current
+versions of r-release, r-patched and r-devel.
 
 @node How can R be obtained?, How can R be installed?, What is the current version of R?, R Basics
 @section How can R be obtained?
@@ -475,9 +473,9 @@
 @subsection How can R be installed (Mac)
 
 The @file{bin/macosx} directory of a @CRAN{} site contains a standard
-Apple installer package to run on OS X 10.6 (`Snow Leopard') and later.
+Apple installer package to run on OS X 10.9 (`Mavericks') and later.
 Once downloaded and executed, the installer will install the current
-release of R and an R.app OS X @acronym{GUI}.  This port of R for OS X
+release of R and R.app, the OS X @acronym{GUI}.  This port of R for OS X
 is maintained by @email{Simon.Urbanek@@R-project.org, Simon Urbanek}
 (and previously by Stefano Iacus).  The
 @url{https://CRAN.R-project.org/bin/macosx/RMacOSX-FAQ.html, ``R for Mac
@@ -673,11 +671,14 @@
   author       = @{@{R Core Team@}@},
   organization = @{R Foundation for Statistical Computing@},
   address      = @{Vienna, Austria@},
-  year         = @value{REL_YEAR},
+  year         = @var{YEAR},
   url          = @{https://www.R-project.org@}
 @}
 @end group
 @end example
+@noindent
+where @var{YEAR} is the release year of the version of R used and can
+determined as @code{R.version$year}.
 
 Citation strings (or Bib@TeX{} entries) for R and R packages can also be
 obtained by @code{citation()}.
@@ -793,6 +794,9 @@
 documentation on R, existing mailing lists and the R Bug Tracking
 system.
 
+Since March 2016, ``old'' material is made available from a central
+@CRAN{} archive server (@url{https://CRAN-archive.R-project.org/}).
+
 Please always use the @acronym{URL} of the master site when referring to
 @CRAN{}.
 
@@ -1573,8 +1577,8 @@
 permissions.  David's paper ``CGIwithR: Facilities for Processing Web
 Forms Using R'' was published in the Journal of Statistical Software
 (@url{http://www.jstatsoft.org/v08/i10/}).  The package is now
-maintained by @email{duncan@@wald.ucdavis.edu, Duncan Temple Lang} and
-has a web page at @url{http://www.omegahat.org/CGIwithR/}.
+maintained by @email{duncan@@wald.ucdavis.edu, Duncan Temple Lang}.
+and has a web page at @url{http://www.omegahat.net/CGIwithR/}.
 
 @c See <https://code.google.com/p/rpad/>
 @c Link to web page <http://www.rpad.org/> no longer works.
@@ -1799,12 +1803,12 @@
 @node Add-on packages from Omegahat, Add-on packages from Bioconductor, Add-on packages from CRAN, Which add-on packages exist for R?
 @subsection Add-on packages from Omegahat
 
-The @url{http://www.omegahat.org/, Omega Project for Statistical
+The @url{http://www.omegahat.net/, Omega Project for Statistical
 Computing} provides a variety of open-source software for statistical
 applications, with special emphasis on web-based software, Java, the
 Java virtual machine, and distributed computing.  A @acronym{CRAN} style
-R package repository is available via @url{http://www.omegahat.org/R/}.
-See @url{http://www.omegahat.org/} for information on most R packages
+R package repository is available via @url{http://www.omegahat.net/R/}.
+See @url{http://www.omegahat.net/} for information on most R packages
 available from the Omega project.
 
 @node Add-on packages from Bioconductor, Other add-on packages, Add-on packages from Omegahat, Which add-on packages exist for R?
@@ -2207,6 +2211,7 @@
 * Why does summary() report strange results for the R^2 estimate when I fit a linear model with no intercept?::
 * Why is R apparently not releasing memory?::
 * How can I enable secure https downloads in R?::
+* How can I get CRAN package binaries for outdated versions of R?::
 @end menu
 
 @c @node Why does R run out of memory?, Why does sourcing a correct file fail?, R Miscellanea, R Miscellanea
@@ -3352,7 +3357,7 @@
 query the allocator about the layout of the allocations, including the
 actually used memory as well as unused memory that cannot be released.
 
-@node How can I enable secure https downloads in R?,  , Why is R apparently not releasing memory?, R Miscellanea
+@node How can I enable secure https downloads in R?, How can I get CRAN package binaries for outdated versions of R?, Why is R apparently not releasing memory?, R Miscellanea
 @section How can I enable secure https downloads in R?
 
 @c This should be re-phrased for 3.3.0.
@@ -3372,8 +3377,10 @@
 The requisite code to add to @file{.Rprofile} or @file{Rprofile.site} is:
 
 @example
-options(download.file.method = "wininet", url.method = "wininet")     @r{(Windows)}
-options(download.file.method = "libcurl", url.method = "libcurl")     @r{(Linux and OS X)}
+options(download.file.method = "wininet", url.method = "wininet")
+@r{(Windows)}
+options(download.file.method = "libcurl", url.method = "libcurl")
+@r{(Linux and OS X)}
 @end example
 
 @noindent
@@ -3388,6 +3395,22 @@
 @code{"libcurl"} with @acronym{HTTPS} support is required except on
 Windows.
 
+@node How can I get CRAN package binaries for outdated versions of R?,  , How can I enable secure https downloads in R?, R Miscellanea
+@section How can I get CRAN package binaries for outdated versions of R?
+
+Since March 2016, Windows and OS X binaries of @CRAN{} packages for old
+versions of R (released more than 5 years ago) are made available from a
+central @CRAN{} archive server instead of the @CRAN{} mirrors.  To get
+these, one should set the @CRAN{} ``mirror'' element of the @code{repos}
+option accordingly, by something like
+@example
+local(@{r <- getOption("repos")
+       r["CRAN"] <- "http://CRAN-archive.R-project.org"
+       options(repos = r)
+      @})
+@end example
+@noindent
+(see @code{?options} for more information).
 
 @node R Programming, R Bugs, R Miscellanea, Top
 @chapter R Programming
diff -Nru r-base-3.2.3/doc/manual/R-intro.texi r-base-3.3.1/doc/manual/R-intro.texi
--- r-base-3.2.3/doc/manual/R-intro.texi	2015-12-03 23:15:23.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-intro.texi	2016-06-09 22:15:05.000000000 +0000
@@ -6504,8 +6504,8 @@
 packages) are distributed with every binary distribution of @R{}.  Most
 are available for download from @acronym{CRAN}
 (@uref{https://CRAN.R-project.org/} and its mirrors) and other
-repositories such as Bioconductor (@uref{https://www.bioconductor.org/})
-and Omegahat (@uref{http://www.omegahat.org/}).  The @emph{R FAQ}
+repositories such as Bioconductor (@uref{https://www.bioconductor.org/}).
+and Omegahat (@uref{http://www.omegahat.net/}).  The @emph{R FAQ}
 contains a list of CRAN packages current at the time of release, but the
 collection of available packages changes very frequently.
 
@@ -7536,9 +7536,12 @@
 file @file{README.Rterm} for command-line editing under
 @code{Rterm.exe}.
 
-When using @R{} with @strong{readline} capabilities, the functions
-described below are available, as well as others (probably) documented
-in @command{man readline} or @command{info readline} on your system.
+When using @R{} with GNU@footnote{It is possible to build @R{} using an
+emulation of GNU @strong{readline}, such as one based on NetBSD's
+@strong{editline}, it which case only a subset of the capabilities may
+be provided.} @strong{readline} capabilities, the functions described
+below are available, as well as others (probably) documented in
+@command{man readline} or @command{info readline} on your system.
 
 Many of these use either Control or Meta characters.  Control
 characters, such as @kbd{Control-m}, are obtained by holding the
@@ -7554,6 +7557,10 @@
 allowed on terminals with real Meta keys.  Note that case is significant
 for Meta characters.
 
+Some but not all versions@footnote{In particular, not versions 6.3 or
+later: this is worked around as from @R{} 3.4.0.} of @strong{readline}
+will recognize resizing of the terminal window so this is best avoided.
+
 @appendixsection Editing actions
 
 The @R{} program keeps a history of the command lines you type,
@@ -7583,7 +7590,8 @@
 @item C-n
 Go to the next command (forwards in the history).
 @item C-r @var{text}
-Find the last command with the @var{text} string in it.
+Find the last command with the @var{text} string in it.  This can be
+cancelled by @code{C-g} (and on some versions of @R{} by @code{C-c}).
 @end table
 
 On most terminals, you can also use the up and down arrow keys instead
diff -Nru r-base-3.2.3/doc/manual/R-ints.texi r-base-3.3.1/doc/manual/R-ints.texi
--- r-base-3.2.3/doc/manual/R-ints.texi	2015-11-27 23:15:10.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-ints.texi	2016-05-19 22:15:05.000000000 +0000
@@ -540,7 +540,7 @@
 There are additional places that `variables' can be looked up, called
 `user databases' in comments in the code.  These seem undocumented in
 the @R{} sources, but apparently refer to the @pkg{RObjectTable} package
-at @uref{http://www.omegahat.org/RObjectTables/}.
+at @uref{http://www.omegahat.net/RObjectTables/}.
 
 @cindex base environment
 @cindex environment, base
@@ -611,7 +611,7 @@
 @cindex namespace
 Namespaces are environments associated with packages (and once again
 the base package is special and will be considered separately).  A
-package @code{@var{pkg}} with a namespace defines two environments
+package @code{@var{pkg}} defines two environments
 @code{namespace:@var{pkg}} and @code{package:@var{pkg}}: it is
 @code{package:@var{pkg}} that can be @code{attach}ed and form part of
 the search path.
@@ -1428,20 +1428,20 @@
 @node S4 methods, Mechanics of S4 dispatch, S4 classes, S4 objects
 @subsection S4 methods
 
-Details of methods are stored in S4 objects of class
-@code{"MethodsList"}.  They have a non-syntactic name of the form
-@code{.__M__@var{generic}:@var{package}} for all methods defined in the
-current environment for the named generic derived from a specific
-package (which might be @code{.GlobalEnv}).
-
-There is also environment @code{.__T__@var{generic}:@var{package}} which
-has names the signatures of the methods defined, and values the
-corresponding method functions.  This is often referred to as a `methods
-table'.
-
-When a package without a namespace is attached these objects become
-visible on the search path.  @code{library} calls
-@code{methods:::cacheMetaData} to update the internal tables.
+Details of the methods are stored in environments (typically hidden in the
+respective namespace) with a non-syntactic name of the form
+@code{.__T__@var{generic}:@var{package}} containing objects of class
+@code{MethodDefinition} for all methods defined in the current environment
+for the named generic derived from a specific package (which might be @code{.GlobalEnv}).
+This is sometimes referred to as a `methods table'.
+
+For example,
+@example
+ length(nM <- asNamespace("Matrix") )                    # 941 for Matrix 1.2-6
+ length(meth <- grep("^[.]__T__", names(nM), value=TRUE))# 107 generics with methods
+ length(meth.Ops <- nM$`.__T__Ops:base`) # 71 methods for the 'Ops' (group)generic
+ head(sort(names(meth.Ops))) ## "abIndex#abIndex" ... "ANY#ddiMatrix" "ANY#ldiMatrix" "ANY#Matrix"
+@end example
 
 During an @R{} session there is an environment associated with each
 non-primitive generic containing objects @code{.AllMTable},
@@ -1456,8 +1456,8 @@
 the namespace for a specified generic: the code also adds to the list
 of generics any that are exported directly.  For generics which are
 listed via @code{exportMethods} or exported themselves, the
-corresponding @code{"MethodsList"} and environment are exported and so
-will appear (as hidden objects) in the package environment.
+corresponding environment is exported and so
+will appear (as hidden object) in the package environment.
 
 Methods for primitives which are internally S4 generic (see below) are
 always exported, whether mentioned in the @file{NAMESPACE} file or not.
@@ -1471,7 +1471,7 @@
 generic could be imported from several different packages, the methods
 tables are merged.
 
-When a package with a namespace is attached
+When a package is attached
 @code{methods:::cacheMetaData} is called to update the internal tables:
 only the visible methods will be cached.
 
@@ -1495,7 +1495,7 @@
 paths, and which will be called depends on which search path is in use.
 This is starkest for functions in the base namespace, where the
 original will be found ahead of the newly created function from any
-other package with a namespace.
+other package.
 
 Primitive functions are treated quite differently, for efficiency
 reasons: this results in different semantics.  @code{setGeneric} is
@@ -3855,8 +3855,8 @@
 Default: -1.
 @item _R_CHECK_XREFS_REPOSITORIES_
 If set to a non-empty value, a space-separated list of repositories to
-use to determine known packages.  Default: empty, when the CRAN,
-Omegahat and Bioconductor repositories known to @R{} is used.
+use to determine known packages.  Default: empty, when the CRAN
+and Bioconductor repositories known to @R{} is used.
 @item _R_CHECK_SRC_MINUS_W_IMPLICIT_
 Control whether installation output is checked for compilation warnings
 about implicit function declarations (as spotted by GCC with command
@@ -3920,17 +3920,19 @@
 Default: false (but true for CRAN submission checks).
 @item _R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_
 By default the output from running the @R{} code in the vignettes is
-kept only if there is an error.
+kept only if there is an error.  As from @R{} 3.2.4 this also applies to
+the @file{build_vignettes.log} log from the re-building of vignettes.
 Default: false.
 @item _R_CHECK_CLEAN_VIGN_TEST_
-Should the @file{vign_test} directory be removed if the test is successful?
+Should the @file{vign_test} directory be removed if the test is
+successful?
 Default: true.
 @item _R_CHECK_REPLACING_IMPORTS_
 Should warnings about replacing imports be reported?  These sometimes come
 from auto-generated @file{NAMESPACE} files in other packages, but most
 often from importing the whole of a namespace rather than using
 @code{importFrom}.
-Default: false (but true for CRAN submission checks).
+Default: true.
 @item _R_CHECK_UNSAFE_CALLS_
 Check for calls that appear to tamper with (or allow tampering with)
 already loaded code not from the current package: such calls may well
@@ -4070,6 +4072,11 @@
 suggests and enhances.
 Default: true (and true for CRAN submission checks).
 
+@item _R_CHECK_CODE_USAGE_WITH_ONLY_BASE_ATTACHED_
+If set, check code usage (via @CRANpkg{codetools}) with only the base
+package attached.
+Default: true.
+
 @item _R_CHECK_EXIT_ON_FIRST_ERROR_
 If set to a true value, the check will exit on the first error.
 Default: false.
diff -Nru r-base-3.2.3/doc/manual/R-lang.texi r-base-3.3.1/doc/manual/R-lang.texi
--- r-base-3.2.3/doc/manual/R-lang.texi	2015-08-25 22:19:14.000000000 +0000
+++ r-base-3.3.1/doc/manual/R-lang.texi	2016-02-26 23:15:07.000000000 +0000
@@ -1360,10 +1360,8 @@
 looping.@footnote{Looping is the repeated evaluation of a statement or
 block of statements.}  They are @code{for}, @code{while} and
 @code{repeat}.  The two built-in constructs, @code{next} and
-@code{break}, provide additional control over the evaluation.  Each of
-the three statements returns the value of the last statement that was
-evaluated.  It is possible, although uncommon, to assign the result of
-one of these statements to a symbol.  @R{} provides other functions for
+@code{break}, provide additional control over the evaluation. 
+@R{} provides other functions for
 implicit looping such as @code{tapply}, @code{apply}, and @code{lapply}.
 In addition many operations, especially arithmetic ones, are vectorized
 so you may not need to use a loop.
diff -Nru r-base-3.2.3/doc/manual/rw-FAQ.texi r-base-3.3.1/doc/manual/rw-FAQ.texi
--- r-base-3.2.3/doc/manual/rw-FAQ.texi	2015-08-13 22:15:11.000000000 +0000
+++ r-base-3.3.1/doc/manual/rw-FAQ.texi	2016-06-09 22:15:05.000000000 +0000
@@ -536,9 +536,11 @@
 @node Does R support automation?, The Internet download functions fail., Does R use the Registry?, Installation and Usage
 @section Does R support automation (OLE, COM)?
 
-Directly, no.  See packages such as @code{RDCOMClient} from
-@uref{http://www.omegahat.org/} and the non-Free project at
-@uref{http://www.statconn.com/}.
+Directly, no.  See packages such as @code{RDCOMClient} from Omegahat
+(source and binary packages available from
+@uref{https://www.stats.ox.ac.uk/pub/RWin/})
+@c @uref{http://www.omegahat.net/} 
+and the non-Free project at @uref{http://www.statconn.com/}.
 
 @node The Internet download functions fail., Entering certain characters crashes Rgui., Does R support automation?, Installation and Usage
 @section The Internet download functions fail.
@@ -1196,7 +1198,7 @@
 
 For package @code{tcltk} to work (try @code{demo(tkdensity)} or
 @code{demo(tkttest)} after @code{library(tcltk)}) you need to have Tcl/Tk
-installed.  This part of the R installation, so it should be there.
+installed.  This is part of the R installation, so it should be there.
 
 However, if you have the environment variable @env{MY_TCLTK} set to a
 non-empty value, it is assumed that you want to use a different Tcl/Tk
diff -Nru r-base-3.2.3/doc/NEWS r-base-3.3.1/doc/NEWS
--- r-base-3.2.3/doc/NEWS	2015-12-10 08:06:20.000000000 +0000
+++ r-base-3.3.1/doc/NEWS	2016-06-21 07:13:46.000000000 +0000
@@ -1,5 +1,731 @@
 R News
 
+CHANGES IN R 3.3.1:
+
+  BUG FIXES:
+
+    * R CMD INSTALL and hence install.packages() gave an internal error
+      installing a package called description from a tarball on a
+      case-insensitive file system.
+
+    * match(x, t) (and hence x %in% t) failed when x was of length one,
+      and either character and x and t only differed in their Encoding
+      or when x and t where complex with NAs or NaNs.  (PR#16885.)
+
+    * unloadNamespace(ns) also works again when ns is a 'namespace', as
+      from getNamespace().
+
+    * rgamma(1,Inf) or rgamma(1, 0,0) no longer give NaN but the
+      correct limit.
+
+    * length(baseenv()) is correct now.
+
+    * pretty(d, ..) for date-time d rarely failed when "halfmonth" time
+      steps were tried (PR#16923) and on 'inaccurate' platforms such as
+      32-bit windows or a configuration with --disable-long-double; see
+      comment #15 of PR#16761.
+
+    * In text.default(x, y, labels), the rarely(?) used default for
+      labels is now correct also for the case of a 2-column matrix x
+      and missing y.
+
+    * as.factor(c(a = 1L)) preserves names() again as in R < 3.1.0.
+
+    * strtrim(""[0], 0[0]) now works.
+
+    * Use of Ctrl-C to terminate a reverse incremental search started
+      by Ctrl-R in the readline-based Unix terminal interface is now
+      supported for readline >= 6.3 (Ctrl-G always worked).  (PR#16603)
+
+    * diff(<difftime>) now keeps the "units" attribute, as subtraction
+      already did, PR#16940.
+
+CHANGES IN R 3.3.0:
+
+  SIGNIFICANT USER-VISIBLE CHANGES:
+
+    * nchar(x, *)'s argument keepNA governing how the result for NAs in
+      x is determined, gets a new default keepNA = NA which returns NA
+      where x is NA, except for type = "width" which still returns 2,
+      the formatting / printing width of NA.
+
+    * All builds have support for https: URLs in the default methods
+      for download.file(), url() and code making use of them.
+
+      Unfortunately that cannot guarantee that any particular https:
+      URL can be accessed.  For example, server and client have to
+      successfully negotiate a cryptographic protocol (TLS/SSL, ...)
+      and the server's identity has to be verifiable _via_ the
+      available certificates.  Different access methods may allow
+      different protocols or use private certificate bundles: we
+      encountered a https: CRAN mirror which could be accessed by one
+      browser but not by another nor by download.file() on the same
+      Linux machine.
+
+  NEW FEATURES:
+
+    * The print method for methods() gains a byclass argument.
+
+    * New functions validEnc() and validUTF8() to give access to the
+      validity checks for inputs used by grep() and friends.
+
+    * Experimental new functionality for S3 method checking, notably
+      isS3method().
+
+      Also, the names of the R 'language elements' are exported as
+      character vector tools::langElts.
+
+    * str(x) now displays "Time-Series" also for matrix (multivariate)
+      time-series, i.e. when is.ts(x) is true.
+
+    * (Windows only) The GUI menu item to install local packages now
+      accepts *.tar.gz files as well as *.zip files (but defaults to
+      the latter).
+
+    * New programmeR's utility function chkDots().
+
+    * D() now signals an error when given invalid input, rather than
+      silently returning NA.  (Request of John Nash.)
+
+    * formula objects are slightly more "first class": e.g., formula()
+      or new("formula", y ~ x) are now valid.  Similarly, for "table",
+      "ordered" and "summary.table".  Packages defining S4 classes with
+      the above S3/S4 classes as slots should be reinstalled.
+
+    * New function strrep() for repeating the elements of a character
+      vector.
+
+    * rapply() preserves attributes on the list when how = "replace".
+
+    * New S3 generic function sigma() with methods for extracting the
+      estimated standard deviation aka "residual standard deviation"
+      from a fitted model.
+
+    * news() now displays R and package news files within the HTML help
+      system if it is available.  If no news file is found, a visible
+      NULL is returned to the console.
+
+    * as.raster(x) now also accepts raw arrays x assuming values in
+      0:255.
+
+    * Subscripting of matrix/array objects of type "expression" is now
+      supported.
+
+    * type.convert("i") now returns a factor instead of a complex value
+      with zero real part and missing imaginary part.
+
+    * Graphics devices cairo_pdf() and cairo_ps() now allow non-default
+      values of the cairographics 'fallback resolution' to be set.
+
+      This now defaults to 300 on all platforms: that is the default
+      documented by cairographics, but apparently was not used by all
+      system installations.
+
+    * file() gains an explicit method argument rather than implicitly
+      using getOption("url.method", "default").
+
+    * Thanks to a patch from Tomas Kalibera, x[x != 0] is now typically
+      faster than x[which(x != 0)] (in the case where x has no NAs, the
+      two are equivalent).
+
+    * read.table() now always uses the names for a named colClasses
+      argument (previously names were only used when colClasses was too
+      short). (In part, wish of PR#16478.)
+
+    * (Windows only) download.file() with default method = "auto" and a
+      ftps:// URL chooses "libcurl" if that is available.
+
+    * The out-of-the box Bioconductor mirror has been changed to one
+      using https://: use chooseBioCmirror() to choose a http:// mirror
+      if required.
+
+    * The data frame and formula methods for aggregate() gain a drop
+      argument.
+
+    * available.packages() gains a repos argument.
+
+    * The undocumented switching of methods for url() on https: and
+      ftps: URLs is confined to method = "default" (and documented).
+
+    * smoothScatter() gains a ret.selection argument.
+
+    * qr() no longer has a ... argument to pass additional arguments to
+      methods.
+
+    * [ has a method for class "table".
+
+    * It is now possible (again) to replayPlot() a display list
+      snapshot that was created by recordPlot() in a different R
+      session.
+
+      It is still not a good idea to use snapshots as a persistent
+      storage format for R plots, but it is now not completely silly to
+      use a snapshot as a format for transferring an R plot between two
+      R sessions.
+
+      The underlying changes mean that packages providing graphics
+      devices (e.g., Cairo, RSvgDevice, cairoDevice, tikzDevice) will
+      need to be reinstalled.
+
+      Code for restoring snapshots was contributed by Jeroen Ooms and
+      JJ Allaire.
+
+      Some testing code is available at <URL:
+      https://github.com/pmur002/R-display-list>.
+
+    * tools::undoc(dir = D) and codoc(dir = D) now also work when D is
+      a directory whose normalizePath()ed version does not end in the
+      package name, e.g. from a symlink.
+
+    * abbreviate() has more support for multi-byte character sets - it
+      no longer removes bytes within characters and knows about Latin
+      vowels with accents.  It is still only really suitable for (most)
+      European languages, and still warns on non-ASCII input.
+
+      abbreviate(use.classes = FALSE) is now implemented, and that is
+      more suitable for non-European languages.
+
+    * match(x, table) is faster (sometimes by an order of magnitude)
+      when x is of length one and incomparables is unchanged, thanks to
+      Peter Haverty (PR#16491).
+
+    * More consistent, partly not back-compatible behavior of NA and
+      NaN coercion to complex numbers, operations less often resulting
+      in complex NA (NA_complex_).
+
+    * lengths() considers methods for length and [[ on x, so it should
+      work automatically on any objects for which appropriate methods
+      on those generics are defined.
+
+    * The logic for selecting the default screen device on OS X has
+      been simplified: it is now quartz() if that is available even if
+      environment variable DISPLAY has been set by the user.
+
+      The choice can easily be overridden _via_ environment variable
+      R_INTERACTIVE_DEVICE.
+
+    * On Unix-like platforms which support the getline C library
+      function, system(*,intern = TRUE) no longer truncates (output)
+      lines longer than 8192 characters, thanks to Karl Millar.
+      (PR#16544)
+
+    * rank() gains a ties.method = "last" option, for convenience (and
+      symmetry).
+
+    * regmatches(invert = NA) can now be used to extract both
+      non-matched and matched substrings.
+
+    * data.frame() gains argument fix.empty.names; as.data.frame.list()
+      gets new cut.names, col.names and fix.empty.names.
+
+    * plot(x ~ x, *) now warns that it is the same as plot(x ~ 1, *).
+
+    * recordPlot() has new arguments load and attach to allow package
+      names to be stored as part of a recorded plot.  replayPlot() has
+      new argument reloadPkgs to load/attach any package names that
+      were stored as part of a recorded plot.
+
+    * S4 dispatch works within calls to .Internal(). This means
+      explicit S4 generics are no longer needed for unlist() and
+      as.vector().
+
+    * Only font family names starting with "Hershey" (and not "Her" as
+      before) are given special treatment by the graphics engine.
+
+    * S4 values are automatically coerced to vector (via as.vector)
+      when subassigned into atomic vectors.
+
+    * findInterval() gets a left.open option.
+
+    * The version of LAPACK included in the sources has been updated to
+      3.6.0, including those 'deprecated' routines which were
+      previously included.  _Ca_ 40 double-complex routines have been
+      added at the request of a package maintainer.
+
+      As before, the details of what is included are in
+      src/modules/lapack/README and this now gives information on
+      earlier additions.
+
+    * tapply() has been made considerably more efficient without
+      changing functionality, thanks to proposals from Peter Haverty
+      and Suharto Anggono.  (PR#16640)
+
+    * match.arg(arg) (the one-argument case) is faster; so is
+      sort.int().  (PR#16640)
+
+    * The format method for object_size objects now also accepts
+      "binary" units such as "KiB" and e.g., "Tb".  (Partly from
+      PR#16649.)
+
+    * Profiling now records calls of the form foo::bar and some similar
+      cases directly rather than as calls to <Anonymous>.  Contributed
+      by Winston Chang.
+
+    * New string utilities startsWith(x, prefix) and endsWith(x,
+      suffix).  Also provide speedups for some grepl("^...",*) uses
+      (related to proposals in PR#16490).
+
+    * Reference class finalizers run at exit, as well as on garbage
+      collection.
+
+    * Avoid parallel dependency on stats for port choice and random
+      number seeds.  (PR#16668)
+
+    * The radix sort algorithm and implementation from data.table
+      (forder) replaces the previous radix (counting) sort and adds a
+      new method for order().  Contributed by Matt Dowle and Arun
+      Srinivasan, the new algorithm supports logical, integer (even
+      with large values), real, and character vectors.  It outperforms
+      all other methods, but there are some caveats (see ?sort).
+
+    * The order() function gains a method argument for choosing between
+      "shell" and "radix".
+
+    * New function grouping() returns a permutation that stably
+      rearranges data so that identical values are adjacent.  The
+      return value includes extra partitioning information on the
+      groups.  The implementation came included with the new radix
+      sort.
+
+    * rhyper(nn, m, n, k) no longer returns NA when one of the three
+      parameters exceeds the maximal integer.
+
+    * switch() now warns when no alternatives are provided.
+
+    * parallel::detectCores() now has default logical = TRUE on all
+      platforms - as this was the default on Windows, this change only
+      affects Sparc Solaris.
+
+      Option logical = FALSE is now supported on Linux and recent
+      versions of OS X (for the latter, thanks to a suggestion of Kyaw
+      Sint).
+
+    * hist() for "Date" or "POSIXt" objects would sometimes give
+      misleading labels on the breaks, as they were set to the day
+      before the start of the period being displayed.  The display
+      format has been changed, and the shift of the start day has been
+      made conditional on right = TRUE (the default).  (PR#16679)
+
+    * R now uses a new version of the logo (donated to the R Foundation
+      by RStudio).  It is defined in .svg format, so will resize
+      without unnecessary degradation when displayed on HTML
+      pages-there is also a vector PDF version.  Thanks to Dirk
+      Eddelbuettel for producing the corresponding X11 icon.
+
+    * New function .traceback() returns the stack trace which
+      traceback() prints.
+
+    * lengths() dispatches internally.
+
+    * dotchart() gains a pt.cex argument to control the size of points
+      separately from the size of plot labels.  Thanks to Michael
+      Friendly and Milan Bouchet-Valat for ideas and patches.
+
+    * as.roman(ch) now correctly deals with more diverse character
+      vectors ch; also arithmetic with the resulting roman numbers
+      works in more cases.  (PR#16779)
+
+    * prcomp() gains a new option rank. allowing to directly aim for
+      less than min(n,p) PC's.  The summary() and its print() method
+      have been amended, notably for this case.
+
+    * gzcon() gains a new option text, which marks the connection as
+      text-oriented (so e.g. pushBack() works).  It is still always
+      opened in binary mode.
+
+    * The import() namespace directive now accepts an argument except
+      which names symbols to exclude from the imports. The except
+      expression should evaluate to a character vector (after
+      substituting symbols for strings). See Writing R Extensions.
+
+    * New convenience function Rcmd() in package tools for invoking R
+      CMD tools from within R.
+
+    * New functions makevars_user() and makevars_site() in package
+      tools to determine the location of the user and site specific
+      Makevars files for customizing package compilation.
+
+  UTILITIES:
+
+    * R CMD check has a new option --ignore-vignettes for use with
+      non-Sweave vignettes whose VignetteBuilder package is not
+      available.
+
+    * R CMD check now by default checks code usage (_via_ codetools)
+      with only the base package attached.  Functions from default
+      packages other than base which are used in the package code but
+      not imported are reported as undefined globals, with a suggested
+      addition to the NAMESPACE file.
+
+    * R CMD check --as-cran now also checks DOIs in package CITATION
+      and Rd files.
+
+    * R CMD Rdconv and R CMD Rd2pdf each have a new option
+      --RdMacros=pkglist which allows Rd macros to be specified before
+      processing.
+
+  DEPRECATED AND DEFUNCT:
+
+    * The previously included versions of zlib, bzip2, xz and PCRE have
+      been removed, so suitable external (usually system) versions are
+      required (see the 'R Installation and Administration' manual).
+
+    * The unexported and undocumented Windows-only devices cairo_bmp(),
+      cairo_png() and cairo_tiff() have been removed.  (These devices
+      should be used as e.g. bmp(type = "cairo").)
+
+    * (Windows only) Function setInternet2() has no effect and will be
+      removed in due course.  The choice between methods "internal" and
+      "wininet" is now made by the method arguments of url() and
+      download.file() and their defaults can be set _via_ options.  The
+      out-of-the-box default remains "wininet" (as it has been since R
+      3.2.2).
+
+    * [<- with an S4 value into a list currently embeds the S4 object
+      into its own list such that the end result is roughly equivalent
+      to using [[<-.  That behavior is deprecated.  In the future, the
+      S4 value will be coerced to a list with as.list().
+
+    * Package tools' functions package.dependencies(), pkgDepends(),
+      etc are deprecated now, mostly in favor of package_dependencies()
+      which is both more flexible and efficient.
+
+  INSTALLATION and INCLUDED SOFTWARE:
+
+    * Support for very old versions of valgrind (e.g., 3.3.0) has been
+      removed.
+
+    * The included libtool script (generated by configure) has been
+      updated to version 2.4.6 (from 2.2.6a).
+
+    * libcurl version 7.28.0 or later with support for the https
+      protocol is required for installation (except on Windows).
+
+    * BSD networking is now required (except on Windows) and so
+      capabilities("http/ftp") is always true.
+
+    * configure uses pkg-config for PNG, TIFF and JPEG where this is
+      available.  This should work better with multiple installs and
+      with those using static libraries.
+
+    * The minimum supported version of OS X is 10.6 ('Snow Leopard'):
+      even that has been unsupported by Apple since 2012.
+
+    * The configure default on OS X is --disable-R-framework: enable
+      this if you intend to install under /Library/Frameworks and use
+      with R.app.
+
+    * The minimum preferred version of PCRE has since R 3.0.0 been 8.32
+      (released in Nov 2012).  Versions 8.10 to 8.31 are now deprecated
+      (with warnings from configure), but will still be accepted until
+      R 3.4.0.
+
+    * configure looks for C functions __cospi, __sinpi and __tanpi and
+      uses these if cospi _etc_ are not found.  (OS X is the main
+      instance.)
+
+    * (Windows) R is now built using gcc 4.9.3.  This build will
+      require recompilation of at least those packages that include C++
+      code, and possibly others.  A build of R-devel using the older
+      toolchain will be temporarily available for comparison purposes.
+
+      During the transition, the environment variable R_COMPILED_BY has
+      been defined to indicate which toolchain was used to compile R
+      (and hence, which should be used to compile code in packages).
+      The COMPILED_BY variable described below will be a permanent
+      replacement for this.
+
+    * (Windows) A make and R CMD config variable named COMPILED_BY has
+      been added.  This indicates which toolchain was used to compile R
+      (and hence, which should be used to compile code in packages).
+
+  PACKAGE INSTALLATION:
+
+    * The make macro AWK which used to be made available to files such
+      as src/Makefile is no longer set.
+
+  C-LEVEL FACILITIES:
+
+    * The API call logspace_sum introduced in R 3.2.0 is now remapped
+      as an entry point to Rf_logspace_sum, and its first argument has
+      gained a const qualifier.  (PR#16470)
+
+      Code using it will need to be reinstalled.
+
+      Similarly, entry point log1pexp also defined in Rmath.h is
+      remapped there to Rf_log1pexp
+
+    * R_GE_version has been increased to 11.
+
+    * New API call R_orderVector1, a faster one-argument version of
+      R_orderVector.
+
+    * When R headers such as R.h and Rmath.h are called from C++ code
+      in packages they include the C++ versions of system headers such
+      as <cmath> rather than the legacy headers such as <math.h>.
+      (Headers Rinternals.h and Rinterface.h already did, and inclusion
+      of system headers can still be circumvented by defining
+      NO_C_HEADERS, including as from this version for those two
+      headers.)
+
+      The manual has long said that R headers should *not* be included
+      within an extern "C" block, and almost all the packages affected
+      by this change were doing so.
+
+    * Including header S.h from C++ code would fail on some platforms,
+      and so gives a compilation error on all.
+
+    * The deprecated header Rdefines.h is now compatible with defining
+      R_NO_REMAP.
+
+    * The connections API now includes a function R_GetConnection()
+      which allows packages implementing connections to convert R
+      connection objects to Rconnection handles used in the API. Code
+      which previously used the low-level R-internal getConnection()
+      entry point should switch to the official API.
+
+  BUG FIXES:
+
+    * C-level asChar(x) is fixed for when x is not a vector, and it
+      returns "TRUE"/"FALSE" instead of "T"/"F" for logical vectors.
+
+    * The first arguments of .colSums() etc (with an initial dot) are
+      now named x rather than X (matching colSums()): thus error
+      messages are corrected.
+
+    * A coef() method for class "maov" has been added to allow vcov()
+      to work with multivariate results. (PR#16380)
+
+    * method = "libcurl" connections signal errors rather than
+      retrieving HTTP error pages (where the ISP reports the error).
+
+    * xpdrows.data.frame() was not checking for unique row names; in
+      particular, this affected assignment to non-existing rows via
+      numerical indexing. (PR#16570)
+
+    * tail.matrix() did not work for zero rows matrices, and could
+      produce row "labels" such as "[1e+05,]".
+
+    * Data frames with a column named "stringsAsFactors" now format and
+      print correctly.  (PR#16580)
+
+    * cor() is now guaranteed to return a value with absolute value
+      less than or equal to 1. (PR#16638)
+
+    * Array subsetting now keeps names(dim(.)).
+
+    * Blocking socket connection selection recovers more gracefully on
+      signal interrupts.
+
+    * The data.frame method of rbind() construction row.names works
+      better in borderline integer cases, but may change the names
+      assigned.  (PR#16666)
+
+    * (X11 only) getGraphicsEvent() miscoded buttons and missed mouse
+      motion events.  (PR#16700)
+
+    * methods(round) now also lists round.POSIXt.
+
+    * tar() now works with the default files = NULL.  (PR#16716)
+
+    * Jumps to outer contexts, for example in error recovery, now make
+      intermediate jumps to contexts where on.exit() actions are
+      established instead of trying to run all on.exit() actions before
+      jumping to the final target. This unwinds the stack gradually,
+      releases resources held on the stack, and significantly reduces
+      the chance of a segfault when running out of C stack space. Error
+      handlers established using withCallingHandlers() and
+      options("error") specifications are ignored when handling a C
+      stack overflow error as attempting one of these would trigger a
+      cascade of C stack overflow errors.  (These changes resolve
+      PR#16753.)
+
+    * The spacing could be wrong when printing a complex array.
+      (Report and patch by Lukas Stadler.)
+
+    * pretty(d, n, min.n, *) for date-time objects d works again in
+      border cases with large min.n, returns a labels attribute also
+      for small-range dates and in such cases its returned length is
+      closer to the desired n.  (PR#16761) Additionally, it finally
+      does cover the range of d, as it always claimed.
+
+    * tsp(x) <- NULL did not handle correctly objects inheriting from
+      both "ts" and "mts".  (PR#16769)
+
+    * install.packages() could give false errors when
+      options("pkgType") was "binary".  (Reported by Jose Claudio
+      Faria.)
+
+    * A bug fix in R 3.0.2 fixed problems with locator() in X11, but
+      introduced problems in Windows.  Now both should be fixed.
+      (PR#15700)
+
+    * download.file() with method = "wininet" incorrectly warned of
+      download file length difference when reported length was unknown.
+      (PR#16805)
+
+    * diag(NULL, 1) crashed because of missed type checking.
+      (PR#16853)
+
+CHANGES IN R 3.2.4 patched:
+
+  BUG FIXES:
+
+    * format.POSIXlt() behaved incorrectly in R 3.2.4.  E.g. the output
+      of format(as.POSIXlt(paste0(1940:2000,"-01-01"), tz = "CET"),
+      usetz = TRUE) ended in two "CEST" time formats.
+
+CHANGES IN R 3.2.4:
+
+  NEW FEATURES:
+
+    * install.packages() and related functions now give a more
+      informative warning when an attempt is made to install a base
+      package.
+
+    * summary(x) now prints with less rounding when x contains infinite
+      values. (Request of PR#16620.)
+
+    * provideDimnames() gets an optional unique argument.
+
+    * shQuote() gains type = "cmd2" for quoting in cmd.exe in Windows.
+      (Response to PR#16636.)
+
+    * The data.frame method of rbind() gains an optional argument
+      stringsAsFactors (instead of only depending on
+      getOption("stringsAsFactors")).
+
+    * smooth(x, *) now also works for long vectors.
+
+    * tools::texi2dvi() has a workaround for problems with the texi2dvi
+      script supplied by texinfo 6.1.
+
+      It extracts more error messages from the LaTeX logs when in
+      emulation mode.
+
+  UTILITIES:
+
+    * R CMD check will leave a log file build_vignettes.log from the
+      re-building of vignettes in the .Rcheck directory if there is a
+      problem, and always if environment variable
+      _R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_ is set to a true value.
+
+  DEPRECATED AND DEFUNCT:
+
+    * Use of SUPPORT_OPENMP from header Rconfig.h is deprecated in
+      favour of the standard OpenMP define _OPENMP.
+
+      (This has been the recommendation in the manual for a while now.)
+
+    * The make macro AWK which is long unused by R itself but recorded
+      in file etc/Makeconf is deprecated and will be removed in R
+      3.3.0.
+
+    * The C header file S.h is no longer documented: its use should be
+      replaced by R.h.
+
+  BUG FIXES:
+
+    * kmeans(x, centers = <1-row>) now works. (PR#16623)
+
+    * Vectorize() now checks for clashes in argument names.  (PR#16577)
+
+    * file.copy(overwrite = FALSE) would signal a successful copy when
+      none had taken place.  (PR#16576)
+
+    * ngettext() now uses the same default domain as gettext().
+      (PR#14605)
+
+    * array(.., dimnames = *) now warns about non-list dimnames and,
+      from R 3.3.0, will signal the same error for invalid dimnames as
+      matrix() has always done.
+
+    * addmargins() now adds dimnames for the extended margins in all
+      cases, as always documented.
+
+    * heatmap() evaluated its add.expr argument in the wrong
+      environment.  (PR#16583)
+
+    * require() etc now give the correct entry of lib.loc in the
+      warning about an old version of a package masking a newer
+      required one.
+
+    * The internal deparser did not add parentheses when necessary,
+      e.g. before [] or [[]].  (Reported by Lukas Stadler; additional
+      fixes included as well).
+
+    * as.data.frame.vector(*, row.names=*) no longer produces
+      'corrupted' data frames from row names of incorrect length, but
+      rather warns about them.  This will become an error.
+
+    * url connections with method = "libcurl" are destroyed properly.
+      (PR#16681)
+
+    * withCallingHandler() now (again) handles warnings even during S4
+      generic's argument evaluation.  (PR#16111)
+
+    * deparse(..., control = "quoteExpressions") incorrectly quoted
+      empty expressions.  (PR#16686)
+
+    * format()ting datetime objects ("POSIX[cl]?t") could segfault or
+      recycle wrongly.  (PR#16685)
+
+    * plot.ts(<matrix>, las = 1) now does use las.
+
+    * saveRDS(*, compress = "gzip") now works as documented.
+      (PR#16653)
+
+    * (Windows only) The Rgui front end did not always initialize the
+      console properly, and could cause R to crash.  (PR#16698)
+
+    * dummy.coef.lm() now works in more cases, thanks to a proposal by
+      Werner Stahel (PR#16665).  In addition, it now works for
+      multivariate linear models ("mlm", manova) thanks to a proposal
+      by Daniel Wollschlaeger.
+
+    * The as.hclust() method for "dendrogram"s failed often when there
+      were ties in the heights.
+
+    * reorder() and midcache.dendrogram() now are non-recursive and
+      hence applicable to somewhat deeply nested dendrograms, thanks to
+      a proposal by Suharto Anggono in PR#16424.
+
+    * cor.test() now calculates very small p values more accurately
+      (affecting the result only in extreme not statistically relevant
+      cases).  (PR#16704)
+
+    * smooth(*, do.ends=TRUE) did not always work correctly in R
+      versions between 3.0.0 and 3.2.3.
+
+    * pretty(D) for date-time objects D now also works well if range(D)
+      is (much) smaller than a second.  In the case of only one unique
+      value in D, the pretty range now is more symmetric around that
+      value than previously.
+
+      Similarly, pretty(dt) no longer returns a length 5 vector with
+      duplicated entries for Date objects dt which span only a few
+      days.
+
+    * The figures in help pages such as ?points were accidentally
+      damaged, and did not appear in R 3.2.3.  (PR#16708)
+
+    * available.packages() sometimes deleted the wrong file when
+      cleaning up temporary files.  (PR#16712)
+
+    * The X11() device sometimes froze on Red Hat Enterprise Linux 6.
+      It now waits for MapNotify events instead of Expose events,
+      thanks to Siteshwar Vashisht. (PR#16497)
+
+    * [dpqr]nbinom(*, size=Inf, mu=.) now works as limit case, for
+      'dpq' as the Poisson.  (PR#16727)
+      pnbinom() no longer loops infinitely in border cases.
+
+    * approxfun(*, method="constant") and hence ecdf() which calls the
+      former now correctly "predict" NaN values as NaN.
+
+    * summary.data.frame() now displays NAs in Date columns in all
+      cases.  (PR#16709)
+
 CHANGES IN R 3.2.3:
 
   NEW FEATURES:
@@ -1318,7 +2044,7 @@
       breaks when some are very large. (PR#15988)
 
     * sub() and gsub() did not handle regular expressions like "\s{2,}"
-      properly if the text contained NA or non-ascii elements in a
+      properly if the text contained NA or non-ASCII elements in a
       UTF-8 locale.  Part of this was due to a bug in the TRE library.
       (PR#16009)
 
diff -Nru r-base-3.2.3/doc/NEWS.2.Rd r-base-3.3.1/doc/NEWS.2.Rd
--- r-base-3.2.3/doc/NEWS.2.Rd	2015-03-18 23:04:13.000000000 +0000
+++ r-base-3.3.1/doc/NEWS.2.Rd	2016-03-16 23:04:40.000000000 +0000
@@ -1,5 +1,5 @@
 % -*- coding: utf-8 -*-
-\newcommand{\Rlogo}{\if{html}{\figure{../../html/logo.jpg}}\if{latex}{\figure{logo.jpg}{options: width=0.5in}}}
+\newcommand{\Rlogo}{\if{html}{\figure{../../html/Rlogo.svg}{options: class="toplogo" alt="[R logo]"}}\if{latex}{\figure{Rlogo.pdf}{options: width=0.5in}}}
 
 \name{NEWS}
 \title{ R News}
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/doc/NEWS.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/doc/NEWS.pdf differ
diff -Nru r-base-3.2.3/doc/NEWS.Rd r-base-3.3.1/doc/NEWS.Rd
--- r-base-3.2.3/doc/NEWS.Rd	2015-12-06 23:15:08.000000000 +0000
+++ r-base-3.3.1/doc/NEWS.Rd	2016-06-11 22:15:12.000000000 +0000
@@ -1,10 +1,819 @@
 % -*- coding: utf-8 -*-
-\newcommand{\Rlogo}{\if{html}{\figure{../../html/logo.jpg}}\if{latex}{\figure{logo.jpg}{options: width=0.5in}}}
+\newcommand{\Rlogo}{\if{html}{\figure{../../html/Rlogo.svg}{options: class="toplogo" alt="[R logo]"}}\if{latex}{\figure{Rlogo.pdf}{options: width=0.5in}}}
 
 \name{NEWS}
 \title{R News}
 \encoding{UTF-8}
 
+\section{\Rlogo CHANGES IN R 3.3.1}{
+  \subsection{BUG FIXES}{
+    \itemize{
+      \item \command{R CMD INSTALL} and hence \code{install.packages()}
+      gave an internal error installing a package called
+      \pkg{description} from a tarball on a case-insensitive file system.
+
+      \item \code{match(x, t)} (and hence \code{x \%in\% t}) failed
+      when \code{x} was of length one, and either \code{character} and \code{x}
+      and \code{t} only differed in their \code{Encoding} or when
+      \code{x} and \code{t} where \code{complex} with \code{NA}s or \code{NaN}s.
+      (\PR{16885}.)
+
+      \item \code{unloadNamespace(ns)} also works again when \code{ns} is a
+      \sQuote{namespace}, as from \code{getNamespace()}.
+
+      \item \code{rgamma(1,Inf)} or \code{rgamma(1, 0,0)} no longer give
+      \code{NaN} but the correct limit.
+
+      \item \code{length(baseenv())} is correct now.
+
+      \item \code{pretty(d, ..)} for date-time \code{d} rarely failed
+      when \code{"halfmonth"} time steps were tried (\PR{16923}) and
+      on \sQuote{inaccurate} platforms such as 32-bit windows or
+      a configuration with \command{--disable-long-double}; see comment
+      #15 of \PR{16761}.
+
+      \item In \code{text.default(x, y, labels)}, the rarely(?) used
+      default for \code{labels} is now correct also for the case of a
+      2-column matrix \code{x} and missing \code{y}.
+
+      \item \code{as.factor(c(a = 1L))} preserves \code{names()} again
+      as in \R < 3.1.0.
+
+      \item \code{strtrim(""[0], 0[0])} now works.
+
+      \item Use of \code{Ctrl-C} to terminate a reverse incremental
+      search started by \code{Ctrl-R} in the \code{readline}-based Unix
+      terminal interface is now supported for \code{readline} >= 6.3
+      (\code{Ctrl-G} always worked).  (\PR{16603})
+
+      \item \code{diff(<difftime>)} now keeps the \code{"units"}
+      attribute, as subtraction already did, \PR{16940}.
+    }
+  }
+}
+
+\section{\Rlogo CHANGES IN R 3.3.0}{
+  \subsection{SIGNIFICANT USER-VISIBLE CHANGES}{
+    \itemize{
+      \item \code{nchar(x, *)}'s argument \code{keepNA} governing how
+      the result for \code{NA}s in \code{x} is determined, gets a new
+      default \code{keepNA = NA} which returns \code{NA} where
+      \code{x} is \code{NA}, except for \code{type = "width"} which still
+      returns \code{2}, the formatting / printing width of \code{NA}.
+
+      \item All builds have support for \samp{https:} URLs in the
+      default methods for \code{download.file()}, \code{url()} and code
+      making use of them.
+
+      Unfortunately that cannot guarantee that any particular
+      \samp{https:} URL can be accessed.  For example, server and client
+      have to successfully negotiate a cryptographic protocol (TLS/SSL,
+      \dots) and the server's identity has to be verifiable \emph{via}
+      the available certificates.  Different access methods may allow
+      different protocols or use private certificate bundles: we
+      encountered a \samp{https:} CRAN mirror which could be accessed by
+      one browser but not by another nor by \code{download.file()} on
+      the same Linux machine.
+    }
+  }
+
+  \subsection{NEW FEATURES}{
+    \itemize{
+      \item The \code{print} method for \code{methods()} gains a
+      \code{byclass} argument.
+
+      \item New functions \code{validEnc()} and \code{validUTF8()} to
+      give access to the validity checks for inputs used by
+      \code{grep()} and friends.
+
+      \item Experimental new functionality for S3 method checking, notably
+      \code{isS3method()}.
+
+      Also, the names of the \R \sQuote{language elements} are exported
+      as character vector \code{tools::langElts}.
+
+      \item \code{str(x)} now displays \code{"Time-Series"} also for
+      matrix (multivariate) time-series, i.e. when \code{is.ts(x)} is true.
+
+      \item (Windows only)  The GUI menu item to install local packages
+      now accepts \file{*.tar.gz} files as well as \file{*.zip} files
+      (but defaults to the latter).
+
+      \item New programmeR's utility function \code{chkDots()}.
+
+      \item \code{D()} now signals an error when given invalid input,
+      rather than silently returning \code{NA}.  (Request of John Nash.)
+
+      \item \code{formula} objects are slightly more \dQuote{first class}:
+      e.g., \code{formula()} or \code{new("formula", y ~ x)} are now
+      valid.  Similarly, for \code{"table"}, \code{"ordered"} and
+      \code{"summary.table"}.  Packages defining S4 classes with the above
+      S3/S4 classes as slots should be reinstalled.
+      % notably if their classes are reused in other
+      % packages. e.g. re-install arules for arulesSequence, flexmix for betareg
+
+      \item New function \code{strrep()} for repeating the elements of a
+      character vector.
+
+      \item \code{rapply()} preserves attributes on the list when
+      \code{how = "replace"}.
+
+      \item New S3 generic function \code{sigma()} with methods for
+      extracting the estimated standard deviation aka \dQuote{residual
+	standard deviation} from a fitted model.
+
+      \item \code{news()} now displays \R and package news files within
+      the HTML help system if it is available.  If no news file is found,
+      a visible \code{NULL} is returned to the console.
+
+      \item \code{as.raster(x)} now also accepts \code{raw} arrays
+      \code{x} assuming values in \code{0:255}.
+
+      \item Subscripting of matrix/array objects of type
+      \code{"expression"} is now supported.
+
+      \item \code{type.convert("i")} now returns a factor instead of a
+      complex value with zero real part and missing imaginary part.
+
+      \item Graphics devices \code{cairo_pdf()} and \code{cairo_ps()}
+      now allow non-default values of the cairographics \sQuote{fallback
+	resolution} to be set.
+
+      This now defaults to 300 on all platforms: that is the default
+      documented by cairographics, but apparently was not used by all
+      system installations.
+
+      \item \code{file()} gains an explicit \code{method} argument
+      rather than implicitly using
+      \code{getOption("url.method", "default")}.
+
+      \item Thanks to a patch from Tomas Kalibera, \code{x[x != 0]} is
+      now typically faster than \code{x[which(x != 0)]} (in the case
+      where \code{x} has no NAs, the two are equivalent).
+
+      \item \code{read.table()} now always uses the names for a named
+      \code{colClasses} argument (previously names were only used when
+      \code{colClasses} was too short). (In part, wish of \PR{16478}.)
+
+      \item (Windows only) \code{download.file()} with default
+      \code{method = "auto"} and a \samp{ftps://} URL chooses
+      \code{"libcurl"} if that is available.
+
+      \item The out-of-the box Bioconductor mirror has been changed to
+      one using \samp{https://}: use \code{chooseBioCmirror()} to choose
+      a \samp{http://} mirror if required.
+
+      \item The data frame and formula methods for \code{aggregate()}
+      gain a \code{drop} argument.
+
+      \item \code{available.packages()} gains a \code{repos} argument.
+
+      \item The undocumented switching of methods for \code{url()} on
+      \samp{https:} and \samp{ftps:} URLs is confined to
+      \code{method = "default"} (and documented).
+
+      \item \code{smoothScatter()} gains a \code{ret.selection} argument.
+
+      \item \code{qr()} no longer has a \code{\dots} argument to pass
+      additional arguments to methods.
+
+      \item \code{[} has a method for class \code{"table"}.
+
+      \item It is now possible (again) to \code{replayPlot()} a
+      display list snapshot that was created by \code{recordPlot()}
+      in a different \R session.
+
+      It is still not a good idea to use snapshots as a persistent
+      storage format for \R plots, but it is now not completely silly to
+      use a snapshot as a format for transferring an R plot between two
+      R sessions.
+
+      The underlying changes mean that packages providing graphics
+      devices (e.g., \CRANpkg{Cairo}, \CRANpkg{RSvgDevice},
+      \CRANpkg{cairoDevice}, \CRANpkg{tikzDevice}) will need to be
+      reinstalled.
+
+      Code for restoring snapshots was contributed by Jeroen Ooms
+      and JJ Allaire.
+
+      Some testing code is available at
+      \url{https://github.com/pmur002/R-display-list}.
+
+      \item \code{tools::undoc(dir = D)} and \code{codoc(dir = D)} now
+      also work when \code{D} is a directory whose \code{normalizePath()}ed
+      version does not end in the package name, e.g.\sspace{}from a symlink.
+
+      \item \code{abbreviate()} has more support for multi-byte
+      character sets -- it no longer removes bytes within characters and
+      knows about Latin vowels with accents.  It is still only
+      really suitable for (most) European languages, and still warns on
+      non-ASCII input.
+
+      \code{abbreviate(use.classes = FALSE)} is now implemented, and
+      that is more suitable for non-European languages.
+
+      \item \code{match(x, table)} is faster (sometimes by an order of
+      magnitude) when \code{x} is of length one and \code{incomparables}
+      is unchanged, thanks to Peter Haverty (\PR{16491}).
+
+      \item More consistent, partly not back-compatible behavior of
+      \code{NA} and \code{NaN} coercion to complex numbers, operations
+      less often resulting in complex \code{NA} (\code{NA_complex_}).
+
+      \item \code{lengths()} considers methods for \code{length} and
+      \code{[[} on \code{x}, so it should work automatically on any
+      objects for which appropriate methods on those generics are
+      defined.
+
+      \item The logic for selecting the default screen device on OS X
+      has been simplified: it is now \code{quartz()} if that is
+      available even if environment variable \env{DISPLAY} has been set
+      by the user.
+
+      The choice can easily be overridden \emph{via} environment
+      variable \env{R_INTERACTIVE_DEVICE}.
+
+      \item On Unix-like platforms which support the \command{getline} C
+      library function, \code{system(*,intern = TRUE)} no longer
+      truncates (output) lines longer than 8192 characters, thanks to
+      Karl Millar. (\PR{16544})
+
+      \item \code{rank()} gains a \code{ties.method = "last"} option,
+      for convenience (and symmetry).
+
+      %% \item \code{getRcode(vignette(..))} is the \R source file name of
+      %% a vignette.
+
+      \item \code{regmatches(invert = NA)} can now be used to extract
+      both non-matched and matched substrings.
+
+      \item \code{data.frame()} gains argument \code{fix.empty.names};
+      \code{as.data.frame.list()} gets new \code{cut.names},
+      \code{col.names} and \code{fix.empty.names}.
+
+      \item \code{plot(x ~ x, *)} now warns that it is the same as
+      \code{plot(x ~ 1, *)}.
+
+      \item \code{recordPlot()} has new arguments \code{load} and
+      \code{attach} to allow package names to be stored as part of a
+      recorded plot.  \code{replayPlot()} has new argument
+      \code{reloadPkgs} to load/attach any package names that were
+      stored as part of a recorded plot.
+
+      \item S4 dispatch works within calls to \code{.Internal()}. This
+      means explicit S4 generics are no longer needed for
+      \code{unlist()} and \code{as.vector()}.
+
+      \item Only font family names starting with \samp{"Hershey"} (and
+      not \samp{"Her"} as before) are given special treatment by the
+      graphics engine.
+
+      \item S4 values are automatically coerced to vector (via
+      \code{as.vector}) when subassigned into atomic vectors.
+
+      \item \code{findInterval()} gets a \code{left.open} option.
+
+      \item The version of LAPACK included in the sources has been
+      updated to 3.6.0, including those \sQuote{deprecated} routines
+      which were previously included.  \emph{Ca} 40 double-complex
+      routines have been added at the request of a package maintainer.
+
+      As before, the details of what is included are in
+      \file{src/modules/lapack/README} and this now gives information on
+      earlier additions.
+
+      \item \code{tapply()} has been made considerably more efficient
+      without changing functionality, thanks to proposals from Peter
+      Haverty and Suharto Anggono.  (\PR{16640})
+
+      \item \code{match.arg(arg)} (the one-argument case) is faster; so
+      is \code{sort.int()}.  (\PR{16640})
+
+      \item The \code{format} method for \code{object_size} objects now
+      also accepts \dQuote{binary} units such as \code{"KiB"} and e.g.,
+      \code{"Tb"}.  (Partly from \PR{16649}.)
+
+      \item Profiling now records calls of the form \code{foo::bar} and
+      some similar cases directly rather than as calls to
+      \code{<Anonymous>}.  Contributed by Winston Chang.
+
+      \item New string utilities \code{startsWith(x, prefix)} and
+      \code{endsWith(x, suffix)}.  Also provide speedups for some
+      \code{grepl("^...",*)} uses (related to proposals in \PR{16490}).
+
+      \item Reference class finalizers run at exit, as well as on
+      garbage collection.
+
+      \item Avoid \pkg{parallel} dependency on \pkg{stats} for port
+      choice and random number seeds.  (\PR{16668})
+
+      \item The radix sort algorithm and implementation from
+      \CRANpkg{data.table} (\code{forder}) replaces the previous radix
+      (counting) sort and adds a new method for \code{order()}.
+      Contributed by Matt Dowle and Arun Srinivasan, the new algorithm
+      supports logical, integer (even with large values), real, and
+      character vectors.  It outperforms all other methods, but there
+      are some caveats (see \code{?sort}).
+
+      \item The \code{order()} function gains a \code{method} argument
+      for choosing between \code{"shell"} and \code{"radix"}.
+
+      \item New function \code{grouping()} returns a permutation that
+      stably rearranges data so that identical values are adjacent.  The
+      return value includes extra partitioning information on the
+      groups.  The implementation came included with the new radix sort.
+
+      \item \code{rhyper(nn, m, n, k)} no longer returns \code{NA} when
+      one of the three parameters exceeds the maximal integer.
+
+      \item \code{switch()} now warns when no alternatives are provided.
+
+      \item \code{parallel::detectCores()} now has default \code{logical
+	= TRUE} on all platforms -- as this was the default on Windows,
+      this change only affects Sparc Solaris.
+
+      Option \code{logical = FALSE} is now supported on Linux and recent
+      versions of OS X (for the latter, thanks to a suggestion of Kyaw
+      Sint).
+
+      \item \code{hist()} for \code{"Date"} or \code{"POSIXt"} objects
+      would sometimes give misleading labels on the breaks, as they
+      were set to the day before the start of the period being
+      displayed.  The display format has been changed, and the shift of the
+      start day has been made conditional on \code{right = TRUE} (the
+      default).  (\PR{16679})
+
+      \item \R now uses a new version of the logo (donated to the R
+      Foundation by RStudio).  It is defined in \file{.svg} format, so
+      will resize without unnecessary degradation when displayed on
+      HTML pages---there is also a vector PDF version.  Thanks to
+      Dirk Eddelbuettel for producing the corresponding X11 icon.
+
+      \item New function \code{.traceback()} returns the stack trace
+      which \code{traceback()} prints.
+
+      \item \code{lengths()} dispatches internally.
+
+      \item \code{dotchart()} gains a \code{pt.cex} argument to control
+      the size of points separately from the size of plot labels.
+      Thanks to Michael Friendly and Milan Bouchet-Valat for ideas
+      and patches.
+
+      \item \code{as.roman(ch)} now correctly deals with more diverse
+      character vectors \code{ch}; also arithmetic with the resulting
+      roman numbers works in more cases.  (\PR{16779})
+
+      \item \code{prcomp()} gains a new option \code{rank.} allowing to
+      directly aim for less than \code{min(n,p)} PC's.  The
+      \code{summary()} and its \code{print()} method have been amended,
+      notably for this case.
+
+      \item \code{gzcon()} gains a new option \code{text}, which marks
+      the connection as text-oriented (so e.g.\sspace{}\code{pushBack()}
+      works).  It is still always opened in binary mode.
+
+      \item The \code{import()} namespace directive now accepts an
+      argument \code{except} which names symbols to exclude from the
+      imports. The \code{except} expression should evaluate to a
+      character vector (after substituting symbols for strings). See
+      Writing R Extensions.
+
+      \item New convenience function \code{Rcmd()} in package
+      \pkg{tools} for invoking \command{R CMD} tools from within \R.
+
+      \item New functions \code{makevars_user()} and
+      \code{makevars_site()} in package \pkg{tools} to determine the
+      location of the user and site specific \file{Makevars} files for
+      customizing package compilation.
+    }
+  }
+
+  \subsection{UTILITIES}{
+    \itemize{
+      \item \command{R CMD check} has a new option
+      \option{--ignore-vignettes} for use with non-Sweave vignettes
+      whose \samp{VignetteBuilder} package is not available.
+
+      \item \command{R CMD check} now by default checks code usage
+      (\emph{via} \CRANpkg{codetools}) with only the base package
+      attached.  Functions from default packages other than \pkg{base}
+      which are used in the package code but not imported are reported
+      as undefined globals, with a suggested addition to the
+      \code{NAMESPACE} file.
+
+      \item \command{R CMD check --as-cran} now also checks DOIs in
+      package \file{CITATION} and Rd files.
+
+      \item \command{R CMD Rdconv} and \command{R CMD Rd2pdf} each have
+      a new option \option{--RdMacros=pkglist} which allows Rd macros
+      to be specified before processing.
+    }
+  }
+
+  \subsection{DEPRECATED AND DEFUNCT}{
+    \itemize{
+      \item The previously included versions of \code{zlib},
+      \code{bzip2}, \code{xz} and PCRE have been removed, so suitable
+      external (usually system) versions are required (see the
+      \sQuote{R Installation and Administration} manual).
+
+      \item The unexported and undocumented Windows-only devices
+      \code{cairo_bmp()}, \code{cairo_png()} and \code{cairo_tiff()}
+      have been removed.  (These devices should be used as
+      e.g.\sspace{}\code{bmp(type = "cairo")}.)
+
+      \item (Windows only)  Function \code{setInternet2()} has no effect
+      and will be removed in due course.  The choice between methods
+      \code{"internal"} and \code{"wininet"} is now made by the
+      \code{method} arguments of \code{url()} and \code{download.file()}
+      and their defaults can be set \emph{via} options.  The
+      out-of-the-box default remains \code{"wininet"} (as it has been
+      since \R 3.2.2).
+
+      \item \code{[<-} with an S4 value into a list currently embeds the
+      S4 object into its own list such that the end result is roughly
+      equivalent to using \code{[[<-}.  That behavior is deprecated.  In
+      the future, the S4 value will be coerced to a list with
+      \code{as.list()}.
+
+      \item Package \pkg{tools}' functions
+      \code{package.dependencies()}, \code{pkgDepends()}, etc are
+      deprecated now, mostly in favor of \code{package_dependencies()}
+      which is both more flexible and efficient.
+    }
+  }
+
+  \subsection{INSTALLATION and INCLUDED SOFTWARE}{
+    \itemize{
+      \item Support for very old versions of \command{valgrind}
+      (e.g., 3.3.0) has been removed.
+
+      \item The included \command{libtool} script (generated by
+      \command{configure}) has been updated to version 2.4.6 (from 2.2.6a).
+
+      \item \code{libcurl} version 7.28.0 or later with support for the
+      \code{https} protocol is required for installation (except on
+      Windows).
+
+      \item BSD networking is now required (except on Windows) and so
+      \code{capabilities("http/ftp")} is always true.
+
+      \item \command{configure} uses \command{pkg-config} for PNG, TIFF
+      and JPEG where this is available.  This should work better with
+      multiple installs and with those using static libraries.
+
+      \item The minimum supported version of OS X is 10.6 (\sQuote{Snow
+	Leopard}): even that has been unsupported by Apple since 2012.
+
+      \item The \command{configure} default on OS X is
+      \option{--disable-R-framework}: enable this if you intend to
+      install under \file{/Library/Frameworks} and use with \code{R.app}.
+
+      \item The minimum preferred version of PCRE has since \R 3.0.0
+      been 8.32 (released in Nov 2012).  Versions 8.10 to 8.31 are now
+      deprecated (with warnings from \command{configure}), but will
+      still be accepted until \R 3.4.0.
+
+      \item \command{configure} looks for C functions \code{__cospi},
+      \code{__sinpi} and \code{__tanpi} and uses these if \code{cospi}
+      \emph{etc} are not found.  (OS X is the main instance.)
+
+      \item (Windows) R is now built using \command{gcc}
+      4.9.3.  This build will require recompilation of at least those packages
+      that include C++ code, and possibly others.  A build of R-devel using
+      the older toolchain will be temporarily available for comparison
+      purposes.
+
+      During the transition, the environment variable
+      \env{R_COMPILED_BY} has been defined to indicate which toolchain
+      was used to compile R (and hence, which should be used to compile
+      code in packages).  The \code{COMPILED_BY} variable described below
+      will be a permanent replacement for this.
+
+      \item (Windows) A \command{make} and \command{R CMD config} variable
+      named \code{COMPILED_BY} has been added.  This indicates
+      which toolchain was used to compile R (and hence, which should be
+      used to compile code in packages).
+    }
+  }
+
+  \subsection{PACKAGE INSTALLATION}{
+    \itemize{
+      \item The \command{make} macro \code{AWK} which used to be made
+      available to files such as \file{src/Makefile} is no longer set.
+    }
+  }
+
+  \subsection{C-LEVEL FACILITIES}{
+    \itemize{
+      \item The API call \code{logspace_sum} introduced in \R 3.2.0 is
+      now remapped as an entry point to \code{Rf_logspace_sum}, and its
+      first argument has gained a \code{const} qualifier.  (\PR{16470})
+
+      Code using it will need to be reinstalled.
+
+      Similarly, entry point \code{log1pexp} also defined in
+      \file{Rmath.h} is remapped there to \code{Rf_log1pexp}
+
+      \item \code{R_GE_version} has been increased to \code{11}.
+
+      \item New API call \code{R_orderVector1}, a faster
+      one-argument version of \code{R_orderVector}.
+
+      \item When \R{} headers such as \file{R.h} and \file{Rmath.h} are
+      called from C++ code in packages they include the C++ versions of
+      system headers such as \file{<cmath>} rather than the legacy
+      headers such as \file{<math.h>}.  (Headers \file{Rinternals.h} and
+      \file{Rinterface.h} already did, and inclusion of system headers
+      can still be circumvented by defining \code{NO_C_HEADERS},
+      including as from this version for those two headers.)
+
+      The manual has long said that \R{} headers should \bold{not} be
+      included within an \code{extern "C"} block, and almost all the
+      packages affected by this change were doing so.
+
+      \item Including header \file{S.h} from C++ code would fail on some
+      platforms, and so gives a compilation error on all.
+
+      \item The deprecated header \file{Rdefines.h} is now compatible
+      with defining \code{R_NO_REMAP}.
+
+      \item The connections API now includes a function
+      \code{R_GetConnection()} which allows packages implementing
+      connections to convert R \code{connection} objects to
+      \code{Rconnection} handles used in the API. Code which previously
+      used the low-level R-internal \code{getConnection()} entry point
+      should switch to the official API.
+    }
+  }
+
+  \subsection{BUG FIXES}{
+    \itemize{
+      \item C-level \code{asChar(x)} is fixed for when \code{x} is not a
+      vector, and it returns \code{"TRUE"}/\code{"FALSE"} instead of
+      \code{"T"}/\code{"F"} for logical vectors.
+
+      \item The first arguments of \code{.colSums()} etc (with an
+      initial dot) are now named \code{x} rather than \code{X} (matching
+      \code{colSums()}): thus error messages are corrected.
+
+      \item A \code{coef()} method for class \code{"maov"} has been
+      added to allow \code{vcov()} to work with multivariate
+      results. (\PR{16380})
+
+      \item \code{method = "libcurl"} connections signal errors rather
+      than retrieving HTTP error pages (where the ISP reports the
+      error).
+
+      \item \code{xpdrows.data.frame()} was not checking for unique
+      row names; in particular, this affected assignment to non-existing
+      rows via numerical indexing. (\PR{16570})
+
+      \item \code{tail.matrix()} did not work for zero rows matrices,
+      and could produce row \dQuote{labels} such as \code{"[1e+05,]"}.
+
+      \item Data frames with a column named \code{"stringsAsFactors"}
+      now format and print correctly.  (\PR{16580})
+
+      \item \code{cor()} is now guaranteed to return a value with
+      absolute value less than or equal to 1. (\PR{16638})
+
+      \item Array subsetting now keeps \code{names(dim(.))}.
+
+      \item Blocking socket connection selection recovers more
+      gracefully on signal interrupts.
+
+      \item The \code{data.frame} method of \code{rbind()} construction
+      \code{row.names} works better in borderline integer cases, but
+      may change the names assigned.  (\PR{16666})
+
+      \item (X11 only)  \code{getGraphicsEvent()} miscoded buttons and
+      missed mouse motion events.  (\PR{16700})
+
+      \item \code{methods(round)} now also lists \code{round.POSIXt}.
+
+      \item \code{tar()} now works with the default \code{files = NULL}.
+      (\PR{16716})
+
+      \item Jumps to outer contexts, for example in error recovery, now
+      make intermediate jumps to contexts where \code{on.exit()} actions
+      are established instead of trying to run all \code{on.exit()}
+      actions before jumping to the final target. This unwinds the stack
+      gradually, releases resources held on the stack, and significantly
+      reduces the chance of a segfault when running out of C stack
+      space. Error handlers established using
+      \code{withCallingHandlers()} and \code{options("error")}
+      specifications are ignored when handling a C stack overflow error
+      as attempting one of these would trigger a cascade of C stack
+      overflow errors.  (These changes resolve \PR{16753}.)
+
+      \item The spacing could be wrong when printing a complex array.
+      (Report and patch by Lukas Stadler.)
+
+      \item \code{pretty(d, n, min.n, *)} for date-time objects \code{d}
+      works again in border cases with large \code{min.n}, returns a
+      \code{labels} attribute also for small-range dates and in such cases
+      its returned length is closer to the desired \code{n}.  (\PR{16761})
+      Additionally, it finally does cover the range of \code{d}, as it
+      always claimed.
+
+      \item \code{tsp(x) <- NULL} did not handle correctly objects
+      inheriting from both \code{"ts"} and \code{"mts"}.  (\PR{16769})
+
+      \item \code{install.packages()} could give false errors when
+      \code{options("pkgType")} was \code{"binary"}.  (Reported by
+      Jose Claudio Faria.)
+
+      \item A bug fix in \R 3.0.2 fixed problems with \code{locator()}
+      in X11, but introduced problems in Windows.  Now both should be
+      fixed.  (\PR{15700})
+
+      \item \code{download.file()} with \code{method = "wininet"}
+      incorrectly warned of download file length difference when
+      reported length was unknown. (\PR{16805})
+
+      \item \code{diag(NULL, 1)} crashed because of missed type
+      checking.  (\PR{16853})
+    }
+  }
+}
+
+\section{\Rlogo CHANGES IN R 3.2.4 patched}{
+  \subsection{BUG FIXES}{
+    \itemize{
+      \item \code{format.POSIXlt()} behaved incorrectly in \R 3.2.4.
+      E.g.\sspace{}the output of
+      \code{format(as.POSIXlt(paste0(1940:2000,"-01-01"), tz = "CET"),
+	usetz = TRUE)} ended in two \code{"CEST"} time formats.
+    }
+  }
+}
+
+\section{\Rlogo CHANGES IN R 3.2.4}{
+  \subsection{NEW FEATURES}{
+    \itemize{
+      \item \code{install.packages()} and related functions now give a
+      more informative warning when an attempt is made to install a base
+      package.
+
+      \item \code{summary(x)} now prints with less rounding when
+      \code{x} contains infinite values. (Request of \PR{16620}.)
+
+      \item \code{provideDimnames()} gets an optional \code{unique} argument.
+
+      \item \code{shQuote()} gains \code{type = "cmd2"} for quoting
+      in \command{cmd.exe} in Windows.  (Response to \PR{16636}.)
+
+      \item The \code{data.frame} method of \code{rbind()} gains an
+      optional argument \code{stringsAsFactors} (instead of only
+      depending on \code{getOption("stringsAsFactors")}).
+
+      \item \code{smooth(x, *)} now also works for long vectors.
+
+      \item \code{tools::texi2dvi()} has a workaround for problems with
+      the \command{texi2dvi} script supplied by \pkg{texinfo 6.1}.
+
+      It extracts more error messages from the LaTeX logs when in
+      emulation mode.
+    }
+  }
+
+  \subsection{UTILITIES}{
+    \itemize{
+      \item \command{R CMD check} will leave a log file
+      \file{build_vignettes.log} from the re-building of vignettes in
+      the \file{.Rcheck} directory if there is a problem, and always if
+      environment variable \env{_R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_} is
+      set to a true value.
+    }
+  }
+
+  \subsection{DEPRECATED AND DEFUNCT}{
+    \itemize{
+      \item Use of \samp{SUPPORT_OPENMP} from header \file{Rconfig.h} is
+      deprecated in favour of the standard OpenMP define \samp{_OPENMP}.
+
+      (This has been the recommendation in the manual for a while now.)
+
+      \item The \command{make} macro \code{AWK} which is long unused by
+      \R itself but recorded in file \file{etc/Makeconf} is deprecated
+      and will be removed in \R 3.3.0.
+
+      \item The C header file \file{S.h} is no longer documented: its
+      use should be replaced by \file{R.h}.
+    }
+  }
+
+  \subsection{BUG FIXES}{
+    \itemize{
+      \item \code{kmeans(x, centers = <1-row>)} now works. (\PR{16623})
+
+      \item \code{Vectorize()} now checks for clashes in argument names.
+      (\PR{16577})
+
+      \item \code{file.copy(overwrite = FALSE)} would signal a successful
+      copy when none had taken place.  (\PR{16576})
+
+      \item \code{ngettext()} now uses the same default domain as
+      \code{gettext()}.  (\PR{14605})
+
+      \item \code{array(.., dimnames = *)} now warns about
+      non-\code{list} dimnames and, from \R 3.3.0, will signal the same
+      error for invalid dimnames as \code{matrix()} has always done.
+
+      \item \code{addmargins()} now adds dimnames for the extended
+      margins in all cases, as always documented.
+
+      \item \code{heatmap()} evaluated its \code{add.expr} argument
+      in the wrong environment.  (\PR{16583})
+
+      \item \code{require()} etc now give the correct entry of
+      \code{lib.loc} in the warning about an old version of a package
+      masking a newer required one.
+
+      \item The internal deparser did not add parentheses when
+      necessary,  e.g. before \code{[]} or \code{[[]]}.  (Reported by
+      Lukas Stadler; additional fixes included as well).
+
+      \item \code{as.data.frame.vector(*, row.names=*)} no longer
+      produces \sQuote{corrupted} data frames from row names of incorrect
+      length, but rather warns about them.  This will become an error.
+
+      \item \code{url} connections with \code{method = "libcurl"} are
+      destroyed properly. (\PR{16681})
+
+      \item \code{withCallingHandler()} now (again) handles warnings
+      even during S4 generic's argument evaluation.  (\PR{16111})
+
+      \item \code{deparse(..., control = "quoteExpressions")}
+      incorrectly quoted empty expressions.  (\PR{16686})
+
+      \item \code{format()}ting datetime objects (\code{"POSIX[cl]?t"})
+      could segfault or recycle wrongly.  (\PR{16685})
+
+      \item \code{plot.ts(<matrix>, las = 1)} now does use \code{las}.
+
+      \item \code{saveRDS(*, compress = "gzip")} now works as
+      documented.  (\PR{16653})
+
+      \item (Windows only) The \command{Rgui} front end did not
+      always initialize the console properly, and could cause
+      \R to crash.  (\PR{16698})
+
+      \item \code{dummy.coef.lm()} now works in more cases, thanks to a
+      proposal by Werner Stahel (\PR{16665}).  In addition, it now works
+      for multivariate linear models (\code{"mlm"}, \code{\link{manova}})
+      thanks to a proposal by Daniel Wollschlaeger.
+
+      \item The \code{as.hclust()} method for \code{"dendrogram"}s
+      failed often when there were ties in the heights.
+
+      \item \code{reorder()} and \code{midcache.dendrogram()} now are
+      non-recursive and hence applicable to somewhat deeply nested
+      dendrograms, thanks to a proposal by Suharto Anggono in \PR{16424}.
+
+      \item \code{cor.test()} now calculates very small p values
+      more accurately (affecting the result only in extreme not
+      statistically relevant cases).  (\PR{16704})
+
+      \item \code{smooth(*, do.ends=TRUE)} did not always work correctly
+      in \R versions between 3.0.0 and 3.2.3.
+
+      \item \code{pretty(D)} for date-time objects \code{D} now also
+      works well if \code{range(D)} is (much) smaller than a second.  In
+      the case of only one unique value in \code{D}, the pretty range
+      now is more symmetric around that value than previously.
+      \cr
+      Similarly, \code{pretty(dt)} no longer returns a length 5 vector
+      with duplicated entries for \code{Date} objects \code{dt} which
+      span only a few days.
+
+      \item The figures in help pages such as \code{?points} were
+      accidentally damaged, and did not appear in \R 3.2.3.
+      (\PR{16708})
+
+      \item \code{available.packages()} sometimes deleted the wrong
+      file when cleaning up temporary files.  (\PR{16712})
+
+      \item The \code{X11()} device sometimes froze on Red Hat
+      Enterprise Linux 6. It now waits for \code{MapNotify} events
+      instead of \code{Expose} events, thanks to Siteshwar
+      Vashisht. (\PR{16497})
+
+      \item \code{[dpqr]nbinom(*, size=Inf, mu=.)} now works as limit
+      case, for \sQuote{dpq} as the Poisson.  (\PR{16727})\cr
+      \code{pnbinom()} no longer loops infinitely in border cases.
+
+      \item \code{approxfun(*, method="constant")} and hence \code{ecdf()}
+      which calls the former now correctly \dQuote{predict} \code{NaN}
+      values as \code{NaN}.
+
+      \item \code{summary.data.frame()} now displays \code{NA}s in
+      \code{Date} columns in all cases.  (\PR{16709})
+    }
+  }
+}
+
 \section{\Rlogo CHANGES IN R 3.2.3}{
   \subsection{NEW FEATURES}{
     \itemize{
@@ -41,10 +850,10 @@
       \item \code{loess(..., iterTrace=TRUE)} now provides diagnostics
       for robustness iterations, and the \code{print()} method for
       \code{summary(<loess>)} shows slightly more.
-      
+
       \item The included version of PCRE has been updated to 8.38, a
       bug-fix release.
-      
+
       \item \code{View()} now displays nested data frames in a more
       friendly way.  (Request with patch in \PR{15915}.)
     }
@@ -1495,7 +2304,7 @@
 
       \item \code{sub()} and \code{gsub()} did not handle regular
       expressions like \code{"\\s{2,}"} properly if the text
-      contained \code{NA} or non-ascii elements in a UTF-8
+      contained \code{NA} or non-ASCII elements in a UTF-8
       locale.  Part of this was due to a bug in the TRE library.
       (\PR{16009})
 
diff -Nru r-base-3.2.3/doc/THANKS r-base-3.3.1/doc/THANKS
--- r-base-3.2.3/doc/THANKS	2015-03-18 23:04:14.000000000 +0000
+++ r-base-3.3.1/doc/THANKS	2016-03-16 23:04:40.000000000 +0000
@@ -3,7 +3,7 @@
 
 Valerio Aimale, Thomas Baier, Henrik Bengtsson, Roger Bivand,
 Ben Bolker, David Brahm, G"oran Brostr"om, Patrick Burns, Vince Carey,
-Saikat DebRoy, Brian D'Urso, Lyndon Drake, Dirk Eddelbuettel,
+Saikat DebRoy, Matt Dowle, Brian D'Urso, Lyndon Drake, Dirk Eddelbuettel,
 Claus Ekstrom, Sebastian Fischmeister, John Fox, Paul Gilbert,
 Yu Gong, Gabor Grothendieck, Frank E Harrell Jr, Torsten Hothorn,
 Robert King, Kjetil Kjernsmo, Roger Koenker, Philippe Lambert,
@@ -12,7 +12,7 @@
 Jens Oehlschaegel, Steve Oncley, Richard O'Keefe, Hubert Palme,
 Roger D. Peng, Jose' C. Pinheiro, Tony Plate, Anthony Rossini,
 Jonathan Rougier, Petr Savicky, Guenther Sawitzki, Marc Schwartz,
-Detlef Steuer, Bill Simpson, Gordon Smyth, Adrian Trapletti,
+Arun Srinivasan, Detlef Steuer, Bill Simpson, Gordon Smyth, Adrian Trapletti,
 Terry Therneau, Rolf Turner, Bill Venables, Gregory R. Warnes,
 Andreas Weingessel, Morten Welinder, James Wettenhall, Simon Wood, and
 Achim Zeileis.
diff -Nru r-base-3.2.3/etc/ldpaths.in r-base-3.3.1/etc/ldpaths.in
--- r-base-3.2.3/etc/ldpaths.in	2013-03-05 23:02:45.000000000 +0000
+++ r-base-3.3.1/etc/ldpaths.in	2016-01-09 23:15:11.000000000 +0000
@@ -8,7 +8,11 @@
 if test -n "${R_JAVA_LD_LIBRARY_PATH}"; then
   R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}:${R_JAVA_LD_LIBRARY_PATH}"
 fi
-## This is DYLD_FALLBACK_LIBRARY_PATH on Darwin (OS X) and LD_LIBRARY_PATH elsewhere
+## This is DYLD_FALLBACK_LIBRARY_PATH on Darwin (OS X) and
+## LD_LIBRARY_PATH elsewhere.
+## However, on OS X 10.11 (if SIP is enabled, the default), the
+## environment value will not be passed to a script such as R.sh, so
+## would not seen here.
 if test -z "${@Rshlibpath_var@}"; then
   @Rshlibpath_var@="${R_LD_LIBRARY_PATH}"
 else
diff -Nru r-base-3.2.3/etc/Makeconf.in r-base-3.3.1/etc/Makeconf.in
--- r-base-3.2.3/etc/Makeconf.in	2015-03-25 10:19:06.000000000 +0000
+++ r-base-3.3.1/etc/Makeconf.in	2016-03-16 23:04:44.000000000 +0000
@@ -10,8 +10,6 @@
 include $(R_SHARE_DIR)/make/vars.mk
 
 AR = @AR@
-## Used by packages 'maps' and 'mapdata'
-AWK = @AWK@
 BLAS_LIBS = @BLAS_LIBS@
 C_VISIBILITY = @C_VISIBILITY@
 CC = @CC@
diff -Nru r-base-3.2.3/etc/repositories r-base-3.3.1/etc/repositories
--- r-base-3.2.3/etc/repositories	2015-08-06 22:02:03.000000000 +0000
+++ r-base-3.3.1/etc/repositories	2016-03-16 23:04:44.000000000 +0000
@@ -14,10 +14,7 @@
 BioCann	"BioC annotation"	%bm/packages/%v/data/annotation	FALSE	TRUE	TRUE	TRUE
 BioCexp	"BioC experiment"	%bm/packages/%v/data/experiment	FALSE	TRUE	TRUE	TRUE
 BioCextra	"BioC extra"	%bm/packages/%v/extra	FALSE	TRUE	TRUE	TRUE
-CRANextra	CRAN (extras)	http://www.stats.ox.ac.uk/pub/RWin	FALSE	TRUE	TRUE	TRUE
-Omegahat	Omegahat	http://www.omegahat.org/R	FALSE	TRUE	FALSE	FALSE
-R-Forge	R-Forge	http://R-Forge.R-project.org	FALSE	TRUE	TRUE	TRUE
-rforge.net	rforge.net	http://www.rforge.net	FALSE	TRUE	TRUE	TRUE
-CRANextra[https]	"CRAN (extras, https)"	"https://www.stats.ox.ac.uk/pub/RWin"	FALSE	TRUE	TRUE	TRUE
-R-Forge[https]	"R-Forge [https]"	https://R-Forge.R-project.org	FALSE	TRUE	TRUE	TRUE
-rforge.net[https]	"rforge.net [https]"	https://www.rforge.net	FALSE	TRUE	TRUE	TRUE
+CRANextra	CRAN (extras)	https://www.stats.ox.ac.uk/pub/RWin	FALSE	TRUE	TRUE	TRUE
+Omegahat	Omegahat	http://www.omegahat.net/R	FALSE	TRUE	FALSE	FALSE
+R-Forge	R-Forge	https://R-Forge.R-project.org	FALSE	TRUE	TRUE	TRUE
+rforge.net	rforge.net	https://www.rforge.net	FALSE	TRUE	TRUE	TRUE
diff -Nru r-base-3.2.3/m4/cairo.m4 r-base-3.3.1/m4/cairo.m4
--- r-base-3.2.3/m4/cairo.m4	2014-06-13 22:15:06.000000000 +0000
+++ r-base-3.3.1/m4/cairo.m4	2016-03-16 23:02:07.000000000 +0000
@@ -16,7 +16,7 @@
 ###
 ### You should have received a copy of the GNU General Public License
 ### along with R; if not, a copy is available at
-### http://www.r-project.org/Licenses/
+### https://www.r-project.org/Licenses/
 
 
 AC_DEFUN([R_PANGO_CAIRO], [
@@ -126,6 +126,7 @@
       case "${host_os}" in
         darwin*)
           ## This is for static OS X build
+	  ## FIXME: doing that unconditionally is really not a good idea
           CAIRO_LIBS=`"${PKGCONF}" --static --libs ${modlist}`
           CAIROX11_LIBS=`"${PKGCONF}" --static --libs ${xmodlist}`
           ;;
diff -Nru r-base-3.2.3/m4/cxx_11.m4 r-base-3.3.1/m4/cxx_11.m4
--- r-base-3.2.3/m4/cxx_11.m4	2014-03-12 23:02:06.000000000 +0000
+++ r-base-3.3.1/m4/cxx_11.m4	2015-12-10 23:15:11.000000000 +0000
@@ -1,5 +1,5 @@
 # ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
 # ============================================================================
 #
 # SYNOPSIS
diff -Nru r-base-3.2.3/m4/libtool.m4 r-base-3.3.1/m4/libtool.m4
--- r-base-3.2.3/m4/libtool.m4	2015-08-02 22:15:03.000000000 +0000
+++ r-base-3.3.1/m4/libtool.m4	2016-03-16 23:02:06.000000000 +0000
@@ -1,7 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -9,37 +8,31 @@
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
-dnl Some changes for FreeBSD >= 10 ported from libtool 2.4.6.
-
-dnl # serial 56 LT_INIT
+dnl commented out to avoid autoconf warnings
+dnl # serial 58 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -67,7 +60,8 @@
 # LT_INIT([OPTIONS])
 # ------------------
 AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -84,11 +78,13 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -108,26 +104,43 @@
 dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
 ])
 
 
 # _LT_FILEUTILS_DEFAULTS
 # ----------------------
 # It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
 m4_defun([_LT_FILEUTILS_DEFAULTS],
 [: ${CP="cp -f"}
 : ${MV="mv -f"}
@@ -140,6 +153,11 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -162,68 +180,54 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 ])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -252,16 +256,38 @@
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
 # now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
 # so we pass a copy along to make sure it has a sensible value anyway.
 m4_defun([_LT_PROG_LTMAIN],
 [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
 _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 ])# _LT_PROG_LTMAIN
 
 
@@ -271,7 +297,7 @@
 
 # So that we can recreate a full libtool script including additional
 # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
 # label.
 
 
@@ -406,11 +432,11 @@
 
 # _LT_CONFIG_STATUS_DECLARE([VARNAME])
 # ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -420,7 +446,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -431,7 +457,7 @@
 # Output comment and list of tags supported by the script
 m4_defun([_LT_LIBTOOL_TAGS],
 [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
 ])
 
 
@@ -459,7 +485,7 @@
 # _LT_LIBTOOL_CONFIG_VARS
 # -----------------------
 # Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
 # script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 # section) are produced by _LT_LIBTOOL_TAG_VARS.
 m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -485,8 +511,8 @@
 # Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 # variables for single and double quote escaping we saved from calls
 # to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
 # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 m4_defun([_LT_CONFIG_COMMANDS],
 [AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -519,12 +545,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -535,9 +569,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -545,16 +579,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -564,20 +620,11 @@
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -585,7 +632,7 @@
 } >&AS_MESSAGE_LOG_FD
 
 lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
 for use in further configure time tests before the real libtool is
 generated.
 
@@ -603,11 +650,11 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
-while test $[#] != 0
+while test 0 != $[#]
 do
   case $[1] in
     --version | --v* | -V )
@@ -620,10 +667,10 @@
       lt_cl_silent=: ;;
 
     -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
 
     *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
   esac
   shift
 done
@@ -648,15 +695,13 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 ])# LT_OUTPUT
 
 
@@ -671,27 +716,31 @@
 _LT_CONFIG_SAVE_COMMANDS([
   m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
   m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
 _LT_COPYING
 _LT_LIBTOOL_TAGS
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
@@ -699,13 +748,24 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -719,15 +779,10 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -744,7 +799,6 @@
 [m4_if([$1], [], [
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'], [])
 ])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -772,6 +826,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -793,6 +848,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -823,6 +903,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -833,11 +917,13 @@
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -911,7 +997,7 @@
 
     AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
       [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
@@ -923,7 +1009,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -931,6 +1023,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -940,36 +1033,64 @@
       AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 	[lt_cv_ld_exported_symbols_list=yes],
 	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
     ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
       _lt_dar_single_mod='$single_module'
     fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
     else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -979,8 +1100,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -989,23 +1110,29 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ],[])
   else
@@ -1013,234 +1140,176 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
 
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-AC_SUBST(lt_ECHO)
-])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
 [AC_ARG_ENABLE([libtool-lock],
   [AS_HELP_STRING([--disable-libtool-lock],
     [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -1269,9 +1338,46 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
@@ -1281,9 +1387,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1302,7 +1418,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1320,25 +1439,39 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
     [AC_LANG_PUSH(C)
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
      AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1352,18 +1485,51 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1381,19 +1547,28 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1408,7 +1583,7 @@
   [$2=no
    m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -1418,15 +1593,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -1435,7 +1610,7 @@
    $RM conftest*
 ])
 
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
     m4_if([$5], , :, [$5])
 else
     m4_if([$6], , :, [$6])
@@ -1457,7 +1632,7 @@
 m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $3"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1466,7 +1641,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1476,10 +1651,10 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 ])
 
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
     m4_if([$4], , :, [$4])
 else
     m4_if([$5], , :, [$5])
@@ -1500,7 +1675,7 @@
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -1529,13 +1704,18 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1554,6 +1734,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1580,22 +1765,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -1611,7 +1797,7 @@
     ;;
   esac
 ])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 else
   AC_MSG_RESULT(none)
@@ -1639,13 +1825,13 @@
 # ----------------------------------------------------------------
 m4_defun([_LT_TRY_DLOPEN_SELF],
 [m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
   [$4]
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1686,7 +1872,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1695,7 +1887,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -1704,7 +1900,7 @@
   return status;
 }]
 _LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -1725,7 +1921,7 @@
 # ------------------
 AC_DEFUN([LT_SYS_DLOPEN_SELF],
 [m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -1735,44 +1931,52 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ])
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
+	  [lt_cv_dlopen=shl_load],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
 	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
+	      [lt_cv_dlopen=dlopen],
 	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
 	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
 	      ])
 	    ])
 	  ])
@@ -1781,21 +1985,21 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1805,7 +2009,7 @@
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     ])
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
 	  lt_cv_dlopen_self_static, [dnl
@@ -1815,9 +2019,9 @@
       ])
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -1871,16 +2075,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -1905,12 +2109,12 @@
 # ----------------------------------
 # Check to see if we can do hard links to lock some files if needed
 m4_defun([_LT_COMPILER_FILE_LOCKS],
-[dnl m4_require([_LT_ENABLE_LOCK])dnl
+[m4_require([_LT_ENABLE_LOCK])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 _LT_COMPILER_C_O([$1])
 
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING([if we can lock with hard links])
   hard_links=yes
@@ -1920,8 +2124,8 @@
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
     need_locks=warn
   fi
 else
@@ -1948,8 +2152,8 @@
 _LT_DECL([], [objdir], [0],
          [The name of the directory that contains temporary libtool files])dnl
 m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
 ])# _LT_CHECK_OBJDIR
 
 
@@ -1961,15 +2165,15 @@
 _LT_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
    test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
 
   # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
     # Linking always hardcodes the temporary library directory.
     _LT_TAGVAR(hardcode_action, $1)=relink
   else
@@ -1983,12 +2187,12 @@
 fi
 AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
 
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -2012,7 +2216,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT([yes])
@@ -2030,6 +2234,47 @@
 ])# _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
@@ -2039,47 +2284,63 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -2089,14 +2350,20 @@
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -2113,56 +2380,109 @@
 # flags to be left without arguments
 need_version=unknown
 
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[[01]] | aix4.[[01]].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -2172,27 +2492,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2204,16 +2524,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -2229,37 +2550,84 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2269,8 +2637,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2280,11 +2648,11 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -2295,19 +2663,20 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[23].]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -2332,13 +2701,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -2355,14 +2727,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -2370,8 +2743,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -2380,20 +2753,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -2404,16 +2779,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -2432,8 +2807,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -2442,35 +2817,65 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2488,12 +2893,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -2502,8 +2907,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -2512,58 +2917,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -2571,11 +2986,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -2585,20 +3000,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -2619,24 +3034,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2651,19 +3066,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -2672,20 +3087,30 @@
   ;;
 esac
 AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
 _LT_DECL([], [variables_saved_for_relink], [1],
     [Variables whose values should be saved in libtool wrapper scripts and
     restored at link time])
@@ -2703,6 +3128,8 @@
     The last name is the one that the linker finds with -lNAME]])
 _LT_DECL([], [soname_spec], [1],
     [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
 _LT_DECL([], [postinstall_cmds], [2],
     [Command to use after installation of a shared archive])
 _LT_DECL([], [postuninstall_cmds], [2],
@@ -2716,39 +3143,41 @@
     [Whether we should hardcode library paths into libraries])
 _LT_DECL([], [sys_lib_search_path_spec], [2],
     [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 ])# _LT_SYS_DYNAMIC_LINKER
 
 
 # _LT_PATH_TOOL_PREFIX(TOOL)
 # --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
 AC_DEFUN([_LT_PATH_TOOL_PREFIX],
 [m4_require([_LT_DECL_EGREP])dnl
 AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 [case $MAGIC_CMD in
 [[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
   ac_dummy="m4_if([$2], , $PATH, [$2])"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -2771,11 +3200,11 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   AC_MSG_RESULT($MAGIC_CMD)
 else
@@ -2793,7 +3222,7 @@
 
 # _LT_PATH_MAGIC
 # --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
 m4_defun([_LT_PATH_MAGIC],
 [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2815,20 +3244,21 @@
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
-dnl AC_ARG_WITH([gnu-ld],
-dnl     [AS_HELP_STRING([--with-gnu-ld],
-dnl 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-dnl     [test "$withval" = no || with_gnu_ld=yes],
-dnl     [with_gnu_ld=no])dnl
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -2842,7 +3272,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -2853,37 +3283,37 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   AC_MSG_CHECKING([for GNU ld])
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -2936,19 +3366,61 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
     ;;
 esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
 # _LT_CHECK_MAGIC_METHOD
 # ----------------------
 # how to check for library dependencies
@@ -2964,13 +3436,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix[[4-9]]*)
@@ -3001,12 +3473,13 @@
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3032,7 +3505,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3044,11 +3517,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3069,8 +3542,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3092,8 +3565,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3146,8 +3619,26 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3155,7 +3646,11 @@
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3167,33 +3662,38 @@
 AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3204,18 +3704,30 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -3225,13 +3737,13 @@
 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   [lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3246,6 +3758,82 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
 
 # LT_LIB_M
 # --------
@@ -3254,15 +3842,15 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
   AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
   ;;
 esac
 AC_SUBST([LIBM])
@@ -3281,8 +3869,13 @@
 
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3299,6 +3892,7 @@
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -3327,7 +3921,7 @@
   symcode='[[ABCDGISTW]]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[[ABCDEGRST]]'
   fi
   ;;
@@ -3360,14 +3954,44 @@
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3385,24 +4009,29 @@
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx]"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3424,7 +4053,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -3436,6 +4065,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3447,7 +4088,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -3455,7 +4096,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -3473,15 +4114,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3498,7 +4139,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -3514,16 +4155,29 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
     [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
 _LT_DECL([global_symbol_to_c_name_address],
     [lt_cv_sys_global_symbol_to_c_name_address], [1],
     [Transform the output of nm in a C name address pair])
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3535,20 +4189,20 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
+  if test yes = "$GXX"; then
     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
     aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -3559,8 +4213,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -3576,6 +4230,11 @@
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -3586,6 +4245,11 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -3620,7 +4284,7 @@
     case $host_os in
       aix[[4-9]]*)
 	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	  # AIX 5 now supports IA64 processor
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
@@ -3635,6 +4299,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -3655,14 +4325,14 @@
 	case $cc_basename in
 	  CC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -3691,7 +4361,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -3699,7 +4369,7 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    # old Intel C++ for x86_64, which still supported -KPIC.
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -3724,8 +4394,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3787,7 +4457,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3844,17 +4514,18 @@
   fi
 ],
 [
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -3865,8 +4536,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -3883,6 +4554,11 @@
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -3891,6 +4567,12 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -3933,12 +4615,21 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
@@ -3946,11 +4637,30 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -3966,7 +4676,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -3975,9 +4685,9 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -3996,7 +4706,19 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4008,25 +4730,40 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
 	esac
 	;;
@@ -4058,7 +4795,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4078,7 +4815,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
@@ -4107,7 +4844,7 @@
   fi
 ])
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_TAGVAR(lt_prog_compiler_pic, $1)=
     ;;
@@ -4115,9 +4852,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4136,6 +4875,8 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4156,6 +4897,7 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4164,27 +4906,41 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4199,7 +4955,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4215,9 +4970,9 @@
   # included in the symbol list
   _LT_TAGVAR(include_expsyms, $1)=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
   _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4233,7 +4988,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -4241,30 +4996,57 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4276,15 +5058,16 @@
     case $host_os in
     aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -4294,7 +5077,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -4310,7 +5093,7 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4320,61 +5103,97 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4385,39 +5204,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
-	xlf*)
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4431,8 +5258,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4450,8 +5277,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4463,7 +5290,7 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -4478,9 +5305,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
@@ -4497,15 +5324,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
       runpath_var=
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
       _LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4521,7 +5348,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4529,32 +5356,57 @@
       ;;
 
     aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -4573,13 +5425,21 @@
       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; then
 	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -4598,56 +5458,80 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -4656,7 +5540,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -4676,24 +5560,69 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
       ;;
 
     dgux*)
@@ -4723,41 +5652,40 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_direct, $1)=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -4765,33 +5693,40 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	case $host_cpu in
@@ -4802,7 +5737,7 @@
 	*)
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -4813,28 +5748,53 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE([AC_LANG_SOURCE([[int foo(void) {}]])],
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(inherit_rpath, $1)=yes
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -4849,7 +5809,7 @@
     newsos6)
       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
@@ -4857,27 +5817,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 	fi
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -4888,33 +5840,53 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4925,24 +5897,24 @@
 
     solaris*)
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -4952,11 +5924,11 @@
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	fi
@@ -4966,10 +5938,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -5018,43 +5990,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -5069,17 +6041,17 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
 	;;
       esac
     fi
   fi
 ])
 AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
 _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 
@@ -5096,7 +6068,7 @@
   # Assume -lc should be added
   _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $_LT_TAGVAR(archive_cmds, $1) in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -5105,36 +6077,38 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
@@ -5171,18 +6145,15 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
     DIR into the resulting binary])
 _LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
     DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
     library is relocated])
 _LT_TAGDECL([], [hardcode_minus_L], [0],
     [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5199,8 +6170,6 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5211,6 +6180,8 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5223,10 +6194,10 @@
 # ------------------------
 # Ensure that the configuration variables for a C compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_C_CONFIG],
 [m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
 AC_LANG_PUSH(C)
 
 # Source file extension for C test sources.
@@ -5266,18 +6237,18 @@
   LT_SYS_DLOPEN_SELF
   _LT_CMD_STRIPLIB
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   AC_MSG_CHECKING([if libtool supports shared libraries])
   AC_MSG_RESULT([$can_build_shared])
 
   AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
-    test "$enable_shared" = yes && enable_static=no
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -5285,8 +6256,12 @@
     ;;
 
   aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -5294,47 +6269,32 @@
 
   AC_MSG_CHECKING([whether to build static libraries])
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   AC_MSG_RESULT([$enable_static])
 
   _LT_CONFIG($1)
 fi
 AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
 ])# _LT_LANG_C_CONFIG
 
 
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
 # _LT_LANG_CXX_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5346,7 +6306,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5356,6 +6315,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5371,7 +6332,7 @@
 # the CXX compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="int some_variable = 0;"
 
@@ -5387,6 +6348,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5404,6 +6366,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5411,35 +6374,35 @@
   if test -n "$compiler"; then
     # We don't want -fno-exception when compiling C++ code, so set the
     # no_builtin_flag separately
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
     else
       _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
     fi
 
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       # Set up default GNU C++ configuration
 
       LT_PATH_LD
 
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 
         # If archive_cmds runs LD, not CC, wlarc should be empty
         # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
         #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
+        wlarc='$wl'
 
         # ancient GNU ld didn't support --whole-archive et. al.
         if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
         else
           _LT_TAGVAR(whole_archive_flag_spec, $1)=
         fi
@@ -5458,7 +6421,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -5475,18 +6438,30 @@
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
       aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
+        if test ia64 = "$host_cpu"; then
           # On IA64, the linker does run time linking by default, so we don't
           # have to do anything special.
           aix_use_runtimelinking=no
           exp_sym_flag='-Bexport'
-          no_entry_flag=""
+          no_entry_flag=
         else
           aix_use_runtimelinking=no
 
           # Test if we are trying to use run time linking or normal
           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
           case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	    for ld_flag in $LDFLAGS; do
 	      case $ld_flag in
@@ -5496,6 +6471,13 @@
 	        ;;
 	      esac
 	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
 	    ;;
           esac
 
@@ -5514,13 +6496,21 @@
         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
         _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
 
-        if test "$GXX" = yes; then
+        if test yes = "$GXX"; then
           case $host_os in aix4.[[012]]|aix4.[[012]].*)
           # We only want to do this on AIX 4.2 and lower, the check
           # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -5538,59 +6528,84 @@
 	  fi
           esac
           shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
 	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
         else
           # not using gcc
-          if test "$host_cpu" = ia64; then
+          if test ia64 = "$host_cpu"; then
 	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	  # chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
           else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
 	    else
-	      shared_flag='${wl}-bM:SRE'
+	      shared_flag='$wl-bM:SRE'
 	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
           fi
         fi
 
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
         # It seems that -bexpall does not export symbols beginning with
         # underscore (_), so it is better to generate a list of symbols to
 	# export.
         _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
           # Warning - without using the other runtime loading flags (-brtl),
           # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
         else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -5600,7 +6615,7 @@
 	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -5616,32 +6631,108 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
 
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
       dgux*)
         case $cc_basename in
           ec++*)
@@ -5676,13 +6767,15 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
       hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
         _LT_TAGVAR(hardcode_direct, $1)=yes
         _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 				             # but as the default
@@ -5694,7 +6787,7 @@
             _LT_TAGVAR(ld_shlibs, $1)=no
             ;;
           aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             # Commands to make compiler produce verbose output that lists
             # what "hidden" libraries, object files and flags are used when
             # linking a shared library.
@@ -5703,11 +6796,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5717,15 +6810,15 @@
         ;;
 
       hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
           case $host_cpu in
             hppa*64*|ia64*)
               ;;
             *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
               ;;
           esac
         fi
@@ -5751,13 +6844,13 @@
           aCC*)
 	    case $host_cpu in
 	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	    esac
 	    # Commands to make compiler produce verbose output that lists
@@ -5768,20 +6861,20 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
 	        case $host_cpu in
 	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -5796,22 +6889,22 @@
       interix[[3-9]]*)
 	_LT_TAGVAR(hardcode_direct, $1)=no
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 	# Instead, shared libraries are loaded at an image base (0x10000000 by
 	# default) and relocated if they conflict, which is a slow very memory
 	# consuming and fragmenting process.  To avoid this, we pick a random,
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -5820,22 +6913,22 @@
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 	    ;;
         esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5843,8 +6936,8 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
 	    # linking a shared library.
@@ -5853,10 +6946,10 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -5870,59 +6963,59 @@
 	    # earlier do not add the objects themselves.
 	    case `$CC -V 2>&1` in
 	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	      *)  # Version 8.0 or newer
 	        tmp_idyn=
 	        case $host_cpu in
 		  ia64*) tmp_idyn=' -i_dynamic';;
 		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	    esac
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 	    ;;
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
 	    esac
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 
 	    runpath_var=LD_RUN_PATH
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5936,18 +7029,18 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
@@ -5955,16 +7048,16 @@
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6016,24 +7109,19 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
 	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
+      openbsd* | bitrig*)
 	if test -f /usr/libexec/ld.so; then
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6047,9 +7135,9 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	    # Archives containing C++ object files must be created using
@@ -6067,17 +7155,17 @@
           cxx*)
 	    case $host in
 	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
 	    esac
@@ -6092,27 +7180,27 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	      esac
 
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6148,13 +7236,13 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6162,14 +7250,14 @@
 	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	      *)
 		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
+		# but understands '-z linker_flag'.
 	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	        ;;
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6179,42 +7267,42 @@
 	    ;;
           gcx*)
 	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 
 	    # The C++ compiler must be used to create the archive.
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 	    ;;
           *)
 	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
 	      case $host_os in
 		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		  ;;
 	      esac
 	    fi
@@ -6223,48 +7311,52 @@
         ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
       case $cc_basename in
         CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
       esac
       ;;
 
       sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
+	# Note: We CANNOT use -z defs as we might desire, because we do not
 	# link with -lc, and that would cause any symbols used from libc to
 	# always be unresolved, which means just about no library would
 	# ever link correctly.  If we're not using GNU ld we use -z text
 	# though, which does catch some bad symbols but isn't as heavy-handed
 	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 	runpath_var='LD_RUN_PATH'
 
 	case $cc_basename in
           CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    ;;
 	esac
       ;;
@@ -6295,10 +7387,10 @@
     esac
 
     AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -6316,6 +7408,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6324,12 +7417,36 @@
   lt_cv_path_LD=$lt_save_path_LD
   lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
 
 AC_LANG_POP
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6338,6 +7455,7 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6387,7 +7505,20 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6399,29 +7530,38 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case $prev$p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
        # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
 	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
 	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
 	   fi
 	   ;;
 	 # The "-l" case would never come before the object being
@@ -6429,13 +7569,15 @@
 	 esac
        else
 	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
 	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -6444,15 +7586,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
+	   _LT_TAGVAR(predep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
 	 fi
        else
 	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	   _LT_TAGVAR(postdep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
 	 fi
@@ -6471,6 +7613,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -6482,51 +7625,6 @@
   _LT_TAGVAR(postdep_objects,$1)=
   _LT_TAGVAR(postdeps,$1)=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 ])
 
@@ -6535,7 +7633,7 @@
 esac
  _LT_TAGVAR(compiler_lib_search_dirs, $1)=
 if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 _LT_TAGDECL([], [compiler_lib_search_dirs], [1],
     [The directories searched by this compiler when creating a shared library])
@@ -6551,32 +7649,16 @@
 ])# _LT_SYS_HIDDEN_LIBDEPS
 
 
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6586,7 +7668,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -6595,6 +7676,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6610,7 +7693,7 @@
 # the F77 compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -6632,9 +7715,11 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6644,21 +7729,25 @@
     AC_MSG_RESULT([$can_build_shared])
 
     AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -6666,11 +7755,11 @@
 
     AC_MSG_CHECKING([whether to build static libraries])
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -6687,39 +7776,25 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
 
 
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6729,7 +7804,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -6738,6 +7812,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6753,7 +7829,7 @@
 # the FC compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -6775,9 +7851,11 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -6789,21 +7867,25 @@
     AC_MSG_RESULT([$can_build_shared])
 
     AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -6811,11 +7893,11 @@
 
     AC_MSG_CHECKING([whether to build static libraries])
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -6833,8 +7915,9 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
 
 AC_LANG_POP
 ])# _LT_LANG_FC_CONFIG
@@ -6844,7 +7927,7 @@
 # --------------------------
 # Ensure that the configuration variables for the GNU Java Compiler compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_GCJ_CONFIG],
 [AC_REQUIRE([LT_PROG_GCJ])dnl
 AC_LANG_SAVE
@@ -6870,19 +7953,23 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
 _LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -6902,15 +7989,87 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_RC_CONFIG],
 [AC_REQUIRE([LT_PROG_RC])dnl
 AC_LANG_SAVE
@@ -6926,7 +8085,7 @@
 lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_TAG_COMPILER
@@ -6936,10 +8095,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -6952,7 +8113,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -6962,7 +8124,7 @@
 [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
   [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
     [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
       AC_SUBST(GCJFLAGS)])])[]dnl
 ])
 
@@ -6972,6 +8134,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -7011,6 +8180,15 @@
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7057,7 +8235,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f "$lt_ac_sed" && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7074,9 +8252,9 @@
     $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
     cmp -s conftest.out conftest.nl || break
     # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
+    test 10 -lt "$lt_ac_count" && break
     lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
       lt_ac_max=$lt_ac_count
       lt_cv_path_SED=$lt_ac_sed
     fi
@@ -7100,27 +8278,7 @@
 # Find out whether the shell is Bourne or XSI compatible,
 # or has some other useful features.
 m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
@@ -7144,208 +8302,69 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
     ;;
-  esac
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
 ])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff -Nru r-base-3.2.3/m4/lt~obsolete.m4 r-base-3.3.1/m4/lt~obsolete.m4
--- r-base-3.2.3/m4/lt~obsolete.m4	2010-03-17 14:43:04.000000000 +0000
+++ r-base-3.3.1/m4/lt~obsolete.m4	2016-03-16 23:02:07.000000000 +0000
@@ -1,17 +1,18 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-dnl # serial 4 lt~obsolete.m4
+dnl # serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
@@ -25,7 +26,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
@@ -77,7 +78,6 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -90,3 +90,10 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff -Nru r-base-3.2.3/m4/ltoptions.m4 r-base-3.3.1/m4/ltoptions.m4
--- r-base-3.2.3/m4/ltoptions.m4	2010-03-17 14:43:04.000000000 +0000
+++ r-base-3.3.1/m4/ltoptions.m4	2016-03-16 23:02:07.000000000 +0000
@@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-dnl # serial 6 ltoptions.m4
+dnl # serial 8 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -28,7 +29,7 @@
 [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
         _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
 ])
 
 
@@ -74,13 +75,15 @@
   dnl
   dnl If no reference was made to various pairs of opposing options, then
   dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
   dnl archives by default:
   _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
   _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
   _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
   _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
   ])
 ])# _LT_SET_OPTIONS
 
@@ -111,7 +114,7 @@
 [_LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -125,7 +128,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +136,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -147,7 +150,7 @@
 _LT_SET_OPTION([LT_INIT], [win32-dll])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -156,9 +159,9 @@
 
 # _LT_ENABLE_SHARED([DEFAULT])
 # ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_SHARED],
 [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([shared],
@@ -171,14 +174,14 @@
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -210,9 +213,9 @@
 
 # _LT_ENABLE_STATIC([DEFAULT])
 # ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_STATIC],
 [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([static],
@@ -225,14 +228,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -264,15 +267,14 @@
 
 # _LT_ENABLE_FAST_INSTALL([DEFAULT])
 # ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_FAST_INSTALL],
 [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([fast-install],
-dnl     [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-dnl     [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    ,
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [(libtool) optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
     [p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -280,14 +282,14 @@
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
 ])
 
 AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -319,19 +321,85 @@
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 
 
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [(libtool( shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
 # _LT_WITH_PIC([MODE])
 # --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 # LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[(libtool) try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
 
 _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 ])# _LT_WITH_PIC
@@ -344,7 +412,7 @@
 [_LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
diff -Nru r-base-3.2.3/m4/ltsugar.m4 r-base-3.3.1/m4/ltsugar.m4
--- r-base-3.2.3/m4/ltsugar.m4	2010-03-17 14:43:04.000000000 +0000
+++ r-base-3.3.1/m4/ltsugar.m4	2016-03-16 23:02:07.000000000 +0000
@@ -1,6 +1,7 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff -Nru r-base-3.2.3/m4/ltversion.m4 r-base-3.3.1/m4/ltversion.m4
--- r-base-3.2.3/m4/ltversion.m4	2010-03-17 14:43:04.000000000 +0000
+++ r-base-3.3.1/m4/ltversion.m4	2016-03-16 23:02:07.000000000 +0000
@@ -1,23 +1,23 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-dnl # serial 3012 ltversion.m4
+dnl # serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru r-base-3.2.3/m4/R.m4 r-base-3.3.1/m4/R.m4
--- r-base-3.2.3/m4/R.m4	2015-08-21 13:36:53.000000000 +0000
+++ r-base-3.3.1/m4/R.m4	2016-03-16 23:02:06.000000000 +0000
@@ -16,7 +16,7 @@
 ###
 ### You should have received a copy of the GNU General Public License
 ### along with R; if not, a copy is available at
-### http://www.r-project.org/Licenses/
+### https://www.r-project.org/Licenses/
 
 ### * General support macros
 
@@ -1968,36 +1968,29 @@
 [AC_CACHE_CHECK([for BSD networking],
                 [r_cv_bsd_networking],
 [if test "${ac_cv_header_netdb_h}" = yes \
+dnl needed for Rhttpd.c but missed before R 3.2.4
+     && test "${ac_cv_header_arpa_inet_h}" = yes \
      && test "${ac_cv_header_netinet_in_h}" = yes \
      && test "${ac_cv_header_sys_socket_h}" = yes \
      && test "${ac_cv_search_connect}" != no \
      && test "${ac_cv_search_gethostbyname}" !=  no; then
   r_cv_bsd_networking=yes
 else
-  r_cv_bsd_networking=no
+  AC_MSG_ERROR([BSD networking functions are required])
 fi])
-if test "${r_cv_bsd_networking}" = yes; then
-  AC_DEFINE(HAVE_BSD_NETWORKING, 1,
-            [Define if you have BSD networking headers and libraries.])
-  AC_DEFINE(HAVE_SOCKETS, 1,
-            [Define if you have support for sockets.])
-  AC_DEFINE(HAVE_INTERNET, 1,
-            [Define if you have support for ftp/http access.])
-  AC_DEFINE(SUPPORT_LIBXML, 1,
-            [Define if you provide support for the libxml ftp/http
-	     functions.])
-fi
 ])# R_BSD_NETWORKING
 
 ## R_BITMAPS
 ## ---------
+## This is the version used without png-config
 ## Here we only need any old -lz, and don't need zlib.h.
 ## However, we do need recent enough libpng and jpeg, and so check both
 ## the header versions and for key routines in the library.
 ## The png code will do a run-time check of the consistency of libpng
 ## versions.
 AC_DEFUN([R_BITMAPS],
-[BITMAP_LIBS=
+[BITMAP_CPPFLAGS=
+BITMAP_LIBS=
 if test "${use_jpeglib}" = yes; then
   _R_HEADER_JPEGLIB
   have_jpeg=${r_cv_header_jpeglib_h}
@@ -2052,9 +2045,104 @@
     fi
   fi
 fi
+AC_SUBST(BITMAP_CPPFLAGS)
 AC_SUBST(BITMAP_LIBS)
 ])# R_BITMAPS
 
+## R_BITMAPS2
+## ---------
+## This is the version used with png-config
+AC_DEFUN([R_BITMAPS2],
+[BITMAP_CPPFLAGS=
+BITMAP_LIBS=
+if test "${use_jpeglib}" = yes; then
+   save_CPPFLAGS=${CPPFLAGS}
+  ## jpeglib does not support pkg-config, although some OSes add it.
+  ## This is untested.
+  if "${PKGCONF}" --exists jpeg; then
+    JPG_CPPFLAGS=`"${PKGCONF}" --cflags jpeg`
+    JPG_LIBS=`"${PKGCONF}" --libs jpeg`
+    CPPFLAGS="${CPPFLAGS} ${JPG_CPPFLAGS}"
+  fi
+  _R_HEADER_JPEGLIB
+  CPPFLAGS=${save_CPPFLAGS}
+  have_jpeg=${r_cv_header_jpeglib_h}
+  if test "${have_jpeg}" = yes; then
+    AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
+		 [have_jpeg=yes], [have_jpeg=no], [${JPG_LIBS} ${LIBS}])
+  fi
+  if test "${have_jpeg}" = yes; then
+    if test -n "${JPG_LIBS}"; then
+      BITMAP_LIBS="${JPG_LIBS}"
+    else
+      BITMAP_LIBS=-ljpeg
+    fi
+    AC_DEFINE(HAVE_JPEG, 1,
+	      [Define if you have the JPEG headers and libraries.])
+  fi
+fi
+if test "${use_libpng}" = yes; then
+  if "${PKGCONF}" --exists libpng; then
+    save_CPPFLAGS=${CPPFLAGS}
+    PNG_CPPFLAGS=`"${PKGCONF}" --cflags libpng`
+    CPPFLAGS="${CPPFLAGS} ${PNG_CPPFLAGS}"
+    _R_HEADER_PNG
+    have_png=${r_cv_header_png_h}
+    CPPFLAGS=${save_CPPFLAGS}
+    if test "${have_png}" = yes; then
+      PNG_LIBS=`"${PKGCONF}" --libs libpng`
+      AC_CHECK_LIB(png, png_create_write_struct, 
+                   [have_png=yes], [have_png=no], [${PNG_LIBS} ${LIBS}])
+      if test "${have_png}" = no; then
+        PNG_LIBS=`"${PKGCONF}" --static --libs libpng`
+        AC_CHECK_LIB(png, png_create_write_struct, 
+                     [have_png=yes], [have_png=no], [${PNG_LIBS} ${LIBS}])
+      fi
+    fi
+    if test "${have_png}" = yes; then
+      BITMAP_CPPFLAGS="${BITMAP_CPPFLAGS} ${PNG_CPPFLAGS}"
+      BITMAP_LIBS="${BITMAP_LIBS} ${PNG_LIBS}"
+      AC_DEFINE(HAVE_PNG, 1,
+	        [Define if you have the PNG headers and libraries.])
+    fi
+  fi
+fi
+if test "${use_libtiff}" = yes; then
+  mod=
+  ## pkg-config support was introduced in libtiff 4.0.0
+  ## I guess the module name might change in future, so
+  ## program defensively here.
+  if "${PKGCONF}" --exists libtiff-4; then
+    mod=libtiff-4
+  fi  
+  if test -n "${mod}"; then
+    save_CPPFLAGS=${CPPFLAGS}
+    TIF_CPPFLAGS=`"${PKGCONF}" --cflags ${mod}`
+    CPPFLAGS="${CPPFLAGS} ${TIF_CPPFLAGS}"
+    AC_CHECK_HEADERS(tiffio.h)
+    CPPFLAGS=${save_CPPFLAGS}
+    if test "x${ac_cv_header_tiffio_h}" = xyes ; then
+      TIF_LIBS=`"${PKGCONF}" --libs ${mod}`
+      AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no],
+                   [${TIF_LIBS} ${BITMAP_LIBS}])
+      if test "x${have_tiff}" = xno; then
+        TIF_LIBS=`"${PKGCONF}" --static --libs ${mod}`
+        AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no],
+                     [${TIF_LIBS} ${BITMAP_LIBS}])
+      fi
+      if test "x${have_tiff}" = xyes; then
+        AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.])
+        BITMAP_LIBS="${TIF_LIBS} ${BITMAP_LIBS}"
+        BITMAP_CPPFLAGS="${BITMAP_CPPFLAGS} ${TIF_CPPFLAGS}"
+      fi
+    fi
+  fi
+fi
+AC_SUBST(BITMAP_CPPFLAGS)
+AC_SUBST(BITMAP_LIBS)
+])# R_BITMAPS2
+
+
 ## _R_HEADER_JPEGLIB
 ## -----------------
 ## Set shell variable r_cv_header_jpeglib_h to 'yes' if a recent enough
@@ -2303,6 +2391,7 @@
   if test "${have_tcltk}" = yes; then
     ## Part 2.  Check for tk.h.
     found_tk_h=no
+    found_tk_by_config=no
     if test -n "${TK_CONFIG}"; then
       . ${TK_CONFIG}
       ## TK_INCLUDE_SPEC (if set) is what we want.
@@ -2312,6 +2401,7 @@
 	AC_CHECK_HEADER([tk.h],
 		        [TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} ${TK_INCLUDE_SPEC}"
 			 found_tk_h=yes])
+	found_tk_by_config=yes
 	CPPFLAGS="${r_save_CPPFLAGS}"
       fi
       if test "${found_tk_h}" = no; then
@@ -2353,8 +2443,12 @@
     fi
   fi
 fi
+## TK_XINCLUDES should be empty for Aqua Tk, so earlier test was wrong
+## Our code does not include any X headers, but tk.h may ....
+## That is true even on OS X, but Aqua Tk has a private version of
+## X11 headers, and we want that one and not the XQuartz one.
 if test "${have_tcltk}" = yes; then
-  if test -n "${TK_XINCLUDES}"; then
+  if test "${found_tk_by_config}" = yes; then
     TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} ${TK_XINCLUDES}"
   else
     TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} ${X_CFLAGS}"
@@ -2366,8 +2460,7 @@
 ## -------------
 ## Find the tcl and tk libraries.
 AC_DEFUN([_R_TCLTK_LIBS],
-[AC_REQUIRE([AC_PATH_XTRA])
-AC_REQUIRE([_R_TCLTK_CONFIG])
+[AC_REQUIRE([_R_TCLTK_CONFIG])
 if test -z "${TCLTK_LIBS}"; then
   ## We have to do the work.
   if test "${have_tcltk}" = yes; then
@@ -2498,7 +2591,7 @@
 ##
 ## This is based on ACX_BLAS by Steven G. Johnson <stevenj@alum.mit.edu>
 ## from the Official Autoconf Macro Archive
-## (http://www.gnu.org/software/ac-archive/htmldoc/acx_blas.m4),
+## (https://www.gnu.org/software/ac-archive/htmldoc/acx_blas.m4),
 ## with the following changes:
 ## * We also handle HPUX .sl command line specifications.
 ## * We explictly deal with the case of f2c.  Most likely pointless.
@@ -2864,7 +2957,7 @@
 ##
 ## This is roughly based on ACX_LAPACK by Steven G. Johnson
 ## <stevenj@alum.mit.edu> from the Official Autoconf Macro Archive
-## (http://www.gnu.org/software/ac-archive/htmldoc/acx_lapack.m4),
+## (https://www.gnu.org/software/ac-archive/htmldoc/acx_lapack.m4),
 ## with the following changes:
 ## * We also handle HPUX .sl command line specifications.
 ## * We explictly deal with the case of f2c.  Most likely pointless.
@@ -2988,27 +3081,22 @@
 ## Try finding zlib library and headers.
 ## We check that both are installed, and that the header >= 1.2.3
 AC_DEFUN([R_ZLIB],
-[if test "x${use_system_zlib}" = xyes; then
-  AC_CHECK_LIB(z, inflateInit2_, [have_zlib=yes], [have_zlib=no])
-  if test "${have_zlib}" = yes; then
-    AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
-  fi
-  if test "${have_zlib}" = yes; then
-    _R_HEADER_ZLIB
-    have_zlib=${r_cv_header_zlib_h}
-  fi
-else
-  have_zlib="no"
+[AC_CHECK_LIB(z, inflateInit2_, [have_zlib=yes], [have_zlib=no])
+if test "${have_zlib}" = yes; then
+  AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 fi
-AC_MSG_CHECKING([whether zlib support needs to be compiled])
 if test "${have_zlib}" = yes; then
-  AC_MSG_RESULT([no])
-  LIBS="-lz ${LIBS}"
+  _R_HEADER_ZLIB
+  have_zlib=${r_cv_header_zlib_h}
+fi
+AC_MSG_CHECKING([whether zlib support suffices])
+if test "${have_zlib}" != yes; then
+  AC_MSG_ERROR([zlib library and headers are required])
 else
+  LIBS="-lz ${LIBS}"
   AC_MSG_RESULT([yes])
   _R_ZLIB_MMAP
 fi
-AM_CONDITIONAL(BUILD_ZLIB, [test "x${have_zlib}" = xno])
 AM_CONDITIONAL(USE_MMAP_ZLIB,
 [test "x${have_zlib}" = xno && test "x${r_cv_zlib_mmap}" = xyes])
 ])# R_ZLIB
@@ -3065,22 +3153,18 @@
 ## ------
 ## If selected, try finding system pcre library and headers.
 ## RedHat put the headers in /usr/include/pcre.
-## There are known problems < 8.10.
+## There are known problems < 8.10, and important bug fixes in 8.32
 AC_DEFUN([R_PCRE],
-[if test "x${use_system_pcre}" = xyes; then
-  AC_CHECK_LIB(pcre, pcre_fullinfo, [have_pcre=yes], [have_pcre=no])
-  if test "${have_pcre}" = yes; then
-    AC_CHECK_HEADERS(pcre.h pcre/pcre.h)
-    if test "${ac_cv_header_pcre_h}" = no \
-	&& test "${ac_cv_header_pcre_pcre_h}" = no; then
-      have_pcre=no
-    fi
+[AC_CHECK_LIB(pcre, pcre_fullinfo, [have_pcre=yes], [have_pcre=no])
+if test "${have_pcre}" = yes; then
+  AC_CHECK_HEADERS(pcre.h pcre/pcre.h)
+  if test "${ac_cv_header_pcre_h}" = no \
+    && test "${ac_cv_header_pcre_pcre_h}" = no; then
+    have_pcre=no
   fi
-else
-  have_pcre=no
 fi
-r_save_LIBS="${LIBS}"
 if test "x${have_pcre}" = xyes; then
+r_save_LIBS="${LIBS}"
 LIBS="-lpcre ${LIBS}"
 AC_CACHE_CHECK([if PCRE version >= 8.10, < 10.0 and has UTF-8 support], [r_cv_have_pcre810],
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -3113,14 +3197,36 @@
 if test "x${r_cv_have_pcre810}" != xyes; then
   have_pcre=no
   LIBS="${r_save_LIBS}"
+else
+AC_CACHE_CHECK([if PCRE version >= 8.32], [r_cv_have_pcre832],
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
+#ifdef HAVE_PCRE_H
+#include <pcre.h>
+#endif
+#endif
+int main() {
+#if PCRE_MAJOR == 8 && PCRE_MINOR >= 32
+  exit(0);
+#else
+  exit(1);
+#endif
+}
+]])], [r_cv_have_pcre832=yes], [r_cv_have_pcre832=no], [r_cv_have_pcre832=no])])
 fi
-AC_MSG_CHECKING([whether PCRE support needs to be compiled])
-if test "x${r_cv_have_pcre810}" = xyes; then
-  AC_MSG_RESULT([no])
+
+AC_MSG_CHECKING([whether PCRE support suffices])
+if test "x${r_cv_have_pcre810}" != xyes; then
+  AC_MSG_ERROR([pcre >= 8.10 library and headers are required])
 else
   AC_MSG_RESULT([yes])
 fi
-AM_CONDITIONAL(BUILD_PCRE, [test "x${r_cv_have_pcre810}" != xyes])
+if test "x${r_cv_have_pcre832}" != xyes; then
+  warn_pcre_version="pcre < 8.32 is deprecated"
+  AC_MSG_WARN([${warn_pcre_version}])
+fi
 ])# R_PCRE
 
 ## R_BZLIB
@@ -3129,13 +3235,9 @@
 ## We check that both are installed,
 ## and that BZ2_bzlibVersion is in the library.
 AC_DEFUN([R_BZLIB],
-[if test "x${use_system_bzlib}" = xyes; then
-  AC_CHECK_LIB(bz2, BZ2_bzlibVersion, [have_bzlib=yes], [have_bzlib=no])
-  if test "${have_bzlib}" = yes; then
-    AC_CHECK_HEADERS(bzlib.h, [have_bzlib=yes], [have_bzlib=no])
-  fi
-else
-  have_bzlib=no
+[AC_CHECK_LIB(bz2, BZ2_bzlibVersion, [have_bzlib=yes], [have_bzlib=no])
+if test "${have_bzlib}" = yes; then
+  AC_CHECK_HEADERS(bzlib.h, [have_bzlib=yes], [have_bzlib=no])
 fi
 if test "x${have_bzlib}" = xyes; then
 AC_CACHE_CHECK([if bzip2 version >= 1.0.6], [r_cv_have_bzlib],
@@ -3157,14 +3259,13 @@
 if test "x${r_cv_have_bzlib}" = xno; then
   have_bzlib=no
 fi
-AC_MSG_CHECKING([whether bzip2 support needs to be compiled])
+AC_MSG_CHECKING([whether bzip2 support suffices])
 if test "x${have_bzlib}" = xyes; then
   AC_MSG_RESULT([no])
   LIBS="-lbz2 ${LIBS}"
 else
-  AC_MSG_RESULT([yes])
+  AC_MSG_ERROR([bzip2 library and headers are required])
 fi
-AM_CONDITIONAL(BUILD_BZLIB, [test "x${have_bzlib}" = xno])
 ])# R_BZLIB
 
 ## R_TRE
@@ -3192,11 +3293,10 @@
 ## Try finding liblzma library and headers.
 ## We check that both are installed,
 AC_DEFUN([R_LZMA],
-[if test "x${use_system_xz}" = xyes; then
-  AC_CHECK_LIB(lzma, lzma_version_number, [have_lzma=yes], [have_lzma=no])
-  if test "${have_lzma}" = yes; then
-    AC_CHECK_HEADERS(lzma.h, [have_lzma=yes], [have_lzma=no])
-  fi
+[AC_CHECK_LIB(lzma, lzma_version_number, [have_lzma=yes], [have_lzma=no])
+if test "${have_lzma}" = yes; then
+  AC_CHECK_HEADERS(lzma.h, [have_lzma=yes], [have_lzma=no])
+fi
 if test "x${have_lzma}" = xyes; then
 AC_CACHE_CHECK([if lzma version >= 5.0.3], [r_cv_have_lzma],
 [AC_LANG_PUSH(C)
@@ -3223,11 +3323,9 @@
 if test "x${have_lzma}" = xyes; then
   AC_DEFINE(HAVE_LZMA, 1, [Define if your system has lzma >= 5.0.3.])
   LIBS="-llzma ${LIBS}"
-fi
 else
-  have_lzma="no"
+  AC_MSG_ERROR("liblzma library and headers are required")
 fi
-AM_CONDITIONAL(BUILD_XZ, [test x${have_lzma} != xyes])
 ])# R_LZMA
 
 
@@ -4048,6 +4146,87 @@
 AC_ARG_VAR([SHLIB_CXX1XLDFLAGS], [special flags used by SHLIB_CXX1XLD])
 ])# R_CXX1X
 
+## R_LIBCURL
+## ----------------
+AC_DEFUN([R_LIBCURL],
+[## curl-config might not match the installed libcurl,
+## so we allow the user to set CURL_CPPFLAGS, CURL_LIBS
+## and check the version directly rather than by curl-config --checkfor
+AC_PATH_PROG(CURL_CONFIG, curl-config)
+if test -n "${CURL_CONFIG}"; then
+  echo "checking libcurl version ..." \
+    `${CURL_CONFIG} --version | sed -e 's,^[[^0-9]]*,,'`
+  if test -z "${CURL_CPPFLAGS}"; then
+    CURL_CPPFLAGS=`${CURL_CONFIG} --cflags`
+  fi
+  ## This should be correct for a static-only build, user will
+  ## need to override to specify static linking (see config.site)
+  if test -z "${CURL_LIBS}"; then
+    CURL_LIBS=`${CURL_CONFIG} --libs`
+  fi
+fi
+r_save_CPPFLAGS="${CPPLAGS}"
+CPPFLAGS="${CURL_CPPFLAGS} ${CPPFLAGS}"
+r_save_LIBS="${LIBS}"
+LIBS="${CURL_LIBS} ${LIBS}"
+AC_CHECK_HEADERS(curl/curl.h, [have_libcurl=yes], [have_libcurl=no])
+
+if test "x${have_libcurl}" = "xyes"; then
+AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0], [r_cv_have_curl728],
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdlib.h>
+#include <curl/curl.h>
+int main() 
+{
+#ifdef LIBCURL_VERSION_MAJOR
+#if LIBCURL_VERSION_MAJOR > 7
+  exit(1);
+#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
+  exit(0);
+#else
+  exit(1);
+#endif
+#else
+  exit(1);
+#endif
+}
+]])], [r_cv_have_curl728=yes], [r_cv_have_curl728=no], [r_cv_have_curl728=no])])
+fi
+if test "x${r_cv_have_curl728}" = xno; then
+  have_libcurl=no
+fi
+
+if test "x${have_libcurl}" = "xyes"; then
+AC_CACHE_CHECK([if libcurl supports https], [r_cv_have_curl_https],
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <string.h>
+#include <curl/curl.h>
+int main()
+{
+    curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+    const char * const *p  = data->protocols;
+    int found = 0;
+    for (; *p; p++)
+	if(strcmp(*p, "https") == 0) {found = 1; break;}
+    exit(found ? 0 : 1);
+}
+]])], [r_cv_have_curl_https=yes], [r_cv_have_curl_https=no], [r_cv_have_curl_https=no])])
+fi
+if test "x${r_cv_have_curl_https}" = xno; then
+  have_libcurl=no
+fi
+if test "x${have_libcurl}" = xyes; then
+  AC_DEFINE(HAVE_LIBCURL, 1, [Define if your system has libcurl >= 7.28.0 with support for https.])
+  CPPFLAGS="${r_save_CPPFLAGS}"
+  LIBS="${r_save_LIBS}"
+  AC_SUBST(CURL_CPPFLAGS)
+  AC_SUBST(CURL_LIBS)
+else
+  AC_MSG_ERROR([libcurl >= 7.28.0 library and headers are required with support for https])
+fi
+])# R_LIBCURL
+
+
 
 ### Local variables: ***
 ### mode: outline-minor ***
diff -Nru r-base-3.2.3/share/Rd/macros/system.Rd r-base-3.3.1/share/Rd/macros/system.Rd
--- r-base-3.2.3/share/Rd/macros/system.Rd	2015-08-25 22:19:12.000000000 +0000
+++ r-base-3.3.1/share/Rd/macros/system.Rd	2016-03-16 23:04:39.000000000 +0000
@@ -44,4 +44,4 @@
 \newcommand{\packageIndices}{\Sexpr[results=rd,stage=build]{tools:::Rd_package_indices("#1")}}
 
 % To indicate a DOI.
-\newcommand{\doi}{doi:\sspace\href{http://doi.org/#1}{#1}}
+\newcommand{\doi}{\Sexpr[results=rd,stage=build]{tools:::Rd_expr_doi("#1")}}
diff -Nru r-base-3.2.3/share/texmf/bibtex/bib/RJournal.bib r-base-3.3.1/share/texmf/bibtex/bib/RJournal.bib
--- r-base-3.2.3/share/texmf/bibtex/bib/RJournal.bib	2015-12-09 23:15:26.000000000 +0000
+++ r-base-3.3.1/share/texmf/bibtex/bib/RJournal.bib	2016-06-20 22:15:14.000000000 +0000
@@ -1,3 +1,321 @@
+
+
+
+
+
+
+@Article{messner-mayr-zeileis:,
+  author       = {Jakob W. Messner and Georg J. Mayr and Achim Zeileis}, 
+  title        = {Heteroscedastic Censored and Truncated Regression with crch}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/messner-mayr-zeileis.pdf}
+
+
+
+@Article{joblin-mauerer:,
+  author       = {Mitchell Joblin and Wolfgang Mauerer}, 
+  title        = {An Interactive Survey Application for Validating Social Network Analysis Techniques}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/joblin-mauerer.pdf}
+
+
+
+@Article{linares-lopez-moliner:,
+  author       = {Daniel Linares and Joan L{\' o}pez-Moliner}, 
+  title        = {quickpsy: An R Package to Fit Psychometric Functions for Multiple Groups}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/linares-lopez-moliner.pdf}
+
+
+
+@Article{calvo-santafe:,
+  author       = {Borja Calvo and Guzm{\' a}n Santaf{\' e}}, 
+  title        = {scmamp: Statistical Comparison of Multiple Algorithms in Multiple Problems}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/calvo-santafe.pdf}
+
+
+
+@Article{eder-rybicki-kestemont:,
+  author       = {Maciej Eder and Jan Rybicki and Mike Kestemont}, 
+  title        = {Stylometry with R: A Package for Computational Text Analysis}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/eder-rybicki-kestemont.pdf}
+
+
+
+@Article{demirhan:,
+  author       = {Haydar Demirhan}, 
+  title        = {rTableICC: An R Package for Random Generation of 2*2*K and R*C Contingency Tables}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/demirhan.pdf}
+
+
+
+@Article{beck:,
+  author       = {Marcus W Beck}, 
+  title        = {SWMPr: An R Package for Retrieving, Organizing, and Analyzing Environmental Data for Estuaries}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/beck.pdf}
+
+
+
+@Article{north:,
+  author       = {Michael North}, 
+  title        = {SchemaOnRead: A Package for Schema-on-Read in R}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/north.pdf}
+
+
+
+@Article{sophie-brouste-istas:,
+  author       = {Lambert-Lacroix Sophie and Alexandre Brouste and Jacques Istas}, 
+  title        = {Bridges associated to fractional Brownian motion and multifractional Brownian motion.}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/sophie-brouste-istas.pdf}
+
+
+
+@Article{franck-osborne:,
+  author       = {Christopher T. Franck and Jason A. Osborne}, 
+  title        = {Exploring Interaction Effects in Factorial Studies using the hiddenf Package in R}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/franck-osborne.pdf}
+
+
+
+@Article{pritikin-schmidt:,
+  author       = {Joshua Pritikin and Karen Schmidt}, 
+  title        = {Model Builder for Item Factor Analysis with OpenMx}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/pritikin-schmidt.pdf}
+
+
+
+@Article{demirhan-bitirim:,
+  author       = {Haydar Demirhan and Nihan Bitirim}, 
+  title        = {CryptRndTest: An R Package for Testing the Cryptographic Randomness}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/demirhan-bitirim.pdf}
+
+
+
+@Article{jacques-yengo-biernacki-etal:,
+  author       = {Julien Jacques and Loïc Yengo and Christophe Biernacki and Mickael Canouil}, 
+  title        = {Variable Clustering in High-Dimensional Linear Regression: The R Package clere}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/jacques-yengo-biernacki-etal.pdf}
+
+
+
+@Article{sestelo-villanueva-meiramachado-etal:,
+  author       = {Marta Sestelo and Nora M. Villanueva and Luís Meira-Machado and Javier Roca-Pardiñas}, 
+  title        = {FWDselect: An R Package for Variable Selection in Regression Models}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/sestelo-villanueva-meiramachado-etal.pdf}
+
+
+
+@Article{szkaliczki:,
+  author       = {Tibor Szkaliczki}, 
+  title        = {clustering.sc.dp: Optimal Clustering with Sequential Constraint by Using Dynamic Programming}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/szkaliczki.pdf}
+
+
+
+@Article{an-liu:,
+  author       = {Weihua An and Yu-Hsin Liu}, 
+  title        = {keyplayer: An R Package for Locating Key Players in Social Networks}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/an-liu.pdf}
+
+
+
+@Article{hu-qutub:,
+  author       = {Chenyue W. Hu and Amina A. Qutub}, 
+  title        = {progenyClust: an R package for Progeny Clustering}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/hu-qutub.pdf}
+
+
+
+@Article{wright:,
+  author       = {Erik Wright}, 
+  title        = {Using DECIPHER v2.0 to Analyze Big Biological Sequence Data in R}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/wright.pdf}
+
+
+
+@Article{beath:,
+  author       = {Dr Ken J. Beath}, 
+  title        = {metaplus: An R Package for the Analysis of Robust Meta-Analysis and Meta-Regression}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/beath.pdf}
+
+
+
+@Article{leeper:,
+  author       = {Thomas J. Leeper}, 
+  title        = {Crowdsourced Data Preprocessing with R and Amazon Mechanical Turk}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/leeper.pdf}
+
+
+
+@Article{na-pebesma-heuvelink:,
+  author       = {Benedikt Gräler and Edzer Pebesma and Gerard Heuvelink}, 
+  title        = {Spatio-Temporal Geostatistics using gstat}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/na-pebesma-heuvelink.pdf}
+
+
+
+@Article{keyes-rudis-jacobs:,
+  author       = {Oliver Keyes and Bob Rudis and Jay Jacobs}, 
+  title        = {R Packages to Aid in Handling Web Access Logs}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/keyes-rudis-jacobs.pdf}
+
+
+
+@Article{yozgatligil-dag:,
+  author       = {Osman Dag and Ceylan Yozgatligil}, 
+  title        = {GMDH: An R Package for Short Term Forecasting via GMDH - Type Neural Network Algorithms}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/yozgatligil-dag.pdf}
+
+
+
+@Article{scrucca-fop-murphy-etal:,
+  author       = {Luca Scrucca and Michael Fop and T. Brendan Murphy and Adrian E. Raftery}, 
+  title        = {mclust 5: Clustering, Classification and Density Estimation Using Gaussian Finite Mixture Models}, 
+  journal      = {The R Journal},
+  year         = ,
+  volume       = ,
+  number       = ,
+  pages        = {},  
+  month        = ,
+  url          = {http://journal.r-project.org/archive/-/scrucca-fop-murphy-etal.pdf}
+
+
+
 @Article{RJournal:2009-1:Chambers,
   author       = {John M. Chambers}, 
   title        = {Facets of {R}}, 
@@ -1097,7 +1415,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {4--6},  
+  pages        = {4--5},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/editorial.pdf}
 
@@ -1110,7 +1428,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {6--13},  
+  pages        = {6--12},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/collingwood-jurka-boydstun-etal.pdf}
 
@@ -1123,7 +1441,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {13--29},  
+  pages        = {13--28},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/xiang-gubian-suomela-etal.pdf}
 
@@ -1136,7 +1454,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {29--39},  
+  pages        = {29--38},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/kostov-becuebertaut-husson.pdf}
 
@@ -1149,7 +1467,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {39--53},  
+  pages        = {39--52},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/fox-friendly-weisberg.pdf}
 
@@ -1162,7 +1480,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {53--64},  
+  pages        = {53--63},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/eugster-schlesinger.pdf}
 
@@ -1175,7 +1493,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {64--73},  
+  pages        = {64--72},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/shang.pdf}
 
@@ -1188,7 +1506,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {73--80},  
+  pages        = {73--79},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/godfrey.pdf}
 
@@ -1201,7 +1519,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {80--87},  
+  pages        = {80--86},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/zagaglia.pdf}
 
@@ -1214,7 +1532,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {87--98},  
+  pages        = {87--97},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/thiem-dusa.pdf}
 
@@ -1227,7 +1545,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {98--108},  
+  pages        = {98--107},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/colleter-guitton-gascuel.pdf}
 
@@ -1240,7 +1558,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {108--117},  
+  pages        = {108--116},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/valle-dellomodarme.pdf}
 
@@ -1253,7 +1571,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {117--130},  
+  pages        = {117--129},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/hofmann-unwin-cook.pdf}
 
@@ -1266,7 +1584,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {130--144},  
+  pages        = {130--143},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/wilhelm-matos.pdf}
 
@@ -1279,7 +1597,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {144--162},  
+  pages        = {144--161},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/kahle-wickham.pdf}
 
@@ -1292,7 +1610,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {162--171},  
+  pages        = {162--170},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/kahle.pdf}
 
@@ -1305,7 +1623,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {171--181},  
+  pages        = {171--180},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/forcheh-verbeke-kasim-etal.pdf}
 
@@ -1318,7 +1636,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {181--188},  
+  pages        = {181--187},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/mcdaniel-henderson-rathouz.pdf}
 
@@ -1331,7 +1649,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {188--197},  
+  pages        = {188--196},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/bouchetvalat-bastin.pdf}
 
@@ -1344,7 +1662,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {197--207},  
+  pages        = {197--206},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/ooms.pdf}
 
@@ -1357,7 +1675,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {207--210},  
+  pages        = {207--209},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/lebauer-dietze-bolker.pdf}
 
@@ -1370,7 +1688,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {210--212},  
+  pages        = {210--211},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/chinese-r-conf.pdf}
 
@@ -1383,7 +1701,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {212--215},  
+  pages        = {212--214},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/r-finance.pdf}
 
@@ -1396,7 +1714,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {215--218},  
+  pages        = {215--217},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/user2013.pdf}
 
@@ -1409,7 +1727,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {218--220},  
+  pages        = {218--219},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/bioconductor.pdf}
 
@@ -1422,7 +1740,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {220--221},  
+  pages        = {220--220},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/r-foundation.pdf}
 
@@ -1435,7 +1753,7 @@
   year         = 2013,
   volume       = 5,
   number       = 1,
-  pages        = {221--239},  
+  pages        = {221--238},  
   month        = jun,
   url          = {http://journal.r-project.org/archive/2013-1/r-changes.pdf}
 
@@ -1461,7 +1779,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {3--4},  
+  pages        = {3--3},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/editorial.pdf}
 
@@ -1474,7 +1792,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {4--16},  
+  pages        = {4--15},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/armstrong.pdf}
 
@@ -1487,7 +1805,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {16--29},  
+  pages        = {16--28},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/sartore.pdf}
 
@@ -1500,7 +1818,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {29--37},  
+  pages        = {29--36},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/michna-woods.pdf}
 
@@ -1513,7 +1831,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {37--53},  
+  pages        = {37--52},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/roediger-bohm-schimke.pdf}
 
@@ -1539,7 +1857,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {62--71},  
+  pages        = {62--70},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/wang-shan.pdf}
 
@@ -1552,7 +1870,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {71--80},  
+  pages        = {71--79},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/bilgic-susmann.pdf}
 
@@ -1565,7 +1883,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {80--88},  
+  pages        = {80--87},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/sax-steiner.pdf}
 
@@ -1578,7 +1896,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {88--97},  
+  pages        = {88--96},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/boehringer.pdf}
 
@@ -1591,7 +1909,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {97--104},  
+  pages        = {97--103},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/nadarajah-bakar.pdf}
 
@@ -1604,7 +1922,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {104--117},  
+  pages        = {104--116},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/gaure.pdf}
 
@@ -1617,7 +1935,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {117--129},  
+  pages        = {117--128},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/dietrich-zug-kaiser.pdf}
 
@@ -1630,7 +1948,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {129--137},  
+  pages        = {129--136},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/hofert.pdf}
 
@@ -1643,7 +1961,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {137--148},  
+  pages        = {137--147},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/sucarrat.pdf}
 
@@ -1656,7 +1974,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {148--161},  
+  pages        = {148--160},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/murrell.pdf}
 
@@ -1669,7 +1987,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {161--162},  
+  pages        = {161--161},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/r-foundation.pdf}
 
@@ -1682,7 +2000,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {162--164},  
+  pages        = {162--163},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/bioconductor.pdf}
 
@@ -1695,7 +2013,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {164--166},  
+  pages        = {164--165},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/siberchicot-dray.pdf}
 
@@ -1708,7 +2026,7 @@
   year         = 2013,
   volume       = 5,
   number       = 2,
-  pages        = {166--192},  
+  pages        = {166--191},  
   month        = dec,
   url          = {http://journal.r-project.org/archive/2013-2/cran.pdf}
 
@@ -2534,7 +2852,7 @@
 
 
 @Article{r-foundation:2015,
-  author       = {Martin M{\" a}chler and Kurt Hornik}, 
+  author       = {Kurt Hornik}, 
   title        = {{R} {F}oundation News}, 
   journal      = {The R Journal},
   year         = 2015,
@@ -2583,3 +2901,341 @@
   month        = jun,
   url          = {http://journal.r-project.org/archive/2015-1/bioconductor.pdf}
 
+
+
+@Article{editorial:2015,
+  author       = {Bettina Gr{\" u}n}, 
+  title        = {Editorial}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {4},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/editorial.pdf}
+
+
+
+@Article{alam-ronnegard-shen:2015,
+  author       = {Moudud Alam and Lars R\"onneg{\aa}rd and Xia Shen}, 
+  title        = {Fitting Conditional and Simultaneous Autoregressive Spatial Models in hglm}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {5--18},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/alam-ronnegard-shen.pdf}
+
+
+
+@Article{genuer-poggi-tuleaumalot:2015,
+  author       = {Robin Genuer and Jean-Michel Poggi and Christine Tuleau-Malot}, 
+  title        = {{VSURF}: An {R} Package for Variable Selection Using Random Forests}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {19--33},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/genuer-poggi-tuleaumalot.pdf}
+
+
+
+@Article{liu-kong:2015,
+  author       = {Fang Liu and Yunchuan Kong}, 
+  title        = {zoib: An {R} Package for Bayesian Inference for Beta Regression and Zero/One Inflated Beta Regression}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {34--51},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/liu-kong.pdf}
+
+
+
+@Article{nielsen:2015,
+  author       = {Bent Nielsen}, 
+  title        = {{apc}: An {R} Package for Age-Period-Cohort Analysis}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {52--64},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/nielsen.pdf}
+
+
+
+@Article{charlier-paindaveine-saracco:2015,
+  author       = {Isabelle Charlier and Davy Paindaveine, and J{\' e}r{\^ o}me Saracco}, 
+  title        = {{QuantifQuantile}: An {R} Package for Performing Quantile Regression Through Optimal Quantization}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {65--80},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/charlier-paindaveine-saracco.pdf}
+
+
+
+@Article{hankin:2015,
+  author       = {Robin K. S. Hankin}, 
+  title        = {Numerical Evaluation of the {G}auss Hypergeometric Function with the hypergeo Package}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {81--88},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/hankin.pdf}
+
+
+
+@Article{villacorta-saez:2015,
+  author       = {Pablo J. Villacorta and Jos{\' e} A. S{\' a}ez}, 
+  title        = {{SRCS}: Statistical Ranking Color Scheme for Visualizing Parameterized Multiple Pairwise Comparisons with {R}}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {89--104},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/villacorta-saez.pdf}
+
+
+
+@Article{vegabayo:2015,
+  author       = {Ainhoa Vega-Bayo}, 
+  title        = {An {R} Package for the Panel Approach Method for Program Evaluation: pampe}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {105--121},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/vegabayo.pdf}
+
+
+
+@Article{lee-chen:2015,
+  author       = {Kuo-Jung Lee and Ray-Bing Chen}, 
+  title        = {{BSGS}: {B}ayesian Sparse Group Selection}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {122--133},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/lee-chen.pdf}
+
+
+
+@Article{vigneau-chen-qannari:2015,
+  author       = {Evelyne Vigneau and Mingkun Chen and El Mostafa Qannari}, 
+  title        = {{ClustVarLV}: An {R} Package for the Clustering of Variables Around Latent Variables}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {134--148},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/vigneau-chen-qannari.pdf}
+
+
+
+@Article{charte-charte:2015,
+  author       = {Francisco Charte and David Charte}, 
+  title        = {Working with Multilabel Datasets in {R}: The mldr Package}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {149--162},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/charte-charte.pdf}
+
+
+
+@Article{valliant-dever-kreuter:2015,
+  author       = {Richard Valliant and Jill A. Dever and Frauke Kreuter}, 
+  title        = {{PracTools}: Computations for Design of Finite Population Samples}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {163--176},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/valliant-dever-kreuter.pdf}
+
+
+
+@Article{seo-pan:2015,
+  author       = {Kangwon Seo and Rong Pan}, 
+  title        = {{ALTopt}: An {R} Package for Optimal Experimental Design of Accelerated Life Testing}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {177--188},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/seo-pan.pdf}
+
+
+
+@Article{nunes-prangle:2015,
+  author       = {Matthew A. Nunes and Dennis Prangle}, 
+  title        = {{abctools}: An {R} Package for Tuning Approximate {B}ayesian Computation Analyses}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {189--205},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/nunes-prangle.pdf}
+
+
+
+@Article{wang-faivre-richard-etal:2015,
+  author       = {Juhui Wang and Robert Faivre and Herv{\' e} Richard and Herv{\' e} Monod}, 
+  title        = {{mtk}: A General-Purpose and Extensible {R} Environment for Uncertainty and Sensitivity Analyses of Numerical Experiments}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {206--226},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/wang-faivre-richard-etal.pdf}
+
+
+
+@Article{buttrey-whitaker:2015,
+  author       = {Samuel E. Buttrey and Lyn R. Whitaker}, 
+  title        = {{treeClust}: An {R} Package for Tree-Based Clustering Dissimilarities}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {227--236},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/buttrey-whitaker.pdf}
+
+
+
+@Article{hino-takano-murata:2015,
+  author       = {Hideitsu Hino and Ken Takano and Noboru Murata}, 
+  title        = {mmpp: A Package for Calculating Similarity and Distance Metrics for Simple and Marked Point Processes}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {237--248},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/hino-takano-murata.pdf}
+
+
+
+@Article{koohafkan-younis:2015,
+  author       = {Michael C. Koohafkan and Bassam A. Younis}, 
+  title        = {Open-Channel Computation with {R}}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {249--262},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/koohafkan-younis.pdf}
+
+
+
+@Article{morina-higueras-puig-etal:2015,
+  author       = {David Mori{\~n}a and Manuel Higueras and Pedro Puig and Mar{\' i}a Oliveira}, 
+  title        = {Generalized {H}ermite Distribution Modelling with the {R} Package hermite}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {263--274},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/morina-higueras-puig-etal.pdf}
+
+
+
+@Article{rubio-villar:2015,
+  author       = {Angel Rubio and Fernando de Villar}, 
+  title        = {Code Profiling in {R}: A Review of Existing Methods and an Introduction to Package {GUIProfiler}}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {275--287},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/rubio-villar.pdf}
+
+
+
+@Article{plummer:2015,
+  author       = {Martyn Plummer}, 
+  title        = {The {R} Consortium and the {R} Foundation}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {288},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/plummer.pdf}
+
+
+
+@Article{tvedebrink:2015,
+  author       = {Torben Tvedebrink}, 
+  title        = {Conference Report: {useR!} 2015}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {289--290},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/tvedebrink.pdf}
+
+
+
+@Article{bioconductor:2015,
+  author       = {The Bioconductor Team}, 
+  title        = {News from the {B}ioconductor Project}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {291--292},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/bioconductor.pdf}
+
+
+
+@Article{r-changes:2015,
+  author       = {The R Core Team}, 
+  title        = {Changes in {R}}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {293--297},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/r-changes.pdf}
+
+
+
+@Article{cran:2015,
+  author       = {Kurt Hornik and Achim Zeileis}, 
+  title        = {Changes on {CRAN}}, 
+  journal      = {The R Journal},
+  year         = 2015,
+  volume       = 7,
+  number       = 2,
+  pages        = {298--339},  
+  month        = dec,
+  url          = {http://journal.r-project.org/archive/2015-2/cran.pdf}
+
diff -Nru r-base-3.2.3/src/appl/integrate.c r-base-3.3.1/src/appl/integrate.c
--- r-base-3.2.3/src/appl/integrate.c	2015-08-25 22:19:01.000000000 +0000
+++ r-base-3.3.1/src/appl/integrate.c	2015-12-10 23:15:18.000000000 +0000
@@ -18,7 +18,7 @@
  *
  *  Most of this file is C translations of Fortran routines in
  *  QUADPACK: the latter is part of SLATEC 'and therefore in the public
- *  domain' (http://en.wikipedia.org/wiki/QUADPACK).
+ *  domain' (https://en.wikipedia.org/wiki/QUADPACK).
  *
  *
  */
diff -Nru r-base-3.2.3/src/appl/interv.c r-base-3.3.1/src/appl/interv.c
--- r-base-3.2.3/src/appl/interv.c	2015-08-25 22:19:01.000000000 +0000
+++ r-base-3.3.1/src/appl/interv.c	2016-03-16 23:04:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2002	      The R Core Team
+ *  Copyright (C) 2002--2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@
   return findInterval(xt, *n, *x, *rightmost_closed, *all_inside, *ilo, mflag);
 }
 
-int findInterval(double *xt, int n, double x,
-		  Rboolean rightmost_closed,  Rboolean all_inside, int ilo,
-		  int *mflag)
+int findInterval2(double *xt, int n, double x,
+		  Rboolean rightmost_closed, Rboolean all_inside, Rboolean left_open,
+		  int ilo, int *mflag)
 {
     int istep, middle, ihi;
 
@@ -51,8 +51,10 @@
 	to be determined.
   rightmost_closed {logical} indicating if the rightmost xt[] interval
 	should be closed, i.e. result := n-1 if x == x[n]
-  mflag =: all_inside	    {logical} indicating if result should be coerced
+	(when left_open, the *leftmost* interval should be closed.)
+  all_inside {logical} indicating if result should be coerced
 		to lie inside {1, n-1}
+  left_open  {logical} use intervals (s, t] instead of [s, t)
   ilo   typically the result of the last call to findInterval(.)
 	`ilo' used to be a static variable (in Fortran) which is not
 	desirable in R anymore (threads!).
@@ -95,56 +97,75 @@
   left = ilo  is then returned.
 */
 
-#define left_boundary  { *mflag = -1;	return(all_inside ? 1 : 0); }
+#define left_boundary  { *mflag = -1; \
+	return((all_inside || (rightmost_closed && x == xt[1])) ? 1 : 0); }
 
 #define right_boundary { *mflag = +1;					\
 	return((all_inside || (rightmost_closed && x == xt[n]))		\
 		? (n - 1) : n); }
 
+#define X_grtr(XT_v) x > XT_v || (!left_open && x >= XT_v)
+#define X_smlr(XT_v) x < XT_v ||  (left_open && x <= XT_v)
+
+
     /* 1-indexing : */
     --xt;
 
     if(ilo <= 0) {
-	if (x < xt[1])			left_boundary;
+	if (X_smlr(xt[1]))		left_boundary;
 	ilo = 1;
     }
     ihi = ilo + 1;
     if (ihi >= n) {
-	if (x >= xt[n])			right_boundary;
+	if (X_grtr(xt[n]))		right_boundary;
 	if (n <= 1) /* x < xt[1] */	left_boundary;
 	ilo = n - 1;
 	ihi = n;
     }
 
-    if (x < xt[ihi]) {
-	if (x >= xt[ilo]) { /* `lucky': same interval as last time */
+    if (X_smlr(xt[ihi])) {
+	if (X_grtr(xt[ilo])) {
+	    /* `lucky': same interval as last time */
 	    *mflag = 0;	   return ilo;
 	}
 	/* **** now x < xt[ilo] .	decrease  ilo  to capture  x */
-	for(istep = 1; ; istep *= 2) {
+	if(!left_open) for(istep = 1; ; istep *= 2) {
 	    ihi = ilo;
 	    ilo = ihi - istep;
 	    if (ilo <= 1)
 		break;
 	    if (x >= xt[ilo])		goto L50;
+	} else for(istep = 1; ; istep *= 2) {
+	    ihi = ilo;
+	    ilo = ihi - istep;
+	    if (ilo <= 1)
+		break;
+	    if (x > xt[ilo])		goto L51;
 	}
 	ilo = 1;
-	if (x < xt[1])			left_boundary;
+	if (X_smlr(xt[1]))		left_boundary;
     }
     else {
 	/* **** now x >= xt[ihi] .	increase  ihi  to capture  x */
-	for(istep = 1; ; istep *= 2) {
+	if(!left_open) for(istep = 1; ; istep *= 2) {
 	    ilo = ihi;
 	    ihi = ilo + istep;
 	    if (ihi >= n)
 		break;
 	    if (x < xt[ihi])		goto L50;
 	}
-	if (x >= xt[n])			right_boundary;
+	else for(istep = 1; ; istep *= 2) {
+	    ilo = ihi;
+	    ihi = ilo + istep;
+	    if (ihi >= n)
+		break;
+	    if (x <= xt[ihi])		goto L51;
+	}
+	if (X_grtr(xt[n]))		right_boundary;
 	ihi = n;
     }
 
-  L50:
+L50: // ! left_open
     /* **** now xt[ilo] <= x < xt[ihi] . narrow the interval. */
     for(;;) {
 	middle = (ilo + ihi) / 2;
@@ -157,4 +178,26 @@
 	else
 	    ihi = middle;
     }
-} /* findInterval */
+
+L51: // left_open
+    /* **** now xt[ilo] < x <= xt[ihi] . narrow the interval. */
+    for(;;) {
+	middle = (ilo + ihi) / 2;
+	if (middle == ilo) {
+	    *mflag = 0;	   return ilo;
+	}
+	/* note. it is assumed that middle = ilo in case ihi = ilo+1 . */
+	if (x > xt[middle])
+	    ilo = middle;
+	else
+	    ihi = middle;
+    }
+} /* findInterval2 */
+
+// has been in API -- keep for compatibility:
+int findInterval(double *xt, int n, double x,
+		 Rboolean rightmost_closed,  Rboolean all_inside, int ilo,
+		 int *mflag)
+{
+    return findInterval2(xt, n, x, rightmost_closed, all_inside, FALSE, ilo, mflag);
+}
diff -Nru r-base-3.2.3/src/appl/Makefile.in r-base-3.3.1/src/appl/Makefile.in
--- r-base-3.2.3/src/appl/Makefile.in	2015-08-25 22:19:00.000000000 +0000
+++ r-base-3.3.1/src/appl/Makefile.in	2015-12-10 23:15:18.000000000 +0000
@@ -47,8 +47,8 @@
 	@$(MAKE) libappl.a
 
 libappl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS)
+	@rm -f $@
+	$(AR) -cr $@ $(OBJECTS)
 	$(RANLIB) $@
 
 blas.o: $(top_srcdir)/src/extra/blas/blas.f
diff -Nru r-base-3.2.3/src/extra/blas/Makefile.in r-base-3.3.1/src/extra/blas/Makefile.in
--- r-base-3.2.3/src/extra/blas/Makefile.in	2015-08-25 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/extra/blas/Makefile.in	2016-03-16 23:02:11.000000000 +0000
@@ -33,8 +33,8 @@
 	@$(MAKE) rhome="$(abs_top_builddir)" Rblas_install
 
 blas_OBJS=blas.o @COMPILE_FORTRAN_DOUBLE_COMPLEX_FALSE@ cmplxblas.o
-@USE_EXTERNAL_BLAS_FALSE@$(Rblas_la): $(blas_OBJS) @BUILD_CYGWIN_TRUE@ xerbla.o
-@USE_EXTERNAL_BLAS_FALSE@	$(DYLIB_LINK) -o $(Rblas_la) $(blas_OBJS) $(Rblas_la_LIBADD) @BUILD_CYGWIN_TRUE@ xerbla.o
+@USE_EXTERNAL_BLAS_FALSE@$(Rblas_la): $(blas_OBJS)
+@USE_EXTERNAL_BLAS_FALSE@	$(DYLIB_LINK) -o $(Rblas_la) $(blas_OBJS) $(Rblas_la_LIBADD)
 
 @USE_EXTERNAL_BLAS_TRUE@$(Rblas_la): blas00.o
 @USE_EXTERNAL_BLAS_TRUE@	$(DYLIB_LINK) -o $(Rblas_la) $^ @BLAS_LIBS0@ $(Rblas_la_LIBADD0)
@@ -65,7 +65,7 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 DISTFILES = Makefile.in Makefile.win Rblas.def \
-  $(SOURCES) $(HEADERS) xerbla.c
+  $(SOURCES) $(HEADERS)
 
 distdir: $(DISTFILES)
 	@for f in $(DISTFILES); do \
diff -Nru r-base-3.2.3/src/extra/blas/xerbla.c r-base-3.3.1/src/extra/blas/xerbla.c
--- r-base-3.2.3/src/extra/blas/xerbla.c	2010-03-17 14:43:05.000000000 +0000
+++ r-base-3.3.1/src/extra/blas/xerbla.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-/* It seems Cygwin does not allow mutually dependent dlls, so fake xerbla */
-
-#include <S.h>
-
-/* Fortran-callable error routine for lapack */
-
-void F77_NAME(xerbla)(const char *srname, int *info)
-{
-   /* srname is not null-terminated.  It should be 6 characters. */
-    char buf[7];
-    strncpy(buf, srname, 6);
-    buf[6] = '\0';
-    printf("BLAS/LAPACK routine '%6s' gave error code %d", buf, -(*info));
-}
diff -Nru r-base-3.2.3/src/extra/bzip2/blocksort.c r-base-3.3.1/src/extra/bzip2/blocksort.c
--- r-base-3.2.3/src/extra/bzip2/blocksort.c	2015-03-18 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/blocksort.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1099 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Block sorting machinery                               ---*/
-/*---                                           blocksort.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-/*---------------------------------------------*/
-/*--- Fallback O(N log(N)^2) sorting        ---*/
-/*--- algorithm, for repetitive blocks      ---*/
-/*---------------------------------------------*/
-
-/*---------------------------------------------*/
-static 
-R_INLINE
-void fallbackSimpleSort ( UInt32* fmap, 
-                          UInt32* eclass, 
-                          Int32   lo, 
-                          Int32   hi )
-{
-   Int32 i, j, tmp;
-   UInt32 ec_tmp;
-
-   if (lo == hi) return;
-
-   if (hi - lo > 3) {
-      for ( i = hi-4; i >= lo; i-- ) {
-         tmp = fmap[i];
-         ec_tmp = eclass[tmp];
-         for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 )
-            fmap[j-4] = fmap[j];
-         fmap[j-4] = tmp;
-      }
-   }
-
-   for ( i = hi-1; i >= lo; i-- ) {
-      tmp = fmap[i];
-      ec_tmp = eclass[tmp];
-      for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ )
-         fmap[j-1] = fmap[j];
-      fmap[j-1] = tmp;
-   }
-}
-
-
-/*---------------------------------------------*/
-#define fswap(zz1, zz2) \
-   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
-
-#define fvswap(zzp1, zzp2, zzn)       \
-{                                     \
-   Int32 yyp1 = (zzp1);               \
-   Int32 yyp2 = (zzp2);               \
-   Int32 yyn  = (zzn);                \
-   while (yyn > 0) {                  \
-      fswap(fmap[yyp1], fmap[yyp2]);  \
-      yyp1++; yyp2++; yyn--;          \
-   }                                  \
-}
-
-
-#define fmin(a,b) ((a) < (b)) ? (a) : (b)
-
-#define fpush(lz,hz) { stackLo[sp] = lz; \
-                       stackHi[sp] = hz; \
-                       sp++; }
-
-#define fpop(lz,hz) { sp--;              \
-                      lz = stackLo[sp];  \
-                      hz = stackHi[sp]; }
-
-#define FALLBACK_QSORT_SMALL_THRESH 10
-#define FALLBACK_QSORT_STACK_SIZE   100
-
-
-static
-void fallbackQSort3 ( UInt32* fmap, 
-                      UInt32* eclass,
-                      Int32   loSt, 
-                      Int32   hiSt )
-{
-   Int32 unLo, unHi, ltLo, gtHi, n, m;
-   Int32 sp, lo, hi;
-   UInt32 med, r, r3;
-   Int32 stackLo[FALLBACK_QSORT_STACK_SIZE];
-   Int32 stackHi[FALLBACK_QSORT_STACK_SIZE];
-
-   r = 0;
-
-   sp = 0;
-   fpush ( loSt, hiSt );
-
-   while (sp > 0) {
-
-      AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 );
-
-      fpop ( lo, hi );
-      if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
-         fallbackSimpleSort ( fmap, eclass, lo, hi );
-         continue;
-      }
-
-      /* Random partitioning.  Median of 3 sometimes fails to
-         avoid bad cases.  Median of 9 seems to help but 
-         looks rather expensive.  This too seems to work but
-         is cheaper.  Guidance for the magic constants 
-         7621 and 32768 is taken from Sedgewick's algorithms
-         book, chapter 35.
-      */
-      r = ((r * 7621) + 1) % 32768;
-      r3 = r % 3;
-      if (r3 == 0) med = eclass[fmap[lo]]; else
-      if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else
-                   med = eclass[fmap[hi]];
-
-      unLo = ltLo = lo;
-      unHi = gtHi = hi;
-
-      while (1) {
-         while (1) {
-            if (unLo > unHi) break;
-            n = (Int32)eclass[fmap[unLo]] - (Int32)med;
-            if (n == 0) { 
-               fswap(fmap[unLo], fmap[ltLo]); 
-               ltLo++; unLo++; 
-               continue; 
-            };
-            if (n > 0) break;
-            unLo++;
-         }
-         while (1) {
-            if (unLo > unHi) break;
-            n = (Int32)eclass[fmap[unHi]] - (Int32)med;
-            if (n == 0) { 
-               fswap(fmap[unHi], fmap[gtHi]); 
-               gtHi--; unHi--; 
-               continue; 
-            };
-            if (n < 0) break;
-            unHi--;
-         }
-         if (unLo > unHi) break;
-         fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--;
-      }
-
-      AssertD ( unHi == unLo-1, "fallbackQSort3(2)" );
-
-      if (gtHi < ltLo) continue;
-
-      n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n);
-      m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m);
-
-      n = lo + unLo - ltLo - 1;
-      m = hi - (gtHi - unHi) + 1;
-
-      if (n - lo > hi - m) {
-         fpush ( lo, n );
-         fpush ( m, hi );
-      } else {
-         fpush ( m, hi );
-         fpush ( lo, n );
-      }
-   }
-}
-
-#undef fmin
-#undef fpush
-#undef fpop
-#undef fswap
-#undef fvswap
-#undef FALLBACK_QSORT_SMALL_THRESH
-#undef FALLBACK_QSORT_STACK_SIZE
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > 0
-      eclass exists for [0 .. nblock-1]
-      ((UChar*)eclass) [0 .. nblock-1] holds block
-      ptr exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)eclass) [0 .. nblock-1] holds block
-      All other areas of eclass destroyed
-      fmap [0 .. nblock-1] holds sorted order
-      bhtab [ 0 .. 2+(nblock/32) ] destroyed
-*/
-
-// R_change: these shifts on signed ints are undefined behaviour.
-#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1U << ((zz) & 31))
-#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1U << ((zz) & 31))
-#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1U << ((zz) & 31)))
-#define      WORD_BH(zz)  bhtab[(zz) >> 5]
-#define UNALIGNED_BH(zz)  ((zz) & 0x01f)
-
-static
-void fallbackSort ( UInt32* fmap, 
-                    UInt32* eclass, 
-                    UInt32* bhtab,
-                    Int32   nblock,
-                    Int32   verb )
-{
-   Int32 ftab[257];
-   Int32 ftabCopy[256];
-   Int32 H, i, j, k, l, r, cc, cc1;
-   Int32 nNotDone;
-   Int32 nBhtab;
-   UChar* eclass8 = (UChar*)eclass;
-
-   /*--
-      Initial 1-char radix sort to generate
-      initial fmap and initial BH bits.
-   --*/
-   if (verb >= 4)
-      VPrintf0 ( "        bucket sorting ...\n" );
-   for (i = 0; i < 257;    i++) ftab[i] = 0;
-   for (i = 0; i < nblock; i++) ftab[eclass8[i]]++;
-   for (i = 0; i < 256;    i++) ftabCopy[i] = ftab[i];
-   for (i = 1; i < 257;    i++) ftab[i] += ftab[i-1];
-
-   for (i = 0; i < nblock; i++) {
-      j = eclass8[i];
-      k = ftab[j] - 1;
-      ftab[j] = k;
-      fmap[k] = i;
-   }
-
-   nBhtab = 2 + (nblock / 32);
-   for (i = 0; i < nBhtab; i++) bhtab[i] = 0;
-   for (i = 0; i < 256; i++) SET_BH(ftab[i]);
-
-   /*--
-      Inductively refine the buckets.  Kind-of an
-      "exponential radix sort" (!), inspired by the
-      Manber-Myers suffix array construction algorithm.
-   --*/
-
-   /*-- set sentinel bits for block-end detection --*/
-   for (i = 0; i < 32; i++) { 
-      SET_BH(nblock + 2*i);
-      CLEAR_BH(nblock + 2*i + 1);
-   }
-
-   /*-- the log(N) loop --*/
-   H = 1;
-   while (1) {
-
-      if (verb >= 4) 
-         VPrintf1 ( "        depth %6d has ", H );
-
-      j = 0;
-      for (i = 0; i < nblock; i++) {
-         if (ISSET_BH(i)) j = i;
-         k = fmap[i] - H; if (k < 0) k += nblock;
-         eclass[k] = j;
-      }
-
-      nNotDone = 0;
-      r = -1;
-      while (1) {
-
-	 /*-- find the next non-singleton bucket --*/
-         k = r + 1;
-         while (ISSET_BH(k) && UNALIGNED_BH(k)) k++;
-         if (ISSET_BH(k)) {
-            while (WORD_BH(k) == 0xffffffff) k += 32;
-            while (ISSET_BH(k)) k++;
-         }
-         l = k - 1;
-         if (l >= nblock) break;
-         while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++;
-         if (!ISSET_BH(k)) {
-            while (WORD_BH(k) == 0x00000000) k += 32;
-            while (!ISSET_BH(k)) k++;
-         }
-         r = k - 1;
-         if (r >= nblock) break;
-
-         /*-- now [l, r] bracket current bucket --*/
-         if (r > l) {
-            nNotDone += (r - l + 1);
-            fallbackQSort3 ( fmap, eclass, l, r );
-
-            /*-- scan bucket and generate header bits-- */
-            cc = -1;
-            for (i = l; i <= r; i++) {
-               cc1 = eclass[fmap[i]];
-               if (cc != cc1) { SET_BH(i); cc = cc1; };
-            }
-         }
-      }
-
-      if (verb >= 4) 
-         VPrintf1 ( "%6d unresolved strings\n", nNotDone );
-
-      H *= 2;
-      if (H > nblock || nNotDone == 0) break;
-   }
-
-   /*-- 
-      Reconstruct the original block in
-      eclass8 [0 .. nblock-1], since the
-      previous phase destroyed it.
-   --*/
-   if (verb >= 4)
-      VPrintf0 ( "        reconstructing block ...\n" );
-   j = 0;
-   for (i = 0; i < nblock; i++) {
-      while (ftabCopy[j] == 0) j++;
-      ftabCopy[j]--;
-      eclass8[fmap[i]] = (UChar)j;
-   }
-   AssertH ( j < 256, 1005 );
-}
-
-#undef       SET_BH
-#undef     CLEAR_BH
-#undef     ISSET_BH
-#undef      WORD_BH
-#undef UNALIGNED_BH
-
-
-/*---------------------------------------------*/
-/*--- The main, O(N^2 log(N)) sorting       ---*/
-/*--- algorithm.  Faster for "normal"       ---*/
-/*--- non-repetitive blocks.                ---*/
-/*---------------------------------------------*/
-
-/*---------------------------------------------*/
-/* Solaris cc objects to inlining functions whose names start with `main' */
-#ifdef __SUNPRO_C
-# define mainGtU BZmainGtU
-#endif
-static
-R_INLINE
-Bool mainGtU ( UInt32  i1, 
-               UInt32  i2,
-               UChar*  block, 
-               UInt16* quadrant,
-               UInt32  nblock,
-               Int32*  budget )
-{
-   Int32  k;
-   UChar  c1, c2;
-   UInt16 s1, s2;
-
-   AssertD ( i1 != i2, "mainGtU" );
-   /* 1 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 2 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 3 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 4 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 5 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 6 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 7 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 8 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 9 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 10 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 11 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 12 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-
-   k = nblock + 8;
-
-   do {
-      /* 1 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 2 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 3 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 4 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 5 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 6 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 7 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 8 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-
-      if (i1 >= nblock) i1 -= nblock;
-      if (i2 >= nblock) i2 -= nblock;
-
-      k -= 8;
-      (*budget)--;
-   }
-      while (k >= 0);
-
-   return False;
-}
-
-
-/*---------------------------------------------*/
-/*--
-   Knuth's increments seem to work better
-   than Incerpi-Sedgewick here.  Possibly
-   because the number of elems to sort is
-   usually small, typically <= 20.
---*/
-static
-Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
-                   9841, 29524, 88573, 265720,
-                   797161, 2391484 };
-
-static
-void mainSimpleSort ( UInt32* ptr,
-                      UChar*  block,
-                      UInt16* quadrant,
-                      Int32   nblock,
-                      Int32   lo, 
-                      Int32   hi, 
-                      Int32   d,
-                      Int32*  budget )
-{
-   Int32 i, j, h, bigN, hp;
-   UInt32 v;
-
-   bigN = hi - lo + 1;
-   if (bigN < 2) return;
-
-   hp = 0;
-   while (incs[hp] < bigN) hp++;
-   hp--;
-
-   for (; hp >= 0; hp--) {
-      h = incs[hp];
-
-      i = lo + h;
-      while (True) {
-
-         /*-- copy 1 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         /*-- copy 2 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         /*-- copy 3 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         if (*budget < 0) return;
-      }
-   }
-}
-
-
-/*---------------------------------------------*/
-/*--
-   The following is an implementation of
-   an elegant 3-way quicksort for strings,
-   described in a paper "Fast Algorithms for
-   Sorting and Searching Strings", by Robert
-   Sedgewick and Jon L. Bentley.
---*/
-
-#define mswap(zz1, zz2) \
-   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
-
-#define mvswap(zzp1, zzp2, zzn)       \
-{                                     \
-   Int32 yyp1 = (zzp1);               \
-   Int32 yyp2 = (zzp2);               \
-   Int32 yyn  = (zzn);                \
-   while (yyn > 0) {                  \
-      mswap(ptr[yyp1], ptr[yyp2]);    \
-      yyp1++; yyp2++; yyn--;          \
-   }                                  \
-}
-
-static 
-R_INLINE
-UChar mmed3 ( UChar a, UChar b, UChar c )
-{
-   UChar t;
-   if (a > b) { t = a; a = b; b = t; };
-   if (b > c) { 
-      b = c;
-      if (a > b) b = a;
-   }
-   return b;
-}
-
-#define mmin(a,b) ((a) < (b)) ? (a) : (b)
-
-#define mpush(lz,hz,dz) { stackLo[sp] = lz; \
-                          stackHi[sp] = hz; \
-                          stackD [sp] = dz; \
-                          sp++; }
-
-#define mpop(lz,hz,dz) { sp--;             \
-                         lz = stackLo[sp]; \
-                         hz = stackHi[sp]; \
-                         dz = stackD [sp]; }
-
-
-#define mnextsize(az) (nextHi[az]-nextLo[az])
-
-#define mnextswap(az,bz)                                        \
-   { Int32 tz;                                                  \
-     tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \
-     tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \
-     tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; }
-
-
-#define MAIN_QSORT_SMALL_THRESH 20
-#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT)
-#define MAIN_QSORT_STACK_SIZE 100
-
-static
-void mainQSort3 ( UInt32* ptr,
-                  UChar*  block,
-                  UInt16* quadrant,
-                  Int32   nblock,
-                  Int32   loSt, 
-                  Int32   hiSt, 
-                  Int32   dSt,
-                  Int32*  budget )
-{
-   Int32 unLo, unHi, ltLo, gtHi, n, m, med;
-   Int32 sp, lo, hi, d;
-
-   Int32 stackLo[MAIN_QSORT_STACK_SIZE];
-   Int32 stackHi[MAIN_QSORT_STACK_SIZE];
-   Int32 stackD [MAIN_QSORT_STACK_SIZE];
-
-   Int32 nextLo[3];
-   Int32 nextHi[3];
-   Int32 nextD [3];
-
-   sp = 0;
-   mpush ( loSt, hiSt, dSt );
-
-   while (sp > 0) {
-
-      AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 );
-
-      mpop ( lo, hi, d );
-      if (hi - lo < MAIN_QSORT_SMALL_THRESH || 
-          d > MAIN_QSORT_DEPTH_THRESH) {
-         mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget );
-         if (*budget < 0) return;
-         continue;
-      }
-
-      med = (Int32) 
-            mmed3 ( block[ptr[ lo         ]+d],
-                    block[ptr[ hi         ]+d],
-                    block[ptr[ (lo+hi)>>1 ]+d] );
-
-      unLo = ltLo = lo;
-      unHi = gtHi = hi;
-
-      while (True) {
-         while (True) {
-            if (unLo > unHi) break;
-            n = ((Int32)block[ptr[unLo]+d]) - med;
-            if (n == 0) { 
-               mswap(ptr[unLo], ptr[ltLo]); 
-               ltLo++; unLo++; continue; 
-            };
-            if (n >  0) break;
-            unLo++;
-         }
-         while (True) {
-            if (unLo > unHi) break;
-            n = ((Int32)block[ptr[unHi]+d]) - med;
-            if (n == 0) { 
-               mswap(ptr[unHi], ptr[gtHi]); 
-               gtHi--; unHi--; continue; 
-            };
-            if (n <  0) break;
-            unHi--;
-         }
-         if (unLo > unHi) break;
-         mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--;
-      }
-
-      AssertD ( unHi == unLo-1, "mainQSort3(2)" );
-
-      if (gtHi < ltLo) {
-         mpush(lo, hi, d+1 );
-         continue;
-      }
-
-      n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n);
-      m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m);
-
-      n = lo + unLo - ltLo - 1;
-      m = hi - (gtHi - unHi) + 1;
-
-      nextLo[0] = lo;  nextHi[0] = n;   nextD[0] = d;
-      nextLo[1] = m;   nextHi[1] = hi;  nextD[1] = d;
-      nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1;
-
-      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
-      if (mnextsize(1) < mnextsize(2)) mnextswap(1,2);
-      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
-
-      AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" );
-      AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" );
-
-      mpush (nextLo[0], nextHi[0], nextD[0]);
-      mpush (nextLo[1], nextHi[1], nextD[1]);
-      mpush (nextLo[2], nextHi[2], nextD[2]);
-   }
-}
-
-#undef mswap
-#undef mvswap
-#undef mpush
-#undef mpop
-#undef mmin
-#undef mnextsize
-#undef mnextswap
-#undef MAIN_QSORT_SMALL_THRESH
-#undef MAIN_QSORT_DEPTH_THRESH
-#undef MAIN_QSORT_STACK_SIZE
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > N_OVERSHOOT
-      block32 exists for [0 .. nblock-1 +N_OVERSHOOT]
-      ((UChar*)block32) [0 .. nblock-1] holds block
-      ptr exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)block32) [0 .. nblock-1] holds block
-      All other areas of block32 destroyed
-      ftab [0 .. 65536 ] destroyed
-      ptr [0 .. nblock-1] holds sorted order
-      if (*budget < 0), sorting was abandoned
-*/
-
-#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8])
-#define SETMASK (1 << 21)
-#define CLEARMASK (~(SETMASK))
-
-static
-void mainSort ( UInt32* ptr, 
-                UChar*  block,
-                UInt16* quadrant, 
-                UInt32* ftab,
-                Int32   nblock,
-                Int32   verb,
-                Int32*  budget )
-{
-   Int32  i, j, k, ss, sb;
-   Int32  runningOrder[256];
-   Bool   bigDone[256];
-   Int32  copyStart[256];
-   Int32  copyEnd  [256];
-   UChar  c1;
-   Int32  numQSorted;
-   UInt16 s;
-   if (verb >= 4) VPrintf0 ( "        main sort initialise ...\n" );
-
-   /*-- set up the 2-byte frequency table --*/
-   for (i = 65536; i >= 0; i--) ftab[i] = 0;
-
-   j = block[0] << 8;
-   i = nblock-1;
-   for (; i >= 3; i -= 4) {
-      quadrant[i] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
-      ftab[j]++;
-      quadrant[i-1] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-1]) << 8);
-      ftab[j]++;
-      quadrant[i-2] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-2]) << 8);
-      ftab[j]++;
-      quadrant[i-3] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-3]) << 8);
-      ftab[j]++;
-   }
-   for (; i >= 0; i--) {
-      quadrant[i] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
-      ftab[j]++;
-   }
-
-   /*-- (emphasises close relationship of block & quadrant) --*/
-   for (i = 0; i < BZ_N_OVERSHOOT; i++) {
-      block   [nblock+i] = block[i];
-      quadrant[nblock+i] = 0;
-   }
-
-   if (verb >= 4) VPrintf0 ( "        bucket sorting ...\n" );
-
-   /*-- Complete the initial radix sort --*/
-   for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1];
-
-   s = block[0] << 8;
-   i = nblock-1;
-   for (; i >= 3; i -= 4) {
-      s = (s >> 8) | (block[i] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i;
-      s = (s >> 8) | (block[i-1] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-1;
-      s = (s >> 8) | (block[i-2] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-2;
-      s = (s >> 8) | (block[i-3] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-3;
-   }
-   for (; i >= 0; i--) {
-      s = (s >> 8) | (block[i] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i;
-   }
-
-   /*--
-      Now ftab contains the first loc of every small bucket.
-      Calculate the running order, from smallest to largest
-      big bucket.
-   --*/
-   for (i = 0; i <= 255; i++) {
-      bigDone     [i] = False;
-      runningOrder[i] = i;
-   }
-
-   {
-      Int32 vv;
-      Int32 h = 1;
-      do h = 3 * h + 1; while (h <= 256);
-      do {
-         h = h / 3;
-         for (i = h; i <= 255; i++) {
-            vv = runningOrder[i];
-            j = i;
-            while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) {
-               runningOrder[j] = runningOrder[j-h];
-               j = j - h;
-               if (j <= (h - 1)) goto zero;
-            }
-            zero:
-            runningOrder[j] = vv;
-         }
-      } while (h != 1);
-   }
-
-   /*--
-      The main sorting loop.
-   --*/
-
-   numQSorted = 0;
-
-   for (i = 0; i <= 255; i++) {
-
-      /*--
-         Process big buckets, starting with the least full.
-         Basically this is a 3-step process in which we call
-         mainQSort3 to sort the small buckets [ss, j], but
-         also make a big effort to avoid the calls if we can.
-      --*/
-      ss = runningOrder[i];
-
-      /*--
-         Step 1:
-         Complete the big bucket [ss] by quicksorting
-         any unsorted small buckets [ss, j], for j != ss.  
-         Hopefully previous pointer-scanning phases have already
-         completed many of the small buckets [ss, j], so
-         we don't have to sort them at all.
-      --*/
-      for (j = 0; j <= 255; j++) {
-         if (j != ss) {
-            sb = (ss << 8) + j;
-            if ( ! (ftab[sb] & SETMASK) ) {
-               Int32 lo = ftab[sb]   & CLEARMASK;
-               Int32 hi = (ftab[sb+1] & CLEARMASK) - 1;
-               if (hi > lo) {
-                  if (verb >= 4)
-                     VPrintf4 ( "        qsort [0x%x, 0x%x]   "
-                                "done %d   this %d\n",
-                                ss, j, numQSorted, hi - lo + 1 );
-                  mainQSort3 ( 
-                     ptr, block, quadrant, nblock, 
-                     lo, hi, BZ_N_RADIX, budget 
-                  );   
-                  numQSorted += (hi - lo + 1);
-                  if (*budget < 0) return;
-               }
-            }
-            ftab[sb] |= SETMASK;
-         }
-      }
-
-      AssertH ( !bigDone[ss], 1006 );
-
-      /*--
-         Step 2:
-         Now scan this big bucket [ss] so as to synthesise the
-         sorted order for small buckets [t, ss] for all t,
-         including, magically, the bucket [ss,ss] too.
-         This will avoid doing Real Work in subsequent Step 1's.
-      --*/
-      {
-         for (j = 0; j <= 255; j++) {
-            copyStart[j] =  ftab[(j << 8) + ss]     & CLEARMASK;
-            copyEnd  [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1;
-         }
-         for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) {
-            k = ptr[j]-1; if (k < 0) k += nblock;
-            c1 = block[k];
-            if (!bigDone[c1])
-               ptr[ copyStart[c1]++ ] = k;
-         }
-         for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) {
-            k = ptr[j]-1; if (k < 0) k += nblock;
-            c1 = block[k];
-            if (!bigDone[c1]) 
-               ptr[ copyEnd[c1]-- ] = k;
-         }
-      }
-
-      AssertH ( (copyStart[ss]-1 == copyEnd[ss])
-                || 
-                /* Extremely rare case missing in bzip2-1.0.0 and 1.0.1.
-                   Necessity for this case is demonstrated by compressing 
-                   a sequence of approximately 48.5 million of character 
-                   251; 1.0.0/1.0.1 will then die here. */
-                (copyStart[ss] == 0 && copyEnd[ss] == nblock-1),
-                1007 )
-
-      for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK;
-
-      /*--
-         Step 3:
-         The [ss] big bucket is now done.  Record this fact,
-         and update the quadrant descriptors.  Remember to
-         update quadrants in the overshoot area too, if
-         necessary.  The "if (i < 255)" test merely skips
-         this updating for the last bucket processed, since
-         updating for the last bucket is pointless.
-
-         The quadrant array provides a way to incrementally
-         cache sort orderings, as they appear, so as to 
-         make subsequent comparisons in fullGtU() complete
-         faster.  For repetitive blocks this makes a big
-         difference (but not big enough to be able to avoid
-         the fallback sorting mechanism, exponential radix sort).
-
-         The precise meaning is: at all times:
-
-            for 0 <= i < nblock and 0 <= j <= nblock
-
-            if block[i] != block[j], 
-
-               then the relative values of quadrant[i] and 
-                    quadrant[j] are meaningless.
-
-               else {
-                  if quadrant[i] < quadrant[j]
-                     then the string starting at i lexicographically
-                     precedes the string starting at j
-
-                  else if quadrant[i] > quadrant[j]
-                     then the string starting at j lexicographically
-                     precedes the string starting at i
-
-                  else
-                     the relative ordering of the strings starting
-                     at i and j has not yet been determined.
-               }
-      --*/
-      bigDone[ss] = True;
-
-      if (i < 255) {
-         Int32 bbStart  = ftab[ss << 8] & CLEARMASK;
-         Int32 bbSize   = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;
-         Int32 shifts   = 0;
-
-         while ((bbSize >> shifts) > 65534) shifts++;
-
-         for (j = bbSize-1; j >= 0; j--) {
-            Int32 a2update     = ptr[bbStart + j];
-            UInt16 qVal        = (UInt16)(j >> shifts);
-            quadrant[a2update] = qVal;
-            if (a2update < BZ_N_OVERSHOOT)
-               quadrant[a2update + nblock] = qVal;
-         }
-         AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 );
-      }
-
-   }
-
-   if (verb >= 4)
-      VPrintf3 ( "        %d pointers, %d sorted, %d scanned\n",
-                 nblock, numQSorted, nblock - numQSorted );
-}
-
-#undef BIGFREQ
-#undef SETMASK
-#undef CLEARMASK
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > 0
-      arr2 exists for [0 .. nblock-1 +N_OVERSHOOT]
-      ((UChar*)arr2)  [0 .. nblock-1] holds block
-      arr1 exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)arr2) [0 .. nblock-1] holds block
-      All other areas of block destroyed
-      ftab [ 0 .. 65536 ] destroyed
-      arr1 [0 .. nblock-1] holds sorted order
-*/
-void BZ2_blockSort ( EState* s )
-{
-   UInt32* ptr    = s->ptr; 
-   UChar*  block  = s->block;
-   UInt32* ftab   = s->ftab;
-   Int32   nblock = s->nblock;
-   Int32   verb   = s->verbosity;
-   Int32   wfact  = s->workFactor;
-   UInt16* quadrant;
-   Int32   budget;
-   Int32   budgetInit;
-   Int32   i;
-
-   if (nblock < 10000) {
-      fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
-   } else {
-      /* Calculate the location for quadrant, remembering to get
-         the alignment right.  Assumes that &(block[0]) is at least
-         2-byte aligned -- this should be ok since block is really
-         the first section of arr2.
-      */
-      i = nblock+BZ_N_OVERSHOOT;
-      if (i & 1) i++;
-      quadrant = (UInt16*)(&(block[i]));
-
-      /* (wfact-1) / 3 puts the default-factor-30
-         transition point at very roughly the same place as 
-         with v0.1 and v0.9.0.  
-         Not that it particularly matters any more, since the
-         resulting compressed stream is now the same regardless
-         of whether or not we use the main sort or fallback sort.
-      */
-      if (wfact < 1  ) wfact = 1;
-      if (wfact > 100) wfact = 100;
-      budgetInit = nblock * ((wfact-1) / 3);
-      budget = budgetInit;
-
-      mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget );
-      if (verb >= 3) 
-         VPrintf3 ( "      %d work, %d block, ratio %5.2f\n",
-                    budgetInit - budget,
-                    nblock, 
-                    (float)(budgetInit - budget) /
-                    (float)(nblock==0 ? 1 : nblock) ); 
-      if (budget < 0) {
-         if (verb >= 2) 
-            VPrintf0 ( "    too repetitive; using fallback"
-                       " sorting algorithm\n" );
-         fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
-      }
-   }
-
-   s->origPtr = -1;
-   for (i = 0; i < s->nblock; i++)
-      if (ptr[i] == 0)
-         { s->origPtr = i; break; };
-
-   AssertH( s->origPtr != -1, 1003 );
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                       blocksort.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/bzlib.c r-base-3.3.1/src/extra/bzip2/bzlib.c
--- r-base-3.2.3/src/extra/bzip2/bzlib.c	2015-03-18 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/bzlib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1586 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Library top-level functions.                          ---*/
-/*---                                               bzlib.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-/* CHANGES
-   0.9.0    -- original version.
-   0.9.0a/b -- no changes in this file.
-   0.9.0c   -- made zero-length BZ_FLUSH work correctly in bzCompress().
-     fixed bzWrite/bzRead to ignore zero-length requests.
-     fixed bzread to correctly handle read requests after EOF.
-     wrong parameter order in call to bzDecompressInit in
-     bzBuffToBuffDecompress.  Fixed.
-*/
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-/*--- Compression stuff                           ---*/
-/*---------------------------------------------------*/
-
-
-/*---------------------------------------------------*/
-#ifndef BZ_NO_STDIO
-void BZ2_bz__AssertH__fail ( int errcode )
-{
-   fprintf(stderr, 
-      "\n\nbzip2/libbzip2: internal error number %d.\n"
-      "This is a bug in bzip2/libbzip2, %s.\n"
-      "Please report it to me at: jseward@bzip.org.  If this happened\n"
-      "when you were using some program which uses libbzip2 as a\n"
-      "component, you should also report this bug to the author(s)\n"
-      "of that program.  Please make an effort to report this bug;\n"
-      "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 10 December 2007.\n\n",
-      errcode,
-      BZ2_bzlibVersion()
-   );
-
-   /* split up over-long message */
-   if (errcode == 1007) {
-       fprintf(stderr, "%s%s%s",
-      "\n*** A special note about internal error number 1007 ***\n"
-      "\n"
-      "Experience suggests that a common cause of i.e. 1007\n"
-      "is unreliable memory or other hardware.  The 1007 assertion\n"
-      "just happens to cross-check the results of huge numbers of\n"
-      "memory reads/writes, and so acts (unintendedly) as a stress\n"
-      "test of your memory system.\n"
-       "\n",
-      "I suggest the following: try compressing the file again,\n"
-      "possibly monitoring progress in detail with the -vv flag.\n"
-      "\n"
-      "* If the error cannot be reproduced, and/or happens at different\n"
-      "  points in compression, you may have a flaky memory system.\n"
-      "  Try a memory-test program.  I have used Memtest86\n"
-      "  (www.memtest86.com).  At the time of writing it is free (GPLd).\n"
-      "  Memtest86 tests memory much more thorougly than your BIOSs\n"
-      "  power-on test, and may find failures that the BIOS doesn't.\n"
-      "\n",
-      "* If the error can be repeatably reproduced, this is a bug in\n"
-      "  bzip2, and I would very much like to hear about it.  Please\n"
-      "  let me know, and, ideally, save a copy of the file causing the\n"
-      "  problem -- without which I will be unable to investigate it.\n"
-      "\n"
-   );
-   }
-
-   exit(3);
-}
-#endif
-
-
-/*---------------------------------------------------*/
-static
-int bz_config_ok ( void )
-{
-   if (sizeof(int)   != 4) return 0;
-   if (sizeof(short) != 2) return 0;
-   if (sizeof(char)  != 1) return 0;
-   return 1;
-}
-
-
-/*---------------------------------------------------*/
-static
-void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
-{
-   void* v = malloc ( items * size );
-   return v;
-}
-
-static
-void default_bzfree ( void* opaque, void* addr )
-{
-   if (addr != NULL) free ( addr );
-}
-
-
-/*---------------------------------------------------*/
-static
-void prepare_new_block ( EState* s )
-{
-   Int32 i;
-   s->nblock = 0;
-   s->numZ = 0;
-   s->state_out_pos = 0;
-   BZ_INITIALISE_CRC ( s->blockCRC );
-   for (i = 0; i < 256; i++) s->inUse[i] = False;
-   s->blockNo++;
-}
-
-
-/*---------------------------------------------------*/
-static
-void init_RL ( EState* s )
-{
-   s->state_in_ch  = 256;
-   s->state_in_len = 0;
-}
-
-
-static
-Bool isempty_RL ( EState* s )
-{
-   if (s->state_in_ch < 256 && s->state_in_len > 0)
-      return False; else
-      return True;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompressInit) 
-                    ( bz_stream* strm, 
-                     int        blockSize100k,
-                     int        verbosity,
-                     int        workFactor )
-{
-   Int32   n;
-   EState* s;
-
-   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
-
-   if (strm == NULL || 
-       blockSize100k < 1 || blockSize100k > 9 ||
-       workFactor < 0 || workFactor > 250)
-     return BZ_PARAM_ERROR;
-
-   if (workFactor == 0) workFactor = 30;
-   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
-
-   s = (EState *) BZALLOC( sizeof(EState) );
-   if (s == NULL) return BZ_MEM_ERROR;
-   s->strm = strm;
-
-   s->arr1 = NULL;
-   s->arr2 = NULL;
-   s->ftab = NULL;
-
-   n       = 100000 * blockSize100k;
-   s->arr1 = (UInt32 *) BZALLOC( n                  * sizeof(UInt32) );
-   s->arr2 = (UInt32 *) BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
-   s->ftab = (UInt32 *) BZALLOC( 65537              * sizeof(UInt32) );
-
-   if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) {
-      if (s->arr1 != NULL) BZFREE(s->arr1);
-      if (s->arr2 != NULL) BZFREE(s->arr2);
-      if (s->ftab != NULL) BZFREE(s->ftab);
-      if (s       != NULL) BZFREE(s);
-      return BZ_MEM_ERROR;
-   }
-
-   s->blockNo           = 0;
-   s->state             = BZ_S_INPUT;
-   s->mode              = BZ_M_RUNNING;
-   s->combinedCRC       = 0;
-   s->blockSize100k     = blockSize100k;
-   s->nblockMAX         = 100000 * blockSize100k - 19;
-   s->verbosity         = verbosity;
-   s->workFactor        = workFactor;
-
-   s->block             = (UChar*)s->arr2;
-   s->mtfv              = (UInt16*)s->arr1;
-   s->zbits             = NULL;
-   s->ptr               = (UInt32*)s->arr1;
-
-   strm->state          = s;
-   strm->total_in_lo32  = 0;
-   strm->total_in_hi32  = 0;
-   strm->total_out_lo32 = 0;
-   strm->total_out_hi32 = 0;
-   init_RL ( s );
-   prepare_new_block ( s );
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-static
-void add_pair_to_block ( EState* s )
-{
-   Int32 i;
-   UChar ch = (UChar)(s->state_in_ch);
-   for (i = 0; i < s->state_in_len; i++) {
-      BZ_UPDATE_CRC( s->blockCRC, ch );
-   }
-   s->inUse[s->state_in_ch] = True;
-   switch (s->state_in_len) {
-      case 1:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      case 2:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      case 3:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      default:
-         s->inUse[s->state_in_len-4] = True;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = ((UChar)(s->state_in_len-4));
-         s->nblock++;
-         break;
-   }
-}
-
-
-/*---------------------------------------------------*/
-static
-void flush_RL ( EState* s )
-{
-   if (s->state_in_ch < 256) add_pair_to_block ( s );
-   init_RL ( s );
-}
-
-
-/*---------------------------------------------------*/
-#define ADD_CHAR_TO_BLOCK(zs,zchh0)               \
-{                                                 \
-   UInt32 zchh = (UInt32)(zchh0);                 \
-   /*-- fast track the common case --*/           \
-   if (zchh != zs->state_in_ch &&                 \
-       zs->state_in_len == 1) {                   \
-      UChar ch = (UChar)(zs->state_in_ch);        \
-      BZ_UPDATE_CRC( zs->blockCRC, ch );          \
-      zs->inUse[zs->state_in_ch] = True;          \
-      zs->block[zs->nblock] = (UChar)ch;          \
-      zs->nblock++;                               \
-      zs->state_in_ch = zchh;                     \
-   }                                              \
-   else                                           \
-   /*-- general, uncommon cases --*/              \
-   if (zchh != zs->state_in_ch ||                 \
-      zs->state_in_len == 255) {                  \
-      if (zs->state_in_ch < 256)                  \
-         add_pair_to_block ( zs );                \
-      zs->state_in_ch = zchh;                     \
-      zs->state_in_len = 1;                       \
-   } else {                                       \
-      zs->state_in_len++;                         \
-   }                                              \
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool copy_input_until_stop ( EState* s )
-{
-   Bool progress_in = False;
-
-   if (s->mode == BZ_M_RUNNING) {
-
-      /*-- fast track the common case --*/
-      while (True) {
-         /*-- block full? --*/
-         if (s->nblock >= s->nblockMAX) break;
-         /*-- no input? --*/
-         if (s->strm->avail_in == 0) break;
-         progress_in = True;
-         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); 
-         s->strm->next_in++;
-         s->strm->avail_in--;
-         s->strm->total_in_lo32++;
-         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
-      }
-
-   } else {
-
-      /*-- general, uncommon case --*/
-      while (True) {
-         /*-- block full? --*/
-         if (s->nblock >= s->nblockMAX) break;
-         /*-- no input? --*/
-         if (s->strm->avail_in == 0) break;
-         /*-- flush/finish end? --*/
-         if (s->avail_in_expect == 0) break;
-         progress_in = True;
-         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); 
-         s->strm->next_in++;
-         s->strm->avail_in--;
-         s->strm->total_in_lo32++;
-         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
-         s->avail_in_expect--;
-      }
-   }
-   return progress_in;
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool copy_output_until_stop ( EState* s )
-{
-   Bool progress_out = False;
-
-   while (True) {
-
-      /*-- no output space? --*/
-      if (s->strm->avail_out == 0) break;
-
-      /*-- block done? --*/
-      if (s->state_out_pos >= s->numZ) break;
-
-      progress_out = True;
-      *(s->strm->next_out) = s->zbits[s->state_out_pos];
-      s->state_out_pos++;
-      s->strm->avail_out--;
-      s->strm->next_out++;
-      s->strm->total_out_lo32++;
-      if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-   }
-
-   return progress_out;
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool handle_compress ( bz_stream* strm )
-{
-   Bool progress_in  = False;
-   Bool progress_out = False;
-   EState* s = (EState *) strm->state;
-   
-   while (True) {
-
-      if (s->state == BZ_S_OUTPUT) {
-         progress_out |= copy_output_until_stop ( s );
-         if (s->state_out_pos < s->numZ) break;
-         if (s->mode == BZ_M_FINISHING && 
-             s->avail_in_expect == 0 &&
-             isempty_RL(s)) break;
-         prepare_new_block ( s );
-         s->state = BZ_S_INPUT;
-         if (s->mode == BZ_M_FLUSHING && 
-             s->avail_in_expect == 0 &&
-             isempty_RL(s)) break;
-      }
-
-      if (s->state == BZ_S_INPUT) {
-         progress_in |= copy_input_until_stop ( s );
-         if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) {
-            flush_RL ( s );
-            BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) );
-            s->state = BZ_S_OUTPUT;
-         }
-         else
-         if (s->nblock >= s->nblockMAX) {
-            BZ2_compressBlock ( s, False );
-            s->state = BZ_S_OUTPUT;
-         }
-         else
-         if (s->strm->avail_in == 0) {
-            break;
-         }
-      }
-
-   }
-
-   return progress_in || progress_out;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action )
-{
-   Bool progress;
-   EState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = (EState *) strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   preswitch:
-   switch (s->mode) {
-
-      case BZ_M_IDLE:
-         return BZ_SEQUENCE_ERROR;
-
-      case BZ_M_RUNNING:
-         if (action == BZ_RUN) {
-            progress = handle_compress ( strm );
-            return progress ? BZ_RUN_OK : BZ_PARAM_ERROR;
-         } 
-         else
-	 if (action == BZ_FLUSH) {
-            s->avail_in_expect = strm->avail_in;
-            s->mode = BZ_M_FLUSHING;
-            goto preswitch;
-         }
-         else
-         if (action == BZ_FINISH) {
-            s->avail_in_expect = strm->avail_in;
-            s->mode = BZ_M_FINISHING;
-            goto preswitch;
-         }
-         else 
-            return BZ_PARAM_ERROR;
-
-      case BZ_M_FLUSHING:
-         if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect != s->strm->avail_in) 
-            return BZ_SEQUENCE_ERROR;
-         progress = handle_compress ( strm );
-         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
-             s->state_out_pos < s->numZ) return BZ_FLUSH_OK;
-         s->mode = BZ_M_RUNNING;
-         return BZ_RUN_OK;
-
-      case BZ_M_FINISHING:
-         if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect != s->strm->avail_in) 
-            return BZ_SEQUENCE_ERROR;
-         progress = handle_compress ( strm );
-         if (!progress) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
-             s->state_out_pos < s->numZ) return BZ_FINISH_OK;
-         s->mode = BZ_M_IDLE;
-         return BZ_STREAM_END;
-   }
-   return BZ_OK; /*--not reached--*/
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompressEnd)  ( bz_stream *strm )
-{
-   EState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = (EState *) strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   if (s->arr1 != NULL) BZFREE(s->arr1);
-   if (s->arr2 != NULL) BZFREE(s->arr2);
-   if (s->ftab != NULL) BZFREE(s->ftab);
-   BZFREE(strm->state);
-
-   strm->state = NULL;   
-
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-/*--- Decompression stuff                         ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompressInit) 
-                     ( bz_stream* strm, 
-                       int        verbosity,
-                       int        small )
-{
-   DState* s;
-
-   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
-
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   if (small != 0 && small != 1) return BZ_PARAM_ERROR;
-   if (verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR;
-
-   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
-
-   s = (DState *) BZALLOC( sizeof(DState) );
-   if (s == NULL) return BZ_MEM_ERROR;
-   s->strm                  = strm;
-   strm->state              = s;
-   s->state                 = BZ_X_MAGIC_1;
-   s->bsLive                = 0;
-   s->bsBuff                = 0;
-   s->calculatedCombinedCRC = 0;
-   strm->total_in_lo32      = 0;
-   strm->total_in_hi32      = 0;
-   strm->total_out_lo32     = 0;
-   strm->total_out_hi32     = 0;
-   s->smallDecompress       = (Bool)small;
-   s->ll4                   = NULL;
-   s->ll16                  = NULL;
-   s->tt                    = NULL;
-   s->currBlockNo           = 0;
-   s->verbosity             = verbosity;
-
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-/* Return  True iff data corruption is discovered.
-   Returns False if there is no problem.
-*/
-static
-Bool unRLE_obuf_to_output_FAST ( DState* s )
-{
-   UChar k1;
-
-   if (s->blockRandomised) {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return False;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return False;
-               
-         /* Only caused by corrupt data stream? */
-         if (s->nblock_used > s->save_nblock+1)
-            return True;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; 
-         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
-      }
-
-   } else {
-
-      /* restore */
-      UInt32        c_calculatedBlockCRC = s->calculatedBlockCRC;
-      UChar         c_state_out_ch       = s->state_out_ch;
-      Int32         c_state_out_len      = s->state_out_len;
-      Int32         c_nblock_used        = s->nblock_used;
-      Int32         c_k0                 = s->k0;
-      UInt32*       c_tt                 = s->tt;
-      UInt32        c_tPos               = s->tPos;
-      char*         cs_next_out          = s->strm->next_out;
-      unsigned int  cs_avail_out         = s->strm->avail_out;
-      Int32         ro_blockSize100k     = s->blockSize100k;
-      /* end restore */
-
-      UInt32       avail_out_INIT = cs_avail_out;
-      Int32        s_save_nblockPP = s->save_nblock+1;
-      unsigned int total_out_lo32_old;
-
-      while (True) {
-
-         /* try to finish existing run */
-         if (c_state_out_len > 0) {
-            while (True) {
-               if (cs_avail_out == 0) goto return_notr;
-               if (c_state_out_len == 1) break;
-               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
-               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
-               c_state_out_len--;
-               cs_next_out++;
-               cs_avail_out--;
-            }
-            s_state_out_len_eq_one:
-            {
-               if (cs_avail_out == 0) { 
-                  c_state_out_len = 1; goto return_notr;
-               };
-               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
-               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
-               cs_next_out++;
-               cs_avail_out--;
-            }
-         }   
-         /* Only caused by corrupt data stream? */
-         if (c_nblock_used > s_save_nblockPP)
-            return True;
-
-         /* can a new run be started? */
-         if (c_nblock_used == s_save_nblockPP) {
-            c_state_out_len = 0; goto return_notr;
-         };   
-         c_state_out_ch = c_k0;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (k1 != c_k0) { 
-            c_k0 = k1; goto s_state_out_len_eq_one; 
-         };
-         if (c_nblock_used == s_save_nblockPP) 
-            goto s_state_out_len_eq_one;
-   
-         c_state_out_len = 2;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (c_nblock_used == s_save_nblockPP) continue;
-         if (k1 != c_k0) { c_k0 = k1; continue; };
-   
-         c_state_out_len = 3;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (c_nblock_used == s_save_nblockPP) continue;
-         if (k1 != c_k0) { c_k0 = k1; continue; };
-   
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         c_state_out_len = ((Int32)k1) + 4;
-         BZ_GET_FAST_C(c_k0); c_nblock_used++;
-      }
-
-      return_notr:
-      total_out_lo32_old = s->strm->total_out_lo32;
-      s->strm->total_out_lo32 += (avail_out_INIT - cs_avail_out);
-      if (s->strm->total_out_lo32 < total_out_lo32_old)
-         s->strm->total_out_hi32++;
-
-      /* save */
-      s->calculatedBlockCRC = c_calculatedBlockCRC;
-      s->state_out_ch       = c_state_out_ch;
-      s->state_out_len      = c_state_out_len;
-      s->nblock_used        = c_nblock_used;
-      s->k0                 = c_k0;
-      s->tt                 = c_tt;
-      s->tPos               = c_tPos;
-      s->strm->next_out     = cs_next_out;
-      s->strm->avail_out    = cs_avail_out;
-      /* end save */
-   }
-   return False;
-}
-
-
-
-/*---------------------------------------------------*/
-Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
-{
-   Int32 nb, na, mid;
-   nb = 0;
-   na = 256;
-   do {
-      mid = (nb + na) >> 1;
-      if (indx >= cftab[mid]) nb = mid; else na = mid;
-   }
-   while (na - nb != 1);
-   return nb;
-}
-
-
-/*---------------------------------------------------*/
-/* Return  True iff data corruption is discovered.
-   Returns False if there is no problem.
-*/
-static
-Bool unRLE_obuf_to_output_SMALL ( DState* s )
-{
-   UChar k1;
-
-   if (s->blockRandomised) {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return False;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return False;
-
-         /* Only caused by corrupt data stream? */
-         if (s->nblock_used > s->save_nblock+1)
-            return True;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; 
-         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
-      }
-
-   } else {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return False;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return False;
-
-         /* Only caused by corrupt data stream? */
-         if (s->nblock_used > s->save_nblock+1)
-            return True;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_SMALL(s->k0); s->nblock_used++;
-      }
-
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
-{
-   Bool    corrupt;
-   DState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = (DState *) strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   while (True) {
-      if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
-      if (s->state == BZ_X_OUTPUT) {
-         if (s->smallDecompress)
-            corrupt = unRLE_obuf_to_output_SMALL ( s ); else
-            corrupt = unRLE_obuf_to_output_FAST  ( s );
-         if (corrupt) return BZ_DATA_ERROR;
-         if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) {
-            BZ_FINALISE_CRC ( s->calculatedBlockCRC );
-            if (s->verbosity >= 3) 
-               VPrintf2 ( " {0x%08x, 0x%08x}", s->storedBlockCRC, 
-                          s->calculatedBlockCRC );
-            if (s->verbosity >= 2) VPrintf0 ( "]" );
-            if (s->calculatedBlockCRC != s->storedBlockCRC)
-               return BZ_DATA_ERROR;
-            s->calculatedCombinedCRC 
-               = (s->calculatedCombinedCRC << 1) | 
-                    (s->calculatedCombinedCRC >> 31);
-            s->calculatedCombinedCRC ^= s->calculatedBlockCRC;
-            s->state = BZ_X_BLKHDR_1;
-         } else {
-            return BZ_OK;
-         }
-      }
-      if (s->state >= BZ_X_MAGIC_1) {
-         Int32 r = BZ2_decompress ( s );
-         if (r == BZ_STREAM_END) {
-            if (s->verbosity >= 3)
-               VPrintf2 ( "\n    combined CRCs: stored = 0x%08x, computed = 0x%08x", 
-                          s->storedCombinedCRC, s->calculatedCombinedCRC );
-            if (s->calculatedCombinedCRC != s->storedCombinedCRC)
-               return BZ_DATA_ERROR;
-            return r;
-         }
-         if (s->state != BZ_X_OUTPUT) return r;
-      }
-   }
-
-#ifdef UNREACHED
-   AssertH ( 0, 6001 );
-
-   return 0;  /*NOTREACHED*/
-#endif
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompressEnd)  ( bz_stream *strm )
-{
-   DState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = (DState *) strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   if (s->tt   != NULL) BZFREE(s->tt);
-   if (s->ll16 != NULL) BZFREE(s->ll16);
-   if (s->ll4  != NULL) BZFREE(s->ll4);
-
-   BZFREE(strm->state);
-   strm->state = NULL;
-
-   return BZ_OK;
-}
-
-
-#ifndef BZ_NO_STDIO
-/*---------------------------------------------------*/
-/*--- File I/O stuff                              ---*/
-/*---------------------------------------------------*/
-
-#define BZ_SETERR(eee)                    \
-{                                         \
-   if (bzerror != NULL) *bzerror = eee;   \
-   if (bzf != NULL) bzf->lastErr = eee;   \
-}
-
-typedef 
-   struct {
-      FILE*     handle;
-      Char      buf[BZ_MAX_UNUSED];
-      Int32     bufN;
-      Bool      writing;
-      bz_stream strm;
-      Int32     lastErr;
-      Bool      initialisedOk;
-   }
-   bzFile;
-
-
-/*---------------------------------------------*/
-static Bool myfeof ( FILE* f )
-{
-   Int32 c = fgetc ( f );
-   if (c == EOF) return True;
-   ungetc ( c, f );
-   return False;
-}
-
-
-/*---------------------------------------------------*/
-BZFILE* BZ_API(BZ2_bzWriteOpen) 
-                    ( int*  bzerror,      
-                      FILE* f, 
-                      int   blockSize100k, 
-                      int   verbosity,
-                      int   workFactor )
-{
-   Int32   ret;
-   bzFile* bzf = NULL;
-
-   BZ_SETERR(BZ_OK);
-
-   if (f == NULL ||
-       (blockSize100k < 1 || blockSize100k > 9) ||
-       (workFactor < 0 || workFactor > 250) ||
-       (verbosity < 0 || verbosity > 4))
-      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
-
-   if (ferror(f))
-      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
-
-   bzf = (bzFile *) malloc ( sizeof(bzFile) );
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
-
-   BZ_SETERR(BZ_OK);
-   bzf->initialisedOk = False;
-   bzf->bufN          = 0;
-   bzf->handle        = f;
-   bzf->writing       = True;
-   bzf->strm.bzalloc  = NULL;
-   bzf->strm.bzfree   = NULL;
-   bzf->strm.opaque   = NULL;
-
-   if (workFactor == 0) workFactor = 30;
-   ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, 
-                              verbosity, workFactor );
-   if (ret != BZ_OK)
-      { BZ_SETERR(ret); free(bzf); return NULL; };
-
-   bzf->strm.avail_in = 0;
-   bzf->initialisedOk = True;
-   return bzf;   
-}
-
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzWrite)
-             ( int*    bzerror, 
-               BZFILE* b, 
-               void*   buf, 
-               int     len )
-{
-   Int32 n, n2, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-   if (bzf == NULL || buf == NULL || len < 0)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-   if (!(bzf->writing))
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (ferror(bzf->handle))
-      { BZ_SETERR(BZ_IO_ERROR); return; };
-
-   if (len == 0)
-      { BZ_SETERR(BZ_OK); return; };
-
-   bzf->strm.avail_in = len;
-   bzf->strm.next_in  = (char *) buf;
-
-   while (True) {
-      bzf->strm.avail_out = BZ_MAX_UNUSED;
-      bzf->strm.next_out = bzf->buf;
-      ret = BZ2_bzCompress ( &(bzf->strm), BZ_RUN );
-      if (ret != BZ_RUN_OK)
-         { BZ_SETERR(ret); return; };
-
-      if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
-         n = BZ_MAX_UNUSED - bzf->strm.avail_out;
-         n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), 
-                       n, bzf->handle );
-         if (n != n2 || ferror(bzf->handle))
-            { BZ_SETERR(BZ_IO_ERROR); return; };
-      }
-
-      if (bzf->strm.avail_in == 0)
-         { BZ_SETERR(BZ_OK); return; };
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzWriteClose)
-                  ( int*          bzerror, 
-                    BZFILE*       b, 
-                    int           abandon,
-                    unsigned int* nbytes_in,
-                    unsigned int* nbytes_out )
-{
-   BZ2_bzWriteClose64 ( bzerror, b, abandon, 
-                        nbytes_in, NULL, nbytes_out, NULL );
-}
-
-
-void BZ_API(BZ2_bzWriteClose64)
-                  ( int*          bzerror, 
-                    BZFILE*       b, 
-                    int           abandon,
-                    unsigned int* nbytes_in_lo32,
-                    unsigned int* nbytes_in_hi32,
-                    unsigned int* nbytes_out_lo32,
-                    unsigned int* nbytes_out_hi32 )
-{
-   Int32   n, n2, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_OK); return; };
-   if (!(bzf->writing))
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (ferror(bzf->handle))
-      { BZ_SETERR(BZ_IO_ERROR); return; };
-
-   if (nbytes_in_lo32 != NULL) *nbytes_in_lo32 = 0;
-   if (nbytes_in_hi32 != NULL) *nbytes_in_hi32 = 0;
-   if (nbytes_out_lo32 != NULL) *nbytes_out_lo32 = 0;
-   if (nbytes_out_hi32 != NULL) *nbytes_out_hi32 = 0;
-
-   if ((!abandon) && bzf->lastErr == BZ_OK) {
-      while (True) {
-         bzf->strm.avail_out = BZ_MAX_UNUSED;
-         bzf->strm.next_out = bzf->buf;
-         ret = BZ2_bzCompress ( &(bzf->strm), BZ_FINISH );
-         if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END)
-            { BZ_SETERR(ret); return; };
-
-         if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
-            n = BZ_MAX_UNUSED - bzf->strm.avail_out;
-            n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), 
-                          n, bzf->handle );
-            if (n != n2 || ferror(bzf->handle))
-               { BZ_SETERR(BZ_IO_ERROR); return; };
-         }
-
-         if (ret == BZ_STREAM_END) break;
-      }
-   }
-
-   if ( !abandon && !ferror ( bzf->handle ) ) {
-      fflush ( bzf->handle );
-      if (ferror(bzf->handle))
-         { BZ_SETERR(BZ_IO_ERROR); return; };
-   }
-
-   if (nbytes_in_lo32 != NULL)
-      *nbytes_in_lo32 = bzf->strm.total_in_lo32;
-   if (nbytes_in_hi32 != NULL)
-      *nbytes_in_hi32 = bzf->strm.total_in_hi32;
-   if (nbytes_out_lo32 != NULL)
-      *nbytes_out_lo32 = bzf->strm.total_out_lo32;
-   if (nbytes_out_hi32 != NULL)
-      *nbytes_out_hi32 = bzf->strm.total_out_hi32;
-
-   BZ_SETERR(BZ_OK);
-   BZ2_bzCompressEnd ( &(bzf->strm) );
-   free ( bzf );
-}
-
-
-/*---------------------------------------------------*/
-BZFILE* BZ_API(BZ2_bzReadOpen) 
-                   ( int*  bzerror, 
-                     FILE* f, 
-                     int   verbosity,
-                     int   small,
-                     void* unused,
-                     int   nUnused )
-{
-   bzFile* bzf = NULL;
-   int     ret;
-
-   BZ_SETERR(BZ_OK);
-
-   if (f == NULL || 
-       (small != 0 && small != 1) ||
-       (verbosity < 0 || verbosity > 4) ||
-       (unused == NULL && nUnused != 0) ||
-       (unused != NULL && (nUnused < 0 || nUnused > BZ_MAX_UNUSED)))
-      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
-
-   if (ferror(f))
-      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
-
-   bzf = (bzFile *) malloc ( sizeof(bzFile) );
-   if (bzf == NULL) 
-      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
-
-   BZ_SETERR(BZ_OK);
-
-   bzf->initialisedOk = False;
-   bzf->handle        = f;
-   bzf->bufN          = 0;
-   bzf->writing       = False;
-   bzf->strm.bzalloc  = NULL;
-   bzf->strm.bzfree   = NULL;
-   bzf->strm.opaque   = NULL;
-   
-   while (nUnused > 0) {
-      bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++;
-      unused = ((void*)( 1 + ((UChar*)(unused))  ));
-      nUnused--;
-   }
-
-   ret = BZ2_bzDecompressInit ( &(bzf->strm), verbosity, small );
-   if (ret != BZ_OK)
-      { BZ_SETERR(ret); free(bzf); return NULL; };
-
-   bzf->strm.avail_in = bzf->bufN;
-   bzf->strm.next_in  = bzf->buf;
-
-   bzf->initialisedOk = True;
-   return bzf;   
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b )
-{
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_OK); return; };
-
-   if (bzf->writing)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-
-   if (bzf->initialisedOk)
-      (void)BZ2_bzDecompressEnd ( &(bzf->strm) );
-   free ( bzf );
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzRead) 
-           ( int*    bzerror, 
-             BZFILE* b, 
-             void*   buf, 
-             int     len )
-{
-   Int32   n, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-
-   if (bzf == NULL || buf == NULL || len < 0)
-      { BZ_SETERR(BZ_PARAM_ERROR); return 0; };
-
-   if (bzf->writing)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return 0; };
-
-   if (len == 0)
-      { BZ_SETERR(BZ_OK); return 0; };
-
-   bzf->strm.avail_out = len;
-   bzf->strm.next_out = (char *) buf;
-
-   while (True) {
-
-      if (ferror(bzf->handle)) 
-         { BZ_SETERR(BZ_IO_ERROR); return 0; };
-
-      if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) {
-         n = fread ( bzf->buf, sizeof(UChar), 
-                     BZ_MAX_UNUSED, bzf->handle );
-         if (ferror(bzf->handle))
-            { BZ_SETERR(BZ_IO_ERROR); return 0; };
-         bzf->bufN = n;
-         bzf->strm.avail_in = bzf->bufN;
-         bzf->strm.next_in = bzf->buf;
-      }
-
-      ret = BZ2_bzDecompress ( &(bzf->strm) );
-
-      if (ret != BZ_OK && ret != BZ_STREAM_END)
-         { BZ_SETERR(ret); return 0; };
-
-      if (ret == BZ_OK && myfeof(bzf->handle) && 
-          bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0)
-         { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; };
-
-      if (ret == BZ_STREAM_END)
-         { BZ_SETERR(BZ_STREAM_END);
-           return len - bzf->strm.avail_out; };
-      if (bzf->strm.avail_out == 0)
-         { BZ_SETERR(BZ_OK); return len; };
-      
-   }
-
-#ifdef UNREACHED
-   return 0; /*not reached*/
-#endif
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzReadGetUnused) 
-                     ( int*    bzerror, 
-                       BZFILE* b, 
-                       void**  unused, 
-                       int*    nUnused )
-{
-   bzFile* bzf = (bzFile*)b;
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-   if (bzf->lastErr != BZ_STREAM_END)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (unused == NULL || nUnused == NULL)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-
-   BZ_SETERR(BZ_OK);
-   *nUnused = bzf->strm.avail_in;
-   *unused = bzf->strm.next_in;
-}
-#endif
-
-
-/*---------------------------------------------------*/
-/*--- Misc convenience stuff                      ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzBuffToBuffCompress) 
-                         ( char*         dest, 
-                           unsigned int* destLen,
-                           char*         source, 
-                           unsigned int  sourceLen,
-                           int           blockSize100k, 
-                           int           verbosity, 
-                           int           workFactor )
-{
-   bz_stream strm;
-   int ret;
-
-   if (dest == NULL || destLen == NULL || 
-       source == NULL ||
-       blockSize100k < 1 || blockSize100k > 9 ||
-       verbosity < 0 || verbosity > 4 ||
-       workFactor < 0 || workFactor > 250) 
-      return BZ_PARAM_ERROR;
-
-   if (workFactor == 0) workFactor = 30;
-   strm.bzalloc = NULL;
-   strm.bzfree = NULL;
-   strm.opaque = NULL;
-   ret = BZ2_bzCompressInit ( &strm, blockSize100k, 
-                              verbosity, workFactor );
-   if (ret != BZ_OK) return ret;
-
-   strm.next_in = source;
-   strm.next_out = dest;
-   strm.avail_in = sourceLen;
-   strm.avail_out = *destLen;
-
-   ret = BZ2_bzCompress ( &strm, BZ_FINISH );
-   if (ret == BZ_FINISH_OK) goto output_overflow;
-   if (ret != BZ_STREAM_END) goto errhandler;
-
-   /* normal termination */
-   *destLen -= strm.avail_out;   
-   BZ2_bzCompressEnd ( &strm );
-   return BZ_OK;
-
-   output_overflow:
-   BZ2_bzCompressEnd ( &strm );
-   return BZ_OUTBUFF_FULL;
-
-   errhandler:
-   BZ2_bzCompressEnd ( &strm );
-   return ret;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzBuffToBuffDecompress) 
-                           ( char*         dest, 
-                             unsigned int* destLen,
-                             char*         source, 
-                             unsigned int  sourceLen,
-                             int           small,
-                             int           verbosity )
-{
-   bz_stream strm;
-   int ret;
-
-   if (dest == NULL || destLen == NULL || 
-       source == NULL ||
-       (small != 0 && small != 1) ||
-       verbosity < 0 || verbosity > 4) 
-          return BZ_PARAM_ERROR;
-
-   strm.bzalloc = NULL;
-   strm.bzfree = NULL;
-   strm.opaque = NULL;
-   ret = BZ2_bzDecompressInit ( &strm, verbosity, small );
-   if (ret != BZ_OK) return ret;
-
-   strm.next_in = source;
-   strm.next_out = dest;
-   strm.avail_in = sourceLen;
-   strm.avail_out = *destLen;
-
-   ret = BZ2_bzDecompress ( &strm );
-   if (ret == BZ_OK) goto output_overflow_or_eof;
-   if (ret != BZ_STREAM_END) goto errhandler;
-
-   /* normal termination */
-   *destLen -= strm.avail_out;
-   BZ2_bzDecompressEnd ( &strm );
-   return BZ_OK;
-
-   output_overflow_or_eof:
-   if (strm.avail_out > 0) {
-      BZ2_bzDecompressEnd ( &strm );
-      return BZ_UNEXPECTED_EOF;
-   } else {
-      BZ2_bzDecompressEnd ( &strm );
-      return BZ_OUTBUFF_FULL;
-   };      
-
-   errhandler:
-   BZ2_bzDecompressEnd ( &strm );
-   return ret; 
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-/*--
-   return version like "0.9.5d, 4-Sept-1999".
---*/
-const char * BZ_API(BZ2_bzlibVersion)(void)
-{
-   return BZ_VERSION;
-}
-
-
-#ifndef BZ_NO_STDIO
-/*---------------------------------------------------*/
-
-#if defined(_WIN32) || defined(OS2) || defined(MSDOS)
-#   include <fcntl.h>
-#   include <io.h>
-#   define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY)
-#else
-#   define SET_BINARY_MODE(file)
-#endif
-
-#if !defined(fdopen) && defined(HAVE_FDOPEN)
-  FILE *fdopen(int fildes, const char *mode)
-#ifdef __cplusplus
-	throw ()
-#endif
- ;
-#endif
-
-static
-BZFILE * bzopen_or_bzdopen
-               ( const char *path,   /* no use when bzdopen */
-                 int fd,             /* no use when bzdopen */
-                 const char *mode,
-                 int open_mode)      /* bzopen: 0, bzdopen:1 */
-{
-   int    bzerr;
-   char   unused[BZ_MAX_UNUSED];
-   int    blockSize100k = 9;
-   int    writing       = 0;
-   char   mode2[10]     = "";
-   FILE   *fp           = NULL;
-   BZFILE *bzfp         = NULL;
-   int    verbosity     = 0;
-   int    workFactor    = 30;
-   int    smallMode     = 0;
-   int    nUnused       = 0; 
-
-   if (mode == NULL) return NULL;
-   while (*mode) {
-      switch (*mode) {
-      case 'r':
-         writing = 0; break;
-      case 'w':
-         writing = 1; break;
-      case 's':
-         smallMode = 1; break;
-      default:
-         if (isdigit((int)(*mode))) {
-            blockSize100k = *mode-BZ_HDR_0;
-         }
-      }
-      mode++;
-   }
-   strcat(mode2, writing ? "w" : "r" );
-   strcat(mode2,"b");   /* binary mode */
-
-   if (open_mode==0) {
-      if (path==NULL || strcmp(path,"")==0) {
-        fp = (writing ? stdout : stdin);
-        SET_BINARY_MODE(fp);
-      } else {
-        fp = fopen(path,mode2);
-      }
-   } else {
-#ifndef HAVE_FDOPEN
-      fp = NULL;
-#else
-      fp = fdopen(fd,mode2);
-#endif
-   }
-   if (fp == NULL) return NULL;
-
-   if (writing) {
-      /* Guard against total chaos and anarchy -- JRS */
-      if (blockSize100k < 1) blockSize100k = 1;
-      if (blockSize100k > 9) blockSize100k = 9; 
-      bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k,
-                             verbosity,workFactor);
-   } else {
-      bzfp = BZ2_bzReadOpen(&bzerr,fp,verbosity,smallMode,
-                            unused,nUnused);
-   }
-   if (bzfp == NULL) {
-      if (fp != stdin && fp != stdout) fclose(fp);
-      return NULL;
-   }
-   return bzfp;
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   open file for read or write.
-      ex) bzopen("file","w9")
-      case path="" or NULL => use stdin or stdout.
---*/
-BZFILE * BZ_API(BZ2_bzopen)
-               ( const char *path,
-                 const char *mode )
-{
-   return bzopen_or_bzdopen(path,-1,mode,/*bzopen*/0);
-}
-
-
-/*---------------------------------------------------*/
-BZFILE * BZ_API(BZ2_bzdopen)
-               ( int fd,
-                 const char *mode )
-{
-   return bzopen_or_bzdopen(NULL,fd,mode,/*bzdopen*/1);
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzread) (BZFILE* b, void* buf, int len )
-{
-   int bzerr, nread;
-   if (((bzFile*)b)->lastErr == BZ_STREAM_END) return 0;
-   nread = BZ2_bzRead(&bzerr,b,buf,len);
-   if (bzerr == BZ_OK || bzerr == BZ_STREAM_END) {
-      return nread;
-   } else {
-      return -1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len )
-{
-   int bzerr;
-
-   BZ2_bzWrite(&bzerr,b,buf,len);
-   if(bzerr == BZ_OK){
-      return len;
-   }else{
-      return -1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzflush) (BZFILE *b)
-{
-   /* do nothing now... */
-   return 0;
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzclose) (BZFILE* b)
-{
-   if (b==NULL) return;
-
-   int bzerr;
-   FILE *fp = ((bzFile *)b)->handle;
-   
-   if(((bzFile*)b)->writing){
-      BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
-      if(bzerr != BZ_OK){
-         BZ2_bzWriteClose(NULL,b,1,NULL,NULL);
-      }
-   }else{
-      BZ2_bzReadClose(&bzerr,b);
-   }
-   if(fp!=stdin && fp!=stdout){
-      fclose(fp);
-   }
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   return last error code 
---*/
-static const char *bzerrorstrings[] = {
-       "OK"
-      ,"SEQUENCE_ERROR"
-      ,"PARAM_ERROR"
-      ,"MEM_ERROR"
-      ,"DATA_ERROR"
-      ,"DATA_ERROR_MAGIC"
-      ,"IO_ERROR"
-      ,"UNEXPECTED_EOF"
-      ,"OUTBUFF_FULL"
-      ,"CONFIG_ERROR"
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-};
-
-
-const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum)
-{
-   int err = ((bzFile *)b)->lastErr;
-
-   if(err>0) err = 0;
-   *errnum = err;
-   return bzerrorstrings[err*-1];
-}
-#endif
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/bzlib.h r-base-3.3.1/src/extra/bzip2/bzlib.h
--- r-base-3.2.3/src/extra/bzip2/bzlib.h	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/bzlib.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,282 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Public header file for the library.                   ---*/
-/*---                                               bzlib.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_H
-#define _BZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BZ_RUN               0
-#define BZ_FLUSH             1
-#define BZ_FINISH            2
-
-#define BZ_OK                0
-#define BZ_RUN_OK            1
-#define BZ_FLUSH_OK          2
-#define BZ_FINISH_OK         3
-#define BZ_STREAM_END        4
-#define BZ_SEQUENCE_ERROR    (-1)
-#define BZ_PARAM_ERROR       (-2)
-#define BZ_MEM_ERROR         (-3)
-#define BZ_DATA_ERROR        (-4)
-#define BZ_DATA_ERROR_MAGIC  (-5)
-#define BZ_IO_ERROR          (-6)
-#define BZ_UNEXPECTED_EOF    (-7)
-#define BZ_OUTBUFF_FULL      (-8)
-#define BZ_CONFIG_ERROR      (-9)
-
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-
-#ifndef BZ_IMPORT
-#define BZ_EXPORT
-#endif
-
-#ifndef BZ_NO_STDIO
-/* Need a definitition for FILE */
-#include <stdio.h>
-#endif
-
-#ifdef _WIN32
-#   include <windows.h>
-#   ifdef small
-      /* windows.h define small to char */
-#      undef small
-#   endif
-#   ifdef BZ_EXPORT
-#   define BZ_API(func) WINAPI func
-#   define BZ_EXTERN extern
-#   else
-   /* import windows dll dynamically */
-#   define BZ_API(func) (WINAPI * func)
-#   define BZ_EXTERN
-#   endif
-#else
-#   define BZ_API(func) func
-#   define BZ_EXTERN extern
-#endif
-
-
-/*-- Core (low-level) library functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
-      int       small
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
-   );
-
-
-
-/*-- High(er) level library functions --*/
-
-#ifndef BZ_NO_STDIO
-#define BZ_MAX_UNUSED 5000
-
-typedef void BZFILE;
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
-      int   small,
-      void* unused,    
-      int   nUnused 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
-      unsigned int* nbytes_out_hi32
-   );
-#endif
-
-
-/*-- Utility functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
-   );
-
-
-/*--
-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-
-BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
-      void
-   );
-
-#ifndef BZ_NO_STDIO
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
-      const char *path,
-      const char *mode
-   );
-
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
-      int        fd,
-      const char *mode
-   );
-         
-BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzflush) (
-      BZFILE* b
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzclose) (
-      BZFILE* b
-   );
-
-BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
-      int    *errnum
-   );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.h ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/bzlib_private.h r-base-3.3.1/src/extra/bzip2/bzlib_private.h
--- r-base-3.2.3/src/extra/bzip2/bzlib_private.h	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/bzlib_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,512 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Private header file for the library.                  ---*/
-/*---                                       bzlib_private.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_PRIVATE_H
-#define _BZLIB_PRIVATE_H
-
-#include <config.h> /* for R_INLINE */
-#undef HAVE_FDOPEN  /* we may have, but this re-declares it and
-		       we don't use BZ2_bzdopen */
-#include <stdlib.h>
-
-#ifndef BZ_NO_STDIO
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#endif
-
-#include "bzlib.h"
-
-
-
-/*-- General stuff. --*/
-
-#define BZ_VERSION  "1.0.6, 6-Sept-2010"
-
-typedef char            Char;
-typedef unsigned char   Bool;
-typedef unsigned char   UChar;
-typedef int             Int32;
-typedef unsigned int    UInt32;
-typedef short           Int16;
-typedef unsigned short  UInt16;
-
-#define True  ((Bool)1)
-#define False ((Bool)0)
-
-#ifndef __GNUC__
-#define __inline__  /* */
-#endif 
-
-#ifndef BZ_NO_STDIO
-
-extern void BZ2_bz__AssertH__fail ( int errcode );
-#define AssertH(cond,errcode) \
-   { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
-
-#if BZ_DEBUG
-#define AssertD(cond,msg) \
-   { if (!(cond)) {       \
-      fprintf ( stderr,   \
-        "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\
-      exit(1); \
-   }}
-#else
-#define AssertD(cond,msg) /* */
-#endif
-
-#define VPrintf0(zf) \
-   fprintf(stderr,zf)
-#define VPrintf1(zf,za1) \
-   fprintf(stderr,zf,za1)
-#define VPrintf2(zf,za1,za2) \
-   fprintf(stderr,zf,za1,za2)
-#define VPrintf3(zf,za1,za2,za3) \
-   fprintf(stderr,zf,za1,za2,za3)
-#define VPrintf4(zf,za1,za2,za3,za4) \
-   fprintf(stderr,zf,za1,za2,za3,za4)
-#define VPrintf5(zf,za1,za2,za3,za4,za5) \
-   fprintf(stderr,zf,za1,za2,za3,za4,za5)
-
-#else
-
-extern void bz_internal_error ( int errcode );
-#define AssertH(cond,errcode) \
-   { if (!(cond)) bz_internal_error ( errcode ); }
-#define AssertD(cond,msg)                do { } while (0)
-#define VPrintf0(zf)                     do { } while (0)
-#define VPrintf1(zf,za1)                 do { } while (0)
-#define VPrintf2(zf,za1,za2)             do { } while (0)
-#define VPrintf3(zf,za1,za2,za3)         do { } while (0)
-#define VPrintf4(zf,za1,za2,za3,za4)     do { } while (0)
-#define VPrintf5(zf,za1,za2,za3,za4,za5) do { } while (0)
-
-#endif
-
-
-#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
-#define BZFREE(ppp)  (strm->bzfree)(strm->opaque,(ppp))
-
-
-/*-- Header bytes. --*/
-
-#define BZ_HDR_B 0x42   /* 'B' */
-#define BZ_HDR_Z 0x5a   /* 'Z' */
-#define BZ_HDR_h 0x68   /* 'h' */
-#define BZ_HDR_0 0x30   /* '0' */
-  
-/*-- Constants for the back end. --*/
-
-#define BZ_MAX_ALPHA_SIZE 258
-#define BZ_MAX_CODE_LEN    23
-
-#define BZ_RUNA 0
-#define BZ_RUNB 1
-
-#define BZ_N_GROUPS 6
-#define BZ_G_SIZE   50
-#define BZ_N_ITERS  4
-
-#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE))
-
-
-
-/*-- Stuff for randomising repetitive blocks. --*/
-
-extern Int32 BZ2_rNums[512];
-
-#define BZ_RAND_DECLS                          \
-   Int32 rNToGo;                               \
-   Int32 rTPos                                 \
-
-#define BZ_RAND_INIT_MASK                      \
-   s->rNToGo = 0;                              \
-   s->rTPos  = 0                               \
-
-#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0)
-
-#define BZ_RAND_UPD_MASK                       \
-   if (s->rNToGo == 0) {                       \
-      s->rNToGo = BZ2_rNums[s->rTPos];         \
-      s->rTPos++;                              \
-      if (s->rTPos == 512) s->rTPos = 0;       \
-   }                                           \
-   s->rNToGo--;
-
-
-
-/*-- Stuff for doing CRCs. --*/
-
-extern UInt32 BZ2_crc32Table[256];
-
-#define BZ_INITIALISE_CRC(crcVar)              \
-{                                              \
-   crcVar = 0xffffffffL;                       \
-}
-
-#define BZ_FINALISE_CRC(crcVar)                \
-{                                              \
-   crcVar = ~(crcVar);                         \
-}
-
-#define BZ_UPDATE_CRC(crcVar,cha)              \
-{                                              \
-   crcVar = (crcVar << 8) ^                    \
-            BZ2_crc32Table[(crcVar >> 24) ^    \
-                           ((UChar)cha)];      \
-}
-
-
-
-/*-- States and modes for compression. --*/
-
-#define BZ_M_IDLE      1
-#define BZ_M_RUNNING   2
-#define BZ_M_FLUSHING  3
-#define BZ_M_FINISHING 4
-
-#define BZ_S_OUTPUT    1
-#define BZ_S_INPUT     2
-
-#define BZ_N_RADIX 2
-#define BZ_N_QSORT 12
-#define BZ_N_SHELL 18
-#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2)
-
-
-
-
-/*-- Structure holding all the compression-side stuff. --*/
-
-typedef
-   struct {
-      /* pointer back to the struct bz_stream */
-      bz_stream* strm;
-
-      /* mode this stream is in, and whether inputting */
-      /* or outputting data */
-      Int32    mode;
-      Int32    state;
-
-      /* remembers avail_in when flush/finish requested */
-      UInt32   avail_in_expect;
-
-      /* for doing the block sorting */
-      UInt32*  arr1;
-      UInt32*  arr2;
-      UInt32*  ftab;
-      Int32    origPtr;
-
-      /* aliases for arr1 and arr2 */
-      UInt32*  ptr;
-      UChar*   block;
-      UInt16*  mtfv;
-      UChar*   zbits;
-
-      /* for deciding when to use the fallback sorting algorithm */
-      Int32    workFactor;
-
-      /* run-length-encoding of the input */
-      UInt32   state_in_ch;
-      Int32    state_in_len;
-      BZ_RAND_DECLS;
-
-      /* input and output limits and current posns */
-      Int32    nblock;
-      Int32    nblockMAX;
-      Int32    numZ;
-      Int32    state_out_pos;
-
-      /* map of bytes used in block */
-      Int32    nInUse;
-      Bool     inUse[256];
-      UChar    unseqToSeq[256];
-
-      /* the buffer for bit stream creation */
-      UInt32   bsBuff;
-      Int32    bsLive;
-
-      /* block and combined CRCs */
-      UInt32   blockCRC;
-      UInt32   combinedCRC;
-
-      /* misc administratium */
-      Int32    verbosity;
-      Int32    blockNo;
-      Int32    blockSize100k;
-
-      /* stuff for coding the MTF values */
-      Int32    nMTF;
-      Int32    mtfFreq    [BZ_MAX_ALPHA_SIZE];
-      UChar    selector   [BZ_MAX_SELECTORS];
-      UChar    selectorMtf[BZ_MAX_SELECTORS];
-
-      UChar    len     [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    code    [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    rfreq   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      /* second dimension: only 3 needed; 4 makes index calculations faster */
-      UInt32   len_pack[BZ_MAX_ALPHA_SIZE][4];
-
-   }
-   EState;
-
-
-
-/*-- externs for compression. --*/
-
-extern void 
-BZ2_blockSort ( EState* );
-
-extern void 
-BZ2_compressBlock ( EState*, Bool );
-
-extern void 
-BZ2_bsInitWrite ( EState* );
-
-extern void 
-BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
-
-extern void 
-BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
-
-
-
-/*-- states for decompression. --*/
-
-#define BZ_X_IDLE        1
-#define BZ_X_OUTPUT      2
-
-#define BZ_X_MAGIC_1     10
-#define BZ_X_MAGIC_2     11
-#define BZ_X_MAGIC_3     12
-#define BZ_X_MAGIC_4     13
-#define BZ_X_BLKHDR_1    14
-#define BZ_X_BLKHDR_2    15
-#define BZ_X_BLKHDR_3    16
-#define BZ_X_BLKHDR_4    17
-#define BZ_X_BLKHDR_5    18
-#define BZ_X_BLKHDR_6    19
-#define BZ_X_BCRC_1      20
-#define BZ_X_BCRC_2      21
-#define BZ_X_BCRC_3      22
-#define BZ_X_BCRC_4      23
-#define BZ_X_RANDBIT     24
-#define BZ_X_ORIGPTR_1   25
-#define BZ_X_ORIGPTR_2   26
-#define BZ_X_ORIGPTR_3   27
-#define BZ_X_MAPPING_1   28
-#define BZ_X_MAPPING_2   29
-#define BZ_X_SELECTOR_1  30
-#define BZ_X_SELECTOR_2  31
-#define BZ_X_SELECTOR_3  32
-#define BZ_X_CODING_1    33
-#define BZ_X_CODING_2    34
-#define BZ_X_CODING_3    35
-#define BZ_X_MTF_1       36
-#define BZ_X_MTF_2       37
-#define BZ_X_MTF_3       38
-#define BZ_X_MTF_4       39
-#define BZ_X_MTF_5       40
-#define BZ_X_MTF_6       41
-#define BZ_X_ENDHDR_2    42
-#define BZ_X_ENDHDR_3    43
-#define BZ_X_ENDHDR_4    44
-#define BZ_X_ENDHDR_5    45
-#define BZ_X_ENDHDR_6    46
-#define BZ_X_CCRC_1      47
-#define BZ_X_CCRC_2      48
-#define BZ_X_CCRC_3      49
-#define BZ_X_CCRC_4      50
-
-
-
-/*-- Constants for the fast MTF decoder. --*/
-
-#define MTFA_SIZE 4096
-#define MTFL_SIZE 16
-
-
-
-/*-- Structure holding all the decompression-side stuff. --*/
-
-typedef
-   struct {
-      /* pointer back to the struct bz_stream */
-      bz_stream* strm;
-
-      /* state indicator for this stream */
-      Int32    state;
-
-      /* for doing the final run-length decoding */
-      UChar    state_out_ch;
-      Int32    state_out_len;
-      Bool     blockRandomised;
-      BZ_RAND_DECLS;
-
-      /* the buffer for bit stream reading */
-      UInt32   bsBuff;
-      Int32    bsLive;
-
-      /* misc administratium */
-      Int32    blockSize100k;
-      Bool     smallDecompress;
-      Int32    currBlockNo;
-      Int32    verbosity;
-
-      /* for undoing the Burrows-Wheeler transform */
-      Int32    origPtr;
-      UInt32   tPos;
-      Int32    k0;
-      Int32    unzftab[256];
-      Int32    nblock_used;
-      Int32    cftab[257];
-      Int32    cftabCopy[257];
-
-      /* for undoing the Burrows-Wheeler transform (FAST) */
-      UInt32   *tt;
-
-      /* for undoing the Burrows-Wheeler transform (SMALL) */
-      UInt16   *ll16;
-      UChar    *ll4;
-
-      /* stored and calculated CRCs */
-      UInt32   storedBlockCRC;
-      UInt32   storedCombinedCRC;
-      UInt32   calculatedBlockCRC;
-      UInt32   calculatedCombinedCRC;
-
-      /* map of bytes used in block */
-      Int32    nInUse;
-      Bool     inUse[256];
-      Bool     inUse16[16];
-      UChar    seqToUnseq[256];
-
-      /* for decoding the MTF values */
-      UChar    mtfa   [MTFA_SIZE];
-      Int32    mtfbase[256 / MTFL_SIZE];
-      UChar    selector   [BZ_MAX_SELECTORS];
-      UChar    selectorMtf[BZ_MAX_SELECTORS];
-      UChar    len  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-
-      Int32    limit  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    base   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    perm   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    minLens[BZ_N_GROUPS];
-
-      /* save area for scalars in the main decompress code */
-      Int32    save_i;
-      Int32    save_j;
-      Int32    save_t;
-      Int32    save_alphaSize;
-      Int32    save_nGroups;
-      Int32    save_nSelectors;
-      Int32    save_EOB;
-      Int32    save_groupNo;
-      Int32    save_groupPos;
-      Int32    save_nextSym;
-      Int32    save_nblockMAX;
-      Int32    save_nblock;
-      Int32    save_es;
-      Int32    save_N;
-      Int32    save_curr;
-      Int32    save_zt;
-      Int32    save_zn; 
-      Int32    save_zvec;
-      Int32    save_zj;
-      Int32    save_gSel;
-      Int32    save_gMinlen;
-      Int32*   save_gLimit;
-      Int32*   save_gBase;
-      Int32*   save_gPerm;
-
-   }
-   DState;
-
-
-
-/*-- Macros for decompression. --*/
-
-#define BZ_GET_FAST(cccc)                     \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
-    s->tPos = s->tt[s->tPos];                 \
-    cccc = (UChar)(s->tPos & 0xff);           \
-    s->tPos >>= 8;
-
-#define BZ_GET_FAST_C(cccc)                   \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
-    c_tPos = c_tt[c_tPos];                    \
-    cccc = (UChar)(c_tPos & 0xff);            \
-    c_tPos >>= 8;
-
-#define SET_LL4(i,n)                                          \
-   { if (((i) & 0x1) == 0)                                    \
-        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else    \
-        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4);  \
-   }
-
-#define GET_LL4(i)                             \
-   ((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF)
-
-#define SET_LL(i,n)                          \
-   { s->ll16[i] = (UInt16)(n & 0x0000ffff);  \
-     SET_LL4(i, n >> 16);                    \
-   }
-
-#define GET_LL(i) \
-   (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
-
-#define BZ_GET_SMALL(cccc)                            \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
-    cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
-    s->tPos = GET_LL(s->tPos);
-
-
-/*-- externs for decompression. --*/
-
-extern Int32 
-BZ2_indexIntoF ( Int32, Int32* );
-
-extern Int32 
-BZ2_decompress ( DState* );
-
-extern void 
-BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
-                           Int32,  Int32, Int32 );
-
-
-#endif
-
-
-/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
-
-#ifdef BZ_NO_STDIO
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                   bzlib_private.h ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/compress.c r-base-3.3.1/src/extra/bzip2/compress.c
--- r-base-3.2.3/src/extra/bzip2/compress.c	2015-03-18 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,672 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Compression machinery (not incl block sorting)        ---*/
-/*---                                            compress.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-/* CHANGES
-    0.9.0    -- original version.
-    0.9.0a/b -- no changes in this file.
-    0.9.0c   -- changed setting of nGroups in sendMTFValues() 
-                so as to do a bit better on small files
-*/
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-/*--- Bit stream I/O                              ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-void BZ2_bsInitWrite ( EState* s )
-{
-   s->bsLive = 0;
-   s->bsBuff = 0;
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsFinishWrite ( EState* s )
-{
-   while (s->bsLive > 0) {
-      s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24);
-      s->numZ++;
-      s->bsBuff <<= 8;
-      s->bsLive -= 8;
-   }
-}
-
-
-/*---------------------------------------------------*/
-#define bsNEEDW(nz)                           \
-{                                             \
-   while (s->bsLive >= 8) {                   \
-      s->zbits[s->numZ]                       \
-         = (UChar)(s->bsBuff >> 24);          \
-      s->numZ++;                              \
-      s->bsBuff <<= 8;                        \
-      s->bsLive -= 8;                         \
-   }                                          \
-}
-
-
-/*---------------------------------------------------*/
-static
-R_INLINE
-void bsW ( EState* s, Int32 n, UInt32 v )
-{
-   bsNEEDW ( n );
-   s->bsBuff |= (v << (32 - s->bsLive - n));
-   s->bsLive += n;
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsPutUInt32 ( EState* s, UInt32 u )
-{
-   bsW ( s, 8, (u >> 24) & 0xffL );
-   bsW ( s, 8, (u >> 16) & 0xffL );
-   bsW ( s, 8, (u >>  8) & 0xffL );
-   bsW ( s, 8,  u        & 0xffL );
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsPutUChar ( EState* s, UChar c )
-{
-   bsW( s, 8, (UInt32)c );
-}
-
-
-/*---------------------------------------------------*/
-/*--- The back end proper                         ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-static
-void makeMaps_e ( EState* s )
-{
-   Int32 i;
-   s->nInUse = 0;
-   for (i = 0; i < 256; i++)
-      if (s->inUse[i]) {
-         s->unseqToSeq[i] = s->nInUse;
-         s->nInUse++;
-      }
-}
-
-
-/*---------------------------------------------------*/
-static
-void generateMTFValues ( EState* s )
-{
-   UChar   yy[256];
-   Int32   i, j;
-   Int32   zPend;
-   Int32   wr;
-   Int32   EOB;
-
-   /* 
-      After sorting (eg, here),
-         s->arr1 [ 0 .. s->nblock-1 ] holds sorted order,
-         and
-         ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] 
-         holds the original block data.
-
-      The first thing to do is generate the MTF values,
-      and put them in
-         ((UInt16*)s->arr1) [ 0 .. s->nblock-1 ].
-      Because there are strictly fewer or equal MTF values
-      than block values, ptr values in this area are overwritten
-      with MTF values only when they are no longer needed.
-
-      The final compressed bitstream is generated into the
-      area starting at
-         (UChar*) (&((UChar*)s->arr2)[s->nblock])
-
-      These storage aliases are set up in bzCompressInit(),
-      except for the last one, which is arranged in 
-      compressBlock().
-   */
-   UInt32* ptr   = s->ptr;
-   UChar* block  = s->block;
-   UInt16* mtfv  = s->mtfv;
-
-   makeMaps_e ( s );
-   EOB = s->nInUse+1;
-
-   for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0;
-
-   wr = 0;
-   zPend = 0;
-   for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
-
-   for (i = 0; i < s->nblock; i++) {
-      UChar ll_i;
-      AssertD ( wr <= i, "generateMTFValues(1)" );
-      j = ptr[i]-1; if (j < 0) j += s->nblock;
-      ll_i = s->unseqToSeq[block[j]];
-      AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
-
-      if (yy[0] == ll_i) { 
-         zPend++;
-      } else {
-
-         if (zPend > 0) {
-            zPend--;
-            while (True) {
-               if (zPend & 1) {
-                  mtfv[wr] = BZ_RUNB; wr++; 
-                  s->mtfFreq[BZ_RUNB]++; 
-               } else {
-                  mtfv[wr] = BZ_RUNA; wr++; 
-                  s->mtfFreq[BZ_RUNA]++; 
-               }
-               if (zPend < 2) break;
-               zPend = (zPend - 2) / 2;
-            };
-            zPend = 0;
-         }
-         {
-            register UChar  rtmp;
-            register UChar* ryy_j;
-            register UChar  rll_i;
-            rtmp  = yy[1];
-            yy[1] = yy[0];
-            ryy_j = &(yy[1]);
-            rll_i = ll_i;
-            while ( rll_i != rtmp ) {
-               register UChar rtmp2;
-               ryy_j++;
-               rtmp2  = rtmp;
-               rtmp   = *ryy_j;
-               *ryy_j = rtmp2;
-            };
-            yy[0] = rtmp;
-            j = ryy_j - &(yy[0]);
-            mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
-         }
-
-      }
-   }
-
-   if (zPend > 0) {
-      zPend--;
-      while (True) {
-         if (zPend & 1) {
-            mtfv[wr] = BZ_RUNB; wr++; 
-            s->mtfFreq[BZ_RUNB]++; 
-         } else {
-            mtfv[wr] = BZ_RUNA; wr++; 
-            s->mtfFreq[BZ_RUNA]++; 
-         }
-         if (zPend < 2) break;
-         zPend = (zPend - 2) / 2;
-      };
-      zPend = 0;
-   }
-
-   mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
-
-   s->nMTF = wr;
-}
-
-
-/*---------------------------------------------------*/
-#define BZ_LESSER_ICOST  0
-#define BZ_GREATER_ICOST 15
-
-static
-void sendMTFValues ( EState* s )
-{
-   Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
-   Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
-   Int32 nGroups, nBytes;
-
-   /*--
-   UChar  len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   is a global since the decoder also needs it.
-
-   Int32  code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   Int32  rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   are also globals only used in this proc.
-   Made global to keep stack frame size small.
-   --*/
-
-
-   UInt16 cost[BZ_N_GROUPS];
-   Int32  fave[BZ_N_GROUPS];
-
-   UInt16* mtfv = s->mtfv;
-
-   if (s->verbosity >= 3)
-      VPrintf3( "      %d in block, %d after MTF & 1-2 coding, "
-                "%d+2 syms in use\n", 
-                s->nblock, s->nMTF, s->nInUse );
-
-   alphaSize = s->nInUse+2;
-   for (t = 0; t < BZ_N_GROUPS; t++)
-      for (v = 0; v < alphaSize; v++)
-         s->len[t][v] = BZ_GREATER_ICOST;
-
-   /*--- Decide how many coding tables to use ---*/
-   AssertH ( s->nMTF > 0, 3001 );
-   if (s->nMTF < 200)  nGroups = 2; else
-   if (s->nMTF < 600)  nGroups = 3; else
-   if (s->nMTF < 1200) nGroups = 4; else
-   if (s->nMTF < 2400) nGroups = 5; else
-                       nGroups = 6;
-
-   /*--- Generate an initial set of coding tables ---*/
-   { 
-      Int32 nPart, remF, tFreq, aFreq;
-
-      nPart = nGroups;
-      remF  = s->nMTF;
-      gs = 0;
-      while (nPart > 0) {
-         tFreq = remF / nPart;
-         ge = gs-1;
-         aFreq = 0;
-         while (aFreq < tFreq && ge < alphaSize-1) {
-            ge++;
-            aFreq += s->mtfFreq[ge];
-         }
-
-         if (ge > gs 
-             && nPart != nGroups && nPart != 1 
-             && ((nGroups-nPart) % 2 == 1)) {
-            aFreq -= s->mtfFreq[ge];
-            ge--;
-         }
-
-         if (s->verbosity >= 3)
-            VPrintf5( "      initial group %d, [%d .. %d], "
-                      "has %d syms (%4.1f%%)\n",
-                      nPart, gs, ge, aFreq, 
-                      (100.0 * (float)aFreq) / (float)(s->nMTF) );
- 
-         for (v = 0; v < alphaSize; v++)
-            if (v >= gs && v <= ge) 
-               s->len[nPart-1][v] = BZ_LESSER_ICOST; else
-               s->len[nPart-1][v] = BZ_GREATER_ICOST;
- 
-         nPart--;
-         gs = ge+1;
-         remF -= aFreq;
-      }
-   }
-
-   /*--- 
-      Iterate up to BZ_N_ITERS times to improve the tables.
-   ---*/
-   for (iter = 0; iter < BZ_N_ITERS; iter++) {
-
-      for (t = 0; t < nGroups; t++) fave[t] = 0;
-
-      for (t = 0; t < nGroups; t++)
-         for (v = 0; v < alphaSize; v++)
-            s->rfreq[t][v] = 0;
-
-      /*---
-        Set up an auxiliary length table which is used to fast-track
-	the common case (nGroups == 6). 
-      ---*/
-      if (nGroups == 6) {
-         for (v = 0; v < alphaSize; v++) {
-            s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
-            s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
-            s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
-	 }
-      }
-
-      nSelectors = 0;
-      totc = 0;
-      gs = 0;
-      while (True) {
-
-         /*--- Set group start & end marks. --*/
-         if (gs >= s->nMTF) break;
-         ge = gs + BZ_G_SIZE - 1; 
-         if (ge >= s->nMTF) ge = s->nMTF-1;
-
-         /*-- 
-            Calculate the cost of this group as coded
-            by each of the coding tables.
-         --*/
-         for (t = 0; t < nGroups; t++) cost[t] = 0;
-
-         if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-            register UInt32 cost01, cost23, cost45;
-            register UInt16 icv;
-            cost01 = cost23 = cost45 = 0;
-
-#           define BZ_ITER(nn)                \
-               icv = mtfv[gs+(nn)];           \
-               cost01 += s->len_pack[icv][0]; \
-               cost23 += s->len_pack[icv][1]; \
-               cost45 += s->len_pack[icv][2]; \
-
-            BZ_ITER(0);  BZ_ITER(1);  BZ_ITER(2);  BZ_ITER(3);  BZ_ITER(4);
-            BZ_ITER(5);  BZ_ITER(6);  BZ_ITER(7);  BZ_ITER(8);  BZ_ITER(9);
-            BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14);
-            BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19);
-            BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24);
-            BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29);
-            BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34);
-            BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39);
-            BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44);
-            BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49);
-
-#           undef BZ_ITER
-
-            cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
-            cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
-            cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
-
-         } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++) { 
-               UInt16 icv = mtfv[i];
-               for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
-            }
-         }
- 
-         /*-- 
-            Find the coding table which is best for this group,
-            and record its identity in the selector table.
-         --*/
-         bc = 999999999; bt = -1;
-         for (t = 0; t < nGroups; t++)
-            if (cost[t] < bc) { bc = cost[t]; bt = t; };
-         totc += bc;
-         fave[bt]++;
-         s->selector[nSelectors] = bt;
-         nSelectors++;
-
-         /*-- 
-            Increment the symbol frequencies for the selected table.
-          --*/
-         if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-
-#           define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++
-
-            BZ_ITUR(0);  BZ_ITUR(1);  BZ_ITUR(2);  BZ_ITUR(3);  BZ_ITUR(4);
-            BZ_ITUR(5);  BZ_ITUR(6);  BZ_ITUR(7);  BZ_ITUR(8);  BZ_ITUR(9);
-            BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14);
-            BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19);
-            BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24);
-            BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29);
-            BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34);
-            BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39);
-            BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44);
-            BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49);
-
-#           undef BZ_ITUR
-
-         } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++)
-               s->rfreq[bt][ mtfv[i] ]++;
-         }
-
-         gs = ge+1;
-      }
-      if (s->verbosity >= 3) {
-         VPrintf2 ( "      pass %d: size is %d, grp uses are ", 
-                   iter+1, totc/8 );
-         for (t = 0; t < nGroups; t++)
-            VPrintf1 ( "%d ", fave[t] );
-         VPrintf0 ( "\n" );
-      }
-
-      /*--
-        Recompute the tables based on the accumulated frequencies.
-      --*/
-      /* maxLen was changed from 20 to 17 in bzip2-1.0.3.  See 
-         comment in huffman.c for details. */
-      for (t = 0; t < nGroups; t++)
-         BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), 
-                                 alphaSize, 17 /*20*/ );
-   }
-
-
-   AssertH( nGroups < 8, 3002 );
-   AssertH( nSelectors < 32768 &&
-            nSelectors <= (2 + (900000 / BZ_G_SIZE)),
-            3003 );
-
-
-   /*--- Compute MTF values for the selectors. ---*/
-   {
-      UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp;
-      for (i = 0; i < nGroups; i++) pos[i] = i;
-      for (i = 0; i < nSelectors; i++) {
-         ll_i = s->selector[i];
-         j = 0;
-         tmp = pos[j];
-         while ( ll_i != tmp ) {
-            j++;
-            tmp2 = tmp;
-            tmp = pos[j];
-            pos[j] = tmp2;
-         };
-         pos[0] = tmp;
-         s->selectorMtf[i] = j;
-      }
-   };
-
-   /*--- Assign actual codes for the tables. --*/
-   for (t = 0; t < nGroups; t++) {
-      minLen = 32;
-      maxLen = 0;
-      for (i = 0; i < alphaSize; i++) {
-         if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-         if (s->len[t][i] < minLen) minLen = s->len[t][i];
-      }
-      AssertH ( !(maxLen > 17 /*20*/ ), 3004 );
-      AssertH ( !(minLen < 1),  3005 );
-      BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), 
-                          minLen, maxLen, alphaSize );
-   }
-
-   /*--- Transmit the mapping table. ---*/
-   { 
-      Bool inUse16[16];
-      for (i = 0; i < 16; i++) {
-          inUse16[i] = False;
-          for (j = 0; j < 16; j++)
-             if (s->inUse[i * 16 + j]) inUse16[i] = True;
-      }
-     
-      nBytes = s->numZ;
-      for (i = 0; i < 16; i++)
-         if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
-
-      for (i = 0; i < 16; i++)
-         if (inUse16[i])
-            for (j = 0; j < 16; j++) {
-               if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0);
-            }
-
-      if (s->verbosity >= 3) 
-         VPrintf1( "      bytes: mapping %d, ", s->numZ-nBytes );
-   }
-
-   /*--- Now the selectors. ---*/
-   nBytes = s->numZ;
-   bsW ( s, 3, nGroups );
-   bsW ( s, 15, nSelectors );
-   for (i = 0; i < nSelectors; i++) { 
-      for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1);
-      bsW(s,1,0);
-   }
-   if (s->verbosity >= 3)
-      VPrintf1( "selectors %d, ", s->numZ-nBytes );
-
-   /*--- Now the coding tables. ---*/
-   nBytes = s->numZ;
-
-   for (t = 0; t < nGroups; t++) {
-      Int32 curr = s->len[t][0];
-      bsW ( s, 5, curr );
-      for (i = 0; i < alphaSize; i++) {
-         while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ };
-         while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ };
-         bsW ( s, 1, 0 );
-      }
-   }
-
-   if (s->verbosity >= 3)
-      VPrintf1 ( "code lengths %d, ", s->numZ-nBytes );
-
-   /*--- And finally, the block data proper ---*/
-   nBytes = s->numZ;
-   selCtr = 0;
-   gs = 0;
-   while (True) {
-      if (gs >= s->nMTF) break;
-      ge = gs + BZ_G_SIZE - 1; 
-      if (ge >= s->nMTF) ge = s->nMTF-1;
-      AssertH ( s->selector[selCtr] < nGroups, 3006 );
-
-      if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-            UInt16 mtfv_i;
-            UChar* s_len_sel_selCtr 
-               = &(s->len[s->selector[selCtr]][0]);
-            Int32* s_code_sel_selCtr
-               = &(s->code[s->selector[selCtr]][0]);
-
-#           define BZ_ITAH(nn)                      \
-               mtfv_i = mtfv[gs+(nn)];              \
-               bsW ( s,                             \
-                     s_len_sel_selCtr[mtfv_i],      \
-                     s_code_sel_selCtr[mtfv_i] )
-
-            BZ_ITAH(0);  BZ_ITAH(1);  BZ_ITAH(2);  BZ_ITAH(3);  BZ_ITAH(4);
-            BZ_ITAH(5);  BZ_ITAH(6);  BZ_ITAH(7);  BZ_ITAH(8);  BZ_ITAH(9);
-            BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14);
-            BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19);
-            BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24);
-            BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29);
-            BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34);
-            BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39);
-            BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44);
-            BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49);
-
-#           undef BZ_ITAH
-
-      } else {
-	 /*--- slow version which correctly handles all situations ---*/
-         for (i = gs; i <= ge; i++) {
-            bsW ( s, 
-                  s->len  [s->selector[selCtr]] [mtfv[i]],
-                  s->code [s->selector[selCtr]] [mtfv[i]] );
-         }
-      }
-
-
-      gs = ge+1;
-      selCtr++;
-   }
-   AssertH( selCtr == nSelectors, 3007 );
-
-   if (s->verbosity >= 3)
-      VPrintf1( "codes %d\n", s->numZ-nBytes );
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_compressBlock ( EState* s, Bool is_last_block )
-{
-   if (s->nblock > 0) {
-
-      BZ_FINALISE_CRC ( s->blockCRC );
-      s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31);
-      s->combinedCRC ^= s->blockCRC;
-      if (s->blockNo > 1) s->numZ = 0;
-
-      if (s->verbosity >= 2)
-         VPrintf4( "    block %d: crc = 0x%08x, "
-                   "combined CRC = 0x%08x, size = %d\n",
-                   s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
-
-      BZ2_blockSort ( s );
-   }
-
-   s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]);
-
-   /*-- If this is the first block, create the stream header. --*/
-   if (s->blockNo == 1) {
-      BZ2_bsInitWrite ( s );
-      bsPutUChar ( s, BZ_HDR_B );
-      bsPutUChar ( s, BZ_HDR_Z );
-      bsPutUChar ( s, BZ_HDR_h );
-      bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) );
-   }
-
-   if (s->nblock > 0) {
-
-      bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 );
-      bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 );
-      bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 );
-
-      /*-- Now the block's CRC, so it is in a known place. --*/
-      bsPutUInt32 ( s, s->blockCRC );
-
-      /*-- 
-         Now a single bit indicating (non-)randomisation. 
-         As of version 0.9.5, we use a better sorting algorithm
-         which makes randomisation unnecessary.  So always set
-         the randomised bit to 'no'.  Of course, the decoder
-         still needs to be able to handle randomised blocks
-         so as to maintain backwards compatibility with
-         older versions of bzip2.
-      --*/
-      bsW(s,1,0);
-
-      bsW ( s, 24, s->origPtr );
-      generateMTFValues ( s );
-      sendMTFValues ( s );
-   }
-
-
-   /*-- If this is the last block, add the stream trailer. --*/
-   if (is_last_block) {
-
-      bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 );
-      bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 );
-      bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
-      bsPutUInt32 ( s, s->combinedCRC );
-      if (s->verbosity >= 2)
-         VPrintf1( "    final combined CRC = 0x%08x\n   ", s->combinedCRC );
-      bsFinishWrite ( s );
-   }
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                        compress.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/crctable.c r-base-3.3.1/src/extra/bzip2/crctable.c
--- r-base-3.2.3/src/extra/bzip2/crctable.c	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/crctable.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Table for doing CRCs                                  ---*/
-/*---                                            crctable.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-/*--
-  I think this is an implementation of the AUTODIN-II,
-  Ethernet & FDDI 32-bit CRC standard.  Vaguely derived
-  from code by Rob Warnock, in Section 51 of the
-  comp.compression FAQ.
---*/
-
-UInt32 BZ2_crc32Table[256] = {
-
-   /*-- Ugly, innit? --*/
-
-   0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L,
-   0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L,
-   0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L,
-   0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL,
-   0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L,
-   0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L,
-   0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L,
-   0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL,
-   0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L,
-   0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L,
-   0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L,
-   0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL,
-   0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L,
-   0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L,
-   0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L,
-   0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL,
-   0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL,
-   0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L,
-   0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L,
-   0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL,
-   0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL,
-   0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L,
-   0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L,
-   0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL,
-   0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL,
-   0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L,
-   0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L,
-   0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL,
-   0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL,
-   0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L,
-   0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L,
-   0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL,
-   0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L,
-   0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL,
-   0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL,
-   0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L,
-   0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L,
-   0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL,
-   0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL,
-   0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L,
-   0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L,
-   0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL,
-   0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL,
-   0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L,
-   0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L,
-   0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL,
-   0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL,
-   0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L,
-   0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L,
-   0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL,
-   0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L,
-   0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L,
-   0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L,
-   0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL,
-   0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L,
-   0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L,
-   0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L,
-   0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL,
-   0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L,
-   0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L,
-   0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L,
-   0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL,
-   0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L,
-   0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
-};
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                        crctable.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/decompress.c r-base-3.3.1/src/extra/bzip2/decompress.c
--- r-base-3.2.3/src/extra/bzip2/decompress.c	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/decompress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,646 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Decompression machinery                               ---*/
-/*---                                          decompress.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-static
-void makeMaps_d ( DState* s )
-{
-   Int32 i;
-   s->nInUse = 0;
-   for (i = 0; i < 256; i++)
-      if (s->inUse[i]) {
-         s->seqToUnseq[s->nInUse] = i;
-         s->nInUse++;
-      }
-}
-
-
-/*---------------------------------------------------*/
-#define RETURN(rrr)                               \
-   { retVal = rrr; goto save_state_and_return; };
-
-#define GET_BITS(lll,vvv,nnn)                     \
-   case lll: s->state = lll;                      \
-   while (True) {                                 \
-      if (s->bsLive >= nnn) {                     \
-         UInt32 v;                                \
-         v = (s->bsBuff >>                        \
-             (s->bsLive-nnn)) & ((1 << nnn)-1);   \
-         s->bsLive -= nnn;                        \
-         vvv = v;                                 \
-         break;                                   \
-      }                                           \
-      if (s->strm->avail_in == 0) RETURN(BZ_OK);  \
-      s->bsBuff                                   \
-         = (s->bsBuff << 8) |                     \
-           ((UInt32)                              \
-              (*((UChar*)(s->strm->next_in))));   \
-      s->bsLive += 8;                             \
-      s->strm->next_in++;                         \
-      s->strm->avail_in--;                        \
-      s->strm->total_in_lo32++;                   \
-      if (s->strm->total_in_lo32 == 0)            \
-         s->strm->total_in_hi32++;                \
-   }
-
-#define GET_UCHAR(lll,uuu)                        \
-   GET_BITS(lll,uuu,8)
-
-#define GET_BIT(lll,uuu)                          \
-   GET_BITS(lll,uuu,1)
-
-/*---------------------------------------------------*/
-#define GET_MTF_VAL(label1,label2,lval)           \
-{                                                 \
-   if (groupPos == 0) {                           \
-      groupNo++;                                  \
-      if (groupNo >= nSelectors)                  \
-         RETURN(BZ_DATA_ERROR);                   \
-      groupPos = BZ_G_SIZE;                       \
-      gSel = s->selector[groupNo];                \
-      gMinlen = s->minLens[gSel];                 \
-      gLimit = &(s->limit[gSel][0]);              \
-      gPerm = &(s->perm[gSel][0]);                \
-      gBase = &(s->base[gSel][0]);                \
-   }                                              \
-   groupPos--;                                    \
-   zn = gMinlen;                                  \
-   GET_BITS(label1, zvec, zn);                    \
-   while (1) {                                    \
-      if (zn > 20 /* the longest code */)         \
-         RETURN(BZ_DATA_ERROR);                   \
-      if (zvec <= gLimit[zn]) break;              \
-      zn++;                                       \
-      GET_BIT(label2, zj);                        \
-      zvec = (zvec << 1) | zj;                    \
-   };                                             \
-   if (zvec - gBase[zn] < 0                       \
-       || zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE)  \
-      RETURN(BZ_DATA_ERROR);                      \
-   lval = gPerm[zvec - gBase[zn]];                \
-}
-
-
-/*---------------------------------------------------*/
-Int32 BZ2_decompress ( DState* s )
-{
-   UChar      uc;
-   Int32      retVal;
-   Int32      minLen, maxLen;
-   bz_stream* strm = s->strm;
-
-   /* stuff that needs to be saved/restored */
-   Int32  i;
-   Int32  j;
-   Int32  t;
-   Int32  alphaSize;
-   Int32  nGroups;
-   Int32  nSelectors;
-   Int32  EOB;
-   Int32  groupNo;
-   Int32  groupPos;
-   Int32  nextSym;
-   Int32  nblockMAX;
-   Int32  nblock;
-   Int32  es;
-   Int32  N;
-   Int32  curr;
-   Int32  zt;
-   Int32  zn; 
-   Int32  zvec;
-   Int32  zj;
-   Int32  gSel;
-   Int32  gMinlen;
-   Int32* gLimit;
-   Int32* gBase;
-   Int32* gPerm;
-
-   if (s->state == BZ_X_MAGIC_1) {
-      /*initialise the save area*/
-      s->save_i           = 0;
-      s->save_j           = 0;
-      s->save_t           = 0;
-      s->save_alphaSize   = 0;
-      s->save_nGroups     = 0;
-      s->save_nSelectors  = 0;
-      s->save_EOB         = 0;
-      s->save_groupNo     = 0;
-      s->save_groupPos    = 0;
-      s->save_nextSym     = 0;
-      s->save_nblockMAX   = 0;
-      s->save_nblock      = 0;
-      s->save_es          = 0;
-      s->save_N           = 0;
-      s->save_curr        = 0;
-      s->save_zt          = 0;
-      s->save_zn          = 0;
-      s->save_zvec        = 0;
-      s->save_zj          = 0;
-      s->save_gSel        = 0;
-      s->save_gMinlen     = 0;
-      s->save_gLimit      = NULL;
-      s->save_gBase       = NULL;
-      s->save_gPerm       = NULL;
-   }
-
-   /*restore from the save area*/
-   i           = s->save_i;
-   j           = s->save_j;
-   t           = s->save_t;
-   alphaSize   = s->save_alphaSize;
-   nGroups     = s->save_nGroups;
-   nSelectors  = s->save_nSelectors;
-   EOB         = s->save_EOB;
-   groupNo     = s->save_groupNo;
-   groupPos    = s->save_groupPos;
-   nextSym     = s->save_nextSym;
-   nblockMAX   = s->save_nblockMAX;
-   nblock      = s->save_nblock;
-   es          = s->save_es;
-   N           = s->save_N;
-   curr        = s->save_curr;
-   zt          = s->save_zt;
-   zn          = s->save_zn; 
-   zvec        = s->save_zvec;
-   zj          = s->save_zj;
-   gSel        = s->save_gSel;
-   gMinlen     = s->save_gMinlen;
-   gLimit      = s->save_gLimit;
-   gBase       = s->save_gBase;
-   gPerm       = s->save_gPerm;
-
-   retVal = BZ_OK;
-
-   switch (s->state) {
-
-      GET_UCHAR(BZ_X_MAGIC_1, uc);
-      if (uc != BZ_HDR_B) RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_UCHAR(BZ_X_MAGIC_2, uc);
-      if (uc != BZ_HDR_Z) RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_UCHAR(BZ_X_MAGIC_3, uc)
-      if (uc != BZ_HDR_h) RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8)
-      if (s->blockSize100k < (BZ_HDR_0 + 1) || 
-          s->blockSize100k > (BZ_HDR_0 + 9)) RETURN(BZ_DATA_ERROR_MAGIC);
-      s->blockSize100k -= BZ_HDR_0;
-
-      if (s->smallDecompress) {
-         s->ll16 = (UInt16*) BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
-         s->ll4  = (UChar *) BZALLOC( 
-		               ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) 
-		             );
-         if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
-      } else {
-         s->tt  = (UInt32 *) BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
-         if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
-      }
-
-      GET_UCHAR(BZ_X_BLKHDR_1, uc);
-
-      if (uc == 0x17) goto endhdr_2;
-      if (uc != 0x31) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_2, uc);
-      if (uc != 0x41) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_3, uc);
-      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_4, uc);
-      if (uc != 0x26) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_5, uc);
-      if (uc != 0x53) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_6, uc);
-      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
-
-      s->currBlockNo++;
-      if (s->verbosity >= 2)
-         VPrintf1 ( "\n    [%d: huff+mtf ", s->currBlockNo );
- 
-      s->storedBlockCRC = 0;
-      GET_UCHAR(BZ_X_BCRC_1, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_2, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_3, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_4, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-
-      GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1);
-
-      s->origPtr = 0;
-      GET_UCHAR(BZ_X_ORIGPTR_1, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-      GET_UCHAR(BZ_X_ORIGPTR_2, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-      GET_UCHAR(BZ_X_ORIGPTR_3, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-
-      if (s->origPtr < 0)
-         RETURN(BZ_DATA_ERROR);
-      if (s->origPtr > 10 + 100000*s->blockSize100k) 
-         RETURN(BZ_DATA_ERROR);
-
-      /*--- Receive the mapping table ---*/
-      for (i = 0; i < 16; i++) {
-         GET_BIT(BZ_X_MAPPING_1, uc);
-         if (uc == 1) 
-            s->inUse16[i] = True; else 
-            s->inUse16[i] = False;
-      }
-
-      for (i = 0; i < 256; i++) s->inUse[i] = False;
-
-      for (i = 0; i < 16; i++)
-         if (s->inUse16[i])
-            for (j = 0; j < 16; j++) {
-               GET_BIT(BZ_X_MAPPING_2, uc);
-               if (uc == 1) s->inUse[i * 16 + j] = True;
-            }
-      makeMaps_d ( s );
-      if (s->nInUse == 0) RETURN(BZ_DATA_ERROR);
-      alphaSize = s->nInUse+2;
-
-      /*--- Now the selectors ---*/
-      GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
-      if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
-      GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
-      if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
-      for (i = 0; i < nSelectors; i++) {
-         j = 0;
-         while (True) {
-            GET_BIT(BZ_X_SELECTOR_3, uc);
-            if (uc == 0) break;
-            j++;
-            if (j >= nGroups) RETURN(BZ_DATA_ERROR);
-         }
-         s->selectorMtf[i] = j;
-      }
-
-      /*--- Undo the MTF values for the selectors. ---*/
-      {
-         UChar pos[BZ_N_GROUPS], tmp, v;
-         for (v = 0; v < nGroups; v++) pos[v] = v;
-   
-         for (i = 0; i < nSelectors; i++) {
-            v = s->selectorMtf[i];
-            tmp = pos[v];
-            while (v > 0) { pos[v] = pos[v-1]; v--; }
-            pos[0] = tmp;
-            s->selector[i] = tmp;
-         }
-      }
-
-      /*--- Now the coding tables ---*/
-      for (t = 0; t < nGroups; t++) {
-         GET_BITS(BZ_X_CODING_1, curr, 5);
-         for (i = 0; i < alphaSize; i++) {
-            while (True) {
-               if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR);
-               GET_BIT(BZ_X_CODING_2, uc);
-               if (uc == 0) break;
-               GET_BIT(BZ_X_CODING_3, uc);
-               if (uc == 0) curr++; else curr--;
-            }
-            s->len[t][i] = curr;
-         }
-      }
-
-      /*--- Create the Huffman decoding tables ---*/
-      for (t = 0; t < nGroups; t++) {
-         minLen = 32;
-         maxLen = 0;
-         for (i = 0; i < alphaSize; i++) {
-            if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-            if (s->len[t][i] < minLen) minLen = s->len[t][i];
-         }
-         BZ2_hbCreateDecodeTables ( 
-            &(s->limit[t][0]), 
-            &(s->base[t][0]), 
-            &(s->perm[t][0]), 
-            &(s->len[t][0]),
-            minLen, maxLen, alphaSize
-         );
-         s->minLens[t] = minLen;
-      }
-
-      /*--- Now the MTF values ---*/
-
-      EOB      = s->nInUse+1;
-      nblockMAX = 100000 * s->blockSize100k;
-      groupNo  = -1;
-      groupPos = 0;
-
-      for (i = 0; i <= 255; i++) s->unzftab[i] = 0;
-
-      /*-- MTF init --*/
-      {
-         Int32 ii, jj, kk;
-         kk = MTFA_SIZE-1;
-         for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) {
-            for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
-               s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj);
-               kk--;
-            }
-            s->mtfbase[ii] = kk + 1;
-         }
-      }
-      /*-- end MTF init --*/
-
-      nblock = 0;
-      GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym);
-
-      while (True) {
-
-         if (nextSym == EOB) break;
-
-         if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) {
-
-            es = -1;
-            N = 1;
-            do {
-               /* Check that N doesn't get too big, so that es doesn't
-                  go negative.  The maximum value that can be
-                  RUNA/RUNB encoded is equal to the block size (post
-                  the initial RLE), viz, 900k, so bounding N at 2
-                  million should guard against overflow without
-                  rejecting any legitimate inputs. */
-               if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR);
-               if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
-               if (nextSym == BZ_RUNB) es = es + (1+1) * N;
-               N = N * 2;
-               GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym);
-            }
-               while (nextSym == BZ_RUNA || nextSym == BZ_RUNB);
-
-            es++;
-            uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ];
-            s->unzftab[uc] += es;
-
-            if (s->smallDecompress)
-               while (es > 0) {
-                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-                  s->ll16[nblock] = (UInt16)uc;
-                  nblock++;
-                  es--;
-               }
-            else
-               while (es > 0) {
-                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-                  s->tt[nblock] = (UInt32)uc;
-                  nblock++;
-                  es--;
-               };
-
-            continue;
-
-         } else {
-
-            if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-
-            /*-- uc = MTF ( nextSym-1 ) --*/
-            {
-               Int32 ii, jj, kk, pp, lno, off;
-               UInt32 nn;
-               nn = (UInt32)(nextSym - 1);
-
-               if (nn < MTFL_SIZE) {
-                  /* avoid general-case expense */
-                  pp = s->mtfbase[0];
-                  uc = s->mtfa[pp+nn];
-                  while (nn > 3) {
-                     Int32 z = pp+nn;
-                     s->mtfa[(z)  ] = s->mtfa[(z)-1];
-                     s->mtfa[(z)-1] = s->mtfa[(z)-2];
-                     s->mtfa[(z)-2] = s->mtfa[(z)-3];
-                     s->mtfa[(z)-3] = s->mtfa[(z)-4];
-                     nn -= 4;
-                  }
-                  while (nn > 0) { 
-                     s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; 
-                  };
-                  s->mtfa[pp] = uc;
-               } else { 
-                  /* general case */
-                  lno = nn / MTFL_SIZE;
-                  off = nn % MTFL_SIZE;
-                  pp = s->mtfbase[lno] + off;
-                  uc = s->mtfa[pp];
-                  while (pp > s->mtfbase[lno]) { 
-                     s->mtfa[pp] = s->mtfa[pp-1]; pp--; 
-                  };
-                  s->mtfbase[lno]++;
-                  while (lno > 0) {
-                     s->mtfbase[lno]--;
-                     s->mtfa[s->mtfbase[lno]] 
-                        = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1];
-                     lno--;
-                  }
-                  s->mtfbase[0]--;
-                  s->mtfa[s->mtfbase[0]] = uc;
-                  if (s->mtfbase[0] == 0) {
-                     kk = MTFA_SIZE-1;
-                     for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) {
-                        for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
-                           s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj];
-                           kk--;
-                        }
-                        s->mtfbase[ii] = kk + 1;
-                     }
-                  }
-               }
-            }
-            /*-- end uc = MTF ( nextSym-1 ) --*/
-
-            s->unzftab[s->seqToUnseq[uc]]++;
-            if (s->smallDecompress)
-               s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else
-               s->tt[nblock]   = (UInt32)(s->seqToUnseq[uc]);
-            nblock++;
-
-            GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym);
-            continue;
-         }
-      }
-
-      /* Now we know what nblock is, we can do a better sanity
-         check on s->origPtr.
-      */
-      if (s->origPtr < 0 || s->origPtr >= nblock)
-         RETURN(BZ_DATA_ERROR);
-
-      /*-- Set up cftab to facilitate generation of T^(-1) --*/
-      /* Check: unzftab entries in range. */
-      for (i = 0; i <= 255; i++) {
-         if (s->unzftab[i] < 0 || s->unzftab[i] > nblock)
-            RETURN(BZ_DATA_ERROR);
-      }
-      /* Actually generate cftab. */
-      s->cftab[0] = 0;
-      for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
-      for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
-      /* Check: cftab entries in range. */
-      for (i = 0; i <= 256; i++) {
-         if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
-            /* s->cftab[i] can legitimately be == nblock */
-            RETURN(BZ_DATA_ERROR);
-         }
-      }
-      /* Check: cftab entries non-descending. */
-      for (i = 1; i <= 256; i++) {
-         if (s->cftab[i-1] > s->cftab[i]) {
-            RETURN(BZ_DATA_ERROR);
-         }
-      }
-
-      s->state_out_len = 0;
-      s->state_out_ch  = 0;
-      BZ_INITIALISE_CRC ( s->calculatedBlockCRC );
-      s->state = BZ_X_OUTPUT;
-      if (s->verbosity >= 2) VPrintf0 ( "rt+rld" );
-
-      if (s->smallDecompress) {
-
-         /*-- Make a copy of cftab, used in generation of T --*/
-         for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i];
-
-         /*-- compute the T vector --*/
-         for (i = 0; i < nblock; i++) {
-            uc = (UChar)(s->ll16[i]);
-            SET_LL(i, s->cftabCopy[uc]);
-            s->cftabCopy[uc]++;
-         }
-
-         /*-- Compute T^(-1) by pointer reversal on T --*/
-         i = s->origPtr;
-         j = GET_LL(i);
-         do {
-            Int32 tmp = GET_LL(j);
-            SET_LL(j, i);
-            i = j;
-            j = tmp;
-         }
-            while (i != s->origPtr);
-
-         s->tPos = s->origPtr;
-         s->nblock_used = 0;
-         if (s->blockRandomised) {
-            BZ_RAND_INIT_MASK;
-            BZ_GET_SMALL(s->k0); s->nblock_used++;
-            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; 
-         } else {
-            BZ_GET_SMALL(s->k0); s->nblock_used++;
-         }
-
-      } else {
-
-         /*-- compute the T^(-1) vector --*/
-         for (i = 0; i < nblock; i++) {
-            uc = (UChar)(s->tt[i] & 0xff);
-            s->tt[s->cftab[uc]] |= (i << 8);
-            s->cftab[uc]++;
-         }
-
-         s->tPos = s->tt[s->origPtr] >> 8;
-         s->nblock_used = 0;
-         if (s->blockRandomised) {
-            BZ_RAND_INIT_MASK;
-            BZ_GET_FAST(s->k0); s->nblock_used++;
-            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; 
-         } else {
-            BZ_GET_FAST(s->k0); s->nblock_used++;
-         }
-
-      }
-
-      RETURN(BZ_OK);
-
-
-
-    endhdr_2:
-
-      GET_UCHAR(BZ_X_ENDHDR_2, uc);
-      if (uc != 0x72) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_3, uc);
-      if (uc != 0x45) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_4, uc);
-      if (uc != 0x38) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_5, uc);
-      if (uc != 0x50) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_6, uc);
-      if (uc != 0x90) RETURN(BZ_DATA_ERROR);
-
-      s->storedCombinedCRC = 0;
-      GET_UCHAR(BZ_X_CCRC_1, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_2, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_3, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_4, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-
-      s->state = BZ_X_IDLE;
-      RETURN(BZ_STREAM_END);
-
-      default: AssertH ( False, 4001 );
-   }
-
-   AssertH ( False, 4002 );
-
-   save_state_and_return:
-
-   s->save_i           = i;
-   s->save_j           = j;
-   s->save_t           = t;
-   s->save_alphaSize   = alphaSize;
-   s->save_nGroups     = nGroups;
-   s->save_nSelectors  = nSelectors;
-   s->save_EOB         = EOB;
-   s->save_groupNo     = groupNo;
-   s->save_groupPos    = groupPos;
-   s->save_nextSym     = nextSym;
-   s->save_nblockMAX   = nblockMAX;
-   s->save_nblock      = nblock;
-   s->save_es          = es;
-   s->save_N           = N;
-   s->save_curr        = curr;
-   s->save_zt          = zt;
-   s->save_zn          = zn;
-   s->save_zvec        = zvec;
-   s->save_zj          = zj;
-   s->save_gSel        = gSel;
-   s->save_gMinlen     = gMinlen;
-   s->save_gLimit      = gLimit;
-   s->save_gBase       = gBase;
-   s->save_gPerm       = gPerm;
-
-   return retVal;   
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                      decompress.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/huffman.c r-base-3.3.1/src/extra/bzip2/huffman.c
--- r-base-3.2.3/src/extra/bzip2/huffman.c	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/huffman.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Huffman coding low-level stuff                        ---*/
-/*---                                             huffman.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-/*---------------------------------------------------*/
-#define WEIGHTOF(zz0)  ((zz0) & 0xffffff00)
-#define DEPTHOF(zz1)   ((zz1) & 0x000000ff)
-#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3))
-
-#define ADDWEIGHTS(zw1,zw2)                           \
-   (WEIGHTOF(zw1)+WEIGHTOF(zw2)) |                    \
-   (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2)))
-
-#define UPHEAP(z)                                     \
-{                                                     \
-   Int32 zz, tmp;                                     \
-   zz = z; tmp = heap[zz];                            \
-   while (weight[tmp] < weight[heap[zz >> 1]]) {      \
-      heap[zz] = heap[zz >> 1];                       \
-      zz >>= 1;                                       \
-   }                                                  \
-   heap[zz] = tmp;                                    \
-}
-
-#define DOWNHEAP(z)                                   \
-{                                                     \
-   Int32 zz, yy, tmp;                                 \
-   zz = z; tmp = heap[zz];                            \
-   while (True) {                                     \
-      yy = zz << 1;                                   \
-      if (yy > nHeap) break;                          \
-      if (yy < nHeap &&                               \
-          weight[heap[yy+1]] < weight[heap[yy]])      \
-         yy++;                                        \
-      if (weight[tmp] < weight[heap[yy]]) break;      \
-      heap[zz] = heap[yy];                            \
-      zz = yy;                                        \
-   }                                                  \
-   heap[zz] = tmp;                                    \
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbMakeCodeLengths ( UChar *len, 
-                             Int32 *freq,
-                             Int32 alphaSize,
-                             Int32 maxLen )
-{
-   /*--
-      Nodes and heap entries run from 1.  Entry 0
-      for both the heap and nodes is a sentinel.
-   --*/
-   Int32 nNodes, nHeap, n1, n2, i, j, k;
-   Bool  tooLong;
-
-   Int32 heap   [ BZ_MAX_ALPHA_SIZE + 2 ];
-   Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ];
-   Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; 
-
-   for (i = 0; i < alphaSize; i++)
-      weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8;
-
-   while (True) {
-
-      nNodes = alphaSize;
-      nHeap = 0;
-
-      heap[0] = 0;
-      weight[0] = 0;
-      parent[0] = -2;
-
-      for (i = 1; i <= alphaSize; i++) {
-         parent[i] = -1;
-         nHeap++;
-         heap[nHeap] = i;
-         UPHEAP(nHeap);
-      }
-
-      AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 );
-   
-      while (nHeap > 1) {
-         n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
-         n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
-         nNodes++;
-         parent[n1] = parent[n2] = nNodes;
-         weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]);
-         parent[nNodes] = -1;
-         nHeap++;
-         heap[nHeap] = nNodes;
-         UPHEAP(nHeap);
-      }
-
-      AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 );
-
-      tooLong = False;
-      for (i = 1; i <= alphaSize; i++) {
-         j = 0;
-         k = i;
-         while (parent[k] >= 0) { k = parent[k]; j++; }
-         len[i-1] = j;
-         if (j > maxLen) tooLong = True;
-      }
-      
-      if (! tooLong) break;
-
-      /* 17 Oct 04: keep-going condition for the following loop used
-         to be 'i < alphaSize', which missed the last element,
-         theoretically leading to the possibility of the compressor
-         looping.  However, this count-scaling step is only needed if
-         one of the generated Huffman code words is longer than
-         maxLen, which up to and including version 1.0.2 was 20 bits,
-         which is extremely unlikely.  In version 1.0.3 maxLen was
-         changed to 17 bits, which has minimal effect on compression
-         ratio, but does mean this scaling step is used from time to
-         time, enough to verify that it works.
-
-         This means that bzip2-1.0.3 and later will only produce
-         Huffman codes with a maximum length of 17 bits.  However, in
-         order to preserve backwards compatibility with bitstreams
-         produced by versions pre-1.0.3, the decompressor must still
-         handle lengths of up to 20. */
-
-      for (i = 1; i <= alphaSize; i++) {
-         j = weight[i] >> 8;
-         j = 1 + (j / 2);
-         weight[i] = j << 8;
-      }
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbAssignCodes ( Int32 *code,
-                         UChar *length,
-                         Int32 minLen,
-                         Int32 maxLen,
-                         Int32 alphaSize )
-{
-   Int32 n, vec, i;
-
-   vec = 0;
-   for (n = minLen; n <= maxLen; n++) {
-      for (i = 0; i < alphaSize; i++)
-         if (length[i] == n) { code[i] = vec; vec++; };
-      vec <<= 1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbCreateDecodeTables ( Int32 *limit,
-                                Int32 *base,
-                                Int32 *perm,
-                                UChar *length,
-                                Int32 minLen,
-                                Int32 maxLen,
-                                Int32 alphaSize )
-{
-   Int32 pp, i, j, vec;
-
-   pp = 0;
-   for (i = minLen; i <= maxLen; i++)
-      for (j = 0; j < alphaSize; j++)
-         if (length[j] == i) { perm[pp] = j; pp++; };
-
-   for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0;
-   for (i = 0; i < alphaSize; i++) base[length[i]+1]++;
-
-   for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1];
-
-   for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0;
-   vec = 0;
-
-   for (i = minLen; i <= maxLen; i++) {
-      vec += (base[i+1] - base[i]);
-      limit[i] = vec-1;
-      vec <<= 1;
-   }
-   for (i = minLen + 1; i <= maxLen; i++)
-      base[i] = ((limit[i-1] + 1) << 1) - base[i];
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                         huffman.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/LICENSE r-base-3.3.1/src/extra/bzip2/LICENSE
--- r-base-3.2.3/src/extra/bzip2/LICENSE	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-
---------------------------------------------------------------------------
-
-This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2010 Julian R Seward.  All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
-   documentation would be appreciated but is not required.
-
-3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-
-4. The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
-
---------------------------------------------------------------------------
diff -Nru r-base-3.2.3/src/extra/bzip2/Makefile.in r-base-3.3.1/src/extra/bzip2/Makefile.in
--- r-base-3.2.3/src/extra/bzip2/Makefile.in	2015-03-18 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-#
-# ${R_HOME}/src/extra/bzip2/Makefile
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-top_builddir = ../../..
-subdir = src/extra/bzip2
-R_HOME = $(top_builddir)
-
-include $(top_builddir)/Makeconf
-
-BZIP2_CPPFLAGS = -I$(srcdir)
-ALL_CPPFLAGS = $(BZIP2_CPPFLAGS) $(R_XTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS)
-
-SOURCES = blocksort.c bzlib.c compress.c crctable.c decompress.c \
-  huffman.c randtable.c
-HEADERS = bzlib.h bzlib_private.h
-DEPENDS = $(SOURCES:.c=.d)
-OBJECTS = $(SOURCES:.c=.o)
-@WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) @C_VISIBILITY@
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-DISTFILES = LICENSE Makefile.in Makefile.win R_changes \
-  $(SOURCES) $(HEADERS)
-noinst_LIBRARIES = libbz2.a
-#noinst_LIBRARIES = @BUILD_BZLIB_TRUE@ libbz2.a
-libbz2_a_SOURCES = $(SOURCES)
-libbz2_a_OBJECTS = $(OBJECTS)
-
-
-all: R
-
-Makefile: $(srcdir)/Makefile.in \
-  $(top_builddir)/config.status \
-  $(SOURCES)
-	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-Makedeps: Makefile $(DEPENDS)
-	@cat $(DEPENDS) >> Makefile
-	@touch $@
-
-R: Makedeps
-	@$(MAKE) $(noinst_LIBRARIES)
-
-libbz2.a: $(libbz2_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(libbz2_a_OBJECTS)
-	$(RANLIB) $@
-
-
-mostlyclean: clean
-clean:
-	@-rm -f Makedeps *.d *.o *.lo *.a
-distclean: clean
-	@-rm -f Makefile
-maintainer-clean: distclean
-
-install install-strip uninstall TAGS info dvi check:
-
-distdir: $(DISTFILES)
-	@for f in $(DISTFILES); do \
-	  test -f $(distdir)/$${f} \
-	    || ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
-	    || cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
-	done
-
-## Automagically generated dependencies:
-
diff -Nru r-base-3.2.3/src/extra/bzip2/Makefile.win r-base-3.3.1/src/extra/bzip2/Makefile.win
--- r-base-3.2.3/src/extra/bzip2/Makefile.win	2015-03-18 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/Makefile.win	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#-*- Makefile -*-
-
-include ../../gnuwin32/MkRules
-
-all: makeMakedeps libbz2.a
-
-CPPFLAGS = -I../../include
-
-CSOURCES =  blocksort.c huffman.c crctable.c randtable.c compress.c \
-          decompress.c bzlib.c
-OBJS = $(CSOURCES:.c=.o)
-
-libbz2.a: $(OBJS)
-
-clean:
-	$(RM) *.o *~ *.d Makedeps
-distclean: clean
-	@$(RM) libbz2.a
-
-# Dependencies
-DEPS = $(CSOURCES:.c=.d)
-
-makeMakedeps: $(DEPS)
-	@$(RM) Makedeps
-	@cat $(DEPS) >> Makedeps
-
--include Makedeps
diff -Nru r-base-3.2.3/src/extra/bzip2/randtable.c r-base-3.3.1/src/extra/bzip2/randtable.c
--- r-base-3.2.3/src/extra/bzip2/randtable.c	2010-09-27 22:05:02.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/randtable.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Table for randomising repetitive blocks               ---*/
-/*---                                           randtable.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------*/
-Int32 BZ2_rNums[512] = { 
-   619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
-   985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
-   733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 
-   419, 436, 278, 496, 867, 210, 399, 680, 480, 51, 
-   878, 465, 811, 169, 869, 675, 611, 697, 867, 561, 
-   862, 687, 507, 283, 482, 129, 807, 591, 733, 623, 
-   150, 238, 59, 379, 684, 877, 625, 169, 643, 105, 
-   170, 607, 520, 932, 727, 476, 693, 425, 174, 647, 
-   73, 122, 335, 530, 442, 853, 695, 249, 445, 515, 
-   909, 545, 703, 919, 874, 474, 882, 500, 594, 612, 
-   641, 801, 220, 162, 819, 984, 589, 513, 495, 799, 
-   161, 604, 958, 533, 221, 400, 386, 867, 600, 782, 
-   382, 596, 414, 171, 516, 375, 682, 485, 911, 276, 
-   98, 553, 163, 354, 666, 933, 424, 341, 533, 870, 
-   227, 730, 475, 186, 263, 647, 537, 686, 600, 224, 
-   469, 68, 770, 919, 190, 373, 294, 822, 808, 206, 
-   184, 943, 795, 384, 383, 461, 404, 758, 839, 887, 
-   715, 67, 618, 276, 204, 918, 873, 777, 604, 560, 
-   951, 160, 578, 722, 79, 804, 96, 409, 713, 940, 
-   652, 934, 970, 447, 318, 353, 859, 672, 112, 785, 
-   645, 863, 803, 350, 139, 93, 354, 99, 820, 908, 
-   609, 772, 154, 274, 580, 184, 79, 626, 630, 742, 
-   653, 282, 762, 623, 680, 81, 927, 626, 789, 125, 
-   411, 521, 938, 300, 821, 78, 343, 175, 128, 250, 
-   170, 774, 972, 275, 999, 639, 495, 78, 352, 126, 
-   857, 956, 358, 619, 580, 124, 737, 594, 701, 612, 
-   669, 112, 134, 694, 363, 992, 809, 743, 168, 974, 
-   944, 375, 748, 52, 600, 747, 642, 182, 862, 81, 
-   344, 805, 988, 739, 511, 655, 814, 334, 249, 515, 
-   897, 955, 664, 981, 649, 113, 974, 459, 893, 228, 
-   433, 837, 553, 268, 926, 240, 102, 654, 459, 51, 
-   686, 754, 806, 760, 493, 403, 415, 394, 687, 700, 
-   946, 670, 656, 610, 738, 392, 760, 799, 887, 653, 
-   978, 321, 576, 617, 626, 502, 894, 679, 243, 440, 
-   680, 879, 194, 572, 640, 724, 926, 56, 204, 700, 
-   707, 151, 457, 449, 797, 195, 791, 558, 945, 679, 
-   297, 59, 87, 824, 713, 663, 412, 693, 342, 606, 
-   134, 108, 571, 364, 631, 212, 174, 643, 304, 329, 
-   343, 97, 430, 751, 497, 314, 983, 374, 822, 928, 
-   140, 206, 73, 263, 980, 736, 876, 478, 430, 305, 
-   170, 514, 364, 692, 829, 82, 855, 953, 676, 246, 
-   369, 970, 294, 750, 807, 827, 150, 790, 288, 923, 
-   804, 378, 215, 828, 592, 281, 565, 555, 710, 82, 
-   896, 831, 547, 261, 524, 462, 293, 465, 502, 56, 
-   661, 821, 976, 991, 658, 869, 905, 758, 745, 193, 
-   768, 550, 608, 933, 378, 286, 215, 979, 792, 961, 
-   61, 688, 793, 644, 986, 403, 106, 366, 905, 644, 
-   372, 567, 466, 434, 645, 210, 389, 550, 919, 135, 
-   780, 773, 635, 389, 707, 100, 626, 958, 165, 504, 
-   920, 176, 193, 713, 857, 265, 203, 50, 668, 108, 
-   645, 990, 626, 197, 510, 357, 358, 850, 858, 364, 
-   936, 638
-};
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                       randtable.c ---*/
-/*-------------------------------------------------------------*/
diff -Nru r-base-3.2.3/src/extra/bzip2/R_changes r-base-3.3.1/src/extra/bzip2/R_changes
--- r-base-3.2.3/src/extra/bzip2/R_changes	2015-03-18 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/bzip2/R_changes	1970-01-01 00:00:00.000000000 +0000
@@ -1,330 +0,0 @@
-The changes for R are all to do with portability:
-
-Only files which are needed for the interface used are included.
-File compress.c was renamed to bzcompress.c to avoid clashes.
-
-__inline__ is not portable.  We make use of static inlining in the 
-file bzlib.c and decompress.c to avoid issues with semantics of 
-'extern inline'.
-
-fdopen is POSIX but not C89 nor C99.
-Solaris' cc at one time objected to inlining functions with names 
-starting with 'main'.
-C character strings are limited to ca 500 chars.
-Various casts were missing.
-Solaris cc complained about unused code, hence the use of UNREACHED.
-The shifts on signed ints are undefined behaviour (this has been
-reported upstream with no response).
-
-
-diff -ru bzip2-1.0.6/blocksort.c bzip2/blocksort.c
---- bzip2-1.0.6/blocksort.c	2010-09-10 23:37:02.000000000 +0100
-+++ bzip2/blocksort.c	2014-11-22 22:18:15.000000000 +0000
-@@ -28,7 +28,7 @@
- 
- /*---------------------------------------------*/
- static 
--__inline__
-+R_INLINE
- void fallbackSimpleSort ( UInt32* fmap, 
-                           UInt32* eclass, 
-                           Int32   lo, 
-@@ -202,9 +202,10 @@
-       bhtab [ 0 .. 2+(nblock/32) ] destroyed
- */
- 
--#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
--#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
--#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
-+// R_change: these shifts on signed ints are undefined behaviour.
-+#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1U << ((zz) & 31))
-+#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1U << ((zz) & 31))
-+#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1U << ((zz) & 31)))
- #define      WORD_BH(zz)  bhtab[(zz) >> 5]
- #define UNALIGNED_BH(zz)  ((zz) & 0x01f)
- 
-@@ -342,8 +343,12 @@
- /*---------------------------------------------*/
- 
- /*---------------------------------------------*/
-+/* Solaris cc objects to inlining functions whose names start with `main' */
-+#ifdef __SUNPRO_C
-+# define mainGtU BZmainGtU
-+#endif
- static
--__inline__
-+R_INLINE
- Bool mainGtU ( UInt32  i1, 
-                UInt32  i2,
-                UChar*  block, 
-@@ -579,7 +584,7 @@
- }
- 
- static 
--__inline__
-+R_INLINE
- UChar mmed3 ( UChar a, UChar b, UChar c )
- {
-    UChar t;
-diff -ru bzip2-1.0.6/bzlib.c bzip2/bzlib.c
---- bzip2-1.0.6/bzlib.c	2010-09-10 23:38:23.000000000 +0100
-+++ bzip2/bzlib.c	2014-11-23 07:43:39.000000000 +0000
-@@ -53,8 +53,9 @@
-       BZ2_bzlibVersion()
-    );
- 
-+   /* split up over-long message */
-    if (errcode == 1007) {
--   fprintf(stderr,
-+       fprintf(stderr, "%s%s%s",
-       "\n*** A special note about internal error number 1007 ***\n"
-       "\n"
-       "Experience suggests that a common cause of i.e. 1007\n"
-@@ -62,7 +63,7 @@
-       "just happens to cross-check the results of huge numbers of\n"
-       "memory reads/writes, and so acts (unintendedly) as a stress\n"
-       "test of your memory system.\n"
--      "\n"
-+       "\n",
-       "I suggest the following: try compressing the file again,\n"
-       "possibly monitoring progress in detail with the -vv flag.\n"
-       "\n"
-@@ -72,7 +73,7 @@
-       "  (www.memtest86.com).  At the time of writing it is free (GPLd).\n"
-       "  Memtest86 tests memory much more thorougly than your BIOSs\n"
-       "  power-on test, and may find failures that the BIOS doesn't.\n"
--      "\n"
-+      "\n",
-       "* If the error can be repeatably reproduced, this is a bug in\n"
-       "  bzip2, and I would very much like to hear about it.  Please\n"
-       "  let me know, and, ideally, save a copy of the file causing the\n"
-@@ -165,7 +166,7 @@
-    if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-    if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
- 
--   s = BZALLOC( sizeof(EState) );
-+   s = (EState *) BZALLOC( sizeof(EState) );
-    if (s == NULL) return BZ_MEM_ERROR;
-    s->strm = strm;
- 
-@@ -174,9 +175,9 @@
-    s->ftab = NULL;
- 
-    n       = 100000 * blockSize100k;
--   s->arr1 = BZALLOC( n                  * sizeof(UInt32) );
--   s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
--   s->ftab = BZALLOC( 65537              * sizeof(UInt32) );
-+   s->arr1 = (UInt32 *) BZALLOC( n                  * sizeof(UInt32) );
-+   s->arr2 = (UInt32 *) BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
-+   s->ftab = (UInt32 *) BZALLOC( 65537              * sizeof(UInt32) );
- 
-    if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) {
-       if (s->arr1 != NULL) BZFREE(s->arr1);
-@@ -362,7 +363,7 @@
- {
-    Bool progress_in  = False;
-    Bool progress_out = False;
--   EState* s = strm->state;
-+   EState* s = (EState *) strm->state;
-    
-    while (True) {
- 
-@@ -409,7 +410,7 @@
-    Bool progress;
-    EState* s;
-    if (strm == NULL) return BZ_PARAM_ERROR;
--   s = strm->state;
-+   s = (EState *) strm->state;
-    if (s == NULL) return BZ_PARAM_ERROR;
-    if (s->strm != strm) return BZ_PARAM_ERROR;
- 
-@@ -469,7 +470,7 @@
- {
-    EState* s;
-    if (strm == NULL) return BZ_PARAM_ERROR;
--   s = strm->state;
-+   s = (EState *) strm->state;
-    if (s == NULL) return BZ_PARAM_ERROR;
-    if (s->strm != strm) return BZ_PARAM_ERROR;
- 
-@@ -505,7 +506,7 @@
-    if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-    if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
- 
--   s = BZALLOC( sizeof(DState) );
-+   s = (DState *) BZALLOC( sizeof(DState) );
-    if (s == NULL) return BZ_MEM_ERROR;
-    s->strm                  = strm;
-    strm->state              = s;
-@@ -684,7 +685,7 @@
- 
- 
- /*---------------------------------------------------*/
--__inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
-+Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
- {
-    Int32 nb, na, mid;
-    nb = 0;
-@@ -810,7 +811,7 @@
-    Bool    corrupt;
-    DState* s;
-    if (strm == NULL) return BZ_PARAM_ERROR;
--   s = strm->state;
-+   s = (DState *) strm->state;
-    if (s == NULL) return BZ_PARAM_ERROR;
-    if (s->strm != strm) return BZ_PARAM_ERROR;
- 
-@@ -852,9 +853,11 @@
-       }
-    }
- 
-+#ifdef UNREACHED
-    AssertH ( 0, 6001 );
- 
-    return 0;  /*NOTREACHED*/
-+#endif
- }
- 
- 
-@@ -863,7 +866,7 @@
- {
-    DState* s;
-    if (strm == NULL) return BZ_PARAM_ERROR;
--   s = strm->state;
-+   s = (DState *) strm->state;
-    if (s == NULL) return BZ_PARAM_ERROR;
-    if (s->strm != strm) return BZ_PARAM_ERROR;
- 
-@@ -934,7 +937,7 @@
-    if (ferror(f))
-       { BZ_SETERR(BZ_IO_ERROR); return NULL; };
- 
--   bzf = malloc ( sizeof(bzFile) );
-+   bzf = (bzFile *) malloc ( sizeof(bzFile) );
-    if (bzf == NULL)
-       { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
- 
-@@ -982,7 +985,7 @@
-       { BZ_SETERR(BZ_OK); return; };
- 
-    bzf->strm.avail_in = len;
--   bzf->strm.next_in  = buf;
-+   bzf->strm.next_in  = (char *) buf;
- 
-    while (True) {
-       bzf->strm.avail_out = BZ_MAX_UNUSED;
-@@ -1107,7 +1110,7 @@
-    if (ferror(f))
-       { BZ_SETERR(BZ_IO_ERROR); return NULL; };
- 
--   bzf = malloc ( sizeof(bzFile) );
-+   bzf = (bzFile *) malloc ( sizeof(bzFile) );
-    if (bzf == NULL) 
-       { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
- 
-@@ -1179,7 +1182,7 @@
-       { BZ_SETERR(BZ_OK); return 0; };
- 
-    bzf->strm.avail_out = len;
--   bzf->strm.next_out = buf;
-+   bzf->strm.next_out = (char *) buf;
- 
-    while (True) {
- 
-@@ -1213,7 +1216,9 @@
-       
-    }
- 
-+#ifdef UNREACHED
-    return 0; /*not reached*/
-+#endif
- }
- 
- 
-@@ -1379,6 +1384,15 @@
- #else
- #   define SET_BINARY_MODE(file)
- #endif
-+
-+#if !defined(fdopen) && defined(HAVE_FDOPEN)
-+  FILE *fdopen(int fildes, const char *mode)
-+#ifdef __cplusplus
-+	throw ()
-+#endif
-+ ;
-+#endif
-+
- static
- BZFILE * bzopen_or_bzdopen
-                ( const char *path,   /* no use when bzdopen */
-@@ -1425,7 +1439,7 @@
-         fp = fopen(path,mode2);
-       }
-    } else {
--#ifdef BZ_STRICT_ANSI
-+#ifndef HAVE_FDOPEN
-       fp = NULL;
- #else
-       fp = fdopen(fd,mode2);
-@@ -1513,11 +1527,11 @@
- /*---------------------------------------------------*/
- void BZ_API(BZ2_bzclose) (BZFILE* b)
- {
-+   if (b==NULL) return;
-+
-    int bzerr;
--   FILE *fp;
-+   FILE *fp = ((bzFile *)b)->handle;
-    
--   if (b==NULL) {return;}
--   fp = ((bzFile *)b)->handle;
-    if(((bzFile*)b)->writing){
-       BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
-       if(bzerr != BZ_OK){
-diff -ru bzip2-1.0.6/bzlib_private.h bzip2/bzlib_private.h
---- bzip2-1.0.6/bzlib_private.h	2010-09-10 23:41:55.000000000 +0100
-+++ bzip2/bzlib_private.h	2011-03-30 14:00:46.000000000 +0100
-@@ -22,6 +22,9 @@
- #ifndef _BZLIB_PRIVATE_H
- #define _BZLIB_PRIVATE_H
- 
-+#include <config.h> /* for R_INLINE */
-+#undef HAVE_FDOPEN  /* we may have, but this re-declares it and
-+		       we don't use BZ2_bzdopen */
- #include <stdlib.h>
- 
- #ifndef BZ_NO_STDIO
-diff -ru bzip2-1.0.6/compress.c bzip2/compress.c
---- bzip2-1.0.6/compress.c	2014-11-21 10:38:37.000000000 +0000
-+++ bzip2/compress.c	2011-03-30 14:00:46.000000000 +0100
-@@ -69,7 +69,7 @@
- 
- /*---------------------------------------------------*/
- static
--__inline__
-+R_INLINE
- void bsW ( EState* s, Int32 n, UInt32 v )
- {
-    bsNEEDW ( n );
-diff -ru bzip2-1.0.6/decompress.c bzip2/decompress.c
---- bzip2-1.0.6/decompress.c	2010-09-10 23:43:17.000000000 +0100
-+++ bzip2/decompress.c	2011-03-30 14:00:46.000000000 +0100
-@@ -209,13 +209,13 @@
-       s->blockSize100k -= BZ_HDR_0;
- 
-       if (s->smallDecompress) {
--         s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
--         s->ll4  = BZALLOC( 
--                      ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) 
--                   );
-+         s->ll16 = (UInt16*) BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
-+         s->ll4  = (UChar *) BZALLOC( 
-+		               ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) 
-+		             );
-          if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
-       } else {
--         s->tt  = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
-+         s->tt  = (UInt32 *) BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
-          if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
-       }
- 
diff -Nru r-base-3.2.3/src/extra/intl/Makefile.in r-base-3.3.1/src/extra/intl/Makefile.in
--- r-base-3.2.3/src/extra/intl/Makefile.in	2010-03-17 14:43:05.000000000 +0000
+++ r-base-3.3.1/src/extra/intl/Makefile.in	2015-12-10 23:15:13.000000000 +0000
@@ -56,8 +56,8 @@
 	@touch $@
 
 libintl.a: $(libintl_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(libintl_a_OBJECTS)
+	@rm -f $@
+	$(AR) -cr $@ $(libintl_a_OBJECTS)
 	$(RANLIB) $@
 
 headers: libgnuintl.h
diff -Nru r-base-3.2.3/src/extra/Makefile.in r-base-3.3.1/src/extra/Makefile.in
--- r-base-3.2.3/src/extra/Makefile.in	2015-03-23 16:16:55.000000000 +0000
+++ r-base-3.3.1/src/extra/Makefile.in	2016-03-16 23:02:11.000000000 +0000
@@ -13,20 +13,15 @@
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 DISTFILES = Makefile.in
 
-SUBDIRS = blas bzip2 pcre tre xdr xz zlib @USE_NLS_TRUE@ intl
+SUBDIRS = blas tre xdr @USE_NLS_TRUE@ intl
 SUBDIRS_WITH_NO_BUILD = graphapp trio tzone win_iconv @USE_NLS_FALSE@ intl
 
 RBLAS =@BLAS_SHLIB_TRUE@ make.blas
-LIBBZ2 =@BUILD_BZLIB_TRUE@ make.bzip2
-LIBPCRE =@BUILD_PCRE_TRUE@ make.pcre
-LIBZ =@BUILD_ZLIB_TRUE@ make.zlib
 LIBXDR =@BUILD_XDR_TRUE@ make.xdr
 LIBINTL =@BUILD_LIBINTL_TRUE@ make.intl
 LIBTRE =@BUILD_TRE_TRUE@ make.tre
-LIBTZONE = @BUILD_TZONE_TRUE@make.tzone
-LIBXZ =@BUILD_XZ_TRUE@ make.xz
-EXTRAS = $(RBLAS) $(LIBBZ2) $(LIBPCRE) $(LIBZ) $(LIBXDR) $(LIBINTL) \
-  $(LIBTRE) $(LIBTZONE) $(LIBXZ)
+LIBTZONE =@BUILD_TZONE_TRUE@make.tzone
+EXTRAS = $(RBLAS) $(LIBXDR) $(LIBINTL) $(LIBTRE) $(LIBTZONE)
 
 all: Makefile R
 
@@ -39,24 +34,12 @@
 make.blas: Makefile
 	@(cd blas; $(MAKE))
 
-make.bzip2: Makefile
-	@(cd bzip2; $(MAKE))
-
-make.pcre: Makefile
-	@(cd pcre; $(MAKE))
-
-make.zlib: Makefile
-	@(cd zlib; $(MAKE))
-
 make.tre: Makefile
 	@(cd tre; $(MAKE))
 
 make.xdr: Makefile
 	@(cd xdr; $(MAKE))
 
-make.xz: Makefile
-	@(cd xz; $(MAKE))
-
 make.intl: Makefile
 	@(cd intl; $(MAKE))
 
diff -Nru r-base-3.2.3/src/extra/pcre/LICENCE r-base-3.3.1/src/extra/pcre/LICENCE
--- r-base-3.2.3/src/extra/pcre/LICENCE	2015-05-13 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/LICENCE	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-PCRE LICENCE
-------------
-
-PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-Release 8 of PCRE is distributed under the terms of the "BSD" licence, as
-specified below. The documentation for PCRE, supplied in the "doc"
-directory, is distributed under the same terms as the software itself. The data
-in the testdata directory is not copyrighted and is in the public domain.
-
-The basic library functions are written in C and are freestanding. Also
-included in the distribution is a set of C++ wrapper functions, and a
-just-in-time compiler that can be used to optimize pattern matching. These
-are both optional features that can be omitted when the library is built.
-
-
-THE BASIC LIBRARY FUNCTIONS
----------------------------
-
-Written by:       Philip Hazel
-Email local part: ph10
-Email domain:     cam.ac.uk
-
-University of Cambridge Computing Service,
-Cambridge, England.
-
-Copyright (c) 1997-2015 University of Cambridge
-All rights reserved.
-
-
-PCRE JUST-IN-TIME COMPILATION SUPPORT
--------------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Emain domain:     freemail.hu
-
-Copyright(c) 2010-2015 Zoltan Herczeg
-All rights reserved.
-
-
-STACK-LESS JUST-IN-TIME COMPILER
---------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Emain domain:     freemail.hu
-
-Copyright(c) 2009-2015 Zoltan Herczeg
-All rights reserved.
-
-
-THE C++ WRAPPER FUNCTIONS
--------------------------
-
-Contributed by:   Google Inc.
-
-Copyright (c) 2007-2012, Google Inc.
-All rights reserved.
-
-
-THE "BSD" LICENCE
------------------
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the name of Google
-      Inc. nor the names of their contributors may be used to endorse or
-      promote products derived from this software without specific prior
-      written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-End
diff -Nru r-base-3.2.3/src/extra/pcre/Makefile.in r-base-3.3.1/src/extra/pcre/Makefile.in
--- r-base-3.2.3/src/extra/pcre/Makefile.in	2015-03-18 23:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-#
-# ${R_HOME}/src/extra/pcre/Makefile
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-top_builddir = ../../..
-subdir = src/extra/pcre
-R_HOME = $(top_builddir)
-
-include $(top_builddir)/Makeconf
-
-PCRE_CPPFLAGS = -I$(srcdir) -DLINK_SIZE=2
-ALL_CPPFLAGS = $(PCRE_CPPFLAGS) $(R_XTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS)
-
-SOURCES = pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c \
-	pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_jit_compile.c \
-	pcre_maketables.c pcre_newline.c pcre_ord2utf8.c pcre_refcount.c \
-	pcre_study.c pcre_tables.c pcre_ucd.c \
-	pcre_valid_utf8.c pcre_version.c pcre_xclass.c
-
-HEADERS = pcre_internal.h pcre.h ucp.h
-DEPENDS = $(SOURCES:.c=.d)
-OBJECTS = $(SOURCES:.c=.o)
-@WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) @C_VISIBILITY@
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-DISTFILES = LICENCE Makefile.in Makefile.win R_changes \
-  $(SOURCES) $(HEADERS)
-
-SUBDIRS_WITH_NO_BUILD = sljit
-
-
-noinst_LIBRARIES = @BUILD_PCRE_TRUE@ libpcre.a
-libpcre_a_SOURCES = $(SOURCES)
-libpcre_a_OBJECTS = $(OBJECTS)
-
-
-all: R
-
-Makefile: $(srcdir)/Makefile.in \
-  $(top_builddir)/config.status \
-  $(SOURCES)
-	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-Makedeps: Makefile $(DEPENDS)
-	@cat $(DEPENDS) >> Makefile
-	@touch $@
-
-R: Makefile
-	@$(MAKE) Makedeps
-	@BUILD_PCRE_TRUE@ @$(MAKE) $(noinst_LIBRARIES)
-
-libpcre.a: $(libpcre_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(libpcre_a_OBJECTS)
-	$(RANLIB) $@
-
-mostlyclean: clean
-clean:
-	@-rm -f Makedeps *.d *.o *.lo *.a
-distclean: clean
-	@-rm -f Makefile
-maintainer-clean: distclean
-
-install install-strip uninstall TAGS info dvi check:
-
-distdir: $(DISTFILES)
-	@for f in $(DISTFILES); do \
-	  test -f $(distdir)/$${f} \
-	    || ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
-	    || cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
-	done
-	@for d in $(SUBDIRS_WITH_NO_BUILD); do \
-	  ((cd $(srcdir); $(TAR) -c -f - --exclude=.svn --exclude=CVS $${d}) \
-	      | (cd $(distdir); $(TAR) -x -f -)) \
-	    || exit 1; \
-	done
-
-## Automagically generated dependencies:
-
diff -Nru r-base-3.2.3/src/extra/pcre/Makefile.win r-base-3.3.1/src/extra/pcre/Makefile.win
--- r-base-3.2.3/src/extra/pcre/Makefile.win	2015-03-18 23:02:11.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/Makefile.win	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#-*- Makefile -*-
-include ../../gnuwin32/MkRules
-
-DEFS = -DWIN32 -DPCRE_STATIC -DLINK_SIZE=2
-
-CPPFLAGS = -I../../include -I. $(DEFS)
-
-## done this way for parallel make
-all:
-	$(MAKE) -f Makefile.win makeMakedeps
-	$(MAKE) -f Makefile.win libpcre.a
-
-CSOURCES = pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c \
-	pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_jit_compile.c \
-	pcre_maketables.c pcre_newline.c pcre_ord2utf8.c pcre_refcount.c \
-	pcre_study.c pcre_tables.c pcre_ucd.c \
-	pcre_valid_utf8.c pcre_version.c pcre_xclass.c
-OBJS = $(CSOURCES:.c=.o)
-libpcre.a: $(OBJS)
-
-clean:
-	@$(RM) *.o *~ *.d Makedeps
-
-distclean: clean
-	@$(RM) libpcre.a
-
-# Dependencies
-DEPS = $(CSOURCES:.c=.d)
-
-makeMakedeps: $(DEPS)
-	@$(RM) Makedeps
-	@cat $(DEPS) >> Makedeps
-
--include Makedeps
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_chartables.c r-base-3.3.1/src/extra/pcre/pcre_chartables.c
--- r-base-3.2.3/src/extra/pcre/pcre_chartables.c	2015-11-26 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_chartables.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* This file contains character tables that are used when no external tables
-are passed to PCRE by the application that calls it. The tables are used only
-for characters whose code values are less than 256.
-
-This is a default version of the tables that assumes ASCII encoding. A program
-called dftables (which is distributed with PCRE) can be used to build
-alternative versions of this file. This is necessary if you are running in an
-EBCDIC environment, or if you want to default to a different encoding, for
-example ISO-8859-1. When dftables is run, it creates these tables in the
-current locale. If PCRE is configured with --enable-rebuild-chartables, this
-happens automatically.
-
-The following #includes are present because without them gcc 4.x may remove the
-array definition from the final binary if PCRE is built into a static library
-and dead code stripping is activated. This leads to link errors. Pulling in the
-header ensures that the array gets flagged as "someone outside this compilation
-unit might reference this" and so it will always be supplied to the linker. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-const pcre_uint8 PRIV(default_tables)[] = {
-
-/* This table is a lower casing table. */
-
-    0,  1,  2,  3,  4,  5,  6,  7,
-    8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55,
-   56, 57, 58, 59, 60, 61, 62, 63,
-   64, 97, 98, 99,100,101,102,103,
-  104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,
-  120,121,122, 91, 92, 93, 94, 95,
-   96, 97, 98, 99,100,101,102,103,
-  104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,
-  120,121,122,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,
-  136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,
-  152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,
-  168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,
-  184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,
-  200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,
-  216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,
-  232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,
-  248,249,250,251,252,253,254,255,
-
-/* This table is a case flipping table. */
-
-    0,  1,  2,  3,  4,  5,  6,  7,
-    8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55,
-   56, 57, 58, 59, 60, 61, 62, 63,
-   64, 97, 98, 99,100,101,102,103,
-  104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,
-  120,121,122, 91, 92, 93, 94, 95,
-   96, 65, 66, 67, 68, 69, 70, 71,
-   72, 73, 74, 75, 76, 77, 78, 79,
-   80, 81, 82, 83, 84, 85, 86, 87,
-   88, 89, 90,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,
-  136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,
-  152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,
-  168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,
-  184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,
-  200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,
-  216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,
-  232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,
-  248,249,250,251,252,253,254,255,
-
-/* This table contains bit maps for various character classes. Each map is 32
-bytes long and the bits run from the least significant end of each byte. The
-classes that have their own maps are: space, xdigit, digit, upper, lower, word,
-graph, print, punct, and cntrl. Other classes are built from combinations. */
-
-  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
-  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
-  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
-  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-/* This table identifies various classes of character by individual bits:
-  0x01   white space character
-  0x02   letter
-  0x04   decimal digit
-  0x08   hexadecimal digit
-  0x10   alphanumeric or '_'
-  0x80   regular expression metacharacter or binary zero
-*/
-
-  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-  0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00, /*   8- 15 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
-  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
-  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
-  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
-  0x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /*  X - _  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
-  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
-
-/* End of pcre_chartables.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_compile.c r-base-3.3.1/src/extra/pcre/pcre_compile.c
--- r-base-3.2.3/src/extra/pcre/pcre_compile.c	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_compile.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9732 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_compile(), along with
-supporting internal functions that are not used by other modules. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define NLBLOCK cd             /* Block containing newline information */
-#define PSSTART start_pattern  /* Field containing pattern start */
-#define PSEND   end_pattern    /* Field containing pattern end */
-
-#include "pcre_internal.h"
-
-
-/* When PCRE_DEBUG is defined, we need the pcre(16|32)_printint() function, which
-is also used by pcretest. PCRE_DEBUG is not defined when building a production
-library. We do not need to select pcre16_printint.c specially, because the
-COMPILE_PCREx macro will already be appropriately set. */
-
-#ifdef PCRE_DEBUG
-/* pcre_printint.c should not include any headers */
-#define PCRE_INCLUDED
-#include "pcre_printint.c"
-#undef PCRE_INCLUDED
-#endif
-
-
-/* Macro for setting individual bits in class bitmaps. */
-
-#define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
-
-/* Maximum length value to check against when making sure that the integer that
-holds the compiled pattern length does not overflow. We make it a bit less than
-INT_MAX to allow for adding in group terminating bytes, so that we don't have
-to check them every time. */
-
-#define OFLOW_MAX (INT_MAX - 20)
-
-/* Definitions to allow mutual recursion */
-
-static int
-  add_list_to_class(pcre_uint8 *, pcre_uchar **, int, compile_data *,
-    const pcre_uint32 *, unsigned int);
-
-static BOOL
-  compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
-    pcre_uint32 *, pcre_int32 *, pcre_uint32 *, pcre_int32 *, branch_chain *,
-    compile_data *, int *);
-
-
-
-/*************************************************
-*      Code parameters and static tables         *
-*************************************************/
-
-/* This value specifies the size of stack workspace that is used during the
-first pre-compile phase that determines how much memory is required. The regex
-is partly compiled into this space, but the compiled parts are discarded as
-soon as they can be, so that hopefully there will never be an overrun. The code
-does, however, check for an overrun. The largest amount I've seen used is 218,
-so this number is very generous.
-
-The same workspace is used during the second, actual compile phase for
-remembering forward references to groups so that they can be filled in at the
-end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
-is 4 there is plenty of room for most patterns. However, the memory can get
-filled up by repetitions of forward references, for example patterns like
-/(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
-that the workspace is expanded using malloc() in this situation. The value
-below is therefore a minimum, and we put a maximum on it for safety. The
-minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
-kicks in at the same number of forward references in all cases. */
-
-#define COMPILE_WORK_SIZE (2048*LINK_SIZE)
-#define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
-
-/* This value determines the size of the initial vector that is used for
-remembering named groups during the pre-compile. It is allocated on the stack,
-but if it is too small, it is expanded using malloc(), in a similar way to the
-workspace. The value is the number of slots in the list. */
-
-#define NAMED_GROUP_LIST_SIZE  20
-
-/* The overrun tests check for a slightly smaller size so that they detect the
-overrun before it actually does run off the end of the data block. */
-
-#define WORK_SIZE_SAFETY_MARGIN (100)
-
-/* Private flags added to firstchar and reqchar. */
-
-#define REQ_CASELESS    (1 << 0)        /* Indicates caselessness */
-#define REQ_VARY        (1 << 1)        /* Reqchar followed non-literal item */
-/* Negative values for the firstchar and reqchar flags */
-#define REQ_UNSET       (-2)
-#define REQ_NONE        (-1)
-
-/* Repeated character flags. */
-
-#define UTF_LENGTH     0x10000000l      /* The char contains its length. */
-
-/* Table for handling escaped characters in the range '0'-'z'. Positive returns
-are simple data values; negative values are for special things like \d and so
-on. Zero means further processing is needed (for things like \x), or the escape
-is invalid. */
-
-#ifndef EBCDIC
-
-/* This is the "normal" table for ASCII systems or for EBCDIC systems running
-in UTF-8 mode. */
-
-static const short int escapes[] = {
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     CHAR_COLON,              CHAR_SEMICOLON,
-     CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
-     CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
-     CHAR_COMMERCIAL_AT,      -ESC_A,
-     -ESC_B,                  -ESC_C,
-     -ESC_D,                  -ESC_E,
-     0,                       -ESC_G,
-     -ESC_H,                  0,
-     0,                       -ESC_K,
-     0,                       0,
-     -ESC_N,                  0,
-     -ESC_P,                  -ESC_Q,
-     -ESC_R,                  -ESC_S,
-     0,                       0,
-     -ESC_V,                  -ESC_W,
-     -ESC_X,                  0,
-     -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
-     CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
-     CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
-     CHAR_GRAVE_ACCENT,       ESC_a,
-     -ESC_b,                  0,
-     -ESC_d,                  ESC_e,
-     ESC_f,                   0,
-     -ESC_h,                  0,
-     0,                       -ESC_k,
-     0,                       0,
-     ESC_n,                   0,
-     -ESC_p,                  0,
-     ESC_r,                   -ESC_s,
-     ESC_tee,                 0,
-     -ESC_v,                  -ESC_w,
-     0,                       0,
-     -ESC_z
-};
-
-#else
-
-/* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
-
-static const short int escapes[] = {
-/*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
-/*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
-/*  58 */     0,     0,    '!',     '$',    '*',   ')',    ';',    '~',
-/*  60 */   '-',   '/',      0,       0,      0,     0,      0,      0,
-/*  68 */     0,     0,    '|',     ',',    '%',   '_',    '>',    '?',
-/*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
-/*  80 */     0, ESC_a, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
-/*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
-/*  90 */     0,     0, -ESC_k,       0,      0, ESC_n,      0, -ESC_p,
-/*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
-/*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
-/*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
-/*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
-/*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
-/*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
-/*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
-/*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
-/*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
-/*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
-/*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
-};
-
-/* We also need a table of characters that may follow \c in an EBCDIC
-environment for characters 0-31. */
-
-static unsigned char ebcdic_escape_c[] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
-
-#endif
-
-
-/* Table of special "verbs" like (*PRUNE). This is a short table, so it is
-searched linearly. Put all the names into a single string, in order to reduce
-the number of relocations when a shared library is dynamically linked. The
-string is built from string macros so that it works in UTF-8 mode on EBCDIC
-platforms. */
-
-typedef struct verbitem {
-  int   len;                 /* Length of verb name */
-  int   op;                  /* Op when no arg, or -1 if arg mandatory */
-  int   op_arg;              /* Op when arg present, or -1 if not allowed */
-} verbitem;
-
-static const char verbnames[] =
-  "\0"                       /* Empty name is a shorthand for MARK */
-  STRING_MARK0
-  STRING_ACCEPT0
-  STRING_COMMIT0
-  STRING_F0
-  STRING_FAIL0
-  STRING_PRUNE0
-  STRING_SKIP0
-  STRING_THEN;
-
-static const verbitem verbs[] = {
-  { 0, -1,        OP_MARK },
-  { 4, -1,        OP_MARK },
-  { 6, OP_ACCEPT, -1 },
-  { 6, OP_COMMIT, -1 },
-  { 1, OP_FAIL,   -1 },
-  { 4, OP_FAIL,   -1 },
-  { 5, OP_PRUNE,  OP_PRUNE_ARG },
-  { 4, OP_SKIP,   OP_SKIP_ARG  },
-  { 4, OP_THEN,   OP_THEN_ARG  }
-};
-
-static const int verbcount = sizeof(verbs)/sizeof(verbitem);
-
-
-/* Substitutes for [[:<:]] and [[:>:]], which mean start and end of word in
-another regex library. */
-
-static const pcre_uchar sub_start_of_word[] = {
-  CHAR_BACKSLASH, CHAR_b, CHAR_LEFT_PARENTHESIS, CHAR_QUESTION_MARK,
-  CHAR_EQUALS_SIGN, CHAR_BACKSLASH, CHAR_w, CHAR_RIGHT_PARENTHESIS, '\0' };
-
-static const pcre_uchar sub_end_of_word[] = {
-  CHAR_BACKSLASH, CHAR_b, CHAR_LEFT_PARENTHESIS, CHAR_QUESTION_MARK,
-  CHAR_LESS_THAN_SIGN, CHAR_EQUALS_SIGN, CHAR_BACKSLASH, CHAR_w,
-  CHAR_RIGHT_PARENTHESIS, '\0' };
-
-
-/* Tables of names of POSIX character classes and their lengths. The names are
-now all in a single string, to reduce the number of relocations when a shared
-library is dynamically loaded. The list of lengths is terminated by a zero
-length entry. The first three must be alpha, lower, upper, as this is assumed
-for handling case independence. The indices for graph, print, and punct are
-needed, so identify them. */
-
-static const char posix_names[] =
-  STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
-  STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
-  STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
-  STRING_word0  STRING_xdigit;
-
-static const pcre_uint8 posix_name_lengths[] = {
-  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
-
-#define PC_GRAPH  8
-#define PC_PRINT  9
-#define PC_PUNCT 10
-
-
-/* Table of class bit maps for each POSIX class. Each class is formed from a
-base map, with an optional addition or removal of another map. Then, for some
-classes, there is some additional tweaking: for [:blank:] the vertical space
-characters are removed, and for [:alpha:] and [:alnum:] the underscore
-character is removed. The triples in the table consist of the base map offset,
-second map offset or -1 if no second map, and a non-negative value for map
-addition or a negative value for map subtraction (if there are two maps). The
-absolute value of the third field has these meanings: 0 => no tweaking, 1 =>
-remove vertical space characters, 2 => remove underscore. */
-
-static const int posix_class_maps[] = {
-  cbit_word,  cbit_digit, -2,             /* alpha */
-  cbit_lower, -1,          0,             /* lower */
-  cbit_upper, -1,          0,             /* upper */
-  cbit_word,  -1,          2,             /* alnum - word without underscore */
-  cbit_print, cbit_cntrl,  0,             /* ascii */
-  cbit_space, -1,          1,             /* blank - a GNU extension */
-  cbit_cntrl, -1,          0,             /* cntrl */
-  cbit_digit, -1,          0,             /* digit */
-  cbit_graph, -1,          0,             /* graph */
-  cbit_print, -1,          0,             /* print */
-  cbit_punct, -1,          0,             /* punct */
-  cbit_space, -1,          0,             /* space */
-  cbit_word,  -1,          0,             /* word - a Perl extension */
-  cbit_xdigit,-1,          0              /* xdigit */
-};
-
-/* Table of substitutes for \d etc when PCRE_UCP is set. They are replaced by
-Unicode property escapes. */
-
-#ifdef SUPPORT_UCP
-static const pcre_uchar string_PNd[]  = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pNd[]  = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PXsp[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pXsp[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PXwd[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pXwd[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-
-static const pcre_uchar *substitutes[] = {
-  string_PNd,           /* \D */
-  string_pNd,           /* \d */
-  string_PXsp,          /* \S */   /* Xsp is Perl space, but from 8.34, Perl */
-  string_pXsp,          /* \s */   /* space and POSIX space are the same. */
-  string_PXwd,          /* \W */
-  string_pXwd           /* \w */
-};
-
-/* The POSIX class substitutes must be in the order of the POSIX class names,
-defined above, and there are both positive and negative cases. NULL means no
-general substitute of a Unicode property escape (\p or \P). However, for some
-POSIX classes (e.g. graph, print, punct) a special property code is compiled
-directly. */
-
-static const pcre_uchar string_pL[] =   {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pLl[] =  {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pLu[] =  {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pXan[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_h[] =    {
-  CHAR_BACKSLASH, CHAR_h, '\0' };
-static const pcre_uchar string_pXps[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PL[] =   {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PLl[] =  {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PLu[] =  {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PXan[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_H[] =    {
-  CHAR_BACKSLASH, CHAR_H, '\0' };
-static const pcre_uchar string_PXps[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-
-static const pcre_uchar *posix_substitutes[] = {
-  string_pL,            /* alpha */
-  string_pLl,           /* lower */
-  string_pLu,           /* upper */
-  string_pXan,          /* alnum */
-  NULL,                 /* ascii */
-  string_h,             /* blank */
-  NULL,                 /* cntrl */
-  string_pNd,           /* digit */
-  NULL,                 /* graph */
-  NULL,                 /* print */
-  NULL,                 /* punct */
-  string_pXps,          /* space */   /* Xps is POSIX space, but from 8.34 */
-  string_pXwd,          /* word  */   /* Perl and POSIX space are the same */
-  NULL,                 /* xdigit */
-  /* Negated cases */
-  string_PL,            /* ^alpha */
-  string_PLl,           /* ^lower */
-  string_PLu,           /* ^upper */
-  string_PXan,          /* ^alnum */
-  NULL,                 /* ^ascii */
-  string_H,             /* ^blank */
-  NULL,                 /* ^cntrl */
-  string_PNd,           /* ^digit */
-  NULL,                 /* ^graph */
-  NULL,                 /* ^print */
-  NULL,                 /* ^punct */
-  string_PXps,          /* ^space */  /* Xps is POSIX space, but from 8.34 */
-  string_PXwd,          /* ^word */   /* Perl and POSIX space are the same */
-  NULL                  /* ^xdigit */
-};
-#define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
-#endif
-
-#define STRING(a)  # a
-#define XSTRING(s) STRING(s)
-
-/* The texts of compile-time error messages. These are "char *" because they
-are passed to the outside world. Do not ever re-use any error number, because
-they are documented. Always add a new error instead. Messages marked DEAD below
-are no longer used. This used to be a table of strings, but in order to reduce
-the number of relocations needed when a shared library is loaded dynamically,
-it is now one long string. We cannot use a table of offsets, because the
-lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
-simply count through to the one we want - this isn't a performance issue
-because these strings are used only when there is a compilation error.
-
-Each substring ends with \0 to insert a null character. This includes the final
-substring, so that the whole string ends with \0\0, which can be detected when
-counting through. */
-
-static const char error_texts[] =
-  "no error\0"
-  "\\ at end of pattern\0"
-  "\\c at end of pattern\0"
-  "unrecognized character follows \\\0"
-  "numbers out of order in {} quantifier\0"
-  /* 5 */
-  "number too big in {} quantifier\0"
-  "missing terminating ] for character class\0"
-  "invalid escape sequence in character class\0"
-  "range out of order in character class\0"
-  "nothing to repeat\0"
-  /* 10 */
-  "internal error: invalid forward reference offset\0"
-  "internal error: unexpected repeat\0"
-  "unrecognized character after (? or (?-\0"
-  "POSIX named classes are supported only within a class\0"
-  "missing )\0"
-  /* 15 */
-  "reference to non-existent subpattern\0"
-  "erroffset passed as NULL\0"
-  "unknown option bit(s) set\0"
-  "missing ) after comment\0"
-  "parentheses nested too deeply\0"  /** DEAD **/
-  /* 20 */
-  "regular expression is too large\0"
-  "failed to get memory\0"
-  "unmatched parentheses\0"
-  "internal error: code overflow\0"
-  "unrecognized character after (?<\0"
-  /* 25 */
-  "lookbehind assertion is not fixed length\0"
-  "malformed number or name after (?(\0"
-  "conditional group contains more than two branches\0"
-  "assertion expected after (?(\0"
-  "(?R or (?[+-]digits must be followed by )\0"
-  /* 30 */
-  "unknown POSIX class name\0"
-  "POSIX collating elements are not supported\0"
-  "this version of PCRE is compiled without UTF support\0"
-  "spare error\0"  /** DEAD **/
-  "character value in \\x{} or \\o{} is too large\0"
-  /* 35 */
-  "invalid condition (?(0)\0"
-  "\\C not allowed in lookbehind assertion\0"
-  "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
-  "number after (?C is > 255\0"
-  "closing ) for (?C expected\0"
-  /* 40 */
-  "recursive call could loop indefinitely\0"
-  "unrecognized character after (?P\0"
-  "syntax error in subpattern name (missing terminator)\0"
-  "two named subpatterns have the same name\0"
-  "invalid UTF-8 string\0"
-  /* 45 */
-  "support for \\P, \\p, and \\X has not been compiled\0"
-  "malformed \\P or \\p sequence\0"
-  "unknown property name after \\P or \\p\0"
-  "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
-  "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
-  /* 50 */
-  "repeated subpattern is too long\0"    /** DEAD **/
-  "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
-  "internal error: overran compiling workspace\0"
-  "internal error: previously-checked referenced subpattern not found\0"
-  "DEFINE group contains more than one branch\0"
-  /* 55 */
-  "repeating a DEFINE group is not allowed\0"  /** DEAD **/
-  "inconsistent NEWLINE options\0"
-  "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
-  "a numbered reference must not be zero\0"
-  "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
-  /* 60 */
-  "(*VERB) not recognized or malformed\0"
-  "number is too big\0"
-  "subpattern name expected\0"
-  "digit expected after (?+\0"
-  "] is an invalid data character in JavaScript compatibility mode\0"
-  /* 65 */
-  "different names for subpatterns of the same number are not allowed\0"
-  "(*MARK) must have an argument\0"
-  "this version of PCRE is not compiled with Unicode property support\0"
-#ifndef EBCDIC
-  "\\c must be followed by an ASCII character\0"
-#else
-  "\\c must be followed by a letter or one of [\\]^_?\0"
-#endif
-  "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
-  /* 70 */
-  "internal error: unknown opcode in find_fixedlength()\0"
-  "\\N is not supported in a class\0"
-  "too many forward references\0"
-  "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
-  "invalid UTF-16 string\0"
-  /* 75 */
-  "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
-  "character value in \\u.... sequence is too large\0"
-  "invalid UTF-32 string\0"
-  "setting UTF is disabled by the application\0"
-  "non-hex character in \\x{} (closing brace missing?)\0"
-  /* 80 */
-  "non-octal character in \\o{} (closing brace missing?)\0"
-  "missing opening brace after \\o\0"
-  "parentheses are too deeply nested\0"
-  "invalid range in character class\0"
-  "group name must start with a non-digit\0"
-  /* 85 */
-  "parentheses are too deeply nested (stack check)\0"
-  "digits missing in \\x{} or \\o{}\0"
-  ;
-
-/* Table to identify digits and hex digits. This is used when compiling
-patterns. Note that the tables in chartables are dependent on the locale, and
-may mark arbitrary characters as digits - but the PCRE compiling code expects
-to handle only 0-9, a-z, and A-Z as digits when compiling. That is why we have
-a private table here. It costs 256 bytes, but it is a lot faster than doing
-character value tests (at least in some simple cases I timed), and in some
-applications one wants PCRE to compile efficiently as well as match
-efficiently.
-
-For convenience, we use the same bit definitions as in chartables:
-
-  0x04   decimal digit
-  0x08   hexadecimal digit
-
-Then we can use ctype_digit and ctype_xdigit in the code. */
-
-/* Using a simple comparison for decimal numbers rather than a memory read
-is much faster, and the resulting code is simpler (the compiler turns it
-into a subtraction and unsigned comparison). */
-
-#define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
-
-#ifndef EBCDIC
-
-/* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
-UTF-8 mode. */
-
-static const pcre_uint8 digitab[] =
-  {
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - '  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ( - /  */
-  0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  */
-  0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00, /*  8 - ?  */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  @ - G  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  H - O  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  P - W  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  X - _  */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  ` - g  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  h - o  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  p - w  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  x -127 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
-
-#else
-
-/* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
-
-static const pcre_uint8 digitab[] =
-  {
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 10 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  32- 39 20 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  40- 47    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  48- 55 30 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  56- 63    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- 95    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 120- "     */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /* 128- g  80 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  h -143    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144- p  90 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  q -159    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160- x  A0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  y -175    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ^ -183 B0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191    */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  { - G  C0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  H -207    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  } - P  D0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  Q -223    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  \ - X  E0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  Y -239    */
-  0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
-  0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
-
-static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
-  0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
-  0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
-  0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  32- 39 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  40- 47 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  48- 55 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  56- 63 */
-  0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */
-  0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */
-  0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- 95 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */
-  0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 120- "  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* 128- g  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  h -143 */
-  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* 144- p  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  q -159 */
-  0x00,0x00,0x12,0x12,0x12,0x12,0x12,0x12, /* 160- x  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  y -175 */
-  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ^ -183 */
-  0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
-  0x80,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  { - G  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  H -207 */
-  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  } - P  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  Q -223 */
-  0x00,0x00,0x12,0x12,0x12,0x12,0x12,0x12, /*  \ - X  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  Y -239 */
-  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
-  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255 */
-#endif
-
-
-/* This table is used to check whether auto-possessification is possible
-between adjacent character-type opcodes. The left-hand (repeated) opcode is
-used to select the row, and the right-hand opcode is use to select the column.
-A value of 1 means that auto-possessification is OK. For example, the second
-value in the first row means that \D+\d can be turned into \D++\d.
-
-The Unicode property types (\P and \p) have to be present to fill out the table
-because of what their opcode values are, but the table values should always be
-zero because property types are handled separately in the code. The last four
-columns apply to items that cannot be repeated, so there is no need to have
-rows for them. Note that OP_DIGIT etc. are generated only when PCRE_UCP is
-*not* set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
-
-#define APTROWS (LAST_AUTOTAB_LEFT_OP - FIRST_AUTOTAB_OP + 1)
-#define APTCOLS (LAST_AUTOTAB_RIGHT_OP - FIRST_AUTOTAB_OP + 1)
-
-static const pcre_uint8 autoposstab[APTROWS][APTCOLS] = {
-/* \D \d \S \s \W \w  . .+ \C \P \p \R \H \h \V \v \X \Z \z  $ $M */
-  { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \D */
-  { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \d */
-  { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \S */
-  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \s */
-  { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \W */
-  { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \w */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .  */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .+ */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \C */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \P */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \p */
-  { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \R */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \H */
-  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \h */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \V */
-  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0 },  /* \v */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }   /* \X */
-};
-
-
-/* This table is used to check whether auto-possessification is possible
-between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP). The
-left-hand (repeated) opcode is used to select the row, and the right-hand
-opcode is used to select the column. The values are as follows:
-
-  0   Always return FALSE (never auto-possessify)
-  1   Character groups are distinct (possessify if both are OP_PROP)
-  2   Check character categories in the same group (general or particular)
-  3   TRUE if the two opcodes are not the same (PROP vs NOTPROP)
-
-  4   Check left general category vs right particular category
-  5   Check right general category vs left particular category
-
-  6   Left alphanum vs right general category
-  7   Left space vs right general category
-  8   Left word vs right general category
-
-  9   Right alphanum vs left general category
- 10   Right space vs left general category
- 11   Right word vs left general category
-
- 12   Left alphanum vs right particular category
- 13   Left space vs right particular category
- 14   Left word vs right particular category
-
- 15   Right alphanum vs left particular category
- 16   Right space vs left particular category
- 17   Right word vs left particular category
-*/
-
-static const pcre_uint8 propposstab[PT_TABSIZE][PT_TABSIZE] = {
-/* ANY LAMP GC  PC  SC ALNUM SPACE PXSPACE WORD CLIST UCNC */
-  { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_ANY */
-  { 0,  3,  0,  0,  0,    3,    1,      1,   0,    0,   0 },  /* PT_LAMP */
-  { 0,  0,  2,  4,  0,    9,   10,     10,  11,    0,   0 },  /* PT_GC */
-  { 0,  0,  5,  2,  0,   15,   16,     16,  17,    0,   0 },  /* PT_PC */
-  { 0,  0,  0,  0,  2,    0,    0,      0,   0,    0,   0 },  /* PT_SC */
-  { 0,  3,  6, 12,  0,    3,    1,      1,   0,    0,   0 },  /* PT_ALNUM */
-  { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_SPACE */
-  { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_PXSPACE */
-  { 0,  0,  8, 14,  0,    0,    1,      1,   3,    0,   0 },  /* PT_WORD */
-  { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_CLIST */
-  { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   3 }   /* PT_UCNC */
-};
-
-/* This table is used to check whether auto-possessification is possible
-between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP) when one
-specifies a general category and the other specifies a particular category. The
-row is selected by the general category and the column by the particular
-category. The value is 1 if the particular category is not part of the general
-category. */
-
-static const pcre_uint8 catposstab[7][30] = {
-/* Cc Cf Cn Co Cs Ll Lm Lo Lt Lu Mc Me Mn Nd Nl No Pc Pd Pe Pf Pi Po Ps Sc Sk Sm So Zl Zp Zs */
-  { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* C */
-  { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* L */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* M */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* N */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 },  /* P */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 },  /* S */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 }   /* Z */
-};
-
-/* This table is used when checking ALNUM, (PX)SPACE, SPACE, and WORD against
-a general or particular category. The properties in each row are those
-that apply to the character set in question. Duplication means that a little
-unnecessary work is done when checking, but this keeps things much simpler
-because they can all use the same code. For more details see the comment where
-this table is used.
-
-Note: SPACE and PXSPACE used to be different because Perl excluded VT from
-"space", but from Perl 5.18 it's included, so both categories are treated the
-same here. */
-
-static const pcre_uint8 posspropstab[3][4] = {
-  { ucp_L, ucp_N, ucp_N, ucp_Nl },  /* ALNUM, 3rd and 4th values redundant */
-  { ucp_Z, ucp_Z, ucp_C, ucp_Cc },  /* SPACE and PXSPACE, 2nd value redundant */
-  { ucp_L, ucp_N, ucp_P, ucp_Po }   /* WORD */
-};
-
-/* This table is used when converting repeating opcodes into possessified
-versions as a result of an explicit possessive quantifier such as ++. A zero
-value means there is no possessified version - in those cases the item in
-question must be wrapped in ONCE brackets. The table is truncated at OP_CALLOUT
-because all relevant opcodes are less than that. */
-
-static const pcre_uint8 opcode_possessify[] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0 - 15  */
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 16 - 31 */
-
-  0,                       /* NOTI */
-  OP_POSSTAR, 0,           /* STAR, MINSTAR */
-  OP_POSPLUS, 0,           /* PLUS, MINPLUS */
-  OP_POSQUERY, 0,          /* QUERY, MINQUERY */
-  OP_POSUPTO, 0,           /* UPTO, MINUPTO */
-  0,                       /* EXACT */
-  0, 0, 0, 0,              /* POS{STAR,PLUS,QUERY,UPTO} */
-
-  OP_POSSTARI, 0,          /* STARI, MINSTARI */
-  OP_POSPLUSI, 0,          /* PLUSI, MINPLUSI */
-  OP_POSQUERYI, 0,         /* QUERYI, MINQUERYI */
-  OP_POSUPTOI, 0,          /* UPTOI, MINUPTOI */
-  0,                       /* EXACTI */
-  0, 0, 0, 0,              /* POS{STARI,PLUSI,QUERYI,UPTOI} */
-
-  OP_NOTPOSSTAR, 0,        /* NOTSTAR, NOTMINSTAR */
-  OP_NOTPOSPLUS, 0,        /* NOTPLUS, NOTMINPLUS */
-  OP_NOTPOSQUERY, 0,       /* NOTQUERY, NOTMINQUERY */
-  OP_NOTPOSUPTO, 0,        /* NOTUPTO, NOTMINUPTO */
-  0,                       /* NOTEXACT */
-  0, 0, 0, 0,              /* NOTPOS{STAR,PLUS,QUERY,UPTO} */
-
-  OP_NOTPOSSTARI, 0,       /* NOTSTARI, NOTMINSTARI */
-  OP_NOTPOSPLUSI, 0,       /* NOTPLUSI, NOTMINPLUSI */
-  OP_NOTPOSQUERYI, 0,      /* NOTQUERYI, NOTMINQUERYI */
-  OP_NOTPOSUPTOI, 0,       /* NOTUPTOI, NOTMINUPTOI */
-  0,                       /* NOTEXACTI */
-  0, 0, 0, 0,              /* NOTPOS{STARI,PLUSI,QUERYI,UPTOI} */
-
-  OP_TYPEPOSSTAR, 0,       /* TYPESTAR, TYPEMINSTAR */
-  OP_TYPEPOSPLUS, 0,       /* TYPEPLUS, TYPEMINPLUS */
-  OP_TYPEPOSQUERY, 0,      /* TYPEQUERY, TYPEMINQUERY */
-  OP_TYPEPOSUPTO, 0,       /* TYPEUPTO, TYPEMINUPTO */
-  0,                       /* TYPEEXACT */
-  0, 0, 0, 0,              /* TYPEPOS{STAR,PLUS,QUERY,UPTO} */
-
-  OP_CRPOSSTAR, 0,         /* CRSTAR, CRMINSTAR */
-  OP_CRPOSPLUS, 0,         /* CRPLUS, CRMINPLUS */
-  OP_CRPOSQUERY, 0,        /* CRQUERY, CRMINQUERY */
-  OP_CRPOSRANGE, 0,        /* CRRANGE, CRMINRANGE */
-  0, 0, 0, 0,              /* CRPOS{STAR,PLUS,QUERY,RANGE} */
-
-  0, 0, 0,                 /* CLASS, NCLASS, XCLASS */
-  0, 0,                    /* REF, REFI */
-  0, 0,                    /* DNREF, DNREFI */
-  0, 0                     /* RECURSE, CALLOUT */
-};
-
-
-
-/*************************************************
-*            Find an error text                  *
-*************************************************/
-
-/* The error texts are now all in one long string, to save on relocations. As
-some of the text is of unknown length, we can't use a table of offsets.
-Instead, just count through the strings. This is not a performance issue
-because it happens only when there has been a compilation error.
-
-Argument:   the error number
-Returns:    pointer to the error string
-*/
-
-static const char *
-find_error_text(int n)
-{
-const char *s = error_texts;
-for (; n > 0; n--)
-  {
-  while (*s++ != CHAR_NULL) {};
-  if (*s == CHAR_NULL) return "Error text not found (please report)";
-  }
-return s;
-}
-
-
-
-/*************************************************
-*           Expand the workspace                 *
-*************************************************/
-
-/* This function is called during the second compiling phase, if the number of
-forward references fills the existing workspace, which is originally a block on
-the stack. A larger block is obtained from malloc() unless the ultimate limit
-has been reached or the increase will be rather small.
-
-Argument: pointer to the compile data block
-Returns:  0 if all went well, else an error number
-*/
-
-static int
-expand_workspace(compile_data *cd)
-{
-pcre_uchar *newspace;
-int newsize = cd->workspace_size * 2;
-
-if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
-if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
-    newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
- return ERR72;
-
-newspace = (PUBL(malloc))(IN_UCHARS(newsize));
-if (newspace == NULL) return ERR21;
-memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
-cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
-if (cd->workspace_size > COMPILE_WORK_SIZE)
-  (PUBL(free))((void *)cd->start_workspace);
-cd->start_workspace = newspace;
-cd->workspace_size = newsize;
-return 0;
-}
-
-
-
-/*************************************************
-*            Check for counted repeat            *
-*************************************************/
-
-/* This function is called when a '{' is encountered in a place where it might
-start a quantifier. It looks ahead to see if it really is a quantifier or not.
-It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
-where the ddds are digits.
-
-Arguments:
-  p         pointer to the first char after '{'
-
-Returns:    TRUE or FALSE
-*/
-
-static BOOL
-is_counted_repeat(const pcre_uchar *p)
-{
-if (!IS_DIGIT(*p)) return FALSE;
-p++;
-while (IS_DIGIT(*p)) p++;
-if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
-
-if (*p++ != CHAR_COMMA) return FALSE;
-if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
-
-if (!IS_DIGIT(*p)) return FALSE;
-p++;
-while (IS_DIGIT(*p)) p++;
-
-return (*p == CHAR_RIGHT_CURLY_BRACKET);
-}
-
-
-
-/*************************************************
-*            Handle escapes                      *
-*************************************************/
-
-/* This function is called when a \ has been encountered. It either returns a
-positive value for a simple escape such as \n, or 0 for a data character which
-will be placed in chptr. A backreference to group n is returned as negative n.
-When UTF-8 is enabled, a positive value greater than 255 may be returned in
-chptr. On entry, ptr is pointing at the \. On exit, it is on the final
-character of the escape sequence.
-
-Arguments:
-  ptrptr         points to the pattern position pointer
-  chptr          points to a returned data character
-  errorcodeptr   points to the errorcode variable
-  bracount       number of previous extracting brackets
-  options        the options bits
-  isclass        TRUE if inside a character class
-
-Returns:         zero => a data character
-                 positive => a special escape sequence
-                 negative => a back reference
-                 on error, errorcodeptr is set
-*/
-
-static int
-check_escape(const pcre_uchar **ptrptr, pcre_uint32 *chptr, int *errorcodeptr,
-  int bracount, int options, BOOL isclass)
-{
-/* PCRE_UTF16 has the same value as PCRE_UTF8. */
-BOOL utf = (options & PCRE_UTF8) != 0;
-const pcre_uchar *ptr = *ptrptr + 1;
-pcre_uint32 c;
-int escape = 0;
-int i;
-
-GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
-ptr--;                            /* Set pointer back to the last byte */
-
-/* If backslash is at the end of the pattern, it's an error. */
-
-if (c == CHAR_NULL) *errorcodeptr = ERR1;
-
-/* Non-alphanumerics are literals. For digits or letters, do an initial lookup
-in a table. A non-zero result is something that can be returned immediately.
-Otherwise further processing may be required. */
-
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-/* Not alphanumeric */
-else if (c < CHAR_0 || c > CHAR_z) {}
-else if ((i = escapes[c - CHAR_0]) != 0)
-  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
-
-#else           /* EBCDIC coding */
-/* Not alphanumeric */
-else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
-else if ((i = escapes[c - 0x48]) != 0)  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
-#endif
-
-/* Escapes that need further processing, or are illegal. */
-
-else
-  {
-  const pcre_uchar *oldptr;
-  BOOL braced, negated, overflow;
-  int s;
-
-  switch (c)
-    {
-    /* A number of Perl escapes are not handled by PCRE. We give an explicit
-    error. */
-
-    case CHAR_l:
-    case CHAR_L:
-    *errorcodeptr = ERR37;
-    break;
-
-    case CHAR_u:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      /* In JavaScript, \u must be followed by four hexadecimal numbers.
-      Otherwise it is a lowercase u letter. */
-      if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
-        && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
-        && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
-        && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
-        {
-        c = 0;
-        for (i = 0; i < 4; ++i)
-          {
-          register pcre_uint32 cc = *(++ptr);
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-          }
-
-#if defined COMPILE_PCRE8
-        if (c > (utf ? 0x10ffffU : 0xffU))
-#elif defined COMPILE_PCRE16
-        if (c > (utf ? 0x10ffffU : 0xffffU))
-#elif defined COMPILE_PCRE32
-        if (utf && c > 0x10ffffU)
-#endif
-          {
-          *errorcodeptr = ERR76;
-          }
-        else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
-        }
-      }
-    else
-      *errorcodeptr = ERR37;
-    break;
-
-    case CHAR_U:
-    /* In JavaScript, \U is an uppercase U letter. */
-    if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
-    break;
-
-    /* In a character class, \g is just a literal "g". Outside a character
-    class, \g must be followed by one of a number of specific things:
-
-    (1) A number, either plain or braced. If positive, it is an absolute
-    backreference. If negative, it is a relative backreference. This is a Perl
-    5.10 feature.
-
-    (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
-    is part of Perl's movement towards a unified syntax for back references. As
-    this is synonymous with \k{name}, we fudge it up by pretending it really
-    was \k.
-
-    (3) For Oniguruma compatibility we also support \g followed by a name or a
-    number either in angle brackets or in single quotes. However, these are
-    (possibly recursive) subroutine calls, _not_ backreferences. Just return
-    the ESC_g code (cf \k). */
-
-    case CHAR_g:
-    if (isclass) break;
-    if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
-      {
-      escape = ESC_g;
-      break;
-      }
-
-    /* Handle the Perl-compatible cases */
-
-    if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
-      {
-      const pcre_uchar *p;
-      for (p = ptr+2; *p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
-        if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
-      if (*p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET)
-        {
-        escape = ESC_k;
-        break;
-        }
-      braced = TRUE;
-      ptr++;
-      }
-    else braced = FALSE;
-
-    if (ptr[1] == CHAR_MINUS)
-      {
-      negated = TRUE;
-      ptr++;
-      }
-    else negated = FALSE;
-
-    /* The integer range is limited by the machine's int representation. */
-    s = 0;
-    overflow = FALSE;
-    while (IS_DIGIT(ptr[1]))
-      {
-      if (s > INT_MAX / 10 - 1) /* Integer overflow */
-        {
-        overflow = TRUE;
-        break;
-        }
-      s = s * 10 + (int)(*(++ptr) - CHAR_0);
-      }
-    if (overflow) /* Integer overflow */
-      {
-      while (IS_DIGIT(ptr[1]))
-        ptr++;
-      *errorcodeptr = ERR61;
-      break;
-      }
-
-    if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
-      {
-      *errorcodeptr = ERR57;
-      break;
-      }
-
-    if (s == 0)
-      {
-      *errorcodeptr = ERR58;
-      break;
-      }
-
-    if (negated)
-      {
-      if (s > bracount)
-        {
-        *errorcodeptr = ERR15;
-        break;
-        }
-      s = bracount - (s - 1);
-      }
-
-    escape = -s;
-    break;
-
-    /* The handling of escape sequences consisting of a string of digits
-    starting with one that is not zero is not straightforward. Perl has changed
-    over the years. Nowadays \g{} for backreferences and \o{} for octal are
-    recommended to avoid the ambiguities in the old syntax.
-
-    Outside a character class, the digits are read as a decimal number. If the
-    number is less than 8 (used to be 10), or if there are that many previous
-    extracting left brackets, then it is a back reference. Otherwise, up to
-    three octal digits are read to form an escaped byte. Thus \123 is likely to
-    be octal 123 (cf \0123, which is octal 012 followed by the literal 3). If
-    the octal value is greater than 377, the least significant 8 bits are
-    taken. \8 and \9 are treated as the literal characters 8 and 9.
-
-    Inside a character class, \ followed by a digit is always either a literal
-    8 or 9 or an octal number. */
-
-    case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
-    case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
-
-    if (!isclass)
-      {
-      oldptr = ptr;
-      /* The integer range is limited by the machine's int representation. */
-      s = (int)(c -CHAR_0);
-      overflow = FALSE;
-      while (IS_DIGIT(ptr[1]))
-        {
-        if (s > INT_MAX / 10 - 1) /* Integer overflow */
-          {
-          overflow = TRUE;
-          break;
-          }
-        s = s * 10 + (int)(*(++ptr) - CHAR_0);
-        }
-      if (overflow) /* Integer overflow */
-        {
-        while (IS_DIGIT(ptr[1]))
-          ptr++;
-        *errorcodeptr = ERR61;
-        break;
-        }
-      if (s < 8 || s <= bracount)  /* Check for back reference */
-        {
-        escape = -s;
-        break;
-        }
-      ptr = oldptr;      /* Put the pointer back and fall through */
-      }
-
-    /* Handle a digit following \ when the number is not a back reference. If
-    the first digit is 8 or 9, Perl used to generate a binary zero byte and
-    then treat the digit as a following literal. At least by Perl 5.18 this
-    changed so as not to insert the binary zero. */
-
-    if ((c = *ptr) >= CHAR_8) break;
-
-    /* Fall through with a digit less than 8 */
-
-    /* \0 always starts an octal number, but we may drop through to here with a
-    larger first octal digit. The original code used just to take the least
-    significant 8 bits of octal numbers (I think this is what early Perls used
-    to do). Nowadays we allow for larger numbers in UTF-8 mode and 16-bit mode,
-    but no more than 3 octal digits. */
-
-    case CHAR_0:
-    c -= CHAR_0;
-    while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
-        c = c * 8 + *(++ptr) - CHAR_0;
-#ifdef COMPILE_PCRE8
-    if (!utf && c > 0xff) *errorcodeptr = ERR51;
-#endif
-    break;
-
-    /* \o is a relatively new Perl feature, supporting a more general way of
-    specifying character codes in octal. The only supported form is \o{ddd}. */
-
-    case CHAR_o:
-    if (ptr[1] != CHAR_LEFT_CURLY_BRACKET) *errorcodeptr = ERR81; else
-    if (ptr[2] == CHAR_RIGHT_CURLY_BRACKET) *errorcodeptr = ERR86; else
-      {
-      ptr += 2;
-      c = 0;
-      overflow = FALSE;
-      while (*ptr >= CHAR_0 && *ptr <= CHAR_7)
-        {
-        register pcre_uint32 cc = *ptr++;
-        if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
-#ifdef COMPILE_PCRE32
-        if (c >= 0x20000000l) { overflow = TRUE; break; }
-#endif
-        c = (c << 3) + cc - CHAR_0 ;
-#if defined COMPILE_PCRE8
-        if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE16
-        if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE32
-        if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
-#endif
-        }
-      if (overflow)
-        {
-        while (*ptr >= CHAR_0 && *ptr <= CHAR_7) ptr++;
-        *errorcodeptr = ERR34;
-        }
-      else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
-        {
-        if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
-        }
-      else *errorcodeptr = ERR80;
-      }
-    break;
-
-    /* \x is complicated. In JavaScript, \x must be followed by two hexadecimal
-    numbers. Otherwise it is a lowercase x letter. */
-
-    case CHAR_x:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
-        && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
-        {
-        c = 0;
-        for (i = 0; i < 2; ++i)
-          {
-          register pcre_uint32 cc = *(++ptr);
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-          }
-        }
-      }    /* End JavaScript handling */
-
-    /* Handle \x in Perl's style. \x{ddd} is a character number which can be
-    greater than 0xff in utf or non-8bit mode, but only if the ddd are hex
-    digits. If not, { used to be treated as a data character. However, Perl
-    seems to read hex digits up to the first non-such, and ignore the rest, so
-    that, for example \x{zz} matches a binary zero. This seems crazy, so PCRE
-    now gives an error. */
-
-    else
-      {
-      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
-        {
-        ptr += 2;
-        if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
-          {
-          *errorcodeptr = ERR86;
-          break;
-          }
-        c = 0;
-        overflow = FALSE;
-        while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0)
-          {
-          register pcre_uint32 cc = *ptr++;
-          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
-
-#ifdef COMPILE_PCRE32
-          if (c >= 0x10000000l) { overflow = TRUE; break; }
-#endif
-
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-
-#if defined COMPILE_PCRE8
-          if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE16
-          if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE32
-          if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
-#endif
-          }
-
-        if (overflow)
-          {
-          while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0) ptr++;
-          *errorcodeptr = ERR34;
-          }
-
-        else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
-          {
-          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
-          }
-
-        /* If the sequence of hex digits does not end with '}', give an error.
-        We used just to recognize this construct and fall through to the normal
-        \x handling, but nowadays Perl gives an error, which seems much more
-        sensible, so we do too. */
-
-        else *errorcodeptr = ERR79;
-        }   /* End of \x{} processing */
-
-      /* Read a single-byte hex-defined char (up to two hex digits after \x) */
-
-      else
-        {
-        c = 0;
-        while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
-          {
-          pcre_uint32 cc;                          /* Some compilers don't like */
-          cc = *(++ptr);                           /* ++ in initializers */
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
-          c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
-          c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-          }
-        }     /* End of \xdd handling */
-      }       /* End of Perl-style \x handling */
-    break;
-
-    /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
-    An error is given if the byte following \c is not an ASCII character. This
-    coding is ASCII-specific, but then the whole concept of \cx is
-    ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
-
-    case CHAR_c:
-    c = *(++ptr);
-    if (c == CHAR_NULL)
-      {
-      *errorcodeptr = ERR2;
-      break;
-      }
-#ifndef EBCDIC    /* ASCII/UTF-8 coding */
-    if (c > 127)  /* Excludes all non-ASCII in either mode */
-      {
-      *errorcodeptr = ERR68;
-      break;
-      }
-    if (c >= CHAR_a && c <= CHAR_z) c -= 32;
-    c ^= 0x40;
-#else             /* EBCDIC coding */
-    if (c >= CHAR_a && c <= CHAR_z) c += 64;
-    if (c == CHAR_QUESTION_MARK)
-      c = ('\\' == 188 && '`' == 74)? 0x5f : 0xff;
-    else
-      {
-      for (i = 0; i < 32; i++)
-        {
-        if (c == ebcdic_escape_c[i]) break;
-        }
-      if (i < 32) c = i; else *errorcodeptr = ERR68;
-      }
-#endif
-    break;
-
-    /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
-    other alphanumeric following \ is an error if PCRE_EXTRA was set;
-    otherwise, for Perl compatibility, it is a literal. This code looks a bit
-    odd, but there used to be some cases other than the default, and there may
-    be again in future, so I haven't "optimized" it. */
-
-    default:
-    if ((options & PCRE_EXTRA) != 0) switch(c)
-      {
-      default:
-      *errorcodeptr = ERR3;
-      break;
-      }
-    break;
-    }
-  }
-
-/* Perl supports \N{name} for character names, as well as plain \N for "not
-newline". PCRE does not support \N{name}. However, it does support
-quantification such as \N{2,3}. */
-
-if (escape == ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
-     !is_counted_repeat(ptr+2))
-  *errorcodeptr = ERR37;
-
-/* If PCRE_UCP is set, we change the values for \d etc. */
-
-if ((options & PCRE_UCP) != 0 && escape >= ESC_D && escape <= ESC_w)
-  escape += (ESC_DU - ESC_D);
-
-/* Set the pointer to the final character before returning. */
-
-*ptrptr = ptr;
-*chptr = c;
-return escape;
-}
-
-
-
-#ifdef SUPPORT_UCP
-/*************************************************
-*               Handle \P and \p                 *
-*************************************************/
-
-/* This function is called after \P or \p has been encountered, provided that
-PCRE is compiled with support for Unicode properties. On entry, ptrptr is
-pointing at the P or p. On exit, it is pointing at the final character of the
-escape sequence.
-
-Argument:
-  ptrptr         points to the pattern position pointer
-  negptr         points to a boolean that is set TRUE for negation else FALSE
-  ptypeptr       points to an unsigned int that is set to the type value
-  pdataptr       points to an unsigned int that is set to the detailed property value
-  errorcodeptr   points to the error code variable
-
-Returns:         TRUE if the type value was found, or FALSE for an invalid type
-*/
-
-static BOOL
-get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, unsigned int *ptypeptr,
-  unsigned int *pdataptr, int *errorcodeptr)
-{
-pcre_uchar c;
-int i, bot, top;
-const pcre_uchar *ptr = *ptrptr;
-pcre_uchar name[32];
-
-c = *(++ptr);
-if (c == CHAR_NULL) goto ERROR_RETURN;
-
-*negptr = FALSE;
-
-/* \P or \p can be followed by a name in {}, optionally preceded by ^ for
-negation. */
-
-if (c == CHAR_LEFT_CURLY_BRACKET)
-  {
-  if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
-    {
-    *negptr = TRUE;
-    ptr++;
-    }
-  for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
-    {
-    c = *(++ptr);
-    if (c == CHAR_NULL) goto ERROR_RETURN;
-    if (c == CHAR_RIGHT_CURLY_BRACKET) break;
-    name[i] = c;
-    }
-  if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
-  name[i] = 0;
-  }
-
-/* Otherwise there is just one following character */
-
-else
-  {
-  name[0] = c;
-  name[1] = 0;
-  }
-
-*ptrptr = ptr;
-
-/* Search for a recognized property name using binary chop */
-
-bot = 0;
-top = PRIV(utt_size);
-
-while (bot < top)
-  {
-  int r;
-  i = (bot + top) >> 1;
-  r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
-  if (r == 0)
-    {
-    *ptypeptr = PRIV(utt)[i].type;
-    *pdataptr = PRIV(utt)[i].value;
-    return TRUE;
-    }
-  if (r > 0) bot = i + 1; else top = i;
-  }
-
-*errorcodeptr = ERR47;
-*ptrptr = ptr;
-return FALSE;
-
-ERROR_RETURN:
-*errorcodeptr = ERR46;
-*ptrptr = ptr;
-return FALSE;
-}
-#endif
-
-
-
-/*************************************************
-*         Read repeat counts                     *
-*************************************************/
-
-/* Read an item of the form {n,m} and return the values. This is called only
-after is_counted_repeat() has confirmed that a repeat-count quantifier exists,
-so the syntax is guaranteed to be correct, but we need to check the values.
-
-Arguments:
-  p              pointer to first char after '{'
-  minp           pointer to int for min
-  maxp           pointer to int for max
-                 returned as -1 if no max
-  errorcodeptr   points to error code variable
-
-Returns:         pointer to '}' on success;
-                 current ptr on error, with errorcodeptr set non-zero
-*/
-
-static const pcre_uchar *
-read_repeat_counts(const pcre_uchar *p, int *minp, int *maxp, int *errorcodeptr)
-{
-int min = 0;
-int max = -1;
-
-while (IS_DIGIT(*p))
-  {
-  min = min * 10 + (int)(*p++ - CHAR_0);
-  if (min > 65535)
-    {
-    *errorcodeptr = ERR5;
-    return p;
-    }
-  }
-
-if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
-  {
-  if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
-    {
-    max = 0;
-    while(IS_DIGIT(*p))
-      {
-      max = max * 10 + (int)(*p++ - CHAR_0);
-      if (max > 65535)
-        {
-        *errorcodeptr = ERR5;
-        return p;
-        }
-      }
-    if (max < min)
-      {
-      *errorcodeptr = ERR4;
-      return p;
-      }
-    }
-  }
-
-*minp = min;
-*maxp = max;
-return p;
-}
-
-
-
-/*************************************************
-*      Find first significant op code            *
-*************************************************/
-
-/* This is called by several functions that scan a compiled expression looking
-for a fixed first character, or an anchoring op code etc. It skips over things
-that do not influence this. For some calls, it makes sense to skip negative
-forward and all backward assertions, and also the \b assertion; for others it
-does not.
-
-Arguments:
-  code         pointer to the start of the group
-  skipassert   TRUE if certain assertions are to be skipped
-
-Returns:       pointer to the first significant opcode
-*/
-
-static const pcre_uchar*
-first_significant_code(const pcre_uchar *code, BOOL skipassert)
-{
-for (;;)
-  {
-  switch ((int)*code)
-    {
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    if (!skipassert) return code;
-    do code += GET(code, 1); while (*code == OP_ALT);
-    code += PRIV(OP_lengths)[*code];
-    break;
-
-    case OP_WORD_BOUNDARY:
-    case OP_NOT_WORD_BOUNDARY:
-    if (!skipassert) return code;
-    /* Fall through */
-
-    case OP_CALLOUT:
-    case OP_CREF:
-    case OP_DNCREF:
-    case OP_RREF:
-    case OP_DNRREF:
-    case OP_DEF:
-    code += PRIV(OP_lengths)[*code];
-    break;
-
-    default:
-    return code;
-    }
-  }
-/* Control never reaches here */
-}
-
-
-
-/*************************************************
-*        Find the fixed length of a branch       *
-*************************************************/
-
-/* Scan a branch and compute the fixed length of subject that will match it,
-if the length is fixed. This is needed for dealing with backward assertions.
-In UTF8 mode, the result is in characters rather than bytes. The branch is
-temporarily terminated with OP_END when this function is called.
-
-This function is called when a backward assertion is encountered, so that if it
-fails, the error message can point to the correct place in the pattern.
-However, we cannot do this when the assertion contains subroutine calls,
-because they can be forward references. We solve this by remembering this case
-and doing the check at the end; a flag specifies which mode we are running in.
-
-Arguments:
-  code     points to the start of the pattern (the bracket)
-  utf      TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  atend    TRUE if called when the pattern is complete
-  cd       the "compile data" structure
-  recurses    chain of recurse_check to catch mutual recursion
-
-Returns:   the fixed length,
-             or -1 if there is no fixed length,
-             or -2 if \C was encountered (in UTF-8 mode only)
-             or -3 if an OP_RECURSE item was encountered and atend is FALSE
-             or -4 if an unknown opcode was encountered (internal error)
-*/
-
-static int
-find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd,
-  recurse_check *recurses)
-{
-int length = -1;
-recurse_check this_recurse;
-register int branchlength = 0;
-register pcre_uchar *cc = code + 1 + LINK_SIZE;
-
-/* Scan along the opcodes for this branch. If we get to the end of the
-branch, check the length against that of the other branches. */
-
-for (;;)
-  {
-  int d;
-  pcre_uchar *ce, *cs;
-  register pcre_uchar op = *cc;
-
-  switch (op)
-    {
-    /* We only need to continue for OP_CBRA (normal capturing bracket) and
-    OP_BRA (normal non-capturing bracket) because the other variants of these
-    opcodes are all concerned with unlimited repeated groups, which of course
-    are not of fixed length. */
-
-    case OP_CBRA:
-    case OP_BRA:
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_COND:
-    d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd,
-      recurses);
-    if (d < 0) return d;
-    branchlength += d;
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Reached end of a branch; if it's a ket it is the end of a nested call.
-    If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
-    an ALT. If it is END it's the end of the outer call. All can be handled by
-    the same code. Note that we must not include the OP_KETRxxx opcodes here,
-    because they all imply an unlimited repeat. */
-
-    case OP_ALT:
-    case OP_KET:
-    case OP_END:
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-    if (length < 0) length = branchlength;
-      else if (length != branchlength) return -1;
-    if (*cc != OP_ALT) return length;
-    cc += 1 + LINK_SIZE;
-    branchlength = 0;
-    break;
-
-    /* A true recursion implies not fixed length, but a subroutine call may
-    be OK. If the subroutine is a forward reference, we can't deal with
-    it until the end of the pattern, so return -3. */
-
-    case OP_RECURSE:
-    if (!atend) return -3;
-    cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
-    do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
-    if (cc > cs && cc < ce) return -1;                    /* Recursion */
-    else   /* Check for mutual recursion */
-      {
-      recurse_check *r = recurses;
-      for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-      if (r != NULL) return -1;   /* Mutual recursion */
-      }
-    this_recurse.prev = recurses;
-    this_recurse.group = cs;
-    d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd, &this_recurse);
-    if (d < 0) return d;
-    branchlength += d;
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Skip over assertive subpatterns */
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Skip over things that don't match chars */
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    cc += cc[1] + PRIV(OP_lengths)[*cc];
-    break;
-
-    case OP_CALLOUT:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_CLOSE:
-    case OP_COMMIT:
-    case OP_CREF:
-    case OP_DEF:
-    case OP_DNCREF:
-    case OP_DNRREF:
-    case OP_DOLL:
-    case OP_DOLLM:
-    case OP_EOD:
-    case OP_EODN:
-    case OP_FAIL:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_PRUNE:
-    case OP_REVERSE:
-    case OP_RREF:
-    case OP_SET_SOM:
-    case OP_SKIP:
-    case OP_SOD:
-    case OP_SOM:
-    case OP_THEN:
-    case OP_WORD_BOUNDARY:
-    cc += PRIV(OP_lengths)[*cc];
-    break;
-
-    /* Handle literal characters */
-
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    branchlength++;
-    cc += 2;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    /* Handle exact repetitions. The count is already in characters, but we
-    need to skip over a multibyte character in UTF8 mode.  */
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-    branchlength += (int)GET2(cc,1);
-    cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    case OP_TYPEEXACT:
-    branchlength += GET2(cc,1);
-    if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP)
-      cc += 2;
-    cc += 1 + IMM2_SIZE + 1;
-    break;
-
-    /* Handle single-char matchers */
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    cc += 2;
-    /* Fall through */
-
-    case OP_HSPACE:
-    case OP_VSPACE:
-    case OP_NOT_HSPACE:
-    case OP_NOT_VSPACE:
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-    branchlength++;
-    cc++;
-    break;
-
-    /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
-    otherwise \C is coded as OP_ALLANY. */
-
-    case OP_ANYBYTE:
-    return -2;
-
-    /* Check a class for variable quantification */
-
-    case OP_CLASS:
-    case OP_NCLASS:
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-    case OP_XCLASS:
-    /* The original code caused an unsigned overflow in 64 bit systems,
-    so now we use a conditional statement. */
-    if (op == OP_XCLASS)
-      cc += GET(cc, 1);
-    else
-      cc += PRIV(OP_lengths)[OP_CLASS];
-#else
-    cc += PRIV(OP_lengths)[OP_CLASS];
-#endif
-
-    switch (*cc)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSPLUS:
-      case OP_CRPOSQUERY:
-      return -1;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
-      branchlength += (int)GET2(cc,1);
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:
-      branchlength++;
-      }
-    break;
-
-    /* Anything else is variable length */
-
-    case OP_ANYNL:
-    case OP_BRAMINZERO:
-    case OP_BRAPOS:
-    case OP_BRAPOSZERO:
-    case OP_BRAZERO:
-    case OP_CBRAPOS:
-    case OP_EXTUNI:
-    case OP_KETRMAX:
-    case OP_KETRMIN:
-    case OP_KETRPOS:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_REF:
-    case OP_REFI:
-    case OP_DNREF:
-    case OP_DNREFI:
-    case OP_SBRA:
-    case OP_SBRAPOS:
-    case OP_SCBRA:
-    case OP_SCBRAPOS:
-    case OP_SCOND:
-    case OP_SKIPZERO:
-    case OP_STAR:
-    case OP_STARI:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEPLUS:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSUPTO:
-    case OP_TYPEQUERY:
-    case OP_TYPESTAR:
-    case OP_TYPEUPTO:
-    case OP_UPTO:
-    case OP_UPTOI:
-    return -1;
-
-    /* Catch unrecognized opcodes so that when new ones are added they
-    are not forgotten, as has happened in the past. */
-
-    default:
-    return -4;
-    }
-  }
-/* Control never gets here */
-}
-
-
-
-/*************************************************
-*    Scan compiled regex for specific bracket    *
-*************************************************/
-
-/* This little function scans through a compiled pattern until it finds a
-capturing bracket with the given number, or, if the number is negative, an
-instance of OP_REVERSE for a lookbehind. The function is global in the C sense
-so that it can be called from pcre_study() when finding the minimum matching
-length.
-
-Arguments:
-  code        points to start of expression
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  number      the required bracket number or negative to find a lookbehind
-
-Returns:      pointer to the opcode for the bracket, or NULL if not found
-*/
-
-const pcre_uchar *
-PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
-{
-for (;;)
-  {
-  register pcre_uchar c = *code;
-
-  if (c == OP_END) return NULL;
-
-  /* XCLASS is used for classes that cannot be represented just by a bit
-  map. This includes negated single high-valued characters. The length in
-  the table is zero; the actual length is stored in the compiled code. */
-
-  if (c == OP_XCLASS) code += GET(code, 1);
-
-  /* Handle recursion */
-
-  else if (c == OP_REVERSE)
-    {
-    if (number < 0) return (pcre_uchar *)code;
-    code += PRIV(OP_lengths)[c];
-    }
-
-  /* Handle capturing bracket */
-
-  else if (c == OP_CBRA || c == OP_SCBRA ||
-           c == OP_CBRAPOS || c == OP_SCBRAPOS)
-    {
-    int n = (int)GET2(code, 1+LINK_SIZE);
-    if (n == number) return (pcre_uchar *)code;
-    code += PRIV(OP_lengths)[c];
-    }
-
-  /* Otherwise, we can get the item's length from the table, except that for
-  repeated character types, we have to test for \p and \P, which have an extra
-  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
-  must add in its length. */
-
-  else
-    {
-    switch(c)
-      {
-      case OP_TYPESTAR:
-      case OP_TYPEMINSTAR:
-      case OP_TYPEPLUS:
-      case OP_TYPEMINPLUS:
-      case OP_TYPEQUERY:
-      case OP_TYPEMINQUERY:
-      case OP_TYPEPOSSTAR:
-      case OP_TYPEPOSPLUS:
-      case OP_TYPEPOSQUERY:
-      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-      break;
-
-      case OP_TYPEUPTO:
-      case OP_TYPEMINUPTO:
-      case OP_TYPEEXACT:
-      case OP_TYPEPOSUPTO:
-      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-        code += 2;
-      break;
-
-      case OP_MARK:
-      case OP_PRUNE_ARG:
-      case OP_SKIP_ARG:
-      case OP_THEN_ARG:
-      code += code[1];
-      break;
-      }
-
-    /* Add in the fixed length from the table */
-
-    code += PRIV(OP_lengths)[c];
-
-  /* In UTF-8 mode, opcodes that are followed by a character may be followed by
-  a multi-byte character. The length in the table is a minimum, so we have to
-  arrange to skip the extra bytes. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (utf) switch(c)
-      {
-      case OP_CHAR:
-      case OP_CHARI:
-      case OP_NOT:
-      case OP_NOTI:
-      case OP_EXACT:
-      case OP_EXACTI:
-      case OP_NOTEXACT:
-      case OP_NOTEXACTI:
-      case OP_UPTO:
-      case OP_UPTOI:
-      case OP_NOTUPTO:
-      case OP_NOTUPTOI:
-      case OP_MINUPTO:
-      case OP_MINUPTOI:
-      case OP_NOTMINUPTO:
-      case OP_NOTMINUPTOI:
-      case OP_POSUPTO:
-      case OP_POSUPTOI:
-      case OP_NOTPOSUPTO:
-      case OP_NOTPOSUPTOI:
-      case OP_STAR:
-      case OP_STARI:
-      case OP_NOTSTAR:
-      case OP_NOTSTARI:
-      case OP_MINSTAR:
-      case OP_MINSTARI:
-      case OP_NOTMINSTAR:
-      case OP_NOTMINSTARI:
-      case OP_POSSTAR:
-      case OP_POSSTARI:
-      case OP_NOTPOSSTAR:
-      case OP_NOTPOSSTARI:
-      case OP_PLUS:
-      case OP_PLUSI:
-      case OP_NOTPLUS:
-      case OP_NOTPLUSI:
-      case OP_MINPLUS:
-      case OP_MINPLUSI:
-      case OP_NOTMINPLUS:
-      case OP_NOTMINPLUSI:
-      case OP_POSPLUS:
-      case OP_POSPLUSI:
-      case OP_NOTPOSPLUS:
-      case OP_NOTPOSPLUSI:
-      case OP_QUERY:
-      case OP_QUERYI:
-      case OP_NOTQUERY:
-      case OP_NOTQUERYI:
-      case OP_MINQUERY:
-      case OP_MINQUERYI:
-      case OP_NOTMINQUERY:
-      case OP_NOTMINQUERYI:
-      case OP_POSQUERY:
-      case OP_POSQUERYI:
-      case OP_NOTPOSQUERY:
-      case OP_NOTPOSQUERYI:
-      if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
-      break;
-      }
-#else
-    (void)(utf);  /* Keep compiler happy by referencing function argument */
-#endif
-    }
-  }
-}
-
-
-
-/*************************************************
-*   Scan compiled regex for recursion reference  *
-*************************************************/
-
-/* This little function scans through a compiled pattern until it finds an
-instance of OP_RECURSE.
-
-Arguments:
-  code        points to start of expression
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-
-Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
-*/
-
-static const pcre_uchar *
-find_recurse(const pcre_uchar *code, BOOL utf)
-{
-for (;;)
-  {
-  register pcre_uchar c = *code;
-  if (c == OP_END) return NULL;
-  if (c == OP_RECURSE) return code;
-
-  /* XCLASS is used for classes that cannot be represented just by a bit
-  map. This includes negated single high-valued characters. The length in
-  the table is zero; the actual length is stored in the compiled code. */
-
-  if (c == OP_XCLASS) code += GET(code, 1);
-
-  /* Otherwise, we can get the item's length from the table, except that for
-  repeated character types, we have to test for \p and \P, which have an extra
-  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
-  must add in its length. */
-
-  else
-    {
-    switch(c)
-      {
-      case OP_TYPESTAR:
-      case OP_TYPEMINSTAR:
-      case OP_TYPEPLUS:
-      case OP_TYPEMINPLUS:
-      case OP_TYPEQUERY:
-      case OP_TYPEMINQUERY:
-      case OP_TYPEPOSSTAR:
-      case OP_TYPEPOSPLUS:
-      case OP_TYPEPOSQUERY:
-      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-      break;
-
-      case OP_TYPEPOSUPTO:
-      case OP_TYPEUPTO:
-      case OP_TYPEMINUPTO:
-      case OP_TYPEEXACT:
-      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-        code += 2;
-      break;
-
-      case OP_MARK:
-      case OP_PRUNE_ARG:
-      case OP_SKIP_ARG:
-      case OP_THEN_ARG:
-      code += code[1];
-      break;
-      }
-
-    /* Add in the fixed length from the table */
-
-    code += PRIV(OP_lengths)[c];
-
-    /* In UTF-8 mode, opcodes that are followed by a character may be followed
-    by a multi-byte character. The length in the table is a minimum, so we have
-    to arrange to skip the extra bytes. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (utf) switch(c)
-      {
-      case OP_CHAR:
-      case OP_CHARI:
-      case OP_NOT:
-      case OP_NOTI:
-      case OP_EXACT:
-      case OP_EXACTI:
-      case OP_NOTEXACT:
-      case OP_NOTEXACTI:
-      case OP_UPTO:
-      case OP_UPTOI:
-      case OP_NOTUPTO:
-      case OP_NOTUPTOI:
-      case OP_MINUPTO:
-      case OP_MINUPTOI:
-      case OP_NOTMINUPTO:
-      case OP_NOTMINUPTOI:
-      case OP_POSUPTO:
-      case OP_POSUPTOI:
-      case OP_NOTPOSUPTO:
-      case OP_NOTPOSUPTOI:
-      case OP_STAR:
-      case OP_STARI:
-      case OP_NOTSTAR:
-      case OP_NOTSTARI:
-      case OP_MINSTAR:
-      case OP_MINSTARI:
-      case OP_NOTMINSTAR:
-      case OP_NOTMINSTARI:
-      case OP_POSSTAR:
-      case OP_POSSTARI:
-      case OP_NOTPOSSTAR:
-      case OP_NOTPOSSTARI:
-      case OP_PLUS:
-      case OP_PLUSI:
-      case OP_NOTPLUS:
-      case OP_NOTPLUSI:
-      case OP_MINPLUS:
-      case OP_MINPLUSI:
-      case OP_NOTMINPLUS:
-      case OP_NOTMINPLUSI:
-      case OP_POSPLUS:
-      case OP_POSPLUSI:
-      case OP_NOTPOSPLUS:
-      case OP_NOTPOSPLUSI:
-      case OP_QUERY:
-      case OP_QUERYI:
-      case OP_NOTQUERY:
-      case OP_NOTQUERYI:
-      case OP_MINQUERY:
-      case OP_MINQUERYI:
-      case OP_NOTMINQUERY:
-      case OP_NOTMINQUERYI:
-      case OP_POSQUERY:
-      case OP_POSQUERYI:
-      case OP_NOTPOSQUERY:
-      case OP_NOTPOSQUERYI:
-      if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
-      break;
-      }
-#else
-    (void)(utf);  /* Keep compiler happy by referencing function argument */
-#endif
-    }
-  }
-}
-
-
-
-/*************************************************
-*    Scan compiled branch for non-emptiness      *
-*************************************************/
-
-/* This function scans through a branch of a compiled pattern to see whether it
-can match the empty string or not. It is called from could_be_empty()
-below and from compile_branch() when checking for an unlimited repeat of a
-group that can match nothing. Note that first_significant_code() skips over
-backward and negative forward assertions when its final argument is TRUE. If we
-hit an unclosed bracket, we return "empty" - this means we've struck an inner
-bracket whose current branch will already have been scanned.
-
-Arguments:
-  code        points to start of search
-  endcode     points to where to stop
-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  cd          contains pointers to tables etc.
-  recurses    chain of recurse_check to catch mutual recursion
-
-Returns:      TRUE if what is matched could be empty
-*/
-
-static BOOL
-could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
-  BOOL utf, compile_data *cd, recurse_check *recurses)
-{
-register pcre_uchar c;
-recurse_check this_recurse;
-
-for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
-     code < endcode;
-     code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
-  {
-  const pcre_uchar *ccode;
-
-  c = *code;
-
-  /* Skip over forward assertions; the other assertions are skipped by
-  first_significant_code() with a TRUE final argument. */
-
-  if (c == OP_ASSERT)
-    {
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    continue;
-    }
-
-  /* For a recursion/subroutine call, if its end has been reached, which
-  implies a backward reference subroutine call, we can scan it. If it's a
-  forward reference subroutine call, we can't. To detect forward reference
-  we have to scan up the list that is kept in the workspace. This function is
-  called only when doing the real compile, not during the pre-compile that
-  measures the size of the compiled pattern. */
-
-  if (c == OP_RECURSE)
-    {
-    const pcre_uchar *scode = cd->start_code + GET(code, 1);
-    const pcre_uchar *endgroup = scode;
-    BOOL empty_branch;
-
-    /* Test for forward reference or uncompleted reference. This is disabled
-    when called to scan a completed pattern by setting cd->start_workspace to
-    NULL. */
-
-    if (cd->start_workspace != NULL)
-      {
-      const pcre_uchar *tcode;
-      for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE)
-        if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
-      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
-      }
-
-    /* If the reference is to a completed group, we need to detect whether this
-    is a recursive call, as otherwise there will be an infinite loop. If it is
-    a recursion, just skip over it. Simple recursions are easily detected. For
-    mutual recursions we keep a chain on the stack. */
-
-    do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT);
-    if (code >= scode && code <= endgroup) continue;  /* Simple recursion */
-    else
-      {
-      recurse_check *r = recurses;
-      for (r = recurses; r != NULL; r = r->prev)
-        if (r->group == scode) break;
-      if (r != NULL) continue;   /* Mutual recursion */
-      }
-
-    /* Completed reference; scan the referenced group, remembering it on the
-    stack chain to detect mutual recursions. */
-
-    empty_branch = FALSE;
-    this_recurse.prev = recurses;
-    this_recurse.group = scode;
-
-    do
-      {
-      if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse))
-        {
-        empty_branch = TRUE;
-        break;
-        }
-      scode += GET(scode, 1);
-      }
-    while (*scode == OP_ALT);
-
-    if (!empty_branch) return FALSE;  /* All branches are non-empty */
-    continue;
-    }
-
-  /* Groups with zero repeats can of course be empty; skip them. */
-
-  if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
-      c == OP_BRAPOSZERO)
-    {
-    code += PRIV(OP_lengths)[c];
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    continue;
-    }
-
-  /* A nested group that is already marked as "could be empty" can just be
-  skipped. */
-
-  if (c == OP_SBRA  || c == OP_SBRAPOS ||
-      c == OP_SCBRA || c == OP_SCBRAPOS)
-    {
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    continue;
-    }
-
-  /* For other groups, scan the branches. */
-
-  if (c == OP_BRA  || c == OP_BRAPOS ||
-      c == OP_CBRA || c == OP_CBRAPOS ||
-      c == OP_ONCE || c == OP_ONCE_NC ||
-      c == OP_COND || c == OP_SCOND)
-    {
-    BOOL empty_branch;
-    if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-
-    /* If a conditional group has only one branch, there is a second, implied,
-    empty branch, so just skip over the conditional, because it could be empty.
-    Otherwise, scan the individual branches of the group. */
-
-    if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
-      code += GET(code, 1);
-    else
-      {
-      empty_branch = FALSE;
-      do
-        {
-        if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd,
-          recurses)) empty_branch = TRUE;
-        code += GET(code, 1);
-        }
-      while (*code == OP_ALT);
-      if (!empty_branch) return FALSE;   /* All branches are non-empty */
-      }
-
-    c = *code;
-    continue;
-    }
-
-  /* Handle the other opcodes */
-
-  switch (c)
-    {
-    /* Check for quantifiers after a class. XCLASS is used for classes that
-    cannot be represented just by a bit map. This includes negated single
-    high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
-    actual length is stored in the compiled code, so we must update "code"
-    here. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-    ccode = code += GET(code, 1);
-    goto CHECK_CLASS_REPEAT;
-#endif
-
-    case OP_CLASS:
-    case OP_NCLASS:
-    ccode = code + PRIV(OP_lengths)[OP_CLASS];
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    CHECK_CLASS_REPEAT:
-#endif
-
-    switch (*ccode)
-      {
-      case OP_CRSTAR:            /* These could be empty; continue */
-      case OP_CRMINSTAR:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSQUERY:
-      break;
-
-      default:                   /* Non-repeat => class must match */
-      case OP_CRPLUS:            /* These repeats aren't empty */
-      case OP_CRMINPLUS:
-      case OP_CRPOSPLUS:
-      return FALSE;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      if (GET2(ccode, 1) > 0) return FALSE;  /* Minimum > 0 */
-      break;
-      }
-    break;
-
-    /* Opcodes that must match a character */
-
-    case OP_ANY:
-    case OP_ALLANY:
-    case OP_ANYBYTE:
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    case OP_ANYNL:
-
-    case OP_NOT_HSPACE:
-    case OP_HSPACE:
-    case OP_NOT_VSPACE:
-    case OP_VSPACE:
-    case OP_EXTUNI:
-
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEEXACT:
-
-    return FALSE;
-
-    /* These are going to continue, as they may be empty, but we have to
-    fudge the length for the \p and \P cases. */
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEPOSQUERY:
-    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-    break;
-
-    /* Same for these */
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEPOSUPTO:
-    if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-      code += 2;
-    break;
-
-    /* End of branch */
-
-    case OP_KET:
-    case OP_KETRMAX:
-    case OP_KETRMIN:
-    case OP_KETRPOS:
-    case OP_ALT:
-    return TRUE;
-
-    /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
-    MINUPTO, and POSUPTO and their caseless and negative versions may be
-    followed by a multibyte character. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    case OP_STAR:
-    case OP_STARI:
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-
-    if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
-    break;
-
-    case OP_UPTO:
-    case OP_UPTOI:
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-
-    if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
-    break;
-#endif
-
-    /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
-    string. */
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    code += code[1];
-    break;
-
-    /* None of the remaining opcodes are required to match a character. */
-
-    default:
-    break;
-    }
-  }
-
-return TRUE;
-}
-
-
-
-/*************************************************
-*    Scan compiled regex for non-emptiness       *
-*************************************************/
-
-/* This function is called to check for left recursive calls. We want to check
-the current branch of the current pattern to see if it could match the empty
-string. If it could, we must look outwards for branches at other levels,
-stopping when we pass beyond the bracket which is the subject of the recursion.
-This function is called only during the real compile, not during the
-pre-compile.
-
-Arguments:
-  code        points to start of the recursion
-  endcode     points to where to stop (current RECURSE item)
-  bcptr       points to the chain of current (unclosed) branch starts
-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  cd          pointers to tables etc
-
-Returns:      TRUE if what is matched could be empty
-*/
-
-static BOOL
-could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
-  branch_chain *bcptr, BOOL utf, compile_data *cd)
-{
-while (bcptr != NULL && bcptr->current_branch >= code)
-  {
-  if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL))
-    return FALSE;
-  bcptr = bcptr->outer;
-  }
-return TRUE;
-}
-
-
-
-/*************************************************
-*        Base opcode of repeated opcodes         *
-*************************************************/
-
-/* Returns the base opcode for repeated single character type opcodes. If the
-opcode is not a repeated character type, it returns with the original value.
-
-Arguments:  c opcode
-Returns:    base opcode for the type
-*/
-
-static pcre_uchar
-get_repeat_base(pcre_uchar c)
-{
-return (c > OP_TYPEPOSUPTO)? c :
-       (c >= OP_TYPESTAR)?   OP_TYPESTAR :
-       (c >= OP_NOTSTARI)?   OP_NOTSTARI :
-       (c >= OP_NOTSTAR)?    OP_NOTSTAR :
-       (c >= OP_STARI)?      OP_STARI :
-                             OP_STAR;
-}
-
-
-
-#ifdef SUPPORT_UCP
-/*************************************************
-*        Check a character and a property        *
-*************************************************/
-
-/* This function is called by check_auto_possessive() when a property item
-is adjacent to a fixed character.
-
-Arguments:
-  c            the character
-  ptype        the property type
-  pdata        the data for the type
-  negated      TRUE if it's a negated property (\P or \p{^)
-
-Returns:       TRUE if auto-possessifying is OK
-*/
-
-static BOOL
-check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata,
-  BOOL negated)
-{
-const pcre_uint32 *p;
-const ucd_record *prop = GET_UCD(c);
-
-switch(ptype)
-  {
-  case PT_LAMP:
-  return (prop->chartype == ucp_Lu ||
-          prop->chartype == ucp_Ll ||
-          prop->chartype == ucp_Lt) == negated;
-
-  case PT_GC:
-  return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
-
-  case PT_PC:
-  return (pdata == prop->chartype) == negated;
-
-  case PT_SC:
-  return (pdata == prop->script) == negated;
-
-  /* These are specials */
-
-  case PT_ALNUM:
-  return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-          PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
-
-  /* Perl space used to exclude VT, but from Perl 5.18 it is included, which
-  means that Perl space and POSIX space are now identical. PCRE was changed
-  at release 8.34. */
-
-  case PT_SPACE:    /* Perl space */
-  case PT_PXSPACE:  /* POSIX space */
-  switch(c)
-    {
-    HSPACE_CASES:
-    VSPACE_CASES:
-    return negated;
-
-    default:
-    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == negated;
-    }
-  break;  /* Control never reaches here */
-
-  case PT_WORD:
-  return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-          PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
-          c == CHAR_UNDERSCORE) == negated;
-
-  case PT_CLIST:
-  p = PRIV(ucd_caseless_sets) + prop->caseset;
-  for (;;)
-    {
-    if (c < *p) return !negated;
-    if (c == *p++) return negated;
-    }
-  break;  /* Control never reaches here */
-  }
-
-return FALSE;
-}
-#endif  /* SUPPORT_UCP */
-
-
-
-/*************************************************
-*        Fill the character property list        *
-*************************************************/
-
-/* Checks whether the code points to an opcode that can take part in auto-
-possessification, and if so, fills a list with its properties.
-
-Arguments:
-  code        points to start of expression
-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  fcc         points to case-flipping table
-  list        points to output list
-              list[0] will be filled with the opcode
-              list[1] will be non-zero if this opcode
-                can match an empty character string
-              list[2..7] depends on the opcode
-
-Returns:      points to the start of the next opcode if *code is accepted
-              NULL if *code is not accepted
-*/
-
-static const pcre_uchar *
-get_chr_property_list(const pcre_uchar *code, BOOL utf,
-  const pcre_uint8 *fcc, pcre_uint32 *list)
-{
-pcre_uchar c = *code;
-pcre_uchar base;
-const pcre_uchar *end;
-pcre_uint32 chr;
-
-#ifdef SUPPORT_UCP
-pcre_uint32 *clist_dest;
-const pcre_uint32 *clist_src;
-#else
-utf = utf;  /* Suppress "unused parameter" compiler warning */
-#endif
-
-list[0] = c;
-list[1] = FALSE;
-code++;
-
-if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
-  {
-  base = get_repeat_base(c);
-  c -= (base - OP_STAR);
-
-  if (c == OP_UPTO || c == OP_MINUPTO || c == OP_EXACT || c == OP_POSUPTO)
-    code += IMM2_SIZE;
-
-  list[1] = (c != OP_PLUS && c != OP_MINPLUS && c != OP_EXACT && c != OP_POSPLUS);
-
-  switch(base)
-    {
-    case OP_STAR:
-    list[0] = OP_CHAR;
-    break;
-
-    case OP_STARI:
-    list[0] = OP_CHARI;
-    break;
-
-    case OP_NOTSTAR:
-    list[0] = OP_NOT;
-    break;
-
-    case OP_NOTSTARI:
-    list[0] = OP_NOTI;
-    break;
-
-    case OP_TYPESTAR:
-    list[0] = *code;
-    code++;
-    break;
-    }
-  c = list[0];
-  }
-
-switch(c)
-  {
-  case OP_NOT_DIGIT:
-  case OP_DIGIT:
-  case OP_NOT_WHITESPACE:
-  case OP_WHITESPACE:
-  case OP_NOT_WORDCHAR:
-  case OP_WORDCHAR:
-  case OP_ANY:
-  case OP_ALLANY:
-  case OP_ANYNL:
-  case OP_NOT_HSPACE:
-  case OP_HSPACE:
-  case OP_NOT_VSPACE:
-  case OP_VSPACE:
-  case OP_EXTUNI:
-  case OP_EODN:
-  case OP_EOD:
-  case OP_DOLL:
-  case OP_DOLLM:
-  return code;
-
-  case OP_CHAR:
-  case OP_NOT:
-  GETCHARINCTEST(chr, code);
-  list[2] = chr;
-  list[3] = NOTACHAR;
-  return code;
-
-  case OP_CHARI:
-  case OP_NOTI:
-  list[0] = (c == OP_CHARI) ? OP_CHAR : OP_NOT;
-  GETCHARINCTEST(chr, code);
-  list[2] = chr;
-
-#ifdef SUPPORT_UCP
-  if (chr < 128 || (chr < 256 && !utf))
-    list[3] = fcc[chr];
-  else
-    list[3] = UCD_OTHERCASE(chr);
-#elif defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  list[3] = (chr < 256) ? fcc[chr] : chr;
-#else
-  list[3] = fcc[chr];
-#endif
-
-  /* The othercase might be the same value. */
-
-  if (chr == list[3])
-    list[3] = NOTACHAR;
-  else
-    list[4] = NOTACHAR;
-  return code;
-
-#ifdef SUPPORT_UCP
-  case OP_PROP:
-  case OP_NOTPROP:
-  if (code[0] != PT_CLIST)
-    {
-    list[2] = code[0];
-    list[3] = code[1];
-    return code + 2;
-    }
-
-  /* Convert only if we have enough space. */
-
-  clist_src = PRIV(ucd_caseless_sets) + code[1];
-  clist_dest = list + 2;
-  code += 2;
-
-  do {
-     if (clist_dest >= list + 8)
-       {
-       /* Early return if there is not enough space. This should never
-       happen, since all clists are shorter than 5 character now. */
-       list[2] = code[0];
-       list[3] = code[1];
-       return code;
-       }
-     *clist_dest++ = *clist_src;
-     }
-  while(*clist_src++ != NOTACHAR);
-
-  /* All characters are stored. The terminating NOTACHAR
-  is copied form the clist itself. */
-
-  list[0] = (c == OP_PROP) ? OP_CHAR : OP_NOT;
-  return code;
-#endif
-
-  case OP_NCLASS:
-  case OP_CLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  case OP_XCLASS:
-  if (c == OP_XCLASS)
-    end = code + GET(code, 0) - 1;
-  else
-#endif
-    end = code + 32 / sizeof(pcre_uchar);
-
-  switch(*end)
-    {
-    case OP_CRSTAR:
-    case OP_CRMINSTAR:
-    case OP_CRQUERY:
-    case OP_CRMINQUERY:
-    case OP_CRPOSSTAR:
-    case OP_CRPOSQUERY:
-    list[1] = TRUE;
-    end++;
-    break;
-
-    case OP_CRPLUS:
-    case OP_CRMINPLUS:
-    case OP_CRPOSPLUS:
-    end++;
-    break;
-
-    case OP_CRRANGE:
-    case OP_CRMINRANGE:
-    case OP_CRPOSRANGE:
-    list[1] = (GET2(end, 1) == 0);
-    end += 1 + 2 * IMM2_SIZE;
-    break;
-    }
-  list[2] = (pcre_uint32)(end - code);
-  return end;
-  }
-return NULL;    /* Opcode not accepted */
-}
-
-
-
-/*************************************************
-*    Scan further character sets for match       *
-*************************************************/
-
-/* Checks whether the base and the current opcode have a common character, in
-which case the base cannot be possessified.
-
-Arguments:
-  code        points to the byte code
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  cd          static compile data
-  base_list   the data list of the base opcode
-
-Returns:      TRUE if the auto-possessification is possible
-*/
-
-static BOOL
-compare_opcodes(const pcre_uchar *code, BOOL utf, const compile_data *cd,
-  const pcre_uint32 *base_list, const pcre_uchar *base_end, int *rec_limit)
-{
-pcre_uchar c;
-pcre_uint32 list[8];
-const pcre_uint32 *chr_ptr;
-const pcre_uint32 *ochr_ptr;
-const pcre_uint32 *list_ptr;
-const pcre_uchar *next_code;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-const pcre_uchar *xclass_flags;
-#endif
-const pcre_uint8 *class_bitset;
-const pcre_uint8 *set1, *set2, *set_end;
-pcre_uint32 chr;
-BOOL accepted, invert_bits;
-BOOL entered_a_group = FALSE;
-
-if (*rec_limit == 0) return FALSE;
---(*rec_limit);
-
-/* Note: the base_list[1] contains whether the current opcode has greedy
-(represented by a non-zero value) quantifier. This is a different from
-other character type lists, which stores here that the character iterator
-matches to an empty string (also represented by a non-zero value). */
-
-for(;;)
-  {
-  /* All operations move the code pointer forward.
-  Therefore infinite recursions are not possible. */
-
-  c = *code;
-
-  /* Skip over callouts */
-
-  if (c == OP_CALLOUT)
-    {
-    code += PRIV(OP_lengths)[c];
-    continue;
-    }
-
-  if (c == OP_ALT)
-    {
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    }
-
-  switch(c)
-    {
-    case OP_END:
-    case OP_KETRPOS:
-    /* TRUE only in greedy case. The non-greedy case could be replaced by
-    an OP_EXACT, but it is probably not worth it. (And note that OP_EXACT
-    uses more memory, which we cannot get at this stage.) */
-
-    return base_list[1] != 0;
-
-    case OP_KET:
-    /* If the bracket is capturing, and referenced by an OP_RECURSE, or
-    it is an atomic sub-pattern (assert, once, etc.) the non-greedy case
-    cannot be converted to a possessive form. */
-
-    if (base_list[1] == 0) return FALSE;
-
-    switch(*(code - GET(code, 1)))
-      {
-      case OP_ASSERT:
-      case OP_ASSERT_NOT:
-      case OP_ASSERTBACK:
-      case OP_ASSERTBACK_NOT:
-      case OP_ONCE:
-      case OP_ONCE_NC:
-      /* Atomic sub-patterns and assertions can always auto-possessify their
-      last iterator. However, if the group was entered as a result of checking
-      a previous iterator, this is not possible. */
-
-      return !entered_a_group;
-      }
-
-    code += PRIV(OP_lengths)[c];
-    continue;
-
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRA:
-    case OP_CBRA:
-    next_code = code + GET(code, 1);
-    code += PRIV(OP_lengths)[c];
-
-    while (*next_code == OP_ALT)
-      {
-      if (!compare_opcodes(code, utf, cd, base_list, base_end, rec_limit))
-        return FALSE;
-      code = next_code + 1 + LINK_SIZE;
-      next_code += GET(next_code, 1);
-      }
-
-    entered_a_group = TRUE;
-    continue;
-
-    case OP_BRAZERO:
-    case OP_BRAMINZERO:
-
-    next_code = code + 1;
-    if (*next_code != OP_BRA && *next_code != OP_CBRA
-        && *next_code != OP_ONCE && *next_code != OP_ONCE_NC) return FALSE;
-
-    do next_code += GET(next_code, 1); while (*next_code == OP_ALT);
-
-    /* The bracket content will be checked by the
-    OP_BRA/OP_CBRA case above. */
-    next_code += 1 + LINK_SIZE;
-    if (!compare_opcodes(next_code, utf, cd, base_list, base_end, rec_limit))
-      return FALSE;
-
-    code += PRIV(OP_lengths)[c];
-    continue;
-
-    default:
-    break;
-    }
-
-  /* Check for a supported opcode, and load its properties. */
-
-  code = get_chr_property_list(code, utf, cd->fcc, list);
-  if (code == NULL) return FALSE;    /* Unsupported */
-
-  /* If either opcode is a small character list, set pointers for comparing
-  characters from that list with another list, or with a property. */
-
-  if (base_list[0] == OP_CHAR)
-    {
-    chr_ptr = base_list + 2;
-    list_ptr = list;
-    }
-  else if (list[0] == OP_CHAR)
-    {
-    chr_ptr = list + 2;
-    list_ptr = base_list;
-    }
-
-  /* Character bitsets can also be compared to certain opcodes. */
-
-  else if (base_list[0] == OP_CLASS || list[0] == OP_CLASS
-#ifdef COMPILE_PCRE8
-      /* In 8 bit, non-UTF mode, OP_CLASS and OP_NCLASS are the same. */
-      || (!utf && (base_list[0] == OP_NCLASS || list[0] == OP_NCLASS))
-#endif
-      )
-    {
-#ifdef COMPILE_PCRE8
-    if (base_list[0] == OP_CLASS || (!utf && base_list[0] == OP_NCLASS))
-#else
-    if (base_list[0] == OP_CLASS)
-#endif
-      {
-      set1 = (pcre_uint8 *)(base_end - base_list[2]);
-      list_ptr = list;
-      }
-    else
-      {
-      set1 = (pcre_uint8 *)(code - list[2]);
-      list_ptr = base_list;
-      }
-
-    invert_bits = FALSE;
-    switch(list_ptr[0])
-      {
-      case OP_CLASS:
-      case OP_NCLASS:
-      set2 = (pcre_uint8 *)
-        ((list_ptr == list ? code : base_end) - list_ptr[2]);
-      break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      xclass_flags = (list_ptr == list ? code : base_end) - list_ptr[2] + LINK_SIZE;
-      if ((*xclass_flags & XCL_HASPROP) != 0) return FALSE;
-      if ((*xclass_flags & XCL_MAP) == 0)
-        {
-        /* No bits are set for characters < 256. */
-        if (list[1] == 0) return TRUE;
-        /* Might be an empty repeat. */
-        continue;
-        }
-      set2 = (pcre_uint8 *)(xclass_flags + 1);
-      break;
-#endif
-
-      case OP_NOT_DIGIT:
-      invert_bits = TRUE;
-      /* Fall through */
-      case OP_DIGIT:
-      set2 = (pcre_uint8 *)(cd->cbits + cbit_digit);
-      break;
-
-      case OP_NOT_WHITESPACE:
-      invert_bits = TRUE;
-      /* Fall through */
-      case OP_WHITESPACE:
-      set2 = (pcre_uint8 *)(cd->cbits + cbit_space);
-      break;
-
-      case OP_NOT_WORDCHAR:
-      invert_bits = TRUE;
-      /* Fall through */
-      case OP_WORDCHAR:
-      set2 = (pcre_uint8 *)(cd->cbits + cbit_word);
-      break;
-
-      default:
-      return FALSE;
-      }
-
-    /* Because the sets are unaligned, we need
-    to perform byte comparison here. */
-    set_end = set1 + 32;
-    if (invert_bits)
-      {
-      do
-        {
-        if ((*set1++ & ~(*set2++)) != 0) return FALSE;
-        }
-      while (set1 < set_end);
-      }
-    else
-      {
-      do
-        {
-        if ((*set1++ & *set2++) != 0) return FALSE;
-        }
-      while (set1 < set_end);
-      }
-
-    if (list[1] == 0) return TRUE;
-    /* Might be an empty repeat. */
-    continue;
-    }
-
-  /* Some property combinations also acceptable. Unicode property opcodes are
-  processed specially; the rest can be handled with a lookup table. */
-
-  else
-    {
-    pcre_uint32 leftop, rightop;
-
-    leftop = base_list[0];
-    rightop = list[0];
-
-#ifdef SUPPORT_UCP
-    accepted = FALSE; /* Always set in non-unicode case. */
-    if (leftop == OP_PROP || leftop == OP_NOTPROP)
-      {
-      if (rightop == OP_EOD)
-        accepted = TRUE;
-      else if (rightop == OP_PROP || rightop == OP_NOTPROP)
-        {
-        int n;
-        const pcre_uint8 *p;
-        BOOL same = leftop == rightop;
-        BOOL lisprop = leftop == OP_PROP;
-        BOOL risprop = rightop == OP_PROP;
-        BOOL bothprop = lisprop && risprop;
-
-        /* There's a table that specifies how each combination is to be
-        processed:
-          0   Always return FALSE (never auto-possessify)
-          1   Character groups are distinct (possessify if both are OP_PROP)
-          2   Check character categories in the same group (general or particular)
-          3   Return TRUE if the two opcodes are not the same
-          ... see comments below
-        */
-
-        n = propposstab[base_list[2]][list[2]];
-        switch(n)
-          {
-          case 0: break;
-          case 1: accepted = bothprop; break;
-          case 2: accepted = (base_list[3] == list[3]) != same; break;
-          case 3: accepted = !same; break;
-
-          case 4:  /* Left general category, right particular category */
-          accepted = risprop && catposstab[base_list[3]][list[3]] == same;
-          break;
-
-          case 5:  /* Right general category, left particular category */
-          accepted = lisprop && catposstab[list[3]][base_list[3]] == same;
-          break;
-
-          /* This code is logically tricky. Think hard before fiddling with it.
-          The posspropstab table has four entries per row. Each row relates to
-          one of PCRE's special properties such as ALNUM or SPACE or WORD.
-          Only WORD actually needs all four entries, but using repeats for the
-          others means they can all use the same code below.
-
-          The first two entries in each row are Unicode general categories, and
-          apply always, because all the characters they include are part of the
-          PCRE character set. The third and fourth entries are a general and a
-          particular category, respectively, that include one or more relevant
-          characters. One or the other is used, depending on whether the check
-          is for a general or a particular category. However, in both cases the
-          category contains more characters than the specials that are defined
-          for the property being tested against. Therefore, it cannot be used
-          in a NOTPROP case.
-
-          Example: the row for WORD contains ucp_L, ucp_N, ucp_P, ucp_Po.
-          Underscore is covered by ucp_P or ucp_Po. */
-
-          case 6:  /* Left alphanum vs right general category */
-          case 7:  /* Left space vs right general category */
-          case 8:  /* Left word vs right general category */
-          p = posspropstab[n-6];
-          accepted = risprop && lisprop ==
-            (list[3] != p[0] &&
-             list[3] != p[1] &&
-            (list[3] != p[2] || !lisprop));
-          break;
-
-          case 9:   /* Right alphanum vs left general category */
-          case 10:  /* Right space vs left general category */
-          case 11:  /* Right word vs left general category */
-          p = posspropstab[n-9];
-          accepted = lisprop && risprop ==
-            (base_list[3] != p[0] &&
-             base_list[3] != p[1] &&
-            (base_list[3] != p[2] || !risprop));
-          break;
-
-          case 12:  /* Left alphanum vs right particular category */
-          case 13:  /* Left space vs right particular category */
-          case 14:  /* Left word vs right particular category */
-          p = posspropstab[n-12];
-          accepted = risprop && lisprop ==
-            (catposstab[p[0]][list[3]] &&
-             catposstab[p[1]][list[3]] &&
-            (list[3] != p[3] || !lisprop));
-          break;
-
-          case 15:  /* Right alphanum vs left particular category */
-          case 16:  /* Right space vs left particular category */
-          case 17:  /* Right word vs left particular category */
-          p = posspropstab[n-15];
-          accepted = lisprop && risprop ==
-            (catposstab[p[0]][base_list[3]] &&
-             catposstab[p[1]][base_list[3]] &&
-            (base_list[3] != p[3] || !risprop));
-          break;
-          }
-        }
-      }
-
-    else
-#endif  /* SUPPORT_UCP */
-
-    accepted = leftop >= FIRST_AUTOTAB_OP && leftop <= LAST_AUTOTAB_LEFT_OP &&
-           rightop >= FIRST_AUTOTAB_OP && rightop <= LAST_AUTOTAB_RIGHT_OP &&
-           autoposstab[leftop - FIRST_AUTOTAB_OP][rightop - FIRST_AUTOTAB_OP];
-
-    if (!accepted) return FALSE;
-
-    if (list[1] == 0) return TRUE;
-    /* Might be an empty repeat. */
-    continue;
-    }
-
-  /* Control reaches here only if one of the items is a small character list.
-  All characters are checked against the other side. */
-
-  do
-    {
-    chr = *chr_ptr;
-
-    switch(list_ptr[0])
-      {
-      case OP_CHAR:
-      ochr_ptr = list_ptr + 2;
-      do
-        {
-        if (chr == *ochr_ptr) return FALSE;
-        ochr_ptr++;
-        }
-      while(*ochr_ptr != NOTACHAR);
-      break;
-
-      case OP_NOT:
-      ochr_ptr = list_ptr + 2;
-      do
-        {
-        if (chr == *ochr_ptr)
-          break;
-        ochr_ptr++;
-        }
-      while(*ochr_ptr != NOTACHAR);
-      if (*ochr_ptr == NOTACHAR) return FALSE;   /* Not found */
-      break;
-
-      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not*
-      set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
-
-      case OP_DIGIT:
-      if (chr < 256 && (cd->ctypes[chr] & ctype_digit) != 0) return FALSE;
-      break;
-
-      case OP_NOT_DIGIT:
-      if (chr > 255 || (cd->ctypes[chr] & ctype_digit) == 0) return FALSE;
-      break;
-
-      case OP_WHITESPACE:
-      if (chr < 256 && (cd->ctypes[chr] & ctype_space) != 0) return FALSE;
-      break;
-
-      case OP_NOT_WHITESPACE:
-      if (chr > 255 || (cd->ctypes[chr] & ctype_space) == 0) return FALSE;
-      break;
-
-      case OP_WORDCHAR:
-      if (chr < 255 && (cd->ctypes[chr] & ctype_word) != 0) return FALSE;
-      break;
-
-      case OP_NOT_WORDCHAR:
-      if (chr > 255 || (cd->ctypes[chr] & ctype_word) == 0) return FALSE;
-      break;
-
-      case OP_HSPACE:
-      switch(chr)
-        {
-        HSPACE_CASES: return FALSE;
-        default: break;
-        }
-      break;
-
-      case OP_NOT_HSPACE:
-      switch(chr)
-        {
-        HSPACE_CASES: break;
-        default: return FALSE;
-        }
-      break;
-
-      case OP_ANYNL:
-      case OP_VSPACE:
-      switch(chr)
-        {
-        VSPACE_CASES: return FALSE;
-        default: break;
-        }
-      break;
-
-      case OP_NOT_VSPACE:
-      switch(chr)
-        {
-        VSPACE_CASES: break;
-        default: return FALSE;
-        }
-      break;
-
-      case OP_DOLL:
-      case OP_EODN:
-      switch (chr)
-        {
-        case CHAR_CR:
-        case CHAR_LF:
-        case CHAR_VT:
-        case CHAR_FF:
-        case CHAR_NEL:
-#ifndef EBCDIC
-        case 0x2028:
-        case 0x2029:
-#endif  /* Not EBCDIC */
-        return FALSE;
-        }
-      break;
-
-      case OP_EOD:    /* Can always possessify before \z */
-      break;
-
-#ifdef SUPPORT_UCP
-      case OP_PROP:
-      case OP_NOTPROP:
-      if (!check_char_prop(chr, list_ptr[2], list_ptr[3],
-            list_ptr[0] == OP_NOTPROP))
-        return FALSE;
-      break;
-#endif
-
-      case OP_NCLASS:
-      if (chr > 255) return FALSE;
-      /* Fall through */
-
-      case OP_CLASS:
-      if (chr > 255) break;
-      class_bitset = (pcre_uint8 *)
-        ((list_ptr == list ? code : base_end) - list_ptr[2]);
-      if ((class_bitset[chr >> 3] & (1 << (chr & 7))) != 0) return FALSE;
-      break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      if (PRIV(xclass)(chr, (list_ptr == list ? code : base_end) -
-          list_ptr[2] + LINK_SIZE, utf)) return FALSE;
-      break;
-#endif
-
-      default:
-      return FALSE;
-      }
-
-    chr_ptr++;
-    }
-  while(*chr_ptr != NOTACHAR);
-
-  /* At least one character must be matched from this opcode. */
-
-  if (list[1] == 0) return TRUE;
-  }
-
-/* Control never reaches here. There used to be a fail-save return FALSE; here,
-but some compilers complain about an unreachable statement. */
-
-}
-
-
-
-/*************************************************
-*    Scan compiled regex for auto-possession     *
-*************************************************/
-
-/* Replaces single character iterations with their possessive alternatives
-if appropriate. This function modifies the compiled opcode!
-
-Arguments:
-  code        points to start of the byte code
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  cd          static compile data
-
-Returns:      nothing
-*/
-
-static void
-auto_possessify(pcre_uchar *code, BOOL utf, const compile_data *cd)
-{
-register pcre_uchar c;
-const pcre_uchar *end;
-pcre_uchar *repeat_opcode;
-pcre_uint32 list[8];
-int rec_limit;
-
-for (;;)
-  {
-  c = *code;
-
-  /* When a pattern with bad UTF-8 encoding is compiled with NO_UTF_CHECK,
-  it may compile without complaining, but may get into a loop here if the code
-  pointer points to a bad value. This is, of course a documentated possibility,
-  when NO_UTF_CHECK is set, so it isn't a bug, but we can detect this case and
-  just give up on this optimization. */
-
-  if (c >= OP_TABLE_LENGTH) return;
-
-  if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
-    {
-    c -= get_repeat_base(c) - OP_STAR;
-    end = (c <= OP_MINUPTO) ?
-      get_chr_property_list(code, utf, cd->fcc, list) : NULL;
-    list[1] = c == OP_STAR || c == OP_PLUS || c == OP_QUERY || c == OP_UPTO;
-
-    rec_limit = 1000;
-    if (end != NULL && compare_opcodes(end, utf, cd, list, end, &rec_limit))
-      {
-      switch(c)
-        {
-        case OP_STAR:
-        *code += OP_POSSTAR - OP_STAR;
-        break;
-
-        case OP_MINSTAR:
-        *code += OP_POSSTAR - OP_MINSTAR;
-        break;
-
-        case OP_PLUS:
-        *code += OP_POSPLUS - OP_PLUS;
-        break;
-
-        case OP_MINPLUS:
-        *code += OP_POSPLUS - OP_MINPLUS;
-        break;
-
-        case OP_QUERY:
-        *code += OP_POSQUERY - OP_QUERY;
-        break;
-
-        case OP_MINQUERY:
-        *code += OP_POSQUERY - OP_MINQUERY;
-        break;
-
-        case OP_UPTO:
-        *code += OP_POSUPTO - OP_UPTO;
-        break;
-
-        case OP_MINUPTO:
-        *code += OP_POSUPTO - OP_MINUPTO;
-        break;
-        }
-      }
-    c = *code;
-    }
-  else if (c == OP_CLASS || c == OP_NCLASS || c == OP_XCLASS)
-    {
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    if (c == OP_XCLASS)
-      repeat_opcode = code + GET(code, 1);
-    else
-#endif
-      repeat_opcode = code + 1 + (32 / sizeof(pcre_uchar));
-
-    c = *repeat_opcode;
-    if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
-      {
-      /* end must not be NULL. */
-      end = get_chr_property_list(code, utf, cd->fcc, list);
-
-      list[1] = (c & 1) == 0;
-
-      rec_limit = 1000;
-      if (compare_opcodes(end, utf, cd, list, end, &rec_limit))
-        {
-        switch (c)
-          {
-          case OP_CRSTAR:
-          case OP_CRMINSTAR:
-          *repeat_opcode = OP_CRPOSSTAR;
-          break;
-
-          case OP_CRPLUS:
-          case OP_CRMINPLUS:
-          *repeat_opcode = OP_CRPOSPLUS;
-          break;
-
-          case OP_CRQUERY:
-          case OP_CRMINQUERY:
-          *repeat_opcode = OP_CRPOSQUERY;
-          break;
-
-          case OP_CRRANGE:
-          case OP_CRMINRANGE:
-          *repeat_opcode = OP_CRPOSRANGE;
-          break;
-          }
-        }
-      }
-    c = *code;
-    }
-
-  switch(c)
-    {
-    case OP_END:
-    return;
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-    break;
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEEXACT:
-    case OP_TYPEPOSUPTO:
-    if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-      code += 2;
-    break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-    code += GET(code, 1);
-    break;
-#endif
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    code += code[1];
-    break;
-    }
-
-  /* Add in the fixed length from the table */
-
-  code += PRIV(OP_lengths)[c];
-
-  /* In UTF-8 mode, opcodes that are followed by a character may be followed by
-  a multi-byte character. The length in the table is a minimum, so we have to
-  arrange to skip the extra bytes. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-  if (utf) switch(c)
-    {
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    case OP_STAR:
-    case OP_MINSTAR:
-    case OP_PLUS:
-    case OP_MINPLUS:
-    case OP_QUERY:
-    case OP_MINQUERY:
-    case OP_UPTO:
-    case OP_MINUPTO:
-    case OP_EXACT:
-    case OP_POSSTAR:
-    case OP_POSPLUS:
-    case OP_POSQUERY:
-    case OP_POSUPTO:
-    case OP_STARI:
-    case OP_MINSTARI:
-    case OP_PLUSI:
-    case OP_MINPLUSI:
-    case OP_QUERYI:
-    case OP_MINQUERYI:
-    case OP_UPTOI:
-    case OP_MINUPTOI:
-    case OP_EXACTI:
-    case OP_POSSTARI:
-    case OP_POSPLUSI:
-    case OP_POSQUERYI:
-    case OP_POSUPTOI:
-    case OP_NOTSTAR:
-    case OP_NOTMINSTAR:
-    case OP_NOTPLUS:
-    case OP_NOTMINPLUS:
-    case OP_NOTQUERY:
-    case OP_NOTMINQUERY:
-    case OP_NOTUPTO:
-    case OP_NOTMINUPTO:
-    case OP_NOTEXACT:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSUPTO:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERYI:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTOI:
-    case OP_NOTEXACTI:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSUPTOI:
-    if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
-    break;
-    }
-#else
-  (void)(utf);  /* Keep compiler happy by referencing function argument */
-#endif
-  }
-}
-
-
-
-/*************************************************
-*           Check for POSIX class syntax         *
-*************************************************/
-
-/* This function is called when the sequence "[:" or "[." or "[=" is
-encountered in a character class. It checks whether this is followed by a
-sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
-reach an unescaped ']' without the special preceding character, return FALSE.
-
-Originally, this function only recognized a sequence of letters between the
-terminators, but it seems that Perl recognizes any sequence of characters,
-though of course unknown POSIX names are subsequently rejected. Perl gives an
-"Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
-didn't consider this to be a POSIX class. Likewise for [:1234:].
-
-The problem in trying to be exactly like Perl is in the handling of escapes. We
-have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
-class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
-below handles the special cases \\ and \], but does not try to do any other
-escape processing. This makes it different from Perl for cases such as
-[:l\ower:] where Perl recognizes it as the POSIX class "lower" but PCRE does
-not recognize "l\ower". This is a lesser evil than not diagnosing bad classes
-when Perl does, I think.
-
-A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
-It seems that the appearance of a nested POSIX class supersedes an apparent
-external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
-a digit.
-
-In Perl, unescaped square brackets may also appear as part of class names. For
-example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
-[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
-seem right at all. PCRE does not allow closing square brackets in POSIX class
-names.
-
-Arguments:
-  ptr      pointer to the initial [
-  endptr   where to return the end pointer
-
-Returns:   TRUE or FALSE
-*/
-
-static BOOL
-check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
-{
-pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
-terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
-for (++ptr; *ptr != CHAR_NULL; ptr++)
-  {
-  if (*ptr == CHAR_BACKSLASH &&
-      (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET ||
-       ptr[1] == CHAR_BACKSLASH))
-    ptr++;
-  else if ((*ptr == CHAR_LEFT_SQUARE_BRACKET && ptr[1] == terminator) ||
-            *ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
-  else if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
-    {
-    *endptr = ptr;
-    return TRUE;
-    }
-  }
-return FALSE;
-}
-
-
-
-
-/*************************************************
-*          Check POSIX class name                *
-*************************************************/
-
-/* This function is called to check the name given in a POSIX-style class entry
-such as [:alnum:].
-
-Arguments:
-  ptr        points to the first letter
-  len        the length of the name
-
-Returns:     a value representing the name, or -1 if unknown
-*/
-
-static int
-check_posix_name(const pcre_uchar *ptr, int len)
-{
-const char *pn = posix_names;
-register int yield = 0;
-while (posix_name_lengths[yield] != 0)
-  {
-  if (len == posix_name_lengths[yield] &&
-    STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
-  pn += posix_name_lengths[yield] + 1;
-  yield++;
-  }
-return -1;
-}
-
-
-/*************************************************
-*    Adjust OP_RECURSE items in repeated group   *
-*************************************************/
-
-/* OP_RECURSE items contain an offset from the start of the regex to the group
-that is referenced. This means that groups can be replicated for fixed
-repetition simply by copying (because the recursion is allowed to refer to
-earlier groups that are outside the current group). However, when a group is
-optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
-inserted before it, after it has been compiled. This means that any OP_RECURSE
-items within it that refer to the group itself or any contained groups have to
-have their offsets adjusted. That one of the jobs of this function. Before it
-is called, the partially compiled regex must be temporarily terminated with
-OP_END.
-
-This function has been extended to cope with forward references for recursions
-and subroutine calls. It must check the list of such references for the
-group we are dealing with. If it finds that one of the recursions in the
-current group is on this list, it does not adjust the value in the reference
-(which is a group number). After the group has been scanned, all the offsets in
-the forward reference list for the group are adjusted.
-
-Arguments:
-  group      points to the start of the group
-  adjust     the amount by which the group is to be moved
-  utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  cd         contains pointers to tables etc.
-  save_hwm_offset   the hwm forward reference offset at the start of the group
-
-Returns:     nothing
-*/
-
-static void
-adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
-  size_t save_hwm_offset)
-{
-int offset;
-pcre_uchar *hc;
-pcre_uchar *ptr = group;
-
-while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
-  {
-  for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-       hc += LINK_SIZE)
-    {
-    offset = (int)GET(hc, 0);
-    if (cd->start_code + offset == ptr + 1) break;
-    }
-
-  /* If we have not found this recursion on the forward reference list, adjust
-  the recursion's offset if it's after the start of this group. */
-
-  if (hc >= cd->hwm)
-    {
-    offset = (int)GET(ptr, 1);
-    if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
-    }
-
-  ptr += 1 + LINK_SIZE;
-  }
-
-/* Now adjust all forward reference offsets for the group. */
-
-for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-     hc += LINK_SIZE)
-  {
-  offset = (int)GET(hc, 0);
-  PUT(hc, 0, offset + adjust);
-  }
-}
-
-
-
-/*************************************************
-*        Insert an automatic callout point       *
-*************************************************/
-
-/* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert
-callout points before each pattern item.
-
-Arguments:
-  code           current code pointer
-  ptr            current pattern pointer
-  cd             pointers to tables etc
-
-Returns:         new code pointer
-*/
-
-static pcre_uchar *
-auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
-{
-*code++ = OP_CALLOUT;
-*code++ = 255;
-PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
-PUT(code, LINK_SIZE, 0);                       /* Default length */
-return code + 2 * LINK_SIZE;
-}
-
-
-
-/*************************************************
-*         Complete a callout item                *
-*************************************************/
-
-/* A callout item contains the length of the next item in the pattern, which
-we can't fill in till after we have reached the relevant point. This is used
-for both automatic and manual callouts.
-
-Arguments:
-  previous_callout   points to previous callout item
-  ptr                current pattern pointer
-  cd                 pointers to tables etc
-
-Returns:             nothing
-*/
-
-static void
-complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
-{
-int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
-PUT(previous_callout, 2 + LINK_SIZE, length);
-}
-
-
-
-#ifdef SUPPORT_UCP
-/*************************************************
-*           Get othercase range                  *
-*************************************************/
-
-/* This function is passed the start and end of a class range, in UTF-8 mode
-with UCP support. It searches up the characters, looking for ranges of
-characters in the "other" case. Each call returns the next one, updating the
-start address. A character with multiple other cases is returned on its own
-with a special return value.
-
-Arguments:
-  cptr        points to starting character value; updated
-  d           end value
-  ocptr       where to put start of othercase range
-  odptr       where to put end of othercase range
-
-Yield:        -1 when no more
-               0 when a range is returned
-              >0 the CASESET offset for char with multiple other cases
-                in this case, ocptr contains the original
-*/
-
-static int
-get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
-  pcre_uint32 *odptr)
-{
-pcre_uint32 c, othercase, next;
-unsigned int co;
-
-/* Find the first character that has an other case. If it has multiple other
-cases, return its case offset value. */
-
-for (c = *cptr; c <= d; c++)
-  {
-  if ((co = UCD_CASESET(c)) != 0)
-    {
-    *ocptr = c++;   /* Character that has the set */
-    *cptr = c;      /* Rest of input range */
-    return (int)co;
-    }
-  if ((othercase = UCD_OTHERCASE(c)) != c) break;
-  }
-
-if (c > d) return -1;  /* Reached end of range */
-
-/* Found a character that has a single other case. Search for the end of the
-range, which is either the end of the input range, or a character that has zero
-or more than one other cases. */
-
-*ocptr = othercase;
-next = othercase + 1;
-
-for (++c; c <= d; c++)
-  {
-  if ((co = UCD_CASESET(c)) != 0 || UCD_OTHERCASE(c) != next) break;
-  next++;
-  }
-
-*odptr = next - 1;     /* End of othercase range */
-*cptr = c;             /* Rest of input range */
-return 0;
-}
-#endif  /* SUPPORT_UCP */
-
-
-
-/*************************************************
-*        Add a character or range to a class     *
-*************************************************/
-
-/* This function packages up the logic of adding a character or range of
-characters to a class. The character values in the arguments will be within the
-valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
-mutually recursive with the function immediately below.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options word
-  cd            contains pointers to tables etc.
-  start         start of range character
-  end           end of range character
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static int
-add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
-  compile_data *cd, pcre_uint32 start, pcre_uint32 end)
-{
-pcre_uint32 c;
-pcre_uint32 classbits_end = (end <= 0xff ? end : 0xff);
-int n8 = 0;
-
-/* If caseless matching is required, scan the range and process alternate
-cases. In Unicode, there are 8-bit characters that have alternate cases that
-are greater than 255 and vice-versa. Sometimes we can just extend the original
-range. */
-
-if ((options & PCRE_CASELESS) != 0)
-  {
-#ifdef SUPPORT_UCP
-  if ((options & PCRE_UTF8) != 0)
-    {
-    int rc;
-    pcre_uint32 oc, od;
-
-    options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
-    c = start;
-
-    while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
-      {
-      /* Handle a single character that has more than one other case. */
-
-      if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
-        PRIV(ucd_caseless_sets) + rc, oc);
-
-      /* Do nothing if the other case range is within the original range. */
-
-      else if (oc >= start && od <= end) continue;
-
-      /* Extend the original range if there is overlap, noting that if oc < c, we
-      can't have od > end because a subrange is always shorter than the basic
-      range. Otherwise, use a recursive call to add the additional range. */
-
-      else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
-      else if (od > end && oc <= end + 1)
-        {
-        end = od;       /* Extend upwards */
-        if (end > classbits_end) classbits_end = (end <= 0xff ? end : 0xff);
-        }
-      else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
-      }
-    }
-  else
-#endif  /* SUPPORT_UCP */
-
-  /* Not UTF-mode, or no UCP */
-
-  for (c = start; c <= classbits_end; c++)
-    {
-    SETBIT(classbits, cd->fcc[c]);
-    n8++;
-    }
-  }
-
-/* Now handle the original range. Adjust the final value according to the bit
-length - this means that the same lists of (e.g.) horizontal spaces can be used
-in all cases. */
-
-#if defined COMPILE_PCRE8
-#ifdef SUPPORT_UTF
-  if ((options & PCRE_UTF8) == 0)
-#endif
-  if (end > 0xff) end = 0xff;
-
-#elif defined COMPILE_PCRE16
-#ifdef SUPPORT_UTF
-  if ((options & PCRE_UTF16) == 0)
-#endif
-  if (end > 0xffff) end = 0xffff;
-
-#endif /* COMPILE_PCRE[8|16] */
-
-/* Use the bitmap for characters < 256. Otherwise use extra data.*/
-
-for (c = start; c <= classbits_end; c++)
-  {
-  /* Regardless of start, c will always be <= 255. */
-  SETBIT(classbits, c);
-  n8++;
-  }
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-if (start <= 0xff) start = 0xff + 1;
-
-if (end >= start)
-  {
-  pcre_uchar *uchardata = *uchardptr;
-#ifdef SUPPORT_UTF
-  if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
-    {
-    if (start < end)
-      {
-      *uchardata++ = XCL_RANGE;
-      uchardata += PRIV(ord2utf)(start, uchardata);
-      uchardata += PRIV(ord2utf)(end, uchardata);
-      }
-    else if (start == end)
-      {
-      *uchardata++ = XCL_SINGLE;
-      uchardata += PRIV(ord2utf)(start, uchardata);
-      }
-    }
-  else
-#endif  /* SUPPORT_UTF */
-
-  /* Without UTF support, character values are constrained by the bit length,
-  and can only be > 256 for 16-bit and 32-bit libraries. */
-
-#ifdef COMPILE_PCRE8
-    {}
-#else
-  if (start < end)
-    {
-    *uchardata++ = XCL_RANGE;
-    *uchardata++ = start;
-    *uchardata++ = end;
-    }
-  else if (start == end)
-    {
-    *uchardata++ = XCL_SINGLE;
-    *uchardata++ = start;
-    }
-#endif
-
-  *uchardptr = uchardata;   /* Updata extra data pointer */
-  }
-#endif /* SUPPORT_UTF || !COMPILE_PCRE8 */
-
-return n8;    /* Number of 8-bit characters */
-}
-
-
-
-
-/*************************************************
-*        Add a list of characters to a class     *
-*************************************************/
-
-/* This function is used for adding a list of case-equivalent characters to a
-class, and also for adding a list of horizontal or vertical whitespace. If the
-list is in order (which it should be), ranges of characters are detected and
-handled appropriately. This function is mutually recursive with the function
-above.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options word
-  cd            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-  except        character to omit; this is used when adding lists of
-                  case-equivalent characters to avoid including the one we
-                  already know about
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static int
-add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
-  compile_data *cd, const pcre_uint32 *p, unsigned int except)
-{
-int n8 = 0;
-while (p[0] < NOTACHAR)
-  {
-  int n = 0;
-  if (p[0] != except)
-    {
-    while(p[n+1] == p[0] + n + 1) n++;
-    n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
-    }
-  p += n + 1;
-  }
-return n8;
-}
-
-
-
-/*************************************************
-*    Add characters not in a list to a class     *
-*************************************************/
-
-/* This function is used for adding the complement of a list of horizontal or
-vertical whitespace to a class. The list must be in order.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options word
-  cd            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static int
-add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
-  int options, compile_data *cd, const pcre_uint32 *p)
-{
-BOOL utf = (options & PCRE_UTF8) != 0;
-int n8 = 0;
-if (p[0] > 0)
-  n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
-while (p[0] < NOTACHAR)
-  {
-  while (p[1] == p[0] + 1) p++;
-  n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
-    (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
-  p++;
-  }
-return n8;
-}
-
-
-
-/*************************************************
-*           Compile one branch                   *
-*************************************************/
-
-/* Scan the pattern, compiling it into the a vector. If the options are
-changed during the branch, the pointer is used to change the external options
-bits. This function is used during the pre-compile phase when we are trying
-to find out the amount of memory needed, as well as during the real compile
-phase. The value of lengthptr distinguishes the two phases.
-
-Arguments:
-  optionsptr        pointer to the option bits
-  codeptr           points to the pointer to the current code point
-  ptrptr            points to the current pattern pointer
-  errorcodeptr      points to error code variable
-  firstcharptr      place to put the first required character
-  firstcharflagsptr place to put the first character flags, or a negative number
-  reqcharptr        place to put the last required character
-  reqcharflagsptr   place to put the last required character flags, or a negative number
-  bcptr             points to current branch chain
-  cond_depth        conditional nesting depth
-  cd                contains pointers to tables etc.
-  lengthptr         NULL during the real compile phase
-                    points to length accumulator during pre-compile phase
-
-Returns:            TRUE on success
-                    FALSE, with *errorcodeptr set non-zero on error
-*/
-
-static BOOL
-compile_branch(int *optionsptr, pcre_uchar **codeptr,
-  const pcre_uchar **ptrptr, int *errorcodeptr,
-  pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
-  pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
-  branch_chain *bcptr, int cond_depth,
-  compile_data *cd, int *lengthptr)
-{
-int repeat_type, op_type;
-int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
-int bravalue = 0;
-int greedy_default, greedy_non_default;
-pcre_uint32 firstchar, reqchar;
-pcre_int32 firstcharflags, reqcharflags;
-pcre_uint32 zeroreqchar, zerofirstchar;
-pcre_int32 zeroreqcharflags, zerofirstcharflags;
-pcre_int32 req_caseopt, reqvary, tempreqvary;
-int options = *optionsptr;               /* May change dynamically */
-int after_manual_callout = 0;
-int length_prevgroup = 0;
-register pcre_uint32 c;
-int escape;
-register pcre_uchar *code = *codeptr;
-pcre_uchar *last_code = code;
-pcre_uchar *orig_code = code;
-pcre_uchar *tempcode;
-BOOL inescq = FALSE;
-BOOL groupsetfirstchar = FALSE;
-const pcre_uchar *ptr = *ptrptr;
-const pcre_uchar *tempptr;
-const pcre_uchar *nestptr = NULL;
-pcre_uchar *previous = NULL;
-pcre_uchar *previous_callout = NULL;
-size_t item_hwm_offset = 0;
-pcre_uint8 classbits[32];
-
-/* We can fish out the UTF-8 setting once and for all into a BOOL, but we
-must not do this for other options (e.g. PCRE_EXTENDED) because they may change
-dynamically as we process the pattern. */
-
-#ifdef SUPPORT_UTF
-/* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
-BOOL utf = (options & PCRE_UTF8) != 0;
-#ifndef COMPILE_PCRE32
-pcre_uchar utf_chars[6];
-#endif
-#else
-BOOL utf = FALSE;
-#endif
-
-/* Helper variables for OP_XCLASS opcode (for characters > 255). We define
-class_uchardata always so that it can be passed to add_to_class() always,
-though it will not be used in non-UTF 8-bit cases. This avoids having to supply
-alternative calls for the different cases. */
-
-pcre_uchar *class_uchardata;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-BOOL xclass;
-pcre_uchar *class_uchardata_base;
-#endif
-
-#ifdef PCRE_DEBUG
-if (lengthptr != NULL) DPRINTF((">> start branch\n"));
-#endif
-
-/* Set up the default and non-default settings for greediness */
-
-greedy_default = ((options & PCRE_UNGREEDY) != 0);
-greedy_non_default = greedy_default ^ 1;
-
-/* Initialize no first byte, no required byte. REQ_UNSET means "no char
-matching encountered yet". It gets changed to REQ_NONE if we hit something that
-matches a non-fixed char first char; reqchar just remains unset if we never
-find one.
-
-When we hit a repeat whose minimum is zero, we may have to adjust these values
-to take the zero repeat into account. This is implemented by setting them to
-zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
-item types that can be repeated set these backoff variables appropriately. */
-
-firstchar = reqchar = zerofirstchar = zeroreqchar = 0;
-firstcharflags = reqcharflags = zerofirstcharflags = zeroreqcharflags = REQ_UNSET;
-
-/* The variable req_caseopt contains either the REQ_CASELESS value
-or zero, according to the current setting of the caseless flag. The
-REQ_CASELESS leaves the lower 28 bit empty. It is added into the
-firstchar or reqchar variables to record the case status of the
-value. This is used only for ASCII characters. */
-
-req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
-
-/* Switch on next character until the end of the branch */
-
-for (;; ptr++)
-  {
-  BOOL negate_class;
-  BOOL should_flip_negation;
-  BOOL possessive_quantifier;
-  BOOL is_quantifier;
-  BOOL is_recurse;
-  BOOL reset_bracount;
-  int class_has_8bitchar;
-  int class_one_char;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  BOOL xclass_has_prop;
-#endif
-  int newoptions;
-  int recno;
-  int refsign;
-  int skipbytes;
-  pcre_uint32 subreqchar, subfirstchar;
-  pcre_int32 subreqcharflags, subfirstcharflags;
-  int terminator;
-  unsigned int mclength;
-  unsigned int tempbracount;
-  pcre_uint32 ec;
-  pcre_uchar mcbuffer[8];
-
-  /* Get next character in the pattern */
-
-  c = *ptr;
-
-  /* If we are at the end of a nested substitution, revert to the outer level
-  string. Nesting only happens one level deep. */
-
-  if (c == CHAR_NULL && nestptr != NULL)
-    {
-    ptr = nestptr;
-    nestptr = NULL;
-    c = *ptr;
-    }
-
-  /* If we are in the pre-compile phase, accumulate the length used for the
-  previous cycle of this loop. */
-
-  if (lengthptr != NULL)
-    {
-#ifdef PCRE_DEBUG
-    if (code > cd->hwm) cd->hwm = code;                 /* High water info */
-#endif
-    if (code > cd->start_workspace + cd->workspace_size -
-        WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
-      {
-      *errorcodeptr = ERR52;
-      goto FAILED;
-      }
-
-    /* There is at least one situation where code goes backwards: this is the
-    case of a zero quantifier after a class (e.g. [ab]{0}). At compile time,
-    the class is simply eliminated. However, it is created first, so we have to
-    allow memory for it. Therefore, don't ever reduce the length at this point.
-    */
-
-    if (code < last_code) code = last_code;
-
-    /* Paranoid check for integer overflow */
-
-    if (OFLOW_MAX - *lengthptr < code - last_code)
-      {
-      *errorcodeptr = ERR20;
-      goto FAILED;
-      }
-
-    *lengthptr += (int)(code - last_code);
-    DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
-      (int)(code - last_code), c, c));
-
-    /* If "previous" is set and it is not at the start of the work space, move
-    it back to there, in order to avoid filling up the work space. Otherwise,
-    if "previous" is NULL, reset the current code pointer to the start. */
-
-    if (previous != NULL)
-      {
-      if (previous > orig_code)
-        {
-        memmove(orig_code, previous, IN_UCHARS(code - previous));
-        code -= previous - orig_code;
-        previous = orig_code;
-        }
-      }
-    else code = orig_code;
-
-    /* Remember where this code item starts so we can pick up the length
-    next time round. */
-
-    last_code = code;
-    }
-
-  /* In the real compile phase, just check the workspace used by the forward
-  reference list. */
-
-  else if (cd->hwm > cd->start_workspace + cd->workspace_size)
-    {
-    *errorcodeptr = ERR52;
-    goto FAILED;
-    }
-
-  /* If in \Q...\E, check for the end; if not, we have a literal */
-
-  if (inescq && c != CHAR_NULL)
-    {
-    if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
-      {
-      inescq = FALSE;
-      ptr++;
-      continue;
-      }
-    else
-      {
-      if (previous_callout != NULL)
-        {
-        if (lengthptr == NULL)  /* Don't attempt in pre-compile phase */
-          complete_callout(previous_callout, ptr, cd);
-        previous_callout = NULL;
-        }
-      if ((options & PCRE_AUTO_CALLOUT) != 0)
-        {
-        previous_callout = code;
-        code = auto_callout(code, ptr, cd);
-        }
-      goto NORMAL_CHAR;
-      }
-    /* Control does not reach here. */
-    }
-
-  /* In extended mode, skip white space and comments. We need a loop in order
-  to check for more white space and more comments after a comment. */
-
-  if ((options & PCRE_EXTENDED) != 0)
-    {
-    for (;;)
-      {
-      while (MAX_255(c) && (cd->ctypes[c] & ctype_space) != 0) c = *(++ptr);
-      if (c != CHAR_NUMBER_SIGN) break;
-      ptr++;
-      while (*ptr != CHAR_NULL)
-        {
-        if (IS_NEWLINE(ptr))         /* For non-fixed-length newline cases, */
-          {                          /* IS_NEWLINE sets cd->nllen. */
-          ptr += cd->nllen;
-          break;
-          }
-        ptr++;
-#ifdef SUPPORT_UTF
-        if (utf) FORWARDCHAR(ptr);
-#endif
-        }
-      c = *ptr;     /* Either NULL or the char after a newline */
-      }
-    }
-
-  /* See if the next thing is a quantifier. */
-
-  is_quantifier =
-    c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
-    (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
-
-  /* Fill in length of a previous callout, except when the next thing is a
-  quantifier or when processing a property substitution string in UCP mode. */
-
-  if (!is_quantifier && previous_callout != NULL && nestptr == NULL &&
-       after_manual_callout-- <= 0)
-    {
-    if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */
-      complete_callout(previous_callout, ptr, cd);
-    previous_callout = NULL;
-    }
-
-  /* Create auto callout, except for quantifiers, or while processing property
-  strings that are substituted for \w etc in UCP mode. */
-
-  if ((options & PCRE_AUTO_CALLOUT) != 0 && !is_quantifier && nestptr == NULL)
-    {
-    previous_callout = code;
-    code = auto_callout(code, ptr, cd);
-    }
-
-  /* Process the next pattern item. */
-
-  switch(c)
-    {
-    /* ===================================================================*/
-    case CHAR_NULL:                /* The branch terminates at string end */
-    case CHAR_VERTICAL_LINE:       /* or | or ) */
-    case CHAR_RIGHT_PARENTHESIS:
-    *firstcharptr = firstchar;
-    *firstcharflagsptr = firstcharflags;
-    *reqcharptr = reqchar;
-    *reqcharflagsptr = reqcharflags;
-    *codeptr = code;
-    *ptrptr = ptr;
-    if (lengthptr != NULL)
-      {
-      if (OFLOW_MAX - *lengthptr < code - last_code)
-        {
-        *errorcodeptr = ERR20;
-        goto FAILED;
-        }
-      *lengthptr += (int)(code - last_code);   /* To include callout length */
-      DPRINTF((">> end branch\n"));
-      }
-    return TRUE;
-
-
-    /* ===================================================================*/
-    /* Handle single-character metacharacters. In multiline mode, ^ disables
-    the setting of any following char as a first character. */
-
-    case CHAR_CIRCUMFLEX_ACCENT:
-    previous = NULL;
-    if ((options & PCRE_MULTILINE) != 0)
-      {
-      if (firstcharflags == REQ_UNSET)
-        zerofirstcharflags = firstcharflags = REQ_NONE;
-      *code++ = OP_CIRCM;
-      }
-    else *code++ = OP_CIRC;
-    break;
-
-    case CHAR_DOLLAR_SIGN:
-    previous = NULL;
-    *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
-    break;
-
-    /* There can never be a first char if '.' is first, whatever happens about
-    repeats. The value of reqchar doesn't change either. */
-
-    case CHAR_DOT:
-    if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-    zerofirstchar = firstchar;
-    zerofirstcharflags = firstcharflags;
-    zeroreqchar = reqchar;
-    zeroreqcharflags = reqcharflags;
-    previous = code;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-    *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
-    break;
-
-
-    /* ===================================================================*/
-    /* Character classes. If the included characters are all < 256, we build a
-    32-byte bitmap of the permitted characters, except in the special case
-    where there is only one such character. For negated classes, we build the
-    map as usual, then invert it at the end. However, we use a different opcode
-    so that data characters > 255 can be handled correctly.
-
-    If the class contains characters outside the 0-255 range, a different
-    opcode is compiled. It may optionally have a bit map for characters < 256,
-    but those above are are explicitly listed afterwards. A flag byte tells
-    whether the bitmap is present, and whether this is a negated class or not.
-
-    In JavaScript compatibility mode, an isolated ']' causes an error. In
-    default (Perl) mode, it is treated as a data character. */
-
-    case CHAR_RIGHT_SQUARE_BRACKET:
-    if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      *errorcodeptr = ERR64;
-      goto FAILED;
-      }
-    goto NORMAL_CHAR;
-
-    /* In another (POSIX) regex library, the ugly syntax [[:<:]] and [[:>:]] is
-    used for "start of word" and "end of word". As these are otherwise illegal
-    sequences, we don't break anything by recognizing them. They are replaced
-    by \b(?=\w) and \b(?<=\w) respectively. Sequences like [a[:<:]] are
-    erroneous and are handled by the normal code below. */
-
-    case CHAR_LEFT_SQUARE_BRACKET:
-    if (STRNCMP_UC_C8(ptr+1, STRING_WEIRD_STARTWORD, 6) == 0)
-      {
-      nestptr = ptr + 7;
-      ptr = sub_start_of_word - 1;
-      continue;
-      }
-
-    if (STRNCMP_UC_C8(ptr+1, STRING_WEIRD_ENDWORD, 6) == 0)
-      {
-      nestptr = ptr + 7;
-      ptr = sub_end_of_word - 1;
-      continue;
-      }
-
-    /* Handle a real character class. */
-
-    previous = code;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-
-    /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
-    they are encountered at the top level, so we'll do that too. */
-
-    if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-         ptr[1] == CHAR_EQUALS_SIGN) &&
-        check_posix_syntax(ptr, &tempptr))
-      {
-      *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
-      goto FAILED;
-      }
-
-    /* If the first character is '^', set the negation flag and skip it. Also,
-    if the first few characters (either before or after ^) are \Q\E or \E we
-    skip them too. This makes for compatibility with Perl. */
-
-    negate_class = FALSE;
-    for (;;)
-      {
-      c = *(++ptr);
-      if (c == CHAR_BACKSLASH)
-        {
-        if (ptr[1] == CHAR_E)
-          ptr++;
-        else if (STRNCMP_UC_C8(ptr + 1, STR_Q STR_BACKSLASH STR_E, 3) == 0)
-          ptr += 3;
-        else
-          break;
-        }
-      else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
-        negate_class = TRUE;
-      else break;
-      }
-
-    /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
-    an initial ']' is taken as a data character -- the code below handles
-    that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
-    [^] must match any character, so generate OP_ALLANY. */
-
-    if (c == CHAR_RIGHT_SQUARE_BRACKET &&
-        (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      *code++ = negate_class? OP_ALLANY : OP_FAIL;
-      if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-      zerofirstchar = firstchar;
-      zerofirstcharflags = firstcharflags;
-      break;
-      }
-
-    /* If a class contains a negative special such as \S, we need to flip the
-    negation flag at the end, so that support for characters > 255 works
-    correctly (they are all included in the class). */
-
-    should_flip_negation = FALSE;
-
-    /* Extended class (xclass) will be used when characters > 255
-    might match. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    xclass = FALSE;
-    class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
-    class_uchardata_base = class_uchardata;   /* Save the start */
-#endif
-
-    /* For optimization purposes, we track some properties of the class:
-    class_has_8bitchar will be non-zero if the class contains at least one <
-    256 character; class_one_char will be 1 if the class contains just one
-    character; xclass_has_prop will be TRUE if unicode property checks
-    are present in the class. */
-
-    class_has_8bitchar = 0;
-    class_one_char = 0;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    xclass_has_prop = FALSE;
-#endif
-
-    /* Initialize the 32-char bit map to all zeros. We build the map in a
-    temporary bit of memory, in case the class contains fewer than two
-    8-bit characters because in that case the compiled code doesn't use the bit
-    map. */
-
-    memset(classbits, 0, 32 * sizeof(pcre_uint8));
-
-    /* Process characters until ] is reached. By writing this as a "do" it
-    means that an initial ] is taken as a data character. At the start of the
-    loop, c contains the first byte of the character. */
-
-    if (c != CHAR_NULL) do
-      {
-      const pcre_uchar *oldptr;
-
-#ifdef SUPPORT_UTF
-      if (utf && HAS_EXTRALEN(c))
-        {                           /* Braces are required because the */
-        GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
-        }
-#endif
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      /* In the pre-compile phase, accumulate the length of any extra
-      data and reset the pointer. This is so that very large classes that
-      contain a zillion > 255 characters no longer overwrite the work space
-      (which is on the stack). We have to remember that there was XCLASS data,
-      however. */
-
-      if (class_uchardata > class_uchardata_base) xclass = TRUE;
-
-      if (lengthptr != NULL && class_uchardata > class_uchardata_base)
-        {
-        *lengthptr += (int)(class_uchardata - class_uchardata_base);
-        class_uchardata = class_uchardata_base;
-        }
-#endif
-
-      /* Inside \Q...\E everything is literal except \E */
-
-      if (inescq)
-        {
-        if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
-          {
-          inescq = FALSE;                   /* Reset literal state */
-          ptr++;                            /* Skip the 'E' */
-          continue;                         /* Carry on with next */
-          }
-        goto CHECK_RANGE;                   /* Could be range if \E follows */
-        }
-
-      /* Handle POSIX class names. Perl allows a negation extension of the
-      form [:^name:]. A square bracket that doesn't match the syntax is
-      treated as a literal. We also recognize the POSIX constructions
-      [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
-      5.6 and 5.8 do. */
-
-      if (c == CHAR_LEFT_SQUARE_BRACKET &&
-          (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-           ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
-        {
-        BOOL local_negate = FALSE;
-        int posix_class, taboffset, tabopt;
-        register const pcre_uint8 *cbits = cd->cbits;
-        pcre_uint8 pbits[32];
-
-        if (ptr[1] != CHAR_COLON)
-          {
-          *errorcodeptr = ERR31;
-          goto FAILED;
-          }
-
-        ptr += 2;
-        if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
-          {
-          local_negate = TRUE;
-          should_flip_negation = TRUE;  /* Note negative special */
-          ptr++;
-          }
-
-        posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
-        if (posix_class < 0)
-          {
-          *errorcodeptr = ERR30;
-          goto FAILED;
-          }
-
-        /* If matching is caseless, upper and lower are converted to
-        alpha. This relies on the fact that the class table starts with
-        alpha, lower, upper as the first 3 entries. */
-
-        if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
-          posix_class = 0;
-
-        /* When PCRE_UCP is set, some of the POSIX classes are converted to
-        different escape sequences that use Unicode properties \p or \P. Others
-        that are not available via \p or \P generate XCL_PROP/XCL_NOTPROP
-        directly. */
-
-#ifdef SUPPORT_UCP
-        if ((options & PCRE_UCP) != 0)
-          {
-          unsigned int ptype = 0;
-          int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
-
-          /* The posix_substitutes table specifies which POSIX classes can be
-          converted to \p or \P items. */
-
-          if (posix_substitutes[pc] != NULL)
-            {
-            nestptr = tempptr + 1;
-            ptr = posix_substitutes[pc] - 1;
-            continue;
-            }
-
-          /* There are three other classes that generate special property calls
-          that are recognized only in an XCLASS. */
-
-          else switch(posix_class)
-            {
-            case PC_GRAPH:
-            ptype = PT_PXGRAPH;
-            /* Fall through */
-            case PC_PRINT:
-            if (ptype == 0) ptype = PT_PXPRINT;
-            /* Fall through */
-            case PC_PUNCT:
-            if (ptype == 0) ptype = PT_PXPUNCT;
-            *class_uchardata++ = local_negate? XCL_NOTPROP : XCL_PROP;
-            *class_uchardata++ = ptype;
-            *class_uchardata++ = 0;
-            xclass_has_prop = TRUE;
-            ptr = tempptr + 1;
-            continue;
-
-            /* For the other POSIX classes (ascii, xdigit) we are going to fall
-            through to the non-UCP case and build a bit map for characters with
-            code points less than 256. If we are in a negated POSIX class
-            within a non-negated overall class, characters with code points
-            greater than 255 must all match. In the special case where we have
-            not yet generated any xclass data, and this is the final item in
-            the overall class, we need do nothing: later on, the opcode
-            OP_NCLASS will be used to indicate that characters greater than 255
-            are acceptable. If we have already seen an xclass item or one may
-            follow (we have to assume that it might if this is not the end of
-            the class), explicitly match all wide codepoints. */
-
-            default:
-            if (!negate_class && local_negate &&
-                (xclass || tempptr[2] != CHAR_RIGHT_SQUARE_BRACKET))
-              {
-              *class_uchardata++ = XCL_RANGE;
-              class_uchardata += PRIV(ord2utf)(0x100, class_uchardata);
-              class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
-              }
-            break;
-            }
-          }
-#endif
-        /* In the non-UCP case, or when UCP makes no difference, we build the
-        bit map for the POSIX class in a chunk of local store because we may be
-        adding and subtracting from it, and we don't want to subtract bits that
-        may be in the main map already. At the end we or the result into the
-        bit map that is being built. */
-
-        posix_class *= 3;
-
-        /* Copy in the first table (always present) */
-
-        memcpy(pbits, cbits + posix_class_maps[posix_class],
-          32 * sizeof(pcre_uint8));
-
-        /* If there is a second table, add or remove it as required. */
-
-        taboffset = posix_class_maps[posix_class + 1];
-        tabopt = posix_class_maps[posix_class + 2];
-
-        if (taboffset >= 0)
-          {
-          if (tabopt >= 0)
-            for (c = 0; c < 32; c++) pbits[c] |= cbits[c + taboffset];
-          else
-            for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];
-          }
-
-        /* Now see if we need to remove any special characters. An option
-        value of 1 removes vertical space and 2 removes underscore. */
-
-        if (tabopt < 0) tabopt = -tabopt;
-        if (tabopt == 1) pbits[1] &= ~0x3c;
-          else if (tabopt == 2) pbits[11] &= 0x7f;
-
-        /* Add the POSIX table or its complement into the main table that is
-        being built and we are done. */
-
-        if (local_negate)
-          for (c = 0; c < 32; c++) classbits[c] |= ~pbits[c];
-        else
-          for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
-
-        ptr = tempptr + 1;
-        /* Every class contains at least one < 256 character. */
-        class_has_8bitchar = 1;
-        /* Every class contains at least two characters. */
-        class_one_char = 2;
-        continue;    /* End of POSIX syntax handling */
-        }
-
-      /* Backslash may introduce a single character, or it may introduce one
-      of the specials, which just set a flag. The sequence \b is a special
-      case. Inside a class (and only there) it is treated as backspace. We
-      assume that other escapes have more than one character in them, so
-      speculatively set both class_has_8bitchar and class_one_char bigger
-      than one. Unrecognized escapes fall through and are either treated
-      as literal characters (by default), or are faulted if
-      PCRE_EXTRA is set. */
-
-      if (c == CHAR_BACKSLASH)
-        {
-        escape = check_escape(&ptr, &ec, errorcodeptr, cd->bracount, options,
-          TRUE);
-        if (*errorcodeptr != 0) goto FAILED;
-        if (escape == 0) c = ec;
-        else if (escape == ESC_b) c = CHAR_BS; /* \b is backspace in a class */
-        else if (escape == ESC_N)          /* \N is not supported in a class */
-          {
-          *errorcodeptr = ERR71;
-          goto FAILED;
-          }
-        else if (escape == ESC_Q)            /* Handle start of quoted string */
-          {
-          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-            {
-            ptr += 2; /* avoid empty string */
-            }
-          else inescq = TRUE;
-          continue;
-          }
-        else if (escape == ESC_E) continue;  /* Ignore orphan \E */
-
-        else
-          {
-          register const pcre_uint8 *cbits = cd->cbits;
-          /* Every class contains at least two < 256 characters. */
-          class_has_8bitchar++;
-          /* Every class contains at least two characters. */
-          class_one_char += 2;
-
-          switch (escape)
-            {
-#ifdef SUPPORT_UCP
-            case ESC_du:     /* These are the values given for \d etc */
-            case ESC_DU:     /* when PCRE_UCP is set. We replace the */
-            case ESC_wu:     /* escape sequence with an appropriate \p */
-            case ESC_WU:     /* or \P to test Unicode properties instead */
-            case ESC_su:     /* of the default ASCII testing. */
-            case ESC_SU:
-            nestptr = ptr;
-            ptr = substitutes[escape - ESC_DU] - 1;  /* Just before substitute */
-            class_has_8bitchar--;                /* Undo! */
-            continue;
-#endif
-            case ESC_d:
-            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
-            continue;
-
-            case ESC_D:
-            should_flip_negation = TRUE;
-            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
-            continue;
-
-            case ESC_w:
-            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_word];
-            continue;
-
-            case ESC_W:
-            should_flip_negation = TRUE;
-            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
-            continue;
-
-            /* Perl 5.004 onwards omitted VT from \s, but restored it at Perl
-            5.18. Before PCRE 8.34, we had to preserve the VT bit if it was
-            previously set by something earlier in the character class.
-            Luckily, the value of CHAR_VT is 0x0b in both ASCII and EBCDIC, so
-            we could just adjust the appropriate bit. From PCRE 8.34 we no
-            longer treat \s and \S specially. */
-
-            case ESC_s:
-            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
-            continue;
-
-            case ESC_S:
-            should_flip_negation = TRUE;
-            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
-            continue;
-
-            /* The rest apply in both UCP and non-UCP cases. */
-
-            case ESC_h:
-            (void)add_list_to_class(classbits, &class_uchardata, options, cd,
-              PRIV(hspace_list), NOTACHAR);
-            continue;
-
-            case ESC_H:
-            (void)add_not_list_to_class(classbits, &class_uchardata, options,
-              cd, PRIV(hspace_list));
-            continue;
-
-            case ESC_v:
-            (void)add_list_to_class(classbits, &class_uchardata, options, cd,
-              PRIV(vspace_list), NOTACHAR);
-            continue;
-
-            case ESC_V:
-            (void)add_not_list_to_class(classbits, &class_uchardata, options,
-              cd, PRIV(vspace_list));
-            continue;
-
-            case ESC_p:
-            case ESC_P:
-#ifdef SUPPORT_UCP
-              {
-              BOOL negated;
-              unsigned int ptype = 0, pdata = 0;
-              if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
-                goto FAILED;
-              *class_uchardata++ = ((escape == ESC_p) != negated)?
-                XCL_PROP : XCL_NOTPROP;
-              *class_uchardata++ = ptype;
-              *class_uchardata++ = pdata;
-              xclass_has_prop = TRUE;
-              class_has_8bitchar--;                /* Undo! */
-              continue;
-              }
-#else
-            *errorcodeptr = ERR45;
-            goto FAILED;
-#endif
-            /* Unrecognized escapes are faulted if PCRE is running in its
-            strict mode. By default, for compatibility with Perl, they are
-            treated as literals. */
-
-            default:
-            if ((options & PCRE_EXTRA) != 0)
-              {
-              *errorcodeptr = ERR7;
-              goto FAILED;
-              }
-            class_has_8bitchar--;    /* Undo the speculative increase. */
-            class_one_char -= 2;     /* Undo the speculative increase. */
-            c = *ptr;                /* Get the final character and fall through */
-            break;
-            }
-          }
-
-        /* Fall through if the escape just defined a single character (c >= 0).
-        This may be greater than 256. */
-
-        escape = 0;
-
-        }   /* End of backslash handling */
-
-      /* A character may be followed by '-' to form a range. However, Perl does
-      not permit ']' to be the end of the range. A '-' character at the end is
-      treated as a literal. Perl ignores orphaned \E sequences entirely. The
-      code for handling \Q and \E is messy. */
-
-      CHECK_RANGE:
-      while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-        {
-        inescq = FALSE;
-        ptr += 2;
-        }
-      oldptr = ptr;
-
-      /* Remember if \r or \n were explicitly used */
-
-      if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
-
-      /* Check for range */
-
-      if (!inescq && ptr[1] == CHAR_MINUS)
-        {
-        pcre_uint32 d;
-        ptr += 2;
-        while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
-
-        /* If we hit \Q (not followed by \E) at this point, go into escaped
-        mode. */
-
-        while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
-          {
-          ptr += 2;
-          if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
-            { ptr += 2; continue; }
-          inescq = TRUE;
-          break;
-          }
-
-        /* Minus (hyphen) at the end of a class is treated as a literal, so put
-        back the pointer and jump to handle the character that preceded it. */
-
-        if (*ptr == CHAR_NULL || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
-          {
-          ptr = oldptr;
-          goto CLASS_SINGLE_CHARACTER;
-          }
-
-        /* Otherwise, we have a potential range; pick up the next character */
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {                           /* Braces are required because the */
-          GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
-          }
-        else
-#endif
-        d = *ptr;  /* Not UTF-8 mode */
-
-        /* The second part of a range can be a single-character escape
-        sequence, but not any of the other escapes. Perl treats a hyphen as a
-        literal in such circumstances. However, in Perl's warning mode, a
-        warning is given, so PCRE now faults it as it is almost certainly a
-        mistake on the user's part. */
-
-        if (!inescq)
-          {
-          if (d == CHAR_BACKSLASH)
-            {
-            int descape;
-            descape = check_escape(&ptr, &d, errorcodeptr, cd->bracount, options, TRUE);
-            if (*errorcodeptr != 0) goto FAILED;
-
-            /* 0 means a character was put into d; \b is backspace; any other
-            special causes an error. */
-
-            if (descape != 0)
-              {
-              if (descape == ESC_b) d = CHAR_BS; else
-                {
-                *errorcodeptr = ERR83;
-                goto FAILED;
-                }
-              }
-            }
-
-          /* A hyphen followed by a POSIX class is treated in the same way. */
-
-          else if (d == CHAR_LEFT_SQUARE_BRACKET &&
-                   (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-                    ptr[1] == CHAR_EQUALS_SIGN) &&
-                   check_posix_syntax(ptr, &tempptr))
-            {
-            *errorcodeptr = ERR83;
-            goto FAILED;
-            }
-          }
-
-        /* Check that the two values are in the correct order. Optimize
-        one-character ranges. */
-
-        if (d < c)
-          {
-          *errorcodeptr = ERR8;
-          goto FAILED;
-          }
-        if (d == c) goto CLASS_SINGLE_CHARACTER;  /* A few lines below */
-
-        /* We have found a character range, so single character optimizations
-        cannot be done anymore. Any value greater than 1 indicates that there
-        is more than one character. */
-
-        class_one_char = 2;
-
-        /* Remember an explicit \r or \n, and add the range to the class. */
-
-        if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
-
-        class_has_8bitchar +=
-          add_to_class(classbits, &class_uchardata, options, cd, c, d);
-
-        continue;   /* Go get the next char in the class */
-        }
-
-      /* Handle a single character - we can get here for a normal non-escape
-      char, or after \ that introduces a single character or for an apparent
-      range that isn't. Only the value 1 matters for class_one_char, so don't
-      increase it if it is already 2 or more ... just in case there's a class
-      with a zillion characters in it. */
-
-      CLASS_SINGLE_CHARACTER:
-      if (class_one_char < 2) class_one_char++;
-
-      /* If xclass_has_prop is false and class_one_char is 1, we have the first
-      single character in the class, and there have been no prior ranges, or
-      XCLASS items generated by escapes. If this is the final character in the
-      class, we can optimize by turning the item into a 1-character OP_CHAR[I]
-      if it's positive, or OP_NOT[I] if it's negative. In the positive case, it
-      can cause firstchar to be set. Otherwise, there can be no first char if
-      this item is first, whatever repeat count may follow. In the case of
-      reqchar, save the previous value for reinstating. */
-
-      if (!inescq &&
-#ifdef SUPPORT_UCP
-          !xclass_has_prop &&
-#endif
-          class_one_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
-        {
-        ptr++;
-        zeroreqchar = reqchar;
-        zeroreqcharflags = reqcharflags;
-
-        if (negate_class)
-          {
-#ifdef SUPPORT_UCP
-          int d;
-#endif
-          if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-          zerofirstchar = firstchar;
-          zerofirstcharflags = firstcharflags;
-
-          /* For caseless UTF-8 mode when UCP support is available, check
-          whether this character has more than one other case. If so, generate
-          a special OP_NOTPROP item instead of OP_NOTI. */
-
-#ifdef SUPPORT_UCP
-          if (utf && (options & PCRE_CASELESS) != 0 &&
-              (d = UCD_CASESET(c)) != 0)
-            {
-            *code++ = OP_NOTPROP;
-            *code++ = PT_CLIST;
-            *code++ = d;
-            }
-          else
-#endif
-          /* Char has only one other case, or UCP not available */
-
-            {
-            *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-            if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
-              code += PRIV(ord2utf)(c, code);
-            else
-#endif
-              *code++ = c;
-            }
-
-          /* We are finished with this character class */
-
-          goto END_CLASS;
-          }
-
-        /* For a single, positive character, get the value into mcbuffer, and
-        then we can handle this with the normal one-character code. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-        if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
-          mclength = PRIV(ord2utf)(c, mcbuffer);
-        else
-#endif
-          {
-          mcbuffer[0] = c;
-          mclength = 1;
-          }
-        goto ONE_CHAR;
-        }       /* End of 1-char optimization */
-
-      /* There is more than one character in the class, or an XCLASS item
-      has been generated. Add this character to the class. */
-
-      class_has_8bitchar +=
-        add_to_class(classbits, &class_uchardata, options, cd, c, c);
-      }
-
-    /* Loop until ']' reached. This "while" is the end of the "do" far above.
-    If we are at the end of an internal nested string, revert to the outer
-    string. */
-
-    while (((c = *(++ptr)) != CHAR_NULL ||
-           (nestptr != NULL &&
-             (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != CHAR_NULL)) &&
-           (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
-
-    /* Check for missing terminating ']' */
-
-    if (c == CHAR_NULL)
-      {
-      *errorcodeptr = ERR6;
-      goto FAILED;
-      }
-
-    /* We will need an XCLASS if data has been placed in class_uchardata. In
-    the second phase this is a sufficient test. However, in the pre-compile
-    phase, class_uchardata gets emptied to prevent workspace overflow, so it
-    only if the very last character in the class needs XCLASS will it contain
-    anything at this point. For this reason, xclass gets set TRUE above when
-    uchar_classdata is emptied, and that's why this code is the way it is here
-    instead of just doing a test on class_uchardata below. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    if (class_uchardata > class_uchardata_base) xclass = TRUE;
-#endif
-
-    /* If this is the first thing in the branch, there can be no first char
-    setting, whatever the repeat count. Any reqchar setting must remain
-    unchanged after any kind of repeat. */
-
-    if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-    zerofirstchar = firstchar;
-    zerofirstcharflags = firstcharflags;
-    zeroreqchar = reqchar;
-    zeroreqcharflags = reqcharflags;
-
-    /* If there are characters with values > 255, we have to compile an
-    extended class, with its own opcode, unless there was a negated special
-    such as \S in the class, and PCRE_UCP is not set, because in that case all
-    characters > 255 are in the class, so any that were explicitly given as
-    well can be ignored. If (when there are explicit characters > 255 that must
-    be listed) there are no characters < 256, we can omit the bitmap in the
-    actual compiled code. */
-
-#ifdef SUPPORT_UTF
-    if (xclass && (xclass_has_prop || !should_flip_negation ||
-        (options & PCRE_UCP) != 0))
-#elif !defined COMPILE_PCRE8
-    if (xclass && (xclass_has_prop || !should_flip_negation))
-#endif
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      {
-      *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
-      *code++ = OP_XCLASS;
-      code += LINK_SIZE;
-      *code = negate_class? XCL_NOT:0;
-      if (xclass_has_prop) *code |= XCL_HASPROP;
-
-      /* If the map is required, move up the extra data to make room for it;
-      otherwise just move the code pointer to the end of the extra data. */
-
-      if (class_has_8bitchar > 0)
-        {
-        *code++ |= XCL_MAP;
-        memmove(code + (32 / sizeof(pcre_uchar)), code,
-          IN_UCHARS(class_uchardata - code));
-        if (negate_class && !xclass_has_prop)
-          for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
-        memcpy(code, classbits, 32);
-        code = class_uchardata + (32 / sizeof(pcre_uchar));
-        }
-      else code = class_uchardata;
-
-      /* Now fill in the complete length of the item */
-
-      PUT(previous, 1, (int)(code - previous));
-      break;   /* End of class handling */
-      }
-
-    /* Even though any XCLASS list is now discarded, we must allow for
-    its memory. */
-
-    if (lengthptr != NULL)
-      *lengthptr += (int)(class_uchardata - class_uchardata_base);
-#endif
-
-    /* If there are no characters > 255, or they are all to be included or
-    excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
-    whole class was negated and whether there were negative specials such as \S
-    (non-UCP) in the class. Then copy the 32-byte map into the code vector,
-    negating it if necessary. */
-
-    *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
-    if (lengthptr == NULL)    /* Save time in the pre-compile phase */
-      {
-      if (negate_class)
-        for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
-      memcpy(code, classbits, 32);
-      }
-    code += 32 / sizeof(pcre_uchar);
-
-    END_CLASS:
-    break;
-
-
-    /* ===================================================================*/
-    /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
-    has been tested above. */
-
-    case CHAR_LEFT_CURLY_BRACKET:
-    if (!is_quantifier) goto NORMAL_CHAR;
-    ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
-    if (*errorcodeptr != 0) goto FAILED;
-    goto REPEAT;
-
-    case CHAR_ASTERISK:
-    repeat_min = 0;
-    repeat_max = -1;
-    goto REPEAT;
-
-    case CHAR_PLUS:
-    repeat_min = 1;
-    repeat_max = -1;
-    goto REPEAT;
-
-    case CHAR_QUESTION_MARK:
-    repeat_min = 0;
-    repeat_max = 1;
-
-    REPEAT:
-    if (previous == NULL)
-      {
-      *errorcodeptr = ERR9;
-      goto FAILED;
-      }
-
-    if (repeat_min == 0)
-      {
-      firstchar = zerofirstchar;    /* Adjust for zero repeat */
-      firstcharflags = zerofirstcharflags;
-      reqchar = zeroreqchar;        /* Ditto */
-      reqcharflags = zeroreqcharflags;
-      }
-
-    /* Remember whether this is a variable length repeat */
-
-    reqvary = (repeat_min == repeat_max)? 0 : REQ_VARY;
-
-    op_type = 0;                    /* Default single-char op codes */
-    possessive_quantifier = FALSE;  /* Default not possessive quantifier */
-
-    /* Save start of previous item, in case we have to move it up in order to
-    insert something before it. */
-
-    tempcode = previous;
-
-    /* Before checking for a possessive quantifier, we must skip over
-    whitespace and comments in extended mode because Perl allows white space at
-    this point. */
-
-    if ((options & PCRE_EXTENDED) != 0)
-      {
-      const pcre_uchar *p = ptr + 1;
-      for (;;)
-        {
-        while (MAX_255(*p) && (cd->ctypes[*p] & ctype_space) != 0) p++;
-        if (*p != CHAR_NUMBER_SIGN) break;
-        p++;
-        while (*p != CHAR_NULL)
-          {
-          if (IS_NEWLINE(p))         /* For non-fixed-length newline cases, */
-            {                        /* IS_NEWLINE sets cd->nllen. */
-            p += cd->nllen;
-            break;
-            }
-          p++;
-#ifdef SUPPORT_UTF
-          if (utf) FORWARDCHAR(p);
-#endif
-          }           /* Loop for comment characters */
-        }             /* Loop for multiple comments */
-      ptr = p - 1;    /* Character before the next significant one. */
-      }
-
-    /* If the next character is '+', we have a possessive quantifier. This
-    implies greediness, whatever the setting of the PCRE_UNGREEDY option.
-    If the next character is '?' this is a minimizing repeat, by default,
-    but if PCRE_UNGREEDY is set, it works the other way round. We change the
-    repeat type to the non-default. */
-
-    if (ptr[1] == CHAR_PLUS)
-      {
-      repeat_type = 0;                  /* Force greedy */
-      possessive_quantifier = TRUE;
-      ptr++;
-      }
-    else if (ptr[1] == CHAR_QUESTION_MARK)
-      {
-      repeat_type = greedy_non_default;
-      ptr++;
-      }
-    else repeat_type = greedy_default;
-
-    /* If previous was a recursion call, wrap it in atomic brackets so that
-    previous becomes the atomic group. All recursions were so wrapped in the
-    past, but it no longer happens for non-repeated recursions. In fact, the
-    repeated ones could be re-implemented independently so as not to need this,
-    but for the moment we rely on the code for repeating groups. */
-
-    if (*previous == OP_RECURSE)
-      {
-      memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
-      *previous = OP_ONCE;
-      PUT(previous, 1, 2 + 2*LINK_SIZE);
-      previous[2 + 2*LINK_SIZE] = OP_KET;
-      PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
-      code += 2 + 2 * LINK_SIZE;
-      length_prevgroup = 3 + 3*LINK_SIZE;
-
-      /* When actually compiling, we need to check whether this was a forward
-      reference, and if so, adjust the offset. */
-
-      if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
-        {
-        int offset = GET(cd->hwm, -LINK_SIZE);
-        if (offset == previous + 1 - cd->start_code)
-          PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
-        }
-      }
-
-    /* Now handle repetition for the different types of item. */
-
-    /* If previous was a character or negated character match, abolish the item
-    and generate a repeat item instead. If a char item has a minimum of more
-    than one, ensure that it is set in reqchar - it might not be if a sequence
-    such as x{3} is the first thing in a branch because the x will have gone
-    into firstchar instead.  */
-
-    if (*previous == OP_CHAR || *previous == OP_CHARI
-        || *previous == OP_NOT || *previous == OP_NOTI)
-      {
-      switch (*previous)
-        {
-        default: /* Make compiler happy. */
-        case OP_CHAR:  op_type = OP_STAR - OP_STAR; break;
-        case OP_CHARI: op_type = OP_STARI - OP_STAR; break;
-        case OP_NOT:   op_type = OP_NOTSTAR - OP_STAR; break;
-        case OP_NOTI:  op_type = OP_NOTSTARI - OP_STAR; break;
-        }
-
-      /* Deal with UTF characters that take up more than one character. It's
-      easier to write this out separately than try to macrify it. Use c to
-      hold the length of the character in bytes, plus UTF_LENGTH to flag that
-      it's a length rather than a small character. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-      if (utf && NOT_FIRSTCHAR(code[-1]))
-        {
-        pcre_uchar *lastchar = code - 1;
-        BACKCHAR(lastchar);
-        c = (int)(code - lastchar);     /* Length of UTF-8 character */
-        memcpy(utf_chars, lastchar, IN_UCHARS(c)); /* Save the char */
-        c |= UTF_LENGTH;                /* Flag c as a length */
-        }
-      else
-#endif /* SUPPORT_UTF */
-
-      /* Handle the case of a single charater - either with no UTF support, or
-      with UTF disabled, or for a single character UTF character. */
-        {
-        c = code[-1];
-        if (*previous <= OP_CHARI && repeat_min > 1)
-          {
-          reqchar = c;
-          reqcharflags = req_caseopt | cd->req_varyopt;
-          }
-        }
-
-      goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
-      }
-
-    /* If previous was a character type match (\d or similar), abolish it and
-    create a suitable repeat item. The code is shared with single-character
-    repeats by setting op_type to add a suitable offset into repeat_type. Note
-    the the Unicode property types will be present only when SUPPORT_UCP is
-    defined, but we don't wrap the little bits of code here because it just
-    makes it horribly messy. */
-
-    else if (*previous < OP_EODN)
-      {
-      pcre_uchar *oldcode;
-      int prop_type, prop_value;
-      op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
-      c = *previous;
-
-      OUTPUT_SINGLE_REPEAT:
-      if (*previous == OP_PROP || *previous == OP_NOTPROP)
-        {
-        prop_type = previous[1];
-        prop_value = previous[2];
-        }
-      else prop_type = prop_value = -1;
-
-      oldcode = code;
-      code = previous;                  /* Usually overwrite previous item */
-
-      /* If the maximum is zero then the minimum must also be zero; Perl allows
-      this case, so we do too - by simply omitting the item altogether. */
-
-      if (repeat_max == 0) goto END_REPEAT;
-
-      /* Combine the op_type with the repeat_type */
-
-      repeat_type += op_type;
-
-      /* A minimum of zero is handled either as the special case * or ?, or as
-      an UPTO, with the maximum given. */
-
-      if (repeat_min == 0)
-        {
-        if (repeat_max == -1) *code++ = OP_STAR + repeat_type;
-          else if (repeat_max == 1) *code++ = OP_QUERY + repeat_type;
-        else
-          {
-          *code++ = OP_UPTO + repeat_type;
-          PUT2INC(code, 0, repeat_max);
-          }
-        }
-
-      /* A repeat minimum of 1 is optimized into some special cases. If the
-      maximum is unlimited, we use OP_PLUS. Otherwise, the original item is
-      left in place and, if the maximum is greater than 1, we use OP_UPTO with
-      one less than the maximum. */
-
-      else if (repeat_min == 1)
-        {
-        if (repeat_max == -1)
-          *code++ = OP_PLUS + repeat_type;
-        else
-          {
-          code = oldcode;                 /* leave previous item in place */
-          if (repeat_max == 1) goto END_REPEAT;
-          *code++ = OP_UPTO + repeat_type;
-          PUT2INC(code, 0, repeat_max - 1);
-          }
-        }
-
-      /* The case {n,n} is just an EXACT, while the general case {n,m} is
-      handled as an EXACT followed by an UPTO. */
-
-      else
-        {
-        *code++ = OP_EXACT + op_type;  /* NB EXACT doesn't have repeat_type */
-        PUT2INC(code, 0, repeat_min);
-
-        /* If the maximum is unlimited, insert an OP_STAR. Before doing so,
-        we have to insert the character for the previous code. For a repeated
-        Unicode property match, there are two extra bytes that define the
-        required property. In UTF-8 mode, long characters have their length in
-        c, with the UTF_LENGTH bit as a flag. */
-
-        if (repeat_max < 0)
-          {
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-          if (utf && (c & UTF_LENGTH) != 0)
-            {
-            memcpy(code, utf_chars, IN_UCHARS(c & 7));
-            code += c & 7;
-            }
-          else
-#endif
-            {
-            *code++ = c;
-            if (prop_type >= 0)
-              {
-              *code++ = prop_type;
-              *code++ = prop_value;
-              }
-            }
-          *code++ = OP_STAR + repeat_type;
-          }
-
-        /* Else insert an UPTO if the max is greater than the min, again
-        preceded by the character, for the previously inserted code. If the
-        UPTO is just for 1 instance, we can use QUERY instead. */
-
-        else if (repeat_max != repeat_min)
-          {
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-          if (utf && (c & UTF_LENGTH) != 0)
-            {
-            memcpy(code, utf_chars, IN_UCHARS(c & 7));
-            code += c & 7;
-            }
-          else
-#endif
-          *code++ = c;
-          if (prop_type >= 0)
-            {
-            *code++ = prop_type;
-            *code++ = prop_value;
-            }
-          repeat_max -= repeat_min;
-
-          if (repeat_max == 1)
-            {
-            *code++ = OP_QUERY + repeat_type;
-            }
-          else
-            {
-            *code++ = OP_UPTO + repeat_type;
-            PUT2INC(code, 0, repeat_max);
-            }
-          }
-        }
-
-      /* The character or character type itself comes last in all cases. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-      if (utf && (c & UTF_LENGTH) != 0)
-        {
-        memcpy(code, utf_chars, IN_UCHARS(c & 7));
-        code += c & 7;
-        }
-      else
-#endif
-      *code++ = c;
-
-      /* For a repeated Unicode property match, there are two extra bytes that
-      define the required property. */
-
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        *code++ = prop_type;
-        *code++ = prop_value;
-        }
-#endif
-      }
-
-    /* If previous was a character class or a back reference, we put the repeat
-    stuff after it, but just skip the item if the repeat was {0,0}. */
-
-    else if (*previous == OP_CLASS || *previous == OP_NCLASS ||
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-             *previous == OP_XCLASS ||
-#endif
-             *previous == OP_REF   || *previous == OP_REFI ||
-             *previous == OP_DNREF || *previous == OP_DNREFI)
-      {
-      if (repeat_max == 0)
-        {
-        code = previous;
-        goto END_REPEAT;
-        }
-
-      if (repeat_min == 0 && repeat_max == -1)
-        *code++ = OP_CRSTAR + repeat_type;
-      else if (repeat_min == 1 && repeat_max == -1)
-        *code++ = OP_CRPLUS + repeat_type;
-      else if (repeat_min == 0 && repeat_max == 1)
-        *code++ = OP_CRQUERY + repeat_type;
-      else
-        {
-        *code++ = OP_CRRANGE + repeat_type;
-        PUT2INC(code, 0, repeat_min);
-        if (repeat_max == -1) repeat_max = 0;  /* 2-byte encoding for max */
-        PUT2INC(code, 0, repeat_max);
-        }
-      }
-
-    /* If previous was a bracket group, we may have to replicate it in certain
-    cases. Note that at this point we can encounter only the "basic" bracket
-    opcodes such as BRA and CBRA, as this is the place where they get converted
-    into the more special varieties such as BRAPOS and SBRA. A test for >=
-    OP_ASSERT and <= OP_COND includes ASSERT, ASSERT_NOT, ASSERTBACK,
-    ASSERTBACK_NOT, ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND.
-    Originally, PCRE did not allow repetition of assertions, but now it does,
-    for Perl compatibility. */
-
-    else if (*previous >= OP_ASSERT && *previous <= OP_COND)
-      {
-      register int i;
-      int len = (int)(code - previous);
-      size_t base_hwm_offset = item_hwm_offset;
-      pcre_uchar *bralink = NULL;
-      pcre_uchar *brazeroptr = NULL;
-
-      /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
-      we just ignore the repeat. */
-
-      if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
-        goto END_REPEAT;
-
-      /* There is no sense in actually repeating assertions. The only potential
-      use of repetition is in cases when the assertion is optional. Therefore,
-      if the minimum is greater than zero, just ignore the repeat. If the
-      maximum is not zero or one, set it to 1. */
-
-      if (*previous < OP_ONCE)    /* Assertion */
-        {
-        if (repeat_min > 0) goto END_REPEAT;
-        if (repeat_max < 0 || repeat_max > 1) repeat_max = 1;
-        }
-
-      /* The case of a zero minimum is special because of the need to stick
-      OP_BRAZERO in front of it, and because the group appears once in the
-      data, whereas in other cases it appears the minimum number of times. For
-      this reason, it is simplest to treat this case separately, as otherwise
-      the code gets far too messy. There are several special subcases when the
-      minimum is zero. */
-
-      if (repeat_min == 0)
-        {
-        /* If the maximum is also zero, we used to just omit the group from the
-        output altogether, like this:
-
-        ** if (repeat_max == 0)
-        **   {
-        **   code = previous;
-        **   goto END_REPEAT;
-        **   }
-
-        However, that fails when a group or a subgroup within it is referenced
-        as a subroutine from elsewhere in the pattern, so now we stick in
-        OP_SKIPZERO in front of it so that it is skipped on execution. As we
-        don't have a list of which groups are referenced, we cannot do this
-        selectively.
-
-        If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
-        and do no more at this point. However, we do need to adjust any
-        OP_RECURSE calls inside the group that refer to the group itself or any
-        internal or forward referenced group, because the offset is from the
-        start of the whole regex. Temporarily terminate the pattern while doing
-        this. */
-
-        if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
-          {
-          *code = OP_END;
-          adjust_recurse(previous, 1, utf, cd, item_hwm_offset);
-          memmove(previous + 1, previous, IN_UCHARS(len));
-          code++;
-          if (repeat_max == 0)
-            {
-            *previous++ = OP_SKIPZERO;
-            goto END_REPEAT;
-            }
-          brazeroptr = previous;    /* Save for possessive optimizing */
-          *previous++ = OP_BRAZERO + repeat_type;
-          }
-
-        /* If the maximum is greater than 1 and limited, we have to replicate
-        in a nested fashion, sticking OP_BRAZERO before each set of brackets.
-        The first one has to be handled carefully because it's the original
-        copy, which has to be moved up. The remainder can be handled by code
-        that is common with the non-zero minimum case below. We have to
-        adjust the value or repeat_max, since one less copy is required. Once
-        again, we may have to adjust any OP_RECURSE calls inside the group. */
-
-        else
-          {
-          int offset;
-          *code = OP_END;
-          adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset);
-          memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
-          code += 2 + LINK_SIZE;
-          *previous++ = OP_BRAZERO + repeat_type;
-          *previous++ = OP_BRA;
-
-          /* We chain together the bracket offset fields that have to be
-          filled in later when the ends of the brackets are reached. */
-
-          offset = (bralink == NULL)? 0 : (int)(previous - bralink);
-          bralink = previous;
-          PUTINC(previous, 0, offset);
-          }
-
-        repeat_max--;
-        }
-
-      /* If the minimum is greater than zero, replicate the group as many
-      times as necessary, and adjust the maximum to the number of subsequent
-      copies that we need. If we set a first char from the group, and didn't
-      set a required char, copy the latter from the former. If there are any
-      forward reference subroutine calls in the group, there will be entries on
-      the workspace list; replicate these with an appropriate increment. */
-
-      else
-        {
-        if (repeat_min > 1)
-          {
-          /* In the pre-compile phase, we don't actually do the replication. We
-          just adjust the length as if we had. Do some paranoid checks for
-          potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
-          integer type when available, otherwise double. */
-
-          if (lengthptr != NULL)
-            {
-            int delta = (repeat_min - 1)*length_prevgroup;
-            if ((INT64_OR_DOUBLE)(repeat_min - 1)*
-                  (INT64_OR_DOUBLE)length_prevgroup >
-                    (INT64_OR_DOUBLE)INT_MAX ||
-                OFLOW_MAX - *lengthptr < delta)
-              {
-              *errorcodeptr = ERR20;
-              goto FAILED;
-              }
-            *lengthptr += delta;
-            }
-
-          /* This is compiling for real. If there is a set first byte for
-          the group, and we have not yet set a "required byte", set it. Make
-          sure there is enough workspace for copying forward references before
-          doing the copy. */
-
-          else
-            {
-            if (groupsetfirstchar && reqcharflags < 0)
-              {
-              reqchar = firstchar;
-              reqcharflags = firstcharflags;
-              }
-
-            for (i = 1; i < repeat_min; i++)
-              {
-              pcre_uchar *hc;
-              size_t this_hwm_offset = cd->hwm - cd->start_workspace;
-              memcpy(code, previous, IN_UCHARS(len));
-
-              while (cd->hwm > cd->start_workspace + cd->workspace_size -
-                     WORK_SIZE_SAFETY_MARGIN -
-                     (this_hwm_offset - base_hwm_offset))
-                {
-                *errorcodeptr = expand_workspace(cd);
-                if (*errorcodeptr != 0) goto FAILED;
-                }
-
-              for (hc = (pcre_uchar *)cd->start_workspace + base_hwm_offset;
-                   hc < (pcre_uchar *)cd->start_workspace + this_hwm_offset;
-                   hc += LINK_SIZE)
-                {
-                PUT(cd->hwm, 0, GET(hc, 0) + len);
-                cd->hwm += LINK_SIZE;
-                }
-              base_hwm_offset = this_hwm_offset;
-              code += len;
-              }
-            }
-          }
-
-        if (repeat_max > 0) repeat_max -= repeat_min;
-        }
-
-      /* This code is common to both the zero and non-zero minimum cases. If
-      the maximum is limited, it replicates the group in a nested fashion,
-      remembering the bracket starts on a stack. In the case of a zero minimum,
-      the first one was set up above. In all cases the repeat_max now specifies
-      the number of additional copies needed. Again, we must remember to
-      replicate entries on the forward reference list. */
-
-      if (repeat_max >= 0)
-        {
-        /* In the pre-compile phase, we don't actually do the replication. We
-        just adjust the length as if we had. For each repetition we must add 1
-        to the length for BRAZERO and for all but the last repetition we must
-        add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
-        paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
-        a 64-bit integer type when available, otherwise double. */
-
-        if (lengthptr != NULL && repeat_max > 0)
-          {
-          int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
-                      2 - 2*LINK_SIZE;   /* Last one doesn't nest */
-          if ((INT64_OR_DOUBLE)repeat_max *
-                (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
-                  > (INT64_OR_DOUBLE)INT_MAX ||
-              OFLOW_MAX - *lengthptr < delta)
-            {
-            *errorcodeptr = ERR20;
-            goto FAILED;
-            }
-          *lengthptr += delta;
-          }
-
-        /* This is compiling for real */
-
-        else for (i = repeat_max - 1; i >= 0; i--)
-          {
-          pcre_uchar *hc;
-          size_t this_hwm_offset = cd->hwm - cd->start_workspace;
-
-          *code++ = OP_BRAZERO + repeat_type;
-
-          /* All but the final copy start a new nesting, maintaining the
-          chain of brackets outstanding. */
-
-          if (i != 0)
-            {
-            int offset;
-            *code++ = OP_BRA;
-            offset = (bralink == NULL)? 0 : (int)(code - bralink);
-            bralink = code;
-            PUTINC(code, 0, offset);
-            }
-
-          memcpy(code, previous, IN_UCHARS(len));
-
-          /* Ensure there is enough workspace for forward references before
-          copying them. */
-
-          while (cd->hwm > cd->start_workspace + cd->workspace_size -
-                 WORK_SIZE_SAFETY_MARGIN -
-                 (this_hwm_offset - base_hwm_offset))
-            {
-            *errorcodeptr = expand_workspace(cd);
-            if (*errorcodeptr != 0) goto FAILED;
-            }
-
-          for (hc = (pcre_uchar *)cd->start_workspace + base_hwm_offset;
-               hc < (pcre_uchar *)cd->start_workspace + this_hwm_offset;
-               hc += LINK_SIZE)
-            {
-            PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
-            cd->hwm += LINK_SIZE;
-            }
-          base_hwm_offset = this_hwm_offset;
-          code += len;
-          }
-
-        /* Now chain through the pending brackets, and fill in their length
-        fields (which are holding the chain links pro tem). */
-
-        while (bralink != NULL)
-          {
-          int oldlinkoffset;
-          int offset = (int)(code - bralink + 1);
-          pcre_uchar *bra = code - offset;
-          oldlinkoffset = GET(bra, 1);
-          bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
-          *code++ = OP_KET;
-          PUTINC(code, 0, offset);
-          PUT(bra, 1, offset);
-          }
-        }
-
-      /* If the maximum is unlimited, set a repeater in the final copy. For
-      ONCE brackets, that's all we need to do. However, possessively repeated
-      ONCE brackets can be converted into non-capturing brackets, as the
-      behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
-      deal with possessive ONCEs specially.
-
-      Otherwise, when we are doing the actual compile phase, check to see
-      whether this group is one that could match an empty string. If so,
-      convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
-      that runtime checking can be done. [This check is also applied to ONCE
-      groups at runtime, but in a different way.]
-
-      Then, if the quantifier was possessive and the bracket is not a
-      conditional, we convert the BRA code to the POS form, and the KET code to
-      KETRPOS. (It turns out to be convenient at runtime to detect this kind of
-      subpattern at both the start and at the end.) The use of special opcodes
-      makes it possible to reduce greatly the stack usage in pcre_exec(). If
-      the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.
-
-      Then, if the minimum number of matches is 1 or 0, cancel the possessive
-      flag so that the default action below, of wrapping everything inside
-      atomic brackets, does not happen. When the minimum is greater than 1,
-      there will be earlier copies of the group, and so we still have to wrap
-      the whole thing. */
-
-      else
-        {
-        pcre_uchar *ketcode = code - 1 - LINK_SIZE;
-        pcre_uchar *bracode = ketcode - GET(ketcode, 1);
-
-        /* Convert possessive ONCE brackets to non-capturing */
-
-        if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
-            possessive_quantifier) *bracode = OP_BRA;
-
-        /* For non-possessive ONCE brackets, all we need to do is to
-        set the KET. */
-
-        if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
-          *ketcode = OP_KETRMAX + repeat_type;
-
-        /* Handle non-ONCE brackets and possessive ONCEs (which have been
-        converted to non-capturing above). */
-
-        else
-          {
-          /* In the compile phase, check for empty string matching. */
-
-          if (lengthptr == NULL)
-            {
-            pcre_uchar *scode = bracode;
-            do
-              {
-              if (could_be_empty_branch(scode, ketcode, utf, cd, NULL))
-                {
-                *bracode += OP_SBRA - OP_BRA;
-                break;
-                }
-              scode += GET(scode, 1);
-              }
-            while (*scode == OP_ALT);
-            }
-
-          /* A conditional group with only one branch has an implicit empty
-          alternative branch. */
-
-          if (*bracode == OP_COND && bracode[GET(bracode,1)] != OP_ALT)
-            *bracode = OP_SCOND;
-
-          /* Handle possessive quantifiers. */
-
-          if (possessive_quantifier)
-            {
-            /* For COND brackets, we wrap the whole thing in a possessively
-            repeated non-capturing bracket, because we have not invented POS
-            versions of the COND opcodes. Because we are moving code along, we
-            must ensure that any pending recursive references are updated. */
-
-            if (*bracode == OP_COND || *bracode == OP_SCOND)
-              {
-              int nlen = (int)(code - bracode);
-              *code = OP_END;
-              adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-              memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
-              code += 1 + LINK_SIZE;
-              nlen += 1 + LINK_SIZE;
-              *bracode = (*bracode == OP_COND)? OP_BRAPOS : OP_SBRAPOS;
-              *code++ = OP_KETRPOS;
-              PUTINC(code, 0, nlen);
-              PUT(bracode, 1, nlen);
-              }
-
-            /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
-
-            else
-              {
-              *bracode += 1;              /* Switch to xxxPOS opcodes */
-              *ketcode = OP_KETRPOS;
-              }
-
-            /* If the minimum is zero, mark it as possessive, then unset the
-            possessive flag when the minimum is 0 or 1. */
-
-            if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
-            if (repeat_min < 2) possessive_quantifier = FALSE;
-            }
-
-          /* Non-possessive quantifier */
-
-          else *ketcode = OP_KETRMAX + repeat_type;
-          }
-        }
-      }
-
-    /* If previous is OP_FAIL, it was generated by an empty class [] in
-    JavaScript mode. The other ways in which OP_FAIL can be generated, that is
-    by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
-    error above. We can just ignore the repeat in JS case. */
-
-    else if (*previous == OP_FAIL) goto END_REPEAT;
-
-    /* Else there's some kind of shambles */
-
-    else
-      {
-      *errorcodeptr = ERR11;
-      goto FAILED;
-      }
-
-    /* If the character following a repeat is '+', possessive_quantifier is
-    TRUE. For some opcodes, there are special alternative opcodes for this
-    case. For anything else, we wrap the entire repeated item inside OP_ONCE
-    brackets. Logically, the '+' notation is just syntactic sugar, taken from
-    Sun's Java package, but the special opcodes can optimize it.
-
-    Some (but not all) possessively repeated subpatterns have already been
-    completely handled in the code just above. For them, possessive_quantifier
-    is always FALSE at this stage. Note that the repeated item starts at
-    tempcode, not at previous, which might be the first part of a string whose
-    (former) last char we repeated. */
-
-    if (possessive_quantifier)
-      {
-      int len;
-
-      /* Possessifying an EXACT quantifier has no effect, so we can ignore it.
-      However, QUERY, STAR, or UPTO may follow (for quantifiers such as {5,6},
-      {5,}, or {5,10}). We skip over an EXACT item; if the length of what
-      remains is greater than zero, there's a further opcode that can be
-      handled. If not, do nothing, leaving the EXACT alone. */
-
-      switch(*tempcode)
-        {
-        case OP_TYPEEXACT:
-        tempcode += PRIV(OP_lengths)[*tempcode] +
-          ((tempcode[1 + IMM2_SIZE] == OP_PROP
-          || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
-        break;
-
-        /* CHAR opcodes are used for exacts whose count is 1. */
-
-        case OP_CHAR:
-        case OP_CHARI:
-        case OP_NOT:
-        case OP_NOTI:
-        case OP_EXACT:
-        case OP_EXACTI:
-        case OP_NOTEXACT:
-        case OP_NOTEXACTI:
-        tempcode += PRIV(OP_lengths)[*tempcode];
-#ifdef SUPPORT_UTF
-        if (utf && HAS_EXTRALEN(tempcode[-1]))
-          tempcode += GET_EXTRALEN(tempcode[-1]);
-#endif
-        break;
-
-        /* For the class opcodes, the repeat operator appears at the end;
-        adjust tempcode to point to it. */
-
-        case OP_CLASS:
-        case OP_NCLASS:
-        tempcode += 1 + 32/sizeof(pcre_uchar);
-        break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-        case OP_XCLASS:
-        tempcode += GET(tempcode, 1);
-        break;
-#endif
-        }
-
-      /* If tempcode is equal to code (which points to the end of the repeated
-      item), it means we have skipped an EXACT item but there is no following
-      QUERY, STAR, or UPTO; the value of len will be 0, and we do nothing. In
-      all other cases, tempcode will be pointing to the repeat opcode, and will
-      be less than code, so the value of len will be greater than 0. */
-
-      len = (int)(code - tempcode);
-      if (len > 0)
-        {
-        unsigned int repcode = *tempcode;
-
-        /* There is a table for possessifying opcodes, all of which are less
-        than OP_CALLOUT. A zero entry means there is no possessified version.
-        */
-
-        if (repcode < OP_CALLOUT && opcode_possessify[repcode] > 0)
-          *tempcode = opcode_possessify[repcode];
-
-        /* For opcode without a special possessified version, wrap the item in
-        ONCE brackets. Because we are moving code along, we must ensure that any
-        pending recursive references are updated. */
-
-        else
-          {
-          *code = OP_END;
-          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-          memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-          code += 1 + LINK_SIZE;
-          len += 1 + LINK_SIZE;
-          tempcode[0] = OP_ONCE;
-          *code++ = OP_KET;
-          PUTINC(code, 0, len);
-          PUT(tempcode, 1, len);
-          }
-        }
-
-#ifdef NEVER
-      if (len > 0) switch (*tempcode)
-        {
-        case OP_STAR:  *tempcode = OP_POSSTAR; break;
-        case OP_PLUS:  *tempcode = OP_POSPLUS; break;
-        case OP_QUERY: *tempcode = OP_POSQUERY; break;
-        case OP_UPTO:  *tempcode = OP_POSUPTO; break;
-
-        case OP_STARI:  *tempcode = OP_POSSTARI; break;
-        case OP_PLUSI:  *tempcode = OP_POSPLUSI; break;
-        case OP_QUERYI: *tempcode = OP_POSQUERYI; break;
-        case OP_UPTOI:  *tempcode = OP_POSUPTOI; break;
-
-        case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;
-        case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;
-        case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
-        case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
-
-        case OP_NOTSTARI:  *tempcode = OP_NOTPOSSTARI; break;
-        case OP_NOTPLUSI:  *tempcode = OP_NOTPOSPLUSI; break;
-        case OP_NOTQUERYI: *tempcode = OP_NOTPOSQUERYI; break;
-        case OP_NOTUPTOI:  *tempcode = OP_NOTPOSUPTOI; break;
-
-        case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
-        case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
-        case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
-        case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
-
-        case OP_CRSTAR:   *tempcode = OP_CRPOSSTAR; break;
-        case OP_CRPLUS:   *tempcode = OP_CRPOSPLUS; break;
-        case OP_CRQUERY:  *tempcode = OP_CRPOSQUERY; break;
-        case OP_CRRANGE:  *tempcode = OP_CRPOSRANGE; break;
-
-        /* Because we are moving code along, we must ensure that any
-        pending recursive references are updated. */
-
-        default:
-        *code = OP_END;
-        adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-        memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-        code += 1 + LINK_SIZE;
-        len += 1 + LINK_SIZE;
-        tempcode[0] = OP_ONCE;
-        *code++ = OP_KET;
-        PUTINC(code, 0, len);
-        PUT(tempcode, 1, len);
-        break;
-        }
-#endif
-      }
-
-    /* In all case we no longer have a previous item. We also set the
-    "follows varying string" flag for subsequently encountered reqchars if
-    it isn't already set and we have just passed a varying length item. */
-
-    END_REPEAT:
-    previous = NULL;
-    cd->req_varyopt |= reqvary;
-    break;
-
-
-    /* ===================================================================*/
-    /* Start of nested parenthesized sub-expression, or comment or lookahead or
-    lookbehind or option setting or condition or all the other extended
-    parenthesis forms.  */
-
-    case CHAR_LEFT_PARENTHESIS:
-    ptr++;
-
-    /* First deal with comments. Putting this code right at the start ensures
-    that comments have no bad side effects. */
-
-    if (ptr[0] == CHAR_QUESTION_MARK && ptr[1] == CHAR_NUMBER_SIGN)
-      {
-      ptr += 2;
-      while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
-      if (*ptr == CHAR_NULL)
-        {
-        *errorcodeptr = ERR18;
-        goto FAILED;
-        }
-      continue;
-      }
-
-    /* Now deal with various "verbs" that can be introduced by '*'. */
-
-    if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':'
-         || (MAX_255(ptr[1]) && ((cd->ctypes[ptr[1]] & ctype_letter) != 0))))
-      {
-      int i, namelen;
-      int arglen = 0;
-      const char *vn = verbnames;
-      const pcre_uchar *name = ptr + 1;
-      const pcre_uchar *arg = NULL;
-      previous = NULL;
-      ptr++;
-      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
-      namelen = (int)(ptr - name);
-
-      /* It appears that Perl allows any characters whatsoever, other than
-      a closing parenthesis, to appear in arguments, so we no longer insist on
-      letters, digits, and underscores. */
-
-      if (*ptr == CHAR_COLON)
-        {
-        arg = ++ptr;
-        while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
-        arglen = (int)(ptr - arg);
-        if ((unsigned int)arglen > MAX_MARK)
-          {
-          *errorcodeptr = ERR75;
-          goto FAILED;
-          }
-        }
-
-      if (*ptr != CHAR_RIGHT_PARENTHESIS)
-        {
-        *errorcodeptr = ERR60;
-        goto FAILED;
-        }
-
-      /* Scan the table of verb names */
-
-      for (i = 0; i < verbcount; i++)
-        {
-        if (namelen == verbs[i].len &&
-            STRNCMP_UC_C8(name, vn, namelen) == 0)
-          {
-          int setverb;
-
-          /* Check for open captures before ACCEPT and convert it to
-          ASSERT_ACCEPT if in an assertion. */
-
-          if (verbs[i].op == OP_ACCEPT)
-            {
-            open_capitem *oc;
-            if (arglen != 0)
-              {
-              *errorcodeptr = ERR59;
-              goto FAILED;
-              }
-            cd->had_accept = TRUE;
-            for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-              {
-              *code++ = OP_CLOSE;
-              PUT2INC(code, 0, oc->number);
-              }
-            setverb = *code++ =
-              (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
-
-            /* Do not set firstchar after *ACCEPT */
-            if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-            }
-
-          /* Handle other cases with/without an argument */
-
-          else if (arglen == 0)
-            {
-            if (verbs[i].op < 0)   /* Argument is mandatory */
-              {
-              *errorcodeptr = ERR66;
-              goto FAILED;
-              }
-            setverb = *code++ = verbs[i].op;
-            }
-
-          else
-            {
-            if (verbs[i].op_arg < 0)   /* Argument is forbidden */
-              {
-              *errorcodeptr = ERR59;
-              goto FAILED;
-              }
-            setverb = *code++ = verbs[i].op_arg;
-            if (lengthptr != NULL)    /* In pass 1 just add in the length */
-              {                       /* to avoid potential workspace */
-              *lengthptr += arglen;   /* overflow. */
-              *code++ = 0;
-              }
-            else
-              {
-              *code++ = arglen;
-              memcpy(code, arg, IN_UCHARS(arglen));
-              code += arglen;
-              }
-            *code++ = 0;
-            }
-
-          switch (setverb)
-            {
-            case OP_THEN:
-            case OP_THEN_ARG:
-            cd->external_flags |= PCRE_HASTHEN;
-            break;
-
-            case OP_PRUNE:
-            case OP_PRUNE_ARG:
-            case OP_SKIP:
-            case OP_SKIP_ARG:
-            cd->had_pruneorskip = TRUE;
-            break;
-            }
-
-          break;  /* Found verb, exit loop */
-          }
-
-        vn += verbs[i].len + 1;
-        }
-
-      if (i < verbcount) continue;    /* Successfully handled a verb */
-      *errorcodeptr = ERR60;          /* Verb not recognized */
-      goto FAILED;
-      }
-
-    /* Initialize for "real" parentheses */
-
-    newoptions = options;
-    skipbytes = 0;
-    bravalue = OP_CBRA;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-    reset_bracount = FALSE;
-
-    /* Deal with the extended parentheses; all are introduced by '?', and the
-    appearance of any of them means that this is not a capturing group. */
-
-    if (*ptr == CHAR_QUESTION_MARK)
-      {
-      int i, set, unset, namelen;
-      int *optset;
-      const pcre_uchar *name;
-      pcre_uchar *slot;
-
-      switch (*(++ptr))
-        {
-        /* ------------------------------------------------------------ */
-        case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
-        reset_bracount = TRUE;
-        cd->dupgroups = TRUE;     /* Record (?| encountered */
-        /* Fall through */
-
-        /* ------------------------------------------------------------ */
-        case CHAR_COLON:          /* Non-capturing bracket */
-        bravalue = OP_BRA;
-        ptr++;
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_LEFT_PARENTHESIS:
-        bravalue = OP_COND;       /* Conditional group */
-        tempptr = ptr;
-
-        /* A condition can be an assertion, a number (referring to a numbered
-        group's having been set), a name (referring to a named group), or 'R',
-        referring to recursion. R<digits> and R&name are also permitted for
-        recursion tests.
-
-        There are ways of testing a named group: (?(name)) is used by Python;
-        Perl 5.10 onwards uses (?(<name>) or (?('name')).
-
-        There is one unfortunate ambiguity, caused by history. 'R' can be the
-        recursive thing or the name 'R' (and similarly for 'R' followed by
-        digits). We look for a name first; if not found, we try the other case.
-
-        For compatibility with auto-callouts, we allow a callout to be
-        specified before a condition that is an assertion. First, check for the
-        syntax of a callout; if found, adjust the temporary pointer that is
-        used to check for an assertion condition. That's all that is needed! */
-
-        if (ptr[1] == CHAR_QUESTION_MARK && ptr[2] == CHAR_C)
-          {
-          for (i = 3;; i++) if (!IS_DIGIT(ptr[i])) break;
-          if (ptr[i] == CHAR_RIGHT_PARENTHESIS)
-            tempptr += i + 1;
-          }
-
-        /* For conditions that are assertions, check the syntax, and then exit
-        the switch. This will take control down to where bracketed groups,
-        including assertions, are processed. */
-
-        if (tempptr[1] == CHAR_QUESTION_MARK &&
-              (tempptr[2] == CHAR_EQUALS_SIGN ||
-               tempptr[2] == CHAR_EXCLAMATION_MARK ||
-                 (tempptr[2] == CHAR_LESS_THAN_SIGN &&
-                   (tempptr[3] == CHAR_EQUALS_SIGN ||
-                    tempptr[3] == CHAR_EXCLAMATION_MARK))))
-          {
-          cd->iscondassert = TRUE;
-          break;
-          }
-
-        /* Other conditions use OP_CREF/OP_DNCREF/OP_RREF/OP_DNRREF, and all
-        need to skip at least 1+IMM2_SIZE bytes at the start of the group. */
-
-        code[1+LINK_SIZE] = OP_CREF;
-        skipbytes = 1+IMM2_SIZE;
-        refsign = -1;     /* => not a number */
-        namelen = -1;     /* => not a name; must set to avoid warning */
-        name = NULL;      /* Always set to avoid warning */
-        recno = 0;        /* Always set to avoid warning */
-
-        /* Check for a test for recursion in a named group. */
-
-        ptr++;
-        if (*ptr == CHAR_R && ptr[1] == CHAR_AMPERSAND)
-          {
-          terminator = -1;
-          ptr += 2;
-          code[1+LINK_SIZE] = OP_RREF;    /* Change the type of test */
-          }
-
-        /* Check for a test for a named group's having been set, using the Perl
-        syntax (?(<name>) or (?('name'), and also allow for the original PCRE
-        syntax of (?(name) or for (?(+n), (?(-n), and just (?(n). */
-
-        else if (*ptr == CHAR_LESS_THAN_SIGN)
-          {
-          terminator = CHAR_GREATER_THAN_SIGN;
-          ptr++;
-          }
-        else if (*ptr == CHAR_APOSTROPHE)
-          {
-          terminator = CHAR_APOSTROPHE;
-          ptr++;
-          }
-        else
-          {
-          terminator = CHAR_NULL;
-          if (*ptr == CHAR_MINUS || *ptr == CHAR_PLUS) refsign = *ptr++;
-            else if (IS_DIGIT(*ptr)) refsign = 0;
-          }
-
-        /* Handle a number */
-
-        if (refsign >= 0)
-          {
-          while (IS_DIGIT(*ptr))
-            {
-            if (recno > INT_MAX / 10 - 1)  /* Integer overflow */
-              {
-              while (IS_DIGIT(*ptr)) ptr++;
-              *errorcodeptr = ERR61;
-              goto FAILED;
-              }
-            recno = recno * 10 + (int)(*ptr - CHAR_0);
-            ptr++;
-            }
-          }
-
-        /* Otherwise we expect to read a name; anything else is an error. When
-        a name is one of a number of duplicates, a different opcode is used and
-        it needs more memory. Unfortunately we cannot tell whether a name is a
-        duplicate in the first pass, so we have to allow for more memory. */
-
-        else
-          {
-          if (IS_DIGIT(*ptr))
-            {
-            *errorcodeptr = ERR84;
-            goto FAILED;
-            }
-          if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_word) == 0)
-            {
-            *errorcodeptr = ERR28;   /* Assertion expected */
-            goto FAILED;
-            }
-          name = ptr++;
-          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0)
-            {
-            ptr++;
-            }
-          namelen = (int)(ptr - name);
-          if (lengthptr != NULL) skipbytes += IMM2_SIZE;
-          }
-
-        /* Check the terminator */
-
-        if ((terminator > 0 && *ptr++ != (pcre_uchar)terminator) ||
-            *ptr++ != CHAR_RIGHT_PARENTHESIS)
-          {
-          ptr--;                  /* Error offset */
-          *errorcodeptr = ERR26;  /* Malformed number or name */
-          goto FAILED;
-          }
-
-        /* Do no further checking in the pre-compile phase. */
-
-        if (lengthptr != NULL) break;
-
-        /* In the real compile we do the work of looking for the actual
-        reference. If refsign is not negative, it means we have a number in
-        recno. */
-
-        if (refsign >= 0)
-          {
-          if (recno <= 0)
-            {
-            *errorcodeptr = ERR35;
-            goto FAILED;
-            }
-          if (refsign != 0) recno = (refsign == CHAR_MINUS)?
-            cd->bracount - recno + 1 : recno + cd->bracount;
-          if (recno <= 0 || recno > cd->final_bracount)
-            {
-            *errorcodeptr = ERR15;
-            goto FAILED;
-            }
-          PUT2(code, 2+LINK_SIZE, recno);
-          if (recno > cd->top_backref) cd->top_backref = recno;
-          break;
-          }
-
-        /* Otherwise look for the name. */
-
-        slot = cd->name_table;
-        for (i = 0; i < cd->names_found; i++)
-          {
-          if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0) break;
-          slot += cd->name_entry_size;
-          }
-
-        /* Found the named subpattern. If the name is duplicated, add one to
-        the opcode to change CREF/RREF into DNCREF/DNRREF and insert
-        appropriate data values. Otherwise, just insert the unique subpattern
-        number. */
-
-        if (i < cd->names_found)
-          {
-          int offset = i++;
-          int count = 1;
-          recno = GET2(slot, 0);   /* Number from first found */
-          if (recno > cd->top_backref) cd->top_backref = recno;
-          for (; i < cd->names_found; i++)
-            {
-            slot += cd->name_entry_size;
-            if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) != 0 ||
-              (slot+IMM2_SIZE)[namelen] != 0) break;
-            count++;
-            }
-
-          if (count > 1)
-            {
-            PUT2(code, 2+LINK_SIZE, offset);
-            PUT2(code, 2+LINK_SIZE+IMM2_SIZE, count);
-            skipbytes += IMM2_SIZE;
-            code[1+LINK_SIZE]++;
-            }
-          else  /* Not a duplicated name */
-            {
-            PUT2(code, 2+LINK_SIZE, recno);
-            }
-          }
-
-        /* If terminator == CHAR_NULL it means that the name followed directly
-        after the opening parenthesis [e.g. (?(abc)...] and in this case there
-        are some further alternatives to try. For the cases where terminator !=
-        CHAR_NULL [things like (?(<name>... or (?('name')... or (?(R&name)... ]
-        we have now checked all the possibilities, so give an error. */
-
-        else if (terminator != CHAR_NULL)
-          {
-          *errorcodeptr = ERR15;
-          goto FAILED;
-          }
-
-        /* Check for (?(R) for recursion. Allow digits after R to specify a
-        specific group number. */
-
-        else if (*name == CHAR_R)
-          {
-          recno = 0;
-          for (i = 1; i < namelen; i++)
-            {
-            if (!IS_DIGIT(name[i]))
-              {
-              *errorcodeptr = ERR15;
-              goto FAILED;
-              }
-            if (recno > INT_MAX / 10 - 1)   /* Integer overflow */
-              {
-              *errorcodeptr = ERR61;
-              goto FAILED;
-              }
-            recno = recno * 10 + name[i] - CHAR_0;
-            }
-          if (recno == 0) recno = RREF_ANY;
-          code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
-          PUT2(code, 2+LINK_SIZE, recno);
-          }
-
-        /* Similarly, check for the (?(DEFINE) "condition", which is always
-        false. */
-
-        else if (namelen == 6 && STRNCMP_UC_C8(name, STRING_DEFINE, 6) == 0)
-          {
-          code[1+LINK_SIZE] = OP_DEF;
-          skipbytes = 1;
-          }
-
-        /* Reference to an unidentified subpattern. */
-
-        else
-          {
-          *errorcodeptr = ERR15;
-          goto FAILED;
-          }
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
-        bravalue = OP_ASSERT;
-        cd->assert_depth += 1;
-        ptr++;
-        break;
-
-        /* Optimize (?!) to (*FAIL) unless it is quantified - which is a weird
-        thing to do, but Perl allows all assertions to be quantified, and when
-        they contain capturing parentheses there may be a potential use for
-        this feature. Not that that applies to a quantified (?!) but we allow
-        it for uniformity. */
-
-        /* ------------------------------------------------------------ */
-        case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
-        ptr++;
-        if (*ptr == CHAR_RIGHT_PARENTHESIS && ptr[1] != CHAR_ASTERISK &&
-             ptr[1] != CHAR_PLUS && ptr[1] != CHAR_QUESTION_MARK &&
-            (ptr[1] != CHAR_LEFT_CURLY_BRACKET || !is_counted_repeat(ptr+2)))
-          {
-          *code++ = OP_FAIL;
-          previous = NULL;
-          continue;
-          }
-        bravalue = OP_ASSERT_NOT;
-        cd->assert_depth += 1;
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
-        switch (ptr[1])
-          {
-          case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
-          bravalue = OP_ASSERTBACK;
-          cd->assert_depth += 1;
-          ptr += 2;
-          break;
-
-          case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
-          bravalue = OP_ASSERTBACK_NOT;
-          cd->assert_depth += 1;
-          ptr += 2;
-          break;
-
-          default:                /* Could be name define, else bad */
-          if (MAX_255(ptr[1]) && (cd->ctypes[ptr[1]] & ctype_word) != 0)
-            goto DEFINE_NAME;
-          ptr++;                  /* Correct offset for error */
-          *errorcodeptr = ERR24;
-          goto FAILED;
-          }
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
-        bravalue = OP_ONCE;
-        ptr++;
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_C:                 /* Callout - may be followed by digits; */
-        previous_callout = code;     /* Save for later completion */
-        after_manual_callout = 1;    /* Skip one item before completing */
-        *code++ = OP_CALLOUT;
-          {
-          int n = 0;
-          ptr++;
-          while(IS_DIGIT(*ptr))
-            n = n * 10 + *ptr++ - CHAR_0;
-          if (*ptr != CHAR_RIGHT_PARENTHESIS)
-            {
-            *errorcodeptr = ERR39;
-            goto FAILED;
-            }
-          if (n > 255)
-            {
-            *errorcodeptr = ERR38;
-            goto FAILED;
-            }
-          *code++ = n;
-          PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
-          PUT(code, LINK_SIZE, 0);                          /* Default length */
-          code += 2 * LINK_SIZE;
-          }
-        previous = NULL;
-        continue;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_P:              /* Python-style named subpattern handling */
-        if (*(++ptr) == CHAR_EQUALS_SIGN ||
-            *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
-          {
-          is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
-          terminator = CHAR_RIGHT_PARENTHESIS;
-          goto NAMED_REF_OR_RECURSE;
-          }
-        else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
-          {
-          *errorcodeptr = ERR41;
-          goto FAILED;
-          }
-        /* Fall through to handle (?P< as (?< is handled */
-
-
-        /* ------------------------------------------------------------ */
-        DEFINE_NAME:    /* Come here from (?< handling */
-        case CHAR_APOSTROPHE:
-        terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
-          CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
-        name = ++ptr;
-        if (IS_DIGIT(*ptr))
-          {
-          *errorcodeptr = ERR84;   /* Group name must start with non-digit */
-          goto FAILED;
-          }
-        while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-        namelen = (int)(ptr - name);
-
-        /* In the pre-compile phase, do a syntax check, remember the longest
-        name, and then remember the group in a vector, expanding it if
-        necessary. Duplicates for the same number are skipped; other duplicates
-        are checked for validity. In the actual compile, there is nothing to
-        do. */
-
-        if (lengthptr != NULL)
-          {
-          named_group *ng;
-          pcre_uint32 number = cd->bracount + 1;
-
-          if (*ptr != (pcre_uchar)terminator)
-            {
-            *errorcodeptr = ERR42;
-            goto FAILED;
-            }
-
-          if (cd->names_found >= MAX_NAME_COUNT)
-            {
-            *errorcodeptr = ERR49;
-            goto FAILED;
-            }
-
-          if (namelen + IMM2_SIZE + 1 > cd->name_entry_size)
-            {
-            cd->name_entry_size = namelen + IMM2_SIZE + 1;
-            if (namelen > MAX_NAME_SIZE)
-              {
-              *errorcodeptr = ERR48;
-              goto FAILED;
-              }
-            }
-
-          /* Scan the list to check for duplicates. For duplicate names, if the
-          number is the same, break the loop, which causes the name to be
-          discarded; otherwise, if DUPNAMES is not set, give an error.
-          If it is set, allow the name with a different number, but continue
-          scanning in case this is a duplicate with the same number. For
-          non-duplicate names, give an error if the number is duplicated. */
-
-          ng = cd->named_groups;
-          for (i = 0; i < cd->names_found; i++, ng++)
-            {
-            if (namelen == ng->length &&
-                STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-              {
-              if (ng->number == number) break;
-              if ((options & PCRE_DUPNAMES) == 0)
-                {
-                *errorcodeptr = ERR43;
-                goto FAILED;
-                }
-              cd->dupnames = TRUE;  /* Duplicate names exist */
-              }
-            else if (ng->number == number)
-              {
-              *errorcodeptr = ERR65;
-              goto FAILED;
-              }
-            }
-
-          if (i >= cd->names_found)     /* Not a duplicate with same number */
-            {
-            /* Increase the list size if necessary */
-
-            if (cd->names_found >= cd->named_group_list_size)
-              {
-              int newsize = cd->named_group_list_size * 2;
-              named_group *newspace = (PUBL(malloc))
-                (newsize * sizeof(named_group));
-
-              if (newspace == NULL)
-                {
-                *errorcodeptr = ERR21;
-                goto FAILED;
-                }
-
-              memcpy(newspace, cd->named_groups,
-                cd->named_group_list_size * sizeof(named_group));
-              if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
-                (PUBL(free))((void *)cd->named_groups);
-              cd->named_groups = newspace;
-              cd->named_group_list_size = newsize;
-              }
-
-            cd->named_groups[cd->names_found].name = name;
-            cd->named_groups[cd->names_found].length = namelen;
-            cd->named_groups[cd->names_found].number = number;
-            cd->names_found++;
-            }
-          }
-
-        ptr++;                    /* Move past > or ' in both passes. */
-        goto NUMBERED_GROUP;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
-        terminator = CHAR_RIGHT_PARENTHESIS;
-        is_recurse = TRUE;
-        /* Fall through */
-
-        /* We come here from the Python syntax above that handles both
-        references (?P=name) and recursion (?P>name), as well as falling
-        through from the Perl recursion syntax (?&name). We also come here from
-        the Perl \k<name> or \k'name' back reference syntax and the \k{name}
-        .NET syntax, and the Oniguruma \g<...> and \g'...' subroutine syntax. */
-
-        NAMED_REF_OR_RECURSE:
-        name = ++ptr;
-        if (IS_DIGIT(*ptr))
-          {
-          *errorcodeptr = ERR84;   /* Group name must start with non-digit */
-          goto FAILED;
-          }
-        while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-        namelen = (int)(ptr - name);
-
-        /* In the pre-compile phase, do a syntax check. We used to just set
-        a dummy reference number, because it was not used in the first pass.
-        However, with the change of recursive back references to be atomic,
-        we have to look for the number so that this state can be identified, as
-        otherwise the incorrect length is computed. If it's not a backwards
-        reference, the dummy number will do. */
-
-        if (lengthptr != NULL)
-          {
-          named_group *ng;
-          recno = 0;
-
-          if (namelen == 0)
-            {
-            *errorcodeptr = ERR62;
-            goto FAILED;
-            }
-          if (*ptr != (pcre_uchar)terminator)
-            {
-            *errorcodeptr = ERR42;
-            goto FAILED;
-            }
-          if (namelen > MAX_NAME_SIZE)
-            {
-            *errorcodeptr = ERR48;
-            goto FAILED;
-            }
-
-          /* Count named back references. */
-
-          if (!is_recurse) cd->namedrefcount++;
-
-          /* We have to allow for a named reference to a duplicated name (this
-          cannot be determined until the second pass). This needs an extra
-          16-bit data item. */
-
-          *lengthptr += IMM2_SIZE;
-
-          /* If this is a forward reference and we are within a (?|...) group,
-          the reference may end up as the number of a group which we are
-          currently inside, that is, it could be a recursive reference. In the
-          real compile this will be picked up and the reference wrapped with
-          OP_ONCE to make it atomic, so we must space in case this occurs. */
-
-          /* In fact, this can happen for a non-forward reference because
-          another group with the same number might be created later. This
-          issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
-          only mode, we finesse the bug by allowing more memory always. */
-
-          *lengthptr += 2 + 2*LINK_SIZE;
-
-          /* It is even worse than that. The current reference may be to an
-          existing named group with a different number (so apparently not
-          recursive) but which later on is also attached to a group with the
-          current number. This can only happen if $(| has been previous
-          encountered. In that case, we allow yet more memory, just in case.
-          (Again, this is fixed "properly" in PCRE2. */
-
-          if (cd->dupgroups) *lengthptr += 4 + 4*LINK_SIZE;
-
-          /* Otherwise, check for recursion here. The name table does not exist
-          in the first pass; instead we must scan the list of names encountered
-          so far in order to get the number. If the name is not found, leave
-          the value of recno as 0 for a forward reference. */
-
-          else
-            {
-            ng = cd->named_groups;
-            for (i = 0; i < cd->names_found; i++, ng++)
-              {
-              if (namelen == ng->length &&
-                  STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-                {
-                open_capitem *oc;
-                recno = ng->number;
-                if (is_recurse) break;
-                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-                  {
-                  if (oc->number == recno)
-                    {
-                    oc->flag = TRUE;
-                    break;
-                    }
-                  }
-                }
-              }
-            }
-          }
-
-        /* In the real compile, search the name table. We check the name
-        first, and then check that we have reached the end of the name in the
-        table. That way, if the name is longer than any in the table, the
-        comparison will fail without reading beyond the table entry. */
-
-        else
-          {
-          slot = cd->name_table;
-          for (i = 0; i < cd->names_found; i++)
-            {
-            if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0 &&
-                slot[IMM2_SIZE+namelen] == 0)
-              break;
-            slot += cd->name_entry_size;
-            }
-
-          if (i < cd->names_found)
-            {
-            recno = GET2(slot, 0);
-            }
-          else
-            {
-            *errorcodeptr = ERR15;
-            goto FAILED;
-            }
-          }
-
-        /* In both phases, for recursions, we can now go to the code than
-        handles numerical recursion. */
-
-        if (is_recurse) goto HANDLE_RECURSION;
-
-        /* In the second pass we must see if the name is duplicated. If so, we
-        generate a different opcode. */
-
-        if (lengthptr == NULL && cd->dupnames)
-          {
-          int count = 1;
-          unsigned int index = i;
-          pcre_uchar *cslot = slot + cd->name_entry_size;
-
-          for (i++; i < cd->names_found; i++)
-            {
-            if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break;
-            count++;
-            cslot += cd->name_entry_size;
-            }
-
-          if (count > 1)
-            {
-            if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-            previous = code;
-            item_hwm_offset = cd->hwm - cd->start_workspace;
-            *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
-            PUT2INC(code, 0, index);
-            PUT2INC(code, 0, count);
-
-            /* Process each potentially referenced group. */
-
-            for (; slot < cslot; slot += cd->name_entry_size)
-              {
-              open_capitem *oc;
-              recno = GET2(slot, 0);
-              cd->backref_map |= (recno < 32)? (1 << recno) : 1;
-              if (recno > cd->top_backref) cd->top_backref = recno;
-
-              /* Check to see if this back reference is recursive, that it, it
-              is inside the group that it references. A flag is set so that the
-              group can be made atomic. */
-
-              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-                {
-                if (oc->number == recno)
-                  {
-                  oc->flag = TRUE;
-                  break;
-                  }
-                }
-              }
-
-            continue;  /* End of back ref handling */
-            }
-          }
-
-        /* First pass, or a non-duplicated name. */
-
-        goto HANDLE_REFERENCE;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_R:              /* Recursion, same as (?0) */
-        recno = 0;
-        if (*(++ptr) != CHAR_RIGHT_PARENTHESIS)
-          {
-          *errorcodeptr = ERR29;
-          goto FAILED;
-          }
-        goto HANDLE_RECURSION;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
-        case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
-        case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
-          {
-          const pcre_uchar *called;
-          terminator = CHAR_RIGHT_PARENTHESIS;
-
-          /* Come here from the \g<...> and \g'...' code (Oniguruma
-          compatibility). However, the syntax has been checked to ensure that
-          the ... are a (signed) number, so that neither ERR63 nor ERR29 will
-          be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
-          ever be taken. */
-
-          HANDLE_NUMERICAL_RECURSION:
-
-          if ((refsign = *ptr) == CHAR_PLUS)
-            {
-            ptr++;
-            if (!IS_DIGIT(*ptr))
-              {
-              *errorcodeptr = ERR63;
-              goto FAILED;
-              }
-            }
-          else if (refsign == CHAR_MINUS)
-            {
-            if (!IS_DIGIT(ptr[1]))
-              goto OTHER_CHAR_AFTER_QUERY;
-            ptr++;
-            }
-
-          recno = 0;
-          while(IS_DIGIT(*ptr))
-            {
-            if (recno > INT_MAX / 10 - 1) /* Integer overflow */
-              {
-              while (IS_DIGIT(*ptr)) ptr++;
-              *errorcodeptr = ERR61;
-              goto FAILED;
-              }
-            recno = recno * 10 + *ptr++ - CHAR_0;
-            }
-
-          if (*ptr != (pcre_uchar)terminator)
-            {
-            *errorcodeptr = ERR29;
-            goto FAILED;
-            }
-
-          if (refsign == CHAR_MINUS)
-            {
-            if (recno == 0)
-              {
-              *errorcodeptr = ERR58;
-              goto FAILED;
-              }
-            recno = cd->bracount - recno + 1;
-            if (recno <= 0)
-              {
-              *errorcodeptr = ERR15;
-              goto FAILED;
-              }
-            }
-          else if (refsign == CHAR_PLUS)
-            {
-            if (recno == 0)
-              {
-              *errorcodeptr = ERR58;
-              goto FAILED;
-              }
-            recno += cd->bracount;
-            }
-
-          /* Come here from code above that handles a named recursion */
-
-          HANDLE_RECURSION:
-
-          previous = code;
-          item_hwm_offset = cd->hwm - cd->start_workspace;
-          called = cd->start_code;
-
-          /* When we are actually compiling, find the bracket that is being
-          referenced. Temporarily end the regex in case it doesn't exist before
-          this point. If we end up with a forward reference, first check that
-          the bracket does occur later so we can give the error (and position)
-          now. Then remember this forward reference in the workspace so it can
-          be filled in at the end. */
-
-          if (lengthptr == NULL)
-            {
-            *code = OP_END;
-            if (recno != 0)
-              called = PRIV(find_bracket)(cd->start_code, utf, recno);
-
-            /* Forward reference */
-
-            if (called == NULL)
-              {
-              if (recno > cd->final_bracount)
-                {
-                *errorcodeptr = ERR15;
-                goto FAILED;
-                }
-
-              /* Fudge the value of "called" so that when it is inserted as an
-              offset below, what it actually inserted is the reference number
-              of the group. Then remember the forward reference. */
-
-              called = cd->start_code + recno;
-              if (cd->hwm >= cd->start_workspace + cd->workspace_size -
-                  WORK_SIZE_SAFETY_MARGIN)
-                {
-                *errorcodeptr = expand_workspace(cd);
-                if (*errorcodeptr != 0) goto FAILED;
-                }
-              PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
-              }
-
-            /* If not a forward reference, and the subpattern is still open,
-            this is a recursive call. We check to see if this is a left
-            recursion that could loop for ever, and diagnose that case. We
-            must not, however, do this check if we are in a conditional
-            subpattern because the condition might be testing for recursion in
-            a pattern such as /(?(R)a+|(?R)b)/, which is perfectly valid.
-            Forever loops are also detected at runtime, so those that occur in
-            conditional subpatterns will be picked up then. */
-
-            else if (GET(called, 1) == 0 && cond_depth <= 0 &&
-                     could_be_empty(called, code, bcptr, utf, cd))
-              {
-              *errorcodeptr = ERR40;
-              goto FAILED;
-              }
-            }
-
-          /* Insert the recursion/subroutine item. It does not have a set first
-          character (relevant if it is repeated, because it will then be
-          wrapped with ONCE brackets). */
-
-          *code = OP_RECURSE;
-          PUT(code, 1, (int)(called - cd->start_code));
-          code += 1 + LINK_SIZE;
-          groupsetfirstchar = FALSE;
-          }
-
-        /* Can't determine a first byte now */
-
-        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-        continue;
-
-
-        /* ------------------------------------------------------------ */
-        default:              /* Other characters: check option setting */
-        OTHER_CHAR_AFTER_QUERY:
-        set = unset = 0;
-        optset = &set;
-
-        while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
-          {
-          switch (*ptr++)
-            {
-            case CHAR_MINUS: optset = &unset; break;
-
-            case CHAR_J:    /* Record that it changed in the external options */
-            *optset |= PCRE_DUPNAMES;
-            cd->external_flags |= PCRE_JCHANGED;
-            break;
-
-            case CHAR_i: *optset |= PCRE_CASELESS; break;
-            case CHAR_m: *optset |= PCRE_MULTILINE; break;
-            case CHAR_s: *optset |= PCRE_DOTALL; break;
-            case CHAR_x: *optset |= PCRE_EXTENDED; break;
-            case CHAR_U: *optset |= PCRE_UNGREEDY; break;
-            case CHAR_X: *optset |= PCRE_EXTRA; break;
-
-            default:  *errorcodeptr = ERR12;
-                      ptr--;    /* Correct the offset */
-                      goto FAILED;
-            }
-          }
-
-        /* Set up the changed option bits, but don't change anything yet. */
-
-        newoptions = (options | set) & (~unset);
-
-        /* If the options ended with ')' this is not the start of a nested
-        group with option changes, so the options change at this level. If this
-        item is right at the start of the pattern, the options can be
-        abstracted and made external in the pre-compile phase, and ignored in
-        the compile phase. This can be helpful when matching -- for instance in
-        caseless checking of required bytes.
-
-        If the code pointer is not (cd->start_code + 1 + LINK_SIZE), we are
-        definitely *not* at the start of the pattern because something has been
-        compiled. In the pre-compile phase, however, the code pointer can have
-        that value after the start, because it gets reset as code is discarded
-        during the pre-compile. However, this can happen only at top level - if
-        we are within parentheses, the starting BRA will still be present. At
-        any parenthesis level, the length value can be used to test if anything
-        has been compiled at that level. Thus, a test for both these conditions
-        is necessary to ensure we correctly detect the start of the pattern in
-        both phases.
-
-        If we are not at the pattern start, reset the greedy defaults and the
-        case value for firstchar and reqchar. */
-
-        if (*ptr == CHAR_RIGHT_PARENTHESIS)
-          {
-          if (code == cd->start_code + 1 + LINK_SIZE &&
-               (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
-            {
-            cd->external_options = newoptions;
-            }
-          else
-            {
-            greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
-            greedy_non_default = greedy_default ^ 1;
-            req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
-            }
-
-          /* Change options at this level, and pass them back for use
-          in subsequent branches. */
-
-          *optionsptr = options = newoptions;
-          previous = NULL;       /* This item can't be repeated */
-          continue;              /* It is complete */
-          }
-
-        /* If the options ended with ':' we are heading into a nested group
-        with possible change of options. Such groups are non-capturing and are
-        not assertions of any kind. All we need to do is skip over the ':';
-        the newoptions value is handled below. */
-
-        bravalue = OP_BRA;
-        ptr++;
-        }     /* End of switch for character following (? */
-      }       /* End of (? handling */
-
-    /* Opening parenthesis not followed by '*' or '?'. If PCRE_NO_AUTO_CAPTURE
-    is set, all unadorned brackets become non-capturing and behave like (?:...)
-    brackets. */
-
-    else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
-      {
-      bravalue = OP_BRA;
-      }
-
-    /* Else we have a capturing group. */
-
-    else
-      {
-      NUMBERED_GROUP:
-      cd->bracount += 1;
-      PUT2(code, 1+LINK_SIZE, cd->bracount);
-      skipbytes = IMM2_SIZE;
-      }
-
-    /* Process nested bracketed regex. First check for parentheses nested too
-    deeply. */
-
-    if ((cd->parens_depth += 1) > PARENS_NEST_LIMIT)
-      {
-      *errorcodeptr = ERR82;
-      goto FAILED;
-      }
-
-    /* All assertions used not to be repeatable, but this was changed for Perl
-    compatibility. All kinds can now be repeated except for assertions that are
-    conditions (Perl also forbids these to be repeated). We copy code into a
-    non-register variable (tempcode) in order to be able to pass its address
-    because some compilers complain otherwise. At the start of a conditional
-    group whose condition is an assertion, cd->iscondassert is set. We unset it
-    here so as to allow assertions later in the group to be quantified. */
-
-    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT &&
-        cd->iscondassert)
-      {
-      previous = NULL;
-      cd->iscondassert = FALSE;
-      }
-    else
-      {
-      previous = code;
-      item_hwm_offset = cd->hwm - cd->start_workspace;
-      }
-
-    *code = bravalue;
-    tempcode = code;
-    tempreqvary = cd->req_varyopt;        /* Save value before bracket */
-    tempbracount = cd->bracount;          /* Save value before bracket */
-    length_prevgroup = 0;                 /* Initialize for pre-compile phase */
-
-    if (!compile_regex(
-         newoptions,                      /* The complete new option state */
-         &tempcode,                       /* Where to put code (updated) */
-         &ptr,                            /* Input pointer (updated) */
-         errorcodeptr,                    /* Where to put an error message */
-         (bravalue == OP_ASSERTBACK ||
-          bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
-         reset_bracount,                  /* True if (?| group */
-         skipbytes,                       /* Skip over bracket number */
-         cond_depth +
-           ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
-         &subfirstchar,                   /* For possible first char */
-         &subfirstcharflags,
-         &subreqchar,                     /* For possible last char */
-         &subreqcharflags,
-         bcptr,                           /* Current branch chain */
-         cd,                              /* Tables block */
-         (lengthptr == NULL)? NULL :      /* Actual compile phase */
-           &length_prevgroup              /* Pre-compile phase */
-         ))
-      goto FAILED;
-
-    cd->parens_depth -= 1;
-
-    /* If this was an atomic group and there are no capturing groups within it,
-    generate OP_ONCE_NC instead of OP_ONCE. */
-
-    if (bravalue == OP_ONCE && cd->bracount <= tempbracount)
-      *code = OP_ONCE_NC;
-
-    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
-      cd->assert_depth -= 1;
-
-    /* At the end of compiling, code is still pointing to the start of the
-    group, while tempcode has been updated to point past the end of the group.
-    The pattern pointer (ptr) is on the bracket.
-
-    If this is a conditional bracket, check that there are no more than
-    two branches in the group, or just one if it's a DEFINE group. We do this
-    in the real compile phase, not in the pre-pass, where the whole group may
-    not be available. */
-
-    if (bravalue == OP_COND && lengthptr == NULL)
-      {
-      pcre_uchar *tc = code;
-      int condcount = 0;
-
-      do {
-         condcount++;
-         tc += GET(tc,1);
-         }
-      while (*tc != OP_KET);
-
-      /* A DEFINE group is never obeyed inline (the "condition" is always
-      false). It must have only one branch. */
-
-      if (code[LINK_SIZE+1] == OP_DEF)
-        {
-        if (condcount > 1)
-          {
-          *errorcodeptr = ERR54;
-          goto FAILED;
-          }
-        bravalue = OP_DEF;   /* Just a flag to suppress char handling below */
-        }
-
-      /* A "normal" conditional group. If there is just one branch, we must not
-      make use of its firstchar or reqchar, because this is equivalent to an
-      empty second branch. */
-
-      else
-        {
-        if (condcount > 2)
-          {
-          *errorcodeptr = ERR27;
-          goto FAILED;
-          }
-        if (condcount == 1) subfirstcharflags = subreqcharflags = REQ_NONE;
-        }
-      }
-
-    /* Error if hit end of pattern */
-
-    if (*ptr != CHAR_RIGHT_PARENTHESIS)
-      {
-      *errorcodeptr = ERR14;
-      goto FAILED;
-      }
-
-    /* In the pre-compile phase, update the length by the length of the group,
-    less the brackets at either end. Then reduce the compiled code to just a
-    set of non-capturing brackets so that it doesn't use much memory if it is
-    duplicated by a quantifier.*/
-
-    if (lengthptr != NULL)
-      {
-      if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
-        {
-        *errorcodeptr = ERR20;
-        goto FAILED;
-        }
-      *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
-      code++;   /* This already contains bravalue */
-      PUTINC(code, 0, 1 + LINK_SIZE);
-      *code++ = OP_KET;
-      PUTINC(code, 0, 1 + LINK_SIZE);
-      break;    /* No need to waste time with special character handling */
-      }
-
-    /* Otherwise update the main code pointer to the end of the group. */
-
-    code = tempcode;
-
-    /* For a DEFINE group, required and first character settings are not
-    relevant. */
-
-    if (bravalue == OP_DEF) break;
-
-    /* Handle updating of the required and first characters for other types of
-    group. Update for normal brackets of all kinds, and conditions with two
-    branches (see code above). If the bracket is followed by a quantifier with
-    zero repeat, we have to back off. Hence the definition of zeroreqchar and
-    zerofirstchar outside the main loop so that they can be accessed for the
-    back off. */
-
-    zeroreqchar = reqchar;
-    zeroreqcharflags = reqcharflags;
-    zerofirstchar = firstchar;
-    zerofirstcharflags = firstcharflags;
-    groupsetfirstchar = FALSE;
-
-    if (bravalue >= OP_ONCE)
-      {
-      /* If we have not yet set a firstchar in this branch, take it from the
-      subpattern, remembering that it was set here so that a repeat of more
-      than one can replicate it as reqchar if necessary. If the subpattern has
-      no firstchar, set "none" for the whole branch. In both cases, a zero
-      repeat forces firstchar to "none". */
-
-      if (firstcharflags == REQ_UNSET)
-        {
-        if (subfirstcharflags >= 0)
-          {
-          firstchar = subfirstchar;
-          firstcharflags = subfirstcharflags;
-          groupsetfirstchar = TRUE;
-          }
-        else firstcharflags = REQ_NONE;
-        zerofirstcharflags = REQ_NONE;
-        }
-
-      /* If firstchar was previously set, convert the subpattern's firstchar
-      into reqchar if there wasn't one, using the vary flag that was in
-      existence beforehand. */
-
-      else if (subfirstcharflags >= 0 && subreqcharflags < 0)
-        {
-        subreqchar = subfirstchar;
-        subreqcharflags = subfirstcharflags | tempreqvary;
-        }
-
-      /* If the subpattern set a required byte (or set a first byte that isn't
-      really the first byte - see above), set it. */
-
-      if (subreqcharflags >= 0)
-        {
-        reqchar = subreqchar;
-        reqcharflags = subreqcharflags;
-        }
-      }
-
-    /* For a forward assertion, we take the reqchar, if set. This can be
-    helpful if the pattern that follows the assertion doesn't set a different
-    char. For example, it's useful for /(?=abcde).+/. We can't set firstchar
-    for an assertion, however because it leads to incorrect effect for patterns
-    such as /(?=a)a.+/ when the "real" "a" would then become a reqchar instead
-    of a firstchar. This is overcome by a scan at the end if there's no
-    firstchar, looking for an asserted first char. */
-
-    else if (bravalue == OP_ASSERT && subreqcharflags >= 0)
-      {
-      reqchar = subreqchar;
-      reqcharflags = subreqcharflags;
-      }
-    break;     /* End of processing '(' */
-
-
-    /* ===================================================================*/
-    /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
-    are arranged to be the negation of the corresponding OP_values in the
-    default case when PCRE_UCP is not set. For the back references, the values
-    are negative the reference number. Only back references and those types
-    that consume a character may be repeated. We can test for values between
-    ESC_b and ESC_Z for the latter; this may have to change if any new ones are
-    ever created. */
-
-    case CHAR_BACKSLASH:
-    tempptr = ptr;
-    escape = check_escape(&ptr, &ec, errorcodeptr, cd->bracount, options, FALSE);
-    if (*errorcodeptr != 0) goto FAILED;
-
-    if (escape == 0)                  /* The escape coded a single character */
-      c = ec;
-    else
-      {
-      if (escape == ESC_Q)            /* Handle start of quoted string */
-        {
-        if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-          ptr += 2;               /* avoid empty string */
-            else inescq = TRUE;
-        continue;
-        }
-
-      if (escape == ESC_E) continue;  /* Perl ignores an orphan \E */
-
-      /* For metasequences that actually match a character, we disable the
-      setting of a first character if it hasn't already been set. */
-
-      if (firstcharflags == REQ_UNSET && escape > ESC_b && escape < ESC_Z)
-        firstcharflags = REQ_NONE;
-
-      /* Set values to reset to if this is followed by a zero repeat. */
-
-      zerofirstchar = firstchar;
-      zerofirstcharflags = firstcharflags;
-      zeroreqchar = reqchar;
-      zeroreqcharflags = reqcharflags;
-
-      /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
-      is a subroutine call by number (Oniguruma syntax). In fact, the value
-      ESC_g is returned only for these cases. So we don't need to check for <
-      or ' if the value is ESC_g. For the Perl syntax \g{n} the value is
-      -n, and for the Perl syntax \g{name} the result is ESC_k (as
-      that is a synonym for a named back reference). */
-
-      if (escape == ESC_g)
-        {
-        const pcre_uchar *p;
-        pcre_uint32 cf;
-
-        item_hwm_offset = cd->hwm - cd->start_workspace;   /* Normally this is set when '(' is read */
-        terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
-          CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
-
-        /* These two statements stop the compiler for warning about possibly
-        unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
-        fact, because we do the check for a number below, the paths that
-        would actually be in error are never taken. */
-
-        skipbytes = 0;
-        reset_bracount = FALSE;
-
-        /* If it's not a signed or unsigned number, treat it as a name. */
-
-        cf = ptr[1];
-        if (cf != CHAR_PLUS && cf != CHAR_MINUS && !IS_DIGIT(cf))
-          {
-          is_recurse = TRUE;
-          goto NAMED_REF_OR_RECURSE;
-          }
-
-        /* Signed or unsigned number (cf = ptr[1]) is known to be plus or minus
-        or a digit. */
-
-        p = ptr + 2;
-        while (IS_DIGIT(*p)) p++;
-        if (*p != (pcre_uchar)terminator)
-          {
-          *errorcodeptr = ERR57;
-          goto FAILED;
-          }
-        ptr++;
-        goto HANDLE_NUMERICAL_RECURSION;
-        }
-
-      /* \k<name> or \k'name' is a back reference by name (Perl syntax).
-      We also support \k{name} (.NET syntax).  */
-
-      if (escape == ESC_k)
-        {
-        if ((ptr[1] != CHAR_LESS_THAN_SIGN &&
-          ptr[1] != CHAR_APOSTROPHE && ptr[1] != CHAR_LEFT_CURLY_BRACKET))
-          {
-          *errorcodeptr = ERR69;
-          goto FAILED;
-          }
-        is_recurse = FALSE;
-        terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
-          CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
-          CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
-        goto NAMED_REF_OR_RECURSE;
-        }
-
-      /* Back references are handled specially; must disable firstchar if
-      not set to cope with cases like (?=(\w+))\1: which would otherwise set
-      ':' later. */
-
-      if (escape < 0)
-        {
-        open_capitem *oc;
-        recno = -escape;
-
-        /* Come here from named backref handling when the reference is to a
-        single group (i.e. not to a duplicated name. */
-
-        HANDLE_REFERENCE:
-        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-        previous = code;
-        item_hwm_offset = cd->hwm - cd->start_workspace;
-        *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
-        PUT2INC(code, 0, recno);
-        cd->backref_map |= (recno < 32)? (1 << recno) : 1;
-        if (recno > cd->top_backref) cd->top_backref = recno;
-
-        /* Check to see if this back reference is recursive, that it, it
-        is inside the group that it references. A flag is set so that the
-        group can be made atomic. */
-
-        for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-          {
-          if (oc->number == recno)
-            {
-            oc->flag = TRUE;
-            break;
-            }
-          }
-        }
-
-      /* So are Unicode property matches, if supported. */
-
-#ifdef SUPPORT_UCP
-      else if (escape == ESC_P || escape == ESC_p)
-        {
-        BOOL negated;
-        unsigned int ptype = 0, pdata = 0;
-        if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
-          goto FAILED;
-        previous = code;
-        item_hwm_offset = cd->hwm - cd->start_workspace;
-        *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
-        *code++ = ptype;
-        *code++ = pdata;
-        }
-#else
-
-      /* If Unicode properties are not supported, \X, \P, and \p are not
-      allowed. */
-
-      else if (escape == ESC_X || escape == ESC_P || escape == ESC_p)
-        {
-        *errorcodeptr = ERR45;
-        goto FAILED;
-        }
-#endif
-
-      /* For the rest (including \X when Unicode properties are supported), we
-      can obtain the OP value by negating the escape value in the default
-      situation when PCRE_UCP is not set. When it *is* set, we substitute
-      Unicode property tests. Note that \b and \B do a one-character
-      lookbehind, and \A also behaves as if it does. */
-
-      else
-        {
-        if ((escape == ESC_b || escape == ESC_B || escape == ESC_A) &&
-             cd->max_lookbehind == 0)
-          cd->max_lookbehind = 1;
-#ifdef SUPPORT_UCP
-        if (escape >= ESC_DU && escape <= ESC_wu)
-          {
-          nestptr = ptr + 1;                   /* Where to resume */
-          ptr = substitutes[escape - ESC_DU] - 1;  /* Just before substitute */
-          }
-        else
-#endif
-        /* In non-UTF-8 mode, we turn \C into OP_ALLANY instead of OP_ANYBYTE
-        so that it works in DFA mode and in lookbehinds. */
-
-          {
-          previous = (escape > ESC_b && escape < ESC_Z)? code : NULL;
-          item_hwm_offset = cd->hwm - cd->start_workspace;
-          *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape;
-          }
-        }
-      continue;
-      }
-
-    /* We have a data character whose value is in c. In UTF-8 mode it may have
-    a value > 127. We set its representation in the length/buffer, and then
-    handle it as a data character. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
-      mclength = PRIV(ord2utf)(c, mcbuffer);
-    else
-#endif
-
-     {
-     mcbuffer[0] = c;
-     mclength = 1;
-     }
-    goto ONE_CHAR;
-
-
-    /* ===================================================================*/
-    /* Handle a literal character. It is guaranteed not to be whitespace or #
-    when the extended flag is set. If we are in a UTF mode, it may be a
-    multi-unit literal character. */
-
-    default:
-    NORMAL_CHAR:
-    mclength = 1;
-    mcbuffer[0] = c;
-
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(c))
-      ACROSSCHAR(TRUE, ptr[1], mcbuffer[mclength++] = *(++ptr));
-#endif
-
-    /* At this point we have the character's bytes in mcbuffer, and the length
-    in mclength. When not in UTF-8 mode, the length is always 1. */
-
-    ONE_CHAR:
-    previous = code;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-
-    /* For caseless UTF-8 mode when UCP support is available, check whether
-    this character has more than one other case. If so, generate a special
-    OP_PROP item instead of OP_CHARI. */
-
-#ifdef SUPPORT_UCP
-    if (utf && (options & PCRE_CASELESS) != 0)
-      {
-      GETCHAR(c, mcbuffer);
-      if ((c = UCD_CASESET(c)) != 0)
-        {
-        *code++ = OP_PROP;
-        *code++ = PT_CLIST;
-        *code++ = c;
-        if (firstcharflags == REQ_UNSET)
-          firstcharflags = zerofirstcharflags = REQ_NONE;
-        break;
-        }
-      }
-#endif
-
-    /* Caseful matches, or not one of the multicase characters. */
-
-    *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARI : OP_CHAR;
-    for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
-
-    /* Remember if \r or \n were seen */
-
-    if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
-      cd->external_flags |= PCRE_HASCRORLF;
-
-    /* Set the first and required bytes appropriately. If no previous first
-    byte, set it from this character, but revert to none on a zero repeat.
-    Otherwise, leave the firstchar value alone, and don't change it on a zero
-    repeat. */
-
-    if (firstcharflags == REQ_UNSET)
-      {
-      zerofirstcharflags = REQ_NONE;
-      zeroreqchar = reqchar;
-      zeroreqcharflags = reqcharflags;
-
-      /* If the character is more than one byte long, we can set firstchar
-      only if it is not to be matched caselessly. */
-
-      if (mclength == 1 || req_caseopt == 0)
-        {
-        firstchar = mcbuffer[0] | req_caseopt;
-        firstchar = mcbuffer[0];
-        firstcharflags = req_caseopt;
-
-        if (mclength != 1)
-          {
-          reqchar = code[-1];
-          reqcharflags = cd->req_varyopt;
-          }
-        }
-      else firstcharflags = reqcharflags = REQ_NONE;
-      }
-
-    /* firstchar was previously set; we can set reqchar only if the length is
-    1 or the matching is caseful. */
-
-    else
-      {
-      zerofirstchar = firstchar;
-      zerofirstcharflags = firstcharflags;
-      zeroreqchar = reqchar;
-      zeroreqcharflags = reqcharflags;
-      if (mclength == 1 || req_caseopt == 0)
-        {
-        reqchar = code[-1];
-        reqcharflags = req_caseopt | cd->req_varyopt;
-        }
-      }
-
-    break;            /* End of literal character handling */
-    }
-  }                   /* end of big loop */
-
-
-/* Control never reaches here by falling through, only by a goto for all the
-error states. Pass back the position in the pattern so that it can be displayed
-to the user for diagnosing the error. */
-
-FAILED:
-*ptrptr = ptr;
-return FALSE;
-}
-
-
-
-/*************************************************
-*     Compile sequence of alternatives           *
-*************************************************/
-
-/* On entry, ptr is pointing past the bracket character, but on return it
-points to the closing bracket, or vertical bar, or end of string. The code
-variable is pointing at the byte into which the BRA operator has been stored.
-This function is used during the pre-compile phase when we are trying to find
-out the amount of memory needed, as well as during the real compile phase. The
-value of lengthptr distinguishes the two phases.
-
-Arguments:
-  options           option bits, including any changes for this subpattern
-  codeptr           -> the address of the current code pointer
-  ptrptr            -> the address of the current pattern pointer
-  errorcodeptr      -> pointer to error code variable
-  lookbehind        TRUE if this is a lookbehind assertion
-  reset_bracount    TRUE to reset the count for each branch
-  skipbytes         skip this many bytes at start (for brackets and OP_COND)
-  cond_depth        depth of nesting for conditional subpatterns
-  firstcharptr      place to put the first required character
-  firstcharflagsptr place to put the first character flags, or a negative number
-  reqcharptr        place to put the last required character
-  reqcharflagsptr   place to put the last required character flags, or a negative number
-  bcptr             pointer to the chain of currently open branches
-  cd                points to the data block with tables pointers etc.
-  lengthptr         NULL during the real compile phase
-                    points to length accumulator during pre-compile phase
-
-Returns:            TRUE on success
-*/
-
-static BOOL
-compile_regex(int options, pcre_uchar **codeptr, const pcre_uchar **ptrptr,
-  int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
-  int cond_depth,
-  pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
-  pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
-  branch_chain *bcptr, compile_data *cd, int *lengthptr)
-{
-const pcre_uchar *ptr = *ptrptr;
-pcre_uchar *code = *codeptr;
-pcre_uchar *last_branch = code;
-pcre_uchar *start_bracket = code;
-pcre_uchar *reverse_count = NULL;
-open_capitem capitem;
-int capnumber = 0;
-pcre_uint32 firstchar, reqchar;
-pcre_int32 firstcharflags, reqcharflags;
-pcre_uint32 branchfirstchar, branchreqchar;
-pcre_int32 branchfirstcharflags, branchreqcharflags;
-int length;
-unsigned int orig_bracount;
-unsigned int max_bracount;
-branch_chain bc;
-size_t save_hwm_offset;
-
-/* If set, call the external function that checks for stack availability. */
-
-if (PUBL(stack_guard) != NULL && PUBL(stack_guard)())
-  {
-  *errorcodeptr= ERR85;
-  return FALSE;
-  }
-
-/* Miscellaneous initialization */
-
-bc.outer = bcptr;
-bc.current_branch = code;
-
-firstchar = reqchar = 0;
-firstcharflags = reqcharflags = REQ_UNSET;
-
-save_hwm_offset = cd->hwm - cd->start_workspace;
-
-/* Accumulate the length for use in the pre-compile phase. Start with the
-length of the BRA and KET and any extra bytes that are required at the
-beginning. We accumulate in a local variable to save frequent testing of
-lenthptr for NULL. We cannot do this by looking at the value of code at the
-start and end of each alternative, because compiled items are discarded during
-the pre-compile phase so that the work space is not exceeded. */
-
-length = 2 + 2*LINK_SIZE + skipbytes;
-
-/* WARNING: If the above line is changed for any reason, you must also change
-the code that abstracts option settings at the start of the pattern and makes
-them global. It tests the value of length for (2 + 2*LINK_SIZE) in the
-pre-compile phase to find out whether anything has yet been compiled or not. */
-
-/* If this is a capturing subpattern, add to the chain of open capturing items
-so that we can detect them if (*ACCEPT) is encountered. This is also used to
-detect groups that contain recursive back references to themselves. Note that
-only OP_CBRA need be tested here; changing this opcode to one of its variants,
-e.g. OP_SCBRAPOS, happens later, after the group has been compiled. */
-
-if (*code == OP_CBRA)
-  {
-  capnumber = GET2(code, 1 + LINK_SIZE);
-  capitem.number = capnumber;
-  capitem.next = cd->open_caps;
-  capitem.flag = FALSE;
-  cd->open_caps = &capitem;
-  }
-
-/* Offset is set zero to mark that this bracket is still open */
-
-PUT(code, 1, 0);
-code += 1 + LINK_SIZE + skipbytes;
-
-/* Loop for each alternative branch */
-
-orig_bracount = max_bracount = cd->bracount;
-for (;;)
-  {
-  /* For a (?| group, reset the capturing bracket count so that each branch
-  uses the same numbers. */
-
-  if (reset_bracount) cd->bracount = orig_bracount;
-
-  /* Set up dummy OP_REVERSE if lookbehind assertion */
-
-  if (lookbehind)
-    {
-    *code++ = OP_REVERSE;
-    reverse_count = code;
-    PUTINC(code, 0, 0);
-    length += 1 + LINK_SIZE;
-    }
-
-  /* Now compile the branch; in the pre-compile phase its length gets added
-  into the length. */
-
-  if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstchar,
-        &branchfirstcharflags, &branchreqchar, &branchreqcharflags, &bc,
-        cond_depth, cd, (lengthptr == NULL)? NULL : &length))
-    {
-    *ptrptr = ptr;
-    return FALSE;
-    }
-
-  /* Keep the highest bracket count in case (?| was used and some branch
-  has fewer than the rest. */
-
-  if (cd->bracount > max_bracount) max_bracount = cd->bracount;
-
-  /* In the real compile phase, there is some post-processing to be done. */
-
-  if (lengthptr == NULL)
-    {
-    /* If this is the first branch, the firstchar and reqchar values for the
-    branch become the values for the regex. */
-
-    if (*last_branch != OP_ALT)
-      {
-      firstchar = branchfirstchar;
-      firstcharflags = branchfirstcharflags;
-      reqchar = branchreqchar;
-      reqcharflags = branchreqcharflags;
-      }
-
-    /* If this is not the first branch, the first char and reqchar have to
-    match the values from all the previous branches, except that if the
-    previous value for reqchar didn't have REQ_VARY set, it can still match,
-    and we set REQ_VARY for the regex. */
-
-    else
-      {
-      /* If we previously had a firstchar, but it doesn't match the new branch,
-      we have to abandon the firstchar for the regex, but if there was
-      previously no reqchar, it takes on the value of the old firstchar. */
-
-      if (firstcharflags >= 0 &&
-          (firstcharflags != branchfirstcharflags || firstchar != branchfirstchar))
-        {
-        if (reqcharflags < 0)
-          {
-          reqchar = firstchar;
-          reqcharflags = firstcharflags;
-          }
-        firstcharflags = REQ_NONE;
-        }
-
-      /* If we (now or from before) have no firstchar, a firstchar from the
-      branch becomes a reqchar if there isn't a branch reqchar. */
-
-      if (firstcharflags < 0 && branchfirstcharflags >= 0 && branchreqcharflags < 0)
-        {
-        branchreqchar = branchfirstchar;
-        branchreqcharflags = branchfirstcharflags;
-        }
-
-      /* Now ensure that the reqchars match */
-
-      if (((reqcharflags & ~REQ_VARY) != (branchreqcharflags & ~REQ_VARY)) ||
-          reqchar != branchreqchar)
-        reqcharflags = REQ_NONE;
-      else
-        {
-        reqchar = branchreqchar;
-        reqcharflags |= branchreqcharflags; /* To "or" REQ_VARY */
-        }
-      }
-
-    /* If lookbehind, check that this branch matches a fixed-length string, and
-    put the length into the OP_REVERSE item. Temporarily mark the end of the
-    branch with OP_END. If the branch contains OP_RECURSE, the result is -3
-    because there may be forward references that we can't check here. Set a
-    flag to cause another lookbehind check at the end. Why not do it all at the
-    end? Because common, erroneous checks are picked up here and the offset of
-    the problem can be shown. */
-
-    if (lookbehind)
-      {
-      int fixed_length;
-      *code = OP_END;
-      fixed_length = find_fixedlength(last_branch,  (options & PCRE_UTF8) != 0,
-        FALSE, cd, NULL);
-      DPRINTF(("fixed length = %d\n", fixed_length));
-      if (fixed_length == -3)
-        {
-        cd->check_lookbehind = TRUE;
-        }
-      else if (fixed_length < 0)
-        {
-        *errorcodeptr = (fixed_length == -2)? ERR36 :
-                        (fixed_length == -4)? ERR70: ERR25;
-        *ptrptr = ptr;
-        return FALSE;
-        }
-      else
-        {
-        if (fixed_length > cd->max_lookbehind)
-          cd->max_lookbehind = fixed_length;
-        PUT(reverse_count, 0, fixed_length);
-        }
-      }
-    }
-
-  /* Reached end of expression, either ')' or end of pattern. In the real
-  compile phase, go back through the alternative branches and reverse the chain
-  of offsets, with the field in the BRA item now becoming an offset to the
-  first alternative. If there are no alternatives, it points to the end of the
-  group. The length in the terminating ket is always the length of the whole
-  bracketed item. Return leaving the pointer at the terminating char. */
-
-  if (*ptr != CHAR_VERTICAL_LINE)
-    {
-    if (lengthptr == NULL)
-      {
-      int branch_length = (int)(code - last_branch);
-      do
-        {
-        int prev_length = GET(last_branch, 1);
-        PUT(last_branch, 1, branch_length);
-        branch_length = prev_length;
-        last_branch -= branch_length;
-        }
-      while (branch_length > 0);
-      }
-
-    /* Fill in the ket */
-
-    *code = OP_KET;
-    PUT(code, 1, (int)(code - start_bracket));
-    code += 1 + LINK_SIZE;
-
-    /* If it was a capturing subpattern, check to see if it contained any
-    recursive back references. If so, we must wrap it in atomic brackets.
-    Because we are moving code along, we must ensure that any pending recursive
-    references are updated. In any event, remove the block from the chain. */
-
-    if (capnumber > 0)
-      {
-      if (cd->open_caps->flag)
-        {
-        *code = OP_END;
-        adjust_recurse(start_bracket, 1 + LINK_SIZE,
-          (options & PCRE_UTF8) != 0, cd, save_hwm_offset);
-        memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
-          IN_UCHARS(code - start_bracket));
-        *start_bracket = OP_ONCE;
-        code += 1 + LINK_SIZE;
-        PUT(start_bracket, 1, (int)(code - start_bracket));
-        *code = OP_KET;
-        PUT(code, 1, (int)(code - start_bracket));
-        code += 1 + LINK_SIZE;
-        length += 2 + 2*LINK_SIZE;
-        }
-      cd->open_caps = cd->open_caps->next;
-      }
-
-    /* Retain the highest bracket number, in case resetting was used. */
-
-    cd->bracount = max_bracount;
-
-    /* Set values to pass back */
-
-    *codeptr = code;
-    *ptrptr = ptr;
-    *firstcharptr = firstchar;
-    *firstcharflagsptr = firstcharflags;
-    *reqcharptr = reqchar;
-    *reqcharflagsptr = reqcharflags;
-    if (lengthptr != NULL)
-      {
-      if (OFLOW_MAX - *lengthptr < length)
-        {
-        *errorcodeptr = ERR20;
-        return FALSE;
-        }
-      *lengthptr += length;
-      }
-    return TRUE;
-    }
-
-  /* Another branch follows. In the pre-compile phase, we can move the code
-  pointer back to where it was for the start of the first branch. (That is,
-  pretend that each branch is the only one.)
-
-  In the real compile phase, insert an ALT node. Its length field points back
-  to the previous branch while the bracket remains open. At the end the chain
-  is reversed. It's done like this so that the start of the bracket has a
-  zero offset until it is closed, making it possible to detect recursion. */
-
-  if (lengthptr != NULL)
-    {
-    code = *codeptr + 1 + LINK_SIZE + skipbytes;
-    length += 1 + LINK_SIZE;
-    }
-  else
-    {
-    *code = OP_ALT;
-    PUT(code, 1, (int)(code - last_branch));
-    bc.current_branch = last_branch = code;
-    code += 1 + LINK_SIZE;
-    }
-
-  ptr++;
-  }
-/* Control never reaches here */
-}
-
-
-
-
-/*************************************************
-*          Check for anchored expression         *
-*************************************************/
-
-/* Try to find out if this is an anchored regular expression. Consider each
-alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket
-all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then
-it's anchored. However, if this is a multiline pattern, then only OP_SOD will
-be found, because ^ generates OP_CIRCM in that mode.
-
-We can also consider a regex to be anchored if OP_SOM starts all its branches.
-This is the code for \G, which means "match at start of match position, taking
-into account the match offset".
-
-A branch is also implicitly anchored if it starts with .* and DOTALL is set,
-because that will try the rest of the pattern at all possible matching points,
-so there is no point trying again.... er ....
-
-.... except when the .* appears inside capturing parentheses, and there is a
-subsequent back reference to those parentheses. We haven't enough information
-to catch that case precisely.
-
-At first, the best we could do was to detect when .* was in capturing brackets
-and the highest back reference was greater than or equal to that level.
-However, by keeping a bitmap of the first 31 back references, we can catch some
-of the more common cases more precisely.
-
-... A second exception is when the .* appears inside an atomic group, because
-this prevents the number of characters it matches from being adjusted.
-
-Arguments:
-  code           points to start of expression (the bracket)
-  bracket_map    a bitmap of which brackets we are inside while testing; this
-                  handles up to substring 31; after that we just have to take
-                  the less precise approach
-  cd             points to the compile data block
-  atomcount      atomic group level
-
-Returns:     TRUE or FALSE
-*/
-
-static BOOL
-is_anchored(register const pcre_uchar *code, unsigned int bracket_map,
-  compile_data *cd, int atomcount)
-{
-do {
-   const pcre_uchar *scode = first_significant_code(
-     code + PRIV(OP_lengths)[*code], FALSE);
-   register int op = *scode;
-
-   /* Non-capturing brackets */
-
-   if (op == OP_BRA  || op == OP_BRAPOS ||
-       op == OP_SBRA || op == OP_SBRAPOS)
-     {
-     if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Capturing brackets */
-
-   else if (op == OP_CBRA  || op == OP_CBRAPOS ||
-            op == OP_SCBRA || op == OP_SCBRAPOS)
-     {
-     int n = GET2(scode, 1+LINK_SIZE);
-     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
-     if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Positive forward assertions and conditions */
-
-   else if (op == OP_ASSERT || op == OP_COND)
-     {
-     if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Atomic groups */
-
-   else if (op == OP_ONCE || op == OP_ONCE_NC)
-     {
-     if (!is_anchored(scode, bracket_map, cd, atomcount + 1))
-       return FALSE;
-     }
-
-   /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
-   it isn't in brackets that are or may be referenced or inside an atomic
-   group. */
-
-   else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
-             op == OP_TYPEPOSSTAR))
-     {
-     if (scode[1] != OP_ALLANY || (bracket_map & cd->backref_map) != 0 ||
-         atomcount > 0 || cd->had_pruneorskip)
-       return FALSE;
-     }
-
-   /* Check for explicit anchoring */
-
-   else if (op != OP_SOD && op != OP_SOM && op != OP_CIRC) return FALSE;
-
-   code += GET(code, 1);
-   }
-while (*code == OP_ALT);   /* Loop for each alternative */
-return TRUE;
-}
-
-
-
-/*************************************************
-*         Check for starting with ^ or .*        *
-*************************************************/
-
-/* This is called to find out if every branch starts with ^ or .* so that
-"first char" processing can be done to speed things up in multiline
-matching and for non-DOTALL patterns that start with .* (which must start at
-the beginning or after \n). As in the case of is_anchored() (see above), we
-have to take account of back references to capturing brackets that contain .*
-because in that case we can't make the assumption. Also, the appearance of .*
-inside atomic brackets or in a pattern that contains *PRUNE or *SKIP does not
-count, because once again the assumption no longer holds.
-
-Arguments:
-  code           points to start of expression (the bracket)
-  bracket_map    a bitmap of which brackets we are inside while testing; this
-                  handles up to substring 31; after that we just have to take
-                  the less precise approach
-  cd             points to the compile data
-  atomcount      atomic group level
-
-Returns:         TRUE or FALSE
-*/
-
-static BOOL
-is_startline(const pcre_uchar *code, unsigned int bracket_map,
-  compile_data *cd, int atomcount)
-{
-do {
-   const pcre_uchar *scode = first_significant_code(
-     code + PRIV(OP_lengths)[*code], FALSE);
-   register int op = *scode;
-
-   /* If we are at the start of a conditional assertion group, *both* the
-   conditional assertion *and* what follows the condition must satisfy the test
-   for start of line. Other kinds of condition fail. Note that there may be an
-   auto-callout at the start of a condition. */
-
-   if (op == OP_COND)
-     {
-     scode += 1 + LINK_SIZE;
-     if (*scode == OP_CALLOUT) scode += PRIV(OP_lengths)[OP_CALLOUT];
-     switch (*scode)
-       {
-       case OP_CREF:
-       case OP_DNCREF:
-       case OP_RREF:
-       case OP_DNRREF:
-       case OP_DEF:
-       case OP_FAIL:
-       return FALSE;
-
-       default:     /* Assertion */
-       if (!is_startline(scode, bracket_map, cd, atomcount)) return FALSE;
-       do scode += GET(scode, 1); while (*scode == OP_ALT);
-       scode += 1 + LINK_SIZE;
-       break;
-       }
-     scode = first_significant_code(scode, FALSE);
-     op = *scode;
-     }
-
-   /* Non-capturing brackets */
-
-   if (op == OP_BRA  || op == OP_BRAPOS ||
-       op == OP_SBRA || op == OP_SBRAPOS)
-     {
-     if (!is_startline(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Capturing brackets */
-
-   else if (op == OP_CBRA  || op == OP_CBRAPOS ||
-            op == OP_SCBRA || op == OP_SCBRAPOS)
-     {
-     int n = GET2(scode, 1+LINK_SIZE);
-     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
-     if (!is_startline(scode, new_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Positive forward assertions */
-
-   else if (op == OP_ASSERT)
-     {
-     if (!is_startline(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Atomic brackets */
-
-   else if (op == OP_ONCE || op == OP_ONCE_NC)
-     {
-     if (!is_startline(scode, bracket_map, cd, atomcount + 1)) return FALSE;
-     }
-
-   /* .* means "start at start or after \n" if it isn't in atomic brackets or
-   brackets that may be referenced, as long as the pattern does not contain
-   *PRUNE or *SKIP, because these break the feature. Consider, for example,
-   /.*?a(*PRUNE)b/ with the subject "aab", which matches "ab", i.e. not at the
-   start of a line. */
-
-   else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR || op == OP_TYPEPOSSTAR)
-     {
-     if (scode[1] != OP_ANY || (bracket_map & cd->backref_map) != 0 ||
-         atomcount > 0 || cd->had_pruneorskip)
-       return FALSE;
-     }
-
-   /* Check for explicit circumflex; anything else gives a FALSE result. Note
-   in particular that this includes atomic brackets OP_ONCE and OP_ONCE_NC
-   because the number of characters matched by .* cannot be adjusted inside
-   them. */
-
-   else if (op != OP_CIRC && op != OP_CIRCM) return FALSE;
-
-   /* Move on to the next alternative */
-
-   code += GET(code, 1);
-   }
-while (*code == OP_ALT);  /* Loop for each alternative */
-return TRUE;
-}
-
-
-
-/*************************************************
-*       Check for asserted fixed first char      *
-*************************************************/
-
-/* During compilation, the "first char" settings from forward assertions are
-discarded, because they can cause conflicts with actual literals that follow.
-However, if we end up without a first char setting for an unanchored pattern,
-it is worth scanning the regex to see if there is an initial asserted first
-char. If all branches start with the same asserted char, or with a
-non-conditional bracket all of whose alternatives start with the same asserted
-char (recurse ad lib), then we return that char, with the flags set to zero or
-REQ_CASELESS; otherwise return zero with REQ_NONE in the flags.
-
-Arguments:
-  code       points to start of expression (the bracket)
-  flags      points to the first char flags, or to REQ_NONE
-  inassert   TRUE if in an assertion
-
-Returns:     the fixed first char, or 0 with REQ_NONE in flags
-*/
-
-static pcre_uint32
-find_firstassertedchar(const pcre_uchar *code, pcre_int32 *flags,
-  BOOL inassert)
-{
-register pcre_uint32 c = 0;
-int cflags = REQ_NONE;
-
-*flags = REQ_NONE;
-do {
-   pcre_uint32 d;
-   int dflags;
-   int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
-             *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
-   const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,
-     TRUE);
-   register pcre_uchar op = *scode;
-
-   switch(op)
-     {
-     default:
-     return 0;
-
-     case OP_BRA:
-     case OP_BRAPOS:
-     case OP_CBRA:
-     case OP_SCBRA:
-     case OP_CBRAPOS:
-     case OP_SCBRAPOS:
-     case OP_ASSERT:
-     case OP_ONCE:
-     case OP_ONCE_NC:
-     d = find_firstassertedchar(scode, &dflags, op == OP_ASSERT);
-     if (dflags < 0)
-       return 0;
-     if (cflags < 0) { c = d; cflags = dflags; } else if (c != d || cflags != dflags) return 0;
-     break;
-
-     case OP_EXACT:
-     scode += IMM2_SIZE;
-     /* Fall through */
-
-     case OP_CHAR:
-     case OP_PLUS:
-     case OP_MINPLUS:
-     case OP_POSPLUS:
-     if (!inassert) return 0;
-     if (cflags < 0) { c = scode[1]; cflags = 0; }
-       else if (c != scode[1]) return 0;
-     break;
-
-     case OP_EXACTI:
-     scode += IMM2_SIZE;
-     /* Fall through */
-
-     case OP_CHARI:
-     case OP_PLUSI:
-     case OP_MINPLUSI:
-     case OP_POSPLUSI:
-     if (!inassert) return 0;
-     if (cflags < 0) { c = scode[1]; cflags = REQ_CASELESS; }
-       else if (c != scode[1]) return 0;
-     break;
-     }
-
-   code += GET(code, 1);
-   }
-while (*code == OP_ALT);
-
-*flags = cflags;
-return c;
-}
-
-
-
-/*************************************************
-*     Add an entry to the name/number table      *
-*************************************************/
-
-/* This function is called between compiling passes to add an entry to the
-name/number table, maintaining alphabetical order. Checking for permitted
-and forbidden duplicates has already been done.
-
-Arguments:
-  cd           the compile data block
-  name         the name to add
-  length       the length of the name
-  groupno      the group number
-
-Returns:       nothing
-*/
-
-static void
-add_name(compile_data *cd, const pcre_uchar *name, int length,
-  unsigned int groupno)
-{
-int i;
-pcre_uchar *slot = cd->name_table;
-
-for (i = 0; i < cd->names_found; i++)
-  {
-  int crc = memcmp(name, slot+IMM2_SIZE, IN_UCHARS(length));
-  if (crc == 0 && slot[IMM2_SIZE+length] != 0)
-    crc = -1; /* Current name is a substring */
-
-  /* Make space in the table and break the loop for an earlier name. For a
-  duplicate or later name, carry on. We do this for duplicates so that in the
-  simple case (when ?(| is not used) they are in order of their numbers. In all
-  cases they are in the order in which they appear in the pattern. */
-
-  if (crc < 0)
-    {
-    memmove(slot + cd->name_entry_size, slot,
-      IN_UCHARS((cd->names_found - i) * cd->name_entry_size));
-    break;
-    }
-
-  /* Continue the loop for a later or duplicate name */
-
-  slot += cd->name_entry_size;
-  }
-
-PUT2(slot, 0, groupno);
-memcpy(slot + IMM2_SIZE, name, IN_UCHARS(length));
-slot[IMM2_SIZE + length] = 0;
-cd->names_found++;
-}
-
-
-
-/*************************************************
-*        Compile a Regular Expression            *
-*************************************************/
-
-/* This function takes a string and returns a pointer to a block of store
-holding a compiled version of the expression. The original API for this
-function had no error code return variable; it is retained for backwards
-compatibility. The new function is given a new name.
-
-Arguments:
-  pattern       the regular expression
-  options       various option bits
-  errorcodeptr  pointer to error code variable (pcre_compile2() only)
-                  can be NULL if you don't want a code value
-  errorptr      pointer to pointer to error text
-  erroroffset   ptr offset in pattern where error was detected
-  tables        pointer to character tables or NULL
-
-Returns:        pointer to compiled data block, or NULL on error,
-                with errorptr and erroroffset set
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
-pcre_compile(const char *pattern, int options, const char **errorptr,
-  int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN pcre16 * PCRE_CALL_CONVENTION
-pcre16_compile(PCRE_SPTR16 pattern, int options, const char **errorptr,
-  int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN pcre32 * PCRE_CALL_CONVENTION
-pcre32_compile(PCRE_SPTR32 pattern, int options, const char **errorptr,
-  int *erroroffset, const unsigned char *tables)
-#endif
-{
-#if defined COMPILE_PCRE8
-return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
-#elif defined COMPILE_PCRE16
-return pcre16_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
-#elif defined COMPILE_PCRE32
-return pcre32_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
-#endif
-}
-
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
-pcre_compile2(const char *pattern, int options, int *errorcodeptr,
-  const char **errorptr, int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN pcre16 * PCRE_CALL_CONVENTION
-pcre16_compile2(PCRE_SPTR16 pattern, int options, int *errorcodeptr,
-  const char **errorptr, int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN pcre32 * PCRE_CALL_CONVENTION
-pcre32_compile2(PCRE_SPTR32 pattern, int options, int *errorcodeptr,
-  const char **errorptr, int *erroroffset, const unsigned char *tables)
-#endif
-{
-REAL_PCRE *re;
-int length = 1;  /* For final END opcode */
-pcre_int32 firstcharflags, reqcharflags;
-pcre_uint32 firstchar, reqchar;
-pcre_uint32 limit_match = PCRE_UINT32_MAX;
-pcre_uint32 limit_recursion = PCRE_UINT32_MAX;
-int newline;
-int errorcode = 0;
-int skipatstart = 0;
-BOOL utf;
-BOOL never_utf = FALSE;
-size_t size;
-pcre_uchar *code;
-const pcre_uchar *codestart;
-const pcre_uchar *ptr;
-compile_data compile_block;
-compile_data *cd = &compile_block;
-
-/* This space is used for "compiling" into during the first phase, when we are
-computing the amount of memory that is needed. Compiled items are thrown away
-as soon as possible, so that a fairly large buffer should be sufficient for
-this purpose. The same space is used in the second phase for remembering where
-to fill in forward references to subpatterns. That may overflow, in which case
-new memory is obtained from malloc(). */
-
-pcre_uchar cworkspace[COMPILE_WORK_SIZE];
-
-/* This vector is used for remembering name groups during the pre-compile. In a
-similar way to cworkspace, it can be expanded using malloc() if necessary. */
-
-named_group named_groups[NAMED_GROUP_LIST_SIZE];
-
-/* Set this early so that early errors get offset 0. */
-
-ptr = (const pcre_uchar *)pattern;
-
-/* We can't pass back an error message if errorptr is NULL; I guess the best we
-can do is just return NULL, but we can set a code value if there is a code
-pointer. */
-
-if (errorptr == NULL)
-  {
-  if (errorcodeptr != NULL) *errorcodeptr = 99;
-  return NULL;
-  }
-
-*errorptr = NULL;
-if (errorcodeptr != NULL) *errorcodeptr = ERR0;
-
-/* However, we can give a message for this error */
-
-if (erroroffset == NULL)
-  {
-  errorcode = ERR16;
-  goto PCRE_EARLY_ERROR_RETURN2;
-  }
-
-*erroroffset = 0;
-
-/* Set up pointers to the individual character tables */
-
-if (tables == NULL) tables = PRIV(default_tables);
-cd->lcc = tables + lcc_offset;
-cd->fcc = tables + fcc_offset;
-cd->cbits = tables + cbits_offset;
-cd->ctypes = tables + ctypes_offset;
-
-/* Check that all undefined public option bits are zero */
-
-if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0)
-  {
-  errorcode = ERR17;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* If PCRE_NEVER_UTF is set, remember it. */
-
-if ((options & PCRE_NEVER_UTF) != 0) never_utf = TRUE;
-
-/* Check for global one-time settings at the start of the pattern, and remember
-the offset for later. */
-
-cd->external_flags = 0;   /* Initialize here for LIMIT_MATCH/RECURSION */
-
-while (ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
-       ptr[skipatstart+1] == CHAR_ASTERISK)
-  {
-  int newnl = 0;
-  int newbsr = 0;
-
-/* For completeness and backward compatibility, (*UTFn) is supported in the
-relevant libraries, but (*UTF) is generic and always supported. Note that
-PCRE_UTF8 == PCRE_UTF16 == PCRE_UTF32. */
-
-#ifdef COMPILE_PCRE8
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF8_RIGHTPAR, 5) == 0)
-    { skipatstart += 7; options |= PCRE_UTF8; continue; }
-#endif
-#ifdef COMPILE_PCRE16
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF16_RIGHTPAR, 6) == 0)
-    { skipatstart += 8; options |= PCRE_UTF16; continue; }
-#endif
-#ifdef COMPILE_PCRE32
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF32_RIGHTPAR, 6) == 0)
-    { skipatstart += 8; options |= PCRE_UTF32; continue; }
-#endif
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF_RIGHTPAR, 4) == 0)
-    { skipatstart += 6; options |= PCRE_UTF8; continue; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UCP_RIGHTPAR, 4) == 0)
-    { skipatstart += 6; options |= PCRE_UCP; continue; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_AUTO_POSSESS_RIGHTPAR, 16) == 0)
-    { skipatstart += 18; options |= PCRE_NO_AUTO_POSSESS; continue; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_START_OPT_RIGHTPAR, 13) == 0)
-    { skipatstart += 15; options |= PCRE_NO_START_OPTIMIZE; continue; }
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LIMIT_MATCH_EQ, 12) == 0)
-    {
-    pcre_uint32 c = 0;
-    int p = skipatstart + 14;
-    while (isdigit(ptr[p]))
-      {
-      if (c > PCRE_UINT32_MAX / 10 - 1) break;   /* Integer overflow */
-      c = c*10 + ptr[p++] - CHAR_0;
-      }
-    if (ptr[p++] != CHAR_RIGHT_PARENTHESIS) break;
-    if (c < limit_match)
-      {
-      limit_match = c;
-      cd->external_flags |= PCRE_MLSET;
-      }
-    skipatstart = p;
-    continue;
-    }
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LIMIT_RECURSION_EQ, 16) == 0)
-    {
-    pcre_uint32 c = 0;
-    int p = skipatstart + 18;
-    while (isdigit(ptr[p]))
-      {
-      if (c > PCRE_UINT32_MAX / 10 - 1) break;   /* Integer overflow check */
-      c = c*10 + ptr[p++] - CHAR_0;
-      }
-    if (ptr[p++] != CHAR_RIGHT_PARENTHESIS) break;
-    if (c < limit_recursion)
-      {
-      limit_recursion = c;
-      cd->external_flags |= PCRE_RLSET;
-      }
-    skipatstart = p;
-    continue;
-    }
-
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_CR_RIGHTPAR, 3) == 0)
-    { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LF_RIGHTPAR, 3)  == 0)
-    { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_CRLF_RIGHTPAR, 5)  == 0)
-    { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_ANY_RIGHTPAR, 4) == 0)
-    { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_ANYCRLF_RIGHTPAR, 8) == 0)
-    { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
-    { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
-    { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
-
-  if (newnl != 0)
-    options = (options & ~PCRE_NEWLINE_BITS) | newnl;
-  else if (newbsr != 0)
-    options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
-  else break;
-  }
-
-/* PCRE_UTF(16|32) have the same value as PCRE_UTF8. */
-utf = (options & PCRE_UTF8) != 0;
-if (utf && never_utf)
-  {
-  errorcode = ERR78;
-  goto PCRE_EARLY_ERROR_RETURN2;
-  }
-
-/* Can't support UTF unless PCRE has been compiled to include the code. The
-return of an error code from PRIV(valid_utf)() is a new feature, introduced in
-release 8.13. It is passed back from pcre_[dfa_]exec(), but at the moment is
-not used here. */
-
-#ifdef SUPPORT_UTF
-if (utf && (options & PCRE_NO_UTF8_CHECK) == 0 &&
-     (errorcode = PRIV(valid_utf)((PCRE_PUCHAR)pattern, -1, erroroffset)) != 0)
-  {
-#if defined COMPILE_PCRE8
-  errorcode = ERR44;
-#elif defined COMPILE_PCRE16
-  errorcode = ERR74;
-#elif defined COMPILE_PCRE32
-  errorcode = ERR77;
-#endif
-  goto PCRE_EARLY_ERROR_RETURN2;
-  }
-#else
-if (utf)
-  {
-  errorcode = ERR32;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-#endif
-
-/* Can't support UCP unless PCRE has been compiled to include the code. */
-
-#ifndef SUPPORT_UCP
-if ((options & PCRE_UCP) != 0)
-  {
-  errorcode = ERR67;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-#endif
-
-/* Check validity of \R options. */
-
-if ((options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) ==
-     (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
-  {
-  errorcode = ERR56;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Handle different types of newline. The three bits give seven cases. The
-current code allows for fixed one- or two-byte sequences, plus "any" and
-"anycrlf". */
-
-switch (options & PCRE_NEWLINE_BITS)
-  {
-  case 0: newline = NEWLINE; break;   /* Build-time default */
-  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: newline = -1; break;
-  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
-  default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-if (newline == -2)
-  {
-  cd->nltype = NLTYPE_ANYCRLF;
-  }
-else if (newline < 0)
-  {
-  cd->nltype = NLTYPE_ANY;
-  }
-else
-  {
-  cd->nltype = NLTYPE_FIXED;
-  if (newline > 255)
-    {
-    cd->nllen = 2;
-    cd->nl[0] = (newline >> 8) & 255;
-    cd->nl[1] = newline & 255;
-    }
-  else
-    {
-    cd->nllen = 1;
-    cd->nl[0] = newline;
-    }
-  }
-
-/* Maximum back reference and backref bitmap. The bitmap records up to 31 back
-references to help in deciding whether (.*) can be treated as anchored or not.
-*/
-
-cd->top_backref = 0;
-cd->backref_map = 0;
-
-/* Reflect pattern for debugging output */
-
-DPRINTF(("------------------------------------------------------------------\n"));
-#ifdef PCRE_DEBUG
-print_puchar(stdout, (PCRE_PUCHAR)pattern);
-#endif
-DPRINTF(("\n"));
-
-/* Pretend to compile the pattern while actually just accumulating the length
-of memory required. This behaviour is triggered by passing a non-NULL final
-argument to compile_regex(). We pass a block of workspace (cworkspace) for it
-to compile parts of the pattern into; the compiled code is discarded when it is
-no longer needed, so hopefully this workspace will never overflow, though there
-is a test for its doing so. */
-
-cd->bracount = cd->final_bracount = 0;
-cd->names_found = 0;
-cd->name_entry_size = 0;
-cd->name_table = NULL;
-cd->dupnames = FALSE;
-cd->dupgroups = FALSE;
-cd->namedrefcount = 0;
-cd->start_code = cworkspace;
-cd->hwm = cworkspace;
-cd->iscondassert = FALSE;
-cd->start_workspace = cworkspace;
-cd->workspace_size = COMPILE_WORK_SIZE;
-cd->named_groups = named_groups;
-cd->named_group_list_size = NAMED_GROUP_LIST_SIZE;
-cd->start_pattern = (const pcre_uchar *)pattern;
-cd->end_pattern = (const pcre_uchar *)(pattern + STRLEN_UC((const pcre_uchar *)pattern));
-cd->req_varyopt = 0;
-cd->parens_depth = 0;
-cd->assert_depth = 0;
-cd->max_lookbehind = 0;
-cd->external_options = options;
-cd->open_caps = NULL;
-
-/* Now do the pre-compile. On error, errorcode will be set non-zero, so we
-don't need to look at the result of the function here. The initial options have
-been put into the cd block so that they can be changed if an option setting is
-found within the regex right at the beginning. Bringing initial option settings
-outside can help speed up starting point checks. */
-
-ptr += skipatstart;
-code = cworkspace;
-*code = OP_BRA;
-
-(void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,
-  FALSE, 0, 0, &firstchar, &firstcharflags, &reqchar, &reqcharflags, NULL,
-  cd, &length);
-if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
-
-DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
-  (int)(cd->hwm - cworkspace)));
-
-if (length > MAX_PATTERN_SIZE)
-  {
-  errorcode = ERR20;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Compute the size of the data block for storing the compiled pattern. Integer
-overflow should no longer be possible because nowadays we limit the maximum
-value of cd->names_found and cd->name_entry_size. */
-
-size = sizeof(REAL_PCRE) +
-  (length + cd->names_found * cd->name_entry_size) * sizeof(pcre_uchar);
-
-/* Get the memory. */
-
-re = (REAL_PCRE *)(PUBL(malloc))(size);
-if (re == NULL)
-  {
-  errorcode = ERR21;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Put in the magic number, and save the sizes, initial options, internal
-flags, and character table pointer. NULL is used for the default character
-tables. The nullpad field is at the end; it's there to help in the case when a
-regex compiled on a system with 4-byte pointers is run on another with 8-byte
-pointers. */
-
-re->magic_number = MAGIC_NUMBER;
-re->size = (int)size;
-re->options = cd->external_options;
-re->flags = cd->external_flags;
-re->limit_match = limit_match;
-re->limit_recursion = limit_recursion;
-re->first_char = 0;
-re->req_char = 0;
-re->name_table_offset = sizeof(REAL_PCRE) / sizeof(pcre_uchar);
-re->name_entry_size = cd->name_entry_size;
-re->name_count = cd->names_found;
-re->ref_count = 0;
-re->tables = (tables == PRIV(default_tables))? NULL : tables;
-re->nullpad = NULL;
-#ifdef COMPILE_PCRE32
-re->dummy = 0;
-#else
-re->dummy1 = re->dummy2 = re->dummy3 = 0;
-#endif
-
-/* The starting points of the name/number translation table and of the code are
-passed around in the compile data block. The start/end pattern and initial
-options are already set from the pre-compile phase, as is the name_entry_size
-field. Reset the bracket count and the names_found field. Also reset the hwm
-field; this time it's used for remembering forward references to subpatterns.
-*/
-
-cd->final_bracount = cd->bracount;  /* Save for checking forward references */
-cd->parens_depth = 0;
-cd->assert_depth = 0;
-cd->bracount = 0;
-cd->max_lookbehind = 0;
-cd->name_table = (pcre_uchar *)re + re->name_table_offset;
-codestart = cd->name_table + re->name_entry_size * re->name_count;
-cd->start_code = codestart;
-cd->hwm = (pcre_uchar *)(cd->start_workspace);
-cd->iscondassert = FALSE;
-cd->req_varyopt = 0;
-cd->had_accept = FALSE;
-cd->had_pruneorskip = FALSE;
-cd->check_lookbehind = FALSE;
-cd->open_caps = NULL;
-
-/* If any named groups were found, create the name/number table from the list
-created in the first pass. */
-
-if (cd->names_found > 0)
-  {
-  int i = cd->names_found;
-  named_group *ng = cd->named_groups;
-  cd->names_found = 0;
-  for (; i > 0; i--, ng++)
-    add_name(cd, ng->name, ng->length, ng->number);
-  if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
-    (PUBL(free))((void *)cd->named_groups);
-  }
-
-/* Set up a starting, non-extracting bracket, then compile the expression. On
-error, errorcode will be set non-zero, so we don't need to look at the result
-of the function here. */
-
-ptr = (const pcre_uchar *)pattern + skipatstart;
-code = (pcre_uchar *)codestart;
-*code = OP_BRA;
-(void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,
-  &firstchar, &firstcharflags, &reqchar, &reqcharflags, NULL, cd, NULL);
-re->top_bracket = cd->bracount;
-re->top_backref = cd->top_backref;
-re->max_lookbehind = cd->max_lookbehind;
-re->flags = cd->external_flags | PCRE_MODE;
-
-if (cd->had_accept)
-  {
-  reqchar = 0;              /* Must disable after (*ACCEPT) */
-  reqcharflags = REQ_NONE;
-  }
-
-/* If not reached end of pattern on success, there's an excess bracket. */
-
-if (errorcode == 0 && *ptr != CHAR_NULL) errorcode = ERR22;
-
-/* Fill in the terminating state and check for disastrous overflow, but
-if debugging, leave the test till after things are printed out. */
-
-*code++ = OP_END;
-
-#ifndef PCRE_DEBUG
-if (code - codestart > length) errorcode = ERR23;
-#endif
-
-#ifdef SUPPORT_VALGRIND
-/* If the estimated length exceeds the really used length, mark the extra
-allocated memory as unaddressable, so that any out-of-bound reads can be
-detected. */
-VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
-#endif
-
-/* Fill in any forward references that are required. There may be repeated
-references; optimize for them, as searching a large regex takes time. */
-
-if (cd->hwm > cd->start_workspace)
-  {
-  int prev_recno = -1;
-  const pcre_uchar *groupptr = NULL;
-  while (errorcode == 0 && cd->hwm > cd->start_workspace)
-    {
-    int offset, recno;
-    cd->hwm -= LINK_SIZE;
-    offset = GET(cd->hwm, 0);
-
-    /* Check that the hwm handling hasn't gone wrong. This whole area is
-    rewritten in PCRE2 because there are some obscure cases. */
-
-    if (offset == 0 || codestart[offset-1] != OP_RECURSE)
-      {
-      errorcode = ERR10;
-      break;
-      }
-
-    recno = GET(codestart, offset);
-    if (recno != prev_recno)
-      {
-      groupptr = PRIV(find_bracket)(codestart, utf, recno);
-      prev_recno = recno;
-      }
-    if (groupptr == NULL) errorcode = ERR53;
-      else PUT(((pcre_uchar *)codestart), offset, (int)(groupptr - codestart));
-    }
-  }
-
-/* If the workspace had to be expanded, free the new memory. Set the pointer to
-NULL to indicate that forward references have been filled in. */
-
-if (cd->workspace_size > COMPILE_WORK_SIZE)
-  (PUBL(free))((void *)cd->start_workspace);
-cd->start_workspace = NULL;
-
-/* Give an error if there's back reference to a non-existent capturing
-subpattern. */
-
-if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
-
-/* Unless disabled, check whether any single character iterators can be
-auto-possessified. The function overwrites the appropriate opcode values, so
-the type of the pointer must be cast. NOTE: the intermediate variable "temp" is
-used in this code because at least one compiler gives a warning about loss of
-"const" attribute if the cast (pcre_uchar *)codestart is used directly in the
-function call. */
-
-if (errorcode == 0 && (options & PCRE_NO_AUTO_POSSESS) == 0)
-  {
-  pcre_uchar *temp = (pcre_uchar *)codestart;
-  auto_possessify(temp, utf, cd);
-  }
-
-/* If there were any lookbehind assertions that contained OP_RECURSE
-(recursions or subroutine calls), a flag is set for them to be checked here,
-because they may contain forward references. Actual recursions cannot be fixed
-length, but subroutine calls can. It is done like this so that those without
-OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
-exceptional ones forgo this. We scan the pattern to check that they are fixed
-length, and set their lengths. */
-
-if (errorcode == 0 && cd->check_lookbehind)
-  {
-  pcre_uchar *cc = (pcre_uchar *)codestart;
-
-  /* Loop, searching for OP_REVERSE items, and process those that do not have
-  their length set. (Actually, it will also re-process any that have a length
-  of zero, but that is a pathological case, and it does no harm.) When we find
-  one, we temporarily terminate the branch it is in while we scan it. */
-
-  for (cc = (pcre_uchar *)PRIV(find_bracket)(codestart, utf, -1);
-       cc != NULL;
-       cc = (pcre_uchar *)PRIV(find_bracket)(cc, utf, -1))
-    {
-    if (GET(cc, 1) == 0)
-      {
-      int fixed_length;
-      pcre_uchar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
-      int end_op = *be;
-      *be = OP_END;
-      fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
-        cd, NULL);
-      *be = end_op;
-      DPRINTF(("fixed length = %d\n", fixed_length));
-      if (fixed_length < 0)
-        {
-        errorcode = (fixed_length == -2)? ERR36 :
-                    (fixed_length == -4)? ERR70 : ERR25;
-        break;
-        }
-      if (fixed_length > cd->max_lookbehind) cd->max_lookbehind = fixed_length;
-      PUT(cc, 1, fixed_length);
-      }
-    cc += 1 + LINK_SIZE;
-    }
-  }
-
-/* Failed to compile, or error while post-processing */
-
-if (errorcode != 0)
-  {
-  (PUBL(free))(re);
-  PCRE_EARLY_ERROR_RETURN:
-  *erroroffset = (int)(ptr - (const pcre_uchar *)pattern);
-  PCRE_EARLY_ERROR_RETURN2:
-  *errorptr = find_error_text(errorcode);
-  if (errorcodeptr != NULL) *errorcodeptr = errorcode;
-  return NULL;
-  }
-
-/* If the anchored option was not passed, set the flag if we can determine that
-the pattern is anchored by virtue of ^ characters or \A or anything else, such
-as starting with non-atomic .* when DOTALL is set and there are no occurrences
-of *PRUNE or *SKIP.
-
-Otherwise, if we know what the first byte has to be, save it, because that
-speeds up unanchored matches no end. If not, see if we can set the
-PCRE_STARTLINE flag. This is helpful for multiline matches when all branches
-start with ^. and also when all branches start with non-atomic .* for
-non-DOTALL matches when *PRUNE and SKIP are not present. */
-
-if ((re->options & PCRE_ANCHORED) == 0)
-  {
-  if (is_anchored(codestart, 0, cd, 0)) re->options |= PCRE_ANCHORED;
-  else
-    {
-    if (firstcharflags < 0)
-      firstchar = find_firstassertedchar(codestart, &firstcharflags, FALSE);
-    if (firstcharflags >= 0)   /* Remove caseless flag for non-caseable chars */
-      {
-#if defined COMPILE_PCRE8
-      re->first_char = firstchar & 0xff;
-#elif defined COMPILE_PCRE16
-      re->first_char = firstchar & 0xffff;
-#elif defined COMPILE_PCRE32
-      re->first_char = firstchar;
-#endif
-      if ((firstcharflags & REQ_CASELESS) != 0)
-        {
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-        /* We ignore non-ASCII first chars in 8 bit mode. */
-        if (utf)
-          {
-          if (re->first_char < 128)
-            {
-            if (cd->fcc[re->first_char] != re->first_char)
-              re->flags |= PCRE_FCH_CASELESS;
-            }
-          else if (UCD_OTHERCASE(re->first_char) != re->first_char)
-            re->flags |= PCRE_FCH_CASELESS;
-          }
-        else
-#endif
-        if (MAX_255(re->first_char)
-            && cd->fcc[re->first_char] != re->first_char)
-          re->flags |= PCRE_FCH_CASELESS;
-        }
-
-      re->flags |= PCRE_FIRSTSET;
-      }
-
-    else if (is_startline(codestart, 0, cd, 0)) re->flags |= PCRE_STARTLINE;
-    }
-  }
-
-/* For an anchored pattern, we use the "required byte" only if it follows a
-variable length item in the regex. Remove the caseless flag for non-caseable
-bytes. */
-
-if (reqcharflags >= 0 &&
-     ((re->options & PCRE_ANCHORED) == 0 || (reqcharflags & REQ_VARY) != 0))
-  {
-#if defined COMPILE_PCRE8
-  re->req_char = reqchar & 0xff;
-#elif defined COMPILE_PCRE16
-  re->req_char = reqchar & 0xffff;
-#elif defined COMPILE_PCRE32
-  re->req_char = reqchar;
-#endif
-  if ((reqcharflags & REQ_CASELESS) != 0)
-    {
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-    /* We ignore non-ASCII first chars in 8 bit mode. */
-    if (utf)
-      {
-      if (re->req_char < 128)
-        {
-        if (cd->fcc[re->req_char] != re->req_char)
-          re->flags |= PCRE_RCH_CASELESS;
-        }
-      else if (UCD_OTHERCASE(re->req_char) != re->req_char)
-        re->flags |= PCRE_RCH_CASELESS;
-      }
-    else
-#endif
-    if (MAX_255(re->req_char) && cd->fcc[re->req_char] != re->req_char)
-      re->flags |= PCRE_RCH_CASELESS;
-    }
-
-  re->flags |= PCRE_REQCHSET;
-  }
-
-/* Print out the compiled data if debugging is enabled. This is never the
-case when building a production library. */
-
-#ifdef PCRE_DEBUG
-printf("Length = %d top_bracket = %d top_backref = %d\n",
-  length, re->top_bracket, re->top_backref);
-
-printf("Options=%08x\n", re->options);
-
-if ((re->flags & PCRE_FIRSTSET) != 0)
-  {
-  pcre_uchar ch = re->first_char;
-  const char *caseless =
-    ((re->flags & PCRE_FCH_CASELESS) == 0)? "" : " (caseless)";
-  if (PRINTABLE(ch)) printf("First char = %c%s\n", ch, caseless);
-    else printf("First char = \\x%02x%s\n", ch, caseless);
-  }
-
-if ((re->flags & PCRE_REQCHSET) != 0)
-  {
-  pcre_uchar ch = re->req_char;
-  const char *caseless =
-    ((re->flags & PCRE_RCH_CASELESS) == 0)? "" : " (caseless)";
-  if (PRINTABLE(ch)) printf("Req char = %c%s\n", ch, caseless);
-    else printf("Req char = \\x%02x%s\n", ch, caseless);
-  }
-
-#if defined COMPILE_PCRE8
-pcre_printint((pcre *)re, stdout, TRUE);
-#elif defined COMPILE_PCRE16
-pcre16_printint((pcre *)re, stdout, TRUE);
-#elif defined COMPILE_PCRE32
-pcre32_printint((pcre *)re, stdout, TRUE);
-#endif
-
-/* This check is done here in the debugging case so that the code that
-was compiled can be seen. */
-
-if (code - codestart > length)
-  {
-  (PUBL(free))(re);
-  *errorptr = find_error_text(ERR23);
-  *erroroffset = ptr - (pcre_uchar *)pattern;
-  if (errorcodeptr != NULL) *errorcodeptr = ERR23;
-  return NULL;
-  }
-#endif   /* PCRE_DEBUG */
-
-/* Check for a pattern than can match an empty string, so that this information
-can be provided to applications. */
-
-do
-  {
-  if (could_be_empty_branch(codestart, code, utf, cd, NULL))
-    {
-    re->flags |= PCRE_MATCH_EMPTY;
-    break;
-    }
-  codestart += GET(codestart, 1);
-  }
-while (*codestart == OP_ALT);
-
-#if defined COMPILE_PCRE8
-return (pcre *)re;
-#elif defined COMPILE_PCRE16
-return (pcre16 *)re;
-#elif defined COMPILE_PCRE32
-return (pcre32 *)re;
-#endif
-}
-
-/* End of pcre_compile.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_config.c r-base-3.3.1/src/extra/pcre/pcre_config.c
--- r-base-3.2.3/src/extra/pcre/pcre_config.c	2015-03-18 23:02:11.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_config.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_config(). */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Keep the original link size. */
-static int real_link_size = LINK_SIZE;
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-* Return info about what features are configured *
-*************************************************/
-
-/* This function has an extensible interface so that additional items can be
-added compatibly.
-
-Arguments:
-  what             what information is required
-  where            where to put the information
-
-Returns:           0 if data returned, negative on error
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_config(int what, void *where)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_config(int what, void *where)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_config(int what, void *where)
-#endif
-{
-switch (what)
-  {
-  case PCRE_CONFIG_UTF8:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  *((int *)where) = 0;
-  return PCRE_ERROR_BADOPTION;
-#else
-#if defined SUPPORT_UTF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-#endif
-
-  case PCRE_CONFIG_UTF16:
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE32
-  *((int *)where) = 0;
-  return PCRE_ERROR_BADOPTION;
-#else
-#if defined SUPPORT_UTF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-#endif
-
-  case PCRE_CONFIG_UTF32:
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-  *((int *)where) = 0;
-  return PCRE_ERROR_BADOPTION;
-#else
-#if defined SUPPORT_UTF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-#endif
-
-  case PCRE_CONFIG_UNICODE_PROPERTIES:
-#ifdef SUPPORT_UCP
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-
-  case PCRE_CONFIG_JIT:
-#ifdef SUPPORT_JIT
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-
-  case PCRE_CONFIG_JITTARGET:
-#ifdef SUPPORT_JIT
-  *((const char **)where) = PRIV(jit_get_target)();
-#else
-  *((const char **)where) = NULL;
-#endif
-  break;
-
-  case PCRE_CONFIG_NEWLINE:
-  *((int *)where) = NEWLINE;
-  break;
-
-  case PCRE_CONFIG_BSR:
-#ifdef BSR_ANYCRLF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-
-  case PCRE_CONFIG_LINK_SIZE:
-  *((int *)where) = real_link_size;
-  break;
-
-  case PCRE_CONFIG_POSIX_MALLOC_THRESHOLD:
-  *((int *)where) = POSIX_MALLOC_THRESHOLD;
-  break;
-
-  case PCRE_CONFIG_PARENS_LIMIT:
-  *((unsigned long int *)where) = PARENS_NEST_LIMIT;
-  break;
-
-  case PCRE_CONFIG_MATCH_LIMIT:
-  *((unsigned long int *)where) = MATCH_LIMIT;
-  break;
-
-  case PCRE_CONFIG_MATCH_LIMIT_RECURSION:
-  *((unsigned long int *)where) = MATCH_LIMIT_RECURSION;
-  break;
-
-  case PCRE_CONFIG_STACKRECURSE:
-#ifdef NO_RECURSE
-  *((int *)where) = 0;
-#else
-  *((int *)where) = 1;
-#endif
-  break;
-
-  default: return PCRE_ERROR_BADOPTION;
-  }
-
-return 0;
-}
-
-/* End of pcre_config.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_exec.c r-base-3.3.1/src/extra/pcre/pcre_exec.c
--- r-base-3.2.3/src/extra/pcre/pcre_exec.c	2015-11-26 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_exec.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,7173 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* This module contains pcre_exec(), the externally visible function that does
-pattern matching using an NFA algorithm, trying to mimic Perl as closely as
-possible. There are also some static supporting functions. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define NLBLOCK md             /* Block containing newline information */
-#define PSSTART start_subject  /* Field containing processed string start */
-#define PSEND   end_subject    /* Field containing processed string end */
-
-#include "pcre_internal.h"
-
-/* Undefine some potentially clashing cpp symbols */
-
-#undef min
-#undef max
-
-/* The md->capture_last field uses the lower 16 bits for the last captured
-substring (which can never be greater than 65535) and a bit in the top half
-to mean "capture vector overflowed". This odd way of doing things was
-implemented when it was realized that preserving and restoring the overflow bit
-whenever the last capture number was saved/restored made for a neater
-interface, and doing it this way saved on (a) another variable, which would
-have increased the stack frame size (a big NO-NO in PCRE) and (b) another
-separate set of save/restore instructions. The following defines are used in
-implementing this. */
-
-#define CAPLMASK    0x0000ffff    /* The bits used for last_capture */
-#define OVFLMASK    0xffff0000    /* The bits used for the overflow flag */
-#define OVFLBIT     0x00010000    /* The bit that is set for overflow */
-
-/* Values for setting in md->match_function_type to indicate two special types
-of call to match(). We do it this way to save on using another stack variable,
-as stack usage is to be discouraged. */
-
-#define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
-#define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
-
-/* Non-error returns from the match() function. Error returns are externally
-defined PCRE_ERROR_xxx codes, which are all negative. */
-
-#define MATCH_MATCH        1
-#define MATCH_NOMATCH      0
-
-/* Special internal returns from the match() function. Make them sufficiently
-negative to avoid the external error codes. */
-
-#define MATCH_ACCEPT       (-999)
-#define MATCH_KETRPOS      (-998)
-#define MATCH_ONCE         (-997)
-/* The next 5 must be kept together and in sequence so that a test that checks
-for any one of them can use a range. */
-#define MATCH_COMMIT       (-996)
-#define MATCH_PRUNE        (-995)
-#define MATCH_SKIP         (-994)
-#define MATCH_SKIP_ARG     (-993)
-#define MATCH_THEN         (-992)
-#define MATCH_BACKTRACK_MAX MATCH_THEN
-#define MATCH_BACKTRACK_MIN MATCH_COMMIT
-
-/* Maximum number of ints of offset to save on the stack for recursive calls.
-If the offset vector is bigger, malloc is used. This should be a multiple of 3,
-because the offset vector is always a multiple of 3 long. */
-
-#define REC_STACK_SAVE_MAX 30
-
-/* Min and max values for the common repeats; for the maxima, 0 => infinity */
-
-static const char rep_min[] = { 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, };
-static const char rep_max[] = { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, };
-
-#ifdef PCRE_DEBUG
-/*************************************************
-*        Debugging function to print chars       *
-*************************************************/
-
-/* Print a sequence of chars in printable format, stopping at the end of the
-subject if the requested.
-
-Arguments:
-  p           points to characters
-  length      number to print
-  is_subject  TRUE if printing from within md->start_subject
-  md          pointer to matching data block, if is_subject is TRUE
-
-Returns:     nothing
-*/
-
-static void
-pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
-{
-pcre_uint32 c;
-BOOL utf = md->utf;
-if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
-while (length-- > 0)
-  if (isprint(c = UCHAR21INCTEST(p))) printf("%c", (char)c); else printf("\\x{%02x}", c);
-}
-#endif
-
-
-
-/*************************************************
-*          Match a back-reference                *
-*************************************************/
-
-/* Normally, if a back reference hasn't been set, the length that is passed is
-negative, so the match always fails. However, in JavaScript compatibility mode,
-the length passed is zero. Note that in caseless UTF-8 mode, the number of
-subject bytes matched may be different to the number of reference bytes.
-
-Arguments:
-  offset      index into the offset vector
-  eptr        pointer into the subject
-  length      length of reference to be matched (number of bytes)
-  md          points to match data block
-  caseless    TRUE if caseless
-
-Returns:      >= 0 the number of subject bytes matched
-              -1 no match
-              -2 partial match; always given if at end subject
-*/
-
-static int
-match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md,
-  BOOL caseless)
-{
-PCRE_PUCHAR eptr_start = eptr;
-register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-BOOL utf = md->utf;
-#endif
-
-#ifdef PCRE_DEBUG
-if (eptr >= md->end_subject)
-  printf("matching subject <null>");
-else
-  {
-  printf("matching subject ");
-  pchars(eptr, length, TRUE, md);
-  }
-printf(" against backref ");
-pchars(p, length, FALSE, md);
-printf("\n");
-#endif
-
-/* Always fail if reference not set (and not JavaScript compatible - in that
-case the length is passed as zero). */
-
-if (length < 0) return -1;
-
-/* Separate the caseless case for speed. In UTF-8 mode we can only do this
-properly if Unicode properties are supported. Otherwise, we can check only
-ASCII characters. */
-
-if (caseless)
-  {
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-  if (utf)
-    {
-    /* Match characters up to the end of the reference. NOTE: the number of
-    data units matched may differ, because in UTF-8 there are some characters
-    whose upper and lower case versions code have different numbers of bytes.
-    For example, U+023A (2 bytes in UTF-8) is the upper case version of U+2C65
-    (3 bytes in UTF-8); a sequence of 3 of the former uses 6 bytes, as does a
-    sequence of two of the latter. It is important, therefore, to check the
-    length along the reference, not along the subject (earlier code did this
-    wrong). */
-
-    PCRE_PUCHAR endptr = p + length;
-    while (p < endptr)
-      {
-      pcre_uint32 c, d;
-      const ucd_record *ur;
-      if (eptr >= md->end_subject) return -2;   /* Partial match */
-      GETCHARINC(c, eptr);
-      GETCHARINC(d, p);
-      ur = GET_UCD(d);
-      if (c != d && c != d + ur->other_case)
-        {
-        const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;
-        for (;;)
-          {
-          if (c < *pp) return -1;
-          if (c == *pp++) break;
-          }
-        }
-      }
-    }
-  else
-#endif
-
-  /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
-  is no UCP support. */
-    {
-    while (length-- > 0)
-      {
-      pcre_uint32 cc, cp;
-      if (eptr >= md->end_subject) return -2;   /* Partial match */
-      cc = UCHAR21TEST(eptr);
-      cp = UCHAR21TEST(p);
-      if (TABLE_GET(cp, md->lcc, cp) != TABLE_GET(cc, md->lcc, cc)) return -1;
-      p++;
-      eptr++;
-      }
-    }
-  }
-
-/* In the caseful case, we can just compare the bytes, whether or not we
-are in UTF-8 mode. */
-
-else
-  {
-  while (length-- > 0)
-    {
-    if (eptr >= md->end_subject) return -2;   /* Partial match */
-    if (UCHAR21INCTEST(p) != UCHAR21INCTEST(eptr)) return -1;
-    }
-  }
-
-return (int)(eptr - eptr_start);
-}
-
-
-
-/***************************************************************************
-****************************************************************************
-                   RECURSION IN THE match() FUNCTION
-
-The match() function is highly recursive, though not every recursive call
-increases the recursive depth. Nevertheless, some regular expressions can cause
-it to recurse to a great depth. I was writing for Unix, so I just let it call
-itself recursively. This uses the stack for saving everything that has to be
-saved for a recursive call. On Unix, the stack can be large, and this works
-fine.
-
-It turns out that on some non-Unix-like systems there are problems with
-programs that use a lot of stack. (This despite the fact that every last chip
-has oodles of memory these days, and techniques for extending the stack have
-been known for decades.) So....
-
-There is a fudge, triggered by defining NO_RECURSE, which avoids recursive
-calls by keeping local variables that need to be preserved in blocks of memory
-obtained from malloc() instead instead of on the stack. Macros are used to
-achieve this so that the actual code doesn't look very different to what it
-always used to.
-
-The original heap-recursive code used longjmp(). However, it seems that this
-can be very slow on some operating systems. Following a suggestion from Stan
-Switzer, the use of longjmp() has been abolished, at the cost of having to
-provide a unique number for each call to RMATCH. There is no way of generating
-a sequence of numbers at compile time in C. I have given them names, to make
-them stand out more clearly.
-
-Crude tests on x86 Linux show a small speedup of around 5-8%. However, on
-FreeBSD, avoiding longjmp() more than halves the time taken to run the standard
-tests. Furthermore, not using longjmp() means that local dynamic variables
-don't have indeterminate values; this has meant that the frame size can be
-reduced because the result can be "passed back" by straight setting of the
-variable instead of being passed in the frame.
-****************************************************************************
-***************************************************************************/
-
-/* Numbers for RMATCH calls. When this list is changed, the code at HEAP_RETURN
-below must be updated in sync.  */
-
-enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
-       RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
-       RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
-       RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
-       RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
-       RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
-       RM61,  RM62, RM63, RM64, RM65, RM66, RM67 };
-
-/* These versions of the macros use the stack, as normal. There are debugging
-versions and production versions. Note that the "rw" argument of RMATCH isn't
-actually used in this definition. */
-
-#ifndef NO_RECURSE
-#define REGISTER register
-
-#ifdef PCRE_DEBUG
-#define RMATCH(ra,rb,rc,rd,re,rw) \
-  { \
-  printf("match() called in line %d\n", __LINE__); \
-  rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
-  printf("to line %d\n", __LINE__); \
-  }
-#define RRETURN(ra) \
-  { \
-  printf("match() returned %d from line %d\n", ra, __LINE__); \
-  return ra; \
-  }
-#else
-#define RMATCH(ra,rb,rc,rd,re,rw) \
-  rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
-#define RRETURN(ra) return ra
-#endif
-
-#else
-
-
-/* These versions of the macros manage a private stack on the heap. Note that
-the "rd" argument of RMATCH isn't actually used in this definition. It's the md
-argument of match(), which never changes. */
-
-#define REGISTER
-
-#define RMATCH(ra,rb,rc,rd,re,rw)\
-  {\
-  heapframe *newframe = frame->Xnextframe;\
-  if (newframe == NULL)\
-    {\
-    newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
-    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
-    newframe->Xnextframe = NULL;\
-    frame->Xnextframe = newframe;\
-    }\
-  frame->Xwhere = rw;\
-  newframe->Xeptr = ra;\
-  newframe->Xecode = rb;\
-  newframe->Xmstart = mstart;\
-  newframe->Xoffset_top = rc;\
-  newframe->Xeptrb = re;\
-  newframe->Xrdepth = frame->Xrdepth + 1;\
-  newframe->Xprevframe = frame;\
-  frame = newframe;\
-  DPRINTF(("restarting from line %d\n", __LINE__));\
-  goto HEAP_RECURSE;\
-  L_##rw:\
-  DPRINTF(("jumped back to line %d\n", __LINE__));\
-  }
-
-#define RRETURN(ra)\
-  {\
-  heapframe *oldframe = frame;\
-  frame = oldframe->Xprevframe;\
-  if (frame != NULL)\
-    {\
-    rrc = ra;\
-    goto HEAP_RETURN;\
-    }\
-  return ra;\
-  }
-
-
-/* Structure for remembering the local variables in a private frame */
-
-typedef struct heapframe {
-  struct heapframe *Xprevframe;
-  struct heapframe *Xnextframe;
-
-  /* Function arguments that may change */
-
-  PCRE_PUCHAR Xeptr;
-  const pcre_uchar *Xecode;
-  PCRE_PUCHAR Xmstart;
-  int Xoffset_top;
-  eptrblock *Xeptrb;
-  unsigned int Xrdepth;
-
-  /* Function local variables */
-
-  PCRE_PUCHAR Xcallpat;
-#ifdef SUPPORT_UTF
-  PCRE_PUCHAR Xcharptr;
-#endif
-  PCRE_PUCHAR Xdata;
-  PCRE_PUCHAR Xnext;
-  PCRE_PUCHAR Xpp;
-  PCRE_PUCHAR Xprev;
-  PCRE_PUCHAR Xsaved_eptr;
-
-  recursion_info Xnew_recursive;
-
-  BOOL Xcur_is_word;
-  BOOL Xcondition;
-  BOOL Xprev_is_word;
-
-#ifdef SUPPORT_UCP
-  int Xprop_type;
-  unsigned int Xprop_value;
-  int Xprop_fail_result;
-  int Xoclength;
-  pcre_uchar Xocchars[6];
-#endif
-
-  int Xcodelink;
-  int Xctype;
-  unsigned int Xfc;
-  int Xfi;
-  int Xlength;
-  int Xmax;
-  int Xmin;
-  unsigned int Xnumber;
-  int Xoffset;
-  unsigned int Xop;
-  pcre_int32 Xsave_capture_last;
-  int Xsave_offset1, Xsave_offset2, Xsave_offset3;
-  int Xstacksave[REC_STACK_SAVE_MAX];
-
-  eptrblock Xnewptrb;
-
-  /* Where to jump back to */
-
-  int Xwhere;
-
-} heapframe;
-
-#endif
-
-
-/***************************************************************************
-***************************************************************************/
-
-
-
-/*************************************************
-*         Match from current position            *
-*************************************************/
-
-/* This function is called recursively in many circumstances. Whenever it
-returns a negative (error) response, the outer incarnation must also return the
-same response. */
-
-/* These macros pack up tests that are used for partial matching, and which
-appear several times in the code. We set the "hit end" flag if the pointer is
-at the end of the subject and also past the start of the subject (i.e.
-something has been matched). For hard partial matching, we then return
-immediately. The second one is used when we already know we are past the end of
-the subject. */
-
-#define CHECK_PARTIAL()\
-  if (md->partial != 0 && eptr >= md->end_subject && \
-      eptr > md->start_used_ptr) \
-    { \
-    md->hitend = TRUE; \
-    if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
-    }
-
-#define SCHECK_PARTIAL()\
-  if (md->partial != 0 && eptr > md->start_used_ptr) \
-    { \
-    md->hitend = TRUE; \
-    if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
-    }
-
-
-/* Performance note: It might be tempting to extract commonly used fields from
-the md structure (e.g. utf, end_subject) into individual variables to improve
-performance. Tests using gcc on a SPARC disproved this; in the first case, it
-made performance worse.
-
-Arguments:
-   eptr        pointer to current character in subject
-   ecode       pointer to current position in compiled code
-   mstart      pointer to the current match start position (can be modified
-                 by encountering \K)
-   offset_top  current top pointer
-   md          pointer to "static" info for the match
-   eptrb       pointer to chain of blocks containing eptr at start of
-                 brackets - for testing for empty matches
-   rdepth      the recursion depth
-
-Returns:       MATCH_MATCH if matched            )  these values are >= 0
-               MATCH_NOMATCH if failed to match  )
-               a negative MATCH_xxx value for PRUNE, SKIP, etc
-               a negative PCRE_ERROR_xxx value if aborted by an error condition
-                 (e.g. stopped by repeated call or recursion limit)
-*/
-
-static int
-match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
-  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
-  unsigned int rdepth)
-{
-/* These variables do not need to be preserved over recursion in this function,
-so they can be ordinary variables in all cases. Mark some of them with
-"register" because they are used a lot in loops. */
-
-register int  rrc;         /* Returns from recursive calls */
-register int  i;           /* Used for loops not involving calls to RMATCH() */
-register pcre_uint32 c;    /* Character values not kept over RMATCH() calls */
-register BOOL utf;         /* Local copy of UTF flag for speed */
-
-BOOL minimize, possessive; /* Quantifier options */
-BOOL caseless;
-int condcode;
-
-/* When recursion is not being used, all "local" variables that have to be
-preserved over calls to RMATCH() are part of a "frame". We set up the top-level
-frame on the stack here; subsequent instantiations are obtained from the heap
-whenever RMATCH() does a "recursion". See the macro definitions above. Putting
-the top-level on the stack rather than malloc-ing them all gives a performance
-boost in many cases where there is not much "recursion". */
-
-#ifdef NO_RECURSE
-heapframe *frame = (heapframe *)md->match_frames_base;
-
-/* Copy in the original argument variables */
-
-frame->Xeptr = eptr;
-frame->Xecode = ecode;
-frame->Xmstart = mstart;
-frame->Xoffset_top = offset_top;
-frame->Xeptrb = eptrb;
-frame->Xrdepth = rdepth;
-
-/* This is where control jumps back to to effect "recursion" */
-
-HEAP_RECURSE:
-
-/* Macros make the argument variables come from the current frame */
-
-#define eptr               frame->Xeptr
-#define ecode              frame->Xecode
-#define mstart             frame->Xmstart
-#define offset_top         frame->Xoffset_top
-#define eptrb              frame->Xeptrb
-#define rdepth             frame->Xrdepth
-
-/* Ditto for the local variables */
-
-#ifdef SUPPORT_UTF
-#define charptr            frame->Xcharptr
-#endif
-#define callpat            frame->Xcallpat
-#define codelink           frame->Xcodelink
-#define data               frame->Xdata
-#define next               frame->Xnext
-#define pp                 frame->Xpp
-#define prev               frame->Xprev
-#define saved_eptr         frame->Xsaved_eptr
-
-#define new_recursive      frame->Xnew_recursive
-
-#define cur_is_word        frame->Xcur_is_word
-#define condition          frame->Xcondition
-#define prev_is_word       frame->Xprev_is_word
-
-#ifdef SUPPORT_UCP
-#define prop_type          frame->Xprop_type
-#define prop_value         frame->Xprop_value
-#define prop_fail_result   frame->Xprop_fail_result
-#define oclength           frame->Xoclength
-#define occhars            frame->Xocchars
-#endif
-
-#define ctype              frame->Xctype
-#define fc                 frame->Xfc
-#define fi                 frame->Xfi
-#define length             frame->Xlength
-#define max                frame->Xmax
-#define min                frame->Xmin
-#define number             frame->Xnumber
-#define offset             frame->Xoffset
-#define op                 frame->Xop
-#define save_capture_last  frame->Xsave_capture_last
-#define save_offset1       frame->Xsave_offset1
-#define save_offset2       frame->Xsave_offset2
-#define save_offset3       frame->Xsave_offset3
-#define stacksave          frame->Xstacksave
-
-#define newptrb            frame->Xnewptrb
-
-/* When recursion is being used, local variables are allocated on the stack and
-get preserved during recursion in the normal way. In this environment, fi and
-i, and fc and c, can be the same variables. */
-
-#else         /* NO_RECURSE not defined */
-#define fi i
-#define fc c
-
-/* Many of the following variables are used only in small blocks of the code.
-My normal style of coding would have declared them within each of those blocks.
-However, in order to accommodate the version of this code that uses an external
-"stack" implemented on the heap, it is easier to declare them all here, so the
-declarations can be cut out in a block. The only declarations within blocks
-below are for variables that do not have to be preserved over a recursive call
-to RMATCH(). */
-
-#ifdef SUPPORT_UTF
-const pcre_uchar *charptr;
-#endif
-const pcre_uchar *callpat;
-const pcre_uchar *data;
-const pcre_uchar *next;
-PCRE_PUCHAR       pp;
-const pcre_uchar *prev;
-PCRE_PUCHAR       saved_eptr;
-
-recursion_info new_recursive;
-
-BOOL cur_is_word;
-BOOL condition;
-BOOL prev_is_word;
-
-#ifdef SUPPORT_UCP
-int prop_type;
-unsigned int prop_value;
-int prop_fail_result;
-int oclength;
-pcre_uchar occhars[6];
-#endif
-
-int codelink;
-int ctype;
-int length;
-int max;
-int min;
-unsigned int number;
-int offset;
-unsigned int op;
-pcre_int32 save_capture_last;
-int save_offset1, save_offset2, save_offset3;
-int stacksave[REC_STACK_SAVE_MAX];
-
-eptrblock newptrb;
-
-/* There is a special fudge for calling match() in a way that causes it to
-measure the size of its basic stack frame when the stack is being used for
-recursion. The second argument (ecode) being NULL triggers this behaviour. It
-cannot normally ever be NULL. The return is the negated value of the frame
-size. */
-
-if (ecode == NULL)
-  {
-  if (rdepth == 0)
-    return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
-  else
-    {
-    int len = (char *)&rdepth - (char *)eptr;
-    return (len > 0)? -len : len;
-    }
-  }
-#endif     /* NO_RECURSE */
-
-/* To save space on the stack and in the heap frame, I have doubled up on some
-of the local variables that are used only in localised parts of the code, but
-still need to be preserved over recursive calls of match(). These macros define
-the alternative names that are used. */
-
-#define allow_zero    cur_is_word
-#define cbegroup      condition
-#define code_offset   codelink
-#define condassert    condition
-#define matched_once  prev_is_word
-#define foc           number
-#define save_mark     data
-
-/* These statements are here to stop the compiler complaining about unitialized
-variables. */
-
-#ifdef SUPPORT_UCP
-prop_value = 0;
-prop_fail_result = 0;
-#endif
-
-
-/* This label is used for tail recursion, which is used in a few cases even
-when NO_RECURSE is not defined, in order to reduce the amount of stack that is
-used. Thanks to Ian Taylor for noticing this possibility and sending the
-original patch. */
-
-TAIL_RECURSE:
-
-/* OK, now we can get on with the real code of the function. Recursive calls
-are specified by the macro RMATCH and RRETURN is used to return. When
-NO_RECURSE is *not* defined, these just turn into a recursive call to match()
-and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
-defined). However, RMATCH isn't like a function call because it's quite a
-complicated macro. It has to be used in one particular way. This shouldn't,
-however, impact performance when true recursion is being used. */
-
-#ifdef SUPPORT_UTF
-utf = md->utf;       /* Local copy of the flag */
-#else
-utf = FALSE;
-#endif
-
-/* First check that we haven't called match() too many times, or that we
-haven't exceeded the recursive call limit. */
-
-if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
-if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
-
-/* At the start of a group with an unlimited repeat that may match an empty
-string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
-done this way to save having to use another function argument, which would take
-up space on the stack. See also MATCH_CONDASSERT below.
-
-When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
-such remembered pointers, to be checked when we hit the closing ket, in order
-to break infinite loops that match no characters. When match() is called in
-other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
-NOT be used with tail recursion, because the memory block that is used is on
-the stack, so a new one may be required for each match(). */
-
-if (md->match_function_type == MATCH_CBEGROUP)
-  {
-  newptrb.epb_saved_eptr = eptr;
-  newptrb.epb_prev = eptrb;
-  eptrb = &newptrb;
-  md->match_function_type = 0;
-  }
-
-/* Now start processing the opcodes. */
-
-for (;;)
-  {
-  minimize = possessive = FALSE;
-  op = *ecode;
-
-  switch(op)
-    {
-    case OP_MARK:
-    md->nomatch_mark = ecode + 2;
-    md->mark = NULL;    /* In case previously set by assertion */
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
-      eptrb, RM55);
-    if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
-         md->mark == NULL) md->mark = ecode + 2;
-
-    /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
-    argument, and we must check whether that argument matches this MARK's
-    argument. It is passed back in md->start_match_ptr (an overloading of that
-    variable). If it does match, we reset that variable to the current subject
-    position and return MATCH_SKIP. Otherwise, pass back the return code
-    unaltered. */
-
-    else if (rrc == MATCH_SKIP_ARG &&
-        STRCMP_UC_UC_TEST(ecode + 2, md->start_match_ptr) == 0)
-      {
-      md->start_match_ptr = eptr;
-      RRETURN(MATCH_SKIP);
-      }
-    RRETURN(rrc);
-
-    case OP_FAIL:
-    RRETURN(MATCH_NOMATCH);
-
-    case OP_COMMIT:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM52);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    RRETURN(MATCH_COMMIT);
-
-    case OP_PRUNE:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM51);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    RRETURN(MATCH_PRUNE);
-
-    case OP_PRUNE_ARG:
-    md->nomatch_mark = ecode + 2;
-    md->mark = NULL;    /* In case previously set by assertion */
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
-      eptrb, RM56);
-    if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
-         md->mark == NULL) md->mark = ecode + 2;
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    RRETURN(MATCH_PRUNE);
-
-    case OP_SKIP:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM53);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    md->start_match_ptr = eptr;   /* Pass back current position */
-    RRETURN(MATCH_SKIP);
-
-    /* Note that, for Perl compatibility, SKIP with an argument does NOT set
-    nomatch_mark. When a pattern match ends with a SKIP_ARG for which there was
-    not a matching mark, we have to re-run the match, ignoring the SKIP_ARG
-    that failed and any that precede it (either they also failed, or were not
-    triggered). To do this, we maintain a count of executed SKIP_ARGs. If a
-    SKIP_ARG gets to top level, the match is re-run with md->ignore_skip_arg
-    set to the count of the one that failed. */
-
-    case OP_SKIP_ARG:
-    md->skip_arg_count++;
-    if (md->skip_arg_count <= md->ignore_skip_arg)
-      {
-      ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
-      break;
-      }
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
-      eptrb, RM57);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-
-    /* Pass back the current skip name by overloading md->start_match_ptr and
-    returning the special MATCH_SKIP_ARG return code. This will either be
-    caught by a matching MARK, or get to the top, where it causes a rematch
-    with md->ignore_skip_arg set to the value of md->skip_arg_count. */
-
-    md->start_match_ptr = ecode + 2;
-    RRETURN(MATCH_SKIP_ARG);
-
-    /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
-    the branch in which it occurs can be determined. Overload the start of
-    match pointer to do this. */
-
-    case OP_THEN:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM54);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    md->start_match_ptr = ecode;
-    RRETURN(MATCH_THEN);
-
-    case OP_THEN_ARG:
-    md->nomatch_mark = ecode + 2;
-    md->mark = NULL;    /* In case previously set by assertion */
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
-      md, eptrb, RM58);
-    if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
-         md->mark == NULL) md->mark = ecode + 2;
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    md->start_match_ptr = ecode;
-    RRETURN(MATCH_THEN);
-
-    /* Handle an atomic group that does not contain any capturing parentheses.
-    This can be handled like an assertion. Prior to 8.13, all atomic groups
-    were handled this way. In 8.13, the code was changed as below for ONCE, so
-    that backups pass through the group and thereby reset captured values.
-    However, this uses a lot more stack, so in 8.20, atomic groups that do not
-    contain any captures generate OP_ONCE_NC, which can be handled in the old,
-    less stack intensive way.
-
-    Check the alternative branches in turn - the matching won't pass the KET
-    for this kind of subpattern. If any one branch matches, we carry on as at
-    the end of a normal bracket, leaving the subject pointer, but resetting
-    the start-of-match value in case it was changed by \K. */
-
-    case OP_ONCE_NC:
-    prev = ecode;
-    saved_eptr = eptr;
-    save_mark = md->mark;
-    do
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
-      if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
-        {
-        mstart = md->start_match_ptr;
-        break;
-        }
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += GET(ecode,1);
-      md->mark = save_mark;
-      }
-    while (*ecode == OP_ALT);
-
-    /* If hit the end of the group (which could be repeated), fail */
-
-    if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
-
-    /* Continue as from after the group, updating the offsets high water
-    mark, since extracts may have been taken. */
-
-    do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-
-    offset_top = md->end_offset_top;
-    eptr = md->end_match_ptr;
-
-    /* For a non-repeating ket, just continue at this level. This also
-    happens for a repeating ket if no characters were matched in the group.
-    This is the forcible breaking of infinite loops as implemented in Perl
-    5.005. */
-
-    if (*ecode == OP_KET || eptr == saved_eptr)
-      {
-      ecode += 1+LINK_SIZE;
-      break;
-      }
-
-    /* The repeating kets try the rest of the pattern or restart from the
-    preceding bracket, in the appropriate order. The second "call" of match()
-    uses tail recursion, to avoid using another stack frame. */
-
-    if (*ecode == OP_KETRMIN)
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode = prev;
-      goto TAIL_RECURSE;
-      }
-    else  /* OP_KETRMAX */
-      {
-      RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += 1 + LINK_SIZE;
-      goto TAIL_RECURSE;
-      }
-    /* Control never gets here */
-
-    /* Handle a capturing bracket, other than those that are possessive with an
-    unlimited repeat. If there is space in the offset vector, save the current
-    subject position in the working slot at the top of the vector. We mustn't
-    change the current values of the data slot, because they may be set from a
-    previous iteration of this group, and be referred to by a reference inside
-    the group. A failure to match might occur after the group has succeeded,
-    if something later on doesn't match. For this reason, we need to restore
-    the working value and also the values of the final offsets, in case they
-    were set by a previous iteration of the same bracket.
-
-    If there isn't enough space in the offset vector, treat this as if it were
-    a non-capturing bracket. Don't worry about setting the flag for the error
-    case here; that is handled in the code for KET. */
-
-    case OP_CBRA:
-    case OP_SCBRA:
-    number = GET2(ecode, 1+LINK_SIZE);
-    offset = number << 1;
-
-#ifdef PCRE_DEBUG
-    printf("start bracket %d\n", number);
-    printf("subject=");
-    pchars(eptr, 16, TRUE, md);
-    printf("\n");
-#endif
-
-    if (offset < md->offset_max)
-      {
-      save_offset1 = md->offset_vector[offset];
-      save_offset2 = md->offset_vector[offset+1];
-      save_offset3 = md->offset_vector[md->offset_end - number];
-      save_capture_last = md->capture_last;
-      save_mark = md->mark;
-
-      DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
-      md->offset_vector[md->offset_end - number] =
-        (int)(eptr - md->start_subject);
-
-      for (;;)
-        {
-        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-          eptrb, RM1);
-        if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
-
-        /* If we backed up to a THEN, check whether it is within the current
-        branch by comparing the address of the THEN that is passed back with
-        the end of the branch. If it is within the current branch, and the
-        branch is one of two or more alternatives (it either starts or ends
-        with OP_ALT), we have reached the limit of THEN's action, so convert
-        the return code to NOMATCH, which will cause normal backtracking to
-        happen from now on. Otherwise, THEN is passed back to an outer
-        alternative. This implements Perl's treatment of parenthesized groups,
-        where a group not containing | does not affect the current alternative,
-        that is, (X) is NOT the same as (X|(*F)). */
-
-        if (rrc == MATCH_THEN)
-          {
-          next = ecode + GET(ecode,1);
-          if (md->start_match_ptr < next &&
-              (*ecode == OP_ALT || *next == OP_ALT))
-            rrc = MATCH_NOMATCH;
-          }
-
-        /* Anything other than NOMATCH is passed back. */
-
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->capture_last = save_capture_last;
-        ecode += GET(ecode, 1);
-        md->mark = save_mark;
-        if (*ecode != OP_ALT) break;
-        }
-
-      DPRINTF(("bracket %d failed\n", number));
-      md->offset_vector[offset] = save_offset1;
-      md->offset_vector[offset+1] = save_offset2;
-      md->offset_vector[md->offset_end - number] = save_offset3;
-
-      /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
-
-      RRETURN(rrc);
-      }
-
-    /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
-    as a non-capturing bracket. */
-
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-
-    DPRINTF(("insufficient capture room: treat as non-capturing\n"));
-
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-
-    /* Non-capturing or atomic group, except for possessive with unlimited
-    repeat and ONCE group with no captures. Loop for all the alternatives.
-
-    When we get to the final alternative within the brackets, we used to return
-    the result of a recursive call to match() whatever happened so it was
-    possible to reduce stack usage by turning this into a tail recursion,
-    except in the case of a possibly empty group. However, now that there is
-    the possiblity of (*THEN) occurring in the final alternative, this
-    optimization is no longer always possible.
-
-    We can optimize if we know there are no (*THEN)s in the pattern; at present
-    this is the best that can be done.
-
-    MATCH_ONCE is returned when the end of an atomic group is successfully
-    reached, but subsequent matching fails. It passes back up the tree (causing
-    captured values to be reset) until the original atomic group level is
-    reached. This is tested by comparing md->once_target with the start of the
-    group. At this point, the return is converted into MATCH_NOMATCH so that
-    previous backup points can be taken. */
-
-    case OP_ONCE:
-    case OP_BRA:
-    case OP_SBRA:
-    DPRINTF(("start non-capturing bracket\n"));
-
-    for (;;)
-      {
-      if (op >= OP_SBRA || op == OP_ONCE)
-        md->match_function_type = MATCH_CBEGROUP;
-
-      /* If this is not a possibly empty group, and there are no (*THEN)s in
-      the pattern, and this is the final alternative, optimize as described
-      above. */
-
-      else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
-        {
-        ecode += PRIV(OP_lengths)[*ecode];
-        goto TAIL_RECURSE;
-        }
-
-      /* In all other cases, we have to make another call to match(). */
-
-      save_mark = md->mark;
-      save_capture_last = md->capture_last;
-      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
-        RM2);
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH)
-        {
-        if (rrc == MATCH_ONCE)
-          {
-          const pcre_uchar *scode = ecode;
-          if (*scode != OP_ONCE)           /* If not at start, find it */
-            {
-            while (*scode == OP_ALT) scode += GET(scode, 1);
-            scode -= GET(scode, 1);
-            }
-          if (md->once_target == scode) rrc = MATCH_NOMATCH;
-          }
-        RRETURN(rrc);
-        }
-      ecode += GET(ecode, 1);
-      md->mark = save_mark;
-      if (*ecode != OP_ALT) break;
-      md->capture_last = save_capture_last;
-      }
-
-    RRETURN(MATCH_NOMATCH);
-
-    /* Handle possessive capturing brackets with an unlimited repeat. We come
-    here from BRAZERO with allow_zero set TRUE. The offset_vector values are
-    handled similarly to the normal case above. However, the matching is
-    different. The end of these brackets will always be OP_KETRPOS, which
-    returns MATCH_KETRPOS without going further in the pattern. By this means
-    we can handle the group by iteration rather than recursion, thereby
-    reducing the amount of stack needed. */
-
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    allow_zero = FALSE;
-
-    POSSESSIVE_CAPTURE:
-    number = GET2(ecode, 1+LINK_SIZE);
-    offset = number << 1;
-
-#ifdef PCRE_DEBUG
-    printf("start possessive bracket %d\n", number);
-    printf("subject=");
-    pchars(eptr, 16, TRUE, md);
-    printf("\n");
-#endif
-
-    if (offset >= md->offset_max) goto POSSESSIVE_NON_CAPTURE;
-
-    matched_once = FALSE;
-    code_offset = (int)(ecode - md->start_code);
-
-    save_offset1 = md->offset_vector[offset];
-    save_offset2 = md->offset_vector[offset+1];
-    save_offset3 = md->offset_vector[md->offset_end - number];
-    save_capture_last = md->capture_last;
-
-    DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
-
-    /* Each time round the loop, save the current subject position for use
-    when the group matches. For MATCH_MATCH, the group has matched, so we
-    restart it with a new subject starting position, remembering that we had
-    at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
-    usual. If we haven't matched any alternatives in any iteration, check to
-    see if a previous iteration matched. If so, the group has matched;
-    continue from afterwards. Otherwise it has failed; restore the previous
-    capture values before returning NOMATCH. */
-
-    for (;;)
-      {
-      md->offset_vector[md->offset_end - number] =
-        (int)(eptr - md->start_subject);
-      if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-        eptrb, RM63);
-      if (rrc == MATCH_KETRPOS)
-        {
-        offset_top = md->end_offset_top;
-        ecode = md->start_code + code_offset;
-        save_capture_last = md->capture_last;
-        matched_once = TRUE;
-        mstart = md->start_match_ptr;    /* In case \K changed it */
-        if (eptr == md->end_match_ptr)   /* Matched an empty string */
-          {
-          do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-          break;
-          }
-        eptr = md->end_match_ptr;
-        continue;
-        }
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      md->capture_last = save_capture_last;
-      ecode += GET(ecode, 1);
-      if (*ecode != OP_ALT) break;
-      }
-
-    if (!matched_once)
-      {
-      md->offset_vector[offset] = save_offset1;
-      md->offset_vector[offset+1] = save_offset2;
-      md->offset_vector[md->offset_end - number] = save_offset3;
-      }
-
-    if (allow_zero || matched_once)
-      {
-      ecode += 1 + LINK_SIZE;
-      break;
-      }
-
-    RRETURN(MATCH_NOMATCH);
-
-    /* Non-capturing possessive bracket with unlimited repeat. We come here
-    from BRAZERO with allow_zero = TRUE. The code is similar to the above,
-    without the capturing complication. It is written out separately for speed
-    and cleanliness. */
-
-    case OP_BRAPOS:
-    case OP_SBRAPOS:
-    allow_zero = FALSE;
-
-    POSSESSIVE_NON_CAPTURE:
-    matched_once = FALSE;
-    code_offset = (int)(ecode - md->start_code);
-    save_capture_last = md->capture_last;
-
-    for (;;)
-      {
-      if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-        eptrb, RM48);
-      if (rrc == MATCH_KETRPOS)
-        {
-        offset_top = md->end_offset_top;
-        ecode = md->start_code + code_offset;
-        matched_once = TRUE;
-        mstart = md->start_match_ptr;   /* In case \K reset it */
-        if (eptr == md->end_match_ptr)  /* Matched an empty string */
-          {
-          do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-          break;
-          }
-        eptr = md->end_match_ptr;
-        continue;
-        }
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += GET(ecode, 1);
-      if (*ecode != OP_ALT) break;
-      md->capture_last = save_capture_last;
-      }
-
-    if (matched_once || allow_zero)
-      {
-      ecode += 1 + LINK_SIZE;
-      break;
-      }
-    RRETURN(MATCH_NOMATCH);
-
-    /* Control never reaches here. */
-
-    /* Conditional group: compilation checked that there are no more than two
-    branches. If the condition is false, skipping the first branch takes us
-    past the end of the item if there is only one branch, but that's exactly
-    what we want. */
-
-    case OP_COND:
-    case OP_SCOND:
-
-    /* The variable codelink will be added to ecode when the condition is
-    false, to get to the second branch. Setting it to the offset to the ALT
-    or KET, then incrementing ecode achieves this effect. We now have ecode
-    pointing to the condition or callout. */
-
-    codelink = GET(ecode, 1);   /* Offset to the second branch */
-    ecode += 1 + LINK_SIZE;     /* From this opcode */
-
-    /* Because of the way auto-callout works during compile, a callout item is
-    inserted between OP_COND and an assertion condition. */
-
-    if (*ecode == OP_CALLOUT)
-      {
-      if (PUBL(callout) != NULL)
-        {
-        PUBL(callout_block) cb;
-        cb.version          = 2;   /* Version 1 of the callout block */
-        cb.callout_number   = ecode[1];
-        cb.offset_vector    = md->offset_vector;
-#if defined COMPILE_PCRE8
-        cb.subject          = (PCRE_SPTR)md->start_subject;
-#elif defined COMPILE_PCRE16
-        cb.subject          = (PCRE_SPTR16)md->start_subject;
-#elif defined COMPILE_PCRE32
-        cb.subject          = (PCRE_SPTR32)md->start_subject;
-#endif
-        cb.subject_length   = (int)(md->end_subject - md->start_subject);
-        cb.start_match      = (int)(mstart - md->start_subject);
-        cb.current_position = (int)(eptr - md->start_subject);
-        cb.pattern_position = GET(ecode, 2);
-        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
-        cb.capture_top      = offset_top/2;
-        cb.capture_last     = md->capture_last & CAPLMASK;
-        /* Internal change requires this for API compatibility. */
-        if (cb.capture_last == 0) cb.capture_last = -1;
-        cb.callout_data     = md->callout_data;
-        cb.mark             = md->nomatch_mark;
-        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
-        if (rrc < 0) RRETURN(rrc);
-        }
-
-      /* Advance ecode past the callout, so it now points to the condition. We
-      must adjust codelink so that the value of ecode+codelink is unchanged. */
-
-      ecode += PRIV(OP_lengths)[OP_CALLOUT];
-      codelink -= PRIV(OP_lengths)[OP_CALLOUT];
-      }
-
-    /* Test the various possible conditions */
-
-    condition = FALSE;
-    switch(condcode = *ecode)
-      {
-      case OP_RREF:         /* Numbered group recursion test */
-      if (md->recursive != NULL)     /* Not recursing => FALSE */
-        {
-        unsigned int recno = GET2(ecode, 1);   /* Recursion group number*/
-        condition = (recno == RREF_ANY || recno == md->recursive->group_num);
-        }
-      break;
-
-      case OP_DNRREF:       /* Duplicate named group recursion test */
-      if (md->recursive != NULL)
-        {
-        int count = GET2(ecode, 1 + IMM2_SIZE);
-        pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
-        while (count-- > 0)
-          {
-          unsigned int recno = GET2(slot, 0);
-          condition = recno == md->recursive->group_num;
-          if (condition) break;
-          slot += md->name_entry_size;
-          }
-        }
-      break;
-
-      case OP_CREF:         /* Numbered group used test */
-      offset = GET2(ecode, 1) << 1;  /* Doubled ref number */
-      condition = offset < offset_top && md->offset_vector[offset] >= 0;
-      break;
-
-      case OP_DNCREF:      /* Duplicate named group used test */
-        {
-        int count = GET2(ecode, 1 + IMM2_SIZE);
-        pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
-        while (count-- > 0)
-          {
-          offset = GET2(slot, 0) << 1;
-          condition = offset < offset_top && md->offset_vector[offset] >= 0;
-          if (condition) break;
-          slot += md->name_entry_size;
-          }
-        }
-      break;
-
-      case OP_DEF:     /* DEFINE - always false */
-      case OP_FAIL:    /* From optimized (?!) condition */
-      break;
-
-      /* The condition is an assertion. Call match() to evaluate it - setting
-      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end
-      of an assertion. */
-
-      default:
-      md->match_function_type = MATCH_CONDASSERT;
-      RMATCH(eptr, ecode, offset_top, md, NULL, RM3);
-      if (rrc == MATCH_MATCH)
-        {
-        if (md->end_offset_top > offset_top)
-          offset_top = md->end_offset_top;  /* Captures may have happened */
-        condition = TRUE;
-
-        /* Advance ecode past the assertion to the start of the first branch,
-        but adjust it so that the general choosing code below works. If the
-        assertion has a quantifier that allows zero repeats we must skip over
-        the BRAZERO. This is a lunatic thing to do, but somebody did! */
-
-        if (*ecode == OP_BRAZERO) ecode++;
-        ecode += GET(ecode, 1);
-        while (*ecode == OP_ALT) ecode += GET(ecode, 1);
-        ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
-        }
-
-      /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
-      assertion; it is therefore treated as NOMATCH. Any other return is an
-      error. */
-
-      else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
-        {
-        RRETURN(rrc);         /* Need braces because of following else */
-        }
-      break;
-      }
-
-    /* Choose branch according to the condition */
-
-    ecode += condition? PRIV(OP_lengths)[condcode] : codelink;
-
-    /* We are now at the branch that is to be obeyed. As there is only one, we
-    can use tail recursion to avoid using another stack frame, except when
-    there is unlimited repeat of a possibly empty group. In the latter case, a
-    recursive call to match() is always required, unless the second alternative
-    doesn't exist, in which case we can just plough on. Note that, for
-    compatibility with Perl, the | in a conditional group is NOT treated as
-    creating two alternatives. If a THEN is encountered in the branch, it
-    propagates out to the enclosing alternative (unless nested in a deeper set
-    of alternatives, of course). */
-
-    if (condition || ecode[-(1+LINK_SIZE)] == OP_ALT)
-      {
-      if (op != OP_SCOND)
-        {
-        goto TAIL_RECURSE;
-        }
-
-      md->match_function_type = MATCH_CBEGROUP;
-      RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);
-      RRETURN(rrc);
-      }
-
-     /* Condition false & no alternative; continue after the group. */
-
-    else
-      {
-      }
-    break;
-
-
-    /* Before OP_ACCEPT there may be any number of OP_CLOSE opcodes,
-    to close any currently open capturing brackets. */
-
-    case OP_CLOSE:
-    number = GET2(ecode, 1);   /* Must be less than 65536 */
-    offset = number << 1;
-
-#ifdef PCRE_DEBUG
-      printf("end bracket %d at *ACCEPT", number);
-      printf("\n");
-#endif
-
-    md->capture_last = (md->capture_last & OVFLMASK) | number;
-    if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
-      {
-      md->offset_vector[offset] =
-        md->offset_vector[md->offset_end - number];
-      md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
-
-      /* If this group is at or above the current highwater mark, ensure that
-      any groups between the current high water mark and this group are marked
-      unset and then update the high water mark. */
-
-      if (offset >= offset_top)
-        {
-        register int *iptr = md->offset_vector + offset_top;
-        register int *iend = md->offset_vector + offset;
-        while (iptr < iend) *iptr++ = -1;
-        offset_top = offset + 2;
-        }
-      }
-    ecode += 1 + IMM2_SIZE;
-    break;
-
-
-    /* End of the pattern, either real or forced. */
-
-    case OP_END:
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-
-    /* If we have matched an empty string, fail if not in an assertion and not
-    in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
-    is set and we have matched at the start of the subject. In both cases,
-    backtracking will then try other alternatives, if any. */
-
-    if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
-         md->recursive == NULL &&
-         (md->notempty ||
-           (md->notempty_atstart &&
-             mstart == md->start_subject + md->start_offset)))
-      RRETURN(MATCH_NOMATCH);
-
-    /* Otherwise, we have a match. */
-
-    md->end_match_ptr = eptr;           /* Record where we ended */
-    md->end_offset_top = offset_top;    /* and how many extracts were taken */
-    md->start_match_ptr = mstart;       /* and the start (\K can modify) */
-
-    /* For some reason, the macros don't work properly if an expression is
-    given as the argument to RRETURN when the heap is in use. */
-
-    rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
-    RRETURN(rrc);
-
-    /* Assertion brackets. Check the alternative branches in turn - the
-    matching won't pass the KET for an assertion. If any one branch matches,
-    the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
-    start of each branch to move the current point backwards, so the code at
-    this level is identical to the lookahead case. When the assertion is part
-    of a condition, we want to return immediately afterwards. The caller of
-    this incarnation of the match() function will have set MATCH_CONDASSERT in
-    md->match_function type, and one of these opcodes will be the first opcode
-    that is processed. We use a local variable that is preserved over calls to
-    match() to remember this case. */
-
-    case OP_ASSERT:
-    case OP_ASSERTBACK:
-    save_mark = md->mark;
-    if (md->match_function_type == MATCH_CONDASSERT)
-      {
-      condassert = TRUE;
-      md->match_function_type = 0;
-      }
-    else condassert = FALSE;
-
-    /* Loop for each branch */
-
-    do
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
-
-      /* A match means that the assertion is true; break out of the loop
-      that matches its alternatives. */
-
-      if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
-        {
-        mstart = md->start_match_ptr;   /* In case \K reset it */
-        break;
-        }
-
-      /* If not matched, restore the previous mark setting. */
-
-      md->mark = save_mark;
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      /* Anything other than NOMATCH causes the entire assertion to fail,
-      passing back the return code. This includes COMMIT, SKIP, PRUNE and an
-      uncaptured THEN, which means they take their normal effect. This
-      consistent approach does not always have exactly the same effect as in
-      Perl. */
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += GET(ecode, 1);
-      }
-    while (*ecode == OP_ALT);   /* Continue for next alternative */
-
-    /* If we have tried all the alternative branches, the assertion has
-    failed. If not, we broke out after a match. */
-
-    if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
-
-    /* If checking an assertion for a condition, return MATCH_MATCH. */
-
-    if (condassert) RRETURN(MATCH_MATCH);
-
-    /* Continue from after a successful assertion, updating the offsets high
-    water mark, since extracts may have been taken during the assertion. */
-
-    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
-    ecode += 1 + LINK_SIZE;
-    offset_top = md->end_offset_top;
-    continue;
-
-    /* Negative assertion: all branches must fail to match for the assertion to
-    succeed. */
-
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK_NOT:
-    save_mark = md->mark;
-    if (md->match_function_type == MATCH_CONDASSERT)
-      {
-      condassert = TRUE;
-      md->match_function_type = 0;
-      }
-    else condassert = FALSE;
-
-    /* Loop for each alternative branch. */
-
-    do
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
-      md->mark = save_mark;   /* Always restore the mark setting */
-
-      switch(rrc)
-        {
-        case MATCH_MATCH:            /* A successful match means */
-        case MATCH_ACCEPT:           /* the assertion has failed. */
-        RRETURN(MATCH_NOMATCH);
-
-        case MATCH_NOMATCH:          /* Carry on with next branch */
-        break;
-
-        /* See comment in the code for capturing groups above about handling
-        THEN. */
-
-        case MATCH_THEN:
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          {
-          rrc = MATCH_NOMATCH;
-          break;
-          }
-        /* Otherwise fall through. */
-
-        /* COMMIT, SKIP, PRUNE, and an uncaptured THEN cause the whole
-        assertion to fail to match, without considering any more alternatives.
-        Failing to match means the assertion is true. This is a consistent
-        approach, but does not always have the same effect as in Perl. */
-
-        case MATCH_COMMIT:
-        case MATCH_SKIP:
-        case MATCH_SKIP_ARG:
-        case MATCH_PRUNE:
-        do ecode += GET(ecode,1); while (*ecode == OP_ALT);
-        goto NEG_ASSERT_TRUE;   /* Break out of alternation loop */
-
-        /* Anything else is an error */
-
-        default:
-        RRETURN(rrc);
-        }
-
-      /* Continue with next branch */
-
-      ecode += GET(ecode,1);
-      }
-    while (*ecode == OP_ALT);
-
-    /* All branches in the assertion failed to match. */
-
-    NEG_ASSERT_TRUE:
-    if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
-    ecode += 1 + LINK_SIZE;                /* Continue with current branch */
-    continue;
-
-    /* Move the subject pointer back. This occurs only at the start of
-    each branch of a lookbehind assertion. If we are too close to the start to
-    move back, this match function fails. When working with UTF-8 we move
-    back a number of characters, not bytes. */
-
-    case OP_REVERSE:
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      i = GET(ecode, 1);
-      while (i-- > 0)
-        {
-        eptr--;
-        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
-        BACKCHAR(eptr);
-        }
-      }
-    else
-#endif
-
-    /* No UTF-8 support, or not in UTF-8 mode: count is byte count */
-
-      {
-      eptr -= GET(ecode, 1);
-      if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
-      }
-
-    /* Save the earliest consulted character, then skip to next op code */
-
-    if (eptr < md->start_used_ptr) md->start_used_ptr = eptr;
-    ecode += 1 + LINK_SIZE;
-    break;
-
-    /* The callout item calls an external function, if one is provided, passing
-    details of the match so far. This is mainly for debugging, though the
-    function is able to force a failure. */
-
-    case OP_CALLOUT:
-    if (PUBL(callout) != NULL)
-      {
-      PUBL(callout_block) cb;
-      cb.version          = 2;   /* Version 1 of the callout block */
-      cb.callout_number   = ecode[1];
-      cb.offset_vector    = md->offset_vector;
-#if defined COMPILE_PCRE8
-      cb.subject          = (PCRE_SPTR)md->start_subject;
-#elif defined COMPILE_PCRE16
-      cb.subject          = (PCRE_SPTR16)md->start_subject;
-#elif defined COMPILE_PCRE32
-      cb.subject          = (PCRE_SPTR32)md->start_subject;
-#endif
-      cb.subject_length   = (int)(md->end_subject - md->start_subject);
-      cb.start_match      = (int)(mstart - md->start_subject);
-      cb.current_position = (int)(eptr - md->start_subject);
-      cb.pattern_position = GET(ecode, 2);
-      cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
-      cb.capture_top      = offset_top/2;
-      cb.capture_last     = md->capture_last & CAPLMASK;
-      /* Internal change requires this for API compatibility. */
-      if (cb.capture_last == 0) cb.capture_last = -1;
-      cb.callout_data     = md->callout_data;
-      cb.mark             = md->nomatch_mark;
-      if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
-      if (rrc < 0) RRETURN(rrc);
-      }
-    ecode += 2 + 2*LINK_SIZE;
-    break;
-
-    /* Recursion either matches the current regex, or some subexpression. The
-    offset data is the offset to the starting bracket from the start of the
-    whole pattern. (This is so that it works from duplicated subpatterns.)
-
-    The state of the capturing groups is preserved over recursion, and
-    re-instated afterwards. We don't know how many are started and not yet
-    finished (offset_top records the completed total) so we just have to save
-    all the potential data. There may be up to 65535 such values, which is too
-    large to put on the stack, but using malloc for small numbers seems
-    expensive. As a compromise, the stack is used when there are no more than
-    REC_STACK_SAVE_MAX values to store; otherwise malloc is used.
-
-    There are also other values that have to be saved. We use a chained
-    sequence of blocks that actually live on the stack. Thanks to Robin Houston
-    for the original version of this logic. It has, however, been hacked around
-    a lot, so he is not to blame for the current way it works. */
-
-    case OP_RECURSE:
-      {
-      recursion_info *ri;
-      unsigned int recno;
-
-      callpat = md->start_code + GET(ecode, 1);
-      recno = (callpat == md->start_code)? 0 :
-        GET2(callpat, 1 + LINK_SIZE);
-
-      /* Check for repeating a recursion without advancing the subject pointer.
-      This should catch convoluted mutual recursions. (Some simple cases are
-      caught at compile time.) */
-
-      for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
-        if (recno == ri->group_num && eptr == ri->subject_position)
-          RRETURN(PCRE_ERROR_RECURSELOOP);
-
-      /* Add to "recursing stack" */
-
-      new_recursive.group_num = recno;
-      new_recursive.saved_capture_last = md->capture_last;
-      new_recursive.subject_position = eptr;
-      new_recursive.prevrec = md->recursive;
-      md->recursive = &new_recursive;
-
-      /* Where to continue from afterwards */
-
-      ecode += 1 + LINK_SIZE;
-
-      /* Now save the offset data */
-
-      new_recursive.saved_max = md->offset_end;
-      if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
-        new_recursive.offset_save = stacksave;
-      else
-        {
-        new_recursive.offset_save =
-          (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
-        if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
-        }
-      memcpy(new_recursive.offset_save, md->offset_vector,
-            new_recursive.saved_max * sizeof(int));
-
-      /* OK, now we can do the recursion. After processing each alternative,
-      restore the offset data and the last captured value. If there were nested
-      recursions, md->recursive might be changed, so reset it before looping.
-      */
-
-      DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
-      cbegroup = (*callpat >= OP_SBRA);
-      do
-        {
-        if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
-        RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
-          md, eptrb, RM6);
-        memcpy(md->offset_vector, new_recursive.offset_save,
-            new_recursive.saved_max * sizeof(int));
-        md->capture_last = new_recursive.saved_capture_last;
-        md->recursive = new_recursive.prevrec;
-        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
-          {
-          DPRINTF(("Recursion matched\n"));
-          if (new_recursive.offset_save != stacksave)
-            (PUBL(free))(new_recursive.offset_save);
-
-          /* Set where we got to in the subject, and reset the start in case
-          it was changed by \K. This *is* propagated back out of a recursion,
-          for Perl compatibility. */
-
-          eptr = md->end_match_ptr;
-          mstart = md->start_match_ptr;
-          goto RECURSION_MATCHED;        /* Exit loop; end processing */
-          }
-
-        /* PCRE does not allow THEN, SKIP, PRUNE or COMMIT to escape beyond a
-        recursion; they cause a NOMATCH for the entire recursion. These codes
-        are defined in a range that can be tested for. */
-
-        if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX)
-          {
-          if (new_recursive.offset_save != stacksave)
-            (PUBL(free))(new_recursive.offset_save);
-          RRETURN(MATCH_NOMATCH);
-          }
-
-        /* Any return code other than NOMATCH is an error. */
-
-        if (rrc != MATCH_NOMATCH)
-          {
-          DPRINTF(("Recursion gave error %d\n", rrc));
-          if (new_recursive.offset_save != stacksave)
-            (PUBL(free))(new_recursive.offset_save);
-          RRETURN(rrc);
-          }
-
-        md->recursive = &new_recursive;
-        callpat += GET(callpat, 1);
-        }
-      while (*callpat == OP_ALT);
-
-      DPRINTF(("Recursion didn't match\n"));
-      md->recursive = new_recursive.prevrec;
-      if (new_recursive.offset_save != stacksave)
-        (PUBL(free))(new_recursive.offset_save);
-      RRETURN(MATCH_NOMATCH);
-      }
-
-    RECURSION_MATCHED:
-    break;
-
-    /* An alternation is the end of a branch; scan along to find the end of the
-    bracketed group and go to there. */
-
-    case OP_ALT:
-    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
-    break;
-
-    /* BRAZERO, BRAMINZERO and SKIPZERO occur just before a bracket group,
-    indicating that it may occur zero times. It may repeat infinitely, or not
-    at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
-    with fixed upper repeat limits are compiled as a number of copies, with the
-    optional ones preceded by BRAZERO or BRAMINZERO. */
-
-    case OP_BRAZERO:
-    next = ecode + 1;
-    RMATCH(eptr, next, offset_top, md, eptrb, RM10);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    do next += GET(next, 1); while (*next == OP_ALT);
-    ecode = next + 1 + LINK_SIZE;
-    break;
-
-    case OP_BRAMINZERO:
-    next = ecode + 1;
-    do next += GET(next, 1); while (*next == OP_ALT);
-    RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    ecode++;
-    break;
-
-    case OP_SKIPZERO:
-    next = ecode+1;
-    do next += GET(next,1); while (*next == OP_ALT);
-    ecode = next + 1 + LINK_SIZE;
-    break;
-
-    /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
-    here; just jump to the group, with allow_zero set TRUE. */
-
-    case OP_BRAPOSZERO:
-    op = *(++ecode);
-    allow_zero = TRUE;
-    if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
-      goto POSSESSIVE_NON_CAPTURE;
-
-    /* End of a group, repeated or non-repeating. */
-
-    case OP_KET:
-    case OP_KETRMIN:
-    case OP_KETRMAX:
-    case OP_KETRPOS:
-    prev = ecode - GET(ecode, 1);
-
-    /* If this was a group that remembered the subject start, in order to break
-    infinite repeats of empty string matches, retrieve the subject start from
-    the chain. Otherwise, set it NULL. */
-
-    if (*prev >= OP_SBRA || *prev == OP_ONCE)
-      {
-      saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
-      eptrb = eptrb->epb_prev;              /* Backup to previous group */
-      }
-    else saved_eptr = NULL;
-
-    /* If we are at the end of an assertion group or a non-capturing atomic
-    group, stop matching and return MATCH_MATCH, but record the current high
-    water mark for use by positive assertions. We also need to record the match
-    start in case it was changed by \K. */
-
-    if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
-         *prev == OP_ONCE_NC)
-      {
-      md->end_match_ptr = eptr;      /* For ONCE_NC */
-      md->end_offset_top = offset_top;
-      md->start_match_ptr = mstart;
-      RRETURN(MATCH_MATCH);         /* Sets md->mark */
-      }
-
-    /* For capturing groups we have to check the group number back at the start
-    and if necessary complete handling an extraction by setting the offsets and
-    bumping the high water mark. Whole-pattern recursion is coded as a recurse
-    into group 0, so it won't be picked up here. Instead, we catch it when the
-    OP_END is reached. Other recursion is handled here. We just have to record
-    the current subject position and start match pointer and give a MATCH
-    return. */
-
-    if (*prev == OP_CBRA || *prev == OP_SCBRA ||
-        *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
-      {
-      number = GET2(prev, 1+LINK_SIZE);
-      offset = number << 1;
-
-#ifdef PCRE_DEBUG
-      printf("end bracket %d", number);
-      printf("\n");
-#endif
-
-      /* Handle a recursively called group. */
-
-      if (md->recursive != NULL && md->recursive->group_num == number)
-        {
-        md->end_match_ptr = eptr;
-        md->start_match_ptr = mstart;
-        RRETURN(MATCH_MATCH);
-        }
-
-      /* Deal with capturing */
-
-      md->capture_last = (md->capture_last & OVFLMASK) | number;
-      if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
-        {
-        /* If offset is greater than offset_top, it means that we are
-        "skipping" a capturing group, and that group's offsets must be marked
-        unset. In earlier versions of PCRE, all the offsets were unset at the
-        start of matching, but this doesn't work because atomic groups and
-        assertions can cause a value to be set that should later be unset.
-        Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
-        part of the atomic group, but this is not on the final matching path,
-        so must be unset when 2 is set. (If there is no group 2, there is no
-        problem, because offset_top will then be 2, indicating no capture.) */
-
-        if (offset > offset_top)
-          {
-          register int *iptr = md->offset_vector + offset_top;
-          register int *iend = md->offset_vector + offset;
-          while (iptr < iend) *iptr++ = -1;
-          }
-
-        /* Now make the extraction */
-
-        md->offset_vector[offset] =
-          md->offset_vector[md->offset_end - number];
-        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
-        if (offset_top <= offset) offset_top = offset + 2;
-        }
-      }
-
-    /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
-    and return the MATCH_KETRPOS. This makes it possible to do the repeats one
-    at a time from the outer level, thus saving stack. This must precede the
-    empty string test - in this case that test is done at the outer level. */
-
-    if (*ecode == OP_KETRPOS)
-      {
-      md->start_match_ptr = mstart;    /* In case \K reset it */
-      md->end_match_ptr = eptr;
-      md->end_offset_top = offset_top;
-      RRETURN(MATCH_KETRPOS);
-      }
-
-    /* For an ordinary non-repeating ket, just continue at this level. This
-    also happens for a repeating ket if no characters were matched in the
-    group. This is the forcible breaking of infinite loops as implemented in
-    Perl 5.005. For a non-repeating atomic group that includes captures,
-    establish a backup point by processing the rest of the pattern at a lower
-    level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
-    original OP_ONCE level, thereby bypassing intermediate backup points, but
-    resetting any captures that happened along the way. */
-
-    if (*ecode == OP_KET || eptr == saved_eptr)
-      {
-      if (*prev == OP_ONCE)
-        {
-        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
-        RRETURN(MATCH_ONCE);
-        }
-      ecode += 1 + LINK_SIZE;    /* Carry on at this level */
-      break;
-      }
-
-    /* The normal repeating kets try the rest of the pattern or restart from
-    the preceding bracket, in the appropriate order. In the second case, we can
-    use tail recursion to avoid using another stack frame, unless we have an
-    an atomic group or an unlimited repeat of a group that can match an empty
-    string. */
-
-    if (*ecode == OP_KETRMIN)
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      if (*prev == OP_ONCE)
-        {
-        RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
-        RRETURN(MATCH_ONCE);
-        }
-      if (*prev >= OP_SBRA)    /* Could match an empty string */
-        {
-        RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
-        RRETURN(rrc);
-        }
-      ecode = prev;
-      goto TAIL_RECURSE;
-      }
-    else  /* OP_KETRMAX */
-      {
-      RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
-      if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      if (*prev == OP_ONCE)
-        {
-        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->once_target = prev;
-        RRETURN(MATCH_ONCE);
-        }
-      ecode += 1 + LINK_SIZE;
-      goto TAIL_RECURSE;
-      }
-    /* Control never gets here */
-
-    /* Not multiline mode: start of subject assertion, unless notbol. */
-
-    case OP_CIRC:
-    if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
-
-    /* Start of subject assertion */
-
-    case OP_SOD:
-    if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    /* Multiline mode: start of subject unless notbol, or after any newline. */
-
-    case OP_CIRCM:
-    if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
-    if (eptr != md->start_subject &&
-        (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    /* Start of match assertion */
-
-    case OP_SOM:
-    if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    /* Reset the start of match point */
-
-    case OP_SET_SOM:
-    mstart = eptr;
-    ecode++;
-    break;
-
-    /* Multiline mode: assert before any newline, or before end of subject
-    unless noteol is set. */
-
-    case OP_DOLLM:
-    if (eptr < md->end_subject)
-      {
-      if (!IS_NEWLINE(eptr))
-        {
-        if (md->partial != 0 &&
-            eptr + 1 >= md->end_subject &&
-            NLBLOCK->nltype == NLTYPE_FIXED &&
-            NLBLOCK->nllen == 2 &&
-            UCHAR21TEST(eptr) == NLBLOCK->nl[0])
-          {
-          md->hitend = TRUE;
-          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-          }
-        RRETURN(MATCH_NOMATCH);
-        }
-      }
-    else
-      {
-      if (md->noteol) RRETURN(MATCH_NOMATCH);
-      SCHECK_PARTIAL();
-      }
-    ecode++;
-    break;
-
-    /* Not multiline mode: assert before a terminating newline or before end of
-    subject unless noteol is set. */
-
-    case OP_DOLL:
-    if (md->noteol) RRETURN(MATCH_NOMATCH);
-    if (!md->endonly) goto ASSERT_NL_OR_EOS;
-
-    /* ... else fall through for endonly */
-
-    /* End of subject assertion (\z) */
-
-    case OP_EOD:
-    if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
-    SCHECK_PARTIAL();
-    ecode++;
-    break;
-
-    /* End of subject or ending \n assertion (\Z) */
-
-    case OP_EODN:
-    ASSERT_NL_OR_EOS:
-    if (eptr < md->end_subject &&
-        (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
-      {
-      if (md->partial != 0 &&
-          eptr + 1 >= md->end_subject &&
-          NLBLOCK->nltype == NLTYPE_FIXED &&
-          NLBLOCK->nllen == 2 &&
-          UCHAR21TEST(eptr) == NLBLOCK->nl[0])
-        {
-        md->hitend = TRUE;
-        if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-        }
-      RRETURN(MATCH_NOMATCH);
-      }
-
-    /* Either at end of string or \n before end. */
-
-    SCHECK_PARTIAL();
-    ecode++;
-    break;
-
-    /* Word boundary assertions */
-
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-      {
-
-      /* Find out if the previous and current characters are "word" characters.
-      It takes a bit more work in UTF-8 mode. Characters > 255 are assumed to
-      be "non-word" characters. Remember the earliest consulted character for
-      partial matching. */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        /* Get status of previous character */
-
-        if (eptr == md->start_subject) prev_is_word = FALSE; else
-          {
-          PCRE_PUCHAR lastptr = eptr - 1;
-          BACKCHAR(lastptr);
-          if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
-          GETCHAR(c, lastptr);
-#ifdef SUPPORT_UCP
-          if (md->use_ucp)
-            {
-            if (c == '_') prev_is_word = TRUE; else
-              {
-              int cat = UCD_CATEGORY(c);
-              prev_is_word = (cat == ucp_L || cat == ucp_N);
-              }
-            }
-          else
-#endif
-          prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
-          }
-
-        /* Get status of next character */
-
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          cur_is_word = FALSE;
-          }
-        else
-          {
-          GETCHAR(c, eptr);
-#ifdef SUPPORT_UCP
-          if (md->use_ucp)
-            {
-            if (c == '_') cur_is_word = TRUE; else
-              {
-              int cat = UCD_CATEGORY(c);
-              cur_is_word = (cat == ucp_L || cat == ucp_N);
-              }
-            }
-          else
-#endif
-          cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
-          }
-        }
-      else
-#endif
-
-      /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
-      consistency with the behaviour of \w we do use it in this case. */
-
-        {
-        /* Get status of previous character */
-
-        if (eptr == md->start_subject) prev_is_word = FALSE; else
-          {
-          if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
-#ifdef SUPPORT_UCP
-          if (md->use_ucp)
-            {
-            c = eptr[-1];
-            if (c == '_') prev_is_word = TRUE; else
-              {
-              int cat = UCD_CATEGORY(c);
-              prev_is_word = (cat == ucp_L || cat == ucp_N);
-              }
-            }
-          else
-#endif
-          prev_is_word = MAX_255(eptr[-1])
-            && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
-          }
-
-        /* Get status of next character */
-
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          cur_is_word = FALSE;
-          }
-        else
-#ifdef SUPPORT_UCP
-        if (md->use_ucp)
-          {
-          c = *eptr;
-          if (c == '_') cur_is_word = TRUE; else
-            {
-            int cat = UCD_CATEGORY(c);
-            cur_is_word = (cat == ucp_L || cat == ucp_N);
-            }
-          }
-        else
-#endif
-        cur_is_word = MAX_255(*eptr)
-          && ((md->ctypes[*eptr] & ctype_word) != 0);
-        }
-
-      /* Now see if the situation is what we want */
-
-      if ((*ecode++ == OP_WORD_BOUNDARY)?
-           cur_is_word == prev_is_word : cur_is_word != prev_is_word)
-        RRETURN(MATCH_NOMATCH);
-      }
-    break;
-
-    /* Match any single character type except newline; have to take care with
-    CRLF newlines and partial matching. */
-
-    case OP_ANY:
-    if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
-    if (md->partial != 0 &&
-        eptr + 1 >= md->end_subject &&
-        NLBLOCK->nltype == NLTYPE_FIXED &&
-        NLBLOCK->nllen == 2 &&
-        UCHAR21TEST(eptr) == NLBLOCK->nl[0])
-      {
-      md->hitend = TRUE;
-      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-      }
-
-    /* Fall through */
-
-    /* Match any single character whatsoever. */
-
-    case OP_ALLANY:
-    if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
-      {                            /* not be updated before SCHECK_PARTIAL. */
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    eptr++;
-#ifdef SUPPORT_UTF
-    if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-#endif
-    ecode++;
-    break;
-
-    /* Match a single byte, even in UTF-8 mode. This opcode really does match
-    any byte, even newline, independent of the setting of PCRE_DOTALL. */
-
-    case OP_ANYBYTE:
-    if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
-      {                            /* not be updated before SCHECK_PARTIAL. */
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    eptr++;
-    ecode++;
-    break;
-
-    case OP_NOT_DIGIT:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c < 256 &&
-#endif
-       (md->ctypes[c] & ctype_digit) != 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_DIGIT:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c > 255 ||
-#endif
-       (md->ctypes[c] & ctype_digit) == 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_NOT_WHITESPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c < 256 &&
-#endif
-       (md->ctypes[c] & ctype_space) != 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_WHITESPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c > 255 ||
-#endif
-       (md->ctypes[c] & ctype_space) == 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_NOT_WORDCHAR:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c < 256 &&
-#endif
-       (md->ctypes[c] & ctype_word) != 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_WORDCHAR:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c > 255 ||
-#endif
-       (md->ctypes[c] & ctype_word) == 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_ANYNL:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      default: RRETURN(MATCH_NOMATCH);
-
-      case CHAR_CR:
-      if (eptr >= md->end_subject)
-        {
-        SCHECK_PARTIAL();
-        }
-      else if (UCHAR21TEST(eptr) == CHAR_LF) eptr++;
-      break;
-
-      case CHAR_LF:
-      break;
-
-      case CHAR_VT:
-      case CHAR_FF:
-      case CHAR_NEL:
-#ifndef EBCDIC
-      case 0x2028:
-      case 0x2029:
-#endif  /* Not EBCDIC */
-      if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-      break;
-      }
-    ecode++;
-    break;
-
-    case OP_NOT_HSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
-      default: break;
-      }
-    ecode++;
-    break;
-
-    case OP_HSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      HSPACE_CASES: break;  /* Byte and multibyte cases */
-      default: RRETURN(MATCH_NOMATCH);
-      }
-    ecode++;
-    break;
-
-    case OP_NOT_VSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      VSPACE_CASES: RRETURN(MATCH_NOMATCH);
-      default: break;
-      }
-    ecode++;
-    break;
-
-    case OP_VSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      VSPACE_CASES: break;
-      default: RRETURN(MATCH_NOMATCH);
-      }
-    ecode++;
-    break;
-
-#ifdef SUPPORT_UCP
-    /* Check the next character by Unicode property. We will get here only
-    if the support is in the binary; otherwise a compile-time error occurs. */
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-      {
-      const pcre_uint32 *cp;
-      const ucd_record *prop = GET_UCD(c);
-
-      switch(ecode[1])
-        {
-        case PT_ANY:
-        if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_LAMP:
-        if ((prop->chartype == ucp_Lu ||
-             prop->chartype == ucp_Ll ||
-             prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_GC:
-        if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_PC:
-        if ((ecode[2] != prop->chartype) == (op == OP_PROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_SC:
-        if ((ecode[2] != prop->script) == (op == OP_PROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        /* These are specials */
-
-        case PT_ALNUM:
-        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-             PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-        which means that Perl space and POSIX space are now identical. PCRE
-        was changed at release 8.34. */
-
-        case PT_SPACE:    /* Perl space */
-        case PT_PXSPACE:  /* POSIX space */
-        switch(c)
-          {
-          HSPACE_CASES:
-          VSPACE_CASES:
-          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
-          break;
-
-          default:
-          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) ==
-            (op == OP_NOTPROP)) RRETURN(MATCH_NOMATCH);
-          break;
-          }
-        break;
-
-        case PT_WORD:
-        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-             PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
-             c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_CLIST:
-        cp = PRIV(ucd_caseless_sets) + ecode[2];
-        for (;;)
-          {
-          if (c < *cp)
-            { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
-          if (c == *cp++)
-            { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
-          }
-        break;
-
-        case PT_UCNC:
-        if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-             c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-             c >= 0xe000) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        /* This should never occur */
-
-        default:
-        RRETURN(PCRE_ERROR_INTERNAL);
-        }
-
-      ecode += 3;
-      }
-    break;
-
-    /* Match an extended Unicode sequence. We will get here only if the support
-    is in the binary; otherwise a compile-time error occurs. */
-
-    case OP_EXTUNI:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    else
-      {
-      int lgb, rgb;
-      GETCHARINCTEST(c, eptr);
-      lgb = UCD_GRAPHBREAK(c);
-      while (eptr < md->end_subject)
-        {
-        int len = 1;
-        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-        rgb = UCD_GRAPHBREAK(c);
-        if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-        lgb = rgb;
-        eptr += len;
-        }
-      }
-    CHECK_PARTIAL();
-    ecode++;
-    break;
-#endif  /* SUPPORT_UCP */
-
-
-    /* Match a back reference, possibly repeatedly. Look past the end of the
-    item to see if there is repeat information following. The code is similar
-    to that for character classes, but repeated for efficiency. Then obey
-    similar code to character type repeats - written out again for speed.
-    However, if the referenced string is the empty string, always treat
-    it as matched, any number of times (otherwise there could be infinite
-    loops). If the reference is unset, there are two possibilities:
-
-    (a) In the default, Perl-compatible state, set the length negative;
-    this ensures that every attempt at a match fails. We can't just fail
-    here, because of the possibility of quantifiers with zero minima.
-
-    (b) If the JavaScript compatibility flag is set, set the length to zero
-    so that the back reference matches an empty string.
-
-    Otherwise, set the length to the length of what was matched by the
-    referenced subpattern.
-
-    The OP_REF and OP_REFI opcodes are used for a reference to a numbered group
-    or to a non-duplicated named group. For a duplicated named group, OP_DNREF
-    and OP_DNREFI are used. In this case we must scan the list of groups to
-    which the name refers, and use the first one that is set. */
-
-    case OP_DNREF:
-    case OP_DNREFI:
-    caseless = op == OP_DNREFI;
-      {
-      int count = GET2(ecode, 1+IMM2_SIZE);
-      pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
-      ecode += 1 + 2*IMM2_SIZE;
-
-      /* Setting the default length first and initializing 'offset' avoids
-      compiler warnings in the REF_REPEAT code. */
-
-      length = (md->jscript_compat)? 0 : -1;
-      offset = 0;
-
-      while (count-- > 0)
-        {
-        offset = GET2(slot, 0) << 1;
-        if (offset < offset_top && md->offset_vector[offset] >= 0)
-          {
-          length = md->offset_vector[offset+1] - md->offset_vector[offset];
-          break;
-          }
-        slot += md->name_entry_size;
-        }
-      }
-    goto REF_REPEAT;
-
-    case OP_REF:
-    case OP_REFI:
-    caseless = op == OP_REFI;
-    offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
-    ecode += 1 + IMM2_SIZE;
-    if (offset >= offset_top || md->offset_vector[offset] < 0)
-      length = (md->jscript_compat)? 0 : -1;
-    else
-      length = md->offset_vector[offset+1] - md->offset_vector[offset];
-
-    /* Set up for repetition, or handle the non-repeated case */
-
-    REF_REPEAT:
-    switch (*ecode)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      c = *ecode++ - OP_CRSTAR;
-      minimize = (c & 1) != 0;
-      min = rep_min[c];                 /* Pick up values from tables; */
-      max = rep_max[c];                 /* zero for max => infinity */
-      if (max == 0) max = INT_MAX;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      minimize = (*ecode == OP_CRMINRANGE);
-      min = GET2(ecode, 1);
-      max = GET2(ecode, 1 + IMM2_SIZE);
-      if (max == 0) max = INT_MAX;
-      ecode += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:               /* No repeat follows */
-      if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
-        {
-        if (length == -2) eptr = md->end_subject;   /* Partial match */
-        CHECK_PARTIAL();
-        RRETURN(MATCH_NOMATCH);
-        }
-      eptr += length;
-      continue;              /* With the main loop */
-      }
-
-    /* Handle repeated back references. If the length of the reference is
-    zero, just continue with the main loop. If the length is negative, it
-    means the reference is unset in non-Java-compatible mode. If the minimum is
-    zero, we can continue at the same level without recursion. For any other
-    minimum, carrying on will result in NOMATCH. */
-
-    if (length == 0) continue;
-    if (length < 0 && min == 0) continue;
-
-    /* First, ensure the minimum number of matches are present. We get back
-    the length of the reference string explicitly rather than passing the
-    address of eptr, so that eptr can be a register variable. */
-
-    for (i = 1; i <= min; i++)
-      {
-      int slength;
-      if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-        {
-        if (slength == -2) eptr = md->end_subject;   /* Partial match */
-        CHECK_PARTIAL();
-        RRETURN(MATCH_NOMATCH);
-        }
-      eptr += slength;
-      }
-
-    /* If min = max, continue at the same level without recursion.
-    They are not both allowed to be zero. */
-
-    if (min == max) continue;
-
-    /* If minimizing, keep trying and advancing the pointer */
-
-    if (minimize)
-      {
-      for (fi = min;; fi++)
-        {
-        int slength;
-        RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        if (fi >= max) RRETURN(MATCH_NOMATCH);
-        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-          {
-          if (slength == -2) eptr = md->end_subject;   /* Partial match */
-          CHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        eptr += slength;
-        }
-      /* Control never gets here */
-      }
-
-    /* If maximizing, find the longest string and work backwards */
-
-    else
-      {
-      pp = eptr;
-      for (i = min; i < max; i++)
-        {
-        int slength;
-        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-          {
-          /* Can't use CHECK_PARTIAL because we don't want to update eptr in
-          the soft partial matching case. */
-
-          if (slength == -2 && md->partial != 0 &&
-              md->end_subject > md->start_used_ptr)
-            {
-            md->hitend = TRUE;
-            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-            }
-          break;
-          }
-        eptr += slength;
-        }
-
-      while (eptr >= pp)
-        {
-        RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        eptr -= length;
-        }
-      RRETURN(MATCH_NOMATCH);
-      }
-    /* Control never gets here */
-
-    /* Match a bit-mapped character class, possibly repeatedly. This op code is
-    used when all the characters in the class have values in the range 0-255,
-    and either the matching is caseful, or the characters are in the range
-    0-127 when UTF-8 processing is enabled. The only difference between
-    OP_CLASS and OP_NCLASS occurs when a data character outside the range is
-    encountered.
-
-    First, look past the end of the item to see if there is repeat information
-    following. Then obey similar code to character type repeats - written out
-    again for speed. */
-
-    case OP_NCLASS:
-    case OP_CLASS:
-      {
-      /* The data variable is saved across frames, so the byte map needs to
-      be stored there. */
-#define BYTE_MAP ((pcre_uint8 *)data)
-      data = ecode + 1;                /* Save for matching */
-      ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
-
-      switch (*ecode)
-        {
-        case OP_CRSTAR:
-        case OP_CRMINSTAR:
-        case OP_CRPLUS:
-        case OP_CRMINPLUS:
-        case OP_CRQUERY:
-        case OP_CRMINQUERY:
-        case OP_CRPOSSTAR:
-        case OP_CRPOSPLUS:
-        case OP_CRPOSQUERY:
-        c = *ecode++ - OP_CRSTAR;
-        if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
-        else possessive = TRUE;
-        min = rep_min[c];                 /* Pick up values from tables; */
-        max = rep_max[c];                 /* zero for max => infinity */
-        if (max == 0) max = INT_MAX;
-        break;
-
-        case OP_CRRANGE:
-        case OP_CRMINRANGE:
-        case OP_CRPOSRANGE:
-        minimize = (*ecode == OP_CRMINRANGE);
-        possessive = (*ecode == OP_CRPOSRANGE);
-        min = GET2(ecode, 1);
-        max = GET2(ecode, 1 + IMM2_SIZE);
-        if (max == 0) max = INT_MAX;
-        ecode += 1 + 2 * IMM2_SIZE;
-        break;
-
-        default:               /* No repeat follows */
-        min = max = 1;
-        break;
-        }
-
-      /* First, ensure the minimum number of matches are present. */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          if (c > 255)
-            {
-            if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-            }
-          else
-            if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-          }
-        }
-      else
-#endif
-      /* Not UTF mode */
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          c = *eptr++;
-#ifndef COMPILE_PCRE8
-          if (c > 255)
-            {
-            if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-            }
-          else
-#endif
-            if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-          }
-        }
-
-      /* If max == min we can continue with the main loop without the
-      need to recurse. */
-
-      if (min == max) continue;
-
-      /* If minimizing, keep testing the rest of the expression and advancing
-      the pointer while it matches the class. */
-
-      if (minimize)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINC(c, eptr);
-            if (c > 255)
-              {
-              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-              }
-            else
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        else
-#endif
-        /* Not UTF mode */
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            c = *eptr++;
-#ifndef COMPILE_PCRE8
-            if (c > 255)
-              {
-              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-              }
-            else
-#endif
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* If maximizing, find the longest possible run, then work backwards. */
-
-      else
-        {
-        pp = eptr;
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c > 255)
-              {
-              if (op == OP_CLASS) break;
-              }
-            else
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
-            eptr += len;
-            }
-
-          if (possessive) continue;    /* No backtracking */
-
-          for (;;)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (eptr-- == pp) break;        /* Stop if tried at original pos */
-            BACKCHAR(eptr);
-            }
-          }
-        else
-#endif
-          /* Not UTF mode */
-          {
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            c = *eptr;
-#ifndef COMPILE_PCRE8
-            if (c > 255)
-              {
-              if (op == OP_CLASS) break;
-              }
-            else
-#endif
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
-            eptr++;
-            }
-
-          if (possessive) continue;    /* No backtracking */
-
-          while (eptr >= pp)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            }
-          }
-
-        RRETURN(MATCH_NOMATCH);
-        }
-#undef BYTE_MAP
-      }
-    /* Control never gets here */
-
-
-    /* Match an extended character class. In the 8-bit library, this opcode is
-    encountered only when UTF-8 mode mode is supported. In the 16-bit and
-    32-bit libraries, codepoints greater than 255 may be encountered even when
-    UTF is not supported. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-      {
-      data = ecode + 1 + LINK_SIZE;                /* Save for matching */
-      ecode += GET(ecode, 1);                      /* Advance past the item */
-
-      switch (*ecode)
-        {
-        case OP_CRSTAR:
-        case OP_CRMINSTAR:
-        case OP_CRPLUS:
-        case OP_CRMINPLUS:
-        case OP_CRQUERY:
-        case OP_CRMINQUERY:
-        case OP_CRPOSSTAR:
-        case OP_CRPOSPLUS:
-        case OP_CRPOSQUERY:
-        c = *ecode++ - OP_CRSTAR;
-        if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
-        else possessive = TRUE;
-        min = rep_min[c];                 /* Pick up values from tables; */
-        max = rep_max[c];                 /* zero for max => infinity */
-        if (max == 0) max = INT_MAX;
-        break;
-
-        case OP_CRRANGE:
-        case OP_CRMINRANGE:
-        case OP_CRPOSRANGE:
-        minimize = (*ecode == OP_CRMINRANGE);
-        possessive = (*ecode == OP_CRPOSRANGE);
-        min = GET2(ecode, 1);
-        max = GET2(ecode, 1 + IMM2_SIZE);
-        if (max == 0) max = INT_MAX;
-        ecode += 1 + 2 * IMM2_SIZE;
-        break;
-
-        default:               /* No repeat follows */
-        min = max = 1;
-        break;
-        }
-
-      /* First, ensure the minimum number of matches are present. */
-
-      for (i = 1; i <= min; i++)
-        {
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        GETCHARINCTEST(c, eptr);
-        if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
-        }
-
-      /* If max == min we can continue with the main loop without the
-      need to recurse. */
-
-      if (min == max) continue;
-
-      /* If minimizing, keep testing the rest of the expression and advancing
-      the pointer while it matches the class. */
-
-      if (minimize)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINCTEST(c, eptr);
-          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
-          }
-        /* Control never gets here */
-        }
-
-      /* If maximizing, find the longest possible run, then work backwards. */
-
-      else
-        {
-        pp = eptr;
-        for (i = min; i < max; i++)
-          {
-          int len = 1;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-#ifdef SUPPORT_UTF
-          GETCHARLENTEST(c, eptr, len);
-#else
-          c = *eptr;
-#endif
-          if (!PRIV(xclass)(c, data, utf)) break;
-          eptr += len;
-          }
-
-        if (possessive) continue;    /* No backtracking */
-
-        for(;;)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (eptr-- == pp) break;        /* Stop if tried at original pos */
-#ifdef SUPPORT_UTF
-          if (utf) BACKCHAR(eptr);
-#endif
-          }
-        RRETURN(MATCH_NOMATCH);
-        }
-
-      /* Control never gets here */
-      }
-#endif    /* End of XCLASS */
-
-    /* Match a single character, casefully */
-
-    case OP_CHAR:
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      length = 1;
-      ecode++;
-      GETCHARLEN(fc, ecode, length);
-      if (length > md->end_subject - eptr)
-        {
-        CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
-        RRETURN(MATCH_NOMATCH);
-        }
-      while (length-- > 0) if (*ecode++ != UCHAR21INC(eptr)) RRETURN(MATCH_NOMATCH);
-      }
-    else
-#endif
-    /* Not UTF mode */
-      {
-      if (md->end_subject - eptr < 1)
-        {
-        SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
-        RRETURN(MATCH_NOMATCH);
-        }
-      if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
-      ecode += 2;
-      }
-    break;
-
-    /* Match a single character, caselessly. If we are at the end of the
-    subject, give up immediately. */
-
-    case OP_CHARI:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      length = 1;
-      ecode++;
-      GETCHARLEN(fc, ecode, length);
-
-      /* If the pattern character's value is < 128, we have only one byte, and
-      we know that its other case must also be one byte long, so we can use the
-      fast lookup table. We know that there is at least one byte left in the
-      subject. */
-
-      if (fc < 128)
-        {
-        pcre_uint32 cc = UCHAR21(eptr);
-        if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
-        ecode++;
-        eptr++;
-        }
-
-      /* Otherwise we must pick up the subject character. Note that we cannot
-      use the value of "length" to check for sufficient bytes left, because the
-      other case of the character may have more or fewer bytes.  */
-
-      else
-        {
-        pcre_uint32 dc;
-        GETCHARINC(dc, eptr);
-        ecode += length;
-
-        /* If we have Unicode property support, we can use it to test the other
-        case of the character, if there is one. */
-
-        if (fc != dc)
-          {
-#ifdef SUPPORT_UCP
-          if (dc != UCD_OTHERCASE(fc))
-#endif
-            RRETURN(MATCH_NOMATCH);
-          }
-        }
-      }
-    else
-#endif   /* SUPPORT_UTF */
-
-    /* Not UTF mode */
-      {
-      if (TABLE_GET(ecode[1], md->lcc, ecode[1])
-          != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
-      eptr++;
-      ecode += 2;
-      }
-    break;
-
-    /* Match a single character repeatedly. */
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    min = max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATCHAR;
-
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    possessive = TRUE;
-    /* Fall through */
-
-    case OP_UPTO:
-    case OP_UPTOI:
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    min = 0;
-    max = GET2(ecode, 1);
-    minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATCHAR;
-
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    possessive = TRUE;
-    min = 0;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATCHAR;
-
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    possessive = TRUE;
-    min = 1;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATCHAR;
-
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    possessive = TRUE;
-    min = 0;
-    max = 1;
-    ecode++;
-    goto REPEATCHAR;
-
-    case OP_STAR:
-    case OP_STARI:
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
-
-    /* Common code for all repeated single-character matches. We first check
-    for the minimum number of characters. If the minimum equals the maximum, we
-    are done. Otherwise, if minimizing, check the rest of the pattern for a
-    match; if there isn't one, advance up to the maximum, one character at a
-    time.
-
-    If maximizing, advance up to the maximum number of matching characters,
-    until eptr is past the end of the maximum run. If possessive, we are
-    then done (no backing up). Otherwise, match at this position; anything
-    other than no match is immediately returned. For nomatch, back up one
-    character, unless we are matching \R and the last thing matched was
-    \r\n, in which case, back up two bytes. When we reach the first optional
-    character position, we can save stack by doing a tail recurse.
-
-    The various UTF/non-UTF and caseful/caseless cases are handled separately,
-    for speed. */
-
-    REPEATCHAR:
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      length = 1;
-      charptr = ecode;
-      GETCHARLEN(fc, ecode, length);
-      ecode += length;
-
-      /* Handle multibyte character matching specially here. There is
-      support for caseless matching if UCP support is present. */
-
-      if (length > 1)
-        {
-#ifdef SUPPORT_UCP
-        pcre_uint32 othercase;
-        if (op >= OP_STARI &&     /* Caseless */
-            (othercase = UCD_OTHERCASE(fc)) != fc)
-          oclength = PRIV(ord2utf)(othercase, occhars);
-        else oclength = 0;
-#endif  /* SUPPORT_UCP */
-
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr <= md->end_subject - length &&
-            memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
-#ifdef SUPPORT_UCP
-          else if (oclength > 0 &&
-                   eptr <= md->end_subject - oclength &&
-                   memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
-#endif  /* SUPPORT_UCP */
-          else
-            {
-            CHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          }
-
-        if (min == max) continue;
-
-        if (minimize)
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr <= md->end_subject - length &&
-              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
-#ifdef SUPPORT_UCP
-            else if (oclength > 0 &&
-                     eptr <= md->end_subject - oclength &&
-                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
-#endif  /* SUPPORT_UCP */
-            else
-              {
-              CHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            }
-          /* Control never gets here */
-          }
-
-        else  /* Maximize */
-          {
-          pp = eptr;
-          for (i = min; i < max; i++)
-            {
-            if (eptr <= md->end_subject - length &&
-                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
-#ifdef SUPPORT_UCP
-            else if (oclength > 0 &&
-                     eptr <= md->end_subject - oclength &&
-                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
-#endif  /* SUPPORT_UCP */
-            else
-              {
-              CHECK_PARTIAL();
-              break;
-              }
-            }
-
-          if (possessive) continue;    /* No backtracking */
-          for(;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-#ifdef SUPPORT_UCP
-            eptr--;
-            BACKCHAR(eptr);
-#else   /* without SUPPORT_UCP */
-            eptr -= length;
-#endif  /* SUPPORT_UCP */
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* If the length of a UTF-8 character is 1, we fall through here, and
-      obey the code as for non-UTF-8 characters below, though in this case the
-      value of fc will always be < 128. */
-      }
-    else
-#endif  /* SUPPORT_UTF */
-      /* When not in UTF-8 mode, load a single-byte character. */
-      fc = *ecode++;
-
-    /* The value of fc at this point is always one character, though we may
-    or may not be in UTF mode. The code is duplicated for the caseless and
-    caseful cases, for speed, since matching characters is likely to be quite
-    common. First, ensure the minimum number of matches are present. If min =
-    max, continue at the same level without recursing. Otherwise, if
-    minimizing, keep trying the rest of the expression and advancing one
-    matching character if failing, up to the maximum. Alternatively, if
-    maximizing, find the maximum number of characters and work backwards. */
-
-    DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
-      max, (char *)eptr));
-
-    if (op >= OP_STARI)  /* Caseless */
-      {
-#ifdef COMPILE_PCRE8
-      /* fc must be < 128 if UTF is enabled. */
-      foc = md->fcc[fc];
-#else
-#ifdef SUPPORT_UTF
-#ifdef SUPPORT_UCP
-      if (utf && fc > 127)
-        foc = UCD_OTHERCASE(fc);
-#else
-      if (utf && fc > 127)
-        foc = fc;
-#endif /* SUPPORT_UCP */
-      else
-#endif /* SUPPORT_UTF */
-        foc = TABLE_GET(fc, md->fcc, fc);
-#endif /* COMPILE_PCRE8 */
-
-      for (i = 1; i <= min; i++)
-        {
-        pcre_uint32 cc;                 /* Faster than pcre_uchar */
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        cc = UCHAR21TEST(eptr);
-        if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
-        eptr++;
-        }
-      if (min == max) continue;
-      if (minimize)
-        {
-        for (fi = min;; fi++)
-          {
-          pcre_uint32 cc;               /* Faster than pcre_uchar */
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21TEST(eptr);
-          if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        /* Control never gets here */
-        }
-      else  /* Maximize */
-        {
-        pp = eptr;
-        for (i = min; i < max; i++)
-          {
-          pcre_uint32 cc;               /* Faster than pcre_uchar */
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-          cc = UCHAR21TEST(eptr);
-          if (fc != cc && foc != cc) break;
-          eptr++;
-          }
-        if (possessive) continue;       /* No backtracking */
-        for (;;)
-          {
-          if (eptr == pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
-          eptr--;
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          }
-        /* Control never gets here */
-        }
-      }
-
-    /* Caseful comparisons (includes all multi-byte characters) */
-
-    else
-      {
-      for (i = 1; i <= min; i++)
-        {
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        if (fc != UCHAR21INCTEST(eptr)) RRETURN(MATCH_NOMATCH);
-        }
-
-      if (min == max) continue;
-
-      if (minimize)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (fc != UCHAR21INCTEST(eptr)) RRETURN(MATCH_NOMATCH);
-          }
-        /* Control never gets here */
-        }
-      else  /* Maximize */
-        {
-        pp = eptr;
-        for (i = min; i < max; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-          if (fc != UCHAR21TEST(eptr)) break;
-          eptr++;
-          }
-        if (possessive) continue;    /* No backtracking */
-        for (;;)
-          {
-          if (eptr == pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
-          eptr--;
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          }
-        /* Control never gets here */
-        }
-      }
-    /* Control never gets here */
-
-    /* Match a negated single one-byte character. The character we are
-    checking can be multibyte. */
-
-    case OP_NOT:
-    case OP_NOTI:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      register pcre_uint32 ch, och;
-
-      ecode++;
-      GETCHARINC(ch, ecode);
-      GETCHARINC(c, eptr);
-
-      if (op == OP_NOT)
-        {
-        if (ch == c) RRETURN(MATCH_NOMATCH);
-        }
-      else
-        {
-#ifdef SUPPORT_UCP
-        if (ch > 127)
-          och = UCD_OTHERCASE(ch);
-#else
-        if (ch > 127)
-          och = ch;
-#endif /* SUPPORT_UCP */
-        else
-          och = TABLE_GET(ch, md->fcc, ch);
-        if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
-        }
-      }
-    else
-#endif
-      {
-      register pcre_uint32 ch = ecode[1];
-      c = *eptr++;
-      if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
-        RRETURN(MATCH_NOMATCH);
-      ecode += 2;
-      }
-    break;
-
-    /* Match a negated single one-byte character repeatedly. This is almost a
-    repeat of the code for a repeated single character, but I haven't found a
-    nice way of commoning these up that doesn't require a test of the
-    positive/negative option for each character match. Maybe that wouldn't add
-    very much to the time taken, but character matching *is* what this is all
-    about... */
-
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-    min = max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-    min = 0;
-    max = GET2(ecode, 1);
-    minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-    possessive = TRUE;
-    min = 0;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-    possessive = TRUE;
-    min = 1;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-    possessive = TRUE;
-    min = 0;
-    max = 1;
-    ecode++;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-    possessive = TRUE;
-    min = 0;
-    max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-    c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
-
-    /* Common code for all repeated single-byte matches. */
-
-    REPEATNOTCHAR:
-    GETCHARINCTEST(fc, ecode);
-
-    /* The code is duplicated for the caseless and caseful cases, for speed,
-    since matching characters is likely to be quite common. First, ensure the
-    minimum number of matches are present. If min = max, continue at the same
-    level without recursing. Otherwise, if minimizing, keep trying the rest of
-    the expression and advancing one matching character if failing, up to the
-    maximum. Alternatively, if maximizing, find the maximum number of
-    characters and work backwards. */
-
-    DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
-      max, (char *)eptr));
-
-    if (op >= OP_NOTSTARI)     /* Caseless */
-      {
-#ifdef SUPPORT_UTF
-#ifdef SUPPORT_UCP
-      if (utf && fc > 127)
-        foc = UCD_OTHERCASE(fc);
-#else
-      if (utf && fc > 127)
-        foc = fc;
-#endif /* SUPPORT_UCP */
-      else
-#endif /* SUPPORT_UTF */
-        foc = TABLE_GET(fc, md->fcc, fc);
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        register pcre_uint32 d;
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(d, eptr);
-          if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
-          }
-        }
-      else
-#endif  /* SUPPORT_UTF */
-      /* Not UTF mode */
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        }
-
-      if (min == max) continue;
-
-      if (minimize)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINC(d, eptr);
-            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        else
-#endif  /*SUPPORT_UTF */
-        /* Not UTF mode */
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
-            eptr++;
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* Maximize case */
-
-      else
-        {
-        pp = eptr;
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(d, eptr, len);
-            if (fc == d || (unsigned int)foc == d) break;
-            eptr += len;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for(;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            BACKCHAR(eptr);
-            }
-          }
-        else
-#endif  /* SUPPORT_UTF */
-        /* Not UTF mode */
-          {
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (fc == *eptr || foc == *eptr) break;
-            eptr++;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for (;;)
-            {
-            if (eptr == pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            }
-          }
-        /* Control never gets here */
-        }
-      }
-
-    /* Caseful comparisons */
-
-    else
-      {
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        register pcre_uint32 d;
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(d, eptr);
-          if (fc == d) RRETURN(MATCH_NOMATCH);
-          }
-        }
-      else
-#endif
-      /* Not UTF mode */
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
-          }
-        }
-
-      if (min == max) continue;
-
-      if (minimize)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINC(d, eptr);
-            if (fc == d) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        else
-#endif
-        /* Not UTF mode */
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* Maximize case */
-
-      else
-        {
-        pp = eptr;
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(d, eptr, len);
-            if (fc == d) break;
-            eptr += len;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for(;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            BACKCHAR(eptr);
-            }
-          }
-        else
-#endif
-        /* Not UTF mode */
-          {
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (fc == *eptr) break;
-            eptr++;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for (;;)
-            {
-            if (eptr == pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            }
-          }
-        /* Control never gets here */
-        }
-      }
-    /* Control never gets here */
-
-    /* Match a single character type repeatedly; several different opcodes
-    share code. This is very similar to the code for single characters, but we
-    repeat it in the interests of efficiency. */
-
-    case OP_TYPEEXACT:
-    min = max = GET2(ecode, 1);
-    minimize = TRUE;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATTYPE;
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    min = 0;
-    max = GET2(ecode, 1);
-    minimize = *ecode == OP_TYPEMINUPTO;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSSTAR:
-    possessive = TRUE;
-    min = 0;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSPLUS:
-    possessive = TRUE;
-    min = 1;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSQUERY:
-    possessive = TRUE;
-    min = 0;
-    max = 1;
-    ecode++;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSUPTO:
-    possessive = TRUE;
-    min = 0;
-    max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATTYPE;
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    c = *ecode++ - OP_TYPESTAR;
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
-
-    /* Common code for all repeated single character type matches. Note that
-    in UTF-8 mode, '.' matches a character of any length, but for the other
-    character types, the valid characters are all one-byte long. */
-
-    REPEATTYPE:
-    ctype = *ecode++;      /* Code for the character type */
-
-#ifdef SUPPORT_UCP
-    if (ctype == OP_PROP || ctype == OP_NOTPROP)
-      {
-      prop_fail_result = ctype == OP_NOTPROP;
-      prop_type = *ecode++;
-      prop_value = *ecode++;
-      }
-    else prop_type = -1;
-#endif
-
-    /* First, ensure the minimum number of matches are present. Use inline
-    code for maximizing the speed, and do the type test once at the start
-    (i.e. keep it out of the loop). Separate the UTF-8 code completely as that
-    is tidier. Also separate the UCP code, which can be the same for both UTF-8
-    and single-bytes. */
-
-    if (min > 0)
-      {
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        switch(prop_type)
-          {
-          case PT_ANY:
-          if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            }
-          break;
-
-          case PT_LAMP:
-          for (i = 1; i <= min; i++)
-            {
-            int chartype;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            chartype = UCD_CHARTYPE(c);
-            if ((chartype == ucp_Lu ||
-                 chartype == ucp_Ll ||
-                 chartype == ucp_Lt) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_GC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_PC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_SC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_ALNUM:
-          for (i = 1; i <= min; i++)
-            {
-            int category;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-          which means that Perl space and POSIX space are now identical. PCRE
-          was changed at release 8.34. */
-
-          case PT_SPACE:    /* Perl space */
-          case PT_PXSPACE:  /* POSIX space */
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            switch(c)
-              {
-              HSPACE_CASES:
-              VSPACE_CASES:
-              if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-              break;
-
-              default:
-              if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
-                RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            }
-          break;
-
-          case PT_WORD:
-          for (i = 1; i <= min; i++)
-            {
-            int category;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
-                   == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_CLIST:
-          for (i = 1; i <= min; i++)
-            {
-            const pcre_uint32 *cp;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            cp = PRIV(ucd_caseless_sets) + prop_value;
-            for (;;)
-              {
-              if (c < *cp)
-                { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
-              if (c == *cp++)
-                { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
-              }
-            }
-          break;
-
-          case PT_UCNC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-                 c >= 0xe000) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          /* This should not occur */
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-        }
-
-      /* Match extended Unicode sequences. We will get here only if the
-      support is in the binary; otherwise a compile-time error occurs. */
-
-      else if (ctype == OP_EXTUNI)
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          else
-            {
-            int lgb, rgb;
-            GETCHARINCTEST(c, eptr);
-            lgb = UCD_GRAPHBREAK(c);
-           while (eptr < md->end_subject)
-              {
-              int len = 1;
-              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-              rgb = UCD_GRAPHBREAK(c);
-              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-              lgb = rgb;
-              eptr += len;
-              }
-            }
-          CHECK_PARTIAL();
-          }
-        }
-
-      else
-#endif     /* SUPPORT_UCP */
-
-/* Handle all other cases when the coding is UTF-8 */
-
-#ifdef SUPPORT_UTF
-      if (utf) switch(ctype)
-        {
-        case OP_ANY:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
-          if (md->partial != 0 &&
-              eptr + 1 >= md->end_subject &&
-              NLBLOCK->nltype == NLTYPE_FIXED &&
-              NLBLOCK->nllen == 2 &&
-              UCHAR21(eptr) == NLBLOCK->nl[0])
-            {
-            md->hitend = TRUE;
-            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-            }
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_ALLANY:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_ANYBYTE:
-        if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
-        eptr += min;
-        break;
-
-        case OP_ANYNL:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-
-            case CHAR_CR:
-            if (eptr < md->end_subject && UCHAR21(eptr) == CHAR_LF) eptr++;
-            break;
-
-            case CHAR_LF:
-            break;
-
-            case CHAR_VT:
-            case CHAR_FF:
-            case CHAR_NEL:
-#ifndef EBCDIC
-            case 0x2028:
-            case 0x2029:
-#endif  /* Not EBCDIC */
-            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
-            default: break;
-            }
-          }
-        break;
-
-        case OP_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            HSPACE_CASES: break;  /* Byte and multibyte cases */
-            default: RRETURN(MATCH_NOMATCH);
-            }
-          }
-        break;
-
-        case OP_NOT_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            VSPACE_CASES: RRETURN(MATCH_NOMATCH);
-            default: break;
-            }
-          }
-        break;
-
-        case OP_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            VSPACE_CASES: break;
-            default: RRETURN(MATCH_NOMATCH);
-            }
-          }
-        break;
-
-        case OP_NOT_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
-            RRETURN(MATCH_NOMATCH);
-          }
-        break;
-
-        case OP_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc >= 128 || (md->ctypes[cc] & ctype_digit) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          /* No need to skip more bytes - we know it's a 1-byte character */
-          }
-        break;
-
-        case OP_NOT_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc < 128 && (md->ctypes[cc] & ctype_space) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc >= 128 || (md->ctypes[cc] & ctype_space) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          /* No need to skip more bytes - we know it's a 1-byte character */
-          }
-        break;
-
-        case OP_NOT_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc < 128 && (md->ctypes[cc] & ctype_word) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc >= 128 || (md->ctypes[cc] & ctype_word) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          /* No need to skip more bytes - we know it's a 1-byte character */
-          }
-        break;
-
-        default:
-        RRETURN(PCRE_ERROR_INTERNAL);
-        }  /* End switch(ctype) */
-
-      else
-#endif     /* SUPPORT_UTF */
-
-      /* Code for the non-UTF-8 case for minimum matching of operators other
-      than OP_PROP and OP_NOTPROP. */
-
-      switch(ctype)
-        {
-        case OP_ANY:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
-          if (md->partial != 0 &&
-              eptr + 1 >= md->end_subject &&
-              NLBLOCK->nltype == NLTYPE_FIXED &&
-              NLBLOCK->nllen == 2 &&
-              *eptr == NLBLOCK->nl[0])
-            {
-            md->hitend = TRUE;
-            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-            }
-          eptr++;
-          }
-        break;
-
-        case OP_ALLANY:
-        if (eptr > md->end_subject - min)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        eptr += min;
-        break;
-
-        case OP_ANYBYTE:
-        if (eptr > md->end_subject - min)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        eptr += min;
-        break;
-
-        case OP_ANYNL:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-
-            case CHAR_CR:
-            if (eptr < md->end_subject && *eptr == CHAR_LF) eptr++;
-            break;
-
-            case CHAR_LF:
-            break;
-
-            case CHAR_VT:
-            case CHAR_FF:
-            case CHAR_NEL:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            case 0x2028:
-            case 0x2029:
-#endif
-            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: break;
-            HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            HSPACE_MULTIBYTE_CASES:
-#endif
-            RRETURN(MATCH_NOMATCH);
-            }
-          }
-        break;
-
-        case OP_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-            HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            HSPACE_MULTIBYTE_CASES:
-#endif
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            VSPACE_MULTIBYTE_CASES:
-#endif
-            RRETURN(MATCH_NOMATCH);
-            default: break;
-            }
-          }
-        break;
-
-        case OP_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-            VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            VSPACE_MULTIBYTE_CASES:
-#endif
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_digit) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_digit) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_NOT_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_space) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_space) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_NOT_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_word) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_word) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        default:
-        RRETURN(PCRE_ERROR_INTERNAL);
-        }
-      }
-
-    /* If min = max, continue at the same level without recursing */
-
-    if (min == max) continue;
-
-    /* If minimizing, we have to test the rest of the pattern before each
-    subsequent match. Again, separate the UTF-8 case for speed, and also
-    separate the UCP cases. */
-
-    if (minimize)
-      {
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        switch(prop_type)
-          {
-          case PT_ANY:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_LAMP:
-          for (fi = min;; fi++)
-            {
-            int chartype;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            chartype = UCD_CHARTYPE(c);
-            if ((chartype == ucp_Lu ||
-                 chartype == ucp_Ll ||
-                 chartype == ucp_Lt) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_GC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_PC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_SC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_ALNUM:
-          for (fi = min;; fi++)
-            {
-            int category;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-          which means that Perl space and POSIX space are now identical. PCRE
-          was changed at release 8.34. */
-
-          case PT_SPACE:    /* Perl space */
-          case PT_PXSPACE:  /* POSIX space */
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            switch(c)
-              {
-              HSPACE_CASES:
-              VSPACE_CASES:
-              if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-              break;
-
-              default:
-              if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
-                RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            }
-          /* Control never gets here */
-
-          case PT_WORD:
-          for (fi = min;; fi++)
-            {
-            int category;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L ||
-                 category == ucp_N ||
-                 c == CHAR_UNDERSCORE)
-                   == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_CLIST:
-          for (fi = min;; fi++)
-            {
-            const pcre_uint32 *cp;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM67);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            cp = PRIV(ucd_caseless_sets) + prop_value;
-            for (;;)
-              {
-              if (c < *cp)
-                { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
-              if (c == *cp++)
-                { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
-              }
-            }
-          /* Control never gets here */
-
-          case PT_UCNC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-                 c >= 0xe000) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          /* This should never occur */
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-        }
-
-      /* Match extended Unicode sequences. We will get here only if the
-      support is in the binary; otherwise a compile-time error occurs. */
-
-      else if (ctype == OP_EXTUNI)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          else
-            {
-            int lgb, rgb;
-            GETCHARINCTEST(c, eptr);
-            lgb = UCD_GRAPHBREAK(c);
-            while (eptr < md->end_subject)
-              {
-              int len = 1;
-              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-              rgb = UCD_GRAPHBREAK(c);
-              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-              lgb = rgb;
-              eptr += len;
-              }
-            }
-          CHECK_PARTIAL();
-          }
-        }
-      else
-#endif     /* SUPPORT_UCP */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (ctype == OP_ANY && IS_NEWLINE(eptr))
-            RRETURN(MATCH_NOMATCH);
-          GETCHARINC(c, eptr);
-          switch(ctype)
-            {
-            case OP_ANY:               /* This is the non-NL case */
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                c == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            break;
-
-            case OP_ALLANY:
-            case OP_ANYBYTE:
-            break;
-
-            case OP_ANYNL:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              case CHAR_CR:
-              if (eptr < md->end_subject && UCHAR21(eptr) == CHAR_LF) eptr++;
-              break;
-
-              case CHAR_LF:
-              break;
-
-              case CHAR_VT:
-              case CHAR_FF:
-              case CHAR_NEL:
-#ifndef EBCDIC
-              case 0x2028:
-              case 0x2029:
-#endif  /* Not EBCDIC */
-              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            break;
-
-            case OP_NOT_HSPACE:
-            switch(c)
-              {
-              HSPACE_CASES: RRETURN(MATCH_NOMATCH);
-              default: break;
-              }
-            break;
-
-            case OP_HSPACE:
-            switch(c)
-              {
-              HSPACE_CASES: break;
-              default: RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_NOT_VSPACE:
-            switch(c)
-              {
-              VSPACE_CASES: RRETURN(MATCH_NOMATCH);
-              default: break;
-              }
-            break;
-
-            case OP_VSPACE:
-            switch(c)
-              {
-              VSPACE_CASES: break;
-              default: RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_NOT_DIGIT:
-            if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_DIGIT:
-            if (c >= 256 || (md->ctypes[c] & ctype_digit) == 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WHITESPACE:
-            if (c < 256 && (md->ctypes[c] & ctype_space) != 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WHITESPACE:
-            if (c >= 256 || (md->ctypes[c] & ctype_space) == 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WORDCHAR:
-            if (c < 256 && (md->ctypes[c] & ctype_word) != 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WORDCHAR:
-            if (c >= 256 || (md->ctypes[c] & ctype_word) == 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            default:
-            RRETURN(PCRE_ERROR_INTERNAL);
-            }
-          }
-        }
-      else
-#endif
-      /* Not UTF mode */
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM43);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (ctype == OP_ANY && IS_NEWLINE(eptr))
-            RRETURN(MATCH_NOMATCH);
-          c = *eptr++;
-          switch(ctype)
-            {
-            case OP_ANY:               /* This is the non-NL case */
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                c == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            break;
-
-            case OP_ALLANY:
-            case OP_ANYBYTE:
-            break;
-
-            case OP_ANYNL:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              case CHAR_CR:
-              if (eptr < md->end_subject && *eptr == CHAR_LF) eptr++;
-              break;
-
-              case CHAR_LF:
-              break;
-
-              case CHAR_VT:
-              case CHAR_FF:
-              case CHAR_NEL:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              case 0x2028:
-              case 0x2029:
-#endif
-              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            break;
-
-            case OP_NOT_HSPACE:
-            switch(c)
-              {
-              default: break;
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_HSPACE:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              break;
-              }
-            break;
-
-            case OP_NOT_VSPACE:
-            switch(c)
-              {
-              default: break;
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_VSPACE:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              break;
-              }
-            break;
-
-            case OP_NOT_DIGIT:
-            if (MAX_255(c) && (md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_DIGIT:
-            if (!MAX_255(c) || (md->ctypes[c] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WHITESPACE:
-            if (MAX_255(c) && (md->ctypes[c] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WHITESPACE:
-            if (!MAX_255(c) || (md->ctypes[c] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WORDCHAR:
-            if (MAX_255(c) && (md->ctypes[c] & ctype_word) != 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WORDCHAR:
-            if (!MAX_255(c) || (md->ctypes[c] & ctype_word) == 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            default:
-            RRETURN(PCRE_ERROR_INTERNAL);
-            }
-          }
-        }
-      /* Control never gets here */
-      }
-
-    /* If maximizing, it is worth using inline code for speed, doing the type
-    test once at the start (i.e. keep it out of the loop). Again, keep the
-    UTF-8 and UCP stuff separate. */
-
-    else
-      {
-      pp = eptr;  /* Remember where we started */
-
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        switch(prop_type)
-          {
-          case PT_ANY:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if (prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_LAMP:
-          for (i = min; i < max; i++)
-            {
-            int chartype;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            chartype = UCD_CHARTYPE(c);
-            if ((chartype == ucp_Lu ||
-                 chartype == ucp_Ll ||
-                 chartype == ucp_Lt) == prop_fail_result)
-              break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_GC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_PC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_SC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_ALNUM:
-          for (i = min; i < max; i++)
-            {
-            int category;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-              break;
-            eptr+= len;
-            }
-          break;
-
-          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-          which means that Perl space and POSIX space are now identical. PCRE
-          was changed at release 8.34. */
-
-          case PT_SPACE:    /* Perl space */
-          case PT_PXSPACE:  /* POSIX space */
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            switch(c)
-              {
-              HSPACE_CASES:
-              VSPACE_CASES:
-              if (prop_fail_result) goto ENDLOOP99;  /* Break the loop */
-              break;
-
-              default:
-              if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
-                goto ENDLOOP99;   /* Break the loop */
-              break;
-              }
-            eptr+= len;
-            }
-          ENDLOOP99:
-          break;
-
-          case PT_WORD:
-          for (i = min; i < max; i++)
-            {
-            int category;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N ||
-                 c == CHAR_UNDERSCORE) == prop_fail_result)
-              break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_CLIST:
-          for (i = min; i < max; i++)
-            {
-            const pcre_uint32 *cp;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            cp = PRIV(ucd_caseless_sets) + prop_value;
-            for (;;)
-              {
-              if (c < *cp)
-                { if (prop_fail_result) break; else goto GOT_MAX; }
-              if (c == *cp++)
-                { if (prop_fail_result) goto GOT_MAX; else break; }
-              }
-            eptr += len;
-            }
-          GOT_MAX:
-          break;
-
-          case PT_UCNC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-                 c >= 0xe000) == prop_fail_result)
-              break;
-            eptr += len;
-            }
-          break;
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-
-        /* eptr is now past the end of the maximum run */
-
-        if (possessive) continue;    /* No backtracking */
-        for(;;)
-          {
-          if (eptr <= pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM44);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          eptr--;
-          if (utf) BACKCHAR(eptr);
-          }
-        }
-
-      /* Match extended Unicode grapheme clusters. We will get here only if the
-      support is in the binary; otherwise a compile-time error occurs. */
-
-      else if (ctype == OP_EXTUNI)
-        {
-        for (i = min; i < max; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-          else
-            {
-            int lgb, rgb;
-            GETCHARINCTEST(c, eptr);
-            lgb = UCD_GRAPHBREAK(c);
-            while (eptr < md->end_subject)
-              {
-              int len = 1;
-              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-              rgb = UCD_GRAPHBREAK(c);
-              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-              lgb = rgb;
-              eptr += len;
-              }
-            }
-          CHECK_PARTIAL();
-          }
-
-        /* eptr is now past the end of the maximum run */
-
-        if (possessive) continue;    /* No backtracking */
-
-        /* We use <= pp rather than == pp to detect the start of the run while
-        backtracking because the use of \C in UTF mode can cause BACKCHAR to
-        move back past pp. This is just palliative; the use of \C in UTF mode
-        is fraught with danger. */
-
-        for(;;)
-          {
-          int lgb, rgb;
-          PCRE_PUCHAR fptr;
-
-          if (eptr <= pp) goto TAIL_RECURSE;   /* At start of char run */
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-
-          /* Backtracking over an extended grapheme cluster involves inspecting
-          the previous two characters (if present) to see if a break is
-          permitted between them. */
-
-          eptr--;
-          if (!utf) c = *eptr; else
-            {
-            BACKCHAR(eptr);
-            GETCHAR(c, eptr);
-            }
-          rgb = UCD_GRAPHBREAK(c);
-
-          for (;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;   /* At start of char run */
-            fptr = eptr - 1;
-            if (!utf) c = *fptr; else
-              {
-              BACKCHAR(fptr);
-              GETCHAR(c, fptr);
-              }
-            lgb = UCD_GRAPHBREAK(c);
-            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-            eptr = fptr;
-            rgb = lgb;
-            }
-          }
-        }
-
-      else
-#endif   /* SUPPORT_UCP */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        switch(ctype)
-          {
-          case OP_ANY:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (IS_NEWLINE(eptr)) break;
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr + 1 >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                UCHAR21(eptr) == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            eptr++;
-            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-            }
-          break;
-
-          case OP_ALLANY:
-          if (max < INT_MAX)
-            {
-            for (i = min; i < max; i++)
-              {
-              if (eptr >= md->end_subject)
-                {
-                SCHECK_PARTIAL();
-                break;
-                }
-              eptr++;
-              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-              }
-            }
-          else
-            {
-            eptr = md->end_subject;   /* Unlimited UTF-8 repeat */
-            SCHECK_PARTIAL();
-            }
-          break;
-
-          /* The byte case is the same as non-UTF8 */
-
-          case OP_ANYBYTE:
-          c = max - min;
-          if (c > (unsigned int)(md->end_subject - eptr))
-            {
-            eptr = md->end_subject;
-            SCHECK_PARTIAL();
-            }
-          else eptr += c;
-          break;
-
-          case OP_ANYNL:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c == CHAR_CR)
-              {
-              if (++eptr >= md->end_subject) break;
-              if (UCHAR21(eptr) == CHAR_LF) eptr++;
-              }
-            else
-              {
-              if (c != CHAR_LF &&
-                  (md->bsr_anycrlf ||
-                   (c != CHAR_VT && c != CHAR_FF && c != CHAR_NEL
-#ifndef EBCDIC
-                    && c != 0x2028 && c != 0x2029
-#endif  /* Not EBCDIC */
-                    )))
-                break;
-              eptr += len;
-              }
-            }
-          break;
-
-          case OP_NOT_HSPACE:
-          case OP_HSPACE:
-          for (i = min; i < max; i++)
-            {
-            BOOL gotspace;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            switch(c)
-              {
-              HSPACE_CASES: gotspace = TRUE; break;
-              default: gotspace = FALSE; break;
-              }
-            if (gotspace == (ctype == OP_NOT_HSPACE)) break;
-            eptr += len;
-            }
-          break;
-
-          case OP_NOT_VSPACE:
-          case OP_VSPACE:
-          for (i = min; i < max; i++)
-            {
-            BOOL gotspace;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            switch(c)
-              {
-              VSPACE_CASES: gotspace = TRUE; break;
-              default: gotspace = FALSE; break;
-              }
-            if (gotspace == (ctype == OP_NOT_VSPACE)) break;
-            eptr += len;
-            }
-          break;
-
-          case OP_NOT_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c < 256 && (md->ctypes[c] & ctype_digit) != 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c >= 256 ||(md->ctypes[c] & ctype_digit) == 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_NOT_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c < 256 && (md->ctypes[c] & ctype_space) != 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c >= 256 ||(md->ctypes[c] & ctype_space) == 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_NOT_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c < 256 && (md->ctypes[c] & ctype_word) != 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c >= 256 || (md->ctypes[c] & ctype_word) == 0) break;
-            eptr+= len;
-            }
-          break;
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-
-        if (possessive) continue;    /* No backtracking */
-        for(;;)
-          {
-          if (eptr <= pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM46);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          eptr--;
-          BACKCHAR(eptr);
-          if (ctype == OP_ANYNL && eptr > pp  && UCHAR21(eptr) == CHAR_NL &&
-              UCHAR21(eptr - 1) == CHAR_CR) eptr--;
-          }
-        }
-      else
-#endif  /* SUPPORT_UTF */
-      /* Not UTF mode */
-        {
-        switch(ctype)
-          {
-          case OP_ANY:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (IS_NEWLINE(eptr)) break;
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr + 1 >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                *eptr == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            eptr++;
-            }
-          break;
-
-          case OP_ALLANY:
-          case OP_ANYBYTE:
-          c = max - min;
-          if (c > (unsigned int)(md->end_subject - eptr))
-            {
-            eptr = md->end_subject;
-            SCHECK_PARTIAL();
-            }
-          else eptr += c;
-          break;
-
-          case OP_ANYNL:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            c = *eptr;
-            if (c == CHAR_CR)
-              {
-              if (++eptr >= md->end_subject) break;
-              if (*eptr == CHAR_LF) eptr++;
-              }
-            else
-              {
-              if (c != CHAR_LF && (md->bsr_anycrlf ||
-                 (c != CHAR_VT && c != CHAR_FF && c != CHAR_NEL
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-                 && c != 0x2028 && c != 0x2029
-#endif
-                 ))) break;
-              eptr++;
-              }
-            }
-          break;
-
-          case OP_NOT_HSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: eptr++; break;
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              goto ENDLOOP00;
-              }
-            }
-          ENDLOOP00:
-          break;
-
-          case OP_HSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: goto ENDLOOP01;
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              eptr++; break;
-              }
-            }
-          ENDLOOP01:
-          break;
-
-          case OP_NOT_VSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: eptr++; break;
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              goto ENDLOOP02;
-              }
-            }
-          ENDLOOP02:
-          break;
-
-          case OP_VSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: goto ENDLOOP03;
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              eptr++; break;
-              }
-            }
-          ENDLOOP03:
-          break;
-
-          case OP_NOT_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_digit) != 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_digit) == 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_NOT_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_space) != 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_space) == 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_NOT_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_word) != 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_word) == 0) break;
-            eptr++;
-            }
-          break;
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-
-        if (possessive) continue;    /* No backtracking */
-        for (;;)
-          {
-          if (eptr == pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM47);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          eptr--;
-          if (ctype == OP_ANYNL && eptr > pp  && *eptr == CHAR_LF &&
-              eptr[-1] == CHAR_CR) eptr--;
-          }
-        }
-
-      /* Control never gets here */
-      }
-
-    /* There's been some horrible disaster. Arrival here can only mean there is
-    something seriously wrong in the code above or the OP_xxx definitions. */
-
-    default:
-    DPRINTF(("Unknown opcode %d\n", *ecode));
-    RRETURN(PCRE_ERROR_UNKNOWN_OPCODE);
-    }
-
-  /* Do not stick any code in here without much thought; it is assumed
-  that "continue" in the code above comes out to here to repeat the main
-  loop. */
-
-  }             /* End of main loop */
-/* Control never reaches here */
-
-
-/* When compiling to use the heap rather than the stack for recursive calls to
-match(), the RRETURN() macro jumps here. The number that is saved in
-frame->Xwhere indicates which label we actually want to return to. */
-
-#ifdef NO_RECURSE
-#define LBL(val) case val: goto L_RM##val;
-HEAP_RETURN:
-switch (frame->Xwhere)
-  {
-  LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
-  LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
-  LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
-  LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
-  LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58) LBL(63) LBL(64)
-  LBL(65) LBL(66)
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  LBL(20) LBL(21)
-#endif
-#ifdef SUPPORT_UTF
-  LBL(16) LBL(18)
-  LBL(22) LBL(23) LBL(28) LBL(30)
-  LBL(32) LBL(34) LBL(42) LBL(46)
-#ifdef SUPPORT_UCP
-  LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
-  LBL(59) LBL(60) LBL(61) LBL(62) LBL(67)
-#endif  /* SUPPORT_UCP */
-#endif  /* SUPPORT_UTF */
-  default:
-  DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
-  return PCRE_ERROR_INTERNAL;
-  }
-#undef LBL
-#endif  /* NO_RECURSE */
-}
-
-
-/***************************************************************************
-****************************************************************************
-                   RECURSION IN THE match() FUNCTION
-
-Undefine all the macros that were defined above to handle this. */
-
-#ifdef NO_RECURSE
-#undef eptr
-#undef ecode
-#undef mstart
-#undef offset_top
-#undef eptrb
-#undef flags
-
-#undef callpat
-#undef charptr
-#undef data
-#undef next
-#undef pp
-#undef prev
-#undef saved_eptr
-
-#undef new_recursive
-
-#undef cur_is_word
-#undef condition
-#undef prev_is_word
-
-#undef ctype
-#undef length
-#undef max
-#undef min
-#undef number
-#undef offset
-#undef op
-#undef save_capture_last
-#undef save_offset1
-#undef save_offset2
-#undef save_offset3
-#undef stacksave
-
-#undef newptrb
-
-#endif
-
-/* These two are defined as macros in both cases */
-
-#undef fc
-#undef fi
-
-/***************************************************************************
-***************************************************************************/
-
-
-#ifdef NO_RECURSE
-/*************************************************
-*          Release allocated heap frames         *
-*************************************************/
-
-/* This function releases all the allocated frames. The base frame is on the
-machine stack, and so must not be freed.
-
-Argument: the address of the base frame
-Returns:  nothing
-*/
-
-static void
-release_match_heapframes (heapframe *frame_base)
-{
-heapframe *nextframe = frame_base->Xnextframe;
-while (nextframe != NULL)
-  {
-  heapframe *oldframe = nextframe;
-  nextframe = nextframe->Xnextframe;
-  (PUBL(stack_free))(oldframe);
-  }
-}
-#endif
-
-
-/*************************************************
-*         Execute a Regular Expression           *
-*************************************************/
-
-/* This function applies a compiled re to a subject string and picks out
-portions of the string if it matches. Two elements in the vector are set for
-each substring: the offsets to the start and end of the substring.
-
-Arguments:
-  argument_re     points to the compiled expression
-  extra_data      points to extra data or is NULL
-  subject         points to the subject string
-  length          length of subject string (may contain binary zeros)
-  start_offset    where to start in the subject string
-  options         option bits
-  offsets         points to a vector of ints to be filled in with offsets
-  offsetcount     the number of elements in the vector
-
-Returns:          > 0 => success; value is the number of elements filled in
-                  = 0 => success, but offsets is not big enough
-                   -1 => failed to match
-                 < -1 => some kind of unexpected problem
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
-  PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_exec(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  PCRE_SPTR32 subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount)
-#endif
-{
-int rc, ocount, arg_offset_max;
-int newline;
-BOOL using_temporary_offsets = FALSE;
-BOOL anchored;
-BOOL startline;
-BOOL firstline;
-BOOL utf;
-BOOL has_first_char = FALSE;
-BOOL has_req_char = FALSE;
-pcre_uchar first_char = 0;
-pcre_uchar first_char2 = 0;
-pcre_uchar req_char = 0;
-pcre_uchar req_char2 = 0;
-match_data match_block;
-match_data *md = &match_block;
-const pcre_uint8 *tables;
-const pcre_uint8 *start_bits = NULL;
-PCRE_PUCHAR start_match = (PCRE_PUCHAR)subject + start_offset;
-PCRE_PUCHAR end_subject;
-PCRE_PUCHAR start_partial = NULL;
-PCRE_PUCHAR match_partial = NULL;
-PCRE_PUCHAR req_char_ptr = start_match - 1;
-
-const pcre_study_data *study;
-const REAL_PCRE *re = (const REAL_PCRE *)argument_re;
-
-#ifdef NO_RECURSE
-heapframe frame_zero;
-frame_zero.Xprevframe = NULL;            /* Marks the top level */
-frame_zero.Xnextframe = NULL;            /* None are allocated yet */
-md->match_frames_base = &frame_zero;
-#endif
-
-/* Check for the special magic call that measures the size of the stack used
-per recursive call of match(). Without the funny casting for sizeof, a Windows
-compiler gave this error: "unary minus operator applied to unsigned type,
-result still unsigned". Hopefully the cast fixes that. */
-
-if (re == NULL && extra_data == NULL && subject == NULL && length == -999 &&
-    start_offset == -999)
-#ifdef NO_RECURSE
-  return -((int)sizeof(heapframe));
-#else
-  return match(NULL, NULL, NULL, 0, NULL, NULL, 0);
-#endif
-
-/* Plausibility checks */
-
-if ((options & ~PUBLIC_EXEC_OPTIONS) != 0) return PCRE_ERROR_BADOPTION;
-if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0))
-  return PCRE_ERROR_NULL;
-if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
-if (length < 0) return PCRE_ERROR_BADLENGTH;
-if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
-
-/* Check that the first field in the block is the magic number. If it is not,
-return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
-REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
-means that the pattern is likely compiled with different endianness. */
-
-if (re->magic_number != MAGIC_NUMBER)
-  return re->magic_number == REVERSED_MAGIC_NUMBER?
-    PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-
-/* These two settings are used in the code for checking a UTF-8 string that
-follows immediately afterwards. Other values in the md block are used only
-during "normal" pcre_exec() processing, not when the JIT support is in use,
-so they are set up later. */
-
-/* PCRE_UTF16 has the same value as PCRE_UTF8. */
-utf = md->utf = (re->options & PCRE_UTF8) != 0;
-md->partial = ((options & PCRE_PARTIAL_HARD) != 0)? 2 :
-              ((options & PCRE_PARTIAL_SOFT) != 0)? 1 : 0;
-
-/* Check a UTF-8 string if required. Pass back the character offset and error
-code for an invalid string if a results vector is available. */
-
-#ifdef SUPPORT_UTF
-if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
-  {
-  int erroroffset;
-  int errorcode = PRIV(valid_utf)((PCRE_PUCHAR)subject, length, &erroroffset);
-  if (errorcode != 0)
-    {
-    if (offsetcount >= 2)
-      {
-      offsets[0] = erroroffset;
-      offsets[1] = errorcode;
-      }
-#if defined COMPILE_PCRE8
-    return (errorcode <= PCRE_UTF8_ERR5 && md->partial > 1)?
-      PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
-#elif defined COMPILE_PCRE16
-    return (errorcode <= PCRE_UTF16_ERR1 && md->partial > 1)?
-      PCRE_ERROR_SHORTUTF16 : PCRE_ERROR_BADUTF16;
-#elif defined COMPILE_PCRE32
-    return PCRE_ERROR_BADUTF32;
-#endif
-    }
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-  /* Check that a start_offset points to the start of a UTF character. */
-  if (start_offset > 0 && start_offset < length &&
-      NOT_FIRSTCHAR(((PCRE_PUCHAR)subject)[start_offset]))
-    return PCRE_ERROR_BADUTF8_OFFSET;
-#endif
-  }
-#endif
-
-/* If the pattern was successfully studied with JIT support, run the JIT
-executable instead of the rest of this function. Most options must be set at
-compile time for the JIT code to be usable. Fallback to the normal code path if
-an unsupported flag is set. */
-
-#ifdef SUPPORT_JIT
-if (extra_data != NULL
-    && (extra_data->flags & (PCRE_EXTRA_EXECUTABLE_JIT |
-                             PCRE_EXTRA_TABLES)) == PCRE_EXTRA_EXECUTABLE_JIT
-    && extra_data->executable_jit != NULL
-    && (options & ~PUBLIC_JIT_EXEC_OPTIONS) == 0)
-  {
-  rc = PRIV(jit_exec)(extra_data, (const pcre_uchar *)subject, length,
-       start_offset, options, offsets, offsetcount);
-
-  /* PCRE_ERROR_NULL means that the selected normal or partial matching
-  mode is not compiled. In this case we simply fallback to interpreter. */
-
-  if (rc != PCRE_ERROR_JIT_BADOPTION) return rc;
-  }
-#endif
-
-/* Carry on with non-JIT matching. This information is for finding all the
-numbers associated with a given name, for condition testing. */
-
-md->name_table = (pcre_uchar *)re + re->name_table_offset;
-md->name_count = re->name_count;
-md->name_entry_size = re->name_entry_size;
-
-/* Fish out the optional data from the extra_data structure, first setting
-the default values. */
-
-study = NULL;
-md->match_limit = MATCH_LIMIT;
-md->match_limit_recursion = MATCH_LIMIT_RECURSION;
-md->callout_data = NULL;
-
-/* The table pointer is always in native byte order. */
-
-tables = re->tables;
-
-/* The two limit values override the defaults, whatever their value. */
-
-if (extra_data != NULL)
-  {
-  unsigned long int flags = extra_data->flags;
-  if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
-    study = (const pcre_study_data *)extra_data->study_data;
-  if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0)
-    md->match_limit = extra_data->match_limit;
-  if ((flags & PCRE_EXTRA_MATCH_LIMIT_RECURSION) != 0)
-    md->match_limit_recursion = extra_data->match_limit_recursion;
-  if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0)
-    md->callout_data = extra_data->callout_data;
-  if ((flags & PCRE_EXTRA_TABLES) != 0) tables = extra_data->tables;
-  }
-
-/* Limits in the regex override only if they are smaller. */
-
-if ((re->flags & PCRE_MLSET) != 0 && re->limit_match < md->match_limit)
-  md->match_limit = re->limit_match;
-
-if ((re->flags & PCRE_RLSET) != 0 &&
-    re->limit_recursion < md->match_limit_recursion)
-  md->match_limit_recursion = re->limit_recursion;
-
-/* If the exec call supplied NULL for tables, use the inbuilt ones. This
-is a feature that makes it possible to save compiled regex and re-use them
-in other programs later. */
-
-if (tables == NULL) tables = PRIV(default_tables);
-
-/* Set up other data */
-
-anchored = ((re->options | options) & PCRE_ANCHORED) != 0;
-startline = (re->flags & PCRE_STARTLINE) != 0;
-firstline = (re->options & PCRE_FIRSTLINE) != 0;
-
-/* The code starts after the real_pcre block and the capture name table. */
-
-md->start_code = (const pcre_uchar *)re + re->name_table_offset +
-  re->name_count * re->name_entry_size;
-
-md->start_subject = (PCRE_PUCHAR)subject;
-md->start_offset = start_offset;
-md->end_subject = md->start_subject + length;
-end_subject = md->end_subject;
-
-md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
-md->use_ucp = (re->options & PCRE_UCP) != 0;
-md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
-md->ignore_skip_arg = 0;
-
-/* Some options are unpacked into BOOL variables in the hope that testing
-them will be faster than individual option bits. */
-
-md->notbol = (options & PCRE_NOTBOL) != 0;
-md->noteol = (options & PCRE_NOTEOL) != 0;
-md->notempty = (options & PCRE_NOTEMPTY) != 0;
-md->notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
-
-md->hitend = FALSE;
-md->mark = md->nomatch_mark = NULL;     /* In case never set */
-
-md->recursive = NULL;                   /* No recursion at top level */
-md->hasthen = (re->flags & PCRE_HASTHEN) != 0;
-
-md->lcc = tables + lcc_offset;
-md->fcc = tables + fcc_offset;
-md->ctypes = tables + ctypes_offset;
-
-/* Handle different \R options. */
-
-switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
-  {
-  case 0:
-  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
-    md->bsr_anycrlf = (re->options & PCRE_BSR_ANYCRLF) != 0;
-  else
-#ifdef BSR_ANYCRLF
-  md->bsr_anycrlf = TRUE;
-#else
-  md->bsr_anycrlf = FALSE;
-#endif
-  break;
-
-  case PCRE_BSR_ANYCRLF:
-  md->bsr_anycrlf = TRUE;
-  break;
-
-  case PCRE_BSR_UNICODE:
-  md->bsr_anycrlf = FALSE;
-  break;
-
-  default: return PCRE_ERROR_BADNEWLINE;
-  }
-
-/* Handle different types of newline. The three bits give eight cases. If
-nothing is set at run time, whatever was used at compile time applies. */
-
-switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options :
-        (pcre_uint32)options) & PCRE_NEWLINE_BITS)
-  {
-  case 0: newline = NEWLINE; break;   /* Compile-time default */
-  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: newline = -1; break;
-  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
-  default: return PCRE_ERROR_BADNEWLINE;
-  }
-
-if (newline == -2)
-  {
-  md->nltype = NLTYPE_ANYCRLF;
-  }
-else if (newline < 0)
-  {
-  md->nltype = NLTYPE_ANY;
-  }
-else
-  {
-  md->nltype = NLTYPE_FIXED;
-  if (newline > 255)
-    {
-    md->nllen = 2;
-    md->nl[0] = (newline >> 8) & 255;
-    md->nl[1] = newline & 255;
-    }
-  else
-    {
-    md->nllen = 1;
-    md->nl[0] = newline;
-    }
-  }
-
-/* Partial matching was originally supported only for a restricted set of
-regexes; from release 8.00 there are no restrictions, but the bits are still
-defined (though never set). So there's no harm in leaving this code. */
-
-if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)
-  return PCRE_ERROR_BADPARTIAL;
-
-/* If the expression has got more back references than the offsets supplied can
-hold, we get a temporary chunk of working store to use during the matching.
-Otherwise, we can use the vector supplied, rounding down its size to a multiple
-of 3. */
-
-ocount = offsetcount - (offsetcount % 3);
-arg_offset_max = (2*ocount)/3;
-
-if (re->top_backref > 0 && re->top_backref >= ocount/3)
-  {
-  ocount = re->top_backref * 3 + 3;
-  md->offset_vector = (int *)(PUBL(malloc))(ocount * sizeof(int));
-  if (md->offset_vector == NULL) return PCRE_ERROR_NOMEMORY;
-  using_temporary_offsets = TRUE;
-  DPRINTF(("Got memory to hold back references\n"));
-  }
-else md->offset_vector = offsets;
-md->offset_end = ocount;
-md->offset_max = (2*ocount)/3;
-md->capture_last = 0;
-
-/* Reset the working variable associated with each extraction. These should
-never be used unless previously set, but they get saved and restored, and so we
-initialize them to avoid reading uninitialized locations. Also, unset the
-offsets for the matched string. This is really just for tidiness with callouts,
-in case they inspect these fields. */
-
-if (md->offset_vector != NULL)
-  {
-  register int *iptr = md->offset_vector + ocount;
-  register int *iend = iptr - re->top_bracket;
-  if (iend < md->offset_vector + 2) iend = md->offset_vector + 2;
-  while (--iptr >= iend) *iptr = -1;
-  if (offsetcount > 0) md->offset_vector[0] = -1;
-  if (offsetcount > 1) md->offset_vector[1] = -1;
-  }
-
-/* Set up the first character to match, if available. The first_char value is
-never set for an anchored regular expression, but the anchoring may be forced
-at run time, so we have to test for anchoring. The first char may be unset for
-an unanchored pattern, of course. If there's no first char and the pattern was
-studied, there may be a bitmap of possible first characters. */
-
-if (!anchored)
-  {
-  if ((re->flags & PCRE_FIRSTSET) != 0)
-    {
-    has_first_char = TRUE;
-    first_char = first_char2 = (pcre_uchar)(re->first_char);
-    if ((re->flags & PCRE_FCH_CASELESS) != 0)
-      {
-      first_char2 = TABLE_GET(first_char, md->fcc, first_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-      if (utf && first_char > 127)
-        first_char2 = UCD_OTHERCASE(first_char);
-#endif
-      }
-    }
-  else
-    if (!startline && study != NULL &&
-      (study->flags & PCRE_STUDY_MAPPED) != 0)
-        start_bits = study->start_bits;
-  }
-
-/* For anchored or unanchored matches, there may be a "last known required
-character" set. */
-
-if ((re->flags & PCRE_REQCHSET) != 0)
-  {
-  has_req_char = TRUE;
-  req_char = req_char2 = (pcre_uchar)(re->req_char);
-  if ((re->flags & PCRE_RCH_CASELESS) != 0)
-    {
-    req_char2 = TABLE_GET(req_char, md->fcc, req_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-    if (utf && req_char > 127)
-      req_char2 = UCD_OTHERCASE(req_char);
-#endif
-    }
-  }
-
-
-/* ==========================================================================*/
-
-/* Loop for handling unanchored repeated matching attempts; for anchored regexs
-the loop runs just once. */
-
-for(;;)
-  {
-  PCRE_PUCHAR save_end_subject = end_subject;
-  PCRE_PUCHAR new_start_match;
-
-  /* If firstline is TRUE, the start of the match is constrained to the first
-  line of a multiline string. That is, the match must be before or at the first
-  newline. Implement this by temporarily adjusting end_subject so that we stop
-  scanning at a newline. If the match fails at the newline, later code breaks
-  this loop. */
-
-  if (firstline)
-    {
-    PCRE_PUCHAR t = start_match;
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      while (t < md->end_subject && !IS_NEWLINE(t))
-        {
-        t++;
-        ACROSSCHAR(t < end_subject, *t, t++);
-        }
-      }
-    else
-#endif
-    while (t < md->end_subject && !IS_NEWLINE(t)) t++;
-    end_subject = t;
-    }
-
-  /* There are some optimizations that avoid running the match if a known
-  starting point is not found, or if a known later character is not present.
-  However, there is an option that disables these, for testing and for ensuring
-  that all callouts do actually occur. The option can be set in the regex by
-  (*NO_START_OPT) or passed in match-time options. */
-
-  if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
-    {
-    /* Advance to a unique first char if there is one. */
-
-    if (has_first_char)
-      {
-      pcre_uchar smc;
-
-      if (first_char != first_char2)
-        while (start_match < end_subject &&
-          (smc = UCHAR21TEST(start_match)) != first_char && smc != first_char2)
-          start_match++;
-      else
-        while (start_match < end_subject && UCHAR21TEST(start_match) != first_char)
-          start_match++;
-      }
-
-    /* Or to just after a linebreak for a multiline match */
-
-    else if (startline)
-      {
-      if (start_match > md->start_subject + start_offset)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          while (start_match < end_subject && !WAS_NEWLINE(start_match))
-            {
-            start_match++;
-            ACROSSCHAR(start_match < end_subject, *start_match,
-              start_match++);
-            }
-          }
-        else
-#endif
-        while (start_match < end_subject && !WAS_NEWLINE(start_match))
-          start_match++;
-
-        /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
-        and we are now at a LF, advance the match position by one more character.
-        */
-
-        if (start_match[-1] == CHAR_CR &&
-             (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
-             start_match < end_subject &&
-             UCHAR21TEST(start_match) == CHAR_NL)
-          start_match++;
-        }
-      }
-
-    /* Or to a non-unique first byte after study */
-
-    else if (start_bits != NULL)
-      {
-      while (start_match < end_subject)
-        {
-        register pcre_uint32 c = UCHAR21TEST(start_match);
-#ifndef COMPILE_PCRE8
-        if (c > 255) c = 255;
-#endif
-        if ((start_bits[c/8] & (1 << (c&7))) != 0) break;
-        start_match++;
-        }
-      }
-    }   /* Starting optimizations */
-
-  /* Restore fudged end_subject */
-
-  end_subject = save_end_subject;
-
-  /* The following two optimizations are disabled for partial matching or if
-  disabling is explicitly requested. */
-
-  if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0 && !md->partial)
-    {
-    /* If the pattern was studied, a minimum subject length may be set. This is
-    a lower bound; no actual string of that length may actually match the
-    pattern. Although the value is, strictly, in characters, we treat it as
-    bytes to avoid spending too much time in this optimization. */
-
-    if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
-        (pcre_uint32)(end_subject - start_match) < study->minlength)
-      {
-      rc = MATCH_NOMATCH;
-      break;
-      }
-
-    /* If req_char is set, we know that that character must appear in the
-    subject for the match to succeed. If the first character is set, req_char
-    must be later in the subject; otherwise the test starts at the match point.
-    This optimization can save a huge amount of backtracking in patterns with
-    nested unlimited repeats that aren't going to match. Writing separate code
-    for cased/caseless versions makes it go faster, as does using an
-    autoincrement and backing off on a match.
-
-    HOWEVER: when the subject string is very, very long, searching to its end
-    can take a long time, and give bad performance on quite ordinary patterns.
-    This showed up when somebody was matching something like /^\d+C/ on a
-    32-megabyte string... so we don't do this when the string is sufficiently
-    long. */
-
-    if (has_req_char && end_subject - start_match < REQ_BYTE_MAX)
-      {
-      register PCRE_PUCHAR p = start_match + (has_first_char? 1:0);
-
-      /* We don't need to repeat the search if we haven't yet reached the
-      place we found it at last time. */
-
-      if (p > req_char_ptr)
-        {
-        if (req_char != req_char2)
-          {
-          while (p < end_subject)
-            {
-            register pcre_uint32 pp = UCHAR21INCTEST(p);
-            if (pp == req_char || pp == req_char2) { p--; break; }
-            }
-          }
-        else
-          {
-          while (p < end_subject)
-            {
-            if (UCHAR21INCTEST(p) == req_char) { p--; break; }
-            }
-          }
-
-        /* If we can't find the required character, break the matching loop,
-        forcing a match failure. */
-
-        if (p >= end_subject)
-          {
-          rc = MATCH_NOMATCH;
-          break;
-          }
-
-        /* If we have found the required character, save the point where we
-        found it, so that we don't search again next time round the loop if
-        the start hasn't passed this character yet. */
-
-        req_char_ptr = p;
-        }
-      }
-    }
-
-#ifdef PCRE_DEBUG  /* Sigh. Some compilers never learn. */
-  printf(">>>> Match against: ");
-  pchars(start_match, end_subject - start_match, TRUE, md);
-  printf("\n");
-#endif
-
-  /* OK, we can now run the match. If "hitend" is set afterwards, remember the
-  first starting point for which a partial match was found. */
-
-  md->start_match_ptr = start_match;
-  md->start_used_ptr = start_match;
-  md->match_call_count = 0;
-  md->match_function_type = 0;
-  md->end_offset_top = 0;
-  md->skip_arg_count = 0;
-  rc = match(start_match, md->start_code, start_match, 2, md, NULL, 0);
-  if (md->hitend && start_partial == NULL)
-    {
-    start_partial = md->start_used_ptr;
-    match_partial = start_match;
-    }
-
-  switch(rc)
-    {
-    /* If MATCH_SKIP_ARG reaches this level it means that a MARK that matched
-    the SKIP's arg was not found. In this circumstance, Perl ignores the SKIP
-    entirely. The only way we can do that is to re-do the match at the same
-    point, with a flag to force SKIP with an argument to be ignored. Just
-    treating this case as NOMATCH does not work because it does not check other
-    alternatives in patterns such as A(*SKIP:A)B|AC when the subject is AC. */
-
-    case MATCH_SKIP_ARG:
-    new_start_match = start_match;
-    md->ignore_skip_arg = md->skip_arg_count;
-    break;
-
-    /* SKIP passes back the next starting point explicitly, but if it is no
-    greater than the match we have just done, treat it as NOMATCH. */
-
-    case MATCH_SKIP:
-    if (md->start_match_ptr > start_match)
-      {
-      new_start_match = md->start_match_ptr;
-      break;
-      }
-    /* Fall through */
-
-    /* NOMATCH and PRUNE advance by one character. THEN at this level acts
-    exactly like PRUNE. Unset ignore SKIP-with-argument. */
-
-    case MATCH_NOMATCH:
-    case MATCH_PRUNE:
-    case MATCH_THEN:
-    md->ignore_skip_arg = 0;
-    new_start_match = start_match + 1;
-#ifdef SUPPORT_UTF
-    if (utf)
-      ACROSSCHAR(new_start_match < end_subject, *new_start_match,
-        new_start_match++);
-#endif
-    break;
-
-    /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
-
-    case MATCH_COMMIT:
-    rc = MATCH_NOMATCH;
-    goto ENDLOOP;
-
-    /* Any other return is either a match, or some kind of error. */
-
-    default:
-    goto ENDLOOP;
-    }
-
-  /* Control reaches here for the various types of "no match at this point"
-  result. Reset the code to MATCH_NOMATCH for subsequent checking. */
-
-  rc = MATCH_NOMATCH;
-
-  /* If PCRE_FIRSTLINE is set, the match must happen before or at the first
-  newline in the subject (though it may continue over the newline). Therefore,
-  if we have just failed to match, starting at a newline, do not continue. */
-
-  if (firstline && IS_NEWLINE(start_match)) break;
-
-  /* Advance to new matching position */
-
-  start_match = new_start_match;
-
-  /* Break the loop if the pattern is anchored or if we have passed the end of
-  the subject. */
-
-  if (anchored || start_match > end_subject) break;
-
-  /* If we have just passed a CR and we are now at a LF, and the pattern does
-  not contain any explicit matches for \r or \n, and the newline option is CRLF
-  or ANY or ANYCRLF, advance the match position by one more character. In
-  normal matching start_match will aways be greater than the first position at
-  this stage, but a failed *SKIP can cause a return at the same point, which is
-  why the first test exists. */
-
-  if (start_match > (PCRE_PUCHAR)subject + start_offset &&
-      start_match[-1] == CHAR_CR &&
-      start_match < end_subject &&
-      *start_match == CHAR_NL &&
-      (re->flags & PCRE_HASCRORLF) == 0 &&
-        (md->nltype == NLTYPE_ANY ||
-         md->nltype == NLTYPE_ANYCRLF ||
-         md->nllen == 2))
-    start_match++;
-
-  md->mark = NULL;   /* Reset for start of next match attempt */
-  }                  /* End of for(;;) "bumpalong" loop */
-
-/* ==========================================================================*/
-
-/* We reach here when rc is not MATCH_NOMATCH, or if one of the stopping
-conditions is true:
-
-(1) The pattern is anchored or the match was failed by (*COMMIT);
-
-(2) We are past the end of the subject;
-
-(3) PCRE_FIRSTLINE is set and we have failed to match at a newline, because
-    this option requests that a match occur at or before the first newline in
-    the subject.
-
-When we have a match and the offset vector is big enough to deal with any
-backreferences, captured substring offsets will already be set up. In the case
-where we had to get some local store to hold offsets for backreference
-processing, copy those that we can. In this case there need not be overflow if
-certain parts of the pattern were not used, even though there are more
-capturing parentheses than vector slots. */
-
-ENDLOOP:
-
-if (rc == MATCH_MATCH || rc == MATCH_ACCEPT)
-  {
-  if (using_temporary_offsets)
-    {
-    if (arg_offset_max >= 4)
-      {
-      memcpy(offsets + 2, md->offset_vector + 2,
-        (arg_offset_max - 2) * sizeof(int));
-      DPRINTF(("Copied offsets from temporary memory\n"));
-      }
-    if (md->end_offset_top > arg_offset_max) md->capture_last |= OVFLBIT;
-    DPRINTF(("Freeing temporary memory\n"));
-    (PUBL(free))(md->offset_vector);
-    }
-
-  /* Set the return code to the number of captured strings, or 0 if there were
-  too many to fit into the vector. */
-
-  rc = ((md->capture_last & OVFLBIT) != 0 &&
-         md->end_offset_top >= arg_offset_max)?
-    0 : md->end_offset_top/2;
-
-  /* If there is space in the offset vector, set any unused pairs at the end of
-  the pattern to -1 for backwards compatibility. It is documented that this
-  happens. In earlier versions, the whole set of potential capturing offsets
-  was set to -1 each time round the loop, but this is handled differently now.
-  "Gaps" are set to -1 dynamically instead (this fixes a bug). Thus, it is only
-  those at the end that need unsetting here. We can't just unset them all at
-  the start of the whole thing because they may get set in one branch that is
-  not the final matching branch. */
-
-  if (md->end_offset_top/2 <= re->top_bracket && offsets != NULL)
-    {
-    register int *iptr, *iend;
-    int resetcount = 2 + re->top_bracket * 2;
-    if (resetcount > offsetcount) resetcount = offsetcount;
-    iptr = offsets + md->end_offset_top;
-    iend = offsets + resetcount;
-    while (iptr < iend) *iptr++ = -1;
-    }
-
-  /* If there is space, set up the whole thing as substring 0. The value of
-  md->start_match_ptr might be modified if \K was encountered on the success
-  matching path. */
-
-  if (offsetcount < 2) rc = 0; else
-    {
-    offsets[0] = (int)(md->start_match_ptr - md->start_subject);
-    offsets[1] = (int)(md->end_match_ptr - md->start_subject);
-    }
-
-  /* Return MARK data if requested */
-
-  if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
-    *(extra_data->mark) = (pcre_uchar *)md->mark;
-  DPRINTF((">>>> returning %d\n", rc));
-#ifdef NO_RECURSE
-  release_match_heapframes(&frame_zero);
-#endif
-  return rc;
-  }
-
-/* Control gets here if there has been an error, or if the overall match
-attempt has failed at all permitted starting positions. */
-
-if (using_temporary_offsets)
-  {
-  DPRINTF(("Freeing temporary memory\n"));
-  (PUBL(free))(md->offset_vector);
-  }
-
-/* For anything other than nomatch or partial match, just return the code. */
-
-if (rc != MATCH_NOMATCH && rc != PCRE_ERROR_PARTIAL)
-  {
-  DPRINTF((">>>> error: returning %d\n", rc));
-#ifdef NO_RECURSE
-  release_match_heapframes(&frame_zero);
-#endif
-  return rc;
-  }
-
-/* Handle partial matches - disable any mark data */
-
-if (match_partial != NULL)
-  {
-  DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
-  md->mark = NULL;
-  if (offsetcount > 1)
-    {
-    offsets[0] = (int)(start_partial - (PCRE_PUCHAR)subject);
-    offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);
-    if (offsetcount > 2)
-      offsets[2] = (int)(match_partial - (PCRE_PUCHAR)subject);
-    }
-  rc = PCRE_ERROR_PARTIAL;
-  }
-
-/* This is the classic nomatch case */
-
-else
-  {
-  DPRINTF((">>>> returning PCRE_ERROR_NOMATCH\n"));
-  rc = PCRE_ERROR_NOMATCH;
-  }
-
-/* Return the MARK data if it has been requested. */
-
-if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
-  *(extra_data->mark) = (pcre_uchar *)md->nomatch_mark;
-#ifdef NO_RECURSE
-  release_match_heapframes(&frame_zero);
-#endif
-return rc;
-}
-
-/* End of pcre_exec.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_fullinfo.c r-base-3.3.1/src/extra/pcre/pcre_fullinfo.c
--- r-base-3.2.3/src/extra/pcre/pcre_fullinfo.c	2013-12-30 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_fullinfo.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,245 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_fullinfo(), which returns
-information about a compiled pattern. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*        Return info about compiled pattern      *
-*************************************************/
-
-/* This is a newer "info" function which has an extensible interface so
-that additional items can be added compatibly.
-
-Arguments:
-  argument_re      points to compiled code
-  extra_data       points extra data, or NULL
-  what             what information is required
-  where            where to put the information
-
-Returns:           0 if data returned, negative on error
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_fullinfo(const pcre *argument_re, const pcre_extra *extra_data,
-  int what, void *where)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_fullinfo(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  int what, void *where)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_fullinfo(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  int what, void *where)
-#endif
-{
-const REAL_PCRE *re = (const REAL_PCRE *)argument_re;
-const pcre_study_data *study = NULL;
-
-if (re == NULL || where == NULL) return PCRE_ERROR_NULL;
-
-if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_STUDY_DATA) != 0)
-  study = (const pcre_study_data *)extra_data->study_data;
-
-/* Check that the first field in the block is the magic number. If it is not,
-return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
-REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
-means that the pattern is likely compiled with different endianness. */
-
-if (re->magic_number != MAGIC_NUMBER)
-  return re->magic_number == REVERSED_MAGIC_NUMBER?
-    PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
-
-/* Check that this pattern was compiled in the correct bit mode */
-
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-
-switch (what)
-  {
-  case PCRE_INFO_OPTIONS:
-  *((unsigned long int *)where) = re->options & PUBLIC_COMPILE_OPTIONS;
-  break;
-
-  case PCRE_INFO_SIZE:
-  *((size_t *)where) = re->size;
-  break;
-
-  case PCRE_INFO_STUDYSIZE:
-  *((size_t *)where) = (study == NULL)? 0 : study->size;
-  break;
-
-  case PCRE_INFO_JITSIZE:
-#ifdef SUPPORT_JIT
-  *((size_t *)where) =
-      (extra_data != NULL &&
-      (extra_data->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-      extra_data->executable_jit != NULL)?
-    PRIV(jit_get_size)(extra_data->executable_jit) : 0;
-#else
-  *((size_t *)where) = 0;
-#endif
-  break;
-
-  case PCRE_INFO_CAPTURECOUNT:
-  *((int *)where) = re->top_bracket;
-  break;
-
-  case PCRE_INFO_BACKREFMAX:
-  *((int *)where) = re->top_backref;
-  break;
-
-  case PCRE_INFO_FIRSTBYTE:
-  *((int *)where) =
-    ((re->flags & PCRE_FIRSTSET) != 0)? (int)re->first_char :
-    ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
-  break;
-
-  case PCRE_INFO_FIRSTCHARACTER:
-    *((pcre_uint32 *)where) =
-      (re->flags & PCRE_FIRSTSET) != 0 ? re->first_char : 0;
-    break;
-
-  case PCRE_INFO_FIRSTCHARACTERFLAGS:
-    *((int *)where) =
-      ((re->flags & PCRE_FIRSTSET) != 0) ? 1 :
-      ((re->flags & PCRE_STARTLINE) != 0) ? 2 : 0;
-    break;
-
-  /* Make sure we pass back the pointer to the bit vector in the external
-  block, not the internal copy (with flipped integer fields). */
-
-  case PCRE_INFO_FIRSTTABLE:
-  *((const pcre_uint8 **)where) =
-    (study != NULL && (study->flags & PCRE_STUDY_MAPPED) != 0)?
-      ((const pcre_study_data *)extra_data->study_data)->start_bits : NULL;
-  break;
-
-  case PCRE_INFO_MINLENGTH:
-  *((int *)where) =
-    (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0)?
-      (int)(study->minlength) : -1;
-  break;
-
-  case PCRE_INFO_JIT:
-  *((int *)where) = extra_data != NULL &&
-                    (extra_data->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-                    extra_data->executable_jit != NULL;
-  break;
-
-  case PCRE_INFO_LASTLITERAL:
-  *((int *)where) =
-    ((re->flags & PCRE_REQCHSET) != 0)? (int)re->req_char : -1;
-  break;
-
-  case PCRE_INFO_REQUIREDCHAR:
-    *((pcre_uint32 *)where) =
-      ((re->flags & PCRE_REQCHSET) != 0) ? re->req_char : 0;
-    break;
-
-  case PCRE_INFO_REQUIREDCHARFLAGS:
-    *((int *)where) =
-      ((re->flags & PCRE_REQCHSET) != 0);
-    break;
-
-  case PCRE_INFO_NAMEENTRYSIZE:
-  *((int *)where) = re->name_entry_size;
-  break;
-
-  case PCRE_INFO_NAMECOUNT:
-  *((int *)where) = re->name_count;
-  break;
-
-  case PCRE_INFO_NAMETABLE:
-  *((const pcre_uchar **)where) = (const pcre_uchar *)re + re->name_table_offset;
-  break;
-
-  case PCRE_INFO_DEFAULT_TABLES:
-  *((const pcre_uint8 **)where) = (const pcre_uint8 *)(PRIV(default_tables));
-  break;
-
-  /* From release 8.00 this will always return TRUE because NOPARTIAL is
-  no longer ever set (the restrictions have been removed). */
-
-  case PCRE_INFO_OKPARTIAL:
-  *((int *)where) = (re->flags & PCRE_NOPARTIAL) == 0;
-  break;
-
-  case PCRE_INFO_JCHANGED:
-  *((int *)where) = (re->flags & PCRE_JCHANGED) != 0;
-  break;
-
-  case PCRE_INFO_HASCRORLF:
-  *((int *)where) = (re->flags & PCRE_HASCRORLF) != 0;
-  break;
-
-  case PCRE_INFO_MAXLOOKBEHIND:
-  *((int *)where) = re->max_lookbehind;
-  break;
-
-  case PCRE_INFO_MATCHLIMIT:
-  if ((re->flags & PCRE_MLSET) == 0) return PCRE_ERROR_UNSET;
-  *((pcre_uint32 *)where) = re->limit_match;
-  break;
-
-  case PCRE_INFO_RECURSIONLIMIT:
-  if ((re->flags & PCRE_RLSET) == 0) return PCRE_ERROR_UNSET;
-  *((pcre_uint32 *)where) = re->limit_recursion;
-  break;
-
-  case PCRE_INFO_MATCH_EMPTY:
-  *((int *)where) = (re->flags & PCRE_MATCH_EMPTY) != 0;
-  break;
-
-  default: return PCRE_ERROR_BADOPTION;
-  }
-
-return 0;
-}
-
-/* End of pcre_fullinfo.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_get.c r-base-3.3.1/src/extra/pcre/pcre_get.c
--- r-base-3.2.3/src/extra/pcre/pcre_get.c	2013-02-04 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_get.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,662 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains some convenience functions for extracting substrings
-from the subject string after a regex match has succeeded. The original idea
-for these functions came from Scott Wimer. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*           Find number for named string         *
-*************************************************/
-
-/* This function is used by the get_first_set() function below, as well
-as being generally available. It assumes that names are unique.
-
-Arguments:
-  code        the compiled regex
-  stringname  the name whose number is required
-
-Returns:      the number of the named parentheses, or a negative number
-                (PCRE_ERROR_NOSUBSTRING) if not found
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_stringnumber(const pcre *code, const char *stringname)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_stringnumber(const pcre16 *code, PCRE_SPTR16 stringname)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_stringnumber(const pcre32 *code, PCRE_SPTR32 stringname)
-#endif
-{
-int rc;
-int entrysize;
-int top, bot;
-pcre_uchar *nametable;
-
-#ifdef COMPILE_PCRE8
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE16
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE32
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-
-bot = 0;
-while (top > bot)
-  {
-  int mid = (top + bot) / 2;
-  pcre_uchar *entry = nametable + entrysize*mid;
-  int c = STRCMP_UC_UC((pcre_uchar *)stringname,
-    (pcre_uchar *)(entry + IMM2_SIZE));
-  if (c == 0) return GET2(entry, 0);
-  if (c > 0) bot = mid + 1; else top = mid;
-  }
-
-return PCRE_ERROR_NOSUBSTRING;
-}
-
-
-
-/*************************************************
-*     Find (multiple) entries for named string   *
-*************************************************/
-
-/* This is used by the get_first_set() function below, as well as being
-generally available. It is used when duplicated names are permitted.
-
-Arguments:
-  code        the compiled regex
-  stringname  the name whose entries required
-  firstptr    where to put the pointer to the first entry
-  lastptr     where to put the pointer to the last entry
-
-Returns:      the length of each entry, or a negative number
-                (PCRE_ERROR_NOSUBSTRING) if not found
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_stringtable_entries(const pcre *code, const char *stringname,
-  char **firstptr, char **lastptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname,
-  PCRE_UCHAR16 **firstptr, PCRE_UCHAR16 **lastptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_stringtable_entries(const pcre32 *code, PCRE_SPTR32 stringname,
-  PCRE_UCHAR32 **firstptr, PCRE_UCHAR32 **lastptr)
-#endif
-{
-int rc;
-int entrysize;
-int top, bot;
-pcre_uchar *nametable, *lastentry;
-
-#ifdef COMPILE_PCRE8
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE16
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE32
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-
-lastentry = nametable + entrysize * (top - 1);
-bot = 0;
-while (top > bot)
-  {
-  int mid = (top + bot) / 2;
-  pcre_uchar *entry = nametable + entrysize*mid;
-  int c = STRCMP_UC_UC((pcre_uchar *)stringname,
-    (pcre_uchar *)(entry + IMM2_SIZE));
-  if (c == 0)
-    {
-    pcre_uchar *first = entry;
-    pcre_uchar *last = entry;
-    while (first > nametable)
-      {
-      if (STRCMP_UC_UC((pcre_uchar *)stringname,
-        (pcre_uchar *)(first - entrysize + IMM2_SIZE)) != 0) break;
-      first -= entrysize;
-      }
-    while (last < lastentry)
-      {
-      if (STRCMP_UC_UC((pcre_uchar *)stringname,
-        (pcre_uchar *)(last + entrysize + IMM2_SIZE)) != 0) break;
-      last += entrysize;
-      }
-#if defined COMPILE_PCRE8
-    *firstptr = (char *)first;
-    *lastptr = (char *)last;
-#elif defined COMPILE_PCRE16
-    *firstptr = (PCRE_UCHAR16 *)first;
-    *lastptr = (PCRE_UCHAR16 *)last;
-#elif defined COMPILE_PCRE32
-    *firstptr = (PCRE_UCHAR32 *)first;
-    *lastptr = (PCRE_UCHAR32 *)last;
-#endif
-    return entrysize;
-    }
-  if (c > 0) bot = mid + 1; else top = mid;
-  }
-
-return PCRE_ERROR_NOSUBSTRING;
-}
-
-
-
-/*************************************************
-*    Find first set of multiple named strings    *
-*************************************************/
-
-/* This function allows for duplicate names in the table of named substrings.
-It returns the number of the first one that was set in a pattern match.
-
-Arguments:
-  code         the compiled regex
-  stringname   the name of the capturing substring
-  ovector      the vector of matched substrings
-
-Returns:       the number of the first that is set,
-               or the number of the last one if none are set,
-               or a negative number on error
-*/
-
-#if defined COMPILE_PCRE8
-static int
-get_first_set(const pcre *code, const char *stringname, int *ovector)
-#elif defined COMPILE_PCRE16
-static int
-get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector)
-#elif defined COMPILE_PCRE32
-static int
-get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector)
-#endif
-{
-const REAL_PCRE *re = (const REAL_PCRE *)code;
-int entrysize;
-pcre_uchar *entry;
-#if defined COMPILE_PCRE8
-char *first, *last;
-#elif defined COMPILE_PCRE16
-PCRE_UCHAR16 *first, *last;
-#elif defined COMPILE_PCRE32
-PCRE_UCHAR32 *first, *last;
-#endif
-
-#if defined COMPILE_PCRE8
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre_get_stringnumber(code, stringname);
-entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
-#elif defined COMPILE_PCRE16
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre16_get_stringnumber(code, stringname);
-entrysize = pcre16_get_stringtable_entries(code, stringname, &first, &last);
-#elif defined COMPILE_PCRE32
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre32_get_stringnumber(code, stringname);
-entrysize = pcre32_get_stringtable_entries(code, stringname, &first, &last);
-#endif
-if (entrysize <= 0) return entrysize;
-for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)
-  {
-  int n = GET2(entry, 0);
-  if (ovector[n*2] >= 0) return n;
-  }
-return GET2(entry, 0);
-}
-
-
-
-
-/*************************************************
-*      Copy captured string to given buffer      *
-*************************************************/
-
-/* This function copies a single captured substring into a given buffer.
-Note that we use memcpy() rather than strncpy() in case there are binary zeros
-in the string.
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringnumber   the number of the required substring
-  buffer         where to put the substring
-  size           the size of the buffer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) buffer too small
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_copy_substring(const char *subject, int *ovector, int stringcount,
-  int stringnumber, char *buffer, int size)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_UCHAR16 *buffer, int size)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_copy_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_UCHAR32 *buffer, int size)
-#endif
-{
-int yield;
-if (stringnumber < 0 || stringnumber >= stringcount)
-  return PCRE_ERROR_NOSUBSTRING;
-stringnumber *= 2;
-yield = ovector[stringnumber+1] - ovector[stringnumber];
-if (size < yield + 1) return PCRE_ERROR_NOMEMORY;
-memcpy(buffer, subject + ovector[stringnumber], IN_UCHARS(yield));
-buffer[yield] = 0;
-return yield;
-}
-
-
-
-/*************************************************
-*   Copy named captured string to given buffer   *
-*************************************************/
-
-/* This function copies a single captured substring into a given buffer,
-identifying it by name. If the regex permits duplicate names, the first
-substring that is set is chosen.
-
-Arguments:
-  code           the compiled regex
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringname     the name of the required substring
-  buffer         where to put the substring
-  size           the size of the buffer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) buffer too small
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_copy_named_substring(const pcre *code, const char *subject,
-  int *ovector, int stringcount, const char *stringname,
-  char *buffer, int size)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_copy_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
-  int *ovector, int stringcount, PCRE_SPTR16 stringname,
-  PCRE_UCHAR16 *buffer, int size)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_copy_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
-  int *ovector, int stringcount, PCRE_SPTR32 stringname,
-  PCRE_UCHAR32 *buffer, int size)
-#endif
-{
-int n = get_first_set(code, stringname, ovector);
-if (n <= 0) return n;
-#if defined COMPILE_PCRE8
-return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size);
-#elif defined COMPILE_PCRE16
-return pcre16_copy_substring(subject, ovector, stringcount, n, buffer, size);
-#elif defined COMPILE_PCRE32
-return pcre32_copy_substring(subject, ovector, stringcount, n, buffer, size);
-#endif
-}
-
-
-
-/*************************************************
-*      Copy all captured strings to new store    *
-*************************************************/
-
-/* This function gets one chunk of store and builds a list of pointers and all
-of the captured substrings in it. A NULL pointer is put on the end of the list.
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  listptr        set to point to the list of pointers
-
-Returns:         if successful: 0
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) failed to get store
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_substring_list(const char *subject, int *ovector, int stringcount,
-  const char ***listptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_substring_list(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  PCRE_SPTR16 **listptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_substring_list(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  PCRE_SPTR32 **listptr)
-#endif
-{
-int i;
-int size = sizeof(pcre_uchar *);
-int double_count = stringcount * 2;
-pcre_uchar **stringlist;
-pcre_uchar *p;
-
-for (i = 0; i < double_count; i += 2)
-  size += sizeof(pcre_uchar *) + IN_UCHARS(ovector[i+1] - ovector[i] + 1);
-
-stringlist = (pcre_uchar **)(PUBL(malloc))(size);
-if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
-
-#if defined COMPILE_PCRE8
-*listptr = (const char **)stringlist;
-#elif defined COMPILE_PCRE16
-*listptr = (PCRE_SPTR16 *)stringlist;
-#elif defined COMPILE_PCRE32
-*listptr = (PCRE_SPTR32 *)stringlist;
-#endif
-p = (pcre_uchar *)(stringlist + stringcount + 1);
-
-for (i = 0; i < double_count; i += 2)
-  {
-  int len = ovector[i+1] - ovector[i];
-  memcpy(p, subject + ovector[i], IN_UCHARS(len));
-  *stringlist++ = p;
-  p += len;
-  *p++ = 0;
-  }
-
-*stringlist = NULL;
-return 0;
-}
-
-
-
-/*************************************************
-*   Free store obtained by get_substring_list    *
-*************************************************/
-
-/* This function exists for the benefit of people calling PCRE from non-C
-programs that can call its functions, but not free() or (PUBL(free))()
-directly.
-
-Argument:   the result of a previous pcre_get_substring_list()
-Returns:    nothing
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre_free_substring_list(const char **pointer)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre16_free_substring_list(PCRE_SPTR16 *pointer)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre32_free_substring_list(PCRE_SPTR32 *pointer)
-#endif
-{
-(PUBL(free))((void *)pointer);
-}
-
-
-
-/*************************************************
-*      Copy captured string to new store         *
-*************************************************/
-
-/* This function copies a single captured substring into a piece of new
-store
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringnumber   the number of the required substring
-  stringptr      where to put a pointer to the substring
-
-Returns:         if successful:
-                   the length of the string, not including the zero that
-                   is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) failed to get store
-                   PCRE_ERROR_NOSUBSTRING (-7) substring not present
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_substring(const char *subject, int *ovector, int stringcount,
-  int stringnumber, const char **stringptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_SPTR16 *stringptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_SPTR32 *stringptr)
-#endif
-{
-int yield;
-pcre_uchar *substring;
-if (stringnumber < 0 || stringnumber >= stringcount)
-  return PCRE_ERROR_NOSUBSTRING;
-stringnumber *= 2;
-yield = ovector[stringnumber+1] - ovector[stringnumber];
-substring = (pcre_uchar *)(PUBL(malloc))(IN_UCHARS(yield + 1));
-if (substring == NULL) return PCRE_ERROR_NOMEMORY;
-memcpy(substring, subject + ovector[stringnumber], IN_UCHARS(yield));
-substring[yield] = 0;
-#if defined COMPILE_PCRE8
-*stringptr = (const char *)substring;
-#elif defined COMPILE_PCRE16
-*stringptr = (PCRE_SPTR16)substring;
-#elif defined COMPILE_PCRE32
-*stringptr = (PCRE_SPTR32)substring;
-#endif
-return yield;
-}
-
-
-
-/*************************************************
-*   Copy named captured string to new store      *
-*************************************************/
-
-/* This function copies a single captured substring, identified by name, into
-new store. If the regex permits duplicate names, the first substring that is
-set is chosen.
-
-Arguments:
-  code           the compiled regex
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringname     the name of the required substring
-  stringptr      where to put the pointer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) couldn't get memory
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_named_substring(const pcre *code, const char *subject,
-  int *ovector, int stringcount, const char *stringname,
-  const char **stringptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
-  int *ovector, int stringcount, PCRE_SPTR16 stringname,
-  PCRE_SPTR16 *stringptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
-  int *ovector, int stringcount, PCRE_SPTR32 stringname,
-  PCRE_SPTR32 *stringptr)
-#endif
-{
-int n = get_first_set(code, stringname, ovector);
-if (n <= 0) return n;
-#if defined COMPILE_PCRE8
-return pcre_get_substring(subject, ovector, stringcount, n, stringptr);
-#elif defined COMPILE_PCRE16
-return pcre16_get_substring(subject, ovector, stringcount, n, stringptr);
-#elif defined COMPILE_PCRE32
-return pcre32_get_substring(subject, ovector, stringcount, n, stringptr);
-#endif
-}
-
-
-
-
-/*************************************************
-*       Free store obtained by get_substring     *
-*************************************************/
-
-/* This function exists for the benefit of people calling PCRE from non-C
-programs that can call its functions, but not free() or (PUBL(free))()
-directly.
-
-Argument:   the result of a previous pcre_get_substring()
-Returns:    nothing
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre_free_substring(const char *pointer)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre16_free_substring(PCRE_SPTR16 pointer)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre32_free_substring(PCRE_SPTR32 pointer)
-#endif
-{
-(PUBL(free))((void *)pointer);
-}
-
-/* End of pcre_get.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_globals.c r-base-3.3.1/src/extra/pcre/pcre_globals.c
--- r-base-3.2.3/src/extra/pcre/pcre_globals.c	2014-04-20 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_globals.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains global variables that are exported by the PCRE library.
-PCRE is thread-clean and doesn't use any global variables in the normal sense.
-However, it calls memory allocation and freeing functions via the four
-indirections below, and it can optionally do callouts, using the fifth
-indirection. These values can be changed by the caller, but are shared between
-all threads.
-
-For MS Visual Studio and Symbian OS, there are problems in initializing these
-variables to non-local functions. In these cases, therefore, an indirection via
-a local function is used.
-
-Also, when compiling for Virtual Pascal, things are done differently, and
-global variables are not used. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-#if defined _MSC_VER || defined  __SYMBIAN32__
-static void* LocalPcreMalloc(size_t aSize)
-  {
-  return malloc(aSize);
-  }
-static void LocalPcreFree(void* aPtr)
-  {
-  free(aPtr);
-  }
-PCRE_EXP_DATA_DEFN void *(*PUBL(malloc))(size_t) = LocalPcreMalloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(free))(void *) = LocalPcreFree;
-PCRE_EXP_DATA_DEFN void *(*PUBL(stack_malloc))(size_t) = LocalPcreMalloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(stack_free))(void *) = LocalPcreFree;
-PCRE_EXP_DATA_DEFN int   (*PUBL(callout))(PUBL(callout_block) *) = NULL;
-PCRE_EXP_DATA_DEFN int   (*PUBL(stack_guard))(void) = NULL;
-
-#elif !defined VPCOMPAT
-PCRE_EXP_DATA_DEFN void *(*PUBL(malloc))(size_t) = malloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(free))(void *) = free;
-PCRE_EXP_DATA_DEFN void *(*PUBL(stack_malloc))(size_t) = malloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(stack_free))(void *) = free;
-PCRE_EXP_DATA_DEFN int   (*PUBL(callout))(PUBL(callout_block) *) = NULL;
-PCRE_EXP_DATA_DEFN int   (*PUBL(stack_guard))(void) = NULL;
-#endif
-
-/* End of pcre_globals.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre.h r-base-3.3.1/src/extra/pcre/pcre.h
--- r-base-3.2.3/src/extra/pcre/pcre.h	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,677 +0,0 @@
-/*************************************************
-*       Perl-Compatible Regular Expressions      *
-*************************************************/
-
-/* This is the public header file for the PCRE library, to be #included by
-applications that call the PCRE functions.
-
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#ifndef _PCRE_H
-#define _PCRE_H
-
-/* The current PCRE version information. */
-
-#define PCRE_MAJOR          8
-#define PCRE_MINOR          38
-#define PCRE_PRERELEASE     
-#define PCRE_DATE           2015-11-23
-
-/* When an application links to a PCRE DLL in Windows, the symbols that are
-imported have to be identified as such. When building PCRE, the appropriate
-export setting is defined in pcre_internal.h, which includes this file. So we
-don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
-
-#if defined(_WIN32) && !defined(PCRE_STATIC)
-#  ifndef PCRE_EXP_DECL
-#    define PCRE_EXP_DECL  extern __declspec(dllimport)
-#  endif
-#  ifdef __cplusplus
-#    ifndef PCRECPP_EXP_DECL
-#      define PCRECPP_EXP_DECL  extern __declspec(dllimport)
-#    endif
-#    ifndef PCRECPP_EXP_DEFN
-#      define PCRECPP_EXP_DEFN  __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-/* By default, we use the standard "extern" declarations. */
-
-#ifndef PCRE_EXP_DECL
-#  ifdef __cplusplus
-#    define PCRE_EXP_DECL  extern "C"
-#  else
-#    define PCRE_EXP_DECL  extern
-#  endif
-#endif
-
-#ifdef __cplusplus
-#  ifndef PCRECPP_EXP_DECL
-#    define PCRECPP_EXP_DECL  extern
-#  endif
-#  ifndef PCRECPP_EXP_DEFN
-#    define PCRECPP_EXP_DEFN
-#  endif
-#endif
-
-/* Have to include stdlib.h in order to ensure that size_t is defined;
-it is needed here for malloc. */
-
-#include <stdlib.h>
-
-/* Allow for C++ users */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public options. Some are compile-time only, some are run-time only, and some
-are both. Most of the compile-time options are saved with the compiled regex so
-that they can be inspected during studying (and therefore JIT compiling). Note
-that pcre_study() has its own set of options. Originally, all the options
-defined here used distinct bits. However, almost all the bits in a 32-bit word
-are now used, so in order to conserve them, option bits that were previously
-only recognized at matching time (i.e. by pcre_exec() or pcre_dfa_exec()) may
-also be used for compile-time options that affect only compiling and are not
-relevant for studying or JIT compiling.
-
-Some options for pcre_compile() change its behaviour but do not affect the
-behaviour of the execution functions. Other options are passed through to the
-execution functions and affect their behaviour, with or without affecting the
-behaviour of pcre_compile().
-
-Options that can be passed to pcre_compile() are tagged Cx below, with these
-variants:
-
-C1   Affects compile only
-C2   Does not affect compile; affects exec, dfa_exec
-C3   Affects compile, exec, dfa_exec
-C4   Affects compile, exec, dfa_exec, study
-C5   Affects compile, exec, study
-
-Options that can be set for pcre_exec() and/or pcre_dfa_exec() are flagged with
-E and D, respectively. They take precedence over C3, C4, and C5 settings passed
-from pcre_compile(). Those that are compatible with JIT execution are flagged
-with J. */
-
-#define PCRE_CASELESS           0x00000001  /* C1       */
-#define PCRE_MULTILINE          0x00000002  /* C1       */
-#define PCRE_DOTALL             0x00000004  /* C1       */
-#define PCRE_EXTENDED           0x00000008  /* C1       */
-#define PCRE_ANCHORED           0x00000010  /* C4 E D   */
-#define PCRE_DOLLAR_ENDONLY     0x00000020  /* C2       */
-#define PCRE_EXTRA              0x00000040  /* C1       */
-#define PCRE_NOTBOL             0x00000080  /*    E D J */
-#define PCRE_NOTEOL             0x00000100  /*    E D J */
-#define PCRE_UNGREEDY           0x00000200  /* C1       */
-#define PCRE_NOTEMPTY           0x00000400  /*    E D J */
-#define PCRE_UTF8               0x00000800  /* C4        )          */
-#define PCRE_UTF16              0x00000800  /* C4        ) Synonyms */
-#define PCRE_UTF32              0x00000800  /* C4        )          */
-#define PCRE_NO_AUTO_CAPTURE    0x00001000  /* C1       */
-#define PCRE_NO_UTF8_CHECK      0x00002000  /* C1 E D J  )          */
-#define PCRE_NO_UTF16_CHECK     0x00002000  /* C1 E D J  ) Synonyms */
-#define PCRE_NO_UTF32_CHECK     0x00002000  /* C1 E D J  )          */
-#define PCRE_AUTO_CALLOUT       0x00004000  /* C1       */
-#define PCRE_PARTIAL_SOFT       0x00008000  /*    E D J  ) Synonyms */
-#define PCRE_PARTIAL            0x00008000  /*    E D J  )          */
-
-/* This pair use the same bit. */
-#define PCRE_NEVER_UTF          0x00010000  /* C1        ) Overlaid */
-#define PCRE_DFA_SHORTEST       0x00010000  /*      D    ) Overlaid */
-
-/* This pair use the same bit. */
-#define PCRE_NO_AUTO_POSSESS    0x00020000  /* C1        ) Overlaid */
-#define PCRE_DFA_RESTART        0x00020000  /*      D    ) Overlaid */
-
-#define PCRE_FIRSTLINE          0x00040000  /* C3       */
-#define PCRE_DUPNAMES           0x00080000  /* C1       */
-#define PCRE_NEWLINE_CR         0x00100000  /* C3 E D   */
-#define PCRE_NEWLINE_LF         0x00200000  /* C3 E D   */
-#define PCRE_NEWLINE_CRLF       0x00300000  /* C3 E D   */
-#define PCRE_NEWLINE_ANY        0x00400000  /* C3 E D   */
-#define PCRE_NEWLINE_ANYCRLF    0x00500000  /* C3 E D   */
-#define PCRE_BSR_ANYCRLF        0x00800000  /* C3 E D   */
-#define PCRE_BSR_UNICODE        0x01000000  /* C3 E D   */
-#define PCRE_JAVASCRIPT_COMPAT  0x02000000  /* C5       */
-#define PCRE_NO_START_OPTIMIZE  0x04000000  /* C2 E D    ) Synonyms */
-#define PCRE_NO_START_OPTIMISE  0x04000000  /* C2 E D    )          */
-#define PCRE_PARTIAL_HARD       0x08000000  /*    E D J */
-#define PCRE_NOTEMPTY_ATSTART   0x10000000  /*    E D J */
-#define PCRE_UCP                0x20000000  /* C3       */
-
-/* Exec-time and get/set-time error codes */
-
-#define PCRE_ERROR_NOMATCH          (-1)
-#define PCRE_ERROR_NULL             (-2)
-#define PCRE_ERROR_BADOPTION        (-3)
-#define PCRE_ERROR_BADMAGIC         (-4)
-#define PCRE_ERROR_UNKNOWN_OPCODE   (-5)
-#define PCRE_ERROR_UNKNOWN_NODE     (-5)  /* For backward compatibility */
-#define PCRE_ERROR_NOMEMORY         (-6)
-#define PCRE_ERROR_NOSUBSTRING      (-7)
-#define PCRE_ERROR_MATCHLIMIT       (-8)
-#define PCRE_ERROR_CALLOUT          (-9)  /* Never used by PCRE itself */
-#define PCRE_ERROR_BADUTF8         (-10)  /* Same for 8/16/32 */
-#define PCRE_ERROR_BADUTF16        (-10)  /* Same for 8/16/32 */
-#define PCRE_ERROR_BADUTF32        (-10)  /* Same for 8/16/32 */
-#define PCRE_ERROR_BADUTF8_OFFSET  (-11)  /* Same for 8/16 */
-#define PCRE_ERROR_BADUTF16_OFFSET (-11)  /* Same for 8/16 */
-#define PCRE_ERROR_PARTIAL         (-12)
-#define PCRE_ERROR_BADPARTIAL      (-13)
-#define PCRE_ERROR_INTERNAL        (-14)
-#define PCRE_ERROR_BADCOUNT        (-15)
-#define PCRE_ERROR_DFA_UITEM       (-16)
-#define PCRE_ERROR_DFA_UCOND       (-17)
-#define PCRE_ERROR_DFA_UMLIMIT     (-18)
-#define PCRE_ERROR_DFA_WSSIZE      (-19)
-#define PCRE_ERROR_DFA_RECURSE     (-20)
-#define PCRE_ERROR_RECURSIONLIMIT  (-21)
-#define PCRE_ERROR_NULLWSLIMIT     (-22)  /* No longer actually used */
-#define PCRE_ERROR_BADNEWLINE      (-23)
-#define PCRE_ERROR_BADOFFSET       (-24)
-#define PCRE_ERROR_SHORTUTF8       (-25)
-#define PCRE_ERROR_SHORTUTF16      (-25)  /* Same for 8/16 */
-#define PCRE_ERROR_RECURSELOOP     (-26)
-#define PCRE_ERROR_JIT_STACKLIMIT  (-27)
-#define PCRE_ERROR_BADMODE         (-28)
-#define PCRE_ERROR_BADENDIANNESS   (-29)
-#define PCRE_ERROR_DFA_BADRESTART  (-30)
-#define PCRE_ERROR_JIT_BADOPTION   (-31)
-#define PCRE_ERROR_BADLENGTH       (-32)
-#define PCRE_ERROR_UNSET           (-33)
-
-/* Specific error codes for UTF-8 validity checks */
-
-#define PCRE_UTF8_ERR0               0
-#define PCRE_UTF8_ERR1               1
-#define PCRE_UTF8_ERR2               2
-#define PCRE_UTF8_ERR3               3
-#define PCRE_UTF8_ERR4               4
-#define PCRE_UTF8_ERR5               5
-#define PCRE_UTF8_ERR6               6
-#define PCRE_UTF8_ERR7               7
-#define PCRE_UTF8_ERR8               8
-#define PCRE_UTF8_ERR9               9
-#define PCRE_UTF8_ERR10             10
-#define PCRE_UTF8_ERR11             11
-#define PCRE_UTF8_ERR12             12
-#define PCRE_UTF8_ERR13             13
-#define PCRE_UTF8_ERR14             14
-#define PCRE_UTF8_ERR15             15
-#define PCRE_UTF8_ERR16             16
-#define PCRE_UTF8_ERR17             17
-#define PCRE_UTF8_ERR18             18
-#define PCRE_UTF8_ERR19             19
-#define PCRE_UTF8_ERR20             20
-#define PCRE_UTF8_ERR21             21
-#define PCRE_UTF8_ERR22             22  /* Unused (was non-character) */
-
-/* Specific error codes for UTF-16 validity checks */
-
-#define PCRE_UTF16_ERR0              0
-#define PCRE_UTF16_ERR1              1
-#define PCRE_UTF16_ERR2              2
-#define PCRE_UTF16_ERR3              3
-#define PCRE_UTF16_ERR4              4  /* Unused (was non-character) */
-
-/* Specific error codes for UTF-32 validity checks */
-
-#define PCRE_UTF32_ERR0              0
-#define PCRE_UTF32_ERR1              1
-#define PCRE_UTF32_ERR2              2  /* Unused (was non-character) */
-#define PCRE_UTF32_ERR3              3
-
-/* Request types for pcre_fullinfo() */
-
-#define PCRE_INFO_OPTIONS            0
-#define PCRE_INFO_SIZE               1
-#define PCRE_INFO_CAPTURECOUNT       2
-#define PCRE_INFO_BACKREFMAX         3
-#define PCRE_INFO_FIRSTBYTE          4
-#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
-#define PCRE_INFO_FIRSTTABLE         5
-#define PCRE_INFO_LASTLITERAL        6
-#define PCRE_INFO_NAMEENTRYSIZE      7
-#define PCRE_INFO_NAMECOUNT          8
-#define PCRE_INFO_NAMETABLE          9
-#define PCRE_INFO_STUDYSIZE         10
-#define PCRE_INFO_DEFAULT_TABLES    11
-#define PCRE_INFO_OKPARTIAL         12
-#define PCRE_INFO_JCHANGED          13
-#define PCRE_INFO_HASCRORLF         14
-#define PCRE_INFO_MINLENGTH         15
-#define PCRE_INFO_JIT               16
-#define PCRE_INFO_JITSIZE           17
-#define PCRE_INFO_MAXLOOKBEHIND     18
-#define PCRE_INFO_FIRSTCHARACTER    19
-#define PCRE_INFO_FIRSTCHARACTERFLAGS 20
-#define PCRE_INFO_REQUIREDCHAR      21
-#define PCRE_INFO_REQUIREDCHARFLAGS 22
-#define PCRE_INFO_MATCHLIMIT        23
-#define PCRE_INFO_RECURSIONLIMIT    24
-#define PCRE_INFO_MATCH_EMPTY       25
-
-/* Request types for pcre_config(). Do not re-arrange, in order to remain
-compatible. */
-
-#define PCRE_CONFIG_UTF8                    0
-#define PCRE_CONFIG_NEWLINE                 1
-#define PCRE_CONFIG_LINK_SIZE               2
-#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
-#define PCRE_CONFIG_MATCH_LIMIT             4
-#define PCRE_CONFIG_STACKRECURSE            5
-#define PCRE_CONFIG_UNICODE_PROPERTIES      6
-#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
-#define PCRE_CONFIG_BSR                     8
-#define PCRE_CONFIG_JIT                     9
-#define PCRE_CONFIG_UTF16                  10
-#define PCRE_CONFIG_JITTARGET              11
-#define PCRE_CONFIG_UTF32                  12
-#define PCRE_CONFIG_PARENS_LIMIT           13
-
-/* Request types for pcre_study(). Do not re-arrange, in order to remain
-compatible. */
-
-#define PCRE_STUDY_JIT_COMPILE                0x0001
-#define PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE   0x0002
-#define PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE   0x0004
-#define PCRE_STUDY_EXTRA_NEEDED               0x0008
-
-/* Bit flags for the pcre[16|32]_extra structure. Do not re-arrange or redefine
-these bits, just add new ones on the end, in order to remain compatible. */
-
-#define PCRE_EXTRA_STUDY_DATA             0x0001
-#define PCRE_EXTRA_MATCH_LIMIT            0x0002
-#define PCRE_EXTRA_CALLOUT_DATA           0x0004
-#define PCRE_EXTRA_TABLES                 0x0008
-#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
-#define PCRE_EXTRA_MARK                   0x0020
-#define PCRE_EXTRA_EXECUTABLE_JIT         0x0040
-
-/* Types */
-
-struct real_pcre;                 /* declaration; the definition is private  */
-typedef struct real_pcre pcre;
-
-struct real_pcre16;               /* declaration; the definition is private  */
-typedef struct real_pcre16 pcre16;
-
-struct real_pcre32;               /* declaration; the definition is private  */
-typedef struct real_pcre32 pcre32;
-
-struct real_pcre_jit_stack;       /* declaration; the definition is private  */
-typedef struct real_pcre_jit_stack pcre_jit_stack;
-
-struct real_pcre16_jit_stack;     /* declaration; the definition is private  */
-typedef struct real_pcre16_jit_stack pcre16_jit_stack;
-
-struct real_pcre32_jit_stack;     /* declaration; the definition is private  */
-typedef struct real_pcre32_jit_stack pcre32_jit_stack;
-
-/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must contain
-a 16 bit wide signed data type. Otherwise it can be a dummy data type since
-pcre16 functions are not implemented. There is a check for this in pcre_internal.h. */
-#ifndef PCRE_UCHAR16
-#define PCRE_UCHAR16 unsigned short
-#endif
-
-#ifndef PCRE_SPTR16
-#define PCRE_SPTR16 const PCRE_UCHAR16 *
-#endif
-
-/* If PCRE is compiled with 32 bit character support, PCRE_UCHAR32 must contain
-a 32 bit wide signed data type. Otherwise it can be a dummy data type since
-pcre32 functions are not implemented. There is a check for this in pcre_internal.h. */
-#ifndef PCRE_UCHAR32
-#define PCRE_UCHAR32 unsigned int
-#endif
-
-#ifndef PCRE_SPTR32
-#define PCRE_SPTR32 const PCRE_UCHAR32 *
-#endif
-
-/* When PCRE is compiled as a C++ library, the subject pointer type can be
-replaced with a custom type. For conventional use, the public interface is a
-const char *. */
-
-#ifndef PCRE_SPTR
-#define PCRE_SPTR const char *
-#endif
-
-/* The structure for passing additional data to pcre_exec(). This is defined in
-such as way as to be extensible. Always add new fields at the end, in order to
-remain compatible. */
-
-typedef struct pcre_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-  unsigned char **mark;           /* For passing back a mark pointer */
-  void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre_extra;
-
-/* Same structure as above, but with 16 bit char pointers. */
-
-typedef struct pcre16_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-  PCRE_UCHAR16 **mark;            /* For passing back a mark pointer */
-  void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre16_extra;
-
-/* Same structure as above, but with 32 bit char pointers. */
-
-typedef struct pcre32_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-  PCRE_UCHAR32 **mark;            /* For passing back a mark pointer */
-  void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre32_extra;
-
-/* The structure for passing out data via the pcre_callout_function. We use a
-structure so that new fields can be added on the end in future versions,
-without changing the API of the function, thereby allowing old clients to work
-without modification. */
-
-typedef struct pcre_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR    subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------- Added for Version 2 -------------------------- */
-  const unsigned char *mark;      /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre_callout_block;
-
-/* Same structure as above, but with 16 bit char pointers. */
-
-typedef struct pcre16_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR16  subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------- Added for Version 2 -------------------------- */
-  const PCRE_UCHAR16 *mark;       /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre16_callout_block;
-
-/* Same structure as above, but with 32 bit char pointers. */
-
-typedef struct pcre32_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR32  subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------- Added for Version 2 -------------------------- */
-  const PCRE_UCHAR32 *mark;       /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre32_callout_block;
-
-/* Indirection for store get and free functions. These can be set to
-alternative malloc/free functions if required. Special ones are used in the
-non-recursive case for "frames". There is also an optional callout function
-that is triggered by the (?) regex item. For Virtual Pascal, these definitions
-have to take another form. */
-
-#ifndef VPCOMPAT
-PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre_free)(void *);
-PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
-PCRE_EXP_DECL int   (*pcre_stack_guard)(void);
-
-PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre16_free)(void *);
-PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre16_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre16_callout)(pcre16_callout_block *);
-PCRE_EXP_DECL int   (*pcre16_stack_guard)(void);
-
-PCRE_EXP_DECL void *(*pcre32_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre32_free)(void *);
-PCRE_EXP_DECL void *(*pcre32_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre32_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre32_callout)(pcre32_callout_block *);
-PCRE_EXP_DECL int   (*pcre32_stack_guard)(void);
-#else   /* VPCOMPAT */
-PCRE_EXP_DECL void *pcre_malloc(size_t);
-PCRE_EXP_DECL void  pcre_free(void *);
-PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre_stack_free(void *);
-PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
-PCRE_EXP_DECL int   pcre_stack_guard(void);
-
-PCRE_EXP_DECL void *pcre16_malloc(size_t);
-PCRE_EXP_DECL void  pcre16_free(void *);
-PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre16_stack_free(void *);
-PCRE_EXP_DECL int   pcre16_callout(pcre16_callout_block *);
-PCRE_EXP_DECL int   pcre16_stack_guard(void);
-
-PCRE_EXP_DECL void *pcre32_malloc(size_t);
-PCRE_EXP_DECL void  pcre32_free(void *);
-PCRE_EXP_DECL void *pcre32_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre32_stack_free(void *);
-PCRE_EXP_DECL int   pcre32_callout(pcre32_callout_block *);
-PCRE_EXP_DECL int   pcre32_stack_guard(void);
-#endif  /* VPCOMPAT */
-
-/* User defined callback which provides a stack just before the match starts. */
-
-typedef pcre_jit_stack *(*pcre_jit_callback)(void *);
-typedef pcre16_jit_stack *(*pcre16_jit_callback)(void *);
-typedef pcre32_jit_stack *(*pcre32_jit_callback)(void *);
-
-/* Exported PCRE functions */
-
-PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
-                  const unsigned char *);
-PCRE_EXP_DECL pcre16 *pcre16_compile(PCRE_SPTR16, int, const char **, int *,
-                  const unsigned char *);
-PCRE_EXP_DECL pcre32 *pcre32_compile(PCRE_SPTR32, int, const char **, int *,
-                  const unsigned char *);
-PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_EXP_DECL pcre16 *pcre16_compile2(PCRE_SPTR16, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_EXP_DECL pcre32 *pcre32_compile2(PCRE_SPTR32, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_EXP_DECL int  pcre_config(int, void *);
-PCRE_EXP_DECL int  pcre16_config(int, void *);
-PCRE_EXP_DECL int  pcre32_config(int, void *);
-PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
-                  int *, int, const char *, char *, int);
-PCRE_EXP_DECL int  pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16,
-                  int *, int, PCRE_SPTR16, PCRE_UCHAR16 *, int);
-PCRE_EXP_DECL int  pcre32_copy_named_substring(const pcre32 *, PCRE_SPTR32,
-                  int *, int, PCRE_SPTR32, PCRE_UCHAR32 *, int);
-PCRE_EXP_DECL int  pcre_copy_substring(const char *, int *, int, int,
-                  char *, int);
-PCRE_EXP_DECL int  pcre16_copy_substring(PCRE_SPTR16, int *, int, int,
-                  PCRE_UCHAR16 *, int);
-PCRE_EXP_DECL int  pcre32_copy_substring(PCRE_SPTR32, int *, int, int,
-                  PCRE_UCHAR32 *, int);
-PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
-                  const char *, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre16_dfa_exec(const pcre16 *, const pcre16_extra *,
-                  PCRE_SPTR16, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre32_dfa_exec(const pcre32 *, const pcre32_extra *,
-                  PCRE_SPTR32, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
-                   int, int, int, int *, int);
-PCRE_EXP_DECL int  pcre16_exec(const pcre16 *, const pcre16_extra *,
-                   PCRE_SPTR16, int, int, int, int *, int);
-PCRE_EXP_DECL int  pcre32_exec(const pcre32 *, const pcre32_extra *,
-                   PCRE_SPTR32, int, int, int, int *, int);
-PCRE_EXP_DECL int  pcre_jit_exec(const pcre *, const pcre_extra *,
-                   PCRE_SPTR, int, int, int, int *, int,
-                   pcre_jit_stack *);
-PCRE_EXP_DECL int  pcre16_jit_exec(const pcre16 *, const pcre16_extra *,
-                   PCRE_SPTR16, int, int, int, int *, int,
-                   pcre16_jit_stack *);
-PCRE_EXP_DECL int  pcre32_jit_exec(const pcre32 *, const pcre32_extra *,
-                   PCRE_SPTR32, int, int, int, int *, int,
-                   pcre32_jit_stack *);
-PCRE_EXP_DECL void pcre_free_substring(const char *);
-PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16);
-PCRE_EXP_DECL void pcre32_free_substring(PCRE_SPTR32);
-PCRE_EXP_DECL void pcre_free_substring_list(const char **);
-PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *);
-PCRE_EXP_DECL void pcre32_free_substring_list(PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
-                  void *);
-PCRE_EXP_DECL int  pcre16_fullinfo(const pcre16 *, const pcre16_extra *, int,
-                  void *);
-PCRE_EXP_DECL int  pcre32_fullinfo(const pcre32 *, const pcre32_extra *, int,
-                  void *);
-PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
-                  int *, int, const char *, const char **);
-PCRE_EXP_DECL int  pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16,
-                  int *, int, PCRE_SPTR16, PCRE_SPTR16 *);
-PCRE_EXP_DECL int  pcre32_get_named_substring(const pcre32 *, PCRE_SPTR32,
-                  int *, int, PCRE_SPTR32, PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
-PCRE_EXP_DECL int  pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16);
-PCRE_EXP_DECL int  pcre32_get_stringnumber(const pcre32 *, PCRE_SPTR32);
-PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
-                  char **, char **);
-PCRE_EXP_DECL int  pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR16,
-                  PCRE_UCHAR16 **, PCRE_UCHAR16 **);
-PCRE_EXP_DECL int  pcre32_get_stringtable_entries(const pcre32 *, PCRE_SPTR32,
-                  PCRE_UCHAR32 **, PCRE_UCHAR32 **);
-PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
-                  const char **);
-PCRE_EXP_DECL int  pcre16_get_substring(PCRE_SPTR16, int *, int, int,
-                  PCRE_SPTR16 *);
-PCRE_EXP_DECL int  pcre32_get_substring(PCRE_SPTR32, int *, int, int,
-                  PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
-                  const char ***);
-PCRE_EXP_DECL int  pcre16_get_substring_list(PCRE_SPTR16, int *, int,
-                  PCRE_SPTR16 **);
-PCRE_EXP_DECL int  pcre32_get_substring_list(PCRE_SPTR32, int *, int,
-                  PCRE_SPTR32 **);
-PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
-PCRE_EXP_DECL const unsigned char *pcre16_maketables(void);
-PCRE_EXP_DECL const unsigned char *pcre32_maketables(void);
-PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
-PCRE_EXP_DECL int  pcre16_refcount(pcre16 *, int);
-PCRE_EXP_DECL int  pcre32_refcount(pcre32 *, int);
-PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
-PCRE_EXP_DECL pcre16_extra *pcre16_study(const pcre16 *, int, const char **);
-PCRE_EXP_DECL pcre32_extra *pcre32_study(const pcre32 *, int, const char **);
-PCRE_EXP_DECL void pcre_free_study(pcre_extra *);
-PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *);
-PCRE_EXP_DECL void pcre32_free_study(pcre32_extra *);
-PCRE_EXP_DECL const char *pcre_version(void);
-PCRE_EXP_DECL const char *pcre16_version(void);
-PCRE_EXP_DECL const char *pcre32_version(void);
-
-/* Utility functions for byte order swaps. */
-PCRE_EXP_DECL int  pcre_pattern_to_host_byte_order(pcre *, pcre_extra *,
-                  const unsigned char *);
-PCRE_EXP_DECL int  pcre16_pattern_to_host_byte_order(pcre16 *, pcre16_extra *,
-                  const unsigned char *);
-PCRE_EXP_DECL int  pcre32_pattern_to_host_byte_order(pcre32 *, pcre32_extra *,
-                  const unsigned char *);
-PCRE_EXP_DECL int  pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *,
-                  PCRE_SPTR16, int, int *, int);
-PCRE_EXP_DECL int  pcre32_utf32_to_host_byte_order(PCRE_UCHAR32 *,
-                  PCRE_SPTR32, int, int *, int);
-
-/* JIT compiler related functions. */
-
-PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int);
-PCRE_EXP_DECL pcre16_jit_stack *pcre16_jit_stack_alloc(int, int);
-PCRE_EXP_DECL pcre32_jit_stack *pcre32_jit_stack_alloc(int, int);
-PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *);
-PCRE_EXP_DECL void pcre16_jit_stack_free(pcre16_jit_stack *);
-PCRE_EXP_DECL void pcre32_jit_stack_free(pcre32_jit_stack *);
-PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra *,
-                  pcre_jit_callback, void *);
-PCRE_EXP_DECL void pcre16_assign_jit_stack(pcre16_extra *,
-                  pcre16_jit_callback, void *);
-PCRE_EXP_DECL void pcre32_assign_jit_stack(pcre32_extra *,
-                  pcre32_jit_callback, void *);
-PCRE_EXP_DECL void pcre_jit_free_unused_memory(void);
-PCRE_EXP_DECL void pcre16_jit_free_unused_memory(void);
-PCRE_EXP_DECL void pcre32_jit_free_unused_memory(void);
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endif /* End of pcre.h */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_internal.h r-base-3.3.1/src/extra/pcre/pcre_internal.h
--- r-base-3.2.3/src/extra/pcre/pcre_internal.h	2015-11-26 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,2825 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* This header contains definitions that are shared between the different
-modules, but which are not relevant to the exported API. This includes some
-functions whose names all begin with "_pcre_", "_pcre16_" or "_pcre32_"
-depending on the PRIV macro. */
-
-#ifndef PCRE_INTERNAL_H
-#define PCRE_INTERNAL_H
-
-#include <config.h>
-
-/* and those that are not in R's configure:
-   LINK_SIZE is set on the command line */
-#define HAVE_MEMMOVE 1
-#define MATCH_LIMIT 10000000
-#define MATCH_LIMIT_RECURSION MATCH_LIMIT
-#define MAX_NAME_COUNT 10000
-#define MAX_NAME_SIZE 32
-#define NEWLINE 10
-#define PARENS_NEST_LIMIT 250
-#define POSIX_MALLOC_THRESHOLD 10
-#define SUPPORT_UCP
-#define SUPPORT_UTF
-
-/* See http://sourceforge.net/p/predef/wiki/Architectures/
-   SPARC_32 support added in 8.32, 'experimental'.
-
-   At least i386 support did not compile on Solaris Studio.
- */
-#ifndef __SUNPRO_C
-#if defined(WIN32) || defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__ppc__) || defined(__powerpc__) || defined(__sparc__)
-# define SUPPORT_JIT
-#endif
-#endif
-
-
-/* Define PCRE_DEBUG to get debugging output on stdout. */
-
-#if 0
-#define PCRE_DEBUG
-#endif
-
-/* PCRE is compiled as an 8 bit library if it is not requested otherwise. */
-
-#if !defined COMPILE_PCRE16 && !defined COMPILE_PCRE32
-#define COMPILE_PCRE8
-#endif
-
-/* If SUPPORT_UCP is defined, SUPPORT_UTF must also be defined. The
-"configure" script ensures this, but not everybody uses "configure". */
-
-#if defined SUPPORT_UCP && !(defined SUPPORT_UTF)
-#define SUPPORT_UTF 1
-#endif
-
-/* We define SUPPORT_UTF if SUPPORT_UTF8 is enabled for compatibility
-reasons with existing code. */
-
-#if defined SUPPORT_UTF8 && !(defined SUPPORT_UTF)
-#define SUPPORT_UTF 1
-#endif
-
-/* Fixme: SUPPORT_UTF8 should be eventually disappear from the code.
-Until then we define it if SUPPORT_UTF is defined. */
-
-#if defined SUPPORT_UTF && !(defined SUPPORT_UTF8)
-#define SUPPORT_UTF8 1
-#endif
-
-/* We do not support both EBCDIC and UTF-8/16/32 at the same time. The "configure"
-script prevents both being selected, but not everybody uses "configure". */
-
-#if defined EBCDIC && defined SUPPORT_UTF
-#error The use of both EBCDIC and SUPPORT_UTF is not supported.
-#endif
-
-/* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
-inline, and there are *still* stupid compilers about that don't like indented
-pre-processor statements, or at least there were when I first wrote this. After
-all, it had only been about 10 years then...
-
-It turns out that the Mac Debugging.h header also defines the macro DPRINTF, so
-be absolutely sure we get our version. */
-
-#undef DPRINTF
-#ifdef PCRE_DEBUG
-#define DPRINTF(p) printf p
-#else
-#define DPRINTF(p) /* Nothing */
-#endif
-
-
-/* Standard C headers plus the external interface definition. The only time
-setjmp and stdarg are used is when NO_RECURSE is set. */
-
-#include <ctype.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Valgrind (memcheck) support */
-
-#ifdef SUPPORT_VALGRIND
-#include <valgrind/memcheck.h>
-#endif
-
-/* When compiling a DLL for Windows, the exported symbols have to be declared
-using some MS magic. I found some useful information on this web page:
-http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
-information there, using __declspec(dllexport) without "extern" we have a
-definition; with "extern" we have a declaration. The settings here override the
-setting in pcre.h (which is included below); it defines only PCRE_EXP_DECL,
-which is all that is needed for applications (they just import the symbols). We
-use:
-
-  PCRE_EXP_DECL       for declarations
-  PCRE_EXP_DEFN       for definitions of exported functions
-  PCRE_EXP_DATA_DEFN  for definitions of exported variables
-
-The reason for the two DEFN macros is that in non-Windows environments, one
-does not want to have "extern" before variable definitions because it leads to
-compiler warnings. So we distinguish between functions and variables. In
-Windows, the two should always be the same.
-
-The reason for wrapping this in #ifndef PCRE_EXP_DECL is so that pcretest,
-which is an application, but needs to import this file in order to "peek" at
-internals, can #include pcre.h first to get an application's-eye view.
-
-In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
-special-purpose environments) might want to stick other stuff in front of
-exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
-PCRE_EXP_DATA_DEFN only if they are not already set. */
-
-#ifndef PCRE_EXP_DECL
-#  ifdef _WIN32
-#    ifndef PCRE_STATIC
-#      define PCRE_EXP_DECL       extern __declspec(dllexport)
-#      define PCRE_EXP_DEFN       __declspec(dllexport)
-#      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
-#    else
-#      define PCRE_EXP_DECL       extern
-#      define PCRE_EXP_DEFN
-#      define PCRE_EXP_DATA_DEFN
-#    endif
-#  else
-#    ifdef __cplusplus
-#      define PCRE_EXP_DECL       extern "C"
-#    else
-#      define PCRE_EXP_DECL       extern
-#    endif
-#    ifndef PCRE_EXP_DEFN
-#      define PCRE_EXP_DEFN       PCRE_EXP_DECL
-#    endif
-#    ifndef PCRE_EXP_DATA_DEFN
-#      define PCRE_EXP_DATA_DEFN
-#    endif
-#  endif
-#endif
-
-/* When compiling with the MSVC compiler, it is sometimes necessary to include
-a "calling convention" before exported function names. (This is secondhand
-information; I know nothing about MSVC myself). For example, something like
-
-  void __cdecl function(....)
-
-might be needed. In order so make this easy, all the exported functions have
-PCRE_CALL_CONVENTION just before their names. It is rarely needed; if not
-set, we ensure here that it has no effect. */
-
-#ifndef PCRE_CALL_CONVENTION
-#define PCRE_CALL_CONVENTION
-#endif
-
-/* We need to have types that specify unsigned 8, 16 and 32-bit integers. We
-cannot determine these outside the compilation (e.g. by running a program as
-part of "configure") because PCRE is often cross-compiled for use on other
-systems. Instead we make use of the maximum sizes that are available at
-preprocessor time in standard C environments. */
-
-typedef unsigned char pcre_uint8;
-
-#if USHRT_MAX == 65535
-typedef unsigned short pcre_uint16;
-typedef short pcre_int16;
-#define PCRE_UINT16_MAX USHRT_MAX
-#define PCRE_INT16_MAX SHRT_MAX
-#elif UINT_MAX == 65535
-typedef unsigned int pcre_uint16;
-typedef int pcre_int16;
-#define PCRE_UINT16_MAX UINT_MAX
-#define PCRE_INT16_MAX INT_MAX
-#else
-#error Cannot determine a type for 16-bit integers
-#endif
-
-#if UINT_MAX == 4294967295U
-typedef unsigned int pcre_uint32;
-typedef int pcre_int32;
-#define PCRE_UINT32_MAX UINT_MAX
-#define PCRE_INT32_MAX INT_MAX
-#elif ULONG_MAX == 4294967295UL
-typedef unsigned long int pcre_uint32;
-typedef long int pcre_int32;
-#define PCRE_UINT32_MAX ULONG_MAX
-#define PCRE_INT32_MAX LONG_MAX
-#else
-#error Cannot determine a type for 32-bit integers
-#endif
-
-/* When checking for integer overflow in pcre_compile(), we need to handle
-large integers. If a 64-bit integer type is available, we can use that.
-Otherwise we have to cast to double, which of course requires floating point
-arithmetic. Handle this by defining a macro for the appropriate type. If
-stdint.h is available, include it; it may define INT64_MAX. Systems that do not
-have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
-by "configure". */
-
-#if defined HAVE_STDINT_H
-#include <stdint.h>
-#elif defined HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#if defined INT64_MAX || defined int64_t
-#define INT64_OR_DOUBLE int64_t
-#else
-#define INT64_OR_DOUBLE double
-#endif
-
-/* All character handling must be done as unsigned characters. Otherwise there
-are problems with top-bit-set characters and functions such as isspace().
-However, we leave the interface to the outside world as char * or short *,
-because that should make things easier for callers. This character type is
-called pcre_uchar.
-
-The IN_UCHARS macro multiply its argument with the byte size of the current
-pcre_uchar type. Useful for memcpy and such operations, whose require the
-byte size of their input/output buffers.
-
-The MAX_255 macro checks whether its pcre_uchar input is less than 256.
-
-The TABLE_GET macro is designed for accessing elements of tables whose contain
-exactly 256 items. When the character is able to contain more than 256
-items, some check is needed before accessing these tables.
-*/
-
-#if defined COMPILE_PCRE8
-
-typedef unsigned char pcre_uchar;
-#define IN_UCHARS(x) (x)
-#define MAX_255(c) 1
-#define TABLE_GET(c, table, default) ((table)[c])
-
-#elif defined COMPILE_PCRE16
-
-#if USHRT_MAX != 65535
-/* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in
-pcre.h(.in) and disable (comment out) this message. */
-#error Warning: PCRE_UCHAR16 is not a 16 bit data type.
-#endif
-
-typedef pcre_uint16 pcre_uchar;
-#define UCHAR_SHIFT (1)
-#define IN_UCHARS(x) ((x) << UCHAR_SHIFT)
-#define MAX_255(c) ((c) <= 255u)
-#define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
-
-#elif defined COMPILE_PCRE32
-
-typedef pcre_uint32 pcre_uchar;
-#define UCHAR_SHIFT (2)
-#define IN_UCHARS(x) ((x) << UCHAR_SHIFT)
-#define MAX_255(c) ((c) <= 255u)
-#define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-/* This is an unsigned int value that no character can ever have. UTF-8
-characters only go up to 0x7fffffff (though Unicode doesn't go beyond
-0x0010ffff). */
-
-#define NOTACHAR 0xffffffff
-
-/* PCRE is able to support several different kinds of newline (CR, LF, CRLF,
-"any" and "anycrlf" at present). The following macros are used to package up
-testing for newlines. NLBLOCK, PSSTART, and PSEND are defined in the various
-modules to indicate in which datablock the parameters exist, and what the
-start/end of string field names are. */
-
-#define NLTYPE_FIXED    0     /* Newline is a fixed length string */
-#define NLTYPE_ANY      1     /* Newline is any Unicode line ending */
-#define NLTYPE_ANYCRLF  2     /* Newline is CR, LF, or CRLF */
-
-/* This macro checks for a newline at the given position */
-
-#define IS_NEWLINE(p) \
-  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
-    ((p) < NLBLOCK->PSEND && \
-     PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, \
-       &(NLBLOCK->nllen), utf)) \
-    : \
-    ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
-     UCHAR21TEST(p) == NLBLOCK->nl[0] && \
-     (NLBLOCK->nllen == 1 || UCHAR21TEST(p+1) == NLBLOCK->nl[1])       \
-    ) \
-  )
-
-/* This macro checks for a newline immediately preceding the given position */
-
-#define WAS_NEWLINE(p) \
-  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
-    ((p) > NLBLOCK->PSSTART && \
-     PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
-       &(NLBLOCK->nllen), utf)) \
-    : \
-    ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
-     UCHAR21TEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
-     (NLBLOCK->nllen == 1 || UCHAR21TEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
-    ) \
-  )
-
-/* When PCRE is compiled as a C++ library, the subject pointer can be replaced
-with a custom type. This makes it possible, for example, to allow pcre_exec()
-to process subject strings that are discontinuous by using a smart pointer
-class. It must always be possible to inspect all of the subject string in
-pcre_exec() because of the way it backtracks. Two macros are required in the
-normal case, for sign-unspecified and unsigned char pointers. The former is
-used for the external interface and appears in pcre.h, which is why its name
-must begin with PCRE_. */
-
-#ifdef CUSTOM_SUBJECT_PTR
-#define PCRE_PUCHAR CUSTOM_SUBJECT_PTR
-#else
-#define PCRE_PUCHAR const pcre_uchar *
-#endif
-
-/* Include the public PCRE header and the definitions of UCP character property
-values. */
-
-#include "pcre.h"
-#include "ucp.h"
-
-#ifdef COMPILE_PCRE32
-/* Assert that the public PCRE_UCHAR32 is a 32-bit type */
-typedef int __assert_pcre_uchar32_size[sizeof(PCRE_UCHAR32) == 4 ? 1 : -1];
-#endif
-
-/* When compiling for use with the Virtual Pascal compiler, these functions
-need to have their names changed. PCRE must be compiled with the -DVPCOMPAT
-option on the command line. */
-
-#ifdef VPCOMPAT
-#define strlen(s)        _strlen(s)
-#define strncmp(s1,s2,m) _strncmp(s1,s2,m)
-#define memcmp(s,c,n)    _memcmp(s,c,n)
-#define memcpy(d,s,n)    _memcpy(d,s,n)
-#define memmove(d,s,n)   _memmove(d,s,n)
-#define memset(s,c,n)    _memset(s,c,n)
-#else  /* VPCOMPAT */
-
-/* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),
-define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY
-is set. Otherwise, include an emulating function for those systems that have
-neither (there some non-Unix environments where this is the case). */
-
-#ifndef HAVE_MEMMOVE
-#undef  memmove        /* some systems may have a macro */
-#ifdef HAVE_BCOPY
-#define memmove(a, b, c) bcopy(b, a, c)
-#else  /* HAVE_BCOPY */
-static void *
-pcre_memmove(void *d, const void *s, size_t n)
-{
-size_t i;
-unsigned char *dest = (unsigned char *)d;
-const unsigned char *src = (const unsigned char *)s;
-if (dest > src)
-  {
-  dest += n;
-  src += n;
-  for (i = 0; i < n; ++i) *(--dest) = *(--src);
-  return (void *)dest;
-  }
-else
-  {
-  for (i = 0; i < n; ++i) *dest++ = *src++;
-  return (void *)(dest - n);
-  }
-}
-#define memmove(a, b, c) pcre_memmove(a, b, c)
-#endif   /* not HAVE_BCOPY */
-#endif   /* not HAVE_MEMMOVE */
-#endif   /* not VPCOMPAT */
-
-
-/* PCRE keeps offsets in its compiled code as 2-byte quantities (always stored
-in big-endian order) by default. These are used, for example, to link from the
-start of a subpattern to its alternatives and its end. The use of 2 bytes per
-offset limits the size of the compiled regex to around 64K, which is big enough
-for almost everybody. However, I received a request for an even bigger limit.
-For this reason, and also to make the code easier to maintain, the storing and
-loading of offsets from the byte string is now handled by the macros that are
-defined here.
-
-The macros are controlled by the value of LINK_SIZE. This defaults to 2 in
-the config.h file, but can be overridden by using -D on the command line. This
-is automated on Unix systems via the "configure" command. */
-
-#if defined COMPILE_PCRE8
-
-#if LINK_SIZE == 2
-
-#define PUT(a,n,d)   \
-  (a[n] = (d) >> 8), \
-  (a[(n)+1] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 8) | (a)[(n)+1])
-
-#define MAX_PATTERN_SIZE (1 << 16)
-
-
-#elif LINK_SIZE == 3
-
-#define PUT(a,n,d)       \
-  (a[n] = (d) >> 16),    \
-  (a[(n)+1] = (d) >> 8), \
-  (a[(n)+2] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 16) | ((a)[(n)+1] << 8) | (a)[(n)+2])
-
-#define MAX_PATTERN_SIZE (1 << 24)
-
-
-#elif LINK_SIZE == 4
-
-#define PUT(a,n,d)        \
-  (a[n] = (d) >> 24),     \
-  (a[(n)+1] = (d) >> 16), \
-  (a[(n)+2] = (d) >> 8),  \
-  (a[(n)+3] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
-
-/* Keep it positive */
-#define MAX_PATTERN_SIZE (1 << 30)
-
-#else
-#error LINK_SIZE must be either 2, 3, or 4
-#endif
-
-#elif defined COMPILE_PCRE16
-
-#if LINK_SIZE == 2
-
-/* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
-#undef LINK_SIZE
-#define LINK_SIZE 1
-
-#define PUT(a,n,d)   \
-  (a[n] = (d))
-
-#define GET(a,n) \
-  (a[n])
-
-#define MAX_PATTERN_SIZE (1 << 16)
-
-#elif LINK_SIZE == 3 || LINK_SIZE == 4
-
-/* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
-#undef LINK_SIZE
-#define LINK_SIZE 2
-
-#define PUT(a,n,d)   \
-  (a[n] = (d) >> 16), \
-  (a[(n)+1] = (d) & 65535)
-
-#define GET(a,n) \
-  (((a)[n] << 16) | (a)[(n)+1])
-
-/* Keep it positive */
-#define MAX_PATTERN_SIZE (1 << 30)
-
-#else
-#error LINK_SIZE must be either 2, 3, or 4
-#endif
-
-#elif defined COMPILE_PCRE32
-
-/* Only supported LINK_SIZE is 4 */
-/* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
-#undef LINK_SIZE
-#define LINK_SIZE 1
-
-#define PUT(a,n,d)   \
-  (a[n] = (d))
-
-#define GET(a,n) \
-  (a[n])
-
-/* Keep it positive */
-#define MAX_PATTERN_SIZE (1 << 30)
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-/* Convenience macro defined in terms of the others */
-
-#define PUTINC(a,n,d)   PUT(a,n,d), a += LINK_SIZE
-
-
-/* PCRE uses some other 2-byte quantities that do not change when the size of
-offsets changes. There are used for repeat counts and for other things such as
-capturing parenthesis numbers in back references. */
-
-#if defined COMPILE_PCRE8
-
-#define IMM2_SIZE 2
-
-#define PUT2(a,n,d)   \
-  a[n] = (d) >> 8; \
-  a[(n)+1] = (d) & 255
-
-/* For reasons that I do not understand, the expression in this GET2 macro is
-treated by gcc as a signed expression, even when a is declared as unsigned. It
-seems that any kind of arithmetic results in a signed value. */
-
-#define GET2(a,n) \
-  (unsigned int)(((a)[n] << 8) | (a)[(n)+1])
-
-#elif defined COMPILE_PCRE16
-
-#define IMM2_SIZE 1
-
-#define PUT2(a,n,d)   \
-   a[n] = d
-
-#define GET2(a,n) \
-   a[n]
-
-#elif defined COMPILE_PCRE32
-
-#define IMM2_SIZE 1
-
-#define PUT2(a,n,d)   \
-   a[n] = d
-
-#define GET2(a,n) \
-   a[n]
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-#define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
-
-/* The maximum length of a MARK name is currently one data unit; it may be
-changed in future to be a fixed number of bytes or to depend on LINK_SIZE. */
-
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#define MAX_MARK ((1u << 16) - 1)
-#else
-#define MAX_MARK ((1u << 8) - 1)
-#endif
-
-/* There is a proposed future special "UTF-21" mode, in which only the lowest
-21 bits of a 32-bit character are interpreted as UTF, with the remaining 11
-high-order bits available to the application for other uses. In preparation for
-the future implementation of this mode, there are macros that load a data item
-and, if in this special mode, mask it to 21 bits. These macros all have names
-starting with UCHAR21. In all other modes, including the normal 32-bit
-library, the macros all have the same simple definitions. When the new mode is
-implemented, it is expected that these definitions will be varied appropriately
-using #ifdef when compiling the library that supports the special mode. */
-
-#define UCHAR21(eptr)        (*(eptr))
-#define UCHAR21TEST(eptr)    (*(eptr))
-#define UCHAR21INC(eptr)     (*(eptr)++)
-#define UCHAR21INCTEST(eptr) (*(eptr)++)
-
-/* When UTF encoding is being used, a character is no longer just a single
-byte in 8-bit mode or a single short in 16-bit mode. The macros for character
-handling generate simple sequences when used in the basic mode, and more
-complicated ones for UTF characters. GETCHARLENTEST and other macros are not
-used when UTF is not supported. To make sure they can never even appear when
-UTF support is omitted, we don't even define them. */
-
-#ifndef SUPPORT_UTF
-
-/* #define MAX_VALUE_FOR_SINGLE_CHAR */
-/* #define HAS_EXTRALEN(c) */
-/* #define GET_EXTRALEN(c) */
-/* #define NOT_FIRSTCHAR(c) */
-#define GETCHAR(c, eptr) c = *eptr;
-#define GETCHARTEST(c, eptr) c = *eptr;
-#define GETCHARINC(c, eptr) c = *eptr++;
-#define GETCHARINCTEST(c, eptr) c = *eptr++;
-#define GETCHARLEN(c, eptr, len) c = *eptr;
-/* #define GETCHARLENTEST(c, eptr, len) */
-/* #define BACKCHAR(eptr) */
-/* #define FORWARDCHAR(eptr) */
-/* #define ACROSSCHAR(condition, eptr, action) */
-
-#else   /* SUPPORT_UTF */
-
-/* Tests whether the code point needs extra characters to decode. */
-
-#define HASUTF8EXTRALEN(c) ((c) >= 0xc0)
-
-/* Base macro to pick up the remaining bytes of a UTF-8 character, not
-advancing the pointer. */
-
-#define GETUTF8(c, eptr) \
-    { \
-    if ((c & 0x20) == 0) \
-      c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
-    else if ((c & 0x10) == 0) \
-      c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
-    else if ((c & 0x08) == 0) \
-      c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
-      ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
-    else if ((c & 0x04) == 0) \
-      c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
-          ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
-          (eptr[4] & 0x3f); \
-    else \
-      c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
-          ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
-          ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
-    }
-
-/* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
-the pointer. */
-
-#define GETUTF8INC(c, eptr) \
-    { \
-    if ((c & 0x20) == 0) \
-      c = ((c & 0x1f) << 6) | (*eptr++ & 0x3f); \
-    else if ((c & 0x10) == 0) \
-      { \
-      c = ((c & 0x0f) << 12) | ((*eptr & 0x3f) << 6) | (eptr[1] & 0x3f); \
-      eptr += 2; \
-      } \
-    else if ((c & 0x08) == 0) \
-      { \
-      c = ((c & 0x07) << 18) | ((*eptr & 0x3f) << 12) | \
-          ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
-      eptr += 3; \
-      } \
-    else if ((c & 0x04) == 0) \
-      { \
-      c = ((c & 0x03) << 24) | ((*eptr & 0x3f) << 18) | \
-          ((eptr[1] & 0x3f) << 12) | ((eptr[2] & 0x3f) << 6) | \
-          (eptr[3] & 0x3f); \
-      eptr += 4; \
-      } \
-    else \
-      { \
-      c = ((c & 0x01) << 30) | ((*eptr & 0x3f) << 24) | \
-          ((eptr[1] & 0x3f) << 18) | ((eptr[2] & 0x3f) << 12) | \
-          ((eptr[3] & 0x3f) << 6) | (eptr[4] & 0x3f); \
-      eptr += 5; \
-      } \
-    }
-
-#if defined COMPILE_PCRE8
-
-/* These macros were originally written in the form of loops that used data
-from the tables whose names start with PRIV(utf8_table). They were rewritten by
-a user so as not to use loops, because in some environments this gives a
-significant performance advantage, and it seems never to do any harm. */
-
-/* Tells the biggest code point which can be encoded as a single character. */
-
-#define MAX_VALUE_FOR_SINGLE_CHAR 127
-
-/* Tests whether the code point needs extra characters to decode. */
-
-#define HAS_EXTRALEN(c) ((c) >= 0xc0)
-
-/* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
-Otherwise it has an undefined behaviour. */
-
-#define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])
-
-/* Returns TRUE, if the given character is not the first character
-of a UTF sequence. */
-
-#define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)
-
-/* Get the next UTF-8 character, not advancing the pointer. This is called when
-we know we are in UTF-8 mode. */
-
-#define GETCHAR(c, eptr) \
-  c = *eptr; \
-  if (c >= 0xc0) GETUTF8(c, eptr);
-
-/* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
-pointer. */
-
-#define GETCHARTEST(c, eptr) \
-  c = *eptr; \
-  if (utf && c >= 0xc0) GETUTF8(c, eptr);
-
-/* Get the next UTF-8 character, advancing the pointer. This is called when we
-know we are in UTF-8 mode. */
-
-#define GETCHARINC(c, eptr) \
-  c = *eptr++; \
-  if (c >= 0xc0) GETUTF8INC(c, eptr);
-
-/* Get the next character, testing for UTF-8 mode, and advancing the pointer.
-This is called when we don't know if we are in UTF-8 mode. */
-
-#define GETCHARINCTEST(c, eptr) \
-  c = *eptr++; \
-  if (utf && c >= 0xc0) GETUTF8INC(c, eptr);
-
-/* Base macro to pick up the remaining bytes of a UTF-8 character, not
-advancing the pointer, incrementing the length. */
-
-#define GETUTF8LEN(c, eptr, len) \
-    { \
-    if ((c & 0x20) == 0) \
-      { \
-      c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
-      len++; \
-      } \
-    else if ((c & 0x10)  == 0) \
-      { \
-      c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
-      len += 2; \
-      } \
-    else if ((c & 0x08)  == 0) \
-      {\
-      c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
-          ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
-      len += 3; \
-      } \
-    else if ((c & 0x04)  == 0) \
-      { \
-      c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
-          ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
-          (eptr[4] & 0x3f); \
-      len += 4; \
-      } \
-    else \
-      {\
-      c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
-          ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
-          ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
-      len += 5; \
-      } \
-    }
-
-/* Get the next UTF-8 character, not advancing the pointer, incrementing length
-if there are extra bytes. This is called when we know we are in UTF-8 mode. */
-
-#define GETCHARLEN(c, eptr, len) \
-  c = *eptr; \
-  if (c >= 0xc0) GETUTF8LEN(c, eptr, len);
-
-/* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
-pointer, incrementing length if there are extra bytes. This is called when we
-do not know if we are in UTF-8 mode. */
-
-#define GETCHARLENTEST(c, eptr, len) \
-  c = *eptr; \
-  if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
-
-/* If the pointer is not at the start of a character, move it back until
-it is. This is called only in UTF-8 mode - we don't put a test within the macro
-because almost all calls are already within a block of UTF-8 only code. */
-
-#define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
-
-/* Same as above, just in the other direction. */
-#define FORWARDCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr++
-
-/* Same as above, but it allows a fully customizable form. */
-#define ACROSSCHAR(condition, eptr, action) \
-  while((condition) && ((eptr) & 0xc0) == 0x80) action
-
-#elif defined COMPILE_PCRE16
-
-/* Tells the biggest code point which can be encoded as a single character. */
-
-#define MAX_VALUE_FOR_SINGLE_CHAR 65535
-
-/* Tests whether the code point needs extra characters to decode. */
-
-#define HAS_EXTRALEN(c) (((c) & 0xfc00) == 0xd800)
-
-/* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
-Otherwise it has an undefined behaviour. */
-
-#define GET_EXTRALEN(c) 1
-
-/* Returns TRUE, if the given character is not the first character
-of a UTF sequence. */
-
-#define NOT_FIRSTCHAR(c) (((c) & 0xfc00) == 0xdc00)
-
-/* Base macro to pick up the low surrogate of a UTF-16 character, not
-advancing the pointer. */
-
-#define GETUTF16(c, eptr) \
-   { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; }
-
-/* Get the next UTF-16 character, not advancing the pointer. This is called when
-we know we are in UTF-16 mode. */
-
-#define GETCHAR(c, eptr) \
-  c = *eptr; \
-  if ((c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
-
-/* Get the next UTF-16 character, testing for UTF-16 mode, and not advancing the
-pointer. */
-
-#define GETCHARTEST(c, eptr) \
-  c = *eptr; \
-  if (utf && (c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
-
-/* Base macro to pick up the low surrogate of a UTF-16 character, advancing
-the pointer. */
-
-#define GETUTF16INC(c, eptr) \
-   { c = (((c & 0x3ff) << 10) | (*eptr++ & 0x3ff)) + 0x10000; }
-
-/* Get the next UTF-16 character, advancing the pointer. This is called when we
-know we are in UTF-16 mode. */
-
-#define GETCHARINC(c, eptr) \
-  c = *eptr++; \
-  if ((c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
-
-/* Get the next character, testing for UTF-16 mode, and advancing the pointer.
-This is called when we don't know if we are in UTF-16 mode. */
-
-#define GETCHARINCTEST(c, eptr) \
-  c = *eptr++; \
-  if (utf && (c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
-
-/* Base macro to pick up the low surrogate of a UTF-16 character, not
-advancing the pointer, incrementing the length. */
-
-#define GETUTF16LEN(c, eptr, len) \
-   { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; len++; }
-
-/* Get the next UTF-16 character, not advancing the pointer, incrementing
-length if there is a low surrogate. This is called when we know we are in
-UTF-16 mode. */
-
-#define GETCHARLEN(c, eptr, len) \
-  c = *eptr; \
-  if ((c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
-
-/* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
-pointer, incrementing length if there is a low surrogate. This is called when
-we do not know if we are in UTF-16 mode. */
-
-#define GETCHARLENTEST(c, eptr, len) \
-  c = *eptr; \
-  if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
-
-/* If the pointer is not at the start of a character, move it back until
-it is. This is called only in UTF-16 mode - we don't put a test within the
-macro because almost all calls are already within a block of UTF-16 only
-code. */
-
-#define BACKCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr--
-
-/* Same as above, just in the other direction. */
-#define FORWARDCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr++
-
-/* Same as above, but it allows a fully customizable form. */
-#define ACROSSCHAR(condition, eptr, action) \
-  if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action
-
-#elif defined COMPILE_PCRE32
-
-/* These are trivial for the 32-bit library, since all UTF-32 characters fit
-into one pcre_uchar unit. */
-#define MAX_VALUE_FOR_SINGLE_CHAR (0x10ffffu)
-#define HAS_EXTRALEN(c) (0)
-#define GET_EXTRALEN(c) (0)
-#define NOT_FIRSTCHAR(c) (0)
-
-/* Get the next UTF-32 character, not advancing the pointer. This is called when
-we know we are in UTF-32 mode. */
-
-#define GETCHAR(c, eptr) \
-  c = *(eptr);
-
-/* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the
-pointer. */
-
-#define GETCHARTEST(c, eptr) \
-  c = *(eptr);
-
-/* Get the next UTF-32 character, advancing the pointer. This is called when we
-know we are in UTF-32 mode. */
-
-#define GETCHARINC(c, eptr) \
-  c = *((eptr)++);
-
-/* Get the next character, testing for UTF-32 mode, and advancing the pointer.
-This is called when we don't know if we are in UTF-32 mode. */
-
-#define GETCHARINCTEST(c, eptr) \
-  c = *((eptr)++);
-
-/* Get the next UTF-32 character, not advancing the pointer, not incrementing
-length (since all UTF-32 is of length 1). This is called when we know we are in
-UTF-32 mode. */
-
-#define GETCHARLEN(c, eptr, len) \
-  GETCHAR(c, eptr)
-
-/* Get the next UTF-32character, testing for UTF-32 mode, not advancing the
-pointer, not incrementing the length (since all UTF-32 is of length 1).
-This is called when we do not know if we are in UTF-32 mode. */
-
-#define GETCHARLENTEST(c, eptr, len) \
-  GETCHARTEST(c, eptr)
-
-/* If the pointer is not at the start of a character, move it back until
-it is. This is called only in UTF-32 mode - we don't put a test within the
-macro because almost all calls are already within a block of UTF-32 only
-code.
-These are all no-ops since all UTF-32 characters fit into one pcre_uchar. */
-
-#define BACKCHAR(eptr) do { } while (0)
-
-/* Same as above, just in the other direction. */
-#define FORWARDCHAR(eptr) do { } while (0)
-
-/* Same as above, but it allows a fully customizable form. */
-#define ACROSSCHAR(condition, eptr, action) do { } while (0)
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-#endif  /* SUPPORT_UTF */
-
-/* Tests for Unicode horizontal and vertical whitespace characters must check a
-number of different values. Using a switch statement for this generates the
-fastest code (no loop, no memory access), and there are several places in the
-interpreter code where this happens. In order to ensure that all the case lists
-remain in step, we use macros so that there is only one place where the lists
-are defined.
-
-These values are also required as lists in pcre_compile.c when processing \h,
-\H, \v and \V in a character class. The lists are defined in pcre_tables.c, but
-macros that define the values are here so that all the definitions are
-together. The lists must be in ascending character order, terminated by
-NOTACHAR (which is 0xffffffff).
-
-Any changes should ensure that the various macros are kept in step with each
-other. NOTE: The values also appear in pcre_jit_compile.c. */
-
-/* ------ ASCII/Unicode environments ------ */
-
-#ifndef EBCDIC
-
-#define HSPACE_LIST \
-  CHAR_HT, CHAR_SPACE, CHAR_NBSP, \
-  0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
-  0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
-  NOTACHAR
-
-#define HSPACE_MULTIBYTE_CASES \
-  case 0x1680:  /* OGHAM SPACE MARK */ \
-  case 0x180e:  /* MONGOLIAN VOWEL SEPARATOR */ \
-  case 0x2000:  /* EN QUAD */ \
-  case 0x2001:  /* EM QUAD */ \
-  case 0x2002:  /* EN SPACE */ \
-  case 0x2003:  /* EM SPACE */ \
-  case 0x2004:  /* THREE-PER-EM SPACE */ \
-  case 0x2005:  /* FOUR-PER-EM SPACE */ \
-  case 0x2006:  /* SIX-PER-EM SPACE */ \
-  case 0x2007:  /* FIGURE SPACE */ \
-  case 0x2008:  /* PUNCTUATION SPACE */ \
-  case 0x2009:  /* THIN SPACE */ \
-  case 0x200A:  /* HAIR SPACE */ \
-  case 0x202f:  /* NARROW NO-BREAK SPACE */ \
-  case 0x205f:  /* MEDIUM MATHEMATICAL SPACE */ \
-  case 0x3000   /* IDEOGRAPHIC SPACE */
-
-#define HSPACE_BYTE_CASES \
-  case CHAR_HT: \
-  case CHAR_SPACE: \
-  case CHAR_NBSP
-
-#define HSPACE_CASES \
-  HSPACE_BYTE_CASES: \
-  HSPACE_MULTIBYTE_CASES
-
-#define VSPACE_LIST \
-  CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
-
-#define VSPACE_MULTIBYTE_CASES \
-  case 0x2028:    /* LINE SEPARATOR */ \
-  case 0x2029     /* PARAGRAPH SEPARATOR */
-
-#define VSPACE_BYTE_CASES \
-  case CHAR_LF: \
-  case CHAR_VT: \
-  case CHAR_FF: \
-  case CHAR_CR: \
-  case CHAR_NEL
-
-#define VSPACE_CASES \
-  VSPACE_BYTE_CASES: \
-  VSPACE_MULTIBYTE_CASES
-
-/* ------ EBCDIC environments ------ */
-
-#else
-#define HSPACE_LIST CHAR_HT, CHAR_SPACE, CHAR_NBSP, NOTACHAR
-
-#define HSPACE_BYTE_CASES \
-  case CHAR_HT: \
-  case CHAR_SPACE: \
-  case CHAR_NBSP
-
-#define HSPACE_CASES HSPACE_BYTE_CASES
-
-#ifdef EBCDIC_NL25
-#define VSPACE_LIST \
-  CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
-#else
-#define VSPACE_LIST \
-  CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
-#endif
-
-#define VSPACE_BYTE_CASES \
-  case CHAR_LF: \
-  case CHAR_VT: \
-  case CHAR_FF: \
-  case CHAR_CR: \
-  case CHAR_NEL
-
-#define VSPACE_CASES VSPACE_BYTE_CASES
-#endif  /* EBCDIC */
-
-/* ------ End of whitespace macros ------ */
-
-
-
-/* Private flags containing information about the compiled regex. They used to
-live at the top end of the options word, but that got almost full, so they were
-moved to a 16-bit flags word - which got almost full, so now they are in a
-32-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as the
-restrictions on partial matching have been lifted. It remains for backwards
-compatibility. */
-
-#define PCRE_MODE8         0x00000001  /* compiled in 8 bit mode */
-#define PCRE_MODE16        0x00000002  /* compiled in 16 bit mode */
-#define PCRE_MODE32        0x00000004  /* compiled in 32 bit mode */
-#define PCRE_FIRSTSET      0x00000010  /* first_char is set */
-#define PCRE_FCH_CASELESS  0x00000020  /* caseless first char */
-#define PCRE_REQCHSET      0x00000040  /* req_byte is set */
-#define PCRE_RCH_CASELESS  0x00000080  /* caseless requested char */
-#define PCRE_STARTLINE     0x00000100  /* start after \n for multiline */
-#define PCRE_NOPARTIAL     0x00000200  /* can't use partial with this regex */
-#define PCRE_JCHANGED      0x00000400  /* j option used in regex */
-#define PCRE_HASCRORLF     0x00000800  /* explicit \r or \n in pattern */
-#define PCRE_HASTHEN       0x00001000  /* pattern contains (*THEN) */
-#define PCRE_MLSET         0x00002000  /* match limit set by regex */
-#define PCRE_RLSET         0x00004000  /* recursion limit set by regex */
-#define PCRE_MATCH_EMPTY   0x00008000  /* pattern can match empty string */
-
-#if defined COMPILE_PCRE8
-#define PCRE_MODE          PCRE_MODE8
-#elif defined COMPILE_PCRE16
-#define PCRE_MODE          PCRE_MODE16
-#elif defined COMPILE_PCRE32
-#define PCRE_MODE          PCRE_MODE32
-#endif
-#define PCRE_MODE_MASK     (PCRE_MODE8 | PCRE_MODE16 | PCRE_MODE32)
-
-/* Flags for the "extra" block produced by pcre_study(). */
-
-#define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
-#define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
-
-/* Masks for identifying the public options that are permitted at compile
-time, run time, or study time, respectively. */
-
-#define PCRE_NEWLINE_BITS (PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|PCRE_NEWLINE_ANY| \
-                           PCRE_NEWLINE_ANYCRLF)
-
-#define PUBLIC_COMPILE_OPTIONS \
-  (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
-   PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
-   PCRE_NO_AUTO_CAPTURE|PCRE_NO_AUTO_POSSESS| \
-   PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
-   PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
-   PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE|PCRE_NEVER_UTF)
-
-#define PUBLIC_EXEC_OPTIONS \
-  (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
-   PCRE_NO_UTF8_CHECK|PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT|PCRE_NEWLINE_BITS| \
-   PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE|PCRE_NO_START_OPTIMIZE)
-
-#define PUBLIC_DFA_EXEC_OPTIONS \
-  (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
-   PCRE_NO_UTF8_CHECK|PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT|PCRE_DFA_SHORTEST| \
-   PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
-   PCRE_NO_START_OPTIMIZE)
-
-#define PUBLIC_STUDY_OPTIONS \
-   (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
-    PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)
-
-#define PUBLIC_JIT_EXEC_OPTIONS \
-   (PCRE_NO_UTF8_CHECK|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|\
-    PCRE_NOTEMPTY_ATSTART|PCRE_PARTIAL_SOFT|PCRE_PARTIAL_HARD)
-
-/* Magic number to provide a small check against being handed junk. */
-
-#define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
-
-/* This variable is used to detect a loaded regular expression
-in different endianness. */
-
-#define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */
-
-/* The maximum remaining length of subject we are prepared to search for a
-req_byte match. */
-
-#define REQ_BYTE_MAX 1000
-
-/* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in
-environments where these macros are defined elsewhere. Unfortunately, there
-is no way to do the same for the typedef. */
-
-typedef int BOOL;
-
-#ifndef FALSE
-#define FALSE   0
-#define TRUE    1
-#endif
-
-/* If PCRE is to support UTF-8 on EBCDIC platforms, we cannot use normal
-character constants like '*' because the compiler would emit their EBCDIC code,
-which is different from their ASCII/UTF-8 code. Instead we define macros for
-the characters so that they always use the ASCII/UTF-8 code when UTF-8 support
-is enabled. When UTF-8 support is not enabled, the definitions use character
-literals. Both character and string versions of each character are needed, and
-there are some longer strings as well.
-
-This means that, on EBCDIC platforms, the PCRE library can handle either
-EBCDIC, or UTF-8, but not both. To support both in the same compiled library
-would need different lookups depending on whether PCRE_UTF8 was set or not.
-This would make it impossible to use characters in switch/case statements,
-which would reduce performance. For a theoretical use (which nobody has asked
-for) in a minority area (EBCDIC platforms), this is not sensible. Any
-application that did need both could compile two versions of the library, using
-macros to give the functions distinct names. */
-
-#ifndef SUPPORT_UTF
-
-/* UTF-8 support is not enabled; use the platform-dependent character literals
-so that PCRE works in both ASCII and EBCDIC environments, but only in non-UTF
-mode. Newline characters are problematic in EBCDIC. Though it has CR and LF
-characters, a common practice has been to use its NL (0x15) character as the
-line terminator in C-like processing environments. However, sometimes the LF
-(0x25) character is used instead, according to this Unicode document:
-
-http://unicode.org/standard/reports/tr13/tr13-5.html
-
-PCRE defaults EBCDIC NL to 0x15, but has a build-time option to select 0x25
-instead. Whichever is *not* chosen is defined as NEL.
-
-In both ASCII and EBCDIC environments, CHAR_NL and CHAR_LF are synonyms for the
-same code point. */
-
-#ifdef EBCDIC
-
-#ifndef EBCDIC_NL25
-#define CHAR_NL                     '\x15'
-#define CHAR_NEL                    '\x25'
-#define STR_NL                      "\x15"
-#define STR_NEL                     "\x25"
-#else
-#define CHAR_NL                     '\x25'
-#define CHAR_NEL                    '\x15'
-#define STR_NL                      "\x25"
-#define STR_NEL                     "\x15"
-#endif
-
-#define CHAR_LF                     CHAR_NL
-#define STR_LF                      STR_NL
-
-#define CHAR_ESC                    '\047'
-#define CHAR_DEL                    '\007'
-#define CHAR_NBSP                   '\x41'
-#define STR_ESC                     "\047"
-#define STR_DEL                     "\007"
-
-#else  /* Not EBCDIC */
-
-/* In ASCII/Unicode, linefeed is '\n' and we equate this to NL for
-compatibility. NEL is the Unicode newline character; make sure it is
-a positive value. */
-
-#define CHAR_LF                     '\n'
-#define CHAR_NL                     CHAR_LF
-#define CHAR_NEL                    ((unsigned char)'\x85')
-#define CHAR_ESC                    '\033'
-#define CHAR_DEL                    '\177'
-#define CHAR_NBSP                   ((unsigned char)'\xa0')
-
-#define STR_LF                      "\n"
-#define STR_NL                      STR_LF
-#define STR_NEL                     "\x85"
-#define STR_ESC                     "\033"
-#define STR_DEL                     "\177"
-
-#endif  /* EBCDIC */
-
-/* The remaining definitions work in both environments. */
-
-#define CHAR_NULL                   '\0'
-#define CHAR_HT                     '\t'
-#define CHAR_VT                     '\v'
-#define CHAR_FF                     '\f'
-#define CHAR_CR                     '\r'
-#define CHAR_BS                     '\b'
-#define CHAR_BEL                    '\a'
-
-#define CHAR_SPACE                  ' '
-#define CHAR_EXCLAMATION_MARK       '!'
-#define CHAR_QUOTATION_MARK         '"'
-#define CHAR_NUMBER_SIGN            '#'
-#define CHAR_DOLLAR_SIGN            '$'
-#define CHAR_PERCENT_SIGN           '%'
-#define CHAR_AMPERSAND              '&'
-#define CHAR_APOSTROPHE             '\''
-#define CHAR_LEFT_PARENTHESIS       '('
-#define CHAR_RIGHT_PARENTHESIS      ')'
-#define CHAR_ASTERISK               '*'
-#define CHAR_PLUS                   '+'
-#define CHAR_COMMA                  ','
-#define CHAR_MINUS                  '-'
-#define CHAR_DOT                    '.'
-#define CHAR_SLASH                  '/'
-#define CHAR_0                      '0'
-#define CHAR_1                      '1'
-#define CHAR_2                      '2'
-#define CHAR_3                      '3'
-#define CHAR_4                      '4'
-#define CHAR_5                      '5'
-#define CHAR_6                      '6'
-#define CHAR_7                      '7'
-#define CHAR_8                      '8'
-#define CHAR_9                      '9'
-#define CHAR_COLON                  ':'
-#define CHAR_SEMICOLON              ';'
-#define CHAR_LESS_THAN_SIGN         '<'
-#define CHAR_EQUALS_SIGN            '='
-#define CHAR_GREATER_THAN_SIGN      '>'
-#define CHAR_QUESTION_MARK          '?'
-#define CHAR_COMMERCIAL_AT          '@'
-#define CHAR_A                      'A'
-#define CHAR_B                      'B'
-#define CHAR_C                      'C'
-#define CHAR_D                      'D'
-#define CHAR_E                      'E'
-#define CHAR_F                      'F'
-#define CHAR_G                      'G'
-#define CHAR_H                      'H'
-#define CHAR_I                      'I'
-#define CHAR_J                      'J'
-#define CHAR_K                      'K'
-#define CHAR_L                      'L'
-#define CHAR_M                      'M'
-#define CHAR_N                      'N'
-#define CHAR_O                      'O'
-#define CHAR_P                      'P'
-#define CHAR_Q                      'Q'
-#define CHAR_R                      'R'
-#define CHAR_S                      'S'
-#define CHAR_T                      'T'
-#define CHAR_U                      'U'
-#define CHAR_V                      'V'
-#define CHAR_W                      'W'
-#define CHAR_X                      'X'
-#define CHAR_Y                      'Y'
-#define CHAR_Z                      'Z'
-#define CHAR_LEFT_SQUARE_BRACKET    '['
-#define CHAR_BACKSLASH              '\\'
-#define CHAR_RIGHT_SQUARE_BRACKET   ']'
-#define CHAR_CIRCUMFLEX_ACCENT      '^'
-#define CHAR_UNDERSCORE             '_'
-#define CHAR_GRAVE_ACCENT           '`'
-#define CHAR_a                      'a'
-#define CHAR_b                      'b'
-#define CHAR_c                      'c'
-#define CHAR_d                      'd'
-#define CHAR_e                      'e'
-#define CHAR_f                      'f'
-#define CHAR_g                      'g'
-#define CHAR_h                      'h'
-#define CHAR_i                      'i'
-#define CHAR_j                      'j'
-#define CHAR_k                      'k'
-#define CHAR_l                      'l'
-#define CHAR_m                      'm'
-#define CHAR_n                      'n'
-#define CHAR_o                      'o'
-#define CHAR_p                      'p'
-#define CHAR_q                      'q'
-#define CHAR_r                      'r'
-#define CHAR_s                      's'
-#define CHAR_t                      't'
-#define CHAR_u                      'u'
-#define CHAR_v                      'v'
-#define CHAR_w                      'w'
-#define CHAR_x                      'x'
-#define CHAR_y                      'y'
-#define CHAR_z                      'z'
-#define CHAR_LEFT_CURLY_BRACKET     '{'
-#define CHAR_VERTICAL_LINE          '|'
-#define CHAR_RIGHT_CURLY_BRACKET    '}'
-#define CHAR_TILDE                  '~'
-
-#define STR_HT                      "\t"
-#define STR_VT                      "\v"
-#define STR_FF                      "\f"
-#define STR_CR                      "\r"
-#define STR_BS                      "\b"
-#define STR_BEL                     "\a"
-
-#define STR_SPACE                   " "
-#define STR_EXCLAMATION_MARK        "!"
-#define STR_QUOTATION_MARK          "\""
-#define STR_NUMBER_SIGN             "#"
-#define STR_DOLLAR_SIGN             "$"
-#define STR_PERCENT_SIGN            "%"
-#define STR_AMPERSAND               "&"
-#define STR_APOSTROPHE              "'"
-#define STR_LEFT_PARENTHESIS        "("
-#define STR_RIGHT_PARENTHESIS       ")"
-#define STR_ASTERISK                "*"
-#define STR_PLUS                    "+"
-#define STR_COMMA                   ","
-#define STR_MINUS                   "-"
-#define STR_DOT                     "."
-#define STR_SLASH                   "/"
-#define STR_0                       "0"
-#define STR_1                       "1"
-#define STR_2                       "2"
-#define STR_3                       "3"
-#define STR_4                       "4"
-#define STR_5                       "5"
-#define STR_6                       "6"
-#define STR_7                       "7"
-#define STR_8                       "8"
-#define STR_9                       "9"
-#define STR_COLON                   ":"
-#define STR_SEMICOLON               ";"
-#define STR_LESS_THAN_SIGN          "<"
-#define STR_EQUALS_SIGN             "="
-#define STR_GREATER_THAN_SIGN       ">"
-#define STR_QUESTION_MARK           "?"
-#define STR_COMMERCIAL_AT           "@"
-#define STR_A                       "A"
-#define STR_B                       "B"
-#define STR_C                       "C"
-#define STR_D                       "D"
-#define STR_E                       "E"
-#define STR_F                       "F"
-#define STR_G                       "G"
-#define STR_H                       "H"
-#define STR_I                       "I"
-#define STR_J                       "J"
-#define STR_K                       "K"
-#define STR_L                       "L"
-#define STR_M                       "M"
-#define STR_N                       "N"
-#define STR_O                       "O"
-#define STR_P                       "P"
-#define STR_Q                       "Q"
-#define STR_R                       "R"
-#define STR_S                       "S"
-#define STR_T                       "T"
-#define STR_U                       "U"
-#define STR_V                       "V"
-#define STR_W                       "W"
-#define STR_X                       "X"
-#define STR_Y                       "Y"
-#define STR_Z                       "Z"
-#define STR_LEFT_SQUARE_BRACKET     "["
-#define STR_BACKSLASH               "\\"
-#define STR_RIGHT_SQUARE_BRACKET    "]"
-#define STR_CIRCUMFLEX_ACCENT       "^"
-#define STR_UNDERSCORE              "_"
-#define STR_GRAVE_ACCENT            "`"
-#define STR_a                       "a"
-#define STR_b                       "b"
-#define STR_c                       "c"
-#define STR_d                       "d"
-#define STR_e                       "e"
-#define STR_f                       "f"
-#define STR_g                       "g"
-#define STR_h                       "h"
-#define STR_i                       "i"
-#define STR_j                       "j"
-#define STR_k                       "k"
-#define STR_l                       "l"
-#define STR_m                       "m"
-#define STR_n                       "n"
-#define STR_o                       "o"
-#define STR_p                       "p"
-#define STR_q                       "q"
-#define STR_r                       "r"
-#define STR_s                       "s"
-#define STR_t                       "t"
-#define STR_u                       "u"
-#define STR_v                       "v"
-#define STR_w                       "w"
-#define STR_x                       "x"
-#define STR_y                       "y"
-#define STR_z                       "z"
-#define STR_LEFT_CURLY_BRACKET      "{"
-#define STR_VERTICAL_LINE           "|"
-#define STR_RIGHT_CURLY_BRACKET     "}"
-#define STR_TILDE                   "~"
-
-#define STRING_ACCEPT0              "ACCEPT\0"
-#define STRING_COMMIT0              "COMMIT\0"
-#define STRING_F0                   "F\0"
-#define STRING_FAIL0                "FAIL\0"
-#define STRING_MARK0                "MARK\0"
-#define STRING_PRUNE0               "PRUNE\0"
-#define STRING_SKIP0                "SKIP\0"
-#define STRING_THEN                 "THEN"
-
-#define STRING_alpha0               "alpha\0"
-#define STRING_lower0               "lower\0"
-#define STRING_upper0               "upper\0"
-#define STRING_alnum0               "alnum\0"
-#define STRING_ascii0               "ascii\0"
-#define STRING_blank0               "blank\0"
-#define STRING_cntrl0               "cntrl\0"
-#define STRING_digit0               "digit\0"
-#define STRING_graph0               "graph\0"
-#define STRING_print0               "print\0"
-#define STRING_punct0               "punct\0"
-#define STRING_space0               "space\0"
-#define STRING_word0                "word\0"
-#define STRING_xdigit               "xdigit"
-
-#define STRING_DEFINE               "DEFINE"
-#define STRING_WEIRD_STARTWORD      "[:<:]]"
-#define STRING_WEIRD_ENDWORD        "[:>:]]"
-
-#define STRING_CR_RIGHTPAR              "CR)"
-#define STRING_LF_RIGHTPAR              "LF)"
-#define STRING_CRLF_RIGHTPAR            "CRLF)"
-#define STRING_ANY_RIGHTPAR             "ANY)"
-#define STRING_ANYCRLF_RIGHTPAR         "ANYCRLF)"
-#define STRING_BSR_ANYCRLF_RIGHTPAR     "BSR_ANYCRLF)"
-#define STRING_BSR_UNICODE_RIGHTPAR     "BSR_UNICODE)"
-#define STRING_UTF8_RIGHTPAR            "UTF8)"
-#define STRING_UTF16_RIGHTPAR           "UTF16)"
-#define STRING_UTF32_RIGHTPAR           "UTF32)"
-#define STRING_UTF_RIGHTPAR             "UTF)"
-#define STRING_UCP_RIGHTPAR             "UCP)"
-#define STRING_NO_AUTO_POSSESS_RIGHTPAR "NO_AUTO_POSSESS)"
-#define STRING_NO_START_OPT_RIGHTPAR    "NO_START_OPT)"
-#define STRING_LIMIT_MATCH_EQ           "LIMIT_MATCH="
-#define STRING_LIMIT_RECURSION_EQ       "LIMIT_RECURSION="
-
-#else  /* SUPPORT_UTF */
-
-/* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This
-works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode
-only. */
-
-#define CHAR_HT                     '\011'
-#define CHAR_VT                     '\013'
-#define CHAR_FF                     '\014'
-#define CHAR_CR                     '\015'
-#define CHAR_LF                     '\012'
-#define CHAR_NL                     CHAR_LF
-#define CHAR_NEL                    ((unsigned char)'\x85')
-#define CHAR_BS                     '\010'
-#define CHAR_BEL                    '\007'
-#define CHAR_ESC                    '\033'
-#define CHAR_DEL                    '\177'
-
-#define CHAR_NULL                   '\0'
-#define CHAR_SPACE                  '\040'
-#define CHAR_EXCLAMATION_MARK       '\041'
-#define CHAR_QUOTATION_MARK         '\042'
-#define CHAR_NUMBER_SIGN            '\043'
-#define CHAR_DOLLAR_SIGN            '\044'
-#define CHAR_PERCENT_SIGN           '\045'
-#define CHAR_AMPERSAND              '\046'
-#define CHAR_APOSTROPHE             '\047'
-#define CHAR_LEFT_PARENTHESIS       '\050'
-#define CHAR_RIGHT_PARENTHESIS      '\051'
-#define CHAR_ASTERISK               '\052'
-#define CHAR_PLUS                   '\053'
-#define CHAR_COMMA                  '\054'
-#define CHAR_MINUS                  '\055'
-#define CHAR_DOT                    '\056'
-#define CHAR_SLASH                  '\057'
-#define CHAR_0                      '\060'
-#define CHAR_1                      '\061'
-#define CHAR_2                      '\062'
-#define CHAR_3                      '\063'
-#define CHAR_4                      '\064'
-#define CHAR_5                      '\065'
-#define CHAR_6                      '\066'
-#define CHAR_7                      '\067'
-#define CHAR_8                      '\070'
-#define CHAR_9                      '\071'
-#define CHAR_COLON                  '\072'
-#define CHAR_SEMICOLON              '\073'
-#define CHAR_LESS_THAN_SIGN         '\074'
-#define CHAR_EQUALS_SIGN            '\075'
-#define CHAR_GREATER_THAN_SIGN      '\076'
-#define CHAR_QUESTION_MARK          '\077'
-#define CHAR_COMMERCIAL_AT          '\100'
-#define CHAR_A                      '\101'
-#define CHAR_B                      '\102'
-#define CHAR_C                      '\103'
-#define CHAR_D                      '\104'
-#define CHAR_E                      '\105'
-#define CHAR_F                      '\106'
-#define CHAR_G                      '\107'
-#define CHAR_H                      '\110'
-#define CHAR_I                      '\111'
-#define CHAR_J                      '\112'
-#define CHAR_K                      '\113'
-#define CHAR_L                      '\114'
-#define CHAR_M                      '\115'
-#define CHAR_N                      '\116'
-#define CHAR_O                      '\117'
-#define CHAR_P                      '\120'
-#define CHAR_Q                      '\121'
-#define CHAR_R                      '\122'
-#define CHAR_S                      '\123'
-#define CHAR_T                      '\124'
-#define CHAR_U                      '\125'
-#define CHAR_V                      '\126'
-#define CHAR_W                      '\127'
-#define CHAR_X                      '\130'
-#define CHAR_Y                      '\131'
-#define CHAR_Z                      '\132'
-#define CHAR_LEFT_SQUARE_BRACKET    '\133'
-#define CHAR_BACKSLASH              '\134'
-#define CHAR_RIGHT_SQUARE_BRACKET   '\135'
-#define CHAR_CIRCUMFLEX_ACCENT      '\136'
-#define CHAR_UNDERSCORE             '\137'
-#define CHAR_GRAVE_ACCENT           '\140'
-#define CHAR_a                      '\141'
-#define CHAR_b                      '\142'
-#define CHAR_c                      '\143'
-#define CHAR_d                      '\144'
-#define CHAR_e                      '\145'
-#define CHAR_f                      '\146'
-#define CHAR_g                      '\147'
-#define CHAR_h                      '\150'
-#define CHAR_i                      '\151'
-#define CHAR_j                      '\152'
-#define CHAR_k                      '\153'
-#define CHAR_l                      '\154'
-#define CHAR_m                      '\155'
-#define CHAR_n                      '\156'
-#define CHAR_o                      '\157'
-#define CHAR_p                      '\160'
-#define CHAR_q                      '\161'
-#define CHAR_r                      '\162'
-#define CHAR_s                      '\163'
-#define CHAR_t                      '\164'
-#define CHAR_u                      '\165'
-#define CHAR_v                      '\166'
-#define CHAR_w                      '\167'
-#define CHAR_x                      '\170'
-#define CHAR_y                      '\171'
-#define CHAR_z                      '\172'
-#define CHAR_LEFT_CURLY_BRACKET     '\173'
-#define CHAR_VERTICAL_LINE          '\174'
-#define CHAR_RIGHT_CURLY_BRACKET    '\175'
-#define CHAR_TILDE                  '\176'
-#define CHAR_NBSP                   ((unsigned char)'\xa0')
-
-#define STR_HT                      "\011"
-#define STR_VT                      "\013"
-#define STR_FF                      "\014"
-#define STR_CR                      "\015"
-#define STR_NL                      "\012"
-#define STR_BS                      "\010"
-#define STR_BEL                     "\007"
-#define STR_ESC                     "\033"
-#define STR_DEL                     "\177"
-
-#define STR_SPACE                   "\040"
-#define STR_EXCLAMATION_MARK        "\041"
-#define STR_QUOTATION_MARK          "\042"
-#define STR_NUMBER_SIGN             "\043"
-#define STR_DOLLAR_SIGN             "\044"
-#define STR_PERCENT_SIGN            "\045"
-#define STR_AMPERSAND               "\046"
-#define STR_APOSTROPHE              "\047"
-#define STR_LEFT_PARENTHESIS        "\050"
-#define STR_RIGHT_PARENTHESIS       "\051"
-#define STR_ASTERISK                "\052"
-#define STR_PLUS                    "\053"
-#define STR_COMMA                   "\054"
-#define STR_MINUS                   "\055"
-#define STR_DOT                     "\056"
-#define STR_SLASH                   "\057"
-#define STR_0                       "\060"
-#define STR_1                       "\061"
-#define STR_2                       "\062"
-#define STR_3                       "\063"
-#define STR_4                       "\064"
-#define STR_5                       "\065"
-#define STR_6                       "\066"
-#define STR_7                       "\067"
-#define STR_8                       "\070"
-#define STR_9                       "\071"
-#define STR_COLON                   "\072"
-#define STR_SEMICOLON               "\073"
-#define STR_LESS_THAN_SIGN          "\074"
-#define STR_EQUALS_SIGN             "\075"
-#define STR_GREATER_THAN_SIGN       "\076"
-#define STR_QUESTION_MARK           "\077"
-#define STR_COMMERCIAL_AT           "\100"
-#define STR_A                       "\101"
-#define STR_B                       "\102"
-#define STR_C                       "\103"
-#define STR_D                       "\104"
-#define STR_E                       "\105"
-#define STR_F                       "\106"
-#define STR_G                       "\107"
-#define STR_H                       "\110"
-#define STR_I                       "\111"
-#define STR_J                       "\112"
-#define STR_K                       "\113"
-#define STR_L                       "\114"
-#define STR_M                       "\115"
-#define STR_N                       "\116"
-#define STR_O                       "\117"
-#define STR_P                       "\120"
-#define STR_Q                       "\121"
-#define STR_R                       "\122"
-#define STR_S                       "\123"
-#define STR_T                       "\124"
-#define STR_U                       "\125"
-#define STR_V                       "\126"
-#define STR_W                       "\127"
-#define STR_X                       "\130"
-#define STR_Y                       "\131"
-#define STR_Z                       "\132"
-#define STR_LEFT_SQUARE_BRACKET     "\133"
-#define STR_BACKSLASH               "\134"
-#define STR_RIGHT_SQUARE_BRACKET    "\135"
-#define STR_CIRCUMFLEX_ACCENT       "\136"
-#define STR_UNDERSCORE              "\137"
-#define STR_GRAVE_ACCENT            "\140"
-#define STR_a                       "\141"
-#define STR_b                       "\142"
-#define STR_c                       "\143"
-#define STR_d                       "\144"
-#define STR_e                       "\145"
-#define STR_f                       "\146"
-#define STR_g                       "\147"
-#define STR_h                       "\150"
-#define STR_i                       "\151"
-#define STR_j                       "\152"
-#define STR_k                       "\153"
-#define STR_l                       "\154"
-#define STR_m                       "\155"
-#define STR_n                       "\156"
-#define STR_o                       "\157"
-#define STR_p                       "\160"
-#define STR_q                       "\161"
-#define STR_r                       "\162"
-#define STR_s                       "\163"
-#define STR_t                       "\164"
-#define STR_u                       "\165"
-#define STR_v                       "\166"
-#define STR_w                       "\167"
-#define STR_x                       "\170"
-#define STR_y                       "\171"
-#define STR_z                       "\172"
-#define STR_LEFT_CURLY_BRACKET      "\173"
-#define STR_VERTICAL_LINE           "\174"
-#define STR_RIGHT_CURLY_BRACKET     "\175"
-#define STR_TILDE                   "\176"
-
-#define STRING_ACCEPT0              STR_A STR_C STR_C STR_E STR_P STR_T "\0"
-#define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"
-#define STRING_F0                   STR_F "\0"
-#define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
-#define STRING_MARK0                STR_M STR_A STR_R STR_K "\0"
-#define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"
-#define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
-#define STRING_THEN                 STR_T STR_H STR_E STR_N
-
-#define STRING_alpha0               STR_a STR_l STR_p STR_h STR_a "\0"
-#define STRING_lower0               STR_l STR_o STR_w STR_e STR_r "\0"
-#define STRING_upper0               STR_u STR_p STR_p STR_e STR_r "\0"
-#define STRING_alnum0               STR_a STR_l STR_n STR_u STR_m "\0"
-#define STRING_ascii0               STR_a STR_s STR_c STR_i STR_i "\0"
-#define STRING_blank0               STR_b STR_l STR_a STR_n STR_k "\0"
-#define STRING_cntrl0               STR_c STR_n STR_t STR_r STR_l "\0"
-#define STRING_digit0               STR_d STR_i STR_g STR_i STR_t "\0"
-#define STRING_graph0               STR_g STR_r STR_a STR_p STR_h "\0"
-#define STRING_print0               STR_p STR_r STR_i STR_n STR_t "\0"
-#define STRING_punct0               STR_p STR_u STR_n STR_c STR_t "\0"
-#define STRING_space0               STR_s STR_p STR_a STR_c STR_e "\0"
-#define STRING_word0                STR_w STR_o STR_r STR_d       "\0"
-#define STRING_xdigit               STR_x STR_d STR_i STR_g STR_i STR_t
-
-#define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E
-#define STRING_WEIRD_STARTWORD      STR_LEFT_SQUARE_BRACKET STR_COLON STR_LESS_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
-#define STRING_WEIRD_ENDWORD        STR_LEFT_SQUARE_BRACKET STR_COLON STR_GREATER_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
-
-#define STRING_CR_RIGHTPAR              STR_C STR_R STR_RIGHT_PARENTHESIS
-#define STRING_LF_RIGHTPAR              STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_CRLF_RIGHTPAR            STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_ANY_RIGHTPAR             STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
-#define STRING_ANYCRLF_RIGHTPAR         STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_BSR_ANYCRLF_RIGHTPAR     STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_BSR_UNICODE_RIGHTPAR     STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
-#define STRING_UTF8_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
-#define STRING_UTF16_RIGHTPAR           STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
-#define STRING_UTF32_RIGHTPAR           STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
-#define STRING_UTF_RIGHTPAR             STR_U STR_T STR_F STR_RIGHT_PARENTHESIS
-#define STRING_UCP_RIGHTPAR             STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
-#define STRING_NO_AUTO_POSSESS_RIGHTPAR STR_N STR_O STR_UNDERSCORE STR_A STR_U STR_T STR_O STR_UNDERSCORE STR_P STR_O STR_S STR_S STR_E STR_S STR_S STR_RIGHT_PARENTHESIS
-#define STRING_NO_START_OPT_RIGHTPAR    STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS
-#define STRING_LIMIT_MATCH_EQ           STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_M STR_A STR_T STR_C STR_H STR_EQUALS_SIGN
-#define STRING_LIMIT_RECURSION_EQ       STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_R STR_E STR_C STR_U STR_R STR_S STR_I STR_O STR_N STR_EQUALS_SIGN
-
-#endif  /* SUPPORT_UTF */
-
-/* Escape items that are just an encoding of a particular data value. */
-
-#ifndef ESC_a
-#define ESC_a CHAR_BEL
-#endif
-
-#ifndef ESC_e
-#define ESC_e CHAR_ESC
-#endif
-
-#ifndef ESC_f
-#define ESC_f CHAR_FF
-#endif
-
-#ifndef ESC_n
-#define ESC_n CHAR_LF
-#endif
-
-#ifndef ESC_r
-#define ESC_r CHAR_CR
-#endif
-
-/* We can't officially use ESC_t because it is a POSIX reserved identifier
-(presumably because of all the others like size_t). */
-
-#ifndef ESC_tee
-#define ESC_tee CHAR_HT
-#endif
-
-/* Codes for different types of Unicode property */
-
-#define PT_ANY        0    /* Any property - matches all chars */
-#define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
-#define PT_GC         2    /* Specified general characteristic (e.g. L) */
-#define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
-#define PT_SC         4    /* Script (e.g. Han) */
-#define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
-#define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
-#define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
-#define PT_WORD       8    /* Word - L plus N plus underscore */
-#define PT_CLIST      9    /* Pseudo-property: match character list */
-#define PT_UCNC      10    /* Universal Character nameable character */
-#define PT_TABSIZE   11    /* Size of square table for autopossessify tests */
-
-/* The following special properties are used only in XCLASS items, when POSIX
-classes are specified and PCRE_UCP is set - in other words, for Unicode
-handling of these classes. They are not available via the \p or \P escapes like
-those in the above list, and so they do not take part in the autopossessifying
-table. */
-
-#define PT_PXGRAPH   11    /* [:graph:] - characters that mark the paper */
-#define PT_PXPRINT   12    /* [:print:] - [:graph:] plus non-control spaces */
-#define PT_PXPUNCT   13    /* [:punct:] - punctuation characters */
-
-/* Flag bits and data types for the extended class (OP_XCLASS) for classes that
-contain characters with values greater than 255. */
-
-#define XCL_NOT       0x01    /* Flag: this is a negative class */
-#define XCL_MAP       0x02    /* Flag: a 32-byte map is present */
-#define XCL_HASPROP   0x04    /* Flag: property checks are present. */
-
-#define XCL_END       0    /* Marks end of individual items */
-#define XCL_SINGLE    1    /* Single item (one multibyte char) follows */
-#define XCL_RANGE     2    /* A range (two multibyte chars) follows */
-#define XCL_PROP      3    /* Unicode property (2-byte property code follows) */
-#define XCL_NOTPROP   4    /* Unicode inverted property (ditto) */
-
-/* These are escaped items that aren't just an encoding of a particular data
-value such as \n. They must have non-zero values, as check_escape() returns 0
-for a data character.  Also, they must appear in the same order as in the
-opcode definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
-corresponds to "." in DOTALL mode rather than an escape sequence. It is also
-used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
-non-DOTALL mode, "." behaves like \N.
-
-The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
-when PCRE_UCP is set and replacement of \d etc by \p sequences is required.
-They must be contiguous, and remain in order so that the replacements can be
-looked up from a table.
-
-Negative numbers are used to encode a backreference (\1, \2, \3, etc.) in
-check_escape(). There are two tests in the code for an escape
-greater than ESC_b and less than ESC_Z to detect the types that may be
-repeated. These are the types that consume characters. If any new escapes are
-put in between that don't consume a character, that code will have to change.
-*/
-
-enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
-       ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
-       ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
-       ESC_E, ESC_Q, ESC_g, ESC_k,
-       ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };
-
-
-/********************** Opcode definitions ******************/
-
-/****** NOTE NOTE NOTE ******
-
-Starting from 1 (i.e. after OP_END), the values up to OP_EOD must correspond in
-order to the list of escapes immediately above. Furthermore, values up to
-OP_DOLLM must not be changed without adjusting the table called autoposstab in
-pcre_compile.c
-
-Whenever this list is updated, the two macro definitions that follow must be
-updated to match. The possessification table called "opcode_possessify" in
-pcre_compile.c must also be updated, and also the tables called "coptable"
-and "poptable" in pcre_dfa_exec.c.
-
-****** NOTE NOTE NOTE ******/
-
-
-/* The values between FIRST_AUTOTAB_OP and LAST_AUTOTAB_RIGHT_OP, inclusive,
-are used in a table for deciding whether a repeated character type can be
-auto-possessified. */
-
-#define FIRST_AUTOTAB_OP       OP_NOT_DIGIT
-#define LAST_AUTOTAB_LEFT_OP   OP_EXTUNI
-#define LAST_AUTOTAB_RIGHT_OP  OP_DOLLM
-
-enum {
-  OP_END,            /* 0 End of pattern */
-
-  /* Values corresponding to backslashed metacharacters */
-
-  OP_SOD,            /* 1 Start of data: \A */
-  OP_SOM,            /* 2 Start of match (subject + offset): \G */
-  OP_SET_SOM,        /* 3 Set start of match (\K) */
-  OP_NOT_WORD_BOUNDARY,  /*  4 \B */
-  OP_WORD_BOUNDARY,      /*  5 \b */
-  OP_NOT_DIGIT,          /*  6 \D */
-  OP_DIGIT,              /*  7 \d */
-  OP_NOT_WHITESPACE,     /*  8 \S */
-  OP_WHITESPACE,         /*  9 \s */
-  OP_NOT_WORDCHAR,       /* 10 \W */
-  OP_WORDCHAR,           /* 11 \w */
-
-  OP_ANY,            /* 12 Match any character except newline (\N) */
-  OP_ALLANY,         /* 13 Match any character */
-  OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
-  OP_NOTPROP,        /* 15 \P (not Unicode property) */
-  OP_PROP,           /* 16 \p (Unicode property) */
-  OP_ANYNL,          /* 17 \R (any newline sequence) */
-  OP_NOT_HSPACE,     /* 18 \H (not horizontal whitespace) */
-  OP_HSPACE,         /* 19 \h (horizontal whitespace) */
-  OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
-  OP_VSPACE,         /* 21 \v (vertical whitespace) */
-  OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
-  OP_EODN,           /* 23 End of data or \n at end of data (\Z) */
-  OP_EOD,            /* 24 End of data (\z) */
-
-  /* Line end assertions */
-
-  OP_DOLL,           /* 25 End of line - not multiline */
-  OP_DOLLM,          /* 26 End of line - multiline */
-  OP_CIRC,           /* 27 Start of line - not multiline */
-  OP_CIRCM,          /* 28 Start of line - multiline */
-
-  /* Single characters; caseful must precede the caseless ones */
-
-  OP_CHAR,           /* 29 Match one character, casefully */
-  OP_CHARI,          /* 30 Match one character, caselessly */
-  OP_NOT,            /* 31 Match one character, not the given one, casefully */
-  OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
-
-  /* The following sets of 13 opcodes must always be kept in step because
-  the offset from the first one is used to generate the others. */
-
-  /* Repeated characters; caseful must precede the caseless ones */
-
-  OP_STAR,           /* 33 The maximizing and minimizing versions of */
-  OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
-  OP_PLUS,           /* 35 the minimizing one second. */
-  OP_MINPLUS,        /* 36 */
-  OP_QUERY,          /* 37 */
-  OP_MINQUERY,       /* 38 */
-
-  OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
-  OP_MINUPTO,        /* 40 */
-  OP_EXACT,          /* 41 Exactly n matches */
-
-  OP_POSSTAR,        /* 42 Possessified star, caseful */
-  OP_POSPLUS,        /* 43 Possessified plus, caseful */
-  OP_POSQUERY,       /* 44 Posesssified query, caseful */
-  OP_POSUPTO,        /* 45 Possessified upto, caseful */
-
-  /* Repeated characters; caseless must follow the caseful ones */
-
-  OP_STARI,          /* 46 */
-  OP_MINSTARI,       /* 47 */
-  OP_PLUSI,          /* 48 */
-  OP_MINPLUSI,       /* 49 */
-  OP_QUERYI,         /* 50 */
-  OP_MINQUERYI,      /* 51 */
-
-  OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
-  OP_MINUPTOI,       /* 53 */
-  OP_EXACTI,         /* 54 */
-
-  OP_POSSTARI,       /* 55 Possessified star, caseless */
-  OP_POSPLUSI,       /* 56 Possessified plus, caseless */
-  OP_POSQUERYI,      /* 57 Posesssified query, caseless */
-  OP_POSUPTOI,       /* 58 Possessified upto, caseless */
-
-  /* The negated ones must follow the non-negated ones, and match them */
-  /* Negated repeated character, caseful; must precede the caseless ones */
-
-  OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
-  OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
-  OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
-  OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
-  OP_NOTQUERY,       /* 63 */
-  OP_NOTMINQUERY,    /* 64 */
-
-  OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
-  OP_NOTMINUPTO,     /* 66 */
-  OP_NOTEXACT,       /* 67 Exactly n matches */
-
-  OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
-  OP_NOTPOSPLUS,     /* 69 */
-  OP_NOTPOSQUERY,    /* 70 */
-  OP_NOTPOSUPTO,     /* 71 */
-
-  /* Negated repeated character, caseless; must follow the caseful ones */
-
-  OP_NOTSTARI,       /* 72 */
-  OP_NOTMINSTARI,    /* 73 */
-  OP_NOTPLUSI,       /* 74 */
-  OP_NOTMINPLUSI,    /* 75 */
-  OP_NOTQUERYI,      /* 76 */
-  OP_NOTMINQUERYI,   /* 77 */
-
-  OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
-  OP_NOTMINUPTOI,    /* 79 */
-  OP_NOTEXACTI,      /* 80 Exactly n matches */
-
-  OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
-  OP_NOTPOSPLUSI,    /* 82 */
-  OP_NOTPOSQUERYI,   /* 83 */
-  OP_NOTPOSUPTOI,    /* 84 */
-
-  /* Character types */
-
-  OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
-  OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
-  OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
-  OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
-  OP_TYPEQUERY,      /* 89 */
-  OP_TYPEMINQUERY,   /* 90 */
-
-  OP_TYPEUPTO,       /* 91 From 0 to n matches */
-  OP_TYPEMINUPTO,    /* 92 */
-  OP_TYPEEXACT,      /* 93 Exactly n matches */
-
-  OP_TYPEPOSSTAR,    /* 94 Possessified versions */
-  OP_TYPEPOSPLUS,    /* 95 */
-  OP_TYPEPOSQUERY,   /* 96 */
-  OP_TYPEPOSUPTO,    /* 97 */
-
-  /* These are used for character classes and back references; only the
-  first six are the same as the sets above. */
-
-  OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
-  OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
-  OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
-  OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
-  OP_CRQUERY,        /* 102 */
-  OP_CRMINQUERY,     /* 103 */
-
-  OP_CRRANGE,        /* 104 These are different to the three sets above. */
-  OP_CRMINRANGE,     /* 105 */
-
-  OP_CRPOSSTAR,      /* 106 Possessified versions */
-  OP_CRPOSPLUS,      /* 107 */
-  OP_CRPOSQUERY,     /* 108 */
-  OP_CRPOSRANGE,     /* 109 */
-
-  /* End of quantifier opcodes */
-
-  OP_CLASS,          /* 110 Match a character class, chars < 256 only */
-  OP_NCLASS,         /* 111 Same, but the bitmap was created from a negative
-                              class - the difference is relevant only when a
-                              character > 255 is encountered. */
-  OP_XCLASS,         /* 112 Extended class for handling > 255 chars within the
-                              class. This does both positive and negative. */
-  OP_REF,            /* 113 Match a back reference, casefully */
-  OP_REFI,           /* 114 Match a back reference, caselessly */
-  OP_DNREF,          /* 115 Match a duplicate name backref, casefully */
-  OP_DNREFI,         /* 116 Match a duplicate name backref, caselessly */
-  OP_RECURSE,        /* 117 Match a numbered subpattern (possibly recursive) */
-  OP_CALLOUT,        /* 118 Call out to external function if provided */
-
-  OP_ALT,            /* 119 Start of alternation */
-  OP_KET,            /* 120 End of group that doesn't have an unbounded repeat */
-  OP_KETRMAX,        /* 121 These two must remain together and in this */
-  OP_KETRMIN,        /* 122 order. They are for groups the repeat for ever. */
-  OP_KETRPOS,        /* 123 Possessive unlimited repeat. */
-
-  /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
-  asserts must remain in order. */
-
-  OP_REVERSE,        /* 124 Move pointer back - used in lookbehind assertions */
-  OP_ASSERT,         /* 125 Positive lookahead */
-  OP_ASSERT_NOT,     /* 126 Negative lookahead */
-  OP_ASSERTBACK,     /* 127 Positive lookbehind */
-  OP_ASSERTBACK_NOT, /* 128 Negative lookbehind */
-
-  /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
-  after the assertions, with ONCE first, as there's a test for >= ONCE for a
-  subpattern that isn't an assertion. The POS versions must immediately follow
-  the non-POS versions in each case. */
-
-  OP_ONCE,           /* 129 Atomic group, contains captures */
-  OP_ONCE_NC,        /* 130 Atomic group containing no captures */
-  OP_BRA,            /* 131 Start of non-capturing bracket */
-  OP_BRAPOS,         /* 132 Ditto, with unlimited, possessive repeat */
-  OP_CBRA,           /* 133 Start of capturing bracket */
-  OP_CBRAPOS,        /* 134 Ditto, with unlimited, possessive repeat */
-  OP_COND,           /* 135 Conditional group */
-
-  /* These five must follow the previous five, in the same order. There's a
-  check for >= SBRA to distinguish the two sets. */
-
-  OP_SBRA,           /* 136 Start of non-capturing bracket, check empty  */
-  OP_SBRAPOS,        /* 137 Ditto, with unlimited, possessive repeat */
-  OP_SCBRA,          /* 138 Start of capturing bracket, check empty */
-  OP_SCBRAPOS,       /* 139 Ditto, with unlimited, possessive repeat */
-  OP_SCOND,          /* 140 Conditional group, check empty */
-
-  /* The next two pairs must (respectively) be kept together. */
-
-  OP_CREF,           /* 141 Used to hold a capture number as condition */
-  OP_DNCREF,         /* 142 Used to point to duplicate names as a condition */
-  OP_RREF,           /* 143 Used to hold a recursion number as condition */
-  OP_DNRREF,         /* 144 Used to point to duplicate names as a condition */
-  OP_DEF,            /* 145 The DEFINE condition */
-
-  OP_BRAZERO,        /* 146 These two must remain together and in this */
-  OP_BRAMINZERO,     /* 147 order. */
-  OP_BRAPOSZERO,     /* 148 */
-
-  /* These are backtracking control verbs */
-
-  OP_MARK,           /* 149 always has an argument */
-  OP_PRUNE,          /* 150 */
-  OP_PRUNE_ARG,      /* 151 same, but with argument */
-  OP_SKIP,           /* 152 */
-  OP_SKIP_ARG,       /* 153 same, but with argument */
-  OP_THEN,           /* 154 */
-  OP_THEN_ARG,       /* 155 same, but with argument */
-  OP_COMMIT,         /* 156 */
-
-  /* These are forced failure and success verbs */
-
-  OP_FAIL,           /* 157 */
-  OP_ACCEPT,         /* 158 */
-  OP_ASSERT_ACCEPT,  /* 159 Used inside assertions */
-  OP_CLOSE,          /* 160 Used before OP_ACCEPT to close open captures */
-
-  /* This is used to skip a subpattern with a {0} quantifier */
-
-  OP_SKIPZERO,       /* 161 */
-
-  /* This is not an opcode, but is used to check that tables indexed by opcode
-  are the correct length, in order to catch updating errors - there have been
-  some in the past. */
-
-  OP_TABLE_LENGTH
-};
-
-/* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
-definitions that follow must also be updated to match. There are also tables
-called "opcode_possessify" in pcre_compile.c and "coptable" and "poptable" in
-pcre_dfa_exec.c that must be updated. */
-
-
-/* This macro defines textual names for all the opcodes. These are used only
-for debugging, and some of them are only partial names. The macro is referenced
-only in pcre_printint.c, which fills out the full names in many cases (and in
-some cases doesn't actually use these names at all). */
-
-#define OP_NAME_LIST \
-  "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
-  "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
-  "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
-  "extuni",  "\\Z", "\\z",                                        \
-  "$", "$", "^", "^", "char", "chari", "not", "noti",             \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
-  "*+","++", "?+", "{",                                           \
-  "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
-  "Recurse", "Callout",                                           \
-  "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
-  "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
-  "Once", "Once_NC",                                              \
-  "Bra", "BraPos", "CBra", "CBraPos",                             \
-  "Cond",                                                         \
-  "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
-  "SCond",                                                        \
-  "Cond ref", "Cond dnref", "Cond rec", "Cond dnrec", "Cond def", \
-  "Brazero", "Braminzero", "Braposzero",                          \
-  "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
-  "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
-  "*ACCEPT", "*ASSERT_ACCEPT",                                    \
-  "Close", "Skip zero"
-
-
-/* This macro defines the length of fixed length operations in the compiled
-regex. The lengths are used when searching for specific things, and also in the
-debugging printing of a compiled regex. We use a macro so that it can be
-defined close to the definitions of the opcodes themselves.
-
-As things have been extended, some of these are no longer fixed lenths, but are
-minima instead. For example, the length of a single-character repeat may vary
-in UTF-8 mode. The code that uses this table must know about such things. */
-
-#define OP_LENGTHS \
-  1,                             /* End                                    */ \
-  1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
-  1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
-  1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
-  3, 3,                          /* \P, \p                                 */ \
-  1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
-  1,                             /* \X                                     */ \
-  1, 1, 1, 1, 1, 1,              /* \Z, \z, $, $M ^, ^M                    */ \
-  2,                             /* Char  - the minimum length             */ \
-  2,                             /* Chari  - the minimum length            */ \
-  2,                             /* not                                    */ \
-  2,                             /* noti                                   */ \
-  /* Positive single-char repeats                             ** These are */ \
-  2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
-  2+IMM2_SIZE,                   /* exact                                  */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
-  2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
-  2+IMM2_SIZE,                   /* exact I                                */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
-  /* Negative single-char repeats - only for chars < 256                   */ \
-  2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
-  2+IMM2_SIZE,                   /* NOT exact                              */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
-  2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
-  2+IMM2_SIZE,                   /* NOT exact I                            */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
-  /* Positive type repeats                                                 */ \
-  2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
-  2+IMM2_SIZE,                   /* Type exact                             */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
-  /* Character class & ref repeats                                         */ \
-  1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
-  1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
-  1, 1, 1, 1+2*IMM2_SIZE,        /* Possessive *+, ++, ?+, CRPOSRANGE      */ \
-  1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
-  1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
-  0,                             /* XCLASS - variable length               */ \
-  1+IMM2_SIZE,                   /* REF                                    */ \
-  1+IMM2_SIZE,                   /* REFI                                   */ \
-  1+2*IMM2_SIZE,                 /* DNREF                                  */ \
-  1+2*IMM2_SIZE,                 /* DNREFI                                 */ \
-  1+LINK_SIZE,                   /* RECURSE                                */ \
-  2+2*LINK_SIZE,                 /* CALLOUT                                */ \
-  1+LINK_SIZE,                   /* Alt                                    */ \
-  1+LINK_SIZE,                   /* Ket                                    */ \
-  1+LINK_SIZE,                   /* KetRmax                                */ \
-  1+LINK_SIZE,                   /* KetRmin                                */ \
-  1+LINK_SIZE,                   /* KetRpos                                */ \
-  1+LINK_SIZE,                   /* Reverse                                */ \
-  1+LINK_SIZE,                   /* Assert                                 */ \
-  1+LINK_SIZE,                   /* Assert not                             */ \
-  1+LINK_SIZE,                   /* Assert behind                          */ \
-  1+LINK_SIZE,                   /* Assert behind not                      */ \
-  1+LINK_SIZE,                   /* ONCE                                   */ \
-  1+LINK_SIZE,                   /* ONCE_NC                                */ \
-  1+LINK_SIZE,                   /* BRA                                    */ \
-  1+LINK_SIZE,                   /* BRAPOS                                 */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
-  1+LINK_SIZE,                   /* COND                                   */ \
-  1+LINK_SIZE,                   /* SBRA                                   */ \
-  1+LINK_SIZE,                   /* SBRAPOS                                */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
-  1+LINK_SIZE,                   /* SCOND                                  */ \
-  1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* CREF, DNCREF                           */ \
-  1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* RREF, DNRREF                           */ \
-  1,                             /* DEF                                    */ \
-  1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
-  3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
-  1, 3,                          /* SKIP, SKIP_ARG                         */ \
-  1, 3,                          /* THEN, THEN_ARG                         */ \
-  1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
-  1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
-
-/* A magic value for OP_RREF to indicate the "any recursion" condition. */
-
-#define RREF_ANY  0xffff
-
-/* Compile time error code numbers. They are given names so that they can more
-easily be tracked. When a new number is added, the table called eint in
-pcreposix.c must be updated. */
-
-enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
-       ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
-       ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
-       ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
-       ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
-       ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
-       ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
-       ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79,
-       ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT };
-
-/* JIT compiling modes. The function list is indexed by them. */
-
-enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
-       JIT_NUMBER_OF_COMPILE_MODES };
-
-/* The real format of the start of the pcre block; the index of names and the
-code vector run on as long as necessary after the end. We store an explicit
-offset to the name table so that if a regex is compiled on one host, saved, and
-then run on another where the size of pointers is different, all might still
-be well.
-
-The size of the structure must be a multiple of 8 bytes. For the case of
-compiled-on-4 and run-on-8, we include an extra pointer that is always NULL so
-that there are an even number of pointers which therefore are a multiple of 8
-bytes.
-
-It is necessary to fork the struct for the 32 bit library, since it needs to
-use pcre_uint32 for first_char and req_char. We can't put an ifdef inside the
-typedef because pcretest needs access to the struct of the 8-, 16- and 32-bit
-variants.
-
-*** WARNING ***
-When new fields are added to these structures, remember to adjust the code in
-pcre_byte_order.c that is concerned with swapping the byte order of the fields
-when a compiled regex is reloaded on a host with different endianness.
-*** WARNING ***
-There is also similar byte-flipping code in pcretest.c, which is used for
-testing the byte-flipping features. It must also be kept in step.
-*** WARNING ***
-*/
-
-typedef struct real_pcre8_or_16 {
-  pcre_uint32 magic_number;
-  pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 options;            /* Public options */
-  pcre_uint32 flags;              /* Private flags */
-  pcre_uint32 limit_match;        /* Limit set from regex */
-  pcre_uint32 limit_recursion;    /* Limit set from regex */
-  pcre_uint16 first_char;         /* Starting character */
-  pcre_uint16 req_char;           /* This character must be seen */
-  pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
-  pcre_uint16 top_bracket;        /* Highest numbered group */
-  pcre_uint16 top_backref;        /* Highest numbered back reference */
-  pcre_uint16 name_table_offset;  /* Offset to name table that follows */
-  pcre_uint16 name_entry_size;    /* Size of any name items */
-  pcre_uint16 name_count;         /* Number of name items */
-  pcre_uint16 ref_count;          /* Reference count */
-  pcre_uint16 dummy1;             /* To ensure size is a multiple of 8 */
-  pcre_uint16 dummy2;             /* To ensure size is a multiple of 8 */
-  pcre_uint16 dummy3;             /* To ensure size is a multiple of 8 */
-  const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
-  void             *nullpad;      /* NULL padding */
-} real_pcre8_or_16;
-
-typedef struct real_pcre8_or_16 real_pcre;
-typedef struct real_pcre8_or_16 real_pcre16;
-
-typedef struct real_pcre32 {
-  pcre_uint32 magic_number;
-  pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 options;            /* Public options */
-  pcre_uint32 flags;              /* Private flags */
-  pcre_uint32 limit_match;        /* Limit set from regex */
-  pcre_uint32 limit_recursion;    /* Limit set from regex */
-  pcre_uint32 first_char;         /* Starting character */
-  pcre_uint32 req_char;           /* This character must be seen */
-  pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
-  pcre_uint16 top_bracket;        /* Highest numbered group */
-  pcre_uint16 top_backref;        /* Highest numbered back reference */
-  pcre_uint16 name_table_offset;  /* Offset to name table that follows */
-  pcre_uint16 name_entry_size;    /* Size of any name items */
-  pcre_uint16 name_count;         /* Number of name items */
-  pcre_uint16 ref_count;          /* Reference count */
-  pcre_uint16 dummy;              /* To ensure size is a multiple of 8 */
-  const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
-  void             *nullpad;      /* NULL padding */
-} real_pcre32;
-
-#if defined COMPILE_PCRE8
-#define REAL_PCRE real_pcre
-#elif defined COMPILE_PCRE16
-#define REAL_PCRE real_pcre16
-#elif defined COMPILE_PCRE32
-#define REAL_PCRE real_pcre32
-#endif
-
-/* Assert that the size of REAL_PCRE is divisible by 8 */
-typedef int __assert_real_pcre_size_divisible_8[(sizeof(REAL_PCRE) % 8) == 0 ? 1 : -1];
-
-/* Needed in pcretest to access some fields in the real_pcre* structures
- * directly. They're unified for 8/16/32 bits since the structs only differ
- * after these fields; if that ever changes, need to fork those defines into
- * 8/16 and 32 bit versions. */
-#define REAL_PCRE_MAGIC(re)     (((REAL_PCRE*)re)->magic_number)
-#define REAL_PCRE_SIZE(re)      (((REAL_PCRE*)re)->size)
-#define REAL_PCRE_OPTIONS(re)   (((REAL_PCRE*)re)->options)
-#define REAL_PCRE_FLAGS(re)     (((REAL_PCRE*)re)->flags)
-
-/* The format of the block used to store data from pcre_study(). The same
-remark (see NOTE above) about extending this structure applies. */
-
-typedef struct pcre_study_data {
-  pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 flags;              /* Private flags */
-  pcre_uint8 start_bits[32];      /* Starting char bits */
-  pcre_uint32 minlength;          /* Minimum subject length */
-} pcre_study_data;
-
-/* Structure for building a chain of open capturing subpatterns during
-compiling, so that instructions to close them can be compiled when (*ACCEPT) is
-encountered. This is also used to identify subpatterns that contain recursive
-back references to themselves, so that they can be made atomic. */
-
-typedef struct open_capitem {
-  struct open_capitem *next;    /* Chain link */
-  pcre_uint16 number;           /* Capture number */
-  pcre_uint16 flag;             /* Set TRUE if recursive back ref */
-} open_capitem;
-
-/* Structure for building a list of named groups during the first pass of
-compiling. */
-
-typedef struct named_group {
-  const pcre_uchar  *name;          /* Points to the name in the pattern */
-  int                length;        /* Length of the name */
-  pcre_uint32        number;        /* Group number */
-} named_group;
-
-/* Structure for passing "static" information around between the functions
-doing the compiling, so that they are thread-safe. */
-
-typedef struct compile_data {
-  const pcre_uint8 *lcc;            /* Points to lower casing table */
-  const pcre_uint8 *fcc;            /* Points to case-flipping table */
-  const pcre_uint8 *cbits;          /* Points to character type table */
-  const pcre_uint8 *ctypes;         /* Points to table of type maps */
-  const pcre_uchar *start_workspace;/* The start of working space */
-  const pcre_uchar *start_code;     /* The start of the compiled code */
-  const pcre_uchar *start_pattern;  /* The start of the pattern */
-  const pcre_uchar *end_pattern;    /* The end of the pattern */
-  pcre_uchar *hwm;                  /* High watermark of workspace */
-  open_capitem *open_caps;          /* Chain of open capture items */
-  named_group *named_groups;        /* Points to vector in pre-compile */
-  pcre_uchar *name_table;           /* The name/number table */
-  int  names_found;                 /* Number of entries so far */
-  int  name_entry_size;             /* Size of each entry */
-  int  named_group_list_size;       /* Number of entries in the list */
-  int  workspace_size;              /* Size of workspace */
-  unsigned int bracount;            /* Count of capturing parens as we compile */
-  int  final_bracount;              /* Saved value after first pass */
-  int  max_lookbehind;              /* Maximum lookbehind (characters) */
-  int  top_backref;                 /* Maximum back reference */
-  unsigned int backref_map;         /* Bitmap of low back refs */
-  unsigned int namedrefcount;       /* Number of backreferences by name */
-  int  parens_depth;                /* Depth of nested parentheses */
-  int  assert_depth;                /* Depth of nested assertions */
-  pcre_uint32 external_options;     /* External (initial) options */
-  pcre_uint32 external_flags;       /* External flag bits to be set */
-  int  req_varyopt;                 /* "After variable item" flag for reqbyte */
-  BOOL had_accept;                  /* (*ACCEPT) encountered */
-  BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
-  BOOL check_lookbehind;            /* Lookbehinds need later checking */
-  BOOL dupnames;                    /* Duplicate names exist */
-  BOOL dupgroups;                   /* Duplicate groups exist: (?| found */
-  BOOL iscondassert;                /* Next assert is a condition */
-  int  nltype;                      /* Newline type */
-  int  nllen;                       /* Newline string length */
-  pcre_uchar nl[4];                 /* Newline string when fixed length */
-} compile_data;
-
-/* Structure for maintaining a chain of pointers to the currently incomplete
-branches, for testing for left recursion while compiling. */
-
-typedef struct branch_chain {
-  struct branch_chain *outer;
-  pcre_uchar *current_branch;
-} branch_chain;
-
-/* Structure for mutual recursion detection. */
-
-typedef struct recurse_check {
-  struct recurse_check *prev;
-  const pcre_uchar *group;
-} recurse_check;
-
-/* Structure for items in a linked list that represents an explicit recursive
-call within the pattern; used by pcre_exec(). */
-
-typedef struct recursion_info {
-  struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
-  unsigned int group_num;         /* Number of group that was called */
-  int *offset_save;               /* Pointer to start of saved offsets */
-  int saved_max;                  /* Number of saved offsets */
-  int saved_capture_last;         /* Last capture number */
-  PCRE_PUCHAR subject_position;   /* Position at start of recursion */
-} recursion_info;
-
-/* A similar structure for pcre_dfa_exec(). */
-
-typedef struct dfa_recursion_info {
-  struct dfa_recursion_info *prevrec;
-  int group_num;
-  PCRE_PUCHAR subject_position;
-} dfa_recursion_info;
-
-/* Structure for building a chain of data for holding the values of the subject
-pointer at the start of each subpattern, so as to detect when an empty string
-has been matched by a subpattern - to break infinite loops; used by
-pcre_exec(). */
-
-typedef struct eptrblock {
-  struct eptrblock *epb_prev;
-  PCRE_PUCHAR epb_saved_eptr;
-} eptrblock;
-
-
-/* Structure for passing "static" information around between the functions
-doing traditional NFA matching, so that they are thread-safe. */
-
-typedef struct match_data {
-  unsigned long int match_call_count;      /* As it says */
-  unsigned long int match_limit;           /* As it says */
-  unsigned long int match_limit_recursion; /* As it says */
-  int   *offset_vector;           /* Offset vector */
-  int    offset_end;              /* One past the end */
-  int    offset_max;              /* The maximum usable for return data */
-  int    nltype;                  /* Newline type */
-  int    nllen;                   /* Newline string length */
-  int    name_count;              /* Number of names in name table */
-  int    name_entry_size;         /* Size of entry in names table */
-  unsigned int skip_arg_count;    /* For counting SKIP_ARGs */
-  unsigned int ignore_skip_arg;   /* For re-run when SKIP arg name not found */
-  pcre_uchar *name_table;         /* Table of names */
-  pcre_uchar nl[4];               /* Newline string when fixed */
-  const  pcre_uint8 *lcc;         /* Points to lower casing table */
-  const  pcre_uint8 *fcc;         /* Points to case-flipping table */
-  const  pcre_uint8 *ctypes;      /* Points to table of type maps */
-  BOOL   notbol;                  /* NOTBOL flag */
-  BOOL   noteol;                  /* NOTEOL flag */
-  BOOL   utf;                     /* UTF-8 / UTF-16 flag */
-  BOOL   jscript_compat;          /* JAVASCRIPT_COMPAT flag */
-  BOOL   use_ucp;                 /* PCRE_UCP flag */
-  BOOL   endonly;                 /* Dollar not before final \n */
-  BOOL   notempty;                /* Empty string match not wanted */
-  BOOL   notempty_atstart;        /* Empty string match at start not wanted */
-  BOOL   hitend;                  /* Hit the end of the subject at some point */
-  BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
-  BOOL   hasthen;                 /* Pattern contains (*THEN) */
-  const  pcre_uchar *start_code;  /* For use when recursing */
-  PCRE_PUCHAR start_subject;      /* Start of the subject string */
-  PCRE_PUCHAR end_subject;        /* End of the subject string */
-  PCRE_PUCHAR start_match_ptr;    /* Start of matched string */
-  PCRE_PUCHAR end_match_ptr;      /* Subject position at end match */
-  PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
-  int    partial;                 /* PARTIAL options */
-  int    end_offset_top;          /* Highwater mark at end of match */
-  pcre_int32 capture_last;        /* Most recent capture number + overflow flag */
-  int    start_offset;            /* The start offset value */
-  int    match_function_type;     /* Set for certain special calls of MATCH() */
-  eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
-  int    eptrn;                   /* Next free eptrblock */
-  recursion_info *recursive;      /* Linked list of recursion data */
-  void  *callout_data;            /* To pass back to callouts */
-  const  pcre_uchar *mark;        /* Mark pointer to pass back on success */
-  const  pcre_uchar *nomatch_mark;/* Mark pointer to pass back on failure */
-  const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
-#ifdef NO_RECURSE
-  void  *match_frames_base;       /* For remembering malloc'd frames */
-#endif
-} match_data;
-
-/* A similar structure is used for the same purpose by the DFA matching
-functions. */
-
-typedef struct dfa_match_data {
-  const pcre_uchar *start_code;     /* Start of the compiled pattern */
-  const pcre_uchar *start_subject ; /* Start of the subject string */
-  const pcre_uchar *end_subject;    /* End of subject string */
-  const pcre_uchar *start_used_ptr; /* Earliest consulted character */
-  const pcre_uint8 *tables;         /* Character tables */
-  int   start_offset;               /* The start offset value */
-  int   moptions;                   /* Match options */
-  int   poptions;                   /* Pattern options */
-  int   nltype;                     /* Newline type */
-  int   nllen;                      /* Newline string length */
-  pcre_uchar nl[4];                 /* Newline string when fixed */
-  void *callout_data;               /* To pass back to callouts */
-  dfa_recursion_info *recursive;    /* Linked list of recursion data */
-} dfa_match_data;
-
-/* Bit definitions for entries in the pcre_ctypes table. */
-
-#define ctype_space   0x01
-#define ctype_letter  0x02
-#define ctype_digit   0x04
-#define ctype_xdigit  0x08
-#define ctype_word    0x10   /* alphanumeric or '_' */
-#define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */
-
-/* Offsets for the bitmap tables in pcre_cbits. Each table contains a set
-of bits for a class map. Some classes are built by combining these tables. */
-
-#define cbit_space     0      /* [:space:] or \s */
-#define cbit_xdigit   32      /* [:xdigit:] */
-#define cbit_digit    64      /* [:digit:] or \d */
-#define cbit_upper    96      /* [:upper:] */
-#define cbit_lower   128      /* [:lower:] */
-#define cbit_word    160      /* [:word:] or \w */
-#define cbit_graph   192      /* [:graph:] */
-#define cbit_print   224      /* [:print:] */
-#define cbit_punct   256      /* [:punct:] */
-#define cbit_cntrl   288      /* [:cntrl:] */
-#define cbit_length  320      /* Length of the cbits table */
-
-/* Offsets of the various tables from the base tables pointer, and
-total length. */
-
-#define lcc_offset      0
-#define fcc_offset    256
-#define cbits_offset  512
-#define ctypes_offset (cbits_offset + cbit_length)
-#define tables_length (ctypes_offset + 256)
-
-/* Internal function and data prefixes. */
-
-#if defined COMPILE_PCRE8
-#ifndef PUBL
-#define PUBL(name) pcre_##name
-#endif
-#ifndef PRIV
-#define PRIV(name) _pcre_##name
-#endif
-#elif defined COMPILE_PCRE16
-#ifndef PUBL
-#define PUBL(name) pcre16_##name
-#endif
-#ifndef PRIV
-#define PRIV(name) _pcre16_##name
-#endif
-#elif defined COMPILE_PCRE32
-#ifndef PUBL
-#define PUBL(name) pcre32_##name
-#endif
-#ifndef PRIV
-#define PRIV(name) _pcre32_##name
-#endif
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-/* Layout of the UCP type table that translates property names into types and
-codes. Each entry used to point directly to a name, but to reduce the number of
-relocations in shared libraries, it now has an offset into a single string
-instead. */
-
-typedef struct {
-  pcre_uint16 name_offset;
-  pcre_uint16 type;
-  pcre_uint16 value;
-} ucp_type_table;
-
-
-/* Internal shared data tables. These are tables that are used by more than one
-of the exported public functions. They have to be "external" in the C sense,
-but are not part of the PCRE public API. The data for these tables is in the
-pcre_tables.c module. */
-
-#ifdef COMPILE_PCRE8
-extern const int            PRIV(utf8_table1)[];
-extern const int            PRIV(utf8_table1_size);
-extern const int            PRIV(utf8_table2)[];
-extern const int            PRIV(utf8_table3)[];
-extern const pcre_uint8     PRIV(utf8_table4)[];
-#endif /* COMPILE_PCRE8 */
-
-extern const char           PRIV(utt_names)[];
-extern const ucp_type_table PRIV(utt)[];
-extern const int            PRIV(utt_size);
-
-extern const pcre_uint8     PRIV(OP_lengths)[];
-extern const pcre_uint8     PRIV(default_tables)[];
-
-extern const pcre_uint32    PRIV(hspace_list)[];
-extern const pcre_uint32    PRIV(vspace_list)[];
-
-
-/* Internal shared functions. These are functions that are used by more than
-one of the exported public functions. They have to be "external" in the C
-sense, but are not part of the PCRE public API. */
-
-/* String comparison functions. */
-#if defined COMPILE_PCRE8
-
-#define STRCMP_UC_UC(str1, str2) \
-  strcmp((char *)(str1), (char *)(str2))
-#define STRCMP_UC_C8(str1, str2) \
-  strcmp((char *)(str1), (str2))
-#define STRNCMP_UC_UC(str1, str2, num) \
-  strncmp((char *)(str1), (char *)(str2), (num))
-#define STRNCMP_UC_C8(str1, str2, num) \
-  strncmp((char *)(str1), (str2), (num))
-#define STRLEN_UC(str) strlen((const char *)str)
-
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-
-extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
-                           const pcre_uchar *);
-extern int               PRIV(strcmp_uc_c8)(const pcre_uchar *,
-                           const char *);
-extern int               PRIV(strncmp_uc_uc)(const pcre_uchar *,
-                           const pcre_uchar *, unsigned int num);
-extern int               PRIV(strncmp_uc_c8)(const pcre_uchar *,
-                           const char *, unsigned int num);
-extern unsigned int      PRIV(strlen_uc)(const pcre_uchar *str);
-
-#define STRCMP_UC_UC(str1, str2) \
-  PRIV(strcmp_uc_uc)((str1), (str2))
-#define STRCMP_UC_C8(str1, str2) \
-  PRIV(strcmp_uc_c8)((str1), (str2))
-#define STRNCMP_UC_UC(str1, str2, num) \
-  PRIV(strncmp_uc_uc)((str1), (str2), (num))
-#define STRNCMP_UC_C8(str1, str2, num) \
-  PRIV(strncmp_uc_c8)((str1), (str2), (num))
-#define STRLEN_UC(str) PRIV(strlen_uc)(str)
-
-#endif /* COMPILE_PCRE[8|16|32] */
-
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-
-#define STRCMP_UC_UC_TEST(str1, str2) STRCMP_UC_UC(str1, str2)
-#define STRCMP_UC_C8_TEST(str1, str2) STRCMP_UC_C8(str1, str2)
-
-#elif defined COMPILE_PCRE32
-
-extern int               PRIV(strcmp_uc_uc_utf)(const pcre_uchar *,
-                           const pcre_uchar *);
-extern int               PRIV(strcmp_uc_c8_utf)(const pcre_uchar *,
-                           const char *);
-
-#define STRCMP_UC_UC_TEST(str1, str2) \
-  (utf ? PRIV(strcmp_uc_uc_utf)((str1), (str2)) : PRIV(strcmp_uc_uc)((str1), (str2)))
-#define STRCMP_UC_C8_TEST(str1, str2) \
-  (utf ? PRIV(strcmp_uc_c8_utf)((str1), (str2)) : PRIV(strcmp_uc_c8)((str1), (str2)))
-
-#endif /* COMPILE_PCRE[8|16|32] */
-
-extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
-extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
-                           int *, BOOL);
-extern unsigned int      PRIV(ord2utf)(pcre_uint32, pcre_uchar *);
-extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);
-extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
-                           int *, BOOL);
-extern BOOL              PRIV(xclass)(pcre_uint32, const pcre_uchar *, BOOL);
-
-#ifdef SUPPORT_JIT
-extern void              PRIV(jit_compile)(const REAL_PCRE *,
-                           PUBL(extra) *, int);
-extern int               PRIV(jit_exec)(const PUBL(extra) *,
-                           const pcre_uchar *, int, int, int, int *, int);
-extern void              PRIV(jit_free)(void *);
-extern int               PRIV(jit_get_size)(void *);
-extern const char*       PRIV(jit_get_target)(void);
-#endif
-
-/* Unicode character database (UCD) */
-
-typedef struct {
-  pcre_uint8 script;     /* ucp_Arabic, etc. */
-  pcre_uint8 chartype;   /* ucp_Cc, etc. (general categories) */
-  pcre_uint8 gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
-  pcre_uint8 caseset;    /* offset to multichar other cases or zero */
-  pcre_int32 other_case; /* offset to other case, or zero if none */
-} ucd_record;
-
-extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
-extern const ucd_record  PRIV(ucd_records)[];
-extern const pcre_uint8  PRIV(ucd_stage1)[];
-extern const pcre_uint16 PRIV(ucd_stage2)[];
-extern const pcre_uint32 PRIV(ucp_gentype)[];
-extern const pcre_uint32 PRIV(ucp_gbtable)[];
-#ifdef SUPPORT_JIT
-extern const int         PRIV(ucp_typerange)[];
-#endif
-
-#ifdef SUPPORT_UCP
-/* UCD access macros */
-
-#define UCD_BLOCK_SIZE 128
-#define GET_UCD(ch) (PRIV(ucd_records) + \
-        PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
-        UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
-
-#define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
-#define UCD_SCRIPT(ch)      GET_UCD(ch)->script
-#define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
-#define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
-#define UCD_CASESET(ch)     GET_UCD(ch)->caseset
-#define UCD_OTHERCASE(ch)   ((pcre_uint32)((int)ch + (int)(GET_UCD(ch)->other_case)))
-
-#endif /* SUPPORT_UCP */
-
-#endif
-
-/* End of pcre_internal.h */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_jit_compile.c r-base-3.3.1/src/extra/pcre/pcre_jit_compile.c
--- r-base-3.2.3/src/extra/pcre/pcre_jit_compile.c	2015-11-26 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_jit_compile.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10733 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
-  The machine code generator part (this module) was written by Zoltan Herczeg
-                      Copyright (c) 2010-2013
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-#if defined SUPPORT_JIT
-
-/* All-in-one: Since we use the JIT compiler only from here,
-we just include it. This way we don't need to touch the build
-system files. */
-
-#define SLJIT_MALLOC(size, allocator_data) (PUBL(malloc))(size)
-#define SLJIT_FREE(ptr, allocator_data) (PUBL(free))(ptr)
-#define SLJIT_CONFIG_AUTO 1
-#define SLJIT_CONFIG_STATIC 1
-#define SLJIT_VERBOSE 0
-#define SLJIT_DEBUG 0
-
-#include "sljit/sljitLir.c"
-
-#if defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED
-#error Unsupported architecture
-#endif
-
-/* Defines for debugging purposes. */
-
-/* 1 - Use unoptimized capturing brackets.
-   2 - Enable capture_last_ptr (includes option 1). */
-/* #define DEBUG_FORCE_UNOPTIMIZED_CBRAS 2 */
-
-/* 1 - Always have a control head. */
-/* #define DEBUG_FORCE_CONTROL_HEAD 1 */
-
-/* Allocate memory for the regex stack on the real machine stack.
-Fast, but limited size. */
-#define MACHINE_STACK_SIZE 32768
-
-/* Growth rate for stack allocated by the OS. Should be the multiply
-of page size. */
-#define STACK_GROWTH_RATE 8192
-
-/* Enable to check that the allocation could destroy temporaries. */
-#if defined SLJIT_DEBUG && SLJIT_DEBUG
-#define DESTROY_REGISTERS 1
-#endif
-
-/*
-Short summary about the backtracking mechanism empolyed by the jit code generator:
-
-The code generator follows the recursive nature of the PERL compatible regular
-expressions. The basic blocks of regular expressions are condition checkers
-whose execute different commands depending on the result of the condition check.
-The relationship between the operators can be horizontal (concatenation) and
-vertical (sub-expression) (See struct backtrack_common for more details).
-
-  'ab' - 'a' and 'b' regexps are concatenated
-  'a+' - 'a' is the sub-expression of the '+' operator
-
-The condition checkers are boolean (true/false) checkers. Machine code is generated
-for the checker itself and for the actions depending on the result of the checker.
-The 'true' case is called as the matching path (expected path), and the other is called as
-the 'backtrack' path. Branch instructions are expesive for all CPUs, so we avoid taken
-branches on the matching path.
-
- Greedy star operator (*) :
-   Matching path: match happens.
-   Backtrack path: match failed.
- Non-greedy star operator (*?) :
-   Matching path: no need to perform a match.
-   Backtrack path: match is required.
-
-The following example shows how the code generated for a capturing bracket
-with two alternatives. Let A, B, C, D are arbirary regular expressions, and
-we have the following regular expression:
-
-   A(B|C)D
-
-The generated code will be the following:
-
- A matching path
- '(' matching path (pushing arguments to the stack)
- B matching path
- ')' matching path (pushing arguments to the stack)
- D matching path
- return with successful match
-
- D backtrack path
- ')' backtrack path (If we arrived from "C" jump to the backtrack of "C")
- B backtrack path
- C expected path
- jump to D matching path
- C backtrack path
- A backtrack path
-
- Notice, that the order of backtrack code paths are the opposite of the fast
- code paths. In this way the topmost value on the stack is always belong
- to the current backtrack code path. The backtrack path must check
- whether there is a next alternative. If so, it needs to jump back to
- the matching path eventually. Otherwise it needs to clear out its own stack
- frame and continue the execution on the backtrack code paths.
-*/
-
-/*
-Saved stack frames:
-
-Atomic blocks and asserts require reloading the values of private data
-when the backtrack mechanism performed. Because of OP_RECURSE, the data
-are not necessarly known in compile time, thus we need a dynamic restore
-mechanism.
-
-The stack frames are stored in a chain list, and have the following format:
-([ capturing bracket offset ][ start value ][ end value ])+ ... [ 0 ] [ previous head ]
-
-Thus we can restore the private data to a particular point in the stack.
-*/
-
-typedef struct jit_arguments {
-  /* Pointers first. */
-  struct sljit_stack *stack;
-  const pcre_uchar *str;
-  const pcre_uchar *begin;
-  const pcre_uchar *end;
-  int *offsets;
-  pcre_uchar *uchar_ptr;
-  pcre_uchar *mark_ptr;
-  void *callout_data;
-  /* Everything else after. */
-  pcre_uint32 limit_match;
-  int real_offset_count;
-  int offset_count;
-  pcre_uint8 notbol;
-  pcre_uint8 noteol;
-  pcre_uint8 notempty;
-  pcre_uint8 notempty_atstart;
-} jit_arguments;
-
-typedef struct executable_functions {
-  void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];
-  void *read_only_data_heads[JIT_NUMBER_OF_COMPILE_MODES];
-  sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];
-  PUBL(jit_callback) callback;
-  void *userdata;
-  pcre_uint32 top_bracket;
-  pcre_uint32 limit_match;
-} executable_functions;
-
-typedef struct jump_list {
-  struct sljit_jump *jump;
-  struct jump_list *next;
-} jump_list;
-
-typedef struct stub_list {
-  struct sljit_jump *start;
-  struct sljit_label *quit;
-  struct stub_list *next;
-} stub_list;
-
-typedef struct label_addr_list {
-  struct sljit_label *label;
-  sljit_uw *update_addr;
-  struct label_addr_list *next;
-} label_addr_list;
-
-enum frame_types {
-  no_frame = -1,
-  no_stack = -2
-};
-
-enum control_types {
-  type_mark = 0,
-  type_then_trap = 1
-};
-
-typedef int (SLJIT_CALL *jit_function)(jit_arguments *args);
-
-/* The following structure is the key data type for the recursive
-code generator. It is allocated by compile_matchingpath, and contains
-the arguments for compile_backtrackingpath. Must be the first member
-of its descendants. */
-typedef struct backtrack_common {
-  /* Concatenation stack. */
-  struct backtrack_common *prev;
-  jump_list *nextbacktracks;
-  /* Internal stack (for component operators). */
-  struct backtrack_common *top;
-  jump_list *topbacktracks;
-  /* Opcode pointer. */
-  pcre_uchar *cc;
-} backtrack_common;
-
-typedef struct assert_backtrack {
-  backtrack_common common;
-  jump_list *condfailed;
-  /* Less than 0 if a frame is not needed. */
-  int framesize;
-  /* Points to our private memory word on the stack. */
-  int private_data_ptr;
-  /* For iterators. */
-  struct sljit_label *matchingpath;
-} assert_backtrack;
-
-typedef struct bracket_backtrack {
-  backtrack_common common;
-  /* Where to coninue if an alternative is successfully matched. */
-  struct sljit_label *alternative_matchingpath;
-  /* For rmin and rmax iterators. */
-  struct sljit_label *recursive_matchingpath;
-  /* For greedy ? operator. */
-  struct sljit_label *zero_matchingpath;
-  /* Contains the branches of a failed condition. */
-  union {
-    /* Both for OP_COND, OP_SCOND. */
-    jump_list *condfailed;
-    assert_backtrack *assert;
-    /* For OP_ONCE. Less than 0 if not needed. */
-    int framesize;
-  } u;
-  /* Points to our private memory word on the stack. */
-  int private_data_ptr;
-} bracket_backtrack;
-
-typedef struct bracketpos_backtrack {
-  backtrack_common common;
-  /* Points to our private memory word on the stack. */
-  int private_data_ptr;
-  /* Reverting stack is needed. */
-  int framesize;
-  /* Allocated stack size. */
-  int stacksize;
-} bracketpos_backtrack;
-
-typedef struct braminzero_backtrack {
-  backtrack_common common;
-  struct sljit_label *matchingpath;
-} braminzero_backtrack;
-
-typedef struct iterator_backtrack {
-  backtrack_common common;
-  /* Next iteration. */
-  struct sljit_label *matchingpath;
-} iterator_backtrack;
-
-typedef struct recurse_entry {
-  struct recurse_entry *next;
-  /* Contains the function entry. */
-  struct sljit_label *entry;
-  /* Collects the calls until the function is not created. */
-  jump_list *calls;
-  /* Points to the starting opcode. */
-  sljit_sw start;
-} recurse_entry;
-
-typedef struct recurse_backtrack {
-  backtrack_common common;
-  BOOL inlined_pattern;
-} recurse_backtrack;
-
-#define OP_THEN_TRAP OP_TABLE_LENGTH
-
-typedef struct then_trap_backtrack {
-  backtrack_common common;
-  /* If then_trap is not NULL, this structure contains the real
-  then_trap for the backtracking path. */
-  struct then_trap_backtrack *then_trap;
-  /* Points to the starting opcode. */
-  sljit_sw start;
-  /* Exit point for the then opcodes of this alternative. */
-  jump_list *quit;
-  /* Frame size of the current alternative. */
-  int framesize;
-} then_trap_backtrack;
-
-#define MAX_RANGE_SIZE 4
-
-typedef struct compiler_common {
-  /* The sljit ceneric compiler. */
-  struct sljit_compiler *compiler;
-  /* First byte code. */
-  pcre_uchar *start;
-  /* Maps private data offset to each opcode. */
-  sljit_si *private_data_ptrs;
-  /* Chain list of read-only data ptrs. */
-  void *read_only_data_head;
-  /* Tells whether the capturing bracket is optimized. */
-  pcre_uint8 *optimized_cbracket;
-  /* Tells whether the starting offset is a target of then. */
-  pcre_uint8 *then_offsets;
-  /* Current position where a THEN must jump. */
-  then_trap_backtrack *then_trap;
-  /* Starting offset of private data for capturing brackets. */
-  int cbra_ptr;
-  /* Output vector starting point. Must be divisible by 2. */
-  int ovector_start;
-  /* Last known position of the requested byte. */
-  int req_char_ptr;
-  /* Head of the last recursion. */
-  int recursive_head_ptr;
-  /* First inspected character for partial matching. */
-  int start_used_ptr;
-  /* Starting pointer for partial soft matches. */
-  int hit_start;
-  /* End pointer of the first line. */
-  int first_line_end;
-  /* Points to the marked string. */
-  int mark_ptr;
-  /* Recursive control verb management chain. */
-  int control_head_ptr;
-  /* Points to the last matched capture block index. */
-  int capture_last_ptr;
-  /* Points to the starting position of the current match. */
-  int start_ptr;
-
-  /* Flipped and lower case tables. */
-  const pcre_uint8 *fcc;
-  sljit_sw lcc;
-  /* Mode can be PCRE_STUDY_JIT_COMPILE and others. */
-  int mode;
-  /* TRUE, when minlength is greater than 0. */
-  BOOL might_be_empty;
-  /* \K is found in the pattern. */
-  BOOL has_set_som;
-  /* (*SKIP:arg) is found in the pattern. */
-  BOOL has_skip_arg;
-  /* (*THEN) is found in the pattern. */
-  BOOL has_then;
-  /* Needs to know the start position anytime. */
-  BOOL needs_start_ptr;
-  /* Currently in recurse or negative assert. */
-  BOOL local_exit;
-  /* Currently in a positive assert. */
-  BOOL positive_assert;
-  /* Newline control. */
-  int nltype;
-  pcre_uint32 nlmax;
-  pcre_uint32 nlmin;
-  int newline;
-  int bsr_nltype;
-  pcre_uint32 bsr_nlmax;
-  pcre_uint32 bsr_nlmin;
-  /* Dollar endonly. */
-  int endonly;
-  /* Tables. */
-  sljit_sw ctypes;
-  /* Named capturing brackets. */
-  pcre_uchar *name_table;
-  sljit_sw name_count;
-  sljit_sw name_entry_size;
-
-  /* Labels and jump lists. */
-  struct sljit_label *partialmatchlabel;
-  struct sljit_label *quit_label;
-  struct sljit_label *forced_quit_label;
-  struct sljit_label *accept_label;
-  struct sljit_label *ff_newline_shortcut;
-  stub_list *stubs;
-  label_addr_list *label_addrs;
-  recurse_entry *entries;
-  recurse_entry *currententry;
-  jump_list *partialmatch;
-  jump_list *quit;
-  jump_list *positive_assert_quit;
-  jump_list *forced_quit;
-  jump_list *accept;
-  jump_list *calllimit;
-  jump_list *stackalloc;
-  jump_list *revertframes;
-  jump_list *wordboundary;
-  jump_list *anynewline;
-  jump_list *hspace;
-  jump_list *vspace;
-  jump_list *casefulcmp;
-  jump_list *caselesscmp;
-  jump_list *reset_match;
-  BOOL jscript_compat;
-#ifdef SUPPORT_UTF
-  BOOL utf;
-#ifdef SUPPORT_UCP
-  BOOL use_ucp;
-#endif
-#ifdef COMPILE_PCRE8
-  jump_list *utfreadchar;
-  jump_list *utfreadchar16;
-  jump_list *utfreadtype8;
-#endif
-#endif /* SUPPORT_UTF */
-#ifdef SUPPORT_UCP
-  jump_list *getucd;
-#endif
-} compiler_common;
-
-/* For byte_sequence_compare. */
-
-typedef struct compare_context {
-  int length;
-  int sourcereg;
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  int ucharptr;
-  union {
-    sljit_si asint;
-    sljit_uh asushort;
-#if defined COMPILE_PCRE8
-    sljit_ub asbyte;
-    sljit_ub asuchars[4];
-#elif defined COMPILE_PCRE16
-    sljit_uh asuchars[2];
-#elif defined COMPILE_PCRE32
-    sljit_ui asuchars[1];
-#endif
-  } c;
-  union {
-    sljit_si asint;
-    sljit_uh asushort;
-#if defined COMPILE_PCRE8
-    sljit_ub asbyte;
-    sljit_ub asuchars[4];
-#elif defined COMPILE_PCRE16
-    sljit_uh asuchars[2];
-#elif defined COMPILE_PCRE32
-    sljit_ui asuchars[1];
-#endif
-  } oc;
-#endif
-} compare_context;
-
-/* Undefine sljit macros. */
-#undef CMP
-
-/* Used for accessing the elements of the stack. */
-#define STACK(i)      ((-(i) - 1) * (int)sizeof(sljit_sw))
-
-#define TMP1          SLJIT_R0
-#define TMP2          SLJIT_R2
-#define TMP3          SLJIT_R3
-#define STR_PTR       SLJIT_S0
-#define STR_END       SLJIT_S1
-#define STACK_TOP     SLJIT_R1
-#define STACK_LIMIT   SLJIT_S2
-#define COUNT_MATCH   SLJIT_S3
-#define ARGUMENTS     SLJIT_S4
-#define RETURN_ADDR   SLJIT_R4
-
-/* Local space layout. */
-/* These two locals can be used by the current opcode. */
-#define LOCALS0          (0 * sizeof(sljit_sw))
-#define LOCALS1          (1 * sizeof(sljit_sw))
-/* Two local variables for possessive quantifiers (char1 cannot use them). */
-#define POSSESSIVE0      (2 * sizeof(sljit_sw))
-#define POSSESSIVE1      (3 * sizeof(sljit_sw))
-/* Max limit of recursions. */
-#define LIMIT_MATCH      (4 * sizeof(sljit_sw))
-/* The output vector is stored on the stack, and contains pointers
-to characters. The vector data is divided into two groups: the first
-group contains the start / end character pointers, and the second is
-the start pointers when the end of the capturing group has not yet reached. */
-#define OVECTOR_START    (common->ovector_start)
-#define OVECTOR(i)       (OVECTOR_START + (i) * (sljit_sw)sizeof(sljit_sw))
-#define OVECTOR_PRIV(i)  (common->cbra_ptr + (i) * (sljit_sw)sizeof(sljit_sw))
-#define PRIVATE_DATA(cc) (common->private_data_ptrs[(cc) - common->start])
-
-#if defined COMPILE_PCRE8
-#define MOV_UCHAR  SLJIT_MOV_UB
-#define MOVU_UCHAR SLJIT_MOVU_UB
-#elif defined COMPILE_PCRE16
-#define MOV_UCHAR  SLJIT_MOV_UH
-#define MOVU_UCHAR SLJIT_MOVU_UH
-#elif defined COMPILE_PCRE32
-#define MOV_UCHAR  SLJIT_MOV_UI
-#define MOVU_UCHAR SLJIT_MOVU_UI
-#else
-#error Unsupported compiling mode
-#endif
-
-/* Shortcuts. */
-#define DEFINE_COMPILER \
-  struct sljit_compiler *compiler = common->compiler
-#define OP1(op, dst, dstw, src, srcw) \
-  sljit_emit_op1(compiler, (op), (dst), (dstw), (src), (srcw))
-#define OP2(op, dst, dstw, src1, src1w, src2, src2w) \
-  sljit_emit_op2(compiler, (op), (dst), (dstw), (src1), (src1w), (src2), (src2w))
-#define LABEL() \
-  sljit_emit_label(compiler)
-#define JUMP(type) \
-  sljit_emit_jump(compiler, (type))
-#define JUMPTO(type, label) \
-  sljit_set_label(sljit_emit_jump(compiler, (type)), (label))
-#define JUMPHERE(jump) \
-  sljit_set_label((jump), sljit_emit_label(compiler))
-#define SET_LABEL(jump, label) \
-  sljit_set_label((jump), (label))
-#define CMP(type, src1, src1w, src2, src2w) \
-  sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w))
-#define CMPTO(type, src1, src1w, src2, src2w, label) \
-  sljit_set_label(sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w)), (label))
-#define OP_FLAGS(op, dst, dstw, src, srcw, type) \
-  sljit_emit_op_flags(compiler, (op), (dst), (dstw), (src), (srcw), (type))
-#define GET_LOCAL_BASE(dst, dstw, offset) \
-  sljit_get_local_base(compiler, (dst), (dstw), (offset))
-
-#define READ_CHAR_MAX 0x7fffffff
-
-static pcre_uchar *bracketend(pcre_uchar *cc)
-{
-SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
-do cc += GET(cc, 1); while (*cc == OP_ALT);
-SLJIT_ASSERT(*cc >= OP_KET && *cc <= OP_KETRPOS);
-cc += 1 + LINK_SIZE;
-return cc;
-}
-
-static int no_alternatives(pcre_uchar *cc)
-{
-int count = 0;
-SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
-do
-  {
-  cc += GET(cc, 1);
-  count++;
-  }
-while (*cc == OP_ALT);
-SLJIT_ASSERT(*cc >= OP_KET && *cc <= OP_KETRPOS);
-return count;
-}
-
-static int ones_in_half_byte[16] = {
-  /* 0 */ 0, 1, 1, 2, /* 4 */ 1, 2, 2, 3,
-  /* 8 */ 1, 2, 2, 3, /* 12 */ 2, 3, 3, 4
-};
-
-/* Functions whose might need modification for all new supported opcodes:
- next_opcode
- check_opcode_types
- set_private_data_ptrs
- get_framesize
- init_frame
- get_private_data_copy_length
- copy_private_data
- compile_matchingpath
- compile_backtrackingpath
-*/
-
-static pcre_uchar *next_opcode(compiler_common *common, pcre_uchar *cc)
-{
-SLJIT_UNUSED_ARG(common);
-switch(*cc)
-  {
-  case OP_SOD:
-  case OP_SOM:
-  case OP_SET_SOM:
-  case OP_NOT_WORD_BOUNDARY:
-  case OP_WORD_BOUNDARY:
-  case OP_NOT_DIGIT:
-  case OP_DIGIT:
-  case OP_NOT_WHITESPACE:
-  case OP_WHITESPACE:
-  case OP_NOT_WORDCHAR:
-  case OP_WORDCHAR:
-  case OP_ANY:
-  case OP_ALLANY:
-  case OP_NOTPROP:
-  case OP_PROP:
-  case OP_ANYNL:
-  case OP_NOT_HSPACE:
-  case OP_HSPACE:
-  case OP_NOT_VSPACE:
-  case OP_VSPACE:
-  case OP_EXTUNI:
-  case OP_EODN:
-  case OP_EOD:
-  case OP_CIRC:
-  case OP_CIRCM:
-  case OP_DOLL:
-  case OP_DOLLM:
-  case OP_CRSTAR:
-  case OP_CRMINSTAR:
-  case OP_CRPLUS:
-  case OP_CRMINPLUS:
-  case OP_CRQUERY:
-  case OP_CRMINQUERY:
-  case OP_CRRANGE:
-  case OP_CRMINRANGE:
-  case OP_CRPOSSTAR:
-  case OP_CRPOSPLUS:
-  case OP_CRPOSQUERY:
-  case OP_CRPOSRANGE:
-  case OP_CLASS:
-  case OP_NCLASS:
-  case OP_REF:
-  case OP_REFI:
-  case OP_DNREF:
-  case OP_DNREFI:
-  case OP_RECURSE:
-  case OP_CALLOUT:
-  case OP_ALT:
-  case OP_KET:
-  case OP_KETRMAX:
-  case OP_KETRMIN:
-  case OP_KETRPOS:
-  case OP_REVERSE:
-  case OP_ASSERT:
-  case OP_ASSERT_NOT:
-  case OP_ASSERTBACK:
-  case OP_ASSERTBACK_NOT:
-  case OP_ONCE:
-  case OP_ONCE_NC:
-  case OP_BRA:
-  case OP_BRAPOS:
-  case OP_CBRA:
-  case OP_CBRAPOS:
-  case OP_COND:
-  case OP_SBRA:
-  case OP_SBRAPOS:
-  case OP_SCBRA:
-  case OP_SCBRAPOS:
-  case OP_SCOND:
-  case OP_CREF:
-  case OP_DNCREF:
-  case OP_RREF:
-  case OP_DNRREF:
-  case OP_DEF:
-  case OP_BRAZERO:
-  case OP_BRAMINZERO:
-  case OP_BRAPOSZERO:
-  case OP_PRUNE:
-  case OP_SKIP:
-  case OP_THEN:
-  case OP_COMMIT:
-  case OP_FAIL:
-  case OP_ACCEPT:
-  case OP_ASSERT_ACCEPT:
-  case OP_CLOSE:
-  case OP_SKIPZERO:
-  return cc + PRIV(OP_lengths)[*cc];
-
-  case OP_CHAR:
-  case OP_CHARI:
-  case OP_NOT:
-  case OP_NOTI:
-  case OP_STAR:
-  case OP_MINSTAR:
-  case OP_PLUS:
-  case OP_MINPLUS:
-  case OP_QUERY:
-  case OP_MINQUERY:
-  case OP_UPTO:
-  case OP_MINUPTO:
-  case OP_EXACT:
-  case OP_POSSTAR:
-  case OP_POSPLUS:
-  case OP_POSQUERY:
-  case OP_POSUPTO:
-  case OP_STARI:
-  case OP_MINSTARI:
-  case OP_PLUSI:
-  case OP_MINPLUSI:
-  case OP_QUERYI:
-  case OP_MINQUERYI:
-  case OP_UPTOI:
-  case OP_MINUPTOI:
-  case OP_EXACTI:
-  case OP_POSSTARI:
-  case OP_POSPLUSI:
-  case OP_POSQUERYI:
-  case OP_POSUPTOI:
-  case OP_NOTSTAR:
-  case OP_NOTMINSTAR:
-  case OP_NOTPLUS:
-  case OP_NOTMINPLUS:
-  case OP_NOTQUERY:
-  case OP_NOTMINQUERY:
-  case OP_NOTUPTO:
-  case OP_NOTMINUPTO:
-  case OP_NOTEXACT:
-  case OP_NOTPOSSTAR:
-  case OP_NOTPOSPLUS:
-  case OP_NOTPOSQUERY:
-  case OP_NOTPOSUPTO:
-  case OP_NOTSTARI:
-  case OP_NOTMINSTARI:
-  case OP_NOTPLUSI:
-  case OP_NOTMINPLUSI:
-  case OP_NOTQUERYI:
-  case OP_NOTMINQUERYI:
-  case OP_NOTUPTOI:
-  case OP_NOTMINUPTOI:
-  case OP_NOTEXACTI:
-  case OP_NOTPOSSTARI:
-  case OP_NOTPOSPLUSI:
-  case OP_NOTPOSQUERYI:
-  case OP_NOTPOSUPTOI:
-  cc += PRIV(OP_lengths)[*cc];
-#ifdef SUPPORT_UTF
-  if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-  return cc;
-
-  /* Special cases. */
-  case OP_TYPESTAR:
-  case OP_TYPEMINSTAR:
-  case OP_TYPEPLUS:
-  case OP_TYPEMINPLUS:
-  case OP_TYPEQUERY:
-  case OP_TYPEMINQUERY:
-  case OP_TYPEUPTO:
-  case OP_TYPEMINUPTO:
-  case OP_TYPEEXACT:
-  case OP_TYPEPOSSTAR:
-  case OP_TYPEPOSPLUS:
-  case OP_TYPEPOSQUERY:
-  case OP_TYPEPOSUPTO:
-  return cc + PRIV(OP_lengths)[*cc] - 1;
-
-  case OP_ANYBYTE:
-#ifdef SUPPORT_UTF
-  if (common->utf) return NULL;
-#endif
-  return cc + 1;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  case OP_XCLASS:
-  return cc + GET(cc, 1);
-#endif
-
-  case OP_MARK:
-  case OP_PRUNE_ARG:
-  case OP_SKIP_ARG:
-  case OP_THEN_ARG:
-  return cc + 1 + 2 + cc[1];
-
-  default:
-  /* All opcodes are supported now! */
-  SLJIT_ASSERT_STOP();
-  return NULL;
-  }
-}
-
-static BOOL check_opcode_types(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)
-{
-int count;
-pcre_uchar *slot;
-
-/* Calculate important variables (like stack size) and checks whether all opcodes are supported. */
-while (cc < ccend)
-  {
-  switch(*cc)
-    {
-    case OP_SET_SOM:
-    common->has_set_som = TRUE;
-    common->might_be_empty = TRUE;
-    cc += 1;
-    break;
-
-    case OP_REF:
-    case OP_REFI:
-    common->optimized_cbracket[GET2(cc, 1)] = 0;
-    cc += 1 + IMM2_SIZE;
-    break;
-
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] = 0;
-    cc += 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    case OP_COND:
-    case OP_SCOND:
-    /* Only AUTO_CALLOUT can insert this opcode. We do
-       not intend to support this case. */
-    if (cc[1 + LINK_SIZE] == OP_CALLOUT)
-      return FALSE;
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_CREF:
-    common->optimized_cbracket[GET2(cc, 1)] = 0;
-    cc += 1 + IMM2_SIZE;
-    break;
-
-    case OP_DNREF:
-    case OP_DNREFI:
-    case OP_DNCREF:
-    count = GET2(cc, 1 + IMM2_SIZE);
-    slot = common->name_table + GET2(cc, 1) * common->name_entry_size;
-    while (count-- > 0)
-      {
-      common->optimized_cbracket[GET2(slot, 0)] = 0;
-      slot += common->name_entry_size;
-      }
-    cc += 1 + 2 * IMM2_SIZE;
-    break;
-
-    case OP_RECURSE:
-    /* Set its value only once. */
-    if (common->recursive_head_ptr == 0)
-      {
-      common->recursive_head_ptr = common->ovector_start;
-      common->ovector_start += sizeof(sljit_sw);
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_CALLOUT:
-    if (common->capture_last_ptr == 0)
-      {
-      common->capture_last_ptr = common->ovector_start;
-      common->ovector_start += sizeof(sljit_sw);
-      }
-    cc += 2 + 2 * LINK_SIZE;
-    break;
-
-    case OP_THEN_ARG:
-    common->has_then = TRUE;
-    common->control_head_ptr = 1;
-    /* Fall through. */
-
-    case OP_PRUNE_ARG:
-    common->needs_start_ptr = TRUE;
-    /* Fall through. */
-
-    case OP_MARK:
-    if (common->mark_ptr == 0)
-      {
-      common->mark_ptr = common->ovector_start;
-      common->ovector_start += sizeof(sljit_sw);
-      }
-    cc += 1 + 2 + cc[1];
-    break;
-
-    case OP_THEN:
-    common->has_then = TRUE;
-    common->control_head_ptr = 1;
-    /* Fall through. */
-
-    case OP_PRUNE:
-    case OP_SKIP:
-    common->needs_start_ptr = TRUE;
-    cc += 1;
-    break;
-
-    case OP_SKIP_ARG:
-    common->control_head_ptr = 1;
-    common->has_skip_arg = TRUE;
-    cc += 1 + 2 + cc[1];
-    break;
-
-    default:
-    cc = next_opcode(common, cc);
-    if (cc == NULL)
-      return FALSE;
-    break;
-    }
-  }
-return TRUE;
-}
-
-static int get_class_iterator_size(pcre_uchar *cc)
-{
-switch(*cc)
-  {
-  case OP_CRSTAR:
-  case OP_CRPLUS:
-  return 2;
-
-  case OP_CRMINSTAR:
-  case OP_CRMINPLUS:
-  case OP_CRQUERY:
-  case OP_CRMINQUERY:
-  return 1;
-
-  case OP_CRRANGE:
-  case OP_CRMINRANGE:
-  if (GET2(cc, 1) == GET2(cc, 1 + IMM2_SIZE))
-    return 0;
-  return 2;
-
-  default:
-  return 0;
-  }
-}
-
-static BOOL detect_repeat(compiler_common *common, pcre_uchar *begin)
-{
-pcre_uchar *end = bracketend(begin);
-pcre_uchar *next;
-pcre_uchar *next_end;
-pcre_uchar *max_end;
-pcre_uchar type;
-sljit_sw length = end - begin;
-int min, max, i;
-
-/* Detect fixed iterations first. */
-if (end[-(1 + LINK_SIZE)] != OP_KET)
-  return FALSE;
-
-/* Already detected repeat. */
-if (common->private_data_ptrs[end - common->start - LINK_SIZE] != 0)
-  return TRUE;
-
-next = end;
-min = 1;
-while (1)
-  {
-  if (*next != *begin)
-    break;
-  next_end = bracketend(next);
-  if (next_end - next != length || memcmp(begin, next, IN_UCHARS(length)) != 0)
-    break;
-  next = next_end;
-  min++;
-  }
-
-if (min == 2)
-  return FALSE;
-
-max = 0;
-max_end = next;
-if (*next == OP_BRAZERO || *next == OP_BRAMINZERO)
-  {
-  type = *next;
-  while (1)
-    {
-    if (next[0] != type || next[1] != OP_BRA || next[2 + LINK_SIZE] != *begin)
-      break;
-    next_end = bracketend(next + 2 + LINK_SIZE);
-    if (next_end - next != (length + 2 + LINK_SIZE) || memcmp(begin, next + 2 + LINK_SIZE, IN_UCHARS(length)) != 0)
-      break;
-    next = next_end;
-    max++;
-    }
-
-  if (next[0] == type && next[1] == *begin && max >= 1)
-    {
-    next_end = bracketend(next + 1);
-    if (next_end - next == (length + 1) && memcmp(begin, next + 1, IN_UCHARS(length)) == 0)
-      {
-      for (i = 0; i < max; i++, next_end += 1 + LINK_SIZE)
-        if (*next_end != OP_KET)
-          break;
-
-      if (i == max)
-        {
-        common->private_data_ptrs[max_end - common->start - LINK_SIZE] = next_end - max_end;
-        common->private_data_ptrs[max_end - common->start - LINK_SIZE + 1] = (type == OP_BRAZERO) ? OP_UPTO : OP_MINUPTO;
-        /* +2 the original and the last. */
-        common->private_data_ptrs[max_end - common->start - LINK_SIZE + 2] = max + 2;
-        if (min == 1)
-          return TRUE;
-        min--;
-        max_end -= (1 + LINK_SIZE) + GET(max_end, -LINK_SIZE);
-        }
-      }
-    }
-  }
-
-if (min >= 3)
-  {
-  common->private_data_ptrs[end - common->start - LINK_SIZE] = max_end - end;
-  common->private_data_ptrs[end - common->start - LINK_SIZE + 1] = OP_EXACT;
-  common->private_data_ptrs[end - common->start - LINK_SIZE + 2] = min;
-  return TRUE;
-  }
-
-return FALSE;
-}
-
-#define CASE_ITERATOR_PRIVATE_DATA_1 \
-    case OP_MINSTAR: \
-    case OP_MINPLUS: \
-    case OP_QUERY: \
-    case OP_MINQUERY: \
-    case OP_MINSTARI: \
-    case OP_MINPLUSI: \
-    case OP_QUERYI: \
-    case OP_MINQUERYI: \
-    case OP_NOTMINSTAR: \
-    case OP_NOTMINPLUS: \
-    case OP_NOTQUERY: \
-    case OP_NOTMINQUERY: \
-    case OP_NOTMINSTARI: \
-    case OP_NOTMINPLUSI: \
-    case OP_NOTQUERYI: \
-    case OP_NOTMINQUERYI:
-
-#define CASE_ITERATOR_PRIVATE_DATA_2A \
-    case OP_STAR: \
-    case OP_PLUS: \
-    case OP_STARI: \
-    case OP_PLUSI: \
-    case OP_NOTSTAR: \
-    case OP_NOTPLUS: \
-    case OP_NOTSTARI: \
-    case OP_NOTPLUSI:
-
-#define CASE_ITERATOR_PRIVATE_DATA_2B \
-    case OP_UPTO: \
-    case OP_MINUPTO: \
-    case OP_UPTOI: \
-    case OP_MINUPTOI: \
-    case OP_NOTUPTO: \
-    case OP_NOTMINUPTO: \
-    case OP_NOTUPTOI: \
-    case OP_NOTMINUPTOI:
-
-#define CASE_ITERATOR_TYPE_PRIVATE_DATA_1 \
-    case OP_TYPEMINSTAR: \
-    case OP_TYPEMINPLUS: \
-    case OP_TYPEQUERY: \
-    case OP_TYPEMINQUERY:
-
-#define CASE_ITERATOR_TYPE_PRIVATE_DATA_2A \
-    case OP_TYPESTAR: \
-    case OP_TYPEPLUS:
-
-#define CASE_ITERATOR_TYPE_PRIVATE_DATA_2B \
-    case OP_TYPEUPTO: \
-    case OP_TYPEMINUPTO:
-
-static void set_private_data_ptrs(compiler_common *common, int *private_data_start, pcre_uchar *ccend)
-{
-pcre_uchar *cc = common->start;
-pcre_uchar *alternative;
-pcre_uchar *end = NULL;
-int private_data_ptr = *private_data_start;
-int space, size, bracketlen;
-BOOL repeat_check = TRUE;
-
-while (cc < ccend)
-  {
-  space = 0;
-  size = 0;
-  bracketlen = 0;
-  if (private_data_ptr > SLJIT_MAX_LOCAL_SIZE)
-    break;
-
-  if (repeat_check && (*cc == OP_ONCE || *cc == OP_ONCE_NC || *cc == OP_BRA || *cc == OP_CBRA || *cc == OP_COND))
-    {
-    if (detect_repeat(common, cc))
-      {
-      /* These brackets are converted to repeats, so no global
-      based single character repeat is allowed. */
-      if (cc >= end)
-        end = bracketend(cc);
-      }
-    }
-  repeat_check = TRUE;
-
-  switch(*cc)
-    {
-    case OP_KET:
-    if (common->private_data_ptrs[cc + 1 - common->start] != 0)
-      {
-      common->private_data_ptrs[cc - common->start] = private_data_ptr;
-      private_data_ptr += sizeof(sljit_sw);
-      cc += common->private_data_ptrs[cc + 1 - common->start];
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRAPOS:
-    case OP_SBRA:
-    case OP_SBRAPOS:
-    case OP_SCOND:
-    common->private_data_ptrs[cc - common->start] = private_data_ptr;
-    private_data_ptr += sizeof(sljit_sw);
-    bracketlen = 1 + LINK_SIZE;
-    break;
-
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    common->private_data_ptrs[cc - common->start] = private_data_ptr;
-    private_data_ptr += sizeof(sljit_sw);
-    bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    case OP_COND:
-    /* Might be a hidden SCOND. */
-    alternative = cc + GET(cc, 1);
-    if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
-      {
-      common->private_data_ptrs[cc - common->start] = private_data_ptr;
-      private_data_ptr += sizeof(sljit_sw);
-      }
-    bracketlen = 1 + LINK_SIZE;
-    break;
-
-    case OP_BRA:
-    bracketlen = 1 + LINK_SIZE;
-    break;
-
-    case OP_CBRA:
-    case OP_SCBRA:
-    bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    case OP_BRAZERO:
-    case OP_BRAMINZERO:
-    case OP_BRAPOSZERO:
-    repeat_check = FALSE;
-    size = 1;
-    break;
-
-    CASE_ITERATOR_PRIVATE_DATA_1
-    space = 1;
-    size = -2;
-    break;
-
-    CASE_ITERATOR_PRIVATE_DATA_2A
-    space = 2;
-    size = -2;
-    break;
-
-    CASE_ITERATOR_PRIVATE_DATA_2B
-    space = 2;
-    size = -(2 + IMM2_SIZE);
-    break;
-
-    CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-    space = 1;
-    size = 1;
-    break;
-
-    CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
-    if (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI)
-      space = 2;
-    size = 1;
-    break;
-
-    case OP_TYPEUPTO:
-    if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI)
-      space = 2;
-    size = 1 + IMM2_SIZE;
-    break;
-
-    case OP_TYPEMINUPTO:
-    space = 2;
-    size = 1 + IMM2_SIZE;
-    break;
-
-    case OP_CLASS:
-    case OP_NCLASS:
-    size += 1 + 32 / sizeof(pcre_uchar);
-    space = get_class_iterator_size(cc + size);
-    break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-    size = GET(cc, 1);
-    space = get_class_iterator_size(cc + size);
-    break;
-#endif
-
-    default:
-    cc = next_opcode(common, cc);
-    SLJIT_ASSERT(cc != NULL);
-    break;
-    }
-
-  /* Character iterators, which are not inside a repeated bracket,
-     gets a private slot instead of allocating it on the stack. */
-  if (space > 0 && cc >= end)
-    {
-    common->private_data_ptrs[cc - common->start] = private_data_ptr;
-    private_data_ptr += sizeof(sljit_sw) * space;
-    }
-
-  if (size != 0)
-    {
-    if (size < 0)
-      {
-      cc += -size;
-#ifdef SUPPORT_UTF
-      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-      }
-    else
-      cc += size;
-    }
-
-  if (bracketlen > 0)
-    {
-    if (cc >= end)
-      {
-      end = bracketend(cc);
-      if (end[-1 - LINK_SIZE] == OP_KET)
-        end = NULL;
-      }
-    cc += bracketlen;
-    }
-  }
-*private_data_start = private_data_ptr;
-}
-
-/* Returns with a frame_types (always < 0) if no need for frame. */
-static int get_framesize(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, BOOL recursive, BOOL *needs_control_head)
-{
-int length = 0;
-int possessive = 0;
-BOOL stack_restore = FALSE;
-BOOL setsom_found = recursive;
-BOOL setmark_found = recursive;
-/* The last capture is a local variable even for recursions. */
-BOOL capture_last_found = FALSE;
-
-#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
-SLJIT_ASSERT(common->control_head_ptr != 0);
-*needs_control_head = TRUE;
-#else
-*needs_control_head = FALSE;
-#endif
-
-if (ccend == NULL)
-  {
-  ccend = bracketend(cc) - (1 + LINK_SIZE);
-  if (!recursive && (*cc == OP_CBRAPOS || *cc == OP_SCBRAPOS))
-    {
-    possessive = length = (common->capture_last_ptr != 0) ? 5 : 3;
-    /* This is correct regardless of common->capture_last_ptr. */
-    capture_last_found = TRUE;
-    }
-  cc = next_opcode(common, cc);
-  }
-
-SLJIT_ASSERT(cc != NULL);
-while (cc < ccend)
-  switch(*cc)
-    {
-    case OP_SET_SOM:
-    SLJIT_ASSERT(common->has_set_som);
-    stack_restore = TRUE;
-    if (!setsom_found)
-      {
-      length += 2;
-      setsom_found = TRUE;
-      }
-    cc += 1;
-    break;
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_THEN_ARG:
-    SLJIT_ASSERT(common->mark_ptr != 0);
-    stack_restore = TRUE;
-    if (!setmark_found)
-      {
-      length += 2;
-      setmark_found = TRUE;
-      }
-    if (common->control_head_ptr != 0)
-      *needs_control_head = TRUE;
-    cc += 1 + 2 + cc[1];
-    break;
-
-    case OP_RECURSE:
-    stack_restore = TRUE;
-    if (common->has_set_som && !setsom_found)
-      {
-      length += 2;
-      setsom_found = TRUE;
-      }
-    if (common->mark_ptr != 0 && !setmark_found)
-      {
-      length += 2;
-      setmark_found = TRUE;
-      }
-    if (common->capture_last_ptr != 0 && !capture_last_found)
-      {
-      length += 2;
-      capture_last_found = TRUE;
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_CBRA:
-    case OP_CBRAPOS:
-    case OP_SCBRA:
-    case OP_SCBRAPOS:
-    stack_restore = TRUE;
-    if (common->capture_last_ptr != 0 && !capture_last_found)
-      {
-      length += 2;
-      capture_last_found = TRUE;
-      }
-    length += 3;
-    cc += 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    case OP_THEN:
-    stack_restore = TRUE;
-    if (common->control_head_ptr != 0)
-      *needs_control_head = TRUE;
-    cc ++;
-    break;
-
-    default:
-    stack_restore = TRUE;
-    /* Fall through. */
-
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-    case OP_ANYBYTE:
-    case OP_NOTPROP:
-    case OP_PROP:
-    case OP_ANYNL:
-    case OP_NOT_HSPACE:
-    case OP_HSPACE:
-    case OP_NOT_VSPACE:
-    case OP_VSPACE:
-    case OP_EXTUNI:
-    case OP_EODN:
-    case OP_EOD:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_DOLL:
-    case OP_DOLLM:
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-
-    case OP_EXACT:
-    case OP_POSSTAR:
-    case OP_POSPLUS:
-    case OP_POSQUERY:
-    case OP_POSUPTO:
-
-    case OP_EXACTI:
-    case OP_POSSTARI:
-    case OP_POSPLUSI:
-    case OP_POSQUERYI:
-    case OP_POSUPTOI:
-
-    case OP_NOTEXACT:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSUPTO:
-
-    case OP_NOTEXACTI:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSUPTOI:
-
-    case OP_TYPEEXACT:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    case OP_TYPEPOSUPTO:
-
-    case OP_CLASS:
-    case OP_NCLASS:
-    case OP_XCLASS:
-
-    cc = next_opcode(common, cc);
-    SLJIT_ASSERT(cc != NULL);
-    break;
-    }
-
-/* Possessive quantifiers can use a special case. */
-if (SLJIT_UNLIKELY(possessive == length))
-  return stack_restore ? no_frame : no_stack;
-
-if (length > 0)
-  return length + 1;
-return stack_restore ? no_frame : no_stack;
-}
-
-static void init_frame(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, int stackpos, int stacktop, BOOL recursive)
-{
-DEFINE_COMPILER;
-BOOL setsom_found = recursive;
-BOOL setmark_found = recursive;
-/* The last capture is a local variable even for recursions. */
-BOOL capture_last_found = FALSE;
-int offset;
-
-/* >= 1 + shortest item size (2) */
-SLJIT_UNUSED_ARG(stacktop);
-SLJIT_ASSERT(stackpos >= stacktop + 2);
-
-stackpos = STACK(stackpos);
-if (ccend == NULL)
-  {
-  ccend = bracketend(cc) - (1 + LINK_SIZE);
-  if (recursive || (*cc != OP_CBRAPOS && *cc != OP_SCBRAPOS))
-    cc = next_opcode(common, cc);
-  }
-
-SLJIT_ASSERT(cc != NULL);
-while (cc < ccend)
-  switch(*cc)
-    {
-    case OP_SET_SOM:
-    SLJIT_ASSERT(common->has_set_som);
-    if (!setsom_found)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -OVECTOR(0));
-      stackpos += (int)sizeof(sljit_sw);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-      stackpos += (int)sizeof(sljit_sw);
-      setsom_found = TRUE;
-      }
-    cc += 1;
-    break;
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_THEN_ARG:
-    SLJIT_ASSERT(common->mark_ptr != 0);
-    if (!setmark_found)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->mark_ptr);
-      stackpos += (int)sizeof(sljit_sw);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-      stackpos += (int)sizeof(sljit_sw);
-      setmark_found = TRUE;
-      }
-    cc += 1 + 2 + cc[1];
-    break;
-
-    case OP_RECURSE:
-    if (common->has_set_som && !setsom_found)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -OVECTOR(0));
-      stackpos += (int)sizeof(sljit_sw);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-      stackpos += (int)sizeof(sljit_sw);
-      setsom_found = TRUE;
-      }
-    if (common->mark_ptr != 0 && !setmark_found)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->mark_ptr);
-      stackpos += (int)sizeof(sljit_sw);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-      stackpos += (int)sizeof(sljit_sw);
-      setmark_found = TRUE;
-      }
-    if (common->capture_last_ptr != 0 && !capture_last_found)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->capture_last_ptr);
-      stackpos += (int)sizeof(sljit_sw);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-      stackpos += (int)sizeof(sljit_sw);
-      capture_last_found = TRUE;
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_CBRA:
-    case OP_CBRAPOS:
-    case OP_SCBRA:
-    case OP_SCBRAPOS:
-    if (common->capture_last_ptr != 0 && !capture_last_found)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->capture_last_ptr);
-      stackpos += (int)sizeof(sljit_sw);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-      stackpos += (int)sizeof(sljit_sw);
-      capture_last_found = TRUE;
-      }
-    offset = (GET2(cc, 1 + LINK_SIZE)) << 1;
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, OVECTOR(offset));
-    stackpos += (int)sizeof(sljit_sw);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-    stackpos += (int)sizeof(sljit_sw);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP2, 0);
-    stackpos += (int)sizeof(sljit_sw);
-
-    cc += 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    default:
-    cc = next_opcode(common, cc);
-    SLJIT_ASSERT(cc != NULL);
-    break;
-    }
-
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, 0);
-SLJIT_ASSERT(stackpos == STACK(stacktop));
-}
-
-static SLJIT_INLINE int get_private_data_copy_length(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, BOOL needs_control_head)
-{
-int private_data_length = needs_control_head ? 3 : 2;
-int size;
-pcre_uchar *alternative;
-/* Calculate the sum of the private machine words. */
-while (cc < ccend)
-  {
-  size = 0;
-  switch(*cc)
-    {
-    case OP_KET:
-    if (PRIVATE_DATA(cc) != 0)
-      {
-      private_data_length++;
-      SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
-      cc += PRIVATE_DATA(cc + 1);
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRAPOS:
-    case OP_SBRA:
-    case OP_SBRAPOS:
-    case OP_SCOND:
-    private_data_length++;
-    SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    case OP_CBRA:
-    case OP_SCBRA:
-    if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-      private_data_length++;
-    cc += 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    private_data_length += 2;
-    cc += 1 + LINK_SIZE + IMM2_SIZE;
-    break;
-
-    case OP_COND:
-    /* Might be a hidden SCOND. */
-    alternative = cc + GET(cc, 1);
-    if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
-      private_data_length++;
-    cc += 1 + LINK_SIZE;
-    break;
-
-    CASE_ITERATOR_PRIVATE_DATA_1
-    if (PRIVATE_DATA(cc))
-      private_data_length++;
-    cc += 2;
-#ifdef SUPPORT_UTF
-    if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    CASE_ITERATOR_PRIVATE_DATA_2A
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
-    cc += 2;
-#ifdef SUPPORT_UTF
-    if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    CASE_ITERATOR_PRIVATE_DATA_2B
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
-    cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
-    if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-    if (PRIVATE_DATA(cc))
-      private_data_length++;
-    cc += 1;
-    break;
-
-    CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
-    cc += 1;
-    break;
-
-    CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
-    cc += 1 + IMM2_SIZE;
-    break;
-
-    case OP_CLASS:
-    case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-    size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
-#else
-    size = 1 + 32 / (int)sizeof(pcre_uchar);
-#endif
-    if (PRIVATE_DATA(cc))
-      private_data_length += get_class_iterator_size(cc + size);
-    cc += size;
-    break;
-
-    default:
-    cc = next_opcode(common, cc);
-    SLJIT_ASSERT(cc != NULL);
-    break;
-    }
-  }
-SLJIT_ASSERT(cc == ccend);
-return private_data_length;
-}
-
-static void copy_private_data(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend,
-  BOOL save, int stackptr, int stacktop, BOOL needs_control_head)
-{
-DEFINE_COMPILER;
-int srcw[2];
-int count, size;
-BOOL tmp1next = TRUE;
-BOOL tmp1empty = TRUE;
-BOOL tmp2empty = TRUE;
-pcre_uchar *alternative;
-enum {
-  start,
-  loop,
-  end
-} status;
-
-status = save ? start : loop;
-stackptr = STACK(stackptr - 2);
-stacktop = STACK(stacktop - 1);
-
-if (!save)
-  {
-  stackptr += (needs_control_head ? 2 : 1) * sizeof(sljit_sw);
-  if (stackptr < stacktop)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-    stackptr += sizeof(sljit_sw);
-    tmp1empty = FALSE;
-    }
-  if (stackptr < stacktop)
-    {
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-    stackptr += sizeof(sljit_sw);
-    tmp2empty = FALSE;
-    }
-  /* The tmp1next must be TRUE in either way. */
-  }
-
-do
-  {
-  count = 0;
-  switch(status)
-    {
-    case start:
-    SLJIT_ASSERT(save && common->recursive_head_ptr != 0);
-    count = 1;
-    srcw[0] = common->recursive_head_ptr;
-    if (needs_control_head)
-      {
-      SLJIT_ASSERT(common->control_head_ptr != 0);
-      count = 2;
-      srcw[1] = common->control_head_ptr;
-      }
-    status = loop;
-    break;
-
-    case loop:
-    if (cc >= ccend)
-      {
-      status = end;
-      break;
-      }
-
-    switch(*cc)
-      {
-      case OP_KET:
-      if (PRIVATE_DATA(cc) != 0)
-        {
-        count = 1;
-        srcw[0] = PRIVATE_DATA(cc);
-        SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
-        cc += PRIVATE_DATA(cc + 1);
-        }
-      cc += 1 + LINK_SIZE;
-      break;
-
-      case OP_ASSERT:
-      case OP_ASSERT_NOT:
-      case OP_ASSERTBACK:
-      case OP_ASSERTBACK_NOT:
-      case OP_ONCE:
-      case OP_ONCE_NC:
-      case OP_BRAPOS:
-      case OP_SBRA:
-      case OP_SBRAPOS:
-      case OP_SCOND:
-      count = 1;
-      srcw[0] = PRIVATE_DATA(cc);
-      SLJIT_ASSERT(srcw[0] != 0);
-      cc += 1 + LINK_SIZE;
-      break;
-
-      case OP_CBRA:
-      case OP_SCBRA:
-      if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-        {
-        count = 1;
-        srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
-        }
-      cc += 1 + LINK_SIZE + IMM2_SIZE;
-      break;
-
-      case OP_CBRAPOS:
-      case OP_SCBRAPOS:
-      count = 2;
-      srcw[0] = PRIVATE_DATA(cc);
-      srcw[1] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
-      SLJIT_ASSERT(srcw[0] != 0 && srcw[1] != 0);
-      cc += 1 + LINK_SIZE + IMM2_SIZE;
-      break;
-
-      case OP_COND:
-      /* Might be a hidden SCOND. */
-      alternative = cc + GET(cc, 1);
-      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
-        {
-        count = 1;
-        srcw[0] = PRIVATE_DATA(cc);
-        SLJIT_ASSERT(srcw[0] != 0);
-        }
-      cc += 1 + LINK_SIZE;
-      break;
-
-      CASE_ITERATOR_PRIVATE_DATA_1
-      if (PRIVATE_DATA(cc))
-        {
-        count = 1;
-        srcw[0] = PRIVATE_DATA(cc);
-        }
-      cc += 2;
-#ifdef SUPPORT_UTF
-      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-      break;
-
-      CASE_ITERATOR_PRIVATE_DATA_2A
-      if (PRIVATE_DATA(cc))
-        {
-        count = 2;
-        srcw[0] = PRIVATE_DATA(cc);
-        srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
-        }
-      cc += 2;
-#ifdef SUPPORT_UTF
-      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-      break;
-
-      CASE_ITERATOR_PRIVATE_DATA_2B
-      if (PRIVATE_DATA(cc))
-        {
-        count = 2;
-        srcw[0] = PRIVATE_DATA(cc);
-        srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
-        }
-      cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
-      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-      break;
-
-      CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-      if (PRIVATE_DATA(cc))
-        {
-        count = 1;
-        srcw[0] = PRIVATE_DATA(cc);
-        }
-      cc += 1;
-      break;
-
-      CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
-      if (PRIVATE_DATA(cc))
-        {
-        count = 2;
-        srcw[0] = PRIVATE_DATA(cc);
-        srcw[1] = srcw[0] + sizeof(sljit_sw);
-        }
-      cc += 1;
-      break;
-
-      CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
-      if (PRIVATE_DATA(cc))
-        {
-        count = 2;
-        srcw[0] = PRIVATE_DATA(cc);
-        srcw[1] = srcw[0] + sizeof(sljit_sw);
-        }
-      cc += 1 + IMM2_SIZE;
-      break;
-
-      case OP_CLASS:
-      case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
-#else
-      size = 1 + 32 / (int)sizeof(pcre_uchar);
-#endif
-      if (PRIVATE_DATA(cc))
-        switch(get_class_iterator_size(cc + size))
-          {
-          case 1:
-          count = 1;
-          srcw[0] = PRIVATE_DATA(cc);
-          break;
-
-          case 2:
-          count = 2;
-          srcw[0] = PRIVATE_DATA(cc);
-          srcw[1] = srcw[0] + sizeof(sljit_sw);
-          break;
-
-          default:
-          SLJIT_ASSERT_STOP();
-          break;
-          }
-      cc += size;
-      break;
-
-      default:
-      cc = next_opcode(common, cc);
-      SLJIT_ASSERT(cc != NULL);
-      break;
-      }
-    break;
-
-    case end:
-    SLJIT_ASSERT_STOP();
-    break;
-    }
-
-  while (count > 0)
-    {
-    count--;
-    if (save)
-      {
-      if (tmp1next)
-        {
-        if (!tmp1empty)
-          {
-          OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-          stackptr += sizeof(sljit_sw);
-          }
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), srcw[count]);
-        tmp1empty = FALSE;
-        tmp1next = FALSE;
-        }
-      else
-        {
-        if (!tmp2empty)
-          {
-          OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-          stackptr += sizeof(sljit_sw);
-          }
-        OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), srcw[count]);
-        tmp2empty = FALSE;
-        tmp1next = TRUE;
-        }
-      }
-    else
-      {
-      if (tmp1next)
-        {
-        SLJIT_ASSERT(!tmp1empty);
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), srcw[count], TMP1, 0);
-        tmp1empty = stackptr >= stacktop;
-        if (!tmp1empty)
-          {
-          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-          stackptr += sizeof(sljit_sw);
-          }
-        tmp1next = FALSE;
-        }
-      else
-        {
-        SLJIT_ASSERT(!tmp2empty);
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), srcw[count], TMP2, 0);
-        tmp2empty = stackptr >= stacktop;
-        if (!tmp2empty)
-          {
-          OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-          stackptr += sizeof(sljit_sw);
-          }
-        tmp1next = TRUE;
-        }
-      }
-    }
-  }
-while (status != end);
-
-if (save)
-  {
-  if (tmp1next)
-    {
-    if (!tmp1empty)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-      stackptr += sizeof(sljit_sw);
-      }
-    if (!tmp2empty)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-      stackptr += sizeof(sljit_sw);
-      }
-    }
-  else
-    {
-    if (!tmp2empty)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-      stackptr += sizeof(sljit_sw);
-      }
-    if (!tmp1empty)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-      stackptr += sizeof(sljit_sw);
-      }
-    }
-  }
-SLJIT_ASSERT(cc == ccend && stackptr == stacktop && (save || (tmp1empty && tmp2empty)));
-}
-
-static SLJIT_INLINE pcre_uchar *set_then_offsets(compiler_common *common, pcre_uchar *cc, pcre_uint8 *current_offset)
-{
-pcre_uchar *end = bracketend(cc);
-BOOL has_alternatives = cc[GET(cc, 1)] == OP_ALT;
-
-/* Assert captures then. */
-if (*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT)
-  current_offset = NULL;
-/* Conditional block does not. */
-if (*cc == OP_COND || *cc == OP_SCOND)
-  has_alternatives = FALSE;
-
-cc = next_opcode(common, cc);
-if (has_alternatives)
-  current_offset = common->then_offsets + (cc - common->start);
-
-while (cc < end)
-  {
-  if ((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND))
-    cc = set_then_offsets(common, cc, current_offset);
-  else
-    {
-    if (*cc == OP_ALT && has_alternatives)
-      current_offset = common->then_offsets + (cc + 1 + LINK_SIZE - common->start);
-    if (*cc >= OP_THEN && *cc <= OP_THEN_ARG && current_offset != NULL)
-      *current_offset = 1;
-    cc = next_opcode(common, cc);
-    }
-  }
-
-return end;
-}
-
-#undef CASE_ITERATOR_PRIVATE_DATA_1
-#undef CASE_ITERATOR_PRIVATE_DATA_2A
-#undef CASE_ITERATOR_PRIVATE_DATA_2B
-#undef CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-#undef CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
-#undef CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
-
-static SLJIT_INLINE BOOL is_powerof2(unsigned int value)
-{
-return (value & (value - 1)) == 0;
-}
-
-static SLJIT_INLINE void set_jumps(jump_list *list, struct sljit_label *label)
-{
-while (list)
-  {
-  /* sljit_set_label is clever enough to do nothing
-  if either the jump or the label is NULL. */
-  SET_LABEL(list->jump, label);
-  list = list->next;
-  }
-}
-
-static SLJIT_INLINE void add_jump(struct sljit_compiler *compiler, jump_list **list, struct sljit_jump *jump)
-{
-jump_list *list_item = sljit_alloc_memory(compiler, sizeof(jump_list));
-if (list_item)
-  {
-  list_item->next = *list;
-  list_item->jump = jump;
-  *list = list_item;
-  }
-}
-
-static void add_stub(compiler_common *common, struct sljit_jump *start)
-{
-DEFINE_COMPILER;
-stub_list *list_item = sljit_alloc_memory(compiler, sizeof(stub_list));
-
-if (list_item)
-  {
-  list_item->start = start;
-  list_item->quit = LABEL();
-  list_item->next = common->stubs;
-  common->stubs = list_item;
-  }
-}
-
-static void flush_stubs(compiler_common *common)
-{
-DEFINE_COMPILER;
-stub_list *list_item = common->stubs;
-
-while (list_item)
-  {
-  JUMPHERE(list_item->start);
-  add_jump(compiler, &common->stackalloc, JUMP(SLJIT_FAST_CALL));
-  JUMPTO(SLJIT_JUMP, list_item->quit);
-  list_item = list_item->next;
-  }
-common->stubs = NULL;
-}
-
-static void add_label_addr(compiler_common *common, sljit_uw *update_addr)
-{
-DEFINE_COMPILER;
-label_addr_list *label_addr;
-
-label_addr = sljit_alloc_memory(compiler, sizeof(label_addr_list));
-if (label_addr == NULL)
-  return;
-label_addr->label = LABEL();
-label_addr->update_addr = update_addr;
-label_addr->next = common->label_addrs;
-common->label_addrs = label_addr;
-}
-
-static SLJIT_INLINE void count_match(compiler_common *common)
-{
-DEFINE_COMPILER;
-
-OP2(SLJIT_SUB | SLJIT_SET_E, COUNT_MATCH, 0, COUNT_MATCH, 0, SLJIT_IMM, 1);
-add_jump(compiler, &common->calllimit, JUMP(SLJIT_ZERO));
-}
-
-static SLJIT_INLINE void allocate_stack(compiler_common *common, int size)
-{
-/* May destroy all locals and registers except TMP2. */
-DEFINE_COMPILER;
-
-OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * sizeof(sljit_sw));
-#ifdef DESTROY_REGISTERS
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 12345);
-OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
-OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, TMP1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP1, 0);
-#endif
-add_stub(common, CMP(SLJIT_GREATER, STACK_TOP, 0, STACK_LIMIT, 0));
-}
-
-static SLJIT_INLINE void free_stack(compiler_common *common, int size)
-{
-DEFINE_COMPILER;
-OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * sizeof(sljit_sw));
-}
-
-static sljit_uw * allocate_read_only_data(compiler_common *common, sljit_uw size)
-{
-DEFINE_COMPILER;
-sljit_uw *result;
-
-if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-  return NULL;
-
-result = (sljit_uw *)SLJIT_MALLOC(size + sizeof(sljit_uw), compiler->allocator_data);
-if (SLJIT_UNLIKELY(result == NULL))
-  {
-  sljit_set_compiler_memory_error(compiler);
-  return NULL;
-  }
-
-*(void**)result = common->read_only_data_head;
-common->read_only_data_head = (void *)result;
-return result + 1;
-}
-
-static void free_read_only_data(void *current, void *allocator_data)
-{
-void *next;
-
-SLJIT_UNUSED_ARG(allocator_data);
-
-while (current != NULL)
-  {
-  next = *(void**)current;
-  SLJIT_FREE(current, allocator_data);
-  current = next;
-  }
-}
-
-static SLJIT_INLINE void reset_ovector(compiler_common *common, int length)
-{
-DEFINE_COMPILER;
-struct sljit_label *loop;
-int i;
-
-/* At this point we can freely use all temporary registers. */
-SLJIT_ASSERT(length > 1);
-/* TMP1 returns with begin - 1. */
-OP2(SLJIT_SUB, SLJIT_R0, 0, SLJIT_MEM1(SLJIT_S0), SLJIT_OFFSETOF(jit_arguments, begin), SLJIT_IMM, IN_UCHARS(1));
-if (length < 8)
-  {
-  for (i = 1; i < length; i++)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(i), SLJIT_R0, 0);
-  }
-else
-  {
-  GET_LOCAL_BASE(SLJIT_R1, 0, OVECTOR_START);
-  OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_IMM, length - 1);
-  loop = LABEL();
-  OP1(SLJIT_MOVU, SLJIT_MEM1(SLJIT_R1), sizeof(sljit_sw), SLJIT_R0, 0);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, loop);
-  }
-}
-
-static SLJIT_INLINE void do_reset_match(compiler_common *common, int length)
-{
-DEFINE_COMPILER;
-struct sljit_label *loop;
-int i;
-
-SLJIT_ASSERT(length > 1);
-/* OVECTOR(1) contains the "string begin - 1" constant. */
-if (length > 2)
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1));
-if (length < 8)
-  {
-  for (i = 2; i < length; i++)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(i), TMP1, 0);
-  }
-else
-  {
-  GET_LOCAL_BASE(TMP2, 0, OVECTOR_START + sizeof(sljit_sw));
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, length - 2);
-  loop = LABEL();
-  OP1(SLJIT_MOVU, SLJIT_MEM1(TMP2), sizeof(sljit_sw), TMP1, 0);
-  OP2(SLJIT_SUB | SLJIT_SET_E, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, loop);
-  }
-
-OP1(SLJIT_MOV, STACK_TOP, 0, ARGUMENTS, 0);
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, SLJIT_IMM, 0);
-if (common->control_head_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(jit_arguments, stack));
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(struct sljit_stack, base));
-}
-
-static sljit_sw SLJIT_CALL do_search_mark(sljit_sw *current, const pcre_uchar *skip_arg)
-{
-while (current != NULL)
-  {
-  switch (current[-2])
-    {
-    case type_then_trap:
-    break;
-
-    case type_mark:
-    if (STRCMP_UC_UC(skip_arg, (pcre_uchar *)current[-3]) == 0)
-      return current[-4];
-    break;
-
-    default:
-    SLJIT_ASSERT_STOP();
-    break;
-    }
-  SLJIT_ASSERT(current > (sljit_sw*)current[-1]);
-  current = (sljit_sw*)current[-1];
-  }
-return -1;
-}
-
-static SLJIT_INLINE void copy_ovector(compiler_common *common, int topbracket)
-{
-DEFINE_COMPILER;
-struct sljit_label *loop;
-struct sljit_jump *early_quit;
-
-/* At this point we can freely use all registers. */
-OP1(SLJIT_MOV, SLJIT_S2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1));
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(1), STR_PTR, 0);
-
-OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-OP1(SLJIT_MOV_SI, SLJIT_R1, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, offset_count));
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_R2, 0);
-OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, offsets), SLJIT_IMM, sizeof(int));
-OP1(SLJIT_MOV, SLJIT_R0, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, begin));
-GET_LOCAL_BASE(SLJIT_S0, 0, OVECTOR_START);
-/* Unlikely, but possible */
-early_quit = CMP(SLJIT_EQUAL, SLJIT_R1, 0, SLJIT_IMM, 0);
-loop = LABEL();
-OP2(SLJIT_SUB, SLJIT_S1, 0, SLJIT_MEM1(SLJIT_S0), 0, SLJIT_R0, 0);
-OP2(SLJIT_ADD, SLJIT_S0, 0, SLJIT_S0, 0, SLJIT_IMM, sizeof(sljit_sw));
-/* Copy the integer value to the output buffer */
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-OP2(SLJIT_ASHR, SLJIT_S1, 0, SLJIT_S1, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-OP1(SLJIT_MOVU_SI, SLJIT_MEM1(SLJIT_R2), sizeof(int), SLJIT_S1, 0);
-OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, 1);
-JUMPTO(SLJIT_NOT_ZERO, loop);
-JUMPHERE(early_quit);
-
-/* Calculate the return value, which is the maximum ovector value. */
-if (topbracket > 1)
-  {
-  GET_LOCAL_BASE(SLJIT_R0, 0, OVECTOR_START + topbracket * 2 * sizeof(sljit_sw));
-  OP1(SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, topbracket + 1);
-
-  /* OVECTOR(0) is never equal to SLJIT_S2. */
-  loop = LABEL();
-  OP1(SLJIT_MOVU, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_R0), -(2 * (sljit_sw)sizeof(sljit_sw)));
-  OP2(SLJIT_SUB, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, 1);
-  CMPTO(SLJIT_EQUAL, SLJIT_R2, 0, SLJIT_S2, 0, loop);
-  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_R1, 0);
-  }
-else
-  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);
-}
-
-static SLJIT_INLINE void return_with_partial_match(compiler_common *common, struct sljit_label *quit)
-{
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-SLJIT_COMPILE_ASSERT(STR_END == SLJIT_S1, str_end_must_be_saved_reg2);
-SLJIT_ASSERT(common->start_used_ptr != 0 && common->start_ptr != 0
-  && (common->mode == JIT_PARTIAL_SOFT_COMPILE ? common->hit_start != 0 : common->hit_start == 0));
-
-OP1(SLJIT_MOV, SLJIT_R1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_PARTIAL);
-OP1(SLJIT_MOV_SI, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, real_offset_count));
-CMPTO(SLJIT_SIG_LESS, SLJIT_R2, 0, SLJIT_IMM, 2, quit);
-
-/* Store match begin and end. */
-OP1(SLJIT_MOV, SLJIT_S0, 0, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, begin));
-OP1(SLJIT_MOV, SLJIT_R1, 0, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, offsets));
-
-jump = CMP(SLJIT_SIG_LESS, SLJIT_R2, 0, SLJIT_IMM, 3);
-OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_ptr : (common->hit_start + (int)sizeof(sljit_sw)), SLJIT_S0, 0);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-OP2(SLJIT_ASHR, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_R1), 2 * sizeof(int), SLJIT_R2, 0);
-JUMPHERE(jump);
-
-OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_used_ptr : common->hit_start);
-OP2(SLJIT_SUB, SLJIT_S1, 0, STR_END, 0, SLJIT_S0, 0);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-OP2(SLJIT_ASHR, SLJIT_S1, 0, SLJIT_S1, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_R1), sizeof(int), SLJIT_S1, 0);
-
-OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_S0, 0);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-OP2(SLJIT_ASHR, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_R1), 0, SLJIT_R2, 0);
-
-JUMPTO(SLJIT_JUMP, quit);
-}
-
-static SLJIT_INLINE void check_start_used_ptr(compiler_common *common)
-{
-/* May destroy TMP1. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
-  {
-  /* The value of -1 must be kept for start_used_ptr! */
-  OP2(SLJIT_ADD, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, 1);
-  /* Jumps if start_used_ptr < STR_PTR, or start_used_ptr == -1. Although overwriting
-  is not necessary if start_used_ptr == STR_PTR, it does not hurt as well. */
-  jump = CMP(SLJIT_LESS_EQUAL, TMP1, 0, STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-  JUMPHERE(jump);
-  }
-else if (common->mode == JIT_PARTIAL_HARD_COMPILE)
-  {
-  jump = CMP(SLJIT_LESS_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-  JUMPHERE(jump);
-  }
-}
-
-static SLJIT_INLINE BOOL char_has_othercase(compiler_common *common, pcre_uchar *cc)
-{
-/* Detects if the character has an othercase. */
-unsigned int c;
-
-#ifdef SUPPORT_UTF
-if (common->utf)
-  {
-  GETCHAR(c, cc);
-  if (c > 127)
-    {
-#ifdef SUPPORT_UCP
-    return c != UCD_OTHERCASE(c);
-#else
-    return FALSE;
-#endif
-    }
-#ifndef COMPILE_PCRE8
-  return common->fcc[c] != c;
-#endif
-  }
-else
-#endif
-  c = *cc;
-return MAX_255(c) ? common->fcc[c] != c : FALSE;
-}
-
-static SLJIT_INLINE unsigned int char_othercase(compiler_common *common, unsigned int c)
-{
-/* Returns with the othercase. */
-#ifdef SUPPORT_UTF
-if (common->utf && c > 127)
-  {
-#ifdef SUPPORT_UCP
-  return UCD_OTHERCASE(c);
-#else
-  return c;
-#endif
-  }
-#endif
-return TABLE_GET(c, common->fcc, c);
-}
-
-static unsigned int char_get_othercase_bit(compiler_common *common, pcre_uchar *cc)
-{
-/* Detects if the character and its othercase has only 1 bit difference. */
-unsigned int c, oc, bit;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-int n;
-#endif
-
-#ifdef SUPPORT_UTF
-if (common->utf)
-  {
-  GETCHAR(c, cc);
-  if (c <= 127)
-    oc = common->fcc[c];
-  else
-    {
-#ifdef SUPPORT_UCP
-    oc = UCD_OTHERCASE(c);
-#else
-    oc = c;
-#endif
-    }
-  }
-else
-  {
-  c = *cc;
-  oc = TABLE_GET(c, common->fcc, c);
-  }
-#else
-c = *cc;
-oc = TABLE_GET(c, common->fcc, c);
-#endif
-
-SLJIT_ASSERT(c != oc);
-
-bit = c ^ oc;
-/* Optimized for English alphabet. */
-if (c <= 127 && bit == 0x20)
-  return (0 << 8) | 0x20;
-
-/* Since c != oc, they must have at least 1 bit difference. */
-if (!is_powerof2(bit))
-  return 0;
-
-#if defined COMPILE_PCRE8
-
-#ifdef SUPPORT_UTF
-if (common->utf && c > 127)
-  {
-  n = GET_EXTRALEN(*cc);
-  while ((bit & 0x3f) == 0)
-    {
-    n--;
-    bit >>= 6;
-    }
-  return (n << 8) | bit;
-  }
-#endif /* SUPPORT_UTF */
-return (0 << 8) | bit;
-
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-
-#ifdef SUPPORT_UTF
-if (common->utf && c > 65535)
-  {
-  if (bit >= (1 << 10))
-    bit >>= 10;
-  else
-    return (bit < 256) ? ((2 << 8) | bit) : ((3 << 8) | (bit >> 8));
-  }
-#endif /* SUPPORT_UTF */
-return (bit < 256) ? ((0 << 8) | bit) : ((1 << 8) | (bit >> 8));
-
-#endif /* COMPILE_PCRE[8|16|32] */
-}
-
-static void check_partial(compiler_common *common, BOOL force)
-{
-/* Checks whether a partial matching is occurred. Does not modify registers. */
-DEFINE_COMPILER;
-struct sljit_jump *jump = NULL;
-
-SLJIT_ASSERT(!force || common->mode != JIT_COMPILE);
-
-if (common->mode == JIT_COMPILE)
-  return;
-
-if (!force)
-  jump = CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-else if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
-  jump = CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, -1);
-
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
-else
-  {
-  if (common->partialmatchlabel != NULL)
-    JUMPTO(SLJIT_JUMP, common->partialmatchlabel);
-  else
-    add_jump(compiler, &common->partialmatch, JUMP(SLJIT_JUMP));
-  }
-
-if (jump != NULL)
-  JUMPHERE(jump);
-}
-
-static void check_str_end(compiler_common *common, jump_list **end_reached)
-{
-/* Does not affect registers. Usually used in a tight spot. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-if (common->mode == JIT_COMPILE)
-  {
-  add_jump(compiler, end_reached, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-  return;
-  }
-
-jump = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
-  {
-  add_jump(compiler, end_reached, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
-  add_jump(compiler, end_reached, JUMP(SLJIT_JUMP));
-  }
-else
-  {
-  add_jump(compiler, end_reached, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
-  if (common->partialmatchlabel != NULL)
-    JUMPTO(SLJIT_JUMP, common->partialmatchlabel);
-  else
-    add_jump(compiler, &common->partialmatch, JUMP(SLJIT_JUMP));
-  }
-JUMPHERE(jump);
-}
-
-static void detect_partial_match(compiler_common *common, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-if (common->mode == JIT_COMPILE)
-  {
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-  return;
-  }
-
-/* Partial matching mode. */
-jump = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
-  {
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
-  add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-  }
-else
-  {
-  if (common->partialmatchlabel != NULL)
-    JUMPTO(SLJIT_JUMP, common->partialmatchlabel);
-  else
-    add_jump(compiler, &common->partialmatch, JUMP(SLJIT_JUMP));
-  }
-JUMPHERE(jump);
-}
-
-static void peek_char(compiler_common *common, pcre_uint32 max)
-{
-/* Reads the character into TMP1, keeps STR_PTR.
-Does not check STR_END. TMP2 Destroyed. */
-DEFINE_COMPILER;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-struct sljit_jump *jump;
-#endif
-
-SLJIT_UNUSED_ARG(max);
-
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (common->utf)
-  {
-  if (max < 128) return;
-
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-  JUMPHERE(jump);
-  }
-#endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-if (common->utf)
-  {
-  if (max < 0xd800) return;
-
-  OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-  /* TMP2 contains the high surrogate. */
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x40);
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3ff);
-  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-  JUMPHERE(jump);
-  }
-#endif
-}
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-
-static BOOL is_char7_bitset(const pcre_uint8 *bitset, BOOL nclass)
-{
-/* Tells whether the character codes below 128 are enough
-to determine a match. */
-const pcre_uint8 value = nclass ? 0xff : 0;
-const pcre_uint8 *end = bitset + 32;
-
-bitset += 16;
-do
-  {
-  if (*bitset++ != value)
-    return FALSE;
-  }
-while (bitset < end);
-return TRUE;
-}
-
-static void read_char7_type(compiler_common *common, BOOL full_read)
-{
-/* Reads the precise character type of a character into TMP1, if the character
-is less than 128. Otherwise it returns with zero. Does not check STR_END. The
-full_read argument tells whether characters above max are accepted or not. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-SLJIT_ASSERT(common->utf);
-
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-
-if (full_read)
-  {
-  jump = CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xc0);
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-  JUMPHERE(jump);
-  }
-}
-
-#endif /* SUPPORT_UTF && COMPILE_PCRE8 */
-
-static void read_char_range(compiler_common *common, pcre_uint32 min, pcre_uint32 max, BOOL update_str_ptr)
-{
-/* Reads the precise value of a character into TMP1, if the character is
-between min and max (c >= min && c <= max). Otherwise it returns with a value
-outside the range. Does not check STR_END. */
-DEFINE_COMPILER;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-struct sljit_jump *jump;
-#endif
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-struct sljit_jump *jump2;
-#endif
-
-SLJIT_UNUSED_ARG(update_str_ptr);
-SLJIT_UNUSED_ARG(min);
-SLJIT_UNUSED_ARG(max);
-SLJIT_ASSERT(min <= max);
-
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (common->utf)
-  {
-  if (max < 128 && !update_str_ptr) return;
-
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-  if (min >= 0x10000)
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xf0);
-    if (update_str_ptr)
-      OP1(SLJIT_MOV_UB, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0x7);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
-    if (!update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    JUMPHERE(jump2);
-    if (update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
-    }
-  else if (min >= 0x800 && max <= 0xffff)
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xe0);
-    if (update_str_ptr)
-      OP1(SLJIT_MOV_UB, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xf);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    if (!update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    JUMPHERE(jump2);
-    if (update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
-    }
-  else if (max >= 0x800)
-    add_jump(compiler, (max < 0x10000) ? &common->utfreadchar16 : &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
-  else if (max < 128)
-    {
-    OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-    }
-  else
-    {
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (!update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    else
-      OP1(SLJIT_MOV_UB, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    if (update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
-    }
-  JUMPHERE(jump);
-  }
-#endif
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-if (common->utf)
-  {
-  if (max >= 0x10000)
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-    jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-    /* TMP2 contains the high surrogate. */
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x40);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3ff);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    JUMPHERE(jump);
-    return;
-    }
-
-  if (max < 0xd800 && !update_str_ptr) return;
-
-  /* Skip low surrogate if necessary. */
-  OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-  if (update_str_ptr)
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  if (max >= 0xd800)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0x10000);
-  JUMPHERE(jump);
-  }
-#endif
-}
-
-static SLJIT_INLINE void read_char(compiler_common *common)
-{
-read_char_range(common, 0, READ_CHAR_MAX, TRUE);
-}
-
-static void read_char8_type(compiler_common *common, BOOL update_str_ptr)
-{
-/* Reads the character type into TMP1, updates STR_PTR. Does not check STR_END. */
-DEFINE_COMPILER;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-struct sljit_jump *jump;
-#endif
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-struct sljit_jump *jump2;
-#endif
-
-SLJIT_UNUSED_ARG(update_str_ptr);
-
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (common->utf)
-  {
-  /* This can be an extra read in some situations, but hopefully
-  it is needed in most cases. */
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-  jump = CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xc0);
-  if (!update_str_ptr)
-    {
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP2, 0, TMP2, 0, TMP1, 0);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
-    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 255);
-    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-    JUMPHERE(jump2);
-    }
-  else
-    add_jump(compiler, &common->utfreadtype8, JUMP(SLJIT_FAST_CALL));
-  JUMPHERE(jump);
-  return;
-  }
-#endif /* SUPPORT_UTF && COMPILE_PCRE8 */
-
-#if !defined COMPILE_PCRE8
-/* The ctypes array contains only 256 values. */
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
-jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 255);
-#endif
-OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-#if !defined COMPILE_PCRE8
-JUMPHERE(jump);
-#endif
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-if (common->utf && update_str_ptr)
-  {
-  /* Skip low surrogate if necessary. */
-  OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xd800);
-  jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  JUMPHERE(jump);
-  }
-#endif /* SUPPORT_UTF && COMPILE_PCRE16 */
-}
-
-static void skip_char_back(compiler_common *common)
-{
-/* Goes one character back. Affects STR_PTR and TMP1. Does not check begin. */
-DEFINE_COMPILER;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-#if defined COMPILE_PCRE8
-struct sljit_label *label;
-
-if (common->utf)
-  {
-  label = LABEL();
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
-  CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, label);
-  return;
-  }
-#elif defined COMPILE_PCRE16
-if (common->utf)
-  {
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  /* Skip low surrogate if necessary. */
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  return;
-  }
-#endif /* COMPILE_PCRE[8|16] */
-#endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
-OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-}
-
-static void check_newlinechar(compiler_common *common, int nltype, jump_list **backtracks, BOOL jumpifmatch)
-{
-/* Character comes in TMP1. Checks if it is a newline. TMP2 may be destroyed. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-if (nltype == NLTYPE_ANY)
-  {
-  add_jump(compiler, &common->anynewline, JUMP(SLJIT_FAST_CALL));
-  add_jump(compiler, backtracks, JUMP(jumpifmatch ? SLJIT_NOT_ZERO : SLJIT_ZERO));
-  }
-else if (nltype == NLTYPE_ANYCRLF)
-  {
-  if (jumpifmatch)
-    {
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR));
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_NL));
-    }
-  else
-    {
-    jump = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_NL));
-    JUMPHERE(jump);
-    }
-  }
-else
-  {
-  SLJIT_ASSERT(nltype == NLTYPE_FIXED && common->newline < 256);
-  add_jump(compiler, backtracks, CMP(jumpifmatch ? SLJIT_EQUAL : SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline));
-  }
-}
-
-#ifdef SUPPORT_UTF
-
-#if defined COMPILE_PCRE8
-static void do_utfreadchar(compiler_common *common)
-{
-/* Fast decoding a UTF-8 character. TMP1 contains the first byte
-of the character (>= 0xc0). Return char value in TMP1, length in TMP2. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-
-/* Searching for the first zero. */
-OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x800);
-jump = JUMP(SLJIT_NOT_ZERO);
-/* Two byte sequence. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(2));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-JUMPHERE(jump);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x800);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-
-OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x10000);
-jump = JUMP(SLJIT_NOT_ZERO);
-/* Three byte sequence. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(3));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-/* Four byte sequence. */
-JUMPHERE(jump);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
-OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(4));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-static void do_utfreadchar16(compiler_common *common)
-{
-/* Fast decoding a UTF-8 character. TMP1 contains the first byte
-of the character (>= 0xc0). Return value in TMP1. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-
-/* Searching for the first zero. */
-OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x800);
-jump = JUMP(SLJIT_NOT_ZERO);
-/* Two byte sequence. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-JUMPHERE(jump);
-OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x400);
-OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_NOT_ZERO);
-/* This code runs only in 8 bit mode. No need to shift the value. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x800);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-/* Three byte sequence. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-static void do_utfreadtype8(compiler_common *common)
-{
-/* Fast decoding a UTF-8 character type. TMP2 contains the first byte
-of the character (>= 0xc0). Return value in TMP1. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-struct sljit_jump *compare;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-
-OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0x20);
-jump = JUMP(SLJIT_NOT_ZERO);
-/* Two byte sequence. */
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x1f);
-/* The upper 5 bits are known at this point. */
-compare = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0x3);
-OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP2, 0, TMP2, 0, TMP1, 0);
-OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-JUMPHERE(compare);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-/* We only have types for characters less than 256. */
-JUMPHERE(jump);
-OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-#endif /* COMPILE_PCRE8 */
-
-#endif /* SUPPORT_UTF */
-
-#ifdef SUPPORT_UCP
-
-/* UCD_BLOCK_SIZE must be 128 (see the assert below). */
-#define UCD_BLOCK_MASK 127
-#define UCD_BLOCK_SHIFT 7
-
-static void do_getucd(compiler_common *common)
-{
-/* Search the UCD record for the character comes in TMP1.
-Returns chartype in TMP1 and UCD offset in TMP2. */
-DEFINE_COMPILER;
-
-SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && sizeof(ucd_record) == 8);
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
-OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
-OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
-OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
-OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
-OP1(SLJIT_MOV_UH, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
-OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-#endif
-
-static SLJIT_INLINE struct sljit_label *mainloop_entry(compiler_common *common, BOOL hascrorlf, BOOL firstline)
-{
-DEFINE_COMPILER;
-struct sljit_label *mainloop;
-struct sljit_label *newlinelabel = NULL;
-struct sljit_jump *start;
-struct sljit_jump *end = NULL;
-struct sljit_jump *nl = NULL;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-struct sljit_jump *singlechar;
-#endif
-jump_list *newline = NULL;
-BOOL newlinecheck = FALSE;
-BOOL readuchar = FALSE;
-
-if (!(hascrorlf || firstline) && (common->nltype == NLTYPE_ANY ||
-    common->nltype == NLTYPE_ANYCRLF || common->newline > 255))
-  newlinecheck = TRUE;
-
-if (firstline)
-  {
-  /* Search for the end of the first line. */
-  SLJIT_ASSERT(common->first_line_end != 0);
-  OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
-
-  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-    {
-    mainloop = LABEL();
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    end = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, mainloop);
-    CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, mainloop);
-    JUMPHERE(end);
-    OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_SP), common->first_line_end, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    }
-  else
-    {
-    end = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-    mainloop = LABEL();
-    /* Continual stores does not cause data dependency. */
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->first_line_end, STR_PTR, 0);
-    read_char_range(common, common->nlmin, common->nlmax, TRUE);
-    check_newlinechar(common, common->nltype, &newline, TRUE);
-    CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, mainloop);
-    JUMPHERE(end);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->first_line_end, STR_PTR, 0);
-    set_jumps(newline, LABEL());
-    }
-
-  OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-  }
-
-start = JUMP(SLJIT_JUMP);
-
-if (newlinecheck)
-  {
-  newlinelabel = LABEL();
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  end = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, common->newline & 0xff);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  nl = JUMP(SLJIT_JUMP);
-  }
-
-mainloop = LABEL();
-
-/* Increasing the STR_PTR here requires one less jump in the most common case. */
-#ifdef SUPPORT_UTF
-if (common->utf) readuchar = TRUE;
-#endif
-if (newlinecheck) readuchar = TRUE;
-
-if (readuchar)
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-
-if (newlinecheck)
-  CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, newlinelabel);
-
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-#if defined COMPILE_PCRE8
-if (common->utf)
-  {
-  singlechar = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  JUMPHERE(singlechar);
-  }
-#elif defined COMPILE_PCRE16
-if (common->utf)
-  {
-  singlechar = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  JUMPHERE(singlechar);
-  }
-#endif /* COMPILE_PCRE[8|16] */
-#endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
-JUMPHERE(start);
-
-if (newlinecheck)
-  {
-  JUMPHERE(end);
-  JUMPHERE(nl);
-  }
-
-return mainloop;
-}
-
-#define MAX_N_CHARS 16
-#define MAX_N_BYTES 8
-
-static SLJIT_INLINE void add_prefix_byte(pcre_uint8 byte, pcre_uint8 *bytes)
-{
-pcre_uint8 len = bytes[0];
-int i;
-
-if (len == 255)
-  return;
-
-if (len == 0)
-  {
-  bytes[0] = 1;
-  bytes[1] = byte;
-  return;
-  }
-
-for (i = len; i > 0; i--)
-  if (bytes[i] == byte)
-    return;
-
-if (len >= MAX_N_BYTES - 1)
-  {
-  bytes[0] = 255;
-  return;
-  }
-
-len++;
-bytes[len] = byte;
-bytes[0] = len;
-}
-
-static int scan_prefix(compiler_common *common, pcre_uchar *cc, pcre_uint32 *chars, pcre_uint8 *bytes, int max_chars, pcre_uint32 *rec_count)
-{
-/* Recursive function, which scans prefix literals. */
-BOOL last, any, caseless;
-int len, repeat, len_save, consumed = 0;
-pcre_uint32 chr, mask;
-pcre_uchar *alternative, *cc_save, *oc;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-pcre_uchar othercase[8];
-#elif defined SUPPORT_UTF && defined COMPILE_PCRE16
-pcre_uchar othercase[2];
-#else
-pcre_uchar othercase[1];
-#endif
-
-repeat = 1;
-while (TRUE)
-  {
-  if (*rec_count == 0)
-    return 0;
-  (*rec_count)--;
-
-  last = TRUE;
-  any = FALSE;
-  caseless = FALSE;
-
-  switch (*cc)
-    {
-    case OP_CHARI:
-    caseless = TRUE;
-    case OP_CHAR:
-    last = FALSE;
-    cc++;
-    break;
-
-    case OP_SOD:
-    case OP_SOM:
-    case OP_SET_SOM:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-    case OP_EODN:
-    case OP_EOD:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_DOLL:
-    case OP_DOLLM:
-    /* Zero width assertions. */
-    cc++;
-    continue;
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    cc = bracketend(cc);
-    continue;
-
-    case OP_PLUSI:
-    case OP_MINPLUSI:
-    case OP_POSPLUSI:
-    caseless = TRUE;
-    case OP_PLUS:
-    case OP_MINPLUS:
-    case OP_POSPLUS:
-    cc++;
-    break;
-
-    case OP_EXACTI:
-    caseless = TRUE;
-    case OP_EXACT:
-    repeat = GET2(cc, 1);
-    last = FALSE;
-    cc += 1 + IMM2_SIZE;
-    break;
-
-    case OP_QUERYI:
-    case OP_MINQUERYI:
-    case OP_POSQUERYI:
-    caseless = TRUE;
-    case OP_QUERY:
-    case OP_MINQUERY:
-    case OP_POSQUERY:
-    len = 1;
-    cc++;
-#ifdef SUPPORT_UTF
-    if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
-#endif
-    max_chars = scan_prefix(common, cc + len, chars, bytes, max_chars, rec_count);
-    if (max_chars == 0)
-      return consumed;
-    last = FALSE;
-    break;
-
-    case OP_KET:
-    cc += 1 + LINK_SIZE;
-    continue;
-
-    case OP_ALT:
-    cc += GET(cc, 1);
-    continue;
-
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRA:
-    case OP_BRAPOS:
-    case OP_CBRA:
-    case OP_CBRAPOS:
-    alternative = cc + GET(cc, 1);
-    while (*alternative == OP_ALT)
-      {
-      max_chars = scan_prefix(common, alternative + 1 + LINK_SIZE, chars, bytes, max_chars, rec_count);
-      if (max_chars == 0)
-        return consumed;
-      alternative += GET(alternative, 1);
-      }
-
-    if (*cc == OP_CBRA || *cc == OP_CBRAPOS)
-      cc += IMM2_SIZE;
-    cc += 1 + LINK_SIZE;
-    continue;
-
-    case OP_CLASS:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-    if (common->utf && !is_char7_bitset((const pcre_uint8 *)(cc + 1), FALSE)) return consumed;
-#endif
-    any = TRUE;
-    cc += 1 + 32 / sizeof(pcre_uchar);
-    break;
-
-    case OP_NCLASS:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (common->utf) return consumed;
-#endif
-    any = TRUE;
-    cc += 1 + 32 / sizeof(pcre_uchar);
-    break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (common->utf) return consumed;
-#endif
-    any = TRUE;
-    cc += GET(cc, 1);
-    break;
-#endif
-
-    case OP_DIGIT:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-    if (common->utf && !is_char7_bitset((const pcre_uint8 *)common->ctypes - cbit_length + cbit_digit, FALSE))
-      return consumed;
-#endif
-    any = TRUE;
-    cc++;
-    break;
-
-    case OP_WHITESPACE:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-    if (common->utf && !is_char7_bitset((const pcre_uint8 *)common->ctypes - cbit_length + cbit_space, FALSE))
-      return consumed;
-#endif
-    any = TRUE;
-    cc++;
-    break;
-
-    case OP_WORDCHAR:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-    if (common->utf && !is_char7_bitset((const pcre_uint8 *)common->ctypes - cbit_length + cbit_word, FALSE))
-      return consumed;
-#endif
-    any = TRUE;
-    cc++;
-    break;
-
-    case OP_NOT:
-    case OP_NOTI:
-    cc++;
-    /* Fall through. */
-    case OP_NOT_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (common->utf) return consumed;
-#endif
-    any = TRUE;
-    cc++;
-    break;
-
-#ifdef SUPPORT_UCP
-    case OP_NOTPROP:
-    case OP_PROP:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (common->utf) return consumed;
-#endif
-    any = TRUE;
-    cc += 1 + 2;
-    break;
-#endif
-
-    case OP_TYPEEXACT:
-    repeat = GET2(cc, 1);
-    cc += 1 + IMM2_SIZE;
-    continue;
-
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (common->utf) return consumed;
-#endif
-    any = TRUE;
-    repeat = GET2(cc, 1);
-    cc += 1 + IMM2_SIZE + 1;
-    break;
-
-    default:
-    return consumed;
-    }
-
-  if (any)
-    {
-#if defined COMPILE_PCRE8
-    mask = 0xff;
-#elif defined COMPILE_PCRE16
-    mask = 0xffff;
-#elif defined COMPILE_PCRE32
-    mask = 0xffffffff;
-#else
-    SLJIT_ASSERT_STOP();
-#endif
-
-    do
-      {
-      chars[0] = mask;
-      chars[1] = mask;
-      bytes[0] = 255;
-
-      consumed++;
-      if (--max_chars == 0)
-        return consumed;
-      chars += 2;
-      bytes += MAX_N_BYTES;
-      }
-    while (--repeat > 0);
-
-    repeat = 1;
-    continue;
-    }
-
-  len = 1;
-#ifdef SUPPORT_UTF
-  if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
-#endif
-
-  if (caseless && char_has_othercase(common, cc))
-    {
-#ifdef SUPPORT_UTF
-    if (common->utf)
-      {
-      GETCHAR(chr, cc);
-      if ((int)PRIV(ord2utf)(char_othercase(common, chr), othercase) != len)
-        return consumed;
-      }
-    else
-#endif
-      {
-      chr = *cc;
-      othercase[0] = TABLE_GET(chr, common->fcc, chr);
-      }
-    }
-  else
-    caseless = FALSE;
-
-  len_save = len;
-  cc_save = cc;
-  while (TRUE)
-    {
-    oc = othercase;
-    do
-      {
-      chr = *cc;
-#ifdef COMPILE_PCRE32
-      if (SLJIT_UNLIKELY(chr == NOTACHAR))
-        return consumed;
-#endif
-      add_prefix_byte((pcre_uint8)chr, bytes);
-
-      mask = 0;
-      if (caseless)
-        {
-        add_prefix_byte((pcre_uint8)*oc, bytes);
-        mask = *cc ^ *oc;
-        chr |= mask;
-        }
-
-#ifdef COMPILE_PCRE32
-      if (chars[0] == NOTACHAR && chars[1] == 0)
-#else
-      if (chars[0] == NOTACHAR)
-#endif
-        {
-        chars[0] = chr;
-        chars[1] = mask;
-        }
-      else
-        {
-        mask |= chars[0] ^ chr;
-        chr |= mask;
-        chars[0] = chr;
-        chars[1] |= mask;
-        }
-
-      len--;
-      consumed++;
-      if (--max_chars == 0)
-        return consumed;
-      chars += 2;
-      bytes += MAX_N_BYTES;
-      cc++;
-      oc++;
-      }
-    while (len > 0);
-
-    if (--repeat == 0)
-      break;
-
-    len = len_save;
-    cc = cc_save;
-    }
-
-  repeat = 1;
-  if (last)
-    return consumed;
-  }
-}
-
-static SLJIT_INLINE BOOL fast_forward_first_n_chars(compiler_common *common, BOOL firstline)
-{
-DEFINE_COMPILER;
-struct sljit_label *start;
-struct sljit_jump *quit;
-pcre_uint32 chars[MAX_N_CHARS * 2];
-pcre_uint8 bytes[MAX_N_CHARS * MAX_N_BYTES];
-pcre_uint8 ones[MAX_N_CHARS];
-int offsets[3];
-pcre_uint32 mask;
-pcre_uint8 *byte_set, *byte_set_end;
-int i, max, from;
-int range_right = -1, range_len = 3 - 1;
-sljit_ub *update_table = NULL;
-BOOL in_range;
-pcre_uint32 rec_count;
-
-for (i = 0; i < MAX_N_CHARS; i++)
-  {
-  chars[i << 1] = NOTACHAR;
-  chars[(i << 1) + 1] = 0;
-  bytes[i * MAX_N_BYTES] = 0;
-  }
-
-rec_count = 10000;
-max = scan_prefix(common, common->start, chars, bytes, MAX_N_CHARS, &rec_count);
-
-if (max <= 1)
-  return FALSE;
-
-for (i = 0; i < max; i++)
-  {
-  mask = chars[(i << 1) + 1];
-  ones[i] = ones_in_half_byte[mask & 0xf];
-  mask >>= 4;
-  while (mask != 0)
-    {
-    ones[i] += ones_in_half_byte[mask & 0xf];
-    mask >>= 4;
-    }
-  }
-
-in_range = FALSE;
-from = 0;   /* Prevent compiler "uninitialized" warning */
-for (i = 0; i <= max; i++)
-  {
-  if (in_range && (i - from) > range_len && (bytes[(i - 1) * MAX_N_BYTES] <= 4))
-    {
-    range_len = i - from;
-    range_right = i - 1;
-    }
-
-  if (i < max && bytes[i * MAX_N_BYTES] < 255)
-    {
-    if (!in_range)
-      {
-      in_range = TRUE;
-      from = i;
-      }
-    }
-  else if (in_range)
-    in_range = FALSE;
-  }
-
-if (range_right >= 0)
-  {
-  update_table = (sljit_ub *)allocate_read_only_data(common, 256);
-  if (update_table == NULL)
-    return TRUE;
-  memset(update_table, IN_UCHARS(range_len), 256);
-
-  for (i = 0; i < range_len; i++)
-    {
-    byte_set = bytes + ((range_right - i) * MAX_N_BYTES);
-    SLJIT_ASSERT(byte_set[0] > 0 && byte_set[0] < 255);
-    byte_set_end = byte_set + byte_set[0];
-    byte_set++;
-    while (byte_set <= byte_set_end)
-      {
-      if (update_table[*byte_set] > IN_UCHARS(i))
-        update_table[*byte_set] = IN_UCHARS(i);
-      byte_set++;
-      }
-    }
-  }
-
-offsets[0] = -1;
-/* Scan forward. */
-for (i = 0; i < max; i++)
-  if (ones[i] <= 2) {
-    offsets[0] = i;
-    break;
-  }
-
-if (offsets[0] < 0 && range_right < 0)
-  return FALSE;
-
-if (offsets[0] >= 0)
-  {
-  /* Scan backward. */
-  offsets[1] = -1;
-  for (i = max - 1; i > offsets[0]; i--)
-    if (ones[i] <= 2 && i != range_right)
-      {
-      offsets[1] = i;
-      break;
-      }
-
-  /* This case is handled better by fast_forward_first_char. */
-  if (offsets[1] == -1 && offsets[0] == 0 && range_right < 0)
-    return FALSE;
-
-  offsets[2] = -1;
-  /* We only search for a middle character if there is no range check. */
-  if (offsets[1] >= 0 && range_right == -1)
-    {
-    /* Scan from middle. */
-    for (i = (offsets[0] + offsets[1]) / 2 + 1; i < offsets[1]; i++)
-      if (ones[i] <= 2)
-        {
-        offsets[2] = i;
-        break;
-        }
-
-    if (offsets[2] == -1)
-      {
-      for (i = (offsets[0] + offsets[1]) / 2; i > offsets[0]; i--)
-        if (ones[i] <= 2)
-          {
-          offsets[2] = i;
-          break;
-          }
-      }
-    }
-
-  SLJIT_ASSERT(offsets[1] == -1 || (offsets[0] < offsets[1]));
-  SLJIT_ASSERT(offsets[2] == -1 || (offsets[0] < offsets[2] && offsets[1] > offsets[2]));
-
-  chars[0] = chars[offsets[0] << 1];
-  chars[1] = chars[(offsets[0] << 1) + 1];
-  if (offsets[2] >= 0)
-    {
-    chars[2] = chars[offsets[2] << 1];
-    chars[3] = chars[(offsets[2] << 1) + 1];
-    }
-  if (offsets[1] >= 0)
-    {
-    chars[4] = chars[offsets[1] << 1];
-    chars[5] = chars[(offsets[1] << 1) + 1];
-    }
-  }
-
-max -= 1;
-if (firstline)
-  {
-  SLJIT_ASSERT(common->first_line_end != 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->first_line_end);
-  OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
-  OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
-  quit = CMP(SLJIT_LESS_EQUAL, STR_END, 0, TMP1, 0);
-  OP1(SLJIT_MOV, STR_END, 0, TMP1, 0);
-  JUMPHERE(quit);
-  }
-else
-  OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
-
-#if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-if (range_right >= 0)
-  OP1(SLJIT_MOV, RETURN_ADDR, 0, SLJIT_IMM, (sljit_sw)update_table);
-#endif
-
-start = LABEL();
-quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-
-SLJIT_ASSERT(range_right >= 0 || offsets[0] >= 0);
-
-if (range_right >= 0)
-  {
-#if defined COMPILE_PCRE8 || (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(range_right));
-#else
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(range_right + 1) - 1);
-#endif
-
-#if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM2(RETURN_ADDR, TMP1), 0);
-#else
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)update_table);
-#endif
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0, start);
-  }
-
-if (offsets[0] >= 0)
-  {
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[0]));
-  if (offsets[1] >= 0)
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[1]));
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-  if (chars[1] != 0)
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[1]);
-  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[0], start);
-  if (offsets[2] >= 0)
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[2] - 1));
-
-  if (offsets[1] >= 0)
-    {
-    if (chars[5] != 0)
-      OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, chars[5]);
-    CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, chars[4], start);
-    }
-
-  if (offsets[2] >= 0)
-    {
-    if (chars[3] != 0)
-      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[3]);
-    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[2], start);
-    }
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  }
-
-JUMPHERE(quit);
-
-if (firstline)
-  {
-  if (range_right >= 0)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->first_line_end);
-  OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
-  if (range_right >= 0)
-    {
-    quit = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
-    OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
-    JUMPHERE(quit);
-    }
-  }
-else
-  OP2(SLJIT_ADD, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
-return TRUE;
-}
-
-#undef MAX_N_CHARS
-#undef MAX_N_BYTES
-
-static SLJIT_INLINE void fast_forward_first_char(compiler_common *common, pcre_uchar first_char, BOOL caseless, BOOL firstline)
-{
-DEFINE_COMPILER;
-struct sljit_label *start;
-struct sljit_jump *quit;
-struct sljit_jump *found;
-pcre_uchar oc, bit;
-
-if (firstline)
-  {
-  SLJIT_ASSERT(common->first_line_end != 0);
-  OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
-  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->first_line_end);
-  }
-
-start = LABEL();
-quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-
-oc = first_char;
-if (caseless)
-  {
-  oc = TABLE_GET(first_char, common->fcc, first_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-  if (first_char > 127 && common->utf)
-    oc = UCD_OTHERCASE(first_char);
-#endif
-  }
-if (first_char == oc)
-  found = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, first_char);
-else
-  {
-  bit = first_char ^ oc;
-  if (is_powerof2(bit))
-    {
-    OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, bit);
-    found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, first_char | bit);
-    }
-  else
-    {
-    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, first_char);
-    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, oc);
-    OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-    found = JUMP(SLJIT_NOT_ZERO);
-    }
-  }
-
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-JUMPTO(SLJIT_JUMP, start);
-JUMPHERE(found);
-JUMPHERE(quit);
-
-if (firstline)
-  OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
-}
-
-static SLJIT_INLINE void fast_forward_newline(compiler_common *common, BOOL firstline)
-{
-DEFINE_COMPILER;
-struct sljit_label *loop;
-struct sljit_jump *lastchar;
-struct sljit_jump *firstchar;
-struct sljit_jump *quit;
-struct sljit_jump *foundcr = NULL;
-struct sljit_jump *notfoundnl;
-jump_list *newline = NULL;
-
-if (firstline)
-  {
-  SLJIT_ASSERT(common->first_line_end != 0);
-  OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
-  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->first_line_end);
-  }
-
-if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-  {
-  lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-  firstchar = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
-
-  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(2));
-  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, STR_PTR, 0, TMP1, 0);
-  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_GREATER_EQUAL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-
-  loop = LABEL();
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
-  OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, loop);
-  CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, loop);
-
-  JUMPHERE(quit);
-  JUMPHERE(firstchar);
-  JUMPHERE(lastchar);
-
-  if (firstline)
-    OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
-  return;
-  }
-
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-firstchar = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
-skip_char_back(common);
-
-loop = LABEL();
-common->ff_newline_shortcut = loop;
-
-read_char_range(common, common->nlmin, common->nlmax, TRUE);
-lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
-  foundcr = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
-check_newlinechar(common, common->nltype, &newline, FALSE);
-set_jumps(newline, loop);
-
-if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
-  {
-  quit = JUMP(SLJIT_JUMP);
-  JUMPHERE(foundcr);
-  notfoundnl = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  JUMPHERE(notfoundnl);
-  JUMPHERE(quit);
-  }
-JUMPHERE(lastchar);
-JUMPHERE(firstchar);
-
-if (firstline)
-  OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
-}
-
-static BOOL check_class_ranges(compiler_common *common, const pcre_uint8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks);
-
-static SLJIT_INLINE void fast_forward_start_bits(compiler_common *common, pcre_uint8 *start_bits, BOOL firstline)
-{
-DEFINE_COMPILER;
-struct sljit_label *start;
-struct sljit_jump *quit;
-struct sljit_jump *found = NULL;
-jump_list *matches = NULL;
-#ifndef COMPILE_PCRE8
-struct sljit_jump *jump;
-#endif
-
-if (firstline)
-  {
-  SLJIT_ASSERT(common->first_line_end != 0);
-  OP1(SLJIT_MOV, RETURN_ADDR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->first_line_end);
-  }
-
-start = LABEL();
-quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-#ifdef SUPPORT_UTF
-if (common->utf)
-  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
-#endif
-
-if (!check_class_ranges(common, start_bits, (start_bits[31] & 0x80) != 0, TRUE, &matches))
-  {
-#ifndef COMPILE_PCRE8
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 255);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 255);
-  JUMPHERE(jump);
-#endif
-  OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)start_bits);
-  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-  found = JUMP(SLJIT_NOT_ZERO);
-  }
-
-#ifdef SUPPORT_UTF
-if (common->utf)
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-#endif
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#ifdef SUPPORT_UTF
-#if defined COMPILE_PCRE8
-if (common->utf)
-  {
-  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0, start);
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  }
-#elif defined COMPILE_PCRE16
-if (common->utf)
-  {
-  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800, start);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  }
-#endif /* COMPILE_PCRE[8|16] */
-#endif /* SUPPORT_UTF */
-JUMPTO(SLJIT_JUMP, start);
-if (found != NULL)
-  JUMPHERE(found);
-if (matches != NULL)
-  set_jumps(matches, LABEL());
-JUMPHERE(quit);
-
-if (firstline)
-  OP1(SLJIT_MOV, STR_END, 0, RETURN_ADDR, 0);
-}
-
-static SLJIT_INLINE struct sljit_jump *search_requested_char(compiler_common *common, pcre_uchar req_char, BOOL caseless, BOOL has_firstchar)
-{
-DEFINE_COMPILER;
-struct sljit_label *loop;
-struct sljit_jump *toolong;
-struct sljit_jump *alreadyfound;
-struct sljit_jump *found;
-struct sljit_jump *foundoc = NULL;
-struct sljit_jump *notfound;
-pcre_uint32 oc, bit;
-
-SLJIT_ASSERT(common->req_char_ptr != 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->req_char_ptr);
-OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, REQ_BYTE_MAX);
-toolong = CMP(SLJIT_LESS, TMP1, 0, STR_END, 0);
-alreadyfound = CMP(SLJIT_LESS, STR_PTR, 0, TMP2, 0);
-
-if (has_firstchar)
-  OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-else
-  OP1(SLJIT_MOV, TMP1, 0, STR_PTR, 0);
-
-loop = LABEL();
-notfound = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, STR_END, 0);
-
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(TMP1), 0);
-oc = req_char;
-if (caseless)
-  {
-  oc = TABLE_GET(req_char, common->fcc, req_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-  if (req_char > 127 && common->utf)
-    oc = UCD_OTHERCASE(req_char);
-#endif
-  }
-if (req_char == oc)
-  found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
-else
-  {
-  bit = req_char ^ oc;
-  if (is_powerof2(bit))
-    {
-    OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, bit);
-    found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char | bit);
-    }
-  else
-    {
-    found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
-    foundoc = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, oc);
-    }
-  }
-OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
-JUMPTO(SLJIT_JUMP, loop);
-
-JUMPHERE(found);
-if (foundoc)
-  JUMPHERE(foundoc);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->req_char_ptr, TMP1, 0);
-JUMPHERE(alreadyfound);
-JUMPHERE(toolong);
-return notfound;
-}
-
-static void do_revertframes(compiler_common *common)
-{
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-struct sljit_label *mainloop;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP1(SLJIT_MOV, TMP1, 0, STACK_TOP, 0);
-GET_LOCAL_BASE(TMP3, 0, 0);
-
-/* Drop frames until we reach STACK_TOP. */
-mainloop = LABEL();
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), 0);
-OP2(SLJIT_SUB | SLJIT_SET_S, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0);
-jump = JUMP(SLJIT_SIG_LESS_EQUAL);
-
-OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP3, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_sw), SLJIT_MEM1(TMP1), 2 * sizeof(sljit_sw));
-OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
-JUMPTO(SLJIT_JUMP, mainloop);
-
-JUMPHERE(jump);
-jump = JUMP(SLJIT_SIG_LESS);
-/* End of dropping frames. */
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-JUMPHERE(jump);
-OP1(SLJIT_NEG, TMP2, 0, TMP2, 0);
-OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP3, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
-OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_sw));
-JUMPTO(SLJIT_JUMP, mainloop);
-}
-
-static void check_wordboundary(compiler_common *common)
-{
-DEFINE_COMPILER;
-struct sljit_jump *skipread;
-jump_list *skipread_list = NULL;
-#if !(defined COMPILE_PCRE8) || defined SUPPORT_UTF
-struct sljit_jump *jump;
-#endif
-
-SLJIT_COMPILE_ASSERT(ctype_word == 0x10, ctype_word_must_be_16);
-
-sljit_emit_fast_enter(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-/* Get type of the previous char, and put it to LOCALS1. */
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, SLJIT_IMM, 0);
-skipread = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
-skip_char_back(common);
-check_start_used_ptr(common);
-read_char(common);
-
-/* Testing char type. */
-#ifdef SUPPORT_UCP
-if (common->use_ucp)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
-  jump = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
-  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-  JUMPHERE(jump);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP2, 0);
-  }
-else
-#endif
-  {
-#ifndef COMPILE_PCRE8
-  jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#elif defined SUPPORT_UTF
-  /* Here LOCALS1 has already been zeroed. */
-  jump = NULL;
-  if (common->utf)
-    jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#endif /* COMPILE_PCRE8 */
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), common->ctypes);
-  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 4 /* ctype_word */);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP1, 0);
-#ifndef COMPILE_PCRE8
-  JUMPHERE(jump);
-#elif defined SUPPORT_UTF
-  if (jump != NULL)
-    JUMPHERE(jump);
-#endif /* COMPILE_PCRE8 */
-  }
-JUMPHERE(skipread);
-
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
-check_str_end(common, &skipread_list);
-peek_char(common, READ_CHAR_MAX);
-
-/* Testing char type. This is a code duplication. */
-#ifdef SUPPORT_UCP
-if (common->use_ucp)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
-  jump = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
-  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-  JUMPHERE(jump);
-  }
-else
-#endif
-  {
-#ifndef COMPILE_PCRE8
-  /* TMP2 may be destroyed by peek_char. */
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
-  jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#elif defined SUPPORT_UTF
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
-  jump = NULL;
-  if (common->utf)
-    jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#endif
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), common->ctypes);
-  OP2(SLJIT_LSHR, TMP2, 0, TMP2, 0, SLJIT_IMM, 4 /* ctype_word */);
-  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
-#ifndef COMPILE_PCRE8
-  JUMPHERE(jump);
-#elif defined SUPPORT_UTF
-  if (jump != NULL)
-    JUMPHERE(jump);
-#endif /* COMPILE_PCRE8 */
-  }
-set_jumps(skipread_list, LABEL());
-
-OP2(SLJIT_XOR | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-sljit_emit_fast_return(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-}
-
-static BOOL check_class_ranges(compiler_common *common, const pcre_uint8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-int ranges[MAX_RANGE_SIZE];
-pcre_uint8 bit, cbit, all;
-int i, byte, length = 0;
-
-bit = bits[0] & 0x1;
-/* All bits will be zero or one (since bit is zero or one). */
-all = -bit;
-
-for (i = 0; i < 256; )
-  {
-  byte = i >> 3;
-  if ((i & 0x7) == 0 && bits[byte] == all)
-    i += 8;
-  else
-    {
-    cbit = (bits[byte] >> (i & 0x7)) & 0x1;
-    if (cbit != bit)
-      {
-      if (length >= MAX_RANGE_SIZE)
-        return FALSE;
-      ranges[length] = i;
-      length++;
-      bit = cbit;
-      all = -cbit;
-      }
-    i++;
-    }
-  }
-
-if (((bit == 0) && nclass) || ((bit == 1) && !nclass))
-  {
-  if (length >= MAX_RANGE_SIZE)
-    return FALSE;
-  ranges[length] = 256;
-  length++;
-  }
-
-if (length < 0 || length > 4)
-  return FALSE;
-
-bit = bits[0] & 0x1;
-if (invert) bit ^= 0x1;
-
-/* No character is accepted. */
-if (length == 0 && bit == 0)
-  add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-
-switch(length)
-  {
-  case 0:
-  /* When bit != 0, all characters are accepted. */
-  return TRUE;
-
-  case 1:
-  add_jump(compiler, backtracks, CMP(bit == 0 ? SLJIT_LESS : SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[0]));
-  return TRUE;
-
-  case 2:
-  if (ranges[0] + 1 != ranges[1])
-    {
-    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[0]);
-    add_jump(compiler, backtracks, CMP(bit != 0 ? SLJIT_LESS : SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[1] - ranges[0]));
-    }
-  else
-    add_jump(compiler, backtracks, CMP(bit != 0 ? SLJIT_EQUAL : SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[0]));
-  return TRUE;
-
-  case 3:
-  if (bit != 0)
-    {
-    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[2]));
-    if (ranges[0] + 1 != ranges[1])
-      {
-      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[0]);
-      add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, ranges[1] - ranges[0]));
-      }
-    else
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[0]));
-    return TRUE;
-    }
-
-  add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, ranges[0]));
-  if (ranges[1] + 1 != ranges[2])
-    {
-    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[1]);
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, ranges[2] - ranges[1]));
-    }
-  else
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[1]));
-  return TRUE;
-
-  case 4:
-  if ((ranges[1] - ranges[0]) == (ranges[3] - ranges[2])
-      && (ranges[0] | (ranges[2] - ranges[0])) == ranges[2]
-      && (ranges[1] & (ranges[2] - ranges[0])) == 0
-      && is_powerof2(ranges[2] - ranges[0]))
-    {
-    SLJIT_ASSERT((ranges[0] & (ranges[2] - ranges[0])) == 0 && (ranges[2] & ranges[3] & (ranges[2] - ranges[0])) != 0);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[2] - ranges[0]);
-    if (ranges[2] + 1 != ranges[3])
-      {
-      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[2]);
-      add_jump(compiler, backtracks, CMP(bit != 0 ? SLJIT_LESS : SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[3] - ranges[2]));
-      }
-    else
-      add_jump(compiler, backtracks, CMP(bit != 0 ? SLJIT_EQUAL : SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[2]));
-    return TRUE;
-    }
-
-  if (bit != 0)
-    {
-    i = 0;
-    if (ranges[0] + 1 != ranges[1])
-      {
-      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[0]);
-      add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, ranges[1] - ranges[0]));
-      i = ranges[0];
-      }
-    else
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[0]));
-
-    if (ranges[2] + 1 != ranges[3])
-      {
-      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[2] - i);
-      add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, ranges[3] - ranges[2]));
-      }
-    else
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[2] - i));
-    return TRUE;
-    }
-
-  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[0]);
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[3] - ranges[0]));
-  if (ranges[1] + 1 != ranges[2])
-    {
-    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[1] - ranges[0]);
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, ranges[2] - ranges[1]));
-    }
-  else
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[1] - ranges[0]));
-  return TRUE;
-
-  default:
-  SLJIT_ASSERT_STOP();
-  return FALSE;
-  }
-}
-
-static void check_anynewline(compiler_common *common)
-{
-/* Check whether TMP1 contains a newline character. TMP2 destroyed. */
-DEFINE_COMPILER;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-
-OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);
-OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
-OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#ifdef COMPILE_PCRE8
-if (common->utf)
-  {
-#endif
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
-#ifdef COMPILE_PCRE8
-  }
-#endif
-#endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
-OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-static void check_hspace(compiler_common *common)
-{
-/* Check whether TMP1 contains a newline character. TMP2 destroyed. */
-DEFINE_COMPILER;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-
-OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x09);
-OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x20);
-OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xa0);
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#ifdef COMPILE_PCRE8
-if (common->utf)
-  {
-#endif
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x1680);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x2000);
-  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x200A - 0x2000);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x202f - 0x2000);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x205f - 0x2000);
-  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x3000 - 0x2000);
-#ifdef COMPILE_PCRE8
-  }
-#endif
-#endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
-OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-static void check_vspace(compiler_common *common)
-{
-/* Check whether TMP1 contains a newline character. TMP2 destroyed. */
-DEFINE_COMPILER;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-
-OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);
-OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
-OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#ifdef COMPILE_PCRE8
-if (common->utf)
-  {
-#endif
-  OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
-#ifdef COMPILE_PCRE8
-  }
-#endif
-#endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
-OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-#define CHAR1 STR_END
-#define CHAR2 STACK_TOP
-
-static void do_casefulcmp(compiler_common *common)
-{
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-struct sljit_label *label;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-OP1(SLJIT_MOV, TMP3, 0, CHAR1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, CHAR2, 0);
-OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
-OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-label = LABEL();
-OP1(MOVU_UCHAR, CHAR1, 0, SLJIT_MEM1(TMP1), IN_UCHARS(1));
-OP1(MOVU_UCHAR, CHAR2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-jump = CMP(SLJIT_NOT_EQUAL, CHAR1, 0, CHAR2, 0);
-OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
-JUMPTO(SLJIT_NOT_ZERO, label);
-
-JUMPHERE(jump);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-OP1(SLJIT_MOV, CHAR1, 0, TMP3, 0);
-OP1(SLJIT_MOV, CHAR2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-#define LCC_TABLE STACK_LIMIT
-
-static void do_caselesscmp(compiler_common *common)
-{
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-struct sljit_label *label;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-
-OP1(SLJIT_MOV, TMP3, 0, LCC_TABLE, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, CHAR1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, CHAR2, 0);
-OP1(SLJIT_MOV, LCC_TABLE, 0, SLJIT_IMM, common->lcc);
-OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
-OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-label = LABEL();
-OP1(MOVU_UCHAR, CHAR1, 0, SLJIT_MEM1(TMP1), IN_UCHARS(1));
-OP1(MOVU_UCHAR, CHAR2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-#ifndef COMPILE_PCRE8
-jump = CMP(SLJIT_GREATER, CHAR1, 0, SLJIT_IMM, 255);
-#endif
-OP1(SLJIT_MOV_UB, CHAR1, 0, SLJIT_MEM2(LCC_TABLE, CHAR1), 0);
-#ifndef COMPILE_PCRE8
-JUMPHERE(jump);
-jump = CMP(SLJIT_GREATER, CHAR2, 0, SLJIT_IMM, 255);
-#endif
-OP1(SLJIT_MOV_UB, CHAR2, 0, SLJIT_MEM2(LCC_TABLE, CHAR2), 0);
-#ifndef COMPILE_PCRE8
-JUMPHERE(jump);
-#endif
-jump = CMP(SLJIT_NOT_EQUAL, CHAR1, 0, CHAR2, 0);
-OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
-JUMPTO(SLJIT_NOT_ZERO, label);
-
-JUMPHERE(jump);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-OP1(SLJIT_MOV, LCC_TABLE, 0, TMP3, 0);
-OP1(SLJIT_MOV, CHAR1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-OP1(SLJIT_MOV, CHAR2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-#undef LCC_TABLE
-#undef CHAR1
-#undef CHAR2
-
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-
-static const pcre_uchar * SLJIT_CALL do_utf_caselesscmp(pcre_uchar *src1, jit_arguments *args, pcre_uchar *end1)
-{
-/* This function would be ineffective to do in JIT level. */
-pcre_uint32 c1, c2;
-const pcre_uchar *src2 = args->uchar_ptr;
-const pcre_uchar *end2 = args->end;
-const ucd_record *ur;
-const pcre_uint32 *pp;
-
-while (src1 < end1)
-  {
-  if (src2 >= end2)
-    return (pcre_uchar*)1;
-  GETCHARINC(c1, src1);
-  GETCHARINC(c2, src2);
-  ur = GET_UCD(c2);
-  if (c1 != c2 && c1 != c2 + ur->other_case)
-    {
-    pp = PRIV(ucd_caseless_sets) + ur->caseset;
-    for (;;)
-      {
-      if (c1 < *pp) return NULL;
-      if (c1 == *pp++) break;
-      }
-    }
-  }
-return src2;
-}
-
-#endif /* SUPPORT_UTF && SUPPORT_UCP */
-
-static pcre_uchar *byte_sequence_compare(compiler_common *common, BOOL caseless, pcre_uchar *cc,
-    compare_context *context, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-unsigned int othercasebit = 0;
-pcre_uchar *othercasechar = NULL;
-#ifdef SUPPORT_UTF
-int utflength;
-#endif
-
-if (caseless && char_has_othercase(common, cc))
-  {
-  othercasebit = char_get_othercase_bit(common, cc);
-  SLJIT_ASSERT(othercasebit);
-  /* Extracting bit difference info. */
-#if defined COMPILE_PCRE8
-  othercasechar = cc + (othercasebit >> 8);
-  othercasebit &= 0xff;
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  /* Note that this code only handles characters in the BMP. If there
-  ever are characters outside the BMP whose othercase differs in only one
-  bit from itself (there currently are none), this code will need to be
-  revised for COMPILE_PCRE32. */
-  othercasechar = cc + (othercasebit >> 9);
-  if ((othercasebit & 0x100) != 0)
-    othercasebit = (othercasebit & 0xff) << 8;
-  else
-    othercasebit &= 0xff;
-#endif /* COMPILE_PCRE[8|16|32] */
-  }
-
-if (context->sourcereg == -1)
-  {
-#if defined COMPILE_PCRE8
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  if (context->length >= 4)
-    OP1(SLJIT_MOV_SI, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-  else if (context->length >= 2)
-    OP1(SLJIT_MOV_UH, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-  else
-#endif
-    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#elif defined COMPILE_PCRE16
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  if (context->length >= 4)
-    OP1(SLJIT_MOV_SI, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-  else
-#endif
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#elif defined COMPILE_PCRE32
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#endif /* COMPILE_PCRE[8|16|32] */
-  context->sourcereg = TMP2;
-  }
-
-#ifdef SUPPORT_UTF
-utflength = 1;
-if (common->utf && HAS_EXTRALEN(*cc))
-  utflength += GET_EXTRALEN(*cc);
-
-do
-  {
-#endif
-
-  context->length -= IN_UCHARS(1);
-#if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED) && (defined COMPILE_PCRE8 || defined COMPILE_PCRE16)
-
-  /* Unaligned read is supported. */
-  if (othercasebit != 0 && othercasechar == cc)
-    {
-    context->c.asuchars[context->ucharptr] = *cc | othercasebit;
-    context->oc.asuchars[context->ucharptr] = othercasebit;
-    }
-  else
-    {
-    context->c.asuchars[context->ucharptr] = *cc;
-    context->oc.asuchars[context->ucharptr] = 0;
-    }
-  context->ucharptr++;
-
-#if defined COMPILE_PCRE8
-  if (context->ucharptr >= 4 || context->length == 0 || (context->ucharptr == 2 && context->length == 1))
-#else
-  if (context->ucharptr >= 2 || context->length == 0)
-#endif
-    {
-    if (context->length >= 4)
-      OP1(SLJIT_MOV_SI, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-    else if (context->length >= 2)
-      OP1(SLJIT_MOV_UH, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#if defined COMPILE_PCRE8
-    else if (context->length >= 1)
-      OP1(SLJIT_MOV_UB, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#endif /* COMPILE_PCRE8 */
-    context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
-
-    switch(context->ucharptr)
-      {
-      case 4 / sizeof(pcre_uchar):
-      if (context->oc.asint != 0)
-        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asint);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asint | context->oc.asint));
-      break;
-
-      case 2 / sizeof(pcre_uchar):
-      if (context->oc.asushort != 0)
-        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asushort);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asushort | context->oc.asushort));
-      break;
-
-#ifdef COMPILE_PCRE8
-      case 1:
-      if (context->oc.asbyte != 0)
-        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asbyte);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asbyte | context->oc.asbyte));
-      break;
-#endif
-
-      default:
-      SLJIT_ASSERT_STOP();
-      break;
-      }
-    context->ucharptr = 0;
-    }
-
-#else
-
-  /* Unaligned read is unsupported or in 32 bit mode. */
-  if (context->length >= 1)
-    OP1(MOV_UCHAR, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-
-  context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
-
-  if (othercasebit != 0 && othercasechar == cc)
-    {
-    OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, othercasebit);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, *cc | othercasebit));
-    }
-  else
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, *cc));
-
-#endif
-
-  cc++;
-#ifdef SUPPORT_UTF
-  utflength--;
-  }
-while (utflength > 0);
-#endif
-
-return cc;
-}
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-
-#define SET_TYPE_OFFSET(value) \
-  if ((value) != typeoffset) \
-    { \
-    if ((value) < typeoffset) \
-      OP2(SLJIT_ADD, typereg, 0, typereg, 0, SLJIT_IMM, typeoffset - (value)); \
-    else \
-      OP2(SLJIT_SUB, typereg, 0, typereg, 0, SLJIT_IMM, (value) - typeoffset); \
-    } \
-  typeoffset = (value);
-
-#define SET_CHAR_OFFSET(value) \
-  if ((value) != charoffset) \
-    { \
-    if ((value) < charoffset) \
-      OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(charoffset - (value))); \
-    else \
-      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)((value) - charoffset)); \
-    } \
-  charoffset = (value);
-
-static void compile_xclass_matchingpath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-jump_list *found = NULL;
-jump_list **list = (cc[0] & XCL_NOT) == 0 ? &found : backtracks;
-sljit_uw c, charoffset, max = 256, min = READ_CHAR_MAX;
-struct sljit_jump *jump = NULL;
-pcre_uchar *ccbegin;
-int compares, invertcmp, numberofcmps;
-#if defined SUPPORT_UTF && (defined COMPILE_PCRE8 || defined COMPILE_PCRE16)
-BOOL utf = common->utf;
-#endif
-
-#ifdef SUPPORT_UCP
-BOOL needstype = FALSE, needsscript = FALSE, needschar = FALSE;
-BOOL charsaved = FALSE;
-int typereg = TMP1, scriptreg = TMP1;
-const pcre_uint32 *other_cases;
-sljit_uw typeoffset;
-#endif
-
-/* Scanning the necessary info. */
-cc++;
-ccbegin = cc;
-compares = 0;
-if (cc[-1] & XCL_MAP)
-  {
-  min = 0;
-  cc += 32 / sizeof(pcre_uchar);
-  }
-
-while (*cc != XCL_END)
-  {
-  compares++;
-  if (*cc == XCL_SINGLE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-    if (c > max) max = c;
-    if (c < min) min = c;
-#ifdef SUPPORT_UCP
-    needschar = TRUE;
-#endif
-    }
-  else if (*cc == XCL_RANGE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-    if (c < min) min = c;
-    GETCHARINCTEST(c, cc);
-    if (c > max) max = c;
-#ifdef SUPPORT_UCP
-    needschar = TRUE;
-#endif
-    }
-#ifdef SUPPORT_UCP
-  else
-    {
-    SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-    cc++;
-    if (*cc == PT_CLIST)
-      {
-      other_cases = PRIV(ucd_caseless_sets) + cc[1];
-      while (*other_cases != NOTACHAR)
-        {
-        if (*other_cases > max) max = *other_cases;
-        if (*other_cases < min) min = *other_cases;
-        other_cases++;
-        }
-      }
-    else
-      {
-      max = READ_CHAR_MAX;
-      min = 0;
-      }
-
-    switch(*cc)
-      {
-      case PT_ANY:
-      break;
-
-      case PT_LAMP:
-      case PT_GC:
-      case PT_PC:
-      case PT_ALNUM:
-      needstype = TRUE;
-      break;
-
-      case PT_SC:
-      needsscript = TRUE;
-      break;
-
-      case PT_SPACE:
-      case PT_PXSPACE:
-      case PT_WORD:
-      case PT_PXGRAPH:
-      case PT_PXPRINT:
-      case PT_PXPUNCT:
-      needstype = TRUE;
-      needschar = TRUE;
-      break;
-
-      case PT_CLIST:
-      case PT_UCNC:
-      needschar = TRUE;
-      break;
-
-      default:
-      SLJIT_ASSERT_STOP();
-      break;
-      }
-    cc += 2;
-    }
-#endif
-  }
-
-/* We are not necessary in utf mode even in 8 bit mode. */
-cc = ccbegin;
-detect_partial_match(common, backtracks);
-read_char_range(common, min, max, (cc[-1] & XCL_NOT) != 0);
-
-if ((cc[-1] & XCL_HASPROP) == 0)
-  {
-  if ((cc[-1] & XCL_MAP) != 0)
-    {
-    jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-    if (!check_class_ranges(common, (const pcre_uint8 *)cc, (((const pcre_uint8 *)cc)[31] & 0x80) != 0, TRUE, &found))
-      {
-      OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-      OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
-      OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-      OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-      add_jump(compiler, &found, JUMP(SLJIT_NOT_ZERO));
-      }
-
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-    JUMPHERE(jump);
-
-    cc += 32 / sizeof(pcre_uchar);
-    }
-  else
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, min);
-    add_jump(compiler, (cc[-1] & XCL_NOT) == 0 ? backtracks : &found, CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, max - min));
-    }
-  }
-else if ((cc[-1] & XCL_MAP) != 0)
-  {
-  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
-#ifdef SUPPORT_UCP
-  charsaved = TRUE;
-#endif
-  if (!check_class_ranges(common, (const pcre_uint8 *)cc, FALSE, TRUE, list))
-    {
-#ifdef COMPILE_PCRE8
-    jump = NULL;
-    if (common->utf)
-#endif
-      jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-
-    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
-    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-    OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-    add_jump(compiler, list, JUMP(SLJIT_NOT_ZERO));
-
-#ifdef COMPILE_PCRE8
-    if (common->utf)
-#endif
-      JUMPHERE(jump);
-    }
-
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-  cc += 32 / sizeof(pcre_uchar);
-  }
-
-#ifdef SUPPORT_UCP
-/* Simple register allocation. TMP1 is preferred if possible. */
-if (needstype || needsscript)
-  {
-  if (needschar && !charsaved)
-    OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  if (needschar)
-    {
-    if (needstype)
-      {
-      OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
-      typereg = RETURN_ADDR;
-      }
-
-    if (needsscript)
-      scriptreg = TMP3;
-    OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-    }
-  else if (needstype && needsscript)
-    scriptreg = TMP3;
-  /* In all other cases only one of them was specified, and that can goes to TMP1. */
-
-  if (needsscript)
-    {
-    if (scriptreg == TMP1)
-      {
-      OP1(SLJIT_MOV, scriptreg, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
-      OP1(SLJIT_MOV_UB, scriptreg, 0, SLJIT_MEM2(scriptreg, TMP2), 3);
-      }
-    else
-      {
-      OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 3);
-      OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
-      OP1(SLJIT_MOV_UB, scriptreg, 0, SLJIT_MEM1(TMP2), 0);
-      }
-    }
-  }
-#endif
-
-/* Generating code. */
-charoffset = 0;
-numberofcmps = 0;
-#ifdef SUPPORT_UCP
-typeoffset = 0;
-#endif
-
-while (*cc != XCL_END)
-  {
-  compares--;
-  invertcmp = (compares == 0 && list != backtracks);
-  jump = NULL;
-
-  if (*cc == XCL_SINGLE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-
-    if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
-      {
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, numberofcmps == 0 ? SLJIT_UNUSED : TMP2, 0, SLJIT_EQUAL);
-      numberofcmps++;
-      }
-    else if (numberofcmps > 0)
-      {
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      numberofcmps = 0;
-      }
-    else
-      {
-      jump = CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      numberofcmps = 0;
-      }
-    }
-  else if (*cc == XCL_RANGE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-    SET_CHAR_OFFSET(c);
-    GETCHARINCTEST(c, cc);
-
-    if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
-      {
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, numberofcmps == 0 ? SLJIT_UNUSED : TMP2, 0, SLJIT_LESS_EQUAL);
-      numberofcmps++;
-      }
-    else if (numberofcmps > 0)
-      {
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      numberofcmps = 0;
-      }
-    else
-      {
-      jump = CMP(SLJIT_LESS_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      numberofcmps = 0;
-      }
-    }
-#ifdef SUPPORT_UCP
-  else
-    {
-    if (*cc == XCL_NOTPROP)
-      invertcmp ^= 0x1;
-    cc++;
-    switch(*cc)
-      {
-      case PT_ANY:
-      if (list != backtracks)
-        {
-        if ((cc[-1] == XCL_NOTPROP && compares > 0) || (cc[-1] == XCL_PROP && compares == 0))
-          continue;
-        }
-      else if (cc[-1] == XCL_NOTPROP)
-        continue;
-      jump = JUMP(SLJIT_JUMP);
-      break;
-
-      case PT_LAMP:
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - typeoffset);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Ll - typeoffset);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lt - typeoffset);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_GC:
-      c = PRIV(ucp_typerange)[(int)cc[1] * 2];
-      SET_TYPE_OFFSET(c);
-      jump = CMP(SLJIT_LESS_EQUAL ^ invertcmp, typereg, 0, SLJIT_IMM, PRIV(ucp_typerange)[(int)cc[1] * 2 + 1] - c);
-      break;
-
-      case PT_PC:
-      jump = CMP(SLJIT_EQUAL ^ invertcmp, typereg, 0, SLJIT_IMM, (int)cc[1] - typeoffset);
-      break;
-
-      case PT_SC:
-      jump = CMP(SLJIT_EQUAL ^ invertcmp, scriptreg, 0, SLJIT_IMM, (int)cc[1]);
-      break;
-
-      case PT_SPACE:
-      case PT_PXSPACE:
-      SET_CHAR_OFFSET(9);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd - 0x9);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x9);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e - 0x9);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-      SET_TYPE_OFFSET(ucp_Zl);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Zl);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_WORD:
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_UNDERSCORE - charoffset));
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-      /* Fall through. */
-
-      case PT_ALNUM:
-      SET_TYPE_OFFSET(ucp_Ll);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
-      OP_FLAGS((*cc == PT_ALNUM) ? SLJIT_MOV : SLJIT_OR, TMP2, 0, (*cc == PT_ALNUM) ? SLJIT_UNUSED : TMP2, 0, SLJIT_LESS_EQUAL);
-      SET_TYPE_OFFSET(ucp_Nd);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_No - ucp_Nd);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_CLIST:
-      other_cases = PRIV(ucd_caseless_sets) + cc[1];
-
-      /* At least three characters are required.
-         Otherwise this case would be handled by the normal code path. */
-      SLJIT_ASSERT(other_cases[0] != NOTACHAR && other_cases[1] != NOTACHAR && other_cases[2] != NOTACHAR);
-      SLJIT_ASSERT(other_cases[0] < other_cases[1] && other_cases[1] < other_cases[2]);
-
-      /* Optimizing character pairs, if their difference is power of 2. */
-      if (is_powerof2(other_cases[1] ^ other_cases[0]))
-        {
-        if (charoffset == 0)
-          OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
-        else
-          {
-          OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
-          OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
-          }
-        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, other_cases[1]);
-        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-        other_cases += 2;
-        }
-      else if (is_powerof2(other_cases[2] ^ other_cases[1]))
-        {
-        if (charoffset == 0)
-          OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, other_cases[2] ^ other_cases[1]);
-        else
-          {
-          OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
-          OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
-          }
-        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, other_cases[2]);
-        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-
-        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(other_cases[0] - charoffset));
-        OP_FLAGS(SLJIT_OR | ((other_cases[3] == NOTACHAR) ? SLJIT_SET_E : 0), TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-        other_cases += 3;
-        }
-      else
-        {
-        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
-        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-        }
-
-      while (*other_cases != NOTACHAR)
-        {
-        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
-        OP_FLAGS(SLJIT_OR | ((*other_cases == NOTACHAR) ? SLJIT_SET_E : 0), TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-        }
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_UCNC:
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_DOLLAR_SIGN - charoffset));
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_COMMERCIAL_AT - charoffset));
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_GRAVE_ACCENT - charoffset));
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-      SET_CHAR_OFFSET(0xa0);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(0xd7ff - charoffset));
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-      SET_CHAR_OFFSET(0);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xe000 - 0);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_GREATER_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_PXGRAPH:
-      /* C and Z groups are the farthest two groups. */
-      SET_TYPE_OFFSET(ucp_Ll);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_So - ucp_Ll);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_GREATER);
-
-      jump = CMP(SLJIT_NOT_EQUAL, typereg, 0, SLJIT_IMM, ucp_Cf - ucp_Ll);
-
-      /* In case of ucp_Cf, we overwrite the result. */
-      SET_CHAR_OFFSET(0x2066);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e - 0x2066);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-      JUMPHERE(jump);
-      jump = CMP(SLJIT_ZERO ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
-      break;
-
-      case PT_PXPRINT:
-      /* C and Z groups are the farthest two groups. */
-      SET_TYPE_OFFSET(ucp_Ll);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_So - ucp_Ll);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_GREATER);
-
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Ll);
-      OP_FLAGS(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_NOT_EQUAL);
-
-      jump = CMP(SLJIT_NOT_EQUAL, typereg, 0, SLJIT_IMM, ucp_Cf - ucp_Ll);
-
-      /* In case of ucp_Cf, we overwrite the result. */
-      SET_CHAR_OFFSET(0x2066);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_EQUAL);
-
-      JUMPHERE(jump);
-      jump = CMP(SLJIT_ZERO ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
-      break;
-
-      case PT_PXPUNCT:
-      SET_TYPE_OFFSET(ucp_Sc);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_So - ucp_Sc);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS_EQUAL);
-
-      SET_CHAR_OFFSET(0);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x7f);
-      OP_FLAGS(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      SET_TYPE_OFFSET(ucp_Pc);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Ps - ucp_Pc);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_LESS_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-      }
-    cc += 2;
-    }
-#endif
-
-  if (jump != NULL)
-    add_jump(compiler, compares > 0 ? list : backtracks, jump);
-  }
-
-if (found != NULL)
-  set_jumps(found, LABEL());
-}
-
-#undef SET_TYPE_OFFSET
-#undef SET_CHAR_OFFSET
-
-#endif
-
-static pcre_uchar *compile_char1_matchingpath(compiler_common *common, pcre_uchar type, pcre_uchar *cc, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-int length;
-unsigned int c, oc, bit;
-compare_context context;
-struct sljit_jump *jump[4];
-jump_list *end_list;
-#ifdef SUPPORT_UTF
-struct sljit_label *label;
-#ifdef SUPPORT_UCP
-pcre_uchar propdata[5];
-#endif
-#endif /* SUPPORT_UTF */
-
-switch(type)
-  {
-  case OP_SOD:
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, TMP1, 0));
-  return cc;
-
-  case OP_SOM:
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, TMP1, 0));
-  return cc;
-
-  case OP_NOT_WORD_BOUNDARY:
-  case OP_WORD_BOUNDARY:
-  add_jump(compiler, &common->wordboundary, JUMP(SLJIT_FAST_CALL));
-  add_jump(compiler, backtracks, JUMP(type == OP_NOT_WORD_BOUNDARY ? SLJIT_NOT_ZERO : SLJIT_ZERO));
-  return cc;
-
-  case OP_NOT_DIGIT:
-  case OP_DIGIT:
-  /* Digits are usually 0-9, so it is worth to optimize them. */
-  detect_partial_match(common, backtracks);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  if (common->utf && is_char7_bitset((const pcre_uint8*)common->ctypes - cbit_length + cbit_digit, FALSE))
-    read_char7_type(common, type == OP_NOT_DIGIT);
-  else
-#endif
-    read_char8_type(common, type == OP_NOT_DIGIT);
-    /* Flip the starting bit in the negative case. */
-  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_digit);
-  add_jump(compiler, backtracks, JUMP(type == OP_DIGIT ? SLJIT_ZERO : SLJIT_NOT_ZERO));
-  return cc;
-
-  case OP_NOT_WHITESPACE:
-  case OP_WHITESPACE:
-  detect_partial_match(common, backtracks);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  if (common->utf && is_char7_bitset((const pcre_uint8*)common->ctypes - cbit_length + cbit_space, FALSE))
-    read_char7_type(common, type == OP_NOT_WHITESPACE);
-  else
-#endif
-    read_char8_type(common, type == OP_NOT_WHITESPACE);
-  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_space);
-  add_jump(compiler, backtracks, JUMP(type == OP_WHITESPACE ? SLJIT_ZERO : SLJIT_NOT_ZERO));
-  return cc;
-
-  case OP_NOT_WORDCHAR:
-  case OP_WORDCHAR:
-  detect_partial_match(common, backtracks);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  if (common->utf && is_char7_bitset((const pcre_uint8*)common->ctypes - cbit_length + cbit_word, FALSE))
-    read_char7_type(common, type == OP_NOT_WORDCHAR);
-  else
-#endif
-    read_char8_type(common, type == OP_NOT_WORDCHAR);
-  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_word);
-  add_jump(compiler, backtracks, JUMP(type == OP_WORDCHAR ? SLJIT_ZERO : SLJIT_NOT_ZERO));
-  return cc;
-
-  case OP_ANY:
-  detect_partial_match(common, backtracks);
-  read_char_range(common, common->nlmin, common->nlmax, TRUE);
-  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-    {
-    jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
-    end_list = NULL;
-    if (common->mode != JIT_PARTIAL_HARD_COMPILE)
-      add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-    else
-      check_str_end(common, &end_list);
-
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline & 0xff));
-    set_jumps(end_list, LABEL());
-    JUMPHERE(jump[0]);
-    }
-  else
-    check_newlinechar(common, common->nltype, backtracks, TRUE);
-  return cc;
-
-  case OP_ALLANY:
-  detect_partial_match(common, backtracks);
-#ifdef SUPPORT_UTF
-  if (common->utf)
-    {
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-#if defined COMPILE_PCRE8
-    jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-#elif defined COMPILE_PCRE16
-    jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-    OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_EQUAL);
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-#endif
-    JUMPHERE(jump[0]);
-#endif /* COMPILE_PCRE[8|16] */
-    return cc;
-    }
-#endif
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  return cc;
-
-  case OP_ANYBYTE:
-  detect_partial_match(common, backtracks);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  return cc;
-
-#ifdef SUPPORT_UTF
-#ifdef SUPPORT_UCP
-  case OP_NOTPROP:
-  case OP_PROP:
-  propdata[0] = XCL_HASPROP;
-  propdata[1] = type == OP_NOTPROP ? XCL_NOTPROP : XCL_PROP;
-  propdata[2] = cc[0];
-  propdata[3] = cc[1];
-  propdata[4] = XCL_END;
-  compile_xclass_matchingpath(common, propdata, backtracks);
-  return cc + 2;
-#endif
-#endif
-
-  case OP_ANYNL:
-  detect_partial_match(common, backtracks);
-  read_char_range(common, common->bsr_nlmin, common->bsr_nlmax, FALSE);
-  jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
-  /* We don't need to handle soft partial matching case. */
-  end_list = NULL;
-  if (common->mode != JIT_PARTIAL_HARD_COMPILE)
-    add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-  else
-    check_str_end(common, &end_list);
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-  jump[1] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_NL);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  jump[2] = JUMP(SLJIT_JUMP);
-  JUMPHERE(jump[0]);
-  check_newlinechar(common, common->bsr_nltype, backtracks, FALSE);
-  set_jumps(end_list, LABEL());
-  JUMPHERE(jump[1]);
-  JUMPHERE(jump[2]);
-  return cc;
-
-  case OP_NOT_HSPACE:
-  case OP_HSPACE:
-  detect_partial_match(common, backtracks);
-  read_char_range(common, 0x9, 0x3000, type == OP_NOT_HSPACE);
-  add_jump(compiler, &common->hspace, JUMP(SLJIT_FAST_CALL));
-  add_jump(compiler, backtracks, JUMP(type == OP_NOT_HSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
-  return cc;
-
-  case OP_NOT_VSPACE:
-  case OP_VSPACE:
-  detect_partial_match(common, backtracks);
-  read_char_range(common, 0xa, 0x2029, type == OP_NOT_VSPACE);
-  add_jump(compiler, &common->vspace, JUMP(SLJIT_FAST_CALL));
-  add_jump(compiler, backtracks, JUMP(type == OP_NOT_VSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
-  return cc;
-
-#ifdef SUPPORT_UCP
-  case OP_EXTUNI:
-  detect_partial_match(common, backtracks);
-  read_char(common);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, gbprop));
-  /* Optimize register allocation: use a real register. */
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-  OP1(SLJIT_MOV_UB, STACK_TOP, 0, SLJIT_MEM2(TMP1, TMP2), 3);
-
-  label = LABEL();
-  jump[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
-  read_char(common);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, gbprop));
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM2(TMP1, TMP2), 3);
-
-  OP2(SLJIT_SHL, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 2);
-  OP1(SLJIT_MOV_UI, TMP1, 0, SLJIT_MEM1(STACK_TOP), (sljit_sw)PRIV(ucp_gbtable));
-  OP1(SLJIT_MOV, STACK_TOP, 0, TMP2, 0);
-  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-  JUMPTO(SLJIT_NOT_ZERO, label);
-
-  OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-  JUMPHERE(jump[0]);
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-
-  if (common->mode == JIT_PARTIAL_HARD_COMPILE)
-    {
-    jump[0] = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-    /* Since we successfully read a char above, partial matching must occure. */
-    check_partial(common, TRUE);
-    JUMPHERE(jump[0]);
-    }
-  return cc;
-#endif
-
-  case OP_EODN:
-  /* Requires rather complex checks. */
-  jump[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-    {
-    OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (common->mode == JIT_COMPILE)
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, STR_END, 0));
-    else
-      {
-      jump[1] = CMP(SLJIT_EQUAL, TMP2, 0, STR_END, 0);
-      OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP2, 0, STR_END, 0);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_LESS);
-      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_NOT_EQUAL);
-      add_jump(compiler, backtracks, JUMP(SLJIT_NOT_EQUAL));
-      check_partial(common, TRUE);
-      add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-      JUMPHERE(jump[1]);
-      }
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff));
-    }
-  else if (common->nltype == NLTYPE_FIXED)
-    {
-    OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, STR_END, 0));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline));
-    }
-  else
-    {
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    jump[1] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
-    OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP2, 0, STR_END, 0);
-    jump[2] = JUMP(SLJIT_GREATER);
-    add_jump(compiler, backtracks, JUMP(SLJIT_LESS));
-    /* Equal. */
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    jump[3] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_NL);
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-
-    JUMPHERE(jump[1]);
-    if (common->nltype == NLTYPE_ANYCRLF)
-      {
-      OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-      add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP2, 0, STR_END, 0));
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_NL));
-      }
-    else
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, STR_PTR, 0);
-      read_char_range(common, common->nlmin, common->nlmax, TRUE);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, STR_END, 0));
-      add_jump(compiler, &common->anynewline, JUMP(SLJIT_FAST_CALL));
-      add_jump(compiler, backtracks, JUMP(SLJIT_ZERO));
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-      }
-    JUMPHERE(jump[2]);
-    JUMPHERE(jump[3]);
-    }
-  JUMPHERE(jump[0]);
-  check_partial(common, FALSE);
-  return cc;
-
-  case OP_EOD:
-  add_jump(compiler, backtracks, CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0));
-  check_partial(common, FALSE);
-  return cc;
-
-  case OP_CIRC:
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, begin));
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, TMP1, 0));
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, notbol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-  return cc;
-
-  case OP_CIRCM:
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, begin));
-  jump[1] = CMP(SLJIT_GREATER, STR_PTR, 0, TMP1, 0);
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, notbol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-  jump[0] = JUMP(SLJIT_JUMP);
-  JUMPHERE(jump[1]);
-
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-    {
-    OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP2, 0, TMP1, 0));
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff));
-    }
-  else
-    {
-    skip_char_back(common);
-    read_char_range(common, common->nlmin, common->nlmax, TRUE);
-    check_newlinechar(common, common->nltype, backtracks, FALSE);
-    }
-  JUMPHERE(jump[0]);
-  return cc;
-
-  case OP_DOLL:
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, noteol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-
-  if (!common->endonly)
-    compile_char1_matchingpath(common, OP_EODN, cc, backtracks);
-  else
-    {
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0));
-    check_partial(common, FALSE);
-    }
-  return cc;
-
-  case OP_DOLLM:
-  jump[1] = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, noteol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-  check_partial(common, FALSE);
-  jump[0] = JUMP(SLJIT_JUMP);
-  JUMPHERE(jump[1]);
-
-  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-    {
-    OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (common->mode == JIT_COMPILE)
-      add_jump(compiler, backtracks, CMP(SLJIT_GREATER, TMP2, 0, STR_END, 0));
-    else
-      {
-      jump[1] = CMP(SLJIT_LESS_EQUAL, TMP2, 0, STR_END, 0);
-      /* STR_PTR = STR_END - IN_UCHARS(1) */
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff));
-      check_partial(common, TRUE);
-      add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-      JUMPHERE(jump[1]);
-      }
-
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff));
-    }
-  else
-    {
-    peek_char(common, common->nlmax);
-    check_newlinechar(common, common->nltype, backtracks, FALSE);
-    }
-  JUMPHERE(jump[0]);
-  return cc;
-
-  case OP_CHAR:
-  case OP_CHARI:
-  length = 1;
-#ifdef SUPPORT_UTF
-  if (common->utf && HAS_EXTRALEN(*cc)) length += GET_EXTRALEN(*cc);
-#endif
-  if (common->mode == JIT_COMPILE && (type == OP_CHAR || !char_has_othercase(common, cc) || char_get_othercase_bit(common, cc) != 0))
-    {
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
-    add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
-
-    context.length = IN_UCHARS(length);
-    context.sourcereg = -1;
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-    context.ucharptr = 0;
-#endif
-    return byte_sequence_compare(common, type == OP_CHARI, cc, &context, backtracks);
-    }
-
-  detect_partial_match(common, backtracks);
-#ifdef SUPPORT_UTF
-  if (common->utf)
-    {
-    GETCHAR(c, cc);
-    }
-  else
-#endif
-    c = *cc;
-
-  if (type == OP_CHAR || !char_has_othercase(common, cc))
-    {
-    read_char_range(common, c, c, FALSE);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-    return cc + length;
-    }
-  oc = char_othercase(common, c);
-  read_char_range(common, c < oc ? c : oc, c > oc ? c : oc, FALSE);
-  bit = c ^ oc;
-  if (is_powerof2(bit))
-    {
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
-    return cc + length;
-    }
-  jump[0] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c);
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
-  JUMPHERE(jump[0]);
-  return cc + length;
-
-  case OP_NOT:
-  case OP_NOTI:
-  detect_partial_match(common, backtracks);
-  length = 1;
-#ifdef SUPPORT_UTF
-  if (common->utf)
-    {
-#ifdef COMPILE_PCRE8
-    c = *cc;
-    if (c < 128)
-      {
-      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-      if (type == OP_NOT || !char_has_othercase(common, cc))
-        add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-      else
-        {
-        /* Since UTF8 code page is fixed, we know that c is in [a-z] or [A-Z] range. */
-        OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x20);
-        add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, c | 0x20));
-        }
-      /* Skip the variable-length character. */
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-      jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-      JUMPHERE(jump[0]);
-      return cc + 1;
-      }
-    else
-#endif /* COMPILE_PCRE8 */
-      {
-      GETCHARLEN(c, cc, length);
-      }
-    }
-  else
-#endif /* SUPPORT_UTF */
-    c = *cc;
-
-  if (type == OP_NOT || !char_has_othercase(common, cc))
-    {
-    read_char_range(common, c, c, TRUE);
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-    }
-  else
-    {
-    oc = char_othercase(common, c);
-    read_char_range(common, c < oc ? c : oc, c > oc ? c : oc, TRUE);
-    bit = c ^ oc;
-    if (is_powerof2(bit))
-      {
-      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
-      }
-    else
-      {
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
-      }
-    }
-  return cc + length;
-
-  case OP_CLASS:
-  case OP_NCLASS:
-  detect_partial_match(common, backtracks);
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  bit = (common->utf && is_char7_bitset((const pcre_uint8 *)cc, type == OP_NCLASS)) ? 127 : 255;
-  read_char_range(common, 0, bit, type == OP_NCLASS);
-#else
-  read_char_range(common, 0, 255, type == OP_NCLASS);
-#endif
-
-  if (check_class_ranges(common, (const pcre_uint8 *)cc, type == OP_NCLASS, FALSE, backtracks))
-    return cc + 32 / sizeof(pcre_uchar);
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  jump[0] = NULL;
-  if (common->utf)
-    {
-    jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, bit);
-    if (type == OP_CLASS)
-      {
-      add_jump(compiler, backtracks, jump[0]);
-      jump[0] = NULL;
-      }
-    }
-#elif !defined COMPILE_PCRE8
-  jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-  if (type == OP_CLASS)
-    {
-    add_jump(compiler, backtracks, jump[0]);
-    jump[0] = NULL;
-    }
-#endif /* SUPPORT_UTF && COMPILE_PCRE8 */
-
-  OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
-  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-  add_jump(compiler, backtracks, JUMP(SLJIT_ZERO));
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  if (jump[0] != NULL)
-    JUMPHERE(jump[0]);
-#endif
-
-  return cc + 32 / sizeof(pcre_uchar);
-
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  case OP_XCLASS:
-  compile_xclass_matchingpath(common, cc + LINK_SIZE, backtracks);
-  return cc + GET(cc, 0) - 1;
-#endif
-
-  case OP_REVERSE:
-  length = GET(cc, 0);
-  if (length == 0)
-    return cc + LINK_SIZE;
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-#ifdef SUPPORT_UTF
-  if (common->utf)
-    {
-    OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, length);
-    label = LABEL();
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP3, 0));
-    skip_char_back(common);
-    OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
-    JUMPTO(SLJIT_NOT_ZERO, label);
-    }
-  else
-#endif
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, STR_PTR, 0, TMP1, 0));
-    }
-  check_start_used_ptr(common);
-  return cc + LINK_SIZE;
-  }
-SLJIT_ASSERT_STOP();
-return cc;
-}
-
-static SLJIT_INLINE pcre_uchar *compile_charn_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, jump_list **backtracks)
-{
-/* This function consumes at least one input character. */
-/* To decrease the number of length checks, we try to concatenate the fixed length character sequences. */
-DEFINE_COMPILER;
-pcre_uchar *ccbegin = cc;
-compare_context context;
-int size;
-
-context.length = 0;
-do
-  {
-  if (cc >= ccend)
-    break;
-
-  if (*cc == OP_CHAR)
-    {
-    size = 1;
-#ifdef SUPPORT_UTF
-    if (common->utf && HAS_EXTRALEN(cc[1]))
-      size += GET_EXTRALEN(cc[1]);
-#endif
-    }
-  else if (*cc == OP_CHARI)
-    {
-    size = 1;
-#ifdef SUPPORT_UTF
-    if (common->utf)
-      {
-      if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
-        size = 0;
-      else if (HAS_EXTRALEN(cc[1]))
-        size += GET_EXTRALEN(cc[1]);
-      }
-    else
-#endif
-    if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
-      size = 0;
-    }
-  else
-    size = 0;
-
-  cc += 1 + size;
-  context.length += IN_UCHARS(size);
-  }
-while (size > 0 && context.length <= 128);
-
-cc = ccbegin;
-if (context.length > 0)
-  {
-  /* We have a fixed-length byte sequence. */
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, context.length);
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
-
-  context.sourcereg = -1;
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  context.ucharptr = 0;
-#endif
-  do cc = byte_sequence_compare(common, *cc == OP_CHARI, cc + 1, &context, backtracks); while (context.length > 0);
-  return cc;
-  }
-
-/* A non-fixed length character will be checked if length == 0. */
-return compile_char1_matchingpath(common, *cc, cc + 1, backtracks);
-}
-
-/* Forward definitions. */
-static void compile_matchingpath(compiler_common *, pcre_uchar *, pcre_uchar *, backtrack_common *);
-static void compile_backtrackingpath(compiler_common *, struct backtrack_common *);
-
-#define PUSH_BACKTRACK(size, ccstart, error) \
-  do \
-    { \
-    backtrack = sljit_alloc_memory(compiler, (size)); \
-    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler))) \
-      return error; \
-    memset(backtrack, 0, size); \
-    backtrack->prev = parent->top; \
-    backtrack->cc = (ccstart); \
-    parent->top = backtrack; \
-    } \
-  while (0)
-
-#define PUSH_BACKTRACK_NOVALUE(size, ccstart) \
-  do \
-    { \
-    backtrack = sljit_alloc_memory(compiler, (size)); \
-    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler))) \
-      return; \
-    memset(backtrack, 0, size); \
-    backtrack->prev = parent->top; \
-    backtrack->cc = (ccstart); \
-    parent->top = backtrack; \
-    } \
-  while (0)
-
-#define BACKTRACK_AS(type) ((type *)backtrack)
-
-static void compile_dnref_search(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)
-{
-/* The OVECTOR offset goes to TMP2. */
-DEFINE_COMPILER;
-int count = GET2(cc, 1 + IMM2_SIZE);
-pcre_uchar *slot = common->name_table + GET2(cc, 1) * common->name_entry_size;
-unsigned int offset;
-jump_list *found = NULL;
-
-SLJIT_ASSERT(*cc == OP_DNREF || *cc == OP_DNREFI);
-
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1));
-
-count--;
-while (count-- > 0)
-  {
-  offset = GET2(slot, 0) << 1;
-  GET_LOCAL_BASE(TMP2, 0, OVECTOR(offset));
-  add_jump(compiler, &found, CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0));
-  slot += common->name_entry_size;
-  }
-
-offset = GET2(slot, 0) << 1;
-GET_LOCAL_BASE(TMP2, 0, OVECTOR(offset));
-if (backtracks != NULL && !common->jscript_compat)
-  add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0));
-
-set_jumps(found, LABEL());
-}
-
-static void compile_ref_matchingpath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks, BOOL withchecks, BOOL emptyfail)
-{
-DEFINE_COMPILER;
-BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
-int offset = 0;
-struct sljit_jump *jump = NULL;
-struct sljit_jump *partial;
-struct sljit_jump *nopartial;
-
-if (ref)
-  {
-  offset = GET2(cc, 1) << 1;
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-  /* OVECTOR(1) contains the "string begin - 1" constant. */
-  if (withchecks && !common->jscript_compat)
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
-  }
-else
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-if (common->utf && *cc == OP_REFI)
-  {
-  SLJIT_ASSERT(TMP1 == SLJIT_R0 && STACK_TOP == SLJIT_R1 && TMP2 == SLJIT_R2);
-  if (ref)
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-  else
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
-
-  if (withchecks)
-    jump = CMP(SLJIT_EQUAL, TMP1, 0, TMP2, 0);
-
-  /* Needed to save important temporary registers. */
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-  OP1(SLJIT_MOV, SLJIT_R1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, uchar_ptr), STR_PTR, 0);
-  sljit_emit_ijump(compiler, SLJIT_CALL3, SLJIT_IMM, SLJIT_FUNC_OFFSET(do_utf_caselesscmp));
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-  if (common->mode == JIT_COMPILE)
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1));
-  else
-    {
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
-    nopartial = CMP(SLJIT_NOT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);
-    check_partial(common, FALSE);
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-    JUMPHERE(nopartial);
-    }
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_RETURN_REG, 0);
-  }
-else
-#endif /* SUPPORT_UTF && SUPPORT_UCP */
-  {
-  if (ref)
-    OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP1, 0);
-  else
-    OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw), TMP1, 0);
-
-  if (withchecks)
-    jump = JUMP(SLJIT_ZERO);
-
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-  partial = CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0);
-  if (common->mode == JIT_COMPILE)
-    add_jump(compiler, backtracks, partial);
-
-  add_jump(compiler, *cc == OP_REF ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-
-  if (common->mode != JIT_COMPILE)
-    {
-    nopartial = JUMP(SLJIT_JUMP);
-    JUMPHERE(partial);
-    /* TMP2 -= STR_END - STR_PTR */
-    OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, STR_PTR, 0);
-    OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, STR_END, 0);
-    partial = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0);
-    OP1(SLJIT_MOV, STR_PTR, 0, STR_END, 0);
-    add_jump(compiler, *cc == OP_REF ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-    JUMPHERE(partial);
-    check_partial(common, FALSE);
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-    JUMPHERE(nopartial);
-    }
-  }
-
-if (jump != NULL)
-  {
-  if (emptyfail)
-    add_jump(compiler, backtracks, jump);
-  else
-    JUMPHERE(jump);
-  }
-}
-
-static SLJIT_INLINE pcre_uchar *compile_ref_iterator_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
-backtrack_common *backtrack;
-pcre_uchar type;
-int offset = 0;
-struct sljit_label *label;
-struct sljit_jump *zerolength;
-struct sljit_jump *jump = NULL;
-pcre_uchar *ccbegin = cc;
-int min = 0, max = 0;
-BOOL minimize;
-
-PUSH_BACKTRACK(sizeof(iterator_backtrack), cc, NULL);
-
-if (ref)
-  offset = GET2(cc, 1) << 1;
-else
-  cc += IMM2_SIZE;
-type = cc[1 + IMM2_SIZE];
-
-SLJIT_COMPILE_ASSERT((OP_CRSTAR & 0x1) == 0, crstar_opcode_must_be_even);
-minimize = (type & 0x1) != 0;
-switch(type)
-  {
-  case OP_CRSTAR:
-  case OP_CRMINSTAR:
-  min = 0;
-  max = 0;
-  cc += 1 + IMM2_SIZE + 1;
-  break;
-  case OP_CRPLUS:
-  case OP_CRMINPLUS:
-  min = 1;
-  max = 0;
-  cc += 1 + IMM2_SIZE + 1;
-  break;
-  case OP_CRQUERY:
-  case OP_CRMINQUERY:
-  min = 0;
-  max = 1;
-  cc += 1 + IMM2_SIZE + 1;
-  break;
-  case OP_CRRANGE:
-  case OP_CRMINRANGE:
-  min = GET2(cc, 1 + IMM2_SIZE + 1);
-  max = GET2(cc, 1 + IMM2_SIZE + 1 + IMM2_SIZE);
-  cc += 1 + IMM2_SIZE + 1 + 2 * IMM2_SIZE;
-  break;
-  default:
-  SLJIT_ASSERT_STOP();
-  break;
-  }
-
-if (!minimize)
-  {
-  if (min == 0)
-    {
-    allocate_stack(common, 2);
-    if (ref)
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);
-    /* Temporary release of STR_PTR. */
-    OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
-    /* Handles both invalid and empty cases. Since the minimum repeat,
-    is zero the invalid case is basically the same as an empty case. */
-    if (ref)
-      zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-    else
-      {
-      compile_dnref_search(common, ccbegin, NULL);
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, TMP2, 0);
-      zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
-      }
-    /* Restore if not zero length. */
-    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
-    }
-  else
-    {
-    allocate_stack(common, 1);
-    if (ref)
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-    if (ref)
-      {
-      add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
-      zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-      }
-    else
-      {
-      compile_dnref_search(common, ccbegin, &backtrack->topbacktracks);
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, TMP2, 0);
-      zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
-      }
-    }
-
-  if (min > 1 || max > 1)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, SLJIT_IMM, 0);
-
-  label = LABEL();
-  if (!ref)
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1);
-  compile_ref_matchingpath(common, ccbegin, &backtrack->topbacktracks, FALSE, FALSE);
-
-  if (min > 1 || max > 1)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0);
-    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, TMP1, 0);
-    if (min > 1)
-      CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, min, label);
-    if (max > 1)
-      {
-      jump = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, max);
-      allocate_stack(common, 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-      JUMPTO(SLJIT_JUMP, label);
-      JUMPHERE(jump);
-      }
-    }
-
-  if (max == 0)
-    {
-    /* Includes min > 1 case as well. */
-    allocate_stack(common, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-    JUMPTO(SLJIT_JUMP, label);
-    }
-
-  JUMPHERE(zerolength);
-  BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
-
-  count_match(common);
-  return cc;
-  }
-
-allocate_stack(common, ref ? 2 : 3);
-if (ref)
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-if (type != OP_CRMINSTAR)
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);
-
-if (min == 0)
-  {
-  /* Handles both invalid and empty cases. Since the minimum repeat,
-  is zero the invalid case is basically the same as an empty case. */
-  if (ref)
-    zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-  else
-    {
-    compile_dnref_search(common, ccbegin, NULL);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(2), TMP2, 0);
-    zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
-    }
-  /* Length is non-zero, we can match real repeats. */
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-  jump = JUMP(SLJIT_JUMP);
-  }
-else
-  {
-  if (ref)
-    {
-    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
-    zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-    }
-  else
-    {
-    compile_dnref_search(common, ccbegin, &backtrack->topbacktracks);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(2), TMP2, 0);
-    zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
-    }
-  }
-
-BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
-if (max > 0)
-  add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, max));
-
-if (!ref)
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(2));
-compile_ref_matchingpath(common, ccbegin, &backtrack->topbacktracks, TRUE, TRUE);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-
-if (min > 1)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
-  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, min, BACKTRACK_AS(iterator_backtrack)->matchingpath);
-  }
-else if (max > 0)
-  OP2(SLJIT_ADD, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 1);
-
-if (jump != NULL)
-  JUMPHERE(jump);
-JUMPHERE(zerolength);
-
-count_match(common);
-return cc;
-}
-
-static SLJIT_INLINE pcre_uchar *compile_recurse_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-recurse_entry *entry = common->entries;
-recurse_entry *prev = NULL;
-sljit_sw start = GET(cc, 1);
-pcre_uchar *start_cc;
-BOOL needs_control_head;
-
-PUSH_BACKTRACK(sizeof(recurse_backtrack), cc, NULL);
-
-/* Inlining simple patterns. */
-if (get_framesize(common, common->start + start, NULL, TRUE, &needs_control_head) == no_stack)
-  {
-  start_cc = common->start + start;
-  compile_matchingpath(common, next_opcode(common, start_cc), bracketend(start_cc) - (1 + LINK_SIZE), backtrack);
-  BACKTRACK_AS(recurse_backtrack)->inlined_pattern = TRUE;
-  return cc + 1 + LINK_SIZE;
-  }
-
-while (entry != NULL)
-  {
-  if (entry->start == start)
-    break;
-  prev = entry;
-  entry = entry->next;
-  }
-
-if (entry == NULL)
-  {
-  entry = sljit_alloc_memory(compiler, sizeof(recurse_entry));
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    return NULL;
-  entry->next = NULL;
-  entry->entry = NULL;
-  entry->calls = NULL;
-  entry->start = start;
-
-  if (prev != NULL)
-    prev->next = entry;
-  else
-    common->entries = entry;
-  }
-
-if (common->has_set_som && common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-  allocate_stack(common, 2);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
-  }
-else if (common->has_set_som || common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->has_set_som ? (int)(OVECTOR(0)) : common->mark_ptr);
-  allocate_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-  }
-
-if (entry->entry == NULL)
-  add_jump(compiler, &entry->calls, JUMP(SLJIT_FAST_CALL));
-else
-  JUMPTO(SLJIT_FAST_CALL, entry->entry);
-/* Leave if the match is failed. */
-add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0));
-return cc + 1 + LINK_SIZE;
-}
-
-static int SLJIT_CALL do_callout(struct jit_arguments *arguments, PUBL(callout_block) *callout_block, pcre_uchar **jit_ovector)
-{
-const pcre_uchar *begin = arguments->begin;
-int *offset_vector = arguments->offsets;
-int offset_count = arguments->offset_count;
-int i;
-
-if (PUBL(callout) == NULL)
-  return 0;
-
-callout_block->version = 2;
-callout_block->callout_data = arguments->callout_data;
-
-/* Offsets in subject. */
-callout_block->subject_length = arguments->end - arguments->begin;
-callout_block->start_match = (pcre_uchar*)callout_block->subject - arguments->begin;
-callout_block->current_position = (pcre_uchar*)callout_block->offset_vector - arguments->begin;
-#if defined COMPILE_PCRE8
-callout_block->subject = (PCRE_SPTR)begin;
-#elif defined COMPILE_PCRE16
-callout_block->subject = (PCRE_SPTR16)begin;
-#elif defined COMPILE_PCRE32
-callout_block->subject = (PCRE_SPTR32)begin;
-#endif
-
-/* Convert and copy the JIT offset vector to the offset_vector array. */
-callout_block->capture_top = 0;
-callout_block->offset_vector = offset_vector;
-for (i = 2; i < offset_count; i += 2)
-  {
-  offset_vector[i] = jit_ovector[i] - begin;
-  offset_vector[i + 1] = jit_ovector[i + 1] - begin;
-  if (jit_ovector[i] >= begin)
-    callout_block->capture_top = i;
-  }
-
-callout_block->capture_top = (callout_block->capture_top >> 1) + 1;
-if (offset_count > 0)
-  offset_vector[0] = -1;
-if (offset_count > 1)
-  offset_vector[1] = -1;
-return (*PUBL(callout))(callout_block);
-}
-
-/* Aligning to 8 byte. */
-#define CALLOUT_ARG_SIZE \
-    (((int)sizeof(PUBL(callout_block)) + 7) & ~7)
-
-#define CALLOUT_ARG_OFFSET(arg) \
-    (-CALLOUT_ARG_SIZE + SLJIT_OFFSETOF(PUBL(callout_block), arg))
-
-static SLJIT_INLINE pcre_uchar *compile_callout_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-
-PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL);
-
-allocate_stack(common, CALLOUT_ARG_SIZE / sizeof(sljit_sw));
-
-SLJIT_ASSERT(common->capture_last_ptr != 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr);
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_number), SLJIT_IMM, cc[1]);
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(capture_last), TMP2, 0);
-
-/* These pointer sized fields temporarly stores internal variables. */
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(offset_vector), STR_PTR, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(subject), TMP2, 0);
-
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr));
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(pattern_position), SLJIT_IMM, GET(cc, 2));
-OP1(SLJIT_MOV_SI, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(next_item_length), SLJIT_IMM, GET(cc, 2 + LINK_SIZE));
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(mark), (common->mark_ptr != 0) ? TMP2 : SLJIT_IMM, 0);
-
-/* Needed to save important temporary registers. */
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-OP2(SLJIT_SUB, SLJIT_R1, 0, STACK_TOP, 0, SLJIT_IMM, CALLOUT_ARG_SIZE);
-GET_LOCAL_BASE(SLJIT_R2, 0, OVECTOR_START);
-sljit_emit_ijump(compiler, SLJIT_CALL3, SLJIT_IMM, SLJIT_FUNC_OFFSET(do_callout));
-OP1(SLJIT_MOV_SI, SLJIT_RETURN_REG, 0, SLJIT_RETURN_REG, 0);
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-free_stack(common, CALLOUT_ARG_SIZE / sizeof(sljit_sw));
-
-/* Check return value. */
-OP2(SLJIT_SUB | SLJIT_SET_S, SLJIT_UNUSED, 0, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
-add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_SIG_GREATER));
-if (common->forced_quit_label == NULL)
-  add_jump(compiler, &common->forced_quit, JUMP(SLJIT_SIG_LESS));
-else
-  JUMPTO(SLJIT_SIG_LESS, common->forced_quit_label);
-return cc + 2 + 2 * LINK_SIZE;
-}
-
-#undef CALLOUT_ARG_SIZE
-#undef CALLOUT_ARG_OFFSET
-
-static pcre_uchar *compile_assert_matchingpath(compiler_common *common, pcre_uchar *cc, assert_backtrack *backtrack, BOOL conditional)
-{
-DEFINE_COMPILER;
-int framesize;
-int extrasize;
-BOOL needs_control_head;
-int private_data_ptr;
-backtrack_common altbacktrack;
-pcre_uchar *ccbegin;
-pcre_uchar opcode;
-pcre_uchar bra = OP_BRA;
-jump_list *tmp = NULL;
-jump_list **target = (conditional) ? &backtrack->condfailed : &backtrack->common.topbacktracks;
-jump_list **found;
-/* Saving previous accept variables. */
-BOOL save_local_exit = common->local_exit;
-BOOL save_positive_assert = common->positive_assert;
-then_trap_backtrack *save_then_trap = common->then_trap;
-struct sljit_label *save_quit_label = common->quit_label;
-struct sljit_label *save_accept_label = common->accept_label;
-jump_list *save_quit = common->quit;
-jump_list *save_positive_assert_quit = common->positive_assert_quit;
-jump_list *save_accept = common->accept;
-struct sljit_jump *jump;
-struct sljit_jump *brajump = NULL;
-
-/* Assert captures then. */
-common->then_trap = NULL;
-
-if (*cc == OP_BRAZERO || *cc == OP_BRAMINZERO)
-  {
-  SLJIT_ASSERT(!conditional);
-  bra = *cc;
-  cc++;
-  }
-private_data_ptr = PRIVATE_DATA(cc);
-SLJIT_ASSERT(private_data_ptr != 0);
-framesize = get_framesize(common, cc, NULL, FALSE, &needs_control_head);
-backtrack->framesize = framesize;
-backtrack->private_data_ptr = private_data_ptr;
-opcode = *cc;
-SLJIT_ASSERT(opcode >= OP_ASSERT && opcode <= OP_ASSERTBACK_NOT);
-found = (opcode == OP_ASSERT || opcode == OP_ASSERTBACK) ? &tmp : target;
-ccbegin = cc;
-cc += GET(cc, 1);
-
-if (bra == OP_BRAMINZERO)
-  {
-  /* This is a braminzero backtrack path. */
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  brajump = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-  }
-
-if (framesize < 0)
-  {
-  extrasize = needs_control_head ? 2 : 1;
-  if (framesize == no_frame)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STACK_TOP, 0);
-  allocate_stack(common, extrasize);
-  if (needs_control_head)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-  if (needs_control_head)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
-    }
-  }
-else
-  {
-  extrasize = needs_control_head ? 3 : 2;
-  allocate_stack(common, framesize + extrasize);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-  OP2(SLJIT_SUB, TMP2, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + extrasize) * sizeof(sljit_sw));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP2, 0);
-  if (needs_control_head)
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-  if (needs_control_head)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(2), TMP1, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP2, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-    }
-  else
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
-  init_frame(common, ccbegin, NULL, framesize + extrasize - 1, extrasize, FALSE);
-  }
-
-memset(&altbacktrack, 0, sizeof(backtrack_common));
-if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
-  {
-  /* Negative assert is stronger than positive assert. */
-  common->local_exit = TRUE;
-  common->quit_label = NULL;
-  common->quit = NULL;
-  common->positive_assert = FALSE;
-  }
-else
-  common->positive_assert = TRUE;
-common->positive_assert_quit = NULL;
-
-while (1)
-  {
-  common->accept_label = NULL;
-  common->accept = NULL;
-  altbacktrack.top = NULL;
-  altbacktrack.topbacktracks = NULL;
-
-  if (*ccbegin == OP_ALT)
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-
-  altbacktrack.cc = ccbegin;
-  compile_matchingpath(common, ccbegin + 1 + LINK_SIZE, cc, &altbacktrack);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    {
-    if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
-      {
-      common->local_exit = save_local_exit;
-      common->quit_label = save_quit_label;
-      common->quit = save_quit;
-      }
-    common->positive_assert = save_positive_assert;
-    common->then_trap = save_then_trap;
-    common->accept_label = save_accept_label;
-    common->positive_assert_quit = save_positive_assert_quit;
-    common->accept = save_accept;
-    return NULL;
-    }
-  common->accept_label = LABEL();
-  if (common->accept != NULL)
-    set_jumps(common->accept, common->accept_label);
-
-  /* Reset stack. */
-  if (framesize < 0)
-    {
-    if (framesize == no_frame)
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    else
-      free_stack(common, extrasize);
-    if (needs_control_head)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), 0);
-    }
-  else
-    {
-    if ((opcode != OP_ASSERT_NOT && opcode != OP_ASSERTBACK_NOT) || conditional)
-      {
-      /* We don't need to keep the STR_PTR, only the previous private_data_ptr. */
-      OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, (framesize + 1) * sizeof(sljit_sw));
-      if (needs_control_head)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), 0);
-      }
-    else
-      {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      if (needs_control_head)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), (framesize + 1) * sizeof(sljit_sw));
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      }
-    }
-
-  if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
-    {
-    /* We know that STR_PTR was stored on the top of the stack. */
-    if (conditional)
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), needs_control_head ? sizeof(sljit_sw) : 0);
-    else if (bra == OP_BRAZERO)
-      {
-      if (framesize < 0)
-        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), (extrasize - 1) * sizeof(sljit_sw));
-      else
-        {
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_sw));
-        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), (framesize + extrasize - 1) * sizeof(sljit_sw));
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
-        }
-      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    else if (framesize >= 0)
-      {
-      /* For OP_BRA and OP_BRAMINZERO. */
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_sw));
-      }
-    }
-  add_jump(compiler, found, JUMP(SLJIT_JUMP));
-
-  compile_backtrackingpath(common, altbacktrack.top);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    {
-    if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
-      {
-      common->local_exit = save_local_exit;
-      common->quit_label = save_quit_label;
-      common->quit = save_quit;
-      }
-    common->positive_assert = save_positive_assert;
-    common->then_trap = save_then_trap;
-    common->accept_label = save_accept_label;
-    common->positive_assert_quit = save_positive_assert_quit;
-    common->accept = save_accept;
-    return NULL;
-    }
-  set_jumps(altbacktrack.topbacktracks, LABEL());
-
-  if (*cc != OP_ALT)
-    break;
-
-  ccbegin = cc;
-  cc += GET(cc, 1);
-  }
-
-if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
-  {
-  SLJIT_ASSERT(common->positive_assert_quit == NULL);
-  /* Makes the check less complicated below. */
-  common->positive_assert_quit = common->quit;
-  }
-
-/* None of them matched. */
-if (common->positive_assert_quit != NULL)
-  {
-  jump = JUMP(SLJIT_JUMP);
-  set_jumps(common->positive_assert_quit, LABEL());
-  SLJIT_ASSERT(framesize != no_stack);
-  if (framesize < 0)
-    OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, extrasize * sizeof(sljit_sw));
-  else
-    {
-    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + extrasize) * sizeof(sljit_sw));
-    }
-  JUMPHERE(jump);
-  }
-
-if (needs_control_head)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(1));
-
-if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK)
-  {
-  /* Assert is failed. */
-  if (conditional || bra == OP_BRAZERO)
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-
-  if (framesize < 0)
-    {
-    /* The topmost item should be 0. */
-    if (bra == OP_BRAZERO)
-      {
-      if (extrasize == 2)
-        free_stack(common, 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    else
-      free_stack(common, extrasize);
-    }
-  else
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(extrasize - 1));
-    /* The topmost item should be 0. */
-    if (bra == OP_BRAZERO)
-      {
-      free_stack(common, framesize + extrasize - 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    else
-      free_stack(common, framesize + extrasize);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
-    }
-  jump = JUMP(SLJIT_JUMP);
-  if (bra != OP_BRAZERO)
-    add_jump(compiler, target, jump);
-
-  /* Assert is successful. */
-  set_jumps(tmp, LABEL());
-  if (framesize < 0)
-    {
-    /* We know that STR_PTR was stored on the top of the stack. */
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), (extrasize - 1) * sizeof(sljit_sw));
-    /* Keep the STR_PTR on the top of the stack. */
-    if (bra == OP_BRAZERO)
-      {
-      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
-      if (extrasize == 2)
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-      }
-    else if (bra == OP_BRAMINZERO)
-      {
-      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    }
-  else
-    {
-    if (bra == OP_BRA)
-      {
-      /* We don't need to keep the STR_PTR, only the previous private_data_ptr. */
-      OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, (framesize + 1) * sizeof(sljit_sw));
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), (extrasize - 2) * sizeof(sljit_sw));
-      }
-    else
-      {
-      /* We don't need to keep the STR_PTR, only the previous private_data_ptr. */
-      OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, (framesize + 2) * sizeof(sljit_sw));
-      if (extrasize == 2)
-        {
-        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-        if (bra == OP_BRAMINZERO)
-          OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-        }
-      else
-        {
-        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), bra == OP_BRAZERO ? STR_PTR : SLJIT_IMM, 0);
-        }
-      }
-    }
-
-  if (bra == OP_BRAZERO)
-    {
-    backtrack->matchingpath = LABEL();
-    SET_LABEL(jump, backtrack->matchingpath);
-    }
-  else if (bra == OP_BRAMINZERO)
-    {
-    JUMPTO(SLJIT_JUMP, backtrack->matchingpath);
-    JUMPHERE(brajump);
-    if (framesize >= 0)
-      {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_sw));
-      }
-    set_jumps(backtrack->common.topbacktracks, LABEL());
-    }
-  }
-else
-  {
-  /* AssertNot is successful. */
-  if (framesize < 0)
-    {
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    if (bra != OP_BRA)
-      {
-      if (extrasize == 2)
-        free_stack(common, 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    else
-      free_stack(common, extrasize);
-    }
-  else
-    {
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(extrasize - 1));
-    /* The topmost item should be 0. */
-    if (bra != OP_BRA)
-      {
-      free_stack(common, framesize + extrasize - 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    else
-      free_stack(common, framesize + extrasize);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
-    }
-
-  if (bra == OP_BRAZERO)
-    backtrack->matchingpath = LABEL();
-  else if (bra == OP_BRAMINZERO)
-    {
-    JUMPTO(SLJIT_JUMP, backtrack->matchingpath);
-    JUMPHERE(brajump);
-    }
-
-  if (bra != OP_BRA)
-    {
-    SLJIT_ASSERT(found == &backtrack->common.topbacktracks);
-    set_jumps(backtrack->common.topbacktracks, LABEL());
-    backtrack->common.topbacktracks = NULL;
-    }
-  }
-
-if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
-  {
-  common->local_exit = save_local_exit;
-  common->quit_label = save_quit_label;
-  common->quit = save_quit;
-  }
-common->positive_assert = save_positive_assert;
-common->then_trap = save_then_trap;
-common->accept_label = save_accept_label;
-common->positive_assert_quit = save_positive_assert_quit;
-common->accept = save_accept;
-return cc + 1 + LINK_SIZE;
-}
-
-static SLJIT_INLINE void match_once_common(compiler_common *common, pcre_uchar ket, int framesize, int private_data_ptr, BOOL has_alternatives, BOOL needs_control_head)
-{
-DEFINE_COMPILER;
-int stacksize;
-
-if (framesize < 0)
-  {
-  if (framesize == no_frame)
-    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-  else
-    {
-    stacksize = needs_control_head ? 1 : 0;
-    if (ket != OP_KET || has_alternatives)
-      stacksize++;
-    free_stack(common, stacksize);
-    }
-
-  if (needs_control_head)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), (ket != OP_KET || has_alternatives) ? sizeof(sljit_sw) : 0);
-
-  /* TMP2 which is set here used by OP_KETRMAX below. */
-  if (ket == OP_KETRMAX)
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), 0);
-  else if (ket == OP_KETRMIN)
-    {
-    /* Move the STR_PTR to the private_data_ptr. */
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), 0);
-    }
-  }
-else
-  {
-  stacksize = (ket != OP_KET || has_alternatives) ? 2 : 1;
-  OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, (framesize + stacksize) * sizeof(sljit_sw));
-  if (needs_control_head)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), 0);
-
-  if (ket == OP_KETRMAX)
-    {
-    /* TMP2 which is set here used by OP_KETRMAX below. */
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    }
-  }
-if (needs_control_head)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, TMP1, 0);
-}
-
-static SLJIT_INLINE int match_capture_common(compiler_common *common, int stacksize, int offset, int private_data_ptr)
-{
-DEFINE_COMPILER;
-
-if (common->capture_last_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, SLJIT_IMM, offset >> 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP1, 0);
-  stacksize++;
-  }
-if (common->optimized_cbracket[offset >> 1] == 0)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP1, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize + 1), TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-  stacksize += 2;
-  }
-return stacksize;
-}
-
-/*
-  Handling bracketed expressions is probably the most complex part.
-
-  Stack layout naming characters:
-    S - Push the current STR_PTR
-    0 - Push a 0 (NULL)
-    A - Push the current STR_PTR. Needed for restoring the STR_PTR
-        before the next alternative. Not pushed if there are no alternatives.
-    M - Any values pushed by the current alternative. Can be empty, or anything.
-    C - Push the previous OVECTOR(i), OVECTOR(i+1) and OVECTOR_PRIV(i) to the stack.
-    L - Push the previous local (pointed by localptr) to the stack
-   () - opional values stored on the stack
-  ()* - optonal, can be stored multiple times
-
-  The following list shows the regular expression templates, their PCRE byte codes
-  and stack layout supported by pcre-sljit.
-
-  (?:)                     OP_BRA     | OP_KET                A M
-  ()                       OP_CBRA    | OP_KET                C M
-  (?:)+                    OP_BRA     | OP_KETRMAX        0   A M S   ( A M S )*
-                           OP_SBRA    | OP_KETRMAX        0   L M S   ( L M S )*
-  (?:)+?                   OP_BRA     | OP_KETRMIN        0   A M S   ( A M S )*
-                           OP_SBRA    | OP_KETRMIN        0   L M S   ( L M S )*
-  ()+                      OP_CBRA    | OP_KETRMAX        0   C M S   ( C M S )*
-                           OP_SCBRA   | OP_KETRMAX        0   C M S   ( C M S )*
-  ()+?                     OP_CBRA    | OP_KETRMIN        0   C M S   ( C M S )*
-                           OP_SCBRA   | OP_KETRMIN        0   C M S   ( C M S )*
-  (?:)?    OP_BRAZERO    | OP_BRA     | OP_KET            S ( A M 0 )
-  (?:)??   OP_BRAMINZERO | OP_BRA     | OP_KET            S ( A M 0 )
-  ()?      OP_BRAZERO    | OP_CBRA    | OP_KET            S ( C M 0 )
-  ()??     OP_BRAMINZERO | OP_CBRA    | OP_KET            S ( C M 0 )
-  (?:)*    OP_BRAZERO    | OP_BRA     | OP_KETRMAX      S 0 ( A M S )*
-           OP_BRAZERO    | OP_SBRA    | OP_KETRMAX      S 0 ( L M S )*
-  (?:)*?   OP_BRAMINZERO | OP_BRA     | OP_KETRMIN      S 0 ( A M S )*
-           OP_BRAMINZERO | OP_SBRA    | OP_KETRMIN      S 0 ( L M S )*
-  ()*      OP_BRAZERO    | OP_CBRA    | OP_KETRMAX      S 0 ( C M S )*
-           OP_BRAZERO    | OP_SCBRA   | OP_KETRMAX      S 0 ( C M S )*
-  ()*?     OP_BRAMINZERO | OP_CBRA    | OP_KETRMIN      S 0 ( C M S )*
-           OP_BRAMINZERO | OP_SCBRA   | OP_KETRMIN      S 0 ( C M S )*
-
-
-  Stack layout naming characters:
-    A - Push the alternative index (starting from 0) on the stack.
-        Not pushed if there is no alternatives.
-    M - Any values pushed by the current alternative. Can be empty, or anything.
-
-  The next list shows the possible content of a bracket:
-  (|)     OP_*BRA    | OP_ALT ...         M A
-  (?()|)  OP_*COND   | OP_ALT             M A
-  (?>|)   OP_ONCE    | OP_ALT ...         [stack trace] M A
-  (?>|)   OP_ONCE_NC | OP_ALT ...         [stack trace] M A
-                                          Or nothing, if trace is unnecessary
-*/
-
-static pcre_uchar *compile_bracket_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-pcre_uchar opcode;
-int private_data_ptr = 0;
-int offset = 0;
-int i, stacksize;
-int repeat_ptr = 0, repeat_length = 0;
-int repeat_type = 0, repeat_count = 0;
-pcre_uchar *ccbegin;
-pcre_uchar *matchingpath;
-pcre_uchar *slot;
-pcre_uchar bra = OP_BRA;
-pcre_uchar ket;
-assert_backtrack *assert;
-BOOL has_alternatives;
-BOOL needs_control_head = FALSE;
-struct sljit_jump *jump;
-struct sljit_jump *skip;
-struct sljit_label *rmax_label = NULL;
-struct sljit_jump *braminzero = NULL;
-
-PUSH_BACKTRACK(sizeof(bracket_backtrack), cc, NULL);
-
-if (*cc == OP_BRAZERO || *cc == OP_BRAMINZERO)
-  {
-  bra = *cc;
-  cc++;
-  opcode = *cc;
-  }
-
-opcode = *cc;
-ccbegin = cc;
-matchingpath = bracketend(cc) - 1 - LINK_SIZE;
-ket = *matchingpath;
-if (ket == OP_KET && PRIVATE_DATA(matchingpath) != 0)
-  {
-  repeat_ptr = PRIVATE_DATA(matchingpath);
-  repeat_length = PRIVATE_DATA(matchingpath + 1);
-  repeat_type = PRIVATE_DATA(matchingpath + 2);
-  repeat_count = PRIVATE_DATA(matchingpath + 3);
-  SLJIT_ASSERT(repeat_length != 0 && repeat_type != 0 && repeat_count != 0);
-  if (repeat_type == OP_UPTO)
-    ket = OP_KETRMAX;
-  if (repeat_type == OP_MINUPTO)
-    ket = OP_KETRMIN;
-  }
-
-if ((opcode == OP_COND || opcode == OP_SCOND) && cc[1 + LINK_SIZE] == OP_DEF)
-  {
-  /* Drop this bracket_backtrack. */
-  parent->top = backtrack->prev;
-  return matchingpath + 1 + LINK_SIZE + repeat_length;
-  }
-
-matchingpath = ccbegin + 1 + LINK_SIZE;
-SLJIT_ASSERT(ket == OP_KET || ket == OP_KETRMAX || ket == OP_KETRMIN);
-SLJIT_ASSERT(!((bra == OP_BRAZERO && ket == OP_KETRMIN) || (bra == OP_BRAMINZERO && ket == OP_KETRMAX)));
-cc += GET(cc, 1);
-
-has_alternatives = *cc == OP_ALT;
-if (SLJIT_UNLIKELY(opcode == OP_COND || opcode == OP_SCOND))
-  has_alternatives = (*matchingpath == OP_RREF || *matchingpath == OP_DNRREF || *matchingpath == OP_FAIL) ? FALSE : TRUE;
-
-if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))
-  opcode = OP_SCOND;
-if (SLJIT_UNLIKELY(opcode == OP_ONCE_NC))
-  opcode = OP_ONCE;
-
-if (opcode == OP_CBRA || opcode == OP_SCBRA)
-  {
-  /* Capturing brackets has a pre-allocated space. */
-  offset = GET2(ccbegin, 1 + LINK_SIZE);
-  if (common->optimized_cbracket[offset] == 0)
-    {
-    private_data_ptr = OVECTOR_PRIV(offset);
-    offset <<= 1;
-    }
-  else
-    {
-    offset <<= 1;
-    private_data_ptr = OVECTOR(offset);
-    }
-  BACKTRACK_AS(bracket_backtrack)->private_data_ptr = private_data_ptr;
-  matchingpath += IMM2_SIZE;
-  }
-else if (opcode == OP_ONCE || opcode == OP_SBRA || opcode == OP_SCOND)
-  {
-  /* Other brackets simply allocate the next entry. */
-  private_data_ptr = PRIVATE_DATA(ccbegin);
-  SLJIT_ASSERT(private_data_ptr != 0);
-  BACKTRACK_AS(bracket_backtrack)->private_data_ptr = private_data_ptr;
-  if (opcode == OP_ONCE)
-    BACKTRACK_AS(bracket_backtrack)->u.framesize = get_framesize(common, ccbegin, NULL, FALSE, &needs_control_head);
-  }
-
-/* Instructions before the first alternative. */
-stacksize = 0;
-if (ket == OP_KETRMAX || (ket == OP_KETRMIN && bra != OP_BRAMINZERO))
-  stacksize++;
-if (bra == OP_BRAZERO)
-  stacksize++;
-
-if (stacksize > 0)
-  allocate_stack(common, stacksize);
-
-stacksize = 0;
-if (ket == OP_KETRMAX || (ket == OP_KETRMIN && bra != OP_BRAMINZERO))
-  {
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
-  stacksize++;
-  }
-
-if (bra == OP_BRAZERO)
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), STR_PTR, 0);
-
-if (bra == OP_BRAMINZERO)
-  {
-  /* This is a backtrack path! (Since the try-path of OP_BRAMINZERO matches to the empty string) */
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  if (ket != OP_KETRMIN)
-    {
-    free_stack(common, 1);
-    braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-    }
-  else
-    {
-    if (opcode == OP_ONCE || opcode >= OP_SBRA)
-      {
-      jump = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-      /* Nothing stored during the first run. */
-      skip = JUMP(SLJIT_JUMP);
-      JUMPHERE(jump);
-      /* Checking zero-length iteration. */
-      if (opcode != OP_ONCE || BACKTRACK_AS(bracket_backtrack)->u.framesize < 0)
-        {
-        /* When we come from outside, private_data_ptr contains the previous STR_PTR. */
-        braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-        }
-      else
-        {
-        /* Except when the whole stack frame must be saved. */
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-        braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(TMP1), (BACKTRACK_AS(bracket_backtrack)->u.framesize + 1) * sizeof(sljit_sw));
-        }
-      JUMPHERE(skip);
-      }
-    else
-      {
-      jump = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-      JUMPHERE(jump);
-      }
-    }
-  }
-
-if (repeat_type != 0)
-  {
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_IMM, repeat_count);
-  if (repeat_type == OP_EXACT)
-    rmax_label = LABEL();
-  }
-
-if (ket == OP_KETRMIN)
-  BACKTRACK_AS(bracket_backtrack)->recursive_matchingpath = LABEL();
-
-if (ket == OP_KETRMAX)
-  {
-  rmax_label = LABEL();
-  if (has_alternatives && opcode != OP_ONCE && opcode < OP_SBRA && repeat_type == 0)
-    BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = rmax_label;
-  }
-
-/* Handling capturing brackets and alternatives. */
-if (opcode == OP_ONCE)
-  {
-  stacksize = 0;
-  if (needs_control_head)
-    {
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-    stacksize++;
-    }
-
-  if (BACKTRACK_AS(bracket_backtrack)->u.framesize < 0)
-    {
-    /* Neither capturing brackets nor recursions are found in the block. */
-    if (ket == OP_KETRMIN)
-      {
-      stacksize += 2;
-      if (!needs_control_head)
-        OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      }
-    else
-      {
-      if (BACKTRACK_AS(bracket_backtrack)->u.framesize == no_frame)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STACK_TOP, 0);
-      if (ket == OP_KETRMAX || has_alternatives)
-        stacksize++;
-      }
-
-    if (stacksize > 0)
-      allocate_stack(common, stacksize);
-
-    stacksize = 0;
-    if (needs_control_head)
-      {
-      stacksize++;
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-      }
-
-    if (ket == OP_KETRMIN)
-      {
-      if (needs_control_head)
-        OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), STR_PTR, 0);
-      if (BACKTRACK_AS(bracket_backtrack)->u.framesize == no_frame)
-        OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STACK_TOP, 0, SLJIT_IMM, needs_control_head ? (2 * sizeof(sljit_sw)) : sizeof(sljit_sw));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize + 1), TMP2, 0);
-      }
-    else if (ket == OP_KETRMAX || has_alternatives)
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), STR_PTR, 0);
-    }
-  else
-    {
-    if (ket != OP_KET || has_alternatives)
-      stacksize++;
-
-    stacksize += BACKTRACK_AS(bracket_backtrack)->u.framesize + 1;
-    allocate_stack(common, stacksize);
-
-    if (needs_control_head)
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    OP2(SLJIT_SUB, TMP2, 0, STACK_TOP, 0, SLJIT_IMM, stacksize * sizeof(sljit_sw));
-
-    stacksize = needs_control_head ? 1 : 0;
-    if (ket != OP_KET || has_alternatives)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), STR_PTR, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP2, 0);
-      stacksize++;
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP1, 0);
-      }
-    else
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP2, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP1, 0);
-      }
-    init_frame(common, ccbegin, NULL, BACKTRACK_AS(bracket_backtrack)->u.framesize + stacksize, stacksize + 1, FALSE);
-    }
-  }
-else if (opcode == OP_CBRA || opcode == OP_SCBRA)
-  {
-  /* Saving the previous values. */
-  if (common->optimized_cbracket[offset >> 1] != 0)
-    {
-    SLJIT_ASSERT(private_data_ptr == OVECTOR(offset));
-    allocate_stack(common, 2);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP1, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP2, 0);
-    }
-  else
-    {
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    allocate_stack(common, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-    }
-  }
-else if (opcode == OP_SBRA || opcode == OP_SCOND)
-  {
-  /* Saving the previous value. */
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-  allocate_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-  }
-else if (has_alternatives)
-  {
-  /* Pushing the starting string pointer. */
-  allocate_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-  }
-
-/* Generating code for the first alternative. */
-if (opcode == OP_COND || opcode == OP_SCOND)
-  {
-  if (*matchingpath == OP_CREF)
-    {
-    SLJIT_ASSERT(has_alternatives);
-    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.condfailed),
-      CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), OVECTOR(GET2(matchingpath, 1) << 1), SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
-    matchingpath += 1 + IMM2_SIZE;
-    }
-  else if (*matchingpath == OP_DNCREF)
-    {
-    SLJIT_ASSERT(has_alternatives);
-
-    i = GET2(matchingpath, 1 + IMM2_SIZE);
-    slot = common->name_table + GET2(matchingpath, 1) * common->name_entry_size;
-    OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1));
-    OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(GET2(slot, 0) << 1), TMP1, 0);
-    slot += common->name_entry_size;
-    i--;
-    while (i-- > 0)
-      {
-      OP2(SLJIT_SUB, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(GET2(slot, 0) << 1), TMP1, 0);
-      OP2(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, STR_PTR, 0);
-      slot += common->name_entry_size;
-      }
-    OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.condfailed), JUMP(SLJIT_ZERO));
-    matchingpath += 1 + 2 * IMM2_SIZE;
-    }
-  else if (*matchingpath == OP_RREF || *matchingpath == OP_DNRREF || *matchingpath == OP_FAIL)
-    {
-    /* Never has other case. */
-    BACKTRACK_AS(bracket_backtrack)->u.condfailed = NULL;
-    SLJIT_ASSERT(!has_alternatives);
-
-    if (*matchingpath == OP_FAIL)
-      stacksize = 0;
-    if (*matchingpath == OP_RREF)
-      {
-      stacksize = GET2(matchingpath, 1);
-      if (common->currententry == NULL)
-        stacksize = 0;
-      else if (stacksize == RREF_ANY)
-        stacksize = 1;
-      else if (common->currententry->start == 0)
-        stacksize = stacksize == 0;
-      else
-        stacksize = stacksize == (int)GET2(common->start, common->currententry->start + 1 + LINK_SIZE);
-
-      if (stacksize != 0)
-        matchingpath += 1 + IMM2_SIZE;
-      }
-    else
-      {
-      if (common->currententry == NULL || common->currententry->start == 0)
-        stacksize = 0;
-      else
-        {
-        stacksize = GET2(matchingpath, 1 + IMM2_SIZE);
-        slot = common->name_table + GET2(matchingpath, 1) * common->name_entry_size;
-        i = (int)GET2(common->start, common->currententry->start + 1 + LINK_SIZE);
-        while (stacksize > 0)
-          {
-          if ((int)GET2(slot, 0) == i)
-            break;
-          slot += common->name_entry_size;
-          stacksize--;
-          }
-        }
-
-      if (stacksize != 0)
-        matchingpath += 1 + 2 * IMM2_SIZE;
-      }
-
-      /* The stacksize == 0 is a common "else" case. */
-      if (stacksize == 0)
-        {
-        if (*cc == OP_ALT)
-          {
-          matchingpath = cc + 1 + LINK_SIZE;
-          cc += GET(cc, 1);
-          }
-        else
-          matchingpath = cc;
-        }
-    }
-  else
-    {
-    SLJIT_ASSERT(has_alternatives && *matchingpath >= OP_ASSERT && *matchingpath <= OP_ASSERTBACK_NOT);
-    /* Similar code as PUSH_BACKTRACK macro. */
-    assert = sljit_alloc_memory(compiler, sizeof(assert_backtrack));
-    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-      return NULL;
-    memset(assert, 0, sizeof(assert_backtrack));
-    assert->common.cc = matchingpath;
-    BACKTRACK_AS(bracket_backtrack)->u.assert = assert;
-    matchingpath = compile_assert_matchingpath(common, matchingpath, assert, TRUE);
-    }
-  }
-
-compile_matchingpath(common, matchingpath, cc, backtrack);
-if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-  return NULL;
-
-if (opcode == OP_ONCE)
-  match_once_common(common, ket, BACKTRACK_AS(bracket_backtrack)->u.framesize, private_data_ptr, has_alternatives, needs_control_head);
-
-stacksize = 0;
-if (repeat_type == OP_MINUPTO)
-  {
-  /* We need to preserve the counter. TMP2 will be used below. */
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), repeat_ptr);
-  stacksize++;
-  }
-if (ket != OP_KET || bra != OP_BRA)
-  stacksize++;
-if (offset != 0)
-  {
-  if (common->capture_last_ptr != 0)
-    stacksize++;
-  if (common->optimized_cbracket[offset >> 1] == 0)
-    stacksize += 2;
-  }
-if (has_alternatives && opcode != OP_ONCE)
-  stacksize++;
-
-if (stacksize > 0)
-  allocate_stack(common, stacksize);
-
-stacksize = 0;
-if (repeat_type == OP_MINUPTO)
-  {
-  /* TMP2 was set above. */
-  OP2(SLJIT_SUB, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP2, 0, SLJIT_IMM, 1);
-  stacksize++;
-  }
-
-if (ket != OP_KET || bra != OP_BRA)
-  {
-  if (ket != OP_KET)
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), STR_PTR, 0);
-  else
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
-  stacksize++;
-  }
-
-if (offset != 0)
-  stacksize = match_capture_common(common, stacksize, offset, private_data_ptr);
-
-if (has_alternatives)
-  {
-  if (opcode != OP_ONCE)
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
-  if (ket != OP_KETRMAX)
-    BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = LABEL();
-  }
-
-/* Must be after the matchingpath label. */
-if (offset != 0 && common->optimized_cbracket[offset >> 1] != 0)
-  {
-  SLJIT_ASSERT(private_data_ptr == OVECTOR(offset + 0));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
-  }
-
-if (ket == OP_KETRMAX)
-  {
-  if (repeat_type != 0)
-    {
-    if (has_alternatives)
-      BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = LABEL();
-    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_IMM, 1);
-    JUMPTO(SLJIT_NOT_ZERO, rmax_label);
-    /* Drop STR_PTR for greedy plus quantifier. */
-    if (opcode != OP_ONCE)
-      free_stack(common, 1);
-    }
-  else if (opcode == OP_ONCE || opcode >= OP_SBRA)
-    {
-    if (has_alternatives)
-      BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = LABEL();
-    /* Checking zero-length iteration. */
-    if (opcode != OP_ONCE)
-      {
-      CMPTO(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0, rmax_label);
-      /* Drop STR_PTR for greedy plus quantifier. */
-      if (bra != OP_BRAZERO)
-        free_stack(common, 1);
-      }
-    else
-      /* TMP2 must contain the starting STR_PTR. */
-      CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, STR_PTR, 0, rmax_label);
-    }
-  else
-    JUMPTO(SLJIT_JUMP, rmax_label);
-  BACKTRACK_AS(bracket_backtrack)->recursive_matchingpath = LABEL();
-  }
-
-if (repeat_type == OP_EXACT)
-  {
-  count_match(common);
-  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, rmax_label);
-  }
-else if (repeat_type == OP_UPTO)
-  {
-  /* We need to preserve the counter. */
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), repeat_ptr);
-  allocate_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-  }
-
-if (bra == OP_BRAZERO)
-  BACKTRACK_AS(bracket_backtrack)->zero_matchingpath = LABEL();
-
-if (bra == OP_BRAMINZERO)
-  {
-  /* This is a backtrack path! (From the viewpoint of OP_BRAMINZERO) */
-  JUMPTO(SLJIT_JUMP, ((braminzero_backtrack *)parent)->matchingpath);
-  if (braminzero != NULL)
-    {
-    JUMPHERE(braminzero);
-    /* We need to release the end pointer to perform the
-    backtrack for the zero-length iteration. When
-    framesize is < 0, OP_ONCE will do the release itself. */
-    if (opcode == OP_ONCE && BACKTRACK_AS(bracket_backtrack)->u.framesize >= 0)
-      {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      }
-    else if (ket == OP_KETRMIN && opcode != OP_ONCE)
-      free_stack(common, 1);
-    }
-  /* Continue to the normal backtrack. */
-  }
-
-if ((ket != OP_KET && bra != OP_BRAMINZERO) || bra == OP_BRAZERO)
-  count_match(common);
-
-/* Skip the other alternatives. */
-while (*cc == OP_ALT)
-  cc += GET(cc, 1);
-cc += 1 + LINK_SIZE;
-
-/* Temporarily encoding the needs_control_head in framesize. */
-if (opcode == OP_ONCE)
-  BACKTRACK_AS(bracket_backtrack)->u.framesize = (BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
-return cc + repeat_length;
-}
-
-static pcre_uchar *compile_bracketpos_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-pcre_uchar opcode;
-int private_data_ptr;
-int cbraprivptr = 0;
-BOOL needs_control_head;
-int framesize;
-int stacksize;
-int offset = 0;
-BOOL zero = FALSE;
-pcre_uchar *ccbegin = NULL;
-int stack; /* Also contains the offset of control head. */
-struct sljit_label *loop = NULL;
-struct jump_list *emptymatch = NULL;
-
-PUSH_BACKTRACK(sizeof(bracketpos_backtrack), cc, NULL);
-if (*cc == OP_BRAPOSZERO)
-  {
-  zero = TRUE;
-  cc++;
-  }
-
-opcode = *cc;
-private_data_ptr = PRIVATE_DATA(cc);
-SLJIT_ASSERT(private_data_ptr != 0);
-BACKTRACK_AS(bracketpos_backtrack)->private_data_ptr = private_data_ptr;
-switch(opcode)
-  {
-  case OP_BRAPOS:
-  case OP_SBRAPOS:
-  ccbegin = cc + 1 + LINK_SIZE;
-  break;
-
-  case OP_CBRAPOS:
-  case OP_SCBRAPOS:
-  offset = GET2(cc, 1 + LINK_SIZE);
-  /* This case cannot be optimized in the same was as
-  normal capturing brackets. */
-  SLJIT_ASSERT(common->optimized_cbracket[offset] == 0);
-  cbraprivptr = OVECTOR_PRIV(offset);
-  offset <<= 1;
-  ccbegin = cc + 1 + LINK_SIZE + IMM2_SIZE;
-  break;
-
-  default:
-  SLJIT_ASSERT_STOP();
-  break;
-  }
-
-framesize = get_framesize(common, cc, NULL, FALSE, &needs_control_head);
-BACKTRACK_AS(bracketpos_backtrack)->framesize = framesize;
-if (framesize < 0)
-  {
-  if (offset != 0)
-    {
-    stacksize = 2;
-    if (common->capture_last_ptr != 0)
-      stacksize++;
-    }
-  else
-    stacksize = 1;
-
-  if (needs_control_head)
-    stacksize++;
-  if (!zero)
-    stacksize++;
-
-  BACKTRACK_AS(bracketpos_backtrack)->stacksize = stacksize;
-  allocate_stack(common, stacksize);
-  if (framesize == no_frame)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STACK_TOP, 0);
-
-  stack = 0;
-  if (offset != 0)
-    {
-    stack = 2;
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP1, 0);
-    if (common->capture_last_ptr != 0)
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP2, 0);
-    if (needs_control_head)
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-    if (common->capture_last_ptr != 0)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(2), TMP1, 0);
-      stack = 3;
-      }
-    }
-  else
-    {
-    if (needs_control_head)
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-    stack = 1;
-    }
-
-  if (needs_control_head)
-    stack++;
-  if (!zero)
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stack), SLJIT_IMM, 1);
-  if (needs_control_head)
-    {
-    stack--;
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stack), TMP2, 0);
-    }
-  }
-else
-  {
-  stacksize = framesize + 1;
-  if (!zero)
-    stacksize++;
-  if (needs_control_head)
-    stacksize++;
-  if (offset == 0)
-    stacksize++;
-  BACKTRACK_AS(bracketpos_backtrack)->stacksize = stacksize;
-
-  allocate_stack(common, stacksize);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-  if (needs_control_head)
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-  OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STACK_TOP, 0, SLJIT_IMM, -STACK(stacksize - 1));
-
-  stack = 0;
-  if (!zero)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 1);
-    stack = 1;
-    }
-  if (needs_control_head)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stack), TMP2, 0);
-    stack++;
-    }
-  if (offset == 0)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stack), STR_PTR, 0);
-    stack++;
-    }
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stack), TMP1, 0);
-  init_frame(common, cc, NULL, stacksize - 1, stacksize - framesize, FALSE);
-  stack -= 1 + (offset == 0);
-  }
-
-if (offset != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), cbraprivptr, STR_PTR, 0);
-
-loop = LABEL();
-while (*cc != OP_KETRPOS)
-  {
-  backtrack->top = NULL;
-  backtrack->topbacktracks = NULL;
-  cc += GET(cc, 1);
-
-  compile_matchingpath(common, ccbegin, cc, backtrack);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    return NULL;
-
-  if (framesize < 0)
-    {
-    if (framesize == no_frame)
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-
-    if (offset != 0)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), cbraprivptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), cbraprivptr, STR_PTR, 0);
-      if (common->capture_last_ptr != 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, SLJIT_IMM, offset >> 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-      }
-    else
-      {
-      if (opcode == OP_SBRAPOS)
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-      }
-
-    /* Even if the match is empty, we need to reset the control head. */
-    if (needs_control_head)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(stack));
-
-    if (opcode == OP_SBRAPOS || opcode == OP_SCBRAPOS)
-      add_jump(compiler, &emptymatch, CMP(SLJIT_EQUAL, TMP1, 0, STR_PTR, 0));
-
-    if (!zero)
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize - 1), SLJIT_IMM, 0);
-    }
-  else
-    {
-    if (offset != 0)
-      {
-      OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, stacksize * sizeof(sljit_sw));
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), cbraprivptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), cbraprivptr, STR_PTR, 0);
-      if (common->capture_last_ptr != 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, SLJIT_IMM, offset >> 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-      }
-    else
-      {
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      OP2(SLJIT_ADD, STACK_TOP, 0, TMP2, 0, SLJIT_IMM, stacksize * sizeof(sljit_sw));
-      if (opcode == OP_SBRAPOS)
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), (framesize + 1) * sizeof(sljit_sw));
-      OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), (framesize + 1) * sizeof(sljit_sw), STR_PTR, 0);
-      }
-
-    /* Even if the match is empty, we need to reset the control head. */
-    if (needs_control_head)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(stack));
-
-    if (opcode == OP_SBRAPOS || opcode == OP_SCBRAPOS)
-      add_jump(compiler, &emptymatch, CMP(SLJIT_EQUAL, TMP1, 0, STR_PTR, 0));
-
-    if (!zero)
-      {
-      if (framesize < 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize - 1), SLJIT_IMM, 0);
-      else
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-    }
-
-  JUMPTO(SLJIT_JUMP, loop);
-  flush_stubs(common);
-
-  compile_backtrackingpath(common, backtrack->top);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    return NULL;
-  set_jumps(backtrack->topbacktracks, LABEL());
-
-  if (framesize < 0)
-    {
-    if (offset != 0)
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), cbraprivptr);
-    else
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    }
-  else
-    {
-    if (offset != 0)
-      {
-      /* Last alternative. */
-      if (*cc == OP_KETRPOS)
-        OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), cbraprivptr);
-      }
-    else
-      {
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(TMP2), (framesize + 1) * sizeof(sljit_sw));
-      }
-    }
-
-  if (*cc == OP_KETRPOS)
-    break;
-  ccbegin = cc + 1 + LINK_SIZE;
-  }
-
-/* We don't have to restore the control head in case of a failed match. */
-
-backtrack->topbacktracks = NULL;
-if (!zero)
-  {
-  if (framesize < 0)
-    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(STACK_TOP), STACK(stacksize - 1), SLJIT_IMM, 0));
-  else /* TMP2 is set to [private_data_ptr] above. */
-    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(TMP2), (stacksize - 1) * sizeof(sljit_sw), SLJIT_IMM, 0));
-  }
-
-/* None of them matched. */
-set_jumps(emptymatch, LABEL());
-count_match(common);
-return cc + 1 + LINK_SIZE;
-}
-
-static SLJIT_INLINE pcre_uchar *get_iterator_parameters(compiler_common *common, pcre_uchar *cc, pcre_uchar *opcode, pcre_uchar *type, int *max, int *min, pcre_uchar **end)
-{
-int class_len;
-
-*opcode = *cc;
-if (*opcode >= OP_STAR && *opcode <= OP_POSUPTO)
-  {
-  cc++;
-  *type = OP_CHAR;
-  }
-else if (*opcode >= OP_STARI && *opcode <= OP_POSUPTOI)
-  {
-  cc++;
-  *type = OP_CHARI;
-  *opcode -= OP_STARI - OP_STAR;
-  }
-else if (*opcode >= OP_NOTSTAR && *opcode <= OP_NOTPOSUPTO)
-  {
-  cc++;
-  *type = OP_NOT;
-  *opcode -= OP_NOTSTAR - OP_STAR;
-  }
-else if (*opcode >= OP_NOTSTARI && *opcode <= OP_NOTPOSUPTOI)
-  {
-  cc++;
-  *type = OP_NOTI;
-  *opcode -= OP_NOTSTARI - OP_STAR;
-  }
-else if (*opcode >= OP_TYPESTAR && *opcode <= OP_TYPEPOSUPTO)
-  {
-  cc++;
-  *opcode -= OP_TYPESTAR - OP_STAR;
-  *type = 0;
-  }
-else
-  {
-  SLJIT_ASSERT(*opcode == OP_CLASS || *opcode == OP_NCLASS || *opcode == OP_XCLASS);
-  *type = *opcode;
-  cc++;
-  class_len = (*type < OP_XCLASS) ? (int)(1 + (32 / sizeof(pcre_uchar))) : GET(cc, 0);
-  *opcode = cc[class_len - 1];
-  if (*opcode >= OP_CRSTAR && *opcode <= OP_CRMINQUERY)
-    {
-    *opcode -= OP_CRSTAR - OP_STAR;
-    if (end != NULL)
-      *end = cc + class_len;
-    }
-  else if (*opcode >= OP_CRPOSSTAR && *opcode <= OP_CRPOSQUERY)
-    {
-    *opcode -= OP_CRPOSSTAR - OP_POSSTAR;
-    if (end != NULL)
-      *end = cc + class_len;
-    }
-  else
-    {
-    SLJIT_ASSERT(*opcode == OP_CRRANGE || *opcode == OP_CRMINRANGE || *opcode == OP_CRPOSRANGE);
-    *max = GET2(cc, (class_len + IMM2_SIZE));
-    *min = GET2(cc, class_len);
-
-    if (*min == 0)
-      {
-      SLJIT_ASSERT(*max != 0);
-      *opcode = (*opcode == OP_CRRANGE) ? OP_UPTO : (*opcode == OP_CRMINRANGE ? OP_MINUPTO : OP_POSUPTO);
-      }
-    if (*max == *min)
-      *opcode = OP_EXACT;
-
-    if (end != NULL)
-      *end = cc + class_len + 2 * IMM2_SIZE;
-    }
-  return cc;
-  }
-
-if (*opcode == OP_UPTO || *opcode == OP_MINUPTO || *opcode == OP_EXACT || *opcode == OP_POSUPTO)
-  {
-  *max = GET2(cc, 0);
-  cc += IMM2_SIZE;
-  }
-
-if (*type == 0)
-  {
-  *type = *cc;
-  if (end != NULL)
-    *end = next_opcode(common, cc);
-  cc++;
-  return cc;
-  }
-
-if (end != NULL)
-  {
-  *end = cc + 1;
-#ifdef SUPPORT_UTF
-  if (common->utf && HAS_EXTRALEN(*cc)) *end += GET_EXTRALEN(*cc);
-#endif
-  }
-return cc;
-}
-
-static pcre_uchar *compile_iterator_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-pcre_uchar opcode;
-pcre_uchar type;
-int max = -1, min = -1;
-pcre_uchar *end;
-jump_list *nomatch = NULL;
-struct sljit_jump *jump = NULL;
-struct sljit_label *label;
-int private_data_ptr = PRIVATE_DATA(cc);
-int base = (private_data_ptr == 0) ? SLJIT_MEM1(STACK_TOP) : SLJIT_MEM1(SLJIT_SP);
-int offset0 = (private_data_ptr == 0) ? STACK(0) : private_data_ptr;
-int offset1 = (private_data_ptr == 0) ? STACK(1) : private_data_ptr + (int)sizeof(sljit_sw);
-int tmp_base, tmp_offset;
-
-PUSH_BACKTRACK(sizeof(iterator_backtrack), cc, NULL);
-
-cc = get_iterator_parameters(common, cc, &opcode, &type, &max, &min, &end);
-
-switch(type)
-  {
-  case OP_NOT_DIGIT:
-  case OP_DIGIT:
-  case OP_NOT_WHITESPACE:
-  case OP_WHITESPACE:
-  case OP_NOT_WORDCHAR:
-  case OP_WORDCHAR:
-  case OP_ANY:
-  case OP_ALLANY:
-  case OP_ANYBYTE:
-  case OP_ANYNL:
-  case OP_NOT_HSPACE:
-  case OP_HSPACE:
-  case OP_NOT_VSPACE:
-  case OP_VSPACE:
-  case OP_CHAR:
-  case OP_CHARI:
-  case OP_NOT:
-  case OP_NOTI:
-  case OP_CLASS:
-  case OP_NCLASS:
-  tmp_base = TMP3;
-  tmp_offset = 0;
-  break;
-
-  default:
-  SLJIT_ASSERT_STOP();
-  /* Fall through. */
-
-  case OP_EXTUNI:
-  case OP_XCLASS:
-  case OP_NOTPROP:
-  case OP_PROP:
-  tmp_base = SLJIT_MEM1(SLJIT_SP);
-  tmp_offset = POSSESSIVE0;
-  break;
-  }
-
-switch(opcode)
-  {
-  case OP_STAR:
-  case OP_PLUS:
-  case OP_UPTO:
-  case OP_CRRANGE:
-  if (type == OP_ANYNL || type == OP_EXTUNI)
-    {
-    SLJIT_ASSERT(private_data_ptr == 0);
-    if (opcode == OP_STAR || opcode == OP_UPTO)
-      {
-      allocate_stack(common, 2);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);
-      }
-    else
-      {
-      allocate_stack(common, 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
-
-    if (opcode == OP_UPTO || opcode == OP_CRRANGE)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, SLJIT_IMM, 0);
-
-    label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-    if (opcode == OP_UPTO || opcode == OP_CRRANGE)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0);
-      OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-      if (opcode == OP_CRRANGE && min > 0)
-        CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, min, label);
-      if (opcode == OP_UPTO || (opcode == OP_CRRANGE && max > 0))
-        jump = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, max);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, TMP1, 0);
-      }
-
-    /* We cannot use TMP3 because of this allocate_stack. */
-    allocate_stack(common, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-    JUMPTO(SLJIT_JUMP, label);
-    if (jump != NULL)
-      JUMPHERE(jump);
-    }
-  else
-    {
-    if (opcode == OP_PLUS)
-      compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-    if (private_data_ptr == 0)
-      allocate_stack(common, 2);
-    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-    if (opcode <= OP_PLUS)
-      OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
-    else
-      OP1(SLJIT_MOV, base, offset1, SLJIT_IMM, 1);
-    label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &nomatch);
-    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-    if (opcode <= OP_PLUS)
-      JUMPTO(SLJIT_JUMP, label);
-    else if (opcode == OP_CRRANGE && max == 0)
-      {
-      OP2(SLJIT_ADD, base, offset1, base, offset1, SLJIT_IMM, 1);
-      JUMPTO(SLJIT_JUMP, label);
-      }
-    else
-      {
-      OP1(SLJIT_MOV, TMP1, 0, base, offset1);
-      OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-      OP1(SLJIT_MOV, base, offset1, TMP1, 0);
-      CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, max + 1, label);
-      }
-    set_jumps(nomatch, LABEL());
-    if (opcode == OP_CRRANGE)
-      add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS, base, offset1, SLJIT_IMM, min + 1));
-    OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-    }
-  BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
-  break;
-
-  case OP_MINSTAR:
-  case OP_MINPLUS:
-  if (opcode == OP_MINPLUS)
-    compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-  if (private_data_ptr == 0)
-    allocate_stack(common, 1);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
-  break;
-
-  case OP_MINUPTO:
-  case OP_CRMINRANGE:
-  if (private_data_ptr == 0)
-    allocate_stack(common, 2);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  OP1(SLJIT_MOV, base, offset1, SLJIT_IMM, 1);
-  if (opcode == OP_CRMINRANGE)
-    add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_JUMP));
-  BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
-  break;
-
-  case OP_QUERY:
-  case OP_MINQUERY:
-  if (private_data_ptr == 0)
-    allocate_stack(common, 1);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  if (opcode == OP_QUERY)
-    compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-  BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
-  break;
-
-  case OP_EXACT:
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
-  label = LABEL();
-  compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-  OP2(SLJIT_SUB | SLJIT_SET_E, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, label);
-  break;
-
-  case OP_POSSTAR:
-  case OP_POSPLUS:
-  case OP_POSUPTO:
-  if (opcode == OP_POSPLUS)
-    compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-  if (opcode == OP_POSUPTO)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, SLJIT_IMM, max);
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-  label = LABEL();
-  compile_char1_matchingpath(common, type, cc, &nomatch);
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-  if (opcode != OP_POSUPTO)
-    JUMPTO(SLJIT_JUMP, label);
-  else
-    {
-    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, SLJIT_IMM, 1);
-    JUMPTO(SLJIT_NOT_ZERO, label);
-    }
-  set_jumps(nomatch, LABEL());
-  OP1(SLJIT_MOV, STR_PTR, 0, tmp_base, tmp_offset);
-  break;
-
-  case OP_POSQUERY:
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-  compile_char1_matchingpath(common, type, cc, &nomatch);
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-  set_jumps(nomatch, LABEL());
-  OP1(SLJIT_MOV, STR_PTR, 0, tmp_base, tmp_offset);
-  break;
-
-  case OP_CRPOSRANGE:
-  /* Combination of OP_EXACT and OP_POSSTAR or OP_POSUPTO */
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, min);
-  label = LABEL();
-  compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks);
-  OP2(SLJIT_SUB | SLJIT_SET_E, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, label);
-
-  if (max != 0)
-    {
-    SLJIT_ASSERT(max - min > 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, SLJIT_IMM, max - min);
-    }
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-  label = LABEL();
-  compile_char1_matchingpath(common, type, cc, &nomatch);
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-  if (max == 0)
-    JUMPTO(SLJIT_JUMP, label);
-  else
-    {
-    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, SLJIT_IMM, 1);
-    JUMPTO(SLJIT_NOT_ZERO, label);
-    }
-  set_jumps(nomatch, LABEL());
-  OP1(SLJIT_MOV, STR_PTR, 0, tmp_base, tmp_offset);
-  break;
-
-  default:
-  SLJIT_ASSERT_STOP();
-  break;
-  }
-
-count_match(common);
-return end;
-}
-
-static SLJIT_INLINE pcre_uchar *compile_fail_accept_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-
-PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL);
-
-if (*cc == OP_FAIL)
-  {
-  add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_JUMP));
-  return cc + 1;
-  }
-
-if (*cc == OP_ASSERT_ACCEPT || common->currententry != NULL || !common->might_be_empty)
-  {
-  /* No need to check notempty conditions. */
-  if (common->accept_label == NULL)
-    add_jump(compiler, &common->accept, JUMP(SLJIT_JUMP));
-  else
-    JUMPTO(SLJIT_JUMP, common->accept_label);
-  return cc + 1;
-  }
-
-if (common->accept_label == NULL)
-  add_jump(compiler, &common->accept, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0)));
-else
-  CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), common->accept_label);
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty));
-add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty_atstart));
-if (common->accept_label == NULL)
-  add_jump(compiler, &common->accept, CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-else
-  CMPTO(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0, common->accept_label);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-if (common->accept_label == NULL)
-  add_jump(compiler, &common->accept, CMP(SLJIT_NOT_EQUAL, TMP2, 0, STR_PTR, 0));
-else
-  CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, STR_PTR, 0, common->accept_label);
-add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_JUMP));
-return cc + 1;
-}
-
-static SLJIT_INLINE pcre_uchar *compile_close_matchingpath(compiler_common *common, pcre_uchar *cc)
-{
-DEFINE_COMPILER;
-int offset = GET2(cc, 1);
-BOOL optimized_cbracket = common->optimized_cbracket[offset] != 0;
-
-/* Data will be discarded anyway... */
-if (common->currententry != NULL)
-  return cc + 1 + IMM2_SIZE;
-
-if (!optimized_cbracket)
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR_PRIV(offset));
-offset <<= 1;
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
-if (!optimized_cbracket)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-return cc + 1 + IMM2_SIZE;
-}
-
-static SLJIT_INLINE pcre_uchar *compile_control_verb_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-pcre_uchar opcode = *cc;
-pcre_uchar *ccend = cc + 1;
-
-if (opcode == OP_PRUNE_ARG || opcode == OP_SKIP_ARG || opcode == OP_THEN_ARG)
-  ccend += 2 + cc[1];
-
-PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL);
-
-if (opcode == OP_SKIP)
-  {
-  allocate_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-  return ccend;
-  }
-
-if (opcode == OP_PRUNE_ARG || opcode == OP_THEN_ARG)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)(cc + 2));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), TMP2, 0);
-  }
-
-return ccend;
-}
-
-static pcre_uchar then_trap_opcode[1] = { OP_THEN_TRAP };
-
-static SLJIT_INLINE void compile_then_trap_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-BOOL needs_control_head;
-int size;
-
-PUSH_BACKTRACK_NOVALUE(sizeof(then_trap_backtrack), cc);
-common->then_trap = BACKTRACK_AS(then_trap_backtrack);
-BACKTRACK_AS(then_trap_backtrack)->common.cc = then_trap_opcode;
-BACKTRACK_AS(then_trap_backtrack)->start = (sljit_sw)(cc - common->start);
-BACKTRACK_AS(then_trap_backtrack)->framesize = get_framesize(common, cc, ccend, FALSE, &needs_control_head);
-
-size = BACKTRACK_AS(then_trap_backtrack)->framesize;
-size = 3 + (size < 0 ? 0 : size);
-
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-allocate_stack(common, size);
-if (size > 3)
-  OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, STACK_TOP, 0, SLJIT_IMM, (size - 3) * sizeof(sljit_sw));
-else
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, STACK_TOP, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(size - 1), SLJIT_IMM, BACKTRACK_AS(then_trap_backtrack)->start);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(size - 2), SLJIT_IMM, type_then_trap);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(size - 3), TMP2, 0);
-
-size = BACKTRACK_AS(then_trap_backtrack)->framesize;
-if (size >= 0)
-  init_frame(common, cc, ccend, size - 1, 0, FALSE);
-}
-
-static void compile_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, backtrack_common *parent)
-{
-DEFINE_COMPILER;
-backtrack_common *backtrack;
-BOOL has_then_trap = FALSE;
-then_trap_backtrack *save_then_trap = NULL;
-
-SLJIT_ASSERT(*ccend == OP_END || (*ccend >= OP_ALT && *ccend <= OP_KETRPOS));
-
-if (common->has_then && common->then_offsets[cc - common->start] != 0)
-  {
-  SLJIT_ASSERT(*ccend != OP_END && common->control_head_ptr != 0);
-  has_then_trap = TRUE;
-  save_then_trap = common->then_trap;
-  /* Tail item on backtrack. */
-  compile_then_trap_matchingpath(common, cc, ccend, parent);
-  }
-
-while (cc < ccend)
-  {
-  switch(*cc)
-    {
-    case OP_SOD:
-    case OP_SOM:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-    case OP_ANYBYTE:
-    case OP_NOTPROP:
-    case OP_PROP:
-    case OP_ANYNL:
-    case OP_NOT_HSPACE:
-    case OP_HSPACE:
-    case OP_NOT_VSPACE:
-    case OP_VSPACE:
-    case OP_EXTUNI:
-    case OP_EODN:
-    case OP_EOD:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_DOLL:
-    case OP_DOLLM:
-    case OP_NOT:
-    case OP_NOTI:
-    case OP_REVERSE:
-    cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
-    break;
-
-    case OP_SET_SOM:
-    PUSH_BACKTRACK_NOVALUE(sizeof(backtrack_common), cc);
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-    allocate_stack(common, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), STR_PTR, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-    cc++;
-    break;
-
-    case OP_CHAR:
-    case OP_CHARI:
-    if (common->mode == JIT_COMPILE)
-      cc = compile_charn_matchingpath(common, cc, ccend, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
-    else
-      cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
-    break;
-
-    case OP_STAR:
-    case OP_MINSTAR:
-    case OP_PLUS:
-    case OP_MINPLUS:
-    case OP_QUERY:
-    case OP_MINQUERY:
-    case OP_UPTO:
-    case OP_MINUPTO:
-    case OP_EXACT:
-    case OP_POSSTAR:
-    case OP_POSPLUS:
-    case OP_POSQUERY:
-    case OP_POSUPTO:
-    case OP_STARI:
-    case OP_MINSTARI:
-    case OP_PLUSI:
-    case OP_MINPLUSI:
-    case OP_QUERYI:
-    case OP_MINQUERYI:
-    case OP_UPTOI:
-    case OP_MINUPTOI:
-    case OP_EXACTI:
-    case OP_POSSTARI:
-    case OP_POSPLUSI:
-    case OP_POSQUERYI:
-    case OP_POSUPTOI:
-    case OP_NOTSTAR:
-    case OP_NOTMINSTAR:
-    case OP_NOTPLUS:
-    case OP_NOTMINPLUS:
-    case OP_NOTQUERY:
-    case OP_NOTMINQUERY:
-    case OP_NOTUPTO:
-    case OP_NOTMINUPTO:
-    case OP_NOTEXACT:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSUPTO:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERYI:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTOI:
-    case OP_NOTEXACTI:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSUPTOI:
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEEXACT:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    case OP_TYPEPOSUPTO:
-    cc = compile_iterator_matchingpath(common, cc, parent);
-    break;
-
-    case OP_CLASS:
-    case OP_NCLASS:
-    if (cc[1 + (32 / sizeof(pcre_uchar))] >= OP_CRSTAR && cc[1 + (32 / sizeof(pcre_uchar))] <= OP_CRPOSRANGE)
-      cc = compile_iterator_matchingpath(common, cc, parent);
-    else
-      cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
-    break;
-
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-    case OP_XCLASS:
-    if (*(cc + GET(cc, 1)) >= OP_CRSTAR && *(cc + GET(cc, 1)) <= OP_CRPOSRANGE)
-      cc = compile_iterator_matchingpath(common, cc, parent);
-    else
-      cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
-    break;
-#endif
-
-    case OP_REF:
-    case OP_REFI:
-    if (cc[1 + IMM2_SIZE] >= OP_CRSTAR && cc[1 + IMM2_SIZE] <= OP_CRPOSRANGE)
-      cc = compile_ref_iterator_matchingpath(common, cc, parent);
-    else
-      {
-      compile_ref_matchingpath(common, cc, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks, TRUE, FALSE);
-      cc += 1 + IMM2_SIZE;
-      }
-    break;
-
-    case OP_DNREF:
-    case OP_DNREFI:
-    if (cc[1 + 2 * IMM2_SIZE] >= OP_CRSTAR && cc[1 + 2 * IMM2_SIZE] <= OP_CRPOSRANGE)
-      cc = compile_ref_iterator_matchingpath(common, cc, parent);
-    else
-      {
-      compile_dnref_search(common, cc, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
-      compile_ref_matchingpath(common, cc, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks, TRUE, FALSE);
-      cc += 1 + 2 * IMM2_SIZE;
-      }
-    break;
-
-    case OP_RECURSE:
-    cc = compile_recurse_matchingpath(common, cc, parent);
-    break;
-
-    case OP_CALLOUT:
-    cc = compile_callout_matchingpath(common, cc, parent);
-    break;
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    PUSH_BACKTRACK_NOVALUE(sizeof(assert_backtrack), cc);
-    cc = compile_assert_matchingpath(common, cc, BACKTRACK_AS(assert_backtrack), FALSE);
-    break;
-
-    case OP_BRAMINZERO:
-    PUSH_BACKTRACK_NOVALUE(sizeof(braminzero_backtrack), cc);
-    cc = bracketend(cc + 1);
-    if (*(cc - 1 - LINK_SIZE) != OP_KETRMIN)
-      {
-      allocate_stack(common, 1);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-      }
-    else
-      {
-      allocate_stack(common, 2);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), STR_PTR, 0);
-      }
-    BACKTRACK_AS(braminzero_backtrack)->matchingpath = LABEL();
-    count_match(common);
-    break;
-
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRA:
-    case OP_CBRA:
-    case OP_COND:
-    case OP_SBRA:
-    case OP_SCBRA:
-    case OP_SCOND:
-    cc = compile_bracket_matchingpath(common, cc, parent);
-    break;
-
-    case OP_BRAZERO:
-    if (cc[1] > OP_ASSERTBACK_NOT)
-      cc = compile_bracket_matchingpath(common, cc, parent);
-    else
-      {
-      PUSH_BACKTRACK_NOVALUE(sizeof(assert_backtrack), cc);
-      cc = compile_assert_matchingpath(common, cc, BACKTRACK_AS(assert_backtrack), FALSE);
-      }
-    break;
-
-    case OP_BRAPOS:
-    case OP_CBRAPOS:
-    case OP_SBRAPOS:
-    case OP_SCBRAPOS:
-    case OP_BRAPOSZERO:
-    cc = compile_bracketpos_matchingpath(common, cc, parent);
-    break;
-
-    case OP_MARK:
-    PUSH_BACKTRACK_NOVALUE(sizeof(backtrack_common), cc);
-    SLJIT_ASSERT(common->mark_ptr != 0);
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-    allocate_stack(common, common->has_skip_arg ? 5 : 1);
-    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(common->has_skip_arg ? 4 : 0), TMP2, 0);
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)(cc + 2));
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP2, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), TMP2, 0);
-    if (common->has_skip_arg)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, STACK_TOP, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, type_mark);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(2), SLJIT_IMM, (sljit_sw)(cc + 2));
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(3), STR_PTR, 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP1, 0);
-      }
-    cc += 1 + 2 + cc[1];
-    break;
-
-    case OP_PRUNE:
-    case OP_PRUNE_ARG:
-    case OP_SKIP:
-    case OP_SKIP_ARG:
-    case OP_THEN:
-    case OP_THEN_ARG:
-    case OP_COMMIT:
-    cc = compile_control_verb_matchingpath(common, cc, parent);
-    break;
-
-    case OP_FAIL:
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-    cc = compile_fail_accept_matchingpath(common, cc, parent);
-    break;
-
-    case OP_CLOSE:
-    cc = compile_close_matchingpath(common, cc);
-    break;
-
-    case OP_SKIPZERO:
-    cc = bracketend(cc + 1);
-    break;
-
-    default:
-    SLJIT_ASSERT_STOP();
-    return;
-    }
-  if (cc == NULL)
-    return;
-  }
-
-if (has_then_trap)
-  {
-  /* Head item on backtrack. */
-  PUSH_BACKTRACK_NOVALUE(sizeof(then_trap_backtrack), cc);
-  BACKTRACK_AS(then_trap_backtrack)->common.cc = then_trap_opcode;
-  BACKTRACK_AS(then_trap_backtrack)->then_trap = common->then_trap;
-  common->then_trap = save_then_trap;
-  }
-SLJIT_ASSERT(cc == ccend);
-}
-
-#undef PUSH_BACKTRACK
-#undef PUSH_BACKTRACK_NOVALUE
-#undef BACKTRACK_AS
-
-#define COMPILE_BACKTRACKINGPATH(current) \
-  do \
-    { \
-    compile_backtrackingpath(common, (current)); \
-    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler))) \
-      return; \
-    } \
-  while (0)
-
-#define CURRENT_AS(type) ((type *)current)
-
-static void compile_iterator_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-pcre_uchar *cc = current->cc;
-pcre_uchar opcode;
-pcre_uchar type;
-int max = -1, min = -1;
-struct sljit_label *label = NULL;
-struct sljit_jump *jump = NULL;
-jump_list *jumplist = NULL;
-int private_data_ptr = PRIVATE_DATA(cc);
-int base = (private_data_ptr == 0) ? SLJIT_MEM1(STACK_TOP) : SLJIT_MEM1(SLJIT_SP);
-int offset0 = (private_data_ptr == 0) ? STACK(0) : private_data_ptr;
-int offset1 = (private_data_ptr == 0) ? STACK(1) : private_data_ptr + (int)sizeof(sljit_sw);
-
-cc = get_iterator_parameters(common, cc, &opcode, &type, &max, &min, NULL);
-
-switch(opcode)
-  {
-  case OP_STAR:
-  case OP_PLUS:
-  case OP_UPTO:
-  case OP_CRRANGE:
-  if (type == OP_ANYNL || type == OP_EXTUNI)
-    {
-    SLJIT_ASSERT(private_data_ptr == 0);
-    set_jumps(current->topbacktracks, LABEL());
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    free_stack(common, 1);
-    CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(iterator_backtrack)->matchingpath);
-    }
-  else
-    {
-    if (opcode == OP_UPTO)
-      min = 0;
-    if (opcode <= OP_PLUS)
-      {
-      OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-      jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, base, offset1);
-      }
-    else
-      {
-      OP1(SLJIT_MOV, TMP1, 0, base, offset1);
-      OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-      jump = CMP(SLJIT_LESS_EQUAL, TMP1, 0, SLJIT_IMM, min + 1);
-      OP2(SLJIT_SUB, base, offset1, TMP1, 0, SLJIT_IMM, 1);
-      }
-    skip_char_back(common);
-    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-    JUMPTO(SLJIT_JUMP, CURRENT_AS(iterator_backtrack)->matchingpath);
-    if (opcode == OP_CRRANGE)
-      set_jumps(current->topbacktracks, LABEL());
-    JUMPHERE(jump);
-    if (private_data_ptr == 0)
-      free_stack(common, 2);
-    if (opcode == OP_PLUS)
-      set_jumps(current->topbacktracks, LABEL());
-    }
-  break;
-
-  case OP_MINSTAR:
-  case OP_MINPLUS:
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  compile_char1_matchingpath(common, type, cc, &jumplist);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(iterator_backtrack)->matchingpath);
-  set_jumps(jumplist, LABEL());
-  if (private_data_ptr == 0)
-    free_stack(common, 1);
-  if (opcode == OP_MINPLUS)
-    set_jumps(current->topbacktracks, LABEL());
-  break;
-
-  case OP_MINUPTO:
-  case OP_CRMINRANGE:
-  if (opcode == OP_CRMINRANGE)
-    {
-    label = LABEL();
-    set_jumps(current->topbacktracks, label);
-    }
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  compile_char1_matchingpath(common, type, cc, &jumplist);
-
-  OP1(SLJIT_MOV, TMP1, 0, base, offset1);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP1(SLJIT_MOV, base, offset1, TMP1, 0);
-
-  if (opcode == OP_CRMINRANGE)
-    CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, min + 1, label);
-
-  if (opcode == OP_CRMINRANGE && max == 0)
-    JUMPTO(SLJIT_JUMP, CURRENT_AS(iterator_backtrack)->matchingpath);
-  else
-    CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, max + 2, CURRENT_AS(iterator_backtrack)->matchingpath);
-
-  set_jumps(jumplist, LABEL());
-  if (private_data_ptr == 0)
-    free_stack(common, 2);
-  break;
-
-  case OP_QUERY:
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
-  CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(iterator_backtrack)->matchingpath);
-  jump = JUMP(SLJIT_JUMP);
-  set_jumps(current->topbacktracks, LABEL());
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(iterator_backtrack)->matchingpath);
-  JUMPHERE(jump);
-  if (private_data_ptr == 0)
-    free_stack(common, 1);
-  break;
-
-  case OP_MINQUERY:
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
-  jump = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-  compile_char1_matchingpath(common, type, cc, &jumplist);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(iterator_backtrack)->matchingpath);
-  set_jumps(jumplist, LABEL());
-  JUMPHERE(jump);
-  if (private_data_ptr == 0)
-    free_stack(common, 1);
-  break;
-
-  case OP_EXACT:
-  case OP_POSPLUS:
-  case OP_CRPOSRANGE:
-  set_jumps(current->topbacktracks, LABEL());
-  break;
-
-  case OP_POSSTAR:
-  case OP_POSQUERY:
-  case OP_POSUPTO:
-  break;
-
-  default:
-  SLJIT_ASSERT_STOP();
-  break;
-  }
-}
-
-static SLJIT_INLINE void compile_ref_iterator_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-pcre_uchar *cc = current->cc;
-BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
-pcre_uchar type;
-
-type = cc[ref ? 1 + IMM2_SIZE : 1 + 2 * IMM2_SIZE];
-
-if ((type & 0x1) == 0)
-  {
-  /* Maximize case. */
-  set_jumps(current->topbacktracks, LABEL());
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(iterator_backtrack)->matchingpath);
-  return;
-  }
-
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(iterator_backtrack)->matchingpath);
-set_jumps(current->topbacktracks, LABEL());
-free_stack(common, ref ? 2 : 3);
-}
-
-static SLJIT_INLINE void compile_recurse_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-
-if (CURRENT_AS(recurse_backtrack)->inlined_pattern)
-  compile_backtrackingpath(common, current->top);
-set_jumps(current->topbacktracks, LABEL());
-if (CURRENT_AS(recurse_backtrack)->inlined_pattern)
-  return;
-
-if (common->has_set_som && common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-  free_stack(common, 2);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP1, 0);
-  }
-else if (common->has_set_som || common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->has_set_som ? (int)(OVECTOR(0)) : common->mark_ptr, TMP2, 0);
-  }
-}
-
-static void compile_assert_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-pcre_uchar *cc = current->cc;
-pcre_uchar bra = OP_BRA;
-struct sljit_jump *brajump = NULL;
-
-SLJIT_ASSERT(*cc != OP_BRAMINZERO);
-if (*cc == OP_BRAZERO)
-  {
-  bra = *cc;
-  cc++;
-  }
-
-if (bra == OP_BRAZERO)
-  {
-  SLJIT_ASSERT(current->topbacktracks == NULL);
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  }
-
-if (CURRENT_AS(assert_backtrack)->framesize < 0)
-  {
-  set_jumps(current->topbacktracks, LABEL());
-
-  if (bra == OP_BRAZERO)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-    CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(assert_backtrack)->matchingpath);
-    free_stack(common, 1);
-    }
-  return;
-  }
-
-if (bra == OP_BRAZERO)
-  {
-  if (*cc == OP_ASSERT_NOT || *cc == OP_ASSERTBACK_NOT)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-    CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(assert_backtrack)->matchingpath);
-    free_stack(common, 1);
-    return;
-    }
-  free_stack(common, 1);
-  brajump = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-  }
-
-if (*cc == OP_ASSERT || *cc == OP_ASSERTBACK)
-  {
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(assert_backtrack)->private_data_ptr);
-  add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(assert_backtrack)->private_data_ptr, SLJIT_MEM1(STACK_TOP), CURRENT_AS(assert_backtrack)->framesize * sizeof(sljit_sw));
-
-  set_jumps(current->topbacktracks, LABEL());
-  }
-else
-  set_jumps(current->topbacktracks, LABEL());
-
-if (bra == OP_BRAZERO)
-  {
-  /* We know there is enough place on the stack. */
-  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(assert_backtrack)->matchingpath);
-  JUMPHERE(brajump);
-  }
-}
-
-static void compile_bracket_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-int opcode, stacksize, alt_count, alt_max;
-int offset = 0;
-int private_data_ptr = CURRENT_AS(bracket_backtrack)->private_data_ptr;
-int repeat_ptr = 0, repeat_type = 0, repeat_count = 0;
-pcre_uchar *cc = current->cc;
-pcre_uchar *ccbegin;
-pcre_uchar *ccprev;
-pcre_uchar bra = OP_BRA;
-pcre_uchar ket;
-assert_backtrack *assert;
-sljit_uw *next_update_addr = NULL;
-BOOL has_alternatives;
-BOOL needs_control_head = FALSE;
-struct sljit_jump *brazero = NULL;
-struct sljit_jump *alt1 = NULL;
-struct sljit_jump *alt2 = NULL;
-struct sljit_jump *once = NULL;
-struct sljit_jump *cond = NULL;
-struct sljit_label *rmin_label = NULL;
-struct sljit_label *exact_label = NULL;
-
-if (*cc == OP_BRAZERO || *cc == OP_BRAMINZERO)
-  {
-  bra = *cc;
-  cc++;
-  }
-
-opcode = *cc;
-ccbegin = bracketend(cc) - 1 - LINK_SIZE;
-ket = *ccbegin;
-if (ket == OP_KET && PRIVATE_DATA(ccbegin) != 0)
-  {
-  repeat_ptr = PRIVATE_DATA(ccbegin);
-  repeat_type = PRIVATE_DATA(ccbegin + 2);
-  repeat_count = PRIVATE_DATA(ccbegin + 3);
-  SLJIT_ASSERT(repeat_type != 0 && repeat_count != 0);
-  if (repeat_type == OP_UPTO)
-    ket = OP_KETRMAX;
-  if (repeat_type == OP_MINUPTO)
-    ket = OP_KETRMIN;
-  }
-ccbegin = cc;
-cc += GET(cc, 1);
-has_alternatives = *cc == OP_ALT;
-if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
-  has_alternatives = (ccbegin[1 + LINK_SIZE] >= OP_ASSERT && ccbegin[1 + LINK_SIZE] <= OP_ASSERTBACK_NOT) || CURRENT_AS(bracket_backtrack)->u.condfailed != NULL;
-if (opcode == OP_CBRA || opcode == OP_SCBRA)
-  offset = (GET2(ccbegin, 1 + LINK_SIZE)) << 1;
-if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))
-  opcode = OP_SCOND;
-if (SLJIT_UNLIKELY(opcode == OP_ONCE_NC))
-  opcode = OP_ONCE;
-
-alt_max = has_alternatives ? no_alternatives(ccbegin) : 0;
-
-/* Decoding the needs_control_head in framesize. */
-if (opcode == OP_ONCE)
-  {
-  needs_control_head = (CURRENT_AS(bracket_backtrack)->u.framesize & 0x1) != 0;
-  CURRENT_AS(bracket_backtrack)->u.framesize >>= 1;
-  }
-
-if (ket != OP_KET && repeat_type != 0)
-  {
-  /* TMP1 is used in OP_KETRMIN below. */
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  if (repeat_type == OP_UPTO)
-    OP2(SLJIT_ADD, SLJIT_MEM1(SLJIT_SP), repeat_ptr, TMP1, 0, SLJIT_IMM, 1);
-  else
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), repeat_ptr, TMP1, 0);
-  }
-
-if (ket == OP_KETRMAX)
-  {
-  if (bra == OP_BRAZERO)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    free_stack(common, 1);
-    brazero = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0);
-    }
-  }
-else if (ket == OP_KETRMIN)
-  {
-  if (bra != OP_BRAMINZERO)
-    {
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    if (repeat_type != 0)
-      {
-      /* TMP1 was set a few lines above. */
-      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0, CURRENT_AS(bracket_backtrack)->recursive_matchingpath);
-      /* Drop STR_PTR for non-greedy plus quantifier. */
-      if (opcode != OP_ONCE)
-        free_stack(common, 1);
-      }
-    else if (opcode >= OP_SBRA || opcode == OP_ONCE)
-      {
-      /* Checking zero-length iteration. */
-      if (opcode != OP_ONCE || CURRENT_AS(bracket_backtrack)->u.framesize < 0)
-        CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, CURRENT_AS(bracket_backtrack)->recursive_matchingpath);
-      else
-        {
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-        CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_MEM1(TMP1), (CURRENT_AS(bracket_backtrack)->u.framesize + 1) * sizeof(sljit_sw), CURRENT_AS(bracket_backtrack)->recursive_matchingpath);
-        }
-      /* Drop STR_PTR for non-greedy plus quantifier. */
-      if (opcode != OP_ONCE)
-        free_stack(common, 1);
-      }
-    else
-      JUMPTO(SLJIT_JUMP, CURRENT_AS(bracket_backtrack)->recursive_matchingpath);
-    }
-  rmin_label = LABEL();
-  if (repeat_type != 0)
-    OP2(SLJIT_ADD, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_IMM, 1);
-  }
-else if (bra == OP_BRAZERO)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  brazero = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0);
-  }
-else if (repeat_type == OP_EXACT)
-  {
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_IMM, 1);
-  exact_label = LABEL();
-  }
-
-if (offset != 0)
-  {
-  if (common->capture_last_ptr != 0)
-    {
-    SLJIT_ASSERT(common->optimized_cbracket[offset >> 1] == 0);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, TMP1, 0);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(2));
-    free_stack(common, 3);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP2, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP1, 0);
-    }
-  else if (common->optimized_cbracket[offset >> 1] == 0)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-    free_stack(common, 2);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP2, 0);
-    }
-  }
-
-if (SLJIT_UNLIKELY(opcode == OP_ONCE))
-  {
-  if (CURRENT_AS(bracket_backtrack)->u.framesize >= 0)
-    {
-    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-    }
-  once = JUMP(SLJIT_JUMP);
-  }
-else if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
-  {
-  if (has_alternatives)
-    {
-    /* Always exactly one alternative. */
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    free_stack(common, 1);
-
-    alt_max = 2;
-    alt1 = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, sizeof(sljit_uw));
-    }
-  }
-else if (has_alternatives)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-
-  if (alt_max > 4)
-    {
-    /* Table jump if alt_max is greater than 4. */
-    next_update_addr = allocate_read_only_data(common, alt_max * sizeof(sljit_uw));
-    if (SLJIT_UNLIKELY(next_update_addr == NULL))
-      return;
-    sljit_emit_ijump(compiler, SLJIT_JUMP, SLJIT_MEM1(TMP1), (sljit_sw)next_update_addr);
-    add_label_addr(common, next_update_addr++);
-    }
-  else
-    {
-    if (alt_max == 4)
-      alt2 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_uw));
-    alt1 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, sizeof(sljit_uw));
-    }
-  }
-
-COMPILE_BACKTRACKINGPATH(current->top);
-if (current->topbacktracks)
-  set_jumps(current->topbacktracks, LABEL());
-
-if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
-  {
-  /* Conditional block always has at most one alternative. */
-  if (ccbegin[1 + LINK_SIZE] >= OP_ASSERT && ccbegin[1 + LINK_SIZE] <= OP_ASSERTBACK_NOT)
-    {
-    SLJIT_ASSERT(has_alternatives);
-    assert = CURRENT_AS(bracket_backtrack)->u.assert;
-    if (assert->framesize >= 0 && (ccbegin[1 + LINK_SIZE] == OP_ASSERT || ccbegin[1 + LINK_SIZE] == OP_ASSERTBACK))
-      {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, SLJIT_MEM1(STACK_TOP), assert->framesize * sizeof(sljit_sw));
-      }
-    cond = JUMP(SLJIT_JUMP);
-    set_jumps(CURRENT_AS(bracket_backtrack)->u.assert->condfailed, LABEL());
-    }
-  else if (CURRENT_AS(bracket_backtrack)->u.condfailed != NULL)
-    {
-    SLJIT_ASSERT(has_alternatives);
-    cond = JUMP(SLJIT_JUMP);
-    set_jumps(CURRENT_AS(bracket_backtrack)->u.condfailed, LABEL());
-    }
-  else
-    SLJIT_ASSERT(!has_alternatives);
-  }
-
-if (has_alternatives)
-  {
-  alt_count = sizeof(sljit_uw);
-  do
-    {
-    current->top = NULL;
-    current->topbacktracks = NULL;
-    current->nextbacktracks = NULL;
-    /* Conditional blocks always have an additional alternative, even if it is empty. */
-    if (*cc == OP_ALT)
-      {
-      ccprev = cc + 1 + LINK_SIZE;
-      cc += GET(cc, 1);
-      if (opcode != OP_COND && opcode != OP_SCOND)
-        {
-        if (opcode != OP_ONCE)
-          {
-          if (private_data_ptr != 0)
-            OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-          else
-            OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-          }
-        else
-          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(needs_control_head ? 1 : 0));
-        }
-      compile_matchingpath(common, ccprev, cc, current);
-      if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-        return;
-      }
-
-    /* Instructions after the current alternative is successfully matched. */
-    /* There is a similar code in compile_bracket_matchingpath. */
-    if (opcode == OP_ONCE)
-      match_once_common(common, ket, CURRENT_AS(bracket_backtrack)->u.framesize, private_data_ptr, has_alternatives, needs_control_head);
-
-    stacksize = 0;
-    if (repeat_type == OP_MINUPTO)
-      {
-      /* We need to preserve the counter. TMP2 will be used below. */
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), repeat_ptr);
-      stacksize++;
-      }
-    if (ket != OP_KET || bra != OP_BRA)
-      stacksize++;
-    if (offset != 0)
-      {
-      if (common->capture_last_ptr != 0)
-        stacksize++;
-      if (common->optimized_cbracket[offset >> 1] == 0)
-        stacksize += 2;
-      }
-    if (opcode != OP_ONCE)
-      stacksize++;
-
-    if (stacksize > 0)
-      allocate_stack(common, stacksize);
-
-    stacksize = 0;
-    if (repeat_type == OP_MINUPTO)
-      {
-      /* TMP2 was set above. */
-      OP2(SLJIT_SUB, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP2, 0, SLJIT_IMM, 1);
-      stacksize++;
-      }
-
-    if (ket != OP_KET || bra != OP_BRA)
-      {
-      if (ket != OP_KET)
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), STR_PTR, 0);
-      else
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
-      stacksize++;
-      }
-
-    if (offset != 0)
-      stacksize = match_capture_common(common, stacksize, offset, private_data_ptr);
-
-    if (opcode != OP_ONCE)
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, alt_count);
-
-    if (offset != 0 && ket == OP_KETRMAX && common->optimized_cbracket[offset >> 1] != 0)
-      {
-      /* If ket is not OP_KETRMAX, this code path is executed after the jump to alternative_matchingpath. */
-      SLJIT_ASSERT(private_data_ptr == OVECTOR(offset + 0));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
-      }
-
-    JUMPTO(SLJIT_JUMP, CURRENT_AS(bracket_backtrack)->alternative_matchingpath);
-
-    if (opcode != OP_ONCE)
-      {
-      if (alt_max > 4)
-        add_label_addr(common, next_update_addr++);
-      else
-        {
-        if (alt_count != 2 * sizeof(sljit_uw))
-          {
-          JUMPHERE(alt1);
-          if (alt_max == 3 && alt_count == sizeof(sljit_uw))
-            alt2 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_uw));
-          }
-        else
-          {
-          JUMPHERE(alt2);
-          if (alt_max == 4)
-            alt1 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_uw));
-          }
-        }
-      alt_count += sizeof(sljit_uw);
-      }
-
-    COMPILE_BACKTRACKINGPATH(current->top);
-    if (current->topbacktracks)
-      set_jumps(current->topbacktracks, LABEL());
-    SLJIT_ASSERT(!current->nextbacktracks);
-    }
-  while (*cc == OP_ALT);
-
-  if (cond != NULL)
-    {
-    SLJIT_ASSERT(opcode == OP_COND || opcode == OP_SCOND);
-    assert = CURRENT_AS(bracket_backtrack)->u.assert;
-    if ((ccbegin[1 + LINK_SIZE] == OP_ASSERT_NOT || ccbegin[1 + LINK_SIZE] == OP_ASSERTBACK_NOT) && assert->framesize >= 0)
-      {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, SLJIT_MEM1(STACK_TOP), assert->framesize * sizeof(sljit_sw));
-      }
-    JUMPHERE(cond);
-    }
-
-  /* Free the STR_PTR. */
-  if (private_data_ptr == 0)
-    free_stack(common, 1);
-  }
-
-if (offset != 0)
-  {
-  /* Using both tmp register is better for instruction scheduling. */
-  if (common->optimized_cbracket[offset >> 1] != 0)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-    free_stack(common, 2);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP2, 0);
-    }
-  else
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    free_stack(common, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
-    }
-  }
-else if (opcode == OP_SBRA || opcode == OP_SCOND)
-  {
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  }
-else if (opcode == OP_ONCE)
-  {
-  cc = ccbegin + GET(ccbegin, 1);
-  stacksize = needs_control_head ? 1 : 0;
-
-  if (CURRENT_AS(bracket_backtrack)->u.framesize >= 0)
-    {
-    /* Reset head and drop saved frame. */
-    stacksize += CURRENT_AS(bracket_backtrack)->u.framesize + ((ket != OP_KET || *cc == OP_ALT) ? 2 : 1);
-    }
-  else if (ket == OP_KETRMAX || (*cc == OP_ALT && ket != OP_KETRMIN))
-    {
-    /* The STR_PTR must be released. */
-    stacksize++;
-    }
-  free_stack(common, stacksize);
-
-  JUMPHERE(once);
-  /* Restore previous private_data_ptr */
-  if (CURRENT_AS(bracket_backtrack)->u.framesize >= 0)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), CURRENT_AS(bracket_backtrack)->u.framesize * sizeof(sljit_sw));
-  else if (ket == OP_KETRMIN)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-    /* See the comment below. */
-    free_stack(common, 2);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
-    }
-  }
-
-if (repeat_type == OP_EXACT)
-  {
-  OP2(SLJIT_ADD, TMP1, 0, SLJIT_MEM1(SLJIT_SP), repeat_ptr, SLJIT_IMM, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), repeat_ptr, TMP1, 0);
-  CMPTO(SLJIT_LESS_EQUAL, TMP1, 0, SLJIT_IMM, repeat_count, exact_label);
-  }
-else if (ket == OP_KETRMAX)
-  {
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  if (bra != OP_BRAZERO)
-    free_stack(common, 1);
-
-  CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(bracket_backtrack)->recursive_matchingpath);
-  if (bra == OP_BRAZERO)
-    {
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-    JUMPTO(SLJIT_JUMP, CURRENT_AS(bracket_backtrack)->zero_matchingpath);
-    JUMPHERE(brazero);
-    free_stack(common, 1);
-    }
-  }
-else if (ket == OP_KETRMIN)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-
-  /* OP_ONCE removes everything in case of a backtrack, so we don't
-  need to explicitly release the STR_PTR. The extra release would
-  affect badly the free_stack(2) above. */
-  if (opcode != OP_ONCE)
-    free_stack(common, 1);
-  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0, rmin_label);
-  if (opcode == OP_ONCE)
-    free_stack(common, bra == OP_BRAMINZERO ? 2 : 1);
-  else if (bra == OP_BRAMINZERO)
-    free_stack(common, 1);
-  }
-else if (bra == OP_BRAZERO)
-  {
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(bracket_backtrack)->zero_matchingpath);
-  JUMPHERE(brazero);
-  }
-}
-
-static SLJIT_INLINE void compile_bracketpos_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-int offset;
-struct sljit_jump *jump;
-
-if (CURRENT_AS(bracketpos_backtrack)->framesize < 0)
-  {
-  if (*current->cc == OP_CBRAPOS || *current->cc == OP_SCBRAPOS)
-    {
-    offset = (GET2(current->cc, 1 + LINK_SIZE)) << 1;
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0);
-    if (common->capture_last_ptr != 0)
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(2));
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP2, 0);
-    if (common->capture_last_ptr != 0)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, TMP1, 0);
-    }
-  set_jumps(current->topbacktracks, LABEL());
-  free_stack(common, CURRENT_AS(bracketpos_backtrack)->stacksize);
-  return;
-  }
-
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(bracketpos_backtrack)->private_data_ptr);
-add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-
-if (current->topbacktracks)
-  {
-  jump = JUMP(SLJIT_JUMP);
-  set_jumps(current->topbacktracks, LABEL());
-  /* Drop the stack frame. */
-  free_stack(common, CURRENT_AS(bracketpos_backtrack)->stacksize);
-  JUMPHERE(jump);
-  }
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(bracketpos_backtrack)->private_data_ptr, SLJIT_MEM1(STACK_TOP), CURRENT_AS(bracketpos_backtrack)->framesize * sizeof(sljit_sw));
-}
-
-static SLJIT_INLINE void compile_braminzero_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-assert_backtrack backtrack;
-
-current->top = NULL;
-current->topbacktracks = NULL;
-current->nextbacktracks = NULL;
-if (current->cc[1] > OP_ASSERTBACK_NOT)
-  {
-  /* Manual call of compile_bracket_matchingpath and compile_bracket_backtrackingpath. */
-  compile_bracket_matchingpath(common, current->cc, current);
-  compile_bracket_backtrackingpath(common, current->top);
-  }
-else
-  {
-  memset(&backtrack, 0, sizeof(backtrack));
-  backtrack.common.cc = current->cc;
-  backtrack.matchingpath = CURRENT_AS(braminzero_backtrack)->matchingpath;
-  /* Manual call of compile_assert_matchingpath. */
-  compile_assert_matchingpath(common, current->cc, &backtrack, FALSE);
-  }
-SLJIT_ASSERT(!current->nextbacktracks && !current->topbacktracks);
-}
-
-static SLJIT_INLINE void compile_control_verb_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-pcre_uchar opcode = *current->cc;
-struct sljit_label *loop;
-struct sljit_jump *jump;
-
-if (opcode == OP_THEN || opcode == OP_THEN_ARG)
-  {
-  if (common->then_trap != NULL)
-    {
-    SLJIT_ASSERT(common->control_head_ptr != 0);
-
-    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, type_then_trap);
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, common->then_trap->start);
-    jump = JUMP(SLJIT_JUMP);
-
-    loop = LABEL();
-    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), -(int)sizeof(sljit_sw));
-    JUMPHERE(jump);
-    CMPTO(SLJIT_NOT_EQUAL, SLJIT_MEM1(STACK_TOP), -(int)(2 * sizeof(sljit_sw)), TMP1, 0, loop);
-    CMPTO(SLJIT_NOT_EQUAL, SLJIT_MEM1(STACK_TOP), -(int)(3 * sizeof(sljit_sw)), TMP2, 0, loop);
-    add_jump(compiler, &common->then_trap->quit, JUMP(SLJIT_JUMP));
-    return;
-    }
-  else if (common->positive_assert)
-    {
-    add_jump(compiler, &common->positive_assert_quit, JUMP(SLJIT_JUMP));
-    return;
-    }
-  }
-
-if (common->local_exit)
-  {
-  if (common->quit_label == NULL)
-    add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
-  else
-    JUMPTO(SLJIT_JUMP, common->quit_label);
-  return;
-  }
-
-if (opcode == OP_SKIP_ARG)
-  {
-  SLJIT_ASSERT(common->control_head_ptr != 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, (sljit_sw)(current->cc + 2));
-  sljit_emit_ijump(compiler, SLJIT_CALL2, SLJIT_IMM, SLJIT_FUNC_OFFSET(do_search_mark));
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-
-  OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
-  add_jump(compiler, &common->reset_match, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, -1));
-  return;
-  }
-
-if (opcode == OP_SKIP)
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-else
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_IMM, 0);
-add_jump(compiler, &common->reset_match, JUMP(SLJIT_JUMP));
-}
-
-static SLJIT_INLINE void compile_then_trap_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-int size;
-
-if (CURRENT_AS(then_trap_backtrack)->then_trap)
-  {
-  common->then_trap = CURRENT_AS(then_trap_backtrack)->then_trap;
-  return;
-  }
-
-size = CURRENT_AS(then_trap_backtrack)->framesize;
-size = 3 + (size < 0 ? 0 : size);
-
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(size - 3));
-free_stack(common, size);
-jump = JUMP(SLJIT_JUMP);
-
-set_jumps(CURRENT_AS(then_trap_backtrack)->quit, LABEL());
-/* STACK_TOP is set by THEN. */
-if (CURRENT_AS(then_trap_backtrack)->framesize >= 0)
-  add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-free_stack(common, 3);
-
-JUMPHERE(jump);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, TMP1, 0);
-}
-
-static void compile_backtrackingpath(compiler_common *common, struct backtrack_common *current)
-{
-DEFINE_COMPILER;
-then_trap_backtrack *save_then_trap = common->then_trap;
-
-while (current)
-  {
-  if (current->nextbacktracks != NULL)
-    set_jumps(current->nextbacktracks, LABEL());
-  switch(*current->cc)
-    {
-    case OP_SET_SOM:
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    free_stack(common, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), TMP1, 0);
-    break;
-
-    case OP_STAR:
-    case OP_MINSTAR:
-    case OP_PLUS:
-    case OP_MINPLUS:
-    case OP_QUERY:
-    case OP_MINQUERY:
-    case OP_UPTO:
-    case OP_MINUPTO:
-    case OP_EXACT:
-    case OP_POSSTAR:
-    case OP_POSPLUS:
-    case OP_POSQUERY:
-    case OP_POSUPTO:
-    case OP_STARI:
-    case OP_MINSTARI:
-    case OP_PLUSI:
-    case OP_MINPLUSI:
-    case OP_QUERYI:
-    case OP_MINQUERYI:
-    case OP_UPTOI:
-    case OP_MINUPTOI:
-    case OP_EXACTI:
-    case OP_POSSTARI:
-    case OP_POSPLUSI:
-    case OP_POSQUERYI:
-    case OP_POSUPTOI:
-    case OP_NOTSTAR:
-    case OP_NOTMINSTAR:
-    case OP_NOTPLUS:
-    case OP_NOTMINPLUS:
-    case OP_NOTQUERY:
-    case OP_NOTMINQUERY:
-    case OP_NOTUPTO:
-    case OP_NOTMINUPTO:
-    case OP_NOTEXACT:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSUPTO:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERYI:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTOI:
-    case OP_NOTEXACTI:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSUPTOI:
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEEXACT:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    case OP_TYPEPOSUPTO:
-    case OP_CLASS:
-    case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-#endif
-    compile_iterator_backtrackingpath(common, current);
-    break;
-
-    case OP_REF:
-    case OP_REFI:
-    case OP_DNREF:
-    case OP_DNREFI:
-    compile_ref_iterator_backtrackingpath(common, current);
-    break;
-
-    case OP_RECURSE:
-    compile_recurse_backtrackingpath(common, current);
-    break;
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    compile_assert_backtrackingpath(common, current);
-    break;
-
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRA:
-    case OP_CBRA:
-    case OP_COND:
-    case OP_SBRA:
-    case OP_SCBRA:
-    case OP_SCOND:
-    compile_bracket_backtrackingpath(common, current);
-    break;
-
-    case OP_BRAZERO:
-    if (current->cc[1] > OP_ASSERTBACK_NOT)
-      compile_bracket_backtrackingpath(common, current);
-    else
-      compile_assert_backtrackingpath(common, current);
-    break;
-
-    case OP_BRAPOS:
-    case OP_CBRAPOS:
-    case OP_SBRAPOS:
-    case OP_SCBRAPOS:
-    case OP_BRAPOSZERO:
-    compile_bracketpos_backtrackingpath(common, current);
-    break;
-
-    case OP_BRAMINZERO:
-    compile_braminzero_backtrackingpath(common, current);
-    break;
-
-    case OP_MARK:
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(common->has_skip_arg ? 4 : 0));
-    if (common->has_skip_arg)
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-    free_stack(common, common->has_skip_arg ? 5 : 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP1, 0);
-    if (common->has_skip_arg)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, TMP2, 0);
-    break;
-
-    case OP_THEN:
-    case OP_THEN_ARG:
-    case OP_PRUNE:
-    case OP_PRUNE_ARG:
-    case OP_SKIP:
-    case OP_SKIP_ARG:
-    compile_control_verb_backtrackingpath(common, current);
-    break;
-
-    case OP_COMMIT:
-    if (!common->local_exit)
-      OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
-    if (common->quit_label == NULL)
-      add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
-    else
-      JUMPTO(SLJIT_JUMP, common->quit_label);
-    break;
-
-    case OP_CALLOUT:
-    case OP_FAIL:
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-    set_jumps(current->topbacktracks, LABEL());
-    break;
-
-    case OP_THEN_TRAP:
-    /* A virtual opcode for then traps. */
-    compile_then_trap_backtrackingpath(common, current);
-    break;
-
-    default:
-    SLJIT_ASSERT_STOP();
-    break;
-    }
-  current = current->prev;
-  }
-common->then_trap = save_then_trap;
-}
-
-static SLJIT_INLINE void compile_recurse(compiler_common *common)
-{
-DEFINE_COMPILER;
-pcre_uchar *cc = common->start + common->currententry->start;
-pcre_uchar *ccbegin = cc + 1 + LINK_SIZE + (*cc == OP_BRA ? 0 : IMM2_SIZE);
-pcre_uchar *ccend = bracketend(cc) - (1 + LINK_SIZE);
-BOOL needs_control_head;
-int framesize = get_framesize(common, cc, NULL, TRUE, &needs_control_head);
-int private_data_size = get_private_data_copy_length(common, ccbegin, ccend, needs_control_head);
-int alternativesize;
-BOOL needs_frame;
-backtrack_common altbacktrack;
-struct sljit_jump *jump;
-
-/* Recurse captures then. */
-common->then_trap = NULL;
-
-SLJIT_ASSERT(*cc == OP_BRA || *cc == OP_CBRA || *cc == OP_CBRAPOS || *cc == OP_SCBRA || *cc == OP_SCBRAPOS);
-needs_frame = framesize >= 0;
-if (!needs_frame)
-  framesize = 0;
-alternativesize = *(cc + GET(cc, 1)) == OP_ALT ? 1 : 0;
-
-SLJIT_ASSERT(common->currententry->entry == NULL && common->recursive_head_ptr != 0);
-common->currententry->entry = LABEL();
-set_jumps(common->currententry->calls, common->currententry->entry);
-
-sljit_emit_fast_enter(compiler, TMP2, 0);
-allocate_stack(common, private_data_size + framesize + alternativesize);
-count_match(common);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(private_data_size + framesize + alternativesize - 1), TMP2, 0);
-copy_private_data(common, ccbegin, ccend, TRUE, private_data_size + framesize + alternativesize, framesize + alternativesize, needs_control_head);
-if (needs_control_head)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, STACK_TOP, 0);
-if (needs_frame)
-  init_frame(common, cc, NULL, framesize + alternativesize - 1, alternativesize, TRUE);
-
-if (alternativesize > 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-
-memset(&altbacktrack, 0, sizeof(backtrack_common));
-common->quit_label = NULL;
-common->accept_label = NULL;
-common->quit = NULL;
-common->accept = NULL;
-altbacktrack.cc = ccbegin;
-cc += GET(cc, 1);
-while (1)
-  {
-  altbacktrack.top = NULL;
-  altbacktrack.topbacktracks = NULL;
-
-  if (altbacktrack.cc != ccbegin)
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-
-  compile_matchingpath(common, altbacktrack.cc, cc, &altbacktrack);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    return;
-
-  add_jump(compiler, &common->accept, JUMP(SLJIT_JUMP));
-
-  compile_backtrackingpath(common, altbacktrack.top);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    return;
-  set_jumps(altbacktrack.topbacktracks, LABEL());
-
-  if (*cc != OP_ALT)
-    break;
-
-  altbacktrack.cc = cc + 1 + LINK_SIZE;
-  cc += GET(cc, 1);
-  }
-
-/* None of them matched. */
-OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
-jump = JUMP(SLJIT_JUMP);
-
-if (common->quit != NULL)
-  {
-  set_jumps(common->quit, LABEL());
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr);
-  if (needs_frame)
-    {
-    OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-    add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-    }
-  OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
-  common->quit = NULL;
-  add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
-  }
-
-set_jumps(common->accept, LABEL());
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr);
-if (needs_frame)
-  {
-  OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-  add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-  }
-OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 1);
-
-JUMPHERE(jump);
-if (common->quit != NULL)
-  set_jumps(common->quit, LABEL());
-copy_private_data(common, ccbegin, ccend, FALSE, private_data_size + framesize + alternativesize, framesize + alternativesize, needs_control_head);
-free_stack(common, private_data_size + framesize + alternativesize);
-if (needs_control_head)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), 2 * sizeof(sljit_sw));
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), sizeof(sljit_sw));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, TMP1, 0);
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, TMP2, 0);
-  }
-else
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), sizeof(sljit_sw));
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, TMP2, 0);
-  }
-sljit_emit_fast_return(compiler, SLJIT_MEM1(STACK_TOP), 0);
-}
-
-#undef COMPILE_BACKTRACKINGPATH
-#undef CURRENT_AS
-
-void
-PRIV(jit_compile)(const REAL_PCRE *re, PUBL(extra) *extra, int mode)
-{
-struct sljit_compiler *compiler;
-backtrack_common rootbacktrack;
-compiler_common common_data;
-compiler_common *common = &common_data;
-const pcre_uint8 *tables = re->tables;
-pcre_study_data *study;
-int private_data_size;
-pcre_uchar *ccend;
-executable_functions *functions;
-void *executable_func;
-sljit_uw executable_size;
-sljit_uw total_length;
-label_addr_list *label_addr;
-struct sljit_label *mainloop_label = NULL;
-struct sljit_label *continue_match_label;
-struct sljit_label *empty_match_found_label = NULL;
-struct sljit_label *empty_match_backtrack_label = NULL;
-struct sljit_label *reset_match_label;
-struct sljit_label *quit_label;
-struct sljit_jump *jump;
-struct sljit_jump *minlength_check_failed = NULL;
-struct sljit_jump *reqbyte_notfound = NULL;
-struct sljit_jump *empty_match = NULL;
-
-SLJIT_ASSERT((extra->flags & PCRE_EXTRA_STUDY_DATA) != 0);
-study = extra->study_data;
-
-if (!tables)
-  tables = PRIV(default_tables);
-
-memset(&rootbacktrack, 0, sizeof(backtrack_common));
-memset(common, 0, sizeof(compiler_common));
-rootbacktrack.cc = (pcre_uchar *)re + re->name_table_offset + re->name_count * re->name_entry_size;
-
-common->start = rootbacktrack.cc;
-common->read_only_data_head = NULL;
-common->fcc = tables + fcc_offset;
-common->lcc = (sljit_sw)(tables + lcc_offset);
-common->mode = mode;
-common->might_be_empty = study->minlength == 0;
-common->nltype = NLTYPE_FIXED;
-switch(re->options & PCRE_NEWLINE_BITS)
-  {
-  case 0:
-  /* Compile-time default */
-  switch(NEWLINE)
-    {
-    case -1: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANY; break;
-    case -2: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANYCRLF; break;
-    default: common->newline = NEWLINE; break;
-    }
-  break;
-  case PCRE_NEWLINE_CR: common->newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: common->newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: common->newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANY; break;
-  case PCRE_NEWLINE_ANYCRLF: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANYCRLF; break;
-  default: return;
-  }
-common->nlmax = READ_CHAR_MAX;
-common->nlmin = 0;
-if ((re->options & PCRE_BSR_ANYCRLF) != 0)
-  common->bsr_nltype = NLTYPE_ANYCRLF;
-else if ((re->options & PCRE_BSR_UNICODE) != 0)
-  common->bsr_nltype = NLTYPE_ANY;
-else
-  {
-#ifdef BSR_ANYCRLF
-  common->bsr_nltype = NLTYPE_ANYCRLF;
-#else
-  common->bsr_nltype = NLTYPE_ANY;
-#endif
-  }
-common->bsr_nlmax = READ_CHAR_MAX;
-common->bsr_nlmin = 0;
-common->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
-common->ctypes = (sljit_sw)(tables + ctypes_offset);
-common->name_table = ((pcre_uchar *)re) + re->name_table_offset;
-common->name_count = re->name_count;
-common->name_entry_size = re->name_entry_size;
-common->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
-#ifdef SUPPORT_UTF
-/* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
-common->utf = (re->options & PCRE_UTF8) != 0;
-#ifdef SUPPORT_UCP
-common->use_ucp = (re->options & PCRE_UCP) != 0;
-#endif
-if (common->utf)
-  {
-  if (common->nltype == NLTYPE_ANY)
-    common->nlmax = 0x2029;
-  else if (common->nltype == NLTYPE_ANYCRLF)
-    common->nlmax = (CHAR_CR > CHAR_NL) ? CHAR_CR : CHAR_NL;
-  else
-    {
-    /* We only care about the first newline character. */
-    common->nlmax = common->newline & 0xff;
-    }
-
-  if (common->nltype == NLTYPE_FIXED)
-    common->nlmin = common->newline & 0xff;
-  else
-    common->nlmin = (CHAR_CR < CHAR_NL) ? CHAR_CR : CHAR_NL;
-
-  if (common->bsr_nltype == NLTYPE_ANY)
-    common->bsr_nlmax = 0x2029;
-  else
-    common->bsr_nlmax = (CHAR_CR > CHAR_NL) ? CHAR_CR : CHAR_NL;
-  common->bsr_nlmin = (CHAR_CR < CHAR_NL) ? CHAR_CR : CHAR_NL;
-  }
-#endif /* SUPPORT_UTF */
-ccend = bracketend(common->start);
-
-/* Calculate the local space size on the stack. */
-common->ovector_start = LIMIT_MATCH + sizeof(sljit_sw);
-common->optimized_cbracket = (pcre_uint8 *)SLJIT_MALLOC(re->top_bracket + 1, compiler->allocator_data);
-if (!common->optimized_cbracket)
-  return;
-#if defined DEBUG_FORCE_UNOPTIMIZED_CBRAS && DEBUG_FORCE_UNOPTIMIZED_CBRAS == 1
-memset(common->optimized_cbracket, 0, re->top_bracket + 1);
-#else
-memset(common->optimized_cbracket, 1, re->top_bracket + 1);
-#endif
-
-SLJIT_ASSERT(*common->start == OP_BRA && ccend[-(1 + LINK_SIZE)] == OP_KET);
-#if defined DEBUG_FORCE_UNOPTIMIZED_CBRAS && DEBUG_FORCE_UNOPTIMIZED_CBRAS == 2
-common->capture_last_ptr = common->ovector_start;
-common->ovector_start += sizeof(sljit_sw);
-#endif
-if (!check_opcode_types(common, common->start, ccend))
-  {
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  return;
-  }
-
-/* Checking flags and updating ovector_start. */
-if (mode == JIT_COMPILE && (re->flags & PCRE_REQCHSET) != 0 && (re->options & PCRE_NO_START_OPTIMIZE) == 0)
-  {
-  common->req_char_ptr = common->ovector_start;
-  common->ovector_start += sizeof(sljit_sw);
-  }
-if (mode != JIT_COMPILE)
-  {
-  common->start_used_ptr = common->ovector_start;
-  common->ovector_start += sizeof(sljit_sw);
-  if (mode == JIT_PARTIAL_SOFT_COMPILE)
-    {
-    common->hit_start = common->ovector_start;
-    common->ovector_start += 2 * sizeof(sljit_sw);
-    }
-  else
-    {
-    SLJIT_ASSERT(mode == JIT_PARTIAL_HARD_COMPILE);
-    common->needs_start_ptr = TRUE;
-    }
-  }
-if ((re->options & PCRE_FIRSTLINE) != 0)
-  {
-  common->first_line_end = common->ovector_start;
-  common->ovector_start += sizeof(sljit_sw);
-  }
-#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
-common->control_head_ptr = 1;
-#endif
-if (common->control_head_ptr != 0)
-  {
-  common->control_head_ptr = common->ovector_start;
-  common->ovector_start += sizeof(sljit_sw);
-  }
-if (common->needs_start_ptr && common->has_set_som)
-  {
-  /* Saving the real start pointer is necessary. */
-  common->start_ptr = common->ovector_start;
-  common->ovector_start += sizeof(sljit_sw);
-  }
-else
-  common->needs_start_ptr = FALSE;
-
-/* Aligning ovector to even number of sljit words. */
-if ((common->ovector_start & sizeof(sljit_sw)) != 0)
-  common->ovector_start += sizeof(sljit_sw);
-
-if (common->start_ptr == 0)
-  common->start_ptr = OVECTOR(0);
-
-/* Capturing brackets cannot be optimized if callouts are allowed. */
-if (common->capture_last_ptr != 0)
-  memset(common->optimized_cbracket, 0, re->top_bracket + 1);
-
-SLJIT_ASSERT(!(common->req_char_ptr != 0 && common->start_used_ptr != 0));
-common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);
-
-total_length = ccend - common->start;
-common->private_data_ptrs = (sljit_si *)SLJIT_MALLOC(total_length * (sizeof(sljit_si) + (common->has_then ? 1 : 0)), compiler->allocator_data);
-if (!common->private_data_ptrs)
-  {
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  return;
-  }
-memset(common->private_data_ptrs, 0, total_length * sizeof(sljit_si));
-
-private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
-set_private_data_ptrs(common, &private_data_size, ccend);
-if (private_data_size > SLJIT_MAX_LOCAL_SIZE)
-  {
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  return;
-  }
-
-if (common->has_then)
-  {
-  common->then_offsets = (pcre_uint8 *)(common->private_data_ptrs + total_length);
-  memset(common->then_offsets, 0, total_length);
-  set_then_offsets(common, common->start, NULL);
-  }
-
-compiler = sljit_create_compiler(NULL);
-if (!compiler)
-  {
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  return;
-  }
-common->compiler = compiler;
-
-/* Main pcre_jit_exec entry. */
-sljit_emit_enter(compiler, 0, 1, 5, 5, 0, 0, private_data_size);
-
-/* Register init. */
-reset_ovector(common, (re->top_bracket + 1) * 2);
-if (common->req_char_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->req_char_ptr, SLJIT_R0, 0);
-
-OP1(SLJIT_MOV, ARGUMENTS, 0, SLJIT_S0, 0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_S0, 0);
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, end));
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, stack));
-OP1(SLJIT_MOV_UI, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, limit_match));
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(struct sljit_stack, base));
-OP1(SLJIT_MOV, STACK_LIMIT, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(struct sljit_stack, limit));
-OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LIMIT_MATCH, TMP1, 0);
-
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, -1);
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, SLJIT_IMM, 0);
-if (common->control_head_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-
-/* Main part of the matching */
-if ((re->options & PCRE_ANCHORED) == 0)
-  {
-  mainloop_label = mainloop_entry(common, (re->flags & PCRE_HASCRORLF) != 0, (re->options & PCRE_FIRSTLINE) != 0);
-  continue_match_label = LABEL();
-  /* Forward search if possible. */
-  if ((re->options & PCRE_NO_START_OPTIMIZE) == 0)
-    {
-    if (mode == JIT_COMPILE && fast_forward_first_n_chars(common, (re->options & PCRE_FIRSTLINE) != 0))
-      ;
-    else if ((re->flags & PCRE_FIRSTSET) != 0)
-      fast_forward_first_char(common, (pcre_uchar)re->first_char, (re->flags & PCRE_FCH_CASELESS) != 0, (re->options & PCRE_FIRSTLINE) != 0);
-    else if ((re->flags & PCRE_STARTLINE) != 0)
-      fast_forward_newline(common, (re->options & PCRE_FIRSTLINE) != 0);
-    else if (study != NULL && (study->flags & PCRE_STUDY_MAPPED) != 0)
-      fast_forward_start_bits(common, study->start_bits, (re->options & PCRE_FIRSTLINE) != 0);
-    }
-  }
-else
-  continue_match_label = LABEL();
-
-if (mode == JIT_COMPILE && study->minlength > 0 && (re->options & PCRE_NO_START_OPTIMIZE) == 0)
-  {
-  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
-  OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(study->minlength));
-  minlength_check_failed = CMP(SLJIT_GREATER, TMP2, 0, STR_END, 0);
-  }
-if (common->req_char_ptr != 0)
-  reqbyte_notfound = search_requested_char(common, (pcre_uchar)re->req_char, (re->flags & PCRE_RCH_CASELESS) != 0, (re->flags & PCRE_FIRSTSET) != 0);
-
-/* Store the current STR_PTR in OVECTOR(0). */
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), STR_PTR, 0);
-/* Copy the limit of allowed recursions. */
-OP1(SLJIT_MOV, COUNT_MATCH, 0, SLJIT_MEM1(SLJIT_SP), LIMIT_MATCH);
-if (common->capture_last_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, SLJIT_IMM, -1);
-
-if (common->needs_start_ptr)
-  {
-  SLJIT_ASSERT(common->start_ptr != OVECTOR(0));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_ptr, STR_PTR, 0);
-  }
-else
-  SLJIT_ASSERT(common->start_ptr == OVECTOR(0));
-
-/* Copy the beginning of the string. */
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
-  {
-  jump = CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, -1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start + sizeof(sljit_sw), STR_PTR, 0);
-  JUMPHERE(jump);
-  }
-else if (mode == JIT_PARTIAL_HARD_COMPILE)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-
-compile_matchingpath(common, common->start, ccend, &rootbacktrack);
-if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-  {
-  sljit_free_compiler(compiler);
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-  return;
-  }
-
-if (common->might_be_empty)
-  {
-  empty_match = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-  empty_match_found_label = LABEL();
-  }
-
-common->accept_label = LABEL();
-if (common->accept != NULL)
-  set_jumps(common->accept, common->accept_label);
-
-/* This means we have a match. Update the ovector. */
-copy_ovector(common, re->top_bracket + 1);
-common->quit_label = common->forced_quit_label = LABEL();
-if (common->quit != NULL)
-  set_jumps(common->quit, common->quit_label);
-if (common->forced_quit != NULL)
-  set_jumps(common->forced_quit, common->forced_quit_label);
-if (minlength_check_failed != NULL)
-  SET_LABEL(minlength_check_failed, common->forced_quit_label);
-sljit_emit_return(compiler, SLJIT_MOV, SLJIT_RETURN_REG, 0);
-
-if (mode != JIT_COMPILE)
-  {
-  common->partialmatchlabel = LABEL();
-  set_jumps(common->partialmatch, common->partialmatchlabel);
-  return_with_partial_match(common, common->quit_label);
-  }
-
-if (common->might_be_empty)
-  empty_match_backtrack_label = LABEL();
-compile_backtrackingpath(common, rootbacktrack.top);
-if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-  {
-  sljit_free_compiler(compiler);
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-  return;
-  }
-
-SLJIT_ASSERT(rootbacktrack.prev == NULL);
-reset_match_label = LABEL();
-
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
-  {
-  /* Update hit_start only in the first time. */
-  jump = CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, -1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, TMP1, 0);
-  JUMPHERE(jump);
-  }
-
-/* Check we have remaining characters. */
-if ((re->options & PCRE_ANCHORED) == 0 && (re->options & PCRE_FIRSTLINE) != 0)
-  {
-  SLJIT_ASSERT(common->first_line_end != 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->first_line_end);
-  }
-
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
-
-if ((re->options & PCRE_ANCHORED) == 0)
-  {
-  if (common->ff_newline_shortcut != NULL)
-    {
-    if ((re->options & PCRE_FIRSTLINE) == 0)
-      CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, common->ff_newline_shortcut);
-    /* There cannot be more newlines here. */
-    }
-  else
-    {
-    if ((re->options & PCRE_FIRSTLINE) == 0)
-      CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, mainloop_label);
-    else
-      CMPTO(SLJIT_LESS, STR_PTR, 0, TMP1, 0, mainloop_label);
-    }
-  }
-
-/* No more remaining characters. */
-if (reqbyte_notfound != NULL)
-  JUMPHERE(reqbyte_notfound);
-
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
-  CMPTO(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, -1, common->partialmatchlabel);
-
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
-JUMPTO(SLJIT_JUMP, common->quit_label);
-
-flush_stubs(common);
-
-if (common->might_be_empty)
-  {
-  JUMPHERE(empty_match);
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty));
-  CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_backtrack_label);
-  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty_atstart));
-  CMPTO(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_found_label);
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-  CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, STR_PTR, 0, empty_match_found_label);
-  JUMPTO(SLJIT_JUMP, empty_match_backtrack_label);
-  }
-
-common->currententry = common->entries;
-common->local_exit = TRUE;
-quit_label = common->quit_label;
-while (common->currententry != NULL)
-  {
-  /* Might add new entries. */
-  compile_recurse(common);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
-    {
-    sljit_free_compiler(compiler);
-    SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-    SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-    free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-    return;
-    }
-  flush_stubs(common);
-  common->currententry = common->currententry->next;
-  }
-common->local_exit = FALSE;
-common->quit_label = quit_label;
-
-/* Allocating stack, returns with PCRE_ERROR_JIT_STACKLIMIT if fails. */
-/* This is a (really) rare case. */
-set_jumps(common->stackalloc, LABEL());
-/* RETURN_ADDR is not a saved register. */
-sljit_emit_fast_enter(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP2, 0);
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, stack));
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(struct sljit_stack, top), STACK_TOP, 0);
-OP2(SLJIT_ADD, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(struct sljit_stack, limit), SLJIT_IMM, STACK_GROWTH_RATE);
-
-sljit_emit_ijump(compiler, SLJIT_CALL2, SLJIT_IMM, SLJIT_FUNC_OFFSET(sljit_stack_resize));
-jump = CMP(SLJIT_NOT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, stack));
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(struct sljit_stack, top));
-OP1(SLJIT_MOV, STACK_LIMIT, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(struct sljit_stack, limit));
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-sljit_emit_fast_return(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-
-/* Allocation failed. */
-JUMPHERE(jump);
-/* We break the return address cache here, but this is a really rare case. */
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_JIT_STACKLIMIT);
-JUMPTO(SLJIT_JUMP, common->quit_label);
-
-/* Call limit reached. */
-set_jumps(common->calllimit, LABEL());
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_MATCHLIMIT);
-JUMPTO(SLJIT_JUMP, common->quit_label);
-
-if (common->revertframes != NULL)
-  {
-  set_jumps(common->revertframes, LABEL());
-  do_revertframes(common);
-  }
-if (common->wordboundary != NULL)
-  {
-  set_jumps(common->wordboundary, LABEL());
-  check_wordboundary(common);
-  }
-if (common->anynewline != NULL)
-  {
-  set_jumps(common->anynewline, LABEL());
-  check_anynewline(common);
-  }
-if (common->hspace != NULL)
-  {
-  set_jumps(common->hspace, LABEL());
-  check_hspace(common);
-  }
-if (common->vspace != NULL)
-  {
-  set_jumps(common->vspace, LABEL());
-  check_vspace(common);
-  }
-if (common->casefulcmp != NULL)
-  {
-  set_jumps(common->casefulcmp, LABEL());
-  do_casefulcmp(common);
-  }
-if (common->caselesscmp != NULL)
-  {
-  set_jumps(common->caselesscmp, LABEL());
-  do_caselesscmp(common);
-  }
-if (common->reset_match != NULL)
-  {
-  set_jumps(common->reset_match, LABEL());
-  do_reset_match(common, (re->top_bracket + 1) * 2);
-  CMPTO(SLJIT_GREATER, STR_PTR, 0, TMP1, 0, continue_match_label);
-  OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
-  JUMPTO(SLJIT_JUMP, reset_match_label);
-  }
-#ifdef SUPPORT_UTF
-#ifdef COMPILE_PCRE8
-if (common->utfreadchar != NULL)
-  {
-  set_jumps(common->utfreadchar, LABEL());
-  do_utfreadchar(common);
-  }
-if (common->utfreadchar16 != NULL)
-  {
-  set_jumps(common->utfreadchar16, LABEL());
-  do_utfreadchar16(common);
-  }
-if (common->utfreadtype8 != NULL)
-  {
-  set_jumps(common->utfreadtype8, LABEL());
-  do_utfreadtype8(common);
-  }
-#endif /* COMPILE_PCRE8 */
-#endif /* SUPPORT_UTF */
-#ifdef SUPPORT_UCP
-if (common->getucd != NULL)
-  {
-  set_jumps(common->getucd, LABEL());
-  do_getucd(common);
-  }
-#endif
-
-SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-
-executable_func = sljit_generate_code(compiler);
-executable_size = sljit_get_generated_code_size(compiler);
-label_addr = common->label_addrs;
-while (label_addr != NULL)
-  {
-  *label_addr->update_addr = sljit_get_label_addr(label_addr->label);
-  label_addr = label_addr->next;
-  }
-sljit_free_compiler(compiler);
-if (executable_func == NULL)
-  {
-  free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-  return;
-  }
-
-/* Reuse the function descriptor if possible. */
-if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 && extra->executable_jit != NULL)
-  functions = (executable_functions *)extra->executable_jit;
-else
-  {
-  /* Note: If your memory-checker has flagged the allocation below as a
-   * memory leak, it is probably because you either forgot to call
-   * pcre_free_study() (or pcre16_free_study()) on the pcre_extra (or
-   * pcre16_extra) object, or you called said function after having
-   * cleared the PCRE_EXTRA_EXECUTABLE_JIT bit from the "flags" field
-   * of the object. (The function will only free the JIT data if the
-   * bit remains set, as the bit indicates that the pointer to the data
-   * is valid.)
-   */
-  functions = SLJIT_MALLOC(sizeof(executable_functions), compiler->allocator_data);
-  if (functions == NULL)
-    {
-    /* This case is highly unlikely since we just recently
-    freed a lot of memory. Not impossible though. */
-    sljit_free_code(executable_func);
-    free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-    return;
-    }
-  memset(functions, 0, sizeof(executable_functions));
-  functions->top_bracket = (re->top_bracket + 1) * 2;
-  functions->limit_match = (re->flags & PCRE_MLSET) != 0 ? re->limit_match : 0;
-  extra->executable_jit = functions;
-  extra->flags |= PCRE_EXTRA_EXECUTABLE_JIT;
-  }
-
-functions->executable_funcs[mode] = executable_func;
-functions->read_only_data_heads[mode] = common->read_only_data_head;
-functions->executable_sizes[mode] = executable_size;
-}
-
-static SLJIT_NOINLINE int jit_machine_stack_exec(jit_arguments *arguments, void *executable_func)
-{
-union {
-   void *executable_func;
-   jit_function call_executable_func;
-} convert_executable_func;
-pcre_uint8 local_space[MACHINE_STACK_SIZE];
-struct sljit_stack local_stack;
-
-local_stack.top = (sljit_sw)&local_space;
-local_stack.base = local_stack.top;
-local_stack.limit = local_stack.base + MACHINE_STACK_SIZE;
-local_stack.max_limit = local_stack.limit;
-arguments->stack = &local_stack;
-convert_executable_func.executable_func = executable_func;
-return convert_executable_func.call_executable_func(arguments);
-}
-
-int
-PRIV(jit_exec)(const PUBL(extra) *extra_data, const pcre_uchar *subject,
-  int length, int start_offset, int options, int *offsets, int offset_count)
-{
-executable_functions *functions = (executable_functions *)extra_data->executable_jit;
-union {
-   void *executable_func;
-   jit_function call_executable_func;
-} convert_executable_func;
-jit_arguments arguments;
-int max_offset_count;
-int retval;
-int mode = JIT_COMPILE;
-
-if ((options & PCRE_PARTIAL_HARD) != 0)
-  mode = JIT_PARTIAL_HARD_COMPILE;
-else if ((options & PCRE_PARTIAL_SOFT) != 0)
-  mode = JIT_PARTIAL_SOFT_COMPILE;
-
-if (functions->executable_funcs[mode] == NULL)
-  return PCRE_ERROR_JIT_BADOPTION;
-
-/* Sanity checks should be handled by pcre_exec. */
-arguments.str = subject + start_offset;
-arguments.begin = subject;
-arguments.end = subject + length;
-arguments.mark_ptr = NULL;
-/* JIT decreases this value less frequently than the interpreter. */
-arguments.limit_match = ((extra_data->flags & PCRE_EXTRA_MATCH_LIMIT) == 0) ? MATCH_LIMIT : (pcre_uint32)(extra_data->match_limit);
-if (functions->limit_match != 0 && functions->limit_match < arguments.limit_match)
-  arguments.limit_match = functions->limit_match;
-arguments.notbol = (options & PCRE_NOTBOL) != 0;
-arguments.noteol = (options & PCRE_NOTEOL) != 0;
-arguments.notempty = (options & PCRE_NOTEMPTY) != 0;
-arguments.notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
-arguments.offsets = offsets;
-arguments.callout_data = (extra_data->flags & PCRE_EXTRA_CALLOUT_DATA) != 0 ? extra_data->callout_data : NULL;
-arguments.real_offset_count = offset_count;
-
-/* pcre_exec() rounds offset_count to a multiple of 3, and then uses only 2/3 of
-the output vector for storing captured strings, with the remainder used as
-workspace. We don't need the workspace here. For compatibility, we limit the
-number of captured strings in the same way as pcre_exec(), so that the user
-gets the same result with and without JIT. */
-
-if (offset_count != 2)
-  offset_count = ((offset_count - (offset_count % 3)) * 2) / 3;
-max_offset_count = functions->top_bracket;
-if (offset_count > max_offset_count)
-  offset_count = max_offset_count;
-arguments.offset_count = offset_count;
-
-if (functions->callback)
-  arguments.stack = (struct sljit_stack *)functions->callback(functions->userdata);
-else
-  arguments.stack = (struct sljit_stack *)functions->userdata;
-
-if (arguments.stack == NULL)
-  retval = jit_machine_stack_exec(&arguments, functions->executable_funcs[mode]);
-else
-  {
-  convert_executable_func.executable_func = functions->executable_funcs[mode];
-  retval = convert_executable_func.call_executable_func(&arguments);
-  }
-
-if (retval * 2 > offset_count)
-  retval = 0;
-if ((extra_data->flags & PCRE_EXTRA_MARK) != 0)
-  *(extra_data->mark) = arguments.mark_ptr;
-
-return retval;
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_jit_exec(const pcre *argument_re, const pcre_extra *extra_data,
-  PCRE_SPTR subject, int length, int start_offset, int options,
-  int *offsets, int offset_count, pcre_jit_stack *stack)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_jit_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  PCRE_SPTR16 subject, int length, int start_offset, int options,
-  int *offsets, int offset_count, pcre16_jit_stack *stack)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_jit_exec(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  PCRE_SPTR32 subject, int length, int start_offset, int options,
-  int *offsets, int offset_count, pcre32_jit_stack *stack)
-#endif
-{
-pcre_uchar *subject_ptr = (pcre_uchar *)subject;
-executable_functions *functions = (executable_functions *)extra_data->executable_jit;
-union {
-   void *executable_func;
-   jit_function call_executable_func;
-} convert_executable_func;
-jit_arguments arguments;
-int max_offset_count;
-int retval;
-int mode = JIT_COMPILE;
-
-SLJIT_UNUSED_ARG(argument_re);
-
-/* Plausibility checks */
-if ((options & ~PUBLIC_JIT_EXEC_OPTIONS) != 0) return PCRE_ERROR_JIT_BADOPTION;
-
-if ((options & PCRE_PARTIAL_HARD) != 0)
-  mode = JIT_PARTIAL_HARD_COMPILE;
-else if ((options & PCRE_PARTIAL_SOFT) != 0)
-  mode = JIT_PARTIAL_SOFT_COMPILE;
-
-if (functions->executable_funcs[mode] == NULL)
-  return PCRE_ERROR_JIT_BADOPTION;
-
-/* Sanity checks should be handled by pcre_exec. */
-arguments.stack = (struct sljit_stack *)stack;
-arguments.str = subject_ptr + start_offset;
-arguments.begin = subject_ptr;
-arguments.end = subject_ptr + length;
-arguments.mark_ptr = NULL;
-/* JIT decreases this value less frequently than the interpreter. */
-arguments.limit_match = ((extra_data->flags & PCRE_EXTRA_MATCH_LIMIT) == 0) ? MATCH_LIMIT : (pcre_uint32)(extra_data->match_limit);
-if (functions->limit_match != 0 && functions->limit_match < arguments.limit_match)
-  arguments.limit_match = functions->limit_match;
-arguments.notbol = (options & PCRE_NOTBOL) != 0;
-arguments.noteol = (options & PCRE_NOTEOL) != 0;
-arguments.notempty = (options & PCRE_NOTEMPTY) != 0;
-arguments.notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
-arguments.offsets = offsets;
-arguments.callout_data = (extra_data->flags & PCRE_EXTRA_CALLOUT_DATA) != 0 ? extra_data->callout_data : NULL;
-arguments.real_offset_count = offset_count;
-
-/* pcre_exec() rounds offset_count to a multiple of 3, and then uses only 2/3 of
-the output vector for storing captured strings, with the remainder used as
-workspace. We don't need the workspace here. For compatibility, we limit the
-number of captured strings in the same way as pcre_exec(), so that the user
-gets the same result with and without JIT. */
-
-if (offset_count != 2)
-  offset_count = ((offset_count - (offset_count % 3)) * 2) / 3;
-max_offset_count = functions->top_bracket;
-if (offset_count > max_offset_count)
-  offset_count = max_offset_count;
-arguments.offset_count = offset_count;
-
-convert_executable_func.executable_func = functions->executable_funcs[mode];
-retval = convert_executable_func.call_executable_func(&arguments);
-
-if (retval * 2 > offset_count)
-  retval = 0;
-if ((extra_data->flags & PCRE_EXTRA_MARK) != 0)
-  *(extra_data->mark) = arguments.mark_ptr;
-
-return retval;
-}
-
-void
-PRIV(jit_free)(void *executable_funcs)
-{
-int i;
-executable_functions *functions = (executable_functions *)executable_funcs;
-for (i = 0; i < JIT_NUMBER_OF_COMPILE_MODES; i++)
-  {
-  if (functions->executable_funcs[i] != NULL)
-    sljit_free_code(functions->executable_funcs[i]);
-  free_read_only_data(functions->read_only_data_heads[i], NULL);
-  }
-SLJIT_FREE(functions, compiler->allocator_data);
-}
-
-int
-PRIV(jit_get_size)(void *executable_funcs)
-{
-int i;
-sljit_uw size = 0;
-sljit_uw *executable_sizes = ((executable_functions *)executable_funcs)->executable_sizes;
-for (i = 0; i < JIT_NUMBER_OF_COMPILE_MODES; i++)
-  size += executable_sizes[i];
-return (int)size;
-}
-
-const char*
-PRIV(jit_get_target)(void)
-{
-return sljit_get_platform_name();
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL pcre_jit_stack *
-pcre_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL pcre16_jit_stack *
-pcre16_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL pcre32_jit_stack *
-pcre32_jit_stack_alloc(int startsize, int maxsize)
-#endif
-{
-if (startsize < 1 || maxsize < 1)
-  return NULL;
-if (startsize > maxsize)
-  startsize = maxsize;
-startsize = (startsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
-maxsize = (maxsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
-return (PUBL(jit_stack)*)sljit_allocate_stack(startsize, maxsize, NULL);
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_stack_free(pcre_jit_stack *stack)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_stack_free(pcre16_jit_stack *stack)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_stack_free(pcre32_jit_stack *stack)
-#endif
-{
-sljit_free_stack((struct sljit_stack *)stack, NULL);
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_assign_jit_stack(pcre_extra *extra, pcre_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_assign_jit_stack(pcre16_extra *extra, pcre16_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_assign_jit_stack(pcre32_extra *extra, pcre32_jit_callback callback, void *userdata)
-#endif
-{
-executable_functions *functions;
-if (extra != NULL &&
-    (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-    extra->executable_jit != NULL)
-  {
-  functions = (executable_functions *)extra->executable_jit;
-  functions->callback = callback;
-  functions->userdata = userdata;
-  }
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_free_unused_memory(void)
-#endif
-{
-sljit_free_unused_memory_exec();
-}
-
-#else  /* SUPPORT_JIT */
-
-/* These are dummy functions to avoid linking errors when JIT support is not
-being compiled. */
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL pcre_jit_stack *
-pcre_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL pcre16_jit_stack *
-pcre16_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL pcre32_jit_stack *
-pcre32_jit_stack_alloc(int startsize, int maxsize)
-#endif
-{
-(void)startsize;
-(void)maxsize;
-return NULL;
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_stack_free(pcre_jit_stack *stack)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_stack_free(pcre16_jit_stack *stack)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_stack_free(pcre32_jit_stack *stack)
-#endif
-{
-(void)stack;
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_assign_jit_stack(pcre_extra *extra, pcre_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_assign_jit_stack(pcre16_extra *extra, pcre16_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_assign_jit_stack(pcre32_extra *extra, pcre32_jit_callback callback, void *userdata)
-#endif
-{
-(void)extra;
-(void)callback;
-(void)userdata;
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_free_unused_memory(void)
-#endif
-{
-}
-
-#endif
-
-/* End of pcre_jit_compile.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_maketables.c r-base-3.3.1/src/extra/pcre/pcre_maketables.c
--- r-base-3.2.3/src/extra/pcre/pcre_maketables.c	2013-12-30 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_maketables.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_maketables(), which builds
-character tables for PCRE in the current locale. The file is compiled on its
-own as part of the PCRE library. However, it is also included in the
-compilation of dftables.c, in which case the macro DFTABLES is defined. */
-
-
-#ifndef DFTABLES
-#  ifdef HAVE_CONFIG_H
-#  include "config.h"
-#  endif
-#  include "pcre_internal.h"
-#endif
-
-
-/*************************************************
-*           Create PCRE character tables         *
-*************************************************/
-
-/* This function builds a set of character tables for use by PCRE and returns
-a pointer to them. They are build using the ctype functions, and consequently
-their contents will depend upon the current locale setting. When compiled as
-part of the library, the store is obtained via PUBL(malloc)(), but when
-compiled inside dftables, use malloc().
-
-Arguments:   none
-Returns:     pointer to the contiguous block of data
-*/
-
-#if defined COMPILE_PCRE8
-const unsigned char *
-pcre_maketables(void)
-#elif defined COMPILE_PCRE16
-const unsigned char *
-pcre16_maketables(void)
-#elif defined COMPILE_PCRE32
-const unsigned char *
-pcre32_maketables(void)
-#endif
-{
-unsigned char *yield, *p;
-int i;
-
-#ifndef DFTABLES
-yield = (unsigned char*)(PUBL(malloc))(tables_length);
-#else
-yield = (unsigned char*)malloc(tables_length);
-#endif
-
-if (yield == NULL) return NULL;
-p = yield;
-
-/* First comes the lower casing table */
-
-for (i = 0; i < 256; i++) *p++ = tolower(i);
-
-/* Next the case-flipping table */
-
-for (i = 0; i < 256; i++) *p++ = islower(i)? toupper(i) : tolower(i);
-
-/* Then the character class tables. Don't try to be clever and save effort on
-exclusive ones - in some locales things may be different.
-
-Note that the table for "space" includes everything "isspace" gives, including
-VT in the default locale. This makes it work for the POSIX class [:space:].
-From release 8.34 is is also correct for Perl space, because Perl added VT at
-release 5.18.
-
-Note also that it is possible for a character to be alnum or alpha without
-being lower or upper, such as "male and female ordinals" (\xAA and \xBA) in the
-fr_FR locale (at least under Debian Linux's locales as of 12/2005). So we must
-test for alnum specially. */
-
-memset(p, 0, cbit_length);
-for (i = 0; i < 256; i++)
-  {
-  if (isdigit(i)) p[cbit_digit  + i/8] |= 1 << (i&7);
-  if (isupper(i)) p[cbit_upper  + i/8] |= 1 << (i&7);
-  if (islower(i)) p[cbit_lower  + i/8] |= 1 << (i&7);
-  if (isalnum(i)) p[cbit_word   + i/8] |= 1 << (i&7);
-  if (i == '_')   p[cbit_word   + i/8] |= 1 << (i&7);
-  if (isspace(i)) p[cbit_space  + i/8] |= 1 << (i&7);
-  if (isxdigit(i))p[cbit_xdigit + i/8] |= 1 << (i&7);
-  if (isgraph(i)) p[cbit_graph  + i/8] |= 1 << (i&7);
-  if (isprint(i)) p[cbit_print  + i/8] |= 1 << (i&7);
-  if (ispunct(i)) p[cbit_punct  + i/8] |= 1 << (i&7);
-  if (iscntrl(i)) p[cbit_cntrl  + i/8] |= 1 << (i&7);
-  }
-p += cbit_length;
-
-/* Finally, the character type table. In this, we used to exclude VT from the
-white space chars, because Perl didn't recognize it as such for \s and for
-comments within regexes. However, Perl changed at release 5.18, so PCRE changed
-at release 8.34. */
-
-for (i = 0; i < 256; i++)
-  {
-  int x = 0;
-  if (isspace(i)) x += ctype_space;
-  if (isalpha(i)) x += ctype_letter;
-  if (isdigit(i)) x += ctype_digit;
-  if (isxdigit(i)) x += ctype_xdigit;
-  if (isalnum(i) || i == '_') x += ctype_word;
-
-  /* Note: strchr includes the terminating zero in the characters it considers.
-  In this instance, that is ok because we want binary zero to be flagged as a
-  meta-character, which in this sense is any character that terminates a run
-  of data characters. */
-
-  if (strchr("\\*+?{^.$|()[", i) != 0) x += ctype_meta;
-  *p++ = x;
-  }
-
-return yield;
-}
-
-/* End of pcre_maketables.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_newline.c r-base-3.3.1/src/extra/pcre/pcre_newline.c
--- r-base-3.2.3/src/extra/pcre/pcre_newline.c	2013-02-04 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_newline.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,210 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains internal functions for testing newlines when more than
-one kind of newline is to be recognized. When a newline is found, its length is
-returned. In principle, we could implement several newline "types", each
-referring to a different set of newline characters. At present, PCRE supports
-only NLTYPE_FIXED, which gets handled without these functions, NLTYPE_ANYCRLF,
-and NLTYPE_ANY. The full list of Unicode newline characters is taken from
-http://unicode.org/unicode/reports/tr18/. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-
-/*************************************************
-*      Check for newline at given position       *
-*************************************************/
-
-/* It is guaranteed that the initial value of ptr is less than the end of the
-string that is being processed.
-
-Arguments:
-  ptr          pointer to possible newline
-  type         the newline type
-  endptr       pointer to the end of the string
-  lenptr       where to return the length
-  utf          TRUE if in utf mode
-
-Returns:       TRUE or FALSE
-*/
-
-BOOL
-PRIV(is_newline)(PCRE_PUCHAR ptr, int type, PCRE_PUCHAR endptr, int *lenptr,
-  BOOL utf)
-{
-pcre_uint32 c;
-(void)utf;
-#ifdef SUPPORT_UTF
-if (utf)
-  {
-  GETCHAR(c, ptr);
-  }
-else
-#endif  /* SUPPORT_UTF */
-  c = *ptr;
-
-/* Note that this function is called only for ANY or ANYCRLF. */
-
-if (type == NLTYPE_ANYCRLF) switch(c)
-  {
-  case CHAR_LF: *lenptr = 1; return TRUE;
-  case CHAR_CR: *lenptr = (ptr < endptr - 1 && ptr[1] == CHAR_LF)? 2 : 1;
-               return TRUE;
-  default: return FALSE;
-  }
-
-/* NLTYPE_ANY */
-
-else switch(c)
-  {
-#ifdef EBCDIC
-  case CHAR_NEL:
-#endif
-  case CHAR_LF:
-  case CHAR_VT:
-  case CHAR_FF: *lenptr = 1; return TRUE;
-
-  case CHAR_CR:
-  *lenptr = (ptr < endptr - 1 && ptr[1] == CHAR_LF)? 2 : 1;
-  return TRUE;
-
-#ifndef EBCDIC
-#ifdef COMPILE_PCRE8
-  case CHAR_NEL: *lenptr = utf? 2 : 1; return TRUE;
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 3; return TRUE;             /* PS */
-#else /* COMPILE_PCRE16 || COMPILE_PCRE32 */
-  case CHAR_NEL:
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 1; return TRUE;             /* PS */
-#endif  /* COMPILE_PCRE8 */
-#endif  /* Not EBCDIC */
-
-  default: return FALSE;
-  }
-}
-
-
-
-/*************************************************
-*     Check for newline at previous position     *
-*************************************************/
-
-/* It is guaranteed that the initial value of ptr is greater than the start of
-the string that is being processed.
-
-Arguments:
-  ptr          pointer to possible newline
-  type         the newline type
-  startptr     pointer to the start of the string
-  lenptr       where to return the length
-  utf          TRUE if in utf mode
-
-Returns:       TRUE or FALSE
-*/
-
-BOOL
-PRIV(was_newline)(PCRE_PUCHAR ptr, int type, PCRE_PUCHAR startptr, int *lenptr,
-  BOOL utf)
-{
-pcre_uint32 c;
-(void)utf;
-ptr--;
-#ifdef SUPPORT_UTF
-if (utf)
-  {
-  BACKCHAR(ptr);
-  GETCHAR(c, ptr);
-  }
-else
-#endif  /* SUPPORT_UTF */
-  c = *ptr;
-
-/* Note that this function is called only for ANY or ANYCRLF. */
-
-if (type == NLTYPE_ANYCRLF) switch(c)
-  {
-  case CHAR_LF:
-  *lenptr = (ptr > startptr && ptr[-1] == CHAR_CR)? 2 : 1;
-  return TRUE;
-
-  case CHAR_CR: *lenptr = 1; return TRUE;
-  default: return FALSE;
-  }
-
-/* NLTYPE_ANY */
-
-else switch(c)
-  {
-  case CHAR_LF:
-  *lenptr = (ptr > startptr && ptr[-1] == CHAR_CR)? 2 : 1;
-  return TRUE;
-
-#ifdef EBCDIC
-  case CHAR_NEL:
-#endif
-  case CHAR_VT:
-  case CHAR_FF:
-  case CHAR_CR: *lenptr = 1; return TRUE;
-
-#ifndef EBCDIC
-#ifdef COMPILE_PCRE8
-  case CHAR_NEL: *lenptr = utf? 2 : 1; return TRUE;
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 3; return TRUE;             /* PS */
-#else /* COMPILE_PCRE16 || COMPILE_PCRE32 */
-  case CHAR_NEL:
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 1; return TRUE;             /* PS */
-#endif  /* COMPILE_PCRE8 */
-#endif  /* NotEBCDIC */
-
-  default: return FALSE;
-  }
-}
-
-/* End of pcre_newline.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_ord2utf8.c r-base-3.3.1/src/extra/pcre/pcre_ord2utf8.c
--- r-base-3.2.3/src/extra/pcre/pcre_ord2utf8.c	2013-02-04 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_ord2utf8.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This file contains a private PCRE function that converts an ordinal
-character value into a UTF8 string. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define COMPILE_PCRE8
-
-#include "pcre_internal.h"
-
-/*************************************************
-*       Convert character value to UTF-8         *
-*************************************************/
-
-/* This function takes an integer value in the range 0 - 0x10ffff
-and encodes it as a UTF-8 character in 1 to 4 pcre_uchars.
-
-Arguments:
-  cvalue     the character value
-  buffer     pointer to buffer for result - at least 6 pcre_uchars long
-
-Returns:     number of characters placed in the buffer
-*/
-
-unsigned
-int
-PRIV(ord2utf)(pcre_uint32 cvalue, pcre_uchar *buffer)
-{
-#ifdef SUPPORT_UTF
-
-register int i, j;
-
-for (i = 0; i < PRIV(utf8_table1_size); i++)
-  if ((int)cvalue <= PRIV(utf8_table1)[i]) break;
-buffer += i;
-for (j = i; j > 0; j--)
- {
- *buffer-- = 0x80 | (cvalue & 0x3f);
- cvalue >>= 6;
- }
-*buffer = PRIV(utf8_table2)[i] | cvalue;
-return i + 1;
-
-#else
-
-(void)(cvalue);  /* Keep compiler happy; this function won't ever be */
-(void)(buffer);  /* called when SUPPORT_UTF is not defined. */
-return 0;
-
-#endif
-}
-
-/* End of pcre_ord2utf8.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_refcount.c r-base-3.3.1/src/extra/pcre/pcre_refcount.c
--- r-base-3.2.3/src/extra/pcre/pcre_refcount.c	2013-02-04 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_refcount.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_refcount(), which is an
-auxiliary function that can be used to maintain a reference count in a compiled
-pattern data block. This might be helpful in applications where the block is
-shared by different users. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*           Maintain reference count             *
-*************************************************/
-
-/* The reference count is a 16-bit field, initialized to zero. It is not
-possible to transfer a non-zero count from one host to a different host that
-has a different byte order - though I can't see why anyone in their right mind
-would ever want to do that!
-
-Arguments:
-  argument_re   points to compiled code
-  adjust        value to add to the count
-
-Returns:        the (possibly updated) count value (a non-negative number), or
-                a negative error number
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_refcount(pcre *argument_re, int adjust)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_refcount(pcre16 *argument_re, int adjust)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_refcount(pcre32 *argument_re, int adjust)
-#endif
-{
-REAL_PCRE *re = (REAL_PCRE *)argument_re;
-if (re == NULL) return PCRE_ERROR_NULL;
-if (re->magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC;
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-re->ref_count = (-adjust > re->ref_count)? 0 :
-                (adjust + re->ref_count > 65535)? 65535 :
-                re->ref_count + adjust;
-return re->ref_count;
-}
-
-/* End of pcre_refcount.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_study.c r-base-3.3.1/src/extra/pcre/pcre_study.c
--- r-base-3.2.3/src/extra/pcre/pcre_study.c	2015-11-26 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_study.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1686 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_study(), along with local
-supporting functions. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-#define SET_BIT(c) start_bits[c/8] |= (1 << (c&7))
-
-/* Returns from set_start_bits() */
-
-enum { SSB_FAIL, SSB_DONE, SSB_CONTINUE, SSB_UNKNOWN };
-
-
-
-/*************************************************
-*   Find the minimum subject length for a group  *
-*************************************************/
-
-/* Scan a parenthesized group and compute the minimum length of subject that
-is needed to match it. This is a lower bound; it does not mean there is a
-string of that length that matches. In UTF8 mode, the result is in characters
-rather than bytes.
-
-Arguments:
-  re              compiled pattern block
-  code            pointer to start of group (the bracket)
-  startcode       pointer to start of the whole pattern's code
-  options         the compiling options
-  recurses        chain of recurse_check to catch mutual recursion
-  countptr        pointer to call count (to catch over complexity)
-
-Returns:   the minimum length
-           -1 if \C in UTF-8 mode or (*ACCEPT) was encountered
-           -2 internal error (missing capturing bracket)
-           -3 internal error (opcode not listed)
-*/
-
-static int
-find_minlength(const REAL_PCRE *re, const pcre_uchar *code,
-  const pcre_uchar *startcode, int options, recurse_check *recurses,
-  int *countptr)
-{
-int length = -1;
-/* PCRE_UTF16 has the same value as PCRE_UTF8. */
-BOOL utf = (options & PCRE_UTF8) != 0;
-BOOL had_recurse = FALSE;
-recurse_check this_recurse;
-register int branchlength = 0;
-register pcre_uchar *cc = (pcre_uchar *)code + 1 + LINK_SIZE;
-
-if ((*countptr)++ > 1000) return -1;   /* too complex */
-
-if (*code == OP_CBRA || *code == OP_SCBRA ||
-    *code == OP_CBRAPOS || *code == OP_SCBRAPOS) cc += IMM2_SIZE;
-
-/* Scan along the opcodes for this branch. If we get to the end of the
-branch, check the length against that of the other branches. */
-
-for (;;)
-  {
-  int d, min;
-  pcre_uchar *cs, *ce;
-  register pcre_uchar op = *cc;
-
-  switch (op)
-    {
-    case OP_COND:
-    case OP_SCOND:
-
-    /* If there is only one branch in a condition, the implied branch has zero
-    length, so we don't add anything. This covers the DEFINE "condition"
-    automatically. */
-
-    cs = cc + GET(cc, 1);
-    if (*cs != OP_ALT)
-      {
-      cc = cs + 1 + LINK_SIZE;
-      break;
-      }
-
-    /* Otherwise we can fall through and treat it the same as any other
-    subpattern. */
-
-    case OP_CBRA:
-    case OP_SCBRA:
-    case OP_BRA:
-    case OP_SBRA:
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    case OP_BRAPOS:
-    case OP_SBRAPOS:
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    d = find_minlength(re, cc, startcode, options, recurses, countptr);
-    if (d < 0) return d;
-    branchlength += d;
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* ACCEPT makes things far too complicated; we have to give up. */
-
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-    return -1;
-
-    /* Reached end of a branch; if it's a ket it is the end of a nested
-    call. If it's ALT it is an alternation in a nested call. If it is END it's
-    the end of the outer call. All can be handled by the same code. If an
-    ACCEPT was previously encountered, use the length that was in force at that
-    time, and pass back the shortest ACCEPT length. */
-
-    case OP_ALT:
-    case OP_KET:
-    case OP_KETRMAX:
-    case OP_KETRMIN:
-    case OP_KETRPOS:
-    case OP_END:
-    if (length < 0 || (!had_recurse && branchlength < length))
-      length = branchlength;
-    if (op != OP_ALT) return length;
-    cc += 1 + LINK_SIZE;
-    branchlength = 0;
-    had_recurse = FALSE;
-    break;
-
-    /* Skip over assertive subpatterns */
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    /* Fall through */
-
-    /* Skip over things that don't match chars */
-
-    case OP_REVERSE:
-    case OP_CREF:
-    case OP_DNCREF:
-    case OP_RREF:
-    case OP_DNRREF:
-    case OP_DEF:
-    case OP_CALLOUT:
-    case OP_SOD:
-    case OP_SOM:
-    case OP_EOD:
-    case OP_EODN:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_DOLL:
-    case OP_DOLLM:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-    cc += PRIV(OP_lengths)[*cc];
-    break;
-
-    /* Skip over a subpattern that has a {0} or {0,x} quantifier */
-
-    case OP_BRAZERO:
-    case OP_BRAMINZERO:
-    case OP_BRAPOSZERO:
-    case OP_SKIPZERO:
-    cc += PRIV(OP_lengths)[*cc];
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Handle literal characters and + repetitions */
-
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-    branchlength++;
-    cc += 2;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEPOSPLUS:
-    branchlength++;
-    cc += (cc[1] == OP_PROP || cc[1] == OP_NOTPROP)? 4 : 2;
-    break;
-
-    /* Handle exact repetitions. The count is already in characters, but we
-    need to skip over a multibyte character in UTF8 mode.  */
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-    branchlength += GET2(cc,1);
-    cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    case OP_TYPEEXACT:
-    branchlength += GET2(cc,1);
-    cc += 2 + IMM2_SIZE + ((cc[1 + IMM2_SIZE] == OP_PROP
-      || cc[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
-    break;
-
-    /* Handle single-char non-literal matchers */
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    cc += 2;
-    /* Fall through */
-
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-    case OP_EXTUNI:
-    case OP_HSPACE:
-    case OP_NOT_HSPACE:
-    case OP_VSPACE:
-    case OP_NOT_VSPACE:
-    branchlength++;
-    cc++;
-    break;
-
-    /* "Any newline" might match two characters, but it also might match just
-    one. */
-
-    case OP_ANYNL:
-    branchlength += 1;
-    cc++;
-    break;
-
-    /* The single-byte matcher means we can't proceed in UTF-8 mode. (In
-    non-UTF-8 mode \C will actually be turned into OP_ALLANY, so won't ever
-    appear, but leave the code, just in case.) */
-
-    case OP_ANYBYTE:
-#ifdef SUPPORT_UTF
-    if (utf) return -1;
-#endif
-    branchlength++;
-    cc++;
-    break;
-
-    /* For repeated character types, we have to test for \p and \P, which have
-    an extra two bytes of parameters. */
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSQUERY:
-    if (cc[1] == OP_PROP || cc[1] == OP_NOTPROP) cc += 2;
-    cc += PRIV(OP_lengths)[op];
-    break;
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEPOSUPTO:
-    if (cc[1 + IMM2_SIZE] == OP_PROP
-      || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
-    cc += PRIV(OP_lengths)[op];
-    break;
-
-    /* Check a class for variable quantification */
-
-    case OP_CLASS:
-    case OP_NCLASS:
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-    case OP_XCLASS:
-    /* The original code caused an unsigned overflow in 64 bit systems,
-    so now we use a conditional statement. */
-    if (op == OP_XCLASS)
-      cc += GET(cc, 1);
-    else
-      cc += PRIV(OP_lengths)[OP_CLASS];
-#else
-    cc += PRIV(OP_lengths)[OP_CLASS];
-#endif
-
-    switch (*cc)
-      {
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRPOSPLUS:
-      branchlength++;
-      /* Fall through */
-
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSQUERY:
-      cc++;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      branchlength += GET2(cc,1);
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:
-      branchlength++;
-      break;
-      }
-    break;
-
-    /* Backreferences and subroutine calls are treated in the same way: we find
-    the minimum length for the subpattern. A recursion, however, causes an
-    a flag to be set that causes the length of this branch to be ignored. The
-    logic is that a recursion can only make sense if there is another
-    alternation that stops the recursing. That will provide the minimum length
-    (when no recursion happens). A backreference within the group that it is
-    referencing behaves in the same way.
-
-    If PCRE_JAVASCRIPT_COMPAT is set, a backreference to an unset bracket
-    matches an empty string (by default it causes a matching failure), so in
-    that case we must set the minimum length to zero. */
-
-    case OP_DNREF:     /* Duplicate named pattern back reference */
-    case OP_DNREFI:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)
-      {
-      int count = GET2(cc, 1+IMM2_SIZE);
-      pcre_uchar *slot = (pcre_uchar *)re +
-        re->name_table_offset + GET2(cc, 1) * re->name_entry_size;
-      d = INT_MAX;
-      while (count-- > 0)
-        {
-        ce = cs = (pcre_uchar *)PRIV(find_bracket)(startcode, utf, GET2(slot, 0));
-        if (cs == NULL) return -2;
-        do ce += GET(ce, 1); while (*ce == OP_ALT);
-        if (cc > cs && cc < ce)     /* Simple recursion */
-          {
-          d = 0;
-          had_recurse = TRUE;
-          break;
-          }
-        else
-          {
-          recurse_check *r = recurses;
-          for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-          if (r != NULL)           /* Mutual recursion */
-            {
-            d = 0;
-            had_recurse = TRUE;
-            break;
-            }
-          else
-            {
-            int dd;
-            this_recurse.prev = recurses;
-            this_recurse.group = cs;
-            dd = find_minlength(re, cs, startcode, options, &this_recurse,
-              countptr);
-            if (dd < d) d = dd;
-            }
-          }
-        slot += re->name_entry_size;
-        }
-      }
-    else d = 0;
-    cc += 1 + 2*IMM2_SIZE;
-    goto REPEAT_BACK_REFERENCE;
-
-    case OP_REF:      /* Single back reference */
-    case OP_REFI:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)
-      {
-      ce = cs = (pcre_uchar *)PRIV(find_bracket)(startcode, utf, GET2(cc, 1));
-      if (cs == NULL) return -2;
-      do ce += GET(ce, 1); while (*ce == OP_ALT);
-      if (cc > cs && cc < ce)    /* Simple recursion */
-        {
-        d = 0;
-        had_recurse = TRUE;
-        }
-      else
-        {
-        recurse_check *r = recurses;
-        for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-        if (r != NULL)           /* Mutual recursion */
-          {
-          d = 0;
-          had_recurse = TRUE;
-          }
-        else
-          {
-          this_recurse.prev = recurses;
-          this_recurse.group = cs;
-          d = find_minlength(re, cs, startcode, options, &this_recurse,
-            countptr);
-          }
-        }
-      }
-    else d = 0;
-    cc += 1 + IMM2_SIZE;
-
-    /* Handle repeated back references */
-
-    REPEAT_BACK_REFERENCE:
-    switch (*cc)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSQUERY:
-      min = 0;
-      cc++;
-      break;
-
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRPOSPLUS:
-      min = 1;
-      cc++;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      min = GET2(cc, 1);
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:
-      min = 1;
-      break;
-      }
-
-    branchlength += min * d;
-    break;
-
-    /* We can easily detect direct recursion, but not mutual recursion. This is
-    caught by a recursion depth count. */
-
-    case OP_RECURSE:
-    cs = ce = (pcre_uchar *)startcode + GET(cc, 1);
-    do ce += GET(ce, 1); while (*ce == OP_ALT);
-    if (cc > cs && cc < ce)    /* Simple recursion */
-      had_recurse = TRUE;
-    else
-      {
-      recurse_check *r = recurses;
-      for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-      if (r != NULL)           /* Mutual recursion */
-        had_recurse = TRUE;
-      else
-        {
-        this_recurse.prev = recurses;
-        this_recurse.group = cs;
-        branchlength += find_minlength(re, cs, startcode, options,
-          &this_recurse, countptr);
-        }
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Anything else does not or need not match a character. We can get the
-    item's length from the table, but for those that can match zero occurrences
-    of a character, we must take special action for UTF-8 characters. As it
-    happens, the "NOT" versions of these opcodes are used at present only for
-    ASCII characters, so they could be omitted from this list. However, in
-    future that may change, so we include them here so as not to leave a
-    gotcha for a future maintainer. */
-
-    case OP_UPTO:
-    case OP_UPTOI:
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-
-    case OP_STAR:
-    case OP_STARI:
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-
-    cc += PRIV(OP_lengths)[op];
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    /* Skip these, but we need to add in the name length. */
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    cc += PRIV(OP_lengths)[op] + cc[1];
-    break;
-
-    /* The remaining opcodes are just skipped over. */
-
-    case OP_CLOSE:
-    case OP_COMMIT:
-    case OP_FAIL:
-    case OP_PRUNE:
-    case OP_SET_SOM:
-    case OP_SKIP:
-    case OP_THEN:
-    cc += PRIV(OP_lengths)[op];
-    break;
-
-    /* This should not occur: we list all opcodes explicitly so that when
-    new ones get added they are properly considered. */
-
-    default:
-    return -3;
-    }
-  }
-/* Control never gets here */
-}
-
-
-
-/*************************************************
-*      Set a bit and maybe its alternate case    *
-*************************************************/
-
-/* Given a character, set its first byte's bit in the table, and also the
-corresponding bit for the other version of a letter if we are caseless. In
-UTF-8 mode, for characters greater than 127, we can only do the caseless thing
-when Unicode property support is available.
-
-Arguments:
-  start_bits    points to the bit map
-  p             points to the character
-  caseless      the caseless flag
-  cd            the block with char table pointers
-  utf           TRUE for UTF-8 / UTF-16 / UTF-32 mode
-
-Returns:        pointer after the character
-*/
-
-static const pcre_uchar *
-set_table_bit(pcre_uint8 *start_bits, const pcre_uchar *p, BOOL caseless,
-  compile_data *cd, BOOL utf)
-{
-pcre_uint32 c = *p;
-
-#ifdef COMPILE_PCRE8
-SET_BIT(c);
-
-#ifdef SUPPORT_UTF
-if (utf && c > 127)
-  {
-  GETCHARINC(c, p);
-#ifdef SUPPORT_UCP
-  if (caseless)
-    {
-    pcre_uchar buff[6];
-    c = UCD_OTHERCASE(c);
-    (void)PRIV(ord2utf)(c, buff);
-    SET_BIT(buff[0]);
-    }
-#endif  /* Not SUPPORT_UCP */
-  return p;
-  }
-#else   /* Not SUPPORT_UTF */
-(void)(utf);   /* Stops warning for unused parameter */
-#endif  /* SUPPORT_UTF */
-
-/* Not UTF-8 mode, or character is less than 127. */
-
-if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);
-return p + 1;
-#endif  /* COMPILE_PCRE8 */
-
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-if (c > 0xff)
-  {
-  c = 0xff;
-  caseless = FALSE;
-  }
-SET_BIT(c);
-
-#ifdef SUPPORT_UTF
-if (utf && c > 127)
-  {
-  GETCHARINC(c, p);
-#ifdef SUPPORT_UCP
-  if (caseless)
-    {
-    c = UCD_OTHERCASE(c);
-    if (c > 0xff)
-      c = 0xff;
-    SET_BIT(c);
-    }
-#endif  /* SUPPORT_UCP */
-  return p;
-  }
-#else   /* Not SUPPORT_UTF */
-(void)(utf);   /* Stops warning for unused parameter */
-#endif  /* SUPPORT_UTF */
-
-if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);
-return p + 1;
-#endif
-}
-
-
-
-/*************************************************
-*     Set bits for a positive character type     *
-*************************************************/
-
-/* This function sets starting bits for a character type. In UTF-8 mode, we can
-only do a direct setting for bytes less than 128, as otherwise there can be
-confusion with bytes in the middle of UTF-8 characters. In a "traditional"
-environment, the tables will only recognize ASCII characters anyway, but in at
-least one Windows environment, some higher bytes bits were set in the tables.
-So we deal with that case by considering the UTF-8 encoding.
-
-Arguments:
-  start_bits     the starting bitmap
-  cbit type      the type of character wanted
-  table_limit    32 for non-UTF-8; 16 for UTF-8
-  cd             the block with char table pointers
-
-Returns:         nothing
-*/
-
-static void
-set_type_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit,
-  compile_data *cd)
-{
-register pcre_uint32 c;
-for (c = 0; c < table_limit; c++) start_bits[c] |= cd->cbits[c+cbit_type];
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (table_limit == 32) return;
-for (c = 128; c < 256; c++)
-  {
-  if ((cd->cbits[c/8] & (1 << (c&7))) != 0)
-    {
-    pcre_uchar buff[6];
-    (void)PRIV(ord2utf)(c, buff);
-    SET_BIT(buff[0]);
-    }
-  }
-#endif
-}
-
-
-/*************************************************
-*     Set bits for a negative character type     *
-*************************************************/
-
-/* This function sets starting bits for a negative character type such as \D.
-In UTF-8 mode, we can only do a direct setting for bytes less than 128, as
-otherwise there can be confusion with bytes in the middle of UTF-8 characters.
-Unlike in the positive case, where we can set appropriate starting bits for
-specific high-valued UTF-8 characters, in this case we have to set the bits for
-all high-valued characters. The lowest is 0xc2, but we overkill by starting at
-0xc0 (192) for simplicity.
-
-Arguments:
-  start_bits     the starting bitmap
-  cbit type      the type of character wanted
-  table_limit    32 for non-UTF-8; 16 for UTF-8
-  cd             the block with char table pointers
-
-Returns:         nothing
-*/
-
-static void
-set_nottype_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit,
-  compile_data *cd)
-{
-register pcre_uint32 c;
-for (c = 0; c < table_limit; c++) start_bits[c] |= ~cd->cbits[c+cbit_type];
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (table_limit != 32) for (c = 24; c < 32; c++) start_bits[c] = 0xff;
-#endif
-}
-
-
-
-/*************************************************
-*          Create bitmap of starting bytes       *
-*************************************************/
-
-/* This function scans a compiled unanchored expression recursively and
-attempts to build a bitmap of the set of possible starting bytes. As time goes
-by, we may be able to get more clever at doing this. The SSB_CONTINUE return is
-useful for parenthesized groups in patterns such as (a*)b where the group
-provides some optional starting bytes but scanning must continue at the outer
-level to find at least one mandatory byte. At the outermost level, this
-function fails unless the result is SSB_DONE.
-
-Arguments:
-  code         points to an expression
-  start_bits   points to a 32-byte table, initialized to 0
-  utf          TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  cd           the block with char table pointers
-
-Returns:       SSB_FAIL     => Failed to find any starting bytes
-               SSB_DONE     => Found mandatory starting bytes
-               SSB_CONTINUE => Found optional starting bytes
-               SSB_UNKNOWN  => Hit an unrecognized opcode
-*/
-
-static int
-set_start_bits(const pcre_uchar *code, pcre_uint8 *start_bits, BOOL utf,
-  compile_data *cd)
-{
-register pcre_uint32 c;
-int yield = SSB_DONE;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-int table_limit = utf? 16:32;
-#else
-int table_limit = 32;
-#endif
-
-#if 0
-/* ========================================================================= */
-/* The following comment and code was inserted in January 1999. In May 2006,
-when it was observed to cause compiler warnings about unused values, I took it
-out again. If anybody is still using OS/2, they will have to put it back
-manually. */
-
-/* This next statement and the later reference to dummy are here in order to
-trick the optimizer of the IBM C compiler for OS/2 into generating correct
-code. Apparently IBM isn't going to fix the problem, and we would rather not
-disable optimization (in this module it actually makes a big difference, and
-the pcre module can use all the optimization it can get). */
-
-volatile int dummy;
-/* ========================================================================= */
-#endif
-
-do
-  {
-  BOOL try_next = TRUE;
-  const pcre_uchar *tcode = code + 1 + LINK_SIZE;
-
-  if (*code == OP_CBRA || *code == OP_SCBRA ||
-      *code == OP_CBRAPOS || *code == OP_SCBRAPOS) tcode += IMM2_SIZE;
-
-  while (try_next)    /* Loop for items in this branch */
-    {
-    int rc;
-
-    switch(*tcode)
-      {
-      /* If we reach something we don't understand, it means a new opcode has
-      been created that hasn't been added to this code. Hopefully this problem
-      will be discovered during testing. */
-
-      default:
-      return SSB_UNKNOWN;
-
-      /* Fail for a valid opcode that implies no starting bits. */
-
-      case OP_ACCEPT:
-      case OP_ASSERT_ACCEPT:
-      case OP_ALLANY:
-      case OP_ANY:
-      case OP_ANYBYTE:
-      case OP_CIRC:
-      case OP_CIRCM:
-      case OP_CLOSE:
-      case OP_COMMIT:
-      case OP_COND:
-      case OP_CREF:
-      case OP_DEF:
-      case OP_DNCREF:
-      case OP_DNREF:
-      case OP_DNREFI:
-      case OP_DNRREF:
-      case OP_DOLL:
-      case OP_DOLLM:
-      case OP_END:
-      case OP_EOD:
-      case OP_EODN:
-      case OP_EXTUNI:
-      case OP_FAIL:
-      case OP_MARK:
-      case OP_NOT:
-      case OP_NOTEXACT:
-      case OP_NOTEXACTI:
-      case OP_NOTI:
-      case OP_NOTMINPLUS:
-      case OP_NOTMINPLUSI:
-      case OP_NOTMINQUERY:
-      case OP_NOTMINQUERYI:
-      case OP_NOTMINSTAR:
-      case OP_NOTMINSTARI:
-      case OP_NOTMINUPTO:
-      case OP_NOTMINUPTOI:
-      case OP_NOTPLUS:
-      case OP_NOTPLUSI:
-      case OP_NOTPOSPLUS:
-      case OP_NOTPOSPLUSI:
-      case OP_NOTPOSQUERY:
-      case OP_NOTPOSQUERYI:
-      case OP_NOTPOSSTAR:
-      case OP_NOTPOSSTARI:
-      case OP_NOTPOSUPTO:
-      case OP_NOTPOSUPTOI:
-      case OP_NOTPROP:
-      case OP_NOTQUERY:
-      case OP_NOTQUERYI:
-      case OP_NOTSTAR:
-      case OP_NOTSTARI:
-      case OP_NOTUPTO:
-      case OP_NOTUPTOI:
-      case OP_NOT_HSPACE:
-      case OP_NOT_VSPACE:
-      case OP_PRUNE:
-      case OP_PRUNE_ARG:
-      case OP_RECURSE:
-      case OP_REF:
-      case OP_REFI:
-      case OP_REVERSE:
-      case OP_RREF:
-      case OP_SCOND:
-      case OP_SET_SOM:
-      case OP_SKIP:
-      case OP_SKIP_ARG:
-      case OP_SOD:
-      case OP_SOM:
-      case OP_THEN:
-      case OP_THEN_ARG:
-      return SSB_FAIL;
-
-      /* A "real" property test implies no starting bits, but the fake property
-      PT_CLIST identifies a list of characters. These lists are short, as they
-      are used for characters with more than one "other case", so there is no
-      point in recognizing them for OP_NOTPROP. */
-
-      case OP_PROP:
-      if (tcode[1] != PT_CLIST) return SSB_FAIL;
-        {
-        const pcre_uint32 *p = PRIV(ucd_caseless_sets) + tcode[2];
-        while ((c = *p++) < NOTACHAR)
-          {
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-          if (utf)
-            {
-            pcre_uchar buff[6];
-            (void)PRIV(ord2utf)(c, buff);
-            c = buff[0];
-            }
-#endif
-          if (c > 0xff) SET_BIT(0xff); else SET_BIT(c);
-          }
-        }
-      try_next = FALSE;
-      break;
-
-      /* We can ignore word boundary tests. */
-
-      case OP_WORD_BOUNDARY:
-      case OP_NOT_WORD_BOUNDARY:
-      tcode++;
-      break;
-
-      /* If we hit a bracket or a positive lookahead assertion, recurse to set
-      bits from within the subpattern. If it can't find anything, we have to
-      give up. If it finds some mandatory character(s), we are done for this
-      branch. Otherwise, carry on scanning after the subpattern. */
-
-      case OP_BRA:
-      case OP_SBRA:
-      case OP_CBRA:
-      case OP_SCBRA:
-      case OP_BRAPOS:
-      case OP_SBRAPOS:
-      case OP_CBRAPOS:
-      case OP_SCBRAPOS:
-      case OP_ONCE:
-      case OP_ONCE_NC:
-      case OP_ASSERT:
-      rc = set_start_bits(tcode, start_bits, utf, cd);
-      if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;
-      if (rc == SSB_DONE) try_next = FALSE; else
-        {
-        do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
-        tcode += 1 + LINK_SIZE;
-        }
-      break;
-
-      /* If we hit ALT or KET, it means we haven't found anything mandatory in
-      this branch, though we might have found something optional. For ALT, we
-      continue with the next alternative, but we have to arrange that the final
-      result from subpattern is SSB_CONTINUE rather than SSB_DONE. For KET,
-      return SSB_CONTINUE: if this is the top level, that indicates failure,
-      but after a nested subpattern, it causes scanning to continue. */
-
-      case OP_ALT:
-      yield = SSB_CONTINUE;
-      try_next = FALSE;
-      break;
-
-      case OP_KET:
-      case OP_KETRMAX:
-      case OP_KETRMIN:
-      case OP_KETRPOS:
-      return SSB_CONTINUE;
-
-      /* Skip over callout */
-
-      case OP_CALLOUT:
-      tcode += 2 + 2*LINK_SIZE;
-      break;
-
-      /* Skip over lookbehind and negative lookahead assertions */
-
-      case OP_ASSERT_NOT:
-      case OP_ASSERTBACK:
-      case OP_ASSERTBACK_NOT:
-      do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
-      tcode += 1 + LINK_SIZE;
-      break;
-
-      /* BRAZERO does the bracket, but carries on. */
-
-      case OP_BRAZERO:
-      case OP_BRAMINZERO:
-      case OP_BRAPOSZERO:
-      rc = set_start_bits(++tcode, start_bits, utf, cd);
-      if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;
-/* =========================================================================
-      See the comment at the head of this function concerning the next line,
-      which was an old fudge for the benefit of OS/2.
-      dummy = 1;
-  ========================================================================= */
-      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
-      tcode += 1 + LINK_SIZE;
-      break;
-
-      /* SKIPZERO skips the bracket. */
-
-      case OP_SKIPZERO:
-      tcode++;
-      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
-      tcode += 1 + LINK_SIZE;
-      break;
-
-      /* Single-char * or ? sets the bit and tries the next item */
-
-      case OP_STAR:
-      case OP_MINSTAR:
-      case OP_POSSTAR:
-      case OP_QUERY:
-      case OP_MINQUERY:
-      case OP_POSQUERY:
-      tcode = set_table_bit(start_bits, tcode + 1, FALSE, cd, utf);
-      break;
-
-      case OP_STARI:
-      case OP_MINSTARI:
-      case OP_POSSTARI:
-      case OP_QUERYI:
-      case OP_MINQUERYI:
-      case OP_POSQUERYI:
-      tcode = set_table_bit(start_bits, tcode + 1, TRUE, cd, utf);
-      break;
-
-      /* Single-char upto sets the bit and tries the next */
-
-      case OP_UPTO:
-      case OP_MINUPTO:
-      case OP_POSUPTO:
-      tcode = set_table_bit(start_bits, tcode + 1 + IMM2_SIZE, FALSE, cd, utf);
-      break;
-
-      case OP_UPTOI:
-      case OP_MINUPTOI:
-      case OP_POSUPTOI:
-      tcode = set_table_bit(start_bits, tcode + 1 + IMM2_SIZE, TRUE, cd, utf);
-      break;
-
-      /* At least one single char sets the bit and stops */
-
-      case OP_EXACT:
-      tcode += IMM2_SIZE;
-      /* Fall through */
-      case OP_CHAR:
-      case OP_PLUS:
-      case OP_MINPLUS:
-      case OP_POSPLUS:
-      (void)set_table_bit(start_bits, tcode + 1, FALSE, cd, utf);
-      try_next = FALSE;
-      break;
-
-      case OP_EXACTI:
-      tcode += IMM2_SIZE;
-      /* Fall through */
-      case OP_CHARI:
-      case OP_PLUSI:
-      case OP_MINPLUSI:
-      case OP_POSPLUSI:
-      (void)set_table_bit(start_bits, tcode + 1, TRUE, cd, utf);
-      try_next = FALSE;
-      break;
-
-      /* Special spacing and line-terminating items. These recognize specific
-      lists of characters. The difference between VSPACE and ANYNL is that the
-      latter can match the two-character CRLF sequence, but that is not
-      relevant for finding the first character, so their code here is
-      identical. */
-
-      case OP_HSPACE:
-      SET_BIT(CHAR_HT);
-      SET_BIT(CHAR_SPACE);
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-#ifdef COMPILE_PCRE8
-        SET_BIT(0xC2);  /* For U+00A0 */
-        SET_BIT(0xE1);  /* For U+1680, U+180E */
-        SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
-        SET_BIT(0xE3);  /* For U+3000 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(0xA0);
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[8|16|32] */
-        }
-      else
-#endif /* SUPPORT_UTF */
-        {
-#ifndef EBCDIC
-        SET_BIT(0xA0);
-#endif  /* Not EBCDIC */
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[16|32] */
-        }
-      try_next = FALSE;
-      break;
-
-      case OP_ANYNL:
-      case OP_VSPACE:
-      SET_BIT(CHAR_LF);
-      SET_BIT(CHAR_VT);
-      SET_BIT(CHAR_FF);
-      SET_BIT(CHAR_CR);
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-#ifdef COMPILE_PCRE8
-        SET_BIT(0xC2);  /* For U+0085 */
-        SET_BIT(0xE2);  /* For U+2028, U+2029 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(CHAR_NEL);
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[8|16|32] */
-        }
-      else
-#endif /* SUPPORT_UTF */
-        {
-        SET_BIT(CHAR_NEL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif
-        }
-      try_next = FALSE;
-      break;
-
-      /* Single character types set the bits and stop. Note that if PCRE_UCP
-      is set, we do not see these op codes because \d etc are converted to
-      properties. Therefore, these apply in the case when only characters less
-      than 256 are recognized to match the types. */
-
-      case OP_NOT_DIGIT:
-      set_nottype_bits(start_bits, cbit_digit, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_DIGIT:
-      set_type_bits(start_bits, cbit_digit, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      /* The cbit_space table has vertical tab as whitespace; we no longer
-      have to play fancy tricks because Perl added VT to its whitespace at
-      release 5.18. PCRE added it at release 8.34. */
-
-      case OP_NOT_WHITESPACE:
-      set_nottype_bits(start_bits, cbit_space, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_WHITESPACE:
-      set_type_bits(start_bits, cbit_space, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_NOT_WORDCHAR:
-      set_nottype_bits(start_bits, cbit_word, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_WORDCHAR:
-      set_type_bits(start_bits, cbit_word, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      /* One or more character type fudges the pointer and restarts, knowing
-      it will hit a single character type and stop there. */
-
-      case OP_TYPEPLUS:
-      case OP_TYPEMINPLUS:
-      case OP_TYPEPOSPLUS:
-      tcode++;
-      break;
-
-      case OP_TYPEEXACT:
-      tcode += 1 + IMM2_SIZE;
-      break;
-
-      /* Zero or more repeats of character types set the bits and then
-      try again. */
-
-      case OP_TYPEUPTO:
-      case OP_TYPEMINUPTO:
-      case OP_TYPEPOSUPTO:
-      tcode += IMM2_SIZE;  /* Fall through */
-
-      case OP_TYPESTAR:
-      case OP_TYPEMINSTAR:
-      case OP_TYPEPOSSTAR:
-      case OP_TYPEQUERY:
-      case OP_TYPEMINQUERY:
-      case OP_TYPEPOSQUERY:
-      switch(tcode[1])
-        {
-        default:
-        case OP_ANY:
-        case OP_ALLANY:
-        return SSB_FAIL;
-
-        case OP_HSPACE:
-        SET_BIT(CHAR_HT);
-        SET_BIT(CHAR_SPACE);
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-#ifdef COMPILE_PCRE8
-          SET_BIT(0xC2);  /* For U+00A0 */
-          SET_BIT(0xE1);  /* For U+1680, U+180E */
-          SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
-          SET_BIT(0xE3);  /* For U+3000 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-          SET_BIT(0xA0);
-          SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[8|16|32] */
-          }
-        else
-#endif /* SUPPORT_UTF */
-#ifndef EBCDIC
-          SET_BIT(0xA0);
-#endif  /* Not EBCDIC */
-        break;
-
-        case OP_ANYNL:
-        case OP_VSPACE:
-        SET_BIT(CHAR_LF);
-        SET_BIT(CHAR_VT);
-        SET_BIT(CHAR_FF);
-        SET_BIT(CHAR_CR);
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-#ifdef COMPILE_PCRE8
-          SET_BIT(0xC2);  /* For U+0085 */
-          SET_BIT(0xE2);  /* For U+2028, U+2029 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-          SET_BIT(CHAR_NEL);
-          SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE16 */
-          }
-        else
-#endif /* SUPPORT_UTF */
-          SET_BIT(CHAR_NEL);
-        break;
-
-        case OP_NOT_DIGIT:
-        set_nottype_bits(start_bits, cbit_digit, table_limit, cd);
-        break;
-
-        case OP_DIGIT:
-        set_type_bits(start_bits, cbit_digit, table_limit, cd);
-        break;
-
-        /* The cbit_space table has vertical tab as whitespace; we no longer
-        have to play fancy tricks because Perl added VT to its whitespace at
-        release 5.18. PCRE added it at release 8.34. */
-
-        case OP_NOT_WHITESPACE:
-        set_nottype_bits(start_bits, cbit_space, table_limit, cd);
-        break;
-
-        case OP_WHITESPACE:
-        set_type_bits(start_bits, cbit_space, table_limit, cd);
-        break;
-
-        case OP_NOT_WORDCHAR:
-        set_nottype_bits(start_bits, cbit_word, table_limit, cd);
-        break;
-
-        case OP_WORDCHAR:
-        set_type_bits(start_bits, cbit_word, table_limit, cd);
-        break;
-        }
-
-      tcode += 2;
-      break;
-
-      /* Character class where all the information is in a bit map: set the
-      bits and either carry on or not, according to the repeat count. If it was
-      a negative class, and we are operating with UTF-8 characters, any byte
-      with a value >= 0xc4 is a potentially valid starter because it starts a
-      character with a value > 255. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      if ((tcode[1 + LINK_SIZE] & XCL_HASPROP) != 0)
-        return SSB_FAIL;
-      /* All bits are set. */
-      if ((tcode[1 + LINK_SIZE] & XCL_MAP) == 0 && (tcode[1 + LINK_SIZE] & XCL_NOT) != 0)
-        return SSB_FAIL;
-#endif
-      /* Fall through */
-
-      case OP_NCLASS:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-      if (utf)
-        {
-        start_bits[24] |= 0xf0;              /* Bits for 0xc4 - 0xc8 */
-        memset(start_bits+25, 0xff, 7);      /* Bits for 0xc9 - 0xff */
-        }
-#endif
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-      SET_BIT(0xFF);                         /* For characters > 255 */
-#endif
-      /* Fall through */
-
-      case OP_CLASS:
-        {
-        pcre_uint8 *map;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-        map = NULL;
-        if (*tcode == OP_XCLASS)
-          {
-          if ((tcode[1 + LINK_SIZE] & XCL_MAP) != 0)
-            map = (pcre_uint8 *)(tcode + 1 + LINK_SIZE + 1);
-          tcode += GET(tcode, 1);
-          }
-        else
-#endif
-          {
-          tcode++;
-          map = (pcre_uint8 *)tcode;
-          tcode += 32 / sizeof(pcre_uchar);
-          }
-
-        /* In UTF-8 mode, the bits in a bit map correspond to character
-        values, not to byte values. However, the bit map we are constructing is
-        for byte values. So we have to do a conversion for characters whose
-        value is > 127. In fact, there are only two possible starting bytes for
-        characters in the range 128 - 255. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-        if (map != NULL)
-#endif
-          {
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-          if (utf)
-            {
-            for (c = 0; c < 16; c++) start_bits[c] |= map[c];
-            for (c = 128; c < 256; c++)
-              {
-              if ((map[c/8] && (1 << (c&7))) != 0)
-                {
-                int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
-                start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */
-                c = (c & 0xc0) + 0x40 - 1;          /* next relevant character. */
-                }
-              }
-            }
-          else
-#endif
-            {
-            /* In non-UTF-8 mode, the two bit maps are completely compatible. */
-            for (c = 0; c < 32; c++) start_bits[c] |= map[c];
-            }
-          }
-
-        /* Advance past the bit map, and act on what follows. For a zero
-        minimum repeat, continue; otherwise stop processing. */
-
-        switch (*tcode)
-          {
-          case OP_CRSTAR:
-          case OP_CRMINSTAR:
-          case OP_CRQUERY:
-          case OP_CRMINQUERY:
-          case OP_CRPOSSTAR:
-          case OP_CRPOSQUERY:
-          tcode++;
-          break;
-
-          case OP_CRRANGE:
-          case OP_CRMINRANGE:
-          case OP_CRPOSRANGE:
-          if (GET2(tcode, 1) == 0) tcode += 1 + 2 * IMM2_SIZE;
-            else try_next = FALSE;
-          break;
-
-          default:
-          try_next = FALSE;
-          break;
-          }
-        }
-      break; /* End of bitmap class handling */
-
-      }      /* End of switch */
-    }        /* End of try_next loop */
-
-  code += GET(code, 1);   /* Advance to next branch */
-  }
-while (*code == OP_ALT);
-return yield;
-}
-
-
-
-
-
-/*************************************************
-*          Study a compiled expression           *
-*************************************************/
-
-/* This function is handed a compiled expression that it must study to produce
-information that will speed up the matching. It returns a pcre[16]_extra block
-which then gets handed back to pcre_exec().
-
-Arguments:
-  re        points to the compiled expression
-  options   contains option bits
-  errorptr  points to where to place error messages;
-            set NULL unless error
-
-Returns:    pointer to a pcre[16]_extra block, with study_data filled in and
-              the appropriate flags set;
-            NULL on error or if no optimization possible
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN pcre_extra * PCRE_CALL_CONVENTION
-pcre_study(const pcre *external_re, int options, const char **errorptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN pcre16_extra * PCRE_CALL_CONVENTION
-pcre16_study(const pcre16 *external_re, int options, const char **errorptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN pcre32_extra * PCRE_CALL_CONVENTION
-pcre32_study(const pcre32 *external_re, int options, const char **errorptr)
-#endif
-{
-int min;
-int count = 0;
-BOOL bits_set = FALSE;
-pcre_uint8 start_bits[32];
-PUBL(extra) *extra = NULL;
-pcre_study_data *study;
-const pcre_uint8 *tables;
-pcre_uchar *code;
-compile_data compile_block;
-const REAL_PCRE *re = (const REAL_PCRE *)external_re;
-
-
-*errorptr = NULL;
-
-if (re == NULL || re->magic_number != MAGIC_NUMBER)
-  {
-  *errorptr = "argument is not a compiled regular expression";
-  return NULL;
-  }
-
-if ((re->flags & PCRE_MODE) == 0)
-  {
-#if defined COMPILE_PCRE8
-  *errorptr = "argument not compiled in 8 bit mode";
-#elif defined COMPILE_PCRE16
-  *errorptr = "argument not compiled in 16 bit mode";
-#elif defined COMPILE_PCRE32
-  *errorptr = "argument not compiled in 32 bit mode";
-#endif
-  return NULL;
-  }
-
-if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)
-  {
-  *errorptr = "unknown or incorrect option bit(s) set";
-  return NULL;
-  }
-
-code = (pcre_uchar *)re + re->name_table_offset +
-  (re->name_count * re->name_entry_size);
-
-/* For an anchored pattern, or an unanchored pattern that has a first char, or
-a multiline pattern that matches only at "line starts", there is no point in
-seeking a list of starting bytes. */
-
-if ((re->options & PCRE_ANCHORED) == 0 &&
-    (re->flags & (PCRE_FIRSTSET|PCRE_STARTLINE)) == 0)
-  {
-  int rc;
-
-  /* Set the character tables in the block that is passed around */
-
-  tables = re->tables;
-
-#if defined COMPILE_PCRE8
-  if (tables == NULL)
-    (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
-    (void *)(&tables));
-#elif defined COMPILE_PCRE16
-  if (tables == NULL)
-    (void)pcre16_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
-    (void *)(&tables));
-#elif defined COMPILE_PCRE32
-  if (tables == NULL)
-    (void)pcre32_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
-    (void *)(&tables));
-#endif
-
-  compile_block.lcc = tables + lcc_offset;
-  compile_block.fcc = tables + fcc_offset;
-  compile_block.cbits = tables + cbits_offset;
-  compile_block.ctypes = tables + ctypes_offset;
-
-  /* See if we can find a fixed set of initial characters for the pattern. */
-
-  memset(start_bits, 0, 32 * sizeof(pcre_uint8));
-  rc = set_start_bits(code, start_bits, (re->options & PCRE_UTF8) != 0,
-    &compile_block);
-  bits_set = rc == SSB_DONE;
-  if (rc == SSB_UNKNOWN)
-    {
-    *errorptr = "internal error: opcode not recognized";
-    return NULL;
-    }
-  }
-
-/* Find the minimum length of subject string. */
-
-switch(min = find_minlength(re, code, code, re->options, NULL, &count))
-  {
-  case -2: *errorptr = "internal error: missing capturing bracket"; return NULL;
-  case -3: *errorptr = "internal error: opcode not recognized"; return NULL;
-  default: break;
-  }
-
-/* If a set of starting bytes has been identified, or if the minimum length is
-greater than zero, or if JIT optimization has been requested, or if
-PCRE_STUDY_EXTRA_NEEDED is set, get a pcre[16]_extra block and a
-pcre_study_data block. The study data is put in the latter, which is pointed to
-by the former, which may also get additional data set later by the calling
-program. At the moment, the size of pcre_study_data is fixed. We nevertheless
-save it in a field for returning via the pcre_fullinfo() function so that if it
-becomes variable in the future, we don't have to change that code. */
-
-if (bits_set || min > 0 || (options & (
-#ifdef SUPPORT_JIT
-    PCRE_STUDY_JIT_COMPILE | PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE |
-    PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE |
-#endif
-    PCRE_STUDY_EXTRA_NEEDED)) != 0)
-  {
-  extra = (PUBL(extra) *)(PUBL(malloc))
-    (sizeof(PUBL(extra)) + sizeof(pcre_study_data));
-  if (extra == NULL)
-    {
-    *errorptr = "failed to get memory";
-    return NULL;
-    }
-
-  study = (pcre_study_data *)((char *)extra + sizeof(PUBL(extra)));
-  extra->flags = PCRE_EXTRA_STUDY_DATA;
-  extra->study_data = study;
-
-  study->size = sizeof(pcre_study_data);
-  study->flags = 0;
-
-  /* Set the start bits always, to avoid unset memory errors if the
-  study data is written to a file, but set the flag only if any of the bits
-  are set, to save time looking when none are. */
-
-  if (bits_set)
-    {
-    study->flags |= PCRE_STUDY_MAPPED;
-    memcpy(study->start_bits, start_bits, sizeof(start_bits));
-    }
-  else memset(study->start_bits, 0, 32 * sizeof(pcre_uint8));
-
-#ifdef PCRE_DEBUG
-  if (bits_set)
-    {
-    pcre_uint8 *ptr = start_bits;
-    int i;
-
-    printf("Start bits:\n");
-    for (i = 0; i < 32; i++)
-      printf("%3d: %02x%s", i * 8, *ptr++, ((i + 1) & 0x7) != 0? " " : "\n");
-    }
-#endif
-
-  /* Always set the minlength value in the block, because the JIT compiler
-  makes use of it. However, don't set the bit unless the length is greater than
-  zero - the interpretive pcre_exec() and pcre_dfa_exec() needn't waste time
-  checking the zero case. */
-
-  if (min > 0)
-    {
-    study->flags |= PCRE_STUDY_MINLEN;
-    study->minlength = min;
-    }
-  else study->minlength = 0;
-
-  /* If JIT support was compiled and requested, attempt the JIT compilation.
-  If no starting bytes were found, and the minimum length is zero, and JIT
-  compilation fails, abandon the extra block and return NULL, unless
-  PCRE_STUDY_EXTRA_NEEDED is set. */
-
-#ifdef SUPPORT_JIT
-  extra->executable_jit = NULL;
-  if ((options & PCRE_STUDY_JIT_COMPILE) != 0)
-    PRIV(jit_compile)(re, extra, JIT_COMPILE);
-  if ((options & PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE) != 0)
-    PRIV(jit_compile)(re, extra, JIT_PARTIAL_SOFT_COMPILE);
-  if ((options & PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE) != 0)
-    PRIV(jit_compile)(re, extra, JIT_PARTIAL_HARD_COMPILE);
-
-  if (study->flags == 0 && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) == 0 &&
-      (options & PCRE_STUDY_EXTRA_NEEDED) == 0)
-    {
-#if defined COMPILE_PCRE8
-    pcre_free_study(extra);
-#elif defined COMPILE_PCRE16
-    pcre16_free_study(extra);
-#elif defined COMPILE_PCRE32
-    pcre32_free_study(extra);
-#endif
-    extra = NULL;
-    }
-#endif
-  }
-
-return extra;
-}
-
-
-/*************************************************
-*          Free the study data                   *
-*************************************************/
-
-/* This function frees the memory that was obtained by pcre_study().
-
-Argument:   a pointer to the pcre[16]_extra block
-Returns:    nothing
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void
-pcre_free_study(pcre_extra *extra)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void
-pcre16_free_study(pcre16_extra *extra)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void
-pcre32_free_study(pcre32_extra *extra)
-#endif
-{
-if (extra == NULL)
-  return;
-#ifdef SUPPORT_JIT
-if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-     extra->executable_jit != NULL)
-  PRIV(jit_free)(extra->executable_jit);
-#endif
-PUBL(free)(extra);
-}
-
-/* End of pcre_study.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_tables.c r-base-3.3.1/src/extra/pcre/pcre_tables.c
--- r-base-3.2.3/src/extra/pcre/pcre_tables.c	2014-11-12 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_tables.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,727 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#ifndef PCRE_INCLUDED
-
-/* This module contains some fixed tables that are used by more than one of the
-PCRE code modules. The tables are also #included by the pcretest program, which
-uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
-clashes with the library. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-#endif /* PCRE_INCLUDED */
-
-/* Table of sizes for the fixed-length opcodes. It's defined in a macro so that
-the definition is next to the definition of the opcodes in pcre_internal.h. */
-
-const pcre_uint8 PRIV(OP_lengths)[] = { OP_LENGTHS };
-
-/* Tables of horizontal and vertical whitespace characters, suitable for
-adding to classes. */
-
-const pcre_uint32 PRIV(hspace_list)[] = { HSPACE_LIST };
-const pcre_uint32 PRIV(vspace_list)[] = { VSPACE_LIST };
-
-
-
-/*************************************************
-*           Tables for UTF-8 support             *
-*************************************************/
-
-/* These are the breakpoints for different numbers of bytes in a UTF-8
-character. */
-
-#if (defined SUPPORT_UTF && defined COMPILE_PCRE8) \
-  || (defined PCRE_INCLUDED && (defined SUPPORT_PCRE16 || defined SUPPORT_PCRE32))
-
-/* These tables are also required by pcretest in 16- or 32-bit mode. */
-
-const int PRIV(utf8_table1)[] =
-  { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff};
-
-const int PRIV(utf8_table1_size) = sizeof(PRIV(utf8_table1)) / sizeof(int);
-
-/* These are the indicator bits and the mask for the data bits to set in the
-first byte of a character, indexed by the number of additional bytes. */
-
-const int PRIV(utf8_table2)[] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
-const int PRIV(utf8_table3)[] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
-
-/* Table of the number of extra bytes, indexed by the first byte masked with
-0x3f. The highest number for a valid UTF-8 first byte is in fact 0x3d. */
-
-const pcre_uint8 PRIV(utf8_table4)[] = {
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
-
-#endif /* (SUPPORT_UTF && COMPILE_PCRE8) || (PCRE_INCLUDED && SUPPORT_PCRE[16|32])*/
-
-#ifdef SUPPORT_UTF
-
-/* Table to translate from particular type value to the general value. */
-
-const pcre_uint32 PRIV(ucp_gentype)[] = {
-  ucp_C, ucp_C, ucp_C, ucp_C, ucp_C,  /* Cc, Cf, Cn, Co, Cs */
-  ucp_L, ucp_L, ucp_L, ucp_L, ucp_L,  /* Ll, Lu, Lm, Lo, Lt */
-  ucp_M, ucp_M, ucp_M,                /* Mc, Me, Mn */
-  ucp_N, ucp_N, ucp_N,                /* Nd, Nl, No */
-  ucp_P, ucp_P, ucp_P, ucp_P, ucp_P,  /* Pc, Pd, Pe, Pf, Pi */
-  ucp_P, ucp_P,                       /* Ps, Po */
-  ucp_S, ucp_S, ucp_S, ucp_S,         /* Sc, Sk, Sm, So */
-  ucp_Z, ucp_Z, ucp_Z                 /* Zl, Zp, Zs */
-};
-
-/* This table encodes the rules for finding the end of an extended grapheme
-cluster. Every code point has a grapheme break property which is one of the
-ucp_gbXX values defined in ucp.h. The 2-dimensional table is indexed by the
-properties of two adjacent code points. The left property selects a word from
-the table, and the right property selects a bit from that word like this:
-
-  ucp_gbtable[left-property] & (1 << right-property)
-
-The value is non-zero if a grapheme break is NOT permitted between the relevant
-two code points. The breaking rules are as follows:
-
-1. Break at the start and end of text (pretty obviously).
-
-2. Do not break between a CR and LF; otherwise, break before and   after
-   controls.
-
-3. Do not break Hangul syllable sequences, the rules for which are:
-
-    L may be followed by L, V, LV or LVT
-    LV or V may be followed by V or T
-    LVT or T may be followed by T
-
-4. Do not break before extending characters.
-
-The next two rules are only for extended grapheme clusters (but that's what we
-are implementing).
-
-5. Do not break before SpacingMarks.
-
-6. Do not break after Prepend characters.
-
-7. Otherwise, break everywhere.
-*/
-
-const pcre_uint32 PRIV(ucp_gbtable[]) = {
-   (1<<ucp_gbLF),                                           /*  0 CR */
-   0,                                                       /*  1 LF */
-   0,                                                       /*  2 Control */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark),                /*  3 Extend */
-   (1<<ucp_gbExtend)|(1<<ucp_gbPrepend)|                    /*  4 Prepend */
-     (1<<ucp_gbSpacingMark)|(1<<ucp_gbL)|
-     (1<<ucp_gbV)|(1<<ucp_gbT)|(1<<ucp_gbLV)|
-     (1<<ucp_gbLVT)|(1<<ucp_gbOther),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark),                /*  5 SpacingMark */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbL)|   /*  6 L */
-     (1<<ucp_gbL)|(1<<ucp_gbV)|(1<<ucp_gbLV)|(1<<ucp_gbLVT),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbV)|   /*  7 V */
-     (1<<ucp_gbT),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbT),   /*  8 T */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbV)|   /*  9 LV */
-     (1<<ucp_gbT),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbT),   /* 10 LVT */
-   (1<<ucp_gbRegionalIndicator),                            /* 11 RegionalIndicator */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)                 /* 12 Other */
-};
-
-#ifdef SUPPORT_JIT
-/* This table reverses PRIV(ucp_gentype). We can save the cost
-of a memory load. */
-
-const int PRIV(ucp_typerange)[] = {
-  ucp_Cc, ucp_Cs,
-  ucp_Ll, ucp_Lu,
-  ucp_Mc, ucp_Mn,
-  ucp_Nd, ucp_No,
-  ucp_Pc, ucp_Ps,
-  ucp_Sc, ucp_So,
-  ucp_Zl, ucp_Zs,
-};
-#endif /* SUPPORT_JIT */
-
-/* The pcre_utt[] table below translates Unicode property names into type and
-code values. It is searched by binary chop, so must be in collating sequence of
-name. Originally, the table contained pointers to the name strings in the first
-field of each entry. However, that leads to a large number of relocations when
-a shared library is dynamically loaded. A significant reduction is made by
-putting all the names into a single, large string and then using offsets in the
-table itself. Maintenance is more error-prone, but frequent changes to this
-data are unlikely.
-
-July 2008: There is now a script called maint/GenerateUtt.py that can be used
-to generate this data automatically instead of maintaining it by hand.
-
-The script was updated in March 2009 to generate a new EBCDIC-compliant
-version. Like all other character and string literals that are compared against
-the regular expression pattern, we must use STR_ macros instead of literal
-strings to make sure that UTF-8 support works on EBCDIC platforms. */
-
-#define STRING_Any0 STR_A STR_n STR_y "\0"
-#define STRING_Arabic0 STR_A STR_r STR_a STR_b STR_i STR_c "\0"
-#define STRING_Armenian0 STR_A STR_r STR_m STR_e STR_n STR_i STR_a STR_n "\0"
-#define STRING_Avestan0 STR_A STR_v STR_e STR_s STR_t STR_a STR_n "\0"
-#define STRING_Balinese0 STR_B STR_a STR_l STR_i STR_n STR_e STR_s STR_e "\0"
-#define STRING_Bamum0 STR_B STR_a STR_m STR_u STR_m "\0"
-#define STRING_Bassa_Vah0 STR_B STR_a STR_s STR_s STR_a STR_UNDERSCORE STR_V STR_a STR_h "\0"
-#define STRING_Batak0 STR_B STR_a STR_t STR_a STR_k "\0"
-#define STRING_Bengali0 STR_B STR_e STR_n STR_g STR_a STR_l STR_i "\0"
-#define STRING_Bopomofo0 STR_B STR_o STR_p STR_o STR_m STR_o STR_f STR_o "\0"
-#define STRING_Brahmi0 STR_B STR_r STR_a STR_h STR_m STR_i "\0"
-#define STRING_Braille0 STR_B STR_r STR_a STR_i STR_l STR_l STR_e "\0"
-#define STRING_Buginese0 STR_B STR_u STR_g STR_i STR_n STR_e STR_s STR_e "\0"
-#define STRING_Buhid0 STR_B STR_u STR_h STR_i STR_d "\0"
-#define STRING_C0 STR_C "\0"
-#define STRING_Canadian_Aboriginal0 STR_C STR_a STR_n STR_a STR_d STR_i STR_a STR_n STR_UNDERSCORE STR_A STR_b STR_o STR_r STR_i STR_g STR_i STR_n STR_a STR_l "\0"
-#define STRING_Carian0 STR_C STR_a STR_r STR_i STR_a STR_n "\0"
-#define STRING_Caucasian_Albanian0 STR_C STR_a STR_u STR_c STR_a STR_s STR_i STR_a STR_n STR_UNDERSCORE STR_A STR_l STR_b STR_a STR_n STR_i STR_a STR_n "\0"
-#define STRING_Cc0 STR_C STR_c "\0"
-#define STRING_Cf0 STR_C STR_f "\0"
-#define STRING_Chakma0 STR_C STR_h STR_a STR_k STR_m STR_a "\0"
-#define STRING_Cham0 STR_C STR_h STR_a STR_m "\0"
-#define STRING_Cherokee0 STR_C STR_h STR_e STR_r STR_o STR_k STR_e STR_e "\0"
-#define STRING_Cn0 STR_C STR_n "\0"
-#define STRING_Co0 STR_C STR_o "\0"
-#define STRING_Common0 STR_C STR_o STR_m STR_m STR_o STR_n "\0"
-#define STRING_Coptic0 STR_C STR_o STR_p STR_t STR_i STR_c "\0"
-#define STRING_Cs0 STR_C STR_s "\0"
-#define STRING_Cuneiform0 STR_C STR_u STR_n STR_e STR_i STR_f STR_o STR_r STR_m "\0"
-#define STRING_Cypriot0 STR_C STR_y STR_p STR_r STR_i STR_o STR_t "\0"
-#define STRING_Cyrillic0 STR_C STR_y STR_r STR_i STR_l STR_l STR_i STR_c "\0"
-#define STRING_Deseret0 STR_D STR_e STR_s STR_e STR_r STR_e STR_t "\0"
-#define STRING_Devanagari0 STR_D STR_e STR_v STR_a STR_n STR_a STR_g STR_a STR_r STR_i "\0"
-#define STRING_Duployan0 STR_D STR_u STR_p STR_l STR_o STR_y STR_a STR_n "\0"
-#define STRING_Egyptian_Hieroglyphs0 STR_E STR_g STR_y STR_p STR_t STR_i STR_a STR_n STR_UNDERSCORE STR_H STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
-#define STRING_Elbasan0 STR_E STR_l STR_b STR_a STR_s STR_a STR_n "\0"
-#define STRING_Ethiopic0 STR_E STR_t STR_h STR_i STR_o STR_p STR_i STR_c "\0"
-#define STRING_Georgian0 STR_G STR_e STR_o STR_r STR_g STR_i STR_a STR_n "\0"
-#define STRING_Glagolitic0 STR_G STR_l STR_a STR_g STR_o STR_l STR_i STR_t STR_i STR_c "\0"
-#define STRING_Gothic0 STR_G STR_o STR_t STR_h STR_i STR_c "\0"
-#define STRING_Grantha0 STR_G STR_r STR_a STR_n STR_t STR_h STR_a "\0"
-#define STRING_Greek0 STR_G STR_r STR_e STR_e STR_k "\0"
-#define STRING_Gujarati0 STR_G STR_u STR_j STR_a STR_r STR_a STR_t STR_i "\0"
-#define STRING_Gurmukhi0 STR_G STR_u STR_r STR_m STR_u STR_k STR_h STR_i "\0"
-#define STRING_Han0 STR_H STR_a STR_n "\0"
-#define STRING_Hangul0 STR_H STR_a STR_n STR_g STR_u STR_l "\0"
-#define STRING_Hanunoo0 STR_H STR_a STR_n STR_u STR_n STR_o STR_o "\0"
-#define STRING_Hebrew0 STR_H STR_e STR_b STR_r STR_e STR_w "\0"
-#define STRING_Hiragana0 STR_H STR_i STR_r STR_a STR_g STR_a STR_n STR_a "\0"
-#define STRING_Imperial_Aramaic0 STR_I STR_m STR_p STR_e STR_r STR_i STR_a STR_l STR_UNDERSCORE STR_A STR_r STR_a STR_m STR_a STR_i STR_c "\0"
-#define STRING_Inherited0 STR_I STR_n STR_h STR_e STR_r STR_i STR_t STR_e STR_d "\0"
-#define STRING_Inscriptional_Pahlavi0 STR_I STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_UNDERSCORE STR_P STR_a STR_h STR_l STR_a STR_v STR_i "\0"
-#define STRING_Inscriptional_Parthian0 STR_I STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_UNDERSCORE STR_P STR_a STR_r STR_t STR_h STR_i STR_a STR_n "\0"
-#define STRING_Javanese0 STR_J STR_a STR_v STR_a STR_n STR_e STR_s STR_e "\0"
-#define STRING_Kaithi0 STR_K STR_a STR_i STR_t STR_h STR_i "\0"
-#define STRING_Kannada0 STR_K STR_a STR_n STR_n STR_a STR_d STR_a "\0"
-#define STRING_Katakana0 STR_K STR_a STR_t STR_a STR_k STR_a STR_n STR_a "\0"
-#define STRING_Kayah_Li0 STR_K STR_a STR_y STR_a STR_h STR_UNDERSCORE STR_L STR_i "\0"
-#define STRING_Kharoshthi0 STR_K STR_h STR_a STR_r STR_o STR_s STR_h STR_t STR_h STR_i "\0"
-#define STRING_Khmer0 STR_K STR_h STR_m STR_e STR_r "\0"
-#define STRING_Khojki0 STR_K STR_h STR_o STR_j STR_k STR_i "\0"
-#define STRING_Khudawadi0 STR_K STR_h STR_u STR_d STR_a STR_w STR_a STR_d STR_i "\0"
-#define STRING_L0 STR_L "\0"
-#define STRING_L_AMPERSAND0 STR_L STR_AMPERSAND "\0"
-#define STRING_Lao0 STR_L STR_a STR_o "\0"
-#define STRING_Latin0 STR_L STR_a STR_t STR_i STR_n "\0"
-#define STRING_Lepcha0 STR_L STR_e STR_p STR_c STR_h STR_a "\0"
-#define STRING_Limbu0 STR_L STR_i STR_m STR_b STR_u "\0"
-#define STRING_Linear_A0 STR_L STR_i STR_n STR_e STR_a STR_r STR_UNDERSCORE STR_A "\0"
-#define STRING_Linear_B0 STR_L STR_i STR_n STR_e STR_a STR_r STR_UNDERSCORE STR_B "\0"
-#define STRING_Lisu0 STR_L STR_i STR_s STR_u "\0"
-#define STRING_Ll0 STR_L STR_l "\0"
-#define STRING_Lm0 STR_L STR_m "\0"
-#define STRING_Lo0 STR_L STR_o "\0"
-#define STRING_Lt0 STR_L STR_t "\0"
-#define STRING_Lu0 STR_L STR_u "\0"
-#define STRING_Lycian0 STR_L STR_y STR_c STR_i STR_a STR_n "\0"
-#define STRING_Lydian0 STR_L STR_y STR_d STR_i STR_a STR_n "\0"
-#define STRING_M0 STR_M "\0"
-#define STRING_Mahajani0 STR_M STR_a STR_h STR_a STR_j STR_a STR_n STR_i "\0"
-#define STRING_Malayalam0 STR_M STR_a STR_l STR_a STR_y STR_a STR_l STR_a STR_m "\0"
-#define STRING_Mandaic0 STR_M STR_a STR_n STR_d STR_a STR_i STR_c "\0"
-#define STRING_Manichaean0 STR_M STR_a STR_n STR_i STR_c STR_h STR_a STR_e STR_a STR_n "\0"
-#define STRING_Mc0 STR_M STR_c "\0"
-#define STRING_Me0 STR_M STR_e "\0"
-#define STRING_Meetei_Mayek0 STR_M STR_e STR_e STR_t STR_e STR_i STR_UNDERSCORE STR_M STR_a STR_y STR_e STR_k "\0"
-#define STRING_Mende_Kikakui0 STR_M STR_e STR_n STR_d STR_e STR_UNDERSCORE STR_K STR_i STR_k STR_a STR_k STR_u STR_i "\0"
-#define STRING_Meroitic_Cursive0 STR_M STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_UNDERSCORE STR_C STR_u STR_r STR_s STR_i STR_v STR_e "\0"
-#define STRING_Meroitic_Hieroglyphs0 STR_M STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_UNDERSCORE STR_H STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
-#define STRING_Miao0 STR_M STR_i STR_a STR_o "\0"
-#define STRING_Mn0 STR_M STR_n "\0"
-#define STRING_Modi0 STR_M STR_o STR_d STR_i "\0"
-#define STRING_Mongolian0 STR_M STR_o STR_n STR_g STR_o STR_l STR_i STR_a STR_n "\0"
-#define STRING_Mro0 STR_M STR_r STR_o "\0"
-#define STRING_Myanmar0 STR_M STR_y STR_a STR_n STR_m STR_a STR_r "\0"
-#define STRING_N0 STR_N "\0"
-#define STRING_Nabataean0 STR_N STR_a STR_b STR_a STR_t STR_a STR_e STR_a STR_n "\0"
-#define STRING_Nd0 STR_N STR_d "\0"
-#define STRING_New_Tai_Lue0 STR_N STR_e STR_w STR_UNDERSCORE STR_T STR_a STR_i STR_UNDERSCORE STR_L STR_u STR_e "\0"
-#define STRING_Nko0 STR_N STR_k STR_o "\0"
-#define STRING_Nl0 STR_N STR_l "\0"
-#define STRING_No0 STR_N STR_o "\0"
-#define STRING_Ogham0 STR_O STR_g STR_h STR_a STR_m "\0"
-#define STRING_Ol_Chiki0 STR_O STR_l STR_UNDERSCORE STR_C STR_h STR_i STR_k STR_i "\0"
-#define STRING_Old_Italic0 STR_O STR_l STR_d STR_UNDERSCORE STR_I STR_t STR_a STR_l STR_i STR_c "\0"
-#define STRING_Old_North_Arabian0 STR_O STR_l STR_d STR_UNDERSCORE STR_N STR_o STR_r STR_t STR_h STR_UNDERSCORE STR_A STR_r STR_a STR_b STR_i STR_a STR_n "\0"
-#define STRING_Old_Permic0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_m STR_i STR_c "\0"
-#define STRING_Old_Persian0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_s STR_i STR_a STR_n "\0"
-#define STRING_Old_South_Arabian0 STR_O STR_l STR_d STR_UNDERSCORE STR_S STR_o STR_u STR_t STR_h STR_UNDERSCORE STR_A STR_r STR_a STR_b STR_i STR_a STR_n "\0"
-#define STRING_Old_Turkic0 STR_O STR_l STR_d STR_UNDERSCORE STR_T STR_u STR_r STR_k STR_i STR_c "\0"
-#define STRING_Oriya0 STR_O STR_r STR_i STR_y STR_a "\0"
-#define STRING_Osmanya0 STR_O STR_s STR_m STR_a STR_n STR_y STR_a "\0"
-#define STRING_P0 STR_P "\0"
-#define STRING_Pahawh_Hmong0 STR_P STR_a STR_h STR_a STR_w STR_h STR_UNDERSCORE STR_H STR_m STR_o STR_n STR_g "\0"
-#define STRING_Palmyrene0 STR_P STR_a STR_l STR_m STR_y STR_r STR_e STR_n STR_e "\0"
-#define STRING_Pau_Cin_Hau0 STR_P STR_a STR_u STR_UNDERSCORE STR_C STR_i STR_n STR_UNDERSCORE STR_H STR_a STR_u "\0"
-#define STRING_Pc0 STR_P STR_c "\0"
-#define STRING_Pd0 STR_P STR_d "\0"
-#define STRING_Pe0 STR_P STR_e "\0"
-#define STRING_Pf0 STR_P STR_f "\0"
-#define STRING_Phags_Pa0 STR_P STR_h STR_a STR_g STR_s STR_UNDERSCORE STR_P STR_a "\0"
-#define STRING_Phoenician0 STR_P STR_h STR_o STR_e STR_n STR_i STR_c STR_i STR_a STR_n "\0"
-#define STRING_Pi0 STR_P STR_i "\0"
-#define STRING_Po0 STR_P STR_o "\0"
-#define STRING_Ps0 STR_P STR_s "\0"
-#define STRING_Psalter_Pahlavi0 STR_P STR_s STR_a STR_l STR_t STR_e STR_r STR_UNDERSCORE STR_P STR_a STR_h STR_l STR_a STR_v STR_i "\0"
-#define STRING_Rejang0 STR_R STR_e STR_j STR_a STR_n STR_g "\0"
-#define STRING_Runic0 STR_R STR_u STR_n STR_i STR_c "\0"
-#define STRING_S0 STR_S "\0"
-#define STRING_Samaritan0 STR_S STR_a STR_m STR_a STR_r STR_i STR_t STR_a STR_n "\0"
-#define STRING_Saurashtra0 STR_S STR_a STR_u STR_r STR_a STR_s STR_h STR_t STR_r STR_a "\0"
-#define STRING_Sc0 STR_S STR_c "\0"
-#define STRING_Sharada0 STR_S STR_h STR_a STR_r STR_a STR_d STR_a "\0"
-#define STRING_Shavian0 STR_S STR_h STR_a STR_v STR_i STR_a STR_n "\0"
-#define STRING_Siddham0 STR_S STR_i STR_d STR_d STR_h STR_a STR_m "\0"
-#define STRING_Sinhala0 STR_S STR_i STR_n STR_h STR_a STR_l STR_a "\0"
-#define STRING_Sk0 STR_S STR_k "\0"
-#define STRING_Sm0 STR_S STR_m "\0"
-#define STRING_So0 STR_S STR_o "\0"
-#define STRING_Sora_Sompeng0 STR_S STR_o STR_r STR_a STR_UNDERSCORE STR_S STR_o STR_m STR_p STR_e STR_n STR_g "\0"
-#define STRING_Sundanese0 STR_S STR_u STR_n STR_d STR_a STR_n STR_e STR_s STR_e "\0"
-#define STRING_Syloti_Nagri0 STR_S STR_y STR_l STR_o STR_t STR_i STR_UNDERSCORE STR_N STR_a STR_g STR_r STR_i "\0"
-#define STRING_Syriac0 STR_S STR_y STR_r STR_i STR_a STR_c "\0"
-#define STRING_Tagalog0 STR_T STR_a STR_g STR_a STR_l STR_o STR_g "\0"
-#define STRING_Tagbanwa0 STR_T STR_a STR_g STR_b STR_a STR_n STR_w STR_a "\0"
-#define STRING_Tai_Le0 STR_T STR_a STR_i STR_UNDERSCORE STR_L STR_e "\0"
-#define STRING_Tai_Tham0 STR_T STR_a STR_i STR_UNDERSCORE STR_T STR_h STR_a STR_m "\0"
-#define STRING_Tai_Viet0 STR_T STR_a STR_i STR_UNDERSCORE STR_V STR_i STR_e STR_t "\0"
-#define STRING_Takri0 STR_T STR_a STR_k STR_r STR_i "\0"
-#define STRING_Tamil0 STR_T STR_a STR_m STR_i STR_l "\0"
-#define STRING_Telugu0 STR_T STR_e STR_l STR_u STR_g STR_u "\0"
-#define STRING_Thaana0 STR_T STR_h STR_a STR_a STR_n STR_a "\0"
-#define STRING_Thai0 STR_T STR_h STR_a STR_i "\0"
-#define STRING_Tibetan0 STR_T STR_i STR_b STR_e STR_t STR_a STR_n "\0"
-#define STRING_Tifinagh0 STR_T STR_i STR_f STR_i STR_n STR_a STR_g STR_h "\0"
-#define STRING_Tirhuta0 STR_T STR_i STR_r STR_h STR_u STR_t STR_a "\0"
-#define STRING_Ugaritic0 STR_U STR_g STR_a STR_r STR_i STR_t STR_i STR_c "\0"
-#define STRING_Vai0 STR_V STR_a STR_i "\0"
-#define STRING_Warang_Citi0 STR_W STR_a STR_r STR_a STR_n STR_g STR_UNDERSCORE STR_C STR_i STR_t STR_i "\0"
-#define STRING_Xan0 STR_X STR_a STR_n "\0"
-#define STRING_Xps0 STR_X STR_p STR_s "\0"
-#define STRING_Xsp0 STR_X STR_s STR_p "\0"
-#define STRING_Xuc0 STR_X STR_u STR_c "\0"
-#define STRING_Xwd0 STR_X STR_w STR_d "\0"
-#define STRING_Yi0 STR_Y STR_i "\0"
-#define STRING_Z0 STR_Z "\0"
-#define STRING_Zl0 STR_Z STR_l "\0"
-#define STRING_Zp0 STR_Z STR_p "\0"
-#define STRING_Zs0 STR_Z STR_s "\0"
-
-const char PRIV(utt_names)[] =
-  STRING_Any0
-  STRING_Arabic0
-  STRING_Armenian0
-  STRING_Avestan0
-  STRING_Balinese0
-  STRING_Bamum0
-  STRING_Bassa_Vah0
-  STRING_Batak0
-  STRING_Bengali0
-  STRING_Bopomofo0
-  STRING_Brahmi0
-  STRING_Braille0
-  STRING_Buginese0
-  STRING_Buhid0
-  STRING_C0
-  STRING_Canadian_Aboriginal0
-  STRING_Carian0
-  STRING_Caucasian_Albanian0
-  STRING_Cc0
-  STRING_Cf0
-  STRING_Chakma0
-  STRING_Cham0
-  STRING_Cherokee0
-  STRING_Cn0
-  STRING_Co0
-  STRING_Common0
-  STRING_Coptic0
-  STRING_Cs0
-  STRING_Cuneiform0
-  STRING_Cypriot0
-  STRING_Cyrillic0
-  STRING_Deseret0
-  STRING_Devanagari0
-  STRING_Duployan0
-  STRING_Egyptian_Hieroglyphs0
-  STRING_Elbasan0
-  STRING_Ethiopic0
-  STRING_Georgian0
-  STRING_Glagolitic0
-  STRING_Gothic0
-  STRING_Grantha0
-  STRING_Greek0
-  STRING_Gujarati0
-  STRING_Gurmukhi0
-  STRING_Han0
-  STRING_Hangul0
-  STRING_Hanunoo0
-  STRING_Hebrew0
-  STRING_Hiragana0
-  STRING_Imperial_Aramaic0
-  STRING_Inherited0
-  STRING_Inscriptional_Pahlavi0
-  STRING_Inscriptional_Parthian0
-  STRING_Javanese0
-  STRING_Kaithi0
-  STRING_Kannada0
-  STRING_Katakana0
-  STRING_Kayah_Li0
-  STRING_Kharoshthi0
-  STRING_Khmer0
-  STRING_Khojki0
-  STRING_Khudawadi0
-  STRING_L0
-  STRING_L_AMPERSAND0
-  STRING_Lao0
-  STRING_Latin0
-  STRING_Lepcha0
-  STRING_Limbu0
-  STRING_Linear_A0
-  STRING_Linear_B0
-  STRING_Lisu0
-  STRING_Ll0
-  STRING_Lm0
-  STRING_Lo0
-  STRING_Lt0
-  STRING_Lu0
-  STRING_Lycian0
-  STRING_Lydian0
-  STRING_M0
-  STRING_Mahajani0
-  STRING_Malayalam0
-  STRING_Mandaic0
-  STRING_Manichaean0
-  STRING_Mc0
-  STRING_Me0
-  STRING_Meetei_Mayek0
-  STRING_Mende_Kikakui0
-  STRING_Meroitic_Cursive0
-  STRING_Meroitic_Hieroglyphs0
-  STRING_Miao0
-  STRING_Mn0
-  STRING_Modi0
-  STRING_Mongolian0
-  STRING_Mro0
-  STRING_Myanmar0
-  STRING_N0
-  STRING_Nabataean0
-  STRING_Nd0
-  STRING_New_Tai_Lue0
-  STRING_Nko0
-  STRING_Nl0
-  STRING_No0
-  STRING_Ogham0
-  STRING_Ol_Chiki0
-  STRING_Old_Italic0
-  STRING_Old_North_Arabian0
-  STRING_Old_Permic0
-  STRING_Old_Persian0
-  STRING_Old_South_Arabian0
-  STRING_Old_Turkic0
-  STRING_Oriya0
-  STRING_Osmanya0
-  STRING_P0
-  STRING_Pahawh_Hmong0
-  STRING_Palmyrene0
-  STRING_Pau_Cin_Hau0
-  STRING_Pc0
-  STRING_Pd0
-  STRING_Pe0
-  STRING_Pf0
-  STRING_Phags_Pa0
-  STRING_Phoenician0
-  STRING_Pi0
-  STRING_Po0
-  STRING_Ps0
-  STRING_Psalter_Pahlavi0
-  STRING_Rejang0
-  STRING_Runic0
-  STRING_S0
-  STRING_Samaritan0
-  STRING_Saurashtra0
-  STRING_Sc0
-  STRING_Sharada0
-  STRING_Shavian0
-  STRING_Siddham0
-  STRING_Sinhala0
-  STRING_Sk0
-  STRING_Sm0
-  STRING_So0
-  STRING_Sora_Sompeng0
-  STRING_Sundanese0
-  STRING_Syloti_Nagri0
-  STRING_Syriac0
-  STRING_Tagalog0
-  STRING_Tagbanwa0
-  STRING_Tai_Le0
-  STRING_Tai_Tham0
-  STRING_Tai_Viet0
-  STRING_Takri0
-  STRING_Tamil0
-  STRING_Telugu0
-  STRING_Thaana0
-  STRING_Thai0
-  STRING_Tibetan0
-  STRING_Tifinagh0
-  STRING_Tirhuta0
-  STRING_Ugaritic0
-  STRING_Vai0
-  STRING_Warang_Citi0
-  STRING_Xan0
-  STRING_Xps0
-  STRING_Xsp0
-  STRING_Xuc0
-  STRING_Xwd0
-  STRING_Yi0
-  STRING_Z0
-  STRING_Zl0
-  STRING_Zp0
-  STRING_Zs0;
-
-const ucp_type_table PRIV(utt)[] = {
-  {   0, PT_ANY, 0 },
-  {   4, PT_SC, ucp_Arabic },
-  {  11, PT_SC, ucp_Armenian },
-  {  20, PT_SC, ucp_Avestan },
-  {  28, PT_SC, ucp_Balinese },
-  {  37, PT_SC, ucp_Bamum },
-  {  43, PT_SC, ucp_Bassa_Vah },
-  {  53, PT_SC, ucp_Batak },
-  {  59, PT_SC, ucp_Bengali },
-  {  67, PT_SC, ucp_Bopomofo },
-  {  76, PT_SC, ucp_Brahmi },
-  {  83, PT_SC, ucp_Braille },
-  {  91, PT_SC, ucp_Buginese },
-  { 100, PT_SC, ucp_Buhid },
-  { 106, PT_GC, ucp_C },
-  { 108, PT_SC, ucp_Canadian_Aboriginal },
-  { 128, PT_SC, ucp_Carian },
-  { 135, PT_SC, ucp_Caucasian_Albanian },
-  { 154, PT_PC, ucp_Cc },
-  { 157, PT_PC, ucp_Cf },
-  { 160, PT_SC, ucp_Chakma },
-  { 167, PT_SC, ucp_Cham },
-  { 172, PT_SC, ucp_Cherokee },
-  { 181, PT_PC, ucp_Cn },
-  { 184, PT_PC, ucp_Co },
-  { 187, PT_SC, ucp_Common },
-  { 194, PT_SC, ucp_Coptic },
-  { 201, PT_PC, ucp_Cs },
-  { 204, PT_SC, ucp_Cuneiform },
-  { 214, PT_SC, ucp_Cypriot },
-  { 222, PT_SC, ucp_Cyrillic },
-  { 231, PT_SC, ucp_Deseret },
-  { 239, PT_SC, ucp_Devanagari },
-  { 250, PT_SC, ucp_Duployan },
-  { 259, PT_SC, ucp_Egyptian_Hieroglyphs },
-  { 280, PT_SC, ucp_Elbasan },
-  { 288, PT_SC, ucp_Ethiopic },
-  { 297, PT_SC, ucp_Georgian },
-  { 306, PT_SC, ucp_Glagolitic },
-  { 317, PT_SC, ucp_Gothic },
-  { 324, PT_SC, ucp_Grantha },
-  { 332, PT_SC, ucp_Greek },
-  { 338, PT_SC, ucp_Gujarati },
-  { 347, PT_SC, ucp_Gurmukhi },
-  { 356, PT_SC, ucp_Han },
-  { 360, PT_SC, ucp_Hangul },
-  { 367, PT_SC, ucp_Hanunoo },
-  { 375, PT_SC, ucp_Hebrew },
-  { 382, PT_SC, ucp_Hiragana },
-  { 391, PT_SC, ucp_Imperial_Aramaic },
-  { 408, PT_SC, ucp_Inherited },
-  { 418, PT_SC, ucp_Inscriptional_Pahlavi },
-  { 440, PT_SC, ucp_Inscriptional_Parthian },
-  { 463, PT_SC, ucp_Javanese },
-  { 472, PT_SC, ucp_Kaithi },
-  { 479, PT_SC, ucp_Kannada },
-  { 487, PT_SC, ucp_Katakana },
-  { 496, PT_SC, ucp_Kayah_Li },
-  { 505, PT_SC, ucp_Kharoshthi },
-  { 516, PT_SC, ucp_Khmer },
-  { 522, PT_SC, ucp_Khojki },
-  { 529, PT_SC, ucp_Khudawadi },
-  { 539, PT_GC, ucp_L },
-  { 541, PT_LAMP, 0 },
-  { 544, PT_SC, ucp_Lao },
-  { 548, PT_SC, ucp_Latin },
-  { 554, PT_SC, ucp_Lepcha },
-  { 561, PT_SC, ucp_Limbu },
-  { 567, PT_SC, ucp_Linear_A },
-  { 576, PT_SC, ucp_Linear_B },
-  { 585, PT_SC, ucp_Lisu },
-  { 590, PT_PC, ucp_Ll },
-  { 593, PT_PC, ucp_Lm },
-  { 596, PT_PC, ucp_Lo },
-  { 599, PT_PC, ucp_Lt },
-  { 602, PT_PC, ucp_Lu },
-  { 605, PT_SC, ucp_Lycian },
-  { 612, PT_SC, ucp_Lydian },
-  { 619, PT_GC, ucp_M },
-  { 621, PT_SC, ucp_Mahajani },
-  { 630, PT_SC, ucp_Malayalam },
-  { 640, PT_SC, ucp_Mandaic },
-  { 648, PT_SC, ucp_Manichaean },
-  { 659, PT_PC, ucp_Mc },
-  { 662, PT_PC, ucp_Me },
-  { 665, PT_SC, ucp_Meetei_Mayek },
-  { 678, PT_SC, ucp_Mende_Kikakui },
-  { 692, PT_SC, ucp_Meroitic_Cursive },
-  { 709, PT_SC, ucp_Meroitic_Hieroglyphs },
-  { 730, PT_SC, ucp_Miao },
-  { 735, PT_PC, ucp_Mn },
-  { 738, PT_SC, ucp_Modi },
-  { 743, PT_SC, ucp_Mongolian },
-  { 753, PT_SC, ucp_Mro },
-  { 757, PT_SC, ucp_Myanmar },
-  { 765, PT_GC, ucp_N },
-  { 767, PT_SC, ucp_Nabataean },
-  { 777, PT_PC, ucp_Nd },
-  { 780, PT_SC, ucp_New_Tai_Lue },
-  { 792, PT_SC, ucp_Nko },
-  { 796, PT_PC, ucp_Nl },
-  { 799, PT_PC, ucp_No },
-  { 802, PT_SC, ucp_Ogham },
-  { 808, PT_SC, ucp_Ol_Chiki },
-  { 817, PT_SC, ucp_Old_Italic },
-  { 828, PT_SC, ucp_Old_North_Arabian },
-  { 846, PT_SC, ucp_Old_Permic },
-  { 857, PT_SC, ucp_Old_Persian },
-  { 869, PT_SC, ucp_Old_South_Arabian },
-  { 887, PT_SC, ucp_Old_Turkic },
-  { 898, PT_SC, ucp_Oriya },
-  { 904, PT_SC, ucp_Osmanya },
-  { 912, PT_GC, ucp_P },
-  { 914, PT_SC, ucp_Pahawh_Hmong },
-  { 927, PT_SC, ucp_Palmyrene },
-  { 937, PT_SC, ucp_Pau_Cin_Hau },
-  { 949, PT_PC, ucp_Pc },
-  { 952, PT_PC, ucp_Pd },
-  { 955, PT_PC, ucp_Pe },
-  { 958, PT_PC, ucp_Pf },
-  { 961, PT_SC, ucp_Phags_Pa },
-  { 970, PT_SC, ucp_Phoenician },
-  { 981, PT_PC, ucp_Pi },
-  { 984, PT_PC, ucp_Po },
-  { 987, PT_PC, ucp_Ps },
-  { 990, PT_SC, ucp_Psalter_Pahlavi },
-  { 1006, PT_SC, ucp_Rejang },
-  { 1013, PT_SC, ucp_Runic },
-  { 1019, PT_GC, ucp_S },
-  { 1021, PT_SC, ucp_Samaritan },
-  { 1031, PT_SC, ucp_Saurashtra },
-  { 1042, PT_PC, ucp_Sc },
-  { 1045, PT_SC, ucp_Sharada },
-  { 1053, PT_SC, ucp_Shavian },
-  { 1061, PT_SC, ucp_Siddham },
-  { 1069, PT_SC, ucp_Sinhala },
-  { 1077, PT_PC, ucp_Sk },
-  { 1080, PT_PC, ucp_Sm },
-  { 1083, PT_PC, ucp_So },
-  { 1086, PT_SC, ucp_Sora_Sompeng },
-  { 1099, PT_SC, ucp_Sundanese },
-  { 1109, PT_SC, ucp_Syloti_Nagri },
-  { 1122, PT_SC, ucp_Syriac },
-  { 1129, PT_SC, ucp_Tagalog },
-  { 1137, PT_SC, ucp_Tagbanwa },
-  { 1146, PT_SC, ucp_Tai_Le },
-  { 1153, PT_SC, ucp_Tai_Tham },
-  { 1162, PT_SC, ucp_Tai_Viet },
-  { 1171, PT_SC, ucp_Takri },
-  { 1177, PT_SC, ucp_Tamil },
-  { 1183, PT_SC, ucp_Telugu },
-  { 1190, PT_SC, ucp_Thaana },
-  { 1197, PT_SC, ucp_Thai },
-  { 1202, PT_SC, ucp_Tibetan },
-  { 1210, PT_SC, ucp_Tifinagh },
-  { 1219, PT_SC, ucp_Tirhuta },
-  { 1227, PT_SC, ucp_Ugaritic },
-  { 1236, PT_SC, ucp_Vai },
-  { 1240, PT_SC, ucp_Warang_Citi },
-  { 1252, PT_ALNUM, 0 },
-  { 1256, PT_PXSPACE, 0 },
-  { 1260, PT_SPACE, 0 },
-  { 1264, PT_UCNC, 0 },
-  { 1268, PT_WORD, 0 },
-  { 1272, PT_SC, ucp_Yi },
-  { 1275, PT_GC, ucp_Z },
-  { 1277, PT_PC, ucp_Zl },
-  { 1280, PT_PC, ucp_Zp },
-  { 1283, PT_PC, ucp_Zs }
-};
-
-const int PRIV(utt_size) = sizeof(PRIV(utt)) / sizeof(ucp_type_table);
-
-#endif /* SUPPORT_UTF */
-
-/* End of pcre_tables.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_ucd.c r-base-3.3.1/src/extra/pcre/pcre_ucd.c
--- r-base-3.2.3/src/extra/pcre/pcre_ucd.c	2014-11-12 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_ucd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3630 +0,0 @@
-/* This module is generated by the maint/MultiStage2.py script.
-Do not modify it by hand. Instead modify the script and run it
-to regenerate this code.
-
-As well as being part of the PCRE library, this module is #included
-by the pcretest program, which redefines the PRIV macro to change
-table names from _pcre_xxx to xxxx, thereby avoiding name clashes
-with the library. At present, just one of these tables is actually
-needed. */
-
-#ifndef PCRE_INCLUDED
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-#endif /* PCRE_INCLUDED */
-
-/* Unicode character database. */
-/* This file was autogenerated by the MultiStage2.py script. */
-/* Total size: 72576 bytes, block size: 128. */
-
-/* The tables herein are needed only when UCP support is built
-into PCRE. This module should not be referenced otherwise, so
-it should not matter whether it is compiled or not. However
-a comment was received about space saving - maybe the guy linked
-all the modules rather than using a library - so we include a
-condition to cut out the tables when not needed. But don't leave
-a totally empty module because some compilers barf at that.
-Instead, just supply small dummy tables. */
-
-#ifndef SUPPORT_UCP
-const ucd_record PRIV(ucd_records)[] = {{0,0,0,0,0 }};
-const pcre_uint8 PRIV(ucd_stage1)[] = {0};
-const pcre_uint16 PRIV(ucd_stage2)[] = {0};
-const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
-#else
-
-/* When recompiling tables with a new Unicode version, please check the
-types in this structure definition from pcre_internal.h (the actual
-field names will be different):
-
-typedef struct {
-pcre_uint8 property_0;
-pcre_uint8 property_1;
-pcre_uint8 property_2;
-pcre_uint8 property_3;
-pcre_int32 property_4;
-} ucd_record;
-*/
-
-
-const pcre_uint32 PRIV(ucd_caseless_sets)[] = {
-  NOTACHAR,
-  0x0053,   0x0073,   0x017f,   NOTACHAR,
-  0x01c4,   0x01c5,   0x01c6,   NOTACHAR,
-  0x01c7,   0x01c8,   0x01c9,   NOTACHAR,
-  0x01ca,   0x01cb,   0x01cc,   NOTACHAR,
-  0x01f1,   0x01f2,   0x01f3,   NOTACHAR,
-  0x0345,   0x0399,   0x03b9,   0x1fbe,   NOTACHAR,
-  0x00b5,   0x039c,   0x03bc,   NOTACHAR,
-  0x03a3,   0x03c2,   0x03c3,   NOTACHAR,
-  0x0392,   0x03b2,   0x03d0,   NOTACHAR,
-  0x0398,   0x03b8,   0x03d1,   0x03f4,   NOTACHAR,
-  0x03a6,   0x03c6,   0x03d5,   NOTACHAR,
-  0x03a0,   0x03c0,   0x03d6,   NOTACHAR,
-  0x039a,   0x03ba,   0x03f0,   NOTACHAR,
-  0x03a1,   0x03c1,   0x03f1,   NOTACHAR,
-  0x0395,   0x03b5,   0x03f5,   NOTACHAR,
-  0x1e60,   0x1e61,   0x1e9b,   NOTACHAR,
-  0x03a9,   0x03c9,   0x2126,   NOTACHAR,
-  0x004b,   0x006b,   0x212a,   NOTACHAR,
-  0x00c5,   0x00e5,   0x212b,   NOTACHAR,
-};
-
-/* When #included in pcretest, we don't need this large table. */
-
-#ifndef PCRE_INCLUDED
-
-const ucd_record PRIV(ucd_records)[] = { /* 5760 bytes, record size 8 */
-  {     9,      0,      2,      0,      0, }, /*   0 */
-  {     9,      0,      1,      0,      0, }, /*   1 */
-  {     9,      0,      0,      0,      0, }, /*   2 */
-  {     9,     29,     12,      0,      0, }, /*   3 */
-  {     9,     21,     12,      0,      0, }, /*   4 */
-  {     9,     23,     12,      0,      0, }, /*   5 */
-  {     9,     22,     12,      0,      0, }, /*   6 */
-  {     9,     18,     12,      0,      0, }, /*   7 */
-  {     9,     25,     12,      0,      0, }, /*   8 */
-  {     9,     17,     12,      0,      0, }, /*   9 */
-  {     9,     13,     12,      0,      0, }, /*  10 */
-  {    33,      9,     12,      0,     32, }, /*  11 */
-  {    33,      9,     12,     71,     32, }, /*  12 */
-  {    33,      9,     12,      1,     32, }, /*  13 */
-  {     9,     24,     12,      0,      0, }, /*  14 */
-  {     9,     16,     12,      0,      0, }, /*  15 */
-  {    33,      5,     12,      0,    -32, }, /*  16 */
-  {    33,      5,     12,     71,    -32, }, /*  17 */
-  {    33,      5,     12,      1,    -32, }, /*  18 */
-  {     9,     26,     12,      0,      0, }, /*  19 */
-  {    33,      7,     12,      0,      0, }, /*  20 */
-  {     9,     20,     12,      0,      0, }, /*  21 */
-  {     9,      1,      2,      0,      0, }, /*  22 */
-  {     9,     15,     12,      0,      0, }, /*  23 */
-  {     9,      5,     12,     26,    775, }, /*  24 */
-  {     9,     19,     12,      0,      0, }, /*  25 */
-  {    33,      9,     12,     75,     32, }, /*  26 */
-  {    33,      5,     12,      0,   7615, }, /*  27 */
-  {    33,      5,     12,     75,    -32, }, /*  28 */
-  {    33,      5,     12,      0,    121, }, /*  29 */
-  {    33,      9,     12,      0,      1, }, /*  30 */
-  {    33,      5,     12,      0,     -1, }, /*  31 */
-  {    33,      9,     12,      0,      0, }, /*  32 */
-  {    33,      5,     12,      0,      0, }, /*  33 */
-  {    33,      9,     12,      0,   -121, }, /*  34 */
-  {    33,      5,     12,      1,   -268, }, /*  35 */
-  {    33,      5,     12,      0,    195, }, /*  36 */
-  {    33,      9,     12,      0,    210, }, /*  37 */
-  {    33,      9,     12,      0,    206, }, /*  38 */
-  {    33,      9,     12,      0,    205, }, /*  39 */
-  {    33,      9,     12,      0,     79, }, /*  40 */
-  {    33,      9,     12,      0,    202, }, /*  41 */
-  {    33,      9,     12,      0,    203, }, /*  42 */
-  {    33,      9,     12,      0,    207, }, /*  43 */
-  {    33,      5,     12,      0,     97, }, /*  44 */
-  {    33,      9,     12,      0,    211, }, /*  45 */
-  {    33,      9,     12,      0,    209, }, /*  46 */
-  {    33,      5,     12,      0,    163, }, /*  47 */
-  {    33,      9,     12,      0,    213, }, /*  48 */
-  {    33,      5,     12,      0,    130, }, /*  49 */
-  {    33,      9,     12,      0,    214, }, /*  50 */
-  {    33,      9,     12,      0,    218, }, /*  51 */
-  {    33,      9,     12,      0,    217, }, /*  52 */
-  {    33,      9,     12,      0,    219, }, /*  53 */
-  {    33,      5,     12,      0,     56, }, /*  54 */
-  {    33,      9,     12,      5,      2, }, /*  55 */
-  {    33,      8,     12,      5,      1, }, /*  56 */
-  {    33,      5,     12,      5,     -2, }, /*  57 */
-  {    33,      9,     12,      9,      2, }, /*  58 */
-  {    33,      8,     12,      9,      1, }, /*  59 */
-  {    33,      5,     12,      9,     -2, }, /*  60 */
-  {    33,      9,     12,     13,      2, }, /*  61 */
-  {    33,      8,     12,     13,      1, }, /*  62 */
-  {    33,      5,     12,     13,     -2, }, /*  63 */
-  {    33,      5,     12,      0,    -79, }, /*  64 */
-  {    33,      9,     12,     17,      2, }, /*  65 */
-  {    33,      8,     12,     17,      1, }, /*  66 */
-  {    33,      5,     12,     17,     -2, }, /*  67 */
-  {    33,      9,     12,      0,    -97, }, /*  68 */
-  {    33,      9,     12,      0,    -56, }, /*  69 */
-  {    33,      9,     12,      0,   -130, }, /*  70 */
-  {    33,      9,     12,      0,  10795, }, /*  71 */
-  {    33,      9,     12,      0,   -163, }, /*  72 */
-  {    33,      9,     12,      0,  10792, }, /*  73 */
-  {    33,      5,     12,      0,  10815, }, /*  74 */
-  {    33,      9,     12,      0,   -195, }, /*  75 */
-  {    33,      9,     12,      0,     69, }, /*  76 */
-  {    33,      9,     12,      0,     71, }, /*  77 */
-  {    33,      5,     12,      0,  10783, }, /*  78 */
-  {    33,      5,     12,      0,  10780, }, /*  79 */
-  {    33,      5,     12,      0,  10782, }, /*  80 */
-  {    33,      5,     12,      0,   -210, }, /*  81 */
-  {    33,      5,     12,      0,   -206, }, /*  82 */
-  {    33,      5,     12,      0,   -205, }, /*  83 */
-  {    33,      5,     12,      0,   -202, }, /*  84 */
-  {    33,      5,     12,      0,   -203, }, /*  85 */
-  {    33,      5,     12,      0,  42319, }, /*  86 */
-  {    33,      5,     12,      0,  42315, }, /*  87 */
-  {    33,      5,     12,      0,   -207, }, /*  88 */
-  {    33,      5,     12,      0,  42280, }, /*  89 */
-  {    33,      5,     12,      0,  42308, }, /*  90 */
-  {    33,      5,     12,      0,   -209, }, /*  91 */
-  {    33,      5,     12,      0,   -211, }, /*  92 */
-  {    33,      5,     12,      0,  10743, }, /*  93 */
-  {    33,      5,     12,      0,  42305, }, /*  94 */
-  {    33,      5,     12,      0,  10749, }, /*  95 */
-  {    33,      5,     12,      0,   -213, }, /*  96 */
-  {    33,      5,     12,      0,   -214, }, /*  97 */
-  {    33,      5,     12,      0,  10727, }, /*  98 */
-  {    33,      5,     12,      0,   -218, }, /*  99 */
-  {    33,      5,     12,      0,  42282, }, /* 100 */
-  {    33,      5,     12,      0,    -69, }, /* 101 */
-  {    33,      5,     12,      0,   -217, }, /* 102 */
-  {    33,      5,     12,      0,    -71, }, /* 103 */
-  {    33,      5,     12,      0,   -219, }, /* 104 */
-  {    33,      5,     12,      0,  42258, }, /* 105 */
-  {    33,      6,     12,      0,      0, }, /* 106 */
-  {     9,      6,     12,      0,      0, }, /* 107 */
-  {     3,     24,     12,      0,      0, }, /* 108 */
-  {    27,     12,      3,      0,      0, }, /* 109 */
-  {    27,     12,      3,     21,    116, }, /* 110 */
-  {    19,      9,     12,      0,      1, }, /* 111 */
-  {    19,      5,     12,      0,     -1, }, /* 112 */
-  {    19,     24,     12,      0,      0, }, /* 113 */
-  {     9,      2,     12,      0,      0, }, /* 114 */
-  {    19,      6,     12,      0,      0, }, /* 115 */
-  {    19,      5,     12,      0,    130, }, /* 116 */
-  {    19,      9,     12,      0,    116, }, /* 117 */
-  {    19,      9,     12,      0,     38, }, /* 118 */
-  {    19,      9,     12,      0,     37, }, /* 119 */
-  {    19,      9,     12,      0,     64, }, /* 120 */
-  {    19,      9,     12,      0,     63, }, /* 121 */
-  {    19,      5,     12,      0,      0, }, /* 122 */
-  {    19,      9,     12,      0,     32, }, /* 123 */
-  {    19,      9,     12,     34,     32, }, /* 124 */
-  {    19,      9,     12,     59,     32, }, /* 125 */
-  {    19,      9,     12,     38,     32, }, /* 126 */
-  {    19,      9,     12,     21,     32, }, /* 127 */
-  {    19,      9,     12,     51,     32, }, /* 128 */
-  {    19,      9,     12,     26,     32, }, /* 129 */
-  {    19,      9,     12,     47,     32, }, /* 130 */
-  {    19,      9,     12,     55,     32, }, /* 131 */
-  {    19,      9,     12,     30,     32, }, /* 132 */
-  {    19,      9,     12,     43,     32, }, /* 133 */
-  {    19,      9,     12,     67,     32, }, /* 134 */
-  {    19,      5,     12,      0,    -38, }, /* 135 */
-  {    19,      5,     12,      0,    -37, }, /* 136 */
-  {    19,      5,     12,      0,    -32, }, /* 137 */
-  {    19,      5,     12,     34,    -32, }, /* 138 */
-  {    19,      5,     12,     59,    -32, }, /* 139 */
-  {    19,      5,     12,     38,    -32, }, /* 140 */
-  {    19,      5,     12,     21,   -116, }, /* 141 */
-  {    19,      5,     12,     51,    -32, }, /* 142 */
-  {    19,      5,     12,     26,   -775, }, /* 143 */
-  {    19,      5,     12,     47,    -32, }, /* 144 */
-  {    19,      5,     12,     55,    -32, }, /* 145 */
-  {    19,      5,     12,     30,      1, }, /* 146 */
-  {    19,      5,     12,     30,    -32, }, /* 147 */
-  {    19,      5,     12,     43,    -32, }, /* 148 */
-  {    19,      5,     12,     67,    -32, }, /* 149 */
-  {    19,      5,     12,      0,    -64, }, /* 150 */
-  {    19,      5,     12,      0,    -63, }, /* 151 */
-  {    19,      9,     12,      0,      8, }, /* 152 */
-  {    19,      5,     12,     34,    -30, }, /* 153 */
-  {    19,      5,     12,     38,    -25, }, /* 154 */
-  {    19,      9,     12,      0,      0, }, /* 155 */
-  {    19,      5,     12,     43,    -15, }, /* 156 */
-  {    19,      5,     12,     47,    -22, }, /* 157 */
-  {    19,      5,     12,      0,     -8, }, /* 158 */
-  {    10,      9,     12,      0,      1, }, /* 159 */
-  {    10,      5,     12,      0,     -1, }, /* 160 */
-  {    19,      5,     12,     51,    -54, }, /* 161 */
-  {    19,      5,     12,     55,    -48, }, /* 162 */
-  {    19,      5,     12,      0,      7, }, /* 163 */
-  {    19,      5,     12,      0,   -116, }, /* 164 */
-  {    19,      9,     12,     38,    -60, }, /* 165 */
-  {    19,      5,     12,     59,    -64, }, /* 166 */
-  {    19,     25,     12,      0,      0, }, /* 167 */
-  {    19,      9,     12,      0,     -7, }, /* 168 */
-  {    19,      9,     12,      0,   -130, }, /* 169 */
-  {    12,      9,     12,      0,     80, }, /* 170 */
-  {    12,      9,     12,      0,     32, }, /* 171 */
-  {    12,      5,     12,      0,    -32, }, /* 172 */
-  {    12,      5,     12,      0,    -80, }, /* 173 */
-  {    12,      9,     12,      0,      1, }, /* 174 */
-  {    12,      5,     12,      0,     -1, }, /* 175 */
-  {    12,     26,     12,      0,      0, }, /* 176 */
-  {    12,     12,      3,      0,      0, }, /* 177 */
-  {    12,     11,      3,      0,      0, }, /* 178 */
-  {    12,      9,     12,      0,     15, }, /* 179 */
-  {    12,      5,     12,      0,    -15, }, /* 180 */
-  {     1,      9,     12,      0,     48, }, /* 181 */
-  {     1,      6,     12,      0,      0, }, /* 182 */
-  {     1,     21,     12,      0,      0, }, /* 183 */
-  {     1,      5,     12,      0,    -48, }, /* 184 */
-  {     1,      5,     12,      0,      0, }, /* 185 */
-  {     1,     17,     12,      0,      0, }, /* 186 */
-  {     1,     26,     12,      0,      0, }, /* 187 */
-  {     1,     23,     12,      0,      0, }, /* 188 */
-  {    25,     12,      3,      0,      0, }, /* 189 */
-  {    25,     17,     12,      0,      0, }, /* 190 */
-  {    25,     21,     12,      0,      0, }, /* 191 */
-  {    25,      7,     12,      0,      0, }, /* 192 */
-  {     0,      1,      2,      0,      0, }, /* 193 */
-  {     0,     25,     12,      0,      0, }, /* 194 */
-  {     0,     21,     12,      0,      0, }, /* 195 */
-  {     0,     23,     12,      0,      0, }, /* 196 */
-  {     0,     26,     12,      0,      0, }, /* 197 */
-  {     0,     12,      3,      0,      0, }, /* 198 */
-  {     0,      7,     12,      0,      0, }, /* 199 */
-  {     0,      6,     12,      0,      0, }, /* 200 */
-  {     0,     13,     12,      0,      0, }, /* 201 */
-  {    49,     21,     12,      0,      0, }, /* 202 */
-  {    49,      1,      2,      0,      0, }, /* 203 */
-  {    49,      7,     12,      0,      0, }, /* 204 */
-  {    49,     12,      3,      0,      0, }, /* 205 */
-  {    55,      7,     12,      0,      0, }, /* 206 */
-  {    55,     12,      3,      0,      0, }, /* 207 */
-  {    63,     13,     12,      0,      0, }, /* 208 */
-  {    63,      7,     12,      0,      0, }, /* 209 */
-  {    63,     12,      3,      0,      0, }, /* 210 */
-  {    63,      6,     12,      0,      0, }, /* 211 */
-  {    63,     26,     12,      0,      0, }, /* 212 */
-  {    63,     21,     12,      0,      0, }, /* 213 */
-  {    89,      7,     12,      0,      0, }, /* 214 */
-  {    89,     12,      3,      0,      0, }, /* 215 */
-  {    89,      6,     12,      0,      0, }, /* 216 */
-  {    89,     21,     12,      0,      0, }, /* 217 */
-  {    94,      7,     12,      0,      0, }, /* 218 */
-  {    94,     12,      3,      0,      0, }, /* 219 */
-  {    94,     21,     12,      0,      0, }, /* 220 */
-  {    14,     12,      3,      0,      0, }, /* 221 */
-  {    14,     10,      5,      0,      0, }, /* 222 */
-  {    14,      7,     12,      0,      0, }, /* 223 */
-  {    14,     13,     12,      0,      0, }, /* 224 */
-  {    14,     21,     12,      0,      0, }, /* 225 */
-  {    14,      6,     12,      0,      0, }, /* 226 */
-  {     2,      7,     12,      0,      0, }, /* 227 */
-  {     2,     12,      3,      0,      0, }, /* 228 */
-  {     2,     10,      5,      0,      0, }, /* 229 */
-  {     2,     10,      3,      0,      0, }, /* 230 */
-  {     2,     13,     12,      0,      0, }, /* 231 */
-  {     2,     23,     12,      0,      0, }, /* 232 */
-  {     2,     15,     12,      0,      0, }, /* 233 */
-  {     2,     26,     12,      0,      0, }, /* 234 */
-  {    21,     12,      3,      0,      0, }, /* 235 */
-  {    21,     10,      5,      0,      0, }, /* 236 */
-  {    21,      7,     12,      0,      0, }, /* 237 */
-  {    21,     13,     12,      0,      0, }, /* 238 */
-  {    20,     12,      3,      0,      0, }, /* 239 */
-  {    20,     10,      5,      0,      0, }, /* 240 */
-  {    20,      7,     12,      0,      0, }, /* 241 */
-  {    20,     13,     12,      0,      0, }, /* 242 */
-  {    20,     21,     12,      0,      0, }, /* 243 */
-  {    20,     23,     12,      0,      0, }, /* 244 */
-  {    43,     12,      3,      0,      0, }, /* 245 */
-  {    43,     10,      5,      0,      0, }, /* 246 */
-  {    43,      7,     12,      0,      0, }, /* 247 */
-  {    43,     10,      3,      0,      0, }, /* 248 */
-  {    43,     13,     12,      0,      0, }, /* 249 */
-  {    43,     26,     12,      0,      0, }, /* 250 */
-  {    43,     15,     12,      0,      0, }, /* 251 */
-  {    53,     12,      3,      0,      0, }, /* 252 */
-  {    53,      7,     12,      0,      0, }, /* 253 */
-  {    53,     10,      3,      0,      0, }, /* 254 */
-  {    53,     10,      5,      0,      0, }, /* 255 */
-  {    53,     13,     12,      0,      0, }, /* 256 */
-  {    53,     15,     12,      0,      0, }, /* 257 */
-  {    53,     26,     12,      0,      0, }, /* 258 */
-  {    53,     23,     12,      0,      0, }, /* 259 */
-  {    54,     12,      3,      0,      0, }, /* 260 */
-  {    54,     10,      5,      0,      0, }, /* 261 */
-  {    54,      7,     12,      0,      0, }, /* 262 */
-  {    54,     13,     12,      0,      0, }, /* 263 */
-  {    54,     15,     12,      0,      0, }, /* 264 */
-  {    54,     26,     12,      0,      0, }, /* 265 */
-  {    28,     12,      3,      0,      0, }, /* 266 */
-  {    28,     10,      5,      0,      0, }, /* 267 */
-  {    28,      7,     12,      0,      0, }, /* 268 */
-  {    28,     10,      3,      0,      0, }, /* 269 */
-  {    28,     13,     12,      0,      0, }, /* 270 */
-  {    36,     12,      3,      0,      0, }, /* 271 */
-  {    36,     10,      5,      0,      0, }, /* 272 */
-  {    36,      7,     12,      0,      0, }, /* 273 */
-  {    36,     10,      3,      0,      0, }, /* 274 */
-  {    36,     13,     12,      0,      0, }, /* 275 */
-  {    36,     15,     12,      0,      0, }, /* 276 */
-  {    36,     26,     12,      0,      0, }, /* 277 */
-  {    47,     10,      5,      0,      0, }, /* 278 */
-  {    47,      7,     12,      0,      0, }, /* 279 */
-  {    47,     12,      3,      0,      0, }, /* 280 */
-  {    47,     10,      3,      0,      0, }, /* 281 */
-  {    47,     13,     12,      0,      0, }, /* 282 */
-  {    47,     21,     12,      0,      0, }, /* 283 */
-  {    56,      7,     12,      0,      0, }, /* 284 */
-  {    56,     12,      3,      0,      0, }, /* 285 */
-  {    56,      7,      5,      0,      0, }, /* 286 */
-  {    56,      6,     12,      0,      0, }, /* 287 */
-  {    56,     21,     12,      0,      0, }, /* 288 */
-  {    56,     13,     12,      0,      0, }, /* 289 */
-  {    32,      7,     12,      0,      0, }, /* 290 */
-  {    32,     12,      3,      0,      0, }, /* 291 */
-  {    32,      7,      5,      0,      0, }, /* 292 */
-  {    32,      6,     12,      0,      0, }, /* 293 */
-  {    32,     13,     12,      0,      0, }, /* 294 */
-  {    57,      7,     12,      0,      0, }, /* 295 */
-  {    57,     26,     12,      0,      0, }, /* 296 */
-  {    57,     21,     12,      0,      0, }, /* 297 */
-  {    57,     12,      3,      0,      0, }, /* 298 */
-  {    57,     13,     12,      0,      0, }, /* 299 */
-  {    57,     15,     12,      0,      0, }, /* 300 */
-  {    57,     22,     12,      0,      0, }, /* 301 */
-  {    57,     18,     12,      0,      0, }, /* 302 */
-  {    57,     10,      5,      0,      0, }, /* 303 */
-  {    38,      7,     12,      0,      0, }, /* 304 */
-  {    38,     10,     12,      0,      0, }, /* 305 */
-  {    38,     12,      3,      0,      0, }, /* 306 */
-  {    38,     10,      5,      0,      0, }, /* 307 */
-  {    38,     13,     12,      0,      0, }, /* 308 */
-  {    38,     21,     12,      0,      0, }, /* 309 */
-  {    38,     26,     12,      0,      0, }, /* 310 */
-  {    16,      9,     12,      0,   7264, }, /* 311 */
-  {    16,      7,     12,      0,      0, }, /* 312 */
-  {    16,      6,     12,      0,      0, }, /* 313 */
-  {    23,      7,      6,      0,      0, }, /* 314 */
-  {    23,      7,      7,      0,      0, }, /* 315 */
-  {    23,      7,      8,      0,      0, }, /* 316 */
-  {    15,      7,     12,      0,      0, }, /* 317 */
-  {    15,     12,      3,      0,      0, }, /* 318 */
-  {    15,     21,     12,      0,      0, }, /* 319 */
-  {    15,     15,     12,      0,      0, }, /* 320 */
-  {    15,     26,     12,      0,      0, }, /* 321 */
-  {     8,      7,     12,      0,      0, }, /* 322 */
-  {     7,     17,     12,      0,      0, }, /* 323 */
-  {     7,      7,     12,      0,      0, }, /* 324 */
-  {     7,     21,     12,      0,      0, }, /* 325 */
-  {    40,     29,     12,      0,      0, }, /* 326 */
-  {    40,      7,     12,      0,      0, }, /* 327 */
-  {    40,     22,     12,      0,      0, }, /* 328 */
-  {    40,     18,     12,      0,      0, }, /* 329 */
-  {    45,      7,     12,      0,      0, }, /* 330 */
-  {    45,     14,     12,      0,      0, }, /* 331 */
-  {    50,      7,     12,      0,      0, }, /* 332 */
-  {    50,     12,      3,      0,      0, }, /* 333 */
-  {    24,      7,     12,      0,      0, }, /* 334 */
-  {    24,     12,      3,      0,      0, }, /* 335 */
-  {     6,      7,     12,      0,      0, }, /* 336 */
-  {     6,     12,      3,      0,      0, }, /* 337 */
-  {    51,      7,     12,      0,      0, }, /* 338 */
-  {    51,     12,      3,      0,      0, }, /* 339 */
-  {    31,      7,     12,      0,      0, }, /* 340 */
-  {    31,     12,      3,      0,      0, }, /* 341 */
-  {    31,     10,      5,      0,      0, }, /* 342 */
-  {    31,     21,     12,      0,      0, }, /* 343 */
-  {    31,      6,     12,      0,      0, }, /* 344 */
-  {    31,     23,     12,      0,      0, }, /* 345 */
-  {    31,     13,     12,      0,      0, }, /* 346 */
-  {    31,     15,     12,      0,      0, }, /* 347 */
-  {    37,     21,     12,      0,      0, }, /* 348 */
-  {    37,     17,     12,      0,      0, }, /* 349 */
-  {    37,     12,      3,      0,      0, }, /* 350 */
-  {    37,      1,      2,      0,      0, }, /* 351 */
-  {    37,     13,     12,      0,      0, }, /* 352 */
-  {    37,      7,     12,      0,      0, }, /* 353 */
-  {    37,      6,     12,      0,      0, }, /* 354 */
-  {    34,      7,     12,      0,      0, }, /* 355 */
-  {    34,     12,      3,      0,      0, }, /* 356 */
-  {    34,     10,      5,      0,      0, }, /* 357 */
-  {    34,     26,     12,      0,      0, }, /* 358 */
-  {    34,     21,     12,      0,      0, }, /* 359 */
-  {    34,     13,     12,      0,      0, }, /* 360 */
-  {    52,      7,     12,      0,      0, }, /* 361 */
-  {    39,      7,     12,      0,      0, }, /* 362 */
-  {    39,     10,     12,      0,      0, }, /* 363 */
-  {    39,     10,      5,      0,      0, }, /* 364 */
-  {    39,     13,     12,      0,      0, }, /* 365 */
-  {    39,     15,     12,      0,      0, }, /* 366 */
-  {    39,     26,     12,      0,      0, }, /* 367 */
-  {    31,     26,     12,      0,      0, }, /* 368 */
-  {     5,      7,     12,      0,      0, }, /* 369 */
-  {     5,     12,      3,      0,      0, }, /* 370 */
-  {     5,     10,      5,      0,      0, }, /* 371 */
-  {     5,     21,     12,      0,      0, }, /* 372 */
-  {    90,      7,     12,      0,      0, }, /* 373 */
-  {    90,     10,      5,      0,      0, }, /* 374 */
-  {    90,     12,      3,      0,      0, }, /* 375 */
-  {    90,     10,     12,      0,      0, }, /* 376 */
-  {    90,     13,     12,      0,      0, }, /* 377 */
-  {    90,     21,     12,      0,      0, }, /* 378 */
-  {    90,      6,     12,      0,      0, }, /* 379 */
-  {    27,     11,      3,      0,      0, }, /* 380 */
-  {    61,     12,      3,      0,      0, }, /* 381 */
-  {    61,     10,      5,      0,      0, }, /* 382 */
-  {    61,      7,     12,      0,      0, }, /* 383 */
-  {    61,     13,     12,      0,      0, }, /* 384 */
-  {    61,     21,     12,      0,      0, }, /* 385 */
-  {    61,     26,     12,      0,      0, }, /* 386 */
-  {    75,     12,      3,      0,      0, }, /* 387 */
-  {    75,     10,      5,      0,      0, }, /* 388 */
-  {    75,      7,     12,      0,      0, }, /* 389 */
-  {    75,     13,     12,      0,      0, }, /* 390 */
-  {    92,      7,     12,      0,      0, }, /* 391 */
-  {    92,     12,      3,      0,      0, }, /* 392 */
-  {    92,     10,      5,      0,      0, }, /* 393 */
-  {    92,     21,     12,      0,      0, }, /* 394 */
-  {    69,      7,     12,      0,      0, }, /* 395 */
-  {    69,     10,      5,      0,      0, }, /* 396 */
-  {    69,     12,      3,      0,      0, }, /* 397 */
-  {    69,     21,     12,      0,      0, }, /* 398 */
-  {    69,     13,     12,      0,      0, }, /* 399 */
-  {    72,     13,     12,      0,      0, }, /* 400 */
-  {    72,      7,     12,      0,      0, }, /* 401 */
-  {    72,      6,     12,      0,      0, }, /* 402 */
-  {    72,     21,     12,      0,      0, }, /* 403 */
-  {    75,     21,     12,      0,      0, }, /* 404 */
-  {     9,     10,      5,      0,      0, }, /* 405 */
-  {     9,      7,     12,      0,      0, }, /* 406 */
-  {    12,      5,     12,      0,      0, }, /* 407 */
-  {    12,      6,     12,      0,      0, }, /* 408 */
-  {    33,      5,     12,      0,  35332, }, /* 409 */
-  {    33,      5,     12,      0,   3814, }, /* 410 */
-  {    33,      9,     12,     63,      1, }, /* 411 */
-  {    33,      5,     12,     63,     -1, }, /* 412 */
-  {    33,      5,     12,     63,    -58, }, /* 413 */
-  {    33,      9,     12,      0,  -7615, }, /* 414 */
-  {    19,      5,     12,      0,      8, }, /* 415 */
-  {    19,      9,     12,      0,     -8, }, /* 416 */
-  {    19,      5,     12,      0,     74, }, /* 417 */
-  {    19,      5,     12,      0,     86, }, /* 418 */
-  {    19,      5,     12,      0,    100, }, /* 419 */
-  {    19,      5,     12,      0,    128, }, /* 420 */
-  {    19,      5,     12,      0,    112, }, /* 421 */
-  {    19,      5,     12,      0,    126, }, /* 422 */
-  {    19,      8,     12,      0,     -8, }, /* 423 */
-  {    19,      5,     12,      0,      9, }, /* 424 */
-  {    19,      9,     12,      0,    -74, }, /* 425 */
-  {    19,      8,     12,      0,     -9, }, /* 426 */
-  {    19,      5,     12,     21,  -7173, }, /* 427 */
-  {    19,      9,     12,      0,    -86, }, /* 428 */
-  {    19,      9,     12,      0,   -100, }, /* 429 */
-  {    19,      9,     12,      0,   -112, }, /* 430 */
-  {    19,      9,     12,      0,   -128, }, /* 431 */
-  {    19,      9,     12,      0,   -126, }, /* 432 */
-  {    27,      1,      3,      0,      0, }, /* 433 */
-  {     9,     27,      2,      0,      0, }, /* 434 */
-  {     9,     28,      2,      0,      0, }, /* 435 */
-  {     9,      2,      2,      0,      0, }, /* 436 */
-  {     9,      9,     12,      0,      0, }, /* 437 */
-  {     9,      5,     12,      0,      0, }, /* 438 */
-  {    19,      9,     12,     67,  -7517, }, /* 439 */
-  {    33,      9,     12,     71,  -8383, }, /* 440 */
-  {    33,      9,     12,     75,  -8262, }, /* 441 */
-  {    33,      9,     12,      0,     28, }, /* 442 */
-  {    33,      5,     12,      0,    -28, }, /* 443 */
-  {    33,     14,     12,      0,     16, }, /* 444 */
-  {    33,     14,     12,      0,    -16, }, /* 445 */
-  {    33,     14,     12,      0,      0, }, /* 446 */
-  {     9,     26,     12,      0,     26, }, /* 447 */
-  {     9,     26,     12,      0,    -26, }, /* 448 */
-  {     4,     26,     12,      0,      0, }, /* 449 */
-  {    17,      9,     12,      0,     48, }, /* 450 */
-  {    17,      5,     12,      0,    -48, }, /* 451 */
-  {    33,      9,     12,      0, -10743, }, /* 452 */
-  {    33,      9,     12,      0,  -3814, }, /* 453 */
-  {    33,      9,     12,      0, -10727, }, /* 454 */
-  {    33,      5,     12,      0, -10795, }, /* 455 */
-  {    33,      5,     12,      0, -10792, }, /* 456 */
-  {    33,      9,     12,      0, -10780, }, /* 457 */
-  {    33,      9,     12,      0, -10749, }, /* 458 */
-  {    33,      9,     12,      0, -10783, }, /* 459 */
-  {    33,      9,     12,      0, -10782, }, /* 460 */
-  {    33,      9,     12,      0, -10815, }, /* 461 */
-  {    10,      5,     12,      0,      0, }, /* 462 */
-  {    10,     26,     12,      0,      0, }, /* 463 */
-  {    10,     12,      3,      0,      0, }, /* 464 */
-  {    10,     21,     12,      0,      0, }, /* 465 */
-  {    10,     15,     12,      0,      0, }, /* 466 */
-  {    16,      5,     12,      0,  -7264, }, /* 467 */
-  {    58,      7,     12,      0,      0, }, /* 468 */
-  {    58,      6,     12,      0,      0, }, /* 469 */
-  {    58,     21,     12,      0,      0, }, /* 470 */
-  {    58,     12,      3,      0,      0, }, /* 471 */
-  {    22,     26,     12,      0,      0, }, /* 472 */
-  {    22,      6,     12,      0,      0, }, /* 473 */
-  {    22,     14,     12,      0,      0, }, /* 474 */
-  {    23,     10,      3,      0,      0, }, /* 475 */
-  {    26,      7,     12,      0,      0, }, /* 476 */
-  {    26,      6,     12,      0,      0, }, /* 477 */
-  {    29,      7,     12,      0,      0, }, /* 478 */
-  {    29,      6,     12,      0,      0, }, /* 479 */
-  {     3,      7,     12,      0,      0, }, /* 480 */
-  {    23,      7,     12,      0,      0, }, /* 481 */
-  {    23,     26,     12,      0,      0, }, /* 482 */
-  {    29,     26,     12,      0,      0, }, /* 483 */
-  {    22,      7,     12,      0,      0, }, /* 484 */
-  {    60,      7,     12,      0,      0, }, /* 485 */
-  {    60,      6,     12,      0,      0, }, /* 486 */
-  {    60,     26,     12,      0,      0, }, /* 487 */
-  {    85,      7,     12,      0,      0, }, /* 488 */
-  {    85,      6,     12,      0,      0, }, /* 489 */
-  {    85,     21,     12,      0,      0, }, /* 490 */
-  {    76,      7,     12,      0,      0, }, /* 491 */
-  {    76,      6,     12,      0,      0, }, /* 492 */
-  {    76,     21,     12,      0,      0, }, /* 493 */
-  {    76,     13,     12,      0,      0, }, /* 494 */
-  {    12,      7,     12,      0,      0, }, /* 495 */
-  {    12,     21,     12,      0,      0, }, /* 496 */
-  {    78,      7,     12,      0,      0, }, /* 497 */
-  {    78,     14,     12,      0,      0, }, /* 498 */
-  {    78,     12,      3,      0,      0, }, /* 499 */
-  {    78,     21,     12,      0,      0, }, /* 500 */
-  {    33,      9,     12,      0, -35332, }, /* 501 */
-  {    33,      9,     12,      0, -42280, }, /* 502 */
-  {    33,      9,     12,      0, -42308, }, /* 503 */
-  {    33,      9,     12,      0, -42319, }, /* 504 */
-  {    33,      9,     12,      0, -42315, }, /* 505 */
-  {    33,      9,     12,      0, -42305, }, /* 506 */
-  {    33,      9,     12,      0, -42258, }, /* 507 */
-  {    33,      9,     12,      0, -42282, }, /* 508 */
-  {    48,      7,     12,      0,      0, }, /* 509 */
-  {    48,     12,      3,      0,      0, }, /* 510 */
-  {    48,     10,      5,      0,      0, }, /* 511 */
-  {    48,     26,     12,      0,      0, }, /* 512 */
-  {    64,      7,     12,      0,      0, }, /* 513 */
-  {    64,     21,     12,      0,      0, }, /* 514 */
-  {    74,     10,      5,      0,      0, }, /* 515 */
-  {    74,      7,     12,      0,      0, }, /* 516 */
-  {    74,     12,      3,      0,      0, }, /* 517 */
-  {    74,     21,     12,      0,      0, }, /* 518 */
-  {    74,     13,     12,      0,      0, }, /* 519 */
-  {    68,     13,     12,      0,      0, }, /* 520 */
-  {    68,      7,     12,      0,      0, }, /* 521 */
-  {    68,     12,      3,      0,      0, }, /* 522 */
-  {    68,     21,     12,      0,      0, }, /* 523 */
-  {    73,      7,     12,      0,      0, }, /* 524 */
-  {    73,     12,      3,      0,      0, }, /* 525 */
-  {    73,     10,      5,      0,      0, }, /* 526 */
-  {    73,     21,     12,      0,      0, }, /* 527 */
-  {    83,     12,      3,      0,      0, }, /* 528 */
-  {    83,     10,      5,      0,      0, }, /* 529 */
-  {    83,      7,     12,      0,      0, }, /* 530 */
-  {    83,     21,     12,      0,      0, }, /* 531 */
-  {    83,     13,     12,      0,      0, }, /* 532 */
-  {    38,      6,     12,      0,      0, }, /* 533 */
-  {    67,      7,     12,      0,      0, }, /* 534 */
-  {    67,     12,      3,      0,      0, }, /* 535 */
-  {    67,     10,      5,      0,      0, }, /* 536 */
-  {    67,     13,     12,      0,      0, }, /* 537 */
-  {    67,     21,     12,      0,      0, }, /* 538 */
-  {    91,      7,     12,      0,      0, }, /* 539 */
-  {    91,     12,      3,      0,      0, }, /* 540 */
-  {    91,      6,     12,      0,      0, }, /* 541 */
-  {    91,     21,     12,      0,      0, }, /* 542 */
-  {    86,      7,     12,      0,      0, }, /* 543 */
-  {    86,     10,      5,      0,      0, }, /* 544 */
-  {    86,     12,      3,      0,      0, }, /* 545 */
-  {    86,     21,     12,      0,      0, }, /* 546 */
-  {    86,      6,     12,      0,      0, }, /* 547 */
-  {    86,     13,     12,      0,      0, }, /* 548 */
-  {    23,      7,      9,      0,      0, }, /* 549 */
-  {    23,      7,     10,      0,      0, }, /* 550 */
-  {     9,      4,      2,      0,      0, }, /* 551 */
-  {     9,      3,     12,      0,      0, }, /* 552 */
-  {    25,     25,     12,      0,      0, }, /* 553 */
-  {     0,     24,     12,      0,      0, }, /* 554 */
-  {     9,      6,      3,      0,      0, }, /* 555 */
-  {    35,      7,     12,      0,      0, }, /* 556 */
-  {    19,     14,     12,      0,      0, }, /* 557 */
-  {    19,     15,     12,      0,      0, }, /* 558 */
-  {    19,     26,     12,      0,      0, }, /* 559 */
-  {    70,      7,     12,      0,      0, }, /* 560 */
-  {    66,      7,     12,      0,      0, }, /* 561 */
-  {    41,      7,     12,      0,      0, }, /* 562 */
-  {    41,     15,     12,      0,      0, }, /* 563 */
-  {    18,      7,     12,      0,      0, }, /* 564 */
-  {    18,     14,     12,      0,      0, }, /* 565 */
-  {   117,      7,     12,      0,      0, }, /* 566 */
-  {   117,     12,      3,      0,      0, }, /* 567 */
-  {    59,      7,     12,      0,      0, }, /* 568 */
-  {    59,     21,     12,      0,      0, }, /* 569 */
-  {    42,      7,     12,      0,      0, }, /* 570 */
-  {    42,     21,     12,      0,      0, }, /* 571 */
-  {    42,     14,     12,      0,      0, }, /* 572 */
-  {    13,      9,     12,      0,     40, }, /* 573 */
-  {    13,      5,     12,      0,    -40, }, /* 574 */
-  {    46,      7,     12,      0,      0, }, /* 575 */
-  {    44,      7,     12,      0,      0, }, /* 576 */
-  {    44,     13,     12,      0,      0, }, /* 577 */
-  {   105,      7,     12,      0,      0, }, /* 578 */
-  {   103,      7,     12,      0,      0, }, /* 579 */
-  {   103,     21,     12,      0,      0, }, /* 580 */
-  {   109,      7,     12,      0,      0, }, /* 581 */
-  {    11,      7,     12,      0,      0, }, /* 582 */
-  {    80,      7,     12,      0,      0, }, /* 583 */
-  {    80,     21,     12,      0,      0, }, /* 584 */
-  {    80,     15,     12,      0,      0, }, /* 585 */
-  {   119,      7,     12,      0,      0, }, /* 586 */
-  {   119,     26,     12,      0,      0, }, /* 587 */
-  {   119,     15,     12,      0,      0, }, /* 588 */
-  {   115,      7,     12,      0,      0, }, /* 589 */
-  {   115,     15,     12,      0,      0, }, /* 590 */
-  {    65,      7,     12,      0,      0, }, /* 591 */
-  {    65,     15,     12,      0,      0, }, /* 592 */
-  {    65,     21,     12,      0,      0, }, /* 593 */
-  {    71,      7,     12,      0,      0, }, /* 594 */
-  {    71,     21,     12,      0,      0, }, /* 595 */
-  {    97,      7,     12,      0,      0, }, /* 596 */
-  {    96,      7,     12,      0,      0, }, /* 597 */
-  {    30,      7,     12,      0,      0, }, /* 598 */
-  {    30,     12,      3,      0,      0, }, /* 599 */
-  {    30,     15,     12,      0,      0, }, /* 600 */
-  {    30,     21,     12,      0,      0, }, /* 601 */
-  {    87,      7,     12,      0,      0, }, /* 602 */
-  {    87,     15,     12,      0,      0, }, /* 603 */
-  {    87,     21,     12,      0,      0, }, /* 604 */
-  {   116,      7,     12,      0,      0, }, /* 605 */
-  {   116,     15,     12,      0,      0, }, /* 606 */
-  {   111,      7,     12,      0,      0, }, /* 607 */
-  {   111,     26,     12,      0,      0, }, /* 608 */
-  {   111,     12,      3,      0,      0, }, /* 609 */
-  {   111,     15,     12,      0,      0, }, /* 610 */
-  {   111,     21,     12,      0,      0, }, /* 611 */
-  {    77,      7,     12,      0,      0, }, /* 612 */
-  {    77,     21,     12,      0,      0, }, /* 613 */
-  {    82,      7,     12,      0,      0, }, /* 614 */
-  {    82,     15,     12,      0,      0, }, /* 615 */
-  {    81,      7,     12,      0,      0, }, /* 616 */
-  {    81,     15,     12,      0,      0, }, /* 617 */
-  {   120,      7,     12,      0,      0, }, /* 618 */
-  {   120,     21,     12,      0,      0, }, /* 619 */
-  {   120,     15,     12,      0,      0, }, /* 620 */
-  {    88,      7,     12,      0,      0, }, /* 621 */
-  {     0,     15,     12,      0,      0, }, /* 622 */
-  {    93,     10,      5,      0,      0, }, /* 623 */
-  {    93,     12,      3,      0,      0, }, /* 624 */
-  {    93,      7,     12,      0,      0, }, /* 625 */
-  {    93,     21,     12,      0,      0, }, /* 626 */
-  {    93,     15,     12,      0,      0, }, /* 627 */
-  {    93,     13,     12,      0,      0, }, /* 628 */
-  {    84,     12,      3,      0,      0, }, /* 629 */
-  {    84,     10,      5,      0,      0, }, /* 630 */
-  {    84,      7,     12,      0,      0, }, /* 631 */
-  {    84,     21,     12,      0,      0, }, /* 632 */
-  {    84,      1,      2,      0,      0, }, /* 633 */
-  {   100,      7,     12,      0,      0, }, /* 634 */
-  {   100,     13,     12,      0,      0, }, /* 635 */
-  {    95,     12,      3,      0,      0, }, /* 636 */
-  {    95,      7,     12,      0,      0, }, /* 637 */
-  {    95,     10,      5,      0,      0, }, /* 638 */
-  {    95,     13,     12,      0,      0, }, /* 639 */
-  {    95,     21,     12,      0,      0, }, /* 640 */
-  {   110,      7,     12,      0,      0, }, /* 641 */
-  {   110,     12,      3,      0,      0, }, /* 642 */
-  {   110,     21,     12,      0,      0, }, /* 643 */
-  {    99,     12,      3,      0,      0, }, /* 644 */
-  {    99,     10,      5,      0,      0, }, /* 645 */
-  {    99,      7,     12,      0,      0, }, /* 646 */
-  {    99,     21,     12,      0,      0, }, /* 647 */
-  {    99,     13,     12,      0,      0, }, /* 648 */
-  {    47,     15,     12,      0,      0, }, /* 649 */
-  {   107,      7,     12,      0,      0, }, /* 650 */
-  {   107,     10,      5,      0,      0, }, /* 651 */
-  {   107,     12,      3,      0,      0, }, /* 652 */
-  {   107,     21,     12,      0,      0, }, /* 653 */
-  {   108,      7,     12,      0,      0, }, /* 654 */
-  {   108,     12,      3,      0,      0, }, /* 655 */
-  {   108,     10,      5,      0,      0, }, /* 656 */
-  {   108,     13,     12,      0,      0, }, /* 657 */
-  {   106,     12,      3,      0,      0, }, /* 658 */
-  {   106,     10,      5,      0,      0, }, /* 659 */
-  {   106,      7,     12,      0,      0, }, /* 660 */
-  {   106,     10,      3,      0,      0, }, /* 661 */
-  {   123,      7,     12,      0,      0, }, /* 662 */
-  {   123,     10,      3,      0,      0, }, /* 663 */
-  {   123,     10,      5,      0,      0, }, /* 664 */
-  {   123,     12,      3,      0,      0, }, /* 665 */
-  {   123,     21,     12,      0,      0, }, /* 666 */
-  {   123,     13,     12,      0,      0, }, /* 667 */
-  {   122,      7,     12,      0,      0, }, /* 668 */
-  {   122,     10,      3,      0,      0, }, /* 669 */
-  {   122,     10,      5,      0,      0, }, /* 670 */
-  {   122,     12,      3,      0,      0, }, /* 671 */
-  {   122,     21,     12,      0,      0, }, /* 672 */
-  {   113,      7,     12,      0,      0, }, /* 673 */
-  {   113,     10,      5,      0,      0, }, /* 674 */
-  {   113,     12,      3,      0,      0, }, /* 675 */
-  {   113,     21,     12,      0,      0, }, /* 676 */
-  {   113,     13,     12,      0,      0, }, /* 677 */
-  {   101,      7,     12,      0,      0, }, /* 678 */
-  {   101,     12,      3,      0,      0, }, /* 679 */
-  {   101,     10,      5,      0,      0, }, /* 680 */
-  {   101,     13,     12,      0,      0, }, /* 681 */
-  {   124,      9,     12,      0,     32, }, /* 682 */
-  {   124,      5,     12,      0,    -32, }, /* 683 */
-  {   124,     13,     12,      0,      0, }, /* 684 */
-  {   124,     15,     12,      0,      0, }, /* 685 */
-  {   124,      7,     12,      0,      0, }, /* 686 */
-  {   121,      7,     12,      0,      0, }, /* 687 */
-  {    62,      7,     12,      0,      0, }, /* 688 */
-  {    62,     14,     12,      0,      0, }, /* 689 */
-  {    62,     21,     12,      0,      0, }, /* 690 */
-  {    79,      7,     12,      0,      0, }, /* 691 */
-  {   114,      7,     12,      0,      0, }, /* 692 */
-  {   114,     13,     12,      0,      0, }, /* 693 */
-  {   114,     21,     12,      0,      0, }, /* 694 */
-  {   102,      7,     12,      0,      0, }, /* 695 */
-  {   102,     12,      3,      0,      0, }, /* 696 */
-  {   102,     21,     12,      0,      0, }, /* 697 */
-  {   118,      7,     12,      0,      0, }, /* 698 */
-  {   118,     12,      3,      0,      0, }, /* 699 */
-  {   118,     21,     12,      0,      0, }, /* 700 */
-  {   118,     26,     12,      0,      0, }, /* 701 */
-  {   118,      6,     12,      0,      0, }, /* 702 */
-  {   118,     13,     12,      0,      0, }, /* 703 */
-  {   118,     15,     12,      0,      0, }, /* 704 */
-  {    98,      7,     12,      0,      0, }, /* 705 */
-  {    98,     10,      5,      0,      0, }, /* 706 */
-  {    98,     12,      3,      0,      0, }, /* 707 */
-  {    98,      6,     12,      0,      0, }, /* 708 */
-  {   104,      7,     12,      0,      0, }, /* 709 */
-  {   104,     26,     12,      0,      0, }, /* 710 */
-  {   104,     12,      3,      0,      0, }, /* 711 */
-  {   104,     21,     12,      0,      0, }, /* 712 */
-  {     9,     10,      3,      0,      0, }, /* 713 */
-  {    19,     12,      3,      0,      0, }, /* 714 */
-  {   112,      7,     12,      0,      0, }, /* 715 */
-  {   112,     15,     12,      0,      0, }, /* 716 */
-  {   112,     12,      3,      0,      0, }, /* 717 */
-  {     9,     26,     11,      0,      0, }, /* 718 */
-  {    26,     26,     12,      0,      0, }, /* 719 */
-};
-
-const pcre_uint8 PRIV(ucd_stage1)[] = { /* 8704 bytes */
-  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, /* U+0000 */
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* U+0800 */
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 41, 41, 42, 43, 44, 45, /* U+1000 */
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, /* U+1800 */
- 62, 63, 64, 65, 66, 66, 67, 68, 69, 70, 71, 72, 73, 71, 74, 75, /* U+2000 */
- 76, 76, 66, 77, 66, 66, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, /* U+2800 */
- 88, 89, 90, 91, 92, 93, 94, 71, 95, 95, 95, 95, 95, 95, 95, 95, /* U+3000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+3800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+4000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 96, 95, 95, 95, 95, /* U+4800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+5000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+5800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+6000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+6800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+7000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+7800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+8000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+8800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+9000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 97, /* U+9800 */
- 98, 99, 99, 99, 99, 99, 99, 99, 99,100,101,101,102,103,104,105, /* U+A000 */
-106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,114, /* U+A800 */
-115,116,117,118,119,120,114,115,116,117,118,119,120,114,115,116, /* U+B000 */
-117,118,119,120,114,115,116,117,118,119,120,114,115,116,117,118, /* U+B800 */
-119,120,114,115,116,117,118,119,120,114,115,116,117,118,119,120, /* U+C000 */
-114,115,116,117,118,119,120,114,115,116,117,118,119,120,114,115, /* U+C800 */
-116,117,118,119,120,114,115,116,117,118,119,120,114,115,116,121, /* U+D000 */
-122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122, /* U+D800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+E000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+E800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F000 */
-123,123, 95, 95,124,125,126,127,128,128,129,130,131,132,133,134, /* U+F800 */
-135,136,137,138,139,140,141,142,143,144,145,139,146,146,147,139, /* U+10000 */
-148,149,150,151,152,153,154,155,156,139,139,139,157,139,139,139, /* U+10800 */
-158,159,160,161,162,163,164,139,139,165,139,166,167,168,139,139, /* U+11000 */
-139,169,139,139,139,170,139,139,139,139,139,139,139,139,139,139, /* U+11800 */
-171,171,171,171,171,171,171,172,173,139,139,139,139,139,139,139, /* U+12000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+12800 */
-174,174,174,174,174,174,174,174,175,139,139,139,139,139,139,139, /* U+13000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+13800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+14000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+14800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+15000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+15800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+16000 */
-176,176,176,176,177,178,179,180,139,139,139,139,139,139,181,182, /* U+16800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+17000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+17800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+18000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+18800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+19000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+19800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1A800 */
-183,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1B000 */
-139,139,139,139,139,139,139,139,184,185,139,139,139,139,139,139, /* U+1B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1C800 */
- 71,186,187,188,189,139,190,139,191,192,193,194,195,196,197,198, /* U+1D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1E000 */
-199,200,139,139,139,139,139,139,139,139,139,139,201,202,139,139, /* U+1E800 */
-203,204,205,206,207,139,208,209, 71,210,211,212,213,214,215,216, /* U+1F000 */
-217,218,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1F800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+20000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+20800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+21000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+21800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+22000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+22800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+23000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+23800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+24000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+24800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+25000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+25800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+26000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+26800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+27000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+27800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+28000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+28800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+29000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+29800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,219, 95, 95, /* U+2A000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+2A800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,220, 95, /* U+2B000 */
-221,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2F000 */
- 95, 95, 95, 95,221,139,139,139,139,139,139,139,139,139,139,139, /* U+2F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+30000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+30800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+31000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+31800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+32000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+32800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+33000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+33800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+34000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+34800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+35000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+35800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+36000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+36800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+37000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+37800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+38000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+38800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+39000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+39800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+40000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+40800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+41000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+41800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+42000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+42800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+43000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+43800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+44000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+44800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+45000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+45800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+46000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+46800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+47000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+47800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+48000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+48800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+49000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+49800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+50000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+50800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+51000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+51800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+52000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+52800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+53000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+53800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+54000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+54800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+55000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+55800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+56000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+56800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+57000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+57800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+58000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+58800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+59000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+59800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+60000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+60800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+61000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+61800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+62000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+62800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+63000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+63800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+64000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+64800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+65000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+65800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+66000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+66800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+67000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+67800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+68000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+68800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+69000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+69800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+70000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+70800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+71000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+71800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+72000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+72800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+73000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+73800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+74000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+74800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+75000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+75800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+76000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+76800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+77000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+77800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+78000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+78800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+79000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+79800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+80000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+80800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+81000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+81800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+82000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+82800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+83000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+83800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+84000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+84800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+85000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+85800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+86000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+86800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+87000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+87800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+88000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+88800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+89000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+89800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+90000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+90800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+91000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+91800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+92000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+92800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+93000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+93800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+94000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+94800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+95000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+95800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+96000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+96800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+97000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+97800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+98000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+98800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+99000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+99800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AF800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BF800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CF800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DF800 */
-222,223,224,225,223,223,223,223,223,223,223,223,223,223,223,223, /* U+E0000 */
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, /* U+E0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+ED000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+ED800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EF800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F0000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F0800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F1000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F1800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F2000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F2800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F3000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F3800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F4000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F4800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F5000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F5800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F6000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F6800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F7000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F7800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F8000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F8800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F9000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F9800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FA000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FA800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FB000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FB800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FC000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FC800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FD000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FD800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FE000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FE800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FF000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,226, /* U+FF800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+100000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+100800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+101000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+101800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+102000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+102800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+103000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+103800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+104000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+104800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+105000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+105800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+106000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+106800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+107000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+107800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+108000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+108800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+109000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+109800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10A000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10A800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10B000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10B800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10C000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10C800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10D000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10D800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10E000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10E800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10F000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,226, /* U+10F800 */
-};
-
-const pcre_uint16 PRIV(ucd_stage2)[] = { /* 58112 bytes, block = 128 */
-/* block 0 */
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  4,  4,  4,  5,  4,  4,  4,  6,  7,  4,  8,  4,  9,  4,  4,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  4,  4,  8,  8,  8,  4,
-  4, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 11, 11, 11, 11,
- 11, 11, 11, 13, 11, 11, 11, 11, 11, 11, 11,  6,  4,  7, 14, 15,
- 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 16, 16, 16, 16,
- 16, 16, 16, 18, 16, 16, 16, 16, 16, 16, 16,  6,  8,  7,  8,  0,
-
-/* block 1 */
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  4,  5,  5,  5,  5, 19,  4, 14, 19, 20, 21,  8, 22, 19, 14,
- 19,  8, 23, 23, 14, 24,  4,  4, 14, 23, 20, 25, 23, 23, 23,  4,
- 11, 11, 11, 11, 11, 26, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11,  8, 11, 11, 11, 11, 11, 11, 11, 27,
- 16, 16, 16, 16, 16, 28, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16,  8, 16, 16, 16, 16, 16, 16, 16, 29,
-
-/* block 2 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 32, 33, 30, 31, 30, 31, 30, 31, 33, 30, 31, 30, 31, 30, 31, 30,
- 31, 30, 31, 30, 31, 30, 31, 30, 31, 33, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 34, 30, 31, 30, 31, 30, 31, 35,
-
-/* block 3 */
- 36, 37, 30, 31, 30, 31, 38, 30, 31, 39, 39, 30, 31, 33, 40, 41,
- 42, 30, 31, 39, 43, 44, 45, 46, 30, 31, 47, 33, 45, 48, 49, 50,
- 30, 31, 30, 31, 30, 31, 51, 30, 31, 51, 33, 33, 30, 31, 51, 30,
- 31, 52, 52, 30, 31, 30, 31, 53, 30, 31, 33, 20, 30, 31, 33, 54,
- 20, 20, 20, 20, 55, 56, 57, 58, 59, 60, 61, 62, 63, 30, 31, 30,
- 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 64, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 33, 65, 66, 67, 30, 31, 68, 69, 30, 31, 30, 31, 30, 31, 30, 31,
-
-/* block 4 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 70, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 33, 33, 33, 33, 33, 33, 71, 30, 31, 72, 73, 74,
- 74, 30, 31, 75, 76, 77, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 78, 79, 80, 81, 82, 33, 83, 83, 33, 84, 33, 85, 86, 33, 33, 33,
- 83, 87, 33, 88, 33, 89, 90, 33, 91, 92, 33, 93, 94, 33, 33, 92,
- 33, 95, 96, 33, 33, 97, 33, 33, 33, 33, 33, 33, 33, 98, 33, 33,
-
-/* block 5 */
- 99, 33, 33, 99, 33, 33, 33,100, 99,101,102,102,103, 33, 33, 33,
- 33, 33,104, 33, 20, 33, 33, 33, 33, 33, 33, 33, 33, 33,105, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
-106,106,106,106,106,106,106,106,106,107,107,107,107,107,107,107,
-107,107, 14, 14, 14, 14,107,107,107,107,107,107,107,107,107,107,
-107,107, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-106,106,106,106,106, 14, 14, 14, 14, 14,108,108,107, 14,107, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-
-/* block 6 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,110,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-111,112,111,112,107,113,111,112,114,114,115,116,116,116,  4,117,
-
-/* block 7 */
-114,114,114,114,113, 14,118,  4,119,119,119,114,120,114,121,121,
-122,123,124,123,123,125,123,123,126,127,128,123,129,123,123,123,
-130,131,114,132,123,123,133,123,123,134,123,123,135,136,136,136,
-122,137,138,137,137,139,137,137,140,141,142,137,143,137,137,137,
-144,145,146,147,137,137,148,137,137,149,137,137,150,151,151,152,
-153,154,155,155,155,156,157,158,111,112,111,112,111,112,111,112,
-111,112,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-161,162,163,164,165,166,167,111,112,168,111,112,122,169,169,169,
-
-/* block 8 */
-170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
-171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
-171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
-172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
-172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
-173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-
-/* block 9 */
-174,175,176,177,177,109,109,177,178,178,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-179,174,175,174,175,174,175,174,175,174,175,174,175,174,175,180,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-
-/* block 10 */
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-114,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
-181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
-181,181,181,181,181,181,181,114,114,182,183,183,183,183,183,183,
-114,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,
-184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,
-
-/* block 11 */
-184,184,184,184,184,184,184,185,114,  4,186,114,114,187,187,188,
-114,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
-189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
-189,189,189,189,189,189,189,189,189,189,189,189,189,189,190,189,
-191,189,189,191,189,189,191,189,114,114,114,114,114,114,114,114,
-192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,
-192,192,192,192,192,192,192,192,192,192,192,114,114,114,114,114,
-192,192,192,191,191,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 12 */
-193,193,193,193,193, 22,194,194,194,195,195,196,  4,195,197,197,
-198,198,198,198,198,198,198,198,198,198,198,  4, 22,114,195,  4,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-107,199,199,199,199,199,199,199,199,199,199,109,109,109,109,109,
-109,109,109,109,109,109,198,198,198,198,198,198,198,198,198,198,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,195,195,195,195,199,199,
-109,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 13 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,195,199,198,198,198,198,198,198,198, 22,197,198,
-198,198,198,198,198,200,200,198,198,197,198,198,198,198,199,199,
-201,201,201,201,201,201,201,201,201,201,199,199,199,197,197,199,
-
-/* block 14 */
-202,202,202,202,202,202,202,202,202,202,202,202,202,202,114,203,
-204,205,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
-204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
-205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,
-205,205,205,205,205,205,205,205,205,205,205,114,114,204,204,204,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 15 */
-206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,
-206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,
-206,206,206,206,206,206,207,207,207,207,207,207,207,207,207,207,
-207,206,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-208,208,208,208,208,208,208,208,208,208,209,209,209,209,209,209,
-209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,
-209,209,209,209,209,209,209,209,209,209,209,210,210,210,210,210,
-210,210,210,210,211,211,212,213,213,213,211,114,114,114,114,114,
-
-/* block 16 */
-214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,
-214,214,214,214,214,214,215,215,215,215,216,215,215,215,215,215,
-215,215,215,215,216,215,215,215,216,215,215,215,215,215,114,114,
-217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,114,
-218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,
-218,218,218,218,218,218,218,218,218,219,219,219,114,114,220,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 17 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,198,198,198,198,198,198,198,198,198,198,198,198,
-198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,
-
-/* block 18 */
-221,221,221,222,223,223,223,223,223,223,223,223,223,223,223,223,
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-223,223,223,223,223,223,223,223,223,223,221,222,221,223,222,222,
-222,221,221,221,221,221,221,221,221,222,222,222,222,221,222,222,
-223,109,109,221,221,221,221,221,223,223,223,223,223,223,223,223,
-223,223,221,221,  4,  4,224,224,224,224,224,224,224,224,224,224,
-225,226,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-
-/* block 19 */
-227,228,229,229,114,227,227,227,227,227,227,227,227,114,114,227,
-227,114,114,227,227,227,227,227,227,227,227,227,227,227,227,227,
-227,227,227,227,227,227,227,227,227,114,227,227,227,227,227,227,
-227,114,227,114,114,114,227,227,227,227,114,114,228,227,230,229,
-229,228,228,228,228,114,114,229,229,114,114,229,229,228,227,114,
-114,114,114,114,114,114,114,230,114,114,114,114,227,227,114,227,
-227,227,228,228,114,114,231,231,231,231,231,231,231,231,231,231,
-227,227,232,232,233,233,233,233,233,233,234,232,114,114,114,114,
-
-/* block 20 */
-114,235,235,236,114,237,237,237,237,237,237,114,114,114,114,237,
-237,114,114,237,237,237,237,237,237,237,237,237,237,237,237,237,
-237,237,237,237,237,237,237,237,237,114,237,237,237,237,237,237,
-237,114,237,237,114,237,237,114,237,237,114,114,235,114,236,236,
-236,235,235,114,114,114,114,235,235,114,114,235,235,235,114,114,
-114,235,114,114,114,114,114,114,114,237,237,237,237,114,237,114,
-114,114,114,114,114,114,238,238,238,238,238,238,238,238,238,238,
-235,235,237,237,237,235,114,114,114,114,114,114,114,114,114,114,
-
-/* block 21 */
-114,239,239,240,114,241,241,241,241,241,241,241,241,241,114,241,
-241,241,114,241,241,241,241,241,241,241,241,241,241,241,241,241,
-241,241,241,241,241,241,241,241,241,114,241,241,241,241,241,241,
-241,114,241,241,114,241,241,241,241,241,114,114,239,241,240,240,
-240,239,239,239,239,239,114,239,239,240,114,240,240,239,114,114,
-241,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-241,241,239,239,114,114,242,242,242,242,242,242,242,242,242,242,
-243,244,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 22 */
-114,245,246,246,114,247,247,247,247,247,247,247,247,114,114,247,
-247,114,114,247,247,247,247,247,247,247,247,247,247,247,247,247,
-247,247,247,247,247,247,247,247,247,114,247,247,247,247,247,247,
-247,114,247,247,114,247,247,247,247,247,114,114,245,247,248,245,
-246,245,245,245,245,114,114,246,246,114,114,246,246,245,114,114,
-114,114,114,114,114,114,245,248,114,114,114,114,247,247,114,247,
-247,247,245,245,114,114,249,249,249,249,249,249,249,249,249,249,
-250,247,251,251,251,251,251,251,114,114,114,114,114,114,114,114,
-
-/* block 23 */
-114,114,252,253,114,253,253,253,253,253,253,114,114,114,253,253,
-253,114,253,253,253,253,114,114,114,253,253,114,253,114,253,253,
-114,114,114,253,253,114,114,114,253,253,253,114,114,114,253,253,
-253,253,253,253,253,253,253,253,253,253,114,114,114,114,254,255,
-252,255,255,114,114,114,255,255,255,114,255,255,255,252,114,114,
-253,114,114,114,114,114,114,254,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,256,256,256,256,256,256,256,256,256,256,
-257,257,257,258,258,258,258,258,258,259,258,114,114,114,114,114,
-
-/* block 24 */
-260,261,261,261,114,262,262,262,262,262,262,262,262,114,262,262,
-262,114,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,114,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,114,114,114,262,260,260,
-260,261,261,261,261,114,260,260,260,114,260,260,260,260,114,114,
-114,114,114,114,114,260,260,114,262,262,114,114,114,114,114,114,
-262,262,260,260,114,114,263,263,263,263,263,263,263,263,263,263,
-114,114,114,114,114,114,114,114,264,264,264,264,264,264,264,265,
-
-/* block 25 */
-114,266,267,267,114,268,268,268,268,268,268,268,268,114,268,268,
-268,114,268,268,268,268,268,268,268,268,268,268,268,268,268,268,
-268,268,268,268,268,268,268,268,268,114,268,268,268,268,268,268,
-268,268,268,268,114,268,268,268,268,268,114,114,266,268,267,266,
-267,267,269,267,267,114,266,267,267,114,267,267,266,266,114,114,
-114,114,114,114,114,269,269,114,114,114,114,114,114,114,268,114,
-268,268,266,266,114,114,270,270,270,270,270,270,270,270,270,270,
-114,268,268,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 26 */
-114,271,272,272,114,273,273,273,273,273,273,273,273,114,273,273,
-273,114,273,273,273,273,273,273,273,273,273,273,273,273,273,273,
-273,273,273,273,273,273,273,273,273,273,273,273,273,273,273,273,
-273,273,273,273,273,273,273,273,273,273,273,114,114,273,274,272,
-272,271,271,271,271,114,272,272,272,114,272,272,272,271,273,114,
-114,114,114,114,114,114,114,274,114,114,114,114,114,114,114,114,
-273,273,271,271,114,114,275,275,275,275,275,275,275,275,275,275,
-276,276,276,276,276,276,114,114,114,277,273,273,273,273,273,273,
-
-/* block 27 */
-114,114,278,278,114,279,279,279,279,279,279,279,279,279,279,279,
-279,279,279,279,279,279,279,114,114,114,279,279,279,279,279,279,
-279,279,279,279,279,279,279,279,279,279,279,279,279,279,279,279,
-279,279,114,279,279,279,279,279,279,279,279,279,114,279,114,114,
-279,279,279,279,279,279,279,114,114,114,280,114,114,114,114,281,
-278,278,280,280,280,114,280,114,278,278,278,278,278,278,278,281,
-114,114,114,114,114,114,282,282,282,282,282,282,282,282,282,282,
-114,114,278,278,283,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 28 */
-114,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,
-284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,
-284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,
-284,285,284,286,285,285,285,285,285,285,285,114,114,114,114,  5,
-284,284,284,284,284,284,287,285,285,285,285,285,285,285,285,288,
-289,289,289,289,289,289,289,289,289,289,288,288,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 29 */
-114,290,290,114,290,114,114,290,290,114,290,114,114,290,114,114,
-114,114,114,114,290,290,290,290,114,290,290,290,290,290,290,290,
-114,290,290,290,114,290,114,290,114,114,290,290,114,290,290,290,
-290,291,290,292,291,291,291,291,291,291,114,291,291,290,114,114,
-290,290,290,290,290,114,293,114,291,291,291,291,291,291,114,114,
-294,294,294,294,294,294,294,294,294,294,114,114,290,290,290,290,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 30 */
-295,296,296,296,297,297,297,297,297,297,297,297,297,297,297,297,
-297,297,297,296,297,296,296,296,298,298,296,296,296,296,296,296,
-299,299,299,299,299,299,299,299,299,299,300,300,300,300,300,300,
-300,300,300,300,296,298,296,298,296,298,301,302,301,302,303,303,
-295,295,295,295,295,295,295,295,114,295,295,295,295,295,295,295,
-295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
-295,295,295,295,295,295,295,295,295,295,295,295,295,114,114,114,
-114,298,298,298,298,298,298,298,298,298,298,298,298,298,298,303,
-
-/* block 31 */
-298,298,298,298,298,297,298,298,295,295,295,295,295,298,298,298,
-298,298,298,298,298,298,298,298,114,298,298,298,298,298,298,298,
-298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
-298,298,298,298,298,298,298,298,298,298,298,298,298,114,296,296,
-296,296,296,296,296,296,298,296,296,296,296,296,296,114,296,296,
-297,297,297,297,297, 19, 19, 19, 19,297,297,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 32 */
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-304,304,304,304,304,304,304,304,304,304,304,305,305,306,306,306,
-306,307,306,306,306,306,306,306,305,306,306,307,307,306,306,304,
-308,308,308,308,308,308,308,308,308,308,309,309,309,309,309,309,
-304,304,304,304,304,304,307,307,306,306,304,304,304,304,306,306,
-306,304,305,305,305,304,304,305,305,305,305,305,305,305,304,304,
-304,306,306,306,306,304,304,304,304,304,304,304,304,304,304,304,
-
-/* block 33 */
-304,304,306,305,307,306,306,305,305,305,305,305,305,306,304,305,
-308,308,308,308,308,308,308,308,308,308,305,305,305,306,310,310,
-311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,
-311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,
-311,311,311,311,311,311,114,311,114,114,114,114,114,311,114,114,
-312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,
-312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,
-312,312,312,312,312,312,312,312,312,312,312,  4,313,312,312,312,
-
-/* block 34 */
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-
-/* block 35 */
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,315,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-
-/* block 36 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,114,317,317,317,317,114,114,
-317,317,317,317,317,317,317,114,317,114,317,317,317,317,114,114,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-
-/* block 37 */
-317,317,317,317,317,317,317,317,317,114,317,317,317,317,114,114,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,114,317,317,317,317,114,114,317,317,317,317,317,317,317,114,
-317,114,317,317,317,317,114,114,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-
-/* block 38 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,114,317,317,317,317,114,114,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,114,114,318,318,318,
-319,319,319,319,319,319,319,319,319,320,320,320,320,320,320,320,
-320,320,320,320,320,320,320,320,320,320,320,320,320,114,114,114,
-
-/* block 39 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-321,321,321,321,321,321,321,321,321,321,114,114,114,114,114,114,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 40 */
-323,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-
-/* block 41 */
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-
-/* block 42 */
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,325,325,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-
-/* block 43 */
-326,327,327,327,327,327,327,327,327,327,327,327,327,327,327,327,
-327,327,327,327,327,327,327,327,327,327,327,328,329,114,114,114,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,  4,  4,  4,331,331,
-331,330,330,330,330,330,330,330,330,114,114,114,114,114,114,114,
-
-/* block 44 */
-332,332,332,332,332,332,332,332,332,332,332,332,332,114,332,332,
-332,332,333,333,333,114,114,114,114,114,114,114,114,114,114,114,
-334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,
-334,334,335,335,335,  4,  4,114,114,114,114,114,114,114,114,114,
-336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,
-336,336,337,337,114,114,114,114,114,114,114,114,114,114,114,114,
-338,338,338,338,338,338,338,338,338,338,338,338,338,114,338,338,
-338,114,339,339,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 45 */
-340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
-340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
-340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
-340,340,340,340,341,341,342,341,341,341,341,341,341,341,342,342,
-342,342,342,342,342,342,341,342,342,341,341,341,341,341,341,341,
-341,341,341,341,343,343,343,344,343,343,343,345,340,341,114,114,
-346,346,346,346,346,346,346,346,346,346,114,114,114,114,114,114,
-347,347,347,347,347,347,347,347,347,347,114,114,114,114,114,114,
-
-/* block 46 */
-348,348,  4,  4,348,  4,349,348,348,348,348,350,350,350,351,114,
-352,352,352,352,352,352,352,352,352,352,114,114,114,114,114,114,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,354,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,114,114,114,114,114,114,114,114,
-
-/* block 47 */
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,350,353,114,114,114,114,114,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,114,114,114,114,114,114,114,114,114,114,
-
-/* block 48 */
-355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,
-355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,114,
-356,356,356,357,357,357,357,356,356,357,357,357,114,114,114,114,
-357,357,356,357,357,357,357,357,357,356,356,356,114,114,114,114,
-358,114,114,114,359,359,360,360,360,360,360,360,360,360,360,360,
-361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,
-361,361,361,361,361,361,361,361,361,361,361,361,361,361,114,114,
-361,361,361,361,361,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 49 */
-362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,
-362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,
-362,362,362,362,362,362,362,362,362,362,362,362,114,114,114,114,
-363,363,363,363,363,364,364,364,363,363,364,363,363,363,363,363,
-363,362,362,362,362,362,362,362,363,363,114,114,114,114,114,114,
-365,365,365,365,365,365,365,365,365,365,366,114,114,114,367,367,
-368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,
-368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,
-
-/* block 50 */
-369,369,369,369,369,369,369,369,369,369,369,369,369,369,369,369,
-369,369,369,369,369,369,369,370,370,371,371,370,114,114,372,372,
-373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,
-373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,
-373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,
-373,373,373,373,373,374,375,374,375,375,375,375,375,375,375,114,
-375,376,375,376,376,375,375,375,375,375,375,375,375,374,374,374,
-374,374,374,375,375,375,375,375,375,375,375,375,375,114,114,375,
-
-/* block 51 */
-377,377,377,377,377,377,377,377,377,377,114,114,114,114,114,114,
-377,377,377,377,377,377,377,377,377,377,114,114,114,114,114,114,
-378,378,378,378,378,378,378,379,378,378,378,378,378,378,114,114,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,380,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 52 */
-381,381,381,381,382,383,383,383,383,383,383,383,383,383,383,383,
-383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
-383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
-383,383,383,383,381,382,381,381,381,381,381,382,381,382,382,382,
-382,382,381,382,382,383,383,383,383,383,383,383,114,114,114,114,
-384,384,384,384,384,384,384,384,384,384,385,385,385,385,385,385,
-385,386,386,386,386,386,386,386,386,386,386,381,381,381,381,381,
-381,381,381,381,386,386,386,386,386,386,386,386,386,114,114,114,
-
-/* block 53 */
-387,387,388,389,389,389,389,389,389,389,389,389,389,389,389,389,
-389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,
-389,388,387,387,387,387,388,388,387,387,388,387,387,387,389,389,
-390,390,390,390,390,390,390,390,390,390,389,389,389,389,389,389,
-391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,
-391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,
-391,391,391,391,391,391,392,393,392,392,393,393,393,392,393,392,
-392,392,393,393,114,114,114,114,114,114,114,114,394,394,394,394,
-
-/* block 54 */
-395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,
-395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,
-395,395,395,395,396,396,396,396,396,396,396,396,397,397,397,397,
-397,397,397,397,396,396,397,397,114,114,114,398,398,398,398,398,
-399,399,399,399,399,399,399,399,399,399,114,114,114,395,395,395,
-400,400,400,400,400,400,400,400,400,400,401,401,401,401,401,401,
-401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,
-401,401,401,401,401,401,401,401,402,402,402,402,402,402,403,403,
-
-/* block 55 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-404,404,404,404,404,404,404,404,114,114,114,114,114,114,114,114,
-109,109,109,  4,109,109,109,109,109,109,109,109,109,109,109,109,
-109,405,109,109,109,109,109,109,109,406,406,406,406,109,406,406,
-406,406,405,405,109,406,406,114,109,109,114,114,114,114,114,114,
-
-/* block 56 */
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33,122,122,122,122,122,407,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,115,115,115,
-115,115,106,106,106,106,115,115,115,115,115, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33,408,409, 33, 33, 33,410, 33, 33,
-
-/* block 57 */
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,115,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,114,114,114,114,114,114,109,109,109,109,
-
-/* block 58 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-411,412, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-
-/* block 59 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 33, 33, 33, 33, 33,413, 33, 33,414, 33,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-
-/* block 60 */
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-415,415,415,415,415,415,114,114,416,416,416,416,416,416,114,114,
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-415,415,415,415,415,415,114,114,416,416,416,416,416,416,114,114,
-122,415,122,415,122,415,122,415,114,416,114,416,114,416,114,416,
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-417,417,418,418,418,418,419,419,420,420,421,421,422,422,114,114,
-
-/* block 61 */
-415,415,415,415,415,415,415,415,423,423,423,423,423,423,423,423,
-415,415,415,415,415,415,415,415,423,423,423,423,423,423,423,423,
-415,415,415,415,415,415,415,415,423,423,423,423,423,423,423,423,
-415,415,122,424,122,114,122,122,416,416,425,425,426,113,427,113,
-113,113,122,424,122,114,122,122,428,428,428,428,426,113,113,113,
-415,415,122,122,114,114,122,122,416,416,429,429,114,113,113,113,
-415,415,122,122,122,163,122,122,416,416,430,430,168,113,113,113,
-114,114,122,424,122,114,122,122,431,431,432,432,426,113,113,114,
-
-/* block 62 */
-  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3, 22,433,433, 22, 22,
-  9,  9,  9,  9,  9,  9,  4,  4, 21, 25,  6, 21, 21, 25,  6, 21,
-  4,  4,  4,  4,  4,  4,  4,  4,434,435, 22, 22, 22, 22, 22,  3,
-  4,  4,  4,  4,  4,  4,  4,  4,  4, 21, 25,  4,  4,  4,  4, 15,
- 15,  4,  4,  4,  8,  6,  7,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-  4,  4,  8,  4, 15,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  3,
- 22, 22, 22, 22, 22,436, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 23,106,114,114, 23, 23, 23, 23, 23, 23,  8,  8,  8,  6,  7,106,
-
-/* block 63 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,  8,  8,  8,  6,  7,114,
-106,106,106,106,106,106,106,106,106,106,106,106,106,114,114,114,
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-109,109,109,109,109,109,109,109,109,109,109,109,109,380,380,380,
-380,109,380,380,380,109,109,109,109,109,109,109,109,109,109,109,
-109,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 64 */
- 19, 19,437, 19, 19, 19, 19,437, 19, 19,438,437,437,437,438,438,
-437,437,437,438, 19,437, 19, 19,  8,437,437,437,437,437, 19, 19,
- 19, 19, 19, 19,437, 19,439, 19,437, 19,440,441,437,437, 19,438,
-437,437,442,437,438,406,406,406,406,438, 19, 19,438,438,437,437,
-  8,  8,  8,  8,  8,437,438,438,438,438, 19,  8, 19, 19,443, 19,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,
-445,445,445,445,445,445,445,445,445,445,445,445,445,445,445,445,
-
-/* block 65 */
-446,446,446, 30, 31,446,446,446,446, 23,114,114,114,114,114,114,
-  8,  8,  8,  8,  8, 19, 19, 19, 19, 19,  8,  8, 19, 19, 19, 19,
-  8, 19, 19,  8, 19, 19,  8, 19, 19, 19, 19, 19, 19, 19,  8, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,
- 19, 19,  8, 19,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 66 */
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 67 */
- 19, 19, 19, 19, 19, 19, 19, 19,  6,  7,  6,  7, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-  8,  8, 19, 19, 19, 19, 19, 19, 19,  6,  7, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8, 19, 19, 19,
-
-/* block 68 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,  8,  8,
-  8,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
-
-/* block 69 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-
-/* block 70 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,447,447,447,447,447,447,447,447,447,447,
-447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,
-448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
-448,448,448,448,448,448,448,448,448,448, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-
-/* block 71 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 72 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,  8, 19, 19, 19, 19, 19, 19, 19, 19,
- 19,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 73 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 74 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,  6,  7,  6,  7,  6,  7,  6,  7,
-  6,  7,  6,  7,  6,  7, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-
-/* block 75 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-  8,  8,  8,  8,  8,  6,  7,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 76 */
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-
-/* block 77 */
-  8,  8,  8,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,  6,
-  7,  6,  7,  6,  7,  6,  7,  6,  7,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  6,  7,  6,  7,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  6,  7,  8,  8,
-
-/* block 78 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8, 19, 19,  8,  8,  8,  8,  8,  8, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 79 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19,114, 19, 19, 19, 19, 19, 19,
- 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 80 */
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,114,
-451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,
-451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,
-451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,114,
- 30, 31,452,453,454,455,456, 30, 31, 30, 31, 30, 31,457,458,459,
-460, 33, 30, 31, 33, 30, 31, 33, 33, 33, 33, 33,106,106,461,461,
-
-/* block 81 */
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,462,463,463,463,463,463,463,159,160,159,160,464,
-464,464,159,160,114,114,114,114,114,465,465,465,465,466,465,465,
-
-/* block 82 */
-467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,
-467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,
-467,467,467,467,467,467,114,467,114,114,114,114,114,467,114,114,
-468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,
-468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,
-468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,
-468,468,468,468,468,468,468,468,114,114,114,114,114,114,114,469,
-470,114,114,114,114,114,114,114,114,114,114,114,114,114,114,471,
-
-/* block 83 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,114,114,114,114,114,114,114,114,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
-177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
-
-/* block 84 */
-  4,  4, 21, 25, 21, 25,  4,  4,  4, 21, 25,  4, 21, 25,  4,  4,
-  4,  4,  4,  4,  4,  4,  4,  9,  4,  4,  9,  4, 21, 25,  4,  4,
- 21, 25,  6,  7,  6,  7,  6,  7,  6,  7,  4,  4,  4,  4,  4,107,
-  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  9,  9,  4,  4,  4,  4,
-  9,  4,  6,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 85 */
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,114,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 86 */
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-
-/* block 87 */
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
-
-/* block 88 */
-  3,  4,  4,  4, 19,473,406,474,  6,  7,  6,  7,  6,  7,  6,  7,
-  6,  7, 19, 19,  6,  7,  6,  7,  6,  7,  6,  7,  9,  6,  7,  7,
- 19,474,474,474,474,474,474,474,474,474,109,109,109,109,475,475,
-  9,107,107,107,107,107, 19, 19,474,474,474,473,406,  4, 19, 19,
-114,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-
-/* block 89 */
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,114,114,109,109, 14, 14,477,477,476,
-  9,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,  4,107,479,479,478,
-
-/* block 90 */
-114,114,114,114,114,480,480,480,480,480,480,480,480,480,480,480,
-480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,
-480,480,480,480,480,480,480,480,480,480,480,480,480,480,114,114,
-114,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-
-/* block 91 */
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,114,
- 19, 19, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,
-480,480,480,480,480,480,480,480,480,480,480,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-
-/* block 92 */
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,114,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 23, 23, 23, 23, 23, 23, 23, 23,
- 19, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482, 19,
-
-/* block 93 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,114,
-
-/* block 94 */
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 95 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-
-/* block 96 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 97 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 98 */
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,486,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-
-/* block 99 */
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-
-/* block 100 */
-485,485,485,485,485,485,485,485,485,485,485,485,485,114,114,114,
-487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,
-487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,
-487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,
-487,487,487,487,487,487,487,114,114,114,114,114,114,114,114,114,
-488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,
-488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,
-488,488,488,488,488,488,488,488,489,489,489,489,489,489,490,490,
-
-/* block 101 */
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-
-/* block 102 */
-491,491,491,491,491,491,491,491,491,491,491,491,492,493,493,493,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-494,494,494,494,494,494,494,494,494,494,491,491,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,495,177,
-178,178,178,496,177,177,177,177,177,177,177,177,177,177,496,408,
-
-/* block 103 */
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,408,408,114,177,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,498,498,498,498,498,498,498,498,498,498,
-499,499,500,500,500,500,500,500,114,114,114,114,114,114,114,114,
-
-/* block 104 */
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14,107,107,107,107,107,107,107,107,107,
- 14, 14, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 33, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-106, 33, 33, 33, 33, 33, 33, 33, 33, 30, 31, 30, 31,501, 30, 31,
-
-/* block 105 */
- 30, 31, 30, 31, 30, 31, 30, 31,107, 14, 14, 30, 31,502, 33,114,
- 30, 31, 30, 31, 33, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,503,504,505,506,114,114,
-507,508,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114, 20,106,106, 33, 20, 20, 20, 20, 20,
-
-/* block 106 */
-509,509,510,509,509,509,510,509,509,509,509,510,509,509,509,509,
-509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,
-509,509,509,511,511,510,510,511,512,512,512,512,114,114,114,114,
- 23, 23, 23, 23, 23, 23, 19, 19,  5, 19,114,114,114,114,114,114,
-513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
-513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
-513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
-513,513,513,513,514,514,514,514,114,114,114,114,114,114,114,114,
-
-/* block 107 */
-515,515,516,516,516,516,516,516,516,516,516,516,516,516,516,516,
-516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,
-516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,
-516,516,516,516,515,515,515,515,515,515,515,515,515,515,515,515,
-515,515,515,515,517,114,114,114,114,114,114,114,114,114,518,518,
-519,519,519,519,519,519,519,519,519,519,114,114,114,114,114,114,
-221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,
-221,221,223,223,223,223,223,223,225,225,225,223,114,114,114,114,
-
-/* block 108 */
-520,520,520,520,520,520,520,520,520,520,521,521,521,521,521,521,
-521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,
-521,521,521,521,521,521,522,522,522,522,522,522,522,522,  4,523,
-524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,
-524,524,524,524,524,524,524,525,525,525,525,525,525,525,525,525,
-525,525,526,526,114,114,114,114,114,114,114,114,114,114,114,527,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,114,114,114,
-
-/* block 109 */
-528,528,528,529,530,530,530,530,530,530,530,530,530,530,530,530,
-530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,
-530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,
-530,530,530,528,529,529,528,528,528,528,529,529,528,529,529,529,
-529,531,531,531,531,531,531,531,531,531,531,531,531,531,114,107,
-532,532,532,532,532,532,532,532,532,532,114,114,114,114,531,531,
-304,304,304,304,304,306,533,304,304,304,304,304,304,304,304,304,
-308,308,308,308,308,308,308,308,308,308,304,304,304,304,304,114,
-
-/* block 110 */
-534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,
-534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,
-534,534,534,534,534,534,534,534,534,535,535,535,535,535,535,536,
-536,535,535,536,536,535,535,114,114,114,114,114,114,114,114,114,
-534,534,534,535,534,534,534,534,534,534,534,534,535,536,114,114,
-537,537,537,537,537,537,537,537,537,537,114,114,538,538,538,538,
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-533,304,304,304,304,304,304,310,310,310,304,305,306,305,304,304,
-
-/* block 111 */
-539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,
-539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,
-539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,
-540,539,540,540,540,539,539,540,540,539,539,539,539,539,540,540,
-539,540,539,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,539,539,541,542,542,
-543,543,543,543,543,543,543,543,543,543,543,544,545,545,544,544,
-546,546,543,547,547,544,545,114,114,114,114,114,114,114,114,114,
-
-/* block 112 */
-114,317,317,317,317,317,317,114,114,317,317,317,317,317,317,114,
-114,317,317,317,317,317,317,114,114,114,114,114,114,114,114,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 14,106,106,106,106,
-114,114,114,114, 33,122,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 113 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,
-543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,
-543,543,543,544,544,545,544,544,545,544,544,546,544,545,114,114,
-548,548,548,548,548,548,548,548,548,548,114,114,114,114,114,114,
-
-/* block 114 */
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 115 */
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-
-/* block 116 */
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 117 */
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-
-/* block 118 */
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 119 */
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 120 */
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 121 */
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,114,114,114,114,114,114,114,114,114,114,114,114,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,114,114,114,114,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,114,114,114,114,
-
-/* block 122 */
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-
-/* block 123 */
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-
-/* block 124 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,114,114,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-
-/* block 125 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 126 */
- 33, 33, 33, 33, 33, 33, 33,114,114,114,114,114,114,114,114,114,
-114,114,114,185,185,185,185,185,114,114,114,114,114,192,189,192,
-192,192,192,192,192,192,192,192,192,553,192,192,192,192,192,192,
-192,192,192,192,192,192,192,114,192,192,192,192,192,114,192,114,
-192,192,114,192,192,114,192,192,192,192,192,192,192,192,192,192,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 127 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,554,554,554,554,554,554,554,554,554,554,554,554,554,554,
-554,554,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 128 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 129 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,  7,  6,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 130 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-114,114,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-199,199,199,199,199,199,199,199,199,199,199,199,196,197,114,114,
-
-/* block 131 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-  4,  4,  4,  4,  4,  4,  4,  6,  7,  4,114,114,114,114,114,114,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,114,114,
-  4,  9,  9, 15, 15,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,  6,
-  7,  6,  7,  6,  7,  4,  4,  6,  7,  4,  4,  4,  4, 15, 15, 15,
-  4,  4,  4,114,  4,  4,  4,  4,  9,  6,  7,  6,  7,  6,  7,  4,
-  4,  4,  8,  9,  8,  8,  8,114,  4,  5,  4,  4,114,114,114,114,
-199,199,199,199,199,114,199,199,199,199,199,199,199,199,199,199,
-
-/* block 132 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,114,114, 22,
-
-/* block 133 */
-114,  4,  4,  4,  5,  4,  4,  4,  6,  7,  4,  8,  4,  9,  4,  4,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  4,  4,  8,  8,  8,  4,
-  4, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  6,  4,  7, 14, 15,
- 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  6,  8,  7,  8,  6,
-  7,  4,  6,  7,  4,  4,478,478,478,478,478,478,478,478,478,478,
-107,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-
-/* block 134 */
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,555,555,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,114,
-114,114,481,481,481,481,481,481,114,114,481,481,481,481,481,481,
-114,114,481,481,481,481,481,481,114,114,481,481,481,114,114,114,
-  5,  5,  8, 14, 19,  5,  5,114, 19,  8,  8,  8,  8, 19, 19,114,
-436,436,436,436,436,436,436,436,436, 22, 22, 22, 19, 19,114,114,
-
-/* block 135 */
-556,556,556,556,556,556,556,556,556,556,556,556,114,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,114,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,114,556,556,114,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,114,114,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 136 */
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,114,114,114,114,114,
-
-/* block 137 */
-  4,  4,  4,114,114,114,114, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23,114,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
-557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
-557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
-557,557,557,557,557,558,558,558,558,559,559,559,559,559,559,559,
-
-/* block 138 */
-559,559,559,559,559,559,559,559,559,559,558,558,559,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
-559,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,109,114,114,
-
-/* block 139 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 140 */
-560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,
-560,560,560,560,560,560,560,560,560,560,560,560,560,114,114,114,
-561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,
-561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,
-561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,
-561,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-109, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,114,114,114,114,
-
-/* block 141 */
-562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
-562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
-563,563,563,563,114,114,114,114,114,114,114,114,114,114,114,114,
-564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,
-564,565,564,564,564,564,564,564,564,564,565,114,114,114,114,114,
-566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,
-566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,
-566,566,566,566,566,566,567,567,567,567,567,114,114,114,114,114,
-
-/* block 142 */
-568,568,568,568,568,568,568,568,568,568,568,568,568,568,568,568,
-568,568,568,568,568,568,568,568,568,568,568,568,568,568,114,569,
-570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
-570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
-570,570,570,570,114,114,114,114,570,570,570,570,570,570,570,570,
-571,572,572,572,572,572,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 143 */
-573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,
-573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,
-573,573,573,573,573,573,573,573,574,574,574,574,574,574,574,574,
-574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,
-574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,
-575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,
-575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,
-575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,
-
-/* block 144 */
-576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,
-576,576,576,576,576,576,576,576,576,576,576,576,576,576,114,114,
-577,577,577,577,577,577,577,577,577,577,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 145 */
-578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,
-578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,
-578,578,578,578,578,578,578,578,114,114,114,114,114,114,114,114,
-579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,
-579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,
-579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,
-579,579,579,579,114,114,114,114,114,114,114,114,114,114,114,580,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 146 */
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-
-/* block 147 */
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,114,114,114,114,114,114,114,114,114,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,114,114,114,114,114,114,114,114,114,114,
-581,581,581,581,581,581,581,581,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 148 */
-582,582,582,582,582,582,114,114,582,114,582,582,582,582,582,582,
-582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,
-582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,
-582,582,582,582,582,582,114,582,582,114,114,114,582,114,114,582,
-583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,
-583,583,583,583,583,583,114,584,585,585,585,585,585,585,585,585,
-586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,
-586,586,586,586,586,586,586,587,587,588,588,588,588,588,588,588,
-
-/* block 149 */
-589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,
-589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,114,
-114,114,114,114,114,114,114,590,590,590,590,590,590,590,590,590,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 150 */
-591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
-591,591,591,591,591,591,592,592,592,592,592,592,114,114,114,593,
-594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,
-594,594,594,594,594,594,594,594,594,594,114,114,114,114,114,595,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 151 */
-596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,
-596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,
-597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,
-597,597,597,597,597,597,597,597,114,114,114,114,114,114,597,597,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 152 */
-598,599,599,599,114,599,599,114,114,114,114,114,599,599,599,599,
-598,598,598,598,114,598,598,598,114,598,598,598,598,598,598,598,
-598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,
-598,598,598,598,114,114,114,114,599,599,599,114,114,114,114,599,
-600,600,600,600,600,600,600,600,114,114,114,114,114,114,114,114,
-601,601,601,601,601,601,601,601,601,114,114,114,114,114,114,114,
-602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,
-602,602,602,602,602,602,602,602,602,602,602,602,602,603,603,604,
-
-/* block 153 */
-605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,
-605,605,605,605,605,605,605,605,605,605,605,605,605,606,606,606,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-607,607,607,607,607,607,607,607,608,607,607,607,607,607,607,607,
-607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,
-607,607,607,607,607,609,609,114,114,114,114,610,610,610,610,610,
-611,611,611,611,611,611,611,114,114,114,114,114,114,114,114,114,
-
-/* block 154 */
-612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,
-612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,
-612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,
-612,612,612,612,612,612,114,114,114,613,613,613,613,613,613,613,
-614,614,614,614,614,614,614,614,614,614,614,614,614,614,614,614,
-614,614,614,614,614,614,114,114,615,615,615,615,615,615,615,615,
-616,616,616,616,616,616,616,616,616,616,616,616,616,616,616,616,
-616,616,616,114,114,114,114,114,617,617,617,617,617,617,617,617,
-
-/* block 155 */
-618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,
-618,618,114,114,114,114,114,114,114,619,619,619,619,114,114,114,
-114,114,114,114,114,114,114,114,114,620,620,620,620,620,620,620,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 156 */
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 157 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,
-622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,114,
-
-/* block 158 */
-623,624,623,625,625,625,625,625,625,625,625,625,625,625,625,625,
-625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,
-625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,
-625,625,625,625,625,625,625,625,624,624,624,624,624,624,624,624,
-624,624,624,624,624,624,624,626,626,626,626,626,626,626,114,114,
-114,114,627,627,627,627,627,627,627,627,627,627,627,627,627,627,
-627,627,627,627,627,627,628,628,628,628,628,628,628,628,628,628,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,624,
-
-/* block 159 */
-629,629,630,631,631,631,631,631,631,631,631,631,631,631,631,631,
-631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,
-631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,
-630,630,630,629,629,629,629,630,630,629,629,632,632,633,632,632,
-632,632,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-634,634,634,634,634,634,634,634,634,634,634,634,634,634,634,634,
-634,634,634,634,634,634,634,634,634,114,114,114,114,114,114,114,
-635,635,635,635,635,635,635,635,635,635,114,114,114,114,114,114,
-
-/* block 160 */
-636,636,636,637,637,637,637,637,637,637,637,637,637,637,637,637,
-637,637,637,637,637,637,637,637,637,637,637,637,637,637,637,637,
-637,637,637,637,637,637,637,636,636,636,636,636,638,636,636,636,
-636,636,636,636,636,114,639,639,639,639,639,639,639,639,639,639,
-640,640,640,640,114,114,114,114,114,114,114,114,114,114,114,114,
-641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,
-641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,
-641,641,641,642,643,643,641,114,114,114,114,114,114,114,114,114,
-
-/* block 161 */
-644,644,645,646,646,646,646,646,646,646,646,646,646,646,646,646,
-646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,
-646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,
-646,646,646,645,645,645,644,644,644,644,644,644,644,644,644,645,
-645,646,646,646,646,647,647,647,647,114,114,114,114,647,114,114,
-648,648,648,648,648,648,648,648,648,648,646,114,114,114,114,114,
-114,649,649,649,649,649,649,649,649,649,649,649,649,649,649,649,
-649,649,649,649,649,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 162 */
-650,650,650,650,650,650,650,650,650,650,650,650,650,650,650,650,
-650,650,114,650,650,650,650,650,650,650,650,650,650,650,650,650,
-650,650,650,650,650,650,650,650,650,650,650,650,651,651,651,652,
-652,652,651,651,652,651,652,652,653,653,653,653,653,653,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 163 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,
-654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,
-654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,655,
-656,656,656,655,655,655,655,655,655,655,655,114,114,114,114,114,
-657,657,657,657,657,657,657,657,657,657,114,114,114,114,114,114,
-
-/* block 164 */
-114,658,659,659,114,660,660,660,660,660,660,660,660,114,114,660,
-660,114,114,660,660,660,660,660,660,660,660,660,660,660,660,660,
-660,660,660,660,660,660,660,660,660,114,660,660,660,660,660,660,
-660,114,660,660,114,660,660,660,660,660,114,114,658,660,661,659,
-658,659,659,659,659,114,114,659,659,114,114,659,659,659,114,114,
-114,114,114,114,114,114,114,661,114,114,114,114,114,660,660,660,
-660,660,659,659,114,114,658,658,658,658,658,658,658,114,114,114,
-658,658,658,658,658,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 165 */
-662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,
-662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,
-662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,
-663,664,664,665,665,665,665,665,665,664,665,664,664,663,664,665,
-665,664,665,665,662,662,666,662,114,114,114,114,114,114,114,114,
-667,667,667,667,667,667,667,667,667,667,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 166 */
-668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,
-668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,
-668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,669,
-670,670,671,671,671,671,114,114,670,670,670,670,671,671,670,671,
-671,672,672,672,672,672,672,672,672,672,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 167 */
-673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,
-673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,
-673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,
-674,674,674,675,675,675,675,675,675,675,675,674,674,675,674,675,
-675,676,676,676,673,114,114,114,114,114,114,114,114,114,114,114,
-677,677,677,677,677,677,677,677,677,677,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 168 */
-678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,678,678,678,678,678,678,678,678,678,679,680,679,680,680,
-679,679,679,679,679,679,680,679,114,114,114,114,114,114,114,114,
-681,681,681,681,681,681,681,681,681,681,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 169 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,
-682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,
-683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,
-683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,
-684,684,684,684,684,684,684,684,684,684,685,685,685,685,685,685,
-685,685,685,114,114,114,114,114,114,114,114,114,114,114,114,686,
-
-/* block 170 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,
-687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,
-687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,
-687,687,687,687,687,687,687,687,687,114,114,114,114,114,114,114,
-
-/* block 171 */
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-
-/* block 172 */
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 173 */
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,114,
-690,690,690,690,690,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 174 */
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-
-/* block 175 */
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 176 */
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-
-/* block 177 */
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,114,114,114,114,114,114,114,
-692,692,692,692,692,692,692,692,692,692,692,692,692,692,692,692,
-692,692,692,692,692,692,692,692,692,692,692,692,692,692,692,114,
-693,693,693,693,693,693,693,693,693,693,114,114,114,114,694,694,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 178 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-695,695,695,695,695,695,695,695,695,695,695,695,695,695,695,695,
-695,695,695,695,695,695,695,695,695,695,695,695,695,695,114,114,
-696,696,696,696,696,697,114,114,114,114,114,114,114,114,114,114,
-
-/* block 179 */
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-699,699,699,699,699,699,699,700,700,700,700,700,701,701,701,701,
-702,702,702,702,700,701,114,114,114,114,114,114,114,114,114,114,
-703,703,703,703,703,703,703,703,703,703,114,704,704,704,704,704,
-704,704,114,698,698,698,698,698,698,698,698,698,698,698,698,698,
-698,698,698,698,698,698,698,698,114,114,114,114,114,698,698,698,
-
-/* block 180 */
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 181 */
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,114,114,114,114,114,114,114,114,114,114,114,
-705,706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,
-706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,
-706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,114,
-
-/* block 182 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,707,
-707,707,707,708,708,708,708,708,708,708,708,708,708,708,708,708,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 183 */
-478,476,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 184 */
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,114,114,114,114,114,
-709,709,709,709,709,709,709,709,709,709,709,709,709,114,114,114,
-
-/* block 185 */
-709,709,709,709,709,709,709,709,709,114,114,114,114,114,114,114,
-709,709,709,709,709,709,709,709,709,709,114,114,710,711,711,712,
- 22, 22, 22, 22,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 186 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,
-
-/* block 187 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19,713,405,109,109,109, 19, 19, 19,405,713,713,
-713,713,713, 22, 22, 22, 22, 22, 22, 22, 22,109,109,109,109,109,
-
-/* block 188 */
-109,109,109, 19, 19,109,109,109,109,109,109,109, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,109,109,109,109, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 189 */
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,714,714,714,559,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 190 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 191 */
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,438,438,
-438,438,438,438,438,114,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-
-/* block 192 */
-437,437,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,437,114,437,437,
-114,114,437,114,114,437,437,114,114,437,437,437,437,114,437,437,
-437,437,437,437,437,437,438,438,438,438,114,438,114,438,438,438,
-438,438,438,438,114,438,438,438,438,438,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-
-/* block 193 */
-438,438,438,438,437,437,114,437,437,437,437,114,114,437,437,437,
-437,437,437,437,437,114,437,437,437,437,437,437,437,114,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,437,437,114,437,437,437,437,114,
-437,437,437,437,437,114,437,114,114,114,437,437,437,437,437,437,
-437,114,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-
-/* block 194 */
-437,437,437,437,437,437,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-
-/* block 195 */
-438,438,438,438,438,438,438,438,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-
-/* block 196 */
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,114,114,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,  8,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,  8,438,438,438,438,
-438,438,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,  8,438,438,438,438,
-
-/* block 197 */
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,  8,438,438,438,438,438,438,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,  8,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,  8,
-438,438,438,438,438,438,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,  8,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-
-/* block 198 */
-438,438,438,438,438,438,438,438,438,  8,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,  8,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,  8,438,438,438,438,438,438,437,438,114,114, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-
-/* block 199 */
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-
-/* block 200 */
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,114,114,716,716,716,716,716,716,716,716,716,
-717,717,717,717,717,717,717,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 201 */
-199,199,199,199,114,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-114,199,199,114,199,114,114,199,114,199,199,199,199,199,199,199,
-199,199,199,114,199,199,199,199,114,199,114,199,114,114,114,114,
-114,114,199,114,114,114,114,199,114,199,114,199,114,199,199,199,
-114,199,199,114,199,114,114,199,114,199,114,199,114,199,114,199,
-114,199,199,114,199,114,114,199,199,199,199,114,199,199,199,199,
-199,199,199,114,199,199,199,199,114,199,199,199,199,114,199,114,
-
-/* block 202 */
-199,199,199,199,199,199,199,199,199,199,114,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,114,114,114,114,
-114,199,199,199,114,199,199,199,199,199,114,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-194,194,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 203 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 204 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
-114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,
-
-/* block 205 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 206 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,718,718,718,718,718,718,718,718,718,718,
-718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,
-
-/* block 207 */
-719, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,
- 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 208 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,
-
-/* block 209 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
-114,114,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,
-
-/* block 210 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
-
-/* block 211 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114, 19, 19, 19, 19, 19,
-
-/* block 212 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 213 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 214 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 215 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 216 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 217 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 218 */
- 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 219 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 220 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,114,114,114,114,114,114,114,114,114,114,114,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-
-/* block 221 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 222 */
-436, 22,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-
-/* block 223 */
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-
-/* block 224 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-
-/* block 225 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-
-/* block 226 */
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,114,114,
-
-};
-
-#if UCD_BLOCK_SIZE != 128
-#error Please correct UCD_BLOCK_SIZE in pcre_internal.h
-#endif
-#endif  /* SUPPORT_UCP */
-
-#endif  /* PCRE_INCLUDED */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_valid_utf8.c r-base-3.3.1/src/extra/pcre/pcre_valid_utf8.c
--- r-base-3.2.3/src/extra/pcre/pcre_valid_utf8.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_valid_utf8.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,301 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains an internal function for validating UTF-8 character
-strings. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*         Validate a UTF-8 string                *
-*************************************************/
-
-/* This function is called (optionally) at the start of compile or match, to
-check that a supposed UTF-8 string is actually valid. The early check means
-that subsequent code can assume it is dealing with a valid string. The check
-can be turned off for maximum performance, but the consequences of supplying an
-invalid string are then undefined.
-
-Originally, this function checked according to RFC 2279, allowing for values in
-the range 0 to 0x7fffffff, up to 6 bytes long, but ensuring that they were in
-the canonical format. Once somebody had pointed out RFC 3629 to me (it
-obsoletes 2279), additional restrictions were applied. The values are now
-limited to be between 0 and 0x0010ffff, no more than 4 bytes long, and the
-subrange 0xd000 to 0xdfff is excluded. However, the format of 5-byte and 6-byte
-characters is still checked.
-
-From release 8.13 more information about the details of the error are passed
-back in the returned value:
-
-PCRE_UTF8_ERR0   No error
-PCRE_UTF8_ERR1   Missing 1 byte at the end of the string
-PCRE_UTF8_ERR2   Missing 2 bytes at the end of the string
-PCRE_UTF8_ERR3   Missing 3 bytes at the end of the string
-PCRE_UTF8_ERR4   Missing 4 bytes at the end of the string
-PCRE_UTF8_ERR5   Missing 5 bytes at the end of the string
-PCRE_UTF8_ERR6   2nd-byte's two top bits are not 0x80
-PCRE_UTF8_ERR7   3rd-byte's two top bits are not 0x80
-PCRE_UTF8_ERR8   4th-byte's two top bits are not 0x80
-PCRE_UTF8_ERR9   5th-byte's two top bits are not 0x80
-PCRE_UTF8_ERR10  6th-byte's two top bits are not 0x80
-PCRE_UTF8_ERR11  5-byte character is not permitted by RFC 3629
-PCRE_UTF8_ERR12  6-byte character is not permitted by RFC 3629
-PCRE_UTF8_ERR13  4-byte character with value > 0x10ffff is not permitted
-PCRE_UTF8_ERR14  3-byte character with value 0xd000-0xdfff is not permitted
-PCRE_UTF8_ERR15  Overlong 2-byte sequence
-PCRE_UTF8_ERR16  Overlong 3-byte sequence
-PCRE_UTF8_ERR17  Overlong 4-byte sequence
-PCRE_UTF8_ERR18  Overlong 5-byte sequence (won't ever occur)
-PCRE_UTF8_ERR19  Overlong 6-byte sequence (won't ever occur)
-PCRE_UTF8_ERR20  Isolated 0x80 byte (not within UTF-8 character)
-PCRE_UTF8_ERR21  Byte with the illegal value 0xfe or 0xff
-PCRE_UTF8_ERR22  Unused (was non-character)
-
-Arguments:
-  string       points to the string
-  length       length of string, or -1 if the string is zero-terminated
-  errp         pointer to an error position offset variable
-
-Returns:       = 0    if the string is a valid UTF-8 string
-               > 0    otherwise, setting the offset of the bad character
-*/
-
-int
-PRIV(valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset)
-{
-#ifdef SUPPORT_UTF
-register PCRE_PUCHAR p;
-
-if (length < 0)
-  {
-  for (p = string; *p != 0; p++);
-  length = (int)(p - string);
-  }
-
-for (p = string; length-- > 0; p++)
-  {
-  register pcre_uchar ab, c, d;
-
-  c = *p;
-  if (c < 128) continue;                /* ASCII character */
-
-  if (c < 0xc0)                         /* Isolated 10xx xxxx byte */
-    {
-    *erroroffset = (int)(p - string);
-    return PCRE_UTF8_ERR20;
-    }
-
-  if (c >= 0xfe)                        /* Invalid 0xfe or 0xff bytes */
-    {
-    *erroroffset = (int)(p - string);
-    return PCRE_UTF8_ERR21;
-    }
-
-  ab = PRIV(utf8_table4)[c & 0x3f];     /* Number of additional bytes */
-  if (length < ab)
-    {
-    *erroroffset = (int)(p - string);          /* Missing bytes */
-    return ab - length;                 /* Codes ERR1 to ERR5 */
-    }
-  length -= ab;                         /* Length remaining */
-
-  /* Check top bits in the second byte */
-
-  if (((d = *(++p)) & 0xc0) != 0x80)
-    {
-    *erroroffset = (int)(p - string) - 1;
-    return PCRE_UTF8_ERR6;
-    }
-
-  /* For each length, check that the remaining bytes start with the 0x80 bit
-  set and not the 0x40 bit. Then check for an overlong sequence, and for the
-  excluded range 0xd800 to 0xdfff. */
-
-  switch (ab)
-    {
-    /* 2-byte character. No further bytes to check for 0x80. Check first byte
-    for for xx00 000x (overlong sequence). */
-
-    case 1: if ((c & 0x3e) == 0)
-      {
-      *erroroffset = (int)(p - string) - 1;
-      return PCRE_UTF8_ERR15;
-      }
-    break;
-
-    /* 3-byte character. Check third byte for 0x80. Then check first 2 bytes
-      for 1110 0000, xx0x xxxx (overlong sequence) or
-          1110 1101, 1010 xxxx (0xd800 - 0xdfff) */
-
-    case 2:
-    if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
-      {
-      *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
-      }
-    if (c == 0xe0 && (d & 0x20) == 0)
-      {
-      *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR16;
-      }
-    if (c == 0xed && d >= 0xa0)
-      {
-      *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR14;
-      }
-    break;
-
-    /* 4-byte character. Check 3rd and 4th bytes for 0x80. Then check first 2
-       bytes for for 1111 0000, xx00 xxxx (overlong sequence), then check for a
-       character greater than 0x0010ffff (f4 8f bf bf) */
-
-    case 3:
-    if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
-      {
-      *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
-      }
-    if ((*(++p) & 0xc0) != 0x80)     /* Fourth byte */
-      {
-      *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR8;
-      }
-    if (c == 0xf0 && (d & 0x30) == 0)
-      {
-      *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR17;
-      }
-    if (c > 0xf4 || (c == 0xf4 && d > 0x8f))
-      {
-      *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR13;
-      }
-    break;
-
-    /* 5-byte and 6-byte characters are not allowed by RFC 3629, and will be
-    rejected by the length test below. However, we do the appropriate tests
-    here so that overlong sequences get diagnosed, and also in case there is
-    ever an option for handling these larger code points. */
-
-    /* 5-byte character. Check 3rd, 4th, and 5th bytes for 0x80. Then check for
-    1111 1000, xx00 0xxx */
-
-    case 4:
-    if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
-      {
-      *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
-      }
-    if ((*(++p) & 0xc0) != 0x80)     /* Fourth byte */
-      {
-      *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR8;
-      }
-    if ((*(++p) & 0xc0) != 0x80)     /* Fifth byte */
-      {
-      *erroroffset = (int)(p - string) - 4;
-      return PCRE_UTF8_ERR9;
-      }
-    if (c == 0xf8 && (d & 0x38) == 0)
-      {
-      *erroroffset = (int)(p - string) - 4;
-      return PCRE_UTF8_ERR18;
-      }
-    break;
-
-    /* 6-byte character. Check 3rd-6th bytes for 0x80. Then check for
-    1111 1100, xx00 00xx. */
-
-    case 5:
-    if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
-      {
-      *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
-      }
-    if ((*(++p) & 0xc0) != 0x80)     /* Fourth byte */
-      {
-      *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR8;
-      }
-    if ((*(++p) & 0xc0) != 0x80)     /* Fifth byte */
-      {
-      *erroroffset = (int)(p - string) - 4;
-      return PCRE_UTF8_ERR9;
-      }
-    if ((*(++p) & 0xc0) != 0x80)     /* Sixth byte */
-      {
-      *erroroffset = (int)(p - string) - 5;
-      return PCRE_UTF8_ERR10;
-      }
-    if (c == 0xfc && (d & 0x3c) == 0)
-      {
-      *erroroffset = (int)(p - string) - 5;
-      return PCRE_UTF8_ERR19;
-      }
-    break;
-    }
-
-  /* Character is valid under RFC 2279, but 4-byte and 5-byte characters are
-  excluded by RFC 3629. The pointer p is currently at the last byte of the
-  character. */
-
-  if (ab > 3)
-    {
-    *erroroffset = (int)(p - string) - ab;
-    return (ab == 4)? PCRE_UTF8_ERR11 : PCRE_UTF8_ERR12;
-    }
-  }
-
-#else  /* Not SUPPORT_UTF */
-(void)(string);  /* Keep picky compilers happy */
-(void)(length);
-(void)(erroroffset);
-#endif
-
-return PCRE_UTF8_ERR0;   /* This indicates success */
-}
-
-/* End of pcre_valid_utf8.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_version.c r-base-3.3.1/src/extra/pcre/pcre_version.c
--- r-base-3.2.3/src/extra/pcre/pcre_version.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_version.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_version(), which returns a
-string that identifies the PCRE version that is in use. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*          Return version string                 *
-*************************************************/
-
-/* These macros are the standard way of turning unquoted text into C strings.
-They allow macros like PCRE_MAJOR to be defined without quotes, which is
-convenient for user programs that want to test its value. */
-
-#define STRING(a)  # a
-#define XSTRING(s) STRING(s)
-
-/* A problem turned up with PCRE_PRERELEASE, which is defined empty for
-production releases. Originally, it was used naively in this code:
-
-  return XSTRING(PCRE_MAJOR)
-         "." XSTRING(PCRE_MINOR)
-             XSTRING(PCRE_PRERELEASE)
-         " " XSTRING(PCRE_DATE);
-
-However, when PCRE_PRERELEASE is empty, this leads to an attempted expansion of
-STRING(). The C standard states: "If (before argument substitution) any
-argument consists of no preprocessing tokens, the behavior is undefined." It
-turns out the gcc treats this case as a single empty string - which is what we
-really want - but Visual C grumbles about the lack of an argument for the
-macro. Unfortunately, both are within their rights. To cope with both ways of
-handling this, I had resort to some messy hackery that does a test at run time.
-I could find no way of detecting that a macro is defined as an empty string at
-pre-processor time. This hack uses a standard trick for avoiding calling
-the STRING macro with an empty argument when doing the test. */
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
-pcre_version(void)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
-pcre16_version(void)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
-pcre32_version(void)
-#endif
-{
-return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)?
-  XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) :
-  XSTRING(PCRE_MAJOR.PCRE_MINOR) XSTRING(PCRE_PRERELEASE PCRE_DATE);
-}
-
-/* End of pcre_version.c */
diff -Nru r-base-3.2.3/src/extra/pcre/pcre_xclass.c r-base-3.3.1/src/extra/pcre/pcre_xclass.c
--- r-base-3.2.3/src/extra/pcre/pcre_xclass.c	2015-11-26 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/pcre_xclass.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains an internal function that is used to match an extended
-class. It is used by both pcre_exec() and pcre_def_exec(). */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*       Match character against an XCLASS        *
-*************************************************/
-
-/* This function is called to match a character against an extended class that
-might contain values > 255 and/or Unicode properties.
-
-Arguments:
-  c           the character
-  data        points to the flag byte of the XCLASS data
-
-Returns:      TRUE if character matches, else FALSE
-*/
-
-BOOL
-PRIV(xclass)(pcre_uint32 c, const pcre_uchar *data, BOOL utf)
-{
-pcre_uchar t;
-BOOL negated = (*data & XCL_NOT) != 0;
-
-(void)utf;
-#ifdef COMPILE_PCRE8
-/* In 8 bit mode, this must always be TRUE. Help the compiler to know that. */
-utf = TRUE;
-#endif
-
-/* Character values < 256 are matched against a bitmap, if one is present. If
-not, we still carry on, because there may be ranges that start below 256 in the
-additional data. */
-
-if (c < 256)
-  {
-  if ((*data & XCL_HASPROP) == 0)
-    {
-    if ((*data & XCL_MAP) == 0) return negated;
-    return (((pcre_uint8 *)(data + 1))[c/8] & (1 << (c&7))) != 0;
-    }
-  if ((*data & XCL_MAP) != 0 &&
-    (((pcre_uint8 *)(data + 1))[c/8] & (1 << (c&7))) != 0)
-    return !negated; /* char found */
-  }
-
-/* First skip the bit map if present. Then match against the list of Unicode
-properties or large chars or ranges that end with a large char. We won't ever
-encounter XCL_PROP or XCL_NOTPROP when UCP support is not compiled. */
-
-if ((*data++ & XCL_MAP) != 0) data += 32 / sizeof(pcre_uchar);
-
-while ((t = *data++) != XCL_END)
-  {
-  pcre_uint32 x, y;
-  if (t == XCL_SINGLE)
-    {
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      GETCHARINC(x, data); /* macro generates multiple statements */
-      }
-    else
-#endif
-      x = *data++;
-    if (c == x) return !negated;
-    }
-  else if (t == XCL_RANGE)
-    {
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      GETCHARINC(x, data); /* macro generates multiple statements */
-      GETCHARINC(y, data); /* macro generates multiple statements */
-      }
-    else
-#endif
-      {
-      x = *data++;
-      y = *data++;
-      }
-    if (c >= x && c <= y) return !negated;
-    }
-
-#ifdef SUPPORT_UCP
-  else  /* XCL_PROP & XCL_NOTPROP */
-    {
-    const ucd_record *prop = GET_UCD(c);
-    BOOL isprop = t == XCL_PROP;
-
-    switch(*data)
-      {
-      case PT_ANY:
-      if (isprop) return !negated;
-      break;
-
-      case PT_LAMP:
-      if ((prop->chartype == ucp_Lu || prop->chartype == ucp_Ll ||
-           prop->chartype == ucp_Lt) == isprop) return !negated;
-      break;
-
-      case PT_GC:
-      if ((data[1] == PRIV(ucp_gentype)[prop->chartype]) == isprop)
-        return !negated;
-      break;
-
-      case PT_PC:
-      if ((data[1] == prop->chartype) == isprop) return !negated;
-      break;
-
-      case PT_SC:
-      if ((data[1] == prop->script) == isprop) return !negated;
-      break;
-
-      case PT_ALNUM:
-      if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-           PRIV(ucp_gentype)[prop->chartype] == ucp_N) == isprop)
-        return !negated;
-      break;
-
-      /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-      which means that Perl space and POSIX space are now identical. PCRE
-      was changed at release 8.34. */
-
-      case PT_SPACE:    /* Perl space */
-      case PT_PXSPACE:  /* POSIX space */
-      switch(c)
-        {
-        HSPACE_CASES:
-        VSPACE_CASES:
-        if (isprop) return !negated;
-        break;
-
-        default:
-        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == isprop)
-          return !negated;
-        break;
-        }
-      break;
-
-      case PT_WORD:
-      if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-           PRIV(ucp_gentype)[prop->chartype] == ucp_N || c == CHAR_UNDERSCORE)
-             == isprop)
-        return !negated;
-      break;
-
-      case PT_UCNC:
-      if (c < 0xa0)
-        {
-        if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-             c == CHAR_GRAVE_ACCENT) == isprop)
-          return !negated;
-        }
-      else
-        {
-        if ((c < 0xd800 || c > 0xdfff) == isprop)
-          return !negated;
-        }
-      break;
-
-      /* The following three properties can occur only in an XCLASS, as there
-      is no \p or \P coding for them. */
-
-      /* Graphic character. Implement this as not Z (space or separator) and
-      not C (other), except for Cf (format) with a few exceptions. This seems
-      to be what Perl does. The exceptional characters are:
-
-      U+061C           Arabic Letter Mark
-      U+180E           Mongolian Vowel Separator
-      U+2066 - U+2069  Various "isolate"s
-      */
-
-      case PT_PXGRAPH:
-      if ((PRIV(ucp_gentype)[prop->chartype] != ucp_Z &&
-            (PRIV(ucp_gentype)[prop->chartype] != ucp_C ||
-              (prop->chartype == ucp_Cf &&
-                c != 0x061c && c != 0x180e && (c < 0x2066 || c > 0x2069))
-         )) == isprop)
-        return !negated;
-      break;
-
-      /* Printable character: same as graphic, with the addition of Zs, i.e.
-      not Zl and not Zp, and U+180E. */
-
-      case PT_PXPRINT:
-      if ((prop->chartype != ucp_Zl &&
-           prop->chartype != ucp_Zp &&
-            (PRIV(ucp_gentype)[prop->chartype] != ucp_C ||
-              (prop->chartype == ucp_Cf &&
-                c != 0x061c && (c < 0x2066 || c > 0x2069))
-         )) == isprop)
-        return !negated;
-      break;
-
-      /* Punctuation: all Unicode punctuation, plus ASCII characters that
-      Unicode treats as symbols rather than punctuation, for Perl
-      compatibility (these are $+<=>^`|~). */
-
-      case PT_PXPUNCT:
-      if ((PRIV(ucp_gentype)[prop->chartype] == ucp_P ||
-            (c < 128 && PRIV(ucp_gentype)[prop->chartype] == ucp_S)) == isprop)
-        return !negated;
-      break;
-
-      /* This should never occur, but compilers may mutter if there is no
-      default. */
-
-      default:
-      return FALSE;
-      }
-
-    data += 2;
-    }
-#endif  /* SUPPORT_UCP */
-  }
-
-return negated;   /* char did not match */
-}
-
-/* End of pcre_xclass.c */
diff -Nru r-base-3.2.3/src/extra/pcre/R_changes r-base-3.3.1/src/extra/pcre/R_changes
--- r-base-3.2.3/src/extra/pcre/R_changes	2015-03-18 23:02:11.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/R_changes	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-pcre_internal.h includes the relevant definitions that configure would
-make.
-
-diff -ur pcre-8.36/pcre_internal.h ./pcre_internal.h
---- pcre-8.36/pcre_internal.h	2014-05-27 19:20:05.000000000 +0100
-+++ ./pcre_internal.h	2014-11-11 21:44:03.000000000 +0000
-@@ -46,6 +46,33 @@
- #ifndef PCRE_INTERNAL_H
- #define PCRE_INTERNAL_H
- 
-+#include <config.h>
-+
-+/* and those that are not in R's configure */
-/* and those that are not in R's configure:
-   LINK_SIZE is set on the command line */
-+#define HAVE_MEMMOVE 1
-+#define MATCH_LIMIT 10000000
-+#define MATCH_LIMIT_RECURSION MATCH_LIMIT
-+#define MAX_NAME_COUNT 10000
-+#define MAX_NAME_SIZE 32
-+#define NEWLINE 10
-+#define PARENS_NEST_LIMIT 250
-+#define POSIX_MALLOC_THRESHOLD 10
-+#define SUPPORT_UCP
-+#define SUPPORT_UTF
-+
-+/* See http://sourceforge.net/p/predef/wiki/Architectures/
-+   SPARC_32 support added in 8.32, 'experimental'.
-+
-+   At least i386 support did not compile on Solaris Studio.
-+ */
-+#ifndef __SUNPRO_C
-+#if defined(WIN32) || defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__ppc__) || defined(__powerpc__) || defined(__sparc__)
-+# define SUPPORT_JIT
-+#endif
-+#endif
-+
- /* Define PCRE_DEBUG to get debugging output on stdout. */
- 
- #if 0
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitConfig.h r-base-3.3.1/src/extra/pcre/sljit/sljitConfig.h
--- r-base-3.2.3/src/extra/pcre/sljit/sljitConfig.h	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitConfig.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _SLJIT_CONFIG_H_
-#define _SLJIT_CONFIG_H_
-
-/* --------------------------------------------------------------------- */
-/*  Custom defines                                                       */
-/* --------------------------------------------------------------------- */
-
-/* Put your custom defines here. This empty section will never change
-   which helps maintaining patches (with diff / patch utilities). */
-
-/* --------------------------------------------------------------------- */
-/*  Architecture                                                         */
-/* --------------------------------------------------------------------- */
-
-/* Architecture selection. */
-/* #define SLJIT_CONFIG_X86_32 1 */
-/* #define SLJIT_CONFIG_X86_64 1 */
-/* #define SLJIT_CONFIG_ARM_V5 1 */
-/* #define SLJIT_CONFIG_ARM_V7 1 */
-/* #define SLJIT_CONFIG_ARM_THUMB2 1 */
-/* #define SLJIT_CONFIG_ARM_64 1 */
-/* #define SLJIT_CONFIG_PPC_32 1 */
-/* #define SLJIT_CONFIG_PPC_64 1 */
-/* #define SLJIT_CONFIG_MIPS_32 1 */
-/* #define SLJIT_CONFIG_MIPS_64 1 */
-/* #define SLJIT_CONFIG_SPARC_32 1 */
-/* #define SLJIT_CONFIG_TILEGX 1 */
-
-/* #define SLJIT_CONFIG_AUTO 1 */
-/* #define SLJIT_CONFIG_UNSUPPORTED 1 */
-
-/* --------------------------------------------------------------------- */
-/*  Utilities                                                            */
-/* --------------------------------------------------------------------- */
-
-/* Useful for thread-safe compiling of global functions. */
-#ifndef SLJIT_UTIL_GLOBAL_LOCK
-/* Enabled by default */
-#define SLJIT_UTIL_GLOBAL_LOCK 1
-#endif
-
-/* Implements a stack like data structure (by using mmap / VirtualAlloc). */
-#ifndef SLJIT_UTIL_STACK
-/* Enabled by default */
-#define SLJIT_UTIL_STACK 1
-#endif
-
-/* Single threaded application. Does not require any locks. */
-#ifndef SLJIT_SINGLE_THREADED
-/* Disabled by default. */
-#define SLJIT_SINGLE_THREADED 0
-#endif
-
-/* --------------------------------------------------------------------- */
-/*  Configuration                                                        */
-/* --------------------------------------------------------------------- */
-
-/* If SLJIT_STD_MACROS_DEFINED is not defined, the application should
-   define SLJIT_MALLOC, SLJIT_FREE, SLJIT_MEMMOVE, and NULL. */
-#ifndef SLJIT_STD_MACROS_DEFINED
-/* Disabled by default. */
-#define SLJIT_STD_MACROS_DEFINED 0
-#endif
-
-/* Executable code allocation:
-   If SLJIT_EXECUTABLE_ALLOCATOR is not defined, the application should
-   define both SLJIT_MALLOC_EXEC and SLJIT_FREE_EXEC. */
-#ifndef SLJIT_EXECUTABLE_ALLOCATOR
-/* Enabled by default. */
-#define SLJIT_EXECUTABLE_ALLOCATOR 1
-#endif
-
-/* Force cdecl calling convention even if a better calling
-   convention (e.g. fastcall) is supported by the C compiler.
-   If this option is enabled, C functions without
-   SLJIT_CALL can also be called from JIT code. */
-#ifndef SLJIT_USE_CDECL_CALLING_CONVENTION
-/* Disabled by default */
-#define SLJIT_USE_CDECL_CALLING_CONVENTION 0
-#endif
-
-/* Return with error when an invalid argument is passed. */
-#ifndef SLJIT_ARGUMENT_CHECKS
-/* Disabled by default */
-#define SLJIT_ARGUMENT_CHECKS 0
-#endif
-
-/* Debug checks (assertions, etc.). */
-#ifndef SLJIT_DEBUG
-/* Enabled by default */
-#define SLJIT_DEBUG 1
-#endif
-
-/* Verbose operations. */
-#ifndef SLJIT_VERBOSE
-/* Enabled by default */
-#define SLJIT_VERBOSE 1
-#endif
-
-/*
-  SLJIT_IS_FPU_AVAILABLE
-    The availability of the FPU can be controlled by SLJIT_IS_FPU_AVAILABLE.
-      zero value - FPU is NOT present.
-      nonzero value - FPU is present.
-*/
-
-/* For further configurations, see the beginning of sljitConfigInternal.h */
-
-#endif
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitConfigInternal.h r-base-3.3.1/src/extra/pcre/sljit/sljitConfigInternal.h
--- r-base-3.2.3/src/extra/pcre/sljit/sljitConfigInternal.h	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitConfigInternal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,713 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _SLJIT_CONFIG_INTERNAL_H_
-#define _SLJIT_CONFIG_INTERNAL_H_
-
-/*
-   SLJIT defines the following architecture dependent types and macros:
-
-   Types:
-     sljit_sb, sljit_ub : signed and unsigned 8 bit byte
-     sljit_sh, sljit_uh : signed and unsigned 16 bit half-word (short) type
-     sljit_si, sljit_ui : signed and unsigned 32 bit integer type
-     sljit_sw, sljit_uw : signed and unsigned machine word, enough to store a pointer
-     sljit_p : unsgined pointer value (usually the same as sljit_uw, but
-               some 64 bit ABIs may use 32 bit pointers)
-     sljit_s : single precision floating point value
-     sljit_d : double precision floating point value
-
-   Macros for feature detection (boolean):
-     SLJIT_32BIT_ARCHITECTURE : 32 bit architecture
-     SLJIT_64BIT_ARCHITECTURE : 64 bit architecture
-     SLJIT_LITTLE_ENDIAN : little endian architecture
-     SLJIT_BIG_ENDIAN : big endian architecture
-     SLJIT_UNALIGNED : allows unaligned memory accesses for non-fpu operations (only!)
-     SLJIT_INDIRECT_CALL : see SLJIT_FUNC_OFFSET() for more information
-
-   Constants:
-     SLJIT_NUMBER_OF_REGISTERS : number of available registers
-     SLJIT_NUMBER_OF_SCRATCH_REGISTERS : number of available scratch registers
-     SLJIT_NUMBER_OF_SAVED_REGISTERS : number of available saved registers
-     SLJIT_NUMBER_OF_FLOAT_REGISTERS : number of available floating point registers
-     SLJIT_NUMBER_OF_SCRATCH_FLOAT_REGISTERS : number of available floating point scratch registers
-     SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS : number of available floating point saved registers
-     SLJIT_WORD_SHIFT : the shift required to apply when accessing a sljit_sw/sljit_uw array by index
-     SLJIT_DOUBLE_SHIFT : the shift required to apply when accessing
-                          a double precision floating point array by index
-     SLJIT_SINGLE_SHIFT : the shift required to apply when accessing
-                          a single precision floating point array by index
-     SLJIT_LOCALS_OFFSET : local space starting offset (SLJIT_SP + SLJIT_LOCALS_OFFSET)
-     SLJIT_RETURN_ADDRESS_OFFSET : a return instruction always adds this offset to the return address
-
-   Other macros:
-     SLJIT_CALL : C calling convention define for both calling JIT form C and C callbacks for JIT
-     SLJIT_W(number) : defining 64 bit constants on 64 bit architectures (compiler independent helper)
-*/
-
-/*****************/
-/* Sanity check. */
-/*****************/
-
-#if !((defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) \
-	|| (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) \
-	|| (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) \
-	|| (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7) \
-	|| (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2) \
-	|| (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64) \
-	|| (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) \
-	|| (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) \
-	|| (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32) \
-	|| (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) \
-	|| (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) \
-	|| (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX) \
-	|| (defined SLJIT_CONFIG_AUTO && SLJIT_CONFIG_AUTO) \
-	|| (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED))
-#error "An architecture must be selected"
-#endif
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) \
-	+ (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) \
-	+ (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) \
-	+ (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7) \
-	+ (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2) \
-	+ (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64) \
-	+ (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) \
-	+ (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) \
-	+ (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX) \
-	+ (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32) \
-	+ (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) \
-	+ (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) \
-	+ (defined SLJIT_CONFIG_AUTO && SLJIT_CONFIG_AUTO) \
-	+ (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) >= 2
-#error "Multiple architectures are selected"
-#endif
-
-/********************************************************/
-/* Automatic CPU detection (requires compiler support). */
-/********************************************************/
-
-#if (defined SLJIT_CONFIG_AUTO && SLJIT_CONFIG_AUTO)
-
-#ifndef _WIN32
-
-#if defined(__i386__) || defined(__i386)
-#define SLJIT_CONFIG_X86_32 1
-#elif defined(__x86_64__)
-#define SLJIT_CONFIG_X86_64 1
-#elif defined(__arm__) || defined(__ARM__)
-#ifdef __thumb2__
-#define SLJIT_CONFIG_ARM_THUMB2 1
-#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__)
-#define SLJIT_CONFIG_ARM_V7 1
-#else
-#define SLJIT_CONFIG_ARM_V5 1
-#endif
-#elif defined (__aarch64__)
-#define SLJIT_CONFIG_ARM_64 1
-#elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) || (defined(_POWER) && defined(__64BIT__))
-#define SLJIT_CONFIG_PPC_64 1
-#elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
-#define SLJIT_CONFIG_PPC_32 1
-#elif defined(__mips__) && !defined(_LP64)
-#define SLJIT_CONFIG_MIPS_32 1
-#elif defined(__mips64)
-#define SLJIT_CONFIG_MIPS_64 1
-#elif defined(__sparc__) || defined(__sparc)
-#define SLJIT_CONFIG_SPARC_32 1
-#elif defined(__tilegx__)
-#define SLJIT_CONFIG_TILEGX 1
-#else
-/* Unsupported architecture */
-#define SLJIT_CONFIG_UNSUPPORTED 1
-#endif
-
-#else /* !_WIN32 */
-
-#if defined(_M_X64) || defined(__x86_64__)
-#define SLJIT_CONFIG_X86_64 1
-#elif defined(_ARM_)
-#define SLJIT_CONFIG_ARM_V5 1
-#else
-#define SLJIT_CONFIG_X86_32 1
-#endif
-
-#endif /* !WIN32 */
-#endif /* SLJIT_CONFIG_AUTO */
-
-#if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
-#undef SLJIT_EXECUTABLE_ALLOCATOR
-#endif
-
-/******************************/
-/* CPU family type detection. */
-/******************************/
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7) \
-	|| (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-#define SLJIT_CONFIG_ARM_32 1
-#endif
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-#define SLJIT_CONFIG_X86 1
-#elif (defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32) || (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
-#define SLJIT_CONFIG_ARM 1
-#elif (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) || (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define SLJIT_CONFIG_PPC 1
-#elif (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32) || (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
-#define SLJIT_CONFIG_MIPS 1
-#elif (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) || (defined SLJIT_CONFIG_SPARC_64 && SLJIT_CONFIG_SPARC_64)
-#define SLJIT_CONFIG_SPARC 1
-#endif
-
-/**********************************/
-/* External function definitions. */
-/**********************************/
-
-#if !(defined SLJIT_STD_MACROS_DEFINED && SLJIT_STD_MACROS_DEFINED)
-
-/* These libraries are needed for the macros below. */
-#include <stdlib.h>
-#include <string.h>
-
-#endif /* SLJIT_STD_MACROS_DEFINED */
-
-/* General macros:
-   Note: SLJIT is designed to be independent from them as possible.
-
-   In release mode (SLJIT_DEBUG is not defined) only the following
-   external functions are needed:
-*/
-
-#ifndef SLJIT_MALLOC
-#define SLJIT_MALLOC(size, allocator_data) malloc(size)
-#endif
-
-#ifndef SLJIT_FREE
-#define SLJIT_FREE(ptr, allocator_data) free(ptr)
-#endif
-
-#ifndef SLJIT_MEMMOVE
-#define SLJIT_MEMMOVE(dest, src, len) memmove(dest, src, len)
-#endif
-
-#ifndef SLJIT_ZEROMEM
-#define SLJIT_ZEROMEM(dest, len) memset(dest, 0, len)
-#endif
-
-/***************************/
-/* Compiler helper macros. */
-/***************************/
-
-#if !defined(SLJIT_LIKELY) && !defined(SLJIT_UNLIKELY)
-
-#if defined(__GNUC__) && (__GNUC__ >= 3)
-#define SLJIT_LIKELY(x)		__builtin_expect((x), 1)
-#define SLJIT_UNLIKELY(x)	__builtin_expect((x), 0)
-#else
-#define SLJIT_LIKELY(x)		(x)
-#define SLJIT_UNLIKELY(x)	(x)
-#endif
-
-#endif /* !defined(SLJIT_LIKELY) && !defined(SLJIT_UNLIKELY) */
-
-#ifndef SLJIT_INLINE
-/* Inline functions. Some old compilers do not support them. */
-#if defined(__SUNPRO_C) && __SUNPRO_C <= 0x510
-#define SLJIT_INLINE
-#else
-#define SLJIT_INLINE __inline
-#endif
-#endif /* !SLJIT_INLINE */
-
-#ifndef SLJIT_NOINLINE
-/* Not inline functions. */
-#if defined(__GNUC__)
-#define SLJIT_NOINLINE __attribute__ ((noinline))
-#else
-#define SLJIT_NOINLINE
-#endif
-#endif /* !SLJIT_INLINE */
-
-#ifndef SLJIT_CONST
-/* Const variables. */
-#define SLJIT_CONST const
-#endif
-
-#ifndef SLJIT_UNUSED_ARG
-/* Unused arguments. */
-#define SLJIT_UNUSED_ARG(arg) (void)arg
-#endif
-
-/*********************************/
-/* Type of public API functions. */
-/*********************************/
-
-#if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC)
-/* Static ABI functions. For all-in-one programs. */
-
-#if defined(__GNUC__)
-/* Disable unused warnings in gcc. */
-#define SLJIT_API_FUNC_ATTRIBUTE static __attribute__((unused))
-#else
-#define SLJIT_API_FUNC_ATTRIBUTE static
-#endif
-
-#else
-#define SLJIT_API_FUNC_ATTRIBUTE
-#endif /* (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC) */
-
-/****************************/
-/* Instruction cache flush. */
-/****************************/
-
-#ifndef SLJIT_CACHE_FLUSH
-
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-
-/* Not required to implement on archs with unified caches. */
-#define SLJIT_CACHE_FLUSH(from, to)
-
-#elif defined __APPLE__
-
-/* Supported by all macs since Mac OS 10.5.
-   However, it does not work on non-jailbroken iOS devices,
-   although the compilation is successful. */
-
-#define SLJIT_CACHE_FLUSH(from, to) \
-	sys_icache_invalidate((char*)(from), (char*)(to) - (char*)(from))
-
-#elif defined __ANDROID__
-
-/* Android lacks __clear_cache; instead, cacheflush should be used. */
-
-#define SLJIT_CACHE_FLUSH(from, to) \
-    cacheflush((long)(from), (long)(to), 0)
-
-#elif (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
-
-/* The __clear_cache() implementation of GCC is a dummy function on PowerPC. */
-#define SLJIT_CACHE_FLUSH(from, to) \
-	ppc_cache_flush((from), (to))
-
-#elif (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-
-/* The __clear_cache() implementation of GCC is a dummy function on Sparc. */
-#define SLJIT_CACHE_FLUSH(from, to) \
-	sparc_cache_flush((from), (to))
-
-#else
-
-/* Calls __ARM_NR_cacheflush on ARM-Linux. */
-#define SLJIT_CACHE_FLUSH(from, to) \
-	__clear_cache((char*)(from), (char*)(to))
-
-#endif
-
-#endif /* !SLJIT_CACHE_FLUSH */
-
-/******************************************************/
-/* Byte/half/int/word/single/double type definitions. */
-/******************************************************/
-
-/* 8 bit byte type. */
-typedef unsigned char sljit_ub;
-typedef signed char sljit_sb;
-
-/* 16 bit half-word type. */
-typedef unsigned short int sljit_uh;
-typedef signed short int sljit_sh;
-
-/* 32 bit integer type. */
-typedef unsigned int sljit_ui;
-typedef signed int sljit_si;
-
-/* Machine word type. Enough for storing a pointer.
-     32 bit for 32 bit machines.
-     64 bit for 64 bit machines. */
-#if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
-/* Just to have something. */
-#define SLJIT_WORD_SHIFT 0
-typedef unsigned long int sljit_uw;
-typedef long int sljit_sw;
-#elif !(defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) \
-	&& !(defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64) \
-	&& !(defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) \
-	&& !(defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) \
-	&& !(defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX)
-#define SLJIT_32BIT_ARCHITECTURE 1
-#define SLJIT_WORD_SHIFT 2
-typedef unsigned int sljit_uw;
-typedef int sljit_sw;
-#else
-#define SLJIT_64BIT_ARCHITECTURE 1
-#define SLJIT_WORD_SHIFT 3
-#ifdef _WIN32
-typedef unsigned __int64 sljit_uw;
-typedef __int64 sljit_sw;
-#else
-typedef unsigned long int sljit_uw;
-typedef long int sljit_sw;
-#endif
-#endif
-
-typedef sljit_uw sljit_p;
-
-/* Floating point types. */
-typedef float sljit_s;
-typedef double sljit_d;
-
-/* Shift for pointer sized data. */
-#define SLJIT_POINTER_SHIFT SLJIT_WORD_SHIFT
-
-/* Shift for double precision sized data. */
-#define SLJIT_DOUBLE_SHIFT 3
-#define SLJIT_SINGLE_SHIFT 2
-
-#ifndef SLJIT_W
-
-/* Defining long constants. */
-#if (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
-#define SLJIT_W(w)	(w##ll)
-#else
-#define SLJIT_W(w)	(w)
-#endif
-
-#endif /* !SLJIT_W */
-
-/*************************/
-/* Endianness detection. */
-/*************************/
-
-#if !defined(SLJIT_BIG_ENDIAN) && !defined(SLJIT_LITTLE_ENDIAN)
-
-/* These macros are mostly useful for the applications. */
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) \
-	|| (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-
-#ifdef __LITTLE_ENDIAN__
-#define SLJIT_LITTLE_ENDIAN 1
-#else
-#define SLJIT_BIG_ENDIAN 1
-#endif
-
-#elif (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32) \
-	|| (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
-
-#ifdef __MIPSEL__
-#define SLJIT_LITTLE_ENDIAN 1
-#else
-#define SLJIT_BIG_ENDIAN 1
-#endif
-
-#elif (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-
-#define SLJIT_BIG_ENDIAN 1
-
-#else
-#define SLJIT_LITTLE_ENDIAN 1
-#endif
-
-#endif /* !defined(SLJIT_BIG_ENDIAN) && !defined(SLJIT_LITTLE_ENDIAN) */
-
-/* Sanity check. */
-#if (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN) && (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-#error "Exactly one endianness must be selected"
-#endif
-
-#if !(defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN) && !(defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-#error "Exactly one endianness must be selected"
-#endif
-
-#ifndef SLJIT_UNALIGNED
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) \
-	|| (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) \
-	|| (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7) \
-	|| (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2) \
-	|| (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64) \
-	|| (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) \
-	|| (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define SLJIT_UNALIGNED 1
-#endif
-
-#endif /* !SLJIT_UNALIGNED */
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-/* Auto detect SSE2 support using CPUID.
-   On 64 bit x86 cpus, sse2 must be present. */
-#define SLJIT_DETECT_SSE2 1
-#endif
-
-/*****************************************************************************************/
-/* Calling convention of functions generated by SLJIT or called from the generated code. */
-/*****************************************************************************************/
-
-#ifndef SLJIT_CALL
-
-#if (defined SLJIT_USE_CDECL_CALLING_CONVENTION && SLJIT_USE_CDECL_CALLING_CONVENTION)
-
-/* Force cdecl. */
-#define SLJIT_CALL
-
-#elif (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-
-#if defined(__GNUC__) && !defined(__APPLE__)
-
-#define SLJIT_CALL __attribute__ ((fastcall))
-#define SLJIT_X86_32_FASTCALL 1
-
-#elif defined(_MSC_VER)
-
-#define SLJIT_CALL __fastcall
-#define SLJIT_X86_32_FASTCALL 1
-
-#elif defined(__BORLANDC__)
-
-#define SLJIT_CALL __msfastcall
-#define SLJIT_X86_32_FASTCALL 1
-
-#else /* Unknown compiler. */
-
-/* The cdecl attribute is the default. */
-#define SLJIT_CALL
-
-#endif
-
-#else /* Non x86-32 architectures. */
-
-#define SLJIT_CALL
-
-#endif /* SLJIT_CONFIG_X86_32 */
-
-#endif /* !SLJIT_CALL */
-
-#ifndef SLJIT_INDIRECT_CALL
-#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)) \
-	|| ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && defined _AIX)
-/* It seems certain ppc compilers use an indirect addressing for functions
-   which makes things complicated. */
-#define SLJIT_INDIRECT_CALL 1
-#endif
-#endif /* SLJIT_INDIRECT_CALL */
-
-/* The offset which needs to be substracted from the return address to
-determine the next executed instruction after return. */
-#ifndef SLJIT_RETURN_ADDRESS_OFFSET
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-#define SLJIT_RETURN_ADDRESS_OFFSET 8
-#else
-#define SLJIT_RETURN_ADDRESS_OFFSET 0
-#endif
-#endif /* SLJIT_RETURN_ADDRESS_OFFSET */
-
-/***************************************************/
-/* Functions of the built-in executable allocator. */
-/***************************************************/
-
-#if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size);
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_exec(void* ptr);
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void);
-#define SLJIT_MALLOC_EXEC(size) sljit_malloc_exec(size)
-#define SLJIT_FREE_EXEC(ptr) sljit_free_exec(ptr)
-#endif
-
-/**********************************************/
-/* Registers and locals offset determination. */
-/**********************************************/
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-
-#define SLJIT_NUMBER_OF_REGISTERS 10
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 7
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-#define SLJIT_LOCALS_OFFSET_BASE ((2 + 4) * sizeof(sljit_sw))
-#else
-/* Maximum 3 arguments are passed on the stack, +1 for double alignment. */
-#define SLJIT_LOCALS_OFFSET_BASE ((3 + 1 + 4) * sizeof(sljit_sw))
-#endif /* SLJIT_X86_32_FASTCALL */
-
-#elif (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-
-#ifndef _WIN64
-#define SLJIT_NUMBER_OF_REGISTERS 12
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 6
-#define SLJIT_LOCALS_OFFSET_BASE (sizeof(sljit_sw))
-#else
-#define SLJIT_NUMBER_OF_REGISTERS 12
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 8
-#define SLJIT_LOCALS_OFFSET_BASE ((4 + 2) * sizeof(sljit_sw))
-#endif /* _WIN64 */
-
-#elif (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
-
-#define SLJIT_NUMBER_OF_REGISTERS 11
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 8
-#define SLJIT_LOCALS_OFFSET_BASE 0
-
-#elif (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-
-#define SLJIT_NUMBER_OF_REGISTERS 11
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 7
-#define SLJIT_LOCALS_OFFSET_BASE 0
-
-#elif (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
-
-#define SLJIT_NUMBER_OF_REGISTERS 25
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 10
-#define SLJIT_LOCALS_OFFSET_BASE (2 * sizeof(sljit_sw))
-
-#elif (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
-
-#define SLJIT_NUMBER_OF_REGISTERS 22
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 17
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) || (defined _AIX)
-#define SLJIT_LOCALS_OFFSET_BASE ((6 + 8) * sizeof(sljit_sw))
-#elif (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-/* Add +1 for double alignment. */
-#define SLJIT_LOCALS_OFFSET_BASE ((3 + 1) * sizeof(sljit_sw))
-#else
-#define SLJIT_LOCALS_OFFSET_BASE (3 * sizeof(sljit_sw))
-#endif /* SLJIT_CONFIG_PPC_64 || _AIX */
-
-#elif (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
-
-#define SLJIT_NUMBER_OF_REGISTERS 17
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 8
-#if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
-#define SLJIT_LOCALS_OFFSET_BASE (4 * sizeof(sljit_sw))
-#else
-#define SLJIT_LOCALS_OFFSET_BASE 0
-#endif
-
-#elif (defined SLJIT_CONFIG_SPARC && SLJIT_CONFIG_SPARC)
-
-#define SLJIT_NUMBER_OF_REGISTERS 18
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 14
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-/* Add +1 for double alignment. */
-#define SLJIT_LOCALS_OFFSET_BASE ((23 + 1) * sizeof(sljit_sw))
-#endif
-
-#elif (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX)
-
-#define SLJIT_NUMBER_OF_REGISTERS 10
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 5
-#define SLJIT_LOCALS_OFFSET_BASE 0
-
-#elif (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
-
-#define SLJIT_NUMBER_OF_REGISTERS 0
-#define SLJIT_NUMBER_OF_SAVED_REGISTERS 0
-#define SLJIT_LOCALS_OFFSET_BASE 0
-
-#endif
-
-#define SLJIT_LOCALS_OFFSET (SLJIT_LOCALS_OFFSET_BASE)
-
-#define SLJIT_NUMBER_OF_SCRATCH_REGISTERS \
-	(SLJIT_NUMBER_OF_REGISTERS - SLJIT_NUMBER_OF_SAVED_REGISTERS)
-
-#define SLJIT_NUMBER_OF_FLOAT_REGISTERS 6
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) && (defined _WIN64)
-#define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 1
-#else
-#define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 0
-#endif
-
-#define SLJIT_NUMBER_OF_SCRATCH_FLOAT_REGISTERS \
-	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS)
-
-/*************************************/
-/* Debug and verbose related macros. */
-/*************************************/
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-#include <stdio.h>
-#endif
-
-#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
-
-#if !defined(SLJIT_ASSERT) || !defined(SLJIT_ASSERT_STOP)
-
-/* SLJIT_HALT_PROCESS must halt the process. */
-#ifndef SLJIT_HALT_PROCESS
-#include <stdlib.h>
-
-#define SLJIT_HALT_PROCESS() \
-	abort();
-#endif /* !SLJIT_HALT_PROCESS */
-
-#include <stdio.h>
-
-#endif /* !SLJIT_ASSERT || !SLJIT_ASSERT_STOP */
-
-/* Feel free to redefine these two macros. */
-#ifndef SLJIT_ASSERT
-
-#define SLJIT_ASSERT(x) \
-	do { \
-		if (SLJIT_UNLIKELY(!(x))) { \
-			printf("Assertion failed at " __FILE__ ":%d\n", __LINE__); \
-			SLJIT_HALT_PROCESS(); \
-		} \
-	} while (0)
-
-#endif /* !SLJIT_ASSERT */
-
-#ifndef SLJIT_ASSERT_STOP
-
-#define SLJIT_ASSERT_STOP() \
-	do { \
-		printf("Should never been reached " __FILE__ ":%d\n", __LINE__); \
-		SLJIT_HALT_PROCESS(); \
-	} while (0)
-
-#endif /* !SLJIT_ASSERT_STOP */
-
-#else /* (defined SLJIT_DEBUG && SLJIT_DEBUG) */
-
-/* Forcing empty, but valid statements. */
-#undef SLJIT_ASSERT
-#undef SLJIT_ASSERT_STOP
-
-#define SLJIT_ASSERT(x) \
-	do { } while (0)
-#define SLJIT_ASSERT_STOP() \
-	do { } while (0)
-
-#endif /* (defined SLJIT_DEBUG && SLJIT_DEBUG) */
-
-#ifndef SLJIT_COMPILE_ASSERT
-
-/* Should be improved eventually. */
-#define SLJIT_COMPILE_ASSERT(x, description) \
-	SLJIT_ASSERT(x)
-
-#endif /* !SLJIT_COMPILE_ASSERT */
-
-#endif
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitExecAllocator.c r-base-3.3.1/src/extra/pcre/sljit/sljitExecAllocator.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitExecAllocator.c	2013-12-30 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitExecAllocator.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,312 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
-   This file contains a simple executable memory allocator
-
-   It is assumed, that executable code blocks are usually medium (or sometimes
-   large) memory blocks, and the allocator is not too frequently called (less
-   optimized than other allocators). Thus, using it as a generic allocator is
-   not suggested.
-
-   How does it work:
-     Memory is allocated in continuous memory areas called chunks by alloc_chunk()
-     Chunk format:
-     [ block ][ block ] ... [ block ][ block terminator ]
-
-   All blocks and the block terminator is started with block_header. The block
-   header contains the size of the previous and the next block. These sizes
-   can also contain special values.
-     Block size:
-       0 - The block is a free_block, with a different size member.
-       1 - The block is a block terminator.
-       n - The block is used at the moment, and the value contains its size.
-     Previous block size:
-       0 - This is the first block of the memory chunk.
-       n - The size of the previous block.
-
-   Using these size values we can go forward or backward on the block chain.
-   The unused blocks are stored in a chain list pointed by free_blocks. This
-   list is useful if we need to find a suitable memory area when the allocator
-   is called.
-
-   When a block is freed, the new free block is connected to its adjacent free
-   blocks if possible.
-
-     [ free block ][ used block ][ free block ]
-   and "used block" is freed, the three blocks are connected together:
-     [           one big free block           ]
-*/
-
-/* --------------------------------------------------------------------- */
-/*  System (OS) functions                                                */
-/* --------------------------------------------------------------------- */
-
-/* 64 KByte. */
-#define CHUNK_SIZE	0x10000
-
-/*
-   alloc_chunk / free_chunk :
-     * allocate executable system memory chunks
-     * the size is always divisible by CHUNK_SIZE
-   allocator_grab_lock / allocator_release_lock :
-     * make the allocator thread safe
-     * can be empty if the OS (or the application) does not support threading
-     * only the allocator requires this lock, sljit is fully thread safe
-       as it only uses local variables
-*/
-
-#ifdef _WIN32
-
-static SLJIT_INLINE void* alloc_chunk(sljit_uw size)
-{
-	return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
-}
-
-static SLJIT_INLINE void free_chunk(void* chunk, sljit_uw size)
-{
-	SLJIT_UNUSED_ARG(size);
-	VirtualFree(chunk, 0, MEM_RELEASE);
-}
-
-#else
-
-static SLJIT_INLINE void* alloc_chunk(sljit_uw size)
-{
-	void* retval;
-
-#ifdef MAP_ANON
-	retval = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1, 0);
-#else
-	if (dev_zero < 0) {
-		if (open_dev_zero())
-			return NULL;
-	}
-	retval = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, dev_zero, 0);
-#endif
-
-	return (retval != MAP_FAILED) ? retval : NULL;
-}
-
-static SLJIT_INLINE void free_chunk(void* chunk, sljit_uw size)
-{
-	munmap(chunk, size);
-}
-
-#endif
-
-/* --------------------------------------------------------------------- */
-/*  Common functions                                                     */
-/* --------------------------------------------------------------------- */
-
-#define CHUNK_MASK	(~(CHUNK_SIZE - 1))
-
-struct block_header {
-	sljit_uw size;
-	sljit_uw prev_size;
-};
-
-struct free_block {
-	struct block_header header;
-	struct free_block *next;
-	struct free_block *prev;
-	sljit_uw size;
-};
-
-#define AS_BLOCK_HEADER(base, offset) \
-	((struct block_header*)(((sljit_ub*)base) + offset))
-#define AS_FREE_BLOCK(base, offset) \
-	((struct free_block*)(((sljit_ub*)base) + offset))
-#define MEM_START(base)		((void*)(((sljit_ub*)base) + sizeof(struct block_header)))
-#define ALIGN_SIZE(size)	(((size) + sizeof(struct block_header) + 7) & ~7)
-
-static struct free_block* free_blocks;
-static sljit_uw allocated_size;
-static sljit_uw total_size;
-
-static SLJIT_INLINE void sljit_insert_free_block(struct free_block *free_block, sljit_uw size)
-{
-	free_block->header.size = 0;
-	free_block->size = size;
-
-	free_block->next = free_blocks;
-	free_block->prev = 0;
-	if (free_blocks)
-		free_blocks->prev = free_block;
-	free_blocks = free_block;
-}
-
-static SLJIT_INLINE void sljit_remove_free_block(struct free_block *free_block)
-{
-	if (free_block->next)
-		free_block->next->prev = free_block->prev;
-
-	if (free_block->prev)
-		free_block->prev->next = free_block->next;
-	else {
-		SLJIT_ASSERT(free_blocks == free_block);
-		free_blocks = free_block->next;
-	}
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size)
-{
-	struct block_header *header;
-	struct block_header *next_header;
-	struct free_block *free_block;
-	sljit_uw chunk_size;
-
-	allocator_grab_lock();
-	if (size < sizeof(struct free_block))
-		size = sizeof(struct free_block);
-	size = ALIGN_SIZE(size);
-
-	free_block = free_blocks;
-	while (free_block) {
-		if (free_block->size >= size) {
-			chunk_size = free_block->size;
-			if (chunk_size > size + 64) {
-				/* We just cut a block from the end of the free block. */
-				chunk_size -= size;
-				free_block->size = chunk_size;
-				header = AS_BLOCK_HEADER(free_block, chunk_size);
-				header->prev_size = chunk_size;
-				AS_BLOCK_HEADER(header, size)->prev_size = size;
-			}
-			else {
-				sljit_remove_free_block(free_block);
-				header = (struct block_header*)free_block;
-				size = chunk_size;
-			}
-			allocated_size += size;
-			header->size = size;
-			allocator_release_lock();
-			return MEM_START(header);
-		}
-		free_block = free_block->next;
-	}
-
-	chunk_size = (size + sizeof(struct block_header) + CHUNK_SIZE - 1) & CHUNK_MASK;
-	header = (struct block_header*)alloc_chunk(chunk_size);
-	if (!header) {
-		allocator_release_lock();
-		return NULL;
-	}
-
-	chunk_size -= sizeof(struct block_header);
-	total_size += chunk_size;
-
-	header->prev_size = 0;
-	if (chunk_size > size + 64) {
-		/* Cut the allocated space into a free and a used block. */
-		allocated_size += size;
-		header->size = size;
-		chunk_size -= size;
-
-		free_block = AS_FREE_BLOCK(header, size);
-		free_block->header.prev_size = size;
-		sljit_insert_free_block(free_block, chunk_size);
-		next_header = AS_BLOCK_HEADER(free_block, chunk_size);
-	}
-	else {
-		/* All space belongs to this allocation. */
-		allocated_size += chunk_size;
-		header->size = chunk_size;
-		next_header = AS_BLOCK_HEADER(header, chunk_size);
-	}
-	next_header->size = 1;
-	next_header->prev_size = chunk_size;
-	allocator_release_lock();
-	return MEM_START(header);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_exec(void* ptr)
-{
-	struct block_header *header;
-	struct free_block* free_block;
-
-	allocator_grab_lock();
-	header = AS_BLOCK_HEADER(ptr, -(sljit_sw)sizeof(struct block_header));
-	allocated_size -= header->size;
-
-	/* Connecting free blocks together if possible. */
-
-	/* If header->prev_size == 0, free_block will equal to header.
-	   In this case, free_block->header.size will be > 0. */
-	free_block = AS_FREE_BLOCK(header, -(sljit_sw)header->prev_size);
-	if (SLJIT_UNLIKELY(!free_block->header.size)) {
-		free_block->size += header->size;
-		header = AS_BLOCK_HEADER(free_block, free_block->size);
-		header->prev_size = free_block->size;
-	}
-	else {
-		free_block = (struct free_block*)header;
-		sljit_insert_free_block(free_block, header->size);
-	}
-
-	header = AS_BLOCK_HEADER(free_block, free_block->size);
-	if (SLJIT_UNLIKELY(!header->size)) {
-		free_block->size += ((struct free_block*)header)->size;
-		sljit_remove_free_block((struct free_block*)header);
-		header = AS_BLOCK_HEADER(free_block, free_block->size);
-		header->prev_size = free_block->size;
-	}
-
-	/* The whole chunk is free. */
-	if (SLJIT_UNLIKELY(!free_block->header.prev_size && header->size == 1)) {
-		/* If this block is freed, we still have (allocated_size / 2) free space. */
-		if (total_size - free_block->size > (allocated_size * 3 / 2)) {
-			total_size -= free_block->size;
-			sljit_remove_free_block(free_block);
-			free_chunk(free_block, free_block->size + sizeof(struct block_header));
-		}
-	}
-
-	allocator_release_lock();
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void)
-{
-	struct free_block* free_block;
-	struct free_block* next_free_block;
-
-	allocator_grab_lock();
-
-	free_block = free_blocks;
-	while (free_block) {
-		next_free_block = free_block->next;
-		if (!free_block->header.prev_size && 
-				AS_BLOCK_HEADER(free_block, free_block->size)->size == 1) {
-			total_size -= free_block->size;
-			sljit_remove_free_block(free_block);
-			free_chunk(free_block, free_block->size + sizeof(struct block_header));
-		}
-		free_block = next_free_block;
-	}
-
-	SLJIT_ASSERT((total_size && free_blocks) || (!total_size && !free_blocks));
-	allocator_release_lock();
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitLir.c r-base-3.3.1/src/extra/pcre/sljit/sljitLir.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitLir.c	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitLir.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2029 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sljitLir.h"
-
-#define CHECK_ERROR() \
-	do { \
-		if (SLJIT_UNLIKELY(compiler->error)) \
-			return compiler->error; \
-	} while (0)
-
-#define CHECK_ERROR_PTR() \
-	do { \
-		if (SLJIT_UNLIKELY(compiler->error)) \
-			return NULL; \
-	} while (0)
-
-#define FAIL_IF(expr) \
-	do { \
-		if (SLJIT_UNLIKELY(expr)) \
-			return compiler->error; \
-	} while (0)
-
-#define PTR_FAIL_IF(expr) \
-	do { \
-		if (SLJIT_UNLIKELY(expr)) \
-			return NULL; \
-	} while (0)
-
-#define FAIL_IF_NULL(ptr) \
-	do { \
-		if (SLJIT_UNLIKELY(!(ptr))) { \
-			compiler->error = SLJIT_ERR_ALLOC_FAILED; \
-			return SLJIT_ERR_ALLOC_FAILED; \
-		} \
-	} while (0)
-
-#define PTR_FAIL_IF_NULL(ptr) \
-	do { \
-		if (SLJIT_UNLIKELY(!(ptr))) { \
-			compiler->error = SLJIT_ERR_ALLOC_FAILED; \
-			return NULL; \
-		} \
-	} while (0)
-
-#define PTR_FAIL_WITH_EXEC_IF(ptr) \
-	do { \
-		if (SLJIT_UNLIKELY(!(ptr))) { \
-			compiler->error = SLJIT_ERR_EX_ALLOC_FAILED; \
-			return NULL; \
-		} \
-	} while (0)
-
-#if !(defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
-
-#define GET_OPCODE(op) \
-	((op) & ~(SLJIT_INT_OP | SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C | SLJIT_KEEP_FLAGS))
-
-#define GET_FLAGS(op) \
-	((op) & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C))
-
-#define GET_ALL_FLAGS(op) \
-	((op) & (SLJIT_INT_OP | SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C | SLJIT_KEEP_FLAGS))
-
-#define TYPE_CAST_NEEDED(op) \
-	(((op) >= SLJIT_MOV_UB && (op) <= SLJIT_MOV_SH) || ((op) >= SLJIT_MOVU_UB && (op) <= SLJIT_MOVU_SH))
-
-#define BUF_SIZE	4096
-
-#if (defined SLJIT_32BIT_ARCHITECTURE && SLJIT_32BIT_ARCHITECTURE)
-#define ABUF_SIZE	2048
-#else
-#define ABUF_SIZE	4096
-#endif
-
-/* Parameter parsing. */
-#define REG_MASK		0x3f
-#define OFFS_REG(reg)		(((reg) >> 8) & REG_MASK)
-#define OFFS_REG_MASK		(REG_MASK << 8)
-#define TO_OFFS_REG(reg)	((reg) << 8)
-/* When reg cannot be unused. */
-#define FAST_IS_REG(reg)	((reg) <= REG_MASK)
-/* When reg can be unused. */
-#define SLOW_IS_REG(reg)	((reg) > 0 && (reg) <= REG_MASK)
-
-/* Jump flags. */
-#define JUMP_LABEL	0x1
-#define JUMP_ADDR	0x2
-/* SLJIT_REWRITABLE_JUMP is 0x1000. */
-
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-#	define PATCH_MB	0x4
-#	define PATCH_MW	0x8
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-#	define PATCH_MD	0x10
-#endif
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
-#	define IS_BL		0x4
-#	define PATCH_B		0x8
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5)
-#	define CPOOL_SIZE	512
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-#	define IS_COND		0x04
-#	define IS_BL		0x08
-	/* conditional + imm8 */
-#	define PATCH_TYPE1	0x10
-	/* conditional + imm20 */
-#	define PATCH_TYPE2	0x20
-	/* IT + imm24 */
-#	define PATCH_TYPE3	0x30
-	/* imm11 */
-#	define PATCH_TYPE4	0x40
-	/* imm24 */
-#	define PATCH_TYPE5	0x50
-	/* BL + imm24 */
-#	define PATCH_BL		0x60
-	/* 0xf00 cc code for branches */
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
-#	define IS_COND		0x004
-#	define IS_CBZ		0x008
-#	define IS_BL		0x010
-#	define PATCH_B		0x020
-#	define PATCH_COND	0x040
-#	define PATCH_ABS48	0x080
-#	define PATCH_ABS64	0x100
-#endif
-
-#if (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
-#	define IS_COND		0x004
-#	define IS_CALL		0x008
-#	define PATCH_B		0x010
-#	define PATCH_ABS_B	0x020
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#	define PATCH_ABS32	0x040
-#	define PATCH_ABS48	0x080
-#endif
-#	define REMOVE_COND	0x100
-#endif
-
-#if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
-#	define IS_MOVABLE	0x004
-#	define IS_JAL		0x008
-#	define IS_CALL		0x010
-#	define IS_BIT26_COND	0x020
-#	define IS_BIT16_COND	0x040
-
-#	define IS_COND		(IS_BIT26_COND | IS_BIT16_COND)
-
-#	define PATCH_B		0x080
-#	define PATCH_J		0x100
-
-#if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
-#	define PATCH_ABS32	0x200
-#	define PATCH_ABS48	0x400
-#endif
-
-	/* instruction types */
-#	define MOVABLE_INS	0
-	/* 1 - 31 last destination register */
-	/* no destination (i.e: store) */
-#	define UNMOVABLE_INS	32
-	/* FPU status register */
-#	define FCSR_FCC		33
-#endif
-
-#if (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX)
-#	define IS_JAL		0x04
-#	define IS_COND		0x08
-
-#	define PATCH_B		0x10
-#	define PATCH_J		0x20
-#endif
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-#	define IS_MOVABLE	0x04
-#	define IS_COND		0x08
-#	define IS_CALL		0x10
-
-#	define PATCH_B		0x20
-#	define PATCH_CALL	0x40
-
-	/* instruction types */
-#	define MOVABLE_INS	0
-	/* 1 - 31 last destination register */
-	/* no destination (i.e: store) */
-#	define UNMOVABLE_INS	32
-
-#	define DST_INS_MASK	0xff
-
-	/* ICC_SET is the same as SET_FLAGS. */
-#	define ICC_IS_SET	(1 << 23)
-#	define FCC_IS_SET	(1 << 24)
-#endif
-
-/* Stack management. */
-
-#define GET_SAVED_REGISTERS_SIZE(scratches, saveds, extra) \
-	(((scratches < SLJIT_NUMBER_OF_SCRATCH_REGISTERS ? 0 : (scratches - SLJIT_NUMBER_OF_SCRATCH_REGISTERS)) + \
-		(saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? saveds : SLJIT_NUMBER_OF_SAVED_REGISTERS) + \
-		extra) * sizeof(sljit_sw))
-
-#define ADJUST_LOCAL_OFFSET(p, i) \
-	if ((p) == (SLJIT_MEM1(SLJIT_SP))) \
-		(i) += SLJIT_LOCALS_OFFSET;
-
-#endif /* !(defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) */
-
-/* Utils can still be used even if SLJIT_CONFIG_UNSUPPORTED is set. */
-#include "sljitUtils.c"
-
-#if !(defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
-
-#if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
-#include "sljitExecAllocator.c"
-#endif
-
-/* Argument checking features. */
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-
-/* Returns with error when an invalid argument is passed. */
-
-#define CHECK_ARGUMENT(x) \
-	do { \
-		if (SLJIT_UNLIKELY(!(x))) \
-			return 1; \
-	} while (0)
-
-#define CHECK_RETURN_TYPE sljit_si
-#define CHECK_RETURN_OK return 0
-
-#define CHECK(x) \
-	do { \
-		if (SLJIT_UNLIKELY(x)) { \
-			compiler->error = SLJIT_ERR_BAD_ARGUMENT; \
-			return SLJIT_ERR_BAD_ARGUMENT; \
-		} \
-	} while (0)
-
-#define CHECK_PTR(x) \
-	do { \
-		if (SLJIT_UNLIKELY(x)) { \
-			compiler->error = SLJIT_ERR_BAD_ARGUMENT; \
-			return NULL; \
-		} \
-	} while (0)
-
-#define CHECK_REG_INDEX(x) \
-	do { \
-		if (SLJIT_UNLIKELY(x)) { \
-			return -2; \
-		} \
-	} while (0)
-
-#elif (defined SLJIT_DEBUG && SLJIT_DEBUG)
-
-/* Assertion failure occures if an invalid argument is passed. */
-#undef SLJIT_ARGUMENT_CHECKS
-#define SLJIT_ARGUMENT_CHECKS 1
-
-#define CHECK_ARGUMENT(x) SLJIT_ASSERT(x)
-#define CHECK_RETURN_TYPE void
-#define CHECK_RETURN_OK return
-#define CHECK(x) x
-#define CHECK_PTR(x) x
-#define CHECK_REG_INDEX(x) x
-
-#elif (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-
-/* Arguments are not checked. */
-#define CHECK_RETURN_TYPE void
-#define CHECK_RETURN_OK return
-#define CHECK(x) x
-#define CHECK_PTR(x) x
-#define CHECK_REG_INDEX(x) x
-
-#else
-
-/* Arguments are not checked. */
-#define CHECK(x)
-#define CHECK_PTR(x)
-#define CHECK_REG_INDEX(x)
-
-#endif /* SLJIT_ARGUMENT_CHECKS */
-
-/* --------------------------------------------------------------------- */
-/*  Public functions                                                     */
-/* --------------------------------------------------------------------- */
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) || (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-#define SLJIT_NEEDS_COMPILER_INIT 1
-static sljit_si compiler_initialized = 0;
-/* A thread safe initialization. */
-static void init_compiler(void);
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data)
-{
-	struct sljit_compiler *compiler = (struct sljit_compiler*)SLJIT_MALLOC(sizeof(struct sljit_compiler), allocator_data);
-	if (!compiler)
-		return NULL;
-	SLJIT_ZEROMEM(compiler, sizeof(struct sljit_compiler));
-
-	SLJIT_COMPILE_ASSERT(
-		sizeof(sljit_sb) == 1 && sizeof(sljit_ub) == 1
-		&& sizeof(sljit_sh) == 2 && sizeof(sljit_uh) == 2
-		&& sizeof(sljit_si) == 4 && sizeof(sljit_ui) == 4
-		&& (sizeof(sljit_p) == 4 || sizeof(sljit_p) == 8)
-		&& sizeof(sljit_p) <= sizeof(sljit_sw)
-		&& (sizeof(sljit_sw) == 4 || sizeof(sljit_sw) == 8)
-		&& (sizeof(sljit_uw) == 4 || sizeof(sljit_uw) == 8),
-		invalid_integer_types);
-	SLJIT_COMPILE_ASSERT(SLJIT_INT_OP == SLJIT_SINGLE_OP,
-		int_op_and_single_op_must_be_the_same);
-	SLJIT_COMPILE_ASSERT(SLJIT_REWRITABLE_JUMP != SLJIT_SINGLE_OP,
-		rewritable_jump_and_single_op_must_not_be_the_same);
-
-	/* Only the non-zero members must be set. */
-	compiler->error = SLJIT_SUCCESS;
-
-	compiler->allocator_data = allocator_data;
-	compiler->buf = (struct sljit_memory_fragment*)SLJIT_MALLOC(BUF_SIZE, allocator_data);
-	compiler->abuf = (struct sljit_memory_fragment*)SLJIT_MALLOC(ABUF_SIZE, allocator_data);
-
-	if (!compiler->buf || !compiler->abuf) {
-		if (compiler->buf)
-			SLJIT_FREE(compiler->buf, allocator_data);
-		if (compiler->abuf)
-			SLJIT_FREE(compiler->abuf, allocator_data);
-		SLJIT_FREE(compiler, allocator_data);
-		return NULL;
-	}
-
-	compiler->buf->next = NULL;
-	compiler->buf->used_size = 0;
-	compiler->abuf->next = NULL;
-	compiler->abuf->used_size = 0;
-
-	compiler->scratches = -1;
-	compiler->saveds = -1;
-	compiler->fscratches = -1;
-	compiler->fsaveds = -1;
-	compiler->local_size = -1;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	compiler->args = -1;
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5)
-	compiler->cpool = (sljit_uw*)SLJIT_MALLOC(CPOOL_SIZE * sizeof(sljit_uw)
-		+ CPOOL_SIZE * sizeof(sljit_ub), allocator_data);
-	if (!compiler->cpool) {
-		SLJIT_FREE(compiler->buf, allocator_data);
-		SLJIT_FREE(compiler->abuf, allocator_data);
-		SLJIT_FREE(compiler, allocator_data);
-		return NULL;
-	}
-	compiler->cpool_unique = (sljit_ub*)(compiler->cpool + CPOOL_SIZE);
-	compiler->cpool_diff = 0xffffffff;
-#endif
-
-#if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
-	compiler->delay_slot = UNMOVABLE_INS;
-#endif
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-	compiler->delay_slot = UNMOVABLE_INS;
-#endif
-
-#if (defined SLJIT_NEEDS_COMPILER_INIT && SLJIT_NEEDS_COMPILER_INIT)
-	if (!compiler_initialized) {
-		init_compiler();
-		compiler_initialized = 1;
-	}
-#endif
-
-	return compiler;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_compiler(struct sljit_compiler *compiler)
-{
-	struct sljit_memory_fragment *buf;
-	struct sljit_memory_fragment *curr;
-	void *allocator_data = compiler->allocator_data;
-	SLJIT_UNUSED_ARG(allocator_data);
-
-	buf = compiler->buf;
-	while (buf) {
-		curr = buf;
-		buf = buf->next;
-		SLJIT_FREE(curr, allocator_data);
-	}
-
-	buf = compiler->abuf;
-	while (buf) {
-		curr = buf;
-		buf = buf->next;
-		SLJIT_FREE(curr, allocator_data);
-	}
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5)
-	SLJIT_FREE(compiler->cpool, allocator_data);
-#endif
-	SLJIT_FREE(compiler, allocator_data);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_compiler_memory_error(struct sljit_compiler *compiler)
-{
-	if (compiler->error == SLJIT_SUCCESS)
-		compiler->error = SLJIT_ERR_ALLOC_FAILED;
-}
-
-#if (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code)
-{
-	/* Remove thumb mode flag. */
-	SLJIT_FREE_EXEC((void*)((sljit_uw)code & ~0x1));
-}
-#elif (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code)
-{
-	/* Resolve indirection. */
-	code = (void*)(*(sljit_uw*)code);
-	SLJIT_FREE_EXEC(code);
-}
-#else
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code)
-{
-	SLJIT_FREE_EXEC(code);
-}
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_label(struct sljit_jump *jump, struct sljit_label* label)
-{
-	if (SLJIT_LIKELY(!!jump) && SLJIT_LIKELY(!!label)) {
-		jump->flags &= ~JUMP_ADDR;
-		jump->flags |= JUMP_LABEL;
-		jump->u.label = label;
-	}
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_target(struct sljit_jump *jump, sljit_uw target)
-{
-	if (SLJIT_LIKELY(!!jump)) {
-		jump->flags &= ~JUMP_LABEL;
-		jump->flags |= JUMP_ADDR;
-		jump->u.target = target;
-	}
-}
-
-/* --------------------------------------------------------------------- */
-/*  Private functions                                                    */
-/* --------------------------------------------------------------------- */
-
-static void* ensure_buf(struct sljit_compiler *compiler, sljit_uw size)
-{
-	sljit_ub *ret;
-	struct sljit_memory_fragment *new_frag;
-
-	SLJIT_ASSERT(size <= 256);
-	if (compiler->buf->used_size + size <= (BUF_SIZE - (sljit_uw)SLJIT_OFFSETOF(struct sljit_memory_fragment, memory))) {
-		ret = compiler->buf->memory + compiler->buf->used_size;
-		compiler->buf->used_size += size;
-		return ret;
-	}
-	new_frag = (struct sljit_memory_fragment*)SLJIT_MALLOC(BUF_SIZE, compiler->allocator_data);
-	PTR_FAIL_IF_NULL(new_frag);
-	new_frag->next = compiler->buf;
-	compiler->buf = new_frag;
-	new_frag->used_size = size;
-	return new_frag->memory;
-}
-
-static void* ensure_abuf(struct sljit_compiler *compiler, sljit_uw size)
-{
-	sljit_ub *ret;
-	struct sljit_memory_fragment *new_frag;
-
-	SLJIT_ASSERT(size <= 256);
-	if (compiler->abuf->used_size + size <= (ABUF_SIZE - (sljit_uw)SLJIT_OFFSETOF(struct sljit_memory_fragment, memory))) {
-		ret = compiler->abuf->memory + compiler->abuf->used_size;
-		compiler->abuf->used_size += size;
-		return ret;
-	}
-	new_frag = (struct sljit_memory_fragment*)SLJIT_MALLOC(ABUF_SIZE, compiler->allocator_data);
-	PTR_FAIL_IF_NULL(new_frag);
-	new_frag->next = compiler->abuf;
-	compiler->abuf = new_frag;
-	new_frag->used_size = size;
-	return new_frag->memory;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_alloc_memory(struct sljit_compiler *compiler, sljit_si size)
-{
-	CHECK_ERROR_PTR();
-
-#if (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
-	if (size <= 0 || size > 128)
-		return NULL;
-	size = (size + 7) & ~7;
-#else
-	if (size <= 0 || size > 64)
-		return NULL;
-	size = (size + 3) & ~3;
-#endif
-	return ensure_abuf(compiler, size);
-}
-
-static SLJIT_INLINE void reverse_buf(struct sljit_compiler *compiler)
-{
-	struct sljit_memory_fragment *buf = compiler->buf;
-	struct sljit_memory_fragment *prev = NULL;
-	struct sljit_memory_fragment *tmp;
-
-	do {
-		tmp = buf->next;
-		buf->next = prev;
-		prev = buf;
-		buf = tmp;
-	} while (buf != NULL);
-
-	compiler->buf = prev;
-}
-
-static SLJIT_INLINE void set_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	SLJIT_UNUSED_ARG(args);
-	SLJIT_UNUSED_ARG(local_size);
-
-	compiler->options = options;
-	compiler->scratches = scratches;
-	compiler->saveds = saveds;
-	compiler->fscratches = fscratches;
-	compiler->fsaveds = fsaveds;
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->logical_local_size = local_size;
-#endif
-}
-
-static SLJIT_INLINE void set_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	SLJIT_UNUSED_ARG(args);
-	SLJIT_UNUSED_ARG(local_size);
-
-	compiler->options = options;
-	compiler->scratches = scratches;
-	compiler->saveds = saveds;
-	compiler->fscratches = fscratches;
-	compiler->fsaveds = fsaveds;
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->logical_local_size = local_size;
-#endif
-}
-
-static SLJIT_INLINE void set_label(struct sljit_label *label, struct sljit_compiler *compiler)
-{
-	label->next = NULL;
-	label->size = compiler->size;
-	if (compiler->last_label)
-		compiler->last_label->next = label;
-	else
-		compiler->labels = label;
-	compiler->last_label = label;
-}
-
-static SLJIT_INLINE void set_jump(struct sljit_jump *jump, struct sljit_compiler *compiler, sljit_si flags)
-{
-	jump->next = NULL;
-	jump->flags = flags;
-	if (compiler->last_jump)
-		compiler->last_jump->next = jump;
-	else
-		compiler->jumps = jump;
-	compiler->last_jump = jump;
-}
-
-static SLJIT_INLINE void set_const(struct sljit_const *const_, struct sljit_compiler *compiler)
-{
-	const_->next = NULL;
-	const_->addr = compiler->size;
-	if (compiler->last_const)
-		compiler->last_const->next = const_;
-	else
-		compiler->consts = const_;
-	compiler->last_const = const_;
-}
-
-#define ADDRESSING_DEPENDS_ON(exp, reg) \
-	(((exp) & SLJIT_MEM) && (((exp) & REG_MASK) == reg || OFFS_REG(exp) == reg))
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-#define FUNCTION_CHECK_OP() \
-	CHECK_ARGUMENT(!GET_FLAGS(op) || !(op & SLJIT_KEEP_FLAGS)); \
-	switch (GET_OPCODE(op)) { \
-	case SLJIT_NOT: \
-	case SLJIT_CLZ: \
-	case SLJIT_AND: \
-	case SLJIT_OR: \
-	case SLJIT_XOR: \
-	case SLJIT_SHL: \
-	case SLJIT_LSHR: \
-	case SLJIT_ASHR: \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C))); \
-		break; \
-	case SLJIT_NEG: \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_C))); \
-		break; \
-	case SLJIT_MUL: \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_C))); \
-		break; \
-	case SLJIT_ADD: \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_U | SLJIT_SET_S))); \
-		break; \
-	case SLJIT_SUB: \
-		break; \
-	case SLJIT_ADDC: \
-	case SLJIT_SUBC: \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O))); \
-		break; \
-	case SLJIT_BREAKPOINT: \
-	case SLJIT_NOP: \
-	case SLJIT_LUMUL: \
-	case SLJIT_LSMUL: \
-	case SLJIT_MOV: \
-	case SLJIT_MOV_UI: \
-	case SLJIT_MOV_P: \
-	case SLJIT_MOVU: \
-	case SLJIT_MOVU_UI: \
-	case SLJIT_MOVU_P: \
-		/* Nothing allowed */ \
-		CHECK_ARGUMENT(!(op & (SLJIT_INT_OP | SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C | SLJIT_KEEP_FLAGS))); \
-		break; \
-	default: \
-		/* Only SLJIT_INT_OP or SLJIT_SINGLE_OP is allowed. */ \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C | SLJIT_KEEP_FLAGS))); \
-		break; \
-	}
-
-#define FUNCTION_CHECK_FOP() \
-	CHECK_ARGUMENT(!GET_FLAGS(op) || !(op & SLJIT_KEEP_FLAGS)); \
-	switch (GET_OPCODE(op)) { \
-	case SLJIT_DCMP: \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_U | SLJIT_SET_O | SLJIT_SET_C | SLJIT_KEEP_FLAGS))); \
-		CHECK_ARGUMENT((op & (SLJIT_SET_E | SLJIT_SET_S))); \
-		break; \
-	default: \
-		/* Only SLJIT_INT_OP or SLJIT_SINGLE_OP is allowed. */ \
-		CHECK_ARGUMENT(!(op & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C | SLJIT_KEEP_FLAGS))); \
-		break; \
-	}
-
-#define FUNCTION_CHECK_IS_REG(r) \
-	(((r) >= SLJIT_R0 && (r) < (SLJIT_R0 + compiler->scratches)) || \
-	((r) > (SLJIT_S0 - compiler->saveds) && (r) <= SLJIT_S0))
-
-#define FUNCTION_CHECK_IS_REG_OR_UNUSED(r) \
-	((r) == SLJIT_UNUSED || \
-	((r) >= SLJIT_R0 && (r) < (SLJIT_R0 + compiler->scratches)) || \
-	((r) > (SLJIT_S0 - compiler->saveds) && (r) <= SLJIT_S0))
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-#define CHECK_NOT_VIRTUAL_REGISTER(p) \
-	CHECK_ARGUMENT((p) < SLJIT_R3 || (p) > SLJIT_R6);
-#else
-#define CHECK_NOT_VIRTUAL_REGISTER(p)
-#endif
-
-#define FUNCTION_CHECK_SRC(p, i) \
-	CHECK_ARGUMENT(compiler->scratches != -1 && compiler->saveds != -1); \
-	if (FUNCTION_CHECK_IS_REG(p)) \
-		CHECK_ARGUMENT((i) == 0); \
-	else if ((p) == SLJIT_IMM) \
-		; \
-	else if ((p) == (SLJIT_MEM1(SLJIT_SP))) \
-		CHECK_ARGUMENT((i) >= 0 && (i) < compiler->logical_local_size); \
-	else { \
-		CHECK_ARGUMENT((p) & SLJIT_MEM); \
-		CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG_OR_UNUSED((p) & REG_MASK)); \
-		CHECK_NOT_VIRTUAL_REGISTER((p) & REG_MASK); \
-		if ((p) & OFFS_REG_MASK) { \
-			CHECK_ARGUMENT(((p) & REG_MASK) != SLJIT_UNUSED); \
-			CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(OFFS_REG(p))); \
-			CHECK_NOT_VIRTUAL_REGISTER(OFFS_REG(p)); \
-			CHECK_ARGUMENT(!((i) & ~0x3)); \
-		} \
-		CHECK_ARGUMENT(!((p) & ~(SLJIT_MEM | SLJIT_IMM | REG_MASK | OFFS_REG_MASK))); \
-	}
-
-#define FUNCTION_CHECK_DST(p, i) \
-	CHECK_ARGUMENT(compiler->scratches != -1 && compiler->saveds != -1); \
-	if (FUNCTION_CHECK_IS_REG_OR_UNUSED(p)) \
-		CHECK_ARGUMENT((i) == 0); \
-	else if ((p) == (SLJIT_MEM1(SLJIT_SP))) \
-		CHECK_ARGUMENT((i) >= 0 && (i) < compiler->logical_local_size); \
-	else { \
-		CHECK_ARGUMENT((p) & SLJIT_MEM); \
-		CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG_OR_UNUSED((p) & REG_MASK)); \
-		CHECK_NOT_VIRTUAL_REGISTER((p) & REG_MASK); \
-		if ((p) & OFFS_REG_MASK) { \
-			CHECK_ARGUMENT(((p) & REG_MASK) != SLJIT_UNUSED); \
-			CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(OFFS_REG(p))); \
-			CHECK_NOT_VIRTUAL_REGISTER(OFFS_REG(p)); \
-			CHECK_ARGUMENT(!((i) & ~0x3)); \
-		} \
-		CHECK_ARGUMENT(!((p) & ~(SLJIT_MEM | SLJIT_IMM | REG_MASK | OFFS_REG_MASK))); \
-	}
-
-#define FUNCTION_FCHECK(p, i) \
-	CHECK_ARGUMENT(compiler->fscratches != -1 && compiler->fsaveds != -1); \
-	if (((p) >= SLJIT_FR0 && (p) < (SLJIT_FR0 + compiler->fscratches)) || \
-			((p) > (SLJIT_FS0 - compiler->fsaveds) && (p) <= SLJIT_FS0)) \
-		CHECK_ARGUMENT(i == 0); \
-	else if ((p) == (SLJIT_MEM1(SLJIT_SP))) \
-		CHECK_ARGUMENT((i) >= 0 && (i) < compiler->logical_local_size); \
-	else { \
-		CHECK_ARGUMENT((p) & SLJIT_MEM); \
-		CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG_OR_UNUSED((p) & REG_MASK)); \
-		CHECK_NOT_VIRTUAL_REGISTER((p) & REG_MASK); \
-		if ((p) & OFFS_REG_MASK) { \
-			CHECK_ARGUMENT(((p) & REG_MASK) != SLJIT_UNUSED); \
-			CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(OFFS_REG(p))); \
-			CHECK_NOT_VIRTUAL_REGISTER(OFFS_REG(p)); \
-			CHECK_ARGUMENT(((p) & OFFS_REG_MASK) != TO_OFFS_REG(SLJIT_SP) && !(i & ~0x3)); \
-		} \
-		CHECK_ARGUMENT(!((p) & ~(SLJIT_MEM | SLJIT_IMM | REG_MASK | OFFS_REG_MASK))); \
-	}
-
-#define FUNCTION_CHECK_OP1() \
-	if (GET_OPCODE(op) >= SLJIT_MOVU && GET_OPCODE(op) <= SLJIT_MOVU_P) { \
-		CHECK_ARGUMENT(!(src & SLJIT_MEM) || (src & REG_MASK) != SLJIT_SP); \
-		CHECK_ARGUMENT(!(dst & SLJIT_MEM) || (dst & REG_MASK) != SLJIT_SP); \
-		if ((src & SLJIT_MEM) && (src & REG_MASK)) \
-			CHECK_ARGUMENT((dst & REG_MASK) != (src & REG_MASK) && OFFS_REG(dst) != (src & REG_MASK)); \
-	}
-
-#endif /* SLJIT_ARGUMENT_CHECKS */
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *compiler, FILE* verbose)
-{
-	compiler->verbose = verbose;
-}
-
-#if (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
-#ifdef _WIN64
-#	define SLJIT_PRINT_D	"I64"
-#else
-#	define SLJIT_PRINT_D	"l"
-#endif
-#else
-#	define SLJIT_PRINT_D	""
-#endif
-
-#define sljit_verbose_reg(compiler, r) \
-	do { \
-		if ((r) < (SLJIT_R0 + compiler->scratches)) \
-			fprintf(compiler->verbose, "r%d", (r) - SLJIT_R0); \
-		else \
-			fprintf(compiler->verbose, "s%d", SLJIT_NUMBER_OF_REGISTERS - (r)); \
-	} while (0)
-
-#define sljit_verbose_param(compiler, p, i) \
-	if ((p) & SLJIT_IMM) \
-		fprintf(compiler->verbose, "#%" SLJIT_PRINT_D "d", (i)); \
-	else if ((p) & SLJIT_MEM) { \
-		if ((p) & REG_MASK) { \
-			fputc('[', compiler->verbose); \
-			sljit_verbose_reg(compiler, (p) & REG_MASK); \
-			if ((p) & OFFS_REG_MASK) { \
-				fprintf(compiler->verbose, " + "); \
-				sljit_verbose_reg(compiler, OFFS_REG(p)); \
-				if (i) \
-					fprintf(compiler->verbose, " * %d", 1 << (i)); \
-			} \
-			else if (i) \
-				fprintf(compiler->verbose, " + %" SLJIT_PRINT_D "d", (i)); \
-			fputc(']', compiler->verbose); \
-		} \
-		else \
-			fprintf(compiler->verbose, "[#%" SLJIT_PRINT_D "d]", (i)); \
-	} else if (p) \
-		sljit_verbose_reg(compiler, p); \
-	else \
-		fprintf(compiler->verbose, "unused");
-
-#define sljit_verbose_fparam(compiler, p, i) \
-	if ((p) & SLJIT_MEM) { \
-		if ((p) & REG_MASK) { \
-			fputc('[', compiler->verbose); \
-			sljit_verbose_reg(compiler, (p) & REG_MASK); \
-			if ((p) & OFFS_REG_MASK) { \
-				fprintf(compiler->verbose, " + "); \
-				sljit_verbose_reg(compiler, OFFS_REG(p)); \
-				if (i) \
-					fprintf(compiler->verbose, "%d", 1 << (i)); \
-			} \
-			else if (i) \
-				fprintf(compiler->verbose, "%" SLJIT_PRINT_D "d", (i)); \
-			fputc(']', compiler->verbose); \
-		} \
-		else \
-			fprintf(compiler->verbose, "[#%" SLJIT_PRINT_D "d]", (i)); \
-	} \
-	else { \
-		if ((p) < (SLJIT_FR0 + compiler->fscratches)) \
-			fprintf(compiler->verbose, "fr%d", (p) - SLJIT_FR0); \
-		else \
-			fprintf(compiler->verbose, "fs%d", SLJIT_NUMBER_OF_FLOAT_REGISTERS - (p)); \
-	}
-
-static SLJIT_CONST char* op0_names[] = {
-	(char*)"breakpoint", (char*)"nop", (char*)"lumul", (char*)"lsmul",
-	(char*)"udivmod", (char*)"sdivmod", (char*)"udivi", (char*)"sdivi"
-};
-
-static SLJIT_CONST char* op1_names[] = {
-	(char*)"mov", (char*)"mov_ub", (char*)"mov_sb", (char*)"mov_uh",
-	(char*)"mov_sh", (char*)"mov_ui", (char*)"mov_si", (char*)"mov_p",
-	(char*)"movu", (char*)"movu_ub", (char*)"movu_sb", (char*)"movu_uh",
-	(char*)"movu_sh", (char*)"movu_ui", (char*)"movu_si", (char*)"movu_p",
-	(char*)"not", (char*)"neg", (char*)"clz",
-};
-
-static SLJIT_CONST char* op2_names[] = {
-	(char*)"add", (char*)"addc", (char*)"sub", (char*)"subc",
-	(char*)"mul", (char*)"and", (char*)"or", (char*)"xor",
-	(char*)"shl", (char*)"lshr", (char*)"ashr",
-};
-
-static SLJIT_CONST char* fop1_names[] = {
-	(char*)"mov", (char*)"conv", (char*)"conv", (char*)"conv",
-	(char*)"conv", (char*)"conv", (char*)"cmp", (char*)"neg",
-	(char*)"abs",
-};
-
-static SLJIT_CONST char* fop2_names[] = {
-	(char*)"add", (char*)"sub", (char*)"mul", (char*)"div"
-};
-
-#define JUMP_PREFIX(type) \
-	((type & 0xff) <= SLJIT_MUL_NOT_OVERFLOW ? ((type & SLJIT_INT_OP) ? "i_" : "") \
-	: ((type & 0xff) <= SLJIT_D_ORDERED ? ((type & SLJIT_SINGLE_OP) ? "s_" : "d_") : ""))
-
-static char* jump_names[] = {
-	(char*)"equal", (char*)"not_equal",
-	(char*)"less", (char*)"greater_equal",
-	(char*)"greater", (char*)"less_equal",
-	(char*)"sig_less", (char*)"sig_greater_equal",
-	(char*)"sig_greater", (char*)"sig_less_equal",
-	(char*)"overflow", (char*)"not_overflow",
-	(char*)"mul_overflow", (char*)"mul_not_overflow",
-	(char*)"equal", (char*)"not_equal",
-	(char*)"less", (char*)"greater_equal",
-	(char*)"greater", (char*)"less_equal",
-	(char*)"unordered", (char*)"ordered",
-	(char*)"jump", (char*)"fast_call",
-	(char*)"call0", (char*)"call1", (char*)"call2", (char*)"call3"
-};
-
-#endif /* SLJIT_VERBOSE */
-
-/* --------------------------------------------------------------------- */
-/*  Arch dependent                                                       */
-/* --------------------------------------------------------------------- */
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
-	|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_generate_code(struct sljit_compiler *compiler)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	struct sljit_jump *jump;
-#endif
-
-	SLJIT_UNUSED_ARG(compiler);
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(compiler->size > 0);
-	jump = compiler->jumps;
-	while (jump) {
-		/* All jumps have target. */
-		CHECK_ARGUMENT(jump->flags & (JUMP_LABEL | JUMP_ADDR));
-		jump = jump->next;
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	SLJIT_UNUSED_ARG(compiler);
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(!(options & ~SLJIT_DOUBLE_ALIGNMENT));
-	CHECK_ARGUMENT(args >= 0 && args <= 3);
-	CHECK_ARGUMENT(scratches >= 0 && scratches <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(saveds >= 0 && saveds <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(scratches + saveds <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(args <= saveds);
-	CHECK_ARGUMENT(fscratches >= 0 && fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fsaveds >= 0 && fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fscratches + fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(local_size >= 0 && local_size <= SLJIT_MAX_LOCAL_SIZE);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose))
-		fprintf(compiler->verbose, "  enter options:none args:%d scratches:%d saveds:%d fscratches:%d fsaveds:%d local_size:%d\n",
-			args, scratches, saveds, fscratches, fsaveds, local_size);
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(!(options & ~SLJIT_DOUBLE_ALIGNMENT));
-	CHECK_ARGUMENT(args >= 0 && args <= 3);
-	CHECK_ARGUMENT(scratches >= 0 && scratches <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(saveds >= 0 && saveds <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(scratches + saveds <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(args <= saveds);
-	CHECK_ARGUMENT(fscratches >= 0 && fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fsaveds >= 0 && fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fscratches + fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(local_size >= 0 && local_size <= SLJIT_MAX_LOCAL_SIZE);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose))
-		fprintf(compiler->verbose, "  set_context options:none args:%d scratches:%d saveds:%d fscratches:%d fsaveds:%d local_size:%d\n",
-			args, scratches, saveds, fscratches, fsaveds, local_size);
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(compiler->scratches >= 0);
-	if (op != SLJIT_UNUSED) {
-		CHECK_ARGUMENT(op >= SLJIT_MOV && op <= SLJIT_MOV_P);
-		FUNCTION_CHECK_SRC(src, srcw);
-	}
-	else
-		CHECK_ARGUMENT(src == 0 && srcw == 0);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		if (op == SLJIT_UNUSED)
-			fprintf(compiler->verbose, "  return\n");
-		else {
-			fprintf(compiler->verbose, "  return.%s ", op1_names[op - SLJIT_OP1_BASE]);
-			sljit_verbose_param(compiler, src, srcw);
-			fprintf(compiler->verbose, "\n");
-		}
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	FUNCTION_CHECK_DST(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  fast_enter ");
-		sljit_verbose_param(compiler, dst, dstw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	FUNCTION_CHECK_SRC(src, srcw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  fast_return ");
-		sljit_verbose_param(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT((op >= SLJIT_BREAKPOINT && op <= SLJIT_LSMUL)
-		|| ((op & ~SLJIT_INT_OP) >= SLJIT_UDIVMOD && (op & ~SLJIT_INT_OP) <= SLJIT_SDIVI));
-	CHECK_ARGUMENT(op < SLJIT_LUMUL || compiler->scratches >= 2);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose))
-		fprintf(compiler->verbose, "  %s%s\n", !(op & SLJIT_INT_OP) ? "" : "i", op0_names[GET_OPCODE(op) - SLJIT_OP0_BASE]);
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_MOV && GET_OPCODE(op) <= SLJIT_CLZ);
-	FUNCTION_CHECK_OP();
-	FUNCTION_CHECK_SRC(src, srcw);
-	FUNCTION_CHECK_DST(dst, dstw);
-	FUNCTION_CHECK_OP1();
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  %s%s%s%s%s%s%s%s ", !(op & SLJIT_INT_OP) ? "" : "i", op1_names[GET_OPCODE(op) - SLJIT_OP1_BASE],
-			!(op & SLJIT_SET_E) ? "" : ".e", !(op & SLJIT_SET_U) ? "" : ".u", !(op & SLJIT_SET_S) ? "" : ".s",
-			!(op & SLJIT_SET_O) ? "" : ".o", !(op & SLJIT_SET_C) ? "" : ".c", !(op & SLJIT_KEEP_FLAGS) ? "" : ".k");
-		sljit_verbose_param(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_param(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_ADD && GET_OPCODE(op) <= SLJIT_ASHR);
-	FUNCTION_CHECK_OP();
-	FUNCTION_CHECK_SRC(src1, src1w);
-	FUNCTION_CHECK_SRC(src2, src2w);
-	FUNCTION_CHECK_DST(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  %s%s%s%s%s%s%s%s ", !(op & SLJIT_INT_OP) ? "" : "i", op2_names[GET_OPCODE(op) - SLJIT_OP2_BASE],
-			!(op & SLJIT_SET_E) ? "" : ".e", !(op & SLJIT_SET_U) ? "" : ".u", !(op & SLJIT_SET_S) ? "" : ".s",
-			!(op & SLJIT_SET_O) ? "" : ".o", !(op & SLJIT_SET_C) ? "" : ".c", !(op & SLJIT_KEEP_FLAGS) ? "" : ".k");
-		sljit_verbose_param(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_param(compiler, src1, src1w);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_param(compiler, src2, src2w);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_register_index(sljit_si reg)
-{
-	SLJIT_UNUSED_ARG(reg);
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(reg > 0 && reg <= SLJIT_NUMBER_OF_REGISTERS);
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_float_register_index(sljit_si reg)
-{
-	SLJIT_UNUSED_ARG(reg);
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(reg > 0 && reg <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_compiler *compiler,
-	void *instruction, sljit_si size)
-{
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	int i;
-#endif
-
-	SLJIT_UNUSED_ARG(compiler);
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(instruction);
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-	CHECK_ARGUMENT(size > 0 && size < 16);
-#elif (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-	CHECK_ARGUMENT((size == 2 && (((sljit_sw)instruction) & 0x1) == 0)
-		|| (size == 4 && (((sljit_sw)instruction) & 0x3) == 0));
-#else
-	CHECK_ARGUMENT(size == 4 && (((sljit_sw)instruction) & 0x3) == 0);
-#endif
-
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  op_custom");
-		for (i = 0; i < size; i++)
-			fprintf(compiler->verbose, " 0x%x", ((sljit_ub*)instruction)[i]);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_is_fpu_available());
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_DMOV && GET_OPCODE(op) <= SLJIT_DABS);
-	FUNCTION_CHECK_FOP();
-	FUNCTION_FCHECK(src, srcw);
-	FUNCTION_FCHECK(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		if (GET_OPCODE(op) == SLJIT_CONVD_FROMS)
-			fprintf(compiler->verbose, "  %s%s ", fop1_names[SLJIT_CONVD_FROMS - SLJIT_FOP1_BASE],
-				(op & SLJIT_SINGLE_OP) ? "s.fromd" : "d.froms");
-		else
-			fprintf(compiler->verbose, "  %s%s ", (op & SLJIT_SINGLE_OP) ? "s" : "d",
-				fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE]);
-
-		sljit_verbose_fparam(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_is_fpu_available());
-	CHECK_ARGUMENT(GET_OPCODE(op) == SLJIT_DCMP);
-	FUNCTION_CHECK_FOP();
-	FUNCTION_FCHECK(src1, src1w);
-	FUNCTION_FCHECK(src2, src2w);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  %s%s%s%s ", (op & SLJIT_SINGLE_OP) ? "s" : "d", fop1_names[SLJIT_DCMP - SLJIT_FOP1_BASE],
-			(op & SLJIT_SET_E) ? ".e" : "", (op & SLJIT_SET_S) ? ".s" : "");
-		sljit_verbose_fparam(compiler, src1, src1w);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src2, src2w);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_convw_fromd(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_is_fpu_available());
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_CONVW_FROMD && GET_OPCODE(op) <= SLJIT_CONVI_FROMD);
-	FUNCTION_CHECK_FOP();
-	FUNCTION_FCHECK(src, srcw);
-	FUNCTION_CHECK_DST(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  %s%s.from%s ", fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE],
-			(GET_OPCODE(op) == SLJIT_CONVI_FROMD) ? "i" : "w",
-			(op & SLJIT_SINGLE_OP) ? "s" : "d");
-		sljit_verbose_param(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_convd_fromw(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_is_fpu_available());
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_CONVD_FROMW && GET_OPCODE(op) <= SLJIT_CONVD_FROMI);
-	FUNCTION_CHECK_FOP();
-	FUNCTION_CHECK_SRC(src, srcw);
-	FUNCTION_FCHECK(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  %s%s.from%s ", fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE],
-			(op & SLJIT_SINGLE_OP) ? "s" : "d",
-			(GET_OPCODE(op) == SLJIT_CONVD_FROMI) ? "i" : "w");
-		sljit_verbose_fparam(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_param(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_is_fpu_available());
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_DADD && GET_OPCODE(op) <= SLJIT_DDIV);
-	FUNCTION_CHECK_FOP();
-	FUNCTION_FCHECK(src1, src1w);
-	FUNCTION_FCHECK(src2, src2w);
-	FUNCTION_FCHECK(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  %s%s ", (op & SLJIT_SINGLE_OP) ? "s" : "d", fop2_names[GET_OPCODE(op) - SLJIT_FOP2_BASE]);
-		sljit_verbose_fparam(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src1, src1w);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src2, src2w);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_label(struct sljit_compiler *compiler)
-{
-	SLJIT_UNUSED_ARG(compiler);
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose))
-		fprintf(compiler->verbose, "label:\n");
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_jump(struct sljit_compiler *compiler, sljit_si type)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_REWRITABLE_JUMP | SLJIT_INT_OP)));
-	CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_CALL3);
-	CHECK_ARGUMENT((type & 0xff) < SLJIT_JUMP || !(type & SLJIT_INT_OP));
-	CHECK_ARGUMENT((type & 0xff) <= SLJIT_CALL0 || ((type & 0xff) - SLJIT_CALL0) <= compiler->scratches);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose))
-		fprintf(compiler->verbose, "  jump%s.%s%s\n", !(type & SLJIT_REWRITABLE_JUMP) ? "" : ".r",
-			JUMP_PREFIX(type), jump_names[type & 0xff]);
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_cmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_REWRITABLE_JUMP | SLJIT_INT_OP)));
-	CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_SIG_LESS_EQUAL);
-	FUNCTION_CHECK_SRC(src1, src1w);
-	FUNCTION_CHECK_SRC(src2, src2w);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  cmp%s.%s%s ", !(type & SLJIT_REWRITABLE_JUMP) ? "" : ".r",
-			(type & SLJIT_INT_OP) ? "i_" : "", jump_names[type & 0xff]);
-		sljit_verbose_param(compiler, src1, src1w);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_param(compiler, src2, src2w);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_is_fpu_available());
-	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_REWRITABLE_JUMP | SLJIT_SINGLE_OP)));
-	CHECK_ARGUMENT((type & 0xff) >= SLJIT_D_EQUAL && (type & 0xff) <= SLJIT_D_ORDERED);
-	FUNCTION_FCHECK(src1, src1w);
-	FUNCTION_FCHECK(src2, src2w);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  fcmp%s.%s%s ", !(type & SLJIT_REWRITABLE_JUMP) ? "" : ".r",
-			(type & SLJIT_SINGLE_OP) ? "s_" : "d_", jump_names[type & 0xff]);
-		sljit_verbose_fparam(compiler, src1, src1w);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src2, src2w);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_ijump(struct sljit_compiler *compiler, sljit_si type, sljit_si src, sljit_sw srcw)
-{
-	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
-		compiler->skip_checks = 0;
-		CHECK_RETURN_OK;
-	}
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(type >= SLJIT_JUMP && type <= SLJIT_CALL3);
-	CHECK_ARGUMENT(type <= SLJIT_CALL0 || (type - SLJIT_CALL0) <= compiler->scratches);
-	FUNCTION_CHECK_SRC(src, srcw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  ijump.%s ", jump_names[type]);
-		sljit_verbose_param(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_flags(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw,
-	sljit_si type)
-{
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_INT_OP)));
-	CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_D_ORDERED);
-	CHECK_ARGUMENT(op == SLJIT_MOV || GET_OPCODE(op) == SLJIT_MOV_UI || GET_OPCODE(op) == SLJIT_MOV_SI
-		|| (GET_OPCODE(op) >= SLJIT_AND && GET_OPCODE(op) <= SLJIT_XOR));
-	CHECK_ARGUMENT((op & (SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O | SLJIT_SET_C)) == 0);
-	CHECK_ARGUMENT((op & (SLJIT_SET_E | SLJIT_KEEP_FLAGS)) != (SLJIT_SET_E | SLJIT_KEEP_FLAGS));
-	if (GET_OPCODE(op) < SLJIT_ADD) {
-		CHECK_ARGUMENT(src == SLJIT_UNUSED && srcw == 0);
-	} else {
-		CHECK_ARGUMENT(src == dst && srcw == dstw);
-	}
-	FUNCTION_CHECK_DST(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  flags.%s%s%s%s ", !(op & SLJIT_INT_OP) ? "" : "i",
-			GET_OPCODE(op) >= SLJIT_OP2_BASE ? op2_names[GET_OPCODE(op) - SLJIT_OP2_BASE] : op1_names[GET_OPCODE(op) - SLJIT_OP1_BASE],
-			!(op & SLJIT_SET_E) ? "" : ".e", !(op & SLJIT_KEEP_FLAGS) ? "" : ".k");
-		sljit_verbose_param(compiler, dst, dstw);
-		if (src != SLJIT_UNUSED) {
-			fprintf(compiler->verbose, ", ");
-			sljit_verbose_param(compiler, src, srcw);
-		}
-		fprintf(compiler->verbose, ", %s%s\n", JUMP_PREFIX(type), jump_names[type & 0xff]);
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset)
-{
-	SLJIT_UNUSED_ARG(offset);
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	FUNCTION_CHECK_DST(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  local_base ");
-		sljit_verbose_param(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", #%" SLJIT_PRINT_D "d\n", offset);
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value)
-{
-	SLJIT_UNUSED_ARG(init_value);
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	FUNCTION_CHECK_DST(dst, dstw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  const ");
-		sljit_verbose_param(compiler, dst, dstw);
-		fprintf(compiler->verbose, ", #%" SLJIT_PRINT_D "d\n", init_value);
-	}
-#endif
-	CHECK_RETURN_OK;
-}
-
-#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_VERBOSE */
-
-#define SELECT_FOP1_OPERATION_WITH_CHECKS(compiler, op, dst, dstw, src, srcw) \
-	SLJIT_COMPILE_ASSERT(!(SLJIT_CONVW_FROMD & 0x1) && !(SLJIT_CONVD_FROMW & 0x1), \
-		invalid_float_opcodes); \
-	if (GET_OPCODE(op) >= SLJIT_CONVW_FROMD && GET_OPCODE(op) <= SLJIT_DCMP) { \
-		if (GET_OPCODE(op) == SLJIT_DCMP) { \
-			CHECK(check_sljit_emit_fop1_cmp(compiler, op, dst, dstw, src, srcw)); \
-			ADJUST_LOCAL_OFFSET(dst, dstw); \
-			ADJUST_LOCAL_OFFSET(src, srcw); \
-			return sljit_emit_fop1_cmp(compiler, op, dst, dstw, src, srcw); \
-		} \
-		if ((GET_OPCODE(op) | 0x1) == SLJIT_CONVI_FROMD) { \
-			CHECK(check_sljit_emit_fop1_convw_fromd(compiler, op, dst, dstw, src, srcw)); \
-			ADJUST_LOCAL_OFFSET(dst, dstw); \
-			ADJUST_LOCAL_OFFSET(src, srcw); \
-			return sljit_emit_fop1_convw_fromd(compiler, op, dst, dstw, src, srcw); \
-		} \
-		CHECK(check_sljit_emit_fop1_convd_fromw(compiler, op, dst, dstw, src, srcw)); \
-		ADJUST_LOCAL_OFFSET(dst, dstw); \
-		ADJUST_LOCAL_OFFSET(src, srcw); \
-		return sljit_emit_fop1_convd_fromw(compiler, op, dst, dstw, src, srcw); \
-	} \
-	CHECK(check_sljit_emit_fop1(compiler, op, dst, dstw, src, srcw)); \
-	ADJUST_LOCAL_OFFSET(dst, dstw); \
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-static SLJIT_INLINE sljit_si emit_mov_before_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-	/* Return if don't need to do anything. */
-	if (op == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-#if (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
-	/* At the moment the pointer size is always equal to sljit_sw. May be changed in the future. */
-	if (src == SLJIT_RETURN_REG && (op == SLJIT_MOV || op == SLJIT_MOV_P))
-		return SLJIT_SUCCESS;
-#else
-	if (src == SLJIT_RETURN_REG && (op == SLJIT_MOV || op == SLJIT_MOV_UI || op == SLJIT_MOV_SI || op == SLJIT_MOV_P))
-		return SLJIT_SUCCESS;
-#endif
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
-		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	compiler->skip_checks = 1;
-#endif
-	return sljit_emit_op1(compiler, op, SLJIT_RETURN_REG, 0, src, srcw);
-}
-
-/* CPU description section */
-
-#if (defined SLJIT_32BIT_ARCHITECTURE && SLJIT_32BIT_ARCHITECTURE)
-#define SLJIT_CPUINFO_PART1 " 32bit ("
-#elif (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
-#define SLJIT_CPUINFO_PART1 " 64bit ("
-#else
-#error "Internal error: CPU type info missing"
-#endif
-
-#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-#define SLJIT_CPUINFO_PART2 "little endian + "
-#elif (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)
-#define SLJIT_CPUINFO_PART2 "big endian + "
-#else
-#error "Internal error: CPU type info missing"
-#endif
-
-#if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED)
-#define SLJIT_CPUINFO_PART3 "unaligned)"
-#else
-#define SLJIT_CPUINFO_PART3 "aligned)"
-#endif
-
-#define SLJIT_CPUINFO SLJIT_CPUINFO_PART1 SLJIT_CPUINFO_PART2 SLJIT_CPUINFO_PART3
-
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-#	include "sljitNativeX86_common.c"
-#elif (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5)
-#	include "sljitNativeARM_32.c"
-#elif (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
-#	include "sljitNativeARM_32.c"
-#elif (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-#	include "sljitNativeARM_T2_32.c"
-#elif (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
-#	include "sljitNativeARM_64.c"
-#elif (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
-#	include "sljitNativePPC_common.c"
-#elif (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
-#	include "sljitNativeMIPS_common.c"
-#elif (defined SLJIT_CONFIG_SPARC && SLJIT_CONFIG_SPARC)
-#	include "sljitNativeSPARC_common.c"
-#elif (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX)
-#	include "sljitNativeTILEGX_64.c"
-#endif
-
-#if !(defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	/* Default compare for most architectures. */
-	sljit_si flags, tmp_src, condition;
-	sljit_sw tmp_srcw;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_cmp(compiler, type, src1, src1w, src2, src2w));
-
-	condition = type & 0xff;
-#if (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
-	if ((condition == SLJIT_EQUAL || condition == SLJIT_NOT_EQUAL)) {
-		if ((src1 & SLJIT_IMM) && !src1w) {
-			src1 = src2;
-			src1w = src2w;
-			src2 = SLJIT_IMM;
-			src2w = 0;
-		}
-		if ((src2 & SLJIT_IMM) && !src2w)
-			return emit_cmp_to0(compiler, type, src1, src1w);
-	}
-#endif
-
-	if (SLJIT_UNLIKELY((src1 & SLJIT_IMM) && !(src2 & SLJIT_IMM))) {
-		/* Immediate is prefered as second argument by most architectures. */
-		switch (condition) {
-		case SLJIT_LESS:
-			condition = SLJIT_GREATER;
-			break;
-		case SLJIT_GREATER_EQUAL:
-			condition = SLJIT_LESS_EQUAL;
-			break;
-		case SLJIT_GREATER:
-			condition = SLJIT_LESS;
-			break;
-		case SLJIT_LESS_EQUAL:
-			condition = SLJIT_GREATER_EQUAL;
-			break;
-		case SLJIT_SIG_LESS:
-			condition = SLJIT_SIG_GREATER;
-			break;
-		case SLJIT_SIG_GREATER_EQUAL:
-			condition = SLJIT_SIG_LESS_EQUAL;
-			break;
-		case SLJIT_SIG_GREATER:
-			condition = SLJIT_SIG_LESS;
-			break;
-		case SLJIT_SIG_LESS_EQUAL:
-			condition = SLJIT_SIG_GREATER_EQUAL;
-			break;
-		}
-		type = condition | (type & (SLJIT_INT_OP | SLJIT_REWRITABLE_JUMP));
-		tmp_src = src1;
-		src1 = src2;
-		src2 = tmp_src;
-		tmp_srcw = src1w;
-		src1w = src2w;
-		src2w = tmp_srcw;
-	}
-
-	if (condition <= SLJIT_NOT_ZERO)
-		flags = SLJIT_SET_E;
-	else if (condition <= SLJIT_LESS_EQUAL)
-		flags = SLJIT_SET_U;
-	else
-		flags = SLJIT_SET_S;
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	PTR_FAIL_IF(sljit_emit_op2(compiler, SLJIT_SUB | flags | (type & SLJIT_INT_OP),
-		SLJIT_UNUSED, 0, src1, src1w, src2, src2w));
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	return sljit_emit_jump(compiler, condition | (type & SLJIT_REWRITABLE_JUMP));
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_fcmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_si flags, condition;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_fcmp(compiler, type, src1, src1w, src2, src2w));
-
-	condition = type & 0xff;
-	flags = (condition <= SLJIT_D_NOT_EQUAL) ? SLJIT_SET_E : SLJIT_SET_S;
-	if (type & SLJIT_SINGLE_OP)
-		flags |= SLJIT_SINGLE_OP;
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	sljit_emit_fop1(compiler, SLJIT_DCMP | flags, src1, src1w, src2, src2w);
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	return sljit_emit_jump(compiler, condition | (type & SLJIT_REWRITABLE_JUMP));
-}
-
-#endif
-
-#if !(defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_get_local_base(compiler, dst, dstw, offset));
-
-	ADJUST_LOCAL_OFFSET(SLJIT_MEM1(SLJIT_SP), offset);
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	if (offset != 0)
-		return sljit_emit_op2(compiler, SLJIT_ADD | SLJIT_KEEP_FLAGS, dst, dstw, SLJIT_SP, 0, SLJIT_IMM, offset);
-	return sljit_emit_op1(compiler, SLJIT_MOV, dst, dstw, SLJIT_SP, 0);
-}
-
-#endif
-
-#else /* SLJIT_CONFIG_UNSUPPORTED */
-
-/* Empty function bodies for those machines, which are not (yet) supported. */
-
-SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name(void)
-{
-	return "unsupported";
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void)
-{
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_compiler(struct sljit_compiler *compiler)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_ASSERT_STOP();
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_alloc_memory(struct sljit_compiler *compiler, sljit_si size)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(size);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *compiler, FILE* verbose)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(verbose);
-	SLJIT_ASSERT_STOP();
-}
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code)
-{
-	SLJIT_UNUSED_ARG(code);
-	SLJIT_ASSERT_STOP();
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(options);
-	SLJIT_UNUSED_ARG(args);
-	SLJIT_UNUSED_ARG(scratches);
-	SLJIT_UNUSED_ARG(saveds);
-	SLJIT_UNUSED_ARG(fscratches);
-	SLJIT_UNUSED_ARG(fsaveds);
-	SLJIT_UNUSED_ARG(local_size);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(options);
-	SLJIT_UNUSED_ARG(args);
-	SLJIT_UNUSED_ARG(scratches);
-	SLJIT_UNUSED_ARG(saveds);
-	SLJIT_UNUSED_ARG(fscratches);
-	SLJIT_UNUSED_ARG(fsaveds);
-	SLJIT_UNUSED_ARG(local_size);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(src);
-	SLJIT_UNUSED_ARG(srcw);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(src);
-	SLJIT_UNUSED_ARG(srcw);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(src);
-	SLJIT_UNUSED_ARG(srcw);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(src1);
-	SLJIT_UNUSED_ARG(src1w);
-	SLJIT_UNUSED_ARG(src2);
-	SLJIT_UNUSED_ARG(src2w);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg)
-{
-	SLJIT_ASSERT_STOP();
-	return reg;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler,
-	void *instruction, sljit_si size)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(instruction);
-	SLJIT_UNUSED_ARG(size);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_is_fpu_available(void)
-{
-	SLJIT_ASSERT_STOP();
-	return 0;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(src);
-	SLJIT_UNUSED_ARG(srcw);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(src1);
-	SLJIT_UNUSED_ARG(src1w);
-	SLJIT_UNUSED_ARG(src2);
-	SLJIT_UNUSED_ARG(src2w);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compiler *compiler)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compiler *compiler, sljit_si type)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(type);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(src1);
-	SLJIT_UNUSED_ARG(src1w);
-	SLJIT_UNUSED_ARG(src2);
-	SLJIT_UNUSED_ARG(src2w);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_fcmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(src1);
-	SLJIT_UNUSED_ARG(src1w);
-	SLJIT_UNUSED_ARG(src2);
-	SLJIT_UNUSED_ARG(src2w);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_label(struct sljit_jump *jump, struct sljit_label* label)
-{
-	SLJIT_UNUSED_ARG(jump);
-	SLJIT_UNUSED_ARG(label);
-	SLJIT_ASSERT_STOP();
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_target(struct sljit_jump *jump, sljit_uw target)
-{
-	SLJIT_UNUSED_ARG(jump);
-	SLJIT_UNUSED_ARG(target);
-	SLJIT_ASSERT_STOP();
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_ijump(struct sljit_compiler *compiler, sljit_si type, sljit_si src, sljit_sw srcw)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(src);
-	SLJIT_UNUSED_ARG(srcw);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_flags(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw,
-	sljit_si type)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(src);
-	SLJIT_UNUSED_ARG(srcw);
-	SLJIT_UNUSED_ARG(type);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(offset);
-	SLJIT_ASSERT_STOP();
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw initval)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(dst);
-	SLJIT_UNUSED_ARG(dstw);
-	SLJIT_UNUSED_ARG(initval);
-	SLJIT_ASSERT_STOP();
-	return NULL;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_addr)
-{
-	SLJIT_UNUSED_ARG(addr);
-	SLJIT_UNUSED_ARG(new_addr);
-	SLJIT_ASSERT_STOP();
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant)
-{
-	SLJIT_UNUSED_ARG(addr);
-	SLJIT_UNUSED_ARG(new_constant);
-	SLJIT_ASSERT_STOP();
-}
-
-#endif
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitLir.h r-base-3.3.1/src/extra/pcre/sljit/sljitLir.h
--- r-base-3.2.3/src/extra/pcre/sljit/sljitLir.h	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitLir.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1249 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _SLJIT_LIR_H_
-#define _SLJIT_LIR_H_
-
-/*
-   ------------------------------------------------------------------------
-    Stack-Less JIT compiler for multiple architectures (x86, ARM, PowerPC)
-   ------------------------------------------------------------------------
-
-   Short description
-    Advantages:
-      - The execution can be continued from any LIR instruction. In other
-        words, it is possible to jump to any label from anywhere, even from
-        a code fragment, which is compiled later, if both compiled code
-        shares the same context. See sljit_emit_enter for more details
-      - Supports self modifying code: target of (conditional) jump and call
-        instructions and some constant values can be dynamically modified
-        during runtime
-        - although it is not suggested to do it frequently
-        - can be used for inline caching: save an important value once
-          in the instruction stream
-        - since this feature limits the optimization possibilities, a
-          special flag must be passed at compile time when these
-          instructions are emitted
-      - A fixed stack space can be allocated for local variables
-      - The compiler is thread-safe
-      - The compiler is highly configurable through preprocessor macros.
-        You can disable unneeded features (multithreading in single
-        threaded applications), and you can use your own system functions
-        (including memory allocators). See sljitConfig.h
-    Disadvantages:
-      - No automatic register allocation, and temporary results are
-        not stored on the stack. (hence the name comes)
-    In practice:
-      - This approach is very effective for interpreters
-        - One of the saved registers typically points to a stack interface
-        - It can jump to any exception handler anytime (even if it belongs
-          to another function)
-        - Hot paths can be modified during runtime reflecting the changes
-          of the fastest execution path of the dynamic language
-        - SLJIT supports complex memory addressing modes
-        - mainly position and context independent code (except some cases)
-
-    For valgrind users:
-      - pass --smc-check=all argument to valgrind, since JIT is a "self-modifying code"
-*/
-
-#if !(defined SLJIT_NO_DEFAULT_CONFIG && SLJIT_NO_DEFAULT_CONFIG)
-#include "sljitConfig.h"
-#endif
-
-/* The following header file defines useful macros for fine tuning
-sljit based code generators. They are listed in the beginning
-of sljitConfigInternal.h */
-
-#include "sljitConfigInternal.h"
-
-/* --------------------------------------------------------------------- */
-/*  Error codes                                                          */
-/* --------------------------------------------------------------------- */
-
-/* Indicates no error. */
-#define SLJIT_SUCCESS			0
-/* After the call of sljit_generate_code(), the error code of the compiler
-   is set to this value to avoid future sljit calls (in debug mode at least).
-   The complier should be freed after sljit_generate_code(). */
-#define SLJIT_ERR_COMPILED		1
-/* Cannot allocate non executable memory. */
-#define SLJIT_ERR_ALLOC_FAILED		2
-/* Cannot allocate executable memory.
-   Only for sljit_generate_code() */
-#define SLJIT_ERR_EX_ALLOC_FAILED	3
-/* Return value for SLJIT_CONFIG_UNSUPPORTED placeholder architecture. */
-#define SLJIT_ERR_UNSUPPORTED		4
-/* An ivalid argument is passed to any SLJIT function. */
-#define SLJIT_ERR_BAD_ARGUMENT		5
-
-/* --------------------------------------------------------------------- */
-/*  Registers                                                            */
-/* --------------------------------------------------------------------- */
-
-/*
-  Scratch (R) registers: registers whose may not preserve their values
-  across function calls.
-
-  Saved (S) registers: registers whose preserve their values across
-  function calls.
-
-  The scratch and saved register sets are overlap. The last scratch register
-  is the first saved register, the one before the last is the second saved
-  register, and so on.
-
-  If an architecture provides two scratch and three saved registers,
-  its scratch and saved register sets are the following:
-
-     R0   |  [S4]  |   R0 and S4 represent the same physical register
-     R1   |  [S3]  |   R1 and S3 represent the same physical register
-    [R2]  |   S2   |   R2 and S2 represent the same physical register
-    [R3]  |   S1   |   R3 and S1 represent the same physical register
-    [R4]  |   S0   |   R4 and S0 represent the same physical register
-
-  Note: SLJIT_NUMBER_OF_SCRATCH_REGISTERS would be 2 and
-        SLJIT_NUMBER_OF_SAVED_REGISTERS would be 3 for this architecture.
-
-  Note: On all supported architectures SLJIT_NUMBER_OF_REGISTERS >= 10
-        and SLJIT_NUMBER_OF_SAVED_REGISTERS >= 5. However, 4 registers
-        are virtual on x86-32. See below.
-
-  The purpose of this definition is convenience. Although a register
-  is either scratch register or saved register, SLJIT allows accessing
-  them from the other set. For example, four registers can be used as
-  scratch registers and the fifth one as saved register on the architecture
-  above. Of course the last two scratch registers (R2 and R3) from this
-  four will be saved on the stack, because they are defined as saved
-  registers in the application binary interface. Still R2 and R3 can be
-  used for referencing to these registers instead of S2 and S1, which
-  makes easier to write platform independent code. Scratch registers
-  can be saved registers in a similar way, but these extra saved
-  registers will not be preserved across function calls! Hence the
-  application must save them on those platforms, where the number of
-  saved registers is too low. This can be done by copy them onto
-  the stack and restore them after a function call.
-
-  Note: To emphasize that registers assigned to R2-R4 are saved
-        registers, they are enclosed by square brackets. S3-S4
-        are marked in a similar way.
-
-  Note: sljit_emit_enter and sljit_set_context defines whether a register
-        is S or R register. E.g: when 3 scratches and 1 saved is mapped
-        by sljit_emit_enter, the allowed register set will be: R0-R2 and
-        S0. Although S2 is mapped to the same position as R2, it does not
-        available in the current configuration. Furthermore the R3 (S1)
-        register does not available as well.
-*/
-
-/* When SLJIT_UNUSED is specified as destination, the result is discarded. */
-#define SLJIT_UNUSED		0
-
-/* Scratch registers. */
-#define SLJIT_R0	1
-#define SLJIT_R1	2
-#define SLJIT_R2	3
-/* Note: on x86-32, R3 - R6 (same as S3 - S6) are emulated (they
-   are allocated on the stack). These registers are called virtual
-   and cannot be used for memory addressing (cannot be part of
-   any SLJIT_MEM1, SLJIT_MEM2 construct). There is no such
-   limitation on other CPUs. See sljit_get_register_index(). */
-#define SLJIT_R3	4
-#define SLJIT_R4	5
-#define SLJIT_R5	6
-#define SLJIT_R6	7
-#define SLJIT_R7	8
-#define SLJIT_R8	9
-#define SLJIT_R9	10
-/* All R registers provided by the architecture can be accessed by SLJIT_R(i)
-   The i parameter must be >= 0 and < SLJIT_NUMBER_OF_REGISTERS. */
-#define SLJIT_R(i)	(1 + (i))
-
-/* Saved registers. */
-#define SLJIT_S0	(SLJIT_NUMBER_OF_REGISTERS)
-#define SLJIT_S1	(SLJIT_NUMBER_OF_REGISTERS - 1)
-#define SLJIT_S2	(SLJIT_NUMBER_OF_REGISTERS - 2)
-/* Note: on x86-32, S3 - S6 (same as R3 - R6) are emulated (they
-   are allocated on the stack). These registers are called virtual
-   and cannot be used for memory addressing (cannot be part of
-   any SLJIT_MEM1, SLJIT_MEM2 construct). There is no such
-   limitation on other CPUs. See sljit_get_register_index(). */
-#define SLJIT_S3	(SLJIT_NUMBER_OF_REGISTERS - 3)
-#define SLJIT_S4	(SLJIT_NUMBER_OF_REGISTERS - 4)
-#define SLJIT_S5	(SLJIT_NUMBER_OF_REGISTERS - 5)
-#define SLJIT_S6	(SLJIT_NUMBER_OF_REGISTERS - 6)
-#define SLJIT_S7	(SLJIT_NUMBER_OF_REGISTERS - 7)
-#define SLJIT_S8	(SLJIT_NUMBER_OF_REGISTERS - 8)
-#define SLJIT_S9	(SLJIT_NUMBER_OF_REGISTERS - 9)
-/* All S registers provided by the architecture can be accessed by SLJIT_S(i)
-   The i parameter must be >= 0 and < SLJIT_NUMBER_OF_SAVED_REGISTERS. */
-#define SLJIT_S(i)	(SLJIT_NUMBER_OF_REGISTERS - (i))
-
-/* Registers >= SLJIT_FIRST_SAVED_REG are saved registers. */
-#define SLJIT_FIRST_SAVED_REG (SLJIT_S0 - SLJIT_NUMBER_OF_SAVED_REGISTERS + 1)
-
-/* The SLJIT_SP provides direct access to the linear stack space allocated by
-   sljit_emit_enter. It can only be used in the following form: SLJIT_MEM1(SLJIT_SP).
-   The immediate offset is extended by the relative stack offset automatically.
-   The sljit_get_local_base can be used to obtain the absolute offset. */
-#define SLJIT_SP	(SLJIT_NUMBER_OF_REGISTERS + 1)
-
-/* Return with machine word. */
-
-#define SLJIT_RETURN_REG	SLJIT_R0
-
-/* x86 prefers specific registers for special purposes. In case of shift
-   by register it supports only SLJIT_R2 for shift argument
-   (which is the src2 argument of sljit_emit_op2). If another register is
-   used, sljit must exchange data between registers which cause a minor
-   slowdown. Other architectures has no such limitation. */
-
-#define SLJIT_PREF_SHIFT_REG	SLJIT_R2
-
-/* --------------------------------------------------------------------- */
-/*  Floating point registers                                             */
-/* --------------------------------------------------------------------- */
-
-/* Each floating point register can store a double or single precision
-   value. The FR and FS register sets are overlap in the same way as R
-   and S register sets. See above. */
-
-/* Note: SLJIT_UNUSED as destination is not valid for floating point
-   operations, since they cannot be used for setting flags. */
-
-/* Floating point scratch registers. */
-#define SLJIT_FR0	1
-#define SLJIT_FR1	2
-#define SLJIT_FR2	3
-#define SLJIT_FR3	4
-#define SLJIT_FR4	5
-#define SLJIT_FR5	6
-/* All FR registers provided by the architecture can be accessed by SLJIT_FR(i)
-   The i parameter must be >= 0 and < SLJIT_NUMBER_OF_FLOAT_REGISTERS. */
-#define SLJIT_FR(i)	(1 + (i))
-
-/* Floating point saved registers. */
-#define SLJIT_FS0	(SLJIT_NUMBER_OF_FLOAT_REGISTERS)
-#define SLJIT_FS1	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 1)
-#define SLJIT_FS2	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 2)
-#define SLJIT_FS3	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 3)
-#define SLJIT_FS4	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 4)
-#define SLJIT_FS5	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 5)
-/* All S registers provided by the architecture can be accessed by SLJIT_FS(i)
-   The i parameter must be >= 0 and < SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS. */
-#define SLJIT_FS(i)	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - (i))
-
-/* Float registers >= SLJIT_FIRST_SAVED_FLOAT_REG are saved registers. */
-#define SLJIT_FIRST_SAVED_FLOAT_REG (SLJIT_FS0 - SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS + 1)
-
-/* --------------------------------------------------------------------- */
-/*  Main structures and functions                                        */
-/* --------------------------------------------------------------------- */
-
-/*
-	The following structures are private, and can be changed in the
-	future. Keeping them here allows code inlining.
-*/
-
-struct sljit_memory_fragment {
-	struct sljit_memory_fragment *next;
-	sljit_uw used_size;
-	/* Must be aligned to sljit_sw. */
-	sljit_ub memory[1];
-};
-
-struct sljit_label {
-	struct sljit_label *next;
-	sljit_uw addr;
-	/* The maximum size difference. */
-	sljit_uw size;
-};
-
-struct sljit_jump {
-	struct sljit_jump *next;
-	sljit_uw addr;
-	sljit_sw flags;
-	union {
-		sljit_uw target;
-		struct sljit_label* label;
-	} u;
-};
-
-struct sljit_const {
-	struct sljit_const *next;
-	sljit_uw addr;
-};
-
-struct sljit_compiler {
-	sljit_si error;
-	sljit_si options;
-
-	struct sljit_label *labels;
-	struct sljit_jump *jumps;
-	struct sljit_const *consts;
-	struct sljit_label *last_label;
-	struct sljit_jump *last_jump;
-	struct sljit_const *last_const;
-
-	void *allocator_data;
-	struct sljit_memory_fragment *buf;
-	struct sljit_memory_fragment *abuf;
-
-	/* Used scratch registers. */
-	sljit_si scratches;
-	/* Used saved registers. */
-	sljit_si saveds;
-	/* Used float scratch registers. */
-	sljit_si fscratches;
-	/* Used float saved registers. */
-	sljit_si fsaveds;
-	/* Local stack size. */
-	sljit_si local_size;
-	/* Code size. */
-	sljit_uw size;
-	/* For statistical purposes. */
-	sljit_uw executable_size;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	sljit_si args;
-#endif
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	sljit_si mode32;
-#endif
-
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-	sljit_si flags_saved;
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5)
-	/* Constant pool handling. */
-	sljit_uw *cpool;
-	sljit_ub *cpool_unique;
-	sljit_uw cpool_diff;
-	sljit_uw cpool_fill;
-	/* Other members. */
-	/* Contains pointer, "ldr pc, [...]" pairs. */
-	sljit_uw patches;
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
-	/* Temporary fields. */
-	sljit_uw shift_imm;
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
-	sljit_sw imm;
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
-	sljit_si delay_slot;
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-	sljit_si delay_slot;
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX)
-	sljit_si cache_arg;
-	sljit_sw cache_argw;
-#endif
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	FILE* verbose;
-#endif
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
-		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
-	/* Local size passed to the functions. */
-	sljit_si logical_local_size;
-#endif
-
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
-		|| (defined SLJIT_DEBUG && SLJIT_DEBUG) \
-		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	sljit_si skip_checks;
-#endif
-};
-
-/* --------------------------------------------------------------------- */
-/*  Main functions                                                       */
-/* --------------------------------------------------------------------- */
-
-/* Creates an sljit compiler. The allocator_data is required by some
-   custom memory managers. This pointer is passed to SLJIT_MALLOC
-   and SLJIT_FREE macros. Most allocators (including the default
-   one) ignores this value, and it is recommended to pass NULL
-   as a dummy value for allocator_data.
-
-   Returns NULL if failed. */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data);
-
-/* Frees everything except the compiled machine code. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_compiler(struct sljit_compiler *compiler);
-
-/* Returns the current error code. If an error is occurred, future sljit
-   calls which uses the same compiler argument returns early with the same
-   error code. Thus there is no need for checking the error after every
-   call, it is enough to do it before the code is compiled. Removing
-   these checks increases the performance of the compiling process. */
-static SLJIT_INLINE sljit_si sljit_get_compiler_error(struct sljit_compiler *compiler) { return compiler->error; }
-
-/* Sets the compiler error code to SLJIT_ERR_ALLOC_FAILED except
-   if an error was detected before. After the error code is set
-   the compiler behaves as if the allocation failure happened
-   during an sljit function call. This can greatly simplify error
-   checking, since only the compiler status needs to be checked
-   after the compilation. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_compiler_memory_error(struct sljit_compiler *compiler);
-
-/*
-   Allocate a small amount of memory. The size must be <= 64 bytes on 32 bit,
-   and <= 128 bytes on 64 bit architectures. The memory area is owned by the
-   compiler, and freed by sljit_free_compiler. The returned pointer is
-   sizeof(sljit_sw) aligned. Excellent for allocating small blocks during
-   the compiling, and no need to worry about freeing them. The size is
-   enough to contain at most 16 pointers. If the size is outside of the range,
-   the function will return with NULL. However, this return value does not
-   indicate that there is no more memory (does not set the current error code
-   of the compiler to out-of-memory status).
-*/
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_alloc_memory(struct sljit_compiler *compiler, sljit_si size);
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-/* Passing NULL disables verbose. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *compiler, FILE* verbose);
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler);
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code);
-
-/*
-   After the machine code generation is finished we can retrieve the allocated
-   executable memory size, although this area may not be fully filled with
-   instructions depending on some optimizations. This function is useful only
-   for statistical purposes.
-
-   Before a successful code generation, this function returns with 0.
-*/
-static SLJIT_INLINE sljit_uw sljit_get_generated_code_size(struct sljit_compiler *compiler) { return compiler->executable_size; }
-
-/* Instruction generation. Returns with any error code. If there is no
-   error, they return with SLJIT_SUCCESS. */
-
-/*
-   The executable code is a function call from the viewpoint of the C
-   language. The function calls must obey to the ABI (Application
-   Binary Interface) of the platform, which specify the purpose of
-   all machine registers and stack handling among other things. The
-   sljit_emit_enter function emits the necessary instructions for
-   setting up a new context for the executable code and moves function
-   arguments to the saved registers. Furthermore the options argument
-   can be used to pass configuration options to the compiler. The
-   available options are listed before sljit_emit_enter.
-
-   The number of sljit_sw arguments passed to the generated function
-   are specified in the "args" parameter. The number of arguments must
-   be less than or equal to 3. The first argument goes to SLJIT_S0,
-   the second goes to SLJIT_S1 and so on. The register set used by
-   the function must be declared as well. The number of scratch and
-   saved registers used by the function must be passed to sljit_emit_enter.
-   Only R registers between R0 and "scratches" argument can be used
-   later. E.g. if "scratches" is set to 2, the register set will be
-   limited to R0 and R1. The S registers and the floating point
-   registers ("fscratches" and "fsaveds") are specified in a similar
-   way. The sljit_emit_enter is also capable of allocating a stack
-   space for local variables. The "local_size" argument contains the
-   size in bytes of this local area and its staring address is stored
-   in SLJIT_SP. The memory area between SLJIT_SP (inclusive) and
-   SLJIT_SP + local_size (exclusive) can be modified freely until
-   the function returns. The stack space is not initialized.
-
-   Note: the following conditions must met:
-         0 <= scratches <= SLJIT_NUMBER_OF_REGISTERS
-         0 <= saveds <= SLJIT_NUMBER_OF_REGISTERS
-         scratches + saveds <= SLJIT_NUMBER_OF_REGISTERS
-         0 <= fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
-         0 <= fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
-         fscratches + fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
-
-   Note: every call of sljit_emit_enter and sljit_set_context
-         overwrites the previous context.
-*/
-
-/* The absolute address returned by sljit_get_local_base with
-offset 0 is aligned to sljit_d. Otherwise it is aligned to sljit_uw. */
-#define SLJIT_DOUBLE_ALIGNMENT 0x00000001
-
-/* The local_size must be >= 0 and <= SLJIT_MAX_LOCAL_SIZE. */
-#define SLJIT_MAX_LOCAL_SIZE	65536
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size);
-
-/* The machine code has a context (which contains the local stack space size,
-   number of used registers, etc.) which initialized by sljit_emit_enter. Several
-   functions (like sljit_emit_return) requres this context to be able to generate
-   the appropriate code. However, some code fragments (like inline cache) may have
-   no normal entry point so their context is unknown for the compiler. Their context
-   can be provided to the compiler by the sljit_set_context function.
-
-   Note: every call of sljit_emit_enter and sljit_set_context overwrites
-         the previous context. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size);
-
-/* Return from machine code.  The op argument can be SLJIT_UNUSED which means the
-   function does not return with anything or any opcode between SLJIT_MOV and
-   SLJIT_MOV_P (see sljit_emit_op1). As for src and srcw they must be 0 if op
-   is SLJIT_UNUSED, otherwise see below the description about source and
-   destination arguments. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si src, sljit_sw srcw);
-
-/* Fast calling mechanism for utility functions (see SLJIT_FAST_CALL). All registers and
-   even the stack frame is passed to the callee. The return address is preserved in
-   dst/dstw by sljit_emit_fast_enter (the type of the value stored by this function
-   is sljit_p), and sljit_emit_fast_return can use this as a return value later. */
-
-/* Note: only for sljit specific, non ABI compilant calls. Fast, since only a few machine
-   instructions are needed. Excellent for small uility functions, where saving registers
-   and setting up a new stack frame would cost too much performance. However, it is still
-   possible to return to the address of the caller (or anywhere else). */
-
-/* Note: flags are not changed (unlike sljit_emit_enter / sljit_emit_return). */
-
-/* Note: although sljit_emit_fast_return could be replaced by an ijump, it is not suggested,
-   since many architectures do clever branch prediction on call / return instruction pairs. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw);
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw);
-
-/*
-   Source and destination values for arithmetical instructions
-    imm              - a simple immediate value (cannot be used as a destination)
-    reg              - any of the registers (immediate argument must be 0)
-    [imm]            - absolute immediate memory address
-    [reg+imm]        - indirect memory address
-    [reg+(reg<<imm)] - indirect indexed memory address (shift must be between 0 and 3)
-                       useful for (byte, half, int, sljit_sw) array access
-                       (fully supported by both x86 and ARM architectures, and cheap operation on others)
-*/
-
-/*
-   IMPORATNT NOTE: memory access MUST be naturally aligned except
-                   SLJIT_UNALIGNED macro is defined and its value is 1.
-
-     length | alignment
-   ---------+-----------
-     byte   | 1 byte (any physical_address is accepted)
-     half   | 2 byte (physical_address & 0x1 == 0)
-     int    | 4 byte (physical_address & 0x3 == 0)
-     word   | 4 byte if SLJIT_32BIT_ARCHITECTURE is defined and its value is 1
-            | 8 byte if SLJIT_64BIT_ARCHITECTURE is defined and its value is 1
-    pointer | size of sljit_p type (4 byte on 32 bit machines, 4 or 8 byte
-            | on 64 bit machines)
-
-   Note:   Different architectures have different addressing limitations.
-           A single instruction is enough for the following addressing
-           modes. Other adrressing modes are emulated by instruction
-           sequences. This information could help to improve those code
-           generators which focuses only a few architectures.
-
-   x86:    [reg+imm], -2^32+1 <= imm <= 2^32-1 (full address space on x86-32)
-           [reg+(reg<<imm)] is supported
-           [imm], -2^32+1 <= imm <= 2^32-1 is supported
-           Write-back is not supported
-   arm:    [reg+imm], -4095 <= imm <= 4095 or -255 <= imm <= 255 for signed
-                bytes, any halfs or floating point values)
-           [reg+(reg<<imm)] is supported
-           Write-back is supported
-   arm-t2: [reg+imm], -255 <= imm <= 4095
-           [reg+(reg<<imm)] is supported
-           Write back is supported only for [reg+imm], where -255 <= imm <= 255
-   ppc:    [reg+imm], -65536 <= imm <= 65535. 64 bit loads/stores and 32 bit
-                signed load on 64 bit requires immediates divisible by 4.
-                [reg+imm] is not supported for signed 8 bit values.
-           [reg+reg] is supported
-           Write-back is supported except for one instruction: 32 bit signed
-                load with [reg+imm] addressing mode on 64 bit.
-   mips:   [reg+imm], -65536 <= imm <= 65535
-   sparc:  [reg+imm], -4096 <= imm <= 4095
-           [reg+reg] is supported
-*/
-
-/* Register output: simply the name of the register.
-   For destination, you can use SLJIT_UNUSED as well. */
-#define SLJIT_MEM		0x80
-#define SLJIT_MEM0()		(SLJIT_MEM)
-#define SLJIT_MEM1(r1)		(SLJIT_MEM | (r1))
-#define SLJIT_MEM2(r1, r2)	(SLJIT_MEM | (r1) | ((r2) << 8))
-#define SLJIT_IMM		0x40
-
-/* Set 32 bit operation mode (I) on 64 bit CPUs. The flag is totally ignored on
-   32 bit CPUs. If this flag is set for an arithmetic operation, it uses only the
-   lower 32 bit of the input register(s), and set the CPU status flags according
-   to the 32 bit result. The higher 32 bits are undefined for both the input and
-   output. However, the CPU might not ignore those higher 32 bits, like MIPS, which
-   expects it to be the sign extension of the lower 32 bit. All 32 bit operations
-   are undefined, if this condition is not fulfilled. Therefore, when SLJIT_INT_OP
-   is specified, all register arguments must be the result of other operations with
-   the same SLJIT_INT_OP flag. In other words, although a register can hold either
-   a 64 or 32 bit value, these values cannot be mixed. The only exceptions are
-   SLJIT_IMOV and SLJIT_IMOVU (SLJIT_MOV_SI/SLJIT_MOVU_SI with SLJIT_INT_OP flag)
-   which can convert any source argument to SLJIT_INT_OP compatible result. This
-   conversion might be unnecessary on some CPUs like x86-64, since the upper 32
-   bit is always ignored. In this case SLJIT is clever enough to not generate any
-   instructions if the source and destination operands are the same registers.
-   Affects sljit_emit_op0, sljit_emit_op1 and sljit_emit_op2. */
-#define SLJIT_INT_OP		0x100
-
-/* Single precision mode (SP). This flag is similar to SLJIT_INT_OP, just
-   it applies to floating point registers (it is even the same bit). When
-   this flag is passed, the CPU performs single precision floating point
-   operations. Similar to SLJIT_INT_OP, all register arguments must be the
-   result of other floating point operations with this flag. Affects
-   sljit_emit_fop1, sljit_emit_fop2 and sljit_emit_fcmp. */
-#define SLJIT_SINGLE_OP		0x100
-
-/* Common CPU status flags for all architectures (x86, ARM, PPC)
-    - carry flag
-    - overflow flag
-    - zero flag
-    - negative/positive flag (depends on arc)
-   On mips, these flags are emulated by software. */
-
-/* By default, the instructions may, or may not set the CPU status flags.
-   Forcing to set or keep status flags can be done with the following flags: */
-
-/* Note: sljit tries to emit the minimum number of instructions. Using these
-   flags can increase them, so use them wisely to avoid unnecessary code generation. */
-
-/* Set Equal (Zero) status flag (E). */
-#define SLJIT_SET_E			0x0200
-/* Set unsigned status flag (U). */
-#define SLJIT_SET_U			0x0400
-/* Set signed status flag (S). */
-#define SLJIT_SET_S			0x0800
-/* Set signed overflow flag (O). */
-#define SLJIT_SET_O			0x1000
-/* Set carry flag (C).
-   Note: Kinda unsigned overflow, but behaves differently on various cpus. */
-#define SLJIT_SET_C			0x2000
-/* Do not modify the flags (K).
-   Note: This flag cannot be combined with any other SLJIT_SET_* flag. */
-#define SLJIT_KEEP_FLAGS		0x4000
-
-/* Notes:
-     - you cannot postpone conditional jump instructions except if noted that
-       the instruction does not set flags (See: SLJIT_KEEP_FLAGS).
-     - flag combinations: '|' means 'logical or'. */
-
-/* Starting index of opcodes for sljit_emit_op0. */
-#define SLJIT_OP0_BASE			0
-
-/* Flags: - (never set any flags)
-   Note: breakpoint instruction is not supported by all architectures (e.g. ppc)
-         It falls back to SLJIT_NOP in those cases. */
-#define SLJIT_BREAKPOINT		(SLJIT_OP0_BASE + 0)
-/* Flags: - (never set any flags)
-   Note: may or may not cause an extra cycle wait
-         it can even decrease the runtime in a few cases. */
-#define SLJIT_NOP			(SLJIT_OP0_BASE + 1)
-/* Flags: - (may destroy flags)
-   Unsigned multiplication of SLJIT_R0 and SLJIT_R1.
-   Result is placed into SLJIT_R1:SLJIT_R0 (high:low) word */
-#define SLJIT_LUMUL			(SLJIT_OP0_BASE + 2)
-/* Flags: - (may destroy flags)
-   Signed multiplication of SLJIT_R0 and SLJIT_R1.
-   Result is placed into SLJIT_R1:SLJIT_R0 (high:low) word */
-#define SLJIT_LSMUL			(SLJIT_OP0_BASE + 3)
-/* Flags: I - (may destroy flags)
-   Unsigned divide of the value in SLJIT_R0 by the value in SLJIT_R1.
-   The result is placed into SLJIT_R0 and the remainder into SLJIT_R1.
-   Note: if SLJIT_R1 is 0, the behaviour is undefined. */
-#define SLJIT_UDIVMOD			(SLJIT_OP0_BASE + 4)
-#define SLJIT_IUDIVMOD			(SLJIT_UDIVMOD | SLJIT_INT_OP)
-/* Flags: I - (may destroy flags)
-   Signed divide of the value in SLJIT_R0 by the value in SLJIT_R1.
-   The result is placed into SLJIT_R0 and the remainder into SLJIT_R1.
-   Note: if SLJIT_R1 is 0, the behaviour is undefined.
-   Note: if SLJIT_R1 is -1 and SLJIT_R0 is integer min (0x800..00),
-         the behaviour is undefined. */
-#define SLJIT_SDIVMOD			(SLJIT_OP0_BASE + 5)
-#define SLJIT_ISDIVMOD			(SLJIT_SDIVMOD | SLJIT_INT_OP)
-/* Flags: I - (may destroy flags)
-   Unsigned divide of the value in SLJIT_R0 by the value in SLJIT_R1.
-   The result is placed into SLJIT_R0. SLJIT_R1 preserves its value.
-   Note: if SLJIT_R1 is 0, the behaviour is undefined.
-   Note: SLJIT_SDIV is single precision divide. */
-#define SLJIT_UDIVI			(SLJIT_OP0_BASE + 6)
-#define SLJIT_IUDIVI			(SLJIT_UDIVI | SLJIT_INT_OP)
-/* Flags: I - (may destroy flags)
-   Signed divide of the value in SLJIT_R0 by the value in SLJIT_R1.
-   The result is placed into SLJIT_R0. SLJIT_R1 preserves its value.
-   Note: if SLJIT_R1 is 0, the behaviour is undefined.
-   Note: if SLJIT_R1 is -1 and SLJIT_R0 is integer min (0x800..00),
-         the behaviour is undefined.
-   Note: SLJIT_SDIV is single precision divide. */
-#define SLJIT_SDIVI			(SLJIT_OP0_BASE + 7)
-#define SLJIT_ISDIVI			(SLJIT_SDIVI | SLJIT_INT_OP)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op);
-
-/* Starting index of opcodes for sljit_emit_op1. */
-#define SLJIT_OP1_BASE			32
-
-/* Notes for MOV instructions:
-   U = Mov with update (pre form). If source or destination defined as SLJIT_MEM1(r1)
-       or SLJIT_MEM2(r1, r2), r1 is increased by the sum of r2 and the constant argument
-   UB = unsigned byte (8 bit)
-   SB = signed byte (8 bit)
-   UH = unsigned half (16 bit)
-   SH = signed half (16 bit)
-   UI = unsigned int (32 bit)
-   SI = signed int (32 bit)
-   P  = pointer (sljit_p) size */
-
-/* Flags: - (never set any flags) */
-#define SLJIT_MOV			(SLJIT_OP1_BASE + 0)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOV_UB			(SLJIT_OP1_BASE + 1)
-#define SLJIT_IMOV_UB			(SLJIT_MOV_UB | SLJIT_INT_OP)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOV_SB			(SLJIT_OP1_BASE + 2)
-#define SLJIT_IMOV_SB			(SLJIT_MOV_SB | SLJIT_INT_OP)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOV_UH			(SLJIT_OP1_BASE + 3)
-#define SLJIT_IMOV_UH			(SLJIT_MOV_UH | SLJIT_INT_OP)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOV_SH			(SLJIT_OP1_BASE + 4)
-#define SLJIT_IMOV_SH			(SLJIT_MOV_SH | SLJIT_INT_OP)
-/* Flags: I - (never set any flags)
-   Note: see SLJIT_INT_OP for further details. */
-#define SLJIT_MOV_UI			(SLJIT_OP1_BASE + 5)
-/* No SLJIT_INT_OP form, since it is the same as SLJIT_IMOV. */
-/* Flags: I - (never set any flags)
-   Note: see SLJIT_INT_OP for further details. */
-#define SLJIT_MOV_SI			(SLJIT_OP1_BASE + 6)
-#define SLJIT_IMOV			(SLJIT_MOV_SI | SLJIT_INT_OP)
-/* Flags: - (never set any flags) */
-#define SLJIT_MOV_P			(SLJIT_OP1_BASE + 7)
-/* Flags: - (never set any flags) */
-#define SLJIT_MOVU			(SLJIT_OP1_BASE + 8)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOVU_UB			(SLJIT_OP1_BASE + 9)
-#define SLJIT_IMOVU_UB			(SLJIT_MOVU_UB | SLJIT_INT_OP)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOVU_SB			(SLJIT_OP1_BASE + 10)
-#define SLJIT_IMOVU_SB			(SLJIT_MOVU_SB | SLJIT_INT_OP)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOVU_UH			(SLJIT_OP1_BASE + 11)
-#define SLJIT_IMOVU_UH			(SLJIT_MOVU_UH | SLJIT_INT_OP)
-/* Flags: I - (never set any flags) */
-#define SLJIT_MOVU_SH			(SLJIT_OP1_BASE + 12)
-#define SLJIT_IMOVU_SH			(SLJIT_MOVU_SH | SLJIT_INT_OP)
-/* Flags: I - (never set any flags)
-   Note: see SLJIT_INT_OP for further details. */
-#define SLJIT_MOVU_UI			(SLJIT_OP1_BASE + 13)
-/* No SLJIT_INT_OP form, since it is the same as SLJIT_IMOVU. */
-/* Flags: I - (never set any flags)
-   Note: see SLJIT_INT_OP for further details. */
-#define SLJIT_MOVU_SI			(SLJIT_OP1_BASE + 14)
-#define SLJIT_IMOVU			(SLJIT_MOVU_SI | SLJIT_INT_OP)
-/* Flags: - (never set any flags) */
-#define SLJIT_MOVU_P			(SLJIT_OP1_BASE + 15)
-/* Flags: I | E | K */
-#define SLJIT_NOT			(SLJIT_OP1_BASE + 16)
-#define SLJIT_INOT			(SLJIT_NOT | SLJIT_INT_OP)
-/* Flags: I | E | O | K */
-#define SLJIT_NEG			(SLJIT_OP1_BASE + 17)
-#define SLJIT_INEG			(SLJIT_NEG | SLJIT_INT_OP)
-/* Count leading zeroes
-   Flags: I | E | K
-   Important note! Sparc 32 does not support K flag, since
-   the required popc instruction is introduced only in sparc 64. */
-#define SLJIT_CLZ			(SLJIT_OP1_BASE + 18)
-#define SLJIT_ICLZ			(SLJIT_CLZ | SLJIT_INT_OP)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw);
-
-/* Starting index of opcodes for sljit_emit_op2. */
-#define SLJIT_OP2_BASE			96
-
-/* Flags: I | E | O | C | K */
-#define SLJIT_ADD			(SLJIT_OP2_BASE + 0)
-#define SLJIT_IADD			(SLJIT_ADD | SLJIT_INT_OP)
-/* Flags: I | C | K */
-#define SLJIT_ADDC			(SLJIT_OP2_BASE + 1)
-#define SLJIT_IADDC			(SLJIT_ADDC | SLJIT_INT_OP)
-/* Flags: I | E | U | S | O | C | K */
-#define SLJIT_SUB			(SLJIT_OP2_BASE + 2)
-#define SLJIT_ISUB			(SLJIT_SUB | SLJIT_INT_OP)
-/* Flags: I | C | K */
-#define SLJIT_SUBC			(SLJIT_OP2_BASE + 3)
-#define SLJIT_ISUBC			(SLJIT_SUBC | SLJIT_INT_OP)
-/* Note: integer mul
-   Flags: I | O (see SLJIT_C_MUL_*) | K */
-#define SLJIT_MUL			(SLJIT_OP2_BASE + 4)
-#define SLJIT_IMUL			(SLJIT_MUL | SLJIT_INT_OP)
-/* Flags: I | E | K */
-#define SLJIT_AND			(SLJIT_OP2_BASE + 5)
-#define SLJIT_IAND			(SLJIT_AND | SLJIT_INT_OP)
-/* Flags: I | E | K */
-#define SLJIT_OR			(SLJIT_OP2_BASE + 6)
-#define SLJIT_IOR			(SLJIT_OR | SLJIT_INT_OP)
-/* Flags: I | E | K */
-#define SLJIT_XOR			(SLJIT_OP2_BASE + 7)
-#define SLJIT_IXOR			(SLJIT_XOR | SLJIT_INT_OP)
-/* Flags: I | E | K
-   Let bit_length be the length of the shift operation: 32 or 64.
-   If src2 is immediate, src2w is masked by (bit_length - 1).
-   Otherwise, if the content of src2 is outside the range from 0
-   to bit_length - 1, the result is undefined. */
-#define SLJIT_SHL			(SLJIT_OP2_BASE + 8)
-#define SLJIT_ISHL			(SLJIT_SHL | SLJIT_INT_OP)
-/* Flags: I | E | K
-   Let bit_length be the length of the shift operation: 32 or 64.
-   If src2 is immediate, src2w is masked by (bit_length - 1).
-   Otherwise, if the content of src2 is outside the range from 0
-   to bit_length - 1, the result is undefined. */
-#define SLJIT_LSHR			(SLJIT_OP2_BASE + 9)
-#define SLJIT_ILSHR			(SLJIT_LSHR | SLJIT_INT_OP)
-/* Flags: I | E | K
-   Let bit_length be the length of the shift operation: 32 or 64.
-   If src2 is immediate, src2w is masked by (bit_length - 1).
-   Otherwise, if the content of src2 is outside the range from 0
-   to bit_length - 1, the result is undefined. */
-#define SLJIT_ASHR			(SLJIT_OP2_BASE + 10)
-#define SLJIT_IASHR			(SLJIT_ASHR | SLJIT_INT_OP)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w);
-
-/* Returns with non-zero if fpu is available. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_is_fpu_available(void);
-
-/* Starting index of opcodes for sljit_emit_fop1. */
-#define SLJIT_FOP1_BASE			128
-
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DMOV			(SLJIT_FOP1_BASE + 0)
-#define SLJIT_SMOV			(SLJIT_DMOV | SLJIT_SINGLE_OP)
-/* Convert opcodes: CONV[DST_TYPE].FROM[SRC_TYPE]
-   SRC/DST TYPE can be: D - double, S - single, W - signed word, I - signed int
-   Rounding mode when the destination is W or I: round towards zero. */
-/* Flags: SP - (never set any flags) */
-#define SLJIT_CONVD_FROMS		(SLJIT_FOP1_BASE + 1)
-#define SLJIT_CONVS_FROMD		(SLJIT_CONVD_FROMS | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_CONVW_FROMD		(SLJIT_FOP1_BASE + 2)
-#define SLJIT_CONVW_FROMS		(SLJIT_CONVW_FROMD | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_CONVI_FROMD		(SLJIT_FOP1_BASE + 3)
-#define SLJIT_CONVI_FROMS		(SLJIT_CONVI_FROMD | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_CONVD_FROMW		(SLJIT_FOP1_BASE + 4)
-#define SLJIT_CONVS_FROMW		(SLJIT_CONVD_FROMW | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_CONVD_FROMI		(SLJIT_FOP1_BASE + 5)
-#define SLJIT_CONVS_FROMI		(SLJIT_CONVD_FROMI | SLJIT_SINGLE_OP)
-/* Note: dst is the left and src is the right operand for SLJIT_CMPD.
-   Note: NaN check is always performed. If SLJIT_C_FLOAT_UNORDERED flag
-         is set, the comparison result is unpredictable.
-   Flags: SP | E | S (see SLJIT_C_FLOAT_*) */
-#define SLJIT_DCMP			(SLJIT_FOP1_BASE + 6)
-#define SLJIT_SCMP			(SLJIT_DCMP | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DNEG			(SLJIT_FOP1_BASE + 7)
-#define SLJIT_SNEG			(SLJIT_DNEG | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DABS			(SLJIT_FOP1_BASE + 8)
-#define SLJIT_SABS			(SLJIT_DABS | SLJIT_SINGLE_OP)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw);
-
-/* Starting index of opcodes for sljit_emit_fop2. */
-#define SLJIT_FOP2_BASE			160
-
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DADD			(SLJIT_FOP2_BASE + 0)
-#define SLJIT_SADD			(SLJIT_DADD | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DSUB			(SLJIT_FOP2_BASE + 1)
-#define SLJIT_SSUB			(SLJIT_DSUB | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DMUL			(SLJIT_FOP2_BASE + 2)
-#define SLJIT_SMUL			(SLJIT_DMUL | SLJIT_SINGLE_OP)
-/* Flags: SP - (never set any flags) */
-#define SLJIT_DDIV			(SLJIT_FOP2_BASE + 3)
-#define SLJIT_SDIV			(SLJIT_DDIV | SLJIT_SINGLE_OP)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w);
-
-/* Label and jump instructions. */
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compiler *compiler);
-
-/* Invert (negate) conditional type: xor (^) with 0x1 */
-
-/* Integer comparison types. */
-#define SLJIT_EQUAL			0
-#define SLJIT_I_EQUAL			(SLJIT_EQUAL | SLJIT_INT_OP)
-#define SLJIT_ZERO			0
-#define SLJIT_I_ZERO			(SLJIT_ZERO | SLJIT_INT_OP)
-#define SLJIT_NOT_EQUAL			1
-#define SLJIT_I_NOT_EQUAL		(SLJIT_NOT_EQUAL | SLJIT_INT_OP)
-#define SLJIT_NOT_ZERO			1
-#define SLJIT_I_NOT_ZERO		(SLJIT_NOT_ZERO | SLJIT_INT_OP)
-
-#define SLJIT_LESS			2
-#define SLJIT_I_LESS			(SLJIT_LESS | SLJIT_INT_OP)
-#define SLJIT_GREATER_EQUAL		3
-#define SLJIT_I_GREATER_EQUAL		(SLJIT_GREATER_EQUAL | SLJIT_INT_OP)
-#define SLJIT_GREATER			4
-#define SLJIT_I_GREATER			(SLJIT_GREATER | SLJIT_INT_OP)
-#define SLJIT_LESS_EQUAL		5
-#define SLJIT_I_LESS_EQUAL		(SLJIT_LESS_EQUAL | SLJIT_INT_OP)
-#define SLJIT_SIG_LESS			6
-#define SLJIT_I_SIG_LESS		(SLJIT_SIG_LESS | SLJIT_INT_OP)
-#define SLJIT_SIG_GREATER_EQUAL		7
-#define SLJIT_I_SIG_GREATER_EQUAL	(SLJIT_SIG_GREATER_EQUAL | SLJIT_INT_OP)
-#define SLJIT_SIG_GREATER		8
-#define SLJIT_I_SIG_GREATER		(SLJIT_SIG_GREATER | SLJIT_INT_OP)
-#define SLJIT_SIG_LESS_EQUAL		9
-#define SLJIT_I_SIG_LESS_EQUAL		(SLJIT_SIG_LESS_EQUAL | SLJIT_INT_OP)
-
-#define SLJIT_OVERFLOW			10
-#define SLJIT_I_OVERFLOW		(SLJIT_OVERFLOW | SLJIT_INT_OP)
-#define SLJIT_NOT_OVERFLOW		11
-#define SLJIT_I_NOT_OVERFLOW		(SLJIT_NOT_OVERFLOW | SLJIT_INT_OP)
-
-#define SLJIT_MUL_OVERFLOW		12
-#define SLJIT_I_MUL_OVERFLOW		(SLJIT_MUL_OVERFLOW | SLJIT_INT_OP)
-#define SLJIT_MUL_NOT_OVERFLOW		13
-#define SLJIT_I_MUL_NOT_OVERFLOW	(SLJIT_MUL_NOT_OVERFLOW | SLJIT_INT_OP)
-
-/* Floating point comparison types. */
-#define SLJIT_D_EQUAL			14
-#define SLJIT_S_EQUAL			(SLJIT_D_EQUAL | SLJIT_SINGLE_OP)
-#define SLJIT_D_NOT_EQUAL		15
-#define SLJIT_S_NOT_EQUAL		(SLJIT_D_NOT_EQUAL | SLJIT_SINGLE_OP)
-#define SLJIT_D_LESS			16
-#define SLJIT_S_LESS			(SLJIT_D_LESS | SLJIT_SINGLE_OP)
-#define SLJIT_D_GREATER_EQUAL		17
-#define SLJIT_S_GREATER_EQUAL		(SLJIT_D_GREATER_EQUAL | SLJIT_SINGLE_OP)
-#define SLJIT_D_GREATER			18
-#define SLJIT_S_GREATER			(SLJIT_D_GREATER | SLJIT_SINGLE_OP)
-#define SLJIT_D_LESS_EQUAL		19
-#define SLJIT_S_LESS_EQUAL		(SLJIT_D_LESS_EQUAL | SLJIT_SINGLE_OP)
-#define SLJIT_D_UNORDERED		20
-#define SLJIT_S_UNORDERED		(SLJIT_D_UNORDERED | SLJIT_SINGLE_OP)
-#define SLJIT_D_ORDERED			21
-#define SLJIT_S_ORDERED			(SLJIT_D_ORDERED | SLJIT_SINGLE_OP)
-
-/* Unconditional jump types. */
-#define SLJIT_JUMP			22
-#define SLJIT_FAST_CALL			23
-#define SLJIT_CALL0			24
-#define SLJIT_CALL1			25
-#define SLJIT_CALL2			26
-#define SLJIT_CALL3			27
-
-/* Fast calling method. See sljit_emit_fast_enter / sljit_emit_fast_return. */
-
-/* The target can be changed during runtime (see: sljit_set_jump_addr). */
-#define SLJIT_REWRITABLE_JUMP		0x1000
-
-/* Emit a jump instruction. The destination is not set, only the type of the jump.
-    type must be between SLJIT_EQUAL and SLJIT_CALL3
-    type can be combined (or'ed) with SLJIT_REWRITABLE_JUMP
-   Flags: - (never set any flags) for both conditional and unconditional jumps.
-   Flags: destroy all flags for calls. */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compiler *compiler, sljit_si type);
-
-/* Basic arithmetic comparison. In most architectures it is implemented as
-   an SLJIT_SUB operation (with SLJIT_UNUSED destination and setting
-   appropriate flags) followed by a sljit_emit_jump. However some
-   architectures (i.e: ARM64 or MIPS) may employ special optimizations here.
-   It is suggested to use this comparison form when appropriate.
-    type must be between SLJIT_EQUAL and SLJIT_I_SIG_LESS_EQUAL
-    type can be combined (or'ed) with SLJIT_REWRITABLE_JUMP
-   Flags: destroy flags. */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w);
-
-/* Basic floating point comparison. In most architectures it is implemented as
-   an SLJIT_FCMP operation (setting appropriate flags) followed by a
-   sljit_emit_jump. However some architectures (i.e: MIPS) may employ
-   special optimizations here. It is suggested to use this comparison form
-   when appropriate.
-    type must be between SLJIT_D_EQUAL and SLJIT_S_ORDERED
-    type can be combined (or'ed) with SLJIT_REWRITABLE_JUMP
-   Flags: destroy flags.
-   Note: if either operand is NaN, the behaviour is undefined for
-         types up to SLJIT_S_LESS_EQUAL. */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_fcmp(struct sljit_compiler *compiler, sljit_si type,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w);
-
-/* Set the destination of the jump to this label. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_label(struct sljit_jump *jump, struct sljit_label* label);
-/* Set the destination address of the jump to this label. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_target(struct sljit_jump *jump, sljit_uw target);
-
-/* Call function or jump anywhere. Both direct and indirect form
-    type must be between SLJIT_JUMP and SLJIT_CALL3
-    Direct form: set src to SLJIT_IMM() and srcw to the address
-    Indirect form: any other valid addressing mode
-   Flags: - (never set any flags) for unconditional jumps.
-   Flags: destroy all flags for calls. */
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_ijump(struct sljit_compiler *compiler, sljit_si type, sljit_si src, sljit_sw srcw);
-
-/* Perform the operation using the conditional flags as the second argument.
-   Type must always be between SLJIT_EQUAL and SLJIT_S_ORDERED. The value
-   represented by the type is 1, if the condition represented by the type
-   is fulfilled, and 0 otherwise.
-
-   If op == SLJIT_MOV, SLJIT_MOV_SI, SLJIT_MOV_UI:
-     Set dst to the value represented by the type (0 or 1).
-     Src must be SLJIT_UNUSED, and srcw must be 0
-     Flags: - (never set any flags)
-   If op == SLJIT_OR, op == SLJIT_AND, op == SLJIT_XOR
-     Performs the binary operation using src as the first, and the value
-     represented by type as the second argument.
-     Important note: only dst=src and dstw=srcw is supported at the moment!
-     Flags: I | E | K
-   Note: sljit_emit_op_flags does nothing, if dst is SLJIT_UNUSED (regardless of op). */
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_flags(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw,
-	sljit_si type);
-
-/* Copies the base address of SLJIT_SP + offset to dst.
-   Flags: - (never set any flags) */
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset);
-
-/* The constant can be changed runtime (see: sljit_set_const)
-   Flags: - (never set any flags) */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value);
-
-/* After the code generation the address for label, jump and const instructions
-   are computed. Since these structures are freed by sljit_free_compiler, the
-   addresses must be preserved by the user program elsewere. */
-static SLJIT_INLINE sljit_uw sljit_get_label_addr(struct sljit_label *label) { return label->addr; }
-static SLJIT_INLINE sljit_uw sljit_get_jump_addr(struct sljit_jump *jump) { return jump->addr; }
-static SLJIT_INLINE sljit_uw sljit_get_const_addr(struct sljit_const *const_) { return const_->addr; }
-
-/* Only the address is required to rewrite the code. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_addr);
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant);
-
-/* --------------------------------------------------------------------- */
-/*  Miscellaneous utility functions                                      */
-/* --------------------------------------------------------------------- */
-
-#define SLJIT_MAJOR_VERSION	0
-#define SLJIT_MINOR_VERSION	93
-
-/* Get the human readable name of the platform. Can be useful on platforms
-   like ARM, where ARM and Thumb2 functions can be mixed, and
-   it is useful to know the type of the code generator. */
-SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name(void);
-
-/* Portable helper function to get an offset of a member. */
-#define SLJIT_OFFSETOF(base, member) ((sljit_sw)(&((base*)0x10)->member) - 0x10)
-
-#if (defined SLJIT_UTIL_GLOBAL_LOCK && SLJIT_UTIL_GLOBAL_LOCK)
-/* This global lock is useful to compile common functions. */
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_grab_lock(void);
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_release_lock(void);
-#endif
-
-#if (defined SLJIT_UTIL_STACK && SLJIT_UTIL_STACK)
-
-/* The sljit_stack is a utiliy feature of sljit, which allocates a
-   writable memory region between base (inclusive) and limit (exclusive).
-   Both base and limit is a pointer, and base is always <= than limit.
-   This feature uses the "address space reserve" feature
-   of modern operating systems. Basically we don't need to allocate a
-   huge memory block in one step for the worst case, we can start with
-   a smaller chunk and extend it later. Since the address space is
-   reserved, the data never copied to other regions, thus it is safe
-   to store pointers here. */
-
-/* Note: The base field is aligned to PAGE_SIZE bytes (usually 4k or more).
-   Note: stack growing should not happen in small steps: 4k, 16k or even
-     bigger growth is better.
-   Note: this structure may not be supported by all operating systems.
-     Some kind of fallback mechanism is suggested when SLJIT_UTIL_STACK
-     is not defined. */
-
-struct sljit_stack {
-	/* User data, anything can be stored here.
-	   Starting with the same value as base. */
-	sljit_uw top;
-	/* These members are read only. */
-	sljit_uw base;
-	sljit_uw limit;
-	sljit_uw max_limit;
-};
-
-/* Returns NULL if unsuccessful.
-   Note: limit and max_limit contains the size for stack allocation.
-   Note: the top field is initialized to base.
-   Note: see sljit_create_compiler for the explanation of allocator_data. */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(sljit_uw limit, sljit_uw max_limit, void *allocator_data);
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_free_stack(struct sljit_stack *stack, void *allocator_data);
-
-/* Can be used to increase (allocate) or decrease (free) the memory area.
-   Returns with a non-zero value if unsuccessful. If new_limit is greater than
-   max_limit, it will fail. It is very easy to implement a stack data structure,
-   since the growth ratio can be added to the current limit, and sljit_stack_resize
-   will do all the necessary checks. The fields of the stack are not changed if
-   sljit_stack_resize fails. */
-SLJIT_API_FUNC_ATTRIBUTE sljit_sw SLJIT_CALL sljit_stack_resize(struct sljit_stack *stack, sljit_uw new_limit);
-
-#endif /* (defined SLJIT_UTIL_STACK && SLJIT_UTIL_STACK) */
-
-#if !(defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-
-/* Get the entry address of a given function. */
-#define SLJIT_FUNC_OFFSET(func_name)	((sljit_sw)func_name)
-
-#else /* !(defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL) */
-
-/* All JIT related code should be placed in the same context (library, binary, etc.). */
-
-#define SLJIT_FUNC_OFFSET(func_name)	(*(sljit_sw*)(void*)func_name)
-
-/* For powerpc64, the function pointers point to a context descriptor. */
-struct sljit_function_context {
-	sljit_sw addr;
-	sljit_sw r2;
-	sljit_sw r11;
-};
-
-/* Fill the context arguments using the addr and the function.
-   If func_ptr is NULL, it will not be set to the address of context
-   If addr is NULL, the function address also comes from the func pointer. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_function_context(void** func_ptr, struct sljit_function_context* context, sljit_sw addr, void* func);
-
-#endif /* !(defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL) */
-
-/* --------------------------------------------------------------------- */
-/*  CPU specific functions                                               */
-/* --------------------------------------------------------------------- */
-
-/* The following function is a helper function for sljit_emit_op_custom.
-   It returns with the real machine register index ( >=0 ) of any SLJIT_R,
-   SLJIT_S and SLJIT_SP registers.
-
-   Note: it returns with -1 for virtual registers (only on x86-32). */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg);
-
-/* The following function is a helper function for sljit_emit_op_custom.
-   It returns with the real machine register index of any SLJIT_FLOAT register.
-
-   Note: the index is always an even number on ARM (except ARM-64), MIPS, and SPARC. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_float_register_index(sljit_si reg);
-
-/* Any instruction can be inserted into the instruction stream by
-   sljit_emit_op_custom. It has a similar purpose as inline assembly.
-   The size parameter must match to the instruction size of the target
-   architecture:
-
-         x86: 0 < size <= 15. The instruction argument can be byte aligned.
-      Thumb2: if size == 2, the instruction argument must be 2 byte aligned.
-              if size == 4, the instruction argument must be 4 byte aligned.
-   Otherwise: size must be 4 and instruction argument must be 4 byte aligned. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler,
-	void *instruction, sljit_si size);
-
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-
-/* Returns with non-zero if sse2 is available. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_sse2_available(void);
-
-/* Returns with non-zero if cmov instruction is available. */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_cmov_available(void);
-
-/* Emit a conditional mov instruction on x86 CPUs. This instruction
-   moves src to destination, if the condition is satisfied. Unlike
-   other arithmetic instructions, destination must be a register.
-   Before such instructions are emitted, cmov support should be
-   checked by sljit_x86_is_cmov_available function.
-    type must be between SLJIT_EQUAL and SLJIT_S_ORDERED
-    dst_reg must be a valid register and it can be combined
-      with SLJIT_INT_OP to perform 32 bit arithmetic
-   Flags: I - (never set any flags)
- */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_emit_cmov(struct sljit_compiler *compiler,
-	sljit_si type,
-	sljit_si dst_reg,
-	sljit_si src, sljit_sw srcw);
-
-#endif
-
-#endif /* _SLJIT_LIR_H_ */
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativePPC_32.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativePPC_32.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativePPC_32.c	2014-04-20 22:15:03.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativePPC_32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* ppc 32-bit arch dependent functions. */
-
-static sljit_si load_immediate(struct sljit_compiler *compiler, sljit_si reg, sljit_sw imm)
-{
-	if (imm <= SIMM_MAX && imm >= SIMM_MIN)
-		return push_inst(compiler, ADDI | D(reg) | A(0) | IMM(imm));
-
-	if (!(imm & ~0xffff))
-		return push_inst(compiler, ORI | S(TMP_ZERO) | A(reg) | IMM(imm));
-
-	FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(imm >> 16)));
-	return (imm & 0xffff) ? push_inst(compiler, ORI | S(reg) | A(reg) | IMM(imm)) : SLJIT_SUCCESS;
-}
-
-#define INS_CLEAR_LEFT(dst, src, from) \
-	(RLWINM | S(src) | A(dst) | ((from) << 6) | (31 << 1))
-
-static SLJIT_INLINE sljit_si emit_single_op(struct sljit_compiler *compiler, sljit_si op, sljit_si flags,
-	sljit_si dst, sljit_si src1, sljit_si src2)
-{
-	switch (op) {
-	case SLJIT_MOV:
-	case SLJIT_MOV_UI:
-	case SLJIT_MOV_SI:
-	case SLJIT_MOV_P:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if (dst != src2)
-			return push_inst(compiler, OR | S(src2) | A(dst) | B(src2));
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UB:
-	case SLJIT_MOV_SB:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			if (op == SLJIT_MOV_SB)
-				return push_inst(compiler, EXTSB | S(src2) | A(dst));
-			return push_inst(compiler, INS_CLEAR_LEFT(dst, src2, 24));
-		}
-		else if ((flags & REG_DEST) && op == SLJIT_MOV_SB)
-			return push_inst(compiler, EXTSB | S(src2) | A(dst));
-		else {
-			SLJIT_ASSERT(dst == src2);
-		}
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UH:
-	case SLJIT_MOV_SH:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			if (op == SLJIT_MOV_SH)
-				return push_inst(compiler, EXTSH | S(src2) | A(dst));
-			return push_inst(compiler, INS_CLEAR_LEFT(dst, src2, 16));
-		}
-		else {
-			SLJIT_ASSERT(dst == src2);
-		}
-		return SLJIT_SUCCESS;
-
-	case SLJIT_NOT:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		return push_inst(compiler, NOR | RC(flags) | S(src2) | A(dst) | B(src2));
-
-	case SLJIT_NEG:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		return push_inst(compiler, NEG | OERC(flags) | D(dst) | A(src2));
-
-	case SLJIT_CLZ:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		return push_inst(compiler, CNTLZW | RC(flags) | S(src2) | A(dst));
-
-	case SLJIT_ADD:
-		if (flags & ALT_FORM1) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ADDI | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ADDIS | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & ALT_FORM3) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ADDIC | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & ALT_FORM4) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			FAIL_IF(push_inst(compiler, ADDI | D(dst) | A(src1) | (compiler->imm & 0xffff)));
-			return push_inst(compiler, ADDIS | D(dst) | A(dst) | (((compiler->imm >> 16) & 0xffff) + ((compiler->imm >> 15) & 0x1)));
-		}
-		if (!(flags & ALT_SET_FLAGS))
-			return push_inst(compiler, ADD | D(dst) | A(src1) | B(src2));
-		return push_inst(compiler, ADDC | OERC(ALT_SET_FLAGS) | D(dst) | A(src1) | B(src2));
-
-	case SLJIT_ADDC:
-		if (flags & ALT_FORM1) {
-			FAIL_IF(push_inst(compiler, MFXER | D(0)));
-			FAIL_IF(push_inst(compiler, ADDE | D(dst) | A(src1) | B(src2)));
-			return push_inst(compiler, MTXER | S(0));
-		}
-		return push_inst(compiler, ADDE | D(dst) | A(src1) | B(src2));
-
-	case SLJIT_SUB:
-		if (flags & ALT_FORM1) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, SUBFIC | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & (ALT_FORM2 | ALT_FORM3)) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			if (flags & ALT_FORM2)
-				FAIL_IF(push_inst(compiler, CMPI | CRD(0) | A(src1) | compiler->imm));
-			if (flags & ALT_FORM3)
-				return push_inst(compiler, CMPLI | CRD(4) | A(src1) | compiler->imm);
-			return SLJIT_SUCCESS;
-		}
-		if (flags & (ALT_FORM4 | ALT_FORM5)) {
-			if (flags & ALT_FORM4)
-				FAIL_IF(push_inst(compiler, CMPL | CRD(4) | A(src1) | B(src2)));
-			if (flags & ALT_FORM5)
-				FAIL_IF(push_inst(compiler, CMP | CRD(0) | A(src1) | B(src2)));
-			return SLJIT_SUCCESS;
-		}
-		if (!(flags & ALT_SET_FLAGS))
-			return push_inst(compiler, SUBF | D(dst) | A(src2) | B(src1));
-		if (flags & ALT_FORM6)
-			FAIL_IF(push_inst(compiler, CMPL | CRD(4) | A(src1) | B(src2)));
-		return push_inst(compiler, SUBFC | OERC(ALT_SET_FLAGS) | D(dst) | A(src2) | B(src1));
-
-	case SLJIT_SUBC:
-		if (flags & ALT_FORM1) {
-			FAIL_IF(push_inst(compiler, MFXER | D(0)));
-			FAIL_IF(push_inst(compiler, SUBFE | D(dst) | A(src2) | B(src1)));
-			return push_inst(compiler, MTXER | S(0));
-		}
-		return push_inst(compiler, SUBFE | D(dst) | A(src2) | B(src1));
-
-	case SLJIT_MUL:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, MULLI | D(dst) | A(src1) | compiler->imm);
-		}
-		return push_inst(compiler, MULLW | OERC(flags) | D(dst) | A(src2) | B(src1));
-
-	case SLJIT_AND:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ANDI | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ANDIS | S(src1) | A(dst) | compiler->imm);
-		}
-		return push_inst(compiler, AND | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_OR:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ORI | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ORIS | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM3) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			FAIL_IF(push_inst(compiler, ORI | S(src1) | A(dst) | IMM(compiler->imm)));
-			return push_inst(compiler, ORIS | S(dst) | A(dst) | IMM(compiler->imm >> 16));
-		}
-		return push_inst(compiler, OR | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_XOR:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, XORI | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, XORIS | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM3) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			FAIL_IF(push_inst(compiler, XORI | S(src1) | A(dst) | IMM(compiler->imm)));
-			return push_inst(compiler, XORIS | S(dst) | A(dst) | IMM(compiler->imm >> 16));
-		}
-		return push_inst(compiler, XOR | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_SHL:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			compiler->imm &= 0x1f;
-			return push_inst(compiler, RLWINM | RC(flags) | S(src1) | A(dst) | (compiler->imm << 11) | ((31 - compiler->imm) << 1));
-		}
-		return push_inst(compiler, SLW | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_LSHR:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			compiler->imm &= 0x1f;
-			return push_inst(compiler, RLWINM | RC(flags) | S(src1) | A(dst) | (((32 - compiler->imm) & 0x1f) << 11) | (compiler->imm << 6) | (31 << 1));
-		}
-		return push_inst(compiler, SRW | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_ASHR:
-		if (flags & ALT_FORM3)
-			FAIL_IF(push_inst(compiler, MFXER | D(0)));
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			compiler->imm &= 0x1f;
-			FAIL_IF(push_inst(compiler, SRAWI | RC(flags) | S(src1) | A(dst) | (compiler->imm << 11)));
-		}
-		else
-			FAIL_IF(push_inst(compiler, SRAW | RC(flags) | S(src1) | A(dst) | B(src2)));
-		return (flags & ALT_FORM3) ? push_inst(compiler, MTXER | S(0)) : SLJIT_SUCCESS;
-	}
-
-	SLJIT_ASSERT_STOP();
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si emit_const(struct sljit_compiler *compiler, sljit_si reg, sljit_sw init_value)
-{
-	FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(init_value >> 16)));
-	return push_inst(compiler, ORI | S(reg) | A(reg) | IMM(init_value));
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_addr)
-{
-	sljit_ins *inst = (sljit_ins*)addr;
-
-	inst[0] = (inst[0] & 0xffff0000) | ((new_addr >> 16) & 0xffff);
-	inst[1] = (inst[1] & 0xffff0000) | (new_addr & 0xffff);
-	SLJIT_CACHE_FLUSH(inst, inst + 2);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant)
-{
-	sljit_ins *inst = (sljit_ins*)addr;
-
-	inst[0] = (inst[0] & 0xffff0000) | ((new_constant >> 16) & 0xffff);
-	inst[1] = (inst[1] & 0xffff0000) | (new_constant & 0xffff);
-	SLJIT_CACHE_FLUSH(inst, inst + 2);
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativePPC_64.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativePPC_64.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativePPC_64.c	2014-04-20 22:15:03.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativePPC_64.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,421 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* ppc 64-bit arch dependent functions. */
-
-#if defined(__GNUC__) || (defined(__IBM_GCC_ASM) && __IBM_GCC_ASM)
-#define ASM_SLJIT_CLZ(src, dst) \
-	__asm__ volatile ( "cntlzd %0, %1" : "=r"(dst) : "r"(src) )
-#elif defined(__xlc__)
-#error "Please enable GCC syntax for inline assembly statements"
-#else
-#error "Must implement count leading zeroes"
-#endif
-
-#define RLDI(dst, src, sh, mb, type) \
-	(HI(30) | S(src) | A(dst) | ((type) << 2) | (((sh) & 0x1f) << 11) | (((sh) & 0x20) >> 4) | (((mb) & 0x1f) << 6) | ((mb) & 0x20))
-
-#define PUSH_RLDICR(reg, shift) \
-	push_inst(compiler, RLDI(reg, reg, 63 - shift, shift, 1))
-
-static sljit_si load_immediate(struct sljit_compiler *compiler, sljit_si reg, sljit_sw imm)
-{
-	sljit_uw tmp;
-	sljit_uw shift;
-	sljit_uw tmp2;
-	sljit_uw shift2;
-
-	if (imm <= SIMM_MAX && imm >= SIMM_MIN)
-		return push_inst(compiler, ADDI | D(reg) | A(0) | IMM(imm));
-
-	if (!(imm & ~0xffff))
-		return push_inst(compiler, ORI | S(TMP_ZERO) | A(reg) | IMM(imm));
-
-	if (imm <= 0x7fffffffl && imm >= -0x80000000l) {
-		FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(imm >> 16)));
-		return (imm & 0xffff) ? push_inst(compiler, ORI | S(reg) | A(reg) | IMM(imm)) : SLJIT_SUCCESS;
-	}
-
-	/* Count leading zeroes. */
-	tmp = (imm >= 0) ? imm : ~imm;
-	ASM_SLJIT_CLZ(tmp, shift);
-	SLJIT_ASSERT(shift > 0);
-	shift--;
-	tmp = (imm << shift);
-
-	if ((tmp & ~0xffff000000000000ul) == 0) {
-		FAIL_IF(push_inst(compiler, ADDI | D(reg) | A(0) | IMM(tmp >> 48)));
-		shift += 15;
-		return PUSH_RLDICR(reg, shift);
-	}
-
-	if ((tmp & ~0xffffffff00000000ul) == 0) {
-		FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(tmp >> 48)));
-		FAIL_IF(push_inst(compiler, ORI | S(reg) | A(reg) | IMM(tmp >> 32)));
-		shift += 31;
-		return PUSH_RLDICR(reg, shift);
-	}
-
-	/* Cut out the 16 bit from immediate. */
-	shift += 15;
-	tmp2 = imm & ((1ul << (63 - shift)) - 1);
-
-	if (tmp2 <= 0xffff) {
-		FAIL_IF(push_inst(compiler, ADDI | D(reg) | A(0) | IMM(tmp >> 48)));
-		FAIL_IF(PUSH_RLDICR(reg, shift));
-		return push_inst(compiler, ORI | S(reg) | A(reg) | tmp2);
-	}
-
-	if (tmp2 <= 0xffffffff) {
-		FAIL_IF(push_inst(compiler, ADDI | D(reg) | A(0) | IMM(tmp >> 48)));
-		FAIL_IF(PUSH_RLDICR(reg, shift));
-		FAIL_IF(push_inst(compiler, ORIS | S(reg) | A(reg) | (tmp2 >> 16)));
-		return (imm & 0xffff) ? push_inst(compiler, ORI | S(reg) | A(reg) | IMM(tmp2)) : SLJIT_SUCCESS;
-	}
-
-	ASM_SLJIT_CLZ(tmp2, shift2);
-	tmp2 <<= shift2;
-
-	if ((tmp2 & ~0xffff000000000000ul) == 0) {
-		FAIL_IF(push_inst(compiler, ADDI | D(reg) | A(0) | IMM(tmp >> 48)));
-		shift2 += 15;
-		shift += (63 - shift2);
-		FAIL_IF(PUSH_RLDICR(reg, shift));
-		FAIL_IF(push_inst(compiler, ORI | S(reg) | A(reg) | (tmp2 >> 48)));
-		return PUSH_RLDICR(reg, shift2);
-	}
-
-	/* The general version. */
-	FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(imm >> 48)));
-	FAIL_IF(push_inst(compiler, ORI | S(reg) | A(reg) | IMM(imm >> 32)));
-	FAIL_IF(PUSH_RLDICR(reg, 31));
-	FAIL_IF(push_inst(compiler, ORIS | S(reg) | A(reg) | IMM(imm >> 16)));
-	return push_inst(compiler, ORI | S(reg) | A(reg) | IMM(imm));
-}
-
-/* Simplified mnemonics: clrldi. */
-#define INS_CLEAR_LEFT(dst, src, from) \
-	(RLDICL | S(src) | A(dst) | ((from) << 6) | (1 << 5))
-
-/* Sign extension for integer operations. */
-#define UN_EXTS() \
-	if ((flags & (ALT_SIGN_EXT | REG2_SOURCE)) == (ALT_SIGN_EXT | REG2_SOURCE)) { \
-		FAIL_IF(push_inst(compiler, EXTSW | S(src2) | A(TMP_REG2))); \
-		src2 = TMP_REG2; \
-	}
-
-#define BIN_EXTS() \
-	if (flags & ALT_SIGN_EXT) { \
-		if (flags & REG1_SOURCE) { \
-			FAIL_IF(push_inst(compiler, EXTSW | S(src1) | A(TMP_REG1))); \
-			src1 = TMP_REG1; \
-		} \
-		if (flags & REG2_SOURCE) { \
-			FAIL_IF(push_inst(compiler, EXTSW | S(src2) | A(TMP_REG2))); \
-			src2 = TMP_REG2; \
-		} \
-	}
-
-#define BIN_IMM_EXTS() \
-	if ((flags & (ALT_SIGN_EXT | REG1_SOURCE)) == (ALT_SIGN_EXT | REG1_SOURCE)) { \
-		FAIL_IF(push_inst(compiler, EXTSW | S(src1) | A(TMP_REG1))); \
-		src1 = TMP_REG1; \
-	}
-
-static SLJIT_INLINE sljit_si emit_single_op(struct sljit_compiler *compiler, sljit_si op, sljit_si flags,
-	sljit_si dst, sljit_si src1, sljit_si src2)
-{
-	switch (op) {
-	case SLJIT_MOV:
-	case SLJIT_MOV_P:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if (dst != src2)
-			return push_inst(compiler, OR | S(src2) | A(dst) | B(src2));
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UI:
-	case SLJIT_MOV_SI:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			if (op == SLJIT_MOV_SI)
-				return push_inst(compiler, EXTSW | S(src2) | A(dst));
-			return push_inst(compiler, INS_CLEAR_LEFT(dst, src2, 0));
-		}
-		else {
-			SLJIT_ASSERT(dst == src2);
-		}
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UB:
-	case SLJIT_MOV_SB:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			if (op == SLJIT_MOV_SB)
-				return push_inst(compiler, EXTSB | S(src2) | A(dst));
-			return push_inst(compiler, INS_CLEAR_LEFT(dst, src2, 24));
-		}
-		else if ((flags & REG_DEST) && op == SLJIT_MOV_SB)
-			return push_inst(compiler, EXTSB | S(src2) | A(dst));
-		else {
-			SLJIT_ASSERT(dst == src2);
-		}
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UH:
-	case SLJIT_MOV_SH:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			if (op == SLJIT_MOV_SH)
-				return push_inst(compiler, EXTSH | S(src2) | A(dst));
-			return push_inst(compiler, INS_CLEAR_LEFT(dst, src2, 16));
-		}
-		else {
-			SLJIT_ASSERT(dst == src2);
-		}
-		return SLJIT_SUCCESS;
-
-	case SLJIT_NOT:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		UN_EXTS();
-		return push_inst(compiler, NOR | RC(flags) | S(src2) | A(dst) | B(src2));
-
-	case SLJIT_NEG:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		UN_EXTS();
-		return push_inst(compiler, NEG | OERC(flags) | D(dst) | A(src2));
-
-	case SLJIT_CLZ:
-		SLJIT_ASSERT(src1 == TMP_REG1);
-		if (flags & ALT_FORM1)
-			return push_inst(compiler, CNTLZW | RC(flags) | S(src2) | A(dst));
-		return push_inst(compiler, CNTLZD | RC(flags) | S(src2) | A(dst));
-
-	case SLJIT_ADD:
-		if (flags & ALT_FORM1) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ADDI | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ADDIS | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & ALT_FORM3) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			BIN_IMM_EXTS();
-			return push_inst(compiler, ADDIC | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & ALT_FORM4) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			FAIL_IF(push_inst(compiler, ADDI | D(dst) | A(src1) | (compiler->imm & 0xffff)));
-			return push_inst(compiler, ADDIS | D(dst) | A(dst) | (((compiler->imm >> 16) & 0xffff) + ((compiler->imm >> 15) & 0x1)));
-		}
-		if (!(flags & ALT_SET_FLAGS))
-			return push_inst(compiler, ADD | D(dst) | A(src1) | B(src2));
-		BIN_EXTS();
-		return push_inst(compiler, ADDC | OERC(ALT_SET_FLAGS) | D(dst) | A(src1) | B(src2));
-
-	case SLJIT_ADDC:
-		if (flags & ALT_FORM1) {
-			FAIL_IF(push_inst(compiler, MFXER | D(0)));
-			FAIL_IF(push_inst(compiler, ADDE | D(dst) | A(src1) | B(src2)));
-			return push_inst(compiler, MTXER | S(0));
-		}
-		BIN_EXTS();
-		return push_inst(compiler, ADDE | D(dst) | A(src1) | B(src2));
-
-	case SLJIT_SUB:
-		if (flags & ALT_FORM1) {
-			/* Flags does not set: BIN_IMM_EXTS unnecessary. */
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, SUBFIC | D(dst) | A(src1) | compiler->imm);
-		}
-		if (flags & (ALT_FORM2 | ALT_FORM3)) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			if (flags & ALT_FORM2)
-				FAIL_IF(push_inst(compiler, CMPI | CRD(0 | ((flags & ALT_SIGN_EXT) ? 0 : 1)) | A(src1) | compiler->imm));
-			if (flags & ALT_FORM3)
-				return push_inst(compiler, CMPLI | CRD(4 | ((flags & ALT_SIGN_EXT) ? 0 : 1)) | A(src1) | compiler->imm);
-			return SLJIT_SUCCESS;
-		}
-		if (flags & (ALT_FORM4 | ALT_FORM5)) {
-			if (flags & ALT_FORM4)
-				FAIL_IF(push_inst(compiler, CMPL | CRD(4 | ((flags & ALT_SIGN_EXT) ? 0 : 1)) | A(src1) | B(src2)));
-			if (flags & ALT_FORM5)
-				return push_inst(compiler, CMP | CRD(0 | ((flags & ALT_SIGN_EXT) ? 0 : 1)) | A(src1) | B(src2));
-			return SLJIT_SUCCESS;
-		}
-		if (!(flags & ALT_SET_FLAGS))
-			return push_inst(compiler, SUBF | D(dst) | A(src2) | B(src1));
-		BIN_EXTS();
-		if (flags & ALT_FORM6)
-			FAIL_IF(push_inst(compiler, CMPL | CRD(4 | ((flags & ALT_SIGN_EXT) ? 0 : 1)) | A(src1) | B(src2)));
-		return push_inst(compiler, SUBFC | OERC(ALT_SET_FLAGS) | D(dst) | A(src2) | B(src1));
-
-	case SLJIT_SUBC:
-		if (flags & ALT_FORM1) {
-			FAIL_IF(push_inst(compiler, MFXER | D(0)));
-			FAIL_IF(push_inst(compiler, SUBFE | D(dst) | A(src2) | B(src1)));
-			return push_inst(compiler, MTXER | S(0));
-		}
-		BIN_EXTS();
-		return push_inst(compiler, SUBFE | D(dst) | A(src2) | B(src1));
-
-	case SLJIT_MUL:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, MULLI | D(dst) | A(src1) | compiler->imm);
-		}
-		BIN_EXTS();
-		if (flags & ALT_FORM2)
-			return push_inst(compiler, MULLW | OERC(flags) | D(dst) | A(src2) | B(src1));
-		return push_inst(compiler, MULLD | OERC(flags) | D(dst) | A(src2) | B(src1));
-
-	case SLJIT_AND:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ANDI | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ANDIS | S(src1) | A(dst) | compiler->imm);
-		}
-		return push_inst(compiler, AND | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_OR:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ORI | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, ORIS | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM3) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			FAIL_IF(push_inst(compiler, ORI | S(src1) | A(dst) | IMM(compiler->imm)));
-			return push_inst(compiler, ORIS | S(dst) | A(dst) | IMM(compiler->imm >> 16));
-		}
-		return push_inst(compiler, OR | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_XOR:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, XORI | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM2) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			return push_inst(compiler, XORIS | S(src1) | A(dst) | compiler->imm);
-		}
-		if (flags & ALT_FORM3) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			FAIL_IF(push_inst(compiler, XORI | S(src1) | A(dst) | IMM(compiler->imm)));
-			return push_inst(compiler, XORIS | S(dst) | A(dst) | IMM(compiler->imm >> 16));
-		}
-		return push_inst(compiler, XOR | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_SHL:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			if (flags & ALT_FORM2) {
-				compiler->imm &= 0x1f;
-				return push_inst(compiler, RLWINM | RC(flags) | S(src1) | A(dst) | (compiler->imm << 11) | ((31 - compiler->imm) << 1));
-			}
-			else {
-				compiler->imm &= 0x3f;
-				return push_inst(compiler, RLDI(dst, src1, compiler->imm, 63 - compiler->imm, 1) | RC(flags));
-			}
-		}
-		return push_inst(compiler, ((flags & ALT_FORM2) ? SLW : SLD) | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_LSHR:
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			if (flags & ALT_FORM2) {
-				compiler->imm &= 0x1f;
-				return push_inst(compiler, RLWINM | RC(flags) | S(src1) | A(dst) | (((32 - compiler->imm) & 0x1f) << 11) | (compiler->imm << 6) | (31 << 1));
-			}
-			else {
-				compiler->imm &= 0x3f;
-				return push_inst(compiler, RLDI(dst, src1, 64 - compiler->imm, compiler->imm, 0) | RC(flags));
-			}
-		}
-		return push_inst(compiler, ((flags & ALT_FORM2) ? SRW : SRD) | RC(flags) | S(src1) | A(dst) | B(src2));
-
-	case SLJIT_ASHR:
-		if (flags & ALT_FORM3)
-			FAIL_IF(push_inst(compiler, MFXER | D(0)));
-		if (flags & ALT_FORM1) {
-			SLJIT_ASSERT(src2 == TMP_REG2);
-			if (flags & ALT_FORM2) {
-				compiler->imm &= 0x1f;
-				FAIL_IF(push_inst(compiler, SRAWI | RC(flags) | S(src1) | A(dst) | (compiler->imm << 11)));
-			}
-			else {
-				compiler->imm &= 0x3f;
-				FAIL_IF(push_inst(compiler, SRADI | RC(flags) | S(src1) | A(dst) | ((compiler->imm & 0x1f) << 11) | ((compiler->imm & 0x20) >> 4)));
-			}
-		}
-		else
-			FAIL_IF(push_inst(compiler, ((flags & ALT_FORM2) ? SRAW : SRAD) | RC(flags) | S(src1) | A(dst) | B(src2)));
-		return (flags & ALT_FORM3) ? push_inst(compiler, MTXER | S(0)) : SLJIT_SUCCESS;
-	}
-
-	SLJIT_ASSERT_STOP();
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si emit_const(struct sljit_compiler *compiler, sljit_si reg, sljit_sw init_value)
-{
-	FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(init_value >> 48)));
-	FAIL_IF(push_inst(compiler, ORI | S(reg) | A(reg) | IMM(init_value >> 32)));
-	FAIL_IF(PUSH_RLDICR(reg, 31));
-	FAIL_IF(push_inst(compiler, ORIS | S(reg) | A(reg) | IMM(init_value >> 16)));
-	return push_inst(compiler, ORI | S(reg) | A(reg) | IMM(init_value));
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_addr)
-{
-	sljit_ins *inst = (sljit_ins*)addr;
-
-	inst[0] = (inst[0] & 0xffff0000) | ((new_addr >> 48) & 0xffff);
-	inst[1] = (inst[1] & 0xffff0000) | ((new_addr >> 32) & 0xffff);
-	inst[3] = (inst[3] & 0xffff0000) | ((new_addr >> 16) & 0xffff);
-	inst[4] = (inst[4] & 0xffff0000) | (new_addr & 0xffff);
-	SLJIT_CACHE_FLUSH(inst, inst + 5);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant)
-{
-	sljit_ins *inst = (sljit_ins*)addr;
-
-	inst[0] = (inst[0] & 0xffff0000) | ((new_constant >> 48) & 0xffff);
-	inst[1] = (inst[1] & 0xffff0000) | ((new_constant >> 32) & 0xffff);
-	inst[3] = (inst[3] & 0xffff0000) | ((new_constant >> 16) & 0xffff);
-	inst[4] = (inst[4] & 0xffff0000) | (new_constant & 0xffff);
-	SLJIT_CACHE_FLUSH(inst, inst + 5);
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativePPC_common.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativePPC_common.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativePPC_common.c	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativePPC_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2375 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name(void)
-{
-	return "PowerPC" SLJIT_CPUINFO;
-}
-
-/* Length of an instruction word.
-   Both for ppc-32 and ppc-64. */
-typedef sljit_ui sljit_ins;
-
-#if ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && (defined _AIX)) \
-	|| (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define SLJIT_PPC_STACK_FRAME_V2 1
-#endif
-
-#ifdef _AIX
-#include <sys/cache.h>
-#endif
-
-#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-#define SLJIT_PASS_ENTRY_ADDR_TO_CALL 1
-#endif
-
-static void ppc_cache_flush(sljit_ins *from, sljit_ins *to)
-{
-#ifdef _AIX
-	_sync_cache_range((caddr_t)from, (int)((size_t)to - (size_t)from));
-#elif defined(__GNUC__) || (defined(__IBM_GCC_ASM) && __IBM_GCC_ASM)
-#	if defined(_ARCH_PWR) || defined(_ARCH_PWR2)
-	/* Cache flush for POWER architecture. */
-	while (from < to) {
-		__asm__ volatile (
-			"clf 0, %0\n"
-			"dcs\n"
-			: : "r"(from)
-		);
-		from++;
-	}
-	__asm__ volatile ( "ics" );
-#	elif defined(_ARCH_COM) && !defined(_ARCH_PPC)
-#	error "Cache flush is not implemented for PowerPC/POWER common mode."
-#	else
-	/* Cache flush for PowerPC architecture. */
-	while (from < to) {
-		__asm__ volatile (
-			"dcbf 0, %0\n"
-			"sync\n"
-			"icbi 0, %0\n"
-			: : "r"(from)
-		);
-		from++;
-	}
-	__asm__ volatile ( "isync" );
-#	endif
-#	ifdef __xlc__
-#	warning "This file may fail to compile if -qfuncsect is used"
-#	endif
-#elif defined(__xlc__)
-#error "Please enable GCC syntax for inline assembly statements with -qasm=gcc"
-#else
-#error "This platform requires a cache flush implementation."
-#endif /* _AIX */
-}
-
-#define TMP_REG1	(SLJIT_NUMBER_OF_REGISTERS + 2)
-#define TMP_REG2	(SLJIT_NUMBER_OF_REGISTERS + 3)
-#define TMP_REG3	(SLJIT_NUMBER_OF_REGISTERS + 4)
-#define TMP_ZERO	(SLJIT_NUMBER_OF_REGISTERS + 5)
-
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-#define TMP_CALL_REG	(SLJIT_NUMBER_OF_REGISTERS + 6)
-#else
-#define TMP_CALL_REG	TMP_REG2
-#endif
-
-#define TMP_FREG1	(0)
-#define TMP_FREG2	(SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
-
-static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 7] = {
-	0, 3, 4, 5, 6, 7, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 1, 8, 9, 10, 31, 12
-};
-
-/* --------------------------------------------------------------------- */
-/*  Instrucion forms                                                     */
-/* --------------------------------------------------------------------- */
-#define D(d)		(reg_map[d] << 21)
-#define S(s)		(reg_map[s] << 21)
-#define A(a)		(reg_map[a] << 16)
-#define B(b)		(reg_map[b] << 11)
-#define C(c)		(reg_map[c] << 6)
-#define FD(fd)		((fd) << 21)
-#define FS(fs)		((fs) << 21)
-#define FA(fa)		((fa) << 16)
-#define FB(fb)		((fb) << 11)
-#define FC(fc)		((fc) << 6)
-#define IMM(imm)	((imm) & 0xffff)
-#define CRD(d)		((d) << 21)
-
-/* Instruction bit sections.
-   OE and Rc flag (see ALT_SET_FLAGS). */
-#define OERC(flags)	(((flags & ALT_SET_FLAGS) >> 10) | (flags & ALT_SET_FLAGS))
-/* Rc flag (see ALT_SET_FLAGS). */
-#define RC(flags)	((flags & ALT_SET_FLAGS) >> 10)
-#define HI(opcode)	((opcode) << 26)
-#define LO(opcode)	((opcode) << 1)
-
-#define ADD		(HI(31) | LO(266))
-#define ADDC		(HI(31) | LO(10))
-#define ADDE		(HI(31) | LO(138))
-#define ADDI		(HI(14))
-#define ADDIC		(HI(13))
-#define ADDIS		(HI(15))
-#define ADDME		(HI(31) | LO(234))
-#define AND		(HI(31) | LO(28))
-#define ANDI		(HI(28))
-#define ANDIS		(HI(29))
-#define Bx		(HI(18))
-#define BCx		(HI(16))
-#define BCCTR		(HI(19) | LO(528) | (3 << 11))
-#define BLR		(HI(19) | LO(16) | (0x14 << 21))
-#define CNTLZD		(HI(31) | LO(58))
-#define CNTLZW		(HI(31) | LO(26))
-#define CMP		(HI(31) | LO(0))
-#define CMPI		(HI(11))
-#define CMPL		(HI(31) | LO(32))
-#define CMPLI		(HI(10))
-#define CROR		(HI(19) | LO(449))
-#define DIVD		(HI(31) | LO(489))
-#define DIVDU		(HI(31) | LO(457))
-#define DIVW		(HI(31) | LO(491))
-#define DIVWU		(HI(31) | LO(459))
-#define EXTSB		(HI(31) | LO(954))
-#define EXTSH		(HI(31) | LO(922))
-#define EXTSW		(HI(31) | LO(986))
-#define FABS		(HI(63) | LO(264))
-#define FADD		(HI(63) | LO(21))
-#define FADDS		(HI(59) | LO(21))
-#define FCFID		(HI(63) | LO(846))
-#define FCMPU		(HI(63) | LO(0))
-#define FCTIDZ		(HI(63) | LO(815))
-#define FCTIWZ		(HI(63) | LO(15))
-#define FDIV		(HI(63) | LO(18))
-#define FDIVS		(HI(59) | LO(18))
-#define FMR		(HI(63) | LO(72))
-#define FMUL		(HI(63) | LO(25))
-#define FMULS		(HI(59) | LO(25))
-#define FNEG		(HI(63) | LO(40))
-#define FRSP		(HI(63) | LO(12))
-#define FSUB		(HI(63) | LO(20))
-#define FSUBS		(HI(59) | LO(20))
-#define LD		(HI(58) | 0)
-#define LWZ		(HI(32))
-#define MFCR		(HI(31) | LO(19))
-#define MFLR		(HI(31) | LO(339) | 0x80000)
-#define MFXER		(HI(31) | LO(339) | 0x10000)
-#define MTCTR		(HI(31) | LO(467) | 0x90000)
-#define MTLR		(HI(31) | LO(467) | 0x80000)
-#define MTXER		(HI(31) | LO(467) | 0x10000)
-#define MULHD		(HI(31) | LO(73))
-#define MULHDU		(HI(31) | LO(9))
-#define MULHW		(HI(31) | LO(75))
-#define MULHWU		(HI(31) | LO(11))
-#define MULLD		(HI(31) | LO(233))
-#define MULLI		(HI(7))
-#define MULLW		(HI(31) | LO(235))
-#define NEG		(HI(31) | LO(104))
-#define NOP		(HI(24))
-#define NOR		(HI(31) | LO(124))
-#define OR		(HI(31) | LO(444))
-#define ORI		(HI(24))
-#define ORIS		(HI(25))
-#define RLDICL		(HI(30))
-#define RLWINM		(HI(21))
-#define SLD		(HI(31) | LO(27))
-#define SLW		(HI(31) | LO(24))
-#define SRAD		(HI(31) | LO(794))
-#define SRADI		(HI(31) | LO(413 << 1))
-#define SRAW		(HI(31) | LO(792))
-#define SRAWI		(HI(31) | LO(824))
-#define SRD		(HI(31) | LO(539))
-#define SRW		(HI(31) | LO(536))
-#define STD		(HI(62) | 0)
-#define STDU		(HI(62) | 1)
-#define STDUX		(HI(31) | LO(181))
-#define STFIWX		(HI(31) | LO(983))
-#define STW		(HI(36))
-#define STWU		(HI(37))
-#define STWUX		(HI(31) | LO(183))
-#define SUBF		(HI(31) | LO(40))
-#define SUBFC		(HI(31) | LO(8))
-#define SUBFE		(HI(31) | LO(136))
-#define SUBFIC		(HI(8))
-#define XOR		(HI(31) | LO(316))
-#define XORI		(HI(26))
-#define XORIS		(HI(27))
-
-#define SIMM_MAX	(0x7fff)
-#define SIMM_MIN	(-0x8000)
-#define UIMM_MAX	(0xffff)
-
-#if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_function_context(void** func_ptr, struct sljit_function_context* context, sljit_sw addr, void* func)
-{
-	sljit_sw* ptrs;
-	if (func_ptr)
-		*func_ptr = (void*)context;
-	ptrs = (sljit_sw*)func;
-	context->addr = addr ? addr : ptrs[0];
-	context->r2 = ptrs[1];
-	context->r11 = ptrs[2];
-}
-#endif
-
-static sljit_si push_inst(struct sljit_compiler *compiler, sljit_ins ins)
-{
-	sljit_ins *ptr = (sljit_ins*)ensure_buf(compiler, sizeof(sljit_ins));
-	FAIL_IF(!ptr);
-	*ptr = ins;
-	compiler->size++;
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code)
-{
-	sljit_sw diff;
-	sljit_uw target_addr;
-	sljit_sw extra_jump_flags;
-
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL) && (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	if (jump->flags & (SLJIT_REWRITABLE_JUMP | IS_CALL))
-		return 0;
-#else
-	if (jump->flags & SLJIT_REWRITABLE_JUMP)
-		return 0;
-#endif
-
-	if (jump->flags & JUMP_ADDR)
-		target_addr = jump->u.target;
-	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		target_addr = (sljit_uw)(code + jump->u.label->size);
-	}
-
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL) && (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	if (jump->flags & IS_CALL)
-		goto keep_address;
-#endif
-
-	diff = ((sljit_sw)target_addr - (sljit_sw)(code_ptr)) & ~0x3l;
-
-	extra_jump_flags = 0;
-	if (jump->flags & IS_COND) {
-		if (diff <= 0x7fff && diff >= -0x8000) {
-			jump->flags |= PATCH_B;
-			return 1;
-		}
-		if (target_addr <= 0xffff) {
-			jump->flags |= PATCH_B | PATCH_ABS_B;
-			return 1;
-		}
-		extra_jump_flags = REMOVE_COND;
-
-		diff -= sizeof(sljit_ins);
-	}
-
-	if (diff <= 0x01ffffff && diff >= -0x02000000) {
-		jump->flags |= PATCH_B | extra_jump_flags;
-		return 1;
-	}
-	if (target_addr <= 0x03ffffff) {
-		jump->flags |= PATCH_B | PATCH_ABS_B | extra_jump_flags;
-		return 1;
-	}
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-keep_address:
-#endif
-	if (target_addr <= 0x7fffffff) {
-		jump->flags |= PATCH_ABS32;
-		return 1;
-	}
-	if (target_addr <= 0x7fffffffffffl) {
-		jump->flags |= PATCH_ABS48;
-		return 1;
-	}
-#endif
-
-	return 0;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
-{
-	struct sljit_memory_fragment *buf;
-	sljit_ins *code;
-	sljit_ins *code_ptr;
-	sljit_ins *buf_ptr;
-	sljit_ins *buf_end;
-	sljit_uw word_count;
-	sljit_uw addr;
-
-	struct sljit_label *label;
-	struct sljit_jump *jump;
-	struct sljit_const *const_;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
-
-#if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	compiler->size += (compiler->size & 0x1) + (sizeof(struct sljit_function_context) / sizeof(sljit_ins));
-#else
-	compiler->size += (sizeof(struct sljit_function_context) / sizeof(sljit_ins));
-#endif
-#endif
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins));
-	PTR_FAIL_WITH_EXEC_IF(code);
-	buf = compiler->buf;
-
-	code_ptr = code;
-	word_count = 0;
-	label = compiler->labels;
-	jump = compiler->jumps;
-	const_ = compiler->consts;
-	do {
-		buf_ptr = (sljit_ins*)buf->memory;
-		buf_end = buf_ptr + (buf->used_size >> 2);
-		do {
-			*code_ptr = *buf_ptr++;
-			SLJIT_ASSERT(!label || label->size >= word_count);
-			SLJIT_ASSERT(!jump || jump->addr >= word_count);
-			SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-			/* These structures are ordered by their address. */
-			if (label && label->size == word_count) {
-				/* Just recording the address. */
-				label->addr = (sljit_uw)code_ptr;
-				label->size = code_ptr - code;
-				label = label->next;
-			}
-			if (jump && jump->addr == word_count) {
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-				jump->addr = (sljit_uw)(code_ptr - 3);
-#else
-				jump->addr = (sljit_uw)(code_ptr - 6);
-#endif
-				if (detect_jump_type(jump, code_ptr, code)) {
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-					code_ptr[-3] = code_ptr[0];
-					code_ptr -= 3;
-#else
-					if (jump->flags & PATCH_ABS32) {
-						code_ptr -= 3;
-						code_ptr[-1] = code_ptr[2];
-						code_ptr[0] = code_ptr[3];
-					}
-					else if (jump->flags & PATCH_ABS48) {
-						code_ptr--;
-						code_ptr[-1] = code_ptr[0];
-						code_ptr[0] = code_ptr[1];
-						/* rldicr rX,rX,32,31 -> rX,rX,16,47 */
-						SLJIT_ASSERT((code_ptr[-3] & 0xfc00ffff) == 0x780007c6);
-						code_ptr[-3] ^= 0x8422;
-						/* oris -> ori */
-						code_ptr[-2] ^= 0x4000000;
-					}
-					else {
-						code_ptr[-6] = code_ptr[0];
-						code_ptr -= 6;
-					}
-#endif
-					if (jump->flags & REMOVE_COND) {
-						code_ptr[0] = BCx | (2 << 2) | ((code_ptr[0] ^ (8 << 21)) & 0x03ff0001);
-						code_ptr++;
-						jump->addr += sizeof(sljit_ins);
-						code_ptr[0] = Bx;
-						jump->flags -= IS_COND;
-					}
-				}
-				jump = jump->next;
-			}
-			if (const_ && const_->addr == word_count) {
-				const_->addr = (sljit_uw)code_ptr;
-				const_ = const_->next;
-			}
-			code_ptr ++;
-			word_count ++;
-		} while (buf_ptr < buf_end);
-
-		buf = buf->next;
-	} while (buf);
-
-	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)code_ptr;
-		label->size = code_ptr - code;
-		label = label->next;
-	}
-
-	SLJIT_ASSERT(!label);
-	SLJIT_ASSERT(!jump);
-	SLJIT_ASSERT(!const_);
-#if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size - (sizeof(struct sljit_function_context) / sizeof(sljit_ins)));
-#else
-	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size);
-#endif
-
-	jump = compiler->jumps;
-	while (jump) {
-		do {
-			addr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
-			buf_ptr = (sljit_ins*)jump->addr;
-			if (jump->flags & PATCH_B) {
-				if (jump->flags & IS_COND) {
-					if (!(jump->flags & PATCH_ABS_B)) {
-						addr = addr - jump->addr;
-						SLJIT_ASSERT((sljit_sw)addr <= 0x7fff && (sljit_sw)addr >= -0x8000);
-						*buf_ptr = BCx | (addr & 0xfffc) | ((*buf_ptr) & 0x03ff0001);
-					}
-					else {
-						SLJIT_ASSERT(addr <= 0xffff);
-						*buf_ptr = BCx | (addr & 0xfffc) | 0x2 | ((*buf_ptr) & 0x03ff0001);
-					}
-				}
-				else {
-					if (!(jump->flags & PATCH_ABS_B)) {
-						addr = addr - jump->addr;
-						SLJIT_ASSERT((sljit_sw)addr <= 0x01ffffff && (sljit_sw)addr >= -0x02000000);
-						*buf_ptr = Bx | (addr & 0x03fffffc) | ((*buf_ptr) & 0x1);
-					}
-					else {
-						SLJIT_ASSERT(addr <= 0x03ffffff);
-						*buf_ptr = Bx | (addr & 0x03fffffc) | 0x2 | ((*buf_ptr) & 0x1);
-					}
-				}
-				break;
-			}
-			/* Set the fields of immediate loads. */
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-			buf_ptr[0] = (buf_ptr[0] & 0xffff0000) | ((addr >> 16) & 0xffff);
-			buf_ptr[1] = (buf_ptr[1] & 0xffff0000) | (addr & 0xffff);
-#else
-			if (jump->flags & PATCH_ABS32) {
-				SLJIT_ASSERT(addr <= 0x7fffffff);
-				buf_ptr[0] = (buf_ptr[0] & 0xffff0000) | ((addr >> 16) & 0xffff);
-				buf_ptr[1] = (buf_ptr[1] & 0xffff0000) | (addr & 0xffff);
-				break;
-			}
-			if (jump->flags & PATCH_ABS48) {
-				SLJIT_ASSERT(addr <= 0x7fffffffffff);
-				buf_ptr[0] = (buf_ptr[0] & 0xffff0000) | ((addr >> 32) & 0xffff);
-				buf_ptr[1] = (buf_ptr[1] & 0xffff0000) | ((addr >> 16) & 0xffff);
-				buf_ptr[3] = (buf_ptr[3] & 0xffff0000) | (addr & 0xffff);
-				break;
-			}
-			buf_ptr[0] = (buf_ptr[0] & 0xffff0000) | ((addr >> 48) & 0xffff);
-			buf_ptr[1] = (buf_ptr[1] & 0xffff0000) | ((addr >> 32) & 0xffff);
-			buf_ptr[3] = (buf_ptr[3] & 0xffff0000) | ((addr >> 16) & 0xffff);
-			buf_ptr[4] = (buf_ptr[4] & 0xffff0000) | (addr & 0xffff);
-#endif
-		} while (0);
-		jump = jump->next;
-	}
-
-	compiler->error = SLJIT_ERR_COMPILED;
-	compiler->executable_size = (code_ptr - code) * sizeof(sljit_ins);
-	SLJIT_CACHE_FLUSH(code, code_ptr);
-
-#if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	if (((sljit_sw)code_ptr) & 0x4)
-		code_ptr++;
-	sljit_set_function_context(NULL, (struct sljit_function_context*)code_ptr, (sljit_sw)code, (void*)sljit_generate_code);
-	return code_ptr;
-#else
-	sljit_set_function_context(NULL, (struct sljit_function_context*)code_ptr, (sljit_sw)code, (void*)sljit_generate_code);
-	return code_ptr;
-#endif
-#else
-	return code;
-#endif
-}
-
-/* --------------------------------------------------------------------- */
-/*  Entry, exit                                                          */
-/* --------------------------------------------------------------------- */
-
-/* inp_flags: */
-
-/* Creates an index in data_transfer_insts array. */
-#define LOAD_DATA	0x01
-#define INDEXED		0x02
-#define WRITE_BACK	0x04
-#define WORD_DATA	0x00
-#define BYTE_DATA	0x08
-#define HALF_DATA	0x10
-#define INT_DATA	0x18
-#define SIGNED_DATA	0x20
-/* Separates integer and floating point registers */
-#define GPR_REG		0x3f
-#define DOUBLE_DATA	0x40
-
-#define MEM_MASK	0x7f
-
-/* Other inp_flags. */
-
-#define ARG_TEST	0x000100
-/* Integer opertion and set flags -> requires exts on 64 bit systems. */
-#define ALT_SIGN_EXT	0x000200
-/* This flag affects the RC() and OERC() macros. */
-#define ALT_SET_FLAGS	0x000400
-#define ALT_KEEP_CACHE	0x000800
-#define ALT_FORM1	0x010000
-#define ALT_FORM2	0x020000
-#define ALT_FORM3	0x040000
-#define ALT_FORM4	0x080000
-#define ALT_FORM5	0x100000
-#define ALT_FORM6	0x200000
-
-/* Source and destination is register. */
-#define REG_DEST	0x000001
-#define REG1_SOURCE	0x000002
-#define REG2_SOURCE	0x000004
-/* getput_arg_fast returned true. */
-#define FAST_DEST	0x000008
-/* Multiple instructions are required. */
-#define SLOW_DEST	0x000010
-/*
-ALT_SIGN_EXT		0x000200
-ALT_SET_FLAGS		0x000400
-ALT_FORM1		0x010000
-...
-ALT_FORM6		0x200000 */
-
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-#include "sljitNativePPC_32.c"
-#else
-#include "sljitNativePPC_64.c"
-#endif
-
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-#define STACK_STORE	STW
-#define STACK_LOAD	LWZ
-#else
-#define STACK_STORE	STD
-#define STACK_LOAD	LD
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	sljit_si i, tmp, offs;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	FAIL_IF(push_inst(compiler, MFLR | D(0)));
-	offs = -(sljit_si)(sizeof(sljit_sw));
-	FAIL_IF(push_inst(compiler, STACK_STORE | S(TMP_ZERO) | A(SLJIT_SP) | IMM(offs)));
-
-	tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG;
-	for (i = SLJIT_S0; i >= tmp; i--) {
-		offs -= (sljit_si)(sizeof(sljit_sw));
-		FAIL_IF(push_inst(compiler, STACK_STORE | S(i) | A(SLJIT_SP) | IMM(offs)));
-	}
-
-	for (i = scratches; i >= SLJIT_FIRST_SAVED_REG; i--) {
-		offs -= (sljit_si)(sizeof(sljit_sw));
-		FAIL_IF(push_inst(compiler, STACK_STORE | S(i) | A(SLJIT_SP) | IMM(offs)));
-	}
-
-	SLJIT_ASSERT(offs == -(sljit_si)GET_SAVED_REGISTERS_SIZE(compiler->scratches, compiler->saveds, 1));
-
-#if (defined SLJIT_PPC_STACK_FRAME_V2 && SLJIT_PPC_STACK_FRAME_V2)
-	FAIL_IF(push_inst(compiler, STACK_STORE | S(0) | A(SLJIT_SP) | IMM(2 * sizeof(sljit_sw))));
-#else
-	FAIL_IF(push_inst(compiler, STACK_STORE | S(0) | A(SLJIT_SP) | IMM(sizeof(sljit_sw))));
-#endif
-
-	FAIL_IF(push_inst(compiler, ADDI | D(TMP_ZERO) | A(0) | 0));
-	if (args >= 1)
-		FAIL_IF(push_inst(compiler, OR | S(SLJIT_R0) | A(SLJIT_S0) | B(SLJIT_R0)));
-	if (args >= 2)
-		FAIL_IF(push_inst(compiler, OR | S(SLJIT_R1) | A(SLJIT_S1) | B(SLJIT_R1)));
-	if (args >= 3)
-		FAIL_IF(push_inst(compiler, OR | S(SLJIT_R2) | A(SLJIT_S2) | B(SLJIT_R2)));
-
-	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1) + SLJIT_LOCALS_OFFSET;
-	local_size = (local_size + 15) & ~0xf;
-	compiler->local_size = local_size;
-
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	if (local_size <= SIMM_MAX)
-		FAIL_IF(push_inst(compiler, STWU | S(SLJIT_SP) | A(SLJIT_SP) | IMM(-local_size)));
-	else {
-		FAIL_IF(load_immediate(compiler, 0, -local_size));
-		FAIL_IF(push_inst(compiler, STWUX | S(SLJIT_SP) | A(SLJIT_SP) | B(0)));
-	}
-#else
-	if (local_size <= SIMM_MAX)
-		FAIL_IF(push_inst(compiler, STDU | S(SLJIT_SP) | A(SLJIT_SP) | IMM(-local_size)));
-	else {
-		FAIL_IF(load_immediate(compiler, 0, -local_size));
-		FAIL_IF(push_inst(compiler, STDUX | S(SLJIT_SP) | A(SLJIT_SP) | B(0)));
-	}
-#endif
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1) + SLJIT_LOCALS_OFFSET;
-	compiler->local_size = (local_size + 15) & ~0xf;
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-	sljit_si i, tmp, offs;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_return(compiler, op, src, srcw));
-
-	FAIL_IF(emit_mov_before_return(compiler, op, src, srcw));
-
-	if (compiler->local_size <= SIMM_MAX)
-		FAIL_IF(push_inst(compiler, ADDI | D(SLJIT_SP) | A(SLJIT_SP) | IMM(compiler->local_size)));
-	else {
-		FAIL_IF(load_immediate(compiler, 0, compiler->local_size));
-		FAIL_IF(push_inst(compiler, ADD | D(SLJIT_SP) | A(SLJIT_SP) | B(0)));
-	}
-
-#if (defined SLJIT_PPC_STACK_FRAME_V2 && SLJIT_PPC_STACK_FRAME_V2)
-	FAIL_IF(push_inst(compiler, STACK_LOAD | D(0) | A(SLJIT_SP) | IMM(2 * sizeof(sljit_sw))));
-#else
-	FAIL_IF(push_inst(compiler, STACK_LOAD | D(0) | A(SLJIT_SP) | IMM(sizeof(sljit_sw))));
-#endif
-
-	offs = -(sljit_si)GET_SAVED_REGISTERS_SIZE(compiler->scratches, compiler->saveds, 1);
-
-	tmp = compiler->scratches;
-	for (i = SLJIT_FIRST_SAVED_REG; i <= tmp; i++) {
-		FAIL_IF(push_inst(compiler, STACK_LOAD | D(i) | A(SLJIT_SP) | IMM(offs)));
-		offs += (sljit_si)(sizeof(sljit_sw));
-	}
-
-	tmp = compiler->saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - compiler->saveds) : SLJIT_FIRST_SAVED_REG;
-	for (i = tmp; i <= SLJIT_S0; i++) {
-		FAIL_IF(push_inst(compiler, STACK_LOAD | D(i) | A(SLJIT_SP) | IMM(offs)));
-		offs += (sljit_si)(sizeof(sljit_sw));
-	}
-
-	FAIL_IF(push_inst(compiler, STACK_LOAD | D(TMP_ZERO) | A(SLJIT_SP) | IMM(offs)));
-	SLJIT_ASSERT(offs == -(sljit_sw)(sizeof(sljit_sw)));
-
-	FAIL_IF(push_inst(compiler, MTLR | S(0)));
-	FAIL_IF(push_inst(compiler, BLR));
-
-	return SLJIT_SUCCESS;
-}
-
-#undef STACK_STORE
-#undef STACK_LOAD
-
-/* --------------------------------------------------------------------- */
-/*  Operators                                                            */
-/* --------------------------------------------------------------------- */
-
-/* i/x - immediate/indexed form
-   n/w - no write-back / write-back (1 bit)
-   s/l - store/load (1 bit)
-   u/s - signed/unsigned (1 bit)
-   w/b/h/i - word/byte/half/int allowed (2 bit)
-   It contans 32 items, but not all are different. */
-
-/* 64 bit only: [reg+imm] must be aligned to 4 bytes. */
-#define INT_ALIGNED	0x10000
-/* 64-bit only: there is no lwau instruction. */
-#define UPDATE_REQ	0x20000
-
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-#define ARCH_32_64(a, b)	a
-#define INST_CODE_AND_DST(inst, flags, reg) \
-	((inst) | (((flags) & MEM_MASK) <= GPR_REG ? D(reg) : FD(reg)))
-#else
-#define ARCH_32_64(a, b)	b
-#define INST_CODE_AND_DST(inst, flags, reg) \
-	(((inst) & ~(INT_ALIGNED | UPDATE_REQ)) | (((flags) & MEM_MASK) <= GPR_REG ? D(reg) : FD(reg)))
-#endif
-
-static SLJIT_CONST sljit_ins data_transfer_insts[64 + 8] = {
-
-/* -------- Unsigned -------- */
-
-/* Word. */
-
-/* u w n i s */ ARCH_32_64(HI(36) /* stw */, HI(62) | INT_ALIGNED | 0x0 /* std */),
-/* u w n i l */ ARCH_32_64(HI(32) /* lwz */, HI(58) | INT_ALIGNED | 0x0 /* ld */),
-/* u w n x s */ ARCH_32_64(HI(31) | LO(151) /* stwx */, HI(31) | LO(149) /* stdx */),
-/* u w n x l */ ARCH_32_64(HI(31) | LO(23) /* lwzx */, HI(31) | LO(21) /* ldx */),
-
-/* u w w i s */ ARCH_32_64(HI(37) /* stwu */, HI(62) | INT_ALIGNED | 0x1 /* stdu */),
-/* u w w i l */ ARCH_32_64(HI(33) /* lwzu */, HI(58) | INT_ALIGNED | 0x1 /* ldu */),
-/* u w w x s */ ARCH_32_64(HI(31) | LO(183) /* stwux */, HI(31) | LO(181) /* stdux */),
-/* u w w x l */ ARCH_32_64(HI(31) | LO(55) /* lwzux */, HI(31) | LO(53) /* ldux */),
-
-/* Byte. */
-
-/* u b n i s */ HI(38) /* stb */, 
-/* u b n i l */ HI(34) /* lbz */,
-/* u b n x s */ HI(31) | LO(215) /* stbx */,
-/* u b n x l */ HI(31) | LO(87) /* lbzx */,
-
-/* u b w i s */ HI(39) /* stbu */,
-/* u b w i l */ HI(35) /* lbzu */,
-/* u b w x s */ HI(31) | LO(247) /* stbux */,
-/* u b w x l */ HI(31) | LO(119) /* lbzux */,
-
-/* Half. */
-
-/* u h n i s */ HI(44) /* sth */,
-/* u h n i l */ HI(40) /* lhz */,
-/* u h n x s */ HI(31) | LO(407) /* sthx */,
-/* u h n x l */ HI(31) | LO(279) /* lhzx */,
-
-/* u h w i s */ HI(45) /* sthu */,
-/* u h w i l */ HI(41) /* lhzu */,
-/* u h w x s */ HI(31) | LO(439) /* sthux */,
-/* u h w x l */ HI(31) | LO(311) /* lhzux */,
-
-/* Int. */
-
-/* u i n i s */ HI(36) /* stw */,
-/* u i n i l */ HI(32) /* lwz */,
-/* u i n x s */ HI(31) | LO(151) /* stwx */,
-/* u i n x l */ HI(31) | LO(23) /* lwzx */,
-
-/* u i w i s */ HI(37) /* stwu */,
-/* u i w i l */ HI(33) /* lwzu */,
-/* u i w x s */ HI(31) | LO(183) /* stwux */,
-/* u i w x l */ HI(31) | LO(55) /* lwzux */,
-
-/* -------- Signed -------- */
-
-/* Word. */
-
-/* s w n i s */ ARCH_32_64(HI(36) /* stw */, HI(62) | INT_ALIGNED | 0x0 /* std */),
-/* s w n i l */ ARCH_32_64(HI(32) /* lwz */, HI(58) | INT_ALIGNED | 0x0 /* ld */),
-/* s w n x s */ ARCH_32_64(HI(31) | LO(151) /* stwx */, HI(31) | LO(149) /* stdx */),
-/* s w n x l */ ARCH_32_64(HI(31) | LO(23) /* lwzx */, HI(31) | LO(21) /* ldx */),
-
-/* s w w i s */ ARCH_32_64(HI(37) /* stwu */, HI(62) | INT_ALIGNED | 0x1 /* stdu */),
-/* s w w i l */ ARCH_32_64(HI(33) /* lwzu */, HI(58) | INT_ALIGNED | 0x1 /* ldu */),
-/* s w w x s */ ARCH_32_64(HI(31) | LO(183) /* stwux */, HI(31) | LO(181) /* stdux */),
-/* s w w x l */ ARCH_32_64(HI(31) | LO(55) /* lwzux */, HI(31) | LO(53) /* ldux */),
-
-/* Byte. */
-
-/* s b n i s */ HI(38) /* stb */,
-/* s b n i l */ HI(34) /* lbz */ /* EXTS_REQ */,
-/* s b n x s */ HI(31) | LO(215) /* stbx */,
-/* s b n x l */ HI(31) | LO(87) /* lbzx */ /* EXTS_REQ */,
-
-/* s b w i s */ HI(39) /* stbu */,
-/* s b w i l */ HI(35) /* lbzu */ /* EXTS_REQ */,
-/* s b w x s */ HI(31) | LO(247) /* stbux */,
-/* s b w x l */ HI(31) | LO(119) /* lbzux */ /* EXTS_REQ */,
-
-/* Half. */
-
-/* s h n i s */ HI(44) /* sth */,
-/* s h n i l */ HI(42) /* lha */,
-/* s h n x s */ HI(31) | LO(407) /* sthx */,
-/* s h n x l */ HI(31) | LO(343) /* lhax */,
-
-/* s h w i s */ HI(45) /* sthu */,
-/* s h w i l */ HI(43) /* lhau */,
-/* s h w x s */ HI(31) | LO(439) /* sthux */,
-/* s h w x l */ HI(31) | LO(375) /* lhaux */,
-
-/* Int. */
-
-/* s i n i s */ HI(36) /* stw */,
-/* s i n i l */ ARCH_32_64(HI(32) /* lwz */, HI(58) | INT_ALIGNED | 0x2 /* lwa */),
-/* s i n x s */ HI(31) | LO(151) /* stwx */,
-/* s i n x l */ ARCH_32_64(HI(31) | LO(23) /* lwzx */, HI(31) | LO(341) /* lwax */),
-
-/* s i w i s */ HI(37) /* stwu */,
-/* s i w i l */ ARCH_32_64(HI(33) /* lwzu */, HI(58) | INT_ALIGNED | UPDATE_REQ | 0x2 /* lwa */),
-/* s i w x s */ HI(31) | LO(183) /* stwux */,
-/* s i w x l */ ARCH_32_64(HI(31) | LO(55) /* lwzux */, HI(31) | LO(373) /* lwaux */),
-
-/* -------- Double -------- */
-
-/* d   n i s */ HI(54) /* stfd */,
-/* d   n i l */ HI(50) /* lfd */,
-/* d   n x s */ HI(31) | LO(727) /* stfdx */,
-/* d   n x l */ HI(31) | LO(599) /* lfdx */,
-
-/* s   n i s */ HI(52) /* stfs */,
-/* s   n i l */ HI(48) /* lfs */,
-/* s   n x s */ HI(31) | LO(663) /* stfsx */,
-/* s   n x l */ HI(31) | LO(535) /* lfsx */,
-
-};
-
-#undef ARCH_32_64
-
-/* Simple cases, (no caching is required). */
-static sljit_si getput_arg_fast(struct sljit_compiler *compiler, sljit_si inp_flags, sljit_si reg, sljit_si arg, sljit_sw argw)
-{
-	sljit_ins inst;
-
-	/* Should work when (arg & REG_MASK) == 0. */
-	SLJIT_COMPILE_ASSERT(A(0) == 0, a0_must_be_0);
-	SLJIT_ASSERT(arg & SLJIT_MEM);
-
-	if (arg & OFFS_REG_MASK) {
-		if (argw & 0x3)
-			return 0;
-		if (inp_flags & ARG_TEST)
-			return 1;
-
-		inst = data_transfer_insts[(inp_flags | INDEXED) & MEM_MASK];
-		SLJIT_ASSERT(!(inst & (INT_ALIGNED | UPDATE_REQ)));
-		FAIL_IF(push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(arg & REG_MASK) | B(OFFS_REG(arg))));
-		return -1;
-	}
-
-	if (SLJIT_UNLIKELY(!(arg & REG_MASK)))
-		inp_flags &= ~WRITE_BACK;
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	inst = data_transfer_insts[inp_flags & MEM_MASK];
-	SLJIT_ASSERT((arg & REG_MASK) || !(inst & UPDATE_REQ));
-
-	if (argw > SIMM_MAX || argw < SIMM_MIN || ((inst & INT_ALIGNED) && (argw & 0x3)) || (inst & UPDATE_REQ))
-		return 0;
-	if (inp_flags & ARG_TEST)
-		return 1;
-#endif
-
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	if (argw > SIMM_MAX || argw < SIMM_MIN)
-		return 0;
-	if (inp_flags & ARG_TEST)
-		return 1;
-
-	inst = data_transfer_insts[inp_flags & MEM_MASK];
-	SLJIT_ASSERT(!(inst & (INT_ALIGNED | UPDATE_REQ)));
-#endif
-
-	FAIL_IF(push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(arg & REG_MASK) | IMM(argw)));
-	return -1;
-}
-
-/* See getput_arg below.
-   Note: can_cache is called only for binary operators. Those operator always
-   uses word arguments without write back. */
-static sljit_si can_cache(sljit_si arg, sljit_sw argw, sljit_si next_arg, sljit_sw next_argw)
-{
-	sljit_sw high_short, next_high_short;
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	sljit_sw diff;
-#endif
-
-	SLJIT_ASSERT((arg & SLJIT_MEM) && (next_arg & SLJIT_MEM));
-
-	if (arg & OFFS_REG_MASK)
-		return ((arg & OFFS_REG_MASK) == (next_arg & OFFS_REG_MASK) && (argw & 0x3) == (next_argw & 0x3));
-
-	if (next_arg & OFFS_REG_MASK)
-		return 0;
-
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	high_short = (argw + ((argw & 0x8000) << 1)) & ~0xffff;
-	next_high_short = (next_argw + ((next_argw & 0x8000) << 1)) & ~0xffff;
-	return high_short == next_high_short;
-#else
-	if (argw <= 0x7fffffffl && argw >= -0x80000000l) {
-		high_short = (argw + ((argw & 0x8000) << 1)) & ~0xffff;
-		next_high_short = (next_argw + ((next_argw & 0x8000) << 1)) & ~0xffff;
-		if (high_short == next_high_short)
-			return 1;
-	}
-
-	diff = argw - next_argw;
-	if (!(arg & REG_MASK))
-		return diff <= SIMM_MAX && diff >= SIMM_MIN;
-
-	if (arg == next_arg && diff <= SIMM_MAX && diff >= SIMM_MIN)
-		return 1;
-
-	return 0;
-#endif
-}
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define ADJUST_CACHED_IMM(imm) \
-	if ((inst & INT_ALIGNED) && (imm & 0x3)) { \
-		/* Adjust cached value. Fortunately this is really a rare case */ \
-		compiler->cache_argw += imm & 0x3; \
-		FAIL_IF(push_inst(compiler, ADDI | D(TMP_REG3) | A(TMP_REG3) | (imm & 0x3))); \
-		imm &= ~0x3; \
-	}
-#endif
-
-/* Emit the necessary instructions. See can_cache above. */
-static sljit_si getput_arg(struct sljit_compiler *compiler, sljit_si inp_flags, sljit_si reg, sljit_si arg, sljit_sw argw, sljit_si next_arg, sljit_sw next_argw)
-{
-	sljit_si tmp_r;
-	sljit_ins inst;
-	sljit_sw high_short, next_high_short;
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	sljit_sw diff;
-#endif
-
-	SLJIT_ASSERT(arg & SLJIT_MEM);
-
-	tmp_r = ((inp_flags & LOAD_DATA) && ((inp_flags) & MEM_MASK) <= GPR_REG) ? reg : TMP_REG1;
-	/* Special case for "mov reg, [reg, ... ]". */
-	if ((arg & REG_MASK) == tmp_r)
-		tmp_r = TMP_REG1;
-
-	if (SLJIT_UNLIKELY(arg & OFFS_REG_MASK)) {
-		argw &= 0x3;
-		/* Otherwise getput_arg_fast would capture it. */
-		SLJIT_ASSERT(argw);
-
-		if ((SLJIT_MEM | (arg & OFFS_REG_MASK)) == compiler->cache_arg && argw == compiler->cache_argw)
-			tmp_r = TMP_REG3;
-		else {
-			if ((arg & OFFS_REG_MASK) == (next_arg & OFFS_REG_MASK) && argw == (next_argw & 0x3)) {
-				compiler->cache_arg = SLJIT_MEM | (arg & OFFS_REG_MASK);
-				compiler->cache_argw = argw;
-				tmp_r = TMP_REG3;
-			}
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-			FAIL_IF(push_inst(compiler, RLWINM | S(OFFS_REG(arg)) | A(tmp_r) | (argw << 11) | ((31 - argw) << 1)));
-#else
-			FAIL_IF(push_inst(compiler, RLDI(tmp_r, OFFS_REG(arg), argw, 63 - argw, 1)));
-#endif
-		}
-		inst = data_transfer_insts[(inp_flags | INDEXED) & MEM_MASK];
-		SLJIT_ASSERT(!(inst & (INT_ALIGNED | UPDATE_REQ)));
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(arg & REG_MASK) | B(tmp_r));
-	}
-
-	if (SLJIT_UNLIKELY(!(arg & REG_MASK)))
-		inp_flags &= ~WRITE_BACK;
-
-	inst = data_transfer_insts[inp_flags & MEM_MASK];
-	SLJIT_ASSERT((arg & REG_MASK) || !(inst & UPDATE_REQ));
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	if (argw <= 0x7fff7fffl && argw >= -0x80000000l
-			&& (!(inst & INT_ALIGNED) || !(argw & 0x3)) && !(inst & UPDATE_REQ)) {
-#endif
-
-		arg &= REG_MASK;
-		high_short = (sljit_si)(argw + ((argw & 0x8000) << 1)) & ~0xffff;
-		/* The getput_arg_fast should handle this otherwise. */
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		SLJIT_ASSERT(high_short && high_short <= 0x7fffffffl && high_short >= -0x80000000l);
-#else
-		SLJIT_ASSERT(high_short && !(inst & (INT_ALIGNED | UPDATE_REQ)));
-#endif
-
-		if (inp_flags & WRITE_BACK) {
-			if (arg == reg) {
-				FAIL_IF(push_inst(compiler, OR | S(reg) | A(tmp_r) | B(reg)));
-				reg = tmp_r;
-			}
-			tmp_r = arg;
-			FAIL_IF(push_inst(compiler, ADDIS | D(arg) | A(arg) | IMM(high_short >> 16)));
-		}
-		else if (compiler->cache_arg != (SLJIT_MEM | arg) || high_short != compiler->cache_argw) {
-			if ((next_arg & SLJIT_MEM) && !(next_arg & OFFS_REG_MASK)) {
-				next_high_short = (sljit_si)(next_argw + ((next_argw & 0x8000) << 1)) & ~0xffff;
-				if (high_short == next_high_short) {
-					compiler->cache_arg = SLJIT_MEM | arg;
-					compiler->cache_argw = high_short;
-					tmp_r = TMP_REG3;
-				}
-			}
-			FAIL_IF(push_inst(compiler, ADDIS | D(tmp_r) | A(arg & REG_MASK) | IMM(high_short >> 16)));
-		}
-		else
-			tmp_r = TMP_REG3;
-
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(tmp_r) | IMM(argw));
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	}
-
-	/* Everything else is PPC-64 only. */
-	if (SLJIT_UNLIKELY(!(arg & REG_MASK))) {
-		diff = argw - compiler->cache_argw;
-		if ((compiler->cache_arg & SLJIT_IMM) && diff <= SIMM_MAX && diff >= SIMM_MIN) {
-			ADJUST_CACHED_IMM(diff);
-			return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(TMP_REG3) | IMM(diff));
-		}
-
-		diff = argw - next_argw;
-		if ((next_arg & SLJIT_MEM) && diff <= SIMM_MAX && diff >= SIMM_MIN) {
-			SLJIT_ASSERT(inp_flags & LOAD_DATA);
-
-			compiler->cache_arg = SLJIT_IMM;
-			compiler->cache_argw = argw;
-			tmp_r = TMP_REG3;
-		}
-
-		FAIL_IF(load_immediate(compiler, tmp_r, argw));
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(tmp_r));
-	}
-
-	diff = argw - compiler->cache_argw;
-	if (compiler->cache_arg == arg && diff <= SIMM_MAX && diff >= SIMM_MIN) {
-		SLJIT_ASSERT(!(inp_flags & WRITE_BACK) && !(inst & UPDATE_REQ));
-		ADJUST_CACHED_IMM(diff);
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(TMP_REG3) | IMM(diff));
-	}
-
-	if ((compiler->cache_arg & SLJIT_IMM) && diff <= SIMM_MAX && diff >= SIMM_MIN) {
-		inst = data_transfer_insts[(inp_flags | INDEXED) & MEM_MASK];
-		SLJIT_ASSERT(!(inst & (INT_ALIGNED | UPDATE_REQ)));
-		if (compiler->cache_argw != argw) {
-			FAIL_IF(push_inst(compiler, ADDI | D(TMP_REG3) | A(TMP_REG3) | IMM(diff)));
-			compiler->cache_argw = argw;
-		}
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(arg & REG_MASK) | B(TMP_REG3));
-	}
-
-	if (argw == next_argw && (next_arg & SLJIT_MEM)) {
-		SLJIT_ASSERT(inp_flags & LOAD_DATA);
-		FAIL_IF(load_immediate(compiler, TMP_REG3, argw));
-
-		compiler->cache_arg = SLJIT_IMM;
-		compiler->cache_argw = argw;
-
-		inst = data_transfer_insts[(inp_flags | INDEXED) & MEM_MASK];
-		SLJIT_ASSERT(!(inst & (INT_ALIGNED | UPDATE_REQ)));
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(arg & REG_MASK) | B(TMP_REG3));
-	}
-
-	diff = argw - next_argw;
-	if (arg == next_arg && !(inp_flags & WRITE_BACK) && diff <= SIMM_MAX && diff >= SIMM_MIN) {
-		SLJIT_ASSERT(inp_flags & LOAD_DATA);
-		FAIL_IF(load_immediate(compiler, TMP_REG3, argw));
-		FAIL_IF(push_inst(compiler, ADD | D(TMP_REG3) | A(TMP_REG3) | B(arg & REG_MASK)));
-
-		compiler->cache_arg = arg;
-		compiler->cache_argw = argw;
-
-		return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(TMP_REG3));
-	}
-
-	if ((next_arg & SLJIT_MEM) && !(next_arg & OFFS_REG_MASK) && diff <= SIMM_MAX && diff >= SIMM_MIN) {
-		SLJIT_ASSERT(inp_flags & LOAD_DATA);
-		FAIL_IF(load_immediate(compiler, TMP_REG3, argw));
-
-		compiler->cache_arg = SLJIT_IMM;
-		compiler->cache_argw = argw;
-		tmp_r = TMP_REG3;
-	}
-	else
-		FAIL_IF(load_immediate(compiler, tmp_r, argw));
-
-	/* Get the indexed version instead of the normal one. */
-	inst = data_transfer_insts[(inp_flags | INDEXED) & MEM_MASK];
-	SLJIT_ASSERT(!(inst & (INT_ALIGNED | UPDATE_REQ)));
-	return push_inst(compiler, INST_CODE_AND_DST(inst, inp_flags, reg) | A(arg & REG_MASK) | B(tmp_r));
-#endif
-}
-
-static SLJIT_INLINE sljit_si emit_op_mem2(struct sljit_compiler *compiler, sljit_si flags, sljit_si reg, sljit_si arg1, sljit_sw arg1w, sljit_si arg2, sljit_sw arg2w)
-{
-	if (getput_arg_fast(compiler, flags, reg, arg1, arg1w))
-		return compiler->error;
-	return getput_arg(compiler, flags, reg, arg1, arg1w, arg2, arg2w);
-}
-
-static sljit_si emit_op(struct sljit_compiler *compiler, sljit_si op, sljit_si input_flags,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	/* arg1 goes to TMP_REG1 or src reg
-	   arg2 goes to TMP_REG2, imm or src reg
-	   TMP_REG3 can be used for caching
-	   result goes to TMP_REG2, so put result can use TMP_REG1 and TMP_REG3. */
-	sljit_si dst_r;
-	sljit_si src1_r;
-	sljit_si src2_r;
-	sljit_si sugg_src2_r = TMP_REG2;
-	sljit_si flags = input_flags & (ALT_FORM1 | ALT_FORM2 | ALT_FORM3 | ALT_FORM4 | ALT_FORM5 | ALT_FORM6 | ALT_SIGN_EXT | ALT_SET_FLAGS);
-
-	if (!(input_flags & ALT_KEEP_CACHE)) {
-		compiler->cache_arg = 0;
-		compiler->cache_argw = 0;
-	}
-
-	/* Destination check. */
-	if (SLJIT_UNLIKELY(dst == SLJIT_UNUSED)) {
-		if (op >= SLJIT_MOV && op <= SLJIT_MOVU_SI && !(src2 & SLJIT_MEM))
-			return SLJIT_SUCCESS;
-		dst_r = TMP_REG2;
-	}
-	else if (FAST_IS_REG(dst)) {
-		dst_r = dst;
-		flags |= REG_DEST;
-		if (op >= SLJIT_MOV && op <= SLJIT_MOVU_SI)
-			sugg_src2_r = dst_r;
-	}
-	else {
-		SLJIT_ASSERT(dst & SLJIT_MEM);
-		if (getput_arg_fast(compiler, input_flags | ARG_TEST, TMP_REG2, dst, dstw)) {
-			flags |= FAST_DEST;
-			dst_r = TMP_REG2;
-		}
-		else {
-			flags |= SLOW_DEST;
-			dst_r = 0;
-		}
-	}
-
-	/* Source 1. */
-	if (FAST_IS_REG(src1)) {
-		src1_r = src1;
-		flags |= REG1_SOURCE;
-	}
-	else if (src1 & SLJIT_IMM) {
-		FAIL_IF(load_immediate(compiler, TMP_REG1, src1w));
-		src1_r = TMP_REG1;
-	}
-	else if (getput_arg_fast(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w)) {
-		FAIL_IF(compiler->error);
-		src1_r = TMP_REG1;
-	}
-	else
-		src1_r = 0;
-
-	/* Source 2. */
-	if (FAST_IS_REG(src2)) {
-		src2_r = src2;
-		flags |= REG2_SOURCE;
-		if (!(flags & REG_DEST) && op >= SLJIT_MOV && op <= SLJIT_MOVU_SI)
-			dst_r = src2_r;
-	}
-	else if (src2 & SLJIT_IMM) {
-		FAIL_IF(load_immediate(compiler, sugg_src2_r, src2w));
-		src2_r = sugg_src2_r;
-	}
-	else if (getput_arg_fast(compiler, input_flags | LOAD_DATA, sugg_src2_r, src2, src2w)) {
-		FAIL_IF(compiler->error);
-		src2_r = sugg_src2_r;
-	}
-	else
-		src2_r = 0;
-
-	/* src1_r, src2_r and dst_r can be zero (=unprocessed).
-	   All arguments are complex addressing modes, and it is a binary operator. */
-	if (src1_r == 0 && src2_r == 0 && dst_r == 0) {
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
-			FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG2, src2, src2w, src1, src1w));
-			FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
-		}
-		else {
-			FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
-			FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG2, src2, src2w, dst, dstw));
-		}
-		src1_r = TMP_REG1;
-		src2_r = TMP_REG2;
-	}
-	else if (src1_r == 0 && src2_r == 0) {
-		FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
-		src1_r = TMP_REG1;
-	}
-	else if (src1_r == 0 && dst_r == 0) {
-		FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
-		src1_r = TMP_REG1;
-	}
-	else if (src2_r == 0 && dst_r == 0) {
-		FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, sugg_src2_r, src2, src2w, dst, dstw));
-		src2_r = sugg_src2_r;
-	}
-
-	if (dst_r == 0)
-		dst_r = TMP_REG2;
-
-	if (src1_r == 0) {
-		FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, 0, 0));
-		src1_r = TMP_REG1;
-	}
-
-	if (src2_r == 0) {
-		FAIL_IF(getput_arg(compiler, input_flags | LOAD_DATA, sugg_src2_r, src2, src2w, 0, 0));
-		src2_r = sugg_src2_r;
-	}
-
-	FAIL_IF(emit_single_op(compiler, op, flags, dst_r, src1_r, src2_r));
-
-	if (flags & (FAST_DEST | SLOW_DEST)) {
-		if (flags & FAST_DEST)
-			FAIL_IF(getput_arg_fast(compiler, input_flags, dst_r, dst, dstw));
-		else
-			FAIL_IF(getput_arg(compiler, input_flags, dst_r, dst, dstw, 0, 0));
-	}
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op)
-{
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	sljit_si int_op = op & SLJIT_INT_OP;
-#endif
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op0(compiler, op));
-
-	op = GET_OPCODE(op);
-	switch (op) {
-	case SLJIT_BREAKPOINT:
-	case SLJIT_NOP:
-		return push_inst(compiler, NOP);
-	case SLJIT_LUMUL:
-	case SLJIT_LSMUL:
-		FAIL_IF(push_inst(compiler, OR | S(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R0)));
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		FAIL_IF(push_inst(compiler, MULLD | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1)));
-		return push_inst(compiler, (op == SLJIT_LUMUL ? MULHDU : MULHD) | D(SLJIT_R1) | A(TMP_REG1) | B(SLJIT_R1));
-#else
-		FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1)));
-		return push_inst(compiler, (op == SLJIT_LUMUL ? MULHWU : MULHW) | D(SLJIT_R1) | A(TMP_REG1) | B(SLJIT_R1));
-#endif
-	case SLJIT_UDIVMOD:
-	case SLJIT_SDIVMOD:
-		FAIL_IF(push_inst(compiler, OR | S(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R0)));
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		FAIL_IF(push_inst(compiler, (int_op ? (op == SLJIT_UDIVMOD ? DIVWU : DIVW) : (op == SLJIT_UDIVMOD ? DIVDU : DIVD)) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1)));
-		FAIL_IF(push_inst(compiler, (int_op ? MULLW : MULLD) | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1)));
-#else
-		FAIL_IF(push_inst(compiler, (op == SLJIT_UDIVMOD ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1)));
-		FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1)));
-#endif
-		return push_inst(compiler, SUBF | D(SLJIT_R1) | A(SLJIT_R1) | B(TMP_REG1));
-	case SLJIT_UDIVI:
-	case SLJIT_SDIVI:
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		return push_inst(compiler, (int_op ? (op == SLJIT_UDIVI ? DIVWU : DIVW) : (op == SLJIT_UDIVI ? DIVDU : DIVD)) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1));
-#else
-		return push_inst(compiler, (op == SLJIT_UDIVI ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1));
-#endif
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-#define EMIT_MOV(type, type_flags, type_cast) \
-	emit_op(compiler, (src & SLJIT_IMM) ? SLJIT_MOV : type, flags | (type_flags), dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? type_cast srcw : srcw)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si flags = GET_FLAGS(op) ? ALT_SET_FLAGS : 0;
-	sljit_si op_flags = GET_ALL_FLAGS(op);
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op1(compiler, op, dst, dstw, src, srcw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	op = GET_OPCODE(op);
-	if ((src & SLJIT_IMM) && srcw == 0)
-		src = TMP_ZERO;
-
-	if (op_flags & SLJIT_SET_O)
-		FAIL_IF(push_inst(compiler, MTXER | S(TMP_ZERO)));
-
-	if (op_flags & SLJIT_INT_OP) {
-		if (op < SLJIT_NOT) {
-			if (FAST_IS_REG(src) && src == dst) {
-				if (!TYPE_CAST_NEEDED(op))
-					return SLJIT_SUCCESS;
-			}
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-			if (op == SLJIT_MOV_SI && (src & SLJIT_MEM))
-				op = SLJIT_MOV_UI;
-			if (op == SLJIT_MOVU_SI && (src & SLJIT_MEM))
-				op = SLJIT_MOVU_UI;
-			if (op == SLJIT_MOV_UI && (src & SLJIT_IMM))
-				op = SLJIT_MOV_SI;
-			if (op == SLJIT_MOVU_UI && (src & SLJIT_IMM))
-				op = SLJIT_MOVU_SI;
-#endif
-		}
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		else {
-			/* Most operations expect sign extended arguments. */
-			flags |= INT_DATA | SIGNED_DATA;
-			if (src & SLJIT_IMM)
-				srcw = (sljit_si)srcw;
-		}
-#endif
-	}
-
-	switch (op) {
-	case SLJIT_MOV:
-	case SLJIT_MOV_P:
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	case SLJIT_MOV_UI:
-	case SLJIT_MOV_SI:
-#endif
-		return emit_op(compiler, SLJIT_MOV, flags | WORD_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	case SLJIT_MOV_UI:
-		return EMIT_MOV(SLJIT_MOV_UI, INT_DATA, (sljit_ui));
-
-	case SLJIT_MOV_SI:
-		return EMIT_MOV(SLJIT_MOV_SI, INT_DATA | SIGNED_DATA, (sljit_si));
-#endif
-
-	case SLJIT_MOV_UB:
-		return EMIT_MOV(SLJIT_MOV_UB, BYTE_DATA, (sljit_ub));
-
-	case SLJIT_MOV_SB:
-		return EMIT_MOV(SLJIT_MOV_SB, BYTE_DATA | SIGNED_DATA, (sljit_sb));
-
-	case SLJIT_MOV_UH:
-		return EMIT_MOV(SLJIT_MOV_UH, HALF_DATA, (sljit_uh));
-
-	case SLJIT_MOV_SH:
-		return EMIT_MOV(SLJIT_MOV_SH, HALF_DATA | SIGNED_DATA, (sljit_sh));
-
-	case SLJIT_MOVU:
-	case SLJIT_MOVU_P:
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	case SLJIT_MOVU_UI:
-	case SLJIT_MOVU_SI:
-#endif
-		return emit_op(compiler, SLJIT_MOV, flags | WORD_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, srcw);
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	case SLJIT_MOVU_UI:
-		return EMIT_MOV(SLJIT_MOV_UI, INT_DATA | WRITE_BACK, (sljit_ui));
-
-	case SLJIT_MOVU_SI:
-		return EMIT_MOV(SLJIT_MOV_SI, INT_DATA | SIGNED_DATA | WRITE_BACK, (sljit_si));
-#endif
-
-	case SLJIT_MOVU_UB:
-		return EMIT_MOV(SLJIT_MOV_UB, BYTE_DATA | WRITE_BACK, (sljit_ub));
-
-	case SLJIT_MOVU_SB:
-		return EMIT_MOV(SLJIT_MOV_SB, BYTE_DATA | SIGNED_DATA | WRITE_BACK, (sljit_sb));
-
-	case SLJIT_MOVU_UH:
-		return EMIT_MOV(SLJIT_MOV_UH, HALF_DATA | WRITE_BACK, (sljit_uh));
-
-	case SLJIT_MOVU_SH:
-		return EMIT_MOV(SLJIT_MOV_SH, HALF_DATA | SIGNED_DATA | WRITE_BACK, (sljit_sh));
-
-	case SLJIT_NOT:
-		return emit_op(compiler, SLJIT_NOT, flags, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_NEG:
-		return emit_op(compiler, SLJIT_NEG, flags, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_CLZ:
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		return emit_op(compiler, SLJIT_CLZ, flags | (!(op_flags & SLJIT_INT_OP) ? 0 : ALT_FORM1), dst, dstw, TMP_REG1, 0, src, srcw);
-#else
-		return emit_op(compiler, SLJIT_CLZ, flags, dst, dstw, TMP_REG1, 0, src, srcw);
-#endif
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-#undef EMIT_MOV
-
-#define TEST_SL_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && (srcw) <= SIMM_MAX && (srcw) >= SIMM_MIN)
-
-#define TEST_UL_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && !((srcw) & ~0xffff))
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define TEST_SH_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && !((srcw) & 0xffff) && (srcw) <= 0x7fffffffl && (srcw) >= -0x80000000l)
-#else
-#define TEST_SH_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && !((srcw) & 0xffff))
-#endif
-
-#define TEST_UH_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && !((srcw) & ~0xffff0000))
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define TEST_ADD_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && (srcw) <= 0x7fff7fffl && (srcw) >= -0x80000000l)
-#else
-#define TEST_ADD_IMM(src, srcw) \
-	((src) & SLJIT_IMM)
-#endif
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define TEST_UI_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && !((srcw) & ~0xffffffff))
-#else
-#define TEST_UI_IMM(src, srcw) \
-	((src) & SLJIT_IMM)
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_si flags = GET_FLAGS(op) ? ALT_SET_FLAGS : 0;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op2(compiler, op, dst, dstw, src1, src1w, src2, src2w));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-	ADJUST_LOCAL_OFFSET(src2, src2w);
-
-	if ((src1 & SLJIT_IMM) && src1w == 0)
-		src1 = TMP_ZERO;
-	if ((src2 & SLJIT_IMM) && src2w == 0)
-		src2 = TMP_ZERO;
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	if (op & SLJIT_INT_OP) {
-		/* Most operations expect sign extended arguments. */
-		flags |= INT_DATA | SIGNED_DATA;
-		if (src1 & SLJIT_IMM)
-			src1w = (sljit_si)(src1w);
-		if (src2 & SLJIT_IMM)
-			src2w = (sljit_si)(src2w);
-		if (GET_FLAGS(op))
-			flags |= ALT_SIGN_EXT;
-	}
-#endif
-	if (op & SLJIT_SET_O)
-		FAIL_IF(push_inst(compiler, MTXER | S(TMP_ZERO)));
-	if (src2 == TMP_REG2)
-		flags |= ALT_KEEP_CACHE;
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_ADD:
-		if (!GET_FLAGS(op) && ((src1 | src2) & SLJIT_IMM)) {
-			if (TEST_SL_IMM(src2, src2w)) {
-				compiler->imm = src2w & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM1, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_SL_IMM(src1, src1w)) {
-				compiler->imm = src1w & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM1, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-			if (TEST_SH_IMM(src2, src2w)) {
-				compiler->imm = (src2w >> 16) & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM2, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_SH_IMM(src1, src1w)) {
-				compiler->imm = (src1w >> 16) & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM2, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-			/* Range between -1 and -32768 is covered above. */
-			if (TEST_ADD_IMM(src2, src2w)) {
-				compiler->imm = src2w & 0xffffffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM4, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_ADD_IMM(src1, src1w)) {
-				compiler->imm = src1w & 0xffffffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM4, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-		}
-		if (!(GET_FLAGS(op) & (SLJIT_SET_E | SLJIT_SET_O))) {
-			if (TEST_SL_IMM(src2, src2w)) {
-				compiler->imm = src2w & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM3, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_SL_IMM(src1, src1w)) {
-				compiler->imm = src1w & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM3, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-		}
-		return emit_op(compiler, SLJIT_ADD, flags, dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_ADDC:
-		return emit_op(compiler, SLJIT_ADDC, flags | (!(op & SLJIT_KEEP_FLAGS) ? 0 : ALT_FORM1), dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_SUB:
-		if (!GET_FLAGS(op) && ((src1 | src2) & SLJIT_IMM)) {
-			if (TEST_SL_IMM(src2, -src2w)) {
-				compiler->imm = (-src2w) & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM1, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_SL_IMM(src1, src1w)) {
-				compiler->imm = src1w & 0xffff;
-				return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM1, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-			if (TEST_SH_IMM(src2, -src2w)) {
-				compiler->imm = ((-src2w) >> 16) & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM2, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			/* Range between -1 and -32768 is covered above. */
-			if (TEST_ADD_IMM(src2, -src2w)) {
-				compiler->imm = -src2w & 0xffffffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM4, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-		}
-		if (dst == SLJIT_UNUSED && (op & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S)) && !(op & (SLJIT_SET_O | SLJIT_SET_C))) {
-			if (!(op & SLJIT_SET_U)) {
-				/* We know ALT_SIGN_EXT is set if it is an SLJIT_INT_OP on 64 bit systems. */
-				if (TEST_SL_IMM(src2, src2w)) {
-					compiler->imm = src2w & 0xffff;
-					return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM2, dst, dstw, src1, src1w, TMP_REG2, 0);
-				}
-				if (GET_FLAGS(op) == SLJIT_SET_E && TEST_SL_IMM(src1, src1w)) {
-					compiler->imm = src1w & 0xffff;
-					return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM2, dst, dstw, src2, src2w, TMP_REG2, 0);
-				}
-			}
-			if (!(op & (SLJIT_SET_E | SLJIT_SET_S))) {
-				/* We know ALT_SIGN_EXT is set if it is an SLJIT_INT_OP on 64 bit systems. */
-				if (TEST_UL_IMM(src2, src2w)) {
-					compiler->imm = src2w & 0xffff;
-					return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM3, dst, dstw, src1, src1w, TMP_REG2, 0);
-				}
-				return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM4, dst, dstw, src1, src1w, src2, src2w);
-			}
-			if ((src2 & SLJIT_IMM) && src2w >= 0 && src2w <= 0x7fff) {
-				compiler->imm = src2w;
-				return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM2 | ALT_FORM3, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			return emit_op(compiler, SLJIT_SUB, flags | ((op & SLJIT_SET_U) ? ALT_FORM4 : 0) | ((op & (SLJIT_SET_E | SLJIT_SET_S)) ? ALT_FORM5 : 0), dst, dstw, src1, src1w, src2, src2w);
-		}
-		if (!(op & (SLJIT_SET_E | SLJIT_SET_U | SLJIT_SET_S | SLJIT_SET_O))) {
-			if (TEST_SL_IMM(src2, -src2w)) {
-				compiler->imm = (-src2w) & 0xffff;
-				return emit_op(compiler, SLJIT_ADD, flags | ALT_FORM3, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-		}
-		/* We know ALT_SIGN_EXT is set if it is an SLJIT_INT_OP on 64 bit systems. */
-		return emit_op(compiler, SLJIT_SUB, flags | (!(op & SLJIT_SET_U) ? 0 : ALT_FORM6), dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_SUBC:
-		return emit_op(compiler, SLJIT_SUBC, flags | (!(op & SLJIT_KEEP_FLAGS) ? 0 : ALT_FORM1), dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_MUL:
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		if (op & SLJIT_INT_OP)
-			flags |= ALT_FORM2;
-#endif
-		if (!GET_FLAGS(op)) {
-			if (TEST_SL_IMM(src2, src2w)) {
-				compiler->imm = src2w & 0xffff;
-				return emit_op(compiler, SLJIT_MUL, flags | ALT_FORM1, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_SL_IMM(src1, src1w)) {
-				compiler->imm = src1w & 0xffff;
-				return emit_op(compiler, SLJIT_MUL, flags | ALT_FORM1, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-		}
-		return emit_op(compiler, SLJIT_MUL, flags, dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_AND:
-	case SLJIT_OR:
-	case SLJIT_XOR:
-		/* Commutative unsigned operations. */
-		if (!GET_FLAGS(op) || GET_OPCODE(op) == SLJIT_AND) {
-			if (TEST_UL_IMM(src2, src2w)) {
-				compiler->imm = src2w;
-				return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM1, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_UL_IMM(src1, src1w)) {
-				compiler->imm = src1w;
-				return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM1, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-			if (TEST_UH_IMM(src2, src2w)) {
-				compiler->imm = (src2w >> 16) & 0xffff;
-				return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM2, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_UH_IMM(src1, src1w)) {
-				compiler->imm = (src1w >> 16) & 0xffff;
-				return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM2, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-		}
-		if (!GET_FLAGS(op) && GET_OPCODE(op) != SLJIT_AND) {
-			if (TEST_UI_IMM(src2, src2w)) {
-				compiler->imm = src2w;
-				return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM3, dst, dstw, src1, src1w, TMP_REG2, 0);
-			}
-			if (TEST_UI_IMM(src1, src1w)) {
-				compiler->imm = src1w;
-				return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM3, dst, dstw, src2, src2w, TMP_REG2, 0);
-			}
-		}
-		return emit_op(compiler, GET_OPCODE(op), flags, dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_ASHR:
-		if (op & SLJIT_KEEP_FLAGS)
-			flags |= ALT_FORM3;
-		/* Fall through. */
-	case SLJIT_SHL:
-	case SLJIT_LSHR:
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		if (op & SLJIT_INT_OP)
-			flags |= ALT_FORM2;
-#endif
-		if (src2 & SLJIT_IMM) {
-			compiler->imm = src2w;
-			return emit_op(compiler, GET_OPCODE(op), flags | ALT_FORM1, dst, dstw, src1, src1w, TMP_REG2, 0);
-		}
-		return emit_op(compiler, GET_OPCODE(op), flags, dst, dstw, src1, src1w, src2, src2w);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg)
-{
-	CHECK_REG_INDEX(check_sljit_get_register_index(reg));
-	return reg_map[reg];
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_float_register_index(sljit_si reg)
-{
-	CHECK_REG_INDEX(check_sljit_get_float_register_index(reg));
-	return reg;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler,
-	void *instruction, sljit_si size)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op_custom(compiler, instruction, size));
-
-	return push_inst(compiler, *(sljit_ins*)instruction);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Floating point operators                                             */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_is_fpu_available(void)
-{
-#ifdef SLJIT_IS_FPU_AVAILABLE
-	return SLJIT_IS_FPU_AVAILABLE;
-#else
-	/* Available by default. */
-	return 1;
-#endif
-}
-
-#define FLOAT_DATA(op) (DOUBLE_DATA | ((op & SLJIT_SINGLE_OP) >> 6))
-#define SELECT_FOP(op, single, double) ((op & SLJIT_SINGLE_OP) ? single : double)
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-#define FLOAT_TMP_MEM_OFFSET (6 * sizeof(sljit_sw))
-#else
-#define FLOAT_TMP_MEM_OFFSET (2 * sizeof(sljit_sw))
-
-#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-#define FLOAT_TMP_MEM_OFFSET_LOW (2 * sizeof(sljit_sw))
-#define FLOAT_TMP_MEM_OFFSET_HI (3 * sizeof(sljit_sw))
-#else
-#define FLOAT_TMP_MEM_OFFSET_LOW (3 * sizeof(sljit_sw))
-#define FLOAT_TMP_MEM_OFFSET_HI (2 * sizeof(sljit_sw))
-#endif
-
-#endif /* SLJIT_CONFIG_PPC_64 */
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_convw_fromd(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	if (src & SLJIT_MEM) {
-		/* We can ignore the temporary data store on the stack from caching point of view. */
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src, srcw, dst, dstw));
-		src = TMP_FREG1;
-	}
-
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	op = GET_OPCODE(op);
-	FAIL_IF(push_inst(compiler, (op == SLJIT_CONVI_FROMD ? FCTIWZ : FCTIDZ) | FD(TMP_FREG1) | FB(src)));
-
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-	if (op == SLJIT_CONVW_FROMD) {
-		if (FAST_IS_REG(dst)) {
-			FAIL_IF(emit_op_mem2(compiler, DOUBLE_DATA, TMP_FREG1, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, 0, 0));
-			return emit_op_mem2(compiler, WORD_DATA | LOAD_DATA, dst, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, 0, 0);
-		}
-		return emit_op_mem2(compiler, DOUBLE_DATA, TMP_FREG1, dst, dstw, 0, 0);
-	}
-
-#else
-	FAIL_IF(push_inst(compiler, FCTIWZ | FD(TMP_FREG1) | FB(src)));
-
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-#endif
-
-	if (FAST_IS_REG(dst)) {
-		FAIL_IF(load_immediate(compiler, TMP_REG1, FLOAT_TMP_MEM_OFFSET));
-		FAIL_IF(push_inst(compiler, STFIWX | FS(TMP_FREG1) | A(SLJIT_SP) | B(TMP_REG1)));
-		return emit_op_mem2(compiler, INT_DATA | LOAD_DATA, dst, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, 0, 0);
-	}
-
-	SLJIT_ASSERT(dst & SLJIT_MEM);
-
-	if (dst & OFFS_REG_MASK) {
-		dstw &= 0x3;
-		if (dstw) {
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-			FAIL_IF(push_inst(compiler, RLWINM | S(OFFS_REG(dst)) | A(TMP_REG1) | (dstw << 11) | ((31 - dstw) << 1)));
-#else
-			FAIL_IF(push_inst(compiler, RLDI(TMP_REG1, OFFS_REG(dst), dstw, 63 - dstw, 1)));
-#endif
-			dstw = TMP_REG1;
-		}
-		else
-			dstw = OFFS_REG(dst);
-	}
-	else {
-		if ((dst & REG_MASK) && !dstw) {
-			dstw = dst & REG_MASK;
-			dst = 0;
-		}
-		else {
-			/* This works regardless we have SLJIT_MEM1 or SLJIT_MEM0. */
-			FAIL_IF(load_immediate(compiler, TMP_REG1, dstw));
-			dstw = TMP_REG1;
-		}
-	}
-
-	return push_inst(compiler, STFIWX | FS(TMP_FREG1) | A(dst & REG_MASK) | B(dstw));
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_convd_fromw(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-
-	sljit_si dst_r = FAST_IS_REG(dst) ? dst : TMP_FREG1;
-
-	if (src & SLJIT_IMM) {
-		if (GET_OPCODE(op) == SLJIT_CONVD_FROMI)
-			srcw = (sljit_si)srcw;
-		FAIL_IF(load_immediate(compiler, TMP_REG1, srcw));
-		src = TMP_REG1;
-	}
-	else if (GET_OPCODE(op) == SLJIT_CONVD_FROMI) {
-		if (FAST_IS_REG(src))
-			FAIL_IF(push_inst(compiler, EXTSW | S(src) | A(TMP_REG1)));
-		else
-			FAIL_IF(emit_op_mem2(compiler, INT_DATA | SIGNED_DATA | LOAD_DATA, TMP_REG1, src, srcw, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET));
-		src = TMP_REG1;
-	}
-
-	if (FAST_IS_REG(src)) {
-		FAIL_IF(emit_op_mem2(compiler, WORD_DATA, src, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET));
-		FAIL_IF(emit_op_mem2(compiler, DOUBLE_DATA | LOAD_DATA, TMP_FREG1, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, dst, dstw));
-	}
-	else
-		FAIL_IF(emit_op_mem2(compiler, DOUBLE_DATA | LOAD_DATA, TMP_FREG1, src, srcw, dst, dstw));
-
-	FAIL_IF(push_inst(compiler, FCFID | FD(dst_r) | FB(TMP_FREG1)));
-
-	if (dst & SLJIT_MEM)
-		return emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG1, dst, dstw, 0, 0);
-	if (op & SLJIT_SINGLE_OP)
-		return push_inst(compiler, FRSP | FD(dst_r) | FB(dst_r));
-	return SLJIT_SUCCESS;
-
-#else
-
-	sljit_si dst_r = FAST_IS_REG(dst) ? dst : TMP_FREG1;
-	sljit_si invert_sign = 1;
-
-	if (src & SLJIT_IMM) {
-		FAIL_IF(load_immediate(compiler, TMP_REG1, srcw ^ 0x80000000));
-		src = TMP_REG1;
-		invert_sign = 0;
-	}
-	else if (!FAST_IS_REG(src)) {
-		FAIL_IF(emit_op_mem2(compiler, WORD_DATA | SIGNED_DATA | LOAD_DATA, TMP_REG1, src, srcw, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_LOW));
-		src = TMP_REG1;
-	}
-
-	/* First, a special double floating point value is constructed: (2^53 + (input xor (2^31)))
-	   The double precision format has exactly 53 bit precision, so the lower 32 bit represents
-	   the lower 32 bit of such value. The result of xor 2^31 is the same as adding 0x80000000
-	   to the input, which shifts it into the 0 - 0xffffffff range. To get the converted floating
-	   point value, we need to substract 2^53 + 2^31 from the constructed value. */
-	FAIL_IF(push_inst(compiler, ADDIS | D(TMP_REG2) | A(0) | 0x4330));
-	if (invert_sign)
-		FAIL_IF(push_inst(compiler, XORIS | S(src) | A(TMP_REG1) | 0x8000));
-	FAIL_IF(emit_op_mem2(compiler, WORD_DATA, TMP_REG2, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_HI, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET));
-	FAIL_IF(emit_op_mem2(compiler, WORD_DATA, TMP_REG1, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_LOW, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_HI));
-	FAIL_IF(push_inst(compiler, ADDIS | D(TMP_REG1) | A(0) | 0x8000));
-	FAIL_IF(emit_op_mem2(compiler, DOUBLE_DATA | LOAD_DATA, TMP_FREG1, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_LOW));
-	FAIL_IF(emit_op_mem2(compiler, WORD_DATA, TMP_REG1, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_LOW, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET));
-	FAIL_IF(emit_op_mem2(compiler, DOUBLE_DATA | LOAD_DATA, TMP_FREG2, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET_LOW));
-
-	FAIL_IF(push_inst(compiler, FSUB | FD(dst_r) | FA(TMP_FREG1) | FB(TMP_FREG2)));
-
-	if (dst & SLJIT_MEM)
-		return emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG1, dst, dstw, 0, 0);
-	if (op & SLJIT_SINGLE_OP)
-		return push_inst(compiler, FRSP | FD(dst_r) | FB(dst_r));
-	return SLJIT_SUCCESS;
-
-#endif
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_cmp(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, src2, src2w));
-		src1 = TMP_FREG1;
-	}
-
-	if (src2 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, 0, 0));
-		src2 = TMP_FREG2;
-	}
-
-	return push_inst(compiler, FCMPU | CRD(4) | FA(src1) | FB(src2));
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si dst_r;
-
-	CHECK_ERROR();
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-
-	SLJIT_COMPILE_ASSERT((SLJIT_SINGLE_OP == 0x100) && !(DOUBLE_DATA & 0x4), float_transfer_bit_error);
-	SELECT_FOP1_OPERATION_WITH_CHECKS(compiler, op, dst, dstw, src, srcw);
-
-	if (GET_OPCODE(op) == SLJIT_CONVD_FROMS)
-		op ^= SLJIT_SINGLE_OP;
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_FREG1;
-
-	if (src & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, dst_r, src, srcw, dst, dstw));
-		src = dst_r;
-	}
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_CONVD_FROMS:
-		op ^= SLJIT_SINGLE_OP;
-		if (op & SLJIT_SINGLE_OP) {
-			FAIL_IF(push_inst(compiler, FRSP | FD(dst_r) | FB(src)));
-			break;
-		}
-		/* Fall through. */
-	case SLJIT_DMOV:
-		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
-				FAIL_IF(push_inst(compiler, FMR | FD(dst_r) | FB(src)));
-			else
-				dst_r = src;
-		}
-		break;
-	case SLJIT_DNEG:
-		FAIL_IF(push_inst(compiler, FNEG | FD(dst_r) | FB(src)));
-		break;
-	case SLJIT_DABS:
-		FAIL_IF(push_inst(compiler, FABS | FD(dst_r) | FB(src)));
-		break;
-	}
-
-	if (dst & SLJIT_MEM)
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op), dst_r, dst, dstw, 0, 0));
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_si dst_r, flags = 0;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fop2(compiler, op, dst, dstw, src1, src1w, src2, src2w));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-	ADJUST_LOCAL_OFFSET(src2, src2w);
-
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_FREG2;
-
-	if (src1 & SLJIT_MEM) {
-		if (getput_arg_fast(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w)) {
-			FAIL_IF(compiler->error);
-			src1 = TMP_FREG1;
-		} else
-			flags |= ALT_FORM1;
-	}
-
-	if (src2 & SLJIT_MEM) {
-		if (getput_arg_fast(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w)) {
-			FAIL_IF(compiler->error);
-			src2 = TMP_FREG2;
-		} else
-			flags |= ALT_FORM2;
-	}
-
-	if ((flags & (ALT_FORM1 | ALT_FORM2)) == (ALT_FORM1 | ALT_FORM2)) {
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, src1, src1w));
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, dst, dstw));
-		}
-		else {
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, src2, src2w));
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, dst, dstw));
-		}
-	}
-	else if (flags & ALT_FORM1)
-		FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, dst, dstw));
-	else if (flags & ALT_FORM2)
-		FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, dst, dstw));
-
-	if (flags & ALT_FORM1)
-		src1 = TMP_FREG1;
-	if (flags & ALT_FORM2)
-		src2 = TMP_FREG2;
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_DADD:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FADDS, FADD) | FD(dst_r) | FA(src1) | FB(src2)));
-		break;
-
-	case SLJIT_DSUB:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FSUBS, FSUB) | FD(dst_r) | FA(src1) | FB(src2)));
-		break;
-
-	case SLJIT_DMUL:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FMULS, FMUL) | FD(dst_r) | FA(src1) | FC(src2) /* FMUL use FC as src2 */));
-		break;
-
-	case SLJIT_DDIV:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FDIVS, FDIV) | FD(dst_r) | FA(src1) | FB(src2)));
-		break;
-	}
-
-	if (dst_r == TMP_FREG2)
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG2, dst, dstw, 0, 0));
-
-	return SLJIT_SUCCESS;
-}
-
-#undef FLOAT_DATA
-#undef SELECT_FOP
-
-/* --------------------------------------------------------------------- */
-/*  Other instructions                                                   */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_enter(compiler, dst, dstw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	/* For UNUSED dst. Uncommon, but possible. */
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-	if (FAST_IS_REG(dst))
-		return push_inst(compiler, MFLR | D(dst));
-
-	/* Memory. */
-	FAIL_IF(push_inst(compiler, MFLR | D(TMP_REG2)));
-	return emit_op(compiler, SLJIT_MOV, WORD_DATA, dst, dstw, TMP_REG1, 0, TMP_REG2, 0);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_return(compiler, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	if (FAST_IS_REG(src))
-		FAIL_IF(push_inst(compiler, MTLR | S(src)));
-	else {
-		if (src & SLJIT_MEM)
-			FAIL_IF(emit_op(compiler, SLJIT_MOV, WORD_DATA, TMP_REG2, 0, TMP_REG1, 0, src, srcw));
-		else if (src & SLJIT_IMM)
-			FAIL_IF(load_immediate(compiler, TMP_REG2, srcw));
-		FAIL_IF(push_inst(compiler, MTLR | S(TMP_REG2)));
-	}
-	return push_inst(compiler, BLR);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Conditional instructions                                             */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compiler *compiler)
-{
-	struct sljit_label *label;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_label(compiler));
-
-	if (compiler->last_label && compiler->last_label->size == compiler->size)
-		return compiler->last_label;
-
-	label = (struct sljit_label*)ensure_abuf(compiler, sizeof(struct sljit_label));
-	PTR_FAIL_IF(!label);
-	set_label(label, compiler);
-	return label;
-}
-
-static sljit_ins get_bo_bi_flags(sljit_si type)
-{
-	switch (type) {
-	case SLJIT_EQUAL:
-		return (12 << 21) | (2 << 16);
-
-	case SLJIT_NOT_EQUAL:
-		return (4 << 21) | (2 << 16);
-
-	case SLJIT_LESS:
-	case SLJIT_D_LESS:
-		return (12 << 21) | ((4 + 0) << 16);
-
-	case SLJIT_GREATER_EQUAL:
-	case SLJIT_D_GREATER_EQUAL:
-		return (4 << 21) | ((4 + 0) << 16);
-
-	case SLJIT_GREATER:
-	case SLJIT_D_GREATER:
-		return (12 << 21) | ((4 + 1) << 16);
-
-	case SLJIT_LESS_EQUAL:
-	case SLJIT_D_LESS_EQUAL:
-		return (4 << 21) | ((4 + 1) << 16);
-
-	case SLJIT_SIG_LESS:
-		return (12 << 21) | (0 << 16);
-
-	case SLJIT_SIG_GREATER_EQUAL:
-		return (4 << 21) | (0 << 16);
-
-	case SLJIT_SIG_GREATER:
-		return (12 << 21) | (1 << 16);
-
-	case SLJIT_SIG_LESS_EQUAL:
-		return (4 << 21) | (1 << 16);
-
-	case SLJIT_OVERFLOW:
-	case SLJIT_MUL_OVERFLOW:
-		return (12 << 21) | (3 << 16);
-
-	case SLJIT_NOT_OVERFLOW:
-	case SLJIT_MUL_NOT_OVERFLOW:
-		return (4 << 21) | (3 << 16);
-
-	case SLJIT_D_EQUAL:
-		return (12 << 21) | ((4 + 2) << 16);
-
-	case SLJIT_D_NOT_EQUAL:
-		return (4 << 21) | ((4 + 2) << 16);
-
-	case SLJIT_D_UNORDERED:
-		return (12 << 21) | ((4 + 3) << 16);
-
-	case SLJIT_D_ORDERED:
-		return (4 << 21) | ((4 + 3) << 16);
-
-	default:
-		SLJIT_ASSERT(type >= SLJIT_JUMP && type <= SLJIT_CALL3);
-		return (20 << 21);
-	}
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compiler *compiler, sljit_si type)
-{
-	struct sljit_jump *jump;
-	sljit_ins bo_bi_flags;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_jump(compiler, type));
-
-	bo_bi_flags = get_bo_bi_flags(type & 0xff);
-	if (!bo_bi_flags)
-		return NULL;
-
-	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
-	PTR_FAIL_IF(!jump);
-	set_jump(jump, compiler, type & SLJIT_REWRITABLE_JUMP);
-	type &= 0xff;
-
-	/* In PPC, we don't need to touch the arguments. */
-	if (type < SLJIT_JUMP)
-		jump->flags |= IS_COND;
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-	if (type >= SLJIT_CALL0)
-		jump->flags |= IS_CALL;
-#endif
-
-	PTR_FAIL_IF(emit_const(compiler, TMP_CALL_REG, 0));
-	PTR_FAIL_IF(push_inst(compiler, MTCTR | S(TMP_CALL_REG)));
-	jump->addr = compiler->size;
-	PTR_FAIL_IF(push_inst(compiler, BCCTR | bo_bi_flags | (type >= SLJIT_FAST_CALL ? 1 : 0)));
-	return jump;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_ijump(struct sljit_compiler *compiler, sljit_si type, sljit_si src, sljit_sw srcw)
-{
-	struct sljit_jump *jump = NULL;
-	sljit_si src_r;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_ijump(compiler, type, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	if (FAST_IS_REG(src)) {
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-		if (type >= SLJIT_CALL0) {
-			FAIL_IF(push_inst(compiler, OR | S(src) | A(TMP_CALL_REG) | B(src)));
-			src_r = TMP_CALL_REG;
-		}
-		else
-			src_r = src;
-#else
-		src_r = src;
-#endif
-	} else if (src & SLJIT_IMM) {
-		jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
-		FAIL_IF(!jump);
-		set_jump(jump, compiler, JUMP_ADDR);
-		jump->u.target = srcw;
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-		if (type >= SLJIT_CALL0)
-			jump->flags |= IS_CALL;
-#endif
-		FAIL_IF(emit_const(compiler, TMP_CALL_REG, 0));
-		src_r = TMP_CALL_REG;
-	}
-	else {
-		FAIL_IF(emit_op(compiler, SLJIT_MOV, WORD_DATA, TMP_CALL_REG, 0, TMP_REG1, 0, src, srcw));
-		src_r = TMP_CALL_REG;
-	}
-
-	FAIL_IF(push_inst(compiler, MTCTR | S(src_r)));
-	if (jump)
-		jump->addr = compiler->size;
-	return push_inst(compiler, BCCTR | (20 << 21) | (type >= SLJIT_FAST_CALL ? 1 : 0));
-}
-
-/* Get a bit from CR, all other bits are zeroed. */
-#define GET_CR_BIT(bit, dst) \
-	FAIL_IF(push_inst(compiler, MFCR | D(dst))); \
-	FAIL_IF(push_inst(compiler, RLWINM | S(dst) | A(dst) | ((1 + (bit)) << 11) | (31 << 6) | (31 << 1)));
-
-#define INVERT_BIT(dst) \
-	FAIL_IF(push_inst(compiler, XORI | S(dst) | A(dst) | 0x1));
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_flags(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw,
-	sljit_si type)
-{
-	sljit_si reg, input_flags;
-	sljit_si flags = GET_ALL_FLAGS(op);
-	sljit_sw original_dstw = dstw;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op_flags(compiler, op, dst, dstw, src, srcw, type));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-	op = GET_OPCODE(op);
-	reg = (op < SLJIT_ADD && FAST_IS_REG(dst)) ? dst : TMP_REG2;
-
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-	if (op >= SLJIT_ADD && (src & SLJIT_MEM)) {
-		ADJUST_LOCAL_OFFSET(src, srcw);
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		input_flags = (flags & SLJIT_INT_OP) ? INT_DATA : WORD_DATA;
-#else
-		input_flags = WORD_DATA;
-#endif
-		FAIL_IF(emit_op_mem2(compiler, input_flags | LOAD_DATA, TMP_REG1, src, srcw, dst, dstw));
-		src = TMP_REG1;
-		srcw = 0;
-	}
-
-	switch (type & 0xff) {
-	case SLJIT_EQUAL:
-		GET_CR_BIT(2, reg);
-		break;
-
-	case SLJIT_NOT_EQUAL:
-		GET_CR_BIT(2, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_LESS:
-	case SLJIT_D_LESS:
-		GET_CR_BIT(4 + 0, reg);
-		break;
-
-	case SLJIT_GREATER_EQUAL:
-	case SLJIT_D_GREATER_EQUAL:
-		GET_CR_BIT(4 + 0, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_GREATER:
-	case SLJIT_D_GREATER:
-		GET_CR_BIT(4 + 1, reg);
-		break;
-
-	case SLJIT_LESS_EQUAL:
-	case SLJIT_D_LESS_EQUAL:
-		GET_CR_BIT(4 + 1, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_SIG_LESS:
-		GET_CR_BIT(0, reg);
-		break;
-
-	case SLJIT_SIG_GREATER_EQUAL:
-		GET_CR_BIT(0, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_SIG_GREATER:
-		GET_CR_BIT(1, reg);
-		break;
-
-	case SLJIT_SIG_LESS_EQUAL:
-		GET_CR_BIT(1, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_OVERFLOW:
-	case SLJIT_MUL_OVERFLOW:
-		GET_CR_BIT(3, reg);
-		break;
-
-	case SLJIT_NOT_OVERFLOW:
-	case SLJIT_MUL_NOT_OVERFLOW:
-		GET_CR_BIT(3, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_D_EQUAL:
-		GET_CR_BIT(4 + 2, reg);
-		break;
-
-	case SLJIT_D_NOT_EQUAL:
-		GET_CR_BIT(4 + 2, reg);
-		INVERT_BIT(reg);
-		break;
-
-	case SLJIT_D_UNORDERED:
-		GET_CR_BIT(4 + 3, reg);
-		break;
-
-	case SLJIT_D_ORDERED:
-		GET_CR_BIT(4 + 3, reg);
-		INVERT_BIT(reg);
-		break;
-
-	default:
-		SLJIT_ASSERT_STOP();
-		break;
-	}
-
-	if (op < SLJIT_ADD) {
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		if (op == SLJIT_MOV)
-			input_flags = WORD_DATA;
-		else {
-			op = SLJIT_MOV_UI;
-			input_flags = INT_DATA;
-		}
-#else
-		op = SLJIT_MOV;
-		input_flags = WORD_DATA;
-#endif
-		if (reg != TMP_REG2)
-			return SLJIT_SUCCESS;
-		return emit_op(compiler, op, input_flags, dst, dstw, TMP_REG1, 0, TMP_REG2, 0);
-	}
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	return sljit_emit_op2(compiler, op | flags, dst, original_dstw, src, srcw, TMP_REG2, 0);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value)
-{
-	struct sljit_const *const_;
-	sljit_si reg;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_const(compiler, dst, dstw, init_value));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	const_ = (struct sljit_const*)ensure_abuf(compiler, sizeof(struct sljit_const));
-	PTR_FAIL_IF(!const_);
-	set_const(const_, compiler);
-
-	reg = SLOW_IS_REG(dst) ? dst : TMP_REG2;
-
-	PTR_FAIL_IF(emit_const(compiler, reg, init_value));
-
-	if (dst & SLJIT_MEM)
-		PTR_FAIL_IF(emit_op(compiler, SLJIT_MOV, WORD_DATA, dst, dstw, TMP_REG1, 0, TMP_REG2, 0));
-	return const_;
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativeSPARC_32.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativeSPARC_32.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativeSPARC_32.c	2014-11-12 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativeSPARC_32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-static sljit_si load_immediate(struct sljit_compiler *compiler, sljit_si dst, sljit_sw imm)
-{
-	if (imm <= SIMM_MAX && imm >= SIMM_MIN)
-		return push_inst(compiler, OR | D(dst) | S1(0) | IMM(imm), DR(dst));
-
-	FAIL_IF(push_inst(compiler, SETHI | D(dst) | ((imm >> 10) & 0x3fffff), DR(dst)));
-	return (imm & 0x3ff) ? push_inst(compiler, OR | D(dst) | S1(dst) | IMM_ARG | (imm & 0x3ff), DR(dst)) : SLJIT_SUCCESS;
-}
-
-#define ARG2(flags, src2) ((flags & SRC2_IMM) ? IMM(src2) : S2(src2))
-
-static SLJIT_INLINE sljit_si emit_single_op(struct sljit_compiler *compiler, sljit_si op, sljit_si flags,
-	sljit_si dst, sljit_si src1, sljit_sw src2)
-{
-	SLJIT_COMPILE_ASSERT(ICC_IS_SET == SET_FLAGS, icc_is_set_and_set_flags_must_be_the_same);
-
-	switch (op) {
-	case SLJIT_MOV:
-	case SLJIT_MOV_UI:
-	case SLJIT_MOV_SI:
-	case SLJIT_MOV_P:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
-		if (dst != src2)
-			return push_inst(compiler, OR | D(dst) | S1(0) | S2(src2), DR(dst));
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UB:
-	case SLJIT_MOV_SB:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			if (op == SLJIT_MOV_UB)
-				return push_inst(compiler, AND | D(dst) | S1(src2) | IMM(0xff), DR(dst));
-			FAIL_IF(push_inst(compiler, SLL | D(dst) | S1(src2) | IMM(24), DR(dst)));
-			return push_inst(compiler, SRA | D(dst) | S1(dst) | IMM(24), DR(dst));
-		}
-		else if (dst != src2)
-			SLJIT_ASSERT_STOP();
-		return SLJIT_SUCCESS;
-
-	case SLJIT_MOV_UH:
-	case SLJIT_MOV_SH:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
-		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
-			FAIL_IF(push_inst(compiler, SLL | D(dst) | S1(src2) | IMM(16), DR(dst)));
-			return push_inst(compiler, (op == SLJIT_MOV_SH ? SRA : SRL) | D(dst) | S1(dst) | IMM(16), DR(dst));
-		}
-		else if (dst != src2)
-			SLJIT_ASSERT_STOP();
-		return SLJIT_SUCCESS;
-
-	case SLJIT_NOT:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
-		return push_inst(compiler, XNOR | (flags & SET_FLAGS) | D(dst) | S1(0) | S2(src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_CLZ:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
-		/* sparc 32 does not support SLJIT_KEEP_FLAGS. Not sure I can fix this. */
-		FAIL_IF(push_inst(compiler, SUB | SET_FLAGS | D(0) | S1(src2) | S2(0), SET_FLAGS));
-		FAIL_IF(push_inst(compiler, OR | D(TMP_REG1) | S1(0) | S2(src2), DR(TMP_REG1)));
-		FAIL_IF(push_inst(compiler, BICC | DA(0x1) | (7 & DISP_MASK), UNMOVABLE_INS));
-		FAIL_IF(push_inst(compiler, OR | (flags & SET_FLAGS) | D(dst) | S1(0) | IMM(32), UNMOVABLE_INS | (flags & SET_FLAGS)));
-		FAIL_IF(push_inst(compiler, OR | D(dst) | S1(0) | IMM(-1), DR(dst)));
-
-		/* Loop. */
-		FAIL_IF(push_inst(compiler, SUB | SET_FLAGS | D(0) | S1(TMP_REG1) | S2(0), SET_FLAGS));
-		FAIL_IF(push_inst(compiler, SLL | D(TMP_REG1) | S1(TMP_REG1) | IMM(1), DR(TMP_REG1)));
-		FAIL_IF(push_inst(compiler, BICC | DA(0xe) | (-2 & DISP_MASK), UNMOVABLE_INS));
-		return push_inst(compiler, ADD | (flags & SET_FLAGS) | D(dst) | S1(dst) | IMM(1), UNMOVABLE_INS | (flags & SET_FLAGS));
-
-	case SLJIT_ADD:
-		return push_inst(compiler, ADD | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_ADDC:
-		return push_inst(compiler, ADDC | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_SUB:
-		return push_inst(compiler, SUB | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_SUBC:
-		return push_inst(compiler, SUBC | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_MUL:
-		FAIL_IF(push_inst(compiler, SMUL | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst)));
-		if (!(flags & SET_FLAGS))
-			return SLJIT_SUCCESS;
-		FAIL_IF(push_inst(compiler, SRA | D(TMP_REG1) | S1(dst) | IMM(31), DR(TMP_REG1)));
-		FAIL_IF(push_inst(compiler, RDY | D(TMP_LINK), DR(TMP_LINK)));
-		return push_inst(compiler, SUB | SET_FLAGS | D(0) | S1(TMP_REG1) | S2(TMP_LINK), MOVABLE_INS | SET_FLAGS);
-
-	case SLJIT_AND:
-		return push_inst(compiler, AND | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_OR:
-		return push_inst(compiler, OR | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_XOR:
-		return push_inst(compiler, XOR | (flags & SET_FLAGS) | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst) | (flags & SET_FLAGS));
-
-	case SLJIT_SHL:
-		FAIL_IF(push_inst(compiler, SLL | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst)));
-		return !(flags & SET_FLAGS) ? SLJIT_SUCCESS : push_inst(compiler, SUB | SET_FLAGS | D(0) | S1(dst) | S2(0), SET_FLAGS);
-
-	case SLJIT_LSHR:
-		FAIL_IF(push_inst(compiler, SRL | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst)));
-		return !(flags & SET_FLAGS) ? SLJIT_SUCCESS : push_inst(compiler, SUB | SET_FLAGS | D(0) | S1(dst) | S2(0), SET_FLAGS);
-
-	case SLJIT_ASHR:
-		FAIL_IF(push_inst(compiler, SRA | D(dst) | S1(src1) | ARG2(flags, src2), DR(dst)));
-		return !(flags & SET_FLAGS) ? SLJIT_SUCCESS : push_inst(compiler, SUB | SET_FLAGS | D(0) | S1(dst) | S2(0), SET_FLAGS);
-	}
-
-	SLJIT_ASSERT_STOP();
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw init_value)
-{
-	FAIL_IF(push_inst(compiler, SETHI | D(dst) | ((init_value >> 10) & 0x3fffff), DR(dst)));
-	return push_inst(compiler, OR | D(dst) | S1(dst) | IMM_ARG | (init_value & 0x3ff), DR(dst));
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_addr)
-{
-	sljit_ins *inst = (sljit_ins*)addr;
-
-	inst[0] = (inst[0] & 0xffc00000) | ((new_addr >> 10) & 0x3fffff);
-	inst[1] = (inst[1] & 0xfffffc00) | (new_addr & 0x3ff);
-	SLJIT_CACHE_FLUSH(inst, inst + 2);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant)
-{
-	sljit_ins *inst = (sljit_ins*)addr;
-
-	inst[0] = (inst[0] & 0xffc00000) | ((new_constant >> 10) & 0x3fffff);
-	inst[1] = (inst[1] & 0xfffffc00) | (new_constant & 0x3ff);
-	SLJIT_CACHE_FLUSH(inst, inst + 2);
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativeSPARC_common.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativeSPARC_common.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativeSPARC_common.c	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativeSPARC_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1435 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name(void)
-{
-	return "SPARC" SLJIT_CPUINFO;
-}
-
-/* Length of an instruction word
-   Both for sparc-32 and sparc-64 */
-typedef sljit_ui sljit_ins;
-
-static void sparc_cache_flush(sljit_ins *from, sljit_ins *to)
-{
-#if defined(__SUNPRO_C) && __SUNPRO_C < 0x590
-	__asm (
-		/* if (from == to) return */
-		"cmp %i0, %i1\n"
-		"be .leave\n"
-		"nop\n"
-
-		/* loop until from >= to */
-		".mainloop:\n"
-		"flush %i0\n"
-		"add %i0, 8, %i0\n"
-		"cmp %i0, %i1\n"
-		"bcs .mainloop\n"
-		"nop\n"
-
-		/* The comparison was done above. */
-		"bne .leave\n"
-		/* nop is not necessary here, since the
-		   sub operation has no side effect. */
-		"sub %i0, 4, %i0\n"
-		"flush %i0\n"
-		".leave:"
-	);
-#else
-	if (SLJIT_UNLIKELY(from == to))
-		return;
-
-	do {
-		__asm__ volatile (
-			"flush %0\n"
-			: : "r"(from)
-		);
-		/* Operates at least on doubleword. */
-		from += 2;
-	} while (from < to);
-
-	if (from == to) {
-		/* Flush the last word. */
-		from --;
-		__asm__ volatile (
-			"flush %0\n"
-			: : "r"(from)
-		);
-	}
-#endif
-}
-
-/* TMP_REG2 is not used by getput_arg */
-#define TMP_REG1	(SLJIT_NUMBER_OF_REGISTERS + 2)
-#define TMP_REG2	(SLJIT_NUMBER_OF_REGISTERS + 3)
-#define TMP_REG3	(SLJIT_NUMBER_OF_REGISTERS + 4)
-#define TMP_LINK	(SLJIT_NUMBER_OF_REGISTERS + 5)
-
-#define TMP_FREG1	(0)
-#define TMP_FREG2	((SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1) << 1)
-
-static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 6] = {
-	0, 8, 9, 10, 13, 29, 28, 27, 23, 22, 21, 20, 19, 18, 17, 16, 26, 25, 24, 14, 1, 11, 12, 15
-};
-
-/* --------------------------------------------------------------------- */
-/*  Instrucion forms                                                     */
-/* --------------------------------------------------------------------- */
-
-#define D(d)		(reg_map[d] << 25)
-#define DA(d)		((d) << 25)
-#define S1(s1)		(reg_map[s1] << 14)
-#define S2(s2)		(reg_map[s2])
-#define S1A(s1)		((s1) << 14)
-#define S2A(s2)		(s2)
-#define IMM_ARG		0x2000
-#define DOP(op)		((op) << 5)
-#define IMM(imm)	(((imm) & 0x1fff) | IMM_ARG)
-
-#define DR(dr)		(reg_map[dr])
-#define OPC1(opcode)	((opcode) << 30)
-#define OPC2(opcode)	((opcode) << 22)
-#define OPC3(opcode)	((opcode) << 19)
-#define SET_FLAGS	OPC3(0x10)
-
-#define ADD		(OPC1(0x2) | OPC3(0x00))
-#define ADDC		(OPC1(0x2) | OPC3(0x08))
-#define AND		(OPC1(0x2) | OPC3(0x01))
-#define ANDN		(OPC1(0x2) | OPC3(0x05))
-#define CALL		(OPC1(0x1))
-#define FABSS		(OPC1(0x2) | OPC3(0x34) | DOP(0x09))
-#define FADDD		(OPC1(0x2) | OPC3(0x34) | DOP(0x42))
-#define FADDS		(OPC1(0x2) | OPC3(0x34) | DOP(0x41))
-#define FCMPD		(OPC1(0x2) | OPC3(0x35) | DOP(0x52))
-#define FCMPS		(OPC1(0x2) | OPC3(0x35) | DOP(0x51))
-#define FDIVD		(OPC1(0x2) | OPC3(0x34) | DOP(0x4e))
-#define FDIVS		(OPC1(0x2) | OPC3(0x34) | DOP(0x4d))
-#define FDTOI		(OPC1(0x2) | OPC3(0x34) | DOP(0xd2))
-#define FDTOS		(OPC1(0x2) | OPC3(0x34) | DOP(0xc6))
-#define FITOD		(OPC1(0x2) | OPC3(0x34) | DOP(0xc8))
-#define FITOS		(OPC1(0x2) | OPC3(0x34) | DOP(0xc4))
-#define FMOVS		(OPC1(0x2) | OPC3(0x34) | DOP(0x01))
-#define FMULD		(OPC1(0x2) | OPC3(0x34) | DOP(0x4a))
-#define FMULS		(OPC1(0x2) | OPC3(0x34) | DOP(0x49))
-#define FNEGS		(OPC1(0x2) | OPC3(0x34) | DOP(0x05))
-#define FSTOD		(OPC1(0x2) | OPC3(0x34) | DOP(0xc9))
-#define FSTOI		(OPC1(0x2) | OPC3(0x34) | DOP(0xd1))
-#define FSUBD		(OPC1(0x2) | OPC3(0x34) | DOP(0x46))
-#define FSUBS		(OPC1(0x2) | OPC3(0x34) | DOP(0x45))
-#define JMPL		(OPC1(0x2) | OPC3(0x38))
-#define NOP		(OPC1(0x0) | OPC2(0x04))
-#define OR		(OPC1(0x2) | OPC3(0x02))
-#define ORN		(OPC1(0x2) | OPC3(0x06))
-#define RDY		(OPC1(0x2) | OPC3(0x28) | S1A(0))
-#define RESTORE		(OPC1(0x2) | OPC3(0x3d))
-#define SAVE		(OPC1(0x2) | OPC3(0x3c))
-#define SETHI		(OPC1(0x0) | OPC2(0x04))
-#define SLL		(OPC1(0x2) | OPC3(0x25))
-#define SLLX		(OPC1(0x2) | OPC3(0x25) | (1 << 12))
-#define SRA		(OPC1(0x2) | OPC3(0x27))
-#define SRAX		(OPC1(0x2) | OPC3(0x27) | (1 << 12))
-#define SRL		(OPC1(0x2) | OPC3(0x26))
-#define SRLX		(OPC1(0x2) | OPC3(0x26) | (1 << 12))
-#define SUB		(OPC1(0x2) | OPC3(0x04))
-#define SUBC		(OPC1(0x2) | OPC3(0x0c))
-#define TA		(OPC1(0x2) | OPC3(0x3a) | (8 << 25))
-#define WRY		(OPC1(0x2) | OPC3(0x30) | DA(0))
-#define XOR		(OPC1(0x2) | OPC3(0x03))
-#define XNOR		(OPC1(0x2) | OPC3(0x07))
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-#define MAX_DISP	(0x1fffff)
-#define MIN_DISP	(-0x200000)
-#define DISP_MASK	(0x3fffff)
-
-#define BICC		(OPC1(0x0) | OPC2(0x2))
-#define FBFCC		(OPC1(0x0) | OPC2(0x6))
-#define SLL_W		SLL
-#define SDIV		(OPC1(0x2) | OPC3(0x0f))
-#define SMUL		(OPC1(0x2) | OPC3(0x0b))
-#define UDIV		(OPC1(0x2) | OPC3(0x0e))
-#define UMUL		(OPC1(0x2) | OPC3(0x0a))
-#else
-#define SLL_W		SLLX
-#endif
-
-#define SIMM_MAX	(0x0fff)
-#define SIMM_MIN	(-0x1000)
-
-/* dest_reg is the absolute name of the register
-   Useful for reordering instructions in the delay slot. */
-static sljit_si push_inst(struct sljit_compiler *compiler, sljit_ins ins, sljit_si delay_slot)
-{
-	sljit_ins *ptr;
-	SLJIT_ASSERT((delay_slot & DST_INS_MASK) == UNMOVABLE_INS
-		|| (delay_slot & DST_INS_MASK) == MOVABLE_INS
-		|| (delay_slot & DST_INS_MASK) == ((ins >> 25) & 0x1f));
-	ptr = (sljit_ins*)ensure_buf(compiler, sizeof(sljit_ins));
-	FAIL_IF(!ptr);
-	*ptr = ins;
-	compiler->size++;
-	compiler->delay_slot = delay_slot;
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code)
-{
-	sljit_sw diff;
-	sljit_uw target_addr;
-	sljit_ins *inst;
-	sljit_ins saved_inst;
-
-	if (jump->flags & SLJIT_REWRITABLE_JUMP)
-		return code_ptr;
-
-	if (jump->flags & JUMP_ADDR)
-		target_addr = jump->u.target;
-	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		target_addr = (sljit_uw)(code + jump->u.label->size);
-	}
-	inst = (sljit_ins*)jump->addr;
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-	if (jump->flags & IS_CALL) {
-		/* Call is always patchable on sparc 32. */
-		jump->flags |= PATCH_CALL;
-		if (jump->flags & IS_MOVABLE) {
-			inst[0] = inst[-1];
-			inst[-1] = CALL;
-			jump->addr -= sizeof(sljit_ins);
-			return inst;
-		}
-		inst[0] = CALL;
-		inst[1] = NOP;
-		return inst + 1;
-	}
-#else
-	/* Both calls and BPr instructions shall not pass this point. */
-#error "Implementation required"
-#endif
-
-	if (jump->flags & IS_COND)
-		inst--;
-
-	if (jump->flags & IS_MOVABLE) {
-		diff = ((sljit_sw)target_addr - (sljit_sw)(inst - 1)) >> 2;
-		if (diff <= MAX_DISP && diff >= MIN_DISP) {
-			jump->flags |= PATCH_B;
-			inst--;
-			if (jump->flags & IS_COND) {
-				saved_inst = inst[0];
-				inst[0] = inst[1] ^ (1 << 28);
-				inst[1] = saved_inst;
-			} else {
-				inst[1] = inst[0];
-				inst[0] = BICC | DA(0x8);
-			}
-			jump->addr = (sljit_uw)inst;
-			return inst + 1;
-		}
-	}
-
-	diff = ((sljit_sw)target_addr - (sljit_sw)(inst)) >> 2;
-	if (diff <= MAX_DISP && diff >= MIN_DISP) {
-		jump->flags |= PATCH_B;
-		if (jump->flags & IS_COND)
-			inst[0] ^= (1 << 28);
-		else
-			inst[0] = BICC | DA(0x8);
-		inst[1] = NOP;
-		jump->addr = (sljit_uw)inst;
-		return inst + 1;
-	}
-
-	return code_ptr;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
-{
-	struct sljit_memory_fragment *buf;
-	sljit_ins *code;
-	sljit_ins *code_ptr;
-	sljit_ins *buf_ptr;
-	sljit_ins *buf_end;
-	sljit_uw word_count;
-	sljit_uw addr;
-
-	struct sljit_label *label;
-	struct sljit_jump *jump;
-	struct sljit_const *const_;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
-
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins));
-	PTR_FAIL_WITH_EXEC_IF(code);
-	buf = compiler->buf;
-
-	code_ptr = code;
-	word_count = 0;
-	label = compiler->labels;
-	jump = compiler->jumps;
-	const_ = compiler->consts;
-	do {
-		buf_ptr = (sljit_ins*)buf->memory;
-		buf_end = buf_ptr + (buf->used_size >> 2);
-		do {
-			*code_ptr = *buf_ptr++;
-			SLJIT_ASSERT(!label || label->size >= word_count);
-			SLJIT_ASSERT(!jump || jump->addr >= word_count);
-			SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-			/* These structures are ordered by their address. */
-			if (label && label->size == word_count) {
-				/* Just recording the address. */
-				label->addr = (sljit_uw)code_ptr;
-				label->size = code_ptr - code;
-				label = label->next;
-			}
-			if (jump && jump->addr == word_count) {
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-				jump->addr = (sljit_uw)(code_ptr - 3);
-#else
-				jump->addr = (sljit_uw)(code_ptr - 6);
-#endif
-				code_ptr = detect_jump_type(jump, code_ptr, code);
-				jump = jump->next;
-			}
-			if (const_ && const_->addr == word_count) {
-				/* Just recording the address. */
-				const_->addr = (sljit_uw)code_ptr;
-				const_ = const_->next;
-			}
-			code_ptr ++;
-			word_count ++;
-		} while (buf_ptr < buf_end);
-
-		buf = buf->next;
-	} while (buf);
-
-	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)code_ptr;
-		label->size = code_ptr - code;
-		label = label->next;
-	}
-
-	SLJIT_ASSERT(!label);
-	SLJIT_ASSERT(!jump);
-	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(code_ptr - code <= (sljit_si)compiler->size);
-
-	jump = compiler->jumps;
-	while (jump) {
-		do {
-			addr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
-			buf_ptr = (sljit_ins*)jump->addr;
-
-			if (jump->flags & PATCH_CALL) {
-				addr = (sljit_sw)(addr - jump->addr) >> 2;
-				SLJIT_ASSERT((sljit_sw)addr <= 0x1fffffff && (sljit_sw)addr >= -0x20000000);
-				buf_ptr[0] = CALL | (addr & 0x3fffffff);
-				break;
-			}
-			if (jump->flags & PATCH_B) {
-				addr = (sljit_sw)(addr - jump->addr) >> 2;
-				SLJIT_ASSERT((sljit_sw)addr <= MAX_DISP && (sljit_sw)addr >= MIN_DISP);
-				buf_ptr[0] = (buf_ptr[0] & ~DISP_MASK) | (addr & DISP_MASK);
-				break;
-			}
-
-			/* Set the fields of immediate loads. */
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-			buf_ptr[0] = (buf_ptr[0] & 0xffc00000) | ((addr >> 10) & 0x3fffff);
-			buf_ptr[1] = (buf_ptr[1] & 0xfffffc00) | (addr & 0x3ff);
-#else
-#error "Implementation required"
-#endif
-		} while (0);
-		jump = jump->next;
-	}
-
-
-	compiler->error = SLJIT_ERR_COMPILED;
-	compiler->executable_size = (code_ptr - code) * sizeof(sljit_ins);
-	SLJIT_CACHE_FLUSH(code, code_ptr);
-	return code;
-}
-
-/* --------------------------------------------------------------------- */
-/*  Entry, exit                                                          */
-/* --------------------------------------------------------------------- */
-
-/* Creates an index in data_transfer_insts array. */
-#define LOAD_DATA	0x01
-#define WORD_DATA	0x00
-#define BYTE_DATA	0x02
-#define HALF_DATA	0x04
-#define INT_DATA	0x06
-#define SIGNED_DATA	0x08
-/* Separates integer and floating point registers */
-#define GPR_REG		0x0f
-#define DOUBLE_DATA	0x10
-#define SINGLE_DATA	0x12
-
-#define MEM_MASK	0x1f
-
-#define WRITE_BACK	0x00020
-#define ARG_TEST	0x00040
-#define ALT_KEEP_CACHE	0x00080
-#define CUMULATIVE_OP	0x00100
-#define IMM_OP		0x00200
-#define SRC2_IMM	0x00400
-
-#define REG_DEST	0x00800
-#define REG2_SOURCE	0x01000
-#define SLOW_SRC1	0x02000
-#define SLOW_SRC2	0x04000
-#define SLOW_DEST	0x08000
-
-/* SET_FLAGS (0x10 << 19) also belong here! */
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-#include "sljitNativeSPARC_32.c"
-#else
-#include "sljitNativeSPARC_64.c"
-#endif
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	local_size = (local_size + SLJIT_LOCALS_OFFSET + 7) & ~0x7;
-	compiler->local_size = local_size;
-
-	if (local_size <= SIMM_MAX) {
-		FAIL_IF(push_inst(compiler, SAVE | D(SLJIT_SP) | S1(SLJIT_SP) | IMM(-local_size), UNMOVABLE_INS));
-	}
-	else {
-		FAIL_IF(load_immediate(compiler, TMP_REG1, -local_size));
-		FAIL_IF(push_inst(compiler, SAVE | D(SLJIT_SP) | S1(SLJIT_SP) | S2(TMP_REG1), UNMOVABLE_INS));
-	}
-
-	/* Arguments are in their appropriate registers. */
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	compiler->local_size = (local_size + SLJIT_LOCALS_OFFSET + 7) & ~0x7;
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_return(compiler, op, src, srcw));
-
-	if (op != SLJIT_MOV || !FAST_IS_REG(src)) {
-		FAIL_IF(emit_mov_before_return(compiler, op, src, srcw));
-		src = SLJIT_R0;
-	}
-
-	FAIL_IF(push_inst(compiler, JMPL | D(0) | S1A(31) | IMM(8), UNMOVABLE_INS));
-	return push_inst(compiler, RESTORE | D(SLJIT_R0) | S1(src) | S2(0), UNMOVABLE_INS);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Operators                                                            */
-/* --------------------------------------------------------------------- */
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-#define ARCH_32_64(a, b)	a
-#else
-#define ARCH_32_64(a, b)	b
-#endif
-
-static SLJIT_CONST sljit_ins data_transfer_insts[16 + 4] = {
-/* u w s */ ARCH_32_64(OPC1(3) | OPC3(0x04) /* stw */, OPC1(3) | OPC3(0x0e) /* stx */),
-/* u w l */ ARCH_32_64(OPC1(3) | OPC3(0x00) /* lduw */, OPC1(3) | OPC3(0x0b) /* ldx */),
-/* u b s */ OPC1(3) | OPC3(0x05) /* stb */,
-/* u b l */ OPC1(3) | OPC3(0x01) /* ldub */,
-/* u h s */ OPC1(3) | OPC3(0x06) /* sth */,
-/* u h l */ OPC1(3) | OPC3(0x02) /* lduh */,
-/* u i s */ OPC1(3) | OPC3(0x04) /* stw */,
-/* u i l */ OPC1(3) | OPC3(0x00) /* lduw */,
-
-/* s w s */ ARCH_32_64(OPC1(3) | OPC3(0x04) /* stw */, OPC1(3) | OPC3(0x0e) /* stx */),
-/* s w l */ ARCH_32_64(OPC1(3) | OPC3(0x00) /* lduw */, OPC1(3) | OPC3(0x0b) /* ldx */),
-/* s b s */ OPC1(3) | OPC3(0x05) /* stb */,
-/* s b l */ OPC1(3) | OPC3(0x09) /* ldsb */,
-/* s h s */ OPC1(3) | OPC3(0x06) /* sth */,
-/* s h l */ OPC1(3) | OPC3(0x0a) /* ldsh */,
-/* s i s */ OPC1(3) | OPC3(0x04) /* stw */,
-/* s i l */ ARCH_32_64(OPC1(3) | OPC3(0x00) /* lduw */, OPC1(3) | OPC3(0x08) /* ldsw */),
-
-/* d   s */ OPC1(3) | OPC3(0x27),
-/* d   l */ OPC1(3) | OPC3(0x23),
-/* s   s */ OPC1(3) | OPC3(0x24),
-/* s   l */ OPC1(3) | OPC3(0x20),
-};
-
-#undef ARCH_32_64
-
-/* Can perform an operation using at most 1 instruction. */
-static sljit_si getput_arg_fast(struct sljit_compiler *compiler, sljit_si flags, sljit_si reg, sljit_si arg, sljit_sw argw)
-{
-	SLJIT_ASSERT(arg & SLJIT_MEM);
-
-	if (!(flags & WRITE_BACK) || !(arg & REG_MASK)) {
-		if ((!(arg & OFFS_REG_MASK) && argw <= SIMM_MAX && argw >= SIMM_MIN)
-				|| ((arg & OFFS_REG_MASK) && (argw & 0x3) == 0)) {
-			/* Works for both absoulte and relative addresses (immediate case). */
-			if (SLJIT_UNLIKELY(flags & ARG_TEST))
-				return 1;
-			FAIL_IF(push_inst(compiler, data_transfer_insts[flags & MEM_MASK]
-				| ((flags & MEM_MASK) <= GPR_REG ? D(reg) : DA(reg))
-				| S1(arg & REG_MASK) | ((arg & OFFS_REG_MASK) ? S2(OFFS_REG(arg)) : IMM(argw)),
-				((flags & MEM_MASK) <= GPR_REG && (flags & LOAD_DATA)) ? DR(reg) : MOVABLE_INS));
-			return -1;
-		}
-	}
-	return 0;
-}
-
-/* See getput_arg below.
-   Note: can_cache is called only for binary operators. Those
-   operators always uses word arguments without write back. */
-static sljit_si can_cache(sljit_si arg, sljit_sw argw, sljit_si next_arg, sljit_sw next_argw)
-{
-	SLJIT_ASSERT((arg & SLJIT_MEM) && (next_arg & SLJIT_MEM));
-
-	/* Simple operation except for updates. */
-	if (arg & OFFS_REG_MASK) {
-		argw &= 0x3;
-		SLJIT_ASSERT(argw);
-		next_argw &= 0x3;
-		if ((arg & OFFS_REG_MASK) == (next_arg & OFFS_REG_MASK) && argw == next_argw)
-			return 1;
-		return 0;
-	}
-
-	if (((next_argw - argw) <= SIMM_MAX && (next_argw - argw) >= SIMM_MIN))
-		return 1;
-	return 0;
-}
-
-/* Emit the necessary instructions. See can_cache above. */
-static sljit_si getput_arg(struct sljit_compiler *compiler, sljit_si flags, sljit_si reg, sljit_si arg, sljit_sw argw, sljit_si next_arg, sljit_sw next_argw)
-{
-	sljit_si base, arg2, delay_slot;
-	sljit_ins dest;
-
-	SLJIT_ASSERT(arg & SLJIT_MEM);
-	if (!(next_arg & SLJIT_MEM)) {
-		next_arg = 0;
-		next_argw = 0;
-	}
-
-	base = arg & REG_MASK;
-	if (SLJIT_UNLIKELY(arg & OFFS_REG_MASK)) {
-		argw &= 0x3;
-		SLJIT_ASSERT(argw != 0);
-
-		/* Using the cache. */
-		if (((SLJIT_MEM | (arg & OFFS_REG_MASK)) == compiler->cache_arg) && (argw == compiler->cache_argw))
-			arg2 = TMP_REG3;
-		else {
-			if ((arg & OFFS_REG_MASK) == (next_arg & OFFS_REG_MASK) && argw == (next_argw & 0x3)) {
-				compiler->cache_arg = SLJIT_MEM | (arg & OFFS_REG_MASK);
-				compiler->cache_argw = argw;
-				arg2 = TMP_REG3;
-			}
-			else if ((flags & LOAD_DATA) && ((flags & MEM_MASK) <= GPR_REG) && reg != base && reg != OFFS_REG(arg))
-				arg2 = reg;
-			else /* It must be a mov operation, so tmp1 must be free to use. */
-				arg2 = TMP_REG1;
-			FAIL_IF(push_inst(compiler, SLL_W | D(arg2) | S1(OFFS_REG(arg)) | IMM_ARG | argw, DR(arg2)));
-		}
-	}
-	else {
-		/* Using the cache. */
-		if ((compiler->cache_arg == SLJIT_MEM) && (argw - compiler->cache_argw) <= SIMM_MAX && (argw - compiler->cache_argw) >= SIMM_MIN) {
-			if (argw != compiler->cache_argw) {
-				FAIL_IF(push_inst(compiler, ADD | D(TMP_REG3) | S1(TMP_REG3) | IMM(argw - compiler->cache_argw), DR(TMP_REG3)));
-				compiler->cache_argw = argw;
-			}
-			arg2 = TMP_REG3;
-		} else {
-			if ((next_argw - argw) <= SIMM_MAX && (next_argw - argw) >= SIMM_MIN) {
-				compiler->cache_arg = SLJIT_MEM;
-				compiler->cache_argw = argw;
-				arg2 = TMP_REG3;
-			}
-			else if ((flags & LOAD_DATA) && ((flags & MEM_MASK) <= GPR_REG) && reg != base)
-				arg2 = reg;
-			else /* It must be a mov operation, so tmp1 must be free to use. */
-				arg2 = TMP_REG1;
-			FAIL_IF(load_immediate(compiler, arg2, argw));
-		}
-	}
-
-	dest = ((flags & MEM_MASK) <= GPR_REG ? D(reg) : DA(reg));
-	delay_slot = ((flags & MEM_MASK) <= GPR_REG && (flags & LOAD_DATA)) ? DR(reg) : MOVABLE_INS;
-	if (!base)
-		return push_inst(compiler, data_transfer_insts[flags & MEM_MASK] | dest | S1(arg2) | IMM(0), delay_slot);
-	if (!(flags & WRITE_BACK))
-		return push_inst(compiler, data_transfer_insts[flags & MEM_MASK] | dest | S1(base) | S2(arg2), delay_slot);
-	FAIL_IF(push_inst(compiler, data_transfer_insts[flags & MEM_MASK] | dest | S1(base) | S2(arg2), delay_slot));
-	return push_inst(compiler, ADD | D(base) | S1(base) | S2(arg2), DR(base));
-}
-
-static SLJIT_INLINE sljit_si emit_op_mem(struct sljit_compiler *compiler, sljit_si flags, sljit_si reg, sljit_si arg, sljit_sw argw)
-{
-	if (getput_arg_fast(compiler, flags, reg, arg, argw))
-		return compiler->error;
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-	return getput_arg(compiler, flags, reg, arg, argw, 0, 0);
-}
-
-static SLJIT_INLINE sljit_si emit_op_mem2(struct sljit_compiler *compiler, sljit_si flags, sljit_si reg, sljit_si arg1, sljit_sw arg1w, sljit_si arg2, sljit_sw arg2w)
-{
-	if (getput_arg_fast(compiler, flags, reg, arg1, arg1w))
-		return compiler->error;
-	return getput_arg(compiler, flags, reg, arg1, arg1w, arg2, arg2w);
-}
-
-static sljit_si emit_op(struct sljit_compiler *compiler, sljit_si op, sljit_si flags,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	/* arg1 goes to TMP_REG1 or src reg
-	   arg2 goes to TMP_REG2, imm or src reg
-	   TMP_REG3 can be used for caching
-	   result goes to TMP_REG2, so put result can use TMP_REG1 and TMP_REG3. */
-	sljit_si dst_r = TMP_REG2;
-	sljit_si src1_r;
-	sljit_sw src2_r = 0;
-	sljit_si sugg_src2_r = TMP_REG2;
-
-	if (!(flags & ALT_KEEP_CACHE)) {
-		compiler->cache_arg = 0;
-		compiler->cache_argw = 0;
-	}
-
-	if (SLJIT_UNLIKELY(dst == SLJIT_UNUSED)) {
-		if (op >= SLJIT_MOV && op <= SLJIT_MOVU_SI && !(src2 & SLJIT_MEM))
-			return SLJIT_SUCCESS;
-	}
-	else if (FAST_IS_REG(dst)) {
-		dst_r = dst;
-		flags |= REG_DEST;
-		if (op >= SLJIT_MOV && op <= SLJIT_MOVU_SI)
-			sugg_src2_r = dst_r;
-	}
-	else if ((dst & SLJIT_MEM) && !getput_arg_fast(compiler, flags | ARG_TEST, TMP_REG1, dst, dstw))
-		flags |= SLOW_DEST;
-
-	if (flags & IMM_OP) {
-		if ((src2 & SLJIT_IMM) && src2w) {
-			if (src2w <= SIMM_MAX && src2w >= SIMM_MIN) {
-				flags |= SRC2_IMM;
-				src2_r = src2w;
-			}
-		}
-		if (!(flags & SRC2_IMM) && (flags & CUMULATIVE_OP) && (src1 & SLJIT_IMM) && src1w) {
-			if (src1w <= SIMM_MAX && src1w >= SIMM_MIN) {
-				flags |= SRC2_IMM;
-				src2_r = src1w;
-
-				/* And swap arguments. */
-				src1 = src2;
-				src1w = src2w;
-				src2 = SLJIT_IMM;
-				/* src2w = src2_r unneeded. */
-			}
-		}
-	}
-
-	/* Source 1. */
-	if (FAST_IS_REG(src1))
-		src1_r = src1;
-	else if (src1 & SLJIT_IMM) {
-		if (src1w) {
-			FAIL_IF(load_immediate(compiler, TMP_REG1, src1w));
-			src1_r = TMP_REG1;
-		}
-		else
-			src1_r = 0;
-	}
-	else {
-		if (getput_arg_fast(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w))
-			FAIL_IF(compiler->error);
-		else
-			flags |= SLOW_SRC1;
-		src1_r = TMP_REG1;
-	}
-
-	/* Source 2. */
-	if (FAST_IS_REG(src2)) {
-		src2_r = src2;
-		flags |= REG2_SOURCE;
-		if (!(flags & REG_DEST) && op >= SLJIT_MOV && op <= SLJIT_MOVU_SI)
-			dst_r = src2_r;
-	}
-	else if (src2 & SLJIT_IMM) {
-		if (!(flags & SRC2_IMM)) {
-			if (src2w) {
-				FAIL_IF(load_immediate(compiler, sugg_src2_r, src2w));
-				src2_r = sugg_src2_r;
-			}
-			else {
-				src2_r = 0;
-				if ((op >= SLJIT_MOV && op <= SLJIT_MOVU_SI) && (dst & SLJIT_MEM))
-					dst_r = 0;
-			}
-		}
-	}
-	else {
-		if (getput_arg_fast(compiler, flags | LOAD_DATA, sugg_src2_r, src2, src2w))
-			FAIL_IF(compiler->error);
-		else
-			flags |= SLOW_SRC2;
-		src2_r = sugg_src2_r;
-	}
-
-	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
-		SLJIT_ASSERT(src2_r == TMP_REG2);
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG2, src2, src2w, src1, src1w));
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
-		}
-		else {
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG2, src2, src2w, dst, dstw));
-		}
-	}
-	else if (flags & SLOW_SRC1)
-		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
-	else if (flags & SLOW_SRC2)
-		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, sugg_src2_r, src2, src2w, dst, dstw));
-
-	FAIL_IF(emit_single_op(compiler, op, flags, dst_r, src1_r, src2_r));
-
-	if (dst & SLJIT_MEM) {
-		if (!(flags & SLOW_DEST)) {
-			getput_arg_fast(compiler, flags, dst_r, dst, dstw);
-			return compiler->error;
-		}
-		return getput_arg(compiler, flags, dst_r, dst, dstw, 0, 0);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op0(compiler, op));
-
-	op = GET_OPCODE(op);
-	switch (op) {
-	case SLJIT_BREAKPOINT:
-		return push_inst(compiler, TA, UNMOVABLE_INS);
-	case SLJIT_NOP:
-		return push_inst(compiler, NOP, UNMOVABLE_INS);
-	case SLJIT_LUMUL:
-	case SLJIT_LSMUL:
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-		FAIL_IF(push_inst(compiler, (op == SLJIT_LUMUL ? UMUL : SMUL) | D(SLJIT_R0) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R0)));
-		return push_inst(compiler, RDY | D(SLJIT_R1), DR(SLJIT_R1));
-#else
-#error "Implementation required"
-#endif
-	case SLJIT_UDIVMOD:
-	case SLJIT_SDIVMOD:
-	case SLJIT_UDIVI:
-	case SLJIT_SDIVI:
-		SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments);
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-		if ((op | 0x2) == SLJIT_UDIVI)
-			FAIL_IF(push_inst(compiler, WRY | S1(0), MOVABLE_INS));
-		else {
-			FAIL_IF(push_inst(compiler, SRA | D(TMP_REG1) | S1(SLJIT_R0) | IMM(31), DR(TMP_REG1)));
-			FAIL_IF(push_inst(compiler, WRY | S1(TMP_REG1), MOVABLE_INS));
-		}
-		if (op <= SLJIT_SDIVMOD)
-			FAIL_IF(push_inst(compiler, OR | D(TMP_REG2) | S1(0) | S2(SLJIT_R0), DR(TMP_REG2)));
-		FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? UDIV : SDIV) | D(SLJIT_R0) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R0)));
-		if (op >= SLJIT_UDIVI)
-			return SLJIT_SUCCESS;
-		FAIL_IF(push_inst(compiler, SMUL | D(SLJIT_R1) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R1)));
-		return push_inst(compiler, SUB | D(SLJIT_R1) | S1(TMP_REG2) | S2(SLJIT_R1), DR(SLJIT_R1));
-#else
-#error "Implementation required"
-#endif
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si flags = GET_FLAGS(op) ? SET_FLAGS : 0;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op1(compiler, op, dst, dstw, src, srcw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	op = GET_OPCODE(op);
-	switch (op) {
-	case SLJIT_MOV:
-	case SLJIT_MOV_P:
-		return emit_op(compiler, SLJIT_MOV, flags | WORD_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_MOV_UI:
-		return emit_op(compiler, SLJIT_MOV_UI, flags | INT_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_MOV_SI:
-		return emit_op(compiler, SLJIT_MOV_SI, flags | INT_DATA | SIGNED_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_MOV_UB:
-		return emit_op(compiler, SLJIT_MOV_UB, flags | BYTE_DATA, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_ub)srcw : srcw);
-
-	case SLJIT_MOV_SB:
-		return emit_op(compiler, SLJIT_MOV_SB, flags | BYTE_DATA | SIGNED_DATA, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_sb)srcw : srcw);
-
-	case SLJIT_MOV_UH:
-		return emit_op(compiler, SLJIT_MOV_UH, flags | HALF_DATA, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_uh)srcw : srcw);
-
-	case SLJIT_MOV_SH:
-		return emit_op(compiler, SLJIT_MOV_SH, flags | HALF_DATA | SIGNED_DATA, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_sh)srcw : srcw);
-
-	case SLJIT_MOVU:
-	case SLJIT_MOVU_P:
-		return emit_op(compiler, SLJIT_MOV, flags | WORD_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_MOVU_UI:
-		return emit_op(compiler, SLJIT_MOV_UI, flags | INT_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_MOVU_SI:
-		return emit_op(compiler, SLJIT_MOV_SI, flags | INT_DATA | SIGNED_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_MOVU_UB:
-		return emit_op(compiler, SLJIT_MOV_UB, flags | BYTE_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_ub)srcw : srcw);
-
-	case SLJIT_MOVU_SB:
-		return emit_op(compiler, SLJIT_MOV_SB, flags | BYTE_DATA | SIGNED_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_sb)srcw : srcw);
-
-	case SLJIT_MOVU_UH:
-		return emit_op(compiler, SLJIT_MOV_UH, flags | HALF_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_uh)srcw : srcw);
-
-	case SLJIT_MOVU_SH:
-		return emit_op(compiler, SLJIT_MOV_SH, flags | HALF_DATA | SIGNED_DATA | WRITE_BACK, dst, dstw, TMP_REG1, 0, src, (src & SLJIT_IMM) ? (sljit_sh)srcw : srcw);
-
-	case SLJIT_NOT:
-	case SLJIT_CLZ:
-		return emit_op(compiler, op, flags, dst, dstw, TMP_REG1, 0, src, srcw);
-
-	case SLJIT_NEG:
-		return emit_op(compiler, SLJIT_SUB, flags | IMM_OP, dst, dstw, SLJIT_IMM, 0, src, srcw);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_si flags = GET_FLAGS(op) ? SET_FLAGS : 0;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op2(compiler, op, dst, dstw, src1, src1w, src2, src2w));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-	ADJUST_LOCAL_OFFSET(src2, src2w);
-
-	op = GET_OPCODE(op);
-	switch (op) {
-	case SLJIT_ADD:
-	case SLJIT_ADDC:
-	case SLJIT_MUL:
-	case SLJIT_AND:
-	case SLJIT_OR:
-	case SLJIT_XOR:
-		return emit_op(compiler, op, flags | CUMULATIVE_OP | IMM_OP, dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_SUB:
-	case SLJIT_SUBC:
-		return emit_op(compiler, op, flags | IMM_OP, dst, dstw, src1, src1w, src2, src2w);
-
-	case SLJIT_SHL:
-	case SLJIT_LSHR:
-	case SLJIT_ASHR:
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-		if (src2 & SLJIT_IMM)
-			src2w &= 0x1f;
-#else
-		SLJIT_ASSERT_STOP();
-#endif
-		return emit_op(compiler, op, flags | IMM_OP, dst, dstw, src1, src1w, src2, src2w);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg)
-{
-	CHECK_REG_INDEX(check_sljit_get_register_index(reg));
-	return reg_map[reg];
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_float_register_index(sljit_si reg)
-{
-	CHECK_REG_INDEX(check_sljit_get_float_register_index(reg));
-	return reg << 1;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler,
-	void *instruction, sljit_si size)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op_custom(compiler, instruction, size));
-
-	return push_inst(compiler, *(sljit_ins*)instruction, UNMOVABLE_INS);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Floating point operators                                             */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_is_fpu_available(void)
-{
-#ifdef SLJIT_IS_FPU_AVAILABLE
-	return SLJIT_IS_FPU_AVAILABLE;
-#else
-	/* Available by default. */
-	return 1;
-#endif
-}
-
-#define FLOAT_DATA(op) (DOUBLE_DATA | ((op & SLJIT_SINGLE_OP) >> 7))
-#define SELECT_FOP(op, single, double) ((op & SLJIT_SINGLE_OP) ? single : double)
-#define FLOAT_TMP_MEM_OFFSET (22 * sizeof(sljit_sw))
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_convw_fromd(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	if (src & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src, srcw, dst, dstw));
-		src = TMP_FREG1;
-	}
-	else
-		src <<= 1;
-
-	FAIL_IF(push_inst(compiler, SELECT_FOP(op, FSTOI, FDTOI) | DA(TMP_FREG1) | S2A(src), MOVABLE_INS));
-
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-	if (FAST_IS_REG(dst)) {
-		FAIL_IF(emit_op_mem2(compiler, SINGLE_DATA, TMP_FREG1, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET));
-		return emit_op_mem2(compiler, WORD_DATA | LOAD_DATA, dst, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET);
-	}
-
-	/* Store the integer value from a VFP register. */
-	return emit_op_mem2(compiler, SINGLE_DATA, TMP_FREG1, dst, dstw, 0, 0);
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_convd_fromw(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si dst_r = FAST_IS_REG(dst) ? (dst << 1) : TMP_FREG1;
-
-	if (src & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if (GET_OPCODE(op) == SLJIT_CONVD_FROMI)
-			srcw = (sljit_si)srcw;
-#endif
-		FAIL_IF(load_immediate(compiler, TMP_REG1, srcw));
-		src = TMP_REG1;
-		srcw = 0;
-	}
-
-	if (FAST_IS_REG(src)) {
-		FAIL_IF(emit_op_mem2(compiler, WORD_DATA, src, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET, SLJIT_MEM1(SLJIT_SP), FLOAT_TMP_MEM_OFFSET));
-		src = SLJIT_MEM1(SLJIT_SP);
-		srcw = FLOAT_TMP_MEM_OFFSET;
-	}
-
-	FAIL_IF(emit_op_mem2(compiler, SINGLE_DATA | LOAD_DATA, TMP_FREG1, src, srcw, dst, dstw));
-	FAIL_IF(push_inst(compiler, SELECT_FOP(op, FITOS, FITOD) | DA(dst_r) | S2A(TMP_FREG1), MOVABLE_INS));
-
-	if (dst & SLJIT_MEM)
-		return emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG1, dst, dstw, 0, 0);
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_cmp(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, src2, src2w));
-		src1 = TMP_FREG1;
-	}
-	else
-		src1 <<= 1;
-
-	if (src2 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, 0, 0));
-		src2 = TMP_FREG2;
-	}
-	else
-		src2 <<= 1;
-
-	return push_inst(compiler, SELECT_FOP(op, FCMPS, FCMPD) | S1A(src1) | S2A(src2), FCC_IS_SET | MOVABLE_INS);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si dst_r;
-
-	CHECK_ERROR();
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-
-	SLJIT_COMPILE_ASSERT((SLJIT_SINGLE_OP == 0x100) && !(DOUBLE_DATA & 0x2), float_transfer_bit_error);
-	SELECT_FOP1_OPERATION_WITH_CHECKS(compiler, op, dst, dstw, src, srcw);
-
-	if (GET_OPCODE(op) == SLJIT_CONVD_FROMS)
-		op ^= SLJIT_SINGLE_OP;
-
-	dst_r = FAST_IS_REG(dst) ? (dst << 1) : TMP_FREG1;
-
-	if (src & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op) | LOAD_DATA, dst_r, src, srcw, dst, dstw));
-		src = dst_r;
-	}
-	else
-		src <<= 1;
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_DMOV:
-		if (src != dst_r) {
-			if (dst_r != TMP_FREG1) {
-				FAIL_IF(push_inst(compiler, FMOVS | DA(dst_r) | S2A(src), MOVABLE_INS));
-				if (!(op & SLJIT_SINGLE_OP))
-					FAIL_IF(push_inst(compiler, FMOVS | DA(dst_r | 1) | S2A(src | 1), MOVABLE_INS));
-			}
-			else
-				dst_r = src;
-		}
-		break;
-	case SLJIT_DNEG:
-		FAIL_IF(push_inst(compiler, FNEGS | DA(dst_r) | S2A(src), MOVABLE_INS));
-		if (dst_r != src && !(op & SLJIT_SINGLE_OP))
-			FAIL_IF(push_inst(compiler, FMOVS | DA(dst_r | 1) | S2A(src | 1), MOVABLE_INS));
-		break;
-	case SLJIT_DABS:
-		FAIL_IF(push_inst(compiler, FABSS | DA(dst_r) | S2A(src), MOVABLE_INS));
-		if (dst_r != src && !(op & SLJIT_SINGLE_OP))
-			FAIL_IF(push_inst(compiler, FMOVS | DA(dst_r | 1) | S2A(src | 1), MOVABLE_INS));
-		break;
-	case SLJIT_CONVD_FROMS:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FSTOD, FDTOS) | DA(dst_r) | S2A(src), MOVABLE_INS));
-		op ^= SLJIT_SINGLE_OP;
-		break;
-	}
-
-	if (dst & SLJIT_MEM)
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op), dst_r, dst, dstw, 0, 0));
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_si dst_r, flags = 0;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fop2(compiler, op, dst, dstw, src1, src1w, src2, src2w));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-	ADJUST_LOCAL_OFFSET(src2, src2w);
-
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-
-	dst_r = FAST_IS_REG(dst) ? (dst << 1) : TMP_FREG2;
-
-	if (src1 & SLJIT_MEM) {
-		if (getput_arg_fast(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w)) {
-			FAIL_IF(compiler->error);
-			src1 = TMP_FREG1;
-		} else
-			flags |= SLOW_SRC1;
-	}
-	else
-		src1 <<= 1;
-
-	if (src2 & SLJIT_MEM) {
-		if (getput_arg_fast(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w)) {
-			FAIL_IF(compiler->error);
-			src2 = TMP_FREG2;
-		} else
-			flags |= SLOW_SRC2;
-	}
-	else
-		src2 <<= 1;
-
-	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, src1, src1w));
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, dst, dstw));
-		}
-		else {
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, src2, src2w));
-			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, dst, dstw));
-		}
-	}
-	else if (flags & SLOW_SRC1)
-		FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, dst, dstw));
-	else if (flags & SLOW_SRC2)
-		FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, dst, dstw));
-
-	if (flags & SLOW_SRC1)
-		src1 = TMP_FREG1;
-	if (flags & SLOW_SRC2)
-		src2 = TMP_FREG2;
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_DADD:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FADDS, FADDD) | DA(dst_r) | S1A(src1) | S2A(src2), MOVABLE_INS));
-		break;
-
-	case SLJIT_DSUB:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FSUBS, FSUBD) | DA(dst_r) | S1A(src1) | S2A(src2), MOVABLE_INS));
-		break;
-
-	case SLJIT_DMUL:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FMULS, FMULD) | DA(dst_r) | S1A(src1) | S2A(src2), MOVABLE_INS));
-		break;
-
-	case SLJIT_DDIV:
-		FAIL_IF(push_inst(compiler, SELECT_FOP(op, FDIVS, FDIVD) | DA(dst_r) | S1A(src1) | S2A(src2), MOVABLE_INS));
-		break;
-	}
-
-	if (dst_r == TMP_FREG2)
-		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG2, dst, dstw, 0, 0));
-
-	return SLJIT_SUCCESS;
-}
-
-#undef FLOAT_DATA
-#undef SELECT_FOP
-
-/* --------------------------------------------------------------------- */
-/*  Other instructions                                                   */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_enter(compiler, dst, dstw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	/* For UNUSED dst. Uncommon, but possible. */
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-	if (FAST_IS_REG(dst))
-		return push_inst(compiler, OR | D(dst) | S1(0) | S2(TMP_LINK), DR(dst));
-
-	/* Memory. */
-	return emit_op_mem(compiler, WORD_DATA, TMP_LINK, dst, dstw);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_return(compiler, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	if (FAST_IS_REG(src))
-		FAIL_IF(push_inst(compiler, OR | D(TMP_LINK) | S1(0) | S2(src), DR(TMP_LINK)));
-	else if (src & SLJIT_MEM)
-		FAIL_IF(emit_op_mem(compiler, WORD_DATA | LOAD_DATA, TMP_LINK, src, srcw));
-	else if (src & SLJIT_IMM)
-		FAIL_IF(load_immediate(compiler, TMP_LINK, srcw));
-
-	FAIL_IF(push_inst(compiler, JMPL | D(0) | S1(TMP_LINK) | IMM(8), UNMOVABLE_INS));
-	return push_inst(compiler, NOP, UNMOVABLE_INS);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Conditional instructions                                             */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compiler *compiler)
-{
-	struct sljit_label *label;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_label(compiler));
-
-	if (compiler->last_label && compiler->last_label->size == compiler->size)
-		return compiler->last_label;
-
-	label = (struct sljit_label*)ensure_abuf(compiler, sizeof(struct sljit_label));
-	PTR_FAIL_IF(!label);
-	set_label(label, compiler);
-	compiler->delay_slot = UNMOVABLE_INS;
-	return label;
-}
-
-static sljit_ins get_cc(sljit_si type)
-{
-	switch (type) {
-	case SLJIT_EQUAL:
-	case SLJIT_MUL_NOT_OVERFLOW:
-	case SLJIT_D_NOT_EQUAL: /* Unordered. */
-		return DA(0x1);
-
-	case SLJIT_NOT_EQUAL:
-	case SLJIT_MUL_OVERFLOW:
-	case SLJIT_D_EQUAL:
-		return DA(0x9);
-
-	case SLJIT_LESS:
-	case SLJIT_D_GREATER: /* Unordered. */
-		return DA(0x5);
-
-	case SLJIT_GREATER_EQUAL:
-	case SLJIT_D_LESS_EQUAL:
-		return DA(0xd);
-
-	case SLJIT_GREATER:
-	case SLJIT_D_GREATER_EQUAL: /* Unordered. */
-		return DA(0xc);
-
-	case SLJIT_LESS_EQUAL:
-	case SLJIT_D_LESS:
-		return DA(0x4);
-
-	case SLJIT_SIG_LESS:
-		return DA(0x3);
-
-	case SLJIT_SIG_GREATER_EQUAL:
-		return DA(0xb);
-
-	case SLJIT_SIG_GREATER:
-		return DA(0xa);
-
-	case SLJIT_SIG_LESS_EQUAL:
-		return DA(0x2);
-
-	case SLJIT_OVERFLOW:
-	case SLJIT_D_UNORDERED:
-		return DA(0x7);
-
-	case SLJIT_NOT_OVERFLOW:
-	case SLJIT_D_ORDERED:
-		return DA(0xf);
-
-	default:
-		SLJIT_ASSERT_STOP();
-		return DA(0x8);
-	}
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compiler *compiler, sljit_si type)
-{
-	struct sljit_jump *jump;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_jump(compiler, type));
-
-	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
-	PTR_FAIL_IF(!jump);
-	set_jump(jump, compiler, type & SLJIT_REWRITABLE_JUMP);
-	type &= 0xff;
-
-	if (type < SLJIT_D_EQUAL) {
-		jump->flags |= IS_COND;
-		if (((compiler->delay_slot & DST_INS_MASK) != UNMOVABLE_INS) && !(compiler->delay_slot & ICC_IS_SET))
-			jump->flags |= IS_MOVABLE;
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-		PTR_FAIL_IF(push_inst(compiler, BICC | get_cc(type ^ 1) | 5, UNMOVABLE_INS));
-#else
-#error "Implementation required"
-#endif
-	}
-	else if (type < SLJIT_JUMP) {
-		jump->flags |= IS_COND;
-		if (((compiler->delay_slot & DST_INS_MASK) != UNMOVABLE_INS) && !(compiler->delay_slot & FCC_IS_SET))
-			jump->flags |= IS_MOVABLE;
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-		PTR_FAIL_IF(push_inst(compiler, FBFCC | get_cc(type ^ 1) | 5, UNMOVABLE_INS));
-#else
-#error "Implementation required"
-#endif
-	} else {
-		if ((compiler->delay_slot & DST_INS_MASK) != UNMOVABLE_INS)
-			jump->flags |= IS_MOVABLE;
-		if (type >= SLJIT_FAST_CALL)
-			jump->flags |= IS_CALL;
-	}
-
-	PTR_FAIL_IF(emit_const(compiler, TMP_REG2, 0));
-	PTR_FAIL_IF(push_inst(compiler, JMPL | D(type >= SLJIT_FAST_CALL ? TMP_LINK : 0) | S1(TMP_REG2) | IMM(0), UNMOVABLE_INS));
-	jump->addr = compiler->size;
-	PTR_FAIL_IF(push_inst(compiler, NOP, UNMOVABLE_INS));
-
-	return jump;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_ijump(struct sljit_compiler *compiler, sljit_si type, sljit_si src, sljit_sw srcw)
-{
-	struct sljit_jump *jump = NULL;
-	sljit_si src_r;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_ijump(compiler, type, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	if (FAST_IS_REG(src))
-		src_r = src;
-	else if (src & SLJIT_IMM) {
-		jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
-		FAIL_IF(!jump);
-		set_jump(jump, compiler, JUMP_ADDR);
-		jump->u.target = srcw;
-		if ((compiler->delay_slot & DST_INS_MASK) != UNMOVABLE_INS)
-			jump->flags |= IS_MOVABLE;
-		if (type >= SLJIT_FAST_CALL)
-			jump->flags |= IS_CALL;
-
-		FAIL_IF(emit_const(compiler, TMP_REG2, 0));
-		src_r = TMP_REG2;
-	}
-	else {
-		FAIL_IF(emit_op_mem(compiler, WORD_DATA | LOAD_DATA, TMP_REG2, src, srcw));
-		src_r = TMP_REG2;
-	}
-
-	FAIL_IF(push_inst(compiler, JMPL | D(type >= SLJIT_FAST_CALL ? TMP_LINK : 0) | S1(src_r) | IMM(0), UNMOVABLE_INS));
-	if (jump)
-		jump->addr = compiler->size;
-	return push_inst(compiler, NOP, UNMOVABLE_INS);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_flags(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw,
-	sljit_si type)
-{
-	sljit_si reg, flags = (GET_FLAGS(op) ? SET_FLAGS : 0);
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op_flags(compiler, op, dst, dstw, src, srcw, type));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-#if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32)
-	op = GET_OPCODE(op);
-	reg = (op < SLJIT_ADD && FAST_IS_REG(dst)) ? dst : TMP_REG2;
-
-	compiler->cache_arg = 0;
-	compiler->cache_argw = 0;
-	if (op >= SLJIT_ADD && (src & SLJIT_MEM)) {
-		ADJUST_LOCAL_OFFSET(src, srcw);
-		FAIL_IF(emit_op_mem2(compiler, WORD_DATA | LOAD_DATA, TMP_REG1, src, srcw, dst, dstw));
-		src = TMP_REG1;
-		srcw = 0;
-	}
-
-	type &= 0xff;
-	if (type < SLJIT_D_EQUAL)
-		FAIL_IF(push_inst(compiler, BICC | get_cc(type) | 3, UNMOVABLE_INS));
-	else
-		FAIL_IF(push_inst(compiler, FBFCC | get_cc(type) | 3, UNMOVABLE_INS));
-
-	FAIL_IF(push_inst(compiler, OR | D(reg) | S1(0) | IMM(1), UNMOVABLE_INS));
-	FAIL_IF(push_inst(compiler, OR | D(reg) | S1(0) | IMM(0), UNMOVABLE_INS));
-
-	if (op >= SLJIT_ADD)
-		return emit_op(compiler, op, flags | CUMULATIVE_OP | IMM_OP | ALT_KEEP_CACHE, dst, dstw, src, srcw, TMP_REG2, 0);
-
-	return (reg == TMP_REG2) ? emit_op_mem(compiler, WORD_DATA, TMP_REG2, dst, dstw) : SLJIT_SUCCESS;
-#else
-#error "Implementation required"
-#endif
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value)
-{
-	sljit_si reg;
-	struct sljit_const *const_;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_const(compiler, dst, dstw, init_value));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	const_ = (struct sljit_const*)ensure_abuf(compiler, sizeof(struct sljit_const));
-	PTR_FAIL_IF(!const_);
-	set_const(const_, compiler);
-
-	reg = SLOW_IS_REG(dst) ? dst : TMP_REG2;
-
-	PTR_FAIL_IF(emit_const(compiler, reg, init_value));
-
-	if (dst & SLJIT_MEM)
-		PTR_FAIL_IF(emit_op_mem(compiler, WORD_DATA, TMP_REG2, dst, dstw));
-	return const_;
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativeX86_32.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativeX86_32.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativeX86_32.c	2015-05-13 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativeX86_32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,550 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* x86 32-bit arch dependent functions. */
-
-static sljit_si emit_do_imm(struct sljit_compiler *compiler, sljit_ub opcode, sljit_sw imm)
-{
-	sljit_ub *inst;
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 1 + sizeof(sljit_sw));
-	FAIL_IF(!inst);
-	INC_SIZE(1 + sizeof(sljit_sw));
-	*inst++ = opcode;
-	*(sljit_sw*)inst = imm;
-	return SLJIT_SUCCESS;
-}
-
-static sljit_ub* generate_far_jump_code(struct sljit_jump *jump, sljit_ub *code_ptr, sljit_si type)
-{
-	if (type == SLJIT_JUMP) {
-		*code_ptr++ = JMP_i32;
-		jump->addr++;
-	}
-	else if (type >= SLJIT_FAST_CALL) {
-		*code_ptr++ = CALL_i32;
-		jump->addr++;
-	}
-	else {
-		*code_ptr++ = GROUP_0F;
-		*code_ptr++ = get_jump_code(type);
-		jump->addr += 2;
-	}
-
-	if (jump->flags & JUMP_LABEL)
-		jump->flags |= PATCH_MW;
-	else
-		*(sljit_sw*)code_ptr = jump->u.target - (jump->addr + 4);
-	code_ptr += 4;
-
-	return code_ptr;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	sljit_si size;
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	compiler->args = args;
-	compiler->flags_saved = 0;
-
-	size = 1 + (scratches > 7 ? (scratches - 7) : 0) + (saveds <= 3 ? saveds : 3);
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-	size += (args > 0 ? (args * 2) : 0) + (args > 2 ? 2 : 0);
-#else
-	size += (args > 0 ? (2 + args * 3) : 0);
-#endif
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-	FAIL_IF(!inst);
-
-	INC_SIZE(size);
-	PUSH_REG(reg_map[TMP_REG1]);
-#if !(defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-	if (args > 0) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (reg_map[TMP_REG1] << 3) | 0x4 /* esp */;
-	}
-#endif
-	if (saveds > 2 || scratches > 7)
-		PUSH_REG(reg_map[SLJIT_S2]);
-	if (saveds > 1 || scratches > 8)
-		PUSH_REG(reg_map[SLJIT_S1]);
-	if (saveds > 0 || scratches > 9)
-		PUSH_REG(reg_map[SLJIT_S0]);
-
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-	if (args > 0) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | reg_map[SLJIT_R2];
-	}
-	if (args > 1) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (reg_map[SLJIT_S1] << 3) | reg_map[SLJIT_R1];
-	}
-	if (args > 2) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 0x4 /* esp */;
-		*inst++ = 0x24;
-		*inst++ = sizeof(sljit_sw) * (3 + 2); /* saveds >= 3 as well. */
-	}
-#else
-	if (args > 0) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_DISP8 | (reg_map[SLJIT_S0] << 3) | reg_map[TMP_REG1];
-		*inst++ = sizeof(sljit_sw) * 2;
-	}
-	if (args > 1) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_DISP8 | (reg_map[SLJIT_S1] << 3) | reg_map[TMP_REG1];
-		*inst++ = sizeof(sljit_sw) * 3;
-	}
-	if (args > 2) {
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | reg_map[TMP_REG1];
-		*inst++ = sizeof(sljit_sw) * 4;
-	}
-#endif
-
-	SLJIT_COMPILE_ASSERT(SLJIT_LOCALS_OFFSET >= (2 + 4) * sizeof(sljit_uw), require_at_least_two_words);
-#if defined(__APPLE__)
-	/* Ignore pushed registers and SLJIT_LOCALS_OFFSET when computing the aligned local size. */
-	saveds = (2 + (scratches > 7 ? (scratches - 7) : 0) + (saveds <= 3 ? saveds : 3)) * sizeof(sljit_uw);
-	local_size = ((SLJIT_LOCALS_OFFSET + saveds + local_size + 15) & ~15) - saveds;
-#else
-	if (options & SLJIT_DOUBLE_ALIGNMENT) {
-		local_size = SLJIT_LOCALS_OFFSET + ((local_size + 7) & ~7);
-
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 17);
-		FAIL_IF(!inst);
-
-		INC_SIZE(17);
-		inst[0] = MOV_r_rm;
-		inst[1] = MOD_REG | (reg_map[TMP_REG1] << 3) | reg_map[SLJIT_SP];
-		inst[2] = GROUP_F7;
-		inst[3] = MOD_REG | (0 << 3) | reg_map[SLJIT_SP];
-		*(sljit_sw*)(inst + 4) = 0x4;
-		inst[8] = JNE_i8;
-		inst[9] = 6;
-		inst[10] = GROUP_BINARY_81;
-		inst[11] = MOD_REG | (5 << 3) | reg_map[SLJIT_SP];
-		*(sljit_sw*)(inst + 12) = 0x4;
-		inst[16] = PUSH_r + reg_map[TMP_REG1];
-	}
-	else
-		local_size = SLJIT_LOCALS_OFFSET + ((local_size + 3) & ~3);
-#endif
-
-	compiler->local_size = local_size;
-#ifdef _WIN32
-	if (local_size > 1024) {
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-		FAIL_IF(emit_do_imm(compiler, MOV_r_i32 + reg_map[SLJIT_R0], local_size));
-#else
-		local_size -= SLJIT_LOCALS_OFFSET;
-		FAIL_IF(emit_do_imm(compiler, MOV_r_i32 + reg_map[SLJIT_R0], local_size));
-		FAIL_IF(emit_non_cum_binary(compiler, SUB_r_rm, SUB_rm_r, SUB, SUB_EAX_i32,
-			SLJIT_SP, 0, SLJIT_SP, 0, SLJIT_IMM, SLJIT_LOCALS_OFFSET));
-#endif
-		FAIL_IF(sljit_emit_ijump(compiler, SLJIT_CALL1, SLJIT_IMM, SLJIT_FUNC_OFFSET(sljit_grow_stack)));
-	}
-#endif
-
-	SLJIT_ASSERT(local_size > 0);
-	return emit_non_cum_binary(compiler, SUB_r_rm, SUB_rm_r, SUB, SUB_EAX_i32,
-		SLJIT_SP, 0, SLJIT_SP, 0, SLJIT_IMM, local_size);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	compiler->args = args;
-
-#if defined(__APPLE__)
-	saveds = (2 + (scratches > 7 ? (scratches - 7) : 0) + (saveds <= 3 ? saveds : 3)) * sizeof(sljit_uw);
-	compiler->local_size = ((SLJIT_LOCALS_OFFSET + saveds + local_size + 15) & ~15) - saveds;
-#else
-	if (options & SLJIT_DOUBLE_ALIGNMENT)
-		compiler->local_size = SLJIT_LOCALS_OFFSET + ((local_size + 7) & ~7);
-	else
-		compiler->local_size = SLJIT_LOCALS_OFFSET + ((local_size + 3) & ~3);
-#endif
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-	sljit_si size;
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_return(compiler, op, src, srcw));
-	SLJIT_ASSERT(compiler->args >= 0);
-
-	compiler->flags_saved = 0;
-	FAIL_IF(emit_mov_before_return(compiler, op, src, srcw));
-
-	SLJIT_ASSERT(compiler->local_size > 0);
-	FAIL_IF(emit_cum_binary(compiler, ADD_r_rm, ADD_rm_r, ADD, ADD_EAX_i32,
-		SLJIT_SP, 0, SLJIT_SP, 0, SLJIT_IMM, compiler->local_size));
-
-#if !defined(__APPLE__)
-	if (compiler->options & SLJIT_DOUBLE_ALIGNMENT) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 3);
-		FAIL_IF(!inst);
-
-		INC_SIZE(3);
-		inst[0] = MOV_r_rm;
-		inst[1] = (reg_map[SLJIT_SP] << 3) | 0x4 /* SIB */;
-		inst[2] = (4 << 3) | reg_map[SLJIT_SP];
-	}
-#endif
-
-	size = 2 + (compiler->scratches > 7 ? (compiler->scratches - 7) : 0) +
-		(compiler->saveds <= 3 ? compiler->saveds : 3);
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-	if (compiler->args > 2)
-		size += 2;
-#else
-	if (compiler->args > 0)
-		size += 2;
-#endif
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-	FAIL_IF(!inst);
-
-	INC_SIZE(size);
-
-	if (compiler->saveds > 0 || compiler->scratches > 9)
-		POP_REG(reg_map[SLJIT_S0]);
-	if (compiler->saveds > 1 || compiler->scratches > 8)
-		POP_REG(reg_map[SLJIT_S1]);
-	if (compiler->saveds > 2 || compiler->scratches > 7)
-		POP_REG(reg_map[SLJIT_S2]);
-	POP_REG(reg_map[TMP_REG1]);
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-	if (compiler->args > 2)
-		RET_I16(sizeof(sljit_sw));
-	else
-		RET();
-#else
-	RET();
-#endif
-
-	return SLJIT_SUCCESS;
-}
-
-/* --------------------------------------------------------------------- */
-/*  Operators                                                            */
-/* --------------------------------------------------------------------- */
-
-/* Size contains the flags as well. */
-static sljit_ub* emit_x86_instruction(struct sljit_compiler *compiler, sljit_si size,
-	/* The register or immediate operand. */
-	sljit_si a, sljit_sw imma,
-	/* The general operand (not immediate). */
-	sljit_si b, sljit_sw immb)
-{
-	sljit_ub *inst;
-	sljit_ub *buf_ptr;
-	sljit_si flags = size & ~0xf;
-	sljit_si inst_size;
-
-	/* Both cannot be switched on. */
-	SLJIT_ASSERT((flags & (EX86_BIN_INS | EX86_SHIFT_INS)) != (EX86_BIN_INS | EX86_SHIFT_INS));
-	/* Size flags not allowed for typed instructions. */
-	SLJIT_ASSERT(!(flags & (EX86_BIN_INS | EX86_SHIFT_INS)) || (flags & (EX86_BYTE_ARG | EX86_HALF_ARG)) == 0);
-	/* Both size flags cannot be switched on. */
-	SLJIT_ASSERT((flags & (EX86_BYTE_ARG | EX86_HALF_ARG)) != (EX86_BYTE_ARG | EX86_HALF_ARG));
-	/* SSE2 and immediate is not possible. */
-	SLJIT_ASSERT(!(a & SLJIT_IMM) || !(flags & EX86_SSE2));
-	SLJIT_ASSERT((flags & (EX86_PREF_F2 | EX86_PREF_F3)) != (EX86_PREF_F2 | EX86_PREF_F3)
-		&& (flags & (EX86_PREF_F2 | EX86_PREF_66)) != (EX86_PREF_F2 | EX86_PREF_66)
-		&& (flags & (EX86_PREF_F3 | EX86_PREF_66)) != (EX86_PREF_F3 | EX86_PREF_66));
-
-	size &= 0xf;
-	inst_size = size;
-
-	if (flags & (EX86_PREF_F2 | EX86_PREF_F3))
-		inst_size++;
-	if (flags & EX86_PREF_66)
-		inst_size++;
-
-	/* Calculate size of b. */
-	inst_size += 1; /* mod r/m byte. */
-	if (b & SLJIT_MEM) {
-		if ((b & REG_MASK) == SLJIT_UNUSED)
-			inst_size += sizeof(sljit_sw);
-		else if (immb != 0 && !(b & OFFS_REG_MASK)) {
-			/* Immediate operand. */
-			if (immb <= 127 && immb >= -128)
-				inst_size += sizeof(sljit_sb);
-			else
-				inst_size += sizeof(sljit_sw);
-		}
-
-		if ((b & REG_MASK) == SLJIT_SP && !(b & OFFS_REG_MASK))
-			b |= TO_OFFS_REG(SLJIT_SP);
-
-		if ((b & OFFS_REG_MASK) != SLJIT_UNUSED)
-			inst_size += 1; /* SIB byte. */
-	}
-
-	/* Calculate size of a. */
-	if (a & SLJIT_IMM) {
-		if (flags & EX86_BIN_INS) {
-			if (imma <= 127 && imma >= -128) {
-				inst_size += 1;
-				flags |= EX86_BYTE_ARG;
-			} else
-				inst_size += 4;
-		}
-		else if (flags & EX86_SHIFT_INS) {
-			imma &= 0x1f;
-			if (imma != 1) {
-				inst_size ++;
-				flags |= EX86_BYTE_ARG;
-			}
-		} else if (flags & EX86_BYTE_ARG)
-			inst_size++;
-		else if (flags & EX86_HALF_ARG)
-			inst_size += sizeof(short);
-		else
-			inst_size += sizeof(sljit_sw);
-	}
-	else
-		SLJIT_ASSERT(!(flags & EX86_SHIFT_INS) || a == SLJIT_PREF_SHIFT_REG);
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + inst_size);
-	PTR_FAIL_IF(!inst);
-
-	/* Encoding the byte. */
-	INC_SIZE(inst_size);
-	if (flags & EX86_PREF_F2)
-		*inst++ = 0xf2;
-	if (flags & EX86_PREF_F3)
-		*inst++ = 0xf3;
-	if (flags & EX86_PREF_66)
-		*inst++ = 0x66;
-
-	buf_ptr = inst + size;
-
-	/* Encode mod/rm byte. */
-	if (!(flags & EX86_SHIFT_INS)) {
-		if ((flags & EX86_BIN_INS) && (a & SLJIT_IMM))
-			*inst = (flags & EX86_BYTE_ARG) ? GROUP_BINARY_83 : GROUP_BINARY_81;
-
-		if ((a & SLJIT_IMM) || (a == 0))
-			*buf_ptr = 0;
-		else if (!(flags & EX86_SSE2_OP1))
-			*buf_ptr = reg_map[a] << 3;
-		else
-			*buf_ptr = a << 3;
-	}
-	else {
-		if (a & SLJIT_IMM) {
-			if (imma == 1)
-				*inst = GROUP_SHIFT_1;
-			else
-				*inst = GROUP_SHIFT_N;
-		} else
-			*inst = GROUP_SHIFT_CL;
-		*buf_ptr = 0;
-	}
-
-	if (!(b & SLJIT_MEM))
-		*buf_ptr++ |= MOD_REG + ((!(flags & EX86_SSE2_OP2)) ? reg_map[b] : b);
-	else if ((b & REG_MASK) != SLJIT_UNUSED) {
-		if ((b & OFFS_REG_MASK) == SLJIT_UNUSED || (b & OFFS_REG_MASK) == TO_OFFS_REG(SLJIT_SP)) {
-			if (immb != 0) {
-				if (immb <= 127 && immb >= -128)
-					*buf_ptr |= 0x40;
-				else
-					*buf_ptr |= 0x80;
-			}
-
-			if ((b & OFFS_REG_MASK) == SLJIT_UNUSED)
-				*buf_ptr++ |= reg_map[b & REG_MASK];
-			else {
-				*buf_ptr++ |= 0x04;
-				*buf_ptr++ = reg_map[b & REG_MASK] | (reg_map[OFFS_REG(b)] << 3);
-			}
-
-			if (immb != 0) {
-				if (immb <= 127 && immb >= -128)
-					*buf_ptr++ = immb; /* 8 bit displacement. */
-				else {
-					*(sljit_sw*)buf_ptr = immb; /* 32 bit displacement. */
-					buf_ptr += sizeof(sljit_sw);
-				}
-			}
-		}
-		else {
-			*buf_ptr++ |= 0x04;
-			*buf_ptr++ = reg_map[b & REG_MASK] | (reg_map[OFFS_REG(b)] << 3) | (immb << 6);
-		}
-	}
-	else {
-		*buf_ptr++ |= 0x05;
-		*(sljit_sw*)buf_ptr = immb; /* 32 bit displacement. */
-		buf_ptr += sizeof(sljit_sw);
-	}
-
-	if (a & SLJIT_IMM) {
-		if (flags & EX86_BYTE_ARG)
-			*buf_ptr = imma;
-		else if (flags & EX86_HALF_ARG)
-			*(short*)buf_ptr = imma;
-		else if (!(flags & EX86_SHIFT_INS))
-			*(sljit_sw*)buf_ptr = imma;
-	}
-
-	return !(flags & EX86_SHIFT_INS) ? inst : (inst + 1);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Call / return instructions                                           */
-/* --------------------------------------------------------------------- */
-
-static SLJIT_INLINE sljit_si call_with_args(struct sljit_compiler *compiler, sljit_si type)
-{
-	sljit_ub *inst;
-
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-	inst = (sljit_ub*)ensure_buf(compiler, type >= SLJIT_CALL3 ? 1 + 2 + 1 : 1 + 2);
-	FAIL_IF(!inst);
-	INC_SIZE(type >= SLJIT_CALL3 ? 2 + 1 : 2);
-
-	if (type >= SLJIT_CALL3)
-		PUSH_REG(reg_map[SLJIT_R2]);
-	*inst++ = MOV_r_rm;
-	*inst++ = MOD_REG | (reg_map[SLJIT_R2] << 3) | reg_map[SLJIT_R0];
-#else
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 4 * (type - SLJIT_CALL0));
-	FAIL_IF(!inst);
-	INC_SIZE(4 * (type - SLJIT_CALL0));
-
-	*inst++ = MOV_rm_r;
-	*inst++ = MOD_DISP8 | (reg_map[SLJIT_R0] << 3) | 0x4 /* SIB */;
-	*inst++ = (0x4 /* none*/ << 3) | reg_map[SLJIT_SP];
-	*inst++ = 0;
-	if (type >= SLJIT_CALL2) {
-		*inst++ = MOV_rm_r;
-		*inst++ = MOD_DISP8 | (reg_map[SLJIT_R1] << 3) | 0x4 /* SIB */;
-		*inst++ = (0x4 /* none*/ << 3) | reg_map[SLJIT_SP];
-		*inst++ = sizeof(sljit_sw);
-	}
-	if (type >= SLJIT_CALL3) {
-		*inst++ = MOV_rm_r;
-		*inst++ = MOD_DISP8 | (reg_map[SLJIT_R2] << 3) | 0x4 /* SIB */;
-		*inst++ = (0x4 /* none*/ << 3) | reg_map[SLJIT_SP];
-		*inst++ = 2 * sizeof(sljit_sw);
-	}
-#endif
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw)
-{
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_enter(compiler, dst, dstw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	CHECK_EXTRA_REGS(dst, dstw, (void)0);
-
-	/* For UNUSED dst. Uncommon, but possible. */
-	if (dst == SLJIT_UNUSED)
-		dst = TMP_REG1;
-
-	if (FAST_IS_REG(dst)) {
-		/* Unused dest is possible here. */
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-		FAIL_IF(!inst);
-
-		INC_SIZE(1);
-		POP_REG(reg_map[dst]);
-		return SLJIT_SUCCESS;
-	}
-
-	/* Memory. */
-	inst = emit_x86_instruction(compiler, 1, 0, 0, dst, dstw);
-	FAIL_IF(!inst);
-	*inst++ = POP_rm;
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw)
-{
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_return(compiler, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	CHECK_EXTRA_REGS(src, srcw, (void)0);
-
-	if (FAST_IS_REG(src)) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1 + 1);
-		FAIL_IF(!inst);
-
-		INC_SIZE(1 + 1);
-		PUSH_REG(reg_map[src]);
-	}
-	else if (src & SLJIT_MEM) {
-		inst = emit_x86_instruction(compiler, 1, 0, 0, src, srcw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_FF;
-		*inst |= PUSH_rm;
-
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-		FAIL_IF(!inst);
-		INC_SIZE(1);
-	}
-	else {
-		/* SLJIT_IMM. */
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 5 + 1);
-		FAIL_IF(!inst);
-
-		INC_SIZE(5 + 1);
-		*inst++ = PUSH_i32;
-		*(sljit_sw*)inst = srcw;
-		inst += sizeof(sljit_sw);
-	}
-
-	RET();
-	return SLJIT_SUCCESS;
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativeX86_64.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativeX86_64.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativeX86_64.c	2015-05-13 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativeX86_64.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,747 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* x86 64-bit arch dependent functions. */
-
-static sljit_si emit_load_imm64(struct sljit_compiler *compiler, sljit_si reg, sljit_sw imm)
-{
-	sljit_ub *inst;
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 2 + sizeof(sljit_sw));
-	FAIL_IF(!inst);
-	INC_SIZE(2 + sizeof(sljit_sw));
-	*inst++ = REX_W | ((reg_map[reg] <= 7) ? 0 : REX_B);
-	*inst++ = MOV_r_i32 + (reg_map[reg] & 0x7);
-	*(sljit_sw*)inst = imm;
-	return SLJIT_SUCCESS;
-}
-
-static sljit_ub* generate_far_jump_code(struct sljit_jump *jump, sljit_ub *code_ptr, sljit_si type)
-{
-	if (type < SLJIT_JUMP) {
-		/* Invert type. */
-		*code_ptr++ = get_jump_code(type ^ 0x1) - 0x10;
-		*code_ptr++ = 10 + 3;
-	}
-
-	SLJIT_COMPILE_ASSERT(reg_map[TMP_REG3] == 9, tmp3_is_9_first);
-	*code_ptr++ = REX_W | REX_B;
-	*code_ptr++ = MOV_r_i32 + 1;
-	jump->addr = (sljit_uw)code_ptr;
-
-	if (jump->flags & JUMP_LABEL)
-		jump->flags |= PATCH_MD;
-	else
-		*(sljit_sw*)code_ptr = jump->u.target;
-
-	code_ptr += sizeof(sljit_sw);
-	*code_ptr++ = REX_B;
-	*code_ptr++ = GROUP_FF;
-	*code_ptr++ = (type >= SLJIT_FAST_CALL) ? (MOD_REG | CALL_rm | 1) : (MOD_REG | JMP_rm | 1);
-
-	return code_ptr;
-}
-
-static sljit_ub* generate_fixed_jump(sljit_ub *code_ptr, sljit_sw addr, sljit_si type)
-{
-	sljit_sw delta = addr - ((sljit_sw)code_ptr + 1 + sizeof(sljit_si));
-
-	if (delta <= HALFWORD_MAX && delta >= HALFWORD_MIN) {
-		*code_ptr++ = (type == 2) ? CALL_i32 : JMP_i32;
-		*(sljit_sw*)code_ptr = delta;
-	}
-	else {
-		SLJIT_COMPILE_ASSERT(reg_map[TMP_REG3] == 9, tmp3_is_9_second);
-		*code_ptr++ = REX_W | REX_B;
-		*code_ptr++ = MOV_r_i32 + 1;
-		*(sljit_sw*)code_ptr = addr;
-		code_ptr += sizeof(sljit_sw);
-		*code_ptr++ = REX_B;
-		*code_ptr++ = GROUP_FF;
-		*code_ptr++ = (type == 2) ? (MOD_REG | CALL_rm | 1) : (MOD_REG | JMP_rm | 1);
-	}
-
-	return code_ptr;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	sljit_si i, tmp, size, saved_register_size;
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	compiler->flags_saved = 0;
-
-	/* Including the return address saved by the call instruction. */
-	saved_register_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1);
-
-	tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG;
-	for (i = SLJIT_S0; i >= tmp; i--) {
-		size = reg_map[i] >= 8 ? 2 : 1;
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-		FAIL_IF(!inst);
-		INC_SIZE(size);
-		if (reg_map[i] >= 8)
-			*inst++ = REX_B;
-		PUSH_REG(reg_lmap[i]);
-	}
-
-	for (i = scratches; i >= SLJIT_FIRST_SAVED_REG; i--) {
-		size = reg_map[i] >= 8 ? 2 : 1;
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-		FAIL_IF(!inst);
-		INC_SIZE(size);
-		if (reg_map[i] >= 8)
-			*inst++ = REX_B;
-		PUSH_REG(reg_lmap[i]);
-	}
-
-	if (args > 0) {
-		size = args * 3;
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-		FAIL_IF(!inst);
-
-		INC_SIZE(size);
-
-#ifndef _WIN64
-		if (args > 0) {
-			*inst++ = REX_W;
-			*inst++ = MOV_r_rm;
-			*inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | 0x7 /* rdi */;
-		}
-		if (args > 1) {
-			*inst++ = REX_W | REX_R;
-			*inst++ = MOV_r_rm;
-			*inst++ = MOD_REG | (reg_lmap[SLJIT_S1] << 3) | 0x6 /* rsi */;
-		}
-		if (args > 2) {
-			*inst++ = REX_W | REX_R;
-			*inst++ = MOV_r_rm;
-			*inst++ = MOD_REG | (reg_lmap[SLJIT_S2] << 3) | 0x2 /* rdx */;
-		}
-#else
-		if (args > 0) {
-			*inst++ = REX_W;
-			*inst++ = MOV_r_rm;
-			*inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | 0x1 /* rcx */;
-		}
-		if (args > 1) {
-			*inst++ = REX_W;
-			*inst++ = MOV_r_rm;
-			*inst++ = MOD_REG | (reg_map[SLJIT_S1] << 3) | 0x2 /* rdx */;
-		}
-		if (args > 2) {
-			*inst++ = REX_W | REX_B;
-			*inst++ = MOV_r_rm;
-			*inst++ = MOD_REG | (reg_map[SLJIT_S2] << 3) | 0x0 /* r8 */;
-		}
-#endif
-	}
-
-	local_size = ((local_size + SLJIT_LOCALS_OFFSET + saved_register_size + 15) & ~15) - saved_register_size;
-	compiler->local_size = local_size;
-
-#ifdef _WIN64
-	if (local_size > 1024) {
-		/* Allocate stack for the callback, which grows the stack. */
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 4 + (3 + sizeof(sljit_si)));
-		FAIL_IF(!inst);
-		INC_SIZE(4 + (3 + sizeof(sljit_si)));
-		*inst++ = REX_W;
-		*inst++ = GROUP_BINARY_83;
-		*inst++ = MOD_REG | SUB | 4;
-		/* Allocated size for registers must be divisible by 8. */
-		SLJIT_ASSERT(!(saved_register_size & 0x7));
-		/* Aligned to 16 byte. */
-		if (saved_register_size & 0x8) {
-			*inst++ = 5 * sizeof(sljit_sw);
-			local_size -= 5 * sizeof(sljit_sw);
-		} else {
-			*inst++ = 4 * sizeof(sljit_sw);
-			local_size -= 4 * sizeof(sljit_sw);
-		}
-		/* Second instruction */
-		SLJIT_COMPILE_ASSERT(reg_map[SLJIT_R0] < 8, temporary_reg1_is_loreg);
-		*inst++ = REX_W;
-		*inst++ = MOV_rm_i32;
-		*inst++ = MOD_REG | reg_lmap[SLJIT_R0];
-		*(sljit_si*)inst = local_size;
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-			|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-		compiler->skip_checks = 1;
-#endif
-		FAIL_IF(sljit_emit_ijump(compiler, SLJIT_CALL1, SLJIT_IMM, SLJIT_FUNC_OFFSET(sljit_grow_stack)));
-	}
-#endif
-
-	SLJIT_ASSERT(local_size > 0);
-	if (local_size <= 127) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-		FAIL_IF(!inst);
-		INC_SIZE(4);
-		*inst++ = REX_W;
-		*inst++ = GROUP_BINARY_83;
-		*inst++ = MOD_REG | SUB | 4;
-		*inst++ = local_size;
-	}
-	else {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 7);
-		FAIL_IF(!inst);
-		INC_SIZE(7);
-		*inst++ = REX_W;
-		*inst++ = GROUP_BINARY_81;
-		*inst++ = MOD_REG | SUB | 4;
-		*(sljit_si*)inst = local_size;
-		inst += sizeof(sljit_si);
-	}
-
-#ifdef _WIN64
-	/* Save xmm6 register: movaps [rsp + 0x20], xmm6 */
-	if (fscratches >= 6 || fsaveds >= 1) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 5);
-		FAIL_IF(!inst);
-		INC_SIZE(5);
-		*inst++ = GROUP_0F;
-		*(sljit_si*)inst = 0x20247429;
-	}
-#endif
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler,
-	sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds,
-	sljit_si fscratches, sljit_si fsaveds, sljit_si local_size)
-{
-	sljit_si saved_register_size;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
-
-	/* Including the return address saved by the call instruction. */
-	saved_register_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1);
-	compiler->local_size = ((local_size + SLJIT_LOCALS_OFFSET + saved_register_size + 15) & ~15) - saved_register_size;
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw)
-{
-	sljit_si i, tmp, size;
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_return(compiler, op, src, srcw));
-
-	compiler->flags_saved = 0;
-	FAIL_IF(emit_mov_before_return(compiler, op, src, srcw));
-
-#ifdef _WIN64
-	/* Restore xmm6 register: movaps xmm6, [rsp + 0x20] */
-	if (compiler->fscratches >= 6 || compiler->fsaveds >= 1) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 5);
-		FAIL_IF(!inst);
-		INC_SIZE(5);
-		*inst++ = GROUP_0F;
-		*(sljit_si*)inst = 0x20247428;
-	}
-#endif
-
-	SLJIT_ASSERT(compiler->local_size > 0);
-	if (compiler->local_size <= 127) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-		FAIL_IF(!inst);
-		INC_SIZE(4);
-		*inst++ = REX_W;
-		*inst++ = GROUP_BINARY_83;
-		*inst++ = MOD_REG | ADD | 4;
-		*inst = compiler->local_size;
-	}
-	else {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 7);
-		FAIL_IF(!inst);
-		INC_SIZE(7);
-		*inst++ = REX_W;
-		*inst++ = GROUP_BINARY_81;
-		*inst++ = MOD_REG | ADD | 4;
-		*(sljit_si*)inst = compiler->local_size;
-	}
-
-	tmp = compiler->scratches;
-	for (i = SLJIT_FIRST_SAVED_REG; i <= tmp; i++) {
-		size = reg_map[i] >= 8 ? 2 : 1;
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-		FAIL_IF(!inst);
-		INC_SIZE(size);
-		if (reg_map[i] >= 8)
-			*inst++ = REX_B;
-		POP_REG(reg_lmap[i]);
-	}
-
-	tmp = compiler->saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - compiler->saveds) : SLJIT_FIRST_SAVED_REG;
-	for (i = tmp; i <= SLJIT_S0; i++) {
-		size = reg_map[i] >= 8 ? 2 : 1;
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-		FAIL_IF(!inst);
-		INC_SIZE(size);
-		if (reg_map[i] >= 8)
-			*inst++ = REX_B;
-		POP_REG(reg_lmap[i]);
-	}
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-	FAIL_IF(!inst);
-	INC_SIZE(1);
-	RET();
-	return SLJIT_SUCCESS;
-}
-
-/* --------------------------------------------------------------------- */
-/*  Operators                                                            */
-/* --------------------------------------------------------------------- */
-
-static sljit_si emit_do_imm32(struct sljit_compiler *compiler, sljit_ub rex, sljit_ub opcode, sljit_sw imm)
-{
-	sljit_ub *inst;
-	sljit_si length = 1 + (rex ? 1 : 0) + sizeof(sljit_si);
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + length);
-	FAIL_IF(!inst);
-	INC_SIZE(length);
-	if (rex)
-		*inst++ = rex;
-	*inst++ = opcode;
-	*(sljit_si*)inst = imm;
-	return SLJIT_SUCCESS;
-}
-
-static sljit_ub* emit_x86_instruction(struct sljit_compiler *compiler, sljit_si size,
-	/* The register or immediate operand. */
-	sljit_si a, sljit_sw imma,
-	/* The general operand (not immediate). */
-	sljit_si b, sljit_sw immb)
-{
-	sljit_ub *inst;
-	sljit_ub *buf_ptr;
-	sljit_ub rex = 0;
-	sljit_si flags = size & ~0xf;
-	sljit_si inst_size;
-
-	/* The immediate operand must be 32 bit. */
-	SLJIT_ASSERT(!(a & SLJIT_IMM) || compiler->mode32 || IS_HALFWORD(imma));
-	/* Both cannot be switched on. */
-	SLJIT_ASSERT((flags & (EX86_BIN_INS | EX86_SHIFT_INS)) != (EX86_BIN_INS | EX86_SHIFT_INS));
-	/* Size flags not allowed for typed instructions. */
-	SLJIT_ASSERT(!(flags & (EX86_BIN_INS | EX86_SHIFT_INS)) || (flags & (EX86_BYTE_ARG | EX86_HALF_ARG)) == 0);
-	/* Both size flags cannot be switched on. */
-	SLJIT_ASSERT((flags & (EX86_BYTE_ARG | EX86_HALF_ARG)) != (EX86_BYTE_ARG | EX86_HALF_ARG));
-	/* SSE2 and immediate is not possible. */
-	SLJIT_ASSERT(!(a & SLJIT_IMM) || !(flags & EX86_SSE2));
-	SLJIT_ASSERT((flags & (EX86_PREF_F2 | EX86_PREF_F3)) != (EX86_PREF_F2 | EX86_PREF_F3)
-		&& (flags & (EX86_PREF_F2 | EX86_PREF_66)) != (EX86_PREF_F2 | EX86_PREF_66)
-		&& (flags & (EX86_PREF_F3 | EX86_PREF_66)) != (EX86_PREF_F3 | EX86_PREF_66));
-
-	size &= 0xf;
-	inst_size = size;
-
-	if (!compiler->mode32 && !(flags & EX86_NO_REXW))
-		rex |= REX_W;
-	else if (flags & EX86_REX)
-		rex |= REX;
-
-	if (flags & (EX86_PREF_F2 | EX86_PREF_F3))
-		inst_size++;
-	if (flags & EX86_PREF_66)
-		inst_size++;
-
-	/* Calculate size of b. */
-	inst_size += 1; /* mod r/m byte. */
-	if (b & SLJIT_MEM) {
-		if (!(b & OFFS_REG_MASK)) {
-			if (NOT_HALFWORD(immb)) {
-				if (emit_load_imm64(compiler, TMP_REG3, immb))
-					return NULL;
-				immb = 0;
-				if (b & REG_MASK)
-					b |= TO_OFFS_REG(TMP_REG3);
-				else
-					b |= TMP_REG3;
-			}
-			else if (reg_lmap[b & REG_MASK] == 4)
-				b |= TO_OFFS_REG(SLJIT_SP);
-		}
-
-		if ((b & REG_MASK) == SLJIT_UNUSED)
-			inst_size += 1 + sizeof(sljit_si); /* SIB byte required to avoid RIP based addressing. */
-		else {
-			if (reg_map[b & REG_MASK] >= 8)
-				rex |= REX_B;
-
-			if (immb != 0 && (!(b & OFFS_REG_MASK) || (b & OFFS_REG_MASK) == TO_OFFS_REG(SLJIT_SP))) {
-				/* Immediate operand. */
-				if (immb <= 127 && immb >= -128)
-					inst_size += sizeof(sljit_sb);
-				else
-					inst_size += sizeof(sljit_si);
-			}
-			else if (reg_lmap[b & REG_MASK] == 5)
-				inst_size += sizeof(sljit_sb);
-
-			if ((b & OFFS_REG_MASK) != SLJIT_UNUSED) {
-				inst_size += 1; /* SIB byte. */
-				if (reg_map[OFFS_REG(b)] >= 8)
-					rex |= REX_X;
-			}
-		}
-	}
-	else if (!(flags & EX86_SSE2_OP2) && reg_map[b] >= 8)
-		rex |= REX_B;
-
-	if (a & SLJIT_IMM) {
-		if (flags & EX86_BIN_INS) {
-			if (imma <= 127 && imma >= -128) {
-				inst_size += 1;
-				flags |= EX86_BYTE_ARG;
-			} else
-				inst_size += 4;
-		}
-		else if (flags & EX86_SHIFT_INS) {
-			imma &= compiler->mode32 ? 0x1f : 0x3f;
-			if (imma != 1) {
-				inst_size ++;
-				flags |= EX86_BYTE_ARG;
-			}
-		} else if (flags & EX86_BYTE_ARG)
-			inst_size++;
-		else if (flags & EX86_HALF_ARG)
-			inst_size += sizeof(short);
-		else
-			inst_size += sizeof(sljit_si);
-	}
-	else {
-		SLJIT_ASSERT(!(flags & EX86_SHIFT_INS) || a == SLJIT_PREF_SHIFT_REG);
-		/* reg_map[SLJIT_PREF_SHIFT_REG] is less than 8. */
-		if (!(flags & EX86_SSE2_OP1) && reg_map[a] >= 8)
-			rex |= REX_R;
-	}
-
-	if (rex)
-		inst_size++;
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + inst_size);
-	PTR_FAIL_IF(!inst);
-
-	/* Encoding the byte. */
-	INC_SIZE(inst_size);
-	if (flags & EX86_PREF_F2)
-		*inst++ = 0xf2;
-	if (flags & EX86_PREF_F3)
-		*inst++ = 0xf3;
-	if (flags & EX86_PREF_66)
-		*inst++ = 0x66;
-	if (rex)
-		*inst++ = rex;
-	buf_ptr = inst + size;
-
-	/* Encode mod/rm byte. */
-	if (!(flags & EX86_SHIFT_INS)) {
-		if ((flags & EX86_BIN_INS) && (a & SLJIT_IMM))
-			*inst = (flags & EX86_BYTE_ARG) ? GROUP_BINARY_83 : GROUP_BINARY_81;
-
-		if ((a & SLJIT_IMM) || (a == 0))
-			*buf_ptr = 0;
-		else if (!(flags & EX86_SSE2_OP1))
-			*buf_ptr = reg_lmap[a] << 3;
-		else
-			*buf_ptr = a << 3;
-	}
-	else {
-		if (a & SLJIT_IMM) {
-			if (imma == 1)
-				*inst = GROUP_SHIFT_1;
-			else
-				*inst = GROUP_SHIFT_N;
-		} else
-			*inst = GROUP_SHIFT_CL;
-		*buf_ptr = 0;
-	}
-
-	if (!(b & SLJIT_MEM))
-		*buf_ptr++ |= MOD_REG + ((!(flags & EX86_SSE2_OP2)) ? reg_lmap[b] : b);
-	else if ((b & REG_MASK) != SLJIT_UNUSED) {
-		if ((b & OFFS_REG_MASK) == SLJIT_UNUSED || (b & OFFS_REG_MASK) == TO_OFFS_REG(SLJIT_SP)) {
-			if (immb != 0 || reg_lmap[b & REG_MASK] == 5) {
-				if (immb <= 127 && immb >= -128)
-					*buf_ptr |= 0x40;
-				else
-					*buf_ptr |= 0x80;
-			}
-
-			if ((b & OFFS_REG_MASK) == SLJIT_UNUSED)
-				*buf_ptr++ |= reg_lmap[b & REG_MASK];
-			else {
-				*buf_ptr++ |= 0x04;
-				*buf_ptr++ = reg_lmap[b & REG_MASK] | (reg_lmap[OFFS_REG(b)] << 3);
-			}
-
-			if (immb != 0 || reg_lmap[b & REG_MASK] == 5) {
-				if (immb <= 127 && immb >= -128)
-					*buf_ptr++ = immb; /* 8 bit displacement. */
-				else {
-					*(sljit_si*)buf_ptr = immb; /* 32 bit displacement. */
-					buf_ptr += sizeof(sljit_si);
-				}
-			}
-		}
-		else {
-			if (reg_lmap[b & REG_MASK] == 5)
-				*buf_ptr |= 0x40;
-			*buf_ptr++ |= 0x04;
-			*buf_ptr++ = reg_lmap[b & REG_MASK] | (reg_lmap[OFFS_REG(b)] << 3) | (immb << 6);
-			if (reg_lmap[b & REG_MASK] == 5)
-				*buf_ptr++ = 0;
-		}
-	}
-	else {
-		*buf_ptr++ |= 0x04;
-		*buf_ptr++ = 0x25;
-		*(sljit_si*)buf_ptr = immb; /* 32 bit displacement. */
-		buf_ptr += sizeof(sljit_si);
-	}
-
-	if (a & SLJIT_IMM) {
-		if (flags & EX86_BYTE_ARG)
-			*buf_ptr = imma;
-		else if (flags & EX86_HALF_ARG)
-			*(short*)buf_ptr = imma;
-		else if (!(flags & EX86_SHIFT_INS))
-			*(sljit_si*)buf_ptr = imma;
-	}
-
-	return !(flags & EX86_SHIFT_INS) ? inst : (inst + 1);
-}
-
-/* --------------------------------------------------------------------- */
-/*  Call / return instructions                                           */
-/* --------------------------------------------------------------------- */
-
-static SLJIT_INLINE sljit_si call_with_args(struct sljit_compiler *compiler, sljit_si type)
-{
-	sljit_ub *inst;
-
-#ifndef _WIN64
-	SLJIT_COMPILE_ASSERT(reg_map[SLJIT_R1] == 6 && reg_map[SLJIT_R0] < 8 && reg_map[SLJIT_R2] < 8, args_registers);
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + ((type < SLJIT_CALL3) ? 3 : 6));
-	FAIL_IF(!inst);
-	INC_SIZE((type < SLJIT_CALL3) ? 3 : 6);
-	if (type >= SLJIT_CALL3) {
-		*inst++ = REX_W;
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (0x2 /* rdx */ << 3) | reg_lmap[SLJIT_R2];
-	}
-	*inst++ = REX_W;
-	*inst++ = MOV_r_rm;
-	*inst++ = MOD_REG | (0x7 /* rdi */ << 3) | reg_lmap[SLJIT_R0];
-#else
-	SLJIT_COMPILE_ASSERT(reg_map[SLJIT_R1] == 2 && reg_map[SLJIT_R0] < 8 && reg_map[SLJIT_R2] < 8, args_registers);
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + ((type < SLJIT_CALL3) ? 3 : 6));
-	FAIL_IF(!inst);
-	INC_SIZE((type < SLJIT_CALL3) ? 3 : 6);
-	if (type >= SLJIT_CALL3) {
-		*inst++ = REX_W | REX_R;
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (0x0 /* r8 */ << 3) | reg_lmap[SLJIT_R2];
-	}
-	*inst++ = REX_W;
-	*inst++ = MOV_r_rm;
-	*inst++ = MOD_REG | (0x1 /* rcx */ << 3) | reg_lmap[SLJIT_R0];
-#endif
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw)
-{
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_enter(compiler, dst, dstw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	/* For UNUSED dst. Uncommon, but possible. */
-	if (dst == SLJIT_UNUSED)
-		dst = TMP_REG1;
-
-	if (FAST_IS_REG(dst)) {
-		if (reg_map[dst] < 8) {
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-			FAIL_IF(!inst);
-			INC_SIZE(1);
-			POP_REG(reg_lmap[dst]);
-			return SLJIT_SUCCESS;
-		}
-
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 2);
-		FAIL_IF(!inst);
-		INC_SIZE(2);
-		*inst++ = REX_B;
-		POP_REG(reg_lmap[dst]);
-		return SLJIT_SUCCESS;
-	}
-
-	/* REX_W is not necessary (src is not immediate). */
-	compiler->mode32 = 1;
-	inst = emit_x86_instruction(compiler, 1, 0, 0, dst, dstw);
-	FAIL_IF(!inst);
-	*inst++ = POP_rm;
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw)
-{
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fast_return(compiler, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	if ((src & SLJIT_IMM) && NOT_HALFWORD(srcw)) {
-		FAIL_IF(emit_load_imm64(compiler, TMP_REG1, srcw));
-		src = TMP_REG1;
-	}
-
-	if (FAST_IS_REG(src)) {
-		if (reg_map[src] < 8) {
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 1 + 1);
-			FAIL_IF(!inst);
-
-			INC_SIZE(1 + 1);
-			PUSH_REG(reg_lmap[src]);
-		}
-		else {
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 2 + 1);
-			FAIL_IF(!inst);
-
-			INC_SIZE(2 + 1);
-			*inst++ = REX_B;
-			PUSH_REG(reg_lmap[src]);
-		}
-	}
-	else if (src & SLJIT_MEM) {
-		/* REX_W is not necessary (src is not immediate). */
-		compiler->mode32 = 1;
-		inst = emit_x86_instruction(compiler, 1, 0, 0, src, srcw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_FF;
-		*inst |= PUSH_rm;
-
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-		FAIL_IF(!inst);
-		INC_SIZE(1);
-	}
-	else {
-		SLJIT_ASSERT(IS_HALFWORD(srcw));
-		/* SLJIT_IMM. */
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 5 + 1);
-		FAIL_IF(!inst);
-
-		INC_SIZE(5 + 1);
-		*inst++ = PUSH_i32;
-		*(sljit_si*)inst = srcw;
-		inst += sizeof(sljit_si);
-	}
-
-	RET();
-	return SLJIT_SUCCESS;
-}
-
-
-/* --------------------------------------------------------------------- */
-/*  Extend input                                                         */
-/* --------------------------------------------------------------------- */
-
-static sljit_si emit_mov_int(struct sljit_compiler *compiler, sljit_si sign,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-	sljit_si dst_r;
-
-	compiler->mode32 = 0;
-
-	if (dst == SLJIT_UNUSED && !(src & SLJIT_MEM))
-		return SLJIT_SUCCESS; /* Empty instruction. */
-
-	if (src & SLJIT_IMM) {
-		if (FAST_IS_REG(dst)) {
-			if (sign || ((sljit_uw)srcw <= 0x7fffffff)) {
-				inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, (sljit_sw)(sljit_si)srcw, dst, dstw);
-				FAIL_IF(!inst);
-				*inst = MOV_rm_i32;
-				return SLJIT_SUCCESS;
-			}
-			return emit_load_imm64(compiler, dst, srcw);
-		}
-		compiler->mode32 = 1;
-		inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, (sljit_sw)(sljit_si)srcw, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm_i32;
-		compiler->mode32 = 0;
-		return SLJIT_SUCCESS;
-	}
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-
-	if ((dst & SLJIT_MEM) && FAST_IS_REG(src))
-		dst_r = src;
-	else {
-		if (sign) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src, srcw);
-			FAIL_IF(!inst);
-			*inst++ = MOVSXD_r_rm;
-		} else {
-			compiler->mode32 = 1;
-			FAIL_IF(emit_mov(compiler, dst_r, 0, src, srcw));
-			compiler->mode32 = 0;
-		}
-	}
-
-	if (dst & SLJIT_MEM) {
-		compiler->mode32 = 1;
-		inst = emit_x86_instruction(compiler, 1, dst_r, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm_r;
-		compiler->mode32 = 0;
-	}
-
-	return SLJIT_SUCCESS;
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitNativeX86_common.c r-base-3.3.1/src/extra/pcre/sljit/sljitNativeX86_common.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitNativeX86_common.c	2015-11-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitNativeX86_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3004 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name(void)
-{
-	return "x86" SLJIT_CPUINFO;
-}
-
-/*
-   32b register indexes:
-     0 - EAX
-     1 - ECX
-     2 - EDX
-     3 - EBX
-     4 - none
-     5 - EBP
-     6 - ESI
-     7 - EDI
-*/
-
-/*
-   64b register indexes:
-     0 - RAX
-     1 - RCX
-     2 - RDX
-     3 - RBX
-     4 - none
-     5 - RBP
-     6 - RSI
-     7 - RDI
-     8 - R8   - From now on REX prefix is required
-     9 - R9
-    10 - R10
-    11 - R11
-    12 - R12
-    13 - R13
-    14 - R14
-    15 - R15
-*/
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-
-/* Last register + 1. */
-#define TMP_REG1	(SLJIT_NUMBER_OF_REGISTERS + 2)
-
-static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 3] = {
-	0, 0, 2, 1, 0, 0, 0, 0, 7, 6, 3, 4, 5
-};
-
-#define CHECK_EXTRA_REGS(p, w, do) \
-	if (p >= SLJIT_R3 && p <= SLJIT_R6) { \
-		w = SLJIT_LOCALS_OFFSET + ((p) - (SLJIT_R3 + 4)) * sizeof(sljit_sw); \
-		p = SLJIT_MEM1(SLJIT_SP); \
-		do; \
-	}
-
-#else /* SLJIT_CONFIG_X86_32 */
-
-/* Last register + 1. */
-#define TMP_REG1	(SLJIT_NUMBER_OF_REGISTERS + 2)
-#define TMP_REG2	(SLJIT_NUMBER_OF_REGISTERS + 3)
-#define TMP_REG3	(SLJIT_NUMBER_OF_REGISTERS + 4)
-
-/* Note: r12 & 0x7 == 0b100, which decoded as SIB byte present
-   Note: avoid to use r12 and r13 for memory addessing
-   therefore r12 is better for SAVED_EREG than SAVED_REG. */
-#ifndef _WIN64
-/* 1st passed in rdi, 2nd argument passed in rsi, 3rd in rdx. */
-static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 5] = {
-	0, 0, 6, 1, 8, 11, 10, 12, 5, 13, 14, 15, 3, 4, 2, 7, 9
-};
-/* low-map. reg_map & 0x7. */
-static SLJIT_CONST sljit_ub reg_lmap[SLJIT_NUMBER_OF_REGISTERS + 5] = {
-	0, 0, 6, 1, 0, 3,  2,  4,  5,  5,  6,  7, 3, 4, 2, 7, 1
-};
-#else
-/* 1st passed in rcx, 2nd argument passed in rdx, 3rd in r8. */
-static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 5] = {
-	0, 0, 2, 1, 11, 12, 5, 13, 14, 15, 7, 6, 3, 4, 10, 8, 9
-};
-/* low-map. reg_map & 0x7. */
-static SLJIT_CONST sljit_ub reg_lmap[SLJIT_NUMBER_OF_REGISTERS + 5] = {
-	0, 0, 2, 1, 3,  4,  5,  5, 6,  7,  7, 6, 3, 4, 2,  0, 1
-};
-#endif
-
-#define REX_W		0x48
-#define REX_R		0x44
-#define REX_X		0x42
-#define REX_B		0x41
-#define REX		0x40
-
-#ifndef _WIN64
-#define HALFWORD_MAX 0x7fffffffl
-#define HALFWORD_MIN -0x80000000l
-#else
-#define HALFWORD_MAX 0x7fffffffll
-#define HALFWORD_MIN -0x80000000ll
-#endif
-
-#define IS_HALFWORD(x)		((x) <= HALFWORD_MAX && (x) >= HALFWORD_MIN)
-#define NOT_HALFWORD(x)		((x) > HALFWORD_MAX || (x) < HALFWORD_MIN)
-
-#define CHECK_EXTRA_REGS(p, w, do)
-
-#endif /* SLJIT_CONFIG_X86_32 */
-
-#define TMP_FREG	(0)
-
-/* Size flags for emit_x86_instruction: */
-#define EX86_BIN_INS		0x0010
-#define EX86_SHIFT_INS		0x0020
-#define EX86_REX		0x0040
-#define EX86_NO_REXW		0x0080
-#define EX86_BYTE_ARG		0x0100
-#define EX86_HALF_ARG		0x0200
-#define EX86_PREF_66		0x0400
-#define EX86_PREF_F2		0x0800
-#define EX86_PREF_F3		0x1000
-#define EX86_SSE2_OP1		0x2000
-#define EX86_SSE2_OP2		0x4000
-#define EX86_SSE2		(EX86_SSE2_OP1 | EX86_SSE2_OP2)
-
-/* --------------------------------------------------------------------- */
-/*  Instrucion forms                                                     */
-/* --------------------------------------------------------------------- */
-
-#define ADD		(/* BINARY */ 0 << 3)
-#define ADD_EAX_i32	0x05
-#define ADD_r_rm	0x03
-#define ADD_rm_r	0x01
-#define ADDSD_x_xm	0x58
-#define ADC		(/* BINARY */ 2 << 3)
-#define ADC_EAX_i32	0x15
-#define ADC_r_rm	0x13
-#define ADC_rm_r	0x11
-#define AND		(/* BINARY */ 4 << 3)
-#define AND_EAX_i32	0x25
-#define AND_r_rm	0x23
-#define AND_rm_r	0x21
-#define ANDPD_x_xm	0x54
-#define BSR_r_rm	(/* GROUP_0F */ 0xbd)
-#define CALL_i32	0xe8
-#define CALL_rm		(/* GROUP_FF */ 2 << 3)
-#define CDQ		0x99
-#define CMOVNE_r_rm	(/* GROUP_0F */ 0x45)
-#define CMP		(/* BINARY */ 7 << 3)
-#define CMP_EAX_i32	0x3d
-#define CMP_r_rm	0x3b
-#define CMP_rm_r	0x39
-#define CVTPD2PS_x_xm	0x5a
-#define CVTSI2SD_x_rm	0x2a
-#define CVTTSD2SI_r_xm	0x2c
-#define DIV		(/* GROUP_F7 */ 6 << 3)
-#define DIVSD_x_xm	0x5e
-#define INT3		0xcc
-#define IDIV		(/* GROUP_F7 */ 7 << 3)
-#define IMUL		(/* GROUP_F7 */ 5 << 3)
-#define IMUL_r_rm	(/* GROUP_0F */ 0xaf)
-#define IMUL_r_rm_i8	0x6b
-#define IMUL_r_rm_i32	0x69
-#define JE_i8		0x74
-#define JNE_i8		0x75
-#define JMP_i8		0xeb
-#define JMP_i32		0xe9
-#define JMP_rm		(/* GROUP_FF */ 4 << 3)
-#define LEA_r_m		0x8d
-#define MOV_r_rm	0x8b
-#define MOV_r_i32	0xb8
-#define MOV_rm_r	0x89
-#define MOV_rm_i32	0xc7
-#define MOV_rm8_i8	0xc6
-#define MOV_rm8_r8	0x88
-#define MOVSD_x_xm	0x10
-#define MOVSD_xm_x	0x11
-#define MOVSXD_r_rm	0x63
-#define MOVSX_r_rm8	(/* GROUP_0F */ 0xbe)
-#define MOVSX_r_rm16	(/* GROUP_0F */ 0xbf)
-#define MOVZX_r_rm8	(/* GROUP_0F */ 0xb6)
-#define MOVZX_r_rm16	(/* GROUP_0F */ 0xb7)
-#define MUL		(/* GROUP_F7 */ 4 << 3)
-#define MULSD_x_xm	0x59
-#define NEG_rm		(/* GROUP_F7 */ 3 << 3)
-#define NOP		0x90
-#define NOT_rm		(/* GROUP_F7 */ 2 << 3)
-#define OR		(/* BINARY */ 1 << 3)
-#define OR_r_rm		0x0b
-#define OR_EAX_i32	0x0d
-#define OR_rm_r		0x09
-#define OR_rm8_r8	0x08
-#define POP_r		0x58
-#define POP_rm		0x8f
-#define POPF		0x9d
-#define PUSH_i32	0x68
-#define PUSH_r		0x50
-#define PUSH_rm		(/* GROUP_FF */ 6 << 3)
-#define PUSHF		0x9c
-#define RET_near	0xc3
-#define RET_i16		0xc2
-#define SBB		(/* BINARY */ 3 << 3)
-#define SBB_EAX_i32	0x1d
-#define SBB_r_rm	0x1b
-#define SBB_rm_r	0x19
-#define SAR		(/* SHIFT */ 7 << 3)
-#define SHL		(/* SHIFT */ 4 << 3)
-#define SHR		(/* SHIFT */ 5 << 3)
-#define SUB		(/* BINARY */ 5 << 3)
-#define SUB_EAX_i32	0x2d
-#define SUB_r_rm	0x2b
-#define SUB_rm_r	0x29
-#define SUBSD_x_xm	0x5c
-#define TEST_EAX_i32	0xa9
-#define TEST_rm_r	0x85
-#define UCOMISD_x_xm	0x2e
-#define UNPCKLPD_x_xm	0x14
-#define XCHG_EAX_r	0x90
-#define XCHG_r_rm	0x87
-#define XOR		(/* BINARY */ 6 << 3)
-#define XOR_EAX_i32	0x35
-#define XOR_r_rm	0x33
-#define XOR_rm_r	0x31
-#define XORPD_x_xm	0x57
-
-#define GROUP_0F	0x0f
-#define GROUP_F7	0xf7
-#define GROUP_FF	0xff
-#define GROUP_BINARY_81	0x81
-#define GROUP_BINARY_83	0x83
-#define GROUP_SHIFT_1	0xd1
-#define GROUP_SHIFT_N	0xc1
-#define GROUP_SHIFT_CL	0xd3
-
-#define MOD_REG		0xc0
-#define MOD_DISP8	0x40
-
-#define INC_SIZE(s)			(*inst++ = (s), compiler->size += (s))
-
-#define PUSH_REG(r)			(*inst++ = (PUSH_r + (r)))
-#define POP_REG(r)			(*inst++ = (POP_r + (r)))
-#define RET()				(*inst++ = (RET_near))
-#define RET_I16(n)			(*inst++ = (RET_i16), *inst++ = n, *inst++ = 0)
-/* r32, r/m32 */
-#define MOV_RM(mod, reg, rm)		(*inst++ = (MOV_r_rm), *inst++ = (mod) << 6 | (reg) << 3 | (rm))
-
-/* Multithreading does not affect these static variables, since they store
-   built-in CPU features. Therefore they can be overwritten by different threads
-   if they detect the CPU features in the same time. */
-#if (defined SLJIT_DETECT_SSE2 && SLJIT_DETECT_SSE2)
-static sljit_si cpu_has_sse2 = -1;
-#endif
-static sljit_si cpu_has_cmov = -1;
-
-#ifdef _WIN32_WCE
-#include <cmnintrin.h>
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-#include <intrin.h>
-#endif
-
-static void get_cpu_features(void)
-{
-	sljit_ui features;
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-
-	int CPUInfo[4];
-	__cpuid(CPUInfo, 1);
-	features = (sljit_ui)CPUInfo[3];
-
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C)
-
-	/* AT&T syntax. */
-	__asm__ (
-		"movl $0x1, %%eax\n"
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		/* On x86-32, there is no red zone, so this
-		   should work (no need for a local variable). */
-		"push %%ebx\n"
-#endif
-		"cpuid\n"
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		"pop %%ebx\n"
-#endif
-		"movl %%edx, %0\n"
-		: "=g" (features)
-		:
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		: "%eax", "%ecx", "%edx"
-#else
-		: "%rax", "%rbx", "%rcx", "%rdx"
-#endif
-	);
-
-#else /* _MSC_VER && _MSC_VER >= 1400 */
-
-	/* Intel syntax. */
-	__asm {
-		mov eax, 1
-		cpuid
-		mov features, edx
-	}
-
-#endif /* _MSC_VER && _MSC_VER >= 1400 */
-
-#if (defined SLJIT_DETECT_SSE2 && SLJIT_DETECT_SSE2)
-	cpu_has_sse2 = (features >> 26) & 0x1;
-#endif
-	cpu_has_cmov = (features >> 15) & 0x1;
-}
-
-static sljit_ub get_jump_code(sljit_si type)
-{
-	switch (type) {
-	case SLJIT_EQUAL:
-	case SLJIT_D_EQUAL:
-		return 0x84 /* je */;
-
-	case SLJIT_NOT_EQUAL:
-	case SLJIT_D_NOT_EQUAL:
-		return 0x85 /* jne */;
-
-	case SLJIT_LESS:
-	case SLJIT_D_LESS:
-		return 0x82 /* jc */;
-
-	case SLJIT_GREATER_EQUAL:
-	case SLJIT_D_GREATER_EQUAL:
-		return 0x83 /* jae */;
-
-	case SLJIT_GREATER:
-	case SLJIT_D_GREATER:
-		return 0x87 /* jnbe */;
-
-	case SLJIT_LESS_EQUAL:
-	case SLJIT_D_LESS_EQUAL:
-		return 0x86 /* jbe */;
-
-	case SLJIT_SIG_LESS:
-		return 0x8c /* jl */;
-
-	case SLJIT_SIG_GREATER_EQUAL:
-		return 0x8d /* jnl */;
-
-	case SLJIT_SIG_GREATER:
-		return 0x8f /* jnle */;
-
-	case SLJIT_SIG_LESS_EQUAL:
-		return 0x8e /* jle */;
-
-	case SLJIT_OVERFLOW:
-	case SLJIT_MUL_OVERFLOW:
-		return 0x80 /* jo */;
-
-	case SLJIT_NOT_OVERFLOW:
-	case SLJIT_MUL_NOT_OVERFLOW:
-		return 0x81 /* jno */;
-
-	case SLJIT_D_UNORDERED:
-		return 0x8a /* jp */;
-
-	case SLJIT_D_ORDERED:
-		return 0x8b /* jpo */;
-	}
-	return 0;
-}
-
-static sljit_ub* generate_far_jump_code(struct sljit_jump *jump, sljit_ub *code_ptr, sljit_si type);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-static sljit_ub* generate_fixed_jump(sljit_ub *code_ptr, sljit_sw addr, sljit_si type);
-#endif
-
-static sljit_ub* generate_near_jump_code(struct sljit_jump *jump, sljit_ub *code_ptr, sljit_ub *code, sljit_si type)
-{
-	sljit_si short_jump;
-	sljit_uw label_addr;
-
-	if (jump->flags & JUMP_LABEL)
-		label_addr = (sljit_uw)(code + jump->u.label->size);
-	else
-		label_addr = jump->u.target;
-	short_jump = (sljit_sw)(label_addr - (jump->addr + 2)) >= -128 && (sljit_sw)(label_addr - (jump->addr + 2)) <= 127;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if ((sljit_sw)(label_addr - (jump->addr + 1)) > HALFWORD_MAX || (sljit_sw)(label_addr - (jump->addr + 1)) < HALFWORD_MIN)
-		return generate_far_jump_code(jump, code_ptr, type);
-#endif
-
-	if (type == SLJIT_JUMP) {
-		if (short_jump)
-			*code_ptr++ = JMP_i8;
-		else
-			*code_ptr++ = JMP_i32;
-		jump->addr++;
-	}
-	else if (type >= SLJIT_FAST_CALL) {
-		short_jump = 0;
-		*code_ptr++ = CALL_i32;
-		jump->addr++;
-	}
-	else if (short_jump) {
-		*code_ptr++ = get_jump_code(type) - 0x10;
-		jump->addr++;
-	}
-	else {
-		*code_ptr++ = GROUP_0F;
-		*code_ptr++ = get_jump_code(type);
-		jump->addr += 2;
-	}
-
-	if (short_jump) {
-		jump->flags |= PATCH_MB;
-		code_ptr += sizeof(sljit_sb);
-	} else {
-		jump->flags |= PATCH_MW;
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		code_ptr += sizeof(sljit_sw);
-#else
-		code_ptr += sizeof(sljit_si);
-#endif
-	}
-
-	return code_ptr;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
-{
-	struct sljit_memory_fragment *buf;
-	sljit_ub *code;
-	sljit_ub *code_ptr;
-	sljit_ub *buf_ptr;
-	sljit_ub *buf_end;
-	sljit_ub len;
-
-	struct sljit_label *label;
-	struct sljit_jump *jump;
-	struct sljit_const *const_;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
-
-	/* Second code generation pass. */
-	code = (sljit_ub*)SLJIT_MALLOC_EXEC(compiler->size);
-	PTR_FAIL_WITH_EXEC_IF(code);
-	buf = compiler->buf;
-
-	code_ptr = code;
-	label = compiler->labels;
-	jump = compiler->jumps;
-	const_ = compiler->consts;
-	do {
-		buf_ptr = buf->memory;
-		buf_end = buf_ptr + buf->used_size;
-		do {
-			len = *buf_ptr++;
-			if (len > 0) {
-				/* The code is already generated. */
-				SLJIT_MEMMOVE(code_ptr, buf_ptr, len);
-				code_ptr += len;
-				buf_ptr += len;
-			}
-			else {
-				if (*buf_ptr >= 4) {
-					jump->addr = (sljit_uw)code_ptr;
-					if (!(jump->flags & SLJIT_REWRITABLE_JUMP))
-						code_ptr = generate_near_jump_code(jump, code_ptr, code, *buf_ptr - 4);
-					else
-						code_ptr = generate_far_jump_code(jump, code_ptr, *buf_ptr - 4);
-					jump = jump->next;
-				}
-				else if (*buf_ptr == 0) {
-					label->addr = (sljit_uw)code_ptr;
-					label->size = code_ptr - code;
-					label = label->next;
-				}
-				else if (*buf_ptr == 1) {
-					const_->addr = ((sljit_uw)code_ptr) - sizeof(sljit_sw);
-					const_ = const_->next;
-				}
-				else {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-					*code_ptr++ = (*buf_ptr == 2) ? CALL_i32 : JMP_i32;
-					buf_ptr++;
-					*(sljit_sw*)code_ptr = *(sljit_sw*)buf_ptr - ((sljit_sw)code_ptr + sizeof(sljit_sw));
-					code_ptr += sizeof(sljit_sw);
-					buf_ptr += sizeof(sljit_sw) - 1;
-#else
-					code_ptr = generate_fixed_jump(code_ptr, *(sljit_sw*)(buf_ptr + 1), *buf_ptr);
-					buf_ptr += sizeof(sljit_sw);
-#endif
-				}
-				buf_ptr++;
-			}
-		} while (buf_ptr < buf_end);
-		SLJIT_ASSERT(buf_ptr == buf_end);
-		buf = buf->next;
-	} while (buf);
-
-	SLJIT_ASSERT(!label);
-	SLJIT_ASSERT(!jump);
-	SLJIT_ASSERT(!const_);
-
-	jump = compiler->jumps;
-	while (jump) {
-		if (jump->flags & PATCH_MB) {
-			SLJIT_ASSERT((sljit_sw)(jump->u.label->addr - (jump->addr + sizeof(sljit_sb))) >= -128 && (sljit_sw)(jump->u.label->addr - (jump->addr + sizeof(sljit_sb))) <= 127);
-			*(sljit_ub*)jump->addr = (sljit_ub)(jump->u.label->addr - (jump->addr + sizeof(sljit_sb)));
-		} else if (jump->flags & PATCH_MW) {
-			if (jump->flags & JUMP_LABEL) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-				*(sljit_sw*)jump->addr = (sljit_sw)(jump->u.label->addr - (jump->addr + sizeof(sljit_sw)));
-#else
-				SLJIT_ASSERT((sljit_sw)(jump->u.label->addr - (jump->addr + sizeof(sljit_si))) >= HALFWORD_MIN && (sljit_sw)(jump->u.label->addr - (jump->addr + sizeof(sljit_si))) <= HALFWORD_MAX);
-				*(sljit_si*)jump->addr = (sljit_si)(jump->u.label->addr - (jump->addr + sizeof(sljit_si)));
-#endif
-			}
-			else {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-				*(sljit_sw*)jump->addr = (sljit_sw)(jump->u.target - (jump->addr + sizeof(sljit_sw)));
-#else
-				SLJIT_ASSERT((sljit_sw)(jump->u.target - (jump->addr + sizeof(sljit_si))) >= HALFWORD_MIN && (sljit_sw)(jump->u.target - (jump->addr + sizeof(sljit_si))) <= HALFWORD_MAX);
-				*(sljit_si*)jump->addr = (sljit_si)(jump->u.target - (jump->addr + sizeof(sljit_si)));
-#endif
-			}
-		}
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		else if (jump->flags & PATCH_MD)
-			*(sljit_sw*)jump->addr = jump->u.label->addr;
-#endif
-
-		jump = jump->next;
-	}
-
-	/* Maybe we waste some space because of short jumps. */
-	SLJIT_ASSERT(code_ptr <= code + compiler->size);
-	compiler->error = SLJIT_ERR_COMPILED;
-	compiler->executable_size = code_ptr - code;
-	return (void*)code;
-}
-
-/* --------------------------------------------------------------------- */
-/*  Operators                                                            */
-/* --------------------------------------------------------------------- */
-
-static sljit_si emit_cum_binary(struct sljit_compiler *compiler,
-	sljit_ub op_rm, sljit_ub op_mr, sljit_ub op_imm, sljit_ub op_eax_imm,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w);
-
-static sljit_si emit_non_cum_binary(struct sljit_compiler *compiler,
-	sljit_ub op_rm, sljit_ub op_mr, sljit_ub op_imm, sljit_ub op_eax_imm,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w);
-
-static sljit_si emit_mov(struct sljit_compiler *compiler,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw);
-
-static SLJIT_INLINE sljit_si emit_save_flags(struct sljit_compiler *compiler)
-{
-	sljit_ub *inst;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 5);
-	FAIL_IF(!inst);
-	INC_SIZE(5);
-#else
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 6);
-	FAIL_IF(!inst);
-	INC_SIZE(6);
-	*inst++ = REX_W;
-#endif
-	*inst++ = LEA_r_m; /* lea esp/rsp, [esp/rsp + sizeof(sljit_sw)] */
-	*inst++ = 0x64;
-	*inst++ = 0x24;
-	*inst++ = (sljit_ub)sizeof(sljit_sw);
-	*inst++ = PUSHF;
-	compiler->flags_saved = 1;
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si emit_restore_flags(struct sljit_compiler *compiler, sljit_si keep_flags)
-{
-	sljit_ub *inst;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 5);
-	FAIL_IF(!inst);
-	INC_SIZE(5);
-	*inst++ = POPF;
-#else
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 6);
-	FAIL_IF(!inst);
-	INC_SIZE(6);
-	*inst++ = POPF;
-	*inst++ = REX_W;
-#endif
-	*inst++ = LEA_r_m; /* lea esp/rsp, [esp/rsp - sizeof(sljit_sw)] */
-	*inst++ = 0x64;
-	*inst++ = 0x24;
-	*inst++ = (sljit_ub)-(sljit_sb)sizeof(sljit_sw);
-	compiler->flags_saved = keep_flags;
-	return SLJIT_SUCCESS;
-}
-
-#ifdef _WIN32
-#include <malloc.h>
-
-static void SLJIT_CALL sljit_grow_stack(sljit_sw local_size)
-{
-	/* Workaround for calling the internal _chkstk() function on Windows.
-	This function touches all 4k pages belongs to the requested stack space,
-	which size is passed in local_size. This is necessary on Windows where
-	the stack can only grow in 4k steps. However, this function just burn
-	CPU cycles if the stack is large enough. However, you don't know it in
-	advance, so it must always be called. I think this is a bad design in
-	general even if it has some reasons. */
-	*(volatile sljit_si*)alloca(local_size) = 0;
-}
-
-#endif
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-#include "sljitNativeX86_32.c"
-#else
-#include "sljitNativeX86_64.c"
-#endif
-
-static sljit_si emit_mov(struct sljit_compiler *compiler,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-
-	if (dst == SLJIT_UNUSED) {
-		/* No destination, doesn't need to setup flags. */
-		if (src & SLJIT_MEM) {
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src, srcw);
-			FAIL_IF(!inst);
-			*inst = MOV_r_rm;
-		}
-		return SLJIT_SUCCESS;
-	}
-	if (FAST_IS_REG(src)) {
-		inst = emit_x86_instruction(compiler, 1, src, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm_r;
-		return SLJIT_SUCCESS;
-	}
-	if (src & SLJIT_IMM) {
-		if (FAST_IS_REG(dst)) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-			return emit_do_imm(compiler, MOV_r_i32 + reg_map[dst], srcw);
-#else
-			if (!compiler->mode32) {
-				if (NOT_HALFWORD(srcw))
-					return emit_load_imm64(compiler, dst, srcw);
-			}
-			else
-				return emit_do_imm32(compiler, (reg_map[dst] >= 8) ? REX_B : 0, MOV_r_i32 + reg_lmap[dst], srcw);
-#endif
-		}
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if (!compiler->mode32 && NOT_HALFWORD(srcw)) {
-			FAIL_IF(emit_load_imm64(compiler, TMP_REG2, srcw));
-			inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = MOV_rm_r;
-			return SLJIT_SUCCESS;
-		}
-#endif
-		inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, srcw, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm_i32;
-		return SLJIT_SUCCESS;
-	}
-	if (FAST_IS_REG(dst)) {
-		inst = emit_x86_instruction(compiler, 1, dst, 0, src, srcw);
-		FAIL_IF(!inst);
-		*inst = MOV_r_rm;
-		return SLJIT_SUCCESS;
-	}
-
-	/* Memory to memory move. Requires two instruction. */
-	inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src, srcw);
-	FAIL_IF(!inst);
-	*inst = MOV_r_rm;
-	inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, dst, dstw);
-	FAIL_IF(!inst);
-	*inst = MOV_rm_r;
-	return SLJIT_SUCCESS;
-}
-
-#define EMIT_MOV(compiler, dst, dstw, src, srcw) \
-	FAIL_IF(emit_mov(compiler, dst, dstw, src, srcw));
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op)
-{
-	sljit_ub *inst;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	sljit_si size;
-#endif
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op0(compiler, op));
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_BREAKPOINT:
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-		FAIL_IF(!inst);
-		INC_SIZE(1);
-		*inst = INT3;
-		break;
-	case SLJIT_NOP:
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-		FAIL_IF(!inst);
-		INC_SIZE(1);
-		*inst = NOP;
-		break;
-	case SLJIT_LUMUL:
-	case SLJIT_LSMUL:
-	case SLJIT_UDIVMOD:
-	case SLJIT_SDIVMOD:
-	case SLJIT_UDIVI:
-	case SLJIT_SDIVI:
-		compiler->flags_saved = 0;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-#ifdef _WIN64
-		SLJIT_COMPILE_ASSERT(
-			reg_map[SLJIT_R0] == 0
-			&& reg_map[SLJIT_R1] == 2
-			&& reg_map[TMP_REG1] > 7,
-			invalid_register_assignment_for_div_mul);
-#else
-		SLJIT_COMPILE_ASSERT(
-			reg_map[SLJIT_R0] == 0
-			&& reg_map[SLJIT_R1] < 7
-			&& reg_map[TMP_REG1] == 2,
-			invalid_register_assignment_for_div_mul);
-#endif
-		compiler->mode32 = op & SLJIT_INT_OP;
-#endif
-		SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments);
-
-		op = GET_OPCODE(op);
-		if ((op | 0x2) == SLJIT_UDIVI) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || defined(_WIN64)
-			EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0);
-			inst = emit_x86_instruction(compiler, 1, SLJIT_R1, 0, SLJIT_R1, 0);
-#else
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, TMP_REG1, 0);
-#endif
-			FAIL_IF(!inst);
-			*inst = XOR_r_rm;
-		}
-
-		if ((op | 0x2) == SLJIT_SDIVI) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || defined(_WIN64)
-			EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0);
-#endif
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-			FAIL_IF(!inst);
-			INC_SIZE(1);
-			*inst = CDQ;
-#else
-			if (compiler->mode32) {
-				inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-				FAIL_IF(!inst);
-				INC_SIZE(1);
-				*inst = CDQ;
-			} else {
-				inst = (sljit_ub*)ensure_buf(compiler, 1 + 2);
-				FAIL_IF(!inst);
-				INC_SIZE(2);
-				*inst++ = REX_W;
-				*inst = CDQ;
-			}
-#endif
-		}
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 2);
-		FAIL_IF(!inst);
-		INC_SIZE(2);
-		*inst++ = GROUP_F7;
-		*inst = MOD_REG | ((op >= SLJIT_UDIVMOD) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]);
-#else
-#ifdef _WIN64
-		size = (!compiler->mode32 || op >= SLJIT_UDIVMOD) ? 3 : 2;
-#else
-		size = (!compiler->mode32) ? 3 : 2;
-#endif
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-		FAIL_IF(!inst);
-		INC_SIZE(size);
-#ifdef _WIN64
-		if (!compiler->mode32)
-			*inst++ = REX_W | ((op >= SLJIT_UDIVMOD) ? REX_B : 0);
-		else if (op >= SLJIT_UDIVMOD)
-			*inst++ = REX_B;
-		*inst++ = GROUP_F7;
-		*inst = MOD_REG | ((op >= SLJIT_UDIVMOD) ? reg_lmap[TMP_REG1] : reg_lmap[SLJIT_R1]);
-#else
-		if (!compiler->mode32)
-			*inst++ = REX_W;
-		*inst++ = GROUP_F7;
-		*inst = MOD_REG | reg_map[SLJIT_R1];
-#endif
-#endif
-		switch (op) {
-		case SLJIT_LUMUL:
-			*inst |= MUL;
-			break;
-		case SLJIT_LSMUL:
-			*inst |= IMUL;
-			break;
-		case SLJIT_UDIVMOD:
-		case SLJIT_UDIVI:
-			*inst |= DIV;
-			break;
-		case SLJIT_SDIVMOD:
-		case SLJIT_SDIVI:
-			*inst |= IDIV;
-			break;
-		}
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) && !defined(_WIN64)
-		if (op <= SLJIT_SDIVMOD)
-			EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0);
-#else
-		if (op >= SLJIT_UDIVI)
-			EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0);
-#endif
-		break;
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-#define ENCODE_PREFIX(prefix) \
-	do { \
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1); \
-		FAIL_IF(!inst); \
-		INC_SIZE(1); \
-		*inst = (prefix); \
-	} while (0)
-
-static sljit_si emit_mov_byte(struct sljit_compiler *compiler, sljit_si sign,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-	sljit_si dst_r;
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	sljit_si work_r;
-#endif
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 0;
-#endif
-
-	if (dst == SLJIT_UNUSED && !(src & SLJIT_MEM))
-		return SLJIT_SUCCESS; /* Empty instruction. */
-
-	if (src & SLJIT_IMM) {
-		if (FAST_IS_REG(dst)) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-			return emit_do_imm(compiler, MOV_r_i32 + reg_map[dst], srcw);
-#else
-			inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, srcw, dst, 0);
-			FAIL_IF(!inst);
-			*inst = MOV_rm_i32;
-			return SLJIT_SUCCESS;
-#endif
-		}
-		inst = emit_x86_instruction(compiler, 1 | EX86_BYTE_ARG | EX86_NO_REXW, SLJIT_IMM, srcw, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm8_i8;
-		return SLJIT_SUCCESS;
-	}
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-
-	if ((dst & SLJIT_MEM) && FAST_IS_REG(src)) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		if (reg_map[src] >= 4) {
-			SLJIT_ASSERT(dst_r == TMP_REG1);
-			EMIT_MOV(compiler, TMP_REG1, 0, src, 0);
-		} else
-			dst_r = src;
-#else
-		dst_r = src;
-#endif
-	}
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	else if (FAST_IS_REG(src) && reg_map[src] >= 4) {
-		/* src, dst are registers. */
-		SLJIT_ASSERT(SLOW_IS_REG(dst));
-		if (reg_map[dst] < 4) {
-			if (dst != src)
-				EMIT_MOV(compiler, dst, 0, src, 0);
-			inst = emit_x86_instruction(compiler, 2, dst, 0, dst, 0);
-			FAIL_IF(!inst);
-			*inst++ = GROUP_0F;
-			*inst = sign ? MOVSX_r_rm8 : MOVZX_r_rm8;
-		}
-		else {
-			if (dst != src)
-				EMIT_MOV(compiler, dst, 0, src, 0);
-			if (sign) {
-				/* shl reg, 24 */
-				inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_IMM, 24, dst, 0);
-				FAIL_IF(!inst);
-				*inst |= SHL;
-				/* sar reg, 24 */
-				inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_IMM, 24, dst, 0);
-				FAIL_IF(!inst);
-				*inst |= SAR;
-			}
-			else {
-				inst = emit_x86_instruction(compiler, 1 | EX86_BIN_INS, SLJIT_IMM, 0xff, dst, 0);
-				FAIL_IF(!inst);
-				*(inst + 1) |= AND;
-			}
-		}
-		return SLJIT_SUCCESS;
-	}
-#endif
-	else {
-		/* src can be memory addr or reg_map[src] < 4 on x86_32 architectures. */
-		inst = emit_x86_instruction(compiler, 2, dst_r, 0, src, srcw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_0F;
-		*inst = sign ? MOVSX_r_rm8 : MOVZX_r_rm8;
-	}
-
-	if (dst & SLJIT_MEM) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		if (dst_r == TMP_REG1) {
-			/* Find a non-used register, whose reg_map[src] < 4. */
-			if ((dst & REG_MASK) == SLJIT_R0) {
-				if ((dst & OFFS_REG_MASK) == TO_OFFS_REG(SLJIT_R1))
-					work_r = SLJIT_R2;
-				else
-					work_r = SLJIT_R1;
-			}
-			else {
-				if ((dst & OFFS_REG_MASK) != TO_OFFS_REG(SLJIT_R0))
-					work_r = SLJIT_R0;
-				else if ((dst & REG_MASK) == SLJIT_R1)
-					work_r = SLJIT_R2;
-				else
-					work_r = SLJIT_R1;
-			}
-
-			if (work_r == SLJIT_R0) {
-				ENCODE_PREFIX(XCHG_EAX_r + reg_map[TMP_REG1]);
-			}
-			else {
-				inst = emit_x86_instruction(compiler, 1, work_r, 0, dst_r, 0);
-				FAIL_IF(!inst);
-				*inst = XCHG_r_rm;
-			}
-
-			inst = emit_x86_instruction(compiler, 1, work_r, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = MOV_rm8_r8;
-
-			if (work_r == SLJIT_R0) {
-				ENCODE_PREFIX(XCHG_EAX_r + reg_map[TMP_REG1]);
-			}
-			else {
-				inst = emit_x86_instruction(compiler, 1, work_r, 0, dst_r, 0);
-				FAIL_IF(!inst);
-				*inst = XCHG_r_rm;
-			}
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = MOV_rm8_r8;
-		}
-#else
-		inst = emit_x86_instruction(compiler, 1 | EX86_REX | EX86_NO_REXW, dst_r, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm8_r8;
-#endif
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_mov_half(struct sljit_compiler *compiler, sljit_si sign,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-	sljit_si dst_r;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 0;
-#endif
-
-	if (dst == SLJIT_UNUSED && !(src & SLJIT_MEM))
-		return SLJIT_SUCCESS; /* Empty instruction. */
-
-	if (src & SLJIT_IMM) {
-		if (FAST_IS_REG(dst)) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-			return emit_do_imm(compiler, MOV_r_i32 + reg_map[dst], srcw);
-#else
-			inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, srcw, dst, 0);
-			FAIL_IF(!inst);
-			*inst = MOV_rm_i32;
-			return SLJIT_SUCCESS;
-#endif
-		}
-		inst = emit_x86_instruction(compiler, 1 | EX86_HALF_ARG | EX86_NO_REXW | EX86_PREF_66, SLJIT_IMM, srcw, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm_i32;
-		return SLJIT_SUCCESS;
-	}
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-
-	if ((dst & SLJIT_MEM) && FAST_IS_REG(src))
-		dst_r = src;
-	else {
-		inst = emit_x86_instruction(compiler, 2, dst_r, 0, src, srcw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_0F;
-		*inst = sign ? MOVSX_r_rm16 : MOVZX_r_rm16;
-	}
-
-	if (dst & SLJIT_MEM) {
-		inst = emit_x86_instruction(compiler, 1 | EX86_NO_REXW | EX86_PREF_66, dst_r, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = MOV_rm_r;
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_unary(struct sljit_compiler *compiler, sljit_ub opcode,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-
-	if (dst == SLJIT_UNUSED) {
-		EMIT_MOV(compiler, TMP_REG1, 0, src, srcw);
-		inst = emit_x86_instruction(compiler, 1, 0, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_F7;
-		*inst |= opcode;
-		return SLJIT_SUCCESS;
-	}
-	if (dst == src && dstw == srcw) {
-		/* Same input and output */
-		inst = emit_x86_instruction(compiler, 1, 0, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_F7;
-		*inst |= opcode;
-		return SLJIT_SUCCESS;
-	}
-	if (FAST_IS_REG(dst)) {
-		EMIT_MOV(compiler, dst, 0, src, srcw);
-		inst = emit_x86_instruction(compiler, 1, 0, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_F7;
-		*inst |= opcode;
-		return SLJIT_SUCCESS;
-	}
-	EMIT_MOV(compiler, TMP_REG1, 0, src, srcw);
-	inst = emit_x86_instruction(compiler, 1, 0, 0, TMP_REG1, 0);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_F7;
-	*inst |= opcode;
-	EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_not_with_flags(struct sljit_compiler *compiler,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-
-	if (dst == SLJIT_UNUSED) {
-		EMIT_MOV(compiler, TMP_REG1, 0, src, srcw);
-		inst = emit_x86_instruction(compiler, 1, 0, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_F7;
-		*inst |= NOT_rm;
-		inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst = OR_r_rm;
-		return SLJIT_SUCCESS;
-	}
-	if (FAST_IS_REG(dst)) {
-		EMIT_MOV(compiler, dst, 0, src, srcw);
-		inst = emit_x86_instruction(compiler, 1, 0, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_F7;
-		*inst |= NOT_rm;
-		inst = emit_x86_instruction(compiler, 1, dst, 0, dst, 0);
-		FAIL_IF(!inst);
-		*inst = OR_r_rm;
-		return SLJIT_SUCCESS;
-	}
-	EMIT_MOV(compiler, TMP_REG1, 0, src, srcw);
-	inst = emit_x86_instruction(compiler, 1, 0, 0, TMP_REG1, 0);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_F7;
-	*inst |= NOT_rm;
-	inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, TMP_REG1, 0);
-	FAIL_IF(!inst);
-	*inst = OR_r_rm;
-	EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_clz(struct sljit_compiler *compiler, sljit_si op_flags,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-	sljit_si dst_r;
-
-	SLJIT_UNUSED_ARG(op_flags);
-	if (SLJIT_UNLIKELY(dst == SLJIT_UNUSED)) {
-		/* Just set the zero flag. */
-		EMIT_MOV(compiler, TMP_REG1, 0, src, srcw);
-		inst = emit_x86_instruction(compiler, 1, 0, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_F7;
-		*inst |= NOT_rm;
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_IMM, 31, TMP_REG1, 0);
-#else
-		inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_IMM, !(op_flags & SLJIT_INT_OP) ? 63 : 31, TMP_REG1, 0);
-#endif
-		FAIL_IF(!inst);
-		*inst |= SHR;
-		return SLJIT_SUCCESS;
-	}
-
-	if (SLJIT_UNLIKELY(src & SLJIT_IMM)) {
-		EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, srcw);
-		src = TMP_REG1;
-		srcw = 0;
-	}
-
-	inst = emit_x86_instruction(compiler, 2, TMP_REG1, 0, src, srcw);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_0F;
-	*inst = BSR_r_rm;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	if (FAST_IS_REG(dst))
-		dst_r = dst;
-	else {
-		/* Find an unused temporary register. */
-		if ((dst & REG_MASK) != SLJIT_R0 && (dst & OFFS_REG_MASK) != TO_OFFS_REG(SLJIT_R0))
-			dst_r = SLJIT_R0;
-		else if ((dst & REG_MASK) != SLJIT_R1 && (dst & OFFS_REG_MASK) != TO_OFFS_REG(SLJIT_R1))
-			dst_r = SLJIT_R1;
-		else
-			dst_r = SLJIT_R2;
-		EMIT_MOV(compiler, dst, dstw, dst_r, 0);
-	}
-	EMIT_MOV(compiler, dst_r, 0, SLJIT_IMM, 32 + 31);
-#else
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
-	compiler->mode32 = 0;
-	EMIT_MOV(compiler, dst_r, 0, SLJIT_IMM, !(op_flags & SLJIT_INT_OP) ? 64 + 63 : 32 + 31);
-	compiler->mode32 = op_flags & SLJIT_INT_OP;
-#endif
-
-	if (cpu_has_cmov == -1)
-		get_cpu_features();
-
-	if (cpu_has_cmov) {
-		inst = emit_x86_instruction(compiler, 2, dst_r, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_0F;
-		*inst = CMOVNE_r_rm;
-	} else {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-		FAIL_IF(!inst);
-		INC_SIZE(4);
-
-		*inst++ = JE_i8;
-		*inst++ = 2;
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (reg_map[dst_r] << 3) | reg_map[TMP_REG1];
-#else
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 5);
-		FAIL_IF(!inst);
-		INC_SIZE(5);
-
-		*inst++ = JE_i8;
-		*inst++ = 3;
-		*inst++ = REX_W | (reg_map[dst_r] >= 8 ? REX_R : 0) | (reg_map[TMP_REG1] >= 8 ? REX_B : 0);
-		*inst++ = MOV_r_rm;
-		*inst++ = MOD_REG | (reg_lmap[dst_r] << 3) | reg_lmap[TMP_REG1];
-#endif
-	}
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	inst = emit_x86_instruction(compiler, 1 | EX86_BIN_INS, SLJIT_IMM, 31, dst_r, 0);
-#else
-	inst = emit_x86_instruction(compiler, 1 | EX86_BIN_INS, SLJIT_IMM, !(op_flags & SLJIT_INT_OP) ? 63 : 31, dst_r, 0);
-#endif
-	FAIL_IF(!inst);
-	*(inst + 1) |= XOR;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	if (dst & SLJIT_MEM) {
-		inst = emit_x86_instruction(compiler, 1, dst_r, 0, dst, dstw);
-		FAIL_IF(!inst);
-		*inst = XCHG_r_rm;
-	}
-#else
-	if (dst & SLJIT_MEM)
-		EMIT_MOV(compiler, dst, dstw, TMP_REG2, 0);
-#endif
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-	sljit_si update = 0;
-	sljit_si op_flags = GET_ALL_FLAGS(op);
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	sljit_si dst_is_ereg = 0;
-	sljit_si src_is_ereg = 0;
-#else
-#	define src_is_ereg 0
-#endif
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op1(compiler, op, dst, dstw, src, srcw));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	CHECK_EXTRA_REGS(dst, dstw, dst_is_ereg = 1);
-	CHECK_EXTRA_REGS(src, srcw, src_is_ereg = 1);
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = op_flags & SLJIT_INT_OP;
-#endif
-
-	op = GET_OPCODE(op);
-	if (op >= SLJIT_MOV && op <= SLJIT_MOVU_P) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		compiler->mode32 = 0;
-#endif
-
-		if (op_flags & SLJIT_INT_OP) {
-			if (FAST_IS_REG(src) && src == dst) {
-				if (!TYPE_CAST_NEEDED(op))
-					return SLJIT_SUCCESS;
-			}
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			if (op == SLJIT_MOV_SI && (src & SLJIT_MEM))
-				op = SLJIT_MOV_UI;
-			if (op == SLJIT_MOVU_SI && (src & SLJIT_MEM))
-				op = SLJIT_MOVU_UI;
-			if (op == SLJIT_MOV_UI && (src & SLJIT_IMM))
-				op = SLJIT_MOV_SI;
-			if (op == SLJIT_MOVU_UI && (src & SLJIT_IMM))
-				op = SLJIT_MOVU_SI;
-#endif
-		}
-
-		SLJIT_COMPILE_ASSERT(SLJIT_MOV + 8 == SLJIT_MOVU, movu_offset);
-		if (op >= SLJIT_MOVU) {
-			update = 1;
-			op -= 8;
-		}
-
-		if (src & SLJIT_IMM) {
-			switch (op) {
-			case SLJIT_MOV_UB:
-				srcw = (sljit_ub)srcw;
-				break;
-			case SLJIT_MOV_SB:
-				srcw = (sljit_sb)srcw;
-				break;
-			case SLJIT_MOV_UH:
-				srcw = (sljit_uh)srcw;
-				break;
-			case SLJIT_MOV_SH:
-				srcw = (sljit_sh)srcw;
-				break;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			case SLJIT_MOV_UI:
-				srcw = (sljit_ui)srcw;
-				break;
-			case SLJIT_MOV_SI:
-				srcw = (sljit_si)srcw;
-				break;
-#endif
-			}
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-			if (SLJIT_UNLIKELY(dst_is_ereg))
-				return emit_mov(compiler, dst, dstw, src, srcw);
-#endif
-		}
-
-		if (SLJIT_UNLIKELY(update) && (src & SLJIT_MEM) && !src_is_ereg && (src & REG_MASK) && (srcw != 0 || (src & OFFS_REG_MASK) != 0)) {
-			inst = emit_x86_instruction(compiler, 1, src & REG_MASK, 0, src, srcw);
-			FAIL_IF(!inst);
-			*inst = LEA_r_m;
-			src &= SLJIT_MEM | 0xf;
-			srcw = 0;
-		}
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		if (SLJIT_UNLIKELY(dst_is_ereg) && (!(op == SLJIT_MOV || op == SLJIT_MOV_UI || op == SLJIT_MOV_SI || op == SLJIT_MOV_P) || (src & SLJIT_MEM))) {
-			SLJIT_ASSERT(dst == SLJIT_MEM1(SLJIT_SP));
-			dst = TMP_REG1;
-		}
-#endif
-
-		switch (op) {
-		case SLJIT_MOV:
-		case SLJIT_MOV_P:
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		case SLJIT_MOV_UI:
-		case SLJIT_MOV_SI:
-#endif
-			FAIL_IF(emit_mov(compiler, dst, dstw, src, srcw));
-			break;
-		case SLJIT_MOV_UB:
-			FAIL_IF(emit_mov_byte(compiler, 0, dst, dstw, src, srcw));
-			break;
-		case SLJIT_MOV_SB:
-			FAIL_IF(emit_mov_byte(compiler, 1, dst, dstw, src, srcw));
-			break;
-		case SLJIT_MOV_UH:
-			FAIL_IF(emit_mov_half(compiler, 0, dst, dstw, src, srcw));
-			break;
-		case SLJIT_MOV_SH:
-			FAIL_IF(emit_mov_half(compiler, 1, dst, dstw, src, srcw));
-			break;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		case SLJIT_MOV_UI:
-			FAIL_IF(emit_mov_int(compiler, 0, dst, dstw, src, srcw));
-			break;
-		case SLJIT_MOV_SI:
-			FAIL_IF(emit_mov_int(compiler, 1, dst, dstw, src, srcw));
-			break;
-#endif
-		}
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		if (SLJIT_UNLIKELY(dst_is_ereg) && dst == TMP_REG1)
-			return emit_mov(compiler, SLJIT_MEM1(SLJIT_SP), dstw, TMP_REG1, 0);
-#endif
-
-		if (SLJIT_UNLIKELY(update) && (dst & SLJIT_MEM) && (dst & REG_MASK) && (dstw != 0 || (dst & OFFS_REG_MASK) != 0)) {
-			inst = emit_x86_instruction(compiler, 1, dst & REG_MASK, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = LEA_r_m;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	if (SLJIT_UNLIKELY(GET_FLAGS(op_flags)))
-		compiler->flags_saved = 0;
-
-	switch (op) {
-	case SLJIT_NOT:
-		if (SLJIT_UNLIKELY(op_flags & SLJIT_SET_E))
-			return emit_not_with_flags(compiler, dst, dstw, src, srcw);
-		return emit_unary(compiler, NOT_rm, dst, dstw, src, srcw);
-
-	case SLJIT_NEG:
-		if (SLJIT_UNLIKELY(op_flags & SLJIT_KEEP_FLAGS) && !compiler->flags_saved)
-			FAIL_IF(emit_save_flags(compiler));
-		return emit_unary(compiler, NEG_rm, dst, dstw, src, srcw);
-
-	case SLJIT_CLZ:
-		if (SLJIT_UNLIKELY(op_flags & SLJIT_KEEP_FLAGS) && !compiler->flags_saved)
-			FAIL_IF(emit_save_flags(compiler));
-		return emit_clz(compiler, op_flags, dst, dstw, src, srcw);
-	}
-
-	return SLJIT_SUCCESS;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-#	undef src_is_ereg
-#endif
-}
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-
-#define BINARY_IMM(op_imm, op_mr, immw, arg, argw) \
-	if (IS_HALFWORD(immw) || compiler->mode32) { \
-		inst = emit_x86_instruction(compiler, 1 | EX86_BIN_INS, SLJIT_IMM, immw, arg, argw); \
-		FAIL_IF(!inst); \
-		*(inst + 1) |= (op_imm); \
-	} \
-	else { \
-		FAIL_IF(emit_load_imm64(compiler, TMP_REG2, immw)); \
-		inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, arg, argw); \
-		FAIL_IF(!inst); \
-		*inst = (op_mr); \
-	}
-
-#define BINARY_EAX_IMM(op_eax_imm, immw) \
-	FAIL_IF(emit_do_imm32(compiler, (!compiler->mode32) ? REX_W : 0, (op_eax_imm), immw))
-
-#else
-
-#define BINARY_IMM(op_imm, op_mr, immw, arg, argw) \
-	inst = emit_x86_instruction(compiler, 1 | EX86_BIN_INS, SLJIT_IMM, immw, arg, argw); \
-	FAIL_IF(!inst); \
-	*(inst + 1) |= (op_imm);
-
-#define BINARY_EAX_IMM(op_eax_imm, immw) \
-	FAIL_IF(emit_do_imm(compiler, (op_eax_imm), immw))
-
-#endif
-
-static sljit_si emit_cum_binary(struct sljit_compiler *compiler,
-	sljit_ub op_rm, sljit_ub op_mr, sljit_ub op_imm, sljit_ub op_eax_imm,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-
-	if (dst == SLJIT_UNUSED) {
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(op_imm, op_mr, src2w, TMP_REG1, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	if (dst == src1 && dstw == src1w) {
-		if (src2 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			if ((dst == SLJIT_R0) && (src2w > 127 || src2w < -128) && (compiler->mode32 || IS_HALFWORD(src2w))) {
-#else
-			if ((dst == SLJIT_R0) && (src2w > 127 || src2w < -128)) {
-#endif
-				BINARY_EAX_IMM(op_eax_imm, src2w);
-			}
-			else {
-				BINARY_IMM(op_imm, op_mr, src2w, dst, dstw);
-			}
-		}
-		else if (FAST_IS_REG(dst)) {
-			inst = emit_x86_instruction(compiler, 1, dst, dstw, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		else if (FAST_IS_REG(src2)) {
-			/* Special exception for sljit_emit_op_flags. */
-			inst = emit_x86_instruction(compiler, 1, src2, src2w, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = op_mr;
-		}
-		else {
-			EMIT_MOV(compiler, TMP_REG1, 0, src2, src2w);
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = op_mr;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	/* Only for cumulative operations. */
-	if (dst == src2 && dstw == src2w) {
-		if (src1 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			if ((dst == SLJIT_R0) && (src1w > 127 || src1w < -128) && (compiler->mode32 || IS_HALFWORD(src1w))) {
-#else
-			if ((dst == SLJIT_R0) && (src1w > 127 || src1w < -128)) {
-#endif
-				BINARY_EAX_IMM(op_eax_imm, src1w);
-			}
-			else {
-				BINARY_IMM(op_imm, op_mr, src1w, dst, dstw);
-			}
-		}
-		else if (FAST_IS_REG(dst)) {
-			inst = emit_x86_instruction(compiler, 1, dst, dstw, src1, src1w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		else if (FAST_IS_REG(src1)) {
-			inst = emit_x86_instruction(compiler, 1, src1, src1w, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = op_mr;
-		}
-		else {
-			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = op_mr;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	/* General version. */
-	if (FAST_IS_REG(dst)) {
-		EMIT_MOV(compiler, dst, 0, src1, src1w);
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(op_imm, op_mr, src2w, dst, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, dst, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-	}
-	else {
-		/* This version requires less memory writing. */
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(op_imm, op_mr, src2w, TMP_REG1, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_non_cum_binary(struct sljit_compiler *compiler,
-	sljit_ub op_rm, sljit_ub op_mr, sljit_ub op_imm, sljit_ub op_eax_imm,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-
-	if (dst == SLJIT_UNUSED) {
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(op_imm, op_mr, src2w, TMP_REG1, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	if (dst == src1 && dstw == src1w) {
-		if (src2 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			if ((dst == SLJIT_R0) && (src2w > 127 || src2w < -128) && (compiler->mode32 || IS_HALFWORD(src2w))) {
-#else
-			if ((dst == SLJIT_R0) && (src2w > 127 || src2w < -128)) {
-#endif
-				BINARY_EAX_IMM(op_eax_imm, src2w);
-			}
-			else {
-				BINARY_IMM(op_imm, op_mr, src2w, dst, dstw);
-			}
-		}
-		else if (FAST_IS_REG(dst)) {
-			inst = emit_x86_instruction(compiler, 1, dst, dstw, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		else if (FAST_IS_REG(src2)) {
-			inst = emit_x86_instruction(compiler, 1, src2, src2w, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = op_mr;
-		}
-		else {
-			EMIT_MOV(compiler, TMP_REG1, 0, src2, src2w);
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, dst, dstw);
-			FAIL_IF(!inst);
-			*inst = op_mr;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	/* General version. */
-	if (FAST_IS_REG(dst) && dst != src2) {
-		EMIT_MOV(compiler, dst, 0, src1, src1w);
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(op_imm, op_mr, src2w, dst, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, dst, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-	}
-	else {
-		/* This version requires less memory writing. */
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(op_imm, op_mr, src2w, TMP_REG1, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = op_rm;
-		}
-		EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_mul(struct sljit_compiler *compiler,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-	sljit_si dst_r;
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-
-	/* Register destination. */
-	if (dst_r == src1 && !(src2 & SLJIT_IMM)) {
-		inst = emit_x86_instruction(compiler, 2, dst_r, 0, src2, src2w);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_0F;
-		*inst = IMUL_r_rm;
-	}
-	else if (dst_r == src2 && !(src1 & SLJIT_IMM)) {
-		inst = emit_x86_instruction(compiler, 2, dst_r, 0, src1, src1w);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_0F;
-		*inst = IMUL_r_rm;
-	}
-	else if (src1 & SLJIT_IMM) {
-		if (src2 & SLJIT_IMM) {
-			EMIT_MOV(compiler, dst_r, 0, SLJIT_IMM, src2w);
-			src2 = dst_r;
-			src2w = 0;
-		}
-
-		if (src1w <= 127 && src1w >= -128) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = IMUL_r_rm_i8;
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-			FAIL_IF(!inst);
-			INC_SIZE(1);
-			*inst = (sljit_sb)src1w;
-		}
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		else {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = IMUL_r_rm_i32;
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-			FAIL_IF(!inst);
-			INC_SIZE(4);
-			*(sljit_sw*)inst = src1w;
-		}
-#else
-		else if (IS_HALFWORD(src1w)) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = IMUL_r_rm_i32;
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-			FAIL_IF(!inst);
-			INC_SIZE(4);
-			*(sljit_si*)inst = (sljit_si)src1w;
-		}
-		else {
-			EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_IMM, src1w);
-			if (dst_r != src2)
-				EMIT_MOV(compiler, dst_r, 0, src2, src2w);
-			inst = emit_x86_instruction(compiler, 2, dst_r, 0, TMP_REG2, 0);
-			FAIL_IF(!inst);
-			*inst++ = GROUP_0F;
-			*inst = IMUL_r_rm;
-		}
-#endif
-	}
-	else if (src2 & SLJIT_IMM) {
-		/* Note: src1 is NOT immediate. */
-
-		if (src2w <= 127 && src2w >= -128) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src1, src1w);
-			FAIL_IF(!inst);
-			*inst = IMUL_r_rm_i8;
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 1);
-			FAIL_IF(!inst);
-			INC_SIZE(1);
-			*inst = (sljit_sb)src2w;
-		}
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		else {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src1, src1w);
-			FAIL_IF(!inst);
-			*inst = IMUL_r_rm_i32;
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-			FAIL_IF(!inst);
-			INC_SIZE(4);
-			*(sljit_sw*)inst = src2w;
-		}
-#else
-		else if (IS_HALFWORD(src2w)) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, src1, src1w);
-			FAIL_IF(!inst);
-			*inst = IMUL_r_rm_i32;
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 4);
-			FAIL_IF(!inst);
-			INC_SIZE(4);
-			*(sljit_si*)inst = (sljit_si)src2w;
-		}
-		else {
-			EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_IMM, src2w);
-			if (dst_r != src1)
-				EMIT_MOV(compiler, dst_r, 0, src1, src1w);
-			inst = emit_x86_instruction(compiler, 2, dst_r, 0, TMP_REG2, 0);
-			FAIL_IF(!inst);
-			*inst++ = GROUP_0F;
-			*inst = IMUL_r_rm;
-		}
-#endif
-	}
-	else {
-		/* Neither argument is immediate. */
-		if (ADDRESSING_DEPENDS_ON(src2, dst_r))
-			dst_r = TMP_REG1;
-		EMIT_MOV(compiler, dst_r, 0, src1, src1w);
-		inst = emit_x86_instruction(compiler, 2, dst_r, 0, src2, src2w);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_0F;
-		*inst = IMUL_r_rm;
-	}
-
-	if (dst_r == TMP_REG1)
-		EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_lea_binary(struct sljit_compiler *compiler, sljit_si keep_flags,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-	sljit_si dst_r, done = 0;
-
-	/* These cases better be left to handled by normal way. */
-	if (!keep_flags) {
-		if (dst == src1 && dstw == src1w)
-			return SLJIT_ERR_UNSUPPORTED;
-		if (dst == src2 && dstw == src2w)
-			return SLJIT_ERR_UNSUPPORTED;
-	}
-
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-
-	if (FAST_IS_REG(src1)) {
-		if (FAST_IS_REG(src2)) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, SLJIT_MEM2(src1, src2), 0);
-			FAIL_IF(!inst);
-			*inst = LEA_r_m;
-			done = 1;
-		}
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if ((src2 & SLJIT_IMM) && (compiler->mode32 || IS_HALFWORD(src2w))) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, SLJIT_MEM1(src1), (sljit_si)src2w);
-#else
-		if (src2 & SLJIT_IMM) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, SLJIT_MEM1(src1), src2w);
-#endif
-			FAIL_IF(!inst);
-			*inst = LEA_r_m;
-			done = 1;
-		}
-	}
-	else if (FAST_IS_REG(src2)) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if ((src1 & SLJIT_IMM) && (compiler->mode32 || IS_HALFWORD(src1w))) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, SLJIT_MEM1(src2), (sljit_si)src1w);
-#else
-		if (src1 & SLJIT_IMM) {
-			inst = emit_x86_instruction(compiler, 1, dst_r, 0, SLJIT_MEM1(src2), src1w);
-#endif
-			FAIL_IF(!inst);
-			*inst = LEA_r_m;
-			done = 1;
-		}
-	}
-
-	if (done) {
-		if (dst_r == TMP_REG1)
-			return emit_mov(compiler, dst, dstw, TMP_REG1, 0);
-		return SLJIT_SUCCESS;
-	}
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-static sljit_si emit_cmp_binary(struct sljit_compiler *compiler,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (src1 == SLJIT_R0 && (src2 & SLJIT_IMM) && (src2w > 127 || src2w < -128) && (compiler->mode32 || IS_HALFWORD(src2w))) {
-#else
-	if (src1 == SLJIT_R0 && (src2 & SLJIT_IMM) && (src2w > 127 || src2w < -128)) {
-#endif
-		BINARY_EAX_IMM(CMP_EAX_i32, src2w);
-		return SLJIT_SUCCESS;
-	}
-
-	if (FAST_IS_REG(src1)) {
-		if (src2 & SLJIT_IMM) {
-			BINARY_IMM(CMP, CMP_rm_r, src2w, src1, 0);
-		}
-		else {
-			inst = emit_x86_instruction(compiler, 1, src1, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = CMP_r_rm;
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	if (FAST_IS_REG(src2) && !(src1 & SLJIT_IMM)) {
-		inst = emit_x86_instruction(compiler, 1, src2, 0, src1, src1w);
-		FAIL_IF(!inst);
-		*inst = CMP_rm_r;
-		return SLJIT_SUCCESS;
-	}
-
-	if (src2 & SLJIT_IMM) {
-		if (src1 & SLJIT_IMM) {
-			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-			src1 = TMP_REG1;
-			src1w = 0;
-		}
-		BINARY_IMM(CMP, CMP_rm_r, src2w, src1, src1w);
-	}
-	else {
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src2, src2w);
-		FAIL_IF(!inst);
-		*inst = CMP_r_rm;
-	}
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_test_binary(struct sljit_compiler *compiler,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (src1 == SLJIT_R0 && (src2 & SLJIT_IMM) && (src2w > 127 || src2w < -128) && (compiler->mode32 || IS_HALFWORD(src2w))) {
-#else
-	if (src1 == SLJIT_R0 && (src2 & SLJIT_IMM) && (src2w > 127 || src2w < -128)) {
-#endif
-		BINARY_EAX_IMM(TEST_EAX_i32, src2w);
-		return SLJIT_SUCCESS;
-	}
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (src2 == SLJIT_R0 && (src2 & SLJIT_IMM) && (src1w > 127 || src1w < -128) && (compiler->mode32 || IS_HALFWORD(src1w))) {
-#else
-	if (src2 == SLJIT_R0 && (src1 & SLJIT_IMM) && (src1w > 127 || src1w < -128)) {
-#endif
-		BINARY_EAX_IMM(TEST_EAX_i32, src1w);
-		return SLJIT_SUCCESS;
-	}
-
-	if (!(src1 & SLJIT_IMM)) {
-		if (src2 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			if (IS_HALFWORD(src2w) || compiler->mode32) {
-				inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w);
-				FAIL_IF(!inst);
-				*inst = GROUP_F7;
-			}
-			else {
-				FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src2w));
-				inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src1, src1w);
-				FAIL_IF(!inst);
-				*inst = TEST_rm_r;
-			}
-#else
-			inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w);
-			FAIL_IF(!inst);
-			*inst = GROUP_F7;
-#endif
-			return SLJIT_SUCCESS;
-		}
-		else if (FAST_IS_REG(src1)) {
-			inst = emit_x86_instruction(compiler, 1, src1, 0, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = TEST_rm_r;
-			return SLJIT_SUCCESS;
-		}
-	}
-
-	if (!(src2 & SLJIT_IMM)) {
-		if (src1 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-			if (IS_HALFWORD(src1w) || compiler->mode32) {
-				inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src1w, src2, src2w);
-				FAIL_IF(!inst);
-				*inst = GROUP_F7;
-			}
-			else {
-				FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src1w));
-				inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src2, src2w);
-				FAIL_IF(!inst);
-				*inst = TEST_rm_r;
-			}
-#else
-			inst = emit_x86_instruction(compiler, 1, src1, src1w, src2, src2w);
-			FAIL_IF(!inst);
-			*inst = GROUP_F7;
-#endif
-			return SLJIT_SUCCESS;
-		}
-		else if (FAST_IS_REG(src2)) {
-			inst = emit_x86_instruction(compiler, 1, src2, 0, src1, src1w);
-			FAIL_IF(!inst);
-			*inst = TEST_rm_r;
-			return SLJIT_SUCCESS;
-		}
-	}
-
-	EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-	if (src2 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if (IS_HALFWORD(src2w) || compiler->mode32) {
-			inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, TMP_REG1, 0);
-			FAIL_IF(!inst);
-			*inst = GROUP_F7;
-		}
-		else {
-			FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src2w));
-			inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, TMP_REG1, 0);
-			FAIL_IF(!inst);
-			*inst = TEST_rm_r;
-		}
-#else
-		inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst = GROUP_F7;
-#endif
-	}
-	else {
-		inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src2, src2w);
-		FAIL_IF(!inst);
-		*inst = TEST_rm_r;
-	}
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_shift(struct sljit_compiler *compiler,
-	sljit_ub mode,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_ub* inst;
-
-	if ((src2 & SLJIT_IMM) || (src2 == SLJIT_PREF_SHIFT_REG)) {
-		if (dst == src1 && dstw == src1w) {
-			inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, src2, src2w, dst, dstw);
-			FAIL_IF(!inst);
-			*inst |= mode;
-			return SLJIT_SUCCESS;
-		}
-		if (dst == SLJIT_UNUSED) {
-			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-			inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, src2, src2w, TMP_REG1, 0);
-			FAIL_IF(!inst);
-			*inst |= mode;
-			return SLJIT_SUCCESS;
-		}
-		if (dst == SLJIT_PREF_SHIFT_REG && src2 == SLJIT_PREF_SHIFT_REG) {
-			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-			inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_PREF_SHIFT_REG, 0, TMP_REG1, 0);
-			FAIL_IF(!inst);
-			*inst |= mode;
-			EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, TMP_REG1, 0);
-			return SLJIT_SUCCESS;
-		}
-		if (FAST_IS_REG(dst)) {
-			EMIT_MOV(compiler, dst, 0, src1, src1w);
-			inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, src2, src2w, dst, 0);
-			FAIL_IF(!inst);
-			*inst |= mode;
-			return SLJIT_SUCCESS;
-		}
-
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, src2, src2w, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst |= mode;
-		EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-		return SLJIT_SUCCESS;
-	}
-
-	if (dst == SLJIT_PREF_SHIFT_REG) {
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, src2, src2w);
-		inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_PREF_SHIFT_REG, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst |= mode;
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, TMP_REG1, 0);
-	}
-	else if (FAST_IS_REG(dst) && dst != src2 && !ADDRESSING_DEPENDS_ON(src2, dst)) {
-		if (src1 != dst)
-			EMIT_MOV(compiler, dst, 0, src1, src1w);
-		EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_PREF_SHIFT_REG, 0);
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, src2, src2w);
-		inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_PREF_SHIFT_REG, 0, dst, 0);
-		FAIL_IF(!inst);
-		*inst |= mode;
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, TMP_REG1, 0);
-	}
-	else {
-		/* This case is really difficult, since ecx itself may used for
-		   addressing, and we must ensure to work even in that case. */
-		EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_PREF_SHIFT_REG, 0);
-#else
-		/* [esp+0] contains the flags. */
-		EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), sizeof(sljit_sw), SLJIT_PREF_SHIFT_REG, 0);
-#endif
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, src2, src2w);
-		inst = emit_x86_instruction(compiler, 1 | EX86_SHIFT_INS, SLJIT_PREF_SHIFT_REG, 0, TMP_REG1, 0);
-		FAIL_IF(!inst);
-		*inst |= mode;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, TMP_REG2, 0);
-#else
-		EMIT_MOV(compiler, SLJIT_PREF_SHIFT_REG, 0, SLJIT_MEM1(SLJIT_SP), sizeof(sljit_sw));
-#endif
-		EMIT_MOV(compiler, dst, dstw, TMP_REG1, 0);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_shift_with_flags(struct sljit_compiler *compiler,
-	sljit_ub mode, sljit_si set_flags,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	/* The CPU does not set flags if the shift count is 0. */
-	if (src2 & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if ((src2w & 0x3f) != 0 || (compiler->mode32 && (src2w & 0x1f) != 0))
-			return emit_shift(compiler, mode, dst, dstw, src1, src1w, src2, src2w);
-#else
-		if ((src2w & 0x1f) != 0)
-			return emit_shift(compiler, mode, dst, dstw, src1, src1w, src2, src2w);
-#endif
-		if (!set_flags)
-			return emit_mov(compiler, dst, dstw, src1, src1w);
-		/* OR dst, src, 0 */
-		return emit_cum_binary(compiler, OR_r_rm, OR_rm_r, OR, OR_EAX_i32,
-			dst, dstw, src1, src1w, SLJIT_IMM, 0);
-	}
-
-	if (!set_flags)
-		return emit_shift(compiler, mode, dst, dstw, src1, src1w, src2, src2w);
-
-	if (!FAST_IS_REG(dst))
-		FAIL_IF(emit_cmp_binary(compiler, src1, src1w, SLJIT_IMM, 0));
-
-	FAIL_IF(emit_shift(compiler,mode, dst, dstw, src1, src1w, src2, src2w));
-
-	if (FAST_IS_REG(dst))
-		return emit_cmp_binary(compiler, dst, dstw, SLJIT_IMM, 0);
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op2(compiler, op, dst, dstw, src1, src1w, src2, src2w));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-	ADJUST_LOCAL_OFFSET(src2, src2w);
-
-	CHECK_EXTRA_REGS(dst, dstw, (void)0);
-	CHECK_EXTRA_REGS(src1, src1w, (void)0);
-	CHECK_EXTRA_REGS(src2, src2w, (void)0);
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = op & SLJIT_INT_OP;
-#endif
-
-	if (GET_OPCODE(op) >= SLJIT_MUL) {
-		if (SLJIT_UNLIKELY(GET_FLAGS(op)))
-			compiler->flags_saved = 0;
-		else if (SLJIT_UNLIKELY(op & SLJIT_KEEP_FLAGS) && !compiler->flags_saved)
-			FAIL_IF(emit_save_flags(compiler));
-	}
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_ADD:
-		if (!GET_FLAGS(op)) {
-			if (emit_lea_binary(compiler, op & SLJIT_KEEP_FLAGS, dst, dstw, src1, src1w, src2, src2w) != SLJIT_ERR_UNSUPPORTED)
-				return compiler->error;
-		}
-		else
-			compiler->flags_saved = 0;
-		if (SLJIT_UNLIKELY(op & SLJIT_KEEP_FLAGS) && !compiler->flags_saved)
-			FAIL_IF(emit_save_flags(compiler));
-		return emit_cum_binary(compiler, ADD_r_rm, ADD_rm_r, ADD, ADD_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_ADDC:
-		if (SLJIT_UNLIKELY(compiler->flags_saved)) /* C flag must be restored. */
-			FAIL_IF(emit_restore_flags(compiler, 1));
-		else if (SLJIT_UNLIKELY(op & SLJIT_KEEP_FLAGS))
-			FAIL_IF(emit_save_flags(compiler));
-		if (SLJIT_UNLIKELY(GET_FLAGS(op)))
-			compiler->flags_saved = 0;
-		return emit_cum_binary(compiler, ADC_r_rm, ADC_rm_r, ADC, ADC_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_SUB:
-		if (!GET_FLAGS(op)) {
-			if ((src2 & SLJIT_IMM) && emit_lea_binary(compiler, op & SLJIT_KEEP_FLAGS, dst, dstw, src1, src1w, SLJIT_IMM, -src2w) != SLJIT_ERR_UNSUPPORTED)
-				return compiler->error;
-		}
-		else
-			compiler->flags_saved = 0;
-		if (SLJIT_UNLIKELY(op & SLJIT_KEEP_FLAGS) && !compiler->flags_saved)
-			FAIL_IF(emit_save_flags(compiler));
-		if (dst == SLJIT_UNUSED)
-			return emit_cmp_binary(compiler, src1, src1w, src2, src2w);
-		return emit_non_cum_binary(compiler, SUB_r_rm, SUB_rm_r, SUB, SUB_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_SUBC:
-		if (SLJIT_UNLIKELY(compiler->flags_saved)) /* C flag must be restored. */
-			FAIL_IF(emit_restore_flags(compiler, 1));
-		else if (SLJIT_UNLIKELY(op & SLJIT_KEEP_FLAGS))
-			FAIL_IF(emit_save_flags(compiler));
-		if (SLJIT_UNLIKELY(GET_FLAGS(op)))
-			compiler->flags_saved = 0;
-		return emit_non_cum_binary(compiler, SBB_r_rm, SBB_rm_r, SBB, SBB_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_MUL:
-		return emit_mul(compiler, dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_AND:
-		if (dst == SLJIT_UNUSED)
-			return emit_test_binary(compiler, src1, src1w, src2, src2w);
-		return emit_cum_binary(compiler, AND_r_rm, AND_rm_r, AND, AND_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_OR:
-		return emit_cum_binary(compiler, OR_r_rm, OR_rm_r, OR, OR_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_XOR:
-		return emit_cum_binary(compiler, XOR_r_rm, XOR_rm_r, XOR, XOR_EAX_i32,
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_SHL:
-		return emit_shift_with_flags(compiler, SHL, GET_FLAGS(op),
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_LSHR:
-		return emit_shift_with_flags(compiler, SHR, GET_FLAGS(op),
-			dst, dstw, src1, src1w, src2, src2w);
-	case SLJIT_ASHR:
-		return emit_shift_with_flags(compiler, SAR, GET_FLAGS(op),
-			dst, dstw, src1, src1w, src2, src2w);
-	}
-
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg)
-{
-	CHECK_REG_INDEX(check_sljit_get_register_index(reg));
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	if (reg >= SLJIT_R3 && reg <= SLJIT_R6)
-		return -1;
-#endif
-	return reg_map[reg];
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_float_register_index(sljit_si reg)
-{
-	CHECK_REG_INDEX(check_sljit_get_float_register_index(reg));
-	return reg;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler,
-	void *instruction, sljit_si size)
-{
-	sljit_ub *inst;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op_custom(compiler, instruction, size));
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + size);
-	FAIL_IF(!inst);
-	INC_SIZE(size);
-	SLJIT_MEMMOVE(inst, instruction, size);
-	return SLJIT_SUCCESS;
-}
-
-/* --------------------------------------------------------------------- */
-/*  Floating point operators                                             */
-/* --------------------------------------------------------------------- */
-
-/* Alignment + 2 * 16 bytes. */
-static sljit_si sse2_data[3 + (4 + 4) * 2];
-static sljit_si *sse2_buffer;
-
-static void init_compiler(void)
-{
-	sse2_buffer = (sljit_si*)(((sljit_uw)sse2_data + 15) & ~0xf);
-	/* Single precision constants. */
-	sse2_buffer[0] = 0x80000000;
-	sse2_buffer[4] = 0x7fffffff;
-	/* Double precision constants. */
-	sse2_buffer[8] = 0;
-	sse2_buffer[9] = 0x80000000;
-	sse2_buffer[12] = 0xffffffff;
-	sse2_buffer[13] = 0x7fffffff;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_is_fpu_available(void)
-{
-#ifdef SLJIT_IS_FPU_AVAILABLE
-	return SLJIT_IS_FPU_AVAILABLE;
-#elif (defined SLJIT_DETECT_SSE2 && SLJIT_DETECT_SSE2)
-	if (cpu_has_sse2 == -1)
-		get_cpu_features();
-	return cpu_has_sse2;
-#else /* SLJIT_DETECT_SSE2 */
-	return 1;
-#endif /* SLJIT_DETECT_SSE2 */
-}
-
-static sljit_si emit_sse2(struct sljit_compiler *compiler, sljit_ub opcode,
-	sljit_si single, sljit_si xmm1, sljit_si xmm2, sljit_sw xmm2w)
-{
-	sljit_ub *inst;
-
-	inst = emit_x86_instruction(compiler, 2 | (single ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2, xmm1, 0, xmm2, xmm2w);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_0F;
-	*inst = opcode;
-	return SLJIT_SUCCESS;
-}
-
-static sljit_si emit_sse2_logic(struct sljit_compiler *compiler, sljit_ub opcode,
-	sljit_si pref66, sljit_si xmm1, sljit_si xmm2, sljit_sw xmm2w)
-{
-	sljit_ub *inst;
-
-	inst = emit_x86_instruction(compiler, 2 | (pref66 ? EX86_PREF_66 : 0) | EX86_SSE2, xmm1, 0, xmm2, xmm2w);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_0F;
-	*inst = opcode;
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si emit_sse2_load(struct sljit_compiler *compiler,
-	sljit_si single, sljit_si dst, sljit_si src, sljit_sw srcw)
-{
-	return emit_sse2(compiler, MOVSD_x_xm, single, dst, src, srcw);
-}
-
-static SLJIT_INLINE sljit_si emit_sse2_store(struct sljit_compiler *compiler,
-	sljit_si single, sljit_si dst, sljit_sw dstw, sljit_si src)
-{
-	return emit_sse2(compiler, MOVSD_xm_x, single, src, dst, dstw);
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_convw_fromd(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si dst_r = SLOW_IS_REG(dst) ? dst : TMP_REG1;
-	sljit_ub *inst;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (GET_OPCODE(op) == SLJIT_CONVW_FROMD)
-		compiler->mode32 = 0;
-#endif
-
-	inst = emit_x86_instruction(compiler, 2 | ((op & SLJIT_SINGLE_OP) ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2_OP2, dst_r, 0, src, srcw);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_0F;
-	*inst = CVTTSD2SI_r_xm;
-
-	if (dst_r == TMP_REG1 && dst != SLJIT_UNUSED)
-		return emit_mov(compiler, dst, dstw, TMP_REG1, 0);
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_convd_fromw(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si dst_r = FAST_IS_REG(dst) ? dst : TMP_FREG;
-	sljit_ub *inst;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (GET_OPCODE(op) == SLJIT_CONVD_FROMW)
-		compiler->mode32 = 0;
-#endif
-
-	if (src & SLJIT_IMM) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		if (GET_OPCODE(op) == SLJIT_CONVD_FROMI)
-			srcw = (sljit_si)srcw;
-#endif
-		EMIT_MOV(compiler, TMP_REG1, 0, src, srcw);
-		src = TMP_REG1;
-		srcw = 0;
-	}
-
-	inst = emit_x86_instruction(compiler, 2 | ((op & SLJIT_SINGLE_OP) ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2_OP1, dst_r, 0, src, srcw);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_0F;
-	*inst = CVTSI2SD_x_rm;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 1;
-#endif
-	if (dst_r == TMP_FREG)
-		return emit_sse2_store(compiler, op & SLJIT_SINGLE_OP, dst, dstw, TMP_FREG);
-	return SLJIT_SUCCESS;
-}
-
-static SLJIT_INLINE sljit_si sljit_emit_fop1_cmp(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	compiler->flags_saved = 0;
-	if (!FAST_IS_REG(src1)) {
-		FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, TMP_FREG, src1, src1w));
-		src1 = TMP_FREG;
-	}
-	return emit_sse2_logic(compiler, UCOMISD_x_xm, !(op & SLJIT_SINGLE_OP), src1, src2, src2w);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop1(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_si dst_r;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 1;
-#endif
-
-	CHECK_ERROR();
-	SELECT_FOP1_OPERATION_WITH_CHECKS(compiler, op, dst, dstw, src, srcw);
-
-	if (GET_OPCODE(op) == SLJIT_DMOV) {
-		if (FAST_IS_REG(dst))
-			return emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, dst, src, srcw);
-		if (FAST_IS_REG(src))
-			return emit_sse2_store(compiler, op & SLJIT_SINGLE_OP, dst, dstw, src);
-		FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, TMP_FREG, src, srcw));
-		return emit_sse2_store(compiler, op & SLJIT_SINGLE_OP, dst, dstw, TMP_FREG);
-	}
-
-	if (GET_OPCODE(op) == SLJIT_CONVD_FROMS) {
-		dst_r = FAST_IS_REG(dst) ? dst : TMP_FREG;
-		if (FAST_IS_REG(src)) {
-			/* We overwrite the high bits of source. From SLJIT point of view,
-			   this is not an issue.
-			   Note: In SSE3, we could also use MOVDDUP and MOVSLDUP. */
-			FAIL_IF(emit_sse2_logic(compiler, UNPCKLPD_x_xm, op & SLJIT_SINGLE_OP, src, src, 0));
-		}
-		else {
-			FAIL_IF(emit_sse2_load(compiler, !(op & SLJIT_SINGLE_OP), TMP_FREG, src, srcw));
-			src = TMP_FREG;
-		}
-
-		FAIL_IF(emit_sse2_logic(compiler, CVTPD2PS_x_xm, op & SLJIT_SINGLE_OP, dst_r, src, 0));
-		if (dst_r == TMP_FREG)
-			return emit_sse2_store(compiler, op & SLJIT_SINGLE_OP, dst, dstw, TMP_FREG);
-		return SLJIT_SUCCESS;
-	}
-
-	if (SLOW_IS_REG(dst)) {
-		dst_r = dst;
-		if (dst != src)
-			FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, dst_r, src, srcw));
-	}
-	else {
-		dst_r = TMP_FREG;
-		FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, dst_r, src, srcw));
-	}
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_DNEG:
-		FAIL_IF(emit_sse2_logic(compiler, XORPD_x_xm, 1, dst_r, SLJIT_MEM0(), (sljit_sw)(op & SLJIT_SINGLE_OP ? sse2_buffer : sse2_buffer + 8)));
-		break;
-
-	case SLJIT_DABS:
-		FAIL_IF(emit_sse2_logic(compiler, ANDPD_x_xm, 1, dst_r, SLJIT_MEM0(), (sljit_sw)(op & SLJIT_SINGLE_OP ? sse2_buffer + 4 : sse2_buffer + 12)));
-		break;
-	}
-
-	if (dst_r == TMP_FREG)
-		return emit_sse2_store(compiler, op & SLJIT_SINGLE_OP, dst, dstw, TMP_FREG);
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fop2(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src1, sljit_sw src1w,
-	sljit_si src2, sljit_sw src2w)
-{
-	sljit_si dst_r;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_fop2(compiler, op, dst, dstw, src1, src1w, src2, src2w));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-	ADJUST_LOCAL_OFFSET(src2, src2w);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 1;
-#endif
-
-	if (FAST_IS_REG(dst)) {
-		dst_r = dst;
-		if (dst == src1)
-			; /* Do nothing here. */
-		else if (dst == src2 && (op == SLJIT_DADD || op == SLJIT_DMUL)) {
-			/* Swap arguments. */
-			src2 = src1;
-			src2w = src1w;
-		}
-		else if (dst != src2)
-			FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, dst_r, src1, src1w));
-		else {
-			dst_r = TMP_FREG;
-			FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, TMP_FREG, src1, src1w));
-		}
-	}
-	else {
-		dst_r = TMP_FREG;
-		FAIL_IF(emit_sse2_load(compiler, op & SLJIT_SINGLE_OP, TMP_FREG, src1, src1w));
-	}
-
-	switch (GET_OPCODE(op)) {
-	case SLJIT_DADD:
-		FAIL_IF(emit_sse2(compiler, ADDSD_x_xm, op & SLJIT_SINGLE_OP, dst_r, src2, src2w));
-		break;
-
-	case SLJIT_DSUB:
-		FAIL_IF(emit_sse2(compiler, SUBSD_x_xm, op & SLJIT_SINGLE_OP, dst_r, src2, src2w));
-		break;
-
-	case SLJIT_DMUL:
-		FAIL_IF(emit_sse2(compiler, MULSD_x_xm, op & SLJIT_SINGLE_OP, dst_r, src2, src2w));
-		break;
-
-	case SLJIT_DDIV:
-		FAIL_IF(emit_sse2(compiler, DIVSD_x_xm, op & SLJIT_SINGLE_OP, dst_r, src2, src2w));
-		break;
-	}
-
-	if (dst_r == TMP_FREG)
-		return emit_sse2_store(compiler, op & SLJIT_SINGLE_OP, dst, dstw, TMP_FREG);
-	return SLJIT_SUCCESS;
-}
-
-/* --------------------------------------------------------------------- */
-/*  Conditional instructions                                             */
-/* --------------------------------------------------------------------- */
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compiler *compiler)
-{
-	sljit_ub *inst;
-	struct sljit_label *label;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_label(compiler));
-
-	/* We should restore the flags before the label,
-	   since other taken jumps has their own flags as well. */
-	if (SLJIT_UNLIKELY(compiler->flags_saved))
-		PTR_FAIL_IF(emit_restore_flags(compiler, 0));
-
-	if (compiler->last_label && compiler->last_label->size == compiler->size)
-		return compiler->last_label;
-
-	label = (struct sljit_label*)ensure_abuf(compiler, sizeof(struct sljit_label));
-	PTR_FAIL_IF(!label);
-	set_label(label, compiler);
-
-	inst = (sljit_ub*)ensure_buf(compiler, 2);
-	PTR_FAIL_IF(!inst);
-
-	*inst++ = 0;
-	*inst++ = 0;
-
-	return label;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compiler *compiler, sljit_si type)
-{
-	sljit_ub *inst;
-	struct sljit_jump *jump;
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_jump(compiler, type));
-
-	if (SLJIT_UNLIKELY(compiler->flags_saved)) {
-		if ((type & 0xff) <= SLJIT_JUMP)
-			PTR_FAIL_IF(emit_restore_flags(compiler, 0));
-		compiler->flags_saved = 0;
-	}
-
-	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
-	PTR_FAIL_IF_NULL(jump);
-	set_jump(jump, compiler, type & SLJIT_REWRITABLE_JUMP);
-	type &= 0xff;
-
-	if (type >= SLJIT_CALL1)
-		PTR_FAIL_IF(call_with_args(compiler, type));
-
-	/* Worst case size. */
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	compiler->size += (type >= SLJIT_JUMP) ? 5 : 6;
-#else
-	compiler->size += (type >= SLJIT_JUMP) ? (10 + 3) : (2 + 10 + 3);
-#endif
-
-	inst = (sljit_ub*)ensure_buf(compiler, 2);
-	PTR_FAIL_IF_NULL(inst);
-
-	*inst++ = 0;
-	*inst++ = type + 4;
-	return jump;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_ijump(struct sljit_compiler *compiler, sljit_si type, sljit_si src, sljit_sw srcw)
-{
-	sljit_ub *inst;
-	struct sljit_jump *jump;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_ijump(compiler, type, src, srcw));
-	ADJUST_LOCAL_OFFSET(src, srcw);
-
-	CHECK_EXTRA_REGS(src, srcw, (void)0);
-
-	if (SLJIT_UNLIKELY(compiler->flags_saved)) {
-		if (type <= SLJIT_JUMP)
-			FAIL_IF(emit_restore_flags(compiler, 0));
-		compiler->flags_saved = 0;
-	}
-
-	if (type >= SLJIT_CALL1) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-		if (src == SLJIT_R2) {
-			EMIT_MOV(compiler, TMP_REG1, 0, src, 0);
-			src = TMP_REG1;
-		}
-		if (src == SLJIT_MEM1(SLJIT_SP) && type >= SLJIT_CALL3)
-			srcw += sizeof(sljit_sw);
-#endif
-#endif
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) && defined(_WIN64)
-		if (src == SLJIT_R2) {
-			EMIT_MOV(compiler, TMP_REG1, 0, src, 0);
-			src = TMP_REG1;
-		}
-#endif
-		FAIL_IF(call_with_args(compiler, type));
-	}
-
-	if (src == SLJIT_IMM) {
-		jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
-		FAIL_IF_NULL(jump);
-		set_jump(jump, compiler, JUMP_ADDR);
-		jump->u.target = srcw;
-
-		/* Worst case size. */
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		compiler->size += 5;
-#else
-		compiler->size += 10 + 3;
-#endif
-
-		inst = (sljit_ub*)ensure_buf(compiler, 2);
-		FAIL_IF_NULL(inst);
-
-		*inst++ = 0;
-		*inst++ = type + 4;
-	}
-	else {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		/* REX_W is not necessary (src is not immediate). */
-		compiler->mode32 = 1;
-#endif
-		inst = emit_x86_instruction(compiler, 1, 0, 0, src, srcw);
-		FAIL_IF(!inst);
-		*inst++ = GROUP_FF;
-		*inst |= (type >= SLJIT_FAST_CALL) ? CALL_rm : JMP_rm;
-	}
-	return SLJIT_SUCCESS;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_flags(struct sljit_compiler *compiler, sljit_si op,
-	sljit_si dst, sljit_sw dstw,
-	sljit_si src, sljit_sw srcw,
-	sljit_si type)
-{
-	sljit_ub *inst;
-	sljit_ub cond_set = 0;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	sljit_si reg;
-#else
-	/* CHECK_EXTRA_REGS migh overwrite these values. */
-	sljit_si dst_save = dst;
-	sljit_sw dstw_save = dstw;
-#endif
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_op_flags(compiler, op, dst, dstw, src, srcw, type));
-	SLJIT_UNUSED_ARG(srcw);
-
-	if (dst == SLJIT_UNUSED)
-		return SLJIT_SUCCESS;
-
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-	CHECK_EXTRA_REGS(dst, dstw, (void)0);
-	if (SLJIT_UNLIKELY(compiler->flags_saved))
-		FAIL_IF(emit_restore_flags(compiler, op & SLJIT_KEEP_FLAGS));
-
-	type &= 0xff;
-	/* setcc = jcc + 0x10. */
-	cond_set = get_jump_code(type) + 0x10;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (GET_OPCODE(op) == SLJIT_OR && !GET_ALL_FLAGS(op) && FAST_IS_REG(dst) && dst == src) {
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 4 + 3);
-		FAIL_IF(!inst);
-		INC_SIZE(4 + 3);
-		/* Set low register to conditional flag. */
-		*inst++ = (reg_map[TMP_REG1] <= 7) ? REX : REX_B;
-		*inst++ = GROUP_0F;
-		*inst++ = cond_set;
-		*inst++ = MOD_REG | reg_lmap[TMP_REG1];
-		*inst++ = REX | (reg_map[TMP_REG1] <= 7 ? 0 : REX_R) | (reg_map[dst] <= 7 ? 0 : REX_B);
-		*inst++ = OR_rm8_r8;
-		*inst++ = MOD_REG | (reg_lmap[TMP_REG1] << 3) | reg_lmap[dst];
-		return SLJIT_SUCCESS;
-	}
-
-	reg = (op == SLJIT_MOV && FAST_IS_REG(dst)) ? dst : TMP_REG1;
-
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 4 + 4);
-	FAIL_IF(!inst);
-	INC_SIZE(4 + 4);
-	/* Set low register to conditional flag. */
-	*inst++ = (reg_map[reg] <= 7) ? REX : REX_B;
-	*inst++ = GROUP_0F;
-	*inst++ = cond_set;
-	*inst++ = MOD_REG | reg_lmap[reg];
-	*inst++ = REX_W | (reg_map[reg] <= 7 ? 0 : (REX_B | REX_R));
-	*inst++ = GROUP_0F;
-	*inst++ = MOVZX_r_rm8;
-	*inst = MOD_REG | (reg_lmap[reg] << 3) | reg_lmap[reg];
-
-	if (reg != TMP_REG1)
-		return SLJIT_SUCCESS;
-
-	if (GET_OPCODE(op) < SLJIT_ADD) {
-		compiler->mode32 = GET_OPCODE(op) != SLJIT_MOV;
-		return emit_mov(compiler, dst, dstw, TMP_REG1, 0);
-	}
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	return sljit_emit_op2(compiler, op, dst, dstw, dst, dstw, TMP_REG1, 0);
-#else /* SLJIT_CONFIG_X86_64 */
-	if (GET_OPCODE(op) < SLJIT_ADD && FAST_IS_REG(dst)) {
-		if (reg_map[dst] <= 4) {
-			/* Low byte is accessible. */
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 3 + 3);
-			FAIL_IF(!inst);
-			INC_SIZE(3 + 3);
-			/* Set low byte to conditional flag. */
-			*inst++ = GROUP_0F;
-			*inst++ = cond_set;
-			*inst++ = MOD_REG | reg_map[dst];
-
-			*inst++ = GROUP_0F;
-			*inst++ = MOVZX_r_rm8;
-			*inst = MOD_REG | (reg_map[dst] << 3) | reg_map[dst];
-			return SLJIT_SUCCESS;
-		}
-
-		/* Low byte is not accessible. */
-		if (cpu_has_cmov == -1)
-			get_cpu_features();
-
-		if (cpu_has_cmov) {
-			EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, 1);
-			/* a xor reg, reg operation would overwrite the flags. */
-			EMIT_MOV(compiler, dst, 0, SLJIT_IMM, 0);
-
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 3);
-			FAIL_IF(!inst);
-			INC_SIZE(3);
-
-			*inst++ = GROUP_0F;
-			/* cmovcc = setcc - 0x50. */
-			*inst++ = cond_set - 0x50;
-			*inst++ = MOD_REG | (reg_map[dst] << 3) | reg_map[TMP_REG1];
-			return SLJIT_SUCCESS;
-		}
-
-		inst = (sljit_ub*)ensure_buf(compiler, 1 + 1 + 3 + 3 + 1);
-		FAIL_IF(!inst);
-		INC_SIZE(1 + 3 + 3 + 1);
-		*inst++ = XCHG_EAX_r + reg_map[TMP_REG1];
-		/* Set al to conditional flag. */
-		*inst++ = GROUP_0F;
-		*inst++ = cond_set;
-		*inst++ = MOD_REG | 0 /* eax */;
-
-		*inst++ = GROUP_0F;
-		*inst++ = MOVZX_r_rm8;
-		*inst++ = MOD_REG | (reg_map[dst] << 3) | 0 /* eax */;
-		*inst++ = XCHG_EAX_r + reg_map[TMP_REG1];
-		return SLJIT_SUCCESS;
-	}
-
-	if (GET_OPCODE(op) == SLJIT_OR && !GET_ALL_FLAGS(op) && FAST_IS_REG(dst) && dst == src && reg_map[dst] <= 4) {
-		SLJIT_COMPILE_ASSERT(reg_map[SLJIT_R0] == 0, scratch_reg1_must_be_eax);
-		if (dst != SLJIT_R0) {
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 1 + 3 + 2 + 1);
-			FAIL_IF(!inst);
-			INC_SIZE(1 + 3 + 2 + 1);
-			/* Set low register to conditional flag. */
-			*inst++ = XCHG_EAX_r + reg_map[TMP_REG1];
-			*inst++ = GROUP_0F;
-			*inst++ = cond_set;
-			*inst++ = MOD_REG | 0 /* eax */;
-			*inst++ = OR_rm8_r8;
-			*inst++ = MOD_REG | (0 /* eax */ << 3) | reg_map[dst];
-			*inst++ = XCHG_EAX_r + reg_map[TMP_REG1];
-		}
-		else {
-			inst = (sljit_ub*)ensure_buf(compiler, 1 + 2 + 3 + 2 + 2);
-			FAIL_IF(!inst);
-			INC_SIZE(2 + 3 + 2 + 2);
-			/* Set low register to conditional flag. */
-			*inst++ = XCHG_r_rm;
-			*inst++ = MOD_REG | (1 /* ecx */ << 3) | reg_map[TMP_REG1];
-			*inst++ = GROUP_0F;
-			*inst++ = cond_set;
-			*inst++ = MOD_REG | 1 /* ecx */;
-			*inst++ = OR_rm8_r8;
-			*inst++ = MOD_REG | (1 /* ecx */ << 3) | 0 /* eax */;
-			*inst++ = XCHG_r_rm;
-			*inst++ = MOD_REG | (1 /* ecx */ << 3) | reg_map[TMP_REG1];
-		}
-		return SLJIT_SUCCESS;
-	}
-
-	/* Set TMP_REG1 to the bit. */
-	inst = (sljit_ub*)ensure_buf(compiler, 1 + 1 + 3 + 3 + 1);
-	FAIL_IF(!inst);
-	INC_SIZE(1 + 3 + 3 + 1);
-	*inst++ = XCHG_EAX_r + reg_map[TMP_REG1];
-	/* Set al to conditional flag. */
-	*inst++ = GROUP_0F;
-	*inst++ = cond_set;
-	*inst++ = MOD_REG | 0 /* eax */;
-
-	*inst++ = GROUP_0F;
-	*inst++ = MOVZX_r_rm8;
-	*inst++ = MOD_REG | (0 << 3) /* eax */ | 0 /* eax */;
-
-	*inst++ = XCHG_EAX_r + reg_map[TMP_REG1];
-
-	if (GET_OPCODE(op) < SLJIT_ADD)
-		return emit_mov(compiler, dst, dstw, TMP_REG1, 0);
-
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->skip_checks = 1;
-#endif
-	return sljit_emit_op2(compiler, op, dst_save, dstw_save, dst_save, dstw_save, TMP_REG1, 0);
-#endif /* SLJIT_CONFIG_X86_64 */
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset)
-{
-	CHECK_ERROR();
-	CHECK(check_sljit_get_local_base(compiler, dst, dstw, offset));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	CHECK_EXTRA_REGS(dst, dstw, (void)0);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 0;
-#endif
-
-	ADJUST_LOCAL_OFFSET(SLJIT_MEM1(SLJIT_SP), offset);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (NOT_HALFWORD(offset)) {
-		FAIL_IF(emit_load_imm64(compiler, TMP_REG1, offset));
-#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
-		SLJIT_ASSERT(emit_lea_binary(compiler, SLJIT_KEEP_FLAGS, dst, dstw, SLJIT_SP, 0, TMP_REG1, 0) != SLJIT_ERR_UNSUPPORTED);
-		return compiler->error;
-#else
-		return emit_lea_binary(compiler, SLJIT_KEEP_FLAGS, dst, dstw, SLJIT_SP, 0, TMP_REG1, 0);
-#endif
-	}
-#endif
-
-	if (offset != 0)
-		return emit_lea_binary(compiler, SLJIT_KEEP_FLAGS, dst, dstw, SLJIT_SP, 0, SLJIT_IMM, offset);
-	return emit_mov(compiler, dst, dstw, SLJIT_SP, 0);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value)
-{
-	sljit_ub *inst;
-	struct sljit_const *const_;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	sljit_si reg;
-#endif
-
-	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_const(compiler, dst, dstw, init_value));
-	ADJUST_LOCAL_OFFSET(dst, dstw);
-
-	CHECK_EXTRA_REGS(dst, dstw, (void)0);
-
-	const_ = (struct sljit_const*)ensure_abuf(compiler, sizeof(struct sljit_const));
-	PTR_FAIL_IF(!const_);
-	set_const(const_, compiler);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = 0;
-	reg = SLOW_IS_REG(dst) ? dst : TMP_REG1;
-
-	if (emit_load_imm64(compiler, reg, init_value))
-		return NULL;
-#else
-	if (dst == SLJIT_UNUSED)
-		dst = TMP_REG1;
-
-	if (emit_mov(compiler, dst, dstw, SLJIT_IMM, init_value))
-		return NULL;
-#endif
-
-	inst = (sljit_ub*)ensure_buf(compiler, 2);
-	PTR_FAIL_IF(!inst);
-
-	*inst++ = 0;
-	*inst++ = 1;
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (dst & SLJIT_MEM)
-		if (emit_mov(compiler, dst, dstw, TMP_REG1, 0))
-			return NULL;
-#endif
-
-	return const_;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_addr)
-{
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	*(sljit_sw*)addr = new_addr - (addr + 4);
-#else
-	*(sljit_uw*)addr = new_addr;
-#endif
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant)
-{
-	*(sljit_sw*)addr = new_constant;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_sse2_available(void)
-{
-#if (defined SLJIT_DETECT_SSE2 && SLJIT_DETECT_SSE2)
-	if (cpu_has_sse2 == -1)
-		get_cpu_features();
-	return cpu_has_sse2;
-#else
-	return 1;
-#endif
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_cmov_available(void)
-{
-	if (cpu_has_cmov == -1)
-		get_cpu_features();
-	return cpu_has_cmov;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_emit_cmov(struct sljit_compiler *compiler,
-	sljit_si type,
-	sljit_si dst_reg,
-	sljit_si src, sljit_sw srcw)
-{
-	sljit_ub* inst;
-
-	CHECK_ERROR();
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(sljit_x86_is_cmov_available());
-	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_INT_OP)));
-	CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_D_ORDERED);
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(dst_reg & ~SLJIT_INT_OP));
-	FUNCTION_CHECK_SRC(src, srcw);
-#endif
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
-	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  x86_cmov%s %s%s, ",
-			!(dst_reg & SLJIT_INT_OP) ? "" : ".i",
-			JUMP_PREFIX(type), jump_names[type & 0xff]);
-		sljit_verbose_reg(compiler, dst_reg & ~SLJIT_INT_OP);
-		fprintf(compiler->verbose, ", ");
-		sljit_verbose_param(compiler, src, srcw);
-		fprintf(compiler->verbose, "\n");
-	}
-#endif
-
-	ADJUST_LOCAL_OFFSET(src, srcw);
-	CHECK_EXTRA_REGS(src, srcw, (void)0);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = dst_reg & SLJIT_INT_OP;
-#endif
-	dst_reg &= ~SLJIT_INT_OP;
-
-	if (SLJIT_UNLIKELY(src & SLJIT_IMM)) {
-		EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, srcw);
-		src = TMP_REG1;
-		srcw = 0;
-	}
-
-	inst = emit_x86_instruction(compiler, 2, dst_reg, 0, src, srcw);
-	FAIL_IF(!inst);
-	*inst++ = GROUP_0F;
-	*inst = get_jump_code(type & 0xff) - 0x40;
-	return SLJIT_SUCCESS;
-}
diff -Nru r-base-3.2.3/src/extra/pcre/sljit/sljitUtils.c r-base-3.3.1/src/extra/pcre/sljit/sljitUtils.c
--- r-base-3.2.3/src/extra/pcre/sljit/sljitUtils.c	2015-05-13 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/sljit/sljitUtils.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,334 +0,0 @@
-/*
- *    Stack-less Just-In-Time compiler
- *
- *    Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this list of
- *      conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this list
- *      of conditions and the following disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* ------------------------------------------------------------------------ */
-/*  Locks                                                                   */
-/* ------------------------------------------------------------------------ */
-
-#if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR) || (defined SLJIT_UTIL_GLOBAL_LOCK && SLJIT_UTIL_GLOBAL_LOCK)
-
-#if (defined SLJIT_SINGLE_THREADED && SLJIT_SINGLE_THREADED)
-
-#if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
-
-static SLJIT_INLINE void allocator_grab_lock(void)
-{
-	/* Always successful. */
-}
-
-static SLJIT_INLINE void allocator_release_lock(void)
-{
-	/* Always successful. */
-}
-
-#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
-
-#if (defined SLJIT_UTIL_GLOBAL_LOCK && SLJIT_UTIL_GLOBAL_LOCK)
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_grab_lock(void)
-{
-	/* Always successful. */
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_release_lock(void)
-{
-	/* Always successful. */
-}
-
-#endif /* SLJIT_UTIL_GLOBAL_LOCK */
-
-#elif defined(_WIN32) /* SLJIT_SINGLE_THREADED */
-
-#include "windows.h"
-
-#if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
-
-static HANDLE allocator_mutex = 0;
-
-static SLJIT_INLINE void allocator_grab_lock(void)
-{
-	/* No idea what to do if an error occures. Static mutexes should never fail... */
-	if (!allocator_mutex)
-		allocator_mutex = CreateMutex(NULL, TRUE, NULL);
-	else
-		WaitForSingleObject(allocator_mutex, INFINITE);
-}
-
-static SLJIT_INLINE void allocator_release_lock(void)
-{
-	ReleaseMutex(allocator_mutex);
-}
-
-#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
-
-#if (defined SLJIT_UTIL_GLOBAL_LOCK && SLJIT_UTIL_GLOBAL_LOCK)
-
-static HANDLE global_mutex = 0;
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_grab_lock(void)
-{
-	/* No idea what to do if an error occures. Static mutexes should never fail... */
-	if (!global_mutex)
-		global_mutex = CreateMutex(NULL, TRUE, NULL);
-	else
-		WaitForSingleObject(global_mutex, INFINITE);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_release_lock(void)
-{
-	ReleaseMutex(global_mutex);
-}
-
-#endif /* SLJIT_UTIL_GLOBAL_LOCK */
-
-#else /* _WIN32 */
-
-#if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
-
-#include <pthread.h>
-
-static pthread_mutex_t allocator_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static SLJIT_INLINE void allocator_grab_lock(void)
-{
-	pthread_mutex_lock(&allocator_mutex);
-}
-
-static SLJIT_INLINE void allocator_release_lock(void)
-{
-	pthread_mutex_unlock(&allocator_mutex);
-}
-
-#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
-
-#if (defined SLJIT_UTIL_GLOBAL_LOCK && SLJIT_UTIL_GLOBAL_LOCK)
-
-#include <pthread.h>
-
-static pthread_mutex_t global_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_grab_lock(void)
-{
-	pthread_mutex_lock(&global_mutex);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_release_lock(void)
-{
-	pthread_mutex_unlock(&global_mutex);
-}
-
-#endif /* SLJIT_UTIL_GLOBAL_LOCK */
-
-#endif /* _WIN32 */
-
-/* ------------------------------------------------------------------------ */
-/*  Stack                                                                   */
-/* ------------------------------------------------------------------------ */
-
-#if (defined SLJIT_UTIL_STACK && SLJIT_UTIL_STACK) || (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
-
-#ifdef _WIN32
-#include "windows.h"
-#else
-/* Provides mmap function. */
-#include <sys/mman.h>
-/* For detecting the page size. */
-#include <unistd.h>
-
-#ifndef MAP_ANON
-
-#include <fcntl.h>
-
-/* Some old systems does not have MAP_ANON. */
-static sljit_si dev_zero = -1;
-
-#if (defined SLJIT_SINGLE_THREADED && SLJIT_SINGLE_THREADED)
-
-static SLJIT_INLINE sljit_si open_dev_zero(void)
-{
-	dev_zero = open("/dev/zero", O_RDWR);
-	return dev_zero < 0;
-}
-
-#else /* SLJIT_SINGLE_THREADED */
-
-#include <pthread.h>
-
-static pthread_mutex_t dev_zero_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static SLJIT_INLINE sljit_si open_dev_zero(void)
-{
-	pthread_mutex_lock(&dev_zero_mutex);
-	dev_zero = open("/dev/zero", O_RDWR);
-	pthread_mutex_unlock(&dev_zero_mutex);
-	return dev_zero < 0;
-}
-
-#endif /* SLJIT_SINGLE_THREADED */
-
-#endif
-
-#endif
-
-#endif /* SLJIT_UTIL_STACK || SLJIT_EXECUTABLE_ALLOCATOR */
-
-#if (defined SLJIT_UTIL_STACK && SLJIT_UTIL_STACK)
-
-/* Planning to make it even more clever in the future. */
-static sljit_sw sljit_page_align = 0;
-
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(sljit_uw limit, sljit_uw max_limit, void *allocator_data)
-{
-	struct sljit_stack *stack;
-	union {
-		void *ptr;
-		sljit_uw uw;
-	} base;
-#ifdef _WIN32
-	SYSTEM_INFO si;
-#endif
-
-	SLJIT_UNUSED_ARG(allocator_data);
-	if (limit > max_limit || limit < 1)
-		return NULL;
-
-#ifdef _WIN32
-	if (!sljit_page_align) {
-		GetSystemInfo(&si);
-		sljit_page_align = si.dwPageSize - 1;
-	}
-#else
-	if (!sljit_page_align) {
-		sljit_page_align = sysconf(_SC_PAGESIZE);
-		/* Should never happen. */
-		if (sljit_page_align < 0)
-			sljit_page_align = 4096;
-		sljit_page_align--;
-	}
-#endif
-
-	/* Align limit and max_limit. */
-	max_limit = (max_limit + sljit_page_align) & ~sljit_page_align;
-
-	stack = (struct sljit_stack*)SLJIT_MALLOC(sizeof(struct sljit_stack), allocator_data);
-	if (!stack)
-		return NULL;
-
-#ifdef _WIN32
-	base.ptr = VirtualAlloc(NULL, max_limit, MEM_RESERVE, PAGE_READWRITE);
-	if (!base.ptr) {
-		SLJIT_FREE(stack, allocator_data);
-		return NULL;
-	}
-	stack->base = base.uw;
-	stack->limit = stack->base;
-	stack->max_limit = stack->base + max_limit;
-	if (sljit_stack_resize(stack, stack->base + limit)) {
-		sljit_free_stack(stack, allocator_data);
-		return NULL;
-	}
-#else
-#ifdef MAP_ANON
-	base.ptr = mmap(NULL, max_limit, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-#else
-	if (dev_zero < 0) {
-		if (open_dev_zero()) {
-			SLJIT_FREE(stack, allocator_data);
-			return NULL;
-		}
-	}
-	base.ptr = mmap(NULL, max_limit, PROT_READ | PROT_WRITE, MAP_PRIVATE, dev_zero, 0);
-#endif
-	if (base.ptr == MAP_FAILED) {
-		SLJIT_FREE(stack, allocator_data);
-		return NULL;
-	}
-	stack->base = base.uw;
-	stack->limit = stack->base + limit;
-	stack->max_limit = stack->base + max_limit;
-#endif
-	stack->top = stack->base;
-	return stack;
-}
-
-#undef PAGE_ALIGN
-
-SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_free_stack(struct sljit_stack* stack, void *allocator_data)
-{
-	SLJIT_UNUSED_ARG(allocator_data);
-#ifdef _WIN32
-	VirtualFree((void*)stack->base, 0, MEM_RELEASE);
-#else
-	munmap((void*)stack->base, stack->max_limit - stack->base);
-#endif
-	SLJIT_FREE(stack, allocator_data);
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_sw SLJIT_CALL sljit_stack_resize(struct sljit_stack* stack, sljit_uw new_limit)
-{
-	sljit_uw aligned_old_limit;
-	sljit_uw aligned_new_limit;
-
-	if ((new_limit > stack->max_limit) || (new_limit < stack->base))
-		return -1;
-#ifdef _WIN32
-	aligned_new_limit = (new_limit + sljit_page_align) & ~sljit_page_align;
-	aligned_old_limit = (stack->limit + sljit_page_align) & ~sljit_page_align;
-	if (aligned_new_limit != aligned_old_limit) {
-		if (aligned_new_limit > aligned_old_limit) {
-			if (!VirtualAlloc((void*)aligned_old_limit, aligned_new_limit - aligned_old_limit, MEM_COMMIT, PAGE_READWRITE))
-				return -1;
-		}
-		else {
-			if (!VirtualFree((void*)aligned_new_limit, aligned_old_limit - aligned_new_limit, MEM_DECOMMIT))
-				return -1;
-		}
-	}
-	stack->limit = new_limit;
-	return 0;
-#else
-	if (new_limit >= stack->limit) {
-		stack->limit = new_limit;
-		return 0;
-	}
-	aligned_new_limit = (new_limit + sljit_page_align) & ~sljit_page_align;
-	aligned_old_limit = (stack->limit + sljit_page_align) & ~sljit_page_align;
-	/* If madvise is available, we release the unnecessary space. */
-#if defined(MADV_DONTNEED)
-	if (aligned_new_limit < aligned_old_limit)
-		madvise((void*)aligned_new_limit, aligned_old_limit - aligned_new_limit, MADV_DONTNEED);
-#elif defined(POSIX_MADV_DONTNEED)
-	if (aligned_new_limit < aligned_old_limit)
-		posix_madvise((void*)aligned_new_limit, aligned_old_limit - aligned_new_limit, POSIX_MADV_DONTNEED);
-#endif
-	stack->limit = new_limit;
-	return 0;
-#endif
-}
-
-#endif /* SLJIT_UTIL_STACK */
-
-#endif
diff -Nru r-base-3.2.3/src/extra/pcre/ucp.h r-base-3.3.1/src/extra/pcre/ucp.h
--- r-base-3.2.3/src/extra/pcre/ucp.h	2014-11-12 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/extra/pcre/ucp.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-/*************************************************
-*          Unicode Property Table handler        *
-*************************************************/
-
-#ifndef _UCP_H
-#define _UCP_H
-
-/* This file contains definitions of the property values that are returned by
-the UCD access macros. New values that are added for new releases of Unicode
-should always be at the end of each enum, for backwards compatibility.
-
-IMPORTANT: Note also that the specific numeric values of the enums have to be
-the same as the values that are generated by the maint/MultiStage2.py script,
-where the equivalent property descriptive names are listed in vectors.
-
-ALSO: The specific values of the first two enums are assumed for the table
-called catposstab in pcre_compile.c. */
-
-/* These are the general character categories. */
-
-enum {
-  ucp_C,     /* Other */
-  ucp_L,     /* Letter */
-  ucp_M,     /* Mark */
-  ucp_N,     /* Number */
-  ucp_P,     /* Punctuation */
-  ucp_S,     /* Symbol */
-  ucp_Z      /* Separator */
-};
-
-/* These are the particular character categories. */
-
-enum {
-  ucp_Cc,    /* Control */
-  ucp_Cf,    /* Format */
-  ucp_Cn,    /* Unassigned */
-  ucp_Co,    /* Private use */
-  ucp_Cs,    /* Surrogate */
-  ucp_Ll,    /* Lower case letter */
-  ucp_Lm,    /* Modifier letter */
-  ucp_Lo,    /* Other letter */
-  ucp_Lt,    /* Title case letter */
-  ucp_Lu,    /* Upper case letter */
-  ucp_Mc,    /* Spacing mark */
-  ucp_Me,    /* Enclosing mark */
-  ucp_Mn,    /* Non-spacing mark */
-  ucp_Nd,    /* Decimal number */
-  ucp_Nl,    /* Letter number */
-  ucp_No,    /* Other number */
-  ucp_Pc,    /* Connector punctuation */
-  ucp_Pd,    /* Dash punctuation */
-  ucp_Pe,    /* Close punctuation */
-  ucp_Pf,    /* Final punctuation */
-  ucp_Pi,    /* Initial punctuation */
-  ucp_Po,    /* Other punctuation */
-  ucp_Ps,    /* Open punctuation */
-  ucp_Sc,    /* Currency symbol */
-  ucp_Sk,    /* Modifier symbol */
-  ucp_Sm,    /* Mathematical symbol */
-  ucp_So,    /* Other symbol */
-  ucp_Zl,    /* Line separator */
-  ucp_Zp,    /* Paragraph separator */
-  ucp_Zs     /* Space separator */
-};
-
-/* These are grapheme break properties. Note that the code for processing them
-assumes that the values are less than 16. If more values are added that take
-the number to 16 or more, the code will have to be rewritten. */
-
-enum {
-  ucp_gbCR,                /*  0 */
-  ucp_gbLF,                /*  1 */
-  ucp_gbControl,           /*  2 */
-  ucp_gbExtend,            /*  3 */
-  ucp_gbPrepend,           /*  4 */
-  ucp_gbSpacingMark,       /*  5 */
-  ucp_gbL,                 /*  6 Hangul syllable type L */
-  ucp_gbV,                 /*  7 Hangul syllable type V */
-  ucp_gbT,                 /*  8 Hangul syllable type T */
-  ucp_gbLV,                /*  9 Hangul syllable type LV */
-  ucp_gbLVT,               /* 10 Hangul syllable type LVT */
-  ucp_gbRegionalIndicator, /* 11 */
-  ucp_gbOther              /* 12 */
-};
-
-/* These are the script identifications. */
-
-enum {
-  ucp_Arabic,
-  ucp_Armenian,
-  ucp_Bengali,
-  ucp_Bopomofo,
-  ucp_Braille,
-  ucp_Buginese,
-  ucp_Buhid,
-  ucp_Canadian_Aboriginal,
-  ucp_Cherokee,
-  ucp_Common,
-  ucp_Coptic,
-  ucp_Cypriot,
-  ucp_Cyrillic,
-  ucp_Deseret,
-  ucp_Devanagari,
-  ucp_Ethiopic,
-  ucp_Georgian,
-  ucp_Glagolitic,
-  ucp_Gothic,
-  ucp_Greek,
-  ucp_Gujarati,
-  ucp_Gurmukhi,
-  ucp_Han,
-  ucp_Hangul,
-  ucp_Hanunoo,
-  ucp_Hebrew,
-  ucp_Hiragana,
-  ucp_Inherited,
-  ucp_Kannada,
-  ucp_Katakana,
-  ucp_Kharoshthi,
-  ucp_Khmer,
-  ucp_Lao,
-  ucp_Latin,
-  ucp_Limbu,
-  ucp_Linear_B,
-  ucp_Malayalam,
-  ucp_Mongolian,
-  ucp_Myanmar,
-  ucp_New_Tai_Lue,
-  ucp_Ogham,
-  ucp_Old_Italic,
-  ucp_Old_Persian,
-  ucp_Oriya,
-  ucp_Osmanya,
-  ucp_Runic,
-  ucp_Shavian,
-  ucp_Sinhala,
-  ucp_Syloti_Nagri,
-  ucp_Syriac,
-  ucp_Tagalog,
-  ucp_Tagbanwa,
-  ucp_Tai_Le,
-  ucp_Tamil,
-  ucp_Telugu,
-  ucp_Thaana,
-  ucp_Thai,
-  ucp_Tibetan,
-  ucp_Tifinagh,
-  ucp_Ugaritic,
-  ucp_Yi,
-  /* New for Unicode 5.0: */
-  ucp_Balinese,
-  ucp_Cuneiform,
-  ucp_Nko,
-  ucp_Phags_Pa,
-  ucp_Phoenician,
-  /* New for Unicode 5.1: */
-  ucp_Carian,
-  ucp_Cham,
-  ucp_Kayah_Li,
-  ucp_Lepcha,
-  ucp_Lycian,
-  ucp_Lydian,
-  ucp_Ol_Chiki,
-  ucp_Rejang,
-  ucp_Saurashtra,
-  ucp_Sundanese,
-  ucp_Vai,
-  /* New for Unicode 5.2: */
-  ucp_Avestan,
-  ucp_Bamum,
-  ucp_Egyptian_Hieroglyphs,
-  ucp_Imperial_Aramaic,
-  ucp_Inscriptional_Pahlavi,
-  ucp_Inscriptional_Parthian,
-  ucp_Javanese,
-  ucp_Kaithi,
-  ucp_Lisu,
-  ucp_Meetei_Mayek,
-  ucp_Old_South_Arabian,
-  ucp_Old_Turkic,
-  ucp_Samaritan,
-  ucp_Tai_Tham,
-  ucp_Tai_Viet,
-  /* New for Unicode 6.0.0: */
-  ucp_Batak,
-  ucp_Brahmi,
-  ucp_Mandaic,
-  /* New for Unicode 6.1.0: */
-  ucp_Chakma,
-  ucp_Meroitic_Cursive,
-  ucp_Meroitic_Hieroglyphs,
-  ucp_Miao,
-  ucp_Sharada,
-  ucp_Sora_Sompeng,
-  ucp_Takri,
-  /* New for Unicode 7.0.0: */
-  ucp_Bassa_Vah,
-  ucp_Caucasian_Albanian,
-  ucp_Duployan,
-  ucp_Elbasan,
-  ucp_Grantha,
-  ucp_Khojki,
-  ucp_Khudawadi,
-  ucp_Linear_A,
-  ucp_Mahajani,
-  ucp_Manichaean,
-  ucp_Mende_Kikakui,
-  ucp_Modi,
-  ucp_Mro,
-  ucp_Nabataean,
-  ucp_Old_North_Arabian,
-  ucp_Old_Permic,
-  ucp_Pahawh_Hmong,
-  ucp_Palmyrene,
-  ucp_Psalter_Pahlavi,
-  ucp_Pau_Cin_Hau,
-  ucp_Siddham,
-  ucp_Tirhuta,
-  ucp_Warang_Citi
-};
-
-#endif
-
-/* End of ucp.h */
diff -Nru r-base-3.2.3/src/extra/tre/Makefile.in r-base-3.3.1/src/extra/tre/Makefile.in
--- r-base-3.2.3/src/extra/tre/Makefile.in	2014-03-12 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/tre/Makefile.in	2015-12-10 23:15:13.000000000 +0000
@@ -49,8 +49,8 @@
 	@BUILD_TRE_TRUE@ @$(MAKE) $(noinst_LIBRARIES)
 
 libtre.a: $(libtre_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(libtre_a_OBJECTS)
+	@rm -f $@
+	$(AR) -cr $@ $(libtre_a_OBJECTS)
 	$(RANLIB) $@
 
 mostlyclean: clean
diff -Nru r-base-3.2.3/src/extra/tre/tre-internal.h r-base-3.3.1/src/extra/tre/tre-internal.h
--- r-base-3.2.3/src/extra/tre/tre-internal.h	2014-06-13 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/extra/tre/tre-internal.h	2016-03-16 23:02:11.000000000 +0000
@@ -48,7 +48,17 @@
 
 /* Wide characters. */
 typedef wint_t tre_cint_t;
-#define TRE_CHAR_MAX WCHAR_MAX
+/* Workaround problem seen on AIX, (2010 & 2015), e.g.,
+    https://stat.ethz.ch/pipermail/r-devel/2015-October/071902.html
+  WCHAR_MAX = UINT32_MAX on AIX and that is "not possible to work"
+  Solaris-sparcv9   WCHAR_MAX = INT32_MAX
+  Linux amd64       WCHAR_MAX = INT32_MAX
+*/
+#if WCHAR_MAX == UINT32_MAX
+# define TRE_CHAR_MAX INT32_MAX
+#else
+# define TRE_CHAR_MAX WCHAR_MAX
+#endif
 
 #ifdef TRE_MULTIBYTE
 #define TRE_MB_CUR_MAX MB_CUR_MAX
diff -Nru r-base-3.2.3/src/extra/tre/tre-match-approx.c r-base-3.3.1/src/extra/tre/tre-match-approx.c
--- r-base-3.2.3/src/extra/tre/tre-match-approx.c	2014-03-12 23:02:09.000000000 +0000
+++ r-base-3.3.1/src/extra/tre/tre-match-approx.c	2016-01-04 23:15:05.000000000 +0000
@@ -793,10 +793,10 @@
 			       default_params);
 
 	      /* Set the costs after this transition. */
-		memcpy(&reach_next[dest_id].costs,
-		       reach[id].costs,
-		       sizeof(reach[id].costs[0][0])
-		       * TRE_M_LAST * (depth + 1));
+	      memcpy(&reach_next[dest_id].costs,
+		     reach[id].costs,
+		     sizeof(reach[id].costs[0][0])
+		     * TRE_M_LAST * (depth + 1));
 	      reach_next[dest_id].costs[depth][TRE_M_COST] = cost;
 	      reach_next[dest_id].costs[depth][TRE_M_NUM_SUBST] += err;
 	      reach_next[dest_id].costs[depth][TRE_M_NUM_ERR] += err;
diff -Nru r-base-3.2.3/src/extra/tzone/localtime.c r-base-3.3.1/src/extra/tzone/localtime.c
--- r-base-3.2.3/src/extra/tzone/localtime.c	2015-08-25 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/extra/tzone/localtime.c	2016-02-01 23:15:12.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Modifications copyright (C) 2007-2015  The R Core Team
+ *  Modifications copyright (C) 2007-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,8 +38,9 @@
 #include <string.h>
 #include <limits.h>	/* for CHAR_BIT et al. */
 
-// to get tm_zone, tm_gmtoff defined in glibc.
-// some other header, e.g. math.h, might define the macro.
+// To get tm_zone, tm_gmtoff defined in glibc
+// (although this file is not usually used there).
+// Some other header, e.g. math.h, might define the macro.
 #if defined HAVE_FEATURES_H
 # include <features.h>
 # ifdef __GNUC_PREREQ
@@ -279,6 +280,8 @@
 #define lclptr		(&lclmem)
 #define gmtptr		(&gmtmem)
 
+/* These are abbreviated names, so 255 should be ample.
+   But this was not checked in strcpy below. */
 #ifndef TZ_STRLEN_MAX
 #define TZ_STRLEN_MAX 255
 #endif /* !defined TZ_STRLEN_MAX */
@@ -1221,8 +1224,11 @@
     if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0)
 	return;
     lcl_is_set = strlen(name) < sizeof lcl_TZname;
-    if (lcl_is_set)
-	(void) strcpy(lcl_TZname, name);
+    /* R change: was strcpy before. */
+    if (lcl_is_set) {
+	(void) strncpy(lcl_TZname, name, TZ_STRLEN_MAX);
+	lcl_TZname[TZ_STRLEN_MAX] = '\0';
+    }
 
     if (*name == '\0') {
 	/*
diff -Nru r-base-3.2.3/src/extra/tzone/Makefile.in r-base-3.3.1/src/extra/tzone/Makefile.in
--- r-base-3.2.3/src/extra/tzone/Makefile.in	2014-03-12 23:02:06.000000000 +0000
+++ r-base-3.3.1/src/extra/tzone/Makefile.in	2015-12-10 23:15:12.000000000 +0000
@@ -24,7 +24,7 @@
 
 libtz.a: $(OBJECTS)
 	@rm -f $@
-	$(AR) cr $@ $(OBJECTS)
+	$(AR) -cr $@ $(OBJECTS)
 	@$(RANLIB) $@
 
 
diff -Nru r-base-3.2.3/src/extra/tzone/Make.zi r-base-3.3.1/src/extra/tzone/Make.zi
--- r-base-3.2.3/src/extra/tzone/Make.zi	2015-06-14 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/extra/tzone/Make.zi	2016-04-19 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 ## Makefile to be run on a Unix box with zic
 
-VERSION = 2015e
+VERSION = 2016d
 TZDIR = zoneinfo
 TZTMP = tz
 TARFILE = tzdata$(VERSION).tar.gz
diff -Nru r-base-3.2.3/src/extra/tzone/Notes r-base-3.3.1/src/extra/tzone/Notes
--- r-base-3.2.3/src/extra/tzone/Notes	2015-06-18 22:15:03.000000000 +0000
+++ r-base-3.3.1/src/extra/tzone/Notes	2016-04-19 22:15:05.000000000 +0000
@@ -22,11 +22,11 @@
 To remake it, download the current version of tzdataXXXXx.tar.gz from
 http://www.iana.org/time-zones to this directory and run
 
-make -f Make.zi VERSION=2015e
+make -f Make.zi VERSION=2016d
 
 for the appropriate version.  If zic is not on the path, use something like
 
-make -f Make.zi VERSION=2015e ZIC=/usr/sbin/zic
+make -f Make.zi VERSION=2016d ZIC=/usr/sbin/zic
 
 NB: it seems that this needs to be done on a system with 64-bit time_t
 or the catalogs will be confined to 1902-2038.  And even that did not
diff -Nru r-base-3.2.3/src/extra/tzone/tzfile.h r-base-3.3.1/src/extra/tzone/tzfile.h
--- r-base-3.2.3/src/extra/tzone/tzfile.h	2015-08-14 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/extra/tzone/tzfile.h	2016-03-16 23:02:10.000000000 +0000
@@ -115,8 +115,9 @@
 #endif /* !defined NOSOLAR */
 #endif /* !defined TZ_MAX_TYPES */
 
+// increased from 50, http://mm.icann.org/pipermail/tz/2015-August/022623.html
 #ifndef TZ_MAX_CHARS
-#define TZ_MAX_CHARS	50	/* Maximum number of abbreviation characters */
+#define TZ_MAX_CHARS	100	/* Maximum number of abbreviation characters */
 				/* (limited by what unsigned chars can hold) */
 #endif /* !defined TZ_MAX_CHARS */
 
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/extra/tzone/zoneinfo.zip and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/extra/tzone/zoneinfo.zip differ
diff -Nru r-base-3.2.3/src/extra/xdr/Makefile.in r-base-3.3.1/src/extra/xdr/Makefile.in
--- r-base-3.2.3/src/extra/xdr/Makefile.in	2013-09-26 22:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xdr/Makefile.in	2015-12-10 23:15:13.000000000 +0000
@@ -44,8 +44,8 @@
 	@$(MAKE) $(noinst_LIBRARIES)
 
 libxdr.a: $(libxdr_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(libxdr_a_OBJECTS)
+	@rm -f $@
+	$(AR) -cr $@ $(libxdr_a_OBJECTS)
 	$(RANLIB) $@
 
 
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/base.h r-base-3.3.1/src/extra/xz/api/lzma/base.h
--- r-base-3.2.3/src/extra/xz/api/lzma/base.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/base.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,601 +0,0 @@
-/**
- * \file        lzma/base.h
- * \brief       Data types and functions used in many places in liblzma API
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Boolean
- *
- * This is here because C89 doesn't have stdbool.h. To set a value for
- * variables having type lzma_bool, you can use
- *   - C99's `true' and `false' from stdbool.h;
- *   - C++'s internal `true' and `false'; or
- *   - integers one (true) and zero (false).
- */
-typedef unsigned char lzma_bool;
-
-
-/**
- * \brief       Type of reserved enumeration variable in structures
- *
- * To avoid breaking library ABI when new features are added, several
- * structures contain extra variables that may be used in future. Since
- * sizeof(enum) can be different than sizeof(int), and sizeof(enum) may
- * even vary depending on the range of enumeration constants, we specify
- * a separate type to be used for reserved enumeration variables. All
- * enumeration constants in liblzma API will be non-negative and less
- * than 128, which should guarantee that the ABI won't break even when
- * new constants are added to existing enumerations.
- */
-typedef enum {
-	LZMA_RESERVED_ENUM      = 0
-} lzma_reserved_enum;
-
-
-/**
- * \brief       Return values used by several functions in liblzma
- *
- * Check the descriptions of specific functions to find out which return
- * values they can return. With some functions the return values may have
- * more specific meanings than described here; those differences are
- * described per-function basis.
- */
-typedef enum {
-	LZMA_OK                 = 0,
-		/**<
-		 * \brief       Operation completed successfully
-		 */
-
-	LZMA_STREAM_END         = 1,
-		/**<
-		 * \brief       End of stream was reached
-		 *
-		 * In encoder, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, or
-		 * LZMA_FINISH was finished. In decoder, this indicates
-		 * that all the data was successfully decoded.
-		 *
-		 * In all cases, when LZMA_STREAM_END is returned, the last
-		 * output bytes should be picked from strm->next_out.
-		 */
-
-	LZMA_NO_CHECK           = 2,
-		/**<
-		 * \brief       Input stream has no integrity check
-		 *
-		 * This return value can be returned only if the
-		 * LZMA_TELL_NO_CHECK flag was used when initializing
-		 * the decoder. LZMA_NO_CHECK is just a warning, and
-		 * the decoding can be continued normally.
-		 *
-		 * It is possible to call lzma_get_check() immediately after
-		 * lzma_code has returned LZMA_NO_CHECK. The result will
-		 * naturally be LZMA_CHECK_NONE, but the possibility to call
-		 * lzma_get_check() may be convenient in some applications.
-		 */
-
-	LZMA_UNSUPPORTED_CHECK  = 3,
-		/**<
-		 * \brief       Cannot calculate the integrity check
-		 *
-		 * The usage of this return value is different in encoders
-		 * and decoders.
-		 *
-		 * Encoders can return this value only from the initialization
-		 * function. If initialization fails with this value, the
-		 * encoding cannot be done, because there's no way to produce
-		 * output with the correct integrity check.
-		 *
-		 * Decoders can return this value only from lzma_code() and
-		 * only if the LZMA_TELL_UNSUPPORTED_CHECK flag was used when
-		 * initializing the decoder. The decoding can still be
-		 * continued normally even if the check type is unsupported,
-		 * but naturally the check will not be validated, and possible
-		 * errors may go undetected.
-		 *
-		 * With decoder, it is possible to call lzma_get_check()
-		 * immediately after lzma_code() has returned
-		 * LZMA_UNSUPPORTED_CHECK. This way it is possible to find
-		 * out what the unsupported Check ID was.
-		 */
-
-	LZMA_GET_CHECK          = 4,
-		/**<
-		 * \brief       Integrity check type is now available
-		 *
-		 * This value can be returned only by the lzma_code() function
-		 * and only if the decoder was initialized with the
-		 * LZMA_TELL_ANY_CHECK flag. LZMA_GET_CHECK tells the
-		 * application that it may now call lzma_get_check() to find
-		 * out the Check ID. This can be used, for example, to
-		 * implement a decoder that accepts only files that have
-		 * strong enough integrity check.
-		 */
-
-	LZMA_MEM_ERROR          = 5,
-		/**<
-		 * \brief       Cannot allocate memory
-		 *
-		 * Memory allocation failed, or the size of the allocation
-		 * would be greater than SIZE_MAX.
-		 *
-		 * Due to internal implementation reasons, the coding cannot
-		 * be continued even if more memory were made available after
-		 * LZMA_MEM_ERROR.
-		 */
-
-	LZMA_MEMLIMIT_ERROR     = 6,
-		/**
-		 * \brief       Memory usage limit was reached
-		 *
-		 * Decoder would need more memory than allowed by the
-		 * specified memory usage limit. To continue decoding,
-		 * the memory usage limit has to be increased with
-		 * lzma_memlimit_set().
-		 */
-
-	LZMA_FORMAT_ERROR       = 7,
-		/**<
-		 * \brief       File format not recognized
-		 *
-		 * The decoder did not recognize the input as supported file
-		 * format. This error can occur, for example, when trying to
-		 * decode .lzma format file with lzma_stream_decoder,
-		 * because lzma_stream_decoder accepts only the .xz format.
-		 */
-
-	LZMA_OPTIONS_ERROR      = 8,
-		/**<
-		 * \brief       Invalid or unsupported options
-		 *
-		 * Invalid or unsupported options, for example
-		 *  - unsupported filter(s) or filter options; or
-		 *  - reserved bits set in headers (decoder only).
-		 *
-		 * Rebuilding liblzma with more features enabled, or
-		 * upgrading to a newer version of liblzma may help.
-		 */
-
-	LZMA_DATA_ERROR         = 9,
-		/**<
-		 * \brief       Data is corrupt
-		 *
-		 * The usage of this return value is different in encoders
-		 * and decoders. In both encoder and decoder, the coding
-		 * cannot continue after this error.
-		 *
-		 * Encoders return this if size limits of the target file
-		 * format would be exceeded. These limits are huge, thus
-		 * getting this error from an encoder is mostly theoretical.
-		 * For example, the maximum compressed and uncompressed
-		 * size of a .xz Stream is roughly 8 EiB (2^63 bytes).
-		 *
-		 * Decoders return this error if the input data is corrupt.
-		 * This can mean, for example, invalid CRC32 in headers
-		 * or invalid check of uncompressed data.
-		 */
-
-	LZMA_BUF_ERROR          = 10,
-		/**<
-		 * \brief       No progress is possible
-		 *
-		 * This error code is returned when the coder cannot consume
-		 * any new input and produce any new output. The most common
-		 * reason for this error is that the input stream being
-		 * decoded is truncated or corrupt.
-		 *
-		 * This error is not fatal. Coding can be continued normally
-		 * by providing more input and/or more output space, if
-		 * possible.
-		 *
-		 * Typically the first call to lzma_code() that can do no
-		 * progress returns LZMA_OK instead of LZMA_BUF_ERROR. Only
-		 * the second consecutive call doing no progress will return
-		 * LZMA_BUF_ERROR. This is intentional.
-		 *
-		 * With zlib, Z_BUF_ERROR may be returned even if the
-		 * application is doing nothing wrong, so apps will need
-		 * to handle Z_BUF_ERROR specially. The above hack
-		 * guarantees that liblzma never returns LZMA_BUF_ERROR
-		 * to properly written applications unless the input file
-		 * is truncated or corrupt. This should simplify the
-		 * applications a little.
-		 */
-
-	LZMA_PROG_ERROR         = 11,
-		/**<
-		 * \brief       Programming error
-		 *
-		 * This indicates that the arguments given to the function are
-		 * invalid or the internal state of the decoder is corrupt.
-		 *   - Function arguments are invalid or the structures
-		 *     pointed by the argument pointers are invalid
-		 *     e.g. if strm->next_out has been set to NULL and
-		 *     strm->avail_out > 0 when calling lzma_code().
-		 *   - lzma_* functions have been called in wrong order
-		 *     e.g. lzma_code() was called right after lzma_end().
-		 *   - If errors occur randomly, the reason might be flaky
-		 *     hardware.
-		 *
-		 * If you think that your code is correct, this error code
-		 * can be a sign of a bug in liblzma. See the documentation
-		 * how to report bugs.
-		 */
-} lzma_ret;
-
-
-/**
- * \brief       The `action' argument for lzma_code()
- *
- * After the first use of LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, or LZMA_FINISH,
- * the same `action' must is used until lzma_code() returns LZMA_STREAM_END.
- * Also, the amount of input (that is, strm->avail_in) must not be modified
- * by the application until lzma_code() returns LZMA_STREAM_END. Changing the
- * `action' or modifying the amount of input will make lzma_code() return
- * LZMA_PROG_ERROR.
- */
-typedef enum {
-	LZMA_RUN = 0,
-		/**<
-		 * \brief       Continue coding
-		 *
-		 * Encoder: Encode as much input as possible. Some internal
-		 * buffering will probably be done (depends on the filter
-		 * chain in use), which causes latency: the input used won't
-		 * usually be decodeable from the output of the same
-		 * lzma_code() call.
-		 *
-		 * Decoder: Decode as much input as possible and produce as
-		 * much output as possible.
-		 */
-
-	LZMA_SYNC_FLUSH = 1,
-		/**<
-		 * \brief       Make all the input available at output
-		 *
-		 * Normally the encoder introduces some latency.
-		 * LZMA_SYNC_FLUSH forces all the buffered data to be
-		 * available at output without resetting the internal
-		 * state of the encoder. This way it is possible to use
-		 * compressed stream for example for communication over
-		 * network.
-		 *
-		 * Only some filters support LZMA_SYNC_FLUSH. Trying to use
-		 * LZMA_SYNC_FLUSH with filters that don't support it will
-		 * make lzma_code() return LZMA_OPTIONS_ERROR. For example,
-		 * LZMA1 doesn't support LZMA_SYNC_FLUSH but LZMA2 does.
-		 *
-		 * Using LZMA_SYNC_FLUSH very often can dramatically reduce
-		 * the compression ratio. With some filters (for example,
-		 * LZMA2), fine-tuning the compression options may help
-		 * mitigate this problem significantly (for example,
-		 * match finder with LZMA2).
-		 *
-		 * Decoders don't support LZMA_SYNC_FLUSH.
-		 */
-
-	LZMA_FULL_FLUSH = 2,
-		/**<
-		 * \brief       Finish encoding of the current Block
-		 *
-		 * All the input data going to the current Block must have
-		 * been given to the encoder (the last bytes can still be
-		 * pending in* next_in). Call lzma_code() with LZMA_FULL_FLUSH
-		 * until it returns LZMA_STREAM_END. Then continue normally
-		 * with LZMA_RUN or finish the Stream with LZMA_FINISH.
-		 *
-		 * This action is currently supported only by Stream encoder
-		 * and easy encoder (which uses Stream encoder). If there is
-		 * no unfinished Block, no empty Block is created.
-		 */
-
-	LZMA_FINISH = 3
-		/**<
-		 * \brief       Finish the coding operation
-		 *
-		 * All the input data must have been given to the encoder
-		 * (the last bytes can still be pending in next_in).
-		 * Call lzma_code() with LZMA_FINISH until it returns
-		 * LZMA_STREAM_END. Once LZMA_FINISH has been used,
-		 * the amount of input must no longer be changed by
-		 * the application.
-		 *
-		 * When decoding, using LZMA_FINISH is optional unless the
-		 * LZMA_CONCATENATED flag was used when the decoder was
-		 * initialized. When LZMA_CONCATENATED was not used, the only
-		 * effect of LZMA_FINISH is that the amount of input must not
-		 * be changed just like in the encoder.
-		 */
-} lzma_action;
-
-
-/**
- * \brief       Custom functions for memory handling
- *
- * A pointer to lzma_allocator may be passed via lzma_stream structure
- * to liblzma, and some advanced functions take a pointer to lzma_allocator
- * as a separate function argument. The library will use the functions
- * specified in lzma_allocator for memory handling instead of the default
- * malloc() and free(). C++ users should note that the custom memory
- * handling functions must not throw exceptions.
- *
- * liblzma doesn't make an internal copy of lzma_allocator. Thus, it is
- * OK to change these function pointers in the middle of the coding
- * process, but obviously it must be done carefully to make sure that the
- * replacement `free' can deallocate memory allocated by the earlier
- * `alloc' function(s).
- */
-typedef struct {
-	/**
-	 * \brief       Pointer to a custom memory allocation function
-	 *
-	 * If you don't want a custom allocator, but still want
-	 * custom free(), set this to NULL and liblzma will use
-	 * the standard malloc().
-	 *
-	 * \param       opaque  lzma_allocator.opaque (see below)
-	 * \param       nmemb   Number of elements like in calloc(). liblzma
-	 *                      will always set nmemb to 1, so it is safe to
-	 *                      ignore nmemb in a custom allocator if you like.
-	 *                      The nmemb argument exists only for
-	 *                      compatibility with zlib and libbzip2.
-	 * \param       size    Size of an element in bytes.
-	 *                      liblzma never sets this to zero.
-	 *
-	 * \return      Pointer to the beginning of a memory block of
-	 *              `size' bytes, or NULL if allocation fails
-	 *              for some reason. When allocation fails, functions
-	 *              of liblzma return LZMA_MEM_ERROR.
-	 *
-	 * The allocator should not waste time zeroing the allocated buffers.
-	 * This is not only about speed, but also memory usage, since the
-	 * operating system kernel doesn't necessarily allocate the requested
-	 * memory in physical memory until it is actually used. With small
-	 * input files, liblzma may actually need only a fraction of the
-	 * memory that it requested for allocation.
-	 *
-	 * \note        LZMA_MEM_ERROR is also used when the size of the
-	 *              allocation would be greater than SIZE_MAX. Thus,
-	 *              don't assume that the custom allocator must have
-	 *              returned NULL if some function from liblzma
-	 *              returns LZMA_MEM_ERROR.
-	 */
-	void *(LZMA_API_CALL *alloc)(void *opaque, size_t nmemb, size_t size);
-
-	/**
-	 * \brief       Pointer to a custom memory freeing function
-	 *
-	 * If you don't want a custom freeing function, but still
-	 * want a custom allocator, set this to NULL and liblzma
-	 * will use the standard free().
-	 *
-	 * \param       opaque  lzma_allocator.opaque (see below)
-	 * \param       ptr     Pointer returned by lzma_allocator.alloc(),
-	 *                      or when it is set to NULL, a pointer returned
-	 *                      by the standard malloc().
-	 */
-	void (LZMA_API_CALL *free)(void *opaque, void *ptr);
-
-	/**
-	 * \brief       Pointer passed to .alloc() and .free()
-	 *
-	 * opaque is passed as the first argument to lzma_allocator.alloc()
-	 * and lzma_allocator.free(). This intended to ease implementing
-	 * custom memory allocation functions for use with liblzma.
-	 *
-	 * If you don't need this, you should set this to NULL.
-	 */
-	void *opaque;
-
-} lzma_allocator;
-
-
-/**
- * \brief       Internal data structure
- *
- * The contents of this structure is not visible outside the library.
- */
-typedef struct lzma_internal_s lzma_internal;
-
-
-/**
- * \brief       Passing data to and from liblzma
- *
- * The lzma_stream structure is used for
- *  - passing pointers to input and output buffers to liblzma;
- *  - defining custom memory hander functions; and
- *  - holding a pointer to coder-specific internal data structures.
- *
- * Typical usage:
- *
- *  - After allocating lzma_stream (on stack or with malloc()), it must be
- *    initialized to LZMA_STREAM_INIT (see LZMA_STREAM_INIT for details).
- *
- *  - Initialize a coder to the lzma_stream, for example by using
- *    lzma_easy_encoder() or lzma_auto_decoder(). Some notes:
- *      - In contrast to zlib, strm->next_in and strm->next_out are
- *        ignored by all initialization functions, thus it is safe
- *        to not initialize them yet.
- *      - The initialization functions always set strm->total_in and
- *        strm->total_out to zero.
- *      - If the initialization function fails, no memory is left allocated
- *        that would require freeing with lzma_end() even if some memory was
- *        associated with the lzma_stream structure when the initialization
- *        function was called.
- *
- *  - Use lzma_code() to do the actual work.
- *
- *  - Once the coding has been finished, the existing lzma_stream can be
- *    reused. It is OK to reuse lzma_stream with different initialization
- *    function without calling lzma_end() first. Old allocations are
- *    automatically freed.
- *
- *  - Finally, use lzma_end() to free the allocated memory. lzma_end() never
- *    frees the lzma_stream structure itself.
- *
- * Application may modify the values of total_in and total_out as it wants.
- * They are updated by liblzma to match the amount of data read and
- * written, but aren't used for anything else.
- */
-typedef struct {
-	const uint8_t *next_in; /**< Pointer to the next input byte. */
-	size_t avail_in;    /**< Number of available input bytes in next_in. */
-	uint64_t total_in;  /**< Total number of bytes read by liblzma. */
-
-	uint8_t *next_out;  /**< Pointer to the next output position. */
-	size_t avail_out;   /**< Amount of free space in next_out. */
-	uint64_t total_out; /**< Total number of bytes written by liblzma. */
-
-	/**
-	 * \brief       Custom memory allocation functions
-	 *
-	 * In most cases this is NULL which makes liblzma use
-	 * the standard malloc() and free().
-	 */
-	lzma_allocator *allocator;
-
-	/** Internal state is not visible to applications. */
-	lzma_internal *internal;
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. Excluding the initialization of this structure,
-	 * you should not touch these, because the names of these variables
-	 * may change.
-	 */
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-	void *reserved_ptr3;
-	void *reserved_ptr4;
-	uint64_t reserved_int1;
-	uint64_t reserved_int2;
-	size_t reserved_int3;
-	size_t reserved_int4;
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-
-} lzma_stream;
-
-
-/**
- * \brief       Initialization for lzma_stream
- *
- * When you declare an instance of lzma_stream, you can immediately
- * initialize it so that initialization functions know that no memory
- * has been allocated yet:
- *
- *     lzma_stream strm = LZMA_STREAM_INIT;
- *
- * If you need to initialize a dynamically allocated lzma_stream, you can use
- * memset(strm_pointer, 0, sizeof(lzma_stream)). Strictly speaking, this
- * violates the C standard since NULL may have different internal
- * representation than zero, but it should be portable enough in practice.
- * Anyway, for maximum portability, you can use something like this:
- *
- *     lzma_stream tmp = LZMA_STREAM_INIT;
- *     *strm = tmp;
- */
-#define LZMA_STREAM_INIT \
-	{ NULL, 0, 0, NULL, 0, 0, NULL, NULL, \
-	NULL, NULL, NULL, NULL, 0, 0, 0, 0, \
-	LZMA_RESERVED_ENUM, LZMA_RESERVED_ENUM }
-
-
-/**
- * \brief       Encode or decode data
- *
- * Once the lzma_stream has been successfully initialized (e.g. with
- * lzma_stream_encoder()), the actual encoding or decoding is done
- * using this function. The application has to update strm->next_in,
- * strm->avail_in, strm->next_out, and strm->avail_out to pass input
- * to and get output from liblzma.
- *
- * See the description of the coder-specific initialization function to find
- * out what `action' values are supported by the coder.
- */
-extern LZMA_API(lzma_ret) lzma_code(lzma_stream *strm, lzma_action action)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Free memory allocated for the coder data structures
- *
- * \param       strm    Pointer to lzma_stream that is at least initialized
- *                      with LZMA_STREAM_INIT.
- *
- * After lzma_end(strm), strm->internal is guaranteed to be NULL. No other
- * members of the lzma_stream structure are touched.
- *
- * \note        zlib indicates an error if application end()s unfinished
- *              stream structure. liblzma doesn't do this, and assumes that
- *              application knows what it is doing.
- */
-extern LZMA_API(void) lzma_end(lzma_stream *strm) lzma_nothrow;
-
-
-/**
- * \brief       Get the memory usage of decoder filter chain
- *
- * This function is currently supported only when *strm has been initialized
- * with a function that takes a memlimit argument. With other functions, you
- * should use e.g. lzma_raw_encoder_memusage() or lzma_raw_decoder_memusage()
- * to estimate the memory requirements.
- *
- * This function is useful e.g. after LZMA_MEMLIMIT_ERROR to find out how big
- * the memory usage limit should have been to decode the input. Note that
- * this may give misleading information if decoding .xz Streams that have
- * multiple Blocks, because each Block can have different memory requirements.
- *
- * \return      How much memory is currently allocated for the filter
- *              decoders. If no filter chain is currently allocated,
- *              some non-zero value is still returned, which is less than
- *              or equal to what any filter chain would indicate as its
- *              memory requirement.
- *
- *              If this function isn't supported by *strm or some other error
- *              occurs, zero is returned.
- */
-extern LZMA_API(uint64_t) lzma_memusage(const lzma_stream *strm)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the current memory usage limit
- *
- * This function is supported only when *strm has been initialized with
- * a function that takes a memlimit argument.
- *
- * \return      On success, the current memory usage limit is returned
- *              (always non-zero). On error, zero is returned.
- */
-extern LZMA_API(uint64_t) lzma_memlimit_get(const lzma_stream *strm)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Set the memory usage limit
- *
- * This function is supported only when *strm has been initialized with
- * a function that takes a memlimit argument.
- *
- * \return      - LZMA_OK: New memory usage limit successfully set.
- *              - LZMA_MEMLIMIT_ERROR: The new limit is too small.
- *                The limit was not changed.
- *              - LZMA_PROG_ERROR: Invalid arguments, e.g. *strm doesn't
- *                support memory usage limit or memlimit was zero.
- */
-extern LZMA_API(lzma_ret) lzma_memlimit_set(
-		lzma_stream *strm, uint64_t memlimit) lzma_nothrow;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/bcj.h r-base-3.3.1/src/extra/xz/api/lzma/bcj.h
--- r-base-3.2.3/src/extra/xz/api/lzma/bcj.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/bcj.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/**
- * \file        lzma/bcj.h
- * \brief       Branch/Call/Jump conversion filters
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/* Filter IDs for lzma_filter.id */
-
-#define LZMA_FILTER_X86         LZMA_VLI_C(0x04)
-	/**<
-	 * Filter for x86 binaries
-	 */
-
-#define LZMA_FILTER_POWERPC     LZMA_VLI_C(0x05)
-	/**<
-	 * Filter for Big endian PowerPC binaries
-	 */
-
-#define LZMA_FILTER_IA64        LZMA_VLI_C(0x06)
-	/**<
-	 * Filter for IA-64 (Itanium) binaries.
-	 */
-
-#define LZMA_FILTER_ARM         LZMA_VLI_C(0x07)
-	/**<
-	 * Filter for ARM binaries.
-	 */
-
-#define LZMA_FILTER_ARMTHUMB    LZMA_VLI_C(0x08)
-	/**<
-	 * Filter for ARM-Thumb binaries.
-	 */
-
-#define LZMA_FILTER_SPARC       LZMA_VLI_C(0x09)
-	/**<
-	 * Filter for SPARC binaries.
-	 */
-
-
-/**
- * \brief       Options for BCJ filters
- *
- * The BCJ filters never change the size of the data. Specifying options
- * for them is optional: if pointer to options is NULL, default value is
- * used. You probably never need to specify options to BCJ filters, so just
- * set the options pointer to NULL and be happy.
- *
- * If options with non-default values have been specified when encoding,
- * the same options must also be specified when decoding.
- *
- * \note        At the moment, none of the BCJ filters support
- *              LZMA_SYNC_FLUSH. If LZMA_SYNC_FLUSH is specified,
- *              LZMA_OPTIONS_ERROR will be returned. If there is need,
- *              partial support for LZMA_SYNC_FLUSH can be added in future.
- *              Partial means that flushing would be possible only at
- *              offsets that are multiple of 2, 4, or 16 depending on
- *              the filter, except x86 which cannot be made to support
- *              LZMA_SYNC_FLUSH predictably.
- */
-typedef struct {
-	/**
-	 * \brief       Start offset for conversions
-	 *
-	 * This setting is useful only when the same filter is used
-	 * _separately_ for multiple sections of the same executable file,
-	 * and the sections contain cross-section branch/call/jump
-	 * instructions. In that case it is beneficial to set the start
-	 * offset of the non-first sections so that the relative addresses
-	 * of the cross-section branch/call/jump instructions will use the
-	 * same absolute addresses as in the first section.
-	 *
-	 * When the pointer to options is NULL, the default value (zero)
-	 * is used.
-	 */
-	uint32_t start_offset;
-
-} lzma_options_bcj;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/block.h r-base-3.3.1/src/extra/xz/api/lzma/block.h
--- r-base-3.2.3/src/extra/xz/api/lzma/block.h	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/block.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,533 +0,0 @@
-/**
- * \file        lzma/block.h
- * \brief       .xz Block handling
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Options for the Block and Block Header encoders and decoders
- *
- * Different Block handling functions use different parts of this structure.
- * Some read some members, other functions write, and some do both. Only the
- * members listed for reading need to be initialized when the specified
- * functions are called. The members marked for writing will be assigned
- * new values at some point either by calling the given function or by
- * later calls to lzma_code().
- */
-typedef struct {
-	/**
-	 * \brief       Block format version
-	 *
-	 * To prevent API and ABI breakages if new features are needed in
-	 * the Block field, a version number is used to indicate which
-	 * fields in this structure are in use. For now, version must always
-	 * be zero. With non-zero version, most Block related functions will
-	 * return LZMA_OPTIONS_ERROR.
-	 *
-	 * Read by:
-	 *  - All functions that take pointer to lzma_block as argument,
-	 *    including lzma_block_header_decode().
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode()
-	 */
-	uint32_t version;
-
-	/**
-	 * \brief       Size of the Block Header field
-	 *
-	 * This is always a multiple of four.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_unpadded_size()
-	 *  - lzma_block_total_size()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_buffer_encode()
-	 */
-	uint32_t header_size;
-#	define LZMA_BLOCK_HEADER_SIZE_MIN 8
-#	define LZMA_BLOCK_HEADER_SIZE_MAX 1024
-
-	/**
-	 * \brief       Type of integrity Check
-	 *
-	 * The Check ID is not stored into the Block Header, thus its value
-	 * must be provided also when decoding.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_unpadded_size()
-	 *  - lzma_block_total_size()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	lzma_check check;
-
-	/**
-	 * \brief       Size of the Compressed Data in bytes
-	 *
-	 * Encoding: If this is not LZMA_VLI_UNKNOWN, Block Header encoder
-	 * will store this value to the Block Header. Block encoder doesn't
-	 * care about this value, but will set it once the encoding has been
-	 * finished.
-	 *
-	 * Decoding: If this is not LZMA_VLI_UNKNOWN, Block decoder will
-	 * verify that the size of the Compressed Data field matches
-	 * compressed_size.
-	 *
-	 * Usually you don't know this value when encoding in streamed mode,
-	 * and thus cannot write this field into the Block Header.
-	 *
-	 * In non-streamed mode you can reserve space for this field before
-	 * encoding the actual Block. After encoding the data, finish the
-	 * Block by encoding the Block Header. Steps in detail:
-	 *
-	 *  - Set compressed_size to some big enough value. If you don't know
-	 *    better, use LZMA_VLI_MAX, but remember that bigger values take
-	 *    more space in Block Header.
-	 *
-	 *  - Call lzma_block_header_size() to see how much space you need to
-	 *    reserve for the Block Header.
-	 *
-	 *  - Encode the Block using lzma_block_encoder() and lzma_code().
-	 *    It sets compressed_size to the correct value.
-	 *
-	 *  - Use lzma_block_header_encode() to encode the Block Header.
-	 *    Because space was reserved in the first step, you don't need
-	 *    to call lzma_block_header_size() anymore, because due to
-	 *    reserving, header_size has to be big enough. If it is "too big",
-	 *    lzma_block_header_encode() will add enough Header Padding to
-	 *    make Block Header to match the size specified by header_size.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_unpadded_size()
-	 *  - lzma_block_total_size()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	lzma_vli compressed_size;
-
-	/**
-	 * \brief       Uncompressed Size in bytes
-	 *
-	 * This is handled very similarly to compressed_size above.
-	 *
-	 * uncompressed_size is needed by fewer functions than
-	 * compressed_size. This is because uncompressed_size isn't
-	 * needed to validate that Block stays within proper limits.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	lzma_vli uncompressed_size;
-
-	/**
-	 * \brief       Array of filters
-	 *
-	 * There can be 1-4 filters. The end of the array is marked with
-	 * .id = LZMA_VLI_UNKNOWN.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode(): Note that this does NOT free()
-	 *    the old filter options structures. All unused filters[] will
-	 *    have .id == LZMA_VLI_UNKNOWN and .options == NULL. If
-	 *    decoding fails, all filters[] are guaranteed to be
-	 *    LZMA_VLI_UNKNOWN and NULL.
-	 *
-	 * \note        Because of the array is terminated with
-	 *              .id = LZMA_VLI_UNKNOWN, the actual array must
-	 *              have LZMA_FILTERS_MAX + 1 members or the Block
-	 *              Header decoder will overflow the buffer.
-	 */
-	lzma_filter *filters;
-
-	/**
-	 * \brief       Raw value stored in the Check field
-	 *
-	 * After successful coding, the first lzma_check_size(check) bytes
-	 * of this array contain the raw value stored in the Check field.
-	 *
-	 * Note that CRC32 and CRC64 are stored in little endian byte order.
-	 * Take it into account if you display the Check values to the user.
-	 *
-	 * Written by:
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	uint8_t raw_check[LZMA_CHECK_SIZE_MAX];
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the names
-	 * of these variables may change. These are and will never be used
-	 * with the currently supported options, so it is safe to leave these
-	 * uninitialized.
-	 */
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-	void *reserved_ptr3;
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-	lzma_vli reserved_int3;
-	lzma_vli reserved_int4;
-	lzma_vli reserved_int5;
-	lzma_vli reserved_int6;
-	lzma_vli reserved_int7;
-	lzma_vli reserved_int8;
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-	lzma_reserved_enum reserved_enum3;
-	lzma_reserved_enum reserved_enum4;
-	lzma_bool reserved_bool1;
-	lzma_bool reserved_bool2;
-	lzma_bool reserved_bool3;
-	lzma_bool reserved_bool4;
-	lzma_bool reserved_bool5;
-	lzma_bool reserved_bool6;
-	lzma_bool reserved_bool7;
-	lzma_bool reserved_bool8;
-
-} lzma_block;
-
-
-/**
- * \brief       Decode the Block Header Size field
- *
- * To decode Block Header using lzma_block_header_decode(), the size of the
- * Block Header has to be known and stored into lzma_block.header_size.
- * The size can be calculated from the first byte of a Block using this macro.
- * Note that if the first byte is 0x00, it indicates beginning of Index; use
- * this macro only when the byte is not 0x00.
- *
- * There is no encoding macro, because Block Header encoder is enough for that.
- */
-#define lzma_block_header_size_decode(b) (((uint32_t)(b) + 1) * 4)
-
-
-/**
- * \brief       Calculate Block Header Size
- *
- * Calculate the minimum size needed for the Block Header field using the
- * settings specified in the lzma_block structure. Note that it is OK to
- * increase the calculated header_size value as long as it is a multiple of
- * four and doesn't exceed LZMA_BLOCK_HEADER_SIZE_MAX. Increasing header_size
- * just means that lzma_block_header_encode() will add Header Padding.
- *
- * \return      - LZMA_OK: Size calculated successfully and stored to
- *                block->header_size.
- *              - LZMA_OPTIONS_ERROR: Unsupported version, filters or
- *                filter options.
- *              - LZMA_PROG_ERROR: Invalid values like compressed_size == 0.
- *
- * \note        This doesn't check that all the options are valid i.e. this
- *              may return LZMA_OK even if lzma_block_header_encode() or
- *              lzma_block_encoder() would fail. If you want to validate the
- *              filter chain, consider using lzma_memlimit_encoder() which as
- *              a side-effect validates the filter chain.
- */
-extern LZMA_API(lzma_ret) lzma_block_header_size(lzma_block *block)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Encode Block Header
- *
- * The caller must have calculated the size of the Block Header already with
- * lzma_block_header_size(). If a value larger than the one calculated by
- * lzma_block_header_size() is used, the Block Header will be padded to the
- * specified size.
- *
- * \param       out         Beginning of the output buffer. This must be
- *                          at least block->header_size bytes.
- * \param       block       Block options to be encoded.
- *
- * \return      - LZMA_OK: Encoding was successful. block->header_size
- *                bytes were written to output buffer.
- *              - LZMA_OPTIONS_ERROR: Invalid or unsupported options.
- *              - LZMA_PROG_ERROR: Invalid arguments, for example
- *                block->header_size is invalid or block->filters is NULL.
- */
-extern LZMA_API(lzma_ret) lzma_block_header_encode(
-		const lzma_block *block, uint8_t *out)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Block Header
- *
- * block->version should be set to the highest value supported by the
- * application; currently the only possible version is zero. This function
- * will set version to the lowest value that still supports all the features
- * required by the Block Header.
- *
- * The size of the Block Header must have already been decoded with
- * lzma_block_header_size_decode() macro and stored to block->header_size.
- *
- * The integrity check type from Stream Header must have been stored
- * to block->check.
- *
- * block->filters must have been allocated, but they don't need to be
- * initialized (possible existing filter options are not freed).
- *
- * \param       block       Destination for Block options.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() (and also free()
- *                          if an error occurs).
- * \param       in          Beginning of the input buffer. This must be
- *                          at least block->header_size bytes.
- *
- * \return      - LZMA_OK: Decoding was successful. block->header_size
- *                bytes were read from the input buffer.
- *              - LZMA_OPTIONS_ERROR: The Block Header specifies some
- *                unsupported options such as unsupported filters. This can
- *                happen also if block->version was set to a too low value
- *                compared to what would be required to properly represent
- *                the information stored in the Block Header.
- *              - LZMA_DATA_ERROR: Block Header is corrupt, for example,
- *                the CRC32 doesn't match.
- *              - LZMA_PROG_ERROR: Invalid arguments, for example
- *                block->header_size is invalid or block->filters is NULL.
- */
-extern LZMA_API(lzma_ret) lzma_block_header_decode(lzma_block *block,
-		lzma_allocator *allocator, const uint8_t *in)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Validate and set Compressed Size according to Unpadded Size
- *
- * Block Header stores Compressed Size, but Index has Unpadded Size. If the
- * application has already parsed the Index and is now decoding Blocks,
- * it can calculate Compressed Size from Unpadded Size. This function does
- * exactly that with error checking:
- *
- *  - Compressed Size calculated from Unpadded Size must be positive integer,
- *    that is, Unpadded Size must be big enough that after Block Header and
- *    Check fields there's still at least one byte for Compressed Size.
- *
- *  - If Compressed Size was present in Block Header, the new value
- *    calculated from Unpadded Size is compared against the value
- *    from Block Header.
- *
- * \note        This function must be called _after_ decoding the Block Header
- *              field so that it can properly validate Compressed Size if it
- *              was present in Block Header.
- *
- * \return      - LZMA_OK: block->compressed_size was set successfully.
- *              - LZMA_DATA_ERROR: unpadded_size is too small compared to
- *                block->header_size and lzma_check_size(block->check).
- *              - LZMA_PROG_ERROR: Some values are invalid. For example,
- *                block->header_size must be a multiple of four and
- *                between 8 and 1024 inclusive.
- */
-extern LZMA_API(lzma_ret) lzma_block_compressed_size(
-		lzma_block *block, lzma_vli unpadded_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Calculate Unpadded Size
- *
- * The Index field stores Unpadded Size and Uncompressed Size. The latter
- * can be taken directly from the lzma_block structure after coding a Block,
- * but Unpadded Size needs to be calculated from Block Header Size,
- * Compressed Size, and size of the Check field. This is where this function
- * is needed.
- *
- * \return      Unpadded Size on success, or zero on error.
- */
-extern LZMA_API(lzma_vli) lzma_block_unpadded_size(const lzma_block *block)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate the total encoded size of a Block
- *
- * This is equivalent to lzma_block_unpadded_size() except that the returned
- * value includes the size of the Block Padding field.
- *
- * \return      On success, total encoded size of the Block. On error,
- *              zero is returned.
- */
-extern LZMA_API(lzma_vli) lzma_block_total_size(const lzma_block *block)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize .xz Block encoder
- *
- * Valid actions for lzma_code() are LZMA_RUN, LZMA_SYNC_FLUSH (only if the
- * filter chain supports it), and LZMA_FINISH.
- *
- * \return      - LZMA_OK: All good, continue with lzma_code().
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_UNSUPPORTED_CHECK: block->check specifies a Check ID
- *                that is not supported by this buid of liblzma. Initializing
- *                the encoder failed.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_encoder(
-		lzma_stream *strm, lzma_block *block)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .xz Block decoder
- *
- * Valid actions for lzma_code() are LZMA_RUN and LZMA_FINISH. Using
- * LZMA_FINISH is not required. It is supported only for convenience.
- *
- * \return      - LZMA_OK: All good, continue with lzma_code().
- *              - LZMA_UNSUPPORTED_CHECK: Initialization was successful, but
- *                the given Check ID is not supported, thus Check will be
- *                ignored.
- *              - LZMA_PROG_ERROR
- *              - LZMA_MEM_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_decoder(
-		lzma_stream *strm, lzma_block *block)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Calculate maximum output size for single-call Block encoding
- *
- * This is equivalent to lzma_stream_buffer_bound() but for .xz Blocks.
- * See the documentation of lzma_stream_buffer_bound().
- */
-extern LZMA_API(size_t) lzma_block_buffer_bound(size_t uncompressed_size)
-		lzma_nothrow;
-
-
-/**
- * \brief       Single-call .xz Block encoder
- *
- * In contrast to the multi-call encoder initialized with
- * lzma_block_encoder(), this function encodes also the Block Header. This
- * is required to make it possible to write appropriate Block Header also
- * in case the data isn't compressible, and different filter chain has to be
- * used to encode the data in uncompressed form using uncompressed chunks
- * of the LZMA2 filter.
- *
- * When the data isn't compressible, header_size, compressed_size, and
- * uncompressed_size are set just like when the data was compressible, but
- * it is possible that header_size is too small to hold the filter chain
- * specified in block->filters, because that isn't necessarily the filter
- * chain that was actually used to encode the data. lzma_block_unpadded_size()
- * still works normally, because it doesn't read the filters array.
- *
- * \param       block       Block options: block->version, block->check,
- *                          and block->filters must have been initialized.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_buffer_encode(
-		lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Block decoder
- *
- * This is single-call equivalent of lzma_block_decoder(), and requires that
- * the caller has already decoded Block Header and checked its memory usage.
- *
- * \param       block       Block options just like with lzma_block_decoder().
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_BUF_ERROR: Output buffer was too small.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_buffer_decode(
-		lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/check.h r-base-3.3.1/src/extra/xz/api/lzma/check.h
--- r-base-3.2.3/src/extra/xz/api/lzma/check.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/check.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-/**
- * \file        lzma/check.h
- * \brief       Integrity checks
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Type of the integrity check (Check ID)
- *
- * The .xz format supports multiple types of checks that are calculated
- * from the uncompressed data. They vary in both speed and ability to
- * detect errors.
- */
-typedef enum {
-	LZMA_CHECK_NONE     = 0,
-		/**<
-		 * No Check is calculated.
-		 *
-		 * Size of the Check field: 0 bytes
-		 */
-
-	LZMA_CHECK_CRC32    = 1,
-		/**<
-		 * CRC32 using the polynomial from the IEEE 802.3 standard
-		 *
-		 * Size of the Check field: 4 bytes
-		 */
-
-	LZMA_CHECK_CRC64    = 4,
-		/**<
-		 * CRC64 using the polynomial from the ECMA-182 standard
-		 *
-		 * Size of the Check field: 8 bytes
-		 */
-
-	LZMA_CHECK_SHA256   = 10
-		/**<
-		 * SHA-256
-		 *
-		 * Size of the Check field: 32 bytes
-		 */
-} lzma_check;
-
-
-/**
- * \brief       Maximum valid Check ID
- *
- * The .xz file format specification specifies 16 Check IDs (0-15). Some
- * of them are only reserved, that is, no actual Check algorithm has been
- * assigned. When decoding, liblzma still accepts unknown Check IDs for
- * future compatibility. If a valid but unsupported Check ID is detected,
- * liblzma can indicate a warning; see the flags LZMA_TELL_NO_CHECK,
- * LZMA_TELL_UNSUPPORTED_CHECK, and LZMA_TELL_ANY_CHECK in container.h.
- */
-#define LZMA_CHECK_ID_MAX 15
-
-
-/**
- * \brief       Test if the given Check ID is supported
- *
- * Return true if the given Check ID is supported by this liblzma build.
- * Otherwise false is returned. It is safe to call this with a value that
- * is not in the range [0, 15]; in that case the return value is always false.
- *
- * You can assume that LZMA_CHECK_NONE and LZMA_CHECK_CRC32 are always
- * supported (even if liblzma is built with limited features).
- */
-extern LZMA_API(lzma_bool) lzma_check_is_supported(lzma_check check)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Get the size of the Check field with the given Check ID
- *
- * Although not all Check IDs have a check algorithm associated, the size of
- * every Check is already frozen. This function returns the size (in bytes) of
- * the Check field with the specified Check ID. The values are:
- * { 0, 4, 4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64, 64 }
- *
- * If the argument is not in the range [0, 15], UINT32_MAX is returned.
- */
-extern LZMA_API(uint32_t) lzma_check_size(lzma_check check)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Maximum size of a Check field
- */
-#define LZMA_CHECK_SIZE_MAX 64
-
-
-/**
- * \brief       Calculate CRC32
- *
- * Calculate CRC32 using the polynomial from the IEEE 802.3 standard.
- *
- * \param       buf     Pointer to the input buffer
- * \param       size    Size of the input buffer
- * \param       crc     Previously returned CRC value. This is used to
- *                      calculate the CRC of a big buffer in smaller chunks.
- *                      Set to zero when starting a new calculation.
- *
- * \return      Updated CRC value, which can be passed to this function
- *              again to continue CRC calculation.
- */
-extern LZMA_API(uint32_t) lzma_crc32(
-		const uint8_t *buf, size_t size, uint32_t crc)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate CRC64
- *
- * Calculate CRC64 using the polynomial from the ECMA-182 standard.
- *
- * This function is used similarly to lzma_crc32(). See its documentation.
- */
-extern LZMA_API(uint64_t) lzma_crc64(
-		const uint8_t *buf, size_t size, uint64_t crc)
-		lzma_nothrow lzma_attr_pure;
-
-
-/*
- * SHA-256 functions are currently not exported to public API.
- * Contact Lasse Collin if you think it should be.
- */
-
-
-/**
- * \brief       Get the type of the integrity check
- *
- * This function can be called only immediately after lzma_code() has
- * returned LZMA_NO_CHECK, LZMA_UNSUPPORTED_CHECK, or LZMA_GET_CHECK.
- * Calling this function in any other situation has undefined behavior.
- */
-extern LZMA_API(lzma_check) lzma_get_check(const lzma_stream *strm)
-		lzma_nothrow;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/container.h r-base-3.3.1/src/extra/xz/api/lzma/container.h
--- r-base-3.2.3/src/extra/xz/api/lzma/container.h	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/container.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,424 +0,0 @@
-/**
- * \file        lzma/container.h
- * \brief       File formats
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/************
- * Encoding *
- ************/
-
-/**
- * \brief       Default compression preset
- *
- * It's not straightforward to recommend a default preset, because in some
- * cases keeping the resource usage relatively low is more important that
- * getting the maximum compression ratio.
- */
-#define LZMA_PRESET_DEFAULT     UINT32_C(6)
-
-
-/**
- * \brief       Mask for preset level
- *
- * This is useful only if you need to extract the level from the preset
- * variable. That should be rare.
- */
-#define LZMA_PRESET_LEVEL_MASK  UINT32_C(0x1F)
-
-
-/*
- * Preset flags
- *
- * Currently only one flag is defined.
- */
-
-/**
- * \brief       Extreme compression preset
- *
- * This flag modifies the preset to make the encoding significantly slower
- * while improving the compression ratio only marginally. This is useful
- * when you don't mind wasting time to get as small result as possible.
- *
- * This flag doesn't affect the memory usage requirements of the decoder (at
- * least not significantly). The memory usage of the encoder may be increased
- * a little but only at the lowest preset levels (0-3).
- */
-#define LZMA_PRESET_EXTREME       (UINT32_C(1) << 31)
-
-
-/**
- * \brief       Calculate approximate memory usage of easy encoder
- *
- * This function is a wrapper for lzma_raw_encoder_memusage().
- *
- * \param       preset  Compression preset (level and possible flags)
- *
- * \return      Number of bytes of memory required for the given
- *              preset when encoding. If an error occurs, for example
- *              due to unsupported preset, UINT64_MAX is returned.
- */
-extern LZMA_API(uint64_t) lzma_easy_encoder_memusage(uint32_t preset)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate approximate decoder memory usage of a preset
- *
- * This function is a wrapper for lzma_raw_decoder_memusage().
- *
- * \param       preset  Compression preset (level and possible flags)
- *
- * \return      Number of bytes of memory required to decompress a file
- *              that was compressed using the given preset. If an error
- *              occurs, for example due to unsupported preset, UINT64_MAX
- *              is returned.
- */
-extern LZMA_API(uint64_t) lzma_easy_decoder_memusage(uint32_t preset)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize .xz Stream encoder using a preset number
- *
- * This function is intended for those who just want to use the basic features
- * if liblzma (that is, most developers out there).
- *
- * \param       strm    Pointer to lzma_stream that is at least initialized
- *                      with LZMA_STREAM_INIT.
- * \param       preset  Compression preset to use. A preset consist of level
- *                      number and zero or more flags. Usually flags aren't
- *                      used, so preset is simply a number [0, 9] which match
- *                      the options -0 ... -9 of the xz command line tool.
- *                      Additional flags can be be set using bitwise-or with
- *                      the preset level number, e.g. 6 | LZMA_PRESET_EXTREME.
- * \param       check   Integrity check type to use. See check.h for available
- *                      checks. The xz command line tool defaults to
- *                      LZMA_CHECK_CRC64, which is a good choice if you are
- *                      unsure. LZMA_CHECK_CRC32 is good too as long as the
- *                      uncompressed file is not many gigabytes.
- *
- * \return      - LZMA_OK: Initialization succeeded. Use lzma_code() to
- *                encode your data.
- *              - LZMA_MEM_ERROR: Memory allocation failed.
- *              - LZMA_OPTIONS_ERROR: The given compression preset is not
- *                supported by this build of liblzma.
- *              - LZMA_UNSUPPORTED_CHECK: The given check type is not
- *                supported by this liblzma build.
- *              - LZMA_PROG_ERROR: One or more of the parameters have values
- *                that will never be valid. For example, strm == NULL.
- *
- * If initialization fails (return value is not LZMA_OK), all the memory
- * allocated for *strm by liblzma is always freed. Thus, there is no need
- * to call lzma_end() after failed initialization.
- *
- * If initialization succeeds, use lzma_code() to do the actual encoding.
- * Valid values for `action' (the second argument of lzma_code()) are
- * LZMA_RUN, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, and LZMA_FINISH. In future,
- * there may be compression levels or flags that don't support LZMA_SYNC_FLUSH.
- */
-extern LZMA_API(lzma_ret) lzma_easy_encoder(
-		lzma_stream *strm, uint32_t preset, lzma_check check)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Stream encoding using a preset number
- *
- * The maximum required output buffer size can be calculated with
- * lzma_stream_buffer_bound().
- *
- * \param       preset      Compression preset to use. See the description
- *                          in lzma_easy_encoder().
- * \param       check       Type of the integrity check to calculate from
- *                          uncompressed data.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_easy_buffer_encode(
-		uint32_t preset, lzma_check check,
-		lzma_allocator *allocator, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Initialize .xz Stream encoder using a custom filter chain
- *
- * \param       strm    Pointer to properly prepared lzma_stream
- * \param       filters Array of filters. This must be terminated with
- *                      filters[n].id = LZMA_VLI_UNKNOWN. See filter.h for
- *                      more information.
- * \param       check   Type of the integrity check to calculate from
- *                      uncompressed data.
- *
- * \return      - LZMA_OK: Initialization was successful.
- *              - LZMA_MEM_ERROR
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_encoder(lzma_stream *strm,
-		const lzma_filter *filters, lzma_check check)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .lzma encoder (legacy file format)
- *
- * The .lzma format is sometimes called the LZMA_Alone format, which is the
- * reason for the name of this function. The .lzma format supports only the
- * LZMA1 filter. There is no support for integrity checks like CRC32.
- *
- * Use this function if and only if you need to create files readable by
- * legacy LZMA tools such as LZMA Utils 4.32.x. Moving to the .xz format
- * is strongly recommended.
- *
- * The valid action values for lzma_code() are LZMA_RUN and LZMA_FINISH.
- * No kind of flushing is supported, because the file format doesn't make
- * it possible.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_alone_encoder(
-		lzma_stream *strm, const lzma_options_lzma *options)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Calculate output buffer size for single-call Stream encoder
- *
- * When trying to compress uncompressible data, the encoded size will be
- * slightly bigger than the input data. This function calculates how much
- * output buffer space is required to be sure that lzma_stream_buffer_encode()
- * doesn't return LZMA_BUF_ERROR.
- *
- * The calculated value is not exact, but it is guaranteed to be big enough.
- * The actual maximum output space required may be slightly smaller (up to
- * about 100 bytes). This should not be a problem in practice.
- *
- * If the calculated maximum size doesn't fit into size_t or would make the
- * Stream grow past LZMA_VLI_MAX (which should never happen in practice),
- * zero is returned to indicate the error.
- *
- * \note        The limit calculated by this function applies only to
- *              single-call encoding. Multi-call encoding may (and probably
- *              will) have larger maximum expansion when encoding
- *              uncompressible data. Currently there is no function to
- *              calculate the maximum expansion of multi-call encoding.
- */
-extern LZMA_API(size_t) lzma_stream_buffer_bound(size_t uncompressed_size)
-		lzma_nothrow;
-
-
-/**
- * \brief       Single-call .xz Stream encoder
- *
- * \param       filters     Array of filters. This must be terminated with
- *                          filters[n].id = LZMA_VLI_UNKNOWN. See filter.h
- *                          for more information.
- * \param       check       Type of the integrity check to calculate from
- *                          uncompressed data.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_buffer_encode(
-		lzma_filter *filters, lzma_check check,
-		lzma_allocator *allocator, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/************
- * Decoding *
- ************/
-
-/**
- * This flag makes lzma_code() return LZMA_NO_CHECK if the input stream
- * being decoded has no integrity check. Note that when used with
- * lzma_auto_decoder(), all .lzma files will trigger LZMA_NO_CHECK
- * if LZMA_TELL_NO_CHECK is used.
- */
-#define LZMA_TELL_NO_CHECK              UINT32_C(0x01)
-
-
-/**
- * This flag makes lzma_code() return LZMA_UNSUPPORTED_CHECK if the input
- * stream has an integrity check, but the type of the integrity check is not
- * supported by this liblzma version or build. Such files can still be
- * decoded, but the integrity check cannot be verified.
- */
-#define LZMA_TELL_UNSUPPORTED_CHECK     UINT32_C(0x02)
-
-
-/**
- * This flag makes lzma_code() return LZMA_GET_CHECK as soon as the type
- * of the integrity check is known. The type can then be got with
- * lzma_get_check().
- */
-#define LZMA_TELL_ANY_CHECK             UINT32_C(0x04)
-
-
-/**
- * This flag enables decoding of concatenated files with file formats that
- * allow concatenating compressed files as is. From the formats currently
- * supported by liblzma, only the .xz format allows concatenated files.
- * Concatenated files are not allowed with the legacy .lzma format.
- *
- * This flag also affects the usage of the `action' argument for lzma_code().
- * When LZMA_CONCATENATED is used, lzma_code() won't return LZMA_STREAM_END
- * unless LZMA_FINISH is used as `action'. Thus, the application has to set
- * LZMA_FINISH in the same way as it does when encoding.
- *
- * If LZMA_CONCATENATED is not used, the decoders still accept LZMA_FINISH
- * as `action' for lzma_code(), but the usage of LZMA_FINISH isn't required.
- */
-#define LZMA_CONCATENATED               UINT32_C(0x08)
-
-
-/**
- * \brief       Initialize .xz Stream decoder
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       memlimit    Memory usage limit as bytes. Use UINT64_MAX
- *                          to effectively disable the limiter.
- * \param       flags       Bitwise-or of zero or more of the decoder flags:
- *                          LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK,
- *                          LZMA_TELL_ANY_CHECK, LZMA_CONCATENATED
- *
- * \return      - LZMA_OK: Initialization was successful.
- *              - LZMA_MEM_ERROR: Cannot allocate memory.
- *              - LZMA_OPTIONS_ERROR: Unsupported flags
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_decoder(
-		lzma_stream *strm, uint64_t memlimit, uint32_t flags)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode .xz Streams and .lzma files with autodetection
- *
- * This decoder autodetects between the .xz and .lzma file formats, and
- * calls lzma_stream_decoder() or lzma_alone_decoder() once the type
- * of the input file has been detected.
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       memlimit    Memory usage limit as bytes. Use UINT64_MAX
- *                          to effectively disable the limiter.
- * \param       flags       Bitwise-or of flags, or zero for no flags.
- *
- * \return      - LZMA_OK: Initialization was successful.
- *              - LZMA_MEM_ERROR: Cannot allocate memory.
- *              - LZMA_OPTIONS_ERROR: Unsupported flags
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_auto_decoder(
-		lzma_stream *strm, uint64_t memlimit, uint32_t flags)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .lzma decoder (legacy file format)
- *
- * Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH.
- * There is no need to use LZMA_FINISH, but allowing it may simplify
- * certain types of applications.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_alone_decoder(
-		lzma_stream *strm, uint64_t memlimit)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Stream decoder
- *
- * \param       memlimit    Pointer to how much memory the decoder is allowed
- *                          to allocate. The value pointed by this pointer is
- *                          modified if and only if LZMA_MEMLIMIT_ERROR is
- *                          returned.
- * \param       flags       Bitwise-or of zero or more of the decoder flags:
- *                          LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK,
- *                          LZMA_CONCATENATED. Note that LZMA_TELL_ANY_CHECK
- *                          is not allowed and will return LZMA_PROG_ERROR.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if decoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_FORMAT_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_NO_CHECK: This can be returned only if using
- *                the LZMA_TELL_NO_CHECK flag.
- *              - LZMA_UNSUPPORTED_CHECK: This can be returned only if using
- *                the LZMA_TELL_UNSUPPORTED_CHECK flag.
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached.
- *                The minimum required memlimit value was stored to *memlimit.
- *              - LZMA_BUF_ERROR: Output buffer was too small.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_buffer_decode(
-		uint64_t *memlimit, uint32_t flags, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/delta.h r-base-3.3.1/src/extra/xz/api/lzma/delta.h
--- r-base-3.2.3/src/extra/xz/api/lzma/delta.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/delta.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/**
- * \file        lzma/delta.h
- * \brief       Delta filter
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Filter ID
- *
- * Filter ID of the Delta filter. This is used as lzma_filter.id.
- */
-#define LZMA_FILTER_DELTA       LZMA_VLI_C(0x03)
-
-
-/**
- * \brief       Type of the delta calculation
- *
- * Currently only byte-wise delta is supported. Other possible types could
- * be, for example, delta of 16/32/64-bit little/big endian integers, but
- * these are not currently planned since byte-wise delta is almost as good.
- */
-typedef enum {
-	LZMA_DELTA_TYPE_BYTE
-} lzma_delta_type;
-
-
-/**
- * \brief       Options for the Delta filter
- *
- * These options are needed by both encoder and decoder.
- */
-typedef struct {
-	/** For now, this must always be LZMA_DELTA_TYPE_BYTE. */
-	lzma_delta_type type;
-
-	/**
-	 * \brief       Delta distance
-	 *
-	 * With the only currently supported type, LZMA_DELTA_TYPE_BYTE,
-	 * the distance is as bytes.
-	 *
-	 * Examples:
-	 *  - 16-bit stereo audio: distance = 4 bytes
-	 *  - 24-bit RGB image data: distance = 3 bytes
-	 */
-	uint32_t dist;
-#	define LZMA_DELTA_DIST_MIN 1
-#	define LZMA_DELTA_DIST_MAX 256
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the names
-	 * of these variables may change. These are and will never be used
-	 * when type is LZMA_DELTA_TYPE_BYTE, so it is safe to leave these
-	 * uninitialized.
-	 */
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-	uint32_t reserved_int3;
-	uint32_t reserved_int4;
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-
-} lzma_options_delta;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/filter.h r-base-3.3.1/src/extra/xz/api/lzma/filter.h
--- r-base-3.2.3/src/extra/xz/api/lzma/filter.h	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/filter.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,424 +0,0 @@
-/**
- * \file        lzma/filter.h
- * \brief       Common filter related types and functions
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Maximum number of filters in a chain
- *
- * A filter chain can have 1-4 filters, of which three are allowed to change
- * the size of the data. Usually only one or two filters are needed.
- */
-#define LZMA_FILTERS_MAX 4
-
-
-/**
- * \brief       Filter options
- *
- * This structure is used to pass Filter ID and a pointer filter's
- * options to liblzma. A few functions work with a single lzma_filter
- * structure, while most functions expect a filter chain.
- *
- * A filter chain is indicated with an array of lzma_filter structures.
- * The array is terminated with .id = LZMA_VLI_UNKNOWN. Thus, the filter
- * array must have LZMA_FILTERS_MAX + 1 elements (that is, five) to
- * be able to hold any arbitrary filter chain. This is important when
- * using lzma_block_header_decode() from block.h, because too small
- * array would make liblzma write past the end of the filters array.
- */
-typedef struct {
-	/**
-	 * \brief       Filter ID
-	 *
-	 * Use constants whose name begin with `LZMA_FILTER_' to specify
-	 * different filters. In an array of lzma_filter structures, use
-	 * LZMA_VLI_UNKNOWN to indicate end of filters.
-	 *
-	 * \note        This is not an enum, because on some systems enums
-	 *              cannot be 64-bit.
-	 */
-	lzma_vli id;
-
-	/**
-	 * \brief       Pointer to filter-specific options structure
-	 *
-	 * If the filter doesn't need options, set this to NULL. If id is
-	 * set to LZMA_VLI_UNKNOWN, options is ignored, and thus
-	 * doesn't need be initialized.
-	 */
-	void *options;
-
-} lzma_filter;
-
-
-/**
- * \brief       Test if the given Filter ID is supported for encoding
- *
- * Return true if the give Filter ID is supported for encoding by this
- * liblzma build. Otherwise false is returned.
- *
- * There is no way to list which filters are available in this particular
- * liblzma version and build. It would be useless, because the application
- * couldn't know what kind of options the filter would need.
- */
-extern LZMA_API(lzma_bool) lzma_filter_encoder_is_supported(lzma_vli id)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Test if the given Filter ID is supported for decoding
- *
- * Return true if the give Filter ID is supported for decoding by this
- * liblzma build. Otherwise false is returned.
- */
-extern LZMA_API(lzma_bool) lzma_filter_decoder_is_supported(lzma_vli id)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Copy the filters array
- *
- * Copy the Filter IDs and filter-specific options from src to dest.
- * Up to LZMA_FILTERS_MAX filters are copied, plus the terminating
- * .id == LZMA_VLI_UNKNOWN. Thus, dest should have at least
- * LZMA_FILTERS_MAX + 1 elements space unless the caller knows that
- * src is smaller than that.
- *
- * Unless the filter-specific options is NULL, the Filter ID has to be
- * supported by liblzma, because liblzma needs to know the size of every
- * filter-specific options structure. The filter-specific options are not
- * validated. If options is NULL, any unsupported Filter IDs are copied
- * without returning an error.
- *
- * Old filter-specific options in dest are not freed, so dest doesn't
- * need to be initialized by the caller in any way.
- *
- * If an error occurs, memory possibly already allocated by this function
- * is always freed.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR: Unsupported Filter ID and its options
- *                is not NULL.
- *              - LZMA_PROG_ERROR: src or dest is NULL.
- */
-extern LZMA_API(lzma_ret) lzma_filters_copy(const lzma_filter *src,
-		lzma_filter *dest, lzma_allocator *allocator) lzma_nothrow;
-
-
-/**
- * \brief       Calculate approximate memory requirements for raw encoder
- *
- * This function can be used to calculate the memory requirements for
- * Block and Stream encoders too because Block and Stream encoders don't
- * need significantly more memory than raw encoder.
- *
- * \param       filters     Array of filters terminated with
- *                          .id == LZMA_VLI_UNKNOWN.
- *
- * \return      Number of bytes of memory required for the given
- *              filter chain when encoding. If an error occurs,
- *              for example due to unsupported filter chain,
- *              UINT64_MAX is returned.
- */
-extern LZMA_API(uint64_t) lzma_raw_encoder_memusage(const lzma_filter *filters)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate approximate memory requirements for raw decoder
- *
- * This function can be used to calculate the memory requirements for
- * Block and Stream decoders too because Block and Stream decoders don't
- * need significantly more memory than raw decoder.
- *
- * \param       filters     Array of filters terminated with
- *                          .id == LZMA_VLI_UNKNOWN.
- *
- * \return      Number of bytes of memory required for the given
- *              filter chain when decoding. If an error occurs,
- *              for example due to unsupported filter chain,
- *              UINT64_MAX is returned.
- */
-extern LZMA_API(uint64_t) lzma_raw_decoder_memusage(const lzma_filter *filters)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize raw encoder
- *
- * This function may be useful when implementing custom file formats.
- *
- * \param       strm    Pointer to properly prepared lzma_stream
- * \param       filters Array of lzma_filter structures. The end of the
- *                      array must be marked with .id = LZMA_VLI_UNKNOWN.
- *
- * The `action' with lzma_code() can be LZMA_RUN, LZMA_SYNC_FLUSH (if the
- * filter chain supports it), or LZMA_FINISH.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_raw_encoder(
-		lzma_stream *strm, const lzma_filter *filters)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize raw decoder
- *
- * The initialization of raw decoder goes similarly to raw encoder.
- *
- * The `action' with lzma_code() can be LZMA_RUN or LZMA_FINISH. Using
- * LZMA_FINISH is not required, it is supported just for convenience.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_raw_decoder(
-		lzma_stream *strm, const lzma_filter *filters)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Update the filter chain in the encoder
- *
- * This function is for advanced users only. This function has two slightly
- * different purposes:
- *
- *  - After LZMA_FULL_FLUSH when using Stream encoder: Set a new filter
- *    chain, which will be used starting from the next Block.
- *
- *  - After LZMA_SYNC_FLUSH using Raw, Block, or Stream encoder: Change
- *    the filter-specific options in the middle of encoding. The actual
- *    filters in the chain (Filter IDs) cannot be changed. In the future,
- *    it might become possible to change the filter options without
- *    using LZMA_SYNC_FLUSH.
- *
- * While rarely useful, this function may be called also when no data has
- * been compressed yet. In that case, this function will behave as if
- * LZMA_FULL_FLUSH (Stream encoder) or LZMA_SYNC_FLUSH (Raw or Block
- * encoder) had been used right before calling this function.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_filters_update(
-		lzma_stream *strm, const lzma_filter *filters) lzma_nothrow;
-
-
-/**
- * \brief       Single-call raw encoder
- *
- * \param       filters     Array of lzma_filter structures. The end of the
- *                          array must be marked with .id = LZMA_VLI_UNKNOWN.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- *
- * \note        There is no function to calculate how big output buffer
- *              would surely be big enough. (lzma_stream_buffer_bound()
- *              works only for lzma_stream_buffer_encode(); raw encoder
- *              won't necessarily meet that bound.)
- */
-extern LZMA_API(lzma_ret) lzma_raw_buffer_encode(
-		const lzma_filter *filters, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size, uint8_t *out,
-		size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Single-call raw decoder
- *
- * \param       filters     Array of lzma_filter structures. The end of the
- *                          array must be marked with .id = LZMA_VLI_UNKNOWN.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- */
-extern LZMA_API(lzma_ret) lzma_raw_buffer_decode(
-		const lzma_filter *filters, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Get the size of the Filter Properties field
- *
- * This function may be useful when implementing custom file formats
- * using the raw encoder and decoder.
- *
- * \param       size    Pointer to uint32_t to hold the size of the properties
- * \param       filter  Filter ID and options (the size of the properties may
- *                      vary depending on the options)
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- *
- * \note        This function validates the Filter ID, but does not
- *              necessarily validate the options. Thus, it is possible
- *              that this returns LZMA_OK while the following call to
- *              lzma_properties_encode() returns LZMA_OPTIONS_ERROR.
- */
-extern LZMA_API(lzma_ret) lzma_properties_size(
-		uint32_t *size, const lzma_filter *filter) lzma_nothrow;
-
-
-/**
- * \brief       Encode the Filter Properties field
- *
- * \param       filter  Filter ID and options
- * \param       props   Buffer to hold the encoded options. The size of
- *                      buffer must have been already determined with
- *                      lzma_properties_size().
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- *
- * \note        Even this function won't validate more options than actually
- *              necessary. Thus, it is possible that encoding the properties
- *              succeeds but using the same options to initialize the encoder
- *              will fail.
- *
- * \note        If lzma_properties_size() indicated that the size
- *              of the Filter Properties field is zero, calling
- *              lzma_properties_encode() is not required, but it
- *              won't do any harm either.
- */
-extern LZMA_API(lzma_ret) lzma_properties_encode(
-		const lzma_filter *filter, uint8_t *props) lzma_nothrow;
-
-
-/**
- * \brief       Decode the Filter Properties field
- *
- * \param       filter      filter->id must have been set to the correct
- *                          Filter ID. filter->options doesn't need to be
- *                          initialized (it's not freed by this function). The
- *                          decoded options will be stored to filter->options.
- *                          filter->options is set to NULL if there are no
- *                          properties or if an error occurs.
- * \param       allocator   Custom memory allocator used to allocate the
- *                          options. Set to NULL to use the default malloc(),
- *                          and in case of an error, also free().
- * \param       props       Input buffer containing the properties.
- * \param       props_size  Size of the properties. This must be the exact
- *                          size; giving too much or too little input will
- *                          return LZMA_OPTIONS_ERROR.
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_properties_decode(
-		lzma_filter *filter, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size) lzma_nothrow;
-
-
-/**
- * \brief       Calculate encoded size of a Filter Flags field
- *
- * Knowing the size of Filter Flags is useful to know when allocating
- * memory to hold the encoded Filter Flags.
- *
- * \param       size    Pointer to integer to hold the calculated size
- * \param       filter  Filter ID and associated options whose encoded
- *                      size is to be calculated
- *
- * \return      - LZMA_OK: *size set successfully. Note that this doesn't
- *                guarantee that filter->options is valid, thus
- *                lzma_filter_flags_encode() may still fail.
- *              - LZMA_OPTIONS_ERROR: Unknown Filter ID or unsupported options.
- *              - LZMA_PROG_ERROR: Invalid options
- *
- * \note        If you need to calculate size of List of Filter Flags,
- *              you need to loop over every lzma_filter entry.
- */
-extern LZMA_API(lzma_ret) lzma_filter_flags_size(
-		uint32_t *size, const lzma_filter *filter)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Encode Filter Flags into given buffer
- *
- * In contrast to some functions, this doesn't allocate the needed buffer.
- * This is due to how this function is used internally by liblzma.
- *
- * \param       filter      Filter ID and options to be encoded
- * \param       out         Beginning of the output buffer
- * \param       out_pos     out[*out_pos] is the next write position. This
- *                          is updated by the encoder.
- * \param       out_size    out[out_size] is the first byte to not write.
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_OPTIONS_ERROR: Invalid or unsupported options.
- *              - LZMA_PROG_ERROR: Invalid options or not enough output
- *                buffer space (you should have checked it with
- *                lzma_filter_flags_size()).
- */
-extern LZMA_API(lzma_ret) lzma_filter_flags_encode(const lzma_filter *filter,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Filter Flags from given buffer
- *
- * The decoded result is stored into *filter. The old value of
- * filter->options is not free()d.
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_filter_flags_decode(
-		lzma_filter *filter, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/hardware.h r-base-3.3.1/src/extra/xz/api/lzma/hardware.h
--- r-base-3.2.3/src/extra/xz/api/lzma/hardware.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/hardware.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/**
- * \file        lzma/hardware.h
- * \brief       Hardware information
- *
- * Since liblzma can consume a lot of system resources, it also provides
- * ways to limit the resource usage. Applications linking against liblzma
- * need to do the actual decisions how much resources to let liblzma to use.
- * To ease making these decisions, liblzma provides functions to find out
- * the relevant capabilities of the underlaying hardware. Currently there
- * is only a function to find out the amount of RAM, but in the future there
- * will be also a function to detect how many concurrent threads the system
- * can run.
- *
- * \note        On some operating systems, these function may temporarily
- *              load a shared library or open file descriptor(s) to find out
- *              the requested hardware information. Unless the application
- *              assumes that specific file descriptors are not touched by
- *              other threads, this should have no effect on thread safety.
- *              Possible operations involving file descriptors will restart
- *              the syscalls if they return EINTR.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Get the total amount of physical memory (RAM) in bytes
- *
- * This function may be useful when determining a reasonable memory
- * usage limit for decompressing or how much memory it is OK to use
- * for compressing.
- *
- * \return      On success, the total amount of physical memory in bytes
- *              is returned. If the amount of RAM cannot be determined,
- *              zero is returned. This can happen if an error occurs
- *              or if there is no code in liblzma to detect the amount
- *              of RAM on the specific operating system.
- */
-extern LZMA_API(uint64_t) lzma_physmem(void) lzma_nothrow;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/index.h r-base-3.3.1/src/extra/xz/api/lzma/index.h
--- r-base-3.2.3/src/extra/xz/api/lzma/index.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/index.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,682 +0,0 @@
-/**
- * \file        lzma/index.h
- * \brief       Handling of .xz Index and related information
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Opaque data type to hold the Index(es) and other information
- *
- * lzma_index often holds just one .xz Index and possibly the Stream Flags
- * of the same Stream and size of the Stream Padding field. However,
- * multiple lzma_indexes can be concatenated with lzma_index_cat() and then
- * there may be information about multiple Streams in the same lzma_index.
- *
- * Notes about thread safety: Only one thread may modify lzma_index at
- * a time. All functions that take non-const pointer to lzma_index
- * modify it. As long as no thread is modifying the lzma_index, getting
- * information from the same lzma_index can be done from multiple threads
- * at the same time with functions that take a const pointer to
- * lzma_index or use lzma_index_iter. The same iterator must be used
- * only by one thread at a time, of course, but there can be as many
- * iterators for the same lzma_index as needed.
- */
-typedef struct lzma_index_s lzma_index;
-
-
-/**
- * \brief       Iterator to get information about Blocks and Streams
- */
-typedef struct {
-	struct {
-		/**
-		 * \brief       Pointer to Stream Flags
-		 *
-		 * This is NULL if Stream Flags have not been set for
-		 * this Stream with lzma_index_stream_flags().
-		 */
-		const lzma_stream_flags *flags;
-
-		const void *reserved_ptr1;
-		const void *reserved_ptr2;
-		const void *reserved_ptr3;
-
-		/**
-		 * \brief       Stream number in the lzma_index
-		 *
-		 * The first Stream is 1.
-		 */
-		lzma_vli number;
-
-		/**
-		 * \brief       Number of Blocks in the Stream
-		 *
-		 * If this is zero, the block structure below has
-		 * undefined values.
-		 */
-		lzma_vli block_count;
-
-		/**
-		 * \brief       Compressed start offset of this Stream
-		 *
-		 * The offset is relative to the beginning of the lzma_index
-		 * (i.e. usually the beginning of the .xz file).
-		 */
-		lzma_vli compressed_offset;
-
-		/**
-		 * \brief       Uncompressed start offset of this Stream
-		 *
-		 * The offset is relative to the beginning of the lzma_index
-		 * (i.e. usually the beginning of the .xz file).
-		 */
-		lzma_vli uncompressed_offset;
-
-		/**
-		 * \brief       Compressed size of this Stream
-		 *
-		 * This includes all headers except the possible
-		 * Stream Padding after this Stream.
-		 */
-		lzma_vli compressed_size;
-
-		/**
-		 * \brief       Uncompressed size of this Stream
-		 */
-		lzma_vli uncompressed_size;
-
-		/**
-		 * \brief       Size of Stream Padding after this Stream
-		 *
-		 * If it hasn't been set with lzma_index_stream_padding(),
-		 * this defaults to zero. Stream Padding is always
-		 * a multiple of four bytes.
-		 */
-		lzma_vli padding;
-
-		lzma_vli reserved_vli1;
-		lzma_vli reserved_vli2;
-		lzma_vli reserved_vli3;
-		lzma_vli reserved_vli4;
-	} stream;
-
-	struct {
-		/**
-		 * \brief       Block number in the file
-		 *
-		 * The first Block is 1.
-		 */
-		lzma_vli number_in_file;
-
-		/**
-		 * \brief       Compressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the
-		 * lzma_index (i.e. usually the beginning of the .xz file).
-		 * Normally this is where you should seek in the .xz file
-		 * to start decompressing this Block.
-		 */
-		lzma_vli compressed_file_offset;
-
-		/**
-		 * \brief       Uncompressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the lzma_index
-		 * (i.e. usually the beginning of the .xz file).
-		 *
-		 * When doing random-access reading, it is possible that
-		 * the target offset is not exactly at Block boundary. One
-		 * will need to compare the target offset against
-		 * uncompressed_file_offset or uncompressed_stream_offset,
-		 * and possibly decode and throw away some amount of data
-		 * before reaching the target offset.
-		 */
-		lzma_vli uncompressed_file_offset;
-
-		/**
-		 * \brief       Block number in this Stream
-		 *
-		 * The first Block is 1.
-		 */
-		lzma_vli number_in_stream;
-
-		/**
-		 * \brief       Compressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the Stream
-		 * containing this Block.
-		 */
-		lzma_vli compressed_stream_offset;
-
-		/**
-		 * \brief       Uncompressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the Stream
-		 * containing this Block.
-		 */
-		lzma_vli uncompressed_stream_offset;
-
-		/**
-		 * \brief       Uncompressed size of this Block
-		 *
-		 * You should pass this to the Block decoder if you will
-		 * decode this Block. It will allow the Block decoder to
-		 * validate the uncompressed size.
-		 */
-		lzma_vli uncompressed_size;
-
-		/**
-		 * \brief       Unpadded size of this Block
-		 *
-		 * You should pass this to the Block decoder if you will
-		 * decode this Block. It will allow the Block decoder to
-		 * validate the unpadded size.
-		 */
-		lzma_vli unpadded_size;
-
-		/**
-		 * \brief       Total compressed size
-		 *
-		 * This includes all headers and padding in this Block.
-		 * This is useful if you need to know how many bytes
-		 * the Block decoder will actually read.
-		 */
-		lzma_vli total_size;
-
-		lzma_vli reserved_vli1;
-		lzma_vli reserved_vli2;
-		lzma_vli reserved_vli3;
-		lzma_vli reserved_vli4;
-
-		const void *reserved_ptr1;
-		const void *reserved_ptr2;
-		const void *reserved_ptr3;
-		const void *reserved_ptr4;
-	} block;
-
-	/*
-	 * Internal data which is used to store the state of the iterator.
-	 * The exact format may vary between liblzma versions, so don't
-	 * touch these in any way.
-	 */
-	union {
-		const void *p;
-		size_t s;
-		lzma_vli v;
-	} internal[6];
-} lzma_index_iter;
-
-
-/**
- * \brief       Operation mode for lzma_index_iter_next()
- */
-typedef enum {
-	LZMA_INDEX_ITER_ANY             = 0,
-		/**<
-		 * \brief       Get the next Block or Stream
-		 *
-		 * Go to the next Block if the current Stream has at least
-		 * one Block left. Otherwise go to the next Stream even if
-		 * it has no Blocks. If the Stream has no Blocks
-		 * (lzma_index_iter.stream.block_count == 0),
-		 * lzma_index_iter.block will have undefined values.
-		 */
-
-	LZMA_INDEX_ITER_STREAM          = 1,
-		/**<
-		 * \brief       Get the next Stream
-		 *
-		 * Go to the next Stream even if the current Stream has
-		 * unread Blocks left. If the next Stream has at least one
-		 * Block, the iterator will point to the first Block.
-		 * If there are no Blocks, lzma_index_iter.block will have
-		 * undefined values.
-		 */
-
-	LZMA_INDEX_ITER_BLOCK           = 2,
-		/**<
-		 * \brief       Get the next Block
-		 *
-		 * Go to the next Block if the current Stream has at least
-		 * one Block left. If the current Stream has no Blocks left,
-		 * the next Stream with at least one Block is located and
-		 * the iterator will be made to point to the first Block of
-		 * that Stream.
-		 */
-
-	LZMA_INDEX_ITER_NONEMPTY_BLOCK  = 3
-		/**<
-		 * \brief       Get the next non-empty Block
-		 *
-		 * This is like LZMA_INDEX_ITER_BLOCK except that it will
-		 * skip Blocks whose Uncompressed Size is zero.
-		 */
-
-} lzma_index_iter_mode;
-
-
-/**
- * \brief       Calculate memory usage of lzma_index
- *
- * On disk, the size of the Index field depends on both the number of Records
- * stored and how big values the Records store (due to variable-length integer
- * encoding). When the Index is kept in lzma_index structure, the memory usage
- * depends only on the number of Records/Blocks stored in the Index(es), and
- * in case of concatenated lzma_indexes, the number of Streams. The size in
- * RAM is almost always significantly bigger than in the encoded form on disk.
- *
- * This function calculates an approximate amount of memory needed hold
- * the given number of Streams and Blocks in lzma_index structure. This
- * value may vary between CPU architectures and also between liblzma versions
- * if the internal implementation is modified.
- */
-extern LZMA_API(uint64_t) lzma_index_memusage(
-		lzma_vli streams, lzma_vli blocks) lzma_nothrow;
-
-
-/**
- * \brief       Calculate the memory usage of an existing lzma_index
- *
- * This is a shorthand for lzma_index_memusage(lzma_index_stream_count(i),
- * lzma_index_block_count(i)).
- */
-extern LZMA_API(uint64_t) lzma_index_memused(const lzma_index *i)
-		lzma_nothrow;
-
-
-/**
- * \brief       Allocate and initialize a new lzma_index structure
- *
- * \return      On success, a pointer to an empty initialized lzma_index is
- *              returned. If allocation fails, NULL is returned.
- */
-extern LZMA_API(lzma_index *) lzma_index_init(lzma_allocator *allocator)
-		lzma_nothrow;
-
-
-/**
- * \brief       Deallocate lzma_index
- *
- * If i is NULL, this does nothing.
- */
-extern LZMA_API(void) lzma_index_end(lzma_index *i, lzma_allocator *allocator)
-		lzma_nothrow;
-
-
-/**
- * \brief       Add a new Block to lzma_index
- *
- * \param       i                 Pointer to a lzma_index structure
- * \param       allocator         Pointer to lzma_allocator, or NULL to
- *                                use malloc()
- * \param       unpadded_size     Unpadded Size of a Block. This can be
- *                                calculated with lzma_block_unpadded_size()
- *                                after encoding or decoding the Block.
- * \param       uncompressed_size Uncompressed Size of a Block. This can be
- *                                taken directly from lzma_block structure
- *                                after encoding or decoding the Block.
- *
- * Appending a new Block does not invalidate iterators. For example,
- * if an iterator was pointing to the end of the lzma_index, after
- * lzma_index_append() it is possible to read the next Block with
- * an existing iterator.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR: Compressed or uncompressed size of the
- *                Stream or size of the Index field would grow too big.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_append(
-		lzma_index *i, lzma_allocator *allocator,
-		lzma_vli unpadded_size, lzma_vli uncompressed_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Set the Stream Flags
- *
- * Set the Stream Flags of the last (and typically the only) Stream
- * in lzma_index. This can be useful when reading information from the
- * lzma_index, because to decode Blocks, knowing the integrity check type
- * is needed.
- *
- * The given Stream Flags are copied into internal preallocated structure
- * in the lzma_index, thus the caller doesn't need to keep the *stream_flags
- * available after calling this function.
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR: Unsupported stream_flags->version.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_stream_flags(
-		lzma_index *i, const lzma_stream_flags *stream_flags)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Get the types of integrity Checks
- *
- * If lzma_index_stream_flags() is used to set the Stream Flags for
- * every Stream, lzma_index_checks() can be used to get a bitmask to
- * indicate which Check types have been used. It can be useful e.g. if
- * showing the Check types to the user.
- *
- * The bitmask is 1 << check_id, e.g. CRC32 is 1 << 1 and SHA-256 is 1 << 10.
- */
-extern LZMA_API(uint32_t) lzma_index_checks(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Set the amount of Stream Padding
- *
- * Set the amount of Stream Padding of the last (and typically the only)
- * Stream in the lzma_index. This is needed when planning to do random-access
- * reading within multiple concatenated Streams.
- *
- * By default, the amount of Stream Padding is assumed to be zero bytes.
- *
- * \return      - LZMA_OK
- *              - LZMA_DATA_ERROR: The file size would grow too big.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_stream_padding(
-		lzma_index *i, lzma_vli stream_padding)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Get the number of Streams
- */
-extern LZMA_API(lzma_vli) lzma_index_stream_count(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the number of Blocks
- *
- * This returns the total number of Blocks in lzma_index. To get number
- * of Blocks in individual Streams, use lzma_index_iter.
- */
-extern LZMA_API(lzma_vli) lzma_index_block_count(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the size of the Index field as bytes
- *
- * This is needed to verify the Backward Size field in the Stream Footer.
- */
-extern LZMA_API(lzma_vli) lzma_index_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the total size of the Stream
- *
- * If multiple lzma_indexes have been combined, this works as if the Blocks
- * were in a single Stream. This is useful if you are going to combine
- * Blocks from multiple Streams into a single new Stream.
- */
-extern LZMA_API(lzma_vli) lzma_index_stream_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the total size of the Blocks
- *
- * This doesn't include the Stream Header, Stream Footer, Stream Padding,
- * or Index fields.
- */
-extern LZMA_API(lzma_vli) lzma_index_total_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the total size of the file
- *
- * When no lzma_indexes have been combined with lzma_index_cat() and there is
- * no Stream Padding, this function is identical to lzma_index_stream_size().
- * If multiple lzma_indexes have been combined, this includes also the headers
- * of each separate Stream and the possible Stream Padding fields.
- */
-extern LZMA_API(lzma_vli) lzma_index_file_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the uncompressed size of the file
- */
-extern LZMA_API(lzma_vli) lzma_index_uncompressed_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize an iterator
- *
- * \param       iter    Pointer to a lzma_index_iter structure
- * \param       i       lzma_index to which the iterator will be associated
- *
- * This function associates the iterator with the given lzma_index, and calls
- * lzma_index_iter_rewind() on the iterator.
- *
- * This function doesn't allocate any memory, thus there is no
- * lzma_index_iter_end(). The iterator is valid as long as the
- * associated lzma_index is valid, that is, until lzma_index_end() or
- * using it as source in lzma_index_cat(). Specifically, lzma_index doesn't
- * become invalid if new Blocks are added to it with lzma_index_append() or
- * if it is used as the destination in lzma_index_cat().
- *
- * It is safe to make copies of an initialized lzma_index_iter, for example,
- * to easily restart reading at some particular position.
- */
-extern LZMA_API(void) lzma_index_iter_init(
-		lzma_index_iter *iter, const lzma_index *i) lzma_nothrow;
-
-
-/**
- * \brief       Rewind the iterator
- *
- * Rewind the iterator so that next call to lzma_index_iter_next() will
- * return the first Block or Stream.
- */
-extern LZMA_API(void) lzma_index_iter_rewind(lzma_index_iter *iter)
-		lzma_nothrow;
-
-
-/**
- * \brief       Get the next Block or Stream
- *
- * \param       iter    Iterator initialized with lzma_index_iter_init()
- * \param       mode    Specify what kind of information the caller wants
- *                      to get. See lzma_index_iter_mode for details.
- *
- * \return      If next Block or Stream matching the mode was found, *iter
- *              is updated and this function returns false. If no Block or
- *              Stream matching the mode is found, *iter is not modified
- *              and this function returns true. If mode is set to an unknown
- *              value, *iter is not modified and this function returns true.
- */
-extern LZMA_API(lzma_bool) lzma_index_iter_next(
-		lzma_index_iter *iter, lzma_index_iter_mode mode)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Locate a Block
- *
- * If it is possible to seek in the .xz file, it is possible to parse
- * the Index field(s) and use lzma_index_iter_locate() to do random-access
- * reading with granularity of Block size.
- *
- * \param       iter    Iterator that was earlier initialized with
- *                      lzma_index_iter_init().
- * \param       target  Uncompressed target offset which the caller would
- *                      like to locate from the Stream
- *
- * If the target is smaller than the uncompressed size of the Stream (can be
- * checked with lzma_index_uncompressed_size()):
- *  - Information about the Stream and Block containing the requested
- *    uncompressed offset is stored into *iter.
- *  - Internal state of the iterator is adjusted so that
- *    lzma_index_iter_next() can be used to read subsequent Blocks or Streams.
- *  - This function returns false.
- *
- * If target is greater than the uncompressed size of the Stream, *iter
- * is not modified, and this function returns true.
- */
-extern LZMA_API(lzma_bool) lzma_index_iter_locate(
-		lzma_index_iter *iter, lzma_vli target) lzma_nothrow;
-
-
-/**
- * \brief       Concatenate lzma_indexes
- *
- * Concatenating lzma_indexes is useful when doing random-access reading in
- * multi-Stream .xz file, or when combining multiple Streams into single
- * Stream.
- *
- * \param       dest      lzma_index after which src is appended
- * \param       src       lzma_index to be appended after dest. If this
- *                        function succeeds, the memory allocated for src
- *                        is freed or moved to be part of dest, and all
- *                        iterators pointing to src will become invalid.
- * \param       allocator Custom memory allocator; can be NULL to use
- *                        malloc() and free().
- *
- * \return      - LZMA_OK: lzma_indexes were concatenated successfully.
- *                src is now a dangling pointer.
- *              - LZMA_DATA_ERROR: *dest would grow too big.
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_cat(
-		lzma_index *dest, lzma_index *src, lzma_allocator *allocator)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Duplicate lzma_index
- *
- * \return      A copy of the lzma_index, or NULL if memory allocation failed.
- */
-extern LZMA_API(lzma_index *) lzma_index_dup(
-		const lzma_index *i, lzma_allocator *allocator)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .xz Index encoder
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       i           Pointer to lzma_index which should be encoded.
- *
- * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH.
- * It is enough to use only one of them (you can choose freely; use LZMA_RUN
- * to support liblzma versions older than 5.0.0).
- *
- * \return      - LZMA_OK: Initialization succeeded, continue with lzma_code().
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_encoder(
-		lzma_stream *strm, const lzma_index *i)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .xz Index decoder
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       i           The decoded Index will be made available via
- *                          this pointer. Initially this function will
- *                          set *i to NULL (the old value is ignored). If
- *                          decoding succeeds (lzma_code() returns
- *                          LZMA_STREAM_END), *i will be set to point
- *                          to a new lzma_index, which the application
- *                          has to later free with lzma_index_end().
- * \param       memlimit    How much memory the resulting lzma_index is
- *                          allowed to require.
- *
- * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH.
- * It is enough to use only one of them (you can choose freely; use LZMA_RUN
- * to support liblzma versions older than 5.0.0).
- *
- * \return      - LZMA_OK: Initialization succeeded, continue with lzma_code().
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_decoder(
-		lzma_stream *strm, lzma_index **i, uint64_t memlimit)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Index encoder
- *
- * \param       i         lzma_index to be encoded
- * \param       out       Beginning of the output buffer
- * \param       out_pos   The next byte will be written to out[*out_pos].
- *                        *out_pos is updated only if encoding succeeds.
- * \param       out_size  Size of the out buffer; the first byte into
- *                        which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Output buffer is too small. Use
- *                lzma_index_size() to find out how much output
- *                space is needed.
- *              - LZMA_PROG_ERROR
- *
- * \note        This function doesn't take allocator argument since all
- *              the internal data is allocated on stack.
- */
-extern LZMA_API(lzma_ret) lzma_index_buffer_encode(const lzma_index *i,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Single-call .xz Index decoder
- *
- * \param       i           If decoding succeeds, *i will point to a new
- *                          lzma_index, which the application has to
- *                          later free with lzma_index_end(). If an error
- *                          occurs, *i will be NULL. The old value of *i
- *                          is always ignored and thus doesn't need to be
- *                          initialized by the caller.
- * \param       memlimit    Pointer to how much memory the resulting
- *                          lzma_index is allowed to require. The value
- *                          pointed by this pointer is modified if and only
- *                          if LZMA_MEMLIMIT_ERROR is returned.
- * \param       allocator   Pointer to lzma_allocator, or NULL to use malloc()
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached.
- *                The minimum required memlimit value was stored to *memlimit.
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_buffer_decode(lzma_index **i,
-		uint64_t *memlimit, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/index_hash.h r-base-3.3.1/src/extra/xz/api/lzma/index_hash.h
--- r-base-3.2.3/src/extra/xz/api/lzma/index_hash.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/index_hash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/**
- * \file        lzma/index_hash.h
- * \brief       Validate Index by using a hash function
- *
- * Hashing makes it possible to use constant amount of memory to validate
- * Index of arbitrary size.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-/**
- * \brief       Opaque data type to hold the Index hash
- */
-typedef struct lzma_index_hash_s lzma_index_hash;
-
-
-/**
- * \brief       Allocate and initialize a new lzma_index_hash structure
- *
- * If index_hash is NULL, a new lzma_index_hash structure is allocated,
- * initialized, and a pointer to it returned. If allocation fails, NULL
- * is returned.
- *
- * If index_hash is non-NULL, it is reinitialized and the same pointer
- * returned. In this case, return value cannot be NULL or a different
- * pointer than the index_hash that was given as an argument.
- */
-extern LZMA_API(lzma_index_hash *) lzma_index_hash_init(
-		lzma_index_hash *index_hash, lzma_allocator *allocator)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Deallocate lzma_index_hash structure
- */
-extern LZMA_API(void) lzma_index_hash_end(
-		lzma_index_hash *index_hash, lzma_allocator *allocator)
-		lzma_nothrow;
-
-
-/**
- * \brief       Add a new Record to an Index hash
- *
- * \param       index             Pointer to a lzma_index_hash structure
- * \param       unpadded_size     Unpadded Size of a Block
- * \param       uncompressed_size Uncompressed Size of a Block
- *
- * \return      - LZMA_OK
- *              - LZMA_DATA_ERROR: Compressed or uncompressed size of the
- *                Stream or size of the Index field would grow too big.
- *              - LZMA_PROG_ERROR: Invalid arguments or this function is being
- *                used when lzma_index_hash_decode() has already been used.
- */
-extern LZMA_API(lzma_ret) lzma_index_hash_append(lzma_index_hash *index_hash,
-		lzma_vli unpadded_size, lzma_vli uncompressed_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode and validate the Index field
- *
- * After telling the sizes of all Blocks with lzma_index_hash_append(),
- * the actual Index field is decoded with this function. Specifically,
- * once decoding of the Index field has been started, no more Records
- * can be added using lzma_index_hash_append().
- *
- * This function doesn't use lzma_stream structure to pass the input data.
- * Instead, the input buffer is specified using three arguments. This is
- * because it matches better the internal APIs of liblzma.
- *
- * \param       index_hash      Pointer to a lzma_index_hash structure
- * \param       in              Pointer to the beginning of the input buffer
- * \param       in_pos          in[*in_pos] is the next byte to process
- * \param       in_size         in[in_size] is the first byte not to process
- *
- * \return      - LZMA_OK: So far good, but more input is needed.
- *              - LZMA_STREAM_END: Index decoded successfully and it matches
- *                the Records given with lzma_index_hash_append().
- *              - LZMA_DATA_ERROR: Index is corrupt or doesn't match the
- *                information given with lzma_index_hash_append().
- *              - LZMA_BUF_ERROR: Cannot progress because *in_pos >= in_size.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_hash_decode(lzma_index_hash *index_hash,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Get the size of the Index field as bytes
- *
- * This is needed to verify the Backward Size field in the Stream Footer.
- */
-extern LZMA_API(lzma_vli) lzma_index_hash_size(
-		const lzma_index_hash *index_hash)
-		lzma_nothrow lzma_attr_pure;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/lzma.h r-base-3.3.1/src/extra/xz/api/lzma/lzma.h
--- r-base-3.2.3/src/extra/xz/api/lzma/lzma.h	2011-03-15 23:02:23.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/lzma.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,420 +0,0 @@
-/**
- * \file        lzma/lzma.h
- * \brief       LZMA1 and LZMA2 filters
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       LZMA1 Filter ID
- *
- * LZMA1 is the very same thing as what was called just LZMA in LZMA Utils,
- * 7-Zip, and LZMA SDK. It's called LZMA1 here to prevent developers from
- * accidentally using LZMA when they actually want LZMA2.
- *
- * LZMA1 shouldn't be used for new applications unless you _really_ know
- * what you are doing. LZMA2 is almost always a better choice.
- */
-#define LZMA_FILTER_LZMA1       LZMA_VLI_C(0x4000000000000001)
-
-/**
- * \brief       LZMA2 Filter ID
- *
- * Usually you want this instead of LZMA1. Compared to LZMA1, LZMA2 adds
- * support for LZMA_SYNC_FLUSH, uncompressed chunks (smaller expansion
- * when trying to compress uncompressible data), possibility to change
- * lc/lp/pb in the middle of encoding, and some other internal improvements.
- */
-#define LZMA_FILTER_LZMA2       LZMA_VLI_C(0x21)
-
-
-/**
- * \brief       Match finders
- *
- * Match finder has major effect on both speed and compression ratio.
- * Usually hash chains are faster than binary trees.
- *
- * If you will use LZMA_SYNC_FLUSH often, the hash chains may be a better
- * choice, because binary trees get much higher compression ratio penalty
- * with LZMA_SYNC_FLUSH.
- *
- * The memory usage formulas are only rough estimates, which are closest to
- * reality when dict_size is a power of two. The formulas are  more complex
- * in reality, and can also change a little between liblzma versions. Use
- * lzma_raw_encoder_memusage() to get more accurate estimate of memory usage.
- */
-typedef enum {
-	LZMA_MF_HC3     = 0x03,
-		/**<
-		 * \brief       Hash Chain with 2- and 3-byte hashing
-		 *
-		 * Minimum nice_len: 3
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 16 MiB: dict_size * 7.5
-		 *  - dict_size > 16 MiB: dict_size * 5.5 + 64 MiB
-		 */
-
-	LZMA_MF_HC4     = 0x04,
-		/**<
-		 * \brief       Hash Chain with 2-, 3-, and 4-byte hashing
-		 *
-		 * Minimum nice_len: 4
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 32 MiB: dict_size * 7.5
-		 *  - dict_size > 32 MiB: dict_size * 6.5
-		 */
-
-	LZMA_MF_BT2     = 0x12,
-		/**<
-		 * \brief       Binary Tree with 2-byte hashing
-		 *
-		 * Minimum nice_len: 2
-		 *
-		 * Memory usage: dict_size * 9.5
-		 */
-
-	LZMA_MF_BT3     = 0x13,
-		/**<
-		 * \brief       Binary Tree with 2- and 3-byte hashing
-		 *
-		 * Minimum nice_len: 3
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 16 MiB: dict_size * 11.5
-		 *  - dict_size > 16 MiB: dict_size * 9.5 + 64 MiB
-		 */
-
-	LZMA_MF_BT4     = 0x14
-		/**<
-		 * \brief       Binary Tree with 2-, 3-, and 4-byte hashing
-		 *
-		 * Minimum nice_len: 4
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 32 MiB: dict_size * 11.5
-		 *  - dict_size > 32 MiB: dict_size * 10.5
-		 */
-} lzma_match_finder;
-
-
-/**
- * \brief       Test if given match finder is supported
- *
- * Return true if the given match finder is supported by this liblzma build.
- * Otherwise false is returned. It is safe to call this with a value that
- * isn't listed in lzma_match_finder enumeration; the return value will be
- * false.
- *
- * There is no way to list which match finders are available in this
- * particular liblzma version and build. It would be useless, because
- * a new match finder, which the application developer wasn't aware,
- * could require giving additional options to the encoder that the older
- * match finders don't need.
- */
-extern LZMA_API(lzma_bool) lzma_mf_is_supported(lzma_match_finder match_finder)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Compression modes
- *
- * This selects the function used to analyze the data produced by the match
- * finder.
- */
-typedef enum {
-	LZMA_MODE_FAST = 1,
-		/**<
-		 * \brief       Fast compression
-		 *
-		 * Fast mode is usually at its best when combined with
-		 * a hash chain match finder.
-		 */
-
-	LZMA_MODE_NORMAL = 2
-		/**<
-		 * \brief       Normal compression
-		 *
-		 * This is usually notably slower than fast mode. Use this
-		 * together with binary tree match finders to expose the
-		 * full potential of the LZMA1 or LZMA2 encoder.
-		 */
-} lzma_mode;
-
-
-/**
- * \brief       Test if given compression mode is supported
- *
- * Return true if the given compression mode is supported by this liblzma
- * build. Otherwise false is returned. It is safe to call this with a value
- * that isn't listed in lzma_mode enumeration; the return value will be false.
- *
- * There is no way to list which modes are available in this particular
- * liblzma version and build. It would be useless, because a new compression
- * mode, which the application developer wasn't aware, could require giving
- * additional options to the encoder that the older modes don't need.
- */
-extern LZMA_API(lzma_bool) lzma_mode_is_supported(lzma_mode mode)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Options specific to the LZMA1 and LZMA2 filters
- *
- * Since LZMA1 and LZMA2 share most of the code, it's simplest to share
- * the options structure too. For encoding, all but the reserved variables
- * need to be initialized unless specifically mentioned otherwise.
- * lzma_lzma_preset() can be used to get a good starting point.
- *
- * For raw decoding, both LZMA1 and LZMA2 need dict_size, preset_dict, and
- * preset_dict_size (if preset_dict != NULL). LZMA1 needs also lc, lp, and pb.
- */
-typedef struct {
-	/**
-	 * \brief       Dictionary size in bytes
-	 *
-	 * Dictionary size indicates how many bytes of the recently processed
-	 * uncompressed data is kept in memory. One method to reduce size of
-	 * the uncompressed data is to store distance-length pairs, which
-	 * indicate what data to repeat from the dictionary buffer. Thus,
-	 * the bigger the dictionary, the better the compression ratio
-	 * usually is.
-	 *
-	 * Maximum size of the dictionary depends on multiple things:
-	 *  - Memory usage limit
-	 *  - Available address space (not a problem on 64-bit systems)
-	 *  - Selected match finder (encoder only)
-	 *
-	 * Currently the maximum dictionary size for encoding is 1.5 GiB
-	 * (i.e. (UINT32_C(1) << 30) + (UINT32_C(1) << 29)) even on 64-bit
-	 * systems for certain match finder implementation reasons. In the
-	 * future, there may be match finders that support bigger
-	 * dictionaries.
-	 *
-	 * Decoder already supports dictionaries up to 4 GiB - 1 B (i.e.
-	 * UINT32_MAX), so increasing the maximum dictionary size of the
-	 * encoder won't cause problems for old decoders.
-	 *
-	 * Because extremely small dictionaries sizes would have unneeded
-	 * overhead in the decoder, the minimum dictionary size is 4096 bytes.
-	 *
-	 * \note        When decoding, too big dictionary does no other harm
-	 *              than wasting memory.
-	 */
-	uint32_t dict_size;
-#	define LZMA_DICT_SIZE_MIN       UINT32_C(4096)
-#	define LZMA_DICT_SIZE_DEFAULT   (UINT32_C(1) << 23)
-
-	/**
-	 * \brief       Pointer to an initial dictionary
-	 *
-	 * It is possible to initialize the LZ77 history window using
-	 * a preset dictionary. It is useful when compressing many
-	 * similar, relatively small chunks of data independently from
-	 * each other. The preset dictionary should contain typical
-	 * strings that occur in the files being compressed. The most
-	 * probable strings should be near the end of the preset dictionary.
-	 *
-	 * This feature should be used only in special situations. For
-	 * now, it works correctly only with raw encoding and decoding.
-	 * Currently none of the container formats supported by
-	 * liblzma allow preset dictionary when decoding, thus if
-	 * you create a .xz or .lzma file with preset dictionary, it
-	 * cannot be decoded with the regular decoder functions. In the
-	 * future, the .xz format will likely get support for preset
-	 * dictionary though.
-	 */
-	const uint8_t *preset_dict;
-
-	/**
-	 * \brief       Size of the preset dictionary
-	 *
-	 * Specifies the size of the preset dictionary. If the size is
-	 * bigger than dict_size, only the last dict_size bytes are
-	 * processed.
-	 *
-	 * This variable is read only when preset_dict is not NULL.
-	 * If preset_dict is not NULL but preset_dict_size is zero,
-	 * no preset dictionary is used (identical to only setting
-	 * preset_dict to NULL).
-	 */
-	uint32_t preset_dict_size;
-
-	/**
-	 * \brief       Number of literal context bits
-	 *
-	 * How many of the highest bits of the previous uncompressed
-	 * eight-bit byte (also known as `literal') are taken into
-	 * account when predicting the bits of the next literal.
-	 *
-	 * E.g. in typical English text, an upper-case letter is
-	 * often followed by a lower-case letter, and a lower-case
-	 * letter is usually followed by another lower-case letter.
-	 * In the US-ASCII character set, the highest three bits are 010
-	 * for upper-case letters and 011 for lower-case letters.
-	 * When lc is at least 3, the literal coding can take advantage of
-	 * this property in the uncompressed data.
-	 *
-	 * There is a limit that applies to literal context bits and literal
-	 * position bits together: lc + lp <= 4. Without this limit the
-	 * decoding could become very slow, which could have security related
-	 * results in some cases like email servers doing virus scanning.
-	 * This limit also simplifies the internal implementation in liblzma.
-	 *
-	 * There may be LZMA1 streams that have lc + lp > 4 (maximum possible
-	 * lc would be 8). It is not possible to decode such streams with
-	 * liblzma.
-	 */
-	uint32_t lc;
-#	define LZMA_LCLP_MIN    0
-#	define LZMA_LCLP_MAX    4
-#	define LZMA_LC_DEFAULT  3
-
-	/**
-	 * \brief       Number of literal position bits
-	 *
-	 * lp affects what kind of alignment in the uncompressed data is
-	 * assumed when encoding literals. A literal is a single 8-bit byte.
-	 * See pb below for more information about alignment.
-	 */
-	uint32_t lp;
-#	define LZMA_LP_DEFAULT  0
-
-	/**
-	 * \brief       Number of position bits
-	 *
-	 * pb affects what kind of alignment in the uncompressed data is
-	 * assumed in general. The default means four-byte alignment
-	 * (2^ pb =2^2=4), which is often a good choice when there's
-	 * no better guess.
-	 *
-	 * When the aligment is known, setting pb accordingly may reduce
-	 * the file size a little. E.g. with text files having one-byte
-	 * alignment (US-ASCII, ISO-8859-*, UTF-8), setting pb=0 can
-	 * improve compression slightly. For UTF-16 text, pb=1 is a good
-	 * choice. If the alignment is an odd number like 3 bytes, pb=0
-	 * might be the best choice.
-	 *
-	 * Even though the assumed alignment can be adjusted with pb and
-	 * lp, LZMA1 and LZMA2 still slightly favor 16-byte alignment.
-	 * It might be worth taking into account when designing file formats
-	 * that are likely to be often compressed with LZMA1 or LZMA2.
-	 */
-	uint32_t pb;
-#	define LZMA_PB_MIN      0
-#	define LZMA_PB_MAX      4
-#	define LZMA_PB_DEFAULT  2
-
-	/** Compression mode */
-	lzma_mode mode;
-
-	/**
-	 * \brief       Nice length of a match
-	 *
-	 * This determines how many bytes the encoder compares from the match
-	 * candidates when looking for the best match. Once a match of at
-	 * least nice_len bytes long is found, the encoder stops looking for
-	 * better candidates and encodes the match. (Naturally, if the found
-	 * match is actually longer than nice_len, the actual length is
-	 * encoded; it's not truncated to nice_len.)
-	 *
-	 * Bigger values usually increase the compression ratio and
-	 * compression time. For most files, 32 to 128 is a good value,
-	 * which gives very good compression ratio at good speed.
-	 *
-	 * The exact minimum value depends on the match finder. The maximum
-	 * is 273, which is the maximum length of a match that LZMA1 and
-	 * LZMA2 can encode.
-	 */
-	uint32_t nice_len;
-
-	/** Match finder ID */
-	lzma_match_finder mf;
-
-	/**
-	 * \brief       Maximum search depth in the match finder
-	 *
-	 * For every input byte, match finder searches through the hash chain
-	 * or binary tree in a loop, each iteration going one step deeper in
-	 * the chain or tree. The searching stops if
-	 *  - a match of at least nice_len bytes long is found;
-	 *  - all match candidates from the hash chain or binary tree have
-	 *    been checked; or
-	 *  - maximum search depth is reached.
-	 *
-	 * Maximum search depth is needed to prevent the match finder from
-	 * wasting too much time in case there are lots of short match
-	 * candidates. On the other hand, stopping the search before all
-	 * candidates have been checked can reduce compression ratio.
-	 *
-	 * Setting depth to zero tells liblzma to use an automatic default
-	 * value, that depends on the selected match finder and nice_len.
-	 * The default is in the range [4, 200] or so (it may vary between
-	 * liblzma versions).
-	 *
-	 * Using a bigger depth value than the default can increase
-	 * compression ratio in some cases. There is no strict maximum value,
-	 * but high values (thousands or millions) should be used with care:
-	 * the encoder could remain fast enough with typical input, but
-	 * malicious input could cause the match finder to slow down
-	 * dramatically, possibly creating a denial of service attack.
-	 */
-	uint32_t depth;
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the names
-	 * of these variables may change. These are and will never be used
-	 * with the currently supported options, so it is safe to leave these
-	 * uninitialized.
-	 */
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-	uint32_t reserved_int3;
-	uint32_t reserved_int4;
-	uint32_t reserved_int5;
-	uint32_t reserved_int6;
-	uint32_t reserved_int7;
-	uint32_t reserved_int8;
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-	lzma_reserved_enum reserved_enum3;
-	lzma_reserved_enum reserved_enum4;
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-
-} lzma_options_lzma;
-
-
-/**
- * \brief       Set a compression preset to lzma_options_lzma structure
- *
- * 0 is the fastest and 9 is the slowest. These match the switches -0 .. -9
- * of the xz command line tool. In addition, it is possible to bitwise-or
- * flags to the preset. Currently only LZMA_PRESET_EXTREME is supported.
- * The flags are defined in container.h, because the flags are used also
- * with lzma_easy_encoder().
- *
- * The preset values are subject to changes between liblzma versions.
- *
- * This function is available only if LZMA1 or LZMA2 encoder has been enabled
- * when building liblzma.
- *
- * \return      On success, false is returned. If the preset is not
- *              supported, true is returned.
- */
-extern LZMA_API(lzma_bool) lzma_lzma_preset(
-		lzma_options_lzma *options, uint32_t preset) lzma_nothrow;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/stream_flags.h r-base-3.3.1/src/extra/xz/api/lzma/stream_flags.h
--- r-base-3.2.3/src/extra/xz/api/lzma/stream_flags.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/stream_flags.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,223 +0,0 @@
-/**
- * \file        lzma/stream_flags.h
- * \brief       .xz Stream Header and Stream Footer encoder and decoder
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Size of Stream Header and Stream Footer
- *
- * Stream Header and Stream Footer have the same size and they are not
- * going to change even if a newer version of the .xz file format is
- * developed in future.
- */
-#define LZMA_STREAM_HEADER_SIZE 12
-
-
-/**
- * \brief       Options for encoding/decoding Stream Header and Stream Footer
- */
-typedef struct {
-	/**
-	 * \brief       Stream Flags format version
-	 *
-	 * To prevent API and ABI breakages if new features are needed in
-	 * Stream Header or Stream Footer, a version number is used to
-	 * indicate which fields in this structure are in use. For now,
-	 * version must always be zero. With non-zero version, the
-	 * lzma_stream_header_encode() and lzma_stream_footer_encode()
-	 * will return LZMA_OPTIONS_ERROR.
-	 *
-	 * lzma_stream_header_decode() and lzma_stream_footer_decode()
-	 * will always set this to the lowest value that supports all the
-	 * features indicated by the Stream Flags field. The application
-	 * must check that the version number set by the decoding functions
-	 * is supported by the application. Otherwise it is possible that
-	 * the application will decode the Stream incorrectly.
-	 */
-	uint32_t version;
-
-	/**
-	 * \brief       Backward Size
-	 *
-	 * Backward Size must be a multiple of four bytes. In this Stream
-	 * format version, Backward Size is the size of the Index field.
-	 *
-	 * Backward Size isn't actually part of the Stream Flags field, but
-	 * it is convenient to include in this structure anyway. Backward
-	 * Size is present only in the Stream Footer. There is no need to
-	 * initialize backward_size when encoding Stream Header.
-	 *
-	 * lzma_stream_header_decode() always sets backward_size to
-	 * LZMA_VLI_UNKNOWN so that it is convenient to use
-	 * lzma_stream_flags_compare() when both Stream Header and Stream
-	 * Footer have been decoded.
-	 */
-	lzma_vli backward_size;
-#	define LZMA_BACKWARD_SIZE_MIN 4
-#	define LZMA_BACKWARD_SIZE_MAX (LZMA_VLI_C(1) << 34)
-
-	/**
-	 * \brief       Check ID
-	 *
-	 * This indicates the type of the integrity check calculated from
-	 * uncompressed data.
-	 */
-	lzma_check check;
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the
-	 * names of these variables may change.
-	 *
-	 * (We will never be able to use all of these since Stream Flags
-	 * is just two bytes plus Backward Size of four bytes. But it's
-	 * nice to have the proper types when they are needed.)
-	 */
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-	lzma_reserved_enum reserved_enum3;
-	lzma_reserved_enum reserved_enum4;
-	lzma_bool reserved_bool1;
-	lzma_bool reserved_bool2;
-	lzma_bool reserved_bool3;
-	lzma_bool reserved_bool4;
-	lzma_bool reserved_bool5;
-	lzma_bool reserved_bool6;
-	lzma_bool reserved_bool7;
-	lzma_bool reserved_bool8;
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-
-} lzma_stream_flags;
-
-
-/**
- * \brief       Encode Stream Header
- *
- * \param       options     Stream Header options to be encoded.
- *                          options->backward_size is ignored and doesn't
- *                          need to be initialized.
- * \param       out         Beginning of the output buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_OPTIONS_ERROR: options->version is not supported by
- *                this liblzma version.
- *              - LZMA_PROG_ERROR: Invalid options.
- */
-extern LZMA_API(lzma_ret) lzma_stream_header_encode(
-		const lzma_stream_flags *options, uint8_t *out)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Encode Stream Footer
- *
- * \param       options     Stream Footer options to be encoded.
- * \param       out         Beginning of the output buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_OPTIONS_ERROR: options->version is not supported by
- *                this liblzma version.
- *              - LZMA_PROG_ERROR: Invalid options.
- */
-extern LZMA_API(lzma_ret) lzma_stream_footer_encode(
-		const lzma_stream_flags *options, uint8_t *out)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Stream Header
- *
- * \param       options     Target for the decoded Stream Header options.
- * \param       in          Beginning of the input buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * options->backward_size is always set to LZMA_VLI_UNKNOWN. This is to
- * help comparing Stream Flags from Stream Header and Stream Footer with
- * lzma_stream_flags_compare().
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_FORMAT_ERROR: Magic bytes don't match, thus the given
- *                buffer cannot be Stream Header.
- *              - LZMA_DATA_ERROR: CRC32 doesn't match, thus the header
- *                is corrupt.
- *              - LZMA_OPTIONS_ERROR: Unsupported options are present
- *                in the header.
- *
- * \note        When decoding .xz files that contain multiple Streams, it may
- *              make sense to print "file format not recognized" only if
- *              decoding of the Stream Header of the _first_ Stream gives
- *              LZMA_FORMAT_ERROR. If non-first Stream Header gives
- *              LZMA_FORMAT_ERROR, the message used for LZMA_DATA_ERROR is
- *              probably more appropriate.
- *
- *              For example, Stream decoder in liblzma uses LZMA_DATA_ERROR if
- *              LZMA_FORMAT_ERROR is returned by lzma_stream_header_decode()
- *              when decoding non-first Stream.
- */
-extern LZMA_API(lzma_ret) lzma_stream_header_decode(
-		lzma_stream_flags *options, const uint8_t *in)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Stream Footer
- *
- * \param       options     Target for the decoded Stream Header options.
- * \param       in          Beginning of the input buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_FORMAT_ERROR: Magic bytes don't match, thus the given
- *                buffer cannot be Stream Footer.
- *              - LZMA_DATA_ERROR: CRC32 doesn't match, thus the Stream Footer
- *                is corrupt.
- *              - LZMA_OPTIONS_ERROR: Unsupported options are present
- *                in Stream Footer.
- *
- * \note        If Stream Header was already decoded successfully, but
- *              decoding Stream Footer returns LZMA_FORMAT_ERROR, the
- *              application should probably report some other error message
- *              than "file format not recognized", since the file more likely
- *              is corrupt (possibly truncated). Stream decoder in liblzma
- *              uses LZMA_DATA_ERROR in this situation.
- */
-extern LZMA_API(lzma_ret) lzma_stream_footer_decode(
-		lzma_stream_flags *options, const uint8_t *in)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Compare two lzma_stream_flags structures
- *
- * backward_size values are compared only if both are not
- * LZMA_VLI_UNKNOWN.
- *
- * \return      - LZMA_OK: Both are equal. If either had backward_size set
- *                to LZMA_VLI_UNKNOWN, backward_size values were not
- *                compared or validated.
- *              - LZMA_DATA_ERROR: The structures differ.
- *              - LZMA_OPTIONS_ERROR: version in either structure is greater
- *                than the maximum supported version (currently zero).
- *              - LZMA_PROG_ERROR: Invalid value, e.g. invalid check or
- *                backward_size.
- */
-extern LZMA_API(lzma_ret) lzma_stream_flags_compare(
-		const lzma_stream_flags *a, const lzma_stream_flags *b)
-		lzma_nothrow lzma_attr_pure;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/version.h r-base-3.3.1/src/extra/xz/api/lzma/version.h
--- r-base-3.2.3/src/extra/xz/api/lzma/version.h	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/**
- * \file        lzma/version.h
- * \brief       Version number
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/*
- * Version number split into components
- */
-#define LZMA_VERSION_MAJOR 5
-#define LZMA_VERSION_MINOR 0
-#define LZMA_VERSION_PATCH 7
-#define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
-
-#ifndef LZMA_VERSION_COMMIT
-#	define LZMA_VERSION_COMMIT ""
-#endif
-
-
-/*
- * Map symbolic stability levels to integers.
- */
-#define LZMA_VERSION_STABILITY_ALPHA 0
-#define LZMA_VERSION_STABILITY_BETA 1
-#define LZMA_VERSION_STABILITY_STABLE 2
-
-
-/**
- * \brief       Compile-time version number
- *
- * The version number is of format xyyyzzzs where
- *  - x = major
- *  - yyy = minor
- *  - zzz = revision
- *  - s indicates stability: 0 = alpha, 1 = beta, 2 = stable
- *
- * The same xyyyzzz triplet is never reused with different stability levels.
- * For example, if 5.1.0alpha has been released, there will never be 5.1.0beta
- * or 5.1.0 stable.
- *
- * \note        The version number of liblzma has nothing to with
- *              the version number of Igor Pavlov's LZMA SDK.
- */
-#define LZMA_VERSION (LZMA_VERSION_MAJOR * UINT32_C(10000000) \
-		+ LZMA_VERSION_MINOR * UINT32_C(10000) \
-		+ LZMA_VERSION_PATCH * UINT32_C(10) \
-		+ LZMA_VERSION_STABILITY)
-
-
-/*
- * Macros to construct the compile-time version string
- */
-#if LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_ALPHA
-#	define LZMA_VERSION_STABILITY_STRING "alpha"
-#elif LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_BETA
-#	define LZMA_VERSION_STABILITY_STRING "beta"
-#elif LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_STABLE
-#	define LZMA_VERSION_STABILITY_STRING ""
-#else
-#	error Incorrect LZMA_VERSION_STABILITY
-#endif
-
-#define LZMA_VERSION_STRING_C_(major, minor, patch, stability, commit) \
-		#major "." #minor "." #patch stability commit
-
-#define LZMA_VERSION_STRING_C(major, minor, patch, stability, commit) \
-		LZMA_VERSION_STRING_C_(major, minor, patch, stability, commit)
-
-
-/**
- * \brief       Compile-time version as a string
- *
- * This can be for example "4.999.5alpha", "4.999.8beta", or "5.0.0" (stable
- * versions don't have any "stable" suffix). In future, a snapshot built
- * from source code repository may include an additional suffix, for example
- * "4.999.8beta-21-g1d92". The commit ID won't be available in numeric form
- * in LZMA_VERSION macro.
- */
-#define LZMA_VERSION_STRING LZMA_VERSION_STRING_C( \
-		LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, \
-		LZMA_VERSION_PATCH, LZMA_VERSION_STABILITY_STRING, \
-		LZMA_VERSION_COMMIT)
-
-
-/* #ifndef is needed for use with windres (MinGW or Cygwin). */
-#ifndef LZMA_H_INTERNAL_RC
-
-/**
- * \brief       Run-time version number as an integer
- *
- * Return the value of LZMA_VERSION macro at the compile time of liblzma.
- * This allows the application to compare if it was built against the same,
- * older, or newer version of liblzma that is currently running.
- */
-extern LZMA_API(uint32_t) lzma_version_number(void)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Run-time version as a string
- *
- * This function may be useful if you want to display which version of
- * liblzma your application is currently using.
- */
-extern LZMA_API(const char *) lzma_version_string(void)
-		lzma_nothrow lzma_attr_const;
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma/vli.h r-base-3.3.1/src/extra/xz/api/lzma/vli.h
--- r-base-3.2.3/src/extra/xz/api/lzma/vli.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma/vli.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,166 +0,0 @@
-/**
- * \file        lzma/vli.h
- * \brief       Variable-length integer handling
- *
- * In the .xz format, most integers are encoded in a variable-length
- * representation, which is sometimes called little endian base-128 encoding.
- * This saves space when smaller values are more likely than bigger values.
- *
- * The encoding scheme encodes seven bits to every byte, using minimum
- * number of bytes required to represent the given value. Encodings that use
- * non-minimum number of bytes are invalid, thus every integer has exactly
- * one encoded representation. The maximum number of bits in a VLI is 63,
- * thus the vli argument must be less than or equal to UINT64_MAX / 2. You
- * should use LZMA_VLI_MAX for clarity.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Maximum supported value of a variable-length integer
- */
-#define LZMA_VLI_MAX (UINT64_MAX / 2)
-
-/**
- * \brief       VLI value to denote that the value is unknown
- */
-#define LZMA_VLI_UNKNOWN UINT64_MAX
-
-/**
- * \brief       Maximum supported encoded length of variable length integers
- */
-#define LZMA_VLI_BYTES_MAX 9
-
-/**
- * \brief       VLI constant suffix
- */
-#define LZMA_VLI_C(n) UINT64_C(n)
-
-
-/**
- * \brief       Variable-length integer type
- *
- * Valid VLI values are in the range [0, LZMA_VLI_MAX]. Unknown value is
- * indicated with LZMA_VLI_UNKNOWN, which is the maximum value of the
- * underlaying integer type.
- *
- * lzma_vli will be uint64_t for the foreseeable future. If a bigger size
- * is needed in the future, it is guaranteed that 2 * LZMA_VLI_MAX will
- * not overflow lzma_vli. This simplifies integer overflow detection.
- */
-typedef uint64_t lzma_vli;
-
-
-/**
- * \brief       Validate a variable-length integer
- *
- * This is useful to test that application has given acceptable values
- * for example in the uncompressed_size and compressed_size variables.
- *
- * \return      True if the integer is representable as VLI or if it
- *              indicates unknown value.
- */
-#define lzma_vli_is_valid(vli) \
-	((vli) <= LZMA_VLI_MAX || (vli) == LZMA_VLI_UNKNOWN)
-
-
-/**
- * \brief       Encode a variable-length integer
- *
- * This function has two modes: single-call and multi-call. Single-call mode
- * encodes the whole integer at once; it is an error if the output buffer is
- * too small. Multi-call mode saves the position in *vli_pos, and thus it is
- * possible to continue encoding if the buffer becomes full before the whole
- * integer has been encoded.
- *
- * \param       vli       Integer to be encoded
- * \param       vli_pos   How many VLI-encoded bytes have already been written
- *                        out. When starting to encode a new integer in
- *                        multi-call mode, *vli_pos must be set to zero.
- *                        To use single-call encoding, set vli_pos to NULL.
- * \param       out       Beginning of the output buffer
- * \param       out_pos   The next byte will be written to out[*out_pos].
- * \param       out_size  Size of the out buffer; the first byte into
- *                        which no data is written to is out[out_size].
- *
- * \return      Slightly different return values are used in multi-call and
- *              single-call modes.
- *
- *              Single-call (vli_pos == NULL):
- *              - LZMA_OK: Integer successfully encoded.
- *              - LZMA_PROG_ERROR: Arguments are not sane. This can be due
- *                to too little output space; single-call mode doesn't use
- *                LZMA_BUF_ERROR, since the application should have checked
- *                the encoded size with lzma_vli_size().
- *
- *              Multi-call (vli_pos != NULL):
- *              - LZMA_OK: So far all OK, but the integer is not
- *                completely written out yet.
- *              - LZMA_STREAM_END: Integer successfully encoded.
- *              - LZMA_BUF_ERROR: No output space was provided.
- *              - LZMA_PROG_ERROR: Arguments are not sane.
- */
-extern LZMA_API(lzma_ret) lzma_vli_encode(lzma_vli vli, size_t *vli_pos,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Decode a variable-length integer
- *
- * Like lzma_vli_encode(), this function has single-call and multi-call modes.
- *
- * \param       vli       Pointer to decoded integer. The decoder will
- *                        initialize it to zero when *vli_pos == 0, so
- *                        application isn't required to initialize *vli.
- * \param       vli_pos   How many bytes have already been decoded. When
- *                        starting to decode a new integer in multi-call
- *                        mode, *vli_pos must be initialized to zero. To
- *                        use single-call decoding, set vli_pos to NULL.
- * \param       in        Beginning of the input buffer
- * \param       in_pos    The next byte will be read from in[*in_pos].
- * \param       in_size   Size of the input buffer; the first byte that
- *                        won't be read is in[in_size].
- *
- * \return      Slightly different return values are used in multi-call and
- *              single-call modes.
- *
- *              Single-call (vli_pos == NULL):
- *              - LZMA_OK: Integer successfully decoded.
- *              - LZMA_DATA_ERROR: Integer is corrupt. This includes hitting
- *                the end of the input buffer before the whole integer was
- *                decoded; providing no input at all will use LZMA_DATA_ERROR.
- *              - LZMA_PROG_ERROR: Arguments are not sane.
- *
- *              Multi-call (vli_pos != NULL):
- *              - LZMA_OK: So far all OK, but the integer is not
- *                completely decoded yet.
- *              - LZMA_STREAM_END: Integer successfully decoded.
- *              - LZMA_DATA_ERROR: Integer is corrupt.
- *              - LZMA_BUF_ERROR: No input was provided.
- *              - LZMA_PROG_ERROR: Arguments are not sane.
- */
-extern LZMA_API(lzma_ret) lzma_vli_decode(lzma_vli *vli, size_t *vli_pos,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow;
-
-
-/**
- * \brief       Get the number of bytes required to encode a VLI
- *
- * \return      Number of bytes on success (1-9). If vli isn't valid,
- *              zero is returned.
- */
-extern LZMA_API(uint32_t) lzma_vli_size(lzma_vli vli)
-		lzma_nothrow lzma_attr_pure;
diff -Nru r-base-3.2.3/src/extra/xz/api/lzma.h r-base-3.3.1/src/extra/xz/api/lzma.h
--- r-base-3.2.3/src/extra/xz/api/lzma.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/api/lzma.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,313 +0,0 @@
-/**
- * \file        api/lzma.h
- * \brief       The public API of liblzma data compression library
- *
- * liblzma is a public domain general-purpose data compression library with
- * a zlib-like API. The native file format is .xz, but also the old .lzma
- * format and raw (no headers) streams are supported. Multiple compression
- * algorithms (filters) are supported. Currently LZMA2 is the primary filter.
- *
- * liblzma is part of XZ Utils <http://tukaani.org/xz/>. XZ Utils includes
- * a gzip-like command line tool named xz and some other tools. XZ Utils
- * is developed and maintained by Lasse Collin.
- *
- * Major parts of liblzma are based on Igor Pavlov's public domain LZMA SDK
- * <http://7-zip.org/sdk.html>.
- *
- * The SHA-256 implementation is based on the public domain code found from
- * 7-Zip <http://7-zip.org/>, which has a modified version of the public
- * domain SHA-256 code found from Crypto++ <http://www.cryptopp.com/>.
- * The SHA-256 code in Crypto++ was written by Kevin Springle and Wei Dai.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- */
-
-#ifndef LZMA_H
-#define LZMA_H
-
-/*****************************
- * Required standard headers *
- *****************************/
-
-/*
- * liblzma API headers need some standard types and macros. To allow
- * including lzma.h without requiring the application to include other
- * headers first, lzma.h includes the required standard headers unless
- * they already seem to be included already or if LZMA_MANUAL_HEADERS
- * has been defined.
- *
- * Here's what types and macros are needed and from which headers:
- *  - stddef.h: size_t, NULL
- *  - stdint.h: uint8_t, uint32_t, uint64_t, UINT32_C(n), uint64_C(n),
- *    UINT32_MAX, UINT64_MAX
- *
- * However, inttypes.h is a little more portable than stdint.h, although
- * inttypes.h declares some unneeded things compared to plain stdint.h.
- *
- * The hacks below aren't perfect, specifically they assume that inttypes.h
- * exists and that it typedefs at least uint8_t, uint32_t, and uint64_t,
- * and that, in case of incomplete inttypes.h, unsigned int is 32-bit.
- * If the application already takes care of setting up all the types and
- * macros properly (for example by using gnulib's stdint.h or inttypes.h),
- * we try to detect that the macros are already defined and don't include
- * inttypes.h here again. However, you may define LZMA_MANUAL_HEADERS to
- * force this file to never include any system headers.
- *
- * Some could argue that liblzma API should provide all the required types,
- * for example lzma_uint64, LZMA_UINT64_C(n), and LZMA_UINT64_MAX. This was
- * seen as an unnecessary mess, since most systems already provide all the
- * necessary types and macros in the standard headers.
- *
- * Note that liblzma API still has lzma_bool, because using stdbool.h would
- * break C89 and C++ programs on many systems. sizeof(bool) in C99 isn't
- * necessarily the same as sizeof(bool) in C++.
- */
-
-#ifndef LZMA_MANUAL_HEADERS
-	/*
-	 * I suppose this works portably also in C++. Note that in C++,
-	 * we need to get size_t into the global namespace.
-	 */
-#	include <stddef.h>
-
-	/*
-	 * Skip inttypes.h if we already have all the required macros. If we
-	 * have the macros, we assume that we have the matching typedefs too.
-	 */
-#	if !defined(UINT32_C) || !defined(UINT64_C) \
-			|| !defined(UINT32_MAX) || !defined(UINT64_MAX)
-		/*
-		 * MSVC has no C99 support, and thus it cannot be used to
-		 * compile liblzma. The liblzma API has to still be usable
-		 * from MSVC, so we need to define the required standard
-		 * integer types here.
-		 */
-#		if defined(_WIN32) && defined(_MSC_VER)
-			typedef unsigned __int8 uint8_t;
-			typedef unsigned __int32 uint32_t;
-			typedef unsigned __int64 uint64_t;
-#		else
-			/* Use the standard inttypes.h. */
-#			ifdef __cplusplus
-				/*
-				 * C99 sections 7.18.2 and 7.18.4 specify
-				 * that C++ implementations define the limit
-				 * and constant macros only if specifically
-				 * requested. Note that if you want the
-				 * format macros (PRIu64 etc.) too, you need
-				 * to define __STDC_FORMAT_MACROS before
-				 * including lzma.h, since re-including
-				 * inttypes.h with __STDC_FORMAT_MACROS
-				 * defined doesn't necessarily work.
-				 */
-#				ifndef __STDC_LIMIT_MACROS
-#					define __STDC_LIMIT_MACROS 1
-#				endif
-#				ifndef __STDC_CONSTANT_MACROS
-#					define __STDC_CONSTANT_MACROS 1
-#				endif
-#			endif
-
-#			include <inttypes.h>
-#		endif
-
-		/*
-		 * Some old systems have only the typedefs in inttypes.h, and
-		 * lack all the macros. For those systems, we need a few more
-		 * hacks. We assume that unsigned int is 32-bit and unsigned
-		 * long is either 32-bit or 64-bit. If these hacks aren't
-		 * enough, the application has to setup the types manually
-		 * before including lzma.h.
-		 */
-#		ifndef UINT32_C
-#			if defined(_WIN32) && defined(_MSC_VER)
-#				define UINT32_C(n) n ## UI32
-#			else
-#				define UINT32_C(n) n ## U
-#			endif
-#		endif
-
-#		ifndef UINT64_C
-#			if defined(_WIN32) && defined(_MSC_VER)
-#				define UINT64_C(n) n ## UI64
-#			else
-				/* Get ULONG_MAX. */
-#				include <limits.h>
-#				if ULONG_MAX == 4294967295UL
-#					define UINT64_C(n) n ## ULL
-#				else
-#					define UINT64_C(n) n ## UL
-#				endif
-#			endif
-#		endif
-
-#		ifndef UINT32_MAX
-#			define UINT32_MAX (UINT32_C(4294967295))
-#		endif
-
-#		ifndef UINT64_MAX
-#			define UINT64_MAX (UINT64_C(18446744073709551615))
-#		endif
-#	endif
-#endif /* ifdef LZMA_MANUAL_HEADERS */
-
-
-/******************
- * LZMA_API macro *
- ******************/
-
-/*
- * Some systems require that the functions and function pointers are
- * declared specially in the headers. LZMA_API_IMPORT is for importing
- * symbols and LZMA_API_CALL is to specify the calling convention.
- *
- * By default it is assumed that the application will link dynamically
- * against liblzma. #define LZMA_API_STATIC in your application if you
- * want to link against static liblzma. If you don't care about portability
- * to operating systems like Windows, or at least don't care about linking
- * against static liblzma on them, don't worry about LZMA_API_STATIC. That
- * is, most developers will never need to use LZMA_API_STATIC.
- *
- * The GCC variants are a special case on Windows (Cygwin and MinGW).
- * We rely on GCC doing the right thing with its auto-import feature,
- * and thus don't use __declspec(dllimport). This way developers don't
- * need to worry about LZMA_API_STATIC. Also the calling convention is
- * omitted on Cygwin but not on MinGW.
- */
-#ifndef LZMA_API_IMPORT
-#	if !defined(LZMA_API_STATIC) && defined(_WIN32) && !defined(__GNUC__)
-#		define LZMA_API_IMPORT __declspec(dllimport)
-#	else
-#		define LZMA_API_IMPORT
-#	endif
-#endif
-
-#ifndef LZMA_API_CALL
-#	if defined(_WIN32) && !defined(__CYGWIN__)
-#		define LZMA_API_CALL __cdecl
-#	else
-#		define LZMA_API_CALL
-#	endif
-#endif
-
-#ifndef LZMA_API
-#	define LZMA_API(type) LZMA_API_IMPORT type LZMA_API_CALL
-#endif
-
-
-/***********
- * nothrow *
- ***********/
-
-/*
- * None of the functions in liblzma may throw an exception. Even
- * the functions that use callback functions won't throw exceptions,
- * because liblzma would break if a callback function threw an exception.
- */
-#ifndef lzma_nothrow
-#	if defined(__cplusplus)
-#		define lzma_nothrow throw()
-#	elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#		define lzma_nothrow __attribute__((__nothrow__))
-#	else
-#		define lzma_nothrow
-#	endif
-#endif
-
-
-/********************
- * GNU C extensions *
- ********************/
-
-/*
- * GNU C extensions are used conditionally in the public API. It doesn't
- * break anything if these are sometimes enabled and sometimes not, only
- * affects warnings and optimizations.
- */
-#if __GNUC__ >= 3
-#	ifndef lzma_attribute
-#		define lzma_attribute(attr) __attribute__(attr)
-#	endif
-
-	/* warn_unused_result was added in GCC 3.4. */
-#	ifndef lzma_attr_warn_unused_result
-#		if __GNUC__ == 3 && __GNUC_MINOR__ < 4
-#			define lzma_attr_warn_unused_result
-#		endif
-#	endif
-
-#else
-#	ifndef lzma_attribute
-#		define lzma_attribute(attr)
-#	endif
-#endif
-
-
-#ifndef lzma_attr_pure
-#	define lzma_attr_pure lzma_attribute((__pure__))
-#endif
-
-#ifndef lzma_attr_const
-#	define lzma_attr_const lzma_attribute((__const__))
-#endif
-
-#ifndef lzma_attr_warn_unused_result
-#	define lzma_attr_warn_unused_result \
-		lzma_attribute((__warn_unused_result__))
-#endif
-
-
-/**************
- * Subheaders *
- **************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Subheaders check that this is defined. It is to prevent including
- * them directly from applications.
- */
-#define LZMA_H_INTERNAL 1
-
-/* Basic features */
-#include "lzma/version.h"
-#include "lzma/base.h"
-#include "lzma/vli.h"
-#include "lzma/check.h"
-
-/* Filters */
-#include "lzma/filter.h"
-#include "lzma/bcj.h"
-#include "lzma/delta.h"
-#include "lzma/lzma.h"
-
-/* Container formats */
-#include "lzma/container.h"
-
-/* Advanced features */
-#include "lzma/stream_flags.h"
-#include "lzma/block.h"
-#include "lzma/index.h"
-#include "lzma/index_hash.h"
-
-/* Hardware information */
-#include "lzma/hardware.h"
-
-/*
- * All subheaders included. Undefine LZMA_H_INTERNAL to prevent applications
- * re-including the subheaders.
- */
-#undef LZMA_H_INTERNAL
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ifndef LZMA_H */
diff -Nru r-base-3.2.3/src/extra/xz/check/check.c r-base-3.3.1/src/extra/xz/check/check.c
--- r-base-3.2.3/src/extra/xz/check/check.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/check.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       check.c
-/// \brief      Single API to access different integrity checks
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "check.h"
-
-
-extern LZMA_API(lzma_bool)
-lzma_check_is_supported(lzma_check type)
-{
-	if ((unsigned int)(type) > LZMA_CHECK_ID_MAX)
-		return false;
-
-	static const lzma_bool available_checks[LZMA_CHECK_ID_MAX + 1] = {
-		true,   // LZMA_CHECK_NONE
-
-#ifdef HAVE_CHECK_CRC32
-		true,
-#else
-		false,
-#endif
-
-		false,  // Reserved
-		false,  // Reserved
-
-#ifdef HAVE_CHECK_CRC64
-		true,
-#else
-		false,
-#endif
-
-		false,  // Reserved
-		false,  // Reserved
-		false,  // Reserved
-		false,  // Reserved
-		false,  // Reserved
-
-#ifdef HAVE_CHECK_SHA256
-		true,
-#else
-		false,
-#endif
-
-		false,  // Reserved
-		false,  // Reserved
-		false,  // Reserved
-		false,  // Reserved
-		false,  // Reserved
-	};
-
-	return available_checks[(unsigned int)(type)];
-}
-
-
-extern LZMA_API(uint32_t)
-lzma_check_size(lzma_check type)
-{
-	if ((unsigned int)(type) > LZMA_CHECK_ID_MAX)
-		return UINT32_MAX;
-
-	// See file-format.txt section 2.1.1.2.
-	static const uint8_t check_sizes[LZMA_CHECK_ID_MAX + 1] = {
-		0,
-		4, 4, 4,
-		8, 8, 8,
-		16, 16, 16,
-		32, 32, 32,
-		64, 64, 64
-	};
-
-	return check_sizes[(unsigned int)(type)];
-}
-
-
-extern void
-lzma_check_init(lzma_check_state *check, lzma_check type)
-{
-	switch (type) {
-	case LZMA_CHECK_NONE:
-		break;
-
-#ifdef HAVE_CHECK_CRC32
-	case LZMA_CHECK_CRC32:
-		check->state.crc32 = 0;
-		break;
-#endif
-
-#ifdef HAVE_CHECK_CRC64
-	case LZMA_CHECK_CRC64:
-		check->state.crc64 = 0;
-		break;
-#endif
-
-#ifdef HAVE_CHECK_SHA256
-	case LZMA_CHECK_SHA256:
-		lzma_sha256_init(check);
-		break;
-#endif
-
-	default:
-		break;
-	}
-
-	return;
-}
-
-
-extern void
-lzma_check_update(lzma_check_state *check, lzma_check type,
-		const uint8_t *buf, size_t size)
-{
-	switch (type) {
-#ifdef HAVE_CHECK_CRC32
-	case LZMA_CHECK_CRC32:
-		check->state.crc32 = lzma_crc32(buf, size, check->state.crc32);
-		break;
-#endif
-
-#ifdef HAVE_CHECK_CRC64
-	case LZMA_CHECK_CRC64:
-		check->state.crc64 = lzma_crc64(buf, size, check->state.crc64);
-		break;
-#endif
-
-#ifdef HAVE_CHECK_SHA256
-	case LZMA_CHECK_SHA256:
-		lzma_sha256_update(buf, size, check);
-		break;
-#endif
-
-	default:
-		break;
-	}
-
-	return;
-}
-
-
-extern void
-lzma_check_finish(lzma_check_state *check, lzma_check type)
-{
-	switch (type) {
-#ifdef HAVE_CHECK_CRC32
-	case LZMA_CHECK_CRC32:
-		check->buffer.u32[0] = conv32le(check->state.crc32);
-		break;
-#endif
-
-#ifdef HAVE_CHECK_CRC64
-	case LZMA_CHECK_CRC64:
-		check->buffer.u64[0] = conv64le(check->state.crc64);
-		break;
-#endif
-
-#ifdef HAVE_CHECK_SHA256
-	case LZMA_CHECK_SHA256:
-		lzma_sha256_finish(check);
-		break;
-#endif
-
-	default:
-		break;
-	}
-
-	return;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/check.h r-base-3.3.1/src/extra/xz/check/check.h
--- r-base-3.2.3/src/extra/xz/check/check.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/check.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       check.h
-/// \brief      Internal API to different integrity check functions
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_CHECK_H
-#define LZMA_CHECK_H
-
-#include "common.h"
-
-
-// Index hashing needs the best possible hash function (preferably
-// a cryptographic hash) for maximum reliability.
-#if defined(HAVE_CHECK_SHA256)
-#	define LZMA_CHECK_BEST LZMA_CHECK_SHA256
-#elif defined(HAVE_CHECK_CRC64)
-#	define LZMA_CHECK_BEST LZMA_CHECK_CRC64
-#else
-#	define LZMA_CHECK_BEST LZMA_CHECK_CRC32
-#endif
-
-
-/// \brief      Structure to hold internal state of the check being calculated
-///
-/// \note       This is not in the public API because this structure may
-///             change in future if new integrity check algorithms are added.
-typedef struct {
-	/// Buffer to hold the final result and a temporary buffer for SHA256.
-	union {
-		uint8_t u8[64];
-		uint32_t u32[16];
-		uint64_t u64[8];
-	} buffer;
-
-	/// Check-specific data
-	union {
-		uint32_t crc32;
-		uint64_t crc64;
-
-		struct {
-			/// Internal state
-			uint32_t state[8];
-
-			/// Size of the message excluding padding
-			uint64_t size;
-		} sha256;
-	} state;
-
-} lzma_check_state;
-
-
-/// lzma_crc32_table[0] is needed by LZ encoder so we need to keep
-/// the array two-dimensional.
-#ifdef HAVE_SMALL
-extern uint32_t lzma_crc32_table[1][256];
-extern void lzma_crc32_init(void);
-#else
-extern const uint32_t lzma_crc32_table[8][256];
-extern const uint64_t lzma_crc64_table[4][256];
-#endif
-
-
-/// \brief      Initialize *check depending on type
-///
-/// \return     LZMA_OK on success. LZMA_UNSUPPORTED_CHECK if the type is not
-///             supported by the current version or build of liblzma.
-///             LZMA_PROG_ERROR if type > LZMA_CHECK_ID_MAX.
-extern void lzma_check_init(lzma_check_state *check, lzma_check type);
-
-/// Update the check state
-extern void lzma_check_update(lzma_check_state *check, lzma_check type,
-		const uint8_t *buf, size_t size);
-
-/// Finish the check calculation and store the result to check->buffer.u8.
-extern void lzma_check_finish(lzma_check_state *check, lzma_check type);
-
-
-/// Prepare SHA-256 state for new input.
-extern void lzma_sha256_init(lzma_check_state *check);
-
-/// Update the SHA-256 hash state
-extern void lzma_sha256_update(
-		const uint8_t *buf, size_t size, lzma_check_state *check);
-
-/// Finish the SHA-256 calculation and store the result to check->buffer.u8.
-extern void lzma_sha256_finish(lzma_check_state *check);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_fast.c r-base-3.3.1/src/extra/xz/check/crc32_fast.c
--- r-base-3.2.3/src/extra/xz/check/crc32_fast.c	2015-03-18 23:02:08.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_fast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc32.c
-/// \brief      CRC32 calculation
-///
-/// Calculate the CRC32 using the slice-by-eight algorithm.
-/// It is explained in this document:
-/// http://www.intel.com/technology/comms/perfnet/download/CRC_generators.pdf
-/// The code in this file is not the same as in Intel's paper, but
-/// the basic principle is identical.
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "check.h"
-#include "crc_macros.h"
-
-
-// If you make any changes, do some benchmarking! Seemingly unrelated
-// changes can very easily ruin the performance (and very probably is
-// very compiler dependent).
-extern LZMA_API(uint32_t)
-lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc)
-{
-	crc = ~crc;
-
-#ifdef WORDS_BIGENDIAN
-	crc = bswap32(crc);
-#endif
-
-	if (size > 8) {
-		// Fix the alignment, if needed. The if statement above
-		// ensures that this won't read past the end of buf[].
-		while ((uintptr_t)(buf) & 7) {
-			crc = lzma_crc32_table[0][*buf++ ^ A(crc)] ^ S8(crc);
-			--size;
-		}
-
-		// Calculate the position where to stop.
-		const uint8_t *const limit = buf + (size & ~(size_t)(7));
-
-		// Calculate how many bytes must be calculated separately
-		// before returning the result.
-		size &= (size_t)(7);
-
-		// Calculate the CRC32 using the slice-by-eight algorithm.
-		while (buf < limit) {
-			crc ^= *(const uint32_t *)(buf);
-			buf += 4;
-
-			crc = lzma_crc32_table[7][A(crc)]
-			    ^ lzma_crc32_table[6][B(crc)]
-			    ^ lzma_crc32_table[5][C(crc)]
-			    ^ lzma_crc32_table[4][D(crc)];
-
-			const uint32_t tmp = *(const uint32_t *)(buf);
-			buf += 4;
-
-			// At least with some compilers, it is critical for
-			// performance, that the crc variable is XORed
-			// between the two table-lookup pairs.
-			crc = lzma_crc32_table[3][A(tmp)]
-			    ^ lzma_crc32_table[2][B(tmp)]
-			    ^ crc
-			    ^ lzma_crc32_table[1][C(tmp)]
-			    ^ lzma_crc32_table[0][D(tmp)];
-		}
-	}
-
-	while (size-- != 0)
-		crc = lzma_crc32_table[0][*buf++ ^ A(crc)] ^ S8(crc);
-
-#ifdef WORDS_BIGENDIAN
-	crc = bswap32(crc);
-#endif
-
-	return ~crc;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_small.c r-base-3.3.1/src/extra/xz/check/crc32_small.c
--- r-base-3.2.3/src/extra/xz/check/crc32_small.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_small.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc32_small.c
-/// \brief      CRC32 calculation (size-optimized)
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "check.h"
-
-
-uint32_t lzma_crc32_table[1][256];
-
-
-static void
-crc32_init(void)
-{
-	static const uint32_t poly32 = UINT32_C(0xEDB88320);
-
-	for (size_t b = 0; b < 256; ++b) {
-		uint32_t r = b;
-		for (size_t i = 0; i < 8; ++i) {
-			if (r & 1)
-				r = (r >> 1) ^ poly32;
-			else
-				r >>= 1;
-		}
-
-		lzma_crc32_table[0][b] = r;
-	}
-
-	return;
-}
-
-
-extern void
-lzma_crc32_init(void)
-{
-	mythread_once(crc32_init);
-	return;
-}
-
-
-extern LZMA_API(uint32_t)
-lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc)
-{
-	lzma_crc32_init();
-
-	crc = ~crc;
-
-	while (size != 0) {
-		crc = lzma_crc32_table[0][*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
-		--size;
-	}
-
-	return ~crc;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_table_be.h r-base-3.3.1/src/extra/xz/check/crc32_table_be.h
--- r-base-3.2.3/src/extra/xz/check/crc32_table_be.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_table_be.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,525 +0,0 @@
-/* This file has been automatically generated by crc32_tablegen.c. */
-
-const uint32_t lzma_crc32_table[8][256] = {
-	{
-		0x00000000, 0x96300777, 0x2C610EEE, 0xBA510999,
-		0x19C46D07, 0x8FF46A70, 0x35A563E9, 0xA395649E,
-		0x3288DB0E, 0xA4B8DC79, 0x1EE9D5E0, 0x88D9D297,
-		0x2B4CB609, 0xBD7CB17E, 0x072DB8E7, 0x911DBF90,
-		0x6410B71D, 0xF220B06A, 0x4871B9F3, 0xDE41BE84,
-		0x7DD4DA1A, 0xEBE4DD6D, 0x51B5D4F4, 0xC785D383,
-		0x56986C13, 0xC0A86B64, 0x7AF962FD, 0xECC9658A,
-		0x4F5C0114, 0xD96C0663, 0x633D0FFA, 0xF50D088D,
-		0xC8206E3B, 0x5E10694C, 0xE44160D5, 0x727167A2,
-		0xD1E4033C, 0x47D4044B, 0xFD850DD2, 0x6BB50AA5,
-		0xFAA8B535, 0x6C98B242, 0xD6C9BBDB, 0x40F9BCAC,
-		0xE36CD832, 0x755CDF45, 0xCF0DD6DC, 0x593DD1AB,
-		0xAC30D926, 0x3A00DE51, 0x8051D7C8, 0x1661D0BF,
-		0xB5F4B421, 0x23C4B356, 0x9995BACF, 0x0FA5BDB8,
-		0x9EB80228, 0x0888055F, 0xB2D90CC6, 0x24E90BB1,
-		0x877C6F2F, 0x114C6858, 0xAB1D61C1, 0x3D2D66B6,
-		0x9041DC76, 0x0671DB01, 0xBC20D298, 0x2A10D5EF,
-		0x8985B171, 0x1FB5B606, 0xA5E4BF9F, 0x33D4B8E8,
-		0xA2C90778, 0x34F9000F, 0x8EA80996, 0x18980EE1,
-		0xBB0D6A7F, 0x2D3D6D08, 0x976C6491, 0x015C63E6,
-		0xF4516B6B, 0x62616C1C, 0xD8306585, 0x4E0062F2,
-		0xED95066C, 0x7BA5011B, 0xC1F40882, 0x57C40FF5,
-		0xC6D9B065, 0x50E9B712, 0xEAB8BE8B, 0x7C88B9FC,
-		0xDF1DDD62, 0x492DDA15, 0xF37CD38C, 0x654CD4FB,
-		0x5861B24D, 0xCE51B53A, 0x7400BCA3, 0xE230BBD4,
-		0x41A5DF4A, 0xD795D83D, 0x6DC4D1A4, 0xFBF4D6D3,
-		0x6AE96943, 0xFCD96E34, 0x468867AD, 0xD0B860DA,
-		0x732D0444, 0xE51D0333, 0x5F4C0AAA, 0xC97C0DDD,
-		0x3C710550, 0xAA410227, 0x10100BBE, 0x86200CC9,
-		0x25B56857, 0xB3856F20, 0x09D466B9, 0x9FE461CE,
-		0x0EF9DE5E, 0x98C9D929, 0x2298D0B0, 0xB4A8D7C7,
-		0x173DB359, 0x810DB42E, 0x3B5CBDB7, 0xAD6CBAC0,
-		0x2083B8ED, 0xB6B3BF9A, 0x0CE2B603, 0x9AD2B174,
-		0x3947D5EA, 0xAF77D29D, 0x1526DB04, 0x8316DC73,
-		0x120B63E3, 0x843B6494, 0x3E6A6D0D, 0xA85A6A7A,
-		0x0BCF0EE4, 0x9DFF0993, 0x27AE000A, 0xB19E077D,
-		0x44930FF0, 0xD2A30887, 0x68F2011E, 0xFEC20669,
-		0x5D5762F7, 0xCB676580, 0x71366C19, 0xE7066B6E,
-		0x761BD4FE, 0xE02BD389, 0x5A7ADA10, 0xCC4ADD67,
-		0x6FDFB9F9, 0xF9EFBE8E, 0x43BEB717, 0xD58EB060,
-		0xE8A3D6D6, 0x7E93D1A1, 0xC4C2D838, 0x52F2DF4F,
-		0xF167BBD1, 0x6757BCA6, 0xDD06B53F, 0x4B36B248,
-		0xDA2B0DD8, 0x4C1B0AAF, 0xF64A0336, 0x607A0441,
-		0xC3EF60DF, 0x55DF67A8, 0xEF8E6E31, 0x79BE6946,
-		0x8CB361CB, 0x1A8366BC, 0xA0D26F25, 0x36E26852,
-		0x95770CCC, 0x03470BBB, 0xB9160222, 0x2F260555,
-		0xBE3BBAC5, 0x280BBDB2, 0x925AB42B, 0x046AB35C,
-		0xA7FFD7C2, 0x31CFD0B5, 0x8B9ED92C, 0x1DAEDE5B,
-		0xB0C2649B, 0x26F263EC, 0x9CA36A75, 0x0A936D02,
-		0xA906099C, 0x3F360EEB, 0x85670772, 0x13570005,
-		0x824ABF95, 0x147AB8E2, 0xAE2BB17B, 0x381BB60C,
-		0x9B8ED292, 0x0DBED5E5, 0xB7EFDC7C, 0x21DFDB0B,
-		0xD4D2D386, 0x42E2D4F1, 0xF8B3DD68, 0x6E83DA1F,
-		0xCD16BE81, 0x5B26B9F6, 0xE177B06F, 0x7747B718,
-		0xE65A0888, 0x706A0FFF, 0xCA3B0666, 0x5C0B0111,
-		0xFF9E658F, 0x69AE62F8, 0xD3FF6B61, 0x45CF6C16,
-		0x78E20AA0, 0xEED20DD7, 0x5483044E, 0xC2B30339,
-		0x612667A7, 0xF71660D0, 0x4D476949, 0xDB776E3E,
-		0x4A6AD1AE, 0xDC5AD6D9, 0x660BDF40, 0xF03BD837,
-		0x53AEBCA9, 0xC59EBBDE, 0x7FCFB247, 0xE9FFB530,
-		0x1CF2BDBD, 0x8AC2BACA, 0x3093B353, 0xA6A3B424,
-		0x0536D0BA, 0x9306D7CD, 0x2957DE54, 0xBF67D923,
-		0x2E7A66B3, 0xB84A61C4, 0x021B685D, 0x942B6F2A,
-		0x37BE0BB4, 0xA18E0CC3, 0x1BDF055A, 0x8DEF022D
-	}, {
-		0x00000000, 0x41311B19, 0x82623632, 0xC3532D2B,
-		0x04C56C64, 0x45F4777D, 0x86A75A56, 0xC796414F,
-		0x088AD9C8, 0x49BBC2D1, 0x8AE8EFFA, 0xCBD9F4E3,
-		0x0C4FB5AC, 0x4D7EAEB5, 0x8E2D839E, 0xCF1C9887,
-		0x5112C24A, 0x1023D953, 0xD370F478, 0x9241EF61,
-		0x55D7AE2E, 0x14E6B537, 0xD7B5981C, 0x96848305,
-		0x59981B82, 0x18A9009B, 0xDBFA2DB0, 0x9ACB36A9,
-		0x5D5D77E6, 0x1C6C6CFF, 0xDF3F41D4, 0x9E0E5ACD,
-		0xA2248495, 0xE3159F8C, 0x2046B2A7, 0x6177A9BE,
-		0xA6E1E8F1, 0xE7D0F3E8, 0x2483DEC3, 0x65B2C5DA,
-		0xAAAE5D5D, 0xEB9F4644, 0x28CC6B6F, 0x69FD7076,
-		0xAE6B3139, 0xEF5A2A20, 0x2C09070B, 0x6D381C12,
-		0xF33646DF, 0xB2075DC6, 0x715470ED, 0x30656BF4,
-		0xF7F32ABB, 0xB6C231A2, 0x75911C89, 0x34A00790,
-		0xFBBC9F17, 0xBA8D840E, 0x79DEA925, 0x38EFB23C,
-		0xFF79F373, 0xBE48E86A, 0x7D1BC541, 0x3C2ADE58,
-		0x054F79F0, 0x447E62E9, 0x872D4FC2, 0xC61C54DB,
-		0x018A1594, 0x40BB0E8D, 0x83E823A6, 0xC2D938BF,
-		0x0DC5A038, 0x4CF4BB21, 0x8FA7960A, 0xCE968D13,
-		0x0900CC5C, 0x4831D745, 0x8B62FA6E, 0xCA53E177,
-		0x545DBBBA, 0x156CA0A3, 0xD63F8D88, 0x970E9691,
-		0x5098D7DE, 0x11A9CCC7, 0xD2FAE1EC, 0x93CBFAF5,
-		0x5CD76272, 0x1DE6796B, 0xDEB55440, 0x9F844F59,
-		0x58120E16, 0x1923150F, 0xDA703824, 0x9B41233D,
-		0xA76BFD65, 0xE65AE67C, 0x2509CB57, 0x6438D04E,
-		0xA3AE9101, 0xE29F8A18, 0x21CCA733, 0x60FDBC2A,
-		0xAFE124AD, 0xEED03FB4, 0x2D83129F, 0x6CB20986,
-		0xAB2448C9, 0xEA1553D0, 0x29467EFB, 0x687765E2,
-		0xF6793F2F, 0xB7482436, 0x741B091D, 0x352A1204,
-		0xF2BC534B, 0xB38D4852, 0x70DE6579, 0x31EF7E60,
-		0xFEF3E6E7, 0xBFC2FDFE, 0x7C91D0D5, 0x3DA0CBCC,
-		0xFA368A83, 0xBB07919A, 0x7854BCB1, 0x3965A7A8,
-		0x4B98833B, 0x0AA99822, 0xC9FAB509, 0x88CBAE10,
-		0x4F5DEF5F, 0x0E6CF446, 0xCD3FD96D, 0x8C0EC274,
-		0x43125AF3, 0x022341EA, 0xC1706CC1, 0x804177D8,
-		0x47D73697, 0x06E62D8E, 0xC5B500A5, 0x84841BBC,
-		0x1A8A4171, 0x5BBB5A68, 0x98E87743, 0xD9D96C5A,
-		0x1E4F2D15, 0x5F7E360C, 0x9C2D1B27, 0xDD1C003E,
-		0x120098B9, 0x533183A0, 0x9062AE8B, 0xD153B592,
-		0x16C5F4DD, 0x57F4EFC4, 0x94A7C2EF, 0xD596D9F6,
-		0xE9BC07AE, 0xA88D1CB7, 0x6BDE319C, 0x2AEF2A85,
-		0xED796BCA, 0xAC4870D3, 0x6F1B5DF8, 0x2E2A46E1,
-		0xE136DE66, 0xA007C57F, 0x6354E854, 0x2265F34D,
-		0xE5F3B202, 0xA4C2A91B, 0x67918430, 0x26A09F29,
-		0xB8AEC5E4, 0xF99FDEFD, 0x3ACCF3D6, 0x7BFDE8CF,
-		0xBC6BA980, 0xFD5AB299, 0x3E099FB2, 0x7F3884AB,
-		0xB0241C2C, 0xF1150735, 0x32462A1E, 0x73773107,
-		0xB4E17048, 0xF5D06B51, 0x3683467A, 0x77B25D63,
-		0x4ED7FACB, 0x0FE6E1D2, 0xCCB5CCF9, 0x8D84D7E0,
-		0x4A1296AF, 0x0B238DB6, 0xC870A09D, 0x8941BB84,
-		0x465D2303, 0x076C381A, 0xC43F1531, 0x850E0E28,
-		0x42984F67, 0x03A9547E, 0xC0FA7955, 0x81CB624C,
-		0x1FC53881, 0x5EF42398, 0x9DA70EB3, 0xDC9615AA,
-		0x1B0054E5, 0x5A314FFC, 0x996262D7, 0xD85379CE,
-		0x174FE149, 0x567EFA50, 0x952DD77B, 0xD41CCC62,
-		0x138A8D2D, 0x52BB9634, 0x91E8BB1F, 0xD0D9A006,
-		0xECF37E5E, 0xADC26547, 0x6E91486C, 0x2FA05375,
-		0xE836123A, 0xA9070923, 0x6A542408, 0x2B653F11,
-		0xE479A796, 0xA548BC8F, 0x661B91A4, 0x272A8ABD,
-		0xE0BCCBF2, 0xA18DD0EB, 0x62DEFDC0, 0x23EFE6D9,
-		0xBDE1BC14, 0xFCD0A70D, 0x3F838A26, 0x7EB2913F,
-		0xB924D070, 0xF815CB69, 0x3B46E642, 0x7A77FD5B,
-		0xB56B65DC, 0xF45A7EC5, 0x370953EE, 0x763848F7,
-		0xB1AE09B8, 0xF09F12A1, 0x33CC3F8A, 0x72FD2493
-	}, {
-		0x00000000, 0x376AC201, 0x6ED48403, 0x59BE4602,
-		0xDCA80907, 0xEBC2CB06, 0xB27C8D04, 0x85164F05,
-		0xB851130E, 0x8F3BD10F, 0xD685970D, 0xE1EF550C,
-		0x64F91A09, 0x5393D808, 0x0A2D9E0A, 0x3D475C0B,
-		0x70A3261C, 0x47C9E41D, 0x1E77A21F, 0x291D601E,
-		0xAC0B2F1B, 0x9B61ED1A, 0xC2DFAB18, 0xF5B56919,
-		0xC8F23512, 0xFF98F713, 0xA626B111, 0x914C7310,
-		0x145A3C15, 0x2330FE14, 0x7A8EB816, 0x4DE47A17,
-		0xE0464D38, 0xD72C8F39, 0x8E92C93B, 0xB9F80B3A,
-		0x3CEE443F, 0x0B84863E, 0x523AC03C, 0x6550023D,
-		0x58175E36, 0x6F7D9C37, 0x36C3DA35, 0x01A91834,
-		0x84BF5731, 0xB3D59530, 0xEA6BD332, 0xDD011133,
-		0x90E56B24, 0xA78FA925, 0xFE31EF27, 0xC95B2D26,
-		0x4C4D6223, 0x7B27A022, 0x2299E620, 0x15F32421,
-		0x28B4782A, 0x1FDEBA2B, 0x4660FC29, 0x710A3E28,
-		0xF41C712D, 0xC376B32C, 0x9AC8F52E, 0xADA2372F,
-		0xC08D9A70, 0xF7E75871, 0xAE591E73, 0x9933DC72,
-		0x1C259377, 0x2B4F5176, 0x72F11774, 0x459BD575,
-		0x78DC897E, 0x4FB64B7F, 0x16080D7D, 0x2162CF7C,
-		0xA4748079, 0x931E4278, 0xCAA0047A, 0xFDCAC67B,
-		0xB02EBC6C, 0x87447E6D, 0xDEFA386F, 0xE990FA6E,
-		0x6C86B56B, 0x5BEC776A, 0x02523168, 0x3538F369,
-		0x087FAF62, 0x3F156D63, 0x66AB2B61, 0x51C1E960,
-		0xD4D7A665, 0xE3BD6464, 0xBA032266, 0x8D69E067,
-		0x20CBD748, 0x17A11549, 0x4E1F534B, 0x7975914A,
-		0xFC63DE4F, 0xCB091C4E, 0x92B75A4C, 0xA5DD984D,
-		0x989AC446, 0xAFF00647, 0xF64E4045, 0xC1248244,
-		0x4432CD41, 0x73580F40, 0x2AE64942, 0x1D8C8B43,
-		0x5068F154, 0x67023355, 0x3EBC7557, 0x09D6B756,
-		0x8CC0F853, 0xBBAA3A52, 0xE2147C50, 0xD57EBE51,
-		0xE839E25A, 0xDF53205B, 0x86ED6659, 0xB187A458,
-		0x3491EB5D, 0x03FB295C, 0x5A456F5E, 0x6D2FAD5F,
-		0x801B35E1, 0xB771F7E0, 0xEECFB1E2, 0xD9A573E3,
-		0x5CB33CE6, 0x6BD9FEE7, 0x3267B8E5, 0x050D7AE4,
-		0x384A26EF, 0x0F20E4EE, 0x569EA2EC, 0x61F460ED,
-		0xE4E22FE8, 0xD388EDE9, 0x8A36ABEB, 0xBD5C69EA,
-		0xF0B813FD, 0xC7D2D1FC, 0x9E6C97FE, 0xA90655FF,
-		0x2C101AFA, 0x1B7AD8FB, 0x42C49EF9, 0x75AE5CF8,
-		0x48E900F3, 0x7F83C2F2, 0x263D84F0, 0x115746F1,
-		0x944109F4, 0xA32BCBF5, 0xFA958DF7, 0xCDFF4FF6,
-		0x605D78D9, 0x5737BAD8, 0x0E89FCDA, 0x39E33EDB,
-		0xBCF571DE, 0x8B9FB3DF, 0xD221F5DD, 0xE54B37DC,
-		0xD80C6BD7, 0xEF66A9D6, 0xB6D8EFD4, 0x81B22DD5,
-		0x04A462D0, 0x33CEA0D1, 0x6A70E6D3, 0x5D1A24D2,
-		0x10FE5EC5, 0x27949CC4, 0x7E2ADAC6, 0x494018C7,
-		0xCC5657C2, 0xFB3C95C3, 0xA282D3C1, 0x95E811C0,
-		0xA8AF4DCB, 0x9FC58FCA, 0xC67BC9C8, 0xF1110BC9,
-		0x740744CC, 0x436D86CD, 0x1AD3C0CF, 0x2DB902CE,
-		0x4096AF91, 0x77FC6D90, 0x2E422B92, 0x1928E993,
-		0x9C3EA696, 0xAB546497, 0xF2EA2295, 0xC580E094,
-		0xF8C7BC9F, 0xCFAD7E9E, 0x9613389C, 0xA179FA9D,
-		0x246FB598, 0x13057799, 0x4ABB319B, 0x7DD1F39A,
-		0x3035898D, 0x075F4B8C, 0x5EE10D8E, 0x698BCF8F,
-		0xEC9D808A, 0xDBF7428B, 0x82490489, 0xB523C688,
-		0x88649A83, 0xBF0E5882, 0xE6B01E80, 0xD1DADC81,
-		0x54CC9384, 0x63A65185, 0x3A181787, 0x0D72D586,
-		0xA0D0E2A9, 0x97BA20A8, 0xCE0466AA, 0xF96EA4AB,
-		0x7C78EBAE, 0x4B1229AF, 0x12AC6FAD, 0x25C6ADAC,
-		0x1881F1A7, 0x2FEB33A6, 0x765575A4, 0x413FB7A5,
-		0xC429F8A0, 0xF3433AA1, 0xAAFD7CA3, 0x9D97BEA2,
-		0xD073C4B5, 0xE71906B4, 0xBEA740B6, 0x89CD82B7,
-		0x0CDBCDB2, 0x3BB10FB3, 0x620F49B1, 0x55658BB0,
-		0x6822D7BB, 0x5F4815BA, 0x06F653B8, 0x319C91B9,
-		0xB48ADEBC, 0x83E01CBD, 0xDA5E5ABF, 0xED3498BE
-	}, {
-		0x00000000, 0x6567BCB8, 0x8BC809AA, 0xEEAFB512,
-		0x5797628F, 0x32F0DE37, 0xDC5F6B25, 0xB938D79D,
-		0xEF28B4C5, 0x8A4F087D, 0x64E0BD6F, 0x018701D7,
-		0xB8BFD64A, 0xDDD86AF2, 0x3377DFE0, 0x56106358,
-		0x9F571950, 0xFA30A5E8, 0x149F10FA, 0x71F8AC42,
-		0xC8C07BDF, 0xADA7C767, 0x43087275, 0x266FCECD,
-		0x707FAD95, 0x1518112D, 0xFBB7A43F, 0x9ED01887,
-		0x27E8CF1A, 0x428F73A2, 0xAC20C6B0, 0xC9477A08,
-		0x3EAF32A0, 0x5BC88E18, 0xB5673B0A, 0xD00087B2,
-		0x6938502F, 0x0C5FEC97, 0xE2F05985, 0x8797E53D,
-		0xD1878665, 0xB4E03ADD, 0x5A4F8FCF, 0x3F283377,
-		0x8610E4EA, 0xE3775852, 0x0DD8ED40, 0x68BF51F8,
-		0xA1F82BF0, 0xC49F9748, 0x2A30225A, 0x4F579EE2,
-		0xF66F497F, 0x9308F5C7, 0x7DA740D5, 0x18C0FC6D,
-		0x4ED09F35, 0x2BB7238D, 0xC518969F, 0xA07F2A27,
-		0x1947FDBA, 0x7C204102, 0x928FF410, 0xF7E848A8,
-		0x3D58149B, 0x583FA823, 0xB6901D31, 0xD3F7A189,
-		0x6ACF7614, 0x0FA8CAAC, 0xE1077FBE, 0x8460C306,
-		0xD270A05E, 0xB7171CE6, 0x59B8A9F4, 0x3CDF154C,
-		0x85E7C2D1, 0xE0807E69, 0x0E2FCB7B, 0x6B4877C3,
-		0xA20F0DCB, 0xC768B173, 0x29C70461, 0x4CA0B8D9,
-		0xF5986F44, 0x90FFD3FC, 0x7E5066EE, 0x1B37DA56,
-		0x4D27B90E, 0x284005B6, 0xC6EFB0A4, 0xA3880C1C,
-		0x1AB0DB81, 0x7FD76739, 0x9178D22B, 0xF41F6E93,
-		0x03F7263B, 0x66909A83, 0x883F2F91, 0xED589329,
-		0x546044B4, 0x3107F80C, 0xDFA84D1E, 0xBACFF1A6,
-		0xECDF92FE, 0x89B82E46, 0x67179B54, 0x027027EC,
-		0xBB48F071, 0xDE2F4CC9, 0x3080F9DB, 0x55E74563,
-		0x9CA03F6B, 0xF9C783D3, 0x176836C1, 0x720F8A79,
-		0xCB375DE4, 0xAE50E15C, 0x40FF544E, 0x2598E8F6,
-		0x73888BAE, 0x16EF3716, 0xF8408204, 0x9D273EBC,
-		0x241FE921, 0x41785599, 0xAFD7E08B, 0xCAB05C33,
-		0x3BB659ED, 0x5ED1E555, 0xB07E5047, 0xD519ECFF,
-		0x6C213B62, 0x094687DA, 0xE7E932C8, 0x828E8E70,
-		0xD49EED28, 0xB1F95190, 0x5F56E482, 0x3A31583A,
-		0x83098FA7, 0xE66E331F, 0x08C1860D, 0x6DA63AB5,
-		0xA4E140BD, 0xC186FC05, 0x2F294917, 0x4A4EF5AF,
-		0xF3762232, 0x96119E8A, 0x78BE2B98, 0x1DD99720,
-		0x4BC9F478, 0x2EAE48C0, 0xC001FDD2, 0xA566416A,
-		0x1C5E96F7, 0x79392A4F, 0x97969F5D, 0xF2F123E5,
-		0x05196B4D, 0x607ED7F5, 0x8ED162E7, 0xEBB6DE5F,
-		0x528E09C2, 0x37E9B57A, 0xD9460068, 0xBC21BCD0,
-		0xEA31DF88, 0x8F566330, 0x61F9D622, 0x049E6A9A,
-		0xBDA6BD07, 0xD8C101BF, 0x366EB4AD, 0x53090815,
-		0x9A4E721D, 0xFF29CEA5, 0x11867BB7, 0x74E1C70F,
-		0xCDD91092, 0xA8BEAC2A, 0x46111938, 0x2376A580,
-		0x7566C6D8, 0x10017A60, 0xFEAECF72, 0x9BC973CA,
-		0x22F1A457, 0x479618EF, 0xA939ADFD, 0xCC5E1145,
-		0x06EE4D76, 0x6389F1CE, 0x8D2644DC, 0xE841F864,
-		0x51792FF9, 0x341E9341, 0xDAB12653, 0xBFD69AEB,
-		0xE9C6F9B3, 0x8CA1450B, 0x620EF019, 0x07694CA1,
-		0xBE519B3C, 0xDB362784, 0x35999296, 0x50FE2E2E,
-		0x99B95426, 0xFCDEE89E, 0x12715D8C, 0x7716E134,
-		0xCE2E36A9, 0xAB498A11, 0x45E63F03, 0x208183BB,
-		0x7691E0E3, 0x13F65C5B, 0xFD59E949, 0x983E55F1,
-		0x2106826C, 0x44613ED4, 0xAACE8BC6, 0xCFA9377E,
-		0x38417FD6, 0x5D26C36E, 0xB389767C, 0xD6EECAC4,
-		0x6FD61D59, 0x0AB1A1E1, 0xE41E14F3, 0x8179A84B,
-		0xD769CB13, 0xB20E77AB, 0x5CA1C2B9, 0x39C67E01,
-		0x80FEA99C, 0xE5991524, 0x0B36A036, 0x6E511C8E,
-		0xA7166686, 0xC271DA3E, 0x2CDE6F2C, 0x49B9D394,
-		0xF0810409, 0x95E6B8B1, 0x7B490DA3, 0x1E2EB11B,
-		0x483ED243, 0x2D596EFB, 0xC3F6DBE9, 0xA6916751,
-		0x1FA9B0CC, 0x7ACE0C74, 0x9461B966, 0xF10605DE
-	}, {
-		0x00000000, 0xB029603D, 0x6053C07A, 0xD07AA047,
-		0xC0A680F5, 0x708FE0C8, 0xA0F5408F, 0x10DC20B2,
-		0xC14B7030, 0x7162100D, 0xA118B04A, 0x1131D077,
-		0x01EDF0C5, 0xB1C490F8, 0x61BE30BF, 0xD1975082,
-		0x8297E060, 0x32BE805D, 0xE2C4201A, 0x52ED4027,
-		0x42316095, 0xF21800A8, 0x2262A0EF, 0x924BC0D2,
-		0x43DC9050, 0xF3F5F06D, 0x238F502A, 0x93A63017,
-		0x837A10A5, 0x33537098, 0xE329D0DF, 0x5300B0E2,
-		0x042FC1C1, 0xB406A1FC, 0x647C01BB, 0xD4556186,
-		0xC4894134, 0x74A02109, 0xA4DA814E, 0x14F3E173,
-		0xC564B1F1, 0x754DD1CC, 0xA537718B, 0x151E11B6,
-		0x05C23104, 0xB5EB5139, 0x6591F17E, 0xD5B89143,
-		0x86B821A1, 0x3691419C, 0xE6EBE1DB, 0x56C281E6,
-		0x461EA154, 0xF637C169, 0x264D612E, 0x96640113,
-		0x47F35191, 0xF7DA31AC, 0x27A091EB, 0x9789F1D6,
-		0x8755D164, 0x377CB159, 0xE706111E, 0x572F7123,
-		0x4958F358, 0xF9719365, 0x290B3322, 0x9922531F,
-		0x89FE73AD, 0x39D71390, 0xE9ADB3D7, 0x5984D3EA,
-		0x88138368, 0x383AE355, 0xE8404312, 0x5869232F,
-		0x48B5039D, 0xF89C63A0, 0x28E6C3E7, 0x98CFA3DA,
-		0xCBCF1338, 0x7BE67305, 0xAB9CD342, 0x1BB5B37F,
-		0x0B6993CD, 0xBB40F3F0, 0x6B3A53B7, 0xDB13338A,
-		0x0A846308, 0xBAAD0335, 0x6AD7A372, 0xDAFEC34F,
-		0xCA22E3FD, 0x7A0B83C0, 0xAA712387, 0x1A5843BA,
-		0x4D773299, 0xFD5E52A4, 0x2D24F2E3, 0x9D0D92DE,
-		0x8DD1B26C, 0x3DF8D251, 0xED827216, 0x5DAB122B,
-		0x8C3C42A9, 0x3C152294, 0xEC6F82D3, 0x5C46E2EE,
-		0x4C9AC25C, 0xFCB3A261, 0x2CC90226, 0x9CE0621B,
-		0xCFE0D2F9, 0x7FC9B2C4, 0xAFB31283, 0x1F9A72BE,
-		0x0F46520C, 0xBF6F3231, 0x6F159276, 0xDF3CF24B,
-		0x0EABA2C9, 0xBE82C2F4, 0x6EF862B3, 0xDED1028E,
-		0xCE0D223C, 0x7E244201, 0xAE5EE246, 0x1E77827B,
-		0x92B0E6B1, 0x2299868C, 0xF2E326CB, 0x42CA46F6,
-		0x52166644, 0xE23F0679, 0x3245A63E, 0x826CC603,
-		0x53FB9681, 0xE3D2F6BC, 0x33A856FB, 0x838136C6,
-		0x935D1674, 0x23747649, 0xF30ED60E, 0x4327B633,
-		0x102706D1, 0xA00E66EC, 0x7074C6AB, 0xC05DA696,
-		0xD0818624, 0x60A8E619, 0xB0D2465E, 0x00FB2663,
-		0xD16C76E1, 0x614516DC, 0xB13FB69B, 0x0116D6A6,
-		0x11CAF614, 0xA1E39629, 0x7199366E, 0xC1B05653,
-		0x969F2770, 0x26B6474D, 0xF6CCE70A, 0x46E58737,
-		0x5639A785, 0xE610C7B8, 0x366A67FF, 0x864307C2,
-		0x57D45740, 0xE7FD377D, 0x3787973A, 0x87AEF707,
-		0x9772D7B5, 0x275BB788, 0xF72117CF, 0x470877F2,
-		0x1408C710, 0xA421A72D, 0x745B076A, 0xC4726757,
-		0xD4AE47E5, 0x648727D8, 0xB4FD879F, 0x04D4E7A2,
-		0xD543B720, 0x656AD71D, 0xB510775A, 0x05391767,
-		0x15E537D5, 0xA5CC57E8, 0x75B6F7AF, 0xC59F9792,
-		0xDBE815E9, 0x6BC175D4, 0xBBBBD593, 0x0B92B5AE,
-		0x1B4E951C, 0xAB67F521, 0x7B1D5566, 0xCB34355B,
-		0x1AA365D9, 0xAA8A05E4, 0x7AF0A5A3, 0xCAD9C59E,
-		0xDA05E52C, 0x6A2C8511, 0xBA562556, 0x0A7F456B,
-		0x597FF589, 0xE95695B4, 0x392C35F3, 0x890555CE,
-		0x99D9757C, 0x29F01541, 0xF98AB506, 0x49A3D53B,
-		0x983485B9, 0x281DE584, 0xF86745C3, 0x484E25FE,
-		0x5892054C, 0xE8BB6571, 0x38C1C536, 0x88E8A50B,
-		0xDFC7D428, 0x6FEEB415, 0xBF941452, 0x0FBD746F,
-		0x1F6154DD, 0xAF4834E0, 0x7F3294A7, 0xCF1BF49A,
-		0x1E8CA418, 0xAEA5C425, 0x7EDF6462, 0xCEF6045F,
-		0xDE2A24ED, 0x6E0344D0, 0xBE79E497, 0x0E5084AA,
-		0x5D503448, 0xED795475, 0x3D03F432, 0x8D2A940F,
-		0x9DF6B4BD, 0x2DDFD480, 0xFDA574C7, 0x4D8C14FA,
-		0x9C1B4478, 0x2C322445, 0xFC488402, 0x4C61E43F,
-		0x5CBDC48D, 0xEC94A4B0, 0x3CEE04F7, 0x8CC764CA
-	}, {
-		0x00000000, 0xA5D35CCB, 0x0BA1C84D, 0xAE729486,
-		0x1642919B, 0xB391CD50, 0x1DE359D6, 0xB830051D,
-		0x6D8253EC, 0xC8510F27, 0x66239BA1, 0xC3F0C76A,
-		0x7BC0C277, 0xDE139EBC, 0x70610A3A, 0xD5B256F1,
-		0x9B02D603, 0x3ED18AC8, 0x90A31E4E, 0x35704285,
-		0x8D404798, 0x28931B53, 0x86E18FD5, 0x2332D31E,
-		0xF68085EF, 0x5353D924, 0xFD214DA2, 0x58F21169,
-		0xE0C21474, 0x451148BF, 0xEB63DC39, 0x4EB080F2,
-		0x3605AC07, 0x93D6F0CC, 0x3DA4644A, 0x98773881,
-		0x20473D9C, 0x85946157, 0x2BE6F5D1, 0x8E35A91A,
-		0x5B87FFEB, 0xFE54A320, 0x502637A6, 0xF5F56B6D,
-		0x4DC56E70, 0xE81632BB, 0x4664A63D, 0xE3B7FAF6,
-		0xAD077A04, 0x08D426CF, 0xA6A6B249, 0x0375EE82,
-		0xBB45EB9F, 0x1E96B754, 0xB0E423D2, 0x15377F19,
-		0xC08529E8, 0x65567523, 0xCB24E1A5, 0x6EF7BD6E,
-		0xD6C7B873, 0x7314E4B8, 0xDD66703E, 0x78B52CF5,
-		0x6C0A580F, 0xC9D904C4, 0x67AB9042, 0xC278CC89,
-		0x7A48C994, 0xDF9B955F, 0x71E901D9, 0xD43A5D12,
-		0x01880BE3, 0xA45B5728, 0x0A29C3AE, 0xAFFA9F65,
-		0x17CA9A78, 0xB219C6B3, 0x1C6B5235, 0xB9B80EFE,
-		0xF7088E0C, 0x52DBD2C7, 0xFCA94641, 0x597A1A8A,
-		0xE14A1F97, 0x4499435C, 0xEAEBD7DA, 0x4F388B11,
-		0x9A8ADDE0, 0x3F59812B, 0x912B15AD, 0x34F84966,
-		0x8CC84C7B, 0x291B10B0, 0x87698436, 0x22BAD8FD,
-		0x5A0FF408, 0xFFDCA8C3, 0x51AE3C45, 0xF47D608E,
-		0x4C4D6593, 0xE99E3958, 0x47ECADDE, 0xE23FF115,
-		0x378DA7E4, 0x925EFB2F, 0x3C2C6FA9, 0x99FF3362,
-		0x21CF367F, 0x841C6AB4, 0x2A6EFE32, 0x8FBDA2F9,
-		0xC10D220B, 0x64DE7EC0, 0xCAACEA46, 0x6F7FB68D,
-		0xD74FB390, 0x729CEF5B, 0xDCEE7BDD, 0x793D2716,
-		0xAC8F71E7, 0x095C2D2C, 0xA72EB9AA, 0x02FDE561,
-		0xBACDE07C, 0x1F1EBCB7, 0xB16C2831, 0x14BF74FA,
-		0xD814B01E, 0x7DC7ECD5, 0xD3B57853, 0x76662498,
-		0xCE562185, 0x6B857D4E, 0xC5F7E9C8, 0x6024B503,
-		0xB596E3F2, 0x1045BF39, 0xBE372BBF, 0x1BE47774,
-		0xA3D47269, 0x06072EA2, 0xA875BA24, 0x0DA6E6EF,
-		0x4316661D, 0xE6C53AD6, 0x48B7AE50, 0xED64F29B,
-		0x5554F786, 0xF087AB4D, 0x5EF53FCB, 0xFB266300,
-		0x2E9435F1, 0x8B47693A, 0x2535FDBC, 0x80E6A177,
-		0x38D6A46A, 0x9D05F8A1, 0x33776C27, 0x96A430EC,
-		0xEE111C19, 0x4BC240D2, 0xE5B0D454, 0x4063889F,
-		0xF8538D82, 0x5D80D149, 0xF3F245CF, 0x56211904,
-		0x83934FF5, 0x2640133E, 0x883287B8, 0x2DE1DB73,
-		0x95D1DE6E, 0x300282A5, 0x9E701623, 0x3BA34AE8,
-		0x7513CA1A, 0xD0C096D1, 0x7EB20257, 0xDB615E9C,
-		0x63515B81, 0xC682074A, 0x68F093CC, 0xCD23CF07,
-		0x189199F6, 0xBD42C53D, 0x133051BB, 0xB6E30D70,
-		0x0ED3086D, 0xAB0054A6, 0x0572C020, 0xA0A19CEB,
-		0xB41EE811, 0x11CDB4DA, 0xBFBF205C, 0x1A6C7C97,
-		0xA25C798A, 0x078F2541, 0xA9FDB1C7, 0x0C2EED0C,
-		0xD99CBBFD, 0x7C4FE736, 0xD23D73B0, 0x77EE2F7B,
-		0xCFDE2A66, 0x6A0D76AD, 0xC47FE22B, 0x61ACBEE0,
-		0x2F1C3E12, 0x8ACF62D9, 0x24BDF65F, 0x816EAA94,
-		0x395EAF89, 0x9C8DF342, 0x32FF67C4, 0x972C3B0F,
-		0x429E6DFE, 0xE74D3135, 0x493FA5B3, 0xECECF978,
-		0x54DCFC65, 0xF10FA0AE, 0x5F7D3428, 0xFAAE68E3,
-		0x821B4416, 0x27C818DD, 0x89BA8C5B, 0x2C69D090,
-		0x9459D58D, 0x318A8946, 0x9FF81DC0, 0x3A2B410B,
-		0xEF9917FA, 0x4A4A4B31, 0xE438DFB7, 0x41EB837C,
-		0xF9DB8661, 0x5C08DAAA, 0xF27A4E2C, 0x57A912E7,
-		0x19199215, 0xBCCACEDE, 0x12B85A58, 0xB76B0693,
-		0x0F5B038E, 0xAA885F45, 0x04FACBC3, 0xA1299708,
-		0x749BC1F9, 0xD1489D32, 0x7F3A09B4, 0xDAE9557F,
-		0x62D95062, 0xC70A0CA9, 0x6978982F, 0xCCABC4E4
-	}, {
-		0x00000000, 0xB40B77A6, 0x29119F97, 0x9D1AE831,
-		0x13244FF4, 0xA72F3852, 0x3A35D063, 0x8E3EA7C5,
-		0x674EEF33, 0xD3459895, 0x4E5F70A4, 0xFA540702,
-		0x746AA0C7, 0xC061D761, 0x5D7B3F50, 0xE97048F6,
-		0xCE9CDE67, 0x7A97A9C1, 0xE78D41F0, 0x53863656,
-		0xDDB89193, 0x69B3E635, 0xF4A90E04, 0x40A279A2,
-		0xA9D23154, 0x1DD946F2, 0x80C3AEC3, 0x34C8D965,
-		0xBAF67EA0, 0x0EFD0906, 0x93E7E137, 0x27EC9691,
-		0x9C39BDCF, 0x2832CA69, 0xB5282258, 0x012355FE,
-		0x8F1DF23B, 0x3B16859D, 0xA60C6DAC, 0x12071A0A,
-		0xFB7752FC, 0x4F7C255A, 0xD266CD6B, 0x666DBACD,
-		0xE8531D08, 0x5C586AAE, 0xC142829F, 0x7549F539,
-		0x52A563A8, 0xE6AE140E, 0x7BB4FC3F, 0xCFBF8B99,
-		0x41812C5C, 0xF58A5BFA, 0x6890B3CB, 0xDC9BC46D,
-		0x35EB8C9B, 0x81E0FB3D, 0x1CFA130C, 0xA8F164AA,
-		0x26CFC36F, 0x92C4B4C9, 0x0FDE5CF8, 0xBBD52B5E,
-		0x79750B44, 0xCD7E7CE2, 0x506494D3, 0xE46FE375,
-		0x6A5144B0, 0xDE5A3316, 0x4340DB27, 0xF74BAC81,
-		0x1E3BE477, 0xAA3093D1, 0x372A7BE0, 0x83210C46,
-		0x0D1FAB83, 0xB914DC25, 0x240E3414, 0x900543B2,
-		0xB7E9D523, 0x03E2A285, 0x9EF84AB4, 0x2AF33D12,
-		0xA4CD9AD7, 0x10C6ED71, 0x8DDC0540, 0x39D772E6,
-		0xD0A73A10, 0x64AC4DB6, 0xF9B6A587, 0x4DBDD221,
-		0xC38375E4, 0x77880242, 0xEA92EA73, 0x5E999DD5,
-		0xE54CB68B, 0x5147C12D, 0xCC5D291C, 0x78565EBA,
-		0xF668F97F, 0x42638ED9, 0xDF7966E8, 0x6B72114E,
-		0x820259B8, 0x36092E1E, 0xAB13C62F, 0x1F18B189,
-		0x9126164C, 0x252D61EA, 0xB83789DB, 0x0C3CFE7D,
-		0x2BD068EC, 0x9FDB1F4A, 0x02C1F77B, 0xB6CA80DD,
-		0x38F42718, 0x8CFF50BE, 0x11E5B88F, 0xA5EECF29,
-		0x4C9E87DF, 0xF895F079, 0x658F1848, 0xD1846FEE,
-		0x5FBAC82B, 0xEBB1BF8D, 0x76AB57BC, 0xC2A0201A,
-		0xF2EA1688, 0x46E1612E, 0xDBFB891F, 0x6FF0FEB9,
-		0xE1CE597C, 0x55C52EDA, 0xC8DFC6EB, 0x7CD4B14D,
-		0x95A4F9BB, 0x21AF8E1D, 0xBCB5662C, 0x08BE118A,
-		0x8680B64F, 0x328BC1E9, 0xAF9129D8, 0x1B9A5E7E,
-		0x3C76C8EF, 0x887DBF49, 0x15675778, 0xA16C20DE,
-		0x2F52871B, 0x9B59F0BD, 0x0643188C, 0xB2486F2A,
-		0x5B3827DC, 0xEF33507A, 0x7229B84B, 0xC622CFED,
-		0x481C6828, 0xFC171F8E, 0x610DF7BF, 0xD5068019,
-		0x6ED3AB47, 0xDAD8DCE1, 0x47C234D0, 0xF3C94376,
-		0x7DF7E4B3, 0xC9FC9315, 0x54E67B24, 0xE0ED0C82,
-		0x099D4474, 0xBD9633D2, 0x208CDBE3, 0x9487AC45,
-		0x1AB90B80, 0xAEB27C26, 0x33A89417, 0x87A3E3B1,
-		0xA04F7520, 0x14440286, 0x895EEAB7, 0x3D559D11,
-		0xB36B3AD4, 0x07604D72, 0x9A7AA543, 0x2E71D2E5,
-		0xC7019A13, 0x730AEDB5, 0xEE100584, 0x5A1B7222,
-		0xD425D5E7, 0x602EA241, 0xFD344A70, 0x493F3DD6,
-		0x8B9F1DCC, 0x3F946A6A, 0xA28E825B, 0x1685F5FD,
-		0x98BB5238, 0x2CB0259E, 0xB1AACDAF, 0x05A1BA09,
-		0xECD1F2FF, 0x58DA8559, 0xC5C06D68, 0x71CB1ACE,
-		0xFFF5BD0B, 0x4BFECAAD, 0xD6E4229C, 0x62EF553A,
-		0x4503C3AB, 0xF108B40D, 0x6C125C3C, 0xD8192B9A,
-		0x56278C5F, 0xE22CFBF9, 0x7F3613C8, 0xCB3D646E,
-		0x224D2C98, 0x96465B3E, 0x0B5CB30F, 0xBF57C4A9,
-		0x3169636C, 0x856214CA, 0x1878FCFB, 0xAC738B5D,
-		0x17A6A003, 0xA3ADD7A5, 0x3EB73F94, 0x8ABC4832,
-		0x0482EFF7, 0xB0899851, 0x2D937060, 0x999807C6,
-		0x70E84F30, 0xC4E33896, 0x59F9D0A7, 0xEDF2A701,
-		0x63CC00C4, 0xD7C77762, 0x4ADD9F53, 0xFED6E8F5,
-		0xD93A7E64, 0x6D3109C2, 0xF02BE1F3, 0x44209655,
-		0xCA1E3190, 0x7E154636, 0xE30FAE07, 0x5704D9A1,
-		0xBE749157, 0x0A7FE6F1, 0x97650EC0, 0x236E7966,
-		0xAD50DEA3, 0x195BA905, 0x84414134, 0x304A3692
-	}, {
-		0x00000000, 0x9E00AACC, 0x7D072542, 0xE3078F8E,
-		0xFA0E4A84, 0x640EE048, 0x87096FC6, 0x1909C50A,
-		0xB51BE5D3, 0x2B1B4F1F, 0xC81CC091, 0x561C6A5D,
-		0x4F15AF57, 0xD115059B, 0x32128A15, 0xAC1220D9,
-		0x2B31BB7C, 0xB53111B0, 0x56369E3E, 0xC83634F2,
-		0xD13FF1F8, 0x4F3F5B34, 0xAC38D4BA, 0x32387E76,
-		0x9E2A5EAF, 0x002AF463, 0xE32D7BED, 0x7D2DD121,
-		0x6424142B, 0xFA24BEE7, 0x19233169, 0x87239BA5,
-		0x566276F9, 0xC862DC35, 0x2B6553BB, 0xB565F977,
-		0xAC6C3C7D, 0x326C96B1, 0xD16B193F, 0x4F6BB3F3,
-		0xE379932A, 0x7D7939E6, 0x9E7EB668, 0x007E1CA4,
-		0x1977D9AE, 0x87777362, 0x6470FCEC, 0xFA705620,
-		0x7D53CD85, 0xE3536749, 0x0054E8C7, 0x9E54420B,
-		0x875D8701, 0x195D2DCD, 0xFA5AA243, 0x645A088F,
-		0xC8482856, 0x5648829A, 0xB54F0D14, 0x2B4FA7D8,
-		0x324662D2, 0xAC46C81E, 0x4F414790, 0xD141ED5C,
-		0xEDC29D29, 0x73C237E5, 0x90C5B86B, 0x0EC512A7,
-		0x17CCD7AD, 0x89CC7D61, 0x6ACBF2EF, 0xF4CB5823,
-		0x58D978FA, 0xC6D9D236, 0x25DE5DB8, 0xBBDEF774,
-		0xA2D7327E, 0x3CD798B2, 0xDFD0173C, 0x41D0BDF0,
-		0xC6F32655, 0x58F38C99, 0xBBF40317, 0x25F4A9DB,
-		0x3CFD6CD1, 0xA2FDC61D, 0x41FA4993, 0xDFFAE35F,
-		0x73E8C386, 0xEDE8694A, 0x0EEFE6C4, 0x90EF4C08,
-		0x89E68902, 0x17E623CE, 0xF4E1AC40, 0x6AE1068C,
-		0xBBA0EBD0, 0x25A0411C, 0xC6A7CE92, 0x58A7645E,
-		0x41AEA154, 0xDFAE0B98, 0x3CA98416, 0xA2A92EDA,
-		0x0EBB0E03, 0x90BBA4CF, 0x73BC2B41, 0xEDBC818D,
-		0xF4B54487, 0x6AB5EE4B, 0x89B261C5, 0x17B2CB09,
-		0x909150AC, 0x0E91FA60, 0xED9675EE, 0x7396DF22,
-		0x6A9F1A28, 0xF49FB0E4, 0x17983F6A, 0x899895A6,
-		0x258AB57F, 0xBB8A1FB3, 0x588D903D, 0xC68D3AF1,
-		0xDF84FFFB, 0x41845537, 0xA283DAB9, 0x3C837075,
-		0xDA853B53, 0x4485919F, 0xA7821E11, 0x3982B4DD,
-		0x208B71D7, 0xBE8BDB1B, 0x5D8C5495, 0xC38CFE59,
-		0x6F9EDE80, 0xF19E744C, 0x1299FBC2, 0x8C99510E,
-		0x95909404, 0x0B903EC8, 0xE897B146, 0x76971B8A,
-		0xF1B4802F, 0x6FB42AE3, 0x8CB3A56D, 0x12B30FA1,
-		0x0BBACAAB, 0x95BA6067, 0x76BDEFE9, 0xE8BD4525,
-		0x44AF65FC, 0xDAAFCF30, 0x39A840BE, 0xA7A8EA72,
-		0xBEA12F78, 0x20A185B4, 0xC3A60A3A, 0x5DA6A0F6,
-		0x8CE74DAA, 0x12E7E766, 0xF1E068E8, 0x6FE0C224,
-		0x76E9072E, 0xE8E9ADE2, 0x0BEE226C, 0x95EE88A0,
-		0x39FCA879, 0xA7FC02B5, 0x44FB8D3B, 0xDAFB27F7,
-		0xC3F2E2FD, 0x5DF24831, 0xBEF5C7BF, 0x20F56D73,
-		0xA7D6F6D6, 0x39D65C1A, 0xDAD1D394, 0x44D17958,
-		0x5DD8BC52, 0xC3D8169E, 0x20DF9910, 0xBEDF33DC,
-		0x12CD1305, 0x8CCDB9C9, 0x6FCA3647, 0xF1CA9C8B,
-		0xE8C35981, 0x76C3F34D, 0x95C47CC3, 0x0BC4D60F,
-		0x3747A67A, 0xA9470CB6, 0x4A408338, 0xD44029F4,
-		0xCD49ECFE, 0x53494632, 0xB04EC9BC, 0x2E4E6370,
-		0x825C43A9, 0x1C5CE965, 0xFF5B66EB, 0x615BCC27,
-		0x7852092D, 0xE652A3E1, 0x05552C6F, 0x9B5586A3,
-		0x1C761D06, 0x8276B7CA, 0x61713844, 0xFF719288,
-		0xE6785782, 0x7878FD4E, 0x9B7F72C0, 0x057FD80C,
-		0xA96DF8D5, 0x376D5219, 0xD46ADD97, 0x4A6A775B,
-		0x5363B251, 0xCD63189D, 0x2E649713, 0xB0643DDF,
-		0x6125D083, 0xFF257A4F, 0x1C22F5C1, 0x82225F0D,
-		0x9B2B9A07, 0x052B30CB, 0xE62CBF45, 0x782C1589,
-		0xD43E3550, 0x4A3E9F9C, 0xA9391012, 0x3739BADE,
-		0x2E307FD4, 0xB030D518, 0x53375A96, 0xCD37F05A,
-		0x4A146BFF, 0xD414C133, 0x37134EBD, 0xA913E471,
-		0xB01A217B, 0x2E1A8BB7, 0xCD1D0439, 0x531DAEF5,
-		0xFF0F8E2C, 0x610F24E0, 0x8208AB6E, 0x1C0801A2,
-		0x0501C4A8, 0x9B016E64, 0x7806E1EA, 0xE6064B26
-	}
-};
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_table.c r-base-3.3.1/src/extra/xz/check/crc32_table.c
--- r-base-3.2.3/src/extra/xz/check/crc32_table.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_table.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc32_table.c
-/// \brief      Precalculated CRC32 table with correct endianness
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-#ifdef WORDS_BIGENDIAN
-#	include "crc32_table_be.h"
-#else
-#	include "crc32_table_le.h"
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_tablegen.c r-base-3.3.1/src/extra/xz/check/crc32_tablegen.c
--- r-base-3.2.3/src/extra/xz/check/crc32_tablegen.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_tablegen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc32_tablegen.c
-/// \brief      Generate crc32_table_le.h and crc32_table_be.h
-///
-/// Compiling: gcc -std=c99 -o crc32_tablegen crc32_tablegen.c
-/// Add -DWORDS_BIGENDIAN to generate big endian table.
-/// Add -DLZ_HASH_TABLE to generate lz_encoder_hash_table.h (little endian).
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include "../../common/tuklib_integer.h"
-
-
-static uint32_t crc32_table[8][256];
-
-
-static void
-init_crc32_table(void)
-{
-	static const uint32_t poly32 = UINT32_C(0xEDB88320);
-
-	for (size_t s = 0; s < 8; ++s) {
-		for (size_t b = 0; b < 256; ++b) {
-			uint32_t r = s == 0 ? b : crc32_table[s - 1][b];
-
-			for (size_t i = 0; i < 8; ++i) {
-				if (r & 1)
-					r = (r >> 1) ^ poly32;
-				else
-					r >>= 1;
-			}
-
-			crc32_table[s][b] = r;
-		}
-	}
-
-#ifdef WORDS_BIGENDIAN
-	for (size_t s = 0; s < 8; ++s)
-		for (size_t b = 0; b < 256; ++b)
-			crc32_table[s][b] = bswap32(crc32_table[s][b]);
-#endif
-
-	return;
-}
-
-
-static void
-print_crc32_table(void)
-{
-	printf("/* This file has been automatically generated by "
-			"crc32_tablegen.c. */\n\n"
-			"const uint32_t lzma_crc32_table[8][256] = {\n\t{");
-
-	for (size_t s = 0; s < 8; ++s) {
-		for (size_t b = 0; b < 256; ++b) {
-			if ((b % 4) == 0)
-				printf("\n\t\t");
-
-			printf("0x%08" PRIX32, crc32_table[s][b]);
-
-			if (b != 255)
-				printf(",%s", (b+1) % 4 == 0 ? "" : " ");
-		}
-
-		if (s == 7)
-			printf("\n\t}\n};\n");
-		else
-			printf("\n\t}, {");
-	}
-
-	return;
-}
-
-
-static void
-print_lz_table(void)
-{
-	printf("/* This file has been automatically generated by "
-			"crc32_tablegen.c. */\n\n"
-			"const uint32_t lzma_lz_hash_table[256] = {");
-
-	for (size_t b = 0; b < 256; ++b) {
-		if ((b % 4) == 0)
-			printf("\n\t");
-
-		printf("0x%08" PRIX32, crc32_table[0][b]);
-
-		if (b != 255)
-			printf(",%s", (b+1) % 4 == 0 ? "" : " ");
-	}
-
-	printf("\n};\n");
-
-	return;
-}
-
-
-int
-main(void)
-{
-	init_crc32_table();
-
-#ifdef LZ_HASH_TABLE
-	print_lz_table();
-#else
-	print_crc32_table();
-#endif
-
-	return 0;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_table_le.h r-base-3.3.1/src/extra/xz/check/crc32_table_le.h
--- r-base-3.2.3/src/extra/xz/check/crc32_table_le.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_table_le.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,525 +0,0 @@
-/* This file has been automatically generated by crc32_tablegen.c. */
-
-const uint32_t lzma_crc32_table[8][256] = {
-	{
-		0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-		0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-		0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-		0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-		0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-		0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-		0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-		0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-		0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-		0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-		0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-		0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-		0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-		0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-		0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-		0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-		0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-		0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-		0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-		0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-		0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-		0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-		0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-		0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-		0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-		0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-		0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-		0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-		0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-		0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-		0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-		0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-		0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-		0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-		0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-		0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-		0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-		0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-		0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-		0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-		0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-		0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-		0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-		0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-		0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-		0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-		0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-		0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-		0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-		0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-		0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-		0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-		0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-		0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-		0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-		0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-		0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-		0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-		0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-		0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-		0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-		0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-		0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-		0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-	}, {
-		0x00000000, 0x191B3141, 0x32366282, 0x2B2D53C3,
-		0x646CC504, 0x7D77F445, 0x565AA786, 0x4F4196C7,
-		0xC8D98A08, 0xD1C2BB49, 0xFAEFE88A, 0xE3F4D9CB,
-		0xACB54F0C, 0xB5AE7E4D, 0x9E832D8E, 0x87981CCF,
-		0x4AC21251, 0x53D92310, 0x78F470D3, 0x61EF4192,
-		0x2EAED755, 0x37B5E614, 0x1C98B5D7, 0x05838496,
-		0x821B9859, 0x9B00A918, 0xB02DFADB, 0xA936CB9A,
-		0xE6775D5D, 0xFF6C6C1C, 0xD4413FDF, 0xCD5A0E9E,
-		0x958424A2, 0x8C9F15E3, 0xA7B24620, 0xBEA97761,
-		0xF1E8E1A6, 0xE8F3D0E7, 0xC3DE8324, 0xDAC5B265,
-		0x5D5DAEAA, 0x44469FEB, 0x6F6BCC28, 0x7670FD69,
-		0x39316BAE, 0x202A5AEF, 0x0B07092C, 0x121C386D,
-		0xDF4636F3, 0xC65D07B2, 0xED705471, 0xF46B6530,
-		0xBB2AF3F7, 0xA231C2B6, 0x891C9175, 0x9007A034,
-		0x179FBCFB, 0x0E848DBA, 0x25A9DE79, 0x3CB2EF38,
-		0x73F379FF, 0x6AE848BE, 0x41C51B7D, 0x58DE2A3C,
-		0xF0794F05, 0xE9627E44, 0xC24F2D87, 0xDB541CC6,
-		0x94158A01, 0x8D0EBB40, 0xA623E883, 0xBF38D9C2,
-		0x38A0C50D, 0x21BBF44C, 0x0A96A78F, 0x138D96CE,
-		0x5CCC0009, 0x45D73148, 0x6EFA628B, 0x77E153CA,
-		0xBABB5D54, 0xA3A06C15, 0x888D3FD6, 0x91960E97,
-		0xDED79850, 0xC7CCA911, 0xECE1FAD2, 0xF5FACB93,
-		0x7262D75C, 0x6B79E61D, 0x4054B5DE, 0x594F849F,
-		0x160E1258, 0x0F152319, 0x243870DA, 0x3D23419B,
-		0x65FD6BA7, 0x7CE65AE6, 0x57CB0925, 0x4ED03864,
-		0x0191AEA3, 0x188A9FE2, 0x33A7CC21, 0x2ABCFD60,
-		0xAD24E1AF, 0xB43FD0EE, 0x9F12832D, 0x8609B26C,
-		0xC94824AB, 0xD05315EA, 0xFB7E4629, 0xE2657768,
-		0x2F3F79F6, 0x362448B7, 0x1D091B74, 0x04122A35,
-		0x4B53BCF2, 0x52488DB3, 0x7965DE70, 0x607EEF31,
-		0xE7E6F3FE, 0xFEFDC2BF, 0xD5D0917C, 0xCCCBA03D,
-		0x838A36FA, 0x9A9107BB, 0xB1BC5478, 0xA8A76539,
-		0x3B83984B, 0x2298A90A, 0x09B5FAC9, 0x10AECB88,
-		0x5FEF5D4F, 0x46F46C0E, 0x6DD93FCD, 0x74C20E8C,
-		0xF35A1243, 0xEA412302, 0xC16C70C1, 0xD8774180,
-		0x9736D747, 0x8E2DE606, 0xA500B5C5, 0xBC1B8484,
-		0x71418A1A, 0x685ABB5B, 0x4377E898, 0x5A6CD9D9,
-		0x152D4F1E, 0x0C367E5F, 0x271B2D9C, 0x3E001CDD,
-		0xB9980012, 0xA0833153, 0x8BAE6290, 0x92B553D1,
-		0xDDF4C516, 0xC4EFF457, 0xEFC2A794, 0xF6D996D5,
-		0xAE07BCE9, 0xB71C8DA8, 0x9C31DE6B, 0x852AEF2A,
-		0xCA6B79ED, 0xD37048AC, 0xF85D1B6F, 0xE1462A2E,
-		0x66DE36E1, 0x7FC507A0, 0x54E85463, 0x4DF36522,
-		0x02B2F3E5, 0x1BA9C2A4, 0x30849167, 0x299FA026,
-		0xE4C5AEB8, 0xFDDE9FF9, 0xD6F3CC3A, 0xCFE8FD7B,
-		0x80A96BBC, 0x99B25AFD, 0xB29F093E, 0xAB84387F,
-		0x2C1C24B0, 0x350715F1, 0x1E2A4632, 0x07317773,
-		0x4870E1B4, 0x516BD0F5, 0x7A468336, 0x635DB277,
-		0xCBFAD74E, 0xD2E1E60F, 0xF9CCB5CC, 0xE0D7848D,
-		0xAF96124A, 0xB68D230B, 0x9DA070C8, 0x84BB4189,
-		0x03235D46, 0x1A386C07, 0x31153FC4, 0x280E0E85,
-		0x674F9842, 0x7E54A903, 0x5579FAC0, 0x4C62CB81,
-		0x8138C51F, 0x9823F45E, 0xB30EA79D, 0xAA1596DC,
-		0xE554001B, 0xFC4F315A, 0xD7626299, 0xCE7953D8,
-		0x49E14F17, 0x50FA7E56, 0x7BD72D95, 0x62CC1CD4,
-		0x2D8D8A13, 0x3496BB52, 0x1FBBE891, 0x06A0D9D0,
-		0x5E7EF3EC, 0x4765C2AD, 0x6C48916E, 0x7553A02F,
-		0x3A1236E8, 0x230907A9, 0x0824546A, 0x113F652B,
-		0x96A779E4, 0x8FBC48A5, 0xA4911B66, 0xBD8A2A27,
-		0xF2CBBCE0, 0xEBD08DA1, 0xC0FDDE62, 0xD9E6EF23,
-		0x14BCE1BD, 0x0DA7D0FC, 0x268A833F, 0x3F91B27E,
-		0x70D024B9, 0x69CB15F8, 0x42E6463B, 0x5BFD777A,
-		0xDC656BB5, 0xC57E5AF4, 0xEE530937, 0xF7483876,
-		0xB809AEB1, 0xA1129FF0, 0x8A3FCC33, 0x9324FD72
-	}, {
-		0x00000000, 0x01C26A37, 0x0384D46E, 0x0246BE59,
-		0x0709A8DC, 0x06CBC2EB, 0x048D7CB2, 0x054F1685,
-		0x0E1351B8, 0x0FD13B8F, 0x0D9785D6, 0x0C55EFE1,
-		0x091AF964, 0x08D89353, 0x0A9E2D0A, 0x0B5C473D,
-		0x1C26A370, 0x1DE4C947, 0x1FA2771E, 0x1E601D29,
-		0x1B2F0BAC, 0x1AED619B, 0x18ABDFC2, 0x1969B5F5,
-		0x1235F2C8, 0x13F798FF, 0x11B126A6, 0x10734C91,
-		0x153C5A14, 0x14FE3023, 0x16B88E7A, 0x177AE44D,
-		0x384D46E0, 0x398F2CD7, 0x3BC9928E, 0x3A0BF8B9,
-		0x3F44EE3C, 0x3E86840B, 0x3CC03A52, 0x3D025065,
-		0x365E1758, 0x379C7D6F, 0x35DAC336, 0x3418A901,
-		0x3157BF84, 0x3095D5B3, 0x32D36BEA, 0x331101DD,
-		0x246BE590, 0x25A98FA7, 0x27EF31FE, 0x262D5BC9,
-		0x23624D4C, 0x22A0277B, 0x20E69922, 0x2124F315,
-		0x2A78B428, 0x2BBADE1F, 0x29FC6046, 0x283E0A71,
-		0x2D711CF4, 0x2CB376C3, 0x2EF5C89A, 0x2F37A2AD,
-		0x709A8DC0, 0x7158E7F7, 0x731E59AE, 0x72DC3399,
-		0x7793251C, 0x76514F2B, 0x7417F172, 0x75D59B45,
-		0x7E89DC78, 0x7F4BB64F, 0x7D0D0816, 0x7CCF6221,
-		0x798074A4, 0x78421E93, 0x7A04A0CA, 0x7BC6CAFD,
-		0x6CBC2EB0, 0x6D7E4487, 0x6F38FADE, 0x6EFA90E9,
-		0x6BB5866C, 0x6A77EC5B, 0x68315202, 0x69F33835,
-		0x62AF7F08, 0x636D153F, 0x612BAB66, 0x60E9C151,
-		0x65A6D7D4, 0x6464BDE3, 0x662203BA, 0x67E0698D,
-		0x48D7CB20, 0x4915A117, 0x4B531F4E, 0x4A917579,
-		0x4FDE63FC, 0x4E1C09CB, 0x4C5AB792, 0x4D98DDA5,
-		0x46C49A98, 0x4706F0AF, 0x45404EF6, 0x448224C1,
-		0x41CD3244, 0x400F5873, 0x4249E62A, 0x438B8C1D,
-		0x54F16850, 0x55330267, 0x5775BC3E, 0x56B7D609,
-		0x53F8C08C, 0x523AAABB, 0x507C14E2, 0x51BE7ED5,
-		0x5AE239E8, 0x5B2053DF, 0x5966ED86, 0x58A487B1,
-		0x5DEB9134, 0x5C29FB03, 0x5E6F455A, 0x5FAD2F6D,
-		0xE1351B80, 0xE0F771B7, 0xE2B1CFEE, 0xE373A5D9,
-		0xE63CB35C, 0xE7FED96B, 0xE5B86732, 0xE47A0D05,
-		0xEF264A38, 0xEEE4200F, 0xECA29E56, 0xED60F461,
-		0xE82FE2E4, 0xE9ED88D3, 0xEBAB368A, 0xEA695CBD,
-		0xFD13B8F0, 0xFCD1D2C7, 0xFE976C9E, 0xFF5506A9,
-		0xFA1A102C, 0xFBD87A1B, 0xF99EC442, 0xF85CAE75,
-		0xF300E948, 0xF2C2837F, 0xF0843D26, 0xF1465711,
-		0xF4094194, 0xF5CB2BA3, 0xF78D95FA, 0xF64FFFCD,
-		0xD9785D60, 0xD8BA3757, 0xDAFC890E, 0xDB3EE339,
-		0xDE71F5BC, 0xDFB39F8B, 0xDDF521D2, 0xDC374BE5,
-		0xD76B0CD8, 0xD6A966EF, 0xD4EFD8B6, 0xD52DB281,
-		0xD062A404, 0xD1A0CE33, 0xD3E6706A, 0xD2241A5D,
-		0xC55EFE10, 0xC49C9427, 0xC6DA2A7E, 0xC7184049,
-		0xC25756CC, 0xC3953CFB, 0xC1D382A2, 0xC011E895,
-		0xCB4DAFA8, 0xCA8FC59F, 0xC8C97BC6, 0xC90B11F1,
-		0xCC440774, 0xCD866D43, 0xCFC0D31A, 0xCE02B92D,
-		0x91AF9640, 0x906DFC77, 0x922B422E, 0x93E92819,
-		0x96A63E9C, 0x976454AB, 0x9522EAF2, 0x94E080C5,
-		0x9FBCC7F8, 0x9E7EADCF, 0x9C381396, 0x9DFA79A1,
-		0x98B56F24, 0x99770513, 0x9B31BB4A, 0x9AF3D17D,
-		0x8D893530, 0x8C4B5F07, 0x8E0DE15E, 0x8FCF8B69,
-		0x8A809DEC, 0x8B42F7DB, 0x89044982, 0x88C623B5,
-		0x839A6488, 0x82580EBF, 0x801EB0E6, 0x81DCDAD1,
-		0x8493CC54, 0x8551A663, 0x8717183A, 0x86D5720D,
-		0xA9E2D0A0, 0xA820BA97, 0xAA6604CE, 0xABA46EF9,
-		0xAEEB787C, 0xAF29124B, 0xAD6FAC12, 0xACADC625,
-		0xA7F18118, 0xA633EB2F, 0xA4755576, 0xA5B73F41,
-		0xA0F829C4, 0xA13A43F3, 0xA37CFDAA, 0xA2BE979D,
-		0xB5C473D0, 0xB40619E7, 0xB640A7BE, 0xB782CD89,
-		0xB2CDDB0C, 0xB30FB13B, 0xB1490F62, 0xB08B6555,
-		0xBBD72268, 0xBA15485F, 0xB853F606, 0xB9919C31,
-		0xBCDE8AB4, 0xBD1CE083, 0xBF5A5EDA, 0xBE9834ED
-	}, {
-		0x00000000, 0xB8BC6765, 0xAA09C88B, 0x12B5AFEE,
-		0x8F629757, 0x37DEF032, 0x256B5FDC, 0x9DD738B9,
-		0xC5B428EF, 0x7D084F8A, 0x6FBDE064, 0xD7018701,
-		0x4AD6BFB8, 0xF26AD8DD, 0xE0DF7733, 0x58631056,
-		0x5019579F, 0xE8A530FA, 0xFA109F14, 0x42ACF871,
-		0xDF7BC0C8, 0x67C7A7AD, 0x75720843, 0xCDCE6F26,
-		0x95AD7F70, 0x2D111815, 0x3FA4B7FB, 0x8718D09E,
-		0x1ACFE827, 0xA2738F42, 0xB0C620AC, 0x087A47C9,
-		0xA032AF3E, 0x188EC85B, 0x0A3B67B5, 0xB28700D0,
-		0x2F503869, 0x97EC5F0C, 0x8559F0E2, 0x3DE59787,
-		0x658687D1, 0xDD3AE0B4, 0xCF8F4F5A, 0x7733283F,
-		0xEAE41086, 0x525877E3, 0x40EDD80D, 0xF851BF68,
-		0xF02BF8A1, 0x48979FC4, 0x5A22302A, 0xE29E574F,
-		0x7F496FF6, 0xC7F50893, 0xD540A77D, 0x6DFCC018,
-		0x359FD04E, 0x8D23B72B, 0x9F9618C5, 0x272A7FA0,
-		0xBAFD4719, 0x0241207C, 0x10F48F92, 0xA848E8F7,
-		0x9B14583D, 0x23A83F58, 0x311D90B6, 0x89A1F7D3,
-		0x1476CF6A, 0xACCAA80F, 0xBE7F07E1, 0x06C36084,
-		0x5EA070D2, 0xE61C17B7, 0xF4A9B859, 0x4C15DF3C,
-		0xD1C2E785, 0x697E80E0, 0x7BCB2F0E, 0xC377486B,
-		0xCB0D0FA2, 0x73B168C7, 0x6104C729, 0xD9B8A04C,
-		0x446F98F5, 0xFCD3FF90, 0xEE66507E, 0x56DA371B,
-		0x0EB9274D, 0xB6054028, 0xA4B0EFC6, 0x1C0C88A3,
-		0x81DBB01A, 0x3967D77F, 0x2BD27891, 0x936E1FF4,
-		0x3B26F703, 0x839A9066, 0x912F3F88, 0x299358ED,
-		0xB4446054, 0x0CF80731, 0x1E4DA8DF, 0xA6F1CFBA,
-		0xFE92DFEC, 0x462EB889, 0x549B1767, 0xEC277002,
-		0x71F048BB, 0xC94C2FDE, 0xDBF98030, 0x6345E755,
-		0x6B3FA09C, 0xD383C7F9, 0xC1366817, 0x798A0F72,
-		0xE45D37CB, 0x5CE150AE, 0x4E54FF40, 0xF6E89825,
-		0xAE8B8873, 0x1637EF16, 0x048240F8, 0xBC3E279D,
-		0x21E91F24, 0x99557841, 0x8BE0D7AF, 0x335CB0CA,
-		0xED59B63B, 0x55E5D15E, 0x47507EB0, 0xFFEC19D5,
-		0x623B216C, 0xDA874609, 0xC832E9E7, 0x708E8E82,
-		0x28ED9ED4, 0x9051F9B1, 0x82E4565F, 0x3A58313A,
-		0xA78F0983, 0x1F336EE6, 0x0D86C108, 0xB53AA66D,
-		0xBD40E1A4, 0x05FC86C1, 0x1749292F, 0xAFF54E4A,
-		0x322276F3, 0x8A9E1196, 0x982BBE78, 0x2097D91D,
-		0x78F4C94B, 0xC048AE2E, 0xD2FD01C0, 0x6A4166A5,
-		0xF7965E1C, 0x4F2A3979, 0x5D9F9697, 0xE523F1F2,
-		0x4D6B1905, 0xF5D77E60, 0xE762D18E, 0x5FDEB6EB,
-		0xC2098E52, 0x7AB5E937, 0x680046D9, 0xD0BC21BC,
-		0x88DF31EA, 0x3063568F, 0x22D6F961, 0x9A6A9E04,
-		0x07BDA6BD, 0xBF01C1D8, 0xADB46E36, 0x15080953,
-		0x1D724E9A, 0xA5CE29FF, 0xB77B8611, 0x0FC7E174,
-		0x9210D9CD, 0x2AACBEA8, 0x38191146, 0x80A57623,
-		0xD8C66675, 0x607A0110, 0x72CFAEFE, 0xCA73C99B,
-		0x57A4F122, 0xEF189647, 0xFDAD39A9, 0x45115ECC,
-		0x764DEE06, 0xCEF18963, 0xDC44268D, 0x64F841E8,
-		0xF92F7951, 0x41931E34, 0x5326B1DA, 0xEB9AD6BF,
-		0xB3F9C6E9, 0x0B45A18C, 0x19F00E62, 0xA14C6907,
-		0x3C9B51BE, 0x842736DB, 0x96929935, 0x2E2EFE50,
-		0x2654B999, 0x9EE8DEFC, 0x8C5D7112, 0x34E11677,
-		0xA9362ECE, 0x118A49AB, 0x033FE645, 0xBB838120,
-		0xE3E09176, 0x5B5CF613, 0x49E959FD, 0xF1553E98,
-		0x6C820621, 0xD43E6144, 0xC68BCEAA, 0x7E37A9CF,
-		0xD67F4138, 0x6EC3265D, 0x7C7689B3, 0xC4CAEED6,
-		0x591DD66F, 0xE1A1B10A, 0xF3141EE4, 0x4BA87981,
-		0x13CB69D7, 0xAB770EB2, 0xB9C2A15C, 0x017EC639,
-		0x9CA9FE80, 0x241599E5, 0x36A0360B, 0x8E1C516E,
-		0x866616A7, 0x3EDA71C2, 0x2C6FDE2C, 0x94D3B949,
-		0x090481F0, 0xB1B8E695, 0xA30D497B, 0x1BB12E1E,
-		0x43D23E48, 0xFB6E592D, 0xE9DBF6C3, 0x516791A6,
-		0xCCB0A91F, 0x740CCE7A, 0x66B96194, 0xDE0506F1
-	}, {
-		0x00000000, 0x3D6029B0, 0x7AC05360, 0x47A07AD0,
-		0xF580A6C0, 0xC8E08F70, 0x8F40F5A0, 0xB220DC10,
-		0x30704BC1, 0x0D106271, 0x4AB018A1, 0x77D03111,
-		0xC5F0ED01, 0xF890C4B1, 0xBF30BE61, 0x825097D1,
-		0x60E09782, 0x5D80BE32, 0x1A20C4E2, 0x2740ED52,
-		0x95603142, 0xA80018F2, 0xEFA06222, 0xD2C04B92,
-		0x5090DC43, 0x6DF0F5F3, 0x2A508F23, 0x1730A693,
-		0xA5107A83, 0x98705333, 0xDFD029E3, 0xE2B00053,
-		0xC1C12F04, 0xFCA106B4, 0xBB017C64, 0x866155D4,
-		0x344189C4, 0x0921A074, 0x4E81DAA4, 0x73E1F314,
-		0xF1B164C5, 0xCCD14D75, 0x8B7137A5, 0xB6111E15,
-		0x0431C205, 0x3951EBB5, 0x7EF19165, 0x4391B8D5,
-		0xA121B886, 0x9C419136, 0xDBE1EBE6, 0xE681C256,
-		0x54A11E46, 0x69C137F6, 0x2E614D26, 0x13016496,
-		0x9151F347, 0xAC31DAF7, 0xEB91A027, 0xD6F18997,
-		0x64D15587, 0x59B17C37, 0x1E1106E7, 0x23712F57,
-		0x58F35849, 0x659371F9, 0x22330B29, 0x1F532299,
-		0xAD73FE89, 0x9013D739, 0xD7B3ADE9, 0xEAD38459,
-		0x68831388, 0x55E33A38, 0x124340E8, 0x2F236958,
-		0x9D03B548, 0xA0639CF8, 0xE7C3E628, 0xDAA3CF98,
-		0x3813CFCB, 0x0573E67B, 0x42D39CAB, 0x7FB3B51B,
-		0xCD93690B, 0xF0F340BB, 0xB7533A6B, 0x8A3313DB,
-		0x0863840A, 0x3503ADBA, 0x72A3D76A, 0x4FC3FEDA,
-		0xFDE322CA, 0xC0830B7A, 0x872371AA, 0xBA43581A,
-		0x9932774D, 0xA4525EFD, 0xE3F2242D, 0xDE920D9D,
-		0x6CB2D18D, 0x51D2F83D, 0x167282ED, 0x2B12AB5D,
-		0xA9423C8C, 0x9422153C, 0xD3826FEC, 0xEEE2465C,
-		0x5CC29A4C, 0x61A2B3FC, 0x2602C92C, 0x1B62E09C,
-		0xF9D2E0CF, 0xC4B2C97F, 0x8312B3AF, 0xBE729A1F,
-		0x0C52460F, 0x31326FBF, 0x7692156F, 0x4BF23CDF,
-		0xC9A2AB0E, 0xF4C282BE, 0xB362F86E, 0x8E02D1DE,
-		0x3C220DCE, 0x0142247E, 0x46E25EAE, 0x7B82771E,
-		0xB1E6B092, 0x8C869922, 0xCB26E3F2, 0xF646CA42,
-		0x44661652, 0x79063FE2, 0x3EA64532, 0x03C66C82,
-		0x8196FB53, 0xBCF6D2E3, 0xFB56A833, 0xC6368183,
-		0x74165D93, 0x49767423, 0x0ED60EF3, 0x33B62743,
-		0xD1062710, 0xEC660EA0, 0xABC67470, 0x96A65DC0,
-		0x248681D0, 0x19E6A860, 0x5E46D2B0, 0x6326FB00,
-		0xE1766CD1, 0xDC164561, 0x9BB63FB1, 0xA6D61601,
-		0x14F6CA11, 0x2996E3A1, 0x6E369971, 0x5356B0C1,
-		0x70279F96, 0x4D47B626, 0x0AE7CCF6, 0x3787E546,
-		0x85A73956, 0xB8C710E6, 0xFF676A36, 0xC2074386,
-		0x4057D457, 0x7D37FDE7, 0x3A978737, 0x07F7AE87,
-		0xB5D77297, 0x88B75B27, 0xCF1721F7, 0xF2770847,
-		0x10C70814, 0x2DA721A4, 0x6A075B74, 0x576772C4,
-		0xE547AED4, 0xD8278764, 0x9F87FDB4, 0xA2E7D404,
-		0x20B743D5, 0x1DD76A65, 0x5A7710B5, 0x67173905,
-		0xD537E515, 0xE857CCA5, 0xAFF7B675, 0x92979FC5,
-		0xE915E8DB, 0xD475C16B, 0x93D5BBBB, 0xAEB5920B,
-		0x1C954E1B, 0x21F567AB, 0x66551D7B, 0x5B3534CB,
-		0xD965A31A, 0xE4058AAA, 0xA3A5F07A, 0x9EC5D9CA,
-		0x2CE505DA, 0x11852C6A, 0x562556BA, 0x6B457F0A,
-		0x89F57F59, 0xB49556E9, 0xF3352C39, 0xCE550589,
-		0x7C75D999, 0x4115F029, 0x06B58AF9, 0x3BD5A349,
-		0xB9853498, 0x84E51D28, 0xC34567F8, 0xFE254E48,
-		0x4C059258, 0x7165BBE8, 0x36C5C138, 0x0BA5E888,
-		0x28D4C7DF, 0x15B4EE6F, 0x521494BF, 0x6F74BD0F,
-		0xDD54611F, 0xE03448AF, 0xA794327F, 0x9AF41BCF,
-		0x18A48C1E, 0x25C4A5AE, 0x6264DF7E, 0x5F04F6CE,
-		0xED242ADE, 0xD044036E, 0x97E479BE, 0xAA84500E,
-		0x4834505D, 0x755479ED, 0x32F4033D, 0x0F942A8D,
-		0xBDB4F69D, 0x80D4DF2D, 0xC774A5FD, 0xFA148C4D,
-		0x78441B9C, 0x4524322C, 0x028448FC, 0x3FE4614C,
-		0x8DC4BD5C, 0xB0A494EC, 0xF704EE3C, 0xCA64C78C
-	}, {
-		0x00000000, 0xCB5CD3A5, 0x4DC8A10B, 0x869472AE,
-		0x9B914216, 0x50CD91B3, 0xD659E31D, 0x1D0530B8,
-		0xEC53826D, 0x270F51C8, 0xA19B2366, 0x6AC7F0C3,
-		0x77C2C07B, 0xBC9E13DE, 0x3A0A6170, 0xF156B2D5,
-		0x03D6029B, 0xC88AD13E, 0x4E1EA390, 0x85427035,
-		0x9847408D, 0x531B9328, 0xD58FE186, 0x1ED33223,
-		0xEF8580F6, 0x24D95353, 0xA24D21FD, 0x6911F258,
-		0x7414C2E0, 0xBF481145, 0x39DC63EB, 0xF280B04E,
-		0x07AC0536, 0xCCF0D693, 0x4A64A43D, 0x81387798,
-		0x9C3D4720, 0x57619485, 0xD1F5E62B, 0x1AA9358E,
-		0xEBFF875B, 0x20A354FE, 0xA6372650, 0x6D6BF5F5,
-		0x706EC54D, 0xBB3216E8, 0x3DA66446, 0xF6FAB7E3,
-		0x047A07AD, 0xCF26D408, 0x49B2A6A6, 0x82EE7503,
-		0x9FEB45BB, 0x54B7961E, 0xD223E4B0, 0x197F3715,
-		0xE82985C0, 0x23755665, 0xA5E124CB, 0x6EBDF76E,
-		0x73B8C7D6, 0xB8E41473, 0x3E7066DD, 0xF52CB578,
-		0x0F580A6C, 0xC404D9C9, 0x4290AB67, 0x89CC78C2,
-		0x94C9487A, 0x5F959BDF, 0xD901E971, 0x125D3AD4,
-		0xE30B8801, 0x28575BA4, 0xAEC3290A, 0x659FFAAF,
-		0x789ACA17, 0xB3C619B2, 0x35526B1C, 0xFE0EB8B9,
-		0x0C8E08F7, 0xC7D2DB52, 0x4146A9FC, 0x8A1A7A59,
-		0x971F4AE1, 0x5C439944, 0xDAD7EBEA, 0x118B384F,
-		0xE0DD8A9A, 0x2B81593F, 0xAD152B91, 0x6649F834,
-		0x7B4CC88C, 0xB0101B29, 0x36846987, 0xFDD8BA22,
-		0x08F40F5A, 0xC3A8DCFF, 0x453CAE51, 0x8E607DF4,
-		0x93654D4C, 0x58399EE9, 0xDEADEC47, 0x15F13FE2,
-		0xE4A78D37, 0x2FFB5E92, 0xA96F2C3C, 0x6233FF99,
-		0x7F36CF21, 0xB46A1C84, 0x32FE6E2A, 0xF9A2BD8F,
-		0x0B220DC1, 0xC07EDE64, 0x46EAACCA, 0x8DB67F6F,
-		0x90B34FD7, 0x5BEF9C72, 0xDD7BEEDC, 0x16273D79,
-		0xE7718FAC, 0x2C2D5C09, 0xAAB92EA7, 0x61E5FD02,
-		0x7CE0CDBA, 0xB7BC1E1F, 0x31286CB1, 0xFA74BF14,
-		0x1EB014D8, 0xD5ECC77D, 0x5378B5D3, 0x98246676,
-		0x852156CE, 0x4E7D856B, 0xC8E9F7C5, 0x03B52460,
-		0xF2E396B5, 0x39BF4510, 0xBF2B37BE, 0x7477E41B,
-		0x6972D4A3, 0xA22E0706, 0x24BA75A8, 0xEFE6A60D,
-		0x1D661643, 0xD63AC5E6, 0x50AEB748, 0x9BF264ED,
-		0x86F75455, 0x4DAB87F0, 0xCB3FF55E, 0x006326FB,
-		0xF135942E, 0x3A69478B, 0xBCFD3525, 0x77A1E680,
-		0x6AA4D638, 0xA1F8059D, 0x276C7733, 0xEC30A496,
-		0x191C11EE, 0xD240C24B, 0x54D4B0E5, 0x9F886340,
-		0x828D53F8, 0x49D1805D, 0xCF45F2F3, 0x04192156,
-		0xF54F9383, 0x3E134026, 0xB8873288, 0x73DBE12D,
-		0x6EDED195, 0xA5820230, 0x2316709E, 0xE84AA33B,
-		0x1ACA1375, 0xD196C0D0, 0x5702B27E, 0x9C5E61DB,
-		0x815B5163, 0x4A0782C6, 0xCC93F068, 0x07CF23CD,
-		0xF6999118, 0x3DC542BD, 0xBB513013, 0x700DE3B6,
-		0x6D08D30E, 0xA65400AB, 0x20C07205, 0xEB9CA1A0,
-		0x11E81EB4, 0xDAB4CD11, 0x5C20BFBF, 0x977C6C1A,
-		0x8A795CA2, 0x41258F07, 0xC7B1FDA9, 0x0CED2E0C,
-		0xFDBB9CD9, 0x36E74F7C, 0xB0733DD2, 0x7B2FEE77,
-		0x662ADECF, 0xAD760D6A, 0x2BE27FC4, 0xE0BEAC61,
-		0x123E1C2F, 0xD962CF8A, 0x5FF6BD24, 0x94AA6E81,
-		0x89AF5E39, 0x42F38D9C, 0xC467FF32, 0x0F3B2C97,
-		0xFE6D9E42, 0x35314DE7, 0xB3A53F49, 0x78F9ECEC,
-		0x65FCDC54, 0xAEA00FF1, 0x28347D5F, 0xE368AEFA,
-		0x16441B82, 0xDD18C827, 0x5B8CBA89, 0x90D0692C,
-		0x8DD55994, 0x46898A31, 0xC01DF89F, 0x0B412B3A,
-		0xFA1799EF, 0x314B4A4A, 0xB7DF38E4, 0x7C83EB41,
-		0x6186DBF9, 0xAADA085C, 0x2C4E7AF2, 0xE712A957,
-		0x15921919, 0xDECECABC, 0x585AB812, 0x93066BB7,
-		0x8E035B0F, 0x455F88AA, 0xC3CBFA04, 0x089729A1,
-		0xF9C19B74, 0x329D48D1, 0xB4093A7F, 0x7F55E9DA,
-		0x6250D962, 0xA90C0AC7, 0x2F987869, 0xE4C4ABCC
-	}, {
-		0x00000000, 0xA6770BB4, 0x979F1129, 0x31E81A9D,
-		0xF44F2413, 0x52382FA7, 0x63D0353A, 0xC5A73E8E,
-		0x33EF4E67, 0x959845D3, 0xA4705F4E, 0x020754FA,
-		0xC7A06A74, 0x61D761C0, 0x503F7B5D, 0xF64870E9,
-		0x67DE9CCE, 0xC1A9977A, 0xF0418DE7, 0x56368653,
-		0x9391B8DD, 0x35E6B369, 0x040EA9F4, 0xA279A240,
-		0x5431D2A9, 0xF246D91D, 0xC3AEC380, 0x65D9C834,
-		0xA07EF6BA, 0x0609FD0E, 0x37E1E793, 0x9196EC27,
-		0xCFBD399C, 0x69CA3228, 0x582228B5, 0xFE552301,
-		0x3BF21D8F, 0x9D85163B, 0xAC6D0CA6, 0x0A1A0712,
-		0xFC5277FB, 0x5A257C4F, 0x6BCD66D2, 0xCDBA6D66,
-		0x081D53E8, 0xAE6A585C, 0x9F8242C1, 0x39F54975,
-		0xA863A552, 0x0E14AEE6, 0x3FFCB47B, 0x998BBFCF,
-		0x5C2C8141, 0xFA5B8AF5, 0xCBB39068, 0x6DC49BDC,
-		0x9B8CEB35, 0x3DFBE081, 0x0C13FA1C, 0xAA64F1A8,
-		0x6FC3CF26, 0xC9B4C492, 0xF85CDE0F, 0x5E2BD5BB,
-		0x440B7579, 0xE27C7ECD, 0xD3946450, 0x75E36FE4,
-		0xB044516A, 0x16335ADE, 0x27DB4043, 0x81AC4BF7,
-		0x77E43B1E, 0xD19330AA, 0xE07B2A37, 0x460C2183,
-		0x83AB1F0D, 0x25DC14B9, 0x14340E24, 0xB2430590,
-		0x23D5E9B7, 0x85A2E203, 0xB44AF89E, 0x123DF32A,
-		0xD79ACDA4, 0x71EDC610, 0x4005DC8D, 0xE672D739,
-		0x103AA7D0, 0xB64DAC64, 0x87A5B6F9, 0x21D2BD4D,
-		0xE47583C3, 0x42028877, 0x73EA92EA, 0xD59D995E,
-		0x8BB64CE5, 0x2DC14751, 0x1C295DCC, 0xBA5E5678,
-		0x7FF968F6, 0xD98E6342, 0xE86679DF, 0x4E11726B,
-		0xB8590282, 0x1E2E0936, 0x2FC613AB, 0x89B1181F,
-		0x4C162691, 0xEA612D25, 0xDB8937B8, 0x7DFE3C0C,
-		0xEC68D02B, 0x4A1FDB9F, 0x7BF7C102, 0xDD80CAB6,
-		0x1827F438, 0xBE50FF8C, 0x8FB8E511, 0x29CFEEA5,
-		0xDF879E4C, 0x79F095F8, 0x48188F65, 0xEE6F84D1,
-		0x2BC8BA5F, 0x8DBFB1EB, 0xBC57AB76, 0x1A20A0C2,
-		0x8816EAF2, 0x2E61E146, 0x1F89FBDB, 0xB9FEF06F,
-		0x7C59CEE1, 0xDA2EC555, 0xEBC6DFC8, 0x4DB1D47C,
-		0xBBF9A495, 0x1D8EAF21, 0x2C66B5BC, 0x8A11BE08,
-		0x4FB68086, 0xE9C18B32, 0xD82991AF, 0x7E5E9A1B,
-		0xEFC8763C, 0x49BF7D88, 0x78576715, 0xDE206CA1,
-		0x1B87522F, 0xBDF0599B, 0x8C184306, 0x2A6F48B2,
-		0xDC27385B, 0x7A5033EF, 0x4BB82972, 0xEDCF22C6,
-		0x28681C48, 0x8E1F17FC, 0xBFF70D61, 0x198006D5,
-		0x47ABD36E, 0xE1DCD8DA, 0xD034C247, 0x7643C9F3,
-		0xB3E4F77D, 0x1593FCC9, 0x247BE654, 0x820CEDE0,
-		0x74449D09, 0xD23396BD, 0xE3DB8C20, 0x45AC8794,
-		0x800BB91A, 0x267CB2AE, 0x1794A833, 0xB1E3A387,
-		0x20754FA0, 0x86024414, 0xB7EA5E89, 0x119D553D,
-		0xD43A6BB3, 0x724D6007, 0x43A57A9A, 0xE5D2712E,
-		0x139A01C7, 0xB5ED0A73, 0x840510EE, 0x22721B5A,
-		0xE7D525D4, 0x41A22E60, 0x704A34FD, 0xD63D3F49,
-		0xCC1D9F8B, 0x6A6A943F, 0x5B828EA2, 0xFDF58516,
-		0x3852BB98, 0x9E25B02C, 0xAFCDAAB1, 0x09BAA105,
-		0xFFF2D1EC, 0x5985DA58, 0x686DC0C5, 0xCE1ACB71,
-		0x0BBDF5FF, 0xADCAFE4B, 0x9C22E4D6, 0x3A55EF62,
-		0xABC30345, 0x0DB408F1, 0x3C5C126C, 0x9A2B19D8,
-		0x5F8C2756, 0xF9FB2CE2, 0xC813367F, 0x6E643DCB,
-		0x982C4D22, 0x3E5B4696, 0x0FB35C0B, 0xA9C457BF,
-		0x6C636931, 0xCA146285, 0xFBFC7818, 0x5D8B73AC,
-		0x03A0A617, 0xA5D7ADA3, 0x943FB73E, 0x3248BC8A,
-		0xF7EF8204, 0x519889B0, 0x6070932D, 0xC6079899,
-		0x304FE870, 0x9638E3C4, 0xA7D0F959, 0x01A7F2ED,
-		0xC400CC63, 0x6277C7D7, 0x539FDD4A, 0xF5E8D6FE,
-		0x647E3AD9, 0xC209316D, 0xF3E12BF0, 0x55962044,
-		0x90311ECA, 0x3646157E, 0x07AE0FE3, 0xA1D90457,
-		0x579174BE, 0xF1E67F0A, 0xC00E6597, 0x66796E23,
-		0xA3DE50AD, 0x05A95B19, 0x34414184, 0x92364A30
-	}, {
-		0x00000000, 0xCCAA009E, 0x4225077D, 0x8E8F07E3,
-		0x844A0EFA, 0x48E00E64, 0xC66F0987, 0x0AC50919,
-		0xD3E51BB5, 0x1F4F1B2B, 0x91C01CC8, 0x5D6A1C56,
-		0x57AF154F, 0x9B0515D1, 0x158A1232, 0xD92012AC,
-		0x7CBB312B, 0xB01131B5, 0x3E9E3656, 0xF23436C8,
-		0xF8F13FD1, 0x345B3F4F, 0xBAD438AC, 0x767E3832,
-		0xAF5E2A9E, 0x63F42A00, 0xED7B2DE3, 0x21D12D7D,
-		0x2B142464, 0xE7BE24FA, 0x69312319, 0xA59B2387,
-		0xF9766256, 0x35DC62C8, 0xBB53652B, 0x77F965B5,
-		0x7D3C6CAC, 0xB1966C32, 0x3F196BD1, 0xF3B36B4F,
-		0x2A9379E3, 0xE639797D, 0x68B67E9E, 0xA41C7E00,
-		0xAED97719, 0x62737787, 0xECFC7064, 0x205670FA,
-		0x85CD537D, 0x496753E3, 0xC7E85400, 0x0B42549E,
-		0x01875D87, 0xCD2D5D19, 0x43A25AFA, 0x8F085A64,
-		0x562848C8, 0x9A824856, 0x140D4FB5, 0xD8A74F2B,
-		0xD2624632, 0x1EC846AC, 0x9047414F, 0x5CED41D1,
-		0x299DC2ED, 0xE537C273, 0x6BB8C590, 0xA712C50E,
-		0xADD7CC17, 0x617DCC89, 0xEFF2CB6A, 0x2358CBF4,
-		0xFA78D958, 0x36D2D9C6, 0xB85DDE25, 0x74F7DEBB,
-		0x7E32D7A2, 0xB298D73C, 0x3C17D0DF, 0xF0BDD041,
-		0x5526F3C6, 0x998CF358, 0x1703F4BB, 0xDBA9F425,
-		0xD16CFD3C, 0x1DC6FDA2, 0x9349FA41, 0x5FE3FADF,
-		0x86C3E873, 0x4A69E8ED, 0xC4E6EF0E, 0x084CEF90,
-		0x0289E689, 0xCE23E617, 0x40ACE1F4, 0x8C06E16A,
-		0xD0EBA0BB, 0x1C41A025, 0x92CEA7C6, 0x5E64A758,
-		0x54A1AE41, 0x980BAEDF, 0x1684A93C, 0xDA2EA9A2,
-		0x030EBB0E, 0xCFA4BB90, 0x412BBC73, 0x8D81BCED,
-		0x8744B5F4, 0x4BEEB56A, 0xC561B289, 0x09CBB217,
-		0xAC509190, 0x60FA910E, 0xEE7596ED, 0x22DF9673,
-		0x281A9F6A, 0xE4B09FF4, 0x6A3F9817, 0xA6959889,
-		0x7FB58A25, 0xB31F8ABB, 0x3D908D58, 0xF13A8DC6,
-		0xFBFF84DF, 0x37558441, 0xB9DA83A2, 0x7570833C,
-		0x533B85DA, 0x9F918544, 0x111E82A7, 0xDDB48239,
-		0xD7718B20, 0x1BDB8BBE, 0x95548C5D, 0x59FE8CC3,
-		0x80DE9E6F, 0x4C749EF1, 0xC2FB9912, 0x0E51998C,
-		0x04949095, 0xC83E900B, 0x46B197E8, 0x8A1B9776,
-		0x2F80B4F1, 0xE32AB46F, 0x6DA5B38C, 0xA10FB312,
-		0xABCABA0B, 0x6760BA95, 0xE9EFBD76, 0x2545BDE8,
-		0xFC65AF44, 0x30CFAFDA, 0xBE40A839, 0x72EAA8A7,
-		0x782FA1BE, 0xB485A120, 0x3A0AA6C3, 0xF6A0A65D,
-		0xAA4DE78C, 0x66E7E712, 0xE868E0F1, 0x24C2E06F,
-		0x2E07E976, 0xE2ADE9E8, 0x6C22EE0B, 0xA088EE95,
-		0x79A8FC39, 0xB502FCA7, 0x3B8DFB44, 0xF727FBDA,
-		0xFDE2F2C3, 0x3148F25D, 0xBFC7F5BE, 0x736DF520,
-		0xD6F6D6A7, 0x1A5CD639, 0x94D3D1DA, 0x5879D144,
-		0x52BCD85D, 0x9E16D8C3, 0x1099DF20, 0xDC33DFBE,
-		0x0513CD12, 0xC9B9CD8C, 0x4736CA6F, 0x8B9CCAF1,
-		0x8159C3E8, 0x4DF3C376, 0xC37CC495, 0x0FD6C40B,
-		0x7AA64737, 0xB60C47A9, 0x3883404A, 0xF42940D4,
-		0xFEEC49CD, 0x32464953, 0xBCC94EB0, 0x70634E2E,
-		0xA9435C82, 0x65E95C1C, 0xEB665BFF, 0x27CC5B61,
-		0x2D095278, 0xE1A352E6, 0x6F2C5505, 0xA386559B,
-		0x061D761C, 0xCAB77682, 0x44387161, 0x889271FF,
-		0x825778E6, 0x4EFD7878, 0xC0727F9B, 0x0CD87F05,
-		0xD5F86DA9, 0x19526D37, 0x97DD6AD4, 0x5B776A4A,
-		0x51B26353, 0x9D1863CD, 0x1397642E, 0xDF3D64B0,
-		0x83D02561, 0x4F7A25FF, 0xC1F5221C, 0x0D5F2282,
-		0x079A2B9B, 0xCB302B05, 0x45BF2CE6, 0x89152C78,
-		0x50353ED4, 0x9C9F3E4A, 0x121039A9, 0xDEBA3937,
-		0xD47F302E, 0x18D530B0, 0x965A3753, 0x5AF037CD,
-		0xFF6B144A, 0x33C114D4, 0xBD4E1337, 0x71E413A9,
-		0x7B211AB0, 0xB78B1A2E, 0x39041DCD, 0xF5AE1D53,
-		0x2C8E0FFF, 0xE0240F61, 0x6EAB0882, 0xA201081C,
-		0xA8C40105, 0x646E019B, 0xEAE10678, 0x264B06E6
-	}
-};
diff -Nru r-base-3.2.3/src/extra/xz/check/crc32_x86.S r-base-3.3.1/src/extra/xz/check/crc32_x86.S
--- r-base-3.2.3/src/extra/xz/check/crc32_x86.S	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc32_x86.S	1970-01-01 00:00:00.000000000 +0000
@@ -1,304 +0,0 @@
-/*
- * Speed-optimized CRC32 using slicing-by-eight algorithm
- *
- * This uses only i386 instructions, but it is optimized for i686 and later
- * (including e.g. Pentium II/III/IV, Athlon XP, and Core 2). For i586
- * (e.g. Pentium), slicing-by-four would be better, and even the C version
- * of slicing-by-eight built with gcc -march=i586 tends to be a little bit
- * better than this. Very few probably run this code on i586 or older x86
- * so this shouldn't be a problem in practice.
- *
- * Authors: Igor Pavlov (original version)
- *          Lasse Collin (AT&T syntax, PIC support, better portability)
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * This code needs lzma_crc32_table, which can be created using the
- * following C code:
-
-uint32_t lzma_crc32_table[8][256];
-
-void
-init_table(void)
-{
-	// IEEE-802.3
-	static const uint32_t poly32 = UINT32_C(0xEDB88320);
-
-	// Castagnoli
-	// static const uint32_t poly32 = UINT32_C(0x82F63B78);
-
-	// Koopman
-	// static const uint32_t poly32 = UINT32_C(0xEB31D82E);
-
-	for (size_t s = 0; s < 8; ++s) {
-		for (size_t b = 0; b < 256; ++b) {
-			uint32_t r = s == 0 ? b : lzma_crc32_table[s - 1][b];
-
-			for (size_t i = 0; i < 8; ++i) {
-				if (r & 1)
-					r = (r >> 1) ^ poly32;
-				else
-					r >>= 1;
-			}
-
-			lzma_crc32_table[s][b] = r;
-		}
-	}
-}
-
- * The prototype of the CRC32 function:
- * extern uint32_t lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc);
- */
-
-/*
- * On some systems, the functions need to be prefixed. The prefix is
- * usually an underscore.
- */
-#ifndef __USER_LABEL_PREFIX__
-#	define __USER_LABEL_PREFIX__
-#endif
-#define MAKE_SYM_CAT(prefix, sym) prefix ## sym
-#define MAKE_SYM(prefix, sym) MAKE_SYM_CAT(prefix, sym)
-#define LZMA_CRC32 MAKE_SYM(__USER_LABEL_PREFIX__, lzma_crc32)
-#define LZMA_CRC32_TABLE MAKE_SYM(__USER_LABEL_PREFIX__, lzma_crc32_table)
-
-/*
- * Solaris assembler doesn't have .p2align, and Darwin uses .align
- * differently than GNU/Linux and Solaris.
- */
-#if defined(__APPLE__) || defined(__MSDOS__)
-#	define ALIGN(pow2, abs) .align pow2
-#else
-#	define ALIGN(pow2, abs) .align abs
-#endif
-
-	.text
-	.globl	LZMA_CRC32
-
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) \
-		&& !defined(__MSDOS__)
-	.type	LZMA_CRC32, @function
-#endif
-
-	ALIGN(4, 16)
-LZMA_CRC32:
-	/*
-	 * Register usage:
-	 * %eax crc
-	 * %esi buf
-	 * %edi size or buf + size
-	 * %ebx lzma_crc32_table
-	 * %ebp Table index
-	 * %ecx Temporary
-	 * %edx Temporary
-	 */
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	pushl	%ebp
-	movl	0x14(%esp), %esi /* buf */
-	movl	0x18(%esp), %edi /* size */
-	movl	0x1C(%esp), %eax /* crc */
-
-	/*
-	 * Store the address of lzma_crc32_table to %ebx. This is needed to
-	 * get position-independent code (PIC).
-	 *
-	 * The PIC macro is defined by libtool, while __PIC__ is defined
-	 * by GCC but only on some systems. Testing for both makes it simpler
-	 * to test this code without libtool, and keeps the code working also
-	 * when built with libtool but using something else than GCC.
-	 *
-	 * I understood that libtool may define PIC on Windows even though
-	 * the code in Windows DLLs is not PIC in sense that it is in ELF
-	 * binaries, so we need a separate check to always use the non-PIC
-	 * code on Windows.
-	 */
-#if (!defined(PIC) && !defined(__PIC__)) \
-		|| (defined(_WIN32) || defined(__CYGWIN__))
-	/* Not PIC */
-	movl	$ LZMA_CRC32_TABLE, %ebx
-#elif defined(__APPLE__)
-	/* Mach-O */
-	call	.L_get_pc
-.L_pic:
-	leal	.L_lzma_crc32_table$non_lazy_ptr-.L_pic(%ebx), %ebx
-	movl	(%ebx), %ebx
-#else
-	/* ELF */
-	call	.L_get_pc
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-	movl	LZMA_CRC32_TABLE@GOT(%ebx), %ebx
-#endif
-
-	/* Complement the initial value. */
-	notl	%eax
-
-	ALIGN(4, 16)
-.L_align:
-	/*
-	 * Check if there is enough input to use slicing-by-eight.
-	 * We need 16 bytes, because the loop pre-reads eight bytes.
-	 */
-	cmpl	$16, %edi
-	jb	.L_rest
-
-	/* Check if we have reached alignment of eight bytes. */
-	testl	$7, %esi
-	jz	.L_slice
-
-	/* Calculate CRC of the next input byte. */
-	movzbl	(%esi), %ebp
-	incl	%esi
-	movzbl	%al, %ecx
-	xorl	%ecx, %ebp
-	shrl	$8, %eax
-	xorl	(%ebx, %ebp, 4), %eax
-	decl	%edi
-	jmp	.L_align
-
-	ALIGN(2, 4)
-.L_slice:
-	/*
-	 * If we get here, there's at least 16 bytes of aligned input
-	 * available. Make %edi multiple of eight bytes. Store the possible
-	 * remainder over the "size" variable in the argument stack.
-	 */
-	movl	%edi, 0x18(%esp)
-	andl	$-8, %edi
-	subl	%edi, 0x18(%esp)
-
-	/*
-	 * Let %edi be buf + size - 8 while running the main loop. This way
-	 * we can compare for equality to determine when exit the loop.
-	 */
-	addl	%esi, %edi
-	subl	$8, %edi
-
-	/* Read in the first eight aligned bytes. */
-	xorl	(%esi), %eax
-	movl	4(%esi), %ecx
-	movzbl	%cl, %ebp
-
-.L_loop:
-	movl	0x0C00(%ebx, %ebp, 4), %edx
-	movzbl	%ch, %ebp
-	xorl	0x0800(%ebx, %ebp, 4), %edx
-	shrl	$16, %ecx
-	xorl	8(%esi), %edx
-	movzbl	%cl, %ebp
-	xorl	0x0400(%ebx, %ebp, 4), %edx
-	movzbl	%ch, %ebp
-	xorl	(%ebx, %ebp, 4), %edx
-	movzbl	%al, %ebp
-
-	/*
-	 * Read the next four bytes, for which the CRC is calculated
-	 * on the next interation of the loop.
-	 */
-	movl	12(%esi), %ecx
-
-	xorl	0x1C00(%ebx, %ebp, 4), %edx
-	movzbl	%ah, %ebp
-	shrl	$16, %eax
-	xorl	0x1800(%ebx, %ebp, 4), %edx
-	movzbl	%ah, %ebp
-	movzbl	%al, %eax
-	movl	0x1400(%ebx, %eax, 4), %eax
-	addl	$8, %esi
-	xorl	%edx, %eax
-	xorl	0x1000(%ebx, %ebp, 4), %eax
-
-	/* Check for end of aligned input. */
-	cmpl	%edi, %esi
-	movzbl	%cl, %ebp
-	jne	.L_loop
-
-	/*
-	 * Process the remaining eight bytes, which we have already
-	 * copied to %ecx and %edx.
-	 */
-	movl	0x0C00(%ebx, %ebp, 4), %edx
-	movzbl	%ch, %ebp
-	xorl	0x0800(%ebx, %ebp, 4), %edx
-	shrl	$16, %ecx
-	movzbl	%cl, %ebp
-	xorl	0x0400(%ebx, %ebp, 4), %edx
-	movzbl	%ch, %ebp
-	xorl	(%ebx, %ebp, 4), %edx
-	movzbl	%al, %ebp
-
-	xorl	0x1C00(%ebx, %ebp, 4), %edx
-	movzbl	%ah, %ebp
-	shrl	$16, %eax
-	xorl	0x1800(%ebx, %ebp, 4), %edx
-	movzbl	%ah, %ebp
-	movzbl	%al, %eax
-	movl	0x1400(%ebx, %eax, 4), %eax
-	addl	$8, %esi
-	xorl	%edx, %eax
-	xorl	0x1000(%ebx, %ebp, 4), %eax
-
-	/* Copy the number of remaining bytes to %edi. */
-	movl	0x18(%esp), %edi
-
-.L_rest:
-	/* Check for end of input. */
-	testl	%edi, %edi
-	jz	.L_return
-
-	/* Calculate CRC of the next input byte. */
-	movzbl	(%esi), %ebp
-	incl	%esi
-	movzbl	%al, %ecx
-	xorl	%ecx, %ebp
-	shrl	$8, %eax
-	xorl	(%ebx, %ebp, 4), %eax
-	decl	%edi
-	jmp	.L_rest
-
-.L_return:
-	/* Complement the final value. */
-	notl	%eax
-
-	popl	%ebp
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	ret
-
-#if defined(PIC) || defined(__PIC__)
-	ALIGN(4, 16)
-.L_get_pc:
-	movl	(%esp), %ebx
-	ret
-#endif
-
-#if defined(__APPLE__) && (defined(PIC) || defined(__PIC__))
-	/* Mach-O PIC */
-	.section __IMPORT,__pointers,non_lazy_symbol_pointers
-.L_lzma_crc32_table$non_lazy_ptr:
-	.indirect_symbol LZMA_CRC32_TABLE
-	.long 0
-
-#elif defined(_WIN32) || defined(__CYGWIN__)
-#	ifdef DLL_EXPORT
-	/* This is equivalent of __declspec(dllexport). */
-	.section .drectve
-	.ascii " -export:lzma_crc32"
-#	endif
-
-#elif !defined(__MSDOS__)
-	/* ELF */
-	.size	LZMA_CRC32, .-LZMA_CRC32
-#endif
-
-/*
- * This is needed to support non-executable stack. It's ugly to
- * use __linux__ here, but I don't know a way to detect when
- * we are using GNU assembler.
- */
-#if defined(__ELF__) && defined(__linux__)
-	.section	.note.GNU-stack,"",@progbits
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_fast.c r-base-3.3.1/src/extra/xz/check/crc64_fast.c
--- r-base-3.2.3/src/extra/xz/check/crc64_fast.c	2015-03-18 23:02:08.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_fast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc64.c
-/// \brief      CRC64 calculation
-///
-/// Calculate the CRC64 using the slice-by-four algorithm. This is the same
-/// idea that is used in crc32_fast.c, but for CRC64 we use only four tables
-/// instead of eight to avoid increasing CPU cache usage.
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "check.h"
-#include "crc_macros.h"
-
-
-#ifdef WORDS_BIGENDIAN
-#	define A1(x) ((x) >> 56)
-#else
-#	define A1 A
-#endif
-
-
-// R_Change: Used in package utils, so needs to be visible
-#include <R_ext/Visibility.h>
-// See the comments in crc32_fast.c. They aren't duplicated here.
-extern attribute_visible LZMA_API(uint64_t)
-lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc)
-{
-	crc = ~crc;
-
-#ifdef WORDS_BIGENDIAN
-	crc = bswap64(crc);
-#endif
-
-	if (size > 4) {
-		while ((uintptr_t)(buf) & 3) {
-			crc = lzma_crc64_table[0][*buf++ ^ A1(crc)] ^ S8(crc);
-			--size;
-		}
-
-		const uint8_t *const limit = buf + (size & ~(size_t)(3));
-		size &= (size_t)(3);
-
-		while (buf < limit) {
-#ifdef WORDS_BIGENDIAN
-			const uint32_t tmp = (crc >> 32)
-					^ *(const uint32_t *)(buf);
-#else
-			const uint32_t tmp = crc ^ *(const uint32_t *)(buf);
-#endif
-			buf += 4;
-
-			crc = lzma_crc64_table[3][A(tmp)]
-			    ^ lzma_crc64_table[2][B(tmp)]
-			    ^ S32(crc)
-			    ^ lzma_crc64_table[1][C(tmp)]
-			    ^ lzma_crc64_table[0][D(tmp)];
-		}
-	}
-
-	while (size-- != 0)
-		crc = lzma_crc64_table[0][*buf++ ^ A1(crc)] ^ S8(crc);
-
-#ifdef WORDS_BIGENDIAN
-	crc = bswap64(crc);
-#endif
-
-	return ~crc;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_small.c r-base-3.3.1/src/extra/xz/check/crc64_small.c
--- r-base-3.2.3/src/extra/xz/check/crc64_small.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_small.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc64_small.c
-/// \brief      CRC64 calculation (size-optimized)
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "check.h"
-
-
-static uint64_t crc64_table[256];
-
-
-static void
-crc64_init(void)
-{
-	static const uint64_t poly64 = UINT64_C(0xC96C5795D7870F42);
-
-	for (size_t b = 0; b < 256; ++b) {
-		uint64_t r = b;
-		for (size_t i = 0; i < 8; ++i) {
-			if (r & 1)
-				r = (r >> 1) ^ poly64;
-			else
-				r >>= 1;
-		}
-
-		crc64_table[b] = r;
-	}
-
-	return;
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc)
-{
-	mythread_once(crc64_init);
-
-	crc = ~crc;
-
-	while (size != 0) {
-		crc = crc64_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
-		--size;
-	}
-
-	return ~crc;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_table_be.h r-base-3.3.1/src/extra/xz/check/crc64_table_be.h
--- r-base-3.2.3/src/extra/xz/check/crc64_table_be.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_table_be.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,521 +0,0 @@
-/* This file has been automatically generated by crc64_tablegen.c. */
-
-const uint64_t lzma_crc64_table[4][256] = {
-	{
-		UINT64_C(0x0000000000000000), UINT64_C(0x6F5FA703BE4C2EB3),
-		UINT64_C(0x5BA040A8573684F4), UINT64_C(0x34FFE7ABE97AAA47),
-		UINT64_C(0x335E8FFF84C3D07B), UINT64_C(0x5C0128FC3A8FFEC8),
-		UINT64_C(0x68FECF57D3F5548F), UINT64_C(0x07A168546DB97A3C),
-		UINT64_C(0x66BC1EFF0987A1F7), UINT64_C(0x09E3B9FCB7CB8F44),
-		UINT64_C(0x3D1C5E575EB12503), UINT64_C(0x5243F954E0FD0BB0),
-		UINT64_C(0x55E291008D44718C), UINT64_C(0x3ABD360333085F3F),
-		UINT64_C(0x0E42D1A8DA72F578), UINT64_C(0x611D76AB643EDBCB),
-		UINT64_C(0x4966335138A19B7D), UINT64_C(0x2639945286EDB5CE),
-		UINT64_C(0x12C673F96F971F89), UINT64_C(0x7D99D4FAD1DB313A),
-		UINT64_C(0x7A38BCAEBC624B06), UINT64_C(0x15671BAD022E65B5),
-		UINT64_C(0x2198FC06EB54CFF2), UINT64_C(0x4EC75B055518E141),
-		UINT64_C(0x2FDA2DAE31263A8A), UINT64_C(0x40858AAD8F6A1439),
-		UINT64_C(0x747A6D066610BE7E), UINT64_C(0x1B25CA05D85C90CD),
-		UINT64_C(0x1C84A251B5E5EAF1), UINT64_C(0x73DB05520BA9C442),
-		UINT64_C(0x4724E2F9E2D36E05), UINT64_C(0x287B45FA5C9F40B6),
-		UINT64_C(0x92CC66A2704237FB), UINT64_C(0xFD93C1A1CE0E1948),
-		UINT64_C(0xC96C260A2774B30F), UINT64_C(0xA633810999389DBC),
-		UINT64_C(0xA192E95DF481E780), UINT64_C(0xCECD4E5E4ACDC933),
-		UINT64_C(0xFA32A9F5A3B76374), UINT64_C(0x956D0EF61DFB4DC7),
-		UINT64_C(0xF470785D79C5960C), UINT64_C(0x9B2FDF5EC789B8BF),
-		UINT64_C(0xAFD038F52EF312F8), UINT64_C(0xC08F9FF690BF3C4B),
-		UINT64_C(0xC72EF7A2FD064677), UINT64_C(0xA87150A1434A68C4),
-		UINT64_C(0x9C8EB70AAA30C283), UINT64_C(0xF3D11009147CEC30),
-		UINT64_C(0xDBAA55F348E3AC86), UINT64_C(0xB4F5F2F0F6AF8235),
-		UINT64_C(0x800A155B1FD52872), UINT64_C(0xEF55B258A19906C1),
-		UINT64_C(0xE8F4DA0CCC207CFD), UINT64_C(0x87AB7D0F726C524E),
-		UINT64_C(0xB3549AA49B16F809), UINT64_C(0xDC0B3DA7255AD6BA),
-		UINT64_C(0xBD164B0C41640D71), UINT64_C(0xD249EC0FFF2823C2),
-		UINT64_C(0xE6B60BA416528985), UINT64_C(0x89E9ACA7A81EA736),
-		UINT64_C(0x8E48C4F3C5A7DD0A), UINT64_C(0xE11763F07BEBF3B9),
-		UINT64_C(0xD5E8845B929159FE), UINT64_C(0xBAB723582CDD774D),
-		UINT64_C(0xA187C3EBCA2BB664), UINT64_C(0xCED864E8746798D7),
-		UINT64_C(0xFA2783439D1D3290), UINT64_C(0x9578244023511C23),
-		UINT64_C(0x92D94C144EE8661F), UINT64_C(0xFD86EB17F0A448AC),
-		UINT64_C(0xC9790CBC19DEE2EB), UINT64_C(0xA626ABBFA792CC58),
-		UINT64_C(0xC73BDD14C3AC1793), UINT64_C(0xA8647A177DE03920),
-		UINT64_C(0x9C9B9DBC949A9367), UINT64_C(0xF3C43ABF2AD6BDD4),
-		UINT64_C(0xF46552EB476FC7E8), UINT64_C(0x9B3AF5E8F923E95B),
-		UINT64_C(0xAFC512431059431C), UINT64_C(0xC09AB540AE156DAF),
-		UINT64_C(0xE8E1F0BAF28A2D19), UINT64_C(0x87BE57B94CC603AA),
-		UINT64_C(0xB341B012A5BCA9ED), UINT64_C(0xDC1E17111BF0875E),
-		UINT64_C(0xDBBF7F457649FD62), UINT64_C(0xB4E0D846C805D3D1),
-		UINT64_C(0x801F3FED217F7996), UINT64_C(0xEF4098EE9F335725),
-		UINT64_C(0x8E5DEE45FB0D8CEE), UINT64_C(0xE10249464541A25D),
-		UINT64_C(0xD5FDAEEDAC3B081A), UINT64_C(0xBAA209EE127726A9),
-		UINT64_C(0xBD0361BA7FCE5C95), UINT64_C(0xD25CC6B9C1827226),
-		UINT64_C(0xE6A3211228F8D861), UINT64_C(0x89FC861196B4F6D2),
-		UINT64_C(0x334BA549BA69819F), UINT64_C(0x5C14024A0425AF2C),
-		UINT64_C(0x68EBE5E1ED5F056B), UINT64_C(0x07B442E253132BD8),
-		UINT64_C(0x00152AB63EAA51E4), UINT64_C(0x6F4A8DB580E67F57),
-		UINT64_C(0x5BB56A1E699CD510), UINT64_C(0x34EACD1DD7D0FBA3),
-		UINT64_C(0x55F7BBB6B3EE2068), UINT64_C(0x3AA81CB50DA20EDB),
-		UINT64_C(0x0E57FB1EE4D8A49C), UINT64_C(0x61085C1D5A948A2F),
-		UINT64_C(0x66A93449372DF013), UINT64_C(0x09F6934A8961DEA0),
-		UINT64_C(0x3D0974E1601B74E7), UINT64_C(0x5256D3E2DE575A54),
-		UINT64_C(0x7A2D961882C81AE2), UINT64_C(0x1572311B3C843451),
-		UINT64_C(0x218DD6B0D5FE9E16), UINT64_C(0x4ED271B36BB2B0A5),
-		UINT64_C(0x497319E7060BCA99), UINT64_C(0x262CBEE4B847E42A),
-		UINT64_C(0x12D3594F513D4E6D), UINT64_C(0x7D8CFE4CEF7160DE),
-		UINT64_C(0x1C9188E78B4FBB15), UINT64_C(0x73CE2FE4350395A6),
-		UINT64_C(0x4731C84FDC793FE1), UINT64_C(0x286E6F4C62351152),
-		UINT64_C(0x2FCF07180F8C6B6E), UINT64_C(0x4090A01BB1C045DD),
-		UINT64_C(0x746F47B058BAEF9A), UINT64_C(0x1B30E0B3E6F6C129),
-		UINT64_C(0x420F87D795576CC9), UINT64_C(0x2D5020D42B1B427A),
-		UINT64_C(0x19AFC77FC261E83D), UINT64_C(0x76F0607C7C2DC68E),
-		UINT64_C(0x715108281194BCB2), UINT64_C(0x1E0EAF2BAFD89201),
-		UINT64_C(0x2AF1488046A23846), UINT64_C(0x45AEEF83F8EE16F5),
-		UINT64_C(0x24B399289CD0CD3E), UINT64_C(0x4BEC3E2B229CE38D),
-		UINT64_C(0x7F13D980CBE649CA), UINT64_C(0x104C7E8375AA6779),
-		UINT64_C(0x17ED16D718131D45), UINT64_C(0x78B2B1D4A65F33F6),
-		UINT64_C(0x4C4D567F4F2599B1), UINT64_C(0x2312F17CF169B702),
-		UINT64_C(0x0B69B486ADF6F7B4), UINT64_C(0x6436138513BAD907),
-		UINT64_C(0x50C9F42EFAC07340), UINT64_C(0x3F96532D448C5DF3),
-		UINT64_C(0x38373B79293527CF), UINT64_C(0x57689C7A9779097C),
-		UINT64_C(0x63977BD17E03A33B), UINT64_C(0x0CC8DCD2C04F8D88),
-		UINT64_C(0x6DD5AA79A4715643), UINT64_C(0x028A0D7A1A3D78F0),
-		UINT64_C(0x3675EAD1F347D2B7), UINT64_C(0x592A4DD24D0BFC04),
-		UINT64_C(0x5E8B258620B28638), UINT64_C(0x31D482859EFEA88B),
-		UINT64_C(0x052B652E778402CC), UINT64_C(0x6A74C22DC9C82C7F),
-		UINT64_C(0xD0C3E175E5155B32), UINT64_C(0xBF9C46765B597581),
-		UINT64_C(0x8B63A1DDB223DFC6), UINT64_C(0xE43C06DE0C6FF175),
-		UINT64_C(0xE39D6E8A61D68B49), UINT64_C(0x8CC2C989DF9AA5FA),
-		UINT64_C(0xB83D2E2236E00FBD), UINT64_C(0xD762892188AC210E),
-		UINT64_C(0xB67FFF8AEC92FAC5), UINT64_C(0xD920588952DED476),
-		UINT64_C(0xEDDFBF22BBA47E31), UINT64_C(0x8280182105E85082),
-		UINT64_C(0x8521707568512ABE), UINT64_C(0xEA7ED776D61D040D),
-		UINT64_C(0xDE8130DD3F67AE4A), UINT64_C(0xB1DE97DE812B80F9),
-		UINT64_C(0x99A5D224DDB4C04F), UINT64_C(0xF6FA752763F8EEFC),
-		UINT64_C(0xC205928C8A8244BB), UINT64_C(0xAD5A358F34CE6A08),
-		UINT64_C(0xAAFB5DDB59771034), UINT64_C(0xC5A4FAD8E73B3E87),
-		UINT64_C(0xF15B1D730E4194C0), UINT64_C(0x9E04BA70B00DBA73),
-		UINT64_C(0xFF19CCDBD43361B8), UINT64_C(0x90466BD86A7F4F0B),
-		UINT64_C(0xA4B98C738305E54C), UINT64_C(0xCBE62B703D49CBFF),
-		UINT64_C(0xCC47432450F0B1C3), UINT64_C(0xA318E427EEBC9F70),
-		UINT64_C(0x97E7038C07C63537), UINT64_C(0xF8B8A48FB98A1B84),
-		UINT64_C(0xE388443C5F7CDAAD), UINT64_C(0x8CD7E33FE130F41E),
-		UINT64_C(0xB8280494084A5E59), UINT64_C(0xD777A397B60670EA),
-		UINT64_C(0xD0D6CBC3DBBF0AD6), UINT64_C(0xBF896CC065F32465),
-		UINT64_C(0x8B768B6B8C898E22), UINT64_C(0xE4292C6832C5A091),
-		UINT64_C(0x85345AC356FB7B5A), UINT64_C(0xEA6BFDC0E8B755E9),
-		UINT64_C(0xDE941A6B01CDFFAE), UINT64_C(0xB1CBBD68BF81D11D),
-		UINT64_C(0xB66AD53CD238AB21), UINT64_C(0xD935723F6C748592),
-		UINT64_C(0xEDCA9594850E2FD5), UINT64_C(0x829532973B420166),
-		UINT64_C(0xAAEE776D67DD41D0), UINT64_C(0xC5B1D06ED9916F63),
-		UINT64_C(0xF14E37C530EBC524), UINT64_C(0x9E1190C68EA7EB97),
-		UINT64_C(0x99B0F892E31E91AB), UINT64_C(0xF6EF5F915D52BF18),
-		UINT64_C(0xC210B83AB428155F), UINT64_C(0xAD4F1F390A643BEC),
-		UINT64_C(0xCC5269926E5AE027), UINT64_C(0xA30DCE91D016CE94),
-		UINT64_C(0x97F2293A396C64D3), UINT64_C(0xF8AD8E3987204A60),
-		UINT64_C(0xFF0CE66DEA99305C), UINT64_C(0x9053416E54D51EEF),
-		UINT64_C(0xA4ACA6C5BDAFB4A8), UINT64_C(0xCBF301C603E39A1B),
-		UINT64_C(0x7144229E2F3EED56), UINT64_C(0x1E1B859D9172C3E5),
-		UINT64_C(0x2AE46236780869A2), UINT64_C(0x45BBC535C6444711),
-		UINT64_C(0x421AAD61ABFD3D2D), UINT64_C(0x2D450A6215B1139E),
-		UINT64_C(0x19BAEDC9FCCBB9D9), UINT64_C(0x76E54ACA4287976A),
-		UINT64_C(0x17F83C6126B94CA1), UINT64_C(0x78A79B6298F56212),
-		UINT64_C(0x4C587CC9718FC855), UINT64_C(0x2307DBCACFC3E6E6),
-		UINT64_C(0x24A6B39EA27A9CDA), UINT64_C(0x4BF9149D1C36B269),
-		UINT64_C(0x7F06F336F54C182E), UINT64_C(0x105954354B00369D),
-		UINT64_C(0x382211CF179F762B), UINT64_C(0x577DB6CCA9D35898),
-		UINT64_C(0x6382516740A9F2DF), UINT64_C(0x0CDDF664FEE5DC6C),
-		UINT64_C(0x0B7C9E30935CA650), UINT64_C(0x642339332D1088E3),
-		UINT64_C(0x50DCDE98C46A22A4), UINT64_C(0x3F83799B7A260C17),
-		UINT64_C(0x5E9E0F301E18D7DC), UINT64_C(0x31C1A833A054F96F),
-		UINT64_C(0x053E4F98492E5328), UINT64_C(0x6A61E89BF7627D9B),
-		UINT64_C(0x6DC080CF9ADB07A7), UINT64_C(0x029F27CC24972914),
-		UINT64_C(0x3660C067CDED8353), UINT64_C(0x593F676473A1ADE0)
-	}, {
-		UINT64_C(0x0000000000000000), UINT64_C(0x0DF1D05C9279E954),
-		UINT64_C(0x1AE2A1B924F3D2A9), UINT64_C(0x171371E5B68A3BFD),
-		UINT64_C(0xB1DA4DDC62497DC1), UINT64_C(0xBC2B9D80F0309495),
-		UINT64_C(0xAB38EC6546BAAF68), UINT64_C(0xA6C93C39D4C3463C),
-		UINT64_C(0xE7AB9517EE3D2210), UINT64_C(0xEA5A454B7C44CB44),
-		UINT64_C(0xFD4934AECACEF0B9), UINT64_C(0xF0B8E4F258B719ED),
-		UINT64_C(0x5671D8CB8C745FD1), UINT64_C(0x5B8008971E0DB685),
-		UINT64_C(0x4C937972A8878D78), UINT64_C(0x4162A92E3AFE642C),
-		UINT64_C(0xCE572B2FDC7B4420), UINT64_C(0xC3A6FB734E02AD74),
-		UINT64_C(0xD4B58A96F8889689), UINT64_C(0xD9445ACA6AF17FDD),
-		UINT64_C(0x7F8D66F3BE3239E1), UINT64_C(0x727CB6AF2C4BD0B5),
-		UINT64_C(0x656FC74A9AC1EB48), UINT64_C(0x689E171608B8021C),
-		UINT64_C(0x29FCBE3832466630), UINT64_C(0x240D6E64A03F8F64),
-		UINT64_C(0x331E1F8116B5B499), UINT64_C(0x3EEFCFDD84CC5DCD),
-		UINT64_C(0x9826F3E4500F1BF1), UINT64_C(0x95D723B8C276F2A5),
-		UINT64_C(0x82C4525D74FCC958), UINT64_C(0x8F358201E685200C),
-		UINT64_C(0x9CAF565EB8F78840), UINT64_C(0x915E86022A8E6114),
-		UINT64_C(0x864DF7E79C045AE9), UINT64_C(0x8BBC27BB0E7DB3BD),
-		UINT64_C(0x2D751B82DABEF581), UINT64_C(0x2084CBDE48C71CD5),
-		UINT64_C(0x3797BA3BFE4D2728), UINT64_C(0x3A666A676C34CE7C),
-		UINT64_C(0x7B04C34956CAAA50), UINT64_C(0x76F51315C4B34304),
-		UINT64_C(0x61E662F0723978F9), UINT64_C(0x6C17B2ACE04091AD),
-		UINT64_C(0xCADE8E953483D791), UINT64_C(0xC72F5EC9A6FA3EC5),
-		UINT64_C(0xD03C2F2C10700538), UINT64_C(0xDDCDFF708209EC6C),
-		UINT64_C(0x52F87D71648CCC60), UINT64_C(0x5F09AD2DF6F52534),
-		UINT64_C(0x481ADCC8407F1EC9), UINT64_C(0x45EB0C94D206F79D),
-		UINT64_C(0xE32230AD06C5B1A1), UINT64_C(0xEED3E0F194BC58F5),
-		UINT64_C(0xF9C0911422366308), UINT64_C(0xF4314148B04F8A5C),
-		UINT64_C(0xB553E8668AB1EE70), UINT64_C(0xB8A2383A18C80724),
-		UINT64_C(0xAFB149DFAE423CD9), UINT64_C(0xA24099833C3BD58D),
-		UINT64_C(0x0489A5BAE8F893B1), UINT64_C(0x097875E67A817AE5),
-		UINT64_C(0x1E6B0403CC0B4118), UINT64_C(0x139AD45F5E72A84C),
-		UINT64_C(0x385FADBC70EF1181), UINT64_C(0x35AE7DE0E296F8D5),
-		UINT64_C(0x22BD0C05541CC328), UINT64_C(0x2F4CDC59C6652A7C),
-		UINT64_C(0x8985E06012A66C40), UINT64_C(0x8474303C80DF8514),
-		UINT64_C(0x936741D93655BEE9), UINT64_C(0x9E969185A42C57BD),
-		UINT64_C(0xDFF438AB9ED23391), UINT64_C(0xD205E8F70CABDAC5),
-		UINT64_C(0xC5169912BA21E138), UINT64_C(0xC8E7494E2858086C),
-		UINT64_C(0x6E2E7577FC9B4E50), UINT64_C(0x63DFA52B6EE2A704),
-		UINT64_C(0x74CCD4CED8689CF9), UINT64_C(0x793D04924A1175AD),
-		UINT64_C(0xF6088693AC9455A1), UINT64_C(0xFBF956CF3EEDBCF5),
-		UINT64_C(0xECEA272A88678708), UINT64_C(0xE11BF7761A1E6E5C),
-		UINT64_C(0x47D2CB4FCEDD2860), UINT64_C(0x4A231B135CA4C134),
-		UINT64_C(0x5D306AF6EA2EFAC9), UINT64_C(0x50C1BAAA7857139D),
-		UINT64_C(0x11A3138442A977B1), UINT64_C(0x1C52C3D8D0D09EE5),
-		UINT64_C(0x0B41B23D665AA518), UINT64_C(0x06B06261F4234C4C),
-		UINT64_C(0xA0795E5820E00A70), UINT64_C(0xAD888E04B299E324),
-		UINT64_C(0xBA9BFFE10413D8D9), UINT64_C(0xB76A2FBD966A318D),
-		UINT64_C(0xA4F0FBE2C81899C1), UINT64_C(0xA9012BBE5A617095),
-		UINT64_C(0xBE125A5BECEB4B68), UINT64_C(0xB3E38A077E92A23C),
-		UINT64_C(0x152AB63EAA51E400), UINT64_C(0x18DB666238280D54),
-		UINT64_C(0x0FC817878EA236A9), UINT64_C(0x0239C7DB1CDBDFFD),
-		UINT64_C(0x435B6EF52625BBD1), UINT64_C(0x4EAABEA9B45C5285),
-		UINT64_C(0x59B9CF4C02D66978), UINT64_C(0x54481F1090AF802C),
-		UINT64_C(0xF2812329446CC610), UINT64_C(0xFF70F375D6152F44),
-		UINT64_C(0xE8638290609F14B9), UINT64_C(0xE59252CCF2E6FDED),
-		UINT64_C(0x6AA7D0CD1463DDE1), UINT64_C(0x67560091861A34B5),
-		UINT64_C(0x7045717430900F48), UINT64_C(0x7DB4A128A2E9E61C),
-		UINT64_C(0xDB7D9D11762AA020), UINT64_C(0xD68C4D4DE4534974),
-		UINT64_C(0xC19F3CA852D97289), UINT64_C(0xCC6EECF4C0A09BDD),
-		UINT64_C(0x8D0C45DAFA5EFFF1), UINT64_C(0x80FD9586682716A5),
-		UINT64_C(0x97EEE463DEAD2D58), UINT64_C(0x9A1F343F4CD4C40C),
-		UINT64_C(0x3CD6080698178230), UINT64_C(0x3127D85A0A6E6B64),
-		UINT64_C(0x2634A9BFBCE45099), UINT64_C(0x2BC579E32E9DB9CD),
-		UINT64_C(0xF5A054D6CA71FB90), UINT64_C(0xF851848A580812C4),
-		UINT64_C(0xEF42F56FEE822939), UINT64_C(0xE2B325337CFBC06D),
-		UINT64_C(0x447A190AA8388651), UINT64_C(0x498BC9563A416F05),
-		UINT64_C(0x5E98B8B38CCB54F8), UINT64_C(0x536968EF1EB2BDAC),
-		UINT64_C(0x120BC1C1244CD980), UINT64_C(0x1FFA119DB63530D4),
-		UINT64_C(0x08E9607800BF0B29), UINT64_C(0x0518B02492C6E27D),
-		UINT64_C(0xA3D18C1D4605A441), UINT64_C(0xAE205C41D47C4D15),
-		UINT64_C(0xB9332DA462F676E8), UINT64_C(0xB4C2FDF8F08F9FBC),
-		UINT64_C(0x3BF77FF9160ABFB0), UINT64_C(0x3606AFA5847356E4),
-		UINT64_C(0x2115DE4032F96D19), UINT64_C(0x2CE40E1CA080844D),
-		UINT64_C(0x8A2D32257443C271), UINT64_C(0x87DCE279E63A2B25),
-		UINT64_C(0x90CF939C50B010D8), UINT64_C(0x9D3E43C0C2C9F98C),
-		UINT64_C(0xDC5CEAEEF8379DA0), UINT64_C(0xD1AD3AB26A4E74F4),
-		UINT64_C(0xC6BE4B57DCC44F09), UINT64_C(0xCB4F9B0B4EBDA65D),
-		UINT64_C(0x6D86A7329A7EE061), UINT64_C(0x6077776E08070935),
-		UINT64_C(0x7764068BBE8D32C8), UINT64_C(0x7A95D6D72CF4DB9C),
-		UINT64_C(0x690F0288728673D0), UINT64_C(0x64FED2D4E0FF9A84),
-		UINT64_C(0x73EDA3315675A179), UINT64_C(0x7E1C736DC40C482D),
-		UINT64_C(0xD8D54F5410CF0E11), UINT64_C(0xD5249F0882B6E745),
-		UINT64_C(0xC237EEED343CDCB8), UINT64_C(0xCFC63EB1A64535EC),
-		UINT64_C(0x8EA4979F9CBB51C0), UINT64_C(0x835547C30EC2B894),
-		UINT64_C(0x94463626B8488369), UINT64_C(0x99B7E67A2A316A3D),
-		UINT64_C(0x3F7EDA43FEF22C01), UINT64_C(0x328F0A1F6C8BC555),
-		UINT64_C(0x259C7BFADA01FEA8), UINT64_C(0x286DABA6487817FC),
-		UINT64_C(0xA75829A7AEFD37F0), UINT64_C(0xAAA9F9FB3C84DEA4),
-		UINT64_C(0xBDBA881E8A0EE559), UINT64_C(0xB04B584218770C0D),
-		UINT64_C(0x1682647BCCB44A31), UINT64_C(0x1B73B4275ECDA365),
-		UINT64_C(0x0C60C5C2E8479898), UINT64_C(0x0191159E7A3E71CC),
-		UINT64_C(0x40F3BCB040C015E0), UINT64_C(0x4D026CECD2B9FCB4),
-		UINT64_C(0x5A111D096433C749), UINT64_C(0x57E0CD55F64A2E1D),
-		UINT64_C(0xF129F16C22896821), UINT64_C(0xFCD82130B0F08175),
-		UINT64_C(0xEBCB50D5067ABA88), UINT64_C(0xE63A8089940353DC),
-		UINT64_C(0xCDFFF96ABA9EEA11), UINT64_C(0xC00E293628E70345),
-		UINT64_C(0xD71D58D39E6D38B8), UINT64_C(0xDAEC888F0C14D1EC),
-		UINT64_C(0x7C25B4B6D8D797D0), UINT64_C(0x71D464EA4AAE7E84),
-		UINT64_C(0x66C7150FFC244579), UINT64_C(0x6B36C5536E5DAC2D),
-		UINT64_C(0x2A546C7D54A3C801), UINT64_C(0x27A5BC21C6DA2155),
-		UINT64_C(0x30B6CDC470501AA8), UINT64_C(0x3D471D98E229F3FC),
-		UINT64_C(0x9B8E21A136EAB5C0), UINT64_C(0x967FF1FDA4935C94),
-		UINT64_C(0x816C801812196769), UINT64_C(0x8C9D504480608E3D),
-		UINT64_C(0x03A8D24566E5AE31), UINT64_C(0x0E590219F49C4765),
-		UINT64_C(0x194A73FC42167C98), UINT64_C(0x14BBA3A0D06F95CC),
-		UINT64_C(0xB2729F9904ACD3F0), UINT64_C(0xBF834FC596D53AA4),
-		UINT64_C(0xA8903E20205F0159), UINT64_C(0xA561EE7CB226E80D),
-		UINT64_C(0xE403475288D88C21), UINT64_C(0xE9F2970E1AA16575),
-		UINT64_C(0xFEE1E6EBAC2B5E88), UINT64_C(0xF31036B73E52B7DC),
-		UINT64_C(0x55D90A8EEA91F1E0), UINT64_C(0x5828DAD278E818B4),
-		UINT64_C(0x4F3BAB37CE622349), UINT64_C(0x42CA7B6B5C1BCA1D),
-		UINT64_C(0x5150AF3402696251), UINT64_C(0x5CA17F6890108B05),
-		UINT64_C(0x4BB20E8D269AB0F8), UINT64_C(0x4643DED1B4E359AC),
-		UINT64_C(0xE08AE2E860201F90), UINT64_C(0xED7B32B4F259F6C4),
-		UINT64_C(0xFA68435144D3CD39), UINT64_C(0xF799930DD6AA246D),
-		UINT64_C(0xB6FB3A23EC544041), UINT64_C(0xBB0AEA7F7E2DA915),
-		UINT64_C(0xAC199B9AC8A792E8), UINT64_C(0xA1E84BC65ADE7BBC),
-		UINT64_C(0x072177FF8E1D3D80), UINT64_C(0x0AD0A7A31C64D4D4),
-		UINT64_C(0x1DC3D646AAEEEF29), UINT64_C(0x1032061A3897067D),
-		UINT64_C(0x9F07841BDE122671), UINT64_C(0x92F654474C6BCF25),
-		UINT64_C(0x85E525A2FAE1F4D8), UINT64_C(0x8814F5FE68981D8C),
-		UINT64_C(0x2EDDC9C7BC5B5BB0), UINT64_C(0x232C199B2E22B2E4),
-		UINT64_C(0x343F687E98A88919), UINT64_C(0x39CEB8220AD1604D),
-		UINT64_C(0x78AC110C302F0461), UINT64_C(0x755DC150A256ED35),
-		UINT64_C(0x624EB0B514DCD6C8), UINT64_C(0x6FBF60E986A53F9C),
-		UINT64_C(0xC9765CD0526679A0), UINT64_C(0xC4878C8CC01F90F4),
-		UINT64_C(0xD394FD697695AB09), UINT64_C(0xDE652D35E4EC425D)
-	}, {
-		UINT64_C(0x0000000000000000), UINT64_C(0xCB6D6A914AE10B3F),
-		UINT64_C(0x96DBD42295C2177E), UINT64_C(0x5DB6BEB3DF231C41),
-		UINT64_C(0x2CB7A9452A852FFC), UINT64_C(0xE7DAC3D4606424C3),
-		UINT64_C(0xBA6C7D67BF473882), UINT64_C(0x710117F6F5A633BD),
-		UINT64_C(0xDD705D247FA5876A), UINT64_C(0x161D37B535448C55),
-		UINT64_C(0x4BAB8906EA679014), UINT64_C(0x80C6E397A0869B2B),
-		UINT64_C(0xF1C7F4615520A896), UINT64_C(0x3AAA9EF01FC1A3A9),
-		UINT64_C(0x671C2043C0E2BFE8), UINT64_C(0xAC714AD28A03B4D7),
-		UINT64_C(0xBAE1BA48FE4A0FD5), UINT64_C(0x718CD0D9B4AB04EA),
-		UINT64_C(0x2C3A6E6A6B8818AB), UINT64_C(0xE75704FB21691394),
-		UINT64_C(0x9656130DD4CF2029), UINT64_C(0x5D3B799C9E2E2B16),
-		UINT64_C(0x008DC72F410D3757), UINT64_C(0xCBE0ADBE0BEC3C68),
-		UINT64_C(0x6791E76C81EF88BF), UINT64_C(0xACFC8DFDCB0E8380),
-		UINT64_C(0xF14A334E142D9FC1), UINT64_C(0x3A2759DF5ECC94FE),
-		UINT64_C(0x4B264E29AB6AA743), UINT64_C(0x804B24B8E18BAC7C),
-		UINT64_C(0xDDFD9A0B3EA8B03D), UINT64_C(0x1690F09A7449BB02),
-		UINT64_C(0xF1DD7B3ED73AC638), UINT64_C(0x3AB011AF9DDBCD07),
-		UINT64_C(0x6706AF1C42F8D146), UINT64_C(0xAC6BC58D0819DA79),
-		UINT64_C(0xDD6AD27BFDBFE9C4), UINT64_C(0x1607B8EAB75EE2FB),
-		UINT64_C(0x4BB10659687DFEBA), UINT64_C(0x80DC6CC8229CF585),
-		UINT64_C(0x2CAD261AA89F4152), UINT64_C(0xE7C04C8BE27E4A6D),
-		UINT64_C(0xBA76F2383D5D562C), UINT64_C(0x711B98A977BC5D13),
-		UINT64_C(0x001A8F5F821A6EAE), UINT64_C(0xCB77E5CEC8FB6591),
-		UINT64_C(0x96C15B7D17D879D0), UINT64_C(0x5DAC31EC5D3972EF),
-		UINT64_C(0x4B3CC1762970C9ED), UINT64_C(0x8051ABE76391C2D2),
-		UINT64_C(0xDDE71554BCB2DE93), UINT64_C(0x168A7FC5F653D5AC),
-		UINT64_C(0x678B683303F5E611), UINT64_C(0xACE602A24914ED2E),
-		UINT64_C(0xF150BC119637F16F), UINT64_C(0x3A3DD680DCD6FA50),
-		UINT64_C(0x964C9C5256D54E87), UINT64_C(0x5D21F6C31C3445B8),
-		UINT64_C(0x00974870C31759F9), UINT64_C(0xCBFA22E189F652C6),
-		UINT64_C(0xBAFB35177C50617B), UINT64_C(0x71965F8636B16A44),
-		UINT64_C(0x2C20E135E9927605), UINT64_C(0xE74D8BA4A3737D3A),
-		UINT64_C(0xE2BBF77CAE758C71), UINT64_C(0x29D69DEDE494874E),
-		UINT64_C(0x7460235E3BB79B0F), UINT64_C(0xBF0D49CF71569030),
-		UINT64_C(0xCE0C5E3984F0A38D), UINT64_C(0x056134A8CE11A8B2),
-		UINT64_C(0x58D78A1B1132B4F3), UINT64_C(0x93BAE08A5BD3BFCC),
-		UINT64_C(0x3FCBAA58D1D00B1B), UINT64_C(0xF4A6C0C99B310024),
-		UINT64_C(0xA9107E7A44121C65), UINT64_C(0x627D14EB0EF3175A),
-		UINT64_C(0x137C031DFB5524E7), UINT64_C(0xD811698CB1B42FD8),
-		UINT64_C(0x85A7D73F6E973399), UINT64_C(0x4ECABDAE247638A6),
-		UINT64_C(0x585A4D34503F83A4), UINT64_C(0x933727A51ADE889B),
-		UINT64_C(0xCE819916C5FD94DA), UINT64_C(0x05ECF3878F1C9FE5),
-		UINT64_C(0x74EDE4717ABAAC58), UINT64_C(0xBF808EE0305BA767),
-		UINT64_C(0xE2363053EF78BB26), UINT64_C(0x295B5AC2A599B019),
-		UINT64_C(0x852A10102F9A04CE), UINT64_C(0x4E477A81657B0FF1),
-		UINT64_C(0x13F1C432BA5813B0), UINT64_C(0xD89CAEA3F0B9188F),
-		UINT64_C(0xA99DB955051F2B32), UINT64_C(0x62F0D3C44FFE200D),
-		UINT64_C(0x3F466D7790DD3C4C), UINT64_C(0xF42B07E6DA3C3773),
-		UINT64_C(0x13668C42794F4A49), UINT64_C(0xD80BE6D333AE4176),
-		UINT64_C(0x85BD5860EC8D5D37), UINT64_C(0x4ED032F1A66C5608),
-		UINT64_C(0x3FD1250753CA65B5), UINT64_C(0xF4BC4F96192B6E8A),
-		UINT64_C(0xA90AF125C60872CB), UINT64_C(0x62679BB48CE979F4),
-		UINT64_C(0xCE16D16606EACD23), UINT64_C(0x057BBBF74C0BC61C),
-		UINT64_C(0x58CD05449328DA5D), UINT64_C(0x93A06FD5D9C9D162),
-		UINT64_C(0xE2A178232C6FE2DF), UINT64_C(0x29CC12B2668EE9E0),
-		UINT64_C(0x747AAC01B9ADF5A1), UINT64_C(0xBF17C690F34CFE9E),
-		UINT64_C(0xA987360A8705459C), UINT64_C(0x62EA5C9BCDE44EA3),
-		UINT64_C(0x3F5CE22812C752E2), UINT64_C(0xF43188B9582659DD),
-		UINT64_C(0x85309F4FAD806A60), UINT64_C(0x4E5DF5DEE761615F),
-		UINT64_C(0x13EB4B6D38427D1E), UINT64_C(0xD88621FC72A37621),
-		UINT64_C(0x74F76B2EF8A0C2F6), UINT64_C(0xBF9A01BFB241C9C9),
-		UINT64_C(0xE22CBF0C6D62D588), UINT64_C(0x2941D59D2783DEB7),
-		UINT64_C(0x5840C26BD225ED0A), UINT64_C(0x932DA8FA98C4E635),
-		UINT64_C(0xCE9B164947E7FA74), UINT64_C(0x05F67CD80D06F14B),
-		UINT64_C(0xC477EFF95CEB18E3), UINT64_C(0x0F1A8568160A13DC),
-		UINT64_C(0x52AC3BDBC9290F9D), UINT64_C(0x99C1514A83C804A2),
-		UINT64_C(0xE8C046BC766E371F), UINT64_C(0x23AD2C2D3C8F3C20),
-		UINT64_C(0x7E1B929EE3AC2061), UINT64_C(0xB576F80FA94D2B5E),
-		UINT64_C(0x1907B2DD234E9F89), UINT64_C(0xD26AD84C69AF94B6),
-		UINT64_C(0x8FDC66FFB68C88F7), UINT64_C(0x44B10C6EFC6D83C8),
-		UINT64_C(0x35B01B9809CBB075), UINT64_C(0xFEDD7109432ABB4A),
-		UINT64_C(0xA36BCFBA9C09A70B), UINT64_C(0x6806A52BD6E8AC34),
-		UINT64_C(0x7E9655B1A2A11736), UINT64_C(0xB5FB3F20E8401C09),
-		UINT64_C(0xE84D819337630048), UINT64_C(0x2320EB027D820B77),
-		UINT64_C(0x5221FCF4882438CA), UINT64_C(0x994C9665C2C533F5),
-		UINT64_C(0xC4FA28D61DE62FB4), UINT64_C(0x0F9742475707248B),
-		UINT64_C(0xA3E60895DD04905C), UINT64_C(0x688B620497E59B63),
-		UINT64_C(0x353DDCB748C68722), UINT64_C(0xFE50B62602278C1D),
-		UINT64_C(0x8F51A1D0F781BFA0), UINT64_C(0x443CCB41BD60B49F),
-		UINT64_C(0x198A75F26243A8DE), UINT64_C(0xD2E71F6328A2A3E1),
-		UINT64_C(0x35AA94C78BD1DEDB), UINT64_C(0xFEC7FE56C130D5E4),
-		UINT64_C(0xA37140E51E13C9A5), UINT64_C(0x681C2A7454F2C29A),
-		UINT64_C(0x191D3D82A154F127), UINT64_C(0xD2705713EBB5FA18),
-		UINT64_C(0x8FC6E9A03496E659), UINT64_C(0x44AB83317E77ED66),
-		UINT64_C(0xE8DAC9E3F47459B1), UINT64_C(0x23B7A372BE95528E),
-		UINT64_C(0x7E011DC161B64ECF), UINT64_C(0xB56C77502B5745F0),
-		UINT64_C(0xC46D60A6DEF1764D), UINT64_C(0x0F000A3794107D72),
-		UINT64_C(0x52B6B4844B336133), UINT64_C(0x99DBDE1501D26A0C),
-		UINT64_C(0x8F4B2E8F759BD10E), UINT64_C(0x4426441E3F7ADA31),
-		UINT64_C(0x1990FAADE059C670), UINT64_C(0xD2FD903CAAB8CD4F),
-		UINT64_C(0xA3FC87CA5F1EFEF2), UINT64_C(0x6891ED5B15FFF5CD),
-		UINT64_C(0x352753E8CADCE98C), UINT64_C(0xFE4A3979803DE2B3),
-		UINT64_C(0x523B73AB0A3E5664), UINT64_C(0x9956193A40DF5D5B),
-		UINT64_C(0xC4E0A7899FFC411A), UINT64_C(0x0F8DCD18D51D4A25),
-		UINT64_C(0x7E8CDAEE20BB7998), UINT64_C(0xB5E1B07F6A5A72A7),
-		UINT64_C(0xE8570ECCB5796EE6), UINT64_C(0x233A645DFF9865D9),
-		UINT64_C(0x26CC1885F29E9492), UINT64_C(0xEDA17214B87F9FAD),
-		UINT64_C(0xB017CCA7675C83EC), UINT64_C(0x7B7AA6362DBD88D3),
-		UINT64_C(0x0A7BB1C0D81BBB6E), UINT64_C(0xC116DB5192FAB051),
-		UINT64_C(0x9CA065E24DD9AC10), UINT64_C(0x57CD0F730738A72F),
-		UINT64_C(0xFBBC45A18D3B13F8), UINT64_C(0x30D12F30C7DA18C7),
-		UINT64_C(0x6D67918318F90486), UINT64_C(0xA60AFB1252180FB9),
-		UINT64_C(0xD70BECE4A7BE3C04), UINT64_C(0x1C668675ED5F373B),
-		UINT64_C(0x41D038C6327C2B7A), UINT64_C(0x8ABD5257789D2045),
-		UINT64_C(0x9C2DA2CD0CD49B47), UINT64_C(0x5740C85C46359078),
-		UINT64_C(0x0AF676EF99168C39), UINT64_C(0xC19B1C7ED3F78706),
-		UINT64_C(0xB09A0B882651B4BB), UINT64_C(0x7BF761196CB0BF84),
-		UINT64_C(0x2641DFAAB393A3C5), UINT64_C(0xED2CB53BF972A8FA),
-		UINT64_C(0x415DFFE973711C2D), UINT64_C(0x8A30957839901712),
-		UINT64_C(0xD7862BCBE6B30B53), UINT64_C(0x1CEB415AAC52006C),
-		UINT64_C(0x6DEA56AC59F433D1), UINT64_C(0xA6873C3D131538EE),
-		UINT64_C(0xFB31828ECC3624AF), UINT64_C(0x305CE81F86D72F90),
-		UINT64_C(0xD71163BB25A452AA), UINT64_C(0x1C7C092A6F455995),
-		UINT64_C(0x41CAB799B06645D4), UINT64_C(0x8AA7DD08FA874EEB),
-		UINT64_C(0xFBA6CAFE0F217D56), UINT64_C(0x30CBA06F45C07669),
-		UINT64_C(0x6D7D1EDC9AE36A28), UINT64_C(0xA610744DD0026117),
-		UINT64_C(0x0A613E9F5A01D5C0), UINT64_C(0xC10C540E10E0DEFF),
-		UINT64_C(0x9CBAEABDCFC3C2BE), UINT64_C(0x57D7802C8522C981),
-		UINT64_C(0x26D697DA7084FA3C), UINT64_C(0xEDBBFD4B3A65F103),
-		UINT64_C(0xB00D43F8E546ED42), UINT64_C(0x7B602969AFA7E67D),
-		UINT64_C(0x6DF0D9F3DBEE5D7F), UINT64_C(0xA69DB362910F5640),
-		UINT64_C(0xFB2B0DD14E2C4A01), UINT64_C(0x3046674004CD413E),
-		UINT64_C(0x414770B6F16B7283), UINT64_C(0x8A2A1A27BB8A79BC),
-		UINT64_C(0xD79CA49464A965FD), UINT64_C(0x1CF1CE052E486EC2),
-		UINT64_C(0xB08084D7A44BDA15), UINT64_C(0x7BEDEE46EEAAD12A),
-		UINT64_C(0x265B50F53189CD6B), UINT64_C(0xED363A647B68C654),
-		UINT64_C(0x9C372D928ECEF5E9), UINT64_C(0x575A4703C42FFED6),
-		UINT64_C(0x0AECF9B01B0CE297), UINT64_C(0xC181932151EDE9A8)
-	}, {
-		UINT64_C(0x0000000000000000), UINT64_C(0xDCA12C225E8AEE1D),
-		UINT64_C(0xB8435944BC14DD3B), UINT64_C(0x64E27566E29E3326),
-		UINT64_C(0x7087B2887829BA77), UINT64_C(0xAC269EAA26A3546A),
-		UINT64_C(0xC8C4EBCCC43D674C), UINT64_C(0x1465C7EE9AB78951),
-		UINT64_C(0xE00E6511F15274EF), UINT64_C(0x3CAF4933AFD89AF2),
-		UINT64_C(0x584D3C554D46A9D4), UINT64_C(0x84EC107713CC47C9),
-		UINT64_C(0x9089D799897BCE98), UINT64_C(0x4C28FBBBD7F12085),
-		UINT64_C(0x28CA8EDD356F13A3), UINT64_C(0xF46BA2FF6BE5FDBE),
-		UINT64_C(0x4503C48DC90A304C), UINT64_C(0x99A2E8AF9780DE51),
-		UINT64_C(0xFD409DC9751EED77), UINT64_C(0x21E1B1EB2B94036A),
-		UINT64_C(0x35847605B1238A3B), UINT64_C(0xE9255A27EFA96426),
-		UINT64_C(0x8DC72F410D375700), UINT64_C(0x5166036353BDB91D),
-		UINT64_C(0xA50DA19C385844A3), UINT64_C(0x79AC8DBE66D2AABE),
-		UINT64_C(0x1D4EF8D8844C9998), UINT64_C(0xC1EFD4FADAC67785),
-		UINT64_C(0xD58A13144071FED4), UINT64_C(0x092B3F361EFB10C9),
-		UINT64_C(0x6DC94A50FC6523EF), UINT64_C(0xB1686672A2EFCDF2),
-		UINT64_C(0x8A06881B93156098), UINT64_C(0x56A7A439CD9F8E85),
-		UINT64_C(0x3245D15F2F01BDA3), UINT64_C(0xEEE4FD7D718B53BE),
-		UINT64_C(0xFA813A93EB3CDAEF), UINT64_C(0x262016B1B5B634F2),
-		UINT64_C(0x42C263D7572807D4), UINT64_C(0x9E634FF509A2E9C9),
-		UINT64_C(0x6A08ED0A62471477), UINT64_C(0xB6A9C1283CCDFA6A),
-		UINT64_C(0xD24BB44EDE53C94C), UINT64_C(0x0EEA986C80D92751),
-		UINT64_C(0x1A8F5F821A6EAE00), UINT64_C(0xC62E73A044E4401D),
-		UINT64_C(0xA2CC06C6A67A733B), UINT64_C(0x7E6D2AE4F8F09D26),
-		UINT64_C(0xCF054C965A1F50D4), UINT64_C(0x13A460B40495BEC9),
-		UINT64_C(0x774615D2E60B8DEF), UINT64_C(0xABE739F0B88163F2),
-		UINT64_C(0xBF82FE1E2236EAA3), UINT64_C(0x6323D23C7CBC04BE),
-		UINT64_C(0x07C1A75A9E223798), UINT64_C(0xDB608B78C0A8D985),
-		UINT64_C(0x2F0B2987AB4D243B), UINT64_C(0xF3AA05A5F5C7CA26),
-		UINT64_C(0x974870C31759F900), UINT64_C(0x4BE95CE149D3171D),
-		UINT64_C(0x5F8C9B0FD3649E4C), UINT64_C(0x832DB72D8DEE7051),
-		UINT64_C(0xE7CFC24B6F704377), UINT64_C(0x3B6EEE6931FAAD6A),
-		UINT64_C(0x91131E980D8418A2), UINT64_C(0x4DB232BA530EF6BF),
-		UINT64_C(0x295047DCB190C599), UINT64_C(0xF5F16BFEEF1A2B84),
-		UINT64_C(0xE194AC1075ADA2D5), UINT64_C(0x3D3580322B274CC8),
-		UINT64_C(0x59D7F554C9B97FEE), UINT64_C(0x8576D976973391F3),
-		UINT64_C(0x711D7B89FCD66C4D), UINT64_C(0xADBC57ABA25C8250),
-		UINT64_C(0xC95E22CD40C2B176), UINT64_C(0x15FF0EEF1E485F6B),
-		UINT64_C(0x019AC90184FFD63A), UINT64_C(0xDD3BE523DA753827),
-		UINT64_C(0xB9D9904538EB0B01), UINT64_C(0x6578BC676661E51C),
-		UINT64_C(0xD410DA15C48E28EE), UINT64_C(0x08B1F6379A04C6F3),
-		UINT64_C(0x6C538351789AF5D5), UINT64_C(0xB0F2AF7326101BC8),
-		UINT64_C(0xA497689DBCA79299), UINT64_C(0x783644BFE22D7C84),
-		UINT64_C(0x1CD431D900B34FA2), UINT64_C(0xC0751DFB5E39A1BF),
-		UINT64_C(0x341EBF0435DC5C01), UINT64_C(0xE8BF93266B56B21C),
-		UINT64_C(0x8C5DE64089C8813A), UINT64_C(0x50FCCA62D7426F27),
-		UINT64_C(0x44990D8C4DF5E676), UINT64_C(0x983821AE137F086B),
-		UINT64_C(0xFCDA54C8F1E13B4D), UINT64_C(0x207B78EAAF6BD550),
-		UINT64_C(0x1B1596839E91783A), UINT64_C(0xC7B4BAA1C01B9627),
-		UINT64_C(0xA356CFC72285A501), UINT64_C(0x7FF7E3E57C0F4B1C),
-		UINT64_C(0x6B92240BE6B8C24D), UINT64_C(0xB7330829B8322C50),
-		UINT64_C(0xD3D17D4F5AAC1F76), UINT64_C(0x0F70516D0426F16B),
-		UINT64_C(0xFB1BF3926FC30CD5), UINT64_C(0x27BADFB03149E2C8),
-		UINT64_C(0x4358AAD6D3D7D1EE), UINT64_C(0x9FF986F48D5D3FF3),
-		UINT64_C(0x8B9C411A17EAB6A2), UINT64_C(0x573D6D38496058BF),
-		UINT64_C(0x33DF185EABFE6B99), UINT64_C(0xEF7E347CF5748584),
-		UINT64_C(0x5E16520E579B4876), UINT64_C(0x82B77E2C0911A66B),
-		UINT64_C(0xE6550B4AEB8F954D), UINT64_C(0x3AF42768B5057B50),
-		UINT64_C(0x2E91E0862FB2F201), UINT64_C(0xF230CCA471381C1C),
-		UINT64_C(0x96D2B9C293A62F3A), UINT64_C(0x4A7395E0CD2CC127),
-		UINT64_C(0xBE18371FA6C93C99), UINT64_C(0x62B91B3DF843D284),
-		UINT64_C(0x065B6E5B1ADDE1A2), UINT64_C(0xDAFA427944570FBF),
-		UINT64_C(0xCE9F8597DEE086EE), UINT64_C(0x123EA9B5806A68F3),
-		UINT64_C(0x76DCDCD362F45BD5), UINT64_C(0xAA7DF0F13C7EB5C8),
-		UINT64_C(0xA739329F30A7E9D6), UINT64_C(0x7B981EBD6E2D07CB),
-		UINT64_C(0x1F7A6BDB8CB334ED), UINT64_C(0xC3DB47F9D239DAF0),
-		UINT64_C(0xD7BE8017488E53A1), UINT64_C(0x0B1FAC351604BDBC),
-		UINT64_C(0x6FFDD953F49A8E9A), UINT64_C(0xB35CF571AA106087),
-		UINT64_C(0x4737578EC1F59D39), UINT64_C(0x9B967BAC9F7F7324),
-		UINT64_C(0xFF740ECA7DE14002), UINT64_C(0x23D522E8236BAE1F),
-		UINT64_C(0x37B0E506B9DC274E), UINT64_C(0xEB11C924E756C953),
-		UINT64_C(0x8FF3BC4205C8FA75), UINT64_C(0x535290605B421468),
-		UINT64_C(0xE23AF612F9ADD99A), UINT64_C(0x3E9BDA30A7273787),
-		UINT64_C(0x5A79AF5645B904A1), UINT64_C(0x86D883741B33EABC),
-		UINT64_C(0x92BD449A818463ED), UINT64_C(0x4E1C68B8DF0E8DF0),
-		UINT64_C(0x2AFE1DDE3D90BED6), UINT64_C(0xF65F31FC631A50CB),
-		UINT64_C(0x0234930308FFAD75), UINT64_C(0xDE95BF2156754368),
-		UINT64_C(0xBA77CA47B4EB704E), UINT64_C(0x66D6E665EA619E53),
-		UINT64_C(0x72B3218B70D61702), UINT64_C(0xAE120DA92E5CF91F),
-		UINT64_C(0xCAF078CFCCC2CA39), UINT64_C(0x165154ED92482424),
-		UINT64_C(0x2D3FBA84A3B2894E), UINT64_C(0xF19E96A6FD386753),
-		UINT64_C(0x957CE3C01FA65475), UINT64_C(0x49DDCFE2412CBA68),
-		UINT64_C(0x5DB8080CDB9B3339), UINT64_C(0x8119242E8511DD24),
-		UINT64_C(0xE5FB5148678FEE02), UINT64_C(0x395A7D6A3905001F),
-		UINT64_C(0xCD31DF9552E0FDA1), UINT64_C(0x1190F3B70C6A13BC),
-		UINT64_C(0x757286D1EEF4209A), UINT64_C(0xA9D3AAF3B07ECE87),
-		UINT64_C(0xBDB66D1D2AC947D6), UINT64_C(0x6117413F7443A9CB),
-		UINT64_C(0x05F5345996DD9AED), UINT64_C(0xD954187BC85774F0),
-		UINT64_C(0x683C7E096AB8B902), UINT64_C(0xB49D522B3432571F),
-		UINT64_C(0xD07F274DD6AC6439), UINT64_C(0x0CDE0B6F88268A24),
-		UINT64_C(0x18BBCC8112910375), UINT64_C(0xC41AE0A34C1BED68),
-		UINT64_C(0xA0F895C5AE85DE4E), UINT64_C(0x7C59B9E7F00F3053),
-		UINT64_C(0x88321B189BEACDED), UINT64_C(0x5493373AC56023F0),
-		UINT64_C(0x3071425C27FE10D6), UINT64_C(0xECD06E7E7974FECB),
-		UINT64_C(0xF8B5A990E3C3779A), UINT64_C(0x241485B2BD499987),
-		UINT64_C(0x40F6F0D45FD7AAA1), UINT64_C(0x9C57DCF6015D44BC),
-		UINT64_C(0x362A2C073D23F174), UINT64_C(0xEA8B002563A91F69),
-		UINT64_C(0x8E69754381372C4F), UINT64_C(0x52C85961DFBDC252),
-		UINT64_C(0x46AD9E8F450A4B03), UINT64_C(0x9A0CB2AD1B80A51E),
-		UINT64_C(0xFEEEC7CBF91E9638), UINT64_C(0x224FEBE9A7947825),
-		UINT64_C(0xD6244916CC71859B), UINT64_C(0x0A85653492FB6B86),
-		UINT64_C(0x6E671052706558A0), UINT64_C(0xB2C63C702EEFB6BD),
-		UINT64_C(0xA6A3FB9EB4583FEC), UINT64_C(0x7A02D7BCEAD2D1F1),
-		UINT64_C(0x1EE0A2DA084CE2D7), UINT64_C(0xC2418EF856C60CCA),
-		UINT64_C(0x7329E88AF429C138), UINT64_C(0xAF88C4A8AAA32F25),
-		UINT64_C(0xCB6AB1CE483D1C03), UINT64_C(0x17CB9DEC16B7F21E),
-		UINT64_C(0x03AE5A028C007B4F), UINT64_C(0xDF0F7620D28A9552),
-		UINT64_C(0xBBED03463014A674), UINT64_C(0x674C2F646E9E4869),
-		UINT64_C(0x93278D9B057BB5D7), UINT64_C(0x4F86A1B95BF15BCA),
-		UINT64_C(0x2B64D4DFB96F68EC), UINT64_C(0xF7C5F8FDE7E586F1),
-		UINT64_C(0xE3A03F137D520FA0), UINT64_C(0x3F01133123D8E1BD),
-		UINT64_C(0x5BE36657C146D29B), UINT64_C(0x87424A759FCC3C86),
-		UINT64_C(0xBC2CA41CAE3691EC), UINT64_C(0x608D883EF0BC7FF1),
-		UINT64_C(0x046FFD5812224CD7), UINT64_C(0xD8CED17A4CA8A2CA),
-		UINT64_C(0xCCAB1694D61F2B9B), UINT64_C(0x100A3AB68895C586),
-		UINT64_C(0x74E84FD06A0BF6A0), UINT64_C(0xA84963F2348118BD),
-		UINT64_C(0x5C22C10D5F64E503), UINT64_C(0x8083ED2F01EE0B1E),
-		UINT64_C(0xE4619849E3703838), UINT64_C(0x38C0B46BBDFAD625),
-		UINT64_C(0x2CA57385274D5F74), UINT64_C(0xF0045FA779C7B169),
-		UINT64_C(0x94E62AC19B59824F), UINT64_C(0x484706E3C5D36C52),
-		UINT64_C(0xF92F6091673CA1A0), UINT64_C(0x258E4CB339B64FBD),
-		UINT64_C(0x416C39D5DB287C9B), UINT64_C(0x9DCD15F785A29286),
-		UINT64_C(0x89A8D2191F151BD7), UINT64_C(0x5509FE3B419FF5CA),
-		UINT64_C(0x31EB8B5DA301C6EC), UINT64_C(0xED4AA77FFD8B28F1),
-		UINT64_C(0x19210580966ED54F), UINT64_C(0xC58029A2C8E43B52),
-		UINT64_C(0xA1625CC42A7A0874), UINT64_C(0x7DC370E674F0E669),
-		UINT64_C(0x69A6B708EE476F38), UINT64_C(0xB5079B2AB0CD8125),
-		UINT64_C(0xD1E5EE4C5253B203), UINT64_C(0x0D44C26E0CD95C1E)
-	}
-};
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_table.c r-base-3.3.1/src/extra/xz/check/crc64_table.c
--- r-base-3.2.3/src/extra/xz/check/crc64_table.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_table.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc64_table.c
-/// \brief      Precalculated CRC64 table with correct endianness
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-#ifdef WORDS_BIGENDIAN
-#	include "crc64_table_be.h"
-#else
-#	include "crc64_table_le.h"
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_tablegen.c r-base-3.3.1/src/extra/xz/check/crc64_tablegen.c
--- r-base-3.2.3/src/extra/xz/check/crc64_tablegen.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_tablegen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc64_tablegen.c
-/// \brief      Generate crc64_table_le.h and crc64_table_be.h
-///
-/// Compiling: gcc -std=c99 -o crc64_tablegen crc64_tablegen.c
-/// Add -DWORDS_BIGENDIAN to generate big endian table.
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include "../../common/tuklib_integer.h"
-
-
-static uint64_t crc64_table[4][256];
-
-
-extern void
-init_crc64_table(void)
-{
-	static const uint64_t poly64 = UINT64_C(0xC96C5795D7870F42);
-
-	for (size_t s = 0; s < 4; ++s) {
-		for (size_t b = 0; b < 256; ++b) {
-			uint64_t r = s == 0 ? b : crc64_table[s - 1][b];
-
-			for (size_t i = 0; i < 8; ++i) {
-				if (r & 1)
-					r = (r >> 1) ^ poly64;
-				else
-					r >>= 1;
-			}
-
-			crc64_table[s][b] = r;
-		}
-	}
-
-#ifdef WORDS_BIGENDIAN
-	for (size_t s = 0; s < 4; ++s)
-		for (size_t b = 0; b < 256; ++b)
-			crc64_table[s][b] = bswap64(crc64_table[s][b]);
-#endif
-
-	return;
-}
-
-
-static void
-print_crc64_table(void)
-{
-	printf("/* This file has been automatically generated by "
-			"crc64_tablegen.c. */\n\n"
-			"const uint64_t lzma_crc64_table[4][256] = {\n\t{");
-
-	for (size_t s = 0; s < 4; ++s) {
-		for (size_t b = 0; b < 256; ++b) {
-			if ((b % 2) == 0)
-				printf("\n\t\t");
-
-			printf("UINT64_C(0x%016" PRIX64 ")",
-					crc64_table[s][b]);
-
-			if (b != 255)
-				printf(",%s", (b+1) % 2 == 0 ? "" : " ");
-		}
-
-		if (s == 3)
-			printf("\n\t}\n};\n");
-		else
-			printf("\n\t}, {");
-	}
-
-	return;
-}
-
-
-int
-main(void)
-{
-	init_crc64_table();
-	print_crc64_table();
-	return 0;
-}
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_table_le.h r-base-3.3.1/src/extra/xz/check/crc64_table_le.h
--- r-base-3.2.3/src/extra/xz/check/crc64_table_le.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_table_le.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,521 +0,0 @@
-/* This file has been automatically generated by crc64_tablegen.c. */
-
-const uint64_t lzma_crc64_table[4][256] = {
-	{
-		UINT64_C(0x0000000000000000), UINT64_C(0xB32E4CBE03A75F6F),
-		UINT64_C(0xF4843657A840A05B), UINT64_C(0x47AA7AE9ABE7FF34),
-		UINT64_C(0x7BD0C384FF8F5E33), UINT64_C(0xC8FE8F3AFC28015C),
-		UINT64_C(0x8F54F5D357CFFE68), UINT64_C(0x3C7AB96D5468A107),
-		UINT64_C(0xF7A18709FF1EBC66), UINT64_C(0x448FCBB7FCB9E309),
-		UINT64_C(0x0325B15E575E1C3D), UINT64_C(0xB00BFDE054F94352),
-		UINT64_C(0x8C71448D0091E255), UINT64_C(0x3F5F08330336BD3A),
-		UINT64_C(0x78F572DAA8D1420E), UINT64_C(0xCBDB3E64AB761D61),
-		UINT64_C(0x7D9BA13851336649), UINT64_C(0xCEB5ED8652943926),
-		UINT64_C(0x891F976FF973C612), UINT64_C(0x3A31DBD1FAD4997D),
-		UINT64_C(0x064B62BCAEBC387A), UINT64_C(0xB5652E02AD1B6715),
-		UINT64_C(0xF2CF54EB06FC9821), UINT64_C(0x41E11855055BC74E),
-		UINT64_C(0x8A3A2631AE2DDA2F), UINT64_C(0x39146A8FAD8A8540),
-		UINT64_C(0x7EBE1066066D7A74), UINT64_C(0xCD905CD805CA251B),
-		UINT64_C(0xF1EAE5B551A2841C), UINT64_C(0x42C4A90B5205DB73),
-		UINT64_C(0x056ED3E2F9E22447), UINT64_C(0xB6409F5CFA457B28),
-		UINT64_C(0xFB374270A266CC92), UINT64_C(0x48190ECEA1C193FD),
-		UINT64_C(0x0FB374270A266CC9), UINT64_C(0xBC9D3899098133A6),
-		UINT64_C(0x80E781F45DE992A1), UINT64_C(0x33C9CD4A5E4ECDCE),
-		UINT64_C(0x7463B7A3F5A932FA), UINT64_C(0xC74DFB1DF60E6D95),
-		UINT64_C(0x0C96C5795D7870F4), UINT64_C(0xBFB889C75EDF2F9B),
-		UINT64_C(0xF812F32EF538D0AF), UINT64_C(0x4B3CBF90F69F8FC0),
-		UINT64_C(0x774606FDA2F72EC7), UINT64_C(0xC4684A43A15071A8),
-		UINT64_C(0x83C230AA0AB78E9C), UINT64_C(0x30EC7C140910D1F3),
-		UINT64_C(0x86ACE348F355AADB), UINT64_C(0x3582AFF6F0F2F5B4),
-		UINT64_C(0x7228D51F5B150A80), UINT64_C(0xC10699A158B255EF),
-		UINT64_C(0xFD7C20CC0CDAF4E8), UINT64_C(0x4E526C720F7DAB87),
-		UINT64_C(0x09F8169BA49A54B3), UINT64_C(0xBAD65A25A73D0BDC),
-		UINT64_C(0x710D64410C4B16BD), UINT64_C(0xC22328FF0FEC49D2),
-		UINT64_C(0x85895216A40BB6E6), UINT64_C(0x36A71EA8A7ACE989),
-		UINT64_C(0x0ADDA7C5F3C4488E), UINT64_C(0xB9F3EB7BF06317E1),
-		UINT64_C(0xFE5991925B84E8D5), UINT64_C(0x4D77DD2C5823B7BA),
-		UINT64_C(0x64B62BCAEBC387A1), UINT64_C(0xD7986774E864D8CE),
-		UINT64_C(0x90321D9D438327FA), UINT64_C(0x231C512340247895),
-		UINT64_C(0x1F66E84E144CD992), UINT64_C(0xAC48A4F017EB86FD),
-		UINT64_C(0xEBE2DE19BC0C79C9), UINT64_C(0x58CC92A7BFAB26A6),
-		UINT64_C(0x9317ACC314DD3BC7), UINT64_C(0x2039E07D177A64A8),
-		UINT64_C(0x67939A94BC9D9B9C), UINT64_C(0xD4BDD62ABF3AC4F3),
-		UINT64_C(0xE8C76F47EB5265F4), UINT64_C(0x5BE923F9E8F53A9B),
-		UINT64_C(0x1C4359104312C5AF), UINT64_C(0xAF6D15AE40B59AC0),
-		UINT64_C(0x192D8AF2BAF0E1E8), UINT64_C(0xAA03C64CB957BE87),
-		UINT64_C(0xEDA9BCA512B041B3), UINT64_C(0x5E87F01B11171EDC),
-		UINT64_C(0x62FD4976457FBFDB), UINT64_C(0xD1D305C846D8E0B4),
-		UINT64_C(0x96797F21ED3F1F80), UINT64_C(0x2557339FEE9840EF),
-		UINT64_C(0xEE8C0DFB45EE5D8E), UINT64_C(0x5DA24145464902E1),
-		UINT64_C(0x1A083BACEDAEFDD5), UINT64_C(0xA9267712EE09A2BA),
-		UINT64_C(0x955CCE7FBA6103BD), UINT64_C(0x267282C1B9C65CD2),
-		UINT64_C(0x61D8F8281221A3E6), UINT64_C(0xD2F6B4961186FC89),
-		UINT64_C(0x9F8169BA49A54B33), UINT64_C(0x2CAF25044A02145C),
-		UINT64_C(0x6B055FEDE1E5EB68), UINT64_C(0xD82B1353E242B407),
-		UINT64_C(0xE451AA3EB62A1500), UINT64_C(0x577FE680B58D4A6F),
-		UINT64_C(0x10D59C691E6AB55B), UINT64_C(0xA3FBD0D71DCDEA34),
-		UINT64_C(0x6820EEB3B6BBF755), UINT64_C(0xDB0EA20DB51CA83A),
-		UINT64_C(0x9CA4D8E41EFB570E), UINT64_C(0x2F8A945A1D5C0861),
-		UINT64_C(0x13F02D374934A966), UINT64_C(0xA0DE61894A93F609),
-		UINT64_C(0xE7741B60E174093D), UINT64_C(0x545A57DEE2D35652),
-		UINT64_C(0xE21AC88218962D7A), UINT64_C(0x5134843C1B317215),
-		UINT64_C(0x169EFED5B0D68D21), UINT64_C(0xA5B0B26BB371D24E),
-		UINT64_C(0x99CA0B06E7197349), UINT64_C(0x2AE447B8E4BE2C26),
-		UINT64_C(0x6D4E3D514F59D312), UINT64_C(0xDE6071EF4CFE8C7D),
-		UINT64_C(0x15BB4F8BE788911C), UINT64_C(0xA6950335E42FCE73),
-		UINT64_C(0xE13F79DC4FC83147), UINT64_C(0x521135624C6F6E28),
-		UINT64_C(0x6E6B8C0F1807CF2F), UINT64_C(0xDD45C0B11BA09040),
-		UINT64_C(0x9AEFBA58B0476F74), UINT64_C(0x29C1F6E6B3E0301B),
-		UINT64_C(0xC96C5795D7870F42), UINT64_C(0x7A421B2BD420502D),
-		UINT64_C(0x3DE861C27FC7AF19), UINT64_C(0x8EC62D7C7C60F076),
-		UINT64_C(0xB2BC941128085171), UINT64_C(0x0192D8AF2BAF0E1E),
-		UINT64_C(0x4638A2468048F12A), UINT64_C(0xF516EEF883EFAE45),
-		UINT64_C(0x3ECDD09C2899B324), UINT64_C(0x8DE39C222B3EEC4B),
-		UINT64_C(0xCA49E6CB80D9137F), UINT64_C(0x7967AA75837E4C10),
-		UINT64_C(0x451D1318D716ED17), UINT64_C(0xF6335FA6D4B1B278),
-		UINT64_C(0xB199254F7F564D4C), UINT64_C(0x02B769F17CF11223),
-		UINT64_C(0xB4F7F6AD86B4690B), UINT64_C(0x07D9BA1385133664),
-		UINT64_C(0x4073C0FA2EF4C950), UINT64_C(0xF35D8C442D53963F),
-		UINT64_C(0xCF273529793B3738), UINT64_C(0x7C0979977A9C6857),
-		UINT64_C(0x3BA3037ED17B9763), UINT64_C(0x888D4FC0D2DCC80C),
-		UINT64_C(0x435671A479AAD56D), UINT64_C(0xF0783D1A7A0D8A02),
-		UINT64_C(0xB7D247F3D1EA7536), UINT64_C(0x04FC0B4DD24D2A59),
-		UINT64_C(0x3886B22086258B5E), UINT64_C(0x8BA8FE9E8582D431),
-		UINT64_C(0xCC0284772E652B05), UINT64_C(0x7F2CC8C92DC2746A),
-		UINT64_C(0x325B15E575E1C3D0), UINT64_C(0x8175595B76469CBF),
-		UINT64_C(0xC6DF23B2DDA1638B), UINT64_C(0x75F16F0CDE063CE4),
-		UINT64_C(0x498BD6618A6E9DE3), UINT64_C(0xFAA59ADF89C9C28C),
-		UINT64_C(0xBD0FE036222E3DB8), UINT64_C(0x0E21AC88218962D7),
-		UINT64_C(0xC5FA92EC8AFF7FB6), UINT64_C(0x76D4DE52895820D9),
-		UINT64_C(0x317EA4BB22BFDFED), UINT64_C(0x8250E80521188082),
-		UINT64_C(0xBE2A516875702185), UINT64_C(0x0D041DD676D77EEA),
-		UINT64_C(0x4AAE673FDD3081DE), UINT64_C(0xF9802B81DE97DEB1),
-		UINT64_C(0x4FC0B4DD24D2A599), UINT64_C(0xFCEEF8632775FAF6),
-		UINT64_C(0xBB44828A8C9205C2), UINT64_C(0x086ACE348F355AAD),
-		UINT64_C(0x34107759DB5DFBAA), UINT64_C(0x873E3BE7D8FAA4C5),
-		UINT64_C(0xC094410E731D5BF1), UINT64_C(0x73BA0DB070BA049E),
-		UINT64_C(0xB86133D4DBCC19FF), UINT64_C(0x0B4F7F6AD86B4690),
-		UINT64_C(0x4CE50583738CB9A4), UINT64_C(0xFFCB493D702BE6CB),
-		UINT64_C(0xC3B1F050244347CC), UINT64_C(0x709FBCEE27E418A3),
-		UINT64_C(0x3735C6078C03E797), UINT64_C(0x841B8AB98FA4B8F8),
-		UINT64_C(0xADDA7C5F3C4488E3), UINT64_C(0x1EF430E13FE3D78C),
-		UINT64_C(0x595E4A08940428B8), UINT64_C(0xEA7006B697A377D7),
-		UINT64_C(0xD60ABFDBC3CBD6D0), UINT64_C(0x6524F365C06C89BF),
-		UINT64_C(0x228E898C6B8B768B), UINT64_C(0x91A0C532682C29E4),
-		UINT64_C(0x5A7BFB56C35A3485), UINT64_C(0xE955B7E8C0FD6BEA),
-		UINT64_C(0xAEFFCD016B1A94DE), UINT64_C(0x1DD181BF68BDCBB1),
-		UINT64_C(0x21AB38D23CD56AB6), UINT64_C(0x9285746C3F7235D9),
-		UINT64_C(0xD52F0E859495CAED), UINT64_C(0x6601423B97329582),
-		UINT64_C(0xD041DD676D77EEAA), UINT64_C(0x636F91D96ED0B1C5),
-		UINT64_C(0x24C5EB30C5374EF1), UINT64_C(0x97EBA78EC690119E),
-		UINT64_C(0xAB911EE392F8B099), UINT64_C(0x18BF525D915FEFF6),
-		UINT64_C(0x5F1528B43AB810C2), UINT64_C(0xEC3B640A391F4FAD),
-		UINT64_C(0x27E05A6E926952CC), UINT64_C(0x94CE16D091CE0DA3),
-		UINT64_C(0xD3646C393A29F297), UINT64_C(0x604A2087398EADF8),
-		UINT64_C(0x5C3099EA6DE60CFF), UINT64_C(0xEF1ED5546E415390),
-		UINT64_C(0xA8B4AFBDC5A6ACA4), UINT64_C(0x1B9AE303C601F3CB),
-		UINT64_C(0x56ED3E2F9E224471), UINT64_C(0xE5C372919D851B1E),
-		UINT64_C(0xA26908783662E42A), UINT64_C(0x114744C635C5BB45),
-		UINT64_C(0x2D3DFDAB61AD1A42), UINT64_C(0x9E13B115620A452D),
-		UINT64_C(0xD9B9CBFCC9EDBA19), UINT64_C(0x6A978742CA4AE576),
-		UINT64_C(0xA14CB926613CF817), UINT64_C(0x1262F598629BA778),
-		UINT64_C(0x55C88F71C97C584C), UINT64_C(0xE6E6C3CFCADB0723),
-		UINT64_C(0xDA9C7AA29EB3A624), UINT64_C(0x69B2361C9D14F94B),
-		UINT64_C(0x2E184CF536F3067F), UINT64_C(0x9D36004B35545910),
-		UINT64_C(0x2B769F17CF112238), UINT64_C(0x9858D3A9CCB67D57),
-		UINT64_C(0xDFF2A94067518263), UINT64_C(0x6CDCE5FE64F6DD0C),
-		UINT64_C(0x50A65C93309E7C0B), UINT64_C(0xE388102D33392364),
-		UINT64_C(0xA4226AC498DEDC50), UINT64_C(0x170C267A9B79833F),
-		UINT64_C(0xDCD7181E300F9E5E), UINT64_C(0x6FF954A033A8C131),
-		UINT64_C(0x28532E49984F3E05), UINT64_C(0x9B7D62F79BE8616A),
-		UINT64_C(0xA707DB9ACF80C06D), UINT64_C(0x14299724CC279F02),
-		UINT64_C(0x5383EDCD67C06036), UINT64_C(0xE0ADA17364673F59)
-	}, {
-		UINT64_C(0x0000000000000000), UINT64_C(0x54E979925CD0F10D),
-		UINT64_C(0xA9D2F324B9A1E21A), UINT64_C(0xFD3B8AB6E5711317),
-		UINT64_C(0xC17D4962DC4DDAB1), UINT64_C(0x959430F0809D2BBC),
-		UINT64_C(0x68AFBA4665EC38AB), UINT64_C(0x3C46C3D4393CC9A6),
-		UINT64_C(0x10223DEE1795ABE7), UINT64_C(0x44CB447C4B455AEA),
-		UINT64_C(0xB9F0CECAAE3449FD), UINT64_C(0xED19B758F2E4B8F0),
-		UINT64_C(0xD15F748CCBD87156), UINT64_C(0x85B60D1E9708805B),
-		UINT64_C(0x788D87A87279934C), UINT64_C(0x2C64FE3A2EA96241),
-		UINT64_C(0x20447BDC2F2B57CE), UINT64_C(0x74AD024E73FBA6C3),
-		UINT64_C(0x899688F8968AB5D4), UINT64_C(0xDD7FF16ACA5A44D9),
-		UINT64_C(0xE13932BEF3668D7F), UINT64_C(0xB5D04B2CAFB67C72),
-		UINT64_C(0x48EBC19A4AC76F65), UINT64_C(0x1C02B80816179E68),
-		UINT64_C(0x3066463238BEFC29), UINT64_C(0x648F3FA0646E0D24),
-		UINT64_C(0x99B4B516811F1E33), UINT64_C(0xCD5DCC84DDCFEF3E),
-		UINT64_C(0xF11B0F50E4F32698), UINT64_C(0xA5F276C2B823D795),
-		UINT64_C(0x58C9FC745D52C482), UINT64_C(0x0C2085E60182358F),
-		UINT64_C(0x4088F7B85E56AF9C), UINT64_C(0x14618E2A02865E91),
-		UINT64_C(0xE95A049CE7F74D86), UINT64_C(0xBDB37D0EBB27BC8B),
-		UINT64_C(0x81F5BEDA821B752D), UINT64_C(0xD51CC748DECB8420),
-		UINT64_C(0x28274DFE3BBA9737), UINT64_C(0x7CCE346C676A663A),
-		UINT64_C(0x50AACA5649C3047B), UINT64_C(0x0443B3C41513F576),
-		UINT64_C(0xF9783972F062E661), UINT64_C(0xAD9140E0ACB2176C),
-		UINT64_C(0x91D78334958EDECA), UINT64_C(0xC53EFAA6C95E2FC7),
-		UINT64_C(0x380570102C2F3CD0), UINT64_C(0x6CEC098270FFCDDD),
-		UINT64_C(0x60CC8C64717DF852), UINT64_C(0x3425F5F62DAD095F),
-		UINT64_C(0xC91E7F40C8DC1A48), UINT64_C(0x9DF706D2940CEB45),
-		UINT64_C(0xA1B1C506AD3022E3), UINT64_C(0xF558BC94F1E0D3EE),
-		UINT64_C(0x086336221491C0F9), UINT64_C(0x5C8A4FB0484131F4),
-		UINT64_C(0x70EEB18A66E853B5), UINT64_C(0x2407C8183A38A2B8),
-		UINT64_C(0xD93C42AEDF49B1AF), UINT64_C(0x8DD53B3C839940A2),
-		UINT64_C(0xB193F8E8BAA58904), UINT64_C(0xE57A817AE6757809),
-		UINT64_C(0x18410BCC03046B1E), UINT64_C(0x4CA8725E5FD49A13),
-		UINT64_C(0x8111EF70BCAD5F38), UINT64_C(0xD5F896E2E07DAE35),
-		UINT64_C(0x28C31C54050CBD22), UINT64_C(0x7C2A65C659DC4C2F),
-		UINT64_C(0x406CA61260E08589), UINT64_C(0x1485DF803C307484),
-		UINT64_C(0xE9BE5536D9416793), UINT64_C(0xBD572CA48591969E),
-		UINT64_C(0x9133D29EAB38F4DF), UINT64_C(0xC5DAAB0CF7E805D2),
-		UINT64_C(0x38E121BA129916C5), UINT64_C(0x6C0858284E49E7C8),
-		UINT64_C(0x504E9BFC77752E6E), UINT64_C(0x04A7E26E2BA5DF63),
-		UINT64_C(0xF99C68D8CED4CC74), UINT64_C(0xAD75114A92043D79),
-		UINT64_C(0xA15594AC938608F6), UINT64_C(0xF5BCED3ECF56F9FB),
-		UINT64_C(0x088767882A27EAEC), UINT64_C(0x5C6E1E1A76F71BE1),
-		UINT64_C(0x6028DDCE4FCBD247), UINT64_C(0x34C1A45C131B234A),
-		UINT64_C(0xC9FA2EEAF66A305D), UINT64_C(0x9D135778AABAC150),
-		UINT64_C(0xB177A9428413A311), UINT64_C(0xE59ED0D0D8C3521C),
-		UINT64_C(0x18A55A663DB2410B), UINT64_C(0x4C4C23F46162B006),
-		UINT64_C(0x700AE020585E79A0), UINT64_C(0x24E399B2048E88AD),
-		UINT64_C(0xD9D81304E1FF9BBA), UINT64_C(0x8D316A96BD2F6AB7),
-		UINT64_C(0xC19918C8E2FBF0A4), UINT64_C(0x9570615ABE2B01A9),
-		UINT64_C(0x684BEBEC5B5A12BE), UINT64_C(0x3CA2927E078AE3B3),
-		UINT64_C(0x00E451AA3EB62A15), UINT64_C(0x540D28386266DB18),
-		UINT64_C(0xA936A28E8717C80F), UINT64_C(0xFDDFDB1CDBC73902),
-		UINT64_C(0xD1BB2526F56E5B43), UINT64_C(0x85525CB4A9BEAA4E),
-		UINT64_C(0x7869D6024CCFB959), UINT64_C(0x2C80AF90101F4854),
-		UINT64_C(0x10C66C44292381F2), UINT64_C(0x442F15D675F370FF),
-		UINT64_C(0xB9149F60908263E8), UINT64_C(0xEDFDE6F2CC5292E5),
-		UINT64_C(0xE1DD6314CDD0A76A), UINT64_C(0xB5341A8691005667),
-		UINT64_C(0x480F903074714570), UINT64_C(0x1CE6E9A228A1B47D),
-		UINT64_C(0x20A02A76119D7DDB), UINT64_C(0x744953E44D4D8CD6),
-		UINT64_C(0x8972D952A83C9FC1), UINT64_C(0xDD9BA0C0F4EC6ECC),
-		UINT64_C(0xF1FF5EFADA450C8D), UINT64_C(0xA51627688695FD80),
-		UINT64_C(0x582DADDE63E4EE97), UINT64_C(0x0CC4D44C3F341F9A),
-		UINT64_C(0x308217980608D63C), UINT64_C(0x646B6E0A5AD82731),
-		UINT64_C(0x9950E4BCBFA93426), UINT64_C(0xCDB99D2EE379C52B),
-		UINT64_C(0x90FB71CAD654A0F5), UINT64_C(0xC41208588A8451F8),
-		UINT64_C(0x392982EE6FF542EF), UINT64_C(0x6DC0FB7C3325B3E2),
-		UINT64_C(0x518638A80A197A44), UINT64_C(0x056F413A56C98B49),
-		UINT64_C(0xF854CB8CB3B8985E), UINT64_C(0xACBDB21EEF686953),
-		UINT64_C(0x80D94C24C1C10B12), UINT64_C(0xD43035B69D11FA1F),
-		UINT64_C(0x290BBF007860E908), UINT64_C(0x7DE2C69224B01805),
-		UINT64_C(0x41A405461D8CD1A3), UINT64_C(0x154D7CD4415C20AE),
-		UINT64_C(0xE876F662A42D33B9), UINT64_C(0xBC9F8FF0F8FDC2B4),
-		UINT64_C(0xB0BF0A16F97FF73B), UINT64_C(0xE4567384A5AF0636),
-		UINT64_C(0x196DF93240DE1521), UINT64_C(0x4D8480A01C0EE42C),
-		UINT64_C(0x71C2437425322D8A), UINT64_C(0x252B3AE679E2DC87),
-		UINT64_C(0xD810B0509C93CF90), UINT64_C(0x8CF9C9C2C0433E9D),
-		UINT64_C(0xA09D37F8EEEA5CDC), UINT64_C(0xF4744E6AB23AADD1),
-		UINT64_C(0x094FC4DC574BBEC6), UINT64_C(0x5DA6BD4E0B9B4FCB),
-		UINT64_C(0x61E07E9A32A7866D), UINT64_C(0x350907086E777760),
-		UINT64_C(0xC8328DBE8B066477), UINT64_C(0x9CDBF42CD7D6957A),
-		UINT64_C(0xD073867288020F69), UINT64_C(0x849AFFE0D4D2FE64),
-		UINT64_C(0x79A1755631A3ED73), UINT64_C(0x2D480CC46D731C7E),
-		UINT64_C(0x110ECF10544FD5D8), UINT64_C(0x45E7B682089F24D5),
-		UINT64_C(0xB8DC3C34EDEE37C2), UINT64_C(0xEC3545A6B13EC6CF),
-		UINT64_C(0xC051BB9C9F97A48E), UINT64_C(0x94B8C20EC3475583),
-		UINT64_C(0x698348B826364694), UINT64_C(0x3D6A312A7AE6B799),
-		UINT64_C(0x012CF2FE43DA7E3F), UINT64_C(0x55C58B6C1F0A8F32),
-		UINT64_C(0xA8FE01DAFA7B9C25), UINT64_C(0xFC177848A6AB6D28),
-		UINT64_C(0xF037FDAEA72958A7), UINT64_C(0xA4DE843CFBF9A9AA),
-		UINT64_C(0x59E50E8A1E88BABD), UINT64_C(0x0D0C771842584BB0),
-		UINT64_C(0x314AB4CC7B648216), UINT64_C(0x65A3CD5E27B4731B),
-		UINT64_C(0x989847E8C2C5600C), UINT64_C(0xCC713E7A9E159101),
-		UINT64_C(0xE015C040B0BCF340), UINT64_C(0xB4FCB9D2EC6C024D),
-		UINT64_C(0x49C73364091D115A), UINT64_C(0x1D2E4AF655CDE057),
-		UINT64_C(0x216889226CF129F1), UINT64_C(0x7581F0B03021D8FC),
-		UINT64_C(0x88BA7A06D550CBEB), UINT64_C(0xDC53039489803AE6),
-		UINT64_C(0x11EA9EBA6AF9FFCD), UINT64_C(0x4503E72836290EC0),
-		UINT64_C(0xB8386D9ED3581DD7), UINT64_C(0xECD1140C8F88ECDA),
-		UINT64_C(0xD097D7D8B6B4257C), UINT64_C(0x847EAE4AEA64D471),
-		UINT64_C(0x794524FC0F15C766), UINT64_C(0x2DAC5D6E53C5366B),
-		UINT64_C(0x01C8A3547D6C542A), UINT64_C(0x5521DAC621BCA527),
-		UINT64_C(0xA81A5070C4CDB630), UINT64_C(0xFCF329E2981D473D),
-		UINT64_C(0xC0B5EA36A1218E9B), UINT64_C(0x945C93A4FDF17F96),
-		UINT64_C(0x6967191218806C81), UINT64_C(0x3D8E608044509D8C),
-		UINT64_C(0x31AEE56645D2A803), UINT64_C(0x65479CF41902590E),
-		UINT64_C(0x987C1642FC734A19), UINT64_C(0xCC956FD0A0A3BB14),
-		UINT64_C(0xF0D3AC04999F72B2), UINT64_C(0xA43AD596C54F83BF),
-		UINT64_C(0x59015F20203E90A8), UINT64_C(0x0DE826B27CEE61A5),
-		UINT64_C(0x218CD888524703E4), UINT64_C(0x7565A11A0E97F2E9),
-		UINT64_C(0x885E2BACEBE6E1FE), UINT64_C(0xDCB7523EB73610F3),
-		UINT64_C(0xE0F191EA8E0AD955), UINT64_C(0xB418E878D2DA2858),
-		UINT64_C(0x492362CE37AB3B4F), UINT64_C(0x1DCA1B5C6B7BCA42),
-		UINT64_C(0x5162690234AF5051), UINT64_C(0x058B1090687FA15C),
-		UINT64_C(0xF8B09A268D0EB24B), UINT64_C(0xAC59E3B4D1DE4346),
-		UINT64_C(0x901F2060E8E28AE0), UINT64_C(0xC4F659F2B4327BED),
-		UINT64_C(0x39CDD344514368FA), UINT64_C(0x6D24AAD60D9399F7),
-		UINT64_C(0x414054EC233AFBB6), UINT64_C(0x15A92D7E7FEA0ABB),
-		UINT64_C(0xE892A7C89A9B19AC), UINT64_C(0xBC7BDE5AC64BE8A1),
-		UINT64_C(0x803D1D8EFF772107), UINT64_C(0xD4D4641CA3A7D00A),
-		UINT64_C(0x29EFEEAA46D6C31D), UINT64_C(0x7D0697381A063210),
-		UINT64_C(0x712612DE1B84079F), UINT64_C(0x25CF6B4C4754F692),
-		UINT64_C(0xD8F4E1FAA225E585), UINT64_C(0x8C1D9868FEF51488),
-		UINT64_C(0xB05B5BBCC7C9DD2E), UINT64_C(0xE4B2222E9B192C23),
-		UINT64_C(0x1989A8987E683F34), UINT64_C(0x4D60D10A22B8CE39),
-		UINT64_C(0x61042F300C11AC78), UINT64_C(0x35ED56A250C15D75),
-		UINT64_C(0xC8D6DC14B5B04E62), UINT64_C(0x9C3FA586E960BF6F),
-		UINT64_C(0xA0796652D05C76C9), UINT64_C(0xF4901FC08C8C87C4),
-		UINT64_C(0x09AB957669FD94D3), UINT64_C(0x5D42ECE4352D65DE)
-	}, {
-		UINT64_C(0x0000000000000000), UINT64_C(0x3F0BE14A916A6DCB),
-		UINT64_C(0x7E17C29522D4DB96), UINT64_C(0x411C23DFB3BEB65D),
-		UINT64_C(0xFC2F852A45A9B72C), UINT64_C(0xC3246460D4C3DAE7),
-		UINT64_C(0x823847BF677D6CBA), UINT64_C(0xBD33A6F5F6170171),
-		UINT64_C(0x6A87A57F245D70DD), UINT64_C(0x558C4435B5371D16),
-		UINT64_C(0x149067EA0689AB4B), UINT64_C(0x2B9B86A097E3C680),
-		UINT64_C(0x96A8205561F4C7F1), UINT64_C(0xA9A3C11FF09EAA3A),
-		UINT64_C(0xE8BFE2C043201C67), UINT64_C(0xD7B4038AD24A71AC),
-		UINT64_C(0xD50F4AFE48BAE1BA), UINT64_C(0xEA04ABB4D9D08C71),
-		UINT64_C(0xAB18886B6A6E3A2C), UINT64_C(0x94136921FB0457E7),
-		UINT64_C(0x2920CFD40D135696), UINT64_C(0x162B2E9E9C793B5D),
-		UINT64_C(0x57370D412FC78D00), UINT64_C(0x683CEC0BBEADE0CB),
-		UINT64_C(0xBF88EF816CE79167), UINT64_C(0x80830ECBFD8DFCAC),
-		UINT64_C(0xC19F2D144E334AF1), UINT64_C(0xFE94CC5EDF59273A),
-		UINT64_C(0x43A76AAB294E264B), UINT64_C(0x7CAC8BE1B8244B80),
-		UINT64_C(0x3DB0A83E0B9AFDDD), UINT64_C(0x02BB49749AF09016),
-		UINT64_C(0x38C63AD73E7BDDF1), UINT64_C(0x07CDDB9DAF11B03A),
-		UINT64_C(0x46D1F8421CAF0667), UINT64_C(0x79DA19088DC56BAC),
-		UINT64_C(0xC4E9BFFD7BD26ADD), UINT64_C(0xFBE25EB7EAB80716),
-		UINT64_C(0xBAFE7D685906B14B), UINT64_C(0x85F59C22C86CDC80),
-		UINT64_C(0x52419FA81A26AD2C), UINT64_C(0x6D4A7EE28B4CC0E7),
-		UINT64_C(0x2C565D3D38F276BA), UINT64_C(0x135DBC77A9981B71),
-		UINT64_C(0xAE6E1A825F8F1A00), UINT64_C(0x9165FBC8CEE577CB),
-		UINT64_C(0xD079D8177D5BC196), UINT64_C(0xEF72395DEC31AC5D),
-		UINT64_C(0xEDC9702976C13C4B), UINT64_C(0xD2C29163E7AB5180),
-		UINT64_C(0x93DEB2BC5415E7DD), UINT64_C(0xACD553F6C57F8A16),
-		UINT64_C(0x11E6F50333688B67), UINT64_C(0x2EED1449A202E6AC),
-		UINT64_C(0x6FF1379611BC50F1), UINT64_C(0x50FAD6DC80D63D3A),
-		UINT64_C(0x874ED556529C4C96), UINT64_C(0xB845341CC3F6215D),
-		UINT64_C(0xF95917C370489700), UINT64_C(0xC652F689E122FACB),
-		UINT64_C(0x7B61507C1735FBBA), UINT64_C(0x446AB136865F9671),
-		UINT64_C(0x057692E935E1202C), UINT64_C(0x3A7D73A3A48B4DE7),
-		UINT64_C(0x718C75AE7CF7BBE2), UINT64_C(0x4E8794E4ED9DD629),
-		UINT64_C(0x0F9BB73B5E236074), UINT64_C(0x30905671CF490DBF),
-		UINT64_C(0x8DA3F084395E0CCE), UINT64_C(0xB2A811CEA8346105),
-		UINT64_C(0xF3B432111B8AD758), UINT64_C(0xCCBFD35B8AE0BA93),
-		UINT64_C(0x1B0BD0D158AACB3F), UINT64_C(0x2400319BC9C0A6F4),
-		UINT64_C(0x651C12447A7E10A9), UINT64_C(0x5A17F30EEB147D62),
-		UINT64_C(0xE72455FB1D037C13), UINT64_C(0xD82FB4B18C6911D8),
-		UINT64_C(0x9933976E3FD7A785), UINT64_C(0xA6387624AEBDCA4E),
-		UINT64_C(0xA4833F50344D5A58), UINT64_C(0x9B88DE1AA5273793),
-		UINT64_C(0xDA94FDC5169981CE), UINT64_C(0xE59F1C8F87F3EC05),
-		UINT64_C(0x58ACBA7A71E4ED74), UINT64_C(0x67A75B30E08E80BF),
-		UINT64_C(0x26BB78EF533036E2), UINT64_C(0x19B099A5C25A5B29),
-		UINT64_C(0xCE049A2F10102A85), UINT64_C(0xF10F7B65817A474E),
-		UINT64_C(0xB01358BA32C4F113), UINT64_C(0x8F18B9F0A3AE9CD8),
-		UINT64_C(0x322B1F0555B99DA9), UINT64_C(0x0D20FE4FC4D3F062),
-		UINT64_C(0x4C3CDD90776D463F), UINT64_C(0x73373CDAE6072BF4),
-		UINT64_C(0x494A4F79428C6613), UINT64_C(0x7641AE33D3E60BD8),
-		UINT64_C(0x375D8DEC6058BD85), UINT64_C(0x08566CA6F132D04E),
-		UINT64_C(0xB565CA530725D13F), UINT64_C(0x8A6E2B19964FBCF4),
-		UINT64_C(0xCB7208C625F10AA9), UINT64_C(0xF479E98CB49B6762),
-		UINT64_C(0x23CDEA0666D116CE), UINT64_C(0x1CC60B4CF7BB7B05),
-		UINT64_C(0x5DDA28934405CD58), UINT64_C(0x62D1C9D9D56FA093),
-		UINT64_C(0xDFE26F2C2378A1E2), UINT64_C(0xE0E98E66B212CC29),
-		UINT64_C(0xA1F5ADB901AC7A74), UINT64_C(0x9EFE4CF390C617BF),
-		UINT64_C(0x9C4505870A3687A9), UINT64_C(0xA34EE4CD9B5CEA62),
-		UINT64_C(0xE252C71228E25C3F), UINT64_C(0xDD592658B98831F4),
-		UINT64_C(0x606A80AD4F9F3085), UINT64_C(0x5F6161E7DEF55D4E),
-		UINT64_C(0x1E7D42386D4BEB13), UINT64_C(0x2176A372FC2186D8),
-		UINT64_C(0xF6C2A0F82E6BF774), UINT64_C(0xC9C941B2BF019ABF),
-		UINT64_C(0x88D5626D0CBF2CE2), UINT64_C(0xB7DE83279DD54129),
-		UINT64_C(0x0AED25D26BC24058), UINT64_C(0x35E6C498FAA82D93),
-		UINT64_C(0x74FAE74749169BCE), UINT64_C(0x4BF1060DD87CF605),
-		UINT64_C(0xE318EB5CF9EF77C4), UINT64_C(0xDC130A1668851A0F),
-		UINT64_C(0x9D0F29C9DB3BAC52), UINT64_C(0xA204C8834A51C199),
-		UINT64_C(0x1F376E76BC46C0E8), UINT64_C(0x203C8F3C2D2CAD23),
-		UINT64_C(0x6120ACE39E921B7E), UINT64_C(0x5E2B4DA90FF876B5),
-		UINT64_C(0x899F4E23DDB20719), UINT64_C(0xB694AF694CD86AD2),
-		UINT64_C(0xF7888CB6FF66DC8F), UINT64_C(0xC8836DFC6E0CB144),
-		UINT64_C(0x75B0CB09981BB035), UINT64_C(0x4ABB2A430971DDFE),
-		UINT64_C(0x0BA7099CBACF6BA3), UINT64_C(0x34ACE8D62BA50668),
-		UINT64_C(0x3617A1A2B155967E), UINT64_C(0x091C40E8203FFBB5),
-		UINT64_C(0x4800633793814DE8), UINT64_C(0x770B827D02EB2023),
-		UINT64_C(0xCA382488F4FC2152), UINT64_C(0xF533C5C265964C99),
-		UINT64_C(0xB42FE61DD628FAC4), UINT64_C(0x8B2407574742970F),
-		UINT64_C(0x5C9004DD9508E6A3), UINT64_C(0x639BE59704628B68),
-		UINT64_C(0x2287C648B7DC3D35), UINT64_C(0x1D8C270226B650FE),
-		UINT64_C(0xA0BF81F7D0A1518F), UINT64_C(0x9FB460BD41CB3C44),
-		UINT64_C(0xDEA84362F2758A19), UINT64_C(0xE1A3A228631FE7D2),
-		UINT64_C(0xDBDED18BC794AA35), UINT64_C(0xE4D530C156FEC7FE),
-		UINT64_C(0xA5C9131EE54071A3), UINT64_C(0x9AC2F254742A1C68),
-		UINT64_C(0x27F154A1823D1D19), UINT64_C(0x18FAB5EB135770D2),
-		UINT64_C(0x59E69634A0E9C68F), UINT64_C(0x66ED777E3183AB44),
-		UINT64_C(0xB15974F4E3C9DAE8), UINT64_C(0x8E5295BE72A3B723),
-		UINT64_C(0xCF4EB661C11D017E), UINT64_C(0xF045572B50776CB5),
-		UINT64_C(0x4D76F1DEA6606DC4), UINT64_C(0x727D1094370A000F),
-		UINT64_C(0x3361334B84B4B652), UINT64_C(0x0C6AD20115DEDB99),
-		UINT64_C(0x0ED19B758F2E4B8F), UINT64_C(0x31DA7A3F1E442644),
-		UINT64_C(0x70C659E0ADFA9019), UINT64_C(0x4FCDB8AA3C90FDD2),
-		UINT64_C(0xF2FE1E5FCA87FCA3), UINT64_C(0xCDF5FF155BED9168),
-		UINT64_C(0x8CE9DCCAE8532735), UINT64_C(0xB3E23D8079394AFE),
-		UINT64_C(0x64563E0AAB733B52), UINT64_C(0x5B5DDF403A195699),
-		UINT64_C(0x1A41FC9F89A7E0C4), UINT64_C(0x254A1DD518CD8D0F),
-		UINT64_C(0x9879BB20EEDA8C7E), UINT64_C(0xA7725A6A7FB0E1B5),
-		UINT64_C(0xE66E79B5CC0E57E8), UINT64_C(0xD96598FF5D643A23),
-		UINT64_C(0x92949EF28518CC26), UINT64_C(0xAD9F7FB81472A1ED),
-		UINT64_C(0xEC835C67A7CC17B0), UINT64_C(0xD388BD2D36A67A7B),
-		UINT64_C(0x6EBB1BD8C0B17B0A), UINT64_C(0x51B0FA9251DB16C1),
-		UINT64_C(0x10ACD94DE265A09C), UINT64_C(0x2FA73807730FCD57),
-		UINT64_C(0xF8133B8DA145BCFB), UINT64_C(0xC718DAC7302FD130),
-		UINT64_C(0x8604F9188391676D), UINT64_C(0xB90F185212FB0AA6),
-		UINT64_C(0x043CBEA7E4EC0BD7), UINT64_C(0x3B375FED7586661C),
-		UINT64_C(0x7A2B7C32C638D041), UINT64_C(0x45209D785752BD8A),
-		UINT64_C(0x479BD40CCDA22D9C), UINT64_C(0x789035465CC84057),
-		UINT64_C(0x398C1699EF76F60A), UINT64_C(0x0687F7D37E1C9BC1),
-		UINT64_C(0xBBB45126880B9AB0), UINT64_C(0x84BFB06C1961F77B),
-		UINT64_C(0xC5A393B3AADF4126), UINT64_C(0xFAA872F93BB52CED),
-		UINT64_C(0x2D1C7173E9FF5D41), UINT64_C(0x121790397895308A),
-		UINT64_C(0x530BB3E6CB2B86D7), UINT64_C(0x6C0052AC5A41EB1C),
-		UINT64_C(0xD133F459AC56EA6D), UINT64_C(0xEE3815133D3C87A6),
-		UINT64_C(0xAF2436CC8E8231FB), UINT64_C(0x902FD7861FE85C30),
-		UINT64_C(0xAA52A425BB6311D7), UINT64_C(0x9559456F2A097C1C),
-		UINT64_C(0xD44566B099B7CA41), UINT64_C(0xEB4E87FA08DDA78A),
-		UINT64_C(0x567D210FFECAA6FB), UINT64_C(0x6976C0456FA0CB30),
-		UINT64_C(0x286AE39ADC1E7D6D), UINT64_C(0x176102D04D7410A6),
-		UINT64_C(0xC0D5015A9F3E610A), UINT64_C(0xFFDEE0100E540CC1),
-		UINT64_C(0xBEC2C3CFBDEABA9C), UINT64_C(0x81C922852C80D757),
-		UINT64_C(0x3CFA8470DA97D626), UINT64_C(0x03F1653A4BFDBBED),
-		UINT64_C(0x42ED46E5F8430DB0), UINT64_C(0x7DE6A7AF6929607B),
-		UINT64_C(0x7F5DEEDBF3D9F06D), UINT64_C(0x40560F9162B39DA6),
-		UINT64_C(0x014A2C4ED10D2BFB), UINT64_C(0x3E41CD0440674630),
-		UINT64_C(0x83726BF1B6704741), UINT64_C(0xBC798ABB271A2A8A),
-		UINT64_C(0xFD65A96494A49CD7), UINT64_C(0xC26E482E05CEF11C),
-		UINT64_C(0x15DA4BA4D78480B0), UINT64_C(0x2AD1AAEE46EEED7B),
-		UINT64_C(0x6BCD8931F5505B26), UINT64_C(0x54C6687B643A36ED),
-		UINT64_C(0xE9F5CE8E922D379C), UINT64_C(0xD6FE2FC403475A57),
-		UINT64_C(0x97E20C1BB0F9EC0A), UINT64_C(0xA8E9ED51219381C1)
-	}, {
-		UINT64_C(0x0000000000000000), UINT64_C(0x1DEE8A5E222CA1DC),
-		UINT64_C(0x3BDD14BC445943B8), UINT64_C(0x26339EE26675E264),
-		UINT64_C(0x77BA297888B28770), UINT64_C(0x6A54A326AA9E26AC),
-		UINT64_C(0x4C673DC4CCEBC4C8), UINT64_C(0x5189B79AEEC76514),
-		UINT64_C(0xEF7452F111650EE0), UINT64_C(0xF29AD8AF3349AF3C),
-		UINT64_C(0xD4A9464D553C4D58), UINT64_C(0xC947CC137710EC84),
-		UINT64_C(0x98CE7B8999D78990), UINT64_C(0x8520F1D7BBFB284C),
-		UINT64_C(0xA3136F35DD8ECA28), UINT64_C(0xBEFDE56BFFA26BF4),
-		UINT64_C(0x4C300AC98DC40345), UINT64_C(0x51DE8097AFE8A299),
-		UINT64_C(0x77ED1E75C99D40FD), UINT64_C(0x6A03942BEBB1E121),
-		UINT64_C(0x3B8A23B105768435), UINT64_C(0x2664A9EF275A25E9),
-		UINT64_C(0x0057370D412FC78D), UINT64_C(0x1DB9BD5363036651),
-		UINT64_C(0xA34458389CA10DA5), UINT64_C(0xBEAAD266BE8DAC79),
-		UINT64_C(0x98994C84D8F84E1D), UINT64_C(0x8577C6DAFAD4EFC1),
-		UINT64_C(0xD4FE714014138AD5), UINT64_C(0xC910FB1E363F2B09),
-		UINT64_C(0xEF2365FC504AC96D), UINT64_C(0xF2CDEFA2726668B1),
-		UINT64_C(0x986015931B88068A), UINT64_C(0x858E9FCD39A4A756),
-		UINT64_C(0xA3BD012F5FD14532), UINT64_C(0xBE538B717DFDE4EE),
-		UINT64_C(0xEFDA3CEB933A81FA), UINT64_C(0xF234B6B5B1162026),
-		UINT64_C(0xD4072857D763C242), UINT64_C(0xC9E9A209F54F639E),
-		UINT64_C(0x771447620AED086A), UINT64_C(0x6AFACD3C28C1A9B6),
-		UINT64_C(0x4CC953DE4EB44BD2), UINT64_C(0x5127D9806C98EA0E),
-		UINT64_C(0x00AE6E1A825F8F1A), UINT64_C(0x1D40E444A0732EC6),
-		UINT64_C(0x3B737AA6C606CCA2), UINT64_C(0x269DF0F8E42A6D7E),
-		UINT64_C(0xD4501F5A964C05CF), UINT64_C(0xC9BE9504B460A413),
-		UINT64_C(0xEF8D0BE6D2154677), UINT64_C(0xF26381B8F039E7AB),
-		UINT64_C(0xA3EA36221EFE82BF), UINT64_C(0xBE04BC7C3CD22363),
-		UINT64_C(0x9837229E5AA7C107), UINT64_C(0x85D9A8C0788B60DB),
-		UINT64_C(0x3B244DAB87290B2F), UINT64_C(0x26CAC7F5A505AAF3),
-		UINT64_C(0x00F95917C3704897), UINT64_C(0x1D17D349E15CE94B),
-		UINT64_C(0x4C9E64D30F9B8C5F), UINT64_C(0x5170EE8D2DB72D83),
-		UINT64_C(0x7743706F4BC2CFE7), UINT64_C(0x6AADFA3169EE6E3B),
-		UINT64_C(0xA218840D981E1391), UINT64_C(0xBFF60E53BA32B24D),
-		UINT64_C(0x99C590B1DC475029), UINT64_C(0x842B1AEFFE6BF1F5),
-		UINT64_C(0xD5A2AD7510AC94E1), UINT64_C(0xC84C272B3280353D),
-		UINT64_C(0xEE7FB9C954F5D759), UINT64_C(0xF391339776D97685),
-		UINT64_C(0x4D6CD6FC897B1D71), UINT64_C(0x50825CA2AB57BCAD),
-		UINT64_C(0x76B1C240CD225EC9), UINT64_C(0x6B5F481EEF0EFF15),
-		UINT64_C(0x3AD6FF8401C99A01), UINT64_C(0x273875DA23E53BDD),
-		UINT64_C(0x010BEB384590D9B9), UINT64_C(0x1CE5616667BC7865),
-		UINT64_C(0xEE288EC415DA10D4), UINT64_C(0xF3C6049A37F6B108),
-		UINT64_C(0xD5F59A785183536C), UINT64_C(0xC81B102673AFF2B0),
-		UINT64_C(0x9992A7BC9D6897A4), UINT64_C(0x847C2DE2BF443678),
-		UINT64_C(0xA24FB300D931D41C), UINT64_C(0xBFA1395EFB1D75C0),
-		UINT64_C(0x015CDC3504BF1E34), UINT64_C(0x1CB2566B2693BFE8),
-		UINT64_C(0x3A81C88940E65D8C), UINT64_C(0x276F42D762CAFC50),
-		UINT64_C(0x76E6F54D8C0D9944), UINT64_C(0x6B087F13AE213898),
-		UINT64_C(0x4D3BE1F1C854DAFC), UINT64_C(0x50D56BAFEA787B20),
-		UINT64_C(0x3A78919E8396151B), UINT64_C(0x27961BC0A1BAB4C7),
-		UINT64_C(0x01A58522C7CF56A3), UINT64_C(0x1C4B0F7CE5E3F77F),
-		UINT64_C(0x4DC2B8E60B24926B), UINT64_C(0x502C32B8290833B7),
-		UINT64_C(0x761FAC5A4F7DD1D3), UINT64_C(0x6BF126046D51700F),
-		UINT64_C(0xD50CC36F92F31BFB), UINT64_C(0xC8E24931B0DFBA27),
-		UINT64_C(0xEED1D7D3D6AA5843), UINT64_C(0xF33F5D8DF486F99F),
-		UINT64_C(0xA2B6EA171A419C8B), UINT64_C(0xBF586049386D3D57),
-		UINT64_C(0x996BFEAB5E18DF33), UINT64_C(0x848574F57C347EEF),
-		UINT64_C(0x76489B570E52165E), UINT64_C(0x6BA611092C7EB782),
-		UINT64_C(0x4D958FEB4A0B55E6), UINT64_C(0x507B05B56827F43A),
-		UINT64_C(0x01F2B22F86E0912E), UINT64_C(0x1C1C3871A4CC30F2),
-		UINT64_C(0x3A2FA693C2B9D296), UINT64_C(0x27C12CCDE095734A),
-		UINT64_C(0x993CC9A61F3718BE), UINT64_C(0x84D243F83D1BB962),
-		UINT64_C(0xA2E1DD1A5B6E5B06), UINT64_C(0xBF0F57447942FADA),
-		UINT64_C(0xEE86E0DE97859FCE), UINT64_C(0xF3686A80B5A93E12),
-		UINT64_C(0xD55BF462D3DCDC76), UINT64_C(0xC8B57E3CF1F07DAA),
-		UINT64_C(0xD6E9A7309F3239A7), UINT64_C(0xCB072D6EBD1E987B),
-		UINT64_C(0xED34B38CDB6B7A1F), UINT64_C(0xF0DA39D2F947DBC3),
-		UINT64_C(0xA1538E481780BED7), UINT64_C(0xBCBD041635AC1F0B),
-		UINT64_C(0x9A8E9AF453D9FD6F), UINT64_C(0x876010AA71F55CB3),
-		UINT64_C(0x399DF5C18E573747), UINT64_C(0x24737F9FAC7B969B),
-		UINT64_C(0x0240E17DCA0E74FF), UINT64_C(0x1FAE6B23E822D523),
-		UINT64_C(0x4E27DCB906E5B037), UINT64_C(0x53C956E724C911EB),
-		UINT64_C(0x75FAC80542BCF38F), UINT64_C(0x6814425B60905253),
-		UINT64_C(0x9AD9ADF912F63AE2), UINT64_C(0x873727A730DA9B3E),
-		UINT64_C(0xA104B94556AF795A), UINT64_C(0xBCEA331B7483D886),
-		UINT64_C(0xED6384819A44BD92), UINT64_C(0xF08D0EDFB8681C4E),
-		UINT64_C(0xD6BE903DDE1DFE2A), UINT64_C(0xCB501A63FC315FF6),
-		UINT64_C(0x75ADFF0803933402), UINT64_C(0x6843755621BF95DE),
-		UINT64_C(0x4E70EBB447CA77BA), UINT64_C(0x539E61EA65E6D666),
-		UINT64_C(0x0217D6708B21B372), UINT64_C(0x1FF95C2EA90D12AE),
-		UINT64_C(0x39CAC2CCCF78F0CA), UINT64_C(0x24244892ED545116),
-		UINT64_C(0x4E89B2A384BA3F2D), UINT64_C(0x536738FDA6969EF1),
-		UINT64_C(0x7554A61FC0E37C95), UINT64_C(0x68BA2C41E2CFDD49),
-		UINT64_C(0x39339BDB0C08B85D), UINT64_C(0x24DD11852E241981),
-		UINT64_C(0x02EE8F674851FBE5), UINT64_C(0x1F0005396A7D5A39),
-		UINT64_C(0xA1FDE05295DF31CD), UINT64_C(0xBC136A0CB7F39011),
-		UINT64_C(0x9A20F4EED1867275), UINT64_C(0x87CE7EB0F3AAD3A9),
-		UINT64_C(0xD647C92A1D6DB6BD), UINT64_C(0xCBA943743F411761),
-		UINT64_C(0xED9ADD965934F505), UINT64_C(0xF07457C87B1854D9),
-		UINT64_C(0x02B9B86A097E3C68), UINT64_C(0x1F5732342B529DB4),
-		UINT64_C(0x3964ACD64D277FD0), UINT64_C(0x248A26886F0BDE0C),
-		UINT64_C(0x7503911281CCBB18), UINT64_C(0x68ED1B4CA3E01AC4),
-		UINT64_C(0x4EDE85AEC595F8A0), UINT64_C(0x53300FF0E7B9597C),
-		UINT64_C(0xEDCDEA9B181B3288), UINT64_C(0xF02360C53A379354),
-		UINT64_C(0xD610FE275C427130), UINT64_C(0xCBFE74797E6ED0EC),
-		UINT64_C(0x9A77C3E390A9B5F8), UINT64_C(0x879949BDB2851424),
-		UINT64_C(0xA1AAD75FD4F0F640), UINT64_C(0xBC445D01F6DC579C),
-		UINT64_C(0x74F1233D072C2A36), UINT64_C(0x691FA96325008BEA),
-		UINT64_C(0x4F2C37814375698E), UINT64_C(0x52C2BDDF6159C852),
-		UINT64_C(0x034B0A458F9EAD46), UINT64_C(0x1EA5801BADB20C9A),
-		UINT64_C(0x38961EF9CBC7EEFE), UINT64_C(0x257894A7E9EB4F22),
-		UINT64_C(0x9B8571CC164924D6), UINT64_C(0x866BFB923465850A),
-		UINT64_C(0xA05865705210676E), UINT64_C(0xBDB6EF2E703CC6B2),
-		UINT64_C(0xEC3F58B49EFBA3A6), UINT64_C(0xF1D1D2EABCD7027A),
-		UINT64_C(0xD7E24C08DAA2E01E), UINT64_C(0xCA0CC656F88E41C2),
-		UINT64_C(0x38C129F48AE82973), UINT64_C(0x252FA3AAA8C488AF),
-		UINT64_C(0x031C3D48CEB16ACB), UINT64_C(0x1EF2B716EC9DCB17),
-		UINT64_C(0x4F7B008C025AAE03), UINT64_C(0x52958AD220760FDF),
-		UINT64_C(0x74A614304603EDBB), UINT64_C(0x69489E6E642F4C67),
-		UINT64_C(0xD7B57B059B8D2793), UINT64_C(0xCA5BF15BB9A1864F),
-		UINT64_C(0xEC686FB9DFD4642B), UINT64_C(0xF186E5E7FDF8C5F7),
-		UINT64_C(0xA00F527D133FA0E3), UINT64_C(0xBDE1D8233113013F),
-		UINT64_C(0x9BD246C15766E35B), UINT64_C(0x863CCC9F754A4287),
-		UINT64_C(0xEC9136AE1CA42CBC), UINT64_C(0xF17FBCF03E888D60),
-		UINT64_C(0xD74C221258FD6F04), UINT64_C(0xCAA2A84C7AD1CED8),
-		UINT64_C(0x9B2B1FD69416ABCC), UINT64_C(0x86C59588B63A0A10),
-		UINT64_C(0xA0F60B6AD04FE874), UINT64_C(0xBD188134F26349A8),
-		UINT64_C(0x03E5645F0DC1225C), UINT64_C(0x1E0BEE012FED8380),
-		UINT64_C(0x383870E3499861E4), UINT64_C(0x25D6FABD6BB4C038),
-		UINT64_C(0x745F4D278573A52C), UINT64_C(0x69B1C779A75F04F0),
-		UINT64_C(0x4F82599BC12AE694), UINT64_C(0x526CD3C5E3064748),
-		UINT64_C(0xA0A13C6791602FF9), UINT64_C(0xBD4FB639B34C8E25),
-		UINT64_C(0x9B7C28DBD5396C41), UINT64_C(0x8692A285F715CD9D),
-		UINT64_C(0xD71B151F19D2A889), UINT64_C(0xCAF59F413BFE0955),
-		UINT64_C(0xECC601A35D8BEB31), UINT64_C(0xF1288BFD7FA74AED),
-		UINT64_C(0x4FD56E9680052119), UINT64_C(0x523BE4C8A22980C5),
-		UINT64_C(0x74087A2AC45C62A1), UINT64_C(0x69E6F074E670C37D),
-		UINT64_C(0x386F47EE08B7A669), UINT64_C(0x2581CDB02A9B07B5),
-		UINT64_C(0x03B253524CEEE5D1), UINT64_C(0x1E5CD90C6EC2440D)
-	}
-};
diff -Nru r-base-3.2.3/src/extra/xz/check/crc64_x86.S r-base-3.3.1/src/extra/xz/check/crc64_x86.S
--- r-base-3.2.3/src/extra/xz/check/crc64_x86.S	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc64_x86.S	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-/*
- * Speed-optimized CRC64 using slicing-by-four algorithm
- *
- * This uses only i386 instructions, but it is optimized for i686 and later
- * (including e.g. Pentium II/III/IV, Athlon XP, and Core 2).
- *
- * Authors: Igor Pavlov (original CRC32 assembly code)
- *          Lasse Collin (CRC64 adaptation of the modified CRC32 code)
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * This code needs lzma_crc64_table, which can be created using the
- * following C code:
-
-uint64_t lzma_crc64_table[4][256];
-
-void
-init_table(void)
-{
-	// ECMA-182
-	static const uint64_t poly64 = UINT64_C(0xC96C5795D7870F42);
-
-	for (size_t s = 0; s < 4; ++s) {
-		for (size_t b = 0; b < 256; ++b) {
-			uint64_t r = s == 0 ? b : lzma_crc64_table[s - 1][b];
-
-			for (size_t i = 0; i < 8; ++i) {
-				if (r & 1)
-					r = (r >> 1) ^ poly64;
-				else
-					r >>= 1;
-			}
-
-			lzma_crc64_table[s][b] = r;
-		}
-	}
-}
-
- * The prototype of the CRC64 function:
- * extern uint64_t lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc);
- */
-
-/*
- * On some systems, the functions need to be prefixed. The prefix is
- * usually an underscore.
- */
-#ifndef __USER_LABEL_PREFIX__
-#	define __USER_LABEL_PREFIX__
-#endif
-#define MAKE_SYM_CAT(prefix, sym) prefix ## sym
-#define MAKE_SYM(prefix, sym) MAKE_SYM_CAT(prefix, sym)
-#define LZMA_CRC64 MAKE_SYM(__USER_LABEL_PREFIX__, lzma_crc64)
-#define LZMA_CRC64_TABLE MAKE_SYM(__USER_LABEL_PREFIX__, lzma_crc64_table)
-
-/*
- * Solaris assembler doesn't have .p2align, and Darwin uses .align
- * differently than GNU/Linux and Solaris.
- */
-#if defined(__APPLE__) || defined(__MSDOS__)
-#	define ALIGN(pow2, abs) .align pow2
-#else
-#	define ALIGN(pow2, abs) .align abs
-#endif
-
-	.text
-	.globl	LZMA_CRC64
-
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) \
-		&& !defined(__MSDOS__)
-	.type	LZMA_CRC64, @function
-#endif
-
-	ALIGN(4, 16)
-LZMA_CRC64:
-	/*
-	 * Register usage:
-	 * %eax crc LSB
-	 * %edx crc MSB
-	 * %esi buf
-	 * %edi size or buf + size
-	 * %ebx lzma_crc64_table
-	 * %ebp Table index
-	 * %ecx Temporary
-	 */
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	pushl	%ebp
-	movl	0x14(%esp), %esi /* buf */
-	movl	0x18(%esp), %edi /* size */
-	movl	0x1C(%esp), %eax /* crc LSB */
-	movl	0x20(%esp), %edx /* crc MSB */
-
-	/*
-	 * Store the address of lzma_crc64_table to %ebx. This is needed to
-	 * get position-independent code (PIC).
-	 *
-	 * The PIC macro is defined by libtool, while __PIC__ is defined
-	 * by GCC but only on some systems. Testing for both makes it simpler
-	 * to test this code without libtool, and keeps the code working also
-	 * when built with libtool but using something else than GCC.
-	 *
-	 * I understood that libtool may define PIC on Windows even though
-	 * the code in Windows DLLs is not PIC in sense that it is in ELF
-	 * binaries, so we need a separate check to always use the non-PIC
-	 * code on Windows.
-	 */
-#if (!defined(PIC) && !defined(__PIC__)) \
-		|| (defined(_WIN32) || defined(__CYGWIN__))
-	/* Not PIC */
-	movl	$ LZMA_CRC64_TABLE, %ebx
-#elif defined(__APPLE__)
-	/* Mach-O */
-	call	.L_get_pc
-.L_pic:
-	leal	.L_lzma_crc64_table$non_lazy_ptr-.L_pic(%ebx), %ebx
-	movl	(%ebx), %ebx
-#else
-	/* ELF */
-	call	.L_get_pc
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-	movl	LZMA_CRC64_TABLE@GOT(%ebx), %ebx
-#endif
-
-	/* Complement the initial value. */
-	notl	%eax
-	notl	%edx
-
-.L_align:
-	/*
-	 * Check if there is enough input to use slicing-by-four.
-	 * We need eight bytes, because the loop pre-reads four bytes.
-	 */
-	cmpl	$8, %edi
-	jb	.L_rest
-
-	/* Check if we have reached alignment of four bytes. */
-	testl	$3, %esi
-	jz	.L_slice
-
-	/* Calculate CRC of the next input byte. */
-	movzbl	(%esi), %ebp
-	incl	%esi
-	movzbl	%al, %ecx
-	xorl	%ecx, %ebp
-	shrdl	$8, %edx, %eax
-	xorl	(%ebx, %ebp, 8), %eax
-	shrl	$8, %edx
-	xorl	4(%ebx, %ebp, 8), %edx
-	decl	%edi
-	jmp	.L_align
-
-.L_slice:
-	/*
-	 * If we get here, there's at least eight bytes of aligned input
-	 * available. Make %edi multiple of four bytes. Store the possible
-	 * remainder over the "size" variable in the argument stack.
-	 */
-	movl	%edi, 0x18(%esp)
-	andl	$-4, %edi
-	subl	%edi, 0x18(%esp)
-
-	/*
-	 * Let %edi be buf + size - 4 while running the main loop. This way
-	 * we can compare for equality to determine when exit the loop.
-	 */
-	addl	%esi, %edi
-	subl	$4, %edi
-
-	/* Read in the first four aligned bytes. */
-	movl	(%esi), %ecx
-
-.L_loop:
-	xorl	%eax, %ecx
-	movzbl	%cl, %ebp
-	movl	0x1800(%ebx, %ebp, 8), %eax
-	xorl	%edx, %eax
-	movl	0x1804(%ebx, %ebp, 8), %edx
-	movzbl	%ch, %ebp
-	xorl	0x1000(%ebx, %ebp, 8), %eax
-	xorl	0x1004(%ebx, %ebp, 8), %edx
-	shrl	$16, %ecx
-	movzbl	%cl, %ebp
-	xorl	0x0800(%ebx, %ebp, 8), %eax
-	xorl	0x0804(%ebx, %ebp, 8), %edx
-	movzbl	%ch, %ebp
-	addl	$4, %esi
-	xorl	(%ebx, %ebp, 8), %eax
-	xorl	4(%ebx, %ebp, 8), %edx
-
-	/* Check for end of aligned input. */
-	cmpl	%edi, %esi
-
-	/*
-	 * Copy the next input byte to %ecx. It is slightly faster to
-	 * read it here than at the top of the loop.
-	 */
-	movl	(%esi), %ecx
-	jb	.L_loop
-
-	/*
-	 * Process the remaining four bytes, which we have already
-	 * copied to %ecx.
-	 */
-	xorl	%eax, %ecx
-	movzbl	%cl, %ebp
-	movl	0x1800(%ebx, %ebp, 8), %eax
-	xorl	%edx, %eax
-	movl	0x1804(%ebx, %ebp, 8), %edx
-	movzbl	%ch, %ebp
-	xorl	0x1000(%ebx, %ebp, 8), %eax
-	xorl	0x1004(%ebx, %ebp, 8), %edx
-	shrl	$16, %ecx
-	movzbl	%cl, %ebp
-	xorl	0x0800(%ebx, %ebp, 8), %eax
-	xorl	0x0804(%ebx, %ebp, 8), %edx
-	movzbl	%ch, %ebp
-	addl	$4, %esi
-	xorl	(%ebx, %ebp, 8), %eax
-	xorl	4(%ebx, %ebp, 8), %edx
-
-	/* Copy the number of remaining bytes to %edi. */
-	movl	0x18(%esp), %edi
-
-.L_rest:
-	/* Check for end of input. */
-	testl	%edi, %edi
-	jz	.L_return
-
-	/* Calculate CRC of the next input byte. */
-	movzbl	(%esi), %ebp
-	incl	%esi
-	movzbl	%al, %ecx
-	xorl	%ecx, %ebp
-	shrdl	$8, %edx, %eax
-	xorl	(%ebx, %ebp, 8), %eax
-	shrl	$8, %edx
-	xorl	4(%ebx, %ebp, 8), %edx
-	decl	%edi
-	jmp	.L_rest
-
-.L_return:
-	/* Complement the final value. */
-	notl	%eax
-	notl	%edx
-
-	popl	%ebp
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	ret
-
-#if defined(PIC) || defined(__PIC__)
-	ALIGN(4, 16)
-.L_get_pc:
-	movl	(%esp), %ebx
-	ret
-#endif
-
-#if defined(__APPLE__) && (defined(PIC) || defined(__PIC__))
-	/* Mach-O PIC */
-	.section __IMPORT,__pointers,non_lazy_symbol_pointers
-.L_lzma_crc64_table$non_lazy_ptr:
-	.indirect_symbol LZMA_CRC64_TABLE
-	.long 0
-
-#elif defined(_WIN32) || defined(__CYGWIN__)
-#	ifdef DLL_EXPORT
-	/* This is equivalent of __declspec(dllexport). */
-	.section .drectve
-	.ascii " -export:lzma_crc64"
-#	endif
-
-#elif !defined(__MSDOS__)
-	/* ELF */
-	.size	LZMA_CRC64, .-LZMA_CRC64
-#endif
-
-/*
- * This is needed to support non-executable stack. It's ugly to
- * use __linux__ here, but I don't know a way to detect when
- * we are using GNU assembler.
- */
-#if defined(__ELF__) && defined(__linux__)
-	.section	.note.GNU-stack,"",@progbits
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/check/crc_macros.h r-base-3.3.1/src/extra/xz/check/crc_macros.h
--- r-base-3.2.3/src/extra/xz/check/crc_macros.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/crc_macros.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       crc_macros.h
-/// \brief      Some endian-dependent macros for CRC32 and CRC64
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef WORDS_BIGENDIAN
-#	include "bswap.h"
-
-#	define A(x) ((x) >> 24)
-#	define B(x) (((x) >> 16) & 0xFF)
-#	define C(x) (((x) >> 8) & 0xFF)
-#	define D(x) ((x) & 0xFF)
-
-#	define S8(x) ((x) << 8)
-#	define S32(x) ((x) << 32)
-
-#else
-#	define A(x) ((x) & 0xFF)
-#	define B(x) (((x) >> 8) & 0xFF)
-#	define C(x) (((x) >> 16) & 0xFF)
-#	define D(x) ((x) >> 24)
-
-#	define S8(x) ((x) >> 8)
-#	define S32(x) ((x) >> 32)
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/check/sha256.c r-base-3.3.1/src/extra/xz/check/sha256.c
--- r-base-3.2.3/src/extra/xz/check/sha256.c	2015-03-18 23:02:08.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/check/sha256.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       sha256.c
-/// \brief      SHA-256
-///
-/// \todo       Crypto++ has x86 ASM optimizations. They use SSE so if they
-///             are imported to liblzma, SSE instructions need to be used
-///             conditionally to keep the code working on older boxes.
-//
-//  This code is based on the code found from 7-Zip, which has a modified
-//  version of the SHA-256 found from Crypto++ <http://www.cryptopp.com/>.
-//  The code was modified a little to fit into liblzma.
-//
-//  Authors:    Kevin Springle
-//              Wei Dai
-//              Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-// Avoid bogus warnings in transform().
-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || __GNUC__ > 4
-#	pragma GCC diagnostic ignored "-Wuninitialized"
-#endif
-
-#include "check.h"
-
-// At least on x86, GCC is able to optimize this to a rotate instruction.
-#define rotr_32(num, amount) ((num) >> (amount) | (num) << (32 - (amount)))
-
-#define blk0(i) (W[i] = data[i])
-#define blk2(i) (W[i & 15] += s1(W[(i - 2) & 15]) + W[(i - 7) & 15] \
-		+ s0(W[(i - 15) & 15]))
-
-#define Ch(x, y, z) (z ^ (x & (y ^ z)))
-#define Maj(x, y, z) ((x & y) | (z & (x | y)))
-
-#define a(i) T[(0 - i) & 7]
-#define b(i) T[(1 - i) & 7]
-#define c(i) T[(2 - i) & 7]
-#define d(i) T[(3 - i) & 7]
-#define e(i) T[(4 - i) & 7]
-#define f(i) T[(5 - i) & 7]
-#define g(i) T[(6 - i) & 7]
-#define h(i) T[(7 - i) & 7]
-
-#define R(i) \
-	h(i) += S1(e(i)) + Ch(e(i), f(i), g(i)) + SHA256_K[i + j] \
-		+ (j ? blk2(i) : blk0(i)); \
-	d(i) += h(i); \
-	h(i) += S0(a(i)) + Maj(a(i), b(i), c(i))
-
-#define S0(x) (rotr_32(x, 2) ^ rotr_32(x, 13) ^ rotr_32(x, 22))
-#define S1(x) (rotr_32(x, 6) ^ rotr_32(x, 11) ^ rotr_32(x, 25))
-#define s0(x) (rotr_32(x, 7) ^ rotr_32(x, 18) ^ (x >> 3))
-#define s1(x) (rotr_32(x, 17) ^ rotr_32(x, 19) ^ (x >> 10))
-
-
-static const uint32_t SHA256_K[64] = {
-	0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
-	0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
-	0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
-	0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174,
-	0xE49B69C1, 0xEFBE4786, 0x0FC19DC6, 0x240CA1CC,
-	0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA,
-	0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7,
-	0xC6E00BF3, 0xD5A79147, 0x06CA6351, 0x14292967,
-	0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13,
-	0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85,
-	0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3,
-	0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070,
-	0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5,
-	0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3,
-	0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
-	0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2,
-};
-
-
-static void
-transform(uint32_t state[8], const uint32_t data[16])
-{
-	uint32_t W[16];
-	uint32_t T[8];
-
-	// Copy state[] to working vars.
-	memcpy(T, state, sizeof(T));
-
-	// 64 operations, partially loop unrolled
-	for (unsigned int j = 0; j < 64; j += 16) {
-		R( 0); R( 1); R( 2); R( 3);
-		R( 4); R( 5); R( 6); R( 7);
-		R( 8); R( 9); R(10); R(11);
-		R(12); R(13); R(14); R(15);
-	}
-
-	// Add the working vars back into state[].
-	state[0] += a(0);
-	state[1] += b(0);
-	state[2] += c(0);
-	state[3] += d(0);
-	state[4] += e(0);
-	state[5] += f(0);
-	state[6] += g(0);
-	state[7] += h(0);
-}
-
-
-static void
-process(lzma_check_state *check)
-{
-#ifdef WORDS_BIGENDIAN
-	transform(check->state.sha256.state, check->buffer.u32);
-
-#else
-	uint32_t data[16];
-
-	for (size_t i = 0; i < 16; ++i)
-		data[i] = bswap32(check->buffer.u32[i]);
-
-	transform(check->state.sha256.state, data);
-#endif
-
-	return;
-}
-
-
-extern void
-lzma_sha256_init(lzma_check_state *check)
-{
-	static const uint32_t s[8] = {
-		0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
-		0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
-	};
-
-	memcpy(check->state.sha256.state, s, sizeof(s));
-	check->state.sha256.size = 0;
-
-	return;
-}
-
-
-extern void
-lzma_sha256_update(const uint8_t *buf, size_t size, lzma_check_state *check)
-{
-	// Copy the input data into a properly aligned temporary buffer.
-	// This way we can be called with arbitrarily sized buffers
-	// (no need to be multiple of 64 bytes), and the code works also
-	// on architectures that don't allow unaligned memory access.
-	while (size > 0) {
-		const size_t copy_start = check->state.sha256.size & 0x3F;
-		size_t copy_size = 64 - copy_start;
-		if (copy_size > size)
-			copy_size = size;
-
-		memcpy(check->buffer.u8 + copy_start, buf, copy_size);
-
-		buf += copy_size;
-		size -= copy_size;
-		check->state.sha256.size += copy_size;
-
-		if ((check->state.sha256.size & 0x3F) == 0)
-			process(check);
-	}
-
-	return;
-}
-
-
-extern void
-lzma_sha256_finish(lzma_check_state *check)
-{
-	// Add padding as described in RFC 3174 (it describes SHA-1 but
-	// the same padding style is used for SHA-256 too).
-	size_t pos = check->state.sha256.size & 0x3F;
-	check->buffer.u8[pos++] = 0x80;
-
-	while (pos != 64 - 8) {
-		if (pos == 64) {
-			process(check);
-			pos = 0;
-		}
-
-		check->buffer.u8[pos++] = 0x00;
-	}
-
-	// Convert the message size from bytes to bits.
-	check->state.sha256.size *= 8;
-
-	check->buffer.u64[(64 - 8) / 8] = conv64be(check->state.sha256.size);
-
-	process(check);
-
-	for (size_t i = 0; i < 8; ++i)
-		check->buffer.u32[i] = conv32be(check->state.sha256.state[i]);
-
-	return;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/alone_decoder.c r-base-3.3.1/src/extra/xz/common/alone_decoder.c
--- r-base-3.2.3/src/extra/xz/common/alone_decoder.c	2013-07-09 22:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/alone_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       alone_decoder.c
-/// \brief      Decoder for LZMA_Alone files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "alone_decoder.h"
-#include "lzma_decoder.h"
-#include "lz_decoder.h"
-
-
-struct lzma_coder_s {
-	lzma_next_coder next;
-
-	enum {
-		SEQ_PROPERTIES,
-		SEQ_DICTIONARY_SIZE,
-		SEQ_UNCOMPRESSED_SIZE,
-		SEQ_CODER_INIT,
-		SEQ_CODE,
-	} sequence;
-
-	/// If true, reject files that are unlikely to be .lzma files.
-	/// If false, more non-.lzma files get accepted and will give
-	/// LZMA_DATA_ERROR either immediately or after a few output bytes.
-	bool picky;
-
-	/// Position in the header fields
-	size_t pos;
-
-	/// Uncompressed size decoded from the header
-	lzma_vli uncompressed_size;
-
-	/// Memory usage limit
-	uint64_t memlimit;
-
-	/// Amount of memory actually needed (only an estimate)
-	uint64_t memusage;
-
-	/// Options decoded from the header needed to initialize
-	/// the LZMA decoder
-	lzma_options_lzma options;
-};
-
-
-static lzma_ret
-alone_decode(lzma_coder *coder,
-		lzma_allocator *allocator lzma_attribute((__unused__)),
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size,
-		lzma_action action)
-{
-	while (*out_pos < out_size
-			&& (coder->sequence == SEQ_CODE || *in_pos < in_size))
-	switch (coder->sequence) {
-	case SEQ_PROPERTIES:
-		if (lzma_lzma_lclppb_decode(&coder->options, in[*in_pos]))
-			return LZMA_FORMAT_ERROR;
-
-		coder->sequence = SEQ_DICTIONARY_SIZE;
-		++*in_pos;
-		break;
-
-	case SEQ_DICTIONARY_SIZE:
-		coder->options.dict_size
-				|= (size_t)(in[*in_pos]) << (coder->pos * 8);
-
-		if (++coder->pos == 4) {
-			if (coder->picky && coder->options.dict_size
-					!= UINT32_MAX) {
-				// A hack to ditch tons of false positives:
-				// We allow only dictionary sizes that are
-				// 2^n or 2^n + 2^(n-1). LZMA_Alone created
-				// only files with 2^n, but accepts any
-				// dictionary size.
-				uint32_t d = coder->options.dict_size - 1;
-				d |= d >> 2;
-				d |= d >> 3;
-				d |= d >> 4;
-				d |= d >> 8;
-				d |= d >> 16;
-				++d;
-
-				if (d != coder->options.dict_size)
-					return LZMA_FORMAT_ERROR;
-			}
-
-			coder->pos = 0;
-			coder->sequence = SEQ_UNCOMPRESSED_SIZE;
-		}
-
-		++*in_pos;
-		break;
-
-	case SEQ_UNCOMPRESSED_SIZE:
-		coder->uncompressed_size
-				|= (lzma_vli)(in[*in_pos]) << (coder->pos * 8);
-		++*in_pos;
-		if (++coder->pos < 8)
-			break;
-
-		// Another hack to ditch false positives: Assume that
-		// if the uncompressed size is known, it must be less
-		// than 256 GiB.
-		if (coder->picky
-				&& coder->uncompressed_size != LZMA_VLI_UNKNOWN
-				&& coder->uncompressed_size
-					>= (LZMA_VLI_C(1) << 38))
-			return LZMA_FORMAT_ERROR;
-
-		// Calculate the memory usage so that it is ready
-		// for SEQ_CODER_INIT.
-		coder->memusage = lzma_lzma_decoder_memusage(&coder->options)
-				+ LZMA_MEMUSAGE_BASE;
-
-		coder->pos = 0;
-		coder->sequence = SEQ_CODER_INIT;
-
-	// Fall through
-
-	case SEQ_CODER_INIT: {
-		if (coder->memusage > coder->memlimit)
-			return LZMA_MEMLIMIT_ERROR;
-
-		lzma_filter_info filters[2] = {
-			{
-				.init = &lzma_lzma_decoder_init,
-				.options = &coder->options,
-			}, {
-				.init = NULL,
-			}
-		};
-
-		const lzma_ret ret = lzma_next_filter_init(&coder->next,
-				allocator, filters);
-		if (ret != LZMA_OK)
-			return ret;
-
-		// Use a hack to set the uncompressed size.
-		lzma_lz_decoder_uncompressed(coder->next.coder,
-				coder->uncompressed_size);
-
-		coder->sequence = SEQ_CODE;
-		break;
-	}
-
-	case SEQ_CODE: {
-		return coder->next.code(coder->next.coder,
-				allocator, in, in_pos, in_size,
-				out, out_pos, out_size, action);
-	}
-
-	default:
-		return LZMA_PROG_ERROR;
-	}
-
-	return LZMA_OK;
-}
-
-
-static void
-alone_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-alone_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
-		uint64_t *old_memlimit, uint64_t new_memlimit)
-{
-	*memusage = coder->memusage;
-	*old_memlimit = coder->memlimit;
-
-	if (new_memlimit != 0) {
-		if (new_memlimit < coder->memusage)
-			return LZMA_MEMLIMIT_ERROR;
-
-		coder->memlimit = new_memlimit;
-	}
-
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_alone_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		uint64_t memlimit, bool picky)
-{
-	lzma_next_coder_init(&lzma_alone_decoder_init, next, allocator);
-
-	if (memlimit == 0)
-		return LZMA_PROG_ERROR;
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &alone_decode;
-		next->end = &alone_decoder_end;
-		next->memconfig = &alone_decoder_memconfig;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	next->coder->sequence = SEQ_PROPERTIES;
-	next->coder->picky = picky;
-	next->coder->pos = 0;
-	next->coder->options.dict_size = 0;
-	next->coder->options.preset_dict = NULL;
-	next->coder->options.preset_dict_size = 0;
-	next->coder->uncompressed_size = 0;
-	next->coder->memlimit = memlimit;
-	next->coder->memusage = LZMA_MEMUSAGE_BASE;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_alone_decoder(lzma_stream *strm, uint64_t memlimit)
-{
-	lzma_next_strm_init(lzma_alone_decoder_init, strm, memlimit, false);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/alone_decoder.h r-base-3.3.1/src/extra/xz/common/alone_decoder.h
--- r-base-3.2.3/src/extra/xz/common/alone_decoder.h	2013-07-09 22:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/alone_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       alone_decoder.h
-/// \brief      Decoder for LZMA_Alone files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_ALONE_DECODER_H
-#define LZMA_ALONE_DECODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_alone_decoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		uint64_t memlimit, bool picky);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/alone_encoder.c r-base-3.3.1/src/extra/xz/common/alone_encoder.c
--- r-base-3.2.3/src/extra/xz/common/alone_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/alone_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       alone_decoder.c
-/// \brief      Decoder for LZMA_Alone files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-#include "lzma_encoder.h"
-
-
-#define ALONE_HEADER_SIZE (1 + 4 + 8)
-
-
-struct lzma_coder_s {
-	lzma_next_coder next;
-
-	enum {
-		SEQ_HEADER,
-		SEQ_CODE,
-	} sequence;
-
-	size_t header_pos;
-	uint8_t header[ALONE_HEADER_SIZE];
-};
-
-
-static lzma_ret
-alone_encode(lzma_coder *coder,
-		lzma_allocator *allocator lzma_attribute((__unused__)),
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size,
-		lzma_action action)
-{
-	while (*out_pos < out_size)
-	switch (coder->sequence) {
-	case SEQ_HEADER:
-		lzma_bufcpy(coder->header, &coder->header_pos,
-				ALONE_HEADER_SIZE,
-				out, out_pos, out_size);
-		if (coder->header_pos < ALONE_HEADER_SIZE)
-			return LZMA_OK;
-
-		coder->sequence = SEQ_CODE;
-		break;
-
-	case SEQ_CODE:
-		return coder->next.code(coder->next.coder,
-				allocator, in, in_pos, in_size,
-				out, out_pos, out_size, action);
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-	return LZMA_OK;
-}
-
-
-static void
-alone_encoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-// At least for now, this is not used by any internal function.
-static lzma_ret
-alone_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_options_lzma *options)
-{
-	lzma_next_coder_init(&alone_encoder_init, next, allocator);
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &alone_encode;
-		next->end = &alone_encoder_end;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	// Basic initializations
-	next->coder->sequence = SEQ_HEADER;
-	next->coder->header_pos = 0;
-
-	// Encode the header:
-	// - Properties (1 byte)
-	if (lzma_lzma_lclppb_encode(options, next->coder->header))
-		return LZMA_OPTIONS_ERROR;
-
-	// - Dictionary size (4 bytes)
-	if (options->dict_size < LZMA_DICT_SIZE_MIN)
-		return LZMA_OPTIONS_ERROR;
-
-	// Round up to the next 2^n or 2^n + 2^(n - 1) depending on which
-	// one is the next unless it is UINT32_MAX. While the header would
-	// allow any 32-bit integer, we do this to keep the decoder of liblzma
-	// accepting the resulting files.
-	uint32_t d = options->dict_size - 1;
-	d |= d >> 2;
-	d |= d >> 3;
-	d |= d >> 4;
-	d |= d >> 8;
-	d |= d >> 16;
-	if (d != UINT32_MAX)
-		++d;
-
-	unaligned_write32le(next->coder->header + 1, d);
-
-	// - Uncompressed size (always unknown and using EOPM)
-	memset(next->coder->header + 1 + 4, 0xFF, 8);
-
-	// Initialize the LZMA encoder.
-	const lzma_filter_info filters[2] = {
-		{
-			.init = &lzma_lzma_encoder_init,
-			.options = (void *)(options),
-		}, {
-			.init = NULL,
-		}
-	};
-
-	return lzma_next_filter_init(&next->coder->next, allocator, filters);
-}
-
-
-/*
-extern lzma_ret
-lzma_alone_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_options_alone *options)
-{
-	lzma_next_coder_init(&alone_encoder_init, next, allocator, options);
-}
-*/
-
-
-extern LZMA_API(lzma_ret)
-lzma_alone_encoder(lzma_stream *strm, const lzma_options_lzma *options)
-{
-	lzma_next_strm_init(alone_encoder_init, strm, options);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/auto_decoder.c r-base-3.3.1/src/extra/xz/common/auto_decoder.c
--- r-base-3.2.3/src/extra/xz/common/auto_decoder.c	2013-07-09 22:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/auto_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       auto_decoder.c
-/// \brief      Autodetect between .xz Stream and .lzma (LZMA_Alone) formats
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_decoder.h"
-#include "alone_decoder.h"
-
-
-struct lzma_coder_s {
-	/// Stream decoder or LZMA_Alone decoder
-	lzma_next_coder next;
-
-	uint64_t memlimit;
-	uint32_t flags;
-
-	enum {
-		SEQ_INIT,
-		SEQ_CODE,
-		SEQ_FINISH,
-	} sequence;
-};
-
-
-static lzma_ret
-auto_decode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	switch (coder->sequence) {
-	case SEQ_INIT:
-		if (*in_pos >= in_size)
-			return LZMA_OK;
-
-		// Update the sequence now, because we want to continue from
-		// SEQ_CODE even if we return some LZMA_*_CHECK.
-		coder->sequence = SEQ_CODE;
-
-		// Detect the file format. For now this is simple, since if
-		// it doesn't start with 0xFD (the first magic byte of the
-		// new format), it has to be LZMA_Alone, or something that
-		// we don't support at all.
-		if (in[*in_pos] == 0xFD) {
-			return_if_error(lzma_stream_decoder_init(
-					&coder->next, allocator,
-					coder->memlimit, coder->flags));
-		} else {
-			return_if_error(lzma_alone_decoder_init(&coder->next,
-					allocator, coder->memlimit, true));
-
-			// If the application wants to know about missing
-			// integrity check or about the check in general, we
-			// need to handle it here, because LZMA_Alone decoder
-			// doesn't accept any flags.
-			if (coder->flags & LZMA_TELL_NO_CHECK)
-				return LZMA_NO_CHECK;
-
-			if (coder->flags & LZMA_TELL_ANY_CHECK)
-				return LZMA_GET_CHECK;
-		}
-
-	// Fall through
-
-	case SEQ_CODE: {
-		const lzma_ret ret = coder->next.code(
-				coder->next.coder, allocator,
-				in, in_pos, in_size,
-				out, out_pos, out_size, action);
-		if (ret != LZMA_STREAM_END
-				|| (coder->flags & LZMA_CONCATENATED) == 0)
-			return ret;
-
-		coder->sequence = SEQ_FINISH;
-	}
-
-	// Fall through
-
-	case SEQ_FINISH:
-		// When LZMA_DECODE_CONCATENATED was used and we were decoding
-		// LZMA_Alone file, we need to check check that there is no
-		// trailing garbage and wait for LZMA_FINISH.
-		if (*in_pos < in_size)
-			return LZMA_DATA_ERROR;
-
-		return action == LZMA_FINISH ? LZMA_STREAM_END : LZMA_OK;
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-}
-
-
-static void
-auto_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_check
-auto_decoder_get_check(const lzma_coder *coder)
-{
-	// It is LZMA_Alone if get_check is NULL.
-	return coder->next.get_check == NULL ? LZMA_CHECK_NONE
-			: coder->next.get_check(coder->next.coder);
-}
-
-
-static lzma_ret
-auto_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
-		uint64_t *old_memlimit, uint64_t new_memlimit)
-{
-	lzma_ret ret;
-
-	if (coder->next.memconfig != NULL) {
-		ret = coder->next.memconfig(coder->next.coder,
-				memusage, old_memlimit, new_memlimit);
-		assert(*old_memlimit == coder->memlimit);
-	} else {
-		// No coder is configured yet. Use the base value as
-		// the current memory usage.
-		*memusage = LZMA_MEMUSAGE_BASE;
-		*old_memlimit = coder->memlimit;
-		ret = LZMA_OK;
-	}
-
-	if (ret == LZMA_OK && new_memlimit != 0)
-		coder->memlimit = new_memlimit;
-
-	return ret;
-}
-
-
-static lzma_ret
-auto_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		uint64_t memlimit, uint32_t flags)
-{
-	lzma_next_coder_init(&auto_decoder_init, next, allocator);
-
-	if (memlimit == 0)
-		return LZMA_PROG_ERROR;
-
-	if (flags & ~LZMA_SUPPORTED_FLAGS)
-		return LZMA_OPTIONS_ERROR;
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &auto_decode;
-		next->end = &auto_decoder_end;
-		next->get_check = &auto_decoder_get_check;
-		next->memconfig = &auto_decoder_memconfig;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	next->coder->memlimit = memlimit;
-	next->coder->flags = flags;
-	next->coder->sequence = SEQ_INIT;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_auto_decoder(lzma_stream *strm, uint64_t memlimit, uint32_t flags)
-{
-	lzma_next_strm_init(auto_decoder_init, strm, memlimit, flags);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_buffer_decoder.c r-base-3.3.1/src/extra/xz/common/block_buffer_decoder.c
--- r-base-3.2.3/src/extra/xz/common/block_buffer_decoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_buffer_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_buffer_decoder.c
-/// \brief      Single-call .xz Block decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "block_decoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_buffer_decode(lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	if (in_pos == NULL || (in == NULL && *in_pos != in_size)
-			|| *in_pos > in_size || out_pos == NULL
-			|| (out == NULL && *out_pos != out_size)
-			|| *out_pos > out_size)
-		return LZMA_PROG_ERROR;
-
-	// Initialize the Block decoder.
-	lzma_next_coder block_decoder = LZMA_NEXT_CODER_INIT;
-	lzma_ret ret = lzma_block_decoder_init(
-			&block_decoder, allocator, block);
-
-	if (ret == LZMA_OK) {
-		// Save the positions so that we can restore them in case
-		// an error occurs.
-		const size_t in_start = *in_pos;
-		const size_t out_start = *out_pos;
-
-		// Do the actual decoding.
-		ret = block_decoder.code(block_decoder.coder, allocator,
-				in, in_pos, in_size, out, out_pos, out_size,
-				LZMA_FINISH);
-
-		if (ret == LZMA_STREAM_END) {
-			ret = LZMA_OK;
-		} else {
-			if (ret == LZMA_OK) {
-				// Either the input was truncated or the
-				// output buffer was too small.
-				assert(*in_pos == in_size
-						|| *out_pos == out_size);
-
-				// If all the input was consumed, then the
-				// input is truncated, even if the output
-				// buffer is also full. This is because
-				// processing the last byte of the Block
-				// never produces output.
-				//
-				// NOTE: This assumption may break when new
-				// filters are added, if the end marker of
-				// the filter doesn't consume at least one
-				// complete byte.
-				if (*in_pos == in_size)
-					ret = LZMA_DATA_ERROR;
-				else
-					ret = LZMA_BUF_ERROR;
-			}
-
-			// Restore the positions.
-			*in_pos = in_start;
-			*out_pos = out_start;
-		}
-	}
-
-	// Free the decoder memory. This needs to be done even if
-	// initialization fails, because the internal API doesn't
-	// require the initialization function to free its memory on error.
-	lzma_next_end(&block_decoder, allocator);
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_buffer_encoder.c r-base-3.3.1/src/extra/xz/common/block_buffer_encoder.c
--- r-base-3.2.3/src/extra/xz/common/block_buffer_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_buffer_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_buffer_encoder.c
-/// \brief      Single-call .xz Block encoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "block_encoder.h"
-#include "filter_encoder.h"
-#include "lzma2_encoder.h"
-#include "check.h"
-
-
-/// Estimate the maximum size of the Block Header and Check fields for
-/// a Block that uses LZMA2 uncompressed chunks. We could use
-/// lzma_block_header_size() but this is simpler.
-///
-/// Block Header Size + Block Flags + Compressed Size
-/// + Uncompressed Size + Filter Flags for LZMA2 + CRC32 + Check
-/// and round up to the next multiple of four to take Header Padding
-/// into account.
-#define HEADERS_BOUND ((1 + 1 + 2 * LZMA_VLI_BYTES_MAX + 3 + 4 \
-		+ LZMA_CHECK_SIZE_MAX + 3) & ~3)
-
-
-static lzma_vli
-lzma2_bound(lzma_vli uncompressed_size)
-{
-	// Prevent integer overflow in overhead calculation.
-	if (uncompressed_size > COMPRESSED_SIZE_MAX)
-		return 0;
-
-	// Calculate the exact overhead of the LZMA2 headers: Round
-	// uncompressed_size up to the next multiple of LZMA2_CHUNK_MAX,
-	// multiply by the size of per-chunk header, and add one byte for
-	// the end marker.
-	const lzma_vli overhead = ((uncompressed_size + LZMA2_CHUNK_MAX - 1)
-				/ LZMA2_CHUNK_MAX)
-			* LZMA2_HEADER_UNCOMPRESSED + 1;
-
-	// Catch the possible integer overflow.
-	if (COMPRESSED_SIZE_MAX - overhead < uncompressed_size)
-		return 0;
-
-	return uncompressed_size + overhead;
-}
-
-
-extern LZMA_API(size_t)
-lzma_block_buffer_bound(size_t uncompressed_size)
-{
-	// For now, if the data doesn't compress, we always use uncompressed
-	// chunks of LZMA2. In future we may use Subblock filter too, but
-	// but for simplicity we probably will still use the same bound
-	// calculation even though Subblock filter would have slightly less
-	// overhead.
-	lzma_vli lzma2_size = lzma2_bound(uncompressed_size);
-	if (lzma2_size == 0)
-		return 0;
-
-	// Take Block Padding into account.
-	lzma2_size = (lzma2_size + 3) & ~LZMA_VLI_C(3);
-
-#if SIZE_MAX < LZMA_VLI_MAX
-	// Catch the possible integer overflow on 32-bit systems. There's no
-	// overflow on 64-bit systems, because lzma2_bound() already takes
-	// into account the size of the headers in the Block.
-	if (SIZE_MAX - HEADERS_BOUND < lzma2_size)
-		return 0;
-#endif
-
-	return HEADERS_BOUND + lzma2_size;
-}
-
-
-static lzma_ret
-block_encode_uncompressed(lzma_block *block, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// TODO: Figure out if the last filter is LZMA2 or Subblock and use
-	// that filter to encode the uncompressed chunks.
-
-	// Use LZMA2 uncompressed chunks. We wouldn't need a dictionary at
-	// all, but LZMA2 always requires a dictionary, so use the minimum
-	// value to minimize memory usage of the decoder.
-	lzma_options_lzma lzma2 = {
-		.dict_size = LZMA_DICT_SIZE_MIN,
-	};
-
-	lzma_filter filters[2];
-	filters[0].id = LZMA_FILTER_LZMA2;
-	filters[0].options = &lzma2;
-	filters[1].id = LZMA_VLI_UNKNOWN;
-
-	// Set the above filter options to *block temporarily so that we can
-	// encode the Block Header.
-	lzma_filter *filters_orig = block->filters;
-	block->filters = filters;
-
-	if (lzma_block_header_size(block) != LZMA_OK) {
-		block->filters = filters_orig;
-		return LZMA_PROG_ERROR;
-	}
-
-	// Check that there's enough output space. The caller has already
-	// set block->compressed_size to what lzma2_bound() has returned,
-	// so we can reuse that value. We know that compressed_size is a
-	// known valid VLI and header_size is a small value so their sum
-	// will never overflow.
-	assert(block->compressed_size == lzma2_bound(in_size));
-	if (out_size - *out_pos
-			< block->header_size + block->compressed_size) {
-		block->filters = filters_orig;
-		return LZMA_BUF_ERROR;
-	}
-
-	if (lzma_block_header_encode(block, out + *out_pos) != LZMA_OK) {
-		block->filters = filters_orig;
-		return LZMA_PROG_ERROR;
-	}
-
-	block->filters = filters_orig;
-	*out_pos += block->header_size;
-
-	// Encode the data using LZMA2 uncompressed chunks.
-	size_t in_pos = 0;
-	uint8_t control = 0x01; // Dictionary reset
-
-	while (in_pos < in_size) {
-		// Control byte: Indicate uncompressed chunk, of which
-		// the first resets the dictionary.
-		out[(*out_pos)++] = control;
-		control = 0x02; // No dictionary reset
-
-		// Size of the uncompressed chunk
-		const size_t copy_size
-				= my_min(in_size - in_pos, LZMA2_CHUNK_MAX);
-		out[(*out_pos)++] = (copy_size - 1) >> 8;
-		out[(*out_pos)++] = (copy_size - 1) & 0xFF;
-
-		// The actual data
-		assert(*out_pos + copy_size <= out_size);
-		memcpy(out + *out_pos, in + in_pos, copy_size);
-
-		in_pos += copy_size;
-		*out_pos += copy_size;
-	}
-
-	// End marker
-	out[(*out_pos)++] = 0x00;
-	assert(*out_pos <= out_size);
-
-	return LZMA_OK;
-}
-
-
-static lzma_ret
-block_encode_normal(lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// Find out the size of the Block Header.
-	block->compressed_size = lzma2_bound(in_size);
-	if (block->compressed_size == 0)
-		return LZMA_DATA_ERROR;
-
-	block->uncompressed_size = in_size;
-	return_if_error(lzma_block_header_size(block));
-
-	// Reserve space for the Block Header and skip it for now.
-	if (out_size - *out_pos <= block->header_size)
-		return LZMA_BUF_ERROR;
-
-	const size_t out_start = *out_pos;
-	*out_pos += block->header_size;
-
-	// Limit out_size so that we stop encoding if the output would grow
-	// bigger than what uncompressed Block would be.
-	if (out_size - *out_pos > block->compressed_size)
-		out_size = *out_pos + block->compressed_size;
-
-	// TODO: In many common cases this could be optimized to use
-	// significantly less memory.
-	lzma_next_coder raw_encoder = LZMA_NEXT_CODER_INIT;
-	lzma_ret ret = lzma_raw_encoder_init(
-			&raw_encoder, allocator, block->filters);
-
-	if (ret == LZMA_OK) {
-		size_t in_pos = 0;
-		ret = raw_encoder.code(raw_encoder.coder, allocator,
-				in, &in_pos, in_size, out, out_pos, out_size,
-				LZMA_FINISH);
-	}
-
-	// NOTE: This needs to be run even if lzma_raw_encoder_init() failed.
-	lzma_next_end(&raw_encoder, allocator);
-
-	if (ret == LZMA_STREAM_END) {
-		// Compression was successful. Write the Block Header.
-		block->compressed_size
-				= *out_pos - (out_start + block->header_size);
-		ret = lzma_block_header_encode(block, out + out_start);
-		if (ret != LZMA_OK)
-			ret = LZMA_PROG_ERROR;
-
-	} else if (ret == LZMA_OK) {
-		// Output buffer became full.
-		ret = LZMA_BUF_ERROR;
-	}
-
-	// Reset *out_pos if something went wrong.
-	if (ret != LZMA_OK)
-		*out_pos = out_start;
-
-	return ret;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_buffer_encode(lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// Validate the arguments.
-	if (block == NULL || (in == NULL && in_size != 0) || out == NULL
-			|| out_pos == NULL || *out_pos > out_size)
-		return LZMA_PROG_ERROR;
-
-	// The contents of the structure may depend on the version so
-	// check the version before validating the contents of *block.
-	if (block->version != 0)
-		return LZMA_OPTIONS_ERROR;
-
-	if ((unsigned int)(block->check) > LZMA_CHECK_ID_MAX
-			|| block->filters == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (!lzma_check_is_supported(block->check))
-		return LZMA_UNSUPPORTED_CHECK;
-
-	// Size of a Block has to be a multiple of four, so limit the size
-	// here already. This way we don't need to check it again when adding
-	// Block Padding.
-	out_size -= (out_size - *out_pos) & 3;
-
-	// Get the size of the Check field.
-	const size_t check_size = lzma_check_size(block->check);
-	assert(check_size != UINT32_MAX);
-
-	// Reserve space for the Check field.
-	if (out_size - *out_pos <= check_size)
-		return LZMA_BUF_ERROR;
-
-	out_size -= check_size;
-
-	// Do the actual compression.
-	const lzma_ret ret = block_encode_normal(block, allocator,
-			in, in_size, out, out_pos, out_size);
-	if (ret != LZMA_OK) {
-		// If the error was something else than output buffer
-		// becoming full, return the error now.
-		if (ret != LZMA_BUF_ERROR)
-			return ret;
-
-		// The data was uncompressible (at least with the options
-		// given to us) or the output buffer was too small. Use the
-		// uncompressed chunks of LZMA2 to wrap the data into a valid
-		// Block. If we haven't been given enough output space, even
-		// this may fail.
-		return_if_error(block_encode_uncompressed(block, in, in_size,
-				out, out_pos, out_size));
-	}
-
-	assert(*out_pos <= out_size);
-
-	// Block Padding. No buffer overflow here, because we already adjusted
-	// out_size so that (out_size - out_start) is a multiple of four.
-	// Thus, if the buffer is full, the loop body can never run.
-	for (size_t i = (size_t)(block->compressed_size); i & 3; ++i) {
-		assert(*out_pos < out_size);
-		out[(*out_pos)++] = 0x00;
-	}
-
-	// If there's no Check field, we are done now.
-	if (check_size > 0) {
-		// Calculate the integrity check. We reserved space for
-		// the Check field earlier so we don't need to check for
-		// available output space here.
-		lzma_check_state check;
-		lzma_check_init(&check, block->check);
-		lzma_check_update(&check, block->check, in, in_size);
-		lzma_check_finish(&check, block->check);
-
-		memcpy(block->raw_check, check.buffer.u8, check_size);
-		memcpy(out + *out_pos, check.buffer.u8, check_size);
-		*out_pos += check_size;
-	}
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_decoder.c r-base-3.3.1/src/extra/xz/common/block_decoder.c
--- r-base-3.2.3/src/extra/xz/common/block_decoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_decoder.c
-/// \brief      Decodes .xz Blocks
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "block_decoder.h"
-#include "filter_decoder.h"
-#include "check.h"
-
-
-struct lzma_coder_s {
-	enum {
-		SEQ_CODE,
-		SEQ_PADDING,
-		SEQ_CHECK,
-	} sequence;
-
-	/// The filters in the chain; initialized with lzma_raw_decoder_init().
-	lzma_next_coder next;
-
-	/// Decoding options; we also write Compressed Size and Uncompressed
-	/// Size back to this structure when the decoding has been finished.
-	lzma_block *block;
-
-	/// Compressed Size calculated while decoding
-	lzma_vli compressed_size;
-
-	/// Uncompressed Size calculated while decoding
-	lzma_vli uncompressed_size;
-
-	/// Maximum allowed Compressed Size; this takes into account the
-	/// size of the Block Header and Check fields when Compressed Size
-	/// is unknown.
-	lzma_vli compressed_limit;
-
-	/// Position when reading the Check field
-	size_t check_pos;
-
-	/// Check of the uncompressed data
-	lzma_check_state check;
-};
-
-
-static inline bool
-update_size(lzma_vli *size, lzma_vli add, lzma_vli limit)
-{
-	if (limit > LZMA_VLI_MAX)
-		limit = LZMA_VLI_MAX;
-
-	if (limit < *size || limit - *size < add)
-		return true;
-
-	*size += add;
-
-	return false;
-}
-
-
-static inline bool
-is_size_valid(lzma_vli size, lzma_vli reference)
-{
-	return reference == LZMA_VLI_UNKNOWN || reference == size;
-}
-
-
-static lzma_ret
-block_decode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	switch (coder->sequence) {
-	case SEQ_CODE: {
-		const size_t in_start = *in_pos;
-		const size_t out_start = *out_pos;
-
-		const lzma_ret ret = coder->next.code(coder->next.coder,
-				allocator, in, in_pos, in_size,
-				out, out_pos, out_size, action);
-
-		const size_t in_used = *in_pos - in_start;
-		const size_t out_used = *out_pos - out_start;
-
-		// NOTE: We compare to compressed_limit here, which prevents
-		// the total size of the Block growing past LZMA_VLI_MAX.
-		if (update_size(&coder->compressed_size, in_used,
-					coder->compressed_limit)
-				|| update_size(&coder->uncompressed_size,
-					out_used,
-					coder->block->uncompressed_size))
-			return LZMA_DATA_ERROR;
-
-		lzma_check_update(&coder->check, coder->block->check,
-				out + out_start, out_used);
-
-		if (ret != LZMA_STREAM_END)
-			return ret;
-
-		// Compressed and Uncompressed Sizes are now at their final
-		// values. Verify that they match the values given to us.
-		if (!is_size_valid(coder->compressed_size,
-					coder->block->compressed_size)
-				|| !is_size_valid(coder->uncompressed_size,
-					coder->block->uncompressed_size))
-			return LZMA_DATA_ERROR;
-
-		// Copy the values into coder->block. The caller
-		// may use this information to construct Index.
-		coder->block->compressed_size = coder->compressed_size;
-		coder->block->uncompressed_size = coder->uncompressed_size;
-
-		coder->sequence = SEQ_PADDING;
-	}
-
-	// Fall through
-
-	case SEQ_PADDING:
-		// Compressed Data is padded to a multiple of four bytes.
-		while (coder->compressed_size & 3) {
-			if (*in_pos >= in_size)
-				return LZMA_OK;
-
-			// We use compressed_size here just get the Padding
-			// right. The actual Compressed Size was stored to
-			// coder->block already, and won't be modified by
-			// us anymore.
-			++coder->compressed_size;
-
-			if (in[(*in_pos)++] != 0x00)
-				return LZMA_DATA_ERROR;
-		}
-
-		if (coder->block->check == LZMA_CHECK_NONE)
-			return LZMA_STREAM_END;
-
-		lzma_check_finish(&coder->check, coder->block->check);
-		coder->sequence = SEQ_CHECK;
-
-	// Fall through
-
-	case SEQ_CHECK: {
-		const size_t check_size = lzma_check_size(coder->block->check);
-		lzma_bufcpy(in, in_pos, in_size, coder->block->raw_check,
-				&coder->check_pos, check_size);
-		if (coder->check_pos < check_size)
-			return LZMA_OK;
-
-		// Validate the Check only if we support it.
-		// coder->check.buffer may be uninitialized
-		// when the Check ID is not supported.
-		if (lzma_check_is_supported(coder->block->check)
-				&& memcmp(coder->block->raw_check,
-					coder->check.buffer.u8,
-					check_size) != 0)
-			return LZMA_DATA_ERROR;
-
-		return LZMA_STREAM_END;
-	}
-	}
-
-	return LZMA_PROG_ERROR;
-}
-
-
-static void
-block_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-extern lzma_ret
-lzma_block_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		lzma_block *block)
-{
-	lzma_next_coder_init(&lzma_block_decoder_init, next, allocator);
-
-	// Validate the options. lzma_block_unpadded_size() does that for us
-	// except for Uncompressed Size and filters. Filters are validated
-	// by the raw decoder.
-	if (lzma_block_unpadded_size(block) == 0
-			|| !lzma_vli_is_valid(block->uncompressed_size))
-		return LZMA_PROG_ERROR;
-
-	// Allocate and initialize *next->coder if needed.
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &block_decode;
-		next->end = &block_decoder_end;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	// Basic initializations
-	next->coder->sequence = SEQ_CODE;
-	next->coder->block = block;
-	next->coder->compressed_size = 0;
-	next->coder->uncompressed_size = 0;
-
-	// If Compressed Size is not known, we calculate the maximum allowed
-	// value so that encoded size of the Block (including Block Padding)
-	// is still a valid VLI and a multiple of four.
-	next->coder->compressed_limit
-			= block->compressed_size == LZMA_VLI_UNKNOWN
-				? (LZMA_VLI_MAX & ~LZMA_VLI_C(3))
-					- block->header_size
-					- lzma_check_size(block->check)
-				: block->compressed_size;
-
-	// Initialize the check. It's caller's problem if the Check ID is not
-	// supported, and the Block decoder cannot verify the Check field.
-	// Caller can test lzma_check_is_supported(block->check).
-	next->coder->check_pos = 0;
-	lzma_check_init(&next->coder->check, block->check);
-
-	// Initialize the filter chain.
-	return lzma_raw_decoder_init(&next->coder->next, allocator,
-			block->filters);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_decoder(lzma_stream *strm, lzma_block *block)
-{
-	lzma_next_strm_init(lzma_block_decoder_init, strm, block);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_decoder.h r-base-3.3.1/src/extra/xz/common/block_decoder.h
--- r-base-3.2.3/src/extra/xz/common/block_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_decoder.h
-/// \brief      Decodes .xz Blocks
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_BLOCK_DECODER_H
-#define LZMA_BLOCK_DECODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_block_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, lzma_block *block);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/block_encoder.c r-base-3.3.1/src/extra/xz/common/block_encoder.c
--- r-base-3.2.3/src/extra/xz/common/block_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_encoder.c
-/// \brief      Encodes .xz Blocks
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "block_encoder.h"
-#include "filter_encoder.h"
-#include "check.h"
-
-
-struct lzma_coder_s {
-	/// The filters in the chain; initialized with lzma_raw_decoder_init().
-	lzma_next_coder next;
-
-	/// Encoding options; we also write Unpadded Size, Compressed Size,
-	/// and Uncompressed Size back to this structure when the encoding
-	/// has been finished.
-	lzma_block *block;
-
-	enum {
-		SEQ_CODE,
-		SEQ_PADDING,
-		SEQ_CHECK,
-	} sequence;
-
-	/// Compressed Size calculated while encoding
-	lzma_vli compressed_size;
-
-	/// Uncompressed Size calculated while encoding
-	lzma_vli uncompressed_size;
-
-	/// Position in the Check field
-	size_t pos;
-
-	/// Check of the uncompressed data
-	lzma_check_state check;
-};
-
-
-static lzma_ret
-block_encode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	// Check that our amount of input stays in proper limits.
-	if (LZMA_VLI_MAX - coder->uncompressed_size < in_size - *in_pos)
-		return LZMA_DATA_ERROR;
-
-	switch (coder->sequence) {
-	case SEQ_CODE: {
-		const size_t in_start = *in_pos;
-		const size_t out_start = *out_pos;
-
-		const lzma_ret ret = coder->next.code(coder->next.coder,
-				allocator, in, in_pos, in_size,
-				out, out_pos, out_size, action);
-
-		const size_t in_used = *in_pos - in_start;
-		const size_t out_used = *out_pos - out_start;
-
-		if (COMPRESSED_SIZE_MAX - coder->compressed_size < out_used)
-			return LZMA_DATA_ERROR;
-
-		coder->compressed_size += out_used;
-
-		// No need to check for overflow because we have already
-		// checked it at the beginning of this function.
-		coder->uncompressed_size += in_used;
-
-		lzma_check_update(&coder->check, coder->block->check,
-				in + in_start, in_used);
-
-		if (ret != LZMA_STREAM_END || action == LZMA_SYNC_FLUSH)
-			return ret;
-
-		assert(*in_pos == in_size);
-		assert(action == LZMA_FINISH);
-
-		// Copy the values into coder->block. The caller
-		// may use this information to construct Index.
-		coder->block->compressed_size = coder->compressed_size;
-		coder->block->uncompressed_size = coder->uncompressed_size;
-
-		coder->sequence = SEQ_PADDING;
-	}
-
-	// Fall through
-
-	case SEQ_PADDING:
-		// Pad Compressed Data to a multiple of four bytes. We can
-		// use coder->compressed_size for this since we don't need
-		// it for anything else anymore.
-		while (coder->compressed_size & 3) {
-			if (*out_pos >= out_size)
-				return LZMA_OK;
-
-			out[*out_pos] = 0x00;
-			++*out_pos;
-			++coder->compressed_size;
-		}
-
-		if (coder->block->check == LZMA_CHECK_NONE)
-			return LZMA_STREAM_END;
-
-		lzma_check_finish(&coder->check, coder->block->check);
-
-		coder->sequence = SEQ_CHECK;
-
-	// Fall through
-
-	case SEQ_CHECK: {
-		const size_t check_size = lzma_check_size(coder->block->check);
-		lzma_bufcpy(coder->check.buffer.u8, &coder->pos, check_size,
-				out, out_pos, out_size);
-		if (coder->pos < check_size)
-			return LZMA_OK;
-
-		memcpy(coder->block->raw_check, coder->check.buffer.u8,
-				check_size);
-		return LZMA_STREAM_END;
-	}
-	}
-
-	return LZMA_PROG_ERROR;
-}
-
-
-static void
-block_encoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-block_encoder_update(lzma_coder *coder, lzma_allocator *allocator,
-		const lzma_filter *filters lzma_attribute((__unused__)),
-		const lzma_filter *reversed_filters)
-{
-	if (coder->sequence != SEQ_CODE)
-		return LZMA_PROG_ERROR;
-
-	return lzma_next_filter_update(
-			&coder->next, allocator, reversed_filters);
-}
-
-
-extern lzma_ret
-lzma_block_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		lzma_block *block)
-{
-	lzma_next_coder_init(&lzma_block_encoder_init, next, allocator);
-
-	if (block == NULL)
-		return LZMA_PROG_ERROR;
-
-	// The contents of the structure may depend on the version so
-	// check the version first.
-	if (block->version != 0)
-		return LZMA_OPTIONS_ERROR;
-
-	// If the Check ID is not supported, we cannot calculate the check and
-	// thus not create a proper Block.
-	if ((unsigned int)(block->check) > LZMA_CHECK_ID_MAX)
-		return LZMA_PROG_ERROR;
-
-	if (!lzma_check_is_supported(block->check))
-		return LZMA_UNSUPPORTED_CHECK;
-
-	// Allocate and initialize *next->coder if needed.
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &block_encode;
-		next->end = &block_encoder_end;
-		next->update = &block_encoder_update;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	// Basic initializations
-	next->coder->sequence = SEQ_CODE;
-	next->coder->block = block;
-	next->coder->compressed_size = 0;
-	next->coder->uncompressed_size = 0;
-	next->coder->pos = 0;
-
-	// Initialize the check
-	lzma_check_init(&next->coder->check, block->check);
-
-	// Initialize the requested filters.
-	return lzma_raw_encoder_init(&next->coder->next, allocator,
-			block->filters);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_encoder(lzma_stream *strm, lzma_block *block)
-{
-	lzma_next_strm_init(lzma_block_encoder_init, strm, block);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_encoder.h r-base-3.3.1/src/extra/xz/common/block_encoder.h
--- r-base-3.2.3/src/extra/xz/common/block_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_encoder.h
-/// \brief      Encodes .xz Blocks
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_BLOCK_ENCODER_H
-#define LZMA_BLOCK_ENCODER_H
-
-#include "common.h"
-
-
-/// \brief      Biggest Compressed Size value that the Block encoder supports
-///
-/// The maximum size of a single Block is limited by the maximum size of
-/// a Stream, which in theory is 2^63 - 3 bytes (i.e. LZMA_VLI_MAX - 3).
-/// While the size is really big and no one should hit it in practice, we
-/// take it into account in some places anyway to catch some errors e.g. if
-/// application passes insanely big value to some function.
-///
-/// We could take into account the headers etc. to determine the exact
-/// maximum size of the Compressed Data field, but the complexity would give
-/// us nothing useful. Instead, limit the size of Compressed Data so that
-/// even with biggest possible Block Header and Check fields the total
-/// encoded size of the Block stays as a valid VLI. This doesn't guarantee
-/// that the size of the Stream doesn't grow too big, but that problem is
-/// taken care outside the Block handling code.
-///
-/// ~LZMA_VLI_C(3) is to guarantee that if we need padding at the end of
-/// the Compressed Data field, it will still stay in the proper limit.
-///
-/// This constant is in this file because it is needed in both
-/// block_encoder.c and block_buffer_encoder.c.
-#define COMPRESSED_SIZE_MAX ((LZMA_VLI_MAX - LZMA_BLOCK_HEADER_SIZE_MAX \
-		- LZMA_CHECK_SIZE_MAX) & ~LZMA_VLI_C(3))
-
-
-extern lzma_ret lzma_block_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, lzma_block *block);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/block_header_decoder.c r-base-3.3.1/src/extra/xz/common/block_header_decoder.c
--- r-base-3.2.3/src/extra/xz/common/block_header_decoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_header_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_header_decoder.c
-/// \brief      Decodes Block Header from .xz files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-#include "check.h"
-
-
-static void
-free_properties(lzma_block *block, lzma_allocator *allocator)
-{
-	// Free allocated filter options. The last array member is not
-	// touched after the initialization in the beginning of
-	// lzma_block_header_decode(), so we don't need to touch that here.
-	for (size_t i = 0; i < LZMA_FILTERS_MAX; ++i) {
-		lzma_free(block->filters[i].options, allocator);
-		block->filters[i].id = LZMA_VLI_UNKNOWN;
-		block->filters[i].options = NULL;
-	}
-
-	return;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_header_decode(lzma_block *block,
-		lzma_allocator *allocator, const uint8_t *in)
-{
-	// NOTE: We consider the header to be corrupt not only when the
-	// CRC32 doesn't match, but also when variable-length integers
-	// are invalid or over 63 bits, or if the header is too small
-	// to contain the claimed information.
-
-	// Initialize the filter options array. This way the caller can
-	// safely free() the options even if an error occurs in this function.
-	for (size_t i = 0; i <= LZMA_FILTERS_MAX; ++i) {
-		block->filters[i].id = LZMA_VLI_UNKNOWN;
-		block->filters[i].options = NULL;
-	}
-
-	// Always zero for now.
-	block->version = 0;
-
-	// Validate Block Header Size and Check type. The caller must have
-	// already set these, so it is a programming error if this test fails.
-	if (lzma_block_header_size_decode(in[0]) != block->header_size
-			|| (unsigned int)(block->check) > LZMA_CHECK_ID_MAX)
-		return LZMA_PROG_ERROR;
-
-	// Exclude the CRC32 field.
-	const size_t in_size = block->header_size - 4;
-
-	// Verify CRC32
-	if (lzma_crc32(in, in_size, 0) != unaligned_read32le(in + in_size))
-		return LZMA_DATA_ERROR;
-
-	// Check for unsupported flags.
-	if (in[1] & 0x3C)
-		return LZMA_OPTIONS_ERROR;
-
-	// Start after the Block Header Size and Block Flags fields.
-	size_t in_pos = 2;
-
-	// Compressed Size
-	if (in[1] & 0x40) {
-		return_if_error(lzma_vli_decode(&block->compressed_size,
-				NULL, in, &in_pos, in_size));
-
-		// Validate Compressed Size. This checks that it isn't zero
-		// and that the total size of the Block is a valid VLI.
-		if (lzma_block_unpadded_size(block) == 0)
-			return LZMA_DATA_ERROR;
-	} else {
-		block->compressed_size = LZMA_VLI_UNKNOWN;
-	}
-
-	// Uncompressed Size
-	if (in[1] & 0x80)
-		return_if_error(lzma_vli_decode(&block->uncompressed_size,
-				NULL, in, &in_pos, in_size));
-	else
-		block->uncompressed_size = LZMA_VLI_UNKNOWN;
-
-	// Filter Flags
-	const size_t filter_count = (in[1] & 3) + 1;
-	for (size_t i = 0; i < filter_count; ++i) {
-		const lzma_ret ret = lzma_filter_flags_decode(
-				&block->filters[i], allocator,
-				in, &in_pos, in_size);
-		if (ret != LZMA_OK) {
-			free_properties(block, allocator);
-			return ret;
-		}
-	}
-
-	// Padding
-	while (in_pos < in_size) {
-		if (in[in_pos++] != 0x00) {
-			free_properties(block, allocator);
-
-			// Possibly some new field present so use
-			// LZMA_OPTIONS_ERROR instead of LZMA_DATA_ERROR.
-			return LZMA_OPTIONS_ERROR;
-		}
-	}
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_header_encoder.c r-base-3.3.1/src/extra/xz/common/block_header_encoder.c
--- r-base-3.2.3/src/extra/xz/common/block_header_encoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_header_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_header_encoder.c
-/// \brief      Encodes Block Header for .xz files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-#include "check.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_header_size(lzma_block *block)
-{
-	if (block->version != 0)
-		return LZMA_OPTIONS_ERROR;
-
-	// Block Header Size + Block Flags + CRC32.
-	uint32_t size = 1 + 1 + 4;
-
-	// Compressed Size
-	if (block->compressed_size != LZMA_VLI_UNKNOWN) {
-		const uint32_t add = lzma_vli_size(block->compressed_size);
-		if (add == 0 || block->compressed_size == 0)
-			return LZMA_PROG_ERROR;
-
-		size += add;
-	}
-
-	// Uncompressed Size
-	if (block->uncompressed_size != LZMA_VLI_UNKNOWN) {
-		const uint32_t add = lzma_vli_size(block->uncompressed_size);
-		if (add == 0)
-			return LZMA_PROG_ERROR;
-
-		size += add;
-	}
-
-	// List of Filter Flags
-	if (block->filters == NULL || block->filters[0].id == LZMA_VLI_UNKNOWN)
-		return LZMA_PROG_ERROR;
-
-	for (size_t i = 0; block->filters[i].id != LZMA_VLI_UNKNOWN; ++i) {
-		// Don't allow too many filters.
-		if (i == LZMA_FILTERS_MAX)
-			return LZMA_PROG_ERROR;
-
-		uint32_t add;
-		return_if_error(lzma_filter_flags_size(&add,
-				block->filters + i));
-
-		size += add;
-	}
-
-	// Pad to a multiple of four bytes.
-	block->header_size = (size + 3) & ~UINT32_C(3);
-
-	// NOTE: We don't verify that the encoded size of the Block stays
-	// within limits. This is because it is possible that we are called
-	// with exaggerated Compressed Size (e.g. LZMA_VLI_MAX) to reserve
-	// space for Block Header, and later called again with lower,
-	// real values.
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_header_encode(const lzma_block *block, uint8_t *out)
-{
-	// Validate everything but filters.
-	if (lzma_block_unpadded_size(block) == 0
-			|| !lzma_vli_is_valid(block->uncompressed_size))
-		return LZMA_PROG_ERROR;
-
-	// Indicate the size of the buffer _excluding_ the CRC32 field.
-	const size_t out_size = block->header_size - 4;
-
-	// Store the Block Header Size.
-	out[0] = out_size / 4;
-
-	// We write Block Flags in pieces.
-	out[1] = 0x00;
-	size_t out_pos = 2;
-
-	// Compressed Size
-	if (block->compressed_size != LZMA_VLI_UNKNOWN) {
-		return_if_error(lzma_vli_encode(block->compressed_size, NULL,
-				out, &out_pos, out_size));
-
-		out[1] |= 0x40;
-	}
-
-	// Uncompressed Size
-	if (block->uncompressed_size != LZMA_VLI_UNKNOWN) {
-		return_if_error(lzma_vli_encode(block->uncompressed_size, NULL,
-				out, &out_pos, out_size));
-
-		out[1] |= 0x80;
-	}
-
-	// Filter Flags
-	if (block->filters == NULL || block->filters[0].id == LZMA_VLI_UNKNOWN)
-		return LZMA_PROG_ERROR;
-
-	size_t filter_count = 0;
-	do {
-		// There can be a maximum of four filters.
-		if (filter_count == LZMA_FILTERS_MAX)
-			return LZMA_PROG_ERROR;
-
-		return_if_error(lzma_filter_flags_encode(
-				block->filters + filter_count,
-				out, &out_pos, out_size));
-
-	} while (block->filters[++filter_count].id != LZMA_VLI_UNKNOWN);
-
-	out[1] |= filter_count - 1;
-
-	// Padding
-	memzero(out + out_pos, out_size - out_pos);
-
-	// CRC32
-	unaligned_write32le(out + out_size, lzma_crc32(out, out_size, 0));
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/block_util.c r-base-3.3.1/src/extra/xz/common/block_util.c
--- r-base-3.2.3/src/extra/xz/common/block_util.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/block_util.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       block_header.c
-/// \brief      Utility functions to handle lzma_block
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-#include "index.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_block_compressed_size(lzma_block *block, lzma_vli unpadded_size)
-{
-	// Validate everything but Uncompressed Size and filters.
-	if (lzma_block_unpadded_size(block) == 0)
-		return LZMA_PROG_ERROR;
-
-	const uint32_t container_size = block->header_size
-			+ lzma_check_size(block->check);
-
-	// Validate that Compressed Size will be greater than zero.
-	if (unpadded_size <= container_size)
-		return LZMA_DATA_ERROR;
-
-	// Calculate what Compressed Size is supposed to be.
-	// If Compressed Size was present in Block Header,
-	// compare that the new value matches it.
-	const lzma_vli compressed_size = unpadded_size - container_size;
-	if (block->compressed_size != LZMA_VLI_UNKNOWN
-			&& block->compressed_size != compressed_size)
-		return LZMA_DATA_ERROR;
-
-	block->compressed_size = compressed_size;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_block_unpadded_size(const lzma_block *block)
-{
-	// Validate the values that we are interested in i.e. all but
-	// Uncompressed Size and the filters.
-	//
-	// NOTE: This function is used for validation too, so it is
-	// essential that these checks are always done even if
-	// Compressed Size is unknown.
-	if (block == NULL || block->version != 0
-			|| block->header_size < LZMA_BLOCK_HEADER_SIZE_MIN
-			|| block->header_size > LZMA_BLOCK_HEADER_SIZE_MAX
-			|| (block->header_size & 3)
-			|| !lzma_vli_is_valid(block->compressed_size)
-			|| block->compressed_size == 0
-			|| (unsigned int)(block->check) > LZMA_CHECK_ID_MAX)
-		return 0;
-
-	// If Compressed Size is unknown, return that we cannot know
-	// size of the Block either.
-	if (block->compressed_size == LZMA_VLI_UNKNOWN)
-		return LZMA_VLI_UNKNOWN;
-
-	// Calculate Unpadded Size and validate it.
-	const lzma_vli unpadded_size = block->compressed_size
-				+ block->header_size
-				+ lzma_check_size(block->check);
-
-	assert(unpadded_size >= UNPADDED_SIZE_MIN);
-	if (unpadded_size > UNPADDED_SIZE_MAX)
-		return 0;
-
-	return unpadded_size;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_block_total_size(const lzma_block *block)
-{
-	lzma_vli unpadded_size = lzma_block_unpadded_size(block);
-
-	if (unpadded_size != LZMA_VLI_UNKNOWN)
-		unpadded_size = vli_ceil4(unpadded_size);
-
-	return unpadded_size;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/bsr.h r-base-3.3.1/src/extra/xz/common/bsr.h
--- r-base-3.2.3/src/extra/xz/common/bsr.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/bsr.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       bsr.h
-/// \brief      Bit scan reverse
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_BSR_H
-#define LZMA_BSR_H
-
-// NOTE: Both input and output variables for lzma_bsr must be uint32_t.
-
-#if defined(__GNUC__) && (defined (HAVE_ASM_X86) || defined(HAVE_ASM_X86_64))
-#	define lzma_bsr(dest, n) \
-		__asm__("bsrl %1, %0" : "=r" (dest) : "rm" (n))
-
-#else
-#	define lzma_bsr(dest, n) dest = lzma_bsr_helper(n)
-
-static inline uint32_t
-lzma_bsr_helper(uint32_t n)
-{
-	assert(n != 0);
-
-	uint32_t i = 31;
-
-	if ((n & UINT32_C(0xFFFF0000)) == 0) {
-		n <<= 16;
-		i = 15;
-	}
-
-	if ((n & UINT32_C(0xFF000000)) == 0) {
-		n <<= 8;
-		i -= 8;
-	}
-
-	if ((n & UINT32_C(0xF0000000)) == 0) {
-		n <<= 4;
-		i -= 4;
-	}
-
-	if ((n & UINT32_C(0xC0000000)) == 0) {
-		n <<= 2;
-		i -= 2;
-	}
-
-	if ((n & UINT32_C(0x80000000)) == 0)
-		--i;
-
-	return i;
-}
-
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/bswap.h r-base-3.3.1/src/extra/xz/common/bswap.h
--- r-base-3.2.3/src/extra/xz/common/bswap.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/bswap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       bswap.h
-/// \brief      Byte swapping
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_BSWAP_H
-#define LZMA_BSWAP_H
-
-// NOTE: We assume that config.h is already #included.
-
-// At least glibc has byteswap.h which contains inline assembly code for
-// byteswapping. Some systems have byteswap.h but lack one or more of the
-// bswap_xx macros/functions, which is why we check them separately even
-// if byteswap.h is available.
-
-#ifdef HAVE_BYTESWAP_H
-#	include <byteswap.h>
-#endif
-
-#ifndef HAVE_BSWAP_16
-#	define bswap_16(num) \
-		(((num) << 8) | ((num) >> 8))
-#endif
-
-#ifndef HAVE_BSWAP_32
-#	define bswap_32(num) \
-		( (((num) << 24)                       ) \
-		| (((num) <<  8) & UINT32_C(0x00FF0000)) \
-		| (((num) >>  8) & UINT32_C(0x0000FF00)) \
-		| (((num) >> 24)                       ) )
-#endif
-
-#ifndef HAVE_BSWAP_64
-#	define bswap_64(num) \
-		( (((num) << 56)                               ) \
-		| (((num) << 40) & UINT64_C(0x00FF000000000000)) \
-		| (((num) << 24) & UINT64_C(0x0000FF0000000000)) \
-		| (((num) <<  8) & UINT64_C(0x000000FF00000000)) \
-		| (((num) >>  8) & UINT64_C(0x00000000FF000000)) \
-		| (((num) >> 24) & UINT64_C(0x0000000000FF0000)) \
-		| (((num) >> 40) & UINT64_C(0x000000000000FF00)) \
-		| (((num) >> 56)                               ) )
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/common.c r-base-3.3.1/src/extra/xz/common/common.c
--- r-base-3.2.3/src/extra/xz/common/common.c	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,388 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       common.h
-/// \brief      Common functions needed in many places in liblzma
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-/////////////
-// Version //
-/////////////
-
-extern LZMA_API(uint32_t)
-lzma_version_number(void)
-{
-	return LZMA_VERSION;
-}
-
-
-extern LZMA_API(const char *)
-lzma_version_string(void)
-{
-	return LZMA_VERSION_STRING;
-}
-
-
-///////////////////////
-// Memory allocation //
-///////////////////////
-
-extern void * lzma_attribute((__malloc__)) lzma_attr_alloc_size(1)
-lzma_alloc(size_t size, lzma_allocator *allocator)
-{
-	// Some malloc() variants return NULL if called with size == 0.
-	if (size == 0)
-		size = 1;
-
-	void *ptr;
-
-	if (allocator != NULL && allocator->alloc != NULL)
-		ptr = allocator->alloc(allocator->opaque, 1, size);
-	else
-		ptr = malloc(size);
-
-	return ptr;
-}
-
-
-extern void
-lzma_free(void *ptr, lzma_allocator *allocator)
-{
-	if (allocator != NULL && allocator->free != NULL)
-		allocator->free(allocator->opaque, ptr);
-	else
-		free(ptr);
-
-	return;
-}
-
-
-//////////
-// Misc //
-//////////
-
-extern size_t
-lzma_bufcpy(const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size)
-{
-	const size_t in_avail = in_size - *in_pos;
-	const size_t out_avail = out_size - *out_pos;
-	const size_t copy_size = my_min(in_avail, out_avail);
-
-	memcpy(out + *out_pos, in + *in_pos, copy_size);
-
-	*in_pos += copy_size;
-	*out_pos += copy_size;
-
-	return copy_size;
-}
-
-
-extern lzma_ret
-lzma_next_filter_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	lzma_next_coder_init(filters[0].init, next, allocator);
-	next->id = filters[0].id;
-	return filters[0].init == NULL
-			? LZMA_OK : filters[0].init(next, allocator, filters);
-}
-
-
-extern lzma_ret
-lzma_next_filter_update(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *reversed_filters)
-{
-	// Check that the application isn't trying to change the Filter ID.
-	// End of filters is indicated with LZMA_VLI_UNKNOWN in both
-	// reversed_filters[0].id and next->id.
-	if (reversed_filters[0].id != next->id)
-		return LZMA_PROG_ERROR;
-
-	if (reversed_filters[0].id == LZMA_VLI_UNKNOWN)
-		return LZMA_OK;
-
-	assert(next->update != NULL);
-	return next->update(next->coder, allocator, NULL, reversed_filters);
-}
-
-
-extern void
-lzma_next_end(lzma_next_coder *next, lzma_allocator *allocator)
-{
-	if (next->init != (uintptr_t)(NULL)) {
-		// To avoid tiny end functions that simply call
-		// lzma_free(coder, allocator), we allow leaving next->end
-		// NULL and call lzma_free() here.
-		if (next->end != NULL)
-			next->end(next->coder, allocator);
-		else
-			lzma_free(next->coder, allocator);
-
-		// Reset the variables so the we don't accidentally think
-		// that it is an already initialized coder.
-		*next = LZMA_NEXT_CODER_INIT;
-	}
-
-	return;
-}
-
-
-//////////////////////////////////////
-// External to internal API wrapper //
-//////////////////////////////////////
-
-extern lzma_ret
-lzma_strm_init(lzma_stream *strm)
-{
-	if (strm == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (strm->internal == NULL) {
-		strm->internal = lzma_alloc(sizeof(lzma_internal),
-				strm->allocator);
-		if (strm->internal == NULL)
-			return LZMA_MEM_ERROR;
-
-		strm->internal->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	strm->internal->supported_actions[LZMA_RUN] = false;
-	strm->internal->supported_actions[LZMA_SYNC_FLUSH] = false;
-	strm->internal->supported_actions[LZMA_FULL_FLUSH] = false;
-	strm->internal->supported_actions[LZMA_FINISH] = false;
-	strm->internal->sequence = ISEQ_RUN;
-	strm->internal->allow_buf_error = false;
-
-	strm->total_in = 0;
-	strm->total_out = 0;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_code(lzma_stream *strm, lzma_action action)
-{
-	// Sanity checks
-	if ((strm->next_in == NULL && strm->avail_in != 0)
-			|| (strm->next_out == NULL && strm->avail_out != 0)
-			|| strm->internal == NULL
-			|| strm->internal->next.code == NULL
-			|| (unsigned int)(action) > LZMA_FINISH
-			|| !strm->internal->supported_actions[action])
-		return LZMA_PROG_ERROR;
-
-	// Check if unsupported members have been set to non-zero or non-NULL,
-	// which would indicate that some new feature is wanted.
-	if (strm->reserved_ptr1 != NULL
-			|| strm->reserved_ptr2 != NULL
-			|| strm->reserved_ptr3 != NULL
-			|| strm->reserved_ptr4 != NULL
-			|| strm->reserved_int1 != 0
-			|| strm->reserved_int2 != 0
-			|| strm->reserved_int3 != 0
-			|| strm->reserved_int4 != 0
-			|| strm->reserved_enum1 != LZMA_RESERVED_ENUM
-			|| strm->reserved_enum2 != LZMA_RESERVED_ENUM)
-		return LZMA_OPTIONS_ERROR;
-
-	switch (strm->internal->sequence) {
-	case ISEQ_RUN:
-		switch (action) {
-		case LZMA_RUN:
-			break;
-
-		case LZMA_SYNC_FLUSH:
-			strm->internal->sequence = ISEQ_SYNC_FLUSH;
-			break;
-
-		case LZMA_FULL_FLUSH:
-			strm->internal->sequence = ISEQ_FULL_FLUSH;
-			break;
-
-		case LZMA_FINISH:
-			strm->internal->sequence = ISEQ_FINISH;
-			break;
-		}
-
-		break;
-
-	case ISEQ_SYNC_FLUSH:
-		// The same action must be used until we return
-		// LZMA_STREAM_END, and the amount of input must not change.
-		if (action != LZMA_SYNC_FLUSH
-				|| strm->internal->avail_in != strm->avail_in)
-			return LZMA_PROG_ERROR;
-
-		break;
-
-	case ISEQ_FULL_FLUSH:
-		if (action != LZMA_FULL_FLUSH
-				|| strm->internal->avail_in != strm->avail_in)
-			return LZMA_PROG_ERROR;
-
-		break;
-
-	case ISEQ_FINISH:
-		if (action != LZMA_FINISH
-				|| strm->internal->avail_in != strm->avail_in)
-			return LZMA_PROG_ERROR;
-
-		break;
-
-	case ISEQ_END:
-		return LZMA_STREAM_END;
-
-	case ISEQ_ERROR:
-	default:
-		return LZMA_PROG_ERROR;
-	}
-
-	size_t in_pos = 0;
-	size_t out_pos = 0;
-	lzma_ret ret = strm->internal->next.code(
-			strm->internal->next.coder, strm->allocator,
-			strm->next_in, &in_pos, strm->avail_in,
-			strm->next_out, &out_pos, strm->avail_out, action);
-
-	strm->next_in += in_pos;
-	strm->avail_in -= in_pos;
-	strm->total_in += in_pos;
-
-	strm->next_out += out_pos;
-	strm->avail_out -= out_pos;
-	strm->total_out += out_pos;
-
-	strm->internal->avail_in = strm->avail_in;
-
-	switch (ret) {
-	case LZMA_OK:
-		// Don't return LZMA_BUF_ERROR when it happens the first time.
-		// This is to avoid returning LZMA_BUF_ERROR when avail_out
-		// was zero but still there was no more data left to written
-		// to next_out.
-		if (out_pos == 0 && in_pos == 0) {
-			if (strm->internal->allow_buf_error)
-				ret = LZMA_BUF_ERROR;
-			else
-				strm->internal->allow_buf_error = true;
-		} else {
-			strm->internal->allow_buf_error = false;
-		}
-		break;
-
-	case LZMA_STREAM_END:
-		if (strm->internal->sequence == ISEQ_SYNC_FLUSH
-				|| strm->internal->sequence == ISEQ_FULL_FLUSH)
-			strm->internal->sequence = ISEQ_RUN;
-		else
-			strm->internal->sequence = ISEQ_END;
-
-	// Fall through
-
-	case LZMA_NO_CHECK:
-	case LZMA_UNSUPPORTED_CHECK:
-	case LZMA_GET_CHECK:
-	case LZMA_MEMLIMIT_ERROR:
-		// Something else than LZMA_OK, but not a fatal error,
-		// that is, coding may be continued (except if ISEQ_END).
-		strm->internal->allow_buf_error = false;
-		break;
-
-	default:
-		// All the other errors are fatal; coding cannot be continued.
-		assert(ret != LZMA_BUF_ERROR);
-		strm->internal->sequence = ISEQ_ERROR;
-		break;
-	}
-
-	return ret;
-}
-
-
-extern LZMA_API(void)
-lzma_end(lzma_stream *strm)
-{
-	if (strm != NULL && strm->internal != NULL) {
-		lzma_next_end(&strm->internal->next, strm->allocator);
-		lzma_free(strm->internal, strm->allocator);
-		strm->internal = NULL;
-	}
-
-	return;
-}
-
-
-extern LZMA_API(lzma_check)
-lzma_get_check(const lzma_stream *strm)
-{
-	// Return LZMA_CHECK_NONE if we cannot know the check type.
-	// It's a bug in the application if this happens.
-	if (strm->internal->next.get_check == NULL)
-		return LZMA_CHECK_NONE;
-
-	return strm->internal->next.get_check(strm->internal->next.coder);
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_memusage(const lzma_stream *strm)
-{
-	uint64_t memusage;
-	uint64_t old_memlimit;
-
-	if (strm == NULL || strm->internal == NULL
-			|| strm->internal->next.memconfig == NULL
-			|| strm->internal->next.memconfig(
-				strm->internal->next.coder,
-				&memusage, &old_memlimit, 0) != LZMA_OK)
-		return 0;
-
-	return memusage;
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_memlimit_get(const lzma_stream *strm)
-{
-	uint64_t old_memlimit;
-	uint64_t memusage;
-
-	if (strm == NULL || strm->internal == NULL
-			|| strm->internal->next.memconfig == NULL
-			|| strm->internal->next.memconfig(
-				strm->internal->next.coder,
-				&memusage, &old_memlimit, 0) != LZMA_OK)
-		return 0;
-
-	return old_memlimit;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_memlimit_set(lzma_stream *strm, uint64_t new_memlimit)
-{
-	// Dummy variables to simplify memconfig functions
-	uint64_t old_memlimit;
-	uint64_t memusage;
-
-	if (strm == NULL || strm->internal == NULL
-			|| strm->internal->next.memconfig == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (new_memlimit != 0 && new_memlimit < LZMA_MEMUSAGE_BASE)
-		return LZMA_MEMLIMIT_ERROR;
-
-	return strm->internal->next.memconfig(strm->internal->next.coder,
-			&memusage, &old_memlimit, new_memlimit);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/common.h r-base-3.3.1/src/extra/xz/common/common.h
--- r-base-3.2.3/src/extra/xz/common/common.h	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,282 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       common.h
-/// \brief      Definitions common to the whole liblzma library
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_COMMON_H
-#define LZMA_COMMON_H
-
-#include "sysdefs.h"
-#include "mythread.h"
-#include "tuklib_integer.h"
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#	ifdef DLL_EXPORT
-#		define LZMA_API_EXPORT __declspec(dllexport)
-#	else
-#		define LZMA_API_EXPORT
-#	endif
-// R change: we do not want all symbols visible
-#else
-#	define LZMA_API_EXPORT
-#endif
-
-#define LZMA_API(type) LZMA_API_EXPORT type LZMA_API_CALL
-
-#include "lzma.h"
-
-// These allow helping the compiler in some often-executed branches, whose
-// result is almost always the same.
-#ifdef __GNUC__
-#	define likely(expr) __builtin_expect(expr, true)
-#	define unlikely(expr) __builtin_expect(expr, false)
-#else
-#	define likely(expr) (expr)
-#	define unlikely(expr) (expr)
-#endif
-
-
-/// Size of temporary buffers needed in some filters
-#define LZMA_BUFFER_SIZE 4096
-
-
-/// Starting value for memory usage estimates. Instead of calculating size
-/// of _every_ structure and taking into account malloc() overhead etc., we
-/// add a base size to all memory usage estimates. It's not very accurate
-/// but should be easily good enough.
-#define LZMA_MEMUSAGE_BASE (UINT64_C(1) << 15)
-
-/// Start of internal Filter ID space. These IDs must never be used
-/// in Streams.
-#define LZMA_FILTER_RESERVED_START (LZMA_VLI_C(1) << 62)
-
-
-/// Supported flags that can be passed to lzma_stream_decoder()
-/// or lzma_auto_decoder().
-#define LZMA_SUPPORTED_FLAGS \
-	( LZMA_TELL_NO_CHECK \
-	| LZMA_TELL_UNSUPPORTED_CHECK \
-	| LZMA_TELL_ANY_CHECK \
-	| LZMA_CONCATENATED )
-
-
-/// Type of encoder/decoder specific data; the actual structure is defined
-/// differently in different coders.
-typedef struct lzma_coder_s lzma_coder;
-
-typedef struct lzma_next_coder_s lzma_next_coder;
-
-typedef struct lzma_filter_info_s lzma_filter_info;
-
-
-/// Type of a function used to initialize a filter encoder or decoder
-typedef lzma_ret (*lzma_init_function)(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters);
-
-/// Type of a function to do some kind of coding work (filters, Stream,
-/// Block encoders/decoders etc.). Some special coders use don't use both
-/// input and output buffers, but for simplicity they still use this same
-/// function prototype.
-typedef lzma_ret (*lzma_code_function)(
-		lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size,
-		lzma_action action);
-
-/// Type of a function to free the memory allocated for the coder
-typedef void (*lzma_end_function)(
-		lzma_coder *coder, lzma_allocator *allocator);
-
-
-/// Raw coder validates and converts an array of lzma_filter structures to
-/// an array of lzma_filter_info structures. This array is used with
-/// lzma_next_filter_init to initialize the filter chain.
-struct lzma_filter_info_s {
-	/// Filter ID. This is used only by the encoder
-	/// with lzma_filters_update().
-	lzma_vli id;
-
-	/// Pointer to function used to initialize the filter.
-	/// This is NULL to indicate end of array.
-	lzma_init_function init;
-
-	/// Pointer to filter's options structure
-	void *options;
-};
-
-
-/// Hold data and function pointers of the next filter in the chain.
-struct lzma_next_coder_s {
-	/// Pointer to coder-specific data
-	lzma_coder *coder;
-
-	/// Filter ID. This is LZMA_VLI_UNKNOWN when this structure doesn't
-	/// point to a filter coder.
-	lzma_vli id;
-
-	/// "Pointer" to init function. This is never called here.
-	/// We need only to detect if we are initializing a coder
-	/// that was allocated earlier. See lzma_next_coder_init and
-	/// lzma_next_strm_init macros in this file.
-	uintptr_t init;
-
-	/// Pointer to function to do the actual coding
-	lzma_code_function code;
-
-	/// Pointer to function to free lzma_next_coder.coder. This can
-	/// be NULL; in that case, lzma_free is called to free
-	/// lzma_next_coder.coder.
-	lzma_end_function end;
-
-	/// Pointer to function to return the type of the integrity check.
-	/// Most coders won't support this.
-	lzma_check (*get_check)(const lzma_coder *coder);
-
-	/// Pointer to function to get and/or change the memory usage limit.
-	/// If new_memlimit == 0, the limit is not changed.
-	lzma_ret (*memconfig)(lzma_coder *coder, uint64_t *memusage,
-			uint64_t *old_memlimit, uint64_t new_memlimit);
-
-	/// Update the filter-specific options or the whole filter chain
-	/// in the encoder.
-	lzma_ret (*update)(lzma_coder *coder, lzma_allocator *allocator,
-			const lzma_filter *filters,
-			const lzma_filter *reversed_filters);
-};
-
-
-/// Macro to initialize lzma_next_coder structure
-#define LZMA_NEXT_CODER_INIT \
-	(lzma_next_coder){ \
-		.coder = NULL, \
-		.init = (uintptr_t)(NULL), \
-		.id = LZMA_VLI_UNKNOWN, \
-		.code = NULL, \
-		.end = NULL, \
-		.get_check = NULL, \
-		.memconfig = NULL, \
-		.update = NULL, \
-	}
-
-
-/// Internal data for lzma_strm_init, lzma_code, and lzma_end. A pointer to
-/// this is stored in lzma_stream.
-struct lzma_internal_s {
-	/// The actual coder that should do something useful
-	lzma_next_coder next;
-
-	/// Track the state of the coder. This is used to validate arguments
-	/// so that the actual coders can rely on e.g. that LZMA_SYNC_FLUSH
-	/// is used on every call to lzma_code until next.code has returned
-	/// LZMA_STREAM_END.
-	enum {
-		ISEQ_RUN,
-		ISEQ_SYNC_FLUSH,
-		ISEQ_FULL_FLUSH,
-		ISEQ_FINISH,
-		ISEQ_END,
-		ISEQ_ERROR,
-	} sequence;
-
-	/// A copy of lzma_stream avail_in. This is used to verify that the
-	/// amount of input doesn't change once e.g. LZMA_FINISH has been
-	/// used.
-	size_t avail_in;
-
-	/// Indicates which lzma_action values are allowed by next.code.
-	bool supported_actions[4];
-
-	/// If true, lzma_code will return LZMA_BUF_ERROR if no progress was
-	/// made (no input consumed and no output produced by next.code).
-	bool allow_buf_error;
-};
-
-
-/// Allocates memory
-extern void *lzma_alloc(size_t size, lzma_allocator *allocator)
-		lzma_attribute((__malloc__)) lzma_attr_alloc_size(1);
-
-/// Frees memory
-extern void lzma_free(void *ptr, lzma_allocator *allocator);
-
-
-/// Allocates strm->internal if it is NULL, and initializes *strm and
-/// strm->internal. This function is only called via lzma_next_strm_init macro.
-extern lzma_ret lzma_strm_init(lzma_stream *strm);
-
-/// Initializes the next filter in the chain, if any. This takes care of
-/// freeing the memory of previously initialized filter if it is different
-/// than the filter being initialized now. This way the actual filter
-/// initialization functions don't need to use lzma_next_coder_init macro.
-extern lzma_ret lzma_next_filter_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-/// Update the next filter in the chain, if any. This checks that
-/// the application is not trying to change the Filter IDs.
-extern lzma_ret lzma_next_filter_update(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *reversed_filters);
-
-/// Frees the memory allocated for next->coder either using next->end or,
-/// if next->end is NULL, using lzma_free.
-extern void lzma_next_end(lzma_next_coder *next, lzma_allocator *allocator);
-
-
-/// Copy as much data as possible from in[] to out[] and update *in_pos
-/// and *out_pos accordingly. Returns the number of bytes copied.
-extern size_t lzma_bufcpy(const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size);
-
-
-/// \brief      Return if expression doesn't evaluate to LZMA_OK
-///
-/// There are several situations where we want to return immediately
-/// with the value of expr if it isn't LZMA_OK. This macro shortens
-/// the code a little.
-#define return_if_error(expr) \
-do { \
-	const lzma_ret ret_ = (expr); \
-	if (ret_ != LZMA_OK) \
-		return ret_; \
-} while (0)
-
-
-/// If next isn't already initialized, free the previous coder. Then mark
-/// that next is _possibly_ initialized for the coder using this macro.
-/// "Possibly" means that if e.g. allocation of next->coder fails, the
-/// structure isn't actually initialized for this coder, but leaving
-/// next->init to func is still OK.
-#define lzma_next_coder_init(func, next, allocator) \
-do { \
-	if ((uintptr_t)(func) != (next)->init) \
-		lzma_next_end(next, allocator); \
-	(next)->init = (uintptr_t)(func); \
-} while (0)
-
-
-/// Initializes lzma_strm and calls func() to initialize strm->internal->next.
-/// (The function being called will use lzma_next_coder_init()). If
-/// initialization fails, memory that wasn't freed by func() is freed
-/// along strm->internal.
-#define lzma_next_strm_init(func, strm, ...) \
-do { \
-	return_if_error(lzma_strm_init(strm)); \
-	const lzma_ret ret_ = func(&(strm)->internal->next, \
-			(strm)->allocator, __VA_ARGS__); \
-	if (ret_ != LZMA_OK) { \
-		lzma_end(strm); \
-		return ret_; \
-	} \
-} while (0)
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/easy_buffer_encoder.c r-base-3.3.1/src/extra/xz/common/easy_buffer_encoder.c
--- r-base-3.2.3/src/extra/xz/common/easy_buffer_encoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/easy_buffer_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       easy_buffer_encoder.c
-/// \brief      Easy single-call .xz Stream encoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "easy_preset.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_easy_buffer_encode(uint32_t preset, lzma_check check,
-		lzma_allocator *allocator, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	lzma_options_easy opt_easy;
-	if (lzma_easy_preset(&opt_easy, preset))
-		return LZMA_OPTIONS_ERROR;
-
-	return lzma_stream_buffer_encode(opt_easy.filters, check,
-			allocator, in, in_size, out, out_pos, out_size);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/easy_decoder_memusage.c r-base-3.3.1/src/extra/xz/common/easy_decoder_memusage.c
--- r-base-3.2.3/src/extra/xz/common/easy_decoder_memusage.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/easy_decoder_memusage.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       easy_decoder_memusage.c
-/// \brief      Decoder memory usage calculation to match easy encoder presets
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "easy_preset.h"
-
-
-extern LZMA_API(uint64_t)
-lzma_easy_decoder_memusage(uint32_t preset)
-{
-	lzma_options_easy opt_easy;
-	if (lzma_easy_preset(&opt_easy, preset))
-		return UINT32_MAX;
-
-	return lzma_raw_decoder_memusage(opt_easy.filters);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/easy_encoder.c r-base-3.3.1/src/extra/xz/common/easy_encoder.c
--- r-base-3.2.3/src/extra/xz/common/easy_encoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/easy_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       easy_encoder.c
-/// \brief      Easy .xz Stream encoder initialization
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "easy_preset.h"
-#include "stream_encoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_easy_encoder(lzma_stream *strm, uint32_t preset, lzma_check check)
-{
-	lzma_options_easy opt_easy;
-	if (lzma_easy_preset(&opt_easy, preset))
-		return LZMA_OPTIONS_ERROR;
-
-	return lzma_stream_encoder(strm, opt_easy.filters, check);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/easy_encoder_memusage.c r-base-3.3.1/src/extra/xz/common/easy_encoder_memusage.c
--- r-base-3.2.3/src/extra/xz/common/easy_encoder_memusage.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/easy_encoder_memusage.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       easy_encoder_memusage.c
-/// \brief      Easy .xz Stream encoder memory usage calculation
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "easy_preset.h"
-
-
-extern LZMA_API(uint64_t)
-lzma_easy_encoder_memusage(uint32_t preset)
-{
-	lzma_options_easy opt_easy;
-	if (lzma_easy_preset(&opt_easy, preset))
-		return UINT32_MAX;
-
-	return lzma_raw_encoder_memusage(opt_easy.filters);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/easy_preset.c r-base-3.3.1/src/extra/xz/common/easy_preset.c
--- r-base-3.2.3/src/extra/xz/common/easy_preset.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/easy_preset.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       easy_preset.c
-/// \brief      Preset handling for easy encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "easy_preset.h"
-
-
-extern bool
-lzma_easy_preset(lzma_options_easy *opt_easy, uint32_t preset)
-{
-	if (lzma_lzma_preset(&opt_easy->opt_lzma, preset))
-		return true;
-
-	opt_easy->filters[0].id = LZMA_FILTER_LZMA2;
-	opt_easy->filters[0].options = &opt_easy->opt_lzma;
-	opt_easy->filters[1].id = LZMA_VLI_UNKNOWN;
-
-	return false;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/easy_preset.h r-base-3.3.1/src/extra/xz/common/easy_preset.h
--- r-base-3.2.3/src/extra/xz/common/easy_preset.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/easy_preset.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       easy_preset.h
-/// \brief      Preset handling for easy encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-typedef struct {
-	/// We need to keep the filters array available in case
-	/// LZMA_FULL_FLUSH is used.
-	lzma_filter filters[LZMA_FILTERS_MAX + 1];
-
-	/// Options for LZMA2
-	lzma_options_lzma opt_lzma;
-
-	// Options for more filters can be added later, so this struct
-	// is not ready to be put into the public API.
-
-} lzma_options_easy;
-
-
-/// Set *easy to the settings given by the preset. Returns true on error,
-/// false on success.
-extern bool lzma_easy_preset(lzma_options_easy *easy, uint32_t preset);
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_buffer_decoder.c r-base-3.3.1/src/extra/xz/common/filter_buffer_decoder.c
--- r-base-3.2.3/src/extra/xz/common/filter_buffer_decoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_buffer_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_buffer_decoder.c
-/// \brief      Single-call raw decoding
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_decoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_raw_buffer_decode(const lzma_filter *filters, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// Validate what isn't validated later in filter_common.c.
-	if (in == NULL || in_pos == NULL || *in_pos > in_size || out == NULL
-			|| out_pos == NULL || *out_pos > out_size)
-		return LZMA_PROG_ERROR;
-
-	// Initialize the decoer.
-	lzma_next_coder next = LZMA_NEXT_CODER_INIT;
-	return_if_error(lzma_raw_decoder_init(&next, allocator, filters));
-
-	// Store the positions so that we can restore them if something
-	// goes wrong.
-	const size_t in_start = *in_pos;
-	const size_t out_start = *out_pos;
-
-	// Do the actual decoding and free decoder's memory.
-	lzma_ret ret = next.code(next.coder, allocator, in, in_pos, in_size,
-			out, out_pos, out_size, LZMA_FINISH);
-
-	if (ret == LZMA_STREAM_END) {
-		ret = LZMA_OK;
-	} else {
-		if (ret == LZMA_OK) {
-			// Either the input was truncated or the
-			// output buffer was too small.
-			assert(*in_pos == in_size || *out_pos == out_size);
-
-			if (*in_pos != in_size) {
-				// Since input wasn't consumed completely,
-				// the output buffer became full and is
-				// too small.
-				ret = LZMA_BUF_ERROR;
-
-			} else if (*out_pos != out_size) {
-				// Since output didn't became full, the input
-				// has to be truncated.
-				ret = LZMA_DATA_ERROR;
-
-			} else {
-				// All the input was consumed and output
-				// buffer is full. Now we don't immediately
-				// know the reason for the error. Try
-				// decoding one more byte. If it succeeds,
-				// then the output buffer was too small. If
-				// we cannot get a new output byte, the input
-				// is truncated.
-				uint8_t tmp[1];
-				size_t tmp_pos = 0;
-				(void)next.code(next.coder, allocator,
-						in, in_pos, in_size,
-						tmp, &tmp_pos, 1, LZMA_FINISH);
-
-				if (tmp_pos == 1)
-					ret = LZMA_BUF_ERROR;
-				else
-					ret = LZMA_DATA_ERROR;
-			}
-		}
-
-		// Restore the positions.
-		*in_pos = in_start;
-		*out_pos = out_start;
-	}
-
-	lzma_next_end(&next, allocator);
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_buffer_encoder.c r-base-3.3.1/src/extra/xz/common/filter_buffer_encoder.c
--- r-base-3.2.3/src/extra/xz/common/filter_buffer_encoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_buffer_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_buffer_encoder.c
-/// \brief      Single-call raw encoding
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_encoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_raw_buffer_encode(const lzma_filter *filters, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size, uint8_t *out,
-		size_t *out_pos, size_t out_size)
-{
-	// Validate what isn't validated later in filter_common.c.
-	if ((in == NULL && in_size != 0) || out == NULL
-			|| out_pos == NULL || *out_pos > out_size)
-		return LZMA_PROG_ERROR;
-
-	// Initialize the encoder
-	lzma_next_coder next = LZMA_NEXT_CODER_INIT;
-	return_if_error(lzma_raw_encoder_init(&next, allocator, filters));
-
-	// Store the output position so that we can restore it if
-	// something goes wrong.
-	const size_t out_start = *out_pos;
-
-	// Do the actual encoding and free coder's memory.
-	size_t in_pos = 0;
-	lzma_ret ret = next.code(next.coder, allocator, in, &in_pos, in_size,
-			out, out_pos, out_size, LZMA_FINISH);
-	lzma_next_end(&next, allocator);
-
-	if (ret == LZMA_STREAM_END) {
-		ret = LZMA_OK;
-	} else {
-		if (ret == LZMA_OK) {
-			// Output buffer was too small.
-			assert(*out_pos == out_size);
-			ret = LZMA_BUF_ERROR;
-		}
-
-		// Restore the output position.
-		*out_pos = out_start;
-	}
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_common.c r-base-3.3.1/src/extra/xz/common/filter_common.c
--- r-base-3.2.3/src/extra/xz/common/filter_common.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,337 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_common.c
-/// \brief      Filter-specific stuff common for both encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_common.h"
-
-
-static const struct {
-	/// Filter ID
-	lzma_vli id;
-
-	/// Size of the filter-specific options structure
-	size_t options_size;
-
-	/// True if it is OK to use this filter as non-last filter in
-	/// the chain.
-	bool non_last_ok;
-
-	/// True if it is OK to use this filter as the last filter in
-	/// the chain.
-	bool last_ok;
-
-	/// True if the filter may change the size of the data (that is, the
-	/// amount of encoded output can be different than the amount of
-	/// uncompressed input).
-	bool changes_size;
-
-} features[] = {
-#if defined (HAVE_ENCODER_LZMA1) || defined(HAVE_DECODER_LZMA1)
-	{
-		.id = LZMA_FILTER_LZMA1,
-		.options_size = sizeof(lzma_options_lzma),
-		.non_last_ok = false,
-		.last_ok = true,
-		.changes_size = true,
-	},
-#endif
-#if defined(HAVE_ENCODER_LZMA2) || defined(HAVE_DECODER_LZMA2)
-	{
-		.id = LZMA_FILTER_LZMA2,
-		.options_size = sizeof(lzma_options_lzma),
-		.non_last_ok = false,
-		.last_ok = true,
-		.changes_size = true,
-	},
-#endif
-#if defined(HAVE_ENCODER_X86) || defined(HAVE_DECODER_X86)
-	{
-		.id = LZMA_FILTER_X86,
-		.options_size = sizeof(lzma_options_bcj),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-#if defined(HAVE_ENCODER_POWERPC) || defined(HAVE_DECODER_POWERPC)
-	{
-		.id = LZMA_FILTER_POWERPC,
-		.options_size = sizeof(lzma_options_bcj),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-#if defined(HAVE_ENCODER_IA64) || defined(HAVE_DECODER_IA64)
-	{
-		.id = LZMA_FILTER_IA64,
-		.options_size = sizeof(lzma_options_bcj),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-#if defined(HAVE_ENCODER_ARM) || defined(HAVE_DECODER_ARM)
-	{
-		.id = LZMA_FILTER_ARM,
-		.options_size = sizeof(lzma_options_bcj),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-#if defined(HAVE_ENCODER_ARMTHUMB) || defined(HAVE_DECODER_ARMTHUMB)
-	{
-		.id = LZMA_FILTER_ARMTHUMB,
-		.options_size = sizeof(lzma_options_bcj),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-#if defined(HAVE_ENCODER_SPARC) || defined(HAVE_DECODER_SPARC)
-	{
-		.id = LZMA_FILTER_SPARC,
-		.options_size = sizeof(lzma_options_bcj),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-#if defined(HAVE_ENCODER_DELTA) || defined(HAVE_DECODER_DELTA)
-	{
-		.id = LZMA_FILTER_DELTA,
-		.options_size = sizeof(lzma_options_delta),
-		.non_last_ok = true,
-		.last_ok = false,
-		.changes_size = false,
-	},
-#endif
-	{
-		.id = LZMA_VLI_UNKNOWN
-	}
-};
-
-
-extern LZMA_API(lzma_ret)
-lzma_filters_copy(const lzma_filter *src, lzma_filter *dest,
-		lzma_allocator *allocator)
-{
-	if (src == NULL || dest == NULL)
-		return LZMA_PROG_ERROR;
-
-	lzma_ret ret;
-	size_t i;
-	for (i = 0; src[i].id != LZMA_VLI_UNKNOWN; ++i) {
-		// There must be a maximum of four filters plus
-		// the array terminator.
-		if (i == LZMA_FILTERS_MAX) {
-			ret = LZMA_OPTIONS_ERROR;
-			goto error;
-		}
-
-		dest[i].id = src[i].id;
-
-		if (src[i].options == NULL) {
-			dest[i].options = NULL;
-		} else {
-			// See if the filter is supported only when the
-			// options is not NULL. This might be convenient
-			// sometimes if the app is actually copying only
-			// a partial filter chain with a place holder ID.
-			//
-			// When options is not NULL, the Filter ID must be
-			// supported by us, because otherwise we don't know
-			// how big the options are.
-			size_t j;
-			for (j = 0; src[i].id != features[j].id; ++j) {
-				if (features[j].id == LZMA_VLI_UNKNOWN) {
-					ret = LZMA_OPTIONS_ERROR;
-					goto error;
-				}
-			}
-
-			// Allocate and copy the options.
-			dest[i].options = lzma_alloc(features[j].options_size,
-					allocator);
-			if (dest[i].options == NULL) {
-				ret = LZMA_MEM_ERROR;
-				goto error;
-			}
-
-			memcpy(dest[i].options, src[i].options,
-					features[j].options_size);
-		}
-	}
-
-	// Terminate the filter array.
-	assert(i <= LZMA_FILTERS_MAX + 1);
-	dest[i].id = LZMA_VLI_UNKNOWN;
-	dest[i].options = NULL;
-
-	return LZMA_OK;
-
-error:
-	// Free the options which we have already allocated.
-	while (i-- > 0) {
-		lzma_free(dest[i].options, allocator);
-		dest[i].options = NULL;
-	}
-
-	return ret;
-}
-
-
-static lzma_ret
-validate_chain(const lzma_filter *filters, size_t *count)
-{
-	// There must be at least one filter.
-	if (filters == NULL || filters[0].id == LZMA_VLI_UNKNOWN)
-		return LZMA_PROG_ERROR;
-
-	// Number of non-last filters that may change the size of the data
-	// significantly (that is, more than 1-2 % or so).
-	size_t changes_size_count = 0;
-
-	// True if it is OK to add a new filter after the current filter.
-	bool non_last_ok = true;
-
-	// True if the last filter in the given chain is actually usable as
-	// the last filter. Only filters that support embedding End of Payload
-	// Marker can be used as the last filter in the chain.
-	bool last_ok = false;
-
-	size_t i = 0;
-	do {
-		size_t j;
-		for (j = 0; filters[i].id != features[j].id; ++j)
-			if (features[j].id == LZMA_VLI_UNKNOWN)
-				return LZMA_OPTIONS_ERROR;
-
-		// If the previous filter in the chain cannot be a non-last
-		// filter, the chain is invalid.
-		if (!non_last_ok)
-			return LZMA_OPTIONS_ERROR;
-
-		non_last_ok = features[j].non_last_ok;
-		last_ok = features[j].last_ok;
-		changes_size_count += features[j].changes_size;
-
-	} while (filters[++i].id != LZMA_VLI_UNKNOWN);
-
-	// There must be 1-4 filters. The last filter must be usable as
-	// the last filter in the chain. A maximum of three filters are
-	// allowed to change the size of the data.
-	if (i > LZMA_FILTERS_MAX || !last_ok || changes_size_count > 3)
-		return LZMA_OPTIONS_ERROR;
-
-	*count = i;
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_raw_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *options,
-		lzma_filter_find coder_find, bool is_encoder)
-{
-	// Do some basic validation and get the number of filters.
-	size_t count;
-	return_if_error(validate_chain(options, &count));
-
-	// Set the filter functions and copy the options pointer.
-	lzma_filter_info filters[LZMA_FILTERS_MAX + 1];
-	if (is_encoder) {
-		for (size_t i = 0; i < count; ++i) {
-			// The order of the filters is reversed in the
-			// encoder. It allows more efficient handling
-			// of the uncompressed data.
-			const size_t j = count - i - 1;
-
-			const lzma_filter_coder *const fc
-					= coder_find(options[i].id);
-			if (fc == NULL || fc->init == NULL)
-				return LZMA_OPTIONS_ERROR;
-
-			filters[j].id = options[i].id;
-			filters[j].init = fc->init;
-			filters[j].options = options[i].options;
-		}
-	} else {
-		for (size_t i = 0; i < count; ++i) {
-			const lzma_filter_coder *const fc
-					= coder_find(options[i].id);
-			if (fc == NULL || fc->init == NULL)
-				return LZMA_OPTIONS_ERROR;
-
-			filters[i].id = options[i].id;
-			filters[i].init = fc->init;
-			filters[i].options = options[i].options;
-		}
-	}
-
-	// Terminate the array.
-	filters[count].id = LZMA_VLI_UNKNOWN;
-	filters[count].init = NULL;
-
-	// Initialize the filters.
-	const lzma_ret ret = lzma_next_filter_init(next, allocator, filters);
-	if (ret != LZMA_OK)
-		lzma_next_end(next, allocator);
-
-	return ret;
-}
-
-
-extern uint64_t
-lzma_raw_coder_memusage(lzma_filter_find coder_find,
-		const lzma_filter *filters)
-{
-	// The chain has to have at least one filter.
-	{
-		size_t tmp;
-		if (validate_chain(filters, &tmp) != LZMA_OK)
-			return UINT64_MAX;
-	}
-
-	uint64_t total = 0;
-	size_t i = 0;
-
-	do {
-		const lzma_filter_coder *const fc
-				 = coder_find(filters[i].id);
-		if (fc == NULL)
-			return UINT64_MAX; // Unsupported Filter ID
-
-		if (fc->memusage == NULL) {
-			// This filter doesn't have a function to calculate
-			// the memory usage and validate the options. Such
-			// filters need only little memory, so we use 1 KiB
-			// as a good estimate. They also accept all possible
-			// options, so there's no need to worry about lack
-			// of validation.
-			total += 1024;
-		} else {
-			// Call the filter-specific memory usage calculation
-			// function.
-			const uint64_t usage
-					= fc->memusage(filters[i].options);
-			if (usage == UINT64_MAX)
-				return UINT64_MAX; // Invalid options
-
-			total += usage;
-		}
-	} while (filters[++i].id != LZMA_VLI_UNKNOWN);
-
-	// Add some fixed amount of extra. It's to compensate memory usage
-	// of Stream, Block etc. coders, malloc() overhead, stack etc.
-	return total + LZMA_MEMUSAGE_BASE;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_common.h r-base-3.3.1/src/extra/xz/common/filter_common.h
--- r-base-3.2.3/src/extra/xz/common/filter_common.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_common.c
-/// \brief      Filter-specific stuff common for both encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_FILTER_COMMON_H
-#define LZMA_FILTER_COMMON_H
-
-#include "common.h"
-
-
-/// Both lzma_filter_encoder and lzma_filter_decoder begin with these members.
-typedef struct {
-	/// Filter ID
-	lzma_vli id;
-
-	/// Initializes the filter encoder and calls lzma_next_filter_init()
-	/// for filters + 1.
-	lzma_init_function init;
-
-	/// Calculates memory usage of the encoder. If the options are
-	/// invalid, UINT64_MAX is returned.
-	uint64_t (*memusage)(const void *options);
-
-} lzma_filter_coder;
-
-
-typedef const lzma_filter_coder *(*lzma_filter_find)(lzma_vli id);
-
-
-extern lzma_ret lzma_raw_coder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *filters,
-		lzma_filter_find coder_find, bool is_encoder);
-
-
-extern uint64_t lzma_raw_coder_memusage(lzma_filter_find coder_find,
-		const lzma_filter *filters);
-
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_decoder.c r-base-3.3.1/src/extra/xz/common/filter_decoder.c
--- r-base-3.2.3/src/extra/xz/common/filter_decoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_decoder.c
-/// \brief      Filter ID mapping to filter-specific functions
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_decoder.h"
-#include "filter_common.h"
-#include "lzma_decoder.h"
-#include "lzma2_decoder.h"
-#include "simple_decoder.h"
-#include "delta_decoder.h"
-
-
-typedef struct {
-	/// Filter ID
-	lzma_vli id;
-
-	/// Initializes the filter encoder and calls lzma_next_filter_init()
-	/// for filters + 1.
-	lzma_init_function init;
-
-	/// Calculates memory usage of the encoder. If the options are
-	/// invalid, UINT64_MAX is returned.
-	uint64_t (*memusage)(const void *options);
-
-	/// Decodes Filter Properties.
-	///
-	/// \return     - LZMA_OK: Properties decoded successfully.
-	///             - LZMA_OPTIONS_ERROR: Unsupported properties
-	///             - LZMA_MEM_ERROR: Memory allocation failed.
-	lzma_ret (*props_decode)(void **options, lzma_allocator *allocator,
-			const uint8_t *props, size_t props_size);
-
-} lzma_filter_decoder;
-
-
-static const lzma_filter_decoder decoders[] = {
-#ifdef HAVE_DECODER_LZMA1
-	{
-		.id = LZMA_FILTER_LZMA1,
-		.init = &lzma_lzma_decoder_init,
-		.memusage = &lzma_lzma_decoder_memusage,
-		.props_decode = &lzma_lzma_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_LZMA2
-	{
-		.id = LZMA_FILTER_LZMA2,
-		.init = &lzma_lzma2_decoder_init,
-		.memusage = &lzma_lzma2_decoder_memusage,
-		.props_decode = &lzma_lzma2_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_X86
-	{
-		.id = LZMA_FILTER_X86,
-		.init = &lzma_simple_x86_decoder_init,
-		.memusage = NULL,
-		.props_decode = &lzma_simple_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_POWERPC
-	{
-		.id = LZMA_FILTER_POWERPC,
-		.init = &lzma_simple_powerpc_decoder_init,
-		.memusage = NULL,
-		.props_decode = &lzma_simple_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_IA64
-	{
-		.id = LZMA_FILTER_IA64,
-		.init = &lzma_simple_ia64_decoder_init,
-		.memusage = NULL,
-		.props_decode = &lzma_simple_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_ARM
-	{
-		.id = LZMA_FILTER_ARM,
-		.init = &lzma_simple_arm_decoder_init,
-		.memusage = NULL,
-		.props_decode = &lzma_simple_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_ARMTHUMB
-	{
-		.id = LZMA_FILTER_ARMTHUMB,
-		.init = &lzma_simple_armthumb_decoder_init,
-		.memusage = NULL,
-		.props_decode = &lzma_simple_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_SPARC
-	{
-		.id = LZMA_FILTER_SPARC,
-		.init = &lzma_simple_sparc_decoder_init,
-		.memusage = NULL,
-		.props_decode = &lzma_simple_props_decode,
-	},
-#endif
-#ifdef HAVE_DECODER_DELTA
-	{
-		.id = LZMA_FILTER_DELTA,
-		.init = &lzma_delta_decoder_init,
-		.memusage = &lzma_delta_coder_memusage,
-		.props_decode = &lzma_delta_props_decode,
-	},
-#endif
-};
-
-
-static const lzma_filter_decoder *
-decoder_find(lzma_vli id)
-{
-	for (size_t i = 0; i < ARRAY_SIZE(decoders); ++i)
-		if (decoders[i].id == id)
-			return decoders + i;
-
-	return NULL;
-}
-
-
-extern LZMA_API(lzma_bool)
-lzma_filter_decoder_is_supported(lzma_vli id)
-{
-	return decoder_find(id) != NULL;
-}
-
-
-extern lzma_ret
-lzma_raw_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *options)
-{
-	return lzma_raw_coder_init(next, allocator,
-			options, (lzma_filter_find)(&decoder_find), false);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_raw_decoder(lzma_stream *strm, const lzma_filter *options)
-{
-	lzma_next_strm_init(lzma_raw_decoder_init, strm, options);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_raw_decoder_memusage(const lzma_filter *filters)
-{
-	return lzma_raw_coder_memusage(
-			(lzma_filter_find)(&decoder_find), filters);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_properties_decode(lzma_filter *filter, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size)
-{
-	// Make it always NULL so that the caller can always safely free() it.
-	filter->options = NULL;
-
-	const lzma_filter_decoder *const fd = decoder_find(filter->id);
-	if (fd == NULL)
-		return LZMA_OPTIONS_ERROR;
-
-	if (fd->props_decode == NULL)
-		return props_size == 0 ? LZMA_OK : LZMA_OPTIONS_ERROR;
-
-	return fd->props_decode(
-			&filter->options, allocator, props, props_size);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_decoder.h r-base-3.3.1/src/extra/xz/common/filter_decoder.h
--- r-base-3.2.3/src/extra/xz/common/filter_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_decoder.c
-/// \brief      Filter ID mapping to filter-specific functions
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_FILTER_DECODER_H
-#define LZMA_FILTER_DECODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_raw_decoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *options);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_encoder.c r-base-3.3.1/src/extra/xz/common/filter_encoder.c
--- r-base-3.2.3/src/extra/xz/common/filter_encoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,288 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_decoder.c
-/// \brief      Filter ID mapping to filter-specific functions
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_encoder.h"
-#include "filter_common.h"
-#include "lzma_encoder.h"
-#include "lzma2_encoder.h"
-#include "simple_encoder.h"
-#include "delta_encoder.h"
-
-
-typedef struct {
-	/// Filter ID
-	lzma_vli id;
-
-	/// Initializes the filter encoder and calls lzma_next_filter_init()
-	/// for filters + 1.
-	lzma_init_function init;
-
-	/// Calculates memory usage of the encoder. If the options are
-	/// invalid, UINT64_MAX is returned.
-	uint64_t (*memusage)(const void *options);
-
-	/// Calculates the minimum sane size for Blocks (or other types of
-	/// chunks) to which the input data can be split to make
-	/// multithreaded encoding possible. If this is NULL, it is assumed
-	/// that the encoder is fast enough with single thread.
-	lzma_vli (*chunk_size)(const void *options);
-
-	/// Tells the size of the Filter Properties field. If options are
-	/// invalid, UINT32_MAX is returned. If this is NULL, props_size_fixed
-	/// is used.
-	lzma_ret (*props_size_get)(uint32_t *size, const void *options);
-	uint32_t props_size_fixed;
-
-	/// Encodes Filter Properties.
-	///
-	/// \return     - LZMA_OK: Properties encoded successfully.
-	///             - LZMA_OPTIONS_ERROR: Unsupported options
-	///             - LZMA_PROG_ERROR: Invalid options or not enough
-	///               output space
-	lzma_ret (*props_encode)(const void *options, uint8_t *out);
-
-} lzma_filter_encoder;
-
-
-static const lzma_filter_encoder encoders[] = {
-#ifdef HAVE_ENCODER_LZMA1
-	{
-		.id = LZMA_FILTER_LZMA1,
-		.init = &lzma_lzma_encoder_init,
-		.memusage = &lzma_lzma_encoder_memusage,
-		.chunk_size = NULL, // FIXME
-		.props_size_get = NULL,
-		.props_size_fixed = 5,
-		.props_encode = &lzma_lzma_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_LZMA2
-	{
-		.id = LZMA_FILTER_LZMA2,
-		.init = &lzma_lzma2_encoder_init,
-		.memusage = &lzma_lzma2_encoder_memusage,
-		.chunk_size = NULL, // FIXME
-		.props_size_get = NULL,
-		.props_size_fixed = 1,
-		.props_encode = &lzma_lzma2_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_X86
-	{
-		.id = LZMA_FILTER_X86,
-		.init = &lzma_simple_x86_encoder_init,
-		.memusage = NULL,
-		.chunk_size = NULL,
-		.props_size_get = &lzma_simple_props_size,
-		.props_encode = &lzma_simple_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_POWERPC
-	{
-		.id = LZMA_FILTER_POWERPC,
-		.init = &lzma_simple_powerpc_encoder_init,
-		.memusage = NULL,
-		.chunk_size = NULL,
-		.props_size_get = &lzma_simple_props_size,
-		.props_encode = &lzma_simple_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_IA64
-	{
-		.id = LZMA_FILTER_IA64,
-		.init = &lzma_simple_ia64_encoder_init,
-		.memusage = NULL,
-		.chunk_size = NULL,
-		.props_size_get = &lzma_simple_props_size,
-		.props_encode = &lzma_simple_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_ARM
-	{
-		.id = LZMA_FILTER_ARM,
-		.init = &lzma_simple_arm_encoder_init,
-		.memusage = NULL,
-		.chunk_size = NULL,
-		.props_size_get = &lzma_simple_props_size,
-		.props_encode = &lzma_simple_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_ARMTHUMB
-	{
-		.id = LZMA_FILTER_ARMTHUMB,
-		.init = &lzma_simple_armthumb_encoder_init,
-		.memusage = NULL,
-		.chunk_size = NULL,
-		.props_size_get = &lzma_simple_props_size,
-		.props_encode = &lzma_simple_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_SPARC
-	{
-		.id = LZMA_FILTER_SPARC,
-		.init = &lzma_simple_sparc_encoder_init,
-		.memusage = NULL,
-		.chunk_size = NULL,
-		.props_size_get = &lzma_simple_props_size,
-		.props_encode = &lzma_simple_props_encode,
-	},
-#endif
-#ifdef HAVE_ENCODER_DELTA
-	{
-		.id = LZMA_FILTER_DELTA,
-		.init = &lzma_delta_encoder_init,
-		.memusage = &lzma_delta_coder_memusage,
-		.chunk_size = NULL,
-		.props_size_get = NULL,
-		.props_size_fixed = 1,
-		.props_encode = &lzma_delta_props_encode,
-	},
-#endif
-};
-
-
-static const lzma_filter_encoder *
-encoder_find(lzma_vli id)
-{
-	for (size_t i = 0; i < ARRAY_SIZE(encoders); ++i)
-		if (encoders[i].id == id)
-			return encoders + i;
-
-	return NULL;
-}
-
-
-extern LZMA_API(lzma_bool)
-lzma_filter_encoder_is_supported(lzma_vli id)
-{
-	return encoder_find(id) != NULL;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_filters_update(lzma_stream *strm, const lzma_filter *filters)
-{
-	if (strm->internal->next.update == NULL)
-		return LZMA_PROG_ERROR;
-
-	// Validate the filter chain.
-	if (lzma_raw_encoder_memusage(filters) == UINT64_MAX)
-		return LZMA_OPTIONS_ERROR;
-
-	// The actual filter chain in the encoder is reversed. Some things
-	// still want the normal order chain, so we provide both.
-	size_t count = 1;
-	while (filters[count].id != LZMA_VLI_UNKNOWN)
-		++count;
-
-	lzma_filter reversed_filters[LZMA_FILTERS_MAX + 1];
-	for (size_t i = 0; i < count; ++i)
-		reversed_filters[count - i - 1] = filters[i];
-
-	reversed_filters[count].id = LZMA_VLI_UNKNOWN;
-
-	return strm->internal->next.update(strm->internal->next.coder,
-			strm->allocator, filters, reversed_filters);
-}
-
-
-extern lzma_ret
-lzma_raw_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *options)
-{
-	return lzma_raw_coder_init(next, allocator,
-			options, (lzma_filter_find)(&encoder_find), true);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_raw_encoder(lzma_stream *strm, const lzma_filter *options)
-{
-	lzma_next_strm_init(lzma_raw_coder_init, strm, options,
-			(lzma_filter_find)(&encoder_find), true);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_SYNC_FLUSH] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_raw_encoder_memusage(const lzma_filter *filters)
-{
-	return lzma_raw_coder_memusage(
-			(lzma_filter_find)(&encoder_find), filters);
-}
-
-
-/*
-extern LZMA_API(lzma_vli)
-lzma_chunk_size(const lzma_filter *filters)
-{
-	lzma_vli max = 0;
-
-	for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i) {
-		const lzma_filter_encoder *const fe
-				= encoder_find(filters[i].id);
-		if (fe->chunk_size != NULL) {
-			const lzma_vli size
-					= fe->chunk_size(filters[i].options);
-			if (size == LZMA_VLI_UNKNOWN)
-				return LZMA_VLI_UNKNOWN;
-
-			if (size > max)
-				max = size;
-		}
-	}
-
-	return max;
-}
-*/
-
-
-extern LZMA_API(lzma_ret)
-lzma_properties_size(uint32_t *size, const lzma_filter *filter)
-{
-	const lzma_filter_encoder *const fe = encoder_find(filter->id);
-	if (fe == NULL) {
-		// Unknown filter - if the Filter ID is a proper VLI,
-		// return LZMA_OPTIONS_ERROR instead of LZMA_PROG_ERROR,
-		// because it's possible that we just don't have support
-		// compiled in for the requested filter.
-		return filter->id <= LZMA_VLI_MAX
-				? LZMA_OPTIONS_ERROR : LZMA_PROG_ERROR;
-	}
-
-	if (fe->props_size_get == NULL) {
-		// No props_size_get() function, use props_size_fixed.
-		*size = fe->props_size_fixed;
-		return LZMA_OK;
-	}
-
-	return fe->props_size_get(size, filter->options);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_properties_encode(const lzma_filter *filter, uint8_t *props)
-{
-	const lzma_filter_encoder *const fe = encoder_find(filter->id);
-	if (fe == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (fe->props_encode == NULL)
-		return LZMA_OK;
-
-	return fe->props_encode(filter->options, props);
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_encoder.h r-base-3.3.1/src/extra/xz/common/filter_encoder.h
--- r-base-3.2.3/src/extra/xz/common/filter_encoder.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_encoder.c
-/// \brief      Filter ID mapping to filter-specific functions
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_FILTER_ENCODER_H
-#define LZMA_FILTER_ENCODER_H
-
-#include "common.h"
-
-
-// FIXME: Might become a part of the public API once finished.
-// extern lzma_vli lzma_chunk_size(const lzma_filter *filters);
-
-
-extern lzma_ret lzma_raw_encoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *filters);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_flags_decoder.c r-base-3.3.1/src/extra/xz/common/filter_flags_decoder.c
--- r-base-3.2.3/src/extra/xz/common/filter_flags_decoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_flags_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_flags_decoder.c
-/// \brief      Decodes a Filter Flags field
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_decoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_filter_flags_decode(
-		lzma_filter *filter, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-{
-	// Set the pointer to NULL so the caller can always safely free it.
-	filter->options = NULL;
-
-	// Filter ID
-	return_if_error(lzma_vli_decode(&filter->id, NULL,
-			in, in_pos, in_size));
-
-	if (filter->id >= LZMA_FILTER_RESERVED_START)
-		return LZMA_DATA_ERROR;
-
-	// Size of Properties
-	lzma_vli props_size;
-	return_if_error(lzma_vli_decode(&props_size, NULL,
-			in, in_pos, in_size));
-
-	// Filter Properties
-	if (in_size - *in_pos < props_size)
-		return LZMA_DATA_ERROR;
-
-	const lzma_ret ret = lzma_properties_decode(
-			filter, allocator, in + *in_pos, props_size);
-
-	*in_pos += props_size;
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/filter_flags_encoder.c r-base-3.3.1/src/extra/xz/common/filter_flags_encoder.c
--- r-base-3.2.3/src/extra/xz/common/filter_flags_encoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/filter_flags_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       filter_flags_encoder.c
-/// \brief      Decodes a Filter Flags field
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "filter_encoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_filter_flags_size(uint32_t *size, const lzma_filter *filter)
-{
-	if (filter->id >= LZMA_FILTER_RESERVED_START)
-		return LZMA_PROG_ERROR;
-
-	return_if_error(lzma_properties_size(size, filter));
-
-	*size += lzma_vli_size(filter->id) + lzma_vli_size(*size);
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_filter_flags_encode(const lzma_filter *filter,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// Filter ID
-	if (filter->id >= LZMA_FILTER_RESERVED_START)
-		return LZMA_PROG_ERROR;
-
-	return_if_error(lzma_vli_encode(filter->id, NULL,
-			out, out_pos, out_size));
-
-	// Size of Properties
-	uint32_t props_size;
-	return_if_error(lzma_properties_size(&props_size, filter));
-	return_if_error(lzma_vli_encode(props_size, NULL,
-			out, out_pos, out_size));
-
-	// Filter Properties
-	if (out_size - *out_pos < props_size)
-		return LZMA_PROG_ERROR;
-
-	return_if_error(lzma_properties_encode(filter, out + *out_pos));
-
-	*out_pos += props_size;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/index.c r-base-3.3.1/src/extra/xz/common/index.c
--- r-base-3.2.3/src/extra/xz/common/index.c	2012-07-27 22:05:01.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/index.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1244 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       index.c
-/// \brief      Handling of .xz Indexes and some other Stream information
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "index.h"
-#include "stream_flags_common.h"
-
-
-/// \brief      How many Records to allocate at once
-///
-/// This should be big enough to avoid making lots of tiny allocations
-/// but small enough to avoid too much unused memory at once.
-#define INDEX_GROUP_SIZE 512
-
-
-/// \brief      How many Records can be allocated at once at maximum
-#define PREALLOC_MAX ((SIZE_MAX - sizeof(index_group)) / sizeof(index_record))
-
-
-/// \brief      Base structure for index_stream and index_group structures
-typedef struct index_tree_node_s index_tree_node;
-struct index_tree_node_s {
-	/// Uncompressed start offset of this Stream (relative to the
-	/// beginning of the file) or Block (relative to the beginning
-	/// of the Stream)
-	lzma_vli uncompressed_base;
-
-	/// Compressed start offset of this Stream or Block
-	lzma_vli compressed_base;
-
-	index_tree_node *parent;
-	index_tree_node *left;
-	index_tree_node *right;
-};
-
-
-/// \brief      AVL tree to hold index_stream or index_group structures
-typedef struct {
-	/// Root node
-	index_tree_node *root;
-
-	/// Leftmost node. Since the tree will be filled sequentially,
-	/// this won't change after the first node has been added to
-	/// the tree.
-	index_tree_node *leftmost;
-
-	/// The rightmost node in the tree. Since the tree is filled
-	/// sequentially, this is always the node where to add the new data.
-	index_tree_node *rightmost;
-
-	/// Number of nodes in the tree
-	uint32_t count;
-
-} index_tree;
-
-
-typedef struct {
-	lzma_vli uncompressed_sum;
-	lzma_vli unpadded_sum;
-} index_record;
-
-
-typedef struct {
-	/// Every Record group is part of index_stream.groups tree.
-	index_tree_node node;
-
-	/// Number of Blocks in this Stream before this group.
-	lzma_vli number_base;
-
-	/// Number of Records that can be put in records[].
-	size_t allocated;
-
-	/// Index of the last Record in use.
-	size_t last;
-
-	/// The sizes in this array are stored as cumulative sums relative
-	/// to the beginning of the Stream. This makes it possible to
-	/// use binary search in lzma_index_locate().
-	///
-	/// Note that the cumulative summing is done specially for
-	/// unpadded_sum: The previous value is rounded up to the next
-	/// multiple of four before adding the Unpadded Size of the new
-	/// Block. The total encoded size of the Blocks in the Stream
-	/// is records[last].unpadded_sum in the last Record group of
-	/// the Stream.
-	///
-	/// For example, if the Unpadded Sizes are 39, 57, and 81, the
-	/// stored values are 39, 97 (40 + 57), and 181 (100 + 181).
-	/// The total encoded size of these Blocks is 184.
-	///
-	/// This is a flexible array, because it makes easy to optimize
-	/// memory usage in case someone concatenates many Streams that
-	/// have only one or few Blocks.
-	index_record records[];
-
-} index_group;
-
-
-typedef struct {
-	/// Every index_stream is a node in the tree of Sreams.
-	index_tree_node node;
-
-	/// Number of this Stream (first one is 1)
-	uint32_t number;
-
-	/// Total number of Blocks before this Stream
-	lzma_vli block_number_base;
-
-	/// Record groups of this Stream are stored in a tree.
-	/// It's a T-tree with AVL-tree balancing. There are
-	/// INDEX_GROUP_SIZE Records per node by default.
-	/// This keeps the number of memory allocations reasonable
-	/// and finding a Record is fast.
-	index_tree groups;
-
-	/// Number of Records in this Stream
-	lzma_vli record_count;
-
-	/// Size of the List of Records field in this Stream. This is used
-	/// together with record_count to calculate the size of the Index
-	/// field and thus the total size of the Stream.
-	lzma_vli index_list_size;
-
-	/// Stream Flags of this Stream. This is meaningful only if
-	/// the Stream Flags have been told us with lzma_index_stream_flags().
-	/// Initially stream_flags.version is set to UINT32_MAX to indicate
-	/// that the Stream Flags are unknown.
-	lzma_stream_flags stream_flags;
-
-	/// Amount of Stream Padding after this Stream. This defaults to
-	/// zero and can be set with lzma_index_stream_padding().
-	lzma_vli stream_padding;
-
-} index_stream;
-
-
-struct lzma_index_s {
-	/// AVL-tree containing the Stream(s). Often there is just one
-	/// Stream, but using a tree keeps lookups fast even when there
-	/// are many concatenated Streams.
-	index_tree streams;
-
-	/// Uncompressed size of all the Blocks in the Stream(s)
-	lzma_vli uncompressed_size;
-
-	/// Total size of all the Blocks in the Stream(s)
-	lzma_vli total_size;
-
-	/// Total number of Records in all Streams in this lzma_index
-	lzma_vli record_count;
-
-	/// Size of the List of Records field if all the Streams in this
-	/// lzma_index were packed into a single Stream (makes it simpler to
-	/// take many .xz files and combine them into a single Stream).
-	///
-	/// This value together with record_count is needed to calculate
-	/// Backward Size that is stored into Stream Footer.
-	lzma_vli index_list_size;
-
-	/// How many Records to allocate at once in lzma_index_append().
-	/// This defaults to INDEX_GROUP_SIZE but can be overriden with
-	/// lzma_index_prealloc().
-	size_t prealloc;
-
-	/// Bitmask indicating what integrity check types have been used
-	/// as set by lzma_index_stream_flags(). The bit of the last Stream
-	/// is not included here, since it is possible to change it by
-	/// calling lzma_index_stream_flags() again.
-	uint32_t checks;
-};
-
-
-static void
-index_tree_init(index_tree *tree)
-{
-	tree->root = NULL;
-	tree->leftmost = NULL;
-	tree->rightmost = NULL;
-	tree->count = 0;
-	return;
-}
-
-
-/// Helper for index_tree_end()
-static void
-index_tree_node_end(index_tree_node *node, lzma_allocator *allocator,
-		void (*free_func)(void *node, lzma_allocator *allocator))
-{
-	// The tree won't ever be very huge, so recursion should be fine.
-	// 20 levels in the tree is likely quite a lot already in practice.
-	if (node->left != NULL)
-		index_tree_node_end(node->left, allocator, free_func);
-
-	if (node->right != NULL)
-		index_tree_node_end(node->right, allocator, free_func);
-
-	if (free_func != NULL)
-		free_func(node, allocator);
-
-	lzma_free(node, allocator);
-	return;
-}
-
-
-/// Free the meory allocated for a tree. If free_func is not NULL,
-/// it is called on each node before freeing the node. This is used
-/// to free the Record groups from each index_stream before freeing
-/// the index_stream itself.
-static void
-index_tree_end(index_tree *tree, lzma_allocator *allocator,
-		void (*free_func)(void *node, lzma_allocator *allocator))
-{
-	if (tree->root != NULL)
-		index_tree_node_end(tree->root, allocator, free_func);
-
-	return;
-}
-
-
-/// Add a new node to the tree. node->uncompressed_base and
-/// node->compressed_base must have been set by the caller already.
-static void
-index_tree_append(index_tree *tree, index_tree_node *node)
-{
-	node->parent = tree->rightmost;
-	node->left = NULL;
-	node->right = NULL;
-
-	++tree->count;
-
-	// Handle the special case of adding the first node.
-	if (tree->root == NULL) {
-		tree->root = node;
-		tree->leftmost = node;
-		tree->rightmost = node;
-		return;
-	}
-
-	// The tree is always filled sequentially.
-	assert(tree->rightmost->uncompressed_base <= node->uncompressed_base);
-	assert(tree->rightmost->compressed_base < node->compressed_base);
-
-	// Add the new node after the rightmost node. It's the correct
-	// place due to the reason above.
-	tree->rightmost->right = node;
-	tree->rightmost = node;
-
-	// Balance the AVL-tree if needed. We don't need to keep the balance
-	// factors in nodes, because we always fill the tree sequentially,
-	// and thus know the state of the tree just by looking at the node
-	// count. From the node count we can calculate how many steps to go
-	// up in the tree to find the rotation root.
-	uint32_t up = tree->count ^ (UINT32_C(1) << bsr32(tree->count));
-	if (up != 0) {
-		// Locate the root node for the rotation.
-		up = ctz32(tree->count) + 2;
-		do {
-			node = node->parent;
-		} while (--up > 0);
-
-		// Rotate left using node as the rotation root.
-		index_tree_node *pivot = node->right;
-
-		if (node->parent == NULL) {
-			tree->root = pivot;
-		} else {
-			assert(node->parent->right == node);
-			node->parent->right = pivot;
-		}
-
-		pivot->parent = node->parent;
-
-		node->right = pivot->left;
-		if (node->right != NULL)
-			node->right->parent = node;
-
-		pivot->left = node;
-		node->parent = pivot;
-	}
-
-	return;
-}
-
-
-/// Get the next node in the tree. Return NULL if there are no more nodes.
-static void *
-index_tree_next(const index_tree_node *node)
-{
-	if (node->right != NULL) {
-		node = node->right;
-		while (node->left != NULL)
-			node = node->left;
-
-		return (void *)(node);
-	}
-
-	while (node->parent != NULL && node->parent->right == node)
-		node = node->parent;
-
-	return (void *)(node->parent);
-}
-
-
-/// Locate a node that contains the given uncompressed offset. It is
-/// caller's job to check that target is not bigger than the uncompressed
-/// size of the tree (the last node would be returned in that case still).
-static void *
-index_tree_locate(const index_tree *tree, lzma_vli target)
-{
-	const index_tree_node *result = NULL;
-	const index_tree_node *node = tree->root;
-
-	assert(tree->leftmost == NULL
-			|| tree->leftmost->uncompressed_base == 0);
-
-	// Consecutive nodes may have the same uncompressed_base.
-	// We must pick the rightmost one.
-	while (node != NULL) {
-		if (node->uncompressed_base > target) {
-			node = node->left;
-		} else {
-			result = node;
-			node = node->right;
-		}
-	}
-
-	return (void *)(result);
-}
-
-
-/// Allocate and initialize a new Stream using the given base offsets.
-static index_stream *
-index_stream_init(lzma_vli compressed_base, lzma_vli uncompressed_base,
-		lzma_vli stream_number, lzma_vli block_number_base,
-		lzma_allocator *allocator)
-{
-	index_stream *s = lzma_alloc(sizeof(index_stream), allocator);
-	if (s == NULL)
-		return NULL;
-
-	s->node.uncompressed_base = uncompressed_base;
-	s->node.compressed_base = compressed_base;
-	s->node.parent = NULL;
-	s->node.left = NULL;
-	s->node.right = NULL;
-
-	s->number = stream_number;
-	s->block_number_base = block_number_base;
-
-	index_tree_init(&s->groups);
-
-	s->record_count = 0;
-	s->index_list_size = 0;
-	s->stream_flags.version = UINT32_MAX;
-	s->stream_padding = 0;
-
-	return s;
-}
-
-
-/// Free the memory allocated for a Stream and its Record groups.
-static void
-index_stream_end(void *node, lzma_allocator *allocator)
-{
-	index_stream *s = node;
-	index_tree_end(&s->groups, allocator, NULL);
-	return;
-}
-
-
-static lzma_index *
-index_init_plain(lzma_allocator *allocator)
-{
-	lzma_index *i = lzma_alloc(sizeof(lzma_index), allocator);
-	if (i != NULL) {
-		index_tree_init(&i->streams);
-		i->uncompressed_size = 0;
-		i->total_size = 0;
-		i->record_count = 0;
-		i->index_list_size = 0;
-		i->prealloc = INDEX_GROUP_SIZE;
-		i->checks = 0;
-	}
-
-	return i;
-}
-
-
-extern LZMA_API(lzma_index *)
-lzma_index_init(lzma_allocator *allocator)
-{
-	lzma_index *i = index_init_plain(allocator);
-	if (i == NULL)
-		return NULL;
-
-	index_stream *s = index_stream_init(0, 0, 1, 0, allocator);
-	if (s == NULL) {
-		lzma_free(i, allocator);
-		return NULL;
-	}
-
-	index_tree_append(&i->streams, &s->node);
-
-	return i;
-}
-
-
-extern LZMA_API(void)
-lzma_index_end(lzma_index *i, lzma_allocator *allocator)
-{
-	// NOTE: If you modify this function, check also the bottom
-	// of lzma_index_cat().
-	if (i != NULL) {
-		index_tree_end(&i->streams, allocator, &index_stream_end);
-		lzma_free(i, allocator);
-	}
-
-	return;
-}
-
-
-extern void
-lzma_index_prealloc(lzma_index *i, lzma_vli records)
-{
-	if (records > PREALLOC_MAX)
-		records = PREALLOC_MAX;
-
-	i->prealloc = (size_t)(records);
-	return;
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_index_memusage(lzma_vli streams, lzma_vli blocks)
-{
-	// This calculates an upper bound that is only a little bit
-	// bigger than the exact maximum memory usage with the given
-	// parameters.
-
-	// Typical malloc() overhead is 2 * sizeof(void *) but we take
-	// a little bit extra just in case. Using LZMA_MEMUSAGE_BASE
-	// instead would give too inaccurate estimate.
-	const size_t alloc_overhead = 4 * sizeof(void *);
-
-	// Amount of memory needed for each Stream base structures.
-	// We assume that every Stream has at least one Block and
-	// thus at least one group.
-	const size_t stream_base = sizeof(index_stream)
-			+ sizeof(index_group) + 2 * alloc_overhead;
-
-	// Amount of memory needed per group.
-	const size_t group_base = sizeof(index_group)
-			+ INDEX_GROUP_SIZE * sizeof(index_record)
-			+ alloc_overhead;
-
-	// Number of groups. There may actually be more, but that overhead
-	// has been taken into account in stream_base already.
-	const lzma_vli groups
-			= (blocks + INDEX_GROUP_SIZE - 1) / INDEX_GROUP_SIZE;
-
-	// Memory used by index_stream and index_group structures.
-	const uint64_t streams_mem = streams * stream_base;
-	const uint64_t groups_mem = groups * group_base;
-
-	// Memory used by the base structure.
-	const uint64_t index_base = sizeof(lzma_index) + alloc_overhead;
-
-	// Validate the arguments and catch integer overflows.
-	// Maximum number of Streams is "only" UINT32_MAX, because
-	// that limit is used by the tree containing the Streams.
-	const uint64_t limit = UINT64_MAX - index_base;
-	if (streams == 0 || streams > UINT32_MAX || blocks > LZMA_VLI_MAX
-			|| streams > limit / stream_base
-			|| groups > limit / group_base
-			|| limit - streams_mem < groups_mem)
-		return UINT64_MAX;
-
-	return index_base + streams_mem + groups_mem;
-}
-
-
-extern LZMA_API(uint64_t)
-lzma_index_memused(const lzma_index *i)
-{
-	return lzma_index_memusage(i->streams.count, i->record_count);
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_block_count(const lzma_index *i)
-{
-	return i->record_count;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_stream_count(const lzma_index *i)
-{
-	return i->streams.count;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_size(const lzma_index *i)
-{
-	return index_size(i->record_count, i->index_list_size);
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_total_size(const lzma_index *i)
-{
-	return i->total_size;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_stream_size(const lzma_index *i)
-{
-	// Stream Header + Blocks + Index + Stream Footer
-	return LZMA_STREAM_HEADER_SIZE + i->total_size
-			+ index_size(i->record_count, i->index_list_size)
-			+ LZMA_STREAM_HEADER_SIZE;
-}
-
-
-static lzma_vli
-index_file_size(lzma_vli compressed_base, lzma_vli unpadded_sum,
-		lzma_vli record_count, lzma_vli index_list_size,
-		lzma_vli stream_padding)
-{
-	// Earlier Streams and Stream Paddings + Stream Header
-	// + Blocks + Index + Stream Footer + Stream Padding
-	//
-	// This might go over LZMA_VLI_MAX due to too big unpadded_sum
-	// when this function is used in lzma_index_append().
-	lzma_vli file_size = compressed_base + 2 * LZMA_STREAM_HEADER_SIZE
-			+ stream_padding + vli_ceil4(unpadded_sum);
-	if (file_size > LZMA_VLI_MAX)
-		return LZMA_VLI_UNKNOWN;
-
-	// The same applies here.
-	file_size += index_size(record_count, index_list_size);
-	if (file_size > LZMA_VLI_MAX)
-		return LZMA_VLI_UNKNOWN;
-
-	return file_size;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_file_size(const lzma_index *i)
-{
-	const index_stream *s = (const index_stream *)(i->streams.rightmost);
-	const index_group *g = (const index_group *)(s->groups.rightmost);
-	return index_file_size(s->node.compressed_base,
-			g == NULL ? 0 : g->records[g->last].unpadded_sum,
-			s->record_count, s->index_list_size,
-			s->stream_padding);
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_uncompressed_size(const lzma_index *i)
-{
-	return i->uncompressed_size;
-}
-
-
-extern LZMA_API(uint32_t)
-lzma_index_checks(const lzma_index *i)
-{
-	uint32_t checks = i->checks;
-
-	// Get the type of the Check of the last Stream too.
-	const index_stream *s = (const index_stream *)(i->streams.rightmost);
-	if (s->stream_flags.version != UINT32_MAX)
-		checks |= UINT32_C(1) << s->stream_flags.check;
-
-	return checks;
-}
-
-
-extern uint32_t
-lzma_index_padding_size(const lzma_index *i)
-{
-	return (LZMA_VLI_C(4) - index_size_unpadded(
-			i->record_count, i->index_list_size)) & 3;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_stream_flags(lzma_index *i, const lzma_stream_flags *stream_flags)
-{
-	if (i == NULL || stream_flags == NULL)
-		return LZMA_PROG_ERROR;
-
-	// Validate the Stream Flags.
-	return_if_error(lzma_stream_flags_compare(
-			stream_flags, stream_flags));
-
-	index_stream *s = (index_stream *)(i->streams.rightmost);
-	s->stream_flags = *stream_flags;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_stream_padding(lzma_index *i, lzma_vli stream_padding)
-{
-	if (i == NULL || stream_padding > LZMA_VLI_MAX
-			|| (stream_padding & 3) != 0)
-		return LZMA_PROG_ERROR;
-
-	index_stream *s = (index_stream *)(i->streams.rightmost);
-
-	// Check that the new value won't make the file grow too big.
-	const lzma_vli old_stream_padding = s->stream_padding;
-	s->stream_padding = 0;
-	if (lzma_index_file_size(i) + stream_padding > LZMA_VLI_MAX) {
-		s->stream_padding = old_stream_padding;
-		return LZMA_DATA_ERROR;
-	}
-
-	s->stream_padding = stream_padding;
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_append(lzma_index *i, lzma_allocator *allocator,
-		lzma_vli unpadded_size, lzma_vli uncompressed_size)
-{
-	// Validate.
-	if (i == NULL || unpadded_size < UNPADDED_SIZE_MIN
-			|| unpadded_size > UNPADDED_SIZE_MAX
-			|| uncompressed_size > LZMA_VLI_MAX)
-		return LZMA_PROG_ERROR;
-
-	index_stream *s = (index_stream *)(i->streams.rightmost);
-	index_group *g = (index_group *)(s->groups.rightmost);
-
-	const lzma_vli compressed_base = g == NULL ? 0
-			: vli_ceil4(g->records[g->last].unpadded_sum);
-	const lzma_vli uncompressed_base = g == NULL ? 0
-			: g->records[g->last].uncompressed_sum;
-	const uint32_t index_list_size_add = lzma_vli_size(unpadded_size)
-			+ lzma_vli_size(uncompressed_size);
-
-	// Check that the file size will stay within limits.
-	if (index_file_size(s->node.compressed_base,
-			compressed_base + unpadded_size, s->record_count + 1,
-			s->index_list_size + index_list_size_add,
-			s->stream_padding) == LZMA_VLI_UNKNOWN)
-		return LZMA_DATA_ERROR;
-
-	// The size of the Index field must not exceed the maximum value
-	// that can be stored in the Backward Size field.
-	if (index_size(i->record_count + 1,
-			i->index_list_size + index_list_size_add)
-			> LZMA_BACKWARD_SIZE_MAX)
-		return LZMA_DATA_ERROR;
-
-	if (g != NULL && g->last + 1 < g->allocated) {
-		// There is space in the last group at least for one Record.
-		++g->last;
-	} else {
-		// We need to allocate a new group.
-		g = lzma_alloc(sizeof(index_group)
-				+ i->prealloc * sizeof(index_record),
-				allocator);
-		if (g == NULL)
-			return LZMA_MEM_ERROR;
-
-		g->last = 0;
-		g->allocated = i->prealloc;
-
-		// Reset prealloc so that if the application happens to
-		// add new Records, the allocation size will be sane.
-		i->prealloc = INDEX_GROUP_SIZE;
-
-		// Set the start offsets of this group.
-		g->node.uncompressed_base = uncompressed_base;
-		g->node.compressed_base = compressed_base;
-		g->number_base = s->record_count + 1;
-
-		// Add the new group to the Stream.
-		index_tree_append(&s->groups, &g->node);
-	}
-
-	// Add the new Record to the group.
-	g->records[g->last].uncompressed_sum
-			= uncompressed_base + uncompressed_size;
-	g->records[g->last].unpadded_sum
-			= compressed_base + unpadded_size;
-
-	// Update the totals.
-	++s->record_count;
-	s->index_list_size += index_list_size_add;
-
-	i->total_size += vli_ceil4(unpadded_size);
-	i->uncompressed_size += uncompressed_size;
-	++i->record_count;
-	i->index_list_size += index_list_size_add;
-
-	return LZMA_OK;
-}
-
-
-/// Structure to pass info to index_cat_helper()
-typedef struct {
-	/// Uncompressed size of the destination
-	lzma_vli uncompressed_size;
-
-	/// Compressed file size of the destination
-	lzma_vli file_size;
-
-	/// Same as above but for Block numbers
-	lzma_vli block_number_add;
-
-	/// Number of Streams that were in the destination index before we
-	/// started appending new Streams from the source index. This is
-	/// used to fix the Stream numbering.
-	uint32_t stream_number_add;
-
-	/// Destination index' Stream tree
-	index_tree *streams;
-
-} index_cat_info;
-
-
-/// Add the Stream nodes from the source index to dest using recursion.
-/// Simplest iterative traversal of the source tree wouldn't work, because
-/// we update the pointers in nodes when moving them to the destination tree.
-static void
-index_cat_helper(const index_cat_info *info, index_stream *this)
-{
-	index_stream *left = (index_stream *)(this->node.left);
-	index_stream *right = (index_stream *)(this->node.right);
-
-	if (left != NULL)
-		index_cat_helper(info, left);
-
-	this->node.uncompressed_base += info->uncompressed_size;
-	this->node.compressed_base += info->file_size;
-	this->number += info->stream_number_add;
-	this->block_number_base += info->block_number_add;
-	index_tree_append(info->streams, &this->node);
-
-	if (right != NULL)
-		index_cat_helper(info, right);
-
-	return;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_cat(lzma_index *restrict dest, lzma_index *restrict src,
-		lzma_allocator *allocator)
-{
-	const lzma_vli dest_file_size = lzma_index_file_size(dest);
-
-	// Check that we don't exceed the file size limits.
-	if (dest_file_size + lzma_index_file_size(src) > LZMA_VLI_MAX
-			|| dest->uncompressed_size + src->uncompressed_size
-				> LZMA_VLI_MAX)
-		return LZMA_DATA_ERROR;
-
-	// Check that the encoded size of the combined lzma_indexes stays
-	// within limits. In theory, this should be done only if we know
-	// that the user plans to actually combine the Streams and thus
-	// construct a single Index (probably rare). However, exceeding
-	// this limit is quite theoretical, so we do this check always
-	// to simplify things elsewhere.
-	{
-		const lzma_vli dest_size = index_size_unpadded(
-				dest->record_count, dest->index_list_size);
-		const lzma_vli src_size = index_size_unpadded(
-				src->record_count, src->index_list_size);
-		if (vli_ceil4(dest_size + src_size) > LZMA_BACKWARD_SIZE_MAX)
-			return LZMA_DATA_ERROR;
-	}
-
-	// Optimize the last group to minimize memory usage. Allocation has
-	// to be done before modifying dest or src.
-	{
-		index_stream *s = (index_stream *)(dest->streams.rightmost);
-		index_group *g = (index_group *)(s->groups.rightmost);
-		if (g != NULL && g->last + 1 < g->allocated) {
-			assert(g->node.left == NULL);
-			assert(g->node.right == NULL);
-
-			index_group *newg = lzma_alloc(sizeof(index_group)
-					+ (g->last + 1)
-					* sizeof(index_record),
-					allocator);
-			if (newg == NULL)
-				return LZMA_MEM_ERROR;
-
-			newg->node = g->node;
-			newg->allocated = g->last + 1;
-			newg->last = g->last;
-			newg->number_base = g->number_base;
-
-			memcpy(newg->records, g->records, newg->allocated
-					* sizeof(index_record));
-
-			if (g->node.parent != NULL) {
-				assert(g->node.parent->right == &g->node);
-				g->node.parent->right = &newg->node;
-			}
-
-			if (s->groups.leftmost == &g->node) {
-				assert(s->groups.root == &g->node);
-				s->groups.leftmost = &newg->node;
-				s->groups.root = &newg->node;
-			}
-
-			if (s->groups.rightmost == &g->node)
-				s->groups.rightmost = &newg->node;
-
-			lzma_free(g, allocator);
-		}
-	}
-
-	// Add all the Streams from src to dest. Update the base offsets
-	// of each Stream from src.
-	const index_cat_info info = {
-		.uncompressed_size = dest->uncompressed_size,
-		.file_size = dest_file_size,
-		.stream_number_add = dest->streams.count,
-		.block_number_add = dest->record_count,
-		.streams = &dest->streams,
-	};
-	index_cat_helper(&info, (index_stream *)(src->streams.root));
-
-	// Update info about all the combined Streams.
-	dest->uncompressed_size += src->uncompressed_size;
-	dest->total_size += src->total_size;
-	dest->record_count += src->record_count;
-	dest->index_list_size += src->index_list_size;
-	dest->checks = lzma_index_checks(dest) | src->checks;
-
-	// There's nothing else left in src than the base structure.
-	lzma_free(src, allocator);
-
-	return LZMA_OK;
-}
-
-
-/// Duplicate an index_stream.
-static index_stream *
-index_dup_stream(const index_stream *src, lzma_allocator *allocator)
-{
-	// Catch a somewhat theoretical integer overflow.
-	if (src->record_count > PREALLOC_MAX)
-		return NULL;
-
-	// Allocate and initialize a new Stream.
-	index_stream *dest = index_stream_init(src->node.compressed_base,
-			src->node.uncompressed_base, src->number,
-			src->block_number_base, allocator);
-
-	// Return immediately if allocation failed or if there are
-	// no groups to duplicate.
-	if (dest == NULL || src->groups.leftmost == NULL)
-		return dest;
-
-	// Copy the overall information.
-	dest->record_count = src->record_count;
-	dest->index_list_size = src->index_list_size;
-	dest->stream_flags = src->stream_flags;
-	dest->stream_padding = src->stream_padding;
-
-	// Allocate memory for the Records. We put all the Records into
-	// a single group. It's simplest and also tends to make
-	// lzma_index_locate() a little bit faster with very big Indexes.
-	index_group *destg = lzma_alloc(sizeof(index_group)
-			+ src->record_count * sizeof(index_record),
-			allocator);
-	if (destg == NULL) {
-		index_stream_end(dest, allocator);
-		return NULL;
-	}
-
-	// Initialize destg.
-	destg->node.uncompressed_base = 0;
-	destg->node.compressed_base = 0;
-	destg->number_base = 1;
-	destg->allocated = src->record_count;
-	destg->last = src->record_count - 1;
-
-	// Go through all the groups in src and copy the Records into destg.
-	const index_group *srcg = (const index_group *)(src->groups.leftmost);
-	size_t i = 0;
-	do {
-		memcpy(destg->records + i, srcg->records,
-				(srcg->last + 1) * sizeof(index_record));
-		i += srcg->last + 1;
-		srcg = index_tree_next(&srcg->node);
-	} while (srcg != NULL);
-
-	assert(i == destg->allocated);
-
-	// Add the group to the new Stream.
-	index_tree_append(&dest->groups, &destg->node);
-
-	return dest;
-}
-
-
-extern LZMA_API(lzma_index *)
-lzma_index_dup(const lzma_index *src, lzma_allocator *allocator)
-{
-	// Allocate the base structure (no initial Stream).
-	lzma_index *dest = index_init_plain(allocator);
-	if (dest == NULL)
-		return NULL;
-
-	// Copy the totals.
-	dest->uncompressed_size = src->uncompressed_size;
-	dest->total_size = src->total_size;
-	dest->record_count = src->record_count;
-	dest->index_list_size = src->index_list_size;
-
-	// Copy the Streams and the groups in them.
-	const index_stream *srcstream
-			= (const index_stream *)(src->streams.leftmost);
-	do {
-		index_stream *deststream = index_dup_stream(
-				srcstream, allocator);
-		if (deststream == NULL) {
-			lzma_index_end(dest, allocator);
-			return NULL;
-		}
-
-		index_tree_append(&dest->streams, &deststream->node);
-
-		srcstream = index_tree_next(&srcstream->node);
-	} while (srcstream != NULL);
-
-	return dest;
-}
-
-
-/// Indexing for lzma_index_iter.internal[]
-enum {
-	ITER_INDEX,
-	ITER_STREAM,
-	ITER_GROUP,
-	ITER_RECORD,
-	ITER_METHOD,
-};
-
-
-/// Values for lzma_index_iter.internal[ITER_METHOD].s
-enum {
-	ITER_METHOD_NORMAL,
-	ITER_METHOD_NEXT,
-	ITER_METHOD_LEFTMOST,
-};
-
-
-static void
-iter_set_info(lzma_index_iter *iter)
-{
-	const lzma_index *i = iter->internal[ITER_INDEX].p;
-	const index_stream *stream = iter->internal[ITER_STREAM].p;
-	const index_group *group = iter->internal[ITER_GROUP].p;
-	const size_t record = iter->internal[ITER_RECORD].s;
-
-	// lzma_index_iter.internal must not contain a pointer to the last
-	// group in the index, because that may be reallocated by
-	// lzma_index_cat().
-	if (group == NULL) {
-		// There are no groups.
-		assert(stream->groups.root == NULL);
-		iter->internal[ITER_METHOD].s = ITER_METHOD_LEFTMOST;
-
-	} else if (i->streams.rightmost != &stream->node
-			|| stream->groups.rightmost != &group->node) {
-		// The group is not not the last group in the index.
-		iter->internal[ITER_METHOD].s = ITER_METHOD_NORMAL;
-
-	} else if (stream->groups.leftmost != &group->node) {
-		// The group isn't the only group in the Stream, thus we
-		// know that it must have a parent group i.e. it's not
-		// the root node.
-		assert(stream->groups.root != &group->node);
-		assert(group->node.parent->right == &group->node);
-		iter->internal[ITER_METHOD].s = ITER_METHOD_NEXT;
-		iter->internal[ITER_GROUP].p = group->node.parent;
-
-	} else {
-		// The Stream has only one group.
-		assert(stream->groups.root == &group->node);
-		assert(group->node.parent == NULL);
-		iter->internal[ITER_METHOD].s = ITER_METHOD_LEFTMOST;
-		iter->internal[ITER_GROUP].p = NULL;
-	}
-
-	iter->stream.number = stream->number;
-	iter->stream.block_count = stream->record_count;
-	iter->stream.compressed_offset = stream->node.compressed_base;
-	iter->stream.uncompressed_offset = stream->node.uncompressed_base;
-
-	// iter->stream.flags will be NULL if the Stream Flags haven't been
-	// set with lzma_index_stream_flags().
-	iter->stream.flags = stream->stream_flags.version == UINT32_MAX
-			? NULL : &stream->stream_flags;
-	iter->stream.padding = stream->stream_padding;
-
-	if (stream->groups.rightmost == NULL) {
-		// Stream has no Blocks.
-		iter->stream.compressed_size = index_size(0, 0)
-				+ 2 * LZMA_STREAM_HEADER_SIZE;
-		iter->stream.uncompressed_size = 0;
-	} else {
-		const index_group *g = (const index_group *)(
-				stream->groups.rightmost);
-
-		// Stream Header + Stream Footer + Index + Blocks
-		iter->stream.compressed_size = 2 * LZMA_STREAM_HEADER_SIZE
-				+ index_size(stream->record_count,
-					stream->index_list_size)
-				+ vli_ceil4(g->records[g->last].unpadded_sum);
-		iter->stream.uncompressed_size
-				= g->records[g->last].uncompressed_sum;
-	}
-
-	if (group != NULL) {
-		iter->block.number_in_stream = group->number_base + record;
-		iter->block.number_in_file = iter->block.number_in_stream
-				+ stream->block_number_base;
-
-		iter->block.compressed_stream_offset
-				= record == 0 ? group->node.compressed_base
-				: vli_ceil4(group->records[
-					record - 1].unpadded_sum);
-		iter->block.uncompressed_stream_offset
-				= record == 0 ? group->node.uncompressed_base
-				: group->records[record - 1].uncompressed_sum;
-
-		iter->block.uncompressed_size
-				= group->records[record].uncompressed_sum
-				- iter->block.uncompressed_stream_offset;
-		iter->block.unpadded_size
-				= group->records[record].unpadded_sum
-				- iter->block.compressed_stream_offset;
-		iter->block.total_size = vli_ceil4(iter->block.unpadded_size);
-
-		iter->block.compressed_stream_offset
-				+= LZMA_STREAM_HEADER_SIZE;
-
-		iter->block.compressed_file_offset
-				= iter->block.compressed_stream_offset
-				+ iter->stream.compressed_offset;
-		iter->block.uncompressed_file_offset
-				= iter->block.uncompressed_stream_offset
-				+ iter->stream.uncompressed_offset;
-	}
-
-	return;
-}
-
-
-extern LZMA_API(void)
-lzma_index_iter_init(lzma_index_iter *iter, const lzma_index *i)
-{
-	iter->internal[ITER_INDEX].p = i;
-	lzma_index_iter_rewind(iter);
-	return;
-}
-
-
-extern LZMA_API(void)
-lzma_index_iter_rewind(lzma_index_iter *iter)
-{
-	iter->internal[ITER_STREAM].p = NULL;
-	iter->internal[ITER_GROUP].p = NULL;
-	iter->internal[ITER_RECORD].s = 0;
-	iter->internal[ITER_METHOD].s = ITER_METHOD_NORMAL;
-	return;
-}
-
-
-extern LZMA_API(lzma_bool)
-lzma_index_iter_next(lzma_index_iter *iter, lzma_index_iter_mode mode)
-{
-	// Catch unsupported mode values.
-	if ((unsigned int)(mode) > LZMA_INDEX_ITER_NONEMPTY_BLOCK)
-		return true;
-
-	const lzma_index *i = iter->internal[ITER_INDEX].p;
-	const index_stream *stream = iter->internal[ITER_STREAM].p;
-	const index_group *group = NULL;
-	size_t record = iter->internal[ITER_RECORD].s;
-
-	// If we are being asked for the next Stream, leave group to NULL
-	// so that the rest of the this function thinks that this Stream
-	// has no groups and will thus go to the next Stream.
-	if (mode != LZMA_INDEX_ITER_STREAM) {
-		// Get the pointer to the current group. See iter_set_inf()
-		// for explanation.
-		switch (iter->internal[ITER_METHOD].s) {
-		case ITER_METHOD_NORMAL:
-			group = iter->internal[ITER_GROUP].p;
-			break;
-
-		case ITER_METHOD_NEXT:
-			group = index_tree_next(iter->internal[ITER_GROUP].p);
-			break;
-
-		case ITER_METHOD_LEFTMOST:
-			group = (const index_group *)(
-					stream->groups.leftmost);
-			break;
-		}
-	}
-
-again:
-	if (stream == NULL) {
-		// We at the beginning of the lzma_index.
-		// Locate the first Stream.
-		stream = (const index_stream *)(i->streams.leftmost);
-		if (mode >= LZMA_INDEX_ITER_BLOCK) {
-			// Since we are being asked to return information
-			// about the first a Block, skip Streams that have
-			// no Blocks.
-			while (stream->groups.leftmost == NULL) {
-				stream = index_tree_next(&stream->node);
-				if (stream == NULL)
-					return true;
-			}
-		}
-
-		// Start from the first Record in the Stream.
-		group = (const index_group *)(stream->groups.leftmost);
-		record = 0;
-
-	} else if (group != NULL && record < group->last) {
-		// The next Record is in the same group.
-		++record;
-
-	} else {
-		// This group has no more Records or this Stream has
-		// no Blocks at all.
-		record = 0;
-
-		// If group is not NULL, this Stream has at least one Block
-		// and thus at least one group. Find the next group.
-		if (group != NULL)
-			group = index_tree_next(&group->node);
-
-		if (group == NULL) {
-			// This Stream has no more Records. Find the next
-			// Stream. If we are being asked to return information
-			// about a Block, we skip empty Streams.
-			do {
-				stream = index_tree_next(&stream->node);
-				if (stream == NULL)
-					return true;
-			} while (mode >= LZMA_INDEX_ITER_BLOCK
-					&& stream->groups.leftmost == NULL);
-
-			group = (const index_group *)(
-					stream->groups.leftmost);
-		}
-	}
-
-	if (mode == LZMA_INDEX_ITER_NONEMPTY_BLOCK) {
-		// We need to look for the next Block again if this Block
-		// is empty.
-		if (record == 0) {
-			if (group->node.uncompressed_base
-					== group->records[0].uncompressed_sum)
-				goto again;
-		} else if (group->records[record - 1].uncompressed_sum
-				== group->records[record].uncompressed_sum) {
-			goto again;
-		}
-	}
-
-	iter->internal[ITER_STREAM].p = stream;
-	iter->internal[ITER_GROUP].p = group;
-	iter->internal[ITER_RECORD].s = record;
-
-	iter_set_info(iter);
-
-	return false;
-}
-
-
-extern LZMA_API(lzma_bool)
-lzma_index_iter_locate(lzma_index_iter *iter, lzma_vli target)
-{
-	const lzma_index *i = iter->internal[ITER_INDEX].p;
-
-	// If the target is past the end of the file, return immediately.
-	if (i->uncompressed_size <= target)
-		return true;
-
-	// Locate the Stream containing the target offset.
-	const index_stream *stream = index_tree_locate(&i->streams, target);
-	assert(stream != NULL);
-	target -= stream->node.uncompressed_base;
-
-	// Locate the group containing the target offset.
-	const index_group *group = index_tree_locate(&stream->groups, target);
-	assert(group != NULL);
-
-	// Use binary search to locate the exact Record. It is the first
-	// Record whose uncompressed_sum is greater than target.
-	// This is because we want the rightmost Record that fullfills the
-	// search criterion. It is possible that there are empty Blocks;
-	// we don't want to return them.
-	size_t left = 0;
-	size_t right = group->last;
-
-	while (left < right) {
-		const size_t pos = left + (right - left) / 2;
-		if (group->records[pos].uncompressed_sum <= target)
-			left = pos + 1;
-		else
-			right = pos;
-	}
-
-	iter->internal[ITER_STREAM].p = stream;
-	iter->internal[ITER_GROUP].p = group;
-	iter->internal[ITER_RECORD].s = left;
-
-	iter_set_info(iter);
-
-	return false;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/index_decoder.c r-base-3.3.1/src/extra/xz/common/index_decoder.c
--- r-base-3.2.3/src/extra/xz/common/index_decoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/index_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       index_decoder.c
-/// \brief      Decodes the Index field
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "index.h"
-#include "check.h"
-
-
-struct lzma_coder_s {
-	enum {
-		SEQ_INDICATOR,
-		SEQ_COUNT,
-		SEQ_MEMUSAGE,
-		SEQ_UNPADDED,
-		SEQ_UNCOMPRESSED,
-		SEQ_PADDING_INIT,
-		SEQ_PADDING,
-		SEQ_CRC32,
-	} sequence;
-
-	/// Memory usage limit
-	uint64_t memlimit;
-
-	/// Target Index
-	lzma_index *index;
-
-	/// Pointer give by the application, which is set after
-	/// successful decoding.
-	lzma_index **index_ptr;
-
-	/// Number of Records left to decode.
-	lzma_vli count;
-
-	/// The most recent Unpadded Size field
-	lzma_vli unpadded_size;
-
-	/// The most recent Uncompressed Size field
-	lzma_vli uncompressed_size;
-
-	/// Position in integers
-	size_t pos;
-
-	/// CRC32 of the List of Records field
-	uint32_t crc32;
-};
-
-
-static lzma_ret
-index_decode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size,
-		uint8_t *restrict out lzma_attribute((__unused__)),
-		size_t *restrict out_pos lzma_attribute((__unused__)),
-		size_t out_size lzma_attribute((__unused__)),
-		lzma_action action lzma_attribute((__unused__)))
-{
-	// Similar optimization as in index_encoder.c
-	const size_t in_start = *in_pos;
-	lzma_ret ret = LZMA_OK;
-
-	while (*in_pos < in_size)
-	switch (coder->sequence) {
-	case SEQ_INDICATOR:
-		// Return LZMA_DATA_ERROR instead of e.g. LZMA_PROG_ERROR or
-		// LZMA_FORMAT_ERROR, because a typical usage case for Index
-		// decoder is when parsing the Stream backwards. If seeking
-		// backward from the Stream Footer gives us something that
-		// doesn't begin with Index Indicator, the file is considered
-		// corrupt, not "programming error" or "unrecognized file
-		// format". One could argue that the application should
-		// verify the Index Indicator before trying to decode the
-		// Index, but well, I suppose it is simpler this way.
-		if (in[(*in_pos)++] != 0x00)
-			return LZMA_DATA_ERROR;
-
-		coder->sequence = SEQ_COUNT;
-		break;
-
-	case SEQ_COUNT:
-		ret = lzma_vli_decode(&coder->count, &coder->pos,
-				in, in_pos, in_size);
-		if (ret != LZMA_STREAM_END)
-			goto out;
-
-		coder->pos = 0;
-		coder->sequence = SEQ_MEMUSAGE;
-
-	// Fall through
-
-	case SEQ_MEMUSAGE:
-		if (lzma_index_memusage(1, coder->count) > coder->memlimit) {
-			ret = LZMA_MEMLIMIT_ERROR;
-			goto out;
-		}
-
-		// Tell the Index handling code how many Records this
-		// Index has to allow it to allocate memory more efficiently.
-		lzma_index_prealloc(coder->index, coder->count);
-
-		ret = LZMA_OK;
-		coder->sequence = coder->count == 0
-				? SEQ_PADDING_INIT : SEQ_UNPADDED;
-		break;
-
-	case SEQ_UNPADDED:
-	case SEQ_UNCOMPRESSED: {
-		lzma_vli *size = coder->sequence == SEQ_UNPADDED
-				? &coder->unpadded_size
-				: &coder->uncompressed_size;
-
-		ret = lzma_vli_decode(size, &coder->pos,
-				in, in_pos, in_size);
-		if (ret != LZMA_STREAM_END)
-			goto out;
-
-		ret = LZMA_OK;
-		coder->pos = 0;
-
-		if (coder->sequence == SEQ_UNPADDED) {
-			// Validate that encoded Unpadded Size isn't too small
-			// or too big.
-			if (coder->unpadded_size < UNPADDED_SIZE_MIN
-					|| coder->unpadded_size
-						> UNPADDED_SIZE_MAX)
-				return LZMA_DATA_ERROR;
-
-			coder->sequence = SEQ_UNCOMPRESSED;
-		} else {
-			// Add the decoded Record to the Index.
-			return_if_error(lzma_index_append(
-					coder->index, allocator,
-					coder->unpadded_size,
-					coder->uncompressed_size));
-
-			// Check if this was the last Record.
-			coder->sequence = --coder->count == 0
-					? SEQ_PADDING_INIT
-					: SEQ_UNPADDED;
-		}
-
-		break;
-	}
-
-	case SEQ_PADDING_INIT:
-		coder->pos = lzma_index_padding_size(coder->index);
-		coder->sequence = SEQ_PADDING;
-
-	// Fall through
-
-	case SEQ_PADDING:
-		if (coder->pos > 0) {
-			--coder->pos;
-			if (in[(*in_pos)++] != 0x00)
-				return LZMA_DATA_ERROR;
-
-			break;
-		}
-
-		// Finish the CRC32 calculation.
-		coder->crc32 = lzma_crc32(in + in_start,
-				*in_pos - in_start, coder->crc32);
-
-		coder->sequence = SEQ_CRC32;
-
-	// Fall through
-
-	case SEQ_CRC32:
-		do {
-			if (*in_pos == in_size)
-				return LZMA_OK;
-
-			if (((coder->crc32 >> (coder->pos * 8)) & 0xFF)
-					!= in[(*in_pos)++])
-				return LZMA_DATA_ERROR;
-
-		} while (++coder->pos < 4);
-
-		// Decoding was successful, now we can let the application
-		// see the decoded Index.
-		*coder->index_ptr = coder->index;
-
-		// Make index NULL so we don't free it unintentionally.
-		coder->index = NULL;
-
-		return LZMA_STREAM_END;
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-out:
-	// Update the CRC32,
-	coder->crc32 = lzma_crc32(in + in_start,
-			*in_pos - in_start, coder->crc32);
-
-	return ret;
-}
-
-
-static void
-index_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_index_end(coder->index, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-index_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
-		uint64_t *old_memlimit, uint64_t new_memlimit)
-{
-	*memusage = lzma_index_memusage(1, coder->count);
-	*old_memlimit = coder->memlimit;
-
-	if (new_memlimit != 0) {
-		if (new_memlimit < *memusage)
-			return LZMA_MEMLIMIT_ERROR;
-
-		coder->memlimit = new_memlimit;
-	}
-
-	return LZMA_OK;
-}
-
-
-static lzma_ret
-index_decoder_reset(lzma_coder *coder, lzma_allocator *allocator,
-		lzma_index **i, uint64_t memlimit)
-{
-	// Remember the pointer given by the application. We will set it
-	// to point to the decoded Index only if decoding is successful.
-	// Before that, keep it NULL so that applications can always safely
-	// pass it to lzma_index_end() no matter did decoding succeed or not.
-	coder->index_ptr = i;
-	*i = NULL;
-
-	// We always allocate a new lzma_index.
-	coder->index = lzma_index_init(allocator);
-	if (coder->index == NULL)
-		return LZMA_MEM_ERROR;
-
-	// Initialize the rest.
-	coder->sequence = SEQ_INDICATOR;
-	coder->memlimit = memlimit;
-	coder->count = 0; // Needs to be initialized due to _memconfig().
-	coder->pos = 0;
-	coder->crc32 = 0;
-
-	return LZMA_OK;
-}
-
-
-static lzma_ret
-index_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		lzma_index **i, uint64_t memlimit)
-{
-	lzma_next_coder_init(&index_decoder_init, next, allocator);
-
-	if (i == NULL || memlimit == 0)
-		return LZMA_PROG_ERROR;
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &index_decode;
-		next->end = &index_decoder_end;
-		next->memconfig = &index_decoder_memconfig;
-		next->coder->index = NULL;
-	} else {
-		lzma_index_end(next->coder->index, allocator);
-	}
-
-	return index_decoder_reset(next->coder, allocator, i, memlimit);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_decoder(lzma_stream *strm, lzma_index **i, uint64_t memlimit)
-{
-	lzma_next_strm_init(index_decoder_init, strm, i, memlimit);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_buffer_decode(
-		lzma_index **i, uint64_t *memlimit, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-{
-	// Sanity checks
-	if (i == NULL || memlimit == NULL
-			|| in == NULL || in_pos == NULL || *in_pos > in_size)
-		return LZMA_PROG_ERROR;
-
-	// Initialize the decoder.
-	lzma_coder coder;
-	return_if_error(index_decoder_reset(&coder, allocator, i, *memlimit));
-
-	// Store the input start position so that we can restore it in case
-	// of an error.
-	const size_t in_start = *in_pos;
-
-	// Do the actual decoding.
-	lzma_ret ret = index_decode(&coder, allocator, in, in_pos, in_size,
-			NULL, NULL, 0, LZMA_RUN);
-
-	if (ret == LZMA_STREAM_END) {
-		ret = LZMA_OK;
-	} else {
-		// Something went wrong, free the Index structure and restore
-		// the input position.
-		lzma_index_end(coder.index, allocator);
-		*in_pos = in_start;
-
-		if (ret == LZMA_OK) {
-			// The input is truncated or otherwise corrupt.
-			// Use LZMA_DATA_ERROR instead of LZMA_BUF_ERROR
-			// like lzma_vli_decode() does in single-call mode.
-			ret = LZMA_DATA_ERROR;
-
-		} else if (ret == LZMA_MEMLIMIT_ERROR) {
-			// Tell the caller how much memory would have
-			// been needed.
-			*memlimit = lzma_index_memusage(1, coder.count);
-		}
-	}
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/index_encoder.c r-base-3.3.1/src/extra/xz/common/index_encoder.c
--- r-base-3.2.3/src/extra/xz/common/index_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/index_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       index_encoder.c
-/// \brief      Encodes the Index field
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "index_encoder.h"
-#include "index.h"
-#include "check.h"
-
-
-struct lzma_coder_s {
-	enum {
-		SEQ_INDICATOR,
-		SEQ_COUNT,
-		SEQ_UNPADDED,
-		SEQ_UNCOMPRESSED,
-		SEQ_NEXT,
-		SEQ_PADDING,
-		SEQ_CRC32,
-	} sequence;
-
-	/// Index being encoded
-	const lzma_index *index;
-
-	/// Iterator for the Index being encoded
-	lzma_index_iter iter;
-
-	/// Position in integers
-	size_t pos;
-
-	/// CRC32 of the List of Records field
-	uint32_t crc32;
-};
-
-
-static lzma_ret
-index_encode(lzma_coder *coder,
-		lzma_allocator *allocator lzma_attribute((__unused__)),
-		const uint8_t *restrict in lzma_attribute((__unused__)),
-		size_t *restrict in_pos lzma_attribute((__unused__)),
-		size_t in_size lzma_attribute((__unused__)),
-		uint8_t *restrict out, size_t *restrict out_pos,
-		size_t out_size,
-		lzma_action action lzma_attribute((__unused__)))
-{
-	// Position where to start calculating CRC32. The idea is that we
-	// need to call lzma_crc32() only once per call to index_encode().
-	const size_t out_start = *out_pos;
-
-	// Return value to use if we return at the end of this function.
-	// We use "goto out" to jump out of the while-switch construct
-	// instead of returning directly, because that way we don't need
-	// to copypaste the lzma_crc32() call to many places.
-	lzma_ret ret = LZMA_OK;
-
-	while (*out_pos < out_size)
-	switch (coder->sequence) {
-	case SEQ_INDICATOR:
-		out[*out_pos] = 0x00;
-		++*out_pos;
-		coder->sequence = SEQ_COUNT;
-		break;
-
-	case SEQ_COUNT: {
-		const lzma_vli count = lzma_index_block_count(coder->index);
-		ret = lzma_vli_encode(count, &coder->pos,
-				out, out_pos, out_size);
-		if (ret != LZMA_STREAM_END)
-			goto out;
-
-		ret = LZMA_OK;
-		coder->pos = 0;
-		coder->sequence = SEQ_NEXT;
-		break;
-	}
-
-	case SEQ_NEXT:
-		if (lzma_index_iter_next(
-				&coder->iter, LZMA_INDEX_ITER_BLOCK)) {
-			// Get the size of the Index Padding field.
-			coder->pos = lzma_index_padding_size(coder->index);
-			assert(coder->pos <= 3);
-			coder->sequence = SEQ_PADDING;
-			break;
-		}
-
-		coder->sequence = SEQ_UNPADDED;
-
-	// Fall through
-
-	case SEQ_UNPADDED:
-	case SEQ_UNCOMPRESSED: {
-		const lzma_vli size = coder->sequence == SEQ_UNPADDED
-				? coder->iter.block.unpadded_size
-				: coder->iter.block.uncompressed_size;
-
-		ret = lzma_vli_encode(size, &coder->pos,
-				out, out_pos, out_size);
-		if (ret != LZMA_STREAM_END)
-			goto out;
-
-		ret = LZMA_OK;
-		coder->pos = 0;
-
-		// Advance to SEQ_UNCOMPRESSED or SEQ_NEXT.
-		++coder->sequence;
-		break;
-	}
-
-	case SEQ_PADDING:
-		if (coder->pos > 0) {
-			--coder->pos;
-			out[(*out_pos)++] = 0x00;
-			break;
-		}
-
-		// Finish the CRC32 calculation.
-		coder->crc32 = lzma_crc32(out + out_start,
-				*out_pos - out_start, coder->crc32);
-
-		coder->sequence = SEQ_CRC32;
-
-	// Fall through
-
-	case SEQ_CRC32:
-		// We don't use the main loop, because we don't want
-		// coder->crc32 to be touched anymore.
-		do {
-			if (*out_pos == out_size)
-				return LZMA_OK;
-
-			out[*out_pos] = (coder->crc32 >> (coder->pos * 8))
-					& 0xFF;
-			++*out_pos;
-
-		} while (++coder->pos < 4);
-
-		return LZMA_STREAM_END;
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-out:
-	// Update the CRC32.
-	coder->crc32 = lzma_crc32(out + out_start,
-			*out_pos - out_start, coder->crc32);
-
-	return ret;
-}
-
-
-static void
-index_encoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static void
-index_encoder_reset(lzma_coder *coder, const lzma_index *i)
-{
-	lzma_index_iter_init(&coder->iter, i);
-
-	coder->sequence = SEQ_INDICATOR;
-	coder->index = i;
-	coder->pos = 0;
-	coder->crc32 = 0;
-
-	return;
-}
-
-
-extern lzma_ret
-lzma_index_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_index *i)
-{
-	lzma_next_coder_init(&lzma_index_encoder_init, next, allocator);
-
-	if (i == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &index_encode;
-		next->end = &index_encoder_end;
-	}
-
-	index_encoder_reset(next->coder, i);
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_encoder(lzma_stream *strm, const lzma_index *i)
-{
-	lzma_next_strm_init(lzma_index_encoder_init, strm, i);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_buffer_encode(const lzma_index *i,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// Validate the arguments.
-	if (i == NULL || out == NULL || out_pos == NULL || *out_pos > out_size)
-		return LZMA_PROG_ERROR;
-
-	// Don't try to encode if there's not enough output space.
-	if (out_size - *out_pos < lzma_index_size(i))
-		return LZMA_BUF_ERROR;
-
-	// The Index encoder needs just one small data structure so we can
-	// allocate it on stack.
-	lzma_coder coder;
-	index_encoder_reset(&coder, i);
-
-	// Do the actual encoding. This should never fail, but store
-	// the original *out_pos just in case.
-	const size_t out_start = *out_pos;
-	lzma_ret ret = index_encode(&coder, NULL, NULL, NULL, 0,
-			out, out_pos, out_size, LZMA_RUN);
-
-	if (ret == LZMA_STREAM_END) {
-		ret = LZMA_OK;
-	} else {
-		// We should never get here, but just in case, restore the
-		// output position and set the error accordingly if something
-		// goes wrong and debugging isn't enabled.
-		assert(0);
-		*out_pos = out_start;
-		ret = LZMA_PROG_ERROR;
-	}
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/index_encoder.h r-base-3.3.1/src/extra/xz/common/index_encoder.h
--- r-base-3.2.3/src/extra/xz/common/index_encoder.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/index_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       index_encoder.h
-/// \brief      Encodes the Index field
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_INDEX_ENCODER_H
-#define LZMA_INDEX_ENCODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_index_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_index *i);
-
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/index.h r-base-3.3.1/src/extra/xz/common/index.h
--- r-base-3.2.3/src/extra/xz/common/index.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/index.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       index.h
-/// \brief      Handling of Index
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_INDEX_H
-#define LZMA_INDEX_H
-
-#include "common.h"
-
-
-/// Minimum Unpadded Size
-#define UNPADDED_SIZE_MIN LZMA_VLI_C(5)
-
-/// Maximum Unpadded Size
-#define UNPADDED_SIZE_MAX (LZMA_VLI_MAX & ~LZMA_VLI_C(3))
-
-
-/// Get the size of the Index Padding field. This is needed by Index encoder
-/// and decoder, but applications should have no use for this.
-extern uint32_t lzma_index_padding_size(const lzma_index *i);
-
-
-/// Set for how many Records to allocate memory the next time
-/// lzma_index_append() needs to allocate space for a new Record.
-/// This is used only by the Index decoder.
-extern void lzma_index_prealloc(lzma_index *i, lzma_vli records);
-
-
-/// Round the variable-length integer to the next multiple of four.
-static inline lzma_vli
-vli_ceil4(lzma_vli vli)
-{
-	assert(vli <= LZMA_VLI_MAX);
-	return (vli + 3) & ~LZMA_VLI_C(3);
-}
-
-
-/// Calculate the size of the Index field excluding Index Padding
-static inline lzma_vli
-index_size_unpadded(lzma_vli count, lzma_vli index_list_size)
-{
-	// Index Indicator + Number of Records + List of Records + CRC32
-	return 1 + lzma_vli_size(count) + index_list_size + 4;
-}
-
-
-/// Calculate the size of the Index field including Index Padding
-static inline lzma_vli
-index_size(lzma_vli count, lzma_vli index_list_size)
-{
-	return vli_ceil4(index_size_unpadded(count, index_list_size));
-}
-
-
-/// Calculate the total size of the Stream
-static inline lzma_vli
-index_stream_size(lzma_vli blocks_size,
-		lzma_vli count, lzma_vli index_list_size)
-{
-	return LZMA_STREAM_HEADER_SIZE + blocks_size
-			+ index_size(count, index_list_size)
-			+ LZMA_STREAM_HEADER_SIZE;
-}
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/index_hash.c r-base-3.3.1/src/extra/xz/common/index_hash.c
--- r-base-3.2.3/src/extra/xz/common/index_hash.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/index_hash.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,332 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       index_hash.c
-/// \brief      Validates Index by using a hash function
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-#include "index.h"
-#include "check.h"
-
-
-typedef struct {
-	/// Sum of the Block sizes (including Block Padding)
-	lzma_vli blocks_size;
-
-	/// Sum of the Uncompressed Size fields
-	lzma_vli uncompressed_size;
-
-	/// Number of Records
-	lzma_vli count;
-
-	/// Size of the List of Index Records as bytes
-	lzma_vli index_list_size;
-
-	/// Check calculated from Unpadded Sizes and Uncompressed Sizes.
-	lzma_check_state check;
-
-} lzma_index_hash_info;
-
-
-struct lzma_index_hash_s {
-	enum {
-		SEQ_BLOCK,
-		SEQ_COUNT,
-		SEQ_UNPADDED,
-		SEQ_UNCOMPRESSED,
-		SEQ_PADDING_INIT,
-		SEQ_PADDING,
-		SEQ_CRC32,
-	} sequence;
-
-	/// Information collected while decoding the actual Blocks.
-	lzma_index_hash_info blocks;
-
-	/// Information collected from the Index field.
-	lzma_index_hash_info records;
-
-	/// Number of Records not fully decoded
-	lzma_vli remaining;
-
-	/// Unpadded Size currently being read from an Index Record.
-	lzma_vli unpadded_size;
-
-	/// Uncompressed Size currently being read from an Index Record.
-	lzma_vli uncompressed_size;
-
-	/// Position in variable-length integers when decoding them from
-	/// the List of Records.
-	size_t pos;
-
-	/// CRC32 of the Index
-	uint32_t crc32;
-};
-
-
-extern LZMA_API(lzma_index_hash *)
-lzma_index_hash_init(lzma_index_hash *index_hash, lzma_allocator *allocator)
-{
-	if (index_hash == NULL) {
-		index_hash = lzma_alloc(sizeof(lzma_index_hash), allocator);
-		if (index_hash == NULL)
-			return NULL;
-	}
-
-	index_hash->sequence = SEQ_BLOCK;
-	index_hash->blocks.blocks_size = 0;
-	index_hash->blocks.uncompressed_size = 0;
-	index_hash->blocks.count = 0;
-	index_hash->blocks.index_list_size = 0;
-	index_hash->records.blocks_size = 0;
-	index_hash->records.uncompressed_size = 0;
-	index_hash->records.count = 0;
-	index_hash->records.index_list_size = 0;
-	index_hash->unpadded_size = 0;
-	index_hash->uncompressed_size = 0;
-	index_hash->pos = 0;
-	index_hash->crc32 = 0;
-
-	// These cannot fail because LZMA_CHECK_BEST is known to be supported.
-	(void)lzma_check_init(&index_hash->blocks.check, LZMA_CHECK_BEST);
-	(void)lzma_check_init(&index_hash->records.check, LZMA_CHECK_BEST);
-
-	return index_hash;
-}
-
-
-extern LZMA_API(void)
-lzma_index_hash_end(lzma_index_hash *index_hash, lzma_allocator *allocator)
-{
-	lzma_free(index_hash, allocator);
-	return;
-}
-
-
-extern LZMA_API(lzma_vli)
-lzma_index_hash_size(const lzma_index_hash *index_hash)
-{
-	// Get the size of the Index from ->blocks instead of ->records for
-	// cases where application wants to know the Index Size before
-	// decoding the Index.
-	return index_size(index_hash->blocks.count,
-			index_hash->blocks.index_list_size);
-}
-
-
-/// Updates the sizes and the hash without any validation.
-static lzma_ret
-hash_append(lzma_index_hash_info *info, lzma_vli unpadded_size,
-		lzma_vli uncompressed_size)
-{
-	info->blocks_size += vli_ceil4(unpadded_size);
-	info->uncompressed_size += uncompressed_size;
-	info->index_list_size += lzma_vli_size(unpadded_size)
-			+ lzma_vli_size(uncompressed_size);
-	++info->count;
-
-	const lzma_vli sizes[2] = { unpadded_size, uncompressed_size };
-	lzma_check_update(&info->check, LZMA_CHECK_BEST,
-			(const uint8_t *)(sizes), sizeof(sizes));
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_hash_append(lzma_index_hash *index_hash, lzma_vli unpadded_size,
-		lzma_vli uncompressed_size)
-{
-	// Validate the arguments.
-	if (index_hash->sequence != SEQ_BLOCK
-			|| unpadded_size < UNPADDED_SIZE_MIN
-			|| unpadded_size > UNPADDED_SIZE_MAX
-			|| uncompressed_size > LZMA_VLI_MAX)
-		return LZMA_PROG_ERROR;
-
-	// Update the hash.
-	return_if_error(hash_append(&index_hash->blocks,
-			unpadded_size, uncompressed_size));
-
-	// Validate the properties of *info are still in allowed limits.
-	if (index_hash->blocks.blocks_size > LZMA_VLI_MAX
-			|| index_hash->blocks.uncompressed_size > LZMA_VLI_MAX
-			|| index_size(index_hash->blocks.count,
-					index_hash->blocks.index_list_size)
-				> LZMA_BACKWARD_SIZE_MAX
-			|| index_stream_size(index_hash->blocks.blocks_size,
-					index_hash->blocks.count,
-					index_hash->blocks.index_list_size)
-				> LZMA_VLI_MAX)
-		return LZMA_DATA_ERROR;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_index_hash_decode(lzma_index_hash *index_hash, const uint8_t *in,
-		size_t *in_pos, size_t in_size)
-{
-	// Catch zero input buffer here, because in contrast to Index encoder
-	// and decoder functions, applications call this function directly
-	// instead of via lzma_code(), which does the buffer checking.
-	if (*in_pos >= in_size)
-		return LZMA_BUF_ERROR;
-
-	// NOTE: This function has many similarities to index_encode() and
-	// index_decode() functions found from index_encoder.c and
-	// index_decoder.c. See the comments especially in index_encoder.c.
-	const size_t in_start = *in_pos;
-	lzma_ret ret = LZMA_OK;
-
-	while (*in_pos < in_size)
-	switch (index_hash->sequence) {
-	case SEQ_BLOCK:
-		// Check the Index Indicator is present.
-		if (in[(*in_pos)++] != 0x00)
-			return LZMA_DATA_ERROR;
-
-		index_hash->sequence = SEQ_COUNT;
-		break;
-
-	case SEQ_COUNT: {
-		ret = lzma_vli_decode(&index_hash->remaining,
-				&index_hash->pos, in, in_pos, in_size);
-		if (ret != LZMA_STREAM_END)
-			goto out;
-
-		// The count must match the count of the Blocks decoded.
-		if (index_hash->remaining != index_hash->blocks.count)
-			return LZMA_DATA_ERROR;
-
-		ret = LZMA_OK;
-		index_hash->pos = 0;
-
-		// Handle the special case when there are no Blocks.
-		index_hash->sequence = index_hash->remaining == 0
-				? SEQ_PADDING_INIT : SEQ_UNPADDED;
-		break;
-	}
-
-	case SEQ_UNPADDED:
-	case SEQ_UNCOMPRESSED: {
-		lzma_vli *size = index_hash->sequence == SEQ_UNPADDED
-				? &index_hash->unpadded_size
-				: &index_hash->uncompressed_size;
-
-		ret = lzma_vli_decode(size, &index_hash->pos,
-				in, in_pos, in_size);
-		if (ret != LZMA_STREAM_END)
-			goto out;
-
-		ret = LZMA_OK;
-		index_hash->pos = 0;
-
-		if (index_hash->sequence == SEQ_UNPADDED) {
-			if (index_hash->unpadded_size < UNPADDED_SIZE_MIN
-					|| index_hash->unpadded_size
-						> UNPADDED_SIZE_MAX)
-				return LZMA_DATA_ERROR;
-
-			index_hash->sequence = SEQ_UNCOMPRESSED;
-		} else {
-			// Update the hash.
-			return_if_error(hash_append(&index_hash->records,
-					index_hash->unpadded_size,
-					index_hash->uncompressed_size));
-
-			// Verify that we don't go over the known sizes. Note
-			// that this validation is simpler than the one used
-			// in lzma_index_hash_append(), because here we know
-			// that values in index_hash->blocks are already
-			// validated and we are fine as long as we don't
-			// exceed them in index_hash->records.
-			if (index_hash->blocks.blocks_size
-					< index_hash->records.blocks_size
-					|| index_hash->blocks.uncompressed_size
-					< index_hash->records.uncompressed_size
-					|| index_hash->blocks.index_list_size
-					< index_hash->records.index_list_size)
-				return LZMA_DATA_ERROR;
-
-			// Check if this was the last Record.
-			index_hash->sequence = --index_hash->remaining == 0
-					? SEQ_PADDING_INIT : SEQ_UNPADDED;
-		}
-
-		break;
-	}
-
-	case SEQ_PADDING_INIT:
-		index_hash->pos = (LZMA_VLI_C(4) - index_size_unpadded(
-				index_hash->records.count,
-				index_hash->records.index_list_size)) & 3;
-		index_hash->sequence = SEQ_PADDING;
-
-	// Fall through
-
-	case SEQ_PADDING:
-		if (index_hash->pos > 0) {
-			--index_hash->pos;
-			if (in[(*in_pos)++] != 0x00)
-				return LZMA_DATA_ERROR;
-
-			break;
-		}
-
-		// Compare the sizes.
-		if (index_hash->blocks.blocks_size
-				!= index_hash->records.blocks_size
-				|| index_hash->blocks.uncompressed_size
-				!= index_hash->records.uncompressed_size
-				|| index_hash->blocks.index_list_size
-				!= index_hash->records.index_list_size)
-			return LZMA_DATA_ERROR;
-
-		// Finish the hashes and compare them.
-		lzma_check_finish(&index_hash->blocks.check, LZMA_CHECK_BEST);
-		lzma_check_finish(&index_hash->records.check, LZMA_CHECK_BEST);
-		if (memcmp(index_hash->blocks.check.buffer.u8,
-				index_hash->records.check.buffer.u8,
-				lzma_check_size(LZMA_CHECK_BEST)) != 0)
-			return LZMA_DATA_ERROR;
-
-		// Finish the CRC32 calculation.
-		index_hash->crc32 = lzma_crc32(in + in_start,
-				*in_pos - in_start, index_hash->crc32);
-
-		index_hash->sequence = SEQ_CRC32;
-
-	// Fall through
-
-	case SEQ_CRC32:
-		do {
-			if (*in_pos == in_size)
-				return LZMA_OK;
-
-			if (((index_hash->crc32 >> (index_hash->pos * 8))
-					& 0xFF) != in[(*in_pos)++])
-				return LZMA_DATA_ERROR;
-
-		} while (++index_hash->pos < 4);
-
-		return LZMA_STREAM_END;
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-out:
-	// Update the CRC32,
-	index_hash->crc32 = lzma_crc32(in + in_start,
-			*in_pos - in_start, index_hash->crc32);
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/local.h r-base-3.3.1/src/extra/xz/common/local.h
--- r-base-3.2.3/src/extra/xz/common/local.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/local.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/* Define to 1 if crc32 integrity check is enabled. */
-#define HAVE_CHECK_CRC32 1
-
-/* Define to 1 if crc64 integrity check is enabled. */
-#define HAVE_CHECK_CRC64 1
-
-/* Define to 1 if sha256 integrity check is enabled. */
-#define HAVE_CHECK_SHA256 1
-
-/* Define to 1 if decoder components are enabled. */
-#define HAVE_DECODER 1
-
-/* Define to 1 if arm decoder is enabled. */
-#define HAVE_DECODER_ARM 1
-
-/* Define to 1 if armthumb decoder is enabled. */
-#define HAVE_DECODER_ARMTHUMB 1
-
-/* Define to 1 if delta decoder is enabled. */
-#define HAVE_DECODER_DELTA 1
-
-/* Define to 1 if ia64 decoder is enabled. */
-#define HAVE_DECODER_IA64 1
-
-/* Define to 1 if lzma1 decoder is enabled. */
-#define HAVE_DECODER_LZMA1 1
-
-/* Define to 1 if lzma2 decoder is enabled. */
-#define HAVE_DECODER_LZMA2 1
-
-/* Define to 1 if powerpc decoder is enabled. */
-#define HAVE_DECODER_POWERPC 1
-
-/* Define to 1 if sparc decoder is enabled. */
-#define HAVE_DECODER_SPARC 1
-
-/* Define to 1 if subblock decoder is enabled. */
-#define HAVE_DECODER_SUBBLOCK 1
-
-/* Define to 1 if x86 decoder is enabled. */
-#define HAVE_DECODER_X86 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if encoder components are enabled. */
-#define HAVE_ENCODER 1
-
-/* Define to 1 if arm encoder is enabled. */
-#define HAVE_ENCODER_ARM 1
-
-/* Define to 1 if armthumb encoder is enabled. */
-#define HAVE_ENCODER_ARMTHUMB 1
-
-/* Define to 1 if delta encoder is enabled. */
-#define HAVE_ENCODER_DELTA 1
-
-/* Define to 1 if ia64 encoder is enabled. */
-#define HAVE_ENCODER_IA64 1
-
-/* Define to 1 if lzma1 encoder is enabled. */
-#define HAVE_ENCODER_LZMA1 1
-
-/* Define to 1 if lzma2 encoder is enabled. */
-#define HAVE_ENCODER_LZMA2 1
-
-/* Define to 1 if powerpc encoder is enabled. */
-#define HAVE_ENCODER_POWERPC 1
-
-/* Define to 1 if sparc encoder is enabled. */
-#define HAVE_ENCODER_SPARC 1
-
-/* Define to 1 if subblock encoder is enabled. */
-/* #undef HAVE_ENCODER_SUBBLOCK */
-
-/* Define to 1 if x86 encoder is enabled. */
-#define HAVE_ENCODER_X86 1
-
-/* Define to 1 to enable bt2 match finder. */
-#define HAVE_MF_BT2 1
-
-/* Define to 1 to enable bt3 match finder. */
-#define HAVE_MF_BT3 1
-
-/* Define to 1 to enable bt4 match finder. */
-#define HAVE_MF_BT4 1
-
-/* Define to 1 to enable hc3 match finder. */
-#define HAVE_MF_HC3 1
-
-/* Define to 1 to enable hc4 match finder. */
-#define HAVE_MF_HC4 1
-
-/* Things that might be defined on a per-platform basis: */
-
-/* Define to 1 if using x86 assembler optimizations. */
-/* #define HAVE_ASM_X86 1 */
-
-/* Define to 1 if using x86_64 assembler optimizations. */
-/* #undef HAVE_ASM_X86_64 */
-
-/* Define to 1 if bswap_16 is available. */
-/* #undef HAVE_BSWAP_16 */
-
-/* Define to 1 if bswap_32 is available. */
-/* #undef HAVE_BSWAP_32 */
-
-/* Define to 1 if bswap_64 is available. */
-/* #undef HAVE_BSWAP_64 */
-
-/* Define to 1 if you have the <byteswap.h> header file. */
-/* #undef HAVE_BYTESWAP_H */
-
-/* Define to 1 if the system supports fast unaligned memory access. */
-/* #define HAVE_FAST_UNALIGNED_ACCESS 1 */
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #define HAVE__BOOL 1 */
-
-#ifdef WIN32
-#define HAVE_ASM_X86 1
-#define HAVE_FAST_UNALIGNED_ACCESS 1
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/mythread.h r-base-3.3.1/src/extra/xz/common/mythread.h
--- r-base-3.2.3/src/extra/xz/common/mythread.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/mythread.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       mythread.h
-/// \brief      Wrappers for threads
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "sysdefs.h"
-
-
-#ifdef HAVE_PTHREAD
-#	include <pthread.h>
-
-#	define mythread_once(func) \
-	do { \
-		static pthread_once_t once_ = PTHREAD_ONCE_INIT; \
-		pthread_once(&once_, &func); \
-	} while (0)
-
-#	define mythread_sigmask(how, set, oset) \
-		pthread_sigmask(how, set, oset)
-
-#else
-
-#	define mythread_once(func) \
-	do { \
-		static bool once_ = false; \
-		if (!once_) { \
-			func(); \
-			once_ = true; \
-		} \
-	} while (0)
-
-#	define mythread_sigmask(how, set, oset) \
-		sigprocmask(how, set, oset)
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_buffer_decoder.c r-base-3.3.1/src/extra/xz/common/stream_buffer_decoder.c
--- r-base-3.2.3/src/extra/xz/common/stream_buffer_decoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_buffer_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_buffer_decoder.c
-/// \brief      Single-call .xz Stream decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_decoder.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_buffer_decode(uint64_t *memlimit, uint32_t flags,
-		lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	// Sanity checks
-	if (in_pos == NULL || (in == NULL && *in_pos != in_size)
-			|| *in_pos > in_size || out_pos == NULL
-			|| (out == NULL && *out_pos != out_size)
-			|| *out_pos > out_size)
-		return LZMA_PROG_ERROR;
-
-	// Catch flags that are not allowed in buffer-to-buffer decoding.
-	if (flags & LZMA_TELL_ANY_CHECK)
-		return LZMA_PROG_ERROR;
-
-	// Initialize the Stream decoder.
-	// TODO: We need something to tell the decoder that it can use the
-	// output buffer as workspace, and thus save significant amount of RAM.
-	lzma_next_coder stream_decoder = LZMA_NEXT_CODER_INIT;
-	lzma_ret ret = lzma_stream_decoder_init(
-			&stream_decoder, allocator, *memlimit, flags);
-
-	if (ret == LZMA_OK) {
-		// Save the positions so that we can restore them in case
-		// an error occurs.
-		const size_t in_start = *in_pos;
-		const size_t out_start = *out_pos;
-
-		// Do the actual decoding.
-		ret = stream_decoder.code(stream_decoder.coder, allocator,
-				in, in_pos, in_size, out, out_pos, out_size,
-				LZMA_FINISH);
-
-		if (ret == LZMA_STREAM_END) {
-			ret = LZMA_OK;
-		} else {
-			// Something went wrong, restore the positions.
-			*in_pos = in_start;
-			*out_pos = out_start;
-
-			if (ret == LZMA_OK) {
-				// Either the input was truncated or the
-				// output buffer was too small.
-				assert(*in_pos == in_size
-						|| *out_pos == out_size);
-
-				// If all the input was consumed, then the
-				// input is truncated, even if the output
-				// buffer is also full. This is because
-				// processing the last byte of the Stream
-				// never produces output.
-				if (*in_pos == in_size)
-					ret = LZMA_DATA_ERROR;
-				else
-					ret = LZMA_BUF_ERROR;
-
-			} else if (ret == LZMA_MEMLIMIT_ERROR) {
-				// Let the caller know how much memory would
-				// have been needed.
-				uint64_t memusage;
-				(void)stream_decoder.memconfig(
-						stream_decoder.coder,
-						memlimit, &memusage, 0);
-			}
-		}
-	}
-
-	// Free the decoder memory. This needs to be done even if
-	// initialization fails, because the internal API doesn't
-	// require the initialization function to free its memory on error.
-	lzma_next_end(&stream_decoder, allocator);
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_buffer_encoder.c r-base-3.3.1/src/extra/xz/common/stream_buffer_encoder.c
--- r-base-3.2.3/src/extra/xz/common/stream_buffer_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_buffer_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_buffer_encoder.c
-/// \brief      Single-call .xz Stream encoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "index.h"
-
-
-/// Maximum size of Index that has exactly one Record.
-/// Index Indicator + Number of Records + Record + CRC32 rounded up to
-/// the next multiple of four.
-#define INDEX_BOUND ((1 + 1 + 2 * LZMA_VLI_BYTES_MAX + 4 + 3) & ~3)
-
-/// Stream Header, Stream Footer, and Index
-#define HEADERS_BOUND (2 * LZMA_STREAM_HEADER_SIZE + INDEX_BOUND)
-
-
-extern LZMA_API(size_t)
-lzma_stream_buffer_bound(size_t uncompressed_size)
-{
-	// Get the maximum possible size of a Block.
-	const size_t block_bound = lzma_block_buffer_bound(uncompressed_size);
-	if (block_bound == 0)
-		return 0;
-
-	// Catch the possible integer overflow and also prevent the size of
-	// the Stream exceeding LZMA_VLI_MAX (theoretically possible on
-	// 64-bit systems).
-	if (my_min(SIZE_MAX, LZMA_VLI_MAX) - block_bound < HEADERS_BOUND)
-		return 0;
-
-	return block_bound + HEADERS_BOUND;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_buffer_encode(lzma_filter *filters, lzma_check check,
-		lzma_allocator *allocator, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos_ptr, size_t out_size)
-{
-	// Sanity checks
-	if (filters == NULL || (unsigned int)(check) > LZMA_CHECK_ID_MAX
-			|| (in == NULL && in_size != 0) || out == NULL
-			|| out_pos_ptr == NULL || *out_pos_ptr > out_size)
-		return LZMA_PROG_ERROR;
-
-	if (!lzma_check_is_supported(check))
-		return LZMA_UNSUPPORTED_CHECK;
-
-	// Note for the paranoids: Index encoder prevents the Stream from
-	// getting too big and still being accepted with LZMA_OK, and Block
-	// encoder catches if the input is too big. So we don't need to
-	// separately check if the buffers are too big.
-
-	// Use a local copy. We update *out_pos_ptr only if everything
-	// succeeds.
-	size_t out_pos = *out_pos_ptr;
-
-	// Check that there's enough space for both Stream Header and
-	// Stream Footer.
-	if (out_size - out_pos <= 2 * LZMA_STREAM_HEADER_SIZE)
-		return LZMA_BUF_ERROR;
-
-	// Reserve space for Stream Footer so we don't need to check for
-	// available space again before encoding Stream Footer.
-	out_size -= LZMA_STREAM_HEADER_SIZE;
-
-	// Encode the Stream Header.
-	lzma_stream_flags stream_flags = {
-		.version = 0,
-		.check = check,
-	};
-
-	if (lzma_stream_header_encode(&stream_flags, out + out_pos)
-			!= LZMA_OK)
-		return LZMA_PROG_ERROR;
-
-	out_pos += LZMA_STREAM_HEADER_SIZE;
-
-	// Encode a Block but only if there is at least one byte of input.
-	lzma_block block = {
-		.version = 0,
-		.check = check,
-		.filters = filters,
-	};
-
-	if (in_size > 0)
-		return_if_error(lzma_block_buffer_encode(&block, allocator,
-				in, in_size, out, &out_pos, out_size));
-
-	// Index
-	{
-		// Create an Index. It will have one Record if there was
-		// at least one byte of input to encode. Otherwise the
-		// Index will be empty.
-		lzma_index *i = lzma_index_init(allocator);
-		if (i == NULL)
-			return LZMA_MEM_ERROR;
-
-		lzma_ret ret = LZMA_OK;
-
-		if (in_size > 0)
-			ret = lzma_index_append(i, allocator,
-					lzma_block_unpadded_size(&block),
-					block.uncompressed_size);
-
-		// If adding the Record was successful, encode the Index
-		// and get its size which will be stored into Stream Footer.
-		if (ret == LZMA_OK) {
-			ret = lzma_index_buffer_encode(
-					i, out, &out_pos, out_size);
-
-			stream_flags.backward_size = lzma_index_size(i);
-		}
-
-		lzma_index_end(i, allocator);
-
-		if (ret != LZMA_OK)
-			return ret;
-	}
-
-	// Stream Footer. We have already reserved space for this.
-	if (lzma_stream_footer_encode(&stream_flags, out + out_pos)
-			!= LZMA_OK)
-		return LZMA_PROG_ERROR;
-
-	out_pos += LZMA_STREAM_HEADER_SIZE;
-
-	// Everything went fine, make the new output position available
-	// to the application.
-	*out_pos_ptr = out_pos;
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_decoder.c r-base-3.3.1/src/extra/xz/common/stream_decoder.c
--- r-base-3.2.3/src/extra/xz/common/stream_decoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,451 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_decoder.c
-/// \brief      Decodes .xz Streams
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_decoder.h"
-#include "block_decoder.h"
-
-
-struct lzma_coder_s {
-	enum {
-		SEQ_STREAM_HEADER,
-		SEQ_BLOCK_HEADER,
-		SEQ_BLOCK,
-		SEQ_INDEX,
-		SEQ_STREAM_FOOTER,
-		SEQ_STREAM_PADDING,
-	} sequence;
-
-	/// Block or Metadata decoder. This takes little memory and the same
-	/// data structure can be used to decode every Block Header, so it's
-	/// a good idea to have a separate lzma_next_coder structure for it.
-	lzma_next_coder block_decoder;
-
-	/// Block options decoded by the Block Header decoder and used by
-	/// the Block decoder.
-	lzma_block block_options;
-
-	/// Stream Flags from Stream Header
-	lzma_stream_flags stream_flags;
-
-	/// Index is hashed so that it can be compared to the sizes of Blocks
-	/// with O(1) memory usage.
-	lzma_index_hash *index_hash;
-
-	/// Memory usage limit
-	uint64_t memlimit;
-
-	/// Amount of memory actually needed (only an estimate)
-	uint64_t memusage;
-
-	/// If true, LZMA_NO_CHECK is returned if the Stream has
-	/// no integrity check.
-	bool tell_no_check;
-
-	/// If true, LZMA_UNSUPPORTED_CHECK is returned if the Stream has
-	/// an integrity check that isn't supported by this liblzma build.
-	bool tell_unsupported_check;
-
-	/// If true, LZMA_GET_CHECK is returned after decoding Stream Header.
-	bool tell_any_check;
-
-	/// If true, we will decode concatenated Streams that possibly have
-	/// Stream Padding between or after them. LZMA_STREAM_END is returned
-	/// once the application isn't giving us any new input, and we aren't
-	/// in the middle of a Stream, and possible Stream Padding is a
-	/// multiple of four bytes.
-	bool concatenated;
-
-	/// When decoding concatenated Streams, this is true as long as we
-	/// are decoding the first Stream. This is needed to avoid misleading
-	/// LZMA_FORMAT_ERROR in case the later Streams don't have valid magic
-	/// bytes.
-	bool first_stream;
-
-	/// Write position in buffer[] and position in Stream Padding
-	size_t pos;
-
-	/// Buffer to hold Stream Header, Block Header, and Stream Footer.
-	/// Block Header has biggest maximum size.
-	uint8_t buffer[LZMA_BLOCK_HEADER_SIZE_MAX];
-};
-
-
-static lzma_ret
-stream_decoder_reset(lzma_coder *coder, lzma_allocator *allocator)
-{
-	// Initialize the Index hash used to verify the Index.
-	coder->index_hash = lzma_index_hash_init(coder->index_hash, allocator);
-	if (coder->index_hash == NULL)
-		return LZMA_MEM_ERROR;
-
-	// Reset the rest of the variables.
-	coder->sequence = SEQ_STREAM_HEADER;
-	coder->pos = 0;
-
-	return LZMA_OK;
-}
-
-
-static lzma_ret
-stream_decode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	// When decoding the actual Block, it may be able to produce more
-	// output even if we don't give it any new input.
-	while (true)
-	switch (coder->sequence) {
-	case SEQ_STREAM_HEADER: {
-		// Copy the Stream Header to the internal buffer.
-		lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos,
-				LZMA_STREAM_HEADER_SIZE);
-
-		// Return if we didn't get the whole Stream Header yet.
-		if (coder->pos < LZMA_STREAM_HEADER_SIZE)
-			return LZMA_OK;
-
-		coder->pos = 0;
-
-		// Decode the Stream Header.
-		const lzma_ret ret = lzma_stream_header_decode(
-				&coder->stream_flags, coder->buffer);
-		if (ret != LZMA_OK)
-			return ret == LZMA_FORMAT_ERROR && !coder->first_stream
-					? LZMA_DATA_ERROR : ret;
-
-		// If we are decoding concatenated Streams, and the later
-		// Streams have invalid Header Magic Bytes, we give
-		// LZMA_DATA_ERROR instead of LZMA_FORMAT_ERROR.
-		coder->first_stream = false;
-
-		// Copy the type of the Check so that Block Header and Block
-		// decoders see it.
-		coder->block_options.check = coder->stream_flags.check;
-
-		// Even if we return LZMA_*_CHECK below, we want
-		// to continue from Block Header decoding.
-		coder->sequence = SEQ_BLOCK_HEADER;
-
-		// Detect if there's no integrity check or if it is
-		// unsupported if those were requested by the application.
-		if (coder->tell_no_check && coder->stream_flags.check
-				== LZMA_CHECK_NONE)
-			return LZMA_NO_CHECK;
-
-		if (coder->tell_unsupported_check
-				&& !lzma_check_is_supported(
-					coder->stream_flags.check))
-			return LZMA_UNSUPPORTED_CHECK;
-
-		if (coder->tell_any_check)
-			return LZMA_GET_CHECK;
-	}
-
-	// Fall through
-
-	case SEQ_BLOCK_HEADER: {
-		if (*in_pos >= in_size)
-			return LZMA_OK;
-
-		if (coder->pos == 0) {
-			// Detect if it's Index.
-			if (in[*in_pos] == 0x00) {
-				coder->sequence = SEQ_INDEX;
-				break;
-			}
-
-			// Calculate the size of the Block Header. Note that
-			// Block Header decoder wants to see this byte too
-			// so don't advance *in_pos.
-			coder->block_options.header_size
-					= lzma_block_header_size_decode(
-						in[*in_pos]);
-		}
-
-		// Copy the Block Header to the internal buffer.
-		lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos,
-				coder->block_options.header_size);
-
-		// Return if we didn't get the whole Block Header yet.
-		if (coder->pos < coder->block_options.header_size)
-			return LZMA_OK;
-
-		coder->pos = 0;
-
-		// Version 0 is currently the only possible version.
-		coder->block_options.version = 0;
-
-		// Set up a buffer to hold the filter chain. Block Header
-		// decoder will initialize all members of this array so
-		// we don't need to do it here.
-		lzma_filter filters[LZMA_FILTERS_MAX + 1];
-		coder->block_options.filters = filters;
-
-		// Decode the Block Header.
-		return_if_error(lzma_block_header_decode(&coder->block_options,
-				allocator, coder->buffer));
-
-		// Check the memory usage limit.
-		const uint64_t memusage = lzma_raw_decoder_memusage(filters);
-		lzma_ret ret;
-
-		if (memusage == UINT64_MAX) {
-			// One or more unknown Filter IDs.
-			ret = LZMA_OPTIONS_ERROR;
-		} else {
-			// Now we can set coder->memusage since we know that
-			// the filter chain is valid. We don't want
-			// lzma_memusage() to return UINT64_MAX in case of
-			// invalid filter chain.
-			coder->memusage = memusage;
-
-			if (memusage > coder->memlimit) {
-				// The chain would need too much memory.
-				ret = LZMA_MEMLIMIT_ERROR;
-			} else {
-				// Memory usage is OK.
-				// Initialize the Block decoder.
-				ret = lzma_block_decoder_init(
-						&coder->block_decoder,
-						allocator,
-						&coder->block_options);
-			}
-		}
-
-		// Free the allocated filter options since they are needed
-		// only to initialize the Block decoder.
-		for (size_t i = 0; i < LZMA_FILTERS_MAX; ++i)
-			lzma_free(filters[i].options, allocator);
-
-		coder->block_options.filters = NULL;
-
-		// Check if memory usage calculation and Block enocoder
-		// initialization succeeded.
-		if (ret != LZMA_OK)
-			return ret;
-
-		coder->sequence = SEQ_BLOCK;
-	}
-
-	// Fall through
-
-	case SEQ_BLOCK: {
-		const lzma_ret ret = coder->block_decoder.code(
-				coder->block_decoder.coder, allocator,
-				in, in_pos, in_size, out, out_pos, out_size,
-				action);
-
-		if (ret != LZMA_STREAM_END)
-			return ret;
-
-		// Block decoded successfully. Add the new size pair to
-		// the Index hash.
-		return_if_error(lzma_index_hash_append(coder->index_hash,
-				lzma_block_unpadded_size(
-					&coder->block_options),
-				coder->block_options.uncompressed_size));
-
-		coder->sequence = SEQ_BLOCK_HEADER;
-		break;
-	}
-
-	case SEQ_INDEX: {
-		// If we don't have any input, don't call
-		// lzma_index_hash_decode() since it would return
-		// LZMA_BUF_ERROR, which we must not do here.
-		if (*in_pos >= in_size)
-			return LZMA_OK;
-
-		// Decode the Index and compare it to the hash calculated
-		// from the sizes of the Blocks (if any).
-		const lzma_ret ret = lzma_index_hash_decode(coder->index_hash,
-				in, in_pos, in_size);
-		if (ret != LZMA_STREAM_END)
-			return ret;
-
-		coder->sequence = SEQ_STREAM_FOOTER;
-	}
-
-	// Fall through
-
-	case SEQ_STREAM_FOOTER: {
-		// Copy the Stream Footer to the internal buffer.
-		lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos,
-				LZMA_STREAM_HEADER_SIZE);
-
-		// Return if we didn't get the whole Stream Footer yet.
-		if (coder->pos < LZMA_STREAM_HEADER_SIZE)
-			return LZMA_OK;
-
-		coder->pos = 0;
-
-		// Decode the Stream Footer. The decoder gives
-		// LZMA_FORMAT_ERROR if the magic bytes don't match,
-		// so convert that return code to LZMA_DATA_ERROR.
-		lzma_stream_flags footer_flags;
-		const lzma_ret ret = lzma_stream_footer_decode(
-				&footer_flags, coder->buffer);
-		if (ret != LZMA_OK)
-			return ret == LZMA_FORMAT_ERROR
-					? LZMA_DATA_ERROR : ret;
-
-		// Check that Index Size stored in the Stream Footer matches
-		// the real size of the Index field.
-		if (lzma_index_hash_size(coder->index_hash)
-				!= footer_flags.backward_size)
-			return LZMA_DATA_ERROR;
-
-		// Compare that the Stream Flags fields are identical in
-		// both Stream Header and Stream Footer.
-		return_if_error(lzma_stream_flags_compare(
-				&coder->stream_flags, &footer_flags));
-
-		if (!coder->concatenated)
-			return LZMA_STREAM_END;
-
-		coder->sequence = SEQ_STREAM_PADDING;
-	}
-
-	// Fall through
-
-	case SEQ_STREAM_PADDING:
-		assert(coder->concatenated);
-
-		// Skip over possible Stream Padding.
-		while (true) {
-			if (*in_pos >= in_size) {
-				// Unless LZMA_FINISH was used, we cannot
-				// know if there's more input coming later.
-				if (action != LZMA_FINISH)
-					return LZMA_OK;
-
-				// Stream Padding must be a multiple of
-				// four bytes.
-				return coder->pos == 0
-						? LZMA_STREAM_END
-						: LZMA_DATA_ERROR;
-			}
-
-			// If the byte is not zero, it probably indicates
-			// beginning of a new Stream (or the file is corrupt).
-			if (in[*in_pos] != 0x00)
-				break;
-
-			++*in_pos;
-			coder->pos = (coder->pos + 1) & 3;
-		}
-
-		// Stream Padding must be a multiple of four bytes (empty
-		// Stream Padding is OK).
-		if (coder->pos != 0) {
-			++*in_pos;
-			return LZMA_DATA_ERROR;
-		}
-
-		// Prepare to decode the next Stream.
-		return_if_error(stream_decoder_reset(coder, allocator));
-		break;
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-	// Never reached
-}
-
-
-static void
-stream_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->block_decoder, allocator);
-	lzma_index_hash_end(coder->index_hash, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_check
-stream_decoder_get_check(const lzma_coder *coder)
-{
-	return coder->stream_flags.check;
-}
-
-
-static lzma_ret
-stream_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
-		uint64_t *old_memlimit, uint64_t new_memlimit)
-{
-	*memusage = coder->memusage;
-	*old_memlimit = coder->memlimit;
-
-	if (new_memlimit != 0) {
-		if (new_memlimit < coder->memusage)
-			return LZMA_MEMLIMIT_ERROR;
-
-		coder->memlimit = new_memlimit;
-	}
-
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_stream_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		uint64_t memlimit, uint32_t flags)
-{
-	lzma_next_coder_init(&lzma_stream_decoder_init, next, allocator);
-
-	if (memlimit == 0)
-		return LZMA_PROG_ERROR;
-
-	if (flags & ~LZMA_SUPPORTED_FLAGS)
-		return LZMA_OPTIONS_ERROR;
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &stream_decode;
-		next->end = &stream_decoder_end;
-		next->get_check = &stream_decoder_get_check;
-		next->memconfig = &stream_decoder_memconfig;
-
-		next->coder->block_decoder = LZMA_NEXT_CODER_INIT;
-		next->coder->index_hash = NULL;
-	}
-
-	next->coder->memlimit = memlimit;
-	next->coder->memusage = LZMA_MEMUSAGE_BASE;
-	next->coder->tell_no_check = (flags & LZMA_TELL_NO_CHECK) != 0;
-	next->coder->tell_unsupported_check
-			= (flags & LZMA_TELL_UNSUPPORTED_CHECK) != 0;
-	next->coder->tell_any_check = (flags & LZMA_TELL_ANY_CHECK) != 0;
-	next->coder->concatenated = (flags & LZMA_CONCATENATED) != 0;
-	next->coder->first_stream = true;
-
-	return stream_decoder_reset(next->coder, allocator);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_decoder(lzma_stream *strm, uint64_t memlimit, uint32_t flags)
-{
-	lzma_next_strm_init(lzma_stream_decoder_init, strm, memlimit, flags);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_decoder.h r-base-3.3.1/src/extra/xz/common/stream_decoder.h
--- r-base-3.2.3/src/extra/xz/common/stream_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_decoder.h
-/// \brief      Decodes .xz Streams
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_STREAM_DECODER_H
-#define LZMA_STREAM_DECODER_H
-
-#include "common.h"
-
-extern lzma_ret lzma_stream_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, uint64_t memlimit, uint32_t flags);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_encoder.c r-base-3.3.1/src/extra/xz/common/stream_encoder.c
--- r-base-3.2.3/src/extra/xz/common/stream_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,331 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_encoder.c
-/// \brief      Encodes .xz Streams
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_encoder.h"
-#include "block_encoder.h"
-#include "index_encoder.h"
-
-
-struct lzma_coder_s {
-	enum {
-		SEQ_STREAM_HEADER,
-		SEQ_BLOCK_INIT,
-		SEQ_BLOCK_HEADER,
-		SEQ_BLOCK_ENCODE,
-		SEQ_INDEX_ENCODE,
-		SEQ_STREAM_FOOTER,
-	} sequence;
-
-	/// True if Block encoder has been initialized by
-	/// lzma_stream_encoder_init() or stream_encoder_update()
-	/// and thus doesn't need to be initialized in stream_encode().
-	bool block_encoder_is_initialized;
-
-	/// Block
-	lzma_next_coder block_encoder;
-
-	/// Options for the Block encoder
-	lzma_block block_options;
-
-	/// The filter chain currently in use
-	lzma_filter filters[LZMA_FILTERS_MAX + 1];
-
-	/// Index encoder. This is separate from Block encoder, because this
-	/// doesn't take much memory, and when encoding multiple Streams
-	/// with the same encoding options we avoid reallocating memory.
-	lzma_next_coder index_encoder;
-
-	/// Index to hold sizes of the Blocks
-	lzma_index *index;
-
-	/// Read position in buffer[]
-	size_t buffer_pos;
-
-	/// Total number of bytes in buffer[]
-	size_t buffer_size;
-
-	/// Buffer to hold Stream Header, Block Header, and Stream Footer.
-	/// Block Header has biggest maximum size.
-	uint8_t buffer[LZMA_BLOCK_HEADER_SIZE_MAX];
-};
-
-
-static lzma_ret
-block_encoder_init(lzma_coder *coder, lzma_allocator *allocator)
-{
-	// Prepare the Block options. Even though Block encoder doesn't need
-	// compressed_size, uncompressed_size, and header_size to be
-	// initialized, it is a good idea to do it here, because this way
-	// we catch if someone gave us Filter ID that cannot be used in
-	// Blocks/Streams.
-	coder->block_options.compressed_size = LZMA_VLI_UNKNOWN;
-	coder->block_options.uncompressed_size = LZMA_VLI_UNKNOWN;
-
-	return_if_error(lzma_block_header_size(&coder->block_options));
-
-	// Initialize the actual Block encoder.
-	return lzma_block_encoder_init(&coder->block_encoder, allocator,
-			&coder->block_options);
-}
-
-
-static lzma_ret
-stream_encode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	// Main loop
-	while (*out_pos < out_size)
-	switch (coder->sequence) {
-	case SEQ_STREAM_HEADER:
-	case SEQ_BLOCK_HEADER:
-	case SEQ_STREAM_FOOTER:
-		lzma_bufcpy(coder->buffer, &coder->buffer_pos,
-				coder->buffer_size, out, out_pos, out_size);
-		if (coder->buffer_pos < coder->buffer_size)
-			return LZMA_OK;
-
-		if (coder->sequence == SEQ_STREAM_FOOTER)
-			return LZMA_STREAM_END;
-
-		coder->buffer_pos = 0;
-		++coder->sequence;
-		break;
-
-	case SEQ_BLOCK_INIT: {
-		if (*in_pos == in_size) {
-			// If we are requested to flush or finish the current
-			// Block, return LZMA_STREAM_END immediately since
-			// there's nothing to do.
-			if (action != LZMA_FINISH)
-				return action == LZMA_RUN
-						? LZMA_OK : LZMA_STREAM_END;
-
-			// The application had used LZMA_FULL_FLUSH to finish
-			// the previous Block, but now wants to finish without
-			// encoding new data, or it is simply creating an
-			// empty Stream with no Blocks.
-			//
-			// Initialize the Index encoder, and continue to
-			// actually encoding the Index.
-			return_if_error(lzma_index_encoder_init(
-					&coder->index_encoder, allocator,
-					coder->index));
-			coder->sequence = SEQ_INDEX_ENCODE;
-			break;
-		}
-
-		// Initialize the Block encoder unless it was already
-		// initialized by lzma_stream_encoder_init() or
-		// stream_encoder_update().
-		if (!coder->block_encoder_is_initialized)
-			return_if_error(block_encoder_init(coder, allocator));
-
-		// Make it false so that we don't skip the initialization
-		// with the next Block.
-		coder->block_encoder_is_initialized = false;
-
-		// Encode the Block Header. This shouldn't fail since we have
-		// already initialized the Block encoder.
-		if (lzma_block_header_encode(&coder->block_options,
-				coder->buffer) != LZMA_OK)
-			return LZMA_PROG_ERROR;
-
-		coder->buffer_size = coder->block_options.header_size;
-		coder->sequence = SEQ_BLOCK_HEADER;
-		break;
-	}
-
-	case SEQ_BLOCK_ENCODE: {
-		static const lzma_action convert[4] = {
-			LZMA_RUN,
-			LZMA_SYNC_FLUSH,
-			LZMA_FINISH,
-			LZMA_FINISH,
-		};
-
-		const lzma_ret ret = coder->block_encoder.code(
-				coder->block_encoder.coder, allocator,
-				in, in_pos, in_size,
-				out, out_pos, out_size, convert[action]);
-		if (ret != LZMA_STREAM_END || action == LZMA_SYNC_FLUSH)
-			return ret;
-
-		// Add a new Index Record.
-		const lzma_vli unpadded_size = lzma_block_unpadded_size(
-				&coder->block_options);
-		assert(unpadded_size != 0);
-		return_if_error(lzma_index_append(coder->index, allocator,
-				unpadded_size,
-				coder->block_options.uncompressed_size));
-
-		coder->sequence = SEQ_BLOCK_INIT;
-		break;
-	}
-
-	case SEQ_INDEX_ENCODE: {
-		// Call the Index encoder. It doesn't take any input, so
-		// those pointers can be NULL.
-		const lzma_ret ret = coder->index_encoder.code(
-				coder->index_encoder.coder, allocator,
-				NULL, NULL, 0,
-				out, out_pos, out_size, LZMA_RUN);
-		if (ret != LZMA_STREAM_END)
-			return ret;
-
-		// Encode the Stream Footer into coder->buffer.
-		const lzma_stream_flags stream_flags = {
-			.version = 0,
-			.backward_size = lzma_index_size(coder->index),
-			.check = coder->block_options.check,
-		};
-
-		if (lzma_stream_footer_encode(&stream_flags, coder->buffer)
-				!= LZMA_OK)
-			return LZMA_PROG_ERROR;
-
-		coder->buffer_size = LZMA_STREAM_HEADER_SIZE;
-		coder->sequence = SEQ_STREAM_FOOTER;
-		break;
-	}
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-	return LZMA_OK;
-}
-
-
-static void
-stream_encoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->block_encoder, allocator);
-	lzma_next_end(&coder->index_encoder, allocator);
-	lzma_index_end(coder->index, allocator);
-
-	for (size_t i = 0; coder->filters[i].id != LZMA_VLI_UNKNOWN; ++i)
-		lzma_free(coder->filters[i].options, allocator);
-
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-stream_encoder_update(lzma_coder *coder, lzma_allocator *allocator,
-		const lzma_filter *filters,
-		const lzma_filter *reversed_filters)
-{
-	if (coder->sequence <= SEQ_BLOCK_INIT) {
-		// There is no incomplete Block waiting to be finished,
-		// thus we can change the whole filter chain. Start by
-		// trying to initialize the Block encoder with the new
-		// chain. This way we detect if the chain is valid.
-		coder->block_encoder_is_initialized = false;
-		coder->block_options.filters = (lzma_filter *)(filters);
-		const lzma_ret ret = block_encoder_init(coder, allocator);
-		coder->block_options.filters = coder->filters;
-		if (ret != LZMA_OK)
-			return ret;
-
-		coder->block_encoder_is_initialized = true;
-
-	} else if (coder->sequence <= SEQ_BLOCK_ENCODE) {
-		// We are in the middle of a Block. Try to update only
-		// the filter-specific options.
-		return_if_error(coder->block_encoder.update(
-				coder->block_encoder.coder, allocator,
-				filters, reversed_filters));
-	} else {
-		// Trying to update the filter chain when we are already
-		// encoding Index or Stream Footer.
-		return LZMA_PROG_ERROR;
-	}
-
-	// Free the copy of the old chain and make a copy of the new chain.
-	for (size_t i = 0; coder->filters[i].id != LZMA_VLI_UNKNOWN; ++i)
-		lzma_free(coder->filters[i].options, allocator);
-
-	return lzma_filters_copy(filters, coder->filters, allocator);
-}
-
-
-extern lzma_ret
-lzma_stream_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *filters, lzma_check check)
-{
-	lzma_next_coder_init(&lzma_stream_encoder_init, next, allocator);
-
-	if (filters == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &stream_encode;
-		next->end = &stream_encoder_end;
-		next->update = &stream_encoder_update;
-
-		next->coder->filters[0].id = LZMA_VLI_UNKNOWN;
-		next->coder->block_encoder = LZMA_NEXT_CODER_INIT;
-		next->coder->index_encoder = LZMA_NEXT_CODER_INIT;
-		next->coder->index = NULL;
-	}
-
-	// Basic initializations
-	next->coder->sequence = SEQ_STREAM_HEADER;
-	next->coder->block_options.version = 0;
-	next->coder->block_options.check = check;
-
-	// Initialize the Index
-	lzma_index_end(next->coder->index, allocator);
-	next->coder->index = lzma_index_init(allocator);
-	if (next->coder->index == NULL)
-		return LZMA_MEM_ERROR;
-
-	// Encode the Stream Header
-	lzma_stream_flags stream_flags = {
-		.version = 0,
-		.check = check,
-	};
-	return_if_error(lzma_stream_header_encode(
-			&stream_flags, next->coder->buffer));
-
-	next->coder->buffer_pos = 0;
-	next->coder->buffer_size = LZMA_STREAM_HEADER_SIZE;
-
-	// Initialize the Block encoder. This way we detect unsupported
-	// filter chains when initializing the Stream encoder instead of
-	// giving an error after Stream Header has already written out.
-	return stream_encoder_update(
-			next->coder, allocator, filters, NULL);
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_encoder(lzma_stream *strm,
-		const lzma_filter *filters, lzma_check check)
-{
-	lzma_next_strm_init(lzma_stream_encoder_init, strm, filters, check);
-
-	strm->internal->supported_actions[LZMA_RUN] = true;
-	strm->internal->supported_actions[LZMA_SYNC_FLUSH] = true;
-	strm->internal->supported_actions[LZMA_FULL_FLUSH] = true;
-	strm->internal->supported_actions[LZMA_FINISH] = true;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_encoder.h r-base-3.3.1/src/extra/xz/common/stream_encoder.h
--- r-base-3.2.3/src/extra/xz/common/stream_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_encoder.h
-/// \brief      Encodes .xz Streams
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_STREAM_ENCODER_H
-#define LZMA_STREAM_ENCODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_stream_encoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter *filters, lzma_check check);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_flags_common.c r-base-3.3.1/src/extra/xz/common/stream_flags_common.c
--- r-base-3.2.3/src/extra/xz/common/stream_flags_common.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_flags_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_flags_common.c
-/// \brief      Common stuff for Stream flags coders
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_flags_common.h"
-
-
-const uint8_t lzma_header_magic[6] = { 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00 };
-const uint8_t lzma_footer_magic[2] = { 0x59, 0x5A };
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_flags_compare(
-		const lzma_stream_flags *a, const lzma_stream_flags *b)
-{
-	// We can compare only version 0 structures.
-	if (a->version != 0 || b->version != 0)
-		return LZMA_OPTIONS_ERROR;
-
-	// Check type
-	if ((unsigned int)(a->check) > LZMA_CHECK_ID_MAX
-			|| (unsigned int)(b->check) > LZMA_CHECK_ID_MAX)
-		return LZMA_PROG_ERROR;
-
-	if (a->check != b->check)
-		return LZMA_DATA_ERROR;
-
-	// Backward Sizes are compared only if they are known in both.
-	if (a->backward_size != LZMA_VLI_UNKNOWN
-			&& b->backward_size != LZMA_VLI_UNKNOWN) {
-		if (!is_backward_size_valid(a) || !is_backward_size_valid(b))
-			return LZMA_PROG_ERROR;
-
-		if (a->backward_size != b->backward_size)
-			return LZMA_DATA_ERROR;
-	}
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_flags_common.h r-base-3.3.1/src/extra/xz/common/stream_flags_common.h
--- r-base-3.2.3/src/extra/xz/common/stream_flags_common.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_flags_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_flags_common.h
-/// \brief      Common stuff for Stream flags coders
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_STREAM_FLAGS_COMMON_H
-#define LZMA_STREAM_FLAGS_COMMON_H
-
-#include "common.h"
-
-/// Size of the Stream Flags field
-#define LZMA_STREAM_FLAGS_SIZE 2
-
-extern const uint8_t lzma_header_magic[6];
-extern const uint8_t lzma_footer_magic[2];
-
-
-static inline bool
-is_backward_size_valid(const lzma_stream_flags *options)
-{
-	return options->backward_size >= LZMA_BACKWARD_SIZE_MIN
-			&& options->backward_size <= LZMA_BACKWARD_SIZE_MAX
-			&& (options->backward_size & 3) == 0;
-}
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_flags_decoder.c r-base-3.3.1/src/extra/xz/common/stream_flags_decoder.c
--- r-base-3.2.3/src/extra/xz/common/stream_flags_decoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_flags_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_flags_decoder.c
-/// \brief      Decodes Stream Header and Stream Footer from .xz files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_flags_common.h"
-
-
-static bool
-stream_flags_decode(lzma_stream_flags *options, const uint8_t *in)
-{
-	// Reserved bits must be unset.
-	if (in[0] != 0x00 || (in[1] & 0xF0))
-		return true;
-
-	options->version = 0;
-	options->check = in[1] & 0x0F;
-
-	return false;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_header_decode(lzma_stream_flags *options, const uint8_t *in)
-{
-	// Magic
-	if (memcmp(in, lzma_header_magic, sizeof(lzma_header_magic)) != 0)
-		return LZMA_FORMAT_ERROR;
-
-	// Verify the CRC32 so we can distinguish between corrupt
-	// and unsupported files.
-	const uint32_t crc = lzma_crc32(in + sizeof(lzma_header_magic),
-			LZMA_STREAM_FLAGS_SIZE, 0);
-	if (crc != unaligned_read32le(in + sizeof(lzma_header_magic)
-			+ LZMA_STREAM_FLAGS_SIZE))
-		return LZMA_DATA_ERROR;
-
-	// Stream Flags
-	if (stream_flags_decode(options, in + sizeof(lzma_header_magic)))
-		return LZMA_OPTIONS_ERROR;
-
-	// Set Backward Size to indicate unknown value. That way
-	// lzma_stream_flags_compare() can be used to compare Stream Header
-	// and Stream Footer while keeping it useful also for comparing
-	// two Stream Footers.
-	options->backward_size = LZMA_VLI_UNKNOWN;
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_footer_decode(lzma_stream_flags *options, const uint8_t *in)
-{
-	// Magic
-	if (memcmp(in + sizeof(uint32_t) * 2 + LZMA_STREAM_FLAGS_SIZE,
-			lzma_footer_magic, sizeof(lzma_footer_magic)) != 0)
-		return LZMA_FORMAT_ERROR;
-
-	// CRC32
-	const uint32_t crc = lzma_crc32(in + sizeof(uint32_t),
-			sizeof(uint32_t) + LZMA_STREAM_FLAGS_SIZE, 0);
-	if (crc != unaligned_read32le(in))
-		return LZMA_DATA_ERROR;
-
-	// Stream Flags
-	if (stream_flags_decode(options, in + sizeof(uint32_t) * 2))
-		return LZMA_OPTIONS_ERROR;
-
-	// Backward Size
-	options->backward_size = unaligned_read32le(in + sizeof(uint32_t));
-	options->backward_size = (options->backward_size + 1) * 4;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/stream_flags_encoder.c r-base-3.3.1/src/extra/xz/common/stream_flags_encoder.c
--- r-base-3.2.3/src/extra/xz/common/stream_flags_encoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/stream_flags_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       stream_flags_encoder.c
-/// \brief      Encodes Stream Header and Stream Footer for .xz files
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "stream_flags_common.h"
-
-
-static bool
-stream_flags_encode(const lzma_stream_flags *options, uint8_t *out)
-{
-	if ((unsigned int)(options->check) > LZMA_CHECK_ID_MAX)
-		return true;
-
-	out[0] = 0x00;
-	out[1] = options->check;
-
-	return false;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_header_encode(const lzma_stream_flags *options, uint8_t *out)
-{
-	assert(sizeof(lzma_header_magic) + LZMA_STREAM_FLAGS_SIZE
-			+ 4 == LZMA_STREAM_HEADER_SIZE);
-
-	if (options->version != 0)
-		return LZMA_OPTIONS_ERROR;
-
-	// Magic
-	memcpy(out, lzma_header_magic, sizeof(lzma_header_magic));
-
-	// Stream Flags
-	if (stream_flags_encode(options, out + sizeof(lzma_header_magic)))
-		return LZMA_PROG_ERROR;
-
-	// CRC32 of the Stream Header
-	const uint32_t crc = lzma_crc32(out + sizeof(lzma_header_magic),
-			LZMA_STREAM_FLAGS_SIZE, 0);
-
-	unaligned_write32le(out + sizeof(lzma_header_magic)
-			+ LZMA_STREAM_FLAGS_SIZE, crc);
-
-	return LZMA_OK;
-}
-
-
-extern LZMA_API(lzma_ret)
-lzma_stream_footer_encode(const lzma_stream_flags *options, uint8_t *out)
-{
-	assert(2 * 4 + LZMA_STREAM_FLAGS_SIZE + sizeof(lzma_footer_magic)
-			== LZMA_STREAM_HEADER_SIZE);
-
-	if (options->version != 0)
-		return LZMA_OPTIONS_ERROR;
-
-	// Backward Size
-	if (!is_backward_size_valid(options))
-		return LZMA_PROG_ERROR;
-
-	unaligned_write32le(out + 4, options->backward_size / 4 - 1);
-
-	// Stream Flags
-	if (stream_flags_encode(options, out + 2 * 4))
-		return LZMA_PROG_ERROR;
-
-	// CRC32
-	const uint32_t crc = lzma_crc32(
-			out + 4, 4 + LZMA_STREAM_FLAGS_SIZE, 0);
-
-	unaligned_write32le(out, crc);
-
-	// Magic
-	memcpy(out + 2 * 4 + LZMA_STREAM_FLAGS_SIZE,
-			lzma_footer_magic, sizeof(lzma_footer_magic));
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/sysdefs.h r-base-3.3.1/src/extra/xz/common/sysdefs.h
--- r-base-3.2.3/src/extra/xz/common/sysdefs.h	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/sysdefs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,195 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       sysdefs.h
-/// \brief      Common includes, definitions, system-specific things etc.
-///
-/// This file is used also by the lzma command line tool, that's why this
-/// file is separate from common.h.
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_SYSDEFS_H
-#define LZMA_SYSDEFS_H
-
-//////////////
-// Includes //
-//////////////
-
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-// R change
-#include "local.h"
-// Get standard-compliant stdio functions under MinGW and MinGW-w64.
-//#ifdef __MINGW32__
-//#	define __USE_MINGW_ANSI_STDIO 1
-//#endif
-
-// size_t and NULL
-#include <stddef.h>
-
-#ifdef HAVE_INTTYPES_H
-#	include <inttypes.h>
-#endif
-
-// C99 says that inttypes.h always includes stdint.h, but some systems
-// don't do that, and require including stdint.h separately.
-#ifdef HAVE_STDINT_H
-#	include <stdint.h>
-#endif
-
-// Some pre-C99 systems have SIZE_MAX in limits.h instead of stdint.h. The
-// limits are also used to figure out some macros missing from pre-C99 systems.
-#ifdef HAVE_LIMITS_H
-#	include <limits.h>
-#endif
-
-// Be more compatible with systems that have non-conforming inttypes.h.
-// We assume that int is 32-bit and that long is either 32-bit or 64-bit.
-// Full Autoconf test could be more correct, but this should work well enough.
-// Note that this duplicates some code from lzma.h, but this is better since
-// we can work without inttypes.h thanks to Autoconf tests.
-#ifndef UINT32_C
-#	if UINT_MAX != 4294967295U
-#		error UINT32_C is not defined and unsigned int is not 32-bit.
-#	endif
-#	define UINT32_C(n) n ## U
-#endif
-#ifndef UINT32_MAX
-#	define UINT32_MAX UINT32_C(4294967295)
-#endif
-#ifndef PRIu32
-#	define PRIu32 "u"
-#endif
-#ifndef PRIx32
-#	define PRIx32 "x"
-#endif
-#ifndef PRIX32
-#	define PRIX32 "X"
-#endif
-
-#if ULONG_MAX == 4294967295UL
-#	ifndef UINT64_C
-#		define UINT64_C(n) n ## ULL
-#	endif
-#	ifndef PRIu64
-#		define PRIu64 "llu"
-#	endif
-#	ifndef PRIx64
-#		define PRIx64 "llx"
-#	endif
-#	ifndef PRIX64
-#		define PRIX64 "llX"
-#	endif
-#else
-#	ifndef UINT64_C
-#		define UINT64_C(n) n ## UL
-#	endif
-#	ifndef PRIu64
-#		define PRIu64 "lu"
-#	endif
-#	ifndef PRIx64
-#		define PRIx64 "lx"
-#	endif
-#	ifndef PRIX64
-#		define PRIX64 "lX"
-#	endif
-#endif
-#ifndef UINT64_MAX
-#	define UINT64_MAX UINT64_C(18446744073709551615)
-#endif
-
-// Incorrect(?) SIZE_MAX:
-//   - Interix headers typedef size_t to unsigned long,
-//     but a few lines later define SIZE_MAX to INT32_MAX.
-//   - SCO OpenServer (x86) headers typedef size_t to unsigned int
-//     but define SIZE_MAX to INT32_MAX.
-#if defined(__INTERIX) || defined(_SCO_DS)
-#	undef SIZE_MAX
-#endif
-
-// The code currently assumes that size_t is either 32-bit or 64-bit.
-#ifndef SIZE_MAX
-#	if SIZEOF_SIZE_T == 4
-#		define SIZE_MAX UINT32_MAX
-#	elif SIZEOF_SIZE_T == 8
-#		define SIZE_MAX UINT64_MAX
-#	else
-#		error size_t is not 32-bit or 64-bit
-#	endif
-#endif
-#if SIZE_MAX != UINT32_MAX && SIZE_MAX != UINT64_MAX
-#	error size_t is not 32-bit or 64-bit
-#endif
-
-#include <stdlib.h>
-#include <assert.h>
-
-// Pre-C99 systems lack stdbool.h. All the code in LZMA Utils must be written
-// so that it works with fake bool type, for example:
-//
-//    bool foo = (flags & 0x100) != 0;
-//    bool bar = !!(flags & 0x100);
-//
-// This works with the real C99 bool but breaks with fake bool:
-//
-//    bool baz = (flags & 0x100);
-//
-#ifdef HAVE_STDBOOL_H
-#	include <stdbool.h>
-#else
-#	if ! HAVE__BOOL
-/* _Bool gave problems on one Solaris system */
-typedef unsigned char _Bool8;
-#	endif
-#	define bool _Bool8
-#	define false 0
-#	define true 1
-#	define __bool_true_false_are_defined 1
-#endif
-
-// string.h should be enough but let's include strings.h and memory.h too if
-// they exists, since that shouldn't do any harm, but may improve portability.
-#ifdef HAVE_STRING_H
-#	include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#	include <strings.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#	include <memory.h>
-#endif
-
-
-////////////
-// Macros //
-////////////
-
-#undef memzero
-#define memzero(s, n) memset(s, 0, n)
-
-// NOTE: Avoid using MIN() and MAX(), because even conditionally defining
-// those macros can cause some portability trouble, since on some systems
-// the system headers insist defining their own versions.
-#define my_min(x, y) ((x) < (y) ? (x) : (y))
-#define my_max(x, y) ((x) > (y) ? (x) : (y))
-
-#ifndef ARRAY_SIZE
-#	define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
-#	define lzma_attr_alloc_size(x) __attribute__((__alloc_size__(x)))
-#else
-#	define lzma_attr_alloc_size(x)
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/tuklib_common.h r-base-3.3.1/src/extra/xz/common/tuklib_common.h
--- r-base-3.2.3/src/extra/xz/common/tuklib_common.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/tuklib_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       tuklib_common.h
-/// \brief      Common definitions for tuklib modules
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef TUKLIB_COMMON_H
-#define TUKLIB_COMMON_H
-
-// The config file may be replaced by a package-specific file.
-// It should include at least stddef.h, inttypes.h, and limits.h.
-#include "tuklib_config.h"
-
-// TUKLIB_SYMBOL_PREFIX is prefixed to all symbols exported by
-// the tuklib modules. If you use a tuklib module in a library,
-// you should use TUKLIB_SYMBOL_PREFIX to make sure that there
-// are no symbol conflicts in case someone links your library
-// into application that also uses the same tuklib module.
-#ifndef TUKLIB_SYMBOL_PREFIX
-#	define TUKLIB_SYMBOL_PREFIX
-#endif
-
-#define TUKLIB_CAT_X(a, b) a ## b
-#define TUKLIB_CAT(a, b) TUKLIB_CAT_X(a, b)
-
-#ifndef TUKLIB_SYMBOL
-#	define TUKLIB_SYMBOL(sym) TUKLIB_CAT(TUKLIB_SYMBOL_PREFIX, sym)
-#endif
-
-#ifndef TUKLIB_DECLS_BEGIN
-#	ifdef __cplusplus
-#		define TUKLIB_DECLS_BEGIN extern "C" {
-#	else
-#		define TUKLIB_DECLS_BEGIN
-#	endif
-#endif
-
-#ifndef TUKLIB_DECLS_END
-#	ifdef __cplusplus
-#		define TUKLIB_DECLS_END }
-#	else
-#		define TUKLIB_DECLS_END
-#	endif
-#endif
-
-#if defined(__GNUC__) && defined(__GNUC_MINOR__)
-#	define TUKLIB_GNUC_REQ(major, minor) \
-		((__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)) \
-			|| __GNUC__ > (major))
-#else
-#	define TUKLIB_GNUC_REQ(major, minor) 0
-#endif
-
-#if TUKLIB_GNUC_REQ(2, 5)
-#	define tuklib_attr_noreturn __attribute__((__noreturn__))
-#else
-#	define tuklib_attr_noreturn
-#endif
-
-#if (defined(_WIN32) && !defined(__CYGWIN__)) \
-		|| defined(__OS2__) || defined(__MSDOS__)
-#	define TUKLIB_DOSLIKE 1
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/tuklib_config.h r-base-3.3.1/src/extra/xz/common/tuklib_config.h
--- r-base-3.2.3/src/extra/xz/common/tuklib_config.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/tuklib_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#	include "sysdefs.h"
-#else
-#	include <stddef.h>
-#	include <inttypes.h>
-#	include <limits.h>
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/tuklib_integer.h r-base-3.3.1/src/extra/xz/common/tuklib_integer.h
--- r-base-3.2.3/src/extra/xz/common/tuklib_integer.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/tuklib_integer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,523 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       tuklib_integer.h
-/// \brief      Various integer and bit operations
-///
-/// This file provides macros or functions to do some basic integer and bit
-/// operations.
-///
-/// Endianness related integer operations (XX = 16, 32, or 64; Y = b or l):
-///   - Byte swapping: bswapXX(num)
-///   - Byte order conversions to/from native: convXXYe(num)
-///   - Aligned reads: readXXYe(ptr)
-///   - Aligned writes: writeXXYe(ptr, num)
-///   - Unaligned reads (16/32-bit only): unaligned_readXXYe(ptr)
-///   - Unaligned writes (16/32-bit only): unaligned_writeXXYe(ptr, num)
-///
-/// Since they can macros, the arguments should have no side effects since
-/// they may be evaluated more than once.
-///
-/// \todo       PowerPC and possibly some other architectures support
-///             byte swapping load and store instructions. This file
-///             doesn't take advantage of those instructions.
-///
-/// Bit scan operations for non-zero 32-bit integers:
-///   - Bit scan reverse (find highest non-zero bit): bsr32(num)
-///   - Count leading zeros: clz32(num)
-///   - Count trailing zeros: ctz32(num)
-///   - Bit scan forward (simply an alias for ctz32()): bsf32(num)
-///
-/// The above bit scan operations return 0-31. If num is zero,
-/// the result is undefined.
-//
-//  Authors:    Lasse Collin
-//              Joachim Henke
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef TUKLIB_INTEGER_H
-#define TUKLIB_INTEGER_H
-
-#include "tuklib_common.h"
-
-
-////////////////////////////////////////
-// Operating system specific features //
-////////////////////////////////////////
-
-#if defined(HAVE_BYTESWAP_H)
-	// glibc, uClibc, dietlibc
-#	include <byteswap.h>
-#	ifdef HAVE_BSWAP_16
-#		define bswap16(num) bswap_16(num)
-#	endif
-#	ifdef HAVE_BSWAP_32
-#		define bswap32(num) bswap_32(num)
-#	endif
-#	ifdef HAVE_BSWAP_64
-#		define bswap64(num) bswap_64(num)
-#	endif
-
-#elif defined(HAVE_SYS_ENDIAN_H)
-	// *BSDs and Darwin
-#	include <sys/endian.h>
-
-#elif defined(HAVE_SYS_BYTEORDER_H)
-	// Solaris
-#	include <sys/byteorder.h>
-#	ifdef BSWAP_16
-#		define bswap16(num) BSWAP_16(num)
-#	endif
-#	ifdef BSWAP_32
-#		define bswap32(num) BSWAP_32(num)
-#	endif
-#	ifdef BSWAP_64
-#		define bswap64(num) BSWAP_64(num)
-#	endif
-#	ifdef BE_16
-#		define conv16be(num) BE_16(num)
-#	endif
-#	ifdef BE_32
-#		define conv32be(num) BE_32(num)
-#	endif
-#	ifdef BE_64
-#		define conv64be(num) BE_64(num)
-#	endif
-#	ifdef LE_16
-#		define conv16le(num) LE_16(num)
-#	endif
-#	ifdef LE_32
-#		define conv32le(num) LE_32(num)
-#	endif
-#	ifdef LE_64
-#		define conv64le(num) LE_64(num)
-#	endif
-#endif
-
-
-///////////////////
-// Byte swapping //
-///////////////////
-
-#ifndef bswap16
-#	define bswap16(num) \
-		(((uint16_t)(num) << 8) | ((uint16_t)(num) >> 8))
-#endif
-
-#ifndef bswap32
-#	define bswap32(num) \
-		( (((uint32_t)(num) << 24)                       ) \
-		| (((uint32_t)(num) <<  8) & UINT32_C(0x00FF0000)) \
-		| (((uint32_t)(num) >>  8) & UINT32_C(0x0000FF00)) \
-		| (((uint32_t)(num) >> 24)                       ) )
-#endif
-
-#ifndef bswap64
-#	define bswap64(num) \
-		( (((uint64_t)(num) << 56)                               ) \
-		| (((uint64_t)(num) << 40) & UINT64_C(0x00FF000000000000)) \
-		| (((uint64_t)(num) << 24) & UINT64_C(0x0000FF0000000000)) \
-		| (((uint64_t)(num) <<  8) & UINT64_C(0x000000FF00000000)) \
-		| (((uint64_t)(num) >>  8) & UINT64_C(0x00000000FF000000)) \
-		| (((uint64_t)(num) >> 24) & UINT64_C(0x0000000000FF0000)) \
-		| (((uint64_t)(num) >> 40) & UINT64_C(0x000000000000FF00)) \
-		| (((uint64_t)(num) >> 56)                               ) )
-#endif
-
-// Define conversion macros using the basic byte swapping macros.
-#ifdef WORDS_BIGENDIAN
-#	ifndef conv16be
-#		define conv16be(num) ((uint16_t)(num))
-#	endif
-#	ifndef conv32be
-#		define conv32be(num) ((uint32_t)(num))
-#	endif
-#	ifndef conv64be
-#		define conv64be(num) ((uint64_t)(num))
-#	endif
-#	ifndef conv16le
-#		define conv16le(num) bswap16(num)
-#	endif
-#	ifndef conv32le
-#		define conv32le(num) bswap32(num)
-#	endif
-#	ifndef conv64le
-#		define conv64le(num) bswap64(num)
-#	endif
-#else
-#	ifndef conv16be
-#		define conv16be(num) bswap16(num)
-#	endif
-#	ifndef conv32be
-#		define conv32be(num) bswap32(num)
-#	endif
-#	ifndef conv64be
-#		define conv64be(num) bswap64(num)
-#	endif
-#	ifndef conv16le
-#		define conv16le(num) ((uint16_t)(num))
-#	endif
-#	ifndef conv32le
-#		define conv32le(num) ((uint32_t)(num))
-#	endif
-#	ifndef conv64le
-#		define conv64le(num) ((uint64_t)(num))
-#	endif
-#endif
-
-
-//////////////////////////////
-// Aligned reads and writes //
-//////////////////////////////
-
-static inline uint16_t
-read16be(const uint8_t *buf)
-{
-	uint16_t num = *(const uint16_t *)buf;
-	return conv16be(num);
-}
-
-
-static inline uint16_t
-read16le(const uint8_t *buf)
-{
-	uint16_t num = *(const uint16_t *)buf;
-	return conv16le(num);
-}
-
-
-static inline uint32_t
-read32be(const uint8_t *buf)
-{
-	uint32_t num = *(const uint32_t *)buf;
-	return conv32be(num);
-}
-
-
-static inline uint32_t
-read32le(const uint8_t *buf)
-{
-	uint32_t num = *(const uint32_t *)buf;
-	return conv32le(num);
-}
-
-
-static inline uint64_t
-read64be(const uint8_t *buf)
-{
-	uint64_t num = *(const uint64_t *)buf;
-	return conv64be(num);
-}
-
-
-static inline uint64_t
-read64le(const uint8_t *buf)
-{
-	uint64_t num = *(const uint64_t *)buf;
-	return conv64le(num);
-}
-
-
-// NOTE: Possible byte swapping must be done in a macro to allow GCC
-// to optimize byte swapping of constants when using glibc's or *BSD's
-// byte swapping macros. The actual write is done in an inline function
-// to make type checking of the buf pointer possible similarly to readXXYe()
-// functions.
-
-#define write16be(buf, num) write16ne((buf), conv16be(num))
-#define write16le(buf, num) write16ne((buf), conv16le(num))
-#define write32be(buf, num) write32ne((buf), conv32be(num))
-#define write32le(buf, num) write32ne((buf), conv32le(num))
-#define write64be(buf, num) write64ne((buf), conv64be(num))
-#define write64le(buf, num) write64ne((buf), conv64le(num))
-
-
-static inline void
-write16ne(uint8_t *buf, uint16_t num)
-{
-	*(uint16_t *)buf = num;
-	return;
-}
-
-
-static inline void
-write32ne(uint8_t *buf, uint32_t num)
-{
-	*(uint32_t *)buf = num;
-	return;
-}
-
-
-static inline void
-write64ne(uint8_t *buf, uint64_t num)
-{
-	*(uint64_t *)buf = num;
-	return;
-}
-
-
-////////////////////////////////
-// Unaligned reads and writes //
-////////////////////////////////
-
-// NOTE: TUKLIB_FAST_UNALIGNED_ACCESS indicates only support for 16-bit and
-// 32-bit unaligned integer loads and stores. It's possible that 64-bit
-// unaligned access doesn't work or is slower than byte-by-byte access.
-// Since unaligned 64-bit is probably not needed as often as 16-bit or
-// 32-bit, we simply don't support 64-bit unaligned access for now.
-#ifdef TUKLIB_FAST_UNALIGNED_ACCESS
-#	define unaligned_read16be read16be
-#	define unaligned_read16le read16le
-#	define unaligned_read32be read32be
-#	define unaligned_read32le read32le
-#	define unaligned_write16be write16be
-#	define unaligned_write16le write16le
-#	define unaligned_write32be write32be
-#	define unaligned_write32le write32le
-
-#else
-
-static inline uint16_t
-unaligned_read16be(const uint8_t *buf)
-{
-	uint16_t num = ((uint16_t)buf[0] << 8) | (uint16_t)buf[1];
-	return num;
-}
-
-
-static inline uint16_t
-unaligned_read16le(const uint8_t *buf)
-{
-	uint16_t num = ((uint16_t)buf[0]) | ((uint16_t)buf[1] << 8);
-	return num;
-}
-
-
-static inline uint32_t
-unaligned_read32be(const uint8_t *buf)
-{
-	uint32_t num = (uint32_t)buf[0] << 24;
-	num |= (uint32_t)buf[1] << 16;
-	num |= (uint32_t)buf[2] << 8;
-	num |= (uint32_t)buf[3];
-	return num;
-}
-
-
-static inline uint32_t
-unaligned_read32le(const uint8_t *buf)
-{
-	uint32_t num = (uint32_t)buf[0];
-	num |= (uint32_t)buf[1] << 8;
-	num |= (uint32_t)buf[2] << 16;
-	num |= (uint32_t)buf[3] << 24;
-	return num;
-}
-
-
-static inline void
-unaligned_write16be(uint8_t *buf, uint16_t num)
-{
-	buf[0] = num >> 8;
-	buf[1] = num;
-	return;
-}
-
-
-static inline void
-unaligned_write16le(uint8_t *buf, uint16_t num)
-{
-	buf[0] = num;
-	buf[1] = num >> 8;
-	return;
-}
-
-
-static inline void
-unaligned_write32be(uint8_t *buf, uint32_t num)
-{
-	buf[0] = num >> 24;
-	buf[1] = num >> 16;
-	buf[2] = num >> 8;
-	buf[3] = num;
-	return;
-}
-
-
-static inline void
-unaligned_write32le(uint8_t *buf, uint32_t num)
-{
-	buf[0] = num;
-	buf[1] = num >> 8;
-	buf[2] = num >> 16;
-	buf[3] = num >> 24;
-	return;
-}
-
-#endif
-
-
-static inline uint32_t
-bsr32(uint32_t n)
-{
-	// Check for ICC first, since it tends to define __GNUC__ too.
-#if defined(__INTEL_COMPILER)
-	return _bit_scan_reverse(n);
-
-#elif TUKLIB_GNUC_REQ(3, 4) && UINT_MAX == UINT32_MAX
-	// GCC >= 3.4 has __builtin_clz(), which gives good results on
-	// multiple architectures. On x86, __builtin_clz() ^ 31U becomes
-	// either plain BSR (so the XOR gets optimized away) or LZCNT and
-	// XOR (if -march indicates that SSE4a instructions are supported).
-	return __builtin_clz(n) ^ 31U;
-
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-	uint32_t i;
-	__asm__("bsrl %1, %0" : "=r" (i) : "rm" (n));
-	return i;
-
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-	// MSVC isn't supported by tuklib, but since this code exists,
-	// it doesn't hurt to have it here anyway.
-	uint32_t i;
-	_BitScanReverse((DWORD *)&i, n);
-	return i;
-
-#else
-	uint32_t i = 31;
-
-	if ((n & UINT32_C(0xFFFF0000)) == 0) {
-		n <<= 16;
-		i = 15;
-	}
-
-	if ((n & UINT32_C(0xFF000000)) == 0) {
-		n <<= 8;
-		i -= 8;
-	}
-
-	if ((n & UINT32_C(0xF0000000)) == 0) {
-		n <<= 4;
-		i -= 4;
-	}
-
-	if ((n & UINT32_C(0xC0000000)) == 0) {
-		n <<= 2;
-		i -= 2;
-	}
-
-	if ((n & UINT32_C(0x80000000)) == 0)
-		--i;
-
-	return i;
-#endif
-}
-
-
-static inline uint32_t
-clz32(uint32_t n)
-{
-#if defined(__INTEL_COMPILER)
-	return _bit_scan_reverse(n) ^ 31U;
-
-#elif TUKLIB_GNUC_REQ(3, 4) && UINT_MAX == UINT32_MAX
-	return __builtin_clz(n);
-
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-	uint32_t i;
-	__asm__("bsrl %1, %0\n\t"
-		"xorl $31, %0"
-		: "=r" (i) : "rm" (n));
-	return i;
-
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-	uint32_t i;
-	_BitScanReverse((DWORD *)&i, n);
-	return i ^ 31U;
-
-#else
-	uint32_t i = 0;
-
-	if ((n & UINT32_C(0xFFFF0000)) == 0) {
-		n <<= 16;
-		i = 16;
-	}
-
-	if ((n & UINT32_C(0xFF000000)) == 0) {
-		n <<= 8;
-		i += 8;
-	}
-
-	if ((n & UINT32_C(0xF0000000)) == 0) {
-		n <<= 4;
-		i += 4;
-	}
-
-	if ((n & UINT32_C(0xC0000000)) == 0) {
-		n <<= 2;
-		i += 2;
-	}
-
-	if ((n & UINT32_C(0x80000000)) == 0)
-		++i;
-
-	return i;
-#endif
-}
-
-
-static inline uint32_t
-ctz32(uint32_t n)
-{
-#if defined(__INTEL_COMPILER)
-	return _bit_scan_forward(n);
-
-#elif TUKLIB_GNUC_REQ(3, 4) && UINT_MAX >= UINT32_MAX
-	return __builtin_ctz(n);
-
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-	uint32_t i;
-	__asm__("bsfl %1, %0" : "=r" (i) : "rm" (n));
-	return i;
-
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-	uint32_t i;
-	_BitScanForward((DWORD *)&i, n);
-	return i;
-
-#else
-	uint32_t i = 0;
-
-	if ((n & UINT32_C(0x0000FFFF)) == 0) {
-		n >>= 16;
-		i = 16;
-	}
-
-	if ((n & UINT32_C(0x000000FF)) == 0) {
-		n >>= 8;
-		i += 8;
-	}
-
-	if ((n & UINT32_C(0x0000000F)) == 0) {
-		n >>= 4;
-		i += 4;
-	}
-
-	if ((n & UINT32_C(0x00000003)) == 0) {
-		n >>= 2;
-		i += 2;
-	}
-
-	if ((n & UINT32_C(0x00000001)) == 0)
-		++i;
-
-	return i;
-#endif
-}
-
-#define bsf32 ctz32
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/common/vli_decoder.c r-base-3.3.1/src/extra/xz/common/vli_decoder.c
--- r-base-3.2.3/src/extra/xz/common/vli_decoder.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/vli_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       vli_decoder.c
-/// \brief      Decodes variable-length integers
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_vli_decode(lzma_vli *restrict vli, size_t *vli_pos,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size)
-{
-	// If we haven't been given vli_pos, work in single-call mode.
-	size_t vli_pos_internal = 0;
-	if (vli_pos == NULL) {
-		vli_pos = &vli_pos_internal;
-		*vli = 0;
-
-		// If there's no input, use LZMA_DATA_ERROR. This way it is
-		// easy to decode VLIs from buffers that have known size,
-		// and get the correct error code in case the buffer is
-		// too short.
-		if (*in_pos >= in_size)
-			return LZMA_DATA_ERROR;
-
-	} else {
-		// Initialize *vli when starting to decode a new integer.
-		if (*vli_pos == 0)
-			*vli = 0;
-
-		// Validate the arguments.
-		if (*vli_pos >= LZMA_VLI_BYTES_MAX
-				|| (*vli >> (*vli_pos * 7)) != 0)
-			return LZMA_PROG_ERROR;;
-
-		if (*in_pos >= in_size)
-			return LZMA_BUF_ERROR;
-	}
-
-	do {
-		// Read the next byte. Use a temporary variable so that we
-		// can update *in_pos immediately.
-		const uint8_t byte = in[*in_pos];
-		++*in_pos;
-
-		// Add the newly read byte to *vli.
-		*vli += (lzma_vli)(byte & 0x7F) << (*vli_pos * 7);
-		++*vli_pos;
-
-		// Check if this is the last byte of a multibyte integer.
-		if ((byte & 0x80) == 0) {
-			// We don't allow using variable-length integers as
-			// padding i.e. the encoding must use the most the
-			// compact form.
-			if (byte == 0x00 && *vli_pos > 1)
-				return LZMA_DATA_ERROR;
-
-			return vli_pos == &vli_pos_internal
-					? LZMA_OK : LZMA_STREAM_END;
-		}
-
-		// There is at least one more byte coming. If we have already
-		// read maximum number of bytes, the integer is considered
-		// corrupt.
-		//
-		// If we need bigger integers in future, old versions liblzma
-		// will confusingly indicate the file being corrupt istead of
-		// unsupported. I suppose it's still better this way, because
-		// in the foreseeable future (writing this in 2008) the only
-		// reason why files would appear having over 63-bit integers
-		// is that the files are simply corrupt.
-		if (*vli_pos == LZMA_VLI_BYTES_MAX)
-			return LZMA_DATA_ERROR;
-
-	} while (*in_pos < in_size);
-
-	return vli_pos == &vli_pos_internal ? LZMA_DATA_ERROR : LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/vli_encoder.c r-base-3.3.1/src/extra/xz/common/vli_encoder.c
--- r-base-3.2.3/src/extra/xz/common/vli_encoder.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/vli_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       vli_encoder.c
-/// \brief      Encodes variable-length integers
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-extern LZMA_API(lzma_ret)
-lzma_vli_encode(lzma_vli vli, size_t *vli_pos,
-		uint8_t *restrict out, size_t *restrict out_pos,
-		size_t out_size)
-{
-	// If we haven't been given vli_pos, work in single-call mode.
-	size_t vli_pos_internal = 0;
-	if (vli_pos == NULL) {
-		vli_pos = &vli_pos_internal;
-
-		// In single-call mode, we expect that the caller has
-		// reserved enough output space.
-		if (*out_pos >= out_size)
-			return LZMA_PROG_ERROR;
-	} else {
-		// This never happens when we are called by liblzma, but
-		// may happen if called directly from an application.
-		if (*out_pos >= out_size)
-			return LZMA_BUF_ERROR;
-	}
-
-	// Validate the arguments.
-	if (*vli_pos >= LZMA_VLI_BYTES_MAX || vli > LZMA_VLI_MAX)
-		return LZMA_PROG_ERROR;
-
-	// Shift vli so that the next bits to encode are the lowest. In
-	// single-call mode this never changes vli since *vli_pos is zero.
-	vli >>= *vli_pos * 7;
-
-	// Write the non-last bytes in a loop.
-	while (vli >= 0x80) {
-		// We don't need *vli_pos during this function call anymore,
-		// but update it here so that it is ready if we need to
-		// return before the whole integer has been decoded.
-		++*vli_pos;
-		assert(*vli_pos < LZMA_VLI_BYTES_MAX);
-
-		// Write the next byte.
-		out[*out_pos] = (uint8_t)(vli) | 0x80;
-		vli >>= 7;
-
-		if (++*out_pos == out_size)
-			return vli_pos == &vli_pos_internal
-					? LZMA_PROG_ERROR : LZMA_OK;
-	}
-
-	// Write the last byte.
-	out[*out_pos] = (uint8_t)(vli);
-	++*out_pos;
-	++*vli_pos;
-
-	return vli_pos == &vli_pos_internal ? LZMA_OK : LZMA_STREAM_END;
-
-}
diff -Nru r-base-3.2.3/src/extra/xz/common/vli_size.c r-base-3.3.1/src/extra/xz/common/vli_size.c
--- r-base-3.2.3/src/extra/xz/common/vli_size.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/common/vli_size.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       vli_size.c
-/// \brief      Calculates the encoded size of a variable-length integer
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-extern LZMA_API(uint32_t)
-lzma_vli_size(lzma_vli vli)
-{
-	if (vli > LZMA_VLI_MAX)
-		return 0;
-
-	uint32_t i = 0;
-	do {
-		vli >>= 7;
-		++i;
-	} while (vli != 0);
-
-	assert(i <= LZMA_VLI_BYTES_MAX);
-	return i;
-}
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_common.c r-base-3.3.1/src/extra/xz/delta/delta_common.c
--- r-base-3.2.3/src/extra/xz/delta/delta_common.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_common.c
-/// \brief      Common stuff for Delta encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "delta_common.h"
-#include "delta_private.h"
-
-
-static void
-delta_coder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-extern lzma_ret
-lzma_delta_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	// Allocate memory for the decoder if needed.
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		// End function is the same for encoder and decoder.
-		next->end = &delta_coder_end;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	// Validate the options.
-	if (lzma_delta_coder_memusage(filters[0].options) == UINT64_MAX)
-		return LZMA_OPTIONS_ERROR;
-
-	// Set the delta distance.
-	const lzma_options_delta *opt = filters[0].options;
-	next->coder->distance = opt->dist;
-
-	// Initialize the rest of the variables.
-	next->coder->pos = 0;
-	memzero(next->coder->history, LZMA_DELTA_DIST_MAX);
-
-	// Initialize the next decoder in the chain, if any.
-	return lzma_next_filter_init(&next->coder->next,
-			allocator, filters + 1);
-}
-
-
-extern uint64_t
-lzma_delta_coder_memusage(const void *options)
-{
-	const lzma_options_delta *opt = options;
-
-	if (opt == NULL || opt->type != LZMA_DELTA_TYPE_BYTE
-			|| opt->dist < LZMA_DELTA_DIST_MIN
-			|| opt->dist > LZMA_DELTA_DIST_MAX)
-		return UINT64_MAX;
-
-	return sizeof(lzma_coder);
-}
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_common.h r-base-3.3.1/src/extra/xz/delta/delta_common.h
--- r-base-3.2.3/src/extra/xz/delta/delta_common.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_common.h
-/// \brief      Common stuff for Delta encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_DELTA_COMMON_H
-#define LZMA_DELTA_COMMON_H
-
-#include "common.h"
-
-extern uint64_t lzma_delta_coder_memusage(const void *options);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_decoder.c r-base-3.3.1/src/extra/xz/delta/delta_decoder.c
--- r-base-3.2.3/src/extra/xz/delta/delta_decoder.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_decoder.c
-/// \brief      Delta filter decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "delta_decoder.h"
-#include "delta_private.h"
-
-
-static void
-decode_buffer(lzma_coder *coder, uint8_t *buffer, size_t size)
-{
-	const size_t distance = coder->distance;
-
-	for (size_t i = 0; i < size; ++i) {
-		buffer[i] += coder->history[(distance + coder->pos) & 0xFF];
-		coder->history[coder->pos-- & 0xFF] = buffer[i];
-	}
-}
-
-
-static lzma_ret
-delta_decode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	assert(coder->next.code != NULL);
-
-	const size_t out_start = *out_pos;
-
-	const lzma_ret ret = coder->next.code(coder->next.coder, allocator,
-			in, in_pos, in_size, out, out_pos, out_size,
-			action);
-
-	decode_buffer(coder, out + out_start, *out_pos - out_start);
-
-	return ret;
-}
-
-
-extern lzma_ret
-lzma_delta_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	next->code = &delta_decode;
-	return lzma_delta_coder_init(next, allocator, filters);
-}
-
-
-extern lzma_ret
-lzma_delta_props_decode(void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size)
-{
-	if (props_size != 1)
-		return LZMA_OPTIONS_ERROR;
-
-	lzma_options_delta *opt
-			= lzma_alloc(sizeof(lzma_options_delta), allocator);
-	if (opt == NULL)
-		return LZMA_MEM_ERROR;
-
-	opt->type = LZMA_DELTA_TYPE_BYTE;
-	opt->dist = props[0] + 1;
-
-	*options = opt;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_decoder.h r-base-3.3.1/src/extra/xz/delta/delta_decoder.h
--- r-base-3.2.3/src/extra/xz/delta/delta_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_decoder.h
-/// \brief      Delta filter decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_DELTA_DECODER_H
-#define LZMA_DELTA_DECODER_H
-
-#include "delta_common.h"
-
-extern lzma_ret lzma_delta_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_delta_props_decode(
-		void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_encoder.c r-base-3.3.1/src/extra/xz/delta/delta_encoder.c
--- r-base-3.2.3/src/extra/xz/delta/delta_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_encoder.c
-/// \brief      Delta filter encoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "delta_encoder.h"
-#include "delta_private.h"
-
-
-/// Copies and encodes the data at the same time. This is used when Delta
-/// is the first filter in the chain (and thus the last filter in the
-/// encoder's filter stack).
-static void
-copy_and_encode(lzma_coder *coder,
-		const uint8_t *restrict in, uint8_t *restrict out, size_t size)
-{
-	const size_t distance = coder->distance;
-
-	for (size_t i = 0; i < size; ++i) {
-		const uint8_t tmp = coder->history[
-				(distance + coder->pos) & 0xFF];
-		coder->history[coder->pos-- & 0xFF] = in[i];
-		out[i] = in[i] - tmp;
-	}
-}
-
-
-/// Encodes the data in place. This is used when we are the last filter
-/// in the chain (and thus non-last filter in the encoder's filter stack).
-static void
-encode_in_place(lzma_coder *coder, uint8_t *buffer, size_t size)
-{
-	const size_t distance = coder->distance;
-
-	for (size_t i = 0; i < size; ++i) {
-		const uint8_t tmp = coder->history[
-				(distance + coder->pos) & 0xFF];
-		coder->history[coder->pos-- & 0xFF] = buffer[i];
-		buffer[i] -= tmp;
-	}
-}
-
-
-static lzma_ret
-delta_encode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	lzma_ret ret;
-
-	if (coder->next.code == NULL) {
-		const size_t in_avail = in_size - *in_pos;
-		const size_t out_avail = out_size - *out_pos;
-		const size_t size = my_min(in_avail, out_avail);
-
-		copy_and_encode(coder, in + *in_pos, out + *out_pos, size);
-
-		*in_pos += size;
-		*out_pos += size;
-
-		ret = action != LZMA_RUN && *in_pos == in_size
-				? LZMA_STREAM_END : LZMA_OK;
-
-	} else {
-		const size_t out_start = *out_pos;
-
-		ret = coder->next.code(coder->next.coder, allocator,
-				in, in_pos, in_size, out, out_pos, out_size,
-				action);
-
-		encode_in_place(coder, out + out_start, *out_pos - out_start);
-	}
-
-	return ret;
-}
-
-
-static lzma_ret
-delta_encoder_update(lzma_coder *coder, lzma_allocator *allocator,
-		const lzma_filter *filters_null lzma_attribute((__unused__)),
-		const lzma_filter *reversed_filters)
-{
-	// Delta doesn't and will never support changing the options in
-	// the middle of encoding. If the app tries to change them, we
-	// simply ignore them.
-	return lzma_next_filter_update(
-			&coder->next, allocator, reversed_filters + 1);
-}
-
-
-extern lzma_ret
-lzma_delta_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	next->code = &delta_encode;
-	next->update = &delta_encoder_update;
-	return lzma_delta_coder_init(next, allocator, filters);
-}
-
-
-extern lzma_ret
-lzma_delta_props_encode(const void *options, uint8_t *out)
-{
-	// The caller must have already validated the options, so it's
-	// LZMA_PROG_ERROR if they are invalid.
-	if (lzma_delta_coder_memusage(options) == UINT64_MAX)
-		return LZMA_PROG_ERROR;
-
-	const lzma_options_delta *opt = options;
-	out[0] = opt->dist - LZMA_DELTA_DIST_MIN;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_encoder.h r-base-3.3.1/src/extra/xz/delta/delta_encoder.h
--- r-base-3.2.3/src/extra/xz/delta/delta_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_encoder.h
-/// \brief      Delta filter encoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_DELTA_ENCODER_H
-#define LZMA_DELTA_ENCODER_H
-
-#include "delta_common.h"
-
-extern lzma_ret lzma_delta_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_delta_props_encode(const void *options, uint8_t *out);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/delta/delta_private.h r-base-3.3.1/src/extra/xz/delta/delta_private.h
--- r-base-3.2.3/src/extra/xz/delta/delta_private.h	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/delta/delta_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       delta_private.h
-/// \brief      Private common stuff for Delta encoder and decoder
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_DELTA_PRIVATE_H
-#define LZMA_DELTA_PRIVATE_H
-
-#include "delta_common.h"
-
-struct lzma_coder_s {
-	/// Next coder in the chain
-	lzma_next_coder next;
-
-	/// Delta distance
-	size_t distance;
-
-	/// Position in history[]
-	uint8_t pos;
-
-	/// Buffer to hold history of the original data
-	uint8_t history[LZMA_DELTA_DIST_MAX];
-};
-
-
-extern lzma_ret lzma_delta_coder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_decoder.c r-base-3.3.1/src/extra/xz/lz/lz_decoder.c
--- r-base-3.2.3/src/extra/xz/lz/lz_decoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lz_decoder.c
-/// \brief      LZ out window
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-// liblzma supports multiple LZ77-based filters. The LZ part is shared
-// between these filters. The LZ code takes care of dictionary handling
-// and passing the data between filters in the chain. The filter-specific
-// part decodes from the input buffer to the dictionary.
-
-
-#include "lz_decoder.h"
-
-
-struct lzma_coder_s {
-	/// Dictionary (history buffer)
-	lzma_dict dict;
-
-	/// The actual LZ-based decoder e.g. LZMA
-	lzma_lz_decoder lz;
-
-	/// Next filter in the chain, if any. Note that LZMA and LZMA2 are
-	/// only allowed as the last filter, but the long-range filter in
-	/// future can be in the middle of the chain.
-	lzma_next_coder next;
-
-	/// True if the next filter in the chain has returned LZMA_STREAM_END.
-	bool next_finished;
-
-	/// True if the LZ decoder (e.g. LZMA) has detected end of payload
-	/// marker. This may become true before next_finished becomes true.
-	bool this_finished;
-
-	/// Temporary buffer needed when the LZ-based filter is not the last
-	/// filter in the chain. The output of the next filter is first
-	/// decoded into buffer[], which is then used as input for the actual
-	/// LZ-based decoder.
-	struct {
-		size_t pos;
-		size_t size;
-		uint8_t buffer[LZMA_BUFFER_SIZE];
-	} temp;
-};
-
-
-static void
-lz_decoder_reset(lzma_coder *coder)
-{
-	coder->dict.pos = 0;
-	coder->dict.full = 0;
-	coder->dict.buf[coder->dict.size - 1] = '\0';
-	coder->dict.need_reset = false;
-	return;
-}
-
-
-static lzma_ret
-decode_buffer(lzma_coder *coder,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size)
-{
-	while (true) {
-		// Wrap the dictionary if needed.
-		if (coder->dict.pos == coder->dict.size)
-			coder->dict.pos = 0;
-
-		// Store the current dictionary position. It is needed to know
-		// where to start copying to the out[] buffer.
-		const size_t dict_start = coder->dict.pos;
-
-		// Calculate how much we allow coder->lz.code() to decode.
-		// It must not decode past the end of the dictionary
-		// buffer, and we don't want it to decode more than is
-		// actually needed to fill the out[] buffer.
-		coder->dict.limit = coder->dict.pos
-				+ my_min(out_size - *out_pos,
-					coder->dict.size - coder->dict.pos);
-
-		// Call the coder->lz.code() to do the actual decoding.
-		const lzma_ret ret = coder->lz.code(
-				coder->lz.coder, &coder->dict,
-				in, in_pos, in_size);
-
-		// Copy the decoded data from the dictionary to the out[]
-		// buffer.
-		const size_t copy_size = coder->dict.pos - dict_start;
-		assert(copy_size <= out_size - *out_pos);
-		memcpy(out + *out_pos, coder->dict.buf + dict_start,
-				copy_size);
-		*out_pos += copy_size;
-
-		// Reset the dictionary if so requested by coder->lz.code().
-		if (coder->dict.need_reset) {
-			lz_decoder_reset(coder);
-
-			// Since we reset dictionary, we don't check if
-			// dictionary became full.
-			if (ret != LZMA_OK || *out_pos == out_size)
-				return ret;
-		} else {
-			// Return if everything got decoded or an error
-			// occurred, or if there's no more data to decode.
-			//
-			// Note that detecting if there's something to decode
-			// is done by looking if dictionary become full
-			// instead of looking if *in_pos == in_size. This
-			// is because it is possible that all the input was
-			// consumed already but some data is pending to be
-			// written to the dictionary.
-			if (ret != LZMA_OK || *out_pos == out_size
-					|| coder->dict.pos < coder->dict.size)
-				return ret;
-		}
-	}
-}
-
-
-static lzma_ret
-lz_decode(lzma_coder *coder,
-		lzma_allocator *allocator lzma_attribute((__unused__)),
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size,
-		lzma_action action)
-{
-	if (coder->next.code == NULL)
-		return decode_buffer(coder, in, in_pos, in_size,
-				out, out_pos, out_size);
-
-	// We aren't the last coder in the chain, we need to decode
-	// our input to a temporary buffer.
-	while (*out_pos < out_size) {
-		// Fill the temporary buffer if it is empty.
-		if (!coder->next_finished
-				&& coder->temp.pos == coder->temp.size) {
-			coder->temp.pos = 0;
-			coder->temp.size = 0;
-
-			const lzma_ret ret = coder->next.code(
-					coder->next.coder,
-					allocator, in, in_pos, in_size,
-					coder->temp.buffer, &coder->temp.size,
-					LZMA_BUFFER_SIZE, action);
-
-			if (ret == LZMA_STREAM_END)
-				coder->next_finished = true;
-			else if (ret != LZMA_OK || coder->temp.size == 0)
-				return ret;
-		}
-
-		if (coder->this_finished) {
-			if (coder->temp.size != 0)
-				return LZMA_DATA_ERROR;
-
-			if (coder->next_finished)
-				return LZMA_STREAM_END;
-
-			return LZMA_OK;
-		}
-
-		const lzma_ret ret = decode_buffer(coder, coder->temp.buffer,
-				&coder->temp.pos, coder->temp.size,
-				out, out_pos, out_size);
-
-		if (ret == LZMA_STREAM_END)
-			coder->this_finished = true;
-		else if (ret != LZMA_OK)
-			return ret;
-		else if (coder->next_finished && *out_pos < out_size)
-			return LZMA_DATA_ERROR;
-	}
-
-	return LZMA_OK;
-}
-
-
-static void
-lz_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder->dict.buf, allocator);
-
-	if (coder->lz.end != NULL)
-		coder->lz.end(coder->lz.coder, allocator);
-	else
-		lzma_free(coder->lz.coder, allocator);
-
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-extern lzma_ret
-lzma_lz_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters,
-		lzma_ret (*lz_init)(lzma_lz_decoder *lz,
-			lzma_allocator *allocator, const void *options,
-			lzma_lz_options *lz_options))
-{
-	// Allocate the base structure if it isn't already allocated.
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &lz_decode;
-		next->end = &lz_decoder_end;
-
-		next->coder->dict.buf = NULL;
-		next->coder->dict.size = 0;
-		next->coder->lz = LZMA_LZ_DECODER_INIT;
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	// Allocate and initialize the LZ-based decoder. It will also give
-	// us the dictionary size.
-	lzma_lz_options lz_options;
-	return_if_error(lz_init(&next->coder->lz, allocator,
-			filters[0].options, &lz_options));
-
-	// If the dictionary size is very small, increase it to 4096 bytes.
-	// This is to prevent constant wrapping of the dictionary, which
-	// would slow things down. The downside is that since we don't check
-	// separately for the real dictionary size, we may happily accept
-	// corrupt files.
-	if (lz_options.dict_size < 4096)
-		lz_options.dict_size = 4096;
-
-	// Make dictionary size a multipe of 16. Some LZ-based decoders like
-	// LZMA use the lowest bits lzma_dict.pos to know the alignment of the
-	// data. Aligned buffer is also good when memcpying from the
-	// dictionary to the output buffer, since applications are
-	// recommended to give aligned buffers to liblzma.
-	//
-	// Avoid integer overflow.
-	if (lz_options.dict_size > SIZE_MAX - 15)
-		return LZMA_MEM_ERROR;
-
-	lz_options.dict_size = (lz_options.dict_size + 15) & ~((size_t)(15));
-
-	// Allocate and initialize the dictionary.
-	if (next->coder->dict.size != lz_options.dict_size) {
-		lzma_free(next->coder->dict.buf, allocator);
-		next->coder->dict.buf
-				= lzma_alloc(lz_options.dict_size, allocator);
-		if (next->coder->dict.buf == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->coder->dict.size = lz_options.dict_size;
-	}
-
-	lz_decoder_reset(next->coder);
-
-	// Use the preset dictionary if it was given to us.
-	if (lz_options.preset_dict != NULL
-			&& lz_options.preset_dict_size > 0) {
-		// If the preset dictionary is bigger than the actual
-		// dictionary, copy only the tail.
-		const size_t copy_size = my_min(lz_options.preset_dict_size,
-				lz_options.dict_size);
-		const size_t offset = lz_options.preset_dict_size - copy_size;
-		memcpy(next->coder->dict.buf, lz_options.preset_dict + offset,
-				copy_size);
-		next->coder->dict.pos = copy_size;
-		next->coder->dict.full = copy_size;
-	}
-
-	// Miscellaneous initializations
-	next->coder->next_finished = false;
-	next->coder->this_finished = false;
-	next->coder->temp.pos = 0;
-	next->coder->temp.size = 0;
-
-	// Initialize the next filter in the chain, if any.
-	return lzma_next_filter_init(&next->coder->next, allocator,
-			filters + 1);
-}
-
-
-extern uint64_t
-lzma_lz_decoder_memusage(size_t dictionary_size)
-{
-	return sizeof(lzma_coder) + (uint64_t)(dictionary_size);
-}
-
-
-extern void
-lzma_lz_decoder_uncompressed(lzma_coder *coder, lzma_vli uncompressed_size)
-{
-	coder->lz.set_uncompressed(coder->lz.coder, uncompressed_size);
-}
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_decoder.h r-base-3.3.1/src/extra/xz/lz/lz_decoder.h
--- r-base-3.2.3/src/extra/xz/lz/lz_decoder.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lz_decoder.h
-/// \brief      LZ out window
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZ_DECODER_H
-#define LZMA_LZ_DECODER_H
-
-#include "common.h"
-
-
-typedef struct {
-	/// Pointer to the dictionary buffer. It can be an allocated buffer
-	/// internal to liblzma, or it can a be a buffer given by the
-	/// application when in single-call mode (not implemented yet).
-	uint8_t *buf;
-
-	/// Write position in dictionary. The next byte will be written to
-	/// buf[pos].
-	size_t pos;
-
-	/// Indicates how full the dictionary is. This is used by
-	/// dict_is_distance_valid() to detect corrupt files that would
-	/// read beyond the beginning of the dictionary.
-	size_t full;
-
-	/// Write limit
-	size_t limit;
-
-	/// Size of the dictionary
-	size_t size;
-
-	/// True when dictionary should be reset before decoding more data.
-	bool need_reset;
-
-} lzma_dict;
-
-
-typedef struct {
-	size_t dict_size;
-	const uint8_t *preset_dict;
-	size_t preset_dict_size;
-} lzma_lz_options;
-
-
-typedef struct {
-	/// Data specific to the LZ-based decoder
-	lzma_coder *coder;
-
-	/// Function to decode from in[] to *dict
-	lzma_ret (*code)(lzma_coder *restrict coder,
-			lzma_dict *restrict dict, const uint8_t *restrict in,
-			size_t *restrict in_pos, size_t in_size);
-
-	void (*reset)(lzma_coder *coder, const void *options);
-
-	/// Set the uncompressed size
-	void (*set_uncompressed)(lzma_coder *coder,
-			lzma_vli uncompressed_size);
-
-	/// Free allocated resources
-	void (*end)(lzma_coder *coder, lzma_allocator *allocator);
-
-} lzma_lz_decoder;
-
-
-#define LZMA_LZ_DECODER_INIT \
-	(lzma_lz_decoder){ \
-		.coder = NULL, \
-		.code = NULL, \
-		.reset = NULL, \
-		.set_uncompressed = NULL, \
-		.end = NULL, \
-	}
-
-
-extern lzma_ret lzma_lz_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters,
-		lzma_ret (*lz_init)(lzma_lz_decoder *lz,
-			lzma_allocator *allocator, const void *options,
-			lzma_lz_options *lz_options));
-
-extern uint64_t lzma_lz_decoder_memusage(size_t dictionary_size);
-
-extern void lzma_lz_decoder_uncompressed(
-		lzma_coder *coder, lzma_vli uncompressed_size);
-
-
-//////////////////////
-// Inline functions //
-//////////////////////
-
-/// Get a byte from the history buffer.
-static inline uint8_t
-dict_get(const lzma_dict *const dict, const uint32_t distance)
-{
-	return dict->buf[dict->pos - distance - 1
-			+ (distance < dict->pos ? 0 : dict->size)];
-}
-
-
-/// Test if dictionary is empty.
-static inline bool
-dict_is_empty(const lzma_dict *const dict)
-{
-	return dict->full == 0;
-}
-
-
-/// Validate the match distance
-static inline bool
-dict_is_distance_valid(const lzma_dict *const dict, const size_t distance)
-{
-	return dict->full > distance;
-}
-
-
-/// Repeat *len bytes at distance.
-static inline bool
-dict_repeat(lzma_dict *dict, uint32_t distance, uint32_t *len)
-{
-	// Don't write past the end of the dictionary.
-	const size_t dict_avail = dict->limit - dict->pos;
-	uint32_t left = my_min(dict_avail, *len);
-	*len -= left;
-
-	// Repeat a block of data from the history. Because memcpy() is faster
-	// than copying byte by byte in a loop, the copying process gets split
-	// into three cases.
-	if (distance < left) {
-		// Source and target areas overlap, thus we can't use
-		// memcpy() nor even memmove() safely.
-		do {
-			dict->buf[dict->pos] = dict_get(dict, distance);
-			++dict->pos;
-		} while (--left > 0);
-
-	} else if (distance < dict->pos) {
-		// The easiest and fastest case
-		memcpy(dict->buf + dict->pos,
-				dict->buf + dict->pos - distance - 1,
-				left);
-		dict->pos += left;
-
-	} else {
-		// The bigger the dictionary, the more rare this
-		// case occurs. We need to "wrap" the dict, thus
-		// we might need two memcpy() to copy all the data.
-		assert(dict->full == dict->size);
-		const uint32_t copy_pos
-				= dict->pos - distance - 1 + dict->size;
-		uint32_t copy_size = dict->size - copy_pos;
-
-		if (copy_size < left) {
-			memmove(dict->buf + dict->pos, dict->buf + copy_pos,
-					copy_size);
-			dict->pos += copy_size;
-			copy_size = left - copy_size;
-			memcpy(dict->buf + dict->pos, dict->buf, copy_size);
-			dict->pos += copy_size;
-		} else {
-			memmove(dict->buf + dict->pos, dict->buf + copy_pos,
-					left);
-			dict->pos += left;
-		}
-	}
-
-	// Update how full the dictionary is.
-	if (dict->full < dict->pos)
-		dict->full = dict->pos;
-
-	return unlikely(*len != 0);
-}
-
-
-/// Puts one byte into the dictionary. Returns true if the dictionary was
-/// already full and the byte couldn't be added.
-static inline bool
-dict_put(lzma_dict *dict, uint8_t byte)
-{
-	if (unlikely(dict->pos == dict->limit))
-		return true;
-
-	dict->buf[dict->pos++] = byte;
-
-	if (dict->pos > dict->full)
-		dict->full = dict->pos;
-
-	return false;
-}
-
-
-/// Copies arbitrary amount of data into the dictionary.
-static inline void
-dict_write(lzma_dict *restrict dict, const uint8_t *restrict in,
-		size_t *restrict in_pos, size_t in_size,
-		size_t *restrict left)
-{
-	// NOTE: If we are being given more data than the size of the
-	// dictionary, it could be possible to optimize the LZ decoder
-	// so that not everything needs to go through the dictionary.
-	// This shouldn't be very common thing in practice though, and
-	// the slowdown of one extra memcpy() isn't bad compared to how
-	// much time it would have taken if the data were compressed.
-
-	if (in_size - *in_pos > *left)
-		in_size = *in_pos + *left;
-
-	*left -= lzma_bufcpy(in, in_pos, in_size,
-			dict->buf, &dict->pos, dict->limit);
-
-	if (dict->pos > dict->full)
-		dict->full = dict->pos;
-
-	return;
-}
-
-
-static inline void
-dict_reset(lzma_dict *dict)
-{
-	dict->need_reset = true;
-	return;
-}
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_encoder.c r-base-3.3.1/src/extra/xz/lz/lz_encoder.c
--- r-base-3.2.3/src/extra/xz/lz/lz_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,583 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lz_encoder.c
-/// \brief      LZ in window
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lz_encoder.h"
-#include "lz_encoder_hash.h"
-
-// See lz_encoder_hash.h. This is a bit hackish but avoids making
-// endianness a conditional in makefiles.
-#if defined(WORDS_BIGENDIAN) && !defined(HAVE_SMALL)
-#	include "lz_encoder_hash_table.h"
-#endif
-
-
-struct lzma_coder_s {
-	/// LZ-based encoder e.g. LZMA
-	lzma_lz_encoder lz;
-
-	/// History buffer and match finder
-	lzma_mf mf;
-
-	/// Next coder in the chain
-	lzma_next_coder next;
-};
-
-
-/// \brief      Moves the data in the input window to free space for new data
-///
-/// mf->buffer is a sliding input window, which keeps mf->keep_size_before
-/// bytes of input history available all the time. Now and then we need to
-/// "slide" the buffer to make space for the new data to the end of the
-/// buffer. At the same time, data older than keep_size_before is dropped.
-///
-static void
-move_window(lzma_mf *mf)
-{
-	// Align the move to a multiple of 16 bytes. Some LZ-based encoders
-	// like LZMA use the lowest bits of mf->read_pos to know the
-	// alignment of the uncompressed data. We also get better speed
-	// for memmove() with aligned buffers.
-	assert(mf->read_pos > mf->keep_size_before);
-	const uint32_t move_offset
-		= (mf->read_pos - mf->keep_size_before) & ~UINT32_C(15);
-
-	assert(mf->write_pos > move_offset);
-	const size_t move_size = mf->write_pos - move_offset;
-
-	assert(move_offset + move_size <= mf->size);
-
-	memmove(mf->buffer, mf->buffer + move_offset, move_size);
-
-	mf->offset += move_offset;
-	mf->read_pos -= move_offset;
-	mf->read_limit -= move_offset;
-	mf->write_pos -= move_offset;
-
-	return;
-}
-
-
-/// \brief      Tries to fill the input window (mf->buffer)
-///
-/// If we are the last encoder in the chain, our input data is in in[].
-/// Otherwise we call the next filter in the chain to process in[] and
-/// write its output to mf->buffer.
-///
-/// This function must not be called once it has returned LZMA_STREAM_END.
-///
-static lzma_ret
-fill_window(lzma_coder *coder, lzma_allocator *allocator, const uint8_t *in,
-		size_t *in_pos, size_t in_size, lzma_action action)
-{
-	assert(coder->mf.read_pos <= coder->mf.write_pos);
-
-	// Move the sliding window if needed.
-	if (coder->mf.read_pos >= coder->mf.size - coder->mf.keep_size_after)
-		move_window(&coder->mf);
-
-	// Maybe this is ugly, but lzma_mf uses uint32_t for most things
-	// (which I find cleanest), but we need size_t here when filling
-	// the history window.
-	size_t write_pos = coder->mf.write_pos;
-	lzma_ret ret;
-	if (coder->next.code == NULL) {
-		// Not using a filter, simply memcpy() as much as possible.
-		lzma_bufcpy(in, in_pos, in_size, coder->mf.buffer,
-				&write_pos, coder->mf.size);
-
-		ret = action != LZMA_RUN && *in_pos == in_size
-				? LZMA_STREAM_END : LZMA_OK;
-
-	} else {
-		ret = coder->next.code(coder->next.coder, allocator,
-				in, in_pos, in_size,
-				coder->mf.buffer, &write_pos,
-				coder->mf.size, action);
-	}
-
-	coder->mf.write_pos = write_pos;
-
-	// If end of stream has been reached or flushing completed, we allow
-	// the encoder to process all the input (that is, read_pos is allowed
-	// to reach write_pos). Otherwise we keep keep_size_after bytes
-	// available as prebuffer.
-	if (ret == LZMA_STREAM_END) {
-		assert(*in_pos == in_size);
-		ret = LZMA_OK;
-		coder->mf.action = action;
-		coder->mf.read_limit = coder->mf.write_pos;
-
-	} else if (coder->mf.write_pos > coder->mf.keep_size_after) {
-		// This needs to be done conditionally, because if we got
-		// only little new input, there may be too little input
-		// to do any encoding yet.
-		coder->mf.read_limit = coder->mf.write_pos
-				- coder->mf.keep_size_after;
-	}
-
-	// Restart the match finder after finished LZMA_SYNC_FLUSH.
-	if (coder->mf.pending > 0
-			&& coder->mf.read_pos < coder->mf.read_limit) {
-		// Match finder may update coder->pending and expects it to
-		// start from zero, so use a temporary variable.
-		const size_t pending = coder->mf.pending;
-		coder->mf.pending = 0;
-
-		// Rewind read_pos so that the match finder can hash
-		// the pending bytes.
-		assert(coder->mf.read_pos >= pending);
-		coder->mf.read_pos -= pending;
-
-		// Call the skip function directly instead of using
-		// mf_skip(), since we don't want to touch mf->read_ahead.
-		coder->mf.skip(&coder->mf, pending);
-	}
-
-	return ret;
-}
-
-
-static lzma_ret
-lz_encode(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size,
-		uint8_t *restrict out, size_t *restrict out_pos,
-		size_t out_size, lzma_action action)
-{
-	while (*out_pos < out_size
-			&& (*in_pos < in_size || action != LZMA_RUN)) {
-		// Read more data to coder->mf.buffer if needed.
-		if (coder->mf.action == LZMA_RUN && coder->mf.read_pos
-				>= coder->mf.read_limit)
-			return_if_error(fill_window(coder, allocator,
-					in, in_pos, in_size, action));
-
-		// Encode
-		const lzma_ret ret = coder->lz.code(coder->lz.coder,
-				&coder->mf, out, out_pos, out_size);
-		if (ret != LZMA_OK) {
-			// Setting this to LZMA_RUN for cases when we are
-			// flushing. It doesn't matter when finishing or if
-			// an error occurred.
-			coder->mf.action = LZMA_RUN;
-			return ret;
-		}
-	}
-
-	return LZMA_OK;
-}
-
-
-static bool
-lz_encoder_prepare(lzma_mf *mf, lzma_allocator *allocator,
-		const lzma_lz_options *lz_options)
-{
-	// For now, the dictionary size is limited to 1.5 GiB. This may grow
-	// in the future if needed, but it needs a little more work than just
-	// changing this check.
-	if (lz_options->dict_size < LZMA_DICT_SIZE_MIN
-			|| lz_options->dict_size
-				> (UINT32_C(1) << 30) + (UINT32_C(1) << 29)
-			|| lz_options->nice_len > lz_options->match_len_max)
-		return true;
-
-	mf->keep_size_before = lz_options->before_size + lz_options->dict_size;
-
-	mf->keep_size_after = lz_options->after_size
-			+ lz_options->match_len_max;
-
-	// To avoid constant memmove()s, allocate some extra space. Since
-	// memmove()s become more expensive when the size of the buffer
-	// increases, we reserve more space when a large dictionary is
-	// used to make the memmove() calls rarer.
-	//
-	// This works with dictionaries up to about 3 GiB. If bigger
-	// dictionary is wanted, some extra work is needed:
-	//   - Several variables in lzma_mf have to be changed from uint32_t
-	//     to size_t.
-	//   - Memory usage calculation needs something too, e.g. use uint64_t
-	//     for mf->size.
-	uint32_t reserve = lz_options->dict_size / 2;
-	if (reserve > (UINT32_C(1) << 30))
-		reserve /= 2;
-
-	reserve += (lz_options->before_size + lz_options->match_len_max
-			+ lz_options->after_size) / 2 + (UINT32_C(1) << 19);
-
-	const uint32_t old_size = mf->size;
-	mf->size = mf->keep_size_before + reserve + mf->keep_size_after;
-
-	// Deallocate the old history buffer if it exists but has different
-	// size than what is needed now.
-	if (mf->buffer != NULL && old_size != mf->size) {
-		lzma_free(mf->buffer, allocator);
-		mf->buffer = NULL;
-	}
-
-	// Match finder options
-	mf->match_len_max = lz_options->match_len_max;
-	mf->nice_len = lz_options->nice_len;
-
-	// cyclic_size has to stay smaller than 2 Gi. Note that this doesn't
-	// mean limiting dictionary size to less than 2 GiB. With a match
-	// finder that uses multibyte resolution (hashes start at e.g. every
-	// fourth byte), cyclic_size would stay below 2 Gi even when
-	// dictionary size is greater than 2 GiB.
-	//
-	// It would be possible to allow cyclic_size >= 2 Gi, but then we
-	// would need to be careful to use 64-bit types in various places
-	// (size_t could do since we would need bigger than 32-bit address
-	// space anyway). It would also require either zeroing a multigigabyte
-	// buffer at initialization (waste of time and RAM) or allow
-	// normalization in lz_encoder_mf.c to access uninitialized
-	// memory to keep the code simpler. The current way is simple and
-	// still allows pretty big dictionaries, so I don't expect these
-	// limits to change.
-	mf->cyclic_size = lz_options->dict_size + 1;
-
-	// Validate the match finder ID and setup the function pointers.
-	switch (lz_options->match_finder) {
-#ifdef HAVE_MF_HC3
-	case LZMA_MF_HC3:
-		mf->find = &lzma_mf_hc3_find;
-		mf->skip = &lzma_mf_hc3_skip;
-		break;
-#endif
-#ifdef HAVE_MF_HC4
-	case LZMA_MF_HC4:
-		mf->find = &lzma_mf_hc4_find;
-		mf->skip = &lzma_mf_hc4_skip;
-		break;
-#endif
-#ifdef HAVE_MF_BT2
-	case LZMA_MF_BT2:
-		mf->find = &lzma_mf_bt2_find;
-		mf->skip = &lzma_mf_bt2_skip;
-		break;
-#endif
-#ifdef HAVE_MF_BT3
-	case LZMA_MF_BT3:
-		mf->find = &lzma_mf_bt3_find;
-		mf->skip = &lzma_mf_bt3_skip;
-		break;
-#endif
-#ifdef HAVE_MF_BT4
-	case LZMA_MF_BT4:
-		mf->find = &lzma_mf_bt4_find;
-		mf->skip = &lzma_mf_bt4_skip;
-		break;
-#endif
-
-	default:
-		return true;
-	}
-
-	// Calculate the sizes of mf->hash and mf->son and check that
-	// nice_len is big enough for the selected match finder.
-	const uint32_t hash_bytes = lz_options->match_finder & 0x0F;
-	if (hash_bytes > mf->nice_len)
-		return true;
-
-	const bool is_bt = (lz_options->match_finder & 0x10) != 0;
-	uint32_t hs;
-
-	if (hash_bytes == 2) {
-		hs = 0xFFFF;
-	} else {
-		// Round dictionary size up to the next 2^n - 1 so it can
-		// be used as a hash mask.
-		hs = lz_options->dict_size - 1;
-		hs |= hs >> 1;
-		hs |= hs >> 2;
-		hs |= hs >> 4;
-		hs |= hs >> 8;
-		hs >>= 1;
-		hs |= 0xFFFF;
-
-		if (hs > (UINT32_C(1) << 24)) {
-			if (hash_bytes == 3)
-				hs = (UINT32_C(1) << 24) - 1;
-			else
-				hs >>= 1;
-		}
-	}
-
-	mf->hash_mask = hs;
-
-	++hs;
-	if (hash_bytes > 2)
-		hs += HASH_2_SIZE;
-	if (hash_bytes > 3)
-		hs += HASH_3_SIZE;
-/*
-	No match finder uses this at the moment.
-	if (mf->hash_bytes > 4)
-		hs += HASH_4_SIZE;
-*/
-
-	// If the above code calculating hs is modified, make sure that
-	// this assertion stays valid (UINT32_MAX / 5 is not strictly the
-	// exact limit). If it doesn't, you need to calculate that
-	// hash_size_sum + sons_count cannot overflow.
-	assert(hs < UINT32_MAX / 5);
-
-	const uint32_t old_count = mf->hash_size_sum + mf->sons_count;
-	mf->hash_size_sum = hs;
-	mf->sons_count = mf->cyclic_size;
-	if (is_bt)
-		mf->sons_count *= 2;
-
-	const uint32_t new_count = mf->hash_size_sum + mf->sons_count;
-
-	// Deallocate the old hash array if it exists and has different size
-	// than what is needed now.
-	if (old_count != new_count) {
-		lzma_free(mf->hash, allocator);
-		mf->hash = NULL;
-	}
-
-	// Maximum number of match finder cycles
-	mf->depth = lz_options->depth;
-	if (mf->depth == 0) {
-		if (is_bt)
-			mf->depth = 16 + mf->nice_len / 2;
-		else
-			mf->depth = 4 + mf->nice_len / 4;
-	}
-
-	return false;
-}
-
-
-static bool
-lz_encoder_init(lzma_mf *mf, lzma_allocator *allocator,
-		const lzma_lz_options *lz_options)
-{
-	// Allocate the history buffer.
-	if (mf->buffer == NULL) {
-		mf->buffer = lzma_alloc(mf->size, allocator);
-		if (mf->buffer == NULL)
-			return true;
-	}
-
-	// Use cyclic_size as initial mf->offset. This allows
-	// avoiding a few branches in the match finders. The downside is
-	// that match finder needs to be normalized more often, which may
-	// hurt performance with huge dictionaries.
-	mf->offset = mf->cyclic_size;
-	mf->read_pos = 0;
-	mf->read_ahead = 0;
-	mf->read_limit = 0;
-	mf->write_pos = 0;
-	mf->pending = 0;
-
-	// Allocate match finder's hash array.
-	const size_t alloc_count = mf->hash_size_sum + mf->sons_count;
-
-#if UINT32_MAX >= SIZE_MAX / 4
-	// Check for integer overflow. (Huge dictionaries are not
-	// possible on 32-bit CPU.)
-	if (alloc_count > SIZE_MAX / sizeof(uint32_t))
-		return true;
-#endif
-
-	if (mf->hash == NULL) {
-		mf->hash = lzma_alloc(alloc_count * sizeof(uint32_t),
-				allocator);
-		if (mf->hash == NULL)
-			return true;
-	}
-
-	mf->son = mf->hash + mf->hash_size_sum;
-	mf->cyclic_pos = 0;
-
-	// Initialize the hash table. Since EMPTY_HASH_VALUE is zero, we
-	// can use memset().
-/*
-	for (uint32_t i = 0; i < hash_size_sum; ++i)
-		mf->hash[i] = EMPTY_HASH_VALUE;
-*/
-	memzero(mf->hash, (size_t)(mf->hash_size_sum) * sizeof(uint32_t));
-
-	// We don't need to initialize mf->son, but not doing that will
-	// make Valgrind complain in normalization (see normalize() in
-	// lz_encoder_mf.c).
-	//
-	// Skipping this initialization is *very* good when big dictionary is
-	// used but only small amount of data gets actually compressed: most
-	// of the mf->hash won't get actually allocated by the kernel, so
-	// we avoid wasting RAM and improve initialization speed a lot.
-	//memzero(mf->son, (size_t)(mf->sons_count) * sizeof(uint32_t));
-
-	// Handle preset dictionary.
-	if (lz_options->preset_dict != NULL
-			&& lz_options->preset_dict_size > 0) {
-		// If the preset dictionary is bigger than the actual
-		// dictionary, use only the tail.
-		mf->write_pos = my_min(lz_options->preset_dict_size, mf->size);
-		memcpy(mf->buffer, lz_options->preset_dict
-				+ lz_options->preset_dict_size - mf->write_pos,
-				mf->write_pos);
-		mf->action = LZMA_SYNC_FLUSH;
-		mf->skip(mf, mf->write_pos);
-	}
-
-	mf->action = LZMA_RUN;
-
-	return false;
-}
-
-
-extern uint64_t
-lzma_lz_encoder_memusage(const lzma_lz_options *lz_options)
-{
-	// Old buffers must not exist when calling lz_encoder_prepare().
-	lzma_mf mf = {
-		.buffer = NULL,
-		.hash = NULL,
-		.hash_size_sum = 0,
-		.sons_count = 0,
-	};
-
-	// Setup the size information into mf.
-	if (lz_encoder_prepare(&mf, NULL, lz_options))
-		return UINT64_MAX;
-
-	// Calculate the memory usage.
-	return (uint64_t)(mf.hash_size_sum + mf.sons_count)
-				* sizeof(uint32_t)
-			+ (uint64_t)(mf.size) + sizeof(lzma_coder);
-}
-
-
-static void
-lz_encoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-
-	lzma_free(coder->mf.hash, allocator);
-	lzma_free(coder->mf.buffer, allocator);
-
-	if (coder->lz.end != NULL)
-		coder->lz.end(coder->lz.coder, allocator);
-	else
-		lzma_free(coder->lz.coder, allocator);
-
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-lz_encoder_update(lzma_coder *coder, lzma_allocator *allocator,
-		const lzma_filter *filters_null lzma_attribute((__unused__)),
-		const lzma_filter *reversed_filters)
-{
-	if (coder->lz.options_update == NULL)
-		return LZMA_PROG_ERROR;
-
-	return_if_error(coder->lz.options_update(
-			coder->lz.coder, reversed_filters));
-
-	return lzma_next_filter_update(
-			&coder->next, allocator, reversed_filters + 1);
-}
-
-
-extern lzma_ret
-lzma_lz_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters,
-		lzma_ret (*lz_init)(lzma_lz_encoder *lz,
-			lzma_allocator *allocator, const void *options,
-			lzma_lz_options *lz_options))
-{
-#ifdef HAVE_SMALL
-	// We need that the CRC32 table has been initialized.
-	lzma_crc32_init();
-#endif
-
-	// Allocate and initialize the base data structure.
-	if (next->coder == NULL) {
-		next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &lz_encode;
-		next->end = &lz_encoder_end;
-		next->update = &lz_encoder_update;
-
-		next->coder->lz.coder = NULL;
-		next->coder->lz.code = NULL;
-		next->coder->lz.end = NULL;
-
-		next->coder->mf.buffer = NULL;
-		next->coder->mf.hash = NULL;
-		next->coder->mf.hash_size_sum = 0;
-		next->coder->mf.sons_count = 0;
-
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-	}
-
-	// Initialize the LZ-based encoder.
-	lzma_lz_options lz_options;
-	return_if_error(lz_init(&next->coder->lz, allocator,
-			filters[0].options, &lz_options));
-
-	// Setup the size information into next->coder->mf and deallocate
-	// old buffers if they have wrong size.
-	if (lz_encoder_prepare(&next->coder->mf, allocator, &lz_options))
-		return LZMA_OPTIONS_ERROR;
-
-	// Allocate new buffers if needed, and do the rest of
-	// the initialization.
-	if (lz_encoder_init(&next->coder->mf, allocator, &lz_options))
-		return LZMA_MEM_ERROR;
-
-	// Initialize the next filter in the chain, if any.
-	return lzma_next_filter_init(&next->coder->next, allocator,
-			filters + 1);
-}
-
-
-extern LZMA_API(lzma_bool)
-lzma_mf_is_supported(lzma_match_finder mf)
-{
-	bool ret = false;
-
-#ifdef HAVE_MF_HC3
-	if (mf == LZMA_MF_HC3)
-		ret = true;
-#endif
-
-#ifdef HAVE_MF_HC4
-	if (mf == LZMA_MF_HC4)
-		ret = true;
-#endif
-
-#ifdef HAVE_MF_BT2
-	if (mf == LZMA_MF_BT2)
-		ret = true;
-#endif
-
-#ifdef HAVE_MF_BT3
-	if (mf == LZMA_MF_BT3)
-		ret = true;
-#endif
-
-#ifdef HAVE_MF_BT4
-	if (mf == LZMA_MF_BT4)
-		ret = true;
-#endif
-
-	return ret;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_encoder.h r-base-3.3.1/src/extra/xz/lz/lz_encoder.h
--- r-base-3.2.3/src/extra/xz/lz/lz_encoder.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,328 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lz_encoder.h
-/// \brief      LZ in window and match finder API
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZ_ENCODER_H
-#define LZMA_LZ_ENCODER_H
-
-#include "common.h"
-
-
-/// A table of these is used by the LZ-based encoder to hold
-/// the length-distance pairs found by the match finder.
-typedef struct {
-	uint32_t len;
-	uint32_t dist;
-} lzma_match;
-
-
-typedef struct lzma_mf_s lzma_mf;
-struct lzma_mf_s {
-	///////////////
-	// In Window //
-	///////////////
-
-	/// Pointer to buffer with data to be compressed
-	uint8_t *buffer;
-
-	/// Total size of the allocated buffer (that is, including all
-	/// the extra space)
-	uint32_t size;
-
-	/// Number of bytes that must be kept available in our input history.
-	/// That is, once keep_size_before bytes have been processed,
-	/// buffer[read_pos - keep_size_before] is the oldest byte that
-	/// must be available for reading.
-	uint32_t keep_size_before;
-
-	/// Number of bytes that must be kept in buffer after read_pos.
-	/// That is, read_pos <= write_pos - keep_size_after as long as
-	/// action is LZMA_RUN; when action != LZMA_RUN, read_pos is allowed
-	/// to reach write_pos so that the last bytes get encoded too.
-	uint32_t keep_size_after;
-
-	/// Match finders store locations of matches using 32-bit integers.
-	/// To avoid adjusting several megabytes of integers every time the
-	/// input window is moved with move_window, we only adjust the
-	/// offset of the buffer. Thus, buffer[value_in_hash_table - offset]
-	/// is the byte pointed by value_in_hash_table.
-	uint32_t offset;
-
-	/// buffer[read_pos] is the next byte to run through the match
-	/// finder. This is incremented in the match finder once the byte
-	/// has been processed.
-	uint32_t read_pos;
-
-	/// Number of bytes that have been ran through the match finder, but
-	/// which haven't been encoded by the LZ-based encoder yet.
-	uint32_t read_ahead;
-
-	/// As long as read_pos is less than read_limit, there is enough
-	/// input available in buffer for at least one encoding loop.
-	///
-	/// Because of the stateful API, read_limit may and will get greater
-	/// than read_pos quite often. This is taken into account when
-	/// calculating the value for keep_size_after.
-	uint32_t read_limit;
-
-	/// buffer[write_pos] is the first byte that doesn't contain valid
-	/// uncompressed data; that is, the next input byte will be copied
-	/// to buffer[write_pos].
-	uint32_t write_pos;
-
-	/// Number of bytes not hashed before read_pos. This is needed to
-	/// restart the match finder after LZMA_SYNC_FLUSH.
-	uint32_t pending;
-
-	//////////////////
-	// Match Finder //
-	//////////////////
-
-	/// Find matches. Returns the number of distance-length pairs written
-	/// to the matches array. This is called only via lzma_mf_find().
-	uint32_t (*find)(lzma_mf *mf, lzma_match *matches);
-
-	/// Skips num bytes. This is like find() but doesn't make the
-	/// distance-length pairs available, thus being a little faster.
-	/// This is called only via mf_skip().
-	void (*skip)(lzma_mf *mf, uint32_t num);
-
-	uint32_t *hash;
-	uint32_t *son;
-	uint32_t cyclic_pos;
-	uint32_t cyclic_size; // Must be dictionary size + 1.
-	uint32_t hash_mask;
-
-	/// Maximum number of loops in the match finder
-	uint32_t depth;
-
-	/// Maximum length of a match that the match finder will try to find.
-	uint32_t nice_len;
-
-	/// Maximum length of a match supported by the LZ-based encoder.
-	/// If the longest match found by the match finder is nice_len,
-	/// mf_find() tries to expand it up to match_len_max bytes.
-	uint32_t match_len_max;
-
-	/// When running out of input, binary tree match finders need to know
-	/// if it is due to flushing or finishing. The action is used also
-	/// by the LZ-based encoders themselves.
-	lzma_action action;
-
-	/// Number of elements in hash[]
-	uint32_t hash_size_sum;
-
-	/// Number of elements in son[]
-	uint32_t sons_count;
-};
-
-
-typedef struct {
-	/// Extra amount of data to keep available before the "actual"
-	/// dictionary.
-	size_t before_size;
-
-	/// Size of the history buffer
-	size_t dict_size;
-
-	/// Extra amount of data to keep available after the "actual"
-	/// dictionary.
-	size_t after_size;
-
-	/// Maximum length of a match that the LZ-based encoder can accept.
-	/// This is used to extend matches of length nice_len to the
-	/// maximum possible length.
-	size_t match_len_max;
-
-	/// Match finder will search matches up to this length.
-	/// This must be less than or equal to match_len_max.
-	size_t nice_len;
-
-	/// Type of the match finder to use
-	lzma_match_finder match_finder;
-
-	/// Maximum search depth
-	uint32_t depth;
-
-	/// TODO: Comment
-	const uint8_t *preset_dict;
-
-	uint32_t preset_dict_size;
-
-} lzma_lz_options;
-
-
-// The total usable buffer space at any moment outside the match finder:
-// before_size + dict_size + after_size + match_len_max
-//
-// In reality, there's some extra space allocated to prevent the number of
-// memmove() calls reasonable. The bigger the dict_size is, the bigger
-// this extra buffer will be since with bigger dictionaries memmove() would
-// also take longer.
-//
-// A single encoder loop in the LZ-based encoder may call the match finder
-// (mf_find() or mf_skip()) at most after_size times. In other words,
-// a single encoder loop may increment lzma_mf.read_pos at most after_size
-// times. Since matches are looked up to
-// lzma_mf.buffer[lzma_mf.read_pos + match_len_max - 1], the total
-// amount of extra buffer needed after dict_size becomes
-// after_size + match_len_max.
-//
-// before_size has two uses. The first one is to keep literals available
-// in cases when the LZ-based encoder has made some read ahead.
-// TODO: Maybe this could be changed by making the LZ-based encoders to
-// store the actual literals as they do with length-distance pairs.
-//
-// Algorithms such as LZMA2 first try to compress a chunk, and then check
-// if the encoded result is smaller than the uncompressed one. If the chunk
-// was uncompressible, it is better to store it in uncompressed form in
-// the output stream. To do this, the whole uncompressed chunk has to be
-// still available in the history buffer. before_size achieves that.
-
-
-typedef struct {
-	/// Data specific to the LZ-based encoder
-	lzma_coder *coder;
-
-	/// Function to encode from *dict to out[]
-	lzma_ret (*code)(lzma_coder *restrict coder,
-			lzma_mf *restrict mf, uint8_t *restrict out,
-			size_t *restrict out_pos, size_t out_size);
-
-	/// Free allocated resources
-	void (*end)(lzma_coder *coder, lzma_allocator *allocator);
-
-	/// Update the options in the middle of the encoding.
-	lzma_ret (*options_update)(lzma_coder *coder,
-			const lzma_filter *filter);
-
-} lzma_lz_encoder;
-
-
-// Basic steps:
-//  1. Input gets copied into the dictionary.
-//  2. Data in dictionary gets run through the match finder byte by byte.
-//  3. The literals and matches are encoded using e.g. LZMA.
-//
-// The bytes that have been ran through the match finder, but not encoded yet,
-// are called `read ahead'.
-
-
-/// Get pointer to the first byte not ran through the match finder
-static inline const uint8_t *
-mf_ptr(const lzma_mf *mf)
-{
-	return mf->buffer + mf->read_pos;
-}
-
-
-/// Get the number of bytes that haven't been ran through the match finder yet.
-static inline uint32_t
-mf_avail(const lzma_mf *mf)
-{
-	return mf->write_pos - mf->read_pos;
-}
-
-
-/// Get the number of bytes that haven't been encoded yet (some of these
-/// bytes may have been ran through the match finder though).
-static inline uint32_t
-mf_unencoded(const lzma_mf *mf)
-{
-	return mf->write_pos - mf->read_pos + mf->read_ahead;
-}
-
-
-/// Calculate the absolute offset from the beginning of the most recent
-/// dictionary reset. Only the lowest four bits are important, so there's no
-/// problem that we don't know the 64-bit size of the data encoded so far.
-///
-/// NOTE: When moving the input window, we need to do it so that the lowest
-/// bits of dict->read_pos are not modified to keep this macro working
-/// as intended.
-static inline uint32_t
-mf_position(const lzma_mf *mf)
-{
-	return mf->read_pos - mf->read_ahead;
-}
-
-
-/// Since everything else begins with mf_, use it also for lzma_mf_find().
-#define mf_find lzma_mf_find
-
-
-/// Skip the given number of bytes. This is used when a good match was found.
-/// For example, if mf_find() finds a match of 200 bytes long, the first byte
-/// of that match was already consumed by mf_find(), and the rest 199 bytes
-/// have to be skipped with mf_skip(mf, 199).
-static inline void
-mf_skip(lzma_mf *mf, uint32_t amount)
-{
-	if (amount != 0) {
-		mf->skip(mf, amount);
-		mf->read_ahead += amount;
-	}
-}
-
-
-/// Copies at most *left number of bytes from the history buffer
-/// to out[]. This is needed by LZMA2 to encode uncompressed chunks.
-static inline void
-mf_read(lzma_mf *mf, uint8_t *out, size_t *out_pos, size_t out_size,
-		size_t *left)
-{
-	const size_t out_avail = out_size - *out_pos;
-	const size_t copy_size = my_min(out_avail, *left);
-
-	assert(mf->read_ahead == 0);
-	assert(mf->read_pos >= *left);
-
-	memcpy(out + *out_pos, mf->buffer + mf->read_pos - *left,
-			copy_size);
-
-	*out_pos += copy_size;
-	*left -= copy_size;
-	return;
-}
-
-
-extern lzma_ret lzma_lz_encoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters,
-		lzma_ret (*lz_init)(lzma_lz_encoder *lz,
-			lzma_allocator *allocator, const void *options,
-			lzma_lz_options *lz_options));
-
-
-extern uint64_t lzma_lz_encoder_memusage(const lzma_lz_options *lz_options);
-
-
-// These are only for LZ encoder's internal use.
-extern uint32_t lzma_mf_find(
-		lzma_mf *mf, uint32_t *count, lzma_match *matches);
-
-extern uint32_t lzma_mf_hc3_find(lzma_mf *dict, lzma_match *matches);
-extern void lzma_mf_hc3_skip(lzma_mf *dict, uint32_t amount);
-
-extern uint32_t lzma_mf_hc4_find(lzma_mf *dict, lzma_match *matches);
-extern void lzma_mf_hc4_skip(lzma_mf *dict, uint32_t amount);
-
-extern uint32_t lzma_mf_bt2_find(lzma_mf *dict, lzma_match *matches);
-extern void lzma_mf_bt2_skip(lzma_mf *dict, uint32_t amount);
-
-extern uint32_t lzma_mf_bt3_find(lzma_mf *dict, lzma_match *matches);
-extern void lzma_mf_bt3_skip(lzma_mf *dict, uint32_t amount);
-
-extern uint32_t lzma_mf_bt4_find(lzma_mf *dict, lzma_match *matches);
-extern void lzma_mf_bt4_skip(lzma_mf *dict, uint32_t amount);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_encoder_hash.h r-base-3.3.1/src/extra/xz/lz/lz_encoder_hash.h
--- r-base-3.2.3/src/extra/xz/lz/lz_encoder_hash.h	2012-07-27 22:05:01.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_encoder_hash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lz_encoder_hash.h
-/// \brief      Hash macros for match finders
-//
-//  Author:     Igor Pavlov
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZ_ENCODER_HASH_H
-#define LZMA_LZ_ENCODER_HASH_H
-
-#if defined(WORDS_BIGENDIAN) && !defined(HAVE_SMALL)
-	// This is to make liblzma produce the same output on big endian
-	// systems that it does on little endian systems. lz_encoder.c
-	// takes care of including the actual table.
-	extern const uint32_t lzma_lz_hash_table[256];
-#	define hash_table lzma_lz_hash_table
-#else
-#	include "check.h"
-#	define hash_table lzma_crc32_table[0]
-#endif
-
-#define HASH_2_SIZE (UINT32_C(1) << 10)
-#define HASH_3_SIZE (UINT32_C(1) << 16)
-#define HASH_4_SIZE (UINT32_C(1) << 20)
-
-#define HASH_2_MASK (HASH_2_SIZE - 1)
-#define HASH_3_MASK (HASH_3_SIZE - 1)
-#define HASH_4_MASK (HASH_4_SIZE - 1)
-
-#define FIX_3_HASH_SIZE (HASH_2_SIZE)
-#define FIX_4_HASH_SIZE (HASH_2_SIZE + HASH_3_SIZE)
-#define FIX_5_HASH_SIZE (HASH_2_SIZE + HASH_3_SIZE + HASH_4_SIZE)
-
-// Endianness doesn't matter in hash_2_calc() (no effect on the output).
-#ifdef TUKLIB_FAST_UNALIGNED_ACCESS
-#	define hash_2_calc() \
-		const uint32_t hash_value = *(const uint16_t *)(cur)
-#else
-#	define hash_2_calc() \
-		const uint32_t hash_value \
-			= (uint32_t)(cur[0]) | ((uint32_t)(cur[1]) << 8)
-#endif
-
-#define hash_3_calc() \
-	const uint32_t temp = hash_table[cur[0]] ^ cur[1]; \
-	const uint32_t hash_2_value = temp & HASH_2_MASK; \
-	const uint32_t hash_value \
-			= (temp ^ ((uint32_t)(cur[2]) << 8)) & mf->hash_mask
-
-#define hash_4_calc() \
-	const uint32_t temp = hash_table[cur[0]] ^ cur[1]; \
-	const uint32_t hash_2_value = temp & HASH_2_MASK; \
-	const uint32_t hash_3_value \
-			= (temp ^ ((uint32_t)(cur[2]) << 8)) & HASH_3_MASK; \
-	const uint32_t hash_value = (temp ^ ((uint32_t)(cur[2]) << 8) \
-			^ (hash_table[cur[3]] << 5)) & mf->hash_mask
-
-
-// The following are not currently used.
-
-#define hash_5_calc() \
-	const uint32_t temp = hash_table[cur[0]] ^ cur[1]; \
-	const uint32_t hash_2_value = temp & HASH_2_MASK; \
-	const uint32_t hash_3_value \
-			= (temp ^ ((uint32_t)(cur[2]) << 8)) & HASH_3_MASK; \
-	uint32_t hash_4_value = (temp ^ ((uint32_t)(cur[2]) << 8) ^ \
-			^ hash_table[cur[3]] << 5); \
-	const uint32_t hash_value \
-			= (hash_4_value ^ (hash_table[cur[4]] << 3)) \
-				& mf->hash_mask; \
-	hash_4_value &= HASH_4_MASK
-
-/*
-#define hash_zip_calc() \
-	const uint32_t hash_value \
-			= (((uint32_t)(cur[0]) | ((uint32_t)(cur[1]) << 8)) \
-				^ hash_table[cur[2]]) & 0xFFFF
-*/
-
-#define hash_zip_calc() \
-	const uint32_t hash_value \
-			= (((uint32_t)(cur[2]) | ((uint32_t)(cur[0]) << 8)) \
-				^ hash_table[cur[1]]) & 0xFFFF
-
-#define mt_hash_2_calc() \
-	const uint32_t hash_2_value \
-			= (hash_table[cur[0]] ^ cur[1]) & HASH_2_MASK
-
-#define mt_hash_3_calc() \
-	const uint32_t temp = hash_table[cur[0]] ^ cur[1]; \
-	const uint32_t hash_2_value = temp & HASH_2_MASK; \
-	const uint32_t hash_3_value \
-			= (temp ^ ((uint32_t)(cur[2]) << 8)) & HASH_3_MASK
-
-#define mt_hash_4_calc() \
-	const uint32_t temp = hash_table[cur[0]] ^ cur[1]; \
-	const uint32_t hash_2_value = temp & HASH_2_MASK; \
-	const uint32_t hash_3_value \
-			= (temp ^ ((uint32_t)(cur[2]) << 8)) & HASH_3_MASK; \
-	const uint32_t hash_4_value = (temp ^ ((uint32_t)(cur[2]) << 8) ^ \
-			(hash_table[cur[3]] << 5)) & HASH_4_MASK
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_encoder_hash_table.h r-base-3.3.1/src/extra/xz/lz/lz_encoder_hash_table.h
--- r-base-3.2.3/src/extra/xz/lz/lz_encoder_hash_table.h	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_encoder_hash_table.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/* This file has been automatically generated by crc32_tablegen.c. */
-
-const uint32_t lzma_lz_hash_table[256] = {
-	0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-	0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-	0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-	0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-	0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-	0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-	0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-	0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-	0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-	0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-	0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-	0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-	0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-	0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-	0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-	0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-	0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-	0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-	0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-	0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-	0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-	0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-	0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-	0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-	0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-	0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-	0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-	0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-	0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-	0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-	0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-	0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-	0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-	0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-	0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-	0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-	0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-	0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-	0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-	0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-	0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-	0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-	0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-	0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-	0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-	0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-	0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-	0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-	0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-	0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-	0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-	0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-	0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-	0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-	0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-	0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-	0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-	0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-	0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-	0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-	0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-	0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-	0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-	0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-};
diff -Nru r-base-3.2.3/src/extra/xz/lz/lz_encoder_mf.c r-base-3.3.1/src/extra/xz/lz/lz_encoder_mf.c
--- r-base-3.2.3/src/extra/xz/lz/lz_encoder_mf.c	2010-11-08 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lz/lz_encoder_mf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,753 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lz_encoder_mf.c
-/// \brief      Match finders
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lz_encoder.h"
-#include "lz_encoder_hash.h"
-
-
-/// \brief      Find matches starting from the current byte
-///
-/// \return     The length of the longest match found
-extern uint32_t
-lzma_mf_find(lzma_mf *mf, uint32_t *count_ptr, lzma_match *matches)
-{
-	// Call the match finder. It returns the number of length-distance
-	// pairs found.
-	// FIXME: Minimum count is zero, what _exactly_ is the maximum?
-	const uint32_t count = mf->find(mf, matches);
-
-	// Length of the longest match; assume that no matches were found
-	// and thus the maximum length is zero.
-	uint32_t len_best = 0;
-
-	if (count > 0) {
-#ifndef NDEBUG
-		// Validate the matches.
-		for (uint32_t i = 0; i < count; ++i) {
-			assert(matches[i].len <= mf->nice_len);
-			assert(matches[i].dist < mf->read_pos);
-			assert(memcmp(mf_ptr(mf) - 1,
-				mf_ptr(mf) - matches[i].dist - 2,
-				matches[i].len) == 0);
-		}
-#endif
-
-		// The last used element in the array contains
-		// the longest match.
-		len_best = matches[count - 1].len;
-
-		// If a match of maximum search length was found, try to
-		// extend the match to maximum possible length.
-		if (len_best == mf->nice_len) {
-			// The limit for the match length is either the
-			// maximum match length supported by the LZ-based
-			// encoder or the number of bytes left in the
-			// dictionary, whichever is smaller.
-			uint32_t limit = mf_avail(mf) + 1;
-			if (limit > mf->match_len_max)
-				limit = mf->match_len_max;
-
-			// Pointer to the byte we just ran through
-			// the match finder.
-			const uint8_t *p1 = mf_ptr(mf) - 1;
-
-			// Pointer to the beginning of the match. We need -1
-			// here because the match distances are zero based.
-			const uint8_t *p2 = p1 - matches[count - 1].dist - 1;
-
-			while (len_best < limit
-					&& p1[len_best] == p2[len_best])
-				++len_best;
-		}
-	}
-
-	*count_ptr = count;
-
-	// Finally update the read position to indicate that match finder was
-	// run for this dictionary offset.
-	++mf->read_ahead;
-
-	return len_best;
-}
-
-
-/// Hash value to indicate unused element in the hash. Since we start the
-/// positions from dict_size + 1, zero is always too far to qualify
-/// as usable match position.
-#define EMPTY_HASH_VALUE 0
-
-
-/// Normalization must be done when lzma_mf.offset + lzma_mf.read_pos
-/// reaches MUST_NORMALIZE_POS.
-#define MUST_NORMALIZE_POS UINT32_MAX
-
-
-/// \brief      Normalizes hash values
-///
-/// The hash arrays store positions of match candidates. The positions are
-/// relative to an arbitrary offset that is not the same as the absolute
-/// offset in the input stream. The relative position of the current byte
-/// is lzma_mf.offset + lzma_mf.read_pos. The distances of the matches are
-/// the differences of the current read position and the position found from
-/// the hash.
-///
-/// To prevent integer overflows of the offsets stored in the hash arrays,
-/// we need to "normalize" the stored values now and then. During the
-/// normalization, we drop values that indicate distance greater than the
-/// dictionary size, thus making space for new values.
-static void
-normalize(lzma_mf *mf)
-{
-	assert(mf->read_pos + mf->offset == MUST_NORMALIZE_POS);
-
-	// In future we may not want to touch the lowest bits, because there
-	// may be match finders that use larger resolution than one byte.
-	const uint32_t subvalue
-			= (MUST_NORMALIZE_POS - mf->cyclic_size);
-				// & (~(UINT32_C(1) << 10) - 1);
-
-	const uint32_t count = mf->hash_size_sum + mf->sons_count;
-	uint32_t *hash = mf->hash;
-
-	for (uint32_t i = 0; i < count; ++i) {
-		// If the distance is greater than the dictionary size,
-		// we can simply mark the hash element as empty.
-		//
-		// NOTE: Only the first mf->hash_size_sum elements are
-		// initialized for sure. There may be uninitialized elements
-		// in mf->son. Since we go through both mf->hash and
-		// mf->son here in normalization, Valgrind may complain
-		// that the "if" below depends on uninitialized value. In
-		// this case it is safe to ignore the warning. See also the
-		// comments in lz_encoder_init() in lz_encoder.c.
-		if (hash[i] <= subvalue)
-			hash[i] = EMPTY_HASH_VALUE;
-		else
-			hash[i] -= subvalue;
-	}
-
-	// Update offset to match the new locations.
-	mf->offset -= subvalue;
-
-	return;
-}
-
-
-/// Mark the current byte as processed from point of view of the match finder.
-static void
-move_pos(lzma_mf *mf)
-{
-	if (++mf->cyclic_pos == mf->cyclic_size)
-		mf->cyclic_pos = 0;
-
-	++mf->read_pos;
-	assert(mf->read_pos <= mf->write_pos);
-
-	if (unlikely(mf->read_pos + mf->offset == UINT32_MAX))
-		normalize(mf);
-}
-
-
-/// When flushing, we cannot run the match finder unless there is nice_len
-/// bytes available in the dictionary. Instead, we skip running the match
-/// finder (indicating that no match was found), and count how many bytes we
-/// have ignored this way.
-///
-/// When new data is given after the flushing was completed, the match finder
-/// is restarted by rewinding mf->read_pos backwards by mf->pending. Then
-/// the missed bytes are added to the hash using the match finder's skip
-/// function (with small amount of input, it may start using mf->pending
-/// again if flushing).
-///
-/// Due to this rewinding, we don't touch cyclic_pos or test for
-/// normalization. It will be done when the match finder's skip function
-/// catches up after a flush.
-static void
-move_pending(lzma_mf *mf)
-{
-	++mf->read_pos;
-	assert(mf->read_pos <= mf->write_pos);
-	++mf->pending;
-}
-
-
-/// Calculate len_limit and determine if there is enough input to run
-/// the actual match finder code. Sets up "cur" and "pos". This macro
-/// is used by all find functions and binary tree skip functions. Hash
-/// chain skip function doesn't need len_limit so a simpler code is used
-/// in them.
-#define header(is_bt, len_min, ret_op) \
-	uint32_t len_limit = mf_avail(mf); \
-	if (mf->nice_len <= len_limit) { \
-		len_limit = mf->nice_len; \
-	} else if (len_limit < (len_min) \
-			|| (is_bt && mf->action == LZMA_SYNC_FLUSH)) { \
-		assert(mf->action != LZMA_RUN); \
-		move_pending(mf); \
-		ret_op; \
-	} \
-	const uint8_t *cur = mf_ptr(mf); \
-	const uint32_t pos = mf->read_pos + mf->offset
-
-
-/// Header for find functions. "return 0" indicates that zero matches
-/// were found.
-#define header_find(is_bt, len_min) \
-	header(is_bt, len_min, return 0); \
-	uint32_t matches_count = 0
-
-
-/// Header for a loop in a skip function. "continue" tells to skip the rest
-/// of the code in the loop.
-#define header_skip(is_bt, len_min) \
-	header(is_bt, len_min, continue)
-
-
-/// Calls hc_find_func() or bt_find_func() and calculates the total number
-/// of matches found. Updates the dictionary position and returns the number
-/// of matches found.
-#define call_find(func, len_best) \
-do { \
-	matches_count = func(len_limit, pos, cur, cur_match, mf->depth, \
-				mf->son, mf->cyclic_pos, mf->cyclic_size, \
-				matches + matches_count, len_best) \
-			- matches; \
-	move_pos(mf); \
-	return matches_count; \
-} while (0)
-
-
-////////////////
-// Hash Chain //
-////////////////
-
-#if defined(HAVE_MF_HC3) || defined(HAVE_MF_HC4)
-///
-///
-/// \param      len_limit       Don't look for matches longer than len_limit.
-/// \param      pos             lzma_mf.read_pos + lzma_mf.offset
-/// \param      cur             Pointer to current byte (mf_ptr(mf))
-/// \param      cur_match       Start position of the current match candidate
-/// \param      depth           Maximum length of the hash chain
-/// \param      son             lzma_mf.son (contains the hash chain)
-/// \param      cyclic_pos
-/// \param      cyclic_size
-/// \param      matches         Array to hold the matches.
-/// \param      len_best        The length of the longest match found so far.
-static lzma_match *
-hc_find_func(
-		const uint32_t len_limit,
-		const uint32_t pos,
-		const uint8_t *const cur,
-		uint32_t cur_match,
-		uint32_t depth,
-		uint32_t *const son,
-		const uint32_t cyclic_pos,
-		const uint32_t cyclic_size,
-		lzma_match *matches,
-		uint32_t len_best)
-{
-	son[cyclic_pos] = cur_match;
-
-	while (true) {
-		const uint32_t delta = pos - cur_match;
-		if (depth-- == 0 || delta >= cyclic_size)
-			return matches;
-
-		const uint8_t *const pb = cur - delta;
-		cur_match = son[cyclic_pos - delta
-				+ (delta > cyclic_pos ? cyclic_size : 0)];
-
-		if (pb[len_best] == cur[len_best] && pb[0] == cur[0]) {
-			uint32_t len = 0;
-			while (++len != len_limit)
-				if (pb[len] != cur[len])
-					break;
-
-			if (len_best < len) {
-				len_best = len;
-				matches->len = len;
-				matches->dist = delta - 1;
-				++matches;
-
-				if (len == len_limit)
-					return matches;
-			}
-		}
-	}
-}
-
-
-#define hc_find(len_best) \
-	call_find(hc_find_func, len_best)
-
-
-#define hc_skip() \
-do { \
-	mf->son[mf->cyclic_pos] = cur_match; \
-	move_pos(mf); \
-} while (0)
-
-#endif
-
-
-#ifdef HAVE_MF_HC3
-extern uint32_t
-lzma_mf_hc3_find(lzma_mf *mf, lzma_match *matches)
-{
-	header_find(false, 3);
-
-	hash_3_calc();
-
-	const uint32_t delta2 = pos - mf->hash[hash_2_value];
-	const uint32_t cur_match = mf->hash[FIX_3_HASH_SIZE + hash_value];
-
-	mf->hash[hash_2_value] = pos;
-	mf->hash[FIX_3_HASH_SIZE + hash_value] = pos;
-
-	uint32_t len_best = 2;
-
-	if (delta2 < mf->cyclic_size && *(cur - delta2) == *cur) {
-		for ( ; len_best != len_limit; ++len_best)
-			if (*(cur + len_best - delta2) != cur[len_best])
-				break;
-
-		matches[0].len = len_best;
-		matches[0].dist = delta2 - 1;
-		matches_count = 1;
-
-		if (len_best == len_limit) {
-			hc_skip();
-			return 1; // matches_count
-		}
-	}
-
-	hc_find(len_best);
-}
-
-
-extern void
-lzma_mf_hc3_skip(lzma_mf *mf, uint32_t amount)
-{
-	do {
-		if (mf_avail(mf) < 3) {
-			move_pending(mf);
-			continue;
-		}
-
-		const uint8_t *cur = mf_ptr(mf);
-		const uint32_t pos = mf->read_pos + mf->offset;
-
-		hash_3_calc();
-
-		const uint32_t cur_match
-				= mf->hash[FIX_3_HASH_SIZE + hash_value];
-
-		mf->hash[hash_2_value] = pos;
-		mf->hash[FIX_3_HASH_SIZE + hash_value] = pos;
-
-		hc_skip();
-
-	} while (--amount != 0);
-}
-#endif
-
-
-#ifdef HAVE_MF_HC4
-extern uint32_t
-lzma_mf_hc4_find(lzma_mf *mf, lzma_match *matches)
-{
-	header_find(false, 4);
-
-	hash_4_calc();
-
-	uint32_t delta2 = pos - mf->hash[hash_2_value];
-	const uint32_t delta3
-			= pos - mf->hash[FIX_3_HASH_SIZE + hash_3_value];
-	const uint32_t cur_match = mf->hash[FIX_4_HASH_SIZE + hash_value];
-
-	mf->hash[hash_2_value ] = pos;
-	mf->hash[FIX_3_HASH_SIZE + hash_3_value] = pos;
-	mf->hash[FIX_4_HASH_SIZE + hash_value] = pos;
-
-	uint32_t len_best = 1;
-
-	if (delta2 < mf->cyclic_size && *(cur - delta2) == *cur) {
-		len_best = 2;
-		matches[0].len = 2;
-		matches[0].dist = delta2 - 1;
-		matches_count = 1;
-	}
-
-	if (delta2 != delta3 && delta3 < mf->cyclic_size
-			&& *(cur - delta3) == *cur) {
-		len_best = 3;
-		matches[matches_count++].dist = delta3 - 1;
-		delta2 = delta3;
-	}
-
-	if (matches_count != 0) {
-		for ( ; len_best != len_limit; ++len_best)
-			if (*(cur + len_best - delta2) != cur[len_best])
-				break;
-
-		matches[matches_count - 1].len = len_best;
-
-		if (len_best == len_limit) {
-			hc_skip();
-			return matches_count;
-		}
-	}
-
-	if (len_best < 3)
-		len_best = 3;
-
-	hc_find(len_best);
-}
-
-
-extern void
-lzma_mf_hc4_skip(lzma_mf *mf, uint32_t amount)
-{
-	do {
-		if (mf_avail(mf) < 4) {
-			move_pending(mf);
-			continue;
-		}
-
-		const uint8_t *cur = mf_ptr(mf);
-		const uint32_t pos = mf->read_pos + mf->offset;
-
-		hash_4_calc();
-
-		const uint32_t cur_match
-				= mf->hash[FIX_4_HASH_SIZE + hash_value];
-
-		mf->hash[hash_2_value] = pos;
-		mf->hash[FIX_3_HASH_SIZE + hash_3_value] = pos;
-		mf->hash[FIX_4_HASH_SIZE + hash_value] = pos;
-
-		hc_skip();
-
-	} while (--amount != 0);
-}
-#endif
-
-
-/////////////////
-// Binary Tree //
-/////////////////
-
-#if defined(HAVE_MF_BT2) || defined(HAVE_MF_BT3) || defined(HAVE_MF_BT4)
-static lzma_match *
-bt_find_func(
-		const uint32_t len_limit,
-		const uint32_t pos,
-		const uint8_t *const cur,
-		uint32_t cur_match,
-		uint32_t depth,
-		uint32_t *const son,
-		const uint32_t cyclic_pos,
-		const uint32_t cyclic_size,
-		lzma_match *matches,
-		uint32_t len_best)
-{
-	uint32_t *ptr0 = son + (cyclic_pos << 1) + 1;
-	uint32_t *ptr1 = son + (cyclic_pos << 1);
-
-	uint32_t len0 = 0;
-	uint32_t len1 = 0;
-
-	while (true) {
-		const uint32_t delta = pos - cur_match;
-		if (depth-- == 0 || delta >= cyclic_size) {
-			*ptr0 = EMPTY_HASH_VALUE;
-			*ptr1 = EMPTY_HASH_VALUE;
-			return matches;
-		}
-
-		uint32_t *const pair = son + ((cyclic_pos - delta
-				+ (delta > cyclic_pos ? cyclic_size : 0))
-				<< 1);
-
-		const uint8_t *const pb = cur - delta;
-		uint32_t len = my_min(len0, len1);
-
-		if (pb[len] == cur[len]) {
-			while (++len != len_limit)
-				if (pb[len] != cur[len])
-					break;
-
-			if (len_best < len) {
-				len_best = len;
-				matches->len = len;
-				matches->dist = delta - 1;
-				++matches;
-
-				if (len == len_limit) {
-					*ptr1 = pair[0];
-					*ptr0 = pair[1];
-					return matches;
-				}
-			}
-		}
-
-		if (pb[len] < cur[len]) {
-			*ptr1 = cur_match;
-			ptr1 = pair + 1;
-			cur_match = *ptr1;
-			len1 = len;
-		} else {
-			*ptr0 = cur_match;
-			ptr0 = pair;
-			cur_match = *ptr0;
-			len0 = len;
-		}
-	}
-}
-
-
-static void
-bt_skip_func(
-		const uint32_t len_limit,
-		const uint32_t pos,
-		const uint8_t *const cur,
-		uint32_t cur_match,
-		uint32_t depth,
-		uint32_t *const son,
-		const uint32_t cyclic_pos,
-		const uint32_t cyclic_size)
-{
-	uint32_t *ptr0 = son + (cyclic_pos << 1) + 1;
-	uint32_t *ptr1 = son + (cyclic_pos << 1);
-
-	uint32_t len0 = 0;
-	uint32_t len1 = 0;
-
-	while (true) {
-		const uint32_t delta = pos - cur_match;
-		if (depth-- == 0 || delta >= cyclic_size) {
-			*ptr0 = EMPTY_HASH_VALUE;
-			*ptr1 = EMPTY_HASH_VALUE;
-			return;
-		}
-
-		uint32_t *pair = son + ((cyclic_pos - delta
-				+ (delta > cyclic_pos ? cyclic_size : 0))
-				<< 1);
-		const uint8_t *pb = cur - delta;
-		uint32_t len = my_min(len0, len1);
-
-		if (pb[len] == cur[len]) {
-			while (++len != len_limit)
-				if (pb[len] != cur[len])
-					break;
-
-			if (len == len_limit) {
-				*ptr1 = pair[0];
-				*ptr0 = pair[1];
-				return;
-			}
-		}
-
-		if (pb[len] < cur[len]) {
-			*ptr1 = cur_match;
-			ptr1 = pair + 1;
-			cur_match = *ptr1;
-			len1 = len;
-		} else {
-			*ptr0 = cur_match;
-			ptr0 = pair;
-			cur_match = *ptr0;
-			len0 = len;
-		}
-	}
-}
-
-
-#define bt_find(len_best) \
-	call_find(bt_find_func, len_best)
-
-#define bt_skip() \
-do { \
-	bt_skip_func(len_limit, pos, cur, cur_match, mf->depth, \
-			mf->son, mf->cyclic_pos, \
-			mf->cyclic_size); \
-	move_pos(mf); \
-} while (0)
-
-#endif
-
-
-#ifdef HAVE_MF_BT2
-extern uint32_t
-lzma_mf_bt2_find(lzma_mf *mf, lzma_match *matches)
-{
-	header_find(true, 2);
-
-	hash_2_calc();
-
-	const uint32_t cur_match = mf->hash[hash_value];
-	mf->hash[hash_value] = pos;
-
-	bt_find(1);
-}
-
-
-extern void
-lzma_mf_bt2_skip(lzma_mf *mf, uint32_t amount)
-{
-	do {
-		header_skip(true, 2);
-
-		hash_2_calc();
-
-		const uint32_t cur_match = mf->hash[hash_value];
-		mf->hash[hash_value] = pos;
-
-		bt_skip();
-
-	} while (--amount != 0);
-}
-#endif
-
-
-#ifdef HAVE_MF_BT3
-extern uint32_t
-lzma_mf_bt3_find(lzma_mf *mf, lzma_match *matches)
-{
-	header_find(true, 3);
-
-	hash_3_calc();
-
-	const uint32_t delta2 = pos - mf->hash[hash_2_value];
-	const uint32_t cur_match = mf->hash[FIX_3_HASH_SIZE + hash_value];
-
-	mf->hash[hash_2_value] = pos;
-	mf->hash[FIX_3_HASH_SIZE + hash_value] = pos;
-
-	uint32_t len_best = 2;
-
-	if (delta2 < mf->cyclic_size && *(cur - delta2) == *cur) {
-		for ( ; len_best != len_limit; ++len_best)
-			if (*(cur + len_best - delta2) != cur[len_best])
-				break;
-
-		matches[0].len = len_best;
-		matches[0].dist = delta2 - 1;
-		matches_count = 1;
-
-		if (len_best == len_limit) {
-			bt_skip();
-			return 1; // matches_count
-		}
-	}
-
-	bt_find(len_best);
-}
-
-
-extern void
-lzma_mf_bt3_skip(lzma_mf *mf, uint32_t amount)
-{
-	do {
-		header_skip(true, 3);
-
-		hash_3_calc();
-
-		const uint32_t cur_match
-				= mf->hash[FIX_3_HASH_SIZE + hash_value];
-
-		mf->hash[hash_2_value] = pos;
-		mf->hash[FIX_3_HASH_SIZE + hash_value] = pos;
-
-		bt_skip();
-
-	} while (--amount != 0);
-}
-#endif
-
-
-#ifdef HAVE_MF_BT4
-extern uint32_t
-lzma_mf_bt4_find(lzma_mf *mf, lzma_match *matches)
-{
-	header_find(true, 4);
-
-	hash_4_calc();
-
-	uint32_t delta2 = pos - mf->hash[hash_2_value];
-	const uint32_t delta3
-			= pos - mf->hash[FIX_3_HASH_SIZE + hash_3_value];
-	const uint32_t cur_match = mf->hash[FIX_4_HASH_SIZE + hash_value];
-
-	mf->hash[hash_2_value] = pos;
-	mf->hash[FIX_3_HASH_SIZE + hash_3_value] = pos;
-	mf->hash[FIX_4_HASH_SIZE + hash_value] = pos;
-
-	uint32_t len_best = 1;
-
-	if (delta2 < mf->cyclic_size && *(cur - delta2) == *cur) {
-		len_best = 2;
-		matches[0].len = 2;
-		matches[0].dist = delta2 - 1;
-		matches_count = 1;
-	}
-
-	if (delta2 != delta3 && delta3 < mf->cyclic_size
-			&& *(cur - delta3) == *cur) {
-		len_best = 3;
-		matches[matches_count++].dist = delta3 - 1;
-		delta2 = delta3;
-	}
-
-	if (matches_count != 0) {
-		for ( ; len_best != len_limit; ++len_best)
-			if (*(cur + len_best - delta2) != cur[len_best])
-				break;
-
-		matches[matches_count - 1].len = len_best;
-
-		if (len_best == len_limit) {
-			bt_skip();
-			return matches_count;
-		}
-	}
-
-	if (len_best < 3)
-		len_best = 3;
-
-	bt_find(len_best);
-}
-
-
-extern void
-lzma_mf_bt4_skip(lzma_mf *mf, uint32_t amount)
-{
-	do {
-		header_skip(true, 4);
-
-		hash_4_calc();
-
-		const uint32_t cur_match
-				= mf->hash[FIX_4_HASH_SIZE + hash_value];
-
-		mf->hash[hash_2_value] = pos;
-		mf->hash[FIX_3_HASH_SIZE + hash_3_value] = pos;
-		mf->hash[FIX_4_HASH_SIZE + hash_value] = pos;
-
-		bt_skip();
-
-	} while (--amount != 0);
-}
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/fastpos.h r-base-3.3.1/src/extra/xz/lzma/fastpos.h
--- r-base-3.2.3/src/extra/xz/lzma/fastpos.h	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/fastpos.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       fastpos.h
-/// \brief      Kind of two-bit version of bit scan reverse
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_FASTPOS_H
-#define LZMA_FASTPOS_H
-
-// LZMA encodes match distances (positions) by storing the highest two
-// bits using a six-bit value [0, 63], and then the missing lower bits.
-// Dictionary size is also stored using this encoding in the new .lzma
-// file format header.
-//
-// fastpos.h provides a way to quickly find out the correct six-bit
-// values. The following table gives some examples of this encoding:
-//
-//      pos   return
-//       0       0
-//       1       1
-//       2       2
-//       3       3
-//       4       4
-//       5       4
-//       6       5
-//       7       5
-//       8       6
-//      11       6
-//      12       7
-//     ...      ...
-//      15       7
-//      16       8
-//      17       8
-//     ...      ...
-//      23       8
-//      24       9
-//      25       9
-//     ...      ...
-//
-//
-// Provided functions or macros
-// ----------------------------
-//
-// get_pos_slot(pos) is the basic version. get_pos_slot_2(pos)
-// assumes that pos >= FULL_DISTANCES, thus the result is at least
-// FULL_DISTANCES_BITS * 2. Using get_pos_slot(pos) instead of
-// get_pos_slot_2(pos) would give the same result, but get_pos_slot_2(pos)
-// should be tiny bit faster due to the assumption being made.
-//
-//
-// Size vs. speed
-// --------------
-//
-// With some CPUs that have fast BSR (bit scan reverse) instruction, the
-// size optimized version is slightly faster than the bigger table based
-// approach. Such CPUs include Intel Pentium Pro, Pentium II, Pentium III
-// and Core 2 (possibly others). AMD K7 seems to have slower BSR, but that
-// would still have speed roughly comparable to the table version. Older
-// x86 CPUs like the original Pentium have very slow BSR; on those systems
-// the table version is a lot faster.
-//
-// On some CPUs, the table version is a lot faster when using position
-// dependent code, but with position independent code the size optimized
-// version is slightly faster. This occurs at least on 32-bit SPARC (no
-// ASM optimizations).
-//
-// I'm making the table version the default, because that has good speed
-// on all systems I have tried. The size optimized version is sometimes
-// slightly faster, but sometimes it is a lot slower.
-
-#ifdef HAVE_SMALL
-#	define get_pos_slot(pos) ((pos) <= 4 ? (pos) : get_pos_slot_2(pos))
-
-static inline uint32_t
-get_pos_slot_2(uint32_t pos)
-{
-	const uint32_t i = bsr32(pos);
-	return (i + i) + ((pos >> (i - 1)) & 1);
-}
-
-
-#else
-
-#define FASTPOS_BITS 13
-
-extern const uint8_t lzma_fastpos[1 << FASTPOS_BITS];
-
-
-#define fastpos_shift(extra, n) \
-	((extra) + (n) * (FASTPOS_BITS - 1))
-
-#define fastpos_limit(extra, n) \
-	(UINT32_C(1) << (FASTPOS_BITS + fastpos_shift(extra, n)))
-
-#define fastpos_result(pos, extra, n) \
-	lzma_fastpos[(pos) >> fastpos_shift(extra, n)] \
-			+ 2 * fastpos_shift(extra, n)
-
-
-static inline uint32_t
-get_pos_slot(uint32_t pos)
-{
-	// If it is small enough, we can pick the result directly from
-	// the precalculated table.
-	if (pos < fastpos_limit(0, 0))
-		return lzma_fastpos[pos];
-
-	if (pos < fastpos_limit(0, 1))
-		return fastpos_result(pos, 0, 1);
-
-	return fastpos_result(pos, 0, 2);
-}
-
-
-#ifdef FULL_DISTANCES_BITS
-static inline uint32_t
-get_pos_slot_2(uint32_t pos)
-{
-	assert(pos >= FULL_DISTANCES);
-
-	if (pos < fastpos_limit(FULL_DISTANCES_BITS - 1, 0))
-		return fastpos_result(pos, FULL_DISTANCES_BITS - 1, 0);
-
-	if (pos < fastpos_limit(FULL_DISTANCES_BITS - 1, 1))
-		return fastpos_result(pos, FULL_DISTANCES_BITS - 1, 1);
-
-	return fastpos_result(pos, FULL_DISTANCES_BITS - 1, 2);
-}
-#endif
-
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/fastpos_table.c r-base-3.3.1/src/extra/xz/lzma/fastpos_table.c
--- r-base-3.2.3/src/extra/xz/lzma/fastpos_table.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/fastpos_table.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,519 +0,0 @@
-/* This file has been automatically generated by fastpos_tablegen.c. */
-
-#include "common.h"
-#include "fastpos.h"
-
-const uint8_t lzma_fastpos[1 << FASTPOS_BITS] = {
-	  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,
-	  8,  8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9,
-	 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-	 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-	 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-	 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-	 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-	 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-	 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25
-};
diff -Nru r-base-3.2.3/src/extra/xz/lzma/fastpos_tablegen.c r-base-3.3.1/src/extra/xz/lzma/fastpos_tablegen.c
--- r-base-3.2.3/src/extra/xz/lzma/fastpos_tablegen.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/fastpos_tablegen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       fastpos_tablegen.c
-/// \brief      Generates the lzma_fastpos[] lookup table
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <sys/types.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include "fastpos.h"
-
-
-int
-main(void)
-{
-	uint8_t fastpos[1 << FASTPOS_BITS];
-
-	const uint8_t fast_slots = 2 * FASTPOS_BITS;
-	uint32_t c = 2;
-
-	fastpos[0] = 0;
-	fastpos[1] = 1;
-
-	for (uint8_t slot_fast = 2; slot_fast < fast_slots; ++slot_fast) {
-		const uint32_t k = 1 << ((slot_fast >> 1) - 1);
-		for (uint32_t j = 0; j < k; ++j, ++c)
-			fastpos[c] = slot_fast;
-	}
-
-	printf("/* This file has been automatically generated "
-			"by fastpos_tablegen.c. */\n\n"
-			"#include \"common.h\"\n"
-			"#include \"fastpos.h\"\n\n"
-			"const uint8_t lzma_fastpos[1 << FASTPOS_BITS] = {");
-
-	for (size_t i = 0; i < (1 << FASTPOS_BITS); ++i) {
-		if (i % 16 == 0)
-			printf("\n\t");
-
-		printf("%3u", (unsigned int)(fastpos[i]));
-
-		if (i != (1 << FASTPOS_BITS) - 1)
-			printf(",");
-	}
-
-	printf("\n};\n");
-
-	return 0;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma2_decoder.c r-base-3.3.1/src/extra/xz/lzma/lzma2_decoder.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma2_decoder.c	2011-04-23 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma2_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,304 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma2_decoder.c
-/// \brief      LZMA2 decoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lzma2_decoder.h"
-#include "lz_decoder.h"
-#include "lzma_decoder.h"
-
-
-struct lzma_coder_s {
-	enum sequence {
-		SEQ_CONTROL,
-		SEQ_UNCOMPRESSED_1,
-		SEQ_UNCOMPRESSED_2,
-		SEQ_COMPRESSED_0,
-		SEQ_COMPRESSED_1,
-		SEQ_PROPERTIES,
-		SEQ_LZMA,
-		SEQ_COPY,
-	} sequence;
-
-	/// Sequence after the size fields have been decoded.
-	enum sequence next_sequence;
-
-	/// LZMA decoder
-	lzma_lz_decoder lzma;
-
-	/// Uncompressed size of LZMA chunk
-	size_t uncompressed_size;
-
-	/// Compressed size of the chunk (naturally equals to uncompressed
-	/// size of uncompressed chunk)
-	size_t compressed_size;
-
-	/// True if properties are needed. This is false before the
-	/// first LZMA chunk.
-	bool need_properties;
-
-	/// True if dictionary reset is needed. This is false before the
-	/// first chunk (LZMA or uncompressed).
-	bool need_dictionary_reset;
-
-	lzma_options_lzma options;
-};
-
-
-static lzma_ret
-lzma2_decode(lzma_coder *restrict coder, lzma_dict *restrict dict,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size)
-{
-	// With SEQ_LZMA it is possible that no new input is needed to do
-	// some progress. The rest of the sequences assume that there is
-	// at least one byte of input.
-	while (*in_pos < in_size || coder->sequence == SEQ_LZMA)
-	switch (coder->sequence) {
-	case SEQ_CONTROL: {
-		const uint32_t control = in[*in_pos];
-		++*in_pos;
-
-		// End marker
-		if (control == 0x00)
-			return LZMA_STREAM_END;
-
-		if (control >= 0xE0 || control == 1) {
-			// Dictionary reset implies that next LZMA chunk has
-			// to set new properties.
-			coder->need_properties = true;
-			coder->need_dictionary_reset = true;
-		} else if (coder->need_dictionary_reset) {
-			return LZMA_DATA_ERROR;
-		}
-
-		if (control >= 0x80) {
-			// LZMA chunk. The highest five bits of the
-			// uncompressed size are taken from the control byte.
-			coder->uncompressed_size = (control & 0x1F) << 16;
-			coder->sequence = SEQ_UNCOMPRESSED_1;
-
-			// See if there are new properties or if we need to
-			// reset the state.
-			if (control >= 0xC0) {
-				// When there are new properties, state reset
-				// is done at SEQ_PROPERTIES.
-				coder->need_properties = false;
-				coder->next_sequence = SEQ_PROPERTIES;
-
-			} else if (coder->need_properties) {
-				return LZMA_DATA_ERROR;
-
-			} else {
-				coder->next_sequence = SEQ_LZMA;
-
-				// If only state reset is wanted with old
-				// properties, do the resetting here for
-				// simplicity.
-				if (control >= 0xA0)
-					coder->lzma.reset(coder->lzma.coder,
-							&coder->options);
-			}
-		} else {
-			// Invalid control values
-			if (control > 2)
-				return LZMA_DATA_ERROR;
-
-			// It's uncompressed chunk
-			coder->sequence = SEQ_COMPRESSED_0;
-			coder->next_sequence = SEQ_COPY;
-		}
-
-		if (coder->need_dictionary_reset) {
-			// Finish the dictionary reset and let the caller
-			// flush the dictionary to the actual output buffer.
-			coder->need_dictionary_reset = false;
-			dict_reset(dict);
-			return LZMA_OK;
-		}
-
-		break;
-	}
-
-	case SEQ_UNCOMPRESSED_1:
-		coder->uncompressed_size += (uint32_t)(in[(*in_pos)++]) << 8;
-		coder->sequence = SEQ_UNCOMPRESSED_2;
-		break;
-
-	case SEQ_UNCOMPRESSED_2:
-		coder->uncompressed_size += in[(*in_pos)++] + 1;
-		coder->sequence = SEQ_COMPRESSED_0;
-		coder->lzma.set_uncompressed(coder->lzma.coder,
-				coder->uncompressed_size);
-		break;
-
-	case SEQ_COMPRESSED_0:
-		coder->compressed_size = (uint32_t)(in[(*in_pos)++]) << 8;
-		coder->sequence = SEQ_COMPRESSED_1;
-		break;
-
-	case SEQ_COMPRESSED_1:
-		coder->compressed_size += in[(*in_pos)++] + 1;
-		coder->sequence = coder->next_sequence;
-		break;
-
-	case SEQ_PROPERTIES:
-		if (lzma_lzma_lclppb_decode(&coder->options, in[(*in_pos)++]))
-			return LZMA_DATA_ERROR;
-
-		coder->lzma.reset(coder->lzma.coder, &coder->options);
-
-		coder->sequence = SEQ_LZMA;
-		break;
-
-	case SEQ_LZMA: {
-		// Store the start offset so that we can update
-		// coder->compressed_size later.
-		const size_t in_start = *in_pos;
-
-		// Decode from in[] to *dict.
-		const lzma_ret ret = coder->lzma.code(coder->lzma.coder,
-				dict, in, in_pos, in_size);
-
-		// Validate and update coder->compressed_size.
-		const size_t in_used = *in_pos - in_start;
-		if (in_used > coder->compressed_size)
-			return LZMA_DATA_ERROR;
-
-		coder->compressed_size -= in_used;
-
-		// Return if we didn't finish the chunk, or an error occurred.
-		if (ret != LZMA_STREAM_END)
-			return ret;
-
-		// The LZMA decoder must have consumed the whole chunk now.
-		// We don't need to worry about uncompressed size since it
-		// is checked by the LZMA decoder.
-		if (coder->compressed_size != 0)
-			return LZMA_DATA_ERROR;
-
-		coder->sequence = SEQ_CONTROL;
-		break;
-	}
-
-	case SEQ_COPY: {
-		// Copy from input to the dictionary as is.
-		dict_write(dict, in, in_pos, in_size, &coder->compressed_size);
-		if (coder->compressed_size != 0)
-			return LZMA_OK;
-
-		coder->sequence = SEQ_CONTROL;
-		break;
-	}
-
-	default:
-		assert(0);
-		return LZMA_PROG_ERROR;
-	}
-
-	return LZMA_OK;
-}
-
-
-static void
-lzma2_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	assert(coder->lzma.end == NULL);
-	lzma_free(coder->lzma.coder, allocator);
-
-	lzma_free(coder, allocator);
-
-	return;
-}
-
-
-static lzma_ret
-lzma2_decoder_init(lzma_lz_decoder *lz, lzma_allocator *allocator,
-		const void *opt, lzma_lz_options *lz_options)
-{
-	if (lz->coder == NULL) {
-		lz->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (lz->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		lz->code = &lzma2_decode;
-		lz->end = &lzma2_decoder_end;
-
-		lz->coder->lzma = LZMA_LZ_DECODER_INIT;
-	}
-
-	const lzma_options_lzma *options = opt;
-
-	lz->coder->sequence = SEQ_CONTROL;
-	lz->coder->need_properties = true;
-	lz->coder->need_dictionary_reset = options->preset_dict == NULL
-			|| options->preset_dict_size == 0;
-
-	return lzma_lzma_decoder_create(&lz->coder->lzma,
-			allocator, options, lz_options);
-}
-
-
-extern lzma_ret
-lzma_lzma2_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	// LZMA2 can only be the last filter in the chain. This is enforced
-	// by the raw_decoder initialization.
-	assert(filters[1].init == NULL);
-
-	return lzma_lz_decoder_init(next, allocator, filters,
-			&lzma2_decoder_init);
-}
-
-
-extern uint64_t
-lzma_lzma2_decoder_memusage(const void *options)
-{
-	return sizeof(lzma_coder)
-			+ lzma_lzma_decoder_memusage_nocheck(options);
-}
-
-
-extern lzma_ret
-lzma_lzma2_props_decode(void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size)
-{
-	if (props_size != 1)
-		return LZMA_OPTIONS_ERROR;
-
-	// Check that reserved bits are unset.
-	if (props[0] & 0xC0)
-		return LZMA_OPTIONS_ERROR;
-
-	// Decode the dictionary size.
-	if (props[0] > 40)
-		return LZMA_OPTIONS_ERROR;
-
-	lzma_options_lzma *opt = lzma_alloc(
-			sizeof(lzma_options_lzma), allocator);
-	if (opt == NULL)
-		return LZMA_MEM_ERROR;
-
-	if (props[0] == 40) {
-		opt->dict_size = UINT32_MAX;
-	} else {
-		opt->dict_size = 2 | (props[0] & 1);
-		opt->dict_size <<= props[0] / 2 + 11;
-	}
-
-	opt->preset_dict = NULL;
-	opt->preset_dict_size = 0;
-
-	*options = opt;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma2_decoder.h r-base-3.3.1/src/extra/xz/lzma/lzma2_decoder.h
--- r-base-3.2.3/src/extra/xz/lzma/lzma2_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma2_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma2_decoder.h
-/// \brief      LZMA2 decoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZMA2_DECODER_H
-#define LZMA_LZMA2_DECODER_H
-
-#include "common.h"
-
-extern lzma_ret lzma_lzma2_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern uint64_t lzma_lzma2_decoder_memusage(const void *options);
-
-extern lzma_ret lzma_lzma2_props_decode(
-		void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma2_encoder.c r-base-3.3.1/src/extra/xz/lzma/lzma2_encoder.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma2_encoder.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma2_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,393 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma2_encoder.c
-/// \brief      LZMA2 encoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lz_encoder.h"
-#include "lzma_encoder.h"
-#include "fastpos.h"
-#include "lzma2_encoder.h"
-
-
-struct lzma_coder_s {
-	enum {
-		SEQ_INIT,
-		SEQ_LZMA_ENCODE,
-		SEQ_LZMA_COPY,
-		SEQ_UNCOMPRESSED_HEADER,
-		SEQ_UNCOMPRESSED_COPY,
-	} sequence;
-
-	/// LZMA encoder
-	lzma_coder *lzma;
-
-	/// LZMA options currently in use.
-	lzma_options_lzma opt_cur;
-
-	bool need_properties;
-	bool need_state_reset;
-	bool need_dictionary_reset;
-
-	/// Uncompressed size of a chunk
-	size_t uncompressed_size;
-
-	/// Compressed size of a chunk (excluding headers); this is also used
-	/// to indicate the end of buf[] in SEQ_LZMA_COPY.
-	size_t compressed_size;
-
-	/// Read position in buf[]
-	size_t buf_pos;
-
-	/// Buffer to hold the chunk header and LZMA compressed data
-	uint8_t buf[LZMA2_HEADER_MAX + LZMA2_CHUNK_MAX];
-};
-
-
-static void
-lzma2_header_lzma(lzma_coder *coder)
-{
-	assert(coder->uncompressed_size > 0);
-	assert(coder->uncompressed_size <= LZMA2_UNCOMPRESSED_MAX);
-	assert(coder->compressed_size > 0);
-	assert(coder->compressed_size <= LZMA2_CHUNK_MAX);
-
-	size_t pos;
-
-	if (coder->need_properties) {
-		pos = 0;
-
-		if (coder->need_dictionary_reset)
-			coder->buf[pos] = 0x80 + (3 << 5);
-		else
-			coder->buf[pos] = 0x80 + (2 << 5);
-	} else {
-		pos = 1;
-
-		if (coder->need_state_reset)
-			coder->buf[pos] = 0x80 + (1 << 5);
-		else
-			coder->buf[pos] = 0x80;
-	}
-
-	// Set the start position for copying.
-	coder->buf_pos = pos;
-
-	// Uncompressed size
-	size_t size = coder->uncompressed_size - 1;
-	coder->buf[pos++] += size >> 16;
-	coder->buf[pos++] = (size >> 8) & 0xFF;
-	coder->buf[pos++] = size & 0xFF;
-
-	// Compressed size
-	size = coder->compressed_size - 1;
-	coder->buf[pos++] = size >> 8;
-	coder->buf[pos++] = size & 0xFF;
-
-	// Properties, if needed
-	if (coder->need_properties)
-		lzma_lzma_lclppb_encode(&coder->opt_cur, coder->buf + pos);
-
-	coder->need_properties = false;
-	coder->need_state_reset = false;
-	coder->need_dictionary_reset = false;
-
-	// The copying code uses coder->compressed_size to indicate the end
-	// of coder->buf[], so we need add the maximum size of the header here.
-	coder->compressed_size += LZMA2_HEADER_MAX;
-
-	return;
-}
-
-
-static void
-lzma2_header_uncompressed(lzma_coder *coder)
-{
-	assert(coder->uncompressed_size > 0);
-	assert(coder->uncompressed_size <= LZMA2_CHUNK_MAX);
-
-	// If this is the first chunk, we need to include dictionary
-	// reset indicator.
-	if (coder->need_dictionary_reset)
-		coder->buf[0] = 1;
-	else
-		coder->buf[0] = 2;
-
-	coder->need_dictionary_reset = false;
-
-	// "Compressed" size
-	coder->buf[1] = (coder->uncompressed_size - 1) >> 8;
-	coder->buf[2] = (coder->uncompressed_size - 1) & 0xFF;
-
-	// Set the start position for copying.
-	coder->buf_pos = 0;
-	return;
-}
-
-
-static lzma_ret
-lzma2_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint8_t *restrict out, size_t *restrict out_pos,
-		size_t out_size)
-{
-	while (*out_pos < out_size)
-	switch (coder->sequence) {
-	case SEQ_INIT:
-		// If there's no input left and we are flushing or finishing,
-		// don't start a new chunk.
-		if (mf_unencoded(mf) == 0) {
-			// Write end of payload marker if finishing.
-			if (mf->action == LZMA_FINISH)
-				out[(*out_pos)++] = 0;
-
-			return mf->action == LZMA_RUN
-					? LZMA_OK : LZMA_STREAM_END;
-		}
-
-		if (coder->need_state_reset)
-			return_if_error(lzma_lzma_encoder_reset(
-					coder->lzma, &coder->opt_cur));
-
-		coder->uncompressed_size = 0;
-		coder->compressed_size = 0;
-		coder->sequence = SEQ_LZMA_ENCODE;
-
-	// Fall through
-
-	case SEQ_LZMA_ENCODE: {
-		// Calculate how much more uncompressed data this chunk
-		// could accept.
-		const uint32_t left = LZMA2_UNCOMPRESSED_MAX
-				- coder->uncompressed_size;
-		uint32_t limit;
-
-		if (left < mf->match_len_max) {
-			// Must flush immediately since the next LZMA symbol
-			// could make the uncompressed size of the chunk too
-			// big.
-			limit = 0;
-		} else {
-			// Calculate maximum read_limit that is OK from point
-			// of view of LZMA2 chunk size.
-			limit = mf->read_pos - mf->read_ahead
-					+ left - mf->match_len_max;
-		}
-
-		// Save the start position so that we can update
-		// coder->uncompressed_size.
-		const uint32_t read_start = mf->read_pos - mf->read_ahead;
-
-		// Call the LZMA encoder until the chunk is finished.
-		const lzma_ret ret = lzma_lzma_encode(coder->lzma, mf,
-				coder->buf + LZMA2_HEADER_MAX,
-				&coder->compressed_size,
-				LZMA2_CHUNK_MAX, limit);
-
-		coder->uncompressed_size += mf->read_pos - mf->read_ahead
-				- read_start;
-
-		assert(coder->compressed_size <= LZMA2_CHUNK_MAX);
-		assert(coder->uncompressed_size <= LZMA2_UNCOMPRESSED_MAX);
-
-		if (ret != LZMA_STREAM_END)
-			return LZMA_OK;
-
-		// See if the chunk compressed. If it didn't, we encode it
-		// as uncompressed chunk. This saves a few bytes of space
-		// and makes decoding faster.
-		if (coder->compressed_size >= coder->uncompressed_size) {
-			coder->uncompressed_size += mf->read_ahead;
-			assert(coder->uncompressed_size
-					<= LZMA2_UNCOMPRESSED_MAX);
-			mf->read_ahead = 0;
-			lzma2_header_uncompressed(coder);
-			coder->need_state_reset = true;
-			coder->sequence = SEQ_UNCOMPRESSED_HEADER;
-			break;
-		}
-
-		// The chunk did compress at least by one byte, so we store
-		// the chunk as LZMA.
-		lzma2_header_lzma(coder);
-
-		coder->sequence = SEQ_LZMA_COPY;
-	}
-
-	// Fall through
-
-	case SEQ_LZMA_COPY:
-		// Copy the compressed chunk along its headers to the
-		// output buffer.
-		lzma_bufcpy(coder->buf, &coder->buf_pos,
-				coder->compressed_size,
-				out, out_pos, out_size);
-		if (coder->buf_pos != coder->compressed_size)
-			return LZMA_OK;
-
-		coder->sequence = SEQ_INIT;
-		break;
-
-	case SEQ_UNCOMPRESSED_HEADER:
-		// Copy the three-byte header to indicate uncompressed chunk.
-		lzma_bufcpy(coder->buf, &coder->buf_pos,
-				LZMA2_HEADER_UNCOMPRESSED,
-				out, out_pos, out_size);
-		if (coder->buf_pos != LZMA2_HEADER_UNCOMPRESSED)
-			return LZMA_OK;
-
-		coder->sequence = SEQ_UNCOMPRESSED_COPY;
-
-	// Fall through
-
-	case SEQ_UNCOMPRESSED_COPY:
-		// Copy the uncompressed data as is from the dictionary
-		// to the output buffer.
-		mf_read(mf, out, out_pos, out_size, &coder->uncompressed_size);
-		if (coder->uncompressed_size != 0)
-			return LZMA_OK;
-
-		coder->sequence = SEQ_INIT;
-		break;
-	}
-
-	return LZMA_OK;
-}
-
-
-static void
-lzma2_encoder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_free(coder->lzma, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-lzma2_encoder_options_update(lzma_coder *coder, const lzma_filter *filter)
-{
-	// New options can be set only when there is no incomplete chunk.
-	// This is the case at the beginning of the raw stream and right
-	// after LZMA_SYNC_FLUSH.
-	if (filter->options == NULL || coder->sequence != SEQ_INIT)
-		return LZMA_PROG_ERROR;
-
-	// Look if there are new options. At least for now,
-	// only lc/lp/pb can be changed.
-	const lzma_options_lzma *opt = filter->options;
-	if (coder->opt_cur.lc != opt->lc || coder->opt_cur.lp != opt->lp
-			|| coder->opt_cur.pb != opt->pb) {
-		// Validate the options.
-		if (opt->lc > LZMA_LCLP_MAX || opt->lp > LZMA_LCLP_MAX
-				|| opt->lc + opt->lp > LZMA_LCLP_MAX
-				|| opt->pb > LZMA_PB_MAX)
-			return LZMA_OPTIONS_ERROR;
-
-		// The new options will be used when the encoder starts
-		// a new LZMA2 chunk.
-		coder->opt_cur.lc = opt->lc;
-		coder->opt_cur.lp = opt->lp;
-		coder->opt_cur.pb = opt->pb;
-		coder->need_properties = true;
-		coder->need_state_reset = true;
-	}
-
-	return LZMA_OK;
-}
-
-
-static lzma_ret
-lzma2_encoder_init(lzma_lz_encoder *lz, lzma_allocator *allocator,
-		const void *options, lzma_lz_options *lz_options)
-{
-	if (options == NULL)
-		return LZMA_PROG_ERROR;
-
-	if (lz->coder == NULL) {
-		lz->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (lz->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		lz->code = &lzma2_encode;
-		lz->end = &lzma2_encoder_end;
-		lz->options_update = &lzma2_encoder_options_update;
-
-		lz->coder->lzma = NULL;
-	}
-
-	lz->coder->opt_cur = *(const lzma_options_lzma *)(options);
-
-	lz->coder->sequence = SEQ_INIT;
-	lz->coder->need_properties = true;
-	lz->coder->need_state_reset = false;
-	lz->coder->need_dictionary_reset
-			= lz->coder->opt_cur.preset_dict == NULL
-			|| lz->coder->opt_cur.preset_dict_size == 0;
-
-	// Initialize LZMA encoder
-	return_if_error(lzma_lzma_encoder_create(&lz->coder->lzma, allocator,
-			&lz->coder->opt_cur, lz_options));
-
-	// Make sure that we will always have enough history available in
-	// case we need to use uncompressed chunks. They are used when the
-	// compressed size of a chunk is not smaller than the uncompressed
-	// size, so we need to have at least LZMA2_COMPRESSED_MAX bytes
-	// history available.
-	if (lz_options->before_size + lz_options->dict_size < LZMA2_CHUNK_MAX)
-		lz_options->before_size
-				= LZMA2_CHUNK_MAX - lz_options->dict_size;
-
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_lzma2_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	return lzma_lz_encoder_init(
-			next, allocator, filters, &lzma2_encoder_init);
-}
-
-
-extern uint64_t
-lzma_lzma2_encoder_memusage(const void *options)
-{
-	const uint64_t lzma_mem = lzma_lzma_encoder_memusage(options);
-	if (lzma_mem == UINT64_MAX)
-		return UINT64_MAX;
-
-	return sizeof(lzma_coder) + lzma_mem;
-}
-
-
-extern lzma_ret
-lzma_lzma2_props_encode(const void *options, uint8_t *out)
-{
-	const lzma_options_lzma *const opt = options;
-	uint32_t d = my_max(opt->dict_size, LZMA_DICT_SIZE_MIN);
-
-	// Round up to the next 2^n - 1 or 2^n + 2^(n - 1) - 1 depending
-	// on which one is the next:
-	--d;
-	d |= d >> 2;
-	d |= d >> 3;
-	d |= d >> 4;
-	d |= d >> 8;
-	d |= d >> 16;
-
-	// Get the highest two bits using the proper encoding:
-	if (d == UINT32_MAX)
-		out[0] = 40;
-	else
-		out[0] = get_pos_slot(d + 1) - 24;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma2_encoder.h r-base-3.3.1/src/extra/xz/lzma/lzma2_encoder.h
--- r-base-3.2.3/src/extra/xz/lzma/lzma2_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma2_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma2_encoder.h
-/// \brief      LZMA2 encoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZMA2_ENCODER_H
-#define LZMA_LZMA2_ENCODER_H
-
-#include "common.h"
-
-
-/// Maximum number of bytes of actual data per chunk (no headers)
-#define LZMA2_CHUNK_MAX (UINT32_C(1) << 16)
-
-/// Maximum uncompressed size of LZMA chunk (no headers)
-#define LZMA2_UNCOMPRESSED_MAX (UINT32_C(1) << 21)
-
-/// Maximum size of LZMA2 headers
-#define LZMA2_HEADER_MAX 6
-
-/// Size of a header for uncompressed chunk
-#define LZMA2_HEADER_UNCOMPRESSED 3
-
-
-extern lzma_ret lzma_lzma2_encoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters);
-
-extern uint64_t lzma_lzma2_encoder_memusage(const void *options);
-
-extern lzma_ret lzma_lzma2_props_encode(const void *options, uint8_t *out);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_common.h r-base-3.3.1/src/extra/xz/lzma/lzma_common.h
--- r-base-3.2.3/src/extra/xz/lzma/lzma_common.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,223 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_common.h
-/// \brief      Private definitions common to LZMA encoder and decoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZMA_COMMON_H
-#define LZMA_LZMA_COMMON_H
-
-#include "common.h"
-#include "range_common.h"
-
-
-///////////////////
-// Miscellaneous //
-///////////////////
-
-/// Maximum number of position states. A position state is the lowest pos bits
-/// number of bits of the current uncompressed offset. In some places there
-/// are different sets of probabilities for different pos states.
-#define POS_STATES_MAX (1 << LZMA_PB_MAX)
-
-
-/// Validates lc, lp, and pb.
-static inline bool
-is_lclppb_valid(const lzma_options_lzma *options)
-{
-	return options->lc <= LZMA_LCLP_MAX && options->lp <= LZMA_LCLP_MAX
-			&& options->lc + options->lp <= LZMA_LCLP_MAX
-			&& options->pb <= LZMA_PB_MAX;
-}
-
-
-///////////
-// State //
-///////////
-
-/// This enum is used to track which events have occurred most recently and
-/// in which order. This information is used to predict the next event.
-///
-/// Events:
-///  - Literal: One 8-bit byte
-///  - Match: Repeat a chunk of data at some distance
-///  - Long repeat: Multi-byte match at a recently seen distance
-///  - Short repeat: One-byte repeat at a recently seen distance
-///
-/// The event names are in from STATE_oldest_older_previous. REP means
-/// either short or long repeated match, and NONLIT means any non-literal.
-typedef enum {
-	STATE_LIT_LIT,
-	STATE_MATCH_LIT_LIT,
-	STATE_REP_LIT_LIT,
-	STATE_SHORTREP_LIT_LIT,
-	STATE_MATCH_LIT,
-	STATE_REP_LIT,
-	STATE_SHORTREP_LIT,
-	STATE_LIT_MATCH,
-	STATE_LIT_LONGREP,
-	STATE_LIT_SHORTREP,
-	STATE_NONLIT_MATCH,
-	STATE_NONLIT_REP,
-} lzma_lzma_state;
-
-
-/// Total number of states
-#define STATES 12
-
-/// The lowest 7 states indicate that the previous state was a literal.
-#define LIT_STATES 7
-
-
-/// Indicate that the latest state was a literal.
-#define update_literal(state) \
-	state = ((state) <= STATE_SHORTREP_LIT_LIT \
-			? STATE_LIT_LIT \
-			: ((state) <= STATE_LIT_SHORTREP \
-				? (state) - 3 \
-				: (state) - 6))
-
-/// Indicate that the latest state was a match.
-#define update_match(state) \
-	state = ((state) < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH)
-
-/// Indicate that the latest state was a long repeated match.
-#define update_long_rep(state) \
-	state = ((state) < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP)
-
-/// Indicate that the latest state was a short match.
-#define update_short_rep(state) \
-	state = ((state) < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP)
-
-/// Test if the previous state was a literal.
-#define is_literal_state(state) \
-	((state) < LIT_STATES)
-
-
-/////////////
-// Literal //
-/////////////
-
-/// Each literal coder is divided in three sections:
-///   - 0x001-0x0FF: Without match byte
-///   - 0x101-0x1FF: With match byte; match bit is 0
-///   - 0x201-0x2FF: With match byte; match bit is 1
-///
-/// Match byte is used when the previous LZMA symbol was something else than
-/// a literal (that is, it was some kind of match).
-#define LITERAL_CODER_SIZE 0x300
-
-/// Maximum number of literal coders
-#define LITERAL_CODERS_MAX (1 << LZMA_LCLP_MAX)
-
-/// Locate the literal coder for the next literal byte. The choice depends on
-///   - the lowest literal_pos_bits bits of the position of the current
-///     byte; and
-///   - the highest literal_context_bits bits of the previous byte.
-#define literal_subcoder(probs, lc, lp_mask, pos, prev_byte) \
-	((probs)[(((pos) & lp_mask) << lc) + ((prev_byte) >> (8 - lc))])
-
-
-static inline void
-literal_init(probability (*probs)[LITERAL_CODER_SIZE],
-		uint32_t lc, uint32_t lp)
-{
-	assert(lc + lp <= LZMA_LCLP_MAX);
-
-	const uint32_t coders = 1U << (lc + lp);
-
-	for (uint32_t i = 0; i < coders; ++i)
-		for (uint32_t j = 0; j < LITERAL_CODER_SIZE; ++j)
-			bit_reset(probs[i][j]);
-
-	return;
-}
-
-
-//////////////////
-// Match length //
-//////////////////
-
-// Minimum length of a match is two bytes.
-#define MATCH_LEN_MIN 2
-
-// Match length is encoded with 4, 5, or 10 bits.
-//
-// Length   Bits
-//  2-9      4 = Choice=0 + 3 bits
-// 10-17     5 = Choice=1 + Choice2=0 + 3 bits
-// 18-273   10 = Choice=1 + Choice2=1 + 8 bits
-#define LEN_LOW_BITS 3
-#define LEN_LOW_SYMBOLS (1 << LEN_LOW_BITS)
-#define LEN_MID_BITS 3
-#define LEN_MID_SYMBOLS (1 << LEN_MID_BITS)
-#define LEN_HIGH_BITS 8
-#define LEN_HIGH_SYMBOLS (1 << LEN_HIGH_BITS)
-#define LEN_SYMBOLS (LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS + LEN_HIGH_SYMBOLS)
-
-// Maximum length of a match is 273 which is a result of the encoding
-// described above.
-#define MATCH_LEN_MAX (MATCH_LEN_MIN + LEN_SYMBOLS - 1)
-
-
-////////////////////
-// Match distance //
-////////////////////
-
-// Different set of probabilities is used for match distances that have very
-// short match length: Lengths of 2, 3, and 4 bytes have a separate set of
-// probabilities for each length. The matches with longer length use a shared
-// set of probabilities.
-#define LEN_TO_POS_STATES 4
-
-// Macro to get the index of the appropriate probability array.
-#define get_len_to_pos_state(len) \
-	((len) < LEN_TO_POS_STATES + MATCH_LEN_MIN \
-		? (len) - MATCH_LEN_MIN \
-		: LEN_TO_POS_STATES - 1)
-
-// The highest two bits of a match distance (pos slot) are encoded using six
-// bits. See fastpos.h for more explanation.
-#define POS_SLOT_BITS 6
-#define POS_SLOTS (1 << POS_SLOT_BITS)
-
-// Match distances up to 127 are fully encoded using probabilities. Since
-// the highest two bits (pos slot) are always encoded using six bits, the
-// distances 0-3 don't need any additional bits to encode, since the pos
-// slot itself is the same as the actual distance. START_POS_MODEL_INDEX
-// indicates the first pos slot where at least one additional bit is needed.
-#define START_POS_MODEL_INDEX 4
-
-// Match distances greater than 127 are encoded in three pieces:
-//   - pos slot: the highest two bits
-//   - direct bits: 2-26 bits below the highest two bits
-//   - alignment bits: four lowest bits
-//
-// Direct bits don't use any probabilities.
-//
-// The pos slot value of 14 is for distances 128-191 (see the table in
-// fastpos.h to understand why).
-#define END_POS_MODEL_INDEX 14
-
-// Pos slots that indicate a distance <= 127.
-#define FULL_DISTANCES_BITS (END_POS_MODEL_INDEX / 2)
-#define FULL_DISTANCES (1 << FULL_DISTANCES_BITS)
-
-// For match distances greater than 127, only the highest two bits and the
-// lowest four bits (alignment) is encoded using probabilities.
-#define ALIGN_BITS 4
-#define ALIGN_TABLE_SIZE (1 << ALIGN_BITS)
-#define ALIGN_MASK (ALIGN_TABLE_SIZE - 1)
-
-// LZMA remembers the four most recent match distances. Reusing these distances
-// tends to take less space than re-encoding the actual distance value.
-#define REP_DISTANCES 4
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_decoder.c r-base-3.3.1/src/extra/xz/lzma/lzma_decoder.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma_decoder.c	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1057 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_decoder.c
-/// \brief      LZMA decoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lz_decoder.h"
-#include "lzma_common.h"
-#include "lzma_decoder.h"
-#include "range_decoder.h"
-
-
-#ifdef HAVE_SMALL
-
-// Macros for (somewhat) size-optimized code.
-#define seq_4(seq) seq
-
-#define seq_6(seq) seq
-
-#define seq_8(seq) seq
-
-#define seq_len(seq) \
-	seq ## _CHOICE, \
-	seq ## _CHOICE2, \
-	seq ## _BITTREE
-
-#define len_decode(target, ld, pos_state, seq) \
-do { \
-case seq ## _CHOICE: \
-	rc_if_0(ld.choice, seq ## _CHOICE) { \
-		rc_update_0(ld.choice); \
-		probs = ld.low[pos_state];\
-		limit = LEN_LOW_SYMBOLS; \
-		target = MATCH_LEN_MIN; \
-	} else { \
-		rc_update_1(ld.choice); \
-case seq ## _CHOICE2: \
-		rc_if_0(ld.choice2, seq ## _CHOICE2) { \
-			rc_update_0(ld.choice2); \
-			probs = ld.mid[pos_state]; \
-			limit = LEN_MID_SYMBOLS; \
-			target = MATCH_LEN_MIN + LEN_LOW_SYMBOLS; \
-		} else { \
-			rc_update_1(ld.choice2); \
-			probs = ld.high; \
-			limit = LEN_HIGH_SYMBOLS; \
-			target = MATCH_LEN_MIN + LEN_LOW_SYMBOLS \
-					+ LEN_MID_SYMBOLS; \
-		} \
-	} \
-	symbol = 1; \
-case seq ## _BITTREE: \
-	do { \
-		rc_bit(probs[symbol], , , seq ## _BITTREE); \
-	} while (symbol < limit); \
-	target += symbol - limit; \
-} while (0)
-
-#else // HAVE_SMALL
-
-// Unrolled versions
-#define seq_4(seq) \
-	seq ## 0, \
-	seq ## 1, \
-	seq ## 2, \
-	seq ## 3
-
-#define seq_6(seq) \
-	seq ## 0, \
-	seq ## 1, \
-	seq ## 2, \
-	seq ## 3, \
-	seq ## 4, \
-	seq ## 5
-
-#define seq_8(seq) \
-	seq ## 0, \
-	seq ## 1, \
-	seq ## 2, \
-	seq ## 3, \
-	seq ## 4, \
-	seq ## 5, \
-	seq ## 6, \
-	seq ## 7
-
-#define seq_len(seq) \
-	seq ## _CHOICE, \
-	seq ## _LOW0, \
-	seq ## _LOW1, \
-	seq ## _LOW2, \
-	seq ## _CHOICE2, \
-	seq ## _MID0, \
-	seq ## _MID1, \
-	seq ## _MID2, \
-	seq ## _HIGH0, \
-	seq ## _HIGH1, \
-	seq ## _HIGH2, \
-	seq ## _HIGH3, \
-	seq ## _HIGH4, \
-	seq ## _HIGH5, \
-	seq ## _HIGH6, \
-	seq ## _HIGH7
-
-#define len_decode(target, ld, pos_state, seq) \
-do { \
-	symbol = 1; \
-case seq ## _CHOICE: \
-	rc_if_0(ld.choice, seq ## _CHOICE) { \
-		rc_update_0(ld.choice); \
-		rc_bit_case(ld.low[pos_state][symbol], , , seq ## _LOW0); \
-		rc_bit_case(ld.low[pos_state][symbol], , , seq ## _LOW1); \
-		rc_bit_case(ld.low[pos_state][symbol], , , seq ## _LOW2); \
-		target = symbol - LEN_LOW_SYMBOLS + MATCH_LEN_MIN; \
-	} else { \
-		rc_update_1(ld.choice); \
-case seq ## _CHOICE2: \
-		rc_if_0(ld.choice2, seq ## _CHOICE2) { \
-			rc_update_0(ld.choice2); \
-			rc_bit_case(ld.mid[pos_state][symbol], , , \
-					seq ## _MID0); \
-			rc_bit_case(ld.mid[pos_state][symbol], , , \
-					seq ## _MID1); \
-			rc_bit_case(ld.mid[pos_state][symbol], , , \
-					seq ## _MID2); \
-			target = symbol - LEN_MID_SYMBOLS \
-					+ MATCH_LEN_MIN + LEN_LOW_SYMBOLS; \
-		} else { \
-			rc_update_1(ld.choice2); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH0); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH1); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH2); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH3); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH4); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH5); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH6); \
-			rc_bit_case(ld.high[symbol], , , seq ## _HIGH7); \
-			target = symbol - LEN_HIGH_SYMBOLS \
-					+ MATCH_LEN_MIN \
-					+ LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS; \
-		} \
-	} \
-} while (0)
-
-#endif // HAVE_SMALL
-
-
-/// Length decoder probabilities; see comments in lzma_common.h.
-typedef struct {
-	probability choice;
-	probability choice2;
-	probability low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
-	probability mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
-	probability high[LEN_HIGH_SYMBOLS];
-} lzma_length_decoder;
-
-
-struct lzma_coder_s {
-	///////////////////
-	// Probabilities //
-	///////////////////
-
-	/// Literals; see comments in lzma_common.h.
-	probability literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
-
-	/// If 1, it's a match. Otherwise it's a single 8-bit literal.
-	probability is_match[STATES][POS_STATES_MAX];
-
-	/// If 1, it's a repeated match. The distance is one of rep0 .. rep3.
-	probability is_rep[STATES];
-
-	/// If 0, distance of a repeated match is rep0.
-	/// Otherwise check is_rep1.
-	probability is_rep0[STATES];
-
-	/// If 0, distance of a repeated match is rep1.
-	/// Otherwise check is_rep2.
-	probability is_rep1[STATES];
-
-	/// If 0, distance of a repeated match is rep2. Otherwise it is rep3.
-	probability is_rep2[STATES];
-
-	/// If 1, the repeated match has length of one byte. Otherwise
-	/// the length is decoded from rep_len_decoder.
-	probability is_rep0_long[STATES][POS_STATES_MAX];
-
-	/// Probability tree for the highest two bits of the match distance.
-	/// There is a separate probability tree for match lengths of
-	/// 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
-	probability pos_slot[LEN_TO_POS_STATES][POS_SLOTS];
-
-	/// Probability trees for additional bits for match distance when the
-	/// distance is in the range [4, 127].
-	probability pos_special[FULL_DISTANCES - END_POS_MODEL_INDEX];
-
-	/// Probability tree for the lowest four bits of a match distance
-	/// that is equal to or greater than 128.
-	probability pos_align[ALIGN_TABLE_SIZE];
-
-	/// Length of a normal match
-	lzma_length_decoder match_len_decoder;
-
-	/// Length of a repeated match
-	lzma_length_decoder rep_len_decoder;
-
-	///////////////////
-	// Decoder state //
-	///////////////////
-
-	// Range coder
-	lzma_range_decoder rc;
-
-	// Types of the most recently seen LZMA symbols
-	lzma_lzma_state state;
-
-	uint32_t rep0;      ///< Distance of the latest match
-	uint32_t rep1;      ///< Distance of second latest match
-	uint32_t rep2;      ///< Distance of third latest match
-	uint32_t rep3;      ///< Distance of fourth latest match
-
-	uint32_t pos_mask; // (1U << pb) - 1
-	uint32_t literal_context_bits;
-	uint32_t literal_pos_mask;
-
-	/// Uncompressed size as bytes, or LZMA_VLI_UNKNOWN if end of
-	/// payload marker is expected.
-	lzma_vli uncompressed_size;
-
-	////////////////////////////////
-	// State of incomplete symbol //
-	////////////////////////////////
-
-	/// Position where to continue the decoder loop
-	enum {
-		SEQ_NORMALIZE,
-		SEQ_IS_MATCH,
-		seq_8(SEQ_LITERAL),
-		seq_8(SEQ_LITERAL_MATCHED),
-		SEQ_LITERAL_WRITE,
-		SEQ_IS_REP,
-		seq_len(SEQ_MATCH_LEN),
-		seq_6(SEQ_POS_SLOT),
-		SEQ_POS_MODEL,
-		SEQ_DIRECT,
-		seq_4(SEQ_ALIGN),
-		SEQ_EOPM,
-		SEQ_IS_REP0,
-		SEQ_SHORTREP,
-		SEQ_IS_REP0_LONG,
-		SEQ_IS_REP1,
-		SEQ_IS_REP2,
-		seq_len(SEQ_REP_LEN),
-		SEQ_COPY,
-	} sequence;
-
-	/// Base of the current probability tree
-	probability *probs;
-
-	/// Symbol being decoded. This is also used as an index variable in
-	/// bittree decoders: probs[symbol]
-	uint32_t symbol;
-
-	/// Used as a loop termination condition on bittree decoders and
-	/// direct bits decoder.
-	uint32_t limit;
-
-	/// Matched literal decoder: 0x100 or 0 to help avoiding branches.
-	/// Bittree reverse decoders: Offset of the next bit: 1 << offset
-	uint32_t offset;
-
-	/// If decoding a literal: match byte.
-	/// If decoding a match: length of the match.
-	uint32_t len;
-};
-
-
-static lzma_ret
-lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
-		const uint8_t *restrict in,
-		size_t *restrict in_pos, size_t in_size)
-{
-	////////////////////
-	// Initialization //
-	////////////////////
-
-	if (!rc_read_init(&coder->rc, in, in_pos, in_size))
-		return LZMA_OK;
-
-	///////////////
-	// Variables //
-	///////////////
-
-	// Making local copies of often-used variables improves both
-	// speed and readability.
-
-	lzma_dict dict = *dictptr;
-
-	const size_t dict_start = dict.pos;
-
-	// Range decoder
-	rc_to_local(coder->rc, *in_pos);
-
-	// State
-	uint32_t state = coder->state;
-	uint32_t rep0 = coder->rep0;
-	uint32_t rep1 = coder->rep1;
-	uint32_t rep2 = coder->rep2;
-	uint32_t rep3 = coder->rep3;
-
-	const uint32_t pos_mask = coder->pos_mask;
-
-	// These variables are actually needed only if we last time ran
-	// out of input in the middle of the decoder loop.
-	probability *probs = coder->probs;
-	uint32_t symbol = coder->symbol;
-	uint32_t limit = coder->limit;
-	uint32_t offset = coder->offset;
-	uint32_t len = coder->len;
-
-	const uint32_t literal_pos_mask = coder->literal_pos_mask;
-	const uint32_t literal_context_bits = coder->literal_context_bits;
-
-	// Temporary variables
-	uint32_t pos_state = dict.pos & pos_mask;
-
-	lzma_ret ret = LZMA_OK;
-
-	// If uncompressed size is known, there must be no end of payload
-	// marker.
-	const bool no_eopm = coder->uncompressed_size
-			!= LZMA_VLI_UNKNOWN;
-	if (no_eopm && coder->uncompressed_size < dict.limit - dict.pos)
-		dict.limit = dict.pos + (size_t)(coder->uncompressed_size);
-
-	// The main decoder loop. The "switch" is used to restart the decoder at
-	// correct location. Once restarted, the "switch" is no longer used.
-	switch (coder->sequence)
-	while (true) {
-		// Calculate new pos_state. This is skipped on the first loop
-		// since we already calculated it when setting up the local
-		// variables.
-		pos_state = dict.pos & pos_mask;
-
-	case SEQ_NORMALIZE:
-	case SEQ_IS_MATCH:
-		if (unlikely(no_eopm && dict.pos == dict.limit))
-			break;
-
-		rc_if_0(coder->is_match[state][pos_state], SEQ_IS_MATCH) {
-			rc_update_0(coder->is_match[state][pos_state]);
-
-			// It's a literal i.e. a single 8-bit byte.
-
-			probs = literal_subcoder(coder->literal,
-					literal_context_bits, literal_pos_mask,
-					dict.pos, dict_get(&dict, 0));
-			symbol = 1;
-
-			if (is_literal_state(state)) {
-				// Decode literal without match byte.
-#ifdef HAVE_SMALL
-	case SEQ_LITERAL:
-				do {
-					rc_bit(probs[symbol], , , SEQ_LITERAL);
-				} while (symbol < (1 << 8));
-#else
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL0);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL1);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL2);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL3);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL4);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL5);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL6);
-				rc_bit_case(probs[symbol], , , SEQ_LITERAL7);
-#endif
-			} else {
-				// Decode literal with match byte.
-				//
-				// We store the byte we compare against
-				// ("match byte") to "len" to minimize the
-				// number of variables we need to store
-				// between decoder calls.
-				len = dict_get(&dict, rep0) << 1;
-
-				// The usage of "offset" allows omitting some
-				// branches, which should give tiny speed
-				// improvement on some CPUs. "offset" gets
-				// set to zero if match_bit didn't match.
-				offset = 0x100;
-
-#ifdef HAVE_SMALL
-	case SEQ_LITERAL_MATCHED:
-				do {
-					const uint32_t match_bit
-							= len & offset;
-					const uint32_t subcoder_index
-							= offset + match_bit
-							+ symbol;
-
-					rc_bit(probs[subcoder_index],
-							offset &= ~match_bit,
-							offset &= match_bit,
-							SEQ_LITERAL_MATCHED);
-
-					// It seems to be faster to do this
-					// here instead of putting it to the
-					// beginning of the loop and then
-					// putting the "case" in the middle
-					// of the loop.
-					len <<= 1;
-
-				} while (symbol < (1 << 8));
-#else
-				// Unroll the loop.
-				uint32_t match_bit;
-				uint32_t subcoder_index;
-
-#	define d(seq) \
-		case seq: \
-			match_bit = len & offset; \
-			subcoder_index = offset + match_bit + symbol; \
-			rc_bit(probs[subcoder_index], \
-					offset &= ~match_bit, \
-					offset &= match_bit, \
-					seq)
-
-				d(SEQ_LITERAL_MATCHED0);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED1);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED2);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED3);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED4);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED5);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED6);
-				len <<= 1;
-				d(SEQ_LITERAL_MATCHED7);
-#	undef d
-#endif
-			}
-
-			//update_literal(state);
-			// Use a lookup table to update to literal state,
-			// since compared to other state updates, this would
-			// need two branches.
-			static const lzma_lzma_state next_state[] = {
-				STATE_LIT_LIT,
-				STATE_LIT_LIT,
-				STATE_LIT_LIT,
-				STATE_LIT_LIT,
-				STATE_MATCH_LIT_LIT,
-				STATE_REP_LIT_LIT,
-				STATE_SHORTREP_LIT_LIT,
-				STATE_MATCH_LIT,
-				STATE_REP_LIT,
-				STATE_SHORTREP_LIT,
-				STATE_MATCH_LIT,
-				STATE_REP_LIT
-			};
-			state = next_state[state];
-
-	case SEQ_LITERAL_WRITE:
-			if (unlikely(dict_put(&dict, symbol))) {
-				coder->sequence = SEQ_LITERAL_WRITE;
-				goto out;
-			}
-
-			continue;
-		}
-
-		// Instead of a new byte we are going to get a byte range
-		// (distance and length) which will be repeated from our
-		// output history.
-
-		rc_update_1(coder->is_match[state][pos_state]);
-
-	case SEQ_IS_REP:
-		rc_if_0(coder->is_rep[state], SEQ_IS_REP) {
-			// Not a repeated match
-			rc_update_0(coder->is_rep[state]);
-			update_match(state);
-
-			// The latest three match distances are kept in
-			// memory in case there are repeated matches.
-			rep3 = rep2;
-			rep2 = rep1;
-			rep1 = rep0;
-
-			// Decode the length of the match.
-			len_decode(len, coder->match_len_decoder,
-					pos_state, SEQ_MATCH_LEN);
-
-			// Prepare to decode the highest two bits of the
-			// match distance.
-			probs = coder->pos_slot[get_len_to_pos_state(len)];
-			symbol = 1;
-
-#ifdef HAVE_SMALL
-	case SEQ_POS_SLOT:
-			do {
-				rc_bit(probs[symbol], , , SEQ_POS_SLOT);
-			} while (symbol < POS_SLOTS);
-#else
-			rc_bit_case(probs[symbol], , , SEQ_POS_SLOT0);
-			rc_bit_case(probs[symbol], , , SEQ_POS_SLOT1);
-			rc_bit_case(probs[symbol], , , SEQ_POS_SLOT2);
-			rc_bit_case(probs[symbol], , , SEQ_POS_SLOT3);
-			rc_bit_case(probs[symbol], , , SEQ_POS_SLOT4);
-			rc_bit_case(probs[symbol], , , SEQ_POS_SLOT5);
-#endif
-			// Get rid of the highest bit that was needed for
-			// indexing of the probability array.
-			symbol -= POS_SLOTS;
-			assert(symbol <= 63);
-
-			if (symbol < START_POS_MODEL_INDEX) {
-				// Match distances [0, 3] have only two bits.
-				rep0 = symbol;
-			} else {
-				// Decode the lowest [1, 29] bits of
-				// the match distance.
-				limit = (symbol >> 1) - 1;
-				assert(limit >= 1 && limit <= 30);
-				rep0 = 2 + (symbol & 1);
-
-				if (symbol < END_POS_MODEL_INDEX) {
-					// Prepare to decode the low bits for
-					// a distance of [4, 127].
-					assert(limit <= 5);
-					rep0 <<= limit;
-					assert(rep0 <= 96);
-					// -1 is fine, because we start
-					// decoding at probs[1], not probs[0].
-					// NOTE: This violates the C standard,
-					// since we are doing pointer
-					// arithmetic past the beginning of
-					// the array.
-					assert((int32_t)(rep0 - symbol - 1)
-							>= -1);
-					assert((int32_t)(rep0 - symbol - 1)
-							<= 82);
-					probs = coder->pos_special + rep0
-							- symbol - 1;
-					symbol = 1;
-					offset = 0;
-	case SEQ_POS_MODEL:
-#ifdef HAVE_SMALL
-					do {
-						rc_bit(probs[symbol], ,
-							rep0 += 1 << offset,
-							SEQ_POS_MODEL);
-					} while (++offset < limit);
-#else
-					switch (limit) {
-					case 5:
-						assert(offset == 0);
-						rc_bit(probs[symbol], ,
-							rep0 += 1,
-							SEQ_POS_MODEL);
-						++offset;
-						--limit;
-					case 4:
-						rc_bit(probs[symbol], ,
-							rep0 += 1 << offset,
-							SEQ_POS_MODEL);
-						++offset;
-						--limit;
-					case 3:
-						rc_bit(probs[symbol], ,
-							rep0 += 1 << offset,
-							SEQ_POS_MODEL);
-						++offset;
-						--limit;
-					case 2:
-						rc_bit(probs[symbol], ,
-							rep0 += 1 << offset,
-							SEQ_POS_MODEL);
-						++offset;
-						--limit;
-					case 1:
-						// We need "symbol" only for
-						// indexing the probability
-						// array, thus we can use
-						// rc_bit_last() here to omit
-						// the unneeded updating of
-						// "symbol".
-						rc_bit_last(probs[symbol], ,
-							rep0 += 1 << offset,
-							SEQ_POS_MODEL);
-					}
-#endif
-				} else {
-					// The distance is >= 128. Decode the
-					// lower bits without probabilities
-					// except the lowest four bits.
-					assert(symbol >= 14);
-					assert(limit >= 6);
-					limit -= ALIGN_BITS;
-					assert(limit >= 2);
-	case SEQ_DIRECT:
-					// Not worth manual unrolling
-					do {
-						rc_direct(rep0, SEQ_DIRECT);
-					} while (--limit > 0);
-
-					// Decode the lowest four bits using
-					// probabilities.
-					rep0 <<= ALIGN_BITS;
-					symbol = 1;
-#ifdef HAVE_SMALL
-					offset = 0;
-	case SEQ_ALIGN:
-					do {
-						rc_bit(coder->pos_align[
-								symbol], ,
-							rep0 += 1 << offset,
-							SEQ_ALIGN);
-					} while (++offset < ALIGN_BITS);
-#else
-	case SEQ_ALIGN0:
-					rc_bit(coder->pos_align[symbol], ,
-							rep0 += 1, SEQ_ALIGN0);
-	case SEQ_ALIGN1:
-					rc_bit(coder->pos_align[symbol], ,
-							rep0 += 2, SEQ_ALIGN1);
-	case SEQ_ALIGN2:
-					rc_bit(coder->pos_align[symbol], ,
-							rep0 += 4, SEQ_ALIGN2);
-	case SEQ_ALIGN3:
-					// Like in SEQ_POS_MODEL, we don't
-					// need "symbol" for anything else
-					// than indexing the probability array.
-					rc_bit_last(coder->pos_align[symbol], ,
-							rep0 += 8, SEQ_ALIGN3);
-#endif
-
-					if (rep0 == UINT32_MAX) {
-						// End of payload marker was
-						// found. It must not be
-						// present if uncompressed
-						// size is known.
-						if (coder->uncompressed_size
-						!= LZMA_VLI_UNKNOWN) {
-							ret = LZMA_DATA_ERROR;
-							goto out;
-						}
-
-	case SEQ_EOPM:
-						// LZMA1 stream with
-						// end-of-payload marker.
-						rc_normalize(SEQ_EOPM);
-						ret = LZMA_STREAM_END;
-						goto out;
-					}
-				}
-			}
-
-			// Validate the distance we just decoded.
-			if (unlikely(!dict_is_distance_valid(&dict, rep0))) {
-				ret = LZMA_DATA_ERROR;
-				goto out;
-			}
-
-		} else {
-			rc_update_1(coder->is_rep[state]);
-
-			// Repeated match
-			//
-			// The match distance is a value that we have had
-			// earlier. The latest four match distances are
-			// available as rep0, rep1, rep2 and rep3. We will
-			// now decode which of them is the new distance.
-			//
-			// There cannot be a match if we haven't produced
-			// any output, so check that first.
-			if (unlikely(!dict_is_distance_valid(&dict, 0))) {
-				ret = LZMA_DATA_ERROR;
-				goto out;
-			}
-
-	case SEQ_IS_REP0:
-			rc_if_0(coder->is_rep0[state], SEQ_IS_REP0) {
-				rc_update_0(coder->is_rep0[state]);
-				// The distance is rep0.
-
-	case SEQ_IS_REP0_LONG:
-				rc_if_0(coder->is_rep0_long[state][pos_state],
-						SEQ_IS_REP0_LONG) {
-					rc_update_0(coder->is_rep0_long[
-							state][pos_state]);
-
-					update_short_rep(state);
-
-	case SEQ_SHORTREP:
-					if (unlikely(dict_put(&dict, dict_get(
-							&dict, rep0)))) {
-						coder->sequence = SEQ_SHORTREP;
-						goto out;
-					}
-
-					continue;
-				}
-
-				// Repeating more than one byte at
-				// distance of rep0.
-				rc_update_1(coder->is_rep0_long[
-						state][pos_state]);
-
-			} else {
-				rc_update_1(coder->is_rep0[state]);
-
-	case SEQ_IS_REP1:
-				// The distance is rep1, rep2 or rep3. Once
-				// we find out which one of these three, it
-				// is stored to rep0 and rep1, rep2 and rep3
-				// are updated accordingly.
-				rc_if_0(coder->is_rep1[state], SEQ_IS_REP1) {
-					rc_update_0(coder->is_rep1[state]);
-
-					const uint32_t distance = rep1;
-					rep1 = rep0;
-					rep0 = distance;
-
-				} else {
-					rc_update_1(coder->is_rep1[state]);
-	case SEQ_IS_REP2:
-					rc_if_0(coder->is_rep2[state],
-							SEQ_IS_REP2) {
-						rc_update_0(coder->is_rep2[
-								state]);
-
-						const uint32_t distance = rep2;
-						rep2 = rep1;
-						rep1 = rep0;
-						rep0 = distance;
-
-					} else {
-						rc_update_1(coder->is_rep2[
-								state]);
-
-						const uint32_t distance = rep3;
-						rep3 = rep2;
-						rep2 = rep1;
-						rep1 = rep0;
-						rep0 = distance;
-					}
-				}
-			}
-
-			update_long_rep(state);
-
-			// Decode the length of the repeated match.
-			len_decode(len, coder->rep_len_decoder,
-					pos_state, SEQ_REP_LEN);
-		}
-
-		/////////////////////////////////
-		// Repeat from history buffer. //
-		/////////////////////////////////
-
-		// The length is always between these limits. There is no way
-		// to trigger the algorithm to set len outside this range.
-		assert(len >= MATCH_LEN_MIN);
-		assert(len <= MATCH_LEN_MAX);
-
-	case SEQ_COPY:
-		// Repeat len bytes from distance of rep0.
-		if (unlikely(dict_repeat(&dict, rep0, &len))) {
-			coder->sequence = SEQ_COPY;
-			goto out;
-		}
-	}
-
-	rc_normalize(SEQ_NORMALIZE);
-	coder->sequence = SEQ_IS_MATCH;
-
-out:
-	// Save state
-
-	// NOTE: Must not copy dict.limit.
-	dictptr->pos = dict.pos;
-	dictptr->full = dict.full;
-
-	rc_from_local(coder->rc, *in_pos);
-
-	coder->state = state;
-	coder->rep0 = rep0;
-	coder->rep1 = rep1;
-	coder->rep2 = rep2;
-	coder->rep3 = rep3;
-
-	coder->probs = probs;
-	coder->symbol = symbol;
-	coder->limit = limit;
-	coder->offset = offset;
-	coder->len = len;
-
-	// Update the remaining amount of uncompressed data if uncompressed
-	// size was known.
-	if (coder->uncompressed_size != LZMA_VLI_UNKNOWN) {
-		coder->uncompressed_size -= dict.pos - dict_start;
-
-		// Since there cannot be end of payload marker if the
-		// uncompressed size was known, we check here if we
-		// finished decoding.
-		if (coder->uncompressed_size == 0 && ret == LZMA_OK
-				&& coder->sequence != SEQ_NORMALIZE)
-			ret = coder->sequence == SEQ_IS_MATCH
-					? LZMA_STREAM_END : LZMA_DATA_ERROR;
-	}
-
-	// We can do an additional check in the range decoder to catch some
-	// corrupted files.
-	if (ret == LZMA_STREAM_END) {
-		if (!rc_is_finished(coder->rc))
-			ret = LZMA_DATA_ERROR;
-
-		// Reset the range decoder so that it is ready to reinitialize
-		// for a new LZMA2 chunk.
-		rc_reset(coder->rc);
-	}
-
-	return ret;
-}
-
-
-
-static void
-lzma_decoder_uncompressed(lzma_coder *coder, lzma_vli uncompressed_size)
-{
-	coder->uncompressed_size = uncompressed_size;
-}
-
-/*
-extern void
-lzma_lzma_decoder_uncompressed(void *coder_ptr, lzma_vli uncompressed_size)
-{
-	// This is hack.
-	(*(lzma_coder **)(coder))->uncompressed_size = uncompressed_size;
-}
-*/
-
-static void
-lzma_decoder_reset(lzma_coder *coder, const void *opt)
-{
-	const lzma_options_lzma *options = opt;
-
-	// NOTE: We assume that lc/lp/pb are valid since they were
-	// successfully decoded with lzma_lzma_decode_properties().
-
-	// Calculate pos_mask. We don't need pos_bits as is for anything.
-	coder->pos_mask = (1U << options->pb) - 1;
-
-	// Initialize the literal decoder.
-	literal_init(coder->literal, options->lc, options->lp);
-
-	coder->literal_context_bits = options->lc;
-	coder->literal_pos_mask = (1U << options->lp) - 1;
-
-	// State
-	coder->state = STATE_LIT_LIT;
-	coder->rep0 = 0;
-	coder->rep1 = 0;
-	coder->rep2 = 0;
-	coder->rep3 = 0;
-	coder->pos_mask = (1U << options->pb) - 1;
-
-	// Range decoder
-	rc_reset(coder->rc);
-
-	// Bit and bittree decoders
-	for (uint32_t i = 0; i < STATES; ++i) {
-		for (uint32_t j = 0; j <= coder->pos_mask; ++j) {
-			bit_reset(coder->is_match[i][j]);
-			bit_reset(coder->is_rep0_long[i][j]);
-		}
-
-		bit_reset(coder->is_rep[i]);
-		bit_reset(coder->is_rep0[i]);
-		bit_reset(coder->is_rep1[i]);
-		bit_reset(coder->is_rep2[i]);
-	}
-
-	for (uint32_t i = 0; i < LEN_TO_POS_STATES; ++i)
-		bittree_reset(coder->pos_slot[i], POS_SLOT_BITS);
-
-	for (uint32_t i = 0; i < FULL_DISTANCES - END_POS_MODEL_INDEX; ++i)
-		bit_reset(coder->pos_special[i]);
-
-	bittree_reset(coder->pos_align, ALIGN_BITS);
-
-	// Len decoders (also bit/bittree)
-	const uint32_t num_pos_states = 1U << options->pb;
-	bit_reset(coder->match_len_decoder.choice);
-	bit_reset(coder->match_len_decoder.choice2);
-	bit_reset(coder->rep_len_decoder.choice);
-	bit_reset(coder->rep_len_decoder.choice2);
-
-	for (uint32_t pos_state = 0; pos_state < num_pos_states; ++pos_state) {
-		bittree_reset(coder->match_len_decoder.low[pos_state],
-				LEN_LOW_BITS);
-		bittree_reset(coder->match_len_decoder.mid[pos_state],
-				LEN_MID_BITS);
-
-		bittree_reset(coder->rep_len_decoder.low[pos_state],
-				LEN_LOW_BITS);
-		bittree_reset(coder->rep_len_decoder.mid[pos_state],
-				LEN_MID_BITS);
-	}
-
-	bittree_reset(coder->match_len_decoder.high, LEN_HIGH_BITS);
-	bittree_reset(coder->rep_len_decoder.high, LEN_HIGH_BITS);
-
-	coder->sequence = SEQ_IS_MATCH;
-	coder->probs = NULL;
-	coder->symbol = 0;
-	coder->limit = 0;
-	coder->offset = 0;
-	coder->len = 0;
-
-	return;
-}
-
-
-extern lzma_ret
-lzma_lzma_decoder_create(lzma_lz_decoder *lz, lzma_allocator *allocator,
-		const void *opt, lzma_lz_options *lz_options)
-{
-	if (lz->coder == NULL) {
-		lz->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (lz->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		lz->code = &lzma_decode;
-		lz->reset = &lzma_decoder_reset;
-		lz->set_uncompressed = &lzma_decoder_uncompressed;
-	}
-
-	// All dictionary sizes are OK here. LZ decoder will take care of
-	// the special cases.
-	const lzma_options_lzma *options = opt;
-	lz_options->dict_size = options->dict_size;
-	lz_options->preset_dict = options->preset_dict;
-	lz_options->preset_dict_size = options->preset_dict_size;
-
-	return LZMA_OK;
-}
-
-
-/// Allocate and initialize LZMA decoder. This is used only via LZ
-/// initialization (lzma_lzma_decoder_init() passes function pointer to
-/// the LZ initialization).
-static lzma_ret
-lzma_decoder_init(lzma_lz_decoder *lz, lzma_allocator *allocator,
-		const void *options, lzma_lz_options *lz_options)
-{
-	if (!is_lclppb_valid(options))
-		return LZMA_PROG_ERROR;
-
-	return_if_error(lzma_lzma_decoder_create(
-			lz, allocator, options, lz_options));
-
-	lzma_decoder_reset(lz->coder, options);
-	lzma_decoder_uncompressed(lz->coder, LZMA_VLI_UNKNOWN);
-
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_lzma_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	// LZMA can only be the last filter in the chain. This is enforced
-	// by the raw_decoder initialization.
-	assert(filters[1].init == NULL);
-
-	return lzma_lz_decoder_init(next, allocator, filters,
-			&lzma_decoder_init);
-}
-
-
-extern bool
-lzma_lzma_lclppb_decode(lzma_options_lzma *options, uint8_t byte)
-{
-	if (byte > (4 * 5 + 4) * 9 + 8)
-		return true;
-
-	// See the file format specification to understand this.
-	options->pb = byte / (9 * 5);
-	byte -= options->pb * 9 * 5;
-	options->lp = byte / 9;
-	options->lc = byte - options->lp * 9;
-
-	return options->lc + options->lp > LZMA_LCLP_MAX;
-}
-
-
-extern uint64_t
-lzma_lzma_decoder_memusage_nocheck(const void *options)
-{
-	const lzma_options_lzma *const opt = options;
-	return sizeof(lzma_coder) + lzma_lz_decoder_memusage(opt->dict_size);
-}
-
-
-extern uint64_t
-lzma_lzma_decoder_memusage(const void *options)
-{
-	if (!is_lclppb_valid(options))
-		return UINT64_MAX;
-
-	return lzma_lzma_decoder_memusage_nocheck(options);
-}
-
-
-extern lzma_ret
-lzma_lzma_props_decode(void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size)
-{
-	if (props_size != 5)
-		return LZMA_OPTIONS_ERROR;
-
-	lzma_options_lzma *opt
-			= lzma_alloc(sizeof(lzma_options_lzma), allocator);
-	if (opt == NULL)
-		return LZMA_MEM_ERROR;
-
-	if (lzma_lzma_lclppb_decode(opt, props[0]))
-		goto error;
-
-	// All dictionary sizes are accepted, including zero. LZ decoder
-	// will automatically use a dictionary at least a few KiB even if
-	// a smaller dictionary is requested.
-	opt->dict_size = unaligned_read32le(props + 1);
-
-	opt->preset_dict = NULL;
-	opt->preset_dict_size = 0;
-
-	*options = opt;
-
-	return LZMA_OK;
-
-error:
-	lzma_free(opt, allocator);
-	return LZMA_OPTIONS_ERROR;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_decoder.h r-base-3.3.1/src/extra/xz/lzma/lzma_decoder.h
--- r-base-3.2.3/src/extra/xz/lzma/lzma_decoder.h	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_decoder.h
-/// \brief      LZMA decoder API
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZMA_DECODER_H
-#define LZMA_LZMA_DECODER_H
-
-#include "common.h"
-
-
-/// Allocates and initializes LZMA decoder
-extern lzma_ret lzma_lzma_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern uint64_t lzma_lzma_decoder_memusage(const void *options);
-
-extern lzma_ret lzma_lzma_props_decode(
-		void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size);
-
-
-/// \brief      Decodes the LZMA Properties byte (lc/lp/pb)
-///
-/// \return     true if error occurred, false on success
-///
-extern bool lzma_lzma_lclppb_decode(
-		lzma_options_lzma *options, uint8_t byte);
-
-
-#ifdef LZMA_LZ_DECODER_H
-/// Allocate and setup function pointers only. This is used by LZMA1 and
-/// LZMA2 decoders.
-extern lzma_ret lzma_lzma_decoder_create(
-		lzma_lz_decoder *lz, lzma_allocator *allocator,
-		const void *opt, lzma_lz_options *lz_options);
-
-/// Gets memory usage without validating lc/lp/pb. This is used by LZMA2
-/// decoder, because raw LZMA2 decoding doesn't need lc/lp/pb.
-extern uint64_t lzma_lzma_decoder_memusage_nocheck(const void *options);
-
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_encoder.c r-base-3.3.1/src/extra/xz/lzma/lzma_encoder.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma_encoder.c	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,675 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_encoder.c
-/// \brief      LZMA encoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lzma2_encoder.h"
-#include "lzma_encoder_private.h"
-#include "fastpos.h"
-
-
-/////////////
-// Literal //
-/////////////
-
-static inline void
-literal_matched(lzma_range_encoder *rc, probability *subcoder,
-		uint32_t match_byte, uint32_t symbol)
-{
-	uint32_t offset = 0x100;
-	symbol += UINT32_C(1) << 8;
-
-	do {
-		match_byte <<= 1;
-		const uint32_t match_bit = match_byte & offset;
-		const uint32_t subcoder_index
-				= offset + match_bit + (symbol >> 8);
-		const uint32_t bit = (symbol >> 7) & 1;
-		rc_bit(rc, &subcoder[subcoder_index], bit);
-
-		symbol <<= 1;
-		offset &= ~(match_byte ^ symbol);
-
-	} while (symbol < (UINT32_C(1) << 16));
-}
-
-
-static inline void
-literal(lzma_coder *coder, lzma_mf *mf, uint32_t position)
-{
-	// Locate the literal byte to be encoded and the subcoder.
-	const uint8_t cur_byte = mf->buffer[
-			mf->read_pos - mf->read_ahead];
-	probability *subcoder = literal_subcoder(coder->literal,
-			coder->literal_context_bits, coder->literal_pos_mask,
-			position, mf->buffer[mf->read_pos - mf->read_ahead - 1]);
-
-	if (is_literal_state(coder->state)) {
-		// Previous LZMA-symbol was a literal. Encode a normal
-		// literal without a match byte.
-		rc_bittree(&coder->rc, subcoder, 8, cur_byte);
-	} else {
-		// Previous LZMA-symbol was a match. Use the last byte of
-		// the match as a "match byte". That is, compare the bits
-		// of the current literal and the match byte.
-		const uint8_t match_byte = mf->buffer[
-				mf->read_pos - coder->reps[0] - 1
-				- mf->read_ahead];
-		literal_matched(&coder->rc, subcoder, match_byte, cur_byte);
-	}
-
-	update_literal(coder->state);
-}
-
-
-//////////////////
-// Match length //
-//////////////////
-
-static void
-length_update_prices(lzma_length_encoder *lc, const uint32_t pos_state)
-{
-	const uint32_t table_size = lc->table_size;
-	lc->counters[pos_state] = table_size;
-
-	const uint32_t a0 = rc_bit_0_price(lc->choice);
-	const uint32_t a1 = rc_bit_1_price(lc->choice);
-	const uint32_t b0 = a1 + rc_bit_0_price(lc->choice2);
-	const uint32_t b1 = a1 + rc_bit_1_price(lc->choice2);
-	uint32_t *const prices = lc->prices[pos_state];
-
-	uint32_t i;
-	for (i = 0; i < table_size && i < LEN_LOW_SYMBOLS; ++i)
-		prices[i] = a0 + rc_bittree_price(lc->low[pos_state],
-				LEN_LOW_BITS, i);
-
-	for (; i < table_size && i < LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS; ++i)
-		prices[i] = b0 + rc_bittree_price(lc->mid[pos_state],
-				LEN_MID_BITS, i - LEN_LOW_SYMBOLS);
-
-	for (; i < table_size; ++i)
-		prices[i] = b1 + rc_bittree_price(lc->high, LEN_HIGH_BITS,
-				i - LEN_LOW_SYMBOLS - LEN_MID_SYMBOLS);
-
-	return;
-}
-
-
-static inline void
-length(lzma_range_encoder *rc, lzma_length_encoder *lc,
-		const uint32_t pos_state, uint32_t len, const bool fast_mode)
-{
-	assert(len <= MATCH_LEN_MAX);
-	len -= MATCH_LEN_MIN;
-
-	if (len < LEN_LOW_SYMBOLS) {
-		rc_bit(rc, &lc->choice, 0);
-		rc_bittree(rc, lc->low[pos_state], LEN_LOW_BITS, len);
-	} else {
-		rc_bit(rc, &lc->choice, 1);
-		len -= LEN_LOW_SYMBOLS;
-
-		if (len < LEN_MID_SYMBOLS) {
-			rc_bit(rc, &lc->choice2, 0);
-			rc_bittree(rc, lc->mid[pos_state], LEN_MID_BITS, len);
-		} else {
-			rc_bit(rc, &lc->choice2, 1);
-			len -= LEN_MID_SYMBOLS;
-			rc_bittree(rc, lc->high, LEN_HIGH_BITS, len);
-		}
-	}
-
-	// Only getoptimum uses the prices so don't update the table when
-	// in fast mode.
-	if (!fast_mode)
-		if (--lc->counters[pos_state] == 0)
-			length_update_prices(lc, pos_state);
-}
-
-
-///////////
-// Match //
-///////////
-
-static inline void
-match(lzma_coder *coder, const uint32_t pos_state,
-		const uint32_t distance, const uint32_t len)
-{
-	update_match(coder->state);
-
-	length(&coder->rc, &coder->match_len_encoder, pos_state, len,
-			coder->fast_mode);
-
-	const uint32_t pos_slot = get_pos_slot(distance);
-	const uint32_t len_to_pos_state = get_len_to_pos_state(len);
-	rc_bittree(&coder->rc, coder->pos_slot[len_to_pos_state],
-			POS_SLOT_BITS, pos_slot);
-
-	if (pos_slot >= START_POS_MODEL_INDEX) {
-		const uint32_t footer_bits = (pos_slot >> 1) - 1;
-		const uint32_t base = (2 | (pos_slot & 1)) << footer_bits;
-		const uint32_t pos_reduced = distance - base;
-
-		if (pos_slot < END_POS_MODEL_INDEX) {
-			// Careful here: base - pos_slot - 1 can be -1, but
-			// rc_bittree_reverse starts at probs[1], not probs[0].
-			rc_bittree_reverse(&coder->rc,
-				coder->pos_special + base - pos_slot - 1,
-				footer_bits, pos_reduced);
-		} else {
-			rc_direct(&coder->rc, pos_reduced >> ALIGN_BITS,
-					footer_bits - ALIGN_BITS);
-			rc_bittree_reverse(
-					&coder->rc, coder->pos_align,
-					ALIGN_BITS, pos_reduced & ALIGN_MASK);
-			++coder->align_price_count;
-		}
-	}
-
-	coder->reps[3] = coder->reps[2];
-	coder->reps[2] = coder->reps[1];
-	coder->reps[1] = coder->reps[0];
-	coder->reps[0] = distance;
-	++coder->match_price_count;
-}
-
-
-////////////////////
-// Repeated match //
-////////////////////
-
-static inline void
-rep_match(lzma_coder *coder, const uint32_t pos_state,
-		const uint32_t rep, const uint32_t len)
-{
-	if (rep == 0) {
-		rc_bit(&coder->rc, &coder->is_rep0[coder->state], 0);
-		rc_bit(&coder->rc,
-				&coder->is_rep0_long[coder->state][pos_state],
-				len != 1);
-	} else {
-		const uint32_t distance = coder->reps[rep];
-		rc_bit(&coder->rc, &coder->is_rep0[coder->state], 1);
-
-		if (rep == 1) {
-			rc_bit(&coder->rc, &coder->is_rep1[coder->state], 0);
-		} else {
-			rc_bit(&coder->rc, &coder->is_rep1[coder->state], 1);
-			rc_bit(&coder->rc, &coder->is_rep2[coder->state],
-					rep - 2);
-
-			if (rep == 3)
-				coder->reps[3] = coder->reps[2];
-
-			coder->reps[2] = coder->reps[1];
-		}
-
-		coder->reps[1] = coder->reps[0];
-		coder->reps[0] = distance;
-	}
-
-	if (len == 1) {
-		update_short_rep(coder->state);
-	} else {
-		length(&coder->rc, &coder->rep_len_encoder, pos_state, len,
-				coder->fast_mode);
-		update_long_rep(coder->state);
-	}
-}
-
-
-//////////
-// Main //
-//////////
-
-static void
-encode_symbol(lzma_coder *coder, lzma_mf *mf,
-		uint32_t back, uint32_t len, uint32_t position)
-{
-	const uint32_t pos_state = position & coder->pos_mask;
-
-	if (back == UINT32_MAX) {
-		// Literal i.e. eight-bit byte
-		assert(len == 1);
-		rc_bit(&coder->rc,
-				&coder->is_match[coder->state][pos_state], 0);
-		literal(coder, mf, position);
-	} else {
-		// Some type of match
-		rc_bit(&coder->rc,
-			&coder->is_match[coder->state][pos_state], 1);
-
-		if (back < REP_DISTANCES) {
-			// It's a repeated match i.e. the same distance
-			// has been used earlier.
-			rc_bit(&coder->rc, &coder->is_rep[coder->state], 1);
-			rep_match(coder, pos_state, back, len);
-		} else {
-			// Normal match
-			rc_bit(&coder->rc, &coder->is_rep[coder->state], 0);
-			match(coder, pos_state, back - REP_DISTANCES, len);
-		}
-	}
-
-	assert(mf->read_ahead >= len);
-	mf->read_ahead -= len;
-}
-
-
-static bool
-encode_init(lzma_coder *coder, lzma_mf *mf)
-{
-	assert(mf_position(mf) == 0);
-
-	if (mf->read_pos == mf->read_limit) {
-		if (mf->action == LZMA_RUN)
-			return false; // We cannot do anything.
-
-		// We are finishing (we cannot get here when flushing).
-		assert(mf->write_pos == mf->read_pos);
-		assert(mf->action == LZMA_FINISH);
-	} else {
-		// Do the actual initialization. The first LZMA symbol must
-		// always be a literal.
-		mf_skip(mf, 1);
-		mf->read_ahead = 0;
-		rc_bit(&coder->rc, &coder->is_match[0][0], 0);
-		rc_bittree(&coder->rc, coder->literal[0], 8, mf->buffer[0]);
-	}
-
-	// Initialization is done (except if empty file).
-	coder->is_initialized = true;
-
-	return true;
-}
-
-
-static void
-encode_eopm(lzma_coder *coder, uint32_t position)
-{
-	const uint32_t pos_state = position & coder->pos_mask;
-	rc_bit(&coder->rc, &coder->is_match[coder->state][pos_state], 1);
-	rc_bit(&coder->rc, &coder->is_rep[coder->state], 0);
-	match(coder, pos_state, UINT32_MAX, MATCH_LEN_MIN);
-}
-
-
-/// Number of bytes that a single encoding loop in lzma_lzma_encode() can
-/// consume from the dictionary. This limit comes from lzma_lzma_optimum()
-/// and may need to be updated if that function is significantly modified.
-#define LOOP_INPUT_MAX (OPTS + 1)
-
-
-extern lzma_ret
-lzma_lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint8_t *restrict out, size_t *restrict out_pos,
-		size_t out_size, uint32_t limit)
-{
-	// Initialize the stream if no data has been encoded yet.
-	if (!coder->is_initialized && !encode_init(coder, mf))
-		return LZMA_OK;
-
-	// Get the lowest bits of the uncompressed offset from the LZ layer.
-	uint32_t position = mf_position(mf);
-
-	while (true) {
-		// Encode pending bits, if any. Calling this before encoding
-		// the next symbol is needed only with plain LZMA, since
-		// LZMA2 always provides big enough buffer to flush
-		// everything out from the range encoder. For the same reason,
-		// rc_encode() never returns true when this function is used
-		// as part of LZMA2 encoder.
-		if (rc_encode(&coder->rc, out, out_pos, out_size)) {
-			assert(limit == UINT32_MAX);
-			return LZMA_OK;
-		}
-
-		// With LZMA2 we need to take care that compressed size of
-		// a chunk doesn't get too big.
-		// FIXME? Check if this could be improved.
-		if (limit != UINT32_MAX
-				&& (mf->read_pos - mf->read_ahead >= limit
-					|| *out_pos + rc_pending(&coder->rc)
-						>= LZMA2_CHUNK_MAX
-							- LOOP_INPUT_MAX))
-			break;
-
-		// Check that there is some input to process.
-		if (mf->read_pos >= mf->read_limit) {
-			if (mf->action == LZMA_RUN)
-				return LZMA_OK;
-
-			if (mf->read_ahead == 0)
-				break;
-		}
-
-		// Get optimal match (repeat position and length).
-		// Value ranges for pos:
-		//   - [0, REP_DISTANCES): repeated match
-		//   - [REP_DISTANCES, UINT32_MAX):
-		//     match at (pos - REP_DISTANCES)
-		//   - UINT32_MAX: not a match but a literal
-		// Value ranges for len:
-		//   - [MATCH_LEN_MIN, MATCH_LEN_MAX]
-		uint32_t len;
-		uint32_t back;
-
-		if (coder->fast_mode)
-			lzma_lzma_optimum_fast(coder, mf, &back, &len);
-		else
-			lzma_lzma_optimum_normal(
-					coder, mf, &back, &len, position);
-
-		encode_symbol(coder, mf, back, len, position);
-
-		position += len;
-	}
-
-	if (!coder->is_flushed) {
-		coder->is_flushed = true;
-
-		// We don't support encoding plain LZMA streams without EOPM,
-		// and LZMA2 doesn't use EOPM at LZMA level.
-		if (limit == UINT32_MAX)
-			encode_eopm(coder, position);
-
-		// Flush the remaining bytes from the range encoder.
-		rc_flush(&coder->rc);
-
-		// Copy the remaining bytes to the output buffer. If there
-		// isn't enough output space, we will copy out the remaining
-		// bytes on the next call to this function by using
-		// the rc_encode() call in the encoding loop above.
-		if (rc_encode(&coder->rc, out, out_pos, out_size)) {
-			assert(limit == UINT32_MAX);
-			return LZMA_OK;
-		}
-	}
-
-	// Make it ready for the next LZMA2 chunk.
-	coder->is_flushed = false;
-
-	return LZMA_STREAM_END;
-}
-
-
-static lzma_ret
-lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint8_t *restrict out, size_t *restrict out_pos,
-		size_t out_size)
-{
-	// Plain LZMA has no support for sync-flushing.
-	if (unlikely(mf->action == LZMA_SYNC_FLUSH))
-		return LZMA_OPTIONS_ERROR;
-
-	return lzma_lzma_encode(coder, mf, out, out_pos, out_size, UINT32_MAX);
-}
-
-
-////////////////////
-// Initialization //
-////////////////////
-
-static bool
-is_options_valid(const lzma_options_lzma *options)
-{
-	// Validate some of the options. LZ encoder validates nice_len too
-	// but we need a valid value here earlier.
-	return is_lclppb_valid(options)
-			&& options->nice_len >= MATCH_LEN_MIN
-			&& options->nice_len <= MATCH_LEN_MAX
-			&& (options->mode == LZMA_MODE_FAST
-				|| options->mode == LZMA_MODE_NORMAL);
-}
-
-
-static void
-set_lz_options(lzma_lz_options *lz_options, const lzma_options_lzma *options)
-{
-	// LZ encoder initialization does the validation for these so we
-	// don't need to validate here.
-	lz_options->before_size = OPTS;
-	lz_options->dict_size = options->dict_size;
-	lz_options->after_size = LOOP_INPUT_MAX;
-	lz_options->match_len_max = MATCH_LEN_MAX;
-	lz_options->nice_len = options->nice_len;
-	lz_options->match_finder = options->mf;
-	lz_options->depth = options->depth;
-	lz_options->preset_dict = options->preset_dict;
-	lz_options->preset_dict_size = options->preset_dict_size;
-	return;
-}
-
-
-static void
-length_encoder_reset(lzma_length_encoder *lencoder,
-		const uint32_t num_pos_states, const bool fast_mode)
-{
-	bit_reset(lencoder->choice);
-	bit_reset(lencoder->choice2);
-
-	for (size_t pos_state = 0; pos_state < num_pos_states; ++pos_state) {
-		bittree_reset(lencoder->low[pos_state], LEN_LOW_BITS);
-		bittree_reset(lencoder->mid[pos_state], LEN_MID_BITS);
-	}
-
-	bittree_reset(lencoder->high, LEN_HIGH_BITS);
-
-	if (!fast_mode)
-		for (size_t pos_state = 0; pos_state < num_pos_states;
-				++pos_state)
-			length_update_prices(lencoder, pos_state);
-
-	return;
-}
-
-
-extern lzma_ret
-lzma_lzma_encoder_reset(lzma_coder *coder, const lzma_options_lzma *options)
-{
-	if (!is_options_valid(options))
-		return LZMA_OPTIONS_ERROR;
-
-	coder->pos_mask = (1U << options->pb) - 1;
-	coder->literal_context_bits = options->lc;
-	coder->literal_pos_mask = (1U << options->lp) - 1;
-
-	// Range coder
-	rc_reset(&coder->rc);
-
-	// State
-	coder->state = STATE_LIT_LIT;
-	for (size_t i = 0; i < REP_DISTANCES; ++i)
-		coder->reps[i] = 0;
-
-	literal_init(coder->literal, options->lc, options->lp);
-
-	// Bit encoders
-	for (size_t i = 0; i < STATES; ++i) {
-		for (size_t j = 0; j <= coder->pos_mask; ++j) {
-			bit_reset(coder->is_match[i][j]);
-			bit_reset(coder->is_rep0_long[i][j]);
-		}
-
-		bit_reset(coder->is_rep[i]);
-		bit_reset(coder->is_rep0[i]);
-		bit_reset(coder->is_rep1[i]);
-		bit_reset(coder->is_rep2[i]);
-	}
-
-	for (size_t i = 0; i < FULL_DISTANCES - END_POS_MODEL_INDEX; ++i)
-		bit_reset(coder->pos_special[i]);
-
-	// Bit tree encoders
-	for (size_t i = 0; i < LEN_TO_POS_STATES; ++i)
-		bittree_reset(coder->pos_slot[i], POS_SLOT_BITS);
-
-	bittree_reset(coder->pos_align, ALIGN_BITS);
-
-	// Length encoders
-	length_encoder_reset(&coder->match_len_encoder,
-			1U << options->pb, coder->fast_mode);
-
-	length_encoder_reset(&coder->rep_len_encoder,
-			1U << options->pb, coder->fast_mode);
-
-	// Price counts are incremented every time appropriate probabilities
-	// are changed. price counts are set to zero when the price tables
-	// are updated, which is done when the appropriate price counts have
-	// big enough value, and lzma_mf.read_ahead == 0 which happens at
-	// least every OPTS (a few thousand) possible price count increments.
-	//
-	// By resetting price counts to UINT32_MAX / 2, we make sure that the
-	// price tables will be initialized before they will be used (since
-	// the value is definitely big enough), and that it is OK to increment
-	// price counts without risk of integer overflow (since UINT32_MAX / 2
-	// is small enough). The current code doesn't increment price counts
-	// before initializing price tables, but it maybe done in future if
-	// we add support for saving the state between LZMA2 chunks.
-	coder->match_price_count = UINT32_MAX / 2;
-	coder->align_price_count = UINT32_MAX / 2;
-
-	coder->opts_end_index = 0;
-	coder->opts_current_index = 0;
-
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_lzma_encoder_create(lzma_coder **coder_ptr, lzma_allocator *allocator,
-		const lzma_options_lzma *options, lzma_lz_options *lz_options)
-{
-	// Allocate lzma_coder if it wasn't already allocated.
-	if (*coder_ptr == NULL) {
-		*coder_ptr = lzma_alloc(sizeof(lzma_coder), allocator);
-		if (*coder_ptr == NULL)
-			return LZMA_MEM_ERROR;
-	}
-
-	lzma_coder *coder = *coder_ptr;
-
-	// Set compression mode. We haven't validates the options yet,
-	// but it's OK here, since nothing bad happens with invalid
-	// options in the code below, and they will get rejected by
-	// lzma_lzma_encoder_reset() call at the end of this function.
-	switch (options->mode) {
-		case LZMA_MODE_FAST:
-			coder->fast_mode = true;
-			break;
-
-		case LZMA_MODE_NORMAL: {
-			coder->fast_mode = false;
-
-			// Set dist_table_size.
-			// Round the dictionary size up to next 2^n.
-			uint32_t log_size = 0;
-			while ((UINT32_C(1) << log_size) < options->dict_size)
-				++log_size;
-
-			coder->dist_table_size = log_size * 2;
-
-			// Length encoders' price table size
-			coder->match_len_encoder.table_size
-				= options->nice_len + 1 - MATCH_LEN_MIN;
-			coder->rep_len_encoder.table_size
-				= options->nice_len + 1 - MATCH_LEN_MIN;
-			break;
-		}
-
-		default:
-			return LZMA_OPTIONS_ERROR;
-	}
-
-	// We don't need to write the first byte as literal if there is
-	// a non-empty preset dictionary. encode_init() wouldn't even work
-	// if there is a non-empty preset dictionary, because encode_init()
-	// assumes that position is zero and previous byte is also zero.
-	coder->is_initialized = options->preset_dict != NULL
-			&& options->preset_dict_size > 0;
-	coder->is_flushed = false;
-
-	set_lz_options(lz_options, options);
-
-	return lzma_lzma_encoder_reset(coder, options);
-}
-
-
-static lzma_ret
-lzma_encoder_init(lzma_lz_encoder *lz, lzma_allocator *allocator,
-		const void *options, lzma_lz_options *lz_options)
-{
-	lz->code = &lzma_encode;
-	return lzma_lzma_encoder_create(
-			&lz->coder, allocator, options, lz_options);
-}
-
-
-extern lzma_ret
-lzma_lzma_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	return lzma_lz_encoder_init(
-			next, allocator, filters, &lzma_encoder_init);
-}
-
-
-extern uint64_t
-lzma_lzma_encoder_memusage(const void *options)
-{
-	if (!is_options_valid(options))
-		return UINT64_MAX;
-
-	lzma_lz_options lz_options;
-	set_lz_options(&lz_options, options);
-
-	const uint64_t lz_memusage = lzma_lz_encoder_memusage(&lz_options);
-	if (lz_memusage == UINT64_MAX)
-		return UINT64_MAX;
-
-	return (uint64_t)(sizeof(lzma_coder)) + lz_memusage;
-}
-
-
-extern bool
-lzma_lzma_lclppb_encode(const lzma_options_lzma *options, uint8_t *byte)
-{
-	if (!is_lclppb_valid(options))
-		return true;
-
-	*byte = (options->pb * 5 + options->lp) * 9 + options->lc;
-	assert(*byte <= (4 * 5 + 4) * 9 + 8);
-
-	return false;
-}
-
-
-#ifdef HAVE_ENCODER_LZMA1
-extern lzma_ret
-lzma_lzma_props_encode(const void *options, uint8_t *out)
-{
-	const lzma_options_lzma *const opt = options;
-
-	if (lzma_lzma_lclppb_encode(opt, out))
-		return LZMA_PROG_ERROR;
-
-	unaligned_write32le(out + 1, opt->dict_size);
-
-	return LZMA_OK;
-}
-#endif
-
-
-extern LZMA_API(lzma_bool)
-lzma_mode_is_supported(lzma_mode mode)
-{
-	return mode == LZMA_MODE_FAST || mode == LZMA_MODE_NORMAL;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_encoder.h r-base-3.3.1/src/extra/xz/lzma/lzma_encoder.h
--- r-base-3.2.3/src/extra/xz/lzma/lzma_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_encoder.h
-/// \brief      LZMA encoder API
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZMA_ENCODER_H
-#define LZMA_LZMA_ENCODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_lzma_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-
-extern uint64_t lzma_lzma_encoder_memusage(const void *options);
-
-extern lzma_ret lzma_lzma_props_encode(const void *options, uint8_t *out);
-
-
-/// Encodes lc/lp/pb into one byte. Returns false on success and true on error.
-extern bool lzma_lzma_lclppb_encode(
-		const lzma_options_lzma *options, uint8_t *byte);
-
-
-#ifdef LZMA_LZ_ENCODER_H
-
-/// Initializes raw LZMA encoder; this is used by LZMA2.
-extern lzma_ret lzma_lzma_encoder_create(
-		lzma_coder **coder_ptr, lzma_allocator *allocator,
-		const lzma_options_lzma *options, lzma_lz_options *lz_options);
-
-
-/// Resets an already initialized LZMA encoder; this is used by LZMA2.
-extern lzma_ret lzma_lzma_encoder_reset(
-		lzma_coder *coder, const lzma_options_lzma *options);
-
-
-extern lzma_ret lzma_lzma_encode(lzma_coder *restrict coder,
-		lzma_mf *restrict mf, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size,
-		uint32_t read_limit);
-
-#endif
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_optimum_fast.c r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_optimum_fast.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_optimum_fast.c	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_optimum_fast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_encoder_optimum_fast.c
-//
-//  Author:     Igor Pavlov
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lzma_encoder_private.h"
-
-
-#define change_pair(small_dist, big_dist) \
-	(((big_dist) >> 7) > (small_dist))
-
-
-extern void
-lzma_lzma_optimum_fast(lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint32_t *restrict back_res, uint32_t *restrict len_res)
-{
-	const uint32_t nice_len = mf->nice_len;
-
-	uint32_t len_main;
-	uint32_t matches_count;
-	if (mf->read_ahead == 0) {
-		len_main = mf_find(mf, &matches_count, coder->matches);
-	} else {
-		assert(mf->read_ahead == 1);
-		len_main = coder->longest_match_length;
-		matches_count = coder->matches_count;
-	}
-
-	const uint8_t *buf = mf_ptr(mf) - 1;
-	const uint32_t buf_avail = my_min(mf_avail(mf) + 1, MATCH_LEN_MAX);
-
-	if (buf_avail < 2) {
-		// There's not enough input left to encode a match.
-		*back_res = UINT32_MAX;
-		*len_res = 1;
-		return;
-	}
-
-	// Look for repeated matches; scan the previous four match distances
-	uint32_t rep_len = 0;
-	uint32_t rep_index = 0;
-
-	for (uint32_t i = 0; i < REP_DISTANCES; ++i) {
-		// Pointer to the beginning of the match candidate
-		const uint8_t *const buf_back = buf - coder->reps[i] - 1;
-
-		// If the first two bytes (2 == MATCH_LEN_MIN) do not match,
-		// this rep is not useful.
-		if (not_equal_16(buf, buf_back))
-			continue;
-
-		// The first two bytes matched.
-		// Calculate the length of the match.
-		uint32_t len;
-		for (len = 2; len < buf_avail
-				&& buf[len] == buf_back[len]; ++len) ;
-
-		// If we have found a repeated match that is at least
-		// nice_len long, return it immediately.
-		if (len >= nice_len) {
-			*back_res = i;
-			*len_res = len;
-			mf_skip(mf, len - 1);
-			return;
-		}
-
-		if (len > rep_len) {
-			rep_index = i;
-			rep_len = len;
-		}
-	}
-
-	// We didn't find a long enough repeated match. Encode it as a normal
-	// match if the match length is at least nice_len.
-	if (len_main >= nice_len) {
-		*back_res = coder->matches[matches_count - 1].dist
-				+ REP_DISTANCES;
-		*len_res = len_main;
-		mf_skip(mf, len_main - 1);
-		return;
-	}
-
-	uint32_t back_main = 0;
-	if (len_main >= 2) {
-		back_main = coder->matches[matches_count - 1].dist;
-
-		while (matches_count > 1 && len_main ==
-				coder->matches[matches_count - 2].len + 1) {
-			if (!change_pair(coder->matches[
-						matches_count - 2].dist,
-					back_main))
-				break;
-
-			--matches_count;
-			len_main = coder->matches[matches_count - 1].len;
-			back_main = coder->matches[matches_count - 1].dist;
-		}
-
-		if (len_main == 2 && back_main >= 0x80)
-			len_main = 1;
-	}
-
-	if (rep_len >= 2) {
-		if (rep_len + 1 >= len_main
-				|| (rep_len + 2 >= len_main
-					&& back_main > (UINT32_C(1) << 9))
-				|| (rep_len + 3 >= len_main
-					&& back_main > (UINT32_C(1) << 15))) {
-			*back_res = rep_index;
-			*len_res = rep_len;
-			mf_skip(mf, rep_len - 1);
-			return;
-		}
-	}
-
-	if (len_main < 2 || buf_avail <= 2) {
-		*back_res = UINT32_MAX;
-		*len_res = 1;
-		return;
-	}
-
-	// Get the matches for the next byte. If we find a better match,
-	// the current byte is encoded as a literal.
-	coder->longest_match_length = mf_find(mf,
-			&coder->matches_count, coder->matches);
-
-	if (coder->longest_match_length >= 2) {
-		const uint32_t new_dist = coder->matches[
-				coder->matches_count - 1].dist;
-
-		if ((coder->longest_match_length >= len_main
-					&& new_dist < back_main)
-				|| (coder->longest_match_length == len_main + 1
-					&& !change_pair(back_main, new_dist))
-				|| (coder->longest_match_length > len_main + 1)
-				|| (coder->longest_match_length + 1 >= len_main
-					&& len_main >= 3
-					&& change_pair(new_dist, back_main))) {
-			*back_res = UINT32_MAX;
-			*len_res = 1;
-			return;
-		}
-	}
-
-	// In contrast to LZMA SDK, dictionary could not have been moved
-	// between mf_find() calls, thus it is safe to just increment
-	// the old buf pointer instead of recalculating it with mf_ptr().
-	++buf;
-
-	const uint32_t limit = len_main - 1;
-
-	for (uint32_t i = 0; i < REP_DISTANCES; ++i) {
-		const uint8_t *const buf_back = buf - coder->reps[i] - 1;
-
-		if (not_equal_16(buf, buf_back))
-			continue;
-
-		uint32_t len;
-		for (len = 2; len < limit
-				&& buf[len] == buf_back[len]; ++len) ;
-
-		if (len >= limit) {
-			*back_res = UINT32_MAX;
-			*len_res = 1;
-			return;
-		}
-	}
-
-	*back_res = back_main + REP_DISTANCES;
-	*len_res = len_main;
-	mf_skip(mf, len_main - 2);
-	return;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_optimum_normal.c r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_optimum_normal.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_optimum_normal.c	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_optimum_normal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,868 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_encoder_optimum_normal.c
-//
-//  Author:     Igor Pavlov
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "lzma_encoder_private.h"
-#include "fastpos.h"
-
-
-////////////
-// Prices //
-////////////
-
-static uint32_t
-get_literal_price(const lzma_coder *const coder, const uint32_t pos,
-		const uint32_t prev_byte, const bool match_mode,
-		uint32_t match_byte, uint32_t symbol)
-{
-	const probability *const subcoder = literal_subcoder(coder->literal,
-			coder->literal_context_bits, coder->literal_pos_mask,
-			pos, prev_byte);
-
-	uint32_t price = 0;
-
-	if (!match_mode) {
-		price = rc_bittree_price(subcoder, 8, symbol);
-	} else {
-		uint32_t offset = 0x100;
-		symbol += UINT32_C(1) << 8;
-
-		do {
-			match_byte <<= 1;
-
-			const uint32_t match_bit = match_byte & offset;
-			const uint32_t subcoder_index
-					= offset + match_bit + (symbol >> 8);
-			const uint32_t bit = (symbol >> 7) & 1;
-			price += rc_bit_price(subcoder[subcoder_index], bit);
-
-			symbol <<= 1;
-			offset &= ~(match_byte ^ symbol);
-
-		} while (symbol < (UINT32_C(1) << 16));
-	}
-
-	return price;
-}
-
-
-static inline uint32_t
-get_len_price(const lzma_length_encoder *const lencoder,
-		const uint32_t len, const uint32_t pos_state)
-{
-	// NOTE: Unlike the other price tables, length prices are updated
-	// in lzma_encoder.c
-	return lencoder->prices[pos_state][len - MATCH_LEN_MIN];
-}
-
-
-static inline uint32_t
-get_short_rep_price(const lzma_coder *const coder,
-		const lzma_lzma_state state, const uint32_t pos_state)
-{
-	return rc_bit_0_price(coder->is_rep0[state])
-		+ rc_bit_0_price(coder->is_rep0_long[state][pos_state]);
-}
-
-
-static inline uint32_t
-get_pure_rep_price(const lzma_coder *const coder, const uint32_t rep_index,
-		const lzma_lzma_state state, uint32_t pos_state)
-{
-	uint32_t price;
-
-	if (rep_index == 0) {
-		price = rc_bit_0_price(coder->is_rep0[state]);
-		price += rc_bit_1_price(coder->is_rep0_long[state][pos_state]);
-	} else {
-		price = rc_bit_1_price(coder->is_rep0[state]);
-
-		if (rep_index == 1) {
-			price += rc_bit_0_price(coder->is_rep1[state]);
-		} else {
-			price += rc_bit_1_price(coder->is_rep1[state]);
-			price += rc_bit_price(coder->is_rep2[state],
-					rep_index - 2);
-		}
-	}
-
-	return price;
-}
-
-
-static inline uint32_t
-get_rep_price(const lzma_coder *const coder, const uint32_t rep_index,
-		const uint32_t len, const lzma_lzma_state state,
-		const uint32_t pos_state)
-{
-	return get_len_price(&coder->rep_len_encoder, len, pos_state)
-		+ get_pure_rep_price(coder, rep_index, state, pos_state);
-}
-
-
-static inline uint32_t
-get_pos_len_price(const lzma_coder *const coder, const uint32_t pos,
-		const uint32_t len, const uint32_t pos_state)
-{
-	const uint32_t len_to_pos_state = get_len_to_pos_state(len);
-	uint32_t price;
-
-	if (pos < FULL_DISTANCES) {
-		price = coder->distances_prices[len_to_pos_state][pos];
-	} else {
-		const uint32_t pos_slot = get_pos_slot_2(pos);
-		price = coder->pos_slot_prices[len_to_pos_state][pos_slot]
-				+ coder->align_prices[pos & ALIGN_MASK];
-	}
-
-	price += get_len_price(&coder->match_len_encoder, len, pos_state);
-
-	return price;
-}
-
-
-static void
-fill_distances_prices(lzma_coder *coder)
-{
-	for (uint32_t len_to_pos_state = 0;
-			len_to_pos_state < LEN_TO_POS_STATES;
-			++len_to_pos_state) {
-
-		uint32_t *const pos_slot_prices
-				= coder->pos_slot_prices[len_to_pos_state];
-
-		// Price to encode the pos_slot.
-		for (uint32_t pos_slot = 0;
-				pos_slot < coder->dist_table_size; ++pos_slot)
-			pos_slot_prices[pos_slot] = rc_bittree_price(
-					coder->pos_slot[len_to_pos_state],
-					POS_SLOT_BITS, pos_slot);
-
-		// For matches with distance >= FULL_DISTANCES, add the price
-		// of the direct bits part of the match distance. (Align bits
-		// are handled by fill_align_prices()).
-		for (uint32_t pos_slot = END_POS_MODEL_INDEX;
-				pos_slot < coder->dist_table_size; ++pos_slot)
-			pos_slot_prices[pos_slot] += rc_direct_price(
-					((pos_slot >> 1) - 1) - ALIGN_BITS);
-
-		// Distances in the range [0, 3] are fully encoded with
-		// pos_slot, so they are used for coder->distances_prices
-		// as is.
-		for (uint32_t i = 0; i < START_POS_MODEL_INDEX; ++i)
-			coder->distances_prices[len_to_pos_state][i]
-					= pos_slot_prices[i];
-	}
-
-	// Distances in the range [4, 127] depend on pos_slot and pos_special.
-	// We do this in a loop separate from the above loop to avoid
-	// redundant calls to get_pos_slot().
-	for (uint32_t i = START_POS_MODEL_INDEX; i < FULL_DISTANCES; ++i) {
-		const uint32_t pos_slot = get_pos_slot(i);
-		const uint32_t footer_bits = ((pos_slot >> 1) - 1);
-		const uint32_t base = (2 | (pos_slot & 1)) << footer_bits;
-		const uint32_t price = rc_bittree_reverse_price(
-				coder->pos_special + base - pos_slot - 1,
-				footer_bits, i - base);
-
-		for (uint32_t len_to_pos_state = 0;
-				len_to_pos_state < LEN_TO_POS_STATES;
-				++len_to_pos_state)
-			coder->distances_prices[len_to_pos_state][i]
-					= price + coder->pos_slot_prices[
-						len_to_pos_state][pos_slot];
-	}
-
-	coder->match_price_count = 0;
-	return;
-}
-
-
-static void
-fill_align_prices(lzma_coder *coder)
-{
-	for (uint32_t i = 0; i < ALIGN_TABLE_SIZE; ++i)
-		coder->align_prices[i] = rc_bittree_reverse_price(
-				coder->pos_align, ALIGN_BITS, i);
-
-	coder->align_price_count = 0;
-	return;
-}
-
-
-/////////////
-// Optimal //
-/////////////
-
-static inline void
-make_literal(lzma_optimal *optimal)
-{
-	optimal->back_prev = UINT32_MAX;
-	optimal->prev_1_is_literal = false;
-}
-
-
-static inline void
-make_short_rep(lzma_optimal *optimal)
-{
-	optimal->back_prev = 0;
-	optimal->prev_1_is_literal = false;
-}
-
-
-#define is_short_rep(optimal) \
-	((optimal).back_prev == 0)
-
-
-static void
-backward(lzma_coder *restrict coder, uint32_t *restrict len_res,
-		uint32_t *restrict back_res, uint32_t cur)
-{
-	coder->opts_end_index = cur;
-
-	uint32_t pos_mem = coder->opts[cur].pos_prev;
-	uint32_t back_mem = coder->opts[cur].back_prev;
-
-	do {
-		if (coder->opts[cur].prev_1_is_literal) {
-			make_literal(&coder->opts[pos_mem]);
-			coder->opts[pos_mem].pos_prev = pos_mem - 1;
-
-			if (coder->opts[cur].prev_2) {
-				coder->opts[pos_mem - 1].prev_1_is_literal
-						= false;
-				coder->opts[pos_mem - 1].pos_prev
-						= coder->opts[cur].pos_prev_2;
-				coder->opts[pos_mem - 1].back_prev
-						= coder->opts[cur].back_prev_2;
-			}
-		}
-
-		const uint32_t pos_prev = pos_mem;
-		const uint32_t back_cur = back_mem;
-
-		back_mem = coder->opts[pos_prev].back_prev;
-		pos_mem = coder->opts[pos_prev].pos_prev;
-
-		coder->opts[pos_prev].back_prev = back_cur;
-		coder->opts[pos_prev].pos_prev = cur;
-		cur = pos_prev;
-
-	} while (cur != 0);
-
-	coder->opts_current_index = coder->opts[0].pos_prev;
-	*len_res = coder->opts[0].pos_prev;
-	*back_res = coder->opts[0].back_prev;
-
-	return;
-}
-
-
-//////////
-// Main //
-//////////
-
-static inline uint32_t
-helper1(lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint32_t *restrict back_res, uint32_t *restrict len_res,
-		uint32_t position)
-{
-	const uint32_t nice_len = mf->nice_len;
-
-	uint32_t len_main;
-	uint32_t matches_count;
-
-	if (mf->read_ahead == 0) {
-		len_main = mf_find(mf, &matches_count, coder->matches);
-	} else {
-		assert(mf->read_ahead == 1);
-		len_main = coder->longest_match_length;
-		matches_count = coder->matches_count;
-	}
-
-	const uint32_t buf_avail = my_min(mf_avail(mf) + 1, MATCH_LEN_MAX);
-	if (buf_avail < 2) {
-		*back_res = UINT32_MAX;
-		*len_res = 1;
-		return UINT32_MAX;
-	}
-
-	const uint8_t *const buf = mf_ptr(mf) - 1;
-
-	uint32_t rep_lens[REP_DISTANCES];
-	uint32_t rep_max_index = 0;
-
-	for (uint32_t i = 0; i < REP_DISTANCES; ++i) {
-		const uint8_t *const buf_back = buf - coder->reps[i] - 1;
-
-		if (not_equal_16(buf, buf_back)) {
-			rep_lens[i] = 0;
-			continue;
-		}
-
-		uint32_t len_test;
-		for (len_test = 2; len_test < buf_avail
-				&& buf[len_test] == buf_back[len_test];
-				++len_test) ;
-
-		rep_lens[i] = len_test;
-		if (len_test > rep_lens[rep_max_index])
-			rep_max_index = i;
-	}
-
-	if (rep_lens[rep_max_index] >= nice_len) {
-		*back_res = rep_max_index;
-		*len_res = rep_lens[rep_max_index];
-		mf_skip(mf, *len_res - 1);
-		return UINT32_MAX;
-	}
-
-
-	if (len_main >= nice_len) {
-		*back_res = coder->matches[matches_count - 1].dist
-				+ REP_DISTANCES;
-		*len_res = len_main;
-		mf_skip(mf, len_main - 1);
-		return UINT32_MAX;
-	}
-
-	const uint8_t current_byte = *buf;
-	const uint8_t match_byte = *(buf - coder->reps[0] - 1);
-
-	if (len_main < 2 && current_byte != match_byte
-			&& rep_lens[rep_max_index] < 2) {
-		*back_res = UINT32_MAX;
-		*len_res = 1;
-		return UINT32_MAX;
-	}
-
-	coder->opts[0].state = coder->state;
-
-	const uint32_t pos_state = position & coder->pos_mask;
-
-	coder->opts[1].price = rc_bit_0_price(
-				coder->is_match[coder->state][pos_state])
-			+ get_literal_price(coder, position, buf[-1],
-				!is_literal_state(coder->state),
-				match_byte, current_byte);
-
-	make_literal(&coder->opts[1]);
-
-	const uint32_t match_price = rc_bit_1_price(
-			coder->is_match[coder->state][pos_state]);
-	const uint32_t rep_match_price = match_price
-			+ rc_bit_1_price(coder->is_rep[coder->state]);
-
-	if (match_byte == current_byte) {
-		const uint32_t short_rep_price = rep_match_price
-				+ get_short_rep_price(
-					coder, coder->state, pos_state);
-
-		if (short_rep_price < coder->opts[1].price) {
-			coder->opts[1].price = short_rep_price;
-			make_short_rep(&coder->opts[1]);
-		}
-	}
-
-	const uint32_t len_end = my_max(len_main, rep_lens[rep_max_index]);
-
-	if (len_end < 2) {
-		*back_res = coder->opts[1].back_prev;
-		*len_res = 1;
-		return UINT32_MAX;
-	}
-
-	coder->opts[1].pos_prev = 0;
-
-	for (uint32_t i = 0; i < REP_DISTANCES; ++i)
-		coder->opts[0].backs[i] = coder->reps[i];
-
-	uint32_t len = len_end;
-	do {
-		coder->opts[len].price = RC_INFINITY_PRICE;
-	} while (--len >= 2);
-
-
-	for (uint32_t i = 0; i < REP_DISTANCES; ++i) {
-		uint32_t rep_len = rep_lens[i];
-		if (rep_len < 2)
-			continue;
-
-		const uint32_t price = rep_match_price + get_pure_rep_price(
-				coder, i, coder->state, pos_state);
-
-		do {
-			const uint32_t cur_and_len_price = price
-					+ get_len_price(
-						&coder->rep_len_encoder,
-						rep_len, pos_state);
-
-			if (cur_and_len_price < coder->opts[rep_len].price) {
-				coder->opts[rep_len].price = cur_and_len_price;
-				coder->opts[rep_len].pos_prev = 0;
-				coder->opts[rep_len].back_prev = i;
-				coder->opts[rep_len].prev_1_is_literal = false;
-			}
-		} while (--rep_len >= 2);
-	}
-
-
-	const uint32_t normal_match_price = match_price
-			+ rc_bit_0_price(coder->is_rep[coder->state]);
-
-	len = rep_lens[0] >= 2 ? rep_lens[0] + 1 : 2;
-	if (len <= len_main) {
-		uint32_t i = 0;
-		while (len > coder->matches[i].len)
-			++i;
-
-		for(; ; ++len) {
-			const uint32_t dist = coder->matches[i].dist;
-			const uint32_t cur_and_len_price = normal_match_price
-					+ get_pos_len_price(coder,
-						dist, len, pos_state);
-
-			if (cur_and_len_price < coder->opts[len].price) {
-				coder->opts[len].price = cur_and_len_price;
-				coder->opts[len].pos_prev = 0;
-				coder->opts[len].back_prev
-						= dist + REP_DISTANCES;
-				coder->opts[len].prev_1_is_literal = false;
-			}
-
-			if (len == coder->matches[i].len)
-				if (++i == matches_count)
-					break;
-		}
-	}
-
-	return len_end;
-}
-
-
-static inline uint32_t
-helper2(lzma_coder *coder, uint32_t *reps, const uint8_t *buf,
-		uint32_t len_end, uint32_t position, const uint32_t cur,
-		const uint32_t nice_len, const uint32_t buf_avail_full)
-{
-	uint32_t matches_count = coder->matches_count;
-	uint32_t new_len = coder->longest_match_length;
-	uint32_t pos_prev = coder->opts[cur].pos_prev;
-	lzma_lzma_state state;
-
-	if (coder->opts[cur].prev_1_is_literal) {
-		--pos_prev;
-
-		if (coder->opts[cur].prev_2) {
-			state = coder->opts[coder->opts[cur].pos_prev_2].state;
-
-			if (coder->opts[cur].back_prev_2 < REP_DISTANCES)
-				update_long_rep(state);
-			else
-				update_match(state);
-
-		} else {
-			state = coder->opts[pos_prev].state;
-		}
-
-		update_literal(state);
-
-	} else {
-		state = coder->opts[pos_prev].state;
-	}
-
-	if (pos_prev == cur - 1) {
-		if (is_short_rep(coder->opts[cur]))
-			update_short_rep(state);
-		else
-			update_literal(state);
-	} else {
-		uint32_t pos;
-		if (coder->opts[cur].prev_1_is_literal
-				&& coder->opts[cur].prev_2) {
-			pos_prev = coder->opts[cur].pos_prev_2;
-			pos = coder->opts[cur].back_prev_2;
-			update_long_rep(state);
-		} else {
-			pos = coder->opts[cur].back_prev;
-			if (pos < REP_DISTANCES)
-				update_long_rep(state);
-			else
-				update_match(state);
-		}
-
-		if (pos < REP_DISTANCES) {
-			reps[0] = coder->opts[pos_prev].backs[pos];
-
-			uint32_t i;
-			for (i = 1; i <= pos; ++i)
-				reps[i] = coder->opts[pos_prev].backs[i - 1];
-
-			for (; i < REP_DISTANCES; ++i)
-				reps[i] = coder->opts[pos_prev].backs[i];
-
-		} else {
-			reps[0] = pos - REP_DISTANCES;
-
-			for (uint32_t i = 1; i < REP_DISTANCES; ++i)
-				reps[i] = coder->opts[pos_prev].backs[i - 1];
-		}
-	}
-
-	coder->opts[cur].state = state;
-
-	for (uint32_t i = 0; i < REP_DISTANCES; ++i)
-		coder->opts[cur].backs[i] = reps[i];
-
-	const uint32_t cur_price = coder->opts[cur].price;
-
-	const uint8_t current_byte = *buf;
-	const uint8_t match_byte = *(buf - reps[0] - 1);
-
-	const uint32_t pos_state = position & coder->pos_mask;
-
-	const uint32_t cur_and_1_price = cur_price
-			+ rc_bit_0_price(coder->is_match[state][pos_state])
-			+ get_literal_price(coder, position, buf[-1],
-			!is_literal_state(state), match_byte, current_byte);
-
-	bool next_is_literal = false;
-
-	if (cur_and_1_price < coder->opts[cur + 1].price) {
-		coder->opts[cur + 1].price = cur_and_1_price;
-		coder->opts[cur + 1].pos_prev = cur;
-		make_literal(&coder->opts[cur + 1]);
-		next_is_literal = true;
-	}
-
-	const uint32_t match_price = cur_price
-			+ rc_bit_1_price(coder->is_match[state][pos_state]);
-	const uint32_t rep_match_price = match_price
-			+ rc_bit_1_price(coder->is_rep[state]);
-
-	if (match_byte == current_byte
-			&& !(coder->opts[cur + 1].pos_prev < cur
-				&& coder->opts[cur + 1].back_prev == 0)) {
-
-		const uint32_t short_rep_price = rep_match_price
-				+ get_short_rep_price(coder, state, pos_state);
-
-		if (short_rep_price <= coder->opts[cur + 1].price) {
-			coder->opts[cur + 1].price = short_rep_price;
-			coder->opts[cur + 1].pos_prev = cur;
-			make_short_rep(&coder->opts[cur + 1]);
-			next_is_literal = true;
-		}
-	}
-
-	if (buf_avail_full < 2)
-		return len_end;
-
-	const uint32_t buf_avail = my_min(buf_avail_full, nice_len);
-
-	if (!next_is_literal && match_byte != current_byte) { // speed optimization
-		// try literal + rep0
-		const uint8_t *const buf_back = buf - reps[0] - 1;
-		const uint32_t limit = my_min(buf_avail_full, nice_len + 1);
-
-		uint32_t len_test = 1;
-		while (len_test < limit && buf[len_test] == buf_back[len_test])
-			++len_test;
-
-		--len_test;
-
-		if (len_test >= 2) {
-			lzma_lzma_state state_2 = state;
-			update_literal(state_2);
-
-			const uint32_t pos_state_next = (position + 1) & coder->pos_mask;
-			const uint32_t next_rep_match_price = cur_and_1_price
-					+ rc_bit_1_price(coder->is_match[state_2][pos_state_next])
-					+ rc_bit_1_price(coder->is_rep[state_2]);
-
-			//for (; len_test >= 2; --len_test) {
-			const uint32_t offset = cur + 1 + len_test;
-
-			while (len_end < offset)
-				coder->opts[++len_end].price = RC_INFINITY_PRICE;
-
-			const uint32_t cur_and_len_price = next_rep_match_price
-					+ get_rep_price(coder, 0, len_test,
-						state_2, pos_state_next);
-
-			if (cur_and_len_price < coder->opts[offset].price) {
-				coder->opts[offset].price = cur_and_len_price;
-				coder->opts[offset].pos_prev = cur + 1;
-				coder->opts[offset].back_prev = 0;
-				coder->opts[offset].prev_1_is_literal = true;
-				coder->opts[offset].prev_2 = false;
-			}
-			//}
-		}
-	}
-
-
-	uint32_t start_len = 2; // speed optimization
-
-	for (uint32_t rep_index = 0; rep_index < REP_DISTANCES; ++rep_index) {
-		const uint8_t *const buf_back = buf - reps[rep_index] - 1;
-		if (not_equal_16(buf, buf_back))
-			continue;
-
-		uint32_t len_test;
-		for (len_test = 2; len_test < buf_avail
-				&& buf[len_test] == buf_back[len_test];
-				++len_test) ;
-
-		while (len_end < cur + len_test)
-			coder->opts[++len_end].price = RC_INFINITY_PRICE;
-
-		const uint32_t len_test_temp = len_test;
-		const uint32_t price = rep_match_price + get_pure_rep_price(
-				coder, rep_index, state, pos_state);
-
-		do {
-			const uint32_t cur_and_len_price = price
-					+ get_len_price(&coder->rep_len_encoder,
-							len_test, pos_state);
-
-			if (cur_and_len_price < coder->opts[cur + len_test].price) {
-				coder->opts[cur + len_test].price = cur_and_len_price;
-				coder->opts[cur + len_test].pos_prev = cur;
-				coder->opts[cur + len_test].back_prev = rep_index;
-				coder->opts[cur + len_test].prev_1_is_literal = false;
-			}
-		} while (--len_test >= 2);
-
-		len_test = len_test_temp;
-
-		if (rep_index == 0)
-			start_len = len_test + 1;
-
-
-		uint32_t len_test_2 = len_test + 1;
-		const uint32_t limit = my_min(buf_avail_full,
-				len_test_2 + nice_len);
-		for (; len_test_2 < limit
-				&& buf[len_test_2] == buf_back[len_test_2];
-				++len_test_2) ;
-
-		len_test_2 -= len_test + 1;
-
-		if (len_test_2 >= 2) {
-			lzma_lzma_state state_2 = state;
-			update_long_rep(state_2);
-
-			uint32_t pos_state_next = (position + len_test) & coder->pos_mask;
-
-			const uint32_t cur_and_len_literal_price = price
-					+ get_len_price(&coder->rep_len_encoder,
-						len_test, pos_state)
-					+ rc_bit_0_price(coder->is_match[state_2][pos_state_next])
-					+ get_literal_price(coder, position + len_test,
-						buf[len_test - 1], true,
-						buf_back[len_test], buf[len_test]);
-
-			update_literal(state_2);
-
-			pos_state_next = (position + len_test + 1) & coder->pos_mask;
-
-			const uint32_t next_rep_match_price = cur_and_len_literal_price
-					+ rc_bit_1_price(coder->is_match[state_2][pos_state_next])
-					+ rc_bit_1_price(coder->is_rep[state_2]);
-
-			//for(; len_test_2 >= 2; len_test_2--) {
-			const uint32_t offset = cur + len_test + 1 + len_test_2;
-
-			while (len_end < offset)
-				coder->opts[++len_end].price = RC_INFINITY_PRICE;
-
-			const uint32_t cur_and_len_price = next_rep_match_price
-					+ get_rep_price(coder, 0, len_test_2,
-						state_2, pos_state_next);
-
-			if (cur_and_len_price < coder->opts[offset].price) {
-				coder->opts[offset].price = cur_and_len_price;
-				coder->opts[offset].pos_prev = cur + len_test + 1;
-				coder->opts[offset].back_prev = 0;
-				coder->opts[offset].prev_1_is_literal = true;
-				coder->opts[offset].prev_2 = true;
-				coder->opts[offset].pos_prev_2 = cur;
-				coder->opts[offset].back_prev_2 = rep_index;
-			}
-			//}
-		}
-	}
-
-
-	//for (uint32_t len_test = 2; len_test <= new_len; ++len_test)
-	if (new_len > buf_avail) {
-		new_len = buf_avail;
-
-		matches_count = 0;
-		while (new_len > coder->matches[matches_count].len)
-			++matches_count;
-
-		coder->matches[matches_count++].len = new_len;
-	}
-
-
-	if (new_len >= start_len) {
-		const uint32_t normal_match_price = match_price
-				+ rc_bit_0_price(coder->is_rep[state]);
-
-		while (len_end < cur + new_len)
-			coder->opts[++len_end].price = RC_INFINITY_PRICE;
-
-		uint32_t i = 0;
-		while (start_len > coder->matches[i].len)
-			++i;
-
-		for (uint32_t len_test = start_len; ; ++len_test) {
-			const uint32_t cur_back = coder->matches[i].dist;
-			uint32_t cur_and_len_price = normal_match_price
-					+ get_pos_len_price(coder,
-						cur_back, len_test, pos_state);
-
-			if (cur_and_len_price < coder->opts[cur + len_test].price) {
-				coder->opts[cur + len_test].price = cur_and_len_price;
-				coder->opts[cur + len_test].pos_prev = cur;
-				coder->opts[cur + len_test].back_prev
-						= cur_back + REP_DISTANCES;
-				coder->opts[cur + len_test].prev_1_is_literal = false;
-			}
-
-			if (len_test == coder->matches[i].len) {
-				// Try Match + Literal + Rep0
-				const uint8_t *const buf_back = buf - cur_back - 1;
-				uint32_t len_test_2 = len_test + 1;
-				const uint32_t limit = my_min(buf_avail_full,
-						len_test_2 + nice_len);
-
-				for (; len_test_2 < limit &&
-						buf[len_test_2] == buf_back[len_test_2];
-						++len_test_2) ;
-
-				len_test_2 -= len_test + 1;
-
-				if (len_test_2 >= 2) {
-					lzma_lzma_state state_2 = state;
-					update_match(state_2);
-					uint32_t pos_state_next
-							= (position + len_test) & coder->pos_mask;
-
-					const uint32_t cur_and_len_literal_price = cur_and_len_price
-							+ rc_bit_0_price(
-								coder->is_match[state_2][pos_state_next])
-							+ get_literal_price(coder,
-								position + len_test,
-								buf[len_test - 1],
-								true,
-								buf_back[len_test],
-								buf[len_test]);
-
-					update_literal(state_2);
-					pos_state_next = (pos_state_next + 1) & coder->pos_mask;
-
-					const uint32_t next_rep_match_price
-							= cur_and_len_literal_price
-							+ rc_bit_1_price(
-								coder->is_match[state_2][pos_state_next])
-							+ rc_bit_1_price(coder->is_rep[state_2]);
-
-					// for(; len_test_2 >= 2; --len_test_2) {
-					const uint32_t offset = cur + len_test + 1 + len_test_2;
-
-					while (len_end < offset)
-						coder->opts[++len_end].price = RC_INFINITY_PRICE;
-
-					cur_and_len_price = next_rep_match_price
-							+ get_rep_price(coder, 0, len_test_2,
-								state_2, pos_state_next);
-
-					if (cur_and_len_price < coder->opts[offset].price) {
-						coder->opts[offset].price = cur_and_len_price;
-						coder->opts[offset].pos_prev = cur + len_test + 1;
-						coder->opts[offset].back_prev = 0;
-						coder->opts[offset].prev_1_is_literal = true;
-						coder->opts[offset].prev_2 = true;
-						coder->opts[offset].pos_prev_2 = cur;
-						coder->opts[offset].back_prev_2
-								= cur_back + REP_DISTANCES;
-					}
-					//}
-				}
-
-				if (++i == matches_count)
-					break;
-			}
-		}
-	}
-
-	return len_end;
-}
-
-
-extern void
-lzma_lzma_optimum_normal(lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint32_t *restrict back_res, uint32_t *restrict len_res,
-		uint32_t position)
-{
-	// If we have symbols pending, return the next pending symbol.
-	if (coder->opts_end_index != coder->opts_current_index) {
-		assert(mf->read_ahead > 0);
-		*len_res = coder->opts[coder->opts_current_index].pos_prev
-				- coder->opts_current_index;
-		*back_res = coder->opts[coder->opts_current_index].back_prev;
-		coder->opts_current_index = coder->opts[
-				coder->opts_current_index].pos_prev;
-		return;
-	}
-
-	// Update the price tables. In LZMA SDK <= 4.60 (and possibly later)
-	// this was done in both initialization function and in the main loop.
-	// In liblzma they were moved into this single place.
-	if (mf->read_ahead == 0) {
-		if (coder->match_price_count >= (1 << 7))
-			fill_distances_prices(coder);
-
-		if (coder->align_price_count >= ALIGN_TABLE_SIZE)
-			fill_align_prices(coder);
-	}
-
-	// TODO: This needs quite a bit of cleaning still. But splitting
-	// the original function into two pieces makes it at least a little
-	// more readable, since those two parts don't share many variables.
-
-	uint32_t len_end = helper1(coder, mf, back_res, len_res, position);
-	if (len_end == UINT32_MAX)
-		return;
-
-	uint32_t reps[REP_DISTANCES];
-	memcpy(reps, coder->reps, sizeof(reps));
-
-	uint32_t cur;
-	for (cur = 1; cur < len_end; ++cur) {
-		assert(cur < OPTS);
-
-		coder->longest_match_length = mf_find(
-				mf, &coder->matches_count, coder->matches);
-
-		if (coder->longest_match_length >= mf->nice_len)
-			break;
-
-		len_end = helper2(coder, reps, mf_ptr(mf) - 1, len_end,
-				position + cur, cur, mf->nice_len,
-				my_min(mf_avail(mf) + 1, OPTS - 1 - cur));
-	}
-
-	backward(coder, len_res, back_res, cur);
-	return;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_presets.c r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_presets.c
--- r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_presets.c	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_presets.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_encoder_presets.c
-/// \brief      Encoder presets
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-extern LZMA_API(lzma_bool)
-lzma_lzma_preset(lzma_options_lzma *options, uint32_t preset)
-{
-	const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK;
-	const uint32_t flags = preset & ~LZMA_PRESET_LEVEL_MASK;
-	const uint32_t supported_flags = LZMA_PRESET_EXTREME;
-
-	if (level > 9 || (flags & ~supported_flags))
-		return true;
-
-	options->preset_dict = NULL;
-	options->preset_dict_size = 0;
-
-	options->lc = LZMA_LC_DEFAULT;
-	options->lp = LZMA_LP_DEFAULT;
-	options->pb = LZMA_PB_DEFAULT;
-
-	static const uint8_t dict_pow2[]
-			= { 18, 20, 21, 22, 22, 23, 23, 24, 25, 26 };
-	options->dict_size = UINT32_C(1) << dict_pow2[level];
-
-	if (level <= 3) {
-		options->mode = LZMA_MODE_FAST;
-		options->mf = level == 0 ? LZMA_MF_HC3 : LZMA_MF_HC4;
-		options->nice_len = level <= 1 ? 128 : 273;
-		static const uint8_t depths[] = { 4, 8, 24, 48 };
-		options->depth = depths[level];
-	} else {
-		options->mode = LZMA_MODE_NORMAL;
-		options->mf = LZMA_MF_BT4;
-		options->nice_len = level == 4 ? 16 : level == 5 ? 32 : 64;
-		options->depth = 0;
-	}
-
-	if (flags & LZMA_PRESET_EXTREME) {
-		options->mode = LZMA_MODE_NORMAL;
-		options->mf = LZMA_MF_BT4;
-		if (level == 3 || level == 5) {
-			options->nice_len = 192;
-			options->depth = 0;
-		} else {
-			options->nice_len = 273;
-			options->depth = 512;
-		}
-	}
-
-	return false;
-}
diff -Nru r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_private.h r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_private.h
--- r-base-3.2.3/src/extra/xz/lzma/lzma_encoder_private.h	2010-11-08 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/lzma/lzma_encoder_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       lzma_encoder_private.h
-/// \brief      Private definitions for LZMA encoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_LZMA_ENCODER_PRIVATE_H
-#define LZMA_LZMA_ENCODER_PRIVATE_H
-
-#include "lz_encoder.h"
-#include "range_encoder.h"
-#include "lzma_common.h"
-#include "lzma_encoder.h"
-
-
-// Macro to compare if the first two bytes in two buffers differ. This is
-// needed in lzma_lzma_optimum_*() to test if the match is at least
-// MATCH_LEN_MIN bytes. Unaligned access gives tiny gain so there's no
-// reason to not use it when it is supported.
-#ifdef TUKLIB_FAST_UNALIGNED_ACCESS
-#	define not_equal_16(a, b) \
-		(*(const uint16_t *)(a) != *(const uint16_t *)(b))
-#else
-#	define not_equal_16(a, b) \
-		((a)[0] != (b)[0] || (a)[1] != (b)[1])
-#endif
-
-
-// Optimal - Number of entries in the optimum array.
-#define OPTS (1 << 12)
-
-
-typedef struct {
-	probability choice;
-	probability choice2;
-	probability low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
-	probability mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
-	probability high[LEN_HIGH_SYMBOLS];
-
-	uint32_t prices[POS_STATES_MAX][LEN_SYMBOLS];
-	uint32_t table_size;
-	uint32_t counters[POS_STATES_MAX];
-
-} lzma_length_encoder;
-
-
-typedef struct {
-	lzma_lzma_state state;
-
-	bool prev_1_is_literal;
-	bool prev_2;
-
-	uint32_t pos_prev_2;
-	uint32_t back_prev_2;
-
-	uint32_t price;
-	uint32_t pos_prev;  // pos_next;
-	uint32_t back_prev;
-
-	uint32_t backs[REP_DISTANCES];
-
-} lzma_optimal;
-
-
-struct lzma_coder_s {
-	/// Range encoder
-	lzma_range_encoder rc;
-
-	/// State
-	lzma_lzma_state state;
-
-	/// The four most recent match distances
-	uint32_t reps[REP_DISTANCES];
-
-	/// Array of match candidates
-	lzma_match matches[MATCH_LEN_MAX + 1];
-
-	/// Number of match candidates in matches[]
-	uint32_t matches_count;
-
-	/// Variable to hold the length of the longest match between calls
-	/// to lzma_lzma_optimum_*().
-	uint32_t longest_match_length;
-
-	/// True if using getoptimumfast
-	bool fast_mode;
-
-	/// True if the encoder has been initialized by encoding the first
-	/// byte as a literal.
-	bool is_initialized;
-
-	/// True if the range encoder has been flushed, but not all bytes
-	/// have been written to the output buffer yet.
-	bool is_flushed;
-
-	uint32_t pos_mask;         ///< (1 << pos_bits) - 1
-	uint32_t literal_context_bits;
-	uint32_t literal_pos_mask;
-
-	// These are the same as in lzma_decoder.c. See comments there.
-	probability literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
-	probability is_match[STATES][POS_STATES_MAX];
-	probability is_rep[STATES];
-	probability is_rep0[STATES];
-	probability is_rep1[STATES];
-	probability is_rep2[STATES];
-	probability is_rep0_long[STATES][POS_STATES_MAX];
-	probability pos_slot[LEN_TO_POS_STATES][POS_SLOTS];
-	probability pos_special[FULL_DISTANCES - END_POS_MODEL_INDEX];
-	probability pos_align[ALIGN_TABLE_SIZE];
-
-	// These are the same as in lzma_decoder.c except that the encoders
-	// include also price tables.
-	lzma_length_encoder match_len_encoder;
-	lzma_length_encoder rep_len_encoder;
-
-	// Price tables
-	uint32_t pos_slot_prices[LEN_TO_POS_STATES][POS_SLOTS];
-	uint32_t distances_prices[LEN_TO_POS_STATES][FULL_DISTANCES];
-	uint32_t dist_table_size;
-	uint32_t match_price_count;
-
-	uint32_t align_prices[ALIGN_TABLE_SIZE];
-	uint32_t align_price_count;
-
-	// Optimal
-	uint32_t opts_end_index;
-	uint32_t opts_current_index;
-	lzma_optimal opts[OPTS];
-};
-
-
-extern void lzma_lzma_optimum_fast(
-		lzma_coder *restrict coder, lzma_mf *restrict mf,
-		uint32_t *restrict back_res, uint32_t *restrict len_res);
-
-extern void lzma_lzma_optimum_normal(lzma_coder *restrict coder,
-		lzma_mf *restrict mf, uint32_t *restrict back_res,
-		uint32_t *restrict len_res, uint32_t position);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/Makefile.in r-base-3.3.1/src/extra/xz/Makefile.in
--- r-base-3.2.3/src/extra/xz/Makefile.in	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-#
-# ${R_HOME}/src/extra/xz/Makefile
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-top_builddir = ../../..
-subdir = src/extra/xz
-R_HOME = $(top_builddir)
-
-include $(top_builddir)/Makeconf
-
-LZMA_CPPFLAGS = -I$(srcdir)/api
-ALL_CPPFLAGS = $(LZMA_CPPFLAGS) $(R_XTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS)
-
-SOURCES = \
- alone_decoder.c alone_encoder.c arm.c armthumb.c auto_decoder.c \
- block_buffer_decoder.c block_buffer_encoder.c block_decoder.c \
- block_encoder.c block_header_decoder.c block_header_encoder.c block_util.c \
- check.c common.c crc32_fast.c crc32_table.c \
- crc64_fast.c crc64_table.c delta_common.c delta_decoder.c \
- delta_encoder.c easy_buffer_encoder.c easy_decoder_memusage.c easy_encoder.c \
- easy_encoder_memusage.c easy_preset.c fastpos_table.c \
- filter_buffer_decoder.c filter_buffer_encoder.c filter_common.c \
- filter_decoder.c filter_encoder.c filter_flags_decoder.c \
- filter_flags_encoder.c ia64.c index.c index_decoder.c index_encoder.c \
- index_hash.c lz_decoder.c lz_encoder.c lz_encoder_mf.c lzma2_decoder.c \
- lzma2_encoder.c lzma_decoder.c lzma_encoder.c lzma_encoder_optimum_fast.c \
- lzma_encoder_optimum_normal.c lzma_encoder_presets.c powerpc.c \
- price_table.c sha256.c simple_coder.c simple_decoder.c \
- simple_encoder.c sparc.c stream_buffer_decoder.c stream_buffer_encoder.c \
- stream_decoder.c stream_encoder.c stream_flags_common.c \
- stream_flags_decoder.c stream_flags_encoder.c \
- vli_decoder.c vli_encoder.c vli_size.c x86.c
-
-OBJECTS = $(SOURCES:.c=.o)
-@WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) @C_VISIBILITY@
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-DISTFILES = Makefile.in Makefile.win R_changes
-noinst_LIBRARIES = liblzma.a
-liblzma_a_SOURCES = $(SOURCES)
-liblzma_a_OBJECTS = $(OBJECTS)
-SUBDIRS_WITH_NO_BUILD = \
-  api check common delta lz lzma rangecoder simple
-
-all: @BUILD_XZ_TRUE@ R
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-R: Makefile @BUILD_XZ_TRUE@ stamp
-	@BUILD_XZ_TRUE@ @$(MAKE) $(noinst_LIBRARIES)
-
-stamp:
-	@ln -s $(srcdir)/*/*.c $(srcdir)/*/*.h .
-	touch stamp
-
-liblzma.a: $(liblzma_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(liblzma_a_OBJECTS)
-	$(RANLIB) $@
-
-mostlyclean: clean
-clean:
-	@-rm -f Makedeps stamp *.c *.h *.o *.lo *.a
-distclean: clean
-	@-rm -f Makefile
-maintainer-clean: distclean
-
-install install-strip uninstall TAGS info dvi check:
-
-distdir: $(DISTFILES)
-	@for f in $(DISTFILES); do \
-	  test -f $(distdir)/$${f} \
-	    || ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
-	    || cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
-	done
-	@for d in $(SUBDIRS_WITH_NO_BUILD); do \
-	  ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
-	      | (cd $(distdir); $(TAR) -x -f -)) \
-	    || exit 1; \
-	done
-
-## Automagically generated dependencies:
-
diff -Nru r-base-3.2.3/src/extra/xz/Makefile.win r-base-3.3.1/src/extra/xz/Makefile.win
--- r-base-3.2.3/src/extra/xz/Makefile.win	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/Makefile.win	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#-*- Makefile -*-
-include ../../gnuwin32/MkRules
-
-CPPFLAGS = -I../../include -I. -Iapi -DLZMA_API_STATIC -DHAVE_CONFIG_H -DWIN32
-
-SOURCES = \
- alone_decoder.c alone_encoder.c arm.c armthumb.c auto_decoder.c \
- block_buffer_decoder.c block_buffer_encoder.c block_decoder.c \
- block_encoder.c block_header_decoder.c block_header_encoder.c block_util.c \
- check.c common.c crc32_table.c \
- crc64_table.c delta_common.c delta_decoder.c \
- delta_encoder.c easy_buffer_encoder.c easy_decoder_memusage.c easy_encoder.c \
- easy_encoder_memusage.c easy_preset.c fastpos_table.c \
- filter_buffer_decoder.c filter_buffer_encoder.c filter_common.c \
- filter_decoder.c filter_encoder.c filter_flags_decoder.c \
- filter_flags_encoder.c ia64.c index.c index_decoder.c index_encoder.c \
- index_hash.c lz_decoder.c lz_encoder.c lz_encoder_mf.c lzma2_decoder.c \
- lzma2_encoder.c lzma_decoder.c lzma_encoder.c lzma_encoder_optimum_fast.c \
- lzma_encoder_optimum_normal.c lzma_encoder_presets.c powerpc.c \
- price_table.c sha256.c simple_coder.c simple_decoder.c \
- simple_encoder.c sparc.c stream_buffer_decoder.c stream_buffer_encoder.c \
- stream_decoder.c stream_encoder.c stream_flags_common.c \
- stream_flags_decoder.c stream_flags_encoder.c \
- vli_decoder.c vli_encoder.c vli_size.c x86.c
-
-
-## Use assembler version on i386
-ifeq "$(WIN)" "64"
-OBJECTS = $(SOURCES:.c=.o) crc32_fast.o crc64_fast.o
-else
-OBJECTS = $(SOURCES:.c=.o) crc32_x86.o crc64_x86.o
-endif
-
-all:
-	@$(MAKE) -f Makefile.win stamp
-	@$(MAKE) -f Makefile.win liblzma.a
-
-stamp:
-	@cp -p */*.c */*.h check/*.S .
-	touch stamp
-
-liblzma.a: $(OBJECTS)
-
-clean:
-	@$(RM) -f Makedeps stamp *.c *.h *.o *.S
-distclean: clean
-	@$(RM) liblzma.a
diff -Nru r-base-3.2.3/src/extra/xz/rangecoder/price.h r-base-3.3.1/src/extra/xz/rangecoder/price.h
--- r-base-3.2.3/src/extra/xz/rangecoder/price.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/rangecoder/price.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       price.h
-/// \brief      Probability price calculation
-//
-//  Author:     Igor Pavlov
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_PRICE_H
-#define LZMA_PRICE_H
-
-
-#define RC_MOVE_REDUCING_BITS 4
-#define RC_BIT_PRICE_SHIFT_BITS 4
-#define RC_PRICE_TABLE_SIZE (RC_BIT_MODEL_TOTAL >> RC_MOVE_REDUCING_BITS)
-
-#define RC_INFINITY_PRICE (UINT32_C(1) << 30)
-
-
-/// Lookup table for the inline functions defined in this file.
-extern const uint8_t lzma_rc_prices[RC_PRICE_TABLE_SIZE];
-
-
-static inline uint32_t
-rc_bit_price(const probability prob, const uint32_t bit)
-{
-	return lzma_rc_prices[(prob ^ ((UINT32_C(0) - bit)
-			& (RC_BIT_MODEL_TOTAL - 1))) >> RC_MOVE_REDUCING_BITS];
-}
-
-
-static inline uint32_t
-rc_bit_0_price(const probability prob)
-{
-	return lzma_rc_prices[prob >> RC_MOVE_REDUCING_BITS];
-}
-
-
-static inline uint32_t
-rc_bit_1_price(const probability prob)
-{
-	return lzma_rc_prices[(prob ^ (RC_BIT_MODEL_TOTAL - 1))
-			>> RC_MOVE_REDUCING_BITS];
-}
-
-
-static inline uint32_t
-rc_bittree_price(const probability *const probs,
-		const uint32_t bit_levels, uint32_t symbol)
-{
-	uint32_t price = 0;
-	symbol += UINT32_C(1) << bit_levels;
-
-	do {
-		const uint32_t bit = symbol & 1;
-		symbol >>= 1;
-		price += rc_bit_price(probs[symbol], bit);
-	} while (symbol != 1);
-
-	return price;
-}
-
-
-static inline uint32_t
-rc_bittree_reverse_price(const probability *const probs,
-		uint32_t bit_levels, uint32_t symbol)
-{
-	uint32_t price = 0;
-	uint32_t model_index = 1;
-
-	do {
-		const uint32_t bit = symbol & 1;
-		symbol >>= 1;
-		price += rc_bit_price(probs[model_index], bit);
-		model_index = (model_index << 1) + bit;
-	} while (--bit_levels != 0);
-
-	return price;
-}
-
-
-static inline uint32_t
-rc_direct_price(const uint32_t bits)
-{
-	 return bits << RC_BIT_PRICE_SHIFT_BITS;
-}
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/rangecoder/price_table.c r-base-3.3.1/src/extra/xz/rangecoder/price_table.c
--- r-base-3.2.3/src/extra/xz/rangecoder/price_table.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/rangecoder/price_table.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* This file has been automatically generated by price_tablegen.c. */
-
-#include "range_encoder.h"
-
-const uint8_t lzma_rc_prices[RC_PRICE_TABLE_SIZE] = {
-	 128, 103,  91,  84,  78,  73,  69,  66,
-	  63,  61,  58,  56,  54,  52,  51,  49,
-	  48,  46,  45,  44,  43,  42,  41,  40,
-	  39,  38,  37,  36,  35,  34,  34,  33,
-	  32,  31,  31,  30,  29,  29,  28,  28,
-	  27,  26,  26,  25,  25,  24,  24,  23,
-	  23,  22,  22,  22,  21,  21,  20,  20,
-	  19,  19,  19,  18,  18,  17,  17,  17,
-	  16,  16,  16,  15,  15,  15,  14,  14,
-	  14,  13,  13,  13,  12,  12,  12,  11,
-	  11,  11,  11,  10,  10,  10,  10,   9,
-	   9,   9,   9,   8,   8,   8,   8,   7,
-	   7,   7,   7,   6,   6,   6,   6,   5,
-	   5,   5,   5,   5,   4,   4,   4,   4,
-	   3,   3,   3,   3,   3,   2,   2,   2,
-	   2,   2,   2,   1,   1,   1,   1,   1
-};
diff -Nru r-base-3.2.3/src/extra/xz/rangecoder/price_tablegen.c r-base-3.3.1/src/extra/xz/rangecoder/price_tablegen.c
--- r-base-3.2.3/src/extra/xz/rangecoder/price_tablegen.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/rangecoder/price_tablegen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       price_tablegen.c
-/// \brief      Probability price table generator
-///
-/// Compiling: gcc -std=c99 -o price_tablegen price_tablegen.c
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <inttypes.h>
-#include <stdio.h>
-#include "range_common.h"
-#include "price.h"
-
-
-static uint32_t rc_prices[RC_PRICE_TABLE_SIZE];
-
-
-static void
-init_price_table(void)
-{
-	for (uint32_t i = (UINT32_C(1) << RC_MOVE_REDUCING_BITS) / 2;
-			i < RC_BIT_MODEL_TOTAL;
-			i += (UINT32_C(1) << RC_MOVE_REDUCING_BITS)) {
-		const uint32_t cycles_bits = RC_BIT_PRICE_SHIFT_BITS;
-		uint32_t w = i;
-		uint32_t bit_count = 0;
-
-		for (uint32_t j = 0; j < cycles_bits; ++j) {
-			w *= w;
-			bit_count <<= 1;
-
-			while (w >= (UINT32_C(1) << 16)) {
-				w >>= 1;
-				++bit_count;
-			}
-		}
-
-		rc_prices[i >> RC_MOVE_REDUCING_BITS]
-				= (RC_BIT_MODEL_TOTAL_BITS << cycles_bits)
-				- 15 - bit_count;
-	}
-
-	return;
-}
-
-
-static void
-print_price_table(void)
-{
-	printf("/* This file has been automatically generated by "
-			"price_tablegen.c. */\n\n"
-			"#include \"range_encoder.h\"\n\n"
-			"const uint8_t lzma_rc_prices["
-			"RC_PRICE_TABLE_SIZE] = {");
-
-	const size_t array_size = sizeof(lzma_rc_prices)
-			/ sizeof(lzma_rc_prices[0]);
-	for (size_t i = 0; i < array_size; ++i) {
-		if (i % 8 == 0)
-			printf("\n\t");
-
-		printf("%4" PRIu32, rc_prices[i]);
-
-		if (i != array_size - 1)
-			printf(",");
-	}
-
-	printf("\n};\n");
-
-	return;
-}
-
-
-int
-main(void)
-{
-	init_price_table();
-	print_price_table();
-	return 0;
-}
diff -Nru r-base-3.2.3/src/extra/xz/rangecoder/range_common.h r-base-3.3.1/src/extra/xz/rangecoder/range_common.h
--- r-base-3.2.3/src/extra/xz/rangecoder/range_common.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/rangecoder/range_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       range_common.h
-/// \brief      Common things for range encoder and decoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_RANGE_COMMON_H
-#define LZMA_RANGE_COMMON_H
-
-#ifdef HAVE_CONFIG_H
-#	include "common.h"
-#endif
-
-
-///////////////
-// Constants //
-///////////////
-
-#define RC_SHIFT_BITS 8
-#define RC_TOP_BITS 24
-#define RC_TOP_VALUE (UINT32_C(1) << RC_TOP_BITS)
-#define RC_BIT_MODEL_TOTAL_BITS 11
-#define RC_BIT_MODEL_TOTAL (UINT32_C(1) << RC_BIT_MODEL_TOTAL_BITS)
-#define RC_MOVE_BITS 5
-
-
-////////////
-// Macros //
-////////////
-
-// Resets the probability so that both 0 and 1 have probability of 50 %
-#define bit_reset(prob) \
-	prob = RC_BIT_MODEL_TOTAL >> 1
-
-// This does the same for a complete bit tree.
-// (A tree represented as an array.)
-#define bittree_reset(probs, bit_levels) \
-	for (uint32_t bt_i = 0; bt_i < (1 << (bit_levels)); ++bt_i) \
-		bit_reset((probs)[bt_i])
-
-
-//////////////////////
-// Type definitions //
-//////////////////////
-
-/// \brief      Type of probabilities used with range coder
-///
-/// This needs to be at least 12-bit integer, so uint16_t is a logical choice.
-/// However, on some architecture and compiler combinations, a bigger type
-/// may give better speed, because the probability variables are accessed
-/// a lot. On the other hand, bigger probability type increases cache
-/// footprint, since there are 2 to 14 thousand probability variables in
-/// LZMA (assuming the limit of lc + lp <= 4; with lc + lp <= 12 there
-/// would be about 1.5 million variables).
-///
-/// With malicious files, the initialization speed of the LZMA decoder can
-/// become important. In that case, smaller probability variables mean that
-/// there is less bytes to write to RAM, which makes initialization faster.
-/// With big probability type, the initialization can become so slow that it
-/// can be a problem e.g. for email servers doing virus scanning.
-///
-/// I will be sticking to uint16_t unless some specific architectures
-/// are *much* faster (20-50 %) with uint32_t.
-typedef uint16_t probability;
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/rangecoder/range_decoder.h r-base-3.3.1/src/extra/xz/rangecoder/range_decoder.h
--- r-base-3.2.3/src/extra/xz/rangecoder/range_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/rangecoder/range_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       range_decoder.h
-/// \brief      Range Decoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_RANGE_DECODER_H
-#define LZMA_RANGE_DECODER_H
-
-#include "range_common.h"
-
-
-typedef struct {
-	uint32_t range;
-	uint32_t code;
-	uint32_t init_bytes_left;
-} lzma_range_decoder;
-
-
-/// Reads the first five bytes to initialize the range decoder.
-static inline bool
-rc_read_init(lzma_range_decoder *rc, const uint8_t *restrict in,
-		size_t *restrict in_pos, size_t in_size)
-{
-	while (rc->init_bytes_left > 0) {
-		if (*in_pos == in_size)
-			return false;
-
-		rc->code = (rc->code << 8) | in[*in_pos];
-		++*in_pos;
-		--rc->init_bytes_left;
-	}
-
-	return true;
-}
-
-
-/// Makes local copies of range decoder and *in_pos variables. Doing this
-/// improves speed significantly. The range decoder macros expect also
-/// variables `in' and `in_size' to be defined.
-#define rc_to_local(range_decoder, in_pos) \
-	lzma_range_decoder rc = range_decoder; \
-	size_t rc_in_pos = (in_pos); \
-	uint32_t rc_bound
-
-
-/// Stores the local copes back to the range decoder structure.
-#define rc_from_local(range_decoder, in_pos) \
-do { \
-	range_decoder = rc; \
-	in_pos = rc_in_pos; \
-} while (0)
-
-
-/// Resets the range decoder structure.
-#define rc_reset(range_decoder) \
-do { \
-	(range_decoder).range = UINT32_MAX; \
-	(range_decoder).code = 0; \
-	(range_decoder).init_bytes_left = 5; \
-} while (0)
-
-
-/// When decoding has been properly finished, rc.code is always zero unless
-/// the input stream is corrupt. So checking this can catch some corrupt
-/// files especially if they don't have any other integrity check.
-#define rc_is_finished(range_decoder) \
-	((range_decoder).code == 0)
-
-
-/// Read the next input byte if needed. If more input is needed but there is
-/// no more input available, "goto out" is used to jump out of the main
-/// decoder loop.
-#define rc_normalize(seq) \
-do { \
-	if (rc.range < RC_TOP_VALUE) { \
-		if (unlikely(rc_in_pos == in_size)) { \
-			coder->sequence = seq; \
-			goto out; \
-		} \
-		rc.range <<= RC_SHIFT_BITS; \
-		rc.code = (rc.code << RC_SHIFT_BITS) | in[rc_in_pos++]; \
-	} \
-} while (0)
-
-
-/// Start decoding a bit. This must be used together with rc_update_0()
-/// and rc_update_1():
-///
-///     rc_if_0(prob, seq) {
-///         rc_update_0(prob);
-///         // Do something
-///     } else {
-///         rc_update_1(prob);
-///         // Do something else
-///     }
-///
-#define rc_if_0(prob, seq) \
-	rc_normalize(seq); \
-	rc_bound = (rc.range >> RC_BIT_MODEL_TOTAL_BITS) * (prob); \
-	if (rc.code < rc_bound)
-
-
-/// Update the range decoder state and the used probability variable to
-/// match a decoded bit of 0.
-#define rc_update_0(prob) \
-do { \
-	rc.range = rc_bound; \
-	prob += (RC_BIT_MODEL_TOTAL - (prob)) >> RC_MOVE_BITS; \
-} while (0)
-
-
-/// Update the range decoder state and the used probability variable to
-/// match a decoded bit of 1.
-#define rc_update_1(prob) \
-do { \
-	rc.range -= rc_bound; \
-	rc.code -= rc_bound; \
-	prob -= (prob) >> RC_MOVE_BITS; \
-} while (0)
-
-
-/// Decodes one bit and runs action0 or action1 depending on the decoded bit.
-/// This macro is used as the last step in bittree reverse decoders since
-/// those don't use "symbol" for anything else than indexing the probability
-/// arrays.
-#define rc_bit_last(prob, action0, action1, seq) \
-do { \
-	rc_if_0(prob, seq) { \
-		rc_update_0(prob); \
-		action0; \
-	} else { \
-		rc_update_1(prob); \
-		action1; \
-	} \
-} while (0)
-
-
-/// Decodes one bit, updates "symbol", and runs action0 or action1 depending
-/// on the decoded bit.
-#define rc_bit(prob, action0, action1, seq) \
-	rc_bit_last(prob, \
-		symbol <<= 1; action0, \
-		symbol = (symbol << 1) + 1; action1, \
-		seq);
-
-
-/// Like rc_bit() but add "case seq:" as a prefix. This makes the unrolled
-/// loops more readable because the code isn't littered with "case"
-/// statements. On the other hand this also makes it less readable, since
-/// spotting the places where the decoder loop may be restarted is less
-/// obvious.
-#define rc_bit_case(prob, action0, action1, seq) \
-	case seq: rc_bit(prob, action0, action1, seq)
-
-
-/// Decode a bit without using a probability.
-#define rc_direct(dest, seq) \
-do { \
-	rc_normalize(seq); \
-	rc.range >>= 1; \
-	rc.code -= rc.range; \
-	rc_bound = UINT32_C(0) - (rc.code >> 31); \
-	rc.code += rc.range & rc_bound; \
-	dest = (dest << 1) + (rc_bound + 1); \
-} while (0)
-
-
-// NOTE: No macros are provided for bittree decoding. It seems to be simpler
-// to just write them open in the code.
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/rangecoder/range_encoder.h r-base-3.3.1/src/extra/xz/rangecoder/range_encoder.h
--- r-base-3.2.3/src/extra/xz/rangecoder/range_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/rangecoder/range_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,231 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       range_encoder.h
-/// \brief      Range Encoder
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_RANGE_ENCODER_H
-#define LZMA_RANGE_ENCODER_H
-
-#include "range_common.h"
-#include "price.h"
-
-
-/// Maximum number of symbols that can be put pending into lzma_range_encoder
-/// structure between calls to lzma_rc_encode(). For LZMA, 52+5 is enough
-/// (match with big distance and length followed by range encoder flush).
-#define RC_SYMBOLS_MAX 58
-
-
-typedef struct {
-	uint64_t low;
-	uint64_t cache_size;
-	uint32_t range;
-	uint8_t cache;
-
-	/// Number of symbols in the tables
-	size_t count;
-
-	/// rc_encode()'s position in the tables
-	size_t pos;
-
-	/// Symbols to encode
-	enum {
-		RC_BIT_0,
-		RC_BIT_1,
-		RC_DIRECT_0,
-		RC_DIRECT_1,
-		RC_FLUSH,
-	} symbols[RC_SYMBOLS_MAX];
-
-	/// Probabilities associated with RC_BIT_0 or RC_BIT_1
-	probability *probs[RC_SYMBOLS_MAX];
-
-} lzma_range_encoder;
-
-
-static inline void
-rc_reset(lzma_range_encoder *rc)
-{
-	rc->low = 0;
-	rc->cache_size = 1;
-	rc->range = UINT32_MAX;
-	rc->cache = 0;
-	rc->count = 0;
-	rc->pos = 0;
-}
-
-
-static inline void
-rc_bit(lzma_range_encoder *rc, probability *prob, uint32_t bit)
-{
-	rc->symbols[rc->count] = bit;
-	rc->probs[rc->count] = prob;
-	++rc->count;
-}
-
-
-static inline void
-rc_bittree(lzma_range_encoder *rc, probability *probs,
-		uint32_t bit_count, uint32_t symbol)
-{
-	uint32_t model_index = 1;
-
-	do {
-		const uint32_t bit = (symbol >> --bit_count) & 1;
-		rc_bit(rc, &probs[model_index], bit);
-		model_index = (model_index << 1) + bit;
-	} while (bit_count != 0);
-}
-
-
-static inline void
-rc_bittree_reverse(lzma_range_encoder *rc, probability *probs,
-		uint32_t bit_count, uint32_t symbol)
-{
-	uint32_t model_index = 1;
-
-	do {
-		const uint32_t bit = symbol & 1;
-		symbol >>= 1;
-		rc_bit(rc, &probs[model_index], bit);
-		model_index = (model_index << 1) + bit;
-	} while (--bit_count != 0);
-}
-
-
-static inline void
-rc_direct(lzma_range_encoder *rc,
-		uint32_t value, uint32_t bit_count)
-{
-	do {
-		rc->symbols[rc->count++]
-				= RC_DIRECT_0 + ((value >> --bit_count) & 1);
-	} while (bit_count != 0);
-}
-
-
-static inline void
-rc_flush(lzma_range_encoder *rc)
-{
-	for (size_t i = 0; i < 5; ++i)
-		rc->symbols[rc->count++] = RC_FLUSH;
-}
-
-
-static inline bool
-rc_shift_low(lzma_range_encoder *rc,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	if ((uint32_t)(rc->low) < (uint32_t)(0xFF000000)
-			|| (uint32_t)(rc->low >> 32) != 0) {
-		do {
-			if (*out_pos == out_size)
-				return true;
-
-			out[*out_pos] = rc->cache + (uint8_t)(rc->low >> 32);
-			++*out_pos;
-			rc->cache = 0xFF;
-
-		} while (--rc->cache_size != 0);
-
-		rc->cache = (rc->low >> 24) & 0xFF;
-	}
-
-	++rc->cache_size;
-	rc->low = (rc->low & 0x00FFFFFF) << RC_SHIFT_BITS;
-
-	return false;
-}
-
-
-static inline bool
-rc_encode(lzma_range_encoder *rc,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-{
-	assert(rc->count <= RC_SYMBOLS_MAX);
-
-	while (rc->pos < rc->count) {
-		// Normalize
-		if (rc->range < RC_TOP_VALUE) {
-			if (rc_shift_low(rc, out, out_pos, out_size))
-				return true;
-
-			rc->range <<= RC_SHIFT_BITS;
-		}
-
-		// Encode a bit
-		switch (rc->symbols[rc->pos]) {
-		case RC_BIT_0: {
-			probability prob = *rc->probs[rc->pos];
-			rc->range = (rc->range >> RC_BIT_MODEL_TOTAL_BITS)
-					* prob;
-			prob += (RC_BIT_MODEL_TOTAL - prob) >> RC_MOVE_BITS;
-			*rc->probs[rc->pos] = prob;
-			break;
-		}
-
-		case RC_BIT_1: {
-			probability prob = *rc->probs[rc->pos];
-			const uint32_t bound = prob * (rc->range
-					>> RC_BIT_MODEL_TOTAL_BITS);
-			rc->low += bound;
-			rc->range -= bound;
-			prob -= prob >> RC_MOVE_BITS;
-			*rc->probs[rc->pos] = prob;
-			break;
-		}
-
-		case RC_DIRECT_0:
-			rc->range >>= 1;
-			break;
-
-		case RC_DIRECT_1:
-			rc->range >>= 1;
-			rc->low += rc->range;
-			break;
-
-		case RC_FLUSH:
-			// Prevent further normalizations.
-			rc->range = UINT32_MAX;
-
-			// Flush the last five bytes (see rc_flush()).
-			do {
-				if (rc_shift_low(rc, out, out_pos, out_size))
-					return true;
-			} while (++rc->pos < rc->count);
-
-			// Reset the range encoder so we are ready to continue
-			// encoding if we weren't finishing the stream.
-			rc_reset(rc);
-			return false;
-
-		default:
-			assert(0);
-			break;
-		}
-
-		++rc->pos;
-	}
-
-	rc->count = 0;
-	rc->pos = 0;
-
-	return false;
-}
-
-
-static inline uint64_t
-rc_pending(const lzma_range_encoder *rc)
-{
-	return rc->cache_size + 5 - 1;
-}
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/R_changes r-base-3.3.1/src/extra/xz/R_changes
--- r-base-3.2.3/src/extra/xz/R_changes	2015-03-18 23:02:07.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/R_changes	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-All the files from xz-utils are in the public domain.
-
-This is (most of) subdirectory src/liblzma of xz-utils, except for
-files Makefile.in, Makefile.win and R_changes and with the patches
-below.
-
-common/{bswap,mythread,tuklib*}.h are from xz-utils/src/common.
-
-common/local.h is a new file (the set of definitions of features to be built).
-
-x86 performance optimizations are only used on (32-bit) Windows: it is
-assumed that on other 32-bit OSes an optimized system liblzma is or
-could be made available (and this directory is not compiled if a
-system version is available).
-
-common/sysdefs.h is a modified copy of xz-utils/src/common/sysdefs.h which 
-- includes local.h
-- avoids Mingw versions of stdio.
-- r51513: Change _Bool to _Bool8 to avoid clashes on one Solaris 10 system.
-  (Solaris 10 has stdbool.h, but it was not being found on that system.)
-
-We control visibility and make most symbols hidden.
-
---- xz-5.0.7/src/liblzma/common/common.h	2014-09-20 17:48:05.000000000 +0100
-+++ common/common.h	2014-11-21 18:16:04.000000000 +0000
-@@ -23,9 +23,7 @@
- #	else
- #		define LZMA_API_EXPORT
- #	endif
--// Don't use ifdef or defined() below.
--#elif HAVE_VISIBILITY
--#	define LZMA_API_EXPORT __attribute__((__visibility__("default")))
-+// R change: we do not want all symbols visible
- #else
- #	define LZMA_API_EXPORT
- #endif
-
-
---- xz-5.0.7/src/common/sysdefs.h	2014-09-20 17:48:05.000000000 +0100
-+++ /common/sysdefs.h	2014-11-19 10:07:45.000000000 +0000
-@@ -24,10 +24,12 @@
- #	include <config.h>
- #endif
- 
-+// R change
-+#include "local.h"
- // Get standard-compliant stdio functions under MinGW and MinGW-w64.
--#ifdef __MINGW32__
--#	define __USE_MINGW_ANSI_STDIO 1
--#endif
-+//#ifdef __MINGW32__
-+//#	define __USE_MINGW_ANSI_STDIO 1
-+//#endif
- 
- // size_t and NULL
- #include <stddef.h>
-@@ -143,9 +145,10 @@
- #	include <stdbool.h>
- #else
- #	if ! HAVE__BOOL
--typedef unsigned char _Bool;
-+/* _Bool gave problems on one Solaris system */
-+typedef unsigned char _Bool8;
- #	endif
--#	define bool _Bool
-+#	define bool _Bool8
- #	define false 0
- #	define true 1
- #	define __bool_true_false_are_defined 1
-
---- xz-5.0.7/src/liblzma/check/crc64_fast.c	2014-09-20 17:48:05.000000000 +0100
-+++ check/crc64_fast.c	2014-11-19 10:09:11.000000000 +0000
-@@ -25,8 +25,10 @@
- #endif
- 
- 
-+// R_Change: Used in package utils, so needs to be visible
-+#include <R_ext/Visibility.h>
- // See the comments in crc32_fast.c. They aren't duplicated here.
--extern LZMA_API(uint64_t)
-+extern attribute_visible LZMA_API(uint64_t)
- lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc)
- {
- 	crc = ~crc;
-
---- xz-5.0.7/src/liblzma/check/crc_macros.h	2014-09-20 17:48:05.000000000 +0100
-+++ check/crc_macros.h	2011-03-30 14:00:45.000000000 +0100
-@@ -11,6 +11,8 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- #ifdef WORDS_BIGENDIAN
-+#	include "bswap.h"
-+
- #	define A(x) ((x) >> 24)
- #	define B(x) (((x) >> 16) & 0xFF)
- #	define C(x) (((x) >> 8) & 0xFF)
diff -Nru r-base-3.2.3/src/extra/xz/simple/arm.c r-base-3.3.1/src/extra/xz/simple/arm.c
--- r-base-3.2.3/src/extra/xz/simple/arm.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/arm.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       arm.c
-/// \brief      Filter for ARM binaries
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-static size_t
-arm_code(lzma_simple *simple lzma_attribute((__unused__)),
-		uint32_t now_pos, bool is_encoder,
-		uint8_t *buffer, size_t size)
-{
-	size_t i;
-	for (i = 0; i + 4 <= size; i += 4) {
-		if (buffer[i + 3] == 0xEB) {
-			uint32_t src = (buffer[i + 2] << 16)
-					| (buffer[i + 1] << 8)
-					| (buffer[i + 0]);
-			src <<= 2;
-
-			uint32_t dest;
-			if (is_encoder)
-				dest = now_pos + (uint32_t)(i) + 8 + src;
-			else
-				dest = src - (now_pos + (uint32_t)(i) + 8);
-
-			dest >>= 2;
-			buffer[i + 2] = (dest >> 16);
-			buffer[i + 1] = (dest >> 8);
-			buffer[i + 0] = dest;
-		}
-	}
-
-	return i;
-}
-
-
-static lzma_ret
-arm_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters, bool is_encoder)
-{
-	return lzma_simple_coder_init(next, allocator, filters,
-			&arm_code, 0, 4, 4, is_encoder);
-}
-
-
-extern lzma_ret
-lzma_simple_arm_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	return arm_coder_init(next, allocator, filters, true);
-}
-
-
-extern lzma_ret
-lzma_simple_arm_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	return arm_coder_init(next, allocator, filters, false);
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/armthumb.c r-base-3.3.1/src/extra/xz/simple/armthumb.c
--- r-base-3.2.3/src/extra/xz/simple/armthumb.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/armthumb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       armthumb.c
-/// \brief      Filter for ARM-Thumb binaries
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-static size_t
-armthumb_code(lzma_simple *simple lzma_attribute((__unused__)),
-		uint32_t now_pos, bool is_encoder,
-		uint8_t *buffer, size_t size)
-{
-	size_t i;
-	for (i = 0; i + 4 <= size; i += 2) {
-		if ((buffer[i + 1] & 0xF8) == 0xF0
-				&& (buffer[i + 3] & 0xF8) == 0xF8) {
-			uint32_t src = ((buffer[i + 1] & 0x7) << 19)
-					| (buffer[i + 0] << 11)
-					| ((buffer[i + 3] & 0x7) << 8)
-					| (buffer[i + 2]);
-
-			src <<= 1;
-
-			uint32_t dest;
-			if (is_encoder)
-				dest = now_pos + (uint32_t)(i) + 4 + src;
-			else
-				dest = src - (now_pos + (uint32_t)(i) + 4);
-
-			dest >>= 1;
-			buffer[i + 1] = 0xF0 | ((dest >> 19) & 0x7);
-			buffer[i + 0] = (dest >> 11);
-			buffer[i + 3] = 0xF8 | ((dest >> 8) & 0x7);
-			buffer[i + 2] = (dest);
-			i += 2;
-		}
-	}
-
-	return i;
-}
-
-
-static lzma_ret
-armthumb_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters, bool is_encoder)
-{
-	return lzma_simple_coder_init(next, allocator, filters,
-			&armthumb_code, 0, 4, 2, is_encoder);
-}
-
-
-extern lzma_ret
-lzma_simple_armthumb_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return armthumb_coder_init(next, allocator, filters, true);
-}
-
-
-extern lzma_ret
-lzma_simple_armthumb_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return armthumb_coder_init(next, allocator, filters, false);
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/ia64.c r-base-3.3.1/src/extra/xz/simple/ia64.c
--- r-base-3.2.3/src/extra/xz/simple/ia64.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/ia64.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       ia64.c
-/// \brief      Filter for IA64 (Itanium) binaries
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-static size_t
-ia64_code(lzma_simple *simple lzma_attribute((__unused__)),
-		uint32_t now_pos, bool is_encoder,
-		uint8_t *buffer, size_t size)
-{
-	static const uint32_t BRANCH_TABLE[32] = {
-		0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0,
-		4, 4, 6, 6, 0, 0, 7, 7,
-		4, 4, 0, 0, 4, 4, 0, 0
-	};
-
-	size_t i;
-	for (i = 0; i + 16 <= size; i += 16) {
-		const uint32_t instr_template = buffer[i] & 0x1F;
-		const uint32_t mask = BRANCH_TABLE[instr_template];
-		uint32_t bit_pos = 5;
-
-		for (size_t slot = 0; slot < 3; ++slot, bit_pos += 41) {
-			if (((mask >> slot) & 1) == 0)
-				continue;
-
-			const size_t byte_pos = (bit_pos >> 3);
-			const uint32_t bit_res = bit_pos & 0x7;
-			uint64_t instruction = 0;
-
-			for (size_t j = 0; j < 6; ++j)
-				instruction += (uint64_t)(
-						buffer[i + j + byte_pos])
-						<< (8 * j);
-
-			uint64_t inst_norm = instruction >> bit_res;
-
-			if (((inst_norm >> 37) & 0xF) == 0x5
-					&& ((inst_norm >> 9) & 0x7) == 0
-					/* &&  (inst_norm & 0x3F)== 0 */
-					) {
-				uint32_t src = (uint32_t)(
-						(inst_norm >> 13) & 0xFFFFF);
-				src |= ((inst_norm >> 36) & 1) << 20;
-
-				src <<= 4;
-
-				uint32_t dest;
-				if (is_encoder)
-					dest = now_pos + (uint32_t)(i) + src;
-				else
-					dest = src - (now_pos + (uint32_t)(i));
-
-				dest >>= 4;
-
-				inst_norm &= ~((uint64_t)(0x8FFFFF) << 13);
-				inst_norm |= (uint64_t)(dest & 0xFFFFF) << 13;
-				inst_norm |= (uint64_t)(dest & 0x100000)
-						<< (36 - 20);
-
-				instruction &= (1 << bit_res) - 1;
-				instruction |= (inst_norm << bit_res);
-
-				for (size_t j = 0; j < 6; j++)
-					buffer[i + j + byte_pos] = (uint8_t)(
-							instruction
-							>> (8 * j));
-			}
-		}
-	}
-
-	return i;
-}
-
-
-static lzma_ret
-ia64_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters, bool is_encoder)
-{
-	return lzma_simple_coder_init(next, allocator, filters,
-			&ia64_code, 0, 16, 16, is_encoder);
-}
-
-
-extern lzma_ret
-lzma_simple_ia64_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return ia64_coder_init(next, allocator, filters, true);
-}
-
-
-extern lzma_ret
-lzma_simple_ia64_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return ia64_coder_init(next, allocator, filters, false);
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/powerpc.c r-base-3.3.1/src/extra/xz/simple/powerpc.c
--- r-base-3.2.3/src/extra/xz/simple/powerpc.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/powerpc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       powerpc.c
-/// \brief      Filter for PowerPC (big endian) binaries
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-static size_t
-powerpc_code(lzma_simple *simple lzma_attribute((__unused__)),
-		uint32_t now_pos, bool is_encoder,
-		uint8_t *buffer, size_t size)
-{
-	size_t i;
-	for (i = 0; i + 4 <= size; i += 4) {
-		// PowerPC branch 6(48) 24(Offset) 1(Abs) 1(Link)
-		if ((buffer[i] >> 2) == 0x12
-				&& ((buffer[i + 3] & 3) == 1)) {
-
-			const uint32_t src = ((buffer[i + 0] & 3) << 24)
-					| (buffer[i + 1] << 16)
-					| (buffer[i + 2] << 8)
-					| (buffer[i + 3] & (~3));
-
-			uint32_t dest;
-			if (is_encoder)
-				dest = now_pos + (uint32_t)(i) + src;
-			else
-				dest = src - (now_pos + (uint32_t)(i));
-
-			buffer[i + 0] = 0x48 | ((dest >> 24) &  0x03);
-			buffer[i + 1] = (dest >> 16);
-			buffer[i + 2] = (dest >> 8);
-			buffer[i + 3] &= 0x03;
-			buffer[i + 3] |= dest;
-		}
-	}
-
-	return i;
-}
-
-
-static lzma_ret
-powerpc_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters, bool is_encoder)
-{
-	return lzma_simple_coder_init(next, allocator, filters,
-			&powerpc_code, 0, 4, 4, is_encoder);
-}
-
-
-extern lzma_ret
-lzma_simple_powerpc_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return powerpc_coder_init(next, allocator, filters, true);
-}
-
-
-extern lzma_ret
-lzma_simple_powerpc_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return powerpc_coder_init(next, allocator, filters, false);
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_coder.c r-base-3.3.1/src/extra/xz/simple/simple_coder.c
--- r-base-3.2.3/src/extra/xz/simple/simple_coder.c	2012-07-27 22:05:01.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_coder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,277 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_coder.c
-/// \brief      Wrapper for simple filters
-///
-/// Simple filters don't change the size of the data i.e. number of bytes
-/// in equals the number of bytes out.
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-/// Copied or encodes/decodes more data to out[].
-static lzma_ret
-copy_or_code(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	assert(!coder->end_was_reached);
-
-	if (coder->next.code == NULL) {
-		lzma_bufcpy(in, in_pos, in_size, out, out_pos, out_size);
-
-		// Check if end of stream was reached.
-		if (coder->is_encoder && action == LZMA_FINISH
-				&& *in_pos == in_size)
-			coder->end_was_reached = true;
-
-	} else {
-		// Call the next coder in the chain to provide us some data.
-		const lzma_ret ret = coder->next.code(
-				coder->next.coder, allocator,
-				in, in_pos, in_size,
-				out, out_pos, out_size, action);
-
-		if (ret == LZMA_STREAM_END) {
-			assert(!coder->is_encoder
-					|| action == LZMA_FINISH);
-			coder->end_was_reached = true;
-
-		} else if (ret != LZMA_OK) {
-			return ret;
-		}
-	}
-
-	return LZMA_OK;
-}
-
-
-static size_t
-call_filter(lzma_coder *coder, uint8_t *buffer, size_t size)
-{
-	const size_t filtered = coder->filter(coder->simple,
-			coder->now_pos, coder->is_encoder,
-			buffer, size);
-	coder->now_pos += filtered;
-	return filtered;
-}
-
-
-static lzma_ret
-simple_code(lzma_coder *coder, lzma_allocator *allocator,
-		const uint8_t *restrict in, size_t *restrict in_pos,
-		size_t in_size, uint8_t *restrict out,
-		size_t *restrict out_pos, size_t out_size, lzma_action action)
-{
-	// TODO: Add partial support for LZMA_SYNC_FLUSH. We can support it
-	// in cases when the filter is able to filter everything. With most
-	// simple filters it can be done at offset that is a multiple of 2,
-	// 4, or 16. With x86 filter, it needs good luck, and thus cannot
-	// be made to work predictably.
-	if (action == LZMA_SYNC_FLUSH)
-		return LZMA_OPTIONS_ERROR;
-
-	// Flush already filtered data from coder->buffer[] to out[].
-	if (coder->pos < coder->filtered) {
-		lzma_bufcpy(coder->buffer, &coder->pos, coder->filtered,
-				out, out_pos, out_size);
-
-		// If we couldn't flush all the filtered data, return to
-		// application immediately.
-		if (coder->pos < coder->filtered)
-			return LZMA_OK;
-
-		if (coder->end_was_reached) {
-			assert(coder->filtered == coder->size);
-			return LZMA_STREAM_END;
-		}
-	}
-
-	// If we get here, there is no filtered data left in the buffer.
-	coder->filtered = 0;
-
-	assert(!coder->end_was_reached);
-
-	// If there is more output space left than there is unfiltered data
-	// in coder->buffer[], flush coder->buffer[] to out[], and copy/code
-	// more data to out[] hopefully filling it completely. Then filter
-	// the data in out[]. This step is where most of the data gets
-	// filtered if the buffer sizes used by the application are reasonable.
-	const size_t out_avail = out_size - *out_pos;
-	const size_t buf_avail = coder->size - coder->pos;
-	if (out_avail > buf_avail || buf_avail == 0) {
-		// Store the old position so that we know from which byte
-		// to start filtering.
-		const size_t out_start = *out_pos;
-
-		// Flush data from coder->buffer[] to out[], but don't reset
-		// coder->pos and coder->size yet. This way the coder can be
-		// restarted if the next filter in the chain returns e.g.
-		// LZMA_MEM_ERROR.
-		memcpy(out + *out_pos, coder->buffer + coder->pos, buf_avail);
-		*out_pos += buf_avail;
-
-		// Copy/Encode/Decode more data to out[].
-		{
-			const lzma_ret ret = copy_or_code(coder, allocator,
-					in, in_pos, in_size,
-					out, out_pos, out_size, action);
-			assert(ret != LZMA_STREAM_END);
-			if (ret != LZMA_OK)
-				return ret;
-		}
-
-		// Filter out[].
-		const size_t size = *out_pos - out_start;
-		const size_t filtered = call_filter(
-				coder, out + out_start, size);
-
-		const size_t unfiltered = size - filtered;
-		assert(unfiltered <= coder->allocated / 2);
-
-		// Now we can update coder->pos and coder->size, because
-		// the next coder in the chain (if any) was successful.
-		coder->pos = 0;
-		coder->size = unfiltered;
-
-		if (coder->end_was_reached) {
-			// The last byte has been copied to out[] already.
-			// They are left as is.
-			coder->size = 0;
-
-		} else if (unfiltered > 0) {
-			// There is unfiltered data left in out[]. Copy it to
-			// coder->buffer[] and rewind *out_pos appropriately.
-			*out_pos -= unfiltered;
-			memcpy(coder->buffer, out + *out_pos, unfiltered);
-		}
-	} else if (coder->pos > 0) {
-		memmove(coder->buffer, coder->buffer + coder->pos, buf_avail);
-		coder->size -= coder->pos;
-		coder->pos = 0;
-	}
-
-	assert(coder->pos == 0);
-
-	// If coder->buffer[] isn't empty, try to fill it by copying/decoding
-	// more data. Then filter coder->buffer[] and copy the successfully
-	// filtered data to out[]. It is probable, that some filtered and
-	// unfiltered data will be left to coder->buffer[].
-	if (coder->size > 0) {
-		{
-			const lzma_ret ret = copy_or_code(coder, allocator,
-					in, in_pos, in_size,
-					coder->buffer, &coder->size,
-					coder->allocated, action);
-			assert(ret != LZMA_STREAM_END);
-			if (ret != LZMA_OK)
-				return ret;
-		}
-
-		coder->filtered = call_filter(
-				coder, coder->buffer, coder->size);
-
-		// Everything is considered to be filtered if coder->buffer[]
-		// contains the last bytes of the data.
-		if (coder->end_was_reached)
-			coder->filtered = coder->size;
-
-		// Flush as much as possible.
-		lzma_bufcpy(coder->buffer, &coder->pos, coder->filtered,
-				out, out_pos, out_size);
-	}
-
-	// Check if we got everything done.
-	if (coder->end_was_reached && coder->pos == coder->size)
-		return LZMA_STREAM_END;
-
-	return LZMA_OK;
-}
-
-
-static void
-simple_coder_end(lzma_coder *coder, lzma_allocator *allocator)
-{
-	lzma_next_end(&coder->next, allocator);
-	lzma_free(coder->simple, allocator);
-	lzma_free(coder, allocator);
-	return;
-}
-
-
-static lzma_ret
-simple_coder_update(lzma_coder *coder, lzma_allocator *allocator,
-		const lzma_filter *filters_null lzma_attribute((__unused__)),
-		const lzma_filter *reversed_filters)
-{
-	// No update support, just call the next filter in the chain.
-	return lzma_next_filter_update(
-			&coder->next, allocator, reversed_filters + 1);
-}
-
-
-extern lzma_ret
-lzma_simple_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters,
-		size_t (*filter)(lzma_simple *simple, uint32_t now_pos,
-			bool is_encoder, uint8_t *buffer, size_t size),
-		size_t simple_size, size_t unfiltered_max,
-		uint32_t alignment, bool is_encoder)
-{
-	// Allocate memory for the lzma_coder structure if needed.
-	if (next->coder == NULL) {
-		// Here we allocate space also for the temporary buffer. We
-		// need twice the size of unfiltered_max, because then it
-		// is always possible to filter at least unfiltered_max bytes
-		// more data in coder->buffer[] if it can be filled completely.
-		next->coder = lzma_alloc(sizeof(lzma_coder)
-				+ 2 * unfiltered_max, allocator);
-		if (next->coder == NULL)
-			return LZMA_MEM_ERROR;
-
-		next->code = &simple_code;
-		next->end = &simple_coder_end;
-		next->update = &simple_coder_update;
-
-		next->coder->next = LZMA_NEXT_CODER_INIT;
-		next->coder->filter = filter;
-		next->coder->allocated = 2 * unfiltered_max;
-
-		// Allocate memory for filter-specific data structure.
-		if (simple_size > 0) {
-			next->coder->simple = lzma_alloc(
-					simple_size, allocator);
-			if (next->coder->simple == NULL)
-				return LZMA_MEM_ERROR;
-		} else {
-			next->coder->simple = NULL;
-		}
-	}
-
-	if (filters[0].options != NULL) {
-		const lzma_options_bcj *simple = filters[0].options;
-		next->coder->now_pos = simple->start_offset;
-		if (next->coder->now_pos & (alignment - 1))
-			return LZMA_OPTIONS_ERROR;
-	} else {
-		next->coder->now_pos = 0;
-	}
-
-	// Reset variables.
-	next->coder->is_encoder = is_encoder;
-	next->coder->end_was_reached = false;
-	next->coder->pos = 0;
-	next->coder->filtered = 0;
-	next->coder->size = 0;
-
-	return lzma_next_filter_init(
-			&next->coder->next, allocator, filters + 1);
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_coder.h r-base-3.3.1/src/extra/xz/simple/simple_coder.h
--- r-base-3.2.3/src/extra/xz/simple/simple_coder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_coder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_coder.h
-/// \brief      Wrapper for simple filters
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_SIMPLE_CODER_H
-#define LZMA_SIMPLE_CODER_H
-
-#include "common.h"
-
-
-extern lzma_ret lzma_simple_x86_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_simple_x86_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-
-extern lzma_ret lzma_simple_powerpc_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_simple_powerpc_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-
-extern lzma_ret lzma_simple_ia64_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_simple_ia64_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-
-extern lzma_ret lzma_simple_arm_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_simple_arm_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-
-extern lzma_ret lzma_simple_armthumb_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_simple_armthumb_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-
-extern lzma_ret lzma_simple_sparc_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-extern lzma_ret lzma_simple_sparc_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_decoder.c r-base-3.3.1/src/extra/xz/simple/simple_decoder.c
--- r-base-3.2.3/src/extra/xz/simple/simple_decoder.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_decoder.c
-/// \brief      Properties decoder for simple filters
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_decoder.h"
-
-
-extern lzma_ret
-lzma_simple_props_decode(void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size)
-{
-	if (props_size == 0)
-		return LZMA_OK;
-
-	if (props_size != 4)
-		return LZMA_OPTIONS_ERROR;
-
-	lzma_options_bcj *opt = lzma_alloc(
-			sizeof(lzma_options_bcj), allocator);
-	if (opt == NULL)
-		return LZMA_MEM_ERROR;
-
-	opt->start_offset = unaligned_read32le(props);
-
-	// Don't leave an options structure allocated if start_offset is zero.
-	if (opt->start_offset == 0)
-		lzma_free(opt, allocator);
-	else
-		*options = opt;
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_decoder.h r-base-3.3.1/src/extra/xz/simple/simple_decoder.h
--- r-base-3.2.3/src/extra/xz/simple/simple_decoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_decoder.h
-/// \brief      Properties decoder for simple filters
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_SIMPLE_DECODER_H
-#define LZMA_SIMPLE_DECODER_H
-
-#include "simple_coder.h"
-
-extern lzma_ret lzma_simple_props_decode(
-		void **options, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_encoder.c r-base-3.3.1/src/extra/xz/simple/simple_encoder.c
--- r-base-3.2.3/src/extra/xz/simple/simple_encoder.c	2010-11-08 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_encoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_encoder.c
-/// \brief      Properties encoder for simple filters
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_encoder.h"
-
-
-extern lzma_ret
-lzma_simple_props_size(uint32_t *size, const void *options)
-{
-	const lzma_options_bcj *const opt = options;
-	*size = (opt == NULL || opt->start_offset == 0) ? 0 : 4;
-	return LZMA_OK;
-}
-
-
-extern lzma_ret
-lzma_simple_props_encode(const void *options, uint8_t *out)
-{
-	const lzma_options_bcj *const opt = options;
-
-	// The default start offset is zero, so we don't need to store any
-	// options unless the start offset is non-zero.
-	if (opt == NULL || opt->start_offset == 0)
-		return LZMA_OK;
-
-	unaligned_write32le(out, opt->start_offset);
-
-	return LZMA_OK;
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_encoder.h r-base-3.3.1/src/extra/xz/simple/simple_encoder.h
--- r-base-3.2.3/src/extra/xz/simple/simple_encoder.h	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_encoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_encoder.c
-/// \brief      Properties encoder for simple filters
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_SIMPLE_ENCODER_H
-#define LZMA_SIMPLE_ENCODER_H
-
-#include "simple_coder.h"
-
-
-extern lzma_ret lzma_simple_props_size(uint32_t *size, const void *options);
-
-extern lzma_ret lzma_simple_props_encode(const void *options, uint8_t *out);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/simple/simple_private.h r-base-3.3.1/src/extra/xz/simple/simple_private.h
--- r-base-3.2.3/src/extra/xz/simple/simple_private.h	2012-07-27 22:05:01.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/simple_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       simple_private.h
-/// \brief      Private definitions for so called simple filters
-//
-//  Author:     Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef LZMA_SIMPLE_PRIVATE_H
-#define LZMA_SIMPLE_PRIVATE_H
-
-#include "simple_coder.h"
-
-
-typedef struct lzma_simple_s lzma_simple;
-
-struct lzma_coder_s {
-	/// Next filter in the chain
-	lzma_next_coder next;
-
-	/// True if the next coder in the chain has returned LZMA_STREAM_END.
-	bool end_was_reached;
-
-	/// True if filter() should encode the data; false to decode.
-	/// Currently all simple filters use the same function for encoding
-	/// and decoding, because the difference between encoders and decoders
-	/// is very small.
-	bool is_encoder;
-
-	/// Pointer to filter-specific function, which does
-	/// the actual filtering.
-	size_t (*filter)(lzma_simple *simple, uint32_t now_pos,
-			bool is_encoder, uint8_t *buffer, size_t size);
-
-	/// Pointer to filter-specific data, or NULL if filter doesn't need
-	/// any extra data.
-	lzma_simple *simple;
-
-	/// The lowest 32 bits of the current position in the data. Most
-	/// filters need this to do conversions between absolute and relative
-	/// addresses.
-	uint32_t now_pos;
-
-	/// Size of the memory allocated for the buffer.
-	size_t allocated;
-
-	/// Flushing position in the temporary buffer. buffer[pos] is the
-	/// next byte to be copied to out[].
-	size_t pos;
-
-	/// buffer[filtered] is the first unfiltered byte. When pos is smaller
-	/// than filtered, there is unflushed filtered data in the buffer.
-	size_t filtered;
-
-	/// Total number of bytes (both filtered and unfiltered) currently
-	/// in the temporary buffer.
-	size_t size;
-
-	/// Temporary buffer
-	uint8_t buffer[];
-};
-
-
-extern lzma_ret lzma_simple_coder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters,
-		size_t (*filter)(lzma_simple *simple, uint32_t now_pos,
-			bool is_encoder, uint8_t *buffer, size_t size),
-		size_t simple_size, size_t unfiltered_max,
-		uint32_t alignment, bool is_encoder);
-
-#endif
diff -Nru r-base-3.2.3/src/extra/xz/simple/sparc.c r-base-3.3.1/src/extra/xz/simple/sparc.c
--- r-base-3.2.3/src/extra/xz/simple/sparc.c	2011-05-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/sparc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       sparc.c
-/// \brief      Filter for SPARC binaries
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-static size_t
-sparc_code(lzma_simple *simple lzma_attribute((__unused__)),
-		uint32_t now_pos, bool is_encoder,
-		uint8_t *buffer, size_t size)
-{
-	size_t i;
-	for (i = 0; i + 4 <= size; i += 4) {
-
-		if ((buffer[i] == 0x40 && (buffer[i + 1] & 0xC0) == 0x00)
-				|| (buffer[i] == 0x7F
-				&& (buffer[i + 1] & 0xC0) == 0xC0)) {
-
-			uint32_t src = ((uint32_t)buffer[i + 0] << 24)
-					| ((uint32_t)buffer[i + 1] << 16)
-					| ((uint32_t)buffer[i + 2] << 8)
-					| ((uint32_t)buffer[i + 3]);
-
-			src <<= 2;
-
-			uint32_t dest;
-			if (is_encoder)
-				dest = now_pos + (uint32_t)(i) + src;
-			else
-				dest = src - (now_pos + (uint32_t)(i));
-
-			dest >>= 2;
-
-			dest = (((0 - ((dest >> 22) & 1)) << 22) & 0x3FFFFFFF)
-					| (dest & 0x3FFFFF)
-					| 0x40000000;
-
-			buffer[i + 0] = (uint8_t)(dest >> 24);
-			buffer[i + 1] = (uint8_t)(dest >> 16);
-			buffer[i + 2] = (uint8_t)(dest >> 8);
-			buffer[i + 3] = (uint8_t)(dest);
-		}
-	}
-
-	return i;
-}
-
-
-static lzma_ret
-sparc_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters, bool is_encoder)
-{
-	return lzma_simple_coder_init(next, allocator, filters,
-			&sparc_code, 0, 4, 4, is_encoder);
-}
-
-
-extern lzma_ret
-lzma_simple_sparc_encoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return sparc_coder_init(next, allocator, filters, true);
-}
-
-
-extern lzma_ret
-lzma_simple_sparc_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_filter_info *filters)
-{
-	return sparc_coder_init(next, allocator, filters, false);
-}
diff -Nru r-base-3.2.3/src/extra/xz/simple/x86.c r-base-3.3.1/src/extra/xz/simple/x86.c
--- r-base-3.2.3/src/extra/xz/simple/x86.c	2010-03-17 14:43:06.000000000 +0000
+++ r-base-3.3.1/src/extra/xz/simple/x86.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file       x86.c
-/// \brief      Filter for x86 binaries (BCJ filter)
-///
-//  Authors:    Igor Pavlov
-//              Lasse Collin
-//
-//  This file has been put into the public domain.
-//  You can do whatever you want with this file.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "simple_private.h"
-
-
-#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)
-
-
-struct lzma_simple_s {
-	uint32_t prev_mask;
-	uint32_t prev_pos;
-};
-
-
-static size_t
-x86_code(lzma_simple *simple, uint32_t now_pos, bool is_encoder,
-		uint8_t *buffer, size_t size)
-{
-	static const bool MASK_TO_ALLOWED_STATUS[8]
-		= { true, true, true, false, true, false, false, false };
-
-	static const uint32_t MASK_TO_BIT_NUMBER[8]
-			= { 0, 1, 2, 2, 3, 3, 3, 3 };
-
-	uint32_t prev_mask = simple->prev_mask;
-	uint32_t prev_pos = simple->prev_pos;
-
-	if (size < 5)
-		return 0;
-
-	if (now_pos - prev_pos > 5)
-		prev_pos = now_pos - 5;
-
-	const size_t limit = size - 5;
-	size_t buffer_pos = 0;
-
-	while (buffer_pos <= limit) {
-		uint8_t b = buffer[buffer_pos];
-		if (b != 0xE8 && b != 0xE9) {
-			++buffer_pos;
-			continue;
-		}
-
-		const uint32_t offset = now_pos + (uint32_t)(buffer_pos)
-				- prev_pos;
-		prev_pos = now_pos + (uint32_t)(buffer_pos);
-
-		if (offset > 5) {
-			prev_mask = 0;
-		} else {
-			for (uint32_t i = 0; i < offset; ++i) {
-				prev_mask &= 0x77;
-				prev_mask <<= 1;
-			}
-		}
-
-		b = buffer[buffer_pos + 4];
-
-		if (Test86MSByte(b)
-			&& MASK_TO_ALLOWED_STATUS[(prev_mask >> 1) & 0x7]
-				&& (prev_mask >> 1) < 0x10) {
-
-			uint32_t src = ((uint32_t)(b) << 24)
-				| ((uint32_t)(buffer[buffer_pos + 3]) << 16)
-				| ((uint32_t)(buffer[buffer_pos + 2]) << 8)
-				| (buffer[buffer_pos + 1]);
-
-			uint32_t dest;
-			while (true) {
-				if (is_encoder)
-					dest = src + (now_pos + (uint32_t)(
-							buffer_pos) + 5);
-				else
-					dest = src - (now_pos + (uint32_t)(
-							buffer_pos) + 5);
-
-				if (prev_mask == 0)
-					break;
-
-				const uint32_t i = MASK_TO_BIT_NUMBER[
-						prev_mask >> 1];
-
-				b = (uint8_t)(dest >> (24 - i * 8));
-
-				if (!Test86MSByte(b))
-					break;
-
-				src = dest ^ ((1 << (32 - i * 8)) - 1);
-			}
-
-			buffer[buffer_pos + 4]
-					= (uint8_t)(~(((dest >> 24) & 1) - 1));
-			buffer[buffer_pos + 3] = (uint8_t)(dest >> 16);
-			buffer[buffer_pos + 2] = (uint8_t)(dest >> 8);
-			buffer[buffer_pos + 1] = (uint8_t)(dest);
-			buffer_pos += 5;
-			prev_mask = 0;
-
-		} else {
-			++buffer_pos;
-			prev_mask |= 1;
-			if (Test86MSByte(b))
-				prev_mask |= 0x10;
-		}
-	}
-
-	simple->prev_mask = prev_mask;
-	simple->prev_pos = prev_pos;
-
-	return buffer_pos;
-}
-
-
-static lzma_ret
-x86_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters, bool is_encoder)
-{
-	const lzma_ret ret = lzma_simple_coder_init(next, allocator, filters,
-			&x86_code, sizeof(lzma_simple), 5, 1, is_encoder);
-
-	if (ret == LZMA_OK) {
-		next->coder->simple->prev_mask = 0;
-		next->coder->simple->prev_pos = (uint32_t)(-5);
-	}
-
-	return ret;
-}
-
-
-extern lzma_ret
-lzma_simple_x86_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	return x86_coder_init(next, allocator, filters, true);
-}
-
-
-extern lzma_ret
-lzma_simple_x86_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
-		const lzma_filter_info *filters)
-{
-	return x86_coder_init(next, allocator, filters, false);
-}
diff -Nru r-base-3.2.3/src/extra/zlib/adler32.c r-base-3.3.1/src/extra/zlib/adler32.c
--- r-base-3.2.3/src/extra/zlib/adler32.c	2012-02-05 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/adler32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-#define local static
-
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
-#define BASE 65521      /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware --
-   try it both ways to see which is faster */
-#ifdef NO_DIVIDE
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-   (thank you to John Reiser for pointing this out) */
-#  define CHOP(a) \
-    do { \
-        unsigned long tmp = a >> 16; \
-        a &= 0xffffUL; \
-        a += (tmp << 4) - tmp; \
-    } while (0)
-#  define MOD28(a) \
-    do { \
-        CHOP(a); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD(a) \
-    do { \
-        CHOP(a); \
-        MOD28(a); \
-    } while (0)
-#  define MOD63(a) \
-    do { /* this assumes a is not negative */ \
-        z_off64_t tmp = a >> 32; \
-        a &= 0xffffffffL; \
-        a += (tmp << 8) - (tmp << 5) + tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD28(a) a %= BASE
-#  define MOD63(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD28(sum2);            /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffffUL;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    MOD63(len2);                /* assumes len2 >= 0 */
-    rem = (unsigned)len2;
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
-
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
diff -Nru r-base-3.2.3/src/extra/zlib/compress.c r-base-3.3.1/src/extra/zlib/compress.c
--- r-base-3.2.3/src/extra/zlib/compress.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = deflateEnd(&stream);
-    return err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-     If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
-}
diff -Nru r-base-3.2.3/src/extra/zlib/crc32.c r-base-3.3.1/src/extra/zlib/crc32.c
--- r-base-3.2.3/src/extra/zlib/crc32.c	2012-05-16 22:05:01.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/crc32.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,425 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
-
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
- */
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-#define local static
-
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
-
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
-                (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const z_crc_t FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-#ifdef BYFOUR
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    buf4--;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf4++;
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
-
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
diff -Nru r-base-3.2.3/src/extra/zlib/crc32.h r-base-3.3.1/src/extra/zlib/crc32.h
--- r-base-3.2.3/src/extra/zlib/crc32.h	2012-05-16 22:05:01.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/crc32.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const z_crc_t FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};
diff -Nru r-base-3.2.3/src/extra/zlib/deflate.c r-base-3.3.1/src/extra/zlib/deflate.c
--- r-base-3.2.3/src/extra/zlib/deflate.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/deflate.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1967 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->high_water = 0;      /* nothing written to s->window yet */
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt str, n;
-    int wrap;
-    unsigned avail;
-    z_const unsigned char *next;
-
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    wrap = s->wrap;
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-        return Z_STREAM_ERROR;
-
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-    if (wrap == 1)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
-
-    /* if dictionary would fill window, just replace the history */
-    if (dictLength >= s->w_size) {
-        if (wrap == 0) {            /* already empty otherwise */
-            CLEAR_HASH(s);
-            s->strstart = 0;
-            s->block_start = 0L;
-            s->insert = 0;
-        }
-        dictionary += dictLength - s->w_size;  /* use the tail */
-        dictLength = s->w_size;
-    }
-
-    /* insert dictionary into window and hash */
-    avail = strm->avail_in;
-    next = strm->next_in;
-    strm->avail_in = dictLength;
-    strm->next_in = (z_const Bytef *)dictionary;
-    fill_window(s);
-    while (s->lookahead >= MIN_MATCH) {
-        str = s->strstart;
-        n = s->lookahead - (MIN_MATCH-1);
-        do {
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-            s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-            s->head[s->ins_h] = (Pos)str;
-            str++;
-        } while (--n);
-        s->strstart = str;
-        s->lookahead = MIN_MATCH-1;
-        fill_window(s);
-    }
-    s->strstart += s->lookahead;
-    s->block_start = (long)s->strstart;
-    s->insert = s->lookahead;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    strm->next_in = next;
-    strm->avail_in = avail;
-    s->wrap = wrap;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    int ret;
-
-    ret = deflateResetKeep(strm);
-    if (ret == Z_OK)
-        lm_init(strm->state);
-    return ret;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (pending != Z_NULL)
-        *pending = strm->state->pending;
-    if (bits != Z_NULL)
-        *bits = strm->state->bi_valid;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    deflate_state *s;
-    int put;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-        return Z_BUF_ERROR;
-    do {
-        put = Buf_size - s->bi_valid;
-        if (put > bits)
-            put = bits;
-        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
-        s->bi_valid += put;
-        _tr_flush_bits(s);
-        value >>= put;
-        bits -= put;
-    } while (bits);
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        strm->total_in != 0) {
-        /* Flush the last buffer: */
-        err = deflate(strm, Z_BLOCK);
-        if (err == Z_BUF_ERROR && s->pending == 0)
-            err = Z_OK;
-    }
-    if (s->level != level) {
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return err;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = good_length;
-    s->max_lazy_match = max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong complen, wraplen;
-    Bytef *str;
-
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return complen + 6;
-
-    /* compute wrapper length */
-    s = strm->state;
-    switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = 6 + (s->strstart ? 4 : 0);
-        break;
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            if (s->gzhead->extra != Z_NULL)
-                wraplen += 2 + s->gzhead->extra_len;
-            str = s->gzhead->name;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            str = s->gzhead->comment;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-    default:                                /* for compiler happiness */
-        wraplen = 6;
-    }
-
-    /* if not default parameters, return conservative bound */
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
-
-    /* default settings: return tight bound for that case */
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13 - 6 + wraplen;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len;
-    deflate_state *s = strm->state;
-
-    _tr_flush_bits(s);
-    len = s->pending;
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, s->pending_out, len);
-    strm->next_out  += len;
-    s->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out  -= len;
-    s->pending -= len;
-    if (s->pending == 0) {
-        s->pending_out = s->pending_buf;
-    }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_BLOCK || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-#ifdef GZIP
-        if (s->wrap == 2) {
-            strm->adler = crc32(0L, Z_NULL, 0);
-            put_byte(s, 31);
-            put_byte(s, 139);
-            put_byte(s, 8);
-            if (s->gzhead == Z_NULL) {
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, OS_CODE);
-                s->status = BUSY_STATE;
-            }
-            else {
-                put_byte(s, (s->gzhead->text ? 1 : 0) +
-                            (s->gzhead->hcrc ? 2 : 0) +
-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                            (s->gzhead->name == Z_NULL ? 0 : 8) +
-                            (s->gzhead->comment == Z_NULL ? 0 : 16)
-                        );
-                put_byte(s, (Byte)(s->gzhead->time & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != Z_NULL) {
-                    put_byte(s, s->gzhead->extra_len & 0xff);
-                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-                }
-                if (s->gzhead->hcrc)
-                    strm->adler = crc32(strm->adler, s->pending_buf,
-                                        s->pending);
-                s->gzindex = 0;
-                s->status = EXTRA_STATE;
-            }
-        }
-        else
-#endif
-        {
-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-            uInt level_flags;
-
-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-                level_flags = 0;
-            else if (s->level < 6)
-                level_flags = 1;
-            else if (s->level == 6)
-                level_flags = 2;
-            else
-                level_flags = 3;
-            header |= (level_flags << 6);
-            if (s->strstart != 0) header |= PRESET_DICT;
-            header += 31 - (header % 31);
-
-            s->status = BUSY_STATE;
-            putShortMSB(s, header);
-
-            /* Save the adler32 of the preset dictionary: */
-            if (s->strstart != 0) {
-                putShortMSB(s, (uInt)(strm->adler >> 16));
-                putShortMSB(s, (uInt)(strm->adler & 0xffff));
-            }
-            strm->adler = adler32(0L, Z_NULL, 0);
-        }
-    }
-#ifdef GZIP
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-
-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size)
-                        break;
-                }
-                put_byte(s, s->gzhead->extra[s->gzindex]);
-                s->gzindex++;
-            }
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (s->gzindex == s->gzhead->extra_len) {
-                s->gzindex = 0;
-                s->status = NAME_STATE;
-            }
-        }
-        else
-            s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0) {
-                s->gzindex = 0;
-                s->status = COMMENT_STATE;
-            }
-        }
-        else
-            s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0)
-                s->status = HCRC_STATE;
-        }
-        else
-            s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size)
-                flush_pending(strm);
-            if (s->pending + 2 <= s->pending_buf_size) {
-                put_byte(s, (Byte)(strm->adler & 0xff));
-                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-                strm->adler = crc32(0L, Z_NULL, 0);
-                s->status = BUSY_STATE;
-            }
-        }
-        else
-            s->status = BUSY_STATE;
-    }
-#endif
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                        (*(configuration_table[s->level].func))(s, flush));
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                    if (s->lookahead == 0) {
-                        s->strstart = 0;
-                        s->block_start = 0L;
-                        s->insert = 0;
-                    }
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    zmemcpy(buf, strm->next_in, len);
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, buf, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, buf, len);
-    }
-#endif
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-
-#else /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for FASTEST only
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#endif /* FASTEST */
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    register unsigned n, m;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            n = s->hash_size;
-            p = &s->head[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-            } while (--n);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-                /* If n is not on any hash chain, prev[n] is garbage but
-                 * its value will never be used.
-                 */
-            } while (--n);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, last) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (last)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
-   FLUSH_BLOCK_ONLY(s, last); \
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-                   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-        Assert(s->block_start >= 0L, "block gone");
-
-        s->strstart += s->lookahead;
-        s->lookahead = 0;
-
-        /* Emit a stored block if pending_buf will be full: */
-        max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-            /* strstart == 0 is possible when wraparound on 16-bit machine */
-            s->lookahead = (uInt)(s->strstart - max_start);
-            s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-        }
-        /* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-        }
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if ((long)s->strstart > s->block_start)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;       /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;          /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-#endif /* FASTEST */
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-    uInt prev;              /* byte at distance one to match */
-    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest run, plus one for the unrolled loop.
-         */
-        if (s->lookahead <= MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        s->match_length = 0;
-        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
-            scan = s->window + s->strstart - 1;
-            prev = *scan;
-            if (prev == *++scan && prev == *++scan && prev == *++scan) {
-                strend = s->window + s->strstart + MAX_MATCH;
-                do {
-                } while (prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         scan < strend);
-                s->match_length = MAX_MATCH - (int)(strend - scan);
-                if (s->match_length > s->lookahead)
-                    s->match_length = s->lookahead;
-            }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, s->match_length);
-
-            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-            s->strstart += s->match_length;
-            s->match_length = 0;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we have a literal to write. */
-        if (s->lookahead == 0) {
-            fill_window(s);
-            if (s->lookahead == 0) {
-                if (flush == Z_NO_FLUSH)
-                    return need_more;
-                break;      /* flush the current block */
-            }
-        }
-
-        /* Output a literal byte */
-        s->match_length = 0;
-        Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
-        s->lookahead--;
-        s->strstart++;
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
diff -Nru r-base-3.2.3/src/extra/zlib/deflate.h r-base-3.3.1/src/extra/zlib/deflate.h
--- r-base-3.2.3/src/extra/zlib/deflate.h	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/deflate.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef DEFLATE_H
-#define DEFLATE_H
-
-#include "zutil.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define Buf_size 16
-/* size of bit buffer in bi_buf */
-
-#define INIT_STATE    42
-#define EXTRA_STATE   69
-#define NAME_STATE    73
-#define COMMENT_STATE 91
-#define HCRC_STATE   103
-#define BUSY_STATE   113
-#define FINISH_STATE 666
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
-    gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* can only be DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to suppress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    uInt insert;        /* bytes at end of window left to insert */
-
-#ifdef DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-    ulg high_water;
-    /* High water mark offset in window for initialized bytes -- bytes above
-     * this are set to zero in order to avoid memory check warnings when
-     * longest match routines access bytes past the input.  This is then
-     * updated to the new high water mark.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-#define WIN_INIT MAX_MATCH
-/* Number of bytes after end of data in window to initialize in order to avoid
-   memory checker errors from longest match routines */
-
-        /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch ZLIB_INTERNAL _length_code[];
-  extern uch ZLIB_INTERNAL _dist_code[];
-#else
-  extern const uch ZLIB_INTERNAL _length_code[];
-  extern const uch ZLIB_INTERNAL _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length)
-#endif
-
-#endif /* DEFLATE_H */
diff -Nru r-base-3.2.3/src/extra/zlib/infback.c r-base-3.3.1/src/extra/zlib/infback.c
--- r-base-3.2.3/src/extra/zlib/infback.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/infback.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,640 +0,0 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
-   This code is largely copied from inflate.c.  Normally either infback.o or
-   inflate.o would be linked into an application--not both.  The interface
-   with inffast.c is retained so that optimized assembler-coded versions of
-   inflate_fast() can be used with either inflate.c or infback.c.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   windowBits is in the range 8..15, and window is a user-supplied
-   window and output buffer that is 2**windowBits bytes.
- */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL ||
-        windowBits < 8 || windowBits > 15)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-    strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->dmax = 32768U;
-    state->wbits = windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->wnext = 0;
-    state->whave = 0;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-/* Macros for inflateBack(): */
-
-/* Load returned state from inflate_fast() */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Set state from registers for inflate_fast() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = state->window; \
-            left = state->wsize; \
-            state->whave = left; \
-            if (out(out_desc, put, left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    state->mode = TYPE;
-    state->last = 0;
-    state->whave = 0;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = state->window;
-    left = state->wsize;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (state->mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (state->length != 0) {
-                copy = state->length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                if (state->whave < state->wsize)
-                    state->whave = state->wsize - left;
-                inflate_fast(strm, state->wsize);
-                LOAD();
-                break;
-            }
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            state->length = (unsigned)here.val;
-
-            /* process literal */
-            if (here.op == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(state->length);
-                left--;
-                state->mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-
-            /* get distance code */
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-
-            /* get distance extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            if (state->offset > state->wsize - (state->whave < state->wsize ?
-                                                left : 0)) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = state->wsize - state->offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - state->offset;
-                    copy = left;
-                }
-                if (copy > state->length) copy = state->length;
-                state->length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (state->length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
diff -Nru r-base-3.2.3/src/extra/zlib/inffast.c r-base-3.3.1/src/extra/zlib/inffast.c
--- r-base-3.2.3/src/extra/zlib/inffast.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inffast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
-#else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void ZLIB_INTERNAL inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *in;      /* local strm->next_in */
-    z_const unsigned char FAR *last;    /* have enough input while in < last */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    wnext = state->wnext;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-        }
-        here = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(here.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(here.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            PUP(out) = (unsigned char)(here.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-            }
-            here = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(here.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(here.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(PUP(in)) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        if (state->sane) {
-                            strm->msg =
-                                (char *)"invalid distance too far back";
-                            state->mode = BAD;
-                            break;
-                        }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        if (len <= op - whave) {
-                            do {
-                                PUP(out) = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            PUP(out) = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--len);
-                            continue;
-                        }
-#endif
-                    }
-                    from = window - OFF;
-                    if (wnext == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (wnext < op) {      /* wrap around window */
-                        from += wsize + wnext - op;
-                        op -= wnext;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = window - OFF;
-                            if (wnext < len) {  /* some from start of window */
-                                op = wnext;
-                                len -= op;
-                                do {
-                                    PUP(out) = PUP(from);
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += wnext - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    }
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in + OFF;
-    strm->next_out = out + OFF;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and wnext == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
diff -Nru r-base-3.2.3/src/extra/zlib/inffast.h r-base-3.3.1/src/extra/zlib/inffast.h
--- r-base-3.2.3/src/extra/zlib/inffast.h	2011-10-02 22:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inffast.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff -Nru r-base-3.2.3/src/extra/zlib/inffixed.h r-base-3.3.1/src/extra/zlib/inffixed.h
--- r-base-3.2.3/src/extra/zlib/inffixed.h	2012-02-05 23:05:04.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inffixed.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
-
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };
diff -Nru r-base-3.2.3/src/extra/zlib/inflate.c r-base-3.3.1/src/extra/zlib/inflate.c
--- r-base-3.2.3/src/extra/zlib/inflate.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inflate.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1512 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common wnext == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    if (state->wrap)        /* to support ill-conceived Java test suite */
-        strm->adler = state->wrap & 1;
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    state->sane = 1;
-    state->back = -1;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
-    return inflateResetKeep(strm);
-}
-
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
-    int wrap;
-    struct inflate_state FAR *state;
-
-    /* get the state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
-        if (windowBits < 48)
-            windowBits &= 15;
-#endif
-    }
-
-    /* set number of window bits, free window if different */
-    if (windowBits && (windowBits < 8 || windowBits > 15))
-        return Z_STREAM_ERROR;
-    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
-        ZFREE(strm, state->window);
-        state->window = Z_NULL;
-    }
-
-    /* update state and reset the rest of it */
-    state->wrap = wrap;
-    state->wbits = (unsigned)windowBits;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    int ret;
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->window = Z_NULL;
-    ret = inflateReset2(strm, windowBits);
-    if (ret != Z_OK) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-    }
-    return ret;
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits < 0) {
-        state->hold = 0;
-        state->bits = 0;
-        return Z_OK;
-    }
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-               state.lencode[low].bits, state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, end, copy)
-z_streamp strm;
-const Bytef *end;
-unsigned copy;
-{
-    struct inflate_state FAR *state;
-    unsigned dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->wnext = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, end - state->wsize, state->wsize);
-        state->wnext = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->wnext;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, end - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, end - copy, copy);
-            state->wnext = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->wnext += dist;
-            if (state->wnext == state->wsize) state->wnext = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            else if (len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if (state->flags & 0x0200) CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if (state->flags & 0x0200)
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if (hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
-                }
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES) goto inf_leave;
-        case COPY_:
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES) goto inf_leave;
-        case LEN_:
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
-                break;
-            }
-            state->back = 0;
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = (unsigned)here.val;
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                state->mode = LIT;
-                break;
-            }
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
-                state->mode = TYPE;
-                break;
-            }
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
-                    if (copy > state->length) copy = state->length;
-                    if (copy > left) copy = left;
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0) state->mode = LEN;
-                    break;
-#endif
-                }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->wnext - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if (out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     ZSWAP32(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-            (state->mode < CHECK || flush != Z_FINISH)))
-        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if (state->wrap && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) +
-                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-Bytef *dictionary;
-uInt *dictLength;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* copy dictionary */
-    if (state->whave && dictionary != Z_NULL) {
-        zmemcpy(dictionary, state->window + state->wnext,
-                state->whave - state->wnext);
-        zmemcpy(dictionary + state->whave - state->wnext,
-                state->window, state->wnext);
-    }
-    if (dictLength != Z_NULL)
-        *dictLength = state->whave;
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long dictid;
-    int ret;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary identifier */
-    if (state->mode == DICT) {
-        dictid = adler32(0L, Z_NULL, 0);
-        dictid = adler32(dictid, dictionary, dictLength);
-        if (dictid != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window using updatewindow(), which will amend the
-       existing dictionary if appropriate */
-    ret = updatewindow(strm, dictionary + dictLength, dictLength);
-    if (ret) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-const unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
-
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->sane = !subvert;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    return Z_OK;
-#else
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
-    state = (struct inflate_state FAR *)strm->state;
-    return ((long)(state->back) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
diff -Nru r-base-3.2.3/src/extra/zlib/inflate.h r-base-3.3.1/src/extra/zlib/inflate.h
--- r-base-3.2.3/src/extra/zlib/inflate.h	2011-10-02 22:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inflate.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip decoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-    HEAD,       /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */
-    TIME,       /* i: waiting for modification time (gzip) */
-    OS,         /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN,      /* i: waiting for extra length (gzip) */
-    EXTRA,      /* i: waiting for extra bytes (gzip) */
-    NAME,       /* i: waiting for end of file name (gzip) */
-    COMMENT,    /* i: waiting for end of comment (gzip) */
-    HCRC,       /* i: waiting for header crc (gzip) */
-    DICTID,     /* i: waiting for dictionary check value */
-    DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY_,      /* i/o: same as COPY below, but only first time in */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN_,       /* i: same as LEN below, but only first time in */
-            LEN,        /* i: waiting for length/lit/eob code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
-    CHECK,      /* i: waiting for 32-bit check value */
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD,        /* got a data error -- remain here until reset */
-    MEM,        /* got an inflate() memory error -- remain here until reset */
-    SYNC        /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to BAD or MEM on error -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib) or (raw)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-                  HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-        (raw) -> TYPEDO
-    Read deflate blocks:
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-            STORED -> COPY_ -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN_
-            LEN_ -> LEN
-    Read deflate codes in fixed or dynamic block:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* state maintained between inflate() calls.  Approximately 10K bytes. */
-struct inflate_state {
-    inflate_mode mode;          /* current inflate mode */
-    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
-    gz_headerp head;            /* where to save gzip header information */
-        /* sliding window */
-    unsigned wbits;             /* log base 2 of requested window size */
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* bit accumulator */
-    unsigned long hold;         /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
-    unsigned length;            /* literal or length of data to copy */
-    unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
-    unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-    int sane;                   /* if false, allow invalid distance too far */
-    int back;                   /* bits back of last unprocessed length/lit */
-    unsigned was;               /* initial length of match */
-};
diff -Nru r-base-3.2.3/src/extra/zlib/inftrees.c r-base-3.3.1/src/extra/zlib/inftrees.c
--- r-base-3.2.3/src/extra/zlib/inftrees.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inftrees.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,306 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
-   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code here;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) {                     /* no symbols to code at all */
-        here.op = (unsigned char)64;    /* invalid code marker */
-        here.bits = (unsigned char)1;
-        here.val = (unsigned short)0;
-        *(*table)++ = here;             /* make a table to force an error */
-        *(*table)++ = here;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min < max; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftrees.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used > ENOUGH_LENS) ||
-        (type == DISTS && used > ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        here.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
-            here.op = (unsigned char)(extra[work[sym]]);
-            here.val = base[work[sym]];
-        }
-        else {
-            here.op = (unsigned char)(32 + 64);         /* end of block */
-            here.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = here;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used > ENOUGH_LENS) ||
-                (type == DISTS && used > ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /* fill in remaining table entry if code is incomplete (guaranteed to have
-       at most one remaining entry, since if the code is incomplete, the
-       maximum code length that was allowed to get this far is one bit) */
-    if (huff != 0) {
-        here.op = (unsigned char)64;            /* invalid code marker */
-        here.bits = (unsigned char)(len - drop);
-        here.val = (unsigned short)0;
-        next[huff] = here;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}
diff -Nru r-base-3.2.3/src/extra/zlib/inftrees.h r-base-3.3.1/src/extra/zlib/inftrees.h
--- r-base-3.2.3/src/extra/zlib/inftrees.h	2011-10-02 22:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/inftrees.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is
-   changed, then these maximum sizes would be need to be recalculated and
-   updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 592
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
diff -Nru r-base-3.2.3/src/extra/zlib/Makefile.in r-base-3.3.1/src/extra/zlib/Makefile.in
--- r-base-3.2.3/src/extra/zlib/Makefile.in	2013-09-26 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#
-# ${R_HOME}/src/extra/zlib/Makefile
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-top_builddir = ../../..
-subdir = src/extra/zlib
-R_HOME = $(top_builddir)
-
-include $(top_builddir)/Makeconf
-
-ZLIB_CPPFLAGS = -I$(srcdir) @USE_MMAP_ZLIB_TRUE@ -DUSE_MMAP
-ALL_CPPFLAGS = $(ZLIB_CPPFLAGS) $(R_XTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS)
-## need to be PIC for use in grDevices
-ALL_CFLAGS = $(R_XTRA_CFLAGS) $(R_OPENMP_CFLAGS) $(MAIN_CFLAGS) $(CFLAGS) $(CPICFLAGS)
-
-SOURCES = adler32.c compress.c crc32.c deflate.c infback.c \
-  inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c
-HEADERS = crc32.h deflate.h inffast.h inffixed.h inflate.h inftrees.h \
-  trees.h zconf.h zlib.h zutil.h
-DEPENDS = $(SOURCES:.c=.d)
-OBJECTS = $(SOURCES:.c=.o)
-@WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) @C_VISIBILITY@
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-DISTFILES = R_changes README Makefile.in Makefile.win Rzlib.def \
-  $(SOURCES) $(HEADERS)
-noinst_LIBRARIES = @BUILD_ZLIB_TRUE@ libz.a
-libz_a_SOURCES = $(SOURCES)
-libz_a_OBJECTS = $(OBJECTS)
-
-
-all: R
-
-Makefile: $(srcdir)/Makefile.in \
-  $(top_builddir)/config.status \
-  $(SOURCES)
-	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-Makedeps: Makefile $(DEPENDS)
-	@cat $(DEPENDS) >> Makefile
-	@touch $@
-
-R: Makedeps
-	@$(MAKE) $(noinst_LIBRARIES)
-
-libz.a: $(libz_a_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(libz_a_OBJECTS)
-	$(RANLIB) $@
-
-
-mostlyclean: clean
-clean:
-	@-rm -f Makedeps *.d *.o *.lo *.a
-distclean: clean
-	@-rm -f Makefile
-maintainer-clean: distclean
-
-install install-strip uninstall TAGS info dvi check:
-
-distdir: $(DISTFILES)
-	@for f in $(DISTFILES); do \
-	  test -f $(distdir)/$${f} \
-	    || ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
-	    || cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
-	done
-
-## Automagically generated dependencies:
-
diff -Nru r-base-3.2.3/src/extra/zlib/Makefile.win r-base-3.3.1/src/extra/zlib/Makefile.win
--- r-base-3.2.3/src/extra/zlib/Makefile.win	2015-03-18 23:02:06.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/Makefile.win	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#-*- Makefile -*-
-include ../../gnuwin32/MkRules
-
-all: makeMakedeps DLL implib headers
-
-SOURCES = adler32.c compress.c crc32.c deflate.c infback.c \
-  inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c
-OBJECTS = $(SOURCES:.c=.o)
-
-CPPFLAGS = -I../../include -DHAVE_CONFIG_H
-
-# libz.a: $(OBJECTS)
-
-DLL: Rzlib.dll
-	@cp Rzlib.dll ../../../$(BINDIR)
-
-Rzlib.dll: $(OBJECTS) Rzlib.def
-	$(DLL) -shared $(DLLFLAGS) -o $@ Rzlib.def $(OBJECTS)
-
-ifdef USE_IMPLIBS
-implib: libRzlib.dll.a
-	@$(MKDIR) -p ../../../lib
-	@$(CP) libRzlib.dll.a ../../../lib
-else
-implib:
-endif
-
-libRzlib.dll.a: Rzlib.def
-
-headers:
-	@$(CP) -p zlib.h zconf.h ../../../include
-
-clean:
-	@$(RM) *.o *~ *.d Makedeps
-distclean: clean
-	@$(RM) libz.a Rzlib.dll libRzlib.dll.a
-
-# Dependencies
-DEPS = $(SOURCES:.c=.d)
-
-makeMakedeps: $(DEPS)
-	@$(RM) Makedeps
-	@cat $(DEPS) >> Makedeps
-
--include Makedeps
diff -Nru r-base-3.2.3/src/extra/zlib/R_changes r-base-3.3.1/src/extra/zlib/R_changes
--- r-base-3.2.3/src/extra/zlib/R_changes	2011-10-02 22:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/R_changes	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-There are a very few to the source code of zlib-1.2.5 used here.
-
-zconf.h includes R's config.h
-
-Makefile.in is ours, not zlib's, and allows us to use PIC flags so this
-can be included in libR.so.
-
-As from R 2.12.2, on a Unix-alike we remap all the symbols (not just
-those remapped by defining Z_PREFIX) to avoid conflict with system
-versions of zlib (notably 1.2.5) linked into packages' *.so.  The
-known problems are with libxml2 and libggobi, both of which are linked
-to libz.  This is not needed on Windows where the DLL is named
-Rzlib.dll and symbols are imported from a named DLL.  But Rzlib.def is
-used to confine exports to symbols marked ZEXPORT in zlib.h.
-
-From 2.13.0, Z_PREFIX is defined in zconf.h, except on Windows.
-
-Visibility does not work on all platforms in gcc >= 3.3.
-
-diff -u /Users/ripley/Sources/zlib-1.2.5/zconf.h ./zconf.h
---- /Users/ripley/Sources/zlib-1.2.5/zconf.h	2010-04-18 18:58:06.000000000 +0100
-+++ ./zconf.h	2011-04-19 18:49:24.000000000 +0100
-@@ -8,127 +8,84 @@
- #ifndef ZCONF_H
- #define ZCONF_H
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+/* R change */
-+#ifndef WIN32
-+#define Z_PREFIX
-+#endif
-
-plus lots of changes to the defines.
-
-diff -u /Users/ripley/Sources/zlib-1.2.5/zlib.h ./zlib.h
---- /Users/ripley/Sources/zlib-1.2.5/zlib.h	2010-04-20 05:12:48.000000000 +0100
-+++ ./zlib.h	2011-04-19 22:18:56.000000000 +0100
-@@ -1576,8 +1576,15 @@
- #  define gzseek gzseek64
- #  define gztell gztell64
- #  define gzoffset gzoffset64
-+#  undef adler32_combine
-+#  undef crc32_combine
-+# ifdef Z_PREFIX
-+#  define adler32_combine Rz_adler32_combine64
-+#  define crc32_combine Rz_crc32_combine64
-+# else
- #  define adler32_combine adler32_combine64
- #  define crc32_combine crc32_combine64
-+# endif
- #  ifdef _LARGEFILE64_SOURCE
-      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-
-diff -u /Users/ripley/Sources/zlib-1.2.5/zutil.h ./zutil.h
---- /Users/ripley/Sources/zlib-1.2.5/zutil.h	2010-04-18 20:29:24.000000000 +0100
-+++ ./zutil.h	2011-04-19 19:41:57.000000000 +0100
-@@ -13,6 +13,10 @@
- #ifndef ZUTIL_H
- #define ZUTIL_H
- 
-+#ifdef WIN32
-+# define NO_VIZ
-+#endif
-+
- #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
- #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
- #else
diff -Nru r-base-3.2.3/src/extra/zlib/README r-base-3.3.1/src/extra/zlib/README
--- r-base-3.2.3/src/extra/zlib/README	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.8 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
-rfc1952 (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
-of the library is given in the file test/example.c which also tests that
-the library is working correctly.  Another example is given in the file
-test/minigzip.c.  The compression library itself is composed of all source
-files in the root directory.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile.in.  In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix.  For Windows, use
-one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
-make_vms.com.
-
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-<info@winimage.com> for the Windows DLL version.  The zlib home page is
-http://zlib.net/ .  Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
-
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
-issue of Dr.  Dobb's Journal; a copy of the article is available at
-http://marknelson.us/1997/01/01/zlib-engine/ .
-
-The changes made in version 1.2.8 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory contrib/ .
-
-zlib is available in Java using the java.util.zip package, documented at
-http://java.sun.com/developer/technicalArticles/Programming/compression/ .
-
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
-at CPAN (Comprehensive Perl Archive Network) sites, including
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
-
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-available in Python 1.5 and later versions, see
-http://docs.python.org/library/zlib.html .
-
-zlib is built into tcl: http://wiki.tcl.tk/4610 .
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant <info@winimage.com>, is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-  compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-  when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-  necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-  other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS or BEOS.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz.  The deflate and
-  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
-  people who reported problems and suggested various improvements in zlib; they
-  are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.
diff -Nru r-base-3.2.3/src/extra/zlib/Rzlib.def r-base-3.3.1/src/extra/zlib/Rzlib.def
--- r-base-3.2.3/src/extra/zlib/Rzlib.def	2011-10-02 22:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/Rzlib.def	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-EXPORTS
- adler32
- adler32_combine
- adler32_combine64
- compress
- compress2
- compressBound
- crc32
- crc32_combine
- crc32_combine64
- deflate
- deflateBound
- deflateCopy
- deflateEnd
- deflateInit2_
- deflateInit_
- deflateParams
- deflatePrime
- deflateReset
- deflateSetDictionary
- deflateSetHeader
- deflateTune
- get_crc_table   
- inflate
- inflateBack
- inflateBackEnd
- inflateBackInit_
- inflateCopy
- inflateEnd
- inflateGetHeader
- inflateInit2_
- inflateInit_
- inflateMark
- inflatePrime
- inflateReset
- inflateReset2
- inflateSetDictionary
- inflateSync
- uncompress
- zError         
- zlibCompileFlags
- zlibVersion
diff -Nru r-base-3.2.3/src/extra/zlib/trees.c r-base-3.3.1/src/extra/zlib/trees.c
--- r-base-3.2.3/src/extra/zlib/trees.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/trees.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1226 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (ush)(value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* DEBUG */
-
-
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-#ifdef NO_INIT_GLOBAL_POINTERS
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-#endif
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-            "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header,
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-        fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Trace((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-                                s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
-#ifdef DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-#endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
-}
-
-/* ===========================================================================
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
- */
-void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
-{
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-        /* Check if the file is binary or text */
-        if (s->strm->data_type == Z_UNKNOWN)
-            s->strm->data_type = detect_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
-
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, last);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
-        compress_block(s, (const ct_data *)static_ltree,
-                       (const ct_data *)static_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (const ct_data *)s->dyn_ltree,
-                       (const ct_data *)s->dyn_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (last) {
-        bi_windup(s);
-#ifdef DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(s)
-    deflate_state *s;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
diff -Nru r-base-3.2.3/src/extra/zlib/trees.h r-base-3.3.1/src/extra/zlib/trees.h
--- r-base-3.2.3/src/extra/zlib/trees.h	2011-10-02 22:02:10.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/trees.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
diff -Nru r-base-3.2.3/src/extra/zlib/uncompr.c r-base-3.3.1/src/extra/zlib/uncompr.c
--- r-base-3.2.3/src/extra/zlib/uncompr.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/uncompr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-            return Z_DATA_ERROR;
-        return err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
diff -Nru r-base-3.2.3/src/extra/zlib/zconf.h r-base-3.3.1/src/extra/zlib/zconf.h
--- r-base-3.2.3/src/extra/zlib/zconf.h	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/zconf.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,447 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* R change */
-#ifndef WIN32
-#define Z_PREFIX
-#endif
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          Rz_deflateInit_
-#  define deflate               Rz_deflate
-#  define deflateEnd            Rz_deflateEnd
-#  define inflateInit_          Rz_inflateInit_
-#  define inflate               Rz_inflate
-#  define inflateEnd            Rz_inflateEnd
-#  define deflateInit2_         Rz_deflateInit2_
-#  define deflateSetDictionary  Rz_deflateSetDictionary
-#  define deflateCopy           Rz_deflateCopy
-#  define deflateReset          Rz_deflateReset
-#  define deflateParams         Rz_deflateParams
-#  define deflateBound          Rz_deflateBound
-#  define deflatePrime          Rz_deflatePrime
-#  define inflateInit2_         Rz_inflateInit2_
-#  define inflateSetDictionary  Rz_inflateSetDictionary
-#  define inflateSync           Rz_inflateSync
-#  define inflateSyncPoint      Rz_inflateSyncPoint
-#  define inflateCopy           Rz_inflateCopy
-#  define inflateReset          Rz_inflateReset
-#  define inflateBack           Rz_inflateBack
-#  define inflateBackEnd        Rz_inflateBackEnd
-#  define compress              Rz_compress
-#  define compress2             Rz_compress2
-#  define compressBound         Rz_compressBound
-#  define uncompress            Rz_uncompress
-#  define adler32               Rz_adler32
-#  define crc32                 Rz_crc32
-#  define get_crc_table         Rz_get_crc_table
-#  define zError                Rz_zError
-
-#  define alloc_func            Rz_alloc_func
-#  define free_func             Rz_free_func
-#  define in_func               Rz_in_func
-#  define out_func              Rz_out_func
-
-# define adler32_combine       	Rz_adler32_combine
-# define adler32_combine64      Rz_adler32_combine64
-# define crc32_combine		Rz_crc32_combine
-# define crc32_combine64	Rz_crc32_combine64
-# define deflateSetHeader      	Rz_deflateSetHeader
-# define deflateTune		Rz_deflateTune
-# define inflateBackInit_      	Rz_inflateBackInit_
-# define inflate_fast		Rz_inflate_fast
-# define inflateGetHeader      	Rz_inflateGetHeader
-# define inflatePrime		Rz_inflatePrime
-# define inflate_table		Rz_inflate_table
-# define inflateMark		Rz_inflateMark
-# define inflateReset2		Rz_inflateReset2
-# define inflateUndermine	Rz_inflateUndermine
-# define _tr_align		Rz__tr_align
-# define _tr_flush_block       	Rz__tr_flush_block
-# define _tr_init		Rz__tr_init
-# define _tr_stored_block      	Rz__tr_stored_block
-# define _tr_tally		Rz__tr_tally
-# define zcalloc		Rz_zcalloc
-# define zcfree			Rz_zcfree
-# define zlibCompileFlags      	Rz_zlibCompileFlags
-# define zlibVersion		Rz_zlibVersion
-# define _dist_code		Rz_dist_code
-# define _length_code		Rz_length_code
-# define z_errmsg		Rz_errmsg
-# define deflate_copyright	Rz_deflate_copyright 
-# define inflate_copyright	Rz_inflate_copyright 
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-/* ./configure may #define Z_U4 here */
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  include <stddef.h>           /* for wchar_t */
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff -Nru r-base-3.2.3/src/extra/zlib/zlib.h r-base-3.3.1/src/extra/zlib/zlib.h
--- r-base-3.2.3/src/extra/zlib/zlib.h	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/zlib.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1771 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
-
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip streams in memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above or -1 << 16 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
-
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-/* R change */
-#    undef  adler32_combine
-#    define adler32_combine Rz_adler32_combine64
-#    undef  crc32_combine
-#    define crc32_combine Rz_crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff -Nru r-base-3.2.3/src/extra/zlib/zutil.c r-base-3.3.1/src/extra/zlib/zutil.c
--- r-base-3.2.3/src/extra/zlib/zutil.c	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/zutil.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,325 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-#ifndef Z_SOLO
-/* R change */
-//#  include "gzguts.h"
-#endif
-
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
-z_const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch ((int)(sizeof(uInt))) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch ((int)(sizeof(uLong))) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch ((int)(sizeof(voidpf))) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch ((int)(sizeof(z_off_t))) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifdef NO_vsnprintf
-    flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#else
-    flags += 1L << 24;
-#  ifdef NO_snprintf
-    flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int ZLIB_INTERNAL z_verbose = verbose;
-
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-#ifndef Z_SOLO
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */
diff -Nru r-base-3.2.3/src/extra/zlib/zutil.h r-base-3.3.1/src/extra/zlib/zutil.h
--- r-base-3.2.3/src/extra/zlib/zutil.h	2013-06-05 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/extra/zlib/zutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#ifdef HAVE_HIDDEN
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include "zlib.h"
-
-#if defined(STDC) && !defined(Z_SOLO)
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  ifndef Z_SOLO
-#    if defined(__TURBOC__) || defined(__BORLANDC__)
-#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-         /* Allow compilation with ANSI keywords only enabled */
-         void _Cdecl farfree( void *block );
-         void *_Cdecl farmalloc( unsigned long nbytes );
-#      else
-#        include <alloc.h>
-#      endif
-#    else /* MSC or DJGPP */
-#      include <malloc.h>
-#    endif
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#  if defined(M_I86) && !defined(Z_SOLO)
-#    include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#ifdef WIN32
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
-#    define OS_CODE  0x0b
-#  endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
-#if defined(__BORLANDC__) && !defined(MSDOS)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && \
-    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-#ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
-#endif
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-/* Reverse the bytes in a 32-bit value */
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-#endif /* ZUTIL_H */
diff -Nru r-base-3.2.3/src/gnuwin32/console.c r-base-3.3.1/src/gnuwin32/console.c
--- r-base-3.2.3/src/gnuwin32/console.c	2015-08-25 22:19:05.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/console.c	2016-02-06 23:15:09.000000000 +0000
@@ -3,7 +3,7 @@
  *  file console.c
  *  Copyright (C) 1998--2003  Guido Masarotto and Brian Ripley
  *  Copyright (C) 2004-8      The R Foundation
- *  Copyright (C) 2004-2014   The R Core Team
+ *  Copyright (C) 2004-2016   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -342,7 +342,7 @@
 	p->lbuf = NULL;
 	p->kbuf = NULL;
     }
-    p->bm = NULL;
+    BM = NULL;
     p->rows = rows;
     p->cols = cols;
     for (int i=0; i<numGuiColors; i++)
@@ -353,10 +353,10 @@
     WIDTH = (COLS + 1) * FW;
     HEIGHT = (ROWS + 1) * FH + 1; /* +1 avoids size problems in MDI */
     FV = FC = 0;
-    p->newfv = p->newfc = 0;
+    NEWFV = NEWFC = 0;
     p->firstkey = p->numkeys = 0;
     p->clp = NULL;
-    p->r = -1;
+    CURROW = -1;
     p->overwrite = 0;
     p->needredraw = 0;
     p->wipe_completion = 0;
@@ -427,7 +427,7 @@
 
     /* This is right, since columns are of fixed size */
     r = rect(BORDERX + fch * FW, BORDERY + j * FH, (lch - fch + 1) * FW, FH);
-    gfillrect(p->bm, bgr, r);
+    gfillrect(BM, bgr, r);
 
     if (len > FC+fch) {
 	/* Some of the string is visible: */
@@ -461,7 +461,7 @@
 	    if((len > FC+COLS) && (lch == COLS - 1)) *q++ = L'$';
 	    else *q++ = *P++;
 	    *q = L'\0';
-	    gdrawwcs(p->bm, p->f, fgr, pt(r.x, r.y), buff);
+	    gdrawwcs(BM, p->f, fgr, pt(r.x, r.y), buff);
 	} else {
 	    int last;
 	    wchar_t ch, chf, chl;
@@ -472,7 +472,7 @@
 	    } else chl = L'\0';
 	    last = FC + lch + 1;
 	    if (len > last) {ch = s[last]; s[last] = L'\0';} else ch = L'\0';
-	    gdrawwcs(p->bm, p->f, fgr, pt(r.x, r.y), &s[FC+fch]);
+	    gdrawwcs(BM, p->f, fgr, pt(r.x, r.y), &s[FC+fch]);
 	    /* restore the string */
 	    if (ch) s[last] = ch;
 	    if (chl) s[FC+lch] = chl;
@@ -549,7 +549,7 @@
     } else
 	WLHELPER(0, col1, fg, bg);
     /* This is the cursor, and it may need to be variable-width */
-    if ((p->r >= 0) && (CURCOL >= FC) && (CURCOL < FC + COLS) &&
+    if ((CURROW >= 0) && (CURCOL >= FC) && (CURCOL < FC + COLS) &&
 	(i == NUMLINES - 1) && (p->sel == 0 || !intersect_input(p, 0))) {
 	if (!p->overwrite) {
 	    if (p->cursor_blink) {
@@ -560,7 +560,7 @@
 	    
 	    if (p->cursor_blink < 2) {
 	    	r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH, FW/4, FH);
-	    	gfillrect(p->bm, highlight, r);
+	    	gfillrect(BM, highlight, r);
 	    }
 	} else if(mbcslocale) { /* determine the width of the current char */
 	    int w0;
@@ -581,8 +581,8 @@
 	    if (p->cursor_blink < 2) {
 	    	r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
 		         w0 * FW, FH);
-	    	gfillrect(p->bm, highlight, r);
-	    	gdrawwcs(p->bm, p->f, bg, pt(r.x, r.y), nn);
+	    	gfillrect(BM, highlight, r);
+	    	gdrawwcs(BM, p->f, bg, pt(r.x, r.y), nn);
 	    }
 	} else {
 	    if (p->cursor_blink) {
@@ -906,7 +906,7 @@
 static void performCompletion(control c)
 {
     ConsoleData p = getdata(c);
-    int i, alen, alen2, max_show = 10, cursor_position = p->c - prompt_wid;
+    int i, alen, alen2, max_show = 10, cursor_position = CURCOL - prompt_wid;
     wchar_t *partial_line = LINE(NUMLINES - 1) + prompt_wid;
     const char *additional_text;
     SEXP cmdSexp, cmdexpr, ans = R_NilValue;
@@ -1059,9 +1059,9 @@
     storekey(c, '\n');
 /* if we are editing we save the actual line
    FIXME: not right if Unicode */
-    if (p->r > -1) {
+    if (CURROW > -1) {
 	char buf[2000], *cp; /* maximum 2 bytes/char */
-	wchar_t *wc = &(p->lbuf->s[p->lbuf->ns - 1][prompt_len]);
+	wchar_t *wc = &(LINE(NUMLINES - 1)[prompt_len]);
 	memset(buf, 0, 2000);
 	wcstombs(buf, wc, 1000);
 	for (cp = buf; *cp; cp++) storekey(c, *cp);
@@ -1531,7 +1531,7 @@
 	/* now zap it */
 	for(i = 0; i < len; i++) xbufaddxc(p->lbuf, L'\b');
 	if (incomplete) {
-	    p->lbuf->ns--;
+	    NUMLINES--;
 	    p->lbuf->free--;
 	    p->lbuf->av++;
 	}
@@ -1548,11 +1548,11 @@
     if (!p->lazyupdate) {
 	setfirstvisible(c, NUMLINES - ROWS);
 	REDRAW;
-    } else if (p->r >= 0)
+    } else if (CURROW >= 0)
 	setfirstvisible(c, NUMLINES - ROWS);
     else {
-	p->newfv = NUMLINES - ROWS;
-	if (p->newfv < 0) p->newfv = 0;
+	NEWFV = NUMLINES - ROWS;
+	if (NEWFV < 0) NEWFV = 0;
     }
     if(p->input) REDRAW;
     return 0;
@@ -1561,7 +1561,7 @@
 void freeConsoleData(ConsoleData p)
 {
     if (!p) return;
-    if (p->bm) del(p->bm);
+    if (BM) del(BM);
     if (p->kind == CONSOLE) {
 	if (p->lbuf) xbufdel(p->lbuf);
 	if (p->kbuf) free(p->kbuf);
@@ -1666,8 +1666,8 @@
     if (p->needredraw) {
 	REDRAW;
     } else {
-	WRITELINE(NUMLINES - 1, p->r);
-	RSHOW(RLINE(p->r));
+	WRITELINE(NUMLINES - 1, CURROW);
+	RSHOW(RLINE(CURROW));
     }
 }
 
@@ -1718,14 +1718,14 @@
     USER(NUMLINES - 1) = w0;
     prompt_wid = wcswidth(aLine);
     if (NUMLINES > ROWS) {
-	p->r = ROWS - 1;
-	p->newfv = NUMLINES - ROWS;
+	CURROW = ROWS - 1;
+	NEWFV = NUMLINES - ROWS;
     } else {
-	p->r = NUMLINES - 1;
-	p->newfv = 0;
+	CURROW = NUMLINES - 1;
+	NEWFV = 0;
     }
     CURCOL = prompt_wid;
-    p->fc = 0;
+    FC = 0;
     cur_pos = 0;
     max_pos = 0;
     cur_line = &aLine[prompt_len];
@@ -1743,11 +1743,11 @@
 	    cur_line = LINE(NUMLINES - 1) + prompt_len;
 	    ns0 = NUMLINES;
 	    if (NUMLINES > ROWS) {
-		p->r = ROWS - 1;
-		p->newfv = NUMLINES - ROWS;
+		CURROW = ROWS - 1;
+		NEWFV = NUMLINES - ROWS;
 	    } else {
-		p->r = NUMLINES - 1;
-		p->newfv = 0;
+		CURROW = NUMLINES - 1;
+		NEWFV = 0;
 	    }
 	    USER(NUMLINES - 1) = prompt_wid;
 	    p->needredraw = 1;
@@ -1842,7 +1842,7 @@
 		    wcstobuf(buf, len, cur_line);
 		    //sprintf(buf, "%ls", cur_line);
 		    //if(strlen(buf) == 0) strcpy(buf, "invalid input\n");
-		    p->r = -1;
+		    CURROW = -1;
 		    cur_line[max_pos] = L'\0';
 		    if (max_pos && addtohistory) wgl_histadd(cur_line);
 		    xbuffixl(p->lbuf);
@@ -1884,7 +1884,7 @@
 {
     ConsoleData p = getdata(c);
 
-    return p->cols;
+    return COLS;
 }
 
 void consoleresize(console c, rect r)
@@ -1911,6 +1911,8 @@
     HEIGHT = r.height;
     BORDERX = (WIDTH - COLS*FW) / 2;
     BORDERY = (HEIGHT - ROWS*FH) / 2;
+    NEWFV = NUMLINES - ROWS;
+    if (NEWFV < 0) NEWFV = 0;
     del(BM);
     BM = newbitmap(r.width, r.height, 2);
     if (!BM) {
@@ -1919,11 +1921,11 @@
     }
     if(!p->lbuf) return;;    /* don't implement resize if no content
 				   yet in pager */
-    if (p->r >= 0) {
+    if (CURROW >= 0) {
 	if (NUMLINES > ROWS) {
-	    p->r = ROWS - 1;
+	    CURROW = ROWS - 1;
 	} else
-	    p->r = NUMLINES - 1;
+	    CURROW = NUMLINES - 1;
     }
     clear(c);
     p->needredraw = 1;
@@ -2273,6 +2275,6 @@
     xbufshift(l);
     l->shift = oldshift;
     NEWFV = 0;
-    p->r = 0;
+    CURROW = 0;
     REDRAW;
 }
diff -Nru r-base-3.2.3/src/gnuwin32/COPYRIGHTS.win r-base-3.3.1/src/gnuwin32/COPYRIGHTS.win
--- r-base-3.2.3/src/gnuwin32/COPYRIGHTS.win	2014-06-26 22:15:03.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/COPYRIGHTS.win	2016-06-09 22:15:06.000000000 +0000
@@ -125,7 +125,7 @@
 contents.
 
 The build of Tcl/Tk contained in the binary installer is taken via
-Rtools from http://www.stats.ox.ac.uk/pub/Rtools/, which hosts the
+Rtools from https://www.stats.ox.ac.uk/pub/Rtools/, which hosts the
 sources used and links to the scripts used for the build.
 
 Rbitmap.dll is built against static libraries for libpng, jpeg and
@@ -136,7 +136,7 @@
 
 A binay build may contain compiled sources from cairographics,
 distributed under LGPL 2.1 (our choice) or MPL 1.1.  The binary
-distribution used is that at http://www.rforge.net/Cairo/files/ .
+distribution used is that at https://www.rforge.net/Cairo/files/ .
 
 A binary build may contain compiled components from ICU, whose license
 can be viewed at
diff -Nru r-base-3.2.3/src/gnuwin32/cran/index.in r-base-3.3.1/src/gnuwin32/cran/index.in
--- r-base-3.2.3/src/gnuwin32/cran/index.in	2015-08-16 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/cran/index.in	2016-03-16 23:04:30.000000000 +0000
@@ -49,7 +49,7 @@
 <h2>Frequently asked questions</h2>
 
 <ul>
-  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">How do I install R when using Windows Vista?</a></li>
+  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">Does R run under my version of Windows?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#What_0027s-the-best-way-to-upgrade_003f">How do I update packages in my previous version of R?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#Should-I-run-32_002dbit-or-64_002dbit-R_003f">Should I run 32-bit or 64-bit R?</a></li>
 </ul>
diff -Nru r-base-3.2.3/src/gnuwin32/cran/rdevel.in r-base-3.3.1/src/gnuwin32/cran/rdevel.in
--- r-base-3.2.3/src/gnuwin32/cran/rdevel.in	2015-08-16 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/cran/rdevel.in	2016-06-07 22:15:06.000000000 +0000
@@ -38,6 +38,8 @@
 <div class="download">
   <p><a href="@RWVER@-win.exe">Download R-Devel build for Windows</a> <span>(62 megabytes, 32/64 bit)</span></p>
   <ul>
+    <li>This build of R-Devel uses the gcc 4.9.3 toolchain produced
+    by Jeroen Ooms.  For details, see <a href="https://github.com/rwinlib/r-base">the Github page</a>.</li>
     <li><a href="../../windows/base/README.@RWVER@">Installation and other instructions</a></li>
     <li><a href="NEWS.@RWVER@.html">New features in this version</a></li>
   </ul>
@@ -56,8 +58,8 @@
 <h2>Frequently asked questions</h2>
 
 <ul>
-  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">How
-  do I install R when using Windows 7 or Vista?</a></li>
+  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">Does
+  R run under my version of Windows?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#What_0027s-the-best-way-to-upgrade_003f">How do I update packages in my previous version of R?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#Should-I-run-32_002dbit-or-64_002dbit-R_003f">Should I run 32-bit or 64-bit R?</a></li>
 </ul>
diff -Nru r-base-3.2.3/src/gnuwin32/cran/rpatched.in r-base-3.3.1/src/gnuwin32/cran/rpatched.in
--- r-base-3.2.3/src/gnuwin32/cran/rpatched.in	2015-08-16 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/cran/rpatched.in	2016-03-16 23:04:30.000000000 +0000
@@ -52,8 +52,8 @@
 <h2>Frequently asked questions</h2>
 
 <ul>
-  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">How
-  do I install R when using Windows 7 or Vista?</a></li>
+  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">Does
+  R run under my version of Windows?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#What_0027s-the-best-way-to-upgrade_003f">How do I update packages in my previous version of R?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#Should-I-run-32_002dbit-or-64_002dbit-R_003f">Should I run 32-bit or 64-bit R?</a></li>
 </ul>
diff -Nru r-base-3.2.3/src/gnuwin32/cran/rtest.in r-base-3.3.1/src/gnuwin32/cran/rtest.in
--- r-base-3.2.3/src/gnuwin32/cran/rtest.in	2015-08-16 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/cran/rtest.in	2016-03-16 23:04:30.000000000 +0000
@@ -52,7 +52,7 @@
 <h2>Frequently asked questions</h2>
 
 <ul>
-  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">How do I install R when using Windows Vista?</a></li>
+  <li><a href="../../windows/base/rw-FAQ.html#Does-R-run-under-Windows-Vista_003f">Does R run under my version of Windows?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#What_0027s-the-best-way-to-upgrade_003f">How do I update packages in my previous version of R?</a></li>
   <li><a href="../../windows/base/rw-FAQ.html#Should-I-run-32_002dbit-or-64_002dbit-R_003f">Should I run 32-bit or 64-bit R?</a></li>
 </ul>
diff -Nru r-base-3.2.3/src/gnuwin32/fixed/etc/Makeconf r-base-3.3.1/src/gnuwin32/fixed/etc/Makeconf
--- r-base-3.2.3/src/gnuwin32/fixed/etc/Makeconf	2015-03-18 23:04:05.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/fixed/etc/Makeconf	2016-06-09 22:15:06.000000000 +0000
@@ -17,6 +17,7 @@
 ## Things which are substituted by fixed/Makefile (and also -O3 -> -O2)
 WIN = 32
 BINPREF =
+COMPILED_BY =
 # SYMPAT = 's/^.* [BCDRT] _/ /p' for 32-bit
 # SYMPAT = 's/^.* [BCDRT] / /p' for 64-bit
 SYMPAT = @SYMPAT@
@@ -62,8 +63,6 @@
 ZLIB_LIBS = -lz
 
 AR = $(BINPREF)ar
-## Used by packages 'maps' and 'mapdata'
-AWK = gawk
 BLAS_LIBS = -L"$(R_HOME)/$(IMPDIR)" -lRblas
 C_VISIBILITY = 
 CC = $(BINPREF)gcc $(M_ARCH)
@@ -93,7 +92,7 @@
 F77 = $(BINPREF)gfortran $(M_ARCH)
 F77_VISIBILITY = 
 FFLAGS = -O3 $(DEBUGFLAG) @EOPTS@
-FLIBS = -lgfortran
+FLIBS = -lgfortran -lm -lquadmath
 FCPICFLAGS =
 FPICFLAGS = 
 FOUNDATION_CPPFLAGS =
diff -Nru r-base-3.2.3/src/gnuwin32/fixed/h/config.h r-base-3.3.1/src/gnuwin32/fixed/h/config.h
--- r-base-3.2.3/src/gnuwin32/fixed/h/config.h	2015-03-19 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/fixed/h/config.h	2016-03-16 23:04:28.000000000 +0000
@@ -68,9 +68,6 @@
 /* Define to 1 if you have the `atanpi' function. */
 /* #undef HAVE_ATANPI */
 
-/* Define if you have BSD networking headers and libraries. */
-/* #undef HAVE_BSD_NETWORKING */
-
 /* Define to 1 if the compiler understands __builtin_expect. (For intl) */
 #define HAVE_BUILTIN_EXPECT 1
 
@@ -153,14 +150,14 @@
 /* Define to 1 if you have the `ctan' function. */
 #define HAVE_CTAN 1
 
+/* Define to 1 if you have the `ctanh' function. */
+#define HAVE_CTANH 1
+
 /* Define to 1 if you have the <curl/curl.h> header file.
    Set on the command line where supported.
 */
 /* #undef HAVE_CURL_CURL_H */
 
-/* Define to 1 if you have the `ctanh' function. */
-#define HAVE_CTANH 1
-
 /* define if the compiler supports basic C++11 syntax */
 #define HAVE_CXX11 1
 
@@ -375,9 +372,6 @@
 /* Define to 1 if the system has the type `int64_t'. */
 #define HAVE_INT64_T 1
 
-/* Define if you have support for ftp/http access. */
-#define HAVE_INTERNET 1
-
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. (For
    intl) */
 #define HAVE_INTMAX_T 1
@@ -428,8 +422,10 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
-/* Define to 1 if you have the `cc_dynamic' library (-lcc_dynamic). */
-/* #undef HAVE_LIBCC_DYNAMIC */
+/* Define if your system has libcurl >= 7.28.0 with support for https.
+   Set on the command line where supported.
+ */
+/* #undef HAVE_LIBCURL */
 
 /* Define if __libc_stack_end is visible. */
 /* #undef HAVE_LIBC_STACK_END */
@@ -672,9 +668,6 @@
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
-/* Define if you have support for sockets. */
-#define HAVE_SOCKETS 1
-
 /* Define to 1 if the system has the type `stack_t'. */
 /* #undef HAVE_STACK_T */
 
@@ -949,8 +942,7 @@
 /* Define if you have 32 bit ints. */
 #define INT_32_BITS 1
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Define if mktime sets errno. */
@@ -1070,6 +1062,11 @@
 /* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T @ST@
 
+/* Workaround for win64 pow() precision issue in Mingw-w64 V3 and higher
+   See http://sourceforge.net/p/mingw-w64/bugs/466 for discussion. */
+#if defined(_WIN64) && defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR >= 3
+#define USE_POWL_IN_R_POW 1
+#endif
 
 /* Define as the maximum value of type 'size_t', if the system doesn't define
    it. (For intl) */
@@ -1086,9 +1083,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Define if you provide support for the libxml ftp/http functions. */
-#define SUPPORT_LIBXML 1
-
 /* Define if you have C/C++/Fortran OpenMP support for package code. */
 /* #undef SUPPORT_OPENMP */
 
diff -Nru r-base-3.2.3/src/gnuwin32/fixed/h/Rconfig.h r-base-3.3.1/src/gnuwin32/fixed/h/Rconfig.h
--- r-base-3.2.3/src/gnuwin32/fixed/h/Rconfig.h	2015-07-21 22:15:06.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/fixed/h/Rconfig.h	2016-01-03 23:15:03.000000000 +0000
@@ -15,6 +15,7 @@
 #define SUPPORT_MBCS 1
 #define ENABLE_NLS 1
 /* #undef HAVE_AQUA */
+/* Deprecated: use _OPENMP instead */
 /* #undef SUPPORT_OPENMP */
 #ifdef _WIN64
 #define SIZEOF_SIZE_T 8
diff -Nru r-base-3.2.3/src/gnuwin32/fixed/html/rwin.html r-base-3.3.1/src/gnuwin32/fixed/html/rwin.html
--- r-base-3.2.3/src/gnuwin32/fixed/html/rwin.html	2012-04-27 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/fixed/html/rwin.html	2016-03-16 23:04:28.000000000 +0000
@@ -8,7 +8,7 @@
 <body>
 
 <h1>Statistical Data Analysis
-<img class="toplogo" src="logo.jpg" alt="[R logo]"> 
+<img class="toplogo" src="Rlogo.svg" alt="[R logo]"> 
 </h1>
 
 <hr width="100%">
diff -Nru r-base-3.2.3/src/gnuwin32/fixed/Makefile r-base-3.3.1/src/gnuwin32/fixed/Makefile
--- r-base-3.2.3/src/gnuwin32/fixed/Makefile	2015-03-18 23:04:05.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/fixed/Makefile	2016-03-25 23:15:12.000000000 +0000
@@ -28,7 +28,8 @@
 	$(SED) -e 's/WIN = 32/WIN = 64/' \
 	  -e "s/-O3/-O2/" \
 	  -e "s/@EOPTS@/$(EOPTS)/" \
-	  -e "s|BINPREF =|BINPREF = $(BINPREF)|" \
+	  -e "s|BINPREF =|BINPREF ?= $(BINPREF)|" \
+	  -e "s|COMPILED_BY =|COMPILED_BY = $(COMPILED_BY)|" \
 	  -e "s|IMPDIR = bin|IMPDIR = $(IMPDIR)|" \
 	  -e "s|LOCAL_SOFT =|LOCAL_SOFT = $(LOCAL_SOFT)|" \
 	  -e "s|R_ARCH =|R_ARCH = $(R_ARCH)|" \
@@ -44,7 +45,8 @@
 else
 	$(SED) -e "s|IMPDIR = bin|IMPDIR = $(IMPDIR)|" \
 	  -e "s/@EOPTS@/$(EOPTS)/" \
-	  -e "s|BINPREF =|BINPREF = $(BINPREF)|" \
+	  -e "s|BINPREF =|BINPREF ?= $(BINPREF)|" \
+	  -e "s|COMPILED_BY =|COMPILED_BY = $(COMPILED_BY)|" \
 	  -e "s|LOCAL_SOFT =|LOCAL_SOFT = $(LOCAL_SOFT)|" \
 	  -e "s|R_ARCH =|R_ARCH = $(R_ARCH)|" \
 	  -e "s|DT_ARCH =|DT_ARCH = $(DT_ARCH)|" \
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/gnuwin32/front-ends/R.ico and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/gnuwin32/front-ends/R.ico differ
diff -Nru r-base-3.2.3/src/gnuwin32/installer/Makefile r-base-3.3.1/src/gnuwin32/installer/Makefile
--- r-base-3.2.3/src/gnuwin32/installer/Makefile	2015-08-03 13:05:31.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/installer/Makefile	2016-04-04 22:15:06.000000000 +0000
@@ -95,14 +95,16 @@
 # files to make source packages
 	$(MKDIR) -p $(RPREFIX)/share \
 	  $(RPREFIX)/src/library $(RPREFIX)/src/gnuwin32
-	$(CP) $(R_HOME)/doc/html/logo.jpg $(RPREFIX)/doc/html
+	$(CP) $(R_HOME)/doc/html/logo.jpg $(R_HOME)/doc/html/Rlogo.svg $(RPREFIX)/doc/html
 	$(CP) $(R_HOME)/doc/KEYWORDS* $(RPREFIX)/doc
 	$(CP) -pR $(R_HOME)/include $(RPREFIX)
 	$(CP) -pR $(foreach i,$(SHARE_DIRS),$(R_HOME)/share/$i) $(RPREFIX)/share
 # This is odd -- better to clean the copy
 	(cd ..; $(MAKE) --no-print-directory PKGDIR=. pkgclean-windlgs)
 	$(CP) -pR ../windlgs $(RPREFIX)/src/library
-#
+# Edit Makeconf
+	$(SED) -e 's!^BINPREF [?]= .*!BINPREF ?= c:/Rtools/mingw_64/bin/!' \
+	  $(R_HOME)/etc/x64/Makeconf > $(RPREFIX)/etc/x64/Makeconf
 # test dir
 	mkdir $(RPREFIX)/tests
 	$(MAKE) --no-print-directory -C ../../../tests -f Makefile.win \
@@ -144,6 +146,9 @@
              ../../../library/$${f}/DESCRIPTION \
              > $(RPREFIX)/library/$${f}/DESCRIPTION; \
 	done
+# Edit Makeconf file to default Rtools location
+	$(SED) -e 's!^BINPREF [?]= .*!BINPREF ?= c:/Rtools/mingw_32/bin/!' \
+	  $(HOME32)/etc/i386/Makeconf > $(RPREFIX)/etc/i386/Makeconf
 else
 	@echo "------------ not including 32-bit files"
 endif
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/gnuwin32/installer/R.bmp and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/gnuwin32/installer/R.bmp differ
diff -Nru r-base-3.2.3/src/gnuwin32/MkRules.dist r-base-3.3.1/src/gnuwin32/MkRules.dist
--- r-base-3.2.3/src/gnuwin32/MkRules.dist	2015-10-04 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/MkRules.dist	2016-03-25 23:15:12.000000000 +0000
@@ -9,7 +9,7 @@
 
 ## =========== configuration macros for building packages ================
 # Absolute path to '/usr/local' software collection.  The versions used
-# on CRAN can be found at http://www.stats.ox.ac.uk/pub/Rtools/libs.html
+# on CRAN can be found at https://www.stats.ox.ac.uk/pub/Rtools/libs.html
 # It can be interrogated by 'R CMD config LOCAL_SOFT'
 # Use 'make rsync-extsoft' to populate the default directory.
 # LOCAL_SOFT = $(R_HOME)/extsoft
@@ -19,7 +19,7 @@
 # Path of library directory containing zlib, bzlib, liblzma, pcre,
 # libpng, libjpeg, libtiff.
 # A suitable version can be found at
-# http://www.stats.ox.ac.uk/pub/Rtools/libs.html
+# https://www.stats.ox.ac.uk/pub/Rtools/libs.html
 # or use 'make rsync-extsoft' to populate the default directory.
 # EXT_LIBS = $(LOCAL_SOFT)
 
@@ -57,6 +57,8 @@
 # BINPREF = c:/Rtools/gcc492_32/bin/
 # prefix for 64-bit:
 # BINPREF64 = c:/Rtools/gcc492_64/bin/
+# Set this to indicate a non-gcc compiler and version
+# COMPILED_BY = <determined automatically>
 
 # Others use a -m64 or -m32 option to select architectures
 # M_ARCH =
@@ -70,10 +72,10 @@
 # 32- or 64-bit Windows?
 # WIN = 32
 
-# The gcc 4.9.2 64 bit toolchain is set up for the 'medium code' model and needs
-# to remove the .refptr entries from the exports list; this is the default
+# The gcc 4.9.3 64 bit toolchain is set up for the 'medium code' model and needs
+# to remove the .refptr and .weak entries from the exports list; this is the default
 # when WIN = 64, with blank for WIN = 32:
-# NM_FILTER = | $(SED) -e '/.refptr./d'
+# NM_FILTER = | $(SED) -e '/[.]refptr[.]/d' -e '/[.]weak[.]/d'
 
 # We normally link directly against DLLs, 
 # but this macro forces the use of import libs
@@ -100,7 +102,7 @@
 
 # For the cairographics devices
 # Optionally use a static build of cairographics from
-#   http://www.rforge.net/Cairo/files/cairo-current-win.tar.gz
+#   https://www.rforge.net/Cairo/files/cairo-current-win.tar.gz
 # and set CAIRO_HOME to the parent of the win32/win64 directories
 #
 # If CAIRO_HOME is not set the devices are not built.
diff -Nru r-base-3.2.3/src/gnuwin32/MkRules.rules r-base-3.3.1/src/gnuwin32/MkRules.rules
--- r-base-3.2.3/src/gnuwin32/MkRules.rules	2015-10-04 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/MkRules.rules	2016-03-25 23:15:12.000000000 +0000
@@ -11,6 +11,7 @@
 TOOL_PATH ?=
 BINPREF ?=
 BINPREF64 ?= x86_64-w64-mingw32-
+COMPILED_BY ?= gcc-$(shell $(CC) --version | egrep -o "([0-9]{1,}\.){2,}[0-9]{1,}")
 M_ARCH ?=
 AS_ARCH ?=
 RC_ARCH ?=
@@ -61,7 +62,7 @@
 arch_DEFS = -DR_ARCH='"x64"'
 BINPREF = $(BINPREF64)
 SYMPAT = 's/^.* [BCDRT] / /p'
-NM_FILTER ?= | $(SED) -e '/.refptr./d'
+NM_FILTER ?= | $(SED) -e '/[.]refptr[.]/d' -e '/[.]weak[.]/d'
 else
 R_ARCH = /i386
 arch_DEFS = -DR_ARCH='"i386"'
@@ -83,7 +84,6 @@
 endif
 
 AR=$(BINPREF)ar
-# AWK=gawk
 CAT=cat
 CC=$(BINPREF)gcc$(GCC4_SUFF) $(C99FLAG) $(M_ARCH)
 CP=cp
diff -Nru r-base-3.2.3/src/gnuwin32/Rdll.hide r-base-3.3.1/src/gnuwin32/Rdll.hide
--- r-base-3.2.3/src/gnuwin32/Rdll.hide	2015-08-16 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/Rdll.hide	2016-03-16 23:04:29.000000000 +0000
@@ -60,6 +60,7 @@
  NO_SPECIAL_SYMBOLS
  PrintUsage
  ProfileEvent
+ RExitContext
  R_BCNodeStackBase
  R_BCNodeStackEnd
  R_BCNodeStackTop
@@ -89,6 +90,7 @@
  R_FinalizeSrcRefState
  R_FreeSEXP
  R_FreeStringBufferL
+ R_GCEnabled
  R_GE_VStrHeight
  R_GE_VStrWidth
  R_GE_VText
@@ -192,8 +194,10 @@
  R_decompress2
  R_decompress3
  R_dlsym
+ R_doDotCall
  R_do_data_class
  R_do_set_class
+ R_dotCallFn
  R_dot_Class
  R_dot_Generic
  R_dot_GenericCallEnv
@@ -707,6 +711,7 @@
  do_first_min
  do_flush
  do_for
+ do_forceAndCall
  do_formals
  do_format
  do_formatC
@@ -724,6 +729,7 @@
  do_getIdentification
  do_getNSRegistry
  do_getNumRtoCConverters
+ do_getNumericRounding
  do_getOption
  do_getRegNS
  do_getRegisteredRoutines
@@ -788,6 +794,7 @@
  do_lazyLoadDBinsertValue
  do_length
  do_lengthgets
+ do_lengths
  do_levelsgets
  do_list2env
  do_listdirs
@@ -847,7 +854,6 @@
  do_nextn
  do_ngettext
  do_normalizepath
- do_nsl
  do_nzchar
  do_onexit
  do_open
@@ -882,6 +888,7 @@
  do_quit
  do_quote
  do_radixsort
+ do_radixsort2
  do_random1
  do_random2
  do_random3
@@ -941,6 +948,7 @@
  do_set
  do_setFileTime
  do_setInternet2
+ do_setNumericRounding
  do_setS4Object
  do_setSessionTimeLimit
  do_setStatusBar
@@ -977,6 +985,7 @@
  do_stopHTTPD
  do_storage_mode
  do_strptime
+ do_strrep
  do_strsplit
  do_strtoi
  do_strtrim
@@ -1006,6 +1015,7 @@
  do_system
  do_systime
  do_sysumask
+ do_syswhich
  do_tabulate
  do_tempdir
  do_tempfile
@@ -1036,6 +1046,8 @@
  do_url
  do_usemethod
  do_utf8ToInt
+ do_validEnc
+ do_validUTF8
  do_vapply
  do_version
  do_warning
@@ -1509,6 +1521,13 @@
  xbufdel
  xbufgrow
  xcalloc_impl
+ xcopyComplexWithRecycle
+ xcopyIntegerWithRecycle
+ xcopyLogicalWithRecycle
+ xcopyRawWithRecycle
+ xcopyRealWithRecycle
+ xcopyStringWithRecycle
+ xcopyVectorWithRecycle
  xdr_bool
  xdr_bytes
  xdr_char
@@ -1528,6 +1547,13 @@
  xdr_void
  xdr_wrapstring
  xdrstdio_create
+ xfillComplexMatrixWithRecycle
+ xfillIntegerMatrixWithRecycle
+ xfillLogicalMatrixWithRecycle
+ xfillRawMatrixWithRecycle
+ xfillRealMatrixWithRecycle
+ xfillStringMatrixWithRecycle
+ xfillVectorMatrixWithRecycle
  xfree_impl
  xmalloc_configure
  xmalloc_current
diff -Nru r-base-3.2.3/src/gnuwin32/rui.c r-base-3.3.1/src/gnuwin32/rui.c
--- r-base-3.2.3/src/gnuwin32/rui.c	2015-10-23 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/rui.c	2016-03-16 23:04:28.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Langage for Statistical Data Analysis
  *  Copyright (C) 1998--2005  Guido Masarotto and Brian Ripley
- *  Copyright (C) 2004--2014  The R Foundation
+ *  Copyright (C) 2004--2015  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -917,7 +917,7 @@
     MCHECK(pmenu->mpkgu = newmenuitem(G_("Update packages..."), 0,
 			       menupkgupdate));
     MCHECK(newmenuitem("-", 0, NULL));
-    MCHECK(pmenu->mpkgil = newmenuitem(G_("Install package(s) from local zip files..."),
+    MCHECK(pmenu->mpkgil = newmenuitem(G_("Install package(s) from local files..."),
 				0, menupkginstalllocal));
     return 0;
 }
diff -Nru r-base-3.2.3/src/gnuwin32/system.c r-base-3.3.1/src/gnuwin32/system.c
--- r-base-3.2.3/src/gnuwin32/system.c	2015-08-25 22:19:06.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/system.c	2016-03-16 23:04:29.000000000 +0000
@@ -57,7 +57,6 @@
 int Rwin_graphicsx = -25, Rwin_graphicsy = 0;
 
 R_size_t R_max_memory = INT_MAX;
-Rboolean UseInternet2 = TRUE; // used in main/internet.c
 
 extern SA_TYPE SaveAction; /* from ../main/startup.c */
 Rboolean DebugMenuitem = FALSE;  /* exported for rui.c */
@@ -723,6 +722,12 @@
 	putenv(UserRHome);
     }    
 
+    
+    /* This is here temporarily while the GCC version is chosen */
+    char gccversion[30];
+    snprintf(gccversion, 30, "R_COMPILED_BY=gcc %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+    putenv(gccversion);
+
     /* Rterm and Rgui set CharacterMode during startup, then set Rp->CharacterMode
        from it in cmdlineoptions().  Rproxy never calls cmdlineoptions, so we need the
        line below */
@@ -991,7 +996,7 @@
 		InThreadReadConsole = FileReadConsole;
 		setvbuf(stdout, NULL, _IONBF, 0);
 	    } else if (!strcmp(*av, "--internet2")) {
-/*		UseInternet2 = TRUE;    This is now the default */
+/*	        This is now the default */
 	    } else if (!strcmp(*av, "--mdi")) {
 		MDIset = 1;
 	    } else if (!strcmp(*av, "--sdi") || !strcmp(*av, "--no-mdi")) {
diff -Nru r-base-3.2.3/src/gnuwin32/sys-win32.c r-base-3.3.1/src/gnuwin32/sys-win32.c
--- r-base-3.2.3/src/gnuwin32/sys-win32.c	2015-08-25 22:19:05.000000000 +0000
+++ r-base-3.3.1/src/gnuwin32/sys-win32.c	2016-03-16 23:04:28.000000000 +0000
@@ -107,6 +107,7 @@
 
 SEXP do_machine(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    checkArity(op, args);
     return mkString("Win32");
 }
 
diff -Nru r-base-3.2.3/src/include/config.h.in r-base-3.3.1/src/include/config.h.in
--- r-base-3.2.3/src/include/config.h.in	2015-03-18 23:02:16.000000000 +0000
+++ r-base-3.3.1/src/include/config.h.in	2016-03-16 23:02:20.000000000 +0000
@@ -67,9 +67,6 @@
 /* Define to 1 if you have the `atanpi' function. */
 #undef HAVE_ATANPI
 
-/* Define if you have BSD networking headers and libraries. */
-#undef HAVE_BSD_NETWORKING
-
 /* Define to 1 if the compiler understands __builtin_expect. (For intl) */
 #undef HAVE_BUILTIN_EXPECT
 
@@ -312,6 +309,9 @@
 /* Define to 1 if you have the `getgrgid' function. */
 #undef HAVE_GETGRGID
 
+/* Define to 1 if you have the `getline' function. */
+#undef HAVE_GETLINE
+
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
@@ -370,9 +370,6 @@
 /* Define to 1 if the system has the type `int64_t'. */
 #undef HAVE_INT64_T
 
-/* Define if you have support for ftp/http access. */
-#undef HAVE_INTERNET
-
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. (For
    intl) */
 #undef HAVE_INTMAX_T
@@ -423,8 +420,8 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have the `cc_dynamic' library (-lcc_dynamic). */
-#undef HAVE_LIBCC_DYNAMIC
+/* Define if your system has libcurl >= 7.28.0 with support for https. */
+#undef HAVE_LIBCURL
 
 /* Define if __libc_stack_end is visible. */
 #undef HAVE_LIBC_STACK_END
@@ -662,9 +659,6 @@
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
-/* Define if you have support for sockets. */
-#undef HAVE_SOCKETS
-
 /* Define to 1 if the system has the type `stack_t'. */
 #undef HAVE_STACK_T
 
@@ -922,9 +916,18 @@
 /* Define if you have the X11/Xmu headers and libraries. */
 #undef HAVE_X11_Xmu
 
+/* Define to 1 if you have the `__cospi' function. */
+#undef HAVE___COSPI
+
 /* Define to 1 if you have the `__fsetlocking' function. */
 #undef HAVE___FSETLOCKING
 
+/* Define to 1 if you have the `__sinpi' function. */
+#undef HAVE___SINPI
+
+/* Define to 1 if you have the `__tanpi' function. */
+#undef HAVE___TANPI
+
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
 
@@ -937,8 +940,7 @@
 /* Define if you have 32 bit ints. */
 #undef INT_32_BITS
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Define if mktime sets errno. */
@@ -1057,9 +1059,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define if you provide support for the libxml ftp/http functions. */
-#undef SUPPORT_LIBXML
-
 /* Define if you have C/C++/Fortran OpenMP support for package code. */
 #undef SUPPORT_OPENMP
 
diff -Nru r-base-3.2.3/src/include/Defn.h r-base-3.3.1/src/include/Defn.h
--- r-base-3.2.3/src/include/Defn.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/Defn.h	2016-03-16 23:02:20.000000000 +0000
@@ -18,6 +18,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef DEFN_H_
 #define DEFN_H_
 
@@ -91,7 +93,6 @@
 extern0 SEXP    R_ConnIdSymbol;  /* "conn_id" */
 extern0 SEXP    R_DevicesSymbol;  /* ".Devices" */
 
-extern0 SEXP    R_dot_Generic;  /* ".Generic" */
 extern0 SEXP    R_dot_Methods;  /* ".Methods" */
 extern0 SEXP    R_dot_Group;  /* ".Group" */
 extern0 SEXP    R_dot_Class;  /* ".Class" */
@@ -325,8 +326,8 @@
 
 typedef enum {
     PREC_FN	 = 0,
-    PREC_LEFT    = 1,
-    PREC_EQ	 = 2,
+    PREC_EQ	 = 1,
+    PREC_LEFT    = 2,
     PREC_RIGHT	 = 3,
     PREC_TILDE	 = 4,
     PREC_OR	 = 5,
@@ -339,9 +340,9 @@
     PREC_COLON	 = 12,
     PREC_SIGN	 = 13,
     PREC_POWER	 = 14,
-    PREC_DOLLAR  = 15,
-    PREC_NS	 = 16,
-    PREC_SUBSET	 = 17
+    PREC_SUBSET  = 15,
+    PREC_DOLLAR	 = 16,
+    PREC_NS	 = 17
 } PPprec;
 
 typedef struct {
@@ -521,6 +522,7 @@
     void *cenddata;		/* data for C "on.exit" thunk */
     void *vmax;		        /* top of R_alloc stack */
     int intsusp;                /* interrupts are suspended */
+    int gcenabled;		/* R_GCenabled value */
     SEXP handlerstack;          /* condition handler stack */
     SEXP restartstack;          /* stack of available restarts */
     struct RPRSTACK *prstack;   /* stack of pending promises */
@@ -531,6 +533,8 @@
     SEXP srcref;	        /* The source line in effect */
     int browserfinish;     /* should browser finish this context without stopping */
     SEXP returnValue;			/* only set during on.exit calls */
+    struct RCNTXT *jumptarget;	/* target for a continuing jump */
+    int jumpmask;               /* associated LONGJMP argument */
 } RCNTXT, *context;
 
 /* The Various Context Types.
@@ -638,6 +642,7 @@
 /* Memory Management */
 extern0 R_size_t R_NSize  INI_as(R_NSIZE);/* Size of cons cell heap */
 extern0 R_size_t R_VSize  INI_as(R_VSIZE);/* Size of the vector heap */
+extern0 int	R_GCEnabled INI_as(1);
 extern0 SEXP	R_NHeap;	    /* Start of the cons cell heap */
 extern0 SEXP	R_FreeSEXP;	    /* Cons cell free list */
 extern0 R_size_t R_Collected;	    /* Number of free cons cells (after gc) */
@@ -670,6 +675,8 @@
 extern0 int	R_WarnLength	INI_as(1000);	/* Error/warning max length */
 extern0 int	R_nwarnings	INI_as(50);
 extern uintptr_t R_CStackLimit	INI_as((uintptr_t)-1);	/* C stack limit */
+extern uintptr_t R_OldCStackLimit INI_as((uintptr_t)0); /* Old value while 
+							   handling overflow */
 extern uintptr_t R_CStackStart	INI_as((uintptr_t)-1);	/* Initial stack address */
 extern int	R_CStackDir	INI_as(1);	/* C stack direction */
 
@@ -769,6 +776,9 @@
 extern void R_init_jit_enabled(void);
 extern void R_initAsignSymbols(void);
 
+LibExtern SEXP R_CachedScalarReal INI_as(NULL);
+LibExtern SEXP R_CachedScalarInteger INI_as(NULL);
+
 LibExtern int R_num_math_threads INI_as(1);
 LibExtern int R_max_num_math_threads INI_as(1);
 
@@ -808,10 +818,6 @@
 LibExtern SEXP R_FalseValue INI_as(NULL);
 LibExtern SEXP R_LogicalNAValue INI_as(NULL);
 
-#ifdef Win32
-LibExtern Rboolean UseInternet2;
-#endif
-
 #ifdef __MAIN__
 # undef extern
 # undef extern0
@@ -856,7 +862,6 @@
 # define EncodeString           Rf_EncodeString
 # define EnsureString 		Rf_EnsureString
 # define endcontext		Rf_endcontext
-# define envlength		Rf_envlength
 # define ErrorMessage		Rf_ErrorMessage
 # define evalList		Rf_evalList
 # define evalListKeepMissing	Rf_evalListKeepMissing
@@ -910,6 +915,8 @@
 # define matchPar		Rf_matchPar
 # define Mbrtowc		Rf_mbrtowc
 # define mbtoucs		Rf_mbtoucs
+# define mbcsToUcs2		Rf_mbcsToUcs2
+# define memtrace_report	Rf_memtrace_report
 # define mkCLOSXP		Rf_mkCLOSXP
 # define mkFalse		Rf_mkFalse
 # define mkPROMISE		Rf_mkPROMISE
@@ -996,7 +1003,8 @@
 double	R_FileMtime(const char *);
 
 /* environment cell access */
-typedef struct R_varloc_st *R_varloc_t;
+typedef struct { SEXP cell; } R_varloc_t; /* use struct to prevent casting */
+#define R_VARLOC_IS_NULL(loc) ((loc).cell == NULL)
 R_varloc_t R_findVarLocInFrame(SEXP, SEXP);
 SEXP R_GetVarLocValue(R_varloc_t);
 SEXP R_GetVarLocSymbol(R_varloc_t);
@@ -1055,10 +1063,12 @@
 int DispatchAnyOrEval(SEXP, SEXP, const char *, SEXP, SEXP, SEXP*, int, int);
 int DispatchOrEval(SEXP, SEXP, const char *, SEXP, SEXP, SEXP*, int, int);
 int DispatchGroup(const char *, SEXP,SEXP,SEXP,SEXP,SEXP*);
+R_xlen_t dispatch_xlength(SEXP, SEXP, SEXP);
+R_len_t dispatch_length(SEXP, SEXP, SEXP);
+SEXP dispatch_subset2(SEXP, R_xlen_t, SEXP, SEXP);
 SEXP duplicated(SEXP, Rboolean);
 R_xlen_t any_duplicated(SEXP, Rboolean);
 R_xlen_t any_duplicated3(SEXP, SEXP, Rboolean);
-int envlength(SEXP);
 SEXP evalList(SEXP, SEXP, SEXP, int);
 SEXP evalListKeepMissing(SEXP, SEXP);
 int factorsConform(SEXP, SEXP);
@@ -1187,7 +1197,7 @@
 SEXP R_sysfunction(int,RCNTXT*);
 
 void R_run_onexits(RCNTXT *);
-void R_restore_globals(RCNTXT *);
+void NORET R_jumpctxt(RCNTXT *, int, SEXP);
 #endif
 
 /* ../main/bind.c */
diff -Nru r-base-3.2.3/src/include/Errormsg.h r-base-3.3.1/src/include/Errormsg.h
--- r-base-3.2.3/src/include/Errormsg.h	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/Errormsg.h	2016-01-29 23:15:06.000000000 +0000
@@ -18,6 +18,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef ERRORMSG_H
 #define ERRORMSG_H
 
diff -Nru r-base-3.2.3/src/include/Fileio.h r-base-3.3.1/src/include/Fileio.h
--- r-base-3.2.3/src/include/Fileio.h	2015-08-25 22:15:23.000000000 +0000
+++ r-base-3.3.1/src/include/Fileio.h	2016-03-16 23:02:20.000000000 +0000
@@ -18,6 +18,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef RFILEIO_H_
 
 #define RFILEIO_H_
diff -Nru r-base-3.2.3/src/include/Graphics.h r-base-3.3.1/src/include/Graphics.h
--- r-base-3.2.3/src/include/Graphics.h	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/Graphics.h	2016-01-29 23:15:06.000000000 +0000
@@ -18,11 +18,11 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef GRAPHICS_H_
 #define GRAPHICS_H_
 
-/* This is a private header */
-
 #include <R_ext/Boolean.h>
 
 #include <R_ext/GraphicsEngine.h>
@@ -31,8 +31,6 @@
 #define R_GRAPHICS 1
 #include <Rgraphics.h> /* RUnit */
 
-//typedef unsigned int rcolor;
-
 /* base.c, graphics.c, par.c */
 #define MAX_LAYOUT_ROWS 200
 #define MAX_LAYOUT_COLS 200
diff -Nru r-base-3.2.3/src/include/Internal.h r-base-3.3.1/src/include/Internal.h
--- r-base-3.2.3/src/include/Internal.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/Internal.h	2016-03-16 23:02:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 #if Win32
 SEXP do_mkjunction(SEXP, SEXP, SEXP, SEXP);
 SEXP do_shellexec(SEXP, SEXP, SEXP, SEXP);
-SEXP do_setInternet2(SEXP, SEXP, SEXP, SEXP);
 SEXP do_syswhich(SEXP, SEXP, SEXP, SEXP);
 SEXP do_tzone_name(SEXP, SEXP, SEXP, SEXP);
 #else
@@ -64,6 +63,7 @@
 SEXP do_asmatrixdf(SEXP, SEXP, SEXP, SEXP);
 SEXP do_assign(SEXP, SEXP, SEXP, SEXP);
 SEXP do_asvector(SEXP, SEXP, SEXP, SEXP);
+SEXP do_asCharacterFactor(SEXP, SEXP, SEXP, SEXP);
 SEXP do_AT(SEXP call, SEXP op, SEXP args, SEXP env);
 SEXP do_attach(SEXP,SEXP,SEXP,SEXP);
 SEXP do_attr(SEXP, SEXP, SEXP, SEXP);
@@ -112,12 +112,8 @@
 SEXP do_curlGetHeaders(SEXP, SEXP, SEXP, SEXP);
 SEXP do_curlVersion(SEXP, SEXP, SEXP, SEXP);
 SEXP do_D2POSIXlt(SEXP, SEXP, SEXP, SEXP);
-SEXP do_dataentry(SEXP, SEXP, SEXP, SEXP);
-SEXP do_dataframe(SEXP, SEXP, SEXP, SEXP);
-SEXP do_dataviewer(SEXP, SEXP, SEXP, SEXP);
 SEXP do_date(SEXP, SEXP, SEXP, SEXP);
 SEXP do_debug(SEXP, SEXP, SEXP, SEXP);
-SEXP do_devAskNewPage(SEXP, SEXP, SEXP, SEXP);
 SEXP do_delayed(SEXP, SEXP, SEXP, SEXP);
 SEXP do_deparse(SEXP, SEXP, SEXP, SEXP);
 SEXP do_detach(SEXP,SEXP,SEXP,SEXP);
@@ -161,7 +157,6 @@
 SEXP do_filechoose(SEXP, SEXP, SEXP, SEXP);
 SEXP do_filecopy(SEXP, SEXP, SEXP, SEXP);
 SEXP do_filecreate(SEXP, SEXP, SEXP, SEXP);
-SEXP do_fileedit(SEXP, SEXP, SEXP, SEXP);
 SEXP do_fileexists(SEXP, SEXP, SEXP, SEXP);
 SEXP do_fileinfo(SEXP, SEXP, SEXP, SEXP);
 SEXP do_filelink(SEXP, SEXP, SEXP, SEXP);
@@ -173,7 +168,6 @@
 SEXP do_findinterval(SEXP, SEXP, SEXP, SEXP);
 SEXP do_first_min(SEXP, SEXP, SEXP, SEXP);
 SEXP do_flush(SEXP, SEXP, SEXP, SEXP);
-SEXP do_flushconsole(SEXP, SEXP, SEXP, SEXP);
 SEXP do_for(SEXP, SEXP, SEXP, SEXP);
 SEXP do_forceAndCall(SEXP, SEXP, SEXP, SEXP);
 SEXP do_format(SEXP, SEXP, SEXP, SEXP);
@@ -203,12 +197,9 @@
 SEXP do_getwd(SEXP, SEXP, SEXP, SEXP);
 SEXP do_glob(SEXP, SEXP, SEXP, SEXP);
 SEXP do_globalenv(SEXP, SEXP, SEXP, SEXP);
-SEXP do_gray(SEXP, SEXP, SEXP, SEXP);
 SEXP do_grep(SEXP, SEXP, SEXP, SEXP);
 SEXP do_grepraw(SEXP, SEXP, SEXP, SEXP);
 SEXP do_gsub(SEXP, SEXP, SEXP, SEXP);
-SEXP do_hsv(SEXP, SEXP, SEXP, SEXP);
-SEXP do_hcl(SEXP, SEXP, SEXP, SEXP);
 SEXP do_iconv(SEXP, SEXP, SEXP, SEXP);
 SEXP do_ICUget(SEXP, SEXP, SEXP, SEXP);
 SEXP do_ICUset(SEXP, SEXP, SEXP, SEXP);
@@ -285,7 +276,6 @@
 SEXP do_onexit(SEXP, SEXP, SEXP, SEXP);
 SEXP do_options(SEXP, SEXP, SEXP, SEXP);
 SEXP do_order(SEXP, SEXP, SEXP, SEXP);
-SEXP do_pack(SEXP, SEXP, SEXP, SEXP);
 SEXP do_packBits(SEXP, SEXP, SEXP, SEXP);
 SEXP do_paren(SEXP, SEXP, SEXP, SEXP);
 SEXP do_parentenv(SEXP, SEXP, SEXP, SEXP);
@@ -340,15 +330,12 @@
 SEXP do_rep_len(SEXP, SEXP, SEXP, SEXP);
 SEXP do_repeat(SEXP, SEXP, SEXP, SEXP);
 SEXP do_resetCondHands(SEXP, SEXP, SEXP, SEXP);
-SEXP do_restart(SEXP, SEXP, SEXP, SEXP);
 SEXP NORET do_return(SEXP, SEXP, SEXP, SEXP);
 SEXP do_returnValue(SEXP, SEXP, SEXP, SEXP);
 SEXP do_rgb(SEXP, SEXP, SEXP, SEXP);
-SEXP do_RGB2hsv(SEXP, SEXP, SEXP, SEXP);
 SEXP do_Rhome(SEXP, SEXP, SEXP, SEXP);
 SEXP do_RNGkind(SEXP, SEXP, SEXP, SEXP);
 SEXP do_rowsum(SEXP, SEXP, SEXP, SEXP);
-SEXP do_rownames(SEXP, SEXP, SEXP, SEXP);
 SEXP do_rowscols(SEXP, SEXP, SEXP, SEXP);
 SEXP do_S4on(SEXP, SEXP, SEXP, SEXP);
 SEXP do_sample(SEXP, SEXP, SEXP, SEXP);
@@ -358,7 +345,6 @@
 SEXP do_saveplot(SEXP, SEXP, SEXP, SEXP);
 SEXP do_scan(SEXP, SEXP, SEXP, SEXP);
 SEXP do_search(SEXP, SEXP, SEXP, SEXP);
-SEXP do_selectlist(SEXP, SEXP, SEXP, SEXP);
 SEXP do_seq(SEXP, SEXP, SEXP, SEXP);
 SEXP do_seq_along(SEXP, SEXP, SEXP, SEXP);
 SEXP do_seq_len(SEXP, SEXP, SEXP, SEXP);
@@ -386,8 +372,10 @@
 SEXP do_split(SEXP, SEXP, SEXP, SEXP);
 SEXP do_sprintf(SEXP, SEXP, SEXP, SEXP);
 SEXP do_standardGeneric(SEXP, SEXP, SEXP, SEXP);
+SEXP do_startsWith(SEXP, SEXP, SEXP, SEXP);
 SEXP NORET do_stop(SEXP, SEXP, SEXP, SEXP);
 SEXP do_storage_mode(SEXP, SEXP, SEXP, SEXP);
+SEXP do_strrep(SEXP, SEXP, SEXP, SEXP);
 SEXP do_strsplit(SEXP,SEXP,SEXP,SEXP);
 SEXP do_strptime(SEXP,SEXP,SEXP,SEXP);
 SEXP do_strtrim(SEXP,SEXP,SEXP,SEXP);
@@ -401,15 +389,11 @@
 SEXP do_subassign2(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subassign2_dflt(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subassign3(SEXP, SEXP, SEXP, SEXP);
-SEXP do_subassigndf(SEXP, SEXP, SEXP, SEXP);
-SEXP do_subassigndf2(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subset(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subset_dflt(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subset2(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subset2_dflt(SEXP, SEXP, SEXP, SEXP);
 SEXP do_subset3(SEXP, SEXP, SEXP, SEXP);
-SEXP do_subsetdf(SEXP, SEXP, SEXP, SEXP);
-SEXP do_subsetdf2(SEXP, SEXP, SEXP, SEXP);
 SEXP do_substitute(SEXP, SEXP, SEXP, SEXP);
 SEXP do_substr(SEXP,SEXP,SEXP,SEXP);
 SEXP do_substrgets(SEXP,SEXP,SEXP,SEXP);
@@ -437,9 +421,10 @@
 SEXP do_unlist(SEXP, SEXP, SEXP, SEXP);
 SEXP do_unserializeFromConn(SEXP, SEXP, SEXP, SEXP);
 SEXP do_unsetenv(SEXP, SEXP, SEXP, SEXP);
-SEXP do_unzip(SEXP, SEXP, SEXP, SEXP);
 SEXP NORET do_usemethod(SEXP, SEXP, SEXP, SEXP);
 SEXP do_utf8ToInt(SEXP, SEXP, SEXP, SEXP);
+SEXP do_validEnc(SEXP, SEXP, SEXP, SEXP);
+SEXP do_validUTF8(SEXP, SEXP, SEXP, SEXP);
 SEXP do_vapply(SEXP, SEXP, SEXP, SEXP);
 SEXP do_version(SEXP, SEXP, SEXP, SEXP);
 SEXP do_warning(SEXP, SEXP, SEXP, SEXP);
@@ -473,7 +458,6 @@
 SEXP do_stdin(SEXP, SEXP, SEXP, SEXP);
 SEXP do_stdout(SEXP, SEXP, SEXP, SEXP);
 SEXP do_stderr(SEXP, SEXP, SEXP, SEXP);
-SEXP do_readlines(SEXP, SEXP, SEXP, SEXP);
 SEXP do_writelines(SEXP, SEXP, SEXP, SEXP);
 SEXP do_readbin(SEXP, SEXP, SEXP, SEXP);
 SEXP do_writebin(SEXP, SEXP, SEXP, SEXP);
@@ -501,7 +485,6 @@
 SEXP do_getconnection(SEXP, SEXP, SEXP, SEXP);
 SEXP do_getallconnections(SEXP, SEXP, SEXP, SEXP);
 SEXP do_sumconnection(SEXP, SEXP, SEXP, SEXP);
-SEXP do_download(SEXP, SEXP, SEXP, SEXP);
 SEXP do_sockconn(SEXP, SEXP, SEXP, SEXP);
 SEXP do_sockselect(SEXP, SEXP, SEXP, SEXP);
 SEXP do_gzcon(SEXP, SEXP, SEXP, SEXP);
diff -Nru r-base-3.2.3/src/include/IOStuff.h r-base-3.3.1/src/include/IOStuff.h
--- r-base-3.2.3/src/include/IOStuff.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/IOStuff.h	2016-01-29 23:15:06.000000000 +0000
@@ -18,6 +18,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef R_IOSTUFF_H
 #define R_IOSTUFF_H
 
diff -Nru r-base-3.2.3/src/include/Parse.h r-base-3.3.1/src/include/Parse.h
--- r-base-3.2.3/src/include/Parse.h	2015-08-25 22:15:23.000000000 +0000
+++ r-base-3.3.1/src/include/Parse.h	2016-01-29 23:15:06.000000000 +0000
@@ -17,6 +17,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef R_PARSE_H
 #define R_PARSE_H
 
diff -Nru r-base-3.2.3/src/include/Print.h r-base-3.3.1/src/include/Print.h
--- r-base-3.2.3/src/include/Print.h	2015-08-25 22:15:21.000000000 +0000
+++ r-base-3.3.1/src/include/Print.h	2016-01-29 23:15:06.000000000 +0000
@@ -18,6 +18,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef PRINT_H_
 #define PRINT_H_
 
diff -Nru r-base-3.2.3/src/include/Rconnections.h r-base-3.3.1/src/include/Rconnections.h
--- r-base-3.2.3/src/include/Rconnections.h	2015-08-25 22:15:23.000000000 +0000
+++ r-base-3.3.1/src/include/Rconnections.h	2016-01-29 23:15:06.000000000 +0000
@@ -17,6 +17,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef R_CONNECTIONS_H_
 #define R_CONNECTIONS_H_
 
diff -Nru r-base-3.2.3/src/include/Rdefines.h r-base-3.3.1/src/include/Rdefines.h
--- r-base-3.2.3/src/include/Rdefines.h	2015-08-25 22:15:21.000000000 +0000
+++ r-base-3.3.1/src/include/Rdefines.h	2016-03-16 23:02:19.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999-2013 The R Core Team.
+ *  Copyright (C) 1999-2016 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,13 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* From 'Writing R Extensions:
+
+   'these are not kept up to date and are not recommended for new projects.'
+
+   As from R 3.3.0 they have been adjusted to work when R_NO_REMAP is defined.
+*/
+
 #ifndef R_DEFINES_H
 #define R_DEFINES_H
 
@@ -48,34 +55,43 @@
 
 #define NULL_USER_OBJECT	R_NilValue
 
-#define AS_LOGICAL(x)		coerceVector(x,LGLSXP)
-#define AS_INTEGER(x)		coerceVector(x,INTSXP)
-#define AS_NUMERIC(x)		coerceVector(x,REALSXP)
-#define AS_CHARACTER(x)		coerceVector(x,STRSXP)
-#define AS_COMPLEX(x)		coerceVector(x,CPLXSXP)
-#define AS_VECTOR(x)		coerceVector(x,VECSXP)
-#define AS_LIST(x)		coerceVector(x,VECSXP)
-#define AS_RAW(x)		coerceVector(x,RAWSXP)
-
-#define IS_LOGICAL(x)		isLogical(x)
-#define IS_INTEGER(x)		isInteger(x)
-#define IS_NUMERIC(x)		isReal(x)
-#define IS_CHARACTER(x)		isString(x)
-#define IS_COMPLEX(x)		isComplex(x)
-/* NB: is this right? It means atomic or VECSXP or EXPRSXP */
-#define IS_VECTOR(x)		isVector(x)
+#define AS_LOGICAL(x)		Rf_coerceVector(x,LGLSXP)
+#define AS_INTEGER(x)		Rf_coerceVector(x,INTSXP)
+#define AS_NUMERIC(x)		Rf_coerceVector(x,REALSXP)
+#define AS_CHARACTER(x)		Rf_coerceVector(x,STRSXP)
+#define AS_COMPLEX(x)		Rf_coerceVector(x,CPLXSXP)
+#define AS_VECTOR(x)		Rf_coerceVector(x,VECSXP)
+#define AS_LIST(x)		Rf_coerceVector(x,VECSXP)
+#define AS_RAW(x)		Rf_coerceVector(x,RAWSXP)
+
+#ifdef USE_RINTERNALS
+// This is not documented to be supported, and may not be in future
+# define IS_LOGICAL(x)		isLogical(x)
+# define IS_INTEGER(x)		isInteger(x)
+# define IS_NUMERIC(x)		isReal(x)
+# define IS_CHARACTER(x)	isString(x)
+# define IS_COMPLEX(x)		isComplex(x)
+#else
+# define IS_LOGICAL(x)		Rf_isLogical(x)
+# define IS_INTEGER(x)		Rf_isInteger(x)
+# define IS_NUMERIC(x)		Rf_isReal(x)
+# define IS_CHARACTER(x)	Rf_isString(x)
+# define IS_COMPLEX(x)		Rf_isComplex(x)
+#endif
+/* NB: is this right?  It means atomic or VECSXP or EXPRSXP */
+#define IS_VECTOR(x)		Rf_isVector(x)
 /* And this cannot be right: isVectorList(x)? */
 #define IS_LIST(x)		IS_VECTOR(x)
 #define IS_RAW(x)		(TYPEOF(x) == RAWSXP)
 
-#define NEW_LOGICAL(n)		allocVector(LGLSXP,n)
-#define NEW_INTEGER(n)		allocVector(INTSXP,n)
-#define NEW_NUMERIC(n)		allocVector(REALSXP,n)
-#define NEW_CHARACTER(n)	allocVector(STRSXP,n)
-#define NEW_COMPLEX(n)		allocVector(CPLXSXP,n)
-#define NEW_LIST(n)		allocVector(VECSXP,n)
+#define NEW_LOGICAL(n)		Rf_allocVector(LGLSXP,n)
+#define NEW_INTEGER(n)		Rf_allocVector(INTSXP,n)
+#define NEW_NUMERIC(n)		Rf_allocVector(REALSXP,n)
+#define NEW_CHARACTER(n)	Rf_allocVector(STRSXP,n)
+#define NEW_COMPLEX(n)		Rf_allocVector(CPLXSXP,n)
+#define NEW_LIST(n)		Rf_allocVector(VECSXP,n)
 #define NEW_STRING(n)		NEW_CHARACTER(n)
-#define NEW_RAW(n)		allocVector(RAWSXP,n)
+#define NEW_RAW(n)		Rf_allocVector(RAWSXP,n)
 
 #define LOGICAL_POINTER(x)	LOGICAL(x)
 #define INTEGER_POINTER(x)	INTEGER(x)
@@ -109,33 +125,33 @@
 #define RECURSIVE_DATA(x)	(VECTOR_PTR(x))
 #define VECTOR_DATA(x)		(VECTOR_PTR(x))
 
-#define LOGICAL_VALUE(x)	asLogical(x)
-#define INTEGER_VALUE(x)	asInteger(x)
-#define NUMERIC_VALUE(x)	asReal(x)
-#define CHARACTER_VALUE(x)	CHAR(asChar(x))
-#define STRING_VALUE(x)		CHAR(asChar(x))
-#define LIST_VALUE(x)		error("the 'value' of a list object is not defined")
-#define RAW_VALUE(x)		error("the 'value' of a raw object is not defined")
+#define LOGICAL_VALUE(x)	Rf_asLogical(x)
+#define INTEGER_VALUE(x)	Rf_asInteger(x)
+#define NUMERIC_VALUE(x)	Rf_asReal(x)
+#define CHARACTER_VALUE(x)	CHAR(Rf_asChar(x))
+#define STRING_VALUE(x)		CHAR(Rf_asChar(x))
+#define LIST_VALUE(x)		Rf_error("the 'value' of a list object is not defined")
+#define RAW_VALUE(x)		Rf_error("the 'value' of a raw object is not defined")
 
 #define SET_ELEMENT(x, i, val)	SET_VECTOR_ELT(x, i, val)
-#define GET_ATTR(x,what)       	getAttrib(x, what)
-#define GET_CLASS(x)       	getAttrib(x, R_ClassSymbol)
-#define GET_DIM(x)       	getAttrib(x, R_DimSymbol)
-#define GET_DIMNAMES(x)       	getAttrib(x, R_DimNamesSymbol)
-#define GET_COLNAMES(x)       	GetColNames(x)
-#define GET_ROWNAMES(x)       	GetRowNames(x)
-#define GET_LEVELS(x)       	getAttrib(x, R_LevelsSymbol)
-#define GET_TSP(x)       	getAttrib(x, R_TspSymbol)
-#define GET_NAMES(x)		getAttrib(x, R_NamesSymbol)
-#define SET_ATTR(x, what, n)     	setAttrib(x, what, n)
-#define SET_CLASS(x, n)     	setAttrib(x, R_ClassSymbol, n)
-#define SET_DIM(x, n)     	setAttrib(x, R_DimSymbol, n)
-#define SET_DIMNAMES(x, n)     	setAttrib(x, R_DimNamesSymbol, n)
-#define SET_LEVELS(x, l)       	setAttrib(x, R_LevelsSymbol, l)
-#define SET_NAMES(x, n)		setAttrib(x, R_NamesSymbol, n)
+#define GET_ATTR(x,what)       	Rf_getAttrib(x, what)
+#define GET_CLASS(x)       	Rf_getAttrib(x, R_ClassSymbol)
+#define GET_DIM(x)       	Rf_getAttrib(x, R_DimSymbol)
+#define GET_DIMNAMES(x)       	Rf_getAttrib(x, R_DimNamesSymbol)
+#define GET_COLNAMES(x)       	Rf_GetColNames(x)
+#define GET_ROWNAMES(x)       	Rf_GetRowNames(x)
+#define GET_LEVELS(x)       	Rf_getAttrib(x, R_LevelsSymbol)
+#define GET_TSP(x)       	Rf_getAttrib(x, R_TspSymbol)
+#define GET_NAMES(x)		Rf_getAttrib(x, R_NamesSymbol)
+#define SET_ATTR(x, what, n)    Rf_setAttrib(x, what, n)
+#define SET_CLASS(x, n)     	Rf_setAttrib(x, R_ClassSymbol, n)
+#define SET_DIM(x, n)     	Rf_setAttrib(x, R_DimSymbol, n)
+#define SET_DIMNAMES(x, n)     	Rf_setAttrib(x, R_DimNamesSymbol, n)
+#define SET_LEVELS(x, l)       	Rf_setAttrib(x, R_LevelsSymbol, l)
+#define SET_NAMES(x, n)		Rf_setAttrib(x, R_NamesSymbol, n)
 /* These do not support long vectors */
-#define GET_LENGTH(x)		length(x)
-#define SET_LENGTH(x, n)	(x = lengthgets(x, n))
+#define GET_LENGTH(x)		Rf_length(x)
+#define SET_LENGTH(x, n)	(x = Rf_lengthgets(x, n))
 
 #define GET_SLOT(x, what)       R_do_slot(x, what)
 #define SET_SLOT(x, what, value)  R_do_slot_assign(x, what, value)
diff -Nru r-base-3.2.3/src/include/Rdynpriv.h r-base-3.3.1/src/include/Rdynpriv.h
--- r-base-3.2.3/src/include/Rdynpriv.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/Rdynpriv.h	2016-03-16 23:02:20.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-12  The R Core Team.
+ *  Copyright (C) 2001-2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 /*****************************************************
  These are internal routines and definitions subject
  to unannounced changes. Do not use for packages, etc.
+ (The header is not installed.)
  
  There is a great deal of repetition in the definitions 
  of the user-level method definitions and in the internal
@@ -33,11 +34,6 @@
 *****************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 #ifdef Win32
 #include <windows.h>
 #define CACHE_DLL_SYM 1
@@ -207,8 +203,4 @@
 DL_FUNC R_dotCallFn(SEXP, SEXP, int);
 SEXP R_doDotCall(DL_FUNC, int, SEXP *, SEXP);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ifdef R_DYNPRIV_H */
diff -Nru r-base-3.2.3/src/include/Rembedded.h r-base-3.3.1/src/include/Rembedded.h
--- r-base-3.2.3/src/include/Rembedded.h	2015-08-25 22:15:23.000000000 +0000
+++ r-base-3.3.1/src/include/Rembedded.h	2016-01-29 23:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2006-8  The R Core Team.
+ *  Copyright (C) 2006-2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,12 +23,12 @@
 #ifndef REMBEDDED_H_
 #define REMBEDDED_H_
 
+#include <R_ext/Boolean.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <R_ext/Boolean.h>
-
 extern int Rf_initEmbeddedR(int argc, char *argv[]);
 extern void Rf_endEmbeddedR(int fatal);
 
@@ -53,12 +53,7 @@
 LibExtern char *R_TempDir;    
 extern void R_SaveGlobalEnv(void);
 
-
-#ifdef unix
-void fpu_setup(Rboolean start);
-#endif
-
-#ifdef Win32
+#ifdef _WIN32
 extern char *getDLLVersion(void), *getRUser(void), *get_R_HOME(void);
 extern void setup_term_ui(void);
 LibExtern int UserBreak;
@@ -67,6 +62,8 @@
 extern int GA_initapp(int, char **);
 extern void GA_appcleanup(void);
 extern void readconsolecfg(void);
+#else
+void fpu_setup(Rboolean start);
 #endif
 
 #ifdef __cplusplus
diff -Nru r-base-3.2.3/src/include/R_ext/Applic.h r-base-3.3.1/src/include/R_ext/Applic.h
--- r-base-3.2.3/src/include/R_ext/Applic.h	2015-08-25 22:15:20.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Applic.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998-2013   The R Core Team
+ *  Copyright (C) 1998-2015   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -84,6 +84,7 @@
 int findInterval(double *xt, int n, double x,
 		 Rboolean rightmost_closed,  Rboolean all_inside, int ilo,
 		 int *mflag);
+// findInterval2() is only in Utils.h (and hence Rinternals.h)
 
 
 /* ------------------ Entry points NOT in the R API --------------- */
diff -Nru r-base-3.2.3/src/include/R_ext/Arith.h r-base-3.3.1/src/include/R_ext/Arith.h
--- r-base-3.2.3/src/include/R_ext/Arith.h	2015-08-25 22:15:18.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Arith.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998--2015  The R Core Team.
+ *  Copyright (C) 1998--2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -24,21 +24,10 @@
 #define R_ARITH_H_
 
 /* 
-   This used to define _BSD_SOURCE to make declarations of finite and
-   isnan visible in glibc.  But that was deprecated in glibc 2.20, and
-   --std=c99 suffices nowadays.
+   This used to define _BSD_SOURCE to make declarations of isfinite
+   and isnan visible in glibc.  But that was deprecated in glibc 2.20,
+   and --std=c99 suffices nowadays.
 */
-#if defined HAVE_FEATURES_H
-# include <features.h>
-# ifdef __GNUC_PREREQ
-#  if __GNUC_PREREQ(2,20) && !defined(_DEFAULT_SOURCE_)
-#   define _DEFAULT_SOURCE 1
-#  endif
-# endif
-#endif
-#if defined(HAVE_GLIBC2) && !defined(_DEFAULT_SOURCE_) && !defined(_BSD_SOURCE)
-# define _BSD_SOURCE 1
-#endif
 
 #include <R_ext/libextern.h>
 #ifdef  __cplusplus
diff -Nru r-base-3.2.3/src/include/R_ext/Callbacks.h r-base-3.3.1/src/include/R_ext/Callbacks.h
--- r-base-3.2.3/src/include/R_ext/Callbacks.h	2015-08-25 22:15:20.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Callbacks.h	2016-03-02 23:02:03.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2 The R Core Team.
+ *  Copyright (C) 2001-2016 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -72,8 +72,8 @@
   separate package on Omegahat and these declarations allow the package
   to interface to the internal R code.
   
-  See http://developer.r-project.org/RObjectTables.pdf,
-  http://www.omegahat.org/RObjectTables/
+  See https://developer.r-project.org/RObjectTables.pdf,
+  http://www.omegahat.net/RObjectTables/
 */
 
 typedef struct  _R_ObjectTable R_ObjectTable;
diff -Nru r-base-3.2.3/src/include/R_ext/Connections.h r-base-3.3.1/src/include/R_ext/Connections.h
--- r-base-3.2.3/src/include/R_ext/Connections.h	2015-08-25 22:15:20.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Connections.h	2016-03-24 23:15:12.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2013   The R Core Team.
+ *  Copyright (C) 2000-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,8 +23,13 @@
 #include <R_ext/Boolean.h>
 
 #ifndef NO_C_HEADERS
-# include <stddef.h> /* for size_t */
-# include <stdarg.h> /* for va_list */
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cstddef>
+#  include <cstdarg>
+# else
+#  include <stddef.h> /* for size_t */
+#  include <stdarg.h> /* for va_list */
+# endif
 #endif
 
 /* IMPORTANT: we do not expect future connection APIs to be
@@ -83,6 +88,7 @@
 SEXP   R_new_custom_connection(const char *description, const char *mode, const char *class_name, Rconnection *ptr);
 size_t R_ReadConnection(Rconnection con, void *buf, size_t n);
 size_t R_WriteConnection(Rconnection con, void *buf, size_t n);
+Rconnection R_GetConnection(SEXP sConn);
 
 #ifdef  __cplusplus
 }
diff -Nru r-base-3.2.3/src/include/R_ext/eventloop.h r-base-3.3.1/src/include/R_ext/eventloop.h
--- r-base-3.2.3/src/include/R_ext/eventloop.h	2015-08-25 22:15:19.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/eventloop.h	2016-03-16 23:02:15.000000000 +0000
@@ -28,9 +28,9 @@
 #define R_EXT_EVENTLOOP_H
 
 #ifndef NO_C_HEADERS
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>	/* for fd_set according to recent POSIX */
-#endif
+# ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>	/* for fd_set according to recent POSIX */
+# endif
 /* NOTE: Needed at least on FreeBSD so that fd_set is defined. */
 # include <sys/types.h>
 #endif
diff -Nru r-base-3.2.3/src/include/R_ext/GraphicsEngine.h r-base-3.3.1/src/include/R_ext/GraphicsEngine.h
--- r-base-3.2.3/src/include/R_ext/GraphicsEngine.h	2015-08-25 22:15:20.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/GraphicsEngine.h	2016-03-16 23:02:15.000000000 +0000
@@ -57,9 +57,16 @@
  *             haveCapture, haveLocator.  (R 2.14.0)
  * Version 10: For R 3.0.0.  Typedef and use 'rcolor',
  *             Remove name2col (R_GE_str2col does the job).
+ * Version 11: For R 3.3.0.
+ *             Official support for saving/restoring display lists
+ *             across R sessions (via recordPlot() and replayPlot())
+ *             - added grid DL to snapshots (used to be NULL)
+ *             - added this version number to snapshots (as attribute)
+ *             - added R version number to snapshots (as attribute)
+ *             - added pkgName to graphics system state info (as attribute)
  */
 
-#define R_GE_version 10
+#define R_GE_version 11
 
 int R_GE_getVersion(void);
 
diff -Nru r-base-3.2.3/src/include/R_ext/Itermacros.h r-base-3.3.1/src/include/R_ext/Itermacros.h
--- r-base-3.2.3/src/include/R_ext/Itermacros.h	2015-08-25 22:15:19.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Itermacros.h	2016-03-16 23:02:15.000000000 +0000
@@ -51,7 +51,27 @@
 	LOOP_WITH_INTERRUPT_CHECK(R_ITERATE_CORE, ncheck, n, i, loop_body); \
     } while (0)
 
-#define MOD_ITERATE_CORE(n, n1, n2, i, i1, i2, loop_body) do {	\
+
+#define MOD_ITERATE1_CORE(n, n1, i, i1, loop_body) do {	\
+	for (; i < n;							\
+	     i1 = (++i1 == n1) ? 0 : i1,				\
+		 ++i) {							\
+	    loop_body							\
+		}							\
+    } while (0)
+
+#define MOD_ITERATE1(n, n1, i, i1, loop_body) do {	\
+	i = i1 = 0;					\
+	MOD_ITERATE1_CORE(n, n1, i, i1, loop_body);	\
+    } while (0)
+
+#define MOD_ITERATE1_CHECK(ncheck, n, n1, i, i1, loop_body) do {	\
+	i = i1 = 0;							\
+	LOOP_WITH_INTERRUPT_CHECK(MOD_ITERATE1_CORE, ncheck, n,		\
+				  n1, i, i1, loop_body);		\
+    } while (0)
+
+#define MOD_ITERATE2_CORE(n, n1, n2, i, i1, i2, loop_body) do {	\
 	for (; i < n;							\
 	     i1 = (++i1 == n1) ? 0 : i1,				\
 		 i2 = (++i2 == n2) ? 0 : i2,				\
@@ -60,17 +80,21 @@
 		}							\
     } while (0)
 
-#define MOD_ITERATE(n, n1, n2, i, i1, i2, loop_body) do {	\
+#define MOD_ITERATE2(n, n1, n2, i, i1, i2, loop_body) do {	\
 	i = i1 = i2 = 0;					\
-	MOD_ITERATE_CORE(n, n1, n2, i, i1, i2, loop_body);	\
+	MOD_ITERATE2_CORE(n, n1, n2, i, i1, i2, loop_body);	\
     } while (0)
 
-#define MOD_ITERATE_CHECK(ncheck, n, n1, n2, i, i1, i2, loop_body) do {	\
+#define MOD_ITERATE2_CHECK(ncheck, n, n1, n2, i, i1, i2, loop_body) do {	\
 	i = i1 = i2 = 0;						\
-	LOOP_WITH_INTERRUPT_CHECK(MOD_ITERATE_CORE, ncheck, n,		\
+	LOOP_WITH_INTERRUPT_CHECK(MOD_ITERATE2_CORE, ncheck, n,		\
 				  n1, n2, i, i1, i2, loop_body);	\
     } while (0)
 
+#define MOD_ITERATE MOD_ITERATE2
+#define MOD_ITERATE_CORE MOD_ITERATE2_CORE
+#define MOD_ITERATE_CHECK MOD_ITERATE2_CHECK
+
 #define MOD_ITERATE3_CORE(n, n1, n2, n3, i, i1, i2, i3, loop_body) do {	\
 	for (; i < n;							\
 	     i1 = (++i1 == n1) ? 0 : i1,				\
diff -Nru r-base-3.2.3/src/include/R_ext/Lapack.h r-base-3.3.1/src/include/R_ext/Lapack.h
--- r-base-3.2.3/src/include/R_ext/Lapack.h	2015-08-25 22:15:17.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Lapack.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2003-2015 The R Core Team.
+ *  Copyright (C) 2003-2016 The R Core Team.
  *  Copyright (C) 2008   The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -36,11 +36,6 @@
 #include <R_ext/Complex.h>	/* for Rcomplex */
 #include <R_ext/BLAS.h>
 
-/* The LAPACK version: might change after installation with
-   external LAPACK
-*/
-extern void F77_NAME(ilaver)(int *major, int *minor, int *patch);
-
 
 /*
   LAPACK function names are [dz]<name>(), where d denotes the real
@@ -52,6 +47,11 @@
 extern "C" {
 #endif
 
+/* The LAPACK version: might change after installation with
+   external LAPACK
+*/
+extern void F77_NAME(ilaver)(int *major, int *minor, int *patch);
+
 // Never defined by R itself.
 #ifndef La_extern
 #define La_extern extern
@@ -244,18 +244,6 @@
 		 double* vr, const int* ldvr, int* ilo, int* ihi,
 		 double* scale, double* abnrm, double* rconde, double* rcondv,
 		 double* work, const int* lwork, int* iwork, int* info);
-/* DGEGV - compute for a pair of n-by-n real nonsymmetric */
-/* matrices A and B, the generalized eigenvalues (alphar +/- */
-/* alphai*i, beta);, and optionally, the left and/or right */
-/* generalized eigenvectors (VL and VR); */
-La_extern void
-F77_NAME(dgegv)(const char* jobvl, const char* jobvr,
-		const int* n, double* a, const int* lda,
-		double* b, const int* ldb,
-		double* alphar, double* alphai,
-		const double* beta, double* vl, const int* ldvl,
-		double* vr, const int* ldvr,
-		double* work, const int* lwork, int* info);
 /* DGEHD2 - reduce a real general matrix A to upper Hessenberg */
 /* form H by an orthogonal similarity transformation */
 La_extern void
@@ -315,11 +303,6 @@
 F77_NAME(dgeqp3)(const int* m, const int* n, double* a, const int* lda,
 		 int* jpvt, double* tau, double* work, const int* lwork,
 		 int* info);
-/* DGEQPF - compute a QR factorization with column pivoting of a */
-/* real M-by-N matrix A */
-La_extern void
-F77_NAME(dgeqpf)(const int* m, const int* n, double* a, const int* lda,
-		 int* jpvt, double* tau, double* work, int* info);
 /* DGEQR2 - compute a QR factorization of a real m by n matrix A */
 La_extern void
 F77_NAME(dgeqr2)(const int* m, const int* n, double* a, const int* lda,
@@ -459,20 +442,6 @@
 		 double* a, const int* lda, double* taua,
 		 double* b, const int* ldb, double* taub,
 		 double* work, const int* lwork, int* info);
-/* DGGSVD - compute the generalized singular value decomposition */
-/* (GSVD) of an M-by-N real matrix A and P-by-N real matrix B */
-La_extern void
-F77_NAME(dggsvd)(const char* jobu, const char* jobv, const char* jobq,
-		 const int* m, const int* n, const int* p,
-		 const int* k, const int* l,
-		 double* a, const int* lda,
-		 double* b, const int* ldb,
-		 const double* alpha, const double* beta,
-		 double* u, const int* ldu,
-		 double* v, const int* ldv,
-		 double* q, const int* ldq,
-		 double* work, int* iwork, int* info);
-
 
 //* Double precision General Tridiagonal matrices  -> DGT
 
@@ -1597,14 +1566,6 @@
 		 const double* a, const int* lda,
 		 double* b, const int* ldb, int* info);
 
-/* DTZRQF - reduce the M-by-N ( M<=N ); real upper trapezoidal */
-/* matrix A to upper triangular form by means of orthogonal */
-/* transformations  */
-La_extern void
-F77_NAME(dtzrqf)(const int* m, const int* n,
-		 double* a, const int* lda,
-		 double* tau, int* info);
-
 
 
 //* Double precision utilities in Lapack 
@@ -1868,14 +1829,6 @@
 		 double* H, const int* ldh, double* wr, double* wi,
 		 const int* iloz, const int* ihiz,
 		 double* z, const int* ldz, int* info);
-/* DLAHRD - reduce the first NB columns of a real general */
-/* n-by-(n-k+1); matrix A so that elements below the k-th */
-/* subdiagonal are zero */
-La_extern void
-F77_NAME(dlahrd)(const int* n, const int* k, const int* nb,
-		 double* a, const int* lda,
-		 double* tau, double* t, const int* ldt,
-		 double* y, const int* ldy);
 /* DLAIC1 - apply one step of incremental condition estimation in */
 /* its simplest version */
 La_extern void
@@ -2238,13 +2191,6 @@
 		 const char* diag, const char* normin,
 		 const int* n, const double* a, const int* lda,
 		 double* x, double* scale, double* cnorm, int* info);
-/* DLATZM - apply a Householder matrix generated by DTZRQF to a */
-/* matrix */
-La_extern void
-F77_NAME(dlatzm)(const char* side, const int* m, const int* n,
-		 const double* v, const int* incv,
-		 const double* tau, double* c1, double* c2,
-		 const int* ldc, double* work);
 /* DLAUU2 - compute the product U * U' or L' * const int* l, where the */
 /* triangular factor U or L is stored in the upper or lower */
 /* triangular part of the array A */
@@ -2377,25 +2323,12 @@
 	int *ldvt, double *q, int *iq, double *work, int * iwork, int *info);
 
 La_extern void
-F77_NAME(dgegs)(char *jobvsl, char *jobvsr, int *n,
-	double *a, int *lda, double *b, int *ldb, double *
-	alphar, double *alphai, double *beta, double *vsl,
-	int *ldvsl, double *vsr, int *ldvsr, double *work,
-	int *lwork, int *info);
-
-La_extern void
 F77_NAME(dgelsd)(int *m, int *n, int *nrhs,
 	double *a, int *lda, double *b, int *ldb, double *
 	s, double *rcond, int *rank, double *work, int *lwork,
 	 int *iwork, int *info);
 
 La_extern void
-F77_NAME(dgelsx)(int *m, int *n, int *nrhs,
-	double *a, int *lda, double *b, int *ldb, int *
-	jpvt, double *rcond, int *rank, double *work, int *
-	info);
-
-La_extern void
 F77_NAME(dgesc2)(int *n, double *a, int *lda,
 	double *rhs, int *ipiv, int *jpiv, double *scale);
 
@@ -2443,14 +2376,6 @@
 	bwork, int *info);
 
 La_extern void
-F77_NAME(dggsvp)(char *jobu, char *jobv, char *jobq, int *m,
-	int *p, int *n, double *a, int *lda, double *b,
-	int *ldb, double *tola, double *tolb, int *k, int
-	*l, double *u, int *ldu, double *v, int *ldv,
-	double *q, int *ldq, int *iwork, double *tau,
-	double *work, int *info);
-
-La_extern void
 F77_NAME(dgtts2)(int *itrans, int *n, int *nrhs,
 	double *dl, double *d, double *du, double *du2,
 	int *ipiv, double *b, int *ldb);
@@ -2896,11 +2821,6 @@
 	Rcomplex *w, int *iloz, int *ihiz, Rcomplex *z,
 	int *ldz, int *info);
 
-La_extern void
-F77_NAME(zlahrd)(int *n, int *k, int *nb,
-	Rcomplex *a, int *lda, Rcomplex *tau, Rcomplex *t,
-	int *ldt, Rcomplex *y, int *ldy);
-
 La_extern double
 F77_NAME(zlange)(char *norm, int *m, int *n, Rcomplex *a, int *lda,
 		 double *work);
@@ -3096,6 +3016,100 @@
         double *rcond, int *rank, 
         Rcomplex *work, int *lwork, double *rwork, int *iwork, int *info);
 
+/* =========================== DEPRECATED ==============================
+
+   Routines below were deprecated in LAPACK 3.6.0, and are not
+   included in a default build of LAPACK.
+
+   Currently dgegv, dgeqpf, dggsvd and dggsvp are included in R, but
+   that may change before release of R 3.3.0.
+ */
+
+/* DGEGV - compute for a pair of n-by-n real nonsymmetric */
+/* matrices A and B, the generalized eigenvalues (alphar +/- */
+/* alphai*i, beta);, and optionally, the left and/or right */
+/* generalized eigenvectors (VL and VR); */
+La_extern void
+F77_NAME(dgegv)(const char* jobvl, const char* jobvr,
+		const int* n, double* a, const int* lda,
+		double* b, const int* ldb,
+		double* alphar, double* alphai,
+		const double* beta, double* vl, const int* ldvl,
+		double* vr, const int* ldvr,
+		double* work, const int* lwork, int* info);
+
+/* DGEQPF - compute a QR factorization with column pivoting of a */
+/* real M-by-N matrix A */
+La_extern void
+F77_NAME(dgeqpf)(const int* m, const int* n, double* a, const int* lda,
+		 int* jpvt, double* tau, double* work, int* info);
+
+/* DGGSVD - compute the generalized singular value decomposition */
+/* (GSVD) of an M-by-N real matrix A and P-by-N real matrix B */
+La_extern void
+F77_NAME(dggsvd)(const char* jobu, const char* jobv, const char* jobq,
+		 const int* m, const int* n, const int* p,
+		 const int* k, const int* l,
+		 double* a, const int* lda,
+		 double* b, const int* ldb,
+		 const double* alpha, const double* beta,
+		 double* u, const int* ldu,
+		 double* v, const int* ldv,
+		 double* q, const int* ldq,
+		 double* work, int* iwork, int* info);
+
+/* DTZRQF - reduce the M-by-N ( M<=N ); real upper trapezoidal */
+/* matrix A to upper triangular form by means of orthogonal */
+/* transformations  */
+La_extern void
+F77_NAME(dtzrqf)(const int* m, const int* n,
+		 double* a, const int* lda,
+		 double* tau, int* info);
+
+/* DLAHRD - reduce the first NB columns of a real general */
+/* n-by-(n-k+1); matrix A so that elements below the k-th */
+/* subdiagonal are zero */
+La_extern void
+F77_NAME(dlahrd)(const int* n, const int* k, const int* nb,
+		 double* a, const int* lda,
+		 double* tau, double* t, const int* ldt,
+		 double* y, const int* ldy);
+
+/* DLATZM - apply a Householder matrix generated by DTZRQF to a */
+/* matrix */
+La_extern void
+F77_NAME(dlatzm)(const char* side, const int* m, const int* n,
+		 const double* v, const int* incv,
+		 const double* tau, double* c1, double* c2,
+		 const int* ldc, double* work);
+
+La_extern void
+F77_NAME(dgegs)(char *jobvsl, char *jobvsr, int *n,
+	double *a, int *lda, double *b, int *ldb, double *
+	alphar, double *alphai, double *beta, double *vsl,
+	int *ldvsl, double *vsr, int *ldvsr, double *work,
+	int *lwork, int *info);
+
+La_extern void
+F77_NAME(dgelsx)(int *m, int *n, int *nrhs,
+	double *a, int *lda, double *b, int *ldb, int *
+	jpvt, double *rcond, int *rank, double *work, int *
+	info);
+
+La_extern void
+F77_NAME(dggsvp)(char *jobu, char *jobv, char *jobq, int *m,
+	int *p, int *n, double *a, int *lda, double *b,
+	int *ldb, double *tola, double *tolb, int *k, int
+	*l, double *u, int *ldu, double *v, int *ldv,
+	double *q, int *ldq, int *iwork, double *tau,
+	double *work, int *info);
+
+La_extern void
+F77_NAME(zlahrd)(int *n, int *k, int *nb,
+	Rcomplex *a, int *lda, Rcomplex *tau, Rcomplex *t,
+	int *ldt, Rcomplex *y, int *ldy);
+
+
 #ifdef	__cplusplus
 }
 #endif
diff -Nru r-base-3.2.3/src/include/R_ext/Memory.h r-base-3.3.1/src/include/R_ext/Memory.h
--- r-base-3.2.3/src/include/R_ext/Memory.h	2015-08-25 22:15:18.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Memory.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998-2007  The R Core Team
+ *  Copyright (C) 1998-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,12 @@
 #define R_EXT_MEMORY_H_
 
 #ifndef NO_C_HEADERS
-# include <stddef.h> /* for size_t */
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cstddef>
+using std::size_t;
+# else
+#  include <stddef.h> /* for size_t */
+# endif
 #endif
 
 #ifdef  __cplusplus
diff -Nru r-base-3.2.3/src/include/R_ext/Rallocators.h r-base-3.3.1/src/include/R_ext/Rallocators.h
--- r-base-3.2.3/src/include/R_ext/Rallocators.h	2015-08-25 22:15:19.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Rallocators.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2014  The R Core Team
+ *  Copyright (C) 2014-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,11 @@
 #define R_EXT_RALLOCATORS_H_
 
 #ifndef NO_C_HEADERS
-# include <stddef.h> /* for size_t */
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cstddef>
+# else
+#  include <stddef.h> /* for size_t */
+# endif
 #endif
 
 /* R_allocator_t typedef is also declared in Rinternals.h 
diff -Nru r-base-3.2.3/src/include/R_ext/Random.h r-base-3.3.1/src/include/R_ext/Random.h
--- r-base-3.2.3/src/include/R_ext/Random.h	2015-08-25 22:15:19.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Random.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998-2014    The R Core Team
+ *  Copyright (C) 1998-2016    The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -22,12 +22,12 @@
 #ifndef R_RANDOM_H
 #define R_RANDOM_H
 
+#include <R_ext/Boolean.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include <R_ext/Boolean.h>
-
 typedef enum {
     WICHMANN_HILL,
     MARSAGLIA_MULTICARRY,
diff -Nru r-base-3.2.3/src/include/R_ext/R-ftp-http.h r-base-3.3.1/src/include/R_ext/R-ftp-http.h
--- r-base-3.2.3/src/include/R_ext/R-ftp-http.h	2015-08-25 22:15:17.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/R-ftp-http.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2014 The R Core Team.
+ *  Copyright (C) 2001-2016 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -28,7 +28,13 @@
   allow for 'large' files (>= 2GB) on 32-bit systems, where supported.
 */
 /* required by C99/C11 */
-#include <stdint.h>
+#ifndef NO_C_HEADERS
+# ifdef __cplusplus
+#  include <cstdint>
+# else
+#  include <stdint.h>
+# endif
+#endif
 typedef int_fast64_t DLsize_t; // used for download lengths and sizes
 
 #ifdef __cplusplus
diff -Nru r-base-3.2.3/src/include/R_ext/RS.h r-base-3.3.1/src/include/R_ext/RS.h
--- r-base-3.2.3/src/include/R_ext/RS.h	2015-08-25 22:15:20.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/RS.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999-2007 The R Core Team.
+ *  Copyright (C) 1999-2016 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,14 @@
 #define R_RS_H
 
 #ifndef NO_C_HEADERS
-# include <string.h>		/* for memcpy, memset */
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cstring>
+#  include <cstddef>
+using std::size_t;
+# else
+#  include <string.h>		/* for memcpy, memset */
+#  include <stddef.h> /* for size_t */
+# endif
 #endif
 
 #include <Rconfig.h>		/* for F77_APPEND_UNDERSCORE */
diff -Nru r-base-3.2.3/src/include/R_ext/Utils.h r-base-3.3.1/src/include/R_ext/Utils.h
--- r-base-3.2.3/src/include/R_ext/Utils.h	2015-08-25 22:15:19.000000000 +0000
+++ r-base-3.3.1/src/include/R_ext/Utils.h	2016-03-16 23:02:15.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998-2012    The R Core Team
+ *  Copyright (C) 1998-2016    The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -27,7 +27,15 @@
 
 #include <R_ext/Boolean.h>
 #include <R_ext/Complex.h>
-#include <stddef.h>
+
+#ifndef NO_C_HEADERS
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cstddef>
+using std::size_t;
+# else
+#  include <stddef.h>
+# endif
+#endif
 
 #define revsort       Rf_revsort
 #define iPsort        Rf_iPsort
@@ -91,6 +99,9 @@
 int findInterval(double *xt, int n, double x,
 		 Rboolean rightmost_closed,  Rboolean all_inside, int ilo,
 		 int *mflag);
+int findInterval2(double *xt, int n, double x,
+		  Rboolean rightmost_closed,  Rboolean all_inside, Rboolean left_open,
+		  int ilo, int *mflag);
 #ifdef R_RS_H
 int F77_SUB(interv)(double *xt, int *n, double *x,
 		    Rboolean *rightmost_closed, Rboolean *all_inside,
diff -Nru r-base-3.2.3/src/include/Rgraphics.h r-base-3.3.1/src/include/Rgraphics.h
--- r-base-3.2.3/src/include/Rgraphics.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/Rgraphics.h	2016-03-16 23:02:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998--2008  R Core Team
+ *  Copyright (C) 1998--2016  R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -21,11 +21,7 @@
 #ifndef RGRAPHICS_H_
 #define RGRAPHICS_H_
 
-/* This was a public header in R < 2.8.0, but no longer */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
+/* Internal header, not installed */
 
 	/* possible coordinate systems (for specifying locations) */
 typedef enum {
@@ -282,8 +278,4 @@
 double xNPCtoUsr(double, pGEDevDesc);
 double yNPCtoUsr(double, pGEDevDesc);
 
-#ifdef  __cplusplus
-}
-#endif
-
 #endif /* RGRAPHICS_H_ */
diff -Nru r-base-3.2.3/src/include/R.h r-base-3.3.1/src/include/R.h
--- r-base-3.2.3/src/include/R.h	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/R.h	2016-05-16 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2013 The R Core Team.
+ *  Copyright (C) 2000-2016 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -25,15 +25,40 @@
 #endif
 
 #ifndef NO_C_HEADERS
-#include <stdlib.h>
-#include <stdio.h>  /* Used by several packages, remove in due course */
-#include <limits.h> /* for INT_MAX */
-#include <math.h>
+/* same as Rmath.h: needed for cospi etc */
+# ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#  define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+# endif
+/* The C++ headers in Solaris Studio are strict C++98, and many 
+   packages fail because of not using e.g. std::round 
+   or using C99 functions such as snprintf. 
+*/
+# ifdef __SUNPRO_CC
+#  define DO_NOT_USE_CXX_HEADERS
+# endif
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cstdlib>
+#  include <cstdio>
+#  include <climits>
+#  include <cmath>
+# else
+#  include <stdlib.h> /* Not used by R itself, but widely assumed in packages */
+#  include <stdio.h>  /* Used by ca 200 packages, but not in R itself */
+#  include <limits.h> /* for INT_MAX */
+#  include <math.h>
+# endif 
+/* 
+   math.h   is also included by R_ext/Arith.h, except in C++ code
+   stddef.h is included by R_ext/Memory.h
+   string.h is included by R_ext/RS.h
+   All guarded by NO_C_HEADERS.
+*/
 # if defined(__sun)
-# undef DO
-# undef DS
-# undef SO
-# undef SS
+/* Solaris' stdlib.h includes a header which defines these (and more) */
+#  undef DO
+#  undef DS
+#  undef SO
+#  undef SS
 # endif
 #endif
 
diff -Nru r-base-3.2.3/src/include/Rinlinedfuns.h r-base-3.3.1/src/include/Rinlinedfuns.h
--- r-base-3.2.3/src/include/Rinlinedfuns.h	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/Rinlinedfuns.h	2016-03-16 23:02:19.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1999-2012  The R Core Team.
+ *  Copyright (C) 1999-2015  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 /* this header is always to be included from others.
    It is only called if COMPILING_R is defined (in util.c) or
    from GNU C systems.
@@ -121,7 +123,6 @@
 */
 INLINE_FUN R_len_t length(SEXP s)
 {
-    int i;
     switch (TYPEOF(s)) {
     case NILSXP:
 	return 0;
@@ -138,12 +139,14 @@
     case LISTSXP:
     case LANGSXP:
     case DOTSXP:
-	i = 0;
+    {
+	int i = 0;
 	while (s != NULL && s != R_NilValue) {
 	    i++;
 	    s = CDR(s);
 	}
 	return i;
+    }
     case ENVSXP:
 	return Rf_envlength(s);
     default:
@@ -151,9 +154,10 @@
     }
 }
 
+R_xlen_t Rf_envxlength(SEXP rho);
+
 INLINE_FUN R_xlen_t xlength(SEXP s)
 {
-    int i;
     switch (TYPEOF(s)) {
     case NILSXP:
 	return 0;
@@ -170,14 +174,17 @@
     case LISTSXP:
     case LANGSXP:
     case DOTSXP:
-	i = 0;
+    {
+	// it is implausible this would be >= 2^31 elements, but allow it
+	R_xlen_t i = 0;
 	while (s != NULL && s != R_NilValue) {
 	    i++;
 	    s = CDR(s);
 	}
 	return i;
+    }
     case ENVSXP:
-	return Rf_envlength(s);
+	return Rf_envxlength(s);
     default:
 	return 1;
     }
diff -Nru r-base-3.2.3/src/include/Rinterface.h r-base-3.3.1/src/include/Rinterface.h
--- r-base-3.2.3/src/include/Rinterface.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/Rinterface.h	2016-03-16 23:02:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998--2015  The R Core Team.
+ *  Copyright (C) 1998--2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,17 +29,25 @@
 #ifndef RINTERFACE_H_
 #define RINTERFACE_H_
 
+// Support for NO_C_HEADERS added in R 3.3.0
 #ifdef __cplusplus
-#include <cstdio>
+# ifndef NO_C_HEADERS
+#  include <cstdio>
+#  ifdef __SUNPRO_CC
+using std::FILE;
+#  endif
+# endif
 extern "C" {
 #else
-#include <stdio.h>
+# ifndef NO_C_HEADERS
+#  include <stdio.h>
+#endif
 #endif
 
 #if defined(__GNUC__) && __GNUC__ >= 3
-#define NORET __attribute__((noreturn))
+# define NORET __attribute__((noreturn))
 #else
-#define NORET
+# define NORET
 #endif
 
 #include <R_ext/Boolean.h>
diff -Nru r-base-3.2.3/src/include/Rinternals.h r-base-3.3.1/src/include/Rinternals.h
--- r-base-3.2.3/src/include/Rinternals.h	2015-08-25 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/include/Rinternals.h	2016-03-16 23:02:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1999-2015   The R Core Team.
+ *  Copyright (C) 1999-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -26,16 +26,23 @@
 #ifndef R_INTERNALS_H_
 #define R_INTERNALS_H_
 
+// Support for NO_C_HEADERS added in R 3.3.0
 #ifdef __cplusplus
-# include <cstdio>
-# ifdef __SUNPRO_CC
+# ifndef NO_C_HEADERS
+#  include <cstdio>
+#  ifdef __SUNPRO_CC
 using std::FILE;
+#  endif
+#  include <climits>
+#  include <cstddef>
 # endif
-# include <climits>
 extern "C" {
 #else
-# include <stdio.h>
-# include <limits.h> /* for INT_MAX */
+# ifndef NO_C_HEADERS
+#  include <stdio.h>
+#  include <limits.h> /* for INT_MAX */
+#  include <stddef.h> /* for ptrdiff_t */
+# endif
 #endif
 
 #include <R_ext/Arith.h>
@@ -356,6 +363,7 @@
   } while (0)
 # define IS_SCALAR(x, type) (TYPEOF(x) == (type) && SHORT_VEC_LENGTH(x) == 1)
 #else
+# define SHORT_VEC_LENGTH(x) (((VECSEXP) (x))->vecsxp.length)
 # define LENGTH(x)	(((VECSEXP) (x))->vecsxp.length)
 # define TRUELENGTH(x)	(((VECSEXP) (x))->vecsxp.truelength)
 # define XLENGTH(x) LENGTH(x)
@@ -440,7 +448,7 @@
 #define CHAR(x)		R_CHAR(x)
 const char *(R_CHAR)(SEXP x);
 
-/* Various tests with macro versions in the USE_RINTERNALS section */
+/* Various tests with macro versions in the second USE_RINTERNALS section */
 Rboolean (Rf_isNull)(SEXP s);
 Rboolean (Rf_isSymbol)(SEXP s);
 Rboolean (Rf_isLogical)(SEXP s);
@@ -527,6 +535,7 @@
 void (SET_NAMED)(SEXP x, int v);
 void SET_ATTRIB(SEXP x, SEXP v);
 void DUPLICATE_ATTRIB(SEXP to, SEXP from);
+void SHALLOW_DUPLICATE_ATTRIB(SEXP to, SEXP from);
 
 /* S4 object testing */
 int (IS_S4_OBJECT)(SEXP x);
@@ -719,6 +728,7 @@
 LibExtern SEXP  R_dot_Method;       /* ".Method" */
 LibExtern SEXP	R_dot_packageName;// ".packageName"
 LibExtern SEXP  R_dot_target;       /* ".target" */
+LibExtern SEXP  R_dot_Generic;      /* ".Generic" */
 
 /* Missing Values - others from Arith.h */
 #define NA_STRING	R_NaString
@@ -810,6 +820,7 @@
 SEXP Rf_installS3Signature(const char *, const char *);
 Rboolean Rf_isFree(SEXP);
 Rboolean Rf_isOrdered(SEXP);
+Rboolean Rf_isUnmodifiedSpecSym(SEXP sym, SEXP env);
 Rboolean Rf_isUnordered(SEXP);
 Rboolean Rf_isUnsorted(SEXP, Rboolean);
 SEXP Rf_lengthgets(SEXP, R_len_t);
@@ -1049,6 +1060,8 @@
 SEXP R_do_slot(SEXP obj, SEXP name);
 SEXP R_do_slot_assign(SEXP obj, SEXP name, SEXP value);
 int R_has_slot(SEXP obj, SEXP name);
+/* S3-S4 class (inheritance), attrib.c */
+SEXP R_S4_extends(SEXP klass, SEXP useTable);
 
 /* class definition, new objects (objects.c) */
 SEXP R_do_MAKE_CLASS(const char *what);
@@ -1090,7 +1103,9 @@
 
 /* C version of R's  indx <- order(..., na.last, decreasing) :
    e.g.  arglist = Rf_lang2(x,y)  or  Rf_lang3(x,y,z) */
-void R_orderVector(int *indx, int n, SEXP arglist, Rboolean nalast, Rboolean decreasing);
+void R_orderVector (int *indx, int n, SEXP arglist, Rboolean nalast, Rboolean decreasing);
+// C version of R's  indx <- order(x, na.last, decreasing) :
+void R_orderVector1(int *indx, int n, SEXP x,       Rboolean nalast, Rboolean decreasing);
 
 #ifndef R_NO_REMAP
 #define acopy_string		Rf_acopy_string
@@ -1185,6 +1200,7 @@
 #define isS4			Rf_isS4
 #define isString		Rf_isString
 #define isTs			Rf_isTs
+#define isUnmodifiedSpecSym	Rf_isUnmodifiedSpecSym
 #define isUnordered		Rf_isUnordered
 #define isUnsorted		Rf_isUnsorted
 #define isUserBinop		Rf_isUserBinop
diff -Nru r-base-3.2.3/src/include/rlocale.h r-base-3.3.1/src/include/rlocale.h
--- r-base-3.2.3/src/include/rlocale.h	2015-09-10 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/include/rlocale.h	2016-01-29 23:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2005-12   The R Core Team
+ *  Copyright (C) 2005-2016   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,29 +17,26 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
 
 /*  This file was contributed by Ei-ji Nakama.
- *  See also the comments in src/main/rlocale.c.
+ *  See also the comments in  ../main/rlocale.c.
 
  *  It does 2 things:
  * (a) supplies wrapper/substitute wc[s]width functions for use in 
  *    character.c, errors.c, printutils.c, devPS.c, RGui console.
  * (b) Defines a replacment for iswctype to be used on Windows, OS X and AIX.
  * in gram.c 
+ *
+ * It is not an installed header.
  */
 
 #ifndef R_LOCALE_H
 #define R_LOCALE_H
 
-#ifndef NO_C_HEADERS
 #include <wchar.h>
 #include <ctype.h>
 #include <wctype.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
 
 /*
  * Windows CJK
@@ -117,7 +114,4 @@
 #define iswctype(__x,__y) Ri18n_iswctype(__x,__y)
 #endif
 
-#ifdef  __cplusplus
-}
-#endif
 #endif /* R_LOCALE_H */
diff -Nru r-base-3.2.3/src/include/Rmath.h0.in r-base-3.3.1/src/include/Rmath.h0.in
--- r-base-3.2.3/src/include/Rmath.h0.in	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/Rmath.h0.in	2016-03-16 23:02:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*- C -*-
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 1998-2015  The R Core Team
+ *  Copyright (C) 1998-2016  The R Core Team
  *  Copyright (C) 2004       The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -31,11 +31,22 @@
 #ifndef RMATH_H
 #define RMATH_H
 
-/* Note that on some systems we need to include math.h before the
-   defines below. */
+/* Note that on some systems you need to include math.h before the
+   defines below. If so, define this yourself. */
 #ifndef NO_C_HEADERS
-# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
-# include <math.h>
+/* needed for cospi etc */
+# ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#  define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+# endif
+/* See the comment in R.h */
+# ifdef __SUNPRO_CC
+#  define DO_NOT_USE_CXX_HEADERS
+# endif
+# if defined(__cplusplus) && !defined(DO_NOT_USE_CXX_HEADERS)
+#  include <cmath>
+# else
+#  include <math.h>
+# endif
 #endif
 
 /*-- Mathlib as part of R --  define this for standalone : */
@@ -259,9 +270,11 @@
 #define lgammafn	Rf_lgammafn
 #define lgammafn_sign	Rf_lgammafn_sign
 #define lgamma1p	Rf_lgamma1p
+#define log1pexp       	Rf_log1pexp
 #define log1pmx		Rf_log1pmx
 #define logspace_add	Rf_logspace_add
 #define logspace_sub	Rf_logspace_sub
+#define logspace_sum	Rf_logspace_sum
 #define pbeta		Rf_pbeta
 #define pbeta_raw	Rf_pbeta_raw
 #define pbinom		Rf_pbinom
@@ -398,7 +411,7 @@
 double  lgamma1p(double);
 double  logspace_add(double, double);
 double  logspace_sub(double, double);
-double  logspace_sum(double *, int);
+double  logspace_sum(const double *, int);
 
 	/* Beta Distribution */
 
@@ -612,7 +625,7 @@
 
    In future these declarations could clash with system headers if
    someone had already included math.h with
-   __STDC_WANT_IEC_60559_TYPES_EXT__ defined.
+   __STDC_WANT_IEC_60559_FUNCS_EXT__ defined.
    We can add a check for that via the value of
    __STDC_IEC_60559_FUNCS__ (>= 201ymmL, exact value not yet known).
 */
diff -Nru r-base-3.2.3/src/include/S.h r-base-3.3.1/src/include/S.h
--- r-base-3.2.3/src/include/S.h	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/S.h	2016-03-16 23:02:19.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2003 The R Core Team.
+ *  Copyright (C) 1997--2016 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -20,6 +20,14 @@
  *  Much of this is from Doug Bates.
  */
 
+/* 
+   This is a legacy header and no longer documented.
+   Code using it should be converted to use R.h
+*/
+
+/* This header includes C headers and so is not safe for inclusion
+   from C++: use R.h instead. */
+
 #ifndef R_S_H
 #define R_S_H
 
@@ -30,7 +38,7 @@
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+# error S.h can not be used from C++ code: use R.h instead
 #endif
 
 #include <stddef.h>
@@ -38,7 +46,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <float.h>
-# include <math.h>
+#include <math.h>
 
 #include <Rconfig.h>
 #include <R_ext/Constants.h>
@@ -75,9 +83,4 @@
 #define call_S call_R
 #endif
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* !R_S_H */
diff -Nru r-base-3.2.3/src/include/Startup.h r-base-3.3.1/src/include/Startup.h
--- r-base-3.2.3/src/include/Startup.h	2015-08-25 22:15:22.000000000 +0000
+++ r-base-3.3.1/src/include/Startup.h	2016-03-16 23:02:19.000000000 +0000
@@ -17,6 +17,8 @@
  *  https://www.R-project.org/Licenses/
  */
 
+/* Internal header, not installed */
+
 #ifndef STARTUP_H_
 #define STARTUP_H_
 
diff -Nru r-base-3.2.3/src/library/base/man/abbreviate.Rd r-base-3.3.1/src/library/base/man/abbreviate.Rd
--- r-base-3.2.3/src/library/base/man/abbreviate.Rd	2015-08-25 22:18:11.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/abbreviate.Rd	2016-03-16 23:03:59.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/abbreviate.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2015 R Core Team
 % Copyright 2008      The R Foundation
 % Distributed under GPL 2 or later
 
@@ -16,7 +16,7 @@
   \item{names.arg}{a character vector of names to be abbreviated, or an
     object to be coerced to a character vector by \code{\link{as.character}}.}
   \item{minlength}{the minimum length of the abbreviations.}
-  \item{use.classes}{logical (currently ignored by \R).}
+  \item{use.classes}{logical: should lowercase characters be removed first?}
   \item{dot}{logical: should a dot (\code{"."}) be appended?}
   \item{strict}{logical: should \code{minlength} be observed strictly?
     Note that setting \code{strict = TRUE} may return \emph{non}-unique
@@ -32,28 +32,27 @@
 \details{
   The default algorithm (\code{method = "left.kept"}) used is similar
   to that of S.  For a single string it works as follows.
-  First all spaces at the beginning of the string are stripped.
+  First spaces at the ends of the string are stripped.
   Then (if necessary) any other spaces are stripped.
-  Next, lower case vowels are removed (starting at the right)
-  followed by lower case consonants.
+  Next, lower case vowels are removed followed by lower case consonants.
   Finally if the abbreviation is still longer than \code{minlength}
-  upper case letters are stripped.
+  upper case letters and symbols are stripped.
 
-  Characters are always stripped from the end of the word first.
-  If an element of \code{names.arg} contains more than one word (words
-  are separated by space) then at least one letter from each word will be
+  Characters are always stripped from the end of the strings first.  If
+  an element of \code{names.arg} contains more than one word (words are
+  separated by spaces) then at least one letter from each word will be
   retained.
 
   Missing (\code{NA}) values are unaltered.
 
   If \code{use.classes} is \code{FALSE} then the only distinction is to
-  be between letters and space.  This has NOT been implemented.
+  be between letters and space.
 }
 \value{
-  A character vector containing abbreviations for the strings in its
-  first argument.  Duplicates in the original \code{names.arg} will be
-  given identical abbreviations.  If any non-duplicated elements have
-  the same \code{minlength} abbreviations then, if \code{method =
+  A character vector containing abbreviations for the character strings
+  in its first argument.  Duplicates in the original \code{names.arg}
+  will be given identical abbreviations.  If any non-duplicated elements
+  have the same \code{minlength} abbreviations then, if \code{method =
   "both.sides"} the basic internal \code{abbreviate()} algorithm is
   applied to the characterwise \emph{reversed} strings; if there are
   still duplicated abbreviations and if \code{strict = FALSE} as by
@@ -63,11 +62,21 @@
 
   The character version of \code{names.arg} is attached to the returned
   value as a names argument: no other attributes are retained.
+
+  If a input element contains non-ASCII characters, the corresponding
+  value will be in UTF-8 and marked as such (see \code{\link{Encoding}}).
 }
 \section{Warning}{
-  This is really only suitable for English, and does not work correctly with
-  non-ASCII characters in multibyte locales.  It will warn if used with
-  non-ASCII characters (and required to reduce the length).
+  If \code{use.classes} is true (the default), this is really only
+  suitable for English, and prior to \R 3.3.0 did not work correctly
+  with non-ASCII characters in multibyte locales.  It will warn if used
+  with non-ASCII characters (and required to reduce the length).
+
+  As from \R 3.3.0 the concept of \sQuote{vowel} is extended from
+  English vowels by including characters which are accented versions of
+  lower-case English vowels (including \sQuote{o with stroke}).  Of
+  course, there are languages (even Western European languages such as
+  Welsh) with other vowels.
 }
 \seealso{
   \code{\link{substr}}.
@@ -83,7 +92,11 @@
 as[which(as == "Mss")]
 \dontshow{stopifnot(which(as == "Mss") == c(21,24,25))
 }
-## method="both.sides" helps:  no 4-letters, and only 4 3-letters:
+## and without distinguishing vowels:
+st.abb2 <- abbreviate(state.name, 2, FALSE)
+cbind(st.abb, st.abb2)[st.abb2 != st.abb, ]
+
+## method = "both.sides" helps:  no 4-letters, and only 4 3-letters:
 st.ab2 <- abbreviate(state.name, 2, method = "both")
 table(nchar(st.ab2))
 ## Compare the two methods:
diff -Nru r-base-3.2.3/src/library/base/man/all.equal.Rd r-base-3.3.1/src/library/base/man/all.equal.Rd
--- r-base-3.2.3/src/library/base/man/all.equal.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/all.equal.Rd	2016-03-17 23:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/all.equal.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{all.equal}
@@ -25,7 +25,7 @@
 all.equal(target, current, \dots)
 
 \method{all.equal}{numeric}(target, current,
-          tolerance = .Machine$double.eps ^ 0.5, scale = NULL,
+          tolerance = sqrt(.Machine$double.eps), scale = NULL,
           \dots, check.attributes = TRUE)
 
 \method{all.equal}{list}(target, current, \dots,
diff -Nru r-base-3.2.3/src/library/base/man/args.Rd r-base-3.3.1/src/library/base/man/args.Rd
--- r-base-3.2.3/src/library/base/man/args.Rd	2015-08-25 22:17:57.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/args.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/args.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2007, 2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{args}
@@ -39,11 +39,28 @@
   Wadsworth & Brooks/Cole.
 }
 \seealso{
-  \code{\link{formals}},
-  \code{\link{help}}.
+  \code{\link{formals}}, \code{\link{help}};
+  \code{\link{str}} also prints the argument list of a function.
 }
 \examples{
-args(c)
+## "regular" (non-primitive) functions "print their arguments"
+## (by returning another function with NULL body which you also see):
+args(ls)
 args(graphics::plot.default)
+utils::str(ls) # (just "prints": does not show a NULL)
+
+## You can also pass a string naming a function.
+args("scan")
+## ...but :: package specification doesn't work in this case.
+tryCatch(args("graphics::plot.default"), error = print)
+
+## As explained above, args() gives a function with empty body:
+list(is.f = is.function(args(scan)), body = body(args(scan)))
+
+## Primitive functions mostly behave like non-primitive functions.
+args(c)
+args(`+`)
+## primitive functions without well-defined argument list return NULL:
+args(`if`)
 }
 \keyword{documentation}
diff -Nru r-base-3.2.3/src/library/base/man/as.data.frame.Rd r-base-3.3.1/src/library/base/man/as.data.frame.Rd
--- r-base-3.2.3/src/library/base/man/as.data.frame.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/as.data.frame.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,9 +1,10 @@
 % File src/library/base/man/as.data.frame.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{as.data.frame}
+\title{Coerce to a Data Frame}
 \alias{as.data.frame}
 \alias{is.data.frame}
 \alias{as.data.frame.AsIs}
@@ -26,9 +27,6 @@
 \alias{as.data.frame.array}
 \alias{as.data.frame.difftime}
 
-\title{
-  Coerce to a Data Frame
-}
 \description{
   Functions to check if an object is a data frame, or coerce it if possible.
 }
@@ -38,6 +36,10 @@
 \method{as.data.frame}{character}(x, \dots,
               stringsAsFactors = default.stringsAsFactors())
 
+\method{as.data.frame}{list}(x, row.names = NULL, optional = FALSE, \dots,
+              cut.names = FALSE, col.names = names(x), fix.empty.names = TRUE,
+              stringsAsFactors = default.stringsAsFactors())
+
 \method{as.data.frame}{matrix}(x, row.names = NULL, optional = FALSE, \dots,
               stringsAsFactors = default.stringsAsFactors())
 
@@ -49,10 +51,20 @@
     names for the data frame.  Missing values are not allowed.}
   \item{optional}{logical. If \code{TRUE}, setting row names and
     converting column names (to syntactic names: see
-    \code{\link{make.names}}) is optional.}
+    \code{\link{make.names}}) is optional.  Note that all of \R's
+    \pkg{base} package \code{as.data.frame()} methods use
+    \code{optional} only for column names treatment, basically with the
+    meaning of \code{\link{data.frame}(*, check.names = !optional)}.}
   \item{\dots}{additional arguments to be passed to or from methods.}
   \item{stringsAsFactors}{logical: should the character vector be converted
     to a factor?}
+  %% list method:
+  \item{cut.names}{logical or integer; indicating if column names with
+    more than 256 (or \code{cut.names} if that is numeric) characters
+    should be shortened (and the last 6 characters replaced by \code{" ..."}).}
+  \item{col.names}{(optional) character vector of column names.}
+  \item{fix.empty.names}{logical indicating if empty column names, i.e.,
+    \code{""} should be fixed up (in \code{\link{data.frame}}) or not.}
 }
 \value{
   \code{as.data.frame} returns a data frame, normally with all row names
@@ -65,7 +77,7 @@
 \details{
   \code{as.data.frame} is a generic function with many methods, and
   users and packages can supply further methods.  For classes that act
-  as vectors, often a copy of \code{as.data.frame.vector} will work 
+  as vectors, often a copy of \code{as.data.frame.vector} will work
   as the method.
 
   If a list is supplied, each element is converted to a column in the
diff -Nru r-base-3.2.3/src/library/base/man/assignOps.Rd r-base-3.3.1/src/library/base/man/assignOps.Rd
--- r-base-3.2.3/src/library/base/man/assignOps.Rd	2015-08-25 22:17:58.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/assignOps.Rd	2016-05-17 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/assignOps.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{assignOps}
@@ -37,7 +37,7 @@
   or as one of the subexpressions in a braced list of expressions.
 
   The operators \code{<<-} and \code{->>} are normally only used in
-  functions, and cause a search to made through parent environments
+  functions, and cause a search to be made through parent environments
   for an existing definition of the variable being assigned.  If such
   a variable is found (and its binding is not locked) then its value
   is redefined, otherwise assignment takes place in the global
@@ -68,8 +68,9 @@
 }
 
 \seealso{
-  \code{\link{assign}}, for \dQuote{subassignment} such
-  as \code{x[i] <- v}, \code{\link{[<-}}; % ./Extract.Rd
-  \code{\link{environment}}.
+  \code{\link{assign}} (and its inverse \code{\link{get}}),
+  for \dQuote{subassignment} such as \code{x[i] <- v},
+  see \code{\link{[<-}}; % ./Extract.Rd
+  further, \code{\link{environment}}.
 }
 \keyword{data}
diff -Nru r-base-3.2.3/src/library/base/man/assign.Rd r-base-3.3.1/src/library/base/man/assign.Rd
--- r-base-3.2.3/src/library/base/man/assign.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/assign.Rd	2016-05-17 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/assign.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{assign}
@@ -72,7 +72,7 @@
 
 \seealso{
   \code{\link{<-}},
-  \code{\link{get}},
+  \code{\link{get}}, the inverse of \code{assign()},
   \code{\link{exists}},
   \code{\link{environment}}.
 }
diff -Nru r-base-3.2.3/src/library/base/man/attach.Rd r-base-3.3.1/src/library/base/man/attach.Rd
--- r-base-3.2.3/src/library/base/man/attach.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/attach.Rd	2016-03-01 23:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/attach.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{attach}
@@ -73,7 +73,7 @@
 
   There are hooks to attach user-defined table objects of class
   \code{"UserDefinedDatabase"}, supported by the Omegahat package
-  \pkg{RObjectTables}.  See \url{http://www.omegahat.org/RObjectTables/}.
+  \pkg{RObjectTables}.  See \url{http://www.omegahat.net/RObjectTables/}.
 }
 
 \value{
diff -Nru r-base-3.2.3/src/library/base/man/base-defunct.Rd r-base-3.3.1/src/library/base/man/base-defunct.Rd
--- r-base-3.2.3/src/library/base/man/base-defunct.Rd	2015-08-25 22:17:52.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/base-defunct.Rd	2016-03-02 23:02:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/base-defunct.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{base-defunct}
@@ -189,7 +189,7 @@
   references to the same object.  There is no direct replacement.  Where
   multiple references to a single object are required for semantic
   reasons consider using environments or external pointers.  There are
-  some notes on \url{http://developer.r-project.org}.
+  some notes on \url{https://developer.r-project.org}.
 
   \code{.Dyn.libs} and \code{.lib.loc} were internal variables used for
   storing and manipulating the information about packages with DLLs, and
diff -Nru r-base-3.2.3/src/library/base/man/base-internal.Rd r-base-3.3.1/src/library/base/man/base-internal.Rd
--- r-base-3.2.3/src/library/base/man/base-internal.Rd	2015-08-25 22:17:41.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/base-internal.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/base-internal.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{base-internal}
@@ -52,8 +52,8 @@
 \alias{.C_R_stopbcprof}
 
 \title{Internal Objects in Package \pkg{base}}
-\description{
-  Internal objects in the base package which are only user-visible
+\description{% 'most': see e.g., .mapply
+  Internal objects in the base package most of which are only user-visible
   because of the special nature of the base namespace.
 }
 \usage{
diff -Nru r-base-3.2.3/src/library/base/man/bindenv.Rd r-base-3.3.1/src/library/base/man/bindenv.Rd
--- r-base-3.2.3/src/library/base/man/bindenv.Rd	2015-08-25 22:17:53.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/bindenv.Rd	2016-05-17 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/bindenv.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{bindenv}
@@ -30,7 +30,7 @@
   \item{fun}{a function taking zero or one arguments.}
 }
 \description{
-  These functions represent an experimental interface for adjustments
+  These functions represent an interface for adjustments
   to environments and bindings within environments.  They allow for
   locking environments as well as individual bindings, and for linking
   a variable to a function.
diff -Nru r-base-3.2.3/src/library/base/man/body.Rd r-base-3.3.1/src/library/base/man/body.Rd
--- r-base-3.2.3/src/library/base/man/body.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/body.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/body.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{body}
@@ -60,5 +60,8 @@
 body(f) <- as.call(c(as.name("{"), e))
 f
 f(8)
+%% Rd parser bug? : need to backslash-escape the "{" below:
+## Using substitute() may be simpler than 'as.call(c(as.name("\{",..)))':
+stopifnot(identical(body(f), substitute({ y <- x^2; return(y) })))
 }
 \keyword{programming}
diff -Nru r-base-3.2.3/src/library/base/man/capabilities.Rd r-base-3.3.1/src/library/base/man/capabilities.Rd
--- r-base-3.2.3/src/library/base/man/capabilities.Rd	2015-11-19 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/capabilities.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -58,11 +58,11 @@
 #endif
   \item{http/ftp}{does the internal method for \code{\link{url}} and
     \code{\link{download.file}} support \samp{http://} and \samp{ftp://}
-    URLs?}
-  \item{sockets}{are \code{\link{make.socket}} and related functions
-    available?}
+    URLs?  Always \code{TRUE} as from \R 3.3.0.}
+  \item{sockets}{are  \code{\link{make.socket}} and related functions
+    available?  Always \code{TRUE} as from \R 3.3.0.}
   \item{libxml}{is there support for integrating \code{libxml} with
-    the \R event loop?}
+    the \R event loop?  Always \code{TRUE} as from \R 3.3.0.}
   \item{fifo}{are FIFO \link{connections} supported?}
   \item{cledit}{is command-line editing available in the current \R
     session?  This is false in non-interactive sessions.
@@ -103,7 +103,8 @@
 
   \item{libcurl}{is \code{libcurl} available in this build?  Used by
     function \code{\link{curlGetHeaders}} and optionally by
-    \code{\link{download.file}} and \code{\link{url}}.}
+    \code{\link{download.file}} and \code{\link{url}}.   As from \R
+    3.3.0 always true for Unix-alikes, and true for CRAN Windows builds.}
 }
 \seealso{\code{\link{.Platform}} and \code{\link{extSoftVersion}} (and
     links there) for availability capabilities \emph{external} to \R but
@@ -112,8 +113,8 @@
 \examples{
 capabilities()
 
-if(!capabilities("http/ftp"))
-   warning("internal download.file() method is not available")
+if(!capabilities("ICU"))
+   warning("ICU is not available")
 
 ## See also the examples for 'connections'.
 }
diff -Nru r-base-3.2.3/src/library/base/man/cbind.Rd r-base-3.3.1/src/library/base/man/cbind.Rd
--- r-base-3.2.3/src/library/base/man/cbind.Rd	2015-08-25 22:17:57.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/cbind.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/cbind.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{cbind}
@@ -20,7 +20,8 @@
 \usage{
 cbind(\dots, deparse.level = 1)
 rbind(\dots, deparse.level = 1)
-\method{rbind}{data.frame}(\dots, deparse.level = 1, make.row.names = TRUE)
+\method{rbind}{data.frame}(\dots, deparse.level = 1, make.row.names = TRUE,
+      stringsAsFactors = default.stringsAsFactors())
 }
 \arguments{
   \item{\dots}{(generalized) vectors or matrices.  These can be given as named
@@ -37,6 +38,9 @@
   \item{make.row.names}{(only for data frame method:) logical
     indicating if unique and valid \code{\link{row.names}} should be
     constructed from the arguments.}
+  \item{stringsAsFactors}{logical, passed to \code{\link{as.data.frame}};
+    only has an effect when the \code{\dots} arguments contain a
+    (non-\code{data.frame}) \code{\link{character}}.}
 }
 \details{
   The functions \code{cbind} and \code{rbind} are S3 generic, with
@@ -195,8 +199,8 @@
 ## Testing a semi-official use:
 d2 <- rbind.data.frame(as.list(df), as.list(new))
 d3 <- rbind.data.frame(as.list(df), as.list(new), make.row.names=FALSE)
-stopifnot(identical(.row_names_info(d3), -13L),
-          attr(d2, "row.names")[c(1,13)] == c("13", "131"))
+stopifnot(identical(.row_names_info(d3), -13L))
+## no longer: attr(d2, "row.names")[c(1,13)] == c("13", "131"))
 row.names(d2) <- attr(d3, "row.names")# = 1:13
 stopifnot(identical(d2, d3))
 }
diff -Nru r-base-3.2.3/src/library/base/man/charmatch.Rd r-base-3.3.1/src/library/base/man/charmatch.Rd
--- r-base-3.2.3/src/library/base/man/charmatch.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/charmatch.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/charmatch.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{charmatch}
@@ -43,6 +43,7 @@
 \seealso{
   \code{\link{pmatch}}, \code{\link{match}}.
 
+  \code{\link{startsWith}} for another matching of initial parts of strings;
   \code{\link{grep}} or \code{\link{regexpr}} for more general (regexp)
   matching of strings.
 }
diff -Nru r-base-3.2.3/src/library/base/man/chkDots.Rd r-base-3.3.1/src/library/base/man/chkDots.Rd
--- r-base-3.2.3/src/library/base/man/chkDots.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/chkDots.Rd	2016-03-16 23:04:01.000000000 +0000
@@ -0,0 +1,35 @@
+\name{chkDots}
+\alias{chkDots}
+\title{Warn About Extraneous Arguments in the "..." of Its Caller}
+\description{
+  Warn about extraneous arguments in the \code{...} of its caller.  A
+  utility to be used e.g., in S3 methods which need a formal \code{...}
+  argument but do not make any use of it.  This helps catching user
+  errors in calling the function in question (which is the caller of
+  \code{chkDots()}.
+}
+\usage{
+chkDots(..., which.call = -1, allowed = character(0))
+}
+\arguments{
+  \item{...}{\dQuote{the dots}, as passed from the caller.}
+  \item{which.call}{passed to \code{\link{sys.call}()}.  A caller may
+    use -2 if the message should mention \emph{its} caller.}
+  \item{allowed}{not yet implemented: character vector of \emph{named}
+    elements in \code{...} which are \dQuote{allowed} and hence not
+    warned about.}
+}
+\author{Martin Maechler, first version outside base, June 2012.}
+\seealso{
+  \code{\link{warning}},  \code{\link{...}}.
+}
+\examples{
+seq.default ## <- you will see  ' chkDots(...) '
+
+seq(1,5, foo = "bar") # gives warning via chkDots()
+
+## warning with more than one ...-entry:
+density.f <- function(x, ...) NextMethod("density")
+x <- density(structure(rnorm(10), class="f"), bar=TRUE, baz=TRUE)
+}
+\keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/colSums.Rd r-base-3.3.1/src/library/base/man/colSums.Rd
--- r-base-3.2.3/src/library/base/man/colSums.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/colSums.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/colSums.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{colSums}
@@ -14,7 +14,7 @@
 \alias{.rowMeans}
 \title{Form Row and Column Sums and Means}
 \description{
-  Form row and column sums and means for numeric arrays.
+  Form row and column sums and means for numeric arrays (or data frames).
 }
 \usage{
 colSums (x, na.rm = FALSE, dims = 1)
@@ -22,22 +22,24 @@
 colMeans(x, na.rm = FALSE, dims = 1)
 rowMeans(x, na.rm = FALSE, dims = 1)
 
-.colSums(X, m, n, na.rm = FALSE)
-.rowSums(X, m, n, na.rm = FALSE)
-.colMeans(X, m, n, na.rm = FALSE)
-.rowMeans(X, m, n, na.rm = FALSE)
+.colSums(x, m, n, na.rm = FALSE)
+.rowSums(x, m, n, na.rm = FALSE)
+.colMeans(x, m, n, na.rm = FALSE)
+.rowMeans(x, m, n, na.rm = FALSE)
 }
 \arguments{
   \item{x}{an array of two or more dimensions, containing numeric,
-    complex, integer or logical values, or a numeric data frame.}
+    complex, integer or logical values, or a numeric data frame.  For
+    \code{.colSums()} etc, a numeric, integer or logical matrix (or
+    vector of length \code{m * n}).}
   \item{na.rm}{logical.  Should missing values (including \code{NaN})
     be omitted from the calculations?}
   \item{dims}{integer: Which dimensions are regarded as \sQuote{rows} or
     \sQuote{columns} to sum over.  For \code{row*}, the sum or mean is
     over dimensions \code{dims+1, \dots}; for \code{col*} it is over
     dimensions \code{1:dims}.}
-  \item{X}{a numeric matrix.}
-  \item{m, n}{the dimensions of X.}
+  \item{m, n}{the dimensions of the matrix \code{x} for
+    \code{.colSums()} etc.}
 }
 \details{
   These functions are equivalent to use of \code{\link{apply}} with
@@ -54,9 +56,9 @@
   them with \code{\link{na.omit}} or \code{\link{complete.cases}}
   (possibly on the transpose of \code{x}).
 
-  The versions with an initial dot in the name are \sQuote{bare-bones}
-  versions for use in programming: they apply only to numeric matrices
-  and do not name the result.
+  The versions with an initial dot in the name (\code{.colSums()} etc)
+  are \sQuote{bare-bones} versions for use in programming: they apply
+  only to numeric (like) matrices and do not name the result.
 }
 \value{
   A numeric or complex array of suitable size, or a vector if the result
diff -Nru r-base-3.2.3/src/library/base/man/complex.Rd r-base-3.3.1/src/library/base/man/complex.Rd
--- r-base-3.2.3/src/library/base/man/complex.Rd	2015-08-25 22:17:53.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/complex.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,10 +1,10 @@
 % File src/library/base/man/complex.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2010 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{complex}
-\title{Complex Vectors}
+\title{Complex Numbers and Basic Functionality}
 \alias{complex}
 \alias{as.complex}
 \alias{is.complex}
@@ -14,7 +14,8 @@
 \alias{Arg}
 \alias{Conj}
 \description{
-  Basic functions which support complex arithmetic in R.
+  Basic functions which support complex arithmetic in \R, in addition to
+  the arithmetic operators \code{+}, \code{-}, \code{*}, \code{/}, and \code{^}.
 }
 \usage{
 complex(length.out = 0, real = numeric(), imaginary = numeric(),
@@ -48,8 +49,15 @@
 
   \code{as.complex} attempts to coerce its argument to be of complex
   type: like \code{\link{as.vector}} it strips attributes including
-  names.  All forms of \code{NA} and \code{NaN} are coerced to a complex
-  \code{NA}, for which both the real and imaginary parts are \code{NA}.
+  names.  Up to \R versions 3.2.x, all forms of \code{NA} and \code{NaN}
+  were coerced to a complex \code{NA}, i.e., the \code{\link{NA_complex_}}
+  constant, for which both the real and imaginary parts are \code{NA}.
+  Since \R 3.3.0, typically only objects which are \code{NA} in parts
+  are coerced to complex \code{NA}, but others with \code{NaN} parts,
+  are \emph{not}.  As a consequence, complex arithmetic where only
+  \code{NaN}'s (but no \code{NA}'s) are involved typically will
+  \emph{not} give complex \code{NA} but complex numbers with real or
+  imaginary parts of \code{NaN}.
 
   Note that \code{is.complex} and \code{is.numeric} are never both
   \code{TRUE}.
@@ -67,14 +75,36 @@
   individually or \emph{via} the \code{\link[=S3groupGeneric]{Complex}}
   group generic.
 
-  In addition, the elementary trigonometric, logarithmic, exponential,
-  square root and hyperbolic functions are implemented for complex
-  values.
+  In addition to the arithmetic operators (see \link{Arithmetic})
+  \code{+}, \code{-}, \code{*}, \code{/}, and \code{^}, the elementary
+  trigonometric, logarithmic, exponential, square root and hyperbolic
+  functions are implemented for complex values.
+
+  Matrix multiplications (\code{\link{\%*\%}}, \code{\link{crossprod}},
+  \code{\link{tcrossprod}}) are also defined for complex matrices
+  (\code{\link{matrix}}), and so are \code{\link{solve}},
+  \code{\link{eigen}} or \code{\link{svd}}.
 
   Internally, complex numbers are stored as a pair of \link{double}
-  precision numbers, either or both of which can be \code{\link{NaN}} or
+  precision numbers, either or both of which can be \code{\link{NaN}}
+  (including \code{NA}, see \code{\link{NA_complex_}} and above) or
   plus or minus infinity.
 }
+\note{
+  Operations and functions involving complex \code{\link{NaN}} mostly
+  rely on the C library's handling of \samp{double complex} arithmetic,
+  which typically returns \code{complex(re=NaN, im=NaN)} (but we have
+  not seen a guarantee for that).
+  For \code{+} and \code{-}, \R's own handling works strictly
+  \dQuote{coordinate wise}.
+
+  Operations involving complex \code{NA}, i.e., \code{\link{NA_complex_}}, return
+  \code{\link{NA_complex_}}.
+}
+\seealso{
+  \code{\link{Arithmetic}}; \code{\link{polyroot}} finds all \eqn{n}
+  complex roots of a polynomial of degree \eqn{n}.
+}
 \section{S4 methods}{
   \code{as.complex} is primitive and can have S4 methods set.
 
@@ -108,5 +138,15 @@
      main = expression(paste("Rotation by "," ", pi == 180^o)))
 abline(h = 0, v = 0, col = "blue", lty = 3)
 points(zz.shift, col = "orange")
+
+showC <- function(z) noquote(sprintf("(R = \%g, I = \%g)", Re(z), Im(z)))
+
+## The exact result of this *depends* on the platform, compiler, math-library:
+(NpNA <- NaN + NA_complex_) ; str(NpNA) # *behaves* as 'cplx NA' ..
+stopifnot(is.na(NpNA), is.na(NA_complex_), is.na(Re(NA_complex_)), is.na(Im(NA_complex_)))
+showC(NpNA)# but not always is {shows  '(R = NaN, I = NA)' on some platforms}
+## and this is not TRUE everywhere:
+identical(NpNA, NA_complex_)
+showC(NA_complex_) # always == (R = NA, I = NA)
 }
 \keyword{complex}
diff -Nru r-base-3.2.3/src/library/base/man/connections.Rd r-base-3.3.1/src/library/base/man/connections.Rd
--- r-base-3.2.3/src/library/base/man/connections.Rd	2015-09-02 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/connections.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/connections.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{connections}
@@ -41,10 +41,12 @@
 }
 \usage{
 file(description = "", open = "", blocking = TRUE,
-     encoding = getOption("encoding"), raw = FALSE)
+     encoding = getOption("encoding"), raw = FALSE,
+     method = getOption("url.method", "default"))
 
 url(description, open = "", blocking = TRUE,
-    encoding = getOption("encoding"), method)
+    encoding = getOption("encoding"),
+    method = getOption("url.method", "default"))
 
 gzfile(description, open = "", encoding = getOption("encoding"),
        compression = 6)
@@ -94,6 +96,7 @@
     \sQuote{file} may not be seekable.}
   \item{method}{character string, partially matched to
     \code{c("default", "internal", "wininet", "libcurl")}:
+%% FIXME:  Consider  "auto", as in download.file()
     see \sQuote{Details}.}
   \item{compression}{integer in 0--9.  The amount of compression to be
     applied when writing, from none to maximal available.  For
@@ -131,21 +134,16 @@
   (such as \samp{http://}, \samp{https://}, \samp{ftp://} or
   \samp{file://}).  Method \code{"internal"} is that available since
   connections were introduced, method \code{"wininet"} is only available
-  on Windows and method \code{"libcurl"} is optionally supported as from
-  \R 3.2.0.  Method \code{"default"} (as from \R 3.2.0) selects a
-  suitable method depending on the URL scheme, e.g.\sspace{} method
-  \code{"libcurl"} for \samp{https://} and \samp{ftps://} URLs and
-  \code{"internal"} otherwise.  The default method can be changed
-  \emph{via} \code{\link{options}(url.method = )} (including for when
-  URLs are passed to \code{file}): if unset it is method
-  \code{"default"}.  Proxies can be specified: see
+  on Windows (it uses the WinINet functions of that OS) and method
+  \code{"libcurl"} (using the library of that name:
+  \url{http://curl.haxx.se/libcurl/}) is required on a Unix-alike but
+  optional on Windows.  Method \code{"default"} uses method
+  \code{"internal"} for \samp{file:} URLs and \code{"libcurl"} for
+  \code{ftps:} URLs.  On a Unix-alike it uses \code{"internal"} for
+  \samp{http:} and \code{ftp:} URLs and \code{"libcurl"} for
+  \samp{https:} URLs; on Windows \code{"wininet"} for \samp{http:},
+  \code{ftp:} and \samp{https:} URLs.  Proxies can be specified: see
   \code{\link{download.file}}.
-  
-#ifdef windows
-  (See \code{\link{setInternet2}}, which chooses whether the
-  \code{"internal"} method is mapped to \code{"wininet"}: this is
-  true by default as from \R 3.2.2.)
-#endif
 
   For \code{gzfile} the description is the path to a file compressed by
   \command{gzip}: it can also open for reading uncompressed files and
@@ -166,13 +164,9 @@
   from.  This is run in a shell, on Windows that specified by the
   \env{COMSPEC} environment variable.
 
-  For \code{fifo} the description is the path of the fifo.
-
-  All platforms support \code{file}, \code{pipe}, \code{gzfile},
-  \code{bzfile}, \code{xzfile}, \code{unz} and \code{url("file://")}
-  connections.  The other connections may be partially implemented or
-  not implemented at all.  (They do work on most Unix platforms, and all
-  on Windows.)
+  For \code{fifo} the description is the path of the fifo.  (Support for
+  \code{fifo} connections is optional but they are available on most
+  Unix platforms and on Windows.)
 
   The intention is that \code{file} and \code{gzfile} can be used
   generally for text input (from files, \samp{http://} and
@@ -206,13 +200,13 @@
 }
 
 \section{URLs}{
-  \code{url} and \code{file} support URL schemes \samp{http://},
-  \samp{https://}, \samp{ftp://} and \samp{file://}: the first three
-  require OS support (which all known \R platforms have).
+  \code{url} and \code{file} support URL schemes \samp{file://},
+  \samp{http://}, \samp{https://} and \samp{ftp://}.
 
   \code{method = "libcurl"} allows more schemes: exactly which schemes
-  is platform-dependent (see \code{\link{libcurlVersion}}), but most
-  platforms will support \samp{https://} and \samp{ftps://}.
+  is platform-dependent (see \code{\link{libcurlVersion}}), but all
+  Unix-alike platforms will support \samp{https://} and most platforms
+  will support \samp{ftps://}.
 
   Most methods do not percent-encode special characters such as spaces
   in \samp{http://} URLs (see \code{\link{URLencode}}), but it seems the
@@ -395,7 +389,11 @@
   \url{https://en.wikipedia.org/wiki/UTF-16}: the use of characters in
   the \sQuote{Supplementary Planes} which need surrogate pairs is very
   rare so \code{"UCS-2LE"} is an appropriate first choice (as it is more
-  widely implemented).
+  widely implemented).  
+  
+  One caveat:  \R's implementation of \code{"UCS-2LE"} and similar for 
+  output does not currently work on Windows, and on Unix it will default 
+  to Unix-style line endings.  We recommend use of \code{UTF-8} instead.
 
   As from \R 3.0.0 the encoding \code{"UTF-8-BOM"} is accepted for
   reading and will remove a Byte Order Mark if present (which it often
@@ -530,8 +528,8 @@
   \code{\link{writeBin}}, \code{\link{writeChar}}, \code{\link{load}}
   and \code{\link{save}}.
 
-  \code{\link{capabilities}} to see if HTTP/FTP \code{url},
-  \code{fifo} and \code{socketConnection} are supported by this build of \R.
+  \code{\link{capabilities}} to see if \code{fifo} connections are
+  supported by this build of \R.
 
   \code{\link{gzcon}} to wrap \command{gzip} (de)compression around a
   connection.
diff -Nru r-base-3.2.3/src/library/base/man/Control.Rd r-base-3.3.1/src/library/base/man/Control.Rd
--- r-base-3.2.3/src/library/base/man/Control.Rd	2015-08-25 22:17:53.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Control.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/Control.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Control}
diff -Nru r-base-3.2.3/src/library/base/man/Cstack_info.Rd r-base-3.3.1/src/library/base/man/Cstack_info.Rd
--- r-base-3.2.3/src/library/base/man/Cstack_info.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Cstack_info.Rd	2016-02-08 23:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/Cstack_info.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Cstack_info}
@@ -18,12 +18,13 @@
   unavailable, the \code{size} will be returned as \code{NA}, and
   stack-checking is not performed.
 
+  %% Reports in Feb 2016 that this is broken by 'musl' on Linux.
   The information on the stack base address is thought to be accurate on
-  Windows, Linux, OS X and FreeBSD but a heuristic is used on other
-  platforms.  Because this might be slightly inaccurate, the current
-  usage could be estimated as negative.  (The heuristic is not used on
-  embedded uses of \R on platforms where the stack base is not thought
-  to be accurate.)
+  Windows, Linux (using \code{glibc}), OS X and FreeBSD but a heuristic
+  is used on other platforms.  Because this might be slightly
+  inaccurate, the current usage could be estimated as negative.  (The
+  heuristic is not used on embedded uses of \R on platforms where the
+  stack base information is not thought to be accurate.)
 
   The \sQuote{evaluation depth} is the number of nested \R expressions
   currently under evaluation: this has a limit controlled by
diff -Nru r-base-3.2.3/src/library/base/man/curlVersion.Rd r-base-3.3.1/src/library/base/man/curlVersion.Rd
--- r-base-3.2.3/src/library/base/man/curlVersion.Rd	2015-08-10 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/curlVersion.Rd	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-% File src/library/base/man/curlVersion.Rd
-% Part of the R package, https://www.R-project.org
-% Copyright 2015 R Core Team
-% Distributed under GPL 2 or later
-
-\name{libcurlVersion}
-\alias{libcurlVersion}
-\title{
-  Report Version of libcurl
-}
-\description{
-  Report version of \code{libcurl} in use.
-}
-\usage{
-libcurlVersion()
-}
-\value{
-  A character string, with value the \code{libcurl} version in use or
-  \code{""} if none is.  If \code{libcurl} is available, has attributes
-
-  \item{ssl_version}{A character string naming the SSL implementation
-    and version, possibly \code{"none"}.  It is intended for the version
-    of OpenSSL used, but not all implementations of \code{libcurl} use
-    OpenSSL --- for example OS X reports \code{"SecureTranspart"}, its
-    wrapper for SSL/TLS.}
-
-  \item{libssh_version}{A character string naming the \code{libssh} version,
-    which may or may not be available (it is used for
-    e.g.\sspace{}\code{scp} and \code{sftp} protocols). Where present,
-    something like \code{"libssh2/1.5.0"}.}
-
-  \item{protocols}{A character vector of the names of supported
-    protocols, also known as \sQuote{schemes} when part of a URL.}
-}
-\seealso{
-  \code{\link{extSoftVersion}} for versions of other third-party
-  software.
-
-  \code{\link{curlGetHeaders}}, \code{\link{download.file}} and
-  \code{\link{url}} for functions which (optionally) use \code{libcurl}.
-
-  \url{http://curl.haxx.se/docs/sslcerts.html} and
-  \url{http://curl.haxx.se/docs/ssl-compared.html} for more details on
-  SSL versions.  Normally \code{libcurl} used with \R uses
-  SecureTransport on OS X, OpenSSL on Windows and GnuTLS, NSS or OpenSSL
-  on Unix-alikes.  (At the time of writing Debian-based Linuxen use
-  GnuTLS, RedHat-based ones use NSS.)
-}
-\examples{
-libcurlVersion()
-}
diff -Nru r-base-3.2.3/src/library/base/man/data.frame.Rd r-base-3.3.1/src/library/base/man/data.frame.Rd
--- r-base-3.2.3/src/library/base/man/data.frame.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/data.frame.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/data.frame.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{data.frame}
@@ -8,14 +8,14 @@
 \alias{data.frame}
 \alias{default.stringsAsFactors}
 \description{
-  This function creates data frames, tightly coupled
+  The function \code{data.frame()} creates data frames, tightly coupled
   collections of variables which share many of the properties of
   matrices and of lists, used as the fundamental data structure by most
   of \R's modeling software.
 }
 \usage{
 data.frame(\dots, row.names = NULL, check.rows = FALSE,
-           check.names = TRUE,
+           check.names = TRUE, fix.empty.names = TRUE,
            stringsAsFactors = default.stringsAsFactors())
 
 default.stringsAsFactors()
@@ -34,6 +34,11 @@
     syntactically valid variable names and are not duplicated.
     If necessary they are adjusted (by \code{\link{make.names}})
     so that they are.}
+  \item{fix.empty.names}{logical indicating if arguments which are
+    \dQuote{unnamed} (in the sense of not being formally called as
+    \code{someName = arg}) get an automatically constructed name or
+    rather name \code{""}.  Needs to be set to \code{FALSE} even when
+    \code{check.names} is false if \code{""} names should be kept.}
   \item{stringsAsFactors}{logical: should character vectors be converted
     to factors?  The \sQuote{factory-fresh} default is \code{TRUE}, but
     this can be changed by setting \code{\link{options}(stringsAsFactors
diff -Nru r-base-3.2.3/src/library/base/man/deparseOpts.Rd r-base-3.3.1/src/library/base/man/deparseOpts.Rd
--- r-base-3.2.3/src/library/base/man/deparseOpts.Rd	2015-11-06 23:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/deparseOpts.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/deparseOpts.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{deparseOpts}
@@ -94,19 +94,19 @@
     }
   }
   For the most readable (but perhaps incomplete) display, use
-  \code{control = NULL}. This displays the object's value, but not its
+  \code{control = NULL}.  This displays the object's value, but not its
   attributes.  The default in \code{\link{deparse}} is to display the
   attributes as well, but not to use any of the other options to make
   the result parseable.  (\code{\link{dput}} and \code{\link{dump}} do
   use more default options, and printing of functions without sources
   uses \code{c("keepInteger", "keepNA")}.)
 
-  Using \code{control = "all"} comes closest to making \code{deparse()}
-  an inverse of \code{parse()}.  However, not all objects are
-  deparse-able even with this option.  A warning will be issued if the
-  function recognizes that it is being asked to do the impossible.
-  Also, representing double and complex numbers as decimals may well not
-  be exact.
+  Using \code{control = c("all", "hexNumeric")} comes closest to making
+  \code{deparse()} an inverse of \code{parse()}.  However, not all
+  objects are deparse-able even with this option.  A warning will be
+  issued if the function recognizes that it is being asked to do the
+  impossible.  Also, representing double and complex numbers as decimals
+  may well not be exact.
 
   Only one of \code{"hexNumeric"} and \code{"digits17"} can be specified.
 }
diff -Nru r-base-3.2.3/src/library/base/man/difftime.Rd r-base-3.3.1/src/library/base/man/difftime.Rd
--- r-base-3.2.3/src/library/base/man/difftime.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/difftime.Rd	2016-06-10 22:02:05.000000000 +0000
@@ -1,9 +1,10 @@
 % File src/library/base/man/difftime.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{difftime}
+\title{Time Intervals / Differences}
 \alias{difftime}
 \alias{as.difftime}
 \alias{as.double.difftime}
@@ -19,12 +20,14 @@
 \alias{Summary.difftime}
 \alias{[.difftime}
 \alias{mean.difftime}
+\alias{diff.difftime}
+\alias{c.difftime}
 \alias{units}
 \alias{units<-}
 \alias{time interval} % used by mean.Rd
-\title{Time Intervals}
 \description{
-  Time intervals creation, printing, and some arithmetic.
+  Time intervals creation, printing, and some arithmetic.  The
+  \code{\link{print}()} method calls these \dQuote{time differences}.
 }
 \usage{
 \special{time1 - time2}
@@ -87,7 +90,9 @@
   \code{"difftime"} object with the same units as the \code{"difftime"}
   object.  There are methods for \code{\link{mean}} and
   \code{\link{sum}} (via the \code{\link[=S3groupGeneric]{Summary}}
-  group generic).
+  group generic), and \code{\link{diff}} via \code{\link{diff.default}}
+  building on the \code{"difftime"} method for arithmetic, notably
+  \code{-}.
 
   The units of a \code{"difftime"} object can be extracted by the
   \code{units} function, which also has a replacement form.  If the
diff -Nru r-base-3.2.3/src/library/base/man/dimnames.Rd r-base-3.3.1/src/library/base/man/dimnames.Rd
--- r-base-3.2.3/src/library/base/man/dimnames.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/dimnames.Rd	2015-12-21 23:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/dimnames.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{dimnames}
@@ -17,7 +17,7 @@
 dimnames(x)
 dimnames(x) <- value
 
-provideDimnames(x, sep = "", base = list(LETTERS))
+provideDimnames(x, sep = "", base = list(LETTERS), unique = TRUE)
 }
 \arguments{
   \item{x}{an \R object, for example a matrix, array or data frame.}
@@ -29,6 +29,8 @@
     list components are used in turn (and recycled when needed) to
     construct replacements for empty dimnames components.  See also the
     examples.}
+  \item{unique}{logical indicating that the dimnames constructed are
+    unique within each dimension in the sense of \code{\link{make.unique}}.}
 }
 \details{
   The functions \code{dimnames} and \code{dimnames<-} are generic.
@@ -58,7 +60,9 @@
 
   \code{provideDimnames(x)} provides \code{dimnames} where
   \dQuote{missing}, such that its result has \code{\link{character}}
-  dimnames for each component.
+  dimnames for each component.  If \code{unique} is true as by default,
+  they are unique within each component via \code{\link{make.unique}(*,
+    sep=sep)}.
 }
 \value{
   The dimnames of a matrix or array can be \code{NULL} (which is not
@@ -105,6 +109,8 @@
 strd(provideDimnames(A, base= list(letters[-(1:9)], tail(LETTERS))))
 strd(provideDimnames(N, base= list(letters[-(1:9)], tail(LETTERS)))) # recycling
 strd(provideDimnames(A, base= list(c("AA","BB")))) # recycling on both levels
+## set "empty dimnames":
+provideDimnames(rbind(1, 2:3), base = list(""), unique=FALSE)
 }
 \keyword{array}
 \keyword{manip}
diff -Nru r-base-3.2.3/src/library/base/man/encodeString.Rd r-base-3.3.1/src/library/base/man/encodeString.Rd
--- r-base-3.2.3/src/library/base/man/encodeString.Rd	2015-08-25 22:17:40.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/encodeString.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/encodeString.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2008 R Core Team
+% Copyright 1995-2008, 2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{encodeString}
@@ -72,10 +72,11 @@
 factor(x) # makes use of this to print the levels
 
 x <- c("a", "ab", "abcde")
+encodeString(x) # width = 0: use as little as possible
+encodeString(x, 2) # use two or more (left justified)
 encodeString(x, width = NA) # left justification
 encodeString(x, width = NA, justify = "c")
 encodeString(x, width = NA, justify = "r")
 encodeString(x, width = NA, quote = "'", justify = "r")
 }
 \keyword{ utilities }
-
diff -Nru r-base-3.2.3/src/library/base/man/expand.grid.Rd r-base-3.3.1/src/library/base/man/expand.grid.Rd
--- r-base-3.2.3/src/library/base/man/expand.grid.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/expand.grid.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,14 +1,16 @@
 % File src/library/base/man/expand.grid.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2010 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{expand.grid}
-\title{Create a Data Frame from All Combinations of Factors}
+\title{Create a Data Frame from All Combinations of Factor Variables}
+\alias{expand.grid}
+\concept{variable combinations}
+\concept{variable permutations}
 \usage{
 expand.grid(\dots, KEEP.OUT.ATTRS = TRUE, stringsAsFactors = TRUE)
 }
-\alias{expand.grid}
 \arguments{
   \item{\dots}{vectors, factors or a list containing these.}
   \item{KEEP.OUT.ATTRS}{a logical indicating the \code{"out.attrs"}
diff -Nru r-base-3.2.3/src/library/base/man/files.Rd r-base-3.3.1/src/library/base/man/files.Rd
--- r-base-3.2.3/src/library/base/man/files.Rd	2015-08-25 22:18:16.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/files.Rd	2016-05-20 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/files.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{files}
@@ -187,12 +187,17 @@
   (an undocumented restriction of the Windows system call).
 
   Care is needed with removing a junction (and most likely also a
-  symbolic link): many tools will remove the target and its contents
-  (including Windows Explorer in XP, and \code{unlink} in \R prior to
-  2.15.0).
+  symbolic link): many tools will remove the target and its contents.
 }
 #endif
 
+\section{Warning}{
+  Always check the return value of these functions when used in package
+  code.  This is especially important for \code{file.rename}, which has
+  OS-specific restrictions (and note that the session temporary
+  directory is commonly on a different file system from the working
+  directory).
+}
 \author{
   Ross Ihaka, Brian Ripley
 }
diff -Nru r-base-3.2.3/src/library/base/man/findInterval.Rd r-base-3.3.1/src/library/base/man/findInterval.Rd
--- r-base-3.2.3/src/library/base/man/findInterval.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/findInterval.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,13 +1,14 @@
 % File src/library/base/man/findInterval.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2009 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{findInterval}
 \alias{findInterval}
 \title{Find Interval Numbers or Indices}
 \usage{
-findInterval(x, vec, rightmost.closed = FALSE, all.inside = FALSE)
+findInterval(x, vec, rightmost.closed = FALSE, all.inside = FALSE,
+             left.open = FALSE)
 }
 \arguments{
   \item{x}{numeric.}
@@ -18,6 +19,11 @@
   \item{all.inside}{logical; if true, the returned indices are coerced
     into \code{1,\dots,N-1}, i.e., \code{0} is mapped to \code{1}
     and \code{N} to \code{N-1}.}
+  \item{left.open}{logical; if true all the intervals are open at left
+    and closed at right; in the formulas below, \eqn{\le} should be
+    swapped with \eqn{<} (and \eqn{>} with \eqn{\ge}), and
+    \code{rightmost.closed} means \sQuote{leftmost is closed}.  This may
+    be useful, e.g., in survival analysis computations.}
 }
 \description{
   Given a vector of non-decreasing breakpoints in \code{vec}, find the
@@ -47,6 +53,15 @@
   When \code{rightmost.closed = TRUE}, the result for \code{x[j] = vec[N]}
   (\eqn{ = \max vec}{ = max(vec)}), is \code{N - 1} as for all other
   values in the last interval.
+
+  \code{left.open = TRUE} is occasionally useful, e.g., for survival data.
+  For (anti-)symmetry reasons, it is equivalent to using
+  \dQuote{mirrored} data, i.e., the following is always true: \preformatted{
+    identical(
+          findInterval( x,  v,      left.open= TRUE, ...) ,
+      N - findInterval(-x, -v[N:1], left.open=FALSE, ...) )
+    }
+    where \code{N <- length(vec)} as above.
 }
 \value{
   vector of length \code{length(x)} with values in \code{0:N} (and
@@ -72,6 +87,12 @@
 tt <- c(-100, seq(-2, 2, len = 201), +100)
 it <- findInterval(tt, X)
 tt[it < 1 | it >= N] # only first and last are outside range(X)
+
+##  'left.open = TRUE' means  "mirroring" :
+N <- length(v)
+stopifnot(identical(
+                  findInterval( x,  v,  left.open=TRUE) ,
+              N - findInterval(-x, -v[N:1])))
 }
 \keyword{arith}
 \keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/find.package.Rd r-base-3.3.1/src/library/base/man/find.package.Rd
--- r-base-3.2.3/src/library/base/man/find.package.Rd	2015-08-25 22:17:41.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/find.package.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/find.package.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{find.package}
@@ -54,6 +54,10 @@
   Unless \code{quiet = TRUE} it will warn if some of the packages named
   are not attached, and given an error if none are.
 }
+\seealso{
+  \code{\link{path.expand}} and \code{\link{normalizePath}} for path
+  standardization.
+}
 \value{
   A character vector of paths of package directories.
 }
diff -Nru r-base-3.2.3/src/library/base/man/formals.Rd r-base-3.3.1/src/library/base/man/formals.Rd
--- r-base-3.2.3/src/library/base/man/formals.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/formals.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,26 +1,25 @@
 % File src/library/base/man/formals.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{formals}
+\title{Access to and Manipulation of the Formal Arguments}
 \alias{formals}
 \alias{formals<-}
-\title{Access to and Manipulation of the Formal Arguments}
 \description{
-  Get or set the formal arguments of a function.
+  Get or set the formal arguments of a \code{\link{function}}.
 }
 \usage{
 formals(fun = sys.function(sys.parent()))
 formals(fun, envir = environment(fun)) <- value
 }
 \arguments{
-  \item{fun}{a function object, or see \sQuote{Details}.}
-  \item{envir}{environment in which the function should be defined.}
-  \item{value}{a list (or pairlist) of \R expressions.}
+  \item{fun}{a \code{\link{function}}, or see \sQuote{Details}.}
+  \item{envir}{\code{\link{environment}} in which the function should be defined.}
+  \item{value}{a \code{\link{list}} (or \code{\link{pairlist}}) of \R expressions.}
 }
 \details{
-
   For the first form, \code{fun} can also be a character string naming
   the function to be manipulated, which is searched for from the parent
   frame.  If it is not specified, the function calling \code{formals} is
@@ -38,18 +37,34 @@
   environment of the function.
 }
 \seealso{
+  \code{\link{formalArgs}} (from \pkg{methods}), a shortcut for \code{names(formals(.))}.
   \code{\link{args}} for a human-readable version,
   \code{\link{alist}},
   \code{\link{body}},
   \code{\link{function}}.
 }
 \examples{
-require(stats); require(graphics)
-length(formals(lm))      # the number of formal arguments
-names(formals(boxplot))  # formal arguments names
+require(stats)
+formals(lm)
+
+## If you just want the names of the arguments, use formalArgs instead.
+names(formals(lm))
+methods:: formalArgs(lm)     # same
+
+## formals returns a pairlist. Arguments with no default have type symbol (aka name).
+str(formals(lm))
+
+## formals returns NULL for primitive functions.  Use it in combination with
+## args for this case.
+is.primitive(`+`)
+formals(`+`)
+formals(args(`+`))
 
-f <- function(x) a+b
-formals(f) <- alist(a = , b = 3) # function(a, b = 3) a+b
+## You can overwrite the formal arguments of a function (though this is
+## advanced, dangerous coding).
+f <- function(x) a + b
+formals(f) <- alist(a = , b = 3)
+f    # function(a, b = 3) a + b
 f(2) # result = 5
 }
 \keyword{programming}
diff -Nru r-base-3.2.3/src/library/base/man/formatDL.Rd r-base-3.3.1/src/library/base/man/formatDL.Rd
--- r-base-3.2.3/src/library/base/man/formatDL.Rd	2015-08-25 22:18:11.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/formatDL.Rd	2016-03-16 23:03:59.000000000 +0000
@@ -24,7 +24,7 @@
     description information.  Can be abbreviated.
     If \code{"table"}, a two-column table with
     items and descriptions as columns is produced (similar to Texinfo's
-    \verb{@table} environment.  If \code{"list"}, a LaTeX-style tagged
+    \verb{@table} environment).  If \code{"list"}, a LaTeX-style tagged
     description list is obtained.}
   \item{width}{a positive integer giving the target column for wrapping
     lines in the output.}
diff -Nru r-base-3.2.3/src/library/base/man/gettext.Rd r-base-3.3.1/src/library/base/man/gettext.Rd
--- r-base-3.2.3/src/library/base/man/gettext.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/gettext.Rd	2015-12-14 23:15:04.000000000 +0000
@@ -29,10 +29,10 @@
     catalogs for the domain.}
 }
 \details{
-  If \code{domain} is \code{NULL} or \code{""}, and \code{gettext} is
-  called from a function in the namespace of package \pkg{pkg} the
-  domain is set to \code{"R-pkg"}.  Otherwise there is no default
-  domain.
+  If \code{domain} is \code{NULL} or \code{""}, and \code{gettext}
+  or \code{ngettext}  is called from a function in the namespace of 
+  package \pkg{pkg} the domain is set to \code{"R-pkg"}.  Otherwise 
+  there is no default domain.
 
   If a suitable domain is found, each character string is offered for
   translation, and replaced by its translation into the current language
diff -Nru r-base-3.2.3/src/library/base/man/grep.Rd r-base-3.3.1/src/library/base/man/grep.Rd
--- r-base-3.2.3/src/library/base/man/grep.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/grep.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/grep.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{grep}
@@ -40,7 +40,7 @@
 gregexpr(pattern, text, ignore.case = FALSE, perl = FALSE,
          fixed = FALSE, useBytes = FALSE)
 
-regexec(pattern, text, ignore.case = FALSE,
+regexec(pattern, text, ignore.case = FALSE, perl = FALSE,
         fixed = FALSE, useBytes = FALSE)
 }
 \arguments{
@@ -118,10 +118,10 @@
   \code{useBytes = TRUE}.
 
   \code{regexpr} and \code{gregexpr} with \code{perl = TRUE} allow
-  Python-style named captures, but not for \emph{long vector} inputs.  
-    
+  Python-style named captures, but not for \emph{long vector} inputs.
+
   Invalid inputs in the current locale are warned about up to 5 times.
-  
+
   Caseless matching with \code{PERL = TRUE} for non-ASCII characters
   depends on the PCRE library being compiled with \sQuote{Unicode
   property support}: an external library might not be.
@@ -228,7 +228,8 @@
   \code{\link{agrep}} for approximate matching.
 
   \code{\link{charmatch}}, \code{\link{pmatch}} for partial matching,
-  \code{\link{match}} for matching to whole strings.
+  \code{\link{match}} for matching to whole strings,
+  \code{\link{startsWith}} for matching of initial parts of strings.
 
   \code{\link{tolower}}, \code{\link{toupper}} and \code{\link{chartr}}
   for character translations.
@@ -341,7 +342,7 @@
 ## regexec() on the regmatches obtained via gregexpr().  E.g.:
 pattern <- "([[:alpha:]]+)([[:digit:]]+)"
 s <- "Test: A1 BC23 DEF456"
-lapply(regmatches(s, gregexpr(pattern, s)), 
+lapply(regmatches(s, gregexpr(pattern, s)),
        function(e) regmatches(e, regexec(pattern, e)))
 }
 \keyword{character}
diff -Nru r-base-3.2.3/src/library/base/man/grouping.Rd r-base-3.3.1/src/library/base/man/grouping.Rd
--- r-base-3.2.3/src/library/base/man/grouping.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/grouping.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -0,0 +1,56 @@
+% File src/library/base/man/grouping.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 1995-2016 R Core Team
+% Distributed under GPL 2 or later
+
+\name{grouping}
+\title{Grouping Permutation}
+\alias{grouping}
+\concept{aggregation}
+\description{
+  \code{grouping} returns a permutation which rearranges its first
+  argument such that identical values are adjacent to each other.  Also
+  returned as attributes are the group-wise partitioning and the maximum
+  group size.
+}
+\usage{
+grouping(\dots)
+}
+\arguments{
+  \item{\dots}{a sequence of numeric, character or logical
+    vectors, all of the same length, or a classed \R object.}
+}
+\details{
+  The function partially sorts the elements so that identical values are
+  adjacent. \code{NA} values come first.  This is guaranteed to be
+  stable, so ties are preserved, and if the data are already
+  grouped/sorted, the grouping is unchanged.  This is useful for
+  aggregation and is particularly fast for character vectors.
+
+  Under the covers, the \code{"radix"} method of \code{\link{order}} is
+  used, and the same caveats apply, including reduced precision when
+  comparing real values, restrictions on character encodings and lack of
+  support for long vectors (those with \eqn{2^{31}}{2^31} or more elements).
+  
+  Like \code{order}, for a classed \R object the grouping is based on
+  the result of \code{\link{xtfrm}}.
+}
+
+\value{
+  An object of class \code{"grouping"}, the representation of which
+  should be considered experimental and subject to change.  It is an
+  integer vector with two attributes:
+  \item{ends}{subscripts in the result corresponding to the last
+    member of each group}
+  \item{maxgrpn}{the maximum group size}
+}
+
+\seealso{
+  \code{\link{order}}, \code{\link{xtfrm}}.
+}
+\examples{
+(ii <- grouping(x <- c(1, 1, 3:1, 1:4, 3), y <- c(9, 9:1), z <- c(2, 1:9)))
+## 6  5  2  1  7  4 10  8  3  9
+rbind(x, y, z)[, ii]
+}
+\keyword{manip}
diff -Nru r-base-3.2.3/src/library/base/man/gzcon.Rd r-base-3.3.1/src/library/base/man/gzcon.Rd
--- r-base-3.2.3/src/library/base/man/gzcon.Rd	2015-08-25 22:17:59.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/gzcon.Rd	2016-03-30 22:02:04.000000000 +0000
@@ -14,13 +14,17 @@
   connection.  Standard \code{gzip} headers are assumed.
 }
 \usage{
-gzcon(con, level = 6, allowNonCompressed = TRUE)
+gzcon(con, level = 6, allowNonCompressed = TRUE, text = FALSE)
 }
 \arguments{
   \item{con}{a connection.}
   \item{level}{integer between 0 and 9, the compression level when writing.}
   \item{allowNonCompressed}{logical.  When reading, should
     non-compressed input be allowed?}
+  \item{text}{logical. Should the connection be text-oriented? This is
+    distinct from the mode of the connection (must always be binary).
+    If \code{TRUE}, \code{\link{pushBack}} works on the connection,
+    otherwise \code{\link{readBin}} and friends apply.}
 }
 \details{
   If \code{con} is open then the modified connection is opened.  Closing
diff -Nru r-base-3.2.3/src/library/base/man/iconv.Rd r-base-3.3.1/src/library/base/man/iconv.Rd
--- r-base-3.2.3/src/library/base/man/iconv.Rd	2015-10-01 22:15:16.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/iconv.Rd	2015-12-10 23:15:16.000000000 +0000
@@ -129,12 +129,12 @@
   or if \code{to = ""} and the current locale's encoding is detected as
   Latin-1 (or its superset CP1252 on Windows) or UTF-8.
 
-  If \code{toRaw = TRUE}, the value is a vector of the same length and
+  If \code{toRaw = TRUE}, the value is a list of the same length and
   the same attributes as \code{x} whose elements are either \code{NULL}
   (if conversion fails) or a raw vector.
 
   For \code{iconvlist()}, a character vector (typically of a few hundred
-  elements).
+  elements) of known encoding names.
 }
 \note{
   The only reasonably portable name for the ISO 8859-15 encoding,
diff -Nru r-base-3.2.3/src/library/base/man/InternalMethods.Rd r-base-3.3.1/src/library/base/man/InternalMethods.Rd
--- r-base-3.2.3/src/library/base/man/InternalMethods.Rd	2015-08-25 22:17:52.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/InternalMethods.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/zMethods.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{InternalMethods}
@@ -59,8 +59,11 @@
   (which dispatches methods for \code{"seq"})%       [seq.c]
   and \code{\link{xtfrm}}%                           [sort.c]
 
-  In addition, \code{is.name} is a synonym for \code{is.symbol} and
-  dispatches methods for the latter.
+  In addition, \code{is.name} is a synonym for \code{\link{is.symbol}} and
+  dispatches methods for the latter.  Similarly, \code{\link{as.numeric}}
+  is a synonym for \code{as.double} and dispatches methods for the
+  latter, i.e., S3 methods are for \code{as.double}, whereas S4 methods
+  are to be written for \code{as.numeric}.
 
   Note that all of the \link{group generic} functions are also
   internal/primitive and allow methods to be written for them.
diff -Nru r-base-3.2.3/src/library/base/man/is.language.Rd r-base-3.3.1/src/library/base/man/is.language.Rd
--- r-base-3.2.3/src/library/base/man/is.language.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/is.language.Rd	2016-03-16 23:03:59.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/is.language.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{is.language}
@@ -20,6 +20,9 @@
   \item{x}{object to be tested.}
 }
 \note{
+  A \code{name} is also known as \sQuote{symbol}, from its type
+  (\code{\link{typeof}}), see \code{\link{is.symbol}}.
+
   This is a \link{primitive} function.
 }
 \references{
diff -Nru r-base-3.2.3/src/library/base/man/isSymmetric.Rd r-base-3.3.1/src/library/base/man/isSymmetric.Rd
--- r-base-3.2.3/src/library/base/man/isSymmetric.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/isSymmetric.Rd	2016-04-13 22:15:07.000000000 +0000
@@ -6,10 +6,12 @@
 \name{isSymmetric}
 \alias{isSymmetric}
 \alias{isSymmetric.matrix}
-\title{Test if a Matrix or other Object is Symmetric}
+\title{Test if a Matrix or other Object is Symmetric (Hermitian)}
 \description{
   Generic function to test if \code{object} is symmetric or not.
-  Currently only a matrix method is implemented.
+  Currently only a matrix method is implemented, where a
+  \code{\link{complex}} matrix \code{Z} must be \dQuote{Hermitian} for
+  \code{isSymmetric(Z)} to be true.
 }
 \usage{
 isSymmetric(object, \dots)
@@ -44,6 +46,13 @@
 D3
 isSymmetric(D3) # TRUE
 isSymmetric(D3, tol = 0) # FALSE for zero-tolerance
+
+## Complex Matrizes - Hermitian or not
+Z <- sqrt(matrix(-1:2 + 0i, 2)); Z <- t(Conj(Z)) \%*\% Z
+Z
+isSymmetric(Z)      # TRUE
+isSymmetric(Z + 1)  # TRUE
+isSymmetric(Z + 1i) # FALSE -- a Hermitian matrix has a *real* diagonal
 }
 \keyword{array}
 \keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/levels.Rd r-base-3.3.1/src/library/base/man/levels.Rd
--- r-base-3.2.3/src/library/base/man/levels.Rd	2015-08-25 22:17:52.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/levels.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/levels.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2010 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{levels}
@@ -62,13 +62,16 @@
 y
 
 ## combine some levels
-z <- gl(3, 2, 12)
-levels(z) <- c("A", "B", "A")
+z <- gl(3, 2, 12, labels = c("apple", "salad", "orange"))
+z
+levels(z) <- c("fruit", "veg", "fruit")
 z
 
 ## same, using a named list
-z <- gl(3, 2, 12)
-levels(z) <- list(A = c(1,3), B = 2)
+z <- gl(3, 2, 12, labels = c("apple", "salad", "orange"))
+z
+levels(z) <- list("fruit" = c("apple","orange"),
+                  "veg"   = "salad")
 z
 
 ## we can add levels this way:
diff -Nru r-base-3.2.3/src/library/base/man/libcurlVersion.Rd r-base-3.3.1/src/library/base/man/libcurlVersion.Rd
--- r-base-3.2.3/src/library/base/man/libcurlVersion.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/libcurlVersion.Rd	2016-03-16 23:03:59.000000000 +0000
@@ -0,0 +1,51 @@
+% File src/library/base/man/curlVersion.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 2015 R Core Team
+% Distributed under GPL 2 or later
+
+\name{libcurlVersion}
+\alias{libcurlVersion}
+\title{
+  Report Version of libcurl
+}
+\description{
+  Report version of \code{libcurl} in use.
+}
+\usage{
+libcurlVersion()
+}
+\value{
+  A character string, with value the \code{libcurl} version in use or
+  \code{""} if none is.  If \code{libcurl} is available, has attributes
+
+  \item{ssl_version}{A character string naming the SSL implementation
+    and version, possibly \code{"none"}.  It is intended for the version
+    of OpenSSL used, but not all implementations of \code{libcurl} use
+    OpenSSL --- for example OS X reports \code{"SecureTranspart"}, its
+    wrapper for SSL/TLS.}
+
+  \item{libssh_version}{A character string naming the \code{libssh} version,
+    which may or may not be available (it is used for
+    e.g.\sspace{}\code{scp} and \code{sftp} protocols). Where present,
+    something like \code{"libssh2/1.5.0"}.}
+
+  \item{protocols}{A character vector of the names of supported
+    protocols, also known as \sQuote{schemes} when part of a URL.}
+}
+\seealso{
+  \code{\link{extSoftVersion}} for versions of other third-party
+  software.
+
+  \code{\link{curlGetHeaders}}, \code{\link{download.file}} and
+  \code{\link{url}} for functions which (optionally) use \code{libcurl}.
+
+  \url{http://curl.haxx.se/docs/sslcerts.html} and
+  \url{http://curl.haxx.se/docs/ssl-compared.html} for more details on
+  SSL versions.  Normally \code{libcurl} used with \R uses
+  SecureTransport on OS X, OpenSSL on Windows and GnuTLS, NSS or OpenSSL
+  on Unix-alikes.  (At the time of writing Debian-based Linuxen use
+  GnuTLS, RedHat-based ones use NSS.)
+}
+\examples{
+libcurlVersion()
+}
diff -Nru r-base-3.2.3/src/library/base/man/locales.Rd r-base-3.3.1/src/library/base/man/locales.Rd
--- r-base-3.2.3/src/library/base/man/locales.Rd	2015-08-25 22:17:54.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/locales.Rd	2016-06-02 22:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/locales.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{locales}
@@ -64,14 +64,14 @@
   be a warning, depending on the OS.
 
   Attempts to change the character set (by
-  \code{Sys.setlocale("LC_TYPE", )}, if that implies a different
+  \code{Sys.setlocale("LC_CTYPE", )}, if that implies a different
   character set) during a session may not work and are likely to lead to
   some confusion.
 
   Note that the \env{LANGUAGE} environment variable has precedence over
   \code{"LC_MESSAGES"} in selecting the language for message translation
   on most \R platforms.
-  
+
   On platforms where ICU is used for collation the locale used for
   collation can be reset by \code{\link{icuSetCollate}}).  Except on
   Windows, the initial setting is taken from the \code{"LC_COLLATE"}
diff -Nru r-base-3.2.3/src/library/base/man/Memory.Rd r-base-3.3.1/src/library/base/man/Memory.Rd
--- r-base-3.2.3/src/library/base/man/Memory.Rd	2015-10-02 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Memory.Rd	2016-01-29 23:15:07.000000000 +0000
@@ -36,7 +36,7 @@
   garbage collection.  These values can be set by the command line
   options \option{--min-nsize} and \option{--min-vsize} (or if they are
   not used, the environment variables \env{R_NSIZE} and \env{R_VSIZE})
-  when \R is started. Thereafter \R will grow or shrink the areas
+  when \R is started.  Thereafter \R will grow or shrink the areas
   depending on usage, never decreasing below the initial values.
 
   How much time \R spends in the garbage collector will depend on these
diff -Nru r-base-3.2.3/src/library/base/man/merge.Rd r-base-3.3.1/src/library/base/man/merge.Rd
--- r-base-3.2.3/src/library/base/man/merge.Rd	2015-08-25 22:17:53.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/merge.Rd	2016-06-09 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 % File src/library/base/man/merge.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
-% Copyright 2002-2011 The R Foundation
+% Copyright 1995-2016 R Core Team
+% Copyright 2002-2016 The R Foundation
 % Distributed under GPL 2 or later
 
 \name{merge}
@@ -42,7 +42,7 @@
     columns?}
   \item{suffixes}{a character vector of length 2 specifying the suffixes
     to be used for making unique the names of columns in the result
-    which not used for merging (appearing in \code{by} etc).}
+    which are not used for merging (appearing in \code{by} etc).}
   \item{incomparables}{values which cannot be matched.  See
     \code{\link{match}}.  This is intended to be used for merging on one
     column, so these are incomparable values of that column.}
@@ -95,7 +95,7 @@
 \note{
   This is intended to work with data frames with vector-like columns:
   some aspects work with data frames containing matrices, but not all.
-  
+
   Currently long vectors are not accepted for inputs, which are thus
   restricted to less than 2^31 rows.  Prior to \R 3.2.0 that restriction
   also applied to the result (and still does for 32-bit platforms).
diff -Nru r-base-3.2.3/src/library/base/man/name.Rd r-base-3.3.1/src/library/base/man/name.Rd
--- r-base-3.2.3/src/library/base/man/name.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/name.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,11 +1,11 @@
 % File src/library/base/man/name.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{name}
 \alias{name}
-%\alias{symbol} use for plotmath as from R 2.6.0
+\concept{symbol}%\alias{symbol} use for plotmath as from R 2.6.0
 \alias{is.symbol}
 \alias{as.symbol}
 \alias{as.name}
diff -Nru r-base-3.2.3/src/library/base/man/nchar.Rd r-base-3.3.1/src/library/base/man/nchar.Rd
--- r-base-3.2.3/src/library/base/man/nchar.Rd	2015-09-10 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/nchar.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -8,7 +8,7 @@
 \alias{nzchar}
 \title{Count the Number of Characters (or Bytes or Width)}
 \usage{
-nchar(x, type = "chars", allowNA = FALSE, keepNA = FALSE)
+nchar(x, type = "chars", allowNA = FALSE, keepNA = NA)
 
 nzchar(x, keepNA = FALSE)
 }
@@ -29,15 +29,12 @@
     multibyte strings or \code{"bytes"}-encoded strings (rather than
     throwing an error)?}
   \item{keepNA}{logical: should \code{NA} be returned where ever
-    \code{x} is \code{\link{NA}}?  If false, the (implicit or explicit)
-    default for \code{nzchar()} and for \R versions \eqn{\le}{<=} 3.2.x,
-    \code{nchar()} returns \code{2}, as that is the number of printing
-    characters used when strings are written to output, and
-    \code{nzchar()} is \code{TRUE}.
-    From \R version 3.3.0 on, for \code{nchar()} only, the default will
-    be \code{NA}, which means to use \code{keepNA = TRUE} unless
-    \code{type} is \code{"width"}.  Used to be (implicitly) hard coded
-    to \code{FALSE} in \R versions \eqn{\le}{<=} 3.2.0.}
+  \code{x} is \code{\link{NA}}?  If false, \code{nchar()} returns
+  \code{2}, as that is the number of printing characters used when
+  strings are written to output, and \code{nzchar()} is \code{TRUE}.  The
+  default for \code{nchar()}, \code{NA}, means to use \code{keepNA = TRUE}
+  unless \code{type} is \code{"width"}.  Used to be (implicitly) hard
+  coded to \code{FALSE} in \R versions \eqn{\le}{<=} 3.2.0.}
 }
 \details{
   The \sQuote{size} of a character string can be measured in one of
@@ -51,8 +48,8 @@
       if this cannot be calculated.}
   }
   These will often be the same, and almost always will be in single-byte
-  locales (but note how \code{type} may influence \code{NA} treatment
-  for \code{keepNA = NA}).  There will be differences between the first two with
+  locales (but note how \code{type} determines the default for
+  \code{keepNA}).  There will be differences between the first two with
   multibyte character sequences, e.g.\sspace{}in UTF-8 locales.
 
   The internal equivalent of the default method of
@@ -154,8 +151,8 @@
 x[3] <- NA; x
 nchar(x, keepNA= TRUE) #  5  6 NA  1 15
 nchar(x, keepNA=FALSE) #  5  6  2  1 15
-stopifnot(identical(nchar(x, "w", keepNA = NA),
-                    nchar(x,      keepNA = FALSE)),
-          identical(is.na(x), is.na(nchar(x, keepNA=NA))))
+stopifnot(identical(nchar(x     ), nchar(x, keepNA= TRUE)),
+          identical(nchar(x, "w"), nchar(x, keepNA=FALSE)),
+          identical(is.na(x), is.na(nchar(x))))
 }
 \keyword{character}
diff -Nru r-base-3.2.3/src/library/base/man/normalizePath.Rd r-base-3.3.1/src/library/base/man/normalizePath.Rd
--- r-base-3.2.3/src/library/base/man/normalizePath.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/normalizePath.Rd	2016-04-20 22:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/normalizePath.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{normalizePath}
@@ -44,6 +44,12 @@
   messages.
 }
 
+\note{
+  The canonical form of paths may not be what you expect.  For example,
+  on OS X absolute paths such as \file{/tmp} and \file{/var} are
+  symbolic links.
+}
+
 \value{
   A character vector.
 
@@ -73,7 +79,7 @@
 }
 #endif
 
-\examples{\donttest{ # random tempdir
+\examples{\donttest{# random tempdir
 cat(normalizePath(c(R.home(), tempdir())), sep = "\n")
 }}
 \keyword{ utilities }
diff -Nru r-base-3.2.3/src/library/base/man/ns-dblcolon.Rd r-base-3.3.1/src/library/base/man/ns-dblcolon.Rd
--- r-base-3.2.3/src/library/base/man/ns-dblcolon.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/ns-dblcolon.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/ns-dblcolon.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{ns-dblcolon}
@@ -8,7 +8,8 @@
 \alias{::}
 \alias{:::}
 \description{
-  Accessing exported and internal variables in a namespace.
+  Accessing exported and internal variables, i.e.\sspace{}\R objects
+  (including lazy loaded data sets) in a namespace.
 }
 \usage{
 pkg::name
@@ -19,11 +20,11 @@
   \item{name}{variable name: symbol or literal character string.}
 }
 \details{
-  For a package \pkg{pkg}, \code{pkg::name} returns the value of
-  the exported variable \code{name} in namespace \code{pkg}, whereas
+  For a package \pkg{pkg}, \code{pkg::name} returns the value of the
+  exported variable \code{name} in namespace \code{pkg}, whereas
   \code{pkg:::name} returns the value of the internal variable
-  \code{name}. The namespace will be loaded if it was not loaded
-  before the call, but the package will not be attached to the
+  \code{name}.  The package namespace will be loaded if it was not
+  loaded before the call, but the package will not be attached to the
   search path.
 
   Specifying a variable or package that does not exist is an error.
@@ -39,11 +40,13 @@
   It is typically a design mistake to use \code{:::}
   in your code since the corresponding object has probably been kept
   internal for a good reason.  Consider contacting the package
-  maintainer if you feel the need to access the object for anything but
-  mere inspection.
+  \code{\link{maintainer}} if you feel the need to access the object for
+  anything but mere inspection.
 }
 \seealso{
   \code{\link{get}} to access an object masked by another of the same name.
+  \code{\link{loadNamespace}}, \code{\link{asNamespace}} for more about
+  namespaces.
 }
 \examples{
 base::log
diff -Nru r-base-3.2.3/src/library/base/man/ns-internal.Rd r-base-3.3.1/src/library/base/man/ns-internal.Rd
--- r-base-3.2.3/src/library/base/man/ns-internal.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/ns-internal.Rd	2016-04-05 22:15:12.000000000 +0000
@@ -8,6 +8,7 @@
 
 \alias{asNamespace}
 \alias{getNamespaceInfo}
+\alias{.getNamespaceInfo}
 \alias{importIntoEnv}
 \alias{isBaseNamespace}
 \alias{isNamespace}
@@ -37,9 +38,10 @@
 isBaseNamespace(ns)
 isNamespace(ns)
 namespaceExport(ns, vars)
-namespaceImport(self, \dots, from = NULL)
+namespaceImport(self, \dots, from = NULL, except = character(0L))
 namespaceImportFrom(self, ns, vars, generics, packages,
-                    from = "non-package environment")
+                    from = "non-package environment",
+                    except = character(0L))
 namespaceImportClasses(self, ns, vars, from = NULL)
 namespaceImportMethods(self, ns, vars, from = NULL)
 packageHasNamespace(package, package.lib)
@@ -76,6 +78,9 @@
   \item{\dots}{character arguments.}
   \item{metaname}{the methods table name.}
   \item{name}{symbol: name of namespace}
+  \item{except}{character vector naming symbols to exclude from the
+    import, particularly useful when \code{vars} is missing.
+  }
 }
 \description{
   Internal namespace support functions.  Not intended to be called
@@ -88,12 +93,24 @@
   which \pkg{base} and some legacy packages do not.  But then you are
   not intended to be using it \dots.
 }
-
-\keyword{internal}
+\seealso{
+  \code{\link{loadNamespace}} or \code{\link{getNamespace}} are somewhat
+  higher level namespace related functions.
+}
 \author{
   Luke Tierney and other members of the R Core Team.
 }
 \examples{
+nsName <- "stats"
+(ns <- asNamespace(nsName)) # <environment: namespace:stats>
+
+## Inverse function of asNamespace() :
+environmentName(asNamespace("stats")) # "stats"
+environmentName(asNamespace("base"))  # "base"
+getNamespaceInfo(ns, "spec")[["name"]] ## -> "stats"
+\dontshow{stopifnot(identical(nsName,
+                      getNamespaceInfo(ns, "spec")[["name"]]))}
+
 ## Only for for the daring ones, trying to get into the bowels :
 
 lsNamespaceInfo <- function(ns, ...) {
@@ -105,3 +122,4 @@
 utils::str(allinfoNS("stats"))
 utils::str(allinfoNS("stats4"))
 }
+\keyword{internal}
diff -Nru r-base-3.2.3/src/library/base/man/ns-load.Rd r-base-3.3.1/src/library/base/man/ns-load.Rd
--- r-base-3.2.3/src/library/base/man/ns-load.Rd	2015-08-25 22:18:15.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/ns-load.Rd	2016-05-11 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/ns-load.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{ns-load}
@@ -121,6 +121,13 @@
  stopifnot( identical(isNamespaceLoaded(  "foo"   ), FALSE),
             identical(isNamespaceLoaded(quote(foo)), FALSE),
             identical(isNamespaceLoaded(quote(stats)), statL))
+
+hasM <- isNamespaceLoaded("MASS") # (to restore if needed)
+Mns <- asNamespace("MASS") # loads it if not already
+stopifnot(   isNamespaceLoaded("MASS"))
+unloadNamespace(Mns) # unloading the NS 'object'
+stopifnot( ! isNamespaceLoaded("MASS"))
+if (hasM) loadNamespace("MASS") # (restoring previous state)
 }
 \keyword{data}
 \keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/numeric.Rd r-base-3.3.1/src/library/base/man/numeric.Rd
--- r-base-3.2.3/src/library/base/man/numeric.Rd	2015-08-25 22:17:53.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/numeric.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/numeric.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{numeric}
@@ -57,6 +57,13 @@
   \code{is.integer(x) || is.double(x)}, or
   \code{(mode(x) == "numeric") && !is.factor(x)}.
 }
+\section{Warning}{
+  If \code{x} is a \code{\link{factor}}, \code{as.numeric} will return
+  the underlying numeric (integer) representation, which is often
+  meaningless as it may not correspond to the \code{factor}
+  \code{\link{levels}}, see the \sQuote{Warning} section in
+  \code{\link{factor}} (and the 2nd example below).
+}
 \section{S4 methods}{
   \code{as.numeric} and \code{is.numeric} are internally S4 generic and
   so methods can be set for them \emph{via} \code{setMethod}.
@@ -90,7 +97,13 @@
 }
 \examples{
 as.numeric(c("-.1"," 2.7 ","B")) # (-0.1, 2.7, NA)  +  warning
-as.numeric(factor(5:10))
+
+as.numeric(factor(5:10)) # not what you'd expect
+f <- factor(1:5)
+## what you typically meant and want:
+as.numeric(as.character(f))
+## the same, considerably (for long factors) more efficient:
+as.numeric(levels(f))[f]
 }
 \keyword{classes}
 \keyword{attribute}
diff -Nru r-base-3.2.3/src/library/base/man/options.Rd r-base-3.3.1/src/library/base/man/options.Rd
--- r-base-3.2.3/src/library/base/man/options.Rd	2015-12-03 23:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/options.Rd	2016-03-16 23:03:55.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/options.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{options}
@@ -300,7 +300,11 @@
     \item{\code{texi2dvi}:}{used by functions
       \code{\link{texi2dvi}} and \code{\link{texi2pdf}} in package \pkg{tools}.
 #ifdef unix
-      Set at startup from the environment variable \env{R_TEXI2DVICMD}.
+      Set at startup from the environment variable \env{R_TEXI2DVICMD},
+      which defaults first to the value of environment variable
+      \env{TEXI2DVI}, and then to a value set when \R was installed (the
+      full path to a \command{texi2dvi} script if one was found).  If
+      necessary, that environment variable can be set to \code{"emulation"}.
 #endif
     }
 
@@ -500,9 +504,9 @@
   \describe{
     \item{\code{BioC_mirror}:}{The URL of a Bioconductor mirror
       for use by \code{\link{setRepositories}},
-      e.g.\sspace{}the default \samp{"http://bioconductor.org"}
+      e.g.\sspace{}the default \samp{"https://bioconductor.org"}
       or the European mirror
-      \samp{"http://bioconductor.statistik.tu-dortmund.de"}.  Can be set
+      \samp{"https://bioconductor.statistik.tu-dortmund.de"}.  Can be set
       by \code{\link{chooseBioCmirror}}.}
 
     \item{\code{browser}:}{The HTML browser to be used by
@@ -624,8 +628,8 @@
       \code{local({r <- getOption("repos"); r["CRAN"] <- "http://my.local.cran";
                    options(repos = r)})}.
 
-      Note that you can add more repositories (Bioconductor and
-      Omegahat, R-Forge, Rforge.net \dots)
+      Note that you can add more repositories (Bioconductor,
+      R-Forge, Rforge.net \dots)
       using \code{\link{setRepositories}}.
     }
     \item{\code{SweaveHooks}, \code{SweaveSyntax}:}{
diff -Nru r-base-3.2.3/src/library/base/man/order.Rd r-base-3.3.1/src/library/base/man/order.Rd
--- r-base-3.2.3/src/library/base/man/order.Rd	2015-08-25 22:18:11.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/order.Rd	2016-03-16 23:03:59.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/order.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{order}
@@ -16,7 +16,8 @@
   etc.
 }
 \usage{
-order(\dots, na.last = TRUE, decreasing = FALSE)
+order(\dots, na.last = TRUE, decreasing = FALSE,
+      method = c("shell", "radix"))
 
 sort.list(x, partial = NULL, na.last = TRUE, decreasing = FALSE,
           method = c("shell", "quick", "radix"))
@@ -28,15 +29,18 @@
   \item{partial}{vector of indices for partial sorting.
     (Non-\code{NULL} values are not implemented.)}
   \item{decreasing}{logical.  Should the sort order be increasing or
-    decreasing?}
+    decreasing? For the \code{"radix"} method, this can be a vector of
+    length equal to the number of arguments in \code{\dots}. For the
+    other methods, it must be length one.}
   \item{na.last}{for controlling the treatment of \code{NA}s.
     If \code{TRUE}, missing values in the data are put last; if
     \code{FALSE}, they are put first; if \code{NA}, they are removed
     (see \sQuote{Note}.)}
   \item{method}{the method to be used: partial matches are allowed.  The
     default is \code{"shell"} except for some special cases: see
-    \sQuote{Details}.  For details of methods \code{"shell"} and
-    \code{"quick"}, see the help for \code{\link{sort}}.}
+    \sQuote{Details}.  For details of methods \code{"shell"}, 
+    \code{"quick"}, and \code{"radix"},
+    see the help for \code{\link{sort}}.}
 }
 \details{
   In the case of ties in the first vector, values in the second are used
@@ -48,19 +52,20 @@
   Complex values are sorted first by the real part, then the imaginary
   part.
 
-  The sort order for character vectors will depend on the collating
-  sequence of the locale in use: see \code{\link{Comparison}}.
-
-  The default method for \code{sort.list} is a good compromise.  Method
-  \code{"quick"} is only supported for numeric \code{x} with
-  \code{na.last = NA}, and is not stable, but will be substantially
-  faster for long vectors.  Method \code{"radix"} is only implemented
-  for integer \code{x} with a range of less than 100,000.  For such
-  \code{x} it is very fast (and stable), and hence is ideal for sorting
-  factors---as from \R 3.0.0 it is the default method for factors with
-  less than 100,000 levels.  (This is also known as \emph{counting
-  sorting}.)
-
+  Except for method \code{"radix"}, the sort order for character vectors
+  will depend on the collating sequence of the locale in use: see
+  \code{\link{Comparison}}.
+
+  The \code{"shell"} method is generally the safest bet and is the
+  default method, except for factors and integer vectors, where
+  \code{"radix"} is assumed. Method \code{"radix"} stably sorts logical,
+  numeric and character vectors in linear time. It outperforms the other
+  methods, although there are caveats (see \code{\link{sort}}).  Method
+  \code{"quick"} for \code{sort.list} is only supported for numeric
+  \code{x} with \code{na.last = NA}, is not stable, and is slower than
+  \code{"radix"}. The \code{"radix"} method has less precision when
+  sorting real-valued numbers.
+  
   \code{partial = NULL} is supported for compatibility with other
   implementations of S, but no other values are accepted and ordering is
   always complete.
@@ -77,9 +82,18 @@
   more elements, when it is a double vector.
 }
 
+\section{Warning}{
+  In programmatic use it is unsafe to name the \code{\dots} arguments,
+  as the names could match current or future control
+  arguments such as \code{decreasing}.  A sometimes-encountered unsafe
+  practice is to call \code{do.call('order', df_obj)} where
+  \code{df_obj} might be a data frame: copy \code{df_obj} and
+  remove any names, for example using \code{\link{unname}}.
+}
+
 \note{
   \code{sort.list} can get called by mistake as a method for
-  \code{\link{sort}} with a list argument, and gives a suitable error
+  \code{\link{sort}} with a list argument: it gives a suitable error
   message for list \code{x}.
 
   There is a historical difference in behaviour for \code{na.last = NA}:
@@ -92,7 +106,8 @@
   both sort the non-\code{NA} values of \code{x}.
 
   Prior to \R 3.1.0 \code{method = "radix"} was only supported for
-  non-negative integers.
+  non-negative integers. Prior to \R 3.3.0 it was only supported for
+  integers of range less than 100,000.
 }
 
 \references{
@@ -120,6 +135,9 @@
 ## More generally we can make use of xtfrm
 cy <- as.character(y)
 rbind(x, y, z)[, order(x, -xtfrm(cy), z)]
+## The radix sort supports multiple 'decreasing' values:
+rbind(x, y, z)[, order(x, cy, z, decreasing = c(FALSE, TRUE, FALSE),
+                       method="radix")]
 
 ## Sorting data frames:
 dd <- transform(data.frame(x, y, z),
@@ -152,19 +170,26 @@
 (o <- order(a, b, na.last = NA)); z[o, ]
 
 \donttest{
-##  speed examples for long vectors:
-x <- factor(sample(letters, 1e6, replace = TRUE))
-system.time(o <- sort.list(x)) ## 0.4 secs
-stopifnot(!is.unsorted(x[o]))
+##  speed examples on an average laptop for long vectors:
+##  factor/small-valued integers:
+x <- factor(sample(letters, 1e7, replace = TRUE))
 system.time(o <- sort.list(x, method = "quick", na.last = NA)) # 0.1 sec
 stopifnot(!is.unsorted(x[o]))
-system.time(o <- sort.list(x, method = "radix")) # 0.01 sec
+system.time(o <- sort.list(x, method = "radix")) # 0.05 sec, 2X faster
 stopifnot(!is.unsorted(x[o]))
-xx <- sample(1:26, 1e7, replace = TRUE)
-system.time(o <- sort.list(xx, method = "radix")) # 0.1 sec
-xx <- sample(1:100000, 1e7, replace = TRUE)
-system.time(o <- sort.list(xx, method = "radix")) # 0.5 sec
-system.time(o <- sort.list(xx, method = "quick", na.last = NA)) # 1.3 sec
+##  large-valued integers:
+xx <- sample(1:200000, 1e7, replace = TRUE)
+system.time(o <- sort.list(xx, method = "quick", na.last = NA)) # 0.3 sec
+system.time(o <- sort.list(xx, method = "radix")) # 0.2 sec
+##  character vectors:
+xx <- sample(state.name, 1e6, replace = TRUE)
+system.time(o <- sort.list(xx, method = "shell")) # 2 sec
+system.time(o <- sort.list(xx, method = "radix")) # 0.007 sec, 300X faster
+##  double vectors:
+xx <- rnorm(1e6)
+system.time(o <- sort.list(xx, method = "shell")) # 0.4 sec
+system.time(o <- sort.list(xx, method = "quick", na.last = NA)) # 0.1 sec
+system.time(o <- sort.list(xx, method = "radix")) # 0.05 sec, 2X faster
 }}
 \keyword{univar}
 \keyword{manip}
diff -Nru r-base-3.2.3/src/library/base/man/Platform.Rd r-base-3.3.1/src/library/base/man/Platform.Rd
--- r-base-3.2.3/src/library/base/man/Platform.Rd	2015-10-06 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Platform.Rd	2016-05-17 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/Platform.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{.Platform}
@@ -51,8 +51,8 @@
   \item{pkgType}{
     character string, the preferred setting for
     \code{\link{options}("pkgType")}.  Values \code{"source"},
-    \code{"mac.binary"}, \code{"mac.binary.mavericks"} and
-    \code{"win.binary"} are currently in use.
+    \code{"mac.binary.mavericks"} and \code{"win.binary"} are currently
+    in use.
 
     This should \strong{not} be used to identify the OS.
   }
@@ -92,6 +92,10 @@
 
   \code{\link{.Machine}} for details of the arithmetic used, and
   \code{\link{system}} for invoking platform-specific system commands.
+
+  \code{\link{capabilities}} and \code{\link{extSoftVersion}} (and links
+  there) for availability of capabilities partly \emph{external} to \R
+  but used from \R functions.
 }
 
 \examples{
diff -Nru r-base-3.2.3/src/library/base/man/pmatch.Rd r-base-3.3.1/src/library/base/man/pmatch.Rd
--- r-base-3.2.3/src/library/base/man/pmatch.Rd	2015-08-25 22:17:41.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/pmatch.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/pmatch.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{pmatch}
@@ -68,6 +68,7 @@
   \code{\link{match}}, \code{\link{charmatch}} and
   \code{\link{match.arg}}, \code{\link{match.fun}},
   \code{\link{match.call}}, for function argument matching etc.,
+  \code{\link{startsWith}} for particular checking of initial matches;
   \code{\link{grep}} etc for more general (regexp) matching of strings.
 }
 \examples{
diff -Nru r-base-3.2.3/src/library/base/man/qraux.Rd r-base-3.3.1/src/library/base/man/qraux.Rd
--- r-base-3.2.3/src/library/base/man/qraux.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/qraux.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,7 +1,7 @@
 % File src/library/base/man/qraux.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
-% Copyright 2002-2012 The R Foundation
+% Copyright 1995-2015 R Core Team
+% Copyright 2002-2015 The R Foundation
 % Distributed under GPL 2 or later
 
 \name{QR.Auxiliaries}
@@ -9,7 +9,7 @@
 \usage{
 qr.X(qr, complete = FALSE, ncol =)
 qr.Q(qr, complete = FALSE, Dvec =)
-qr.R(qr, complete = FALSE, \dots)
+qr.R(qr, complete = FALSE)
 }
 \alias{qr.X}
 \alias{qr.Q}
@@ -35,8 +35,6 @@
   \item{Dvec}{vector (not matrix) of diagonal values.  Each column of
     the returned \eqn{\bold{Q}} will be multiplied by the corresponding
     diagonal value.  Defaults to all \code{1}s.}
-  \item{\dots}{potentially further arguments, passed potentially to
-    non-default methods.}
 }
 \description{
   Returns the original matrix from which the object was constructed or
diff -Nru r-base-3.2.3/src/library/base/man/Quotes.Rd r-base-3.3.1/src/library/base/man/Quotes.Rd
--- r-base-3.2.3/src/library/base/man/Quotes.Rd	2015-08-25 22:18:17.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Quotes.Rd	2016-03-16 23:04:01.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/Quotes.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Quotes}
@@ -97,4 +97,79 @@
 
   The  \sQuote{R Language Definition} manual.
 }
+\examples{%% NOTE: Quote the \ even  "once more" !
+'single quotes can be used more-or-less interchangeably'
+"with double quotes to create character vectors"
+
+## Single quotes inside single-quoted strings need backslash-escaping.
+## Ditto double quotes inside double-quoted strings.
+##
+identical('"It\'s alive!", he screamed.',
+          "\"It's alive!\", he screamed.") # same
+
+## Backslashes need doubling, or they have a special meaning.
+x <- "In ALGOL, you could do logical AND with /\\\\."
+print(x)      # shows it as above ("input-like")
+writeLines(x) # shows it as you like it ;-)
+
+## Single backslashes followed by a letter are used to denote
+## special characters like tab(ulator)s and newlines:
+x <- "long\tlines can be\nbroken with newlines"
+writeLines(x) # see also ?strwrap
+
+## Backticks are used for non-standard variable names.
+## (See make.names and ?Reserved for what counts as
+## non-standard.)
+`x y` <- 1:5
+`x y`
+d <- data.frame(`1st column` = rchisq(5, 2), check.names = FALSE)
+d$`1st column`
+
+## Backslashes followed by up to three numbers are interpreted as
+## octal notation for ASCII characters.
+"\110\145\154\154\157\40\127\157\162\154\144\41"
+
+## \x followed by up to two numbers is interpreted as
+## hexadecimal notation for ASCII characters.
+(hw1 <- "\x48\x65\x6c\x6c\x6f\x20\x57\x6f\x72\x6c\x64\x21")
+
+## Mixing octal and hexadecimal in the same string is OK
+(hw2 <- "\110\x65\154\x6c\157\x20\127\x6f\162\x6c\144\x21")
+
+## \u is also hexadecimal, but supported up to 4 numbers,
+## using Unicode specification.  In the previous example,
+## you can simply replace \x with \u.
+(hw3 <- "\u48\u65\u6c\u6c\u6f\u20\u57\u6f\u72\u6c\u64\u21")
+
+## The last three are all identical to
+hw <- "Hello World!"
+stopifnot(identical(hw, hw1), identical(hw1, hw2), identical(hw2, hw3))
+
+## Using Unicode makes more sense for non-latin characters.
+(nn <- "\u0126\u0119\u1114\u022d\u2001\u03e2\u0954\u0f3f\u13d3\u147b\u203c")
+
+## Mixing \x and \u throws a _parse_ error (which is not catchable!)
+\dontrun{
+  "\x48\u65\x6c\u6c\x6f\u20\x57\u6f\x72\u6c\x64\u21"
+}
+##   -->   Error: mixing Unicode and octal/hex escapes .....
+
+## \U works like \u, but supports up to eight numbers.
+## So we can replace \u with \U in the previous example.
+n2 <- "\U0126\U0119\U1114\U022d\U2001\U03e2\U0954\U0f3f\U13d3\U147b\U203c"
+stopifnot(identical(nn, n2))
+
+## Under systems supporting multi-byte locales (and not Windows),
+## \U also supports the rarer characters outside the usual 16^4 range.
+## See the R language manual,
+## https://cran.r-project.org/doc/manuals/r-release/R-lang.html#Literal-constants
+## and bug 16098 https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=16098
+"\U1d4d7" # On Windows this gives the incorrect value of "\Ud4d7"
+
+## nul characters (for terminating strings in C) are not allowed (parse errors)
+\dontrun{% as above, these errors cannot be caught via try*(..)
+  "foo\0bar"     # Error: nul character not allowed (line 1)
+  "foo\u0000bar" # same error
+}
+}
 \keyword{documentation}
diff -Nru r-base-3.2.3/src/library/base/man/rank.Rd r-base-3.3.1/src/library/base/man/rank.Rd
--- r-base-3.2.3/src/library/base/man/rank.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/rank.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -12,7 +12,7 @@
 }
 \usage{
 rank(x, na.last = TRUE,
-     ties.method = c("average", "first", "random", "max", "min"))
+     ties.method = c("average", "first", "last", "random", "max", "min"))
 }
 \arguments{
   \item{x}{a numeric, complex, character or logical vector.}
@@ -33,8 +33,9 @@
   well defined, with values in \code{seq_along(x)}.  With some values equal
   (called \sQuote{ties}), the argument \code{ties.method} determines the
   result at the corresponding indices.  The \code{"first"} method results
-  in a permutation with increasing values at each index set of ties.
-  The \code{"random"} method puts these in random order whereas the
+  in a permutation with increasing values at each index set of ties, and
+  analogously \code{"first"} with decreasing values.  The
+  \code{"random"} method puts these in random order whereas the
   default, \code{"average"}, replaces them by their mean, and
   \code{"max"} and \code{"min"} replaces them by their maximum and
   minimum respectively, the latter being the typical sports
@@ -72,6 +73,7 @@
 
 ## ranks without averaging
 rank(x2, ties.method= "first")  # first occurrence wins
+rank(x2, ties.method= "last")   #  last occurrence wins
 rank(x2, ties.method= "random") # ties broken at random
 rank(x2, ties.method= "random") # and again
 
@@ -79,5 +81,14 @@
 (rma <- rank(x2, ties.method= "max"))  # as used classically
 (rmi <- rank(x2, ties.method= "min"))  # as in Sports
 stopifnot(rma + rmi == round(r2 + r2))
+
+## Comparing all tie.methods:
+tMeth <- eval(formals(rank)$ties.method)
+rx2 <- sapply(tMeth, function(M) rank(x2, ties.method=M))
+cbind(x2, rx2)
+## ties.method's does not matter w/o ties:
+x <- sample(47)
+rx <- sapply(tMeth, function(MM) rank(x, ties.method=MM))
+stopifnot(all(rx[,1] == rx))
 }
 \keyword{univar}
diff -Nru r-base-3.2.3/src/library/base/man/raw.Rd r-base-3.3.1/src/library/base/man/raw.Rd
--- r-base-3.2.3/src/library/base/man/raw.Rd	2015-08-25 22:17:52.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/raw.Rd	2016-06-08 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/raw.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2004-2014 R Core Team
+% Copyright 2004-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{raw}
@@ -59,7 +59,9 @@
 xx <- raw(2)
 xx[1] <- as.raw(40)     # NB, not just 40.
 xx[2] <- charToRaw("A")
-xx
+xx       ## 28 41   -- raw prints hexadecimals
+dput(xx) ## as.raw(c(0x28, 0x41))
+as.integer(xx) ## 40 65
 
 x <- "A test string"
 (y <- charToRaw(x))
@@ -67,9 +69,10 @@
 rawToChar(y)
 is.raw(x)
 is.raw(y)
+stopifnot( charToRaw("\xa3") == as.raw(0xa3) )
 
 isASCII <-  function(txt) all(charToRaw(txt) <= as.raw(127))
 isASCII(x)  # true
-isASCII("\x9c25.63") # false (in Latin-1, this is an amount in UK pounds)
+isASCII("\xa325.63") # false (in Latin-1, this is an amount in UK pounds)
 }
 \keyword{classes}
diff -Nru r-base-3.2.3/src/library/base/man/RdUtils.Rd r-base-3.3.1/src/library/base/man/RdUtils.Rd
--- r-base-3.2.3/src/library/base/man/RdUtils.Rd	2015-08-25 22:18:14.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/RdUtils.Rd	2016-02-26 23:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/RdUtils.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{RdUtils}
@@ -45,7 +45,12 @@
   \env{RD2PDF_INPUTENC} can be set to \code{inputenx} to make use of the
   LaTeX package of that name rather than \code{inputenc}: this might be
   needed for better support of the UTF-8 encoding.
-
+  
+  \command{R CMD Rd2pdf} calls \code{tools::\link{texi2pdf}} to produce
+  its PDF file: see its help for the possibilities for the
+  \command{texi2dvi} command which that function uses (and which can be
+  overridden by setting environment variable \env{R_TEXI2DVICMD}).
+  
   Use \command{R CMD \var{foo} --help} to obtain usage information on utility
   \code{\var{foo}}.
 }
diff -Nru r-base-3.2.3/src/library/base/man/regex.Rd r-base-3.3.1/src/library/base/man/regex.Rd
--- r-base-3.2.3/src/library/base/man/regex.Rd	2015-11-19 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/regex.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -206,10 +206,11 @@
   For complete details please consult the man pages for PCRE (and not
   PCRE2), especially \command{man pcrepattern} and \command{man
   pcreapi}), on your system or from the sources at
-  \url{http://www.pcre.org}. If PCRE support was compiled from the
-  sources within \R (the default), the PCRE version is 8.37 as described
-  here.  (The version in use can be found by calling
-  \code{\link{extSoftVersion}}.)
+  \url{http://www.pcre.org}.  (The version in use can be found by
+  calling \code{\link{extSoftVersion}}.  It need not be the version
+  described in the system's man page.  As PCRE has been feature-frozen
+  for some time, the man pages at
+  \url{http://www.pcre.org/original/doc/html/} should be a good match.)
 
   Perl regular expressions can be computed byte-by-byte or
   (UTF-8) character-by-character: the latter is used in all multibyte
@@ -293,8 +294,8 @@
   properties see the PCRE documentation, but for example \samp{Lu} is
   \sQuote{upper case letter} and \samp{Sc} is \sQuote{currency symbol}.
   (This support depends on the PCRE library being compiled with
-  \sQuote{Unicode property support}: an external library might not be.
-  It can be checked \emph{via} \code{\link{pcre_config}}.)
+  \sQuote{Unicode property support} which can be checked \emph{via}
+  \code{\link{pcre_config}}.)
 
   The sequence \samp{(?#} marks the start of a comment which continues
   up to the next closing parenthesis.  Nested parentheses are not
diff -Nru r-base-3.2.3/src/library/base/man/regmatches.Rd r-base-3.3.1/src/library/base/man/regmatches.Rd
--- r-base-3.2.3/src/library/base/man/regmatches.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/regmatches.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -36,6 +36,11 @@
   matches similar to \code{\link{strsplit}} (for vector match data, at
   most a single split is performed).
 
+  If \code{invert} is \code{NA}, \code{regmatches} extracts both
+  non-matched and matched substrings, always starting and ending with a
+  non-match (empty if the match occurred at the beginning or the end,
+  respectively).
+
   Note that the match data can be obtained from regular expression
   matching on a modified version of \code{x} with the same numbers of
   characters.
@@ -52,7 +57,7 @@
 \value{
   For \code{regmatches}, a character vector with the matched substrings
   if \code{m} is a vector and \code{invert} is \code{FALSE}.  Otherwise,
-  a list with the matched or non-matched substrings.
+  a list with the matched or/and non-matched substrings.
 
   For \code{regmatches<-}, the updated character vector.
 }
@@ -79,10 +84,7 @@
 m <- gregexpr("\\\\([^)]*\\\\)", x)
 ## Write a little utility for creating blank strings with given numbers
 ## of characters.
-blanks <- function(n) {
-     vapply(Map(rep.int, rep.int(" ", length(n)), n, USE.NAMES = FALSE),
-           paste, "", collapse = "")
-}
+blanks <- function(n) strrep(" ", n)
 ## Create a copy of x with the parenthesized parts blanked out.
 s <- x
 regmatches(s, m) <- Map(blanks, lapply(regmatches(s, m), nchar))
diff -Nru r-base-3.2.3/src/library/base/man/Rhome.Rd r-base-3.3.1/src/library/base/man/Rhome.Rd
--- r-base-3.2.3/src/library/base/man/Rhome.Rd	2015-08-25 22:17:41.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Rhome.Rd	2016-01-29 23:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/Rhome.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Rhome}
@@ -44,9 +44,10 @@
   set on startup and should not be altered).
 
   On Windows the values of \code{R.home()} and \env{R_HOME} are
-  guaranteed not to contain spaces, switching to the 8.3 short form of
-  path elements if required.  The value of \env{R_HOME} is set to use
-  forward slashes (since many package maintainers pass it unquoted to
-  shells, for example in \file{Makefile}s).
+  switched to the 8.3 short form of path elements if required and if
+  the Windows service to do that is enabled.  The value of
+  \env{R_HOME} is set to use forward slashes (since many package
+  maintainers pass it unquoted to shells, for example in
+  \file{Makefile}s).  
 }
 \keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/scan.Rd r-base-3.3.1/src/library/base/man/scan.Rd
--- r-base-3.2.3/src/library/base/man/scan.Rd	2015-08-25 22:17:41.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/scan.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/scan.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{scan}
@@ -97,7 +97,9 @@
   \item{na.strings}{character vector.  Elements of this vector are to be
     interpreted as missing (\code{\link{NA}}) values.  Blank fields are
     also considered to be missing values in logical, integer, numeric
-    and complex fields.}
+    and complex fields.  Note that the test happens \emph{after} 
+    white space is stripped from the input, so \code{na.strings} values 
+    may need their own white space stripped in advance.}
 
   \item{flush}{logical: if \code{TRUE}, \code{scan} will flush to the
     end of the line after reading the last of the fields requested.
diff -Nru r-base-3.2.3/src/library/base/man/search.Rd r-base-3.3.1/src/library/base/man/search.Rd
--- r-base-3.2.3/src/library/base/man/search.Rd	2015-08-25 22:17:57.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/search.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,16 +1,17 @@
 % File src/library/base/man/search.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{search}
 \title{Give Search Path for R Objects}
+\alias{search}
+\alias{searchpaths}
+\alias{.rmpkg}% not yet: to get pkg name from search()
 \usage{
 search()
 searchpaths()
 }
-\alias{search}
-\alias{searchpaths}
 \description{
   Gives a list of \code{\link{attach}}ed \emph{packages}
   (see \code{\link{library}}), and \R objects, usually
diff -Nru r-base-3.2.3/src/library/base/man/setTimeLimit.Rd r-base-3.3.1/src/library/base/man/setTimeLimit.Rd
--- r-base-3.2.3/src/library/base/man/setTimeLimit.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/setTimeLimit.Rd	2016-02-01 23:15:12.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/setTimeLimit.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{setTimeLimit}
@@ -17,8 +17,8 @@
 setSessionTimeLimit(cpu = Inf, elapsed = Inf)
 }
 \arguments{
-  \item{cpu}{double.  Limit on total cpu time.}
-  \item{elapsed}{double.  Limit on elapsed time.}
+  \item{cpu, elapsed}{double (of length one).  Set a limit on
+    the total or elapsed cpu time in seconds, respectively.}
   \item{transient}{logical.  If \code{TRUE}, the limits apply only to
     the rest of the current computation.}
 }
diff -Nru r-base-3.2.3/src/library/base/man/shQuote.Rd r-base-3.3.1/src/library/base/man/shQuote.Rd
--- r-base-3.2.3/src/library/base/man/shQuote.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/shQuote.Rd	2015-12-24 23:15:04.000000000 +0000
@@ -10,13 +10,13 @@
   Quote a string to be passed to an operating system shell.
 }
 \usage{
-shQuote(string, type = c("sh", "csh", "cmd"))
+shQuote(string, type = c("sh", "csh", "cmd", "cmd2"))
 }
 \arguments{
   \item{string}{a character vector, usually of length one.}
-  \item{type}{character: the type of shell.  Partial matching is
-    supported.  \code{"cmd"} refers to the Windows NT shell, and is the
-    default under Windows.}
+  \item{type}{character: the type of shell quoting.  Partial matching is
+    supported.  \code{"cmd"} and \code{"cmd2"} refer to the Windows shell.
+    \code{"cmd"} is the default under Windows.} 
 }
 \details{
   The default type of quoting supported under Unix-alikes is that for
@@ -36,32 +36,34 @@
   exclamation mark and double quote).  As a last resort, we need to
   split the string into pieces not containing single quotes and surround
   each with single quotes, and the single quotes with double quotes.
-
-#ifdef windows
-  The Windows shell supports only double quoting.  All this
-  implementation does is to surround the string by double quotes and
-  escape internal double quotes by a backslash.  As Windows path names
-  cannot contain double quotes, this makes \code{shQuote} safe for use
-  with file paths in \code{\link{system}}, and with \code{\link{shell}}
-  if the default shell is used.
-
-  It will usually be safe to use \code{shQuote} to quote arguments of a
-  command, but because \code{\link{system}} does not use a shell,
-  interpretation of quoted arguments is done by the run-time code of the
-  executable.  This may depend on the compiler used: Microsoft's rules
-  for the C run-time are given at
-  \url{https://msdn2.microsoft.com/en-us/library/ms880421.aspx}.
-#endif
-}
-\references{
-  Loukides, M. \emph{et al} (2002)
-  \emph{Unix Power Tools} Third Edition.  O'Reilly.  Section 27.12.
+  
+  In Windows, command line interpretation is done by the application
+  as well as the shell.  It may depend on the compiler used:
+  Microsoft's rules for the C run-time are given at 
+  \url{https://msdn.microsoft.com/library/ms880421}. It may depend on
+  the whim of the programmer of the application: check its
+  documentation.  The \code{type = "cmd"} quoting surrounds the string
+  by double quotes and escapes internal double quotes by a backslash.
+  As Windows path names cannot contain double quotes, this makes
+  \code{shQuote} safe for use with many applications when used with
+  \code{\link{system}} or \code{\link{system2}}.  The Windows
+  \command{cmd.exe} shell (used by default with \code{\link{shell}})
+  uses \code{type = "cmd2"} quoting:  special characters are prefixed
+  with \code{"^"}.  In some cases, two types of quoting should be
+  used:  first for the application, and then \code{type = "cmd2"} 
+  for \command{cmd.exe}.  See the examples below.  
+}
+  
+\references{ Loukides, M. \emph{et al} (2002) \emph{Unix Power Tools}
+  Third Edition. O'Reilly.  Section 27.12.
+  
+  Discussion in \PR{16636}.
 
 % gone in Jan 2015  
 % \url{http://www.mhuffman.com/Notes/dos/bash_cmd.htm}
 }
 \seealso{
-  \code{Quotes} for quoting \R code.
+  \link{Quotes} for quoting \R code.
 
   \code{\link{sQuote}} for quoting English text.
 }
@@ -77,8 +79,12 @@
 \dontrun{system(paste("echo", shQuote(tryit)))}
 cat(shQuote(tryit, type = "csh"), "\n")
 
-## Windows-only example.
-perlcmd <- 'print "Hello World\\n";'
-\dontrun{shell(paste("perl -e", shQuote(perlcmd, type = "cmd")))}
+## Windows-only example, assuming cmd.exe:
+perlcmd <- 'print "Hello World\\\\n";'
+\dontrun{
+shell(shQuote(paste("perl -e", 
+                    shQuote(perlcmd, type = "cmd")),
+              type = "cmd2"))
+}
 }
 \keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/sink.Rd r-base-3.3.1/src/library/base/man/sink.Rd
--- r-base-3.2.3/src/library/base/man/sink.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/sink.Rd	2016-05-12 22:15:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/sink.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{sink}
@@ -26,7 +26,7 @@
     sink and to the current output stream, like the Unix program \code{tee}.}
 }
 \description{
-  \code{sink} diverts \R output to a connection.
+  \code{sink} diverts \R output to a connection (and stops such diversions).
 
   \code{sink.number()} reports how many diversions are in use.
 
@@ -34,7 +34,8 @@
   connection currently being used for error messages.
 }
 \details{
-  \code{sink} diverts \R output to a connection.  If \code{file} is a
+  \code{sink} diverts \R output to a connection (and must be used again
+  to finish such a diversion, see below!).  If \code{file} is a
   character string, a file connection with that name will be established
   for the duration of the diversion.
 
@@ -99,14 +100,14 @@
 i <- 1:10
 outer(i, i, "*")
 sink()
-unlink("sink-examp.txt")
+\dontshow{unlink("sink-examp.txt")}% don't show what confuses newbies
 \donttest{
 ## capture all the output to a file.
 zz <- file("all.Rout", open = "wt")
 sink(zz)
 sink(zz, type = "message")
 try(log("a"))
-## back to the console
+## revert output back to the console -- only then access the file!
 sink(type = "message")
 sink()
 file.show("all.Rout")
diff -Nru r-base-3.2.3/src/library/base/man/sort.Rd r-base-3.3.1/src/library/base/man/sort.Rd
--- r-base-3.2.3/src/library/base/man/sort.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/sort.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -20,14 +20,16 @@
 \method{sort}{default}(x, decreasing = FALSE, na.last = NA, \dots)
 
 sort.int(x, partial = NULL, na.last = NA, decreasing = FALSE,
-         method = c("shell", "quick"), index.return = FALSE)
+         method = c("shell", "quick", "radix"), index.return = FALSE)
 }
 \arguments{
   \item{x}{for \code{sort} an \R object with a class or a numeric,
     complex, character or logical vector.  For \code{sort.int}, a
     numeric, complex, character or logical vector, or a factor.}
   \item{decreasing}{logical.  Should the sort be increasing or decreasing?
-     Not available for partial sorting.}
+    For the \code{"radix"} method, this can be a vector of
+    length equal to the number of arguments in \code{\dots}. For the
+    other methods, it must be length one. Not available for partial sorting.}
   \item{\dots}{arguments to be passed to or from methods or (for the
     default methods and objects without a class) to \code{sort.int}.}
   \item{na.last}{for controlling the treatment of \code{NA}s.
@@ -37,8 +39,9 @@
   \item{method}{character string specifying the algorithm used.  Not
     available for partial sorting.  Can be abbreviated.}
   \item{index.return}{logical indicating if the ordering index vector should
-    be returned as well; this is only available for a few cases, the default
-    \code{na.last = NA} and full sorting of non-factors.}
+    be returned as well. Supported by \code{method == "radix"} for any
+    \code{na.last} mode and data type, and the other methods when
+    \code{na.last = NA} (the default) and fully sorting non-factors.}
 }
 \details{
   \code{sort} is a generic function for which methods can be written,
@@ -53,7 +56,8 @@
   Complex values are sorted first by the real part, then the imaginary
   part.
 
-  The sort order for character vectors will depend on the collating
+  Except for method \code{"radix"},
+  the sort order for character vectors will depend on the collating
   sequence of the locale in use: see \code{\link{Comparison}}.
   The sort order for factors is the order of their levels (which is
   particularly appropriate for ordered factors).
@@ -85,9 +89,42 @@
   performance in the rare worst case.  (Peto's modification using a
   pseudo-random midpoint is used to make the worst case rarer.)  This is
   not a stable sort, and ties may be reordered.
-
-  Factors with less than 100,000 levels are sorted by radix sorting when
-  \code{method} is not supplied: see \code{\link{sort.list}}.
+  
+  Method \code{"radix"} relies on simple hashing to scale time linearly
+  with the input size, i.e., its asymptotic time complexity is O(n). The
+  specific variant and its implementation originated from the data.table
+  package and are due to Matt Dowle and Arun Srinivasan.  For small
+  inputs (< 200), the implementation uses an insertion sort (O(n^2))
+  that operates in-place to avoid the allocation overhead of the radix
+  sort. For integer vectors of range less than 100,000, it switches to a
+  simpler and faster linear time counting sort. In all cases, the sort
+  is stable; the order of ties is preserved. It is the default method
+  for integer vectors and factors.
+
+  The \code{"radix"} method generally outperforms the other methods,
+  especially for character vectors and small integers. Compared to quick
+  sort, it is slightly faster for (large) integers and double vectors
+  (but unlike quick sort, radix is stable and supports all
+  \code{na.last} options). The implementation is order of magnitudes
+  faster than shell sort for character vectors, in part thanks to clever
+  use of the internal \code{CHARSXP} table.
+
+  However, there are some caveats with the radix sort:
+  \itemize{
+    \item{
+      If \code{x} is a \code{character} vector, all elements must share
+      the same encoding. Only UTF-8 (including ASCII) and Latin-1
+      encodings are supported. Collation always follows the "C" locale.
+    }
+    \item{
+      There is a small loss of precision when comparing double
+      values. This may be configurable in the future.
+    }
+    \item{
+      Long vectors (with more than 2^32 elements) and \code{complex}
+      vectors are not supported yet.
+    }
+  }
 }
 
 \value{
@@ -97,14 +134,17 @@
   specific method the default method will be used and is equivalent to
   \code{x[order(x, ...)]}: this depends on the class having a suitable
   method for \code{[} (and also that \code{\link{order}} will work,
-  which is not the case for a class based on a list).
+  which requires a \code{\link{xtfrm}} method).
 
   For \code{sort.int} the value is the sorted vector unless
   \code{index.return} is true, when the result is a list with components
   named \code{x} and \code{ix} containing the sorted numbers and the
   ordering index vector.  In the latter case, if \code{method ==
     "quick"} ties may be reversed in the ordering (unlike
-  \code{sort.list}) as quicksort is not stable.  NB: the index vector
+  \code{sort.list}) as quicksort is not stable.  For \code{method ==
+  "radix"}, \code{index.return} is supported for all \code{na.last}
+  modes. The other methods only support \code{index.return}
+  when \code{na.last} is \code{NA}, so the index vector
   refers to element numbers \emph{after removal of \code{NA}s}: see
   \code{\link{order}} if you want the original element numbers.
 
@@ -147,10 +187,10 @@
 x; sort(x); sort(x, partial = c(10, 15))
 
 ## illustrate 'stable' sorting (of ties):
-sort(c(10:3, 2:12), method = "sh", index.return = TRUE) # is stable
+sort(c(10:3, 2:12), method = "shell", index.return = TRUE) # is stable
 ## $x : 2  3  3  4  4  5  5  6  6  7  7  8  8  9  9 10 10 11 12
 ## $ix: 9  8 10  7 11  6 12  5 13  4 14  3 15  2 16  1 17 18 19
-sort(c(10:3, 2:12), method = "qu", index.return = TRUE) # is not
+sort(c(10:3, 2:12), method = "quick", index.return = TRUE) # is not
 ## $x : 2  3  3  4  4  5  5  6  6  7  7  8  8  9  9 10 10 11 12
 ## $ix: 9 10  8  7 11  6 12  5 13  4 14  3 15 16  2 17  1 18 19
 
@@ -168,7 +208,7 @@
   x <- rnorm(N)
   c1[is] <- system.time(for(i in 1:rep) sort(x, method = "shell"))[1]
   c2[is] <- system.time(for(i in 1:rep) sort(x, method = "quick"))[1]
-  stopifnot(sort(x, method = "s") == sort(x, method = "q"))
+  stopifnot(sort(x, method = "shell") == sort(x, method = "quick"))
 }
 rbind(ShellSort = c1, QuickSort = c2)
 cat("Speedup factor of quick sort():\n")
@@ -178,7 +218,9 @@
 x <- rnorm(1e7)
 system.time(x1 <- sort(x, method = "shell"))
 system.time(x2 <- sort(x, method = "quick"))
+system.time(x3 <- sort(x, method = "radix"))
 stopifnot(identical(x1, x2))
+stopifnot(all.equal(x1, x3)) # imprecision in radix sort
 }}
 \keyword{univar}
 \keyword{manip}
diff -Nru r-base-3.2.3/src/library/base/man/source.Rd r-base-3.3.1/src/library/base/man/source.Rd
--- r-base-3.2.3/src/library/base/man/source.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/source.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/source.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{source}
diff -Nru r-base-3.2.3/src/library/base/man/sprintf.Rd r-base-3.3.1/src/library/base/man/sprintf.Rd
--- r-base-3.2.3/src/library/base/man/sprintf.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/sprintf.Rd	2016-03-02 23:02:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/sprintf.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{sprintf}
@@ -186,7 +186,7 @@
   Describes the format options in table B-1 in the Appendix.
 
   The C Standards, especially ISO/IEC 9899:1999 for \sQuote{C99}.  Links
-  can be found at \url{http://developer.r-project.org/Portability.html}.
+  can be found at \url{https://developer.r-project.org/Portability.html}.
 
   \command{man sprintf} on a Unix-alike system.
 }
diff -Nru r-base-3.2.3/src/library/base/man/startsWith.Rd r-base-3.3.1/src/library/base/man/startsWith.Rd
--- r-base-3.2.3/src/library/base/man/startsWith.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/startsWith.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -0,0 +1,57 @@
+\name{startsWith}
+\title{Does String Start or End With Another String?}
+\alias{endsWith}
+\alias{startsWith}
+\description{
+  Determines if entries of \code{x} start or end with string (entries of)
+  \code{prefix} or \code{suffix} respectively, where strings are
+  recycled to common lengths.
+
+  \code{startsWith()} is equivalent to but much faster than
+  \preformatted{substring(x, 1, nchar(prefix)) == prefix}
+  or also \preformatted{grepl("^<prefix>", x)} where \code{prefix} is
+  not to contain special regular expression characters.
+}
+\usage{
+startsWith(x, prefix)
+  endsWith(x, suffix)
+}
+\arguments{
+  \item{x}{vector of \code{\link{character}} string whose \dQuote{starts}
+    are considered.}
+  \item{prefix, suffix}{\code{\link{character}} vector (often of length one).}
+}
+\details{
+  The code has an optimized branch for the most common usage in which
+  \code{prefix} or \code{suffix} is of length one, and is further
+  optimized in a UTF-8 or 8-byte locale if that is an ASCII string.
+}
+\value{
+  A \code{\link{logical}} vector, of \dQuote{common length} of \code{x}
+  and \code{prefix} (or \code{suffix}), i.e., of the longer of the two
+  lengths unless one of them is zero when the result is
+  also of zero length.  A shorter input is recycled to the output length.
+}
+%\author{Martin Maechler}
+\seealso{
+  \code{\link{grepl}}, \code{\link{substring}}; the partial string
+  matching functions \code{\link{charmatch}} and \code{\link{pmatch}}
+  solve a different task.
+}
+\encoding{UTF-8}
+\examples{
+startsWith(search(), "package:") # typically at least two FALSE, nowadays often three
+
+x1 <- c("Foobar", "bla bla", "something", "another", "blu", "brown",
+        "blau blüht der Enzian")# non-ASCII
+x2 <- cbind(
+      startsWith(x1, "b"),
+      startsWith(x1, "bl"),
+      startsWith(x1, "bla"),
+        endsWith(x1, "n"),
+        endsWith(x1, "an"))
+rownames(x2) <- x1; colnames(x2) <- c("b", "b1", "bla", "n", "an")
+x2
+}
+\keyword{character}
+\keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/strptime.Rd r-base-3.3.1/src/library/base/man/strptime.Rd
--- r-base-3.2.3/src/library/base/man/strptime.Rd	2015-09-25 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/strptime.Rd	2016-04-25 22:02:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/strptime.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{strptime}
@@ -71,7 +71,7 @@
   \code{\link{LC_TIME}} locale category.  The \sQuote{current locale} of
   the descriptions might mean the locale in use at the start of the \R
   session or when these functions are first used.
-  
+
   % strftime is C99: strptime is POSIX.
   The details of the formats are platform-specific, but the following are
   likely to be widely available: most are defined by the POSIX standard.
@@ -210,7 +210,7 @@
   truncated to \code{0 <= n <= 6} decimal places (and if \code{\%OS} is
   not followed by a digit, it uses the setting of
   \code{\link{getOption}("digits.secs")}, or if that is unset, \code{n =
-  3}).  Further, for \code{strptime} \code{\%OS} will input seconds
+  0}).  Further, for \code{strptime} \code{\%OS} will input seconds
   including fractional seconds.  Note that \code{\%S} does not read
   fractional parts on output. 
 
@@ -231,7 +231,7 @@
   \code{strptime} turns character representations into an object of
   class \code{"\link{POSIXlt}"}.  The time zone is used to set the
   \code{isdst} component and to set the \code{"tzone"} attribute if
-  \code{tz != ""}. If the specified time is invalid (for example
+  \code{tz != ""}.  If the specified time is invalid (for example
   \samp{"2010-02-30 08:00"}) all the components of the result are
   \code{NA}.  (NB: this does means exactly what it says -- if it is an
   invalid time, not just a time that does not exist in some time zone.)
diff -Nru r-base-3.2.3/src/library/base/man/strrep.Rd r-base-3.3.1/src/library/base/man/strrep.Rd
--- r-base-3.2.3/src/library/base/man/strrep.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/strrep.Rd	2016-03-16 23:03:57.000000000 +0000
@@ -0,0 +1,39 @@
+% File src/library/base/man/strrep.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 2015 R Core Team
+% Distributed under GPL 2 or later
+
+\name{strrep}
+\alias{strrep}
+\title{Repeat the Elements of a Character Vector}
+\description{
+  Repeat the character strings in a character vector a given number of
+  times (i.e., concatenate the respective numbers of copies of the
+  strings).
+}
+\usage{
+strrep(x, times)
+}
+\arguments{
+  \item{x}{a character vector, or an object which can be coerced to a
+    character vector using \code{as.character}.}
+  \item{times}{an integer vector giving the (non-negative) numbers of
+    times to repeat the respective elements of \code{x}.}
+}
+\details{
+  The elements of \code{x} and \code{times} will be recycled as
+  necessary (if one has no elements, and empty character vector is
+  returned).  Missing elements in \code{x} or \code{times} result in
+  missing elements of the return value.
+}
+\value{
+  A character vector with the elements of the given character vector
+  repeated the given numbers of times.
+}
+\examples{
+strrep("ABC", 2)
+strrep(c("A", "B", "C"), 1 : 3)
+## Create vectors with the given numbers of spaces:
+strrep(" ", 1 : 5)
+}
+\keyword{character}
diff -Nru r-base-3.2.3/src/library/base/man/switch.Rd r-base-3.3.1/src/library/base/man/switch.Rd
--- r-base-3.2.3/src/library/base/man/switch.Rd	2015-08-25 22:17:40.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/switch.Rd	2016-03-30 22:02:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/switch.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{switch}
@@ -41,11 +41,14 @@
   \code{2}.  If there is more than one match, the first matching element
   is used.  In the case of no match, if there is a unnamed element of
   \code{\dots} its value is returned.  (If there is more than one such
-  argument an error is returned.)
+  argument an error is signaled.)
 
   The first argument is always taken to be \code{EXPR}: if it is named
   its name must (partially) match.
 
+  A warning is signaled if no alternatives are provides, as this is
+  usually a coding error.
+  
   This is implemented as a \link{primitive} function that only evaluates
   its first argument and one other if one is selected.
 }
@@ -93,7 +96,7 @@
 ff <- gl(3,1, labels=LETTERS[3:1])
 ff[1] # C
 ## so one might expect " is C" here, but
-switch(ff[1], A = "I am A", B="Bb..", C=" is C")# -> "A"
+switch(ff[1], A = "I am A", B="Bb..", C=" is C")# -> "I am A"
 ## so we give a warning
 
 ## Numeric EXPR does not allow a default value to be specified
diff -Nru r-base-3.2.3/src/library/base/man/table.Rd r-base-3.3.1/src/library/base/man/table.Rd
--- r-base-3.2.3/src/library/base/man/table.Rd	2015-08-25 22:17:40.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/table.Rd	2016-03-16 23:03:53.000000000 +0000
@@ -12,6 +12,7 @@
 \alias{as.table}
 \alias{as.table.default}
 \alias{is.table}
+\alias{[.table}
 
 \concept{counts}
 \concept{frequencies}
@@ -23,8 +24,10 @@
   table of the counts at each combination of factor levels.
 }
 \usage{
-table(\dots, exclude = if (useNA == "no") c(NA, NaN), useNA = c("no",
-    "ifany", "always"), dnn = list.names(\dots), deparse.level = 1)
+table(\dots,
+      exclude = if (useNA == "no") c(NA, NaN),
+      useNA = c("no", "ifany", "always"),
+      dnn = list.names(\dots), deparse.level = 1)
 
 as.table(x, \dots)
 is.table(x)
diff -Nru r-base-3.2.3/src/library/base/man/tapply.Rd r-base-3.3.1/src/library/base/man/tapply.Rd
--- r-base-3.2.3/src/library/base/man/tapply.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/tapply.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/tapply.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{tapply}
@@ -102,6 +102,17 @@
 table(ind)
 tapply(1:3, ind) #-> the split vector
 tapply(1:3, ind, sum)
+
+## Some assertions (not held by all patch propsals):
+nq <- names(quantile(1:5))
+stopifnot(
+  identical(tapply(1:3, ind), c(1L, 2L, 4L)),
+  identical(tapply(1:3, ind, sum),
+            matrix(c(1L, 2L, NA, 3L), 2, dimnames = list(c("1", "2"), c("A", "B")))),
+  identical(tapply(1:n, fac, quantile)[-1],
+            array(list(`2` = structure(c(2, 5.75, 9.5, 13.25, 17), .Names = nq),
+                 `3` = structure(c(3, 6, 9, 12, 15), .Names = nq),
+                 `4` = NULL, `5` = NULL), dim=4, dimnames=list(as.character(2:5)))))
 }
 \keyword{iteration}
 \keyword{category}
diff -Nru r-base-3.2.3/src/library/base/man/taskCallbackManager.Rd r-base-3.3.1/src/library/base/man/taskCallbackManager.Rd
--- r-base-3.2.3/src/library/base/man/taskCallbackManager.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/taskCallbackManager.Rd	2016-03-02 23:02:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/taskCallbackManager.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{taskCallbackManager}
@@ -76,7 +76,7 @@
   \code{\link{addTaskCallback}},
   \code{\link{removeTaskCallback}},
   \code{\link{getTaskCallbackNames}}\\
-  \url{http://developer.r-project.org/TaskHandlers.pdf}
+  \url{https://developer.r-project.org/TaskHandlers.pdf}
 }
 \examples{
 # create the manager
diff -Nru r-base-3.2.3/src/library/base/man/taskCallbackNames.Rd r-base-3.3.1/src/library/base/man/taskCallbackNames.Rd
--- r-base-3.2.3/src/library/base/man/taskCallbackNames.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/taskCallbackNames.Rd	2016-03-02 23:02:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/taskCallbackNames.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{taskCallbackNames}
@@ -34,7 +34,7 @@
   \code{\link{addTaskCallback}},
   \code{\link{removeTaskCallback}},
   \code{\link{taskCallbackManager}}\\
-  \url{http://developer.r-project.org/TaskHandlers.pdf}
+  \url{https://developer.r-project.org/TaskHandlers.pdf}
 }
 \examples{
  n <- addTaskCallback(function(expr, value, ok, visible) {
diff -Nru r-base-3.2.3/src/library/base/man/taskCallback.Rd r-base-3.3.1/src/library/base/man/taskCallback.Rd
--- r-base-3.2.3/src/library/base/man/taskCallback.Rd	2015-08-25 22:17:56.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/taskCallback.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/taskCallback.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{taskCallback}
@@ -84,39 +84,37 @@
 \seealso{
   \code{\link{getTaskCallbackNames}}
   \code{\link{taskCallbackManager}}
-  \url{http://developer.r-project.org/TaskHandlers.pdf}
+  \url{https://developer.r-project.org/TaskHandlers.pdf}
 }
 \examples{
 times <- function(total = 3, str = "Task a") {
-   ctr <- 0
-
-   function(expr, value, ok, visible) {
+  ctr <- 0
+  function(expr, value, ok, visible) {
     ctr <<- ctr + 1
     cat(str, ctr, "\n")
-    if(ctr == total) {
+    keep.me <- (ctr < total)
+    if (!keep.me)
       cat("handler removing itself\n")
-    }
-    return(ctr < total)
-   }
- }
-
- # add the callback that will work for
- # 4 top-level tasks and then remove itself.
- n <- addTaskCallback(times(4))
-
- # now remove it, assuming it is still first in the list.
- removeTaskCallback(n)
-
-\dontrun{
-# There is no point in running this
-# as
- addTaskCallback(times(4))
-
- sum(1:10)
- sum(1:10)
- sum(1:10)
- sum(1:10)
- sum(1:10)
+
+    # return
+    keep.me
+  }
 }
+
+# add the callback that will work for
+# 4 top-level tasks and then remove itself.
+n <- addTaskCallback(times(4))
+
+# now remove it, assuming it is still first in the list.
+removeTaskCallback(n)
+
+## See how the handler is called every time till "self destruction":
+
+addTaskCallback(times(4)) # counts as once already
+
+sum(1:10) ; mean(1:3) # two more
+sinpi(1)              # 4th - and "done"
+cospi(1)
+tanpi(1)
 }
 \keyword{environment}
diff -Nru r-base-3.2.3/src/library/base/man/tempfile.Rd r-base-3.3.1/src/library/base/man/tempfile.Rd
--- r-base-3.2.3/src/library/base/man/tempfile.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/tempfile.Rd	2016-04-20 22:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/tempfile.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{tempfile}
@@ -30,6 +30,12 @@
 
   Both will use backslash as the path separator.
 #endif
+#ifdef unix
+  
+  The value will be an absolute path (unless \code{tmpdir} is set to a
+  relative path), but it need not be canonical (see
+  \code{\link{normalizePath}}) and on OS X usually is not.
+#endif
 }
 \details{
   The length of the result is the maximum of the lengths of the three
diff -Nru r-base-3.2.3/src/library/base/man/timezones.Rd r-base-3.3.1/src/library/base/man/timezones.Rd
--- r-base-3.2.3/src/library/base/man/timezones.Rd	2015-09-25 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/timezones.Rd	2016-02-20 23:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/timezones.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{timezones}
@@ -62,15 +62,16 @@
   affiliation between major time zones, have opted out of (or in to) DST
   in various years or adopted DST rule changes late or not at all.
   
-  A quite common system implementation of \code{POSIXct} is as
-  signed 32-bit integers and so only goes back to the end of 1901: on
-  such systems \R assumes that dates prior to that are in the same time
-  zone as they were in 1902.  Most of the world had not adopted time
-  zones by 1902 (so used local \sQuote{mean time} based on longitude)
-  but for a few places there had been time-zone changes before then.
-  64-bit representations are becoming common; unfortunately on some
-  64-bit OSes (notably OS X) the database information is only available
-  for the range 1901--2038, and incompletely for the end years.
+  A quite common system implementation of \code{POSIXct} is as signed
+  32-bit integers and so only goes back to the end of 1901: on such
+  systems \R assumes that dates prior to that are in the same time zone
+  as they were in 1902.  Most of the world had not adopted time zones by
+  1902 (so used local \sQuote{mean time} based on longitude) but for a
+  few places there had been time-zone changes before then.  64-bit
+  representations are becoming common; unfortunately on some 64-bit OSes
+  (notably OS X) the database information is 32-bit and so only
+  available for the range 1901--2038, and incompletely for the end
+  years.
 }
 
 \value{
@@ -117,9 +118,9 @@
   The abbreviations used have changed over the years: for example France
   used \samp{PMT} (\sQuote{Paris Mean Time}) from 1891 to 1911 then
   \samp{WET/WEST} up to 1940 and \samp{CET/CEST} from 1946.  (In almost
-  all time zones they have been stable since 1970.)  The POSIX standard
-  allows only one or two abbreviations per time zone, so you may see the
-  current abbreviation(s) used for older times.
+  all time zones the abbreviations have been stable since 1970.)  The
+  POSIX standard allows only one or two abbreviations per time zone, so
+  you may see the current abbreviation(s) used for older times.
   
   The function \code{OlsonNames} returns the time-zone names known to
   the Olson/IANA database on the current system. The system-specific
@@ -161,6 +162,25 @@
   before the switch to a standard time.  For example, Paris codified its
   LMT as \sQuote{Paris Mean Time} in 1891 (to be used throughout
   mainland France) and switched to \samp{GMT+0} in 1911.
+
+  %% it is a ksh script so could well pop up elsewhere.
+  Some systems (notably Linux) have \command{tzselect} command which
+  allows the interactive selection of a supported time zone name.
+}
+
+\section{Warning}{
+%% glibc and OS X have _POSIX_TZNAME_MAX and define it as 6.
+%% Earlier versions of R's code assumed 10, and it was discovered
+%% that some implemntations did not abbreviate unusual names, thereby
+%% exceeding this.
+%% Olson's tzcode has a limit of 255 and does not check: this has been
+%% corrected in R's copy.
+%% sysconf(_SC_TZNAME_MAX) might allow it to be checked:
+%% that gives 27 on OS X.  However, seems it is dynamic on glibc.
+  There is a system-specific upper limit on the number of bytes in
+  (abbreviated) time-zone names which can be as low as 6 (as required by
+  POSIX).  Some OSes allow the setting of time zones with names which
+  exceed their limit, and that can crash the \R session.
 }
 
 \note{
diff -Nru r-base-3.2.3/src/library/base/man/traceback.Rd r-base-3.3.1/src/library/base/man/traceback.Rd
--- r-base-3.2.3/src/library/base/man/traceback.Rd	2015-08-25 22:17:54.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/traceback.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,21 +1,27 @@
 % File src/library/base/man/traceback.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{traceback}
+\title{Get and Print Call Stacks}
 \alias{traceback}
+\alias{.traceback}
 \alias{.Traceback}
-\title{Print Call Stacks}
 \description{
   By default \code{traceback()} prints the call stack of the last
   uncaught error, i.e., the sequence of calls that lead to the error.
   This is useful when an error occurs with an unidentifiable error
   message.  It can also be used to print the current stack or
   arbitrary lists of deparsed calls.
+
+  \code{.traceback()} now \emph{returns} the above call stack (and
+  \code{traceback(x, *)} can be regarded as convenience function for
+  printing the result of \code{.traceback(x)}).
 }
 \usage{
 traceback(x = NULL, max.lines = getOption("deparse.max.lines"))
+.traceback(x = NULL)
 }
 \arguments{
   \item{x}{\code{NULL} (default, meaning \code{.Traceback}), or an
@@ -68,7 +74,7 @@
 bar <- function(x) { x + a.variable.which.does.not.exist }
 \dontrun{
 foo(2) # gives a strange error
-traceback()}
+traceback()}%dont
 ## 2: bar(2)
 ## 1: foo(2)
 bar
diff -Nru r-base-3.2.3/src/library/base/man/tracemem.Rd r-base-3.3.1/src/library/base/man/tracemem.Rd
--- r-base-3.2.3/src/library/base/man/tracemem.Rd	2015-08-25 22:17:40.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/tracemem.Rd	2016-03-02 23:02:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/tracemem.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{tracemem}
@@ -62,7 +62,7 @@
 
   \code{\link{trace}}, \code{\link{Rprofmem}}
 
-  \url{http://developer.r-project.org/memory-profiling.html}
+  \url{https://developer.r-project.org/memory-profiling.html}
 }
 \examples{\dontrun{
 a <- 1:10
diff -Nru r-base-3.2.3/src/library/base/man/trace.Rd r-base-3.3.1/src/library/base/man/trace.Rd
--- r-base-3.2.3/src/library/base/man/trace.Rd	2015-08-25 22:18:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/trace.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -15,8 +15,9 @@
   call to \code{\link{browser}} or \code{\link{recover}}) at chosen
   places in any function.  A call to \code{untrace} cancels the tracing.
   Specified methods can be traced the same way, without tracing all
-  calls to the function.  Trace code can be any \R expression.  Tracing
-  can be temporarily turned on or off globally by calling \code{tracingState}.
+  calls to the generic function.  Trace code (\code{tracer}) can be any
+  \R expression.  Tracing can be temporarily turned on or off globally
+  by calling \code{tracingState}.
 }
 \usage{
 trace(what, tracer, exit, at, print, signature,
@@ -75,7 +76,7 @@
   (Yes, it's subtle, but the semantics here are central to how
   namespaces work in R.)
   }
-  \item{on}{logical; a call to  the support function \code{tracingState} returns \code{TRUE}
+  \item{on}{logical; a call to the support function \code{tracingState} returns \code{TRUE}
     if tracing is globally turned on, \code{FALSE} otherwise.  An
     argument of one or the other of those values sets the state.  If the
     tracing state is \code{FALSE}, none of the trace actions will
@@ -201,7 +202,7 @@
 }
 \note{
   Using \code{trace()} is conceptually a generalization of
-  \code{\link{debug}}, implemented differently, by calling
+  \code{\link{debug}}, implemented differently.  Namely by calling
   \code{\link{browser}} via its \code{tracer} or \code{exit} argument.
   %% On the other hand, it sometimes triggers less consistently
   %% ?? lacks features of debug()- (which ??)
@@ -303,7 +304,7 @@
 ## has a namespace, so the where= argument must be used
 ## to get the right version of lm)
 
-trace(lm, exit = recover, where = nlme)
+trace(lm, exit = recover, where = asNamespace("nlme"))
 }
 %%}% only if 'methods'
 }
diff -Nru r-base-3.2.3/src/library/base/man/userhooks.Rd r-base-3.3.1/src/library/base/man/userhooks.Rd
--- r-base-3.2.3/src/library/base/man/userhooks.Rd	2015-10-06 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/userhooks.Rd	2016-03-16 23:03:57.000000000 +0000
@@ -100,10 +100,9 @@
 \note{
   Hooks need to be set before the event they modify: for standard
   packages this can be problematic as \pkg{methods} is loaded and
-  attached early in the startup sequence and currently that loads the
-  \pkg{utils} namepace.   The usual place to set hooks such as the
-  example below is in the \file{.Rprofile} file, but that will not work
-  for \pkg{methods} and \pkg{utils}.
+  attached early in the startup sequence.   The usual place to set hooks
+  such as the example below is in the \file{.Rprofile} file, but that
+  will not work for \pkg{methods}.
 }
 
 \seealso{
diff -Nru r-base-3.2.3/src/library/base/man/validUTF8.Rd r-base-3.3.1/src/library/base/man/validUTF8.Rd
--- r-base-3.2.3/src/library/base/man/validUTF8.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/validUTF8.Rd	2016-03-16 23:04:00.000000000 +0000
@@ -0,0 +1,66 @@
+% File src/library/base/man/validUTF8.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 2015 R Core Team
+% Distributed under GPL 2 or later
+
+\name{validUTF8}
+\alias{validUTF8}
+\alias{validEnc}
+\title{
+  Check if a Character Vector is Validly Encoded
+}
+
+\description{
+  Check if each element of a character vector is valid in its implied
+  encoding.
+}
+
+\usage{
+validUTF8(x)
+
+validEnc(x)
+}
+
+\arguments{
+  \item{x}{A character vector.}
+}
+
+\details{
+  These use similar checks to those used by functions such as
+  \code{\link{grep}}.
+
+  \code{validUTF8} ignores any marked encoding (see
+  \code{\link{Encoding}}) and so looks directly if the bytes in each
+  string are valid UTF-8.
+
+  \code{validEnc} regards character strings as validly encoded unless
+  their encodings are marked as UTF-8 or they are unmarked and the \R
+  session is in a UTF-8 or other multi-byte locale.  (The checks in
+  other multi-byte locales depend on the OS and as with
+  \code{\link{iconv}} not all invalid inputs may be detected.)
+}
+
+\note{
+  It would be possible to check for the validity of character strings in
+  a Latin-1 encoding, but extensions such as CP1252 are widely accepted
+  as \sQuote{Latin-1} and 8-bit encodings rarely need to be checked for
+  validity.
+}
+
+\value{
+  A logical vector of the same length as \code{x}.   \code{NA} elements
+  are regarded as validly encoded.
+}
+
+\examples{
+x <-
+  ## from example(text)
+c("Jetz", "no", "chli", "z\xc3\xbcrit\xc3\xbc\xc3\xbctsch:",
+  "(noch", "ein", "bi\xc3\x9fchen", "Z\xc3\xbc", "deutsch)",
+   ## from a CRAN check log
+   "\xfa\xb4\xbf\xbf\x9f")
+validUTF8(x)
+validEnc(x) # depends on the locale
+Encoding(x) <-"UTF-8"
+validEnc(x)
+}
diff -Nru r-base-3.2.3/src/library/base/man/Vectorize.Rd r-base-3.3.1/src/library/base/man/Vectorize.Rd
--- r-base-3.2.3/src/library/base/man/Vectorize.Rd	2015-08-25 22:18:12.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/Vectorize.Rd	2015-12-14 23:15:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/Vectorize.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2011 R Core Team
+% Copyright 1995-2015 R Core Team
 % Copyright 2002-2010 The R Foundation
 % Distributed under GPL 2 or later
 
@@ -34,6 +34,11 @@
 
   \code{Vectorize} cannot be used with primitive functions as they do
   not have a value for \code{\link{formals}}.
+  
+  It also cannot be used with functions that have arguments named
+  \code{FUN}, \code{vectorize.args}, \code{SIMPLIFY} or
+  \code{USE.NAMES}, as they will interfere with the \code{Vectorize}
+  arguments.  See the \code{combn} example below for a workaround.  
 }
 \value{
   A function with the same arguments as \code{FUN}, wrapping a call to
@@ -68,6 +73,12 @@
 K <- seq(0, 0.15, length.out = 40)
 SSvals <- outer(Vm, K, vSS, Treated$rate, Treated$conc)
 contour(Vm, K, SSvals, levels = (1:10)^2, xlab = "Vm", ylab = "K")
+
+# combn() has an argument named FUN
+combnV <- Vectorize(function(x, m, FUNV = NULL) combn(x, m, FUN = FUNV),
+                    vectorize.args = c("x", "m"))
+combnV(4, 1:4)
+combnV(4, 1:4, sum)
 }
 \keyword{manip}
 \keyword{utilities}
diff -Nru r-base-3.2.3/src/library/base/man/vector.Rd r-base-3.3.1/src/library/base/man/vector.Rd
--- r-base-3.2.3/src/library/base/man/vector.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/vector.Rd	2016-03-16 23:03:56.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/vector.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{vector}
@@ -18,15 +18,16 @@
 \arguments{
   \item{mode}{character string naming an atomic mode or
     \code{"list"} or \code{"expression"} or (except for \code{vector})
-    \code{"any"}.}
+    \code{"any"}.  Currently, \code{is.vector()} allows any type (see
+    \code{\link{typeof}}) for \code{mode}, and when mode is not
+    \code{"any"}, \code{is.vector(x, mode)} is almost the same as
+    \code{typeof(x) == mode}.}% differences: for mode = NA, or mode = "numeric"
   \item{length}{a non-negative integer specifying the desired length.
     For a long vector, i.e., \code{length > .Machine$integer.max}, it
     has to be of type \code{"double"}.  Supplying an argument of length
     other than one is an error.}
   \item{x}{an \R object.}
 }
-%% The implementation of is.vector allows any _type_ to be named,
-%% and MM uses "symbol" and "language" in str.default()
 \description{
   \code{vector} produces a vector of the given length and mode.
 
diff -Nru r-base-3.2.3/src/library/base/man/weekday.POSIXt.Rd r-base-3.3.1/src/library/base/man/weekday.POSIXt.Rd
--- r-base-3.2.3/src/library/base/man/weekday.POSIXt.Rd	2015-08-25 22:17:55.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/weekday.POSIXt.Rd	2016-05-17 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/base/man/weekday.POSIXt.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2009 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{weekdays}
@@ -41,7 +41,8 @@
 }
 \arguments{
   \item{x}{an object inheriting from class \code{"POSIXt"} or \code{"Date"}.}
-  \item{abbreviate}{logical.  Should the names be abbreviated?}
+  \item{abbreviate}{logical vector (possibly recycled).  Should the names be
+    abbreviated?}
   \item{origin}{an length-one object inheriting from class
     \code{"POSIXt"} or \code{"Date"}.}
   \item{\dots}{arguments for other methods.}
diff -Nru r-base-3.2.3/src/library/base/man/withVisible.Rd r-base-3.3.1/src/library/base/man/withVisible.Rd
--- r-base-3.2.3/src/library/base/man/withVisible.Rd	2015-08-25 22:18:15.000000000 +0000
+++ r-base-3.3.1/src/library/base/man/withVisible.Rd	2016-05-17 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/withVisible.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2010 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{withVisible}
@@ -28,9 +28,9 @@
 \seealso{\code{\link{invisible}}, \code{\link{eval}}}
 \examples{
 x <- 1
-withVisible(x <- 1)
+withVisible(x <- 1) # *$visible is FALSE
 x
-withVisible(x)
+withVisible(x)      # *$visible is TRUE
 
 # Wrap the call in evalq() for special handling
 
diff -Nru r-base-3.2.3/src/library/base/po/da.po r-base-3.3.1/src/library/base/po/da.po
--- r-base-3.2.3/src/library/base/po/da.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/da.po	2016-04-27 22:15:37.000000000 +0000
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2015-03-25 21:34+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -128,173 +128,174 @@
 msgid "problem in displaying '%ls'"
 msgstr "problem med visning af '%ls'"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "ugyldigt '%s'-argument"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "Windowsversion er ikke understøttet"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "ukorrekt argument"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "vær ikke fjollet!: din maskine har en 4GB adressebegrænsning"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "kan ikke formindske hukommelsesbegrænsning: ignoreret"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' skal være en tegnvektor"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "ugyldig enhed"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "kræver SDI-tilstand"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "ugyldig grafisk enhedsnummer"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "ugyldig enhed"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "ugyldige inddata i 'Rmbstowcs'"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "filvalg afbrudt"
 
@@ -335,185 +336,184 @@
 msgid "'names' is not a character vector"
 msgstr "'names' er ikke en tegnvektor"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "tegnstreng forventet som første argument"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "tegnstreng forventet som tredje argument"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "kørende kommando '%s' havde status %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "nåede tidsbegrænsningen for sessionen"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "nåede tidsbegrænsningen"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "nåede CPU-tidsbegrænsningen for sessionen"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "nåede CPU-tidsbegrænsningen"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Fatal fejl: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "kodning '%s' blev ikke genkendt"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<FEJL: genkodningsfejl fra kodning '%s'>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "kan ikke åbne fil '%s': %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): fil '%s' findes ikke\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "ADVARSEL: R_MAX_MEM_SIZE-værdien er ugyldig: ignoreres\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "ADVARSEL: ingen max-mem-size angivet\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "ADVARSEL: --max-mem-size-værdi er ugyldig: ignoreres\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "ADVARSEL: --max-mem-size=%lu%c: er for stor og ignoreres\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "ADVARSEL: --max-mem-size=%4.1fM: er for lille og ignoreres\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "ADVARSEL: --max-mem-size=%4.0fM: er for stor og taget som %uM\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr "tilvalg '%s' kræver et argument"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "tilvalg '%s' kræver et ikketomt argument"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "ADVARSEL: '-e %s' udeladt som inddata er for langt\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "ADVARSEL: ukendt tilvalg '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGUMENT '%s' __ignoreret__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "kan ikke bruge -e med -f eller --file"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "oprettelse midlertidig fil mislykkedes - sæt TMPDIR på passende vis?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "du skal angive '--save', '--no-save' eller '--vanilla'"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "umuligt at oprette 'reader thread'; du skal frigive nogle systemressourcer"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr ""
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr "ADVARSEL: ingen værdi angivet for --encoding"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "ADVARSEL: tilvalg '%s' er ikke længere understøttet"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "ADVARSEL: ingen værdi angivet for '%s'"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "ADVARSEL: værdien '%s' er ugyldig: ignoreres"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "ADVARSEL: %s: for store og ignoreres"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "ADVARSEL: ingen værdi angivet for '--max-ppsize'"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr ""
 
@@ -611,7 +611,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "kunne ikke allokere plads for 'name'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "tegnargument forventet"
 
@@ -669,7 +669,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "der opstod et problem ved indstilling af variabel »%s« i Renviron"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr "argument '%s' skal være en tegnstreng"
@@ -700,9 +700,9 @@
 msgid "invalid multibyte format string"
 msgstr ""
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -712,7 +712,7 @@
 msgstr ""
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr ""
 
@@ -723,8 +723,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr ""
@@ -732,7 +732,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr ""
@@ -747,7 +747,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr ""
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr ""
@@ -756,29 +756,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "'FUN.VALUE' skal være en vektor"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "ugyldig '%s'-værdi"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "ugyldig længde"
 
@@ -810,7 +810,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr ""
 
@@ -822,215 +822,215 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr ""
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr ""
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr ""
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr ""
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "ugyldig arguemnt for unær-operator"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "ugyldig unær-operator"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr ""
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr ""
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d argument sendt til '%s' som kræver 1 eller 2 argumenter"
 msgstr[1] "%d argumenter sendt til '%s' som kræver 1 eller 2 argumenter"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr ""
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr ""
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr ""
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr ""
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr ""
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr ""
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr ""
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr ""
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr ""
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr ""
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr ""
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr ""
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr ""
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr ""
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'%s' skal være en liste"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr ""
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr ""
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr ""
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr ""
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr ""
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr ""
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr ""
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr ""
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' skal være numerisk"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "'object' er for kort"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr "'dims' kan ikke have længden 0"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr "'x' skal have en positiv længde"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1093,200 +1093,201 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr ""
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr ""
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr ""
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr ""
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr ""
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' skal være en liste"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr ""
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr ""
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr ""
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr ""
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr ""
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr ""
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr ""
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr ""
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr ""
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "attributter skal være navngivet"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr ""
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr ""
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr ""
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "ugyldig type '%s' for pladsnavn"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr ""
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr ""
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr ""
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr ""
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "type '%s' er ikke implementeret i '%s'"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr ""
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr ""
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr ""
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "klassenavnet er for langt i '%s'"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "kan ikke oprette en matrix fra typen '%s'"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr ""
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr ""
@@ -1295,227 +1296,244 @@
 msgid "vector size cannot be NA"
 msgstr "vektorstørrelse kan ikke være NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr ""
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr ""
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr ""
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "brug af NULL-miljø er fejlramt"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "argument må ikke være en funktion"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "erstatningsobjekt er ikke et miljø"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' skal være et miljø"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "argument er ikke et miljø"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "det tomme miljø har ingen overdel"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "kunne ikke angive overdel for tomt miljø"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr "kan ikke angive overmiljøet for et navnerum"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr "kan ikke angive overmiljøet for pakkeimport"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' er ikke et miljø"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "kan ikke skrive til denne forbindelse"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "ugyldig '%s'-specifikation"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr ""
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr ""
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr ""
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr ""
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "ugyldigt argument"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "ugyldig værdi"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr ""
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr ""
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR skal være en længde 1 vektor"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d argument sendt til '%s' som kræver 1 eller 2 argumenter"
 msgstr[1] "%d argumenter sendt til '%s' som kræver 1 eller 2 argumenter"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr ""
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
-msgstr ""
-
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
 #: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
+msgstr "ugyldige understrengsargumenter"
+
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr "ugyldige understrengsargumenter"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+msgid "non-character object(s)"
+msgstr ""
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr ""
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr ""
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr ""
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr ""
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr ""
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr ""
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr ""
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr ""
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr ""
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr ""
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr ""
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr ""
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr ""
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr ""
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr ""
 
@@ -1527,7 +1545,7 @@
 msgid "applies only to lists and vectors"
 msgstr ""
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr ""
 
@@ -1535,7 +1553,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr ""
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr ""
 
@@ -1543,178 +1561,174 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr ""
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "ugyldige data for tilstand '%s' (for kort)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr ""
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr ""
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr ""
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr ""
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr ""
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr ""
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr ""
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr ""
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr ""
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr ""
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "standardmetode er endnu ikke implementeret for type '%s'"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "'name' mangler"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "første argument skal være en tegnstreng"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what' skal være en tegnstreng eller en funktion"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'type' skal være en tegnstreng"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr "'args' skal være en liste eller et udtryk"
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' skal være en liste"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' skal være et miljø"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "ugyldigt miljø angivet"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr ""
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr ""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr ""
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr ""
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "ugyldig kompleks unær-operator"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr ""
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr ""
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr ""
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr ""
 
@@ -1726,7 +1740,7 @@
 msgid "connection not found"
 msgstr "forbindelse ikke fundet"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "ugyldig forbindelse"
 
@@ -1735,9 +1749,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "lukker ubrugt forbindelse %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr ""
@@ -1819,8 +1833,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "for stor en blok angivet"
 
@@ -1848,8 +1862,8 @@
 msgstr "allokering af fifo-forbindelse mislykkedes"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr ""
 
@@ -1859,14 +1873,14 @@
 msgstr ""
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "kan ikke åbne forbindelsen"
@@ -1933,7 +1947,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr ""
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr ""
@@ -1953,12 +1967,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr ""
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "hukommelsesallokering til kopier udklipsholder mislykkedes"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "udklipsholder kan ikke åbnes eller indeholder ingen tekst"
 
@@ -2061,326 +2075,322 @@
 msgid "'con' is not an output textConnection"
 msgstr ""
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "sokler er ikke tilgængelig på dette system"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' er ikke en forbindelse"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "kan ikke åbne standardforbindelser"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "forbindelse er allerede åben"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "ukendt 'rw'-værdi"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "kan ikke lukke standardforbindelser"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr "kan ikke lukke 'output'-datakanalforbindelse"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr "kan ikke lukke 'message'-datakanalforbindelse"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "forbindelse er ikke åben"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr "linje længere end bufferstørrelse"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "kan ikke læse fra denne forbindelse"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "kan ikke allokere buffer i readLines"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr "linje %d ser ud til at indeholde en indlejret nul"
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "ufuldstændig endelig linje fundet på '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "for få linjer læst i readLines"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "ufuldstændig streng i filendelsen er blevet fjernet"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "kan kun læse fra en binær forbindelse"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr ""
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "størrelse %d er ukendt på denne maskine"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw er altid størrelse 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr ""
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "kan kun skrive til en binær forbindelse"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "kun 2^31-1 byte kan skrives til en rå vektor"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "kun 2^31-1 byte kan skrives i et enkelt writeBin()-kald"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "problem ved skrivning til forbindelse"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr ""
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr ""
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "'object' er for kort"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr ""
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr ""
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr ""
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr ""
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "datakanalstak er fuld"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr ""
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "ingen datakanal at fjerne"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr "der er ingen forbindelse NA"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "der er ingen forbindelse %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "metode = »wininet« er kun understøttet på Windows"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr ""
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr ""
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr ""
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "crc-fejl %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "skrivefejl på 'gzcon'-forbindelse"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' skal være en af 0 ... 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'onOff' skal være TRUE (SAND) eller FALSE (FALSK)"
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr ""
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr ""
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr ""
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr ""
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr ""
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "ikke en sokkelforbindelse"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "ukendt komprimering, antager ingen"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr "allokering af %s-forbindelse mislykkedes"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr ""
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr ""
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "kun positive værdier for 'n' er tilladt"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "ingen funktion at genstarte"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr ""
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "ingen browserkontekst at forespørge"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr ""
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr ""
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "intern fejl i 'do_sys'"
 
@@ -2388,37 +2398,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr ""
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "ukendt cumxxx-funktion"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "der opstod et problem med indstilling af tidszonen"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "kan ikke instille tidszoner på dette system"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "problem med at fjerne indstilling for tidszone"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr ""
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "kunne ikke allokere hukomemlse for 'read.dcf'"
 
@@ -2432,11 +2442,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr ""
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr ""
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "argument skal være en funktion"
 
@@ -2445,7 +2451,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "Værdi for '%s' skal være TRUE (sand) eller FALSE (falsk)"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "argument må ikke være en funktion"
 
@@ -2461,58 +2467,58 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr ""
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr ""
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr ""
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr ""
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr "file' skal være en tegnstreng eller forbindelse"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "skrev for få tegn"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr ""
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr "nullængde for argument"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr ""
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "objekt '%s' blev ikke fundet"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "ugyldigt udformet funktionsudtryk"
 
@@ -2524,15 +2530,15 @@
 msgid "no active or default device"
 msgstr "ingen aktiv enhed eller standardenhed"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "for mange åbne enheder"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "ikke nok hukommelse til at allokere enhed (i GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr ""
 
@@ -2618,7 +2624,7 @@
 msgid "too many arguments, sorry"
 msgstr "for mange argumenter, beklager"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr ""
 
@@ -2769,7 +2775,7 @@
 msgid "invalid argument to edit()"
 msgstr "ugyldigt argument for edit()"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "kan ikke åbne fil"
 
@@ -2829,12 +2835,12 @@
 msgstr ""
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr ""
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr ""
 
@@ -2863,82 +2869,96 @@
 msgid "raster capture is not available for this device"
 msgstr ""
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr ""
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr ""
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr ""
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr ""
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr ""
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr ""
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr ""
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr ""
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr "ugyldig skærmliste"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "'expr'-argumentet skal være et udtryk"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr ""
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr ""
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr ""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr ""
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr ""
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr ""
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr ""
 
@@ -2947,7 +2967,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr ""
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr ""
 
@@ -2963,682 +2983,686 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr ""
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr ""
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr ""
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr ""
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr ""
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr ""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr ""
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr ""
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr ""
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr ""
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr ""
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr ""
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "kan ikke fjerne variabler fra denne database"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "objekt '%s' for tilstand '%s' blev ikke fundet"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "ugyldigt navn i position %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "forkert længde for '%s'-argument"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "ugyldig brug af 'missing'"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' kan kun bruges for argumenter"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos' skal være et heltal"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "alle elementer på en liste skal være navngivet"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach' virker kun forlister, datarammer og miljøer"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr ""
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "argument skal være et miljø"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "arguments skal være symbolske"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr ""
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr ""
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr ""
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "S4-objekt udvider ikke klasse \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "ugyldigt objekt for 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "ikke et miljø"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "ikke et symbol"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "ingen binding for \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "ikke en funktion"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "symbol har allerede en regulær binding"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "kan ikke ændre aktive binding hvis binding er låst"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "ukendt op"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr ""
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr ""
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr ""
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr "navnerum er allerede registreret"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr "navnerum er ikke registreret"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "ugyldigt arguement for importmiljø"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "ugyldigt argument for eksportmiljø"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "længden på import- og eksportnavne skal matche"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "eksporteret symbol '%s' har ingen værdi"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "ukendt kodning: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "indlejret nul i streng: '%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr ""
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr "[... afkortet]"
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "ugyldig indstilling \"warning.expression\""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(konverteret fra advarsel) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr "Advarsel i %s :"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr "Kald:"
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Mistede advarselsbeskeder\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Advarselsbesked:"
 msgstr[1] "Advarselsbeskeder:"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr "I %s :"
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "Der var %d advarsel (brug warnings() for at se dem)"
 msgstr[1] "Der var %d advarsler (brug warnings() for at se dem)"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 "Der var %d eller flere advarsler (brug warnings() for at se den første %d)"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr ""
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Fejl i "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr "Fejl i %s (fra %s) : "
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr "Fejl i %s : "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Fejl: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr ""
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "ugyldig tilvalg »error«\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Kørsel stoppet\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr "'%s' skal være en tegnstreng"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [ugyldig streng i stop(.)]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [ugyldig streng i warning(.)]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "forkert antal argumenter for \"%s\""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "funktion ikke implementeret i %s"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "ugyldigt antal argumenter"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr ""
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr ""
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "argumenter er ikke kompatible"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "ukendt fejl (rapporter denne!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr ""
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "ukendt advarsel (rapporter denne !)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "Ingen funktion at returnere fra, hopper til øverste niveau"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr ""
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "ugyldige håndtagsdata"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "fejlbesked er ikke en streng"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "ugyldig fejlbesked"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "ugyldig restart"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr ""
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr ""
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "fejlbesked skal være en tegnstreng"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: Kan ikke åbne profilfil '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "R-profilering er ikke tilgængelig på dette system"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr ""
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "argument mangler, uden nogen standard"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr ""
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "argument %d er tomt"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "kunne ikke finde symbol »%s« i miljø for den generiske funktion"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "symbol »%s« er ikke i metodemiljø"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "betingelsen har længde > 1 og kun det første element vil blive brugt"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "manglende værdi hvor TRUE/FALSE er krævet"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "argument kan ikke fortolkes som logisk"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "argument har længden nul"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr ""
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr ""
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr ""
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr ""
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr ""
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr ""
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr ""
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr ""
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr ""
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr ""
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "'%s' mangler"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr ""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "ugyldigt '%s'-argument af typen '%s'"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr ""
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr ""
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr ""
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr ""
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr ""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr ""
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "\"%s\" er ikke en %s-funktion"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr "ugyldig opcode"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr ""
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr ""
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr ""
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr ""
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr ""
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr ""
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr ""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr ""
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr ""
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr ""
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr ""
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr ""
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr ""
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr ""
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr ""
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr ""
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr ""
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr ""
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr ""
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr "bytekodeprofilering er ikke understøttet i denne bygning"
 
@@ -3655,15 +3679,15 @@
 msgid "this graphics device does not support event handling"
 msgstr "denne grafiskenhed understøtter ikke hændelseshandling"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr ""
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr ""
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr ""
 
@@ -3842,7 +3866,7 @@
 msgstr ""
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr ""
@@ -3930,24 +3954,22 @@
 msgid "internet routines cannot be accessed in module"
 msgstr ""
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
+msgid "socket routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
-msgid "socket routines cannot be loaded"
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
 msgstr ""
 
 #: src/main/lapack.c:39
@@ -3958,38 +3980,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr ""
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr ""
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr ""
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr ""
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "Unær-operator `!' kaldt med to argumenter"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr ""
@@ -3998,61 +4020,75 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "skrivefejl under filtilføjelse"
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Kørsel stoppet\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr ""
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr ""
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr ""
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr ""
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "kan ikke åbne og læse fil"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr ""
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr ""
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr ""
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr ""
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr ""
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr ""
 
@@ -4095,164 +4131,169 @@
 msgstr[0] "ubrugt argument %s"
 msgstr[1] "ubrugte argumenter %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr ""
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "ikke en svag reference"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr ""
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr ""
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr ""
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr ""
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr ""
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr ""
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr ""
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr ""
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr ""
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr ""
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr ""
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr ""
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr ""
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr ""
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr ""
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr ""
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr ""
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr ""
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr ""
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr ""
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr ""
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr ""
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ""
 
@@ -4291,221 +4332,226 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr ""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr ""
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr ""
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr ""
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr ""
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr ""
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr ""
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ""
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr ""
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr ""
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr ""
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr ""
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr ""
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr ""
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr ""
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'onOff' skal være TRUE (SAND) eller FALSE (FALSK)"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr ""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr "argument for 'standardGeneric' skal være en ikketom tegnstreng"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr ""
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
 "\"set\", or \"suppress\""
 msgstr ""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr ""
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr ""
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr ""
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr ""
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr ""
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr "'methods'-pakke endnu ikke indlæst"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "objekt for klasse »%s« korresponderer ikke til et gyldigt S3-objekt"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr ""
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr ""
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr ""
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr ""
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "ugyldig værdi for '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'type' skal være en tegnstreng"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" er blevet erstattet af \"device.ask.default\""
 
@@ -4529,11 +4575,16 @@
 msgid "first argument must be atomic"
 msgstr ""
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "file' skal være en tegnstreng eller forbindelse"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "Umulig tilstand ( x )"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr ""
 
@@ -4541,210 +4592,193 @@
 msgid "invalid filename specification"
 msgstr "ugyldig filnavnsspecifikation"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "skrivefejl under filtilføjelse"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "intet at tilføje til"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr ""
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr ""
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr ""
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr ""
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 "symbolske henvisninger er ikke understøttet på denne version af Windows"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr "symbolske henvisninger er ikke understøttet på denne platform"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "kan ikke lænke '%ls' til '%ls', årsag '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "kan ikke lænke '%s' til '%s', årsag '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "'from' og 'to' er af forskellig længde"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "udvidet 'from'-navn er for langt"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "udvidet 'to'-navn er for langt"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "kan ikke omdøbe fil '%s' til '%s', årsag '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "ugyldigt regulært udtryk for 'pattern'"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr ""
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "filnavn er for langt"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr ""
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "læsefejl på '%s'"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "angivelse af 'LC_NUMERIC' kan få R til at fungere mærkeligt"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr ""
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr ""
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr ""
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr ""
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' findes allerede"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "kan ikke oprette mappe '%s', årsag '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls' findes allerede"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "kan ikke oprette mappe '%ls', årsag '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr ""
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "problem ved oprettelse af mappe %ls: %s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "problem ved læsning af mappe %ls: %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr ""
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr "problem ved læsning af mappe %s: %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "problem med at kopiere %s til %s: %s"
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode' skal mindst have længden en"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "utilstrækkelig OS-understøttelse på denne platform"
 
@@ -4789,67 +4823,71 @@
 msgid "Metric information not available for this family/device"
 msgstr ""
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr ""
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "ugyldige rækkeetiketter"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "ugyldige kolonneetiketter"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ""
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' skal være et ikkenegativt heltal"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr ""
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr ""
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr ""
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr ""
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr ""
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr ""
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr ""
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 
@@ -4857,44 +4895,44 @@
 msgid "argument is not a numeric vector"
 msgstr ""
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr ""
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr ""
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr ""
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr ""
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr ""
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr ""
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr "argument skal være en tegnvektor med længden 1"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
@@ -4902,295 +4940,295 @@
 "argument skal være en tegnvektor med længden 1\n"
 "alle undtagen det første element vil blive ignoreret"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr "argument 'x' skal være en rå vektor"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "argument 'multiple' skal være TRUE (SAND) eller FALSE (FALSK)"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr "argument 'shift' skal være et lille heltal"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr "argument 'x' skal være en heltalsvektor"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "argument 'x' skal være rå, heltal eller logisk"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "argument 'x' skal være et multiplum af %d i længden"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr "argument 'x' må ikke indeholder NA'er"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr "ugyldig UTF-8-streng"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr ""
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr ""
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr ""
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr ""
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr "'a' og 'b' skal have den samme type"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "læsefejl"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr ""
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr ""
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr ""
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr ""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr ""
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr ""
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr ""
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr ""
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr ""
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr ""
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr ""
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr ""
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr ""
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr ""
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr ""
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr ""
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr ""
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr ""
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr ""
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr ""
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr ""
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5205,7 +5243,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr ""
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr ""
 
@@ -5213,7 +5251,7 @@
 msgid "empty 'what' specified"
 msgstr ""
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr ""
@@ -5246,34 +5284,34 @@
 msgid "embedded nul(s) found in input"
 msgstr "indlejret nuller fundet i streng"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr ""
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr ""
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr ""
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr ""
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr ""
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr ""
@@ -5506,53 +5544,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "kun atomare vektorer kan testes for sortering"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' skal være SAND eller FALSK"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "kun atomare vektorer kan sorteres"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "rå vektorer kan ikke sorteres"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr "indeks %ld uden for grænserne"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "NA-indeks"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "indeks %d uden for grænserne"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "argument %d er ikke en vektor"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "argumentlængder er forskellige"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "ugyldig ties.method for rank() [bør aldrig ske]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "for stort interval for værdier i 'x'"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5562,23 +5596,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr ""
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr ""
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr ""
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr ""
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr ""
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr ""
 
@@ -5633,38 +5667,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr ""
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr ""
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr ""
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr ""
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr ""
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr ""
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr ""
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "ej understøttet type"
 
@@ -5672,251 +5706,247 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: mellemlager for lille"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr ""
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr ""
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "erstatning har længden nul"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr ""
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr ""
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr ""
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr ""
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr ""
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr ""
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr ""
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr ""
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr ""
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr ""
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "intern fejl i brugen af rekursiv indeksering"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "rekursiv indeksering mislykkedes på niveau %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "intet sådant indeks på niveau %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "ukorrekt antal kolonner i matrix-underskript"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "negative værdier er ikke tilladt i et matrix-underskript"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr ""
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr ""
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr ""
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr ""
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr ""
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "intet indeks angivet"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr ""
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr ""
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr ""
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr ""
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr ""
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr ""
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr ""
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr ""
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr ""
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "ingen argumenter"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr ""
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr ""
 
@@ -5929,8 +5959,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "kodning for et filnavn kan ikke være 'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -5963,94 +5993,95 @@
 msgid "no 'fileext'"
 msgstr "ingen 'fileext'"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr "systemkald mislykkedes: %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "forkert type for argument"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "forkert længde for argument"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'Sys.setenv' er ikke tilgængelig på dette system"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr ""
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
-msgstr ""
+#: src/main/sysutils.c:658
+#, fuzzy
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
+msgstr "'what' skal være en tegnstreng eller en funktion"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' skal kaldes på en CHARSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr "intern fejl: ingen oversættelse krævet"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "ikke understøttet konvertering til '%s' fra kodeside %d"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr ""
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr ""
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr "kan ikke allokere 'R_TempDir'"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr ""
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr ""
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr ""
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr ""
 
@@ -6085,31 +6116,31 @@
 msgid "'nmax' must be positive"
 msgstr "'nmax' skal være positiv"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr ""
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr ""
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr ""
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr ""
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr ""
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr ""
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr ""
 
@@ -6117,142 +6148,142 @@
 msgid "object is not a matrix"
 msgstr ""
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr ""
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr ""
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr ""
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr ""
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr ""
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr ""
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr ""
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr ""
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr ""
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr ""
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr ""
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr ""
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr ""
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr ""
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr ""
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr "'breaks' er ikke sorteret"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "lang vektor '%s' er ikke understøttet"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr "'x' skal være en vektor"
 
@@ -6301,7 +6332,7 @@
 msgid "There must be at least three control points"
 msgstr ""
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr ""
@@ -6322,210 +6353,216 @@
 "Consider using X11 with colortype=\"pseudo.cube\" or \"gray\"."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr ""
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "kan ikke åbne adresse '%s'"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr ""
 
@@ -6537,29 +6574,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr ""
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr ""
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr ""
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr ""
@@ -6569,31 +6606,37 @@
 msgid "cannot open URL '%s'"
 msgstr "kan ikke åbne adresse '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr ""
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "kan ikke åbne: HTTP-status var '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "InternetOpenUrl mislykkedes: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "kan ikke åbne: HTTP-status var '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "curlGetHeaders er ikke understøttet på denne platform"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr "ugyldigt %s-argument"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
@@ -6602,106 +6645,126 @@
 "libcurl-fejlkode %d\n"
 "\t%s\n"
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 "download.file(method = \"libcurl\") er ikke understøttet på denne platform"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "længden på 'url' og 'destfile' skal matche"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "kan ikke åbne fifo '%s', årsag '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "kan ikke åbne zip-filen '%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "kan ikke læse fra denne forbindelse"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "kan ikke åbne forbindelsen"
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "url(method = \"libcurl\") er ikke understøttet på denne platform"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr ""
 
@@ -6932,7 +6995,7 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -6940,16 +7003,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): præcision tabt i resultat\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "bessel_j-allokeringsfejl"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): præcision tabt i resultat\n"
@@ -6960,7 +7028,7 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -6968,16 +7036,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): præcision tabt i resultat\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr ""
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): præcision tabt i resultat\n"
@@ -6987,42 +7060,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr "'k' (%.2f) skal være et heltal, afrundet til %.0f"
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr ""
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr ""
@@ -7090,7 +7163,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr ""
 
@@ -7104,97 +7177,106 @@
 "report using bug.report()"
 msgstr ""
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr ""
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
 "\n"
 msgstr ""
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr ""
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "ingen historikmekanisme er tilgængelig"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr ""
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "ingen historik tilgængelig for lagring"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "ugyldigt tidsstempel"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr ""
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' skal være logisk og ikke NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "kan ikke popen '%s', mulig årslag '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "fejl i kørende kommando: '%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "fejl i kørende kommando"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "kørende kommando '%s' havde status %d og fejlbesked '%s'"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() er ikke implementeret på dette system"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "ADVARSEL: --gui eller -g uden værdi ignoreret"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "ADVARSEL: ukendt grafisk brugerflade '%s', bruger X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "ADVARSEL: ukendt grafisk brugerflade '%s', bruger ingen\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "oprettelse af midlertidig fil for '-e' mislykkedes"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "ADVARSEL: Redigeringer kun den første i listen over filer"
 
+#~ msgid "sockets are not available on this system"
+#~ msgstr "sokler er ikke tilgængelig på dette system"
+
+#~ msgid "no function to restart"
+#~ msgstr "ingen funktion at genstarte"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "for stort interval for værdier i 'x'"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' skal være en liste"
 
diff -Nru r-base-3.2.3/src/library/base/po/de.po r-base-3.3.1/src/library/base/po/de.po
--- r-base-3.2.3/src/library/base/po/de.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/de.po	2016-04-27 22:15:37.000000000 +0000
@@ -4,10 +4,10 @@
 # Detlef Steuer <steuer@hsu-hh.de>, 2005-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: R-3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 14:30+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-07 17:29+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
 "Language: de\n"
@@ -23,8 +23,7 @@
 #: src/appl/optim.c:67
 #, c-format
 msgid "candidate point in 'optim' evaluated to length %d not %d"
-msgstr ""
-"Kandidatenpunkt in 'optim' gibt Ergebnis der Länge %d zurück, nicht Länge %d"
+msgstr "Kandidatenpunkt in 'optim' gibt Ergebnis der Länge %d zurück, nicht %d"
 
 #: src/appl/optim.c:136
 msgid "REPORT must be > 0 (method = \"BFGS\")"
@@ -40,7 +39,7 @@
 
 #: src/appl/optim.c:497
 msgid "unknown 'type' in \"CG\" method of 'optim'"
-msgstr "unbekannter 'type' in \"CG\" Methode von 'optim'"
+msgstr "unbekannter 'type' in \"CG\"-Methode von 'optim'"
 
 #: src/appl/optim.c:510
 msgid "Function cannot be evaluated at initial parameters"
@@ -48,7 +47,7 @@
 
 #: src/appl/optim.c:565
 msgid "unknown type in \"CG\" method of 'optim'"
-msgstr "unbekannter Typ in \"CG\" Methode von optim"
+msgstr "unbekannter Typ in \"CG\"-Methode von optim"
 
 #: src/appl/optim.c:662
 msgid "REPORT must be > 0 (method = \"L-BFGS-B\")"
@@ -126,7 +125,7 @@
 #: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
 #: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
 #: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
 #: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
 #: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
@@ -180,15 +179,15 @@
 #: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
 #: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
 #: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
+#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2753
+#: src/main/envir.c:3007 src/main/envir.c:3021 src/main/envir.c:3028
+#: src/main/envir.c:3044 src/main/envir.c:3627 src/main/errors.c:1044
 #: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
 #: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
 #: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
 #: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
 #: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
+#: src/main/memory.c:3799 src/main/paste.c:96 src/main/paste.c:392
 #: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
 #: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
 #: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
@@ -225,24 +224,24 @@
 #: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
 #: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
 #: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
-#: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/unique.c:1685 src/main/util.c:636 src/main/util.c:639
+#: src/main/util.c:1375 src/main/util.c:1389 src/main/util.c:1971
+#: src/main/util.c:2192 src/main/util.c:2193 src/main/util.c:2194
+#: src/main/util.c:2211 src/main/util.c:2235 src/main/util.c:2239
+#: src/main/util.c:2241 src/main/util.c:2266 src/main/util.c:2268
+#: src/main/util.c:2270 src/main/util.c:2273 src/main/util.c:2276
+#: src/main/util.c:2280 src/main/util.c:2282 src/modules/X11/devX11.c:3241
+#: src/modules/X11/devX11.c:3244 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3271 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:476 src/modules/internet/libcurl.c:316
+#: src/modules/internet/libcurl.c:320 src/modules/internet/libcurl.c:325
+#: src/modules/internet/libcurl.c:328 src/modules/internet/libcurl.c:332
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1220 src/unix/sys-std.c:1243
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "ungültiges '%s' Argument"
@@ -257,15 +256,15 @@
 
 #: src/gnuwin32/extra.c:302
 msgid "don't be silly!: your machine has a 4Gb address limit"
-msgstr "Stell Dich nicht dumm!: Deine Kiste kann nur 4Gb adressieren"
+msgstr "Stell Dich nicht dumm! Dein Computer kann nur 4Gb adressieren"
 
 #: src/gnuwin32/extra.c:306
 msgid "cannot decrease memory limit: ignored"
 msgstr "kann Speicherobergrenze nicht reduzieren: wird ignoriert"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:958
 msgid "'path' must be a character vector"
-msgstr "'path' muss eine Charaktervektor sein"
+msgstr "'path' muss eine Zeichenkettenvektor sein"
 
 #: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
 #: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
@@ -275,7 +274,7 @@
 
 #: src/gnuwin32/extra.c:565
 msgid "requires SDI mode"
-msgstr "verlangt SDI Modus"
+msgstr "verlangt SDI-Modus"
 
 #: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
@@ -296,7 +295,7 @@
 #: src/gnuwin32/run.c:244
 #, c-format
 msgid "'CreateProcess' failed to run '%s'"
-msgstr "'Createprocess' konnte '%s' nicht ausführen"
+msgstr "'CreateProcess' konnte '%s' nicht ausführen"
 
 #: src/gnuwin32/run.c:346
 msgid "Child process not responding.  R will terminate it."
@@ -328,7 +327,7 @@
 
 #: src/gnuwin32/run.c:790
 msgid "'names' is not a character vector"
-msgstr "'names' ist kein Zeichenketten-Vektor"
+msgstr "'names' ist kein Zeichenkettenvektor"
 
 #: src/gnuwin32/sys-win32.c:179
 msgid "character string expected as first argument"
@@ -353,11 +352,11 @@
 
 #: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
 msgid "reached session CPU time limit"
-msgstr "CPU Zeitlimit für die Sitzung erreicht"
+msgstr "CPU-Zeitlimit für die Sitzung erreicht"
 
 #: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
 msgid "reached CPU time limit"
-msgstr "CPU Zeitlimit erreicht"
+msgstr "CPU-Zeitlimit erreicht"
 
 #: src/gnuwin32/system.c:157
 #, c-format
@@ -378,8 +377,7 @@
 #: src/gnuwin32/system.c:1059 src/main/connections.c:581
 #: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "kann Datei '%s' nicht öffnen: %s"
@@ -428,22 +426,22 @@
 msgid "option '%s' requires a non-empty argument"
 msgstr "Option '%s' verlangt ein nicht-leeres Argument"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1076 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "Warnung: '-e %s' wird ausgelassen; Eingabe ist zu lang\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1080 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "Warnung: unbekannte Option '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1102 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "Argument '%s' __ignoriert__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1108 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "kann -e nicht mit -f oder --file benutzen"
 
@@ -451,7 +449,7 @@
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "Erzeugung von tmpfile fehlgeschlagen -- ist TMPDIR geeignet gesetzt?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1145 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "Sie müssen '--save', '--no-save' oder '--vanilla' angeben"
 
@@ -475,7 +473,7 @@
 
 #: src/main/CommandLineArgs.c:170
 msgid "WARNING: no value given for --encoding"
-msgstr "Warnung: kein Wert für --encoding gegeben"
+msgstr "Warnung: kein Wert für --encoding angegeben"
 
 #: src/main/CommandLineArgs.c:195
 #, c-format
@@ -485,7 +483,7 @@
 #: src/main/CommandLineArgs.c:206
 #, c-format
 msgid "WARNING: no value given for '%s'"
-msgstr "Warnung: kein Wert für '%s' gegeben"
+msgstr "Warnung: kein Wert für '%s' angegeben"
 
 #: src/main/CommandLineArgs.c:216
 #, c-format
@@ -533,7 +531,7 @@
 
 #: src/main/RNG.c:314
 msgid "seed length must be in 0...625; ignored"
-msgstr "Startwertlänge muss in 0...625 liegen: wird ignoriert"
+msgstr "Startwertlänge muss im Bereich 0..625 liegen; wird ignoriert"
 
 #: src/main/RNG.c:322
 #, c-format
@@ -564,12 +562,12 @@
 #: src/main/RNG.c:380
 msgid "'.Random.seed[1] = 5' but no user-supplied generator, so ignored"
 msgstr ""
-"'.Random.seed[1] = 5', aber kein nitzerdefinierter Generator angegeben, wird "
+"'.Random.seed[1] = 5', aber kein nutzerdefinierter Generator angegeben, wird "
 "also ignoriert"
 
 #: src/main/RNG.c:385
 msgid "'.Random.seed[1]' is not a valid RNG kind so ignored"
-msgstr "'.Random.seed[1]' ist kein gültiger RNG Typ, wird also ignoriert"
+msgstr "'.Random.seed[1]' ist kein gültiger RNG-Typ, wird also ignoriert"
 
 #: src/main/RNG.c:412
 msgid "'.Random.seed' has wrong length"
@@ -578,7 +576,7 @@
 #: src/main/RNG.c:465
 #, c-format
 msgid "RNGkind: unimplemented RNG kind %d"
-msgstr "RNGkind: nicht implementierter RNG Typ %d"
+msgstr "RNGkind: nicht implementierter RNG-Typ %d"
 
 #: src/main/RNG.c:485
 msgid "invalid Normal type in 'RNGkind'"
@@ -594,7 +592,7 @@
 
 #: src/main/Rdynload.c:248
 msgid "R_RegisterRoutines called with invalid DllInfo object."
-msgstr "R_RegisterRoutines mit ungültigem DllInfo Objekt."
+msgstr "R_RegisterRoutines mit ungültigem DllInfo-Objekt."
 
 #: src/main/Rdynload.c:533
 msgid "`maximal number of DLLs reached..."
@@ -613,9 +611,9 @@
 msgid "could not allocate space for 'name'"
 msgstr "konnte keinen Speicher für 'name' zuteilen"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:758
 msgid "character argument expected"
-msgstr "Charakter als Argument erwartet"
+msgstr "Zeichenkette als Argument erwartet"
 
 #: src/main/Rdynload.c:887 src/main/Rdynload.c:919 src/main/Rdynload.c:939
 #, c-format
@@ -644,7 +642,7 @@
 
 #: src/main/Rdynload.c:1102 src/main/Rdynload.c:1323
 msgid "must pass package name or DllInfo reference"
-msgstr "es muss der Paketname oder DllInfo Referenz übergeben werden"
+msgstr "es muss der Paketname oder eine DllInfo-Referenz übergeben werden"
 
 #: src/main/Rdynload.c:1199
 #, c-format
@@ -657,7 +655,7 @@
 
 #: src/main/Rdynload.c:1284 src/main/Rdynload.c:1378
 msgid "NULL value passed for DllInfo"
-msgstr "NULL Wert für DllInfo übergeben"
+msgstr "Wert NULL für DllInfo übergeben"
 
 #: src/main/Rdynload.c:1441
 #, c-format
@@ -698,11 +696,11 @@
 
 #: src/main/Rstrptime.h:1268
 msgid "format string is too long"
-msgstr "Formattierungs-Zeichenkette ist zu lang"
+msgstr "Formatierungs-Zeichenkette ist zu lang"
 
 #: src/main/Rstrptime.h:1270
 msgid "invalid multibyte format string"
-msgstr "ungültige multi-byte Formattierungs-Zeichenkette"
+msgstr "ungültige multi-byte Formatierungs-Zeichenkette"
 
 #: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
 #: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
@@ -710,16 +708,16 @@
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
-"Argument '%s' hat einen Länge > 1 und nur das erste Element wird benutzt"
+"Argument '%s' hat eine Länge > 1 und nur das erste Element wird benutzt"
 
 #: src/main/agrep.c:190 src/main/agrep.c:820
 msgid "'pattern' must be a non-empty character string"
 msgstr "'pattern' muss eine nicht-leere Zeichenkette sein"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2704
 msgid "regular expression is invalid in this locale"
-msgstr "regular expression ist in dieser Lokalisierung ungültig"
+msgstr "regular expression ist in dieser locale ungültig"
 
 #: src/main/agrep.c:207 src/main/agrep.c:624
 #, c-format
@@ -729,10 +727,10 @@
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
 #: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:2741
 #, c-format
 msgid "input string %d is invalid in this locale"
-msgstr "Eingabezeichenkette %d ungültig in dieser locale"
+msgstr "Eingabe-Zeichenkette %d ungültig in dieser locale"
 
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
@@ -752,7 +750,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "Eingabezeichenkette y[%d] ungültig in dieser locale"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2710
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "Fehler bei regcomp: '%s'"
@@ -762,19 +760,20 @@
 msgstr "'FUN.VALUE' muss Vektor sein"
 
 #: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
+#: src/main/character.c:1453 src/main/connections.c:3553
+#: src/main/context.c:657 src/main/context.c:676 src/main/datetime.c:685
+#: src/main/datetime.c:787 src/main/datetime.c:1046 src/main/dotcode.c:222
+#: src/main/errors.c:943 src/main/errors.c:976 src/main/errors.c:1079
+#: src/main/errors.c:1104 src/main/errors.c:1109 src/main/errors.c:1382
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:3083
+#: src/main/seq.c:191 src/main/seq.c:347 src/main/seq.c:352 src/main/seq.c:356
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1224 src/main/sort.c:1307 src/main/sort.c:1311
+#: src/main/sort.c:1318 src/main/sort.c:1393 src/main/source.c:225
+#: src/main/summary.c:901 src/main/sysutils.c:250 src/main/util.c:1047
+#: src/main/util.c:1052 src/main/util.c:1059 src/main/util.c:1062
+#: src/main/util.c:2031 src/modules/X11/devX11.c:3142
 #: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
 #: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
 #: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
@@ -896,7 +895,7 @@
 msgstr "ungültiges zweites Argument der Länge 0"
 
 #: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4118
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "Argument \"%s\" fehlt (ohne Standardwert)"
@@ -971,7 +970,7 @@
 
 #: src/main/array.c:236
 msgid "negative extents to 3D array"
-msgstr "negative Ausdehnung für einen 3D Array"
+msgstr "negative Ausdehnung für ein 3D Array"
 
 #: src/main/array.c:239
 msgid "'alloc3Darray': too many elements specified"
@@ -982,9 +981,9 @@
 msgstr "'allocArray': zu viele Elemente durch 'dims' angegeben"
 
 #: src/main/array.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' must be a list or atomic vector"
-msgstr "'x' muss eine Liste von NULL oder ein raw vector sein"
+msgstr "'%s' muss eine Liste oder ein atomarer Vektor sein"
 
 #: src/main/array.c:531
 #, c-format
@@ -1019,7 +1018,7 @@
 #: src/main/array.c:1226
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
-msgstr "'perm[%d]' entspricht  keinem Dimensionsnamen"
+msgstr "'perm[%d]' entspricht keinem Dimensionsnamen"
 
 #: src/main/array.c:1239
 msgid "value out of range in 'perm'"
@@ -1034,9 +1033,8 @@
 msgstr "'x' muss numerisch sein"
 
 #: src/main/array.c:1381
-#, fuzzy
-msgid "'X' is too short"
-msgstr "'object' ist zu kurz"
+msgid "'x' is too short"
+msgstr "'x' ist zu kurz"
 
 #: src/main/array.c:1555
 msgid "'dims' cannot be of length 0"
@@ -1112,7 +1110,7 @@
 #: src/main/attrib.c:865
 #, c-format
 msgid "class '%s' has no 'names' slot"
-msgstr "Klasse '%s' hat keinen 'names' Eintrag"
+msgstr "Klasse '%s' hat keinen 'names'-Eintrag"
 
 #: src/main/attrib.c:867
 #, c-format
@@ -1144,9 +1142,10 @@
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' angewendet auf Nicht-Array"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' muss eine Liste sein"
+#: src/main/attrib.c:1033 src/main/coerce.c:2452
+#, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' muss eine Liste sein"
 
 #: src/main/attrib.c:1036 src/main/attrib.c:1064
 #, c-format
@@ -1210,7 +1209,7 @@
 
 #: src/main/attrib.c:1381
 msgid "'which' must be of mode character"
-msgstr "'which' muss vom Modus Charakter sein"
+msgstr "'which' muss vom Modus character sein"
 
 #: src/main/attrib.c:1383
 msgid "exactly one attribute 'which' must be given"
@@ -1229,7 +1228,7 @@
 
 #: src/main/attrib.c:1539
 msgid "'name' must be non-null character string"
-msgstr "'name' muss eine nicht-Null Zeichenkette sein"
+msgstr "'name' muss eine nicht-null Zeichenkette sein"
 
 #: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
 msgid "invalid type or length for slot name"
@@ -1269,7 +1268,7 @@
 "object "
 msgstr ""
 "versuche einen Slot \"%s\" von einem Objekt der Klasse (\"%s\") anzufordern, "
-"das aber kein S4 Objekt ist"
+"das aber kein S4-Objekt ist"
 
 #: src/main/bind.c:161
 #, c-format
@@ -1294,8 +1293,8 @@
 msgid "argument not a list"
 msgstr "Argument ist keine Liste"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1038 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "Klassenname zu lang in '%s'"
@@ -1335,13 +1334,13 @@
 
 #: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
 #: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
+#: src/main/coerce.c:1519 src/main/connections.c:3062 src/main/engine.c:2967
 #: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
 #: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
+#: src/main/envir.c:2070 src/main/envir.c:2789 src/main/envir.c:2875
+#: src/main/envir.c:3167 src/main/envir.c:3196 src/main/envir.c:3217
+#: src/main/envir.c:3240 src/main/envir.c:3275 src/main/envir.c:3296
+#: src/main/envir.c:3617 src/main/envir.c:3622 src/main/eval.c:6114
 #: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
 #: src/main/saveload.c:2362 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
@@ -1400,7 +1399,7 @@
 #: src/main/builtin.c:643
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
-msgstr "Argument %d (Typ '%s') wird nicht von 'cat' beherrscht"
+msgstr "Argument %d (Typ '%s') wird nicht von 'cat' verstanden"
 
 #: src/main/builtin.c:788
 #, c-format
@@ -1416,14 +1415,14 @@
 msgstr "ungültiges Argument"
 
 #: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/character.c:415 src/main/coerce.c:2813
 msgid "invalid value"
 msgstr "ungültiger Wert"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
+#: src/main/builtin.c:967 src/main/coerce.c:2522 src/main/coerce.c:2565
 #: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
 #: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/eval.c:5459 src/main/eval.c:5576
 msgid "'...' used in an incorrect context"
 msgstr "'...' in falschem Kontext benutzt"
 
@@ -1436,11 +1435,11 @@
 msgid "'EXPR' is missing"
 msgstr "'EXPR' fehlt"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1026 src/main/eval.c:5931
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR muss ein Vektor der Länge 1 sein"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1029 src/main/eval.c:5934
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
@@ -1450,17 +1449,17 @@
 " Evtl. stattdessen '%s' benutzen."
 
 #: src/main/character.c:104 src/main/character.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
-msgstr[0] "%d Argument an '%s' übergeben, welches %d benötigt"
-msgstr[1] "%d Argumente an '%s' übergeben, welches %d benötigt"
+msgstr[0] "%d Argument an '%s' übergeben, welches zwischen %d und %d benötigt"
+msgstr[1] "%d Argumente an '%s' übergeben, welches zwischen %d und %d benötigt"
 
 #: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
 #: src/main/character.c:155
 #, c-format
 msgid "'%s' requires a character vector"
-msgstr "'%s' benötigt einen Charakter-Vektor"
+msgstr "'%s' benötigt einen Zeichenkettenvektor"
 
 #: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
 #: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
@@ -1485,7 +1484,7 @@
 
 #: src/main/character.c:312
 msgid "extracting substrings from a non-character object"
-msgstr "extrahieren von Teilzeichenketten aus einem Nicht-Charakter Objekt"
+msgstr "extrahieren von Teilzeichenketten aus einem nicht-character Objekt"
 
 #: src/main/character.c:317 src/main/character.c:412
 msgid "invalid substring arguments"
@@ -1493,23 +1492,23 @@
 
 #: src/main/character.c:407
 msgid "replacing substrings in a non-character object"
-msgstr "Ersetzen von Teilzeichenketten in einem Nicht-Charakter Objekt"
+msgstr "Ersetzen von Teilzeichenketten in einem nicht-character Objekt"
 
 #: src/main/character.c:600
 msgid "the first argument must be a character vector"
-msgstr "erstes Argument muss ein Charaktervektor sein"
+msgstr "erstes Argument muss ein Zeichenkettenvektor sein"
 
 #: src/main/character.c:619
 msgid "abbreviate used with non-ASCII chars"
-msgstr "abbreviate mit nicht-ASCII Zeichen genutzt"
+msgstr "abbreviate mit Nicht-ASCII-Zeichen genutzt"
 
 #: src/main/character.c:640
 msgid "non-character names"
-msgstr "Nicht-Charakter Namen"
+msgstr "Nicht-character Namen"
 
 #: src/main/character.c:745 src/main/grep.c:163
 msgid "non-character argument"
-msgstr "Nicht-Charakter Argument"
+msgstr "nicht-character Argument"
 
 #: src/main/character.c:854
 #, c-format
@@ -1523,19 +1522,19 @@
 
 #: src/main/character.c:1128
 msgid "invalid UTF-8 string 'old'"
-msgstr "ungültige UTF-8 Zeichenkette 'old'"
+msgstr "ungültige UTF-8-Zeichenkette 'old'"
 
 #: src/main/character.c:1134
 msgid "invalid multibyte string 'old'"
-msgstr "ungültige multibyte Zeichenkette 'old'"
+msgstr "ungültige multi-byte Zeichenkette 'old'"
 
 #: src/main/character.c:1147
 msgid "invalid UTF-8 string 'new'"
-msgstr "ungültige UTF-8 Zeichenkette 'new'"
+msgstr "ungültige UTF-8-Zeichenkette 'new'"
 
 #: src/main/character.c:1153
 msgid "invalid multibyte string 'new'"
-msgstr "ungültige multibyte Zeichenkette 'new'"
+msgstr "ungültige multi-byte Zeichenkette 'new'"
 
 #: src/main/character.c:1181 src/main/character.c:1270
 msgid "'old' is longer than 'new'"
@@ -1544,11 +1543,11 @@
 #: src/main/character.c:1213
 #, c-format
 msgid "invalid input multibyte string %d"
-msgstr "ungültige multibyte Eingabezeichenkette %d"
+msgstr "ungültige multi-byte Eingabezeichenkette %d"
 
 #: src/main/character.c:1320
 msgid "strtrim() requires a character vector"
-msgstr "strtrim() benötigt Charakter-Vektor"
+msgstr "strtrim() benötigt Zeichenkettenvektor"
 
 #: src/main/coerce.c:32
 msgid "invalid 'mode' argument"
@@ -1563,9 +1562,8 @@
 msgstr "NAs durch Umwandlung erzeugt"
 
 #: src/main/coerce.c:79
-#, fuzzy
 msgid "NAs introduced by coercion to integer range"
-msgstr "NAs durch Umwandlung erzeugt"
+msgstr "NAs durch Umwandlung in Bereich ganzer Zahlen erzeugt"
 
 #: src/main/coerce.c:81 src/main/errors.c:1224
 msgid "imaginary parts discarded in coercion"
@@ -1578,7 +1576,7 @@
 #: src/main/coerce.c:392
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
-msgstr "ungültige Daten vom Mode '%s' (zu kurz)"
+msgstr "ungültige Daten vom Modus '%s' (zu kurz)"
 
 #: src/main/coerce.c:995
 #, c-format
@@ -1595,121 +1593,115 @@
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(symbol) Objekt kann nicht in Typ '%s' umgewandelt werden"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1152 src/main/coerce.c:1467
 msgid "no method for coercing this S4 class to a vector"
-msgstr "Keine Methode um diese S4 Klasse in einen Vektor zu verwandeln"
+msgstr "Keine Methode um diese S4-Klasse in einen Vektor umzuwandeln"
 
 #: src/main/coerce.c:1215
 msgid "environments cannot be coerced to other types"
 msgstr "Umgebungen können nicht in andere Typen umgewandelt werden"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1357
 msgid "attempting to coerce non-factor"
-msgstr "Versuch einen nicht-Faktor umzuwandeln"
+msgstr "Versuch einen Nicht-Faktor umzuwandeln"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
-#, fuzzy
+#: src/main/coerce.c:1362 src/main/coerce.c:1372
 msgid "malformed factor"
 msgstr "ungültige Faktoren"
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1515
 msgid "list argument expected"
 msgstr "Listenargument erwartet"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1523 src/main/eval.c:6118
 msgid "invalid environment"
 msgstr "ungültige Umgebung"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1527
 msgid "argument must have length at least 1"
 msgstr "Argument muss mindestens Länge 1 haben"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1549
 msgid "invalid body for function"
 msgstr "ungültiger Funktionstext"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1572
 msgid "invalid length 0 argument"
 msgstr "ungültiges Argument der Länge 0"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1587
 msgid "invalid argument list"
 msgstr "ungültige Argumentenliste"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1899
 msgid "type \"single\" unimplemented in R"
 msgstr "Typ \"single\" nicht in R implementiert"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1901
 msgid "unimplemented predicate"
 msgstr "nicht implementiertes Prädikat"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2053
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
-msgstr "%s() auf nicht-(Liste oder Vektor) des Typs '%s' angewendet"
+msgstr "%s() auf Nicht-(Liste oder Vektor) des Typs '%s' angewendet"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2250 src/main/coerce.c:2313 src/main/coerce.c:2384
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "nicht implementierte Standardmethode für Typ '%s'"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2405
 msgid "'name' is missing"
 msgstr "'name' fehlt"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2412
 msgid "first argument must be a character string"
 msgstr "erstes Argument muss eine Zeichenkette sein"
 
-#: src/main/coerce.c:2449
+#: src/main/coerce.c:2445
 msgid "'what' must be a character string or a function"
 msgstr "'what' muss eine Zeichenkette oder eine Funktion sein"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2449
 msgid "'args' must be a list or expression"
 msgstr "'args' muss eine Liste oder ein Ausdruck sein"
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' muss eine Liste sein"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2456 src/main/unique.c:1285
 msgid "'envir' must be an environment"
 msgstr "'envir' muss eine Umgebung sein"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2615
 msgid "invalid environment specified"
 msgstr "ungültige Umgebung spezifiziert"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2681
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
-msgstr "Setze class(x) auf NULL;  das Ergebnis ist keine S4 Objekt mehr"
+msgstr "Setze class(x) auf NULL;   das Ergebnis ist kein S4-Objekt mehr"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2684
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 "Setze class(x) auf mehrere Zeichenketten(\"%s\", \"%s\", ...); das Ergebnis "
-"ist kein S4 Objekt mehr"
+"ist kein S4-Objekt mehr"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2688
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 "class(x) auf \"%s\" zu setzen, setzt Attribut auf NULL; das Ergebnis ist "
-"kein S4 Objekt mehr"
+"kein S4-Objekt mehr"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2721
 msgid "invalid replacement object to be a class string"
 msgstr "Ungültiges Ersetzungsobjekt als Klassenzeichenkette"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2742
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1717,7 +1709,7 @@
 "\"%s\" kann nur als Klasse gesetzt werden, wenn das Objekt diesen Typ hat; "
 "gefunden wurde \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2760
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1726,18 +1718,18 @@
 "ungültig die Klasse auf Matrix zu setzen, außer das Dimensionsattribut hat "
 "Länge 2 (war %d)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2768
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "Kann Klasse nicht auf \"array\" setzen, außer das Dimensionsattribut hat "
 "eine Länge > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2804
 msgid "'value' must be non-null character string"
 msgstr "'value' muss eine nicht-Null Zeichenkette sein"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2817
 msgid "invalid to change the storage mode of a factor"
 msgstr "unzulässig den Speichermodus eines Faktors zu ändern"
 
@@ -1796,7 +1788,7 @@
 #: src/main/connections.c:330 src/main/connections.c:347
 #: src/main/connections.c:2910
 msgid "printing of extremely long output is truncated"
-msgstr "Druck von extrem langer Ausgabe wird abgeschnitten"
+msgstr "Ausdruck extrem langer Ausgabe wird abgeschnitten"
 
 #: src/main/connections.c:370
 msgid "invalid char string in output conversion"
@@ -1870,26 +1862,26 @@
 
 #: src/main/connections.c:989 src/main/connections.c:995
 msgid "allocation of fifo name failed"
-msgstr "Allokation des FIFO Namens fehlgeschlagen"
+msgstr "Allokation des fifo-Namens fehlgeschlagen"
 
 #: src/main/connections.c:1057
 #, c-format
 msgid "cannot open fifo '%s', reason '%s'"
-msgstr "kann FIFO '%s' nicht öffnen. Grund '%s'"
+msgstr "kann fifo '%s' nicht öffnen. Grund '%s'"
 
 #: src/main/connections.c:1098 src/main/connections.c:1122
 msgid "allocation of fifo buffer failed"
-msgstr "Allokation des FIFO Buffers fehlgeschlagen"
+msgstr "Allokation des fifo-Buffers fehlgeschlagen"
 
 #: src/main/connections.c:1130
 #, c-format
 msgid "cannot write FIFO '%s'"
-msgstr "kann nicht in FIFO  '%s' schreiben"
+msgstr "kann nicht in fifo '%s' schreiben"
 
 #: src/main/connections.c:1166 src/main/connections.c:1170
 #: src/main/connections.c:1176 src/main/connections.c:1192
 msgid "allocation of fifo connection failed"
-msgstr "Allokation der fifo Verbindung fehlgeschlagen"
+msgstr "Allokation der fifo-Verbindung fehlgeschlagen"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
 #: src/main/connections.c:1991 src/main/connections.c:3209
@@ -1919,7 +1911,7 @@
 
 #: src/main/connections.c:1257
 msgid "fifo connections are not available on this system"
-msgstr "fifo Verbindungen sind auf diesem System nicht verfügbar"
+msgstr "fifo-Verbindungen sind auf diesem System nicht verfügbar"
 
 #: src/main/connections.c:1287
 #, c-format
@@ -1967,7 +1959,7 @@
 
 #: src/main/connections.c:1671
 msgid "allocation of overflow buffer for bzfile failed"
-msgstr "Allokation des overflow buffers für bzfile fehlgeschlagen"
+msgstr "Allokation des Overflow-Puffers für bzfile fehlgeschlagen"
 
 #: src/main/connections.c:1678
 #, c-format
@@ -1979,7 +1971,7 @@
 #: src/main/connections.c:1724 src/main/connections.c:1728
 #: src/main/connections.c:1734 src/main/connections.c:1751
 msgid "allocation of bzfile connection failed"
-msgstr "Allokation einer bzfile Verbindung fehlgeschlagen"
+msgstr "Allokation einer bzfile-Verbindung fehlgeschlagen"
 
 #: src/main/connections.c:1797 src/main/connections.c:6050
 #, c-format
@@ -1989,7 +1981,7 @@
 #: src/main/connections.c:1813
 #, c-format
 msgid "cannot initialize lzma encoder, error %d"
-msgstr "kann den lzma Kodierer nicht initialisieren, Fehler %d"
+msgstr "kann den lzma-Kodierer nicht initialisieren, Fehler %d"
 
 #: src/main/connections.c:1941 src/main/connections.c:1945
 #: src/main/connections.c:1951 src/main/connections.c:1969
@@ -2014,7 +2006,7 @@
 
 #: src/main/connections.c:2140
 msgid "memory allocation to open clipboard failed"
-msgstr "Allokation von Speicher um die Zwischenablage zu öffnen fehlgeschlagen"
+msgstr "Allokation von Speicher zum Öffnen der Zwischenablage fehlgeschlagen"
 
 #: src/main/connections.c:2168
 msgid "unable to open the clipboard"
@@ -2034,7 +2026,7 @@
 
 #: src/main/connections.c:2275
 msgid "clipboard buffer is full and output lost"
-msgstr "Zwischenablage-buffer ist voll und Teil der Ausgabe verloren"
+msgstr "Puffer der Zwischenablage ist voll und ein Teil der Ausgabe ging verloren"
 
 #: src/main/connections.c:2296
 msgid "'mode' for the clipboard must be 'r' or 'w'"
@@ -2052,15 +2044,15 @@
 #: src/main/connections.c:2400 src/main/connections.c:2404
 #: src/main/connections.c:2410
 msgid "allocation of terminal connection failed"
-msgstr "Allokation einer Terminal Verbindung fehlgeschlagen"
+msgstr "Allokation einer Terminal-Verbindung fehlgeschlagen"
 
 #: src/main/connections.c:2543
 msgid "attempting to add too many elements to raw vector"
-msgstr "Versuch einem raw Vektor zu viele Elements hinzuzufügen"
+msgstr "Versuch einem raw Vektor zu viele Elemente hinzuzufügen"
 
 #: src/main/connections.c:2595
 msgid "attempt to seek outside the range of the raw connection"
-msgstr "Versuch außerhalb des Bereichs einer raw connection zuzugreifen"
+msgstr "Versuch außerhalb des Bereichs einer raw-Verbindung zuzugreifen"
 
 #: src/main/connections.c:2606 src/main/connections.c:2610
 #: src/main/connections.c:2616 src/main/connections.c:2642
@@ -2077,15 +2069,15 @@
 
 #: src/main/connections.c:2736
 msgid "too many characters for text connection"
-msgstr "zu viele Zeichen für eine Textverbindung"
+msgstr "zu viele Zeichen für eine Text-Verbindung"
 
 #: src/main/connections.c:2741
 msgid "cannot allocate memory for text connection"
-msgstr "kann keinen Speicher für Textverbindung zuweisen"
+msgstr "kann keinen Speicher für Text-Verbindung zuweisen"
 
 #: src/main/connections.c:2790
 msgid "seek is not relevant for text connection"
-msgstr "seek ist nicht relevant für Textverbindungen"
+msgstr "seek ist nicht relevant für Text-Verbindungen"
 
 #: src/main/connections.c:2798 src/main/connections.c:2802
 #: src/main/connections.c:2808 src/main/connections.c:2821
@@ -2097,7 +2089,7 @@
 
 #: src/main/connections.c:2983
 msgid "text connection: appending to a non-existent char vector"
-msgstr "Text Verbindung: Anhängen an nicht existierenden Charakter Vektor"
+msgstr "Text-Verbindung: Anhängen an nicht existierenden Zeichenkettenvektor"
 
 #: src/main/connections.c:3089
 msgid "unsupported mode"
@@ -2219,7 +2211,7 @@
 
 #: src/main/connections.c:4064
 msgid "'x' is not an atomic vector type"
-msgstr "'x' ist kein atomarer Vektor Typ"
+msgstr "'x' ist kein atomarer Vektortyp"
 
 #: src/main/connections.c:4070
 msgid "can only write to a binary connection"
@@ -2232,7 +2224,7 @@
 #: src/main/connections.c:4091
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
-"lediglich 2^31 -1 Bytes können in einem einzelnen aufruf von writeBin() "
+"lediglich 2^31 -1 Bytes können in einem einzelnen Aufruf von writeBin() "
 "geschrieben werden"
 
 #: src/main/connections.c:4140 src/main/connections.c:4293
@@ -2247,7 +2239,7 @@
 #: src/main/connections.c:4328 src/main/connections.c:4332
 #: src/main/connections.c:4371
 msgid "invalid UTF-8 input in readChar()"
-msgstr "ungültige UTF-8 Eingabe in readChar()"
+msgstr "ungültige UTF-8-Eingabe in readChar()"
 
 #: src/main/connections.c:4438
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
@@ -2281,11 +2273,11 @@
 
 #: src/main/connections.c:4680
 msgid "can only push back on open readable connections"
-msgstr "push back geht nur auf offenen lesbaren Verbindungen"
+msgstr "push back geht nur auf offenen, lesbaren Verbindungen"
 
 #: src/main/connections.c:4682
 msgid "can only push back on text-mode connections"
-msgstr "push back geht nur bei Text Verbindungen"
+msgstr "push back geht nur bei Text-Verbindungen"
 
 #: src/main/connections.c:4744 src/main/connections.c:4814
 msgid "sink stack is full"
@@ -2322,7 +2314,7 @@
 #: src/main/connections.c:5170 src/modules/internet/internet.c:153
 #: src/modules/internet/internet.c:274
 msgid "URL scheme unsupported by this method"
-msgstr "URL Schema wird von dieser Methode nicht unterstützt"
+msgstr "URL-Schema wird von dieser Methode nicht unterstützt"
 
 #: src/main/connections.c:5261
 msgid "file stream does not have gzip magic number"
@@ -2334,7 +2326,7 @@
 
 #: src/main/connections.c:5337
 msgid "writing error whilst flushing 'gzcon' connection"
-msgstr "Schreibfehler während flush auf 'gzcon' Verbindung"
+msgstr "Schreibfehler während flush auf 'gzcon'-Verbindung"
 
 #: src/main/connections.c:5439
 #, c-format
@@ -2364,7 +2356,7 @@
 #: src/main/connections.c:5515
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
-"Benutzung einer text-mode 'file' connection arbeitet evtl. nicht korrekt"
+"Benutzung einer text-mode 'file' Verbindung arbeitet evtl. nicht korrekt"
 
 #: src/main/connections.c:5518
 msgid ""
@@ -2372,7 +2364,7 @@
 "rawConnection"
 msgstr ""
 "kann aus einer schreibbaren textConnection keine 'gzcon' Verbindung "
-"erzeugen; evtl. rawconnection benutzen"
+"erzeugen; evtl. rawConnection benutzen"
 
 #: src/main/connections.c:5521 src/main/connections.c:5525
 #: src/main/connections.c:5532 src/main/connections.c:5546
@@ -2478,7 +2470,7 @@
 #: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
 #: src/main/datetime.c:1257 src/main/datetime.c:1259
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
-msgstr "Komponente der Länge 0 in nicht-leerer \"POSIXlt\" Struktur"
+msgstr "Komponente der Länge 0 in nicht-leerer \"POSIXlt\"-Struktur"
 
 #: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
@@ -2535,11 +2527,11 @@
 
 #: src/main/deparse.c:162
 msgid "invalid 'cutoff' value for 'deparse', using default"
-msgstr "ungültiger 'cutoff' Wert für 'deparse', nutze Standard"
+msgstr "ungültiger 'cutoff'-Wert für 'deparse', nutze Standard"
 
 #: src/main/deparse.c:253
 msgid "deparse of an S4 object will not be source()able"
-msgstr "Deparsed S4 Objekt kann nicht ge-sourced() werden"
+msgstr "Deparsed S4-Objekt kann nicht ge-sourced() werden"
 
 #: src/main/deparse.c:255
 msgid "deparse may be incomplete"
@@ -2559,7 +2551,7 @@
 
 #: src/main/deparse.c:401
 msgid "character arguments expected"
-msgstr "Charakter Argumente erwartet"
+msgstr "Zeichenketten-Argumente erwartet"
 
 #: src/main/deparse.c:404
 msgid "zero-length argument"
@@ -2570,7 +2562,7 @@
 msgstr "'opts' sollte eine kleine nicht-negative ganze Zahl sein"
 
 #: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
+#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4127
 #: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
@@ -2602,7 +2594,7 @@
 
 #: src/main/dotcode.c:127 src/main/dotcode.c:157
 msgid "NULL value passed as symbol address"
-msgstr "NULL Wert als Symboladresse übergeben"
+msgstr "Wert NULL als Symboladresse übergeben"
 
 #: src/main/dotcode.c:148
 #, c-format
@@ -2653,15 +2645,15 @@
 
 #: src/main/dotcode.c:376
 msgid "DLL name is too long"
-msgstr "DLL Name ist zu lang"
+msgstr "DLL-Name ist zu lang"
 
 #: src/main/dotcode.c:421
 msgid "PACKAGE argument must be a single character string"
-msgstr "PACKAGE Argument muss eine einfache Zeichenkette sein"
+msgstr "Argument PACKAGE muss eine einfache Zeichenkette sein"
 
 #: src/main/dotcode.c:427
 msgid "PACKAGE argument is too long"
-msgstr "PACKAGE Argument ist zu lang"
+msgstr "Argument PACKAGE ist zu lang"
 
 #: src/main/dotcode.c:492
 msgid "no arguments supplied"
@@ -2690,7 +2682,7 @@
 
 #: src/main/dotcode.c:1380
 msgid "NULL value for DLLInfoReference when looking for DLL"
-msgstr "NULL Wert für DLLInfoReference bei der Suche nach DLL"
+msgstr "NULL-Wert für DLLInfoReference bei der Suche nach DLL"
 
 #: src/main/dotcode.c:1481
 #, c-format
@@ -2719,7 +2711,7 @@
 
 #: src/main/dotcode.c:1616
 msgid "only first string in char vector used in .Fortran"
-msgstr "nur erste Zeichenkette in Charaktervektor in .Fortran benutzt"
+msgstr "nur erste Zeichenkette in Zeichenkettenvektor in .Fortran benutzt"
 
 #: src/main/dotcode.c:1659 src/main/dotcode.c:1675 src/main/dotcode.c:1686
 #, c-format
@@ -2773,24 +2765,24 @@
 
 #: src/main/dounzip.c:364
 msgid "requested file not found in the zip file"
-msgstr "angeforderte Datei nicht in Zipfile gefunden"
+msgstr "angeforderte Datei nicht in Zip-Datei gefunden"
 
 #: src/main/dounzip.c:367
 msgid "zip file is corrupt"
-msgstr "Zipfile ist defekt"
+msgstr "Zip-Datei ist defekt"
 
 #: src/main/dounzip.c:370
 msgid "CRC error in zip file"
-msgstr "CRC Fehler in Zipfile"
+msgstr "CRC-Fehler in Zip-Datei"
 
 #: src/main/dounzip.c:377
 msgid "write error in extracting from zip file"
-msgstr "Schreibfehler während des Extrahierens aus Zipfile"
+msgstr "Schreibfehler während des Extrahierens aus Zip-Datei"
 
 #: src/main/dounzip.c:380
 #, c-format
 msgid "error %d in extracting from zip file"
-msgstr "Fehler %d während des Extrahierens aus Zipfile"
+msgstr "Fehler %d während des Extrahierens aus Zip-Datei"
 
 #: src/main/dounzip.c:405
 msgid "unz connections can only be opened for reading"
@@ -2798,17 +2790,17 @@
 
 #: src/main/dounzip.c:416
 msgid "invalid description of 'unz' connection"
-msgstr "ungültige Beschreibung einer 'unz' Verbindung"
+msgstr "ungültige Beschreibung einer 'unz'-Verbindung"
 
 #: src/main/dounzip.c:422
 #, c-format
 msgid "cannot open zip file '%s'"
-msgstr "kann Zipfile '%s' nicht öffnen"
+msgstr "kann Zip-Datei '%s' nicht öffnen"
 
 #: src/main/dounzip.c:426
 #, c-format
 msgid "cannot locate file '%s' in zip file '%s'"
-msgstr "kann Datei '%s' nicht in Zipfile '%s' finden"
+msgstr "kann Datei '%s' nicht in Zip-Datei '%s' finden"
 
 #: src/main/dounzip.c:470
 msgid "printing not enabled for this connection"
@@ -2821,7 +2813,7 @@
 #: src/main/dounzip.c:494 src/main/dounzip.c:498 src/main/dounzip.c:504
 #: src/main/dounzip.c:521
 msgid "allocation of 'unz' connection failed"
-msgstr "Allokation einer 'unz' Verbindung fehlgeschlagen"
+msgstr "Allokation einer 'unz'-Verbindung fehlgeschlagen"
 
 #: src/main/dstruct.c:90
 msgid "invalid formal arguments for 'function'"
@@ -2858,7 +2850,7 @@
 
 #: src/main/edit.c:161
 msgid "editor ran but returned error status"
-msgstr "Editor lief, aber lieferte Fehlerstatus"
+msgstr "Editor lief, aber lieferte Fehlerstatus zurück"
 
 #: src/main/edit.c:171
 #, c-format
@@ -2884,7 +2876,7 @@
 
 #: src/main/engine.c:40
 msgid "Graphics API version mismatch"
-msgstr "Grafik-API Version passt nicht"
+msgstr "Graphics API-Version passt nicht"
 
 #: src/main/engine.c:113 src/main/engine.c:118 src/main/engine.c:182
 msgid "unable to allocate memory (in GEregister)"
@@ -2911,7 +2903,7 @@
 #: src/main/engine.c:761 src/main/engine.c:865 src/main/engine.c:1098
 #: src/main/engine.c:1205 src/main/engine.c:1328 src/main/engine.c:1392
 msgid "'lwd' must be non-negative and finite"
-msgstr "'lwd' muss nicht-negative und endlich sein"
+msgstr "'lwd' muss nicht-negativ und endlich sein"
 
 #: src/main/engine.c:798
 msgid "out of memory while clipping polyline"
@@ -2982,19 +2974,19 @@
 
 #: src/main/engine.c:2963
 msgid "'expr' argument must be an expression"
-msgstr "'expr' Argument muss ein Ausdruck sein"
+msgstr "'expr'-Argument muss ein Ausdruck sein"
 
 #: src/main/engine.c:2965
 msgid "'list' argument must be a list"
-msgstr "'list' Argument muss eine Liste sein"
+msgstr "'list'-Argument muss eine Liste sein"
 
 #: src/main/engine.c:2971
 msgid "'env' argument must be an environment"
-msgstr "'env' Argument muss eine Umgebung sein"
+msgstr "'env'-Argument muss eine Umgebung sein"
 
 #: src/main/engine.c:3051 src/main/engine.c:3059
 msgid "invalid multibyte char in pch=\"c\""
-msgstr "ungültiges multibyte zeichen in pch=\"c\""
+msgstr "ungültiges multi-byte Zeichen in pch=\"c\""
 
 #: src/main/engine.c:3106
 msgid "invalid hex digit in 'color' or 'lty'"
@@ -3080,11 +3072,11 @@
 
 #: src/main/envir.c:1778
 msgid "names(x) must be a character vector of the same length as x"
-msgstr "names(x) muss ein Charaktervektor so lang wie x sein"
+msgstr "names(x) muss ein Zeichenkettenvektor derselben Länge wie x sein"
 
 #: src/main/envir.c:1781
 msgid "'envir' argument must be an environment"
-msgstr "'envir' Argument muss eine Umgebung sein"
+msgstr "'envir'-Argument muss eine Umgebung sein"
 
 #: src/main/envir.c:1810
 msgid "cannot remove variables from base namespace"
@@ -3139,117 +3131,117 @@
 
 #: src/main/envir.c:2368
 msgid "'attach' only works for lists, data frames and environments"
-msgstr "'attach' arbeitet nur für Listen, Data Frames und Umgebungen"
+msgstr "'attach' funktioniert nur für Listen, Data Frames und Umgebungen"
 
 #: src/main/envir.c:2451
 msgid "detaching \"package:base\" is not allowed"
 msgstr "\"package:base\" kann nicht \"detached\" werden"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2796 src/main/envir.c:2877
 msgid "argument must be an environment"
 msgstr "Argument muss eine Umgebung sein"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2881
 msgid "arguments must be symbolic"
 msgstr "Argumente müssen symbolisch sein"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3017
 msgid "no enclosing environment"
 msgstr "keine einschließende Umgebung"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3070
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "kein Eintrag names \"%s\" im Suchpfad"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3095
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "Benutzung von 'as.enivornment(NULL) ist nicht mehr möglich"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3101
 msgid "S4 object does not extend class \"environment\""
-msgstr "Das S4 Objekt erweitert nicht die Klasse \"environment\""
+msgstr "Das S4-Objekt erweitert nicht die Klasse \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3116
 msgid "invalid object for 'as.environment'"
 msgstr "ungültiges Objekt für 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3142 src/main/envir.c:3170 src/main/envir.c:3199
+#: src/main/envir.c:3220 src/main/envir.c:3243 src/main/envir.c:3278
+#: src/main/envir.c:3299
 msgid "not an environment"
 msgstr "keine Umgebung"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3194 src/main/envir.c:3215 src/main/envir.c:3236
+#: src/main/envir.c:3273 src/main/envir.c:3294 src/main/envir.c:3393
 msgid "not a symbol"
 msgstr "kein Symbol"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3207 src/main/envir.c:3228 src/main/envir.c:3286
+#: src/main/envir.c:3307
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "keine Bindung für \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3238
 msgid "not a function"
 msgstr "keine Funktion"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3246 src/main/envir.c:3262
 msgid "symbol already has a regular binding"
 msgstr "Symbol hat bereits reguläre Bindung"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3248 src/main/envir.c:3264
 msgid "cannot change active binding if binding is locked"
 msgstr "kann die aktive Bindung nicht ändern, wenn diese geschlossen ist"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3352 src/main/envir.c:3589
 msgid "unknown op"
 msgstr "unbekannte Operation"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3397
 msgid "cannot unbind a locked binding"
 msgstr "kann abgeschlossene Bindung nicht lösen"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3399
 msgid "cannot unbind an active binding"
 msgstr "kann aktive Bindung nicht lösen"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3540
 msgid "bad namespace name"
 msgstr "unbrauchbarer Name für Namensraum"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3552
 msgid "namespace already registered"
 msgstr "Namensraum bereits registriert"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3564
 msgid "namespace not registered"
 msgstr "Namensraum nicht registriert"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3620
 msgid "bad import environment argument"
 msgstr "unbrauchbares Argument für zu importierende Umgebung"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3625
 msgid "bad export environment argument"
 msgstr "unbrauchbares Argument für zu exportierende Umgebung"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3629
 msgid "length of import and export names must match"
 msgstr "Länge von Import- und Exportnamen muss übereinstimmen"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3652
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "exportiertes Symbol '%s' hat keinen Wert"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3817
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "unbekannte Kodierung: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3837
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "Zeichenkette '%s' enthält nul Zeichen"
@@ -3441,7 +3433,7 @@
 #: src/main/eval.c:307
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
-msgstr "Quellkodedateien übersprungen von Rprof; bitte '%s' erhöhen"
+msgstr "Quellcodedateien übersprungen von Rprof; bitte '%s' erhöhen"
 
 #: src/main/eval.c:327
 #, c-format
@@ -3471,11 +3463,11 @@
 "Auswertung zu tief verschachtelt: unendliche Rekursion / "
 "options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:574 src/main/eval.c:4119
 msgid "argument is missing, with no default"
 msgstr "Argument fehlt ohne Standard"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5410
 msgid "attempt to apply non-function"
 msgstr "Versuch eine Nicht-Funktion anzuwenden"
 
@@ -3519,7 +3511,7 @@
 msgid "non-symbol loop variable"
 msgstr "nicht-symbolische Schleifenvariable"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1596 src/main/eval.c:5182
 msgid "invalid for() loop sequence"
 msgstr "unbrauchbare Sequenz für for() Schleife"
 
@@ -3533,7 +3525,7 @@
 
 #: src/main/eval.c:1817
 msgid "target of assignment expands to non-language object"
-msgstr "ziel der Zuweisung expandiert zu keinem Sprachobjekt"
+msgstr "Ziel der Zuweisung expandiert zu keinem Sprachobjekt"
 
 #: src/main/eval.c:1900
 #, c-format
@@ -3593,125 +3585,125 @@
 
 #: src/main/eval.c:2957
 msgid "dispatch error in group dispatch"
-msgstr "Dispatch Fehler beim Gruppendispatch"
+msgstr "Dispatch-Fehler beim Gruppen-Dispatch"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3441
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "\"%s\" ist keine %s Funktion"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:3928
 msgid "node stack overflow"
-msgstr "Knotenstacküberlauf"
+msgstr "Knotenstack-Ãœberlauf"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:3934
 msgid "integer stack overflow"
 msgstr "Integerstack-Ãœberlauf"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:3988
 msgid "bad opcode"
 msgstr "unbrauchbarer opcode"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:4964
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "ungültiger %s Typ in 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5076
 msgid "bytecode version mismatch; using eval"
 msgstr "nicht passende Bytecode Versionen; nutze eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5081
 msgid "bytecode version is too old"
 msgstr "Bytecode Version ist zu alt"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5082
 msgid "bytecode version is too new"
 msgstr "Bytecode Version ist zu neu"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5116
 msgid "byte code version mismatch"
 msgstr "nicht passende Bytecode Versionen"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5264
 msgid "invalid sequence argument in for loop"
 msgstr "ungültiges Argument für Sequenz in for Schleife"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5399 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "es gibt keine .Internal Funktion '%s'"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5497 src/main/eval.c:5843 src/main/eval.c:5883
 msgid "bad function"
 msgstr "unbrauchbare Funktion"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5510
 msgid "not a BUILTIN function"
 msgstr "keine BUILTIN Funktion"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:5940
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr "für 'switch' ohne benannte Alternativen ist eine numerische EXPR nötig"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6051
 msgid "cannot find index for threaded code address"
 msgstr "konnte Index für threaded code Adresse nicht finden"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6111
 msgid "invalid body"
 msgstr "ungültiger body"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6131
 msgid "invalid symbol"
 msgstr "ungültiges Symbol"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6175
 msgid "argument is not a byte code object"
 msgstr "Argument ist kein Bytecode Objekt"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6196
 msgid "bad file name"
 msgstr "unbrauchbarer Dateiname"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6200 src/main/eval.c:6221
 msgid "unable to open 'file'"
 msgstr "kann 'file' nicht öffnen"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6215 src/main/saveload.c:1942
 msgid "'file' must be non-empty string"
 msgstr "'file' muss eine nichtleere Zeichenkette sein"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6217 src/main/saveload.c:1944 src/main/saveload.c:2244
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' muss ein logischer Wert sein"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6288 src/main/eval.c:6307 src/main/eval.c:6337
 msgid "constant buffer must be a generic vector"
 msgstr "constant buffer muss ein generischer Vektor sein"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6339
 msgid "bad constant count"
 msgstr "unzulässige Anzahl von Konstanten"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6375
 msgid "profile timer in use"
 msgstr "Profiling-Zeitmessung läuft"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6377
 msgid "already byte code profiling"
 msgstr "Bytecode-Profiling läuft bereits"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6395
 msgid "setting profile timer failed"
 msgstr "Stellen des Profile-Zeitnehmers fehlgeschlagen"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6412
 msgid "not byte code profiling"
-msgstr "Byte Code Profiling läuft nicht"
+msgstr "Bytecodeprofiling läuft nicht"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6427 src/main/eval.c:6430 src/main/eval.c:6433
 msgid "byte code profiling is not supported in this build"
 msgstr "Bytecodeprofiling wird in diesem Binary nicht unterstützt"
 
@@ -3764,7 +3756,7 @@
 
 #: src/main/gram.y:1657
 msgid "contextstack overflow"
-msgstr "Kontextstacküberlauf"
+msgstr "Kontextstack-Ãœberlauf"
 
 #: src/main/gram.y:1907 src/main/gram.y:1913
 #, c-format
@@ -3897,7 +3889,8 @@
 "string at line %d containing Unicode escapes not in this locale\n"
 "is too long (max 10000 chars)"
 msgstr ""
-"Zeichenkette in Zeile %d mit Unicodeescapes nicht aus dieser Lokalisierung\n"
+"Zeichenkette in Zeile %d mit Unicode-Escapecodes nicht aus dieser "
+"Lokalisierung\n"
 "ist zu lang (max. 1000 Zeichen)"
 
 #: src/main/gram.y:3148 src/main/gram.y:3155 src/main/gram.y:3161
@@ -3930,12 +3923,12 @@
 #: src/main/grep.c:900 src/main/grep.c:2499
 #, c-format
 msgid "input string %d is invalid UTF-8"
-msgstr "Eingabezeichenkette %d ist unkorrektes UTF-8"
+msgstr "Eingabe-Zeichenkette %d ist ungültig in UTF-8"
 
 #: src/main/grep.c:292 src/main/grep.c:391
 #, c-format
 msgid "'split' string %d is invalid UTF-8"
-msgstr "'split' Zeichenkette %d ist unkorrektes UTF-8"
+msgstr "'split' Zeichenkette %d ist inkorrektes UTF-8"
 
 #: src/main/grep.c:296 src/main/grep.c:395 src/main/grep.c:571
 #, c-format
@@ -4020,7 +4013,7 @@
 
 #: src/main/internet.c:83
 msgid "internet routines cannot be accessed in module"
-msgstr "Internetroutinen können nicht im Modul angesprochen werden"
+msgstr "Internet-Routinen können nicht angesprochen werden im Modul"
 
 #: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
 #: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
@@ -4028,11 +4021,11 @@
 #: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
 #: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
 msgid "internet routines cannot be loaded"
-msgstr "Internet Routinen können nicht geladen werden"
+msgstr "Internet-Routinen können nicht geladen werden"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
+#: src/main/internet.c:109 src/main/memory.c:3490 src/main/memory.c:3500
+#: src/main/memory.c:3512 src/main/memory.c:3526 src/main/memory.c:3541
+#: src/main/memory.c:3559
 msgid "bad value"
 msgstr "unbrauchbarer Wert"
 
@@ -4040,15 +4033,15 @@
 #: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
 #: src/main/internet.c:327
 msgid "socket routines cannot be loaded"
-msgstr "Socket Routinen können nicht geladen werden"
+msgstr "Socket-Routinen können nicht geladen werden"
 
 #: src/main/lapack.c:39
 msgid "LAPACK routines cannot be accessed in module"
-msgstr "LAPACK Routinen  nicht verfügbar aus Modul"
+msgstr "LAPACK-Routinen  nicht verfügbar aus Modul"
 
 #: src/main/lapack.c:53
 msgid "LAPACK routines cannot be loaded"
-msgstr "LAPACK Routinen können nicht geladen werden"
+msgstr "LAPACK-Routinen können nicht geladen werden"
 
 #: src/main/logic.c:79 src/main/logic.c:141
 msgid "operations are possible only for numeric, logical or complex types"
@@ -4093,7 +4086,7 @@
 
 #: src/main/main.c:481
 msgid "Error: segfault from C stack overflow\n"
-msgstr "Fehler: segmentation fault wegen eines C-Stack Ãœberlaufes\n"
+msgstr "Fehler: segmentation fault wegen eines C-Stack-Ãœberlaufes\n"
 
 #: src/main/main.c:853
 msgid "unable to open the base package\n"
@@ -4108,46 +4101,46 @@
 msgid "During startup - "
 msgstr "Beim Start - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1235
 msgid "cannot quit from browser"
 msgstr "kann Browser nicht beenden"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1239
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "entweder \"yes\", \"no\", \"ask\" oder \"default\" erwartet."
 
-#: src/main/main.c:1241
+#: src/main/main.c:1244
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "save=\"ask\" in nicht-interaktiver Nutzung: Kommandozeilenstandard wird "
 "benutzt"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1252
 msgid "unrecognized value of 'save'"
 msgstr "unbekannter Wert für 'save'"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1255
 msgid "invalid 'status', 0 assumed"
 msgstr "ungültiger 'status', nehme 0 an"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1260
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "ungültiger Wert für 'runLast', nehme FALSE an"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1291
 msgid "cannot allocate space for toplevel callback element"
 msgstr "kann keinen Speicher für toplevel callback zuteilen"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1369
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "negativer Index an R_removeTaskCallbackByIndex übergeben"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1479
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "Warnmeldung vom toplevel task callback '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1535
 msgid "top-level task callback did not return a logical value"
 msgstr "toplevel task callback gibt keinen logischen Wert zurück"
 
@@ -4217,142 +4210,142 @@
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "drittes Argument muss 'TRUE' oder 'FALSE' sein"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1978
 msgid "vector memory exhausted (limit reached?)"
 msgstr "Vektorspeicher erschöpft (Limit erreicht?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1984
 msgid "cons memory exhausted (limit reached?)"
 msgstr "Cons-Speicher erschöpft (Limit erreicht?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1989
 msgid "memory exhausted (limit reached?)"
 msgstr "Speicher erschöpft (Limit erreicht?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2125
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "kann Speicherblock der Größe %0.f Tb nicht allozieren"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2130
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "kann Speicherblock der Größe %0.1f GB nicht zuteilen"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2457
 msgid "vector is too large"
 msgstr "Vektor ist zu groß"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2460
 msgid "negative length vectors are not allowed"
 msgstr "Vektoren negativer Länge sind nicht erlaubt"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2486 src/main/memory.c:2499 src/main/memory.c:2512
+#: src/main/memory.c:2527
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "kann Vektor der Länge %d nicht allozieren"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2548
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "ungültiger Typ/Länge (%s/%d) bei der Vektorallokation"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2647
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "kann Vektor der Größe %0.1f GB nicht allozieren"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2651
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "kann Vektor der Größe %0.1f MB nicht allozieren"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2655
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "kann Vektor der Größe %0.f KB nicht allozieren"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3052
 msgid "protect(): protection stack overflow"
 msgstr "protect(): protection stack Ãœberlauf"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3059
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect(): nur %d geschütztes Element"
 msgstr[1] "unprotect(): nur %d geschützte Elemente"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3094
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: Zeiger nicht gefunden"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3132
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
-"R_Reprotect: nur %d geschütztes Element, kann Index %d nicht reprotecten"
+"R_Reprotect: nur %d geschütztes Element, kann Index %d nicht re-protecten"
 msgstr[1] ""
-"R_Reprotect: nur %d geschützte Elemente, kann Index %d nicht reprotecten"
+"R_Reprotect: nur %d geschützte Elemente, kann Index %d nicht re-protecten"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3184
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "'Calloc' konnte keinen Speicher (%.0f von %u Bytes) zuteilen"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3195
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "'Realloc' konnte keinen Speicher re-allozieren (%.0f Bytes)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3436
 msgid "not safe to return vector pointer"
 msgstr "Vektorzeigerrückgabe ist unsicher"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3447
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
-msgstr "Versuch den Inde %lu/%lu in SET_STRING_ELT zu setzen"
+msgstr "Versuch den Index %lu/%lu in SET_STRING_ELT zu setzen"
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3463
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
-msgstr "Versuch den Inde %lu/%lu in SET_VECTOR_ELT zu setzen"
+msgstr "Versuch den Index %lu/%lu in SET_VECTOR_ELT zu setzen"
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3722
 msgid "memory profiling is not available on this system"
 msgstr "Speicherprofiling ist auf diesem System nicht verfügbar"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3786
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: kann die Ausgabedatei '%s' nicht öffnen"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3894
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr "lange Vektoren noch nicht unterstützt: %s:%d"
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "Zeichenkettenargument benötigt"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "keine solche primitive Funktion"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "Versuch einen Variablennamen der Länge 0 zu nutzen"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "Variablennamen sind auf %d Bytes beschränkt"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "ungültiges Argument für .Internal()"
 
@@ -4373,7 +4366,7 @@
 "no '.S3MethodsClass' table, cannot use S4 objects with S3 methods ('methods' "
 "package not attached?)"
 msgstr ""
-"Keine Tabelle '.S3MethodsClass', kann keine S4 Objekte mit S3 Methoden "
+"Keine Tabelle '.S3MethodsClass', kann keine S4-Objekte mit S3-Methoden "
 "nutzen (Paket 'methods' nicht eingebunden?)"
 
 #: src/main/objects.c:415
@@ -4454,7 +4447,7 @@
 
 #: src/main/objects.c:829
 msgid "'what' must be a character vector"
-msgstr "'what' muss eine Charaktervektor sein"
+msgstr "'what' muss ein Zeichenkettenvektor sein"
 
 #: src/main/objects.c:833
 msgid "'which' must be a length 1 logical vector"
@@ -4462,11 +4455,11 @@
 
 #: src/main/objects.c:839
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
-msgstr "benutze 'is()' statt 'inherits()' für S4 Objekte"
+msgstr "benutze 'is()' statt 'inherits()' für S4-Objekte"
 
 #: src/main/objects.c:968
 msgid "could not find correct environment; please report!"
-msgstr "konnte die richtige Umgebung nicht finden: bitte melden!"
+msgstr "konnte die richtige Umgebung nicht finden: bitte R-devel melden!"
 
 #: src/main/objects.c:1012
 msgid "'onOff' must be TRUE or FALSE"
@@ -4481,7 +4474,7 @@
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
-"'standardGeneric' aufgerufen Dispatch  aus 'methods' zu aktivieren(wird "
+"'standardGeneric' aufgerufen ohne Dispatch aus 'methods' zu aktivieren (wird "
 "ignoriert)"
 
 #: src/main/objects.c:1118
@@ -4532,7 +4525,7 @@
 
 #: src/main/objects.c:1430 src/main/objects.c:1449
 msgid "dispatch error"
-msgstr "Dispatch Fehler"
+msgstr "Dispatch-Fehler"
 
 #: src/main/objects.c:1443
 #, c-format
@@ -4545,7 +4538,7 @@
 
 #: src/main/objects.c:1468
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
-msgstr "Makro MAKE_CLASS auf C Level mit NULL Zeichenkettenzeiger aufgerufen"
+msgstr "Makro MAKE_CLASS auf C Level mit Zeichenketten-NULL-Zeiger aufgerufen"
 
 #: src/main/objects.c:1484
 msgid "'methods' package not yet loaded"
@@ -4568,11 +4561,11 @@
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
-"Objekt der Klasse \"%s\" korrespondiert nicht mit einem gültigen S3 Objekt"
+"Objekt der Klasse \"%s\" korrespondiert nicht mit einem gültigen S3-Objekt"
 
 #: src/main/options.c:120 src/main/options.c:181
 msgid "corrupted options list"
-msgstr "korrupte Optionsliste"
+msgstr "beschädigte Optionsliste"
 
 #: src/main/options.c:130
 msgid "invalid printing width, used 80"
@@ -4580,7 +4573,7 @@
 
 #: src/main/options.c:141
 msgid "invalid printing digits, used 7"
-msgstr "unzulässige Anzahl von Stelle für die Ausgabe, nutze 7"
+msgstr "unzulässige Anzahl von Stellen für die Ausgabe, nutze 7"
 
 #: src/main/options.c:153
 msgid "invalid 'deparse.cutoff', used 60"
@@ -4734,7 +4727,7 @@
 
 #: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'to' name too long"
-msgstr "expandierter 'to' Name zu lang"
+msgstr "expandierter Name 'to' zu lang"
 
 #: src/main/platform.c:738
 #, c-format
@@ -4775,12 +4768,12 @@
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
-"OS meldet: Anfrage Lokilisierung auf \"%s\" zu setzen kann nicht beachtet "
+"OS meldet: Anfrage Lokalisierung auf \"%s\" zu setzen kann nicht beachtet "
 "werden"
 
 #: src/main/platform.c:2148
 msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' muss eine Charaktervektor der Länge 1 sein"
+msgstr "'hostname' muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: src/main/platform.c:2154
 #, c-format
@@ -4789,7 +4782,7 @@
 
 #: src/main/platform.c:2161
 msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "unbekanntes Format von der C Funktion  'gethostbyname' zurückgegeben"
+msgstr "unbekanntes Format von der C-Funktion 'gethostbyname' zurückgegeben"
 
 #: src/main/platform.c:2170
 msgid "nsl() is not supported on this platform"
@@ -4826,7 +4819,7 @@
 #: src/main/platform.c:2356
 #, c-format
 msgid "problem creating directory %ls: %s"
-msgstr "Problem beim erzeugen von Verzeichnis %ls: %s"
+msgstr "Problem beim Erzeugen von Verzeichnis %ls: %s"
 
 #: src/main/platform.c:2376
 #, c-format
@@ -4864,7 +4857,7 @@
 
 #: src/main/platform.c:2821
 msgid "insufficient OS support on this platform"
-msgstr "ungenügende OS Unterstützung auf dieser Plattform"
+msgstr "ungenügende OS-Unterstützung auf dieser Plattform"
 
 #: src/main/plot3d.c:118
 #, c-format
@@ -4873,15 +4866,15 @@
 
 #: src/main/plot3d.c:196
 msgid "all z values are equal"
-msgstr "alle z Werte sind gleich"
+msgstr "alle z-Werte sind gleich"
 
 #: src/main/plot3d.c:198
 msgid "all z values are NA"
-msgstr "alle z Werte sind NA"
+msgstr "alle z-Werte sind NA"
 
 #: src/main/plotmath.c:333
 msgid "invalid math style encountered"
-msgstr "unzulässiger Math-Stil aufgetreten"
+msgstr "unzulässiger mathematischer Stil aufgetreten"
 
 #: src/main/plotmath.c:1260 src/main/plotmath.c:1365 src/main/plotmath.c:2654
 msgid "invalid mathematical annotation"
@@ -4999,7 +4992,7 @@
 #: src/main/random.c:480 src/main/random.c:508
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
-"kann keine Stichprobe größer als die Grundgesamtheit nehmen\n"
+"kann keine Stichprobe größer als die Grundgesamtheit nehmen,\n"
 " wenn 'replace = FALSE'"
 
 #: src/main/random.c:487
@@ -5012,7 +5005,7 @@
 
 #: src/main/raw.c:37 src/main/raw.c:272
 msgid "argument must be a character vector of length 1"
-msgstr "Argument muss ein Charaktervektor der Länge 1 sein"
+msgstr "Argument muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: src/main/raw.c:39 src/main/raw.c:274
 msgid ""
@@ -5028,7 +5021,7 @@
 
 #: src/main/raw.c:56 src/main/raw.c:331
 msgid "argument 'multiple' must be TRUE or FALSE"
-msgstr "Argument 'mulitple' muss TRUE oder FALSE sein"
+msgstr "Argument 'multiple' muss TRUE oder FALSE sein"
 
 #: src/main/raw.c:91
 msgid "argument 'shift' must be a small integer"
@@ -5040,7 +5033,7 @@
 
 #: src/main/raw.c:148
 msgid "argument 'x' must be raw, integer or logical"
-msgstr "Argument 'x' muss raw, ganzzahlig oder Boole'sch sein"
+msgstr "Argument 'x' muss raw, ganzzahlig oder boolesch sein"
 
 #: src/main/raw.c:154
 #, c-format
@@ -5053,7 +5046,7 @@
 
 #: src/main/raw.c:286
 msgid "invalid UTF-8 string"
-msgstr "ungültige UTF-8 Zeichenkette"
+msgstr "ungültige UTF-8-Zeichenkette"
 
 #: src/main/relop.c:202
 #, c-format
@@ -5119,7 +5112,7 @@
 
 #: src/main/saveload.c:572 src/main/saveload.c:645
 msgid "bad SEXP type in data file"
-msgstr "unbrauchbarer SEXP Typ in Datenfile"
+msgstr "unbrauchbarer SEXP-Typ in Datendatei"
 
 #: src/main/saveload.c:586
 msgid "mismatch on types"
@@ -5138,8 +5131,8 @@
 #: src/main/saveload.c:722
 msgid "cannot restore file position while restoring data"
 msgstr ""
-"kann Position in Datei nicht wiederherstellen, während ich Daten "
-"wiederherstelle"
+"kann Position in Datei nicht wiederherstellen, während Daten "
+"wiederhergestellt werden"
 
 #: src/main/saveload.c:915
 msgid "base namespace is not preserved in version 1 workspaces"
@@ -5166,7 +5159,7 @@
 
 #: src/main/saveload.c:1084
 msgid "cannot save byte code objects in version 1 workspaces"
-msgstr "kann Bytecodeobjekte nicht in Version 1 workspace sichern"
+msgstr "kann Bytecode-Objekte nicht in Version 1 Workspace sichern"
 
 #: src/main/saveload.c:1086
 #, c-format
@@ -5179,7 +5172,7 @@
 
 #: src/main/saveload.c:1286
 msgid "cannot read byte code objects from version 1 workspaces"
-msgstr "kann keine Bytecodeobjekte aus Version 1 workspace laden"
+msgstr "kann keine Bytecodeobjekte aus Version 1 Workspace laden"
 
 #: src/main/saveload.c:1288
 #, c-format
@@ -5200,7 +5193,7 @@
 
 #: src/main/saveload.c:1585
 msgid "a binary string read error occurred"
-msgstr "binärer Zeichenkettenlesefehler aufgetreten"
+msgstr "Lesefehler bei binärer Zeichenkette aufgetreten"
 
 #: src/main/saveload.c:1645
 msgid "an xdr integer data write error occurred"
@@ -5212,7 +5205,7 @@
 
 #: src/main/saveload.c:1667 src/main/saveload.c:1686
 msgid "an xdr string data write error occurred"
-msgstr "xdr Schreibfehler bei Zeichenkettendaten aufgetreten"
+msgstr "xdr Schreibfehler bei Zeichenketten-Daten aufgetreten"
 
 #: src/main/saveload.c:1694
 msgid "an xdr real data write error occurred"
@@ -5224,7 +5217,7 @@
 
 #: src/main/saveload.c:1708
 msgid "an xdr complex data write error occurred"
-msgstr "xdr Schreibfehler bei complex aufgetreten"
+msgstr "xdr Schreibfehler bei complex Daten aufgetreten"
 
 #: src/main/saveload.c:1715
 msgid "an xdr complex data read error occurred"
@@ -5247,12 +5240,12 @@
 #: src/main/saveload.c:1914
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
-"unbrauchbare Restoredatei magic number (Datei evtl. korrupt) -- keine Daten "
-"geladen"
+"unbrauchbare Restore Datei magic number (Datei evtl. beschädigt) -- keine "
+"Daten geladen"
 
 #: src/main/saveload.c:1940 src/main/saveload.c:2238
 msgid "first argument must be a character vector"
-msgstr "erstes Argument muss ein Charaktervektor sein"
+msgstr "erstes Argument muss ein Zeichenkettenvektor sein"
 
 #: src/main/saveload.c:2012
 msgid "not a valid named list"
@@ -5261,11 +5254,11 @@
 #: src/main/saveload.c:2019 src/main/saveload.c:2040
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
-msgstr "'%s' sieht aus wie ein pre R-2.4.0 Objekt: bitte neu erzeugen"
+msgstr "'%s' sieht aus wie ein prä R-2.4.0 S4-Objekt: bitte neu erzeugen"
 
 #: src/main/saveload.c:2027
 msgid "loaded data is not in pair list form"
-msgstr "geladene Daten sind nicht in Paarlisten Form"
+msgstr "geladene Daten sind nicht in Form von Paarlisten"
 
 #: src/main/saveload.c:2063
 msgid "first argument must be a file name"
@@ -5373,15 +5366,15 @@
 
 #: src/main/scan.c:988
 msgid "embedded nul(s) found in input"
-msgstr "Eingabe  enthält nul Zeichen"
+msgstr "Eingabe enthält nul Zeichen"
 
 #: src/main/seq.c:48
 msgid "unequal factor lengths"
-msgstr "ungleiche Faktor Längen"
+msgstr "ungleiche Faktorlängen"
 
 #: src/main/seq.c:100
 msgid "result would be too long a vector"
-msgstr "Resultat wäre zu langer Vektor"
+msgstr "Resultat wäre ein zu langer Vektor"
 
 #: src/main/seq.c:159
 msgid "argument of length 0"
@@ -5520,7 +5513,7 @@
 "negative serialized vector length:\n"
 "perhaps long vector from 64-bit version of R?"
 msgstr ""
-"negative Länge für einen serialisierten vektor:\n"
+"negative Länge für einen serialisierten Vektor:\n"
 "evtl. ein langer Vektor aus der 64-bit Version von R"
 
 #: src/main/serialize.c:1746
@@ -5529,7 +5522,7 @@
 
 #: src/main/serialize.c:1748
 msgid "this version of R cannot read generic function references"
-msgstr "diese R Version kann keine Referenzen auf generische Funktionen lesen"
+msgstr "diese R-Version kann keine Referenzen auf generische Funktionen lesen"
 
 #: src/main/serialize.c:1765
 #, c-format
@@ -5566,7 +5559,7 @@
 
 #: src/main/serialize.c:2069
 msgid "unexpected format in ascii connection"
-msgstr "unerwartetes Format aus ASCII Verbindung"
+msgstr "unerwartetes Format aus ASCII-Verbindung"
 
 #: src/main/serialize.c:2074 src/main/serialize.c:2088
 msgid "error reading from connection"
@@ -5593,7 +5586,7 @@
 #: src/main/serialize.c:2481
 msgid "serialization is too large to store in a raw vector"
 msgstr ""
-"Serialisierung ist zu groß, um in einem Raw-Vektor gespeichert zu werden"
+"Serialisierung ist zu groß, um in einem raw Vektor gespeichert zu werden"
 
 #: src/main/serialize.c:2398
 msgid "cannot allocate buffer"
@@ -5724,7 +5717,7 @@
 
 #: src/main/sprintf.c:105
 msgid "'fmt' is not a character vector"
-msgstr "'fmt' ist kein Charakter-Vektor"
+msgstr "'fmt' ist kein Zeichenkettenvektor"
 
 #: src/main/sprintf.c:110
 #, c-format
@@ -5739,7 +5732,7 @@
 #: src/main/sprintf.c:128 src/main/sprintf.c:131
 msgid "arguments cannot be recycled to the same length"
 msgstr ""
-"Argumente können nicht durch Wiederverwendung auf gleiche Länge gebraucht "
+"Argumente können nicht durch Wiederverwendung (Recycling) auf gleiche Länge gebracht "
 "werden"
 
 #: src/main/sprintf.c:153 src/main/sprintf.c:260
@@ -5761,15 +5754,15 @@
 #: src/main/sprintf.c:221
 msgid "at most one asterisk '*' is supported in each conversion specification"
 msgstr ""
-"höchstens ein Stern `*' wird in jeder Konvertierungsspezifikation unterstützt"
+"höchstens ein Stern '*' wird in jeder Konvertierungsspezifikation unterstützt"
 
 #: src/main/sprintf.c:231
 msgid "argument for '*' conversion specification must be a number"
-msgstr "Argument für `*' Konvertierung muss eine Zahl sein"
+msgstr "Argument für '*' Konvertierung muss eine Zahl sein"
 
 #: src/main/sprintf.c:269
 msgid "coercion has changed vector length to 0"
-msgstr "Umwandlung hat Länge des Vektors zu 0 gemacht"
+msgstr "Umwandlung hat Länge des Vektors zu 0 geändert"
 
 #: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
 #: src/main/sprintf.c:405
@@ -5795,7 +5788,7 @@
 #: src/main/sprintf.c:406
 #, c-format
 msgid "use format %s for character objects"
-msgstr "benutze Format %s für Charakter-Objekte"
+msgstr "benutze Format %s für Zeichenketten-Objekte"
 
 #: src/main/sprintf.c:411
 #, c-format
@@ -5921,7 +5914,7 @@
 
 #: src/main/subassign.c:1968
 msgid "no method for assigning subsets of this S4 class"
-msgstr "keine Methode um Teilmengen dieser S4 Klasse zuzuweisen"
+msgstr "keine Methode um Teilmengen dieser S4-Klasse zuzuweisen"
 
 #: src/main/subassign.c:2026
 msgid "Coercing LHS to a list"
@@ -6006,7 +5999,7 @@
 
 #: src/main/subset.c:953
 msgid "this S4 class is not subsettable"
-msgstr "Diese S4 Klasse ist nicht in Teilen verfügbar"
+msgstr "Diese S4-Klasse ist nicht in Teilen verfügbar"
 
 #: src/main/subset.c:960
 msgid "wrong arguments for subsetting an environment"
@@ -6028,7 +6021,7 @@
 
 #: src/main/summary.c:633
 msgid "Integer overflow - use sum(as.numeric(.))"
-msgstr "Integer-Ãœberlauf - nutze sum(as.numeric(,))"
+msgstr "Integer-Ãœberlauf - nutze sum(as.numeric(.))"
 
 #: src/main/summary.c:746
 msgid "no non-missing arguments, returning NA"
@@ -6083,7 +6076,7 @@
 
 #: src/main/sysutils.c:179
 msgid "file name conversion problem"
-msgstr "Problem bei der Konversion des Dateinamens"
+msgstr "Problem bei der Konvertierung des Dateinamens"
 
 #: src/main/sysutils.c:248
 msgid "invalid filename pattern"
@@ -6103,7 +6096,7 @@
 
 #: src/main/sysutils.c:258
 msgid "no 'fileext'"
-msgstr "keine 'fileext'"
+msgstr "keine 'fileext' angegeben"
 
 #: src/main/sysutils.c:322
 #, c-format
@@ -6138,11 +6131,11 @@
 
 #: src/main/sysutils.c:637
 msgid "'x' must be a character vector"
-msgstr "'x' muss ein Charaktervektor sein"
+msgstr "'x' muss ein Zeichenkettenvektor sein"
 
 #: src/main/sysutils.c:652
 msgid "'x' must be a list of NULL or raw vectors"
-msgstr "'x' muss eine Liste von NULL oder ein raw vector sein"
+msgstr "'x' muss eine Liste von NULL oder von raw-Vektoren sein"
 
 #: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
 #: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
@@ -6233,7 +6226,7 @@
 
 #: src/main/unique.c:973 src/main/unique.c:1111
 msgid "argument is not of mode character"
-msgstr "Argument hat nicht Modus Charakter"
+msgstr "Argument hat nicht Modus character"
 
 #: src/main/unique.c:1236
 msgid "... used in a situation where it does not exist"
@@ -6245,7 +6238,7 @@
 
 #: src/main/unique.c:1471
 msgid "non-numeric data frame in rowsum"
-msgstr "nicht-numerischer dataframe in rowsum"
+msgstr "nicht-numerischer Dataframe in rowsum"
 
 #: src/main/unique.c:1503
 msgid "this cannot happen"
@@ -6253,148 +6246,148 @@
 
 #: src/main/unique.c:1574
 msgid "'names' must be a character vector"
-msgstr "'names' muss Charaktervektor sein"
+msgstr "'names' muss ein Zeichenkettenvektor sein"
 
 #: src/main/util.c:87 src/main/util.c:105
 msgid "object is not a matrix"
 msgstr "Objekt ist keine Matrix"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "Typ %d ist in '%s' nicht implementiert"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "nicht implementierter Typ '%s' in '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "nicht implementierter Typ (%d) in '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "ungültiger tag in Namensauswertung"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%d Argument an .Internal(%s) übergeben, welches %d benötigt"
 msgstr[1] "%d Argumente an .Internal(%s) übergeben, welches %d benötigt"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d Argument an '%s' übergeben, welches %d benötigt"
 msgstr[1] "%d Argumente an '%s' übergeben, welches %d benötigt"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "angegebenes Argument names '%s' passt nicht zu '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "'nthcdr' Liste kürzer als %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr' braucht eine Liste um CDR zu verkleinern"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' muss TRUE oder FALSE sein"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' muss TRUE oder FALSE sein"
 
-#: src/main/util.c:670
+#: src/main/util.c:668
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr "Anzahl der Zeilen im Ergebnis überschreitet die maximale Vektorlänge"
 
-#: src/main/util.c:762
+#: src/main/util.c:760
 msgid "missing value is invalid"
 msgstr "fehlender Wert ist unzulässig"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:769 src/main/util.c:776
 msgid "cannot change working directory"
 msgstr "kann Arbeitsverzeichnis nicht wechseln"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:796 src/main/util.c:830 src/main/util.c:871
+#: src/main/util.c:913 src/main/util.c:1042 src/main/util.c:1101
+#: src/main/util.c:1124
 msgid "a character vector argument expected"
-msgstr "Charaktervektor als Argument erwartet"
+msgstr "Zeichenkettenvektor als Argument erwartet"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:803 src/main/util.c:838 src/main/util.c:880
+#: src/main/util.c:921
 msgid "path too long"
 msgstr "Pfad zu lang"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1056
 msgid "only the first character of 'quote' will be used"
 msgstr "nur das erste Zeichen von 'quote' wird benutzt"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1126
 msgid "a character vector 'value' expected"
-msgstr "Charaktervektor 'value' erwartet"
+msgstr "Zeichenkettenvektor 'value' erwartet"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1129
 msgid "'value' must be of positive length"
 msgstr "'value' muss positive Länge haben"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1258 src/main/util.c:1266
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "ungültige Eingabe '%s' in 'utf8towcs"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1351
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "ungültige multibyte Zeichenkette bei '%s'"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1493
 msgid "error message truncated to 255 chars"
 msgstr "Fehlermeldung auf 255 Zeichen gekürzt"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1506
 msgid "warning message truncated to 255 chars"
 msgstr "Warnung auf 255 Zeichen gekürzt"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1655
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr "Genauigkeitsverlust bei der Konvertierung von \"%s\" in numerisch\""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1965
 msgid "all arguments must be named"
 msgstr "alle Argumente müssen Namen haben"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2085
 msgid "ICU is not supported on this build"
 msgstr "ICU wird in diesem Binary nicht unterstützt"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2152
 msgid "'breaks' is not sorted"
 msgstr "'breaks' ist nicht sortiert"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2186 src/main/util.c:2232
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "langer Vektor '%s' wird nicht unterstützt"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2285
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr "'eps.correct' muss 0, 1 oder 2 sein"
 
-#: src/main/util.c:2282
+#: src/main/util.c:2313
 msgid "'x' must be a vector"
 msgstr "'x' muss ein Vektor sein"
 
@@ -6442,7 +6435,7 @@
 
 #: src/main/xspline.c:74
 msgid "insufficient memory to allocate point array"
-msgstr "zu wenig Hauptspeicher um Punktarry zu allozieren"
+msgstr "zu wenig Hauptspeicher um Punkt-Array zu allozieren"
 
 #: src/main/xspline.c:472
 msgid "there must be at least two control points"
@@ -6470,7 +6463,7 @@
 "X11 driver unable to obtain color cube\n"
 "  reverting to monochrome"
 msgstr ""
-"X11 Treiber kann den Farbwürfel nicht bekommen\n"
+"X11-Treiber kann den Farbwürfel nicht bekommen\n"
 "  greife auf monochrom zurück"
 
 #: src/modules/X11/devX11.c:594
@@ -6486,7 +6479,7 @@
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
-"kann keine X11 Schriften finden\n"
+"kann keine X11-Schriften finden\n"
 "Bitte Fontpath überprüfen."
 
 #: src/modules/X11/devX11.c:1087
@@ -6497,29 +6490,29 @@
 #: src/modules/X11/devX11.c:1121
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
-msgstr "X11 Schrift %s, Typ %d in Größe %d konnte nicht geladen werden"
+msgstr "X11-Schrift %s, Typ %d in Größe %d konnte nicht geladen werden"
 
 #: src/modules/X11/devX11.c:1130
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
-"Semi-TRansparenz ist auf diesem Gerät nicht verfügbar: Meldung nur ein Mal "
+"Semi-Transparenz ist auf diesem Gerät nicht verfügbar: Meldung nur ein Mal "
 "pro Seite"
 
 #: src/modules/X11/devX11.c:1254
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
-msgstr "X11 E/A Fehler beim Öffnen einer X11 Verbindung nach '%s'"
+msgstr "X11-I/O-Fehler beim Öffnen einer X11-Verbindung nach '%s'"
 
 #: src/modules/X11/devX11.c:1271
 msgid "X11 fatal IO error: please save work and shut down R"
-msgstr "fataler IO Fehler in X11: Bitte Arbeit sichern und R schließen!"
+msgstr "fataler I/O-Fehler in X11: Bitte Arbeit sichern und R schließen!"
 
 #: src/modules/X11/devX11.c:1326
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
-"Locale nicht von Xlib unterstützt: einige X Operationen werden in Locale C "
+"Lokalisierung nicht von Xlib unterstützt: einige X-Operationen werden in Locale C "
 "ausgeführt"
 
 #: src/modules/X11/devX11.c:1327
@@ -6537,7 +6530,7 @@
 #: src/modules/X11/devX11.c:1341
 #, c-format
 msgid "could not open PNG file '%s'"
-msgstr "konnte PNG Datei '%s' nicht öffnen"
+msgstr "konnte PNG-Datei '%s' nicht öffnen"
 
 #: src/modules/X11/devX11.c:1353
 msgid "no jpeg support in this version of R"
@@ -6550,7 +6543,7 @@
 #: src/modules/X11/devX11.c:1367
 #, c-format
 msgid "could not open JPEG file '%s'"
-msgstr "konnte JPEG Datei '%s' nicht öffnen"
+msgstr "konnte JPEG-Datei '%s' nicht öffnen"
 
 #: src/modules/X11/devX11.c:1379
 msgid "no tiff support in this version of R"
@@ -6567,20 +6560,20 @@
 #: src/modules/X11/devX11.c:1403
 #, c-format
 msgid "could not open BMP file '%s'"
-msgstr "konnte BMP Datei '%s' nicht öffnen"
+msgstr "konnte BMP-Datei '%s' nicht öffnen"
 
 #: src/modules/X11/devX11.c:1433
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
-msgstr "konnte Verbindung zu X11 display '%s' nicht öffnen"
+msgstr "konnte Verbindung zu X11-Display '%s' nicht öffnen"
 
 #: src/modules/X11/devX11.c:1443
 msgid "ignoring 'display' argument as an X11 device is already open"
-msgstr "'display' Argument ignoriert, da X11 Device bereits geöffnet"
+msgstr "'display' Argument ignoriert, da X11-Device bereits geöffnet"
 
 #: src/modules/X11/devX11.c:1449
 msgid "cairo-based types may only work correctly on TrueColor visuals"
-msgstr "cairo-basierte Typen arbeiten evtl. nur auf TrueColor Anzeigen korrekt"
+msgstr "cairo-basierte Typen arbeiten evtl. nur auf TrueColor-Anzeigen korrekt"
 
 #: src/modules/X11/devX11.c:1459
 msgid "jpeg() does not support transparency: using white bg"
@@ -6610,7 +6603,7 @@
 
 #: src/modules/X11/devX11.c:1793
 msgid "font family not found in X11 font database"
-msgstr "Schriftfamilie nicht in X11 Schriftdatenbank gefunden"
+msgstr "Schriftfamilie nicht in X11-Schriftdatenbank gefunden"
 
 #: src/modules/X11/devX11.c:1832
 #, c-format
@@ -6650,7 +6643,7 @@
 
 #: src/modules/X11/devX11.c:3159
 msgid "unknown X11 color/colour model -- using monochrome"
-msgstr "unbekanntes X11 Farbmodell -- nutze Monochrom"
+msgstr "unbekanntes X11-Farbmodell -- nutze Monochrom"
 
 #: src/modules/X11/devX11.c:3249
 msgid "no plot on device to save"
@@ -6671,7 +6664,7 @@
 
 #: src/modules/X11/devX11.c:3317
 msgid "unable to contact X11 display"
-msgstr "konnte Verbindung zu X11 Display nicht herstellen"
+msgstr "konnte Verbindung zu X11-Display nicht herstellen"
 
 #: src/modules/X11/devX11.c:3366
 #, c-format
@@ -6727,7 +6720,7 @@
 #: src/modules/internet/libcurl.c:460
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
-msgstr "heruntergeladene Länge %0.f != angegebener Länge %0.f"
+msgstr "heruntergeladene Länge %0.f != angegebene Länge %0.f"
 
 #: src/modules/internet/internet.c:645 src/modules/internet/internet.c:756
 #, c-format
@@ -6736,12 +6729,12 @@
 
 #: src/modules/internet/internet.c:760
 msgid "unsupported URL scheme"
-msgstr "nicht unterstütztes URL Schema"
+msgstr "nicht unterstütztes URL-Schema"
 
 #: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
 #, c-format
 msgid "cannot open: HTTP status was '%d %s'"
-msgstr "Öffnen fehlgeschlagen: HTTP Status war '%d %s'"
+msgstr "Öffnen fehlgeschlagen: HTTP-Status war '%d %s'"
 
 #: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
 #: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
@@ -6789,12 +6782,12 @@
 
 #: src/modules/internet/nanoftp.c:391
 msgid "removing FTP proxy info"
-msgstr "Entferne FTP Proxy Information"
+msgstr "Entferne FTP-Proxy-Information"
 
 #: src/modules/internet/nanoftp.c:393
 #, c-format
 msgid "using FTP proxy '%s'"
-msgstr "Nutze FTP proxy '%s'"
+msgstr "Nutze FTP-Proxy '%s'"
 
 #: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
@@ -6836,12 +6829,12 @@
 
 #: src/modules/internet/nanohttp.c:441
 msgid "removing HTTP proxy info"
-msgstr "entferne HTTP Proxy Information"
+msgstr "entferne HTTP-Proxy-Information"
 
 #: src/modules/internet/nanohttp.c:443
 #, c-format
 msgid "using HTTP proxy '%s'"
-msgstr "nutze HTTP Proxy '%s'"
+msgstr "nutze HTTP-Proxy '%s'"
 
 #: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
@@ -6869,7 +6862,7 @@
 
 #: src/modules/internet/nanohttp.c:1477
 msgid "too many redirects, aborting ..."
-msgstr "zu viele Umleitungen, breche ab ..."
+msgstr "zu viele Umleitungen (Redirects), breche ab ..."
 
 #: src/modules/internet/sockconn.c:177 src/modules/internet/sockconn.c:181
 #: src/modules/internet/sockconn.c:187 src/modules/internet/sockconn.c:200
@@ -6879,7 +6872,7 @@
 #: src/modules/lapack/Lapack.c:48 src/modules/lapack/Lapack.c:67
 #, c-format
 msgid "argument type[1]='%s' must be a character string of string length 1"
-msgstr "Argument type[1]='%s' muss ein Charakter-Vektor der Länge 1 sein"
+msgstr "Argument type[1]='%s' muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: src/modules/lapack/Lapack.c:56
 #, c-format
@@ -6908,7 +6901,7 @@
 #: src/modules/lapack/Lapack.c:1255
 #, c-format
 msgid "error code %d from Lapack routine '%s'"
-msgstr "Fehlercode %d von Lapackroutine '%s'"
+msgstr "Fehlercode %d von Lapack-Routine '%s'"
 
 #: src/modules/lapack/Lapack.c:153 src/modules/lapack/Lapack.c:248
 #: src/modules/lapack/Lapack.c:874
@@ -6932,7 +6925,7 @@
 #: src/modules/lapack/Lapack.c:377
 #, c-format
 msgid "error [%d] from Lapack 'dgetrf()'"
-msgstr "Fehlercode %d von Lapackroutine 'dgetrf()'"
+msgstr "Fehlercode %d von Lapack-Routine 'dgetrf()'"
 
 #: src/modules/lapack/Lapack.c:382
 #, c-format
@@ -6942,7 +6935,7 @@
 #: src/modules/lapack/Lapack.c:394
 #, c-format
 msgid "error [%d] from Lapack 'dgecon()'"
-msgstr "Fehlercode %d von Lapackroutine 'dgecon()'"
+msgstr "Fehlercode %d von Lapack-Routine 'dgecon()'"
 
 #: src/modules/lapack/Lapack.c:414 src/modules/lapack/Lapack.c:446
 #: src/modules/lapack/Lapack.c:504
@@ -6952,7 +6945,7 @@
 #: src/modules/lapack/Lapack.c:428
 #, c-format
 msgid "error [%d] from Lapack 'dtrcon()'"
-msgstr "Fehlercode %d von Lapackroutine 'dtrcon()'"
+msgstr "Fehlercode %d von Lapack-Routine 'dtrcon()'"
 
 #: src/modules/lapack/Lapack.c:443 src/modules/lapack/Lapack.c:500
 msgid "'A' must be a complex matrix"
@@ -6961,12 +6954,12 @@
 #: src/modules/lapack/Lapack.c:465 src/modules/lapack/Lapack.c:472
 #, c-format
 msgid "error [%d] from Lapack 'zgetrf()'"
-msgstr "Fehlercode %d von Lapackroutine 'zgetrf()'"
+msgstr "Fehlercode %d von Lapack-Routine 'zgetrf()'"
 
 #: src/modules/lapack/Lapack.c:480
 #, c-format
 msgid "error [%d] from Lapack 'zgecon()'"
-msgstr "Fehlercode %d von Lapackroutine 'zgecon()'"
+msgstr "Fehlercode %d von Lapack-Routine 'zgecon()'"
 
 #: src/modules/lapack/Lapack.c:484 src/modules/lapack/Lapack.c:519
 #: src/modules/lapack/Lapack.c:588 src/modules/lapack/Lapack.c:648
@@ -6979,7 +6972,7 @@
 #: src/modules/lapack/Lapack.c:516
 #, c-format
 msgid "error [%d] from Lapack 'ztrcon()'"
-msgstr "Fehlercode %d von Lapackroutine 'ztrcon()'"
+msgstr "Fehlercode %d von Lapack-Routine 'ztrcon()'"
 
 #: src/modules/lapack/Lapack.c:532 src/modules/lapack/Lapack.c:602
 msgid "'a' must be a complex matrix"
@@ -7009,7 +7002,7 @@
 #: src/modules/lapack/Lapack.c:1092
 #, c-format
 msgid "argument %d of Lapack routine %s had invalid value"
-msgstr "Argument %d der Lapackroutine '%s' hatte ungültigen Wert"
+msgstr "Argument %d der Lapack-Routine '%s' hatte ungültigen Wert"
 
 #: src/modules/lapack/Lapack.c:662 src/modules/lapack/Lapack.c:707
 msgid "'b' must be a complex matrix"
@@ -7200,7 +7193,7 @@
 #: src/nmath/pnchisq.c:292
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
-msgstr "pnchisq(x=%g, ..): in %d Iterationen nicht konvergiert"
+msgstr "pnchisq(x=%g, ..): nach %d Iterationen nicht konvergiert"
 
 #: src/nmath/polygamma.c:499
 #, c-format
@@ -7210,7 +7203,7 @@
 #: src/nmath/rmultinom.c:78
 #, c-format
 msgid "rbinom: probability sum should be 1, but is %g"
-msgstr "rbinom: Wahrscheinlichkeitssumme sollte 1 sein, ist aber %g"
+msgstr "rbinom: Summe der Wahrscheinlichkeiten sollte 1 ergeben, ergab aber %g"
 
 #: src/nmath/signrank.c:77
 msgid "signrank allocation error"
@@ -7229,15 +7222,15 @@
 
 #: src/unix/X11.c:54
 msgid "X11 module is not available under this GUI"
-msgstr "X11 Modul ist unter diesem GUI nicht verfügbar"
+msgstr "X11-Modul ist unter diesem GUI nicht verfügbar"
 
 #: src/unix/X11.c:60
 msgid "X11 routines cannot be accessed in module"
-msgstr "X11 Routinen aus Modul nicht verfügbar"
+msgstr "X11-Routinen aus Modul nicht verfügbar"
 
 #: src/unix/X11.c:78 src/unix/X11.c:90 src/unix/X11.c:102 src/unix/X11.c:113
 msgid "X11 module cannot be loaded"
-msgstr "X11 Modul kann nicht geladen werden"
+msgstr "X11-Modul kann nicht geladen werden"
 
 #: src/unix/X11.c:144 src/unix/X11.c:150 src/unix/X11.c:156 src/unix/X11.c:162
 msgid "X11 is not available"
@@ -7286,8 +7279,8 @@
 "An unusual circumstance has arisen in the nesting of readline input. Please "
 "report using bug.report()"
 msgstr ""
-"Ungewöhnliches Ereignis aufgetreten in verschachtelter readline Eingabe. "
-"Bitte melden Sie's via bug.report()"
+"Ungewöhnliches Ereignis in verschachtelter 'readline'-Eingabe aufgetreten. "
+"Bitte melden Sie dies via bug.report()"
 
 #: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
 #, c-format
@@ -7309,7 +7302,7 @@
 
 #: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
 msgid "no history mechanism available"
-msgstr "kein History Mechanismus verfügbar"
+msgstr "kein History-Mechanismus verfügbar"
 
 #: src/unix/sys-std.c:1258
 msgid "problem in truncating the history file"
@@ -7325,11 +7318,11 @@
 
 #: src/unix/sys-unix.c:247
 msgid "non-empty character argument expected"
-msgstr "erwarte nicht-leeres Charakter-Argument"
+msgstr "erwarte nicht-leeres Zeichenketten-Argument"
 
 #: src/unix/sys-unix.c:250
 msgid "'intern' must be logical and not NA"
-msgstr "'intern' muss ein logischer Wert und kein NA sein"
+msgstr "'intern' muss ein logischer Wert und nicht NA sein"
 
 #: src/unix/sys-unix.c:262
 #, c-format
@@ -7349,40 +7342,43 @@
 
 #: src/unix/sys-unix.c:286
 msgid "error in running command"
-msgstr "Fehler bei der Ausführung des Kommandos"
+msgstr "Fehler bei der Ausführung des Befehls"
 
 #: src/unix/sys-unix.c:290
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
-msgstr "Ausführung von Kommando '%s' ergab Status %d und Fehlermeldung '%s'"
+msgstr "Ausführung von Befehl '%s' ergab Status %d und Fehlermeldung '%s'"
 
 #: src/unix/sys-unix.c:395
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() ist auf diesem System nicht implementiert"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "Warnung: --gui oder -g ohne Wert ignoriert"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
-msgstr "Warnung: unbekanntes gui '%s', nutze X11\n"
+msgstr "Warnung: unbekanntes GUI '%s', nutze X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
-msgstr "Warnung: unbekanntes gui '%s', nutze keines\n"
+msgstr "Warnung: unbekanntes GUI '%s', nutze keines\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "Erzeugen einer temporären Datei für '-e' fehlgeschlagen"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "Warnung: editiere nur das erste in der Dateiliste"
 
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' muss eine Liste sein"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' muss eine Liste sein"
 
diff -Nru r-base-3.2.3/src/library/base/po/en_GB.po r-base-3.3.1/src/library/base/po/en_GB.po
--- r-base-3.2.3/src/library/base/po/en_GB.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/en_GB.po	2016-04-27 22:15:36.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2008-02-18 11:38+0000\n"
 "Last-Translator: Prof Brian Ripley <ripley@stats.ox.ac.uk>\n"
 "Language-Team: English\n"
@@ -123,173 +123,174 @@
 msgid "problem in displaying '%ls'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr ""
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr ""
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr ""
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr ""
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr ""
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr ""
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr ""
 
@@ -330,184 +331,183 @@
 msgid "'names' is not a character vector"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr ""
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr ""
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr ""
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr ""
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr ""
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr ""
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr ""
 
@@ -605,7 +605,7 @@
 msgid "could not allocate space for 'name'"
 msgstr ""
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr ""
 
@@ -659,7 +659,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr ""
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr ""
@@ -690,9 +690,9 @@
 msgid "invalid multibyte format string"
 msgstr ""
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -702,7 +702,7 @@
 msgstr ""
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr ""
 
@@ -713,8 +713,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr ""
@@ -722,7 +722,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr ""
@@ -737,7 +737,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr ""
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr ""
@@ -746,29 +746,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr ""
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr ""
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr ""
 
@@ -800,7 +800,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr ""
 
@@ -812,214 +812,214 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr ""
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr ""
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr ""
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr ""
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr ""
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr ""
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr ""
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr ""
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr ""
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr ""
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr ""
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr ""
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr ""
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr ""
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr ""
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr ""
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr ""
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr ""
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr ""
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr ""
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr ""
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr ""
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr ""
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr ""
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr ""
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr ""
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr ""
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr ""
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr ""
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr ""
 
-#: src/main/array.c:1381
-msgid "'X' is too short"
+#: src/main/array.c:1425
+msgid "'x' is too short"
 msgstr ""
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr ""
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr ""
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1082,200 +1082,201 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr ""
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr ""
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr ""
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr ""
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
 msgstr ""
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr ""
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr ""
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr ""
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr ""
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr ""
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr ""
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr ""
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr ""
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr ""
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr ""
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr ""
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr ""
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr ""
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr ""
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr ""
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr ""
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr ""
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr ""
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr ""
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr ""
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr ""
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr ""
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr ""
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr ""
@@ -1284,227 +1285,243 @@
 msgid "vector size cannot be NA"
 msgstr ""
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr ""
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr ""
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr ""
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+msgid "argument is not a function"
+msgstr ""
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr ""
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr ""
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr ""
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr ""
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr ""
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr ""
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr ""
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr ""
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr ""
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr ""
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr ""
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr ""
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr ""
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr ""
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr ""
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr ""
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr ""
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
 #, c-format
-msgid "invalid multibyte string %d"
+msgid "invalid multibyte string, %s"
 msgstr ""
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr ""
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+msgid "non-character object(s)"
+msgstr ""
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr ""
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr ""
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr ""
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr ""
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr ""
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr ""
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr ""
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr ""
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr ""
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr ""
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr ""
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr ""
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr ""
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr ""
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr ""
 
@@ -1516,7 +1533,7 @@
 msgid "applies only to lists and vectors"
 msgstr ""
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr ""
 
@@ -1524,7 +1541,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr ""
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr ""
 
@@ -1532,178 +1549,173 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr ""
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr ""
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr ""
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr ""
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr ""
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr ""
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr ""
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr ""
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr ""
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr ""
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr ""
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr ""
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr ""
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr ""
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
+#: src/main/coerce.c:2464
+msgid "'what' must be a function or character string"
 msgstr ""
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr ""
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr ""
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr ""
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr ""
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr ""
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr ""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr ""
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr ""
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr ""
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr ""
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr ""
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr ""
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr ""
 
@@ -1715,7 +1727,7 @@
 msgid "connection not found"
 msgstr ""
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr ""
 
@@ -1724,9 +1736,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr ""
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr ""
@@ -1808,8 +1820,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr ""
 
@@ -1837,8 +1849,8 @@
 msgstr ""
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr ""
 
@@ -1848,14 +1860,14 @@
 msgstr ""
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr ""
@@ -1922,7 +1934,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr ""
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr ""
@@ -1942,12 +1954,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr ""
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr ""
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr ""
 
@@ -2050,326 +2062,321 @@
 msgid "'con' is not an output textConnection"
 msgstr ""
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr ""
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr ""
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr ""
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr ""
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr ""
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr ""
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr ""
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr ""
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr ""
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr ""
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr ""
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr ""
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr ""
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr ""
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr ""
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr ""
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr ""
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr ""
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr ""
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr ""
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr ""
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr ""
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr ""
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr ""
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr ""
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr ""
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr ""
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr ""
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr ""
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr ""
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr ""
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr ""
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr ""
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr ""
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr ""
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr ""
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr ""
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr ""
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr ""
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+msgid "'text' must be TRUE or FALSE"
+msgstr ""
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr ""
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr ""
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr ""
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr ""
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr ""
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr ""
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr ""
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr ""
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr ""
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr ""
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr ""
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr ""
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr ""
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr ""
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr ""
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr ""
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr ""
 
@@ -2377,37 +2384,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr ""
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr ""
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr ""
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr ""
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr ""
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr ""
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr ""
 
@@ -2421,11 +2428,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr ""
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr ""
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr ""
 
@@ -2434,7 +2437,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr ""
 
@@ -2450,58 +2453,58 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr ""
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr ""
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr ""
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr ""
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr ""
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr ""
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr ""
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr ""
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr ""
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr ""
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr ""
 
@@ -2513,15 +2516,15 @@
 msgid "no active or default device"
 msgstr ""
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr ""
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr ""
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr ""
 
@@ -2607,7 +2610,7 @@
 msgid "too many arguments, sorry"
 msgstr ""
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr ""
 
@@ -2758,7 +2761,7 @@
 msgid "invalid argument to edit()"
 msgstr ""
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr ""
 
@@ -2818,12 +2821,12 @@
 msgstr ""
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr ""
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr ""
 
@@ -2852,82 +2855,96 @@
 msgid "raster capture is not available for this device"
 msgstr ""
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr ""
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr ""
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr ""
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr ""
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr ""
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr ""
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr ""
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr ""
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr ""
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr ""
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr ""
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr ""
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr ""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr ""
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr ""
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr ""
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr ""
 
@@ -2936,7 +2953,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr ""
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr ""
 
@@ -2952,681 +2969,685 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr ""
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr ""
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr ""
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr ""
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr ""
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr ""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr ""
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr ""
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr ""
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr ""
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr ""
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr ""
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr ""
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr ""
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr ""
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr ""
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr ""
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr ""
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr ""
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr ""
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr ""
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr ""
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr ""
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr ""
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr ""
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr ""
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr ""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr ""
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr ""
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr ""
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr ""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr ""
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr ""
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr ""
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr ""
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr ""
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr ""
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr ""
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr ""
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr ""
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr ""
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr ""
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr ""
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr ""
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr ""
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr ""
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr ""
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr ""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr ""
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr ""
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr ""
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr ""
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr ""
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr ""
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr ""
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr ""
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr ""
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr ""
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr ""
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr ""
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr ""
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr ""
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr ""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr ""
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr ""
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr ""
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr ""
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr ""
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr ""
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr ""
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr ""
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr ""
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr ""
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr ""
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr ""
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr ""
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr ""
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr ""
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr ""
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr ""
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr ""
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr ""
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr ""
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr ""
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr ""
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr ""
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr ""
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr ""
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr ""
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr ""
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr ""
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr ""
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr ""
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr ""
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr ""
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr ""
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr ""
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr ""
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr ""
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr ""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr ""
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr ""
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr ""
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr ""
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr ""
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr ""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr ""
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr ""
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr ""
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr ""
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr ""
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr ""
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr ""
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr ""
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr ""
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr ""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr ""
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr ""
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr ""
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr ""
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr ""
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr ""
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr ""
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr ""
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr ""
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr ""
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr ""
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr ""
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr ""
 
@@ -3643,15 +3664,15 @@
 msgid "this graphics device does not support event handling"
 msgstr ""
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr ""
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr ""
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr ""
 
@@ -3830,7 +3851,7 @@
 msgstr ""
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr ""
@@ -3918,24 +3939,22 @@
 msgid "internet routines cannot be accessed in module"
 msgstr ""
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
+msgid "socket routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
-msgid "socket routines cannot be loaded"
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
 msgstr ""
 
 #: src/main/lapack.c:39
@@ -3946,38 +3965,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr ""
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr ""
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr ""
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr ""
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr ""
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr ""
@@ -3986,61 +4005,73 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+msgid "error during cleanup\n"
+msgstr ""
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr ""
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr ""
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr ""
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr ""
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr ""
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+msgid "unable to initialize the JIT\n"
+msgstr ""
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr ""
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr ""
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr ""
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr ""
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr ""
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr ""
 
@@ -4083,164 +4114,169 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr ""
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr ""
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr ""
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr ""
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr ""
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr ""
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr ""
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr ""
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr ""
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr ""
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr ""
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr ""
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr ""
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr ""
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr ""
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr ""
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr ""
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr ""
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr ""
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr ""
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr ""
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr ""
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr ""
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr ""
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ""
 
@@ -4279,221 +4315,225 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr ""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr ""
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr ""
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr ""
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr ""
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr ""
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr ""
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ""
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr ""
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr ""
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr ""
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr ""
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr ""
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr ""
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr ""
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr ""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr ""
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
 "\"set\", or \"suppress\""
 msgstr ""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr ""
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr ""
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr ""
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr ""
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr ""
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr ""
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr ""
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr ""
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr ""
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr ""
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr ""
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+msgid "'OutDec' must be a string of one character"
+msgstr ""
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr ""
 
@@ -4517,11 +4557,15 @@
 msgid "first argument must be atomic"
 msgstr ""
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+msgid "'decimal.mark' must be a string of one character"
+msgstr ""
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr ""
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr ""
 
@@ -4529,209 +4573,192 @@
 msgid "invalid filename specification"
 msgstr ""
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr ""
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr ""
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr ""
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr ""
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr ""
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr ""
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr ""
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr ""
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr ""
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr ""
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr ""
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr ""
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr ""
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr ""
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr ""
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr ""
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr ""
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr ""
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr ""
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr ""
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr ""
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr ""
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr ""
 
@@ -4776,67 +4803,71 @@
 msgid "Metric information not available for this family/device"
 msgstr ""
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr ""
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr ""
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr ""
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ""
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr ""
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr ""
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr ""
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr ""
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr ""
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr ""
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr ""
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr ""
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 
@@ -4844,338 +4875,338 @@
 msgid "argument is not a numeric vector"
 msgstr ""
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr ""
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr ""
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr ""
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr ""
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr ""
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr ""
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr ""
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr ""
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr ""
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr ""
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr ""
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr ""
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr ""
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr ""
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr ""
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr ""
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr ""
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr ""
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr ""
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr ""
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr ""
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr ""
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr ""
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr ""
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr ""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr ""
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr ""
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr ""
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr ""
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr ""
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr ""
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr ""
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr ""
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr ""
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr ""
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr ""
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr ""
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr ""
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr ""
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr ""
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr ""
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr ""
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5190,7 +5221,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr ""
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr ""
 
@@ -5198,7 +5229,7 @@
 msgid "empty 'what' specified"
 msgstr ""
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr ""
@@ -5231,34 +5262,34 @@
 msgid "embedded nul(s) found in input"
 msgstr ""
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr ""
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr ""
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr ""
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr ""
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr ""
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr ""
@@ -5487,53 +5518,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr ""
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr ""
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr ""
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr ""
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr ""
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr ""
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr ""
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr ""
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr ""
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr ""
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5543,23 +5570,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr ""
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr ""
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr ""
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr ""
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr ""
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr ""
 
@@ -5614,38 +5641,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr ""
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr ""
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr ""
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr ""
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr ""
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr ""
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr ""
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr ""
 
@@ -5653,251 +5680,247 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr ""
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr ""
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr ""
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr ""
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr ""
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr ""
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr ""
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr ""
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr ""
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr ""
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr ""
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr ""
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr ""
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr ""
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr ""
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr ""
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr ""
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr ""
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr ""
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr ""
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr ""
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr ""
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr ""
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr ""
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr ""
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr ""
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr ""
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr ""
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr ""
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr ""
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr ""
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr ""
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr ""
 
@@ -5910,8 +5933,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -5944,94 +5967,94 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr ""
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr ""
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr ""
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr ""
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr ""
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr ""
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr ""
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr ""
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr ""
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr ""
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr ""
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr ""
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr ""
 
@@ -6066,31 +6089,31 @@
 msgid "'nmax' must be positive"
 msgstr ""
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr ""
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr ""
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr ""
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr ""
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr ""
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr ""
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr ""
 
@@ -6098,142 +6121,142 @@
 msgid "object is not a matrix"
 msgstr ""
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr ""
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr ""
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr ""
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr ""
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr ""
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr ""
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr ""
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr ""
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr ""
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr ""
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr ""
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr ""
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr ""
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr ""
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr ""
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr ""
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr ""
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr ""
 
@@ -6282,7 +6305,7 @@
 msgid "There must be at least three control points"
 msgstr ""
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr ""
@@ -6307,210 +6330,216 @@
 "Error: X11 cannot allocate additional graphics colours.\n"
 "Consider using X11 with colortype=\"pseudo.cube\" or \"gray\"."
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "unknown X11 colour model -- using monochrome"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr ""
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
+msgstr ""
+
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, c-format
+msgid "scheme not supported in URL '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr ""
 
@@ -6522,29 +6551,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr ""
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr ""
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr ""
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr ""
@@ -6554,136 +6583,159 @@
 msgid "cannot open URL '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
+msgstr ""
+
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
+#, c-format
+msgid "InternetOpenUrl failed: '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/libcurl.c:159
 #, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+msgid "URL '%s': status was '%d %s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/libcurl.c:163
 #, c-format
-msgid "InternetOpenUrl failed: '%s'"
+msgid "URL '%s': status was '%s'"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "invalid hcl colour"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:593
+msgid "cannot download all files"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:727
+msgid "cannot read from connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:763
+msgid "cannot open connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr ""
 
@@ -6914,7 +6966,7 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -6922,16 +6974,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr ""
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6942,7 +6999,7 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -6950,16 +7007,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr ""
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6969,42 +7031,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr ""
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr ""
@@ -7072,7 +7134,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr ""
 
@@ -7086,94 +7148,94 @@
 "report using bug.report()"
 msgstr ""
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr ""
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
 "\n"
 msgstr ""
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr ""
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr ""
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr ""
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr ""
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr ""
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr ""
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr ""
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr ""
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr ""
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr ""
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr ""
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr ""
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr ""
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/base/po/en.po r-base-3.3.1/src/library/base/po/en.po
--- r-base-3.2.3/src/library/base/po/en.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/en.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-01-25 12:01+0000\n"
 "Last-Translator: Brian Ripley <Brian.Ripley@R-project.org>\n"
 "Language-Team: R-core <R-core@R-project.org>\n"
@@ -123,173 +123,174 @@
 msgid "problem in displaying '%ls'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr ""
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr ""
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr ""
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr ""
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr ""
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr ""
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr ""
 
@@ -330,184 +331,183 @@
 msgid "'names' is not a character vector"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr ""
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr ""
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr ""
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr ""
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr ""
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr ""
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr ""
 
@@ -605,7 +605,7 @@
 msgid "could not allocate space for 'name'"
 msgstr ""
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr ""
 
@@ -659,7 +659,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr ""
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr ""
@@ -690,9 +690,9 @@
 msgid "invalid multibyte format string"
 msgstr ""
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -702,7 +702,7 @@
 msgstr ""
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr ""
 
@@ -713,8 +713,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr ""
@@ -722,7 +722,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr ""
@@ -737,7 +737,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr ""
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr ""
@@ -746,29 +746,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr ""
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr ""
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr ""
 
@@ -800,7 +800,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr ""
 
@@ -812,214 +812,214 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr ""
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr ""
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr ""
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr ""
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr ""
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr ""
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr ""
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr ""
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr ""
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr ""
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr ""
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr ""
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr ""
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr ""
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr ""
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr ""
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr ""
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr ""
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr ""
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr ""
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr ""
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr ""
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr ""
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr ""
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr ""
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr ""
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr ""
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr ""
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr ""
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr ""
 
-#: src/main/array.c:1381
-msgid "'X' is too short"
+#: src/main/array.c:1425
+msgid "'x' is too short"
 msgstr ""
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr ""
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr ""
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1082,200 +1082,201 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr ""
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr ""
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr ""
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr ""
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
 msgstr ""
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr ""
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr ""
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr ""
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr ""
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr ""
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr ""
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr ""
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr ""
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr ""
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr ""
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr ""
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr ""
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr ""
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr ""
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr ""
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr ""
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr ""
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr ""
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr ""
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr ""
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr ""
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr ""
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr ""
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr ""
@@ -1284,227 +1285,243 @@
 msgid "vector size cannot be NA"
 msgstr ""
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr ""
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr ""
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr ""
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+msgid "argument is not a function"
+msgstr ""
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr ""
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr ""
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr ""
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr ""
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr ""
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr ""
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr ""
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr ""
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr ""
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr ""
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr ""
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr ""
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr ""
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr ""
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr ""
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr ""
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr ""
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
 #, c-format
-msgid "invalid multibyte string %d"
+msgid "invalid multibyte string, %s"
 msgstr ""
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr ""
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+msgid "non-character object(s)"
+msgstr ""
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr ""
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr ""
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr ""
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr ""
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr ""
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr ""
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr ""
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr ""
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr ""
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr ""
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr ""
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr ""
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr ""
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr ""
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr ""
 
@@ -1516,7 +1533,7 @@
 msgid "applies only to lists and vectors"
 msgstr ""
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr ""
 
@@ -1524,7 +1541,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr ""
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr ""
 
@@ -1532,178 +1549,173 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr ""
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr ""
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr ""
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr ""
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr ""
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr ""
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr ""
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr ""
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr ""
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr ""
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr ""
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr ""
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr ""
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr ""
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
+#: src/main/coerce.c:2464
+msgid "'what' must be a function or character string"
 msgstr ""
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr ""
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr ""
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr ""
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr ""
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr ""
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr ""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr ""
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr ""
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr ""
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr ""
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr ""
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr ""
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr ""
 
@@ -1715,7 +1727,7 @@
 msgid "connection not found"
 msgstr ""
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr ""
 
@@ -1724,9 +1736,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr ""
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr ""
@@ -1808,8 +1820,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr ""
 
@@ -1837,8 +1849,8 @@
 msgstr ""
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr ""
 
@@ -1848,14 +1860,14 @@
 msgstr ""
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr ""
@@ -1922,7 +1934,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr ""
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr ""
@@ -1942,12 +1954,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr ""
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr ""
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr ""
 
@@ -2050,326 +2062,321 @@
 msgid "'con' is not an output textConnection"
 msgstr ""
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr ""
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr ""
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr ""
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr ""
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr ""
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr ""
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr ""
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr ""
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr ""
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr ""
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr ""
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr ""
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr ""
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr ""
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr ""
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr ""
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr ""
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr ""
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr ""
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr ""
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr ""
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr ""
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr ""
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr ""
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr ""
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr ""
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr ""
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr ""
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr ""
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr ""
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr ""
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr ""
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr ""
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr ""
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr ""
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr ""
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr ""
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr ""
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr ""
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+msgid "'text' must be TRUE or FALSE"
+msgstr ""
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr ""
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr ""
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr ""
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr ""
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr ""
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr ""
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr ""
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr ""
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr ""
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr ""
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr ""
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr ""
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr ""
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr ""
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr ""
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr ""
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr ""
 
@@ -2377,37 +2384,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr ""
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr ""
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr ""
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr ""
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr ""
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr ""
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr ""
 
@@ -2421,11 +2428,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr ""
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr ""
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr ""
 
@@ -2434,7 +2437,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr ""
 
@@ -2450,58 +2453,58 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr ""
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr ""
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr ""
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr ""
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr ""
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr ""
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr ""
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr ""
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr ""
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr ""
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr ""
 
@@ -2513,15 +2516,15 @@
 msgid "no active or default device"
 msgstr ""
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr ""
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr ""
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr ""
 
@@ -2607,7 +2610,7 @@
 msgid "too many arguments, sorry"
 msgstr ""
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr ""
 
@@ -2758,7 +2761,7 @@
 msgid "invalid argument to edit()"
 msgstr ""
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr ""
 
@@ -2818,12 +2821,12 @@
 msgstr ""
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr ""
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr ""
 
@@ -2852,82 +2855,96 @@
 msgid "raster capture is not available for this device"
 msgstr ""
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr ""
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr ""
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr ""
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr ""
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr ""
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr ""
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr ""
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr ""
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr ""
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr ""
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr ""
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr ""
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr ""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr ""
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr ""
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr ""
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr ""
 
@@ -2936,7 +2953,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr ""
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr ""
 
@@ -2952,681 +2969,685 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr ""
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr ""
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr ""
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr ""
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr ""
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr ""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr ""
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr ""
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr ""
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr ""
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr ""
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr ""
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr ""
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr ""
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr ""
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr ""
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr ""
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr ""
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr ""
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr ""
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr ""
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr ""
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr ""
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr ""
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr ""
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr ""
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr ""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr ""
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr ""
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr ""
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr ""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr ""
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr ""
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr ""
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr ""
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr ""
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr ""
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr ""
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr ""
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr ""
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr ""
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr ""
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr ""
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr ""
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr ""
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr ""
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr ""
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr ""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr ""
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr ""
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr ""
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr ""
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr ""
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr ""
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr ""
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr ""
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr ""
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr ""
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr ""
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr ""
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr ""
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr ""
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr ""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr ""
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr ""
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr ""
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr ""
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr ""
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr ""
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr ""
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr ""
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr ""
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr ""
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr ""
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr ""
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr ""
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr ""
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr ""
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr ""
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr ""
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr ""
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr ""
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr ""
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr ""
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr ""
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr ""
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr ""
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr ""
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr ""
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr ""
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr ""
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr ""
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr ""
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr ""
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr ""
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr ""
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr ""
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr ""
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr ""
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr ""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr ""
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr ""
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr ""
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr ""
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr ""
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr ""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr ""
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr ""
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr ""
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr ""
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr ""
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr ""
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr ""
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr ""
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr ""
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr ""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr ""
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr ""
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr ""
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr ""
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr ""
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr ""
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr ""
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr ""
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr ""
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr ""
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr ""
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr ""
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr ""
 
@@ -3643,15 +3664,15 @@
 msgid "this graphics device does not support event handling"
 msgstr ""
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr ""
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr ""
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr ""
 
@@ -3830,7 +3851,7 @@
 msgstr ""
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr ""
@@ -3918,24 +3939,22 @@
 msgid "internet routines cannot be accessed in module"
 msgstr ""
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
+msgid "socket routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
-msgid "socket routines cannot be loaded"
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
 msgstr ""
 
 #: src/main/lapack.c:39
@@ -3946,38 +3965,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr ""
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr ""
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr ""
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr ""
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr ""
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr ""
@@ -3986,61 +4005,73 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+msgid "error during cleanup\n"
+msgstr ""
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr ""
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr ""
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr ""
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr ""
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr ""
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+msgid "unable to initialize the JIT\n"
+msgstr ""
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr ""
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr ""
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr ""
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr ""
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr ""
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr ""
 
@@ -4083,164 +4114,169 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr ""
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr ""
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr ""
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr ""
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr ""
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr ""
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr ""
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr ""
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr ""
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr ""
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr ""
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr ""
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr ""
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr ""
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr ""
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr ""
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr ""
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr ""
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr ""
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr ""
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr ""
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr ""
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr ""
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr ""
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ""
 
@@ -4279,221 +4315,225 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr ""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr ""
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr ""
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr ""
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr ""
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr ""
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr ""
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ""
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr ""
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr ""
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr ""
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr ""
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr ""
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr ""
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr ""
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr ""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr ""
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
 "\"set\", or \"suppress\""
 msgstr ""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr ""
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr ""
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr ""
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr ""
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr ""
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr ""
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr ""
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr ""
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr ""
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr ""
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr ""
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+msgid "'OutDec' must be a string of one character"
+msgstr ""
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr ""
 
@@ -4517,11 +4557,15 @@
 msgid "first argument must be atomic"
 msgstr ""
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+msgid "'decimal.mark' must be a string of one character"
+msgstr ""
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr ""
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr ""
 
@@ -4529,209 +4573,192 @@
 msgid "invalid filename specification"
 msgstr ""
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr ""
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr ""
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr ""
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr ""
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr ""
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr ""
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr ""
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr ""
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr ""
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr ""
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr ""
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr ""
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr ""
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr ""
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr ""
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr ""
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr ""
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr ""
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr ""
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr ""
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr ""
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr ""
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr ""
 
@@ -4776,67 +4803,71 @@
 msgid "Metric information not available for this family/device"
 msgstr ""
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr ""
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr ""
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr ""
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ""
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr ""
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr ""
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr ""
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr ""
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr ""
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr ""
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr ""
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr ""
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 
@@ -4844,338 +4875,338 @@
 msgid "argument is not a numeric vector"
 msgstr ""
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr ""
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr ""
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr ""
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr ""
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr ""
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr ""
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr ""
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr ""
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr ""
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr ""
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr ""
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr ""
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr ""
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr ""
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr ""
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr ""
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr ""
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr ""
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr ""
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr ""
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr ""
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr ""
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr ""
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr ""
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr ""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr ""
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr ""
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr ""
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr ""
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr ""
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr ""
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr ""
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr ""
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr ""
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr ""
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr ""
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr ""
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr ""
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr ""
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr ""
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr ""
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr ""
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5190,7 +5221,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr ""
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr ""
 
@@ -5198,7 +5229,7 @@
 msgid "empty 'what' specified"
 msgstr ""
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr ""
@@ -5231,34 +5262,34 @@
 msgid "embedded nul(s) found in input"
 msgstr ""
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr ""
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr ""
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr ""
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr ""
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr ""
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr ""
@@ -5487,53 +5518,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr ""
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr ""
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr ""
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr ""
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr ""
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr ""
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr ""
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr ""
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr ""
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr ""
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5543,23 +5570,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr ""
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr ""
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr ""
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr ""
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr ""
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr ""
 
@@ -5614,38 +5641,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr ""
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr ""
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr ""
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr ""
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr ""
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr ""
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr ""
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr ""
 
@@ -5653,251 +5680,247 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr ""
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr ""
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr ""
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr ""
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr ""
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr ""
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr ""
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr ""
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr ""
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr ""
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr ""
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr ""
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr ""
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr ""
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr ""
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr ""
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr ""
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr ""
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr ""
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr ""
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr ""
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr ""
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr ""
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr ""
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr ""
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr ""
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr ""
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr ""
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr ""
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr ""
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr ""
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr ""
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr ""
 
@@ -5910,8 +5933,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -5944,94 +5967,94 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr ""
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr ""
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr ""
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr ""
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr ""
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr ""
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr ""
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr ""
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr ""
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr ""
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr ""
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr ""
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr ""
 
@@ -6066,31 +6089,31 @@
 msgid "'nmax' must be positive"
 msgstr ""
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr ""
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr ""
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr ""
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr ""
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr ""
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr ""
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr ""
 
@@ -6098,142 +6121,142 @@
 msgid "object is not a matrix"
 msgstr ""
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr ""
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr ""
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr ""
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr ""
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr ""
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr ""
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr ""
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr ""
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr ""
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr ""
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr ""
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr ""
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr ""
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr ""
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr ""
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr ""
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr ""
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr ""
 
@@ -6288,7 +6311,7 @@
 msgid "There must be at least three control points"
 msgstr ""
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr ""
@@ -6309,210 +6332,216 @@
 "Consider using X11 with colortype=\"pseudo.cube\" or \"gray\"."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr ""
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
+msgstr ""
+
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, c-format
+msgid "scheme not supported in URL '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr ""
 
@@ -6524,29 +6553,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr ""
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr ""
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr ""
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr ""
@@ -6556,136 +6585,159 @@
 msgid "cannot open URL '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
+msgstr ""
+
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
+#, c-format
+msgid "InternetOpenUrl failed: '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/libcurl.c:159
 #, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+msgid "URL '%s': status was '%d %s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/libcurl.c:163
 #, c-format
-msgid "InternetOpenUrl failed: '%s'"
+msgid "URL '%s': status was '%s'"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:593
+msgid "cannot download all files"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:727
+msgid "cannot read from connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:763
+msgid "cannot open connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr ""
 
@@ -6916,7 +6968,7 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -6924,16 +6976,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr ""
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6944,7 +7001,7 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -6952,16 +7009,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr ""
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6971,42 +7033,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr ""
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr ""
@@ -7074,7 +7136,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr ""
 
@@ -7088,93 +7150,93 @@
 "report using bug.report()"
 msgstr ""
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr ""
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
 "\n"
 msgstr ""
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr ""
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr ""
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr ""
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr ""
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr ""
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr ""
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr ""
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr ""
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr ""
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr ""
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr ""
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr ""
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr ""
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/base/po/es.po r-base-3.3.1/src/library/base/po/es.po
--- r-base-3.2.3/src/library/base/po/es.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/es.po	2016-04-27 22:15:36.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2012-03-16 15:59+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <pabloemilio.verde@uni-duesseldorf.de>\n"
@@ -127,175 +127,176 @@
 msgid "problem in displaying '%ls'"
 msgstr "problemas al mostrar  '%ls'"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argumento '%s' inválido"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "versión de Windows no soportada"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "argumento incorrecto"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr ""
 "no sea ingenuo: su computadora tiene un límite de direccionamiento de 4Gb"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "no se puede disminuir el límite de la memoria: ignorado"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' debe ser un vector de caracteres"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "dispositivo inválido"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "modo SDI requerido"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "número de dispositivo gráfico no válido"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "dispositivo defectuoso "
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 #, fuzzy
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "entrada no válida en Rmbstowcs"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "selección de archivo cancelada"
 
@@ -337,192 +338,191 @@
 msgid "'names' is not a character vector"
 msgstr "'fmt' debe ser un vector de caracteres no vacío"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "string de caracteres esperado como primer argumento"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "string de caracteres esperado como tercer argumento"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "comando ejecutado '%s' tiene estatus %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "período de sesiones llegó a límite de tiempo transcurrido"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "llegado el tiempo límite"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "período de sesiones llegó a límite de tiempo de CPU"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "llegó a tiempo de CPU límite"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Error fatal: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "codificación'%s' no reconocida"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<ERROR: entrada no válida para codificación '%s'>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "no fue posible abrir el archivo '%s': %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): archivo '%s' no existe\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, fuzzy, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "ATENCIÓN: el valor '%s' no es válido: ignorado\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "ATENCIÓN: falta el argumento max-mem-size\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "ATENCIÓN: valor de --max-mem-size =E9 no válido: ignorado\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "ATENCIÓN: --max-mem-size=%lu%c: demasiado grande e ignorada\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "ATENCIÓN: --max-mem-size =%4.1fM: demasiado pequeña e ignorada\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "ATENCIÓN: max-mem-size =%4.0fM demasiado grande y tomada como %uM\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "operaciones binarias requieren dos argumentos"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "operaciones binarias requieren dos argumentos"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "ATENCION: se omite entrada de  '-e %s' (muy larga)\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "ATENCIÓN: opción desconocida '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGUMENTO '%s' __ignorado__\n"
 
 # Fijate si asi se entiende. Lo deje como estaba
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "no es posible utilizar -e con -f o --file"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 "fallo la creación de archivo tmpfile - establecer TMPDIR adecuadamente?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "se debe especificar '--save', '--no-save' o '--vanilla'"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "es imposible crear 'reader thread'; usted debe liberar algún recurso del "
 "sistema"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "subíndice fuera de  los límites"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "objeto de tipo '%s' no es subconjunto"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 #, fuzzy
 msgid "WARNING: no value given for --encoding"
 msgstr "ATENCIÓN: ningún valor especificado para --encoding\n"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, fuzzy, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "ATENCIÓN: ya no se provee soporte de la opción '%s'\n"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, fuzzy, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "ATENCIÓN: ningún valor especificado para '%s'\n"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, fuzzy, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "ATENCIÓN: el valor '%s' no es válido: ignorado\n"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, fuzzy, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "ATENCIÓN: %s: demasiado grande e ignorado\n"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 #, fuzzy
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "ATENCIÓN: ningún valor especificado para '--max-ppsize'\n"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "ATENCIÓN: el valor de '-max-ppsize'es negativo: ignorado\n"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "ATENCIÓN: el valor de '-max-ppsize' es demasiado pequeño: ignorado\n"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "ATENCIÓN: el valor de '-max-ppsize' es demasiado grande: ignorado\n"
@@ -631,7 +631,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "no fué posible asignar espacio a 'name'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "argumento carácter esperado"
 
@@ -692,7 +692,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "problema  al establecer zona horaria"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "el argumento de 'code' debe ser un string de caracteres"
@@ -723,9 +723,9 @@
 msgid "invalid multibyte format string"
 msgstr "string de formato multibyte no válida"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -738,7 +738,7 @@
 msgstr "'title' debe ser un string de caracteres"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "la expresión regular es inválida es este locale"
 
@@ -749,8 +749,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "string de entrada %d es inválida en este locale"
@@ -758,7 +758,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "argumento '%s  será ignorado"
@@ -773,7 +773,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "string de entrada %d es inválida en este locale"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, fuzzy, c-format
 msgid "regcomp error: '%s'"
 msgstr "error regcomp:  '%s'"
@@ -783,29 +783,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "code debe ser un vector genérico"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "valor de '%s' no válido"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "longitud no válida"
 
@@ -841,7 +841,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<value>) no es ni NULL ni un list de longitud %d"
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "Se han producido NaNs"
 
@@ -854,109 +854,109 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "probable pérdida completa de precisión en el módulo"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "NAs producidos por enteros excedidos"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "el operador necesita uno o dos argumentos"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "argumento no-numérico para operador binario"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "arreglos de dimensón no compatibles"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "series de tiempo no compatibles"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr "longitud de objeto mayor no es múltiplo de la longitud de uno menor"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "argumento no válido para un operador unitario"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "operador unitario no válido"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "función real de 1 argumento no implementada"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "operación compleja no implementada"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "función real de %d argumentos numéricos no implementada"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d argumentos dados a '%s', que requeiren 1 o 2"
 msgstr[1] "%d argumentos dados a '%s', que requeiren 1 o 2"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "segundo argumento no válido de longitud cero"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "el argumento \"%s\" está ausente, sin valor por omisión"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "argumento no válido de base de longitud 0"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, fuzzy, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'path' debe ser un vector de caracteres"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "extensión matricial no numérica"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "valor de 'nrow' no válido (demasiado grande o NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "valor 'nrow' no válido (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "valor de 'ncol' no válido (demasiado grande o NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "valor de 'ncol' no válido (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
@@ -964,7 +964,7 @@
 "la longitud de los datos [%d] no es un submúltiplo o múltiplo del número de "
 "filas [%d] en la matriz"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -973,107 +973,107 @@
 "la longitud de los datos [%d] no es un submúltiplo o múltiplo del número de "
 "columnas [%d] en la matriz"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "la longitud de los datos excede el tamaño de la matriz"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "demasiados elementos especificados"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "extensión negativa para la matriz"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: demasiados elementos especificados"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "extensión negativa para array 3D"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 #, fuzzy
 msgid "'alloc3Darray': too many elements specified"
 msgstr "alloc3Darray: demasiados elementos especificados"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 #, fuzzy
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "allocArray: demasiados elementos especificados para 'dims'"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x' debe ser un vector de caracteres"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, fuzzy, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "se requiere una matriz  como argumento de 'row/col'"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 #, fuzzy
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "requiere argumentos numéricos matriz/vector"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "argumentos no compatibles"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "el argumento no es una matriz"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "primer argumento no válido: debe ser un arreglo"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, fuzzy, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' tiene longitud errónea"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a' no tiene un nombre en dimnames"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, fuzzy, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "perm[%d] no tiene un nombre en dimension"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "valor fuera de sus límites en 'perm'"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 #, fuzzy
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'decreciente' debe ser TRUE o FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' debe ser numérico"
 
 # No se en que contexto va este mensaje, puede estar bien o mal traducido. Vos sabes?
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "objecto demasiado pequeño"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 #, fuzzy
 msgid "'dims' cannot be of length 0"
 msgstr "'hadj' debe tener longitud 1"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 #, fuzzy
 msgid "'x' must have positive length"
 msgstr "argumento debe tener longitud positiva"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1137,12 +1137,12 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "se intenta especificar un atributo 'class' no válido"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, fuzzy, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr "Clase '%s' no tiene 'names' en slot"
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, fuzzy, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
@@ -1151,7 +1151,7 @@
 "Clase '%s' no tiene 'names' en slot; asignar un nombre a un atributo creara "
 "un objeto no válido  "
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, fuzzy, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
@@ -1159,132 +1159,133 @@
 "No es valido usar names()<- para dar 'names' a un slot en una clase que no "
 "es vector ('%s')"
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "argumento 'names' incompatible"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "tipo inválido (%s)  para especificar el atributo de 'names'"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' aplicado a un objeto que no es un arreglo"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' debe ser una lista"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' debe ser una lista"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "la longitud de 'dimnames' [%d] debe coincidir con la de 'dims' [%d]"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "tipo inválido (%s) para 'dimnames' (debe ser un vector)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "la longitud de 'dimnames' [%d] no es igual a la extensión del arreglo"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "primer argumento inválido"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "segundo argumento inválido"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "vector de dimensión de longitud 0 es inválido"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "el dims contiene valores missing"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "el dims contiene valores negativos"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 #, fuzzy
 msgid "dims do not match the length of object"
 msgstr "dims [producto %d] no coincide con la longitud del objeto [%d]"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "dims [producto %d] no coincide con la longitud del objeto [%d]"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "los atributos deben estar en una lista o NULL"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "los atributos deben tener nombre"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "todos los atributos deben tener nombre [%d no lo tiene]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "which' debe ser de modo carácter"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "exactamente 1 atributo 'which' debe ser especificado"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr " encuentros parciales de '%s' to '%s'"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, fuzzy, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "tipo o longitud inválido para el nombre de slot"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name' debe ser una cadena de caracteres no nula"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "tipo o longitud inválido para el nombre de slot"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "no es posible obtener un slot (\"%s\") de un objeto de tipo \"%s\""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "no hay un slot de nombre \"%s\" para ese objeto de clase \"%s\""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 #, fuzzy
 msgid "attempt to set slot on NULL object"
 msgstr "se intenta especificar un atributo en un NULL"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 #, fuzzy
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "no pueden utilizarse clases formales  sin el paquete métodos"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1293,7 +1294,7 @@
 "tentativa de obtener un slot \"%s\" de un objeto de una clase básica (\"%s"
 "\") sin slots"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1302,46 +1303,46 @@
 "tentativa de obtener un slot \"%s\" de un objeto cuya clase (\"%s\") que no "
 "es un objecto clase S4"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr "el vector resultante excede el limite del largo en '%s'"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "tipo '%s' no esta implementado en  '%s'"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "argumento formal repetido 'recursive'"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "argumento formal repetido 'use.names'"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "el argumento no es una lista"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "el nombre de la clase es muy largo en '%s'"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "no es posible crear una matriz a partir de estos tipos"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "el número de filas de las matrices debe coincidir (vea arg %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "el número de columnas de las matrices debe coincidir (vea arg %d)"
@@ -1350,235 +1351,255 @@
 msgid "vector size cannot be NA"
 msgstr "tamaño del vector no puede ser NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "tamaño del vector no puede ser NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "tamaño del vector no puede ser infinito"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "tamaño del vector especificado es muy grande"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "no es posible usar un ambiente NULL"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "el argumento no debe ser una función"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "el objeto de reemplazo no es un entorno"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' debe ser un entorno"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "el argumento no es un entorno"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "el entorno vacio no esta asociado"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "no se puede fijar un entorno en el ambiente vacío"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "no se puede fijar un entorno en el ambiente vacío"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "no se puede fijar un entorno en el ambiente vacío"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' no es un entorno"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "no es posible escribir en esa conexión"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "especificación '%s' inválida"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "un argumento no positivo en 'fill' será ignorado"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "el argumento %d (type '%s') no es soportado por 'cat'"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "vector: no es posible hacer un vector de modo '%s'."
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "no es posible especificar la longitud de un objeto que no es un vector"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "argumento no válido"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "valor no válido"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' usado en un contexto incorrecto"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, fuzzy, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "duplicado de interuptores por defecto: '%s' y '%s'"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "'EXPR' esta perdida"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 #, fuzzy
 msgid "EXPR must be a length 1 vector"
 msgstr "switch: EXPR debe devolver un vector de longitud 1"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+#, fuzzy
+msgid "'switch' with no alternatives"
+msgstr ""
+"EXPR numéricos son necesarios para el switch() sin alternativas con nombre"
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d argumentos dados a '%s', que requeiren 1 o 2"
 msgstr[1] "%d argumentos dados a '%s', que requeiren 1 o 2"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "%s' requiere un vector de caracteres"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "string multibyte %d inválida"
 
-#: src/main/character.c:203
-#, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:159
+#, fuzzy, c-format
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 "número de caracteres no es computable para el elemento %d en el \"bytes\" "
 "codificación"
 
-#: src/main/character.c:232
-#, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:188
+#, fuzzy, c-format
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 "el ancho no es computable para el elemento %d en el \"bytes\" codificación"
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 "tentativa de extraer substrings de un objeto que no es de tipo carácter"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 #, fuzzy
 msgid "invalid substring arguments"
 msgstr "argumento(s) string no válido"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "nombres de tipo no carácter"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "sustitución de substrings en un objeto que no es carácter"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "el primer argumento debe ser un vector de caracteres"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abreviatura utilizada con caracteres no ASCII"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "nombres de tipo no carácter"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "string multibyte %d inválida"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "argumento de tipo no-carácter"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "especificación de rango decreciente ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "especificación de rango decreciente ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "string UTF-8  no válido  'old'"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "string multibyte 'old' inválida"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "string UTF-8  no válido  'new' "
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "string multibyte 'new' inválida"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old' es más largo que 'new'"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "string multibyte %d de entrada inválida"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim() requiere un vector de caracteres"
 
@@ -1590,7 +1611,7 @@
 msgid "applies only to lists and vectors"
 msgstr "se aplica solamente a listas y vectores"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "NAs introducidos por coerción"
 
@@ -1599,7 +1620,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "NAs introducidos por coerción"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "partes imaginarias descartadas en la coerción"
 
@@ -1607,119 +1628,115 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "valores fuera de rango tratados como 0 en la coerción a crudo (raw)"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "dato inválido de modo '%s' (muy corto)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "el objeto 'pairlist' no puede ser coercionado a '%s'"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "el objeto (list) no puede ser coercionado a '%s'"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, fuzzy, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "el objeto (list) no puede ser coercionado a '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "ningún método para coaccionar a esta clase S4 a un vector"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "los entornos no son coercionables a otros tipos"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "intento de coaccionar un objeto diferente a un factor"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "argumento de lista esperado"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "entorno inválido"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "el argumento debe tener al menos longitud 1"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "cuerpo inválido para la función"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "longitud 0 del argumento inválida"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "argumento de lista inválido"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "tipo \"single\" no implementado en R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "predicado no implementado"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() aplicado a un objeto que no es (lista o vector) de tipo '%s"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, fuzzy, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "tipo no implementado '%s' en '%s'\n"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "nombre esta perdido"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "el primer argumento debe ser un string de caracteres"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "que debe ser un string de caracteres o una función"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'text' debe ser un string de caracteres"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "'args' debe ser una lista"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' debe ser una lista"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' debe ser un entorno"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "entorno especificado inválido"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "Configuración de clase (x) a NULL; resultado ya no será un objeto S4"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1728,7 +1745,7 @@
 "Configuración de clase (x) a varias cadenas (\"%s \", \"%s \", ...); "
 "resultado ya no será un objeto S4"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1737,11 +1754,11 @@
 "Configuración de clase(x) a \"%s\" establece atribuibles a NULL; resultado "
 "ya no será un objeto S4"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "objeto inválido de reemplazo de clase string "
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1749,7 +1766,7 @@
 "\"%s\" sólo puede ser puesto como clase si el objeto tiene el tipo;  "
 "encontrado \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1758,38 +1775,38 @@
 "inválido poner la clase como matriz a menos que la dimensión del  atributo "
 "sea de longitud 2 (era %d)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "no es posible especificar la clase como \"array\" a menos que la dimensión "
 "del atributo tenga longitud > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value' debe ser una cadena de caracteres no nula"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "cambio no valido en el contenido de un factor"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "operador singular complejo inválido"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "operación compleja no implementada"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "argumento no numérico para la función"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "coeficiente polinomial inválido"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "falló la raíz que encuentra el código"
 
@@ -1801,7 +1818,7 @@
 msgid "connection not found"
 msgstr "conexión no encontrada"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "conexión inválida"
 
@@ -1810,9 +1827,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "cerrando la conenexion %d (%s) que no esta siendo utilizada \n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "conversión no soportada de '%s' a '%s"
@@ -1894,8 +1911,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "bloque especificado demasiado largo"
 
@@ -1925,8 +1942,8 @@
 msgstr "falla en la asignación de conexión fifo"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "sólo fue usado el primer elemento del argumento 'description' "
 
@@ -1938,14 +1955,14 @@
 "primera opción"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "no se puede abrir la conexión"
@@ -2013,7 +2030,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "falla en la asignación de la conección bzfile"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "No se puede inicializar decodificador lzma, error %d"
@@ -2034,12 +2051,12 @@
 msgstr ""
 "Este es un %s archivo comprimido que no es compatible con esta versión de R"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "falla en la asignación de memoria para copiar en el portapapeles"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "no fue posible abrir el portapapeles o no contiene texto"
 
@@ -2145,272 +2162,272 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' no es una salida de una conexión de texto"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "sockets no están disponibles en este sistema"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' no es una conexión"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "no se pueden abrir las conexiones estándar"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "la conexión ya está abierta"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "valor 'rw' desconocido"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "no se pueden cerrar las conexiones estándar"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 #, fuzzy
 msgid "cannot close 'output' sink connection"
 msgstr "no se puede cerrar la salida de conexión sink"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 #, fuzzy
 msgid "cannot close 'message' sink connection"
 msgstr "no se puede cerrar el mensaje de conexión sink"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "la conexión no está abierta"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 #, fuzzy
 msgid "line longer than buffer size"
 msgstr "Línea más larga que el tamaño del buffer"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "no se puede leer desde esta conexión"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "no se puede asignar buffer en readLines"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, fuzzy, c-format
 msgid "incomplete final line found on '%s'"
 msgstr " readLines encontró la línea final incompleta en '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "muy pocas líneas leídas en readLines"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "se descartó un string incompleto al final del archivo"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 "terminador nulo no encontrado: partiendo string después de 10000 caracteres"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "sólo se puede leer desde una conexión binaria"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "el cambio de tamaño no tiene soporte para vectores complejos"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "tamaño %d desconocido en esta máquina"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "modo raw es siempre de tamaño 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr "'signed = FALSE' es solo valido para enteros de tamaño 1 y 2"
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x' no es un vector de tipo atómico"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "sólo se puede escribir en una conexión binaria"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 #, fuzzy
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "solo formato ascii puede ser escrito en conexiones de modo texto"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 #, fuzzy
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "sólo 2^31-1 bytes se pueden escribir en una sola llamada readBin ()"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "problema al escribir en la conexión"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "el cambio de tamaño no tiene soporte en vectores de tipo crudo (raw)"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "entrada UTF-8 inválida en readChar()"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "puede solo leer en bytes en un local  non-UTF-8 MBCS"
 
 # No se en que contexto va este mensaje, puede estar bien o mal traducido. Vos sabes?
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "objecto demasiado pequeño"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: se requieren más bytes que los existentes en el string - serán "
 "reemplazados con cero"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: se requieren más caracteres que los existentes en el string - "
 "serán reemplazados con cero"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 #, fuzzy
 msgid "maximum number of pushback lines exceeded"
 msgstr "excedido el número máximo de colores"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 #, fuzzy
 msgid "could not allocate space for pushback"
 msgstr "no es posible asignar espacio para pushBack"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "sólo puede dar vuelta en una conexión abierta para lectura"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr " sólo puede dar vuelta en conexiones de modo texto"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "pila sink esta llena"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "no se puede cambiar la salida a stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "ningún sink para remover"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 #, fuzzy
 msgid "there is no connection NA"
 msgstr "No hay conexión %d"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "No hay conexión %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 "file(\"\") permite solamente open = \"w+\" y open = \"w+b\": se usó la "
 "primera opción"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "flujo de archivos no tiene número mágico de gzip"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr " flujo de archivos no tiene encabezado válido de gzip "
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "error de escritura al vaciar la conexión 'gzcon'"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "error crc %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "error de escritura en la conexión 'gzcon'"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' debe ser uno de 0 ... 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression' debe ser TRUE o FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x' debe ser TRUE o FALSE"
+
+#: src/main/connections.c:5502
 #, fuzzy
 msgid "this is already a 'gzcon' connection"
 msgstr "esta ya es una conexión gzcon"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "solo se puede usar conexiones binarias de lectura- o escritura-"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 "la conección puede fallar si se usa un argumento en modo texto en 'file'"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 #, fuzzy
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
@@ -2419,76 +2436,72 @@
 "no se puede crear una conexión gzcon de una escritura textConnection, tal "
 "vez el use rawConnection"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "la conexión de asignación 'gzcon' falló"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "no es una lista de sockets"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "indicadores de escritura defectuosos"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "no es una  conexión socket"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "compresión desconocido, en el supuesto ninguno"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, fuzzy, c-format
 msgid "allocation of %s connection failed"
 msgstr "fallo de asignación de la conexión básica"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 #, fuzzy
 msgid "no loop for break/next, jumping to top level"
 msgstr "ningún ciclo para romper, saltando a nivel superior"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "ninguna función desde donde volver, saltando a nivel superior"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "contexto de destino no está en la pila"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "no hay tantas estructuras en la pila"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "solamente se permiten valore positivos de 'n'"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "ninguna función para reiniciar"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "el número de contextos debe ser positivo"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "no hay contexto en el navegador para la consulta"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "no es que muchas llamadas al navegador estan activas"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "no es que muchas funciones en la pila de llamadas"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "error interno en 'do_sys'"
 
@@ -2497,40 +2510,40 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "Exceso de capacidad (overflow) en 'cumsum'; use 'cumsum(as.numeric(.))"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 #, fuzzy
 msgid "'cummax' not defined for complex numbers"
 msgstr "min/max no definido para números complejos"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 #, fuzzy
 msgid "'cummin' not defined for complex numbers"
 msgstr "min/max no definido para números complejos"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "función cumxxx desconocida"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "problema  al establecer zona horaria"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "no se puede especificar el uso horario en este sistema"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "problema  al desestablecer zona horaria"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 #, fuzzy
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "componente de longitud cero en estructura POSIXlt no vacía"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "no se puede asignar memoria para 'read.dcf'"
 
@@ -2544,11 +2557,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "Línea de inicio '%s ...esta mal formateada!"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "argumento debe ser una clausura"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "argumento debe ser una función"
 
@@ -2557,7 +2566,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x' debe ser TRUE o FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "el argumento no debe ser una función"
 
@@ -2573,61 +2582,61 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr "no usar 'tracemem' para referencias débiles u objetos externos"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R no fue compilado con soporte para perfil de memoria 'R profiling' "
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "muy pocos argumentos"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 #, fuzzy
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "'cutoff' inválido para deparse, se usó el definido por omisión"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "deparse de un objeto S4 no puede ser cargado"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "deparse puede estar incompleto"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr " deparse may be not be source()able in R < 2.7.0"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "que debe ser un string de caracteres o una función"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "muy pocos caracteres escritos"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "argumentos de tipo carácter esperados"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 #, fuzzy
 msgid "zero-length argument"
 msgstr "argumento de longitud cero"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts' debe ser un entero no negativo pequeño"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "objeto '%s' no encontrado"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "expresión de la función mal formada"
 
@@ -2640,16 +2649,16 @@
 msgid "no active or default device"
 msgstr "ningún dispositivo activo o por defecto"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "demasiados dispositivos abiertos"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr ""
 "no hay memoria suficiente para asignar dispositivo (en  GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "<Enter> para ver el próximo gráfico: "
 
@@ -2739,7 +2748,7 @@
 msgid "too many arguments, sorry"
 msgstr "demasiados argumentos, disculpe"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "estado gráfico inválido"
 
@@ -2896,7 +2905,7 @@
 msgid "invalid argument to edit()"
 msgstr "argumento no válido para edit()"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "no es posible abrir el archivo"
 
@@ -2960,12 +2969,12 @@
 msgstr "ningún sistema gráfico para desregistrar"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "final de línea inválido"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "unión de línea inválida"
 
@@ -2999,87 +3008,101 @@
 msgid "raster capture is not available for this device"
 msgstr "\t\"Información métrica no disponible para este dispositivo"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "vista fuente %d no soportada para la familia fuente '%s'"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "ningún dispositivo gráfico está ativo"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "'valor pch '%d' no es válido en este locale"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "valor pch '%d' no implementado"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "extensión de los ejes inválida [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "extensión de los ejes infinita [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): nuevo *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): nuevo *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 #, fuzzy
 msgid "display list redraw incomplete"
 msgstr "Exhibición de rediseño de la lista incompleta"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "argumento de lista inválido"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "el argumento 'expr' debe ser una expresión"
 
 # Marca para mi 3pm
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "el argumento 'list' debe ser una lista"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "el argumento 'env' debe ser un ambiente"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "carácter multibyte inválido en pch=\"c\""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "valor de dígito hexadecimal inválido en 'color' o 'lty'"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "tipo de línea inválida: debe tener longitud 2, 4, 6 u 8"
 
 # tipo de linea inválida: ceros no permitidos
 # La traduccion seria esta, pero......???
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "tipo de línea no válido: los ceros no son permitidos"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "tipo de línea inválido"
 
@@ -3088,7 +3111,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "no se puede cambiar el valor de un vínculo bloqueado para  '%s'"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "no se pueden adicionar vínculos a un ambiente bloqueado"
 
@@ -3104,701 +3127,707 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "desenlazar en el entorno de base no esta implementado"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "no se pueden eliminar vinculaciones de un ambiente bloqueado"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "el argumento a '%s' no es un entorno"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, fuzzy, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "La lista ... no contiene elementos %d"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d usado en un contexto incorreto, ningún ... para examinar"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "no se pudo encontrar la función \"%s\""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "no se pueden asignar valores en el ambiente vacío"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "no se pueden asignar variables a esta base de datos"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "no se pueden adicionar vínculos de '%s' al ambiente base"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "sólo el primer elemento es usado como nombre de variable"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 #, fuzzy
 msgid "first argument must be a named list"
 msgstr "el primer argumento debe ser una lista"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 #, fuzzy
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "'hostname' debe ser un vector de caracteres de longitud 1"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 #, fuzzy
 msgid "'envir' argument must be an environment"
 msgstr "el argumento 'env' debe ser un ambiente"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "no es posible remover las variables del 'base namespace'"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "no se pueden quitar variables del ambiente base"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "no se pueden quitar variables del ambiente vacio"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "no se pueden quitar variables de esta base de datos"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "el objeto '%s' de modo '%s' no fue encontrado"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "nombre inválido en la posición %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "el segundo argumento debe ser un entorno"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "longitud incorrecta para el argumento '%s''"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "uso inválido de 'missing'"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' sólo puede ser usado para argumentos"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "pos' deben ser un entero"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "attach: todos los elementos de una lista deben ser nombrados"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach' sólo funciona con listas, 'data frames' y ambientes"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "'detach' del \"package:base\" no está permitido"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "el argumento debe ser un entorno"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "los argumentos deben ser simbólicos"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "ningún entorno envolvente"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "ningún item \"%s\" en la lista de búsqueda"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "no está ya disponible 'as.environment(NULL)'"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "objeto S4 no se extiende la classe \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "objeto inválido para 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "no es un entorno"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "no es un símbolo"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "ningún vínculo para \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "no es una función"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "el símbolo ya tiene un vínculo regular"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 #, fuzzy
 msgid "cannot change active binding if binding is locked"
 msgstr "no se puede cambiar el valor de un vínculo bloqueado para  '%s'"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "operador desconocido"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "no es posible desvincular un vínculo bloqueado"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "no es posible desvincular un vínculo activo"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 #, fuzzy
 msgid "bad namespace name"
 msgstr "nombre de espacio inválido"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 #, fuzzy
 msgid "namespace already registered"
 msgstr "nombre de espacio ya registrado"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 #, fuzzy
 msgid "namespace not registered"
 msgstr "espacio de nombres no registrado"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "argumento inválido de importación de entorno"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "argumento inválido de exportación de entorno"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "la longitud de los nombres de importación y exportación debe coincidir"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "símbolo exportado '%s' no tiene valor"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, fuzzy, c-format
 msgid "unknown encoding: %d"
 msgstr "codificación '%s' no soportada"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "nul incrustado en la cadena: '%s' \""
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "'interrupts' suspendidas; señal ignorada"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "opción inválida \"warning.expression\""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(convertido del aviso) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "Aviso: %s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "Aviso en %s: %s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Mensajes de aviso perdidos\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Mensajes de aviso perdidos\n"
 msgstr[1] "Mensajes de aviso perdidos\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "Hubo %d avisos (use warnings() para verlos)\n"
 msgstr[1] "Hubo %d avisos (use warnings() para verlos)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr "Hubo 50 o  más avisos (use warnings() para ver los primeros 50)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "Error durante el wrapup: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Error en "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "Error en "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Error: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "Además: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "opción inválida \"error\"\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Ejecución interrumpida\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep' debe ser una cadena (string) de caracteres"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [string inválido en stop(.)]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [string inválido en warning(.)]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "número de argumentos incorrectos para \"%s\""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "recurso no implementado en %s"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "número inválido de argumentos"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "argumento de tipo inválido"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "longitud de la serie-temporal/vector incompatible"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "argumentos incompatibles"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "error desconocido (reporte esto!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "conversión entera imprecisa en la coerción"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "aviso desconocido (reporte esto!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "Ninguna función desde donde retornar, saltando al nivel superior"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "=BFnivel superior inconsistente?"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "manipulador de datos defectuosos"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "el mensaje de error no es un string"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 "manipulador o 'stack' de reinicio incompatible durante el reinicio antiguo"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "mensaje de error inválido"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "reinicio defectuoso"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "reinicio no está en el 'stack'"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "no en el contexto 'try'"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "\t\"mensaje de error debe ser una cadena de caracteres"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: no puede abrir el archivo de perfil '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "'R profiling' no disponible en este sistema"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr "entrada en evaluacion: recursivo por defecto o problemas anteriores?"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "reiniciar evaluación premisa interrumpida"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 "evaluación anidada demasiado profunda; recursión infinita "
 "options(expressions= )?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "argumento ausente, sin argumento por omisión"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "tentativa de aplicar una no-función"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s en %s#%d: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, fuzzy, c-format
 msgid "argument %d is empty"
 msgstr "elemento %d está vacío"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 "no es posible encontrar el símbolo \"%s\" en el entorno de la función "
 "generica"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "símbolo \"%s\" no está en el entorno del método"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "la condición tiene longitud > 1 y sólo el primer elemento será usado"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "valor ausente donde TRUE/FALSE es necesario"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "argumento no interpetable como lógico"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "argumento tiene longitud cero"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "variable 'loop' no-simbólica"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "secuencia loop for() inválida"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 #, fuzzy
 msgid "multi-argument returns are not permitted"
 msgstr "retornos con argumentos múltiples son obsoletos"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "lado izquierdo de la asignación inválida (NULL)"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "destino de la asignación se expande a un objeto fuera del lenguaje"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "nombre demasiado largo en '%s'"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "no se pueden realizar asignaciones complejas en el 'base namespace'"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "no se pueden realizar asignaciones complejas en el entorno base"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "función inválida en asignación compleja"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "lado izquierdo de la asignación inválida (do_set)"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "%s' esta perdido"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "lista de argumentos formales inválida para \"function\""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, fuzzy, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "argumento '%s' inválido"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "argumento 'envir' númerico no tiene longitud uno"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "reinicios no sustentados en 'eval'"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' llamada desde fuera de la clausura"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "no se espera el valor en '...'"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Métodos incompatibles (\"%s\", \"%s\") para \"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "expedición de error en el envío de grupo"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, fuzzy, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "'%s' no es una función"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "stack central desbordado"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "stack de enteros desbordado"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 #, fuzzy
 msgid "bad opcode"
 msgstr "Código de operador defectuoso"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, fuzzy, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "tipo de 'x' inválido en 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "versión de bytecode incompatible; usando eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "versión de bytecode muy vieja"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "versión de bytecode muy nueva"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "versión de bytecode incompatible"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "secuencia inválida de argumentos en el ciclo for"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, fuzzy, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "no hay ninguna función interna \"%s\""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "función defectuosa"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "no es una función NATIVA"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+#, fuzzy
+msgid "bad numeric 'switch' offsets"
+msgstr "mal numérico en el interruptor offsets"
+
+#: src/main/eval.c:6072
 #, fuzzy
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 "EXPR numéricos son necesarios para el switch() sin alternativas con nombre"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+#, fuzzy
+msgid "bad character 'switch' offsets"
+msgstr "mal carácter en el interruptor offsets"
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "índice de encadenamiento del código no encontrado"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 #, fuzzy
 msgid "invalid body"
 msgstr "símbolo inválido"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "símbolo inválido"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "el argumento no es un objeto bytecode"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "nombre de archivo inválido"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "imposible abrir 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file' debe ser un string no vacío"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' debe ser un valor lógico"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 #, fuzzy
 msgid "constant buffer must be a generic vector"
 msgstr "code debe ser un vector genérico"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr "mal contador de constante"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "cronómetro de desempeño en uso"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "byte code ya en desarrollo"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "falló la definición del cronómetro de desempeño"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "byte code no se está desarrollando"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "esta plataforma no soporta nsl()"
@@ -3818,16 +3847,16 @@
 msgid "this graphics device does not support event handling"
 msgstr "dispositivo gráfico no soporta los casos gráficos"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "prompt inválido"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 #, fuzzy
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "el modo '%s' no es soportado en call_R"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 #, fuzzy
 msgid "no graphics event handlers set"
 msgstr "ningún dispositivo gráfico está ativo"
@@ -4015,7 +4044,7 @@
 msgstr "expresión regular '%s' inválida"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, fuzzy, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "string de entrada %d es inválida en este locale"
@@ -4114,26 +4143,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "rutinas de internet no pueden ser abiertas en el módulo"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "rutinas de internet no pueden ser cargadas"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "valor incorrecto"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "rutinas socket no pueden ser cargadas"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "se intenta especificar un atributo 'comment' no válido"
+
 #: src/main/lapack.c:39
 #, fuzzy
 msgid "LAPACK routines cannot be accessed in module"
@@ -4144,40 +4172,40 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "rutinas socket no pueden ser cargadas"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 "solo son posibles operaciones para variables de tipo numérico, compleja o "
 "lógico"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "operación binaria en arreglos no conformables"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "series temporales no conformables"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "operador '%s' requiere 2 argumentos"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "tipo de 'x' inválido en 'x %s y'"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "tipo de 'y' inválido en 'x %s y'"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "Operador unitario `!' llamado con dos argumentos"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "coarcionando argumento de tipo '%s' a logical"
@@ -4186,69 +4214,83 @@
 msgid "dummy - do not translate"
 msgstr "dummy"
 
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "Error durante el wrapup: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Ejecución interrumpida\n"
+
 # Revisar!!!
-#: src/main/main.c:481
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "Error: C produce desborde de pila en 'segfault'\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "imposible abrir el paquete base package\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, fuzzy, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "imposible restaurar datos guardados en .RData\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Durante la inicialización - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "no fue posible abrir un archivo de lectura"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "no se puede salir del navegador"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 "se espera una de las siguientes respuestas: \"yes\", \"no\", \"ask\" o "
 "\"default\""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "guardar=\"ask\" en uso no-interactivo: se usará por defecto la línea de "
 "comando"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "no se reconoce el valor 'save'"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "'status' inválido, se supone el valor 0"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "'runLast' no es válida, se asume el valor FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 "no fue posible asignar espacio para el elemento de retorno de llamada de "
 "nivel superior"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "índice negativo pasado a R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 "mensajes de advertencia desde la llamada de tarea de nivel superior '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "la llamada de tarea de nivel superior no devuelve un valor lógico"
 
@@ -4295,166 +4337,171 @@
 msgstr[0] "el argumento(s) no fue utilizado(s) %s"
 msgstr[1] "el argumento(s) no fue utilizado(s) %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "puede sólo referenciar/finalizar debilmente objetos de referencia"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "el finalizador debe ser una función o NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "no es una referencia débil"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "el primer argumento debe ser un indicador de entorno o externo"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "el segundo argumento debe ser una función"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "el tercer argumento debe ser TRUE o FALSE"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "la memoria vectorial está agotada (se alcanzó el límite?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "la memoria cons está agotada (se alcanzó el límite?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "la memoria está agotada (se alcanzó el límite?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "no se puede asignar un bloque de memoria de tamaño %0.1f Gb"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "no se puede asignar un bloque de memoria de tamaño %0.1f Gb"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 #, fuzzy
 msgid "vector is too large"
 msgstr "tamaño del vector especificado es muy grande"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "no se permiten vectores de longitud negativa"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "no se puede asignar un vector de longitud %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "tipo/longitud no válido (%s/%d) en la asignación del vector"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "no se puede ubicar un vector de tamaño  %0.1f Gb"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "no se puede ubicar un vector de tamaño  %0.1f Mb"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "no se puede ubicar un vector de tamaño  %0.f Kb"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): protección del desborde de la pila"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect(): solo %d proteje items"
 msgstr[1] "unprotect(): solo %d proteje items"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: no se encontró el puntero"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] "unprotect(): solo %d proteje items"
 msgstr[1] "unprotect(): solo %d proteje items"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, fuzzy, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "Calloc no puede asignar memoria (%d de %d)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, fuzzy, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "Realloc no puede re-asignar memoria (tamaño %d)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "no es seguro devolver un puntero de vector"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "valor incorrecto"
+
+#: src/main/memory.c:3746
 #, fuzzy
 msgid "memory profiling is not available on this system"
 msgstr "'R profiling' no disponible en este sistema"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: no puede abrir el archivo de perfil '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "se requiere el argumento del string"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "no existe esta función primitiva"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "se intenta usar un nombre de varible de longitud cero"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "nombres de variables se limitan a %d bytes"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "el argumento .Internal() no es válido"
 
@@ -4498,100 +4545,100 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "no hay método aplicable para \"%s\""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod' fue llamado desde afuera de una función"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod' fue llamado desde una función anónima"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 "no se encontró ninguna llamada genérica: se llamó un método directamente?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' no es una función, sino que es de tipo %d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "argumento ... errado"
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "No se especificó el objeto"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "no se especificó la función genérica"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 #, fuzzy
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "el argumento genérico no es válido para NextMethod"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 #, fuzzy
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "se encontró un argumento 'group' inválido en NextMethod"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr "valor equivocado para .Method"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "se ignoran los métodos incompatibles"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "no existe ningún método para invocar"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "no se puede desclasificar un entorno"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "no se puede desclasificar un puntero externo"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' debe ser un vector de caracteres"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which' debe ser un vector lógico de longitud 1"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "use 'is()' en lugar de 'inherits()' en objetos S4"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr "no se puede encontrar el entorno correcto; por favor reportar!"
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 #, fuzzy
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'all.x' debe ser TRUE o FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "no fue posible encontrar una versión no genérica de la función \"%s\""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 #, fuzzy
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 "standardGeneric fue llamada sin método de despacho habilitado (será ignorada)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 #, fuzzy
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
@@ -4600,7 +4647,7 @@
 # ....desde el cuerpo de esa función genérica
 # o bien
 # ....desde el cuerpo de esa \"funtion\" genérica
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4609,7 +4656,7 @@
 "la llamada de standardGeneric(\"%s\") parece no haber sido originada desde "
 "el cuerpo de una \"function\" genérica"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4618,11 +4665,11 @@
 "el código de los métodos primitivos no es válido (\"%s\"): debe ser \"clear"
 "\", \"reset\", \"set\", o \"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "objeto inválido: debe ser una función primitiva"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4631,20 +4678,20 @@
 "la definición formal de una primitiva genérica debe ser un objeto del "
 "tipo=(got type '%s')"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, fuzzy, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "no parece ser un objecto retornado como funcion generica \"%s\""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "operación primitiva inválida para enviar"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "error de envío"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4653,90 +4700,95 @@
 "la función primitiva \"%s\" se ha fijado para los métodos pero no fue "
 "provista la función genérica"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "macro MAKE_CLASS en C llamado con el puntero de string NULL"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "las fuentes Hershey no pueden ser cargadas"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 #, fuzzy
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "macro MAKE_CLASS en C llamado con el puntero de string NULL"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 "macro NEW en C llamado con el puntero nulo de la definición de la clase"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, fuzzy, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "intención de generar un objeto en C de una clase virtual (\"%s\")"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, fuzzy, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "Objeto de la clase \"%s\" no corresponde a un objeto válido S3"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr " opsiones de lista corruptos"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 #, fuzzy
 msgid "invalid printing width, used 80"
 msgstr "la correspondencia de string parcial no es válida"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "numero de digitos no valido, use  7"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "valor no valido para \"device.ask.default\", usando FALSE"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 #, fuzzy
 msgid "list argument has no valid names"
 msgstr "el argumento no es un modelo válido"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, fuzzy, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "parámetro 'trans' no válido"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, fuzzy, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "parámetro 'trans' no válido"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "' parametros invalidos, perimitido es %d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "valor inválido para '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec' debe ser un carácter único"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" ha sido reemplazado por \"device.ask.default\""
 
@@ -4761,11 +4813,16 @@
 msgid "first argument must be atomic"
 msgstr "primer argumento debe ser atómico"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec' debe ser un carácter único"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "modo imposible (x)"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "sólo argumentos de vectores atómicos"
 
@@ -4773,219 +4830,201 @@
 msgid "invalid filename specification"
 msgstr "especificación del nombre de archivo inválido"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "error de escritura mientras se añade el archivo"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "nada para añadir a"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "argumento del nombre de archivo inválido"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, fuzzy, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "no fue posible crear fifo '%s', motivo '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "primer nombre de archivo inválido"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "segundo nombre de archivo inválido"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "nada para vincular"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 #, fuzzy
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "esta plataforma no soporta symlinks"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, fuzzy, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, fuzzy, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 #, fuzzy
 msgid "symbolic links are not supported on this platform"
 msgstr "esta plataforma no soporta symlinks"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, fuzzy, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, fuzzy, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 #, fuzzy
 msgid "(hard) links are not supported on this platform"
 msgstr "esta plataforma no soporta symlinks"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "'from' y 'to' son de longitudes diferentes"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 #, fuzzy
 msgid "expanded 'from' name too long"
 msgstr "nombre ampliado de fuente demasiado largo"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 #, fuzzy
 msgid "expanded 'to' name too long"
 msgstr "nombre ampliado de fuente demasiado largo"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, fuzzy, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "no fue posible crear fifo '%s', motivo '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "expresión regular inválida en 'pattern'"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "no fue posible determinar el directorio inicial de R"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "nombre de archivo muy largo"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "memoria interna rebasada"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "error de lectura en '%s'"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr ""
 "especificacion de 'LC_NUMERIC' puede forzar R a funcionar de forma extraña"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr "existen LC_MESSAGES en Windows pero no es operacional "
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, fuzzy, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr "el sistema operativo informa que un pedido no puede ser cumplido"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' debe ser un vector de caracteres de longitud 1"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "solución de máquina '%s' imposible en nsl()"
-
-#: src/main/platform.c:2161
-#, fuzzy
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "formato desconocido retornado por gethostbyname"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "esta plataforma no soporta nsl()"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, fuzzy, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "no fue posible crear fifo '%s', motivo '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, fuzzy, c-format
 msgid "'%ls' already exists"
 msgstr "'%s' ya existe"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, fuzzy, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "no fue posible crear fifo '%s', motivo '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "patrón de longitud 0"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, fuzzy, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "problema al ejecutar el editor %s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, fuzzy, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "problema al ejecutar el editor %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 #, fuzzy
 msgid "over-long path length"
 msgstr "patrón de longitud 0"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr "problema al copiar %ls  a %ls: %s"
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, fuzzy, c-format
 msgid "problem creating directory %s: %s"
 msgstr "problema al ejecutar el editor %s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, fuzzy, c-format
 msgid "problem reading directory %s: %s"
 msgstr "problema al ejecutar el editor %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "problema al copiar %s a %s: %s"
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 #, fuzzy
 msgid "'mode' must be of length at least one"
 msgstr "'hadj' debe tener longitud 1"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 #, fuzzy
 msgid "insufficient OS support on this platform"
 msgstr "esta plataforma no soporta nsl()"
@@ -5039,72 +5078,77 @@
 msgid "Metric information not available for this family/device"
 msgstr "truncamiento no habilitado para esta conexión"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "especificación 'na.print' inválida"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "rótulos de líneas inválidos"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "rótulos de columnas inválidos"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 #, fuzzy
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr "el argumento para pegado interno no es un string"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' debe ser un entero no negativo"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "argumento interno 'tryS4' inválido"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "buffer de entrada desbordado en la linea %d"
+
+#: src/main/print.c:1043
 #, fuzzy
 msgid "invalid character length in 'dblepr'"
 msgstr "largo de carácter inválido en dblepr"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 #, fuzzy
 msgid "invalid character length in 'intpr'"
 msgstr " largo de carácter inválido en intpr"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 #, fuzzy
 msgid "invalid character length in 'realpr'"
 msgstr " largo de carácter inválido en realpr"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 #, fuzzy
 msgid "memory allocation error in 'realpr'"
 msgstr "error de asignación de memoria en realpr"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "rutina BLAS/LAPACK  '%6s' tuvo un error de código %d"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "muy pocos rótulos de filas"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr " muy pocos rótulos de columnas"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, fuzzy, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] " [ reached getOption(\"max.print\") -- omitida la última fila ]]\n"
 msgstr[1] " [ reached getOption(\"max.print\") -- omitidas %d filas ]]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 #, fuzzy
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "esta plataforma no soporta nsl()"
@@ -5113,50 +5157,50 @@
 msgid "argument is not a numeric vector"
 msgstr "el argumento no es un vector numérico"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "argumentos inválidos"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "NAs producidos"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "NA en vector de probabilidades"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "probabilidad negativa"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "muy pocas probabilidades positivas"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 #, fuzzy
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "imposible tomar una muestra mayor que la población\n"
 "cuando 'remplace = FALSE'"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "número de probabilidades incorrecto"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 #, fuzzy
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "esta plataforma no soporta 'dirmark = TRUE'"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 #, fuzzy
 msgid "argument must be a character vector of length 1"
 msgstr "'hostname' debe ser un vector de caracteres de longitud 1"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 #, fuzzy
 msgid ""
 "argument should be a character vector of length 1\n"
@@ -5165,143 +5209,143 @@
 "el argumento '%s' tiene tiene longitud > 1 y sólo el primer elemento será "
 "usado"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 #, fuzzy
 msgid "argument 'x' must be a raw vector"
 msgstr "primer argumento debe ser un vector"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 #, fuzzy
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "'decreciente' debe ser TRUE o FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 #, fuzzy
 msgid "argument 'shift' must be a small integer"
 msgstr "el argumento 'size' debe ser un entero positivo"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 #, fuzzy
 msgid "argument 'x' must be an integer vector"
 msgstr "el primer argumento debe ser un vector de caracteres"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 #, fuzzy
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "argumento 'logarithm' debe ser lógico"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, fuzzy, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "argumento debe ser una función"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 #, fuzzy
 msgid "argument 'x' must not contain NAs"
 msgstr "el argumento no debe ser una función"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 #, fuzzy
 msgid "invalid UTF-8 string"
 msgstr "string UTF-8  no válido  'old'"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "comparación  (%d) es posible solo para tipos lista y atómico"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "comparación no permitida para expresiones"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "comparaciones de estos tipoo no están implementadas"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "comparación con valores complejos es inválida"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 #, fuzzy
 msgid "'a' and 'b' must have the same type"
 msgstr "'path' debe ser un vector de caracteres"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "error de lectura"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr " ocurrió un error de lectura en I "
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "ocurrió un error de lectura en R "
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr " ocurrió un error de lectura en C "
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr " ocurrió un error de lectura en S "
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "ocurrió un error de lectura "
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "nodo no resuelto durante restauración"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 "error de compatibilidad de restauración - sin compatibilidad con versión %d"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "tipo SEXP defectuoso en archivo de datos"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "incompatibilidad de tipos"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "no se pudo encontrar la función \"%s\""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "no es posible guardar posición de archivo mientras se restauran datos"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 "no es posible restaurar posición de archivo mientras se restauran datos "
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 "espacio de nombres no está preservado en áreas de trabajo de la versión 1"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 "no es posible guardar nombres de espacio en áreas de trabajo de la versión 1"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 #, fuzzy
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
@@ -5309,178 +5353,178 @@
 "no es posible guardar ambiente con vínculos bloqueados/activos en áreas de "
 "trabajo de la versión 1"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 "no es posible guardar referencias débiles en áreas de trabajo de la versión 1"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec llamado con un tipo no vectorial"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 "no es posible guardar objetos de tipo códigos de byte en áreas de trabajo de "
 "la versión 1"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: tipo desconocido %i"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec llamado con un tipo no vectorial"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 "no es posible leer objetos de tipo códigos de byte a partir de áreas de "
 "trabajo de la versión 1"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: tipo desconocido %i"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "memoria insuficiente en lectura de string ascii"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "ocurrió un error de lectura binario"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr " memoria insuficiente en lectura de string binario"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "ocurrió un error de lectura de string binario"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "ocurrió un error de escritura de un entero xdr "
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr " ocurrió un error de lectura de un entero xdr "
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr " ocurrió un error de escritura de string xdr "
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr " ocurrió un error de escritura de un real xdr "
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr " ocurrió un error de lectura de un real xdr "
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr " ocurrió un error de escritura de un complejo xdr"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr " ocurrió un error de lectura de un complejo xdr"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "falló escritura"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "el archivo de restauración  puede estar vacío - ningún dato cargado"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 "el archivo de restauración puede ser de una versión  más nueva de R - ningún "
 "dato cargado"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "número mágico de archivo de restauración inválido (el archivo puede estar "
 "dañado) -- ningún dato recargado"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "el primer argumento debe ser un vector de caracteres"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "no es una lista de nombres válida"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr "'%s' parece un objecto pre-2.4.0 S4 : por favor recreelo"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "los datos cargados no están en forma de lista pareada"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "el primer argumento debe ser un nombre de archivo"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "escritura XDR falló"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "lectura XDR falló"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, fuzzy, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "no es posible guardar los datos -- no fue posible abrir %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "no es posible guardar  para conexiones en formato de versión %d"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "conexión no abierta para escritura"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "no es posible guardar en formato XDR para una conexión de modo texto"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "error al escribir en una conexión"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 #, fuzzy
 msgid "connection not open for reading"
 msgstr "la conexión no está abierta para la lectura"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 #, fuzzy
 msgid "can only load() from a binary connection"
 msgstr "sólo se puede leer desde una conexión binaria"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 #, fuzzy
 msgid "no input is available"
 msgstr "no hay disponible mecanismos de historia"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5497,7 +5541,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan() esperaba '%s', obtuvo '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 #, fuzzy
 msgid "too many items"
 msgstr "demasiados argumentos"
@@ -5506,7 +5550,7 @@
 msgid "empty 'what' specified"
 msgstr "especificación vacía de 'what'"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "la linea %d no tiene %d elementos"
@@ -5540,36 +5584,36 @@
 msgid "embedded nul(s) found in input"
 msgstr "nul incrustado en la cadena: '%s' \""
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "factores de largos desiguales"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "el resultado seria un vector muy largo"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 #, fuzzy
 msgid "argument of length 0"
 msgstr "argumento tiene longitud cero"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "expresión numérica tiene %d elementos: solo el primero es utilizado"
 msgstr[1] "expresión numérica tiene %d elementos: solo el primero es utilizado"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "Argumento NA/NaN"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 #, fuzzy
 msgid "incorrect type for second argument"
 msgstr "rep() del segundo argumento de tipo incorrecto"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, fuzzy, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "intento de réplica de objeto que no es vector"
@@ -5818,53 +5862,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "solo vectores atómicos pueden ser comparados para ordenarse"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreciente' debe ser TRUE o FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "solo vectores atómicos pueden ser ordenados"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "vetores crudos (raw) no pueden ser ordenados"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, fuzzy, c-format
 msgid "index %ld outside bounds"
 msgstr "índice %d fuera de límites"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "índice NA"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "índice %d fuera de límites"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "argumento %d no es un vector"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "argumentos con longitudes diferentes"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "ties.method inválidod para rank() [nunca debería suceder]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "intervalo de valores muy grande en 'x'"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "coacción de \"texto \" a carácteres  no tuvo éxito"
@@ -5874,24 +5914,24 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "argumento '%s  será ignorado"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "primer argumento debe ser un vector"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "segundo argumento debe ser un factor"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 #, fuzzy
 msgid "group length is 0 but data length > 0"
 msgstr "Largo de grupo es 0 pero el largo de los datos es > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "largo de datos no es múltiplo de la variable de separación"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "factor con mal nivel"
 
@@ -5950,38 +5990,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "coerción ha cambiado largo de vector a 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, fuzzy, c-format
 msgid "invalid format '%s'; %s"
 msgstr "valor inválido para '%s'"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "use formato %d o %i para objetos lógicos"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, fuzzy, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "use formato %d, %i, %x o %X para objetos enteros"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, fuzzy, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "use formato %f, %e o %g para objetos numéricos"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "use formato %s para objetos tipo carácter"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, fuzzy, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "Probable truncamento de string de caracteres"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "tipo no soportado"
 
@@ -5989,269 +6029,265 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: buffer muy pequeño"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "intento de alargar un objeto diferente a un vector"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 "asignación fuera de los límites del vector/lista (extendiendo de %d a %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "tipos incompatibles (de %s a %s) en fijación de tipo sub-asignación"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "NAs no son permitidos en asignaciones subscritas"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 #, fuzzy
 msgid "replacement has length zero"
 msgstr "argumento tiene longitud cero"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 "número de items para para sustituir no es un múltiplo de la longitud del "
 "reemplazo"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "número de subscritos incorretos en matriz"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 "tipos incompatibles (de %s a %s) en asignaciones de subconjunto de la matriz"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "número incorrecto de subíndices"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 "tipos incompatibles (de %s a %s) en asignaciones de subconjunto de arreglos "
 "(arrays)"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 #, fuzzy
 msgid "invalid subscript in list assign"
 msgstr "número de subscritos inválidos en asignación de lista"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "número de subscritos inválidos en asignación de lista"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: número de argumentos inválidos"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 "resultado longitud-cero y de este modo no pude ser un objecto de este "
 "lenguanje"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 "[[<- definido para objectos de tipo \"S4\" solo para subclases de entorno"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "argumentos inválidos para sub-asignación de entorno"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "se dan más elementos que los que pueden ser sustituídos"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] con subscrito ausente"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "subscrito [[ ]] fuera de límites"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "número inadecuado de subscritos en [[ ]]"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "tipos incompatibles (de %s a %s) en asignación [["
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "subscrito (%d) en [[ ]] fuera de íimites"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, fuzzy, c-format
 msgid "invalid subscript type '%s'"
 msgstr "tipo de subscrito inválido"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "ningún método para la asignación de subconjuntos de esta clase S4"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "Realizando coercion de LHD a una lista"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "intento de selecionar menos de un elemento"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "intento de selecionar más de un elemento"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "error interno en uso de indexación recursiva"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "mas encuentros parciales de  '%s' to '%s'"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "falló indexación recursiva en nivel %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "indice inexistente en el nivel %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "número incorreto de columnas en subscrito de matriz"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "no se permiten valores negativos en subscrito de matriz"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(subscript) subscrito lógico muy largo"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "solamente 0's pueden ser mezclados con subscritos negativos"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "arreglo (array) sin atributo 'dimnames'"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "intento de usar un subscrito en un objeto distinto a un vector"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr "dimensiones deben execeder el maximo tamaño de un arreglo"
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "uso de subscritos en matrices no soportadas para este tipo"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "uso de subscritos en arreglos (arrays) no disponibles para este tipo"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "número incorreto de dimensiones"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "ningún índice especificado"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 #, fuzzy
 msgid "this S4 class is not subsettable"
 msgstr "no es posible dividir el objeto en subconjuntos"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "argumentos incorrectos para obtención de subconjuntos de un ambiente"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "'type' (%s) de argumento no válido"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 #, fuzzy
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "Exceso de capacidad (overflow) en sum(.); use sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "error interno ('op = %d' en do_summary).\t Llame a un Guru"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 #, fuzzy
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Exceso de capacidad (overflow) en sum(.); use sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 #, fuzzy
 msgid "no non-missing arguments, returning NA"
 msgstr "ningún argumento finito para min; retornando Inf"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "ningún argumento finito para min; retornando Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "ningun argumento finito para max; retornando -Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "argumento no numérico"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 #, fuzzy
 msgid "argument to 'which' is not logical"
 msgstr "argumento 'logarithm' debe ser lógico"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 #, fuzzy
 msgid "no arguments"
 msgstr "muy pocos argumentos"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 #, fuzzy
 msgid "invalid input type"
 msgstr "de tipo línea inválido"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 #, fuzzy
 msgid "an argument will be fractionally recycled"
 msgstr "argumento '%s  será ignorado"
@@ -6266,8 +6302,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "codificación de un nombre de archivo no puede ser 'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "conversión no soportada de '%s' a '%s"
@@ -6303,105 +6339,105 @@
 msgid "no 'fileext'"
 msgstr "no hay 'fileext'"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "falla de búsqueda en %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "argumento de tipo inválido"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 #, fuzzy
 msgid "wrong length for argument"
 msgstr "longitud incorrecta para el argumento 'mode'"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 #, fuzzy
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'putenv' no está disponible en este sistema"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 "este sistema no puede desvincular variables generales que han sido puestas a "
 "\"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 #, fuzzy
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "'putenv' no está disponible en este sistema"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "conversión no soportada de '%s' a '%s"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' debe ser un vector de caracteres"
 
-#: src/main/sysutils.c:652
+#: src/main/sysutils.c:658
 #, fuzzy
-msgid "'x' must be a list of NULL or raw vectors"
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x' debe ser un vector de caracteres"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, fuzzy, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "csduplicated no llamada dentro de una STRSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr "no se permite traducción de cadenas con \"bytes\" de codificación"
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "error interno en el código unz"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, fuzzy, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "conversión no soportada de '%s' a '%s"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "unión de línea inválida"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 #, fuzzy
 msgid "cannot create 'R_TempDir'"
 msgstr "no puede asignarse R_TempDir"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "imposible fijar R_SESSION_TMPDIR"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 #, fuzzy
 msgid "cannot allocate 'R_TempDir'"
 msgstr "no puede asignarse R_TempDir"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 #, fuzzy
 msgid "temporary name too long"
 msgstr "nombre de archivo muy largo"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "no se puede encontrar un nombre temporario de archivo no utilizado"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 #, fuzzy
 msgid "allocation failed in R_tmpnam2"
 msgstr "fallo de asignación en GVText"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "esta plataforma no soporta 'dirmark = TRUE'"
 
@@ -6439,33 +6475,33 @@
 msgid "'nmax' must be positive"
 msgstr "argumento debe tener longitud positiva"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' requiere argumentos vectoriales"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "argumento no es de modo carácter"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 #, fuzzy
 msgid "... used in a situation where it does not exist"
 msgstr "... usado en una situacion donde no existe"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "no se espera el valor en '...'"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "data frame no numérico en rowsum"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "esto no puede ocurrir"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' debe ser un vector de caracteres"
 
@@ -6473,149 +6509,149 @@
 msgid "object is not a matrix"
 msgstr "objeto no es una matriz"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, fuzzy, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "tipo %d no esta implementado en type2str"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "tipo no implementado '%s' en '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "tipo no implementado (%d) en '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "etiqueta invalida durante la extracción de nombre"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, fuzzy, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%d argumentos dados a 'atan', que requieren 1"
 msgstr[1] "%d argumentos dados a 'atan', que requieren 1"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d argumentos dados a '%s', que requeiren 1 o 2"
 msgstr[1] "%d argumentos dados a '%s', que requeiren 1 o 2"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "nombre de argumento suministrado '%s' no coincide '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, fuzzy, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "lista \"nthcdr\" es menor que %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 #, fuzzy
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "\"nthcdr\" requiere una lista para bajar CDR"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' debe ser TRUE o FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' debe ser TRUE o FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 #, fuzzy
 msgid "missing value is invalid"
 msgstr "valor faltante para el parámetro"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "no es posible cambiar el directorio de trabajo"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "se espera un vector de caracteres como argumento"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "camino (path) muy largo"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "solo el primer carácter de 'quote' será utilizado"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 #, fuzzy
 msgid "a character vector 'value' expected"
 msgstr "se espera un vector de caracteres como argumento"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 #, fuzzy
 msgid "'value' must be of positive length"
 msgstr "argumento debe tener longitud positiva"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, fuzzy, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "entrada no válida en Rmbstowcs"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, fuzzy, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "string multibyte %d inválida"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "mensage de error truncado en 255 caracteres"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "mensage de atención truncado en 255 caracteres"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 #, fuzzy
 msgid "all arguments must be named"
 msgstr "los atributos deben tener nombre"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 #, fuzzy
 msgid "ICU is not supported on this build"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 #, fuzzy
 msgid "'breaks' is not sorted"
 msgstr "el modo '%s' no es soportado en call_R"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, fuzzy, c-format
 msgid "long vector '%s' is not supported"
 msgstr "el modo '%s' no es soportado en call_R"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 #, fuzzy
 msgid "'x' must be a vector"
 msgstr "'x' debe ser un vector de caracteres"
@@ -6681,7 +6717,7 @@
 msgid "There must be at least three control points"
 msgstr "debe haber un primer argumento"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "Error de protocolo X11: %s"
@@ -6707,7 +6743,7 @@
 "Error: X11 no puede asignar colores gráficos adicionales.\n"
 "Considere usar X11 con colortype=\"pseudo.cube\" o \"gray\""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6715,17 +6751,17 @@
 "no fue posible encontrar ninguna fuente X11\n"
 "Verifique que el directorio de fuentes es correcto."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 usa fuentes de tamaño %d cuando %d fue pedido"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, fuzzy, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "fuente X11 de tamaño %d no puede ser cargada"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6733,200 +6769,206 @@
 "semi-transparencia no esta soportado en este dispositivo: reportado solo una "
 "vez por pagina"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "X11 I/O error al abrir la conexión X11 a \"%s\""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "Error fatal de E/S: por favor guarde su trabajo y cancele R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 "locale no soportado por Xlib: algunas operaciones X operarán en locale C "
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X no puede ajustar modificadores locales"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "no hay soporte png en esta versión de R"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "nombre de archivo muy largo en la llamada png()"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "no fue posible abrir el archivo PNG '%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "no se soporta jpeg en esta versión de R"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "nombre de archivo muy largo en llamda jpeg()"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "no fue posible abrir el archivo JPEG '%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 #, fuzzy
 msgid "no tiff support in this version of R"
 msgstr "no hay soporte png en esta versión de R"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 #, fuzzy
 msgid "filename too long in tiff() call"
 msgstr "nombre de archivo muy largo en la llamada png()"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 #, fuzzy
 msgid "filename too long in bmp() call"
 msgstr "nombre de archivo muy largo en la llamada png()"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, fuzzy, c-format
 msgid "could not open BMP file '%s'"
 msgstr "no fue posible abrir el archivo PNG '%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "no fue posible abrir la conexión con el dispositivo X11 '%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 "ignorando el  'display' como un argumento ya que el dispositivo X11 ya está "
 "abierto"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 "typos cairo-based solo pueden funcionar correctamente en visualizacion "
 "TrueColor"
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg() no soporta transparencia: usando fondo blanco"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, fuzzy, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "no fue posible abrir la conexión con el dispositivo X11 '%s'"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "no fue posible abrir la ventana X11"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "'width=%d, height=%d' son valores de pixeles improbables"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "imposible crear mapa de pixeles"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "especificación de fuente no válida"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "familia de fuente no encontrada en la base de X11"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, fuzzy, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "valor inválido para 'n'"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, fuzzy, c-format
 msgid "could not open file '%s'"
 msgstr "no fue posible abrir el archivo PNG '%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, fuzzy, c-format
 msgid "%s not available for this device"
 msgstr "\t\"Información métrica no disponible para este dispositivo"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 #, fuzzy
 msgid "Unable to create XImage"
 msgstr "imposible crear mapa de pixeles"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr "intento de usar el localizador dev.hold()"
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "no fue posible iniciar el dispositivo %s"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width' o 'height' no válidos"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "tipo de color no válido pasado al driver X11"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "modo de color X11 desconocido -- usando modo monocromático"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 #, fuzzy
 msgid "no plot on device to save"
 msgstr "no hay historia disponible para guardar"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 #, fuzzy
 msgid "not an open X11cairo device"
 msgstr "demasiados dispositivos abiertos"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "no fue posible abrir el archivo '%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 #, fuzzy
 msgid "savePlot() is not supported on this build"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "no fue posible abrir conexión con el dispositivo X11"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, fuzzy, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "no fue posible abrir el portapapeles o no contiene texto"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "no fue posible asignar memoria para estrutura de tipo X11Routines"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "reinicios no sustentados en 'eval'"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "fallo de asignación de la conexión url"
 
@@ -6938,29 +6980,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "solo se utilizó el primer elemento del argumento 'destfile'"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Descarga en progreso"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, fuzzy, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, fuzzy, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "probando la URL '%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "longitud bajada %d != longitud informada %d"
@@ -6970,140 +7012,166 @@
 msgid "cannot open URL '%s'"
 msgstr "no fue posible abrir la URL '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "esquema de URL sin soporte"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "no fue posible abrir: el status HTTP fue '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "fallo en InternetOpenUrl: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "no fue posible abrir: el status HTTP fue '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "argumento '%s' inválido"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "la longitud de los nombres de importación y exportación debe coincidir"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "no fue posible abrir el archivo '%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "no se puede leer desde esta conexión"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "no se puede abrir la conexión"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "esta plataforma no soporta nsl()"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: (inválido?) URL muy largo"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "quitando la información proxy FTP"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "usando proxy FTP '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: (inválido?) URL muy largo"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "no fue posible resolver el host"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "fallo en la conexión con el servidor"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "fallo al intentar obtener respuesta del servidor"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: fallo en el intento de crear socket"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "fallo al intentar crear una conexión de datos"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "fallo en el intento de vincular un puerto"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "no fue posible escuchar en el puerto %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: (inválido?) URL muy largo"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "quitando la información sobre proxy HTTP"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "usando proxy HTTP '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: (inválido?) URL muy largo"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, fuzzy, c-format
 msgid "unable to resolve '%s'"
 msgstr "no fue posible resolver '%s'."
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "conectado a '%s' en el puerto %d."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "no fue posible conectarse a '%s' en el puerto %d."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "redireccionamiento a: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "muchos redireccionamientos, abortando ..."
 
@@ -7343,8 +7411,8 @@
 msgstr "error de asignación bessel_i"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fuera de "
 "límites?\n"
@@ -7354,18 +7422,23 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): precisión perdida en resultado\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "error de asignación en bessel_j"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fuera de "
 "límites?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): precisión perdida en resultado\n"
@@ -7375,8 +7448,8 @@
 msgstr "error de asignación en bessel_k"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fuera de "
 "límites?\n"
@@ -7386,18 +7459,23 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): precisión perdida en resultado\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "error de asignación en bessel_y"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fuera de "
 "límites?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): precisión perdida en resultado\n"
@@ -7407,42 +7485,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, fuzzy, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "valor fuera de sus límites en 'perm'"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, fuzzy, c-format
 msgid "value out of range in '%s'\n"
 msgstr "valor fuera de sus límites en 'perm'"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, fuzzy, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "falla de apertura en %s"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "no se han podido alcanzar precisión absoluta en '%s' \n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "se produjo un desbordamiento en '%s' \n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): no converge en %d iteraciones"
@@ -7515,7 +7593,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr "Carga lazy explícita no soportado en esta plataforma. Usa por defecto."
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "no es posible obtener el directorio de trabajo!"
 
@@ -7531,12 +7609,12 @@
 "Una circunstancia inusual ha ocurrido en el anidado de entrada readline. Por "
 "favor informe usando bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, fuzzy, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "problemas al mostrar  '%s'"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, fuzzy, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7545,86 +7623,123 @@
 "no fue posible abrir el archivo '%s'\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "argumento 'file' es muy largo"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "no hay disponible mecanismos de historia"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "problema al truncar el archivo de historial"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "no hay historia disponible para guardar"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "etiqueta inválida"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "argumento de carácter no vacío esperado"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' debe ser un valor lógico y no NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, fuzzy, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "no fue posible abrir el archivo '%s', motivo '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr "linea  %d puede ser truncada en la llamada a  system(, intern = TRUE)"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, fuzzy, c-format
 msgid "error in running command: '%s'"
 msgstr "error interno en el código unz"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 #, fuzzy
 msgid "error in running command"
 msgstr "error interno en el código unz"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "comando ejecuta '%s' tiene estatus %d y mensaje de error '%s' "
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() no está implementado en este sistema"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "ATENCIÓN: --gui o -g sin especificación es ignorado"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "ATENCIÓN: interface gráfica desconocida '%s', usando X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "ATENCIÓN: interface gráfica '%s' desconocida, usando ninguna\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "creación de archivo temporal '-e' falló"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "ATENCIÓN: Solamente editando el primero de los archivos de lista"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "que debe ser un string de caracteres o una función"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "sockets no están disponibles en este sistema"
+
+#~ msgid "no function to restart"
+#~ msgstr "ninguna función para reiniciar"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "argumento debe ser una clausura"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname' debe ser un vector de caracteres de longitud 1"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "solución de máquina '%s' imposible en nsl()"
+
+#, fuzzy
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "formato desconocido retornado por gethostbyname"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "esta plataforma no soporta nsl()"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "intervalo de valores muy grande en 'x'"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "argumento no numérico"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "esquema de URL sin soporte"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' debe ser una lista"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' debe ser una lista"
 
@@ -7820,16 +7935,10 @@
 #~ msgid "can't use R profiling while byte code profiling"
 #~ msgstr "no puede usarse 'R profiling' durante 'byte code profiling'"
 
-#~ msgid "bad character switch offsets"
-#~ msgstr "mal carácter en el interruptor offsets"
-
 #, fuzzy
 #~ msgid "bad switch names"
 #~ msgstr "nombre de archivo inválido"
 
-#~ msgid "bad numeric switch offsets"
-#~ msgstr "mal numérico en el interruptor offsets"
-
 #, fuzzy
 #~ msgid "constBuf must be a generic vector"
 #~ msgstr "code debe ser un vector genérico"
@@ -8006,9 +8115,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title' debe ser un string de caracteres"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "'text' debe ser un string de caracteres"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s' debe tener longitud 1"
 
@@ -8040,9 +8146,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' no es una conexión"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec' debe ser un carácter único"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr ""
 #~ "data frame con problemas -- largo de columna %d no se corresponde con "
diff -Nru r-base-3.2.3/src/library/base/po/fa.po r-base-3.3.1/src/library/base/po/fa.po
--- r-base-3.2.3/src/library/base/po/fa.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/fa.po	2016-04-27 22:15:37.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.15.2\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2012-10-26 22:30+0330\n"
 "Last-Translator: Seyed Mahmood Taghavi Shahri <taghavi_m@razi.tums.ac.ir>\n"
 "Language-Team: Persian\n"
@@ -123,173 +123,174 @@
 msgid "problem in displaying '%ls'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr ""
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr ""
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr ""
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr ""
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr ""
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr ""
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr ""
 
@@ -330,184 +331,183 @@
 msgid "'names' is not a character vector"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr ""
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr ""
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr ""
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr ""
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr ""
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr ""
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr ""
 
@@ -605,7 +605,7 @@
 msgid "could not allocate space for 'name'"
 msgstr ""
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr ""
 
@@ -659,7 +659,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr ""
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr ""
@@ -690,9 +690,9 @@
 msgid "invalid multibyte format string"
 msgstr ""
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -702,7 +702,7 @@
 msgstr ""
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr ""
 
@@ -713,8 +713,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr ""
@@ -722,7 +722,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr ""
@@ -737,7 +737,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr ""
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr ""
@@ -746,29 +746,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr ""
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr ""
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr ""
 
@@ -800,7 +800,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr ""
 
@@ -812,214 +812,214 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr ""
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr ""
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr ""
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr ""
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr ""
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr ""
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr ""
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr ""
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr ""
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr ""
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr ""
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr ""
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr ""
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr ""
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr ""
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr ""
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr ""
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr ""
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr ""
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr ""
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr ""
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr ""
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr ""
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr ""
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr ""
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr ""
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr ""
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr ""
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr ""
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr ""
 
-#: src/main/array.c:1381
-msgid "'X' is too short"
+#: src/main/array.c:1425
+msgid "'x' is too short"
 msgstr ""
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr ""
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr ""
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1082,200 +1082,201 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr ""
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr ""
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr ""
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr ""
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
 msgstr ""
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr ""
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr ""
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr ""
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr ""
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr ""
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr ""
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr ""
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr ""
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr ""
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr ""
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr ""
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr ""
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr ""
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr ""
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr ""
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr ""
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr ""
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr ""
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr ""
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr ""
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr ""
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr ""
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr ""
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr ""
@@ -1284,227 +1285,243 @@
 msgid "vector size cannot be NA"
 msgstr ""
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr ""
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr ""
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr ""
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+msgid "argument is not a function"
+msgstr ""
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr ""
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr ""
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr ""
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr ""
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr ""
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr ""
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr ""
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr ""
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr ""
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr ""
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr ""
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr ""
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr ""
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr ""
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr ""
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr ""
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr ""
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
 #, c-format
-msgid "invalid multibyte string %d"
+msgid "invalid multibyte string, %s"
 msgstr ""
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr ""
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+msgid "non-character object(s)"
+msgstr ""
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr ""
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr ""
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr ""
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr ""
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr ""
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr ""
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr ""
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr ""
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr ""
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr ""
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr ""
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr ""
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr ""
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr ""
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr ""
 
@@ -1516,7 +1533,7 @@
 msgid "applies only to lists and vectors"
 msgstr ""
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr ""
 
@@ -1524,7 +1541,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr ""
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr ""
 
@@ -1532,178 +1549,173 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr ""
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr ""
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr ""
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr ""
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr ""
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr ""
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr ""
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr ""
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr ""
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr ""
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr ""
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr ""
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr ""
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr ""
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
+#: src/main/coerce.c:2464
+msgid "'what' must be a function or character string"
 msgstr ""
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr ""
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr ""
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr ""
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr ""
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr ""
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr ""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr ""
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr ""
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr ""
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr ""
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr ""
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr ""
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr ""
 
@@ -1715,7 +1727,7 @@
 msgid "connection not found"
 msgstr ""
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr ""
 
@@ -1724,9 +1736,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr ""
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr ""
@@ -1808,8 +1820,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr ""
 
@@ -1837,8 +1849,8 @@
 msgstr ""
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr ""
 
@@ -1848,14 +1860,14 @@
 msgstr ""
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr ""
@@ -1922,7 +1934,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr ""
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr ""
@@ -1942,12 +1954,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr ""
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr ""
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr ""
 
@@ -2050,326 +2062,321 @@
 msgid "'con' is not an output textConnection"
 msgstr ""
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr ""
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr ""
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr ""
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr ""
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr ""
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr ""
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr ""
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr ""
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr ""
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr ""
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr ""
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr ""
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr ""
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr ""
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr ""
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr ""
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr ""
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr ""
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr ""
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr ""
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr ""
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr ""
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr ""
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr ""
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr ""
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr ""
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr ""
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr ""
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr ""
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr ""
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr ""
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr ""
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr ""
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr ""
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr ""
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr ""
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr ""
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr ""
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr ""
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+msgid "'text' must be TRUE or FALSE"
+msgstr ""
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr ""
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr ""
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr ""
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr ""
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr ""
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr ""
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr ""
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr ""
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr ""
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr ""
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr ""
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr ""
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr ""
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr ""
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr ""
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr ""
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr ""
 
@@ -2377,37 +2384,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr ""
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr ""
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr ""
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr ""
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr ""
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr ""
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr ""
 
@@ -2421,11 +2428,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr ""
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr ""
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr ""
 
@@ -2434,7 +2437,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr ""
 
@@ -2450,58 +2453,58 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr ""
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr ""
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr ""
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr ""
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr ""
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr ""
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr ""
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr ""
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr ""
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr ""
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr ""
 
@@ -2513,15 +2516,15 @@
 msgid "no active or default device"
 msgstr ""
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr ""
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr ""
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr ""
 
@@ -2607,7 +2610,7 @@
 msgid "too many arguments, sorry"
 msgstr ""
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr ""
 
@@ -2758,7 +2761,7 @@
 msgid "invalid argument to edit()"
 msgstr ""
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr ""
 
@@ -2818,12 +2821,12 @@
 msgstr ""
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr ""
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr ""
 
@@ -2852,82 +2855,96 @@
 msgid "raster capture is not available for this device"
 msgstr ""
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr ""
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr ""
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr ""
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr ""
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr ""
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr ""
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr ""
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr ""
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr ""
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr ""
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr ""
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr ""
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr ""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr ""
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr ""
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr ""
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr ""
 
@@ -2936,7 +2953,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr ""
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr ""
 
@@ -2952,681 +2969,685 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr ""
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr ""
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr ""
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr ""
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr ""
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr ""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr ""
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr ""
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr ""
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr ""
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr ""
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr ""
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr ""
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr ""
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr ""
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr ""
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr ""
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr ""
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr ""
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr ""
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr ""
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr ""
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr ""
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr ""
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr ""
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr ""
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr ""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr ""
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr ""
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr ""
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr ""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr ""
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr ""
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr ""
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr ""
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr ""
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr ""
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr ""
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr ""
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr ""
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr ""
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr ""
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr ""
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr ""
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr ""
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr ""
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr ""
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr ""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr ""
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr ""
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr ""
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr ""
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr ""
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr ""
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr ""
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr ""
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr ""
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr ""
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr ""
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr ""
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr ""
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr ""
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr ""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr ""
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr ""
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr ""
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr ""
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr ""
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr ""
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr ""
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr ""
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr ""
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr ""
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr ""
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr ""
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr ""
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr ""
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr ""
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr ""
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr ""
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr ""
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr ""
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr ""
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr ""
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr ""
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr ""
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr ""
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr ""
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr ""
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr ""
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr ""
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr ""
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr ""
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr ""
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr ""
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr ""
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr ""
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr ""
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr ""
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr ""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr ""
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr ""
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr ""
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr ""
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr ""
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr ""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr ""
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr ""
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr ""
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr ""
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr ""
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr ""
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr ""
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr ""
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr ""
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr ""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr ""
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr ""
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr ""
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr ""
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr ""
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr ""
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr ""
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr ""
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr ""
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr ""
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr ""
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr ""
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr ""
 
@@ -3643,15 +3664,15 @@
 msgid "this graphics device does not support event handling"
 msgstr ""
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr ""
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr ""
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr ""
 
@@ -3830,7 +3851,7 @@
 msgstr ""
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr ""
@@ -3918,24 +3939,22 @@
 msgid "internet routines cannot be accessed in module"
 msgstr ""
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
+msgid "socket routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
-msgid "socket routines cannot be loaded"
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
 msgstr ""
 
 #: src/main/lapack.c:39
@@ -3946,38 +3965,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr ""
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr ""
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr ""
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr ""
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr ""
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr ""
@@ -3986,61 +4005,73 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+msgid "error during cleanup\n"
+msgstr ""
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr ""
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr ""
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr ""
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr ""
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr ""
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+msgid "unable to initialize the JIT\n"
+msgstr ""
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr ""
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr ""
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr ""
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr ""
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr ""
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr ""
 
@@ -4083,164 +4114,169 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr ""
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr ""
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr ""
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr ""
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr ""
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr ""
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr ""
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr ""
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr ""
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr ""
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr ""
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr ""
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr ""
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr ""
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr ""
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr ""
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr ""
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr ""
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr ""
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr ""
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr ""
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr ""
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr ""
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr ""
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ""
 
@@ -4279,221 +4315,225 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr ""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr ""
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr ""
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr ""
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr ""
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr ""
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr ""
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ""
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr ""
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr ""
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr ""
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr ""
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr ""
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr ""
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr ""
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr ""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr ""
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
 "\"set\", or \"suppress\""
 msgstr ""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr ""
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr ""
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr ""
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr ""
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr ""
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr ""
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr ""
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr ""
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr ""
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr ""
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr ""
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+msgid "'OutDec' must be a string of one character"
+msgstr ""
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr ""
 
@@ -4517,11 +4557,15 @@
 msgid "first argument must be atomic"
 msgstr ""
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+msgid "'decimal.mark' must be a string of one character"
+msgstr ""
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr ""
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr ""
 
@@ -4529,209 +4573,192 @@
 msgid "invalid filename specification"
 msgstr ""
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr ""
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr ""
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr ""
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr ""
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr ""
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr ""
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr ""
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr ""
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr ""
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr ""
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr ""
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr ""
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr ""
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr ""
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr ""
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr ""
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr ""
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr ""
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr ""
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr ""
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr ""
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr ""
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr ""
 
@@ -4776,67 +4803,71 @@
 msgid "Metric information not available for this family/device"
 msgstr ""
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr ""
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr ""
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr ""
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ""
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr ""
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr ""
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr ""
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr ""
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr ""
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr ""
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr ""
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr ""
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 
@@ -4844,338 +4875,338 @@
 msgid "argument is not a numeric vector"
 msgstr ""
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr ""
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr ""
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr ""
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr ""
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr ""
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr ""
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr ""
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr ""
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr ""
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr ""
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr ""
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr ""
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr ""
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr ""
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr ""
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr ""
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr ""
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr ""
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr ""
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr ""
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr ""
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr ""
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr ""
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr ""
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr ""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr ""
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr ""
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr ""
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr ""
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr ""
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr ""
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr ""
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr ""
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr ""
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr ""
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr ""
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr ""
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr ""
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr ""
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr ""
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr ""
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr ""
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5190,7 +5221,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr ""
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr ""
 
@@ -5198,7 +5229,7 @@
 msgid "empty 'what' specified"
 msgstr ""
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr ""
@@ -5231,34 +5262,34 @@
 msgid "embedded nul(s) found in input"
 msgstr ""
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr ""
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr ""
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr ""
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr ""
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr ""
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr ""
@@ -5487,53 +5518,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr ""
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr ""
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr ""
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr ""
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr ""
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr ""
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr ""
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr ""
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr ""
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr ""
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5543,23 +5570,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr ""
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr ""
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr ""
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr ""
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr ""
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr ""
 
@@ -5614,38 +5641,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr ""
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr ""
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr ""
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr ""
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr ""
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr ""
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr ""
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr ""
 
@@ -5653,251 +5680,247 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr ""
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr ""
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr ""
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr ""
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr ""
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr ""
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr ""
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr ""
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr ""
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr ""
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr ""
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr ""
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr ""
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr ""
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr ""
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr ""
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr ""
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr ""
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr ""
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr ""
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr ""
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr ""
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr ""
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr ""
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr ""
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr ""
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr ""
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr ""
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr ""
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr ""
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr ""
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr ""
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr ""
 
@@ -5910,8 +5933,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -5944,94 +5967,94 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr ""
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr ""
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr ""
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr ""
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr ""
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr ""
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr ""
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr ""
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr ""
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr ""
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr ""
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr ""
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr ""
 
@@ -6066,31 +6089,31 @@
 msgid "'nmax' must be positive"
 msgstr ""
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr ""
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr ""
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr ""
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr ""
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr ""
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr ""
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr ""
 
@@ -6098,142 +6121,142 @@
 msgid "object is not a matrix"
 msgstr ""
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr ""
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr ""
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr ""
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr ""
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr ""
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr ""
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr ""
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr ""
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr ""
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr ""
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr ""
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr ""
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr ""
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr ""
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr ""
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr ""
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr ""
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr ""
 
@@ -6296,7 +6319,7 @@
 msgid "There must be at least three control points"
 msgstr ""
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr ""
@@ -6317,210 +6340,216 @@
 "Consider using X11 with colortype=\"pseudo.cube\" or \"gray\"."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr ""
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
+msgstr ""
+
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, c-format
+msgid "scheme not supported in URL '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr ""
 
@@ -6532,29 +6561,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr ""
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr ""
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr ""
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr ""
@@ -6564,136 +6593,159 @@
 msgid "cannot open URL '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
+msgstr ""
+
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
+#, c-format
+msgid "InternetOpenUrl failed: '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/libcurl.c:159
 #, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+msgid "URL '%s': status was '%d %s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/libcurl.c:163
 #, c-format
-msgid "InternetOpenUrl failed: '%s'"
+msgid "URL '%s': status was '%s'"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:593
+msgid "cannot download all files"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:727
+msgid "cannot read from connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:763
+msgid "cannot open connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr ""
 
@@ -6924,7 +6976,7 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -6932,16 +6984,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr ""
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6952,7 +7009,7 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -6960,16 +7017,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr ""
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6979,42 +7041,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr ""
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr ""
@@ -7082,7 +7144,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr ""
 
@@ -7096,93 +7158,93 @@
 "report using bug.report()"
 msgstr ""
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr ""
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
 "\n"
 msgstr ""
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr ""
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr ""
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr ""
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr ""
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr ""
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr ""
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr ""
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr ""
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr ""
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr ""
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr ""
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr ""
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr ""
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/base/po/fr.po r-base-3.3.1/src/library/base/po/fr.po
--- r-base-3.2.3/src/library/base/po/fr.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/fr.po	2016-04-27 22:15:36.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2014-03-17 10:36+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -125,175 +125,176 @@
 msgid "problem in displaying '%ls'"
 msgstr "problème lors de l'affichage de '%ls'"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argument '%s' incorrect"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "version de Windows non supportée"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "argument incorrect"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr ""
 "ne soyez pas stupide ! Votre machine a une limite de mémoire adressable de 4 "
 "Go"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "impossible de diminuer la limite de mémoire allouée : ignorée"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' doit être un vecteur de chaîne de caractères"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "périphérique incorrect"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "nécessite le mode SDI"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "numéro de périphérique graphique incorrect"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "mauvais périphérique"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "entrée incorrecte dans 'Rmbstowcs'"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "choix de fichier annulé"
 
@@ -334,186 +335,185 @@
 msgid "'names' is not a character vector"
 msgstr "'names' n'est pas un vecteur de caractères"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "chaîne de caractères attendue comme premier argument"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "chaîne de caractères attendue comme troisième argument"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "l'exécution de la commande '%s' renvoie un statut %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "la limite de temps de la session est atteinte"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "la limite de temps est atteinte"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "la limite de temps processeur est atteinte"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "limite de temps processeur atteinte"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Erreur fatale : %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "l'encodage '%s' n'est pas reconnu"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<ERREUR : réencodage erroné pour l'encodage '%s'>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "impossible d'ouvrir le fichier '%s' : %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show() : fichier '%s' inexistant\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "AVIS : valeur R_MAX_MEM_SIZE incorrecte : ignorée\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "AVIS : max-mem-size absent\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "AVIS : valeur --max-mem-size incorrecte : ignorée\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "AVIS : --max-mem-size = %lu%c : trop grande et ignorée\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "AVIS : --max-mem-size = %4.1fM : trop petite et ignorée\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "AVIS : --max-mem-size = %4.0fM : trop petite et considérée comme %uM\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr "l'option '%s' nécessite un argument"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "l'option '%s' nécessite un argument non vide"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "AVIS : '-e %s' omis comme entrée trop longue\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "AVIS : option inconnue '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGUMENT '%s' __ignoré__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "utilisation de -e avec -f ou --file interdite "
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "la création de tmpfile a échoué -- redéfinir TMPDIR ? "
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "vous devez spécifier '--save', '--no-save' ou '--vanilla'"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "impossible de créer le 'reader thread' ; vous devez libérer des ressources "
 "système"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "indice hors limites"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "objet de type '%s' non indiçable"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr "AVIS : aucune valeur donnée pour --encoding"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "AVIS : l'option '%s' n'est plus disponible"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "AVIS : aucune valeur donnée pour '%s'"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "AVIS : valeur '%s' incorrecte : ignorée"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "AVIS : %s : trop grand et ignoré"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "AVIS : aucune valeur donnée pour '--max-ppsize'"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "AVIS : valeur de '--max-ppsize' strictement négative : ignorée"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "AVIS : valeur de '--max-ppsize' trop petite : ignorée"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "AVIS : valeur de '--max-ppsize' trop grande : ignorée"
 
@@ -628,7 +628,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "impossible d'allouer de l'espace pour 'name'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "argument de type caractère attendu"
 
@@ -688,7 +688,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "problème lors de l'affectation de la variable '%s' dans Renviron"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "l'argument 'x' doit être une chaîne de caractères"
@@ -719,9 +719,9 @@
 msgid "invalid multibyte format string"
 msgstr "chaîne de caractères multioctets incorrecte"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -732,7 +732,7 @@
 msgstr "'pattern' doit être une chaîne de caractères non vide"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "expression régulière incorrecte dans cet environnement linguistique"
 
@@ -743,8 +743,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr ""
@@ -754,7 +754,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "l'argument '%s' sera ignoré"
@@ -773,7 +773,7 @@
 "la chaîne de caractères entrée y[%d] est incorrecte dans cet environnement "
 "linguistique"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "erreur regcomp : '%s'"
@@ -782,29 +782,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "'FUN.VALUE' doit être un vecteur"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "valeur '%s' incorrecte"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "taille incorrecte"
 
@@ -841,7 +841,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<valeur>) n'est ni NULL ni une liste de longueur %d"
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "production de NaN"
 
@@ -853,111 +853,111 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "perte totale de précision probable dans modulus"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "NA produit par débordement d'entier par le haut"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "l'opérateur a besoin d'un ou de deux arguments"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "argument non numérique pour un opérateur binaire"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "tableaux de tailles inadéquates"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "séries temporelles de tailles inadéquates"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 "la taille d'un objet plus long n'est pas multiple de la taille d'un objet "
 "plus court"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "argument incorrect pour un opérateur unitaire"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "opérateur unitaire incorrect"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "fonction réelle à un argument non implémentée"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "fonction complexe non implémentée"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "fonction réelle de %d arguments numériques non implémentée"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d arguments passés à '%s' qui en exige 1 ou 2"
 msgstr[1] "%d arguments passés à '%s' qui en exige 1 ou 2"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "second argument de taille nulle incorrect"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "l'argument \"%s\" est manquant, avec aucune valeur par défaut"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "argument 'base' de taille nulle incorrect"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data' doit être de type vecteur, il était '%s'"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "plage non numérique pour une matrice"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "valeur 'nrow' incorrecte (trop grande ou NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "valeur 'nrow' incorrecte (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "valeur 'ncol' incorrecte (trop grande ou NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "valeur 'ncol' incorrecte (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr "nc = 0 pour des données non nulles"
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr "nr = 0 pour des données non nulles"
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
@@ -965,7 +965,7 @@
 "la longueur des données [%d] n'est pas un diviseur ni un multiple du nombre "
 "de lignes [%d]"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -974,101 +974,101 @@
 "la longueur des données [%d] n'est pas un diviseur ni un multiple du nombre "
 "de colonnes [%d]"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "la longueur des données dépasse la taille de la matrice"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "trop d'éléments fournis"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "plage négative pour la matrice"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix : trop d'éléments fournis"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "plage négative pour une tableau 3D"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr "'alloc3Darray' : trop d'éléments fournis"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "'allocArray' : trop d'éléments fournis par 'dims'"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x' doit être une list de vecteurs NULL ou \"raw\""
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 "une objet de type matrice ou assimilé est nécessaire comme argument pour '%s'"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "nécessite des arguments numériques/complexes matrice/vecteur"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "arguments inadéquats"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "l'argument n'est pas une matrice"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "premier argument incorrect, doit être un tableau"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' est d'une mauvaise longueur %d (!= %d)"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a' n'a pas de noms de dimensions"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "'perm[%d]' ne correspond pas à une dimension de nom"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "valeur de 'perm' hors intervalle"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'resize' doit être TRUE ou FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' doit être numérique"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "'object' est trop court"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr "'dims' doit être de longueur 0"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr "'x' doit avoir une longueur strictement positive"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1134,12 +1134,12 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "tentative de changer l'attribut 'class' à une valeur incorrecte"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr "La classe '%s' n'a pas d  slot 'names'"
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
@@ -1148,7 +1148,7 @@
 "La classe '%s' n'a pas de slot 'names'; l'affectation d'un attribut 'names' "
 "créera un object incorrect"
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
@@ -1156,131 +1156,132 @@
 "L'utilisation de names()<- pour changer le slot 'names' dans une classe non "
 "vectorielle ('%s') est interdite"
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "argument 'names' incompatible"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "type incorrect (%s) pour l'attribut 'names'"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' appliqué à autre chose qu'un tableau"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' doit être une liste"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' doit être une liste"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 "la longueur de 'dimnames' [%d] doit correspondre à celle de 'dims' [%d]"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "type incorrect (%s) pour 'dimnames' (doit être un vecteur)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "la longueur de 'dimnames' [%d] n'est pas égale à l'étendue du tableau"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "premier argument incorrect"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "second argument incorrect"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "vecteur dimension de longueur nulle incorrect"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "les dimensions contiennent des valeurs manquantes"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "les dimensions contiennent des valeurs négatives"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr "dims ne correspond pas à la longueur de l'objet"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "dims [produit %d] ne correspond pas à la longueur de l'objet [%d]"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "les attributs doivent être dans une liste, ou alors la valeur 'NULL'"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "les attributs doivent être nommés"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "tous les attributs doivent être nommés [%d ne l'est pas]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "'which' doit être en mode caractère"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "un et un seul attribut 'which' doit être fourni"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "correspondance partielle de '%s' en '%s'"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "type incorrect '%s' pour le nom d'un slot"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name' doit être une chaîne de caractères non nulle"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "type ou longueur incorrect pour le nom d'un slot"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "impossible d'obtenir un slot (\"%s\") d'un objet de type \"%s\""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "aucun slot de nom \"%s\" pour cet objet de la classe \"%s\""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "tentative de changer le slot d'un objet en NULL"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 "les classes formelles ne peuvent être utilisées sans le package 'methods'"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1289,7 +1290,7 @@
 "tentative d'obtenir le slot \"%s\" d'un objet d'une classe élémentaire (\"%s"
 "\") sans slots"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1298,48 +1299,48 @@
 "tentative d'obtenir le slot \"%s\" d'un objet (classe \"%s\") qui n'est pas "
 "un objet S4"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 "le vecteur résultant à une taille supérieure à la valeur maximale permise "
 "dans '%s'"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "type '%s' est indisponible dans '%s'"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "argument formel 'recursive' répété"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "argument formel 'use.names' répété"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "l'argument n'est pas une liste"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "nom de classe trop long dans '%s'"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "impossible de créer une matrice à partir de du type '%s'"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "le nombre de lignes des matrices doit correspondre (voir argument %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr ""
@@ -1349,129 +1350,134 @@
 msgid "vector size cannot be NA"
 msgstr "la taille de vecteur ne peut être NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "la taille de vecteur ne peut être NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "la longueur d'un vecteur ne peut être infinie"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "la longueur choisie pour le vecteur est trop grande"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "l'utilisation de l'environnement NULL n'est plus autorisée"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "l'argument ne peut pas être une fonction"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "l'objet de remplacement n'est pas un environnement"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' doit être un environnement"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "l'argument n'est pas un environnment"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "l'environnement vide n'a pas de parent"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "impossible de fixer le parent de l'environnement vide"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "impossible de fixer le parent de l'environnement vide"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "impossible de fixer le parent de l'environnement vide"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' n'est pas un environnement"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "impossible d'écrire vers cette connexion"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "spécification de '%s' incorrecte"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "l'argument 'fill' négatif ou nul sera ignoré"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "argument %d (type '%s') pas encore traité par cat"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "vector : impossible de créer un vecteur de mode '%s'"
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "impossible de modifier la longueur d'un objet qui n'est pas un vecteur"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "argument incorrect"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "valeur incorrecte"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' utilisé dans un contexte incorrect"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "multiples valeurs par défaut dans 'switch' : '%s' et ''%s'"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "'EXPR' est manquant"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR doit être un vecteur de longueur 1"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
@@ -1480,103 +1486,117 @@
 "EXPR est une variable \"factor\", elle sera traitée comme des entiers.\n"
 " Pensez à utiliser plutôt '%s'."
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+#, fuzzy
+msgid "'switch' with no alternatives"
+msgstr "EXPR numérique requise dans 'switch' sans alternatives nommées"
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d argument passés à '%s' qui en exige %d"
 msgstr[1] "%d arguments passés à '%s' qui en exige %d"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s' exige un vecteur de caractères comme argument"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "chaîne de charactères multioctets incorrecte %d"
 
-#: src/main/character.c:203
-#, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:159
+#, fuzzy, c-format
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 "nombre de caractères impossible à calculer pour l'élément %d dans l'encodage "
 "\"bytes\""
 
-#: src/main/character.c:232
-#, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:188
+#, fuzzy, c-format
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 "largeur impossible à calculer pour l'élément %d dans l'encodage \"bytes\""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "extraction d'une chaîne d'un objet ne contenant pas des caractères"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr "arguments de type chaîne incorrects"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "les noms ne sont pas des chaînes de caractères"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "la chaîne de remplacement n'est pas un objet constitué de caractères"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "le premier argument doit être un vecteur de caractères"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abbreviate utilisé avec des caractères non ASCII"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "les noms ne sont pas des chaînes de caractères"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "chaîne de charactères multioctets incorrecte %d"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "l'argument n'est pas une chaîne de caractères"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "spécification de plage décroissante ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "spécification de plage décroissante ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "chaîne de charactères UTF-8 'old' incorrecte"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "chaîne de charactères multioctets 'old' incorrecte"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "chaîne de charactères uTF-8 'new' incorrecte"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "chaîne de charactères multioctets 'new' incorrecte"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old' est plus long que 'new'"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "chaîne de caractères multioctets %d incorrecte en entrée"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim() exige un vecteur de caractères comme argument"
 
@@ -1588,7 +1608,7 @@
 msgid "applies only to lists and vectors"
 msgstr "ne s'applique qu'à des listes ou des vecteurs"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "NAs introduits lors de la conversion automatique"
 
@@ -1597,7 +1617,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "NAs introduits lors de la conversion automatique"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "les parties imaginaires sont perdues lors de la conversion automatique"
 
@@ -1607,121 +1627,117 @@
 "valeurs hors plages traitées comme 0 lors de la conversion automatique en "
 "type raw"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "données incorrectes de mode '%s' (trop courtes)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr ""
 "l'objet 'pairlist' ne peut être converti automatiquement en un type '%s'"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "l'objet (list) ne peut être converti automatiquement en un type '%s'"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "l'objet (symbol) ne peut être converti automatiquement en un type '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 "pas de méthode pour convertir automatiquement cette classe S4 en vecteur"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "les environnements ne peuvent être convertis vers d'autres types"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "tentative de conversion automatique d'autre chose qu'un facteur"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "liste d'arguments attendue"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "environnement incorrect"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "l'argument doit avoir une longueur d'au moins 1"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "corps de fonction incorrect"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "argument de longueur nulle incorrect"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "liste d'arguments incorrect"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "type \"single\" non implémenté dans R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "prédicat non implémenté"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr ""
 "%s() appliqué à un objet de type '%s' qui n'est ni une liste, ni un vecteur"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "méthode par défaut indisponible pour le type '%s'"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "'name' est manquant"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "le premier argument doit être une chaîne de caractères"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what' doit être une chaîne de caractères ou une fonction"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'text' doit être une chaîne de caractères"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr "'args' doit être une liste ou une expression"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' doit être une liste"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' doit être un environnement"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "environnement spécifié incorrect"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "class(x) est mise à NULL ; le résultat ne sera plus un objet S4"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1730,7 +1746,7 @@
 "class(x) est une chaîne multiple (\"%s\", \"%s\", ...) ; le résultat ne sera "
 "plus un objet S4"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1739,12 +1755,12 @@
 "class(x) changée vers \"%s\" et l'attribut devient NULL ; le résultat ne "
 "sera plus un objet S4"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr ""
 "objet de remplacement incorrect, doit être de classe chaîne de caractères"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1752,7 +1768,7 @@
 "\"%s\" peut être attribué comme classe seulement si l'objet est de ce type ; "
 "type trouvé : \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1761,39 +1777,39 @@
 "impossible de définir la classe de l'objet comme matrice si son attribut de "
 "dimension n'est pas de longueur 2 (il est de %d)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "impossible de définir la classe de l'objet comme tableau, à moins que "
 "l'attribut de dimension ait une longueur > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value' doit être une chaîne de caractères non nulle"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 "la modification du mode de stockage d'un objet 'factor' n'est pas autorisée"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "opérateur complexe unitaire incorrect"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "opération complexe non implémentée"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "argument non numérique pour une fonction"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "coefficient de polynôme incorrect"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "le code de recherche de zéro a échoué"
 
@@ -1805,7 +1821,7 @@
 msgid "connection not found"
 msgstr "connexion non trouvée"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "connexion incorrecte"
 
@@ -1814,9 +1830,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "fermeture de la connexion inutilisée %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "conversion automatique indisponible de '%s' à '%s'"
@@ -1899,8 +1915,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "bloc trop large fourni"
 
@@ -1928,8 +1944,8 @@
 msgstr "l'allocation d'une connexion fifo a échoué"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "seul le premier élément de l'argument 'description' est utilisé"
 
@@ -1941,14 +1957,14 @@
 "du premier"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "impossible d'ouvrir la connexion"
@@ -2018,7 +2034,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "l'allocation d'une connexion bzfile a échoué"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "impossible d'initialiser le décodeur lzma, erreur %d"
@@ -2040,12 +2056,12 @@
 "ceci est un fichier compressé par %s pour lequel cette version de R ne "
 "propose pas de support"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "l'allocation de mémoire pour une copie dans le presse-papier a échoué"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "presse-papier impossible à ouvrir ou ne contenant aucun texte"
 
@@ -2155,268 +2171,267 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' n'est pas une connexion en sortie"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr ""
-"les connecteurs logiciels (sockets) ne sont pas disponibles sur ce système"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' n'est pas une connexion"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "impossible d'ouvrir les connexions standards"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "la connexion est déjà ouverte"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "valeur 'rw' inconnue"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "impossible de fermer les connexions standards"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr "impossible de fermer la connexion 'output' en sortie"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr "impossible de fermer la connexion 'message' en sortie"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "connexion non ouverte"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr "ligne plus longue que la taille du tampon"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "impossible de lire depuis la connexion"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "impossible d'allouer un tampon dans readLines"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr "la ligne %d contient un caractère nul"
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "ligne finale incomplète trouvée dans '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "trop peu de lignes lues par readLines"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "la chaîne de caractères incomplète à la fin du fichier a été éliminée"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr "terminaison 'null' non trouvée : coupure de la chaîne à 10000 octets"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "lecture seulement possible pour une connexion binaire"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr ""
 "changement de taille indisponible pour des vecteurs de nombres complexes"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "la taille %d est inconnue sur cette machine"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw est toujours de taille 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr "'signed = FALSE' n'est autorisé que pour des entiers de taille 1 ou 2"
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x' n'est pas un type de vecteur atomique"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "l'écriture est seulement possible vers une connexion binaire"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "seuls 2^31-1 octets peuvent être écrits dans un vecteur 'raw'"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
 "seuls 2^31-1 octets peuvent être écrits lors d'un appel unique writeBin()"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "problème lors de l'écriture vers la connexion"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "changement de taille indisponible pour des vecteurs de type raw"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "entrée UTF-8 incorrecte dans readChar()"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 "seuls des octets dand un environnement linguistique différent de UTF-8 MBCS "
 "peuvent être lus"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "'object' est trop court"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar : demande de plus de caractères que ceux disponibles dans la "
 "chaîne - comblement avec des zéros"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar : demande de plus de caractères que ceux disponibles dans la "
 "chaîne - comblement avec des 0"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr "nombre maximum de lignes en 'pushback' dépassé"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr "impossible d'allouer de l'espace pour pushBack"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "repoussage seulement possible sur des connexions ouvertes en lecture"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "repoussage seulement possible sur des connexions en mode texte"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "la pile de la sortie par défaut est pleine"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "impossible de diriger la sortie vers stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "aucune sortie par défaut à supprimer"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr "pas de connexion NA"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "pas de connexion %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "nsl() ne fonctionne pas sur cette architecture"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 "file(\"\") accepte seulement open = \"w+\" et open = \"w+b\" : utilisation "
 "du premier"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "ICU ne fonctionne pas dans cette compilation"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "le corps du fichier n'a pas le nombre magique de gzip"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "le corps du fichier n'a pas une entête gzip correcte"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "erreur d'écriture lors du vidage de tampon d'une connexion 'gzcon'"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "erreur CRC %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "erreur d'écriture sur une connexion 'gzcon'"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' doit être une valeur parmi 0 ... 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression' doit être TRUE ou FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x' doit être TRUE ou FALSE"
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr "ceci est déjà une connexion 'gzcon'"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr ""
 "seulement les connexions binaires en lecture ou écriture sont utilisables"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 "l'utilisation d'un 'fichier' en mode texte peut ne pas fonctionner "
 "correctement"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
@@ -2424,76 +2439,72 @@
 "impossible de créer une connexion 'gzcon' à partir d'une textConnection "
 "ouverte en écriture ; Essayez peut-être une rawConnection"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "l'allocation d'une connexion 'gzcon' a échoué"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "ceci n'est pas une liste de connecteurs logiciels (sockets)"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "mauvais indicateurs d'écriture"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "ceci n'est pas un connecteur logiciel (socket)"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "mode de compression inconnu, considéré comme non compressé"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr "erreur d'allocation d'une connexion %s"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 "aucune boucle d'où sortir (break/next) ; saut vers le niveau le plus haut"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "aucune fonction d'où sortir ; saut vers le niveau le plus haut"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "le contexte visé n'est pas dans la pile"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "il n'y a pas autant de trames dans la pile"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "valeurs de 'n' strictement positives seules autorisées"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "aucune function à relancer"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "le nombre de contextes doit être positif"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "pas de contexte à interroger pour l'explorateur"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "il n'y a pas autant d'appels actifs à l'explorateur"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "il n'y a pas autant de fonctions dans la pile de trame"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "erreur interne dans 'do_sys'"
 
@@ -2501,37 +2512,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "Dépassement d'entier dans 'cumsum' ; utiliser 'cumsum(as.numeric(.))'"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr "'cummax' non défini pour les nombres complexes"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr "'cummin' non défini pour les nombres complexes"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "fonction cumxxx inconnue"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "problème lors de la détermination du fuseau horaire"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "impossible de définir le fuseau horaire sur ce système"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "problème lors de la désaffectation d'un fuseau horaire"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "composante de longueur nulle dans une structure \"POSIXlt\" non vide"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "impossible d'allouer de la mémoire pour 'read.dcf'"
 
@@ -2547,11 +2558,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "La ligne commençant par '%s...' est incorrecte !"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "l'argument doit être une fermeture (closure)"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "l'argument doit être une fonction"
 
@@ -2560,7 +2567,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x' doit être TRUE ou FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "l'argument ne peut pas être une fonction"
 
@@ -2580,62 +2587,62 @@
 "'tracemem' est inutilisable pour des objets de type référence lâche ou "
 "pointeur externe"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R n'a pas été compilé pour supporter le profilage de mémoire"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "trop peu d'arguments"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "'cutoff' incorrect pour 'deparse', utilisation de la valeur par défaut"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 "la reconstruction de code (deparse) d'un objet S4 n'est pas forcément "
 "source()able"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "deparse est peut-être incomplet"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 "reconstruction de code (deparse) pas forcément source()able dans R < 2.7.0"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "'what' doit être une chaîne de caractères ou une fonction"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "écriture de trop peu de caractères"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "arguments caractères attendus"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr "argument de longueur nulle"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts' doit être un petit entier positif ou nul"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "objet '%s' introuvable"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "expression de fonction mal structurée"
 
@@ -2647,16 +2654,16 @@
 msgid "no active or default device"
 msgstr "pas de périphérique actif ou par défaut"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "trop de périphériques ouverts"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr ""
 "insuffisamment de mémoire à allouer au périphérique (dans GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "Tapez <Entrée> pour voir le graphique suivant :"
 
@@ -2746,7 +2753,7 @@
 msgid "too many arguments, sorry"
 msgstr "trop d'arguments, désolé"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "état des graphiques incorrect"
 
@@ -2900,7 +2907,7 @@
 msgid "invalid argument to edit()"
 msgstr "argument incorrect pour edit()"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "ouverture de fichier impossible"
 
@@ -2964,12 +2971,12 @@
 msgstr "aucun système graphiques à enregistrer"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "fin de ligne incorrecte"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "jonction de ligne incorrecte"
 
@@ -2998,83 +3005,97 @@
 msgid "raster capture is not available for this device"
 msgstr "capture en mode point (raster) non disponible pour ce périphérique"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 "la police de caractère %d n'est pas disponible pour la famille de fontes '%s'"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "aucun périphérique graphiques actif"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "valeur pch '%d' incorrecte dans cet environnement linguistique"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "valeur '%d' de pch non implémentée"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "étendue de l'axe incorrecte [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "étendue de l'axe infinie [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.) : nouveau *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.) : nouveau *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr "liste de retraçage des affichages incomplète"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr "liste de périphériques d'affichages incorrecte"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "l'argument 'expr' doit être une expression"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "l'argument 'list' doit être une liste"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "l'argument 'env' doit être un environnement"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "caractère multioctet incorrect dans pch=\"c\""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "nombre hexadécimal incorrect dans 'color' ou 'lty'"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "type de ligne incorrect : doit être de longueur 2, 4, 6 ou 8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "type de ligne incorrect : les zéros ne sont pas autorisés"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "type de ligne incorrect"
 
@@ -3083,7 +3104,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "impossible de changer la valeur d'un lien verrouillé pour '%s'"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "impossible d'ajouter des liens à un environnement verrouillé"
 
@@ -3101,433 +3122,429 @@
 "impossible de délier dans l'environnement de base (pas implémenté "
 "actuellement)"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "impossible d'éliminer les liens d'un environnement verrouillé"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "l'argument à '%s' n'est pas un environnment"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "la liste ... ne contient pas %d éléments"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d utilisé dans un mauvais contexte, aucun ... où chercher"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "impossible de trouver la fonction \"%s\""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "impossible d'assigner des valeurs dans l'environnement vide"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "impossible d'affecter des variables à cette base de données"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "impossible d'ajouter des liens de '%s' à l'environnement de base"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "seulement le premier élément est utilisé comme nom de variable"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "le premier argument doit être une liste nommée"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "names(x) doit être un vecteur de caractères de la même longueur que x"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr "l'argument 'envir' doit être un environnement"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "impossible d'effacer des variables de l'espace de noms de base"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "impossible d'éliminer des variables de l'environnement de base"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "impossible d'éliminer des variables de l'environnement vide"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "impossible d'éliminer des variables de cette base de données"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "objet '%s' de mode '%s' introuvable"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "nom incorrect à la position %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "le second argument doit être un environnement"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "mauvaise longueur pour l'argument '%s'"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "utilisation incorrecte de 'missing'"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' peut seulement être utilisé pour des arguments"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos' doit être un entier"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "tous les éléments de la liste doivent être nommés"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr ""
 "'attach' fonctionne seulement pour des listes, des tableaux de données ou "
 "des environnements"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "il est interdit de détacher \"package:base\""
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "l'argument doit être un environnement"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "les arguments doivent être symboliques"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "aucun environnement fermant (enclosing)"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "ancun élément du nom de \"%s\" dans la liste de recherche"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "l'utilisation de 'as.environment(NULL)' n'est plus autorisée"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "les objets S4 n'étendent pas la classe \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "objet incorrect pour 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "ceci n'est pas un environnement"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "ceci n'est pas un symbole"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "aucun lien pour \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "ceci n'est pas une fonction"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "le symbole a déjà un lien régulier"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "impossible de changer un lien actif si le lien est verrouillé"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "opération inconnue"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "impossible d'éliminer un lien verrouillé"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "impossible d'éliminer un lien actif"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr "espace de nom erroné"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr "espace de noms déjà enregistré"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr "espace de noms non enregistré"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "argument d'environnement 'import' erroné"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "argument d'environnement 'export' erroné"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "les longueurs de 'import' et 'export' doivent correspondre"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "le symbole exporté '%s' n'a pas de valeur associée"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "encodage inconnu : %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "caractère nul au milieu de la chaîne : '%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "interruptions suspendues ; le signal est ignoré"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "option incorrecte \"warning.expression\""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(converti depuis l'avis) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "Avis : %s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "Avis dans %s : %s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "messages d'avis perdus\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Message d'avis :\n"
 msgstr[1] "Messages d'avis :\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "Il y a eu %d avis (utilisez warnings() pour les visionner)\n"
 msgstr[1] "Il y a eu %d avis (utilisez warnings() pour les visionner)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 "Il y a eu %d avis ou plus (utilisez warnings() pour voir les %d premiers)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "Erreur pendant l'emballage (wrapup) : "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Erreur dans "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, fuzzy, c-format
 msgid "Error in %s (from %s) : "
 msgstr " (depuis %s) : "
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "Erreur dans "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Erreur : "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "De plus : "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "option \"error\" incorrecte\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Exécution arrêtée\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep' doit être une chaîne de caractères"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [chaîne incorrecte dans stop(.)]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [chaîne incorrecte dans warning(.)]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "nombre d'arguments incorrect pour \"%s\""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "fonction non implémentée dans %s"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "nombre d'arguments incorrect"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "type de l'argument incorrect"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "longueurs incompatibles des séries temporelles / vecteurs"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "arguments incompatibles"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "erreur inconnue (veuillez signaler ceci aux développeurs !)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "conversion automatique d'entier approximative"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "avis inconnu (veuillez signaler ceci aux développeurs !)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "Aucun function d'où sortir, branchement vers le niveau le plus haut"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "niveau le plus haut incohérent ?"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "mauvais manipulateur de données"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "le message d'erreur n'est pas une chaîne de caractères"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 "manipulateur de données ou pile de redémarrage incohérent dans l'ancien "
 "redémarrage"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "mauvais message d'erreur"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "mauvais redémarrage"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "le redémarrage n'est pas dans la pile"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "vous n'êtes pas dans un contexte 'try'"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "le message d'erreur doit être une chaîne de caractères"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr "fichiers source évités par Rprof ; veuillez augmenter '%s'"
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof : impossible d'ouvrir le fichier '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "'le profilage de R n'est pas disponible sur ce système"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
@@ -3535,264 +3552,274 @@
 "la promesse est déjà en cours d'évaluation : référence récursive d'argument "
 "par défaut ou problème antérieur ?"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "redémarrage de l'évaluation d'une promesse interrompue"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 "évaluations trop profondément imbriquées : récursion infinie / "
 "options(expressions=) ?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "argument manquant, sans valeur associée par défaut"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "tentative d'appliquer un objet qui n'est pas une fonction"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s à %s#%d :"
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "l'argument %d est vide"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 "impossible de trouver le symbole \"%s\" dans l'environnement de la fonction "
 "générique"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "le symbole \"%s\" n'est pas dans l'environnement de la méthode"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "la condition a une longueur > 1 et seul le premier élément est utilisé"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "valeur manquante là où TRUE / FALSE est requis"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "l'argument n'est pas interprétable comme une valeur logique"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "l'argument est de longueur nulle"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "variable de boucle non symbolique"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "séquence de boucle for() incorrecte"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "les renvois multi-arguments sont inderdits"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "partie gauche de l'assignation (NULL) incorrect"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "la cible de l'assignation est un objet n'appartenant pas au langage"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "nom trop long dans '%s'"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr ""
 "impossible d'effectuer des assignations complexes dans l'espace de noms de "
 "base"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr ""
 "impossible d'effectuer des assignations complexes dans l'environnement de "
 "base"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "fonction incorrecte dans un assignation complexe"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "membre gauche de l'assignation (do_set) incorrect"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "'%s' est manquant"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "liste d'arguments formels incorrecte pour \"function\""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "argument '%s' incorrect de type '%s'"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "argument numérique 'envir' n'ayant une longueur unitaire"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "redémarrages non supportés dans 'eval'"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' appelé en dehors d'une fermeture (closure)"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "la valeur dans '...' n'est pas une promesse (promise)"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Méthodes incompatibles (\"%s\", \"%s\") pour \"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "erreur de branchement de méthode du groupe"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "\"%s\" n'est pas une fonction %s"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "pile de noeuds débordée vers le haut"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "pile d'entiers débordée vers le haut"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr "mauvais code d'opération (opcode)"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "type %s incorrect dans 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "incohérence de version de pseudo-code ; utilisation de eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "la version du pseudo-code est trop longue"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "la version du pseudo-code est trop récente"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "incohérence de versions du pseudo-code"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "séquence d'arguments incorrecte dans une boucle for"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "pas de fonction .Internal '%s'"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "mauvaise fonction"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "ce n'est pas une function BUILTIN"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+#, fuzzy
+msgid "bad numeric 'switch' offsets"
+msgstr "valeur de décalage numérique erronée"
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr "EXPR numérique requise dans 'switch' sans alternatives nommées"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+#, fuzzy
+msgid "bad character 'switch' offsets"
+msgstr "valeur de décalage caractère erronée"
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "impossible de trouver l'indice pour l'adresse de code traitée"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr "corps (body) non valide"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "symbole non valide"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "l'argument n'est pas un objet pseudo-code"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "mauvais nom de fichier"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "impossible d'ouvrir 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file' doit être une chaîne de caractères non vide"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' doit être une valeur logique"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr "le tampon des constantes doit être un vecteur générique"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr "nombre de constantes erroné"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "temporisation de profilage en utilisation"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "déjà en train de profiler du pseudo-code"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "le démarrage d'une temporisation de profilage a échoué"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "profilage d'autre chose que du pseudo-code"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "ICU ne fonctionne pas dans cette compilation"
@@ -3810,15 +3837,15 @@
 msgid "this graphics device does not support event handling"
 msgstr "le périphérique graphique ne supporte pas les événements graphiques"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "invite de commande incorrecte (prompt)"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "l'utilisation récursive de 'getGraphicsEvent' n'est pas permise"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "aucun manipulateur graphiques (handler) défini"
 
@@ -4020,7 +4047,7 @@
 msgstr "expression régulière incorrecte, à cause de '%s'"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "la chaîne de caractères entrée %d est incorrecte comme encodage UTF-8"
@@ -4117,27 +4144,26 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "les routines internet ne sont pas accessibles dans ce module"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "les routines internet ne peuvent pas être chargées"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "mauvaise valeur"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr ""
 "les routines de connecteurs logiciels (sockets) ne peuvent pas être chargées"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "tentative de changer l'attribut 'comment' à une valeur incorrecte"
+
 #: src/main/lapack.c:39
 msgid "LAPACK routines cannot be accessed in module"
 msgstr "les routines LAPACK ne sont pas accessibles dans le module"
@@ -4146,40 +4172,40 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "les routines LAPACK ne peuvent pas être chargées"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 "ces opérations ne sont possibles que pour des types numériques, logiques ou "
 "complexes"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "opération binaire sur des tableaux de tailles non conformes"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "séries temporelles de tailles non conformes"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "l'opérateur '%s' nécessite deux arguments"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "type 'x' incorrect dans 'x %s y'"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "type 'y' incorrect dans 'x %s y'"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "L'opération unaire `!' est appelée avec deux arguments"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "conversion automatique d'un argument de type '%s' en booléen (logical)"
@@ -4188,67 +4214,81 @@
 msgid "dummy - do not translate"
 msgstr "dummy - ne pas traduire"
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "Erreur pendant l'emballage (wrapup) : "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Exécution arrêtée\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "Erreur : pile C débordée vers le haut\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "impossible d'ouvrir le package 'base'\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "impossible de récupérer les données sauvées dans %s\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Pendant le démarrage - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "impossible d'ouvrir le fichier en lecture"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "impossible de sortir de l'explorateur"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "réponse attendue parmi \"yes\", \"no\", \"ask\" ou \"default\""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "save=\"ask\" en usage non interactif : valeur par défaut de la ligne de "
 "commande utilisée"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "valeur de 'save' non reconnue"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "'status' incorrect, 0 est utilisé"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "'runLast' incorrect, FALSE est utilisé"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 "impossible d'assigner de l'espace pour l'élément de rappel (callback) de "
 "niveau le plus haut"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "indice négatif passé à R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 "messages d'avertissement du rappel (callback) de la tâche de niveau le plus "
 "haut '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "la tâche de niveau le plus haut n'a pas renvoyé une valeur logique"
 
@@ -4294,102 +4334,102 @@
 msgstr[0] "argument inutilisé %s"
 msgstr[1] "arguments inutilisés %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "ne peut référencer des objets qu'avec une référence faible / finalisée"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "le \"finalisateur\" doit être une fonction ou NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "ce n'est pas une référence faible"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "le premier argument doit être un environnement ou un pointeur externe"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "le second argument doit être une fonction"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "le troisième argument doit être 'TRUE' ou 'FALSE'"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "vecteurs de mémoire épuisés (limite atteinte ?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "mémoires 'cons' épuisées (limite atteinte ?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "mémoire épuisée (limite atteinte ?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "impossible d'allouer un bloc de mémoire de taille %0.f Tb"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "impossible d'allouer un bloc de mémoire de taille %0.1f Go"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr "vecteur trop long"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "longueur de vecteurs négative non permise"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "impossible d'allouer un vecteur de longueur %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "type / longueur incorrect (%s / %d) dans l'allocation de vecteur"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "impossible d'allouer un vecteur de taille %0.1f Go"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "impossible d'allouer un vecteur de taille %0.1f Mo"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "impossible d'allouer un vecteur de taille %0.f Ko"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect() : débordement vers le haut de protection de pile"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect() : seulement %d éléments protégés"
 msgstr[1] "unprotect() : seulement %d éléments protégés"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr : pointeur non trouvé"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
@@ -4400,62 +4440,67 @@
 "R_Reprotect : seulement %d éléments protégés, impossible de reprotéger "
 "l'indice %d"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "'Calloc' ne peut allouer de la mémoire (%.0f de %u octets)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "'Realloc' ne peut réallouer de la mémoire (%.0f octets)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "le renvoi d'un pointeur sur un vecteur n'est pas sûr"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr "tentative de modification de l'index %lu/%lu dans SET_STRING_ELT"
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr "tentative de modification de l'index %lu/%lu dans SET_VECTOR_ELT"
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "mauvaise valeur"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "le profilage de la mémoire n'est pas disponible sur ce système"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: impossible d'ouvrir le fichier '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr "les vecteurs longs ne sont pas encore supportés : %s:%d"
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "argument chaîne de caractères requis"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "une telle fonction primitive n'existe pas"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "tentative d'utilisation de nom de variable de longueur nulle"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "les noms de variables sont limités à %d octets"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "argument .Internal() incorrect"
 
@@ -4496,104 +4541,104 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "pas de méthode pour '%s' applicable pour un objet de classe \"%s\""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod' appelé en dehors d'une fonction"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod' appelé depuis une fonction anonyme"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 "aucun appel générique trouvé : est-ce qu'une méthode a été appelée "
 "directement ?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' n'est pas une fonction, mais est de type %d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "argument ... incorrect"
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "objet non spécifié"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "fonction générique non spécifiée"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "argument générique incorrect pour 'NextMethod'"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "argument 'group' incorrect découvert dans 'NextMethod'"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr "mauvaise valeur pour .Method"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "Méthodes incompatibles et ignorées"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "aucune méthode ne peut être invoquée"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "impossible de déclasser un environnement"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "impossible de déclasser un pointeur externe"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' doit être un vecteur de chaîne de caractères"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which' doit être un vecteur logique de longueur 1"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "utilisez 'is()' à la place de 'inherits()' pour des objets S4"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 "impossible de trouver un environnement correct ; Veuillez reporter ceci !"
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'onOff' doit être TRUE ou FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "impossible de trouver une version non générique de la fonction \"%s\""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 "'standardGeneric' appelé sans que le dispatcheur de 'methods' ne soit activé "
 "(sera ignoré)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 "l'argument à 'standardGeneric' doit être une chaîne de caractères non vide"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4602,7 +4647,7 @@
 "l'appel à standardGeneric(\"%s\") n'est apparemment pas fait à partir du "
 "corps d'une fonction"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4611,11 +4656,11 @@
 "code de méthodes primitives incorrect (\"%s\") : doit être \"clear\", \"reset"
 "\", \"set\", ou \"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "object incorrect : doit être une fonction primitive"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4624,21 +4669,21 @@
 "la définition formelle de la primitive générique doit être un objet de type "
 "fonction (le type est '%s')"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 "l'objet renvoyé comme fonction générique \"%s\" ne semble pas en être une"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "opération primitive incorrecte fournie pour le dispatcheur"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "erreur de branchement de méthode"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4647,90 +4692,95 @@
 "la fonction primitive \"%s\" est appliquée pour les méthodes mais aucune "
 "fonction générique n'a été fournie"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 "la macro de niveau C MAKE_CLASS est appelée avec un pointeur de chaîne NULL"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "impossible de charger les fontes Hershey "
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "R_getClassDef(.) appelée avec un pointeur de chaîne NULL"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 "la macro de niveau C NEW est appelée avec un pointeur de définition de "
 "classe NULL"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 "essai de génération d'un objet à partir d'une classe virtuelle (\"%s\")"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "l'objet de classe \"%s\" ne correspond pas à un objet S3 correct"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "liste d'options corrompue"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "largeur d'impression incorrecte, utilisation de 80"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "nombre de chiffres à imprimés incorrect, utilisation de 7"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr "'deparse.cutoff' incorrect, utilisation de 60"
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "valeur non autorisée pour \"device.ask.default\", utilisation de FALSE"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "l'argument liste n'a pas de noms valides"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "paramètre 'width' incorrect, valeurs autorisées %d...%d"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "paramètre 'digits' incorrect, valeurs autorisées %d...%d"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "paramètre 'expressions' incorrect, valeurs permises %d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "valeur incorrecte pour '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec' doit être un seul caractère"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" est remplacé par \"device.ask.default\""
 
@@ -4758,11 +4808,16 @@
 msgid "first argument must be atomic"
 msgstr "le premier argument doit être atomique"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec' doit être un seul caractère"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "Mode impossible ( x )"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "arguments vectoriels atomiques uniquement"
 
@@ -4770,215 +4825,198 @@
 msgid "invalid filename specification"
 msgstr "choix de nom de fichier incorrect"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "erreur en écriture lors de l'ajout a un fichier"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "rien à ajouter à"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "argument 'filename' incorrect"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "impossible de créer le fichier '%s', à cause de '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "premier nom de fichier incorrect"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "impossible d'effacer le fichier '%s', à cause de '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "second nom de fichier incorrect"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "rien à lier"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 "les liens symboliques ne sont pas supportés sur cette version de Windows"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 "impossible de créer un lien symbolique de '%ls' vers '%ls', à cause de '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 "impossible de créer un lien symbolique de '%s' vers '%s', à cause de '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr "les liens symboliques ne sont pas supportés sur cette plateforme"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr ""
 "impossible de créer un lien symbolique de '%ls' vers '%ls', à cause de '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr ""
 "impossible de créer un lien symbolique de '%s' vers '%s', à cause de '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr "les liens matériels ne sont pas supportés sur cette architecture"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "'from' et 'to' sont de longueurs différentes"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "nom de 'from' expansé trop long"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "nom de 'to' expansé trop long"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "impossible de renommer le fichier '%s' en '%s', à cause de '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "expression régulière 'pattern' incorrecte"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "incapable de localiser R home"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "nom de fichier trop long"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "condition interne, plus de mémoire disponible"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "erreur de lecture sur '%s'"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "changer 'LC_NUMERIC' peut résulter en un fonctionnement étrange de R"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr "LC_MESSAGES existe sous Windows mais n'y est pas opérationel"
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 "la requête OS pour spécifier la localisation à \"%s\" n'a pas pu être honorée"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' doit être un vecteur de caractères de longueur 1"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "nsl() est incapable de résoudre le nom de la machine hote '%s'"
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "format inconnu renvoyé par la fonction C 'gethostbyname'"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "nsl() ne fonctionne pas sur cette architecture"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "impossible de créer le répertoire '%s', à cause de '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls' existe déjà"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "impossible de créer le répertoire '%ls', à cause de '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr "imbrication trop profonde"
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr "chemin trop long"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "problème lors de la création du répertoire %ls: %s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "problème lors de la lecture du répertoire %ls: %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr "chemin trop long"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr "problème lors de la copie de %ls vers %ls: %s"
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr "problème lors de la création du répertoire %s: %s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr "problème lors de la lecture du répertoire %s: %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "problème lors de la copie de %s vers %s: %s"
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode' doit être de longueur unitaire ou plus"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "support de l'OS insuffisant sur cette plateforme"
 
@@ -5023,69 +5061,74 @@
 msgid "Metric information not available for this family/device"
 msgstr "Information de métrique indisponible pour cette famille / périphérique"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "choix de 'na.print' incorrect"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "étiquettes de lignes incorrectes"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "étiquettes de colonne incorrectes"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ""
 "l'argument passé à la fonction .Internal(print.function(.)) n'est pas une "
 "fonction"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' doit être un entier positif ou nul"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "argument interne 'tryS4' incorrect"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "débordement vers le haut du tampon d'entrée à la ligne %d"
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr "taille de caractère incorrecte dans 'dblepr'"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr "taille de caractère incorrecte dans 'intpr'"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr "taille de caractère incorrecte dans 'realpr'"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr "erreur d'affectation mémoire dans 'realpr'"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "la procédure BLAS/LAPACK '%6s' a produit le code d'erreur %d"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "trop peu d'étiquettes de lignes"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "trop peu d'étiquettes de colonnes"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] " [ getOption(\"max.print\") est atteint -- ligne %d omise ]\n"
 msgstr[1] " [ getOption(\"max.print\") est atteint -- %d lignes omises ]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "wchar_t ne devrait pas être Unicode sur cette plateforme"
 
@@ -5093,48 +5136,48 @@
 msgid "argument is not a numeric vector"
 msgstr "l'argument n'est pas un vecteur numérique"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "arguments incorrects"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "production de NAs"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "NA dans le vecteur de probabilités"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "probabilité négative ou nulle"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "trop peu de probabilités strictement positives"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "impossible de prendre un échantillon plus grand que la population lorsque "
 "'replace = FALSE'"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "nombre de probabilités incorrect"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 "n >= 2^31, replace = FALSE est seulement supporté sur des plateformes 64-bit"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr "l'argument doit être un vecteur de caractères de longueur 1"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
@@ -5142,318 +5185,318 @@
 "l'argument doit être une chaîne de caractères de longueur 1\n"
 "seul le premier élément est utilisé"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr "l'argument 'x' doit être un vecteur raw"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "l'argument 'multiple' doit être TRUE ou FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr "l'argument 'shift' doit être un petit entier"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr "l'argument 'x' doit être un vecteur d'entiers"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "l'argument 'x' doit être raw, entier ou de type logique"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "l'argument 'x' doit être un multiple de %d long"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr "l'argument 'x' ne peut contenir de NAs"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr "chaîne de charactères UTF-8 incorrecte"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "comparaison (%d) possible seulement pour les types liste et atomique"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "comparaison interdite pour les expressions"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "comparaison de ces types non implémentée"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "comparaison incorrecte pour des valeurs complexes"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr "'a' et 'b' doivent être de même type"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "erreur de lecture"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "erreur de lecture I"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "erreur de lecture R"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "erreur de lecture C"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "erreur de lecture S"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "erreur de lecture"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "noeud non résolu pendant la restauration"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 "erreur de compatibilité de restauration - absence de compatibilité avec la "
 "version %d"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "mauvais type SEXP dans le fichier de données"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "incohérence de types"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "impossible de trouver le nom de la fonction interne \"%s\""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 "impossible de sauvegarder la position dans le fichier lors de la "
 "restauration des données"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 "impossible de restaurer la position dans le fichier lors de la restauration "
 "des données"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 "espace de noms de base perdu dans la version 1 des environnements de travail"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 "sauvegarde impossible des espaces de nom dans la version 1 des "
 "environnements de travail"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 "sauvegarde impossible de l'environnement avec des liens verrouillés / actifs "
 "dans la version 1 des environnements de travail"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 "sauvegarde impossible des références légères dans la version 1 des "
 "environnements de travail"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec appelé avec un type non vectoriel"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 "impossible de sauvegarder les objets en pseudo-code dans la version 1 des "
 "environnements de travail"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem : type %i inconnu"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec appelé avec un type non vectoriel"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 "lecture d'objets en pseudo-code impossible depuis la version 1 des "
 "environnements de travail"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem : type %i inconnu"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "mémoire saturée en lisant une chaîne ascii"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "erreur de lecture binaire"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "mémoire saturée en lisant une chaîne binaire"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "erreur de lecture d'une chaîne binaire"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "erreur xdr d'écriture de données d'entiers"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "erreur xdr de lecture de données d'entiers"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "erreur xdr d'écriture de données chaînes de caractères"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "erreur xdr d'écriture de données de réels"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "erreur xdr de lecture de données de réels"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "erreur xdr d'écriture de données de complexes"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "erreur xdr de lecture de données de complexes"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "échec d'écriture"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "fichier de restauration peut-être vide -- aucune donnée chargée"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 "fichier de restauration peut-être d'une version plus récente de R -- aucune "
 "donnée chargée"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "mauvais numéro magique de restauration de fichier (le fichier est peut être "
 "corrompu) -- aucune donnée chargée"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "le premier argument doit être un vecteur de caractères"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "liste nommée incorrecte"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 "'%s' semble être un objet S4 antérieur à la version 2.4.0 : veuillez le "
 "recréer"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "les données chargées ne sont pas sous forme de listes appariées"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "le premier argument doit être un nom de fichier"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "échec d'écriture XDR"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "échec de lecture XDR"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "impossible de sauvegarder les données -- impossible d'ouvrir %s : %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "sauvegarde impossible vers des connexions de version de format %d"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "connexion non ouverte en écriture"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "sauvegarde impossible en format XDR vers une connexion en mode texte"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "erreur d'écriture vers la connexion"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "connexion non ouverte en lecture"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr "lecture seulement possible pour une connexion binaire"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "pas d'entrée disponible"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5470,7 +5513,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan() attendait '%s' et a reçu '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr "trop d'éléments"
 
@@ -5478,7 +5521,7 @@
 msgid "empty 'what' specified"
 msgstr "'what' fourni vide"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "la ligne %d n'avait pas %d éléments"
@@ -5511,34 +5554,34 @@
 msgid "embedded nul(s) found in input"
 msgstr "caractère(s) 'nul' au milieu de l'entrée"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "tailles de variables facteur inégales"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "le résultat serait un vecteur trop long"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "l'argument est de longueur nulle"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "l'expression numérique a %d éléments : seul le premier est utilisé"
 msgstr[1] "l'expression numérique a %d éléments : seul le premier est utilisé"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "argument NA / NaN"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "type incorrect pour le second argument"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "tentative de dupliquer un objet de type '%s'"
@@ -5778,53 +5821,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "seuls les vecteurs atomiques peuvent être testés pourle tri"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' doit être TRUE ou FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "tri possible seulement pour les vecteurs atomiques"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "tri impossible pour les vecteurs de type raw"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr "NA ou indices infinis"
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr "indice  %ld en dehors des limites"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "indice NA"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "indice %d en dehors des limites"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "l'argument %d n'est pas un vecteur"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "arguments de tailles différentes"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "ties.method incorrecte pour rank() [ne devrait jamais se produire]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "intervalle de valeurs trop grand en 'x'"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5835,23 +5874,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "l'argument '%s = \"%s\"' sera ignoré"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "le premier argument doit être un vecteur"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "le second argument doit être une variable facteur"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr "La taille du groupe est 0 mais la taille des données est > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "la taille de données n'est pas un multiple de la variable découpée"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "la variable 'factor' a des niveaux erronés"
 
@@ -5910,38 +5949,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "la conversion automatique a changé la taille du vecteur à 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "format incorrect '%s' ; %s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "utilisez les formats %d ou %i pour les objets booléens"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "utilisez les formats %d, %i, %o, %x ou %X pour les objets entiers"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "utilisez les formats %f, %e, %g ou %a pour les objets numériques"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "utilisez le format %s pour les objets caractères"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "Troncature probable d'une chaîne à %d caractères"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "type non géré"
 
@@ -5949,262 +5988,258 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName : tampon trop petit"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "tentative d'extension d'autre chose qu'un vecteur"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 "affectation en dehors des limites vecteur / liste (extension de %d vers %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 "types (de %s a %s) incompatibles dans l'ajustement d'affectation de type"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "NAs interdits dans les affectations indicées"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "l'argument de remplacement est de longueur nulle"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 "le nombre d'objets à remplacer n'est pas multiple de la taille du "
 "remplacement"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "nombre d'indices incorrect sur la matrice"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 "types incompatibles (de %s à %s) dans l'affectation d'un sous-ensemble de "
 "matrice"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "nombre d'indices incorrect"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 "types (de %s à %s) incompatibles dans l'affectation d'un sous-ensemble de "
 "tableau"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "nombre incorrect d'indices pour l'affectation d'une liste"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "nombre incorrect d'indices pour l'affectation d'une liste"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs : nombre d'arguments incorrect"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 "le résultat a une longueur nulle et donc, ne peut être un objet de language"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 "[[<- défini pour des objets de type \"S4\" pour des sous-classes de "
 "l'environnement seulement"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "mauvais arguments pour une affectation d'environnement"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "plus d'éléments fournis que d'éléments à remplacer"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] avec indice manquant"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] indice en dehors des limites"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] nombre d'indices incorrect"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "types (de %s a %s) incompatibles dans l'affectation [["
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] indice (%d) en dehors des bornes"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "type '%s' d'indice incorrect"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "pas de méthode pour changer un sous-ensemble de cette classe S4"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "Conversion automatique de LHS en liste"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "tentative de sélectionner moins d'un élément"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "tentative de sélectionner plus d'un élément"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "erreur interne dans l'utilisation d'indiçage récursif"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "autre correspondance partielle de '%s' par rapport à '%s'"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "échec d'indexation récursive au niveau %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "un tel index n'existe pas au niveau %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "nombre de colonnes incorrect dans un indice de matrice"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "valeurs négatives interdites dans un indice de matrice"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(subscript) indice logique trop long"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "les indices négatifs ne peuvent être mélangés qu'à des 0"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr "indices subscript trop larges pour un R 32-bit"
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "aucun attribut 'dimnames' pour le tableau"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "indiçage d'un élément non vectoriel"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr "les dimensions excèderaient la taille maximale du tableau"
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "indiçage matriciel non géré pour ce type"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "indiçage matriciel non géré pour ce type"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "nombre de dimensions incorrect"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "aucun indice spécifié"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "cette classe S4 n'est pas indiçable"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "mauvais arguments pour extraire une partie d'un environnement"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "'type' (%s) de l'argument incorrect"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "dépassement d'entier - utiliser sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "erreur interne ('op = %d' in do_summary).\t Appelez un expert"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Dépassement d'entier - utiliser sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "aucun argument spécifié ; NA est renvoyé"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "aucun argument trouvé pour min ; Inf est renvoyé"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "aucun argument pour max ; -Inf est renvoyé"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "argument non numérique"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "l'argument 'which' doit être de type logique"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "pas d'arguments"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "type d'entrée incorrect"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr "un argument sera recyclé partiellement"
 
@@ -6217,8 +6252,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "l'encodage d'un nom de fichier ne peut être 'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "conversion de '%s' dans la page de code %d indisponible"
@@ -6251,99 +6286,100 @@
 msgid "no 'fileext'"
 msgstr "aucun 'fileext'"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "échec de parcours en mode aléatoire dans %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "argument de type incorrect"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "mauvaise longueur pour l'argument"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'Sys.setenv' indisponible sur ce système"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 "ce système ne peut effacer des variables d'environnement : la valeur est "
 "mise à \"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "'Sys.unsetenv' indisponible sur ce système"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "conversion de '%s' vers '%s' dans la page de code %d indisponible"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' doit être un vecteur de caractères"
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+#, fuzzy
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x' doit être une list de vecteurs NULL ou \"raw\""
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' doit être appelé sur un CHARSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 "la traduction de chaînes de caractères dans l'encodage \"bytes\" n'est pas "
 "permis"
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "erreur interne dans le code unz"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "conversion vers '%s' depuis la page de code %d indisponible"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr "valeur Unicode incorrecte %u"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr "impossible de créer 'R_TempDir'"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "spécification de R_SESSION_TMPDIR impossible"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr "impossible d'allouer 'R_TempDir'"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr "nom temporaire trop long"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "aucun nom de fichier temporaire disponible"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr "erreur d'affectation mémoire dans R_tmpnam2"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "'dirmark = TRUE' n'est pas supporté sur cette architecture"
 
@@ -6378,32 +6414,32 @@
 msgid "'nmax' must be positive"
 msgstr "'nmax' doit être strictement positif"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' exige des arguments vectoriels"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "argument n'est pas de mode caractère"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr "... utilisé dans une situation où il n'existe pas"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "la valeur dans '...' n'est pas une promesse (promise)"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "tableau de données non numériques dans rowsum"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "cela ne peut se produire"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' doit être un vecteur de caractères"
 
@@ -6411,142 +6447,142 @@
 msgid "object is not a matrix"
 msgstr "l'objet n'est pas une matrice"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "type %d est indisponible dans '%s'"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "type '%s' indisponible dans '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "type (%d) indisponible dans '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "étiquette incorrecte dans l'extraction du nom"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%d arguments passés à .Internal(%s) qui en exige %d"
 msgstr[1] "%d arguments passés à .Internal(%s) qui en exige %d"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d argument passés à '%s' qui en exige %d"
 msgstr[1] "%d arguments passés à '%s' qui en exige %d"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "le nom d'argument fourni '%s' ne correspond pas à '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "liste 'nthcdr' plus courte que %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr' exige une liste pour CDR"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' doit être TRUE ou FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' doit être TRUE ou FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "valeur manquante non permise"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "impossible de changer de répertoire de travail"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "un argument de type vecteur de caractères est attendu"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "chemin trop long"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "seul le premier caractère de 'quote' sera utilisé"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "un argument 'value' de type vecteur de caractères est attendu"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "'value' doit avoir une longueur strictement positive"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "entrée incorrecte '%s' dans 'utf8towcs'"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "chaîne de charactères multioctets incorrecte à '%s'"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "message d'erreur tronqué à 255 caractères"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "message d'avertissement tronqué à 255 caractères"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr "tous les arguments doivent être nommés"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "ICU ne fonctionne pas dans cette compilation"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr "'breaks' n'est pas trié"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "le vectuer long '%s' n'est pas supporté"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr "'eps.correct' doit être 0, 1, ou 2"
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr "'x' doit être un vecteur"
 
@@ -6607,7 +6643,7 @@
 msgid "There must be at least three control points"
 msgstr "Il doit y avoir au moins trois points de contrôle"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "erreur de protocole X11 : %s"
@@ -6632,7 +6668,7 @@
 "Erreur : X11 ne peut allouer d'autres couleurs.\n"
 "Essayez d'utiliser X11 avec colortype=\"pseudo.cube\" ou \"gray\"."
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6640,18 +6676,18 @@
 "impossible de trouver les polices X11\n"
 "Vérifiez que le chemin d'accès aux polices est correct."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr ""
 "X11 a utilisé la taille de police %d, alors que la taille demandée était %d"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "impossible de charger la police X11 %s, de face %d et de taille %d"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6659,193 +6695,199 @@
 "la semi-transparence n'est pas supportée sur ce périphérique : signalé "
 "seulement une fois par page"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 "Erreur d'entrée/sortie X11 lors de l'ouverture d'une connexion X11 vers '%s'"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "erreur d'E/S X11 fatale : enregistrez votre travail et fermez R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 "environnement linguistique indisponible dans Xlib : certaines opérations X "
 "fonctionneront en environnement linguistique C"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X ne peut fixer les modificateurs d'environnement linguistique"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "format PNG indisponible dans cette version de R"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "nom de fichier trop long dans un appel a png()"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "impossible d'ouvrir le fichier PNG '%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "format JPEG indisponible dans cette version de R"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "nom de fichier trop long dans un appel a jpeg()"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "impossible d'ouvrir le fichier JPEG '%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "format TIFF indisponible dans cette version de R"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "nom de fichier trop long dans un appel à tiff()"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "nom de fichier trop long dans un appel à bmp()"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "impossible d'ouvrir le fichier BMP '%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "impossible d'établir une connexion avec l'affichage X11 '%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 "l'argument 'display' est ignoré car un périphérique X11 est déjà ouvert"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 "les types basés sur cairo ne fonctionnent correctement qu'en mode TrueColor"
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "transparence indisponible dans jpeg() : fond blanc utilisé"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "impossible d'obtenir des informations pour l'affichage '%s'"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "impossible de créer une fenêtre X11"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "'width=%d, height=%d' ne sont probablement pas des valeurs en pixels"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "impossible de créer un pixmap"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "choix de fonte incorrect"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "famille de police introuvable dans la base de données des polices X11"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "usage incorrect de %d < 0 dans  '%s'"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "%s non disponible pour ce périphérique"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "impossible de créer un 'XImage'"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr "tentative d'utilisation du localisateur (locator) après dev.hold()"
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "inpossible de démarrer le périphérique %s"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width' ou 'height' incorrecte"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "colorimétrie incorrecte passée au pilote X11"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "couleur / modèle de couleur X11 inconnu -- monochrome utilisé"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "aucun graphique disponible dans ce périphérique pour la sauvegarde"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "ceci n'est pas un périphérique X11cairo ouvert"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "savePlot() ne fonctionne pas dans cette compilation"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "incapable de rentrer en contact avec l'affichage X11"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "presse-papier impossible à ouvrir en lecture (code d'erreur %d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "affectation mémoire impossible pour la structure X11Routines"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "redémarrages non supportés dans 'eval'"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "erreur d'allocation d'une connexion URL"
 
@@ -6857,29 +6899,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "seul le premier élément de l'argument 'destfile' est utilisé"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Progression du téléchargement"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "impossible d'ouvrir l'URL '%s', à cause de '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "impossible d'ouvrir le fichier de destination '%s', à cause de '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "essai de l'URL '%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "taille téléchargée %d != taille déclarée %d"
@@ -6889,141 +6931,167 @@
 msgid "cannot open URL '%s'"
 msgstr "impossible d'ouvrir l'URL '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "schéma URL non supporté"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "ouverture impossible : le statut HTTP était '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "échec de InternetOpenUrl : '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "ouverture impossible : le statut HTTP était '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "nsl() ne fonctionne pas sur cette architecture"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "argument '%s' incorrect"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() ne fonctionne pas sur cette architecture"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "les longueurs de 'import' et 'export' doivent correspondre"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "impossible d'ouvrir le fichier de destination '%s', à cause de '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "impossible d'ouvrir le fichier '%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "impossible de lire depuis la connexion"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "impossible d'ouvrir la connexion"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() ne fonctionne pas sur cette architecture"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL : URL trop longue (incorrecte ?)"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "suppression des informations de proxy FTP"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "utilisation du proxy FTP '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy : URL trop longue (incorrecte ?)"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "impossible de résoudre le nom d'hôte"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "échec de connexion au serveur"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "aucune réponse du serveur"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 "RxmlNanoFTPGetConnection : erreur de création de connecteur logiciel (socket)"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "échec de création d'une connexion de données"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "échec de liaison à un port"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "écoute impossible sur le port %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL : URL trop longue (incorrecte ?)"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "suppression des informations de proxy HTTP"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "utilisation du proxy HTTP '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy : URL trop longue (incorrecte ?)"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "incapable de résoudre '%s'"
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "connexion à '%s' sur le port %d."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "connexion à '%s' impossible sur le port %d."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "redirection vers : '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "trop de redirections, annulation ..."
 
@@ -7261,8 +7329,8 @@
 msgstr "erreur d'allocation pour bessel_i"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument hors limites ?\n"
 
@@ -7271,18 +7339,23 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g) : perte de précision dans le résultat\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "erreur d'allocation pour bessel_j"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_j(%g) : ncalc (=%ld) != nb (=%ld) ; alpha=%g. Argument hors "
 "limites ?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g) : perte de précision dans le résultat\n"
@@ -7292,8 +7365,8 @@
 msgstr "erreur d'allocation pour bessel_k"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_k(%g) : ncalc (=%ld) != nb (=%ld); alpha=%g. Argument hors limites ?\n"
 
@@ -7302,17 +7375,22 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g) : perte de précision dans le résultat\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "erreur d'allocation pour bessel_y"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_y(%g) : ncalc (=%ld) != nb (=%ld); alpha=%g. Argument hors limites ?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g) : perte de précision dans le résultat\n"
@@ -7322,42 +7400,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr "'k' (%.2f) doit être entier, arrondi à %.0f"
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "valeur d'argument hors domaine dans '%s'\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "valeur d'argument hors intervalle dans '%s'\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "non convergence dans '%s'\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "la précision complète ne sera peut être pas atteinte dans '%s'\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "dépassement de mémoire vers le bas dans '%s'\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, fuzzy, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr "pbeta_raw() -> bratio() a renvoyé le code d'erreur %d"
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr "pnbinom_mu() -> bratio() a renvoyé le code d'erreur %d"
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..) : absence de convergence en %d itérations."
@@ -7433,7 +7511,7 @@
 "Chargement dynamique partiel explicite indisponible sur cette architecture. "
 "Utilisation de la valeur par défaut."
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "impossible d'obtenir le répertoire de travail !"
 
@@ -7449,12 +7527,12 @@
 "Une situation inhabituelle s'est produite dans l'imbrication des entrées "
 "readline. Veuillez signaler l'anomalie à l'aide de bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "problème lors de la sauvegarde du fichier historique '%s'"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7463,89 +7541,126 @@
 "impossible d'ouvrir le fichier '%s' : %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "argument 'file' trop long"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "aucun mécanisme d'historique des commandes disponible"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "problème lors de la troncature du fichier d'historique des commandes"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "aucun historique des commandes disponible pour la sauvegarde"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "marque (timestamp) incorrecte"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "argument de taille non nulle et de type caractère attendu"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' doit être une valeur logique et non NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "popen impossible pour '%s', cause probable : '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 "la ligne %d est probablement tronquée lors de l'appel à system(, intern = "
 "TRUE)"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "erreur lors de l'exécution de la commande : '%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "erreur lors de l'exécution d'une commande"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 "l'exécution de la commande '%s' renvoie un statut %d et le message d'erreur "
 "'%s'"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() n'est pas implémenté sur ce système"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "AVIS : l'utilisation de --gui ou -g sans fournir de valeur est ignorée"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "AVIS : interface graphique '%s' inconnue, utilisation d'X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "AVIS : interface graphique '%s' inconnue, aucune n'est utilisée\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "la création d'un fichier temporaire pour '-e' a échoué"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "AVIS : édition uniquement du premier fichier de la liste"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "'what' doit être une chaîne de caractères ou une fonction"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr ""
+#~ "les connecteurs logiciels (sockets) ne sont pas disponibles sur ce système"
+
+#~ msgid "no function to restart"
+#~ msgstr "aucune function à relancer"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "l'argument doit être une fermeture (closure)"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname' doit être un vecteur de caractères de longueur 1"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "nsl() est incapable de résoudre le nom de la machine hote '%s'"
+
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "format inconnu renvoyé par la fonction C 'gethostbyname'"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "nsl() ne fonctionne pas sur cette architecture"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "intervalle de valeurs trop grand en 'x'"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "argument non numérique"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "schéma URL non supporté"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' doit être une liste"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' doit être une liste"
 
@@ -7745,15 +7860,9 @@
 #~ msgid "can't use R profiling while byte code profiling"
 #~ msgstr "'profilage R inutilisable lorsque du pseudo-code est profilé"
 
-#~ msgid "bad character switch offsets"
-#~ msgstr "valeur de décalage caractère erronée"
-
 #~ msgid "bad switch names"
 #~ msgstr "noms des options de branchage non appropriés"
 
-#~ msgid "bad numeric switch offsets"
-#~ msgstr "valeur de décalage numérique erronée"
-
 #~ msgid "constBuf must be a generic vector"
 #~ msgstr "constBuf code doit être un vecteur générique"
 
@@ -7921,9 +8030,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title' doit être une chaîne de caractères"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "'text' doit être une chaîne de caractères"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s' doit être de taille 1"
 
@@ -7956,9 +8062,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' n'est pas une connexion"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec' doit être un seul caractère"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr ""
 #~ "tableau de données corrompu -- la taille de la colonne %d ne correspond "
diff -Nru r-base-3.2.3/src/library/base/po/it.po r-base-3.3.1/src/library/base/po/it.po
--- r-base-3.2.3/src/library/base/po/it.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/it.po	2016-04-27 22:15:37.000000000 +0000
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2006-01-16 09:11+0100\n"
 "Last-Translator: Daniele Medri <daniele.medri2@unibo.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -134,176 +134,177 @@
 msgid "problem in displaying '%ls'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argomento '%s' non valido"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 #, fuzzy
 msgid "unsupported version of Windows"
 msgstr "conversione non supportata"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "argomento non corretto"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "esagerato: la tua macchina ha un limite massimo di indirizzi di 4Gb"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 #, fuzzy
 msgid "cannot decrease memory limit: ignored"
 msgstr "impossibile diminuire il limite di memoria"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' deve essere un vettore di tipo character"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "dispositivo non valido"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "richiede modalità SDI"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "numero di dispositivo non valido"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "dispositivo errato"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 #, fuzzy
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "input non valido per Rmbstowcs"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "scelta del file annullata"
 
@@ -345,196 +346,195 @@
 msgid "'names' is not a character vector"
 msgstr "'fmt' deve essere un vettore di caratteri non vuoto"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "il primo parametro deve essere una stringa di caratteri"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "il terzo parametro deve essere una stringa di caratteri"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr ""
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Errore irreversibile: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "encoding '%s' non riconosciuto"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, fuzzy, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<ERRORE: input non valido per questo encoding> "
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, fuzzy, c-format
 msgid "cannot open file '%s': %s"
 msgstr "impossibile aprire il file '%s'"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): il file %s non esiste\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, fuzzy, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "ATTENZIONE: il valore %s non è valido: verrà ignorato\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "ATTENZIONE: non è stato specificato un valore per max-mem-size\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "ATTENZIONE: valore non valido di  --max-mem-size: verrà ignorato\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, fuzzy, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 "ATTENZIONE: valore di --max-mem-size=%lu'%c': troppo grande e quindi "
 "ignorato\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, fuzzy, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 "ATTENZIONE: valore di max-mem-size =%4.1fM troppo piccolo e quindi ignorato\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, fuzzy, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 "ATTENZIONE: il valore di max-mem-size =%4.1fM è troppo grande e sarà "
 "considerato il limite di 3Gb\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "operazioni binarie richiedono due argomenti"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "operazioni binarie richiedono due argomenti"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "ATTENZIONE: opzione %s sconosciuta\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGOMENTO '%s' __ignorato__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 #, fuzzy
 msgid "cannot use -e with -f or --file"
 msgstr "impossibile impostare lunghezza di un oggetto non vector"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "si deve specificare '--save', '--no-save' oppure '--vanilla'"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "impossibile creare 'thread di lettura'; liberare qualche risorsa di sistema"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "indice fuori limite"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, fuzzy, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "questo oggetto non è indicizzabile"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 #, fuzzy
 msgid "WARNING: no value given for --encoding"
 msgstr "ATTENZIONE: nessun valore specificato per --encoding\n"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, fuzzy, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "ATTENZIONE: l'opzione %s non è più supportata\n"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, fuzzy, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "ATTENZIONE: nessun valore specificato per %s\n"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, fuzzy, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "ATTENZIONE: il valore %s non è valido: verrà ignorato\n"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, fuzzy, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "ATTENZIONE: %s=%lu'%c': tropo grande e quindi ingorato\n"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 #, fuzzy
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "ATTENZIONE: nessun valore specificato per --max-ppsize\n"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "ATTENZIONE: il valore di -max-ppsize è negativo: verrà ignorato\n"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr ""
 "ATTENZIONE: il valore di -max-ppsize è troppo piccolo: verrà ignorato\n"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr ""
@@ -646,7 +646,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "non è possibile allocare memoria per 'name'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "richiesto argomento di tipo character"
 
@@ -703,7 +703,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "problema nello scrivere sulla connessione"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "l'argomento 'code' deve essere una stringa di tipo character"
@@ -734,9 +734,9 @@
 msgid "invalid multibyte format string"
 msgstr "stringa formato multibyte non valida"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, fuzzy, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -748,7 +748,7 @@
 msgstr "'title' deve essere una stringa di tipo character"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "l'espressione regolare non è valida in questo locale"
 
@@ -759,8 +759,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "stringa di input %d non valida in questo locale"
@@ -768,7 +768,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, fuzzy, c-format
 msgid "argument '%s' will be ignored"
 msgstr "gli argomenti successivi ai primi due vengono ignorati"
@@ -783,7 +783,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "stringa di input %d non valida in questo locale"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, fuzzy, c-format
 msgid "regcomp error: '%s'"
 msgstr "errore di lettura"
@@ -793,29 +793,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "code deve essere un vettore generico"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "valore '%s' non valido"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "lunghezza non valida"
 
@@ -847,7 +847,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "Si è prodotto un NaN"
 
@@ -860,117 +860,117 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "possibile perdita totale di precisione in modulo"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "si è prodotto un NA per overflow di interi"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "l'operatore necessita di uno o due argomenti"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "argomento non numerico trasformato in operatore binario"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "array incompatibili"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "Serie storiche non compatibili"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 #, fuzzy
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 "la lunghezza dell'oggetto più lungo\n"
 "\tnon è un multipla di quella del più piccolo"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "argomento non valido per l'operatore"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "operatore non valido"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "funzione reale (di un argomento) non implementata"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "funzione complessa non implementata"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "funzione reale di %d argomenti numerici non implementata"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d argomenti passati a 'log' che ne richiede 1 o 2"
 msgstr[1] "%d argomenti passati a 'log' che ne richiede 1 o 2"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "secondo argomento di lunghezza 0 non valido"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "l'argomento \"%s\"  non è specificato e non ha un valore predefinito"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 #, fuzzy
 msgid "invalid argument 'base' of length 0"
 msgstr "secondo argomento di lunghezza 0 non valido"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, fuzzy, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'path' deve essere un vettore di tipo character"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "limite matrice non numerico"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 #, fuzzy
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "matrix: valore di 'nrow' non ammissibile (troppo grande o NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 #, fuzzy
 msgid "invalid 'nrow' value (< 0)"
 msgstr "matrix:valore 'nrow' non valido (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 #, fuzzy
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "matrix: valore di 'ncol' non ammissibile (troppo grande o NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 #, fuzzy
 msgid "invalid 'ncol' value (< 0)"
 msgstr "matrix: valore 'ncol' non valido (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, fuzzy, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
@@ -978,7 +978,7 @@
 "la lunghezza [%d] dei dati non è un sottomultiplo o un multiplo del numerodi "
 "di righe [%d] in matrix"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, fuzzy, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -987,108 +987,108 @@
 "la lunghezza [%d] dei dati non è un sottomultiplo o un multiplo del numero "
 "di colonne [%d] in matrix"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "la lunghezza dei dati supera la dimensione della matrice"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 #, fuzzy
 msgid "too many elements specified"
 msgstr "matrix: troppi elementi specificati"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "limite negativo per matrix"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: troppi elementi specificati"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 #, fuzzy
 msgid "negative extents to 3D array"
 msgstr "limite negativo per matrix"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 #, fuzzy
 msgid "'alloc3Darray': too many elements specified"
 msgstr "allocMatrix: troppi elementi specificati"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 #, fuzzy
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "allocArray: troppi elementi specificati in 'dims'"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x' deve essere un vettore di tipo character"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, fuzzy, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "'row/col' richiedono come argomento un oggetto matrix"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 #, fuzzy
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "richiesti argomenti numerici per matrix/vector"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "gli argomenti non sono compatibili"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "l'argomento non è di tipo matrix"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "primo argomento non valido, deve essere di tipo array"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, fuzzy, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' ha una lunghezza non ammissibile"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr ""
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr ""
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "valore fuori limite in 'perm'"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 #, fuzzy
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'decreasing' deve essere TRUE o FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' deve essere di tipo numeric"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "questo oggetto non è indicizzabile"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 #, fuzzy
 msgid "'dims' cannot be of length 0"
 msgstr "'hadj' deve essere di lunghezza 1"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 #, fuzzy
 msgid "'x' must have positive length"
 msgstr "l'argomento deve avere lunghezza positiva"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1153,159 +1153,160 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "tentativo di assegnazione di un attributo 'class' non ammissibile"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "argomento 'names' incompatibile"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, fuzzy, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "tipo non valido per assegnare l'attributo 'names'"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' usata su oggetti non array"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
 msgstr "'dimnames' deve essere di tipo list"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "la lunghezza di 'dimnames' [%d] non coincide con quella di 'dims' [%d]"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, fuzzy, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "tipo non valido per 'dimnames' (deve essere di tipo vector)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr ""
 "la lunghezza di 'dimnames' [%d] non coincide con l'estensione dell'array"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "primo argomento non valido"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "secondo argomento non valido"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 #, fuzzy
 msgid "length-0 dimension vector is invalid"
 msgstr "dim: vettori di dimensione di lunghezza 0 non ammissibili"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr ""
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr ""
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 #, fuzzy
 msgid "dims do not match the length of object"
 msgstr ""
 "dim<- : dims [prodotto %d] non conformi alla lunghezza dell'oggetto [%d]"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, fuzzy, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr ""
 "dim<- : dims [prodotto %d] non conformi alla lunghezza dell'oggetto [%d]"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 #, fuzzy
 msgid "attributes must be a list or NULL"
 msgstr "gli attributi devono essere un oggetto di tipo list"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "gli attributi devono avere un nome"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "tutti gli attributi devono avere dei nomi [%d non ce l'ha]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 #, fuzzy
 msgid "'which' must be of mode character"
 msgstr "l'attributo 'name' deve essere in modalità character"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 #, fuzzy
 msgid "exactly one attribute 'which' must be given"
 msgstr "deve essere specificato solo un attributo 'name'"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, fuzzy, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "typo o lunghezza non ammissibile per il nome dello slot"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 #, fuzzy
 msgid "'name' must be non-null character string"
 msgstr "'name' deve essere un character non nullo"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "typo o lunghezza non ammissibile per il nome dello slot"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "non è possibile ottenere lo slot (\"%s\") da un oggetto di tipo \"%s\""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "nessuno slot di nome \"%s\" per questo oggetto di classe \"%s\""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 #, fuzzy
 msgid "attempt to set slot on NULL object"
 msgstr "tentativo di impostare un attributo a NULL"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 #, fuzzy
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 "classi formali non possono essere utilizzati senza il pacchetto methods"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1314,7 +1315,7 @@
 "tentativo di ottenre lo slot \"%s\" da un oggetto di classe base (\"%s\") "
 "senza slots"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, fuzzy, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1323,46 +1324,46 @@
 "tentativo di ottere lo slot \"%s\" da un oggetto per il quale la classe (\"%s"
 "\") non è definita "
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, fuzzy, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "tipo %d non è implementato in type2str"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "argomento formale 'recursive' ripetuto"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "argomento formale 'use.names' ripetuto"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "l'argomento non è di tipo list"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "nome class troppo lungo in '%s'"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "non posso creare una matrice a partire da questo tipo di dati"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "il numero di righe delle matrici deve coincidere (si veda arg %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "il numero di colonne delle matrici deve coincidere (si veda arg %d)"
@@ -1371,240 +1372,258 @@
 msgid "vector size cannot be NA"
 msgstr "la dimensione del vettore no può essere NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 #, fuzzy
 msgid "vector size cannot be NA/NaN"
 msgstr "la dimensione del vettore no può essere NA"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 #, fuzzy
 msgid "vector size cannot be infinite"
 msgstr "la dimensione del vettore non può essere negativa"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "dimensione troppo grande per il vettore indicato"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "il secondo argomento deve essere una funzione"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "l'oggetto sostitutivo non è un environment"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' deve essere un environment"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "l'argomento non è un environment"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 #, fuzzy
 msgid "the empty environment has no parent"
 msgstr "argomento esportazione environment sbagliato"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 #, fuzzy
 msgid "can not set parent of the empty environment"
 msgstr "non posso rompere i legami nell'environment base"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "non posso rompere i legami nell'environment base"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "non posso rompere i legami nell'environment base"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' non è un environment"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "non posso scrivere su questa connessione"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "specificazione di '%s' non valida"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr ""
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, fuzzy, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "l'argomento %d (type '%s') non ancora supportato da cat"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, fuzzy, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "vector: non posso creare un vettore in modalità \"%s\"."
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "impossibile impostare lunghezza di un oggetto non vector"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 #, fuzzy
 msgid "invalid value"
 msgstr "valore '%s' non valido"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' usato in un contesto sbagliato"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr ""
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 #, fuzzy
 msgid "EXPR must be a length 1 vector"
 msgstr "switch: EXPR deve restituire un vettore di lunghezza 1"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d argomenti passati a 'log' che ne richiede 1 o 2"
 msgstr[1] "%d argomenti passati a 'log' che ne richiede 1 o 2"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, fuzzy, c-format
 msgid "'%s' requires a character vector"
 msgstr "strstrim() necessita di un vettore di caratteri"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "stringa mulibyte %d non valida"
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "estraggo una sottostringa da un oggetto che non è di tipo character"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 #, fuzzy
 msgid "invalid substring arguments"
 msgstr "argomento stringa non valido"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "nomi non di tipo character"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "rimpiazzo una sottostringa in un oggetto che non è di tipo character"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 #, fuzzy
 msgid "the first argument must be a character vector"
 msgstr "il primo argomento deve essere una vettore character"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abbreviazione usata con caratteri non ASCII"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "nomi non di tipo character"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "stringa mulibyte %d non valida"
+
+#: src/main/character.c:948 src/main/grep.c:163
 #, fuzzy
 msgid "non-character argument"
 msgstr "nomi non di tipo character"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "specificazione range decrescente ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "specificazione range decrescente ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 #, fuzzy
 msgid "invalid UTF-8 string 'old'"
 msgstr "stringa multibyte non valido in 'old'"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "stringa multibyte non valido in 'old'"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 #, fuzzy
 msgid "invalid UTF-8 string 'new'"
 msgstr "stringa multibyte 'new' non valida"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "stringa multibyte 'new' non valida"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old' è più lungo di 'new'"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "stringa input multibyte %d non valida"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strstrim() necessita di un vettore di caratteri"
 
@@ -1617,7 +1636,7 @@
 msgid "applies only to lists and vectors"
 msgstr "si applica solo a liste e vettori"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "si è prodotto un NA per coercizione"
 
@@ -1626,7 +1645,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "si è prodotto un NA per coercizione"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "parti immaginarie eliminate durante la conversione"
 
@@ -1634,140 +1653,135 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "valori fuori range trattati come 0 durante la conversione"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, fuzzy, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "dato in modalità \"%s\" non valido (troppo corto)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, fuzzy, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "l'oggetto 'pairlist' non può essere convertito in '%s'"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, fuzzy, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "oggetto (list) non può essere converito in '%s'"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, fuzzy, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "oggetto (list) non può essere converito in '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr ""
 "gli environment non possono essere trasformati in altri tipi di oggetti"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 #, fuzzy
 msgid "attempting to coerce non-factor"
 msgstr "tentativo di ingrandire un non vettore"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "richiesto argomento di tipo list"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "environment non valido"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "l'argomento deve avere almeno lunghezza 1"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "corpo funzione non valido"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "argomento di lunghezza 0 non valido"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "argomento di tipo list non valido"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "tipo \"single\" non implementato in R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "predicato non implementato"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, fuzzy, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() applicato a una non-(lista o vettore)"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, fuzzy, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "tipo '%s' non implementato in '%s'\n"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr ""
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "il primo argomento deve essere una stringa di tipo character"
 
-#: src/main/coerce.c:2449
+#: src/main/coerce.c:2464
 #, fuzzy
-msgid "'what' must be a character string or a function"
-msgstr "il primo argomento deve essere una stringa di caratteri o una funzione"
+msgid "'what' must be a function or character string"
+msgstr "'title' deve essere una stringa di tipo character"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "'dimnames' deve essere di tipo list"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'dimnames' deve essere di tipo list"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' deve essere un environment"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "environment specificato non valido"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "oggetto sostitutivo non valido per essere di classe stringa"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1775,7 +1789,7 @@
 "\"%s\" può essere impostato come classe se l'oggetto è di questo tipo; ho "
 "trovato \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1784,39 +1798,39 @@
 "non è possibile impostare la classe a matrix  se l'attributo dimensione non "
 "ha lunghezza 2 (era %d)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "non è possibile impostare la classe ad \"array\"  se l'attributo dimensione "
 "non ha lunghezza > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 #, fuzzy
 msgid "'value' must be non-null character string"
 msgstr "'name' deve essere un character non nullo"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "operatore complesso non valido"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "operazione tra numeri complessi non implementata"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "argomento non numerico alla funzione"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "coefficiente polinomiale non valido"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "codice di ricerca della radice fallito"
 
@@ -1828,7 +1842,7 @@
 msgid "connection not found"
 msgstr "connessione non trovata"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "connessione non valida"
 
@@ -1837,9 +1851,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr ""
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "conversione non supportata"
@@ -1921,8 +1935,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 #, fuzzy
 msgid "too large a block specified"
 msgstr "matrix: troppi elementi specificati"
@@ -1953,8 +1967,8 @@
 msgstr "allocazione della connessione 'fifo' fallita"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "solo il primo elemento del parametro 'descrizione' viene utilizzato"
 
@@ -1964,14 +1978,14 @@
 msgstr ""
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "non posso aprire questa connessione"
@@ -2039,7 +2053,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "allocazione della connessione 'bzfile' fallita"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr ""
@@ -2060,12 +2074,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr ""
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "allocazione memoria appunti fallita"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "la clipboard non può essere aperta o non contiene testo"
 
@@ -2177,350 +2191,346 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' non è una connessione"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "i socket non sono disponibili su questo sistema"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' non è una connessione"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "impossibile aprire connessioni standard"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "connessione già aperta"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "valore 'rw' ignoto"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "impossibile chiudere connessioni standard"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 #, fuzzy
 msgid "cannot close 'output' sink connection"
 msgstr "impossibile chiudere una connessione di sink dell'output"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 #, fuzzy
 msgid "cannot close 'message' sink connection"
 msgstr "impossibile chiudere una connessione di sink dei messaggi"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "connessione non aperta"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 #, fuzzy
 msgid "line longer than buffer size"
 msgstr "Linea più lunga della dimensione del buffer"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "non posso leggere da questa connessione"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "non posso allocare il buffer in readLines"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, fuzzy, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "riga finale incompleta in readLines su '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "troppo poche righe lette in readLines"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "la stringa incompleta trovata alla fine del file è stata tralasciata"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 #, fuzzy
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr "terminatore nullo non trovato: taglio la stringa a 10000 caratteri"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "posso leggere solo da una connessione binaria"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "cambio di dimensione non supportato per vettori complessi"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "dimensione %d sconosciuta su questa macchina"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "dato grezzo è sempre di dimensione 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x' non è un vettore di tipo atomico"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "possono scrivere solo su una connessione binaria"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 #, fuzzy
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr ""
 "possono essere scritti solo i formati ascii su connessioni in modalità testo"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 #, fuzzy
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
 "possono essere scritti solo i formati ascii su connessioni in modalità testo"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "problema nello scrivere sulla connessione"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "cambio di dimensione non supportata per vettori elementari"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "input UTF-8 non valido in readChar()"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 #, fuzzy
 msgid "'object' is too short"
 msgstr "questo oggetto non è indicizzabile"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 #, fuzzy
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: sono necessari più caratteri di quelle presenti nella stringa - "
 "riempirò con spazi"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: sono necessari più caratteri di quelle presenti nella stringa - "
 "riempirò con spazi"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 #, fuzzy
 msgid "maximum number of pushback lines exceeded"
 msgstr "numero massimo di colori superato"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 #, fuzzy
 msgid "could not allocate space for pushback"
 msgstr "non posso allocare spazio per pushBack"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "posso unicamente ripristinare connessioni leggibili e aperte"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "posso riavvolgere solo connessione aperte in lettura"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "il sink stack è pieno"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "non posso dirigere l'output verso lo stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "non c'è nulla da eliminare"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 #, fuzzy
 msgid "there is no connection NA"
 msgstr "'file' non è una connessione"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, fuzzy, c-format
 msgid "there is no connection %d"
 msgstr "'file' non è una connessione"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "il file non ha il numero magico di gzip"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "il file non ha un header di tipo gzip valido"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "errore di scrittura durante lo svuotamento della connessione 'gzcon'"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "errore crc %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "errore di scrittura sulla connessione 'gzcon'"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' deve essere fra 0 ... 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression' deve essere TRUE o FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x' deve essere TRUE o FALSE"
+
+#: src/main/connections.c:5502
 #, fuzzy
 msgid "this is already a 'gzcon' connection"
 msgstr "c'è già una connessione di tipo gzcon"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "è possibile usare soltanto connessioni binarie in scrittura o lettura"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr ""
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "allocazione della connessione 'gzcon' fallita"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "non è una lista di sockets"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "indicatori errati di scrittura"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "non è una connessione socket"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr ""
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, fuzzy, c-format
 msgid "allocation of %s connection failed"
 msgstr "allocazione della connessione 'url' fallita"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 #, fuzzy
 msgid "no loop for break/next, jumping to top level"
 msgstr "non c'è alcun loop da cui uscire, salto al livello radice"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "non vi è alcuna funzione da cui uscire, salto al livello radice"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "il contesto obiettivo non è nello stack"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "non così tanti frame nello stack"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "sono permessi valori di 'n' positivi"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "nessuna funzione da far ripartire"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 #, fuzzy
 msgid "number of contexts must be positive"
 msgstr "'maxiter' deve essere positivo"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr ""
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 #, fuzzy
 msgid "not that many calls to browser are active"
 msgstr "non così tanti frame nello stack"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 #, fuzzy
 msgid "not that many functions on the call stack"
 msgstr "non così tanti frame nello stack"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "errore interno in 'do_sys'"
 
@@ -2529,42 +2539,42 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "Overflow di interi in sum(.); usare sum(as.numeric(.))"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 #, fuzzy
 msgid "'cummax' not defined for complex numbers"
 msgstr "min/max non sono definite per i numeri complessi"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 #, fuzzy
 msgid "'cummin' not defined for complex numbers"
 msgstr "min/max non sono definite per i numeri complessi"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "la funzione cumxxx è ignota"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 #, fuzzy
 msgid "problem with setting timezone"
 msgstr "problema nello scrivere sulla connessione"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "non è possibile istanziare timezones su questo sistema"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 #, fuzzy
 msgid "problem with unsetting timezone"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 #, fuzzy
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "un componente di lunghezza zero è nella struttura POSIXIt"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "non è possibile allocare memoria per 'read.dcf'"
 
@@ -2578,12 +2588,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr ""
 
-#: src/main/debug.c:45
-#, fuzzy
-msgid "argument must be a closure"
-msgstr "il secondo argomento deve essere una funzione"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 #, fuzzy
 msgid "argument must be a function"
 msgstr "il secondo argomento deve essere una funzione"
@@ -2593,7 +2598,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x' deve essere TRUE o FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 #, fuzzy
 msgid "argument must not be a function"
 msgstr "il secondo argomento deve essere una funzione"
@@ -2610,62 +2615,62 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr ""
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "argomenti insufficienti"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 #, fuzzy
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "'cutoff' non valido nel deparse, utilizzo il default"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "la scomposizione può essere incompleta"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "il primo argomento deve essere una stringa di caratteri o una funzione"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "hai scritto troppi pochi caratteri"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "sono attesi argomenti di tipo character"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 #, fuzzy
 msgid "zero-length argument"
 msgstr "argomento di lunghezza zero"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 #, fuzzy
 msgid "'opts' should be small non-negative integer"
 msgstr "'gap' deve essere un intero non negativo"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "oggetto \"%s\" non trovato"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "l'espressione della funzione è costruita male"
 
@@ -2678,16 +2683,16 @@
 msgid "no active or default device"
 msgstr "nessun dispositivo attivo o di default"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "troppi dispositivi aperti"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 #, fuzzy
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "memoria insufficiente per allocare il dispostivo (in addDevice)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "Premi <Invio> per vedere il prossimo grafico: "
 
@@ -2775,7 +2780,7 @@
 msgid "too many arguments, sorry"
 msgstr "troppi argomenti, spiacente"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "stato grafico non valido"
 
@@ -2933,7 +2938,7 @@
 msgid "invalid argument to edit()"
 msgstr "argomento non valido in edit()"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "impossibile aprire file"
 
@@ -2997,12 +3002,12 @@
 msgstr "nessun sistema grafico da eliminare"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "'line end' non valida"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "'line join' non valida"
 
@@ -3036,85 +3041,99 @@
 msgid "raster capture is not available for this device"
 msgstr "'truncation' non disponibile per questa connessione"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "font fact %d non supportata per la famiglia font '%s'"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "nessuno dispositivo grafico attivo"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, fuzzy, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "'pattern' non valido per questo locale"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "valore pch '%d' non implementato"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "estensione asse non valida [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "estensione asse infinita [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): nuovo  *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): nuovo *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 #, fuzzy
 msgid "display list redraw incomplete"
 msgstr "Aggiornamento del grafico incompleto"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "argomento di tipo list non valido"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "l'argomento 'expr' deve essere un'espressione"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "l'argomento 'list' deve essere una lista"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "l'argomento 'env' deve essere un environment"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "carattere multibyte non valido in pch=\"c\""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "cifre esadecimali non valide in 'color' o 'lty'"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "line type non valido: deve avere lunghezza 2, 4, 6 o 8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 #, fuzzy
 msgid "invalid line type: zeroes are not allowed"
 msgstr "vettori di lunghezza negativa non ammessi"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "line type non valido"
 
@@ -3123,7 +3142,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "non posso cambiare un valore con un legame bloccato"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "non posso aggiungere legami ad un environment bloccato"
 
@@ -3140,711 +3159,715 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "non posso rompere i legami nell'environment base"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "non posso rimuovere i legami da un environment bloccato"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, fuzzy, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "l'argomento non è un environment"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, fuzzy, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "La lista ... non contiene %d elementi"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d usato in un contesto sbagliato, nessun ... in cui cercare"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "non trovo la funzione \"%s\""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 #, fuzzy
 msgid "cannot assign values in the empty environment"
 msgstr "non posso rompere i legami nell'environment base"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "impossibile assegnare variabili a questo database"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, fuzzy, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "non posso aggiungere legami ad un environment bloccato"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "solo il primo elemento è utilizzato come nome di variabile"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 #, fuzzy
 msgid "first argument must be a named list"
 msgstr "il primo parametro deve essere di tipo list"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 #, fuzzy
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "'hostname' deve essere una stringa di tipo character"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 #, fuzzy
 msgid "'envir' argument must be an environment"
 msgstr "l'argomento 'env' deve essere un environment"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "impossibile rimuovere variabili dal namespace base"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 #, fuzzy
 msgid "cannot remove variables from the base environment"
 msgstr "impossibile rimuovere variabili da questo database"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 #, fuzzy
 msgid "cannot remove variables from the empty environment"
 msgstr "impossibile rimuovere variabili da questo database"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "impossibile rimuovere variabili da questo database"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, fuzzy, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "variabile \"%s\" in modalità \"%s\" non trovata"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "nome non valido in posizione %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "il secondo argomento deve essere un environment"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, fuzzy, c-format
 msgid "wrong length for '%s' argument"
 msgstr "lunghezza sbagliata dell'argomento 'mode'"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 #, fuzzy
 msgid "invalid use of 'missing'"
 msgstr "uso di 'missing' non valido"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 #, fuzzy
 msgid "'missing' can only be used for arguments"
 msgstr "missing si può usare solo per gli argomenti"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 #, fuzzy
 msgid "'pos' must be an integer"
 msgstr "'a' e 'b' devono essere finiti"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 #, fuzzy
 msgid "all elements of a list must be named"
 msgstr "attach: tutti gli elementi devono avere un nome"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 #, fuzzy
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "attach funziona solo per liste e data frames"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "il detach di \"package:base\" non è permesso"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "l'argomento deve essere di tipo environment"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "l'argomento deve essere simbolico"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "nessun environment di inclusione"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "nessun termine chiamato \"%s\" nella lista di ricerca"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr ""
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 #, fuzzy
 msgid "S4 object does not extend class \"environment\""
 msgstr "l'oggetto sostitutivo non è un environment"
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 #, fuzzy
 msgid "invalid object for 'as.environment'"
 msgstr "oggetto non valido per 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "non è un environment"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "non è un simbolo"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "nessun collegamento per \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "non è una funzione"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "il simbolo ha già un collegamento regolare"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 #, fuzzy
 msgid "cannot change active binding if binding is locked"
 msgstr "non posso cambiare un valore con un legame bloccato"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "op sconosciuto"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "non posso sbloccare un collegamento bloccato"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "non posso scollegare un collegamento attivo"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 #, fuzzy
 msgid "bad namespace name"
 msgstr "nome namespace non valido"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 #, fuzzy
 msgid "namespace already registered"
 msgstr "namespace già registrato"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 #, fuzzy
 msgid "namespace not registered"
 msgstr "namespace non registrato"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "argoment importazione environment sbagliato"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "argomento esportazione environment sbagliato"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "le lunghezze dei nomi di import e export devono conincidere"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "il simbolo esportato '%s' non ha un valore"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, fuzzy, c-format
 msgid "unknown encoding: %d"
 msgstr "codifica '%s' non supportata"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr ""
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "interrupt sospesi; segnale ignorato"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "opzione  \"warning.expression\" non valida"
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(contertito da avviso) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "Avviso: "
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "Avviso in %s : "
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Alcuni messaggi di avviso perduti\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Alcuni messaggi di avviso perduti\n"
 msgstr[1] "Alcuni messaggi di avviso perduti\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "Ci sono %d avvisi (usare warnings() per leggerli)\n"
 msgstr[1] "Ci sono %d avvisi (usare warnings() per leggerli)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr "Ci sono 50 o più avvisi (usare warnings() per leggere i primi 50)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "Errore durante wrapup: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Errore in "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "Errore in "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Errore: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "Inoltre: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "opzione \"error\" non valida\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Esecuzione interrotta\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep' deve essere una stringa di tipo character"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [stringa non valida in stop(.)]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [stringa non valida in warning(.)]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "numero di argomenti non corretto per \"%s\""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "funzionalità non implementata in %s"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "numero di argomenti non valido"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "tipo argomento non valido"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "lunghezza serie storiche/vettore non concordante"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "argomenti incompatibili"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "errore sconosciuto (per piacere, segnalatecelo!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "conversione intera non accurata durante la conversione"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "avviso sconosciuto (per piacere, segnalatecelo!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "non vi è alcuna funzione da cui uscire, salto al livello superiore"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "inconsitenza a livello superiore?"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr ""
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "il messaggio di errore non è una stringa"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "messaggio di errore sbagliato"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "riavvio non corretto"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "'restart' non è nello stack"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "non è in un contesto di 'try'"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 #, fuzzy
 msgid "error message must be a character string"
 msgstr "'msg1' deve essere una stringa di tipo character"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: non posso aprire il file di profile '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "Il profiling di R non è disponibile su questo sistema"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 #, fuzzy
 msgid "restarting interrupted promise evaluation"
 msgstr "riavvi non supportati in 'eval'"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 "calcolo annidatato in un numero eccessivo di livelli: ricorsione infinita / "
 "options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "argomento non specificato e senza un valore predefinito"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "tentativo di applicare una non-funzione"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, fuzzy, c-format
 msgid "argument %d is empty"
 msgstr "l'argomento %d non è di tipo vector"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "non trovo il simbolo \"%s\" nell'environment della funzione generica"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "il simbolo \"%s\" non è nell'environment del metodo"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr ""
 "la condizione la lunghezza > 1 e solo il promo elemento verrà utilizzato"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "valore mancante dove è richiesto TRUE/FALSE"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "l'argomento non può essere interpretato come logico"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "l'argomento ha lunghezza zero"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "variabile di ciclo non simbolica"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "sequenza ciclo for() non corretta"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 #, fuzzy
 msgid "multi-argument returns are not permitted"
 msgstr "return multi-argomento sono deprecati"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "membro di sinistra (NULL) dell'assegnazione non valido"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr ""
 "la destinazione dell'assegnazione si espande in un oggetto non del linguaggio"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "nome troppo lungo in '%s'"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "non si possono fare assegnazioni complesse nel namespace base"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "non si possono fare assegnazioni complesse nell'environment di base"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "funzione non ammissibile nell'assegnazione complessa"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "il membro di sinistra dell'assegnazione (do_set) non è valido"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr ""
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "argomento formale list non valido per \"function\""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, fuzzy, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "argomento '%s' non valido"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "l'argomento di tipo numeric 'envir' non ha lunghezza uno"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "riavvi non supportati in 'eval'"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' chiamato esternamente da una chiusura"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "valore in '...' non è una promessa"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Metodi incompatibili (\"%s\", \"%s\") per \"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 #, fuzzy
 msgid "dispatch error in group dispatch"
 msgstr "errore nel dispatch"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, fuzzy, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "'%s' non è una funzione"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "overflow del node stack"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "overflow dello stack interi"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 #, fuzzy
 msgid "bad opcode"
 msgstr "Opcode errato"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, fuzzy, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "'x' non valido in 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "versione bytecode non corretta; uso eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "versione bytecode troppo vecchia"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "versione bytecode troppo nuova"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "versione bytecode non coincidente"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "argomento 'sequence' non valido nel ciclo 'for'"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, fuzzy, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "nessuna funzione interna \"%s\""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "funzione sbagliata"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "non è una funzione BUILTIN"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 #, fuzzy
 msgid "invalid body"
 msgstr "simbolo non valido"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "simbolo non valido"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "l'argomento non è un oggetto bytecode"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "nome file sbagliato"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "impossibile aprire 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file' deve essere una stringa non vuota"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' deve essere di tipo logico"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 #, fuzzy
 msgid "constant buffer must be a generic vector"
 msgstr "code deve essere un vettore generico"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "timer di profile in uso"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "sto già effettuando bytecode profiling"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "impostazione del profile timer non riuscita"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "non sto effettuando profiling bytecode"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "nls() non è supportato in questa piattaforma"
@@ -3864,16 +3887,16 @@
 msgid "this graphics device does not support event handling"
 msgstr "il dispositivo grafico non support gli eventi grafici"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "prompt non valido"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 #, fuzzy
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "modalità '%s' non supportata in call_R"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 #, fuzzy
 msgid "no graphics event handlers set"
 msgstr "nessuno dispositivo grafico attivo"
@@ -4054,7 +4077,7 @@
 msgstr "espressione regolare '%s' non valida"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, fuzzy, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "stringa di input %d non valida in questo locale"
@@ -4146,26 +4169,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "le routine internet non sono accessibili dal modulo"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "le routine internet non possono essere caricate"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "valore sbagliato"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "le routine socket non possono essere caricate"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "tentativo di impostare un attributo 'comment' non ammissibile"
+
 #: src/main/lapack.c:39
 #, fuzzy
 msgid "LAPACK routines cannot be accessed in module"
@@ -4176,39 +4198,39 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "le routine socket non possono essere caricate"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 #, fuzzy
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr "le operazioni sono possibli solo per oggetti di tipo numeric o logical"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "operazione binaria su array non conformi"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "serie storiche non compatibili"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "l'operatore '%s' richiede due argomenti"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "'x' non valido in 'x %s y'"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "tipo 'y' non valido in 'x %s y'"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "l'operatore `!' è stato usato con due argomenti"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr ""
@@ -4217,65 +4239,79 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "Errore durante wrapup: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Esecuzione interrotta\n"
+
+#: src/main/main.c:505
 #, fuzzy
 msgid "Error: segfault from C stack overflow\n"
 msgstr "overflow dello stack interi"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "impossibile aprire pacchetto base\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, fuzzy, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "impossibile ripristinare i dati registrati in .RData\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Durante l'avvio - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "impossibile aprire file in lettura"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "non posso uscire dal browser"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "si ci aspetta una tra \"yes\", \"no\", \"ask\" o \"default\"."
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "save=\"ask\" in modalità non interattiva: viene usata la linea di comando di "
 "default"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "valore sconosciuto di 'save'"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "valore 'status' non valido, uso 0"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "argomento 'runLast' non valido, uso FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 "non posso allocare spazio per l'elemento di callback di livello superiore"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "indice negativo passato a R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "messaggio di avviso dal processo callback di livello superiore '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr ""
 "il processo callback di livello superiore restituisce un valore non logico"
@@ -4320,168 +4356,173 @@
 msgstr[0] "argomento(i) non usato (%s ...)"
 msgstr[1] "argomento(i) non usato (%s ...)"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "posso solo creare un riferimento debole agli oggetti di tipo reference"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "il 'finalizer' deve essere una funzione o NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "non è un riferimento debole"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "il primo argomento deve essere un environment o un puntatore esterno"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "il secondo argomento deve essere una funzione"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 #, fuzzy
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "l'argomento 'mutiple' deve essere TRUE o FALSE"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "memoria 'vector' esaurita (raggiunto il limite?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "memoria 'cons' esaurita (raggiunto il limite?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 #, fuzzy
 msgid "memory exhausted (limit reached?)"
 msgstr "memoria 'cons' esaurita (raggiunto il limite?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "non posso allocare un blocco di memoria di dimensione %.0f"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "non posso allocare un blocco di memoria di dimensione %.0f"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 #, fuzzy
 msgid "vector is too large"
 msgstr "dimensione troppo grande per il vettore indicato"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "vettori di lunghezza negativa non ammessi"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "non è possibile allocare un vettore di lunghezza %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, fuzzy, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "tipo/lunghezza non valida (%d/%d) in allocazione di vettore"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, fuzzy, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "non posso allocare un vettore di dimensione %lu Kb"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, fuzzy, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "non posso allocare un vettore di dimensione %lu Kb"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, fuzzy, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "non posso allocare un vettore di dimensione %lu Kb"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): overflow dello stack di protezione"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: puntatore non trovato"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, fuzzy, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "Calloc non può allocare memoria (%d di %d)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, fuzzy, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "Realloc non può riallocare memoria (dimensione %d)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "non è sicuro restituire puntatori vettoriali"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "valore sbagliato"
+
+#: src/main/memory.c:3746
 #, fuzzy
 msgid "memory profiling is not available on this system"
 msgstr "Il profiling di R non è disponibile su questo sistema"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, fuzzy, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprof: non posso aprire il file di profile '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "necessario argomento stringa"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "funzione primitiva non esistente"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "tentativo di utilizzo di un nome variabile di lunghezza zero"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr ""
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "argomento .Internal() non valido"
 
@@ -4522,105 +4563,105 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "nessun metodo applicabile per \"%s\""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod' chiamato al di fuori di una chiusura"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod' chiamato da una funzione anonima"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "nessuna chiamata generica: il metodo è stato chiamato direttamente?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' non è una funzione, ma di tipo %d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "argomento sbagliato ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "oggetto non specificato"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "funzione generica non specificata"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 #, fuzzy
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "argomento genrico non valido in NextMethod"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 #, fuzzy
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "argomento 'group' non valido in NextMethod"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr "valore non valido per .Method"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "metodi incompatibili ignorati"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "nessun metodo da invocare"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "non posso applicare 'unclass' a un environment"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "non posso de-classificare un puntatore esterno"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' deve essere un vettore di tipo character"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which' deve essere un vettore logico di lunghezza 1"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr ""
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 #, fuzzy
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'all.x' deve essere TRUE o FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "non riesco a trovare una versione generica della funzione \"%s\""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 #, fuzzy
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr "standardGeneric chiamato senza un dispatch abilitato (sarà ignorato)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 #, fuzzy
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 "l'argomento di standardGeneric deve essere una stringa di tipo character non "
 "vuota"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4629,7 +4670,7 @@
 "chiamata di standardGeneric(\"%s\") apparentemente al di fuori del corpo di "
 "quella funzione generica"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4638,11 +4679,11 @@
 "codice metodo primitiva (\"%s\") non valido : dovrebbe essere \"clear\", "
 "\"reset\", \"set\", o \"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "oggetto non valido: deve essere una funzione primitiva"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4651,20 +4692,20 @@
 "la definzione formale di una primitiva generica deve essere un oggetto "
 "funzione invece è di tipo '%s')"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "operazione primitiva non valida fornita per il dispatch"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "errore nel dispatch"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4673,90 +4714,95 @@
 "è stata impostata la funzione primitiva \"%s\" per i metodi ma non è stata "
 "fornita alcuna funzione generica"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "macro C MAKE_CLASS chiamata passando un puntatore stringa NULL"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "font Hershey non caricati"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 #, fuzzy
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "macro C MAKE_CLASS chiamata passando un puntatore stringa NULL"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "macro C NEW chiamata con puntatore definizione di classe null"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, fuzzy, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 "provo a generare un oggetto in C a partire dalla classe virtuale (\"%s\")"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 #, fuzzy
 msgid "invalid printing width, used 80"
 msgstr "match stringa parziale non valido"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr ""
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr ""
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 #, fuzzy
 msgid "list argument has no valid names"
 msgstr "l'argomento non è un modello valido"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, fuzzy, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "parametro 'trans' non valido"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, fuzzy, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "parametro 'trans' non valido"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, fuzzy, c-format
 msgid "invalid value for '%s'"
 msgstr "valore non valido per 'n'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec' deve un singolo carattere"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr ""
 
@@ -4781,11 +4827,16 @@
 msgid "first argument must be atomic"
 msgstr "il primo argomento deve essere atomico"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec' deve un singolo carattere"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "modalità ( x ) impossbile"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "solo argomenti vettoriali"
 
@@ -4793,218 +4844,200 @@
 msgid "invalid filename specification"
 msgstr "specificazione del nome file non valida"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "errore di scrittura durante file append"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "niente da accodare"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "argomento 'filename' non valido"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, fuzzy, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "impossibile creare fifo '%s' perché '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "il nome del primo file non è valido"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, fuzzy, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "il nome del secondo file non è valido"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "niente da collegare"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 #, fuzzy
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "symlink non supportati su questa piattaforma"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, fuzzy, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, fuzzy, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 #, fuzzy
 msgid "symbolic links are not supported on this platform"
 msgstr "symlink non supportati su questa piattaforma"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, fuzzy, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, fuzzy, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 #, fuzzy
 msgid "(hard) links are not supported on this platform"
 msgstr "symlink non supportati su questa piattaforma"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 #, fuzzy
 msgid "expanded 'from' name too long"
 msgstr "nome sorgente esteso troppo lungo"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 #, fuzzy
 msgid "expanded 'to' name too long"
 msgstr "nome sorgente esteso troppo lungo"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, fuzzy, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "impossibile creare fifo '%s' perché '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "espressione regolare 'pattern' non valida"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "impossibile determinare posizione R home"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "nome del file troppo lungo"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr ""
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, fuzzy, c-format
 msgid "read error on '%s'"
 msgstr "errore di lettura"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "l'impostazione 'LC_NUMERIC' può causare uno strano funzionamento di R"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, fuzzy, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr "Il sistema operativo segnala che la richiesta non può essere esaudita"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' deve essere una stringa di tipo character"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "nls() non riesce a identificare l'host '%s'"
-
-#: src/main/platform.c:2161
-#, fuzzy
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "formato sconosciuto resituito da gethostbyname"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "nls() non è supportato in questa piattaforma"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' già esistente"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, fuzzy, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "impossibile creare fifo '%s' perché '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, fuzzy, c-format
 msgid "'%ls' already exists"
 msgstr "'%s' già esistente"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, fuzzy, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "impossibile creare fifo '%s' perché '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "'pattern' di lunghezza zero"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, fuzzy, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, fuzzy, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 #, fuzzy
 msgid "over-long path length"
 msgstr "'pattern' di lunghezza zero"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, fuzzy, c-format
 msgid "problem creating directory %s: %s"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, fuzzy, c-format
 msgid "problem reading directory %s: %s"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 #, fuzzy
 msgid "'mode' must be of length at least one"
 msgstr "'hadj' deve essere di lunghezza 1"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 #, fuzzy
 msgid "insufficient OS support on this platform"
 msgstr "nls() non è supportato in questa piattaforma"
@@ -5057,72 +5090,77 @@
 msgid "Metric information not available for this family/device"
 msgstr "'truncation' non disponibile per questa connessione"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "psecificazione di 'na.print' non valida"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "etichette di riga non valide"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "etichette di colonna non valide"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 #, fuzzy
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr "argomento non-stringa per 'incolla' interna"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' deve essere un intero non negativo"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "argomento interno 'tryS4' non valido"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "overflow buffer di input"
+
+#: src/main/print.c:1043
 #, fuzzy
 msgid "invalid character length in 'dblepr'"
 msgstr "lunghezza carattere non valida in dblepr"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 #, fuzzy
 msgid "invalid character length in 'intpr'"
 msgstr "lunghezza carattere non valida in intpr"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 #, fuzzy
 msgid "invalid character length in 'realpr'"
 msgstr "lnghezza carattere non valida in realpr"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 #, fuzzy
 msgid "memory allocation error in 'realpr'"
 msgstr "errore di allocazione della memoria in realpr"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "la routine BLAS/LAPACK '%6s' ha restituito un codice errore %d"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "etichette di riga insufficienti"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "etichette di colonna insufficienti"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 #, fuzzy
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "nls() non è supportato in questa piattaforma"
@@ -5131,50 +5169,50 @@
 msgid "argument is not a numeric vector"
 msgstr "l'argomento non è un vettore di tipo numeric"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "argomenti non validi"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "generati NA"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "valori NA in un vettore di probabilità"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "probabilità non positiva"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "troppe poche probabilità positive"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 #, fuzzy
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "non posso estrarre un campione più grande dellapopolazione se 'replace = "
 "FALSE'"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "numero di probaibilità non corretto"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 #, fuzzy
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "'recursive = TRUE' non è supportato su questa piattaforma"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 #, fuzzy
 msgid "argument must be a character vector of length 1"
 msgstr "'hostname' deve essere una stringa di tipo character"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 #, fuzzy
 msgid ""
 "argument should be a character vector of length 1\n"
@@ -5182,143 +5220,143 @@
 msgstr ""
 "la condizione la lunghezza > 1 e solo il promo elemento verrà utilizzato"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 #, fuzzy
 msgid "argument 'x' must be a raw vector"
 msgstr "il primo argomento deve essere un vettore"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 #, fuzzy
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "'decreasing' deve essere TRUE o FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 #, fuzzy
 msgid "argument 'shift' must be a small integer"
 msgstr "l'argomento 'size' deve essere un intero positivo"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 #, fuzzy
 msgid "argument 'x' must be an integer vector"
 msgstr "il primo argomento deve essere una vettore character"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 #, fuzzy
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "l'argomento di 'logarithm' deve essere logico"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, fuzzy, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "il secondo argomento deve essere una funzione"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 #, fuzzy
 msgid "argument 'x' must not contain NAs"
 msgstr "il secondo argomento deve essere una funzione"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 #, fuzzy
 msgid "invalid UTF-8 string"
 msgstr "stringa multibyte non valido in 'old'"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "confronto (%d) possibile solo per dati atomic o list"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "confronto tra espressioni non permesso"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "confronto tra questi tipi non implementato"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "confronto tra valori complessi non ammissibile"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 #, fuzzy
 msgid "'a' and 'b' must have the same type"
 msgstr "'path' deve essere un vettore di tipo character"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "errore di lettura"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "si è verificato un errore I in lettura"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "si è verificato un errore R in lettura"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "si è verificato un errore C in lettura"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "si è verificato un errore S in lettura"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "si è verificato un errore in lettura"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "nodo non ricostruito durante la fase di ripristino"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 "errore di compatibilità in fase di ripristino - non c'è compatibilità con la "
 "versione %d"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "tipo SEXP errato nel file dei dati"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "disaccordo sui tipi"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "non trovo la funzione \"%s\""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 "non possono registrare la posizione del file durante il ripristino dei dati"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 "non posso rispristinare la posizione del file durante il ripristino dei dati"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr "il namespace di base non viene conservato nei workspace versione 1"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "non posso salvare i namespace nella versione 1 dei workspace"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 #, fuzzy
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
@@ -5326,176 +5364,176 @@
 "non posso registrare l'environment con legami bloccati/attivi nei workspace "
 "versione 1"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "non posso registrare riferimenti deboli nei workspace della versione 1"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec chiamata con tipo non vettore"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr "non posso salve oggetti byte code in workspace versione 1"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: tipo %i sconosciuto"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec chiamato con tipo non vettore"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr "non posso leggere oggetti byte code in workspace versione 1"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: tipo %i sconosciuto"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "memoria esaurita durante la lettura di una stringa ascii"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "si è verificato un errore in lettura binaria"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "memoria esaurita durante la lettura di una stringa binaria"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "si è erificato un errore durante la lettura di una stringa binaria"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "si è verificato un errore in scrittura di un intero in formato xdr"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "si è verificato un errore in lettura di un intero in formato xdr"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "si è verificato un errore in scrittura di una stringa in formato xdr"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr ""
 "si è verificato un errore in scrittura di un numero reale in formato xdr"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "si è verificato un errore in lettura di un numeor reale in formato xdr"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr ""
 "si è verificato un errore in scrittura di un numero complesso in formato xdr"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr ""
 "si è verificato un errore in lettura di un numero complesso in formato xdr"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "scrittura non riuscita"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "il file di restore potrebbe essere vuoto - nessun dato caricato"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 "il file di ripristino potrebbe provenire da una versione troppo recente di R "
 "- dati non caricati"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "numero magico errato del file di ripristino (il file potrebbe essere "
 "danneggiato) - dati non caricati"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "il primo argomento deve essere una vettore character"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "list con nomi non validi"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "i dati caricati non sono in formato lista appaiata"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "il primo argomento deve essere un nome file"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "scrittura XDR non avvenuta"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "lettura XDR non avvenuta"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, fuzzy, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "impossibile scrivere i dati - impossibile aprire %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "non posso scrivere su una connessione in formato %d"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "connessione non aperta in scrittura"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "non posso salvare in formato XDR su una connessione in modo 'text'"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "errore di scrittura sulla connessione"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 #, fuzzy
 msgid "connection not open for reading"
 msgstr "connessione non aperta in lettura"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 #, fuzzy
 msgid "can only load() from a binary connection"
 msgstr "posso leggere solo da una connessione binaria"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 #, fuzzy
 msgid "no input is available"
 msgstr "non esiste un meccanismo di gestione history"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5510,7 +5548,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan() richiede '%s', invece risulta '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 #, fuzzy
 msgid "too many items"
 msgstr "troppi argomenti"
@@ -5519,7 +5557,7 @@
 msgid "empty 'what' specified"
 msgstr "specificato 'what' vuoto"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "la riga %d non ha %d elementi"
@@ -5552,36 +5590,36 @@
 msgid "embedded nul(s) found in input"
 msgstr ""
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "lunghezza del fattore non equa"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "il risultato sarebbe un vettore troppo lungo"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 #, fuzzy
 msgid "argument of length 0"
 msgstr "l'argomento ha lunghezza zero"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "l'espressione numerica ha %d elementi: solo il primo è utilizzato"
 msgstr[1] "l'espressione numerica ha %d elementi: solo il primo è utilizzato"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "argomento NA/NaN"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 #, fuzzy
 msgid "incorrect type for second argument"
 msgstr "rep() tipo del secondo argomento non valido"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, fuzzy, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "tentativo di replicare un non vettore"
@@ -5831,53 +5869,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "è possibile eseguire un ordinamento solo su vettori atomici"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' deve essere TRUE o FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "possono essere ordinati solo i vettori atomici"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "vettori raw non possono essere ordinati"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, fuzzy, c-format
 msgid "index %ld outside bounds"
 msgstr "indice %d fuori limite"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "indice NA"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "indice %d fuori limite"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "l'argomento %d non è di tipo vector"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "la lunghezza degli argomenti differisce"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "ties.method non valid in rank() [non dovrebbe mai accadere]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "range dei valori di 'x' troppo grande"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5887,24 +5921,24 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "gli argomenti successivi ai primi due vengono ignorati"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "il primo argomento deve essere un vettore"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "il secondo argomento deve essere di tipo factor"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 #, fuzzy
 msgid "group length is 0 but data length > 0"
 msgstr "La lunghezza di gruppo è 0 ma i dati hanno lunghezza > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "la lunghezza dei dati non è un multiplo della variabile di split"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr ""
 
@@ -5960,38 +5994,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "la trasformazione ha cmabiato la lunghezza del vettore in 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, fuzzy, c-format
 msgid "invalid format '%s'; %s"
 msgstr "valore non valido per 'n'"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "usare il formato %d o %i per oggetti di tipo logical"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, fuzzy, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "sare formato %d, %i, %x o %X per oggetti di tipo integer"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, fuzzy, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "usare il fomrato %f, %e o %g per oggetti di tipo numeric"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "usare il formato %s per oggetti di tipo character"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, fuzzy, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "La stringa di caratteri verrà probabilmente troncata"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "tipo non supportato"
 
@@ -5999,266 +6033,262 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: buffer troppo piccolo"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "tentativo di ingrandire un non vettore"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "assegnazione oltre i limiti del vettore/lista (estendo da %d a %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "tipi incompatibili (da %s a %s) in subassignment type fix"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "NA non si possono usare in indici di assegnazione"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 #, fuzzy
 msgid "replacement has length zero"
 msgstr "l'argomento ha lunghezza zero"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 "il numero di elementi da sostituire non è un multiplo della lunghezza di "
 "sostituzione"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "numero di indici non corretto su una matrice"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 "tipi incompatibili (da %s a %s) in assegnazioni per sottogruppi in matrix"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "numero di indici non corretto"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 "tipi incompatibili (da %s a %s) in assegnazioni per sottogruppi in array"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 #, fuzzy
 msgid "invalid subscript in list assign"
 msgstr "numero di indici non valido in assegnamento di lista"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "numero di indici non valido in assegnamento di lista"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: numero argomenti non valido"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "argomenti errati in sottoassegnamenti di environment"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "più elementi forniti di quelli da sostituire"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]]] con indici missing"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] indice fuori limiti"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] numero di indici non valido"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "tipi incompatibili (da %s a %s) nell'assegnazione [["
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] indice (%d) fuori limiti"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, fuzzy, c-format
 msgid "invalid subscript type '%s'"
 msgstr "tipo di indice non valido"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "Trasformo il membro di sinistra in una lista"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "tentativo di selezione meno di un elemento"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "tentativo di selezionare più di un elemnto"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "errore interno nell'uso dell'indicizzazione ricorsiva"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "indicizzazione ricorsiva non avvenuta a livello %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "indice non trovato a livello %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "numero di colonne non valido nell'indice della matrice"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "valori negativi non ammessi come indici di matrice"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(subscript) indice logicol troppo lungo"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "solo gli 0 si possono usare contemporaneamente con indici negativi"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "attributo 'dimnames' mancante per l'array"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "indicizzazione su un non vettore"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "sottoindicizzazione matrice non valido per questo tipo"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "sottoindicizzazione matrice non supportato per questo tipo"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "numero di dimensioni errato"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "nessun indice specificato"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 #, fuzzy
 msgid "this S4 class is not subsettable"
 msgstr "questo oggetto non è indicizzabile"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "argomenti sbagliati per sottoindicizzare un environment"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, fuzzy, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "argomento 'mode' non valido"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 #, fuzzy
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "Overflow di interi in sum(.); usare sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "errore interno ('op = %d' in do_summary).\t Chiama un Guru"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 #, fuzzy
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Overflow di interi in sum(.); usare sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 #, fuzzy
 msgid "no non-missing arguments, returning NA"
 msgstr "argomenti di min non finiti; restituisco Inf"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 #, fuzzy
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "argomenti di min non finiti; restituisco Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 #, fuzzy
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "argomenti non finiti in max; restituisco -Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "argomento non numerico"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 #, fuzzy
 msgid "argument to 'which' is not logical"
 msgstr "l'argomento di 'logarithm' deve essere logico"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 #, fuzzy
 msgid "no arguments"
 msgstr "argomenti insufficienti"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 #, fuzzy
 msgid "invalid input type"
 msgstr "line type non valido"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 #, fuzzy
 msgid "an argument will be fractionally recycled"
 msgstr "gli argomenti successivi ai primi due vengono ignorati"
@@ -6272,8 +6302,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "conversione non supportata"
@@ -6309,103 +6339,103 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "posizionamento non riuscito su %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "tipo errato per l'argomento"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 #, fuzzy
 msgid "wrong length for argument"
 msgstr "lunghezza sbagliata dell'argomento 'mode'"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 #, fuzzy
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'putenv' non disponibile su questo sistema"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 #, fuzzy
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "'putenv' non disponibile su questo sistema"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "conversione non supportata"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' deve essere un vettore di tipo character"
 
-#: src/main/sysutils.c:652
+#: src/main/sysutils.c:658
 #, fuzzy
-msgid "'x' must be a list of NULL or raw vectors"
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x' deve essere un vettore di tipo character"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, fuzzy, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "csduplicated non chiamato su un STRSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "errore interno in 'unz'"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, fuzzy, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "conversione non supportata"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "'line join' non valida"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 #, fuzzy
 msgid "cannot create 'R_TempDir'"
 msgstr "non è possibile allocare memoria per R_TempDir"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr ""
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 #, fuzzy
 msgid "cannot allocate 'R_TempDir'"
 msgstr "non è possibile allocare memoria per R_TempDir"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 #, fuzzy
 msgid "temporary name too long"
 msgstr "nome del file troppo lungo"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "non è stato possibile trovare un nome tempfile non ancora utilizzato"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 #, fuzzy
 msgid "allocation failed in R_tmpnam2"
 msgstr "allocazione di memoria non riuscita in GVText"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 #, fuzzy
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "'recursive = TRUE' non è supportato su questa piattaforma"
@@ -6444,33 +6474,33 @@
 msgid "'nmax' must be positive"
 msgstr "l'argomento deve avere lunghezza positiva"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' richiede argomenti vettoriali"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "l'argomento non è in modalità carattere"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 #, fuzzy
 msgid "... used in a situation where it does not exist"
 msgstr "... usato in un contesto dove non esiste"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "valore in '...' non è una promessa"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "data frame non numeri in rowsum"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "questo non deve accadere"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' deve essere un vettore di tipo character"
 
@@ -6478,149 +6508,149 @@
 msgid "object is not a matrix"
 msgstr "l'oggetto non è una matrice"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, fuzzy, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "tipo %d non è implementato in type2str"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "tipo '%s' non implementato in '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "tipo (%d) non implementato in '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "'tag' non valida nell'estrazione nome"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, fuzzy, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%d argomenti passati alla funzione 'atan' che ne richiede 1"
 msgstr[1] "%d argomenti passati alla funzione 'atan' che ne richiede 1"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d argomenti passati a 'log' che ne richiede 1 o 2"
 msgstr[1] "%d argomenti passati a 'log' che ne richiede 1 o 2"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr ""
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, fuzzy, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "la lista \"nthcdr\" è più piccola di %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 #, fuzzy
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "\"nthcdr\" necessita una lista da CRN"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' deve essere TRUE o FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' deve essere TRUE o FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 #, fuzzy
 msgid "missing value is invalid"
 msgstr "valori nulli nei parametri"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "non posso cambiare la directory di lavoro"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "richiesti argomenti di tipo vector"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "percorso troppo lungo"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "solo il primo carattere di 'quote' verrà usato"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 #, fuzzy
 msgid "a character vector 'value' expected"
 msgstr "richiesti argomenti di tipo vector"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 #, fuzzy
 msgid "'value' must be of positive length"
 msgstr "l'argomento deve avere lunghezza positiva"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, fuzzy, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "input non valido per Rmbstowcs"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, fuzzy, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "stringa mulibyte %d non valida"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "messaggio di errore troncato a 255 caratteri"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "avviso troncato a 255 caratteri"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 #, fuzzy
 msgid "all arguments must be named"
 msgstr "gli attributi devono avere un nome"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 #, fuzzy
 msgid "ICU is not supported on this build"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 #, fuzzy
 msgid "'breaks' is not sorted"
 msgstr "modalità '%s' non supportata in call_R"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, fuzzy, c-format
 msgid "long vector '%s' is not supported"
 msgstr "modalità '%s' non supportata in call_R"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 #, fuzzy
 msgid "'x' must be a vector"
 msgstr "'x' deve essere un vettore di tipo character"
@@ -6685,7 +6715,7 @@
 msgid "There must be at least three control points"
 msgstr "deve esserci un primo argomento"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "Errore di protocollo in X11: %s"
@@ -6711,7 +6741,7 @@
 "Errore: X11 non può allocare colori grafici aggiuntivi.\n"
 "Si provi ad usare X11 con colortype=\"pseudo.cube\" o \"gray\"."
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6719,215 +6749,221 @@
 "non è possibile trovare alcun carattere X11\n"
 "Verificare che il percorso verso i caratteri sia correttamente impostato."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 ha usato un dimensione carattere di %d mentre era richiesta %d"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, fuzzy, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "Il carattere X11 di dimensione %d non può essere caricato"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 "Errore irreversebilie di IO di X11: si prega di registrare il vostro lavoro "
 "e uscire da R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 "localizzazione non supportata da Xlib: alcune funzionalità di X lavoreranno "
 "con un locale C"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X non può impostare parametri locali"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "supporto png non disponibile in questa versione di R"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "nome file troppo lungo in png()"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "impossibile aprire il file PNG '%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "supporto jpeg non disponibile in questa versione di R"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "nome file troppo lungo in jpeg()"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "impossibile aprire il file JPEG '%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 #, fuzzy
 msgid "no tiff support in this version of R"
 msgstr "supporto png non disponibile in questa versione di R"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 #, fuzzy
 msgid "filename too long in tiff() call"
 msgstr "nome file troppo lungo in png()"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 #, fuzzy
 msgid "filename too long in bmp() call"
 msgstr "nome file troppo lungo in png()"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, fuzzy, c-format
 msgid "could not open BMP file '%s'"
 msgstr "impossibile aprire il file PNG '%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "impossibile aprire connessione con display X11 '%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg() non supporta la trasparenza: bg impostato su bianco"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, fuzzy, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "impossibile aprire connessione con display X11 '%s'"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "impossibile creare una finestra X11"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "impossibile creare una pixmap"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "specificazione font non valida"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "famiglia di caratteri non trovata tra quelli disponibili per X11"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, fuzzy, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "valore non valido per 'n'"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, fuzzy, c-format
 msgid "could not open file '%s'"
 msgstr "impossibile aprire il file PNG '%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, fuzzy, c-format
 msgid "%s not available for this device"
 msgstr "'truncation' non disponibile per questa connessione"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 #, fuzzy
 msgid "Unable to create XImage"
 msgstr "impossibile creare una pixmap"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "impossibile aprire dispositivo %s"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width' o 'height' non validi"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "tipo di colore non valido per il driver X11"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "modello colre X11 sconosciuto -- si utilizza quello monocromatico"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 #, fuzzy
 msgid "no plot on device to save"
 msgstr "nessuna history displonibile da salvare"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 #, fuzzy
 msgid "not an open X11cairo device"
 msgstr "troppi dispositivi aperti"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "impossibile aprire il file '%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 #, fuzzy
 msgid "savePlot() is not supported on this build"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "impossibile contattare un display X11"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, fuzzy, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "la clipboard non può essere aperta o non contiene testo"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "non è possibile allocare memoria per la struttura X11Routines"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "riavvi non supportati in 'eval'"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "allocazione della connessione 'url' fallita"
 
@@ -6939,29 +6975,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "solo il primo elemento di 'destifle' viene utilizzato"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Progressione caricamento"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, fuzzy, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, fuzzy, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "provo con l'URL '%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "lunghezza caricamento %d != lunghezza prevista %d"
@@ -6971,140 +7007,166 @@
 msgid "cannot open URL '%s'"
 msgstr "impossibile aprire URL '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "schema URL non supportato"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "apertura non riuscita: stato HTTP '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "InternetOpenUrl non riuscita: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "apertura non riuscita: stato HTTP '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "argomento '%s' non valido"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "le lunghezze dei nomi di import e export devono conincidere"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "impossibile aprire il file '%s' perché '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "impossibile aprire il file '%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "non posso leggere da questa connessione"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "non posso aprire questa connessione"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "nls() non è supportato in questa piattaforma"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "elimino informazione proxy FTP"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "uso proxy FTP '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "impossibile identificare host"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "connessione al server non riuscita"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "impossibile ottenere una risposta dal server"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: creazione socket non riuscita"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "impossibile creare una connessione dati"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "collegamento ad una porta non avvenuto"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "non è possibile leggere dalla porta %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "rimuovo l'informazione del proxy HTTP"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "uso proxy HTTP '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, fuzzy, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossibile identificare '%s'."
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "connesso a '%s' sulla porta %d."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "impossibile collegarsi a '%s' sulla porta %d."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "reindirizzamento su: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "troppi reindirizzamenti, annullo..."
 
@@ -7343,8 +7405,8 @@
 msgstr "errore di allocazione in bessel_i"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. fuori range?\n"
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -7352,16 +7414,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): perdita di precisione nel risultato\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "errore di allocazione in bessel_j"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. fuori range?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): perdiat di precisione nel risultato\n"
@@ -7371,8 +7438,8 @@
 msgstr "errore di allocazione in bessel_k"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. fuori range?\n"
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -7380,16 +7447,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): perdita di precision nel risultato\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "errore di allocazione in bessel_y"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. fuori range?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): perdita di precisione nel risultato\n"
@@ -7399,42 +7471,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, fuzzy, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "valore fuori limite in 'perm'"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, fuzzy, c-format
 msgid "value out of range in '%s'\n"
 msgstr "valore fuori limite in 'perm'"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, fuzzy, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "apertura non riuscita su %s"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr ""
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): diverge nell'iterazione %d."
@@ -7510,7 +7582,7 @@
 "Lazy dynamic loading esplicito non supportato in questa piattaforma. Si "
 "utilizza quello predefinito."
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "impossibile ottenere la directory di lavoro"
 
@@ -7526,12 +7598,12 @@
 "Una circostanza inattesa si è verificata nell'annidamento dell'inout di "
 "readline.Si prega di riportare l'errore usando bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, fuzzy, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, fuzzy, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7540,91 +7612,131 @@
 "impossibile aprire il file '%s'\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "argomento 'file' troppo lungo"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "non esiste un meccanismo di gestione history"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 #, fuzzy
 msgid "problem in truncating the history file"
 msgstr "è sorto un problema nel lanciare l'editor %s"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "nessuna history displonibile da salvare"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 #, fuzzy
 msgid "invalid timestamp"
 msgstr "'tag' non valido"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "richiesti argomenti di tipo character non vuoti"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 #, fuzzy
 msgid "'intern' must be logical and not NA"
 msgstr "'ascii' deve essere di tipo logico"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, fuzzy, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "impossibile aprire il file '%s' perché '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, fuzzy, c-format
 msgid "error in running command: '%s'"
 msgstr "errore interno in 'unz'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 #, fuzzy
 msgid "error in running command"
 msgstr "errore interno in 'unz'"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() non è implementata su questo sistema"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "ATTENZIONE: --gui o -g senza valore viene ignorata"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "ATTENZIONE: gui '%s' sconosciuta, verrà utilizzata X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "ATTENZIONE: gui '%s' sconosciuta, non ne verrà utilizzata alcuna\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 #, fuzzy
 msgid "creating temporary file for '-e' failed"
 msgstr "impostazione del profile timer non riuscita"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "ATTENZIONE: Verrà editato solo il primo file della lista"
 
 #, fuzzy
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr ""
+#~ "il primo argomento deve essere una stringa di caratteri o una funzione"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "i socket non sono disponibili su questo sistema"
+
+#~ msgid "no function to restart"
+#~ msgstr "nessuna funzione da far ripartire"
+
+#, fuzzy
+#~ msgid "argument must be a closure"
+#~ msgstr "il secondo argomento deve essere una funzione"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname' deve essere una stringa di tipo character"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "nls() non riesce a identificare l'host '%s'"
+
+#, fuzzy
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "formato sconosciuto resituito da gethostbyname"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "nls() non è supportato in questa piattaforma"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "range dei valori di 'x' troppo grande"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "argomento non numerico"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "schema URL non supportato"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' deve essere di tipo list"
+
+#, fuzzy
 #~ msgid "'args' must be a list"
 #~ msgstr "'dimnames' deve essere di tipo list"
 
@@ -7982,10 +8094,6 @@
 #~ msgstr "'title' deve essere una stringa di tipo character"
 
 #, fuzzy
-#~ msgid "'text' must be a character string"
-#~ msgstr "'title' deve essere una stringa di tipo character"
-
-#, fuzzy
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'which' deve essere di lunghezza 1"
 
@@ -8019,9 +8127,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' non è una connessione"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec' deve un singolo carattere"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr ""
 #~ "data frame danneggiato - la lunghezza della colonna %d non coincide con "
diff -Nru r-base-3.2.3/src/library/base/po/ja.po r-base-3.3.1/src/library/base/po/ja.po
--- r-base-3.2.3/src/library/base/po/ja.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/ja.po	2016-04-27 22:15:37.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.5.0 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2015-03-27 14:41+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: R-core <R-core@R-project.org> \n"
@@ -124,173 +124,174 @@
 msgid "problem in displaying '%ls'"
 msgstr " '%ls' �表示��題��り�� "
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr " '%s' 引数��正�� "
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr " ���ージョン� Windows �サ�ート�れ����ん "
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr " 正����引数�� "
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr " �らら�����マシン�アドレス空間�上�� 4Gb �� "
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr " メモリー�界を減ら��������ん: 無視���� "
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr " 'path' �文字ベクトル������り��ん "
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr " �正�装置�� "
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr " SDI モード��求�れ�� "
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr " グラフィックスデ�イス番���正�� "
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr " �正�装置�� "
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr " 'Rmbstowcs' ��入力��正�� "
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr " ファイル��択�キャンセル�れ��� "
 
@@ -331,187 +332,186 @@
 msgid "'names' is not a character vector"
 msgstr " 'names' �文字ベクトル���り��ん "
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr " 最��引数��文字列�期待�れ���� "
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr " 三番目�引数��文字列�期待�れ���� "
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr " 命令 '%s' �実行�状態 %d を����� "
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr " セッション時間�経���上������� "
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr " 時間�経���上������� "
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr " セッション CPU 時間�経���上������� "
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr " CPU 時間�経���上������� "
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr " 致命的�エラー��: %s \n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr " '%s' ���エンコーディング��識����ん "
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr ""
 " <エラー: エンコーディング '%s' �ら��エンコーディング�失敗����> \n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr " ファイル '%s' を開��������ん: %s "
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr " file.show(): ファイル '%s' �存在���ん \n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr " 警告: R_MAX_MEM_SIZE 値��正���無視�れ��� \n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr " 警告: max-mem-size �与�られ����ん \n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr " 警告: --max-mem-size 値��正��: 無視�れ��� \n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr " 警告: --max-mem-size=%lu%c �大���る��無視�れ��� \n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr " 警告: max-mem-size=%4.1fM �����る��無視�れ�� \n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr " 警告: max-mem-size=%4.0fM �大���る�� %uM ��れ��� \n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr " オプション '%s' ��引数�必��� "
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr " オプション '%s' �空���引数�必��� "
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr " 警告: 入力�長��る��, '-e %s' ��略�れ��� \n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr " 警告: 未知� '%s' オプション \n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr " 引数 '%s' �無視�れ��� \n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr " -e �-f や --file �併用�る�������ん "
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 " 一時ファイル�作��失敗���� -- TMPDIR�正��設定�れ�����? "
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr " '--save' , '--no-save', '--vanilla' ���れ�を指定������ "
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 " 'reader thread' を作れ��ん。システム�リソースを幾ら�解放����� "
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr " 添�字�許�れる範囲外�� "
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr " '%s' 型�オブジェクト�部分代入�能���り��ん "
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr " 警告: --encoding �値�与�られ����ん "
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr " 警告: '%s' オプション�もや�サ�ート�れ����ん "
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr " 警告: '%s' �値�与�られ����ん "
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr " 警告: '%s' 値��正���無視�れ��� "
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr " 警告: %s: 大���る��無視�れ��� "
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr " 警告: '--max-ppsize' �値�与�られ����ん "
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr " 警告: '--max-ppsize' 値�負���無視�れ��� "
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr " 警告: '--max-ppsize' 値�����る��無視�れ��� "
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr " 警告: '--max-ppsize' 値�大���る��無視�れ��� "
 
@@ -615,7 +615,7 @@
 msgid "could not allocate space for 'name'"
 msgstr " 'name' ����領域を割り当�られ��ん��� "
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr " 文字引数�期待�れ���� "
 
@@ -672,7 +672,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr " Renviron ���る変数 '%s' �設定��題��り�� "
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr " 引数 '%s' �文字列������り��ん "
@@ -703,9 +703,9 @@
 msgid "invalid multibyte format string"
 msgstr " マル��イト文字列��正�� "
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr " 引数 '%s' � 1 を超�る長�����最���素���使�れ�� "
@@ -715,7 +715,7 @@
 msgstr " 'pattern' �空���文字列���れ��り��ん "
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr " ��ロケール���正�表��無効�� "
 
@@ -726,8 +726,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr " 入力文字列 %d ���ロケール����切�� "
@@ -735,7 +735,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr " 引数 '%s' �無視�れ�� "
@@ -750,7 +750,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr " 入力文字列 y[%d] ���ロケール����切�� "
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr " regcomp �エラー: '%s' "
@@ -759,29 +759,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr " 'FUN.VALUE' �ベクトル���れ��り��ん "
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr " '%s' �値��正�� "
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr " 長���正�� "
 
@@ -817,7 +817,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr " dimnames(<value>) � NULL �も長� %d �リスト�も�り��ん "
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr " 計算�果� NaN ��り��� "
 
@@ -829,116 +829,116 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr " 絶対値�精度�完全�失�れ��能性��り�� "
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr " 整数����れ�より NA �生��れ��� "
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr " 演算��一����二��引数を必����� "
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr " 二項演算��引数�数値���り��ん "
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr " �切��列���り��ん "
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr " 整���時系列���り��ん "
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr " 長�オブジェクト�長��短�オブジェクト�長���数�������ん "
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr " �項演算��対�る引数��正�� "
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr " �正��項演算��� "
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr " 1 個�引数を��未実装�数値関数 "
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr " 未実装�複素関数�� "
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr " %d 個�数値引数を��未実装�数値関数 "
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] ""
 " %d 個�引数� '%s' �渡�れ�����1 ���� 2 ��必���れ���� "
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr " 二番目�長� 0 �引数��正�� "
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr " 引数 \"%s\" ��り��ん���略時既定値も�り��ん "
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr " 長� 0 � 'base ' 引数�� "
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr " 'data' �ベクトル型������り��ん��'%s' ��� "
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr " 行列�大���数値���り��ん "
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr " 'nrow' �値��正�� (大���る� NA ��) "
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr " 'nrow' �値��正�� (負�値��) "
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr " 'ncol' �値��正�� (大���る� NA ��) "
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr " 'ncol' �値��正�� (負�値��) "
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr " �NULLデータ�列数�0�� "
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr " �NULLデータ�行数�0�� "
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr ""
 " データ長 [%d] �行数 [%d] を整数�割���も���掛��値���り��ん "
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -946,100 +946,100 @@
 msgstr ""
 " データ長 [%d] �列数 [%d] を整数�割���も���掛��値���り��ん "
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr " データ�長��行列�大��を超����� "
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr " 指定�れ��素数�多���� "
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr " 行列�大���負�値������� "
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr " allocMatrix �����指定�れ��素数�多���� "
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr " 3 次元�列�大���負�値������� "
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr " 'alloc3Darray': 指定�れ��素数�多���� "
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr " 'allocArray': 'dims' �よ��指定�れ��素数�多���� "
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr " 'x' � NULL ��� raw vector �ら�るリスト������り��ん "
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr " '%s' �引数�行列�よ��オブジェクト���れ��り��ん "
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr " 数値/複素数/行列���ベクトル��求�れ�� "
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr " �切�引数���り��ん "
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr " 引数�行列���り��ん "
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr " 一番目�引数��正��。�列������り��ん "
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr " 'perm' �長� %d �誤����� (!= %d) "
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr " 'a' ���付��次元�を����ん "
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr " 'perm[%d]' �次元��マッ����ん "
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr " 'perm' 中�値�範囲を超����� "
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr " 'resize' � TRUE � FALSE ���れ��り��ん "
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr " 'x' �数値���れ��り��ん "
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr " 'object' �短���� "
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr " 'dims' �長� 0 ������り��ん "
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr " 'x' �正�長�を����れ��り��ん "
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1106,12 +1106,12 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr " �正� 'class' 属性を設定�よ������ "
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr " クラス '%s' �� 'names' スロット��り��ん "
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
@@ -1120,7 +1120,7 @@
 " クラス '%s' �� 'names' スロット��り��ん; names 属性を付加�る��正�"
 "オブジェクト�生��れ�� "
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
@@ -1128,134 +1128,135 @@
 " ベクタ���クラス ('%s') � 'names' スロット�値をセット�る��� "
 "names()<- を使��������ん "
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr " 'names' 引数�互�性��り��ん "
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr " 'names' 属性���設定�る���正�型 (%s) �� "
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr " 'dimnames' ��列以外��用�れ��� "
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr " 'dimnames' �リスト������り��ん "
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
+msgstr " '%s' �リスト���れ��り��ん "
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 " 'dimnames' �長� [%d] � 'dims' �長� [%d] ���������り��ん "
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr " 'dimnames' �型 (%s) ��正�� (ベクトル���れ��り��ん) "
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr " 'dimnames' �長� [%d] ��列�大��������� "
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr " 一番目�引数��正�� "
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr " 二番目�引数��正�� "
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr " 長� 0 �次元�ベクトル�無効�� "
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr " dims 変数�欠�値を���� "
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr " dims 変数�負�値を���� "
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr " dims �オブジェクト�長��整����ん "
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr " dims [product %d] �オブジェクト [%d] �長��整����ん "
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr " 属性�リストも��� NULL ���れ��り��ん "
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr " 属性����付�られ����れ��り��ん "
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr " 全��属性���を������れ��り��ん [%d �������ん] "
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr " 'which' �文字列モード������り��ん "
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr " 性格�一��属性 'which' �与�ら��れ��り��ん "
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr " '%s' � '%s' ��部分的マッ� "
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr " スロット��対�る�正�型 '%s' �� "
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr " 'name' � NULL ���文字列���れ��り��ん "
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr " スロット��型���長���正�� "
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 " 型 \"%s\" �オブジェクト�ら�スロット (\"%s\") を得る���出���ん "
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 " �� \"%s\" ���スロット��クラス \"%s\" ���オブジェクト��存在���"
 "ã‚“ "
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr " NULL オブジェクト�対�� スロットを設定�よ������ "
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 " 'methods' パッケージ���フォーマルクラス (formal class) �使用����ん "
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1264,7 +1265,7 @@
 " スロット \"%s\"を�スロットを����基本クラス (\"%s\") �オブジェクト�ら"
 "得よ������ "
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1273,46 +1274,46 @@
 " スロット \"%s\" を S4 オブジェクト��無� (クラス \"%s\") �オブジェクト�"
 "ら得よ������ "
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr " '%s' �出力�れるベクタ��ベクタ�長��上�を超����� "
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr " '%s' 型 � '%s' 型��実装�れ����ん "
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr " 'recursive' 仮引数�繰り返�れ��� "
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr " 'use.names' 仮引数�繰り返�れ��� "
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr " 引数�リスト���り��ん "
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr " '%s' �クラス��長���� "
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr " '%s' タイプ�ら�行列を生�����ん "
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr " 行列�行数�一致�����れ��り��ん (%d 番目�引数を�照) "
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr " 行列�列数�一致�����れ��り��ん (%d 番目�引数を�照) "
@@ -1321,127 +1322,132 @@
 msgid "vector size cannot be NA"
 msgstr " ベクトル�サイズ� NA ���り���ん "
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr " ベクトル�サイズ� NA や NaN ���り���ん "
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr " ベクトル�サイズ�∞���り���ん "
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr " 指定�れ�ベクトル�サイズ�長���� "
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr " NULL環境�使用�廃�素�� "
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr " 引数�関数������り��ん "
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr " 置���るオブジェクト�環境���り��ん "
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr " 'enclos' �環境������り��ん "
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr " 引数�環境���り��ん "
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr " 空�環境�親を����ん "
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr " 空�環境�親��置����ん "
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr " ��空間�親�環境�設定����ん "
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr " パッケージ�イン�ート�親�環境�設定����ん "
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr " 'parent' �環境���り��ん "
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr " ��コ�クション��書�出���ん "
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr " '%s' �指定��正�� "
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr " 正��� 'fill' 引数�無視�れ�� "
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr " 引数 %d (タイプ '%s') � 'cat' ��り扱���ん "
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr " ベクトル: モード '%s' �ベクトルを作る�������ん。 "
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr " ベクトル���も��長��設定����ん "
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr " 引数��正�� "
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr " 値��正�� "
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr " '...' ���切�文脈�使�れ��� "
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr " �複�る 'switch' 既定値: '%s' � '%s' "
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr " 'EXPR' ��り��ん "
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr " EXPR �長� 1 �ベクトル���れ��り��ん "
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
@@ -1449,99 +1455,113 @@
 msgstr ""
 "EXPR�factor��整数���扱�れ��。代�り�'%s'�使用を検討������ "
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+#, fuzzy
+msgid "'switch' with no alternatives"
+msgstr " ��付��代替値�無� 'switch' 関数��数値� EXPR �必��� "
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] " %d 個�引数� '%s' �渡�れ�����%d �必���れ���� "
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr " '%s' �文字ベクトルを�求��� "
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr " %d ��正�マル��イト文字�� "
 
-#: src/main/character.c:203
-#, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:159
+#, fuzzy, c-format
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr " \"bytes\"�エンコード�れ��素 %d �文字数�計算����ん "
 
-#: src/main/character.c:232
-#, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:188
+#, fuzzy, c-format
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr " \"bytes\"�エンコード�れ��素 %d �幅�計算����ん "
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr " 文字列���オブジェクト�ら部分文字列を抽出�よ������ "
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr " 部分文字列引数��正�� "
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr " ���文字列���り��ん "
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr " 文字列���オブジェクト�部分文字列�置����� "
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr " 最��引数�文字ベクトル������り��ん "
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr " ASCII 文字���も���略����使�れ��� "
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr " ���文字列���り��ん "
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr " %d ��正�マル��イト文字�� "
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr " 文字列���引数�� "
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr " 範囲指定を縮���� ('%lc-%lc') "
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr " 範囲指定を縮���� ('%c-%c') "
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr " 'old' ��正� UTF-8 文字�� "
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr " 'old' ��正�マル��イト文字�� "
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr " 'new' ��正� UTF-8 文字列�� "
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr " 'new' ��正�マル��イト文字�� "
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr " 'old' � 'new' より長��� "
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr " �正�マル��イト文字列入力 %d �� "
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr " strtrim() 関数�文字ベクトルを�求��� "
 
@@ -1553,7 +1573,7 @@
 msgid "applies only to lists and vectors"
 msgstr " リスト�ベクトル����用���� "
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr " 強制変��より NA �生��れ��� "
 
@@ -1562,7 +1582,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr " 強制変��より NA �生��れ��� "
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr " 複素数�虚部��コ�クション���られ��� "
 
@@ -1570,120 +1590,116 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr " raw コ�クション��範囲外�値� 0 ���扱���� "
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr " �正�モード '%s' �データ�� (短����) "
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr " 'pairlist' オブジェクト� '%s' ��変�����ん "
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr " (list) オブジェクト� '%s' �変�����ん "
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr " (symbol) オブジェクト� '%s' �変�����ん "
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr " �� S4 クラスをベクトル�強制変��る方法��り��ん "
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr " 環境�他�型�変��る�������ん "
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr " �因��強制変��よ������� "
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr " リスト引数�期待�れ���� "
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr " �正�環境�� "
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr " 引数�長�� 1 以上���れ�����ん "
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr " 関数�内容��正�� "
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr " 長�� 0 �引数��正�� "
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr " 引数リスト��正�� "
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr " \"single\" 型� R ��実装�れ����ん "
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr " 未実装�「述語��� "
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr " %s() �型 '%s' �ベクトル�リスト以外��用�れ�� "
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr " 型 '%s' �デフォルトメソッド�実装�れ����ん "
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr " 'name' �見��り��ん "
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr " 最��引数�文字列������り��ん "
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr " 'what' �文字列���関数���れ��り��ん "
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr " 'text' �文字列���れ��り��ん "
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr " 'args' �リスト���expression���れ��り��ん "
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr " '%s' �リスト���れ��り��ん "
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr " 'envir' �環境������り��ん "
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr " �正�環境指定�� "
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 " class(x) を NULL �設定�よ�������; �果�も�や S4 オブジェクト��"
 "���り�� "
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1692,7 +1708,7 @@
 " class(x) を多�文字列 (\"%s\", \"%s\", ...) �設定�よ�������; �果�"
 "も�や S4 オブジェクト�����り�� "
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1701,11 +1717,11 @@
 " class(x) を \"%s\" �設定�る�属性� NULL �設定�れ��; �果�も�や S4 "
 "オブジェクト�����り�� "
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr " クラス文字列��る���正�置���オブジェクト�� "
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1713,7 +1729,7 @@
 " \"%s\" �オブジェクト���型を��時��クラス���設定����。\"%s\" �"
 "見��り��� "
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1722,36 +1738,36 @@
 " 次元属性�長� 2 �����り (%d ���)�行列�クラスを設定�る���正�"
 "� "
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr " 次元属性�長� > 0 �����り��列�クラスを設定����ん "
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr " 'value' � NULL ���文字列���れ��り��ん "
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr " 因��管モードを変更�る���正�� "
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr " �正�複素�項演算��� "
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr " 未実装�複素演算�� "
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr " 関数�引数�数値���り��ん "
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr " 多項��係数��正�� "
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr " 根を見��るコード�失敗���� "
 
@@ -1763,7 +1779,7 @@
 msgid "connection not found"
 msgstr " コ�クション��り��ん "
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr " コ�クション��正�� "
 
@@ -1772,9 +1788,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr " 使�れ����コ�クション %d (%s) を閉��� \n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr " '%s' �ら '%s' ��サ�ート�れ����変��� "
@@ -1856,8 +1872,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr " 指定�れ�ブロック�大����� "
 
@@ -1885,8 +1901,8 @@
 msgstr " fifo 接続�割り当��失敗���� "
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr " 'description' 引数�最���素���使�れ��� "
 
@@ -1898,14 +1914,14 @@
 "使��� "
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr " コ�クションを開��������ん "
@@ -1974,7 +1990,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr " bzfile 接続�割り当��失敗���� "
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr " lzma デコーダーを�期化����ん�エラー %d "
@@ -1994,12 +2010,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr " �れ� R ���ビルト�サ�ート����� %s-圧縮ファイル��。 "
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr " クリップボード�コピー�メモリ確��失敗���� "
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr " クリップボードを開����������中身��り��ん "
 
@@ -2104,257 +2120,257 @@
 msgid "'con' is not an output textConnection"
 msgstr " 'con' �出力テキストコ�クション���り��ん "
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr " ��システム��ソケット�使���ん "
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr " 'con' �コ�クション���り��ん "
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr " 標準コ�クションを開��������ん "
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr " コ�クション����開�れ���� "
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr " 未知� 'rw' 値�� "
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr " 標準コ�クションを閉�る�������ん "
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr " 'output' sink コ�クションを閉�る�������ん "
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr " 'message' sink コ�クションを閉�る�������ん "
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr " コ�クション�開�れ����ん "
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr " 行��ッファーサイズより長������� "
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr " ��コ�クション�ら読�込�����ん "
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr " readLines ��ッファを割り当�る�������ん "
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr " 行 %d ��埋�込�れ�nulを�ん��るよ��� "
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr " '%s' ��完全�最終行�見��り��� "
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr " readLines �読�込む行�少����� "
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr " ファイル�末尾��完全�文字列�無視�れ���� "
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr " 終端 (null) ��り��ん�10000 byte �切り����� "
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr " �イナリコ�クション�ら��入力���� "
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr " 複素ベクトル�サイズ�変更�サ�ート�れ����ん "
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr " ��マシン�� %d ���サイズ�使�れ����ん "
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr " raw 型オブジェクト�サイズ���も 1 �� "
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr " 'signed = FALSE' ��サイズ 1 �よ� 2 �整数�対����有効�� "
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr " 'x' �アトミックベクトルタイプ���り��ん "
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr " �イナリコ�クション���書�込����� "
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr " raw ベクトル�� 2^31-1 �イト��書�込�����ん "
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr " 一�� writeBin() 呼�出��� 2^31-1 �イト��書�込�����ん "
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr " コ�クション��書�込���題��り�� "
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr " raw ベクトル�サイズ�変更�サ�ート�れ����ん "
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr " readChar() 関数���正� UTF-8 入力�� "
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr " UTF-8 以外�マル��イトロケール���イト型���読�込��能�� "
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr " 'object' �短���� "
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 " writeChar: 文字列中�今�る以上��イト数��求�れ�����ゼロ�埋��� "
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 " writeChar: 文字列中�今�る以上�文字��求�れ�����ゼロ�埋��� "
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr " pushback 行�最大値を超�������� "
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr " pushｂack ����領域を割り当�られ��ん��� "
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr " 開���る読�込��能コ�クション���プッシュ�ック���� "
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr " テキストモード�コ�クション���プッシュ�ック���� "
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr " sink �スタック�溢れ��� "
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr " 出力を stdin �切り替�る�������ん "
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr " �り除��� sink ��り��ん "
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr " NA ���コ�クション��り��ん "
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr " %d ���コ�クション��り��ん "
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr " method = \"wininet\" �Windows���サ�ート�れ�� "
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 " file(\"\") ��open = \"w+\" � open = \"w+b\" ��をサ�ート���: �者を"
 "使��� "
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr " ��メソッド��URLスキーム�サ�ート�れ����ん "
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr " ファイルストリーム� gzip マジックナン�ーを������ん "
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr " ファイルストリーム��正� gzip ヘッダを������ん "
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr " 'gzcon' コ�クション�フラッシュ時�書�込�エラー�生���� "
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr " crc エラー %x %x \n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr " 'gzcon' コ�クション�書�込�エラー�生���� "
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr " 'level' � 0～9 ���れ�������り��ん "
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr " 'allowNonCompression' � TRUE ��� FALSE ���れ��り��ん "
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr " 'all.x' � TRUE ��� FALSE ���れ��り��ん "
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr " �れ���� 'gzcon' コ�クション�� "
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr " 読�込�����書�出������イナリコ�クション���使��� "
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 " テキストモード 'file' コ�クション�使用�正��機能����も�れ��ん "
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
@@ -2362,75 +2378,71 @@
 " 書�込��能� textConnection �ら� 'gzcon' コ�クションを作�����ん; "
 "rawConnection を使����も�れ��ん "
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr " 'gzcon' コ�クション�割り当��失敗���� "
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr " ソケット�リスト���り��ん "
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr " ��切�書�込�指示��� "
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr " ソケットコ�クション���り��ん "
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr " 未知�圧縮法���何も仮定���ん "
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr " %s コ�クション�割り当��失敗���� "
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr " break/next �対応�るループ������トップレベル�ジャンプ��� "
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr " 戻る���関数��り��ん�トップレベル�ジャンプ��� "
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr " 目標�文脈 (context) �スタック上��り��ん "
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr " �れ�スタック上�多��フレーム���り��ん "
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr " 'n' �正�値���許�れ�� "
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr " �実行����関数��り��ん "
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr " コンテキスト�数�正������り��ん "
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr " ��������ブラウザーコンテキスト��り��ん "
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr " �ん��多��アクティブ�ブラウザー��呼�出���り��ん "
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr " 呼�出�スタック上���ん��多��関数��り��ん "
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr " 'do_sys' �内部エラー�起���� "
 
@@ -2440,37 +2452,37 @@
 " 'cumsum' 関数����整数�オー�ーフロー��り���。'cumsum(as."
 "numeric(.))' を使��下�� "
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr " 複素数�対��� 'cummax' 関数�定義�れ����ん "
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr " 複素数�対��� 'cummin' 関数�定義�れ����ん "
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr " 未知� cumxxx 関数�� "
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr " タイムゾーン�設定��題��り�� "
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr " ��システム��タイムゾーン�設定����ん "
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr " タイムゾーン�未設定�よる�題�� "
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr " 空���� \"POSIXlt\" 構造�中�長�ゼロ��分��り�� "
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr " 'read.dcf' ����メモリを割り当�られ��ん��� "
 
@@ -2484,11 +2496,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr " '%s ...' �始�る行��正�� "
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr " 引数�クロージャー���れ��り��ん "
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr " 引数�関数���れ��り��ん "
 
@@ -2497,7 +2505,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr " '%s' �値� TRUE ��� FALSE ���れ��り��ん "
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr " 引数�関数������り��ん "
 
@@ -2513,61 +2521,61 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr " 'tracemem' �弱��照���外部�インター������役�立���ん "
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 " R �メモリプロファイリング�サ�ートを有効���コンパイル�れ����ん "
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr " 引数�少����� "
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr " 'deparse' �対�る�正� 'cutoff' 値��; 既定値を使��� "
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr " S4 オブジェクト�文字列化 (deparse) � source() ������ょ� "
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr " ��文字列化 (deparse) ��完全�も知れ��ん "
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 " R 2.7.0 より以���ージョン�文字列化 (deparse) �れ��� source() ���"
 "��も�れ��ん "
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr " 'file' �文字列���コ�クション���れ��り��ん "
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr " 書�れ�文字�短���� "
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr " 文字引数 (複数) �期待�れ���� "
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr " 長�ゼロ�引数�� "
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr " 'opts' ������負�整数������り��ん "
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr " オブジェクト '%s' ��り��ん "
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr " 関数�構文���切�� "
 
@@ -2579,15 +2587,15 @@
 msgid "no active or default device"
 msgstr " アクティブ���デフォルトデ�イス��り��ん "
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr " 開��デ�イス�多���� "
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr " (GEcreateDevDesc 内�) デ�イス割り当���分�メモリ��り��ん "
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr " 次�図を見る���� <Return> キーを押��下��: "
 
@@ -2676,7 +2684,7 @@
 msgid "too many arguments, sorry"
 msgstr " 引数�多���������ん "
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr " グラフィックス�状態��正�� "
 
@@ -2828,7 +2836,7 @@
 msgid "invalid argument to edit()"
 msgstr " edit() 関数�引数��正�� "
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr " ファイルを開��������ん "
 
@@ -2891,12 +2899,12 @@
 msgstr " 登録解除��るグラフィックスシステム��り��ん "
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr " 行末��正�� "
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr " 行を���られ��ん "
 
@@ -2925,83 +2933,97 @@
 msgid "raster capture is not available for this device"
 msgstr " ��デ�イス��ラスタ�り込��使用����ん "
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 " フォントフェース %d �フォントファミリー '%s' ��サ�ート�れ����ん "
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr " 有効�グラフィックスデ�イス��り��ん "
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr " pch�値 '%d' ��在�ロケール���正�� "
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr " pch �値 '%d' �未実装�� "
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr " �正�軸範囲�� [GEPretty(.,.,n=%d) "
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr " 無��軸�伸��れ���� [GEPretty(%g,%g,%d)] "
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo = %g < %g = x1 "
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up = %g > %g = x2 "
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr " ディスプレイリスト��完全���画�れ��� "
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr " ディスプレイリスト��正�� "
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr " 'expr' 引数��������り��ん "
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr " 'list' 引数�リスト������り��ん "
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr " 'env' 引数�環境������り��ん "
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr " pch=\"c\" 中��正�マル��イト� char ��り�� "
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr " 'color' ��� 'lty' 中� 16 進数��正�� "
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr " 行�タイプ��正��: 行�長�� 2, 4, 6, 8 ���れ����下�� "
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr " �正�線種: ゼロ�許�れ��ん "
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr " 行�タイプ��正�� "
 
@@ -3010,7 +3032,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr " '%s' �対�るロック�れ��インディング�値�変更����ん "
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr " ロック�れ�環境��インディングを追加�る�������ん "
 
@@ -3026,691 +3048,697 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr " 基本環境中� unbind �未実装�� "
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr " ロック�れ�環境�ら��インディングを�り除��������ん "
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr " '%s' �対�る引数�環境���り��ん "
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr " ... リスト� %d 個��素を�ん����ん "
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr " ..%d �正����文脈�使�れ������照��� ... ��り��ん "
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr " 関数 \"%s\" を見��る�������ん��� "
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr " 空�環境中���る値を割り当�る�������ん "
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr " ��データベース�変数を代入����ん "
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr " ロック�れ�環境��インディング '%s' を追加�る�������ん "
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr " 最���素���変数����使�れ��� "
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr " 最��引数���付�リスト������り��ん "
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr " names(x) � x ���長��文字ベクトル������り��ん "
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr " 'envir' 引数�環境������り��ん "
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr " base ��空間�ら�変数を�り除��������ん "
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr " 空�環境中�ら変数を除去�る�������ん "
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr " 空�環境中�ら変数を除去�る�������ん "
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr " ��データベース�ら変数を除去�る�������ん "
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr " 変数 '%s' （モード '%s'）�見��り��ん "
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr " �置 %d ��正�����り�� "
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr " 二番目�引数�環境���れ��り��ん "
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr " '%s' 引数�長���正�� "
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr " 'missing' ��正�使用�� "
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr " 'missing' �引数�対����使��� "
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr " 'pos' �整数���れ��り��ん "
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr " リスト中�全���素�����必��� "
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr " 'attach' �リスト�データフレーム�も���環境���有効�� "
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr " \"package:base\" �切り離��������ん "
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr " 引数�環境���れ��り��ん "
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr " 引数�シンボル���������ん "
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr " 上� (enclosing) 環境��り��ん "
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr " 検索リスト� \"%s\" ���項目��り��ん "
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr " 'as.environment(NULL)' �利用�廃止�れ��� "
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr " S4 オブジェクト�クラス \"environment\" �拡張�れ��ん "
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr " 'as.environment' �対�る�正�オブジェクト�� "
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr " 環境���り��ん "
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr " シンボル���り��ん "
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr " \"%s\" ��インド�れ��るも���り��ん。 "
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr " 関数��り��ん "
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr " シンボル�既� regular binding を������ "
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr ""
 " �インディング�ロック�れ��る�ら��アクティブ��インディングを変更�る"
 "�������ん "
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr " 未知�演算��� "
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr " ロック�れ��インディングを切り離���ん "
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr " �在使用中��インディングを切り離��������ん "
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr " �正���空間��� "
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr " �ームスペース����登録�れ���� "
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr " �ームスペース�登録�れ����ん "
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr " イン�ート�よ�����る環境引数��正�� "
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr " エクス�ート�よ�����る環境引数��正�� "
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr " イン�ート�エクス�ート��長��一致���れ��り��ん "
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr " エクス�ート�れ�シンボル '%s' �値を������ん "
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr " 未知�エンコーディング��: %d "
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr " 文字列�中� nul �埋�込�れ����: '%s' "
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr " 割り込��中断�れ���; シグナル�無視�れ��� "
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr " [... �略] "
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr " オプション \"warnig.expression\" ��正�� "
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr " (警告�ら変��れ���) %s "
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr " 警告: "
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr " %s �警告��り���: "
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr " 呼�出�: "
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr " 警告メッセージ�失�れ��� \n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] " 警告メッセージ: "
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr " %s �: "
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] ""
 " %d 件�警告��り��� (警告を見る�� warnings() を使��下��) "
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 " %d 件以上�警告��り��� (最�� %d 個�警告を見る�� warnings() を使�"
 "�下��) "
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr " wrapup 中�エラー�起�り���: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr " 以下�エラー "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr " %s �エラー (%s �ら) : "
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr " %s �エラー: "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr " エラー: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr " 追加情報: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr " オプション \"error\" ��正�� \n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr " 実行��止�れ��� \n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr " '%s' �文字列���れ��り��ん "
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " stop() 関数�引数��正�文字列�� "
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " warning() 関数�引数��正�文字列�� "
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr " \"%s\" ��引数�個数�正���り��ん "
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr " %s 中�未実装�機能�� "
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr " 引数�個数��正�� "
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr " 引数�型��正�� "
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr " 時系列���ベクトル �長���致���ん "
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr " 互�性���引数�� "
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr " 未知�エラー�� (報告�������) "
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr " 強制変�中��正確�整数変��行�れ��� "
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr " 未知�警告�� (報告�������) "
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr " 戻る��関数������トップレベル�ジャンプ��� "
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr " トップレベル��整�？ "
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr " �ンドラーデータ (handler data) ��正�� "
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr " エラーメッセージ�文字列���り��ん "
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr " handler stack � restart stack ���� restart �一致���ん "
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr " �正�エラーメッセージ�� "
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr " �正��起動�� "
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr " スタック�ら�����実行�� "
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr " トライ (try) 文脈���り��ん "
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr " エラーメッセージ�文字列��る����り��ん "
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 " ソースファイル� Rprof �よりスキップ�れ���; '%s' を増や������ "
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr " Rprof: プロファイル・ファイル '%s' を開��������ん "
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr " R プロファイル���システム��使���ん "
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 " プロミス�既�評価�れ����: �帰的�引数既定値��照�以���題？ "
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr " 中断�れ�プロミス評価を�開��� "
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 " 評価���り�深�入れ��������。無���帰� "
 "options(expressions=)？ "
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr " 引数��り��ん���略時既定値も�り��ん "
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr " 関数���も�を�用�よ������ "
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr " %2$s#%3$d � %1$s: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr " 引数 %d �空�� "
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 " ジエ�リック関数�環境中� \"%s\" ���シンボル�見��り��ん��� "
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr " シンボル \"%s\" �メソッド�環境�中��り��ん "
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr " �件�長�� 2 以上����最�� 1 ����使�れ�� "
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr " TRUE/FALSE �必������欠�値�� "
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr " 引数�論�変数���解釈�る�������ん "
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr " 引数�長�� 0 �� "
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr " ループ変数�シンボル���り��ん "
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr " for() ループ��正�� "
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr " 複数��果を返� return �許�れ��ん "
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr " 代入�左辺��正 (NULL) �� "
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr " 付値対象��言語オブジェクト�展開�れ�� "
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr " '%s' ����長���� "
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr " base ��空間�����複素数�代入�����ん "
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr " 基本環境�����複素数�代入�����ん "
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr " 複素数�代入��関数��正�� "
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr " 代入�左辺��正 (do_set) �� "
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr " '%s' �見��り��ん "
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr " \"function\" �仮引数リスト��正�� "
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr " '%s' 引数 (型 '%s') ��正�� "
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr " 数値� 'envir' 引数�長�� 1 ���り��ん "
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr " �実行機能� 'eval' 関数�対���サ�ート�れ����ん "
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr " クロージャ�外部�ら 'Recall' �呼�出�れ���。 "
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr " '...' �中�値� promise ���り��ん "
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr " メソッド (\"%s\", \"%s\") � \"%s\" �対���矛盾����� "
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr " グループディスパッ��ディスパッ�エラー��り�� "
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr " \"%s\" � %s 関数���り��ん "
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr " ノードスタック�溢れ��� "
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr " 整数スタック�溢れ��� "
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr " opcode ���当�� "
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr " 'x %s y' � %s �型��正�� "
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr " �イトコード��ージョン��一致��; eval を使��� "
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr " �イトコード��ージョン������ "
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr " �イトコード��ージョン�新����� "
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr " �イトコード��ージョン��一致�� "
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr " for ループ�範囲引数��正�� "
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr " .Internal 関数 '%s' ��り��ん "
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr " �正�関数�� "
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr " BUILTIN 関数���り��ん "
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+#, fuzzy
+msgid "bad numeric 'switch' offsets"
+msgstr " �正�数値スィッ�オフセット�� "
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr " ��付��代替値�無� 'switch' 関数��数値� EXPR �必��� "
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+#, fuzzy
+msgid "bad character 'switch' offsets"
+msgstr " �正��文字スィッ�オフセット�� "
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 " スレッデッド・コード・アドレス (threaded code address) �インデックスを見�"
 "�る�������ん "
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr " 本体 (body) ��正�� "
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr " シンボル記���正�� "
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr " 引数��イトコードオブジェクト���り��ん "
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr " �正�ファイル��� "
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr " 'file' を開��������ん "
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr " 'file' �空���文字列���れ�����ん "
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr " 'ascii' �論�値���れ��り��ん "
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr " 定数値�ッファー��称的�ベクトル���れ��り��ん "
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr " �正�定数値カウント�� "
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr " プロファイルタイマー�使用中�� "
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr " 既��イトコード�分��れ���� "
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr " プロファイルタイマー�設定�失敗���� "
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr " �イトコード�プロファイリング���り��ん "
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr " ��ビルド���イトコードプロファイリング�サ�ート�れ����ん "
 
@@ -3727,15 +3755,15 @@
 msgid "this graphics device does not support event handling"
 msgstr " ��グラフィックスデ�イス� event handling をサ�ート�����ん "
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr " プロンプト��正�� "
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr " 'getGrapshicsEvent' ��帰的使用�サ�ート�れ����ん "
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr " 設定�れ�グラフィックス event handler ��り��ん "
 
@@ -3917,7 +3945,7 @@
 msgstr " �正�正則表�����由� '%s' "
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr " 入力文字列 %d ��正� UTF-8 文字列�� "
@@ -4012,26 +4040,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr " モジュール中�インター�ットルー�ン�アクセス����ん "
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr " インター�ットルー�ン�ロード����ん "
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr " ��切�値�� "
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr " ソケットルー�ン�ロード����ん "
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr " �正� 'comment' 属性を設定�よ������ "
+
 #: src/main/lapack.c:39
 msgid "LAPACK routines cannot be accessed in module"
 msgstr " LAPACK ルー�ン���モジュール��アクセス����ん "
@@ -4040,38 +4067,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr " LAPCK ルー�ン�ロード����ん "
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr " 演算��能���数値�論�値����複素数型���� "
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr " �整���列��二項演算�� "
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr " 整���時系列���り��ん "
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr " '%s' 演算��� 2 ��引数�必��� "
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr " 'x %s y' � 'x' �型��正�� "
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr " 'x %s y' � 'y' �型��正�� "
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr " �項演算� '!' � 2 ��引数�呼�出�れ��� "
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr " '%s' 型�引数を論�型�変���� "
@@ -4080,63 +4107,77 @@
 msgid "dummy - do not translate"
 msgstr " ダミー�訳������� (���訳������) "
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr " wrapup 中�エラー�起�り���: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr " 実行��止�れ��� \n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr " エラー: C スタック・オー�ーフロー�よるセグメンテーション�� \n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr " base パッケージを開��������ん \n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr " %s ��存�れ�データを復帰����ん \n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr " 起動準備中�� - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr " 読�込�����ファイルを開��������ん "
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr " ブラウザを終了����ん "
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 " \"yes\", \"no\", \"ask\" ��� \"default\" ��れ��期待�れ���� "
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 " �対話的�使用�� save=\"ask\": コマンドライン��既定動作�使用�れ�� "
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr " 'save' �値��識����ん "
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr " 'status' ��正��。0 �仮定�れ��� "
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr " 'runLast' ��正��。FALSE �仮定�れ��� "
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr " トップレベル� callback �素�作業空間を割り当�る�������ん "
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr " R_removeTaskCallbackByIndex �負�添字�渡�れ��� "
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr " トップレベル� task callback '%s' �ら�警告メッセージ \n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr " トップレベル� task callback �論�値を返�����ん "
 
@@ -4178,101 +4219,101 @@
 msgid_plural "unused arguments %s"
 msgstr[0] " 使�れ����引数 %s "
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr " �照オブジェクト�曖昧����照・完�����ん "
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr " ファイナライザー�関数��る� NULL ���れ��り��ん "
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr " 弱� (weak) �照���り��ん "
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr " 最��引数�環境�外部�インタ������り��ん "
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr " 二番目�引数�関数���れ��り��ん "
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr " 三番目�引数� 'TRUE' � 'FALSE' ������り��ん "
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr " ベクトル�メモリを使�切り��� (上�����？) "
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr " cons メモリ�尽���� (�界�����も？) "
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr " メモリ�尽���� (�界�����も？) "
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr " サイズ %0.f Tb �メモリブロックを割り当�る�������ん "
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr " サイズ %0.1f Gb �メモリブロックを割り当�る�������ん "
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr " ベクトル�サイズ�大����� "
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr " 負�長��ベクトル�許�れ��ん "
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr " 長� %d �ベクトルを割り当�る�������ん "
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr " ベクトル割り当������型�長� (%s � %d) ��正�� "
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr " サイズ %0.1f Gb �ベクトルを割り当�る�������ん "
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr " サイズ %0.1f Mb �ベクトルを割り当�る�������ん "
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr " サイズ %0.f Kb �ベクトルを割り当�る�������ん "
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr " protect(): プロテクションスタック�溢れ��� "
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] " unprotect(): %d 個����護�れ�項目 "
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr " unprotect_ptr: �インター��り��ん "
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
@@ -4280,63 +4321,68 @@
 " R_Reprotect: %d 個����護�れ�項目���インデックス %d を�プロテクト�"
 "���ん "
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr ""
 " 'Calloc' �メモリー (%.0f �イト�%u �イト中) を割り��られ��ん��� "
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr " 'Realloc' �メモリーを�確�����ん (%.0f �イト) "
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr " ベクトル��インタを返���安全���り��ん "
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr "SET_STRING_ELT 中� インデックス %lu/%lu を設定�よ������ "
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr "SET_VECTOR_ELT中� インデックス %lu/%lu を設定�よ������ "
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr " ��切�値�� "
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr " メモリプロファリング���システム��使���ん "
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr " Rprofmem: ファイル '%s' を開��������ん "
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr " 長�ベクトル���サ�ート�れ����ん: %s:%d "
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr " 文字列引数��求�れ���� "
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr " ��よ��プリミティブ関数��り��ん "
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr " 長� 0 �変数�を使������� "
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr " 変数�� %d �イト�上��� "
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr " .Internal() 引数��正�� "
 
@@ -4378,100 +4424,100 @@
 msgstr ""
 " '%s' をクラス \"%s\" �オブジェクト��用��るよ��メソッド��り��ん "
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr " 'NextMethod' �関数�外�ら呼�れ��� "
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr " 'NextMethod' �匿�関数�ら呼�れ��� "
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr " 呼出���称関数�見��り��ん。メソッド�直接呼�出�れ����？ "
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr " 'function' �関数������� %d 型�� "
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr " 誤��引数��... "
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr " オブジェクト�指定�れ����ん "
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr " �称的関数�指定�れ����ん "
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr " 'NextMethod' ���称的引数��正�� "
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr " 'NextMethod' 中��正� 'group' 引数�見��り��� "
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr " .Method �値��正�� "
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr " 相容れ��メソッド�無視�れ��� "
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr " 起動���メソッド��り��ん "
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr " 基本環境�クラス属性��り除���ん "
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr " 外部�インター�クラス属性��り除���ん "
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr " 'what' �文字ベクトル������り��ん "
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr " 'which' �長� 1 �論�ベクトル������り��ん "
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr " S4 オブジェクト�� 'inherits()' ��� 'is()' を使������ "
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr " 正��環境を見��られ��ん���; 報告を�願����! "
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr " 'onOff' � TRUE ��� FALSE ���れ��り��ん "
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr " \"%s\" 関数���称的���も��見��り��ん��� "
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 " 'methods' ��用�有効��れる��無�� 'standardGeneric' �呼�出�れ��"
 "� (無視���) "
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr " 'standardGeneric' �対�る引数�空���文字列���れ��り��ん "
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4479,7 +4525,7 @@
 msgstr ""
 " 見�����称関数�本体�ら���� standardGeneric(\"%s\") �呼出��� "
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4488,11 +4534,11 @@
 " �正� primitive メソッドコード (\"%s\") ��: \"clear\", \"reset\", \"set"
 "\" ��� \"suppress\" ���れ����れ��り��ん "
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr " �正�オブジェクト��: プリミティブ�関数������り��ん "
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4501,20 +4547,20 @@
 " primitive ��称関数�形�的定義�関数オブジェクト���れ��り��ん (型 "
 "'%s' ��) "
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr " �称的関数 \"%s\" ���返�れ�オブジェクト�一�����よ��� "
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr " ディスパッ�（dispatch）用�与�られ� primitive 関数��正�� "
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr " メソッド割り当��エラー�� "
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4523,88 +4569,93 @@
 " primitive �関数 \"%s\" �メソッド�対��設定�れ������称関数�与�ら"
 "れ����ん "
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 " C level MAKE_CLASS �マクロ��NULL 文字�インタを伴��呼�出�れ��� "
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr " 'methods' パッケージ���ロード�れ����ん "
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr " R_getClassDef(.) � NULL 文字�インタを伴��呼�出�れ��� "
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 " C レベル� NEW マクロ��null クラス�定義�インタを伴��呼�出�れ��� "
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr " 仮想クラス (\"%s\") �らオブジェクトを生��よ������� "
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
 " クラス \"%s\" �オブジェクト��正� S3 オブジェクト�対応�����ん "
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr " オプションリスト�間������ "
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr " 表示�幅��正��: 80 ���� "
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr " 表示��数��正��: 7 ���� "
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr " �正� 'deparse.cutoff', 60 �使�れ��� "
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr " \"device.ask.default\"�対���正�値: FALSEを使��� "
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr " 引数リスト�有効������り��ん "
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr " 'width' パラメータ��正��: %d...%d ���られ���� "
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr " 'digits' �パラメータ��正��: %d...%d ���られ���� "
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr " 'expression' パラメータ��正��: %d...%d ���られ���� "
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr " '%s' �値��正�� "
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr " 'dec' �一文字���れ��り��ん "
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr " \"par.ask.default\" � \"device.ask.default\" �置���られ��� "
 
@@ -4628,11 +4679,16 @@
 msgid "first argument must be atomic"
 msgstr " 最��引数�アトム������り��ん "
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr " 'dec' �一文字���れ��り��ん "
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr " ��能�モード (x) �� "
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr " 引数�アトム��るベクトル���� "
 
@@ -4640,214 +4696,197 @@
 msgid "invalid filename specification"
 msgstr " ファイル��指定��正�� "
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr " ファイル追加中�書�込�エラー�生���� "
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr " 付�足� (append) ��も���り��ん "
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr " ファイル�引数��正�� "
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr " fife '%s' を作れ��ん��由� '%s' �� "
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr " 一番目�ファイル���正�� "
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr " ファイル '%s' を削除����ん��由� '%s' �� "
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr " 二番目�ファイル���正�� "
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr " リンク���も���り��ん "
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 " �� Windows ��ージョン��シンボリックリンク�サ�ート�れ����ん "
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 " シンボリックリンク '%ls' ('%ls' �対�る) を作�����ん��由� '%s' �"
 "� "
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 " '%s' �対�るシンボリックリンク '%s' を作�����ん��由� '%s' �� "
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr " ��プラットフォーム��シンボリックリンク�サ�ート�れ����ん "
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr " '%ls' を '%ls' �リンク����ん��由� '%s' �� "
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr " '%s' を '%s' �リンク����ん��由� '%s' �� "
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr " ��プラットフォーム�� (�ード) リンク�サ�ート�れ����ん "
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr " 'from' � 'to' �異���長��� "
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr " 展開�れ� 'from' ��長���� "
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr " 展開�れ�　'to' ��長���� "
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr " ファイル�を '%s' �ら '%s' �変更����ん��由� '%s' �� "
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr " 正�表�� 'pattern' ��正�� "
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr " R �ホームロケーションを決定����ん "
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr " ファイル��長���� "
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr " 内部�アウトオブメモリー�発生����� "
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr " '%s' �読�込�エラー�� "
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr " 'LC_NUMERIC' をセット�る��R �変�機能�る�も�れ��ん "
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr " LC_MESSAGES � Windows �も存在�����動作���ん "
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 " ロケールを \"%s\" �設定�よ�� OS �レ�ート�求���入れられ��ん "
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr " 'hostname' �長� 1 �文字ベクトル������り��ん "
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr " nsl() 関数�ホスト '%s' を解決����ん��� "
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr " C �関数 'gethostbyname' �未知�書�を返���� "
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr " ��プラットフォーム�� nsl() 関数�サ�ート�れ����ん "
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr " '%s' ����存在��� "
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr " ディレクトリ '%s' を作�����ん��由� '%s' �� "
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr " '%ls' ����存在��� "
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr " ディレクトリ '%ls' を作�����ん��由� '%s' �� "
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr " 入れ��深���� "
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr " 長��るパス長 "
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr " ディレクトリ %ls �作���題��り��: %s "
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr " ディレクトリ %ls �作���題��り��: %s "
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr " 長��るパス長 "
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr " %ls � %ls ��コピー��題��り��: %s "
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr " ディレクトリ %s �作���題��り��: %s "
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr " ディレクトリ %s �作���題��り��: %s "
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr " %s � %s ��コピー��題��り��: %s "
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr " 'mode' �長�� 1 以上������り��ん "
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr " ��プラットフォーム����分� OS �サ�ート�� "
 
@@ -4892,66 +4931,71 @@
 msgid "Metric information not available for this family/device"
 msgstr " �� family/device �対��メトリック情報�利用����ん "
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr " 'na.print' �指定��正�� "
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr " 行ラベル��正�� "
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr " 列ラベル��正�� "
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr " .Internal(print.function(.)) ��関数���引数�� "
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr " 'gap' �，�負�整数������り��ん "
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr " 'tryS4' 内部引数��正�� "
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr " 入力�ッファ�溢れ��� (%d 行) "
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr " 'dblepr' 中�文字列�長���正�� "
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr " 'intpr' 中�文字列�長���正�� "
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr " 'realpr' 中�文字列�長���正�� "
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr " 'realpr' 中�メモリ確��失敗���� "
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr " BLAS/LAPACK 関数 '%6s' �エラーコード %d を返���� "
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr " 行ラベル�数�少����� "
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr " 列ラベル�数�少����� "
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] " [ reached getOption(\"max.print\") -- %d 行を無視���� ] \n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 " ��プラットフォーム�� wchar_t � Unicode ��る���知られ����ん "
@@ -4960,47 +5004,47 @@
 msgid "argument is not a numeric vector"
 msgstr " 引数�数値ベクトル���り��ん "
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr " 引数 (複数) ��正�� "
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr " NA �生��れ��� "
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr " 確率ベクトル� NA ���れ���� "
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr " 確率値�正�値���り��ん "
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr " 正�確率値�少����� "
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 " 'replace = FALSE' �����集団以上�大���標本��る�������ん "
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr " 確率値�個数�正���り��ん "
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 " n >= 2^31, replace = FALSE �64ビットプラットフォーム���サ�ート�れ��"
 "�� "
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr " 引数�長� 1 �文字ベクトル������り��ん "
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
@@ -5008,307 +5052,307 @@
 " 引数�長� 1 �文字ベクトル��る必���り�� \n"
 " 最���素以外�全�無視�れ�� "
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr " 引数 'x' � raw ベクトル������り��ん "
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr " 引数 'multiple' � TRUE ��� FALSE ���れ��り��ん "
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr " 引数 'shift' ����整数値���れ��り��ん "
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr " 引数 'x' �整数ベクトル������り��ん "
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr " 引数 'ｘ' � raw, 整数も���論�型������り��ん "
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr " 引数 'x' � %d 長��数���れ��り��ん "
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr " 引数 'x' � NA を�ん������ん "
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr " �正� UTF-8 文字列�� "
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr " 比較 (%d) �アトミック�よ�リスト型�対�����能�� "
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr " ��比較�許�れ����ん "
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr " �れら�型�比較�未実装�� "
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr " �正�複素値��比較�� "
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr " 'a' � 'b' ��一�型������り��ん "
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr " 読�込�エラー�� "
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr " 整数値�入力エラー�起���� "
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr " 実数値�入力エラー�起���� "
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr " 文字�入力エラー�起���� "
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr " 文字列�入力エラー�起���� "
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr " 入力エラー�起���� "
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr " リストア中�解決����ノード��り��� "
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr " リストア互�性エラー��ージョン %d ��互�性��り��ん "
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr " データファイル中��正� SEXP 型��り��� "
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr " 型�一致���ん "
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr " 内部関数 \"%s\" を見��る�������ん��� "
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr " データ restore 中�ファイル�置をセーブ�る�������ん "
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr " データ restore 中�，ファイル�置を restore �る�������ん "
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr " 基本� namespace � version 1 �ワークスペース��存�れ��ん "
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr " �ージョン 1 �作業スペース�� namespace を�存����ん "
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 " �ージョン 1 �作業スペース��ロック�れ���り使用中� binding を�ん�作"
 "業環境を�存����ん "
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr " �ージョン 1 �作業スペース�� weak reference を�存����ん "
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr " ベクトル型���も�を用�� NewWriteVec �呼�れ��� "
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 " �ージョン 1 �作業スペース���イトコード�オブジェクト��存����ん "
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr " NewWriteItem: 未知�型 %i �� "
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr " ベクトル型���も�を用�� NewReadVec �呼�れ��� "
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 " varsion 1 �ワークスペース�ら��イトコードオブジェクトを読�込む�����"
 "��ん "
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr " NewReadItem: 未知�型 %i �� "
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr " ascii 文字列を読ん��る途中�メモリ�尽���� "
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr " �イナリ値�入力エラー�起���� "
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr " �イナリ文字列を読ん��る途中�メモリ�尽���� "
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr " �イナリ文字列�入力エラー�起���� "
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr " xdr 整数データ�出力エラー�起���� "
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr " xdr 整数データ�入力エラー�起���� "
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr " xdr 文字列データ�出力エラー�起���� "
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr " xdr 実数データ�出力エラー�起���� "
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr " xdr 実数データ�入力エラー�起���� "
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr " xdr 複素数データ�出力エラー�起���� "
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr " xdr 複素数データ�入力エラー�起���� "
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr " 書�込��失敗���� "
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr ""
 " リストア�よ����ファイル�空��能性�データ�読�込�れ��ん��� "
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 " リストア�よ����ファイル� R �新���ージョン�も����れ��。デー"
 "タ�読�込�れ��ん "
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 " ファイル�マジック・ナン�ー��正�� (ファイル�壊れ��る�も�れ��"
 "ん)。データ�ロード�れ��ん��� "
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr " 最��引数�文字ベクトル������り��ん "
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr " �切���付�リスト���り��ん "
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 " '%s' ��ージョン 2.4.0 以�� S4 オブジェクト�よ�����作り直�����"
 "� "
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr " ロード�れ�データ�ペアリスト�形����り��ん "
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr " 最��引数�ファイル�������り��ん "
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr " XDR 書���書�出��失敗���� "
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr " XDR 書���読�込��失敗���� "
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr " データをセーブ����ん -- '%s' を開���ん: %s "
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr " �ージョン %d 書���コ�クション��存����ん "
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr " コ�クション�書�出�����開�れ����ん "
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr " テキストモード�コ�クション�� XDR 書����存����ん "
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr " コ�クション��書�込�エラー�発生���� "
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr " コ�クション�読�込�����開�れ����ん "
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr " �イナリコ�クション�ら�� load() ���� "
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr " 入力�利用����ん "
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5325,7 +5369,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr " scan() 関数� '%s' を期待�����得られ��� '%s' ��� "
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr " 項目�数�多���� "
 
@@ -5333,7 +5377,7 @@
 msgid "empty 'what' specified"
 msgstr " 空� 'what' �指定�れ��� "
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr " %d 行目�� %d 個��素��り��ん "
@@ -5366,33 +5410,33 @@
 msgid "embedded nul(s) found in input"
 msgstr " 入力文字列�中� nul �埋�込�れ���� "
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr " 因��長��異�り�� "
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr " �果�ベクトル�長���� "
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr " 引数�長�� 0 �� "
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] " 数値�� %d 個��素を������: 最���素���使�れ��� "
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr " 引数� NA/NaN �� "
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr " 二番目�引数�型��正確�� "
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr " 型 '%s' �オブジェクトを複製�よ������ "
@@ -5628,55 +5672,51 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr " 並�替���る�検査��る��アトミックベクトル���� "
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr " 'decreasing' � TRUE � FALSE ���れ��り��ん "
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr " 並�替���る��アトミックベクトル���� "
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr " raw 型オブジェクト�ベクトル�ソート����ん "
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr " 添�字� NA ���無�大�� "
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr " 添�字 %ld �範囲外�� "
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr " 添�字� NA �� "
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr " 添�字 %d �範囲外�� "
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr " 引数 %d �ベクトル���り��ん "
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr " 引数�長��異�り�� "
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr ""
 " rank() 関数� ties.method ��正�� [��よ�����決��起�ら�����"
 "�] "
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr " 'x' 中�値�範囲�大����� "
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr " 'text' �ら文字列��変��失敗���� "
@@ -5686,23 +5726,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr " 引数 '%s= \"%s\"' �無視�れ�� "
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr " 最��引数�ベクトル������り��ん "
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr " 二番目�引数�因����れ��り��ん "
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr " グループ長� 0 ����データ長� > 0 �� "
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr " データ�長��分割変数��数���り��ん "
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr " 　因���正�水準を���� "
 
@@ -5757,38 +5797,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr " 変��よりベクトル�長�� 0 ��り��� "
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr " �正�書� '%s'; %s "
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr " 論�オブジェクト�� %d � %i 書�を使������ "
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr " 整数オブジェクト�� %d, %i, %o, %x ��� %X 書�を使������ "
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr " 数値オブジェクト�� %f, %e, %g ��� %a 書�を使������ "
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr " 文字オブジェクト�� %s 書�を使������ "
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr " 文字列� %d 文字�丸�られ��能性��り�� "
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr " サ�ート�れ����タイプ�� "
 
@@ -5796,254 +5836,250 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr " R_LibraryFileName: �ッファー������� "
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr " ベクトル���も�を拡張�よ������ "
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr " ベクトル/リスト�範囲外��付置 (%d �ら %d �拡大) "
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 " 部分代入���る型�フィックス����，両立���型�� (%s �ら %s) "
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr " 添�字付��付値� NA �許�れ����ん "
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr " replacement (置���) �長�� 0 �� "
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr " 置���る��項目数��置���る数��数���り��ん��� "
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr " 行列��添�字�数�正���り��ん "
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr " 行列��部分代入�両立���型�� (%s �ら %s) "
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr " 添�字�数�正���り��ん "
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr " �列�部分代入�両立���型��り�� (%s �ら %s) "
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr " リスト��付値�添字��正�� "
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr " リスト��付値�添字�個数��正�� "
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr " SubAssignArgs: 引数�個数����� "
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr " �果��ゼロ長��り�言語オブジェクト���り��ん "
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 " 環境�サブクラス�対�る [[<- ��\"S4\" 型�オブジェクト�対����定義�"
 "れ���� "
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr " subassignment 環境�対�る誤��引数�� "
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr " 置���られる個数よりも多���素�与�られ��� "
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr " [[ ]] �添�字��り��ん "
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr " [[ ]] �添�字�範囲外�� "
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr " [[ ]] �添�字�個数���切�� "
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr " [[ �よる代入�両立���型��り��(%s �ら %s) "
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr " [[ ]] �添�字 (%d) �範囲外�� "
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr " 添�字�型 '%s' ��正�� "
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr " �� S4 クラス�サブセットを付値�るメソッド��り��ん "
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr " 左辺をリスト�変����� "
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr " 一�未満��素を�択�よ������ "
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr " 二�以上��素を�択�よ������ "
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr " �帰的インデックス�使用中��内部エラー�起���� "
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr " '%s' � '%s' ��更�る部分マッ� "
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr " �帰的�添字�作�レベル %d �失敗���� \n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr " レベル %d ����よ��インデックス��り��ん \n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr " 添�字�数�正���り��ん "
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr " 負�長��ベクトル�許�れ��ん "
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr " (subscript) 論�値添�字�長���� "
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr " 負�添字�混在��る�� 0 ���添字���� "
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr " 添�字� 32-bit R �対���大����� "
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr " �列� 'dimnames' 属性��り��ん "
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr " ベクトル���も���添�字�作 "
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr " 次元��列�最大サイズを超���も�れ��ん "
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr " ��データ型�対���添�字�使���ん "
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr " ��データ型�対���添�字�使���ん "
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr " 次元数�正���り��ん "
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr " 添字�指定�れ����ん "
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr " �� S4 クラス�部分代入�能���り��ん "
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr " 環境� subsetting �対�る誤��引数�� "
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr " 引数 'type' (%s) ��正�� "
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr " 整数�オー�ーフロー��り���。sum(as.numeric(.)) を使��� "
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr " 内部エラー (do_summary 中� 'op = %d')。\t R ��人�相談���ょ� "
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr " 整数�オー�ーフロー��り���。sum(as.numeric(.)) を使��� "
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr " 引数�有��値��り��ん: NA を返��� "
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr " min �引数�有��値��り��ん: Inf を返��� "
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr " max �引数�有��値��り��ん: -Inf を返��� "
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr " 引数�数値��り��ん "
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr " 'which' �渡�引数�論�型���り��ん "
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr " 引数��り��ん "
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr " 入力�タイプ��正�� "
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr " 引数�部分的��利用�れ�� "
 
@@ -6056,8 +6092,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr " ファイル��エンコーディング� 'bytes' �許�れ��ん "
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr " '%s' �ら�サ�ート�れ����変��コードページ %d ��り�� "
@@ -6090,97 +6126,98 @@
 msgid "no 'fileext'"
 msgstr " 'fileext' ��り��ん "
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr " システムコール�失敗����: %s "
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr " 引数�型��正�� "
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr " 引数�長���正�� "
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr " 'Sys.setenv' ���システム��使���ん "
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 " ��システム��\"\" �セット�る����環境変数をセット���状態��る�"
 "������ん "
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr " 'Sys.unsetenv' ���システム��使���ん "
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 " '%s' �ら '%s' ��サ�ート�れ����変��コードページ %d 中��り�� "
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr " 'x' �文字ベクトル������り��ん "
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+#, fuzzy
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr " 'x' � NULL ��� raw vector �ら�るリスト������り��ん "
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr " '%s' � CHARSXP 上�呼�出�れ��れ��り��ん "
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr " エンコーディング� \"bytes\" �文字列�翻訳�許�れ��ん "
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr " internal error: no translation needed "
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr " '%s' ��サ�ート�れ����変��コードページ %d ��り�� "
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr " �正�ユニコード�イント %u "
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr " 'R_TempDir' を作��る�������ん "
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr " R_SESSION_TMPDIR を設定�る���出���ん "
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr " 'R_TempDir' を割り当�る�������ん "
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr " 一時��長���� "
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr " 未使用�一時ファイル�を探��������ん "
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr " R_tmpnam2 ����メモリ割り当��失敗���� "
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr " 'dirmark = TRUE' ���プラットフォーム��サ�ート�れ����ん "
 
@@ -6215,31 +6252,31 @@
 msgid "'nmax' must be positive"
 msgstr " 'nmax' �正���れ��り��ん "
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr " 'match' �ベクトル引数を必����� "
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr " 引数�モードを表�文字列���り��ん "
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr " ... ��れ�存在���状��使�れ��� "
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr " ... �ペアリスト���り��ん "
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr " rowsum �引数�数値データフレーム���り��ん "
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr " ��よ�����起�得������ "
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr " 'names' �文字ベクトル���れ��り��ん "
 
@@ -6247,27 +6284,27 @@
 msgid "object is not a matrix"
 msgstr " オブジェクト�行列���り��ん "
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr " 型 %d � '%s' ��未実装�� "
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr " 型 '%s'（'%s' ���る）�未実装�� \n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr " 型 %d（'%s' ���る）�未実装�� \n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr " ���抽出����タグ��正�� "
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
@@ -6275,114 +6312,114 @@
 " .Internal(%2$s) 関数� %1$d 個�引数�渡�れ�����%3$d 個������り"
 "��ん "
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] " %d 個�引数� '%s' �渡�れ�����%d �必���れ���� "
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr " 使�れ�引数� '%s' � '%s' �一致���ん "
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr " 'nthcdr' リスト� %d より短��� "
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr " 'nthcdr' � CDR down ��リストを必����� "
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr " 'all.x' � TRUE ��� FALSE ���れ��り��ん "
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr " 'all.y' � TRUE��� FALSE ���れ��り��ん "
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr " �果���れる行数�ベクタ�最大長を超���� "
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr " 欠�値��正�� "
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr " 作業ディレクトリを変更����ん "
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr " 文字ベクトル�引数�期待�れ���� "
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr " パス�長���� "
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr " 'quote' �最��文字���使�れ�� "
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr " 文字ベクトル� 'value' �期待�れ���� "
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr " 'value' �正�長�を���������ん "
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr " 'utf8towcs' 中��正�入力 '%s' ��り�� "
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr " '%s' ��正�マル��イト文字��り�� "
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr " エラーメッセージ� 255 文字�切り��られ��� "
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr " 警告メッセージ� 255 文字�切り詰�られ��� "
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr " \"%s\" を数値�変��る際�精度����れ��� "
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr " 全��引数����付�られ����れ��り��ん "
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr " ��ビルド�� ICU �サ�ート�れ����ん "
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr " 'breaks' �ソート�れ����ん "
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr " long vector '%s' �サ�ート�れ����ん "
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr " 'eps.correct' � 0, 1, ��� 2 ���れ��り��ん "
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr " 'x' �ベクトル������り��ん "
 
@@ -6446,7 +6483,7 @@
 msgid "There must be at least three control points"
 msgstr " 少���も三��制御点�必��� "
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr " X11 プロトコルエラー: %s "
@@ -6471,7 +6508,7 @@
 " エラー: X11 �追加�グラフィックスカラーを用�����ん。 \n"
 " X11 を colortype=\"pseudo.cube\" � \"grey\" �使���を考����下�� "
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6479,17 +6516,17 @@
 " ���る X11 フォントも見��られ��ん��� \n"
 " フォントパス�正�������ェック���ょ� "
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr " X11 �フォントサイズ %d を使����（%d ��求�れ�����） "
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr " X11 フォント %s (サイズ %d, フェイス %d) �読�込���ん "
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6497,191 +6534,198 @@
 " ���効果���デ�イス�対���サ�ート�れ����ん: ページ毎�一度��"
 "レ�ート�れ�� "
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 " '%s' �対�� X11 コ�クションを開��� X11 I/O エラー�発生���� "
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr " X11 �致命的 I/O エラー���作業を�存�� R を終了��下�� "
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 " Xlib �サ�ート���ロケール��。����� X 機能� C ロケール�動作��"
 "� "
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr " X �ロケール変更を設定�る�������ん "
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr " �� R ��ージョン�� png �サ�ート��り��ん "
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr " png() 関数�呼�出��ファイル��長���� "
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr " PNG ファイル '%s' を開���ん��� "
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr " �� R ��ージョン�� jpeg �サ�ート��り��ん "
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr " jpeg() 関数�呼�出��ファイル��長���� "
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr " JPEG ファイル '%s' を開���ん��� "
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr " �� R ��ージョン�� tiff �サ�ート��り��ん "
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr " tiff() �呼�出��ファイル��長���� "
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr " bmp() �呼�出��ファイル��長���� "
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr " BMP ファイル '%s' を開���ん��� "
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr " X11 ディスプレイ '%s' ��コ�クションを開��������ん "
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr " X11 デ�イス����開���る���'display' 引数�無視�れ�� "
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr " cairo ベース�型� TrueColor �場����正��動作��� "
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr " jpeg() 関数��明�背景�サ�ート�����ん (bg �白を使���) "
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr " X11 ディスプレイ '%s' �情報を得る�������ん "
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr " X11 ウィンドウを作る�������ん "
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr " 'width=%d, height=%d' �ピクセル���り��も無�値�� "
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr " pixmap を作れ��ん "
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr " フォント�指定��正�� "
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr " フォントファミリー� X11 フォントデータベース��り��ん "
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr " %d < 0 � '%s' ���正�� "
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr " ファイル '%s' を開���ん��� "
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr " ��デ�イス�対�� %s �利用����ん "
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr " XImage を作れ��ん "
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr " dev.hold() �実行後�ロケーターを使������� "
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr " デ�イス %s を開始����ん "
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr " 'width' ��� 'height' ��正�� "
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr " �正�色タイプ� X11 ドライ�ー�引�渡�れ��� "
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr " 未知� X11 カラーモデル�� -- モノクロを使用��� "
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr " デ�イス上��存���プロット��り��ん "
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr " X11cairo デ�イスを開���ん "
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr " ファイル '%s' を開��������ん "
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr " ��ビルド�� savePlot() �サ�ート�れ����ん "
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr " X11 ディスプレイ�接続����ん "
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr " クリップボード�内容を読�込���ん (エラーコード %d) "
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr " X11Routines ストラク�ャ�メモリを割り当�る�������ん "
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+#, fuzzy
+msgid "for https:// URLs use method = \"wininet\""
 msgstr " https:// �URL���setInternet2(TRUE)を使用��下�� "
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr " �実行機能� 'eval' 関数�対���サ�ート�れ����ん "
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr " url 接続�割り当��失敗���� "
 
@@ -6693,29 +6737,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr " 'destfile' 引数�最���素���使�れ��� "
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr " ダウンロード実行中�� "
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr " URL '%s' を開��������ん��由� '%s' �� "
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr " 目標ファイル '%s' を開��������ん��由� '%s' �� "
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr " URL '%s' を試����� \n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr " ダウンロード�れ�長� %0.f != 報告�れ�長� %0.f �� "
@@ -6725,31 +6769,37 @@
 msgid "cannot open URL '%s'"
 msgstr " URL '%s' を開���ん "
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr " サ�ート�れ����URLスキーム�� "
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr " 開���ん: HTTP ステータス� '%d %s' �� "
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr " InternetOpenUrl �失敗: '%s' "
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr " 開���ん: HTTP ステータス� '%d %s' �� "
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr " ��プラットフォーム�� curlGetHeaders �サ�ート�れ����ん "
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr " '%s' 引数��正�� "
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
@@ -6758,108 +6808,128 @@
 " libcurl エラーコード %d \n"
 " \t%s \n"
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 " ��プラットフォーム�� download.file(method = \"libcurl\") �サ�ート�れ"
 "����ん "
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr " 'url' � 'destfile' �長��一致���れ��り��ん "
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr " 目標ファイル '%s' を開��������ん��由� '%s' �� "
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr " ファイル '%s' を開��������ん "
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr " ��コ�クション�ら読�込�����ん "
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr " コ�クションを開��������ん "
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 " ��プラットフォーム�� url(method = \"libcurl\")�サ�ート�れ����ん "
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr " RxmlNanoFTPScanURL: 長��る (�正�？) URL "
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr " FTP プロキシ�情報を�り除����� "
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr " FTP プロキシ '%s' を使��� "
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr " RxmlNanoFTPScanProxy: 長��る (�正�？) URL "
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr " ホスト���解決�出���ん "
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr " サー�ー�接続�る�������ん��� "
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr " サー�ー�ら�応答を���れ��ん��� "
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr " RxmlNanoFTPGetConnection: ソケット�作��失敗���� "
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr " データコ�クションを作�����ん��� "
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr " �ート��インド�失敗���� "
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr " �ート %d �ら listen ����ん��� "
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr " RxmlNanoHTTPScanURL: 長��る (�正�？) URL "
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr " HTTP プロキシ�情報を�り除����� "
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr " HTTP プロキシ '%s' を使��� "
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr " RxmlNanoHTTPScanProxy: 長��る (�正�？) URL "
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr " '%s' を解決�る�������ん "
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr " '%s' ��ート %d �接続���� "
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr " '%s' を�ート %d �コ�クト����ん "
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr " '%s' �リダイレクト�れ�� "
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr " リダイレクト�数�多�����放棄���… "
 
@@ -7092,8 +7162,8 @@
 msgstr " bessel_i �割り当�エラー��り��� "
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr " bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. 引数�範囲外？ \n"
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -7101,17 +7171,22 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr " bessel_i(%g,nu=%g): �果�精度�失�れ��� \n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr " bessel_j �割り当�エラー��り��� "
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 " bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. 引数�範囲外�？ \n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr " bessel_j(%g,nu=%g): �果�精度�失�れ��� \n"
@@ -7121,8 +7196,8 @@
 msgstr " bessel_k �割り当�エラー��り��� "
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr " bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. 範囲外�引数？ \n"
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -7130,16 +7205,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr " bessel_k(%g,nu=%g): �果�精度�失�れ��� \n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr " bessel_y �割り当�エラー��り��� "
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr " bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. 引数�範囲外？ \n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr " bessel_y(%g,nu=%g): �果�精度�失�れ��� \n"
@@ -7149,43 +7229,43 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr " 'k' (%.2f) �整数���れ��り��ん， %.0f �丸�られ��� "
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr " '%s' �中�引数�範囲外�� \n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr " '%s' 中�値�範囲を超����� \n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr " '%s' �中������ん��� \n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr " '%s' �中�最大��精度�満��れ���も�れ��ん \n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr " '%s' �アンダーフロー�起�り��� \n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 " pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() �エラーコード %d を返���� "
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr " pnbinom_mu() -> bratio() �エラーコード %d を返���� "
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr " pnchisq(x=%g, ..): %d 回�繰り返�計算������ん��� "
@@ -7261,7 +7341,7 @@
 " 明示的��延ダイナミックローディング���プラットフォーム��サ�ート�れ�"
 "���ん。既定動作を使��� "
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr " 作業ディレクトリを得る�������ん� "
 
@@ -7277,12 +7357,12 @@
 " readline 入力��スティング中�普通���状��起�り���。bug.report() 関"
 "数を使用��報告��下�� "
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr " 履歴ファイル '%s' ��存��題��り�� "
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7291,87 +7371,123 @@
 " ファイル '%s' を開��������ん: %s \n"
 " \n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr " 'file' 引数�長���� "
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr " 利用��る履歴機構��り��ん "
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr " 履歴ファイル�切り詰�中��題������ "
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr " �存���履歴��り��ん "
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr " タイムスタンプ��正�� "
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr " 空���文字引数�期待�れ���� "
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr " 'intern' �論�値��り NA ������り��ん "
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr " '%s' を popen �る�������ん。�由���ら� '%s' �� "
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 " 線 %d � system(, intern = TRUE) ��呼出�����切り詰�られ��も�れ�"
 "�ん "
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr " 以下�命令�実行中�エラー�起����: '%s' "
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr " 命令�実行中�エラー�起���� "
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr " 命令 '%s' �実行�状態 %d �エラーメッセージ '%s' を����� "
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr " Sys.info() ���システム��実装�れ����ん "
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr " 警告: --gui ��� -g ��値�指定�れ������無視�れ��� "
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr " 警告: '%s' �未知� gui ��。X11 を使��� \n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr " 警告: '%s' �未知� gui ��。何も使���ん \n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr " '-e' �対��一時ファイル�作��失敗���� "
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr " 警告: ファイルリスト�最���を編集��� "
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr " 'what' �文字列���関数���れ��り��ん "
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr " ��システム��ソケット�使���ん "
+
+#~ msgid "no function to restart"
+#~ msgstr " �実行����関数��り��ん "
+
+#~ msgid "argument must be a closure"
+#~ msgstr " 引数�クロージャー���れ��り��ん "
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr " 'hostname' �長� 1 �文字ベクトル������り��ん "
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr " nsl() 関数�ホスト '%s' を解決����ん��� "
+
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr " C �関数 'gethostbyname' �未知�書�を返���� "
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr " ��プラットフォーム�� nsl() 関数�サ�ート�れ����ん "
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr " 'x' 中�値�範囲�大����� "
+
+#~ msgid "non-numeric argument"
+#~ msgstr " 引数�数値��り��ん "
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr " サ�ート�れ����URLスキーム�� "
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr " 'dimnames' �リスト������り��ん "
+
 #~ msgid "'args' must be a list"
 #~ msgstr " 'args' �リスト������り��ん "
 
@@ -7570,15 +7686,9 @@
 #~ msgstr ""
 #~ " �イトコード�プロファイリング中�� R �プロファイル機能�使���ん "
 
-#~ msgid "bad character switch offsets"
-#~ msgstr " �正��文字スィッ�オフセット�� "
-
 #~ msgid "bad switch names"
 #~ msgstr " �正�スィッ���� "
 
-#~ msgid "bad numeric switch offsets"
-#~ msgstr " �正�数値スィッ�オフセット�� "
-
 #~ msgid "constBuf must be a generic vector"
 #~ msgstr " constBuf ��称的�ベクトル���れ��り��ん "
 
@@ -7744,9 +7854,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr " 'title' �文字列���れ��り��ん "
 
-#~ msgid "'text' must be a character string"
-#~ msgstr " 'text' �文字列���れ��り��ん "
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr " '%s' �長�1���れ��り��ん "
 
@@ -7777,9 +7884,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr " 'file' �コ�クション���り��ん "
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr " 'dec' �一文字���れ��り��ん "
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr ""
 #~ " データフレーム�壊れ����（列数 %d � nrows ��������ん） "
diff -Nru r-base-3.2.3/src/library/base/po/ko.po r-base-3.3.1/src/library/base/po/ko.po
--- r-base-3.2.3/src/library/base/po/ko.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/ko.po	2016-04-27 22:15:36.000000000 +0000
@@ -1,23 +1,31 @@
 # Korean translation for R base package
-# src/library/base/po/ko.po
+# ./base/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R base package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 31-MAR-2016 for R-3.3.1 - QC: TBA
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
+# Freezed on 13-AUG-2013 for R-3.1.0 - QC: PASS
+# Freezed on 08-MAR-2012 for R-2.15.0 - QC: PASS
+# Freezed on 20-APR-2010 for R-2.11.0 (25-MAR-2010 as well)
+# Freezed on 14-FEB-2010 for R-2.10.0 - QC: PASS
+# Freezed on 25-JAN-2009 for R-
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +34,7 @@
 
 #: src/appl/optim.c:60
 msgid "non-finite value supplied by 'optim'"
-msgstr "'optim'으로부터 유한하지 않� 값� �성�었습니다"
+msgstr "'optim'�서 유한(finite)하지 않� 값� 반환�었습니다."
 
 #: src/appl/optim.c:67
 #, c-format
@@ -67,9 +75,7 @@
 
 #: src/appl/optim.c:741
 msgid "trace, REPORT must be >= 0 (method = \"SANN\")"
-msgstr ""
-"trace, method� \"SANN\"� 사용�때, REPORT는 반드시 0보다 �거나 같아야 합니"
-"다"
+msgstr "trace, method� \"SANN\"� 사용�때, REPORT는 반드시 0보다 �거나 같아야 합니다"
 
 #: src/appl/pretty.c:111
 msgid "Internal(pretty()): very small range.. corrected"
@@ -132,175 +138,176 @@
 msgid "problem in displaying '%ls'"
 msgstr "'%ls'를 표시하는� 문제가 발�했습니다"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
-msgstr "'%s' ��가 잘못�었습니다"
+msgstr "�� '%s'가 올바르지 않습니다."
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
-msgstr "지��지 않는 윈�우즈 버전입니다"
+msgstr "지��지 않는 Windows (윈�우즈) 버전입니다."
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
-msgstr "잘못� ��입니다"
+msgstr "올바르지 않� ��입니다."
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
-msgstr "사용� 컴퓨터 주소공간� 한계는 4Gb입니다"
+msgstr "don't be silly!: 사용� 컴퓨터 주소공간� 한계는 4Gb입니다."
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
-msgstr "메모리 한계를 줄� 수 없기 때문� 무시�었습니다"
+msgstr "메모리� 한계를 줄� 수 없으므로 실행�지 않습니다."
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
-msgstr "'path'는 반드시 문�형 벡터�어야 합니다"
+msgstr "'path'는 반드시 문�형 벡터�어야 합니다."
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
-msgstr "유효한 장치가 아닙니다"
+msgstr "사용할 수 없는 장치입니다."
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
-msgstr "SDI 모드가 요구�니다"
+msgstr "SDI 모드가 필요합니다."
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
-msgstr "그래픽 장치번호가 유효하지 않습니다"
+msgstr "그래픽 장치번호가 올바르지 않습니다."
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
-msgstr "잘못� 장치입니다"
+msgstr "사용할 수 없는 장치입니다."
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
-msgstr "'Rmbstowcs'� 올바른 입력� 아닙니다"
+msgstr "'Rmbstowcs'� 입력� 올바르지 않습니다."
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
-msgstr "파�선�� 취소�었습니다"
+msgstr "파�선�� 취소�었습니다."
 
 #: src/gnuwin32/run.c:244
 #, c-format
@@ -339,186 +346,182 @@
 msgid "'names' is not a character vector"
 msgstr "'names'는 문�형 벡터가 아닙니다"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "첫번째 ���는 문�열� 입력�어야 합니다"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "세번째 ���는 문�열� 입력�어야 합니다"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "명령 '%s'� 실행으로 �태 %d가 �었습니다"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "세션경과 시간제한� �달했습니다"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "경과시간제한� �달했습니다"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "세션 CPU 시간제한� �달했습니다"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "CPU 시간제한� �달했습니다"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "치명� �러: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "�코딩 '%s'를 ��하지 못합니다"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<�러: �코딩 '%s'으로부터 재�코딩� 실패했습니다>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "파� '%1$s'를 여는� 실패했습니다: %2$s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): 파� '%s'는 존재하지 않습니다\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "경고: R_MAX_MEM_SIZE 값� 유효하지 않아 무시�니다\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "경고: max-mem-size� 주어지지 않았습니다\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "경고: --max-mem-size� 유효하지 않아 무시�니다\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "경고: --max-mem-size=%lu%c: 너무 커서 무시�니다\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "경고: --max-mem-size=%4.1fM: 너무 작아 무시�니다\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "경고: --max-mem-size=%4.0fM: 너무 커서 %uM으로 변경�었습니다\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr "옵션 '%s'� ��를 필요로 합니다"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "옵션 '%s'� 비어있지 않� ��를 필요로 합니다"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "경고: 입력� 너무 길어 '-e %s'가 �략�었습니다\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "경고: 알 수 없는 옵션 '%s'입니다\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "�� '%s'는 무시�었습니다\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "-e는 -f �는 --file와 함께 사용� 수 없습니다"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "tmpfile �성� 실패했습니다 -- TMPDIR 를 올바르게 지정했나요?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "'--save', '--no-save' �는 '--vanilla'를 반드시 지정해주어야 합니다"
 
-#: src/gnuwin32/system.c:1150
-msgid ""
-"impossible to create 'reader thread'; you must free some system resources"
-msgstr ""
-"'reader thread'� �성� 불가능합니다. �부 시스템 리소스� 사용� 중단해야 "
-"합니다"
-
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/gnuwin32/system.c:1161
+msgid "impossible to create 'reader thread'; you must free some system resources"
+msgstr "'reader thread'� �성� 불가능합니다. �부 시스템 리소스� 사용� 중단해야 합니다"
+
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "첨�� 허용 범위를 벗어났습니다"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "�체� 타입 '%s'는 부분대입할 수 없습니다"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr "경고: --encoding� 주어진 값� 없습니다"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "경고: 옵션 '%s'는 � �� 지��지 않습니다"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "경고: '%s'� 주어진 값� 없습니다"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "경고: '%s'� 값� 유효하지 않아 무시�니다"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "경고: %s: 너무 커서 무시�니다"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "경고: '--max-ppsize'� 주어진 값� 없습니다"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "경고: '--max-ppsize'� 값� �수�므로 무시�니다"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "경고: '--max-ppsize'� 값� 너무 작아 무시�니다"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "경고: '--max-ppsize'� 값� 너무 커서 무시�니다"
 
@@ -568,14 +571,11 @@
 
 #: src/main/RNG.c:380
 msgid "'.Random.seed[1] = 5' but no user-supplied generator, so ignored"
-msgstr ""
-"'.Random.seed[1] = 5' ��만 사용�� �하여 제공� �성기가 아니므로 무시�"
-"어집니다"
+msgstr "'.Random.seed[1] = 5' ��만 사용�� �하여 제공� �성기가 아니므로 무시�어집니다"
 
 #: src/main/RNG.c:385
 msgid "'.Random.seed[1]' is not a valid RNG kind so ignored"
-msgstr ""
-"'.Random.seed[1]'는 올바른 난수�성 발�기� 종류가 아니므로 무시�어집니다"
+msgstr "'.Random.seed[1]'는 올바른 난수�성 발�기� 종류가 아니므로 무시�어집니다"
 
 #: src/main/RNG.c:412
 msgid "'.Random.seed' has wrong length"
@@ -619,7 +619,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "'name'� 공간� 할당할 수 없습니다"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "문�형 ��가 필요합니다"
 
@@ -641,9 +641,7 @@
 #, c-format
 msgid "cannot allocate memory for registered native symbol (%d byte)"
 msgid_plural "cannot allocate memory for registered native symbol (%d bytes)"
-msgstr[0] ""
-"%d 바�트가 필요한 등�� 고유기호(registered native symbol)� 메모리를 할당"
-"할 수 없습니다."
+msgstr[0] "%d 바�트가 필요한 등�� 고유기호(registered native symbol)� 메모리를 할당할 수 없습니다."
 
 #: src/main/Rdynload.c:1102 src/main/Rdynload.c:1323
 msgid "must pass package name or DllInfo reference"
@@ -676,7 +674,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "Renviron 내� 변수 '%s'를 지정하는� 문제가 발�했습니다"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr "�� '%s'는 반드시 문�열(character string)�어야 합니다."
@@ -707,21 +705,19 @@
 msgid "invalid multibyte format string"
 msgstr "멀티바�트 형�� �맷문�열� 유효하지 않습니다"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
-msgstr ""
-"�� '%s'는 반드시 길�가 1 보다 커야 하고, 오로지 첫번째 요소만� 사용� 것"
-"입니다"
+msgstr "�� '%s'는 반드시 길�가 1 보다 커야 하고, 오로지 첫번째 요소만� 사용� 것입니다"
 
 #: src/main/agrep.c:190 src/main/agrep.c:820
 msgid "'pattern' must be a non-empty character string"
 msgstr "'pattern'� 반드시 비어있지 않� 문�열�어야 합니다"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "� 로케��서는 정규표현�� 유효하지 않습니다"
 
@@ -732,8 +728,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "� 로케��서는 입력문�열 %d는 유효하지 않습니다"
@@ -741,7 +737,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "�� '%s'는 무시� 것입니다"
@@ -756,7 +752,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "� 로케��서 입력문�열 y[%d]는 유효하지 않습니다"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "regcomp �러: '%s'"
@@ -765,29 +761,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "'FUN.VALUE'는 반드시 벡터�어야 합니다"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "'%s'� 값� 잘못�었습니다"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "유효하지 않� 길�입니다"
 
@@ -823,7 +819,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<value>)� NULL� 아니고 길�가 %d� 리스트� 아닙니다"
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "NaN� �성�었습니다"
 
@@ -835,219 +831,213 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr ""
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "정수형 오버플로우� �하여 �성� NA입니다"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "연산�는 하나 �는 �개� ��를 필요로 합니다"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "�항연산�� 수치가 아닌 �수입니다"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "배열� �기가 올바르지 않습니다"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "시계열� �기가 올바르지 않습니다"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr "� �체� 길�가 서로 배수관계� 있지 않습니다"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "단항연산�� 유효한 ��가 아닙니다"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "유효하지 않� 단항연산�입니다"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "1개� �수를 받는 실수형 함수�나 구현�지 않았습니다"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "구현�지 않� 복소함수입니다"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "%d개� 수치형 �수를 가지는 실수형함수�나 구현�지 않았습니다"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
-msgstr[0] ""
-"'1 �는 2개� ��들� 필요로 하는 '%2$s'� %1$d개� ��들� 전달�었습니다."
+msgstr[0] "'1 �는 2개� ��들� 필요로 하는 '%2$s'� %1$d개� ��들� 전달�었습니다."
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "길�를 0으로 가지는 �번째 ��는 유효하지 않습니다"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "기본값� 없는 �수 \"%s\"가 누��어 있습니다"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "길�가 0� �� 'base'는 유효하지 않습니다"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data'는 반드시 벡터형�어야 하지만 '%s'입니다"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "행렬� �기가 숫�로 지정�지 않았습니다"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "'nrow'� 값� 유효하지 않습니다 (너무 �거나 NA입니다)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "'nrow'� 값� 유효하지 않습니다 (0보다 작습니다)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "'ncol'� 값� 유효하지 않습니다 (너무 �거나 NA입니다)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "'ncol'� 값� 유효하지 않습니다 (0보다 작습니다)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr "null� 아닌 ��터� 열� 수가 0 입니다"
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr "null� 아닌 ��터� 행� 수가 0입니다"
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
-msgid ""
-"data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
+msgid "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr "��터� 길�[%d]가 행� 개수[%d]� 배수가 �지 않습니다"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
-msgid ""
-"data length [%d] is not a sub-multiple or multiple of the number of columns "
-"[%d]"
+msgid "data length [%d] is not a sub-multiple or multiple of the number of columns [%d]"
 msgstr "��터� 길�[%d]가 열� 개수[%d]� 배수가 �지 않습니다"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "��터� 길�가 행렬� 사�즈를 초과합니다"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "지정� 요소들� 개수가 너무 많습니다"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "행렬� �기가 �수입니다"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: 지정� 요소들� 개수가 너무 많습니다"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "3차� 배열� �기가 �수입니다"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr "'alloc3Darray': 지정� 요소들� 개수가 너무 많습니다"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "'allocArray': 'dims'� �하여 지정� 요소들� 개수가 너무 많습니다"
 
-#: src/main/array.c:493
-#, fuzzy, c-format
+#: src/main/array.c:523
+#, c-format
 msgid "'%s' must be a list or atomic vector"
-msgstr "'x'는 반드시 NULL �는 벡터들로 구성� 리스트�어야 합니다"
+msgstr "'%s'는 반드시 리스트(list) �는 �형벡터(atomic vector)�어야 합니다. "
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "행렬과 같� �체가 ��로서 '%s'� 전달�어져야 합니다"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "수치 �는 복소수형태� 행렬 혹� 벡터 ��가 요구�니다"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "�합한 ��들� 아닙니다"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "��가 행렬� 가지지 않습니다"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "첫번째 ��가 유효하지 않습니다.  반드시 배열�어야만 합니다"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm'� 길�는 %2$d�어야 하는� %1$d입니다"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a'는 �름� 주어진 dimnames를 가지고 있지 않습니다"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "'perm[%d]'� 차�� �름과 �치하지 않습니다"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "'perm'내�서 허용하는 범위외� 값입니다"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'resize'는 반드시 TRUE �는 FALSE �어야 합니다"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x'는 반드시 수치형�어야 합니다"
 
-#: src/main/array.c:1381
-#, fuzzy
-msgid "'X' is too short"
-msgstr "'object'가 너무 짧습니다"
+#: src/main/array.c:1425
+msgid "'x' is too short"
+msgstr "'x'� 길�가 너무 짧습니다."
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr "'dims'� 길�가 0� � 수 없습니다"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr "'x'� 길�는 반드시 양수�어야 합니다"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
-msgstr ""
-"'backsolve'� 비가역행렬� 있습니다.  대�행렬 [%d]� 첫번째가 제로입니다"
+msgstr "'backsolve'� 비가역행렬� 있습니다.  대�행렬 [%d]� 첫번째가 제로입니다"
 
 #: src/main/attrib.c:40 src/main/attrib.c:231 src/main/attrib.c:265
 #: src/main/attrib.c:287 src/main/attrib.c:403 src/main/attrib.c:450
@@ -1068,8 +1058,7 @@
 #: src/main/attrib.c:377
 #, c-format
 msgid "invalid type (%s) for 'names': must be vector"
-msgstr ""
-"'names'는 반드시 벡터�어야 하는� 유효하지 않� 타입 %s를 가지고 있습니다"
+msgstr "'names'는 반드시 벡터�어야 하는� 유효하지 않� 타입 %s를 가지고 있습니다"
 
 #: src/main/attrib.c:380
 #, c-format
@@ -1108,343 +1097,327 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "유효하지 않� 'class' �성� 지정하려고 시�합니다"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr "�래스 '%s'는 'names' 슬롯� 가지고 있지 않습니다"
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
-msgid ""
-"class '%s' has no 'names' slot; assigning a names attribute will create an "
-"invalid object"
-msgstr ""
-"�래스 '%s'는 아무런 'names' 슬롯� 가지지 않기 때문� names �성� 부여하는 "
-"것� 유효하지 않� �체를 �성하게 할 것입니다"
+msgid "class '%s' has no 'names' slot; assigning a names attribute will create an invalid object"
+msgstr "�래스 '%s'는 아무런 'names' 슬롯� 가지지 않기 때문� names �성� 부여하는 것� 유효하지 않� �체를 �성하게 할 것입니다"
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
-msgid ""
-"invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
-msgstr ""
-"벡터가 아닌 �래스 ('%s')� 있는 'names' 슬롯� 지정하기 위해서 names()<- 와 "
-"같� 구문� �용하는 것� 유효하지 않습니다"
+msgid "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
+msgstr "벡터가 아닌 �래스 ('%s')� 있는 'names' 슬롯� 지정하기 위해서 names()<- 와 같� 구문� �용하는 것� 유효하지 않습니다"
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "'names' ��는 함께 사용� 수 없습니다"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "%s는 'names' �성� 지정하는� 유효한 타입� 아닙니다"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames'가 배열� 아닌 �체� �용�었습니다"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames'� 반드시 리스트�어야 합니다"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
+msgstr "'%s'는 반드시 리스트(list)�어야 합니다. "
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "'dimnames'� 길� [%d]는 반드시 'dims'� 길� [%d]와 같아야 합니다"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
-msgstr ""
-"%s는 'dimnames'� 유효한 유형� 아닙니다 (�는 반드시 벡터�어야 합니다)"
+msgstr "%s는 'dimnames'� 유효한 유형� 아닙니다 (�는 반드시 벡터�어야 합니다)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "'dimnames'� 길� [%d]가 배열� �기와 같지 않습니다"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "첫번째 ��가 유효하지 않습니다"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "�번째 ��가 유효하지 않습니다"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "차�벡터� 길�가 0� 것� 유효하지 않습니다"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "dims� 누�� 값들� 있습니다"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "dims� �수값들� �함�어 있습니다"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr "dims가 �체� 길�와 �치하지 않습니다"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "dims [product %d]가 �체 [%d]� 길�와 �치하지 않습니다"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "�성들� 반드시 리스트 �는 NULL�어야 합니다"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "�성들� 반드시 �름� 주어져야 합니다"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
-msgstr ""
-"모든 �성들� 반드시 �름� 가지고 있어야 합니다 [그러나 %d는 그렇지 않습니"
-"다]"
+msgstr "모든 �성들� 반드시 �름� 가지고 있어야 합니다 [그러나 %d는 그렇지 않습니다]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "'which'는 반드시 문�형 모드�어야 합니다"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "오로지 한개� �성만� 'which'� 주어질 수 있습니다"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "'%s'는 '%s'� 부분�으로만 �치합니다"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "'%s'는 슬롯�름� 유효한 타입� 아닙니다"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name'� 반드시 NULL� 아닌 문�열�어야 합니다"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "슬롯�름� 유형 �는 길�가 잘못�었습니다"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "유형 \"%2$s\"를 가지는 �체로부터 슬롯 (\"%1$s\")를 얻� 수 없습니다"
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
-msgstr ""
-"�래스 \"%2$s\"를 가지는 � �체�는 \"%1$s\" �름� 가진 슬롯� 없습니다"
+msgstr "�래스 \"%2$s\"를 가지는 � �체�는 \"%1$s\" �름� 가진 슬롯� 없습니다"
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "NULL �체� 슬롯� 지정하려고 했습니다"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "'methods' 패키지없� formal classes를 사용할 수 없습니다"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
-msgid ""
-"trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
-"slots"
-msgstr ""
-"슬롯� 없는 기본 �래스 (\"%2$s\")로부터 슬롯 \"%1$s\"를 가져오려 했습니다"
+msgid "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no slots"
+msgstr "슬롯� 없는 기본 �래스 (\"%2$s\")로부터 슬롯 \"%1$s\"를 가져오려 했습니다"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
-msgid ""
-"trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
-"object "
-msgstr ""
-"S4 �체가 아닌 �래스 \"%2$s\"� �체로부터 슬롯 \"%1$s\"를 가져오려했습니다"
+msgid "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 object "
+msgstr "S4 �체가 아닌 �래스 \"%2$s\"� �체로부터 슬롯 \"%1$s\"를 가져오려했습니다"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr "'%s'내�서 초래� 벡터는 벡터� 길�제한� 넘어섭니다"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "타입 '%s'는 아� '%s'�서 구현�지 않았습니다"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "형��� 'recursive'가 반복�니다"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "형��� 'use.names'가 반복�니다"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "리스트가 아닌 ��입니다"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "'%s'내� 있는 �래스명� 너무 �니다"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "타입 '%s'으로부터 행렬� �성할 수 없습니다"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
-msgstr ""
-"��� 행렬� 가진 행� 개수는 반드시 서로 �치해야 합니다 (�� %d를 참고하"
-"세요)"
+msgstr "��� 행렬� 가진 행� 개수는 반드시 서로 �치해야 합니다 (�� %d를 참고하세요)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
-msgstr ""
-"��� 행렬� 가진 열� 개수는 반드시 서로 �치해야 합니다 (�� %d를 참고하"
-"세요)"
+msgstr "��� 행렬� 가진 열� 개수는 반드시 서로 �치해야 합니다 (�� %d를 참고하세요)"
 
 #: src/main/builtin.c:43
 msgid "vector size cannot be NA"
 msgstr "벡터� �기는 NA� 수 없습니다"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "벡터� �기는 NA �는 NaN � 수 없습니다"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "벡터� �기는 무한할 수 없습니다"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "지정� 벡터� �기가 너무 �니다"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "NULL �바�런먼트� 사용� ��� 지��지 않습니다"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+msgid "argument is not a function"
+msgstr "함수를 ��로 받지 않았습니다."
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "대체�체는 �바�런먼트가 아닙니다"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos'는 반드시 �바�런먼트�어야 합니다"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "��는 �바�런먼트� 아닙니다"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "비어있는 �바�런먼트는 모체를 가지지 않습니다"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "비어있는 �바�런먼트는 모체를 지정할 수 없습니다"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr ""
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr ""
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent'는 �바�런먼트가 아닙니다"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "� 연결� 쓰기를 할 수 없습니다"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "'%s' 지정� 유효하지 않습니다"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "양수가 아닌 'fill' ��는 무시�어질 것입니다"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "타입 '%2$s'� �� %1$d는 'cat'� �하여 다루어 질 수 없습니다"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "벡터: 모드가 '%s'� 벡터를 만들 수 없습니다."
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "벡터가 아닌 것� 길�를 지정할 수 없습니다"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "유효하지 않� ��입니다"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "유효하지 않� 값입니다"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...'가 잘못� 맥��서 사용�었습니다"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "'switch'� 기본값으로 '%1$s'와 '%2$s'가 중복�니다"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "'EXPR'� 없습니다"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR� 반드시 길�가 1� 벡터�어야 합니다"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
@@ -1453,100 +1426,111 @@
 "EXPR는 정수로서 다루어지는 \"factor\"입니다.\n"
 " 대신 '%s'� 사용해보세요."
 
-#: src/main/character.c:104 src/main/character.c:146
-#, fuzzy, c-format
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
+#, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
-msgstr[0] "%3$d를 필요로 하는 '%2$s'� �� %1$d가 전달�었습니다"
+msgstr[0] ""
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s'� 문�형 벡터를 필요로 합니다"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
 #, c-format
-msgid "invalid multibyte string %d"
-msgstr "유효하지 않� 멀티바�트 문�열 %d입니다"
+msgid "invalid multibyte string, %s"
+msgstr ""
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
-"요소 %d� 대한 글�� 개수를 \"bytes\" �코딩으로는 계산� 할 수 없습니다"
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
-msgstr "요소 %d� 대한 너비를 \"bytes\" �코딩으로는 계산� 할 수 없습니다"
+msgid "width is not computable for %s in \"bytes\" encoding"
+msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "문�형� 아닌 �체로부터 부분문�열들� 추출하려고 했습니다"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr "유효하지 않� 부분문�열 ��들입니다"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+msgid "non-character object(s)"
+msgstr "문�형 �체(들)가 아닙니다."
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "문�형� 아닌 �체�서 부분문�열들� 대체합니다"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "첫번째 ��는 반드시 문�형 벡터�어야 합니다"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "아스키 문�가 아닌 것� 사용한 약어입니다"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "문�로 �루어지지 않� �름들입니다"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "유효하지 않� 멀티바�트 문�열 %d입니다"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "문�형� 가지지 않는 ��입니다"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "범위지정� 축소합니다 ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "범위지정� 축소합니다 ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "유효하지 않� UTF-8 문�열 'old'입니다"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "유효하지 않� 멀티바�트 문�열 'old'입니다"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "유효하지 않� UTF-8 문�열 'new'입니다"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "유효하지 않� 멀티바�트 문�열 'new'입니다"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old'� 길�가 'new'� 길�보다 �니다"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "유효하지 않� 멀티바�트 문�열 %d가 입력�었습니다"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim()는 문�형 벡터를 필요로 합니다"
 
@@ -1558,16 +1542,15 @@
 msgid "applies only to lists and vectors"
 msgstr "오로지 리스트와 벡터�만 �용�니다"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "강제형변환� �해 �성� NA 입니다"
 
 #: src/main/coerce.c:79
-#, fuzzy
 msgid "NAs introduced by coercion to integer range"
-msgstr "강제형변환� �해 �성� NA 입니다"
+msgstr ""
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "강제형변환중� 허수부분� 버려졌습니다"
 
@@ -1575,186 +1558,165 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "강제형변환중 범위밖� 값들� 0으로 처리�니다"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "유효하지 않� ��터� 모드 '%s'입니다 (너무 짧습니다)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "'pairlist' �체는 유형 '%s'로 강제형변환� 수 없습니다"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "(리스트) �체는 유형 '%s'로 강제형변환 � 수 없습니다"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(기호) �체는 유형 '%s'로 강제형변환 � 수 없습니다"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "본 S4 �래스를 벡터로 강제형변환하는 방법� 없습니다"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "�바�런먼트들� 다른 유형으로 강제형변환� 수 없습니다"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "요�� 아닌 것으로 강제형변환� 시�하고 있습니다"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
-msgstr ""
+msgstr "잘못� 요소"
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "리스트 ��가 와야합니다"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "유효하지 않� �바�런먼트입니다"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "��는 반드시 길�가 최소 1 �어야 합니다"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "함수� 대한 내용� 유효하지 않습니다"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "길�가 0� 유효하지 않� ��입니다"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "�� 목�� 유효하지 않습니다"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "타입 \"single\"� R�서 구현�지 않았습니다"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
-msgstr ""
+msgstr "구현�지 않� 조건�"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s()는 유형� '%s'� (리스트 �는 벡터)가 아닌 것� �용�었습니다"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "유형 '%s'� 대한 기본메소드는 구현�지 않았습니다"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "'name'� 없습니다"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "첫번째 ��는 반드시 문�열�어야 합니다"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what'� 반드시 문�열 �는 함수�어야 합니다"
+#: src/main/coerce.c:2464
+msgid "'what' must be a function or character string"
+msgstr "'what'� 반드시 함수�거나 문�열�어야 합니다."
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr "'args'는 반드시 리스트 �는 �스프레�션�어야 합니다"
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr ""
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir'는 반드시 �바�런먼트�어야 합니다"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "지정� �바�런먼트는 유효하지 않습니다"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "class(x)를 NULL로 설정했기 때문� 결과는 ��� S4 �체가 아닙니다"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
-msgid ""
-"Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
-"longer be an S4 object"
-msgstr ""
-"class(x)를 다중문�열 (\"%s\", \"%s\", ...)로 설정했기 때문� 결과는 ��� "
-"S4 �체가 아닙니다"
+msgid "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no longer be an S4 object"
+msgstr "class(x)를 다중문�열 (\"%s\", \"%s\", ...)로 설정했기 때문� 결과는 ��� S4 �체가 아닙니다"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
-msgid ""
-"Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
-"an S4 object"
-msgstr ""
-"\"%s\"� class(x)를 설정하는 것� �성� NULL로 변경하는 것�므로, 결과는 �"
-"�� S4 �체가 아닙니다"
+msgid "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be an S4 object"
+msgstr "\"%s\"� class(x)를 설정하는 것� �성� NULL로 변경하는 것�므로, 결과는 ��� S4 �체가 아닙니다"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "�래스 문�열� 대체할 �체가 유효하지 않습니다"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
-msgid ""
-"\"%s\" can only be set as the class if the object has this type; found \"%s\""
-msgstr ""
-"\"%s\"는 오로지 �체가 � 유형� 가지고 있� 때만 �래스로서 설정�지만, 유"
-"형 \"%s\"입니다"
+msgid "\"%s\" can only be set as the class if the object has this type; found \"%s\""
+msgstr "\"%s\"는 오로지 �체가 � 유형� 가지고 있� 때만 �래스로서 설정�지만, 유형 \"%s\"입니다"
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
-msgid ""
-"invalid to set the class to matrix unless the dimension attribute is of "
-"length 2 (was %d)"
-msgstr ""
-"차��성� 길�가 2가 아닌��� 행렬� �래스를 부여할 수 없는�, %d 입니다"
+msgid "invalid to set the class to matrix unless the dimension attribute is of length 2 (was %d)"
+msgstr "차��성� 길�가 2가 아닌��� 행렬� �래스를 부여할 수 없는�, %d 입니다"
 
-#: src/main/coerce.c:2772
-msgid ""
-"cannot set class to \"array\" unless the dimension attribute has length > 0"
-msgstr ""
-"차��성� 길�가 0 보다 �지 않다면 배열� �래스를 설정할 수 없습니다"
+#: src/main/coerce.c:2787
+msgid "cannot set class to \"array\" unless the dimension attribute has length > 0"
+msgstr "차��성� 길�가 0 보다 �지 않다면 배열� �래스를 설정할 수 없습니다"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value'는 반드시 NULL 문�열� 아니여야 합니다"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "요�� 대한 저장모드 변경� 유효하지 않습니다"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "유효하지 않� 복소수 단항 연산�입니다"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "구현�지 않� 복소수 연산입니다"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "함수� 수치가 아닌 ��가 주어졌습니다"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "유효하지 않� 다항계수입니다"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "근� 찾는 코드� 문제가 있습니다"
 
@@ -1766,7 +1728,7 @@
 msgid "connection not found"
 msgstr "커넥션� 찾� 수 없습니다"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "유효하지 않� 커넥션입니다"
 
@@ -1775,9 +1737,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "사용�지 않는 커넥션 %d (%s)를 닫습니다\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "'%1$s'�서 '%2$s'로� 변환� 지��지 않습니다"
@@ -1859,8 +1821,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "지정� 블�� 너무 �니다"
 
@@ -1888,27 +1850,24 @@
 msgstr "fifo 커넥션 할당� 할 수 없습니다"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "'description' ��� 첫번째 요소만� 사용�었습니다"
 
 #: src/main/connections.c:1227
-msgid ""
-"fifo(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
-msgstr ""
-"fifo(\"\")는 오로지 open = \"w+\"와 open = \"w+b\"만� 지�합니다.  전�를 사"
-"용합니다"
+msgid "fifo(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
+msgstr "fifo(\"\")는 오로지 open = \"w+\"와 open = \"w+b\"만� 지�합니다.  전�를 사용합니다"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "커넥션� 열 수 없습니다"
@@ -1966,17 +1925,15 @@
 
 #: src/main/connections.c:1678
 #, c-format
-msgid ""
-"file '%s' has trailing content that appears not to be compressed by bzip2"
-msgstr ""
-"파� '%s'는 bzip2로 압축�지 않� 것 같� 긴 분량� 내용� 가지고 있습니다"
+msgid "file '%s' has trailing content that appears not to be compressed by bzip2"
+msgstr "파� '%s'는 bzip2로 압축�지 않� 것 같� 긴 분량� 내용� 가지고 있습니다"
 
 #: src/main/connections.c:1724 src/main/connections.c:1728
 #: src/main/connections.c:1734 src/main/connections.c:1751
 msgid "allocation of bzfile connection failed"
 msgstr "bzfile 커넥션 할당� 할 수 없습니다"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "lzma 디코�를 초기화 할 수 없습니다, �러 %d입니다"
@@ -1996,12 +1953,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr "�것� � 빌드� R� 지�하지 않는 %s로 압축� 파�입니다"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "�립보드� 복사하는 필요한 메모리 할당� 실패했습니다"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "�리보드를 열 수 없거나 아무런 �스트� �함하고 있지 않습니다"
 
@@ -2058,7 +2015,7 @@
 #: src/main/connections.c:2606 src/main/connections.c:2610
 #: src/main/connections.c:2616 src/main/connections.c:2642
 msgid "allocation of raw connection failed"
-msgstr ""
+msgstr "�시 커넥션� 할당 실패"
 
 #: src/main/connections.c:2695
 msgid "'con' is not a rawConnection"
@@ -2104,377 +2061,355 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con'� 출력 textConnection� 아닙니다"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "� 시스템�서는 소켓� 사용할 수 없습니다"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con'� 연결� 아닙니다"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "표준 커넥션들� 열 수 없습니다"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "커넥션� �미 열려 있습니다"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "알 수 없는 'rw' 값입니다"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "표준 커넥션들� 닫� 수 없습니다"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr "'output' sink 커넥션� 닫� 수 없습니다"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr "'message' sink 커넥션� 닫� 수 없습니다"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "커넥션� 열려 있지 않습니다"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr "행� 버�사�즈보다 길어지고 있습니다"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "� 커넥션으로부터 ��수 없습니다"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "readLines내�서 버�를 할당할 수 없습니다"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr "�� %d�서 nul � �함하는 것으로 보여집니다"
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "'%s'�서 불완전한 마지막 행� 발견�었습니다"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "readLines로 불러들�는 행� 수가 너무 �습니다"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "파�� �� 있는 완전하지 않� 문�열� 제거�었습니다"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
-msgstr ""
-"� 터미네�터를 찾�수 없습니다: 따�서 10000 바�트�서 문�열� �릅니다"
+msgstr "� 터미네�터를 찾�수 없습니다: 따�서 10000 바�트�서 문�열� �릅니다"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "바�너리 커넥션으로는 오로지 �� 수 밖� 없습니다"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "복소수형 벡터들� �기 변경� 지��지 않습니다"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "� 시스템�서 �기 %d를 알 수 없습니다"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw는 항� 사�즈가 1 입니다"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr "'signed = FALSE'는 사�즈가 1과 2� 정수들� 대해서만 유효합니다"
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x'는 atomic 벡터유형� 아닙니다"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "바�너리 커넥션� 쓰기만� 할 수 있습니다"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "오� 2^31-1 바�트만� raw 벡터� 쓰여질 수 있습니다"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "오� 2^31-1 바�트만� 한 번� writeBin() 호출� 쓰여질 수 있습니다"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "커�센� 쓰기 문제가 발�했습니다"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "raw 벡터들� 대해서 �기변경� 지��지 않습니다"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "readChar()� 유효하지 않� UTF-8 입력입니다"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "UTF-8가 아닌 MBCS 로케��서만 바�트로만 �� 수 있습니다"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
-msgstr "'object'가 너무 짧습니다"
+msgstr "'object'� 길�가 너무 짧습니다."
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
-msgstr ""
-"writeChar: 문�열내� 있는 것보다 � 많� 바�트가 요구�어 집니다 - will "
-"zero-pad"
+msgstr "writeChar: 문�열내� 있는 것보다 � 많� 바�트가 요구�어 집니다 - will zero-pad"
 
-#: src/main/connections.c:4588
-msgid ""
-"writeChar: more characters requested than are in the string - will zero-pad"
-msgstr ""
-"writeChar: 문�열내� 있는 것보다 � 많� 문�들� 요구�어 집니다 - will "
-"zero-pad"
+#: src/main/connections.c:4595
+msgid "writeChar: more characters requested than are in the string - will zero-pad"
+msgstr "writeChar: 문�열내� 있는 것보다 � 많� 문�들� 요구�어 집니다 - will zero-pad"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr "푸쉬백 ��들� 최대값� 초과했습니다"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr "푸쉬백� 위한 공간� 할당할 수 없습니다"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "�기가 가능한 열린 커넥션�서만 푸쉬백� 할 수 있습니다"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "�스트 모드 커넥션�서만 푸쉬백� 할 수 있습니다"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "sink 스�� 꽉 찼습니다"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "출력� stdin으로 전환할 수 없습니다"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "제거할 sink가 없습니다"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr "NA��는 커넥션� 없습니다"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "%d�는 커넥션� 없습니다"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
-msgstr ""
+msgstr "메소드 \"wininet\"� 윈�우즈�서만 지��니다."
 
-#: src/main/connections.c:5116
-msgid ""
-"file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
-msgstr ""
-"파�(\"\")� 오로지 open = \"w+\"과 open = \"w+b\"만� 지�합니다: 전�� 것"
-"� 사용합니다"
+#: src/main/connections.c:5103
+msgid "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
+msgstr "파�(\"\")� 오로지 open = \"w+\"과 open = \"w+b\"만� 지�합니다: 전�� 것� 사용합니다"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr "� 메소드� �하여 지��는 URL scheme� 아닙니다."
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "파� 스트림� gzip 매�넘버를 가지고 있지 않습니다"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "파� 스트림� 유효한 gzip 헤�를 가지고 있지 않습니다"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "'gzcon' 커넥션� 플러싱 하는 �안� 쓰기 �러가 발�했습니다"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "crc �러 %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "'gzcon' 커넥션� 쓰기 �러가 발�했습니다"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level'� 반드시 0 ... 9 중 하나�어야 합니다"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression'� 반드시 TRUE �는 FALSE�어야 합니다"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+msgid "'text' must be TRUE or FALSE"
+msgstr "'text'는 반드시 TRUE �는 FALSE�어야 합니다."
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr "�미 'gzcon' 커넥션입니다"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "�기 �는 쓰기를 위한 바�너리 커넥션들만� 사용할 수 있습니다"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
-msgstr ""
-"�스트 모드 'file' 커넥션� �용하는 것� 제대로 작�하지 않� 수 있습니다"
+msgstr "�스트 모드 'file' 커넥션� �용하는 것� 제대로 작�하지 않� 수 있습니다"
 
-#: src/main/connections.c:5518
-msgid ""
-"cannot create a 'gzcon' connection from a writable textConnection; maybe use "
-"rawConnection"
-msgstr ""
-"쓰기가 가능한 textConnection으로부터 'gzcon' 커넥션� �성할 수 없습니다.  아"
-"마� rawConnection� 사용해야 할 것 같습니다"
+#: src/main/connections.c:5514
+msgid "cannot create a 'gzcon' connection from a writable textConnection; maybe use rawConnection"
+msgstr "쓰기가 가능한 textConnection으로부터 'gzcon' 커넥션� �성할 수 없습니다.  아마� rawConnection� 사용해야 할 것 같습니다"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "'gzcon' 커넥션 할당� 할 수 없습니다"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "소켓들� 목�� 아닙니다"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "잘못� 쓰기 지시�들입니다"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "소켓 커넥션� 아닙니다"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
-msgstr ""
-"알 수 없는 종류� 압축� 사용�었으므로 압축�지 않� 것으로 가정합니다"
+msgstr "알 수 없는 종류� 압축� 사용�었으므로 압축�지 않� 것으로 가정합니다"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr "%s 커넥션� 할당� 실패했습니다"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr "break/next� 대한 루프가 없으므로 최�위레벨로 ��합니다"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "��아가야 할 함수가 없으므로 최�위레벨로 ��합니다"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "타겟 컨�스트가 스�� 존재하지 않습니다"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "스�� 그렇게 많� 프레임들� 있지 않습니다"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "'n'�는 오로지 양� 값들만� 허용�니다"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "재시작� 할 함수가 없습니다"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "컨�스트� 개수는 반드시 양수�어야 합니다"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "쿼리를 위한 브�우저 컨�스트가 없습니다"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
-msgstr ""
+msgstr "활성화� 브�우저 호출� 많지는 않습니다. "
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "호출 스�� 그렇게 많� 함수들� 있지는 않습니다"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "'do_sys'�서 내부오류가 발�했습니다"
 
 #: src/main/cum.c:49
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
-msgstr ""
-"'cumsum'�서 정수형 오버플로우가 발�했으므로 'cumsum(as.numeric(.))'� 사용"
-"해주세요"
+msgstr "'cumsum'�서 정수형 오버플로우가 발�했으므로 'cumsum(as.numeric(.))'� 사용해주세요"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr "복소수들� 대해서는 'cummax'가 정��어 있지 않습니다"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr "복소수들� 대해서는 'cummin'� 정��어 있지 않습니다"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "알 수 없는 cumxxx 함수입니다"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "시간대를 설정하는 �중 문제가 발�했습니다"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "� 시스템�서는 시간대를 설정할 수 없습니다"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "시간대가 설정�어 있지 않아서 �긴 문제입니다"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "비어있지 않� \"POSIXlt\" 스트럭�� 길�가 �� 구성요소가 있습니다"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "'read.dcf'� 메모리를 할당할 수 없습니다"
 
@@ -2488,11 +2423,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "'%s ...'로 시작하는 줄� 잘 못 �었습니다"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "��는 반드시 �로우져�어야 합니다"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "��는 반드시 함수�어야 합니다"
 
@@ -2501,7 +2432,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'%s'� 대한 값� 반드시 TRUE �는 FALSE �어야 합니다."
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "��는 반드시 함수가 아니어야 합니다"
 
@@ -2511,69 +2442,64 @@
 
 #: src/main/debug.c:146
 msgid "'tracemem' is not useful for promise and environment objects"
-msgstr ""
-"'tracemem'� promise와 �바�런먼트 �체들� 대해서는 유용하지 않습니다"
+msgstr "'tracemem'� promise와 �바�런먼트 �체들� 대해서는 유용하지 않습니다"
 
 #: src/main/debug.c:149
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
-msgstr ""
-"'tracemem'� weak reference �는 외부 ��터 �체들� 대해서는 유용하지 않습"
-"니다"
+msgstr "'tracemem'� weak reference �는 외부 ��터 �체들� 대해서는 유용하지 않습니다"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R� 메모리 프로파� 지�기능과 함께 컴파� �지 않았었습니다"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "��들� 수가 너무 �습니다"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "'deparse'� 대한 'cutoff'� 값� 유효하지 않으므로 기본값� �용합니다"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "S4�체� deparse는 source() 할 수 없는 것 같습니다"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "deparse는 아마� 불완전한 것 같습니다"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "deparse는 R < 2.7.0 �서는 source()할 수 없는 것 같습니다"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
-msgstr ""
-"'file'� 반드시 문�열(character string) �는 커넥션(connection)�어야 합니"
-"다."
+msgstr "'file'� 반드시 문�열(character string) �는 커넥션(connection)�어야 합니다."
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "너무 �� 문�들� 기�했습니다"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "문�형 ��들� 와야 합니다"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr "길�가 0� �수입니다"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts'는 반드시 �� 아닌 작� 정수�어야 합니다"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "�체 '%s'를 찾� 수 없습니다"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "좋지 않게 구성� 함수� �스프레�션입니다"
 
@@ -2585,15 +2511,15 @@
 msgid "no active or default device"
 msgstr "활성화 � 장치가 없거나 기본 장치가 없습니다"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "너무 많� 장치들� 열려 있습니다"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "(GEcreateDevDesc�서) 장치 분배� 할당할 충분한 메모리가 없습니다"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "다� 플�� 보기 위해서는 <Return>키를 치세요"
 
@@ -2612,11 +2538,8 @@
 msgstr "심볼 '%s'는 너무 �니다"
 
 #: src/main/dotcode.c:174
-msgid ""
-"first argument must be a string (of length 1) or native symbol reference"
-msgstr ""
-"첫번째 ��는 반드시 길�가 1� 문�열�거나 native symbol reference �어야 "
-"합니다"
+msgid "first argument must be a string (of length 1) or native symbol reference"
+msgstr "첫번째 ��는 반드시 길�가 1� 문�열�거나 native symbol reference �어야 합니다"
 
 #: src/main/dotcode.c:224 src/main/dotcode.c:1240
 msgid "too many arguments in foreign function call"
@@ -2681,7 +2604,7 @@
 msgid "too many arguments, sorry"
 msgstr "��가 너무 많습니다"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "그래픽 �태가 올바르지 않습니다"
 
@@ -2826,13 +2749,13 @@
 
 #: src/main/dstruct.c:100
 msgid "invalid body argument for 'function'"
-msgstr ""
+msgstr "함수� 대한 유효하지 않� body ��"
 
 #: src/main/edit.c:110
 msgid "invalid argument to edit()"
 msgstr "edit()� 전달�는 �수가 유효하지 않습니다"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "파�� 열 수 없습니다"
 
@@ -2896,14 +2819,14 @@
 msgstr "등�� 해제할 그래픽 시스템� 없습니다"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "��� �� 잘못�었습니다"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
-msgstr ""
+msgstr "유효하지 않� 줄 결합 "
 
 #: src/main/engine.c:761 src/main/engine.c:865 src/main/engine.c:1098
 #: src/main/engine.c:1205 src/main/engine.c:1328 src/main/engine.c:1392
@@ -2930,83 +2853,92 @@
 msgid "raster capture is not available for this device"
 msgstr "� 장치�서는 래스터 캡�가 사용가능하지 않습니다"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "�트 페�스 %d는 �트 페밀리 '%s'�서 지��지 않습니다"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "활성화� 그래픽 장치가 없습니다"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "� 로케��서 pch� 값 '%d'� 유효하지 않습니다"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "pch� 값 '%d'는 구현�지 않았습니다"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "축� 범위가 유효하지 않습니다 [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "축� 범위가 무한합니다 [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
-msgstr ""
+msgstr "디스플레� 목�� 재호출� 불완전합니다."
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr "디스플레� 목�� 올바르지 않습니다"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid "snapshot recorded with different graphics engine version (pre 11 - this is version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid "snapshot recorded with different graphics engine version (%d - this is version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "'expr' ��는 반드시 표현��어야 합니다"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "'list' ��는 반드시 리스트�어야 합니다"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "'env' ��는 반드시 �바�런먼트�어야 합니다"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "pch=\"c\"� 유효하지 않� 멀티바�트 문�가 있습니다"
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "'color' �는 'lty'� 유효하지 않� 16진수가 있습니다"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
-msgstr ""
-"�� 타입� 유효하지 않습니다: 반드시 길�가 2, 4, 6 �는 8 �어야 합니다"
+msgstr "�� 타입� 유효하지 않습니다: 반드시 길�가 2, 4, 6 �는 8 �어야 합니다"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "�� 타입� 유효하지 않습니다: 0� 값� 허용�지 않습니다"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "�� 타입� 유효하지 않습니다"
 
@@ -3015,7 +2947,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "'%s'� 대해서 잠긴 바�딩� 값� 변경할 수 없습니다"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "잠겨있는 �바�런먼트� 바�딩� 추가할 수 없습니다"
 
@@ -3025,697 +2957,688 @@
 
 #: src/main/envir.c:836
 msgid "cannot unbind in the base namespace"
-msgstr ""
+msgstr "베�스 네임스페�스� 바�딩할 수 없습니다."
 
 #: src/main/envir.c:838
 msgid "unbind in the base environment is unimplemented"
-msgstr ""
+msgstr "기본 환경 언바�드가 수행�지 않았습니다."
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "잠겨있는 �바�런먼트로부터 바�딩� 제거할 수 없습니다"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "'%s'� 대한 ��는 �바�런먼트가 아닙니다"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "... 목�� %d개� 구성요소들� 가지고 있지 않습니다"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
-msgstr ""
+msgstr "부정확한 콘�스트�서 사용� %d,  안� 볼 수 없는 "
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "함수 \"%s\"를 찾� 수 없습니다"
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "비어있는 �바�런먼트�는 값� 부여할 수 없습니다"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "� ��터베�스� 변수를 부여할 수 없습니다"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "바�딩 '%s'를 베�스 �바�런먼트� 추가할 수 없습니다"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "오로지 첫번째 요소만� 변수명으로 사용�니다"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "첫번째 ��는 반드시 named list�어야 합니다"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "names(x)는 반드시 x와 같� 길�를 가지는 문�형 벡터�어야 합니다"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr "'envir' ��는 반드시 �바�런먼트�어야 합니다"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "base 네임스페�스로부터 변수들� 제거 할 수 없습니다"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "베�스 �바�런먼트로부터 변수들� 제거 할 수 없습니다"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "비어 있는 �바�런먼트로부터 변수들� 제거 할 수 없습니다"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "� ��터베�스로부터 변수들� 제거 할 수 없습니다"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "모드 '%2$s'를 가지는 �체 '%1$s'를 찾� 수 없습니다"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "위치 %d� 유효하지 않� �름� 존재합니다"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "�번째 ��는 반드시 �바�런먼트�어야 합니다"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "'%s' �수� 길�가 잘못�었습니다"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "'missing'� 사용� 올바르지 않습니다"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing'� ��들� 대해서만 사용할 수 있습니다"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos'는 반드시 정수�어야 합니다"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "리스트� 모든 구성요소들�는 반드시 �름� 주어져야 합니다"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
-msgstr ""
-"'attach'는 리스트, ��터프레임, 그리고 �바�런먼트�서만 작�하�� �어 있"
-"습니다"
+msgstr "'attach'는 리스트, ��터프레임, 그리고 �바�런먼트�서만 작�하�� �어 있습니다"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "\"package:base\"를 분리해 내는 것� 허용�지 않습니다"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "��는 반드시 �바�런먼트�어야 합니다"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "��들� 반드시 심볼릭�어야 합니다"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "둘러싸고 있는 �바�런먼트가 없습니다"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "\"%s\"�고 하는 항목� 검색목�� 없습니다"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "'as.environment(NULL)'� 사용� � �� 지�하지 않습니다"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "S4 �체는 �래스 \"environment\"를 확장하지 않습니다"
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "'as.environment'� 유효하지 않� �체입니다"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "�바�런먼트가 아닙니다"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "심볼� 아닙니다"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
-msgstr ""
+msgstr "\"%s\"� 대한 바�딩� 아님 "
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "함수가 아닙니다"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
-msgstr ""
+msgstr "심볼� �미 규칙� 바�딩� 가집니다."
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "바�딩� 잠겨있다면 활성화 �어 있는 바�딩� 변경할 수 없습니다"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "알 수 없는 op입니다"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "잠겨있는 바�딩� 떼어낼 수 없습니다"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "활성화 �어 있는 바�딩� 떼어낼 수 없습니다"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr "잘못� 네임스페�스명입니다"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr "�미 등��어 있는 네임스페�스입니다"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr "등��어 있지 않� 네임스페�스입니다1"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "불러오기 �바�런먼트 ��가 잘못�었습니다"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "내보내기 �바�런먼트 ��가 잘못�었습니다"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "불러오기와 내보내기� �름들� 길�는 반드시 �치해야 합니다"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "내보내어진 심볼 '%s'� 값� 가지고 있지 않습니다"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "알수없는 �코딩입니다: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "문�열� nul� �함�어 있습니다: '%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
-msgstr ""
+msgstr "중지 연기�, 신호가 무시�니다."
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
-msgstr ""
+msgstr "[... 잘려�]"
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "유효하지 않� 옵션 \"warning.expression\"입니다"
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
-msgstr ""
+msgstr "(경고�서 변환) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr "경고:"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr "%s�서 경고가 발�했습니다 : "
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
-msgstr ""
+msgstr "호출:"
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "경고메시지들� �실�었습니다\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "경고메시지(들): "
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
-msgstr ""
+msgstr "%s�서:"
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
-msgstr[0] ""
-"%d건� 경고들� 발견�었습니다 (�를 확�하기 위해서는 warnings()를 �용하시"
-"길 바�니다)."
+msgstr[0] "%d건� 경고들� 발견�었습니다 (�를 확�하기 위해서는 warnings()를 �용하시길 바�니다)."
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
-msgstr ""
-"%d건 ��� 경고들� 발견�었습니다 (�들 중 처� %d건� 확�하기 위해서는 "
-"warnings()를 �용하시길 바�니다)."
+msgstr "%d건 ��� 경고들� 발견�었습니다 (�들 중 처� %d건� 확�하기 위해서는 warnings()를 �용하시길 바�니다)."
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr ""
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "다�� 오류가 있습니다"
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
-msgstr ""
+msgstr "%s�서 다�과 같� �러가 발�했습니다:"
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "�러: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "추가정보: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "유효하지 않� 옵션 \"error\"입니다\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "실행� 정지�었습니다\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr "'%s'는 반드시 문�열(character string)�어야 합니다."
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [유효하지 않� 문�열� stop(.)내� 있습니다]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [유효하지 않� 문�열� warning(.)내� 있습니다]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "\"%s\"� ��� 개수가 잘못�었습니다"
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "%s�서는 구현�지 않� 기능입니다"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "�수� 개수가 잘못�었습니다"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "잘못� ��� 유형입니다"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "시계열/벡터� 길�가 �치하지 않습니다"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "�합하지 않� ��들입니다"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "알 수 없는 �러입니다 (�것� 보고해주세요!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "강제형변환중 부정확한 정수변환� 발�했습니다"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "알 수 없는 경고입니다 (�것� 보고해주세요!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "반환� 함수가 없기 때문� 최�위레벨로 ��합니다"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr ""
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr ""
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "�러메시지가 문�열� 아닙니다"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "잘못� �러 메시지입니다"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "잘못� 재시작입니다"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr ""
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr ""
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "�러메시지는 반드시 문�열�어야 합니다"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr "Rprof� �해서 건너뛴 소스파�들�므로 '%s'를 �가시켜주세요"
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: 프로필 파� '%s'를 열 수 없습니다"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "� 시스템�서는 R 프로파��� 사용할 수 없습니다"
 
-#: src/main/eval.c:445
-msgid ""
-"promise already under evaluation: recursive default argument reference or "
-"earlier problems?"
+#: src/main/eval.c:503
+msgid "promise already under evaluation: recursive default argument reference or earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr ""
 
-#: src/main/eval.c:543
-msgid ""
-"evaluation nested too deeply: infinite recursion / options(expressions=)?"
+#: src/main/eval.c:601
+msgid "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "기본값� 없는 �수가 누��어 있습니다"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "함수가 아닌것� �용하려고 합니다"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "�� %d는 비어있습니다"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "제네릭 함수� �바�런먼트 내�서 심볼 \"%s\"를 찾� 수 없습니다"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "메소드� �바�런먼트 내�서 심볼 \"%s\"를 찾� 수 없습니다"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "length > 1 ��는 조건� 있고, 첫번째 요소만� 사용� 것입니다"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "TRUE/FALSE가 필요한 곳� 값� 없습니다"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr ""
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "��� 길�가 0입니다"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "심볼� 아닌 루프 변수입니다"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "유효한 for() 루프 시퀀스가 아닙니다"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "다중�� 반환� 허용�지 않습니다"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "할당문� 좌변� 유효하지 않습니다 (NULL입니다)"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "대입� 대�� 비언어� �체로 확장�니다"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "'%s'� 너무 긴 �름� 있습니다"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "base 네임스페�스�서는 복소수 대입� 할 수 없습니다"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "베�스 �바�런먼트 내�서는 복소수 대입� 할 수 없습니다"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "복소수 대입� 유효하지 않� 함수가 있습니다"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "대입� 유효하지 않� (do_set) 좌변입니다"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "'%s'가 누��어 있습니다"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "\"function\"� 유효하지 않� formal argument 목�입니다"
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "타입� '%2$s'� 유효하지 않� �� '%1$s'입니다"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "길�가 1� 아닌 수치형 'envir' ��입니다"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "'eval'�서 지��는 재실행기능� 아닙니다"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "�로저 외부로부터 호출� 'Recall'입니다"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr ""
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "\"%3$s\"� 호환�는 메소드들� 아닙니다 (\"%1$s\", \"%2$s\")"
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr ""
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "\"%s\"는 %s 함수가 아닙니다"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "노드 스� 오버플로우입니다"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "정수형 스� 오버플로우입니다"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr "잘못� opcode입니다"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "'x %s y'� 유효하지 않� %s 타입입니다"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "바�트코드 버전� �치하지 않으므로 eval� 사용합니다"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "바�트코드 버전� 너무 오래�었습니다"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "바�트코드 버전� 너무 앞서 있습니다"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "바�트 코드 버전� 불�치합니다"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "for 루프� 유효하지 않� 시퀀스 ��가 있습니다"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr ".Internal 함수 '%s'는 없습니다"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "잘못� 함수입니다"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "BUILTIN 함수가 아닙니다"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
+msgstr "'switch'문� 케�스� 대하여 �름� 사용하지 않는다면 수치형 표현�� �용해야 합니다"
+
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
 msgstr ""
-"'switch'문� 케�스� 대하여 �름� 사용하지 않는다면 수치형 표현�� �용해"
-"야 합니다"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr "본체가 올바르지 않습니다"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "심볼� 올바르지 않습니다"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "��가 바�트코드 �체가 아닙니다"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "잘못� 파��름입니다"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "'file'� 열 수 없습니다"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file'� 반드시 비어있지 않� 문�열�어야 합니다"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii'는 반드시 논리��어야 합니다"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr ""
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "프로파� 타�머가 사용중입니다"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr ""
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
-msgstr ""
-"� 빌드�서는 바�트 코드 프로파��(byte code profiling)� 지��지 않습니"
-"다."
+msgstr "� 빌드�서는 바�트 코드 프로파��(byte code profiling)� 지��지 않습니다."
 
 #: src/main/gevents.c:43
 #, c-format
@@ -3730,15 +3653,15 @@
 msgid "this graphics device does not support event handling"
 msgstr "� 그래픽 장치는 �벤트 핸들�� 지�하지 않습니다"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "유효하지 않� 프롬프트입니다"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "'getGraphicsEvent'� 재귀� 사용� 지��지 않습니다"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "설정� 그래픽 �벤트 핸들러가 없습니다"
 
@@ -3877,13 +3800,11 @@
 #: src/main/gram.y:2482
 #, c-format
 msgid "'\\%c' is an unrecognized escape in character string starting \"%s\""
-msgstr ""
-"\"%2$s\"로 시작하는 문�열 중�서 '\\%1$c'는 ��할 수 없는 �스케�프입니다"
+msgstr "\"%2$s\"로 시작하는 문�열 중�서 '\\%1$c'는 ��할 수 없는 �스케�프입니다"
 
 #: src/main/gram.y:2546
 msgid "mixing Unicode and octal/hex escapes in a string is not allowed"
-msgstr ""
-"문�열�서 유니코드와 8진수/16진수 �스케�프� 혼용� 허용�지 않습니다"
+msgstr "문�열�서 유니코드와 8진수/16진수 �스케�프� 혼용� 허용�지 않습니다"
 
 #: src/main/gram.y:2550
 #, c-format
@@ -3921,7 +3842,7 @@
 msgstr "잘못� 정규표현�입니다, 그 �유는 '%s'입니다"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "입력� 문�열 %d는 유효하지 않� UTF-8입니다"
@@ -3969,8 +3890,7 @@
 
 #: src/main/grep.c:1282
 msgid "pattern matches an empty string infinitely, returning first match only"
-msgstr ""
-"패턴� 비어있는 문�열과 무한히 매칭�기 때문� 가장 처�� 매칭� �려�니다"
+msgstr "패턴� 비어있는 문�열과 무한히 매칭�기 때문� 가장 처�� 매칭� �려�니다"
 
 #: src/main/grep.c:1595
 msgid "'pattern' is invalid UTF-8"
@@ -4010,26 +3930,24 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "� 모듈�서는 �터넷 루틴들� 접근할 수 없습니다"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "�터넷 루틴들� 로드할 수 없습니다"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "잘못� 값입니다"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "소켓 루틴들� 로드할 수 없습니다"
 
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
+msgstr ""
+
 #: src/main/lapack.c:39
 msgid "LAPACK routines cannot be accessed in module"
 msgstr "� 모듈�서는 LAPACK 루틴들� 접근할 수 없습니다"
@@ -4038,38 +3956,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "LAPACK 루틴들� 로드할 수 없습니다"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr "오로지 숫�, 논리, �는 복소수 유형� 대한 연산들만 가능합니다"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr ""
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr ""
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "'%s' 연산�는 2개� ��들� 필요로 합니다"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "'x' 유형� 'x %s y'� 유효하지 않습니다"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "'y' 유형� 'x %s y'� 유효하지 않습니다"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "�개� ��와 함께 호출� 단항연산� `!'입니다"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "유형 '%s'� ��를 논리형으로 강제형변환� 수행합니다"
@@ -4078,61 +3996,73 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+msgid "error during cleanup\n"
+msgstr ""
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "실행� 정지�었습니다\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr ""
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "base 패키지를 열 수 없습니다\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "%s� 저장�어 있는 ��터를 복구 할 수 없습니다\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "스타트업� 하는 �안 - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+msgid "unable to initialize the JIT\n"
+msgstr ""
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "브�우저로부터 빠져나올 수 없습니다"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "\"yes\", \"no\", \"ask\" �는 \"default\" 중 하나가 입력�어야 합니다"
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr "save=\"ask\"� 비대화� 사용�므로 커맨드�� 디�트가 사용� 것입니다"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "'save'� 값� ��할 수 없습니다"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "'status'가 유효하지 않아 0으로 가정�니다"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "'runLast'가 유효하지 않아 FALSE로 가정�니다"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr "최�위 callback 요소� 공간� 할당할 수 없습니다"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "R_removeTaskCallbackByIndex� �수를 가지는 ��스가 전달�었습니다"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "최�위 작업 callback '%s'로부터 나온 경고메시지입니다\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "최�위 작업 callback� 논리값� 반환하지 않았습니다"
 
@@ -4174,162 +4104,167 @@
 msgid_plural "unused arguments %s"
 msgstr[0] "사용�지 않� �� %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "파����저는 반드시 함수 �는 NULL�어야 합니다"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "weak reference가 아닙니다"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "첫번째 ��는 반드시 �바�런먼트 �는 외부��터�어야 합니다"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "�번째 ��는 반드시 함수�어야 합니다"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "세번째 ��는 반드시 'TRUE' �는 'FALSE'�어야 합니다"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "벡터 메모리가 모� 사용�었습니다 (한계� �달했나요?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "cons 메모리가 모� 사용�었습니다 (한계� �달했나요?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "메모리가 모� 사용�었습니다 (한계� �달했나요?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "�기가 %0.f Tb� 메모리 블�� 할당할 수 없습니다"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "�기가 %0.1f GB� 메모리 블�� 할당할 수 없습니다"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr "벡터가 너무 �니다"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "길�가 �수� 벡터는 허용�지 않습니다"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "길�가 %d� 벡터를 할당할 수 없습니다"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "벡터할당� 유효한 타입/길� (%s/%d)가 아닙니다"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "�기가 %0.1f Gb� 벡터를 할당할 수 없습니다"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "�기가 %0.1f Mb� 벡터를 할당할 수 없습니다"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "�기가 %0.f Kb� 벡터를 할당할 수 없습니다"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): 프로�션 스� 오버플로우입니다"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: ��터를 찾� 수 없습니다"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "'Calloc'� 메모리 (%.0f of %u 바�트)를 할당할 수 없습니다"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "'Realloc'� 메모리 (%.0f 바�트)를 재할당 할 수 없습니다"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "벡터��터를 반환하기� 안전하지 않습니다"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "잘못� 값입니다"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "� 시스템�서는 메모리 프로파�� 기능� �용가능하지 않습니다"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: 출력파� '%s'� 열 수 없습니다"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr "아�까지는 지��지 않는 긴 벡터들입니다: %s:%d"
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "문�열 �수가 요구�어 집니다"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "그러한 프리미티브 함수는 없습니다"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "길�가 0� 변수명� 사용하려고 시�했습니다"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "변수명들� 최대 %d 바�트까지 허용�니다"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "유효하지 않� .Internal() ��입니다"
 
@@ -4346,12 +4281,8 @@
 msgstr "제네릭 정� �바�런먼트가 잘못�었습니다"
 
 #: src/main/objects.c:249
-msgid ""
-"no '.S3MethodsClass' table, cannot use S4 objects with S3 methods ('methods' "
-"package not attached?)"
-msgstr ""
-"'.S3MethodsClass' 테�블� 없어 S4 �체들� S3 메소드들과 함께 사용할 수 없습"
-"니다 ('methods' 패키지가 연결�었나요?)"
+msgid "no '.S3MethodsClass' table, cannot use S4 objects with S3 methods ('methods' package not attached?)"
+msgstr "'.S3MethodsClass' 테�블� 없어 S4 �체들� S3 메소드들과 함께 사용할 수 없습니다 ('methods' 패키지가 연결�었나요?)"
 
 #: src/main/objects.c:415
 msgid "there must be a 'generic' argument"
@@ -4368,233 +4299,218 @@
 #: src/main/objects.c:472
 #, c-format
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
-msgstr ""
-"�래스 \"%2$s\"� �체� �용� '%1$s'� 사용할수 있는 메소드가 없습니다"
+msgstr "�래스 \"%2$s\"� �체� �용� '%1$s'� 사용할수 있는 메소드가 없습니다"
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "함수 외부로부터 호출� 'NextMethod'입니다"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "�명� 함수외부로부터 호출� 'NextMethod'입니다"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "호출� 제네릭� 찾� 수 없습니다:  메소드가 �접�으로 호출�었나요?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function'� 함수가 아니�, 타입 %d입니다"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "잘못� �� ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "지정� �체가 없습니다"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "지정� 제네릭 함수가 없습니다"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "'NextMethod'� 유효하지 않� ��가 있습니다"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "'NextMethod'�서 유효하지 않� 'group' ��가 발견�었습니다"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ".Method� 값� 잘못�었습니다"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr ""
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "실행할 수 있는 메소드가 없습니다"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "�바�런먼트� �래스 �성� 해제할 수 없습니다"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "외부��터� �래스 �성� 해제할 수 없습니다"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what'� 반드시 문�형 벡터�어야 합니다"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which'는 반드시 길�가 1� 논리형 벡터�어야 합니다"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "S4 �체들� 대해서는 'inherits()' 보다는 'is()'를 사용해주세요"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr "올바른 �바�런먼트를 찾� 수 없으므로 꼭 보고해주세요!"
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'onOff'는 반드시 TRUE �는 FALSE�어야 합니다"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "제네릭 버전� 아닌 함수 \"%s\"를 찾� 수 없습니다"
 
-#: src/main/objects.c:1109
-msgid ""
-"'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
-msgstr ""
-"'methods' 디스패치 없� 호출� 'standardGeneric'� 사용중�므로 무시� 것입니"
-"다"
+#: src/main/objects.c:1136
+msgid "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
+msgstr "'methods' 디스패치 없� 호출� 'standardGeneric'� 사용중�므로 무시� 것입니다"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
-msgstr ""
-"'standardGeneric'� 전달�는 ��는 반드시 비어있지 않� 문�열�어야 합니다"
+msgstr "'standardGeneric'� 전달�는 ��는 반드시 비어있지 않� 문�열�어야 합니다"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
-msgid ""
-"call to standardGeneric(\"%s\") apparently not from the body of that generic "
-"function"
-msgstr ""
-"제네릭 함수� 본체로부터 �루어지지 않� standardGeneric(\"%s\")� 대한 호출"
-"입니다"
+msgid "call to standardGeneric(\"%s\") apparently not from the body of that generic function"
+msgstr "제네릭 함수� 본체로부터 �루어지지 않� standardGeneric(\"%s\")� 대한 호출입니다"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
-msgid ""
-"invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
-"\"set\", or \"suppress\""
-msgstr ""
-"유효하지 않� 프리미티브 메소드 코드 (\"%s\")입니다: \"clear\", \"reset\", "
-"\"set\", �는 \"suppress\" �어야 합니다"
+msgid "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", \"set\", or \"suppress\""
+msgstr "유효하지 않� 프리미티브 메소드 코드 (\"%s\")입니다: \"clear\", \"reset\", \"set\", �는 \"suppress\" �어야 합니다"
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "유효하지 않� �체입니다: 반드시 프리미티브 함수�어야 합니다"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
-msgid ""
-"the formal definition of a primitive generic must be a function object (got "
-"type '%s')"
-msgstr ""
-"프리미티브 제네릭� formal definition� 반드시 타입 '%s'� 가지는 함수�체�"
-"어야 합니다"
+msgid "the formal definition of a primitive generic must be a function object (got type '%s')"
+msgstr "프리미티브 제네릭� formal definition� 반드시 타입 '%s'� 가지는 함수�체�어야 합니다"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "제네릭 함수 \"%s\"로부터 반환� �체가 하나가 아닌 것 같습니다"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "디스패치� 주어진 유효한 프리미티브 오�레�션� 아닙니다"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "디스패치 �러"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
-msgid ""
-"primitive function \"%s\" has been set for methods but no generic function "
-"supplied"
+msgid "primitive function \"%s\" has been set for methods but no generic function supplied"
 msgstr ""
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "C 레벨 MAKE_CLASS 매�로가 NULL 문�열 ��터와 함께 호출�었습니다"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr "아� 로드�지 않� 'methods' 패키지입니다."
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "R_getClassDef(.)가 NULL 문�열 ��터와 함께 호출�었습니다"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "C 레벨 NEW 매�로가 null �래스 �피니션 ��터와 함께 호출�었습니다"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "가�� �래스 \"%s\"로부터 �체를 �성하려고 시�합니다"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "�래스 \"%s\"� �체는 유효한 S3 �체가 아닙니다"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "유효하지 않� 프린팅 너비�므로 80� 사용�었습니다"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "유효하지 않� 프린팅 �릿수�므로 7� 사용�었습니다"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr "유효하지 않� 'deparse.cutoff'�므로 60� 사용�었습니다"
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "\"device.ask.default\"� 대한 값� 유효하지 않아 FALSE를 사용합니다"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr ""
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "유효하지 않� 'width' 파�미터입니다.  오로지 %d...%d만� 허용합니다"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "유효하지 않� 'digits' 파�미터입니다. %d...%d만� 허용합니다"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "유효하지 않� 'expression' 파�미터입니다.  %d...%d만� 허용합니다"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "'%s'� 값� 유효하지 않습니다"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+msgid "'OutDec' must be a string of one character"
+msgstr ""
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\"� \"device.ask.default\"로 변경�었습니다"
 
@@ -4618,11 +4534,15 @@
 msgid "first argument must be atomic"
 msgstr "첫번째 ��는 반드시 atomic�어야 합니다"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+msgid "'decimal.mark' must be a string of one character"
+msgstr ""
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr ""
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr ""
 
@@ -4630,216 +4550,192 @@
 msgid "invalid filename specification"
 msgstr "유효한 파�명 지정� 아닙니다"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr ""
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "다�� 추가할 것� 아무것� 없습니다"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "파�명 ��가 유효하지 않습니다"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "파� '%s'� �성할 수 없습니다, 그 �유는 '%s'입니다"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "유효하지 않� 첫번째 파�명입니다"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "파� '%s'� 지울 수 없습니다, 그 �유는 '%s'입니다"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "유효하지 않� �번째 파�명입니다"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "연결할 것� 없습니다"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "� 버전� 윈�우즈�서는 심볼릭 ��를 지�하지 않습니다"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
-msgstr ""
-"'%1$ls'� 대한 심볼릭�� '%2$ls'를 만들 수 없습니다. 그 �유는 '%3$s' 때문입"
-"니다"
+msgstr "'%1$ls'� 대한 심볼릭�� '%2$ls'를 만들 수 없습니다. 그 �유는 '%3$s' 때문입니다"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
-msgstr ""
-"'%1$s'� 대한 심볼릭�� '%2$s'를 만들 수 없습니다. 그 �유는 '%3$s' 때문입니"
-"다"
+msgstr "'%1$s'� 대한 심볼릭�� '%2$s'를 만들 수 없습니다. 그 �유는 '%3$s' 때문입니다"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr "� 플랫��서 심볼릭��가 지��지 않습니다"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "'%1$ls'를 '%2$ls'� 연결할 수 없습니다.  그 �유는 '%3$s' 때문입니다"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "'%1$s'를 '%2$s'� 연결할 수 없습니다.  그 �유는 '%3$s' 때문입니다"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr "� 플랫��서는 (하드) ��가 지��지 않습니다"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "'from'과 'to'� 길�가 다릅니다"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "전개� 'from'� �름� 너무 �니다"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "전개� 'to'� �름� 너무 �니다"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
-msgstr ""
-"파�명� '%1$s'�서 '%2$s'로 바꿀 수 없습니다.  그 �유는 '%3$s' 때문입니다"
+msgstr "파�명� '%1$s'�서 '%2$s'로 바꿀 수 없습니다.  그 �유는 '%3$s' 때문입니다"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "유효하지 않� 정규표현� 'pattern'입니다"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "R HOME� 위치를 확�할 수 없습니다"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "파�명� 너무 �니다"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "내부 메모리 부족 �태입니다"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "'%s'�서 �기 오류가 발�했습니다"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "'LC_NUMERIC'� 조정하는 것� R� ��하게 작�하게 할 수� 있습니다"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr "LC_MESSAGES는 윈�우� 있지만, �는 사용가능하지 않습니다"
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
-msgstr ""
-"OS는 로케�� \"%s\"로 설정하기 위한 요청� 받아들� 수 없다고 보고합니다"
-
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname'� 반드시 길�가 1� 문�형 벡터�어야 합니다"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr ""
+msgstr "OS는 로케�� \"%s\"로 설정하기 위한 요청� 받아들� 수 없다고 보고합니다"
 
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr ""
-"알수 없는 형�� C로 작성� 함수 'gethostbyname'� �하여 반환�었습니다"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "� 플랫��서는 nsl()가 지��지 않습니다"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s'는 �미 존재합니다"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "디렉토리 '%s'를 만들 수 없습니다. 그 �유는 '%s'입니다"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls'� �미 존재합니다"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "디렉토리 '%ls'를 만들 수 없습니다. 그 �유는 '%s'입니다. "
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr "패스� 길�가 너무 �니다"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "디렉토리 %ls를 �성하는� 문제가 발�했습니다: %s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "디렉토리 %ls를 �는� 문제가 발�했습니다: %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr ""
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr "%ls를 %ls로 복사하는� 문제가 발�했습니다: %s"
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr "디렉토리 %s를 �성하는� 문제가 발�했습니다: %s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr "디렉토리 %s를 �는� 문제가 발�했습니다: %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "%1$s를 %2$s로 복사하는� 문제가 발�했습니다: %3$s"
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode'� 길�는 반드시 최소한 1���어야 합니다"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "� 플랫��서는 OS지�� 충분하지 않습니다"
 
@@ -4884,67 +4780,70 @@
 msgid "Metric information not available for this family/device"
 msgstr "� 페밀리/장치� 대한 메트릭 정보가 �용가능하지 않습니다"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "유효하지 않� 'na.print' 지정입니다"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "유효하지 않� 행 레�블입니다"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "유효하지 않� 열 레�블입니다"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ".Internal(print.function(.))� 함수가 아닌 ��가 전달�었습니다"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap'� 반드시 �� 아닌 정수�어야 합니다"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "유효한 'tryS4' 내부 ��가 아닙니다"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr ""
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr "'dblepr' 내� 문�� 길�가 올바르지 않습니다"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr "'intpr' 내� 문�� 길�가 올바르지 않습니다"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr "'realpr' 내� 문�� 길�가 올바르지 않습니다"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr "'realpr' 내� 메모리 할당 �러입니다"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "BLAS/LAPACK 루틴 '%6s'� �러코드 %d를 주었습니다"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "행 레�블� 수가 너무 �습니다"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "열 레�블� 수가 너무 �습니다"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
-msgstr[0] ""
-" [ getOption(\"max.print\") � �달했습니다 -- %d 행들� �략합니다 ]\n"
+msgstr[0] " [ getOption(\"max.print\") � �달했습니다 -- %d 행들� �략합니다 ]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "� 플랫��서는 wchar_t가 유니코드�지 알 수 없습니다"
 
@@ -4952,46 +4851,44 @@
 msgid "argument is not a numeric vector"
 msgstr "��가 수치형 벡터가 아닙니다"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "유효하지 않� ��들입니다"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "NA가 �성�었습니다"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "확률벡터� NA가 있습니다"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr "확률값� �수입니다."
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "양� 값� 가지는 확률들� 너무 �습니다"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr "'replace = FALSE' �때는 모집단보다 � 샘플� 가질 수 없습니다"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "확률값� 개수가 잘못�었습니다"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
-msgstr ""
-"n� 값� 2^31보다 �거나 같습니다. replace = FALSE 는 오로지 64 비트 플랫��"
-"서만 지��니다"
+msgstr "n� 값� 2^31보다 �거나 같습니다. replace = FALSE 는 오로지 64 비트 플랫��서만 지��니다"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr "��는 반드시 길�가 1� 문�형 벡터�어야 합니다"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
@@ -4999,306 +4896,296 @@
 "��는 반드시 길�가 1� 문�형 벡터�어야 합니다\n"
 "첫번째 구성요소를 제외한 나머지는 모� 무시� 것입니다"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr "�� 'x'는 반드시 raw 벡터�어야 합니다"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "�� 'multiple'� 반드시 TRUE �는 FALSE�어야 합니다"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr "�� 'shift'는 반드시 작� 값� 정수�어야 합니다"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr "�� 'x'는 반드시 정수형 벡터�어야 합니다"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "�� 'x'는 반드시 raw, 정수 �는 논리값�어야 합니다"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "�� 'x'는 반드시 %d� 배수�어야 합니다"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr "�� 'x'는 반드시 NA를 �함해서는 안�니다"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr "잘못� UTF-8 문�열입니다"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "atomic과 리스트 타입들� 대해서만 비�(%d)가 가능합니다"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "표현�� 대해서는 비�가 가능하지 않습니다"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "�러한 유형들� 대한 비�는 구현�지 않았습니다"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "복소수들� 대한 비�는 유효하지 않습니다"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr "'a'와 'b'는 반드시 같� 유형�어야 합니다"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "�기 오류입니다"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "정수값 I를 �는� �러가 발�했습니다"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "실수값 R� �는� �러가 발�했습니다"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "문� C를 �는� �러가 발�했습니다"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "문�열 S를 �는� �러가 발�했습니다"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "�기 �러가 발�했습니다"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr ""
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "복� 호환성 �러입니다 - 버전 %d와 호환�지 않습니다0"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "��터파�� 잘못� SEXP 유형� 있습니다"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "타입들� �치하지 않습니다"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "��할 수 없는 �터� 함수명 \"%s\"입니다"
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "��터를 복�중�는 파�� 위치를 저장할 수 없습니다"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr "��터를 복�하는 중�는 파�� 위치를 복�할 수 없습니다"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "버전 1� 워�스페�스� 네임스페�스를 저장할 수 없습니다"
 
-#: src/main/saveload.c:919
-msgid ""
-"cannot save environment with locked/active bindings in version 1 workspaces"
-msgstr ""
-"버전 1� 워�스페�스� 잠겨있거나 활성중� 바�딩� 있는 �바�런먼트는 저장"
-"할 수 없습니다"
+#: src/main/saveload.c:921
+msgid "cannot save environment with locked/active bindings in version 1 workspaces"
+msgstr "버전 1� 워�스페�스� 잠겨있거나 활성중� 바�딩� 있는 �바�런먼트는 저장할 수 없습니다"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "버전 1 워�스페�스�서는 weak reference들� 저장할 수 없습니다"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "벡터가 아닌 타입과 함께 호출� NewWriteVec 입니다"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr "버전 1 워�스페�스�서는 바�트 코드 �체들� 저장할 수 없습니다"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: %i는 알 수 없는 유형입니다"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "벡터가 아닌 타입과 함께 호출� NewReadVec입니다"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr "버전 1 워�스페�스로부터 바�트코드 �체들� �� 수 없습니다"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: %i는 알 수 없는 유형입니다"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "ascii 문�열� �는� 메모리가 부족합니다"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "바�너리 �기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "바�너리 문�열� �는� 메모리가 부족합니다"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "바�너리 문�열 �기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "xdr 정수 ��터 쓰기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "xdr 정수 ��터 �기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "xdr 문�열 ��터 쓰기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "xdr 실수형 ��터 쓰기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "xdr 실수형 ��터 �기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "xdr 복소수형 ��터 쓰기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "xdr 복소수형 ��터 �기 �러가 발�했습니다"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "쓰기� 실패했습니다"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "복�하려는 파�� 비어있는 것 같습니다 -- 로드� ��터가 없습니다"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
-msgstr ""
-"복�하려는 파�� � 최신버전� R�서 �성�었� 수 있습니다 -- 로드� ��터"
-"가 없습니다"
+msgstr "복�하려는 파�� � 최신버전� R�서 �성�었� 수 있습니다 -- 로드� ��터가 없습니다"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
-msgstr ""
-"잘못� 파� 복� 매�넘버입니다 (파�� 아마� ���듯 합니다) -- 로드할 �"
-"�터가 없습니다"
+msgstr "잘못� 파� 복� 매�넘버입니다 (파�� 아마� ���듯 합니다) -- 로드할 ��터가 없습니다"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "첫번째 ��는 반드시 문�형 벡터�어야 합니다"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr ""
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr "'%s'는 마치 2.4.0 �전� S4 �체로 보�므로, �를 다시 �성해 주세요"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr ""
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "첫번째 ��는 반드시 파��름�어야 합니다"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "XDR 쓰기� 실패했습니다"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "XDR �기� 실패했습니다"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "��터를 저장할 수 없습니다 -- '%1$s'를 열 수 없습니다: %2$s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr ""
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "쓰기를 위해서 열린 커넥션� 아닙니다"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "�스트 모드 커넥션� XDR형�� 저장할 수 없습니다"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr ""
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "�기위해서 열린 커넥션� 아닙니다"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr "바�너리 커넥션으로부터 오로지 load()만� 할 수 있습니다"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "입력� 없습니다"
 
-#: src/main/saveload.c:2381
-msgid ""
-"the input does not start with a magic number compatible with loading from a "
-"connection"
-msgstr ""
-"입력� 커넥션으로부터 로딩�면서 호환� �는 매�넘버로 시작하지 않습니다"
+#: src/main/saveload.c:2383
+msgid "the input does not start with a magic number compatible with loading from a connection"
+msgstr "입력� 커넥션으로부터 로딩�면서 호환� �는 매�넘버로 시작하지 않습니다"
 
 #: src/main/scan.c:364 src/main/scan.c:414
 msgid "EOF within quoted string"
@@ -5309,7 +5196,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan()� '%s'를 입력받아야 하는�, '%s'를 받았습니다"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr "항목들� 너무 많습니다"
 
@@ -5317,7 +5204,7 @@
 msgid "empty 'what' specified"
 msgstr "비어있는 'what'� 지정�었습니다"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "�� %1$d는 %2$d개� 구성요소들� 가지고 있지 않습니다"
@@ -5350,35 +5237,33 @@
 msgid "embedded nul(s) found in input"
 msgstr "입력� nul(s)� �함�어 있습니다"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr ""
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "결과�으로 너무 긴 벡터� 것입니다"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "��� 길�가 0입니다."
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
-msgstr[0] ""
-"수치형 표현�(numerical expression)� %d개� 구성요소들� 가지고 있기 때문� "
-"오로지 첫번째 것만� 사용합니다."
+msgstr[0] "수치형 표현�(numerical expression)� %d개� 구성요소들� 가지고 있기 때문� 오로지 첫번째 것만� 사용합니다."
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "��� 값� NA/NaN 입니다."
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "�번째 ��� 대한 형�� 잘못�었습니다"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "�체� 타입 '%s'를 복제하려고 시�합니다"
@@ -5508,25 +5393,17 @@
 #: src/main/serialize.c:1765
 #, c-format
 msgid "ReadItem: unknown type %i, perhaps written by later version of R"
-msgstr ""
-"ReadItem: 알 수 없는 타입 %i입니다.  아마� R� �후버전� �해서 작성� 것 "
-"같습니다"
+msgstr "ReadItem: 알 수 없는 타입 %i입니다.  아마� R� �후버전� �해서 작성� 것 같습니다"
 
 #: src/main/serialize.c:1921
 #, c-format
-msgid ""
-"cannot read unreleased workspace version %d written by experimental R %d.%d."
-"%d"
+msgid "cannot read unreleased workspace version %d written by experimental R %d.%d.%d"
 msgstr ""
 
 #: src/main/serialize.c:1925
 #, c-format
-msgid ""
-"cannot read workspace version %d written by R %d.%d.%d; need R %d.%d.%d or "
-"newer"
-msgstr ""
-"R %2$d.%3$d.%4$d� �해 작성� 워�스페�스 버전 %1$d� �� 수 없습니다; 따"
-"�서, R %5$d.%6$d.%7$d �는 그 �후� 버전� 필요합니다"
+msgid "cannot read workspace version %d written by R %d.%d.%d; need R %d.%d.%d or newer"
+msgstr "R %2$d.%3$d.%4$d� �해 작성� 워�스페�스 버전 %1$d� �� 수 없습니다; 따�서, R %5$d.%6$d.%7$d �는 그 �후� 버전� 필요합니다"
 
 #: src/main/serialize.c:2004
 msgid "read failed"
@@ -5611,54 +5488,48 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "atomic 벡터들만� 테스트�고 저장� 수 있습니다"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing'� 반드시 TRUE �는 FALSE�어야 합니다"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "atomic 벡터들만� 저장� 수 있습니다"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "raw 벡터들� 정렬� 수 없습니다"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr ""
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr ""
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr ""
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "�� %d는 벡터가 아닙니다"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "��� 길�가 서로 다릅니다"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
-msgstr ""
-"rank()� 대해서 유효하지 않� ties.method입니다 [�어나서는 안�는 경우입니"
-"다]"
-
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr ""
+msgstr "rank()� 대해서 유효하지 않� ties.method입니다 [�어나서는 안�는 경우입니다]"
 
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
@@ -5669,23 +5540,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "�� '%1$s = \"%2$s\"'는 무시� 것입니다"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "첫번째 ��는 반드시 벡터�어야 합니다"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "�번째 ��는 반드시 요��어야 합니다"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr "그룹� 길�가 0��, ��터� 길�는 0 보다 �니다"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr ""
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "요�� 올바른 수준� 가지고 있지 않습니다"
 
@@ -5740,38 +5611,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "강제형변환� �하여 벡터� 길�가 0� �었습니다"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "'%1$s'는 유효하지 않� �맷입니다; %2$s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "논리형 �체들� 대해서는 �맷 %d �는 %i를 사용해주세요"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "정수형 �체들�는 �맷 %d, %i, %o, %x �는 %X� 사용해 주세요"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "수치형 �체들�는 �맷 %f, %e, %g �는 %a를 사용해 주세요"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "문�형 �체들�는 �맷 %s를 사용해주세요"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr ""
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "지��지 않는 타입입니다"
 
@@ -5779,251 +5650,246 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: 버�가 너무 작습니다"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr ""
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr ""
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr ""
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "행렬� 있는 첨�� 개수가 올바르지 않습니다"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "첨�들� 개수가 올바르지 않습니다"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr ""
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr ""
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr ""
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
-msgid ""
-"[[<- defined for objects of type \"S4\" only for subclasses of environment"
+#: src/main/subassign.c:1665
+msgid "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr ""
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr ""
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr ""
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr ""
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "유효하지 않� 첨�� 타입 '%s'입니다"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "좌변� 리스트로 강제형변환합니다"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
-msgstr "한 개 ��� 구성요소 선�� 시�합니다"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
+msgstr ""
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr ""
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr ""
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr ""
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr "32 비트� R�서는 너무 � 첨�입니다"
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr ""
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr ""
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr ""
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "지정� ��스가 없습니다"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr ""
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr ""
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "��� 'type' (%s)� 올바르지 않습니다"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr ""
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "누�� ��들� 있어 NA를 반환합니다"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "min� 전달�는 ��들 중 누�� 있어 Inf를 반환합니다"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "max� 전달�는 ��들 중 누�� 있어 -Inf를 반환합니다"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "수치형 ��가 아닙니다"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "'which'� 전달�는 ��가 논리형� 아닙니다"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "��들� 없습니다"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "유효하지 않� 입력 유형입니다"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr ""
 
@@ -6036,8 +5902,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "파�명� �코딩� 'bytes'� 수 없습니다"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -6070,94 +5936,94 @@
 msgid "no 'fileext'"
 msgstr "'fileext'가 없습니다"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr "시스템 호출� 실패했습니다: %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "��� 대한 타입� 올바르지 않습니다"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "��� 대한 길�가 올바르지 않습니다"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "� 시스템�서는 'Sys.setenv'� 사용할 수 없습니다"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "� 시스템�서는 'Sys.unsetenv'를 사용할 수 없습니다"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x'는 반드시 문�형 벡터�어야 합니다"
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
-msgstr "'x'는 반드시 NULL �는 벡터들로 구성� 리스트�어야 합니다"
+#: src/main/sysutils.c:658
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
+msgstr "'x'는 반드시 문�형 벡터 �는 NULL로 � 리스트 �는 raw 벡터�어야 합니다. "
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s'는 반드시 CHARSXP ��서 호출�어야 합니다"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr "\"bytes\" �코딩으로 � 문�열� 번역하는 것� 허용�지 않습니다"
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr "내부오류: 번역� 필요하지 않습니다."
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "코드페�지(codepage) %2$d로부터 '%1$s'는 지��지 않는 변환입니다."
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr "유니코드 %u는 올바르지 않습니다"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr "'R_TempDir'� �성할 수 없습니다"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "R_SESSION_TMPDIR� 지정할 수 없습니다"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr "'R_TempDir'� 할당할 수 없습니다"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr ""
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "사용�지 않� 임시파�명� 찾� 수 없습니다"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr "R_tmpnam2내� 할당� 실패했습니다"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "� 플랫��서는 'dirmark = TRUE'� 지��지 않습니다"
 
@@ -6192,31 +6058,31 @@
 msgid "'nmax' must be positive"
 msgstr "'nmax'는 반드시 양수�어야 합니다"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match'는 벡터형 ��들� 필요로 합니다"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "��가 �릭터 모드가 아닙니다"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr "... 가 존재하지 않는 경우� 사용�었습니다"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr "...는 pairlist가 아닙니다."
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr ""
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "�것� �어날 수 없는 경우입니다"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' must be a character vector"
 
@@ -6224,140 +6090,140 @@
 msgid "object is not a matrix"
 msgstr "�체가 행렬� 아닙니다"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "%d는 '%s'�서 구현�지 않� 유형입니다"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "'%s'� '%s'�서 구현�지 않� 유형입니다\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "%d� '%s'�서 구현�지 않� 유형입니다\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr ""
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%3$d를 필요로 하는 .Internal(%2$s)� �� %1$d가 전달�었습니다"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%3$d를 필요로 하는 '%2$s'� �� %1$d가 전달�었습니다"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "주어진 ��명 '%s'� '%s'� 매치�지 않습니다"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr ""
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr ""
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x'는 반드시 TRUE �는 FALSE�어야 합니다"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y'는 반드시 TRUE �는 FALSE�어야 합니다"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr ""
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "작업디렉토리를 변경할 수 없습니다"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "문�형 벡터 ��가 와야합니다"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "경로가 너무 �니다"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "오로지 'quote'� 첫번째 문�만� 사용� 것입니다"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "문�형 벡터 'value'가 와야합니다"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "'value'는 반드시 길�가 양수�어야 합니다"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "'utf8towcs'내� 입력 '%s'� 잘못�었습니다"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "'%s'�서 유효하지 않� 멀티바�트 문�열� 있습니다"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "�러메시지가 255 문�까지 보여집니다"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "경고메시지가 255 문�까지 보여집니다"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr "모든 ��들�는 반드시 �름� 주어져야 합니다"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "� 빌드�서는 ICU는 지��지 않습니다"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr "'breaks'가 정렬�지 않았습니다"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "긴 벡터 '%s'는 지��지 않습니다"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr "'eps.correct'는 반드시 0, 1, �는 2 �어야 합니다"
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr "'x'는 반드시 벡터�어야 합니다"
 
@@ -6370,8 +6236,7 @@
 msgstr ""
 "R� �유 소프트웨어�며, 어떠한 형태� 보�없� 배��니다.\n"
 "�한, �정한 조건하�서 �것� 재배� 할 수 있습니다.\n"
-"배�와 관련� �세한 내용� 'license()' �는 'licence()'� 통하여 확�할 수 "
-"있습니다.\n"
+"배�와 관련� �세한 내용� 'license()' �는 'licence()'� 통하여 확�할 수 있습니다.\n"
 "\n"
 
 #: src/main/version.c:40
@@ -6382,10 +6247,8 @@
 "\n"
 msgstr ""
 "R� 많� 기여�들� 참여하는 공�프로�트입니다.\n"
-"'contributors()'�고 입력하시면 �� 대한 � 많� 정보를 확�하실 수 있습니"
-"다.\n"
-"그리고, R �는 R 패키지들� 출�물� �용하는 방법� 대해서는 'citation()'� "
-"통해 확�하시길 부�드립니다.\n"
+"'contributors()'�고 입력하시면 �� 대한 � 많� 정보를 확�하실 수 있습니다.\n"
+"그리고, R �는 R 패키지들� 출�물� �용하는 방법� 대해서는 'citation()'� 통해 확�하시길 부�드립니다.\n"
 "\n"
 
 #: src/main/version.c:43
@@ -6395,10 +6258,8 @@
 "Type 'q()' to quit R.\n"
 "\n"
 msgstr ""
-"'demo()'를 입력하신다면 몇가지 �모를 보실 수 있으며, 'help()'를 입력하시면 "
-"온�� �움�� �용하실 수 있습니다.\n"
-"�한, 'help.start()'� 입력� 통하여 HTML 브�우저� �한 �움�� 사용하실"
-"수 있습니다\n"
+"'demo()'를 입력하신다면 몇가지 �모를 보실 수 있으며, 'help()'를 입력하시면 온�� �움�� �용하실 수 있습니다.\n"
+"�한, 'help.start()'� 입력� 통하여 HTML 브�우저� �한 �움�� 사용하실수 있습니다\n"
 "R� 종료를 �하시면 'q()'� 입력해주세요.\n"
 "\n"
 
@@ -6423,7 +6284,7 @@
 msgid "There must be at least three control points"
 msgstr "최소한 세개� 컨트롤 ��트들� 필요합니다"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr ""
@@ -6444,210 +6305,214 @@
 "Consider using X11 with colortype=\"pseudo.cube\" or \"gray\"."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "%2$d가 요청�었� 때 X11� 글꼴 �기 %1$d를 �용합니다"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1130
-msgid ""
-"semi-transparency is not supported on this device: reported only once per "
-"page"
+#: src/modules/X11/devX11.c:1132
+msgid "semi-transparency is not supported on this device: reported only once per page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "'%s'� 연결� X11� 여는 �안� X11 I/O �러가 발�했습니다"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "현 버전� R� png를 지�하지 않습니다"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "png() 호출� 사용� 파�명� 너무 �니다"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "PNG 파� '%s'를 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "현 버전� R� jpeg를 지�하지 않습니다"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "jpeg() 호출� 사용� 파�명� 너무 �니다"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "JPEG 파� '%s'를 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "현 버전� R� tiff를 지�하지 않습니다"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "tiff() 호출� 사용� 파�명� 너무 �니다"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "bmp() 호출� 사용� 파�명� 너무 �니다"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "BMP 형�� 파� '%s'� 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "'%s'를 보여주기 위한 X11� 커넥션� 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr "X11 장치가 �미 열려 있기 때문� 'display' ��를 무시합니다"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "디스플레� '%s'�서 정보를 가져올 수 없습니다"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "X11창� �성할 수 없습니다"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "pixmap� �성할 수 없습니다"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "�트지정� 잘못�었습니다"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "X11 �트 ��터베�스�서 �트페밀리를 찾� 수 없습니다"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "파� '%s'를 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "� 장치�서 %s를 사용할 수 없습니다"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "XImage를 �성할 수 없습니다"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "장치 %s를 시작할 수 없습니다"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width' �는 'height'가 잘못�었습니다"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "올바르지 않� 컬러타입� X11 장치� 전달�었습니다"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "알 수 없는 X11 색�모�입니다 -- 모노�롬� �용합니다"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "장치� 저장할 플�� 없습니다"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "X11cairo 장치를 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "파� '%s'를 열 수 없습니다"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "� 빌드�서는 savePlot()가 지��지 않습니다"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "�립보드를 �� 수 없습니다 (�러코드 %d입니다)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "X11루틴 스트럭�들� 위한 메모리를 할당할 수 없습니다"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
+msgstr ""
+
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, c-format
+msgid "scheme not supported in URL '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "url 커넥션 할당� 할 수 없습니다"
 
@@ -6659,29 +6524,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "'destfile' ���서 오로지 첫번째 구성요소만� 사용�었습니다"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "다운로드 진행"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "URL '%s'를 열 수 없습니다.  그 �유는 '%s'입니다"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "'%1$s' 파�� '%2$s' �유로 열 수 없습니다"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "URL '%s'� 시�합니다\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr ""
@@ -6691,137 +6556,159 @@
 msgid "cannot open URL '%s'"
 msgstr "URL '%s'를 열 수 없습니다"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "지��지 않는 URG scheme입니다"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
 #, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "� 플랫��서는 curlGetHeaders를 사용할 수 없습니다."
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr "�� '%s'가 올바르지 않습니다."
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
-msgstr ""
-"� 플랫��서는 download.file(method = \"libcurl\")를 사용할 수 없습니다."
+msgstr "� 플랫��서는 download.file(method = \"libcurl\")를 사용할 수 없습니다."
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "'url'� 길�와 'destfile'� 길�는 �치해야 합니다."
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:593
+msgid "cannot download all files"
+msgstr "모든 파�들� 다운로드 할 수 없습니다. "
+
+#: src/modules/internet/libcurl.c:727
+msgid "cannot read from connection"
+msgstr "� 커넥션으로부터 �어올 수 없습니다."
+
+#: src/modules/internet/libcurl.c:763
+msgid "cannot open connection"
+msgstr "커넥션� 열 수 없습니다."
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "� 플랫��서는 url(method = \"libcurl\")를 사용할 수 없습니다."
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "FTP proxy 정보를 제거합니다"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "FTP proxy '%s'를 �용합니다"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "서버 접�� 실패했습니다"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "서버로부터 �답� 받는� 실패했습니다"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "��터 커넥션 �성� 실패했습니다"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "�트를 바�드 하는� 실패했습니다"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "HTTP proxy 정보를 제거합니다"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "HTTP proxy '%s'를 �용합니다"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "�트 %2$d�서 '%1$s'� 연결했습니다."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "�트 %2$d�서 '%1$s' 연결 할 수 없습니다."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "다�으로 리다�렉트 합니다: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "너무 많� 리다�렉션� 있어, 다� ...� 중단합니다"
 
@@ -6838,8 +6725,7 @@
 #: src/modules/lapack/Lapack.c:56
 #, c-format
 msgid "argument type[1]='%s' must be one of 'M','1','O','I','F' or 'E'"
-msgstr ""
-"�� type[1]='%s'� 반드시 'M','1','O','I','F' �는 'E' 중 하나�어야 합니다"
+msgstr "�� type[1]='%s'� 반드시 'M','1','O','I','F' �는 'E' 중 하나�어야 합니다"
 
 #: src/modules/lapack/Lapack.c:73
 #, c-format
@@ -7053,27 +6939,29 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. ��가 범위 밖� 있나요?\n"
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
 #, c-format
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): 결과가 정밀하지 않습니다\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "bessel_j 할당 �러입니다"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. ��가 범위 밖� 있나"
-"ìš”?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): 결과가 정밀하지 않습니다\n"
@@ -7084,26 +6972,29 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. ��가 범위 밖� 있나요?\n"
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
 #, c-format
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): 결과가 정밀하지 않습니다\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "bessel_y 할당 �러입니다"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. ��가 범위 밖� 있나요?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): 결과가 정밀하지 않습니다\n"
@@ -7113,44 +7004,44 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr "'k' (%.2f)는 반드시 정수�어야 하므로, %.0f로 반올림�었습니다"
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "'%s'�서 언�플로우가 발�했습니다\n"
 
 # added on 28-MAR-2013
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio()� �러코드 %d를 주었습니다."
 
 # added on 28-MAR-2013
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr "pnbinom_mu() -> bratio()는 �러코드 %d를 주었습니다."
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): %d 번째 반복�서 수렴하지 않습니다."
@@ -7185,8 +7076,7 @@
 # updated on 28-MAR-2013
 #: src/unix/X11.c:54
 msgid "X11 module is not available under this GUI"
-msgstr ""
-"X11 모듈� 현재 �용중� 그래픽 사용� �터페�스�서는 사용할 수 없습니다."
+msgstr "X11 모듈� 현재 �용중� 그래픽 사용� �터페�스�서는 사용할 수 없습니다."
 
 #: src/unix/X11.c:60
 msgid "X11 routines cannot be accessed in module"
@@ -7201,28 +7091,22 @@
 msgstr "X11� 사용할 수 없습니다"
 
 #: src/unix/dynload.c:143
-msgid ""
-"Explicit local dynamic loading not supported on this platform. Using default."
+msgid "Explicit local dynamic loading not supported on this platform. Using default."
 msgstr ""
 
 #: src/unix/dynload.c:144
-msgid ""
-"Explicit global dynamic loading not supported on this platform. Using "
-"default."
+msgid "Explicit global dynamic loading not supported on this platform. Using default."
 msgstr ""
 
 #: src/unix/dynload.c:145
-msgid ""
-"Explicit non-lazy dynamic loading not supported on this platform. Using "
-"default."
+msgid "Explicit non-lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
 #: src/unix/dynload.c:146
-msgid ""
-"Explicit lazy dynamic loading not supported on this platform. Using default."
+msgid "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "작업 디렉토리를 얻� 수 없습니다!"
 
@@ -7231,17 +7115,15 @@
 msgstr ""
 
 #: src/unix/sys-std.c:521
-msgid ""
-"An unusual circumstance has arisen in the nesting of readline input. Please "
-"report using bug.report()"
+msgid "An unusual circumstance has arisen in the nesting of readline input. Please report using bug.report()"
 msgstr ""
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "작업기� 파� '%s'를 저장하는� 문제가 발�했습니다"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7250,92 +7132,142 @@
 "파� '%s'를 열 수 없습니다: %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "'file' ��가 너무 �니다"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "히스토리 메카니즘� �용할 수 없습니다"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "히스토리 파�� 잘�내는 �중 문제가 발�했습니다"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "저장할 히스토리가 없습니다"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "타임스탬프가 잘못�었습니다"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "비어있지 않� 문�형 ��가 와야합니다"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern'� 반드시 논리��어야 하며 NA�어서는 안�니다"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "'%s'� 열 수 없습니다, 아마� '%s'�기 때문입니다"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
 # QC: PASS
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "다�� 명령� 실행하는 �중 �러가 발�했습니다: '%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "명령� 실행하는 �중 �러가 발�하였습니다."
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "명령 '%s'� 실행으로 �태 %d가 �고, �러 메시지 '%s'를 가집니다"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "� 시스템�서 Sys.info()는 구현�지 않았습니다"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr ""
 
 # updated on 28-MAR-2013
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
-msgstr ""
-"경고: '%s'는 알 수 없는 그래픽 사용� �터페�스 (gui)�므로 X11� 사용합니"
-"다.\n"
+msgstr "경고: '%s'는 알 수 없는 그래픽 사용� �터페�스 (gui)�므로 X11� 사용합니다.\n"
 
 # updated on 28-MAR-2013
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
-msgstr ""
-"경고: '%s'는 알 수 없는 그래픽 사용� �터페�스 (gui)�므로 아무것� 사용하"
-"지 않습니다.\n"
+msgstr "경고: '%s'는 알 수 없는 그래픽 사용� �터페�스 (gui)�므로 아무것� 사용하지 않습니다.\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr ""
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "경고: 파�들� 목��서 오로지 첫번째 것만� 편집합니다"
 
+#~ msgid "number of characters is not computable for element %d in \"bytes\" encoding"
+#~ msgstr "요소 %d� 대한 글�� 개수를 \"bytes\" �코딩으로는 계산� 할 수 없습니다"
+
+#~ msgid "width is not computable for element %d in \"bytes\" encoding"
+#~ msgstr "요소 %d� 대한 너비를 \"bytes\" �코딩으로는 계산� 할 수 없습니다"
+
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "'what'� 반드시 문�열 �는 함수�어야 합니다"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "� 시스템�서는 소켓� 사용할 수 없습니다"
+
+#~ msgid "no function to restart"
+#~ msgstr "재시작� 할 함수가 없습니다"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "��는 반드시 �로우져�어야 합니다"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname'� 반드시 길�가 1� 문�형 벡터�어야 합니다"
+
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "알수 없는 형�� C로 작성� 함수 'gethostbyname'� �하여 반환�었습니다"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "� 플랫��서는 nsl()가 지��지 않습니다"
+
+#~ msgid "attempt to select more than one element"
+#~ msgstr "한 개 ��� 구성요소 선�� 시�합니다"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "수치형 ��가 아닙니다"
+
+#~ msgid "'x' must be a list of NULL or raw vectors"
+#~ msgstr "'x'는 반드시 NULL �는 벡터들로 구성� 리스트�어야 합니다"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "지��지 않는 URG scheme입니다"
+
+#~ msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#~ msgstr "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. ��가 범위 밖� 있나요?\n"
+
+#~ msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#~ msgstr "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. ��가 범위 밖� 있나요?\n"
+
+#~ msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#~ msgstr "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. ��가 범위 밖� 있나요?\n"
+
+#~ msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#~ msgstr "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. ��가 범위 밖� 있나요?\n"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames'� 반드시 리스트�어야 합니다"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args'는 반드시 리스트�어야 합니다"
 
@@ -7375,12 +7307,8 @@
 #~ msgid "first argument must be a generic name"
 #~ msgstr "첫번째 ��는 반드시 제네릭명�어야 합니다"
 
-#~ msgid ""
-#~ "explicit request not to duplicate arguments in call to '%s', but argument "
-#~ "%d is of the wrong type (%d != %d)"
-#~ msgstr ""
-#~ "'%1$s' 호출시� 중복� ��들� 사용하지 ��는 요청�� 불구하고, �� "
-#~ "%2$d� 타입� 잘못�었습니다 (%3$d != %4$d)"
+#~ msgid "explicit request not to duplicate arguments in call to '%s', but argument %d is of the wrong type (%d != %d)"
+#~ msgstr "'%1$s' 호출시� 중복� ��들� 사용하지 ��는 요청�� 불구하고, �� %2$d� 타입� 잘못�었습니다 (%3$d != %4$d)"
 
 #~ msgid "character variables must be duplicated in .C/.Fortran"
 #~ msgstr "문� 변수들� .C/.Fortran 내�서 중복�었�� 틀림없습니다"
@@ -7395,9 +7323,7 @@
 #~ msgstr "'%s'� 있는 메소드명� 너무 �니다"
 
 #~ msgid "%d arguments passed to 'log' which requires 1 or 2"
-#~ msgstr ""
-#~ "'log'함수는 1개 혹� 2개� ��들� 필요로 하지만 %d개� ��들� 전달�었"
-#~ "습니다"
+#~ msgstr "'log'함수는 1개 혹� 2개� ��들� 필요로 하지만 %d개� ��들� 전달�었습니다"
 
 #~ msgid ""
 #~ "Warning in %s :\n"
diff -Nru r-base-3.2.3/src/library/base/po/nn.po r-base-3.3.1/src/library/base/po/nn.po
--- r-base-3.2.3/src/library/base/po/nn.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/nn.po	2016-04-27 22:15:36.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-02-18 09:09+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -127,174 +127,175 @@
 msgid "problem in displaying '%ls'"
 msgstr "feil ved vising av «%ls»"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "ugyldig «%s»-argument"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "denne Windows-versjonen er ikkje støtta"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "ugyldig argument"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "Ikkje ver tåpeleg! Maskina di har ei adressegrense på 4 GiB."
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "kan ikkje redusera minnegrensa: ignorert"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "«path» må vera ein teiknvektor"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "ugyldig eining"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "krev SDI-modus"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "ugyldig nummer på grafisk eining"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "ubrukbar eining"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 #, fuzzy
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "ugyldig inndata i «Rmbstowcs»"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "filval avbrote"
 
@@ -336,193 +337,192 @@
 msgid "'names' is not a character vector"
 msgstr "«fmt» må vera ein teiknvektor"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "venta teiknstreng som førsteargument"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "venta teiknstreng som tredjeargument"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "køyring av kommandoen «%s» gav statusen %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "nådde tidsgrensa for økta"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "nådde tidsgrensa"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "nådde CPU-tidsgrensa for økta"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "nådde CPU-tidsgrensa"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Kritisk feil: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "kjenner ikkje teiknkodinga «%s»"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<FEIL: Feil ved omkoding frå teiknkodinga «%s»>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "klarte ikkje opna fila «%s»: %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): fila «%s» finst ikkje\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, fuzzy, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "ÅTVARING: «%s»-verdien er ugyldig, og vert ikkje brukt\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "ÅTVARING: ingen «max-mem-size» vald\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "ÅTVARING: «--max-mem-size»-verdien er ugyldig, og vert ikkje brukt\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 "ÅTVARING: «--max-mem-size=%lu%c»-verdien er for høg, og vert ikkje brukt\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 "ÅTVARING: «--max-mem-size=%4.1fM»-verdien er for låg, og vert ikkje brukt\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 "ÅTVARING: «--max-mem-size=%4.0fM»-verdien er for låg, og %uM vert brukt i "
 "staden for\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "binæroperasjonar krev to argument"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "binæroperasjonar krev to argument"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "ÅTVARING: «-e %s»-argumentet utelate, sidan inndata er for stor\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "ÅTVARING: ukjent val («%s»)\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGUMENTET «%s» __ikkje brukt__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "kan ikkje bruka «-e» med «-f» eller «--file»"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "klarte ikkje lagra «tmpfile». Prøv å definera «TMPDIR»."
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "du må velja «--save», «--no-save» eller «--vanilla»"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "klarte ikkje laga «reader thread». Du må frigjera nokre systemressursar."
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "indeksen ligg utanfor grensene"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "kan ikkje trekkja ut delmengd av objekt som er av typen «%s»"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 #, fuzzy
 msgid "WARNING: no value given for --encoding"
 msgstr "ÅTVARING: ingen verdi vald for «--encoding»\n"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, fuzzy, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "ÅTVARING: valet «%s» er ikkje lenger støtta\n"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, fuzzy, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "ÅTVARING: ingen verdi vald for «%s»\n"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, fuzzy, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "ÅTVARING: «%s»-verdien er ugyldig, og vert ikkje brukt\n"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, fuzzy, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "ÅTVARING: «%s»-verdien er for stor, og vert ikkje brukt\n"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 #, fuzzy
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "ÅTVARING: ingen verdi vald for «--max-ppsize»\n"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "ÅTVARING: «--max-ppsize»-verdien er negativ, og vert ikkje brukt\n"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "ÅTVARING: «--max-ppsize»-verdien er for låg, og vert ikkje brukt\n"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "ÅTVARING: «--max-ppsize»-verdien er for høg, og vert ikkje brukt\n"
@@ -631,7 +631,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "fann ikkje ledig plass til «name»"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "venta teiknargument"
 
@@ -689,7 +689,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "feil ved setjing av tidssone"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "argumentet «code» må vera ein teiknstreng"
@@ -720,9 +720,9 @@
 msgid "invalid multibyte format string"
 msgstr "ugyldig multibyte-formateringstekst"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -734,7 +734,7 @@
 msgstr "«title» må vera ein teiknstreng"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "det regulære uttrykket er ugyldig i dette lokalet"
 
@@ -745,8 +745,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "innteksten «%d» er ugyldig i dette lokalet"
@@ -754,7 +754,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "argumentet «%s» vert ikkje brukt"
@@ -769,7 +769,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "innteksten «%d» er ugyldig i dette lokalet"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, fuzzy, c-format
 msgid "regcomp error: '%s'"
 msgstr "regcomp-feil: «%s»"
@@ -779,29 +779,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "«FUN.VALUE» må vera ein vektor"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "ugyldig «%s»-verdi"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "ugyldig lengd"
 
@@ -837,7 +837,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "NaN-verdiar vart laga"
 
@@ -850,111 +850,111 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "truleg fullstendig tap av nøyaktigheit ved modulus-operasjon"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "NA-verdiar produsert av heiltalsoverflyt"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "operatoren treng eitt eller to argument"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "ikkje-numerisk argument til binæroperator"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "array-objekt av ikkje-samsvarande storleikar"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "tidsrekkjer av ikkje-samsvarande storleikar"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 "lengda til det lengste objektet er ikkje eit multiplum av lengda til det "
 "kortaste"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "ugyldig argument til unæroperator"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "ugyldig unæroperator"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "ikkje-implementert reell funksjon med 1 argument"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "ikkje-implementert kompleks funksjon"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "ikkje-implementert reell funksjon med %d numeriske argument"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d argument sende til «%s», som tek 1 eller 2 argument"
 msgstr[1] "%d argument sende til «%s», som tek 1 eller 2 argument"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "ugyldig andreargument av lengd 0"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "argumentet «%s» manglar, og har ingen standardverdi"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "ugyldig argument «base» av lengd 0"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, fuzzy, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "«path» må vera ein teiknvektor"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "ikkje-numerisk matrisestorleik"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "ugyldig «nrow»-verdi (for stor eller NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "negativ «nrow»-verdi"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "ugyldig «ncol»-verdi (for stor eller NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "negativ «ncol»-verdi"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
@@ -962,7 +962,7 @@
 "datalengda [%d] er ikkje ein faktor eller eit multiplum av talet på rader "
 "[%d]"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -970,104 +970,104 @@
 msgstr ""
 "datalengda [%d] er ikkje ein faktor eller multiplum av talet på kolonnar [%d]"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "datalengda er større enn matrisa"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "for mange oppgjevne element"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "negativ matrisestorleik"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: for mange oppgjevne element"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "negativ storleik på 3D-array"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 #, fuzzy
 msgid "'alloc3Darray': too many elements specified"
 msgstr "alloc3Darray: for mange oppgjevne element"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 #, fuzzy
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "allocArray: for mange element oppgjevne i «dims»"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "«x» må vera ein teiknvektor"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, fuzzy, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "«row» og «col» tek berre matriseliknande element"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "tek berre numeriske eller komplekse matrise- og vektorargument"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "ikkje-samsvarande argument"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "argumentet er ikkje ei matrise"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "førsteargumentet må vera eit array"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, fuzzy, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "«perm» har feil lengd"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "«a» har ikkje «dimnames»-namn"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, fuzzy, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "«perm[%d]» er ikkje i samsvar med eit dimensjonsnamn"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "verdien til «perm» er utanfor gyldig verdiområde"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "«resize» må vera TRUE eller FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "«x» må vera numerisk"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "«object» er for kort"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 #, fuzzy
 msgid "'dims' cannot be of length 0"
 msgstr "«hadj» må ha lengd 1"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 #, fuzzy
 msgid "'x' must have positive length"
 msgstr "«value» må ha positiv lengd"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1132,150 +1132,151 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "prøvde å definera eit ugyldig «class»-attributt"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "ikkje-kompatibelt «names»-argument"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "ugyldig type (%s) for å setja «names»-attributt"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "«dimnames» brukt på ikkje-array"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "«dimnames» må vera ei liste"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "«%s» må vera ei liste"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "lengda til «dimnames» [%d] må vera i samsvar med «dims» [%d]"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "ugyldig type (%s) for «dimnames» (må vera ein vektor)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "lengda til «dimnames» [%d] er ikkje lik array-storleiken"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "ugyldig førsteargument"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "ugyldig andreargument"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "dimensjonsvektoren kan ikkje ha lengd 0"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "dimensjonane inneheld manglande verdiar"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "dimensjonane inneheld negative verdiar"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 #, fuzzy
 msgid "dims do not match the length of object"
 msgstr "«dims» [produkt %d] er ikkje i samsvar med lengda av objektet [%d]"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "«dims» [produkt %d] er ikkje i samsvar med lengda av objektet [%d]"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "attributta må vera ei liste eller NULL"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "attributta må ha namn"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "alle attributta må ha namn (%d har ikkje det)"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "«which» må ha modus «character»"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "nøyaktig eitt «which»-attributt må vera oppgjeve"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "«%s» vert tolka som «%s»"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, fuzzy, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "ugyldig type eller lengd på slot-namn"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "«name» må vera ein teiknstreng ulik null"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "ugyldig type eller lengd på slot-namn"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "klarte ikkje henta slot («%s») frå eit objekt av typen «%s»"
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 "det finst ikkje ein slot med namnet «%s» for dette objektet av klassen «%s»"
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "prøvde å setja slot på eit NULL-objekt"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 #, fuzzy
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "formelle klassar kan ikkje brukast utan «methods»-pakken"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1284,7 +1285,7 @@
 "prøver å henta slot «%s» frå eit objekt av ein grunnklasse («%s») utan slot-"
 "ar"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1293,46 +1294,46 @@
 "prøver å henta slot «%s» frå eit objekt (klasse «%s») som ikkje er eit S4-"
 "objekt"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "typen «%s» er ikkje implementert i «%s»"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "gjenteke formelt argument: «recursive»"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "gjenteke formelt argument: «use.names»"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "argumentet er ikkje ei liste"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "klassenamnet er for langt i «%s»"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "kan ikkje laga matrise frå desse typane"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "talet på rader i matrisene må vera like (sjå argument %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "talet på kolonnar i matrisene må vera like (sjå argument %d)"
@@ -1341,230 +1342,248 @@
 msgid "vector size cannot be NA"
 msgstr "vektorstorleiken kan ikkje vera NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "vektorstorleiken kan ikkje vera NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "vektorstorleiken kan ikkje vera uendeleg"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "den oppgjevne vektorstorleiken er for stor"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "bruk av NULL-omgjevnaden er ikkje lenger mogleg"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "argumentet kan ikkje vera ein funksjon"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "erstattingsobjektet er ikkje ein omgjevnad"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "«enclos» må vera ein omgjevnad"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "argumentet er ikkje ein omgjevnad"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "den tomme omgjevnaden har ikkje nokon forelder"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "kan ikkje definera forelderen til den tomme omgjevnaden"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "kan ikkje definera forelderen til den tomme omgjevnaden"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "kan ikkje definera forelderen til den tomme omgjevnaden"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "«parent» er ikkje ein omgjevnad"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "klarte ikkje skriva til sambandet"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "ugyldig «%s»-format"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "ikkje-positivt «fill»-argument vert ikkje brukt"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "«cat» kan ikkje handtera argument %d (type «%s»)"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "vector: kan ikkje laga vektor av modus «%s»"
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "kan ikkje setja lengda til ikkje-vektor"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "ugyldig argument"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "ugyldig verdi"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "«...» brukt i feil samanheng"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, fuzzy, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "duplikat standardverdi i «switch»: «%s» og «%s»"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "«EXPR» manglar"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "«EXPR» må vera ein vektor av lengd 1"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d argument sendt til «%s», som tek %d argument"
 msgstr[1] "%d argument sende til «%s», som tek %d argument"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "«%s» tek berre ein teiknvektor"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "ugyldig multibyte-streng: %d"
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "hentar ut delstrengar frå ikkjeteikn-objekt"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 #, fuzzy
 msgid "invalid substring arguments"
 msgstr "ugyldig(e) delstreng-argument"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "ikkjeteikn-namn"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "byt ut delstrengar i ikkjeteikn-objekt"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "det første argumentet må vera ein teiknvektor"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abbreviate() brukt på ikkje-ASCII-data"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "ikkjeteikn-namn"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "ugyldig multibyte-streng: %d"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "ikkjeteikn-argument"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "minkande område valt («%lc-%lc»)"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "minkande område valt («%c-%c»)"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "ugyldig UTF-8-streng: «old»"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "ugyldig multibyte-streng: «old»"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "ugyldig UTF-8-streng: «new»"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "ugyldig multibyte-streng: «new»"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "«old» er lengre enn «new»"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "ugyldig multibyte-inntekst %d"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim() tek berre ein teiknvektor"
 
@@ -1576,7 +1595,7 @@
 msgid "applies only to lists and vectors"
 msgstr "kan berre brukast på lister og vektorar"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "det oppstod NA-verdiar ved typeomgjering"
 
@@ -1585,7 +1604,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "det oppstod NA-verdiar ved typeomgjering"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "imaginærdel forkasta ved talomgjering"
 
@@ -1593,119 +1612,115 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "verdiar utanfor gyldig talområde vart 0 ved omgjering til råverdiar"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "ugyldig data av modus «%s» (for kort)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "«pairlist»-objekt kan ikkje gjerast om til typen «%s»"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "(liste-)objekt kan ikkje gjerast om til typen «%s»"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(symbol-)objekt kan ikkje gjerast om til typen «%s»"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "manglar metode for å gjera denne S4-klassen om til ein vektor"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "omgjevnader kan ikkje gjerast om til andre typar"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "prøvde å gjera om ein ikkje-faktor"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "venta listeargument"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "ugyldig omgjevnad"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "argumentet må ha lengd større enn 0"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "ugyldig funksjonskropp"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "ugyldig argument av lengd 0"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "ugyldig argumentliste"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "typen «single» er ikkje implementert i R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "ikkje-implementert predikat"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() brukt på ikkje-(liste eller vektor) av typen «%s»"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, fuzzy, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "ikkje-implementert type «%s» i «%s»\n"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "«name» manglar"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "det første argumentet må vera ein teiknstreng"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "«what» må vera ein teiknstreng eller ein funksjon"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "«text» må vera ein teiknstreng"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "«args» må vera ei liste"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "«%s» må vera ei liste"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "«envir» må vera ein omgjevnad"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "ugyldig omgjevnad oppgjeven"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "Set class(x) til NULL. Resultatet vil ikkje lenger vera eit S4-objekt."
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1714,7 +1729,7 @@
 "Set class(x) til fleire teiknstrengar («%s», «%s», ...). Resultatet vil "
 "ikkje lenger vera eit S4-objekt."
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1723,18 +1738,18 @@
 "Ved å setja class(x) til «%s», vert attributtet sett til NULL. Resultatet "
 "vil ikkje lenger vera eit S4-objekt."
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "ugyldig erstattingsobjekt for å vera ein klassestreng"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr ""
 "«%s» kan berre setjast som klasse viss objektet har denne typen (fann «%s»)"
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1743,38 +1758,38 @@
 "kan ikkje setja klassen til «matrix» med mindre dimensjonsattributtet er av "
 "lengd 2 (var %d)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "kan ikkje setja klassen til «array» med mindre dimensjonsattributtet har "
 "lengd > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "«value» må vera ein teiknstreng ulik null"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "kan ikkje endra lagringsmodus til ein faktor"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "ugyldig kompleks unæroperator"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "ikkje-implementert kompleks operasjon"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "ikkje-numerisk argument til funksjon"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "ugyldig polynomkoeffisient"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "feil ved rotfinning"
 
@@ -1786,7 +1801,7 @@
 msgid "connection not found"
 msgstr "fann ikkje samband"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "ugyldig samband"
 
@@ -1795,9 +1810,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "lukka ubrukt samband (%d) (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "ikkje-støtta omgjering frå «%s» til «%s»"
@@ -1879,8 +1894,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "for stor blokk oppgjeven"
 
@@ -1910,8 +1925,8 @@
 msgstr "feil ved reservering av fifo-samband"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "berre det første elementet i «description»-argumentet vert brukt"
 
@@ -1923,14 +1938,14 @@
 "sistnemnde)"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "klarte ikkje opna sambandet"
@@ -1998,7 +2013,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "feil ved reservering av bzfile-samband"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "klarte ikkje starta lzma-dekodaren (feil %d)"
@@ -2019,12 +2034,12 @@
 msgstr ""
 "dette er ei %s-komprimert fil, som denne byggversjonen av R ikkje støttar"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "feil ved minnereservering til kopiering til utklippstavla"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "utklippstavla kan ikkje opnast, eller inneheld ikkje noko tekst"
 
@@ -2130,268 +2145,268 @@
 msgid "'con' is not an output textConnection"
 msgstr "«con» er ikkje ein ut-«textConnection»"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "soklar er ikkje tilgjengelege på dette systemet"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "«con» er ikkje eit samband"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "klarte ikkje opna standardsamband"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "sambandet er alt ope"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "ukjend «rw»-verdi"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "klarte ikkje lukka standardsambanda"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 #, fuzzy
 msgid "cannot close 'output' sink connection"
 msgstr "klarte ikkje lukka utsink-samband"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 #, fuzzy
 msgid "cannot close 'message' sink connection"
 msgstr "klarte ikkje lukka meldingssink-samband"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "sambandet er ikkje ope"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 #, fuzzy
 msgid "line longer than buffer size"
 msgstr "Linja er lengre enn bufferstorleiken"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "klarte ikkje lesa frå dette sambandet"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "klarte ikkje reservera buffer i readLines"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "fann ufullstendig sluttlinje på «%s»"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "for få linjer å lesa i readLines"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "forkasta ufullstendig streng på slutten av fila"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr "fann ingen nullterminator: bryt strengen etter 10 000 byte"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "kan berre lesa frå eit binærsamband"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "endring av storleik er ikkje støtta for komplekse vektorar"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "storleiken %d er ukjend på denne maskina"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw er alltid av storleik 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "«x» er ikkje ein atomsk vektortype"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "kan berre skriva til binærsamband"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "berre 2³¹ − 1 byte kan skrivast til ein råvektor"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 #, fuzzy
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "berre 2³¹ − 1 byte kan skrivast i eit einskild «readBin()»-kall"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "feil ved skriving til samband"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "endring av storleik er ikkje støtta for råvektorar"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "ugyldig UTF-8-data i readChar()"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "kan berre lesa i byte i eit ikkje-UTF-8-basert MBCS-lokale"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "«object» er for kort"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: ba om fleire byte enn det er i strengen (nullverdiar vert lagde "
 "til på slutten)"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: ba om fleire teikn enn det er i strengen (nullverdiar vert lagde "
 "til på slutten)"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 #, fuzzy
 msgid "maximum number of pushback lines exceeded"
 msgstr "meir enn maks tal på fargar brukt"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 #, fuzzy
 msgid "could not allocate space for pushback"
 msgstr "klarte ikkje reservera plass til pushBack"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "kan berre gjera «push back» på opne leselege samband"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "kan berre gjera «push back» på tekstmodus-samband"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "sink-stakken er full"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "klarte ikkje byta utdata til stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "ingen sink å fjerna"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 #, fuzzy
 msgid "there is no connection NA"
 msgstr "sambandet %d finst ikkje"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "sambandet %d finst ikkje"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "nsl() er ikkje støtta på denne plattforma"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 "file(\"\") støttar berre «open = \"w+\"» og «open = \"w+b\"» (brukar "
 "førstnemnde)"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "ICU er ikkje støtte på dette bygget"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "filstraumen har ikkje det magiske talet til gzip"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "filstraumen har ikkje eit gyldig gzip-hovud"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "feil ved tømming av gzon-samband"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "CRC-feil %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "feil ved skriving til gzcon-samband"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "«level» må vera éin av 0, 1, ..., 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "«allowNonCompression» må vera «TRUE» (sann) eller «FALSE» (usann)"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "«all.x» må vera TRUE eller FALSE"
+
+#: src/main/connections.c:5502
 #, fuzzy
 msgid "this is already a 'gzcon' connection"
 msgstr "dette er alt eit gzcon-samband"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "kan berre bruka lese- eller skrive-binærsamband"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr "bruk av tekstmodus-«file»-samband vil kanskje ikkje fungera skikkeleg"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 #, fuzzy
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
@@ -2400,76 +2415,72 @@
 "kan ikkje oppretta eit gzcon-samband frå ein skrivar «textConnection» (du "
 "kan prøva å bruka «rawConnection»)"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "feil ved reservering av gzcon-samband"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "ikkje ei liste over soklar"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "ugyldig skriveindikatorar"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "ikkje eit sokkelsamband"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "ukjend komprimering – antek ukomprimerte data"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, fuzzy, c-format
 msgid "allocation of %s connection failed"
 msgstr "feil ved reservering av råsamband"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 #, fuzzy
 msgid "no loop for break/next, jumping to top level"
 msgstr "inga lykkje å bryta ut av (hoppar til toppnivå)"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "ingen funksjon å returnera frå (hoppar til toppnivå)"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "målkonteksten er ikkje på stakken"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "så mange rammer finst ikkje på stakken"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "berre positive verdiar av «n» er tilletne"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "ingen funksjon å starta på nytt"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "talet på kontekstar må vera positiv"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "manglar browser-kontekst å spørja"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "ikkje så mange kall til browser er aktive"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "så mange funksjonar finst ikkje på stakken"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "intern feil i «do_sys»"
 
@@ -2478,40 +2489,40 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "Heiltalsoverflyt i «cumsum». Bruk «cumsum(as.numeric(.))»."
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 #, fuzzy
 msgid "'cummax' not defined for complex numbers"
 msgstr "min/max er ikkje definert for komplekse tal"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 #, fuzzy
 msgid "'cummin' not defined for complex numbers"
 msgstr "min/max er ikkje definert for komplekse tal"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "ukjend cumxxx-funksjon"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "feil ved setjing av tidssone"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "kan ikkje setja tidssonar på dette systemet"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "feil ved avsetjing av tidssone"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 #, fuzzy
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "komponent av lengd null i ikkje-tom POSIXlt-struktur"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "klarte ikkje reservera minne til «read.dcf»"
 
@@ -2525,11 +2536,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "Linja som startar med «%s ...» har feil format."
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "argumentet må vera ei omslutting"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "argumentet må vera ein funksjon"
 
@@ -2538,7 +2545,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "«all.x» må vera TRUE eller FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "argumentet kan ikkje vera ein funksjon"
 
@@ -2555,61 +2562,61 @@
 msgstr ""
 "«tracemem» er ikkje nyttig for svake referansar eller eksternpeikar-objekt"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R vart ikkje kompilert med støtte for minneprofilering"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "for få argument"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 #, fuzzy
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "ugyldig «cutoff» for deparse (brukar standardverdien)"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "deparse på S4-objekt kan ikkje seinare source()-ast"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "deparse-resultatet kan vera ufullstendig"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "deparse-resultatet kan kanskje ikkje source()-ast på R < 2.7.0"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "«what» må vera ein teiknstreng eller ein funksjon"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "skreiv for få teikn"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "venta teiknargument"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 #, fuzzy
 msgid "zero-length argument"
 msgstr "argument av lengd null"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "«opts» må vera eit lite, ikkje-negativt tal"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "fann ikkje objektet «%s»"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "feilutforma funksjonsuttrykk"
 
@@ -2622,15 +2629,15 @@
 msgid "no active or default device"
 msgstr "inga verksam eller standard eining"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "for mange opne einingar"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "ikkje nok minne å tildela eininga (i GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "Trykk «Enter» for å sjå det neste plottet: "
 
@@ -2718,7 +2725,7 @@
 msgid "too many arguments, sorry"
 msgstr "for mange argument"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "ugyldig grafikktilstand"
 
@@ -2873,7 +2880,7 @@
 msgid "invalid argument to edit()"
 msgstr "ugyldig argument til edit()"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "klarte ikkje opna fila"
 
@@ -2937,12 +2944,12 @@
 msgstr "ingen grafikksystem å avregistrera"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "ugyldig linjeslutt"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "ugyldig linjesamanslåing"
 
@@ -2975,84 +2982,98 @@
 msgid "raster capture is not available for this device"
 msgstr "%s er ikkje tilgjengeleg for eininga"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "skriftsnittet «%d» er ikkje støtta for skrifta «%s»"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "ingen verksame grafikkeiningar"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "pch-verdien «%d» er ugyldig i dette lokalet"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "ikkje-implementert pch-verdi «%d»"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "ugyldig aksestorleik [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "uendeleg aksestorleik [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 #, fuzzy
 msgid "display list redraw incomplete"
 msgstr "Ufullstendig oppteikning av visingsliste"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "ugyldig argumentliste"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "«expr»-argumentet må vera eit uttrykk"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "«list»-argumentet må vera ei liste"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "«env»-argumentet må vera ein omgjevnad"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "ugyldig multibyte-teikn i pch=\"c\""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "ugyldig heksadesimal-siffer i «color» eller «lty»"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "ugyldig linjetype: må ha lengd 2,4 6 eller 8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "ugyldig linjetype: nullar er ikkje tilletne"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "ugyldig linjetype"
 
@@ -3061,7 +3082,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "kan ikkje endra verdi på låst binding for «%s»"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "kan ikkje leggja bindingar til ein låst omgjevnad"
 
@@ -3077,434 +3098,430 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "avbinding er ikkje implementert for namnerommet «base»"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "kan ikkje fjerna bindingar frå ein låst omgjevnad"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "argumentet til «%s» er ikkje ein omgjevnad"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, fuzzy, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "Lista «...» inneheld ikkje %d element"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d er brukt i feil samanheng: ingen «...» å sjå i"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "fann ikkje funksjonen «%s»"
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "kan ikkje tildela verdiar i den tomme omgjevnaden"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "kan ikkje tildela verdiar til databasen"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "kan ikkje leggja binding av «%s» til omgjevnaden «base»"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "berre det første elementet vert brukt som variabelnamn"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "det første argumentet må vera ei namna liste"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "names(x) må vera ein teiknvektor av same lengd som x«xosm"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 #, fuzzy
 msgid "'envir' argument must be an environment"
 msgstr "«env»-argumentet må vera ein omgjevnad"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "kan ikkje fjerna variablar frå namnerommet «base»"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "kan ikkje fjerna variablar frå omgjevnaden «base»"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "kan ikkje fjerna variablar frå den tomme omgjevnaden"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "kan ikkje fjerna variablar frå denne databasen"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "fann ikkje objektet «%s» av modus «%s»"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "ugyldig namn i posisjon %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "det andre argumentet må vera ein omgjevnad"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "feil lengd på «%s»-argumentet"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "ugyldig bruk av «missing»"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "«missing» kan berre brukast på argument"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "«pos» må vera eit heiltal"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "all elementa i ei liste må ha namn"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "«attach» fungerer berre for lister, datarammer og omgjevnader"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "kan ikkje kopla laus «package:base»"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "argumentet må vera ein omgjevnad"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "argumenta må vera symbolske"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "inga omslutnande omgjevnad"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "elementet «%s» finst ikkje i søkjelista"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "bruk av «as.environment(NULL)» er ikkje lenger mogleg"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "S4-objekt utvidar ikkje klassen «environment»"
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "ugyldig objekt til «as.environment»"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "ikkje ein omgjevnad"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "ikkje eit symbol"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "inga binding for «%s»"
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "ikkje ein funksjon"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "symbolet har alt ei vanleg binding"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "kan ikkje endra verksam binding viss binding er låst"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "ukjend op"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "kan ikkje avbinda ei låst binding"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "kan ikkje avbinda ei aktiv binding"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 #, fuzzy
 msgid "bad namespace name"
 msgstr "ugyldig namn på namnerom"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 #, fuzzy
 msgid "namespace already registered"
 msgstr "namnerommet er alt registrert"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 #, fuzzy
 msgid "namespace not registered"
 msgstr "namnerommet er ikkje registrert"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "ugyldig argument til importeringsomgjevnad"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "ugyldig argument til eksporteringsomgjevnad"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "importerings- og eksporteringsnamna må vera like lange"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "det eksporterte symbolet «%s» har ikkje nokon verdi"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "ukjend koding: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "nul inni streng: «%s»"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "uverksame avbrot – signal ignorert"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "ugyldig val «warning.expression»"
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(gjord om frå åtvaring) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "Ã…tvaring: %s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "Ã…tvaring in %s: %s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Tapt åtvaringsmelding\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Ã…tvaring:\n"
 msgstr[1] "Ã…tvaringar:\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "Det oppstod %d åtvaringar (bruk «warnings()» for å sjå dei)\n"
 msgstr[1] "Det oppstod %d åtvaringar (bruk «warnings()» for å sjå dei)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 "Det oppstod 50 eller fleire åtvaringar (bruk «warnings()» for å sjå dei 50 "
 "første)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "Feil ved wrapup: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Feil i "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "Feil i "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Feil: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "I tillegg: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "ugyldig val «error»\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Stoppa køyring\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "«sep» må vera ein teiknvektor"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [ugyldig streng i stop(.)]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [ugyldig streng i warning(.)]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "feil tal på argument til «%s»"
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "ikkje-implementert funksjon i %s"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "ugyldig tal på argument"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "ugyldig argumentstype"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "ikkje samsvarande lengd på tidsrekkje/vektor"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "ikkje-kompatible argument"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "ukjend feil (meld frå om dette!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "unøyaktig heiltalsomgjering ved typeomgjering"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "ukjend åtvaring (meld frå om dette!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "Ingen funksjon å venda tilbake frå. Hoppar til toppnivå."
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "Inkonsistens på toppnivå"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "ugyldig handteringsdata"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "feilmeldinga er ikkje ein teiknstreng"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr "ikkje samsvar i handterings- eller omstartstakk i gammal omstart"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "ugyldig feilmelding"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "ugyldig omstart"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "omstart ikkje på stakk"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "er ikkje i ein «try»-samanheng"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "feilmeldinga må vera ein teiknstreng"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: klarte ikkje opna profilfila «%s»"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "R-profilering er ikkje tilgjengeleg på dette systemet"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
@@ -3512,259 +3529,267 @@
 "promise held allereie på å verta evaluert: rekursiv standardargument-"
 "referanse eller tidlegare problem?"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "startar avbroten promise-evaluering på nytt"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr "for djup evaluering: uendeleg rekursjon / options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "argumentet manglar (og har ikkje nokon standardverdi)"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "prøvde å køyra ikkje-funksjon"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s på %s#%d: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "argumentet %d er tomt"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "fann ikkje symbolet «%s» i omgjevnaden til den generiske funksjonen"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "symbolet «%s» finst ikkje i omgjevnaden til metoden"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "vilkåret har lengd større 1 enn (berre første elementet vert brukt)"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "manglar verdi der TRUE/FALSE (sann/usann) trengst"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "argumentet kan ikkje tolkast som ein logisk verdi"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "argumentet har lengd null"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "lykkje-variabel som ikkje er eit symbol"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "ugyldig for()-lykkje"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "fleire returverdiar er ikkje mogleg"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "ugyldig venstreside (NULL) i tildeling"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "målet i tildelinga vert utvida til eit ikkje-språksobjekt"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "for langt namn i «%s»"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "kan ikkje utføra komplekse tildelingar namnerommet «base»"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "kan ikkje utføra komplekse tildelingar omgjevnaden «base»"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "ugyldig funksjon i kompleks tildeling"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "ugyldig (do_set) venstreside i tildeling"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "«%s» manglar"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "ugyldig formell argumentliste til «function»"
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, fuzzy, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "ugyldig «%s»-argument"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "numerisk «envir»-argument ikkje av lengd 1"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "omstartar er ikkje støtta i «eval»"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "«Recall» kalla utanfrå ei omslutting"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "verdien i «...» er ikkje eit «promise»"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Ikkje-kompatible metodar («%s», «%s») for «%s»"
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "avsendingsfeil i gruppeavsending"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, fuzzy, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "«fn» er ikkje ein funksjon"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "overflytsfeil i nodestakk"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "overflytsfeil i heiltalsstakk"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 #, fuzzy
 msgid "bad opcode"
 msgstr "Ugyldig opcode"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "ugyldig %s-type i «x %s y»"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "feil bytekode-versjon (brukar eval)"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "bytekode-versjonen er for gammal"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "bytekode-versjonen er for ny"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "feil i bytekode-versjon"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "ugyldig følgjeargument i for-lykkje"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, fuzzy, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "internfunksjonen «%s» finst ikkje"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "ugyldig funksjon"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "ikkje ein BUIILTIN-funksjon"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "finn ikkje indeks for tråda kodeadresse"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 #, fuzzy
 msgid "invalid body"
 msgstr "ugyldig symbol"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "ugyldig symbol"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "argumentet er ikkje eit bytekode-objekt"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "ugyldig filnamn"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "klarte ikkje opna «file»"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "«file» må vera ein ikkje-tom teiknstreng"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "«ascii» må vera ein logisk verdi"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 #, fuzzy
 msgid "constant buffer must be a generic vector"
 msgstr "«code» må vera ein generisk vektor"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "profiltidtakar i bruk"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "profilerer alt bytekode"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "klarte ikkje velja profiltidtakar"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "profilerer ikkje bytekode"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "ICU er ikkje støtte på dette bygget"
@@ -3782,16 +3807,16 @@
 msgid "this graphics device does not support event handling"
 msgstr "grafikkeininga støttar ikkje hendingshandsaming"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "ugyldig spørjing"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 #, fuzzy
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "rekursiv bruk av «getGraphicsEvent» er ikkje støtta"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "ingen grafikkhendingshandsamarar definerte"
 
@@ -3975,7 +4000,7 @@
 msgstr "ugyldig regulært uttrykk: %s"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "innteksten «%d» er ugyldig UTF-8"
@@ -4068,26 +4093,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "kan ikkje bruka Internett-rutinar i modul"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "kan ikkje lasta Internett-rutinar"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "ugyldig verdi"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "kan ikkje lasta sokkelrutinar"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "prøvde å definera eit ugyldig «comment»-attributt"
+
 #: src/main/lapack.c:39
 #, fuzzy
 msgid "LAPACK routines cannot be accessed in module"
@@ -4098,39 +4122,39 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "kan ikkje lasta sokkelrutinar"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 "operasjonane kan berre brukast på numeriske, logiske eller komplekse typar"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "binæroperasjon på array-ar av ikkje-samsvarande storleikar"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "tidsrekkjer av ikkje-samsvarande storleikar"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "«%s»-operatoren tek nøyaktig 2 argument"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "ugyldig «x»-type i «x %s y»"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "ugyldig «y»-type i «x %s y»"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "kalla unæroperatoren «!» med to argument"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "gjer om argument av typen «%s» til logisk verdi"
@@ -4139,62 +4163,76 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "Feil ved wrapup: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Stoppa køyring\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "Feil: Minnepeikarfeil frå C-stakkoverflyt\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "klarte ikkje opna pakken «base»\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, fuzzy, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "klarte ikkje gjenoppretta lagra data i «.RData»\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Ved oppstart – "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "klarte ikkje opna fila å lesa"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "klarte ikkje avslutta browser"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "venta anten «yes», «no», «ask» eller «default»"
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "save=\"ask\" i ikkje-interaktiv bruk: kommandolinjestandardverdien vert brukt"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "ukjend «save»-verdi"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "ugyldig «status» (brukar 0)"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "ugyldig «runLast» (brukar FALSE)"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr "klarte ikkje reservera plass til tilbakekall-element på toppnivå"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "negativ indeks send til R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "åtvaringsmeldingar frå oppgåve-tilbakekall «%s» på toppnivå\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "oppgåve-tilbakekall på toppnivå returnerte ikkje ein logisk verdi"
 
@@ -4239,165 +4277,170 @@
 msgstr[0] "ubrukt(e) argument %s"
 msgstr[1] "ubrukt(e) argument %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "kan berre svakt referera/finalisera referanseobjekt"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "finalisatoren må vera ein funksjon eller NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "ikkje ein svak referanse"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "det første argumentet må vera ein omgjevnad eller ein ekstern peikar"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "det andre argumentet må vera ein funksjon"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "det tredje argumentet må vera «TRUE» (sann) eller «FALSE» (usann)"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "ikkje nok vektorminne (nådde grensa?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "ikkje nok konstantminne (nådde grensa?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "ikkje nok minne (nådde grensa?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "klarte ikkje reservera minneblokk av storleik %0.1f Gb"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "klarte ikkje reservera minneblokk av storleik %0.1f Gb"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 #, fuzzy
 msgid "vector is too large"
 msgstr "den oppgjevne vektorstorleiken er for stor"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "kan ikkje ha vektorar av negativ lengd"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "kan ikkje reservera vektor av lengd %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "ugyldig type/lengd (%s/%d) ved vektorreservering"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "kan ikkje reservera vektor av storleik %0.1f Gb"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "kan ikkje reservera vektor av storleik %0.1f Mb"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "kan ikkje reservera vektor av storleik %0.f Kb"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): vern av stakkoverflyt"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect(): berre %d verna objekt"
 msgstr[1] "unprotect(): berre %d verna objekt"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: fann ikkje peikar"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] "unprotect(): berre %d verna objekt"
 msgstr[1] "unprotect(): berre %d verna objekt"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, fuzzy, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "Calloc klarte ikkje reservera (%u av %u) minne"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, fuzzy, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "Realloc klarte ikkje endra storleik (%u) på reservert minne"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "ikkje trygt å returnera vektorpeikar"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "ugyldig verdi"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "minneprofilering er ikkje tilgjengeleg på dette systemet"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: klarte ikkje opna utfila «%s»"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "krev strengargument"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "primitivfunksjonen finst ikkje"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "variabelnamn av lengd null"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "variabelnamn må vera mindre enn %d byte"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "ugyldig .Internal()-argument"
 
@@ -4439,104 +4482,104 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "ingen samsvarande metode for «%s» brukt på eit objekt av klassen «%s»"
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "«NextMethod» kalla utanfrå ein funksjon"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "«NextMethod» kalla frå ein anonym funksjon"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "fann ikkje noko generisk kall: vart metoden kalla direkte?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "«function» er ikkje ein funksjon men av typen %d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "feil argument ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "ikkje valt objekt"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "ikkje valt generisk funksjon"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 #, fuzzy
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "ugyldig generisk argument til NextMethod"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 #, fuzzy
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "fann ugyldig «group»-argument i NextMethod"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr "feil verdi for «.Method»"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "ikkje-kompatible metodar ignorerte"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "ingen metode å bruka"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "kan ikkje fjerna klasse frå ein omgjevnad"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "kan ikkje fjerna klasse frå ein ekstern peikar"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "«what» må vera ein teiknvektor"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "«which» må vera ein logisk vektor av lengd 1"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "bruk «is» i staden for «inherits()» på S4-objekt"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 #, fuzzy
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "«all.x» må vera TRUE eller FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "klarte ikkje finna ein ikkje-generisk versjon av funksjonen «%s»"
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 #, fuzzy
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 "standardGeneric vart kalla utan metodeavsending slått på (vert ignorert)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 #, fuzzy
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr "argument til standardGeneric må vera ein ikkjetom teiknstreng"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4545,7 +4588,7 @@
 "kall til standardGeneric(\"%s\") ikkje frå funksjonskroppen til den "
 "generiske funksjonen"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4554,11 +4597,11 @@
 "ugyldig primitivmetode-kode («%s») (må vera «clear», «reset», «set» eller "
 "«suppress»)"
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "ugyldig objekt: må vera ein primitiv funksjon"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4567,22 +4610,22 @@
 "den formelle definisjonen av ein primitiv generisk må vera eit "
 "funksjonsobjekt (typen er «%s»)"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, fuzzy, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 "objekt returnert som den generiske funksjonen «%s» ser ikkje ut til å vera "
 "ein generisk funksjon"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "ugyldig primitivoperasjon gjeven for avsending"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "avsendingsfeil"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4591,86 +4634,91 @@
 "primitivfunksjonen «%s» er sett for metodar, men ingen generisk funksjon er "
 "oppgjeven"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "MAKE_CLASS-makro på C-nivå kalla med NULL-strengpeikar"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "Hershey-skriftene kan ikkje lastast"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "R_getClassDef(.) kalla med NULL-strengpeikar"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "NEW-makro på C-nivå kalla med NULL-klassedefinisjonspeikar"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "prøver å generera objekt frå virtuell klasse («%s»)"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, fuzzy, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "Objekt av klassen «%s» svarar ikkje til eit gyldig S3-objekt"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "øydelagd valliste"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "ugyldig tekstbreidd (brukar 80)"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "ugyldig tal på siffer (brukar 7)"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "ugyldig verdi for «device.ask.default» (brukar FALSE)"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "listeargumentet har ikkje nokon gyldige namn"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "ugyldig «width»-parameter (bruk verdiar frå %d til %d)"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "ugyldig «digits»-parameter (bruk verdiar frå %d til %d)"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "ugyldig «expressions»-parameter (bruk verdiar frå %d til %d)"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "ugyldig verdi for «%s»"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "«dec» må vera eitt teikn"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "«par.ask.default» er bytt ut med «device.ask.default»"
 
@@ -4695,11 +4743,16 @@
 msgid "first argument must be atomic"
 msgstr "det første argumentet må vera atomisk"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "«dec» må vera eitt teikn"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "umogleg modus (x)"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "berre atomske vektorargument"
 
@@ -4707,217 +4760,199 @@
 msgid "invalid filename specification"
 msgstr "ugyldig filnamnspesifikasjon"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "skrivefeil ved tilføying"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "ingenting å tilføya til"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "ugyldig filnamnargument"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "kan ikkje oppretta fila «%s», av grunnen «%s»"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "ugyldig første filnamn"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "kan ikkje fjerna fila «%s», av grunnen «%s»"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "ugyldig andre filnamn"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "ingenting å lenkja"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 #, fuzzy
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "symbolske lenkjer er ikkje støtta på denne plattforma"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, fuzzy, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "kan ikkje laga symbolsk lenkje av «%s» til «%s», av grunnen «%s»"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "kan ikkje laga symbolsk lenkje av «%s» til «%s», av grunnen «%s»"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 #, fuzzy
 msgid "symbolic links are not supported on this platform"
 msgstr "symbolske lenkjer er ikkje støtta på denne plattforma"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, fuzzy, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "kan ikkje laga symbolsk lenkje av «%s» til «%s», av grunnen «%s»"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, fuzzy, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "kan ikkje laga symbolsk lenkje av «%s» til «%s», av grunnen «%s»"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 #, fuzzy
 msgid "(hard) links are not supported on this platform"
 msgstr "symbolske lenkjer er ikkje støtta på denne plattforma"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 #, fuzzy
 msgid "expanded 'from' name too long"
 msgstr "det utvida kjeldenamnet er for langt"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 #, fuzzy
 msgid "expanded 'to' name too long"
 msgstr "det utvida kjeldenamnet er for langt"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "kan ikkje byta namnet på fila «%s» til «%s», av grunnen «%s»"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "ugyldig «pattern» i regulært uttrykk"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "klarte ikkje fastsetja heimeadressa til R"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "filnamnet er for langt"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "intern «ikkje nok minne»-feil"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "lesefeil på «%s»"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "viss du set «LC_NUMERIC», kan R oppføra seg merkeleg"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr "OS-førespurnad om å setja lokalet til «%s» kan ikkje følgjast"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "«hostnamne» må vera ein teiknvektor av lengd 1"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "nsl() klarte ikkje utføra namneoppslag for verten «%s»"
-
-#: src/main/platform.c:2161
-#, fuzzy
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "ukjend format returnert av gethostbyname"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "nsl() er ikkje støtta på denne plattforma"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» finst alt"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "kan ikkje oppretta mappa «%s», av grunnen «%s»"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "«%ls» finst alt"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, fuzzy, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "kan ikkje oppretta mappa «%s», av grunnen «%s»"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "mønster av lengd 0"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, fuzzy, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "feil ved køyring av skriveprogrammet %s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, fuzzy, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "feil ved køyring av skriveprogrammet %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 #, fuzzy
 msgid "over-long path length"
 msgstr "mønster av lengd 0"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, fuzzy, c-format
 msgid "problem creating directory %s: %s"
 msgstr "feil ved køyring av skriveprogrammet %s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, fuzzy, c-format
 msgid "problem reading directory %s: %s"
 msgstr "feil ved køyring av skriveprogrammet %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "«mode» må ha minst eitt element"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "ikkje nok OS-støtte på denne plattforma"
 
@@ -4962,71 +4997,76 @@
 msgid "Metric information not available for this family/device"
 msgstr "Metrikkinformasjon ikkje tilgjengeleg for denne familien/eininga"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "ugyldig «na.print»-val"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "ugyldige radnamn"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "ugyldige kolonnenamn"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr "ikkje-funksjonsargument til .Internal(print.function(.))"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "«gap» må vera eit heiltal større enn null"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "ugyldig «tryS4» internt argument"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "overflyt i inndatabuffer på linje %d"
+
+#: src/main/print.c:1043
 #, fuzzy
 msgid "invalid character length in 'dblepr'"
 msgstr "ugyldig teiknlengd i dblepr"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 #, fuzzy
 msgid "invalid character length in 'intpr'"
 msgstr "ugyldig teiknlengd i intpr"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 #, fuzzy
 msgid "invalid character length in 'realpr'"
 msgstr "ugyldig teiknlengd i realpr"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 #, fuzzy
 msgid "memory allocation error in 'realpr'"
 msgstr "minnereserveringsfeil i realpr"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "BLAS/LAPACK-rutinen «%6s» gav feilkoden %d"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "for få radnamn"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "for få kolonnenamn"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, fuzzy, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] " [ nådde getOption(\"max.print\") – hoppa over siste rad ]]\n"
 msgstr[1] " [ nådde getOption(\"max.print\") – hoppa over siste %d rader ]]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 #, fuzzy
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "nsl() er ikkje støtta på denne plattforma"
@@ -5035,48 +5075,48 @@
 msgid "argument is not a numeric vector"
 msgstr "argument er ikkje ein numerisk vektor"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "ugyldige argument"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "NA-verdiar produserte"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "NA-verdiar i sannsynsvektor"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "ikkje-positivt sannsyn"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "for få positive sannsyn"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "kan ikkje trekkja eit utval større enn populasjonen når «replace =FALSE»"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "feil tal på sannsynsverdiar"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 #, fuzzy
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "«dirmark = TRUE» er ikkje støtta på denne plattforma"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 #, fuzzy
 msgid "argument must be a character vector of length 1"
 msgstr "«hostnamne» må vera ein teiknvektor av lengd 1"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 #, fuzzy
 msgid ""
 "argument should be a character vector of length 1\n"
@@ -5084,310 +5124,310 @@
 msgstr ""
 "argumentet «%s» har lengd større enn 1 (berre første elementet vert brukt)"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 #, fuzzy
 msgid "argument 'x' must be a raw vector"
 msgstr "det første argumentet må vera ein vektor"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 #, fuzzy
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "«resize» må vera TRUE eller FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 #, fuzzy
 msgid "argument 'shift' must be a small integer"
 msgstr "«size»-argumentet må vera eit positivt heiltal"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 #, fuzzy
 msgid "argument 'x' must be an integer vector"
 msgstr "det første argumentet må vera ein teiknvektor"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 #, fuzzy
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "argumentet «logarithm» må vera logisk"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, fuzzy, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "argumentet må vera ein funksjon"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 #, fuzzy
 msgid "argument 'x' must not contain NAs"
 msgstr "argumentet kan ikkje vera ein funksjon"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 #, fuzzy
 msgid "invalid UTF-8 string"
 msgstr "ugyldig UTF-8-streng: «old»"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "samanlikning (%d) er berre mogleg for atomske og liste-typar"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "samanlikning er ikkje mogleg for uttrykk"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "samanlikning er ikkje implementert for desse typane"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "ugyldig samanlikning med komplekse verdiar"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 #, fuzzy
 msgid "'a' and 'b' must have the same type"
 msgstr "«path» må vera ein teiknvektor"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "lesefeil"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "det oppstod ein I-lesefeil"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "det oppstod ein R-lesefeil"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "det oppstod ein C-lesefeil"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "det oppstod ein S-lesefeil"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "det oppstod ein lesefeil"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "uløyst node ved gjenoppretting"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "kompatiblitetsfeil ved gjenoppretting – versjon %d ikkje støtta"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "ugyldig SEXP-type i datafil"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "ulike typar"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "fann ikkje funksjonen «%s»"
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "kan ikkje lagra filplassering ved gjenoppretting av data"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr "kan ikkje gjenoppretta filplassering ved gjenoppretting av data"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr "«base»-namnerom ikkje bevart i versjon 1-arbeidsområde"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "kan ikkje lagra namneområde i versjon 1-arbeidsområde"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 #, fuzzy
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 "kan ikkje lagra omgjevnad med låste/verksame bindingar i versjon 1-namnerom"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "kan ikkje lagra svak referanse i versjon 1-arbeidsområde"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec kalla med type som ikkje er vektor"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr "kan ikkje lagra bytekode-objekt i versjon 1-namneområde"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: ukjend type %i"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec kalla med type som ikkje er vektor"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr "kan ikkje lesa bytekode-objekt frå versjon 1-namneområde"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: ukjend type %i"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "slapp opp for minne ved lesing av ASCII-streng"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "det oppstod ein binærlesefeil"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "slapp opp for minne ved lesing av binærstreng"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "det oppstod ein feil ved lesing av binærstreng"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "det oppstod ein skrivefeil ved lagring av xdr-heiltalsdata"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "det oppstod ein lesefeil ved lesing av xdr-heiltalsdata"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "det oppstod ein skrivefeil ved lagring av xdr-strengdata"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "det oppstod ein skrivefeil ved lagring av xdr-realdata"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "det oppstod ein lesefeil ved lesing av xdr-heiltalsdata"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "det oppstod ein skrivefeil ved lagring av xdr-kompleksdata"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "det oppstod ein lesing ved lesing av xdr-kompleksdata"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "feil ved skriving"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "gjenopprettingsfila kan vera tom – ingen data lasta"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 "gjenopprettingsfila kan vera frå ein nyare versjon av R – ingen data lasta"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "ugyldig magisk tal i gjenoppretingsfil (fila kan vera øydelagd) – ingen data "
 "lasta"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "det første argumentet må vera ein teiknvektor"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "ikkje ei gyldig liste med namn"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 "«%s» ser ut til å vera eit S4-objekt frå før R 2.4.0. Du må laga det på nytt."
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "lasta data er ikkje i para listeform"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "det første argumentet må vera eit filnamn"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "feil ved XDR-skriving"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "feil ved XDR-lesing"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "klarte ikkje lagra data – klarte ikkje opna «%s»: %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "klarte ikkje lagra til samband i versjon %d-format"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "samband ikkje ope for skriving"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "klarte ikkje lagra XDR-format til tekstmodussamband"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "feil ved skriving til samband"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "samband ikkje ope for lesing"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 #, fuzzy
 msgid "can only load() from a binary connection"
 msgstr "kan berre lesa frå eit binærsamband"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "inndata ikkje tilgjengeleg"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5403,7 +5443,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan() venta «%s», men fekk «%s»"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 #, fuzzy
 msgid "too many items"
 msgstr "for mange argument"
@@ -5412,7 +5452,7 @@
 msgid "empty 'what' specified"
 msgstr "tom «what» vald"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "linje %d har ikkje %d element"
@@ -5446,34 +5486,34 @@
 msgid "embedded nul(s) found in input"
 msgstr "nul inni streng: «%s»"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "ulike faktorlengder"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "resultatet ville vera ein lang vektor"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "argumentet har lengd null"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "det numeriske uttrykket har %d element: berre det først vart brukt"
 msgstr[1] "det numeriske uttrykket har %d element: berre det først vart brukt"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "NA/NaN-argument"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "ugyldig type for andre argument"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, fuzzy, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "prøvde å replikera ikkje-vektor"
@@ -5710,53 +5750,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "berre atomske vektorar kan testast for sortering"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "«decreasing» må vera TRUE eller FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "berre atomske vektorar kan sorterast"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "råvektorar kan ikkje sorterast"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, fuzzy, c-format
 msgid "index %ld outside bounds"
 msgstr "indeksen %d ligg utanfor gyldig verdiområde"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "NA-indeks"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "indeksen %d ligg utanfor gyldig verdiområde"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "argumentet %d er ikkje ein vektor"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "argumentlengda er forskjellige"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "ugyldig ties.method for rank() [skal aldri skje]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "for stort verdiområde i «x»"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "klarte ikkje gjera «text» om til ein tekststreng"
@@ -5766,24 +5802,24 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "argumentet «%s = \"%s\"» vert ikkje brukt"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "det første argumentet må vera ein vektor"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "det andre argumentet må vera ein vektor"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 #, fuzzy
 msgid "group length is 0 but data length > 0"
 msgstr "Gruppelengda er 0, men datalengda er > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "datalegnda er ikkje eit multiplum av splittvariabelen"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "faktoren har ugyldige nivå"
 
@@ -5839,38 +5875,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "typeomgjeringa har endra vektorlengda til 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "ugyldig format «%s»: %s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "bruk formatet %d eller %i for logiske objekt"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "bruk formatet %d, %i, %o, %x eller %X for heiltalsobjekt"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "bruk formatet %f, %e, %g eller %a for heiltalsobjekt"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "bruk formatet %s for teiknobjekt"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "truleg trunkering av teiknstreng til %d teikn"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "ikkje-støtta type"
 
@@ -5878,253 +5914,249 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: for liten buffer"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "prøvde å gjera ikkje-vektor lengre"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "tildeling utanfor grense til vektor/liste (utvidar frå %d til %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "ikkje-kompatible typar (frå %s til %s) i undertildelings-typefiks"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "NA-verdiar er ikkje tillatne i indeks-tildelingar"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "«replacement» har lengd null"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr "talet på element å byta ut er ikkje eit multiplum av ubytingslengda"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "feil tal på indeks i matrise"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr "ikkje-kompatible typar (frå %s til %s) i delmatrise-tildeling"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "feil tal på indeksar"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr "ikkje-kompatible typar (frå %s til %s) i delarray-tildeling"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "ugyldig tal på indeks i listetildeling"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "ugyldig tal på indeks i listetildeling"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: ugyldig tal på argument"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr "resultatet har lengd null, og kan derfor ikkje vera eit språkobjekt"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 #, fuzzy
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr "[[<- for S4-objekt er berre definert for underklassar av omgjevnad"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "feil argument for omgjevnads-deltildeling"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "fleire element oppgjevne enn det er element å byta ut"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] med manglande indeks"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] indeks utanfor gyldig verdiområde"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] feil tal på indeksar"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "ikkje-kompatible typar (frå %s til %s) i [[-tildeling"
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] indeks (%d) utanfor gyldig verdiområde"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "ugyldig indekstype «%s»"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "ingen metode for tildeling av delmengder av denne S4-klassen"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "Gjer om venstresida til ei liste"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "prøvde å velja mindre enn eitt element"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "prøvde å velja meir enn eitt element"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "intern feil ved bruk av rekursiv indeksering"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "fleire delvise treff av «%s» til «%s»"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "feil ved rekursiv indeksering på nivå %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "indeks manglar på nivå %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "feil tal på kolonnar i matriseindeks"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "negative verdiar ikkje tillatne i matriseindeks"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(subscript) logisk indeks for lang"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "berre 0-verdiar kan blandast med negative indeksar"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "manglar «dimnamnes»-attributt for array"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "delmengduttrekking på ikkje-vektor"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "matriseindeksering ikkje handtert for denne typen"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "arrayindeksering ikkje handtert for denne typen"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "feil tal på dimensjonar"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "ingen indeks vald"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "kan ikkje trekkja ut delmengder denne S4-klassen"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "feil argument for uttrekkjing av delmengder av omgjevnad"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "ugyldig «type»-argument (%s)"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 #, fuzzy
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "Heiltalsoverfly – bruk sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "internfeil («op = %d» i do_summary).\t Ta kontakt med ein Guru."
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Heiltalsoverfly – bruk sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "ingen ikkje-manglande argument – returnerer NA"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "ingen ikkje-manglande argument til min – returnerer Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "ingen ikkje-manglande argument til max – returnerer -Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "ikkje-numerisk argument"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "argumentet til «which» må vera logisk"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "ingen argument"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "ugyldig inndatatype"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 #, fuzzy
 msgid "an argument will be fractionally recycled"
 msgstr "argumentet «%s» vert ikkje brukt"
@@ -6138,8 +6170,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "ikkje-støtta omgjering frå «%s» til «%s»"
@@ -6173,100 +6205,100 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "feil ved søking på %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "feil type for argument"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "feil lengd på argument"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "«Sys.setenv» er ikkje tilgjengeleg på dette systemet"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr "dette systemet kan ikkje avdefinera omgjevnadsvariablar: set til \"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "«Sys.unsetenv» er ikkje tilgjengeleg på dette systemet"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "ikkje-støtta omgjering frå «%s» til «%s»"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "«x» må vera ein teiknvektor"
 
-#: src/main/sysutils.c:652
+#: src/main/sysutils.c:658
 #, fuzzy
-msgid "'x' must be a list of NULL or raw vectors"
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "«x» må vera ein teiknvektor"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "«%s» må kallast på ein CHARSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "intern feil i unz-kode"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, fuzzy, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "ikkje-støtta omgjering frå «%s» til «%s»"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "ugyldig linjesamanslåing"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 #, fuzzy
 msgid "cannot create 'R_TempDir'"
 msgstr "klarte ikkje reservera R_TempDir"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "klarte ikkje definera R_SESSION_TMPDIR"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 #, fuzzy
 msgid "cannot allocate 'R_TempDir'"
 msgstr "klarte ikkje reservera R_TempDir"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 #, fuzzy
 msgid "temporary name too long"
 msgstr "filnamnet er for langt"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "finn ikkje ubrukt «tempfile»-namn"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 #, fuzzy
 msgid "allocation failed in R_tmpnam2"
 msgstr "reserveringsfeil i «R_tmpnam»"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "«dirmark = TRUE» er ikkje støtta på denne plattforma"
 
@@ -6304,33 +6336,33 @@
 msgid "'nmax' must be positive"
 msgstr "«value» må ha positiv lengd"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "«match» tek berre vektorargument"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "argumentet har ikkje modus «character»"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 #, fuzzy
 msgid "... used in a situation where it does not exist"
 msgstr "... brukt i ein situasjon der han ikkje eksisterer"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "verdien i «...» er ikkje eit «promise»"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "ikkje-numerisk data i rowsum"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "dette kan ikkje skje"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "«names» må vera ein teiknvektor"
 
@@ -6338,144 +6370,144 @@
 msgid "object is not a matrix"
 msgstr "objektet er ikkje ei matrise"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "typen %d er ikkje implementert i «%s»"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "ikkje-implementert type «%s» i «%s»\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "ikkje-implementert type (%d) i «%s»\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "ugyldig merkelapp i namneuttrekk"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%d argument sendt til «.Internal(%s)», som tek %d argument"
 msgstr[1] "%d argument sende til «.Internal(%s)», som tek %d argument"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d argument sendt til «%s», som tek %d argument"
 msgstr[1] "%d argument sende til «%s», som tek %d argument"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "den oppgjevne argumentnamnet «%s» passar ikkje til «%s»"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "«nthcdr»-lista er kortare enn %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "«nthcdr» treng ei liste til CDR ned"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "«all.x» må vera TRUE eller FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "«all.y» må vera TRUE eller FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "manglande verdi er ugyldig"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "klarte ikkje endra arbeidsmappe"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "venta eit teiknvektorargument"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "adressa er for lang"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "berre det første teiknet i «quote» vert brukt"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "venta ein teiknvektor «value»"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "«value» må ha positiv lengd"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "ugyldig inndata «%s» i «utf8towcs»"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "ugyldig multibyte-streng i «%s»"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "feilmelding trunkert til 255 teikn"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "Ã¥tvaring trunkert til 255 teikn"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 #, fuzzy
 msgid "all arguments must be named"
 msgstr "attributta må ha namn"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "ICU er ikkje støtte på dette bygget"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 #, fuzzy
 msgid "'breaks' is not sorted"
 msgstr "typen «%s» er ikkje støtta"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, fuzzy, c-format
 msgid "long vector '%s' is not supported"
 msgstr "typen «%s» er ikkje støtta"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 #, fuzzy
 msgid "'x' must be a vector"
 msgstr "«x» må vera ein teiknvektor"
@@ -6541,7 +6573,7 @@
 msgid "There must be at least three control points"
 msgstr "Det må vera minst tre kontrollpunkt"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "X11-protokollfeil: %s"
@@ -6566,7 +6598,7 @@
 "Feil: X11 kan ikkje tildela fleire grafikkfargar.\n"
 "Prøv å bruka X11 med colortype=\"pseudo.cube\" eller \"gray\"."
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6574,17 +6606,17 @@
 "fann ikkje nokon X11-skrifter.\n"
 "Kontroller at skriftadressa er rett."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 brukte skriftstorleiken %d ved førespurnad om %d"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "klarte ikkje lasta X11-skrifta %s, snitt %d ved storleik %d"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6592,188 +6624,194 @@
 "halvgjennomsikt er ikkje støtta på denne eininga (berre meldt frå om éin "
 "gong per side)"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "X11 I/O-feil ved opning av X11-samband til «%s»"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "X11 kritisk IO-feil: lagra arbeidet ditt og avslutt R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr "lokalet er ikkje støtta av Xlib: nokre X-ops vil operera i C-lokalet"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X kan ikkje setja lokale modikatorar"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "inga PNG-støtte i denne R-versjonen"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "filnamnet i png()-kallet er for langt"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "klarte ikkje opna PNG-fila «%s»"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "inga JPEG-støtte i denne R-versjonen"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "filnamnet i jpeg()-kallet er for langt"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "klarte ikkje opna JPEG-fila «%s»"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "inga TIFF-støtte i denne R-versjonen"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "filnamnet i tiff()-kallet er for langt"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "filnamnet i bmp()-kallet er for langt"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "klarte ikkje opna BMP-fila «%s»"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "klarte ikkje opna samband til X11-skjermen «%s»"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr "ignorerer «display»-argumentet, då ei X11-eining alt er open"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg() støttar ikkje gjennomsikt: brukar kvit bakgrunn"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "klarte ikkje henta informasjon om skjermen «%s»"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "klarte ikkje laga X11-vindauge"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "«width=%d, height=%d» er usannsynlege pikselverdiar"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "klarte ikkje laga pixmap"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "ugyldig skriftspesifikasjon"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "fann ikkje skriftfamilien i X11-skriftdatabasen"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "ugyldig bruk av %d <0 i «%s»"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "klarte ikkje opna fila «%s»"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "%s er ikkje tilgjengeleg for eininga"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "klarte ikkje laga XImage"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "klarte ikkje starta eininga %s"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "ugyldig «breidd» eller «høgd»"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "ugyldig colortype sendt til X11-drivaren"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "ukjend X11 color/colour-modell – brukar monochrome"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "inga plott på eininga å lagra"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "ikkje ei open X11cairo-eining"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "klarte ikkje opna fila «%s»"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "savePlot() er ikkje støtta på denne bygginga"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "fekk ikkje kontakt med X11-display"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "utklippstavla kan ikkje opnast (feilkode: %d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "klarte ikkje reservera minne for X11Routines-struktur"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "omstartar er ikkje støtta i «eval»"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "klarte ikkje reservera url-samband"
 
@@ -6785,29 +6823,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "berre det første elementet i «destfile»-argumentet vert brukt"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Lastar ned"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "klarte ikkje opna adressa «%s», av grunnen «%s»"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "klarte ikkje opna målfila «%s», av grunnen «%s»"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "prøver adressa «%s»\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "nedlastingslengda %d var ikkje lik den rapporterte lengda %d"
@@ -6817,140 +6855,166 @@
 msgid "cannot open URL '%s'"
 msgstr "klarte ikkje opna adressa «%s»"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "ikkje-støtta URL-skjema"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "klarte ikkje opna: HTTP-statusmeldinga var «%d %s»"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "feil ved InternetOpenUrl: «%s»"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "klarte ikkje opna: HTTP-statusmeldinga var «%d %s»"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "nsl() er ikkje støtta på denne plattforma"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "ugyldig «%s»-argument"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() er ikkje støtta på denne plattforma"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "importerings- og eksporteringsnamna må vera like lange"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "klarte ikkje opna målfila «%s», av grunnen «%s»"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "klarte ikkje opna fila «%s»"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "klarte ikkje lesa frå dette sambandet"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "klarte ikkje opna sambandet"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() er ikkje støtta på denne plattforma"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: for lang (ugyldig?) adresse"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "fjernar FTP-mellomtenarinfo"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "brukar FTP-mellomtenaren «%s»"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: for lang (ugyldig?) adresse"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "feil ved namneoppslag"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "klarte ikkje kopla til tenaren"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "fekk ikkje svar frå tenaren"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: klarte ikkje oppretta sokkel"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "klarte ikkje oppretta datasamband"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "klarte ikkje binda til port"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "klarte ikkje lytta på porten %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: for lang (ugyldig?) adresse"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "fjernar HTTP-mellomtenarinfo"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "brukar HTTP-mellomtenaren «%s»"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: for lang (ugyldig?) adresse"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "feil ved namneoppslag på «%s»"
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "kopla til «%s» på port %d."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "klarte ikkje kopla til «%s» på port %d."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "vidaresend til «%s»"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "for mange vidaresendingar – avbryt"
 
@@ -7184,8 +7248,8 @@
 msgstr "bessel_i-reserveringsfeil"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument utanfor gyldig "
 "verdiområde?\n"
@@ -7195,18 +7259,23 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): tapt presisjon i resultatet\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "bessel_j-reserveringsfeil"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumetn utanfor gyldig "
 "verdiområde?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): tapt presisjon i resultat\n"
@@ -7216,8 +7285,8 @@
 msgstr "bessel_k-reserveringsfeil"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument utanfor gyldig "
 "verdiområde?\n"
@@ -7227,18 +7296,23 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): tapt presisjon i resultat\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "bessel_y-reserveringsfeil"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument utanfor gyldig "
 "verdiområde?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): tapt presisjon i resultat\n"
@@ -7248,42 +7322,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "argumentet er utanfor gyldig definisjonområde i «%s»\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "verdien til «%s» er utanfor gyldig verdiområde\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "konvergerte ikkje i «%s»\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "full presisjon vart kanskje ikkje oppnådd i «%s»\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "det oppstod underflyt i «%s»\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): ikkje konvergert etter %d iterasjonar."
@@ -7359,7 +7433,7 @@
 "Eksplisitt lat dynamisk lasting er ikkje støtta på denne plattforma. Brukar "
 "standard."
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "fekk ikkje tilgang til arbeidsmappa"
 
@@ -7375,12 +7449,12 @@
 "Det oppstod eit uvanleg tilfelle i nøsting av readline-inndata. Meld frå om "
 "dette med bug.report()."
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "feil ved lagring av historiefila «%s»"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7389,85 +7463,122 @@
 "Klarte ikkje opna fila «%s»: %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "argumentet «file» er for langt"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "ingen historiemekanisme er tilgjengeleg"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "feil ved trunkering av historiefila"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "ingen historie er klar for lagring"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "ugyldig tidsstempel"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "venta ikkje-tom teiknargument"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "«intern» må vera logisk og ikkje NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "klarte ikkje køyra «popen» på «%s», truleg av grunnen «%s»"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr "linje %d kan vera trunkert i kall til system(, intern = TRUE)"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "feil ved køyring av kommando: «%s»"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "feil ved køyring av kommando"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "køyring av kommandoen «%s» gav statusen %d og feilmeldinga «%s»"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() er ikkje implementert på dette systemet"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "Ã…TVARING: --gui eller -g utan verdi ignorert"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "ÅTVARING: ukjend gui «%s» (brukar X11)\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "ÅTVARING: ukjend gui «%s» (brukar ingen)\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "feil ved oppretting av mellombels fil for «-e»"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "ÅTVARING: Redigerer berre den første i lista over filer"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "«what» må vera ein teiknstreng eller ein funksjon"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "soklar er ikkje tilgjengelege på dette systemet"
+
+#~ msgid "no function to restart"
+#~ msgstr "ingen funksjon å starta på nytt"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "argumentet må vera ei omslutting"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "«hostnamne» må vera ein teiknvektor av lengd 1"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "nsl() klarte ikkje utføra namneoppslag for verten «%s»"
+
+#, fuzzy
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "ukjend format returnert av gethostbyname"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "nsl() er ikkje støtta på denne plattforma"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "for stort verdiområde i «x»"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "ikkje-numerisk argument"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "ikkje-støtta URL-skjema"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "«dimnames» må vera ei liste"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "«args» må vera ei liste"
 
@@ -7829,9 +7940,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "«title» må vera ein teiknstreng"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "«text» må vera ein teiknstreng"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "«%s» må ha lengd 1"
 
@@ -7862,9 +7970,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "«file» er ikkje eit samband"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "«dec» må vera eitt teikn"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr "øydelagd dataramme – lengda til kolonne %d er ikkje lik nrows"
 
diff -Nru r-base-3.2.3/src/library/base/po/pl.po r-base-3.3.1/src/library/base/po/pl.po
--- r-base-3.2.3/src/library/base/po/pl.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/pl.po	2016-04-27 22:15:37.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-04 08:15+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,8 +13,8 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Poedit-Bookmarks: -1,736,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: src/appl/optim.c:60
@@ -124,173 +124,174 @@
 msgid "problem in displaying '%ls'"
 msgstr "problem z wyświetleniem pliku '%ls'"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:237 src/main/character.c:240
+#: src/main/character.c:245 src/main/character.c:786 src/main/character.c:789
+#: src/main/character.c:1287 src/main/character.c:1291
+#: src/main/character.c:1526 src/main/character.c:1530
+#: src/main/character.c:1591 src/main/character.c:1594
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:615
+#: src/main/seq.c:620 src/main/seq.c:628 src/main/seq.c:659 src/main/seq.c:663
+#: src/main/seq.c:669 src/main/seq.c:677 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "niepoprawny argument '%s'"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "niewspierana wersja systemu Windows"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "niepoprawny argument"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "nie bądź niemądry!: twoja maszyna posiada limit 4Gb pamięci adresowej"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "nie można zmniejszyć limitu pamięci: zignorowano"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' musi być wektorem tekstowym"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "niepoprawne urzÄ…dzenie"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "tryb SDI jest wymagany"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "niepoprawny numer urzÄ…dzenia graficznego"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "złe urządzenie"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "niepoprawne wejście w 'Rmbstowcs'"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "anulowano wybór pliku"
 
@@ -331,190 +332,189 @@
 msgid "'names' is not a character vector"
 msgstr "argument 'names' nie jest wektorem tekstowym"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "oczekiwano łańcucha tekstowego jako pierwszego argumentu"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "oczekiwano łańcucha tekstowego jako trzeciego argumentu"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "uruchomione polecenie '%s' otrzymało status %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "osiągnięto limit czasu sesji"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "osiągnięto limit czasu"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "osiągnięto limit czasu sesji CPU"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "osiągnięto limit czasu CPU"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "BÅ‚Ä…d krytyczny: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "kodowanie '%s' nie zostało rozpoznane"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<B�ĄD: ponowne kodowanie nie powiodło się dla kodowania '%s'>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "nie można otworzyć pliku '%s': %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): plik '%s' nie istnieje\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "OSTRZEŻENIE: wartość R_MAX_MEM_SIZE jest niepoprawna: zignorowano\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "OSTRZEŻENIE: nie podano max-mem-size\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "OSTRZEŻENIE: wartość --max-mem-size jest niepoprawna: zignorowano\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 "OSTRZEŻENIE: --max-mem-size=%lu%c: wartość zbyt duża została zignorowana\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 "OSTRZEŻENIE: --max-mem-size=%4.1fM: wartość zbyt mała została zignorowano\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 "OSTRZEŻENIE: --max-mem-size=%4.0fM: wartość zbyt duża została wzięta jako "
 "%uM\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr "opcja '%s' wymaga argumentu"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "opcja '%s' wymaga niepustego argumentu"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "OSTRZEŻENIE: '-e %s' pominięto ponieważ wejście jest zbyt długie\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "OSTRZEŻENIE: nieznana opcja '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGUMENT '%s' __zignorowano__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "nie można użyć -e razem z -f lub --file"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 "utworzenie pliku 'tmpfile' nie powiodło się -- ustawić 'TMPDIR' odpowiednio?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "musisz określić '--save', '--no-save' lub '--vanilla'"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "nie można utworzyć 'reader thread'; musisz zwolnić część zasobów systemowych"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "indeks jest poza granicami"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "obiekt typu '%s' nie jest ustawialny"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr "OSTRZEŻENIE: nie podano wartości dla --encoding"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "OSTRZEŻENIE: opcja '%s' nie jest już wspierana"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "OSTRZEŻENIE: nie podano wartości dla '%s'"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "OSTRZEŻENIE: wartość '%s' jest niepoprawna: zignorowano"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "OSTRZEŻENIE: %s: zignorowano zbyt dużą wartość"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "OSTRZEŻENIE: nie podano wartości dla '--max-ppsize'"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "OSTRZEŻENIE: wartość '--max-ppsize' jest ujemna: zignorowano"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "OSTRZEŻENIE: wartość '--max-ppsize' jest zbyt mała: zignorowano"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "OSTRZEŻENIE: wartość '--max-ppsize' jest zbyt duża: zignorowano"
 
@@ -622,7 +622,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "nie można przydzielić miejsca dla 'name'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "oczekiwano argumentu tekstowego"
 
@@ -685,7 +685,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "problem z ustawieniem zmiennej '%s' w środowisku R"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr "argument '%s' musi być łańcuchem tekstowym"
@@ -716,9 +716,9 @@
 msgid "invalid multibyte format string"
 msgstr "niepoprawny wielobajtowy łańcuch formatujący"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1289
+#: src/main/character.c:1293 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr "argument '%s' ma długość > 1 i tylko pierwszy element zostanie użyty"
@@ -728,7 +728,7 @@
 msgstr "argument 'pattern' musi być niepustym łańcuchem tekstowym"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "niepoprawne wyrażenie regularne w lokalizacji"
 
@@ -739,8 +739,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "niepoprawny łańcuch wejściowy %d w lokalizacji"
@@ -748,7 +748,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "argument '%s' zostanie zignorowany"
@@ -763,7 +763,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "wejściowy łańcuch tekstowy y[%d] jest niepoprawny w lokalizacji"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "błąd regcomp: '%s'"
@@ -772,29 +772,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "'FUN.VALUE' musi być wektorem"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:845
+#: src/main/character.c:1653 src/main/connections.c:3551 src/main/context.c:653
+#: src/main/context.c:672 src/main/datetime.c:681 src/main/datetime.c:783
+#: src/main/datetime.c:1047 src/main/dotcode.c:222 src/main/errors.c:910
+#: src/main/errors.c:943 src/main/errors.c:1049 src/main/errors.c:1074
+#: src/main/errors.c:1079 src/main/errors.c:1349 src/main/identical.c:66
+#: src/main/identical.c:67 src/main/identical.c:68 src/main/identical.c:69
+#: src/main/identical.c:70 src/main/platform.c:2982 src/main/seq.c:192
+#: src/main/seq.c:340 src/main/seq.c:345 src/main/seq.c:349 src/main/seq.c:390
+#: src/main/seq.c:394 src/main/seq.c:398 src/main/sort.c:1244
+#: src/main/sort.c:1327 src/main/sort.c:1331 src/main/sort.c:1338
+#: src/main/source.c:225 src/main/summary.c:954 src/main/sysutils.c:250
+#: src/main/util.c:1051 src/main/util.c:1056 src/main/util.c:1063
+#: src/main/util.c:1066 src/main/util.c:2035 src/modules/X11/devX11.c:3148
+#: src/modules/X11/devX11.c:3175 src/modules/X11/devX11.c:3180
+#: src/modules/X11/devX11.c:3185 src/modules/X11/devX11.c:3195
+#: src/modules/X11/devX11.c:3200 src/modules/X11/devX11.c:3204
+#: src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "niepoprawna wartość '%s'"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "niepoprawna długość"
 
@@ -826,7 +826,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<value>) nie jest wartością NULL ani też listą o długości %d"
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "wyprodukowano wartości NaN"
 
@@ -838,57 +838,57 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "prawdopodobna całkowita utrata precyzji w module"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr ""
 "wyprodukowano wartości NA na skutek przepełnienia zakresu liczb całkowitych"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "operator wymaga jednego lub dwóch argumentów"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "argument nieliczbowy przekazany do operatora dwuargumentowego"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:230
 msgid "non-conformable arrays"
 msgstr "niezgodne tablice"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "niezgodne szeregi czasowe"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:169
+#: src/main/relop.c:268
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 "długość dłuszego obiektu nie jest wielokrotnością długości krótszego obiektu"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "niepoprawny argument przekazany do operatora jednoargumentowego"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "niepoprawny operator jednoargumentowy"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "niezaimplementowana rzeczywista funkcja jednego argumentu"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "niezaimplementowana funkcja zespolona"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "niezaimplementowana rzeczywista funkcja %d argumentów liczbowych"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
@@ -899,54 +899,54 @@
 msgstr[2] ""
 "%d argumentów przekazano do funkcji '%s', która wymaga 1 lub 2 argumentów"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "niepoprawny drugi argument o długości 0"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "brakuje argumentu '%s', a nie ma określonej wartości domyślnej"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "niepoprawny argument 'base' o zerowej długości"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data' musi być typu wektor, było '%s'"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "nieliczbowy stopień macierzy"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "niepoprawna wartość 'nrow' (zbyt duża lub wartość NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "niepoprawna wartość 'nrow' (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "niepoprawna wartość 'ncol' (zbyt duża lub wartość NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "niepoprawna wartość 'ncol' (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr "'nc = 0' dla niepustych danych"
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr "'nr = 0' dla niepustych danych"
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
@@ -954,7 +954,7 @@
 "długość danych [%d] nie jest pod-wielokrotnością lub wielokrotnością liczby "
 "wierszy [%d]"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -963,101 +963,100 @@
 "długość danych [%d] nie jest pod-wielokrotnością lub wielokrotnością liczby "
 "kolumn [%d]"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "długość danych przewyższa rozmiar macierzy"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "określono zbyt dużo elementów"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "ujemne wymiary przekazane do macierzy"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: określono zbyt wiele elementów"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "ujemne wymiary przekazane do tablicy 3D"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr "'alloc3Darray': określono zbyt wiele elementów"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "'allocArray': zbyt wiele elementów określono poprzez argument 'dims'"
 
-#: src/main/array.c:493
-#, fuzzy, c-format
+#: src/main/array.c:523
+#, c-format
 msgid "'%s' must be a list or atomic vector"
-msgstr "argument 'x' musi być listą z wartościami NULL lub pustymi wektorami"
+msgstr "argument '%s' musi być listą lub atomowym wektorem"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 "obiekt macierzopodobny jest wymagany jako argument przekazywany do '%s'"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "wymagane są liczbowe/zespolone argumenty macierzy/wektorów"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "niezgodne argumenty"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "argument nie jest macierzÄ…"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "niepoprawny pierwszy argument, musi być tablicą"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' posiada błędną długość %d (!= %d)"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a' nie ma nazwanych wymiarów"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "'perm[%d]' nie jest zgodne z nazwÄ… wymiaru"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "wartość w 'perm' jest poza zakresem"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "argument 'resize' musi posiadać wartość TRUE lub FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "argument 'x' musi być liczbą"
 
-#: src/main/array.c:1381
-#, fuzzy
-msgid "'X' is too short"
-msgstr "argument 'object' jest zbyt krótki"
+#: src/main/array.c:1425
+msgid "'x' is too short"
+msgstr "argument 'x' jest zbyt krótki"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr "argument 'dims' nie może posiadać długości 0"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr "argument 'x' musi posiadać dodatnią długość"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr "osobliwa macierz w 'backsolve()'. Pierwsze zero na diagonali [%d]"
@@ -1120,12 +1119,12 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "próba ustawienia niepoprawnego atrybutu 'class'"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr "klasa \"%s\" nie ma gniazda 'names'"
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
@@ -1134,7 +1133,7 @@
 "klasa \"%s\" nie ma gniazda 'names'; przypisanie atrybutu 'names' spowoduje "
 "utworzenie niepoprawnego obiektu"
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
@@ -1142,129 +1141,130 @@
 "nie wolno użyć names()<- w celu ustawienia gniazda 'names' w nie-wektorowej "
 "klasie (\"%s\")"
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "niezgodny argument 'names'"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "niepoprawny typ (%s) do ustawienia atrybutu 'names'"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames()' zastosowane do nie-tablicy"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' musi być listą"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
+msgstr "argument '%s' musi być listą"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "długość 'dimnames' [%d] musi zgadzać się z tą dla 'dims' [%d]"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "niepoprawny typ (%s) dla 'dimnames' (musi być wektor)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "długość 'dimnames' [%d] nie jest równa stopniowi tablicy"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "niepoprawny pierwszy argument"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "niepoprawny drugi argument"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "wektor wymiaru zerowej długości jest niepoprawny"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "wymiary zawierają brakujące wartości"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "wymiary zawierają ujemne wartości"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr "wymiary nie zgadzają się z długością obiektu"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "wymiary [produkt %d] nie odpowiadają długości obiektu [%d]"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "atrybuty muszą być listą lub wartością NULL"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "atrybuty muszą być nazwane"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "wszystkie atrybuty muszą mieć nazwę [atrybut nr %d takiej nie ma]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "atrybut 'which' musi być trybu tekstowego"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "dokładnie jeden atrybut 'which' musi zostać podany"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "częściowa zgodność między '%s' a '%s'"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "niepoprawny typ '%s' dla nazwy gniazda"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name' musi być niepustym łańcuchem tekstowym"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "niepoprawny typ lub długość dla nazwy gniazda"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "nie można pobrać gniazda (\"%s\") z obiektu o typie \"%s\""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "brak gniazda o nazwie \"%s\" dla tego obiektu klasy \"%s\""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "próba ustawienia gniazda na obiekt NULL"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "formalne klasy nie mogą być używane bez pakietu 'methods'"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1272,7 +1272,7 @@
 msgstr ""
 "próba pobrania gniazda \"%s\" z obiektu klasy podstawowej (\"%s\") bez gniazd"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1281,46 +1281,46 @@
 "próba pobrania gniazda \"%s\" z obiektu (klasa \"%s\"), który nie jest "
 "obiektem S4"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr "wektor wynikowy przekracza graniczną długość wektora w '%s'"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "typ '%s' nie jest zaimplementowany w '%s'"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "powtórzony formalny argument 'recursive'"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "powtórzony formalny argument 'use.names'"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "argument nie jest listÄ…"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "nazwa klasy w '%s' jest zbyt długa"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "nie można utworzyć macierzy z type '%s'"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "liczby wierszy macierzy muszą być zgodne (zobacz argument %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "liczby kolumn macierzy muszą być zgodne (zobacz argument %d)"
@@ -1329,127 +1329,131 @@
 msgid "vector size cannot be NA"
 msgstr "rozmiar wektora nie może mieć wartości NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "rozmiar wektora nie może mieć wartości NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "rozmiar wektora nie może być nieskończony"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "podany rozmiar wektora jest zbyt duży"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "użycie środowiska NULL jest przestarzałe"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+msgid "argument is not a function"
+msgstr "argument nie jest funkcjÄ…"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "zastępujący obiekt nie jest środowiskiem"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' musi być środowiskiem"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "argument nie jest środowiskiem"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "puste środowisko nie posiada rodzica"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "nie można ustawić rodzica pustego środowiska"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr "nie można ustawić nadrzędnego środowiska przestrzeni nazw"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr "nie można ustawić nadrzędnego środowiska importów pakietu"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' nie jest środowiskiem"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "nie można zapisywać w tym połączeniu"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "niepoprawna specyfikacja '%s'"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "niedodatni argument 'fill' będzie zignorowany"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "argument %d (typ '%s') nie może zostać obsłużony przez 'cat'"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "wektor: nie można utworzyć wektora trybu '%s'."
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "nie można ustawić długości nie-wektora"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "niepoprawny argument"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:523 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "niepoprawna wartość"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' użyte w złym kontekście"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "powtórzone wartości domyślne w 'switch': '%s' oraz '%s'"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "brakuje 'EXPR'"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR musi być wektorem o długości 1"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
@@ -1458,102 +1462,113 @@
 "'EXPR' jest obiektem klasy \"factor\", traktowanym jako liczba całkowita.\n"
 " Rozważ użycie '%s' w zamian."
 
-#: src/main/character.c:104 src/main/character.c:146
-#, fuzzy, c-format
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr "funkcja 'switch()' bez żadnych alternatyw"
+
+#: src/main/character.c:103 src/main/character.c:224
+#, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
-msgstr[0] "%d argument przekazano do funkcji '%s', która wymaga %d"
-msgstr[1] "%d argumenty przekazano do funkcji '%s', która wymaga %d"
-msgstr[2] "%d argumentów przekazano do funkcji '%s', która wymaga %d"
+msgstr[0] "%d argument przekazano do funkcji '%s', która wymaga od %d do %d"
+msgstr[1] "%d argumenty przekazano do funkcji '%s', która wymaga od %d do %d"
+msgstr[2] "%d argumentów przekazano do funkcji '%s', która wymaga od %d do %d"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:230
+#: src/main/character.c:233
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s' wymaga wektora tekstowego"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
 #, c-format
-msgid "invalid multibyte string %d"
-msgstr "niepoprawny wielobajtowy łańcuch %d"
+msgid "invalid multibyte string, %s"
+msgstr "niepoprawny wielobajtowy łańcuch, %s"
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
-msgstr ""
-"liczba znaków nie jest obliczalna dla elementu %d w kodowaniu \"bytes\""
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
+msgstr "liczba znaków nie jest obliczalna w kodowaniu \"bytes\", %s"
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
-msgstr "szerokość nie jest obliczalna dla elementu %d w kodowaniu \"bytes\""
+msgid "width is not computable for %s in \"bytes\" encoding"
+msgstr "szerokość nie jest obliczalna dla elementu %s w kodowaniu \"bytes\""
 
-#: src/main/character.c:312
+#: src/main/character.c:309
 msgid "extracting substrings from a non-character object"
 msgstr "wyodrębnianie podłańcuchów z nietekstowego obiektu"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:319 src/main/character.c:520
 msgid "invalid substring arguments"
 msgstr "niepoprawne argumenty podłańcucha"
 
-#: src/main/character.c:407
+#: src/main/character.c:359
+msgid "non-character object(s)"
+msgstr "nietekstowe obiekty"
+
+#: src/main/character.c:515
 msgid "replacing substrings in a non-character object"
 msgstr "zastępowanie podłańcuchów w nietekstowym obiekcie"
 
-#: src/main/character.c:600
+#: src/main/character.c:783
 msgid "the first argument must be a character vector"
 msgstr "pierwszy argument musi być wektorem tekstowym"
 
-#: src/main/character.c:619
+#: src/main/character.c:820
 msgid "abbreviate used with non-ASCII chars"
 msgstr "'abbreviate' użyte ze znakami nie będącymi ASCII"
 
-#: src/main/character.c:640
+#: src/main/character.c:841
 msgid "non-character names"
 msgstr "nazwy nietekstowe"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:903 src/main/character.c:1000
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "niepoprawny wielobajtowy łańcuch %d"
+
+#: src/main/character.c:946 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "argument nietekstowy"
 
-#: src/main/character.c:854
+#: src/main/character.c:1055
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "określenie zmniejszenia zakresu ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1141
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "określenie zmniejszenia zakresu ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1329
 msgid "invalid UTF-8 string 'old'"
 msgstr "niepoprawny łańcuch UTF-8 'old'"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1335
 msgid "invalid multibyte string 'old'"
 msgstr "niepoprawny wielobajtowy łańcuch 'old'"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1348
 msgid "invalid UTF-8 string 'new'"
 msgstr "niepoprawny łańcuch UTF-8 'new'"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1354
 msgid "invalid multibyte string 'new'"
 msgstr "niepoprawny wielobajtowy łańcuch 'new'"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1382 src/main/character.c:1471
 msgid "'old' is longer than 'new'"
 msgstr "'old' jest dłuższe niż 'new'"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1414
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "niepoprawny wielobajtowy łańcuch wejściowy %d"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1521
 msgid "strtrim() requires a character vector"
 msgstr "'strtrim()' wymaga wektora tekstowego"
 
@@ -1565,16 +1580,16 @@
 msgid "applies only to lists and vectors"
 msgstr "ma zastosowanie jedynie do list oraz wektorów"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "pojawiły się wartości NA na skutek przekształcenia"
 
 #: src/main/coerce.c:79
-#, fuzzy
 msgid "NAs introduced by coercion to integer range"
-msgstr "pojawiły się wartości NA na skutek przekształcenia"
+msgstr ""
+"pojawiły się wartości NA na skutek przekształcenia do liczby całkowitej"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "części urojone odrzucone na skutek przekształcenia"
 
@@ -1584,118 +1599,113 @@
 "wartości poza zakresem będą traktowane jako 0 podczas przekształcenia do "
 "typu prostego"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "niepoprawne dane trybu '%s' (zbyt krótkie)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "obiekt 'pairlist' nie może zostać przekształcony na typ '%s'"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "obiekt (lista) nie może zostać przekształcony na typ '%s'"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "obiekt (symbol) nie może zostać przekształcony na typ '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "brak metody dla przekształcenia tej klasy S4 na wektor"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "środowiska nie mogą zostać przekształcone na inne typy"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "próba przekonwertowania nie-czynnika"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
-msgstr ""
+msgstr "uszkodzony czynnik"
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "oczekiwano listy argumentów"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "niepoprawne środowisko"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "argument musi mieć długość przynajmniej 1"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "niepoprawne ciało dla funkcji"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "niepoprawny argument o długości 0"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "niepoprawna lista argumentów"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "typ \"single\" nie jest zaimplementowany w R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "niezaimplementowany predykat (is.xxx)"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "'%s()' zastosowane do nie-listy lub nie-wektora typu '%s'"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "domyślna metoda nie jest zaimplementowana dla typu '%s'"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "brakuje 'name'"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "pierwszy argument musi być łańcuchem tekstowym"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
+#: src/main/coerce.c:2464
+msgid "'what' must be a function or character string"
 msgstr "argument 'what' musi być łańcuchem tekstowym lub funkcją"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr "'args' musi być listą lub wyrażeniem"
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr "argument '%s' musi być listą"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' musi być środowiskiem"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "określono niepoprawne środowisko"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "Ustawianie class(x) na NULL. Wynik nie będzie już dłużej obiektem S4"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1704,7 +1714,7 @@
 "Ustawianie class(x) w wiele łańcuchów (\"%s\", \"%s\", ...). Wynik nie "
 "będzie już dłużej obiektem S4"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1713,11 +1723,11 @@
 "Ustawianie class(x) na \"%s\" ustawia atrybut na NULL. Wynik nie będzie już "
 "dłużej obiektem S4"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "niepoprawny zastępujący obiekt na miejsce łańcucha klasy"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1725,7 +1735,7 @@
 "\"%s\" można ustawić jako klasę jeśli obiekt posiada ten typ; znaleziono \"%s"
 "\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1734,37 +1744,37 @@
 "niepoprawne ustawienie klasy na macierz chyba, że atrybut wymiaru jest "
 "długości 2 (było %d)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "nie można ustawić klasy na \"array\" chyba, że atrybut wymiaru ma długość > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value' musi być niepustym łańcuchem tekstowym"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "niepoprawna zmiana trybu przechowywania czynnika"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "niepoprawny zespolony operator jednoargumentowy"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "niezaimplementowana operacja zespolona"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "argument nieliczbowy przekazany do funkcji"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "niepoprawny współczynnik wielomianu"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "kod znajdujący pierwiastki zawiódł"
 
@@ -1776,7 +1786,7 @@
 msgid "connection not found"
 msgstr "połączenie nie zostało znalezione"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "niepoprawne połączenie"
 
@@ -1785,9 +1795,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "zamykanie nieużywanego połączenia %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "niewspierana konwersja z '%s' na '%s'"
@@ -1869,8 +1879,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "określono zbyt duży blok"
 
@@ -1898,8 +1908,8 @@
 msgstr "przydział połączenia fifo nie powiódł się"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "tylko pierwszy element argumentu 'description' został użyty"
 
@@ -1911,14 +1921,14 @@
 "pierwszego"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "nie można otworzyć połączenia"
@@ -1988,7 +1998,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "przydział połączenia bzfile nie powiódł się"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "nie można zainicjować dekodera lzma, błąd %d"
@@ -2008,12 +2018,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr "to jest plik skompresowany metodą '%s', której ta wersja R nie wspiera"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "przydział pamięci do skopowiania zawartości schowka nie powiódł się"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "schowek nie może zostać otworzony lub nie zawiera tekstu"
 
@@ -2116,260 +2126,259 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' nie jest wyjściem textConnection"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "gniazda nie są dostępne w tym systemie"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' nie jest połączeniem"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "nie można otworzyć standardowych połączeń"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "połączenie jest już otwarte"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "nieznana wartość 'rw'"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "nie można zamknąć standardowych połączeń"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr "nie można zamknąć połączenia sink 'output'"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr "nie można zamknąć połączenia sink 'message'"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "połączenie nie jest otwarte"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr "linia jest dłuższa niż rozmiar bufora"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "nie można czytać z tego połączenia"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "nie można przydzielić bufora w 'readlines'"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr "wygląda na to, że %d linia zawiera osadzony znak null"
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "niekompletna końcowa linia znaleziona w '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "zbyt mało linii odczytanych w 'readLines()'"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "niekompletny łańcuch na końcu pliku został odrzucony"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 "ogranicznik 'null' nie został znaleziony: przerywanie łańcucha po 10000 "
 "bajtów"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "można czytać tylko z połączenia binarnego"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "zmiana rozmiaru nie jest wspierana dla wektorów zespolonych"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "rozmiar %d jest nieznany na tej maszynie"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "pusty obiekt zawsze posiada rozmiar 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 "'signed = FALSE' jest poprawny jedynie dla liczb całkowitych o rozmiarach 1 "
 "oraz 2"
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "argument 'x' nie jest typem atomowego wektora"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "można zapisać tylko do połączenia binarnego"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "tylko 2^31-1 bajtów może być zapisane do prostego wektora"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "tylko 2^31-1 bajtów może być zapisane w jednym wywołaniu 'writeBin()'"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "problem z zapisywaniem do połączenia"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "zmiana rozmiaru nie jest wspierana dla prostych wektorów"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "niepoprawne wejście UTF-8 w 'readChar()'"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "można czytać w bajtach jedynie w kodowaniu nie-UTF-8 MBCS"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "argument 'object' jest zbyt krótki"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: zażądano więcej bajtów niż jest w łańcuchu - zostaną wyzerowane"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: zażądano więcej znaków niż jest w łańcuchu - zostaną wyzerowane"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr "przekroczono maksymalną liczbę zepchniętych linii"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr "nie można przydzielić miejsca dla zepchnięcia"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "można zepchnąć tylko dla otwartych odczytywalnych połączeń"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "można zepchnąć tylko dla połączeń w trybie tekstowym"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "stos 'sink' jest pełny"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "nie można przełączyć wyjścia na 'stdin'"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "brak 'sink' do usunięcia"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr "brak połączenia NA"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "brak połączenia %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "opcja 'method = \"wininet\"' jest wspierana tylko w systemie Windows"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 "'file(\"\")' wspiera tylko 'open = \"w+\"' oraz 'open = \"w+b\"': używanie "
 "pierwszego"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr "schemat URL nie jest wspierany przez tÄ™ metodÄ™"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "strumień plikowy nie posiada magicznej liczby gzip"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "strumień plikowy nie posiada poprawnego nagłówka gzip"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "błąd zapisu podczas czyszczenia połączenia gzcon"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "błąd crc %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "błąd zapisu w połączeniu gzcon"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "argument 'level' musi być liczbą z zakresu 0 ... 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "argument 'allowNonCompression' musi być TRUE lub FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+msgid "'text' must be TRUE or FALSE"
+msgstr "argument 'text' musi mieć wartość TRUE lub FALSE"
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr "to już jest połączenie gzcon"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "można użyć tylko odczytywalnych lub zapisywalnych połączeń binarnych"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr "użycie trybu tekstowego połączenia 'file' może nie działać poprawnie"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
@@ -2377,78 +2386,74 @@
 "nie można utworzyć połączenia gzcon z zapisywalnego połączenia "
 "'textConnection'; użyj być może 'rawConnection'"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "przydział połączenia gzcon nie powiódł się"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "argument 'socklist' nie jest listÄ… gniazd"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "błędne wskaźniki zapisu"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "to nie jest połączenie socket"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "nieznana kompresja, zakładam brak"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr "przydział połączenia %s nie powiódł się"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 "brak pętli do przerwania/przejścia dalej, przeskakiwanie do najwyższego "
 "poziomu"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr ""
 "brak funkcji z której można powrócić, przeskakiwanie do najwyższego poziomu"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "kontekst celu nie jest na stosie"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "nie tak wiele ramek na stosie"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "tylko dodatnie wartości 'n' są dozwolone"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "brak funkcji którą można zrestartować"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "liczba kontekstów musi by dodatnia"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "brak kontekstu przeglÄ…dania zapytania"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "nie tak wiele aktywnych połączeń z przeglądarką"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "nie tak dużo funkcji na stosie wywołania"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "błąd wewnętrzny w 'do_sys'"
 
@@ -2458,37 +2463,37 @@
 "przepełnienie całkowitoliczbowe w funkcji 'cumsum()'; użyj cumsum(as."
 "numeric(.))'"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr "funkcja 'cummax()' nie jest określona dla liczb zespolonych"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr "funkcja 'cummin()' nie jest określona dla liczb zespolonych"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "nieznana funkcja 'cumxxx()'"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "problem z ustawieniem strefy czasowej"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "nie można ustawić stref czasowych na tym systemie"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "problem z wyłączeniem strefy czasowej"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "komponent o zerowej długości w niepustej strukturze \"POSIXlt\""
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "nie można przydzielić pamięci dla 'read.dcf'"
 
@@ -2504,11 +2509,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "Linia rozpoczynajÄ…ca siÄ™ od '%s ...' jest uszkodzona!"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "argument musi być zamknięciem"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "argument musi być funkcją"
 
@@ -2517,7 +2518,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "Wartość '%s' musi być TRUE lub FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "argument nie może być funkcją"
 
@@ -2535,64 +2536,64 @@
 "'tracemem' jest nieprzydatny dla słabych referencji lub zewnętrznych "
 "wskaźników"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R nie został skompilowany z obsługą profilowania pamięci"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "zbyt mało argumentów"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr ""
 "niepoprawna wartość 'cutoff' w metodzie 'deparse()', używanie domyślnej "
 "wartości"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 "wynik konwersji wyrażenia na łańcuch tekstowy na obiekcie S4 nie będzie "
 "dostępny dla metody 'source()'"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "konwersja wyrażenia na łańcuch może być niekompletna"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 "wynik konwersji wyrażenia na łańcuch tekstowy może być niedostępny dla "
 "metody 'source()' w R < 2.7.0"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr "argument 'file' musi być łańcuchem tekstowym lub połączeniem"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "zapisano zbyt mało znaków"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "oczekiwano argumentów tekstowych"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr "argument o zerowej długości"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "argument 'opts' powinien być małą nieujemną liczbą całkowitą"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "nie znaleziono obiektu '%s'"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "źle sformułowane wyrażenie dla funkcji"
 
@@ -2604,15 +2605,15 @@
 msgid "no active or default device"
 msgstr "brak aktywnego lub domyślnego urządzenia"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "zbyt dużo otwartych urzadzeń"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "zbyt mało pamięci aby przydzielić urządzenie (w GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "Naciśnij <Enter> aby zobaczyć kolejny wykres: "
 
@@ -2683,7 +2684,7 @@
 msgid "no arguments supplied"
 msgstr "nie dostarczono argumentów"
 
-#: src/main/dotcode.c:493 src/main/seq.c:911
+#: src/main/dotcode.c:493 src/main/seq.c:904
 msgid "too many arguments"
 msgstr "zbyt dużo argumentów"
 
@@ -2700,7 +2701,7 @@
 msgid "too many arguments, sorry"
 msgstr "zbyt dużo argumentów, przykro mi"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "niepoprawny stan grafiki"
 
@@ -2851,7 +2852,7 @@
 msgid "invalid argument to edit()"
 msgstr "niepoprawny argument przekazany do 'edit()'"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "nie można otworzyć pliku"
 
@@ -2915,12 +2916,12 @@
 msgstr "niegraficzny system dla wyrejestrowania"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "niepoprawne zakończenie linii"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "niepoprawny Å‚Ä…cznik linii"
 
@@ -2949,82 +2950,98 @@
 msgid "raster capture is not available for this device"
 msgstr "przechwytywanie rastrowe nie jest dostępne dla tego urządzenia"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "krój czcionki %d nie jest wspierany dla rodziny czcionek '%s'"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "brak aktywnego urzÄ…dzenia graficznego"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "niepoprawna wartość '%d' 'pch' w tej lokalizacji"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "niezaimplementowana wartość '%d' 'pch'"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "niepoprawne długości osi '[GEPretty(.,.,n=%d)]'"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "nieskończone długości osi '[GEPretty(%g,%g,%d)]'"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. 'GEPretty(.)': nowy *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. 'GEPretty(.)': nowy *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr "ponowne rozrysowanie wyświetlanej listy jest niekompletne"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr "niepoprawna lista wyświetleń"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+"zrzut zapisany z innÄ… wersjÄ… silnika grafiki (przed wersjÄ… 11 - to jest "
+"wersja %d)"
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr "zrzut zapisany z innÄ… wersjÄ… silnika grafiki (%d - to jest wersja %d)"
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "argument 'expr' musi być wyrażeniem"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "argument 'list' musi być listą"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "argument 'env' musi być środowiskiem"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "niepoprawny znak wielobajtowy w 'pch=\"c\"'"
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "niepoprawna liczba szestnastkowa w argumencie 'color' lub 'lty'"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "niepoprawny typ linii: musi być długości 2, 4, 6 lub 8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "niepoprawny typ linii: zera nie sÄ… dozwolone"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "niepoprawny typ linii"
 
@@ -3033,7 +3050,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "nie można zmienić wartości zablokowanego połączenia dla '%s'"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "nie można dodać powiązań do zablokowanego środowiska"
 
@@ -3049,275 +3066,275 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "odpinanie w bazowym środowisku jest niezaimplementowane"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "nie można usunąć powiązań z zablokowanego środowiska"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "argument przekazywany do '%s' nie jest środowiskiem"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "lista '...' nie zawiera %d elementów"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d użyte w niepoprawnym znaczeniu, brak '...' do szukania"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "nie udało się znaleźć funkcji '%s'"
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "nie można przypisać wartości w pustym środowisku"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "nie można przypisać zmiennej do tej bazy danych"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "nie można dodać powiązania '%s' do bazowego środowiska"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "tylko pierwszy element jest używany jako nazwa zmiennej"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "pierwszy argument musi być nazwaną listą"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "'names(x)' musi być wektorem tekstowym tej samej długości co 'x'"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr "argument 'envir' musi być środowiskiem"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "nie można usunąć zmiennych z bazowej przestrzeni nazw"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "nie można usunąć zmiennych z bazowego środowiska"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "nie można usunąć zmiennych z pustego środowiska"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "nie można usunąć zmiennych z tej bazy danych"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "obiekt '%s' typu '%s' nie został znaleziony"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "niepoprawna nazwa w pozycji %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "drugi argument musi być środowiskiem"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "błędna długość dla argumentu '%s'"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "niepoprawne użycie 'missing'"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' można użyć jedynie dla argumentów"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos' musi być liczbą całkowitą"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "wszystkie elementy listy muszą być nazwane"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach()' działa tylko dla list, ramek danych oraz środowisk"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "odłączenie \"package:base\" nie jest dozwolone"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "argument musi być środowiskiem"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "argumenty muszą być symboliczne"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "brak wbudowanego środowiska"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "brak pozycji o nazwie '%s' na liście wyszukiwania"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "użycie 'as.environment(NULL)' jest przestarzałe"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "obiekt S4 nie rozszerza klasy \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "niepoprawny obiekt dla 'as.environment()'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "atrybut nie jest środowiskiem"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "argument nie jest symbolem"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "brak połączenia dla '%s'"
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "argument 'fun' nie jest funkcjÄ…"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "symbol posiada już regularne powiązanie"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr ""
 "nie można zmienić aktywnego powiązania jeśli powiązanie jest zablokowane"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "nieznana opcja"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "nie można zwolnić zablokowanego łącza"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "nie można zwolnić aktywnego łącza"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr "zła nazwa przestrzeni nazw"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr "przestrzeń nazw jest już zarejestrowana"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr "przestrzeń nazw nie została zarejestrowana"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "niepoprawny argument importu środowiska"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "niepoprawny argument eksportu środowiska"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "długości nazw importu oraz eksportu muszą się zgadzać"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "eksportowny symbol '%s' nie ma wartości"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "nieznana strona kodowa: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "osadzony znak null w łańcuchu: '%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "przerwania zawieszone; sygnał został zignorowany"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr " [... przycięte]"
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "niepoprawna opcja \"warning.expression\""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(przetworzone z ostrzeżenia) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr "Ostrzeżenie:"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr "Ostrzeżenie w poleceniu '%s':"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr "Wywołania:"
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Utracono komunikaty ostrzegawcze\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Komunikat ostrzegawczy:"
 msgstr[1] "Komunikaty ostrzegawcze:"
 msgstr[2] "Komunikaty ostrzegawcze:"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr "W poleceniu '%s':"
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
@@ -3325,155 +3342,151 @@
 msgstr[1] "Były %d ostrzeżenia (użyj 'warnings()' aby je zobaczyć)"
 msgstr[2] "Było %d ostrzeżenie (użyj 'warnings()' aby je zobaczyć)"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 "Było %d lub więcej ostrzeżeń (użyj 'warnings()' aby zobaczyć pierwsze %d)"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "Błąd podczas tworzenia skrótów:"
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "BÅ‚Ä…d w"
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr "BÅ‚Ä…d w poleceniu '%s' (z %s): "
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr "BÅ‚Ä…d w poleceniu '%s':"
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "B�ĄD: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "Dodatkowo: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "niepoprawna opcja \"error\"\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Wykonywanie wstrzymane\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr "'%s' musi być łańcuchem tekstowym"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [niepoprawny łańcuch tekstowy w 'stop()']"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [niepoprawny łańcuch w 'warning()']"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "niepoprawna liczba argumentów przekazanych do \"%s\""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "niezaimplementowana cecha w '%s'"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "niepoprawna liczba argumentów"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "niepoprawny typ argumentu"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "niezgodność długości szeregu czasowego/wektora"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "niezgodne argumenty"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "nieznany błąd (zgłoś raport!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "niedokładna konwersja liczby całkowitej w przekształceniu"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "nieznane ostrzeżenie (zgłoś raport!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr ""
 "Brak funkcji z której można powrócić, przeskakiwanie do najwyższego poziomu"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "niezgodność na najwyższym poziomie?"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "błędne dane programu obsługi"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "komunikat błędu nie jest łańcuchem"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr "niezgodność obsługi lub restart stosu w starym restarcie"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "błędny komunikat błędu"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "błędny restart"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "restart nie jest na stosie"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "to nie jest w kontekście 'try'"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "komunikat błędu musi być łańcuchem tekstowym"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr "pliki źródłowe pominięte przez Rprof; proszę zwiększyć '%s'"
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: nie można otworzyć pliku profilu '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "profilowanie R nie jest dostępne na tym systemie"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
@@ -3481,259 +3494,267 @@
 "obietnica jest już w trakcie obliczania: rekursywne domyślne odwołanie do "
 "argumentu lub wcześniejsze problemy?"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "restartowanie przerwało obliczanie obietnicy"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 "obliczanie jest zagnieżdżone zbyt głęboko: nieskończona rekurencja / "
 "options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "brakuje argumentu, a nie ma określonej wartości domyślnej"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "próba zastosowania nie-funkcji"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "'%s' w %s#%d: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "argument %d jest pusty"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "nie udało się znaleźć symbolu \"%s\" w środowisku ogólnej funkcji"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "symbol '%s' nie jest w środowisku metody"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "warunek posiada długość > 1 i tylko pierwszy element będzie użyty"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "brakuje wartości tam, gdzie wymagane jest TRUE/FALSE"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "argument nie jest interpretowany jako logiczny"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "argument jest długości zero"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "niesymboliczna zmienna pętli"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "niepoprawna sekwencja pętli 'for()'"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "zwracania wielu argumentów nie są dozwolone"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "niepoprawna (NULL) lewa strona przypisania"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "docelowe przypisanie rozszerza się na nie-języczny obiekt"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "nazwa jest zbyt długa w '%s'"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "nie można wykonać złożonych przypisać w bazowej przestrzeni nazw"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "nie można wykonać złożonych przypisań w bazowym środowisku"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "niepoprawna funkcja w złożonym przypisaniu"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "niepoprawna (do_set) lewa strona do przypisania"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "brakuje '%s'"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "niepoprawna lista formalnych argumentów dla \"function\""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "niepoprawny argument '%s' typu '%s'"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "liczbowy argument 'envir' nie posiada długości 1"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "restartowania nie są obsługiwane w 'eval'"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' wywołane spoza zamknięcia"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "wartość w '...' nie jest obietnicą"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Niezgodne metody (\"%s\", \"%s\") w \"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "błąd wysyłania w grupowej wysyłce"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "'%s' nie jest funkcjÄ… '%s'"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "przepełnienie stosu strony"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "przepełnienie stosu liczb całkowitych"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr "błędny kod operacji"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "błędny typ '%s' w 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "niezgodność wersji kodu bajtowego; używanie 'eval'"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "wersja kodu bajtowego jest zbyt stara"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "wersja kodu bajtowego jest zbyt nowa"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "niezgodność wersji kodu bajtowego"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "niepoprawny argument sekwencji w pętli 'for()'"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "brak wewnętrznej (.Internal) funkcji '%s'"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "zła funkcja"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "to nie jest funkcja 'BUILTIN'"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr "błędne przesunięcia liczbowe w funkcji 'switch()'"
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 "wyrażenie regularne 'EXPR' wymagane przez 'switch()' bez nazwanych alternatyw"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr "błędne przesunięcia znakowe 'switch()'"
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "nie można znaleźć indeksu dla wątkowego adresu kodu"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr "niepoprawne ciało"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "niepoprawny symbol"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "argument 'code' nie jest obiektem kodu bajtowego"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "zła nazwa pliku"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "nie można otworzyć 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file' musi być niepustym łańcuchem tekstowym"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' musi być logiczne"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr "stały bufor musi być ogólnym wektorem"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr "zła liczba stałych"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "czasomierz profilu jest w użyciu"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "profilowanie kodu bajtowego jest w trakcie"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "ustawienie czasomierza profilu nie powiodło się"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "brak profilowania kodu bajtowego"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr "profilowanie kodu bajtowego nie jest wspierane w tej kompilacji"
 
@@ -3750,15 +3771,15 @@
 msgid "this graphics device does not support event handling"
 msgstr "to graficzne urządzenie nie wspiera obsługi zdarzeń"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "niepoprawne zapytanie"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "rekursywne użycie 'getGraphicsEvent' nie jest wspierane"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "nie ustawiono obsługi zdarzeń grafiki"
 
@@ -3955,7 +3976,7 @@
 msgstr "niepoprawne wyrażenie regularne, powód '%s'"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "wejściowy łańcuch %d to niepoprawny UTF-8"
@@ -4050,26 +4071,24 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "procedury internetowe nie są dostępne w module"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "procedury internetowe nie mogą zostać załadowane"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "niepoprawna wartość"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "procedury 'socket' nie mogą zostać załadowane"
 
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
+msgstr "próba zamknięcia niepoprawnego gniazda"
+
 #: src/main/lapack.c:39
 msgid "LAPACK routines cannot be accessed in module"
 msgstr "procedury LAPACK nie są dostępne w module"
@@ -4078,39 +4097,39 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "procedury LAPACK nie mogą zostać załadowane"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 "operacje są możliwe jedynie dla typów liczbowych, logicznych oraz zespolonych"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "operacja dwuargumentowa na niezgodnych tablicach"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:250
 msgid "non-conformable time series"
 msgstr "niezgodne szeregi czasowe"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "operator '%s' wymaga 2 argumentów"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "błędny typ 'x' w 'x %s y'"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "błędny typ 'y' w 'x %s y'"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "Operator jednoargumentowy '!' wywołany z dwoma argumentami"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "przekształcenie argumentu typu '%s' w logiczny"
@@ -4119,65 +4138,77 @@
 msgid "dummy - do not translate"
 msgstr "wydmuszka - nie tłumacz tego"
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+msgid "error during cleanup\n"
+msgstr "błąd podczas czyszczenia\n"
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Wykonywanie wstrzymane\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "Błąd: błąd segmentacji z przepełnionego stosu C\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "nie można otworzyć bazowego pakietu\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "nie można odtworzyć zapisanych danych w '%s'\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Podczas startu - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+msgid "unable to initialize the JIT\n"
+msgstr "nie można zainicjować JIT\n"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "nie można wyjść z przeglądarki"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "oczekiwano wartości jednej z \"yes\", \"no\", \"ask\" lub \"default\"."
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "'save=\"ask\"' jest w nieinteraktywnym użyciu: zostanie użyty domyślny "
 "wiersz poleceń"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "nierozpoznana wartość argumentu 'save'"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "niepoprawny argument 'status', założono wartość 0"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "niepoprawny argument 'runLast', przyjęto FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 "nie można przydzielić miejsca dla elementu 'callback' najwyższego poziomu"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "ujemny indeks przekazany do 'R_removeTaskCallbackByIndex()'"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 "komunikaty ostrzegawcze z zadania 'callback' najwyższego poziomu '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "zadanie 'callback' najwyższego poziomu nie zwróciło wartości logicznej"
 
@@ -4223,91 +4254,91 @@
 msgstr[1] "nieużywane argumenty %s"
 msgstr[2] "nieużywane argumenty %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "można jedynie słabo odwoływać/ finalizować obiekty referencyjne"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "finalizator musi być funkcją lub wartością NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "to nie jest słaba referencja"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "pierwszy argument musi być środowiskiem lub zewnętrznym wskaźnikiem"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "drugi argument musi być funkcją"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "trzeci argument musi być 'TRUE' lub 'FALSE'"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "wektorowa pamięć wyczerpana (osiągnięto limit?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "pamięć 'cons' wyczerpana (osiągnięto limit?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "pamięć wyczerpana (osiągnięto limit?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "nie można przydzielić bloku pamięci o rozmiarze %0.f Tb"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "nie można przydzielić bloku pamięci o rozmiarze %0.1f Gb"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr "wektor jest zbyt duży"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "wektory o ujemnej długości nie są dozwolone"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "nie można przydzielić wektora o długości %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "niepoprawny typ/długość (%s/%d) dla przydziału wektora"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "nie można przydzielić wektora o rozmiarze %0.1f Gb"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "nie można przydzielić wektora o rozmiarze %0.1f Mb"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "nie można przydzielić wektora o rozmiarze %0.f Kb"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): zabezpieczenie stosu przed przepełnieniem"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
@@ -4315,11 +4346,11 @@
 msgstr[1] "unprotect(): tylko %d zabezpieczone pozycje"
 msgstr[2] "unprotect(): tylko %d zabezpieczonych pozycji"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: wskaźnik nie został znaleziony"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
@@ -4333,62 +4364,67 @@
 "R_Reprotect: tylko %d zabezpieczonych pozycji. Nie można ponownie "
 "zabezpieczyć indeksu %d"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "'Calloc' nie mógł przydzielić pamięci (%.0f z %u bajtów)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "'Realloc' nie mógł ponownie przydzielić pamięci (%.0f bajtów)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "nie jest bezpiecznie zwracać wskaźnik wektora"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr "próba ustawienia indeksu %lu/%lu w SET_STRING_ELT"
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr "próba ustawienia indeksu %lu/%lu w SET_VECTOR_ELT"
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "niepoprawna wartość"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "profilowanie pamięci nie jest dostępne na tym systemie"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: nie można otworzyć pliku wyjściowego '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr "długie wektory nie są jeszcze wspierane: %s:%d"
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "wymagany jest argument łańcucha"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "brak takiej prymitywnej funkcji"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "próba użycia nazwy zmiennej o zerowej długości"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "nazwy zmiennych są ograniczone do %d bajtów"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "niepoprawny argument '.Internal()'"
 
@@ -4429,102 +4465,102 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "niestosowalna metoda dla '%s' zastosowana do obiektu klasy \"%s\""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod()' wywołana spoza funkcji"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod()' wywołana z anonimowej funkcji"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "nie znaleziono ogólnego wywołania: czy metoda wywołana bezpośrednio?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' nie jest funkcjÄ…, lecz typem '%d'"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "błędny argument ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "nie określono obiektu"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "ogólna funkcja nie jest określona"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "niepoprawny ogólny argument przekazany do 'NextMethod()'"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "niepoprawny argument 'group' znaleziony w 'NextMethod()'"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr "błędna wartość dla '.Method'"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "Niezgodne metody zostały zignorowane"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "brak metody do wywołania"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "nie można zdjąć klasy ze środowiska"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "nie można zdjąć klasy z zewnętrznego wskaźnika"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' musi być wektorem tekstowym"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "argument 'which' musi być wektorem logicznym o długości 1"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "użyj 'is()' zamiast 'inherits()' dla obiektów S4"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr "nie udało się znaleźć poprawnego środowiska; proszę zgłosić raport!"
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'onOff' musi być TRUE lub FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "nie można znaleźć nie-ogólnej wersji funkcji \"%s\""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 "'standardGeneric' wywołane bez włączonego wysyłania 'methods' (będzie "
 "zignorowane)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 "argument przekazywany do 'standardGeneric()' musi być niepustym łańcuchem "
 "tekstowym"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4533,7 +4569,7 @@
 "wywołanie dla 'standardGeneric' (\"%s\") najwyraźniej nie zostało wysłane z "
 "ciała funkcji ogólnej"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4542,11 +4578,11 @@
 "niepoprawny kod prymitywnej metody (\"%s\"): musi być \"clear\", \"reset\", "
 "\"set\", lub \"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "niepoprawny obiekt: musi być prymitywną funkcją"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4555,20 +4591,20 @@
 "formalna definicja prymitywnej ogólnej metody musi być obiektem funkcyjnym "
 "(otrzymano typ '%s')"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "obiekt zwrócony jako ogólna funkcja '%s' nie wygląda na taką"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "podano niepoprawną prymitywną operację dla wysyłania"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "błąd wysyłania"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4577,87 +4613,91 @@
 "prymitywna funkcja '%s' została ustawiona dla metod, ale nie dostarczono "
 "funkcji ogólnej"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 "makro MAKE_CLASS poziomu C wywołane ze wskaźnikiem łańcucha ustawionym na "
 "NULL"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr "pakiet 'methods' nie został jeszcze załadowany"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "'R_getClassDef(.)' wywołane ze wskaźnikiem łańcucha ustawionym na NULL"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "makro NEW poziomu C wywołane z pustym wskaźnikiem definicji klasy"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "próba wygenerowania obiektu z klasy wirtualnej (\"%s\")"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "obiekt klasy \"%s\" nie odpowiada poprawnemu obiektowi klasy S3"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "uszkodzona lista opcji"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "niepoprawna szerokość druku, użyto 80"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "niepoprawna liczba cyfr po przecinku, użyto 7"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr "niepoprawne 'deparse.cutoff', użyto 60"
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "niepoprawna wartość dla \"device.ask.default\", używanie FALSE"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "argument listy nie ma poprawnych nazw"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "niepoprawny parametr 'width', dozwolone %d...%d"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "niepoprawny parametr 'digits', dozwolone %d...%d"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "niepoprawny parametr 'expressions', dozwolone %d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "niepoprawna wartość w '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+msgid "'OutDec' must be a string of one character"
+msgstr "argument 'OutDec' musi być jednym znakiem"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" został zastąpiony przez \"device.ask.default\""
 
@@ -4681,11 +4721,15 @@
 msgid "first argument must be atomic"
 msgstr "pierwszy argument musi być atomowy"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+msgid "'decimal.mark' must be a string of one character"
+msgstr "argument 'decimal.mark' musi być jednym znakiem"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "Niemożliwy tryb ( x )"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "tylko argumenty o typie atomowych wektorów"
 
@@ -4693,211 +4737,194 @@
 msgid "invalid filename specification"
 msgstr "niepoprawne określenie nazwy pliku"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "błąd zapisu podczas dołączania pliku"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "nie ma do czego dołączyć"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "niepoprawny argument nazwy pliku"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "nie można utworzyć pliku '%s', powód: '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "błędna nazwa pierwszego pliku"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "nie można usunąć pliku '%s', powód '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "niepoprawna nazwa drugiego pliku"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "nie ma do czego łączyć"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "symboliczne połączenia nie są wspierane w tej wersji systemu Windows"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "nie można utworzyć symbolicznego połączenia '%ls' z '%ls', powód '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "nie można utworzyć symbolicznego połączenia '%s' z '%s', powód '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr "symboliczne połączenia nie są wspierane na tej platformie"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "nie można połączyć '%ls' z '%ls', powód '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "nie można połączyć '%s' z '%s', powód '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr "(twarde) połączenia nie są wspierane na tej platformie"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "argumenty 'from' oraz 'to' są różnej długości"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "rozszerzona nazwa 'from' jest zbyt długa"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "rozszerzona nazwa 'to' jest zbyt długa"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "nie można zmienić nazwy pliku z '%s' na '%s', powód '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "niepoprawne wyrażenie regularne 'pattern'"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "nie można określić bazowego położenia R"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "nazwa pliku jest zbyt długa"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "wewnętrzny warunek braku pamięci"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "błąd odczytu w '%s'"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "ustawienie 'LC_NUMERIC' może spowodować, że R będzie dziwnie działał"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr "'LC_MESSAGES' istnieje w systemie Windows, ale nie jest operacyjne"
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 "Żądania raportów OS aby ustawić lokalizację na \"%s\" nie mogą zostać "
 "wykonane"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "argument 'hostname' musi być wektorem tekstowym o długości 1"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "'nsl()' nie był w stanie nawiązać połączenia z hostem '%s'"
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "nieznany format zwrócony przez funkcję C 'gethostbyname()'"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "'nsl()' nie jest obsługiwany na tej platformie"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "katalog '%s' już istnieje"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "nie można utworzyć katalogu '%s', powód '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "katalog '%ls' już istnieje"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "nie można utworzyć katalogu '%ls', powód '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr "zbyt głębokie zagnieżdżenie"
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr "zbyt długa ścieżka"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "problem z utworzeniem katalogu %ls: %s "
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "problem z czytaniem katalogu %ls: %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr "zbyt długa ścieżka"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr "problem z kopiowaniem %ls do %ls: %s"
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr "problem z utworzeniem katalogu %s: %s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr "problem z czytaniem katalogu %s: %s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "problem z kopiowaniem %s do %s: %s"
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "argument 'mode' musi mieć długość co najmniej 1"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "niewystarczajÄ…ce wsparcie OS na tej platformie"
 
@@ -4942,60 +4969,64 @@
 msgid "Metric information not available for this family/device"
 msgstr "Informacje metryczne nie są dostępne dla tej rodziny/urządzenia"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "niepoprawne określenie 'na.print'"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "niepoprawne etykiety wierszy"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "niepoprawne etykiety kolumn"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr "argument niefunkcyjny przekazany do '.Internal(print.function(.))'"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' musi być nieujemną liczbą całkowitą"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "niepoprawny wewnętrzny argument 'tryS4' "
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr "przepełnienie bufora druku"
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr "niepoprawna długość tekstu w 'dblepr'"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr "niepoprawna długość tekstu w 'intpr'"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr "niepoprawna długość tekstu w 'realpr'"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr "błąd przydziału pamięci w 'realpr'"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "procedura BLAS/LAPACK '%6s' zwróciła kod %d błędu"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "zbyt mało etykiet wierszy"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "zbyt mało etykiet kolumn"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
@@ -5003,7 +5034,7 @@
 msgstr[1] " [ osiągnięto getOption(\"max.print\") -- pominięto %d wiersze]\n"
 msgstr[2] " [ osiągnięto getOption(\"max.print\") -- pominięto %d wierszy]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 "nie jest jest wiadome, że wchar_t jest symbolem Unicode na tej platformie"
@@ -5012,46 +5043,46 @@
 msgid "argument is not a numeric vector"
 msgstr "argument nie jest wektorem liczbowym"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "niepoprawne argumenty"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "wyprodukowano wartości Na"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "wartość NA w wektorze prawdopodobieństwa"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr "ujemne prawdopodobieństwo"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "zbyt mało dodatnich prawdopodobieństw"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "nie można wziąć próby większej niż rozmiar populacji gdy 'replace = FALSE'"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "niepoprawna liczba prawdopodobieństw"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 "n >= 2^31, replace = FALSE jest wspierane jedynie na platformach 64-bitowych"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr "argument musi być wektorem tekstowym o długości 1"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
@@ -5059,303 +5090,301 @@
 "argument powinien być wektorem tekstowym o długości 1.\n"
 "Wszystkie elementy poza pierwszym zostanÄ… zignorowane"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr "argument 'x' musi być pustym wektorem"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "argument 'multiple' musi posiadać wartość TRUE lub FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr "argument 'shift' musi być małą liczbą całkowitą"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr "argument 'x' musi być wektorem liczb całkowitych"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "argument 'x' musi być typem pustym, logicznym lub liczbą całkowitą"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "argument 'x' musi być wielokrotnością długości %d"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr "argument 'x' nie może zawierać wartości NA"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr "niepoprawny łańcuch UTF-8"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:205
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "porównanie (%d) jest możliwe jedynie dla typów atomowych oraz list"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:210
 msgid "comparison is not allowed for expressions"
 msgstr "porównanie nie jest dozwolone dla wyrażeń"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:299
 msgid "comparison of these types is not implemented"
 msgstr "porównanie tych typów nie jest zaimplementowane"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:503
 msgid "invalid comparison with complex values"
 msgstr "niepoprawne porównanie wartości zespolonych"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:761
 msgid "'a' and 'b' must have the same type"
 msgstr "'A' oraz 'B' muszą mieć ten sam typ"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
-#: src/main/serialize.c:421 src/main/serialize.c:2429
-#: src/main/serialize.c:2437
+#: src/main/serialize.c:421 src/main/serialize.c:2429 src/main/serialize.c:2437
 msgid "read error"
 msgstr "błąd odczytu"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "nastąpił błąd odczytu 'I'"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "nastąpił błąd odczytu 'R'"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "nastąpił błąd odczytu 'C'"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "nastąpił błąd odczytu 'S'"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "nastąpił błąd odczytu"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "nierozwiązany węzeł podczas przywracania"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "błąd przywrócenia zgodności -- brak zgodnościi dla wersji %d"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "niepoprawny typ 'SEXP' w pliku danych"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "niezgodność typów"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "nierozpoznana nazwa wewnętrznej funkcji \"%s\""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "nie można zachować położenia pliku podczas przywracania danych"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr "nie można przywrócić położenia pliku podczas przywracania danych"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 "bazowa przestrzeń nazw nie jest zachowywana w obszarze roboczym w wersji 1"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "nie można zachować przestrzeni nazw w obszarze roboczym w wersji 1"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 "nie można zachować środowiska z zablokowanymi/aktwnymi wiązaniami w obszarze "
 "roboczym w wersji 1"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "nie można zachować słabej referencji w obszarze roboczym w wersji 1"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "'NewWriteVec' wywołane z typem nie-wektora"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 "nie można zachować obiektów kodu bajtowego w obszarze roboczym w wersji 1"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "'NewWriteItem': nieznany typ %i"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "'NewReadVec' wywołane z typem nie-wektora"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 "nie można czytać obiektów kodu bajtowego z obszaru roboczego w wersji 1"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: nieznany typ %i"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "zabrakło pamięci podczas czytania łańcucha ASCII"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "nastąpił błąd odczytu danych binarnych"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "zabrakło pamięci podczas czytania łańcucha binarnego"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "nastąpił błąd odczytu łańcucha binarnego"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "pojawił się błąd zapisu danych liczby całkowitej w xdr"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "pojawił się błąd odczytu danych liczby całkowitej w xdr"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "pojawił się błąd zapisu danych łańcucha w xdr"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "pojawił się błąd zapisu danych liczby rzeczywistej w xdr"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "pojawił się błąd odczytu danych liczby rzeczywistej w xdr"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "pojawił się błąd zapisu danych liczby zespolonej w xdr"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "pojawił się błąd odczytu danych liczby zespolonej w xdr"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
-#: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
+#: src/main/saveload.c:1785 src/main/serialize.c:1997 src/main/serialize.c:2614
+#: src/modules/internet/internet.c:514 src/modules/internet/internet.c:590
+#: src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "zapis nie powiódł się"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "przywrócony plik może być pusty -- nie załadowano danych"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr "przywrócony plik może być z nowszej wersji R -- nie załadowano danych"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "niepoprawna magiczna liczba przywracanego pliku (plik może być uszkodzony) "
 "-- nie załadowano danych"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "pierwszy argument musi być wektorem tekstowym"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "to nie jest niepoprawnie nazwana lista"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 "'%s' wygląda na obiekt S4 sprzed wersji 2.4.0: proszę go ponownie utworzyć"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "załadowane dane nie są w postaci listy par"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "pierwszy argument musi być nazwą pliku"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "zapis 'XDR' nie powiódł się"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "odczyt 'XDR' nie powiódł się"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "nie można zapisać danych -- nie można otworzyć '%s': %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "nie można zapisać w połączeniach w formacie w wersji %d"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "połączenie nie jest otwarte do zapisu"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "nie można zapisać formatu XDR w połączeniu w trybie tekstowym"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
-#: src/main/serialize.c:2119 src/main/serialize.c:2303
-#: src/main/serialize.c:2325
+#: src/main/saveload.c:2298 src/main/serialize.c:2105 src/main/serialize.c:2119
+#: src/main/serialize.c:2303 src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "błąd zapisu do połączenia"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "połączenie nie jest otwarte do odczytu"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr "można ładować jedynie z połączenia binarnego"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "brak dostępnego wejścia"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5371,7 +5400,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "'scan()' oczekiwał '%s', dostał '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr "zbyt dużo pozycji"
 
@@ -5379,7 +5408,7 @@
 msgid "empty 'what' specified"
 msgstr "określono pusty 'what'"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "linia %d nie miała %d elementów"
@@ -5412,19 +5441,19 @@
 msgid "embedded nul(s) found in input"
 msgstr "znaleziono osadzony znak znak null na wejściu"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "nierówne długości czynników"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "wynikiem byłby zbyt długi wektor"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "argument ma długość 0"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
@@ -5432,61 +5461,61 @@
 msgstr[1] "wyrażenie liczbowe posiada %d elementy: użyto tylko pierwszego"
 msgstr[2] "wyrażenie liczbowe posiada %d elementów: użyto tylko pierwszego"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "argument o wartości NA/NaN"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:330
 msgid "incorrect type for second argument"
 msgstr "niepoprawny typ dla drugiego argumentu"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:333
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "próba powielenia obiektu typu '%s'"
 
-#: src/main/seq.c:393
+#: src/main/seq.c:386
 msgid "attempt to replicate non-vector"
 msgstr "próba powielenia nie-wektora"
 
-#: src/main/seq.c:409
+#: src/main/seq.c:402
 msgid "cannot replicate NULL to a non-zero length"
 msgstr "nie można powielać wartości NULL do niezerowej długości"
 
-#: src/main/seq.c:630 src/main/seq.c:637 src/main/seq.c:766 src/main/seq.c:977
+#: src/main/seq.c:623 src/main/seq.c:630 src/main/seq.c:759 src/main/seq.c:970
 #, c-format
 msgid "first element used of '%s' argument"
 msgstr "użyto pierwszego elementu argumentu '%s'"
 
-#: src/main/seq.c:764
+#: src/main/seq.c:757
 msgid "'length.out' must be a non-negative number"
 msgstr "argument 'length.out' musi być liczbą nieujemną"
 
-#: src/main/seq.c:788 src/main/seq.c:854 src/main/seq.c:871
+#: src/main/seq.c:781 src/main/seq.c:847 src/main/seq.c:864
 msgid "'from' must be finite"
 msgstr "'from' musi być skończone"
 
-#: src/main/seq.c:790 src/main/seq.c:856 src/main/seq.c:893
+#: src/main/seq.c:783 src/main/seq.c:849 src/main/seq.c:886
 msgid "'to' must be finite"
 msgstr "'to' musi być skończone"
 
-#: src/main/seq.c:802
+#: src/main/seq.c:795
 msgid "invalid '(to - from)/by' in 'seq'"
 msgstr "niepoprawne '(to - from)/by' w 'seq()'"
 
-#: src/main/seq.c:814
+#: src/main/seq.c:807
 msgid "'by' argument is much too small"
 msgstr "argument 'by' jest znacznie za mały"
 
-#: src/main/seq.c:816
+#: src/main/seq.c:809
 msgid "wrong sign in 'by' argument"
 msgstr "błędny znak w argumencie 'by'"
 
-#: src/main/seq.c:873 src/main/seq.c:895
+#: src/main/seq.c:866 src/main/seq.c:888
 msgid "'by' must be finite"
 msgstr "'by' musi być skończone"
 
-#: src/main/seq.c:983 src/main/seq.c:988
+#: src/main/seq.c:976 src/main/seq.c:981
 msgid "argument must be coercible to non-negative integer"
 msgstr "argument musi być przekształcalny do nieujemnej liczby całkowitej"
 
@@ -5678,53 +5707,49 @@
 msgstr ""
 "tylko atomowe wektory mogą być testowane pod kątem możliwości ich sortowania"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' musi być TRUE lub FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "tylko atomowe wektory mogą być sortowane"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "puste wektory nie mogą być sortowane"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr "wartość NA lub nieskończony indeks"
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr "indeks %ld jest poza granicami"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "Indeks ma wartość NA"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "indeks %d jest poza zakresem"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "argument %d nie jest wektorem"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "długości argumentów różnią się"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "niepoprawny 'ties.method' dla 'rank()' [nie powinien się zdarzyć]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "zbyt duży zakres wartości w 'x'"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "przekształcenie 'text' w znak nie powiodło się"
@@ -5734,23 +5759,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "argument '%s = \"%s\"' zostanie zignorowany"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "pierwszy argument musi być wektorem"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "drugi argument musi być czynnikiem"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr "długość grupy wynosi 0 ale długość danych > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "długość danych nie jest wielokrotnością zmiennej rozdzielającej"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "czynnik posiada błędny poziom"
 
@@ -5806,38 +5831,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "konwersja zmieniła długość wektora na 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "niepoprawny format '%s'; %s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "użyj formatu %d lub %i dla obiektów logicznych"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "użyj formatu %d, %i, %o, %x lub %X dla liczb całkowitych"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "użyj formatu %f, %e, %g lub %a dla liczb rzeczywistych"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "użyj formatu '%s' dla obiektu tekstowego"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "prawdopodobne przycięcie łańcucha tekstowego do %d znaków"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "niewspierany typ"
 
@@ -5845,253 +5870,249 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "'R_LibraryFileName': bufor jest zbyt mały"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "próba powiększenia nie-wektora"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "przypisanie poza granicami wektora/listy (rozciÄ…ganie od %d do %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "niezgodne typy (z %s do %s) w przypisaniu w typie 'fix'"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "wartości NA nie są dozwolone w przypisaniach indeksowych"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "zamiana ma długość zero"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 "liczba pozycji do zastąpienia nie jest wielokrotnością długości zamiany"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "niepoprawna liczba indeksów w macierzy"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr "niezgodne typy (z %s do %s) w przypisaniu w podgrupie macierzy"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "niepoprawna liczba indeksów"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr "niezgodne typy (z %s do %s) w przypisaniu w podgrupie tablicy"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "niepoprawny indeks w przypisaniu listy"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "niepoprawna liczba indeksów w przypisaniu listy"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "'SubAssignArgs': niepoprawna liczba argumentów"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr "wynik posiada zerową długość tak więc nie może być obiektem językowym"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 "[[<- zdefiniowane dla obiektów typu \"S4\" tylko dla podklas środowiska"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "niepoprawne argumenty dla przypisania środowiska"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "dostarczono więcej elementów niż jest do zastąpienia"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] z brakujÄ…cymi indeksami"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] indeks poza granicami"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] niepoprawna liczba indeksów"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "niezgodne typy (z %s do %s) w przypisaniu [["
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "indeks [[ ]] (%d) poza granicami"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "niepoprawny typ '%s' indeksu"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "brak metody do przypisywania podgrup tej klasy S4"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "Przekształcenie wyrażenia po lewej strony w listę"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
-msgstr "próba wybrania mniej niż jednego elementu"
-
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
-msgstr "próba wybrania więcej niż jednego elementu"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
+msgstr "próba wybrania mniej niż jednego elementu w %s"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
+msgstr "próba wybrania więcej niż jednego elementu w %s"
+
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "wewnętrzny błąd w używaniu rekursywnego indeksowania"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "dalsza częściowa zgodność '%s' z '%s'"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "rekursywne indeksowanie nie powiodło się na poziomie %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "brak takiego indeksu na poziomie %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "niepoprawna liczba kolumn w indeksie macierzy"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "ujemne wartości nie są dozwolone w indeksie macierzy"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(indeks) logiczny indeks jest zbyt długi"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "tylko zera mogą być mieszane z ujemnymi indeksami"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr "indeks jest zbyt duży dla R w wersji 32-bitowej"
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "brak atrybutu 'dimnames' dla tablicy"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "indeksowanie na nie-wektorze"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr "wymiary przekroczyłyby maksymalny rozmiar tablicy"
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "indeksowanie macierzy nie jest obsługiwane dla tego typu"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "indeksowanie tablic nie jest obsługiwane dla tego typu"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "niepoprawna liczba wymiarów"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "nie określono indeksu"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "ta klasa S4 nie jest podstawialna"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "nieprawidłowe argumenty do podstawienia w środowisku"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "niepoprawny 'type' (%s) argumentu"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "przepełnienie całkowitoliczbowe - użyj 'sum(as.numeric(.))'"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "wewnętrzny błąd ('op = %d' w 'do_summary').\t Wezwij Guru"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Przepełnienie całkowitoliczbowe - użyj 'sum(as.numeric(.))'"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "brak argumentów; zwracanie wartości NA"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "brak argumentów w min; zwracanie wartości Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "brak argumentów w max; zwracanie wartości -Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "argument nieliczbowy"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "argument przekazany do 'which' nie jest argumentem logicznym"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "brak argumentów"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "niepoprawny typ wejściowy"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr "argument zostanie częściowo powtórzony"
 
@@ -6104,8 +6125,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "strona kodowa nazwy pliku nie może być ustawiona na 'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "niewspierana konwersja z '%s' w stronie kodowej '%d'"
@@ -6138,98 +6159,100 @@
 msgid "no 'fileext'"
 msgstr "brak 'fileext'"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr "wywołanie systemowe powiodło się: %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "błędny typ argumentu"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "błędna długość argumentu"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'Sys.setenv' nie jest dostępne w tym systemie"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 "ten system nie może usunąć ustawienia zmiennych środowiskowych: ustawianie "
 "na \"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "'Sys.unsetenv' nie jest dostępny na tym systemie"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "niewspierana konwersja z '%s' do '%s' w stronie kodowej %d"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' musi być wektorem tekstowym"
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
-msgstr "argument 'x' musi być listą z wartościami NULL lub pustymi wektorami"
+#: src/main/sysutils.c:658
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
+msgstr ""
+"argument 'x' musi być wektorem tekstowym lub listą z wartościami NULL lub "
+"pustymi wektorami"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' musi być wywołany w 'CHARSXP'"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 "tłumaczenie łańcuchów tekstowych ze stroną kodową \"bytes\" nie jest "
 "dozwolone"
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr "błąd wewnętrzny: translacja nie jest konieczna"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "niewspierana konwersja do '%s' ze strony kodowej %d"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr "niepoprawny punkt Unicode %u"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr "nie można utworzyć 'R_TempDir'"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "nie można ustawić R_SESSION_TMPDIR"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr "nie można przydzielić 'R_TempDir'"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr "nazwa tymczasowa jest zbyt długa"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "nie można znaleźć nieużytej nazwy tymczasowego pliku"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr "przydział w 'R_tmpnam2' nie powiódł się"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "'dirmarke = TRUE' nie jest wspierany na tej platformie"
 
@@ -6264,31 +6287,31 @@
 msgid "'nmax' must be positive"
 msgstr "'nmax' musi być dodatnie"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' wymaga wektorów jako argumentów"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "argument nie jest trybem tekstowym"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr "... użyte w sytuacji w której nie istnieje"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr "wartość w '...' nie jest obiektem klasy \"pairlist\""
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "nieliczbowa ramka w 'rowsum()'"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "to nie może się stać"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' musi być wektorem tekstowym"
 
@@ -6296,27 +6319,27 @@
 msgid "object is not a matrix"
 msgstr "obiekt nie jest macierzÄ…"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "niezaimplementowany typ %d w '%s'"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "niezaimplementowany typ '%s' w '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "niezaimplementowany typ (%d) w '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "niepoprawna etykieta w ekstrakcji nazwy"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
@@ -6324,7 +6347,7 @@
 msgstr[1] "%d argumenty przekazano do '.Internal(%s)' który wymaga %d"
 msgstr[2] "%d argumentów przekazano do '.Internal(%s)' który wymaga %d"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
@@ -6332,108 +6355,108 @@
 msgstr[1] "%d argumenty przekazano do funkcji '%s', która wymaga %d"
 msgstr[2] "%d argumentów przekazano do funkcji '%s', która wymaga %d"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "dostarczona nazwa '%s' argumentu nie pasuje do '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "lista 'nthcdr' jest krótsza niż %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr' potrzebuje listy aby prześledzić w dół listy elementów"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' musi być TRUE lub FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' musi być TRUE lub FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr "liczba wierszy wyniku przekracza maksymalną długość wektora"
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "brakująca wartość jest niepoprawna"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "nie można zmienić katalogu roboczego"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "oczekiwano wektora tekstowego jako argumentu"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "ścieżka jest zbyt długa"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "tylko pierwszy znak argumentu 'quote' zostanie użyty"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "oczekiwano tekstowego wektora 'value'"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "argument 'value' musi posiadać dodatnią długość"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "niepoprawne wejście '%s' w funkcji 'utf8towcs()'"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "niepoprawny wielobajtowy łańcuch w '%s'"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "komunikat błędu przycięty do 255 znaków"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "komunikat ostrzegawczy przycięty do 255 znaków"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr "utracono precyzjÄ™ podczas konwersji z \"%s\" do liczby"
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr "wszystkie argumenty muszą być nazwane"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "ICU nie jest wspierany w tej kompilacji"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr "argument 'breaks' nie jest posortowany"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "długi wektor '%s' nie jest wspierany"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr "'eps.correct' musi być 0, 1, lub 2"
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr "'x' musi być wektorem"
 
@@ -6495,7 +6518,7 @@
 msgid "There must be at least three control points"
 msgstr "Muszą być przynajmniej trzy punkty kontrolne"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "błąd protokołu X11: %s"
@@ -6520,7 +6543,7 @@
 "Błąd: X11 nie może przydzielić dodatkowych kolorów grafiki.\n"
 "Rozważ użycie X11 z colortype=\"pseudo.cube\" lub \"gray\"."
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6528,17 +6551,17 @@
 "nie można znaleźć żadnych czcionek X11. Sprawdź, czy ścieżka do czcionek "
 "jest poprawna."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 użył rozmiaru czcionki %d podczas gdy żądano %d"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "czcionka X11 %s, krój %d o rozmiarze %d nie mogła zostać załadowana"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6546,194 +6569,200 @@
 "półprzezroczystość nie jest wspierana na tym urządzeniu: zaraportowane tylko "
 "raz na stronÄ™"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "błąd X11 wejścia/wyjścia podczas otwierania połączenia X11 z '%s'"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 "krytyczny błąd X11 wejścia/wyjścia: proszę zapisać pracę po czym zamknąć R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 "lokalizacja nie jest wspierana przez 'Xlib': niektóre opcje X będą operowały "
 "w lokalizacji C"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X nie może ustawić modyfikatorów lokalizacji"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "brak wsparcia 'png' w tej wersji R"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "nazwa pliku jest zbyt długa w wywołaniu 'png()'"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "nie udało się otworzyć pliku PNG '%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "brak wsparcia 'jpeg' w tej wersji R"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "nazwa pliku jest zbyt długa w wywołaniu 'jpeg()'"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "nie udało się otworzyć pliku JPEG '%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "brak wsparcia 'tiff' w tej wersji R"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "nazwa pliku jest zbyt długa w wywołaniu 'tiff()'"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "nazwa pliku jest zbyt długa w wywołaniu 'bmp()'"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "nie udało się otworzyć pliku BMP '%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "nie można otworzyć połączenia z oknem X11 '%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 "ignorowanie argumentu 'display' ponieważ urządzenie X11 jest już otwarte"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 "typy oparte na 'cairo' mogą działać poprawnie jedynie na wyświetlaczach "
 "'TrueColor'"
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "funkcja 'jpeg()' nie wspiera przezroczystości: używanie białego tła"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "nie można uzyskać informacji z ekranu '%s'"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "nie można utworzyć okna X11"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "'width=%d, height=%d' są mało prawdopodobnymi wartościami w pikselach"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "nie można utworzyć 'pixmap'"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "niepoprawne określenie czcionki"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "nie znaleziono czcionki w bazie czcionek X11"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "błędne użycie %d < 0 w '%s'"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "nie udało się otworzyć pliku '%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "%s nie jest dostępne dla tego urządzenia"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "Nie można utworzyć XImage"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr "próba użycia lokalizatora po 'dev.hold()'"
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "nie można uruchomić urządzenia '%s'"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "niepoprawne argumenty 'width' lub 'height'"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "niepoprawny argument 'colortype' przekazany do sterownika X11"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "nieznany model koloru/ kolor X11 -- używanie monochromatycznego"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "brak wykresu na urządzeniu, który można zapisać"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "nie ma otwartego urzÄ…dzenia 'X11cairo'"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "nie można otworzyć pliku '%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "'savePlot()' nie jest wspierane w tej kompilacji"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "nie można połączyć się z ekranem X11"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "nie można odczytać zawartości schowka (kod błędu %d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "nie można przydzielić pamięci dla struktury 'X11Routines'"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
-msgstr "dla adresów https:// użyj 'setInternet2(TRUE)'"
+msgid "for https:// URLs use method = \"wininet\""
+msgstr "dla adresów https:// użyj opcji 'method = \"wininet\"'"
+
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "schemat nie jest wspierany w URL '%s'"
 
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "przydział połączenia url nie powiódł się"
 
@@ -6745,29 +6774,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "tylko pierwszy element argumentu 'destfile' został użyty"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Postęp pobierania"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "nie można otworzyć URL '%s', powód '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "nie można otworzyć docelowego pliku '%s', powód '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "próbowanie adresu URL '%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "pobrana długość %0.f != zgłoszona długość %0.f"
@@ -6777,31 +6806,37 @@
 msgid "cannot open URL '%s'"
 msgstr "nie można otworzyć adresu URL '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "niewspierany schemat adresu URL"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
 #, c-format
-msgid "cannot open: HTTP status was '%d %s'"
-msgstr "nie można otworzyć: uzyskany status HTTP to '%d %s'"
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
+msgstr "nie można otworzyć adresu URL '%s': status HTTP '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "'InternetOpenUrl' nie powiódł się: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "Adres URL '%s': status '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr "Adres URL '%s': status '%s'"
+
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "metoda 'curlGetHeaders()' nie jest obsługiwana na tej platformie"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr "niepoprawny argument '%s'"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
@@ -6810,108 +6845,125 @@
 "kod %d błędu libcurl\n"
 "\t%s\n"
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 "metoda 'download.file(method = \"libcurl\")' nie jest obsługiwana na tej "
 "platformie"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "długości argumentów 'url' oraz 'destfile' muszą się zgadzać"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "Adres URL %s: nie można otworzyć docelowego pliku '%s', powód '%s'"
+
+#: src/modules/internet/libcurl.c:593
+msgid "cannot download all files"
+msgstr "nie można pobrać wszystkich plików"
+
+#: src/modules/internet/libcurl.c:727
+msgid "cannot read from connection"
+msgstr "nie można czytać z połączenia"
+
+#: src/modules/internet/libcurl.c:763
+msgid "cannot open connection"
+msgstr "nie można otworzyć połączenia"
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 "metoda 'url(method = \"libcurl\")' nie jest obsługiwana na tej platformie"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: zbyt długi (niepoprawny?) URL"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "usuwanie informacji o proxy FTP"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "używanie proxy FTP '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: zbyt długi (niepoprawny?) URL"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "nie można określić adresu hosta"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "nie udało się połączyć z serwerem"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "nie udało się uzyskać odpowiedzi z serwera"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "'RxmlNanoFTPGetConnection': nie udało się utworzyć gniazda"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "nie udało się utworzyć połączenia danych"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "nie udało się powiązać portu"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "nie udało się nasłuchiwać na porcie %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: zbyt długi (niepoprawny?) URL"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "usuwanie informacji o proxy HTTP"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "używanie proxy HTTP '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: zbyt długi (niepoprawny?) URL"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "nie można rozwiązać '%s'"
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "połączono z '%s' na porcie %d."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "nie można połączyć się z '%s' na porcie %d."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "przekieruj do: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "zbyt dużo przekierowań, przerywanie ..."
 
@@ -7144,26 +7196,31 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument poza zakresem?\n"
+"bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Argument poza zakresem?\n"
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
 #, c-format
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): precyzja utracona w wyniku\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr "'besselJ(x, nu)': 'nu=%g' jest zbyt duże dla algorytmu 'bessel_j()'"
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "błąd przydziału 'bessel_j'"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument poza zakresem?\n"
+"bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Argument poza zakresem?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): precyzja utracona w wyniku\n"
@@ -7174,26 +7231,31 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument poza zakresem?\n"
+"bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Argument poza zakresem?\n"
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
 #, c-format
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): precyzja utracona w wyniku\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr "'besselY(x, nu)': 'nu=%g' jest zbyt duże dla algorytmu 'bessel_y()'"
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "błąd przydziału 'bessel_y'"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
-"bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argument poza zakresem?\n"
+"bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Argument poza zakresem?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): precyzja utracona w wyniku\n"
@@ -7203,42 +7265,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr "'k' (%.2f) musi być liczbą całkowitą, zaokrągloną do %.0f"
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "argument spoza dziedziny w '%s'\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "wartość poza zakresem w '%s'\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "uzbieżnienie nie powiodło się w '%s'\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "pełna precyzja może nie zostać osiągnięta w '%s'\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "wystąpił niedomiar w '%s'\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() zwróciło kod błędu %d"
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr "pnbinom_mu() -> bratio() zwróciło kod błędu %d"
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): nie uzbieżnił się w %d iteracjach."
@@ -7314,7 +7376,7 @@
 "Jawne leniwe dynamiczne ładowanie nie jest obsługiwane na tej platformie. "
 "Używanie domyślnego."
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "nie można uzyskać dostępu do katalogu roboczego"
 
@@ -7330,12 +7392,12 @@
 "Pojawił się niezwykły przypadek podczas zagnieżdżania wejścia 'readline'. "
 "Proszę zgłosić raport używając bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "problem z zapisaniem pliku historii '%s'"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7344,87 +7406,123 @@
 "Nie można otworzyć pliku '%s': %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "argument 'file' jest zbyt długi"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "brak dostępnego mechanizmu historii"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "problem z przycięciem pliku historii"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "brak dostępnej historii do zapisania"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "niepoprawna sygnatura czasu"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "oczekiwano niepustego argumentu tekstowego"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' musi być wartością logiczną oraz nie może być wartością NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "nie można otworzyć '%s', prawdopodobny powód '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 "linia %d może zostać przycięta w wywołaniu w systemie (, intern = TRUE)"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "błąd w uruchamianym poleceniu: '%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "błąd podczas uruchamiania polecenia"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 "działające polecenie '%s' otrzymało status %d oraz komunikat błędu '%s'"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "'Sys.info()' nie jest zaimplementowane w tym systemie"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "OSTRZEŻENIE: zignorowano --gui lub -g bez wartości"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "OSTRZEŻENIE: nieznane gui '%s', używanie X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "OSTRZEŻENIE: nieznane gui '%s', nie używam żadnego\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "tworzenie pliku tymczasowego dla '-e' nie powiodło się"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "OSTRZEŻENIE: Edytowanie tylko pierwszego pliku na liście"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "argument 'what' musi być łańcuchem tekstowym lub funkcją"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "gniazda nie są dostępne w tym systemie"
+
+#~ msgid "no function to restart"
+#~ msgstr "brak funkcji którą można zrestartować"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "argument musi być zamknięciem"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "argument 'hostname' musi być wektorem tekstowym o długości 1"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "'nsl()' nie był w stanie nawiązać połączenia z hostem '%s'"
+
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "nieznany format zwrócony przez funkcję C 'gethostbyname()'"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "'nsl()' nie jest obsługiwany na tej platformie"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "zbyt duży zakres wartości w 'x'"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "argument nieliczbowy"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "niewspierany schemat adresu URL"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' musi być listą"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' musi być listą"
 
@@ -8127,9 +8225,6 @@
 #~ msgid "invalid multibyte input string %d"
 #~ msgstr "niepoprawny wielobajtowy łańcuch wejściowy %d"
 
-#~ msgid "invalid multibyte string '%s'"
-#~ msgstr "niepoprawny wielobajtowy łańcuch '%s'"
-
 #~ msgid "NA values introduced by coercion"
 #~ msgstr "pojawiły się wartości NA na skutek przekształcenia"
 
@@ -8456,15 +8551,9 @@
 #~ msgid "there is no '.Internal' function '%s'"
 #~ msgstr "brak wewnętrznej (.Internal) funkcji '%s'"
 
-#~ msgid "bad character 'switch()' offsets"
-#~ msgstr "błędne przesunięcia znakowe 'switch()'"
-
 #~ msgid "bad 'switch()' names"
 #~ msgstr "niepoprawne nazwy 'switch()'"
 
-#~ msgid "bad numeric 'switch()' offsets"
-#~ msgstr "błędne przesunięcia liczbowe w funkcji 'switch()'"
-
 #~ msgid "unknown instruction code"
 #~ msgstr "nieznany kod instrukcji"
 
diff -Nru r-base-3.2.3/src/library/base/po/pt_BR.po r-base-3.3.1/src/library/base/po/pt_BR.po
--- r-base-3.2.3/src/library/base/po/pt_BR.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/pt_BR.po	2016-04-27 22:15:36.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:56-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -128,174 +128,175 @@
 msgid "problem in displaying '%ls'"
 msgstr "problema ao mostrar '%ls'"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argumento '%s' inválido"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "versão do Windows não suportada"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "argumento incorreto"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "não seja tolo!: seu computador tem um limite de endereçamento de 4Gb"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "não foi possível diminuir o limite de memória: ignorado"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' deve ser um vetor de caracteres"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "dispositivo inválido"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "modo SDI requerido"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "número de dispositivo gráfico inválido"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "dispositivo defeituoso"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 #, fuzzy
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "entrada inválida em Rmbstowcs"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "escolha de arquivo cancelada"
 
@@ -337,189 +338,188 @@
 msgid "'names' is not a character vector"
 msgstr "'fmt' não é um vetor de caracteres"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "cadeia de caracteres esperada como primeiro argumento"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "cadeia de caracteres esperada como terceiro argumento"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "execução do comando '%s' teve status %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "período da sessão atingiu tempo limite"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "tempo limite atingido"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "tempo limite de sessão na CPU atingido"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "tempo limite da CPU atingido"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Erro fatal: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "codificação '%s' não reconhecida"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<ERRO: re-codificação falhou a partir da codificação '%s'> \n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "não foi possível abrir o arquivo '%s': %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): arquivo '%s' não existe\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, fuzzy, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "ATENÇÃO: valor '%s' é inválido: ignorado\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "ATENÇÃO: faltando argumento max-mem-size\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "ATENÇÃO: valor de --max-mem-size é inválido: ignorado\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "ATENÇÃO: --max-mem-size=%lu'%c': muito grande e ignorado\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "ATENÇÃO: max-mem-size =%4.1fM muito pequeno e ignorado\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "ATENÇÃO: max-mem-size =%4.0fM muito grande e tomando como %uM\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "operações binárias requerem dois argumentos"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "operações binárias requerem dois argumentos"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "ATENÇÃO: '-e %s' omitido na entrada é muito grande\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "ATENÇÃO: opção desconhecida '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGUMENTO '%s' __ignorado__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "não é possível usar -e com -f ou --file"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "criação de tmpfile falho -- tente definir TMPDIR adequadamente?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "você deve especificar '--save', '--no-save' ou '--vanilla'"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "impossível criar 'reader thread'; você deve liberar algum recurso do sistema"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "índice fora de limites"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "objeto de tipo '%s' não possível dividir em subconjuntos"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 #, fuzzy
 msgid "WARNING: no value given for --encoding"
 msgstr "ATENÇÃO: nenhum valor especificado para --encoding\n"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, fuzzy, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "ATENÇÃO: opção '%s' não mais suportada\n"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, fuzzy, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "ATENÇÃO: nenhum valor especificado para '%s'\n"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, fuzzy, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "ATENÇÃO: valor '%s' é inválido: ignorado\n"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, fuzzy, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "ATENÇÃO: %s: muito grande e ignorado\n"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 #, fuzzy
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "ATENÇÃO: nenhum valor especificado para '--max-ppsize'\n"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "ATENÇÃO: valor de '--max-ppsize' negativo: ignorado\n"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "ATENÇÃO: valor de '--max-ppsize' é muito pequeno: ignorado\n"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "ATENÇÃO: valor de '--max-ppsize' é muito grande: ignorado\n"
@@ -628,7 +628,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "não foi possível alocar espaço para 'name'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "esperado um argumento caractere"
 
@@ -686,7 +686,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "problema ao definir fuso horário"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "argumento 'code' deve ser uma string de caracteres"
@@ -717,9 +717,9 @@
 msgid "invalid multibyte format string"
 msgstr "string de formato multibyte inválida"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -731,7 +731,7 @@
 msgstr "'title' deve ser uma string de caracteres"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "expressão regular é inválida nesse locale"
 
@@ -742,8 +742,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "string de entrada %d é inválida nesse locale"
@@ -751,7 +751,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "argumento '%s' será ignorado"
@@ -766,7 +766,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "string de entrada %d é inválida nesse locale"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, fuzzy, c-format
 msgid "regcomp error: '%s'"
 msgstr "erro regcomp:  '%s'"
@@ -776,29 +776,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "FUN.VALUE deve ser um vetor"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "valor de '%s' inválido"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "comprimento inválido"
 
@@ -834,7 +834,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<value>) não é NULL nem uma lista de comprimento %d"
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "NaNs produzidos"
 
@@ -847,110 +847,110 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "provável perda completa de precisão no módulo"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "NAs produzidos por estouro de inteiro"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "operador precisa de um ou dois argumentos"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "argumento não-numérico para operador binário"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "arrays de dimensão não compatível"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "séries temporais não compatíveis"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 "comprimento do objeto maior não é múltiplo do comprimento do objeto menor"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "argumento inválido para operador unário"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "operador unário ilegal"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "função real de 1 argumento não implementada"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "função complexa não implementada"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "função real de %d argumentos numéricos não implementada"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d argumentos passados para '%s', que requer 1 ou 2"
 msgstr[1] "%d argumentos passados para '%s', que requer 1 ou 2"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "segundo argumento inválido com comprimento zero"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "argumento \"%s\" ausente, sem padrão"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "argumento 'base' inválido com comprimento zero"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, fuzzy, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data' deve ser de tipo vetor"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "extensão matricial não numérica"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "valor de 'nrow' inválido (muito grande ou NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "valor 'nrow' inválido (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "valor de 'ncol' inválido (muito grande ou NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "valor de 'ncol' inválido (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
@@ -958,7 +958,7 @@
 "comprimento dos dados [%d] não é um submúltiplo ou múltiplo do número de "
 "linhas [%d]"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
@@ -967,104 +967,104 @@
 "comprimento dos dados [%d] não é um submúltiplo ou múltiplo do número de "
 "colunas [%d]"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "comprimento dos dados excede o tamanho da matrix"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "elementos demais especificados"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "extensão negativa para matrix"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: muitos elementos especificados"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "extensão negativa para array 3D"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 #, fuzzy
 msgid "'alloc3Darray': too many elements specified"
 msgstr "alloc3Darray: muitos elementos especificados"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 #, fuzzy
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "allocArray: muitos elementos especificados pelas 'dims'"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x' deve ser um vetor de caracteres"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, fuzzy, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "um objeto do tipo matriz é requerida como argumento para 'row/col'"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "requer argumentos numéricos/complexos matriz/vetor"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "argumentos não compatíveis"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "argumento não é uma matriz"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "primeiro argumento inválido: deve ser um array"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, fuzzy, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' tem comprimento errado"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a' não tem nomes de dimensões"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, fuzzy, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "perm[%d] não corresponde a um nome de dimensão"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "valor fora de limites em 'perm'"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'resize' deve ser TRUE ou FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' deve ser numérico"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "'object' é muito curto"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 #, fuzzy
 msgid "'dims' cannot be of length 0"
 msgstr "'hadj' deve ter comprimento 1"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 #, fuzzy
 msgid "'x' must have positive length"
 msgstr "'value' deve ter comprimento positivo"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1127,150 +1127,151 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "tentativa de especificar um atributo 'class' inválido"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "argumento 'names' incompatível"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "tipo inválido (%s) para especificar atributo 'names'"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' aplicado a um objeto diferente de array"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' deve ser uma lista"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' deve ser uma lista"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "comprimento de 'dimnames' [%d] deve ser o mesmo de 'dims' [%d]"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "tipo inválido (%s) para 'dimnames' (deve ser um vetor)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "comprimento de 'dimnames' [%d] não é igual ao tamanho do array"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "primeiro argumento inválido"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "segundo argumento inválido"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "vetor de dimensões de comprimento 0 é inválido"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "as dimensões contem valores faltantes"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "as dimensões contem valores negativos"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 #, fuzzy
 msgid "dims do not match the length of object"
 msgstr "dims [produto %d] não corresponde ao comprimento do objeto [%d]"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "dims [produto %d] não corresponde ao comprimento do objeto [%d]"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "atributos devem ser uma lista ou NULL"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "os atributos devem ter nome"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "todos os atributos devem ter nome [%d não tem]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "atributo 'which' deve ser de modo caractere"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "exatamente 1 atributo 'which' deve ser especificado"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "correspondência parcial de '%s' para '%s'"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, fuzzy, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "tipo ou compriento inválido para nome de slot"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name' deve ser uma cadeia de caracteres não nula"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "tipo ou compriento inválido para nome de slot"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 "não é possível conseguir um slot (\"%s\") para um objeto do tipo \"%s\""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "nenhum slot de nome \"%s\" para esse objeto de classe \"%s\""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "tentativa de especificar um slot em um objeto NULL"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 #, fuzzy
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "classes formais não podem ser utilizadas sem o pacote methods"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1279,7 +1280,7 @@
 "tentativa de obter um slot \"%s\" de um objeto de uma classe básica (\"%s\") "
 "sem slots"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1288,46 +1289,46 @@
 "tentativa de obter um slot \"%s\" de um objeto cuja classe (\"%s\") não é um "
 "objeto S4 "
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "tipo '%s' não está implementado em '%s'"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "argumento formal repetido 'recursive'"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "argumento formal repetido 'use.names'"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "argumento não é uma lista"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "nome da classe muito longo em '%s'"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "não é possível criar uma matriz a partir desses tipos"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "número de linhas das matrizes devem ser iguais (veja arg %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "números de colunas das matrizes devem ser iguais (veja arg %d)"
@@ -1336,234 +1337,254 @@
 msgid "vector size cannot be NA"
 msgstr "tamanho de vetor não pode ser NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "tamanho de vetor não pode ser NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "tamanho de vetor não pode ser infinito"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "tamanho de vetor especificado é muito grande"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "uso do ambiente NULL não é mais permitido"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "argumento não deve ser uma função"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "objeto substituto não é um ambiente"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' deve ser um ambiente"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "argumento não é um ambiente"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "o ambiente vazio não tem pai"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "não é possível ajustar o pai do ambiente vazio"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "não é possível ajustar o pai do ambiente vazio"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "não é possível ajustar o pai do ambiente vazio"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' não é um ambiente"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "não é possível escrever nessa conexão"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "especificação '%s' inválida"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "argumento 'fill' não positivo será ignorado"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "argumento %d (tipo '%s') não suportado por 'cat'"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "vector: não é possível criar um vetor de modo '%s'."
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr ""
 "não é possível especificar o comprimento de um objeto que não seja vetor"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "argumento inválido"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "valor inválido"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' usado em um contexto incorreto"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, fuzzy, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "padrões de alternação duplicados: '%s' e '%s'"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "'EXPR' faltante"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR deve ser um vetor de comprimento 1"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+#, fuzzy
+msgid "'switch' with no alternatives"
+msgstr ""
+"expressão numérica (EXPR) requerida para switch() sem alternativas nomeadas"
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d argumentos passados para '%s', que requer %d"
 msgstr[1] "%d argumentos passados para '%s', que requer %d"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s' requer um vetor de caracteres"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "string multibyte inválida %d"
 
-#: src/main/character.c:203
-#, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:159
+#, fuzzy, c-format
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 "número de caracteres não é computável para elemento %d em codificação \"bytes"
 "\""
 
-#: src/main/character.c:232
-#, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:188
+#, fuzzy, c-format
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr "width não é computável para elemento %d em codificação \"bytes\""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 "tentativa de extrair substrings de um objeto de modo diferente de caractere"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 #, fuzzy
 msgid "invalid substring arguments"
 msgstr "argumento de substring inválido"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "nomes de modo não caractere"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "substituição de substrings em um objeto de modo diferente de caractere"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "primeiro argumento deve ser um vetor de caracteres"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abbreaviate usado com caracteres não-ASCII"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "nomes de modo não caractere"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "string multibyte inválida %d"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "argumento modo não caractere"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "especificação de intervalo decrescente ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "especificação de intervalo decrescente ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "string UTF-8 'old' inválida "
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "string multibyte inválida 'old'"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "string UTF-8 'new' inválida"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "string multibyte inválida 'new'"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old' é maior que 'new'"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "string de entrada multibyte %d inválida"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim() requer um vetor de caracteres"
 
@@ -1575,7 +1596,7 @@
 msgid "applies only to lists and vectors"
 msgstr "se aplica somente a listas e vetores"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "NAs introduzidos por coerção"
 
@@ -1584,7 +1605,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "NAs introduzidos por coerção"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "partes imaginárias descartadas na coerção"
 
@@ -1592,119 +1613,115 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "valores fora do limite considerados como 0 na coerção para tipo raw"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "dado inválido de modo '%s' (muito curto)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "objeto do tipo 'pairlist' não é coercível para tipo '%s'"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "objeto (list) não é coercível para tipo '%s'"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "objeto (symbol) não é coercível para tipo '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "nenhum método para coerção desta classe S4 para vetor"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "ambientes não são coercíveis para outros tipos"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "tentativa de fazer coerção de objeto não-fator"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "lista esperada como argumento"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "ambiente inválido"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "argumento deve ter comprimento de pelo menos 1"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "corpo inválido para função"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "argumento de comprimento 0 inválido"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "argumento lista inválido"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "tipo \"single\" não implementado em R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "predicativo não implementado"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() aplicado a um objeto diferente de lista ou vetor de tipo '%s'"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, fuzzy, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "tipo não implementado '%s' em '%s'\n"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "'name' ausente"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "primeiro argumento deve ser uma string de caracteres"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what' deve ser uma cadeia de caracteres ou uma função"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'title' deve ser uma cadeia de caracteres"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "'args' deve ser uma lista"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' deve ser uma lista"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' deve ser um ambiente"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "ambiente inválido especificado"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "Definindo class(x) para NULL;   resultado não será mais um objeto S4"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1713,7 +1730,7 @@
 "Definindo class(x) para múltiplas strings (\"%s\", \"%s\", ...); resultado "
 "não será mais um objeto S4"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1722,11 +1739,11 @@
 "Definindo class(x) para \"%s\" define o atributo como NULL; resultado não "
 "será mais um objeto S4"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "objeto substituto inválido para ser da classe string"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1734,7 +1751,7 @@
 "\"%s\" só pode ser especificada como classe se o objeto tiver esse tipo;"
 "encontrado \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1743,38 +1760,38 @@
 "inválido especificar a classe como matriz a não ser que o atributo de "
 "dimensão tenha comprimento 2 (%d encontrado)"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "impossível especificar a classe como \"array\" a não ser que o atributo de "
 "dimensão tenha comprimento > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value' deve ser um caractere não nulo"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "inválido mudar o modo de armazenamento de um fator"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "operador complexo unário inválido"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "operação complexa não implementada"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "argumento não numérico para função"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "coeficiente polinomial inválido"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "código para encontrar a raiz falhou"
 
@@ -1786,7 +1803,7 @@
 msgid "connection not found"
 msgstr "conexão não encontrada"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "conexão inválida"
 
@@ -1795,9 +1812,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "encerrando conexão não utilizada %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "conversão não suportada de '%s' para '%s'"
@@ -1879,8 +1896,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "bloco especificado é muito grande"
 
@@ -1910,8 +1927,8 @@
 msgstr "alocação de conexão fifo falhou"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "somente o primeiro elemento de 'description' foi utilizado"
 
@@ -1923,14 +1940,14 @@
 "anterior"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "não é possível abrir a conexão"
@@ -2000,7 +2017,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "alocação de conexão bzfile falhou"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "não foi possível inicializar decodificador lzma, erro %d"
@@ -2021,12 +2038,12 @@
 msgstr ""
 "este é um arquivo comprimido %s que não é compatível com esta versão do R"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "alocação de memória para cópia da área de transferência falhou"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "área de transferência não pode ser aberta ou não contem texto"
 
@@ -2132,269 +2149,269 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' não é uma conexão de saída textConnection"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "soquetes não estão disponíveis nesse sistema"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' não é uma conexão"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "não é possível abrir conexões padrão"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "conexão já está aberta"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "valor 'rw' desconhecido"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "não foi possível fechar conexões padrão"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 #, fuzzy
 msgid "cannot close 'output' sink connection"
 msgstr "não foi possível fechar conexão de saída sink"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 #, fuzzy
 msgid "cannot close 'message' sink connection"
 msgstr "não foi possível fechar mensagens de conexão sink"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "conexão não está aberta"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 #, fuzzy
 msgid "line longer than buffer size"
 msgstr "Linha mais longa que o tamanho do buffer"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "não é possível ler a partir desta conexão"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "não foi possível alocar buffer em readLines"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "linha final incompleta encontrada em '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "muito poucas linhas lidas em readLines"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "string incompleta no final do arquivo foi descartada"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 "terminador nulo não encontrado: quebrando a string depois de 10.000 bytes"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "só é possível ler a partir de uma conexão binária"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "mudança de tamanho não é suportada para vetores complexos"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "tamanho %d é desconhecido nessa máquina"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw é sempre de tamanho 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x' não é um vetor do tipo atômico"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "só é possível escrever em uma conexão binária"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "somente 2^31-1 bytes podem ser escritos em um vetor raw"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 #, fuzzy
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "somente 2^31-1 bytes podem ser escritos em uma única chamada readBin()"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "problema escrevendo na conexão"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "mudança de tamanho não é suportada para vetores de tipo raw"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "entrada UTF-8 inválida em readChar()"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "somente possível ler bytes em um locale não UTF-8 MBCS"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "'object' é muito curto"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: mais bytes requeridos do que presentes na string - será "
 "preenchida com zeros"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: mais caracteres requeridos do que presentes na string - será "
 "preenchida com zeros"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 #, fuzzy
 msgid "maximum number of pushback lines exceeded"
 msgstr "número máximo de cores atingido"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 #, fuzzy
 msgid "could not allocate space for pushback"
 msgstr "não foi possível alocar espaço para pushBack"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "só é possível voltar atrás em conexões abertas para leitura"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "só é possível voltar atrás em conexões de modo texto"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "pilha sink cheia"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "não é possível trocar saída para stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "nenhum sink para remover"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 #, fuzzy
 msgid "there is no connection NA"
 msgstr "não há conexão %d"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "não há conexão %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "nsl() não é suportado nessa plataforma"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 "file(\"\") permite somente open = \"w+\" e open = \"w+b\": usando a segunda "
 "opção"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "ICU não é suportado nessa plataforma"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "fluxo de arquivo não contém o número mágico gzip"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "fluxo de arquivo não contem um cabeçalho gzip válido"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "erro na escrita enquanto esvaziando conexão 'gzcon'"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "erro crc %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "erro de escrita na conexão 'gzcon'"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' deve estar em 0 ... 9"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression' deve ser TRUE ou FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x' deve ser TRUE ou FALSE"
+
+#: src/main/connections.c:5502
 #, fuzzy
 msgid "this is already a 'gzcon' connection"
 msgstr "esta já é uma conexão gzcon"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "só é possível usar conexões binárias read- ou write-"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr "uso de uma conexão 'file' em modo texto pode não funcionar"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 #, fuzzy
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
@@ -2403,76 +2420,72 @@
 "não é possível criar uma conexão gzcon a partir de uma conexão de texto do "
 "tipo escrita; talvez use rawConnection"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "alocação de conexão 'gzcon' falhou"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "não é uma lista de soquetes"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "indicadores de escrita defeituosos"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "não é uma conexão soquete"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "compressão desconhecida, assumindo nenhuma"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, fuzzy, c-format
 msgid "allocation of %s connection failed"
 msgstr "alocação de conexão raw falhou"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 #, fuzzy
 msgid "no loop for break/next, jumping to top level"
 msgstr "nenhum loop de onde escapar, pulando para o nível superior"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "nenhuma função da qual retornar, pulando para o nível superior"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "contexto de destino não está na pilha"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "não há tantas estruturas na pilha"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "somente valores positivos são permitidos para 'n'"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "nenhuma função para reiniciar"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "número de contextos deve ser positivo"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "nenhum contexto do navegador para consultar"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "não há tantas chamadas para o navegador ativas"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "não há tantas funções na pilha de chamada"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "erro interno em 'do_sys'"
 
@@ -2482,40 +2495,40 @@
 msgstr ""
 "Estouro da capacidade de inteiro em 'cumsum'; use cumsum(as.numeric(.))"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 #, fuzzy
 msgid "'cummax' not defined for complex numbers"
 msgstr "min/max não definido para números complexos"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 #, fuzzy
 msgid "'cummin' not defined for complex numbers"
 msgstr "min/max não definido para números complexos"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "função cumxxx desconhecida"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "problema ao definir fuso horário"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "não é possível especificar fuso horários nesse sistema"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "problema ao remover fuso horário"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 #, fuzzy
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "componente de comprimento zero em estrutura POSIXlt não vazia"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "não foi possível alocar memória para 'read.dcf'"
 
@@ -2530,11 +2543,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "Linha começando com '%s ...' está mal formada!"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "argumento deve ser um objeto do tipo closure"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "argumento deve ser uma função"
 
@@ -2543,7 +2552,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x' deve ser TRUE ou FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "argumento não deve ser uma função"
 
@@ -2560,61 +2569,61 @@
 msgstr ""
 "'tracemem' não é útil para referências fracas ou objetos de ponteiro externos"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R não foi compilado com suporte a perfilamento de memória"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "muitos poucos argumentos"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 #, fuzzy
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "'cutoff' inválido para deparse, usando o padrão"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "análise de objeto S4 não pode ser carregado com source()"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "deparse pode ser incompleto"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "análise não pode ser carregada com source() no R < 2.7.0"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "'what' deve ser uma cadeia de caracteres ou uma função"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "muito poucos caracteres escritos"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "argumentos do tipo caractere esperados"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 #, fuzzy
 msgid "zero-length argument"
 msgstr "argumento de comprimento zero"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts' deve ser um inteiro pequeno não negativo"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "objeto '%s' não encontrado"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "expressão funcional mal formada"
 
@@ -2627,15 +2636,15 @@
 msgid "no active or default device"
 msgstr "nenhum dispositivo ativo ou padrão"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "muitos dispositivos abertos"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "não há memória suficiente para alocar dispositivo (em GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "Aperte <Enter> para ver o próximo gráfico: "
 
@@ -2725,7 +2734,7 @@
 msgid "too many arguments, sorry"
 msgstr "argumentos de mais, desculpe"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "estado gráfico inválido"
 
@@ -2880,7 +2889,7 @@
 msgid "invalid argument to edit()"
 msgstr "argumento inválido para edit()"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "não é possível abrir arquivo"
 
@@ -2944,12 +2953,12 @@
 msgstr "nenhum sistema gráfico para desregistrar"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "terminador de linha inválido"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "junção de linha inválida"
 
@@ -2982,84 +2991,98 @@
 msgid "raster capture is not available for this device"
 msgstr "%s não está disponível para este dispositivo"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "face de fonte %d não suportada para a família de fonte '%s'"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "nenhum dispositivo gráfico está ativo"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "valor pch '%d' é inválido nesse locale"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "valor pch '%d' não implementado"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "extensão para eixos inválida [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "extensão infinita para eixos [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 #, fuzzy
 msgid "display list redraw incomplete"
 msgstr "Exibição do redesenho da lista incompleta"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "argumento lista inválido"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "argumento 'expr' deve ser uma expressão"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "argumento 'list' deve ser uma lista"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "argumento 'env' deve ser um ambiente"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "caractere multibyte inválido em pch=\"c\""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "valor de dígito hexa inválido em 'color' ou 'lty'"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "linha de tipo inválida: deve ter comprimento 2, 4, 6 ou 8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "tipo de linha inválida: zeros não são permitidos"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "linha de tipo inválido"
 
@@ -3068,7 +3091,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "não é possível mudar o valor de vinculo bloqueado para '%s'"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "não é possível adicionar vinculações a um ambiente bloqueado"
 
@@ -3084,434 +3107,430 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "desvincular no ambiente base não está implementado"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "não é possível desfazer vinculações de um ambiente bloqueado"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "argumento para '%s' não é um ambiente"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, fuzzy, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "A lista ... não contém %d elementos"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d usado em um contexto incorreto, nenhum ... para procurar"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "não foi possível encontrar a função \"%s\""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "não é possível atribuir valores no ambiente vazio"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "não é possível atribuir variáveis a essa base de dados"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "não é possível adicionar vinculação de '%s' ao ambiente base"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "apenas o primeiro elemento é usado como nome da variável"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "primeiro argumento deve ser uma lista nomeada"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "names(x) deve ser um vetor de caracter de mesmo comprimento que x"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 #, fuzzy
 msgid "'envir' argument must be an environment"
 msgstr "argumento 'env' deve ser um ambiente"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "não é possível remover variáveis do espaço de nomes base"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "não é possível remover variáveis do ambiente base"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "não é possível remover variáveis do ambiente vazio"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "não é possível remover variáveis dessa base de dados"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "objeto '%s' de modo '%s'  não foi encontrado"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "nome inválido na posição %d"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "segundo argumento deve ser um ambiente"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "comprimento errado para argumento '%s'"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "uso inválido de 'missing'"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' só pode ser usado para argumentos"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos' deve ser um inteiro"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "todos os elementos de uma lista devem ser nomeados"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach' só funciona para listas, data frames e ambientes"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "detach de \"package:base\" não é permitido"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "argumento deve ser um ambiente"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "argumentos devem ser simbólicos"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "nenhum ambiente abrangente"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "nenhum item \"%s\" na lista de procura"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "uso de 'as.environment(NULL)' não é mais permitido"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "objeto S4 não estende classe \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "objeto inválido para 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "não é um ambiente"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "não é um símbolo"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "nenhuma vinculação para \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "não é uma função"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "símbolo já tem uma vinculação regular"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "não é possível mudar a vinculação ativa se o vínculo estiver bloqueado"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "operador não conhecido"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "não é possível desvincular uma vinculação bloqueada"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "não é possível desvincular uma vinculação ativa"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 #, fuzzy
 msgid "bad namespace name"
 msgstr "nome de espaço de nomes inválido"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 #, fuzzy
 msgid "namespace already registered"
 msgstr "espaço de nomes já registrado"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 #, fuzzy
 msgid "namespace not registered"
 msgstr "espaço de nomes não registrado"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "argumento de importação de ambiente inválido"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "argumento de exportação de ambiente inválido"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "comprimentos dos nomes de importação e exportação devem ser iguais"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "símbolo exportado '%s' não tem valor"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "codificação não suportada: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "cadeia de caracteres com nul incluso: '%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "interrupções suspendidas; sinal ignorado"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "opção inválida \"warning.expression\""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(convertido do aviso) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "Aviso: %s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "Aviso em %s : %s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Mensagens de aviso perdidas\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Mensagens de aviso perdidas:\n"
 msgstr[1] "Mensagens de aviso perdidas:\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "Houve %d avisos (use warnings() para vê-los)\n"
 msgstr[1] "Houve %d avisos (use warnings() para vê-los)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr "Houve 50 ou mais avisos (use warnings() para ver os primeiros 50)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "Erros durante o embrulho: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Erro em "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "Erro em "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Erro: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "Além disso: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "opção inválida \"error\"\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Execução interrompida\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep' deve ser uma string de caracteres"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [string inválida em stop(.)]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [string inválida em warning(.)]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "número de argumentos inválidos para \"%s\""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "recurso não implementado em %s"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "número inválido de argumentos"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "argumento de tipo inválido"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "comprimento de séries temporais/vetor incompatível"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "argumentos incompatíveis"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "erro desconhecido (avise isso!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "conversão inteira inacurada na coerção"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "aviso desconhecido (avise isso!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "Nenhuma função de onde retornar, pulando para o nível superior"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "nível superior inconsistente?"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "manipulador de dados defeituoso"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "mensagem de erro não é uma string"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 "incompatibilidade no manipulador ou pilha de reinício durante o reinício "
 "antigo"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "mensagem de erro inválida"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "reinício defeituoso"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "reínicio não está na pilha"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "não está em um contexto try"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "mensagem de erro deve ser uma cadeia de caracteres"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: não é possível abrir o arquivo de perfil '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "Verificação de desempenho do R não está disponível nesse sistema"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
@@ -3519,263 +3538,271 @@
 "promessa já está sendo avaliada: referência de argumento padrão recursivo ou "
 "problemas anteriores?"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "reiniciando promessa interrompida de avaliação"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr "avaliação aninhada demais; recursão infinita / options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "argumento ausente, sem padrão"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "tentativa de aplicar uma não-função"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s em %s#%d: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "argumento %d está vazio"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 "não foi possível encontrar o símbolo \"%s\" no ambiente da função genérica"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "símbolo \"%s\" não está no ambiente do método"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr ""
 "a condição tem comprimento > 1 e somente o primeiro elemento será usado"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "valor ausente onde TRUE/FALSE necessário"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "argumento não é interpretável como lógico"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "argumento tem comprimento zero"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "variável loop não simbólica"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "seqüência de loop for() inválida"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "retornos com múltiplos argumentos não são permitidos"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "lado esquerdo de atribuição inválido (NULL)"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "destino da atribuição expande para um objeto fora da linguagem"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "nome longo demais em '%s'"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "não é possível fazer atribuições complexas no espaço de nomes base"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "não é possível fazer atribuições complexas no ambiente base"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "função inválida em uma atribuição complexa"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "lado esquerdo da atribuição inválida (do_set)"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "'%s' faltante"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "lista de argumento formal inválida para \"function\""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, fuzzy, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "argumento '%s' inválido"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "argumento 'envir' numérico não tem comprimento um"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "reinícios não suportados em 'eval'"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' chamada fora de um fechamento"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "valor em '...' não é uma promessa"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Métodos incompatíveis (\"%s\", \"%s\") para \"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "erro de despacho no despacho em grupo"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "'%s' não é uma função %s"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "estouro da pilha de nós"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "estouro da pilha de inteiros"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 #, fuzzy
 msgid "bad opcode"
 msgstr "Código de operador defeituoso"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "tipo '%s' inválido em 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "incompatibilidade da versão bytecode; usando eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "versão bytecode é muito velha"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "versão bytecode é muito nova"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "incompatibilidade da versão bytecode"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "seqüência de argumentos inválida em loop for"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, fuzzy, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "nenhuma função interna \"%s\""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "função defeituosa"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "não é uma função NATIVA"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 #, fuzzy
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 "expressão numérica (EXPR) requerida para switch() sem alternativas nomeadas"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "não é possível encontrar um índice para código de endereço encadeado"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 #, fuzzy
 msgid "invalid body"
 msgstr "símbolo inválido"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "símbolo inválido"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "argumento não é um objeto bytecode"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "nome de arquivo inválido"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "não é possível abrir 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file' deve ser uma string não vazia"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' deve ser um valor lógico"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 #, fuzzy
 msgid "constant buffer must be a generic vector"
 msgstr "code deve ser um vetor genérico"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "cronômetro de desempenho em uso"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "análise de desempenho byte code já em andamento"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "especificação de um cronômetro de desempenho falhou"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "análise de desempenho bytecode não está em andamento"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "ICU não é suportado nessa plataforma"
@@ -3793,16 +3820,16 @@
 msgid "this graphics device does not support event handling"
 msgstr "este dispositivo gráfico não suporta gerenciamento de eventos"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "prompt inválido"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 #, fuzzy
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "uso recursivo de getGraphicsEvent não suportado"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "nenhum evento gráfico definido"
 
@@ -3995,7 +4022,7 @@
 msgstr "expressão regular inválida '%s'"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "string de entrada %d é inválida em UTF-8"
@@ -4088,26 +4115,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "rotinas de internet não podem ser acessadas dentro do módulo"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "rotinas de internet não podem ser carregadas"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "valor inválido"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "rotinas de soquete não podem ser carregadas"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "tentativa de especificar um atributo 'comment' inválido"
+
 #: src/main/lapack.c:39
 #, fuzzy
 msgid "LAPACK routines cannot be accessed in module"
@@ -4118,39 +4144,39 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "rotinas de soquete não podem ser carregadas"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 "operações são possíveis somente para tipos numéricos, lógicos ou complexos"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "operação binária em array de dimensão incompatível"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "série temporal não compatível"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "operador '%s' requer 2 argumentos"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "tipo de 'x' inválido em 'x %s y'"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "tipo de 'y' inválido em 'x %s y'"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "Operador unário `!' chamado com dois argumentos"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "coerção de argumento de tipo '%s' para lógico"
@@ -4159,65 +4185,79 @@
 msgid "dummy - do not translate"
 msgstr "dummy"
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "Erros durante o embrulho: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Execução interrompida\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "Erro: falha de segmentação na pilha C\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "não foi possível abrir o pacote base\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, fuzzy, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "não foi possível restaurar os dados presentes em .RData\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Durante a inicialização - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "não foi possível abrir o arquivo para leitura"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "não é possível sair do navegador"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 "uma das respostas a seguir esperada: \"yes\", \"no\", \"ask\" ou \"default\""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "save=\"ask\" em uso não-interativo: padrão da linha de comando será utilizado"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "valor de 'save' não reconhecido"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "'status' inválido, suposto 0"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "'runLast' inválido, suposto FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 "não foi possível alocar espaço para elemento do retorno de chamada de nível "
 "superior"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "índice negativo passado para R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "mensagens de aviso da chamada de tarefa de nível superior '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "chamada de tarefa de nível superior não retornou um valor lógico"
 
@@ -4261,166 +4301,171 @@
 msgstr[0] "argumento(s) não utilizado(s) %s"
 msgstr[1] "argumento(s) não utilizado(s) %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 "só é possível referenciar/finalizar objetos de referência de forma fraca"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "finalizador deve ser uma função ou NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "não é uma referência fraca"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "primeiro argumento deve ser um ambiente ou ponteiro externo"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "segundo argumento deve ser uma função"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "terceiro argumento deve ser 'TRUE' ou 'FALSE'"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "memória vetorial esgotada (limite atingido?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "memória do tipo cons esgotada (limite atingido?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "memória esgotada (limite atingido?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "não foi possível alocar um bloco de memória de tamanho %0.1f Gb"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "não foi possível alocar um bloco de memória de tamanho %0.1f Gb"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 #, fuzzy
 msgid "vector is too large"
 msgstr "tamanho de vetor especificado é muito grande"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "vetores de comprimento negativo não são permitidos"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "não foi possível alocar vetor de comprimento %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "tipo/comprimento inválido (%s/%d) na alocação de vetor"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "não é possível alocar vetor de tamanho %0.1f Gb"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "não é possível alocar vetor de tamanho %0.1f Mb"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "não é possível alocar vetor de tamanho %0.f Kb"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): estouro da proteção de pilha"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect(): somente %d itens protegidos"
 msgstr[1] "unprotect(): somente %d itens protegidos"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: ponteiro não encontrado"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] "unprotect(): somente %d itens protegidos"
 msgstr[1] "unprotect(): somente %d itens protegidos"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, fuzzy, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "Calloc não pôde alocar memória (%.0f de %u bytes)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, fuzzy, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "Realloc não pôde re-alocar memória (%.0f bytes)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "não é seguro retornar um ponteiro de vetor"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "valor inválido"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "avaliação do perfil de memória não está disponível nesse sistema"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: não é possível abrir o arquivo de perfil '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "argumento string requerido"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "não existe tal função primitiva"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "tentativa de usar um nome de variável com comprimento zero"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "nomes de variáveis são limitados a %d bytes"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "argumento .Internal() inválido"
 
@@ -4462,106 +4507,106 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "método não aplicável para '%s' aplicado a um objeto de classe \"%s\""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod' chamado fora de uma função"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod' chamado a partir de uma função anônima"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 "nenhuma chamada genérica foi encontrada: um método foi chamado diretamente?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' não é uma função, mas do tipo %d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "argumento ... errado"
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "objeto não especificado"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "função genérica não especificada"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 #, fuzzy
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "argumento genérico inválido para NextMethod"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 #, fuzzy
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "argumento 'group' inválido em NextMethod"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr "valor errado para .Method"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "Métodos incompatíveis ignorados"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "nenhum método para invocar"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "não é possível remover a classe de um ambiente"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "não é possível remover a classe de um ponteiro externo"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' deve ser um vetor de caracteres"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which' deve ser um vetor lógico de comprimento 1"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "use 'is()' ao invés de 'inherits()' em objetos S4"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 #, fuzzy
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'all.x' deve ser TRUE ou FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "impossível encontrar uma versão não genérica da função \"%s\""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 #, fuzzy
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 "standardGeneric chamada sem métodos de despacho habilitados (será ignorada)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 #, fuzzy
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 "argumento para standardGeneric deve ser uma string de caracteres não vazia"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4570,7 +4615,7 @@
 "chamada de standardGeneric(\"%s\") aparentemente não originada do corpo de "
 "uma função genérica"
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4579,11 +4624,11 @@
 "código de métodos primitivos inválido (\"%s\"): deve ser \"clear\", \"reset"
 "\", \"set\", ou \"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "objeto inválido: deve ser uma função primitiva"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4592,20 +4637,20 @@
 "a definição formal de uma genérica primitiva deve ser um objeto do tipo "
 "função (tipo %s obtido)"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, fuzzy, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "objeto \"%s\", retornado como função genérica, não parece ser tal"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "operação primitiva inválida para despacho"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "erro de despacho"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4614,86 +4659,91 @@
 "função primitiva \"%s\" foi especificada para métodos mas nenhuma função "
 "genérica foi fornecida"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "macro MAKE_CLASS em C foi chamada com um ponteiro NULL para string"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "fontes Hershey não podem ser carregadas"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "R_getClassDef(.) chamada com pointeiro NULL para string"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "macro NEW em C foi chamada com um ponteiro de definição de classe nulo"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "tentando gerar um objeto a partir de uma classe virtual (\"%s\")"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, fuzzy, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "Objeto de classe \"%s\" não corresponde a um objeto S3 válido"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "lista de opções corrompida"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "largura de impressão inválida, usando 80"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "dígitos para impressão inválidos, usando 7"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "valor inválido para \"device.ask.default\", usando FALSE"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "lista de argumentos não têm nomes válidos"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "parâmetro 'width' inválido, permitido %d... %d"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "parâmetro 'digits' inválido, permitido %d... %d"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "parâmetro 'expressions' inválido, permitido %d... %d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "valor inválido para '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec' deve ser um único caractere"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" foi substituído por \"device.ask.default\""
 
@@ -4718,11 +4768,16 @@
 msgid "first argument must be atomic"
 msgstr "primeiro argumento deve ser atômico"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec' deve ser um único caractere"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "Modo impossível ( x )"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "somente argumentos vetoriais atômicos permitidos"
 
@@ -4730,219 +4785,201 @@
 msgid "invalid filename specification"
 msgstr "especificação de nome de arquivo inválido"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "erro na escrita durante acréscimo a arquivo"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "nada para acrescentar"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "argumento nome de arquivo inválido"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "não foi possível criar arquivo '%s', motivo '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "primeiro nome de arquivo inválido"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "não foi possível remover o arquivo '%s', motivo '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "segundo nome de arquivo inválido"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "nada para vincular"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 #, fuzzy
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "links simbólicos não são suportados nessa plataforma"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, fuzzy, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "não foi possível criar o link simbólico de '%s' para '%s', motivo '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "não foi possível criar o link simbólico de '%s' para '%s', motivo '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 #, fuzzy
 msgid "symbolic links are not supported on this platform"
 msgstr "links simbólicos não são suportados nessa plataforma"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "não foi possível criar o link de '%ls' para '%ls', motivo '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, fuzzy, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "não foi possível criar o link simbólico de '%s' para '%s', motivo '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 #, fuzzy
 msgid "(hard) links are not supported on this platform"
 msgstr "links simbólicos não são suportados nessa plataforma"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 #, fuzzy
 msgid "expanded 'from' name too long"
 msgstr "nome da origem extendido muito longo"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 #, fuzzy
 msgid "expanded 'to' name too long"
 msgstr "nome da origem extendido muito longo"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "não foi possível renomear o arquivo '%s' para '%s', motivo '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "expressão regular inválida em 'pattern'"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "não foi possível determinar a localização do diretório inicial do R"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "nome de arquivo muito longo"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "condição de falta de memória interna"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "erro de leitura em '%s'"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "espeficação de 'LC_NUMERIC' pode fazer o R funcionar de forma estranha"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 "SO informa que a requisição para definir o locale como '%s' não pode ser "
 "honrada"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' deve ser um vetor de caracteres de comprimento 1"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "resolução de máquina '%s' impossível em nsl()"
-
-#: src/main/platform.c:2161
-#, fuzzy
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "formato desconhecido retornado por gethostbyname"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "nsl() não é suportado nessa plataforma"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' já existe"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "não foi possível criar o diretório '%s', motivo '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls' já existe"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "não foi possível criar o diretório '%ls', motivo '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "padrão de comprimento 0"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 #, fuzzy
 msgid "over-long path length"
 msgstr "padrão de comprimento 0"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode' deve ser de comprimento pelo menos um"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "suporte do SO insuficiente nesta plataforma"
 
@@ -4987,64 +5024,69 @@
 msgid "Metric information not available for this family/device"
 msgstr "Informação métrica não está disponível para esta família/dispositivo"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "especificação de 'na.print' inválida"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "rótulos de linhas inválidos"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "rótulos de colunas inválidos"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr "argumento não função para .Internal(print.function(.))"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' deve ser um inteiro não negativo"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "argumento interno 'tryS4' inválido"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "estouro do buffer de entrada na linha %d"
+
+#: src/main/print.c:1043
 #, fuzzy
 msgid "invalid character length in 'dblepr'"
 msgstr "comprimento de caractere inválido em dblepr"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 #, fuzzy
 msgid "invalid character length in 'intpr'"
 msgstr "comprimento de caractere inválido em intpr"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 #, fuzzy
 msgid "invalid character length in 'realpr'"
 msgstr "comprimento de caractere inválido em realpr"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 #, fuzzy
 msgid "memory allocation error in 'realpr'"
 msgstr "erro de alocação de memória em realpr"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "rotina BLAS/LAPACK '%6s' teve um erro de código %d"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "muitos poucos rótulos de linhas"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "muitos poucos rótulos de colunas"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, fuzzy, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
@@ -5052,7 +5094,7 @@
 msgstr[1] ""
 " [ atingido getOption(\"max.print\") -- últimas %d linhas omitidas ]]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 #, fuzzy
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "nsl() não é suportado nessa plataforma"
@@ -5061,48 +5103,48 @@
 msgid "argument is not a numeric vector"
 msgstr "argumento não é um vetor numérico"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "argumentos inválidos"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "NAs produzidos"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "NA em vetor de probabilidades"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "probabilidade não positiva"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "muito poucas probabilidades positivas"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "impossível tomar uma amostra maior que a população quando 'replace = FALSE'"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "número de probabilidades incorreto"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 #, fuzzy
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "'dirmark = TRUE' não é suportado nessa plataforma"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 #, fuzzy
 msgid "argument must be a character vector of length 1"
 msgstr "'hostname' deve ser um vetor de caracteres de comprimento 1"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 #, fuzzy
 msgid ""
 "argument should be a character vector of length 1\n"
@@ -5110,141 +5152,141 @@
 msgstr ""
 "argumento '%s' tem comprimento > 1 e somente o primeiro elemento será usado"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 #, fuzzy
 msgid "argument 'x' must be a raw vector"
 msgstr "primeiro argumento deve ser um vetor"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 #, fuzzy
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "'resize' deve ser TRUE ou FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 #, fuzzy
 msgid "argument 'shift' must be a small integer"
 msgstr "argumento 'size' deve ser um inteiro positivo"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 #, fuzzy
 msgid "argument 'x' must be an integer vector"
 msgstr "primeiro argumento deve ser um vetor de caracteres"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 #, fuzzy
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "argumento 'logarithm' deve ser lógico"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, fuzzy, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "argumento deve ser uma função"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 #, fuzzy
 msgid "argument 'x' must not contain NAs"
 msgstr "argumento não deve ser uma função"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 #, fuzzy
 msgid "invalid UTF-8 string"
 msgstr "string UTF-8 'old' inválida "
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "comparação (%d) é possível apenas para tipos lista ou atômicos"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "comparação não é permitida para expressões"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "comparação desses tipos não está implementada"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "comparação inválida com valores complexos"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 #, fuzzy
 msgid "'a' and 'b' must have the same type"
 msgstr "'data' deve ser de tipo vetor"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "erro de leitura"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "um erro de leitura I ocorreu"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "um erro de leitura R ocorreu"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "um erro de leitura C ocorreu"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "um erro de leitura S ocorreu"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "um erro de leitura ocorreu"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "nó não resolvido durante restauração"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 "erro de compatibilidade de restauração - sem compatibilidade com versão %d"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "tipo SEXP defeituoso no arquivo de dados"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "incompatibilidade de tipos"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "não foi possível encontrar a função \"%s\""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "não é possível salvar a posição do arquivo enquanto restaurando dados"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 "não é possível restaurar a posição do arquivo enquanto restaurando dados"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr "espaço de nomes não é preservado em áreas de trabalho versão 1"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "não é possível salvar nomes de espaço em áreas de trabalho versão 1"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 #, fuzzy
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
@@ -5252,175 +5294,175 @@
 "não é possível salvar ambiente com vínculos bloqueados/ativos em áreas de "
 "trabalho versão 1"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "não é possível salvar referências fracas em áreas de trabalho versão 1"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec chamado com um tipo não vetorial"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 "não é possível salvar objetos do tipo códigos de byte em áreas de trabalho "
 "versão 1"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: tipo desconhecido %i"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec chamado com um tipo não vetorial"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 "não é possível ler objetos do tipo códigos de byte a partir de áreas de "
 "trabalho versão 1"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: tipo desconhecido %i"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "memória insuficiente na leitura de string ascii"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "um erro de leitura binário ocorreu"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "memória insuficiente na leitura de string binária"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "um erro de leitura de string binária ocorreu"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "um erro de escrita de inteiro xdr ocorreu"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "um erro de leitura de inteiro xdr ocorreu"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "um erro de escrita de string xdr ocorreu"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "um erro de escrita de real xdr ocorreu"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "um erro de leitura de inteiro xdr ocorreu"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "um erro de escrita de complexos xdr ocorreu"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "um erro de leitura de complexos xdr ocorreu"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "falha de escrita"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "arquivo de restauração pode estar vazio -- nenhum dado carregado"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 "arquivo de restauração pode ser de uma versão mais nova do R -- nenhum dado "
 "carregado"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "número mágico do arquivo de restauração inválido (arquivo pode estar "
 "corrompido) -- nenhum dado carregado"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "primeiro argumento deve ser um vetor de caracteres"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "não é uma lista com nomes válida"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr "'%s' parece um objeto S4 pre-2.4.0 S4: por favor recrie-o"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "dados carregados não estão em forma de lista pareada"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "primeiro argumento deve ser um nome de arquivo"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "escrita XDR falhou"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "leitura XDR falhou"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "não é possível salvar os dados -- não foi possível abrir '%s': %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "não é possível salvar para conexões em formato de versão %d"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "conexão não aberta para leitura"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "não é possível salvar em formato XDR para uma conexão de modo texto"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "erro ao escrever na conexão"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "conexão não está aberta para leitura"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 #, fuzzy
 msgid "can only load() from a binary connection"
 msgstr "só é possível ler a partir de uma conexão binária"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "nenhuma entrada disponível"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5437,7 +5479,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan() esperava '%s', obteve '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 #, fuzzy
 msgid "too many items"
 msgstr "argumentos demais"
@@ -5446,7 +5488,7 @@
 msgid "empty 'what' specified"
 msgstr "especificação vazia de 'what='"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "linha %d não tinha %d elementos"
@@ -5480,34 +5522,34 @@
 msgid "embedded nul(s) found in input"
 msgstr "cadeia de caracteres com nul incluso: '%s'"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "comprimentos diferentes de fatores"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "resultado seria um vetor muito longo"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "argumento de comprimento zero"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "expressão numérica tem %d elementos: somente o primeiro usado"
 msgstr[1] "expressão numérica tem %d elementos: somente o primeiro usado"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "Argumento NA/NaN"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "tipo inválido para o segundo argumento"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, fuzzy, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "tentativa de replicar um objeto diferente de vetor"
@@ -5746,53 +5788,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "somente vetores atômicos podem ser testados para ordenação"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' deve ser TRUE ou FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "somente vetores atômicos podem ser ordenados"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "vetores raw não podem ser ordenados"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, fuzzy, c-format
 msgid "index %ld outside bounds"
 msgstr "índice %d fora de limites"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "índice NA"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "índice %d fora de limites"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "argumento %d não é um vetor"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "comprimentos de argumentos difererem"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "ties.method inválido para rank() [nunca deveria acontecer]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "intervalo de valores muito grande em 'x'"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "coerção de 'text' para modo caractere não teve êxito"
@@ -5802,25 +5840,25 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "argumento '%s = \"%s\"' será ignorado"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "primeiro argumento deve ser um vetor"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "segundo argumento deve ser um fator"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 #, fuzzy
 msgid "group length is 0 but data length > 0"
 msgstr ""
 "Comprimento do grupo é zero mas o comprimento dos dados é maior que zero"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "comprimento dos dados não é múltiplo da variável de separação"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "fator tem um nível com problema"
 
@@ -5876,38 +5914,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "coerção mudou o comprimento do vetor para 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "formato inválido'%s'; %s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "use o formato %d ou %i para objetos lógicos"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "use o formato %d, %i, %o, %x ou %X para objetos inteiros"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "use o formato %f, %e, %g ou %a para objetos numéricos"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "use o formato %s para objetos caractere"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "provável truncamento de string de caracteres para %d caracteres"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "tipo não suportado"
 
@@ -5915,74 +5953,74 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: buffer muito pequeno"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "tentativa de alargar um objeto diferente de vetor"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "atribuição fora dos limites do vetor/lista (extendendo de %d até %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "tipos incompatíveis (de %s para %s) em correção de tipo subatribuição"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "NAs não são permitidos em atribuições por subscritos"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "substituto tem comprimento zero"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 "número de itens para para substituir não é um múltiplo do comprimento do "
 "substituto"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "número de subscritos incorretos na matriz"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 "tipos incompatíveis (de %s para %s) em atribuição de subconjunto de matriz"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "número de índices incorretos"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 "tipos incompatíveis (de %s para %s) em atribuição de subconjunto de array"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "número de subscritos inválidos em atribuição de lista"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "número de subscritos inválidos em atribuição de lista"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: número de argumentos inválidos"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 "resultado tem comprimento zero e por isso não pode ser um objeto de linguagem"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 #, fuzzy
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
@@ -5990,185 +6028,181 @@
 "[[<- definido somente para objetos de tipo \"S4\" somente para subclasses de "
 "um ambiente"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "argumentos inválidos para subatribuição de ambiente"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "mais elementos fornecidos do que podem ser substituidos"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] com subscrito ausente"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "subscrito [[ ]] fora de limites"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "número inadequado de subscritos em [[ ]]"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "tipos incompatíveis (de %s para %s) em atribuição [["
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "subscrito (%d) em [[ ]] fora de limites"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "tipo de subscrito inválido '%s'"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "nenhum método para atribuir subconjuntos dessa classe S4"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "Realizando coerção de LHD para uma lista"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "tentativa de selecionar menos de um elemento"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "tentativa de selecionar mais de um elemento"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "erro interno no uso de indexação recursiva"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "correspondência parcial de '%s' para '%s'"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "indexação recursiva falhou no nível %d\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "nenhum índice no nível %d\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "número incorreto de colunas na subscrição de matriz"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "valores negativos não são permitidos na subscrição de matriz"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(subscript) subscrito lógico muito longo"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "somente 0's podem ser usados junto com subscritos negativos"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "array sem atributo 'dimnames'"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "tentativa de usar um subscrito em um objeto diferente de vetor"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "uso de subscritos em matrizes não suportados para esse tipo"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "uso de subscritos em arrays não disponíveis para esse tipo"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "número incorreto de dimensões"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "nenhum índice especificado"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "não é possível dividir essa classe S4 em subconjuntos"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "argumentos errados para obtenção de subconjuntos de um ambiente"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "'type' inválido (%s) do argumento"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 #, fuzzy
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "Estouro da capacidade de inteiro - use sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "erro interno ('op = %d' em do_summary).\t Chame um guru"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Estouro da capacidade de inteiro - use sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "nenhum argumento não faltante; retornando NA"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "nenhum argumento não faltante para min; retornando Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "nenhum argumento não faltante para max; retornando -Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "argumento não numérico"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "argumento 'which' não é lógico"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "nenhum argumento"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "tipo de entrada inválido"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 #, fuzzy
 msgid "an argument will be fractionally recycled"
 msgstr "argumento '%s' será ignorado"
@@ -6182,8 +6216,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -6217,101 +6251,101 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "falha na procura em %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "argumento de tipo inválido"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "comprimento errado para argumento"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'Sys.setenv' não está disponível nesse sistema"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 "esse sistema não pode desvincular variáveis de ambiente: definindo como \"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "'Sys.unsetenv' não está disponível nesse sistema"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' deve ser um vetor de caracteres"
 
-#: src/main/sysutils.c:652
+#: src/main/sysutils.c:658
 #, fuzzy
-msgid "'x' must be a list of NULL or raw vectors"
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x' deve ser um vetor de caracteres"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' deve ser chamado em uma CHARSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "erro interno no código unz"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "junção de linha inválida"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 #, fuzzy
 msgid "cannot create 'R_TempDir'"
 msgstr "não é possível alocar R_TempDir"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "impossível definir R_SESSION_TMPDIR"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 #, fuzzy
 msgid "cannot allocate 'R_TempDir'"
 msgstr "não é possível alocar R_TempDir"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 #, fuzzy
 msgid "temporary name too long"
 msgstr "nome de arquivo muito longo"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr ""
 "não foi possivel encontrar um nome não utilizado para arquivo temporário."
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr "falha de alocação em R_tmpnam2"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "'dirmark = TRUE' não é suportado nessa plataforma"
 
@@ -6347,33 +6381,33 @@
 msgid "'nmax' must be positive"
 msgstr "'value' deve ter comprimento positivo"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' requer argumentos vetoriais"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "argumento não é de modo caractere"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 #, fuzzy
 msgid "... used in a situation where it does not exist"
 msgstr "... usado em uma situação onde ele não existe"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "valor em '...' não é uma promessa"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "data frame não numérico em rowsum"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "isso não pode acontecer"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' deve ser um vetor de caracteres"
 
@@ -6381,144 +6415,144 @@
 msgid "object is not a matrix"
 msgstr "objeto não é uma matriz"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "tipo %d não está implementado em '%s'"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "tipo não implementado '%s' em '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "tipo não implementado (%d) em '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "etiqueta inválida durante a extração de nomes"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "%d argumento passado para .Internal(%s), que requer %d"
 msgstr[1] "%d argumentos passados para .Internal(%s), que requer %d"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d argumentos passados para '%s', que requer %d"
 msgstr[1] "%d argumentos passados para '%s', que requer %d"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "nome de argumento fornecido '%s' não corresponde a '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "lista 'nthcdr' é menor que %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr' requer uma lista para aplicar o CDR"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' deve ser TRUE ou FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' deve ser TRUE ou FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "valor faltante é inválido"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "não é possível mudar o diretório de trabalho"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "vetor de caracteres esperado como argumento"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "caminho muito longo"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "apenas o primeiro caractere"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "vetor de caracteres vector.'value' esperado"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "'value' deve ter comprimento positivo"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "entrada inválida '%s' em 'utf8towcs'"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "string multibyte inválida em '%s'"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "mensagem de erro truncada para 255 caracteres"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "mensagem de aviso truncada para 255 caracteres"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 #, fuzzy
 msgid "all arguments must be named"
 msgstr "os atributos devem ter nome"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "ICU não é suportado nessa plataforma"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 #, fuzzy
 msgid "'breaks' is not sorted"
 msgstr "tipo '%s' não é suportado"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, fuzzy, c-format
 msgid "long vector '%s' is not supported"
 msgstr "tipo '%s' não é suportado"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 #, fuzzy
 msgid "'x' must be a vector"
 msgstr "'x' deve ser um vetor de caracteres"
@@ -6583,7 +6617,7 @@
 msgid "There must be at least three control points"
 msgstr "Deve haver pelo menos três pontos de controle"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "Erro no protocolo X11: %s"
@@ -6609,7 +6643,7 @@
 "Erro: X11 não pode alocar cores adicionais.\n"
 "Considere usar o X11 com a opção colortype=\"pseudo.cube\" ou \"gray\""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6617,17 +6651,17 @@
 "não foi possível achar nenhuma fonte X11\n"
 "Verifique se o caminho de fontes está correto."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 utilizou o tamanho de fonte %d ao invés do %d pedido"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "fonte X11 %s, face %d e tamanho %d não pôde ser carregada"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6635,190 +6669,196 @@
 "semi-transparência não é suportada por este dispositivo: reportada somente "
 "uma vez por página"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "Erro de E/S X11 enquanto abrindo conexão X11 para '%s'"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "Erro de E/S: por favor salve o seu trabalho atual e feche o R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 "locale não suportado pela Xlib: algumas operações X vão ser realizadas no "
 "locale C"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X não pode ajustar os modificadores de locale"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "sem suporte png nessa versão do R"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "nome de arquivo muito longo em chamada png()"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "não foi possível abrir o arquivo PNG '%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "sem suporte jpeg nessa versão do R"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "nome de arquivo muito longo em chamada jpeg()"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "não foi possível abrir o arquivo JPEG '%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "sem suporte a tiff nessa versão do R"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "nome de arquivo muito longo em chamada tiff()"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "nome de arquivo muito longo em chamada bmp()"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "não foi possível abrir o arquivo BMP '%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "não foi possível abrir conexão com o dispositivo X11 '%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr "ignorando argumento 'display' pois um dispositivo X11 já está aberto"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg() não suporta transparência: usando fundo de tela branco"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "não foi possível obter informação sobre o dispositivo X11 '%s'"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "não foi possível criar janela X11"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "width=%d, height=%d' são valores improváveis em pixeis"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "impossível criar mapa de pixels"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "especificação de fonte inválida"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "família de fonte não encontrada no banco de dados de fonte do X11"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "uso inválido de %d < 0 em '%s'"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "não foi possível abrir o arquivo '%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "%s não está disponível para este dispositivo"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "impossível criar Ximage"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "não foi possível iniciar o dispositivo %s"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width' ou 'height' inválidos"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "tipo de cor inválido passado para o driver X11"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "modo de cor X11 desconhecido -- usando modo monocromático"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "nenhum histórico de gráfico disponível pra salvar"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "não existe um dispositivo X11cairo aberto"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "não foi possível abrir o arquivo '%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "savePlot() não está suportado nesta compilação"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "não foi possível abrir conexão com o dispositivo X11"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "área de transferência não pode ser lida (código de erro %d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "não foi possível alocar memória para estrutura do tipo X11Routines"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "reinícios não suportados em 'eval'"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "alocação de conexão url falhou"
 
@@ -6830,29 +6870,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "apenas o primeiro elemento do argumento 'destfile' foi utilizado"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Download em progresso"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "não foi possível abrir a URL '%s', motivo '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "não foi possível abrir o arquivo de destino '%s', motivo '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "tentando a URL '%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "comprimento baixado %d != comprimento informado %d"
@@ -6862,140 +6902,166 @@
 msgid "cannot open URL '%s'"
 msgstr "não foi possível abrir a URL '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "esquema de URL não suportado"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "não foi possível abrir: status HTTP foi '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "falha em InternetOpenUrl: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "não foi possível abrir: status HTTP foi '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "nsl() não é suportado nessa plataforma"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "argumento '%s' inválido"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() não é suportado nessa plataforma"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "comprimentos dos nomes de importação e exportação devem ser iguais"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "não foi possível abrir o arquivo de destino '%s', motivo '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "não foi possível abrir o arquivo '%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "não é possível ler a partir desta conexão"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "não é possível abrir a conexão"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() não é suportado nessa plataforma"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: URL longa de mais (inválida?)"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "removendo informação de proxy FTP"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "usando proxy FTP '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: URL longa de mais (inválida?)"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "não foi possível resolver o servidor"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "falha na conexão com servidor"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "falha ao obter resposta do servidor"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: falha ao criar soquete"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "falha ao criar conexão de dados"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "falha ao vincular uma porta"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "não foi possível escutar na porta %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: URL longa de mais (inválida?)"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "removendo informação sobre proxy HTTP"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "usando proxy HTTP '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: URL longa de mais (inválida?)"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "não foi possível resolver '%s'"
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "conectado a '%s' na porta %d."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "não foi possível conectar a '%s' na porta %d."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "redirecionamento para: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "muitos redirecionamentos, abortando ..."
 
@@ -7230,8 +7296,8 @@
 msgstr "erro de alocação em bessel_i"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fora de "
 "limites?\n"
@@ -7241,18 +7307,23 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): precisão perdida no resultado\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "erro de alocação em bessel_j"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fora de "
 "limites?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): precisão perdida no resultado\n"
@@ -7262,8 +7333,8 @@
 msgstr "erro de alocação em bessel_k"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fora de "
 "limites?\n"
@@ -7273,18 +7344,23 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): precisão perdida no resultado\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "erro de alocação em bessel_y"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argumento fora de "
 "limites?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): precisão perdida no resultado\n"
@@ -7294,42 +7370,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "argumento fora de domínio em '%s'\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "valor fora de limites em '%s'\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "convergência falhou em '%s'\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "precisão completa pode não ser conseguida em '%s'\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "transbordamento ocorreu em '%s'\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): não houve convergência em %d iterações"
@@ -7405,7 +7481,7 @@
 "Carregamento dinâmico preguiçoso explícito não suportado nessa plataforma. "
 "Usando padrão."
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "não foi possível obter o diretório de trabalho!"
 
@@ -7421,12 +7497,12 @@
 "Uma circunstância rara ocorreu no aninhamento da entrada readline. Por favor "
 "informe usando bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "problema ao salvar o arquivo de histórico '%s'"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7435,85 +7511,122 @@
 "Não foi possível abrir o arquivo '%s': %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "argumento 'file' é muito longo"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "nenhum mecanismo de histórico disponível"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "problema no truncamento do arquivo de histórico"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "nenhum histórico disponível pra salvar"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "etiqueta de tempo inválida"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "argumento caractere não vazio esperado"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' deve ser um valor lógico e não NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "não foi possível abrir o arquivo '%s', motivo '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr "linha %d pode ser truncada na chamada de system(, intern = TRUE)"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "erro ao executar o comando: '%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "erro ao executar comando"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "execução do comando '%s' deve status %d e mensagem de erro '%s'"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() não está implementado nesse sistema"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "ATENÇÃO: --gui ou -g sem especificação e ignorado"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "ATENÇÃO: interface gráfica desconhecida '%s', usando X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "ATENÇÃO: interface gráfica '%s' desconhecida, usando nenhuma\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "criação de arquivo temporário para '-e' falhou"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "ATENÇÃO: Somente editando o primeiro arquivo da lista"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "'what' deve ser uma cadeia de caracteres ou uma função"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "soquetes não estão disponíveis nesse sistema"
+
+#~ msgid "no function to restart"
+#~ msgstr "nenhuma função para reiniciar"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "argumento deve ser um objeto do tipo closure"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname' deve ser um vetor de caracteres de comprimento 1"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "resolução de máquina '%s' impossível em nsl()"
+
+#, fuzzy
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "formato desconhecido retornado por gethostbyname"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "nsl() não é suportado nessa plataforma"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "intervalo de valores muito grande em 'x'"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "argumento não numérico"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "esquema de URL não suportado"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' deve ser uma lista"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' deve ser uma lista"
 
@@ -7876,9 +7989,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title' deve ser uma string de caracteres"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "'title' deve ser uma cadeia de caracteres"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s' deve ter comprimento 1"
 
@@ -7909,9 +8019,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' não é uma conexão"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec' deve ser um único caractere"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr ""
 #~ "data frame corrupto -- comprimento da coluna %d não corresponde a nrows"
diff -Nru r-base-3.2.3/src/library/base/po/R-base.pot r-base-3.3.1/src/library/base/po/R-base.pot
--- r-base-3.2.3/src/library/base/po/R-base.pot	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-base.pot	2016-04-27 22:15:36.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: base 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -209,6 +208,9 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr ""
 
+msgid "'row.names' is not a character vector of length %d -- omitting it. Will be an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
 
@@ -458,6 +460,15 @@
 msgid "Invalid DCF format.\nContinuation lines must not start a record.\nOffending lines start with:\n%s"
 msgstr ""
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr ""
 
@@ -566,10 +577,10 @@
 msgid "invalid 'time' argument"
 msgstr ""
 
-msgid "'vec' contains NAs"
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr ""
 
-msgid "'vec' must be sorted non-decreasingly"
+msgid "'fun' is not a function"
 msgstr ""
 
 msgid "using the first element of 'value' of type \"expression\""
@@ -596,15 +607,18 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr ""
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr ""
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr ""
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+msgid "'input.d.mark' has no characters"
+msgstr ""
+
 msgid "'subset' must be logical"
 msgstr ""
 
@@ -683,7 +697,13 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr ""
 
-msgid "package %s has a license that you need to accept:\naccording to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr ""
+
+msgid "according to the DESCRIPTION file it is"
+msgstr ""
+
+msgid "%s"
 msgstr ""
 
 msgid "license for package %s not accepted"
@@ -851,6 +871,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr ""
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ""
+
 msgid "'arg' must be NULL or a character vector"
 msgstr ""
 
@@ -1013,13 +1042,16 @@
 msgid "found methods to import for function %s but not the generic itself"
 msgstr ""
 
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr ""
 
 msgid "requested methods not found in environment/package %s: %s"
 msgstr ""
 
-msgid "No generic function found corresponding to requested imported methods for \"%s\" from package \"%s\" (malformed exports?)"
+msgid "No generic function %s found corresponding to requested imported methods from package %s when loading %s (malformed exports?)"
 msgstr ""
 
 msgid "cannot add to exports of a sealed namespace"
@@ -1175,6 +1207,9 @@
 msgid "too many arguments"
 msgstr ""
 
+msgid "invalid 'compress' argument:"
+msgstr ""
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr ""
 
@@ -1208,6 +1243,9 @@
 msgid "'decreasing' must be a length-1 logical vector.\nDid you intend to set 'partial'?"
 msgstr ""
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr ""
 
@@ -1232,9 +1270,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr ""
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr ""
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr ""
 
@@ -1286,9 +1321,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr ""
 
-msgid ","
-msgstr ""
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr ""
 
@@ -1331,6 +1363,9 @@
 msgid "arguments must have same length"
 msgstr ""
 
+msgid "total number of levels >= 2^31"
+msgstr ""
+
 msgid "handler must be a function"
 msgstr ""
 
@@ -1571,11 +1606,6 @@
 msgstr[0]    ""
 msgstr[1]    ""
 
-msgid        "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0]    ""
-msgstr[1]    ""
-
 msgid        "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0]    ""
@@ -1585,3 +1615,8 @@
 msgid_plural "Warning messages:\n"
 msgstr[0]    ""
 msgstr[1]    ""
+
+msgid        "In %s :\n extra argument %s will be disregarded"
+msgid_plural "In %s :\n extra arguments %s will be disregarded"
+msgstr[0]    ""
+msgstr[1]    ""
diff -Nru r-base-3.2.3/src/library/base/po/R-da.po r-base-3.3.1/src/library/base/po/R-da.po
--- r-base-3.2.3/src/library/base/po/R-da.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-da.po	2016-04-27 22:15:36.000000000 +0000
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: R 3.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-25 14:20+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -229,6 +229,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr "kan ikke tvinge klasse »%s« ind i en data.frame"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr "options(\"stringsAsFactors\") ikke angivet til TRUE eller FALSE"
 
@@ -498,6 +503,15 @@
 "Overtrædende linjer starter med:\n"
 "%s"
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "'x' skal være en kvadratisk matrix"
 
@@ -613,12 +627,14 @@
 msgid "invalid 'time' argument"
 msgstr "ugyldigt 'time'-argument"
 
-msgid "'vec' contains NAs"
-msgstr "'vec' indeholder NA'er"
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr "'vec' skal sorteres ikkefaldende"
 
+#, fuzzy
+msgid "'fun' is not a function"
+msgstr "håndtag skal være en funktion"
+
 msgid "using the first element of 'value' of type \"expression\""
 msgstr "bruger det første element for 'value' for type »expression«"
 
@@ -645,16 +661,20 @@
 msgstr ""
 "ødelagt dataramme: kolonner vil blive afkortet eller forlænget med NA'er"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-"'big.mark' og 'decimal.mark' er begge '%s', hvilket kan være forvirrende"
-
 msgid "'zero.print' has length > 1"
 msgstr "'zero.print' har længde > 1"
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr "'zero.print' skal være tegn, logisk eller NULL"
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+"'big.mark' og 'decimal.mark' er begge '%s', hvilket kan være forvirrende"
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr "'input' og 'target' skal være tegnvektorer"
+
 msgid "'subset' must be logical"
 msgstr "'subset' skal være logisk"
 
@@ -734,13 +754,19 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr "pakke %s har en licens, som du skal acceptere efter visning"
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+#, fuzzy
+msgid "package %s has a license that you need to accept:"
+msgstr "pakke %s har en licens, som du skal acceptere efter visning"
+
+#, fuzzy
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
 "pakke %s har en licens, som du skal acceptere:\n"
 "ifølge DESCRIPTION-filen er det"
 
+msgid "%s"
+msgstr ""
+
 msgid "license for package %s not accepted"
 msgstr "licens for pakke %s er ikke accepteret"
 
@@ -912,6 +938,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr "skal angive navne på formelle argumenter for 'vectorize'"
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ","
+
 msgid "'arg' must be NULL or a character vector"
 msgstr "'arg' skal være NULL eller en tegnvektor"
 
@@ -1101,15 +1136,20 @@
 msgstr ""
 "fandt metoder at importere for funktion %s men ikke selve den generiske"
 
+#, fuzzy
+msgid "replacing previous import %s by %s when loading %s"
+msgstr "erstatter tidligere import af %s når %s indlæses"
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr "Ingen metoder fundet i »%s« for forespørgsler: %s"
 
 msgid "requested methods not found in environment/package %s: %s"
 msgstr "forespurgte metoder blev ikke fundet i miljø/pakke %s: %s"
 
+#, fuzzy
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 "Ingen generisk funktion fundet, der svarer til forespurgte importerede "
 "metoder for »%s« fra pakke »%s« (forkert udformet eksport?)"
@@ -1267,6 +1307,10 @@
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "ugyldigt 'name'-argument"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr "'compress' ignoreres med mindre at 'file' er et filnavn"
 
@@ -1304,6 +1348,9 @@
 "'decreasing' skal være en længde-1 logisk vektor.\n"
 "Ønskede du at angive den 'partial'?"
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr "'index.return' kun for ikke-faktorer"
 
@@ -1332,9 +1379,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr "metode = »quick« er kun for numerisk 'x'"
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "metode = »radix« er kun for heltal 'x'"
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr "'local' skal være TRUE, FALSE eller et miljø"
 
@@ -1387,9 +1431,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr "sandsynligvis forkert kodning i names(.) for kolonne"
 
-msgid ","
-msgstr ","
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr "STATS er længere end omfanget af 'dim(x)[MARGIN]'"
 
@@ -1432,6 +1473,10 @@
 msgid "arguments must have same length"
 msgstr "argumenter skal have samme længde"
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr "niveauantal er forskelligt"
+
 msgid "handler must be a function"
 msgstr "håndtag skal være en funktion"
 
@@ -1711,11 +1756,6 @@
 msgstr[0] "S3-metode %s blev deklareret i NAMESPACE men ikke fundet"
 msgstr[1] "S3-metoder %s blev deklareret i NAMESPACE men ikke fundet"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "ekstra argument %s vil blive ignoreret"
-msgstr[1] "ekstra argumentet %s vil blive ignoreret"
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "%s er ikke TRUE"
@@ -1725,3 +1765,19 @@
 msgid_plural "Warning messages:\n"
 msgstr[0] "Advarselsbesked:\n"
 msgstr[1] "Advarselsbeskeder:\n"
+
+#, fuzzy
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] "ekstra argument %s vil blive ignoreret"
+msgstr[1] "ekstra argumentet %s vil blive ignoreret"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "'vec' indeholder NA'er"
+
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "metode = »radix« er kun for heltal 'x'"
diff -Nru r-base-3.2.3/src/library/base/po/R-de.po r-base-3.3.1/src/library/base/po/R-de.po
--- r-base-3.2.3/src/library/base/po/R-de.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-de.po	2016-04-27 22:15:36.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-26 14:30+0100\n"
+"POT-Creation-Date: 2015-03-24 11:51\n"
+"PO-Revision-Date: 2016-04-07 11:21+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -47,8 +47,7 @@
 msgid "a dimension is zero"
 msgstr "eine Dimension ist 0"
 
-#, fuzzy
-msgid "\"hexNumeric\" and \"digits17\" are mutually exclusive"
+msgid "\"hexNumeric\"and \"digits17\" are mutually exclusive"
 msgstr "\"hexNumeric\" und \"digits15\" schliessen sich gegenseitig aus"
 
 msgid "second argument must be a list"
@@ -76,7 +75,7 @@
 msgstr "Ziel ist %s, aktuell ist %s"
 
 msgid "'tolerance' should be numeric"
-msgstr "'tolernce' sollte  numerisch sein"
+msgstr "'tolerance' sollte  numerisch sein"
 
 msgid "'scale' should be numeric or NULL"
 msgstr "'scale' sollte numerisch oder NULL sein"
@@ -112,11 +111,11 @@
 msgstr "Datei '%s' nicht gefunden"
 
 msgid "invalid 'name' argument"
-msgstr "ungültiges 'name'Argument"
+msgstr "ungültiges 'name' Argument"
 
 msgid "package %s is required by %s, which may no longer work correctly"
 msgstr ""
-"Paket '%s' wird von %s benötigt, welches evtl nicht mehr korrekt arbeitet"
+"Paket '%s' wird von %s benötigt, welches evtl. nicht mehr korrekt arbeitet"
 
 msgid "package %s is required by %s so will not be detached"
 msgstr "Paket %s wird von %s benötigt, wird deshalb nicht detached"
@@ -185,10 +184,10 @@
 msgstr "kann nur eine geöffnete Verbindung abschneiden"
 
 msgid "can only write vector objects"
-msgstr "kann nur Vektorobjekte schreiben"
+msgstr "kann nur Vektor-Objekte schreiben"
 
 msgid "can only write character objects"
-msgstr "kann nur Zeichenobjekte schreiben"
+msgstr "kann nur Zeichenketten-Objekte schreiben"
 
 msgid "'timeout' must be NULL or a non-negative number"
 msgstr "'timeout' muss NULL oder eine nicht-negative Zahl sein"
@@ -275,14 +274,14 @@
 msgstr "'value' hat falsche Länge"
 
 msgid "unsupported matrix index in replacement"
-msgstr "nicht unterstützter Matrixindes in der Ersetzung"
+msgstr "nicht unterstützter Matrix-Index in der Ersetzung"
 
 msgid "need 0, 1, or 2 subscripts"
 msgstr "brauche 0, 1, oder 2 Indizes"
 
 msgid ""
 "missing values are not allowed in subscripted assignments of data frames"
-msgstr "Fehlende Werte sind in Teilzuweisungen von data frames nicht erlaubt"
+msgstr "fehlende Werte sind in Teilzuweisungen von Dataframes nicht erlaubt"
 
 msgid "non-existent rows not allowed"
 msgstr "nicht existierende Zeilen sind nicht erlaubt"
@@ -307,7 +306,7 @@
 msgstr "nur ein einzelnes Element sollte ersetzt werden"
 
 msgid "Partial match of '%s' to '%s' in data frame"
-msgstr "Partielle Ãœbereinstimmung von '%s' mit '%s' in data frame"
+msgstr "Partielle Ãœbereinstimmung von '%s' mit '%s' in Dataframe"
 
 msgid "names do not match previous names"
 msgstr "Namen passen nicht zu den vorhergehenden Namen"
@@ -322,16 +321,16 @@
 msgstr "<0 Zeilen> (oder row.names mit Länge 0)"
 
 msgid "non-numeric variable in data frame:"
-msgstr "nicht numerische Variable in data frame:"
+msgstr "nicht numerische Variable in Dataframe:"
 
 msgid "%s only defined for equally-sized data frames"
-msgstr "%s ist nur definiert für dataframes gleicher Größe"
+msgstr "%s ist nur für Dataframes gleicher Größe definiert"
 
 msgid "list of length %d not meaningful"
 msgstr "Liste der Länge %d nicht sinnvoll"
 
 msgid "only defined on a data frame with all numeric variables"
-msgstr "nur für einen data frame definiert, mit nur nummerischen Variablen"
+msgstr "nur für einen Dataframe mit nur numerischen Variablen definiert"
 
 msgid "character string is not in a standard unambiguous format"
 msgstr "Zeichenkette ist nicht in einem eindeutigen Standardformat"
@@ -442,10 +441,10 @@
 msgstr "'tzone' Attribute sind inkonsistent"
 
 msgid "'tim' is not character or numeric"
-msgstr "'tim' ist nicht Character oder nummerisch"
+msgstr "'tim' ist weder Zeichenkette noch numerisch"
 
 msgid "need explicit units for numeric conversion"
-msgstr "benötige explizite Einheiten für nummerische Konversion"
+msgstr "benötige explizite Einheiten für numerische Konversion"
 
 msgid "invalid units specified"
 msgstr "ungültige Einheiten spezifiziert"
@@ -581,14 +580,14 @@
 msgstr "keine Dateien, um dorthin zu kopieren"
 
 msgid "attempt to copy a directory to itself"
-msgstr "Versuch ein Verzeichnis rekrusiv in sich selbst zu kopieren"
+msgstr "Versuch ein Verzeichnis rekursiv in sich selbst zu kopieren"
 
 msgid "more 'from' files than 'to' files"
 msgstr "mehr 'from' Dateien als 'to' Dateien"
 
 msgid "'recursive' will be ignored as 'to' is not a single existing directory"
 msgstr ""
-"'recursive' wird ignoriert, da 'to' keine einzelnes, existierendes\n"
+"'recursive' wird ignoriert, da 'to' kein einzelnes, existierendes\n"
 "Verzeichnis ist"
 
 msgid "file can not be copied both 'from' and 'to'"
@@ -610,7 +609,7 @@
 msgstr "keine Datei gefunden"
 
 msgid "invalid 'path' argument"
-msgstr "ungültiges 'path'Argument"
+msgstr "ungültiges 'path' Argument"
 
 msgid "invalid 'time' argument"
 msgstr "ungültiges 'time' Argument"
@@ -631,7 +630,7 @@
 msgstr "'mode' muss \"double\" (\"real\"), \"integer\" oder \"character\" sein"
 
 msgid "coercing argument to \"character\" for format=\"s\""
-msgstr "wandle Argument in \"character\" für das Format=\"s\""
+msgstr "wandle Argument um in \"character\" für das Format=\"s\""
 
 msgid "'format' must be one of {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}"
 msgstr ""
@@ -645,7 +644,7 @@
 
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr ""
-"Korrupter Data Frame: Spalten werden abgeschnitten oder mit NAs aufgefüllt"
+"Beschädigter Dataframe: Spalten werden abgeschnitten oder mit NAs aufgefüllt"
 
 msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
 msgstr ""
@@ -655,7 +654,7 @@
 msgstr "'zero.print' muss Länge > 1 haben"
 
 msgid "'zero.print' must be character, logical or NULL"
-msgstr "'zero.print' muss Charakter, logisch oder NULL sein"
+msgstr "'zero.print' muss Zeichenkette, boolesch oder NULL sein"
 
 msgid "'subset' must be logical"
 msgstr "'subset' muss boolesch sein"
@@ -767,7 +766,7 @@
 msgstr "keine Bibliotheken in 'lib.loc' gefunden"
 
 msgid "%s is not a valid installed package"
-msgstr "%s ist keine gültiges installiertes Paket"
+msgstr "%s ist kein gültiges, installiertes Paket"
 
 msgid "%s not found on search path, using pos = 2"
 msgstr "%s nicht im Suchpfad gefunden, nutze pos = 2"
@@ -877,7 +876,7 @@
 msgstr "leere (Null Bytes) Eingabedatei"
 
 msgid "input has been corrupted, with LF replaced by CR"
-msgstr "Eingabe wurde korrumpiert, LF wurde ersetzt durch CR"
+msgstr "Eingabe wurde beschädigt, LF wurde ersetzt durch CR"
 
 msgid "bad 'file' argument"
 msgstr "unbrauchbares 'file' Argument"
@@ -914,7 +913,7 @@
 
 msgid "Specified environment not found: using '.GlobalEnv' instead"
 msgstr ""
-"spezifizierte Umgebung nicht gefunden: benutze '.globalEnv' statt dessen"
+"spezifizierte Umgebung nicht gefunden: benutze stattdessen '.globalEnv'"
 
 msgid "invalid 'category' argument"
 msgstr "ungültiges Argument für 'category'"
@@ -923,7 +922,7 @@
 msgstr "für 'vectorize' müssen Namen für formale Argumente angegeben werden"
 
 msgid "'arg' must be NULL or a character vector"
-msgstr "'arg' muss NULL sein oder ein Charakter-Vektor."
+msgstr "'arg' muss NULL oder ein Zeichenkettenvektor sein"
 
 msgid "'arg' must be of length 1"
 msgstr "'arg' muss Länge 1 haben"
@@ -932,7 +931,7 @@
 msgstr "'arg' muss Länge >=1 haben"
 
 msgid "'arg' should be one of %s"
-msgstr "'arg' sollte eines  von '%s' sein"
+msgstr "'arg' sollte eines von '%s' sein"
 
 msgid "there is more than one match in 'match.arg'"
 msgstr "mehr als ein Treffer in 'match.arg'"
@@ -964,7 +963,7 @@
 msgstr "Argument ist weder numerisch noch boolesch: gebe NA zurück"
 
 msgid "'trim' must be numeric of length one"
-msgstr "'trim' muss nummerisch sein und Länge 1 haben"
+msgstr "'trim' muss numerisch sein und Länge 1 haben"
 
 msgid "trimmed means are not defined for complex data"
 msgstr "getrimmte Mittelwerte sind für komplexe Daten nicht definiert"
@@ -1028,22 +1027,20 @@
 "failed to assign RegisteredNativeSymbol for %s to %s since %s is already "
 "defined in the %s namespace"
 msgstr ""
-"Zuweisung von RegisteredNativeSymbol gescheitert für %s zu %s\n"
+"Zuweisung von RegisteredNativeSymbol für %s zu %s\n"
 "fehlgeschlagen, da %s bereits im %s Namensraum definiert"
 
 msgid ""
 "failed to assign NativeSymbolInfo for %s to %s since %s is already defined "
 "in the %s namespace"
 msgstr ""
-"konnte kein NativeSymbolInfo für %s zu %s hinzufügen, da %s bereits im\n"
+"konnte kein NativeSymbolInfo für %s zu %s hinzufügen, da %s bereits im "
 "%s Namensraum definiert"
 
 msgid ""
 "failed to assign NativeSymbolInfo for %s since %s is already defined in the "
 "%s namespace"
-msgstr ""
-"\"konnte kein NativeSymbolInfo für %s hinzufügen, da %s bereits im\\n\"\n"
-"\"%s Namensraum definiert\""
+msgstr "konnte kein NativeSymbolInfo für %s hinzufügen, da %s bereits im %s Namensraum definiert"
 
 msgid "package %s does not have a namespace"
 msgstr "Paket %s hat keinen Namensraum"
@@ -1142,7 +1139,7 @@
 msgstr "Paket %s hat keine 'NAMESPACE' Datei"
 
 msgid "empty name in directive '%s' in 'NAMESPACE' file"
-msgstr "leerer Name in der Direktive  '%s' in der 'NAMESPACE' Datei"
+msgstr "leerer Name in der Direktive '%s' in der 'NAMESPACE' Datei"
 
 msgid "duplicate symbol names %s in useDynLib(\"%s\")"
 msgstr "doppelte Symbolnamen %s in useDynLib(\"%s\")"
@@ -1247,7 +1244,7 @@
 msgstr "fehlende Werte für 'group'"
 
 msgid "not a data frame"
-msgstr "kein Data Frame"
+msgstr "kein Dataframe"
 
 msgid "length of 'center' must equal the number of columns of 'x'"
 msgstr "Länge von 'center' muss mit der Spaltenanzahl von 'x' übereinstimmen"
@@ -1383,10 +1380,6 @@
 msgid "Timestamp of %s has changed"
 msgstr "Zeitstempel von %s hat sich geändert"
 
-#, fuzzy
-msgid "'x' and 'to' must refer to same file"
-msgstr "'x' und 'y' müssen die selbe Länge haben"
-
 msgid "additional arguments ignored in stop()"
 msgstr "zusätzliche Argumente in stop() ignoriert"
 
@@ -1415,13 +1408,13 @@
 msgstr "STATS recycelt nicht exakt über MARGIN"
 
 msgid "length(STATS) or dim(STATS) do not match dim(x)[MARGIN]"
-msgstr "length(STATS) oder dim(STATS) passen nciiht zu dim(x)[MARGIN]"
+msgstr "length(STATS) oder dim(STATS) passen nicht zu dim(x)[MARGIN]"
 
 msgid "nothing to tabulate"
 msgstr "nichts zu tabellarisieren"
 
 msgid "all arguments must have the same length"
-msgstr "alle Argumente müssen die selbe Länge haben"
+msgstr "alle Argumente müssen dieselbe Länge haben"
 
 msgid "attempt to make a table with >= 2^31 elements"
 msgstr "Versuch eine Tabelle mit mehr als 2^31 Elementen zu erstellen"
@@ -1445,7 +1438,7 @@
 msgstr "ungültiger Wert für 'nbins'"
 
 msgid "'INDEX' is of length zero"
-msgstr "'INDEX' hat  Länge 0"
+msgstr "'INDEX' hat Länge 0"
 
 msgid "arguments must have same length"
 msgstr "Argumente müssen die selbe Länge haben"
@@ -1539,7 +1532,7 @@
 msgstr "weniger 'from' Dateien als 'to' Dateien"
 
 msgid "link '%s' already exists"
-msgstr "link '%s' exisitiert bereits"
+msgstr "link '%s' existiert bereits"
 
 msgid "failed to create directory for link '%s"
 msgstr "konnte Verzeichnis für link %s nicht anlegen"
@@ -1615,8 +1608,8 @@
 
 msgid "invalid 'row.names', length %d for a data frame with %d row"
 msgid_plural "invalid 'row.names', length %d for a data frame with %d rows"
-msgstr[0] "ungültige 'row.names', Länge %d für data frame mit %d Zeile"
-msgstr[1] "ungültige 'row.names', Länge %d für data frame mit %d Zeilen"
+msgstr[0] "ungültige 'row.names', Länge %d für Dataframe mit %d Zeile"
+msgstr[1] "ungültige 'row.names', Länge %d für Dataframe mit %d Zeilen"
 
 msgid "supplied %d row name for %d rows"
 msgid_plural "supplied %d row names for %d rows"
@@ -1636,12 +1629,8 @@
 msgid "replacement element %d is a matrix/data frame of %d row, need %d"
 msgid_plural ""
 "replacement element %d is a matrix/data frame of %d rows, need %d"
-msgstr[0] ""
-"Ersetzungselement %d ist eine Matrix/data frame mit %d Zeile, benötigt "
-"werden %d"
-msgstr[1] ""
-"Ersetzungselement %d ist eine Matrix/data frame mit %d Zeilen, benötigt "
-"werden %d"
+msgstr[0] "Ersetzungselement %d ist Matrix/Dataframe mit %d Zeile, benötigt werden %d"
+msgstr[1] "Ersetzungselement %d ist Matrix/Dataframe mit %d Zeilen, benötigt werden %d"
 
 msgid "replacement element %d has %d row, need %d"
 msgid_plural "replacement element %d has %d rows, need %d"
diff -Nru r-base-3.2.3/src/library/base/po/R-fa.po r-base-3.3.1/src/library/base/po/R-fa.po
--- r-base-3.2.3/src/library/base/po/R-fa.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-fa.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.15.1\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-11-27 01:11+0330\n"
 "Last-Translator: Seyed Mahmood Taghavi Shahri <taghavi_m@razi.tums.ac.ir>\n"
 "Language-Team: Persian\n"
@@ -217,6 +217,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr ""
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
 
@@ -476,6 +481,15 @@
 "%s"
 msgstr ""
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr ""
 
@@ -587,10 +601,10 @@
 msgid "invalid 'time' argument"
 msgstr ""
 
-msgid "'vec' contains NAs"
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr ""
 
-msgid "'vec' must be sorted non-decreasingly"
+msgid "'fun' is not a function"
 msgstr ""
 
 msgid "using the first element of 'value' of type \"expression\""
@@ -617,15 +631,18 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr ""
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr ""
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr ""
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+msgid "'input.d.mark' has no characters"
+msgstr ""
+
 msgid "'subset' must be logical"
 msgstr ""
 
@@ -705,9 +722,13 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr ""
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr ""
+
+msgid "according to the DESCRIPTION file it is"
+msgstr ""
+
+msgid "%s"
 msgstr ""
 
 msgid "license for package %s not accepted"
@@ -878,6 +899,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr ""
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ""
+
 msgid "'arg' must be NULL or a character vector"
 msgstr ""
 
@@ -1052,6 +1082,9 @@
 msgid "found methods to import for function %s but not the generic itself"
 msgstr ""
 
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr ""
 
@@ -1059,8 +1092,8 @@
 msgstr ""
 
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 
 msgid "cannot add to exports of a sealed namespace"
@@ -1216,6 +1249,9 @@
 msgid "too many arguments"
 msgstr ""
 
+msgid "invalid 'compress' argument:"
+msgstr ""
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr ""
 
@@ -1251,6 +1287,9 @@
 "Did you intend to set 'partial'?"
 msgstr ""
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr ""
 
@@ -1277,9 +1316,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr ""
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr ""
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr ""
 
@@ -1331,9 +1367,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr ""
 
-msgid ","
-msgstr ""
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr ""
 
@@ -1376,6 +1409,9 @@
 msgid "arguments must have same length"
 msgstr ""
 
+msgid "total number of levels >= 2^31"
+msgstr ""
+
 msgid "handler must be a function"
 msgstr ""
 
@@ -1635,11 +1671,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] ""
@@ -1649,3 +1680,12 @@
 msgid_plural "Warning messages:\n"
 msgstr[0] ""
 msgstr[1] ""
+
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] ""
+msgstr[1] ""
diff -Nru r-base-3.2.3/src/library/base/po/R-fr.po r-base-3.3.1/src/library/base/po/R-fr.po
--- r-base-3.2.3/src/library/base/po/R-fr.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-fr.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 10:41+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -231,6 +231,11 @@
 "impossible de convertir automatiquement la classe  \"%s\" en un tableau de "
 "données (data.frame)"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr "options(\"stringsAsFactors\") n'est pas TRUE ou FALSE"
 
@@ -519,6 +524,15 @@
 "Les lignes litigieuses commencent par:\n"
 "%s"
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "'x' doit être une matrice carrée"
 
@@ -639,12 +653,14 @@
 msgid "invalid 'time' argument"
 msgstr "argument 'time' incorrect"
 
-msgid "'vec' contains NAs"
-msgstr "'vec' contient des valeurs manquantes (NAs)"
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr "'vec' doit être trié par ordre croissant"
 
+#, fuzzy
+msgid "'fun' is not a function"
+msgstr "le manipulateur de données (handler) doit être une fonction"
+
 msgid "using the first element of 'value' of type \"expression\""
 msgstr "utilisation du premier élément de 'value' de type \"expression\""
 
@@ -674,9 +690,6 @@
 "tableau de données corrompu : les colonnes seront tronquées ou complétées "
 "avec des NAs"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr "'zero.print' a une longueur > 1"
 
@@ -684,6 +697,13 @@
 msgstr ""
 "'zero.print' doit être une chaîne de caractères, une valeur logique ou NULL"
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr "'input' et 'target' doivent être des vecteurs caractères"
+
 msgid "'subset' must be logical"
 msgstr "'subset' doit être une valeur logique"
 
@@ -768,13 +788,19 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr "Le package %s a une licence que vous devez accepter après l'avoir lue"
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+#, fuzzy
+msgid "package %s has a license that you need to accept:"
+msgstr "Le package %s a une licence que vous devez accepter après l'avoir lue"
+
+#, fuzzy
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
 "Le package %s a une licence que vous devez accepter :\n"
 "d'après le fichier DESCRIPTION, il s'agit de"
 
+msgid "%s"
+msgstr ""
+
 msgid "license for package %s not accepted"
 msgstr "La licence du package %s n'est pas acceptée"
 
@@ -956,6 +982,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr "les noms d'arguments formels doivent être spécifiés pour 'vectorize'"
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ","
+
 msgid "'arg' must be NULL or a character vector"
 msgstr "'arg' doit être NULL ou une chaîne de caractères"
 
@@ -1155,6 +1190,11 @@
 "des méthodes sont disponibles à l'importation pour la fonction %s mais pas "
 "pour la fonction générique elle-même"
 
+#, fuzzy
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+"remplacement de l'importation précédente par %s lors du chargement de %s"
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr "Pas de méthodes trouvées das \"%s\" pour les requêtes : %s"
 
@@ -1163,9 +1203,10 @@
 "des méthodes demandées sont introuvables dans l'environnement / le package "
 "%s : %s"
 
+#, fuzzy
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 "Pas de fonction générique trouvée pour les méthodes importées requises pour "
 "\"%s\" du package \"%s\" (exports incorrect ?)"
@@ -1326,6 +1367,10 @@
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "argument 'name' incorrect"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr "'compress' est ignoré à moins que 'file' ne soit le nom d'un fichier"
 
@@ -1363,6 +1408,9 @@
 "'decreasing' doit être un vecteur logique unitaire.\n"
 "Aviez-vous l'intention de définir 'partial'?"
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr "'index.return' seulement pour des variables autres que des facteurs"
 
@@ -1391,9 +1439,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr "method=\"quick\" est utilisable seulement pour des 'x' numériques"
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "method=\"radix\" est seulement utilisable pour des 'x' entiers"
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr "'local' doit être TRUE, FALSE ou un environnement"
 
@@ -1447,9 +1492,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr "encodage probablement erroné dans les noms de colonnes 'names(.)'"
 
-msgid ","
-msgstr ","
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr "STATS est plus long que l'étendue de 'dim(x)[MARGIN]'"
 
@@ -1494,6 +1536,10 @@
 msgid "arguments must have same length"
 msgstr "les arguments doivent avoir même longueur"
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr "le nombre de niveaux diffère"
+
 msgid "handler must be a function"
 msgstr "le manipulateur de données (handler) doit être une fonction"
 
@@ -1782,11 +1828,6 @@
 msgstr[1] ""
 "les méthodes S3 %s sont déclarées dans NAMESPACE mais sont introuvables"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "l'argument supplémentaire %s sera ignoré"
-msgstr[1] "l'argument supplémentaire %s sera ignoré"
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "%s n'est pas TRUE"
@@ -1798,13 +1839,29 @@
 msgstr[1] "Messages d'avis :\n"
 
 #, fuzzy
-#~ msgid "cannot be unloaded."
-#~ msgstr "l'espace de noms %s ne peut être déchargé :"
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] "l'argument supplémentaire %s sera ignoré"
+msgstr[1] "l'argument supplémentaire %s sera ignoré"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "'vec' contient des valeurs manquantes (NAs)"
+
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "method=\"radix\" est seulement utilisable pour des 'x' entiers"
 
 #, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr "l'objet %s n'est pas exporté par 'namespace:%s'"
 
+#, fuzzy
+#~ msgid "cannot be unloaded."
+#~ msgstr "l'espace de noms %s ne peut être déchargé :"
+
 #~ msgid "package %s %s was found, but %s %s is required by %s"
 #~ msgstr "le package %s %s est trouvé, mais %s %s est réquis par %s"
 
diff -Nru r-base-3.2.3/src/library/base/po/RGui-da.po r-base-3.3.1/src/library/base/po/RGui-da.po
--- r-base-3.2.3/src/library/base/po/RGui-da.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-da.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: RGUi\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2014-03-18 23:36+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -32,12 +32,12 @@
 msgid "Unable to open the clipboard"
 msgstr "Kan ikke åbne udklipsholderen"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Utilstrækkelig hukommelse. Luk venligst konsollen"
 
 # engelsk fejl, ekstra mellemrum.
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -47,23 +47,23 @@
 "Skrifttype %s-%d-%d blev ikke fundet.\n"
 "Bruger systemskrifttype"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Gem markering til"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Gem konsolindhold til"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Rulle.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Tastatur: PgUp, PgDown, Ctrl+pile, Ctrl+Home, Ctrl+End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -71,75 +71,75 @@
 "  Mus: Brug rullebjælkerne.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Redigere.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  Flytning af markøren: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     Venstre pil eller Ctrl+B: Flyt et tegn tilbage;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     Højre pil eller Ctrl+F: Flyt et tegn fremad;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home eller Ctrl+A: GÃ¥ til begyndelsen af linjen;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End eller Ctrl+E: GÃ¥ til slutningen af linjen;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Historik: Pilene op og ned, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Slette:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del eller Ctrl+D: Slet aktuelt tegn eller markering;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Slet tilbage: Slet foregående tegn;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     Ctrl+Del eller Ctrl+K: Slet tekst fra aktuel tegn til slutningen af "
 "linjen.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: Slet al tekst fra aktuel linje.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Kopier og indsæt.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "     Brug musen (med den venstre tast nede) til at markere (vælge) tekst.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "     Brug Skift+Del (eller Ctrl+C) til at kopiere den markerede tekst til "
 "udklipsholderen og\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -147,28 +147,28 @@
 "     Skift+Ins (eller Ctrl+V eller Ctrl+Y) til at indsætte indholdet af "
 "udklipsholderen (hvis der er noget)  \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     til konsollen, Ctrl+X først kopier så indsæt\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  Div.:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: Ryd konsollen.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     Ctrl+O eller INS: Skift tilstand for overskrivning: Som start slukket.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: Udveksl aktuelt tegn med tegnet til venstre.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -176,7 +176,7 @@
 "\n"
 "Bemærk: Konsol opdateres kun når inddata er krævet..\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -184,7 +184,7 @@
 "  Brug Ctrl+W til at tænde og slukke denne funktion..\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -192,7 +192,7 @@
 "Brug ESC til at stoppe fortolkeren.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -200,11 +200,11 @@
 "TAB påbegynder færdiggørelse af det aktuelle ord.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "Standardgenvejstaster for Windows kan bruges til at skifte til\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "den grafiske enhed (Ctrl+Tab eller Ctrl+F6 i MDI, Alt+Tab i SDI)"
 
@@ -361,6 +361,7 @@
 msgstr "Gem som..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Udskriv..."
@@ -416,7 +417,7 @@
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Vælg fil"
 
@@ -617,7 +618,8 @@
 msgstr "Opdater pakker..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Installer pakker fra lokale zip-filer..."
 
 #: src/gnuwin32/rui.c:944
@@ -831,7 +833,7 @@
 msgid "menu or item does not exist"
 msgstr "menu eller punkt findes ikke"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Gem arbejdsrumsbillede?"
 
@@ -853,27 +855,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "Kan ikke angive »%s« som arbejdsmappe"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "O.k."
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Bruger"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "»%s« ikke fundet"
@@ -1121,10 +1123,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "som en metafil\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Udskriv...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "luk enhed"
@@ -1209,5 +1207,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Klik eller tryk på RETUR for næste side"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Udskriv...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "ugyldig enhed"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-de.po r-base-3.3.1/src/library/base/po/RGui-de.po
--- r-base-3.2.3/src/library/base/po/RGui-de.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-de.po	2016-04-27 22:15:36.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: R-3.1.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2015-02-09 08:52+0000\n"
-"PO-Revision-Date: 2013-03-18 10:12+0100\n"
+"PO-Revision-Date: 2016-04-07 11:28+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
 "Language: de\n"
@@ -23,7 +23,7 @@
 
 #: src/gnuwin32/console.c:1256 src/gnuwin32/console.c:1260
 msgid "Insufficient memory: text not copied to the clipboard"
-msgstr "Nicht genügend Speicher: Text nicht in Zwischenablege kopiert"
+msgstr "Nicht genügend Speicher: Text nicht in Zwischenablage kopiert"
 
 #: src/gnuwin32/console.c:1296 src/extra/graphapp/clipboard.c:53
 #: src/extra/graphapp/clipboard.c:79
@@ -246,7 +246,7 @@
 
 #: src/gnuwin32/editor.c:606
 msgid "A standard text editor for editing and running R code.\n"
-msgstr "Ein Standardtexteditor zum Bearbeiten und Laufen lassen von R Code.\n"
+msgstr "Ein Standardtexteditor zum Bearbeiten und Ausführen lassen von R Code.\n"
 
 #: src/gnuwin32/editor.c:608
 msgid "RUNNING COMMANDS\n"
@@ -475,7 +475,7 @@
 "Save the preferences and restart Rgui to apply them.\n"
 msgstr ""
 "Die Eigenschaften der Konsole können nicht geändert\n"
-"werden während die Konsole läuft.\n"
+"werden, während die Konsole läuft.\n"
 "\n"
 "Sichern Sie die Einstellungen und starten Sie Rgui neu.\n"
 
@@ -540,7 +540,7 @@
 
 #: src/gnuwin32/rui.c:199
 msgid "Save history in"
-msgstr "Speicher History in"
+msgstr "Speichere History in"
 
 #: src/gnuwin32/rui.c:246 src/gnuwin32/rui.c:255
 msgid "No text available"
@@ -548,7 +548,7 @@
 
 #: src/gnuwin32/rui.c:304
 msgid "Name of data frame or matrix"
-msgstr "Name von Data Frame oder Matrix"
+msgstr "Name von Dataframe oder Matrix"
 
 #: src/gnuwin32/rui.c:311
 #, c-format
@@ -569,7 +569,7 @@
 
 #: src/gnuwin32/rui.c:617
 msgid "Search for words in help list archives and documentation"
-msgstr "Suche nach den Worten in den Archiven von R-help und der Dokumentation"
+msgstr "Suche nach Begriffen in den Archiven von R-help und der Dokumentation"
 
 #: src/gnuwin32/rui.c:632
 msgid "Apropos"
@@ -769,7 +769,7 @@
 
 #: src/gnuwin32/rui.c:1172
 msgid "Filename completion"
-msgstr "Dateinamenvervolständigung"
+msgstr "Dateinamenvervollständigung"
 
 #: src/gnuwin32/rui.c:1179
 msgid "List objects"
@@ -838,7 +838,7 @@
 
 #: src/extra/graphapp/clipboard.c:69 src/extra/graphapp/clipboard.c:73
 msgid "Insufficient memory: cell not copied to the clipboard"
-msgstr "Ungenügend Speicher: Zelle wurde nicht in Zwischenablage kopiert"
+msgstr "Zu wenig Speicher: Zelle wurde nicht in Zwischenablage kopiert"
 
 #: src/extra/graphapp/dialogs.c:148 src/extra/graphapp/dialogs.c:165
 #: src/extra/graphapp/dialogs.c:182
@@ -922,15 +922,15 @@
 
 #: src/library/utils/src/windows/dataentry.c:1473
 msgid "column names cannot be blank"
-msgstr "Spaltennamen können keine Blanks sein"
+msgstr "Spaltennamen können nicht leer sein"
 
 #: src/library/utils/src/windows/dataentry.c:1519
 msgid "Variable editor"
-msgstr "Variable Editor"
+msgstr "Variableneditor"
 
 #: src/library/utils/src/windows/dataentry.c:1524
 msgid "variable name"
-msgstr "Variable Name"
+msgstr "Variablenname"
 
 #: src/library/utils/src/windows/dataentry.c:1526
 msgid "type"
@@ -1079,12 +1079,12 @@
 #: src/library/grDevices/src/devWindows.c:1619
 #: src/library/grDevices/src/devWindows.c:1630
 msgid "Stop locator"
-msgstr "Stopp locator()"
+msgstr "Beende locator()"
 
 #: src/library/grDevices/src/devWindows.c:1629
 #: src/library/grDevices/src/devWindows.c:1633
 msgid "Stop"
-msgstr "Stopp"
+msgstr "Beenden"
 
 #: src/library/grDevices/src/devWindows.c:1635
 msgid "Continue"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-es.po r-base-3.3.1/src/library/base/po/RGui-es.po
--- r-base-3.2.3/src/library/base/po/RGui-es.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-es.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2012-03-16 15:43+0100\n"
 "Last-Translator: Dr. Pablo Emilio Verde <pabloemilio.verde@uni-duesseldorf."
 "de>\n"
@@ -32,11 +32,11 @@
 msgid "Unable to open the clipboard"
 msgstr "No es posible abrir el área de transferencia"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Memoria insuficiente. Por favor cierre la consola"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -46,23 +46,23 @@
 "Fuente %s-%d-%d  no encontrada.\n"
 "Usando fuente dada por el sistema"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Guardar como"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Guardar contenido de la consola en "
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Desplazarse.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Teclado:  PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -70,75 +70,75 @@
 "  Mouse: use la barra de desplazamiento.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Editando.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr " Moviendo el cursor: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "    Flecha izquierda or Ctrl+B: mueve un caracter para atras;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     Flecha derecha o  Ctrl+F: mueve un caracter para adelante;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home o Ctrl+A: va al principio de linea;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End o Ctrl+E: va al fin de linea;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Histórico: flechas arriba y abajo, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Borrando:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del o Ctrl+D: borrar caracter actual o sección;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: delete preceding character;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     Ctrl+Del o Ctrl+K: borra texto desde caracter actual al fin de linea.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: borrar todo el texto desde la linea actual.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Copiar y pegar.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "     Use el mouse (con el botón izquierdo sujetado) para marcar (selecionar) "
 "texto.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "     Use Shift+Del (o Ctrl+C) para copiar el texto selecionado para a área "
 "de transferencia\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -146,29 +146,29 @@
 "     Shift+Ins (o Ctrl+V o Ctrl+Y) para pegar el contenido del área de "
 "transferencia (si hubiera alguno)  \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     para la consola, Ctrl+X primeiro copie depues pegue\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  Misc:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: Limpia la consola.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     Ctrl+O o INS: Alterna o modo de sobre ecritura: inicialmente "
 "desactivado.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: Intercambia caracter actual con uno de la izquierda.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -176,7 +176,7 @@
 "\n"
 "Nota: Consola es actualizada solo cuando alguna entrada es requerida.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -184,7 +184,7 @@
 "  Use Ctrl+W para alternar esta caracteristica prendido/apagado.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -192,7 +192,7 @@
 "Use ESC para parar el interprete.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -200,11 +200,11 @@
 "TAB comienza a completar la palabra.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "Teclas estandards de Windows pueden ser utilizadas para cambiar a\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "dispositivo gráfico (Ctrl+Tab ou Ctrl+F6 en MDI, Alt+Tab en SDI)"
 
@@ -362,6 +362,7 @@
 msgstr "Guardar como..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Imprimir..."
@@ -417,7 +418,7 @@
 msgid "Untitled"
 msgstr "Sin nombre"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Selecionar archivo"
 
@@ -620,7 +621,8 @@
 msgstr "Actualizar paquetes..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Instalar paquetes(s) a partir de archivos zip locales..."
 
 #: src/gnuwin32/rui.c:944
@@ -832,7 +834,7 @@
 msgid "menu or item does not exist"
 msgstr "menu o item no existente"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Guardar imagen de área de trabajo?"
 
@@ -855,27 +857,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "No fue posible especificar '%s' como directorio de trabajo"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Usuario"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Palabra secreta"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
@@ -1126,10 +1128,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "como un Metafile\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Imprimir...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "cerrar Dispositivo"
@@ -1214,5 +1212,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Clique con el mouse o presione ENTER para próxima página"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Imprimir...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "dispositivo inválido"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-fa.po r-base-3.3.1/src/library/base/po/RGui-fa.po
--- r-base-3.2.3/src/library/base/po/RGui-fa.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-fa.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.15.2\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2012-10-26 22:30+0330\n"
 "Last-Translator: Seyed Mahmood Taghavi Shahri <taghavi_m@razi.tums.ac.ir>\n"
 "Language-Team: Persian\n"
@@ -29,11 +29,11 @@
 msgid "Unable to open the clipboard"
 msgstr "ناتوان در باز کردن کلیپ‌بود"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "به علت کمبود حا�ظه لط�ا کنسول را ببندید"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -43,24 +43,24 @@
 ".پیدا نشد %s-%d-%d �ونت \n"
 "از �ونت ثابت سیستم است�اده می‌شود"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "ذخیره متن منتخب"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "ذخیره تمام متن"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "راهنمای پیمایش کنسول \n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr ""
 " و کنترل کلیدهای جهتی Ctrl+End و Ctrl+Home و PgDown و PgUp :ص�حه‌کلید \n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -68,73 +68,73 @@
 " موشی: از میله لغزشی که در لبه راست یا پایین کنسول ظاهر می‌شود است�اده کنید \n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "راهنمای ویرایش در کنسول \n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "برای جابجایی مکان‌نمای چشمک‌زن: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr " مکان‌نمای چشمک‌زن را یک حر� به عقب می‌برد Ctrl+B کلید جهتی چپ یا \n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr " مکان‌نمای چشمک‌زن را یک حر� به جلو می‌برد Ctrl+F کلید جهتی راست یا \n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr " مکان‌نمای چشمک‌زن را به ابتدای خط انتقال می‌دهد Ctrl+A یا Home \n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr " مکان‌نمای چشمک‌زن را به انتهای خط انتقال می‌دهد Ctrl+E یا End \n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr ""
 " تاریخچه را نشان می‌دهند Ctrl+N و Ctrl+P کلیدهای جهتی بالا و پایین یا \n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "برای پاک کردن متن: \n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr " حر� (جاری) سمت راست یا محدوده منتخب را پاک می‌کند Ctrl+D یا Del \n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr " حر� (قبلی) سمت چپ را پاک می‌کند Backspace \n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 " از حر� (جاری) سمت راست تا انتهای خط را پاک می‌کند Ctrl+K یا Ctrl+Del \n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr " نمام متن خط جاری را پاک می‌کند Ctrl+U \n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "برای کپی و جای گذاری: \n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 " برای علامت‌گذاری متن (انتخاب) از موشی (با نگه داشتن دکمه چپ) است�اده کنید \n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr " برای کپی متن علامت‌گذاری به کلیپ‌بورد بکار می‌رود Shift+Del یا Ctrl+C \n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -142,27 +142,27 @@
 " در کنسول برای Shift+Ins یا Ctrl+Y یا Ctrl+V \n"
 " جای گذاری محتوای کلیپ‌بورد (اگر وجود داشته باشد) بکار می‌رود \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr " از متن کپی گر�ته و همزمان جای گذاری می کند Ctrl+X \n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "راهنمای موارد دیگر \n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr " متن کنسول را پاک می‌کند Ctrl+L \n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr " حالت جای‌نوشت را که ابتدائا خاموش است روشن می‌کند Ctrl+O یا INS \n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr " حرو� راست و چپ مکان‌نمای چشمک‌زن را با هم عوض می‌کند Ctrl+T \n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -170,7 +170,7 @@
 "\n"
 " نکته: بطور پیش‌�رض خروجی کنسول غیر لحظه‌ای نمایش داده می‌شود \n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -178,7 +178,7 @@
 " بکار می‌رود Ctrl+W برای تغییر حالت خروجی به لحظه‌ای و بالعکس \n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -186,7 +186,7 @@
 " برای توق� محاسبات نرم‌ا�زار بکار می‌رود ESC \n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -194,11 +194,11 @@
 " در هنگام تایپ دستورات باعث کامل نمودن نام اشیاء و توابع می‌شود TAB \n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr " با کلیدهای تعری� شده در ویندوز می‌توان بین پنجره‌ها جابه‌جا شد \n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr " SDI در حالت Alt+Tab و MDI در حالت Ctrl+F6 یا Ctrl+Tab"
 
@@ -353,6 +353,7 @@
 msgstr "ذخیره دست‌نوشته به عنوان ..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "چاپ ..."
@@ -408,7 +409,7 @@
 msgid "Untitled"
 msgstr "بدون عنوان"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "انتخاب پرونده"
 
@@ -608,7 +609,8 @@
 msgstr "به روزرسانی بسته‌ها ..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "zip نصب بسته بوسیله پرونده ..."
 
 #: src/gnuwin32/rui.c:944
@@ -820,7 +822,7 @@
 msgid "menu or item does not exist"
 msgstr "منو یا گزینه موجود نیست"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "�ضای کار در مکان پوشه کاری ذخیره شود؟"
 
@@ -842,27 +844,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "به عنوان پوشه‌کاری '%s' ناتوان در تنظیم"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr " لغو "
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "تایید"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "نام کاربری"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "رمز ورود"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "پیدا نشد \"%s\""
@@ -1109,10 +1111,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "Metafile به عنوان \tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "چاپ ... \tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "گرا�یک Device بستن"
@@ -1197,5 +1195,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "برای دیدن تصویر بعد در این پنجره تلیک کنید یا کلید اینتر را بزنید"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "چاپ ... \tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "دستگاه نامعتبر"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-fr.po r-base-3.3.1/src/library/base/po/RGui-fr.po
--- r-base-3.2.3/src/library/base/po/RGui-fr.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-fr.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: RGui 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-18 21:59+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -31,11 +31,11 @@
 msgid "Unable to open the clipboard"
 msgstr "Impossible d'ouvrir le presse-papier"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Mémoire insuffisante. Veuillez refermer la console, s'il-vous-plait"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -45,23 +45,23 @@
 "La police %s-%d-%d est introuvable.\n"
 "La police système non proportionnelle est utilisée"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Sauver la sélection dans"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Sauver le contenu de la console dans"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Défilement.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Clavier : PageHaut, PageBas, Ctrl+Flèches, Ctrl+Début, Ctrl+Fin,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -69,78 +69,78 @@
 "  Souris : utilisez les barres de défilement.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Edition.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  Déplacement du curseur : \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr ""
 "     Flèche gauche ou Ctrl+B : se déplacer d'un caractère vers la gauche ;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr ""
 "     Flèche droite ou Ctrl+F : se déplacer d'un caractère vers la droite ;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Début ou Ctrl+A : aller au début de la ligne ;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     Fin ou Ctrl+E : aller à la fin de la ligne ;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Historique : flèches haut et bas, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Effacement :\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del ou Ctrl+D : effacer le caractère courant ou la sélection ;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Suppr. arrière: effacer le caractère précédent ;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     Ctrl+Suppr ou Ctrl+K : effacer le texte du caractère sous le curseur "
 "jusqu'à la fin.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U : effacer tout le texte de la ligne courante.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Copier et coller.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "     Utilisez la souris (bouton gauche enfoncé) pour marquer (sélectionner) "
 "du texte.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "     Utilisez Shift+Suppr (ou Ctrl+C) pour copier le texte marqué dans le "
 "presse-papier et\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -148,28 +148,28 @@
 "     Shift+Ins (ou Ctrl+V ou Ctrl+Y) pour coller le contenu du presse-"
 "papier\n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     dans la console, Ctrl+X copie et colle en une fois\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  Divers :\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L : Effacer la console.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     Ctrl+O ou INS : Bascule le mode surimpression ; désactivé au départ.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T : Echange le caractère courant avec le précédent.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -178,7 +178,7 @@
 "Note: la console est mise-à-jour quand elle est prête à recevoir une "
 "commande.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -186,7 +186,7 @@
 "  Utilisez Ctrl+W pour (dés)activer ce comportement.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -194,7 +194,7 @@
 "Utilisez ECHAPPE pour arrêter le calcul.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -202,11 +202,11 @@
 "TAB pour compléter le mot courant.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "Les raccourcis Windows standard sont utilisables pour activer\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr ""
 "les périphériques graphiques (Ctrl+Tab ou Ctrl+F6 en MDI, Alt+Tab en SDI)"
@@ -364,6 +364,7 @@
 msgstr "Sauver sous..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Imprimer..."
@@ -419,7 +420,7 @@
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Sélectionner un fichier"
 
@@ -623,7 +624,8 @@
 msgstr "Mettre à jour les packages..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Installer le(s) package(s) depuis des fichiers zip..."
 
 #: src/gnuwin32/rui.c:944
@@ -835,7 +837,7 @@
 msgid "menu or item does not exist"
 msgstr "le menu ou l'entrée de menu n'existe pas"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Sauver une image de la session ?"
 
@@ -857,27 +859,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "Impossible de spécifier '%s' comme répertoire courant"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" introuvable"
@@ -1124,10 +1126,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "comme vectoriel\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Imprimer...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "Fermer le périphérique"
@@ -1212,5 +1210,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Cliquez ou appuyez ENTREE pour la page suivante"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Imprimer...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "périphérique incorrect"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-it.po r-base-3.3.1/src/library/base/po/RGui-it.po
--- r-base-3.2.3/src/library/base/po/RGui-it.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-it.po	2016-04-27 22:15:36.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: RGui\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-05 13:45+0100\n"
 "Last-Translator: Stefano M. Iacus <stefano.iacus@R-project.org>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -30,11 +30,11 @@
 msgid "Unable to open the clipboard"
 msgstr "Non è possibile aprire gli appunti"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Memoria insufficiente. Per piacere, chiudi la console"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -44,23 +44,23 @@
 "Font %s-%d-%d  non trovato.\n"
 "Utilizzo il carattere di sistema a spaziatura fissa"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Salva selezione su"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Salva contenuto console su"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Scorrimento.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Tastiera: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -68,76 +68,76 @@
 "  Mouse: usare barre scorrimento.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Modifica.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  Sposto cursore a: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     Freccia sinistra o Ctrl+B: muove indietro di un carattere;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     Freccai destra o Ctrl+F: muove avanti di un carattere;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home o Ctrl+A: vai a inizio linea;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End o Ctrl+E: vai a fine linea;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  History: Freccia Su e Giu, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Cancello:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 #, fuzzy
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del o Ctrl+D: elimina carattere corrente;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: elimina carattere precedente;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     Ctrl+Del o Ctrl+K: cancella il testo dal carattere corrente a fine "
 "riga.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: cancella tutto il testo della riga corrente.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Copia e incolla.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "     Usa il mouse (tasto sinistro abbassato) per selezionare il testo.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "     Usa Shift+Del (o Ctrl+C) per copiare il testo selezionato negli appunti "
 "e\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -145,29 +145,29 @@
 "     Shift+Ins (o Ctrl+V o Ctrl+Y) per copiare il contenuto della clipboard "
 "(se presente)  \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     nella console, Ctrl+X prima copia e poi incolla\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr " Varie:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: pulisci console.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     Ctrl+O o INS: attiva/disattiva modalità sovrascrittura: inizialmente "
 "inattiva.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: Scambia il carattere corrente con quello a sinistra.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -175,7 +175,7 @@
 "\n"
 "Nota: La Console viene aggiornata solo quando richiesto dell'input.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -183,7 +183,7 @@
 "  Usa Ctrl+W per attivare/disattivare questa funzione.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -191,18 +191,18 @@
 "Usa ESC per interrompere l'interprete.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr ""
 "Le hotkey standard di Windows possono essere utilizzate per spostarsi al\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "dispositivo grafico (Ctrl+Tab o Ctrl+F6 in MDI, Alt+Tab in SDI)"
 
@@ -359,6 +359,7 @@
 msgstr "Salva con nome..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Stampa..."
@@ -414,7 +415,7 @@
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Seleziona file"
 
@@ -617,7 +618,8 @@
 msgstr "Aggiorna pacchetti..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Installa pacchetti da file zip locali..."
 
 #: src/gnuwin32/rui.c:944
@@ -830,7 +832,7 @@
 msgid "menu or item does not exist"
 msgstr "il menu o la voce non esistono"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Salva area di lavoro?"
 
@@ -852,27 +854,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "Impossibile impostare '%s' come directory di lavoro"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Utente"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
@@ -1121,10 +1123,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "come Metafile\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Stampa...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "chiudi dispositivo"
@@ -1209,5 +1207,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Click o premi ENTER per pagina successiva"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Stampa...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "dispositivo non valido"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-ja.po r-base-3.3.1/src/library/base/po/RGui-ja.po
--- r-base-3.2.3/src/library/base/po/RGui-ja.po	2015-03-27 23:15:16.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-ja.po	2016-04-27 22:15:36.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.1 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org \n"
-"POT-Creation-Date: 2015-02-09 08:52+0000 \n"
+"Report-Msgid-Bugs-To: bugs.r-project.org\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-19 13:41+0200 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: R-core <R-core@R-project.org> \n"
@@ -31,11 +31,11 @@
 msgid "Unable to open the clipboard"
 msgstr " クリップボードを開��������ん "
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr " メモリ��足�����。コンソールを閉������ "
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -45,23 +45,23 @@
 " フォント %s-%d-%d  �見��り��ん \n"
 " システム�用��れ��るフォントを使��� "
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr " �択を以下�セーブ��� "
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr " コンソール�内容を以下��存��� "
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr " スクロール. \n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "   キーボード: PgUp, PgDown, Ctrl+矢�, Ctrl+Home, Ctrl+End, \n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -69,76 +69,76 @@
 "   マウス: スクロール�ーを使���. \n"
 " \n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr " 編集. \n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "   カーソル移動: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "      左矢� ��� Ctrl+B: 1 文字戻る; \n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "      �矢� ��� Ctrl+F: 1 文字進む; \n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "      Home ��� Ctrl+A: 行頭�移動; \n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "      End ��� Ctrl+E: 行末�移動; \n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "   履歴: 上矢��下矢��Ctrl+P�Ctrl+N \n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "   消去: \n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "      Delete ��� Ctrl+D: �在�択���る文字を消去; \n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "      Backspace: 1 ���文字を消去; \n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "      Ctrl+Del ��� Ctrl+K: �在�択���る文字�ら行末���文字を全�消"
 "去。 \n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "      Ctrl+U: �在�行�テキストを全�消去。 \n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "   コピー＆ペースト. \n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "      マウス�左ボタンを押���らマウスを使��文字列をマーク (�択) ��"
 "�。 \n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "      Shift+Del (��� Ctrl+C) を使���マーク (�択) ��文字列をクリップ"
 "ボード�コピー�� \n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -146,29 +146,29 @@
 "      Shift+Ins (��� Ctrl+V ��� Ctrl+Y) �クリップボード�内容 (も��"
 "れ�) をペースト�� \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr ""
 "      �コンソール�出力������ Ctrl+X �コピー��後�ペースト��も構"
 "���ん \n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "   ��他: \n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "      Ctrl+L: コンソール画�を全消去���。 \n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr "      Ctrl+O: 上書�モードを切り替���: 最��オフ��. \n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "      Ctrl+T: �在�文字�1文字��文字を入れ替���. \n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -176,7 +176,7 @@
 "\n"
 " 注�: 何ら��入力��求�れ�場����,コンソール�更新�れ��. \n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -184,7 +184,7 @@
 "   Ctrl+W ��在�機能� off/on を切り替���. \n"
 " \n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -192,7 +192,7 @@
 " ESC �計算を中断���. \n"
 " \n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -200,11 +200,11 @@
 " 'rcompgen' パッケージ�インストール�れ��れ�, TAB �補完を開始���. \n"
 " \n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr " 標準ウインドウズ・ホットキーを使�以下�切り��る������� \n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr ""
 " グラフィックスデ�イス (MDI 中� Ctrl+Tab ��� Ctrl+F6, SDI 中� Alt+Tab) "
@@ -364,6 +364,7 @@
 msgstr " 別���存... "
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr " �刷... "
@@ -419,7 +420,7 @@
 msgid "Untitled"
 msgstr " 無題 "
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr " ファイルを�択 "
 
@@ -619,7 +620,8 @@
 msgstr " パッケージ�更新... "
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr " ローカル��る zip ファイル�ら�パッケージ�インストール... "
 
 #: src/gnuwin32/rui.c:944
@@ -831,7 +833,7 @@
 msgid "menu or item does not exist"
 msgstr " メニュー���アイテム�存在���ん "
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr " 作業スペースを�存����? "
 
@@ -854,27 +856,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr " 作業ディレクトリ��� '%s' を設定�る�������ん "
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr " キャンセル "
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr " OK "
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr " ユーザー "
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr " パスワード "
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr " \"%s\" �見��り��ん "
@@ -1122,10 +1124,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr " メタファイル���\tCTRL+W "
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr " �刷...\tCTRL+P "
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr " デ�イスを閉�る "
@@ -1210,5 +1208,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr " クリック��� ENTER キーを押��次�ページ�移り�� "
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr " �刷...\tCTRL+P "
+
 #~ msgid "invalid device"
 #~ msgstr " 無効�デ�イス�� "
diff -Nru r-base-3.2.3/src/library/base/po/RGui-ko.po r-base-3.3.1/src/library/base/po/RGui-ko.po
--- r-base-3.2.3/src/library/base/po/RGui-ko.po	2015-03-31 22:15:13.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-ko.po	2016-04-27 22:15:37.000000000 +0000
@@ -1,24 +1,27 @@
 # Korean translation for R base package
-# src/library/base/po/RGui-ko.po
+# ./base/po/RGui-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
 #
-# Copyright (C) 1995-2015 The R Core Team
-# 
 # This file is distributed under the same license as the R base package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 # Bug-reports are processed (17-JAN-2015)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,11 +41,11 @@
 msgid "Unable to open the clipboard"
 msgstr "�립보드를 열 수 없습니다"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "메모리가 부족합니다.  콘솔� 닫아주세요"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -52,23 +55,23 @@
 "�트 %s-%d-%d를 찾� 수 없습니다.\n"
 "시스템고정�트를 사용합니다"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "선�한 부분� 다� 위치� 저장합니다"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "콘솔� 내용� 다�� 위치� 저장합니다"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "스�롤�.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  키보드: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -76,91 +79,103 @@
 "  마우스: 스�롤바를 사용하세요.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "편집.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  커서를 ��중: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     좌로 ��화살표 �는 Ctrl+B: 한 문� 뒤로 ��합니다;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     우로 ��화살표 �는 Ctrl+F: 한 문� 앞으로 ��합니다;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home �는 Ctrl+A: ��� 맨 처�으로 ��합니다;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End �는 Ctrl+E: ��� 맨 �으로 ��합니다;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  작업기�: 위로 ��과 아래로 �� 화살표들, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  삭제:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del �는 Ctrl+D: 현재 문� �는 선� �역� 삭제합니다;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: 바로 �전문�를 삭제합니다;\n"
 
-#: src/gnuwin32/console.c:2245
-msgid "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
+#: src/gnuwin32/console.c:2247
+msgid ""
+"     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr "     Ctrl+Del �는 Ctrl+K: 현재 문�부터 ��� �까지 삭제합니다.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: 현재 ��� 모든 �스트를 삭제합니다.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  복사하여 붙여넣기.\n"
 
-#: src/gnuwin32/console.c:2248
-msgid "     Use the mouse (with the left button held down) to mark (select) text.\n"
-msgstr "     복사할 �스트를 선�하기 위해서는 (좌측 버튼� 누른채로) 마우스를 �용하세요. \n"
-
-#: src/gnuwin32/console.c:2249
-msgid "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
-msgstr "     선�� �스트를 �립보드� 복사하기 위해서는 Shift+Del (�는 Ctrl+C)를 사용합니다. \n"
-
 #: src/gnuwin32/console.c:2250
-msgid "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard (if any)  \n"
-msgstr "     �립보드� 있는 내용� 콘솔� 붙여넣고� 한다면 Shift+Ins (�는 Ctrl+V 혹� Ctrl+Y)를 사용할 수 있습니다.\n"
+msgid ""
+"     Use the mouse (with the left button held down) to mark (select) text.\n"
+msgstr ""
+"     복사할 �스트를 선�하기 위해서는 (좌측 버튼� 누른채로) 마우스를 �용하"
+"세요. \n"
 
 #: src/gnuwin32/console.c:2251
+msgid ""
+"     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
+msgstr ""
+"     선�� �스트를 �립보드� 복사하기 위해서는 Shift+Del (�는 Ctrl+C)를 "
+"사용합니다. \n"
+
+#: src/gnuwin32/console.c:2252
+msgid ""
+"     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
+"(if any)  \n"
+msgstr ""
+"     �립보드� 있는 내용� 콘솔� 붙여넣고� 한다면 Shift+Ins (�는 Ctrl+V "
+"혹� Ctrl+Y)를 사용할 수 있습니다.\n"
+
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     Ctrl+X를 �용하여 복사한 뒤 붙여넣�수� 있습니다.\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  기타:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: 콘솔화면� 깨�하게 정리해 �니다.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
-msgstr "     Ctrl+O �는 INS: �어쓰기 모드로 전환합니다: 처��는 꺼져있습니다.\n"
+msgstr ""
+"     Ctrl+O �는 INS: �어쓰기 모드로 전환합니다: 처��는 꺼져있습니다.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: 현재� 문�와 좌측� 있는 문�를 서로 �환합니다.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -168,7 +183,7 @@
 "\n"
 "참고: 콘솔� 오로지 어떤 입력� 요구�어 질 때만 갱신�니다.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -176,7 +191,7 @@
 "  � 기능� 켜거나 혹� �고 싶� 때 Ctrl+W 를 �용하세요.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -184,21 +199,23 @@
 "�터프리터를 중단하기 위해서는 ESC 키를 �용하세요.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
 msgstr ""
-"TAB키를 �용하여 현재 입력중� 단어� 대한 ��완성기능� 살펴볼 수 있습니다.\n"
+"TAB키를 �용하여 현재 입력중� 단어� 대한 ��완성기능� 살펴볼 수 있습니"
+"다.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "표준 윈�우즈 핫키들� 그래픽 장치 전환� 사용� 수 있습니다 \n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
-msgstr "(MDI� 경우 Ctrl+Tab �는 Ctrl+F6를, SDI� 경우 Alt+Tab� 사용할 수 있습니다)"
+msgstr ""
+"(MDI� 경우 Ctrl+Tab �는 Ctrl+F6를, SDI� 경우 Alt+Tab� 사용할 수 있습니다)"
 
 #: src/gnuwin32/editor.c:91 src/gnuwin32/editor.c:93
 msgid "R Editor"
@@ -223,8 +240,8 @@
 msgid "Save script as"
 msgstr "다른 �름으로 스�립트를 저장"
 
-#: src/gnuwin32/editor.c:379 src/gnuwin32/editor.c:696 src/gnuwin32/pager.c:430
-#: src/gnuwin32/rui.c:1076
+#: src/gnuwin32/editor.c:379 src/gnuwin32/editor.c:696
+#: src/gnuwin32/pager.c:430 src/gnuwin32/rui.c:1076
 msgid "Open script"
 msgstr "스�립트 열기"
 
@@ -246,7 +263,8 @@
 
 #: src/gnuwin32/editor.c:609
 msgid "To run a line or section of R code, select the code and either\n"
-msgstr "R 코드 한 줄 �는 선�한 �역� 실행하고� 한다면, 코드를 먼저 선�한 뒤 \n"
+msgstr ""
+"R 코드 한 줄 �는 선�한 �역� 실행하고� 한다면, 코드를 먼저 선�한 뒤 \n"
 
 #: src/gnuwin32/editor.c:610
 msgid "     Press Ctrl-R\n"
@@ -261,12 +279,15 @@
 msgstr "     툴바� 있는 \"줄 �는 선��역 실행\" 아�콘� 눌러 주세요\n"
 
 #: src/gnuwin32/editor.c:613
-msgid "This will copy the selected commands to the console and evaluate them.\n"
+msgid ""
+"This will copy the selected commands to the console and evaluate them.\n"
 msgstr "�것� 선�� 명령어들� 콘솔로 복사하고 �가할 것입니다.\n"
 
 #: src/gnuwin32/editor.c:614
-msgid "If there is no selection, this will just run the current line and advance\n"
-msgstr "만약 선�� 명령어들� 없다면, �것� 단순히 커서가 놓� ��� 실행하고\n"
+msgid ""
+"If there is no selection, this will just run the current line and advance\n"
+msgstr ""
+"만약 선�� 명령어들� 없다면, �것� 단순히 커서가 놓� ��� 실행하고\n"
 
 #: src/gnuwin32/editor.c:615
 msgid "the cursor by one line.\n"
@@ -285,9 +306,9 @@
 msgid "Cut"
 msgstr "잘�내기"
 
-#: src/gnuwin32/editor.c:632 src/gnuwin32/editor.c:752 src/gnuwin32/pager.c:304
-#: src/gnuwin32/pager.c:477 src/gnuwin32/rui.c:859 src/gnuwin32/rui.c:1088
-#: src/gnuwin32/rui.c:1144
+#: src/gnuwin32/editor.c:632 src/gnuwin32/editor.c:752
+#: src/gnuwin32/pager.c:304 src/gnuwin32/pager.c:477 src/gnuwin32/rui.c:859
+#: src/gnuwin32/rui.c:1088 src/gnuwin32/rui.c:1144
 msgid "Copy"
 msgstr "복사하기"
 
@@ -300,8 +321,9 @@
 msgid "Delete"
 msgstr "삭제하기"
 
-#: src/gnuwin32/editor.c:636 src/gnuwin32/editor.c:758 src/gnuwin32/pager.c:307
-#: src/gnuwin32/pager.c:483 src/gnuwin32/rui.c:866 src/gnuwin32/rui.c:1149
+#: src/gnuwin32/editor.c:636 src/gnuwin32/editor.c:758
+#: src/gnuwin32/pager.c:307 src/gnuwin32/pager.c:483 src/gnuwin32/rui.c:866
+#: src/gnuwin32/rui.c:1149
 msgid "Select all"
 msgstr "모� 선�하기"
 
@@ -346,6 +368,7 @@
 msgstr "다른 �름으로 저장..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "�쇄하기..."
@@ -403,7 +426,7 @@
 msgid "Untitled"
 msgstr "제목없�"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "파�선�"
 
@@ -603,8 +626,8 @@
 msgstr "패키지 업��트..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
-msgstr "로컬� 있는 zip 파�들로부터 패키지(들) 설치..."
+msgid "Install package(s) from local files..."
+msgstr "로컬� 저장� 파�� 사용하여 패키지(들)를 설치합니다..."
 
 #: src/gnuwin32/rui.c:944
 msgid "FAQ on R"
@@ -664,11 +687,11 @@
 
 #: src/gnuwin32/rui.c:1012
 msgid "Minimize group"
-msgstr ""
+msgstr "그룹� 축소합니다."
 
 #: src/gnuwin32/rui.c:1013
 msgid "Restore group"
-msgstr ""
+msgstr "그룹복�"
 
 #: src/gnuwin32/rui.c:1080
 msgid "Load workspace"
@@ -744,7 +767,7 @@
 
 #: src/gnuwin32/rui.c:1167
 msgid "Break to debugger"
-msgstr ""
+msgstr "디버거� 브레�� 지정"
 
 #: src/gnuwin32/rui.c:1170
 msgid "Word completion"
@@ -801,7 +824,7 @@
 
 #: src/gnuwin32/rui.c:1414 src/gnuwin32/rui.c:1437 src/gnuwin32/rui.c:1442
 msgid "failed to allocate char storage"
-msgstr ""
+msgstr "저장소� 문�를 할당하지 못했습니다."
 
 #: src/gnuwin32/rui.c:1450
 msgid "failed to allocate menuitem"
@@ -815,7 +838,7 @@
 msgid "menu or item does not exist"
 msgstr "메뉴 �는 항목� 존재하지 않습니다"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "작업공간 �미지를 저장하시겠습니까?"
 
@@ -837,27 +860,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "'%s'를 작업디렉토리로 지정할 수 없습니다"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "취소"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "사용�"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "비밀번호"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\"를 찾� 수 없습니다"
@@ -970,7 +993,8 @@
 "  Ctrl-L 키는 열� �기를 ��으로 재조정하여 화면� 다시 그려 보여�니다\n"
 "  Ctrl-C 키는 선�� 셀� 복사합니다\n"
 "  Ctrl-V 키는 선�� 셀� 붙여넣습니다\n"
-"  우측 버튼� 누르면 복사, 붙여넣기, 선태� 열� 대한 ���기 조절� 할 수 있는 메뉴를 보여�니다\n"
+"  우측 버튼� 누르면 복사, 붙여넣기, 선태� 열� 대한 ���기 조절� 할 수 "
+"있는 메뉴를 보여�니다\n"
 "\n"
 
 #: src/library/utils/src/windows/dataentry.c:1700
@@ -1103,10 +1127,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "메타파�로\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "�쇄...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "장치를 닫습니다"
@@ -1191,5 +1211,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "다� 페�지로 ��하기 위해서는 �릭 �는 엔터키를 누르세요"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "�쇄...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "잘못� 장치입니다"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-nn.po r-base-3.3.1/src/library/base/po/RGui-nn.po
--- r-base-3.2.3/src/library/base/po/RGui-nn.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-nn.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-01-28 10:51+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -31,11 +31,11 @@
 msgid "Unable to open the clipboard"
 msgstr "Klarte ikkje opna utklippstavla"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Ikkje nok minne. Lukk konsollen."
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -45,24 +45,24 @@
 "Fann ikkje skrifta «%s-%d-%d».\n"
 "Brukar system-skrifta."
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Lagra utvalet til"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Lagra konsollinhaldet til"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Rulling.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr ""
 "  Tastatur: Page Up, Page Down, Ctrl + piltastar, Ctrl + Home, Ctrl + End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -70,74 +70,74 @@
 "  Mus: Bruk rullefelta.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Redigering.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  Flytting av skrivemerket: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     «Pil venstre» eller «Ctrl + B»: flytt eitt teikn bakover;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     «Pil høgre» eller «Ctrl + F»: flytt eitt teikn framover;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     «Home» eller «Ctrl + A»: gå til starten av linja;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     «End» eller «Ctrl + E»: gå til slutten av linja;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Loggen: «Pil opp» og «Pil ned», eller «Ctrl + P» og «Ctrl + N»\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Sletting:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     «Delete» eller «Ctrl + D»: slett gjeldande teikn eller utval;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     «Rettetast»: slett førre teikn;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     «Ctrl + Delete» eller «Ctrl + K»: slett tekst frå gjeldande teikn til "
 "slutten av linja.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     «Ctrl + U»: Slett all teksten frå den gjeldande linja.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Kopiering og innliming.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr "     Bruk musa (med venstre museknapp inne) for å merkje teksten.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "     Bruk «Shift + Delete» eller «Ctrl + C» for kopiera utvalet til "
 "utklippstavla, og\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -145,29 +145,29 @@
 "     «Shift + Insert», «Ctrl + V» eller «Ctrl +Y» for å lima inn innhaldet "
 "frå utklippstavla\n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     til konsollen, «Ctrl + X» først kopiera og så lima inn\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  Ymse:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     «Ctrl + L»: tøm konsollen.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     « Ctrl + O» eller «Insert»: slå på/av overskrivingsmodus (av som "
 "standard).\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     «Ctrl +T»: Byt det gjeldande teiknet med det til venstre.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -175,7 +175,7 @@
 "\n"
 "Merk: Konsollen vert berre oppdatert når han treng inndata.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -183,7 +183,7 @@
 "  Bruk «Ctrl + W» for å slå funksjonen av eller på.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -191,7 +191,7 @@
 "Bruk «Escape» for å stoppa skriptkøyringa.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -199,11 +199,11 @@
 "Bruk «Tab» for å autofullføra det gjeldande ordet.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "Du kan bruka dei vanlige Windows-snarvegane for å byta til\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr ""
 "grafikkeininga («Ctrl + Tab» eller «Ctrl + F6» i MDI, og «Alt + Tab» i SDI)"
@@ -359,6 +359,7 @@
 msgstr "Lagra som …"
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Skriv ut …"
@@ -414,7 +415,7 @@
 msgid "Untitled"
 msgstr "Namnlaus"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Vel fil"
 
@@ -615,7 +616,8 @@
 msgstr "Oppdater pakkar …"
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Installer pakkar frå lokale ZIP-filer …"
 
 #: src/gnuwin32/rui.c:944
@@ -827,7 +829,7 @@
 msgid "menu or item does not exist"
 msgstr "menyen eller elementet finst ikkje"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Vil du lagra arbeidsområdet?"
 
@@ -849,27 +851,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "Klarte ikkje velja «%s» som arbeidsmappe"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Brukar"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Passord"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Fann ikkje «%s»"
@@ -1117,10 +1119,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "Som metafil\tCTRL+w"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Skriv ut …\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "lukk eining"
@@ -1205,5 +1203,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Klikk eller trykk «Enter» for neste side"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Skriv ut …\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "ugyldig eining"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-pl.po r-base-3.3.1/src/library/base/po/RGui-pl.po
--- r-base-3.2.3/src/library/base/po/RGui-pl.po	2015-03-27 23:15:16.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-pl.po	2016-04-27 22:15:36.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -12,8 +12,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.4\n"
 
 # src/gnuwin32/console.c: 1167
 # G_("Not enough memory")
@@ -43,7 +43,7 @@
 
 # src/gnuwin32/console.c: 1914
 # G_("Insufficient memory. Please close the console")
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Brak wystarczającej pamięci. Proszę zamknąć konsolę"
 
@@ -57,7 +57,7 @@
 # sprintf(msg,
 # 		    G_("Font %s-%d-%d  not found.\nUsing system fixed font"),
 # 		    fontname, fontsty | FixedWidth, pointsize)
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026 src/gnuwin32/preferences.c:333
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028 src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
 "Font %s-%d-%d  not found.\n"
@@ -68,27 +68,27 @@
 
 # src/gnuwin32/console.c: 2127
 # G_("Save selection to")
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Zapisz wybór do"
 
 # src/gnuwin32/console.c: 2129
 # G_("Save console contents to")
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Zapisz zawartość konsoli w"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Przewijanie.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Klawiatura: PgUp, PgDown, Ctrl+Strzałki, Ctrl+Home, Ctrl+End,\n"
 
 # src/gnuwin32/console.c: 2230
 # G_("  Mouse: use the scrollbar(s).\n\n")
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -96,93 +96,93 @@
 "  Myszka: użyj pasków przewijania.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Edytowanie.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  Przesuwanie kursora: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     Lewa strzałka lub Ctrl+B: przesuń wstecz o jeden znak;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     Prawa strzałka lub Ctrl+F: przesuń do przodu o jeden znak;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home lub Ctrl+A: idź do początku linii;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End lub Ctrl+E: idź do końca linii;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Historia: Strzałki Up oraz Down, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "Kasowanie:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del lub Ctrl+D: usuń bieżący znak lub zaznaczenie;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: usuń poprzedni znak;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr "     Ctrl+Del lub Ctrl+K: usuń tekst od bieżącego znaku do końca linii.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: usuń cały tekst z bieżącej linii.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "Kopiuj i wklej.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr "     Użyj myszki (z naciśniętym lewym przyciskiem myszki) by zaznaczyć (wybrać) tekst.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr "     Użyj Shift+Del (lub Ctrl+C) by skopiować zaznaczony tekst do schowka i\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard (if any)  \n"
 msgstr "     Shift+Ins (lub Ctrl+V lub Ctrl+Y) by wkleić zawartość schowka (jeśli jakaś jest)  \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     do konsoli, Ctrl+X najpierw kopiuje potem wkleja\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr " Różne:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: Wyczyść konsolę.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr "     Ctrl+O lub INS: Przełącz tryb nadpisywania: początkowo wyłączony.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: Zamień bieżący znak z tym po lewej.\n"
 
 # src/gnuwin32/console.c: 2252
 # G_("\nNote: Console is updated only when some input is required.\n")
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -192,7 +192,7 @@
 
 # src/gnuwin32/console.c: 2253
 # G_("  Use Ctrl+W to toggle this feature off/on.\n\n")
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -202,7 +202,7 @@
 
 # src/gnuwin32/console.c: 2254
 # G_("Use ESC to stop the interpreter.\n\n")
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -212,7 +212,7 @@
 
 # src/gnuwin32/console.c: 2255
 # G_("TAB starts completion of the current word.\n\n")
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -220,13 +220,13 @@
 "TAB uzupełnia bieżące słowo.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "Standardowe klawisze skrótu mogą być użyte by przełączyć się do\n"
 
 # src/gnuwin32/console.c: 2257
 # G_("graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)")
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "urzÄ…dzenia graficznego (Ctrl+Tab lub Ctrl+F6 w MDI, Alt+Tab w SDI)"
 
@@ -505,7 +505,7 @@
 # G_("Print...")
 # src/library/grDevices/src/devWindows.c: 1688
 # G_("Print...")
-#: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138 src/library/grDevices/src/devWindows.c:1708
+#: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138 src/library/grDevices/src/devWindows.c:1666 src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Drukuj..."
 
@@ -603,7 +603,7 @@
 # G_("Select file")
 # src/gnuwin32/extra.c: 823
 # G_("Select file")
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Wybierz plik"
 
@@ -926,8 +926,8 @@
 # src/gnuwin32/rui.c: 918
 # G_("Install package(s) from local zip files...")
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
-msgstr "Zainstaluj pakiet(y) z lokalnych plików zip..."
+msgid "Install package(s) from local files..."
+msgstr "Zainstaluj pakiet(y) z lokalnych plików..."
 
 # src/gnuwin32/rui.c: 942
 # G_("FAQ on R")
@@ -1274,7 +1274,7 @@
 
 # src/gnuwin32/system.c: 442
 # G_("Save workspace image?")
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Zapisać obraz obszaru roboczego?"
 
@@ -1325,7 +1325,7 @@
 # gettext("Cancel")
 # src/library/utils/src/windows/widgets.c: 125
 # G_("Cancel")
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621 src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726 src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746 src/library/utils/src/windows/widgets.c:125
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622 src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727 src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747 src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1353,13 +1353,13 @@
 # message(" OK")
 # src/library/utils/src/windows/widgets.c: 124
 # G_("OK")
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742 src/library/utils/src/windows/widgets.c:124
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743 src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
 
 # src/extra/graphapp/dialogs.c: 733
 # G_("User")
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Użytkownik"
 
@@ -1367,7 +1367,7 @@
 # G_("Password")
 # src/extra/graphapp/dialogs.c: 736
 # (_("Password"), rect(10, h*4, tw+4, h*2+2), AlignLeft)
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Hasło"
 
@@ -1375,7 +1375,7 @@
 # G_("\"%s\" not found")
 # src/extra/graphapp/dialogs.c: 906
 # G_("\"%s\" not found")
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nie znaleziono"
@@ -1775,12 +1775,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "jako Metaplik\tCTRL+W"
 
-# src/library/grDevices/src/devWindows.c: 1646
-# G_("Print...\tCTRL+P")
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Drukuj...\tCTRL+P"
-
 # src/library/grDevices/src/devWindows.c: 1648
 # G_("close Device")
 #: src/library/grDevices/src/devWindows.c:1668
@@ -1907,6 +1901,11 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Kliknij lub naciśnij ENTER aby przejść do następnej strony"
 
+# src/library/grDevices/src/devWindows.c: 1646
+# G_("Print...\tCTRL+P")
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Drukuj...\tCTRL+P"
+
 # src/gnuwin32/extra.c: 574
 # error(_("invalid device"))
 # src/gnuwin32/extra.c: 576
diff -Nru r-base-3.2.3/src/library/base/po/RGui.pot r-base-3.3.1/src/library/base/po/RGui.pot
--- r-base-3.2.3/src/library/base/po/RGui.pot	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui.pot	2016-04-27 22:15:37.000000000 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,11 +30,11 @@
 msgid "Unable to open the clipboard"
 msgstr ""
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr ""
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -42,146 +42,146 @@
 "Using system fixed font"
 msgstr ""
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr ""
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr ""
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr ""
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr ""
 
@@ -334,6 +334,7 @@
 msgstr ""
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr ""
@@ -389,7 +390,7 @@
 msgid "Untitled"
 msgstr ""
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr ""
 
@@ -579,7 +580,7 @@
 msgstr ""
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+msgid "Install package(s) from local files..."
 msgstr ""
 
 #: src/gnuwin32/rui.c:944
@@ -791,7 +792,7 @@
 msgid "menu or item does not exist"
 msgstr ""
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr ""
 
@@ -813,27 +814,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr ""
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
@@ -1060,10 +1061,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr ""
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr ""
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/base/po/RGui-pt_BR.po r-base-3.3.1/src/library/base/po/RGui-pt_BR.po
--- r-base-3.2.3/src/library/base/po/RGui-pt_BR.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-pt_BR.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.1.1\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:56-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -33,11 +33,11 @@
 msgid "Unable to open the clipboard"
 msgstr "Não foi possível abrir a área de transferência"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Memória insuficiente. Por favor verifique o console"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -47,23 +47,23 @@
 "Fonte %s-%d-%d  não encontrada.\n"
 "Usando fonte fixa do sistema"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Salvar seleção em"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Salvar conteúdo do console em"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Fazendo rolagem.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Teclado:  PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -71,78 +71,78 @@
 "  Mouse: use a(s) barra(s) de rolagem.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Editando.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr " Movendo o cursor: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     Seta esquerda ou Ctrl+B: anda para trás um caractere;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     Seta direita ou Ctrl+F: anda para frente um caractere;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home ou Ctrl+A: vai para o começo da linha;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End ou Ctrl+E: vai para o fim da linha;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Histórico: setas para Cima e para Baixo, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Excluindo:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del ou Ctrl+D: exclui o caractere atual;\n"
 
 # precedente ou próximo?
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: exclui o caracter precedente;\n"
 
 # atual ou corrente?
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     Ctrl+Del ou Ctrl+K: apaga o texto do caracter atual até o final da "
 "linha.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: exclui todo o texto da linha atual.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Copiar e colar.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "     Use o mouse (segurando o botão esquerdo) para marcar (selecionar) "
 "texto.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr ""
 "     Use Shift+Del (ou Ctrl+C) para copiar o texto selecionado para a área "
 "de transferência e\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
@@ -150,28 +150,28 @@
 "     Shift+Ins (ou Ctrl+V ou Ctrl+Y) para colar o conteúdo da área de "
 "transferência (se houver algum)  \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     para o console, Ctrl+X primeiro copie depois cole\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  Misc:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: Limpa o console.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     Ctrl+O or INS: Alterna o modo de sobrescrita: inicialmente desligado.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: Troca o caracter atual com o da esquerda.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -179,7 +179,7 @@
 "\n"
 "Nota: O console é atualizado somente quando alguma entrada é requerida.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -187,7 +187,7 @@
 "  Use Ctrl+W para alternar entre a ativação/desativação desse recurso.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -195,7 +195,7 @@
 "Use ESC para parar o interpretador.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -203,12 +203,12 @@
 "TAB começa a completar a palavra atual.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr ""
 "Teclas de atalho padrão do Windows podem ser usadas para mudar para o\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "dispositivo gráfico (Ctrl+Tab ou Ctrl+F6 em MDI, Alt+Tab em SDI)"
 
@@ -368,6 +368,7 @@
 msgstr "Salvar como..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Imprimir..."
@@ -423,7 +424,7 @@
 msgid "Untitled"
 msgstr "Sem nome"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
@@ -625,7 +626,8 @@
 msgstr "Atualizar pacotes..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Instalar pacote(s) a partir de arquivos zip locais..."
 
 #: src/gnuwin32/rui.c:944
@@ -837,7 +839,7 @@
 msgid "menu or item does not exist"
 msgstr "menu ou item não existe"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Salvar imagem da área de trabalho?"
 
@@ -860,27 +862,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "Não foi possível especificar '%s' como o diretório de trabalho"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Usuário"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Senha"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" não encontrado"
@@ -1133,10 +1135,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "como um Metafile\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Imprimir...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "fecha Dispositivo"
@@ -1221,5 +1219,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Clique com o mouse ou pressione ENTER para próxima página"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Imprimir...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "dispositivo inválido"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-ru.po r-base-3.3.1/src/library/base/po/RGui-ru.po
--- r-base-3.2.3/src/library/base/po/RGui-ru.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-ru.po	2016-04-27 22:15:37.000000000 +0000
@@ -9,25 +9,27 @@
 "Project-Id-Version: R 2.10.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2015-02-09 08:52+0000\n"
-"PO-Revision-Date: 2013-03-19 17:46-0600\n"
+"PO-Revision-Date: 2016-04-05 18:17-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian <dactylorhiza at gmail>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/gnuwin32/console.c:1167 src/gnuwin32/console.c:1209
+#: src/gnuwin32/console.c:1167
+#: src/gnuwin32/console.c:1209
 msgid "Not enough memory"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ"
 
-#: src/gnuwin32/console.c:1256 src/gnuwin32/console.c:1260
+#: src/gnuwin32/console.c:1256
+#: src/gnuwin32/console.c:1260
 msgid "Insufficient memory: text not copied to the clipboard"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ: ÔÅËÓÔ ÎÅ ÓËÏÐÉÒÏ×ÁÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ"
 
-#: src/gnuwin32/console.c:1296 src/extra/graphapp/clipboard.c:53
+#: src/gnuwin32/console.c:1296
+#: src/extra/graphapp/clipboard.c:53
 #: src/extra/graphapp/clipboard.c:79
 msgid "Unable to open the clipboard"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÕÆÅÒ ÏÂÍÅÎÁ"
@@ -36,7 +38,8 @@
 msgid "Insufficient memory. Please close the console"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ. ðÏÖÁÌÕÊÓÔÁ, ÚÁËÒÏÊÔÅ ËÏÎÓÏÌØ"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1972
+#: src/gnuwin32/console.c:2026
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -111,11 +114,8 @@
 msgstr "     Backspace: ÕÄÁÌÉÔØ ÐÒÅÄÙÄÕÝÉÊ ÓÉÍ×ÏÌ;\n"
 
 #: src/gnuwin32/console.c:2245
-msgid ""
-"     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
-msgstr ""
-"     Ctrl+Del ÉÌÉ Ctrl+K: ÕÄÁÌÉÔØ ÔÅËÓÔ ÏÔ ÔÅËÕÝÅÇÏ ÓÉÍ×ÏÌÁ ÄÏ ËÏÎÃÁ "
-"ÓÔÒÏËÉ.\n"
+msgid "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
+msgstr "     Ctrl+Del ÉÌÉ Ctrl+K: ÕÄÁÌÉÔØ ÔÅËÓÔ ÏÔ ÔÅËÕÝÅÇÏ ÓÉÍ×ÏÌÁ ÄÏ ËÏÎÃÁ ÓÔÒÏËÉ.\n"
 
 #: src/gnuwin32/console.c:2246
 msgid "     Ctrl+U: delete all text from current line.\n"
@@ -126,24 +126,16 @@
 msgstr "  ëÏÐÉÒÏ×ÁÎÉÅ É ×ÓÔÁ×ËÁ:\n"
 
 #: src/gnuwin32/console.c:2248
-msgid ""
-"     Use the mouse (with the left button held down) to mark (select) text.\n"
-msgstr ""
-"     éÓÐÏÌØÚÏ×ÁÔØ ÍÙÛØ (Ó ÎÁÖÁÔÏÊ ÌÅ×ÏÊ ËÎÏÐËÏÊ) ÄÌÑ ×ÙÄÅÌÅÎÉÑ ÔÅËÓÔÁ.\n"
+msgid "     Use the mouse (with the left button held down) to mark (select) text.\n"
+msgstr "     éÓÐÏÌØÚÏ×ÁÔØ ÍÙÛØ (Ó ÎÁÖÁÔÏÊ ÌÅ×ÏÊ ËÎÏÐËÏÊ) ÄÌÑ ×ÙÄÅÌÅÎÉÑ ÔÅËÓÔÁ.\n"
 
 #: src/gnuwin32/console.c:2249
-msgid ""
-"     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
-msgstr ""
-"     éÓÐÏÌØÚÏ×ÁÔØ Shift+Del (ÉÌÉ Ctrl+C) ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ ×ÙÄÅÌÅÎÉÑ × ÂÕÆÅÒ\n"
+msgid "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
+msgstr "     éÓÐÏÌØÚÏ×ÁÔØ Shift+Del (ÉÌÉ Ctrl+C) ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ ×ÙÄÅÌÅÎÉÑ × ÂÕÆÅÒ\n"
 
 #: src/gnuwin32/console.c:2250
-msgid ""
-"     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
-"(if any)  \n"
-msgstr ""
-"     Shift+Ins (ÉÌÉ Ctrl+V ÉÌÉ Ctrl+Y) ÄÌÑ ×ÓÔÁ×ËÉ ÓÏÄÅÒÖÉÍÏÇÏ ÂÕÆÅÒÁ (ÅÓÌÉ "
-"ÅÓÔØ)  \n"
+msgid "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard (if any)  \n"
+msgstr "     Shift+Ins (ÉÌÉ Ctrl+V ÉÌÉ Ctrl+Y) ÄÌÑ ×ÓÔÁ×ËÉ ÓÏÄÅÒÖÉÍÏÇÏ ÂÕÆÅÒÁ (ÅÓÌÉ ÅÓÔØ)  \n"
 
 #: src/gnuwin32/console.c:2251
 msgid "     to the console, Ctrl+X first copy then paste\n"
@@ -205,7 +197,8 @@
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "ÏËÎÕ ÇÒÁÆÉËÉ (Ctrl+Tab ÉÌÉ Ctrl+F6 × MDI, Alt+Tab × SDI)"
 
-#: src/gnuwin32/editor.c:91 src/gnuwin32/editor.c:93
+#: src/gnuwin32/editor.c:91
+#: src/gnuwin32/editor.c:93
 msgid "R Editor"
 msgstr "òÅÄÁËÔÏÒ R"
 
@@ -228,12 +221,16 @@
 msgid "Save script as"
 msgstr "óÏÈÒÁÎÉÔØ ÓËÒÉÐÔ ËÁË"
 
-#: src/gnuwin32/editor.c:379 src/gnuwin32/editor.c:696
-#: src/gnuwin32/pager.c:430 src/gnuwin32/rui.c:1076
+#: src/gnuwin32/editor.c:379
+#: src/gnuwin32/editor.c:696
+#: src/gnuwin32/pager.c:430
+#: src/gnuwin32/rui.c:1076
 msgid "Open script"
 msgstr "ïÔËÒÙÔØ ÓËÒÉÐÔ"
 
-#: src/gnuwin32/editor.c:502 src/gnuwin32/pager.c:184 src/gnuwin32/pager.c:204
+#: src/gnuwin32/editor.c:502
+#: src/gnuwin32/pager.c:184
+#: src/gnuwin32/pager.c:204
 msgid "No RGui console to paste to"
 msgstr "îÅÔ ÇÒÁÆÉÞÅÓËÏÊ ËÏÎÓÏÌÉ ÄÌÑ ×ÓÔÁ×ËÉ"
 
@@ -266,50 +263,61 @@
 msgstr "     îÁÖÍÉÔÅ ÎÁ ÐÁÎÅÌÉ ËÎÏÐËÕ \"úÁÐÕÓÔÉÔØ ÓÔÒÏËÕ ÉÌÉ ÂÌÏË\"\n"
 
 #: src/gnuwin32/editor.c:613
-msgid ""
-"This will copy the selected commands to the console and evaluate them.\n"
-msgstr ""
-"÷ ÒÅÚÕÌØÔÁÔÅ ×ÙÂÒÁÎÎÙÅ ËÏÍÁÎÄÙ ÓËÏÐÉÒÕÀÔÓÑ ÎÁ ËÏÎÓÏÌØ É ÚÁÐÕÓÔÑÔÓÑ ÔÁÍ.\n"
+msgid "This will copy the selected commands to the console and evaluate them.\n"
+msgstr "÷ ÒÅÚÕÌØÔÁÔÅ ×ÙÂÒÁÎÎÙÅ ËÏÍÁÎÄÙ ÓËÏÐÉÒÕÀÔÓÑ ÎÁ ËÏÎÓÏÌØ É ÚÁÐÕÓÔÑÔÓÑ ÔÁÍ.\n"
 
 #: src/gnuwin32/editor.c:614
-msgid ""
-"If there is no selection, this will just run the current line and advance\n"
+msgid "If there is no selection, this will just run the current line and advance\n"
 msgstr "åÓÌÉ ×ÙÄÅÌÅÎÉÑ ÎÅÔ, ÂÕÄÅÔ ÚÁÐÕÝÅÎÁ ÔÅËÕÝÁÑ ÓÔÒÏËÁ, Á ËÕÒÓÏÒ\n"
 
 #: src/gnuwin32/editor.c:615
 msgid "the cursor by one line.\n"
 msgstr "ÐÅÒÅÍÅÓÔÉÔÓÑ ÎÁ ÓÔÒÏËÕ ×ÎÉÚ.\n"
 
-#: src/gnuwin32/editor.c:627 src/gnuwin32/editor.c:704
+#: src/gnuwin32/editor.c:627
+#: src/gnuwin32/editor.c:704
 #: src/gnuwin32/editor.c:762
 msgid "Run line or selection"
 msgstr "úÁÐÕÓÔÉÔØ ÓÔÒÏËÕ ÉÌÉ ÂÌÏË"
 
-#: src/gnuwin32/editor.c:629 src/gnuwin32/editor.c:747
+#: src/gnuwin32/editor.c:629
+#: src/gnuwin32/editor.c:747
 msgid "Undo"
 msgstr "ïÔÍÅÎÉÔØ"
 
-#: src/gnuwin32/editor.c:631 src/gnuwin32/editor.c:750
+#: src/gnuwin32/editor.c:631
+#: src/gnuwin32/editor.c:750
 msgid "Cut"
 msgstr "÷ÙÒÅÚÁÔØ"
 
-#: src/gnuwin32/editor.c:632 src/gnuwin32/editor.c:752
-#: src/gnuwin32/pager.c:304 src/gnuwin32/pager.c:477 src/gnuwin32/rui.c:859
-#: src/gnuwin32/rui.c:1088 src/gnuwin32/rui.c:1144
+#: src/gnuwin32/editor.c:632
+#: src/gnuwin32/editor.c:752
+#: src/gnuwin32/pager.c:304
+#: src/gnuwin32/pager.c:477
+#: src/gnuwin32/rui.c:859
+#: src/gnuwin32/rui.c:1088
+#: src/gnuwin32/rui.c:1144
 msgid "Copy"
 msgstr "ëÏÐÉÒÏ×ÁÔØ"
 
-#: src/gnuwin32/editor.c:633 src/gnuwin32/editor.c:754 src/gnuwin32/rui.c:860
-#: src/gnuwin32/rui.c:1092 src/gnuwin32/rui.c:1145
+#: src/gnuwin32/editor.c:633
+#: src/gnuwin32/editor.c:754
+#: src/gnuwin32/rui.c:860
+#: src/gnuwin32/rui.c:1092
+#: src/gnuwin32/rui.c:1145
 msgid "Paste"
 msgstr "÷ÓÔÁ×ÉÔØ"
 
-#: src/gnuwin32/editor.c:634 src/gnuwin32/editor.c:756
+#: src/gnuwin32/editor.c:634
+#: src/gnuwin32/editor.c:756
 msgid "Delete"
 msgstr "õÄÁÌÉÔØ"
 
-#: src/gnuwin32/editor.c:636 src/gnuwin32/editor.c:758
-#: src/gnuwin32/pager.c:307 src/gnuwin32/pager.c:483 src/gnuwin32/rui.c:866
+#: src/gnuwin32/editor.c:636
+#: src/gnuwin32/editor.c:758
+#: src/gnuwin32/pager.c:307
+#: src/gnuwin32/pager.c:483
+#: src/gnuwin32/rui.c:866
 #: src/gnuwin32/rui.c:1149
 msgid "Select all"
 msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ"
@@ -318,7 +326,8 @@
 msgid "Save script"
 msgstr "óÏÈÒÁÎÉÔØ ÓËÒÉÐÔ"
 
-#: src/gnuwin32/editor.c:708 src/gnuwin32/pager.c:450
+#: src/gnuwin32/editor.c:708
+#: src/gnuwin32/pager.c:450
 #: src/library/grDevices/src/devWindows.c:1613
 msgid "Return focus to Console"
 msgstr "÷ÅÒÎÕÔØ ÆÏËÕÓ × ËÏÎÓÏÌØ"
@@ -327,22 +336,30 @@
 msgid "Print script"
 msgstr "ðÅÞÁÔÁÔØ ÓËÒÉÐÔ"
 
-#: src/gnuwin32/editor.c:713 src/gnuwin32/pager.c:445 src/gnuwin32/rui.c:1104
+#: src/gnuwin32/editor.c:713
+#: src/gnuwin32/pager.c:445
+#: src/gnuwin32/rui.c:1104
 #: src/library/grDevices/src/devWindows.c:1607
 msgid "Print"
 msgstr "ðÅÞÁÔØ"
 
-#: src/gnuwin32/editor.c:731 src/gnuwin32/pager.c:466 src/gnuwin32/rui.c:1122
+#: src/gnuwin32/editor.c:731
+#: src/gnuwin32/pager.c:466
+#: src/gnuwin32/rui.c:1122
 #: src/library/utils/src/windows/dataentry.c:1791
 #: src/library/grDevices/src/devWindows.c:1645
 msgid "File"
 msgstr "æÁÊÌ"
 
-#: src/gnuwin32/editor.c:732 src/gnuwin32/pager.c:467 src/gnuwin32/rui.c:1124
+#: src/gnuwin32/editor.c:732
+#: src/gnuwin32/pager.c:467
+#: src/gnuwin32/rui.c:1124
 msgid "New script"
 msgstr "îÏ×ÙÊ ÓËÒÉÐÔ"
 
-#: src/gnuwin32/editor.c:734 src/gnuwin32/pager.c:468 src/gnuwin32/rui.c:1125
+#: src/gnuwin32/editor.c:734
+#: src/gnuwin32/pager.c:468
+#: src/gnuwin32/rui.c:1125
 msgid "Open script..."
 msgstr "ïÔËÒÙÔØ ÓËÒÉÐÔ..."
 
@@ -354,7 +371,9 @@
 msgid "Save as..."
 msgstr "óÏÈÒÁÎÉÔØ ËÁË..."
 
-#: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/gnuwin32/editor.c:741
+#: src/gnuwin32/pager.c:469
+#: src/gnuwin32/rui.c:1138
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "ðÅÞÁÔØ..."
@@ -363,12 +382,15 @@
 msgid "Close script"
 msgstr "úÁËÒÙÔØ ÓËÒÉÐÔ"
 
-#: src/gnuwin32/editor.c:746 src/gnuwin32/pager.c:476 src/gnuwin32/rui.c:1143
+#: src/gnuwin32/editor.c:746
+#: src/gnuwin32/pager.c:476
+#: src/gnuwin32/rui.c:1143
 #: src/library/utils/src/windows/dataentry.c:1797
 msgid "Edit"
 msgstr "ðÒÁ×ËÁ"
 
-#: src/gnuwin32/editor.c:760 src/gnuwin32/rui.c:1150
+#: src/gnuwin32/editor.c:760
+#: src/gnuwin32/rui.c:1150
 msgid "Clear console"
 msgstr "ïÞÉÓÔÉÔØ ËÏÎÓÏÌØ"
 
@@ -384,11 +406,13 @@
 msgid "Replace..."
 msgstr "úÁÍÅÎÉÔØ..."
 
-#: src/gnuwin32/editor.c:772 src/gnuwin32/rui.c:1154
+#: src/gnuwin32/editor.c:772
+#: src/gnuwin32/rui.c:1154
 msgid "GUI preferences..."
 msgstr "îÁÓÔÒÏÊËÉ ÉÎÔÅÒÆÅÊÓÁ..."
 
-#: src/gnuwin32/editor.c:782 src/gnuwin32/rui.c:1186
+#: src/gnuwin32/editor.c:782
+#: src/gnuwin32/rui.c:1186
 #: src/library/utils/src/windows/dataentry.c:1698
 #: src/library/utils/src/windows/dataentry.c:1808
 msgid "Help"
@@ -422,36 +446,47 @@
 msgid "Insufficient memory to display file in internal pager"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÄÌÑ ÏÔÒÁÖÅÎÉÑ ÆÁÊÌÁ ×Ï ×ÎÕÔÒÅÎÎÅÍ ÐÒÏÓÍÏÔÒÝÉËÅ"
 
-#: src/gnuwin32/pager.c:176 src/gnuwin32/pager.c:188 src/gnuwin32/pager.c:208
-#: src/gnuwin32/rui.c:237 src/gnuwin32/rui.c:264
+#: src/gnuwin32/pager.c:176
+#: src/gnuwin32/pager.c:188
+#: src/gnuwin32/pager.c:208
+#: src/gnuwin32/rui.c:237
+#: src/gnuwin32/rui.c:264
 msgid "No selection"
 msgstr "îÅÔ ×ÙÄÅÌÅÎÉÑ"
 
-#: src/gnuwin32/pager.c:305 src/gnuwin32/pager.c:435 src/gnuwin32/pager.c:479
+#: src/gnuwin32/pager.c:305
+#: src/gnuwin32/pager.c:435
+#: src/gnuwin32/pager.c:479
 msgid "Paste to console"
 msgstr "÷ÓÔÁ×ÉÔØ ÎÁ ËÏÎÓÏÌØ"
 
-#: src/gnuwin32/pager.c:306 src/gnuwin32/pager.c:440 src/gnuwin32/pager.c:481
+#: src/gnuwin32/pager.c:306
+#: src/gnuwin32/pager.c:440
+#: src/gnuwin32/pager.c:481
 msgid "Paste commands to console"
 msgstr "÷ÓÔÁ×ÉÔØ ËÏÍÁÎÄÙ ÎÁ ËÏÎÓÏÌØ"
 
-#: src/gnuwin32/pager.c:309 src/gnuwin32/rui.c:869
+#: src/gnuwin32/pager.c:309
+#: src/gnuwin32/rui.c:869
 #: src/library/utils/src/windows/dataentry.c:1704
 #: src/library/grDevices/src/devWindows.c:1705
 msgid "Stay on top"
 msgstr "òÁÓÐÏÌÏÖÉÔØ Ó×ÅÒÈÕ"
 
-#: src/gnuwin32/pager.c:311 src/gnuwin32/pager.c:474
+#: src/gnuwin32/pager.c:311
+#: src/gnuwin32/pager.c:474
 #: src/library/utils/src/windows/dataentry.c:1706
 #: src/library/utils/src/windows/dataentry.c:1793
 msgid "Close"
 msgstr "úÁËÒÙÔØ"
 
-#: src/gnuwin32/pager.c:471 src/gnuwin32/rui.c:1139
+#: src/gnuwin32/pager.c:471
+#: src/gnuwin32/rui.c:1139
 msgid "Save to File..."
 msgstr "óÏÈÒÁÎÉÔØ × ÆÁÊÌ..."
 
-#: src/gnuwin32/pager.c:486 src/gnuwin32/rui.c:1156
+#: src/gnuwin32/pager.c:486
+#: src/gnuwin32/rui.c:1156
 msgid "View"
 msgstr "÷ÉÄ"
 
@@ -532,7 +567,8 @@
 msgid "Save history in"
 msgstr "óÏÈÒÁÎÉÔØ ÉÓÔÏÒÉÀ ËÏÍÁÎÄ ×"
 
-#: src/gnuwin32/rui.c:246 src/gnuwin32/rui.c:255
+#: src/gnuwin32/rui.c:246
+#: src/gnuwin32/rui.c:255
 msgid "No text available"
 msgstr "îÅÔ ÄÏÓÔÕÐÎÏÇÏ ÔÅËÓÔÁ"
 
@@ -569,11 +605,13 @@
 msgid "Can only drag-and-drop .R, .RData and .rda files"
 msgstr "íÏÖÎÏ ÐÅÒÅÔÁÝÉÔØ ÔÏÌØËÏ ÆÁÊÌÙ .R, .Rdata É .rda"
 
-#: src/gnuwin32/rui.c:861 src/gnuwin32/rui.c:1146
+#: src/gnuwin32/rui.c:861
+#: src/gnuwin32/rui.c:1146
 msgid "Paste commands only"
 msgstr "÷ÓÔÁ×ÉÔØ ÔÏÌØËÏ ËÏÍÁÎÄÙ"
 
-#: src/gnuwin32/rui.c:862 src/gnuwin32/rui.c:1096
+#: src/gnuwin32/rui.c:862
+#: src/gnuwin32/rui.c:1096
 msgid "Copy and paste"
 msgstr "ëÏÐÉÒÏ×ÁÔØ É ×ÓÔÁ×ÉÔØ"
 
@@ -581,7 +619,8 @@
 msgid "Clear window"
 msgstr "ïÞÉÓÔÉÔØ ÏËÎÏ"
 
-#: src/gnuwin32/rui.c:868 src/gnuwin32/rui.c:1169
+#: src/gnuwin32/rui.c:868
+#: src/gnuwin32/rui.c:1169
 msgid "Buffered output"
 msgstr "âÕÆÅÒÉÚÏ×ÁÎÎÙÊ ×Ù×ÏÄ"
 
@@ -621,7 +660,8 @@
 msgid "FAQ on R for &Windows"
 msgstr "þÁ÷ï ÐÏ R ÄÌÑ Windows"
 
-#: src/gnuwin32/rui.c:952 src/gnuwin32/rui.c:955
+#: src/gnuwin32/rui.c:952
+#: src/gnuwin32/rui.c:955
 msgid "Manuals (in PDF)"
 msgstr "òÕËÏ×ÏÄÓÔ×Á (× PDF)"
 
@@ -653,19 +693,23 @@
 msgid "About"
 msgstr "ï ÐÒÏÇÒÁÍÍÅ"
 
-#: src/gnuwin32/rui.c:1008 src/extra/graphapp/gmenus.c:52
+#: src/gnuwin32/rui.c:1008
+#: src/extra/graphapp/gmenus.c:52
 msgid "Windows"
 msgstr "ïËÎÁ"
 
-#: src/gnuwin32/rui.c:1009 src/extra/graphapp/gmenus.c:53
+#: src/gnuwin32/rui.c:1009
+#: src/extra/graphapp/gmenus.c:53
 msgid "Cascade"
 msgstr "ìÅÓÅÎËÏÊ"
 
-#: src/gnuwin32/rui.c:1010 src/extra/graphapp/gmenus.c:54
+#: src/gnuwin32/rui.c:1010
+#: src/extra/graphapp/gmenus.c:54
 msgid "Tile &Horizontally"
 msgstr "óÌÅ×Á ÎÁÐÒÁ×Ï"
 
-#: src/gnuwin32/rui.c:1011 src/extra/graphapp/gmenus.c:55
+#: src/gnuwin32/rui.c:1011
+#: src/extra/graphapp/gmenus.c:55
 msgid "Tile &Vertically"
 msgstr "ó×ÅÒÈÕ ×ÎÉÚ"
 
@@ -798,15 +842,19 @@
 msgid "failed to allocate menu"
 msgstr "ÎÅ ÐÏÌÕÞÉÌÏÓØ ÒÁÚÍÅÓÔÉÔØ ÍÅÎÀ"
 
-#: src/gnuwin32/rui.c:1388 src/gnuwin32/rui.c:1512
+#: src/gnuwin32/rui.c:1388
+#: src/gnuwin32/rui.c:1512
 msgid "menu + item is limited to 1000 bytes"
 msgstr "ÍÅÎÀ + ÐÕÎËÔ ÍÅÎÀ ÏÇÒÁÎÉÞÅÎÙ: 1000 ÚÎÁËÏ×"
 
-#: src/gnuwin32/rui.c:1396 src/gnuwin32/rui.c:1479
+#: src/gnuwin32/rui.c:1396
+#: src/gnuwin32/rui.c:1479
 msgid "menu does not exist"
 msgstr "ÍÅÎÀ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: src/gnuwin32/rui.c:1414 src/gnuwin32/rui.c:1437 src/gnuwin32/rui.c:1442
+#: src/gnuwin32/rui.c:1414
+#: src/gnuwin32/rui.c:1437
+#: src/gnuwin32/rui.c:1442
 msgid "failed to allocate char storage"
 msgstr "ÎÅ ÐÏÌÕÞÉÌÏÓØ ÒÁÚÍÅÓÔÉÔØ ÈÒÁÎÉÌÉÝÅ ÚÎÁËÏ×"
 
@@ -826,11 +874,13 @@
 msgid "Save workspace image?"
 msgstr "óÏÈÒÁÎÉÔØ ÒÁÂÏÞÅÅ ÐÒÏÓÔÒÁÎÓÔ×Ï?"
 
-#: src/extra/graphapp/clipboard.c:69 src/extra/graphapp/clipboard.c:73
+#: src/extra/graphapp/clipboard.c:69
+#: src/extra/graphapp/clipboard.c:73
 msgid "Insufficient memory: cell not copied to the clipboard"
 msgstr "íÁÌÏ ÐÁÍÑÔÉ: ÑÞÅÊËÉ ÎÅ ÓËÏÐÉÒÏ×ÁÌÉÓØ × ÂÕÆÅÒ"
 
-#: src/extra/graphapp/dialogs.c:148 src/extra/graphapp/dialogs.c:165
+#: src/extra/graphapp/dialogs.c:148
+#: src/extra/graphapp/dialogs.c:165
 #: src/extra/graphapp/dialogs.c:182
 msgid "Question"
 msgstr "÷ÏÐÒÏÓ"
@@ -844,14 +894,18 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ '%s' ËÁË ÒÁÂÏÞÕÀ ÐÁÐËÕ"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:603
+#: src/extra/graphapp/dialogs.c:621
+#: src/extra/graphapp/dialogs.c:627
+#: src/extra/graphapp/dialogs.c:726
+#: src/extra/graphapp/dialogs.c:740
+#: src/extra/graphapp/dialogs.c:746
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "ïÔÍÅÎÉÔØ"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:623
+#: src/extra/graphapp/dialogs.c:742
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "OK"
@@ -864,7 +918,8 @@
 msgid "Password"
 msgstr "ðÁÒÏÌØ"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:901
+#: src/extra/graphapp/dialogs.c:907
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ÎÅ ÎÁÊÄÅÎ"
@@ -1200,3 +1255,4 @@
 
 #~ msgid "invalid device"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
+
diff -Nru r-base-3.2.3/src/library/base/po/RGui-tr.po r-base-3.3.1/src/library/base/po/RGui-tr.po
--- r-base-3.2.3/src/library/base/po/RGui-tr.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-tr.po	2016-04-27 22:15:36.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-04-02 18:17+0200\n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -33,11 +33,11 @@
 msgid "Unable to open the clipboard"
 msgstr "Pano açılamadı"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "Yetersiz bellek. Lütfen konsolu kapatın"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -47,23 +47,23 @@
 "Yazıtipi %s-%d-%d bulunamadı.\n"
 "Sistemde gömülü yazıtipi kullanılıyor"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Seçileni kaydet"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Konsol içeriklerini dosyaya kaydet "
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "Kaydırma.\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "Klavye: PgUp, PgDown, Ctrl+Ok Tuşları, Ctrl+Home, Ctrl+End,\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -71,104 +71,104 @@
 "  Fare: kaydırma çubuklarını kullan.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "Düzenleme.\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  İmleç hareket ettirme: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     Sol ok yada Ctrl+B: bir karakter geri git;\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     SaÄŸ ok yada Ctrl+F: bir karakter ileri git;\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home tuşu yada Ctrl+A: satır başına git;\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End tuşu yada Ctrl+E: satır sonuna git;\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  Geçmiş: Aşağı ve Yukarı Oklar, Ctrl+P, Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  Silme:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del tuşu yada Ctrl+D: geçerli seçimi yada karakteri sil;\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: önceki karakteri sil;\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr ""
 "     Ctrl+Del yada Ctrl+K: metni geçerli karakterden satır sonuna kadar "
 "sil.\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: geçerli satırdaki tüm metni sil.\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  Kopyalama ve yapıştırma.\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr ""
 "     Metni işaretlemek (seçmek) için fareyi (sol tuşuna basılı tutarak) "
 "kullan.\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr "     Seçili metni panoya kopyalamak Shift+Del (veya Ctrl+C), \n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
 msgstr "      (eğer varsa) pano içeriğini konsola yapıştırmak için\n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr ""
 "     Shift+Ins (veya Ctrl+V veya Ctrl+Y) kısayollarını kullanın,\n"
 "     Ctrl+X önce kopyalar ardından yapıştırır.\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  DiÄŸer:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: Konsolu temizle.\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr ""
 "     Ctrl+O veya INS: Üstüne yazma modunu değiştir: başlangıçta kapalıdır.\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr ""
 "     Ctrl+T: Geçerli karakteri soldakiyle karşılıklı olarak değiştir.\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -176,7 +176,7 @@
 "\n"
 "Not: Konsol sadece bir veri girişi gerektiğinde güncellenir.\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -184,7 +184,7 @@
 "  Bu özelliği açıp kapatmak için Ctrl+W kısayolunu kullanın.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -192,7 +192,7 @@
 "Yorumlamayı durdurmak için ESC tuşunu kullanın.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -200,11 +200,11 @@
 "TAB geçerli kelimenin tamamlanması işlemini başlatır.\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "Grafik aygıtına geçmek için Standart Windows kısayolları\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr ""
 "kullanılabilir  (Çoklu pencerede Ctrl+Tab ve Ctrl+F6i, Tekli pencerede Alt"
@@ -363,6 +363,7 @@
 msgstr "Farklı kaydet ... "
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "Yazdır..."
@@ -418,7 +419,7 @@
 msgid "Untitled"
 msgstr "Ä°simsiz "
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Dosya seç"
 
@@ -621,7 +622,8 @@
 msgstr "Paketleri güncelle..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "Yerel zip dosyasından paket(ler) kur..."
 
 #: src/gnuwin32/rui.c:944
@@ -833,7 +835,7 @@
 msgid "menu or item does not exist"
 msgstr "menü yada öğe bulunmuyor"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Çalışma alanı görüntüsünü kaydetmek istermisiniz?"
 
@@ -855,27 +857,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "'%s' çalışma dizini olarak ayarlanamadı"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "Tamam"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Kullanıcı"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "Åžifre"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" bulunamadı"
@@ -1122,10 +1124,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "Metafile olarak\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "Yazdır...\tCTRL+P "
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "Aygıtı kapat"
@@ -1210,5 +1208,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "Sonraki sayfa için ENTER'a basın yada tıklayın"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "Yazdır...\tCTRL+P "
+
 #~ msgid "invalid device"
 #~ msgstr "geçersiz aygıt"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-zh_CN.po r-base-3.3.1/src/library/base/po/RGui-zh_CN.po
--- r-base-3.2.3/src/library/base/po/RGui-zh_CN.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-zh_CN.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2007-11-06 13:34+0800\n"
 "Last-Translator: Yihui Xie <xie@yihui.name>\n"
 "Language-Team: Chinese\n"
@@ -30,11 +30,11 @@
 msgid "Unable to open the clipboard"
 msgstr "ÎÞ·¨´ò¿ª¼ôÌù°å"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "ÄÚ´æ²»¹»¡£ Çë¹Ø±Õ¿ØÖÆ̨"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -44,23 +44,23 @@
 "ÕÒ²»µ½%s-%d-%d×ÖÌå¡£\n"
 "ÓÃϵͳ¹Ì¶¨×ÖÌå"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "±£´æËùÑ¡µ½"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "±£´æ¿ØÖÆ̨ÄÚÈݵ½"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "¹ö¶¯£º\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  ¼üÅÌ£ºPgUp£¬PgDown£¬Ctrl+·½Ïò¼ü£¬Ctrl+Home£¬Ctrl+End£»\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -68,96 +68,96 @@
 "  Êó±ê£º¿ØÖƹö¶¯Ìõ¡£\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "±à¼­£º\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  Òƶ¯Êó±ê£º\n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     ×ó¼ýÍ·»òCtrl+B£º×óÒÆÒ»×Ö·û£»\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     ÓÒ¼ýÍ·»òCtrl+F£ºÓÒÒÆÒ»×Ö·û£»\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home»òCtrl+A£ºÒƵ½ÐÐÍ·£»\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End»òCtrl+E£ºÒƵ½ÐÐβ£»\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  ÀúÊ·ÃüÁÉÏ¡¢Ï¼ýÍ·£¬Ctrl+P£¬Ctrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  ɾ³ý£º\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del»òCtrl+D£ºÉ¾³ýÔÚµ±Ç°Î»ÖõÄ×Ö·û»òËùÑ¡Îı¾£»\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace£ºÉ¾³ýµ±Ç°Î»ÖÃ֮ǰµÄ×Ö·û£»\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr "     Ctrl+Del»òCtrl+K£ºÉ¾³ýµ±Ç°Î»Öõ½ÐÐβµÄËùÓÐÎÄ×Ö£»\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U£ºÉ¾³ýµ±Ç°ÐÐÉÏËùÓеÄÎÄ×Ö£»\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  ¸´ÖƺÍÕ³Ìù£º\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr "     °´ÏÂÊó±ê×ó¼üÑ¡ÔñÎÄ×Ö£»\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr "     ÓÃShift+Del(»òCtrl+C) °ÑÑ¡ÔñÎÄ×Ö¸´ÖƵ½¼ôÌù°å£»\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
 msgstr "     ÓÃShift+Ins(»òCtrl+V»òCtrl+Y)À´Õ³Ìù¼ôÌù°åµÄÄÚÈÝ£¨Èç¹ûÓеĻ°£©£»\n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     ÔÚ¿ØÖÆ̨ÖУ¬Ctrl+X±íʾÏȸ´ÖÆÔÙÕ³Ìù£»\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  ÆäËû£º\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L£ºÇå¿Õ¿ØÖÆ̨£»\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr "     Ctrl+O»òINS£º¿ª¹Ø¸²¸Çģʽ£¬³õʼÊǹصôµÄ£»\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: ½«µ±Ç°ËùÔÚλÖõÄ×Ö·ûÓëÆä×ó·½µÄ×Ö·û½»»»£»\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -165,7 +165,7 @@
 "\n"
 "×¢Ò⣺¿ØÖÆ̨Êä³ö¿ÉÒÔ±»»º³å£¬\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -173,7 +173,7 @@
 "  ÓÃCtrl+WÀ´¿ª¹ØÕâÒ»¹¦ÄÜ¡£\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -181,17 +181,17 @@
 "ÓÃESCÀ´ÖжϽâÊÍÆ÷µÄ¹¤×÷¡£\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
 msgstr "TAB¼ü¿ÉÒÔ²¹È«µ±Ç°µ¥´Ê¡£\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "¿ÉÒÔÓÃWindows±ê×¼ÈȼüÀ´×ª»»\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "»æͼÉ豸 (MDIÓÃCtrl+Tab»òCtrl+F6, SDIÓÃAlt+Tab)"
 
@@ -344,6 +344,7 @@
 msgstr "Áí´æΪ..."
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "´òÓ¡..."
@@ -399,7 +400,7 @@
 msgid "Untitled"
 msgstr "δÃüÃû"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "Ñ¡ÔñÎļþ"
 
@@ -597,7 +598,8 @@
 msgstr "¸üгÌÐò°ü..."
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "´Ó±¾µØzipÎļþ°²×°³ÌÐò°ü..."
 
 #: src/gnuwin32/rui.c:944
@@ -809,7 +811,7 @@
 msgid "menu or item does not exist"
 msgstr "²Ëµ¥»òÕ߲˵¥Ïî²»´æÔÚ"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "ÊÇ·ñ±£´æ¹¤×÷¿Õ¼äÓ³Ïñ?"
 
@@ -831,27 +833,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "ÎÞ·¨½«'%s'Éè³É¹¤×÷Ŀ¼"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "È·¶¨"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "Óû§"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "ÃÜÂë"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "ÕÒ²»µ½\"%s\""
@@ -1098,10 +1100,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "ΪͼԪÎļþ\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "´òÓ¡...\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "¹Ø±ÕÉ豸"
@@ -1186,5 +1184,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "°´ENTER¿´ÏÂÒ»Ò³"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "´òÓ¡...\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "É豸ÎÞЧ"
diff -Nru r-base-3.2.3/src/library/base/po/RGui-zh_TW.po r-base-3.3.1/src/library/base/po/RGui-zh_TW.po
--- r-base-3.2.3/src/library/base/po/RGui-zh_TW.po	2015-03-18 23:03:43.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/RGui-zh_TW.po	2016-04-27 22:15:36.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: RGui 2.14.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-02-09 08:52+0000\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-10-13 17:33+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -31,11 +31,11 @@
 msgid "Unable to open the clipboard"
 msgstr "µLªk¶}±Ò°Å¶Kï"
 
-#: src/gnuwin32/console.c:1917
+#: src/gnuwin32/console.c:1919
 msgid "Insufficient memory. Please close the console"
 msgstr "°O¾ÐÅ餣¨¬¡C½ÐÃö³¬¥D±±»O"
 
-#: src/gnuwin32/console.c:1972 src/gnuwin32/console.c:2026
+#: src/gnuwin32/console.c:1974 src/gnuwin32/console.c:2028
 #: src/gnuwin32/preferences.c:333
 #, c-format
 msgid ""
@@ -45,23 +45,23 @@
 "§ä¤£¨ì %s-%d-%d ¦r«¬¡C\n"
 "¨Ï¥Î¨t²Î©w¼e¦r«¬"
 
-#: src/gnuwin32/console.c:2131
+#: src/gnuwin32/console.c:2133
 msgid "Save selection to"
 msgstr "Àx¦s©Ò¿ï³¡¥÷¨ì"
 
-#: src/gnuwin32/console.c:2133
+#: src/gnuwin32/console.c:2135
 msgid "Save console contents to"
 msgstr "Àx¦s¥D±±»O¤º®e¨ì"
 
-#: src/gnuwin32/console.c:2232
+#: src/gnuwin32/console.c:2234
 msgid "Scrolling.\n"
 msgstr "±²°Ê¡C\n"
 
-#: src/gnuwin32/console.c:2233
+#: src/gnuwin32/console.c:2235
 msgid "  Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n"
 msgstr "  Áä½L: PgUp¡BPgDown¡BCtrl+¤è¦VÁä¡BCtrl+Home¡BCtrl+End¡B\n"
 
-#: src/gnuwin32/console.c:2234
+#: src/gnuwin32/console.c:2236
 msgid ""
 "  Mouse: use the scrollbar(s).\n"
 "\n"
@@ -69,97 +69,97 @@
 "  ·Æ¹«: ¨Ï¥Î±²°Ê¶b¡C\n"
 "\n"
 
-#: src/gnuwin32/console.c:2235
+#: src/gnuwin32/console.c:2237
 msgid "Editing.\n"
 msgstr "½s¿è¤¤¡C\n"
 
-#: src/gnuwin32/console.c:2236
+#: src/gnuwin32/console.c:2238
 msgid "  Moving the cursor: \n"
 msgstr "  ²¾°Ê´å¼Ð: \n"
 
-#: src/gnuwin32/console.c:2237
+#: src/gnuwin32/console.c:2239
 msgid "     Left arrow or Ctrl+B: move backward one character;\n"
 msgstr "     ¥ª½bÀY©Î Ctrl+B: ¥ª²¾¤@¦r¤¸¡F\n"
 
-#: src/gnuwin32/console.c:2238
+#: src/gnuwin32/console.c:2240
 msgid "     Right arrow or Ctrl+F: move forward one character;\n"
 msgstr "     ¥k½bÀY©ÎCtrl+F: ¥k²¾¤@¦r¤¸¡F\n"
 
-#: src/gnuwin32/console.c:2239
+#: src/gnuwin32/console.c:2241
 msgid "     Home or Ctrl+A: go to beginning of line;\n"
 msgstr "     Home ©Î Ctrl+A: ²¾¨ì¦C­º¡F\n"
 
-#: src/gnuwin32/console.c:2240
+#: src/gnuwin32/console.c:2242
 msgid "     End or Ctrl+E: go to end of line;\n"
 msgstr "     End ©Î Ctrl+E: ²¾¨ì¦C§À¡F\n"
 
-#: src/gnuwin32/console.c:2241
+#: src/gnuwin32/console.c:2243
 msgid "  History: Up and Down Arrows, Ctrl+P, Ctrl+N\n"
 msgstr "  ©R¥O¾úµ{: ¤W¡B¤U½bÀY¡BCtrl+P¡BCtrl+N\n"
 
-#: src/gnuwin32/console.c:2242
+#: src/gnuwin32/console.c:2244
 msgid "  Deleting:\n"
 msgstr "  §R°£¤¤:\n"
 
-#: src/gnuwin32/console.c:2243
+#: src/gnuwin32/console.c:2245
 msgid "     Del or Ctrl+D: delete current character or selection;\n"
 msgstr "     Del ©Î Ctrl+D:§R°£¥Ø«e©Ò¦b¦r¤¸©Î¿ï¨ú¡F\n"
 
-#: src/gnuwin32/console.c:2244
+#: src/gnuwin32/console.c:2246
 msgid "     Backspace: delete preceding character;\n"
 msgstr "     Backspace: §R°£¥Ø«e¦ì¸m¤§«eªº¦r¤¸¡F\n"
 
-#: src/gnuwin32/console.c:2245
+#: src/gnuwin32/console.c:2247
 msgid ""
 "     Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n"
 msgstr "     Ctrl+Del ©Î Ctrl+K: §R°£¥Ø«e¦ì¸m¨ì¦C§Àªº©Ò¦³¤å¦r¡C\n"
 
-#: src/gnuwin32/console.c:2246
+#: src/gnuwin32/console.c:2248
 msgid "     Ctrl+U: delete all text from current line.\n"
 msgstr "     Ctrl+U: ±q¥Ø«e©Ò¦b¦C¶}©l§R°£©Ò¦³ªº¤å¦r¡C\n"
 
-#: src/gnuwin32/console.c:2247
+#: src/gnuwin32/console.c:2249
 msgid "  Copy and paste.\n"
 msgstr "  ½Æ»s©M¶K¤W¡C\n"
 
-#: src/gnuwin32/console.c:2248
+#: src/gnuwin32/console.c:2250
 msgid ""
 "     Use the mouse (with the left button held down) to mark (select) text.\n"
 msgstr "     ¥Î·Æ¹« («ùÄò«öµÛ¥ªÁä) ¨Ó¿ï¾Ü¤å¦r¡C\n"
 
-#: src/gnuwin32/console.c:2249
+#: src/gnuwin32/console.c:2251
 msgid ""
 "     Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n"
 msgstr "     ¥Î Shift+Del (©Î Ctrl+C) §â¿ï¾Ü¦nªº¤å¦r½Æ»s¨ì°Å¶Kï¥H¤Î\n"
 
-#: src/gnuwin32/console.c:2250
+#: src/gnuwin32/console.c:2252
 msgid ""
 "     Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard "
 "(if any)  \n"
 msgstr ""
 "     ¥Î Shift+Ins (©Î Ctrl+V ©Î Ctrl+Y) ¨Ó¶K¤W°Å¶K諸¤º®e (¦pªG¦³ªº¸Ü)  \n"
 
-#: src/gnuwin32/console.c:2251
+#: src/gnuwin32/console.c:2253
 msgid "     to the console, Ctrl+X first copy then paste\n"
 msgstr "     ¨ì¥D±±»O¡ACtrl+X ¥ý½Æ»s¦A¶K¤W\n"
 
-#: src/gnuwin32/console.c:2252
+#: src/gnuwin32/console.c:2254
 msgid "  Misc:\n"
 msgstr "  ¨ä¥¦:\n"
 
-#: src/gnuwin32/console.c:2253
+#: src/gnuwin32/console.c:2255
 msgid "     Ctrl+L: Clear the console.\n"
 msgstr "     Ctrl+L: ²M°£¥D±±»O¡C\n"
 
-#: src/gnuwin32/console.c:2254
+#: src/gnuwin32/console.c:2256
 msgid "     Ctrl+O or INS: Toggle overwrite mode: initially off.\n"
 msgstr "     Ctrl+O ©Î INS¡G¤Á´«Âмg¼Ò¦¡¡Gªì©l®ÉÃö³¬¡C\n"
 
-#: src/gnuwin32/console.c:2255
+#: src/gnuwin32/console.c:2257
 msgid "     Ctrl+T: Interchange current char with one to the left.\n"
 msgstr "     Ctrl+T: ±N¥Ø«e©Ò¦b¦ì¸mªº¦r¤¸»P¨ä¥ª¤èªº¦r¤¸¥æ´«¡C\n"
 
-#: src/gnuwin32/console.c:2256
+#: src/gnuwin32/console.c:2258
 msgid ""
 "\n"
 "Note: Console is updated only when some input is required.\n"
@@ -167,7 +167,7 @@
 "\n"
 "ª`·N: ¥u¦³¦b­n¨D¿é¤J®É¥D±±»O¤~·|³Q§ó·s¡C\n"
 
-#: src/gnuwin32/console.c:2257
+#: src/gnuwin32/console.c:2259
 msgid ""
 "  Use Ctrl+W to toggle this feature off/on.\n"
 "\n"
@@ -175,7 +175,7 @@
 "  ¨Ï¥Î Ctrl+W ¨Ó¶}Ãö¦¹¤@¥\¯à¡C\n"
 "\n"
 
-#: src/gnuwin32/console.c:2258
+#: src/gnuwin32/console.c:2260
 msgid ""
 "Use ESC to stop the interpreter.\n"
 "\n"
@@ -183,7 +183,7 @@
 "¨Ï¥Î ESC ¨Ó°±¤î¸ÑĶ¾¹¡C\n"
 "\n"
 
-#: src/gnuwin32/console.c:2259
+#: src/gnuwin32/console.c:2261
 msgid ""
 "TAB starts completion of the current word.\n"
 "\n"
@@ -191,11 +191,11 @@
 "TAB ±Ò°Ê¸É§¹¥Ø«eªº¦rµü¡C\n"
 "\n"
 
-#: src/gnuwin32/console.c:2260
+#: src/gnuwin32/console.c:2262
 msgid "Standard Windows hotkeys can be used to switch to the\n"
 msgstr "¥i¥H¥Î Windows ªº¼Ð·Ç§Ö±¶Áä¨ÓÂà´«\n"
 
-#: src/gnuwin32/console.c:2261
+#: src/gnuwin32/console.c:2263
 msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)"
 msgstr "ø¹Ï¸Ë¸m (MDI ¥Î Ctrl+Tab ©Î Ctrl+F6¡ASDI ¥Î Alt+Tab)"
 
@@ -348,6 +348,7 @@
 msgstr "¥t¦s¬°¡K"
 
 #: src/gnuwin32/editor.c:741 src/gnuwin32/pager.c:469 src/gnuwin32/rui.c:1138
+#: src/library/grDevices/src/devWindows.c:1666
 #: src/library/grDevices/src/devWindows.c:1708
 msgid "Print..."
 msgstr "¦C¦L¡K"
@@ -403,7 +404,7 @@
 msgid "Untitled"
 msgstr "¥¼©R¦W"
 
-#: src/gnuwin32/extra.c:811
+#: src/gnuwin32/extra.c:825
 msgid "Select file"
 msgstr "¿ï¾ÜÀÉ®×"
 
@@ -602,7 +603,8 @@
 msgstr "§ó·sµ{¦¡®M¥ó¡K"
 
 #: src/gnuwin32/rui.c:920
-msgid "Install package(s) from local zip files..."
+#, fuzzy
+msgid "Install package(s) from local files..."
 msgstr "¥Î¥»¾÷ªº zip ÀɮרӦw¸Ëµ{¦¡®M¥ó¡K"
 
 #: src/gnuwin32/rui.c:944
@@ -815,7 +817,7 @@
 msgid "menu or item does not exist"
 msgstr "¿ï³æ©Î¬O¶µ¥Ø¤£¦s¦b"
 
-#: src/gnuwin32/system.c:447
+#: src/gnuwin32/system.c:446
 msgid "Save workspace image?"
 msgstr "Àx¦s¤u§@ªÅ¶¡¹Ï®×?"
 
@@ -837,27 +839,27 @@
 msgid "Unable to set '%s' as working directory"
 msgstr "µLªk±N '%s' ³]¦¨²{¦æ¥Ø¿ý"
 
-#: src/extra/graphapp/dialogs.c:603 src/extra/graphapp/dialogs.c:621
-#: src/extra/graphapp/dialogs.c:627 src/extra/graphapp/dialogs.c:726
-#: src/extra/graphapp/dialogs.c:740 src/extra/graphapp/dialogs.c:746
+#: src/extra/graphapp/dialogs.c:604 src/extra/graphapp/dialogs.c:622
+#: src/extra/graphapp/dialogs.c:628 src/extra/graphapp/dialogs.c:727
+#: src/extra/graphapp/dialogs.c:741 src/extra/graphapp/dialogs.c:747
 #: src/library/utils/src/windows/widgets.c:125
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#: src/extra/graphapp/dialogs.c:623 src/extra/graphapp/dialogs.c:742
+#: src/extra/graphapp/dialogs.c:624 src/extra/graphapp/dialogs.c:743
 #: src/library/utils/src/windows/widgets.c:124
 msgid "OK"
 msgstr "½T©w"
 
-#: src/extra/graphapp/dialogs.c:734
+#: src/extra/graphapp/dialogs.c:735
 msgid "User"
 msgstr "¨Ï¥ÎªÌ"
 
-#: src/extra/graphapp/dialogs.c:735
+#: src/extra/graphapp/dialogs.c:736
 msgid "Password"
 msgstr "±K½X"
 
-#: src/extra/graphapp/dialogs.c:901 src/extra/graphapp/dialogs.c:907
+#: src/extra/graphapp/dialogs.c:902 src/extra/graphapp/dialogs.c:908
 #, c-format
 msgid "\"%s\" not found"
 msgstr "§ä¤£¨ì \"%s\""
@@ -1104,10 +1106,6 @@
 msgid "as a Metafile\tCTRL+W"
 msgstr "°µ¬° Metafile\tCTRL+W"
 
-#: src/library/grDevices/src/devWindows.c:1666
-msgid "Print...\tCTRL+P"
-msgstr "¦C¦L¡K\tCTRL+P"
-
 #: src/library/grDevices/src/devWindows.c:1668
 msgid "close Device"
 msgstr "Ãö³¬¸Ë¸m"
@@ -1192,5 +1190,8 @@
 msgid "Click or hit ENTER for next page"
 msgstr "«ö ENTER ¨Ó¬Ý¤U¤@­¶"
 
+#~ msgid "Print...\tCTRL+P"
+#~ msgstr "¦C¦L¡K\tCTRL+P"
+
 #~ msgid "invalid device"
 #~ msgstr "¸Ë¸mµo¥Í¿ù»~"
diff -Nru r-base-3.2.3/src/library/base/po/R-it.po r-base-3.3.1/src/library/base/po/R-it.po
--- r-base-3.2.3/src/library/base/po/R-it.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-it.po	2016-04-27 22:15:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-16 08:34\n"
 "Last-Translator: Stefano M. Iacus <Stefano.Iacus@R-project.org>\n"
 "Language-Team: Italian\n"
@@ -238,6 +238,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr "non posso trasformare un oggetto di classe \"%s\" in un data.frame"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
 
@@ -544,6 +549,15 @@
 "%s"
 msgstr ""
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "'x' deve essere una matrice quadrata"
 
@@ -680,12 +694,14 @@
 msgid "invalid 'time' argument"
 msgstr "argomento 'category' non valido"
 
-msgid "'vec' contains NAs"
-msgstr "'vec' contiene NA"
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr "'vec' deve essere ordinato in ordine non decrescente"
 
+#, fuzzy
+msgid "'fun' is not a function"
+msgstr "handler deve essere una funzione"
+
 msgid "using the first element of 'value' of type \"expression\""
 msgstr ""
 
@@ -711,15 +727,19 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr "data frame corrotto: le colonne verranno accorciate o riempite con NA"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr "'zero.print' deve avere lunghezza > 1"
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr ""
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr "'input' e 'target' devono essere vettori di caratteri"
+
 msgid "'subset' must be logical"
 msgstr "'subset' deve essere di tipo logico"
 
@@ -816,9 +836,13 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr ""
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr ""
+
+msgid "according to the DESCRIPTION file it is"
+msgstr ""
+
+msgid "%s"
 msgstr ""
 
 #, fuzzy
@@ -1021,6 +1045,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr ""
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ","
+
 #, fuzzy
 msgid "'arg' must be NULL or a character vector"
 msgstr "'normal.kind' deve essere una stringa di caratteri di lunghezza 1"
@@ -1223,6 +1256,9 @@
 msgid "found methods to import for function %s but not the generic itself"
 msgstr ""
 
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr ""
 
@@ -1232,8 +1268,8 @@
 "oggetti  'methods' richiesti non trovati nel environment/pacchetto '%s': %s"
 
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 
 #, fuzzy
@@ -1408,6 +1444,10 @@
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "argomento 'category' non valido"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr ""
 
@@ -1443,6 +1483,9 @@
 "Did you intend to set 'partial'?"
 msgstr ""
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr "'index.return' solo per oggetti non factor"
 
@@ -1470,10 +1513,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr "method=\"quick\" è solo per 'x' di tipo numeric"
 
-#, fuzzy
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "method=\"radix\" è solo per 'x' interi"
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr ""
 
@@ -1526,9 +1565,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr ""
 
-msgid ","
-msgstr ","
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr ""
 
@@ -1576,6 +1612,10 @@
 msgid "arguments must have same length"
 msgstr "gli argomenti devono avere la stessa lunghezza"
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr "il numero dei livelli è differente"
+
 msgid "handler must be a function"
 msgstr "handler deve essere una funzione"
 
@@ -1869,12 +1909,6 @@
 msgstr[1] "metodi S3 %s dichiarati in NAMESPACE ma non trovati"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "l'argomento drop verrà ignorato"
-msgstr[1] "l'argomento drop verrà ignorato"
-
-#, fuzzy
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "non è"
@@ -1886,14 +1920,31 @@
 msgstr[1] "Messaggi di avvertimento:\n"
 
 #, fuzzy
-#~ msgid "cannot be unloaded."
-#~ msgstr "namespace '%s' caricato"
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] "l'argomento drop verrà ignorato"
+msgstr[1] "l'argomento drop verrà ignorato"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "'vec' contiene NA"
+
+#, fuzzy
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "method=\"radix\" è solo per 'x' interi"
 
 #, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr "l'oggetto %s non è esportato da 'namespace:%s'"
 
 #, fuzzy
+#~ msgid "cannot be unloaded."
+#~ msgstr "namespace '%s' caricato"
+
+#, fuzzy
 #~ msgid "package %s %s was found, but %s %s is required by %s"
 #~ msgstr "pacchetto '%s' non trovato, ma %s %s è richiesto da '%s'"
 
diff -Nru r-base-3.2.3/src/library/base/po/R-ja.po r-base-3.3.1/src/library/base/po/R-ja.po
--- r-base-3.2.3/src/library/base/po/R-ja.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-ja.po	2016-04-27 22:15:36.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.4.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 14:42+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -221,6 +221,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr " クラス \"%s\" �データフレーム�強制変�����ん "
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
 " options(\"stringsAsFactors\") � TRUE �も FALSE �も設定�れ����ん "
@@ -495,6 +500,15 @@
 " �正�行�次�場所�始������: \n"
 " %s "
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr " 'x' �正方行列���れ��り��ん "
 
@@ -614,12 +628,14 @@
 msgid "invalid 'time' argument"
 msgstr " 無効� 'time' 引数�� "
 
-msgid "'vec' contains NAs"
-msgstr " 'vec' � NA 値を�ん���� "
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr " 'vec' ��減少順�ソート�れ����れ�����ん "
 
+#, fuzzy
+msgid "'fun' is not a function"
+msgstr " �ンドラー�関数���れ��り��ん "
+
 msgid "using the first element of 'value' of type \"expression\""
 msgstr " タイプ \"expression\" � 'value' �最���素��を使��� "
 
@@ -649,16 +665,20 @@
 msgstr ""
 " 壊れ�データフレーム��。列�切り詰�られる����� NA 値�埋�られ�� "
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-" 'big.mark' � 'decimal.mark' �両方�も '%s' ���，�れ�混乱を招��� "
-
 msgid "'zero.print' has length > 1"
 msgstr " 'zero.print' �長� > 1 を���� "
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr " 'zero.print' �文字�論�値���� NULL ���れ��り��ん "
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+" 'big.mark' � 'decimal.mark' �両方�も '%s' ���，�れ�混乱を招��� "
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr " 'input' ��� 'target' �文字ベクトル���れ��り��ん "
+
 msgid "'subset' must be logical"
 msgstr " 'subset' �論�値���れ��り��ん "
 
@@ -741,13 +761,19 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr " パッケージ %s を使���ライセンスを確����諾�る必���り�� "
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+#, fuzzy
+msgid "package %s has a license that you need to accept:"
+msgstr " パッケージ %s を使���ライセンスを確����諾�る必���り�� "
+
+#, fuzzy
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
 " パッケージ %s を使���ライセンスを�諾�る必���り��。以下を�確���"
 "��。: "
 
+msgid "%s"
+msgstr ""
+
 msgid "license for package %s not accepted"
 msgstr " パッケージ %s �ライセンス��諾�れ����ん "
 
@@ -926,6 +952,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr " 'vectorize.args' ��仮引数���指定出���ん "
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr " , "
+
 msgid "'arg' must be NULL or a character vector"
 msgstr " 'arg' ��NULL �����文字ベクトル���れ��り��ん "
 
@@ -1119,6 +1154,10 @@
 msgstr ""
 " 関数 %s �対�るイン�ートメソッドを���������称的���り��ん "
 
+#, fuzzy
+msgid "replacing previous import %s by %s when loading %s"
+msgstr " %2$s �ロード中��以��イン�ート %1$s を置������� "
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr " \"%s\" 中���求�対�るメソッド�見��り��ん: %s "
 
@@ -1127,9 +1166,10 @@
 " �求�れ� methods オブジェクト�環境も���パッケージ %s 中�見付�り��"
 "ã‚“: %s "
 
+#, fuzzy
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 " \"%s\" �対���求�れ�イン�ート�れ�メソッド (パッケージ \"%s\" �ら"
 "�) �対応�る�称的関数��り��ん (�正確�エクス�ート？) "
@@ -1289,6 +1329,10 @@
 msgid "too many arguments"
 msgstr " 引数�数�多���� "
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr " 無効� 'name' 引数�� "
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr " 'file' �ファイル�����り�'compress' �無視�れ�� "
 
@@ -1328,6 +1372,9 @@
 " 'decreasing' �長� length-1 �論�値ベクトル���れ��り��ん。 \n"
 " 'partial' を設定�る�もり���？ "
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr " 'index.return' ��因�専用�� "
 
@@ -1356,9 +1403,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr " method = \"quick\" �実数� 'x' ���利用����ん "
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr " method = \"radix\" �整数� 'x' ���利用����ん "
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr " 'local' � TRUE � FALSE ����環境���れ��り��ん "
 
@@ -1412,9 +1456,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr " ��ら�列� names(.) 中�間���エンコーディング��り�� "
 
-msgid ","
-msgstr " , "
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr " STATS � 'dim(x)[MARGIN]' �大��より長��� "
 
@@ -1457,6 +1498,10 @@
 msgid "arguments must have same length"
 msgstr " 引数���長����れ��り��ん "
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr " 水準�数�異�り�� "
+
 msgid "handler must be a function"
 msgstr " �ンドラー�関数���れ��り��ん "
 
@@ -1707,10 +1752,6 @@
 msgstr[0] ""
 " S3 メソッド %s � NAMESPACE �宣言�れ�����見��り��ん��� "
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] " 余分�引数 %s �無視�れ�� "
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] " %s � TRUE ���り��ん "
@@ -1720,6 +1761,21 @@
 msgstr[0] " 警告メッセージ: \n"
 
 #, fuzzy
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] " 余分�引数 %s �無視�れ�� "
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr " 'vec' � NA 値を�ん���� "
+
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr " method = \"radix\" �整数� 'x' ���利用����ん "
+
+#, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr ""
 #~ " オブジェクト %s � 'namespace:%s' �よ��エクス�ート�れ����ん "
diff -Nru r-base-3.2.3/src/library/base/po/R-ko.po r-base-3.3.1/src/library/base/po/R-ko.po
--- r-base-3.2.3/src/library/base/po/R-ko.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-ko.po	2016-04-27 22:15:36.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R base package
-# src/library/base/po/R-ko.po
+# ./base/po/R-ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R base package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,9 +59,8 @@
 msgid "a dimension is zero"
 msgstr "차�� �(zero)입니다."
 
-#, fuzzy
 msgid "\"hexNumeric\" and \"digits17\" are mutually exclusive"
-msgstr "\"hexNumeric\"와 \"digits17\"는 �호배타�(mutually exclusive)입니다."
+msgstr "\"hexNumeric\"과 \"digits17\"� �호 배��입니다."
 
 msgid "second argument must be a list"
 msgstr "�번째 ��는 반드시 리스트(list)�어야 합니다."
@@ -81,7 +83,7 @@
 msgstr "'%s'는 유효한 선�� 아닙니다"
 
 msgid "malformed version string"
-msgstr ""
+msgstr "잘못� 버전 "
 
 msgid "target is %s, current is %s"
 msgstr "타겟� %s�지만, 현재는 %s 입니다"
@@ -102,7 +104,7 @@
 msgstr "'X'는 반드시 named dimnames를 가져야 합니다"
 
 msgid "not all elements of 'MARGIN' are names of dimensions"
-msgstr ""
+msgstr "'MARGIN'� 있는 모든 요소들� 차�� �름� 아닙니다."
 
 msgid "'dims' cannot be of length 0"
 msgstr "'dims'� 길�는 0� � 수 없습니다"
@@ -188,7 +190,7 @@
 msgstr "�� 'where'� 길�는 �(0)입니다."
 
 msgid "argument 'object' must deparse to a single character string"
-msgstr ""
+msgstr "'object'��는 반드시 하나� 문�열로 만들어져야 합니다."
 
 msgid "'origin' must be one of 'start', 'current' or 'end'"
 msgstr "'origin'� 반드시 'start', 'current' �는 'end' 중 하나�어야 합니다"
@@ -235,12 +237,19 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr "�래스  \"%s\"를 data.frame으로 강제형변환 할 수 없습니다"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+"'row.names'� 길�가 %d� 문�형 벡터가 아니므로 삭제합니다.   따�서, �러"
+"가 발�� 것입니다!"
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
 "options(\"stringsAsFactors\")� 값� TRUE �는 FALSE로 지정�어 있지 않습니다"
 
 msgid "mismatch of row names in arguments of 'data.frame', item %d"
-msgstr ""
+msgstr "��터 프레임 ��� 행�름과 �치하지 않습니다. item %d"
 
 msgid "some row.names duplicated: %s --> row.names NOT used"
 msgstr "�부 row.names가 중복�니다: %s --> row.names 는 사용�지 않았습니다"
@@ -261,7 +270,7 @@
 msgstr "제공� 행� �름들� 길�가 잘못�었습니다"
 
 msgid "row names were found from a short variable and have been discarded"
-msgstr ""
+msgstr "행 �름� 짧�  변수�서 발견�어 제거�었습니다."
 
 msgid "named arguments other than 'drop' are discouraged"
 msgstr ""
@@ -319,7 +328,7 @@
 msgstr ""
 
 msgid "names do not match previous names"
-msgstr ""
+msgstr "�전� 사용� �름들과 �치하지 않습니다."
 
 msgid "numbers of columns of arguments do not match"
 msgstr ""
@@ -458,19 +467,19 @@
 msgstr ""
 
 msgid "invalid units specified"
-msgstr ""
+msgstr "주어진 단위정보가 올바르지 않습니다."
 
 msgid "unary '%s' not defined for \"difftime\" objects"
-msgstr ""
+msgstr "단항연산� '%s'는 \"difftime\" �체� 사용할 수 없습니다."
 
 msgid "'%s' not defined for \"difftime\" objects"
-msgstr ""
+msgstr "'%s'는  \"difftime\" �체� 사용할 수 없습니다."
 
 msgid "both arguments of * cannot be \"difftime\" objects"
-msgstr ""
+msgstr "�개� �� 모�가 \"difftime\" �체 � 수는 없습니다."
 
 msgid "second argument of / cannot be a \"difftime\" object"
-msgstr ""
+msgstr "/ � �번째 ��가 \"difftime\" �체�서는 안�니다."
 
 msgid "'from' must be a \"POSIXt\" object"
 msgstr "'from'� 반드시 \"POSIXt\" �체�어야 합니다"
@@ -498,11 +507,21 @@
 "%s"
 msgstr ""
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "'x'는 반드시 정방행렬�어야 합니다"
 
 msgid "'determinant' not currently defined for complex matrices"
 msgstr ""
+"아�� 복소수 행렬� 사용할 수 있는 'determinant'는 정��지 않았습니다."
 
 msgid "'nrow' or 'ncol' cannot be specified when 'x' is a matrix"
 msgstr "'nrow' �는 'ncol'는 'x'가 행렬�때 지정� 수 없습니다"
@@ -514,10 +533,10 @@
 msgstr "오로지 행렬� 대�요소들만� 변경할 수 있습니다"
 
 msgid "replacement diagonal has wrong length"
-msgstr ""
+msgstr "대체하고� 하는 대��소� 길�가 올바르지 않습니다."
 
 msgid "MARGIN = %d is invalid for dim = %d"
-msgstr ""
+msgstr "dim = %d�� MARGIN = %d입니다."
 
 msgid "must pass a package name, %s or %s object"
 msgstr "반드시 패키지명, %s �는 %s �체를 넘겨주어야 합니다"
@@ -544,7 +563,7 @@
 msgstr "0 행 0 열 행렬입니다"
 
 msgid "non-square matrix in 'eigen'"
-msgstr ""
+msgstr "'eigen'� 비정방행렬� 존재합니다."
 
 msgid "invalid nrow(x)"
 msgstr "유효하지 않� nrow(x)입니다"
@@ -575,6 +594,8 @@
 "'%s' is only meaningful for ordered factors if all arguments have the same "
 "level sets"
 msgstr ""
+"만약 모든 ��들� 같� 수준들� 가지고 있다면 '%s'는 오로지 순위형 요�들� "
+"대해서만 �미가 있습니다."
 
 msgid "no files to copy to"
 msgstr "다�� 복사할 파�들� 없습니다"
@@ -612,17 +633,17 @@
 msgid "invalid 'time' argument"
 msgstr "유효하지 않� 'time' ��입니다"
 
-msgid "'vec' contains NAs"
-msgstr "'vec'는 NA 값들� �함합니다"
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
+msgstr "'vec'는 오름차순으로 정렬�어야 하고 NA를 �함하지 않아야 합니다. "
 
-msgid "'vec' must be sorted non-decreasingly"
-msgstr ""
+msgid "'fun' is not a function"
+msgstr "'fun'� 함수가 아닙니다."
 
 msgid "using the first element of 'value' of type \"expression\""
 msgstr "타입 \"expression\"� 가지는 'value'� 첫번째 요소를 사용합니다"
 
 msgid "class of 'x' was discarded"
-msgstr ""
+msgstr "�래스 'x'는 사용�지 않습니다."
 
 msgid "'mode' must be \"double\" (\"real\"), \"integer\" or \"character\""
 msgstr ""
@@ -647,15 +668,18 @@
 msgstr ""
 "��� ��터 프레임입니다:  columns will be truncated or padded with NAs"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr "'zero.print'는 길�가 1 보다 커야합니다"
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr "'zero.print'는 반드시 문�, 논리값, �는 NULL�어야 합니다"
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr "'big.mark'와 'decimal.mark' 모� '%s'�� �는 혼란스러울 수 있습니다."
+
+msgid "'input.d.mark' has no characters"
+msgstr "'input.d.mark'는 어떠한 문�� 가지고 있습니다."
+
 msgid "'subset' must be logical"
 msgstr "'subset'� 반드시 논리��어야 합니다"
 
@@ -675,7 +699,7 @@
 msgstr ""
 
 msgid "cost components must be non-negative"
-msgstr ""
+msgstr "cost component는 �� 값� 가질 수 없습니다."
 
 msgid "%s and %s must have the same length"
 msgstr "%s와 %s는 반드시 같� 길�를 가져야 합니다"
@@ -693,16 +717,16 @@
 msgstr ""
 
 msgid "must have replacements for non-matches"
-msgstr ""
+msgstr "�치하지 않는 항목들� 대하여 대체할 값들� 필요합니다."
 
 msgid "must have replacements for matches"
-msgstr ""
+msgstr "�치하는 항목들� 대하여 대체할 값들� 필요합니다."
 
 msgid "No factors specified"
 msgstr "지정� 요�들� 없습니다"
 
 msgid "norm '%s' currently always uses exact = FALSE"
-msgstr ""
+msgstr "'%s'는 현재로서는 항� exact = FALSE를 사용합니다."
 
 msgid "triangular matrix should be square"
 msgstr "triangular matrix는 반드시 정방�어야 합니다"
@@ -736,12 +760,16 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr "패키지 %s는 당신� 보고 확�� 해야할 ��센스를 가지고 있습니다"
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr ""
+"패키지 %s는 당신� 수�해야만 하는 다�과 같� 종류� ��센스를 가지고 있습"
+"니다:"
+
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
-"패키지 %s는 DESCRIPTION 파�� 따르면, \n"
-"당신� 수용� 해야만 하는 ��센스를 가지고 있습니다"
+
+msgid "%s"
+msgstr "%s"
 
 msgid "license for package %s not accepted"
 msgstr "패키지 %s� 대해서 수��지 않� ��센스입니다"
@@ -751,6 +779,8 @@
 
 msgid "'verbose' and 'quietly' are both true; being verbose then .."
 msgstr ""
+"'verbose'와 'quitely' 모� 참으로 설정�어 있는�, verbose� 주어진 값� �용"
+"합니다. "
 
 msgid "invalid package name"
 msgstr "유효하지 않� 패키지명입니다"
@@ -768,7 +798,7 @@
 msgstr "%s를 �색경로�서 찾� 수 없어 pos = 2 를 사용합니다"
 
 msgid "Package %s version %s cannot be unloaded"
-msgstr ""
+msgstr "패키지 %s 버전 %s를 로드 할 수 없습니다."
 
 msgid "package or namespace load failed for %s"
 msgstr ""
@@ -839,10 +869,14 @@
 "package %s found more than once,\n"
 "using the one found in %s"
 msgstr ""
+"패키지 %s가 한 곳 ���서 발견�었습니다.\n"
+"다�� 위치�서 발견� 패키지를 사용합니다: %s"
 
 msgid ""
 "Further information is available in the following vignettes in directory %s:"
 msgstr ""
+"디렉토리 %s� 존재하는 다�과 같� 비그네트로부터 � 많� 내용� 찾� 수 있습"
+"니다:"
 
 msgid "Description:"
 msgstr "설명:"
@@ -866,7 +900,7 @@
 msgstr "패키지 %s는 로드�어질 수 없습니다"
 
 msgid "empty (zero-byte) input file"
-msgstr ""
+msgstr "입력파�� 내용� 비어있습니다."
 
 msgid "input has been corrupted, with LF replaced by CR"
 msgstr ""
@@ -913,6 +947,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr ""
 
+msgid "FUN"
+msgstr "FUN"
+
+msgid "may not have argument(s) named"
+msgstr "아마� �름� 주어진 ��를 가지고 있지 않� 것 같습니다."
+
+msgid ","
+msgstr ","
+
 msgid "'arg' must be NULL or a character vector"
 msgstr "'arg'는 반드시 NULL �는 문�형 벡터�어야 합니다"
 
@@ -957,6 +1000,8 @@
 
 msgid "trimmed means are not defined for complex data"
 msgstr ""
+"복소수형 ��터� 사용할 수 있는 절삭�균(trimmed means)는 정��지 않았습니"
+"다."
 
 msgid "'by' must match numbers of columns"
 msgstr "'by'는 반드시 열� 개수와 �치해야 합니다"
@@ -966,6 +1011,8 @@
 
 msgid "'by' must specify one or more columns as numbers, names or logical"
 msgstr ""
+"'by'는 반드시 숫�, �름, �는 논리값� �용하여 하나 ��� 열들� 지정해야 "
+"합니다."
 
 msgid "long vectors are not supported"
 msgstr ""
@@ -993,12 +1040,14 @@
 "namespace %s is not available and has been replaced\n"
 "by .GlobalEnv when processing object %s"
 msgstr ""
+"네임스페�스 %s를 사용할 수 없으며\n"
+"�체 %s를 프로세싱할 때 .GlobalEnv� �하여 대체�었습니다."
 
 msgid "'%s' is not an exported object from 'namespace:%s'"
 msgstr "'%s'는 'namespace:%s'로부터 내보내어진 �체가 아닙니다"
 
 msgid "namespace is already attached"
-msgstr ""
+msgstr "네임스페�스가 �미 연결�어 있습니다."
 
 msgid "%s not found"
 msgstr "%s를 찾� 수 없습니다"
@@ -1101,6 +1150,9 @@
 msgid "found methods to import for function %s but not the generic itself"
 msgstr ""
 
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr ""
 
@@ -1108,8 +1160,8 @@
 msgstr "요청� 메소드를 environment/패키지 %s�서 찾� 수 없습니다: %s"
 
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 
 msgid "cannot add to exports of a sealed namespace"
@@ -1161,7 +1213,7 @@
 msgstr "��들� 없습니다"
 
 msgid "an argument will be fractionally recycled"
-msgstr ""
+msgstr "��가 부분�으로 재활용� 것입니다."
 
 msgid "invalid ncol(x)"
 msgstr "유효하지 않� ncol(x)입니다"
@@ -1170,7 +1222,7 @@
 msgstr "LINPACK� 너무 � 행렬입니다"
 
 msgid "first argument must be a QR decomposition"
-msgstr ""
+msgstr "첫번째 ��는 반드시 QR 분해�어야 합니다. "
 
 msgid "invalid nrow(qr$qr)"
 msgstr "유효하지 않� nrow(qr$qr)입니다"
@@ -1239,7 +1291,7 @@
 msgstr "'nmax' �는 'n' 중 하나는 지정�어야 하지만 모�는 아닙니다"
 
 msgid "'from' cannot be NA, NaN or infinite"
-msgstr ""
+msgstr "'from'� NA, NaN �는 infinite�어서는 안�니다."
 
 msgid "argument 'length.out' must be of length 1"
 msgstr "�� 'length.out'� 반드시 길�가 1�어야 합니다"
@@ -1248,7 +1300,7 @@
 msgstr "'length.out' ��� 사용� 첫번째 요소입니다"
 
 msgid "'to' cannot be NA, NaN or infinite"
-msgstr ""
+msgstr "'to'는 NA, NaN �는 infinite�어서는 안�니다."
 
 msgid "invalid (to - from)/by in seq(.)"
 msgstr "seq(.)내� 유효하지 않� (to - from)/by 입니다"
@@ -1265,6 +1317,9 @@
 msgid "too many arguments"
 msgstr "너무 많� ��들� 있습니다"
 
+msgid "invalid 'compress' argument:"
+msgstr "올바른 'compress' ��가 아닙니다:"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr "만약 'file'� 파�명� 아니�면 'compress'는 무시�어 집니다"
 
@@ -1299,15 +1354,20 @@
 "'decreasing' must be a length-1 logical vector.\n"
 "Did you intend to set 'partial'?"
 msgstr ""
+"'decreasing'� 반드시 길�가 1� 논리형 벡터�어야 합니다.\n"
+"���으로 'partial'로 설정하고� 하나요?"
+
+msgid "'partial' sorting not supported by radix method"
+msgstr "radix 방법� �하여 지��는 'partial' 정렬� 아닙니다."
 
 msgid "'index.return' only for non-factors"
-msgstr ""
+msgstr "'index.return'� 오로지 요�� 아닌 경우�만 사용할 수 있습니다."
 
 msgid "'x' must be atomic"
 msgstr "'x'는 반드시 atomic�어야 합니다"
 
 msgid "'index.return' only for 'na.last = NA'"
-msgstr ""
+msgstr "'index.return'� 오로지 'na.last = NA'� 경우�만 사용할 수 있습니다. "
 
 msgid "unsupported options for partial sorting"
 msgstr "부분정렬� 지��지 않는 옵션입니다"
@@ -1325,9 +1385,7 @@
 
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr ""
-
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr ""
+"method = \"quick\" 는 오로지 수치형 'x'� 경우�만 사용할 수 있습니다. "
 
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr "'local'� 반드시 TRUE, FALSE �는 environment �어야 합니다"
@@ -1347,10 +1405,10 @@
 msgstr "encoding = \"%s\"로 선��었습니다"
 
 msgid "'chdir = TRUE' makes no sense for a URL"
-msgstr ""
+msgstr "'chdir = TRUE'는 URL� 경우�는 사용할 수 없습니다. "
 
 msgid "cannot 'chdir' as current directory is unknown"
-msgstr ""
+msgstr "현재� 디렉토리를 알 수 없으므로 'chdir'를 사용할 수 없습니다."
 
 msgid "'chdir = TRUE' makes no sense for a connection"
 msgstr ""
@@ -1361,9 +1419,8 @@
 msgid "Timestamp of %s has changed"
 msgstr "%s� 타임스탬프가 변경�었습니다"
 
-#, fuzzy
 msgid "'x' and 'to' must refer to same file"
-msgstr "'x'와 'y'는 반드시 같� 길�를 가져야 합니다"
+msgstr "'x'와 'to'는 반드시 같� 파�� 참조해야 합니다."
 
 msgid "additional arguments ignored in stop()"
 msgstr "stop()�서 무시� 추가�� ��들입니다"
@@ -1383,9 +1440,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr ""
 
-msgid ","
-msgstr ","
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr ""
 
@@ -1396,13 +1450,13 @@
 msgstr "length(STATS) �는 dim(STATS)가 dim(x)[MARGIN]와 �치하지 않습니다"
 
 msgid "nothing to tabulate"
-msgstr ""
+msgstr "테�블로 보여줘야 할 것� 아무것� 없습니다. "
 
 msgid "all arguments must have the same length"
 msgstr "모든 ��들� 반드시 같� 길�를 가져야 합니다"
 
 msgid "attempt to make a table with >= 2^31 elements"
-msgstr ""
+msgstr "2^31개가 넘는 요소들로 구성� 테�블� �성하고� 하였습니다."
 
 msgid "'object' must inherit from class %s"
 msgstr "'object'는 반드시 �래스 %s로부터 �성�어야 합니다"
@@ -1428,6 +1482,9 @@
 msgid "arguments must have same length"
 msgstr "��들� 반드시 같� 길�를 가져야 합니다"
 
+msgid "total number of levels >= 2^31"
+msgstr "수준� � 개수가 2^31 ��입니다."
+
 msgid "handler must be a function"
 msgstr "핸들러는 반드시 함수�어야 합니다"
 
@@ -1665,10 +1722,6 @@
 msgid_plural "S3 methods %s were declared in NAMESPACE but not found"
 msgstr[0] "S3 메소드 %s는 NAMESPACE 내� 선언�었으나 찾� 수 없습니다"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "추가�� �� %s는 고려�지 않� 것입니다"
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "%s는 TRUE가 아닙니다"
@@ -1677,6 +1730,32 @@
 msgid_plural "Warning messages:\n"
 msgstr[0] "경고 메시지:\n"
 
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] ""
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "'vec'는 NA 값들� �함합니다"
+
+#~ msgid ""
+#~ "package %s has a license that you need to accept:\n"
+#~ "according to the DESCRIPTION file it is"
+#~ msgstr ""
+#~ "패키지 %s는 DESCRIPTION 파�� 따르면, \n"
+#~ "당신� 수용� 해야만 하는 ��센스를 가지고 있습니다"
+
+#~ msgid "\"hexNumeric\"and \"digits17\" are mutually exclusive"
+#~ msgstr ""
+#~ "\"hexNumeric\"와 \"digits17\"는 �호배타�(mutually exclusive)입니다."
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "추가�� �� %s는 고려�지 않� 것입니다"
+
 #~ msgid "cannot be unloaded."
 #~ msgstr "%s 네임스페�스는 언로드 � 수 없습니다:"
 
diff -Nru r-base-3.2.3/src/library/base/po/R-nn.po r-base-3.3.1/src/library/base/po/R-nn.po
--- r-base-3.2.3/src/library/base/po/R-nn.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-nn.po	2016-04-27 22:15:36.000000000 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: R 2.15.1\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-09-28 22:18+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -230,6 +230,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr "kan ikkje gjera klassen «%s» om til ei dataramme"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr "options(\"stringsAsFactors\") ikkje sett til TRUE eller FALSE"
 
@@ -521,6 +526,15 @@
 "Ugyldige linjer begynner med:\n"
 "%s"
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "«x» må vera ei kvadratisk matrise"
 
@@ -646,13 +660,15 @@
 msgid "invalid 'time' argument"
 msgstr "ugyldig «time»-argument"
 
-msgid "'vec' contains NAs"
-msgstr "«vec» inneheld NA-verdiar"
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr "«vec» må vera sortert aukande rekkjefølgja"
 
 #, fuzzy
+msgid "'fun' is not a function"
+msgstr "handsamaren må vera ein funksjon"
+
+#, fuzzy
 msgid "using the first element of 'value' of type \"expression\""
 msgstr "brukar første element av «value» i uttrykket"
 
@@ -678,15 +694,19 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr "ugyldig dataramme: kolonnar vert trunkerte eller fylde med NA-verdiar"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr "«zero.print» har lengd > 1"
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr "«zero.print» må vera ein teiknstreng, ein boolsk verdi eller NULL"
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr "«input» og «target» må vera teiknvektorar"
+
 msgid "'subset' must be logical"
 msgstr "«subset» må vera ein logisk vektor"
 
@@ -772,13 +792,18 @@
 msgstr "Pakken %s har lisensvilkår som du må godta etter at du har lese"
 
 #, fuzzy
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr "Pakken %s har lisensvilkår som du må godta etter at du har lese"
+
+#, fuzzy
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
 "Pakken %s har lisensvilkår som du må godta:\n"
 "Ifølgje DESCRIPTION-fila er vilkåra"
 
+msgid "%s"
+msgstr ""
+
 #, fuzzy
 msgid "license for package %s not accepted"
 msgstr "Lisensvilkåra for pakken %s ikkje godtekne"
@@ -958,6 +983,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr "må oppgje namn på formelle argument til «vectorize»"
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ","
+
 msgid "'arg' must be NULL or a character vector"
 msgstr "«arg» må vera NULL eller ein teiknvektor"
 
@@ -1154,15 +1188,20 @@
 "fann metodar for import for funksjonen «%s», men ikkje for den generiske "
 "funksjonen sjølv"
 
+#, fuzzy
+msgid "replacing previous import %s by %s when loading %s"
+msgstr "byt ut førre import «%s» ved lasting av «%s»"
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr "Fann ingen metodar i «%s» for førespurnader: %s"
 
 msgid "requested methods not found in environment/package %s: %s"
 msgstr "fann ikkje førespurde metodar i omgjevnaden/pakken «%s»: %s"
 
+#, fuzzy
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 "Fann ingen generisk funksjon som svarar til førespurde importerte metodar "
 "for «%s» frå pakken «%s» (feilformaterte eksportar?)"
@@ -1327,6 +1366,10 @@
 msgid "too many arguments"
 msgstr "for mange argument"
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "ugyldig «name»-argument"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr "«compress» vert ignorert med mindre «file» er eit filnamn"
 
@@ -1364,6 +1407,9 @@
 "«decreasing» må vera ein boolske vektor med eitt element.\n"
 "Meinte du å bruka «partial»-argumentet?"
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr "«index.return» berre for ikkje-faktorar"
 
@@ -1393,10 +1439,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr "«method=\"quick\"» er berre for numerisk «x»"
 
-#, fuzzy
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "«method=\"radix\"» er berre for numerisk «x»"
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr "«local» må vera TRUE, FALSE eller ein omgjevnad"
 
@@ -1450,9 +1492,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr "truleg feil teiknkoding for names(.) til kolonne"
 
-msgid ","
-msgstr ","
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr "STATS er lengre enn storleiken til «dim(x)[MARGIN]»"
 
@@ -1499,6 +1538,10 @@
 msgid "arguments must have same length"
 msgstr "argumenta må vera like lange"
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr "talet på nivå er forskjellig"
+
 msgid "handler must be a function"
 msgstr "handsamaren må vera ein funksjon"
 
@@ -1784,12 +1827,6 @@
 msgstr[1] "S3-metodane «%s» er deklarerte i NAMESPACE, men vart ikkje funnen"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "ekstraargument(a) «%s» vert ikkje brukt(e)"
-msgstr[1] "ekstraargument(a) «%s» vert ikkje brukt(e)"
-
-#, fuzzy
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "T brukt i staden for TRUE"
@@ -1801,13 +1838,30 @@
 msgstr[1] "Ã…tvaringar:\n"
 
 #, fuzzy
-#~ msgid "cannot be unloaded."
-#~ msgstr "namnerom kan ikkje lastast ut:"
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] "ekstraargument(a) «%s» vert ikkje brukt(e)"
+msgstr[1] "ekstraargument(a) «%s» vert ikkje brukt(e)"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "«vec» inneheld NA-verdiar"
+
+#, fuzzy
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "«method=\"radix\"» er berre for numerisk «x»"
 
 #, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr "objektet «%s» er ikkje eksportert av «namespace:%s»"
 
+#, fuzzy
+#~ msgid "cannot be unloaded."
+#~ msgstr "namnerom kan ikkje lastast ut:"
+
 #~ msgid "package %s %s was found, but %s %s is required by %s"
 #~ msgstr "fann pakken «%s %s», men «%s %s» trengst av «%s»"
 
diff -Nru r-base-3.2.3/src/library/base/po/R-pl.po r-base-3.3.1/src/library/base/po/R-pl.po
--- r-base-3.2.3/src/library/base/po/R-pl.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-pl.po	2016-04-27 22:15:36.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-04 19:01\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,1620 +13,2869 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-msgid "'%s' is defunct."
-msgstr "Funkcja '%s' została zlikwidowana."
+#. R/New-Internal.R: stop("\"hexNumeric\" and \"digits17\" are mutually exclusive")
+#: R/New-Internal.R:0
+msgid "\"hexNumeric\" and \"digits17\" are mutually exclusive"
+msgstr "argumenty \"hexNumeric\" oraz \"digits17\" wzajemnie siÄ™ wykluczajÄ…"
 
-msgid "Use '%s' instead."
-msgstr "Użyj w zamian '%s'."
+#. R/grep.R: gettextf("%s and %s must have the same length", sQuote("x"),     sQuote("m"))
+#: R/grep.R:0
+msgid "%s and %s must have the same length"
+msgstr "argumenty %s oraz %s muszą mieć tę samą długość"
 
-msgid "See help(\"Defunct\") and help(\"%s-defunct\")."
-msgstr "Zobacz help(\"Defunct\") oraz help(\"%s-defunct\")."
+#. R/attach.R: gettextf("%s converted to character string", sQuote(name))
+#: R/attach.R:0
+msgid "%s converted to character string"
+msgstr "wartość %s została zamieniona na tekst"
 
-msgid "See help(\"Defunct\")"
-msgstr "Zobacz help(\"Defunct\")"
+#. R/attach.R: gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",     ".onDetach", "detach", pkgname, deparse(conditionCall(res))[1L],     conditionMessage(res))
+#. R/attach.R: gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",     ".Last.lib", "detach", pkgname, deparse(conditionCall(res))[1L],     conditionMessage(res))
+#. R/namespace.R: gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",     hookname, "attachNamespace", nsname, deparse(conditionCall(res))[1L],     conditionMessage(res))
+#. R/namespace.R: gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",     hookname, "loadNamespace", pkgname, deparse(conditionCall(res))[1L],     conditionMessage(res))
+#. R/namespace.R: gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",     hookname, "unloadNamespace", nsname, deparse(conditionCall(res))[1L],     conditionMessage(res))
+#: R/attach.R:0 R/namespace.R:0
+msgid ""
+"%s failed in %s() for '%s', details:\n"
+"  call: %s\n"
+"  error: %s"
+msgstr ""
+"%s nie powiodło się w funkcji '%s()' dla pakietu '%s', szczegóły:\n"
+"  wywołanie: %s\n"
+"  błąd:  %s"
 
-msgid "'%s' is deprecated."
-msgstr "Funkcja '%s' jest przestarzała."
+#. R/library.R: gettextf("%s is not a valid installed package", sQuote(package))
+#: R/library.R:0
+msgid "%s is not a valid installed package"
+msgstr "%s nie jest poprawnie zainstalowanym pakietem"
 
-msgid "See help(\"Deprecated\") and help(\"%s-deprecated\")."
-msgstr "Zobacz help(\"Deprecated\") oraz help(\"%s-deprecated\")."
+#. R/mapply.R: gettextf("%s may not have argument(s) named %s", sQuote("FUN"),     paste(sQuote(arg.names[collisions]), collapse = ", "))
+#: R/mapply.R:0
+msgid "%s may not have argument(s) named %s"
+msgstr "%s nie może mieć argumentów o nazwach %s"
 
-msgid "See help(\"Deprecated\")"
-msgstr "Zobacz help(\"Deprecated\")"
+#. R/attach.R: gettextf("%s namespace cannot be unloaded:\n  ", sQuote(pkgname))
+#: R/attach.R:0
+msgid "%s namespace cannot be unloaded:"
+msgstr "przestrzeń nazw %s pakietu nie może zostać zwolniona:"
 
-msgid "argument to 'La.svd' must be numeric or complex"
-msgstr ""
-"argument przekazywany do 'La.svd()' musi być wartością logiczną, liczbą lub "
-"liczbÄ… zespolonÄ…"
+#. R/dates.R: gettextf("%s not defined for \"Date\" objects", .Generic)
+#. R/dates.R: gettextf("%s not defined for \"Date\" objects", .Generic)
+#. R/dates.R: gettextf("%s not defined for \"Date\" objects", .Generic)
+#: R/dates.R:0
+msgid "%s not defined for \"Date\" objects"
+msgstr "'%s' nie jest określone dla obiektów klasy \"Date\""
 
-msgid "infinite or missing values in 'x'"
-msgstr "wartość nieskończona lub brakuje wartości w 'x'"
+#. R/version.R: gettextf("%s not defined for \"numeric_version\" objects", .Generic)
+#: R/version.R:0
+msgid "%s not defined for \"numeric_version\" objects"
+msgstr "'%s' nie jest określone dla obiektów klasy \"numeric_version\""
 
-msgid "a dimension is zero"
-msgstr "wymiar wynosi zero"
+#. R/namespace.R: gettextf("%s not found", sQuote(x))
+#: R/namespace.R:0
+msgid "%s not found"
+msgstr "wartość %s nie została znaleziona"
 
-#, fuzzy
-msgid "\"hexNumeric\" and \"digits17\" are mutually exclusive"
-msgstr "\"hexNumeric\" oraz \"digits17\" wzajemnie siÄ™ wykluczajÄ…"
+#. R/library.R: gettextf("%s not found on search path, using pos = 2", sQuote(pos))
+#: R/library.R:0
+msgid "%s not found on search path, using pos = 2"
+msgstr "%s nie zostało znalezione w ścieżce wyszukiwania, używanie 'pos = 2'"
 
-msgid "second argument must be a list"
-msgstr "drugi argument musi być listą"
+#. R/factor.R: gettextf("%s not meaningful for factors", sQuote(.Generic))
+#. R/factor.R: gettextf("%s not meaningful for factors", sQuote(.Generic))
+#. R/factor.R: gettextf("%s not meaningful for factors", sQuote(.Generic))
+#: R/factor.R:0
+msgid "%s not meaningful for factors"
+msgstr "%s nie ma sensu dla czynników"
 
-msgid "'iconvlist' is not available on this system"
-msgstr "'iconvlist' nie jest dostępne w tym systemie"
+#. R/dataframe.R: gettextf("%s only defined for equally-sized data frames", sQuote(.Generic))
+#: R/dataframe.R:0
+msgid "%s only defined for equally-sized data frames"
+msgstr "%s jest zdefiniowane jedynie dla ramek danych o równych rozmiarach"
 
-msgid "'kind' must be a character string of length 1 (RNG to be used)."
-msgstr ""
-"'kind' musi być łańcuchem tekstowym o długości 1 (zostanie użyty 'RNG')."
+#. R/library.R: gettextf("%sPackages in library %s:\n", sep, sQuote(lib))
+#: R/library.R:0
+msgid "%sPackages in library %s:"
+msgstr "%sPakiety w bibliotece %s:"
+
+#. R/windows/system.R: gettextf("'%s' could not be run", cmd0)
+#. R/windows/system.R: gettextf("'%s' could not be run", cmd0)
+#: R/windows/system.R:0
+msgid "'%s' could not be run"
+msgstr "'%s' nie mogło zostać uruchomione"
 
+#. R/windows/system.R: gettextf("'%s' execution failed with error code %d", cmd0, res)
+#. R/windows/system.R: gettextf("'%s' execution failed with error code %d", cmd0, res)
+#: R/windows/system.R:0
+msgid "'%s' execution failed with error code %d"
+msgstr "wykonywanie '%s' nie powiodło się zwracając kod błędu %d"
+
+#. R/Defunct.R: gettextf("'%s' is defunct.\n", as.character(sys.call(sys.parent())[[1L]]))
+#: R/Defunct.R:0
+msgid "'%s' is defunct."
+msgstr "Funkcja '%s' została zlikwidowana."
+
+#. R/Deprecated.R: gettextf("'%s' is deprecated.\n", old)
+#: R/Deprecated.R:0
+msgid "'%s' is deprecated."
+msgstr "Funkcja '%s' jest przestarzała."
+
+#. R/dates.R: gettextf("'%s' is not a \"date\" object", deparse(substitute(x)))
+#. R/datetime.R: gettextf("'%s' is not a \"date\" object", deparse(substitute(x)))
+#: R/dates.R:0 R/datetime.R:0
+msgid "'%s' is not a \"date\" object"
+msgstr "argument '%s' nie jest obiektem klasy \"date\""
+
+#. R/dates.R: gettextf("'%s' is not a \"dates\" object", deparse(substitute(x)))
+#. R/datetime.R: gettextf("'%s' is not a \"dates\" object", deparse(substitute(x)))
+#: R/dates.R:0 R/datetime.R:0
+msgid "'%s' is not a \"dates\" object"
+msgstr "argument '%s' nie jest obiektem klasy \"dates\""
+
+#. R/match.fun.R: gettextf("'%s' is not a function, character or symbol", deparse(FUN))
+#: R/match.fun.R:0
+msgid "'%s' is not a function, character or symbol"
+msgstr "'%s' nie jest funkcjÄ…, tekstem ani symbolem"
+
+#. R/RNG.R: gettextf("'%s' is not a valid abbreviation of an RNG", kind)
+#. R/RNG.R: gettextf("'%s' is not a valid abbreviation of an RNG", kind)
+#: R/RNG.R:0
 msgid "'%s' is not a valid abbreviation of an RNG"
 msgstr "'%s' nie jest poprawnym skrótem dla 'RNG'"
 
-msgid "'normal.kind' must be a character string of length 1"
-msgstr "'normal.kind' musi być łańcuchem tekstowym o długości 1"
-
+#. R/RNG.R: gettextf("'%s' is not a valid choice", normal.kind)
+#. R/RNG.R: gettextf("'%s' is not a valid choice", normal.kind)
+#: R/RNG.R:0
 msgid "'%s' is not a valid choice"
 msgstr "'%s' nie jest poprawnym wyborem"
 
-msgid "malformed version string"
-msgstr "zniekształcony łańcuch tekstowy wersji"
+#. R/source.R: gettextf("'%s' is not an existing file", file)
+#: R/source.R:0
+msgid "'%s' is not an existing file"
+msgstr "'%s' nie jest istniejÄ…cym plikiem"
 
-msgid "target is %s, current is %s"
-msgstr "cel: %s, bieżące: %s"
+#. R/namespace.R: gettextf("'%s' is not an exported object from 'namespace:%s'",     name, getNamespaceName(ns))
+#: R/namespace.R:0
+msgid "'%s' is not an exported object from 'namespace:%s'"
+msgstr "'%s' nie jest eksportowanym obiektem z 'namespace:%s'"
 
-msgid "'tolerance' should be numeric"
-msgstr "argument 'tolerance' musi być liczbą"
+#. R/notyet.R: gettextf("'%s' is not implemented yet", as.character(sys.call(sys.parent())[[1L]]))
+#: R/notyet.R:0
+msgid "'%s' is not implemented yet"
+msgstr "'%s' nie jest jeszcze zaimplementowane"
 
-msgid "'scale' should be numeric or NULL"
-msgstr "argument 'scale' powininen być liczbą lub wartością NULL"
+#. R/factor.R: sprintf("'%s' is not meaningful for ordered factors", .Generic)
+#: R/factor.R:0
+msgid "'%s' is not meaningful for ordered factors"
+msgstr "'%s' nie ma sensu dla uporządkowanych czynników"
+
+#. R/factor.R: gettextf("'%s' is only meaningful for ordered factors if all arguments have the same level sets",     .Generic)
+#: R/factor.R:0
+msgid ""
+"'%s' is only meaningful for ordered factors if all arguments have the same "
+"level sets"
+msgstr ""
+"'%s' ma sens tylko dla uporządkowanych czynników jeśli wszystkie argumenty "
+"mają ten sam zbiór poziomów"
 
+#. R/all.equal.R: gettextf("'%s' must be logical", "check.attributes")
+#. R/all.equal.R: gettextf("'%s' must be logical", "check.attributes")
+#. R/all.equal.R: gettextf("'%s' must be logical", "check.attributes")
+#. R/all.equal.R: gettextf("'%s' must be logical", "use.names")
+#. R/all.equal.R: gettextf("'%s' must be logical", "check.attributes")
+#. R/all.equal.R: gettextf("'%s' must be logical", "check.attributes")
+#. R/all.equal.R: gettextf("'%s' must be logical", "check.names")
+#: R/all.equal.R:0
 msgid "'%s' must be logical"
 msgstr "argumen '%s' musi być zmienną logiczną"
 
-msgid "dim(X) must have a positive length"
-msgstr "'dim(X)' musi mieć dodatnią długość"
-
-msgid "'X' must have named dimnames"
-msgstr "'X' musi mieć nazwane wymiary"
+#. R/datetime.R: gettextf("'%s' not defined for \"POSIXt\" objects", .Generic)
+#. R/datetime.R: gettextf("'%s' not defined for \"POSIXt\" objects", .Generic)
+#. R/datetime.R: gettextf("'%s' not defined for \"POSIXt\" objects", .Generic)
+#. R/datetime.R: gettextf("'%s' not defined for \"POSIXt\" objects", .Generic)
+#: R/datetime.R:0
+msgid "'%s' not defined for \"POSIXt\" objects"
+msgstr "'%s' nie jest określone dla obiektów klasy \"POSIXt\""
 
-msgid "not all elements of 'MARGIN' are names of dimensions"
-msgstr "nie wszystkie elementy 'MARGIN' są nazwami wymiarów"
+#. R/datetime.R: gettextf("'%s' not defined for \"difftime\" objects", .Generic)
+#. R/datetime.R: gettextf("'%s' not defined for \"difftime\" objects", .Generic)
+#. R/datetime.R: gettextf("'%s' not defined for \"difftime\" objects", .Generic)
+#: R/datetime.R:0
+msgid "'%s' not defined for \"difftime\" objects"
+msgstr "'%s' nie jest określone dla obiektów klasy \"difftime\""
 
-msgid "'dims' cannot be of length 0"
-msgstr "'dims' nie mogą posiadać długości 0"
+#. R/version.R: gettextf("'%s' not defined for \"numeric_version\" objects",     .Generic)
+#: R/version.R:0
+msgid "'%s' not defined for \"numeric_version\" objects"
+msgstr "'%s' nie jest określone dla obiektów klasy \"numeric_version\""
 
-msgid "'dim' specifies too large an array"
-msgstr "'dim' określa zbyć dużą tablicę"
+#. R/factor.R: gettextf("'%s' not defined for ordered factors", .Generic)
+#: R/factor.R:0
+msgid "'%s' not defined for ordered factors"
+msgstr "'%s' nie jest określone dla uporządkowanych czynników"
 
-msgid "incorrect value for 'MARGIN'"
-msgstr "niepoprawna wartość dla argumentu 'MARGIN'"
+#. R/library.R: warning("'DESCRIPTION' has an 'Encoding' field and re-encoding is not possible",     call. = FALSE)
+#. R/library.R: warning("'DESCRIPTION' has an 'Encoding' field and re-encoding is not possible",     call. = FALSE)
+#: R/library.R:0
+msgid "'DESCRIPTION' has an 'Encoding' field and re-encoding is not possible"
+msgstr ""
+"plik 'DESCRIPTION' posiada pole 'Encoding' i ponowne kodowanie nie jest "
+"możliwe"
 
-msgid "*** 'pos=1' is not possible; setting 'pos=2' for now."
-msgstr "*** 'pos=1' nie jest możliwe; na chwilę obecną ustawianie 'pos=2'."
+#. R/tapply.R: stop("'INDEX' is of length zero")
+#: R/tapply.R:0
+msgid "'INDEX' is of length zero"
+msgstr "argument 'INDEX' ma zerową długość"
 
-msgid "*** Note that 'pos=1' will give an error in the future"
-msgstr "*** Zwróć uwagę, że 'pos=1' będzie zwracało błąd w przyszłości"
+#. R/apply.R: stop("'X' must have named dimnames")
+#: R/apply.R:0
+msgid "'X' must have named dimnames"
+msgstr "'X' musi mieć nazwane wymiary"
 
-msgid "file '%s' not found"
-msgstr "plik '%s' nie został znaleziony"
+#. R/match.R: stop("'arg' must be NULL or a character vector")
+#: R/match.R:0
+msgid "'arg' must be NULL or a character vector"
+msgstr "argument 'arg' musi być wartością NULL lub wektorem tekstowym"
 
-msgid "invalid 'name' argument"
-msgstr "niepoprawny argument 'name'"
+#. R/match.R: stop("'arg' must be of length 1")
+#: R/match.R:0
+msgid "'arg' must be of length 1"
+msgstr "argument 'arg' musi mieć długość 1"
 
-msgid "package %s is required by %s, which may no longer work correctly"
-msgstr ""
-"pakiet %s jest wymagany przez %s, który z kolei może nie działać poprawnie"
+#. R/match.R: stop("'arg' must be of length >= 1")
+#: R/match.R:0
+msgid "'arg' must be of length >= 1"
+msgstr "argument 'arg' musi mieć długość >= 1"
 
-msgid "package %s is required by %s so will not be detached"
-msgstr "pakiet %s jest wymagany przez %s tak więc nie zostanie odłączony"
+#. R/match.R: gettextf("'arg' should be one of %s", paste(dQuote(choices),     collapse = ", "))
+#: R/match.R:0
+msgid "'arg' should be one of %s"
+msgstr "argument 'arg' powininen być jednym z %s"
 
-msgid ""
-"%s failed in %s() for '%s', details:\n"
-"  call: %s\n"
-"  error: %s"
+#. R/format.R: gettextf("'big.mark' and 'decimal.mark' are both '%s', which could be confusing",     big.mark)
+#: R/format.R:0
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
 msgstr ""
-"%s nie powiodło się w funkcji '%s()' dla pakietu '%s', szczegóły:\n"
-"  wywołanie: %s\n"
-"  błąd:  %s"
+"oba argumenty 'big.mark' oraz 'decimal.mark' są ustawione na '%s', co może "
+"być mylące"
 
-msgid "%s namespace cannot be unloaded:"
-msgstr "przestrzeń nazw %s pakietu nie może zostać zwolniona:"
+#. R/tabulate.R: stop("'bin' must be numeric or a factor")
+#: R/tabulate.R:0
+msgid "'bin' must be numeric or a factor"
+msgstr "argument 'bin' musi być liczbą lub czynnikiem"
 
-msgid "%s converted to character string"
-msgstr "wartość %s została zamieniona na tekst"
+#. R/cut.R: stop("'breaks' are not unique")
+#: R/cut.R:0
+msgid "'breaks' are not unique"
+msgstr "wartosci w argumencie 'breaks' nie sÄ… unikalne"
 
-msgid "replaced regular expression pattern '[' by  '\\\\['"
-msgstr "zastąpiono wzór wyrażenia regularnego '[' przez '\\\\['"
+#. R/seq.R: stop("'by' argument is much too small")
+#: R/seq.R:0
+msgid "'by' argument is much too small"
+msgstr "wartość w argumencie 'by' jest znacznie za mała"
 
-msgid "replaced '[<-' by '\\\\[<-' in regular expression pattern"
-msgstr "zastąpiono '[<-' przez '\\\\[<-' we wzorcu wyrażenia regularnego"
+#. R/dates.R: stop("'by' is NA")
+#. R/datetime.R: stop("'by' is NA")
+#: R/dates.R:0 R/datetime.R:0
+msgid "'by' is NA"
+msgstr "'by' posiada wartość NA"
 
-msgid "'value' must be a list"
-msgstr "argument 'value' musi być listą"
+#. R/dates.R: stop("'by' must be of length 1")
+#. R/datetime.R: stop("'by' must be of length 1")
+#: R/dates.R:0 R/datetime.R:0
+msgid "'by' must be of length 1"
+msgstr "argument 'by' musi mieć długość 1"
 
-msgid "an object with that name already exists"
-msgstr "obiekt o tej nazwie już istnieje"
+#. R/merge.R: stop("'by' must match number of columns")
+#: R/merge.R:0
+msgid "'by' must match number of columns"
+msgstr "argument 'by' musi zgadzać się z liczbą kolumn"
 
-msgid "autoloader did not find '%s' in '%s'"
-msgstr "automat ładujący nie znalazł '%s' w pakiecie '%s'"
+#. R/merge.R: stop("'by' must match numbers of columns")
+#: R/merge.R:0
+msgid "'by' must match numbers of columns"
+msgstr "argument 'by' musi zgadzać się z liczbą kolumn"
 
-msgid "complex matrices not permitted at present"
-msgstr "macierze zespolone na chwilÄ™ obecnÄ… nie sÄ… dozwolone"
+#. R/merge.R: stop("'by' must specify one or more columns as numbers, names or logical")
+#: R/merge.R:0
+msgid "'by' must specify one or more columns as numbers, names or logical"
+msgstr ""
+"argument 'by' musi określać jedną lub więcej kolumn jako liczby, nazwy lub "
+"warunki logiczne"
 
-msgid "'x' must be an array of at least two dimensions"
-msgstr "argument 'x' musi być tablicą o co najmniej dwóch wymiarach"
+#. R/merge.R: stop("'by.x' and 'by.y' specify different numbers of columns")
+#: R/merge.R:0
+msgid "'by.x' and 'by.y' specify different numbers of columns"
+msgstr "argumenty 'by.x' oraz 'by.y' określają różne liczby kolumn"
 
-msgid "invalid 'dims'"
-msgstr "niepoprawny argument 'dims'"
+#. R/source.R: warning("'chdir = TRUE' makes no sense for a URL")
+#: R/source.R:0
+msgid "'chdir = TRUE' makes no sense for a URL"
+msgstr "'chdir = TRUE' nie ma sensu dla adresu URL"
 
-msgid "bad handler specification"
-msgstr "niepoprawne określenie obsługi"
+#. R/source.R: warning("'chdir = TRUE' makes no sense for a connection")
+#: R/source.R:0
+msgid "'chdir = TRUE' makes no sense for a connection"
+msgstr "'chdir = TRUE' nie ma sensu dla połączenia"
 
-msgid "no 'restart' '%s' found"
-msgstr "nie znaleziono 'restart' '%s'"
+#. R/load.R: gettextf("'compress = \"%s\"' is invalid", compress)
+#: R/load.R:0
+msgid "'compress = \"%s\"' is invalid"
+msgstr "'compress = \"%s\"' jest niepoprawne"
 
-msgid "not an interactive session"
-msgstr "nieinteraktywna sesja"
+#. R/serialize.R: warning("'compress' is ignored unless 'file' is a file name")
+#: R/serialize.R:0
+msgid "'compress' is ignored unless 'file' is a file name"
+msgstr ""
+"argument 'compress' zostanie zignorowany o ile argument 'file' nie jest "
+"nazwÄ… pliku"
 
-msgid "not a valid restart specification"
-msgstr "niepoprawne określenie restartu"
+#. R/load.R: stop("'compress' must be logical or character")
+#: R/load.R:0
+msgid "'compress' must be logical or character"
+msgstr "argument 'compress' musi być typem logicznym lub tekstem"
 
-msgid "argument 'where' of length 0"
-msgstr "argument 'where' ma długość 0"
+#. R/serialize.R: stop("'connection' must be a connection")
+#. R/serialize.R: stop("'connection' must be a connection")
+#: R/serialize.R:0
+msgid "'connection' must be a connection"
+msgstr "argument 'connection' musi być połączeniem"
 
-msgid "argument 'object' must deparse to a single character string"
+#. R/sort.R: stop("'decreasing' must be a length-1 logical vector.\nDid you intend to set 'partial'?")
+#: R/sort.R:0
+msgid ""
+"'decreasing' must be a length-1 logical vector.\n"
+"Did you intend to set 'partial'?"
 msgstr ""
-"argument 'object' musi być konwertowalny do pojedynczego łańcucha tekstowego"
-
-msgid "'origin' must be one of 'start', 'current' or 'end'"
-msgstr "argument 'origin' musi być jednym ze 'start', 'current' lub 'end'"
+"'decreasing' musi być wektorem logicznym o długości 1.\n"
+"Czy chciałeś ustawić 'partial'?"
 
-msgid "can only truncate an open connection"
+#. R/det.R: stop("'determinant' not currently defined for complex matrices")
+#: R/det.R:0
+msgid "'determinant' not currently defined for complex matrices"
 msgstr ""
-"funkcja 'truncate.connection()' może przycinać jedynie otwarte połączenie"
+"funkcja 'determinant()' nie jest aktualnie zdefiniowana dla macierzy "
+"zespolonych"
 
-msgid "can only write vector objects"
-msgstr "można zapisać jedynie obiekty wektorowe"
+#. R/format.R: gettextf("'digits' reduced to %d", maxDigits)
+#: R/format.R:0
+msgid "'digits' reduced to %d"
+msgstr "'digits' zredukowano do %d"
 
-msgid "can only write character objects"
-msgstr "można zapisać jedynie obiekty wektorowe"
+#. R/array.R: stop("'dim' specifies too large an array")
+#: R/array.R:0
+msgid "'dim' specifies too large an array"
+msgstr "'dim' określa zbyć dużą tablicę"
 
-msgid "'timeout' must be NULL or a non-negative number"
-msgstr "argument 'timeout' musi być wartością NULL lub nieujemną liczbą"
-
-msgid "'from' must be raw or character"
-msgstr "argument 'from' musi być typem pustym lub tekstem"
-
-msgid "'x' must be numeric"
-msgstr "argument 'x' musi być liczbą"
-
-msgid "invalid number of intervals"
-msgstr "niepoprawna liczba interwałów"
+#. R/array.R: stop("'dims' cannot be of length 0")
+#: R/array.R:0
+msgid "'dims' cannot be of length 0"
+msgstr "'dims' nie mogą posiadać długości 0"
 
-msgid "'breaks' are not unique"
-msgstr "wartosci w argumencie 'breaks' nie sÄ… unikalne"
+#. R/dataframe.R: warning("'drop' argument will be ignored")
+#: R/dataframe.R:0
+msgid "'drop' argument will be ignored"
+msgstr "argument 'drop' zostanie zignorowany"
 
-msgid "lengths of 'breaks' and 'labels' differ"
-msgstr "długości argumentów 'breaks' oraz 'labels' różnią się"
+#. R/source.R: stop("'echo' must be logical")
+#: R/source.R:0
+msgid "'echo' must be logical"
+msgstr "'echo' musi być zmienną logiczną"
 
-msgid "invalid 'row.names' length"
-msgstr "niepoprawna długość 'row.names'"
+#. R/namespace.R: gettextf("'exportClassPattern' specified in 'NAMESPACE' but no matching classes in package %s",     sQuote(package))
+#: R/namespace.R:0
+msgid ""
+"'exportClassPattern' specified in 'NAMESPACE' but no matching classes in "
+"package %s"
+msgstr ""
+"'exportClassPattern' określono w pliku 'NAMESPACE', ale brak pasujących klas "
+"w pakiecie %s"
 
-msgid "duplicate 'row.names' are not allowed"
-msgstr "powtórzone wartości w 'row.names' nie są dozwolone"
+#. R/sink.R: stop("'file' must be NULL or an already open connection")
+#: R/sink.R:0
+msgid "'file' must be NULL or an already open connection"
+msgstr "'file' musi być wartością NULL lub już otwartym połączeniem"
 
-msgid "missing values in 'row.names' are not allowed"
-msgstr "brakujące wartości w 'row.names' nie są dozwolone"
+#. R/sink.R: stop("'file' must be NULL, a connection or a character string")
+#: R/sink.R:0
+msgid "'file' must be NULL, a connection or a character string"
+msgstr "'file' musi być wartością NULL, połączeniem lub łańcuchem tekstowym"
 
-msgid "invalid 'dimnames' given for data frame"
-msgstr "niepoprawne 'dimnames' dla podanej ramki danych"
+#. R/dcf.R: stop("'file' must be a character string or connection")
+#. R/dcf.R: stop("'file' must be a character string or connection")
+#. R/scan.R: stop("'file' must be a character string or connection")
+#: R/dcf.R:0 R/scan.R:0
+msgid "'file' must be a character string or connection"
+msgstr "argument 'file' musi być łańcuchem tekstowym lub połączeniem"
 
-msgid "cannot coerce class \"%s\" to a data.frame"
-msgstr "nie można przekształcić klasy \"%s\" w klasę \"data.frame\""
+#. R/load.R: stop("'file' must be non-empty string")
+#. R/load.R: stop("'file' must be non-empty string")
+#. R/serialize.R: stop("'file' must be non-empty string")
+#: R/load.R:0 R/serialize.R:0
+msgid "'file' must be non-empty string"
+msgstr "argument 'file' musi być niepustym łańcuchem tekstowym"
 
-msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
-msgstr ""
-"'options(\"stringsAsFactors\")' nie zostało ustawione na 'TRUE' lub 'FALSE'"
+#. R/load.R: stop("'file' must be specified")
+#: R/load.R:0
+msgid "'file' must be specified"
+msgstr "argument 'file' musi być określony"
 
-msgid "mismatch of row names in arguments of 'data.frame', item %d"
-msgstr "niedopasowanie nazw wierszy w argumentach 'data.frame()', pozycja %d"
+#. R/format.R: stop("'flag' can contain only '0+- #'")
+#: R/format.R:0
+msgid "'flag' can contain only '0+- #'"
+msgstr "'flag' może zawierać jedynie znaki '0+- #'"
 
-msgid "some row.names duplicated: %s --> row.names NOT used"
+#. R/format.R: stop("'format' must be one of {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}")
+#: R/format.R:0
+msgid "'format' must be one of {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}"
 msgstr ""
-"niektóre wartości 'row.names' są powtórzone: %s --> nazwy wierszy nie "
-"zostały użyte"
-
-msgid "row names contain missing values"
-msgstr "nazwy wierszy zawierają brakujące wartości"
-
-msgid "duplicate row.names: %s"
-msgstr "powtórzone wartości 'row.names': %s"
+"argument 'format' musi być jednym z {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", "
+"\"s\"}"
 
-msgid "arguments imply differing number of rows: %s"
-msgstr "argumenty sugerują różną liczbę wierszy: %s"
+#. R/seq.R: stop("'from' cannot be NA, NaN or infinite")
+#. R/seq.R: stop("'from' cannot be NA, NaN or infinite")
+#: R/seq.R:0
+msgid "'from' cannot be NA, NaN or infinite"
+msgstr "argument 'from' nie może mieć wartości NA, NaN lub nieskończoność"
 
-msgid "'row.names' should specify one of the variables"
-msgstr "argument 'row.names' powinien określać jedną ze zmiennych"
+#. R/dates.R: stop("'from' must be a \"Date\" object")
+#: R/dates.R:0
+msgid "'from' must be a \"Date\" object"
+msgstr "argument 'from' musi być obiektem klasy \"Date\""
 
-msgid "row names supplied are of the wrong length"
-msgstr "dostarczone nazwy wierszy mają niepoprawną długość"
+#. R/datetime.R: stop("'from' must be a \"POSIXt\" object")
+#: R/datetime.R:0
+msgid "'from' must be a \"POSIXt\" object"
+msgstr "argument 'from' musi być obiektem klasy \"POSIXt\""
 
-msgid "row names were found from a short variable and have been discarded"
-msgstr ""
-"nazwy wierszy zostały znalezione z krótkiej zmiennej i zostały odrzucone"
+#. R/dates.R: stop("'from' must be of length 1")
+#. R/datetime.R: stop("'from' must be of length 1")
+#. R/seq.R: stop("'from' must be of length 1")
+#: R/dates.R:0 R/datetime.R:0 R/seq.R:0
+msgid "'from' must be of length 1"
+msgstr "argument 'from' musi mieć długość 1"
 
-msgid "named arguments other than 'drop' are discouraged"
-msgstr "nazwane argumenty inne niż 'drop' są odrzucane"
+#. R/connections.R: stop("'from' must be raw or character")
+#: R/connections.R:0
+msgid "'from' must be raw or character"
+msgstr "argument 'from' musi być typem pustym lub tekstem"
 
-msgid "'drop' argument will be ignored"
-msgstr "argument 'drop' zostanie zignorowany"
+#. R/dates.R: stop("'from' must be specified")
+#. R/datetime.R: stop("'from' must be specified")
+#: R/dates.R:0 R/datetime.R:0
+msgid "'from' must be specified"
+msgstr "argument 'from' musi być określony"
 
-msgid "undefined columns selected"
-msgstr "nie wybrano kolumn"
+#. R/formals.R: warning("'fun' is not a function")
+#. R/formals.R: warning("'fun' is not a function")
+#: R/formals.R:0
+msgid "'fun' is not a function"
+msgstr "argument 'fun' nie jest funkcjÄ…"
+
+#. R/New-Internal.R: stop("'iconvlist' is not available on this system")
+#. R/New-Internal.R: stop("'iconvlist' is not available on this system")
+#: R/New-Internal.R:0
+msgid "'iconvlist' is not available on this system"
+msgstr "'iconvlist' nie jest dostępne w tym systemie"
 
-msgid "named arguments other than 'exact' are discouraged"
-msgstr "nazwane argumenty inne niż 'exact' są odrzucane"
+#. R/unix/system.unix.R: stop("'ignore.stderr' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'ignore.stderr' must be TRUE or FALSE")
+#: R/unix/system.unix.R:0 R/windows/system.R:0
+msgid "'ignore.stderr' must be TRUE or FALSE"
+msgstr "argument 'ignore.stderr' musi mieć wartość TRUE lub FALSE"
 
-msgid "named arguments are discouraged"
-msgstr "nazwane argumenty sÄ… odrzucane"
+#. R/unix/system.unix.R: stop("'ignore.stdout' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'ignore.stdout' must be TRUE or FALSE")
+#: R/unix/system.unix.R:0 R/windows/system.R:0
+msgid "'ignore.stdout' must be TRUE or FALSE"
+msgstr "argument 'ignore.stdout' musi mieć wartość TRUE lub FALSE"
 
-msgid "number of items to replace is not a multiple of replacement length"
+#. R/merge.R: stop("'incomparables' is supported only for merging on a single column")
+#: R/merge.R:0
+msgid "'incomparables' is supported only for merging on a single column"
 msgstr ""
-"liczba pozycji do zastąpienia nie jest wielokrotnością długości zamiany"
+"'incomparables' jest wspierany w sytuacji łączeń na pojedynczej kolumnie"
 
-msgid "'value' is the wrong length"
-msgstr "argument 'value' posiada niepoprawną długość"
+#. R/sort.R: stop("'index.return' only for 'na.last = NA'")
+#: R/sort.R:0
+msgid "'index.return' only for 'na.last = NA'"
+msgstr "'index.return' dostępne jest jedynie dla 'na.last = NA'"
 
-msgid "unsupported matrix index in replacement"
-msgstr "niedozwolony indeks macierzy w zamianie"
+#. R/sort.R: stop("'index.return' only for non-factors")
+#: R/sort.R:0
+msgid "'index.return' only for non-factors"
+msgstr "argument 'index.return' jest poprawny jedynie dla nie-czynników"
 
-msgid "need 0, 1, or 2 subscripts"
-msgstr "wymagane jest 0, 1, lub 2 indeksy"
+#. R/match.R: stop("'input' and 'target' must be character vectors")
+#: R/match.R:0
+msgid "'input' and 'target' must be character vectors"
+msgstr "argumenty 'input' oraz 'target' muszą być wektorami tekstowymi"
 
-msgid ""
-"missing values are not allowed in subscripted assignments of data frames"
-msgstr ""
-"brakujące wartości nie są dozwolone w indeksowanych przypisaniach ramek "
-"danych"
+#. R/unix/system.unix.R: stop("'input' must be a character vector or 'NULL'")
+#. R/unix/system.unix.R: stop("'input' must be a character vector or 'NULL'")
+#: R/unix/system.unix.R:0
+msgid "'input' must be a character vector or 'NULL'"
+msgstr "argument 'input' musi być wektorem tekstowym lub wartością 'NULL'"
 
-msgid "non-existent rows not allowed"
-msgstr "nieistniejÄ…ce wiersze nie sÄ… dozwolone"
+#. R/match.R: stop("'input' must have length 1")
+#: R/match.R:0
+msgid "'input' must have length 1"
+msgstr "argument 'input' musi mieć długość 1"
 
-msgid "column name \"\" cannot match any column"
-msgstr "kolumny o nazwie \"\" nie można dopasować do żadnej kolumny"
+#. R/format.R: stop("'input.d.mark' has no characters")
+#: R/format.R:0
+msgid "'input.d.mark' has no characters"
+msgstr "argument 'input.d.mark' nie zawiera znaków"
+
+#. R/unix/system.unix.R: stop("'intern' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'intern' must be TRUE or FALSE")
+#: R/unix/system.unix.R:0 R/windows/system.R:0
+msgid "'intern' must be TRUE or FALSE"
+msgstr "argument 'intern' musi mieć wartość TRUE lub FALSE"
 
-msgid "new columns would leave holes after existing columns"
-msgstr "nowe kolumny zostawiłyby dziury po istniejących kolumnach"
+#. R/windows/system.R: stop("'invisible' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'invisible' must be TRUE or FALSE")
+#: R/windows/system.R:0
+msgid "'invisible' must be TRUE or FALSE"
+msgstr "argument 'invisible' musi mieć wartość TRUE lub FALSE"
 
-msgid "duplicate subscripts for columns"
-msgstr "powtórzone indeksy dla kolumn"
+#. R/qr.R: stop("'k' is too large")
+#: R/qr.R:0
+msgid "'k' is too large"
+msgstr "argument 'k' jest zbyt duży"
 
-msgid "only valid calls are x[[j]] <- value or x[[i,j]] <- value"
+#. R/RNG.R: stop("'kind' must be a character string of length 1 (RNG to be used).")
+#. R/RNG.R: stop("'kind' must be a character string of length 1 (RNG to be used).")
+#: R/RNG.R:0
+msgid "'kind' must be a character string of length 1 (RNG to be used)."
 msgstr ""
-"jedynymi poprawnymi przywołaniami są x[[j]] <- wartość lub x[[i,j]] <- "
-"wartość"
-
-msgid "replacing element in non-existent column: %s"
-msgstr "zastępowanie elementu w nieistniejącej kolumnie: %s"
+"'kind' musi być łańcuchem tekstowym o długości 1 (zostanie użyty 'RNG')."
 
-msgid "only a single element should be replaced"
-msgstr "tylko pojedynczy element powinień być zamieniany"
+#. R/dates.R: stop("'lag' and 'differences' must be integers >= 1")
+#. R/datetime.R: stop("'lag' and 'differences' must be integers >= 1")
+#. R/diff.R: stop("'lag' and 'differences' must be integers >= 1")
+#: R/dates.R:0 R/datetime.R:0 R/diff.R:0
+msgid "'lag' and 'differences' must be integers >= 1"
+msgstr "argumenty 'lag' oraz 'differences' muszą być liczbami całkowitymi >= 1"
 
-msgid "Partial match of '%s' to '%s' in data frame"
-msgstr "Częściowe dopasowanie '%s' do '%s' w ramce danych"
+#. R/dates.R: stop("'length.out' must be of length 1")
+#. R/datetime.R: stop("'length.out' must be of length 1")
+#: R/dates.R:0 R/datetime.R:0
+msgid "'length.out' must be of length 1"
+msgstr "argument 'length.out' musi mieć długość 1"
 
-msgid "names do not match previous names"
-msgstr "nazwy nie zgadzajÄ… siÄ™ z poprzednimi nazwami"
+#. R/source.R: stop("'local' must be TRUE, FALSE or an environment")
+#: R/source.R:0
+msgid "'local' must be TRUE, FALSE or an environment"
+msgstr "argument 'local' musi być TRUE, FALSE lub musi być środowiskiem"
 
-msgid "numbers of columns of arguments do not match"
-msgstr "liczba kolumn argumentów nie zgadza się"
+#. R/windows/system.R: stop("'minimized' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'minimized' must be TRUE or FALSE")
+#: R/windows/system.R:0
+msgid "'minimized' must be TRUE or FALSE"
+msgstr "argument 'minimized' musi mieć wartość TRUE lub FALSE"
 
-msgid "invalid list argument: all variables should have the same length"
-msgstr ""
-"niepoprawny argument listy: wszystkie zmienne powinny mieć tę samą długość"
+#. R/format.R: stop("'mode' must be \"double\" (\"real\"), \"integer\" or \"character\"")
+#: R/format.R:0
+msgid "'mode' must be \"double\" (\"real\"), \"integer\" or \"character\""
+msgstr "'mode' musi być \"double\" (\"real\"), \"integer\" lub \"character\""
 
-msgid "<0 rows> (or 0-length row.names)"
-msgstr "<0 wierszy> (lub 'row.names' o zerowej długości)"
+#. R/RNG.R: stop("'normal.kind' must be a character string of length 1")
+#. R/RNG.R: stop("'normal.kind' must be a character string of length 1")
+#: R/RNG.R:0
+msgid "'normal.kind' must be a character string of length 1"
+msgstr "'normal.kind' musi być łańcuchem tekstowym o długości 1"
 
-msgid "non-numeric variable in data frame:"
-msgstr "zmienna nieliczbowa w ramce danych:"
+#. R/diag.R: stop("'nrow' or 'ncol' cannot be specified when 'x' is a matrix")
+#: R/diag.R:0
+msgid "'nrow' or 'ncol' cannot be specified when 'x' is a matrix"
+msgstr "'nrow' ani 'ncol' nie mogą być określone kiedy 'x' jest macierzą"
 
-msgid "%s only defined for equally-sized data frames"
-msgstr "%s jest zdefiniowane jedynie dla ramek danych o równych rozmiarach"
+#. R/lapply.R: stop("'object' must be a list")
+#: R/lapply.R:0
+msgid "'object' must be a list"
+msgstr "argument 'object' musi być listą"
 
-msgid "list of length %d not meaningful"
-msgstr "lista o długości %d nie ma sensu"
+#. R/table.R: gettextf("'object' must inherit from class %s", dQuote("table"))
+#: R/table.R:0
+msgid "'object' must inherit from class %s"
+msgstr "argument 'object' musi dziedziczyć z klasy %s"
 
-msgid "only defined on a data frame with all numeric variables"
-msgstr ""
-"funkcja 'summary()' zdefiniowana jest jedynie na ramce danych ze wszystkimi "
-"zmiennymi będącymi liczbami"
+#. R/dates.R: stop("'origin' must be of length one")
+#. R/datetime.R: stop("'origin' must be of length one")
+#: R/dates.R:0 R/datetime.R:0
+msgid "'origin' must be of length one"
+msgstr "argument 'origin' musi mieć długość 1"
 
-msgid "character string is not in a standard unambiguous format"
-msgstr "łańcuch tekstowy nie jest w standardowym jednoznacznym formacie"
+#. R/connections.R: stop("'origin' must be one of 'start', 'current' or 'end'")
+#: R/connections.R:0
+msgid "'origin' must be one of 'start', 'current' or 'end'"
+msgstr "argument 'origin' musi być jednym ze 'start', 'current' lub 'end'"
 
+#. R/dates.R: stop("'origin' must be supplied")
+#. R/datetime.R: stop("'origin' must be supplied")
+#. R/datetime.R: stop("'origin' must be supplied")
+#: R/dates.R:0 R/datetime.R:0
 msgid "'origin' must be supplied"
 msgstr "argument 'origin' musi zostać dostarczony"
 
-msgid "do not know how to convert '%s' to class %s"
-msgstr "nie wiem jak przekonwertować '%s' na klasę %s"
+#. R/files.R: stop("'package' must be of length 1")
+#. R/library.R: stop("'package' must be of length 1")
+#: R/files.R:0 R/library.R:0
+msgid "'package' must be of length 1"
+msgstr "argument 'package' musi mieć długość 1"
 
-msgid "'%s' is not a \"date\" object"
-msgstr "argument '%s' nie jest obiektem klasy \"date\""
+#. R/sort.R: stop("'partial' sorting not supported by radix method")
+#: R/sort.R:0
+msgid "'partial' sorting not supported by radix method"
+msgstr "sortowanie 'partial' nie jest wspierane przez metodÄ™ 'radix'"
+
+#. R/qr.R: stop("'qr' and 'y' must have the same number of rows")
+#. R/qr.R: stop("'qr' and 'y' must have the same number of rows")
+#. R/qr.R: stop("'qr' and 'y' must have the same number of rows")
+#. R/qr.R: stop("'qr' and 'y' must have the same number of rows")
+#. R/qr.R: stop("'qr' and 'y' must have the same number of rows")
+#: R/qr.R:0
+msgid "'qr' and 'y' must have the same number of rows"
+msgstr "argumenty 'qr' oraz 'y' muszą mieć tę samą liczbę wierszy"
 
-msgid "'%s' is not a \"dates\" object"
-msgstr "argument '%s' nie jest obiektem klasy \"dates\""
+#. R/files.R: warning("'recursive' will be ignored as 'to' is not a single existing directory")
+#: R/files.R:0
+msgid "'recursive' will be ignored as 'to' is not a single existing directory"
+msgstr ""
+"argument 'recursive' zostanie zignorowany ponieważ argument 'to' nie jest "
+"pojedynczym istniejÄ…cym katalogiem"
 
-msgid "binary + is not defined for \"Date\" objects"
+#. R/dataframe.R: gettextf("'row.names' is not a character vector of length %d -- omitting it. Will be an error!",     nrows)
+#: R/dataframe.R:0
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
 msgstr ""
-"dwuargumentowy operator '+' nie jest określony dla obiektów klasy \"Date\""
+"argument 'row.names' nie jest wektorem tekstowym o długości %d -- pomijanie "
+"go. Będzie błąd!"
 
-msgid "can only subtract from \"Date\" objects"
-msgstr "można odejmować jedynie od obiektów klasy \"Date\""
+#. R/dataframe.R: stop("'row.names' should specify one of the variables")
+#: R/dataframe.R:0
+msgid "'row.names' should specify one of the variables"
+msgstr "argument 'row.names' powinien określać jedną ze zmiennych"
 
-msgid "unary - is not defined for \"Date\" objects"
-msgstr ""
-"jednoargumentowy operator '-' nie jest określony dla obiektów klasy \"Date\""
+#. R/all.equal.R: stop("'scale' should be numeric or NULL")
+#: R/all.equal.R:0
+msgid "'scale' should be numeric or NULL"
+msgstr "argument 'scale' powininen być liczbą lub wartością NULL"
 
-msgid "can only subtract numbers from \"Date\" objects"
-msgstr "można odejmować jedynie liczby od obiektów klasy \"Date\""
+#. R/windows/system.R: stop("'show.output.on.console' must be TRUE or FALSE")
+#: R/windows/system.R:0
+msgid "'show.output.on.console' must be TRUE or FALSE"
+msgstr "argument 'show.output.on.console' musi mieć wartość TRUE lub FALSE"
 
-msgid "unary %s not defined for \"Date\" objects"
-msgstr ""
-"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy \"Date\""
+#. R/unix/system.unix.R: stop("'stderr' must be of length 1")
+#: R/unix/system.unix.R:0
+msgid "'stderr' must be of length 1"
+msgstr "'stderr' musi mieć długość 1"
 
-msgid "%s not defined for \"Date\" objects"
-msgstr "'%s' nie jest określone dla obiektów klasy \"Date\""
+#. R/unix/system.unix.R: stop("'stdout' must be of length 1")
+#: R/unix/system.unix.R:0
+msgid "'stdout' must be of length 1"
+msgstr "'stdout' musi mieć długość 1"
 
-msgid "'from' must be specified"
-msgstr "argument 'from' musi być określony"
+#. R/frametools.R: stop("'subset' must be logical")
+#. R/frametools.R: stop("'subset' must be logical")
+#. R/frametools.R: stop("'subset' must be logical")
+#: R/frametools.R:0
+msgid "'subset' must be logical"
+msgstr "'subset' musi być zmienną logiczną"
 
-msgid "'from' must be a \"Date\" object"
-msgstr "argument 'from' musi być obiektem klasy \"Date\""
+#. R/datetime.R: stop("'tim' is not character or numeric")
+#: R/datetime.R:0
+msgid "'tim' is not character or numeric"
+msgstr "argument 'tim' nie jest tekstem ani liczbÄ…"
 
-msgid "'from' must be of length 1"
-msgstr "argument 'from' musi mieć długość 1"
+#. R/connections.R: stop("'timeout' must be NULL or a non-negative number")
+#: R/connections.R:0
+msgid "'timeout' must be NULL or a non-negative number"
+msgstr "argument 'timeout' musi być wartością NULL lub nieujemną liczbą"
+
+#. R/seq.R: stop("'to' cannot be NA, NaN or infinite")
+#: R/seq.R:0
+msgid "'to' cannot be NA, NaN or infinite"
+msgstr "argument 'to' nie może mieć wartości NA, NaN lub nieskończoność"
 
+#. R/dates.R: stop("'to' must be a \"Date\" object")
+#: R/dates.R:0
 msgid "'to' must be a \"Date\" object"
 msgstr "argument 'to' musi być obiektem klasy \"Date\""
 
+#. R/datetime.R: stop("'to' must be a \"POSIXt\" object")
+#: R/datetime.R:0
+msgid "'to' must be a \"POSIXt\" object"
+msgstr "argument 'to' musi być obiektem klasy \"POSIXt\""
+
+#. R/dates.R: stop("'to' must be of length 1")
+#. R/datetime.R: stop("'to' must be of length 1")
+#. R/seq.R: stop("'to' must be of length 1")
+#: R/dates.R:0 R/datetime.R:0 R/seq.R:0
 msgid "'to' must be of length 1"
 msgstr "argument 'to' musi mieć długość 1"
 
-msgid "'length.out' must be of length 1"
-msgstr "argument 'length.out' musi mieć długość 1"
-
-msgid ""
-"exactly two of 'to', 'by' and 'length.out' / 'along.with' must be specified"
+#. R/all.equal.R: stop("'tolerance' should be numeric")
+#: R/all.equal.R:0
+msgid "'tolerance' should be numeric"
+msgstr "argument 'tolerance' musi być liczbą"
+
+#. R/mean.R: stop("'trim' must be numeric of length one")
+#: R/mean.R:0
+msgid "'trim' must be numeric of length one"
+msgstr "argument 'trim' musi być liczbą o długości 1"
+
+#. R/datetime.R: warning("'tzone' attributes are inconsistent")
+#: R/datetime.R:0
+msgid "'tzone' attributes are inconsistent"
+msgstr "atrybuty 'tzone' są niespójne"
+
+#. R/dataframe.R: stop("'value' is the wrong length")
+#: R/dataframe.R:0
+msgid "'value' is the wrong length"
+msgstr "argument 'value' posiada niepoprawną długość"
+
+#. R/attr.R: stop("'value' must be a list")
+#: R/attr.R:0
+msgid "'value' must be a list"
+msgstr "argument 'value' musi być listą"
+
+#. R/findInt.R: stop("'vec' must be sorted non-decreasingly and not contain NAs")
+#: R/findInt.R:0
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr ""
-"dokładnie dwa z 'to', 'by' oraz 'length.out' / 'along.with' muszą być "
-"określone"
+"argument 'vec' musi być posortowany w sposób niemalejący oraz nie mogą "
+"zawierać wartości NA"
 
-msgid "'by' must be of length 1"
-msgstr "argument 'by' musi mieć długość 1"
+#. R/library.R: message("'verbose' and 'quietly' are both true; being verbose then ..")
+#: R/library.R:0
+msgid "'verbose' and 'quietly' are both true; being verbose then .."
+msgstr ""
+"oba argumenty 'verbose' oraz 'quietly' sÄ… ustawione na tak; przyjmujÄ™ w "
+"takim razie tryb 'verbose' .."
 
-msgid "invalid 'by' string"
-msgstr "błędny łańcuch 'by'"
+#. R/source.R: warning("'verbose' is TRUE, 'echo' not; ... coercing 'echo <- TRUE'")
+#: R/source.R:0
+msgid "'verbose' is TRUE, 'echo' not; ... coercing 'echo <- TRUE'"
+msgstr ""
+"argument 'verbose' jest TRUE, argument 'echo' nie; ... przekształcanie 'echo "
+"<- TRUE'"
 
-msgid "invalid string for 'by'"
-msgstr "błędny łańcuch dla argumentu 'by'"
+#. R/unix/system.unix.R: stop("'wait' must be TRUE or FALSE")
+#. R/unix/system.unix.R: stop("'wait' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'wait' must be TRUE or FALSE")
+#. R/windows/system.R: stop("'wait' must be TRUE or FALSE")
+#: R/unix/system.unix.R:0 R/windows/system.R:0
+msgid "'wait' must be TRUE or FALSE"
+msgstr "argument 'wait' musi mieć wartość TRUE lub FALSE"
 
-msgid "invalid mode for 'by'"
-msgstr "błędny tryb dla argumentu 'by'"
+#. R/unix/system.unix.R: warning("'which' was not found on this platform")
+#: R/unix/system.unix.R:0
+msgid "'which' was not found on this platform"
+msgstr "'which' nie zostało znalezione na tej platformie"
 
-msgid "'by' is NA"
-msgstr "'by' posiada wartość NA"
+#. R/toString.R: stop("'width' must be positive")
+#: R/toString.R:0
+msgid "'width' must be positive"
+msgstr "argument 'width' musi być dodatni"
+
+#. R/srcfile.R: stop("'x' and 'to' must refer to same file")
+#: R/srcfile.R:0
+msgid "'x' and 'to' must refer to same file"
+msgstr "argumenty 'X' oraz 'to' muszą odnosić się do tego samego pliku"
+
+#. R/strwrap.R: stop("'x' and 'y' must have the same length")
+#: R/strwrap.R:0
+msgid "'x' and 'y' must have the same length"
+msgstr "'x' oraz 'y' muszą mieć tę samą długość"
 
+#. R/octhex.R: stop("'x' cannot be coerced to class \"hexmode\"")
+#: R/octhex.R:0
+msgid "'x' cannot be coerced to class \"hexmode\""
+msgstr "argument 'x' nie może zostać przekształcony na klasę \"hexmode\""
+
+#. R/octhex.R: stop("'x' cannot be coerced to class \"octmode\"")
+#: R/octhex.R:0
+msgid "'x' cannot be coerced to class \"octmode\""
+msgstr "argument 'x' nie może zostać przekształcony na klasę \"octmode\""
+
+#. R/diag.R: stop("'x' is an array, but not one-dimensional.")
+#: R/diag.R:0
+msgid "'x' is an array, but not one-dimensional."
+msgstr "argument 'x' jest tablicÄ…, ale nie jednowymiarowÄ…."
+
+#. R/table.R: stop("'x' is not an array")
+#: R/table.R:0
+msgid "'x' is not an array"
+msgstr "argument 'x' nie jest tablicÄ…"
+
+#. R/dates.R: stop("'x' must be a date-time object")
+#. R/datetime.R: stop("'x' must be a date-time object")
+#: R/dates.R:0 R/datetime.R:0
 msgid "'x' must be a date-time object"
 msgstr "argument 'x' musi być obiektem typu data-czas"
 
-msgid "invalid specification of 'breaks'"
-msgstr "niepoprawne określenie dla 'breaks'"
+#. R/det.R: stop("'x' must be a square matrix")
+#: R/det.R:0
+msgid "'x' must be a square matrix"
+msgstr "argument 'x' musi być macierzą kwadratową"
 
-msgid "'origin' must be of length one"
-msgstr "argument 'origin' musi mieć długość 1"
+#. R/rle.R: stop("'x' must be a vector of an atomic type")
+#: R/rle.R:0
+msgid "'x' must be a vector of an atomic type"
+msgstr "'x' musi być wektorem o typie atomowym"
 
-msgid "'lag' and 'differences' must be integers >= 1"
-msgstr "argumenty 'lag' oraz 'differences' muszą być liczbami całkowitymi >= 1"
+#. R/colSums.R: stop("'x' must be an array of at least two dimensions")
+#. R/colSums.R: stop("'x' must be an array of at least two dimensions")
+#. R/colSums.R: stop("'x' must be an array of at least two dimensions")
+#. R/colSums.R: stop("'x' must be an array of at least two dimensions")
+#: R/colSums.R:0
+msgid "'x' must be an array of at least two dimensions"
+msgstr "argument 'x' musi być tablicą o co najmniej dwóch wymiarach"
 
-msgid "wrong class"
-msgstr "błędna klasa"
+#. R/sort.R: stop("'x' must be atomic")
+#: R/sort.R:0
+msgid "'x' must be atomic"
+msgstr "argument 'x' musi być atomowy"
 
-msgid "binary '+' is not defined for \"POSIXt\" objects"
+#. R/sort.R: stop("'x' must be atomic for 'sort.list'\nHave you called 'sort' on a list?")
+#: R/sort.R:0
+msgid ""
+"'x' must be atomic for 'sort.list'\n"
+"Have you called 'sort' on a list?"
 msgstr ""
-"dwuargumentowy operator '+' nie jest określony dla obiektów klasy \"POSIXt\""
+"'x' musi być typem atomowym dla 'sort.list'\n"
+"Czy wywołano 'sort' na liście?"
 
-msgid "can only subtract from \"POSIXt\" objects"
-msgstr "można odejmować jedynie od obiektów klasy \"POSIXt\""
+#. R/cut.R: stop("'x' must be numeric")
+#. R/jitter.R: stop("'x' must be numeric")
+#. R/rowsum.R: stop("'x' must be numeric")
+#: R/cut.R:0 R/jitter.R:0 R/rowsum.R:0
+msgid "'x' must be numeric"
+msgstr "argument 'x' musi być liczbą"
 
-msgid "unary '-' is not defined for \"POSIXt\" objects"
-msgstr ""
-"jednoargumentowy operator '-' nie jest określony dla obiektów klasy \"POSIXt"
-"\""
+#. R/table.R: gettextf("'x' must inherit from class %s", dQuote("summary.table"))
+#: R/table.R:0
+msgid "'x' must inherit from class %s"
+msgstr "argument 'x' musi dziedziczyć z klasy %s"
 
-msgid "can only subtract numbers from \"POSIXt\" objects"
-msgstr "można odejmować jedynie liczby od obiektów klasy \"POSIXt\""
+#. R/format.R: stop("'zero.print' has length > 1")
+#: R/format.R:0
+msgid "'zero.print' has length > 1"
+msgstr "'zero.print' ma długość > 1"
 
-msgid "unary '%s' not defined for \"POSIXt\" objects"
-msgstr ""
-"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy \"POSIXt"
-"\""
+#. R/format.R: stop("'zero.print' must be character, logical or NULL")
+#: R/format.R:0
+msgid "'zero.print' must be character, logical or NULL"
+msgstr "'zero.print' musi być tekstem, wartością logiczną lub NULL"
 
-msgid "'%s' not defined for \"POSIXt\" objects"
-msgstr "'%s' nie jest określone dla obiektów klasy \"POSIXt\""
+#. R/attach.R: warning("*** 'pos=1' is not possible; setting 'pos=2' for now.\n",     "*** Note that 'pos=1' will give an error in the future")
+#: R/attach.R:0
+msgid "*** 'pos=1' is not possible; setting 'pos=2' for now."
+msgstr "*** 'pos=1' nie jest możliwe; na chwilę obecną ustawianie 'pos=2'."
 
-msgid "'tzone' attributes are inconsistent"
-msgstr "atrybuty 'tzone' są niespójne"
+#. R/attach.R: warning("*** 'pos=1' is not possible; setting 'pos=2' for now.\n",     "*** Note that 'pos=1' will give an error in the future")
+#: R/attach.R:0
+msgid "*** Note that 'pos=1' will give an error in the future"
+msgstr "*** Zwróć uwagę, że 'pos=1' będzie zwracało błąd w przyszłości"
 
-msgid "'tim' is not character or numeric"
-msgstr "argument 'tim' nie jest tekstem ani liczbÄ…"
+#. R/../../../../share/R/REMOVE.R: stop("-l option without value", call. = FALSE)
+#: R/../../../../share/R/REMOVE.R:0
+msgid "-l option without value"
+msgstr "opcja -l bez wartości"
 
-msgid "need explicit units for numeric conversion"
-msgstr ""
-"'as.difftime()' potrzebuje sprecyzowanego argumentu 'units' dla konwersji "
-"liczbowej"
+#. R/rm.R: stop("... must contain names or character strings")
+#: R/rm.R:0
+msgid "... must contain names or character strings"
+msgstr "'...' musi zawierać nazwy lub łańcuchy tekstowe"
 
-msgid "invalid units specified"
-msgstr "niepoprawne określenie 'units'"
+#. R/eigen.R: stop("0 x 0 matrix")
+#: R/eigen.R:0
+msgid "0 x 0 matrix"
+msgstr "macierz ma rozmiar 0 x 0"
 
-msgid "unary '%s' not defined for \"difftime\" objects"
+#. R/version.R: gettext("<0 elements>")
+#: R/version.R:0
+msgid "<0 elements>"
+msgstr "<0 elementów>"
+
+#. R/dataframe.R: gettext("<0 rows> (or 0-length row.names)\n")
+#: R/dataframe.R:0
+msgid "<0 rows> (or 0-length row.names)"
+msgstr "<0 wierszy> (lub 'row.names' o zerowej długości)"
+
+#. R/library.R: gettextf("\nAttaching package: %s\n", sQuote(package))
+#: R/library.R:0
+msgid "Attaching package: %s"
+msgstr "Dołączanie pakietu: %s"
+
+#. R/load.R: gettextf("Attempting to load the environment %s", sQuote(info))
+#: R/load.R:0
+msgid "Attempting to load the environment %s"
+msgstr "Próba załadowania środowiska %s"
+
+#. R/library.R: gettextf("DLL %s already loaded", sQuote(chname1))
+#: R/library.R:0
+msgid "DLL %s already loaded"
+msgstr "plik DLL %s jest już załadowany"
+
+#. R/library.R: gettextf("DLL %s not found", sQuote(chname1))
+#: R/library.R:0
+msgid "DLL %s not found"
+msgstr "plik DLL %s nie został znaleziony"
+
+#. R/library.R: gettextf("DLL %s not found: maybe not installed for this architecture?",     sQuote(chname))
+#: R/library.R:0
+msgid "DLL %s not found: maybe not installed for this architecture?"
 msgstr ""
-"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy "
-"\"difftime\""
+"plik DLL %s nie został znaleziony: być może nie został zainstalowany dla tej "
+"architektury?"
 
-msgid "'%s' not defined for \"difftime\" objects"
-msgstr "'%s' nie jest określone dla obiektów klasy \"difftime\""
+#. R/library.R: gettextf("DLL %s was not loaded", sQuote(chname1))
+#: R/library.R:0
+msgid "DLL %s was not loaded"
+msgstr "plik DLL %s nie został załadowany"
 
-msgid "both arguments of * cannot be \"difftime\" objects"
-msgstr "oba argumenty operatora '*' nie mogą być obiektami klasy \"difftime\""
+#. R/library.R: gettext("Description:")
+#: R/library.R:0
+msgid "Description:"
+msgstr "Opis:"
 
-msgid "second argument of / cannot be a \"difftime\" object"
-msgstr "drugi argument operatora '/' nie może być obiektem klasy \"difftime\""
+#. R/library.R: gettextf("Documentation for package %s", sQuote(x$name))
+#: R/library.R:0
+msgid "Documentation for package %s"
+msgstr "Dokumentacja dla pakietu %s"
 
-msgid "'from' must be a \"POSIXt\" object"
-msgstr "argument 'from' musi być obiektem klasy \"POSIXt\""
+#. R/../../../../share/R/REMOVE.R: stop("ERROR: cannot cd to directory ", sQuote(lib), call. = FALSE)
+#: R/../../../../share/R/REMOVE.R:0
+msgid "ERROR: cannot cd to directory"
+msgstr "B�ĄD: nie można wejść do katalogu"
 
-msgid "'to' must be a \"POSIXt\" object"
-msgstr "argument 'to' musi być obiektem klasy \"POSIXt\""
+#. R/../../../../share/R/REMOVE.R: stop("ERROR: no packages specified", call. = FALSE)
+#: R/../../../../share/R/REMOVE.R:0
+msgid "ERROR: no packages specified"
+msgstr "B�ĄD: nie określono pakietów"
 
-msgid "no Olson database found"
-msgstr "nie znaleziono bazy Olsona"
+#. R/../../../../share/R/REMOVE.R: stop("ERROR: no permission to remove from directory ", sQuote(lib),     call. = FALSE)
+#: R/../../../../share/R/REMOVE.R:0
+msgid "ERROR: no permission to remove from directory"
+msgstr "B�ĄD: brak uprawnień aby usunąć z katalogu"
 
-msgid "'file' must be a character string or connection"
-msgstr "argument 'file' musi być łańcuchem tekstowym lub połączeniem"
+#. R/library.R: gettextf("Further information is available in the following vignettes in directory %s:",     sQuote(file.path(x$path, "doc")))
+#: R/library.R:0
+msgid ""
+"Further information is available in the following vignettes in directory %s:"
+msgstr ""
+"Dalsza informacja jest dostępna w następujących ilustracjach w katalogu %s:"
+
+#. R/library.R: gettext("Index:")
+#: R/library.R:0
+msgid "Index:"
+msgstr "Indeks:"
+
+#. R/library.R: gettextf("\n\t\tInformation on package %s", sQuote(x$name))
+#: R/library.R:0
+msgid "Information on package %s"
+msgstr "Informacja dotyczÄ…ca pakietu %s"
 
+#. R/dcf.R: gettextf("Invalid DCF format.\nContinuation lines must not start a record.\nOffending lines start with:\n%s",     paste0("  ", lines, collapse = "\n"))
+#: R/dcf.R:0
 msgid ""
 "Invalid DCF format.\n"
-"Regular lines must have a tag.\n"
+"Continuation lines must not start a record.\n"
 "Offending lines start with:\n"
 "%s"
 msgstr ""
 "Niepoprawny format DCF.\n"
-"Regularne linie muszą mieć znacznik.\n"
+"Linie uzupełniające nie mogą rozpoczynać rekordu.\n"
 "PrzeszkadzajÄ…ce linie rozpoczynajÄ… siÄ™ od:\n"
 "%s"
 
+#. R/dcf.R: gettextf("Invalid DCF format.\nRegular lines must have a tag.\nOffending lines start with:\n%s",     paste0("  ", lines, collapse = "\n"))
+#: R/dcf.R:0
 msgid ""
 "Invalid DCF format.\n"
-"Continuation lines must not start a record.\n"
+"Regular lines must have a tag.\n"
 "Offending lines start with:\n"
 "%s"
 msgstr ""
 "Niepoprawny format DCF.\n"
-"Linie uzupełniające nie mogą rozpoczynać rekordu.\n"
+"Regularne linie muszą mieć znacznik.\n"
 "PrzeszkadzajÄ…ce linie rozpoczynajÄ… siÄ™ od:\n"
 "%s"
 
-msgid "'x' must be a square matrix"
-msgstr "argument 'x' musi być macierzą kwadratową"
-
-msgid "'determinant' not currently defined for complex matrices"
-msgstr ""
-"funkcja 'determinant()' nie jest aktualnie zdefiniowana dla macierzy "
-"zespolonych"
-
-msgid "'nrow' or 'ncol' cannot be specified when 'x' is a matrix"
-msgstr "'nrow' ani 'ncol' nie mogą być określone kiedy 'x' jest macierzą"
-
-msgid "'x' is an array, but not one-dimensional."
-msgstr "argument 'x' jest tablicÄ…, ale nie jednowymiarowÄ…."
-
-msgid "only matrix diagonals can be replaced"
-msgstr "tylko elementy diagonalne macierzy mogą zostać zastąpione"
+#. R/namespace.R: gettextf("Loading required namespace: %s", package)
+#: R/namespace.R:0
+msgid "Loading required namespace: %s"
+msgstr "�adowanie wymaganej przestrzeni nazw: %s"
 
-msgid "replacement diagonal has wrong length"
-msgstr "zamiana elementów diagonalnych ma niepoprawną długość"
+#. R/library.R: gettextf("Loading required package: %s", package)
+#. R/library.R: gettextf("Loading required package: %s", pkg)
+#: R/library.R:0
+msgid "Loading required package: %s"
+msgstr "�adowanie wymaganego pakietu: %s"
 
+#. R/duplicated.R: gettextf("MARGIN = %d is invalid for dim = %d", MARGIN, dx)
+#. R/duplicated.R: gettextf("MARGIN = %d is invalid for dim = %d", MARGIN, dx)
+#. R/duplicated.R: gettextf("MARGIN = %d is invalid for dim = %d", MARGIN, dx)
+#: R/duplicated.R:0
 msgid "MARGIN = %d is invalid for dim = %d"
 msgstr "MARGIN = %d jest niepoprawny dla dim =%d"
 
-msgid "must pass a package name, %s or %s object"
-msgstr "wymagane jest przekazanie nazwy pakietu %s lub obiekt %s"
-
+#. R/dynload.R: gettextf("No DLL currently loaded with name or path %s", sQuote(dll))
+#: R/dynload.R:0
 msgid "No DLL currently loaded with name or path %s"
 msgstr "Brak biblioteki DLL aktualnie załadowanej o nazwie lub ścieżce %s"
 
-msgid "multiple DLLs match '%s'. Using '%s'"
-msgstr "wielokrotna zgodność plików DLL z '%s'. Używanie '%s'"
-
-msgid "must specify DLL via a %s object. See getLoadedDLLs()"
-msgstr ""
-"wymagane jest określenie DLL przez obiekt klasy %s. Zobacz 'getLoadedDLLs()'"
-
-msgid "function is not in a namespace, so cannot locate associated DLL"
-msgstr ""
-"funkcja nie jest w przestrzeni nazw tak więc nie można zlokalizować "
-"powiÄ…zanego pliku DLL"
+#. R/interaction.R: stop("No factors specified")
+#: R/interaction.R:0
+msgid "No factors specified"
+msgstr "Nie określono czynników"
 
+#. R/namespace.R: gettextf("No generic function %s found corresponding to requested imported methods from package %s when loading %s (malformed exports?)",     sQuote(g), sQuote(pkg), sQuote(from))
+#: R/namespace.R:0
 msgid ""
-"looking for DLL for native routine call, but no DLLs in namespace of call"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
-"poszukiwanie pliku DLL dla wywołania rodzimej procedury, ale brak plików DLL "
-"w przestrzeni nazw wywołania"
+"Nie znaleziono ogólnej funkcji %s odpowiadającej zażądanym zaimportowanym "
+"metodom z pakietu '%s' podczas Å‚adowania %s (uszkodzone eksporty?)"
 
-msgid "0 x 0 matrix"
-msgstr "macierz ma rozmiar 0 x 0"
+#. R/namespace.R: gettextf("No methods found in \"%s\" for requests: %s", pkg,     paste(vars[is.na(match(vars, allFuns))], collapse = ", "))
+#: R/namespace.R:0
+msgid "No methods found in \"%s\" for requests: %s"
+msgstr "Nie znaleziono metod w pakiecie '%s' dla żądań: %s"
 
-msgid "non-square matrix in 'eigen'"
-msgstr "macierz w funkcji 'eigen()' nie jest kwadratowa"
+#. R/traceback.R: gettext("No traceback available")
+#: R/traceback.R:0
+msgid "No traceback available"
+msgstr "Åšledzenie nie jest dostepne"
 
-msgid "invalid nrow(x)"
-msgstr "niepoprawna wartość 'nrow(x)'"
+#. R/library.R: gettextf("Package %s version %s cannot be unloaded", sQuote(package),     oldversion)
+#: R/library.R:0
+msgid "Package %s version %s cannot be unloaded"
+msgstr "Pakiet %s w wersji %s nie może być zwolniony"
 
-msgid "invalid 'labels'; length %d should be 1 or %d"
-msgstr "nieprawidłowe 'labels'; długość %d powinna wynosić 1 lub %d"
+#. R/dataframe.R: gettextf("Partial match of '%s' to '%s' in data frame", name,     names[pmatch(name, names)])
+#: R/dataframe.R:0
+msgid "Partial match of '%s' to '%s' in data frame"
+msgstr "Częściowe dopasowanie '%s' do '%s' w ramce danych"
 
-msgid "number of levels differs"
-msgstr "liczba poziomów różni się"
+#. R/library.R: gettext("R packages available")
+#: R/library.R:0
+msgid "R packages available"
+msgstr "Dostępne pakiety R"
 
-msgid "%s not meaningful for factors"
-msgstr "%s nie ma sensu dla czynników"
+#. R/taskCallback.R: gettext("Registering 'evaluate' as low-level callback\n")
+#: R/taskCallback.R:0
+msgid "Registering 'evaluate' as low-level callback"
+msgstr "Rejestrowanie 'evaluate' jako wywołania zwrotnego niskiego poziomu"
 
-msgid "level sets of factors are different"
-msgstr "poziomy czynników są różne"
+#. R/taskCallback.R: gettextf("Removing %s", paste(discard, collapse = ", "))
+#: R/taskCallback.R:0
+msgid "Removing %s"
+msgstr "Usuwanie %s"
 
-msgid "invalid factor level, NA generated"
-msgstr "niepoprawny poziom czynnika, wygenerowano wartość NA"
+#. R/../../../../share/R/REMOVE.R: message("Removing from library ", sQuote(lib))
+#: R/../../../../share/R/REMOVE.R:0
+msgid "Removing from library"
+msgstr "Usuwanie z biblioteki"
 
-msgid "'%s' is not meaningful for ordered factors"
-msgstr "'%s' nie ma sensu dla uporządkowanych czynników"
+#. R/namespace.R: gettextf("S3 method %s was declared but not found", sQuote(method))
+#: R/namespace.R:0
+msgid "S3 method %s was declared but not found"
+msgstr "metoda S3 %s została zadeklarowana, ale nie została znaleziona"
 
-msgid "'%s' not defined for ordered factors"
-msgstr "'%s' nie jest określone dla uporządkowanych czynników"
+#. R/sweep.R: warning("STATS does not recycle exactly across MARGIN")
+#: R/sweep.R:0
+msgid "STATS does not recycle exactly across MARGIN"
+msgstr "STATS nie powtarza się dokładnie zgodnie z MARGIN"
 
-msgid ""
-"'%s' is only meaningful for ordered factors if all arguments have the same "
-"level sets"
-msgstr ""
-"'%s' ma sens tylko dla uporządkowanych czynników jeśli wszystkie argumenty "
-"mają ten sam zbiór poziomów"
+#. R/sweep.R: warning("STATS is longer than the extent of 'dim(x)[MARGIN]'")
+#: R/sweep.R:0
+msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
+msgstr "STATS jest dłuższe niż rozmiar 'dim(x)[MARGIN]'"
 
-msgid "no files to copy to"
-msgstr "brak plików do skopiowania"
+#. R/Defunct.R: gettext("See help(\"Defunct\")")
+#: R/Defunct.R:0
+msgid "See help(\"Defunct\")"
+msgstr "Zobacz help(\"Defunct\")"
 
-msgid "attempt to copy a directory to itself"
-msgstr "próba skopiowania katalogu do samego siebie"
+#. R/Defunct.R: gettextf("See help(\"Defunct\") and help(\"%s-defunct\").", package)
+#: R/Defunct.R:0
+msgid "See help(\"Defunct\") and help(\"%s-defunct\")."
+msgstr "Zobacz help(\"Defunct\") oraz help(\"%s-defunct\")."
 
-msgid "more 'from' files than 'to' files"
-msgstr "więcej plików 'from' niż plików 'to'"
+#. R/Deprecated.R: gettext("See help(\"Deprecated\")")
+#: R/Deprecated.R:0
+msgid "See help(\"Deprecated\")"
+msgstr "Zobacz help(\"Deprecated\")"
 
-msgid "'recursive' will be ignored as 'to' is not a single existing directory"
+#. R/Deprecated.R: gettextf("See help(\"Deprecated\") and help(\"%s-deprecated\").",     package)
+#: R/Deprecated.R:0
+msgid "See help(\"Deprecated\") and help(\"%s-deprecated\")."
+msgstr "Zobacz help(\"Deprecated\") oraz help(\"%s-deprecated\")."
+
+#. R/load.R: message("Specified environment not found: using '.GlobalEnv' instead")
+#: R/load.R:0
+msgid "Specified environment not found: using '.GlobalEnv' instead"
 msgstr ""
-"argument 'recursive' zostanie zignorowany ponieważ argument 'to' nie jest "
-"pojedynczym istniejÄ…cym katalogiem"
+"Nie znaleziono określonego środowiska: zamiast tego używanie '.GlobalEnv'"
 
-msgid "file can not be copied both 'from' and 'to'"
-msgstr "plik nie może być skopiowany jednocześnie z 'from' oraz 'to'"
+#. R/library.R: gettextf("This is R %s, package %s needs %s %s", current, sQuote(pkgname),     dep$op, target)
+#: R/library.R:0
+msgid "This is R %s, package %s needs %s %s"
+msgstr "To jest R %s, pakiet %s potrzebuje %s %s"
 
-msgid "no files to link from"
-msgstr "brak plików z których można łączyć"
+#. R/srcfile.R: gettextf("Timestamp of %s has changed", sQuote(srcfile$filename))
+#: R/srcfile.R:0
+msgid "Timestamp of %s has changed"
+msgstr "Sygnatura czasu dla %s zmieniła się"
 
-msgid "no files/directory to link to"
-msgstr "brak plików/katalogu do których można łączyć"
+#. R/Defunct.R: gettextf("Use '%s' instead.\n", new)
+#. R/Deprecated.R: gettextf("Use '%s' instead.\n", new)
+#: R/Defunct.R:0 R/Deprecated.R:0
+msgid "Use '%s' instead."
+msgstr "Użyj w zamian '%s'."
 
-msgid "no files to link to"
-msgstr "brak plików do których można łączyć"
+#. R/load.R: message("[Previously saved workspace restored]", "\n")
+#: R/load.R:0
+msgid "[Previously saved workspace restored]"
+msgstr "[Poprzednio zapisany obszar roboczy został przywrócony]"
 
-msgid "'package' must be of length 1"
-msgstr "argument 'package' musi mieć długość 1"
+#. R/LAPACK.R: stop("a dimension is zero")
+#. R/svd.R: stop("a dimension is zero")
+#: R/LAPACK.R:0 R/svd.R:0
+msgid "a dimension is zero"
+msgstr "wymiar wynosi zero"
 
-msgid "no file found"
-msgstr "nie znaleziono pliku"
+#. R/message.R: warning("additional arguments ignored in message()")
+#: R/message.R:0
+msgid "additional arguments ignored in message()"
+msgstr "dodatkowe argumenty zostały zignorowane w 'message()'"
 
-msgid "invalid 'path' argument"
-msgstr "niepoprawny argument 'path'"
+#. R/stop.R: warning("additional arguments ignored in stop()")
+#: R/stop.R:0
+msgid "additional arguments ignored in stop()"
+msgstr "dodatkowe argumenty zostały zignorowane w 'stop()'"
 
-msgid "invalid 'time' argument"
-msgstr "niepoprawny argument 'time'"
+#. R/stop.R: gettext("additional arguments ignored in warning()")
+#: R/stop.R:0
+msgid "additional arguments ignored in warning()"
+msgstr "dodatkowe argumenty zostały zignorowane w 'warning()'"
 
-msgid "'vec' contains NAs"
-msgstr "argument 'vec' zawiera wartości NA"
+#. R/getenv.R: stop("all arguments must be named")
+#: R/getenv.R:0
+msgid "all arguments must be named"
+msgstr "wszystkie argumenty muszą być nazwane"
 
-msgid "'vec' must be sorted non-decreasingly"
-msgstr "argument 'vec' musi być posortowany w sposób niemalejący"
+#. R/table.R: stop("all arguments must have the same length")
+#: R/table.R:0
+msgid "all arguments must have the same length"
+msgstr "wszystkie argumenty muszą mieć tę samą długość"
 
-msgid "using the first element of 'value' of type \"expression\""
-msgstr "używanie pierwszego elementu 'value' typu \"expression\""
+#. R/pmax.R: warning("an argument will be fractionally recycled")
+#. R/pmax.R: warning("an argument will be fractionally recycled")
+#. R/pmax.R: warning("an argument will be fractionally recycled")
+#. R/pmax.R: warning("an argument will be fractionally recycled")
+#: R/pmax.R:0
+msgid "an argument will be fractionally recycled"
+msgstr "argument zostanie częściowo powtórzony"
 
-msgid "class of 'x' was discarded"
-msgstr "klasa argumentu 'x' została odrzucona"
+#. R/autoload.R: stop("an object with that name already exists")
+#: R/autoload.R:0
+msgid "an object with that name already exists"
+msgstr "obiekt o tej nazwie już istnieje"
 
-msgid "'mode' must be \"double\" (\"real\"), \"integer\" or \"character\""
-msgstr "'mode' musi być \"double\" (\"real\"), \"integer\" lub \"character\""
+#. R/notyet.R: gettextf("argument '%s' is not used (yet)", arg)
+#: R/notyet.R:0
+msgid "argument '%s' is not used (yet)"
+msgstr "argument %s nie został (jeszcze) użyty"
 
-msgid "coercing argument to \"character\" for format=\"s\""
-msgstr "przekształcanie argumentu w \"character\" dla 'format=\"s\"'"
+#. R/seq.R: stop("argument 'length.out' must be of length 1")
+#: R/seq.R:0
+msgid "argument 'length.out' must be of length 1"
+msgstr "argument 'length.out' musi mieć długość 1"
 
-msgid "'format' must be one of {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}"
+#. R/connections.R: stop("argument 'object' must deparse to a single character string")
+#: R/connections.R:0
+msgid "argument 'object' must deparse to a single character string"
 msgstr ""
-"argument 'format' musi być jednym z {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", "
-"\"s\"}"
+"argument 'object' musi być konwertowalny do pojedynczego łańcucha tekstowego"
 
-msgid "'digits' reduced to %d"
-msgstr "'digits' zredukowano do %d"
+#. R/conflicts.R: stop("argument 'where' of length 0")
+#: R/conflicts.R:0
+msgid "argument 'where' of length 0"
+msgstr "argument 'where' ma długość 0"
 
-msgid "'flag' can contain only '0+- #'"
-msgstr "'flag' może zawierać jedynie znaki '0+- #'"
+#. R/qr.R: stop("argument is not a QR decomposition")
+#. R/qr.R: stop("argument is not a QR decomposition")
+#. R/qr.R: stop("argument is not a QR decomposition")
+#. R/qr.R: stop("argument is not a QR decomposition")
+#. R/qr.R: stop("argument is not a QR decomposition")
+#. R/qr.R: stop("argument is not a QR decomposition")
+#. R/qr.R: stop("argument is not a QR decomposition")
+#: R/qr.R:0
+msgid "argument is not a QR decomposition"
+msgstr "argument nie jest dekompozycjÄ… QR"
 
-msgid "corrupt data frame: columns will be truncated or padded with NAs"
+#. R/mean.R: warning("argument is not numeric or logical: returning NA")
+#: R/mean.R:0
+msgid "argument is not numeric or logical: returning NA"
 msgstr ""
-"uszkodzona ramka danych: kolumny będą obcięte lub uzupełnione wartościami "
-"'NA'"
+"argument nie jest wartością liczbową ani logiczną: zwracanie wartości NA"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-"oba argumenty 'big.mark' oraz 'decimal.mark' są ustawione na '%s', co może "
-"być mylące"
+#. R/sort.R: stop("argument lengths differ")
+#: R/sort.R:0
+msgid "argument lengths differ"
+msgstr "długości argumentów różnią się"
 
-msgid "'zero.print' has length > 1"
-msgstr "'zero.print' ma długość > 1"
+#. R/LAPACK.R: stop("argument to 'La.svd' must be numeric or complex")
+#: R/LAPACK.R:0
+msgid "argument to 'La.svd' must be numeric or complex"
+msgstr ""
+"argument przekazywany do 'La.svd()' musi być wartością logiczną, liczbą lub "
+"liczbÄ… zespolonÄ…"
 
-msgid "'zero.print' must be character, logical or NULL"
-msgstr "'zero.print' musi być tekstem, wartością logiczną lub NULL"
+#. R/unix/system.unix.R: message("arguments 'minimized' and 'invisible' are for Windows only")
+#: R/unix/system.unix.R:0
+msgid "arguments 'minimized' and 'invisible' are for Windows only"
+msgstr "argumenty 'minimized' oraz 'invisible' sÄ… tylko dla systemu Windows"
 
-msgid "'subset' must be logical"
-msgstr "'subset' musi być zmienną logiczną"
+#. R/unix/system.unix.R: message("arguments 'show.output.on.console', 'minimized' and 'invisible' are for Windows only")
+#: R/unix/system.unix.R:0
+msgid ""
+"arguments 'show.output.on.console', 'minimized' and 'invisible' are for "
+"Windows only"
+msgstr ""
+"argumenty 'show.output.on.console', 'minimized' oraz 'invisible' sÄ… tylko "
+"dla systemu Windows"
 
-msgid "value for %s not found"
-msgstr "wartość dla %s nie została znaleziona"
+#. R/dataframe.R: gettextf("arguments imply differing number of rows: %s", paste(unique(nrows),     collapse = ", "))
+#: R/dataframe.R:0
+msgid "arguments imply differing number of rows: %s"
+msgstr "argumenty sugerują różną liczbę wierszy: %s"
 
-msgid "all arguments must be named"
-msgstr "wszystkie argumenty muszą być nazwane"
+#. R/tapply.R: stop("arguments must have same length")
+#: R/tapply.R:0
+msgid "arguments must have same length"
+msgstr "argumenty muszą mieć tę samą długość"
 
-msgid "match distance components must be non-negative"
-msgstr "komponenty o dopasowanej odległości muszą być nieujemne"
+#. R/files.R: stop("attempt to copy a directory to itself")
+#: R/files.R:0
+msgid "attempt to copy a directory to itself"
+msgstr "próba skopiowania katalogu do samego siebie"
 
-msgid "unknown match distance components ignored"
-msgstr "nieznane komponenty o dopasowanej odległości zostały zignorowane"
+#. R/table.R: stop("attempt to make a table with >= 2^31 elements")
+#. R/tabulate.R: stop("attempt to make a table with >= 2^31 elements")
+#: R/table.R:0 R/tabulate.R:0
+msgid "attempt to make a table with >= 2^31 elements"
+msgstr "próba utworzenia tabeli z >= 2^31 elementami"
 
-msgid "unknown cost components ignored"
-msgstr "nieznane komponenty kosztowe zostały zignorowane"
+#. R/matrix.R: stop("attempt to set 'colnames' on an object with less than two dimensions")
+#. R/matrix.R: stop("attempt to set 'colnames' on an object with less than two dimensions")
+#: R/matrix.R:0
+msgid "attempt to set 'colnames' on an object with less than two dimensions"
+msgstr "próba ustawienia 'colnames' dla obiektu z mniej niż dwoma wymiarami"
 
-msgid "cost components must be non-negative"
-msgstr "komponenty kosztowe muszą być nieujemne"
+#. R/matrix.R: stop("attempt to set 'rownames' on an object with no dimensions")
+#. R/matrix.R: stop("attempt to set 'rownames' on an object with no dimensions")
+#: R/matrix.R:0
+msgid "attempt to set 'rownames' on an object with no dimensions"
+msgstr "próba ustawienia 'rownames' dla obiektu bez wymiarów"
 
-msgid "%s and %s must have the same length"
-msgstr "argumenty %s oraz %s muszą mieć tę samą długość"
+#. R/autoload.R: gettextf("autoloader did not find '%s' in '%s'", name, package)
+#: R/autoload.R:0
+msgid "autoloader did not find '%s' in '%s'"
+msgstr "automat ładujący nie znalazł '%s' w pakiecie '%s'"
 
-msgid "need non-overlapping matches for %s"
-msgstr "wymagane sÄ… niepokrywajÄ…ce siÄ™ dopasowania dla %s"
+#. R/namespace.R: gettextf("bad 'S3method' directive: %s", deparse(e))
+#: R/namespace.R:0
+msgid "bad 'S3method' directive: %s"
+msgstr "niepoprawna dyrektywa 'S3method': %s"
 
-msgid "missing replacement values are not allowed"
-msgstr "brakujące wartości dla zamiany nie są dozwolone"
+#. R/load.R: stop("bad 'file' argument")
+#. R/serialize.R: stop("bad 'file' argument")
+#. R/serialize.R: stop("bad 'file' argument")
+#: R/load.R:0 R/serialize.R:0
+msgid "bad 'file' argument"
+msgstr "niepoprawny argument 'file'"
 
-msgid "must have replacement values for matches"
-msgstr "wymagane są wartości zamian dla dopasowań"
+#. R/load.R: stop("bad file argument")
+#: R/load.R:0
+msgid "bad file argument"
+msgstr "niepoprawny argument 'file'"
 
-msgid "value does not provide any replacement values"
-msgstr "wartości nie dostarczają żadnych wartości zamian"
+#. R/conditions.R: stop("bad handler specification")
+#. R/conditions.R: stop("bad handler specification")
+#: R/conditions.R:0
+msgid "bad handler specification"
+msgstr "niepoprawne określenie obsługi"
 
-msgid "must have replacements for non-matches"
-msgstr "wymagane są zamiany dla niedopasowań"
+#. R/namespace.R: stop("bad method")
+#: R/namespace.R:0
+msgid "bad method"
+msgstr "błędna metoda"
 
-msgid "must have replacements for matches"
-msgstr "wymagane są zamiany dla dopasowań"
+#. R/datetime.R: stop("binary '+' is not defined for \"POSIXt\" objects")
+#: R/datetime.R:0
+msgid "binary '+' is not defined for \"POSIXt\" objects"
+msgstr ""
+"dwuargumentowy operator '+' nie jest określony dla obiektów klasy \"POSIXt\""
 
-msgid "No factors specified"
-msgstr "Nie określono czynników"
+#. R/dates.R: stop("binary + is not defined for \"Date\" objects")
+#: R/dates.R:0
+msgid "binary + is not defined for \"Date\" objects"
+msgstr ""
+"dwuargumentowy operator '+' nie jest określony dla obiektów klasy \"Date\""
 
-msgid "norm '%s' currently always uses exact = FALSE"
-msgstr "norma '%s' aktualnie zawsze używa dokładnej wartości = FALSE"
+#. R/datetime.R: stop("both arguments of * cannot be \"difftime\" objects")
+#: R/datetime.R:0
+msgid "both arguments of * cannot be \"difftime\" objects"
+msgstr "oba argumenty operatora '*' nie mogą być obiektami klasy \"difftime\""
 
-msgid "triangular matrix should be square"
-msgstr "macierz trójkątna powinna mieć równą liczbę wierszy i kolumn"
+#. R/load.R: stop("can only save to a binary connection")
+#: R/load.R:0
+msgid "can only save to a binary connection"
+msgstr "można zapisać tylko do połączenia binarnego"
 
-msgid "'object' must be a list"
-msgstr "argument 'object' musi być listą"
+#. R/dates.R: stop("can only subtract from \"Date\" objects")
+#: R/dates.R:0
+msgid "can only subtract from \"Date\" objects"
+msgstr "można odejmować jedynie od obiektów klasy \"Date\""
 
-msgid "package %s has not been installed properly"
-msgstr "pakiet %s nie został zainstalowany poprawnie"
+#. R/datetime.R: stop("can only subtract from \"POSIXt\" objects")
+#: R/datetime.R:0
+msgid "can only subtract from \"POSIXt\" objects"
+msgstr "można odejmować jedynie od obiektów klasy \"POSIXt\""
 
-msgid "package %s was built before R 3.0.0: please re-install it"
-msgstr "pakiet %s został zbudowany przed R 3.0.0: proszę go przeinstalować"
+#. R/dates.R: stop("can only subtract numbers from \"Date\" objects")
+#: R/dates.R:0
+msgid "can only subtract numbers from \"Date\" objects"
+msgstr "można odejmować jedynie liczby od obiektów klasy \"Date\""
 
-msgid "This is R %s, package %s needs %s %s"
-msgstr "To jest R %s, pakiet %s potrzebuje %s %s"
+#. R/datetime.R: stop("can only subtract numbers from \"POSIXt\" objects")
+#: R/datetime.R:0
+msgid "can only subtract numbers from \"POSIXt\" objects"
+msgstr "można odejmować jedynie liczby od obiektów klasy \"POSIXt\""
 
-msgid "package %s was built under R version %s"
-msgstr "pakiet %s został zbudowany w wersji R %s"
+#. R/connections.R: stop("can only truncate an open connection")
+#: R/connections.R:0
+msgid "can only truncate an open connection"
+msgstr ""
+"funkcja 'truncate.connection()' może przycinać jedynie otwarte połączenie"
 
-msgid "package %s was built for %s"
-msgstr "pakiet %s został zbudowany dla platformy %s"
+#. R/connections.R: stop("can only write character objects")
+#: R/connections.R:0
+msgid "can only write character objects"
+msgstr "można zapisać jedynie obiekty wektorowe"
 
-msgid "package %s is not installed for 'arch = %s'"
-msgstr "pakiet %s nie jest zainstalowany dla 'arch=%s'"
+#. R/connections.R: stop("can only write vector objects")
+#: R/connections.R:0
+msgid "can only write vector objects"
+msgstr "można zapisać jedynie obiekty wektorowe"
 
-msgid ""
-"package %s has a license that you need to accept in an interactive session"
-msgstr ""
-"Pakiet %s posiada licencję, którą musisz zaakceptować w interaktywnej sesji"
+#. R/source.R: stop("cannot 'chdir' as current directory is unknown")
+#. R/source.R: stop("cannot 'chdir' as current directory is unknown")
+#: R/source.R:0
+msgid "cannot 'chdir' as current directory is unknown"
+msgstr "nie można wykonać 'chdir' ponieważ bieżący katalog nie jest znany"
 
-msgid "package %s has a license that you need to accept after viewing"
-msgstr ""
-"pakiet %s posiada licencję, którą musisz zaakceptować po przeglądnięciu"
+#. R/namespace.R: stop("cannot add to exports of a sealed namespace")
+#: R/namespace.R:0
+msgid "cannot add to exports of a sealed namespace"
+msgstr "nie można dodać do eksportów zamkniętej przestrzeni nazw"
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
-msgstr ""
-"pakiet %s posiada licencję, którą musisz zaakceptować:\n"
-"zgodnie z opisem w pliku DESCRIPTION jest to"
+#. R/dataframe.R: gettextf("cannot coerce class \"%s\" to a data.frame", deparse(class(x)))
+#: R/dataframe.R:0
+msgid "cannot coerce class \"%s\" to a data.frame"
+msgstr "nie można przekształcić klasy \"%s\" w klasę \"data.frame\""
 
-msgid "license for package %s not accepted"
-msgstr "licencja dla pakietu %s nie została zaakceptowana"
+#. R/table.R: stop("cannot coerce to a table")
+#: R/table.R:0
+msgid "cannot coerce to a table"
+msgstr "nie można przekształcić w tabelę"
 
-msgid "Attaching package: %s"
-msgstr "Dołączanie pakietu: %s"
-
-msgid "'verbose' and 'quietly' are both true; being verbose then .."
-msgstr ""
-"oba argumenty 'verbose' oraz 'quietly' sÄ… ustawione na tak; przyjmujÄ™ w "
-"takim razie tryb 'verbose' .."
-
-msgid "invalid package name"
-msgstr "niepoprawna nazwa pakietu"
-
-msgid "there is no package called %s"
-msgstr "nie ma pakietu o nazwie %s"
-
-msgid "no library trees found in 'lib.loc'"
-msgstr "nie znaleziono drzew bibliotek w 'lib.loc'"
+#. R/namespace.R: stop("cannot import into a sealed namespace")
+#: R/namespace.R:0
+msgid "cannot import into a sealed namespace"
+msgstr "nie można zaimportować do zamkniętej przestrzeni nazw"
 
-msgid "%s is not a valid installed package"
-msgstr "%s nie jest poprawnie zainstalowanym pakietem"
+#. R/sink.R: stop("cannot split the message connection")
+#: R/sink.R:0
+msgid "cannot split the message connection"
+msgstr "nie można rozdzielić komunikatu wiadomości"
 
-msgid "%s not found on search path, using pos = 2"
-msgstr "%s nie zostało znalezione w ścieżce wyszukiwania, używanie 'pos = 2'"
+#. R/dates.R: stop("character string is not in a standard unambiguous format")
+#. R/datetime.R: stop("character string is not in a standard unambiguous format")
+#: R/dates.R:0 R/datetime.R:0
+msgid "character string is not in a standard unambiguous format"
+msgstr "łańcuch tekstowy nie jest w standardowym jednoznacznym formacie"
 
-msgid "Package %s version %s cannot be unloaded"
-msgstr "Pakiet %s w wersji %s nie może być zwolniony"
+#. R/format.R: warning("class of 'x' was discarded")
+#: R/format.R:0
+msgid "class of 'x' was discarded"
+msgstr "klasa argumentu 'x' została odrzucona"
 
-msgid "package or namespace load failed for %s"
-msgstr "ładowanie pakietu lub przestrzeni nazw nie powiodło się dla pakietu %s"
+#. R/format.R: warning("coercing argument to \"character\" for format=\"s\"")
+#: R/format.R:0
+msgid "coercing argument to \"character\" for format=\"s\""
+msgstr "przekształcanie argumentu w \"character\" dla 'format=\"s\"'"
 
-msgid "package %s does not have a namespace and should be re-installed"
-msgstr ""
-"pakiet %s nie posiada przestrzeni nazw i powinien zostać zainstalowany "
-"ponownie"
+#. R/dataframe.R: stop("column name \"\" cannot match any column")
+#. R/dataframe.R: stop("column name \"\" cannot match any column")
+#: R/dataframe.R:0
+msgid "column name \"\" cannot match any column"
+msgstr "kolumny o nazwie \"\" nie można dopasować do żadnej kolumny"
 
-msgid "package %s already present in search()"
-msgstr "pakiet %s jest już obecny w 'search()'"
+#. R/chol.R: stop("complex matrices not permitted at present")
+#: R/chol.R:0
+msgid "complex matrices not permitted at present"
+msgstr "macierze zespolone na chwilÄ™ obecnÄ… nie sÄ… dozwolone"
 
-msgid "'DESCRIPTION' has an 'Encoding' field and re-encoding is not possible"
+#. R/format.R: warning("corrupt data frame: columns will be truncated or padded with NAs")
+#: R/format.R:0
+msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr ""
-"plik 'DESCRIPTION' posiada pole 'Encoding' i ponowne kodowanie nie jest "
-"możliwe"
-
-msgid "%sPackages in library %s:"
-msgstr "%sPakiety w bibliotece %s:"
+"uszkodzona ramka danych: kolumny będą obcięte lub uzupełnione wartościami "
+"'NA'"
 
-msgid "no packages found"
-msgstr "nie znaleziono pakietów"
+#. R/grep.R: stop("cost components must be non-negative")
+#: R/grep.R:0
+msgid "cost components must be non-negative"
+msgstr "komponenty kosztowe muszą być nieujemne"
 
-msgid "R packages available"
-msgstr "Dostępne pakiety R"
+#. R/apply.R: stop("dim(X) must have a positive length")
+#: R/apply.R:0
+msgid "dim(X) must have a positive length"
+msgstr "'dim(X)' musi mieć dodatnią długość"
 
-msgid "DLL %s not found: maybe not installed for this architecture?"
-msgstr ""
-"plik DLL %s nie został znaleziony: być może nie został zainstalowany dla tej "
-"architektury?"
+#. R/dates.R: gettextf("do not know how to convert '%s' to class %s", deparse(substitute(x)),     dQuote("Date"))
+#. R/datetime.R: gettextf("do not know how to convert '%s' to class %s", deparse(substitute(x)),     dQuote("POSIXlt"))
+#. R/datetime.R: gettextf("do not know how to convert '%s' to class %s", deparse(substitute(x)),     dQuote("POSIXct"))
+#: R/dates.R:0 R/datetime.R:0
+msgid "do not know how to convert '%s' to class %s"
+msgstr "nie wiem jak przekonwertować '%s' na klasę %s"
 
-msgid "shared object %s not found"
-msgstr "współdzielony obiekt %s nie został znaleziony"
+#. R/dataframe.R: stop("duplicate 'row.names' are not allowed")
+#: R/dataframe.R:0
+msgid "duplicate 'row.names' are not allowed"
+msgstr "powtórzone wartości w 'row.names' nie są dozwolone"
 
-msgid "DLL %s already loaded"
-msgstr "plik DLL %s jest już załadowany"
+#. R/namespace.R: gettextf("duplicate import names %s", paste(sQuote(impnames[duplicated(impnames)]),     collapse = ", "))
+#: R/namespace.R:0
+msgid "duplicate import names %s"
+msgstr "powtórzone nazwy %s importu"
 
-msgid "shared object '%s' already loaded"
-msgstr "współdzielony obiekt '%s' jest już załadowany"
+#. R/dataframe.R: gettextf("duplicate row.names: %s", paste(unique(row.names[duplicated(row.names)]),     collapse = ", "))
+#. R/dataframe.R: gettextf("duplicate row.names: %s", paste(unique(row.names[duplicated(row.names)]),     collapse = ", "))
+#: R/dataframe.R:0
+msgid "duplicate row.names: %s"
+msgstr "powtórzone wartości 'row.names': %s"
 
-msgid "now dyn.load(\"%s\") ..."
-msgstr "teraz 'dyn.load(\"%s\")' ..."
+#. R/dataframe.R: stop("duplicate subscripts for columns")
+#: R/dataframe.R:0
+msgid "duplicate subscripts for columns"
+msgstr "powtórzone indeksy dla kolumn"
 
-msgid "no DLL was specified"
-msgstr "nie określono pliku DLL"
+#. R/namespace.R: gettextf("duplicate symbol names %s in useDynLib(\"%s\")", paste(sQuote(names(symNames)[dup]),     collapse = ", "), dyl)
+#: R/namespace.R:0
+msgid "duplicate symbol names %s in useDynLib(\"%s\")"
+msgstr "powtórzone nazwy symboli %s w 'useDynlib(\"%s\")'"
 
-msgid "no shared object was specified"
-msgstr "nie określono współdzielonego obiektu"
+#. R/scan.R: stop("either specify 'nmax' or 'n', but not both.")
+#: R/scan.R:0
+msgid "either specify 'nmax' or 'n', but not both."
+msgstr "określ albo 'nmax' albo 'n', ale nie oba naraz"
 
-msgid "DLL %s was not loaded"
-msgstr "plik DLL %s nie został załadowany"
+#. R/time.R: gettext("elapsed")
+#: R/time.R:0
+msgid "elapsed"
+msgstr "upłynęło"
 
-msgid "shared object %s was not loaded"
-msgstr "współdzielony obiekt %s nie został załadowany"
+#. R/load.R: stop("empty (zero-byte) input file")
+#: R/load.R:0
+msgid "empty (zero-byte) input file"
+msgstr "pusty (zero bajtów) plik wejściowy"
 
-msgid "DLL %s not found"
-msgstr "plik DLL %s nie został znaleziony"
+#. R/namespace.R: gettextf("empty name in directive '%s' in 'NAMESPACE' file",     as.character(e[[1L]]))
+#: R/namespace.R:0
+msgid "empty name in directive '%s' in 'NAMESPACE' file"
+msgstr "pusta nazwa w dyrektywie %s w pliku 'NAMESPACE'"
 
-msgid "shared object '%s' not found"
-msgstr "współdzielony obiekt '%s' nie został znaleziony"
+#. R/source.R: gettextf("encoding = \"%s\" chosen", encoding)
+#: R/source.R:0
+msgid "encoding = \"%s\" chosen"
+msgstr "wybrano 'encoding = \"%s\"'"
 
-msgid "now dyn.unload(\"%s\") ..."
-msgstr "teraz 'dyn.load(\"%s\")' ..."
+#. R/qr.R: stop("exact singularity in 'qr.coef'")
+#: R/qr.R:0
+msgid "exact singularity in 'qr.coef'"
+msgstr "ścisła osobliwość w funkcji 'qr.coef()'"
 
-msgid "Loading required package: %s"
-msgstr "�adowanie wymaganego pakietu: %s"
+#. R/dates.R: stop("exactly two of 'to', 'by' and 'length.out' / 'along.with' must be specified")
+#. R/datetime.R: stop("exactly two of 'to', 'by' and 'length.out' / 'along.with' must be specified")
+#: R/dates.R:0 R/datetime.R:0
+msgid ""
+"exactly two of 'to', 'by' and 'length.out' / 'along.with' must be specified"
+msgstr ""
+"dokładnie dwa z 'to', 'by' oraz 'length.out' / 'along.with' muszą być "
+"określone"
 
-msgid "none of the packages are loaded"
-msgstr "żaden z tych pakietów nie został załadowany"
+#. R/namespace.R: gettextf("failed to assign NativeSymbolInfo for %s since %s is already defined in the %s namespace",     origVarName, varName, sQuote(package))
+#: R/namespace.R:0
+msgid ""
+"failed to assign NativeSymbolInfo for %s since %s is already defined in the "
+"%s namespace"
+msgstr ""
+"nie udało się przypisać NativeSymbolInfo dla %s ponieważ %s jest już "
+"zdefiniowane w przestrzeni nazw %s"
 
+#. R/namespace.R: gettextf("failed to assign NativeSymbolInfo for %s to %s since %s is already defined in the %s namespace",     origVarName, varName, varName, sQuote(package))
+#: R/namespace.R:0
 msgid ""
-"package %s found more than once,\n"
-"using the one found in %s"
+"failed to assign NativeSymbolInfo for %s to %s since %s is already defined "
+"in the %s namespace"
 msgstr ""
-"pakiet %s został znaleziony więcej niż raz. Używanie tego znalezionego w %s"
+"nie udało się przypisać NativeSymbolInfo dla %s do %s ponieważ %s jest już "
+"zdefiniowane w przestrzeni nazw %s"
 
+#. R/namespace.R: gettextf("failed to assign RegisteredNativeSymbol for %s to %s since %s is already defined in the %s namespace",     sym$name, varName, varName, sQuote(package))
+#: R/namespace.R:0
 msgid ""
-"Further information is available in the following vignettes in directory %s:"
+"failed to assign RegisteredNativeSymbol for %s to %s since %s is already "
+"defined in the %s namespace"
 msgstr ""
-"Dalsza informacja jest dostępna w następujących ilustracjach w katalogu %s:"
+"nie udało się przypisać RegisteredNativeSymbol dla %s do %s ponieważ %s jest "
+"już zdefiniowane w przestrzeni nazw %s"
 
-msgid "Description:"
-msgstr "Opis:"
+#. R/windows/junctions.R: gettextf("failed to create directory for link '%s", link)
+#: R/windows/junctions.R:0
+msgid "failed to create directory for link '%s"
+msgstr "nie udało się utworzyć katalogu dla łącza '%s"
 
-msgid "Index:"
-msgstr "Indeks:"
+#. R/namespace.R: gettextf("failed to find metadata object for %s", sQuote(mi))
+#: R/namespace.R:0
+msgid "failed to find metadata object for %s"
+msgstr "nie udało się znaleźć obiektu metadanych dla  %s"
 
-msgid "Information on package %s"
-msgstr "Informacja dotyczÄ…ca pakietu %s"
+#. R/debug.R: stop("failed to load methods package for handling signature")
+#: R/debug.R:0
+msgid "failed to load methods package for handling signature"
+msgstr "nie udało się załadować pakietu 'methods' dla obsługi sygnatury"
+
+#. R/debug.R: stop("failed to load methods package for undebugging by signature")
+#: R/debug.R:0
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+"nie udało się załadować pakietu 'methods' dla wyłączenia debugowania przez "
+"sygnaturÄ™"
+
+#. R/debug.R: stop("failed to load the methods package for debugging by signature")
+#. R/debug.R: stop("failed to load the methods package for debugging by signature")
+#: R/debug.R:0
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+"nie udało się załadować pakietu 'methods' dla włączenia debugowania przez "
+"sygnaturÄ™"
 
-msgid "Documentation for package %s"
-msgstr "Dokumentacja dla pakietu %s"
+#. R/windows/junctions.R: stop("fewer 'from' files than 'to' files")
+#: R/windows/junctions.R:0
+msgid "fewer 'from' files than 'to' files"
+msgstr "mniej plików 'from' niż plików 'to'"
 
-msgid "package %s required by %s could not be found"
-msgstr "pakiet %s wymagany przez pakiet %s nie mógł zostać znaleziony"
+#. R/attach.R: gettextf("file '%s' not found", what)
+#: R/attach.R:0
+msgid "file '%s' not found"
+msgstr "plik '%s' nie został znaleziony"
 
-msgid "version %s of %s masked by %s in %s"
-msgstr "wersja %s pakietu %s zakryta przez wersjÄ™ %s w %s"
+#. R/files.R: stop("file can not be copied both 'from' and 'to'")
+#: R/files.R:0
+msgid "file can not be copied both 'from' and 'to'"
+msgstr "plik nie może być skopiowany jednocześnie z 'from' oraz 'to'"
 
-msgid "package %s could not be loaded"
-msgstr "pakiet %s nie mógł zostać załadowany"
+#. R/qr.R: stop("first argument must be a QR decomposition")
+#: R/qr.R:0
+msgid "first argument must be a QR decomposition"
+msgstr "pierwszy argument musi być dekompozycją QR"
 
-msgid "empty (zero-byte) input file"
-msgstr "pusty (zero bajtów) plik wejściowy"
+#. R/seq.R: warning("first element used of 'length.out' argument")
+#: R/seq.R:0
+msgid "first element used of 'length.out' argument"
+msgstr "użyto pierwszego elementu argumentu 'length.out'"
 
-msgid "input has been corrupted, with LF replaced by CR"
-msgstr "wejście zostało uszkodzone z LF zastąpionym przez CR"
+#. R/namespace.R: gettextf("found methods to import for function %s but not the generic itself",     sQuote(genName))
+#: R/namespace.R:0
+msgid "found methods to import for function %s but not the generic itself"
+msgstr ""
+"znaleziono metody do importu dla funkcji %s ale nie znaleziono samej funkcji "
+"ogólnej"
 
-msgid "bad 'file' argument"
-msgstr "niepoprawny argument 'file'"
+#. R/match.fun.R: gettextf("found non-function '%s'", FUN)
+#: R/match.fun.R:0
+msgid "found non-function '%s'"
+msgstr "znaleziono nie-funkcjÄ™ '%s'"
 
-msgid "'file' must be specified"
-msgstr "argument 'file' musi być określony"
+#. R/dynload.R: stop("function is not in a namespace, so cannot locate associated DLL")
+#: R/dynload.R:0
+msgid "function is not in a namespace, so cannot locate associated DLL"
+msgstr ""
+"funkcja nie jest w przestrzeni nazw tak więc nie można zlokalizować "
+"powiÄ…zanego pliku DLL"
 
-msgid "nothing specified to be save()d"
-msgstr "nic nie zostało określone do zapisu"
+#. R/taskCallback.R: stop("handler must be a function")
+#: R/taskCallback.R:0
+msgid "handler must be a function"
+msgstr "przewodnik musi być funkcją"
 
-msgid "'file' must be non-empty string"
-msgstr "argument 'file' musi być niepustym łańcuchem tekstowym"
+#. R/load.R: gettextf("image could not be renamed and is left in %s", outfile)
+#: R/load.R:0
+msgid "image could not be renamed and is left in %s"
+msgstr "nazwa obrazu nie mogła zostać zmieniona; obraz pozostał w pliku %s"
 
-msgid "'compress' must be logical or character"
-msgstr "argument 'compress' musi być typem logicznym lub tekstem"
+#. R/namespace.R: gettextf("in %s methods for export not found: %s", sQuote(package),     paste(expMethods[missingMethods], collapse = ", "))
+#: R/namespace.R:0
+msgid "in %s methods for export not found: %s"
+msgstr "w pakiecie %s metody do eksportu nie zostały znalezione: %s"
 
-msgid "'compress = \"%s\"' is invalid"
-msgstr "'compress = \"%s\"' jest niepoprawne"
+#. R/namespace.R: gettextf("in package %s classes %s were specified for export but not defined",     sQuote(package), paste(expClasses[missingClasses], collapse = ", "))
+#: R/namespace.R:0
+msgid "in package %s classes %s were specified for export but not defined"
+msgstr ""
+"w pakiecie %s klasy %s zostały określone do eksportu, ale nie zostały "
+"zdefiniowane"
 
-msgid "bad file argument"
-msgstr "niepoprawny argument 'file'"
+#. R/namespace.R: gettextf("in package %s methods %s were specified for export but not defined",     sQuote(package), paste(expMethods, collapse = ", "))
+#: R/namespace.R:0
+msgid "in package %s methods %s were specified for export but not defined"
+msgstr ""
+"w pakiecie %s metody %s zostały określone do eksportu, ale nie zostały "
+"zdefiniowane"
 
-msgid "can only save to a binary connection"
-msgstr "można zapisać tylko do połączenia binarnego"
+#. R/rowsum.R: stop("incorrect length for 'group'")
+#. R/rowsum.R: stop("incorrect length for 'group'")
+#: R/rowsum.R:0
+msgid "incorrect length for 'group'"
+msgstr "niepoprawna długość argumentu 'group'"
 
-msgid "image could not be renamed and is left in %s"
-msgstr "nazwa obrazu nie mogła zostać zmieniona; obraz pozostał w pliku %s"
+#. R/array.R: stop("incorrect value for 'MARGIN'")
+#: R/array.R:0
+msgid "incorrect value for 'MARGIN'"
+msgstr "niepoprawna wartość dla argumentu 'MARGIN'"
 
-msgid "[Previously saved workspace restored]"
-msgstr "[Poprzednio zapisany obszar roboczy został przywrócony]"
+#. R/strwrap.R: stop("incorrect value for 'x'")
+#. R/strwrap.R: stop("incorrect value for 'x'")
+#: R/strwrap.R:0
+msgid "incorrect value for 'x'"
+msgstr "niepoprawna wartość dla argumentu 'x'"
 
-msgid "Attempting to load the environment %s"
-msgstr "Próba załadowania środowiska %s"
+#. R/strwrap.R: stop("incorrect values of 'indent' and 'width'")
+#: R/strwrap.R:0
+msgid "incorrect values of 'indent' and 'width'"
+msgstr "niepoprawne wartości 'indent' oraz 'width'"
 
-msgid "Specified environment not found: using '.GlobalEnv' instead"
-msgstr ""
-"Nie znaleziono określonego środowiska: zamiast tego używanie '.GlobalEnv'"
+#. R/LAPACK.R: stop("infinite or missing values in 'x'")
+#. R/eigen.R: stop("infinite or missing values in 'x'")
+#. R/svd.R: stop("infinite or missing values in 'x'")
+#: R/LAPACK.R:0 R/eigen.R:0 R/svd.R:0
+msgid "infinite or missing values in 'x'"
+msgstr "wartość nieskończona lub brakuje wartości w 'x'"
+
+#. R/load.R: stop("input has been corrupted, with LF replaced by CR")
+#: R/load.R:0
+msgid "input has been corrupted, with LF replaced by CR"
+msgstr "wejście zostało uszkodzone z LF zastąpionym przez CR"
+
+#. R/dates.R: stop("invalid 'by' string")
+#. R/datetime.R: stop("invalid 'by' string")
+#: R/dates.R:0 R/datetime.R:0
+msgid "invalid 'by' string"
+msgstr "błędny łańcuch 'by'"
 
+#. R/locales.R: stop("invalid 'category' argument")
+#. R/locales.R: stop("invalid 'category' argument")
+#: R/locales.R:0
 msgid "invalid 'category' argument"
 msgstr "niepoprawny argument 'category'"
 
-msgid "must specify names of formal arguments for 'vectorize'"
-msgstr "wymagane jest określenie nazwy formalnych argumentów dla 'vectorize'"
+#. R/serialize.R: stop("invalid 'compress' argument: ", compress)
+#: R/serialize.R:0
+msgid "invalid 'compress' argument:"
+msgstr "niepoprawny argument 'compress':"
 
-msgid "'arg' must be NULL or a character vector"
-msgstr "argument 'arg' musi być wartością NULL lub wektorem tekstowym"
+#. R/zapsmall.R: stop("invalid 'digits'")
+#: R/zapsmall.R:0
+msgid "invalid 'digits'"
+msgstr "niepoprawna wartość 'digits'"
 
-msgid "'arg' must be of length 1"
-msgstr "argument 'arg' musi mieć długość 1"
+#. R/dataframe.R: stop("invalid 'dimnames' given for data frame")
+#. R/dataframe.R: stop("invalid 'dimnames' given for data frame")
+#: R/dataframe.R:0
+msgid "invalid 'dimnames' given for data frame"
+msgstr "niepoprawne 'dimnames' dla podanej ramki danych"
 
-msgid "'arg' must be of length >= 1"
-msgstr "argument 'arg' musi mieć długość >= 1"
+#. R/colSums.R: stop("invalid 'dims'")
+#. R/colSums.R: stop("invalid 'dims'")
+#. R/colSums.R: stop("invalid 'dims'")
+#. R/colSums.R: stop("invalid 'dims'")
+#: R/colSums.R:0
+msgid "invalid 'dims'"
+msgstr "niepoprawny argument 'dims'"
 
-msgid "'arg' should be one of %s"
-msgstr "argument 'arg' powininen być jednym z %s"
+#. R/factor.R: gettextf("invalid 'labels'; length %d should be 1 or %d", nl,     nL)
+#: R/factor.R:0
+msgid "invalid 'labels'; length %d should be 1 or %d"
+msgstr "nieprawidłowe 'labels'; długość %d powinna wynosić 1 lub %d"
 
-msgid "there is more than one match in 'match.arg'"
-msgstr "jest więcej niż jedno dopasowanie w funkcji 'match.arg()'"
+#. R/attach.R: stop("invalid 'name' argument")
+#: R/attach.R:0
+msgid "invalid 'name' argument"
+msgstr "niepoprawny argument 'name'"
 
-msgid "no match"
-msgstr "brak dopasowania"
+#. R/files.R: stop("invalid 'path' argument")
+#: R/files.R:0
+msgid "invalid 'path' argument"
+msgstr "niepoprawny argument 'path'"
 
-msgid "'input' must have length 1"
-msgstr "argument 'input' musi mieć długość 1"
+#. R/rle.R: stop("invalid 'rle' structure")
+#: R/rle.R:0
+msgid "invalid 'rle' structure"
+msgstr "niepoprawna struktura 'rle'"
 
-msgid "'input' and 'target' must be character vectors"
-msgstr "argumenty 'input' oraz 'target' muszą być wektorami tekstowymi"
+#. R/dataframe.R: stop("invalid 'row.names' length")
+#. R/dataframe.R: stop("invalid 'row.names' length")
+#: R/dataframe.R:0
+msgid "invalid 'row.names' length"
+msgstr "niepoprawna długość 'row.names'"
 
-msgid "'%s' is not a function, character or symbol"
-msgstr "'%s' nie jest funkcjÄ…, tekstem ani symbolem"
+#. R/files.R: stop("invalid 'time' argument")
+#: R/files.R:0
+msgid "invalid 'time' argument"
+msgstr "niepoprawny argument 'time'"
 
-msgid "found non-function '%s'"
-msgstr "znaleziono nie-funkcjÄ™ '%s'"
+#. R/version.R: stop("invalid 'value'")
+#. R/version.R: stop("invalid 'value'")
+#. R/version.R: stop("invalid 'value'")
+#. R/version.R: stop("invalid 'value'")
+#: R/version.R:0
+msgid "invalid 'value'"
+msgstr "niepoprawna wartość 'value'"
 
-msgid "attempt to set 'rownames' on an object with no dimensions"
-msgstr "próba ustawienia 'rownames' dla obiektu bez wymiarów"
+#. R/seq.R: stop("invalid (to - from)/by in seq(.)")
+#: R/seq.R:0
+msgid "invalid (to - from)/by in seq(.)"
+msgstr "niepoprawne '(to - from)/by' w 'seq(.)'"
 
-msgid "attempt to set 'colnames' on an object with less than two dimensions"
-msgstr "próba ustawienia 'colnames' dla obiektu z mniej niż dwoma wymiarami"
+#. R/qr.R: stop("invalid NCOL(R)")
+#: R/qr.R:0
+msgid "invalid NCOL(R)"
+msgstr "niepoprawna wartość 'ncol(R)'"
 
-msgid "argument is not numeric or logical: returning NA"
-msgstr ""
-"argument nie jest wartością liczbową ani logiczną: zwracanie wartości NA"
+#. R/qr.R: stop("invalid NCOL(y)")
+#. R/qr.R: stop("invalid NCOL(y)")
+#. R/qr.R: stop("invalid NCOL(y)")
+#. R/qr.R: stop("invalid NCOL(y)")
+#: R/qr.R:0
+msgid "invalid NCOL(y)"
+msgstr "niepoprawna wartość 'ncol(y)'"
 
-msgid "'trim' must be numeric of length one"
-msgstr "argument 'trim' musi być liczbą o długości 1"
+#. R/factor.R: warning("invalid factor level, NA generated")
+#. R/factor.R: warning("invalid factor level, NA generated")
+#: R/factor.R:0
+msgid "invalid factor level, NA generated"
+msgstr "niepoprawny poziom czynnika, wygenerowano wartość NA"
 
-msgid "trimmed means are not defined for complex data"
-msgstr "przycięte średnie nie są zdefiniowane dla danych złożonych"
+#. R/namespace.R: stop("invalid import target")
+#: R/namespace.R:0
+msgid "invalid import target"
+msgstr "niepoprawny cel importu"
 
-msgid "'by' must match numbers of columns"
-msgstr "argument 'by' musi zgadzać się z liczbą kolumn"
+#. R/dataframe.R: stop("invalid list argument: all variables should have the same length")
+#: R/dataframe.R:0
+msgid "invalid list argument: all variables should have the same length"
+msgstr ""
+"niepoprawny argument listy: wszystkie zmienne powinny mieć tę samą długość"
 
-msgid "'by' must match number of columns"
-msgstr "argument 'by' musi zgadzać się z liczbą kolumn"
+#. R/dates.R: stop("invalid mode for 'by'")
+#. R/datetime.R: stop("invalid mode for 'by'")
+#: R/dates.R:0 R/datetime.R:0
+msgid "invalid mode for 'by'"
+msgstr "błędny tryb dla argumentu 'by'"
 
-msgid "'by' must specify one or more columns as numbers, names or logical"
-msgstr ""
-"argument 'by' musi określać jedną lub więcej kolumn jako liczby, nazwy lub "
-"warunki logiczne"
+#. R/qr.R: stop("invalid ncol(qr$qr)")
+#: R/qr.R:0
+msgid "invalid ncol(qr$qr)"
+msgstr "niepoprawna wartość 'ncol(qr$qr)'"
 
-msgid "long vectors are not supported"
-msgstr "długie wektory nie są wspierane"
+#. R/qr.R: stop("invalid ncol(qr$rank)")
+#: R/qr.R:0
+msgid "invalid ncol(qr$rank)"
+msgstr "niepoprawna wartość 'ncol(qr$rank)'"
 
-msgid "'by.x' and 'by.y' specify different numbers of columns"
-msgstr "argumenty 'by.x' oraz 'by.y' określają różne liczby kolumn"
+#. R/qr.R: stop("invalid ncol(x)")
+#: R/qr.R:0
+msgid "invalid ncol(x)"
+msgstr "niepoprawna wartość 'ncol(x)'"
 
-msgid "'incomparables' is supported only for merging on a single column"
-msgstr ""
-"'incomparables' jest wspierany w sytuacji łączeń na pojedynczej kolumnie"
+#. R/qr.R: stop("invalid ncol(y)")
+#: R/qr.R:0
+msgid "invalid ncol(y)"
+msgstr "niepoprawna wartość 'ncol(y)'"
 
-msgid "additional arguments ignored in message()"
-msgstr "dodatkowe argumenty zostały zignorowane w 'message()'"
+#. R/qr.R: stop("invalid nrow(qr$qr)")
+#. R/qr.R: stop("invalid nrow(qr$qr)")
+#. R/qr.R: stop("invalid nrow(qr$qr)")
+#. R/qr.R: stop("invalid nrow(qr$qr)")
+#. R/qr.R: stop("invalid nrow(qr$qr)")
+#: R/qr.R:0
+msgid "invalid nrow(qr$qr)"
+msgstr "niepoprawna wartość 'nrow(qr$qr)'"
 
-msgid ""
-"tracing functions requires the 'methods' package, but unable to load the "
-"'methods' namespace"
-msgstr ""
-"funkcjonalność śledzenia funkcji wymaga pakietu 'methods', ale nie można "
-"załadować przestrzeni nazw 'methods'"
+#. R/eigen.R: stop("invalid nrow(x)")
+#. R/kappa.R: stop("invalid nrow(x)")
+#. R/qr.R: stop("invalid nrow(x)")
+#: R/eigen.R:0 R/kappa.R:0 R/qr.R:0
+msgid "invalid nrow(x)"
+msgstr "niepoprawna wartość 'nrow(x)'"
 
-msgid "invalid to change the storage mode of a factor"
-msgstr "nie można zmienić trybu przechowywania czynnika"
+#. R/cut.R: stop("invalid number of intervals")
+#: R/cut.R:0
+msgid "invalid number of intervals"
+msgstr "niepoprawna liczba interwałów"
 
-msgid ""
-"namespace %s is not available and has been replaced\n"
-"by .GlobalEnv when processing object %s"
-msgstr ""
-"przestrzeń nazw %s nie jest dostępna, więc została zastąpiona przez '."
-"GlobalEnv' podczas przetwarzania obiektu %s"
+#. R/library.R: stop("invalid package name")
+#: R/library.R:0
+msgid "invalid package name"
+msgstr "niepoprawna nazwa pakietu"
 
-msgid "'%s' is not an exported object from 'namespace:%s'"
-msgstr "'%s' nie jest eksportowanym obiektem z 'namespace:%s'"
+#. R/dates.R: stop("invalid specification of 'breaks'")
+#. R/dates.R: stop("invalid specification of 'breaks'")
+#. R/dates.R: stop("invalid specification of 'breaks'")
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#: R/dates.R:0 R/datetime.R:0
+msgid "invalid specification of 'breaks'"
+msgstr "niepoprawne określenie dla 'breaks'"
 
-msgid "namespace is already attached"
-msgstr "przestrzeń nazw jest już dołączona"
+#. R/dates.R: stop("invalid string for 'by'")
+#. R/datetime.R: stop("invalid string for 'by'")
+#: R/dates.R:0 R/datetime.R:0
+msgid "invalid string for 'by'"
+msgstr "błędny łańcuch dla argumentu 'by'"
 
-msgid "%s not found"
-msgstr "wartość %s nie została znaleziona"
+#. R/mode.R: stop("invalid to change the storage mode of a factor")
+#: R/mode.R:0
+msgid "invalid to change the storage mode of a factor"
+msgstr "nie można zmienić trybu przechowywania czynnika"
 
-msgid "namespace %s %s is already loaded, but %s %s is required"
-msgstr "przestrzeń nazw %s %s jest już załadowana, ale %s %s jest wymagana"
+#. R/datetime.R: stop("invalid units specified")
+#. R/datetime.R: stop("invalid units specified")
+#: R/datetime.R:0
+msgid "invalid units specified"
+msgstr "niepoprawne określenie 'units'"
 
-msgid "namespace %s is already sealed in 'loadNamespace'"
-msgstr "przestrzeń nazw %s jest już zamknięta w 'loadNamespace()'"
+#. R/tabulate.R: stop("invalid value of 'nbins'")
+#: R/tabulate.R:0
+msgid "invalid value of 'nbins'"
+msgstr "niepoprawna wartość 'nbins'"
 
-msgid ""
-"failed to assign RegisteredNativeSymbol for %s to %s since %s is already "
-"defined in the %s namespace"
-msgstr ""
-"nie udało się przypisać RegisteredNativeSymbol dla %s do %s ponieważ %s jest "
-"już zdefiniowane w przestrzeni nazw %s"
+#. R/version.R: gettextf("invalid version specification %s", paste(sQuote(unique(x[!ok])),     collapse = ", "))
+#: R/version.R:0
+msgid "invalid version specification %s"
+msgstr "niepoprawne określenie wersji %s"
 
-msgid ""
-"failed to assign NativeSymbolInfo for %s to %s since %s is already defined "
-"in the %s namespace"
-msgstr ""
-"nie udało się przypisać NativeSymbolInfo dla %s do %s ponieważ %s jest już "
-"zdefiniowane w przestrzeni nazw %s"
+#. R/seq.R: stop("length must be non-negative number")
+#: R/seq.R:0
+msgid "length must be non-negative number"
+msgstr "długość musi być liczbą nieujemną"
 
-msgid ""
-"failed to assign NativeSymbolInfo for %s since %s is already defined in the "
-"%s namespace"
+#. R/scale.R: stop("length of 'center' must equal the number of columns of 'x'")
+#: R/scale.R:0
+msgid "length of 'center' must equal the number of columns of 'x'"
 msgstr ""
-"nie udało się przypisać NativeSymbolInfo dla %s ponieważ %s jest już "
-"zdefiniowane w przestrzeni nazw %s"
-
-msgid "package %s does not have a namespace"
-msgstr "pakiet %s nie zawiera przestrzeni nazw"
+"długość argumentu 'center' musi równać się liczbie kolumn argumentu 'x'"
 
-msgid "namespace %s %s is being loaded, but %s %s is required"
-msgstr "przestrzeń nazw %s %s jest ładowana, ale %s %s jest wymagana"
+#. R/scale.R: stop("length of 'scale' must equal the number of columns of 'x'")
+#: R/scale.R:0
+msgid "length of 'scale' must equal the number of columns of 'x'"
+msgstr "długość argumentu 'scale' musi równać się liczbie kolumn argumentu 'x'"
 
-msgid "unable to load R code in package %s"
-msgstr "nie można załadować kodu R w pakiecie %s"
+#. R/sweep.R: warning("length(STATS) or dim(STATS) do not match dim(x)[MARGIN]")
+#: R/sweep.R:0
+msgid "length(STATS) or dim(STATS) do not match dim(x)[MARGIN]"
+msgstr "'length(STATS)' lub 'dim(STATS)' nie zgadza siÄ™ z 'dim(x)[MARGIN]'"
 
-msgid ""
-"'exportClassPattern' specified in 'NAMESPACE' but no matching classes in "
-"package %s"
-msgstr ""
-"'exportClassPattern' określono w pliku 'NAMESPACE', ale brak pasujących klas "
-"w pakiecie %s"
+#. R/cut.R: stop("lengths of 'breaks' and 'labels' differ")
+#: R/cut.R:0
+msgid "lengths of 'breaks' and 'labels' differ"
+msgstr "długości argumentów 'breaks' oraz 'labels' różnią się"
 
-msgid "in package %s classes %s were specified for export but not defined"
-msgstr ""
-"w pakiecie %s klasy %s zostały określone do eksportu, ale nie zostały "
-"zdefiniowane"
+#. R/factor.R: stop("level sets of factors are different")
+#. R/factor.R: stop("level sets of factors are different")
+#: R/factor.R:0
+msgid "level sets of factors are different"
+msgstr "poziomy czynników są różne"
 
-msgid "no function found corresponding to methods exports from %s for: %s"
-msgstr ""
-"nie znaleziono funkcji odpowiadajÄ…cej eksportom funkcji z przestrzeni nazw "
-"%s dla: %s"
+#. R/library.R: gettextf("license for package %s not accepted", sQuote(package))
+#: R/library.R:0
+msgid "license for package %s not accepted"
+msgstr "licencja dla pakietu %s nie została zaakceptowana"
 
-msgid "in %s methods for export not found: %s"
-msgstr "w pakiecie %s metody do eksportu nie zostały znalezione: %s"
+#. R/windows/junctions.R: gettextf("link '%s' already exists", link)
+#: R/windows/junctions.R:0
+msgid "link '%s' already exists"
+msgstr "połączenie '%s' już istnieje"
 
-msgid "multiple methods tables found for %s"
-msgstr "wiele tablic metod znaleziono dla %s"
+#. R/dataframe.R: gettextf("list of length %d not meaningful", length(e2))
+#. R/dataframe.R: gettextf("list of length %d not meaningful", length(e1))
+#: R/dataframe.R:0
+msgid "list of length %d not meaningful"
+msgstr "lista o długości %d nie ma sensu"
 
-msgid "failed to find metadata object for %s"
-msgstr "nie udało się znaleźć obiektu metadanych dla  %s"
+#. R/merge.R: stop("long vectors are not supported")
+#: R/merge.R:0
+msgid "long vectors are not supported"
+msgstr "długie wektory nie są wspierane"
 
-msgid "in package %s methods %s were specified for export but not defined"
+#. R/dynload.R: stop("looking for DLL for native routine call, but no DLLs in namespace of call")
+#: R/dynload.R:0
+msgid ""
+"looking for DLL for native routine call, but no DLLs in namespace of call"
 msgstr ""
-"w pakiecie %s metody %s zostały określone do eksportu, ale nie zostały "
-"zdefiniowane"
-
-msgid "Loading required namespace: %s"
-msgstr "�adowanie wymaganej przestrzeni nazw: %s"
+"poszukiwanie pliku DLL dla wywołania rodzimej procedury, ale brak plików DLL "
+"w przestrzeni nazw wywołania"
 
-msgid "not loading a namespace"
-msgstr "nie Å‚adujÄ™ przestrzeni nazw"
+#. R/RNG.R: stop("malformed version string")
+#: R/RNG.R:0
+msgid "malformed version string"
+msgstr "zniekształcony łańcuch tekstowy wersji"
 
-msgid "namespace %s is imported by %s so cannot be unloaded"
-msgstr ""
-"przestrzeń nazw %s jest zaimportowana przez %s nie może być więc usunięta"
+#. R/grep.R: stop("match distance components must be non-negative")
+#. R/grep.R: stop("match distance components must be non-negative")
+#: R/grep.R:0
+msgid "match distance components must be non-negative"
+msgstr "komponenty o dopasowanej odległości muszą być nieujemne"
 
-msgid "not a namespace"
-msgstr "argument nie jest przestrzeniÄ… nazw"
+#. R/sort.R: stop("method = \"quick\" is only for numeric 'x'")
+#: R/sort.R:0
+msgid "method = \"quick\" is only for numeric 'x'"
+msgstr "'method=\"quick\"' jest tylko dla liczbowych 'x'"
 
-msgid "operation not allowed on base namespace"
-msgstr "operacja niedozwolona na bazowej przestrzeni nazw"
+#. R/dataframe.R: gettextf("mismatch of row names in arguments of 'data.frame', item %d",     i)
+#: R/dataframe.R:0
+msgid "mismatch of row names in arguments of 'data.frame', item %d"
+msgstr "niedopasowanie nazw wierszy w argumentach 'data.frame()', pozycja %d"
 
-msgid "duplicate import names %s"
-msgstr "powtórzone nazwy %s importu"
+#. R/grep.R: stop("missing replacement values are not allowed")
+#. R/grep.R: stop("missing replacement values are not allowed")
+#: R/grep.R:0
+msgid "missing replacement values are not allowed"
+msgstr "brakujące wartości dla zamiany nie są dozwolone"
 
-msgid "replacing local value with import %s when loading %s"
+#. R/dataframe.R: stop("missing values are not allowed in subscripted assignments of data frames")
+#. R/dataframe.R: stop("missing values are not allowed in subscripted assignments of data frames")
+#: R/dataframe.R:0
+msgid ""
+"missing values are not allowed in subscripted assignments of data frames"
 msgstr ""
-"zastępowanie lokalnej wartości z importu %s podczas ładowania przestrzeni "
-"nazw %s"
+"brakujące wartości nie są dozwolone w indeksowanych przypisaniach ramek "
+"danych"
 
-msgid "cannot import into a sealed namespace"
-msgstr "nie można zaimportować do zamkniętej przestrzeni nazw"
+#. R/rowsum.R: warning("missing values for 'group'")
+#. R/rowsum.R: warning("missing values for 'group'")
+#: R/rowsum.R:0
+msgid "missing values for 'group'"
+msgstr "brakujące wartości w argumencie 'group'"
 
-msgid "replacing previous import by %s when loading %s"
-msgstr ""
-"zastępowanie poprzedniego importu przez %s podczas ładowanie przestrzeni "
-"nazw %s"
+#. R/dataframe.R: stop("missing values in 'row.names' are not allowed")
+#: R/dataframe.R:0
+msgid "missing values in 'row.names' are not allowed"
+msgstr "brakujące wartości w 'row.names' nie są dozwolone"
 
-msgid "invalid import target"
-msgstr "niepoprawny cel importu"
+#. R/files.R: stop("more 'from' files than 'to' files")
+#. R/windows/junctions.R: stop("more 'from' files than 'to' files")
+#: R/files.R:0 R/windows/junctions.R:0
+msgid "more 'from' files than 'to' files"
+msgstr "więcej plików 'from' niż plików 'to'"
 
-msgid "found methods to import for function %s but not the generic itself"
-msgstr ""
-"znaleziono metody do importu dla funkcji %s ale nie znaleziono samej funkcji "
-"ogólnej"
+#. R/dynload.R: gettextf("multiple DLLs match '%s'. Using '%s'", dll, dll[["path"]])
+#: R/dynload.R:0
+msgid "multiple DLLs match '%s'. Using '%s'"
+msgstr "wielokrotna zgodność plików DLL z '%s'. Używanie '%s'"
 
-msgid "No methods found in \"%s\" for requests: %s"
-msgstr "Nie znaleziono metod w pakiecie '%s' dla żądań: %s"
+#. R/namespace.R: gettextf("multiple methods tables found for %s", sQuote(mi))
+#: R/namespace.R:0
+msgid "multiple methods tables found for %s"
+msgstr "wiele tablic metod znaleziono dla %s"
 
-msgid "requested methods not found in environment/package %s: %s"
-msgstr "zażądane metody nie zostały znalezione w środowisku/pakiecie %s: %s"
+#. R/grep.R: stop("must have replacement values for matches")
+#: R/grep.R:0
+msgid "must have replacement values for matches"
+msgstr "wymagane są wartości zamian dla dopasowań"
 
-msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
-msgstr ""
-"Nie znaleziono ogólnej funkcji odpowiadającej zażądanym zaimportowanym "
-"metodom dla funkcji '%s' z pakietu '%s' (uszkodzone eksporty?)"
+#. R/grep.R: stop("must have replacements for matches")
+#: R/grep.R:0
+msgid "must have replacements for matches"
+msgstr "wymagane są zamiany dla dopasowań"
 
-msgid "cannot add to exports of a sealed namespace"
-msgstr "nie można dodać do eksportów zamkniętej przestrzeni nazw"
+#. R/grep.R: stop("must have replacements for non-matches")
+#: R/grep.R:0
+msgid "must have replacements for non-matches"
+msgstr "wymagane są zamiany dla niedopasowań"
 
-msgid "undefined exports: %s"
-msgstr "niezdefiniowane eksporty: %s"
+#. R/dynload.R: gettextf("must pass a package name, %s or %s object", dQuote("DLLInfo"),     dQuote("DllInfoReference"))
+#: R/dynload.R:0
+msgid "must pass a package name, %s or %s object"
+msgstr "wymagane jest przekazanie nazwy pakietu %s lub obiekt %s"
 
-msgid "package %s has no 'NAMESPACE' file"
-msgstr "pakiet %s nie posiada pliku 'NAMESPACE'"
+#. R/dynload.R: gettextf("must specify DLL via a %s object. See getLoadedDLLs()",     dQuote("DLLInfo"))
+#: R/dynload.R:0
+msgid "must specify DLL via a %s object. See getLoadedDLLs()"
+msgstr ""
+"wymagane jest określenie DLL przez obiekt klasy %s. Zobacz 'getLoadedDLLs()'"
 
-msgid "empty name in directive '%s' in 'NAMESPACE' file"
-msgstr "pusta nazwa w dyrektywie %s w pliku 'NAMESPACE'"
+#. R/mapply.R: stop("must specify names of formal arguments for 'vectorize'")
+#: R/mapply.R:0
+msgid "must specify names of formal arguments for 'vectorize'"
+msgstr "wymagane jest określenie nazwy formalnych argumentów dla 'vectorize'"
 
-msgid "duplicate symbol names %s in useDynLib(\"%s\")"
-msgstr "powtórzone nazwy symboli %s w 'useDynlib(\"%s\")'"
+#. R/dataframe.R: warning("named arguments are discouraged")
+#. R/dataframe.R: warning("named arguments are discouraged")
+#: R/dataframe.R:0
+msgid "named arguments are discouraged"
+msgstr "nazwane argumenty sÄ… odrzucane"
 
-msgid "bad 'S3method' directive: %s"
-msgstr "niepoprawna dyrektywa 'S3method': %s"
+#. R/dataframe.R: warning("named arguments other than 'drop' are discouraged")
+#: R/dataframe.R:0
+msgid "named arguments other than 'drop' are discouraged"
+msgstr "nazwane argumenty inne niż 'drop' są odrzucane"
 
-msgid "unknown namespace directive: %s"
-msgstr "nieznana dyrektywa przestrzeni nazw: %s"
+#. R/dataframe.R: warning("named arguments other than 'exact' are discouraged")
+#: R/dataframe.R:0
+msgid "named arguments other than 'exact' are discouraged"
+msgstr "nazwane argumenty inne niż 'exact' są odrzucane"
 
-msgid "S3 method %s was declared but not found"
-msgstr "metoda S3 %s została zadeklarowana, ale nie została znaleziona"
+#. R/dataframe.R: stop("names do not match previous names")
+#. R/dataframe.R: stop("names do not match previous names")
+#: R/dataframe.R:0
+msgid "names do not match previous names"
+msgstr "nazwy nie zgadzajÄ… siÄ™ z poprzednimi nazwami"
 
-msgid "bad method"
-msgstr "błędna metoda"
+#. R/namespace.R: gettextf("namespace %s %s is already loaded, but %s %s is required",     sQuote(package), current, zop, zversion)
+#: R/namespace.R:0
+msgid "namespace %s %s is already loaded, but %s %s is required"
+msgstr "przestrzeń nazw %s %s jest już załadowana, ale %s %s jest wymagana"
 
-msgid "object '%s' not found whilst loading namespace '%s'"
-msgstr "nie znaleziono obiektu '%s' podczas Å‚adowania przestrzeni nazw '%s'"
+#. R/namespace.R: gettextf("namespace %s %s is being loaded, but %s %s is required",     sQuote(package), version, zop, zversion)
+#: R/namespace.R:0
+msgid "namespace %s %s is being loaded, but %s %s is required"
+msgstr "przestrzeń nazw %s %s jest ładowana, ale %s %s jest wymagana"
 
-msgid "'%s' is not implemented yet"
-msgstr "'%s' nie jest jeszcze zaimplementowane"
+#. R/namespace.R: gettextf("namespace %s is already sealed in 'loadNamespace'",     sQuote(getNamespaceName(ns)))
+#: R/namespace.R:0
+msgid "namespace %s is already sealed in 'loadNamespace'"
+msgstr "przestrzeń nazw %s jest już zamknięta w 'loadNamespace()'"
 
-msgid "argument '%s' is not used (yet)"
-msgstr "argument %s nie został (jeszcze) użyty"
+#. R/namespace.R: gettextf("namespace %s is imported by %s so cannot be unloaded",     sQuote(getNamespaceName(ns)), paste(sQuote(users), collapse = ", "))
+#: R/namespace.R:0
+msgid "namespace %s is imported by %s so cannot be unloaded"
+msgstr ""
+"przestrzeń nazw %s jest zaimportowana przez %s nie może być więc usunięta"
 
-msgid "'x' cannot be coerced to class \"octmode\""
-msgstr "argument 'x' nie może zostać przekształcony na klasę \"octmode\""
+#. R/namespace.R: gettextf("namespace %s is not available and has been replaced\nby .GlobalEnv when processing object %s",     sQuote(name)[1L], sQuote(where))
+#: R/namespace.R:0
+msgid ""
+"namespace %s is not available and has been replaced\n"
+"by .GlobalEnv when processing object %s"
+msgstr ""
+"przestrzeń nazw %s nie jest dostępna, więc została zastąpiona przez '."
+"GlobalEnv' podczas przetwarzania obiektu %s"
 
-msgid "'x' cannot be coerced to class \"hexmode\""
-msgstr "argument 'x' nie może zostać przekształcony na klasę \"hexmode\""
+#. R/namespace.R: stop("namespace is already attached")
+#: R/namespace.R:0
+msgid "namespace is already attached"
+msgstr "przestrzeń nazw jest już dołączona"
 
-msgid "using ... with FUN = \"*\" is an error"
-msgstr "używanie '...' z FUN = \"*\" jest błędem"
+#. R/dataframe.R: stop("need 0, 1, or 2 subscripts")
+#: R/dataframe.R:0
+msgid "need 0, 1, or 2 subscripts"
+msgstr "wymagane jest 0, 1, lub 2 indeksy"
 
-msgid "no arguments"
-msgstr "brak argumentów"
+#. R/datetime.R: stop("need explicit units for numeric conversion")
+#: R/datetime.R:0
+msgid "need explicit units for numeric conversion"
+msgstr ""
+"'as.difftime()' potrzebuje sprecyzowanego argumentu 'units' dla konwersji "
+"liczbowej"
 
-msgid "an argument will be fractionally recycled"
-msgstr "argument zostanie częściowo powtórzony"
+#. R/qr.R: stop("need larger value of 'ncol' as pivoting occurred")
+#: R/qr.R:0
+msgid "need larger value of 'ncol' as pivoting occurred"
+msgstr "wymagana jest większa wartość argumentu 'ncol' ponieważ nastąpił obrót"
 
-msgid "invalid ncol(x)"
-msgstr "niepoprawna wartość 'ncol(x)'"
+#. R/grep.R: gettextf("need non-overlapping matches for %s", sQuote("invert = NA"))
+#. R/grep.R: gettextf("need non-overlapping matches for %s", sQuote("invert = TRUE"))
+#: R/grep.R:0
+msgid "need non-overlapping matches for %s"
+msgstr "wymagane sÄ… niepokrywajÄ…ce siÄ™ dopasowania dla %s"
 
-msgid "too large a matrix for LINPACK"
-msgstr "macierz jest zbyt duża dla LINPACK"
+#. R/dataframe.R: stop("new columns would leave holes after existing columns")
+#: R/dataframe.R:0
+msgid "new columns would leave holes after existing columns"
+msgstr "nowe kolumny zostawiłyby dziury po istniejących kolumnach"
 
-msgid "first argument must be a QR decomposition"
-msgstr "pierwszy argument musi być dekompozycją QR"
+#. R/conditions.R: gettextf("no 'restart' '%s' found", as.character(r))
+#. R/conditions.R: gettextf("no 'restart' '%s' found", as.character(r))
+#: R/conditions.R:0
+msgid "no 'restart' '%s' found"
+msgstr "nie znaleziono 'restart' '%s'"
 
-msgid "invalid nrow(qr$qr)"
-msgstr "niepoprawna wartość 'nrow(qr$qr)'"
+#. R/library.R: stop("no DLL was specified")
+#: R/library.R:0
+msgid "no DLL was specified"
+msgstr "nie określono pliku DLL"
 
-msgid "invalid ncol(qr$qr)"
-msgstr "niepoprawna wartość 'ncol(qr$qr)'"
+#. R/datetime.R: warning("no Olson database found")
+#: R/datetime.R:0
+msgid "no Olson database found"
+msgstr "nie znaleziono bazy Olsona"
 
-msgid "invalid ncol(qr$rank)"
-msgstr "niepoprawna wartość 'ncol(qr$rank)'"
+#. R/pmax.R: stop("no arguments")
+#. R/pmax.R: stop("no arguments")
+#: R/pmax.R:0
+msgid "no arguments"
+msgstr "brak argumentów"
 
-msgid "invalid ncol(y)"
-msgstr "niepoprawna wartość 'ncol(y)'"
+#. R/files.R: stop("no file found")
+#: R/files.R:0
+msgid "no file found"
+msgstr "nie znaleziono pliku"
 
-msgid "'qr' and 'y' must have the same number of rows"
-msgstr "argumenty 'qr' oraz 'y' muszą mieć tę samą liczbę wierszy"
+#. R/files.R: stop("no files to copy to")
+#: R/files.R:0
+msgid "no files to copy to"
+msgstr "brak plików do skopiowania"
 
-msgid "exact singularity in 'qr.coef'"
-msgstr "ścisła osobliwość w funkcji 'qr.coef()'"
+#. R/files.R: stop("no files to link from")
+#. R/files.R: stop("no files to link from")
+#: R/files.R:0
+msgid "no files to link from"
+msgstr "brak plików z których można łączyć"
 
-msgid "argument is not a QR decomposition"
-msgstr "argument nie jest dekompozycjÄ… QR"
+#. R/files.R: stop("no files to link to")
+#. R/windows/junctions.R: stop("no files to link to")
+#: R/files.R:0 R/windows/junctions.R:0
+msgid "no files to link to"
+msgstr "brak plików do których można łączyć"
 
-msgid "invalid NCOL(y)"
-msgstr "niepoprawna wartość 'ncol(y)'"
+#. R/files.R: stop("no files/directory to link to")
+#: R/files.R:0
+msgid "no files/directory to link to"
+msgstr "brak plików/katalogu do których można łączyć"
 
-msgid "not implemented for complex 'qr'"
+#. R/namespace.R: gettextf("no function found corresponding to methods exports from %s for: %s",     sQuote(package), paste(sQuote(sort(unique(addGenerics[nowhere]))),         collapse = ", "))
+#: R/namespace.R:0
+msgid "no function found corresponding to methods exports from %s for: %s"
 msgstr ""
-"funkcja 'qr()' nie jest zaimplementowana dla zespolonego argumentu 'qr'"
+"nie znaleziono funkcji odpowiadajÄ…cej eksportom funkcji z przestrzeni nazw "
+"%s dla: %s"
 
-msgid "not supported for LAPACK QR"
-msgstr "funkcja 'qr()' nie jest wspierana przez 'LAPACK QR'"
+#. R/library.R: gettext("no library trees found in 'lib.loc'")
+#: R/library.R:0
+msgid "no library trees found in 'lib.loc'"
+msgstr "nie znaleziono drzew bibliotek w 'lib.loc'"
 
-msgid "'k' is too large"
-msgstr "argument 'k' jest zbyt duży"
+#. R/match.R: stop("no match")
+#: R/match.R:0
+msgid "no match"
+msgstr "brak dopasowania"
 
-msgid "need larger value of 'ncol' as pivoting occurred"
-msgstr "wymagana jest większa wartość argumentu 'ncol' ponieważ nastąpił obrót"
+#. R/library.R: message("no packages found")
+#: R/library.R:0
+msgid "no packages found"
+msgstr "nie znaleziono pakietów"
 
-msgid "invalid NCOL(R)"
-msgstr "niepoprawna wartość 'ncol(R)'"
+#. R/library.R: stop("no shared object was specified")
+#: R/library.R:0
+msgid "no shared object was specified"
+msgstr "nie określono współdzielonego obiektu"
 
-msgid "'x' must be a vector of an atomic type"
-msgstr "'x' musi być wektorem o typie atomowym"
+#. R/taskCallback.R: gettextf("no such element '%s'", which)
+#: R/taskCallback.R:0
+msgid "no such element '%s'"
+msgstr "nie ma elementu '%s'"
 
-msgid "invalid 'rle' structure"
-msgstr "niepoprawna struktura 'rle'"
+#. R/dataframe.R: stop("non-existent rows not allowed")
+#. R/dataframe.R: stop("non-existent rows not allowed")
+#: R/dataframe.R:0
+msgid "non-existent rows not allowed"
+msgstr "nieistniejÄ…ce wiersze nie sÄ… dozwolone"
 
-msgid "... must contain names or character strings"
-msgstr "'...' musi zawierać nazwy lub łańcuchy tekstowe"
+#. R/sort.R: stop("non-finite 'partial'")
+#: R/sort.R:0
+msgid "non-finite 'partial'"
+msgstr "nieskończona wartość 'partial'"
 
-msgid "incorrect length for 'group'"
-msgstr "niepoprawna długość argumentu 'group'"
+#. R/dataframe.R: stop("non-numeric variable in data frame: ", vnames[!mode.ok])
+#: R/dataframe.R:0
+msgid "non-numeric variable in data frame:"
+msgstr "zmienna nieliczbowa w ramce danych:"
 
-msgid "missing values for 'group'"
-msgstr "brakujące wartości w argumencie 'group'"
+#. R/eigen.R: stop("non-square matrix in 'eigen'")
+#: R/eigen.R:0
+msgid "non-square matrix in 'eigen'"
+msgstr "macierz w funkcji 'eigen()' nie jest kwadratowa"
+
+#. R/library.R: stop("none of the packages are loaded")
+#: R/library.R:0
+msgid "none of the packages are loaded"
+msgstr "żaden z tych pakietów nie został załadowany"
 
+#. R/kappa.R: gettextf("norm '%s' currently always uses exact = FALSE", norm)
+#: R/kappa.R:0
+msgid "norm '%s' currently always uses exact = FALSE"
+msgstr "norma '%s' aktualnie zawsze używa dokładnej wartości = FALSE"
+
+#. R/rowsum.R: stop("not a data frame")
+#: R/rowsum.R:0
 msgid "not a data frame"
 msgstr "argument nie jest ramkÄ… danych"
 
-msgid "length of 'center' must equal the number of columns of 'x'"
-msgstr ""
-"długość argumentu 'center' musi równać się liczbie kolumn argumentu 'x'"
-
-msgid "length of 'scale' must equal the number of columns of 'x'"
-msgstr "długość argumentu 'scale' musi równać się liczbie kolumn argumentu 'x'"
+#. R/namespace.R: stop("not a namespace")
+#: R/namespace.R:0
+msgid "not a namespace"
+msgstr "argument nie jest przestrzeniÄ… nazw"
 
-msgid "either specify 'nmax' or 'n', but not both."
-msgstr "określ albo 'nmax' albo 'n', ale nie oba naraz"
+#. R/conditions.R: stop("not a valid restart specification")
+#: R/conditions.R:0
+msgid "not a valid restart specification"
+msgstr "niepoprawne określenie restartu"
 
-msgid "'from' cannot be NA, NaN or infinite"
-msgstr "argument 'from' nie może mieć wartości NA, NaN lub nieskończoność"
+#. R/apply.R: stop("not all elements of 'MARGIN' are names of dimensions")
+#: R/apply.R:0
+msgid "not all elements of 'MARGIN' are names of dimensions"
+msgstr "nie wszystkie elementy 'MARGIN' są nazwami wymiarów"
 
-msgid "argument 'length.out' must be of length 1"
-msgstr "argument 'length.out' musi mieć długość 1"
+#. R/conditions.R: stop("not an interactive session")
+#: R/conditions.R:0
+msgid "not an interactive session"
+msgstr "nieinteraktywna sesja"
 
-msgid "first element used of 'length.out' argument"
-msgstr "użyto pierwszego elementu argumentu 'length.out'"
+#. R/qr.R: stop("not implemented for complex 'qr'")
+#. R/qr.R: stop("not implemented for complex 'qr'")
+#: R/qr.R:0
+msgid "not implemented for complex 'qr'"
+msgstr ""
+"funkcja 'qr()' nie jest zaimplementowana dla zespolonego argumentu 'qr'"
 
-msgid "'to' cannot be NA, NaN or infinite"
-msgstr "argument 'to' nie może mieć wartości NA, NaN lub nieskończoność"
+#. R/namespace.R: stop("not loading a namespace")
+#: R/namespace.R:0
+msgid "not loading a namespace"
+msgstr "nie Å‚adujÄ™ przestrzeni nazw"
 
-msgid "invalid (to - from)/by in seq(.)"
-msgstr "niepoprawne '(to - from)/by' w 'seq(.)'"
+#. R/qr.R: stop("not supported for LAPACK QR")
+#. R/qr.R: stop("not supported for LAPACK QR")
+#: R/qr.R:0
+msgid "not supported for LAPACK QR"
+msgstr "funkcja 'qr()' nie jest wspierana przez 'LAPACK QR'"
 
-msgid "wrong sign in 'by' argument"
-msgstr "błędny znak w argumencie 'by'"
+#. R/load.R: warning("nothing specified to be save()d")
+#: R/load.R:0
+msgid "nothing specified to be save()d"
+msgstr "nic nie zostało określone do zapisu"
 
-msgid "'by' argument is much too small"
-msgstr "wartość w argumencie 'by' jest znacznie za mała"
+#. R/table.R: stop("nothing to tabulate")
+#: R/table.R:0
+msgid "nothing to tabulate"
+msgstr "nic do tabulacji"
 
-msgid "length must be non-negative number"
-msgstr "długość musi być liczbą nieujemną"
+#. R/library.R: gettextf("now dyn.load(\"%s\") ...", file)
+#: R/library.R:0
+msgid "now dyn.load(\"%s\") ..."
+msgstr "teraz 'dyn.load(\"%s\")' ..."
 
-msgid "too many arguments"
-msgstr "zbyć dużo argumentów"
+#. R/library.R: gettextf("now dyn.unload(\"%s\") ...", file)
+#: R/library.R:0
+msgid "now dyn.unload(\"%s\") ..."
+msgstr "teraz 'dyn.load(\"%s\")' ..."
 
-msgid "'compress' is ignored unless 'file' is a file name"
+#. R/dataframe.R: warning("number of items to replace is not a multiple of replacement length")
+#: R/dataframe.R:0
+msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
-"argument 'compress' zostanie zignorowany o ile argument 'file' nie jest "
-"nazwÄ… pliku"
+"liczba pozycji do zastąpienia nie jest wielokrotnością długości zamiany"
 
-msgid "'connection' must be a connection"
-msgstr "argument 'connection' musi być połączeniem"
+#. R/factor.R: stop("number of levels differs")
+#: R/factor.R:0
+msgid "number of levels differs"
+msgstr "liczba poziomów różni się"
 
-msgid "'file' must be NULL or an already open connection"
-msgstr "'file' musi być wartością NULL lub już otwartym połączeniem"
+#. R/dataframe.R: stop("numbers of columns of arguments do not match")
+#. R/dataframe.R: stop("numbers of columns of arguments do not match")
+#: R/dataframe.R:0
+msgid "numbers of columns of arguments do not match"
+msgstr "liczba kolumn argumentów nie zgadza się"
 
-msgid "cannot split the message connection"
-msgstr "nie można rozdzielić komunikatu wiadomości"
+#. R/namespace.R: gettextf("object '%s' not found whilst loading namespace '%s'",     genname, package)
+#: R/namespace.R:0
+msgid "object '%s' not found whilst loading namespace '%s'"
+msgstr "nie znaleziono obiektu '%s' podczas Å‚adowania przestrzeni nazw '%s'"
 
-msgid "'file' must be NULL, a connection or a character string"
-msgstr "'file' musi być wartością NULL, połączeniem lub łańcuchem tekstowym"
+#. R/dataframe.R: stop("only a single element should be replaced")
+#: R/dataframe.R:0
+msgid "only a single element should be replaced"
+msgstr "tylko pojedynczy element powinień być zamieniany"
 
-msgid "this is the \"qr\" method for the generic function solve()"
-msgstr "to jest metoda \"qr\" dla ogólnej funkcji 'solve()'"
+#. R/dataframe.R: stop("only defined on a data frame with all numeric variables")
+#: R/dataframe.R:0
+msgid "only defined on a data frame with all numeric variables"
+msgstr ""
+"funkcja 'summary()' zdefiniowana jest jedynie na ramce danych ze wszystkimi "
+"zmiennymi będącymi liczbami"
 
-msgid "singular matrix 'a' in 'solve'"
-msgstr "osobliwa macierz 'a' w 'solve()'"
+#. R/diag.R: stop("only matrix diagonals can be replaced")
+#: R/diag.R:0
+msgid "only matrix diagonals can be replaced"
+msgstr "tylko elementy diagonalne macierzy mogą zostać zastąpione"
 
+#. R/solve.R: stop("only square matrices can be inverted")
+#. R/solve.R: stop("only square matrices can be inverted")
+#: R/solve.R:0
 msgid "only square matrices can be inverted"
 msgstr "jedynie kwadratowe macierze mogą zostać odwrócone"
 
-msgid "solve.default called with a \"qr\" object: use 'qr.solve'"
+#. R/dataframe.R: stop("only valid calls are x[[j]] <- value or x[[i,j]] <- value")
+#: R/dataframe.R:0
+msgid "only valid calls are x[[j]] <- value or x[[i,j]] <- value"
 msgstr ""
-"'solve.default' zostało wywołane z obiektem \"qr\": używanie 'qr.solve'"
+"jedynymi poprawnymi przywołaniami są x[[j]] <- wartość lub x[[i,j]] <- "
+"wartość"
 
-msgid "singular matrix 'a' in solve"
-msgstr "osobliwa macierz 'a' w 'solve()'"
+#. R/namespace.R: stop("operation not allowed on base namespace")
+#: R/namespace.R:0
+msgid "operation not allowed on base namespace"
+msgstr "operacja niedozwolona na bazowej przestrzeni nazw"
 
-msgid ""
-"'decreasing' must be a length-1 logical vector.\n"
-"Did you intend to set 'partial'?"
+#. R/dataframe.R: stop("options(\"stringsAsFactors\") not set to TRUE or FALSE")
+#: R/dataframe.R:0
+msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
-"'decreasing' musi być wektorem logicznym o długości 1.\n"
-"Czy chciałeś ustawić 'partial'?"
-
-msgid "'index.return' only for non-factors"
-msgstr "argument 'index.return' jest poprawny jedynie dla nie-czynników"
-
-msgid "'x' must be atomic"
-msgstr "argument 'x' musi być atomowy"
+"'options(\"stringsAsFactors\")' nie zostało ustawione na 'TRUE' lub 'FALSE'"
 
-msgid "'index.return' only for 'na.last = NA'"
-msgstr "'index.return' dostępne jest jedynie dla 'na.last = NA'"
+#. R/library.R: gettextf("package %s already present in search()", sQuote(package))
+#: R/library.R:0
+msgid "package %s already present in search()"
+msgstr "pakiet %s jest już obecny w 'search()'"
 
-msgid "unsupported options for partial sorting"
-msgstr "niewspierane opcje dla częściowego sortowania"
+#. R/library.R: gettextf("package %s could not be loaded", sQuote(pkg))
+#: R/library.R:0
+msgid "package %s could not be loaded"
+msgstr "pakiet %s nie mógł zostać załadowany"
 
-msgid "non-finite 'partial'"
-msgstr "nieskończona wartość 'partial'"
+#. R/namespace.R: gettextf("package %s does not have a namespace", sQuote(package))
+#: R/namespace.R:0
+msgid "package %s does not have a namespace"
+msgstr "pakiet %s nie zawiera przestrzeni nazw"
 
-msgid "argument lengths differ"
-msgstr "długości argumentów różnią się"
+#. R/library.R: gettextf("package %s does not have a namespace and should be re-installed",     sQuote(package))
+#: R/library.R:0
+msgid "package %s does not have a namespace and should be re-installed"
+msgstr ""
+"pakiet %s nie posiada przestrzeni nazw i powinien zostać zainstalowany "
+"ponownie"
 
+#. R/library.R: gettextf("package %s found more than once,\nusing the one found in %s",     sQuote(pkg), sQuote(paths))
+#: R/library.R:0
 msgid ""
-"'x' must be atomic for 'sort.list'\n"
-"Have you called 'sort' on a list?"
+"package %s found more than once,\n"
+"using the one found in %s"
 msgstr ""
-"'x' musi być typem atomowym dla 'sort.list'\n"
-"Czy wywołano 'sort' na liście?"
-
-msgid "method = \"quick\" is only for numeric 'x'"
-msgstr "'method=\"quick\"' jest tylko dla liczbowych 'x'"
-
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "'method=\"radix\"' jest tylko dla liczb całkowitych 'x'"
-
-msgid "'local' must be TRUE, FALSE or an environment"
-msgstr "argument 'local' musi być TRUE, FALSE lub musi być środowiskiem"
+"pakiet %s został znaleziony więcej niż raz. Używanie tego znalezionego w %s"
 
-msgid "'echo' must be logical"
-msgstr "'echo' musi być zmienną logiczną"
+#. R/library.R: gettextf("package %s has a license that you need to accept after viewing",     sQuote(pkg))
+#: R/library.R:0
+msgid "package %s has a license that you need to accept after viewing"
+msgstr ""
+"pakiet %s posiada licencję, którą musisz zaakceptować po przeglądnięciu"
 
-msgid "'verbose' is TRUE, 'echo' not; ... coercing 'echo <- TRUE'"
+#. R/library.R: gettextf("package %s has a license that you need to accept in an interactive session",     sQuote(pkg))
+#: R/library.R:0
+msgid ""
+"package %s has a license that you need to accept in an interactive session"
 msgstr ""
-"argument 'verbose' jest TRUE, argument 'echo' nie; ... przekształcanie 'echo "
-"<- TRUE'"
+"Pakiet %s posiada licencję, którą musisz zaakceptować w interaktywnej sesji"
 
-msgid "unable to find a plausible encoding"
-msgstr "nie można znaleźć wiarygodnego kodowania"
+#. R/library.R: gettextf("package %s has a license that you need to accept:\naccording to the DESCRIPTION file it is\n%s",     sQuote(pkg), pkgInfo$DESCRIPTION["License"])
+#: R/library.R:0
+msgid ""
+"package %s has a license that you need to accept:\n"
+"according to the DESCRIPTION file it is\n"
+"%s"
+msgstr ""
+"pakiet %s posiada licencję, którą musisz zaakceptować:\n"
+"według pliku 'DESCRIPTION' jest to\n"
+"%s"
 
-msgid "encoding = \"%s\" chosen"
-msgstr "wybrano 'encoding = \"%s\"'"
+#. R/namespace.R: gettextf("package %s has no 'NAMESPACE' file", sQuote(package))
+#: R/namespace.R:0
+msgid "package %s has no 'NAMESPACE' file"
+msgstr "pakiet %s nie posiada pliku 'NAMESPACE'"
 
-msgid "'chdir = TRUE' makes no sense for a URL"
-msgstr "'chdir = TRUE' nie ma sensu dla adresu URL"
+#. R/library.R: gettextf("package %s has not been installed properly\n", sQuote(pkgname))
+#. R/namespace.R: gettextf("package %s has not been installed properly\n", sQuote(basename(pkgpath)))
+#: R/library.R:0 R/namespace.R:0
+msgid "package %s has not been installed properly"
+msgstr "pakiet %s nie został zainstalowany poprawnie"
 
-msgid "cannot 'chdir' as current directory is unknown"
-msgstr "nie można wykonać 'chdir' ponieważ bieżący katalog nie jest znany"
+#. R/library.R: gettextf("package %s is not installed for 'arch = %s'", sQuote(pkgname),     r_arch)
+#: R/library.R:0
+msgid "package %s is not installed for 'arch = %s'"
+msgstr "pakiet %s nie jest zainstalowany dla 'arch=%s'"
 
-msgid "'chdir = TRUE' makes no sense for a connection"
-msgstr "'chdir = TRUE' nie ma sensu dla połączenia"
+#. R/attach.R: gettextf("package %s is required by %s so will not be detached",     sQuote(pkgname), sQuote(.rmpkg(pkg)))
+#: R/attach.R:0
+msgid "package %s is required by %s so will not be detached"
+msgstr "pakiet %s jest wymagany przez %s tak więc nie zostanie odłączony"
 
-msgid "'%s' is not an existing file"
-msgstr "'%s' nie jest istniejÄ…cym plikiem"
+#. R/attach.R: gettextf("package %s is required by %s, which may no longer work correctly",     sQuote(pkgname), sQuote(.rmpkg(pkg)))
+#: R/attach.R:0
+msgid "package %s is required by %s, which may no longer work correctly"
+msgstr ""
+"pakiet %s jest wymagany przez %s, który z kolei może nie działać poprawnie"
 
-msgid "Timestamp of %s has changed"
-msgstr "Sygnatura czasu dla %s zmieniła się"
+#. R/library.R: gettextf("package %s required by %s could not be found", sQuote(pkg),     sQuote(pkgname))
+#: R/library.R:0
+msgid "package %s required by %s could not be found"
+msgstr "pakiet %s wymagany przez pakiet %s nie mógł zostać znaleziony"
 
-#, fuzzy
-msgid "'x' and 'to' must refer to same file"
-msgstr "'x' oraz 'y' muszą mieć tę samą długość"
+#. R/library.R: gettextf("package %s was built before R 3.0.0: please re-install it",     sQuote(pkgname))
+#. R/namespace.R: gettextf("package %s was built before R 3.0.0: please re-install it",     sQuote(basename(pkgpath)))
+#: R/library.R:0 R/namespace.R:0
+msgid "package %s was built before R 3.0.0: please re-install it"
+msgstr "pakiet %s został zbudowany przed R 3.0.0: proszę go przeinstalować"
 
-msgid "additional arguments ignored in stop()"
-msgstr "dodatkowe argumenty zostały zignorowane w 'stop()'"
+#. R/library.R: gettextf("package %s was built for %s", sQuote(pkgname), platform)
+#. R/library.R: gettextf("package %s was built for %s", sQuote(pkgname), platform)
+#: R/library.R:0
+msgid "package %s was built for %s"
+msgstr "pakiet %s został zbudowany dla platformy %s"
 
-msgid "additional arguments ignored in warning()"
-msgstr "dodatkowe argumenty zostały zignorowane w 'warning()'"
+#. R/library.R: gettextf("package %s was built under R version %s", sQuote(pkgname),     as.character(built$R))
+#: R/library.R:0
+msgid "package %s was built under R version %s"
+msgstr "pakiet %s został zbudowany w wersji R %s"
 
-msgid "incorrect value for 'x'"
-msgstr "niepoprawna wartość dla argumentu 'x'"
+#. R/library.R: gettextf("package or namespace load failed for %s", sQuote(package))
+#: R/library.R:0
+msgid "package or namespace load failed for %s"
+msgstr "ładowanie pakietu lub przestrzeni nazw nie powiodło się dla pakietu %s"
 
-msgid "'x' and 'y' must have the same length"
-msgstr "'x' oraz 'y' muszą mieć tę samą długość"
+#. R/summary.R: gettextf("probably wrong encoding in names(.) of column %s",     paste(which(is.na(lw)), collapse = ", "))
+#: R/summary.R:0
+msgid "probably wrong encoding in names(.) of column %s"
+msgstr "prawdopodobnie błędne kodowanie w 'names(.)' kolumny %s"
 
-msgid "incorrect values of 'indent' and 'width'"
-msgstr "niepoprawne wartości 'indent' oraz 'width'"
+#. R/attach.R: warning("replaced '[<-' by '\\\\[<-' in regular expression pattern")
+#: R/attach.R:0
+msgid "replaced '[<-' by '\\\\[<-' in regular expression pattern"
+msgstr "zastąpiono '[<-' przez '\\\\[<-' we wzorcu wyrażenia regularnego"
 
-msgid "probably wrong encoding in names(.) of column"
-msgstr "prawdopodobnie błędne kodowanie w 'names(.)' kolumny"
+#. R/attach.R: warning("replaced regular expression pattern '[' by  '\\\\['")
+#: R/attach.R:0
+msgid "replaced regular expression pattern '[' by  '\\\\['"
+msgstr "zastąpiono wzór wyrażenia regularnego '[' przez '\\\\['"
 
-msgid ","
-msgstr ","
+#. R/diag.R: stop("replacement diagonal has wrong length")
+#: R/diag.R:0
+msgid "replacement diagonal has wrong length"
+msgstr "zamiana elementów diagonalnych ma niepoprawną długość"
 
-msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
-msgstr "STATS jest dłuższe niż rozmiar 'dim(x)[MARGIN]'"
+#. R/dataframe.R: gettextf("replacing element in non-existent column: %s", j[is.na(jseq)])
+#. R/dataframe.R: gettextf("replacing element in non-existent column: %s", jseq[jseq >     nvars])
+#: R/dataframe.R:0
+msgid "replacing element in non-existent column: %s"
+msgstr "zastępowanie elementu w nieistniejącej kolumnie: %s"
 
-msgid "STATS does not recycle exactly across MARGIN"
-msgstr "STATS nie powtarza się dokładnie zgodnie z MARGIN"
+#. R/namespace.R: gettext("replacing local value with import %s when loading %s")
+#. R/namespace.R: gettext("replacing local value with import %s when loading %s")
+#: R/namespace.R:0
+msgid "replacing local value with import %s when loading %s"
+msgstr ""
+"zastępowanie lokalnej wartości z importu %s podczas ładowania przestrzeni "
+"nazw %s"
 
-msgid "length(STATS) or dim(STATS) do not match dim(x)[MARGIN]"
-msgstr "'length(STATS)' lub 'dim(STATS)' nie zgadza siÄ™ z 'dim(x)[MARGIN]'"
+#. R/namespace.R: gettext("replacing previous import %s by %s when loading %s")
+#: R/namespace.R:0
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+"zastępowanie poprzedniego importu %s przez %s podczas ładowanie przestrzeni "
+"nazw %s"
 
-msgid "nothing to tabulate"
-msgstr "nic do tabulacji"
+#. R/namespace.R: gettext("replacing previous import by %s when loading %s")
+#: R/namespace.R:0
+msgid "replacing previous import by %s when loading %s"
+msgstr ""
+"zastępowanie poprzedniego importu przez %s podczas ładowanie przestrzeni "
+"nazw %s"
 
-msgid "all arguments must have the same length"
-msgstr "wszystkie argumenty muszą mieć tę samą długość"
+#. R/namespace.R: gettextf("requested methods not found in environment/package %s: %s",     sQuote(pkg), paste(vars[is.na(match(vars, allFuns))], collapse = ", "))
+#: R/namespace.R:0
+msgid "requested methods not found in environment/package %s: %s"
+msgstr "zażądane metody nie zostały znalezione w środowisku/pakiecie %s: %s"
 
-msgid "attempt to make a table with >= 2^31 elements"
-msgstr "próba utworzenia tabeli z >= 2^31 elementami"
+#. R/dataframe.R: stop("row names contain missing values")
+#. R/dataframe.R: stop("row names contain missing values")
+#: R/dataframe.R:0
+msgid "row names contain missing values"
+msgstr "nazwy wierszy zawierają brakujące wartości"
 
-msgid "'object' must inherit from class %s"
-msgstr "argument 'object' musi dziedziczyć z klasy %s"
+#. R/dataframe.R: stop("row names supplied are of the wrong length")
+#: R/dataframe.R:0
+msgid "row names supplied are of the wrong length"
+msgstr "dostarczone nazwy wierszy mają niepoprawną długość"
 
-msgid "'x' must inherit from class %s"
-msgstr "argument 'x' musi dziedziczyć z klasy %s"
+#. R/dataframe.R: warning("row names were found from a short variable and have been discarded")
+#: R/dataframe.R:0
+msgid "row names were found from a short variable and have been discarded"
+msgstr ""
+"nazwy wierszy zostały znalezione z krótkiej zmiennej i zostały odrzucone"
 
-msgid "cannot coerce to a table"
-msgstr "nie można przekształcić w tabelę"
+#. R/New-Internal.R: stop("second argument must be a list")
+#: R/New-Internal.R:0
+msgid "second argument must be a list"
+msgstr "drugi argument musi być listą"
 
-msgid "'x' is not an array"
-msgstr "argument 'x' nie jest tablicÄ…"
+#. R/datetime.R: stop("second argument of / cannot be a \"difftime\" object")
+#: R/datetime.R:0
+msgid "second argument of / cannot be a \"difftime\" object"
+msgstr "drugi argument operatora '/' nie może być obiektem klasy \"difftime\""
 
-msgid "'bin' must be numeric or a factor"
-msgstr "argument 'bin' musi być liczbą lub czynnikiem"
+#. R/unix/system.unix.R: warning("setting stdout = TRUE")
+#: R/unix/system.unix.R:0
+msgid "setting stdout = TRUE"
+msgstr "ustawianie 'stdout = TRUE'"
 
-msgid "invalid value of 'nbins'"
-msgstr "niepoprawna wartość 'nbins'"
+#. R/library.R: gettextf("shared object %s not found", sQuote(chname1))
+#: R/library.R:0
+msgid "shared object %s not found"
+msgstr "współdzielony obiekt %s nie został znaleziony"
 
-msgid "'INDEX' is of length zero"
-msgstr "argument 'INDEX' ma zerową długość"
+#. R/library.R: gettextf("shared object %s was not loaded", sQuote(chname1))
+#: R/library.R:0
+msgid "shared object %s was not loaded"
+msgstr "współdzielony obiekt %s nie został załadowany"
 
-msgid "arguments must have same length"
-msgstr "argumenty muszą mieć tę samą długość"
+#. R/library.R: gettextf("shared object '%s' already loaded", sQuote(chname1))
+#: R/library.R:0
+msgid "shared object '%s' already loaded"
+msgstr "współdzielony obiekt '%s' jest już załadowany"
 
-msgid "handler must be a function"
-msgstr "przewodnik musi być funkcją"
+#. R/library.R: gettextf("shared object '%s' not found", sQuote(chname1))
+#: R/library.R:0
+msgid "shared object '%s' not found"
+msgstr "współdzielony obiekt '%s' nie został znaleziony"
 
-msgid "no such element '%s'"
-msgstr "nie ma elementu '%s'"
+#. R/solve.R: stop("singular matrix 'a' in 'solve'")
+#: R/solve.R:0
+msgid "singular matrix 'a' in 'solve'"
+msgstr "osobliwa macierz 'a' w 'solve()'"
 
-msgid "Removing %s"
-msgstr "Usuwanie %s"
+#. R/solve.R: stop("singular matrix 'a' in solve")
+#: R/solve.R:0
+msgid "singular matrix 'a' in solve"
+msgstr "osobliwa macierz 'a' w 'solve()'"
 
-msgid "Registering 'evaluate' as low-level callback"
-msgstr "Rejestrowanie 'evaluate' jako wywołania zwrotnego niskiego poziomu"
+#. R/solve.R: warning("solve.default called with a \"qr\" object: use 'qr.solve'")
+#: R/solve.R:0
+msgid "solve.default called with a \"qr\" object: use 'qr.solve'"
+msgstr ""
+"'solve.default' zostało wywołane z obiektem \"qr\": używanie 'qr.solve'"
 
-msgid "user"
-msgstr "użytkownik"
+#. R/dataframe.R: gettextf("some row.names duplicated: %s --> row.names NOT used",     paste(which(duplicated(new)), collapse = ","))
+#: R/dataframe.R:0
+msgid "some row.names duplicated: %s --> row.names NOT used"
+msgstr ""
+"niektóre wartości 'row.names' są powtórzone: %s --> nazwy wierszy nie "
+"zostały użyte"
 
+#. R/time.R: gettext("system")
+#: R/time.R:0
 msgid "system"
 msgstr "system"
 
-msgid "elapsed"
-msgstr "upłynęło"
+#. R/all.equal.R: gettextf("target is %s, current is %s", data.class(target), data.class(current))
+#: R/all.equal.R:0
+msgid "target is %s, current is %s"
+msgstr "cel: %s, bieżące: %s"
 
-msgid "'width' must be positive"
-msgstr "argument 'width' musi być dodatni"
+#. R/match.R: stop("there is more than one match in 'match.arg'")
+#: R/match.R:0
+msgid "there is more than one match in 'match.arg'"
+msgstr "jest więcej niż jedno dopasowanie w funkcji 'match.arg()'"
 
-msgid "No traceback available"
-msgstr "Åšledzenie nie jest dostepne"
+#. R/library.R: gettextf("there is no package called %s", sQuote(package))
+#. R/library.R: gettextf("there is no package called %s", sQuote(pkg))
+#. R/library.R: gettextf("there is no package called %s", sQuote(pkg))
+#. R/namespace.R: gettextf("there is no package called %s", sQuote(package))
+#: R/library.R:0 R/namespace.R:0
+msgid "there is no package called %s"
+msgstr "nie ma pakietu o nazwie %s"
 
-msgid "invalid version specification %s"
-msgstr "niepoprawne określenie wersji %s"
+#. R/solve.R: stop("this is the \"qr\" method for the generic function solve()")
+#: R/solve.R:0
+msgid "this is the \"qr\" method for the generic function solve()"
+msgstr "to jest metoda \"qr\" dla ogólnej funkcji 'solve()'"
 
-msgid "invalid 'value'"
-msgstr "niepoprawna wartość 'value'"
+#. R/qr.R: stop("too large a matrix for LINPACK")
+#: R/qr.R:0
+msgid "too large a matrix for LINPACK"
+msgstr "macierz jest zbyt duża dla LINPACK"
 
-msgid "unary '%s' not defined for \"numeric_version\" objects"
+#. R/seq.R: stop("too many arguments")
+#: R/seq.R:0
+msgid "too many arguments"
+msgstr "zbyć dużo argumentów"
+
+#. R/tapply.R: stop("total number of levels >= 2^31")
+#: R/tapply.R:0
+msgid "total number of levels >= 2^31"
+msgstr "całkowita liczba poziomów jest >= 2^31"
+
+#. R/methodsSupport.R: stop("tracing functions requires the 'methods' package, but unable to load the 'methods' namespace")
+#: R/methodsSupport.R:0
+msgid ""
+"tracing functions requires the 'methods' package, but unable to load the "
+"'methods' namespace"
 msgstr ""
-"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy "
-"\"numeric_version\""
+"funkcjonalność śledzenia funkcji wymaga pakietu 'methods', ale nie można "
+"załadować przestrzeni nazw 'methods'"
 
-msgid "'%s' not defined for \"numeric_version\" objects"
-msgstr "'%s' nie jest określone dla obiektów klasy \"numeric_version\""
+#. R/kappa.R: stop("triangular matrix should be square")
+#: R/kappa.R:0
+msgid "triangular matrix should be square"
+msgstr "macierz trójkątna powinna mieć równą liczbę wierszy i kolumn"
 
-msgid "%s not defined for \"numeric_version\" objects"
-msgstr "'%s' nie jest określone dla obiektów klasy \"numeric_version\""
+#. R/mean.R: stop("trimmed means are not defined for complex data")
+#: R/mean.R:0
+msgid "trimmed means are not defined for complex data"
+msgstr "przycięte średnie nie są zdefiniowane dla danych złożonych"
 
-msgid "<0 elements>"
-msgstr "<0 elementów>"
+#. R/source.R: stop("unable to find a plausible encoding")
+#: R/source.R:0
+msgid "unable to find a plausible encoding"
+msgstr "nie można znaleźć wiarygodnego kodowania"
 
-msgid "invalid 'digits'"
-msgstr "niepoprawna wartość 'digits'"
+#. R/namespace.R: gettextf("unable to load R code in package %s", sQuote(package))
+#: R/namespace.R:0
+msgid "unable to load R code in package %s"
+msgstr "nie można załadować kodu R w pakiecie %s"
 
-msgid ""
-"arguments 'show.output.on.console', 'minimized' and 'invisible' are for "
-"Windows only"
+#. R/dates.R: gettextf("unary %s not defined for \"Date\" objects", .Generic)
+#: R/dates.R:0
+msgid "unary %s not defined for \"Date\" objects"
 msgstr ""
-"argumenty 'show.output.on.console', 'minimized' oraz 'invisible' sÄ… tylko "
-"dla systemu Windows"
+"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy \"Date\""
 
-msgid "'intern' must be TRUE or FALSE"
-msgstr "argument 'intern' musi mieć wartość TRUE lub FALSE"
+#. R/datetime.R: gettextf("unary '%s' not defined for \"POSIXt\" objects", .Generic)
+#: R/datetime.R:0
+msgid "unary '%s' not defined for \"POSIXt\" objects"
+msgstr ""
+"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy \"POSIXt"
+"\""
 
-msgid "'ignore.stdout' must be TRUE or FALSE"
-msgstr "argument 'ignore.stdout' musi mieć wartość TRUE lub FALSE"
+#. R/datetime.R: gettextf("unary '%s' not defined for \"difftime\" objects", .Generic)
+#: R/datetime.R:0
+msgid "unary '%s' not defined for \"difftime\" objects"
+msgstr ""
+"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy "
+"\"difftime\""
 
-msgid "'ignore.stderr' must be TRUE or FALSE"
-msgstr "argument 'ignore.stderr' musi mieć wartość TRUE lub FALSE"
+#. R/version.R: gettextf("unary '%s' not defined for \"numeric_version\" objects",     .Generic)
+#: R/version.R:0
+msgid "unary '%s' not defined for \"numeric_version\" objects"
+msgstr ""
+"jednoargumentowy operator '%s' nie jest określony dla obiektów klasy "
+"\"numeric_version\""
 
-msgid "'wait' must be TRUE or FALSE"
-msgstr "argument 'wait' musi mieć wartość TRUE lub FALSE"
+#. R/datetime.R: stop("unary '-' is not defined for \"POSIXt\" objects")
+#: R/datetime.R:0
+msgid "unary '-' is not defined for \"POSIXt\" objects"
+msgstr ""
+"jednoargumentowy operator '-' nie jest określony dla obiektów klasy \"POSIXt"
+"\""
 
-msgid "'input' must be a character vector or 'NULL'"
-msgstr "argument 'input' musi być wektorem tekstowym lub wartością 'NULL'"
+#. R/dates.R: stop("unary - is not defined for \"Date\" objects")
+#: R/dates.R:0
+msgid "unary - is not defined for \"Date\" objects"
+msgstr ""
+"jednoargumentowy operator '-' nie jest określony dla obiektów klasy \"Date\""
 
-msgid "arguments 'minimized' and 'invisible' are for Windows only"
-msgstr "argumenty 'minimized' oraz 'invisible' sÄ… tylko dla systemu Windows"
+#. R/dataframe.R: stop("undefined columns selected")
+#. R/dataframe.R: stop("undefined columns selected")
+#. R/dataframe.R: stop("undefined columns selected")
+#. R/dataframe.R: stop("undefined columns selected")
+#. R/dataframe.R: stop("undefined columns selected")
+#: R/dataframe.R:0
+msgid "undefined columns selected"
+msgstr "nie wybrano kolumn"
 
-msgid "setting stdout = TRUE"
-msgstr "ustawianie 'stdout = TRUE'"
+#. R/namespace.R: gettextf("undefined exports: %s", undef)
+#: R/namespace.R:0
+msgid "undefined exports: %s"
+msgstr "niezdefiniowane eksporty: %s"
 
-msgid "'stdout' must be of length 1"
-msgstr "'stdout' musi mieć długość 1"
+#. R/grep.R: warning("unknown cost components ignored")
+#: R/grep.R:0
+msgid "unknown cost components ignored"
+msgstr "nieznane komponenty kosztowe zostały zignorowane"
 
-msgid "'stderr' must be of length 1"
-msgstr "'stderr' musi mieć długość 1"
+#. R/grep.R: warning("unknown match distance components ignored")
+#: R/grep.R:0
+msgid "unknown match distance components ignored"
+msgstr "nieznane komponenty o dopasowanej odległości zostały zignorowane"
 
-msgid "'which' was not found on this platform"
-msgstr "'which' nie zostało znalezione na tej platformie"
+#. R/namespace.R: gettextf("unknown namespace directive: %s", deparse(e, nlines = 1L))
+#: R/namespace.R:0
+msgid "unknown namespace directive: %s"
+msgstr "nieznana dyrektywa przestrzeni nazw: %s"
 
-msgid "fewer 'from' files than 'to' files"
-msgstr "mniej plików 'from' niż plików 'to'"
+#. R/dataframe.R: stop("unsupported matrix index in replacement")
+#: R/dataframe.R:0
+msgid "unsupported matrix index in replacement"
+msgstr "niedozwolony indeks macierzy w zamianie"
 
-msgid "link '%s' already exists"
-msgstr "połączenie '%s' już istnieje"
+#. R/sort.R: stop("unsupported options for partial sorting")
+#: R/sort.R:0
+msgid "unsupported options for partial sorting"
+msgstr "niewspierane opcje dla częściowego sortowania"
 
-msgid "failed to create directory for link '%s"
-msgstr "nie udało się utworzyć katalogu dla łącza '%s"
+#. R/time.R: gettext("user")
+#: R/time.R:0
+msgid "user"
+msgstr "użytkownik"
 
-msgid "'show.output.on.console' must be TRUE or FALSE"
-msgstr "argument 'show.output.on.console' musi mieć wartość TRUE lub FALSE"
+#. R/outer.R: stop("using ... with FUN = \"*\" is an error")
+#: R/outer.R:0
+msgid "using ... with FUN = \"*\" is an error"
+msgstr "używanie '...' z FUN = \"*\" jest błędem"
 
-msgid "'minimized' must be TRUE or FALSE"
-msgstr "argument 'minimized' musi mieć wartość TRUE lub FALSE"
+#. R/formals.R: warning("using the first element of 'value' of type \"expression\"")
+#: R/formals.R:0
+msgid "using the first element of 'value' of type \"expression\""
+msgstr "używanie pierwszego elementu 'value' typu \"expression\""
 
-msgid "'invisible' must be TRUE or FALSE"
-msgstr "argument 'invisible' musi mieć wartość TRUE lub FALSE"
+#. R/grep.R: stop("value does not provide any replacement values")
+#: R/grep.R:0
+msgid "value does not provide any replacement values"
+msgstr "wartości nie dostarczają żadnych wartości zamian"
 
-msgid "'%s' could not be run"
-msgstr "'%s' nie mogło zostać uruchomione"
+#. R/get.R: gettextf("value for %s not found", sQuote(x))
+#: R/get.R:0
+msgid "value for %s not found"
+msgstr "wartość dla %s nie została znaleziona"
 
-msgid "'%s' execution failed with error code %d"
-msgstr "wykonywanie '%s' nie powiodło się zwracając kod błędu %d"
+#. R/library.R: gettextf("version %s of %s masked by %s in %s", versions[which(sufficient)[1L]],     sQuote(pkg), current, lib.loc[iV[!sufficient][1L]])
+#: R/library.R:0
+msgid "version %s of %s masked by %s in %s"
+msgstr "wersja %s pakietu %s zakryta przez wersjÄ™ %s w %s"
 
-msgid "-l option without value"
-msgstr "opcja -l bez wartości"
+#. R/datetime.R: stop("wrong class")
+#. R/datetime.R: stop("wrong class")
+#. R/library.R: stop("wrong class")
+#. R/version.R: stop("wrong class")
+#: R/datetime.R:0 R/library.R:0 R/version.R:0
+msgid "wrong class"
+msgstr "błędna klasa"
 
-msgid "ERROR: no packages specified"
-msgstr "B�ĄD: nie określono pakietów"
+#. R/seq.R: stop("wrong sign in 'by' argument")
+#: R/seq.R:0
+msgid "wrong sign in 'by' argument"
+msgstr "błędny znak w argumencie 'by'"
 
-msgid "Removing from library"
-msgstr "Usuwanie z biblioteki"
+#. R/dataframe.R: ngettext(nrowv, "%d row in value to replace %d rows", "%d rows in value to replace %d rows")
+#: R/dataframe.R:0
+msgid "%d row in value to replace %d rows"
+msgid_plural "%d rows in value to replace %d rows"
+msgstr[0] "%d wiersz w wartości do zastąpienia %d wierszy"
+msgstr[1] "%d wiersze w wartości do zastąpienia %d wierszy"
+msgstr[2] "%d wierszy w wartości do zastąpienia %d wierszy"
+
+#. R/stop.R: ngettext(length(r), "%s is not TRUE", "%s are not all TRUE")
+#: R/stop.R:0
+msgid "%s is not TRUE"
+msgid_plural "%s are not all TRUE"
+msgstr[0] "zmienna %s nie ma wartości TRUE"
+msgstr[1] "nie wszystkie zmienne %s mają wartość TRUE"
+msgstr[2] "nie wszystkie zmienne %s mają wartość TRUE"
+
+#. R/merge.R: ngettext(sum(bad), "'by' must specify a uniquely valid column",     "'by' must specify uniquely valid columns")
+#. R/merge.R: ngettext(sum(bad), "'by' must specify a uniquely valid column",     "'by' must specify uniquely valid columns")
+#: R/merge.R:0
+msgid "'by' must specify a uniquely valid column"
+msgid_plural "'by' must specify uniquely valid columns"
+msgstr[0] "argument 'by' musi jednoznacznie określać poprawną kolumnę"
+msgstr[1] "argument 'by' musi jednoznacznie określać poprawne kolumny"
+msgstr[2] "argument 'by' musi jednoznacznie określać poprawne kolumny"
 
-msgid "ERROR: cannot cd to directory"
-msgstr "B�ĄD: nie można wejść do katalogu"
+#. R/namespace.R: ngettext(length(bad), "Function found when exporting methods from the namespace %s which is not S4 generic: %s",     "Functions found when exporting methods from the namespace %s which are not S4 generic: %s")
+#: R/namespace.R:0
+msgid ""
+"Function found when exporting methods from the namespace %s which is not S4 "
+"generic: %s"
+msgid_plural ""
+"Functions found when exporting methods from the namespace %s which are not "
+"S4 generic: %s"
+msgstr[0] ""
+"Funkcja została znaleziona podczas eksportowania metod z przestrzeni nazw %s "
+"która nie jest ogólną S4: %s"
+msgstr[1] ""
+"Funkcje zostały znalezione podczas eksportowania metod z przestrzeni nazw %s "
+"która nie są ogólnymi S4: %s"
+msgstr[2] ""
+"Funkcje zostały znalezione podczas eksportowania metod z przestrzeni nazw %s "
+"która nie są ogólnymi S4: %s"
 
-msgid "ERROR: no permission to remove from directory"
-msgstr "B�ĄD: brak uprawnień aby usunąć z katalogu"
+#. R/warnings.R: ngettext(nx, "In %s :\n extra argument %s will be disregarded",     "In %s :\n extra arguments %s will be disregarded")
+#: R/warnings.R:0
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] ""
+"W poleceniu '%s':\n"
+" dodatkowy argument %s zostanie odrzucony"
+msgstr[1] ""
+"W poleceniu '%s':\n"
+" dodatkowe argumenty %s zostanÄ… odrzucone"
+msgstr[2] ""
+"W poleceniu '%s':\n"
+" dodatkowe argumenty %s zostanÄ… odrzucone"
 
-msgid "deparse option %s is not recognized"
-msgid_plural "deparse options %s are not recognized"
-msgstr[0] "opcja odwrotnego parsowania %s nie jest rozpoznana"
-msgstr[1] "opcje odwrotnego parsowania %s nie sÄ… rozpoznane"
-msgstr[2] "opcje odwrotnego parsowania %s nie sÄ… rozpoznane"
+#. R/namespace.R: ngettext(sum(notex), "S3 method %s was declared in NAMESPACE but not found",     "S3 methods %s were declared in NAMESPACE but not found")
+#: R/namespace.R:0
+msgid "S3 method %s was declared in NAMESPACE but not found"
+msgid_plural "S3 methods %s were declared in NAMESPACE but not found"
+msgstr[0] ""
+"Metoda S3 %s została zadeklarowana w pliku 'NAMESPACE', ale nie została "
+"znaleziona"
+msgstr[1] ""
+"Metody S3 %s zostały zadeklarowane w pliku 'NAMESPACE', ale nie zostały "
+"znalezione"
+msgstr[2] ""
+"Metody S3 %s zostały zadeklarowane w pliku 'NAMESPACE', ale nie zostały "
+"znalezione"
 
+#. R/attach.R: ngettext(length(same), "The following object is masked _by_ %s:\n\n%s\n",     "The following objects are masked _by_ %s:\n\n%s\n")
+#: R/attach.R:0
 msgid ""
 "The following object is masked _by_ %s:\n"
 "\n"
@@ -1648,6 +2897,8 @@
 "\n"
 "%s\n"
 
+#. R/attach.R: ngettext(length(same), "The following object is masked from %s:\n\n%s\n",     "The following objects are masked from %s:\n\n%s\n")
+#: R/attach.R:0
 msgid ""
 "The following object is masked from %s:\n"
 "\n"
@@ -1669,169 +2920,187 @@
 "\n"
 "%s\n"
 
-msgid "invalid 'row.names', length %d for a data frame with %d row"
-msgid_plural "invalid 'row.names', length %d for a data frame with %d rows"
-msgstr[0] "niepoprawny 'row.names', długość %d dla ramki danych z %d wierszem"
-msgstr[1] "niepoprawny 'row.names', długość %d dla ramki danych z %d wierszami"
-msgstr[2] "niepoprawny 'row.names', długość %d dla ramki danych z %d wierszami"
-
-msgid "supplied %d row name for %d rows"
-msgid_plural "supplied %d row names for %d rows"
-msgstr[0] "dostarczono %d nazwÄ™ wierszy dla %d wierszy"
-msgstr[1] "dostarczono %d nazwy wierszy dla %d wierszy"
-msgstr[2] "dostarczono %d nazw wierszy dla %d wierszy"
-
-msgid "replacement has %d row, data has %d"
-msgid_plural "replacement has %d rows, data has %d"
-msgstr[0] "zamiana ma %d wiersz, dane majÄ… %d"
-msgstr[1] "zamiana ma %d wiersze, dane majÄ… %d"
-msgstr[2] "zamiana ma %d wierszy, dane majÄ… %d"
-
-msgid "replacement has %d item, need %d"
-msgid_plural "replacement has %d items, need %d"
-msgstr[0] "zamiana ma %d pozycjÄ™, potrzeba %d"
-msgstr[1] "zamiana ma %d pozycje, potrzeba %d"
-msgstr[2] "zamiana ma %d pozycji, potrzeba %d"
-
-msgid "replacement element %d is a matrix/data frame of %d row, need %d"
-msgid_plural ""
-"replacement element %d is a matrix/data frame of %d rows, need %d"
-msgstr[0] ""
-"element zamiany %d jest macierzÄ…/ramkÄ… danych o %d wierszu, potrzeba %d"
-msgstr[1] ""
-"element zamiany %d jest macierzÄ…/ramkÄ… danych o %d wierszach, potrzeba %d"
-msgstr[2] ""
-"element zamiany %d jest macierzÄ…/ramkÄ… danych o %d wierszach, potrzeba %d"
-
-msgid "replacement element %d has %d row, need %d"
-msgid_plural "replacement element %d has %d rows, need %d"
-msgstr[0] "element zamiany %d posiada %d wiersz, potrzeba %d"
-msgstr[1] "element zamiany %d posiada %d wiersze, potrzeba %d"
-msgstr[2] "element zamiany %d posiada %d wierszy, potrzeba %d"
-
-msgid "replacement element %d has %d row to replace %d rows"
-msgid_plural "replacement element %d has %d rows to replace %d rows"
-msgstr[0] "element zamiany %d posiada %d wiersz do zastÄ…pienia %d wierszy"
-msgstr[1] "element zamiany %d posiada %d wiersze do zastÄ…pienia %d wierszy"
-msgstr[2] "element zamiany %d posiada %d wierszy do zastÄ…pienia %d wierszy"
-
-msgid "%d row in value to replace %d rows"
-msgid_plural "%d rows in value to replace %d rows"
-msgstr[0] "%d wiersz w wartości do zastąpienia %d wierszy"
-msgstr[1] "%d wiersze w wartości do zastąpienia %d wierszy"
-msgstr[2] "%d wierszy w wartości do zastąpienia %d wierszy"
-
-msgid "replacement data has %d row to replace %d rows"
-msgid_plural "replacement data has %d rows to replace %d rows"
-msgstr[0] "zamienne dane posiadajÄ… %d wiersz do zastÄ…pienia %d wierszy"
-msgstr[1] "zamienne dane posiadajÄ… %d wiersze do zastÄ…pienia %d wierszy"
-msgstr[2] "zamienne dane posiadajÄ… %d wierszy do zastÄ…pienia %d wierszy"
+#. R/warnings.R: ngettext(n, "Warning message:\n", "Warning messages:\n")
+#: R/warnings.R:0
+msgid "Warning message:\n"
+msgid_plural "Warning messages:\n"
+msgstr[0] "Komunikat ostrzegawczy:\n"
+msgstr[1] "Komunikaty ostrzegawcze:\n"
+msgstr[2] "Komunikaty ostrzegawcze:\n"
 
-msgid "provided %d variable to replace %d variables"
-msgid_plural "provided %d variables to replace %d variables"
-msgstr[0] "dostarczono %d zmiennÄ… do zastÄ…pienia %d zmiennych"
-msgstr[1] "dostarczono %d zmienne do zastÄ…pienia %d zmiennych"
-msgstr[2] "dostarczono %d zmiennych do zastÄ…pienia %d zmiennych"
+#. R/namespace.R: ngettext(length(miss), "class %s is not exported by 'namespace:%s'",     "classes %s are not exported by 'namespace:%s'")
+#: R/namespace.R:0
+msgid "class %s is not exported by 'namespace:%s'"
+msgid_plural "classes %s are not exported by 'namespace:%s'"
+msgstr[0] "klasa %s nie jest wyeksportowana przez 'namespace:%s'"
+msgstr[1] "klasy %s nie sÄ… wyeksportowane przez 'namespace:%s'"
+msgstr[2] "klasy %s nie sÄ… wyeksportowane przez 'namespace:%s'"
 
+#. R/dataframe.R: ngettext(n, "data frame with 0 columns and %d row", "data frame with 0 columns and %d rows")
+#: R/dataframe.R:0
 msgid "data frame with 0 columns and %d row"
 msgid_plural "data frame with 0 columns and %d rows"
 msgstr[0] "ramka danych z zerowÄ… liczbÄ… kolumn oraz %d wierszem"
 msgstr[1] "ramka danych z zerowÄ… liczbÄ… kolumn oraz %d wierszami"
 msgstr[2] "ramka danych z zerowÄ… liczbÄ… kolumn oraz %d wierszami"
 
+#. R/New-Internal.R: ngettext(as.integer(sum(is.na(opts))), "deparse option %s is not recognized",     "deparse options %s are not recognized")
+#: R/New-Internal.R:0
+msgid "deparse option %s is not recognized"
+msgid_plural "deparse options %s are not recognized"
+msgstr[0] "opcja odwrotnego parsowania %s nie jest rozpoznana"
+msgstr[1] "opcje odwrotnego parsowania %s nie sÄ… rozpoznane"
+msgstr[2] "opcje odwrotnego parsowania %s nie sÄ… rozpoznane"
+
+#. R/dataframe.R: ngettext(nr, "invalid 'row.names', length %d for a data frame with %d row",     "invalid 'row.names', length %d for a data frame with %d rows")
+#: R/dataframe.R:0
+msgid "invalid 'row.names', length %d for a data frame with %d row"
+msgid_plural "invalid 'row.names', length %d for a data frame with %d rows"
+msgstr[0] "niepoprawny 'row.names', długość %d dla ramki danych z %d wierszem"
+msgstr[1] "niepoprawny 'row.names', długość %d dla ramki danych z %d wierszami"
+msgstr[2] "niepoprawny 'row.names', długość %d dla ramki danych z %d wierszami"
+
+#. R/library.R: ngettext(length(nopkgs), "library %s contains no packages", "libraries %s contain no packages")
+#: R/library.R:0
 msgid "library %s contains no packages"
 msgid_plural "libraries %s contain no packages"
 msgstr[0] "biblioteka %s nie zawiera pakietów"
 msgstr[1] "biblioteki %s nie zawierają pakietów"
 msgstr[2] "biblioteki %s nie zawierają pakietów"
 
-msgid "package %s is not loaded"
-msgid_plural "packages %s are not loaded"
-msgstr[0] "pakiet %s nie jest załadowany"
-msgstr[1] "pakiety %s nie są załadowane"
-msgstr[2] "pakiety %s nie są załadowane"
-
-msgid "there is no package called"
-msgid_plural "there are no packages called"
-msgstr[0] "nie ma pakietu o nazwie"
-msgstr[1] "nie ma pakietów o nazwach"
-msgstr[2] "nie ma pakietów o nazwach"
+#. R/namespace.R: ngettext(length(miss), "object %s is not exported by 'namespace:%s'",     "objects %s are not exported by 'namespace:%s'")
+#: R/namespace.R:0
+msgid "object %s is not exported by 'namespace:%s'"
+msgid_plural "objects %s are not exported by 'namespace:%s'"
+msgstr[0] "obiekt %s nie jest eksportowany przez 'namespace:%s'"
+msgstr[1] "obiekty %s nie sÄ… eksportowane przez 'namespace:%s'"
+msgstr[2] "obiekty %s nie sÄ… eksportowane przez 'namespace:%s'"
 
+#. R/load.R: ngettext(n, "object %s not found", "objects %s not found")
+#: R/load.R:0
 msgid "object %s not found"
 msgid_plural "objects %s not found"
 msgstr[0] "nie znaleziono obiektu %s"
 msgstr[1] "nie znaleziono obiektów %s"
 msgstr[2] "nie znaleziono obiektów %s"
 
-msgid "'by' must specify a uniquely valid column"
-msgid_plural "'by' must specify uniquely valid columns"
-msgstr[0] "argument 'by' musi jednoznacznie określać poprawną kolumnę"
-msgstr[1] "argument 'by' musi jednoznacznie określać poprawne kolumny"
-msgstr[2] "argument 'by' musi jednoznacznie określać poprawne kolumny"
-
-msgid ""
-"Function found when exporting methods from the namespace %s which is not S4 "
-"generic: %s"
-msgid_plural ""
-"Functions found when exporting methods from the namespace %s which are not "
-"S4 generic: %s"
-msgstr[0] ""
-"Funkcja została znaleziona podczas eksportowania metod z przestrzeni nazw %s "
-"która nie jest ogólną S4: %s"
-msgstr[1] ""
-"Funkcje zostały znalezione podczas eksportowania metod z przestrzeni nazw %s "
-"która nie są ogólnymi S4: %s"
-msgstr[2] ""
-"Funkcje zostały znalezione podczas eksportowania metod z przestrzeni nazw %s "
-"która nie są ogólnymi S4: %s"
-
-msgid "class %s is not exported by 'namespace:%s'"
-msgid_plural "classes %s are not exported by 'namespace:%s'"
-msgstr[0] "klasa %s nie jest wyeksportowana przez 'namespace:%s'"
-msgstr[1] "klasy %s nie sÄ… wyeksportowane przez 'namespace:%s'"
-msgstr[2] "klasy %s nie sÄ… wyeksportowane przez 'namespace:%s'"
-
-msgid "object %s is not exported by 'namespace:%s'"
-msgid_plural "objects %s are not exported by 'namespace:%s'"
-msgstr[0] "obiekt %s nie jest eksportowany przez 'namespace:%s'"
-msgstr[1] "obiekty %s nie sÄ… eksportowane przez 'namespace:%s'"
-msgstr[2] "obiekty %s nie sÄ… eksportowane przez 'namespace:%s'"
+#. R/library.R: ngettext(as.integer(sum(m)), "package %s is not loaded", "packages %s are not loaded")
+#: R/library.R:0
+msgid "package %s is not loaded"
+msgid_plural "packages %s are not loaded"
+msgstr[0] "pakiet %s nie jest załadowany"
+msgstr[1] "pakiety %s nie są załadowane"
+msgstr[2] "pakiety %s nie są załadowane"
 
+#. R/namespace.R: ngettext(sum(ex), "previous export '%s' is being replaced", "previous exports '%s' are being replaced")
+#: R/namespace.R:0
 msgid "previous export '%s' is being replaced"
 msgid_plural "previous exports '%s' are being replaced"
 msgstr[0] "poprzedni eksport '%s' jest zastępowany"
 msgstr[1] "poprzednie eksporty '%s' są zastępowane"
 msgstr[2] "poprzednie eksporty '%s' są zastępowane"
 
-msgid "S3 method %s was declared in NAMESPACE but not found"
-msgid_plural "S3 methods %s were declared in NAMESPACE but not found"
+#. R/dataframe.R: ngettext(ncolv, "provided %d variable to replace %d variables",     "provided %d variables to replace %d variables")
+#: R/dataframe.R:0
+msgid "provided %d variable to replace %d variables"
+msgid_plural "provided %d variables to replace %d variables"
+msgstr[0] "dostarczono %d zmiennÄ… do zastÄ…pienia %d zmiennych"
+msgstr[1] "dostarczono %d zmienne do zastÄ…pienia %d zmiennych"
+msgstr[2] "dostarczono %d zmiennych do zastÄ…pienia %d zmiennych"
+
+#. R/dataframe.R: ngettext(nrowv, "replacement data has %d row to replace %d rows",     "replacement data has %d rows to replace %d rows")
+#: R/dataframe.R:0
+msgid "replacement data has %d row to replace %d rows"
+msgid_plural "replacement data has %d rows to replace %d rows"
+msgstr[0] "zamienne dane posiadajÄ… %d wiersz do zastÄ…pienia %d wierszy"
+msgstr[1] "zamienne dane posiadajÄ… %d wiersze do zastÄ…pienia %d wierszy"
+msgstr[2] "zamienne dane posiadajÄ… %d wierszy do zastÄ…pienia %d wierszy"
+
+#. R/dataframe.R: ngettext(N, "replacement element %d has %d row to replace %d rows",     "replacement element %d has %d rows to replace %d rows")
+#: R/dataframe.R:0
+msgid "replacement element %d has %d row to replace %d rows"
+msgid_plural "replacement element %d has %d rows to replace %d rows"
+msgstr[0] "element zamiany %d posiada %d wiersz do zastÄ…pienia %d wierszy"
+msgstr[1] "element zamiany %d posiada %d wiersze do zastÄ…pienia %d wierszy"
+msgstr[2] "element zamiany %d posiada %d wierszy do zastÄ…pienia %d wierszy"
+
+#. R/dataframe.R: ngettext(N, "replacement element %d has %d row, need %d", "replacement element %d has %d rows, need %d")
+#: R/dataframe.R:0
+msgid "replacement element %d has %d row, need %d"
+msgid_plural "replacement element %d has %d rows, need %d"
+msgstr[0] "element zamiany %d posiada %d wiersz, potrzeba %d"
+msgstr[1] "element zamiany %d posiada %d wiersze, potrzeba %d"
+msgstr[2] "element zamiany %d posiada %d wierszy, potrzeba %d"
+
+#. R/dataframe.R: ngettext(N, "replacement element %d is a matrix/data frame of %d row, need %d",     "replacement element %d is a matrix/data frame of %d rows, need %d")
+#: R/dataframe.R:0
+msgid "replacement element %d is a matrix/data frame of %d row, need %d"
+msgid_plural ""
+"replacement element %d is a matrix/data frame of %d rows, need %d"
 msgstr[0] ""
-"Metoda S3 %s została zadeklarowana w pliku 'NAMESPACE', ale nie została "
-"znaleziona"
+"element zamiany %d jest macierzÄ…/ramkÄ… danych o %d wierszu, potrzeba %d"
 msgstr[1] ""
-"Metody S3 %s zostały zadeklarowane w pliku 'NAMESPACE', ale nie zostały "
-"znalezione"
+"element zamiany %d jest macierzÄ…/ramkÄ… danych o %d wierszach, potrzeba %d"
 msgstr[2] ""
-"Metody S3 %s zostały zadeklarowane w pliku 'NAMESPACE', ale nie zostały "
-"znalezione"
+"element zamiany %d jest macierzÄ…/ramkÄ… danych o %d wierszach, potrzeba %d"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "dodatkowy argument %s zostanie odrzucony"
-msgstr[1] "dodatkowe argumenty %s zostanÄ… odrzucone"
-msgstr[2] "dodatkowe argumenty %s zostanÄ… odrzucone"
+#. R/dataframe.R: ngettext(m, "replacement has %d item, need %d", "replacement has %d items, need %d")
+#: R/dataframe.R:0
+msgid "replacement has %d item, need %d"
+msgid_plural "replacement has %d items, need %d"
+msgstr[0] "zamiana ma %d pozycjÄ™, potrzeba %d"
+msgstr[1] "zamiana ma %d pozycje, potrzeba %d"
+msgstr[2] "zamiana ma %d pozycji, potrzeba %d"
 
-msgid "%s is not TRUE"
-msgid_plural "%s are not all TRUE"
-msgstr[0] "zmienna %s nie ma wartości TRUE"
-msgstr[1] "nie wszystkie zmienne %s mają wartość TRUE"
-msgstr[2] "nie wszystkie zmienne %s mają wartość TRUE"
+#. R/dataframe.R: ngettext(N, "replacement has %d row, data has %d", "replacement has %d rows, data has %d")
+#. R/dataframe.R: ngettext(N, "replacement has %d row, data has %d", "replacement has %d rows, data has %d")
+#. R/dataframe.R: ngettext(N, "replacement has %d row, data has %d", "replacement has %d rows, data has %d")
+#. R/dataframe.R: ngettext(N, "replacement has %d row, data has %d", "replacement has %d rows, data has %d")
+#. R/dataframe.R: ngettext(N, "replacement has %d row, data has %d", "replacement has %d rows, data has %d")
+#. R/dataframe.R: ngettext(N, "replacement has %d row, data has %d", "replacement has %d rows, data has %d")
+#: R/dataframe.R:0
+msgid "replacement has %d row, data has %d"
+msgid_plural "replacement has %d rows, data has %d"
+msgstr[0] "zamiana ma %d wiersz, dane majÄ… %d"
+msgstr[1] "zamiana ma %d wiersze, dane majÄ… %d"
+msgstr[2] "zamiana ma %d wierszy, dane majÄ… %d"
 
-msgid "Warning message:\n"
-msgid_plural "Warning messages:\n"
-msgstr[0] "Komunikat ostrzegawczy:\n"
-msgstr[1] "Komunikaty ostrzegawcze:\n"
-msgstr[2] "Komunikaty ostrzegawcze:\n"
+#. R/dataframe.R: ngettext(length(row.names), "supplied %d row name for %d rows",     "supplied %d row names for %d rows")
+#: R/dataframe.R:0
+msgid "supplied %d row name for %d rows"
+msgid_plural "supplied %d row names for %d rows"
+msgstr[0] "dostarczono %d nazwÄ™ wierszy dla %d wierszy"
+msgstr[1] "dostarczono %d nazwy wierszy dla %d wierszy"
+msgstr[2] "dostarczono %d nazw wierszy dla %d wierszy"
+
+#. R/library.R: ngettext(length(bad), "there is no package called", "there are no packages called")
+#: R/library.R:0
+msgid "there is no package called"
+msgid_plural "there are no packages called"
+msgstr[0] "nie ma pakietu o nazwie"
+msgstr[1] "nie ma pakietów o nazwach"
+msgstr[2] "nie ma pakietów o nazwach"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "FUN"
+#~ msgstr "FUN"
+
+#~ msgid "according to the DESCRIPTION file it is"
+#~ msgstr "zgodnie z opisem w pliku 'DESCRIPTION' jest to"
+
+#~ msgid "package %s has a license that you need to accept:"
+#~ msgstr "pakiet %s posiada licencję, którą musisz zaakceptować:"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "argument 'vec' zawiera wartości NA"
+
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "'method=\"radix\"' jest tylko dla liczb całkowitych 'x'"
 
 #~ msgid "cannot be unloaded."
 #~ msgstr "nie może być zwolniony"
diff -Nru r-base-3.2.3/src/library/base/po/R.pot r-base-3.3.1/src/library/base/po/R.pot
--- r-base-3.2.3/src/library/base/po/R.pot	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R.pot	2016-04-27 22:15:37.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: base 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -124,173 +124,174 @@
 msgid "problem in displaying '%ls'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr ""
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr ""
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr ""
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr ""
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr ""
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr ""
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr ""
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr ""
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr ""
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr ""
 
@@ -331,184 +332,183 @@
 msgid "'names' is not a character vector"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr ""
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr ""
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr ""
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr ""
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr ""
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr ""
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr ""
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr ""
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr ""
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr ""
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr ""
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr ""
 
@@ -606,7 +606,7 @@
 msgid "could not allocate space for 'name'"
 msgstr ""
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr ""
 
@@ -660,7 +660,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr ""
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr ""
@@ -691,9 +691,9 @@
 msgid "invalid multibyte format string"
 msgstr ""
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr ""
@@ -703,7 +703,7 @@
 msgstr ""
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr ""
 
@@ -714,8 +714,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr ""
@@ -723,7 +723,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr ""
@@ -738,7 +738,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr ""
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr ""
@@ -747,29 +747,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr ""
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr ""
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr ""
 
@@ -801,7 +801,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr ""
 
@@ -813,214 +813,214 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr ""
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr ""
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr ""
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr ""
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr ""
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr ""
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr ""
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr ""
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr ""
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr ""
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr ""
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr ""
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr ""
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr ""
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr ""
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr ""
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr ""
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr ""
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr ""
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr ""
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr ""
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr ""
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr ""
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr ""
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr ""
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr ""
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr ""
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr ""
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr ""
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr ""
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr ""
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr ""
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr ""
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr ""
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr ""
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr ""
 
-#: src/main/array.c:1381
-msgid "'X' is too short"
+#: src/main/array.c:1425
+msgid "'x' is too short"
 msgstr ""
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr ""
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr ""
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1083,200 +1083,201 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr ""
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr ""
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr ""
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr ""
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, c-format
+msgid "'%s' must be a list"
 msgstr ""
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr ""
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr ""
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr ""
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr ""
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr ""
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr ""
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr ""
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr ""
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr ""
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr ""
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr ""
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr ""
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr ""
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr ""
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr ""
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr ""
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr ""
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr ""
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr ""
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr ""
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr ""
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr ""
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr ""
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr ""
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr ""
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr ""
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr ""
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr ""
@@ -1285,227 +1286,243 @@
 msgid "vector size cannot be NA"
 msgstr ""
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr ""
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr ""
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr ""
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+msgid "argument is not a function"
+msgstr ""
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr ""
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr ""
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr ""
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 msgid "can not set the parent environment of a namespace"
 msgstr ""
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 msgid "can not set the parent environment of package imports"
 msgstr ""
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr ""
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr ""
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr ""
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr ""
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr ""
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr ""
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr ""
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr ""
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr ""
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr ""
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr ""
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr ""
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr ""
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
 #, c-format
-msgid "invalid multibyte string %d"
+msgid "invalid multibyte string, %s"
 msgstr ""
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr ""
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr ""
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+msgid "non-character object(s)"
+msgstr ""
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr ""
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr ""
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr ""
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr ""
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr ""
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr ""
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr ""
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr ""
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr ""
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr ""
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr ""
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr ""
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr ""
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr ""
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr ""
 
@@ -1517,7 +1534,7 @@
 msgid "applies only to lists and vectors"
 msgstr ""
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr ""
 
@@ -1525,7 +1542,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr ""
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr ""
 
@@ -1533,178 +1550,173 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr ""
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr ""
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr ""
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr ""
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr ""
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr ""
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr ""
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr ""
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr ""
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr ""
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr ""
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr ""
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr ""
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr ""
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr ""
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr ""
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
+#: src/main/coerce.c:2464
+msgid "'what' must be a function or character string"
 msgstr ""
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 msgid "'args' must be a list or expression"
 msgstr ""
 
-#: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr ""
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr ""
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr ""
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr ""
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr ""
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr ""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr ""
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr ""
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr ""
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr ""
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr ""
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr ""
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr ""
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr ""
 
@@ -1716,7 +1728,7 @@
 msgid "connection not found"
 msgstr ""
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr ""
 
@@ -1725,9 +1737,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr ""
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr ""
@@ -1809,8 +1821,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr ""
 
@@ -1838,8 +1850,8 @@
 msgstr ""
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr ""
 
@@ -1849,14 +1861,14 @@
 msgstr ""
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr ""
@@ -1923,7 +1935,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr ""
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr ""
@@ -1943,12 +1955,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr ""
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr ""
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr ""
 
@@ -2051,326 +2063,321 @@
 msgid "'con' is not an output textConnection"
 msgstr ""
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr ""
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr ""
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr ""
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr ""
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr ""
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr ""
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr ""
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr ""
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr ""
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr ""
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr ""
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr ""
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr ""
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr ""
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr ""
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr ""
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr ""
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr ""
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr ""
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr ""
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr ""
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr ""
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr ""
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr ""
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr ""
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr ""
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr ""
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr ""
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr ""
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr ""
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr ""
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr ""
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr ""
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr ""
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr ""
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr ""
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr ""
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr ""
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 msgid "URL scheme unsupported by this method"
 msgstr ""
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr ""
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr ""
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr ""
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr ""
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+msgid "'text' must be TRUE or FALSE"
+msgstr ""
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr ""
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr ""
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr ""
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr ""
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr ""
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr ""
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr ""
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr ""
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr ""
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr ""
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr ""
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr ""
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr ""
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr ""
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr ""
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr ""
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr ""
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr ""
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr ""
 
@@ -2378,37 +2385,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr ""
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr ""
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr ""
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr ""
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr ""
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr ""
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr ""
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr ""
 
@@ -2422,11 +2429,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr ""
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr ""
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr ""
 
@@ -2435,7 +2438,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr ""
 
@@ -2451,58 +2454,58 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr ""
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr ""
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr ""
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr ""
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr ""
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr ""
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr ""
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr ""
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr ""
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr ""
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr ""
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr ""
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr ""
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr ""
 
@@ -2514,15 +2517,15 @@
 msgid "no active or default device"
 msgstr ""
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr ""
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr ""
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr ""
 
@@ -2608,7 +2611,7 @@
 msgid "too many arguments, sorry"
 msgstr ""
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr ""
 
@@ -2759,7 +2762,7 @@
 msgid "invalid argument to edit()"
 msgstr ""
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr ""
 
@@ -2819,12 +2822,12 @@
 msgstr ""
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr ""
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr ""
 
@@ -2853,82 +2856,96 @@
 msgid "raster capture is not available for this device"
 msgstr ""
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr ""
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr ""
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr ""
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr ""
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr ""
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr ""
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr ""
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr ""
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr ""
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 msgid "invalid display list"
 msgstr ""
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr ""
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr ""
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr ""
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr ""
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr ""
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr ""
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr ""
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr ""
 
@@ -2937,7 +2954,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr ""
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr ""
 
@@ -2953,681 +2970,685 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr ""
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr ""
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr ""
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr ""
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr ""
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr ""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr ""
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr ""
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr ""
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr ""
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr ""
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr ""
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr ""
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr ""
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr ""
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr ""
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr ""
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr ""
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr ""
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr ""
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr ""
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr ""
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr ""
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr ""
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr ""
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr ""
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr ""
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr ""
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr ""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr ""
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr ""
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr ""
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr ""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr ""
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr ""
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr ""
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr ""
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr ""
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr ""
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr ""
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr ""
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr ""
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr ""
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr ""
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr ""
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr ""
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr ""
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr ""
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr ""
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr ""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr ""
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 msgid "Warning:"
 msgstr ""
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, c-format
 msgid "Warning in %s :"
 msgstr ""
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr ""
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr ""
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr ""
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, c-format
 msgid "Error in %s : "
 msgstr ""
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr ""
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr ""
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr ""
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr ""
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, c-format
 msgid "'%s' must be a character string"
 msgstr ""
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr ""
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr ""
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr ""
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr ""
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr ""
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr ""
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr ""
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr ""
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr ""
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr ""
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr ""
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr ""
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr ""
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr ""
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr ""
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr ""
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr ""
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr ""
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr ""
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr ""
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr ""
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr ""
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr ""
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr ""
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr ""
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr ""
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr ""
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr ""
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr ""
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr ""
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr ""
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr ""
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr ""
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr ""
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr ""
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr ""
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr ""
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr ""
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr ""
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr ""
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr ""
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr ""
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr ""
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr ""
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr ""
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr ""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr ""
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr ""
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr ""
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr ""
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr ""
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr ""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr ""
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr ""
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr ""
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr ""
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr ""
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr ""
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr ""
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr ""
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr ""
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr ""
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr ""
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr ""
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr ""
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr ""
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr ""
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr ""
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr ""
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr ""
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr ""
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr ""
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr ""
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr ""
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr ""
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr ""
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 msgid "byte code profiling is not supported in this build"
 msgstr ""
 
@@ -3644,15 +3665,15 @@
 msgid "this graphics device does not support event handling"
 msgstr ""
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr ""
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr ""
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr ""
 
@@ -3831,7 +3852,7 @@
 msgstr ""
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr ""
@@ -3919,24 +3940,22 @@
 msgid "internet routines cannot be accessed in module"
 msgstr ""
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
+msgid "socket routines cannot be loaded"
 msgstr ""
 
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
-msgid "socket routines cannot be loaded"
+#: src/main/internet.c:242
+msgid "attempt to close invalid socket"
 msgstr ""
 
 #: src/main/lapack.c:39
@@ -3947,38 +3966,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr ""
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr ""
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr ""
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr ""
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr ""
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr ""
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr ""
@@ -3987,61 +4006,73 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+msgid "error during cleanup\n"
+msgstr ""
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr ""
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr ""
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr ""
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr ""
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr ""
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+msgid "unable to initialize the JIT\n"
+msgstr ""
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr ""
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr ""
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr ""
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr ""
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr ""
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr ""
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr ""
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr ""
 
@@ -4084,164 +4115,169 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr ""
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr ""
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr ""
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr ""
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr ""
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr ""
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr ""
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr ""
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr ""
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr ""
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr ""
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr ""
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr ""
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr ""
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr ""
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr ""
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr ""
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr ""
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr ""
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr ""
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr ""
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr ""
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr ""
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr ""
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr ""
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr ""
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr ""
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ""
 
@@ -4280,221 +4316,225 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr ""
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr ""
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr ""
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr ""
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr ""
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr ""
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr ""
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr ""
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr ""
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ""
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr ""
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr ""
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr ""
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr ""
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr ""
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr ""
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr ""
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr ""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr ""
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr ""
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr ""
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
 "\"set\", or \"suppress\""
 msgstr ""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr ""
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr ""
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr ""
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr ""
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr ""
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr ""
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 msgid "'methods' package not yet loaded"
 msgstr ""
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr ""
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr ""
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr ""
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr ""
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr ""
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr ""
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr ""
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr ""
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr ""
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr ""
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr ""
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+msgid "'OutDec' must be a string of one character"
+msgstr ""
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr ""
 
@@ -4518,11 +4558,15 @@
 msgid "first argument must be atomic"
 msgstr ""
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+msgid "'decimal.mark' must be a string of one character"
+msgstr ""
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr ""
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr ""
 
@@ -4530,209 +4574,192 @@
 msgid "invalid filename specification"
 msgstr ""
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr ""
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr ""
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr ""
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr ""
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr ""
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr ""
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr ""
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr ""
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr ""
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr ""
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr ""
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr ""
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr ""
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr ""
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr ""
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr ""
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr ""
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr ""
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr ""
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr ""
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr ""
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr ""
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 msgid "over-long path"
 msgstr ""
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr ""
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr ""
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr ""
 
@@ -4777,67 +4804,71 @@
 msgid "Metric information not available for this family/device"
 msgstr ""
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr ""
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr ""
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr ""
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ""
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr ""
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr ""
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+msgid "print buffer overflow"
+msgstr ""
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr ""
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr ""
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr ""
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr ""
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr ""
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr ""
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr ""
 
@@ -4845,338 +4876,338 @@
 msgid "argument is not a numeric vector"
 msgstr ""
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr ""
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr ""
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr ""
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 msgid "negative probability"
 msgstr ""
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr ""
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr ""
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr ""
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr ""
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr ""
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr ""
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr ""
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr ""
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr ""
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr ""
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr ""
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr ""
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr ""
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr ""
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr ""
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr ""
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr ""
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr ""
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr ""
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr ""
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr ""
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr ""
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr ""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr ""
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr ""
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr ""
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr ""
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr ""
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr ""
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr ""
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr ""
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr ""
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr ""
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr ""
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr ""
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr ""
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr ""
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr ""
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr ""
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr ""
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr ""
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr ""
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr ""
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr ""
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr ""
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr ""
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5191,7 +5222,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr ""
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr ""
 
@@ -5199,7 +5230,7 @@
 msgid "empty 'what' specified"
 msgstr ""
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr ""
@@ -5232,34 +5263,34 @@
 msgid "embedded nul(s) found in input"
 msgstr ""
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr ""
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr ""
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr ""
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr ""
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr ""
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr ""
@@ -5488,53 +5519,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr ""
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr ""
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr ""
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr ""
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr ""
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr ""
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr ""
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr ""
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr ""
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr ""
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr ""
@@ -5544,23 +5571,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr ""
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr ""
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr ""
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr ""
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr ""
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr ""
 
@@ -5615,38 +5642,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr ""
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr ""
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr ""
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr ""
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr ""
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr ""
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr ""
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr ""
 
@@ -5654,251 +5681,247 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr ""
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr ""
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr ""
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr ""
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr ""
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr ""
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr ""
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr ""
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr ""
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr ""
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr ""
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr ""
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr ""
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr ""
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr ""
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr ""
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr ""
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr ""
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr ""
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr ""
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr ""
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr ""
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, c-format
+msgid "attempt to select less than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, c-format
+msgid "attempt to select more than one element in %s"
 msgstr ""
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr ""
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr ""
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr ""
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr ""
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr ""
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr ""
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr ""
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr ""
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr ""
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr ""
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr ""
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr ""
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr ""
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr ""
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr ""
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr ""
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr ""
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr ""
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr ""
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr ""
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr ""
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr ""
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr ""
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr ""
 
@@ -5911,8 +5934,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr ""
@@ -5945,94 +5968,94 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, c-format
 msgid "system call failed: %s"
 msgstr ""
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr ""
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr ""
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr ""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr ""
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr ""
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr ""
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr ""
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 msgid "internal error: no translation needed"
 msgstr ""
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr ""
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, c-format
 msgid "invalid Unicode point %u"
 msgstr ""
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr ""
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr ""
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr ""
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr ""
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr ""
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr ""
 
@@ -6067,31 +6090,31 @@
 msgid "'nmax' must be positive"
 msgstr ""
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr ""
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr ""
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr ""
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 msgid "... is not a pairlist"
 msgstr ""
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr ""
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr ""
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr ""
 
@@ -6099,142 +6122,142 @@
 msgid "object is not a matrix"
 msgstr ""
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr ""
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr ""
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr ""
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr ""
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr ""
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr ""
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr ""
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr ""
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr ""
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr ""
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr ""
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr ""
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr ""
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr ""
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr ""
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr ""
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr ""
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr ""
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr ""
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr ""
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr ""
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr ""
 
@@ -6283,7 +6306,7 @@
 msgid "There must be at least three control points"
 msgstr ""
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr ""
@@ -6304,210 +6327,216 @@
 "Consider using X11 with colortype=\"pseudo.cube\" or \"gray\"."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
 msgstr ""
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr ""
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr ""
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
+msgstr ""
+
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, c-format
+msgid "scheme not supported in URL '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr ""
 
@@ -6519,29 +6548,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr ""
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr ""
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr ""
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr ""
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr ""
@@ -6551,136 +6580,159 @@
 msgid "cannot open URL '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
+msgstr ""
+
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
+#, c-format
+msgid "InternetOpenUrl failed: '%s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/libcurl.c:159
 #, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+msgid "URL '%s': status was '%d %s'"
 msgstr ""
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/libcurl.c:163
 #, c-format
-msgid "InternetOpenUrl failed: '%s'"
+msgid "URL '%s': status was '%s'"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:240
 msgid "curlGetHeaders is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, c-format
 msgid "invalid %s argument"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:593
+msgid "cannot download all files"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:727
+msgid "cannot read from connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:763
+msgid "cannot open connection"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:826
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr ""
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr ""
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr ""
 
@@ -6911,7 +6963,7 @@
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
 #, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -6919,16 +6971,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr ""
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
 #, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6939,7 +6996,7 @@
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
 #, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -6947,16 +7004,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr ""
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
 #, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr ""
@@ -6966,42 +7028,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr ""
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr ""
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr ""
@@ -7069,7 +7131,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr ""
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr ""
 
@@ -7083,93 +7145,93 @@
 "report using bug.report()"
 msgstr ""
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr ""
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
 "\n"
 msgstr ""
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr ""
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr ""
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr ""
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr ""
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr ""
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr ""
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr ""
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr ""
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr ""
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr ""
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr ""
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr ""
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr ""
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr ""
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/base/po/R-pt_BR.po r-base-3.3.1/src/library/base/po/R-pt_BR.po
--- r-base-3.2.3/src/library/base/po/R-pt_BR.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-pt_BR.po	2016-04-27 22:15:36.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:54-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -232,6 +232,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr "não é possível fazer coerção de classe \"%s\" para um data.frame"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 #, fuzzy
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr "options('stringsAsFactors') não definido como TRUE ou FALSE"
@@ -533,6 +538,15 @@
 "As linhas que não estão no padrão começam com:\n"
 "%s"
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "'x' deve ser uma matriz quadrada"
 
@@ -660,13 +674,15 @@
 msgid "invalid 'time' argument"
 msgstr "argumento 'name' inválido"
 
-msgid "'vec' contains NAs"
-msgstr "'vec' contem NAs"
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr "'vec' deve ser ordenado de forma não-decrescente"
 
 #, fuzzy
+msgid "'fun' is not a function"
+msgstr "manipulador deve ser uma função"
+
+#, fuzzy
 msgid "using the first element of 'value' of type \"expression\""
 msgstr "usando o primeiro elemento de 'value' da expressão de tipo"
 
@@ -693,15 +709,19 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr "data frame corrompido: colunas serão truncadas ou completadas com NAs"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr "'zero.print' tem comprimento > 1"
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr "'zero.print' deve ser caractere, lógico ou NULL"
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr "'input' e 'target' devem ser vetores de caracteres"
+
 msgid "'subset' must be logical"
 msgstr "'subset' deve ser lógico"
 
@@ -800,13 +820,19 @@
 "Pacote '%s' tem uma licença que você precisa aceitar depois de visualizá-la"
 
 #, fuzzy
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr ""
+"Pacote '%s' tem uma licença que você precisa aceitar depois de visualizá-la"
+
+#, fuzzy
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
 "Pacote '%s' tem uma licença que você precisa aceitar:\n"
 "de acordo com o arquivo DESCRIPTION"
 
+msgid "%s"
+msgstr ""
+
 #, fuzzy
 msgid "license for package %s not accepted"
 msgstr "Licença para o pacote '%s' não foi aceita"
@@ -1006,6 +1032,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr "nomes de argumentos formais devem ser especificados para vetorizar"
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ","
+
 msgid "'arg' must be NULL or a character vector"
 msgstr "'arg' deve ser NULL ou um vetor caractere"
 
@@ -1212,6 +1247,10 @@
 msgstr ""
 "métodos encontrados para importar para função %s mas não o genérico em si"
 
+#, fuzzy
+msgid "replacing previous import %s by %s when loading %s"
+msgstr "substituindo importação %s quando carregando %s"
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr ""
 
@@ -1219,8 +1258,8 @@
 msgstr "métodos requeridos não encontrados no ambiente/pacote %s: %s"
 
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 
 #, fuzzy
@@ -1388,6 +1427,10 @@
 msgid "too many arguments"
 msgstr "muitos argumentos"
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "argumento 'name' inválido"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr ""
 
@@ -1425,6 +1468,9 @@
 "'decreasing' deve ser um vetor lógico de comprimento 1.\n"
 "Sua intenção era definir 'partial'?"
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr "'index.return' somente para não fatores"
 
@@ -1455,10 +1501,6 @@
 msgstr "method=\"quick\" somente para 'x' numérico"
 
 #, fuzzy
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "method=\"radix\" somente para 'x' inteiro"
-
-#, fuzzy
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr "'wait' deve ser TRUE ou FALSE"
 
@@ -1512,9 +1554,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr "provavelmente codificação errada no names(.) da coluna"
 
-msgid ","
-msgstr ","
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr "STATS é maior que o comprimento de 'dim(x)[MARGIN]'"
 
@@ -1562,6 +1601,10 @@
 msgid "arguments must have same length"
 msgstr "argumentos devem ter o mesmo comprimento"
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr "número de níveis difere"
+
 msgid "handler must be a function"
 msgstr "manipulador deve ser uma função"
 
@@ -1849,12 +1892,6 @@
 msgstr[1] "métodos S3 %s foram declarados no NAMESPACE mas não encontrados"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "argumento 'drop' será ignorado"
-msgstr[1] "argumento 'drop' será ignorado"
-
-#, fuzzy
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "T usado ao invés de TRUE"
@@ -1866,14 +1903,31 @@
 msgstr[1] "Mensagens de aviso:\n"
 
 #, fuzzy
-#~ msgid "cannot be unloaded."
-#~ msgstr "espaço de nomes não pode ser descarregado"
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] "argumento 'drop' será ignorado"
+msgstr[1] "argumento 'drop' será ignorado"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "'vec' contem NAs"
+
+#, fuzzy
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "method=\"radix\" somente para 'x' inteiro"
 
 #, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr "objeto %s não foi exportado por 'namespace:%s'"
 
 #, fuzzy
+#~ msgid "cannot be unloaded."
+#~ msgstr "espaço de nomes não pode ser descarregado"
+
+#, fuzzy
 #~ msgid "package %s %s was found, but %s %s is required by %s"
 #~ msgstr "pacote '%s' %s foi encontrado, mas %s %s é exigido por '%s'"
 
diff -Nru r-base-3.2.3/src/library/base/po/R-ru.po r-base-3.3.1/src/library/base/po/R-ru.po
--- r-base-3.2.3/src/library/base/po/R-ru.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-ru.po	2016-04-27 22:15:37.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-26 17:58-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:17-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -18,8 +18,7 @@
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgid "'%s' is defunct."
 msgstr "'%s' ÂÏÌØÛÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
@@ -51,9 +50,8 @@
 msgid "a dimension is zero"
 msgstr "ÎÕÌÅ×ÏÅ ÉÚÍÅÒÅÎÉÅ"
 
-#, fuzzy
 msgid "\"hexNumeric\" and \"digits17\" are mutually exclusive"
-msgstr "\"hexNumeric\" É \"digits17\" ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ"
+msgstr "\"hexNumeric\" É \"digits17\" ÎÅÓÏ×ÍÅÓÔÉÍÙ"
 
 msgid "second argument must be a list"
 msgstr "×ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÐÉÓËÏÍ"
@@ -280,10 +278,8 @@
 msgid "need 0, 1, or 2 subscripts"
 msgstr "ÎÕÖÎÙ 0, 1, ÉÌÉ 2 ÉÎÄÅËÓÁ"
 
-msgid ""
-"missing values are not allowed in subscripted assignments of data frames"
-msgstr ""
-"ÐÒÏÐÕÝÅÎÎÙÅ ÚÎÁÞÅÎÉÑ ÎÅ ÒÁÚÒÅÛÅÎÙ × ÉÎÄÅËÓÉÒÏ×ÁÎÎÙÈ ÐÒÉÓ×ÏÅÎÉÑÈ ÔÁÂÌÉà ÄÁÎÎÙÈ"
+msgid "missing values are not allowed in subscripted assignments of data frames"
+msgstr "ÐÒÏÐÕÝÅÎÎÙÅ ÚÎÁÞÅÎÉÑ ÎÅ ÒÁÚÒÅÛÅÎÙ × ÉÎÄÅËÓÉÒÏ×ÁÎÎÙÈ ÐÒÉÓ×ÏÅÎÉÑÈ ÔÁÂÌÉà ÄÁÎÎÙÈ"
 
 msgid "non-existent rows not allowed"
 msgstr "ÎÅÓÕÝÅÓÔ×ÕÀÝÉÅ ÓÔÒÏËÉ ÎÅ ÒÁÚÒÅÛÅÎÙ"
@@ -298,8 +294,7 @@
 msgstr "ÏÄÉÎÁËÏ×ÙÅ ÉÎÄÅËÓÙ ËÏÌÏÎÏË"
 
 msgid "only valid calls are x[[j]] <- value or x[[i,j]] <- value"
-msgstr ""
-"ÐÒÁ×ÉÌØÎÙ ÌÉÛØ ÔÁËÉÅ ×ÙÚÏ×Ù: x[[j]] <- ÚÎÁÞÅÎÉÅ ÉÌÉ x[[i,j]] <- ÚÎÁÞÅÎÉÅ"
+msgstr "ÐÒÁ×ÉÌØÎÙ ÌÉÛØ ÔÁËÉÅ ×ÙÚÏ×Ù: x[[j]] <- ÚÎÁÞÅÎÉÅ ÉÌÉ x[[i,j]] <- ÚÎÁÞÅÎÉÅ"
 
 msgid "replacing element in non-existent column: %s"
 msgstr "ÚÁÍÅÎÁ ÜÌÅÍÅÎÔÁ × ÎÅÓÕÝÅÓÔ×ÕÀÝÅÊ ËÏÌÏÎËÅ: %s"
@@ -385,10 +380,8 @@
 msgid "'length.out' must be of length 1"
 msgstr "'length.out' ÄÏÌÖÅÎ ÂÙÔØ ÄÌÉÎÏÊ 1"
 
-msgid ""
-"exactly two of 'to', 'by' and 'length.out' / 'along.with' must be specified"
-msgstr ""
-"ÎÕÖÎÏ ÕËÁÚÁÔØ × ÔÏÞÎÏÓÔÉ Ä×Á ÉÚ: 'to', 'by' É 'length.out' / 'along.with'"
+msgid "exactly two of 'to', 'by' and 'length.out' / 'along.with' must be specified"
+msgstr "ÎÕÖÎÏ ÕËÁÚÁÔØ × ÔÏÞÎÏÓÔÉ Ä×Á ÉÚ: 'to', 'by' É 'length.out' / 'along.with'"
 
 msgid "'by' must be of length 1"
 msgstr "'by' ÄÏÌÖÅÎ ÂÙÔØ ÄÌÉÎÏÊ 1"
@@ -532,10 +525,8 @@
 msgid "function is not in a namespace, so cannot locate associated DLL"
 msgstr "ÆÕÎËÃÉÑ ÎÅ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ, ÐÏÜÔÏÍÕ ÎÅ ÍÏÇÕ ÎÁÊÔÉ Ó×ÑÚÁÎÎÙÊ DLL"
 
-msgid ""
-"looking for DLL for native routine call, but no DLLs in namespace of call"
-msgstr ""
-"ÉÝÕ DLL ÄÌÑ ÄÁÎÎÏÇÏ ×ÎÕÔÒÅÎÎÅÇÏ ×ÙÚÏ×Á, ÎÏ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ ×ÙÚÏ×Á ÅÇÏ ÎÅÔ"
+msgid "looking for DLL for native routine call, but no DLLs in namespace of call"
+msgstr "ÉÝÕ DLL ÄÌÑ ÄÁÎÎÏÇÏ ×ÎÕÔÒÅÎÎÅÇÏ ×ÙÚÏ×Á, ÎÏ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ ×ÙÚÏ×Á ÅÇÏ ÎÅÔ"
 
 msgid "0 x 0 matrix"
 msgstr "0 x 0 ÍÁÔÒÉÃÁ"
@@ -567,12 +558,8 @@
 msgid "'%s' not defined for ordered factors"
 msgstr "'%s' ÎÅ ÏÐÒÅÄÅÌÅÎ ÄÌÑ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÆÁËÔÏÒÏ×"
 
-msgid ""
-"'%s' is only meaningful for ordered factors if all arguments have the same "
-"level sets"
-msgstr ""
-"'%s' ÉÍÅÅÔ ÓÍÙÓÌ ÔÏÌØËÏ ÄÌÑ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÆÁËÔÏÒÏ× ÅÓÌÉ ×ÓÅ ÁÒÇÕÍÅÎÔÙ ÉÍÅÀÔ "
-"ÏÄÉÎÁËÏ×ÙÅ ÎÁÂÏÒÙ ÇÒÁÄÁÃÉÊ"
+msgid "'%s' is only meaningful for ordered factors if all arguments have the same level sets"
+msgstr "'%s' ÉÍÅÅÔ ÓÍÙÓÌ ÔÏÌØËÏ ÄÌÑ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÆÁËÔÏÒÏ× ÅÓÌÉ ×ÓÅ ÁÒÇÕÍÅÎÔÙ ÉÍÅÀÔ ÏÄÉÎÁËÏ×ÙÅ ÎÁÂÏÒÙ ÇÒÁÄÁÃÉÊ"
 
 msgid "no files to copy to"
 msgstr "ÎÅÔ ÆÁÊÌÏ×, ÞÔÏÂÙ ÓËÏÐÉÒÏ×ÁÔØ ÎÁ"
@@ -584,9 +571,7 @@
 msgstr "ÂÏÌØÛÅ ÆÁÊÌÏ× 'from', ÞÅÍ 'to'"
 
 msgid "'recursive' will be ignored as 'to' is not a single existing directory"
-msgstr ""
-"'recursive' ÂÕÄÅÔ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ, ÔÁË ËÁË 'to' ÎÅ Ñ×ÌÑÅÔÓÑ ÏÄÉÎÏÞÎÙÍ "
-"ËÁÔÁÌÏÇÏÍ"
+msgstr "'recursive' ÂÕÄÅÔ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ, ÔÁË ËÁË 'to' ÎÅ Ñ×ÌÑÅÔÓÑ ÏÄÉÎÏÞÎÙÍ ËÁÔÁÌÏÇÏÍ"
 
 msgid "file can not be copied both 'from' and 'to'"
 msgstr "ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓËÏÐÉÒÏ×ÁÎ ÏÄÎÏ×ÒÅÍÅÎÎÏ 'from' É 'to'"
@@ -625,15 +610,13 @@
 msgstr "ËÌÁÓÓ 'x' ÕÄÁÌÅÎ"
 
 msgid "'mode' must be \"double\" (\"real\"), \"integer\" or \"character\""
-msgstr ""
-"'mode' ÄÏÌÖÎÁ ÂÙÔØ \"double\" (\"real\"), \"integer\" ÉÌÉ \"character\""
+msgstr "'mode' ÄÏÌÖÎÁ ÂÙÔØ \"double\" (\"real\"), \"integer\" ÉÌÉ \"character\""
 
 msgid "coercing argument to \"character\" for format=\"s\""
 msgstr "ÐÒÅÏÂÒÁÚÕÀ ÁÒÇÕÍÅÎÔ × \"character\" ÄÌÑ format=\"s\""
 
 msgid "'format' must be one of {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}"
-msgstr ""
-"'format' ÄÏÌÖÅÎ ÂÙÔØ ÏÄÎÉÍ ÉÚ {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}"
+msgstr "'format' ÄÏÌÖÅÎ ÂÙÔØ ÏÄÎÉÍ ÉÚ {\"f\",\"e\",\"E\",\"g\",\"G\", \"fg\", \"s\"}"
 
 msgid "'digits' reduced to %d"
 msgstr "'digits' ÓÏËÒÁÝÅÎÏ ÄÏ %d"
@@ -725,10 +708,8 @@
 msgid "package %s is not installed for 'arch = %s'"
 msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ ÄÌÑ 'arch=%s'"
 
-msgid ""
-"package %s has a license that you need to accept in an interactive session"
-msgstr ""
-"Õ ÐÁËÅÔÁ %s ÅÓÔØ ÌÉÃÅÎÚÉÑ, ËÏÔÏÒÕÀ ÷ÁÍ ÎÕÖÎÏ ÐÒÉÎÑÔØ × ÉÎÅÒÁËÔÉ×ÎÏÊ ÓÅÓÓÉÉ"
+msgid "package %s has a license that you need to accept in an interactive session"
+msgstr "Õ ÐÁËÅÔÁ %s ÅÓÔØ ÌÉÃÅÎÚÉÑ, ËÏÔÏÒÕÀ ÷ÁÍ ÎÕÖÎÏ ÐÒÉÎÑÔØ × ÉÎÅÒÁËÔÉ×ÎÏÊ ÓÅÓÓÉÉ"
 
 msgid "package %s has a license that you need to accept after viewing"
 msgstr "ÐÁËÅÔ %s ÉÍÅÅÔ ÌÉÃÅÎÚÉÀ, ËÏÔÏÒÕÀ ÷ÁÍ ÎÕÖÎÏ ÐÒÉÎÑÔØ ÐÏÓÌÅ ÐÒÏÓÍÏÔÒÁ"
@@ -837,8 +818,7 @@
 "ÐÁËÅÔ %s ÎÁÊÄÅÎ ÂÏÌØÛÅ ÏÄÎÏÇÏ ÒÁÚÁ,\n"
 "ÉÓÐÏÌØÚÕÀ ÔÏÔ, ËÏÔÏÒÙÊ ÎÁÊÄÅÎ × %s"
 
-msgid ""
-"Further information is available in the following vignettes in directory %s:"
+msgid "Further information is available in the following vignettes in directory %s:"
 msgstr "äÁÌØÎÅÊÛÁÑ ÉÎÆÏÒÍÁÃÉÑ ÄÏÓÔÕÐÎÁ × ÓÌÅÄÕÀÝÉÈ ÍÉÎÉÁÔÀÒÁÈ ÉÚ ÐÁÐËÉ %s:"
 
 msgid "Description:"
@@ -944,8 +924,7 @@
 msgstr "ÐÏÐÙÔËÁ ÕÓÔÁÎÏ×ÉÔØ ÉÍÅÎÁ ÓÔÒÏË ÄÌÑ ÏÂßÅËÔÁ ÂÅÚ ÉÚÍÅÒÅÎÉÊ"
 
 msgid "attempt to set 'colnames' on an object with less than two dimensions"
-msgstr ""
-"ÐÏÐÙÔËÁ ÕÓÔÁÎÏ×ÉÔØ ÉÍÅÎÁ ËÏÌÏÎÏË ÄÌÑ ÏÂßÅËÔÁ Ó ÍÅÎÅÅ ÞÅÍ Ä×ÕÍÑ ÉÚÍÅÒÅÎÉÑÍÉ"
+msgstr "ÐÏÐÙÔËÁ ÕÓÔÁÎÏ×ÉÔØ ÉÍÅÎÁ ËÏÌÏÎÏË ÄÌÑ ÏÂßÅËÔÁ Ó ÍÅÎÅÅ ÞÅÍ Ä×ÕÍÑ ÉÚÍÅÒÅÎÉÑÍÉ"
 
 msgid "argument is not numeric or logical: returning NA"
 msgstr "ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÞÉÓÌÏ×ÙÍ ÉÌÉ ÌÏÇÉÞÅÓËÉÍ: ×ÏÚ×ÒÁÝÁÀ NA"
@@ -963,9 +942,7 @@
 msgstr "'by' ÄÏÌÖÅÎ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÞÉÓÌÕ ËÏÌÏÎÏË"
 
 msgid "'by' must specify one or more columns as numbers, names or logical"
-msgstr ""
-"'by' ÄÏÌÖÅÎ ÏÐÒÅÄÅÌÑÔØ ÏÄÎÕ ÉÌÉ ÂÏÌÅÅ ËÏÌÏÎÏË ËÁË ÞÉÓÌÁ, ÉÍÅÎÁ ÉÌÉ "
-"ÌÏÇÉÞÅÓËÉÅ ÄÁÎÎÙÅ"
+msgstr "'by' ÄÏÌÖÅÎ ÏÐÒÅÄÅÌÑÔØ ÏÄÎÕ ÉÌÉ ÂÏÌÅÅ ËÏÌÏÎÏË ËÁË ÞÉÓÌÁ, ÉÍÅÎÁ ÉÌÉ ÌÏÇÉÞÅÓËÉÅ ÄÁÎÎÙÅ"
 
 msgid "long vectors are not supported"
 msgstr "ÄÌÉÎÎÙÅ ×ÅËÔÏÒÙ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ"
@@ -979,12 +956,8 @@
 msgid "additional arguments ignored in message()"
 msgstr "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÐÒÏÐÕÝÅÎÙ × message()"
 
-msgid ""
-"tracing functions requires the 'methods' package, but unable to load the "
-"'methods' namespace"
-msgstr ""
-"ÔÒÁÓÓÉÒÏ×ËÁ ÆÕÎËÃÉÊ ÔÒÅÂÕÅÔ ÐÁËÅÔÁ 'methods', ÎÏ Ñ ÎÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ ÅÇÏ "
-"ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ"
+msgid "tracing functions requires the 'methods' package, but unable to load the 'methods' namespace"
+msgstr "ÔÒÁÓÓÉÒÏ×ËÁ ÆÕÎËÃÉÊ ÔÒÅÂÕÅÔ ÐÁËÅÔÁ 'methods', ÎÏ Ñ ÎÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ ÅÇÏ ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ"
 
 msgid "invalid to change the storage mode of a factor"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÍÅÎÑÔØ ÔÉÐ ÈÒÁÎÅÎÉÑ ÆÁËÔÏÒÁ"
@@ -1011,26 +984,14 @@
 msgid "namespace %s is already sealed in 'loadNamespace'"
 msgstr "ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ %s ÕÖÅ ÚÁÐÅÞÁÔÁÎÏ × 'loadNamespace'"
 
-msgid ""
-"failed to assign RegisteredNativeSymbol for %s to %s since %s is already "
-"defined in the %s namespace"
-msgstr ""
-"ÎÅ ÕÄÁÌÏÓØ ÐÒÉÓ×ÏÉÔØ RegisteredNativeSymbol ÄÌÑ %s × %s ÐÏÓËÏÌØËÕ %s ÕÖÅ "
-"ÏÐÒÅÄÅÌÅÎÏ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ %s"
+msgid "failed to assign RegisteredNativeSymbol for %s to %s since %s is already defined in the %s namespace"
+msgstr "ÎÅ ÕÄÁÌÏÓØ ÐÒÉÓ×ÏÉÔØ RegisteredNativeSymbol ÄÌÑ %s × %s ÐÏÓËÏÌØËÕ %s ÕÖÅ ÏÐÒÅÄÅÌÅÎÏ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ %s"
 
-msgid ""
-"failed to assign NativeSymbolInfo for %s to %s since %s is already defined "
-"in the %s namespace"
-msgstr ""
-"ÎÅ ÐÏÌÕÞÉÌÏÓØ ÐÒÉÓ×ÏÉÔØ NativeSymbolInfo ÉÚ %s × %s ÐÏÓËÏÌØËÕ %s ÕÖÅ "
-"ÏÐÒÅÄÅÌÅÎ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ %s"
+msgid "failed to assign NativeSymbolInfo for %s to %s since %s is already defined in the %s namespace"
+msgstr "ÎÅ ÐÏÌÕÞÉÌÏÓØ ÐÒÉÓ×ÏÉÔØ NativeSymbolInfo ÉÚ %s × %s ÐÏÓËÏÌØËÕ %s ÕÖÅ ÏÐÒÅÄÅÌÅÎ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ %s"
 
-msgid ""
-"failed to assign NativeSymbolInfo for %s since %s is already defined in the "
-"%s namespace"
-msgstr ""
-"ÎÅ ÐÏÌÕÞÉÌÏÓØ ÐÒÉÓ×ÏÉÔØ NativeSymbolInfo ÄÌÑ %s ÐÏÓËÏÌØËÕ %s ÕÖÅ ÏÐÒÅÄÅÌÅÎ × "
-"ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ %s"
+msgid "failed to assign NativeSymbolInfo for %s since %s is already defined in the %s namespace"
+msgstr "ÎÅ ÐÏÌÕÞÉÌÏÓØ ÐÒÉÓ×ÏÉÔØ NativeSymbolInfo ÄÌÑ %s ÐÏÓËÏÌØËÕ %s ÕÖÅ ÏÐÒÅÄÅÌÅÎ × ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ %s"
 
 msgid "package %s does not have a namespace"
 msgstr "ÐÁËÅÔ %s ÎÅ ÉÍÅÅÔ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ"
@@ -1041,12 +1002,8 @@
 msgid "unable to load R code in package %s"
 msgstr "ÎÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ ËÏÄ R ÐÁËÅÔÁ %s"
 
-msgid ""
-"'exportClassPattern' specified in 'NAMESPACE' but no matching classes in "
-"package %s"
-msgstr ""
-"× NAMESPACE ÕËÁÚÁÎ 'exportClassPattern', ÎÏ ÏÔÓÕÔÓÔ×ÕÀÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ "
-"ËÌÁÓÓÙ × ÐÁËÅÔÅ %s"
+msgid "'exportClassPattern' specified in 'NAMESPACE' but no matching classes in package %s"
+msgstr "× NAMESPACE ÕËÁÚÁÎ 'exportClassPattern', ÎÏ ÏÔÓÕÔÓÔ×ÕÀÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ËÌÁÓÓÙ × ÐÁËÅÔÅ %s"
 
 msgid "in package %s classes %s were specified for export but not defined"
 msgstr "× ÐÁËÅÔÅ '%s' ËÌÁÓÓÙ %s ÕËÁÚÁÎÙ ÄÌÑ ÜËÓÐÏÒÔÁ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎÙ"
@@ -1105,12 +1062,8 @@
 msgid "requested methods not found in environment/package %s: %s"
 msgstr "ÚÁÐÒÏÛÅÎÎÙÅ ÍÅÔÏÄÙ ÎÅ ÎÁÊÄÅÎÙ × ÏËÒÕÖÅÎÉÉ/ÐÁËÅÔÅ %s: %s"
 
-msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
-msgstr ""
-"îÅ ÎÁÊÄÅÎÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÚÁÐÒÏÛÅÎÎÙÍ ÍÅÔÏÄÁÍ ÉÍÐÏÒÔÁ ÄÌÑ "
-"\"%s\" ÉÚ ÐÁËÅÔÁ \"%s\" (ÉÓÐÏÒÞÅÎ ×Ù×ÏÄ?)"
+msgid "No generic function found corresponding to requested imported methods for \"%s\" from package \"%s\" (malformed exports?)"
+msgstr "îÅ ÎÁÊÄÅÎÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÚÁÐÒÏÛÅÎÎÙÍ ÍÅÔÏÄÁÍ ÉÍÐÏÒÔÁ ÄÌÑ \"%s\" ÉÚ ÐÁËÅÔÁ \"%s\" (ÉÓÐÏÒÞÅÎ ×Ù×ÏÄ?)"
 
 msgid "cannot add to exports of a sealed namespace"
 msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ Ë ÜËÓÐÏÒÔÕ ÉÚ ÚÁÐÅÞÁÔÁÎÎÏÇÏ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ"
@@ -1206,8 +1159,7 @@
 msgstr "'k' ÓÌÉÛËÏÍ ×ÅÌÉË"
 
 msgid "need larger value of 'ncol' as pivoting occurred"
-msgstr ""
-"ÎÕÖÎÏ ÂÏÌØÛÅÅ ÚÎÁÞÅÎÉÅ 'ncol', ÔÁË ËÁË ÐÒÏÉÓÈÏÄÉÔ ×ÙÂÏÒ ×ÅÄÕÝÅÇÏ ÜÌÅÍÅÎÔÁ"
+msgstr "ÎÕÖÎÏ ÂÏÌØÛÅÅ ÚÎÁÞÅÎÉÅ 'ncol', ÔÁË ËÁË ÐÒÏÉÓÈÏÄÉÔ ×ÙÂÏÒ ×ÅÄÕÝÅÇÏ ÜÌÅÍÅÎÔÁ"
 
 msgid "invalid NCOL(R)"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ NCOL(R)"
@@ -1341,8 +1293,7 @@
 msgstr "'echo' ÄÏÌÖÎÏ ÂÙÔØ ÌÏÇÉÞÅÓËÉÍ"
 
 msgid "'verbose' is TRUE, 'echo' not; ... coercing 'echo <- TRUE'"
-msgstr ""
-"'verbose' Ñ×ÌÑÅÔÓÑ TRUE, Á 'echo' -- ÎÅÔ; ... ÐÒÅÏÂÒÁÚÕÀ 'echo <- TRUE'"
+msgstr "'verbose' Ñ×ÌÑÅÔÓÑ TRUE, Á 'echo' -- ÎÅÔ; ... ÐÒÅÏÂÒÁÚÕÀ 'echo <- TRUE'"
 
 msgid "unable to find a plausible encoding"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÐÒÁ×ÄÏÐÏÄÏÂÎÕÀ ËÏÄÉÒÏ×ËÕ"
@@ -1365,9 +1316,8 @@
 msgid "Timestamp of %s has changed"
 msgstr "÷ÒÅÍÅÎÎáÑ ÍÁÓËÁ %s ÉÚÍÅÎÉÌÁÓØ"
 
-#, fuzzy
 msgid "'x' and 'to' must refer to same file"
-msgstr "'x' É 'y' ÄÏÌÖÎÙ ÉÍÅÔØ ÏÄÉÎÁËÏ×ÕÀ ÄÌÉÎÕ"
+msgstr "'x' É 'y' ÄÏÌÖÎÙ ÕËÁÚÙ×ÁÔØ ÎÁ ÏÄÉÎ É ÔÏÔ ÖÅ ÆÁÊÌ"
 
 msgid "additional arguments ignored in stop()"
 msgstr "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÐÒÏÐÕÝÅÎÙ × stop()"
@@ -1480,12 +1430,8 @@
 msgid "invalid 'digits'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÅ 'digits'"
 
-msgid ""
-"arguments 'show.output.on.console', 'minimized' and 'invisible' are for "
-"Windows only"
-msgstr ""
-"ÁÒÇÕÍÅÎÔÙ Õ 'show.output.on.console', 'minimized' É 'invisible' ÔÏÌØËÏ ÄÌÑ "
-"Windows"
+msgid "arguments 'show.output.on.console', 'minimized' and 'invisible' are for Windows only"
+msgstr "ÁÒÇÕÍÅÎÔÙ Õ 'show.output.on.console', 'minimized' É 'invisible' ÔÏÌØËÏ ÄÌÑ Windows"
 
 msgid "'intern' must be TRUE or FALSE"
 msgstr "'intern' ÄÏÌÖÅÎ ÂÙÔØ TRUE ÉÌÉ FALSE"
@@ -1606,12 +1552,9 @@
 
 msgid "invalid 'row.names', length %d for a data frame with %d row"
 msgid_plural "invalid 'row.names', length %d for a data frame with %d rows"
-msgstr[0] ""
-"ÎÅÐÒÁ×ÉÌØÎÙÅ 'row.names', ÄÌÉÎÏÊ %d ÄÌÑ ÔÁÂÌÉÃÙ ÄÁÎÎÙÈ Ó %d ÓÔÒÏËÁÍÉ"
-msgstr[1] ""
-"ÎÅÐÒÁ×ÉÌØÎÙÅ 'row.names', ÄÌÉÎÏÊ %d ÄÌÑ ÔÁÂÌÉÃÙ ÄÁÎÎÙÈ Ó %d ÓÔÒÏËÁÍÉ"
-msgstr[2] ""
-"ÎÅÐÒÁ×ÉÌØÎÙÅ 'row.names', ÄÌÉÎÏÊ %d ÄÌÑ ÔÁÂÌÉÃÙ ÄÁÎÎÙÈ Ó %d ÓÔÒÏËÁÍÉ"
+msgstr[0] "ÎÅÐÒÁ×ÉÌØÎÙÅ 'row.names', ÄÌÉÎÏÊ %d ÄÌÑ ÔÁÂÌÉÃÙ ÄÁÎÎÙÈ Ó %d ÓÔÒÏËÁÍÉ"
+msgstr[1] "ÎÅÐÒÁ×ÉÌØÎÙÅ 'row.names', ÄÌÉÎÏÊ %d ÄÌÑ ÔÁÂÌÉÃÙ ÄÁÎÎÙÈ Ó %d ÓÔÒÏËÁÍÉ"
+msgstr[2] "ÎÅÐÒÁ×ÉÌØÎÙÅ 'row.names', ÄÌÉÎÏÊ %d ÄÌÑ ÔÁÂÌÉÃÙ ÄÁÎÎÙÈ Ó %d ÓÔÒÏËÁÍÉ"
 
 msgid "supplied %d row name for %d rows"
 msgid_plural "supplied %d row names for %d rows"
@@ -1632,8 +1575,7 @@
 msgstr[2] "Õ ÚÁÍÅÎÙ %d ÜÌÅÍÅÎÔÏ×, Á ÎÁÄÏ %d"
 
 msgid "replacement element %d is a matrix/data frame of %d row, need %d"
-msgid_plural ""
-"replacement element %d is a matrix/data frame of %d rows, need %d"
+msgid_plural "replacement element %d is a matrix/data frame of %d rows, need %d"
 msgstr[0] "ÜÌÅÍÅÎÔ ÚÁÍÅÎÙ %d -- ÍÁÔÒÉÃÁ/ÔÁÂÌÉÃÁ ÄÁÎÎÙÈ ÉÚ %d ÓÔÒÏË, Á ÎÁÄÏ %d"
 msgstr[1] "ÜÌÅÍÅÎÔ ÚÁÍÅÎÙ %d -- ÍÁÔÒÉÃÁ/ÔÁÂÌÉÃÁ ÄÁÎÎÙÈ ÉÚ %d ÓÔÒÏË, Á ÎÁÄÏ %d"
 msgstr[2] "ÜÌÅÍÅÎÔ ÚÁÍÅÎÙ %d -- ÍÁÔÒÉÃÁ/ÔÁÂÌÉÃÁ ÄÁÎÎÙÈ ÉÚ %d ÓÔÒÏË, Á ÎÁÄÏ %d"
@@ -1704,18 +1646,11 @@
 msgstr[1] "'by' ÄÏÌÖÅÎ ÏÐÒÅÄÅÌÑÔØ ÐÒÁ×ÉÌØÎÙÅ ËÏÌÏÎËÉ"
 msgstr[2] "'by' ÄÏÌÖÅÎ ÏÐÒÅÄÅÌÑÔØ ÐÒÁ×ÉÌØÎÙÅ ËÏÌÏÎËÉ"
 
-msgid ""
-"Function found when exporting methods from the namespace %s which is not S4 "
-"generic: %s"
-msgid_plural ""
-"Functions found when exporting methods from the namespace %s which are not "
-"S4 generic: %s"
-msgstr[0] ""
-"÷Ï ×ÒÅÍÑ ÜËÓÐÏÒÔÁ ÉÚ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ %s ÎÁÊÄÅÎÁ ÎÅ S4-ÏÂÝÁÑ ÆÕÎËÃÉÑ: %s"
-msgstr[1] ""
-"÷Ï ×ÒÅÍÑ ÜËÓÐÏÒÔÁ ÉÚ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ %s ÎÁÊÄÅÎÙ ÎÅ S4-ÏÂÝÉÅ ÆÕÎËÃÉÉ: %s"
-msgstr[2] ""
-"÷Ï ×ÒÅÍÑ ÜËÓÐÏÒÔÁ ÉÚ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ %s ÎÁÊÄÅÎÙ ÎÅ S4-ÏÂÝÉÅ ÆÕÎËÃÉÉ: %s"
+msgid "Function found when exporting methods from the namespace %s which is not S4 generic: %s"
+msgid_plural "Functions found when exporting methods from the namespace %s which are not S4 generic: %s"
+msgstr[0] "÷Ï ×ÒÅÍÑ ÜËÓÐÏÒÔÁ ÉÚ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ %s ÎÁÊÄÅÎÁ ÎÅ S4-ÏÂÝÁÑ ÆÕÎËÃÉÑ: %s"
+msgstr[1] "÷Ï ×ÒÅÍÑ ÜËÓÐÏÒÔÁ ÉÚ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ %s ÎÁÊÄÅÎÙ ÎÅ S4-ÏÂÝÉÅ ÆÕÎËÃÉÉ: %s"
+msgstr[2] "÷Ï ×ÒÅÍÑ ÜËÓÐÏÒÔÁ ÉÚ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ %s ÎÁÊÄÅÎÙ ÎÅ S4-ÏÂÝÉÅ ÆÕÎËÃÉÉ: %s"
 
 msgid "class %s is not exported by 'namespace:%s'"
 msgid_plural "classes %s are not exported by 'namespace:%s'"
@@ -1741,12 +1676,6 @@
 msgstr[1] "S3 ÍÅÔÏÄÙ %s ÏÂßÑ×ÌÅÎÙ × NAMESPACE ÎÏ ÎÅ ÎÁÊÄÅÎÙ"
 msgstr[2] "S3 ÍÅÔÏÄÙ %s ÏÂßÑ×ÌÅÎÙ × NAMESPACE ÎÏ ÎÅ ÎÁÊÄÅÎÙ"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ %s ÎÅ ÂÕÄÅÔ ÕÞÔÅÎ"
-msgstr[1] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÎÅ ÂÕÄÕÔ ÕÞÔÅÎÙ"
-msgstr[2] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÎÅ ÂÕÄÕÔ ÕÞÔÅÎÙ"
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "%s ÎÅ TRUE"
@@ -1759,6 +1688,22 @@
 msgstr[1] "ðÒÅÄÕÐÒÅÖÄÅÎÉÑ:\n"
 msgstr[2] "ðÒÅÄÕÐÒÅÖÄÅÎÉÑ:\n"
 
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] ""
+"÷ %s :\n"
+" ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ %s ÎÅ ÂÕÄÅÔ ÕÞÔÅÎ"
+msgstr[1] ""
+"÷ %s :\n"
+" ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÎÅ ÂÕÄÕÔ ÕÞÔÅÎÙ"
+msgstr[2] ""
+"÷ %s :\n"
+" ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÎÅ ÂÕÄÕÔ ÕÞÔÅÎÙ"
+
 #, fuzzy
 #~ msgid "cannot be unloaded."
 #~ msgstr "%s ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ ÎÅÌØÚÑ ×ÙÇÒÕÚÉÔØ:"
@@ -1766,16 +1711,12 @@
 #, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr "ÏÂßÅËÔ %s ÎÅ ÜËÓÐÏÒÔÉÒÏ×ÁÎ ÉÚ 'namespace:%s'"
-
 #~ msgid "package %s %s was found, but %s %s is required by %s"
 #~ msgstr "ÐÁËÅÔ %s %s ÎÁÊÄÅÎ, ÎÏ %s %s ÔÒÅÂÕÅÔÓÑ ÄÌÑ %s"
-
 #~ msgid "package %s %s is loaded, but %s %s is required by %s"
 #~ msgstr "ÐÁËÅÔ %s %s ÚÁÇÒÕÖÅÎ, ÎÏ %s %s ÔÒÅÂÕÅÔÓÑ ÄÌÑ %s"
-
 #~ msgid "wrong argument"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ"
-
 #~ msgid ""
 #~ "The following object is masked %s %s:\n"
 #~ "\n"
@@ -1796,220 +1737,156 @@
 #~ "óÌÅÄÕÀÝÉÅ ÏÂßÅËÔÙ ÓËÒÙÔÙ %s %s:\n"
 #~ "\n"
 #~ "%s\n"
-
 #~ msgid "'nu' must be 0, nrow(x) or ncol(x)"
 #~ msgstr "'nu' ÄÏÌÖÅÎ ÂÙÔØ 0, nrow(x) ÉÌÉ ncol(x)"
-
 #~ msgid "'nv' must be 0, nrow(x) or ncol(x)"
 #~ msgstr "'nv' ÄÏÌÖÅÎ ÂÙÔØ 0, nrow(x) ÉÌÉ ncol(x)"
-
 #~ msgid "non-square matrix in 'chol'"
 #~ msgstr "ÎÅ Ë×ÁÄÒÁÔÎÁÑ ÍÁÔÒÉÃÁ × 'chol'"
-
 #~ msgid "non-matrix argument to 'chol'"
 #~ msgstr "ÎÅÍÁÔÒÉÞÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ 'chol'"
-
 #~ msgid "matrix not positive definite"
 #~ msgstr "ÍÁÔÒÉÃÁ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÌÏÖÉÔÅÌØÎÏ ÏÐÒÅÄÅÌÅÎÎÏÊ"
-
 #~ msgid "too many 'S3method' directives"
 #~ msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÄÉÒÅËÔÉ× 'S3method'"
-
 #~ msgid "'keep.source' is deprecated and will be ignored"
 #~ msgstr "'keep.source' ÕÓÔÁÒÅÌ É ÂÕÄÅÔ ÐÒÏÐÕÝÅÎ"
-
 #~ msgid "non-positive definite matrix in 'chol'"
 #~ msgstr "ÎÅ ÐÏÌÏÖÉÔÅÌØÎÏ ÏÐÒÅÄÅÌÅÎÎÁÑ ÍÁÔÒÉÃÁ × 'chol'"
-
 #~ msgid "non-numeric argument to 'chol2inv'"
 #~ msgstr "ÎÅÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ 'chol2inv'"
-
 #~ msgid "invalid 'size' argument in 'chol2inv'"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ 'size' × 'chol2inv'"
-
 #~ msgid "singular matrix in 'chol2inv'"
 #~ msgstr "ÓÉÎÇÕÌÑÒÎÁÑ ÍÁÔÒÉÃÁ × 'chol2inv'"
 
 #, fuzzy
 #~ msgid "'%s' returned code %d in 'eigen'"
 #~ msgstr "'rs' ×ÏÚ×ÒÁÔÉÌ ËÏÄ %d × 'eigen'"
-
 #~ msgid "'nv' must be 0 or ncol(x)"
 #~ msgstr "'nv' ÄÏÌÖÅÎ ÂÙÔØ 0 ÉÌÉ ncol(x)"
 
 #, fuzzy
 #~ msgid "error %d in LINPACK subroutine 'dsvdc'"
 #~ msgstr "ÏÛÉÂËÁ %d × 'dsvdc'"
-
 #~ msgid "found an S4 version of %s so it has not been imported correctly"
 #~ msgstr "ÎÁÊÄÅÎÁ S4-×ÅÒÓÉÑ %s É ÐÏÜÔÏÍÕ ÏÎÁ ÎÅ ÚÁÇÒÕÖÅÎÁ ÐÒÁ×ÉÌØÎÏ"
-
 #~ msgid "Use of save versions prior to 2 is deprecated"
 #~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ ÓÏÈÒÁÎÅÎÎÙÈ ×ÅÒÓÉÊ, ÂÏÌÅÅ ÒÁÎÎÉÈ ÞÅÍ 2, ÎÅ ÏÄÏÂÒÑÅÔÓÑ"
-
 #~ msgid "T used instead of TRUE"
 #~ msgstr "T ÉÓÐÏÌØÚÏ×ÁÎÏ ×ÍÅÓÔÏ TRUE"
-
 #~ msgid "F used instead of FALSE"
 #~ msgstr "F ÉÓÐÏÌØÚÏ×ÁÎÏ ×ÍÅÓÔÏ FALSE"
-
 #~ msgid "cannot find namespace environment"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏËÒÕÖÅÎÉÅ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ"
-
 #~ msgid "items"
 #~ msgstr "ÜÌÅÍÅÎÔÙ"
-
 #~ msgid "have been removed from the search path"
 #~ msgstr "ÕÄÁÌÅÎ ÉÚ ÐÕÔÉ ÐÏÉÓËÁ"
-
 #~ msgid "0 extent dimensions"
 #~ msgstr "ÎÕÌÅ×ÁÑ ÐÒÏÔÑÖÅÎÎÏÓÔØ ÉÚÍÅÒÅÎÉÊ"
-
 #~ msgid "Buggy version of Kinderman-Ramage generator used"
 #~ msgstr "éÓÐÏÌØÚÏ×ÁÎÁ ÏÛÉÂÏÞÎÁÑ ×ÅÒÓÉÑ ÇÅÎÅÒÁÔÏÒÁ Kinderman-Ramage"
-
 #~ msgid "Buggy version of Kinderman-Ramage generator is not allowed"
 #~ msgstr "ïÛÉÂÏÞÎÁÑ ×ÅÒÓÉÑ ÇÅÎÅÒÁÔÏÒÁ Kinderman-Ramage ÎÅ ÒÁÚÒÅÛÅÎÁ"
-
 #~ msgid "you cannot be serious"
 #~ msgstr "÷Ù ÛÕÔÉÔÅ"
-
 #~ msgid "RHS must be list"
 #~ msgstr "ÐÒÁ×ÁÑ ÓÔÏÒÏÎÁ ÐÒÉÓ×ÁÉ×ÁÎÉÑ ÄÏÌÖÎÁ ÂÙÔØ ÓÐÉÓËÏÍ"
-
 #~ msgid "labels/breaks length conflict"
 #~ msgstr "ÄÌÉÎÙ labels/breaks ËÏÎÆÌÉËÔÕÀÔ"
-
 #~ msgid "--> row.names NOT used"
 #~ msgstr "--> 'row.names' îå ÉÓÐÏÌØÚÏ×ÁÎÙ"
-
 #~ msgid "'ch' returned code %d in 'eigen'"
 #~ msgstr "'ch' ×ÏÚ×ÒÁÔÉÌ ËÏÄ %d × 'eigen'"
-
 #~ msgid "'cg' returned code %d in 'eigen'"
 #~ msgstr "'cg' ×ÏÚ×ÒÁÔÉÌ ËÏÄ %d × 'eigen'"
-
 #~ msgid "'rg' returned code %d in 'eigen'"
 #~ msgstr "'rg' ×ÏÚ×ÒÁÔÉÌ ËÏÄ %d × 'eigen'"
-
 #~ msgid "invalid factor level, NAs generated"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÕÒÏ×ÅÎØ ÆÁËÔÏÒÁ, ÐÏÌÕÞÉÌÉÓØ NA"
-
 #~ msgid "'subset' must evaluate to logical"
 #~ msgstr "×ÙÞÉÓÌÅÎÉÅ 'subset' ÄÏÌÖÅÎ ÐÒÉ×ÏÄÉÔØ Ë ÂÕÌÅ×ÏÍÕ ÚÎÁÞÅÎÉÀ"
-
 #~ msgid "License"
 #~ msgstr "ìÉÃÅÎÚÉÑ"
-
 #~ msgid ""
 #~ "file %s has magic number '%s'\n"
 #~ "   Use of save versions prior to 2 is deprecated"
 #~ msgstr ""
 #~ "ÆÁÊÌ %s ÉÍÅÅÔ ÍÁÇÉÞÅÓËÏÅ ÞÉÓÌÏ '%s'\n"
 #~ "   éÓÐÏÌØÚÏ×ÁÎÉÅ ÓÏÈÒÁÎÅÎÎÙÈ ×ÅÒÓÉÊ, ÂÏÌÅÅ ÒÁÎÎÉÈ ÞÅÍ 2, ÎÅ ÏÄÏÂÒÑÅÔÓÑ"
-
 #~ msgid "(loaded the methods namespace)"
 #~ msgstr "(ÚÁÇÒÕÖÅÎÏ ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ ÍÅÔÏÄÏ×)"
-
 #~ msgid "doc"
 #~ msgstr "ÄÏËÕÍÅÎÔ"
-
 #~ msgid "'by' must specify valid column(s)"
 #~ msgstr "'by' ÄÏÌÖÅÎ ÏÐÒÅÄÅÌÑÔØ ÐÒÁ×ÉÌØÎÙÅ ËÏÌÏÎË(É)"
 
 #, fuzzy
 #~ msgid "%s not defined for numeric_version objects"
 #~ msgstr "ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÄÌÑ ÏÂßÅËÔÏ× numeric_version"
-
 #~ msgid "unary"
 #~ msgstr "ÕÎÁÒÎÙÊ"
-
 #~ msgid "MARGIN ="
 #~ msgstr "MARGIN ="
-
 #~ msgid "value for '"
 #~ msgstr "ÚÎÁÞÅÎÉÅ ÄÌÑ '"
-
 #~ msgid "' not found"
 #~ msgstr "' ÎÅ ÎÁÊÄÅÎÏ"
-
 #~ msgid "to"
 #~ msgstr "×"
-
 #~ msgid "since"
 #~ msgstr "ÔÁË ËÁË"
-
 #~ msgid "is already defined in the"
 #~ msgstr "ÕÖÅ ÏÐÒÅÄÅÌÅÎÏ ×"
-
 #~ msgid "namespace"
 #~ msgstr "ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ"
-
 #~ msgid "failed to assign NativeSymbolInfo for"
 #~ msgstr "ÎÅ ÕÄÁÌÏÓØ ÐÒÉÓ×ÏÉÔØ NativeSymbolInfo ÄÌÑ"
-
 #~ msgid "not found"
 #~ msgstr "ÎÅ ÎÁÊÄÅÎ"
-
 #~ msgid "' has changed"
 #~ msgstr "' ÓÍÅÎÉÌÁÓØ"
-
 #~ msgid "is not"
 #~ msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ"
-
 #~ msgid "all"
 #~ msgstr "×ÓÅ"
-
 #~ msgid "TRUE"
 #~ msgstr "TRUE"
-
 #~ msgid "non-numeric argument to 'chol'"
 #~ msgstr "ÎÅÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ 'chol'"
-
 #~ msgid "do not know how to convert '%s' to class \"POSIXlt\""
 #~ msgstr "ÎÅ ÚÎÁÀ ËÁË ËÏÎ×ÅÒÔÉÒÏ×ÁÔØ '%s' × ËÌÁÓÓ \"POSIXlt\""
-
 #~ msgid "do not know how to convert '%s' to class \"POSIXct\""
 #~ msgstr "ÎÅ ÚÎÁÀ ËÁË ËÏÎ×ÅÒÔÉÒÏ×ÁÔØ '%s' × ËÌÁÓÓ \"POSIXct\""
-
 #~ msgid "invalid 'n' value"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ 'n'"
-
 #~ msgid "'shrink.sml' must be numeric > 0"
 #~ msgstr "'shrink.sml' ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ > 0"
-
 #~ msgid "'min.n' must be non-negative integer <= n"
 #~ msgstr "'min.n' ÄÏÌÖÅÎ ÂÙÔØ ÎÅÏÔÒÉÃÁÔÅÌØÎÙÍ ÃÅÌÙÍ <= n"
-
 #~ msgid "'high.u.bias' must be non-negative numeric"
 #~ msgstr "'high.u.bias' ÄÏÌÖÅÎ ÂÙÔØ ÎÅÏÔÒÉÃÁÔÅÌØÎÙÍ ÞÉÓÌÏÍ"
-
 #~ msgid "'u5.bias' must be non-negative numeric"
 #~ msgstr "'u5.bias' ÄÏÌÖÅÎ ÂÙÔØ ÎÅÏÔÒÉÃÁÔÅÌØÎÙÍ ÞÉÓÌÏÍ"
-
 #~ msgid "'eps.correct' must be 0, 1, or 2"
 #~ msgstr "'eps.correct' ÄÏÌÖÅÎ ÂÙÔØ 0, 1, ÉÌÉ 2"
-
 #~ msgid "'b' must be compatible with 'a'"
 #~ msgstr "'b' ÄÏÌÖÅÎ ÂÙÔØ ÓÏ×ÍÅÓÔÉÍ Ó 'a'"
-
 #~ msgid "invalid argument values in 'backsolve'"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÙÅ ÚÎÁÞÅÎÉÑ ÁÒÇÕÍÅÎÔÁ × 'backsolve'"
 
 #, fuzzy
 #~ msgid "invalid value of ncol(x)"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ"
-
 #~ msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 #~ msgstr "ÓÉÎÇÕÌÑÒÎÁÑ ÍÁÔÒÉÃÁ × 'backsolve'. ðÅÒ×ÙÊ ÎÏÌØ ÎÁ ÄÉÁÇÏÎÁÌÉ [%d]"
 
 #, fuzzy
 #~ msgid "invalid value of nrow(x)"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ"
-
 #~ msgid "Expected a single logical value for the S4 state flag"
 #~ msgstr "ïÖÉÄÁÅÔÓÑ ÐÒÏÓÔÏÅ ÌÏÇÉÞÅÓËÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÆÌÁÇÁ ÓÏÓÔÏÑÎÉÑ S4"
-
 #~ msgid "Expected a single logical value for the S3 state flag"
 #~ msgstr "ïÖÉÄÁÅÔÓÑ ÐÒÏÓÔÏÅ ÌÏÇÉÞÅÓËÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÆÌÁÇÁ ÓÏÓÔÏÑÎÉÑ S3"
 
@@ -2032,3 +1909,4 @@
 #, fuzzy
 #~ msgid "invalid value of length(bin)"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ"
+
diff -Nru r-base-3.2.3/src/library/base/po/R-tr.po r-base-3.3.1/src/library/base/po/R-tr.po
--- r-base-3.2.3/src/library/base/po/R-tr.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-tr.po	2016-04-27 22:15:36.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-04-01 04:29+0200\n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -221,6 +221,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr ""
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr ""
 
@@ -480,6 +485,15 @@
 "%s"
 msgstr ""
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr ""
 
@@ -593,10 +607,10 @@
 msgid "invalid 'time' argument"
 msgstr "geçersiz paket ismi"
 
-msgid "'vec' contains NAs"
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr ""
 
-msgid "'vec' must be sorted non-decreasingly"
+msgid "'fun' is not a function"
 msgstr ""
 
 msgid "using the first element of 'value' of type \"expression\""
@@ -623,15 +637,18 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr ""
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr ""
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr ""
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+msgid "'input.d.mark' has no characters"
+msgstr ""
+
 msgid "'subset' must be logical"
 msgstr ""
 
@@ -712,9 +729,13 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr ""
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+msgid "package %s has a license that you need to accept:"
+msgstr ""
+
+msgid "according to the DESCRIPTION file it is"
+msgstr ""
+
+msgid "%s"
 msgstr ""
 
 msgid "license for package %s not accepted"
@@ -890,6 +911,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr ""
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr ""
+
 msgid "'arg' must be NULL or a character vector"
 msgstr ""
 
@@ -1066,6 +1096,9 @@
 msgid "found methods to import for function %s but not the generic itself"
 msgstr ""
 
+msgid "replacing previous import %s by %s when loading %s"
+msgstr ""
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr ""
 
@@ -1073,8 +1106,8 @@
 msgstr ""
 
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 
 msgid "cannot add to exports of a sealed namespace"
@@ -1230,6 +1263,10 @@
 msgid "too many arguments"
 msgstr ""
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "geçersiz paket ismi"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr ""
 
@@ -1265,6 +1302,9 @@
 "Did you intend to set 'partial'?"
 msgstr ""
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr ""
 
@@ -1291,9 +1331,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr ""
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr ""
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr ""
 
@@ -1345,9 +1382,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr ""
 
-msgid ","
-msgstr ""
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr ""
 
@@ -1390,6 +1424,9 @@
 msgid "arguments must have same length"
 msgstr ""
 
+msgid "total number of levels >= 2^31"
+msgstr ""
+
 msgid "handler must be a function"
 msgstr ""
 
@@ -1635,10 +1672,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] ""
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] ""
@@ -1648,6 +1681,14 @@
 msgstr[0] ""
 msgstr[1] ""
 
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] ""
+
 #~ msgid "namespace"
 #~ msgstr "isim alanı"
 
diff -Nru r-base-3.2.3/src/library/base/po/ru.po r-base-3.3.1/src/library/base/po/ru.po
--- r-base-3.2.3/src/library/base/po/ru.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/ru.po	2016-04-27 22:15:36.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-27 18:55-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:20-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -19,8 +19,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "First-Translator: Dmitri I GOULIAEV <dmitri.gouliaev@telkel.net\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/appl/optim.c:60
 msgid "non-finite value supplied by 'optim'"
@@ -84,7 +83,9 @@
 msgid "cannot get working directory"
 msgstr "не могу попа�ть в рабочую папку"
 
-#: src/gnuwin32/extra.c:61 src/gnuwin32/extra.c:89 src/gnuwin32/extra.c:128
+#: src/gnuwin32/extra.c:61
+#: src/gnuwin32/extra.c:89
+#: src/gnuwin32/extra.c:128
 msgid "R_HOME not set"
 msgstr "R_HOME не у�тановлен"
 
@@ -128,125 +129,320 @@
 msgid "problem in displaying '%ls'"
 msgstr "проблема при отображении '%ls'"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
-#: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
-#: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
-#: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
-#: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
-#: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
+#: src/gnuwin32/extra.c:116
+#: src/gnuwin32/extra.c:158
+#: src/gnuwin32/extra.c:334
+#: src/gnuwin32/extra.c:560
+#: src/gnuwin32/extra.c:585
+#: src/main/agrep.c:131
+#: src/main/agrep.c:135
+#: src/main/agrep.c:776
+#: src/main/agrep.c:781
+#: src/main/apply.c:330
+#: src/main/apply.c:332
+#: src/main/apply.c:335
+#: src/main/array.c:87
+#: src/main/array.c:1241
+#: src/main/array.c:1367
+#: src/main/array.c:1369
+#: src/main/array.c:1370
+#: src/main/array.c:1713
+#: src/main/array.c:1715
+#: src/main/array.c:1717
+#: src/main/attrib.c:190
+#: src/main/builtin.c:88
+#: src/main/builtin.c:97
+#: src/main/builtin.c:116
+#: src/main/builtin.c:118
+#: src/main/builtin.c:148
+#: src/main/builtin.c:559
+#: src/main/builtin.c:575
+#: src/main/builtin.c:764
+#: src/main/builtin.c:766
+#: src/main/builtin.c:768
+#: src/main/character.c:159
+#: src/main/character.c:162
+#: src/main/character.c:167
+#: src/main/character.c:1086
+#: src/main/character.c:1090
+#: src/main/character.c:1325
+#: src/main/character.c:1329
+#: src/main/character.c:1390
+#: src/main/character.c:1393
+#: src/main/connections.c:1208
+#: src/main/connections.c:1214
+#: src/main/connections.c:1217
+#: src/main/connections.c:1221
+#: src/main/connections.c:1367
+#: src/main/connections.c:1383
+#: src/main/connections.c:1388
+#: src/main/connections.c:1989
+#: src/main/connections.c:1995
+#: src/main/connections.c:1999
+#: src/main/connections.c:2003
+#: src/main/connections.c:2008
+#: src/main/connections.c:2659
+#: src/main/connections.c:2664
+#: src/main/connections.c:2667
+#: src/main/connections.c:2670
+#: src/main/connections.c:3053
+#: src/main/connections.c:3058
+#: src/main/connections.c:3064
+#: src/main/connections.c:3067
+#: src/main/connections.c:3071
+#: src/main/connections.c:3086
+#: src/main/connections.c:3136
+#: src/main/connections.c:3141
+#: src/main/connections.c:3145
+#: src/main/connections.c:3149
+#: src/main/connections.c:3153
+#: src/main/connections.c:3159
+#: src/main/connections.c:3207
+#: src/main/connections.c:3213
+#: src/main/connections.c:3217
+#: src/main/connections.c:3268
+#: src/main/connections.c:3271
+#: src/main/connections.c:3545
+#: src/main/connections.c:3548
+#: src/main/connections.c:3551
+#: src/main/connections.c:3557
+#: src/main/connections.c:3664
+#: src/main/connections.c:3670
+#: src/main/connections.c:3673
+#: src/main/connections.c:3825
+#: src/main/connections.c:3828
+#: src/main/connections.c:3832
+#: src/main/connections.c:3835
+#: src/main/connections.c:3956
+#: src/main/connections.c:4078
+#: src/main/connections.c:4081
+#: src/main/connections.c:4418
+#: src/main/connections.c:4443
+#: src/main/connections.c:4478
+#: src/main/connections.c:4493
+#: src/main/connections.c:4501
+#: src/main/connections.c:4527
+#: src/main/connections.c:4673
+#: src/main/connections.c:4677
+#: src/main/connections.c:4805
+#: src/main/connections.c:4807
+#: src/main/connections.c:4809
+#: src/main/connections.c:4837
+#: src/main/connections.c:4975
+#: src/main/connections.c:5004
+#: src/main/connections.c:5008
+#: src/main/connections.c:5012
+#: src/main/connections.c:5016
+#: src/main/context.c:611
+#: src/main/context.c:620
+#: src/main/context.c:624
+#: src/main/datetime.c:785
+#: src/main/datetime.c:875
+#: src/main/datetime.c:877
+#: src/main/datetime.c:881
+#: src/main/datetime.c:1042
+#: src/main/datetime.c:1044
+#: src/main/datetime.c:1249
+#: src/main/debug.c:241
+#: src/main/deparse.c:407
+#: src/main/dotcode.c:496
+#: src/main/dotcode.c:500
+#: src/main/dotcode.c:505
+#: src/main/dounzip.c:323
+#: src/main/dounzip.c:330
+#: src/main/dounzip.c:340
+#: src/main/dounzip.c:345
+#: src/main/dounzip.c:349
+#: src/main/dounzip.c:353
+#: src/main/envir.c:1750
+#: src/main/envir.c:1753
+#: src/main/envir.c:1874
+#: src/main/envir.c:1879
+#: src/main/envir.c:1943
+#: src/main/envir.c:1959
+#: src/main/envir.c:1965
+#: src/main/envir.c:2077
+#: src/main/envir.c:2085
+#: src/main/envir.c:2092
+#: src/main/envir.c:2103
+#: src/main/envir.c:2335
+#: src/main/envir.c:2456
+#: src/main/envir.c:2753
+#: src/main/envir.c:3007
+#: src/main/envir.c:3021
+#: src/main/envir.c:3028
+#: src/main/envir.c:3044
+#: src/main/envir.c:3627
+#: src/main/errors.c:1044
+#: src/main/eval.c:396
+#: src/main/eval.c:405
+#: src/main/eval.c:408
+#: src/main/grep.c:780
+#: src/main/grep.c:785
+#: src/main/grep.c:1079
+#: src/main/grep.c:1081
+#: src/main/grep.c:1083
+#: src/main/grep.c:1528
+#: src/main/grep.c:1532
+#: src/main/grep.c:1537
+#: src/main/grep.c:2345
+#: src/main/grep.c:2350
+#: src/main/grep.c:2649
+#: src/main/grep.c:2654
+#: src/main/memory.c:3799
+#: src/main/paste.c:96
+#: src/main/paste.c:392
+#: src/main/paste.c:399
+#: src/main/paste.c:406
+#: src/main/paste.c:411
+#: src/main/paste.c:416
+#: src/main/paste.c:421
+#: src/main/paste.c:424
+#: src/main/paste.c:432
+#: src/main/paste.c:599
+#: src/main/paste.c:604
+#: src/main/platform.c:306
+#: src/main/platform.c:308
+#: src/main/platform.c:310
+#: src/main/platform.c:326
+#: src/main/platform.c:337
+#: src/main/platform.c:390
+#: src/main/platform.c:392
+#: src/main/platform.c:705
+#: src/main/platform.c:707
+#: src/main/platform.c:796
+#: src/main/platform.c:1134
+#: src/main/platform.c:1140
+#: src/main/platform.c:1143
+#: src/main/platform.c:1146
+#: src/main/platform.c:1149
+#: src/main/platform.c:1152
+#: src/main/platform.c:1155
+#: src/main/platform.c:1158
+#: src/main/platform.c:1255
+#: src/main/platform.c:1258
+#: src/main/platform.c:1261
+#: src/main/platform.c:1299
+#: src/main/platform.c:1357
+#: src/main/platform.c:1360
+#: src/main/platform.c:1569
+#: src/main/platform.c:1572
+#: src/main/platform.c:1575
+#: src/main/platform.c:1611
+#: src/main/platform.c:1614
+#: src/main/platform.c:1617
+#: src/main/platform.c:1700
+#: src/main/platform.c:1716
+#: src/main/platform.c:1749
+#: src/main/platform.c:1751
+#: src/main/platform.c:1822
+#: src/main/platform.c:1906
+#: src/main/platform.c:2199
+#: src/main/platform.c:2259
+#: src/main/platform.c:2436
+#: src/main/platform.c:2439
+#: src/main/platform.c:2442
+#: src/main/platform.c:2445
+#: src/main/platform.c:2448
+#: src/main/platform.c:2451
+#: src/main/platform.c:2656
+#: src/main/platform.c:2659
+#: src/main/platform.c:2662
+#: src/main/platform.c:2665
+#: src/main/platform.c:2668
+#: src/main/platform.c:2671
+#: src/main/platform.c:2749
+#: src/main/platform.c:2757
+#: src/main/platform.c:2793
+#: src/main/platform.c:2843
+#: src/main/print.c:242
+#: src/main/print.c:248
+#: src/main/print.c:270
+#: src/main/print.c:276
+#: src/main/print.c:283
+#: src/main/random.c:467
+#: src/main/random.c:471
+#: src/main/random.c:478
+#: src/main/random.c:506
+#: src/main/saveload.c:1950
+#: src/main/saveload.c:1953
+#: src/main/saveload.c:1956
+#: src/main/saveload.c:2072
+#: src/main/saveload.c:2252
+#: src/main/saveload.c:2257
+#: src/main/saveload.c:2260
+#: src/main/saveload.c:2364
+#: src/main/scan.c:684
+#: src/main/scan.c:853
+#: src/main/scan.c:867
+#: src/main/scan.c:871
+#: src/main/scan.c:873
+#: src/main/scan.c:884
+#: src/main/scan.c:911
+#: src/main/scan.c:914
+#: src/main/scan.c:917
+#: src/main/scan.c:972
+#: src/main/seq.c:622
+#: src/main/seq.c:627
+#: src/main/seq.c:635
+#: src/main/seq.c:666
+#: src/main/seq.c:670
+#: src/main/seq.c:676
+#: src/main/seq.c:684
+#: src/main/sort.c:175
+#: src/main/sysutils.c:591
+#: src/main/sysutils.c:595
+#: src/main/sysutils.c:599
+#: src/main/sysutils.c:605
+#: src/main/sysutils.c:609
+#: src/main/sysutils.c:1781
+#: src/main/sysutils.c:1785
+#: src/main/unique.c:969
+#: src/main/unique.c:1277
+#: src/main/unique.c:1281
+#: src/main/unique.c:1291
+#: src/main/unique.c:1685
+#: src/main/util.c:636
+#: src/main/util.c:639
+#: src/main/util.c:1375
+#: src/main/util.c:1389
+#: src/main/util.c:1971
+#: src/main/util.c:2192
+#: src/main/util.c:2193
+#: src/main/util.c:2194
+#: src/main/util.c:2211
+#: src/main/util.c:2235
+#: src/main/util.c:2239
+#: src/main/util.c:2241
+#: src/main/util.c:2266
+#: src/main/util.c:2268
+#: src/main/util.c:2270
+#: src/main/util.c:2273
+#: src/main/util.c:2276
+#: src/main/util.c:2280
+#: src/main/util.c:2282
+#: src/modules/X11/devX11.c:3241
+#: src/modules/X11/devX11.c:3244
+#: src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3271
+#: src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459
+#: src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468
+#: src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:476
+#: src/modules/internet/libcurl.c:316
+#: src/modules/internet/libcurl.c:320
+#: src/modules/internet/libcurl.c:325
+#: src/modules/internet/libcurl.c:328
+#: src/modules/internet/libcurl.c:332
+#: src/modules/lapack/Lapack.c:155
+#: src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709
+#: src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880
+#: src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1220
 #: src/unix/sys-std.c:1243
 #, c-format
 msgid "invalid '%s' argument"
@@ -256,7 +452,8 @@
 msgid "unsupported version of Windows"
 msgstr "неподдерживаема� вер�и� Windows"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:299
+#: src/gnuwin32/extra.c:310
 msgid "incorrect argument"
 msgstr "неправильный аргумент"
 
@@ -268,12 +465,18 @@
 msgid "cannot decrease memory limit: ignored"
 msgstr "не могу уменьшить предел пам�ти: пропущено"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:413
+#: src/gnuwin32/extra.c:514
+#: src/main/util.c:958
 msgid "'path' must be a character vector"
 msgstr "'path' должен быть тек�товым вектором"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:562
+#: src/gnuwin32/extra.c:564
+#: src/gnuwin32/extra.c:587
+#: src/gnuwin32/extra.c:589
+#: src/gnuwin32/extra.c:624
+#: src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "неправильное у�трой�тво"
@@ -282,7 +485,9 @@
 msgid "requires SDI mode"
 msgstr "требует SDI-вида"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:618
+#: src/main/gevents.c:58
+#: src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "неправильный номер графиче�кого у�трой�тва"
 
@@ -290,11 +495,13 @@
 msgid "bad device"
 msgstr "плохое у�трой�тво"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:782
+#: src/gnuwin32/extra.c:790
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "неправильный ввод в 'Rmbstowcs'"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:813
+#: src/main/platform.c:1332
 msgid "file choice cancelled"
 msgstr "выбор файла отменен"
 
@@ -316,7 +523,8 @@
 msgid "Insufficient memory (rpipeOpen)"
 msgstr "�едо�таточно пам�ти (rpipeOpen)"
 
-#: src/gnuwin32/run.c:650 src/main/dounzip.c:481
+#: src/gnuwin32/run.c:650
+#: src/main/dounzip.c:481
 msgid "seek not enabled for this connection"
 msgstr "пои�к дл� �того �оединени� не разрешен"
 
@@ -324,9 +532,13 @@
 msgid "truncate not enabled for this connection"
 msgstr "укорочение дл� �того �оединени� не разрешено"
 
-#: src/gnuwin32/run.c:731 src/gnuwin32/run.c:735 src/gnuwin32/run.c:748
-#: src/gnuwin32/run.c:776 src/main/connections.c:1322
-#: src/main/connections.c:1326 src/main/connections.c:1332
+#: src/gnuwin32/run.c:731
+#: src/gnuwin32/run.c:735
+#: src/gnuwin32/run.c:748
+#: src/gnuwin32/run.c:776
+#: src/main/connections.c:1322
+#: src/main/connections.c:1326
+#: src/main/connections.c:1332
 #: src/main/connections.c:1346
 msgid "allocation of pipe connection failed"
 msgstr "выделение �оединени� по каналу не удало�ь"
@@ -343,24 +555,29 @@
 msgid "character string expected as third argument"
 msgstr "третий аргумент должен быть тек�товой �трокой"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:254
+#: src/unix/sys-unix.c:295
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "работающа� команда '%s' имеет �тату� %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:122
+#: src/unix/sys-unix.c:423
 msgid "reached session elapsed time limit"
 msgstr "до�тигнуто �е��ионное ограничение времени операции"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:124
+#: src/unix/sys-unix.c:425
 msgid "reached elapsed time limit"
 msgstr "до�тигнуто ограничение времени операции"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:130
+#: src/unix/sys-unix.c:431
 msgid "reached session CPU time limit"
 msgstr "до�тигнуто �е��ионное ограничение времени ЦПУ"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:132
+#: src/unix/sys-unix.c:433
 msgid "reached CPU time limit"
 msgstr "до�тигнуто ограничение времени ЦПУ"
 
@@ -369,22 +586,30 @@
 msgid "Fatal error: %s\n"
 msgstr "Фатальна� ошибка: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:335
+#: src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "кодировка '%s' не ра�познана"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:341
+#: src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<ОШИБК�: неудачна� перекодировка из '%s'>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
-#: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/gnuwin32/system.c:555
+#: src/gnuwin32/system.c:1047
+#: src/gnuwin32/system.c:1059
+#: src/main/connections.c:581
+#: src/main/connections.c:586
+#: src/main/dounzip.c:178
+#: src/main/saveload.c:1961
+#: src/main/serialize.c:2598
+#: src/main/serialize.c:2603
+#: src/main/serialize.c:2688
+#: src/main/serialize.c:2733
+#: src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "не могу открыть файл '%s': %s"
@@ -433,22 +658,26 @@
 msgid "option '%s' requires a non-empty argument"
 msgstr "опци� '%s' требует непу�той аргумент"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1076
+#: src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "WARNING: '-e %s', пропущенна� при вводе, �лишком длинна�\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1080
+#: src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "В�ИМ��ИЕ: неизве�тный параметр '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1102
+#: src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "�РГУМЕ�Т '%s' __пропущен__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1108
+#: src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "не могу и�пользовать -e вме�те � -f или --file"
 
@@ -456,20 +685,23 @@
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "�оздание временного файла не удало�ь -- у�тановить подход�щую TMPDIR?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1145
+#: src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "Вы должны задать '--save', '--no-save' или '--vanilla'"
 
 #: src/gnuwin32/system.c:1150
-msgid ""
-"impossible to create 'reader thread'; you must free some system resources"
-msgstr ""
-"невозможно �оздать 'reader thread'; Вы должны о�вободить какие-нибудь "
-"�и�темные ре�ур�ы"
+msgid "impossible to create 'reader thread'; you must free some system resources"
+msgstr "невозможно �оздать 'reader thread'; Вы должны о�вободить какие-нибудь �и�темные ре�ур�ы"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:25
+#: src/main/subscript.c:390
+#: src/main/subscript.c:408
+#: src/main/subscript.c:432
+#: src/main/subscript.c:471
+#: src/main/subscript.c:652
+#: src/main/subscript.c:691
+#: src/main/subscript.c:834
 msgid "subscript out of bounds"
 msgstr "подгруппа выходит за пределы"
 
@@ -552,14 +784,11 @@
 #: src/main/RNG.c:352
 #, c-format
 msgid "'.Random.seed' is not an integer vector but of type '%s', so ignored"
-msgstr ""
-"'.Random.seed' не �вл�ет�� целочи�ленным вектором, он типа '%s', и по�тому "
-"пропущен"
+msgstr "'.Random.seed' не �вл�ет�� целочи�ленным вектором, он типа '%s', и по�тому пропущен"
 
 #: src/main/RNG.c:360
 msgid "'.Random.seed[1]' is not a valid integer, so ignored"
-msgstr ""
-"'.Random.seed[1]' не �вл�ет�� правильным целым чи�лом, и по�тому пропущен"
+msgstr "'.Random.seed[1]' не �вл�ет�� правильным целым чи�лом, и по�тому пропущен"
 
 #: src/main/RNG.c:366
 msgid "'.Random.seed[1]' is not a valid Normal type, so ignored"
@@ -567,9 +796,7 @@
 
 #: src/main/RNG.c:380
 msgid "'.Random.seed[1] = 5' but no user-supplied generator, so ignored"
-msgstr ""
-"'.Random.seed[1] = 5', но нет пользователь�кого генератора, и по�тому "
-"пропущен"
+msgstr "'.Random.seed[1] = 5', но нет пользователь�кого генератора, и по�тому пропущен"
 
 #: src/main/RNG.c:385
 msgid "'.Random.seed[1]' is not a valid RNG kind so ignored"
@@ -617,11 +844,15 @@
 msgid "could not allocate space for 'name'"
 msgstr "не могу выделить ме�то под 'им�'"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881
+#: src/main/Rdynload.c:897
+#: src/main/util.c:758
 msgid "character argument expected"
 msgstr "нужен тек�товый аргумент"
 
-#: src/main/Rdynload.c:887 src/main/Rdynload.c:919 src/main/Rdynload.c:939
+#: src/main/Rdynload.c:887
+#: src/main/Rdynload.c:919
+#: src/main/Rdynload.c:939
 #, c-format
 msgid ""
 "unable to load shared object '%s':\n"
@@ -639,14 +870,12 @@
 #, c-format
 msgid "cannot allocate memory for registered native symbol (%d byte)"
 msgid_plural "cannot allocate memory for registered native symbol (%d bytes)"
-msgstr[0] ""
-"не могу разме�тить пам�ть дл� зареги�трированного native �имвола (%d байт)"
-msgstr[1] ""
-"не могу разме�тить пам�ть дл� зареги�трированного native �имвола (%d байта)"
-msgstr[2] ""
-"не могу разме�тить пам�ть дл� зареги�трированного native �имвола (%d байтов)"
+msgstr[0] "не могу разме�тить пам�ть дл� зареги�трированного native �имвола (%d байт)"
+msgstr[1] "не могу разме�тить пам�ть дл� зареги�трированного native �имвола (%d байта)"
+msgstr[2] "не могу разме�тить пам�ть дл� зареги�трированного native �имвола (%d байтов)"
 
-#: src/main/Rdynload.c:1102 src/main/Rdynload.c:1323
+#: src/main/Rdynload.c:1102
+#: src/main/Rdynload.c:1323
 msgid "must pass package name or DllInfo reference"
 msgstr "должен передать им� пакета или ��ылку DllInfo"
 
@@ -655,11 +884,13 @@
 msgid "unimplemented type %d in 'createRSymbolObject'"
 msgstr "нереализованный тип %d у 'createRSymbolObject'"
 
-#: src/main/Rdynload.c:1281 src/main/Rdynload.c:1375
+#: src/main/Rdynload.c:1281
+#: src/main/Rdynload.c:1375
 msgid "R_getRegisteredRoutines() expects a DllInfo reference"
 msgstr "R_getRegisteredRoutines() ожидает ��ылку DllInfo"
 
-#: src/main/Rdynload.c:1284 src/main/Rdynload.c:1378
+#: src/main/Rdynload.c:1284
+#: src/main/Rdynload.c:1378
 msgid "NULL value passed for DllInfo"
 msgstr "значение NULL передано дл� DllInfo"
 
@@ -672,12 +903,15 @@
 msgid "table entry must be an external pointer"
 msgstr "вход таблицы должен быть внешним указателем"
 
-#: src/main/Renviron.c:159 src/main/Renviron.c:164
+#: src/main/Renviron.c:159
+#: src/main/Renviron.c:164
 #, c-format
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "проблема у�тановки переманной '%s' в Renviron"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311
+#: src/main/objects.c:1147
+#: src/main/raw.c:150
 #, c-format
 msgid "argument '%s' must be a character string"
 msgstr "аргумент '%s' должен быть тек�товой �трокой"
@@ -687,7 +921,8 @@
 msgid "file '%s' cannot be opened for reading"
 msgstr "файл '%s' не может быть открыт дл� чтени�"
 
-#: src/main/Rstrptime.h:524 src/main/Rstrptime.h:991
+#: src/main/Rstrptime.h:524
+#: src/main/Rstrptime.h:991
 #, c-format
 msgid "use of %s for input is not supported"
 msgstr "и�пользование '%s' дл� ввода не поддерживает��"
@@ -708,39 +943,64 @@
 msgid "invalid multibyte format string"
 msgstr "неправильна� многобайтна� �трока"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133
+#: src/main/agrep.c:778
+#: src/main/character.c:1088
+#: src/main/character.c:1092
+#: src/main/grep.c:782
+#: src/main/grep.c:1530
+#: src/main/grep.c:1534
+#: src/main/grep.c:2347
+#: src/main/grep.c:2651
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr "длина аргумента '%s' > 1, будет и�пользован только первый �лемент"
 
-#: src/main/agrep.c:190 src/main/agrep.c:820
+#: src/main/agrep.c:190
+#: src/main/agrep.c:820
 msgid "'pattern' must be a non-empty character string"
 msgstr "'pattern' должен быть непу�той тек�товой �трокой"
 
-#: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/agrep.c:201
+#: src/main/agrep.c:829
+#: src/main/grep.c:853
+#: src/main/grep.c:2405
+#: src/main/grep.c:2704
 msgid "regular expression is invalid in this locale"
 msgstr "неправильное регул�рное выражение дл� �той локали"
 
-#: src/main/agrep.c:207 src/main/agrep.c:624
+#: src/main/agrep.c:207
+#: src/main/agrep.c:624
 #, c-format
 msgid "regcomp error:  '%s'"
 msgstr "ошибка regcomp: '%s'"
 
-#: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
-#: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/agrep.c:239
+#: src/main/agrep.c:874
+#: src/main/grep.c:233
+#: src/main/grep.c:323
+#: src/main/grep.c:434
+#: src/main/grep.c:590
+#: src/main/grep.c:907
+#: src/main/grep.c:2507
+#: src/main/grep.c:2576
+#: src/main/grep.c:2741
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "неправильна� входна� �трока %d дл� �той локали"
 
-#: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
-#: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
-#: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/agrep.c:526
+#: src/main/agrep.c:766
+#: src/main/grep.c:159
+#: src/main/grep.c:773
+#: src/main/grep.c:775
+#: src/main/grep.c:1065
+#: src/main/grep.c:1073
+#: src/main/grep.c:1521
+#: src/main/grep.c:1523
+#: src/main/grep.c:2337
+#: src/main/grep.c:2339
+#: src/main/grep.c:2639
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "аргумент '%s' будет проигнорирован"
@@ -755,7 +1015,8 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "неправильна� входна� �трока y[%d] дл� �той локали"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835
+#: src/main/grep.c:2710
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "ошибка regcomp: '%s'"
@@ -764,29 +1025,63 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "'FUN.VALUE' должно быть вектором"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
+#: src/main/apply.c:100
+#: src/main/array.c:480
+#: src/main/character.c:644
+#: src/main/character.c:1453
+#: src/main/connections.c:3553
+#: src/main/context.c:657
+#: src/main/context.c:676
+#: src/main/datetime.c:685
+#: src/main/datetime.c:787
+#: src/main/datetime.c:1046
+#: src/main/dotcode.c:222
+#: src/main/errors.c:943
+#: src/main/errors.c:976
+#: src/main/errors.c:1079
+#: src/main/errors.c:1104
+#: src/main/errors.c:1109
+#: src/main/errors.c:1382
+#: src/main/identical.c:66
+#: src/main/identical.c:67
+#: src/main/identical.c:68
+#: src/main/identical.c:69
+#: src/main/identical.c:70
+#: src/main/platform.c:3083
+#: src/main/seq.c:191
+#: src/main/seq.c:347
+#: src/main/seq.c:352
+#: src/main/seq.c:356
+#: src/main/seq.c:397
+#: src/main/seq.c:401
+#: src/main/seq.c:405
+#: src/main/sort.c:1224
+#: src/main/sort.c:1307
+#: src/main/sort.c:1311
+#: src/main/sort.c:1318
+#: src/main/sort.c:1393
+#: src/main/source.c:225
+#: src/main/summary.c:901
+#: src/main/sysutils.c:250
+#: src/main/util.c:1047
+#: src/main/util.c:1052
+#: src/main/util.c:1059
+#: src/main/util.c:1062
+#: src/main/util.c:2031
+#: src/modules/X11/devX11.c:3142
+#: src/modules/X11/devX11.c:3169
+#: src/modules/X11/devX11.c:3174
+#: src/modules/X11/devX11.c:3179
+#: src/modules/X11/devX11.c:3189
+#: src/modules/X11/devX11.c:3194
+#: src/modules/X11/devX11.c:3198
 #: src/modules/X11/devX11.c:3202
 #, c-format
 msgid "invalid '%s' value"
 msgstr "неправильное значение '%s'"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103
+#: src/main/complex.c:761
 msgid "invalid length"
 msgstr "неправильна� длина"
 
@@ -846,7 +1141,8 @@
 msgid "non-numeric argument to binary operator"
 msgstr "нечи�ловой аргумент дл� бинарного оператора"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:572
+#: src/main/relop.c:227
 msgid "non-conformable arrays"
 msgstr "неподобные многомерные матрицы"
 
@@ -854,17 +1150,19 @@
 msgid "non-conformable time-series"
 msgstr "неподобные временные р�ды"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
+#: src/main/arithmetic.c:637
+#: src/main/logic.c:134
+#: src/main/relop.c:166
 #: src/main/relop.c:265
 msgid "longer object length is not a multiple of shorter object length"
-msgstr ""
-"длина большего объекта не �вл�ет�� произведением длины меньшего объекта"
+msgstr "длина большего объекта не �вл�ет�� произведением длины меньшего объекта"
 
 #: src/main/arithmetic.c:708
 msgid "invalid argument to unary operator"
 msgstr "неправильный аргумент дл� унарного оператора"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
+#: src/main/arithmetic.c:737
+#: src/main/arithmetic.c:762
 #: src/main/arithmetic.c:781
 msgid "invalid unary operator"
 msgstr "неправильный унарный оператор"
@@ -873,12 +1171,16 @@
 msgid "unimplemented real function of 1 argument"
 msgstr "нереализованна� дей�твительна� функци� 1 аргумента"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1207
+#: src/main/complex.c:648
+#: src/main/complex.c:718
 msgid "unimplemented complex function"
 msgstr "нереализованна� комплек�на� функци�"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1486
+#: src/main/arithmetic.c:1885
+#: src/main/arithmetic.c:2064
+#: src/main/arithmetic.c:2176
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "нереализованна� дей�твительна� функци� %d чи�ловых аргументов"
@@ -895,8 +1197,12 @@
 msgid "invalid second argument of length 0"
 msgstr "неправильный второй аргумент нулевой длины"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1627
+#: src/main/arithmetic.c:1645
+#: src/main/envir.c:1462
+#: src/main/envir.c:1970
+#: src/main/eval.c:572
+#: src/main/eval.c:4118
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "аргумент \"%s\" пропущен, умолчаний нет"
@@ -905,28 +1211,34 @@
 msgid "invalid argument 'base' of length 0"
 msgstr "неправильный аргумент 'base' нулевой длины"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:79
+#: src/main/array.c:1547
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data' должен быть вектором, а была '%s'"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:94
+#: src/main/array.c:102
 msgid "non-numeric matrix extent"
 msgstr "нечи�лова� прот�женно�ть матрицы"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:97
+#: src/main/array.c:1656
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "неправильное значение 'nrow' (�лишком велико или NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:99
+#: src/main/array.c:1658
 msgid "invalid 'nrow' value (< 0)"
 msgstr "неправильное значение 'nrow' (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:105
+#: src/main/array.c:1661
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "неправильное значение 'ncol' (�лишком велико или NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:107
+#: src/main/array.c:1663
 msgid "invalid 'ncol' value (< 0)"
 msgstr "неправильное значение 'ncol' (< 0)"
 
@@ -940,22 +1252,21 @@
 
 #: src/main/array.c:135
 #, c-format
-msgid ""
-"data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
+msgid "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr "длина данных [%d] не �вл�ет�� множителем количе�тва �трок [%d]"
 
 #: src/main/array.c:138
 #, c-format
-msgid ""
-"data length [%d] is not a sub-multiple or multiple of the number of columns "
-"[%d]"
+msgid "data length [%d] is not a sub-multiple or multiple of the number of columns [%d]"
 msgstr "длина данных [%d] не �вл�ет�� множителем количе�тва �толбцов [%d]"
 
 #: src/main/array.c:141
 msgid "data length exceeds size of matrix"
 msgstr "длина данных превышает размер матрицы"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:147
+#: src/main/array.c:1559
+#: src/main/array.c:1670
 msgid "too many elements specified"
 msgstr "задано �лишком много �лементов"
 
@@ -980,9 +1291,9 @@
 msgstr "'allocArray': при помощи 'dims' задано �лишком много �лементов"
 
 #: src/main/array.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' must be a list or atomic vector"
-msgstr "'x' должен быть �пи�ком из NULL или про�тых векторов"
+msgstr "'%s' должен быть �пи�ком из про�тых векторов"
 
 #: src/main/array.c:531
 #, c-format
@@ -993,7 +1304,9 @@
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "требует чи�ловых/комплек�ных матричных/векторных аргументов"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:855
+#: src/main/array.c:859
+#: src/main/array.c:863
 msgid "non-conformable arguments"
 msgstr "неподобные аргументы"
 
@@ -1010,7 +1323,8 @@
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' неправильной длины %d (!= %d)"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1216
+#: src/main/array.c:1219
 msgid "'a' does not have named dimnames"
 msgstr "'a' не имеет именованных измерений"
 
@@ -1032,9 +1346,8 @@
 msgstr "'x' должен быть чи�лом"
 
 #: src/main/array.c:1381
-#, fuzzy
-msgid "'X' is too short"
-msgstr "'object' �лишком короткий"
+msgid "'x' is too short"
+msgstr "'x' �лишком короткий"
 
 #: src/main/array.c:1555
 msgid "'dims' cannot be of length 0"
@@ -1049,8 +1362,12 @@
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr "вырожденна� матрица 'backsolve'. Первый нуль в диагонали [%d]"
 
-#: src/main/attrib.c:40 src/main/attrib.c:231 src/main/attrib.c:265
-#: src/main/attrib.c:287 src/main/attrib.c:403 src/main/attrib.c:450
+#: src/main/attrib.c:40
+#: src/main/attrib.c:231
+#: src/main/attrib.c:265
+#: src/main/attrib.c:287
+#: src/main/attrib.c:403
+#: src/main/attrib.c:450
 #: src/main/attrib.c:501
 msgid "attempt to set an attribute on NULL"
 msgstr "попытка при�воени� атрибута на NULL"
@@ -1114,20 +1431,13 @@
 
 #: src/main/attrib.c:867
 #, c-format
-msgid ""
-"class '%s' has no 'names' slot; assigning a names attribute will create an "
-"invalid object"
-msgstr ""
-"у кла��а '%s' нет позиции 'names'; при�воение атрибута имени �озда�т "
-"неправильный объект"
+msgid "class '%s' has no 'names' slot; assigning a names attribute will create an invalid object"
+msgstr "у кла��а '%s' нет позиции 'names'; при�воение атрибута имени �озда�т неправильный объект"
 
 #: src/main/attrib.c:870
 #, c-format
-msgid ""
-"invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
-msgstr ""
-"нельз� и�пользовать names()<- чтобы у�тановить позицию 'names' в невекторном "
-"кла��е ('%s')"
+msgid "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
+msgstr "нельз� и�пользовать names()<- чтобы у�тановить позицию 'names' в невекторном кла��е ('%s')"
 
 #: src/main/attrib.c:900
 msgid "incompatible 'names' argument"
@@ -1143,10 +1453,13 @@
 msgstr "'dimnames' применены дл� не-многомерной матрицы"
 
 #: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' должны быть �пи�ком"
+#: src/main/coerce.c:2452
+#, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' должен быть �пи�ком"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1036
+#: src/main/attrib.c:1064
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "длина 'dimnames' [%d] должна �оответ�твовать 'dims' [%d]"
@@ -1161,10 +1474,18 @@
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "длина 'dimnames' [%d] не равна прот�женно�ти многомерной матрицы"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1145
+#: src/main/builtin.c:75
+#: src/main/builtin.c:112
+#: src/main/envir.c:1738
+#: src/main/envir.c:1866
+#: src/main/envir.c:1926
+#: src/main/envir.c:2063
+#: src/main/paste.c:74
+#: src/main/paste.c:293
+#: src/main/random.c:476
+#: src/main/random.c:505
+#: src/main/unique.c:1684
 msgid "invalid first argument"
 msgstr "неправильный первый аргумент"
 
@@ -1214,8 +1535,12 @@
 msgid "exactly one attribute 'which' must be given"
 msgstr "должен быть задан в точно�ти один атрибут 'which'"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1441
+#: src/main/attrib.c:1464
+#: src/main/subscript.c:248
+#: src/main/subscript.c:252
+#: src/main/subset.c:1230
+#: src/main/subset.c:1281
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "ча�тичное �оответ�твие между '%s' и '%s'"
@@ -1229,7 +1554,9 @@
 msgid "'name' must be non-null character string"
 msgstr "'name' должно быть непу�той �трокой"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1663
+#: src/main/attrib.c:1734
+#: src/main/attrib.c:1771
 msgid "invalid type or length for slot name"
 msgstr "неправильный тип или длина дл� имени �лота"
 
@@ -1253,28 +1580,24 @@
 
 #: src/main/attrib.c:1778
 #, c-format
-msgid ""
-"trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
-"slots"
-msgstr ""
-"попытка получить �лот \"%s\" из объекта базового кла��а (\"%s\") без �лотов"
+msgid "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no slots"
+msgstr "попытка получить �лот \"%s\" из объекта базового кла��а (\"%s\") без �лотов"
 
 #: src/main/attrib.c:1782
 #, c-format
-msgid ""
-"trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
-"object "
-msgstr ""
-"попытка получить �лот \"%s\" из объекта (кла�� \"%s\"), который не �вл�ет�� "
-"объектом S4"
+msgid "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 object "
+msgstr "попытка получить �лот \"%s\" из объекта (кла�� \"%s\"), который не �вл�ет�� объектом S4"
 
 #: src/main/bind.c:161
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr "получивший�� в '%s' вектор превышает предел длины вектора"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:291
+#: src/main/bind.c:327
+#: src/main/bind.c:376
+#: src/main/bind.c:449
+#: src/main/bind.c:477
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "тип '%s' в '%s' не реализован"
@@ -1291,8 +1614,11 @@
 msgid "argument not a list"
 msgstr "аргумент не �вл�ет�� �пи�ком"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1038
+#: src/main/names.c:1273
+#: src/main/names.c:1278
+#: src/main/names.c:1283
+#: src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "�лишком длинное им� кла��а в '%s'"
@@ -1316,30 +1642,57 @@
 msgid "vector size cannot be NA"
 msgstr "размер вектора не может быть NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49
+#: src/main/builtin.c:57
+#: src/main/sort.c:1303
 msgid "vector size cannot be NA/NaN"
 msgstr "размер вектора не может быть NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50
+#: src/main/builtin.c:58
+#: src/main/sort.c:1304
 msgid "vector size cannot be infinite"
 msgstr "размер вектора не может быть неопределенным"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
+#: src/main/builtin.c:51
+#: src/main/builtin.c:59
+#: src/main/builtin.c:941
 #: src/main/sort.c:1305
 msgid "vector size specified is too large"
 msgstr "указанный размер вектора �лишком велик"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84
+#: src/main/builtin.c:93
+#: src/main/builtin.c:294
+#: src/main/builtin.c:327
+#: src/main/builtin.c:384
+#: src/main/builtin.c:398
+#: src/main/coerce.c:1519
+#: src/main/connections.c:3062
+#: src/main/engine.c:2967
+#: src/main/envir.c:999
+#: src/main/envir.c:1052
+#: src/main/envir.c:1208
+#: src/main/envir.c:1747
+#: src/main/envir.c:1871
+#: src/main/envir.c:1937
+#: src/main/envir.c:2070
+#: src/main/envir.c:2789
+#: src/main/envir.c:2875
+#: src/main/envir.c:3167
+#: src/main/envir.c:3196
+#: src/main/envir.c:3217
+#: src/main/envir.c:3240
+#: src/main/envir.c:3275
+#: src/main/envir.c:3296
+#: src/main/envir.c:3617
+#: src/main/envir.c:3622
+#: src/main/eval.c:6114
+#: src/main/objects.c:191
+#: src/main/objects.c:199
+#: src/main/saveload.c:2070
+#: src/main/saveload.c:2362
+#: src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "и�пользование окружени� NULL не одобр�ет��"
 
@@ -1351,7 +1704,8 @@
 msgid "'enclos' must be an environment"
 msgstr "'enclos' должен быть окружением"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:353
+#: src/main/builtin.c:389
 msgid "argument is not an environment"
 msgstr "аргумент не �вл�ет�� окружением"
 
@@ -1375,16 +1729,23 @@
 msgid "'parent' is not an environment"
 msgstr "'parent' не �вл�ет�� окружением"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:546
+#: src/main/connections.c:3689
+#: src/main/connections.c:4072
+#: src/main/connections.c:4106
+#: src/main/connections.c:4484
+#: src/main/connections.c:4554
+#: src/main/connections.c:4763
+#: src/main/connections.c:4767
+#: src/main/connections.c:5212
+#: src/main/deparse.c:368
+#: src/main/deparse.c:457
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "не могу запи�ать в �то �оединение"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:551
+#: src/main/builtin.c:581
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "неправильное определение '%s'"
@@ -1407,19 +1768,31 @@
 msgid "cannot set length of non-vector"
 msgstr "у�тановить длину дл� не-вектора"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:922
+#: src/main/builtin.c:932
+#: src/main/options.c:653
 msgid "invalid argument"
 msgstr "неправильный аргумент"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:924
+#: src/main/builtin.c:934
+#: src/main/builtin.c:936
+#: src/main/character.c:415
+#: src/main/coerce.c:2813
 msgid "invalid value"
 msgstr "неправильное значение"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:967
+#: src/main/coerce.c:2522
+#: src/main/coerce.c:2565
+#: src/main/eval.c:562
+#: src/main/eval.c:682
+#: src/main/eval.c:2175
+#: src/main/eval.c:2255
+#: src/main/eval.c:2316
+#: src/main/eval.c:2654
+#: src/main/eval.c:5459
+#: src/main/eval.c:5576
 msgid "'...' used in an incorrect context"
 msgstr "'...' и�пользовано в неправильном контек�те"
 
@@ -1432,11 +1805,13 @@
 msgid "'EXPR' is missing"
 msgstr "'EXPR' от�ут�твует"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1026
+#: src/main/eval.c:5931
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR должно быть вектором единичной длины"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1029
+#: src/main/eval.c:5934
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
@@ -1445,30 +1820,36 @@
 "EXPR -- �то \"factor\", ра��матриваемый как целое чи�ло.\n"
 " Попробуйте и�пользовать '%s' взамен."
 
-#: src/main/character.c:104 src/main/character.c:146
-#, fuzzy, c-format
+#: src/main/character.c:104
+#: src/main/character.c:146
+#, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
-msgstr[0] "%d аргумент передан '%s', а требует�� %d"
-msgstr[1] "%d аргумента переданы '%s', а требует�� %d"
-msgstr[2] "%d аргументов переданы '%s', а требует�� %d"
-
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
+msgstr[0] "%d аргумент передан '%s', а требует�� %d дл� %d"
+msgstr[1] "%d аргумента переданы '%s', а требует�� %d дл� %d"
+msgstr[2] "%d аргументов переданы '%s', а требует�� %d дл� %d"
+
+#: src/main/character.c:111
+#: src/main/character.c:114
+#: src/main/character.c:152
 #: src/main/character.c:155
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s' требует тек�тового вектора"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
+#: src/main/character.c:193
+#: src/main/character.c:209
+#: src/main/character.c:219
+#: src/main/character.c:244
+#: src/main/character.c:702
+#: src/main/character.c:799
 #, c-format
 msgid "invalid multibyte string %d"
 msgstr "неправильна� многобайтна� �трока %d"
 
 #: src/main/character.c:203
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable for element %d in \"bytes\" encoding"
 msgstr "чи�ло �имволов не вычи�лимо дл� �лемента %d в кодировке \"bytes\""
 
 #: src/main/character.c:232
@@ -1480,7 +1861,8 @@
 msgid "extracting substrings from a non-character object"
 msgstr "извлечение под�трок из не-тек�тового объекта"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:317
+#: src/main/character.c:412
 msgid "invalid substring arguments"
 msgstr "неправильный под�троковый аргумент(ы)"
 
@@ -1500,7 +1882,8 @@
 msgid "non-character names"
 msgstr "не-тек�товые имена"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:745
+#: src/main/grep.c:163
 msgid "non-character argument"
 msgstr "не-тек�товый аргумент"
 
@@ -1530,7 +1913,8 @@
 msgid "invalid multibyte string 'new'"
 msgstr "неправильный многобайтна� �трока 'new'"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1181
+#: src/main/character.c:1270
 msgid "'old' is longer than 'new'"
 msgstr "'old' длиннее чем 'new'"
 
@@ -1551,16 +1935,17 @@
 msgid "applies only to lists and vectors"
 msgstr "применимо только к �пи�кам и векторам"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77
+#: src/main/errors.c:1222
 msgid "NAs introduced by coercion"
 msgstr "в результате преобразовани� �озданы NA"
 
 #: src/main/coerce.c:79
-#, fuzzy
 msgid "NAs introduced by coercion to integer range"
-msgstr "в результате преобразовани� �озданы NA"
+msgstr "в результате целочи�ленного преобразовани� �озданы NA"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81
+#: src/main/errors.c:1224
 msgid "imaginary parts discarded in coercion"
 msgstr "мнимые ча�ти убраны при преобразовании"
 
@@ -1588,7 +1973,8 @@
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(�имвол) объект не может быть преобразован в тип '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1152
+#: src/main/coerce.c:1467
 msgid "no method for coercing this S4 class to a vector"
 msgstr "От�ут�твует метод дл� конвер�ии данного кла��а S4 в вектор"
 
@@ -1596,141 +1982,122 @@
 msgid "environments cannot be coerced to other types"
 msgstr "окружени� не могут быть преобразованы в другие типы"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1357
 msgid "attempting to coerce non-factor"
 msgstr "попытка конвер�ии не-фактора"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1362
+#: src/main/coerce.c:1372
 msgid "malformed factor"
-msgstr ""
+msgstr "неправильный фактор"
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1515
 msgid "list argument expected"
 msgstr "ожидает�� аргумент-�пи�ок"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1523
+#: src/main/eval.c:6118
 msgid "invalid environment"
 msgstr "неправильное окружение"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1527
 msgid "argument must have length at least 1"
 msgstr "аргумент должен быть по крайней мере единичной длины"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1549
 msgid "invalid body for function"
 msgstr "неправильное тело функции"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1572
 msgid "invalid length 0 argument"
 msgstr "неправильный аргумент нулевой длины"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1587
 msgid "invalid argument list"
 msgstr "неправильный �пи�ок аргументов"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1899
 msgid "type \"single\" unimplemented in R"
 msgstr "тип \"single\" не реализован в R"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1901
 msgid "unimplemented predicate"
 msgstr "нереализованный предикат"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2053
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() применен к не-�пи�ку/вектору типа '%s'"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2250
+#: src/main/coerce.c:2313
+#: src/main/coerce.c:2384
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "метод по умолчанию дл� типа '%s' не �делан"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2405
 msgid "'name' is missing"
 msgstr "'name' от�ут�твует"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2412
 msgid "first argument must be a character string"
 msgstr "первый аргумент должен быть тек�товой �трокой"
 
-#: src/main/coerce.c:2449
+#: src/main/coerce.c:2445
 msgid "'what' must be a character string or a function"
 msgstr "'what' должен быть тек�товой �трокой или функцией"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2449
 msgid "'args' must be a list or expression"
 msgstr "'args' должны быть �пи�ком или выражением"
 
 #: src/main/coerce.c:2456
-#, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' должен быть �пи�ком"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/unique.c:1285
 msgid "'envir' must be an environment"
 msgstr "'envir' должен быть окружением"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2615
 msgid "invalid environment specified"
 msgstr "задано неправильное окружение"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2681
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
-msgstr ""
-"Вы�тавл�ю атрибут class(x) в NULL;   результат не будет �вл�ть�� объектом S4"
+msgstr "Вы�тавл�ю атрибут class(x) в NULL;   результат не будет �вл�ть�� объектом S4"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2684
 #, c-format
-msgid ""
-"Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
-"longer be an S4 object"
-msgstr ""
-"Вы�тавл�ю class(x) в набор �трок (\"%s\", \"%s\", ...);  результат не будет "
-"�вл�ть�� объектом S4"
+msgid "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no longer be an S4 object"
+msgstr "Вы�тавл�ю class(x) в набор �трок (\"%s\", \"%s\", ...);  результат не будет �вл�ть�� объектом S4"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2688
 #, c-format
-msgid ""
-"Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
-"an S4 object"
-msgstr ""
-"У�тановка class(x) в \"%s\" вы�тавл�ет атрибут в NULL; результат не будет "
-"больше объектом S4"
+msgid "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be an S4 object"
+msgstr "У�тановка class(x) в \"%s\" вы�тавл�ет атрибут в NULL; результат не будет больше объектом S4"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2721
 msgid "invalid replacement object to be a class string"
 msgstr "неправильный замещающий объект, дл� того чтобы быть кла��овой �трокой"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2742
 #, c-format
-msgid ""
-"\"%s\" can only be set as the class if the object has this type; found \"%s\""
-msgstr ""
-"\"%s\" может быть у�тановлен как кла�� е�ли объект имеет �тот тип; найден "
-"\"%s\""
+msgid "\"%s\" can only be set as the class if the object has this type; found \"%s\""
+msgstr "\"%s\" может быть у�тановлен как кла�� е�ли объект имеет �тот тип; найден \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2760
 #, c-format
-msgid ""
-"invalid to set the class to matrix unless the dimension attribute is of "
-"length 2 (was %d)"
-msgstr ""
-"не �по�обен правильно у�тановить кла�� дл� матрицы покуда атрибут "
-"'dimension' не �танет длиной 2 (был %d)"
+msgid "invalid to set the class to matrix unless the dimension attribute is of length 2 (was %d)"
+msgstr "не �по�обен правильно у�тановить кла�� дл� матрицы покуда атрибут 'dimension' не �танет длиной 2 (был %d)"
 
-#: src/main/coerce.c:2772
-msgid ""
-"cannot set class to \"array\" unless the dimension attribute has length > 0"
-msgstr ""
-"не могу у�тановить кла�� дл� \"array\" до тех пор, пока атрибут \"dimension"
-"\" не �танет > 0"
+#: src/main/coerce.c:2768
+msgid "cannot set class to \"array\" unless the dimension attribute has length > 0"
+msgstr "не могу у�тановить кла�� дл� \"array\" до тех пор, пока атрибут \"dimension\" не �танет > 0"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2804
 msgid "'value' must be non-null character string"
 msgstr "'value' должно быть непу�той �трокой"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2817
 msgid "invalid to change the storage mode of a factor"
 msgstr "не могу помен�ть тип хранени� фактора"
 
@@ -1771,22 +2138,32 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "закрываю неи�пользованное �оединение %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229
+#: src/main/sysutils.c:625
+#: src/main/sysutils.c:828
+#: src/main/sysutils.c:843
+#: src/main/sysutils.c:972
+#: src/main/sysutils.c:1045
+#: src/main/sysutils.c:1055
+#: src/main/sysutils.c:1068
+#: src/main/sysutils.c:1466
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "неподдерживаема� конвертаци� из '%s' в '%s'"
 
-#: src/main/connections.c:285 src/main/connections.c:300
-#: src/main/connections.c:451 src/main/connections.c:456
-#: src/main/connections.c:461 src/main/connections.c:472
+#: src/main/connections.c:285
+#: src/main/connections.c:300
+#: src/main/connections.c:451
+#: src/main/connections.c:456
+#: src/main/connections.c:461
+#: src/main/connections.c:472
 #: src/main/connections.c:478
 #, c-format
 msgid "%s not enabled for this connection"
 msgstr "%s не допущен дл� �того �оединени�"
 
-#: src/main/connections.c:330 src/main/connections.c:347
+#: src/main/connections.c:330
+#: src/main/connections.c:347
 #: src/main/connections.c:2910
 msgid "printing of extremely long output is truncated"
 msgstr "печать �лишком длинного вывода обрезана"
@@ -1813,11 +2190,13 @@
 msgid "connection is not open for writing"
 msgstr "�оединение не открыто дл� запи�и"
 
-#: src/main/connections.c:726 src/main/connections.c:2223
+#: src/main/connections.c:726
+#: src/main/connections.c:2223
 msgid "can only truncate connections open for writing"
 msgstr "могу укоротить только открытые дл� запи�и �оединени�"
 
-#: src/main/connections.c:730 src/main/connections.c:732
+#: src/main/connections.c:730
+#: src/main/connections.c:732
 msgid "file truncation failed"
 msgstr "укорочение файла не удало�ь"
 
@@ -1825,12 +2204,15 @@
 msgid "file truncation unavailable on this platform"
 msgstr "укорочение файла недо�тупно дл� �той платформы"
 
-#: src/main/connections.c:780 src/main/connections.c:784
-#: src/main/connections.c:790 src/main/connections.c:807
+#: src/main/connections.c:780
+#: src/main/connections.c:784
+#: src/main/connections.c:790
+#: src/main/connections.c:807
 msgid "allocation of file connection failed"
 msgstr "выделение файлового �оединени� не удало�ь"
 
-#: src/main/connections.c:858 src/main/connections.c:1035
+#: src/main/connections.c:858
+#: src/main/connections.c:1035
 #, c-format
 msgid "cannot create fifo '%s', reason '%s'"
 msgstr "не могу �оздать fifo-канал '%s' по причине '%s'"
@@ -1850,17 +2232,24 @@
 msgid "cannot open fifo '%s'"
 msgstr "не могу открыть fifo-канал '%s'"
 
-#: src/main/connections.c:920 src/main/connections.c:931
-#: src/main/connections.c:1095 src/main/connections.c:1114
-#: src/main/connections.c:1524 src/main/connections.c:1534
-#: src/main/connections.c:1653 src/main/connections.c:1713
-#: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
+#: src/main/connections.c:920
+#: src/main/connections.c:931
+#: src/main/connections.c:1095
+#: src/main/connections.c:1114
+#: src/main/connections.c:1524
+#: src/main/connections.c:1534
+#: src/main/connections.c:1653
+#: src/main/connections.c:1713
+#: src/main/connections.c:2240
+#: src/main/connections.c:2257
+#: src/main/connections.c:2566
+#: src/main/connections.c:5393
 #: src/main/connections.c:5457
 msgid "too large a block specified"
 msgstr "определен �лишком большой блок"
 
-#: src/main/connections.c:989 src/main/connections.c:995
+#: src/main/connections.c:989
+#: src/main/connections.c:995
 msgid "allocation of fifo name failed"
 msgstr "размещение имени fifo не удало�ь"
 
@@ -1869,7 +2258,8 @@
 msgid "cannot open fifo '%s', reason '%s'"
 msgstr "не могу открыть fifo '%s' по причине '%s'"
 
-#: src/main/connections.c:1098 src/main/connections.c:1122
+#: src/main/connections.c:1098
+#: src/main/connections.c:1122
 msgid "allocation of fifo buffer failed"
 msgstr "размещение буфера fifo не удало�ь"
 
@@ -1878,34 +2268,48 @@
 msgid "cannot write FIFO '%s'"
 msgstr "не могу запи�ать FIFO '%s'"
 
-#: src/main/connections.c:1166 src/main/connections.c:1170
-#: src/main/connections.c:1176 src/main/connections.c:1192
+#: src/main/connections.c:1166
+#: src/main/connections.c:1170
+#: src/main/connections.c:1176
+#: src/main/connections.c:1192
 msgid "allocation of fifo connection failed"
 msgstr "размещение fifo �оединени� не удало�ь"
 
-#: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
+#: src/main/connections.c:1210
+#: src/main/connections.c:1369
+#: src/main/connections.c:1991
+#: src/main/connections.c:3209
 #: src/main/connections.c:4977
 msgid "only first element of 'description' argument used"
 msgstr "и�пользован только первый �лемент аргумента 'description'"
 
 #: src/main/connections.c:1227
-msgid ""
-"fifo(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
-msgstr ""
-"fifo(\"\") поддерживает только open = \"w+\" и open = \"w+b\": и�пользую "
-"второе"
+msgid "fifo(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
+msgstr "fifo(\"\") поддерживает только open = \"w+\" и open = \"w+b\": и�пользую второе"
 
-#: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
-#: src/main/serialize.c:2267 src/main/source.c:270
+#: src/main/connections.c:1242
+#: src/main/connections.c:1407
+#: src/main/connections.c:2058
+#: src/main/connections.c:3176
+#: src/main/connections.c:3230
+#: src/main/connections.c:3278
+#: src/main/connections.c:3565
+#: src/main/connections.c:3681
+#: src/main/connections.c:3843
+#: src/main/connections.c:4099
+#: src/main/connections.c:4427
+#: src/main/connections.c:4547
+#: src/main/connections.c:4759
+#: src/main/connections.c:5193
+#: src/main/dcf.c:94
+#: src/main/deparse.c:360
+#: src/main/deparse.c:449
+#: src/main/saveload.c:2267
+#: src/main/saveload.c:2348
+#: src/main/scan.c:933
+#: src/main/serialize.c:2216
+#: src/main/serialize.c:2267
+#: src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "не могу открыть �оединение"
 
@@ -1923,7 +2327,8 @@
 msgid "cannot open pipe() cmd '%s': %s"
 msgstr "не могу открыть pipe() командой '%s': %s"
 
-#: src/main/connections.c:1464 src/main/connections.c:1784
+#: src/main/connections.c:1464
+#: src/main/connections.c:1784
 #, c-format
 msgid "cannot open compressed file '%s', probable reason '%s'"
 msgstr "не могу открыть �жатый файл '%s', возможна� причина -- '%s'"
@@ -1936,8 +2341,10 @@
 msgid "seek on a gzfile connection returned an internal error"
 msgstr "пои�к gzfile-�оединени� вернул внутреннюю ошибку"
 
-#: src/main/connections.c:1543 src/main/connections.c:1547
-#: src/main/connections.c:1553 src/main/connections.c:1570
+#: src/main/connections.c:1543
+#: src/main/connections.c:1547
+#: src/main/connections.c:1553
+#: src/main/connections.c:1570
 msgid "allocation of gzfile connection failed"
 msgstr "выделение gzfile-�оединени� не удало�ь"
 
@@ -1962,16 +2369,18 @@
 
 #: src/main/connections.c:1678
 #, c-format
-msgid ""
-"file '%s' has trailing content that appears not to be compressed by bzip2"
+msgid "file '%s' has trailing content that appears not to be compressed by bzip2"
 msgstr "файл '%s', по-видимому, �жат не bzip2"
 
-#: src/main/connections.c:1724 src/main/connections.c:1728
-#: src/main/connections.c:1734 src/main/connections.c:1751
+#: src/main/connections.c:1724
+#: src/main/connections.c:1728
+#: src/main/connections.c:1734
+#: src/main/connections.c:1751
 msgid "allocation of bzfile connection failed"
 msgstr "выделение bzfile-�оединени� не удало�ь"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797
+#: src/main/connections.c:6050
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "не могу включить декодер lzma, ошибка %d"
@@ -1981,8 +2390,10 @@
 msgid "cannot initialize lzma encoder, error %d"
 msgstr "не могу включить кодер lzma, ошибка %d"
 
-#: src/main/connections.c:1941 src/main/connections.c:1945
-#: src/main/connections.c:1951 src/main/connections.c:1969
+#: src/main/connections.c:1941
+#: src/main/connections.c:1945
+#: src/main/connections.c:1951
+#: src/main/connections.c:1969
 msgid "allocation of xzfile connection failed"
 msgstr "выделение xzfile-�оединени� не удало�ь"
 
@@ -1991,11 +2402,13 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr "�то %s-архивированный файл, который не поддерживает данна� �борка R"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124
+#: src/modules/X11/devX11.c:3375
 msgid "memory allocation to copy clipboard failed"
 msgstr "выделение пам�ти дл� копировани� буфера обмена не удало�ь"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
+#: src/main/connections.c:2129
+#: src/modules/X11/devX11.c:3354
 #: src/modules/X11/devX11.c:3359
 msgid "clipboard cannot be opened or contains no text"
 msgstr "буфер обмена не может быть открыт или не �одержит тек�та"
@@ -2032,27 +2445,31 @@
 msgid "'mode' for the clipboard must be 'r' on Unix"
 msgstr "'mode' дл� буфера обмена должна быть 'r' в  Unix"
 
-#: src/main/connections.c:2302 src/main/connections.c:2308
-#: src/main/connections.c:2314 src/main/connections.c:2331
+#: src/main/connections.c:2302
+#: src/main/connections.c:2308
+#: src/main/connections.c:2314
+#: src/main/connections.c:2331
 msgid "allocation of clipboard connection failed"
 msgstr "выделение �оединени� � буфером обмена не удало�ь"
 
-#: src/main/connections.c:2400 src/main/connections.c:2404
+#: src/main/connections.c:2400
+#: src/main/connections.c:2404
 #: src/main/connections.c:2410
 msgid "allocation of terminal connection failed"
 msgstr "выделение �оединени� � терминалом не удало�ь"
 
 #: src/main/connections.c:2543
 msgid "attempting to add too many elements to raw vector"
-msgstr ""
-"попытка добавлени� �лишком большого количе�тва �лементов в про�той вектор"
+msgstr "попытка добавлени� �лишком большого количе�тва �лементов в про�той вектор"
 
 #: src/main/connections.c:2595
 msgid "attempt to seek outside the range of the raw connection"
 msgstr "попытка пои�ка вне обла�ти про�того �оединени�"
 
-#: src/main/connections.c:2606 src/main/connections.c:2610
-#: src/main/connections.c:2616 src/main/connections.c:2642
+#: src/main/connections.c:2606
+#: src/main/connections.c:2610
+#: src/main/connections.c:2616
+#: src/main/connections.c:2642
 msgid "allocation of raw connection failed"
 msgstr "размещение про�того �оединени� не удало�ь"
 
@@ -2076,10 +2493,14 @@
 msgid "seek is not relevant for text connection"
 msgstr "пои�к дл� тек�тового �оединени� неуме�тен"
 
-#: src/main/connections.c:2798 src/main/connections.c:2802
-#: src/main/connections.c:2808 src/main/connections.c:2821
-#: src/main/connections.c:3008 src/main/connections.c:3012
-#: src/main/connections.c:3018 src/main/connections.c:3031
+#: src/main/connections.c:2798
+#: src/main/connections.c:2802
+#: src/main/connections.c:2808
+#: src/main/connections.c:2821
+#: src/main/connections.c:3008
+#: src/main/connections.c:3012
+#: src/main/connections.c:3018
+#: src/main/connections.c:3031
 #: src/main/connections.c:3037
 msgid "allocation of text connection failed"
 msgstr "выделение тек�тового �оединени� не удало�ь"
@@ -2104,11 +2525,16 @@
 msgid "sockets are not available on this system"
 msgstr "дл� �той �и�темы �океты недо�тупны"
 
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3258
+#: src/main/connections.c:3307
+#: src/main/connections.c:3318
+#: src/main/connections.c:3365
+#: src/main/connections.c:3390
+#: src/main/connections.c:3413
+#: src/main/connections.c:3425
+#: src/main/connections.c:3541
+#: src/main/connections.c:3666
+#: src/main/connections.c:5496
 msgid "'con' is not a connection"
 msgstr "'con' не �вл�ет�� �оединением"
 
@@ -2136,25 +2562,35 @@
 msgid "cannot close 'message' sink connection"
 msgstr "не могу закрыть sink-�оединение дл� �ообщений"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3392
+#: src/main/connections.c:5211
+#: src/main/connections.c:5219
+#: src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "�оединение не открыто"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3488
+#: src/main/connections.c:3500
 msgid "line longer than buffer size"
 msgstr "�трока длиннее буфера"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
-#: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
+#: src/main/connections.c:3572
+#: src/main/connections.c:3574
+#: src/main/connections.c:3851
+#: src/main/connections.c:4410
+#: src/main/connections.c:4435
+#: src/main/connections.c:5220
+#: src/main/dcf.c:101
+#: src/main/scan.c:936
+#: src/main/scan.c:940
+#: src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "не могу читать из �того �оединени�"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3586
+#: src/main/connections.c:3608
 msgid "cannot allocate buffer in readLines"
 msgstr "не могу разме�тить буфер в readLines"
 
@@ -2184,14 +2620,19 @@
 msgid "can only read from a binary connection"
 msgstr "могу только читать из бинарного �оединени�"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3868
+#: src/main/connections.c:4180
 msgid "size changing is not supported for complex vectors"
 msgstr "изменение размера не поддерживает�� дл� комплек�ных векторов"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
+#: src/main/connections.c:3907
+#: src/main/connections.c:3925
+#: src/main/connections.c:3951
+#: src/main/connections.c:4013
+#: src/main/connections.c:4034
+#: src/main/connections.c:4161
+#: src/main/connections.c:4174
+#: src/main/connections.c:4233
 #: src/main/connections.c:4265
 #, c-format
 msgid "size %d is unknown on this machine"
@@ -2221,8 +2662,10 @@
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "только 2^31-1 байта можно запи�ать в один вызов writeBin()"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4140
+#: src/main/connections.c:4293
+#: src/main/connections.c:4574
+#: src/main/connections.c:4614
 msgid "problem writing to connection"
 msgstr "проблема запи�и в �оединение"
 
@@ -2230,7 +2673,8 @@
 msgid "size changing is not supported for raw vectors"
 msgstr "изменение размера не поддерживает�� дл� про�тых векторов"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
+#: src/main/connections.c:4328
+#: src/main/connections.c:4332
 #: src/main/connections.c:4371
 msgid "invalid UTF-8 input in readChar()"
 msgstr "неправильный UTF-8 ввод в readChar()"
@@ -2248,30 +2692,30 @@
 msgstr "writeChar: запрошено больше байтов, чем е�ть в �троке -- буду обнул�ть"
 
 #: src/main/connections.c:4588
-msgid ""
-"writeChar: more characters requested than are in the string - will zero-pad"
-msgstr ""
-"writeChar: запрошено больше �имволов, чем е�ть в �троке -- буду обнул�ть"
+msgid "writeChar: more characters requested than are in the string - will zero-pad"
+msgstr "writeChar: запрошено больше �имволов, чем е�ть в �троке -- буду обнул�ть"
 
 #: src/main/connections.c:4642
 msgid "maximum number of pushback lines exceeded"
 msgstr "превышено мак�имальное количе�тво возвращаемых в поток �трок"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4648
+#: src/main/connections.c:4652
+#: src/main/connections.c:4689
+#: src/main/connections.c:4697
 msgid "could not allocate space for pushback"
 msgstr "не могу разме�тить ме�то дл� возвращени� в поток"
 
 #: src/main/connections.c:4680
 msgid "can only push back on open readable connections"
-msgstr ""
-"могу только выталкивать назад из открытых до�тупных дл� чтени� �оединений"
+msgstr "могу только выталкивать назад из открытых до�тупных дл� чтени� �оединений"
 
 #: src/main/connections.c:4682
 msgid "can only push back on text-mode connections"
 msgstr "могу только выталкивать назад из тек�товых �оединений"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4744
+#: src/main/connections.c:4814
 msgid "sink stack is full"
 msgstr "�тек 'sink' полон"
 
@@ -2297,13 +2741,11 @@
 msgstr "method = \"wininet\" поддерживает�� полько под Windows"
 
 #: src/main/connections.c:5116
-msgid ""
-"file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
-msgstr ""
-"файл(\"\") поддерживает только open = \"w+\" and open = \"w+b\": и�пользую "
-"второе"
+msgid "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
+msgstr "файл(\"\") поддерживает только open = \"w+\" and open = \"w+b\": и�пользую второе"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
+#: src/main/connections.c:5170
+#: src/modules/internet/internet.c:153
 #: src/modules/internet/internet.c:274
 msgid "URL scheme unsupported by this method"
 msgstr "�хема URL не поддерживает�� �тим методом"
@@ -2347,19 +2789,16 @@
 
 #: src/main/connections.c:5515
 msgid "using a text-mode 'file' connection may not work correctly"
-msgstr ""
-"и�пользование тек�тового �оединени� 'file' может не работать как положено"
+msgstr "и�пользование тек�тового �оединени� 'file' может не работать как положено"
 
 #: src/main/connections.c:5518
-msgid ""
-"cannot create a 'gzcon' connection from a writable textConnection; maybe use "
-"rawConnection"
-msgstr ""
-"не могу �оздать �оединение 'gzcon' из textConnection, открытого дл� запи�и; "
-"возможно, поможет rawConnection"
+msgid "cannot create a 'gzcon' connection from a writable textConnection; maybe use rawConnection"
+msgstr "не могу �оздать �оединение 'gzcon' из textConnection, открытого дл� запи�и; возможно, поможет rawConnection"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5521
+#: src/main/connections.c:5525
+#: src/main/connections.c:5532
+#: src/main/connections.c:5546
 msgid "allocation of 'gzcon' connection failed"
 msgstr "выделить gzcon-�оединение не удало�ь"
 
@@ -2379,7 +2818,8 @@
 msgid "unknown compression, assuming none"
 msgstr "неизве�тный архиватор, предполагаю, что архивации не было"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
+#: src/main/connections.c:6112
+#: src/main/connections.c:6116
 #: src/main/connections.c:6122
 #, c-format
 msgid "allocation of %s connection failed"
@@ -2397,8 +2837,12 @@
 msgid "target context is not on the stack"
 msgstr "целевой контек�т не находит�� в �теке"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:339
+#: src/main/context.c:355
+#: src/main/context.c:422
+#: src/main/context.c:443
+#: src/main/context.c:455
+#: src/main/context.c:467
 msgid "not that many frames on the stack"
 msgstr "не так много кадров в �теке"
 
@@ -2432,8 +2876,7 @@
 
 #: src/main/cum.c:49
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
-msgstr ""
-"целочи�ленное переполнение в 'cumsum'; и�пользуйте 'cumsum(as.numeric(.))'"
+msgstr "целочи�ленное переполнение в 'cumsum'; и�пользуйте 'cumsum(as.numeric(.))'"
 
 #: src/main/cum.c:180
 msgid "'cummax' not defined for complex numbers"
@@ -2443,11 +2886,14 @@
 msgid "'cummin' not defined for complex numbers"
 msgstr "'cummin' не определено дл� комплек�ных чи�ел"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:210
+#: src/main/cum.c:237
 msgid "unknown cumxxx function"
 msgstr "неизве�тна� функци� 'cumxxx'"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
+#: src/main/datetime.c:558
+#: src/main/datetime.c:566
+#: src/main/datetime.c:580
 #: src/main/datetime.c:585
 msgid "problem with setting timezone"
 msgstr "проблема у�тановки ча�ового по��а"
@@ -2456,16 +2902,22 @@
 msgid "cannot set timezones on this system"
 msgstr "не могу у�тановить ча�овые по��а дл� �той �и�темы"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:592
+#: src/main/datetime.c:594
 msgid "problem with unsetting timezone"
 msgstr "проблема выключени� ча�ового по��а"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:814
+#: src/main/datetime.c:816
+#: src/main/datetime.c:911
+#: src/main/datetime.c:1257
+#: src/main/datetime.c:1259
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "нулева� �о�тавл�юща� в непу�той \"POSIXlt\"-�труктуре"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:113
+#: src/main/dcf.c:181
+#: src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "не могу разме�тить пам�ть дл� 'read.dcf'"
 
@@ -2492,7 +2944,9 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "Значение '%s' должно быть TRUE или FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139
+#: src/main/debug.c:167
+#: src/main/debug.c:237
 msgid "argument must not be a function"
 msgstr "аргумент не должен быть функцией"
 
@@ -2508,11 +2962,14 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr "'tracemem' бе�полезна дл� �лабых ��ылок и внешних указателей"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:178
+#: src/main/debug.c:183
 msgid "R was not compiled with support for memory profiling"
 msgstr "R не был �компилирован � поддержкой профилировани� пам�ти"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:155
+#: src/main/sprintf.c:216
+#: src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "�лишком мало аргументов"
 
@@ -2532,11 +2989,15 @@
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "'deparse' может быть недо�тупным дл� source() в R < 2.7.0"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:349
+#: src/main/deparse.c:399
+#: src/main/source.c:206
 msgid "'file' must be a character string or connection"
 msgstr "'file' должен быть тек�товой �трокой или �оединением"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:377
+#: src/main/deparse.c:472
+#: src/main/deparse.c:478
 msgid "wrote too few characters"
 msgstr "запи�ано �лишком мало �имволов"
 
@@ -2552,9 +3013,15 @@
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts' должен быть малым положительным целым чи�лом"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:421
+#: src/main/envir.c:1896
+#: src/main/envir.c:1981
+#: src/main/eval.c:568
+#: src/main/eval.c:1332
+#: src/main/eval.c:4127
+#: src/main/saveload.c:1978
+#: src/main/saveload.c:2310
+#: src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "объект '%s' не найден"
@@ -2567,11 +3034,13 @@
 msgid "the base graphics system is not registered"
 msgstr "базова� графиче�ка� �и�тема не зареги�трирована"
 
-#: src/main/devices.c:166 src/main/devices.c:174
+#: src/main/devices.c:166
+#: src/main/devices.c:174
 msgid "no active or default device"
 msgstr "нет активного или умалчиваемого у�трой�тва"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:387
+#: src/main/devices.c:449
 msgid "too many open devices"
 msgstr "�лишком много открытых у�трой�тв"
 
@@ -2583,7 +3052,8 @@
 msgid "Hit <Return> to see next plot: "
 msgstr "�ажмите <Ввод>, чтобы увидеть �ледующий график:"
 
-#: src/main/dotcode.c:127 src/main/dotcode.c:157
+#: src/main/dotcode.c:127
+#: src/main/dotcode.c:157
 msgid "NULL value passed as symbol address"
 msgstr "NULL-значение передано как �имволиче�кий адре�"
 
@@ -2592,19 +3062,18 @@
 msgid "Unimplemented type %d in createRSymbolObject"
 msgstr "�ереализованный тип %d у createRSymbolObject"
 
-#: src/main/dotcode.c:162 src/main/dotcode.c:260
+#: src/main/dotcode.c:162
+#: src/main/dotcode.c:260
 #, c-format
 msgid "symbol '%s' is too long"
 msgstr "�имвол '%s' �лишком длинен"
 
 #: src/main/dotcode.c:174
-msgid ""
-"first argument must be a string (of length 1) or native symbol reference"
-msgstr ""
-"первый аргумент должен быть �трокой (единичной длины) или е�те�твенной "
-"�имвольной ��ылкой"
+msgid "first argument must be a string (of length 1) or native symbol reference"
+msgstr "первый аргумент должен быть �трокой (единичной длины) или е�те�твенной �имвольной ��ылкой"
 
-#: src/main/dotcode.c:224 src/main/dotcode.c:1240
+#: src/main/dotcode.c:224
+#: src/main/dotcode.c:1240
 msgid "too many arguments in foreign function call"
 msgstr "�лишком много аргументов при вызове внешней функции"
 
@@ -2612,7 +3081,9 @@
 msgid "PACKAGE = \"\" is invalid"
 msgstr "PACKAGE = \"\" неправильный"
 
-#: src/main/dotcode.c:292 src/main/dotcode.c:297 src/main/dotcode.c:302
+#: src/main/dotcode.c:292
+#: src/main/dotcode.c:297
+#: src/main/dotcode.c:302
 #: src/main/dotcode.c:307
 #, c-format
 msgid "\"%s\" not available for %s() for package \"%s\""
@@ -2628,8 +3099,11 @@
 msgid "%s symbol name \"%s\" not in load table"
 msgstr "%s им� �имвола \"%s\" от�ут�твует в таблице загрузки"
 
-#: src/main/dotcode.c:368 src/main/dotcode.c:370 src/main/dotcode.c:380
-#: src/main/dotcode.c:445 src/main/dotcode.c:452
+#: src/main/dotcode.c:368
+#: src/main/dotcode.c:370
+#: src/main/dotcode.c:380
+#: src/main/dotcode.c:445
+#: src/main/dotcode.c:452
 #, c-format
 msgid "'%s' used more than once"
 msgstr "'%s' и�пользован более одного раза"
@@ -2650,24 +3124,32 @@
 msgid "no arguments supplied"
 msgstr "не заданы аргументы"
 
-#: src/main/dotcode.c:493 src/main/seq.c:911
+#: src/main/dotcode.c:493
+#: src/main/seq.c:911
 msgid "too many arguments"
 msgstr "�лишком много аргументов"
 
-#: src/main/dotcode.c:530 src/main/dotcode.c:1232 src/main/dotcode.c:1420
+#: src/main/dotcode.c:530
+#: src/main/dotcode.c:1232
+#: src/main/dotcode.c:1420
 msgid "'.NAME' is missing"
 msgstr "'NAME' от�ут�твует"
 
-#: src/main/dotcode.c:539 src/main/dotcode.c:1247 src/main/dotcode.c:1441
+#: src/main/dotcode.c:539
+#: src/main/dotcode.c:1247
+#: src/main/dotcode.c:1441
 #, c-format
 msgid "Incorrect number of arguments (%d), expecting %d for '%s'"
 msgstr "�еправильное количе�тво аргументов (%d), ожидает�� %d дл� '%s' "
 
-#: src/main/dotcode.c:1216 src/main/dotcode.c:2290
+#: src/main/dotcode.c:1216
+#: src/main/dotcode.c:2290
 msgid "too many arguments, sorry"
 msgstr "�лишком много аргументов, извините"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284
+#: src/main/dotcode.c:1301
+#: src/main/engine.c:2993
 msgid "invalid graphics state"
 msgstr "неправильное графиче�кое �о�то�ние"
 
@@ -2704,7 +3186,9 @@
 msgid "only first string in char vector used in .Fortran"
 msgstr "только перва� �трока тек�тового вектора и�пользована в .Fortran"
 
-#: src/main/dotcode.c:1659 src/main/dotcode.c:1675 src/main/dotcode.c:1686
+#: src/main/dotcode.c:1659
+#: src/main/dotcode.c:1675
+#: src/main/dotcode.c:1686
 #, c-format
 msgid "invalid mode (%s) to pass to Fortran (arg %d)"
 msgstr "неправильный режим (%s) дл� передачи в Fortran (аргумент %d)"
@@ -2742,7 +3226,8 @@
 msgid "invalid zip name argument"
 msgstr "неправильный аргумент имени zip"
 
-#: src/main/dounzip.c:316 src/main/dounzip.c:410
+#: src/main/dounzip.c:316
+#: src/main/dounzip.c:410
 msgid "zip path is too long"
 msgstr "путь zip �лишком длинный"
 
@@ -2801,7 +3286,9 @@
 msgid "write not enabled for this connection"
 msgstr "запи�ь дл� �того �оединени� невозможна"
 
-#: src/main/dounzip.c:494 src/main/dounzip.c:498 src/main/dounzip.c:504
+#: src/main/dounzip.c:494
+#: src/main/dounzip.c:498
+#: src/main/dounzip.c:504
 #: src/main/dounzip.c:521
 msgid "allocation of 'unz' connection failed"
 msgstr "размещение 'unz'-�оединени� не удало�ь"
@@ -2818,7 +3305,8 @@
 msgid "invalid argument to edit()"
 msgstr "неправильный аргумент у 'edit()'"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121
+#: src/main/saveload.c:2076
 msgid "unable to open file"
 msgstr "не могу открыть файл"
 
@@ -2869,7 +3357,9 @@
 msgid "Graphics API version mismatch"
 msgstr "�е�оответ�твие вер�ии графиче�кого API"
 
-#: src/main/engine.c:113 src/main/engine.c:118 src/main/engine.c:182
+#: src/main/engine.c:113
+#: src/main/engine.c:118
+#: src/main/engine.c:182
 msgid "unable to allocate memory (in GEregister)"
 msgstr "не могу разме�тить пам�ть (в GEregister)"
 
@@ -2881,18 +3371,30 @@
 msgid "no graphics system to unregister"
 msgstr "нет графиче�кой �и�темы дл� отмены реги�трации"
 
-#: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:443
+#: src/main/engine.c:448
+#: src/main/engine.c:456
+#: src/main/engine.c:463
+#: src/main/engine.c:477
+#: src/modules/X11/devX11.c:1157
 msgid "invalid line end"
 msgstr "неправильный конец �троки"
 
-#: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:508
+#: src/main/engine.c:513
+#: src/main/engine.c:521
+#: src/main/engine.c:528
+#: src/main/engine.c:542
+#: src/modules/X11/devX11.c:1175
 msgid "invalid line join"
 msgstr "неправильное объединение �трок"
 
-#: src/main/engine.c:761 src/main/engine.c:865 src/main/engine.c:1098
-#: src/main/engine.c:1205 src/main/engine.c:1328 src/main/engine.c:1392
+#: src/main/engine.c:761
+#: src/main/engine.c:865
+#: src/main/engine.c:1098
+#: src/main/engine.c:1205
+#: src/main/engine.c:1328
+#: src/main/engine.c:1392
 msgid "'lwd' must be non-negative and finite"
 msgstr "'lwd' должен быть положительным конечным чи�лом"
 
@@ -2975,7 +3477,8 @@
 msgid "'env' argument must be an environment"
 msgstr "аргумент 'env' должен быть окружением"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3051
+#: src/main/engine.c:3059
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "неправильный многобайтный знак в pch=\"c\""
 
@@ -2991,16 +3494,20 @@
 msgid "invalid line type: zeroes are not allowed"
 msgstr "неправильный тип линии: нули не разрешены"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3142
+#: src/main/engine.c:3150
+#: src/main/engine.c:3157
 msgid "invalid line type"
 msgstr "неправильный тип линии"
 
-#: src/main/envir.c:120 src/main/envir.c:132
+#: src/main/envir.c:120
+#: src/main/envir.c:132
 #, c-format
 msgid "cannot change value of locked binding for '%s'"
 msgstr "не могу изменить значение блокированной �в�зи '%s'"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251
+#: src/main/envir.c:1528
 msgid "cannot add bindings to a locked environment"
 msgstr "не могу добавить �в�зи в блокированное окружение"
 
@@ -3016,7 +3523,8 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "о�вобождение в базовом окружении не реализовано"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840
+#: src/main/envir.c:1816
 msgid "cannot remove bindings from a locked environment"
 msgstr "не могу убрать �в�зи в блокированном окружении"
 
@@ -3044,7 +3552,8 @@
 msgid "cannot assign values in the empty environment"
 msgstr "не могу при�ваивать значени� в пу�том окружении"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1496
+#: src/main/envir.c:1626
 msgid "cannot assign variables to this database"
 msgstr "не могу при�воить переменные �той базе данных"
 
@@ -3099,7 +3608,8 @@
 msgid "second argument must be an environment"
 msgstr "второй аргумент должен быть окружением"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2080
+#: src/main/envir.c:2088
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "неправильна� длина аргумента '%s''"
@@ -3128,117 +3638,132 @@
 msgid "detaching \"package:base\" is not allowed"
 msgstr "отделение \"package:base\" не разрешено"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2796
+#: src/main/envir.c:2877
 msgid "argument must be an environment"
 msgstr "аргумент должен быть окружением"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2881
 msgid "arguments must be symbolic"
 msgstr "аргументы должны быть �имволиче�кими"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3017
 msgid "no enclosing environment"
 msgstr "нет вложенного окружени�"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3070
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "в �пи�ке пои�ка нет пункта по имени \"%s\""
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3095
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "и�пользование 'as.environment(NULL)' не одобр�ет��"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3101
 msgid "S4 object does not extend class \"environment\""
 msgstr "объект S4 не ра�шир�ет кла�� \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3116
 msgid "invalid object for 'as.environment'"
 msgstr "неправильный объект дл� 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3142
+#: src/main/envir.c:3170
+#: src/main/envir.c:3199
+#: src/main/envir.c:3220
+#: src/main/envir.c:3243
+#: src/main/envir.c:3278
+#: src/main/envir.c:3299
 msgid "not an environment"
 msgstr "не окружение"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3194
+#: src/main/envir.c:3215
+#: src/main/envir.c:3236
+#: src/main/envir.c:3273
+#: src/main/envir.c:3294
+#: src/main/envir.c:3393
 msgid "not a symbol"
 msgstr "не �имвол"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3207
+#: src/main/envir.c:3228
+#: src/main/envir.c:3286
+#: src/main/envir.c:3307
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "нет �в�зи дл� \"%s\""
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3238
 msgid "not a function"
 msgstr "не функци�"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3246
+#: src/main/envir.c:3262
 msgid "symbol already has a regular binding"
 msgstr "�имвол уже имеет правильную �в�зь"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3248
+#: src/main/envir.c:3264
 msgid "cannot change active binding if binding is locked"
 msgstr "не могу изменить активную �в�зь когда �в�зь блокирована"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3352
+#: src/main/envir.c:3589
 msgid "unknown op"
 msgstr "неизве�тный op"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3397
 msgid "cannot unbind a locked binding"
 msgstr "не могу о�вободить блокированную �в�зь"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3399
 msgid "cannot unbind an active binding"
 msgstr "не могу о�вободить активную �в�зь"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3540
 msgid "bad namespace name"
 msgstr "неправильное им� про�тран�тва имен"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3552
 msgid "namespace already registered"
 msgstr "про�тран�тво имен уже зареги�трировано"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3564
 msgid "namespace not registered"
 msgstr "про�тран�тво имен не реги�трировано"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3620
 msgid "bad import environment argument"
 msgstr "неправильный аргумент импорта окружени�"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3625
 msgid "bad export environment argument"
 msgstr "неправильный аргумент �к�порта окружени�"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3629
 msgid "length of import and export names must match"
 msgstr "длины �к�портируемых и импортируемых имен должны �овпадать"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3652
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "�к�портируемый �имвол '%s' не имеет значени�"
 
 # fuzzy, c-format
-#: src/main/envir.c:3816
+#: src/main/envir.c:3817
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "неизве�тна� кодировка: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3837
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "внутреннее nul в �троке: '%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:171
+#: src/main/errors.c:208
 msgid "interrupts suspended; signal ignored"
 msgstr "прерывани� заморожены; �игнал пропущен"
 
@@ -3264,11 +3789,15 @@
 msgid "Warning in %s :"
 msgstr "Предупреждение в %s :"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:368
+#: src/main/errors.c:382
+#: src/main/errors.c:695
 msgid "Calls:"
 msgstr "Вызовы:"
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:429
+#: src/main/errors.c:448
+#: src/main/errors.c:610
 msgid "Lost warning messages\n"
 msgstr "Потер�нные предупреждени�\n"
 
@@ -3279,7 +3808,8 @@
 msgstr[1] "Предупреждени�:"
 msgstr[2] "Предупреждени�:"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:470
+#: src/main/errors.c:498
 #, c-format
 msgid "In %s :"
 msgstr "Ð’ %s :"
@@ -3295,9 +3825,7 @@
 #: src/main/errors.c:528
 #, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
-msgstr ""
-"Было %d или более предупреждений (введите warnings() чтобы про�мотреть "
-"первые %d)"
+msgstr "Было %d или более предупреждений (введите warnings() чтобы про�мотреть первые %d)"
 
 #: src/main/errors.c:601
 msgid "Error during wrapup: "
@@ -3307,7 +3835,8 @@
 msgid "Error in "
 msgstr "Ошибка в "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:648
+#: src/main/errors.c:655
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr "Ошибка в %s (из %s) : "
@@ -3317,12 +3846,14 @@
 msgid "Error in %s : "
 msgstr "Ошибка в %s :"
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:677
+#: src/main/errors.c:683
 #, c-format
 msgid "Error: "
 msgstr "Ошибка: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:704
+#: src/main/errors.c:1333
 msgid "In addition: "
 msgstr "Вдобавок: "
 
@@ -3334,7 +3865,9 @@
 msgid "Execution halted\n"
 msgstr "Выполнение о�тановлено\n"
 
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
+#: src/main/errors.c:1046
+#: src/main/errors.c:1048
+#: src/main/options.c:338
 #: src/main/unique.c:1578
 #, c-format
 msgid "'%s' must be a character string"
@@ -3353,7 +3886,8 @@
 msgid "incorrect number of arguments to \"%s\""
 msgstr "у \"%s\" неправильное количе�тво аргументов"
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1198
+#: src/main/errors.c:1213
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "�та о�обенно�ть в %s не реализована"
@@ -3362,7 +3896,8 @@
 msgid "invalid number of arguments"
 msgstr "неправильное количе�тво аргументов"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1208
+#: src/main/logic.c:180
 msgid "invalid argument type"
 msgstr "неправильный тип аргумента"
 
@@ -3404,10 +3939,10 @@
 
 #: src/main/errors.c:1717
 msgid "handler or restart stack mismatch in old restart"
-msgstr ""
-"не�оответ�твие обработчика или перезагрузочного �тека в �тарой перезагрузке"
+msgstr "не�оответ�твие обработчика или перезагрузочного �тека в �тарой перезагрузке"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1743
+#: src/main/errors.c:1759
 msgid "bad error message"
 msgstr "неправильное �ообщение об ошибке"
 
@@ -3442,29 +3977,25 @@
 msgstr "R-профилирование недо�тупно в �той �и�теме"
 
 #: src/main/eval.c:445
-msgid ""
-"promise already under evaluation: recursive default argument reference or "
-"earlier problems?"
-msgstr ""
-"обещание уже ра��матривает��: рекур�ивна� ��ылка на аргумент по умолчанию "
-"или более ранние проблемы?"
+msgid "promise already under evaluation: recursive default argument reference or earlier problems?"
+msgstr "обещание уже ра��матривает��: рекур�ивна� ��ылка на аргумент по умолчанию или более ранние проблемы?"
 
 #: src/main/eval.c:447
 msgid "restarting interrupted promise evaluation"
 msgstr "перезапу�к прерван выполнением обещани�"
 
 #: src/main/eval.c:543
-msgid ""
-"evaluation nested too deeply: infinite recursion / options(expressions=)?"
-msgstr ""
-"и�полнение ра�положено �лишком глубоко: неопределенна� рекур�и� / "
-"options(expressions=)?"
+msgid "evaluation nested too deeply: infinite recursion / options(expressions=)?"
+msgstr "и�полнение ра�положено �лишком глубоко: неопределенна� рекур�и� / options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:574
+#: src/main/eval.c:4119
 msgid "argument is missing, with no default"
 msgstr "аргумент пропущен, умолчаний нет"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:678
+#: src/main/eval.c:1215
+#: src/main/eval.c:5410
 msgid "attempt to apply non-function"
 msgstr "попытка применить не-функцию"
 
@@ -3473,7 +4004,8 @@
 msgid "%s at %s#%d: "
 msgstr "%s на %s#%d: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1207
+#: src/main/eval.c:2180
 #, c-format
 msgid "argument %d is empty"
 msgstr "аргумент %d пу�т"
@@ -3508,7 +4040,8 @@
 msgid "non-symbol loop variable"
 msgstr "не�имвольна� переменна� цикла"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1596
+#: src/main/eval.c:5182
 msgid "invalid for() loop sequence"
 msgstr "неправильна� цикличе�ка� по�ледовательно�ть for()"
 
@@ -3537,7 +4070,8 @@
 msgid "cannot do complex assignments in base environment"
 msgstr "не могу делать комплек�ные при�ваивани� в базовом окружении"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2030
+#: src/main/eval.c:2057
 msgid "invalid function in complex assignment"
 msgstr "неправильна� функци� в комплек�ном при�воении"
 
@@ -3554,7 +4088,9 @@
 msgid "invalid formal argument list for \"function\""
 msgstr "неправильный �пи�ок формальных аргументов дл� \"функци�\""
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2406
+#: src/main/eval.c:2437
+#: src/main/eval.c:2442
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "неправильный аргумент '%s' типа '%s'"
@@ -3563,11 +4099,13 @@
 msgid "numeric 'envir' arg not of length one"
 msgstr "чи�ловой аргумент 'envir' не единичной длины"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2458
+#: src/main/eval.c:2482
 msgid "restarts not supported in 'eval'"
 msgstr "перезапу�к не поддерживает�� в 'eval'"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2541
+#: src/main/eval.c:2554
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' вызвано �наружи вложени�"
 
@@ -3584,123 +4122,134 @@
 msgid "dispatch error in group dispatch"
 msgstr "ошибка отправки в групповой отправке"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3441
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "'%s' не �вл�ет�� %s функцией"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:3928
 msgid "node stack overflow"
 msgstr "переполнение �тека узла"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:3934
 msgid "integer stack overflow"
 msgstr "переполнение �тека целых чи�ел"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:3988
 msgid "bad opcode"
 msgstr "неправильный opcode"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:4964
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "неправильный тип %s в 'x %s y'"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5076
 msgid "bytecode version mismatch; using eval"
 msgstr "не�оответ�твие вер�ии байтового кода; и�пользую eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5081
 msgid "bytecode version is too old"
 msgstr "вер�и� байтового кода �лишком �тара�"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5082
 msgid "bytecode version is too new"
 msgstr "вер�и� байтового кода �лишком нова�"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5116
 msgid "byte code version mismatch"
 msgstr "не�оответ�твие вер�ии байтового кода"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5264
 msgid "invalid sequence argument in for loop"
 msgstr "неправильна� по�ледовательно�ть аргументов в цикле 'for'"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5399
+#: src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "нет .Internal функции '%s'"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5497
+#: src/main/eval.c:5843
+#: src/main/eval.c:5883
 msgid "bad function"
 msgstr "неправильна� функци�"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5510
 msgid "not a BUILTIN function"
 msgstr "не BUILTIN-функци�"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:5940
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr "чи�ловое EXPR требует�� дл� 'switch' без именованных альтернатив"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6051
 msgid "cannot find index for threaded code address"
 msgstr "не могу найти индек� дл� нитевого адре�а кода"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6111
 msgid "invalid body"
 msgstr "неправильное тело"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6131
 msgid "invalid symbol"
 msgstr "неправильный �имвол"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6175
 msgid "argument is not a byte code object"
 msgstr "аргумент не �вл�ет�� объектом байтового кода"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6196
 msgid "bad file name"
 msgstr "неправильное им� файла"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6200
+#: src/main/eval.c:6221
 msgid "unable to open 'file'"
 msgstr "не могу открыть 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6215
+#: src/main/saveload.c:1942
 msgid "'file' must be non-empty string"
 msgstr "'file' должен быть непу�той �трокой"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6217
+#: src/main/saveload.c:1944
+#: src/main/saveload.c:2244
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' должно быть логиче�ким"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6288
+#: src/main/eval.c:6307
+#: src/main/eval.c:6337
 msgid "constant buffer must be a generic vector"
 msgstr "кон�тантный буфер должен быть общим вектором"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6339
 msgid "bad constant count"
 msgstr "неверное чи�ло кон�тант"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6375
 msgid "profile timer in use"
 msgstr "и�пользует�� профильный таймер"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6377
 msgid "already byte code profiling"
 msgstr "уже е�ть побайтное профилирование"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6395
 msgid "setting profile timer failed"
 msgstr "у�тановить профильный таймер не удало�ь"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6412
 msgid "not byte code profiling"
 msgstr "не побайтное профилирование"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6427
+#: src/main/eval.c:6430
+#: src/main/eval.c:6433
 msgid "byte code profiling is not supported in this build"
 msgstr "профилинг байткода не поддерживает�� в �той �борке"
 
@@ -3729,13 +4278,17 @@
 msgid "no graphics event handlers set"
 msgstr "нет графиче�ких обработчиков �обытий"
 
-#: src/main/gram.y:222 src/main/gram.y:237 src/main/gram.y:2245
+#: src/main/gram.y:222
+#: src/main/gram.y:237
+#: src/main/gram.y:2245
 #: src/main/gram.y:2259
 #, c-format
 msgid "EOF whilst reading MBCS char at line %d"
 msgstr "EOF во врем� чтени� �имвола MBCS на �троке %d"
 
-#: src/main/gram.y:226 src/main/gram.y:234 src/main/gram.y:2249
+#: src/main/gram.y:226
+#: src/main/gram.y:234
+#: src/main/gram.y:2249
 #: src/main/gram.y:2256
 #, c-format
 msgid "invalid multibyte character in parser at line %d"
@@ -3755,12 +4308,14 @@
 msgid "contextstack overflow"
 msgstr "переполнение �тека контек�та"
 
-#: src/main/gram.y:1907 src/main/gram.y:1913
+#: src/main/gram.y:1907
+#: src/main/gram.y:1913
 #, c-format
 msgid "unexpected input"
 msgstr "неожиданный ввод"
 
-#: src/main/gram.y:1910 src/main/main.c:311
+#: src/main/gram.y:1910
+#: src/main/main.c:311
 #, c-format
 msgid "unexpected end of input"
 msgstr "неожиданный конец ввода"
@@ -3790,7 +4345,8 @@
 msgid "unexpected end of line"
 msgstr "неожиданный конец �троки"
 
-#: src/main/gram.y:1931 src/main/gram.y:1939
+#: src/main/gram.y:1931
+#: src/main/gram.y:1939
 #, c-format
 msgid "unexpected %s"
 msgstr "неожиданный %s"
@@ -3820,7 +4376,9 @@
 msgid "unable to allocate buffer for long string at line %d"
 msgstr "не могу разме�тить буфер дл� длинной под�троки на �троке %d"
 
-#: src/main/gram.y:2347 src/main/gram.y:2370 src/main/gram.y:2407
+#: src/main/gram.y:2347
+#: src/main/gram.y:2370
+#: src/main/gram.y:2407
 #: src/main/gram.y:2443
 #, c-format
 msgid "nul character not allowed (line %d)"
@@ -3829,21 +4387,17 @@
 #: src/main/gram.y:2363
 #, c-format
 msgid "'\\x' used without hex digits in character string starting \"%s\""
-msgstr ""
-"'\\x' и�пользовано без ше�тнадцатиричных цифр в �троке начинающей�� � \"%s\""
+msgstr "'\\x' и�пользовано без ше�тнадцатиричных цифр в �троке начинающей�� � \"%s\""
 
 #: src/main/gram.y:2379
 #, c-format
 msgid "\\uxxxx sequences not supported inside backticks (line %d)"
-msgstr ""
-"по�ледовательно�ти \\uxxxx не поддерживают�� внутри обратных кавычек (�трока "
-"%d)"
+msgstr "по�ледовательно�ти \\uxxxx не поддерживают�� внутри обратных кавычек (�трока %d)"
 
 #: src/main/gram.y:2394
 #, c-format
 msgid "'\\u' used without hex digits in character string starting \"%s\""
-msgstr ""
-"'\\x' и�пользовано без ше�тнадцатиричных цифр в �троке начинающей�� � \"%s\""
+msgstr "'\\x' и�пользовано без ше�тнадцатиричных цифр в �троке начинающей�� � \"%s\""
 
 #: src/main/gram.y:2402
 #, c-format
@@ -3853,15 +4407,12 @@
 #: src/main/gram.y:2416
 #, c-format
 msgid "\\Uxxxxxxxx sequences not supported inside backticks (line %d)"
-msgstr ""
-"по�ледовательно�ти \\Uxxxxxxxx не поддерживают�� внутри обратных кавычек "
-"(�трока %d)"
+msgstr "по�ледовательно�ти \\Uxxxxxxxx не поддерживают�� внутри обратных кавычек (�трока %d)"
 
 #: src/main/gram.y:2431
 #, c-format
 msgid "'\\U' used without hex digits in character string starting \"%s\""
-msgstr ""
-"'\\x' и�пользовано без ше�тнадцатиричных цифр в �троке начинающей�� � \"%s\""
+msgstr "'\\x' и�пользовано без ше�тнадцатиричных цифр в �троке начинающей�� � \"%s\""
 
 #: src/main/gram.y:2439
 #, c-format
@@ -3871,8 +4422,7 @@
 #: src/main/gram.y:2482
 #, c-format
 msgid "'\\%c' is an unrecognized escape in character string starting \"%s\""
-msgstr ""
-"'\\%c' -- нера�познаваемый префик� в �троке в �троке начинающей�� � \"%s\""
+msgstr "'\\%c' -- нера�познаваемый префик� в �троке в �троке начинающей�� � \"%s\""
 
 #: src/main/gram.y:2546
 msgid "mixing Unicode and octal/hex escapes in a string is not allowed"
@@ -3887,7 +4437,9 @@
 "под�трока на �троке %d, �одержаща� Unicode-escapes не из �той локали\n"
 "�лишком длинна� (мак�имум 10000 �имволов)"
 
-#: src/main/gram.y:3148 src/main/gram.y:3155 src/main/gram.y:3161
+#: src/main/gram.y:3148
+#: src/main/gram.y:3155
+#: src/main/gram.y:3161
 #: src/main/gram.y:3168
 #, c-format
 msgid "contextstack overflow at line %d"
@@ -3913,23 +4465,31 @@
 msgid "invalid regular expression, reason '%s'"
 msgstr "неправильное регул�рное выражение, причина '%s'"
 
-#: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:225
+#: src/main/grep.c:315
+#: src/main/grep.c:426
+#: src/main/grep.c:900
+#: src/main/grep.c:2499
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "входна� �трока %d -- �то неправильный UTF-8"
 
-#: src/main/grep.c:292 src/main/grep.c:391
+#: src/main/grep.c:292
+#: src/main/grep.c:391
 #, c-format
 msgid "'split' string %d is invalid UTF-8"
 msgstr "�трока 'split' %d -- �то неправильный UTF-8"
 
-#: src/main/grep.c:296 src/main/grep.c:395 src/main/grep.c:571
+#: src/main/grep.c:296
+#: src/main/grep.c:395
+#: src/main/grep.c:571
 #, c-format
 msgid "'split' string %d is invalid in this locale"
 msgstr "�трока 'split' %d дл� �той локали неправильна�"
 
-#: src/main/grep.c:404 src/main/grep.c:867 src/main/grep.c:1621
+#: src/main/grep.c:404
+#: src/main/grep.c:867
+#: src/main/grep.c:1621
 #: src/main/grep.c:2419
 #, c-format
 msgid ""
@@ -3946,7 +4506,9 @@
 msgid "invalid split pattern '%s'"
 msgstr "неправильный образец разделени� '%s'"
 
-#: src/main/grep.c:410 src/main/grep.c:873 src/main/grep.c:1628
+#: src/main/grep.c:410
+#: src/main/grep.c:873
+#: src/main/grep.c:1628
 #: src/main/grep.c:2426
 #, c-format
 msgid ""
@@ -3956,20 +4518,21 @@
 "Ошибка анализа паттерна PCRE\n"
 "\t'%s'\n"
 
-#: src/main/grep.c:849 src/main/grep.c:2401
+#: src/main/grep.c:849
+#: src/main/grep.c:2401
 msgid "regular expression is invalid UTF-8"
 msgstr "регул�рное выражение -- �то неправильный UTF-8"
 
-#: src/main/grep.c:869 src/main/grep.c:1623 src/main/grep.c:2421
+#: src/main/grep.c:869
+#: src/main/grep.c:1623
+#: src/main/grep.c:2421
 #, c-format
 msgid "invalid regular expression '%s'"
 msgstr "неправильное регул�рное выражение '%s'"
 
 #: src/main/grep.c:1282
 msgid "pattern matches an empty string infinitely, returning first match only"
-msgstr ""
-"образец позвол�ет �опо�тавить пу�тую �троку негораниченное чи�ло раз, только "
-"первое �овпадение возвращено"
+msgstr "образец позвол�ет �опо�тавить пу�тую �троку негораниченное чи�ло раз, только первое �овпадение возвращено"
 
 #: src/main/grep.c:1595
 msgid "'pattern' is invalid UTF-8"
@@ -3991,8 +4554,12 @@
 msgid "zero-length pattern"
 msgstr "нулевой образец"
 
-#: src/main/grep.c:1753 src/main/grep.c:1769 src/main/grep.c:1817
-#: src/main/grep.c:1833 src/main/grep.c:1880 src/main/grep.c:1896
+#: src/main/grep.c:1753
+#: src/main/grep.c:1769
+#: src/main/grep.c:1817
+#: src/main/grep.c:1833
+#: src/main/grep.c:1880
+#: src/main/grep.c:1896
 msgid "result string is too long"
 msgstr "�трока результата �лишком длинна"
 
@@ -4009,22 +4576,40 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "�ред�тва Интернет не до�тупны из модул�"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94
+#: src/main/internet.c:128
+#: src/main/internet.c:141
+#: src/main/internet.c:152
+#: src/main/internet.c:163
+#: src/main/internet.c:174
+#: src/main/internet.c:183
+#: src/main/internet.c:194
+#: src/main/internet.c:205
+#: src/main/internet.c:214
+#: src/main/internet.c:224
+#: src/main/internet.c:338
+#: src/main/internet.c:349
+#: src/main/internet.c:360
+#: src/main/internet.c:372
 msgid "internet routines cannot be loaded"
 msgstr "�ред�тва Интернет не могут быть загружены"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
+#: src/main/internet.c:109
+#: src/main/memory.c:3490
+#: src/main/memory.c:3500
+#: src/main/memory.c:3512
+#: src/main/memory.c:3526
+#: src/main/memory.c:3541
+#: src/main/memory.c:3559
 msgid "bad value"
 msgstr "неправильное значение"
 
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
+#: src/main/internet.c:238
+#: src/main/internet.c:252
+#: src/main/internet.c:268
+#: src/main/internet.c:280
+#: src/main/internet.c:294
+#: src/main/internet.c:314
 #: src/main/internet.c:327
 msgid "socket routines cannot be loaded"
 msgstr "�ред�тва �окетов не могут быть загружены"
@@ -4037,16 +4622,17 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "�ред�тва LAPACK не могут быть загружены"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:79
+#: src/main/logic.c:141
 msgid "operations are possible only for numeric, logical or complex types"
-msgstr ""
-"операции возможны только дл� чи�ловых, логиче�ких или комплек�ных типов"
+msgstr "операции возможны только дл� чи�ловых, логиче�ких или комплек�ных типов"
 
 #: src/main/logic.c:89
 msgid "binary operation on non-conformable arrays"
 msgstr "бинарна� операци� на неподобных многомерных матрицах"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:115
+#: src/main/relop.c:247
 msgid "non-conformable time series"
 msgstr "неподобные временные р�ды"
 
@@ -4095,47 +4681,44 @@
 msgid "During startup - "
 msgstr "Во врем� загрузки - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1235
 msgid "cannot quit from browser"
 msgstr "не могу выйти из браузера"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1239
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "ожидает�� одно из: \"yes\", \"no\", \"ask\" или \"default\"."
 
-#: src/main/main.c:1241
+#: src/main/main.c:1244
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
-msgstr ""
-"save=\"ask\" во врем� неинтерактивной работы: будет и�пользована командна� "
-"�трока по умолчанию"
+msgstr "save=\"ask\" во врем� неинтерактивной работы: будет и�пользована командна� �трока по умолчанию"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1252
 msgid "unrecognized value of 'save'"
 msgstr "нера�познанное значение 'save'"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1255
 msgid "invalid 'status', 0 assumed"
 msgstr "неправильный 'status', прин�т 0"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1260
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "неправильный 'runLast', прин�то FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1291
 msgid "cannot allocate space for toplevel callback element"
 msgstr "не могу выделить ме�то обратного вызова �лемента верхнего уровн�"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1369
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "отрицательный индек� передан в R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1479
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
-msgstr ""
-"предупреждающие �ообщени� из обратного вызова задачи верхнего уровн� '%s'\n"
+msgstr "предупреждающие �ообщени� из обратного вызова задачи верхнего уровн� '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1535
 msgid "top-level task callback did not return a logical value"
 msgstr "обратный вызов задачи верхнего уровн� не вернул логиче�кого значени�"
 
@@ -4155,13 +4738,16 @@
 msgid "invalid partial string match"
 msgstr "неправильное �оответ�твие ча�ти �троки"
 
-#: src/main/match.c:228 src/main/match.c:266 src/main/objects.c:49
+#: src/main/match.c:228
+#: src/main/match.c:266
+#: src/main/objects.c:49
 #: src/main/objects.c:59
 #, c-format
 msgid "formal argument \"%s\" matched by multiple actual arguments"
 msgstr "формальный аргумент \"%s\" �оответ�твует многим реальным аргументам"
 
-#: src/main/match.c:231 src/main/match.c:264
+#: src/main/match.c:231
+#: src/main/match.c:264
 #, c-format
 msgid "argument %d matches multiple formal arguments"
 msgstr "аргумент %d �оответ�твует многим формальным аргументам"
@@ -4187,7 +4773,9 @@
 msgid "finalizer must be a function or NULL"
 msgstr "завершитель должен быть функцией или NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1328
+#: src/main/memory.c:1336
+#: src/main/memory.c:1347
 msgid "not a weak reference"
 msgstr "не �вл�ет�� �лабой ��ылкой"
 
@@ -4203,67 +4791,69 @@
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "третий аргумент должен быть 'TRUE' или 'FALSE'"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1978
 msgid "vector memory exhausted (limit reached?)"
 msgstr "векторна� пам�ть вышла (до�тигнут предел?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1984
 msgid "cons memory exhausted (limit reached?)"
 msgstr "cons-пам�ть вышла (до�тигнут предел?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1989
 msgid "memory exhausted (limit reached?)"
 msgstr "пам�ть и�черпана (до�тигнут предел?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2125
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "не могу разме�тить блок пам�ти размером %0.f Tb"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2130
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "не могу разме�тить блок пам�ти размером %0.1f Gb"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2457
 msgid "vector is too large"
 msgstr "вектор �лишком велик"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2460
 msgid "negative length vectors are not allowed"
 msgstr "не разрешена отрицательна� длина векторов"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2486
+#: src/main/memory.c:2499
+#: src/main/memory.c:2512
+#: src/main/memory.c:2527
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "не могу разме�тить вектор длины %d"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2548
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "неправильный тип/длина (%s/%d) дл� размещени� вектора"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2647
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "не могу разме�тить вектор размером %0.1f Gb"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2651
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "не могу разме�тить вектор размером %0.1f Mb"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2655
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "не могу разме�тить вектор размером %0.f Kb"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3052
 msgid "protect(): protection stack overflow"
 msgstr "protect(): переполнение �тека защиты"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3059
 #, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
@@ -4271,77 +4861,77 @@
 msgstr[1] "unprotect(): только %d защищенных �лемента"
 msgstr[2] "unprotect(): только %d защищенных �лементов"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3094
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: указатель не найден"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3132
 #, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
-msgstr[0] ""
-"R_Reprotect: только %d защищенный �лемент, не могу перезащитить индек� %d"
-msgstr[1] ""
-"R_Reprotect: только %d защищенных �лемента, не могу перезащитить индек� %d"
-msgstr[2] ""
-"R_Reprotect: только %d защищенных �лементов, не могу перезащитить индек� %d"
+msgstr[0] "R_Reprotect: только %d защищенный �лемент, не могу перезащитить индек� %d"
+msgstr[1] "R_Reprotect: только %d защищенных �лемента, не могу перезащитить индек� %d"
+msgstr[2] "R_Reprotect: только %d защищенных �лементов, не могу перезащитить индек� %d"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3184
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "'Calloc' не может выделить пам�ть (%.0f из %u байт)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3195
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "'Realloc' не может переразме�тить пам�ть (%.0f байт)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3436
 msgid "not safe to return vector pointer"
 msgstr "небезопа�но возвращать указатель вектора"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3447
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr "попытка у�тановить индек� %lu/%lu в SET_STRING_ELT"
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3463
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr "попытка у�тановить индек� %lu/%lu в SET_VECTOR_ELT"
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3722
 msgid "memory profiling is not available on this system"
 msgstr "профилирование пам�ти в �той �и�теме недо�тупно"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3786
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: не могу открыть выходной файл '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3894
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr "длинные вектора еще не поддерживают��: %s:%d"
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "нужен тек�товый аргумент"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "нет такой примитивной функции"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212
+#: src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "попытка и�пользовать им� переменной нулевой длины"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214
+#: src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "имена переменных ограничены %d байтами"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307
+#: src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "неправильный .Internal() аргумент"
 
@@ -4358,12 +4948,8 @@
 msgstr "неправильное общее определение окружени�"
 
 #: src/main/objects.c:249
-msgid ""
-"no '.S3MethodsClass' table, cannot use S4 objects with S3 methods ('methods' "
-"package not attached?)"
-msgstr ""
-"нет '.S3MethodsClass', не могу и�пользовать объекты S4 � методами S3 (пакет "
-"'methods' не при�оединен?)"
+msgid "no '.S3MethodsClass' table, cannot use S4 objects with S3 methods ('methods' package not attached?)"
+msgstr "нет '.S3MethodsClass', не могу и�пользовать объекты S4 � методами S3 (пакет 'methods' не при�оединен?)"
 
 #: src/main/objects.c:415
 msgid "there must be a 'generic' argument"
@@ -4407,7 +4993,8 @@
 msgid "object not specified"
 msgstr "объект не указан"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:635
+#: src/main/objects.c:642
 msgid "generic function not specified"
 msgstr "обща� функци� не указана"
 
@@ -4427,7 +5014,8 @@
 msgid "Incompatible methods ignored"
 msgstr "�е�овме�тимый метод пропущен"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:735
+#: src/main/objects.c:740
 msgid "no method to invoke"
 msgstr "нет метода дл� вызова"
 
@@ -4465,10 +5053,8 @@
 msgstr "не могу найти не-общую вер�ию функции \"%s\""
 
 #: src/main/objects.c:1109
-msgid ""
-"'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
-msgstr ""
-"'standardGeneric' вызван без включенных методов до�тавки (будет пропущен)"
+msgid "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
+msgstr "'standardGeneric' вызван без включенных методов до�тавки (будет пропущен)"
 
 #: src/main/objects.c:1118
 msgid "argument to 'standardGeneric' must be a non-empty character string"
@@ -4476,19 +5062,13 @@
 
 #: src/main/objects.c:1123
 #, c-format
-msgid ""
-"call to standardGeneric(\"%s\") apparently not from the body of that generic "
-"function"
+msgid "call to standardGeneric(\"%s\") apparently not from the body of that generic function"
 msgstr "вызов дл� 'standardGeneric' (\"%s\") не из тела данной общей функции"
 
 #: src/main/objects.c:1214
 #, c-format
-msgid ""
-"invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
-"\"set\", or \"suppress\""
-msgstr ""
-"неправильный код первичного метода (\"%s\"): должен быть \"clear\", \"reset"
-"\", \"set\", или \"suppress\""
+msgid "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", \"set\", or \"suppress\""
+msgstr "неправильный код первичного метода (\"%s\"): должен быть \"clear\", \"reset\", \"set\", или \"suppress\""
 
 #: src/main/objects.c:1222
 msgid "invalid object: must be a primitive function"
@@ -4496,12 +5076,8 @@
 
 #: src/main/objects.c:1269
 #, c-format
-msgid ""
-"the formal definition of a primitive generic must be a function object (got "
-"type '%s')"
-msgstr ""
-"формальное определение первичного общего должно быть объектом-функцией "
-"(получить тип '%s')"
+msgid "the formal definition of a primitive generic must be a function object (got type '%s')"
+msgstr "формальное определение первичного общего должно быть объектом-функцией (получить тип '%s')"
 
 #: src/main/objects.c:1299
 #, c-format
@@ -4512,18 +5088,15 @@
 msgid "invalid primitive operation given for dispatch"
 msgstr "дл� до�тавки и�пользована неправильна� первична� операци�"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1430
+#: src/main/objects.c:1449
 msgid "dispatch error"
 msgstr "ошибка отправки"
 
 #: src/main/objects.c:1443
 #, c-format
-msgid ""
-"primitive function \"%s\" has been set for methods but no generic function "
-"supplied"
-msgstr ""
-"дл� методов у�тановлена первична� функци� \"%s\", но не предложено общей "
-"функции"
+msgid "primitive function \"%s\" has been set for methods but no generic function supplied"
+msgstr "дл� методов у�тановлена первична� функци� \"%s\", но не предложено общей функции"
 
 #: src/main/objects.c:1468
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
@@ -4551,7 +5124,8 @@
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "объект кла��а \"%s\" не �вл�ет�� правильным объектом S3"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:120
+#: src/main/options.c:181
 msgid "corrupted options list"
 msgstr "ли�т опций поврежден"
 
@@ -4590,24 +5164,43 @@
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "неправильный параметр 'expressions', разрешает�� %d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:468
+#: src/main/options.c:476
+#: src/main/options.c:482
+#: src/main/options.c:490
+#: src/main/options.c:497
+#: src/main/options.c:502
+#: src/main/options.c:509
+#: src/main/options.c:515
+#: src/main/options.c:521
+#: src/main/options.c:526
+#: src/main/options.c:531
+#: src/main/options.c:540
+#: src/main/options.c:546
+#: src/main/options.c:552
+#: src/main/options.c:562
+#: src/main/options.c:572
+#: src/main/options.c:578
+#: src/main/options.c:586
+#: src/main/options.c:593
+#: src/main/options.c:600
+#: src/main/options.c:607
+#: src/main/options.c:614
+#: src/main/options.c:622
+#: src/main/options.c:631
+#: src/main/options.c:634
+#: src/main/options.c:640
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "неправильное значение '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:627
+#: src/main/options.c:656
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" заменен на \"device.ask.default\""
 
-#: src/main/paste.c:80 src/main/paste.c:300
+#: src/main/paste.c:80
+#: src/main/paste.c:300
 msgid "invalid separator"
 msgstr "неправильный разделитель"
 
@@ -4615,7 +5208,8 @@
 msgid "non-string argument to internal 'paste'"
 msgstr "аргумент дл� внутренней в�тавки не �вл�ет�� �трокой"
 
-#: src/main/paste.c:174 src/main/paste.c:244
+#: src/main/paste.c:174
+#: src/main/paste.c:244
 msgid "result would exceed 2^31-1 bytes"
 msgstr "результат будет превышать 2^31-1 байт"
 
@@ -4635,11 +5229,13 @@
 msgid "atomic vector arguments only"
 msgstr "аргументы �вл�ют�� только �лементарными векторами"
 
-#: src/main/platform.c:304 src/main/platform.c:322
+#: src/main/platform.c:304
+#: src/main/platform.c:322
 msgid "invalid filename specification"
 msgstr "неправильный указание имени файла"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375
+#: src/main/platform.c:419
 msgid "write error during file append"
 msgstr "ошибка запи�и во врем� добавки файла"
 
@@ -4647,7 +5243,9 @@
 msgid "nothing to append to"
 msgstr "нечего добавить к"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:448
+#: src/main/platform.c:793
+#: src/main/platform.c:975
 msgid "invalid filename argument"
 msgstr "неправильный аргумент имени файла"
 
@@ -4656,7 +5254,9 @@
 msgid "cannot create file '%s', reason '%s'"
 msgstr "не могу �оздать файл '%s' по причине '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:475
+#: src/main/platform.c:545
+#: src/main/platform.c:627
 msgid "invalid first filename"
 msgstr "неправильное первое им� файла"
 
@@ -4665,11 +5265,13 @@
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "не могу удалить файл '%s' по причине '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:547
+#: src/main/platform.c:629
 msgid "invalid second filename"
 msgstr "неправильное второе им� файла"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:549
+#: src/main/platform.c:631
 msgid "nothing to link"
 msgstr "нечего �в�зать"
 
@@ -4709,11 +5311,13 @@
 msgid "'from' and 'to' are of different lengths"
 msgstr "'from' и 'to' имеют разную длину"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:720
+#: src/main/platform.c:730
 msgid "expanded 'from' name too long"
 msgstr "ра�крытое им� 'from' �лишком длинное"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:724
+#: src/main/platform.c:734
 msgid "expanded 'to' name too long"
 msgstr "ра�крытое им� 'to' �лишком длинное"
 
@@ -4734,12 +5338,15 @@
 msgid "file name too long"
 msgstr "им� файла �лишком длинное"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
+#: src/main/platform.c:1582
+#: src/main/platform.c:1629
+#: src/main/sysutils.c:1800
 #: src/main/sysutils.c:1814
 msgid "internal out-of-memory condition"
 msgstr "внутренн�� нехватка пам�ти"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1625
+#: src/main/sysutils.c:1810
 #, c-format
 msgid "read error on '%s'"
 msgstr "ошибка чтени� в '%s'"
@@ -4755,8 +5362,7 @@
 #: src/main/platform.c:1828
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
-msgstr ""
-"ОС �ообщает, что запро� у�тановки локали в \"%s\" не может быть выполнен"
+msgstr "ОС �ообщает, что запро� у�тановки локали в \"%s\" не может быть выполнен"
 
 #: src/main/platform.c:2148
 msgid "'hostname' must be a character vector of length 1"
@@ -4795,11 +5401,14 @@
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "не могу �оздать каталог '%ls' по причине '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2328
+#: src/main/platform.c:2537
 msgid "too deep nesting"
 msgstr "�лишком глубоко"
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2336
+#: src/main/platform.c:2349
+#: src/main/platform.c:2367
 msgid "over-long path"
 msgstr "�лишком больша� длина path"
 
@@ -4813,8 +5422,11 @@
 msgid "problem reading dir %ls: %s"
 msgstr "проблема � чтением каталога %ls: %s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2387
+#: src/main/platform.c:2553
+#: src/main/platform.c:2566
+#: src/main/platform.c:2586
+#: src/main/platform.c:2608
 msgid "over-long path length"
 msgstr "�лишком больша� длина path"
 
@@ -4863,7 +5475,9 @@
 msgid "invalid math style encountered"
 msgstr "в�третил�� неправильный математиче�кий �тиль"
 
-#: src/main/plotmath.c:1260 src/main/plotmath.c:1365 src/main/plotmath.c:2654
+#: src/main/plotmath.c:1260
+#: src/main/plotmath.c:1365
+#: src/main/plotmath.c:2654
 msgid "invalid mathematical annotation"
 msgstr "неправильна� математиче�ка� аннотаци�"
 
@@ -4875,7 +5489,8 @@
 msgid "invalid group delimiter"
 msgstr "неправильный разделитель групп"
 
-#: src/main/plotmath.c:1990 src/main/plotmath.c:2127
+#: src/main/plotmath.c:1990
+#: src/main/plotmath.c:2127
 msgid "invalid group specification"
 msgstr "неправильное указание группы"
 
@@ -4887,7 +5502,8 @@
 msgid "Metric information not available for this family/device"
 msgstr "Метриче�ка� информаци� дл� �того �емей�тва/у�трой�тва недо�тупна"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:148
+#: src/main/print.c:254
 msgid "invalid 'na.print' specification"
 msgstr "неправильное указание 'na.print'"
 
@@ -4960,8 +5576,12 @@
 msgid "invalid arguments"
 msgstr "неправильные аргументы"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:93
+#: src/main/random.c:110
+#: src/main/random.c:175
+#: src/main/random.c:201
+#: src/main/random.c:274
+#: src/main/random.c:288
 msgid "NAs produced"
 msgstr "получили�ь NA"
 
@@ -4977,7 +5597,8 @@
 msgid "too few positive probabilities"
 msgstr "�лишком мало положительных веро�тно�тей"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:480
+#: src/main/random.c:508
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr "не могу �делать выборку бОльшую чем попул�ци� е�ли 'replace = FALSE'"
 
@@ -4987,14 +5608,15 @@
 
 #: src/main/random.c:526
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
-msgstr ""
-"n >= 2^31, replace = FALSE поддерживает�� только на 64-битных платформах"
+msgstr "n >= 2^31, replace = FALSE поддерживает�� только на 64-битных платформах"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37
+#: src/main/raw.c:272
 msgid "argument must be a character vector of length 1"
 msgstr "аргумент должен быть единичным тек�товым вектором"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39
+#: src/main/raw.c:274
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
@@ -5002,11 +5624,14 @@
 "аргумент должен быть единичным тек�товым вектором\n"
 "в�е кроме первого �лемента будет пропущено"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53
+#: src/main/raw.c:89
+#: src/main/raw.c:110
 msgid "argument 'x' must be a raw vector"
 msgstr "аргумент 'x' должен быть про�тым вектором"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56
+#: src/main/raw.c:331
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "аргумент 'multiple' должен быть TRUE или FALSE"
 
@@ -5014,7 +5639,8 @@
 msgid "argument 'shift' must be a small integer"
 msgstr "аргумент 'shift' должен быть малым целым чи�лом"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:129
+#: src/main/raw.c:328
 msgid "argument 'x' must be an integer vector"
 msgstr "аргумент 'x' должен быть целочи�ленным вектором"
 
@@ -5027,7 +5653,8 @@
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "аргумент 'x' должен быть произведением длины %d"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:167
+#: src/main/raw.c:181
 msgid "argument 'x' must not contain NAs"
 msgstr "аргумент 'x' не должен �одержать NA"
 
@@ -5056,13 +5683,26 @@
 msgid "'a' and 'b' must have the same type"
 msgstr "'a' и 'b' должны быть одного типа"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
-#: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
-#: src/main/serialize.c:421 src/main/serialize.c:2429
+#: src/main/saveload.c:200
+#: src/main/saveload.c:205
+#: src/main/saveload.c:214
+#: src/main/saveload.c:223
+#: src/main/saveload.c:232
+#: src/main/saveload.c:241
+#: src/main/saveload.c:245
+#: src/main/saveload.c:254
+#: src/main/saveload.c:1381
+#: src/main/saveload.c:1386
+#: src/main/saveload.c:1430
+#: src/main/saveload.c:1498
+#: src/main/saveload.c:1507
+#: src/main/serialize.c:354
+#: src/main/serialize.c:361
+#: src/main/serialize.c:374
+#: src/main/serialize.c:378
+#: src/main/serialize.c:405
+#: src/main/serialize.c:421
+#: src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "ошибка чтени�"
@@ -5083,8 +5723,11 @@
 msgid "a S read error occurred"
 msgstr "произошла ошибка чтени� 'S'"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:387
+#: src/main/saveload.c:395
+#: src/main/saveload.c:403
+#: src/main/saveload.c:1594
+#: src/main/saveload.c:1602
 msgid "a read error occurred"
 msgstr "произошла ошибка чтени�"
 
@@ -5097,7 +5740,8 @@
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "ошибка во��тановлени� -- нет �овме�тимо�ти дл� вер�ии %d"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:572
+#: src/main/saveload.c:645
 msgid "bad SEXP type in data file"
 msgstr "неправильный SEXP-тип в файле данных"
 
@@ -5105,7 +5749,9 @@
 msgid "mismatch on types"
 msgstr "не�оответ�твие типов"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:607
+#: src/main/saveload.c:1270
+#: src/main/serialize.c:1675
 #, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "не могу найти им� внутренней функции \"%s\""
@@ -5120,19 +5766,15 @@
 
 #: src/main/saveload.c:915
 msgid "base namespace is not preserved in version 1 workspaces"
-msgstr ""
-"базовое про�тран�тво имен не �охранено в рабочих про�тран�твах вер�ии 1"
+msgstr "базовое про�тран�тво имен не �охранено в рабочих про�тран�твах вер�ии 1"
 
 #: src/main/saveload.c:917
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "не могу �охранить про�тран�тво имен в рабочих про�тран�твах вер�ии 1"
 
 #: src/main/saveload.c:919
-msgid ""
-"cannot save environment with locked/active bindings in version 1 workspaces"
-msgstr ""
-"не могу �охранить окружение � блокированными/активными �в�з�ми в рабочих "
-"про�тран�твах вер�ии 1"
+msgid "cannot save environment with locked/active bindings in version 1 workspaces"
+msgstr "не могу �охранить окружение � блокированными/активными �в�з�ми в рабочих про�тран�твах вер�ии 1"
 
 #: src/main/saveload.c:943
 msgid "cannot save weak references in version 1 workspaces"
@@ -5172,7 +5814,8 @@
 msgid "a binary read error occurred"
 msgstr "произошла ошибка чтени� бинарных данных"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1580
+#: src/main/saveload.c:1681
 msgid "out of memory reading binary string"
 msgstr "не хватает пам�ти при чтении бинарной �троки"
 
@@ -5188,7 +5831,8 @@
 msgid "an xdr integer data read error occurred"
 msgstr "произошла ошибка чтени� целочи�ленных xdr-данных"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1667
+#: src/main/saveload.c:1686
 msgid "an xdr string data write error occurred"
 msgstr "произошла ошибка чтени� xdr-�троки"
 
@@ -5208,9 +5852,12 @@
 msgid "an xdr complex data read error occurred"
 msgstr "произошла ошибка чтени� комплек�ных xdr-данных"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
-#: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
+#: src/main/saveload.c:1783
+#: src/main/serialize.c:1997
+#: src/main/serialize.c:2614
+#: src/modules/internet/internet.c:513
+#: src/modules/internet/internet.c:590
+#: src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "запи�ь не удала�ь"
 
@@ -5220,16 +5867,14 @@
 
 #: src/main/saveload.c:1912
 msgid "restore file may be from a newer version of R -- no data loaded"
-msgstr ""
-"файл во��тановлени�, возможно, от более новой вер�ии R -- данные не загружены"
+msgstr "файл во��тановлени�, возможно, от более новой вер�ии R -- данные не загружены"
 
 #: src/main/saveload.c:1914
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
-msgstr ""
-"неправильное магиче�кое чи�ло файла (файл может быть поврежден) -- данные не "
-"загружены"
+msgstr "неправильное магиче�кое чи�ло файла (файл может быть поврежден) -- данные не загружены"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1940
+#: src/main/saveload.c:2238
 msgid "first argument must be a character vector"
 msgstr "первый аргумент должен быть тек�товым вектором"
 
@@ -5237,11 +5882,11 @@
 msgid "not a valid named list"
 msgstr "неправильный именованный �пи�ок"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2019
+#: src/main/saveload.c:2040
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
-msgstr ""
-"'%s', похоже, �вл�ет�� до-2.4.0 S4-объект: пере�оздайте его, пожалуй�та"
+msgstr "'%s', похоже, �вл�ет�� до-2.4.0 S4-объект: пере�оздайте его, пожалуй�та"
 
 #: src/main/saveload.c:2027
 msgid "loaded data is not in pair list form"
@@ -5251,13 +5896,19 @@
 msgid "first argument must be a file name"
 msgstr "первый аргумент должен быть именем файла"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
-#: src/main/serialize.c:901 src/main/serialize.c:939
+#: src/main/saveload.c:2108
+#: src/main/saveload.c:2134
+#: src/main/serialize.c:864
+#: src/main/serialize.c:901
+#: src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "запи�ь 'XDR' не удала�ь"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
-#: src/main/serialize.c:1436 src/main/serialize.c:1474
+#: src/main/saveload.c:2121
+#: src/main/saveload.c:2146
+#: src/main/serialize.c:1400
+#: src/main/serialize.c:1436
+#: src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "чтение 'XDR' не удало�ь"
 
@@ -5266,12 +5917,14 @@
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "не могу �охранить данные -- нельз� открыть %s: %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2254
+#: src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "не могу �охранить в �оединени� в формате вер�ии %d"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2277
+#: src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "�оединение не открыто дл� запи�и"
 
@@ -5279,13 +5932,16 @@
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "не могу �охранить формат 'XDR' в тек�товое �оединение"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
-#: src/main/serialize.c:2119 src/main/serialize.c:2303
+#: src/main/saveload.c:2296
+#: src/main/serialize.c:2105
+#: src/main/serialize.c:2119
+#: src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "ошибка запи�и в �оединение"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2357
+#: src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "�оединение не открыто дл� чтени�"
 
@@ -5298,13 +5954,11 @@
 msgstr "ввод недо�тупен"
 
 #: src/main/saveload.c:2381
-msgid ""
-"the input does not start with a magic number compatible with loading from a "
-"connection"
-msgstr ""
-"ввод не начал�� � магиче�кого чи�ла, �овме�тимого � загрузкой � �оединени�"
+msgid "the input does not start with a magic number compatible with loading from a connection"
+msgstr "ввод не начал�� � магиче�кого чи�ла, �овме�тимого � загрузкой � �оединени�"
 
-#: src/main/scan.c:364 src/main/scan.c:414
+#: src/main/scan.c:364
+#: src/main/scan.c:414
 msgid "EOF within quoted string"
 msgstr "EOF внутри закавыченной �троки"
 
@@ -5313,7 +5967,8 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "'scan()' ожидает '%s', а не '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585
+#: src/main/scan.c:732
 msgid "too many items"
 msgstr "�лишком много �лементов"
 
@@ -5328,8 +5983,7 @@
 
 #: src/main/scan.c:775
 msgid "number of items read is not a multiple of the number of columns"
-msgstr ""
-"количе�тво прочитанных �лементов не �вл�ет�� произведением количе�тва колонок"
+msgstr "количе�тво прочитанных �лементов не �вл�ет�� произведением количе�тва колонок"
 
 #: src/main/scan.c:869
 msgid "invalid 'strip.white' length"
@@ -5367,7 +6021,8 @@
 msgid "argument of length 0"
 msgstr "аргумент нулевой длины"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:162
+#: src/main/seq.c:167
 #, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
@@ -5396,7 +6051,10 @@
 msgid "cannot replicate NULL to a non-zero length"
 msgstr "не могу размножить NULL до ненулевой длины"
 
-#: src/main/seq.c:630 src/main/seq.c:637 src/main/seq.c:766 src/main/seq.c:977
+#: src/main/seq.c:630
+#: src/main/seq.c:637
+#: src/main/seq.c:766
+#: src/main/seq.c:977
 #, c-format
 msgid "first element used of '%s' argument"
 msgstr "и�пользован первый �лемент аргумента '%s'"
@@ -5405,11 +6063,15 @@
 msgid "'length.out' must be a non-negative number"
 msgstr "'length.out' должен быть неотрицательным чи�лом"
 
-#: src/main/seq.c:788 src/main/seq.c:854 src/main/seq.c:871
+#: src/main/seq.c:788
+#: src/main/seq.c:854
+#: src/main/seq.c:871
 msgid "'from' must be finite"
 msgstr "'from' должен быть конечным"
 
-#: src/main/seq.c:790 src/main/seq.c:856 src/main/seq.c:893
+#: src/main/seq.c:790
+#: src/main/seq.c:856
+#: src/main/seq.c:893
 msgid "'to' must be finite"
 msgstr "'to' должен быть конечным"
 
@@ -5425,15 +6087,19 @@
 msgid "wrong sign in 'by' argument"
 msgstr "неправильный знак аргумента 'by'"
 
-#: src/main/seq.c:873 src/main/seq.c:895
+#: src/main/seq.c:873
+#: src/main/seq.c:895
 msgid "'by' must be finite"
 msgstr "'by' должен быть конечным"
 
-#: src/main/seq.c:983 src/main/seq.c:988
+#: src/main/seq.c:983
+#: src/main/seq.c:988
 msgid "argument must be coercible to non-negative integer"
 msgstr "аргумент должен быть преобразовываем в неотрицательное целое чи�ло"
 
-#: src/main/serialize.c:228 src/main/serialize.c:275 src/main/serialize.c:299
+#: src/main/serialize.c:228
+#: src/main/serialize.c:275
+#: src/main/serialize.c:299
 msgid "unknown or inappropriate output format"
 msgstr "неизве�тный или неподход�щий формат вывода"
 
@@ -5519,21 +6185,13 @@
 
 #: src/main/serialize.c:1921
 #, c-format
-msgid ""
-"cannot read unreleased workspace version %d written by experimental R %d.%d."
-"%d"
-msgstr ""
-"не могу прочитать рабочее про�тран�тво не выпущенной вер�ии %d, запи�анной "
-"�к�периментальным R %d.%d.%d"
+msgid "cannot read unreleased workspace version %d written by experimental R %d.%d.%d"
+msgstr "не могу прочитать рабочее про�тран�тво не выпущенной вер�ии %d, запи�анной �к�периментальным R %d.%d.%d"
 
 #: src/main/serialize.c:1925
 #, c-format
-msgid ""
-"cannot read workspace version %d written by R %d.%d.%d; need R %d.%d.%d or "
-"newer"
-msgstr ""
-"не могу прочитать рабочее про�тран�тво вер�ии %d, запи�анное R %d.%d.%d; "
-"нужен R %d.%d.%d или более новый"
+msgid "cannot read workspace version %d written by R %d.%d.%d; need R %d.%d.%d or newer"
+msgstr "не могу прочитать рабочее про�тран�тво вер�ии %d, запи�анное R %d.%d.%d; нужен R %d.%d.%d или более новый"
 
 #: src/main/serialize.c:2004
 msgid "read failed"
@@ -5547,7 +6205,8 @@
 msgid "unexpected format in ascii connection"
 msgstr "не могу читать из ASCII-�оединени�"
 
-#: src/main/serialize.c:2074 src/main/serialize.c:2088
+#: src/main/serialize.c:2074
+#: src/main/serialize.c:2088
 msgid "error reading from connection"
 msgstr "ошибка чтени� из �оединени�"
 
@@ -5559,7 +6218,8 @@
 msgid "only ascii format can be read from text mode connections"
 msgstr "только формат 'ascii' может быть прочитан из тек�товых �оединений"
 
-#: src/main/serialize.c:2200 src/main/serialize.c:2353
+#: src/main/serialize.c:2200
+#: src/main/serialize.c:2353
 #: src/main/serialize.c:2502
 msgid "bad version value"
 msgstr "неправильное значение вер�ии"
@@ -5568,17 +6228,18 @@
 msgid "binary-mode connection required for ascii=FALSE"
 msgstr "дл� ascii=FALSE требует�� двоичное �оединение"
 
-#: src/main/serialize.c:2381 src/main/serialize.c:2418
+#: src/main/serialize.c:2381
+#: src/main/serialize.c:2418
 #: src/main/serialize.c:2481
 msgid "serialization is too large to store in a raw vector"
-msgstr ""
-"�ериализаци� �лишком велика, дл� того чтобы хранить ее в про�том векторе"
+msgstr "�ериализаци� �лишком велика, дл� того чтобы хранить ее в про�том векторе"
 
 #: src/main/serialize.c:2398
 msgid "cannot allocate buffer"
 msgstr "не могу разме�тить буфер"
 
-#: src/main/serialize.c:2592 src/main/serialize.c:2665
+#: src/main/serialize.c:2592
+#: src/main/serialize.c:2665
 msgid "not a proper file name"
 msgstr "неправильное им� файла"
 
@@ -5594,15 +6255,19 @@
 msgid "bad offset/length argument"
 msgstr "неправильный аргумент �мещени�/длины"
 
-#: src/main/serialize.c:2691 src/main/serialize.c:2704
-#: src/main/serialize.c:2713 src/main/serialize.c:2723
+#: src/main/serialize.c:2691
+#: src/main/serialize.c:2704
+#: src/main/serialize.c:2713
+#: src/main/serialize.c:2723
 #: src/main/serialize.c:2736
 #, c-format
 msgid "seek failed on %s"
 msgstr "на %s не удало�ь найти"
 
-#: src/main/serialize.c:2708 src/main/serialize.c:2717
-#: src/main/serialize.c:2727 src/main/serialize.c:2740
+#: src/main/serialize.c:2708
+#: src/main/serialize.c:2717
+#: src/main/serialize.c:2727
+#: src/main/serialize.c:2740
 #, c-format
 msgid "read failed on %s"
 msgstr "на %s не удало�ь прочитать"
@@ -5619,15 +6284,20 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "только �лементарные факторы могут быть проверены на �ортировку"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:326
+#: src/main/sort.c:1228
+#: src/main/sort.c:1396
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' должен быть TRUE или FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:329
+#: src/main/sort.c:600
 msgid "only atomic vectors can be sorted"
 msgstr "только �лементарные векторы могут быть от�ортированы"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:331
+#: src/main/sort.c:602
+#: src/main/sort.c:1297
 msgid "raw vectors cannot be sorted"
 msgstr "про�тые векторы не могут быть от�ортированы"
 
@@ -5640,11 +6310,13 @@
 msgid "index %ld outside bounds"
 msgstr "индек� %ld за пределами"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:621
+#: src/main/sort.c:634
 msgid "NA index"
 msgstr "NA-индек�"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:623
+#: src/main/sort.c:636
 #, c-format
 msgid "index %d outside bounds"
 msgstr "индек� %d за пределами"
@@ -5714,11 +6386,13 @@
 msgid "invalid type of argument[%d]: '%s'"
 msgstr "неправильный тип аргумента [%d]: '%s'"
 
-#: src/main/sprintf.c:128 src/main/sprintf.c:131
+#: src/main/sprintf.c:128
+#: src/main/sprintf.c:131
 msgid "arguments cannot be recycled to the same length"
 msgstr "аргументы не могут �амоповтор�ть�� до одинаковой длины"
 
-#: src/main/sprintf.c:153 src/main/sprintf.c:260
+#: src/main/sprintf.c:153
+#: src/main/sprintf.c:260
 #, c-format
 msgid "'fmt' length exceeds maximal format length %d"
 msgstr "длина 'fmt' превышает мак�имальную длину формата %d"
@@ -5728,7 +6402,9 @@
 msgid "unrecognised format specification '%s'"
 msgstr "неправильное указание формата '%s'"
 
-#: src/main/sprintf.c:183 src/main/sprintf.c:189 src/main/sprintf.c:202
+#: src/main/sprintf.c:183
+#: src/main/sprintf.c:189
+#: src/main/sprintf.c:202
 #: src/main/sprintf.c:209
 #, c-format
 msgid "reference to non-existent argument %d"
@@ -5736,8 +6412,7 @@
 
 #: src/main/sprintf.c:221
 msgid "at most one asterisk '*' is supported in each conversion specification"
-msgstr ""
-"не более одной звездочки '*' поддерживает�� на каждое определение конвер�ии"
+msgstr "не более одной звездочки '*' поддерживает�� на каждое определение конвер�ии"
 
 #: src/main/sprintf.c:231
 msgid "argument for '*' conversion specification must be a number"
@@ -5747,7 +6422,9 @@
 msgid "coercion has changed vector length to 0"
 msgstr "преобразование изменило длину вектора в 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
+#: src/main/sprintf.c:342
+#: src/main/sprintf.c:356
+#: src/main/sprintf.c:370
 #: src/main/sprintf.c:405
 #, c-format
 msgid "invalid format '%s'; %s"
@@ -5800,17 +6477,23 @@
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "не�овме�тимые типы (от %s до %s) при запи�и типа подгрупп при�воени�"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
+#: src/main/subassign.c:503
+#: src/main/subassign.c:783
+#: src/main/subassign.c:786
 #: src/main/subassign.c:1077
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "в подгруппах при�воений NA не разрешены"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
+#: src/main/subassign.c:521
+#: src/main/subassign.c:797
+#: src/main/subassign.c:1069
 #: src/main/subassign.c:1647
 msgid "replacement has length zero"
 msgstr "замена имеет нулевую длину"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:523
+#: src/main/subassign.c:799
+#: src/main/subassign.c:1071
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr "чи�ло единиц дл� замены не �вл�ет�� произведением длины замены"
 
@@ -5823,17 +6506,18 @@
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr "не�овме�тимые типы (от %s до %s) в определении подгрупп матрицы"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1039
+#: src/main/subset.c:947
 msgid "incorrect number of subscripts"
 msgstr "неправильное количе�тво подгрупп"
 
 #: src/main/subassign.c:1215
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
-msgstr ""
-"не�овме�тимые типы (от %s до %s) в определении подгрупп многомерной матрицы"
+msgstr "не�овме�тимые типы (от %s до %s) в определении подгрупп многомерной матрицы"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1250
+#: src/main/subassign.c:1271
 msgid "invalid subscript in list assign"
 msgstr "неправильна� подгруппа �пи�ка при�воений"
 
@@ -5850,10 +6534,8 @@
 msgstr "результат нулевой длины и по�тому не может быть объектом �зыка"
 
 #: src/main/subassign.c:1607
-msgid ""
-"[[<- defined for objects of type \"S4\" only for subclasses of environment"
-msgstr ""
-"[[<- дл� объектов типа \"S4\" определено только дл� подкла��ов окружени�"
+msgid "[[<- defined for objects of type \"S4\" only for subclasses of environment"
+msgstr "[[<- дл� объектов типа \"S4\" определено только дл� подкла��ов окружени�"
 
 #: src/main/subassign.c:1619
 msgid "wrong args for environment subassignment"
@@ -5867,11 +6549,13 @@
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] � пропущенным индек�ом"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1669
+#: src/main/subassign.c:1687
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] индек� за пределами"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1675
+#: src/main/subassign.c:1856
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] неправильное количе�тво подгрупп"
 
@@ -5885,9 +6569,15 @@
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] индек� (%d) за пределами"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
+#: src/main/subassign.c:1923
+#: src/main/subscript.c:151
+#: src/main/subscript.c:153
+#: src/main/subscript.c:282
+#: src/main/subscript.c:284
+#: src/main/subscript.c:894
+#: src/main/subscript.c:896
+#: src/main/subscript.c:987
+#: src/main/subscript.c:989
 #: src/main/subset.c:1149
 #, c-format
 msgid "invalid subscript type '%s'"
@@ -5901,13 +6591,18 @@
 msgid "Coercing LHS to a list"
 msgstr "Преобразование левой �тороны выражени� в �пи�ок"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
+#: src/main/subscript.c:58
+#: src/main/subscript.c:80
+#: src/main/subscript.c:188
 #: src/main/subscript.c:212
 msgid "attempt to select less than one element"
 msgstr "попытка выбрать менее одного �лемента"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
+#: src/main/subscript.c:62
+#: src/main/subscript.c:77
+#: src/main/subscript.c:186
+#: src/main/subscript.c:216
+#: src/main/subscript.c:312
 msgid "attempt to select more than one element"
 msgstr "попытка выбрать более одного �лемента"
 
@@ -5934,7 +6629,9 @@
 msgid "incorrect number of columns in matrix subscript"
 msgstr "неправильное количе�тво колонок в индек�е матрицы"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:386
+#: src/main/subscript.c:404
+#: src/main/subscript.c:428
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "отрицательные значени� в индек�е матрицы не разрешены"
 
@@ -5942,7 +6639,8 @@
 msgid "(subscript) logical subscript too long"
 msgstr "(subscript) логиче�кий индек� �лишком велик"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:658
+#: src/main/subscript.c:713
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "только нули могут �мешивать�� � отрицательными индек�ами"
 
@@ -5962,7 +6660,8 @@
 msgid "dimensions would exceed maximum size of array"
 msgstr "размерно�ти превышают мак�имальный размер ма��ива"
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:305
+#: src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "индек�ирование матрицы дл� �того типа невозможно"
 
@@ -5991,7 +6690,9 @@
 msgid "invalid 'type' (%s) of argument"
 msgstr "неправильный 'type' (%s) аргумента"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:66
+#: src/main/summary.c:78
+#: src/main/summary.c:103
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "целочи�ленное переполнение -- и�пользуйте sum(as.numeric(.))"
 
@@ -6028,7 +6729,8 @@
 msgid "no arguments"
 msgstr "нет аргументов"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:915
+#: src/main/summary.c:932
 msgid "invalid input type"
 msgstr "неправильный тип ввода"
 
@@ -6036,7 +6738,8 @@
 msgid "an argument will be fractionally recycled"
 msgstr "аргумент будет ча�тично зациклен"
 
-#: src/main/sysutils.c:68 src/main/sysutils.c:82
+#: src/main/sysutils.c:68
+#: src/main/sysutils.c:82
 #, c-format
 msgid "cannot determine file modification time of '%s'"
 msgstr "не могу определить врем� изменени� файла '%s'"
@@ -6045,7 +6748,9 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "кодировка дл� имени файла не может быть 'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
+#: src/main/sysutils.c:169
+#: src/main/sysutils.c:825
+#: src/main/sysutils.c:840
 #: src/main/sysutils.c:969
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
@@ -6084,8 +6789,11 @@
 msgid "system call failed: %s"
 msgstr "�и�темный вызов не удал�� %s"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:351
+#: src/main/sysutils.c:354
+#: src/main/sysutils.c:445
+#: src/main/sysutils.c:447
+#: src/main/sysutils.c:483
 msgid "wrong type for argument"
 msgstr "неправильный тип дл� аргумента"
 
@@ -6099,8 +6807,7 @@
 
 #: src/main/sysutils.c:514
 msgid "this system cannot unset environment variables: setting to \"\""
-msgstr ""
-"�та �и�тема не может отменить переменные окружени�: у�танавливаю в \"\""
+msgstr "�та �и�тема не может отменить переменные окружени�: у�танавливаю в \"\""
 
 #: src/main/sysutils.c:525
 msgid "'Sys.unsetenv' is not available on this system"
@@ -6119,13 +6826,19 @@
 msgid "'x' must be a list of NULL or raw vectors"
 msgstr "'x' должен быть �пи�ком из NULL или про�тых векторов"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:730
+#: src/main/sysutils.c:908
+#: src/main/sysutils.c:926
+#: src/main/sysutils.c:943
+#: src/main/sysutils.c:959
+#: src/main/sysutils.c:1036
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' должен быть вызван на CHARSXP"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:799
+#: src/main/sysutils.c:964
+#: src/main/sysutils.c:1039
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr "перевод �трок � кодировкой \"bytes\" запрещено"
 
@@ -6147,7 +6860,9 @@
 msgid "cannot create 'R_TempDir'"
 msgstr "не могу �оздать 'R_TempDir'"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1586
+#: src/main/sysutils.c:1594
+#: src/main/sysutils.c:1597
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "не могу у�тановить R_SESSION_TMPDIR"
 
@@ -6171,13 +6886,17 @@
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "'dirmarke = TRUE' не поддерживает�� на �той платформе"
 
-#: src/main/unique.c:321 src/main/unique.c:324
+#: src/main/unique.c:321
+#: src/main/unique.c:324
 #, c-format
 msgid "length %d is too large for hashing"
 msgstr "длина %d �лишком велика дл� хешировани�"
 
-#: src/main/unique.c:490 src/main/unique.c:519 src/main/unique.c:549
-#: src/main/unique.c:573 src/main/unique.c:612
+#: src/main/unique.c:490
+#: src/main/unique.c:519
+#: src/main/unique.c:549
+#: src/main/unique.c:573
+#: src/main/unique.c:612
 msgid "'duplicated' applies only to vectors"
 msgstr "'duplicated' применима только к векторам"
 
@@ -6206,7 +6925,8 @@
 msgid "'match' requires vector arguments"
 msgstr "'match' требует векторных аргументов"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:973
+#: src/main/unique.c:1111
 msgid "argument is not of mode character"
 msgstr "аргумент не �вл�ет�� тек�том"
 
@@ -6230,31 +6950,34 @@
 msgid "'names' must be a character vector"
 msgstr "'names' должны быть тек�товым вектором"
 
-#: src/main/util.c:87 src/main/util.c:105
+#: src/main/util.c:87
+#: src/main/util.c:105
 msgid "object is not a matrix"
 msgstr "объект не �вл�ет�� матрицей"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303
+#: src/main/util.c:315
+#: src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "тип %d не реализован в '%s'"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "нереализованный тип '%s' в '%s'\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "нереализованный  тип (%d) в '%s'\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "неправильный �рлык при выделении имени"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
@@ -6262,7 +6985,7 @@
 msgstr[1] "%d аргумента переданы в .Internal(%s), а требует�� %d"
 msgstr[2] "%d аргументов переданы в .Internal(%s), а требует�� %d"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
@@ -6270,108 +6993,117 @@
 msgstr[1] "%d аргумента переданы '%s', а требует�� %d"
 msgstr[2] "%d аргументов переданы '%s', а требует�� %d"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "предложенное им� аргумента '%s' не �оответ�твует '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "�пи�ок 'nthcdr' короче, чем %d"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr' нужен �пи�ок дл� выполнени� CDR"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' должно быть TRUE или FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' должно быть TRUE или FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:668
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr "количе�тво �трок в результате превышает мак�имальную длину вектора"
 
-#: src/main/util.c:762
+#: src/main/util.c:760
 msgid "missing value is invalid"
 msgstr "неправильное пропущенное значение"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:769
+#: src/main/util.c:776
 msgid "cannot change working directory"
 msgstr "невозможно �менить рабочий каталог"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:796
+#: src/main/util.c:830
+#: src/main/util.c:871
+#: src/main/util.c:913
+#: src/main/util.c:1042
+#: src/main/util.c:1101
+#: src/main/util.c:1124
 msgid "a character vector argument expected"
 msgstr "нужен аргумент -- тек�товый вектор"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:803
+#: src/main/util.c:838
+#: src/main/util.c:880
+#: src/main/util.c:921
 msgid "path too long"
 msgstr "�лишком длинный путь"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1056
 msgid "only the first character of 'quote' will be used"
 msgstr "будет и�пользован только первый �имвол 'quote'"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1126
 msgid "a character vector 'value' expected"
 msgstr "ожидает�� тек�товый вектор 'value'"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1129
 msgid "'value' must be of positive length"
 msgstr "'value' должно иметь положительную длину"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1258
+#: src/main/util.c:1266
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "неправильный ввод '%s' в 'utf8towcs'"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1351
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "неправильна� многобайтна� �трока в '%s'"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1493
 msgid "error message truncated to 255 chars"
 msgstr "�ообщение об ошибке �окращено до 255 �имволов"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1506
 msgid "warning message truncated to 255 chars"
 msgstr "предупреждающее �ообщение �окращено до 255 �имволов"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1655
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr "потер� точно�ти при конвертации \"%s\" в чи�ло"
 
-#: src/main/util.c:1934
+#: src/main/util.c:1965
 msgid "all arguments must be named"
 msgstr "в�е аргументы должны быть именованы"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2085
 msgid "ICU is not supported on this build"
 msgstr "ICU не поддерживает�� в �той �борке"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2152
 msgid "'breaks' is not sorted"
 msgstr "'breaks' не �ортированы"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2186
+#: src/main/util.c:2232
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "длинный вектор '%s' не поддерживает��"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2285
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr "'eps.correct' должен быть 0, 1, or 2"
 
-#: src/main/util.c:2282
+#: src/main/util.c:2313
 msgid "'x' must be a vector"
 msgstr "'x' должен быть вектором"
 
@@ -6433,7 +7165,8 @@
 msgid "There must be at least three control points"
 msgstr "Тут должно быть по крайней мере 3 контрольных точки"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874
+#: src/modules/X11/devX11.c:1246
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "ошибка протокола X11: %s"
@@ -6477,12 +7210,8 @@
 msgstr "X11 шрифт %s, начертани� %d и размера %d нельз� загрузить"
 
 #: src/modules/X11/devX11.c:1130
-msgid ""
-"semi-transparency is not supported on this device: reported only once per "
-"page"
-msgstr ""
-"полупрозрачно�ть не поддерживает�� �тим у�трой�твом: �ообщает�� раз на "
-"�траницу"
+msgid "semi-transparency is not supported on this device: reported only once per page"
+msgstr "полупрозрачно�ть не поддерживает�� �тим у�трой�твом: �ообщает�� раз на �траницу"
 
 #: src/modules/X11/devX11.c:1254
 #, c-format
@@ -6495,9 +7224,7 @@
 
 #: src/modules/X11/devX11.c:1326
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
-msgstr ""
-"локаль не поддерживает�� 'Xlib': некоторые операции X будут прои�ходить на "
-"локали C"
+msgstr "локаль не поддерживает�� 'Xlib': некоторые операции X будут прои�ходить на локали C"
 
 #: src/modules/X11/devX11.c:1327
 msgid "X cannot set locale modifiers"
@@ -6557,8 +7284,7 @@
 
 #: src/modules/X11/devX11.c:1449
 msgid "cairo-based types may only work correctly on TrueColor visuals"
-msgstr ""
-"о�нованные на cairo типы работают правильно только на у�трой�твах TrueColor"
+msgstr "о�нованные на cairo типы работают правильно только на у�трой�твах TrueColor"
 
 #: src/modules/X11/devX11.c:1459
 msgid "jpeg() does not support transparency: using white bg"
@@ -6664,10 +7390,14 @@
 msgid "for https:// URLs use setInternet2(TRUE)"
 msgstr "дл� https:// URLs и�пользуйте setInternet2(TRUE)"
 
-#: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
-#: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
+#: src/modules/internet/internet.c:348
+#: src/modules/internet/internet.c:352
+#: src/modules/internet/internet.c:357
+#: src/modules/internet/internet.c:381
+#: src/modules/internet/libcurl.c:655
+#: src/modules/internet/libcurl.c:659
+#: src/modules/internet/libcurl.c:665
+#: src/modules/internet/libcurl.c:677
 #: src/modules/internet/libcurl.c:685
 msgid "allocation of url connection failed"
 msgstr "выделение url-�оединени� не удало�ь"
@@ -6680,7 +7410,8 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "и�пользован только первый �лемент аргумента 'destfile'"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:479
+#: src/modules/internet/libcurl.c:367
 msgid "Download progress"
 msgstr "Процент загрузки"
 
@@ -6689,25 +7420,30 @@
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "не могу открыть URL '%s' по причине '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:508
+#: src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
+#: src/modules/internet/libcurl.c:408
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "не могу открыть файл назначени� '%s' по причине '%s'"
 
-#: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
+#: src/modules/internet/internet.c:541
+#: src/modules/internet/internet.c:666
 #: src/modules/internet/libcurl.c:412
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "пробую URL '%s'\n"
 
-#: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
+#: src/modules/internet/internet.c:640
+#: src/modules/internet/internet.c:751
 #: src/modules/internet/libcurl.c:460
 #, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "загруженный размер %0.f != �ообщенному размеру %0.f"
 
-#: src/modules/internet/internet.c:645 src/modules/internet/internet.c:756
+#: src/modules/internet/internet.c:645
+#: src/modules/internet/internet.c:756
 #, c-format
 msgid "cannot open URL '%s'"
 msgstr "не могу открыть URL '%s'"
@@ -6716,13 +7452,16 @@
 msgid "unsupported URL scheme"
 msgstr "не поддерживаема� �хема URL"
 
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
+#: src/modules/internet/internet.c:783
+#: src/modules/internet/internet.c:949
 #, c-format
 msgid "cannot open: HTTP status was '%d %s'"
 msgstr "не могу открыть: �тату� HTTP был '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:920
+#: src/modules/internet/internet.c:934
+#: src/modules/internet/internet.c:1021
+#: src/modules/internet/internet.c:1030
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "'InternetOpenUrl' не удало�ь: '%s'"
@@ -6731,7 +7470,8 @@
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "curlGetHeaders не поддерживает�� на �той платформе"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:151
+#: src/modules/internet/libcurl.c:154
 #, c-format
 msgid "invalid %s argument"
 msgstr "неправильный аргумент %s"
@@ -6747,8 +7487,7 @@
 
 #: src/modules/internet/libcurl.c:306
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
-msgstr ""
-"download.file(method = \"libcurl\") не поддерживает�� на �той платформе"
+msgstr "download.file(method = \"libcurl\") не поддерживает�� на �той платформе"
 
 #: src/modules/internet/libcurl.c:322
 msgid "lengths of 'url' and 'destfile' must match"
@@ -6758,8 +7497,10 @@
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "url(method = \"libcurl\") не поддерживает�� на �той платформе"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
+#: src/modules/internet/nanoftp.c:290
+#: src/modules/internet/nanoftp.c:303
+#: src/modules/internet/nanoftp.c:314
+#: src/modules/internet/nanoftp.c:348
 #: src/modules/internet/nanoftp.c:358
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: чере�чур длинные (неправильные?) URL"
@@ -6773,7 +7514,8 @@
 msgid "using FTP proxy '%s'"
 msgstr "и�пользую FTP-прок�и '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:404
+#: src/modules/internet/nanoftp.c:433
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: чере�чур длинные (неправильные?) URL"
 
@@ -6806,7 +7548,8 @@
 msgid "could not listen on port %d"
 msgstr "не могу про�лушать порт %d"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
+#: src/modules/internet/nanohttp.c:370
+#: src/modules/internet/nanohttp.c:398
 #: src/modules/internet/nanohttp.c:407
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: чере�чур длинные (неправильные?) URL"
@@ -6820,7 +7563,8 @@
 msgid "using HTTP proxy '%s'"
 msgstr "и�пользую HTTP-прок�и '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:454
+#: src/modules/internet/nanohttp.c:490
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: чере�чур длинные (неправильные?) URL"
 
@@ -6848,12 +7592,15 @@
 msgid "too many redirects, aborting ..."
 msgstr "�лишком много перенаправлений, отключаю�ь ..."
 
-#: src/modules/internet/sockconn.c:177 src/modules/internet/sockconn.c:181
-#: src/modules/internet/sockconn.c:187 src/modules/internet/sockconn.c:200
+#: src/modules/internet/sockconn.c:177
+#: src/modules/internet/sockconn.c:181
+#: src/modules/internet/sockconn.c:187
+#: src/modules/internet/sockconn.c:200
 msgid "allocation of socket connection failed"
 msgstr "не удало�ь размещение socket-�оединени�"
 
-#: src/modules/lapack/Lapack.c:48 src/modules/lapack/Lapack.c:67
+#: src/modules/lapack/Lapack.c:48
+#: src/modules/lapack/Lapack.c:67
 #, c-format
 msgid "argument type[1]='%s' must be a character string of string length 1"
 msgstr "аргумент type[1]='%s' должен быть a тек�товым вектором единичной длины"
@@ -6868,30 +7615,45 @@
 msgid "argument type[1]='%s' must be one of '1','O', or 'I'"
 msgstr "аргумент type[1]='%s' должен быть одним из '1','O', или 'I'"
 
-#: src/modules/lapack/Lapack.c:116 src/modules/lapack/Lapack.c:123
-#: src/modules/lapack/Lapack.c:182 src/modules/lapack/Lapack.c:193
-#: src/modules/lapack/Lapack.c:275 src/modules/lapack/Lapack.c:281
-#: src/modules/lapack/Lapack.c:617 src/modules/lapack/Lapack.c:623
-#: src/modules/lapack/Lapack.c:677 src/modules/lapack/Lapack.c:684
-#: src/modules/lapack/Lapack.c:688 src/modules/lapack/Lapack.c:723
-#: src/modules/lapack/Lapack.c:730 src/modules/lapack/Lapack.c:779
-#: src/modules/lapack/Lapack.c:786 src/modules/lapack/Lapack.c:834
-#: src/modules/lapack/Lapack.c:840 src/modules/lapack/Lapack.c:894
-#: src/modules/lapack/Lapack.c:900 src/modules/lapack/Lapack.c:1135
-#: src/modules/lapack/Lapack.c:1141 src/modules/lapack/Lapack.c:1189
-#: src/modules/lapack/Lapack.c:1196 src/modules/lapack/Lapack.c:1200
-#: src/modules/lapack/Lapack.c:1228 src/modules/lapack/Lapack.c:1235
+#: src/modules/lapack/Lapack.c:116
+#: src/modules/lapack/Lapack.c:123
+#: src/modules/lapack/Lapack.c:182
+#: src/modules/lapack/Lapack.c:193
+#: src/modules/lapack/Lapack.c:275
+#: src/modules/lapack/Lapack.c:281
+#: src/modules/lapack/Lapack.c:617
+#: src/modules/lapack/Lapack.c:623
+#: src/modules/lapack/Lapack.c:677
+#: src/modules/lapack/Lapack.c:684
+#: src/modules/lapack/Lapack.c:688
+#: src/modules/lapack/Lapack.c:723
+#: src/modules/lapack/Lapack.c:730
+#: src/modules/lapack/Lapack.c:779
+#: src/modules/lapack/Lapack.c:786
+#: src/modules/lapack/Lapack.c:834
+#: src/modules/lapack/Lapack.c:840
+#: src/modules/lapack/Lapack.c:894
+#: src/modules/lapack/Lapack.c:900
+#: src/modules/lapack/Lapack.c:1135
+#: src/modules/lapack/Lapack.c:1141
+#: src/modules/lapack/Lapack.c:1189
+#: src/modules/lapack/Lapack.c:1196
+#: src/modules/lapack/Lapack.c:1200
+#: src/modules/lapack/Lapack.c:1228
+#: src/modules/lapack/Lapack.c:1235
 #: src/modules/lapack/Lapack.c:1255
 #, c-format
 msgid "error code %d from Lapack routine '%s'"
 msgstr "ошибка � кодом %d из �ред�тва 'Lapack' '%s'"
 
-#: src/modules/lapack/Lapack.c:153 src/modules/lapack/Lapack.c:248
+#: src/modules/lapack/Lapack.c:153
+#: src/modules/lapack/Lapack.c:248
 #: src/modules/lapack/Lapack.c:874
 msgid "'x' must be a square numeric matrix"
 msgstr "'x' должен быть квадратной чи�ловой матрицей"
 
-#: src/modules/lapack/Lapack.c:325 src/modules/lapack/Lapack.c:355
+#: src/modules/lapack/Lapack.c:325
+#: src/modules/lapack/Lapack.c:355
 #: src/modules/lapack/Lapack.c:404
 msgid "'A' must be a numeric matrix"
 msgstr "'A' должна быть чи�ловой матрицей"
@@ -6900,8 +7662,10 @@
 msgid "'type' must be a character string"
 msgstr "'type' должен быть тек�товой �трокой"
 
-#: src/modules/lapack/Lapack.c:357 src/modules/lapack/Lapack.c:405
-#: src/modules/lapack/Lapack.c:441 src/modules/lapack/Lapack.c:498
+#: src/modules/lapack/Lapack.c:357
+#: src/modules/lapack/Lapack.c:405
+#: src/modules/lapack/Lapack.c:441
+#: src/modules/lapack/Lapack.c:498
 msgid "'norm' must be a character string"
 msgstr "'norm' должен быть тек�товой �трокой"
 
@@ -6920,7 +7684,8 @@
 msgid "error [%d] from Lapack 'dgecon()'"
 msgstr "ошибка [%d] в Lapack функции 'dgecon()'"
 
-#: src/modules/lapack/Lapack.c:414 src/modules/lapack/Lapack.c:446
+#: src/modules/lapack/Lapack.c:414
+#: src/modules/lapack/Lapack.c:446
 #: src/modules/lapack/Lapack.c:504
 msgid "'A' must be a *square* matrix"
 msgstr "'A' должна быть *квадратной* матрицей"
@@ -6930,11 +7695,13 @@
 msgid "error [%d] from Lapack 'dtrcon()'"
 msgstr "ошибка [%d] в Lapack функции 'dtrcon()'"
 
-#: src/modules/lapack/Lapack.c:443 src/modules/lapack/Lapack.c:500
+#: src/modules/lapack/Lapack.c:443
+#: src/modules/lapack/Lapack.c:500
 msgid "'A' must be a complex matrix"
 msgstr "'A' должна быть комплек�ной матрицей"
 
-#: src/modules/lapack/Lapack.c:465 src/modules/lapack/Lapack.c:472
+#: src/modules/lapack/Lapack.c:465
+#: src/modules/lapack/Lapack.c:472
 #, c-format
 msgid "error [%d] from Lapack 'zgetrf()'"
 msgstr "ошибка [%d] в Lapack функции 'zgetrf()'"
@@ -6944,10 +7711,14 @@
 msgid "error [%d] from Lapack 'zgecon()'"
 msgstr "ошибка [%d] в Lapack функции 'zgecon()'"
 
-#: src/modules/lapack/Lapack.c:484 src/modules/lapack/Lapack.c:519
-#: src/modules/lapack/Lapack.c:588 src/modules/lapack/Lapack.c:648
-#: src/modules/lapack/Lapack.c:692 src/modules/lapack/Lapack.c:734
-#: src/modules/lapack/Lapack.c:800 src/modules/lapack/Lapack.c:857
+#: src/modules/lapack/Lapack.c:484
+#: src/modules/lapack/Lapack.c:519
+#: src/modules/lapack/Lapack.c:588
+#: src/modules/lapack/Lapack.c:648
+#: src/modules/lapack/Lapack.c:692
+#: src/modules/lapack/Lapack.c:734
+#: src/modules/lapack/Lapack.c:800
+#: src/modules/lapack/Lapack.c:857
 #: src/modules/lapack/Lapack.c:917
 msgid "Fortran complex functions are not available on this platform"
 msgstr "комплек�ные функции Fortran на �той платформе недо�тупны"
@@ -6957,42 +7728,53 @@
 msgid "error [%d] from Lapack 'ztrcon()'"
 msgstr "ошибка [%d] в Lapack функции 'ztrcon()'"
 
-#: src/modules/lapack/Lapack.c:532 src/modules/lapack/Lapack.c:602
+#: src/modules/lapack/Lapack.c:532
+#: src/modules/lapack/Lapack.c:602
 msgid "'a' must be a complex matrix"
 msgstr "'a' должен быть комплек�ной матрицей"
 
-#: src/modules/lapack/Lapack.c:535 src/modules/lapack/Lapack.c:1043
+#: src/modules/lapack/Lapack.c:535
+#: src/modules/lapack/Lapack.c:1043
 msgid "'a' is 0-diml"
 msgstr "'a' �вл�ет�� 0-мерной"
 
-#: src/modules/lapack/Lapack.c:537 src/modules/lapack/Lapack.c:1045
+#: src/modules/lapack/Lapack.c:537
+#: src/modules/lapack/Lapack.c:1045
 #, c-format
 msgid "'a' (%d x %d) must be square"
 msgstr "'a' (%d x %d) должна быть квадратной"
 
-#: src/modules/lapack/Lapack.c:543 src/modules/lapack/Lapack.c:1051
+#: src/modules/lapack/Lapack.c:543
+#: src/modules/lapack/Lapack.c:1051
 msgid "no right-hand side in 'b'"
 msgstr "у 'b' нет правой �тороны"
 
-#: src/modules/lapack/Lapack.c:546 src/modules/lapack/Lapack.c:560
-#: src/modules/lapack/Lapack.c:1054 src/modules/lapack/Lapack.c:1070
+#: src/modules/lapack/Lapack.c:546
+#: src/modules/lapack/Lapack.c:560
+#: src/modules/lapack/Lapack.c:1054
+#: src/modules/lapack/Lapack.c:1070
 #, c-format
 msgid "'b' (%d x %d) must be compatible with 'a' (%d x %d)"
 msgstr "'b' (%d x %d) должна быть �овме�тима � 'a' (%d x %d)"
 
-#: src/modules/lapack/Lapack.c:581 src/modules/lapack/Lapack.c:948
-#: src/modules/lapack/Lapack.c:962 src/modules/lapack/Lapack.c:1018
+#: src/modules/lapack/Lapack.c:581
+#: src/modules/lapack/Lapack.c:948
+#: src/modules/lapack/Lapack.c:962
+#: src/modules/lapack/Lapack.c:1018
 #: src/modules/lapack/Lapack.c:1092
 #, c-format
 msgid "argument %d of Lapack routine %s had invalid value"
 msgstr "аргумент %d функции 'Lapack' %s имеет неправильное значение"
 
-#: src/modules/lapack/Lapack.c:662 src/modules/lapack/Lapack.c:707
+#: src/modules/lapack/Lapack.c:662
+#: src/modules/lapack/Lapack.c:707
 msgid "'b' must be a complex matrix"
 msgstr "'b' должен быть комплек�ной матрицей"
 
-#: src/modules/lapack/Lapack.c:670 src/modules/lapack/Lapack.c:716
-#: src/modules/lapack/Lapack.c:1182 src/modules/lapack/Lapack.c:1221
+#: src/modules/lapack/Lapack.c:670
+#: src/modules/lapack/Lapack.c:716
+#: src/modules/lapack/Lapack.c:1182
+#: src/modules/lapack/Lapack.c:1221
 #, c-format
 msgid "right-hand side should have %d not %d rows"
 msgstr "права� �торона должна иметь %d, а не %d �трок"
@@ -7009,13 +7791,16 @@
 msgid "'x' must be a square complex matrix"
 msgstr "'x' должен быть квадратной комплек�ной матрицей"
 
-#: src/modules/lapack/Lapack.c:926 src/modules/lapack/Lapack.c:1001
-#: src/modules/lapack/Lapack.c:1040 src/modules/lapack/Lapack.c:1115
+#: src/modules/lapack/Lapack.c:926
+#: src/modules/lapack/Lapack.c:1001
+#: src/modules/lapack/Lapack.c:1040
+#: src/modules/lapack/Lapack.c:1115
 #: src/modules/lapack/Lapack.c:1246
 msgid "'a' must be a numeric matrix"
 msgstr "'a' должен быть чи�ловой матрицей"
 
-#: src/modules/lapack/Lapack.c:933 src/modules/lapack/Lapack.c:1251
+#: src/modules/lapack/Lapack.c:933
+#: src/modules/lapack/Lapack.c:1251
 msgid "'a' must be a square matrix"
 msgstr "'a' должна быть квадратной матрицей"
 
@@ -7059,11 +7844,10 @@
 #: src/modules/lapack/Lapack.c:1103
 #, c-format
 msgid "system is computationally singular: reciprocal condition number = %g"
-msgstr ""
-"�и�тема вычи�лительно �ингул�рна�: величина, обратна� к чи�лу "
-"обу�ловленно�ти, равна %g"
+msgstr "�и�тема вычи�лительно �ингул�рна�: величина, обратна� к чи�лу обу�ловленно�ти, равна %g"
 
-#: src/modules/lapack/Lapack.c:1175 src/modules/lapack/Lapack.c:1213
+#: src/modules/lapack/Lapack.c:1175
+#: src/modules/lapack/Lapack.c:1213
 msgid "'b' must be a numeric matrix"
 msgstr "'b' должен быть чи�ловой матрицей"
 
@@ -7075,13 +7859,14 @@
 msgid "bessel_i allocation error"
 msgstr "ошибка выделени� пам�ти в 'bessel_i'"
 
-#: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
+#: src/nmath/bessel_i.c:77
+#: src/nmath/bessel_i.c:122
 #, c-format
 msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
-msgstr ""
-"bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
+msgstr "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
 
-#: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
+#: src/nmath/bessel_i.c:80
+#: src/nmath/bessel_i.c:125
 #, c-format
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): потер�на точно�ть результата\n"
@@ -7090,13 +7875,14 @@
 msgid "bessel_j allocation error"
 msgstr "ошибка выделени� пам�ти в 'bessel_j'"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
+#: src/nmath/bessel_j.c:79
+#: src/nmath/bessel_j.c:125
 #, c-format
 msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
-msgstr ""
-"bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
+msgstr "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:82
+#: src/nmath/bessel_j.c:128
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): потер�на точно�ть результата\n"
@@ -7105,13 +7891,14 @@
 msgid "bessel_k allocation error"
 msgstr "ошибка выделени� пам�ти в 'bessel_k'"
 
-#: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
+#: src/nmath/bessel_k.c:71
+#: src/nmath/bessel_k.c:108
 #, c-format
 msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
-msgstr ""
-"bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
+msgstr "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
 
-#: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
+#: src/nmath/bessel_k.c:74
+#: src/nmath/bessel_k.c:111
 #, c-format
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): потер�на точно�ть результата\n"
@@ -7120,18 +7907,20 @@
 msgid "bessel_y allocation error"
 msgstr "ошибка выделени� пам�ти в 'bessel_y'"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
+#: src/nmath/bessel_y.c:86
+#: src/nmath/bessel_y.c:134
 #, c-format
 msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
-msgstr ""
-"bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
+msgstr "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. �ргумент за пределами?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:89
+#: src/nmath/bessel_y.c:137
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): потер�на точно�ть результата\n"
 
-#: src/nmath/choose.c:79 src/nmath/choose.c:122
+#: src/nmath/choose.c:79
+#: src/nmath/choose.c:122
 #, c-format
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr "'k' (%.2f) должен быть целым, округлено до %.0f"
@@ -7195,7 +7984,9 @@
 msgid "norm_rand(): invalid N01_kind: %d\n"
 msgstr "'norm_rand()': неправильный 'N01_kind': %d\n"
 
-#: src/nmath/wilcox.c:85 src/nmath/wilcox.c:95 src/nmath/wilcox.c:148
+#: src/nmath/wilcox.c:85
+#: src/nmath/wilcox.c:95
+#: src/nmath/wilcox.c:148
 #: src/nmath/wilcox.c:313
 #, c-format
 msgid "wilcox allocation error %d"
@@ -7209,43 +8000,35 @@
 msgid "X11 routines cannot be accessed in module"
 msgstr "�ред�тва X11 не до�тупны в модуле"
 
-#: src/unix/X11.c:78 src/unix/X11.c:90 src/unix/X11.c:102 src/unix/X11.c:113
+#: src/unix/X11.c:78
+#: src/unix/X11.c:90
+#: src/unix/X11.c:102
+#: src/unix/X11.c:113
 msgid "X11 module cannot be loaded"
 msgstr "модуль X11 нельз� загрузить"
 
-#: src/unix/X11.c:144 src/unix/X11.c:150 src/unix/X11.c:156 src/unix/X11.c:162
+#: src/unix/X11.c:144
+#: src/unix/X11.c:150
+#: src/unix/X11.c:156
+#: src/unix/X11.c:162
 msgid "X11 is not available"
 msgstr "X11 недо�тупен"
 
 #: src/unix/dynload.c:143
-msgid ""
-"Explicit local dynamic loading not supported on this platform. Using default."
-msgstr ""
-"Явна� локальна� динамиче�ка� загрузка не поддерживает�� на �той платформе. "
-"И�пользую умолчание."
+msgid "Explicit local dynamic loading not supported on this platform. Using default."
+msgstr "Явна� локальна� динамиче�ка� загрузка не поддерживает�� на �той платформе. И�пользую умолчание."
 
 #: src/unix/dynload.c:144
-msgid ""
-"Explicit global dynamic loading not supported on this platform. Using "
-"default."
-msgstr ""
-"Явна� глобальна� динамиче�ка� загрузка не поддерживает�� на �той платформе. "
-"И�пользую умолчание."
+msgid "Explicit global dynamic loading not supported on this platform. Using default."
+msgstr "Явна� глобальна� динамиче�ка� загрузка не поддерживает�� на �той платформе. И�пользую умолчание."
 
 #: src/unix/dynload.c:145
-msgid ""
-"Explicit non-lazy dynamic loading not supported on this platform. Using "
-"default."
-msgstr ""
-"Явна� неленива� динамиче�ка� загрузка не поддерживает�� на �той платформе. "
-"И�пользую умолчание."
+msgid "Explicit non-lazy dynamic loading not supported on this platform. Using default."
+msgstr "Явна� неленива� динамиче�ка� загрузка не поддерживает�� на �той платформе. И�пользую умолчание."
 
 #: src/unix/dynload.c:146
-msgid ""
-"Explicit lazy dynamic loading not supported on this platform. Using default."
-msgstr ""
-"Явна� ленива� динамиче�ка� загрузка не поддерживает�� на �той платформе. "
-"И�пользую умолчание."
+msgid "Explicit lazy dynamic loading not supported on this platform. Using default."
+msgstr "Явна� ленива� динамиче�ка� загрузка не поддерживает�� на �той платформе. И�пользую умолчание."
 
 #: src/unix/dynload.c:240
 msgid "cannot get working directory!"
@@ -7256,14 +8039,11 @@
 msgstr "обработчик прерывани� не должен возвращать"
 
 #: src/unix/sys-std.c:521
-msgid ""
-"An unusual circumstance has arisen in the nesting of readline input. Please "
-"report using bug.report()"
-msgstr ""
-"При в�тавке ввода 'readline' произошло нечто необычное. Пожалуй�та, "
-"�ообщите, и�пользу� bug.report()"
+msgid "An unusual circumstance has arisen in the nesting of readline input. Please report using bug.report()"
+msgstr "При в�тавке ввода 'readline' произошло нечто необычное. Пожалуй�та, �ообщите, и�пользу� bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085
+#: src/unix/sys-std.c:1252
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "проблема при �охранении файла и�тории '%s'"
@@ -7277,11 +8057,13 @@
 "�е могу открыть файл '%s': %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1223
+#: src/unix/sys-std.c:1246
 msgid "'file' argument is too long"
 msgstr "аргумент 'file' �лишком длинный"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1229
+#: src/unix/sys-std.c:1231
 msgid "no history mechanism available"
 msgstr "механизм и�тории недо�тупен"
 
@@ -7289,7 +8071,8 @@
 msgid "problem in truncating the history file"
 msgstr "проблема � обрезкой файла и�тории"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1260
+#: src/unix/sys-std.c:1262
 msgid "no history available to save"
 msgstr "нет и�тории, чтобы �охранить"
 
@@ -7333,260 +8116,193 @@
 msgid "Sys.info() is not implemented on this system"
 msgstr "'Sys.info()' в �той �и�теме не разработан"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: --gui или -g без значени� пропущен"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неизве�тный gui '%s', и�пользую X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неизве�тный gui '%s', не и�пользую никакого\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "�оздать временный файл дл� '-e' не удало�ь"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: Только редактирование первого файла из �пи�ка"
 
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' должны быть �пи�ком"
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' должны быть �пи�ком"
-
 #~ msgid "binary operations require two arguments"
 #~ msgstr "бинарные операторы требуют два аргумента"
-
 #~ msgid "opened URL\n"
 #~ msgstr "открытие URL\n"
-
 #~ msgid "internet routines were already initialized"
 #~ msgstr "�ред�тва Интернет уже включены"
-
 #~ msgid "'msg1' must be a character string"
 #~ msgstr "'msg1' должен быть тек�товой �трокой"
-
 #~ msgid "'msg2' must be a character string"
 #~ msgstr "'msg2' должен быть тек�товой �трокой"
-
 #~ msgid "argument 'code' must be a character string"
 #~ msgstr "аргумент 'code' должен быть тек�товой �трокой"
-
 #~ msgid "argument 'type' must be a character string"
 #~ msgstr "аргумент 'type' должен быть тек�товой �трокой"
-
 #~ msgid "InternetOpenUrl timed out"
 #~ msgstr "тайм-аут 'InternetOpenUrl'"
-
 #~ msgid "Internet read timed out"
 #~ msgstr "тайм-аут чтени� из Internet"
-
 #~ msgid "unable to find a closure from within which 'match.call' was called"
 #~ msgstr "не могу найти вложение из которого вызвано 'match.call'"
-
 #~ msgid "vfont routines cannot be accessed in module"
 #~ msgstr "�ред�тва 'vfont' не до�тупны в модуле"
-
 #~ msgid "Hershey fonts cannot be loaded"
 #~ msgstr "шрифты 'Hershey' не могут быть загружены"
-
 #~ msgid "invalid generic function in 'usemethod'"
 #~ msgstr "неправильна� обща� функци� в 'usemethod'"
-
 #~ msgid "'UseMethod' called from outside a function"
 #~ msgstr "'UseMethod' вызван �наружи функции"
-
 #~ msgid "first argument must be a generic name"
 #~ msgstr "первый аргумент должен быть общим именем"
-
 #~ msgid ""
 #~ "explicit request not to duplicate arguments in call to '%s', but argument "
 #~ "%d is of the wrong type (%d != %d)"
 #~ msgstr ""
 #~ "�вный запро� не дублировать аргументы при вызове '%s', однако аргумент %d "
 #~ "неправильного типа (%d != %d)"
-
 #~ msgid "single values not returned if not duplicated"
 #~ msgstr "одиночные значени� не возвращают��, е�ли не дублированы"
-
 #~ msgid "character variables must be duplicated in .C/.Fortran"
 #~ msgstr "тек�товые переменные должны быть дублированы в  .C/.Fortran"
-
 #~ msgid "call name too long in '%s'"
 #~ msgstr "�лишком длинное им� вызова в '%s'"
-
 #~ msgid "generic name too long in '%s'"
 #~ msgstr "у %s �лишком длинное общее им�"
-
 #~ msgid "method name too long in '%s'"
 #~ msgstr "�лишком длинное им� метода в '%s'"
-
 #~ msgid "%d arguments passed to 'log' which requires 1 or 2"
 #~ msgstr "%d аргумента передано 'log', а требует�� 1 или 2"
-
 #~ msgid ""
 #~ "Warning in %s :\n"
 #~ "  %s\n"
 #~ msgstr ""
 #~ "Предупреждение в %s :\n"
 #~ "  %s\n"
-
 #~ msgid "input"
 #~ msgstr "ввод"
-
 #~ msgid "symbol"
 #~ msgstr "�имвол"
-
 #~ msgid "assignment"
 #~ msgstr "при�воение"
-
 #~ msgid ""
 #~ "bad target context--should NEVER happen;\n"
 #~ "please bug.report() [R_run_onexits]"
 #~ msgstr ""
 #~ "неправильный целевой контек�т -- �Е ДОЛЖ�О прои�ходить;\n"
 #~ "пожалуй�та, bug.report() [R_run_onexits]"
-
 #~ msgid "invalid assignment left-hand side"
 #~ msgstr "неправильна� лева� �торона при�воени�"
-
 #~ msgid "negative value in 'x'"
 #~ msgstr "отрицательное значение в 'x'"
-
 #~ msgid "'jobu' and 'jobv' must be character strings"
 #~ msgstr "'jobu' и 'jobv' должны быть тек�товыми �троками"
 
 #, fuzzy
 #~ msgid "\"%s\" is not an existing slot in an object of class \"%s\""
 #~ msgstr "нет �лота имени \"%s\" дл� �того объекта кла��а \"%s\""
-
 #~ msgid "R_CompiledFileName: buffer too small"
 #~ msgstr "R_CompiledFileName: буфер �лишком мал"
-
 #~ msgid ".C(..): Width cannot be zero"
 #~ msgstr ".C(..): ширина не может = 0"
-
 #~ msgid ".C(..): 'type' must be \"integer\" for  \"d\"-format"
 #~ msgstr ".C(..): дл�  \"d\"-формата 'тип' должно быть \"integer\" "
-
 #~ msgid ".C(..): 'type' must be \"real\" for this format"
 #~ msgstr ".C(..): дл� �того формата 'тип' должен быть \"real\""
-
 #~ msgid "'names' is not a character string"
 #~ msgstr "'names' не �вл�ет�� тек�товой �трокой"
-
 #~ msgid "bad hsv to rgb color conversion"
 #~ msgstr "неправильна� конвертаци� цвета из hsv в rgb"
-
 #~ msgid "unknown palette (need >= 2 colors)"
 #~ msgstr "неизве�тна� палитра (нужно >= 2 цветов)"
-
 #~ msgid "maximum number of colors exceeded"
 #~ msgstr "превышено мак�имальное количе�тво цветов"
-
 #~ msgid "invalid RGB specification"
 #~ msgstr "неправильное указание RGB "
-
 #~ msgid "invalid color name '%s'"
 #~ msgstr "неправильное им� цвета '%s'"
-
 #~ msgid "invalid color specification '%s'"
 #~ msgstr "неправильное указание цвета '%s'"
-
 #~ msgid "supplied color is not numeric nor character"
 #~ msgstr "предложенный цвет -- не цифра и не �имвол"
 
 #, fuzzy
 #~ msgid "invalid color specification"
 #~ msgstr "�еправильное определение цвета"
-
 #~ msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 #~ msgstr ""
 #~ "rcont2 [%d,%d]: при вычи�лении exp произошло и�чезновение пор�дка "
 #~ "(антипереполнение) в 0; ошибка алгоритма"
-
 #~ msgid "no R-to-C converter found corresponding to identifier"
 #~ msgstr "не найдено конвертера R-в-C, �оответ�твующего идентификатору"
-
 #~ msgid "invalid USE.NAMES value"
 #~ msgstr "неправльное значение USE.NAMES"
-
 #~ msgid "duplicated levels will not be allowed in factors anymore"
 #~ msgstr "повтор�ющией�� уровни в факторах больше не разрешены"
-
 #~ msgid "... used in an incorrect context"
 #~ msgstr "... и�пользовано в неправильном контек�те"
-
 #~ msgid "NAOK used more than once"
 #~ msgstr "NAOK и�пользован более одного раза"
-
 #~ msgid "PACKAGE used more than once"
 #~ msgstr "PACKAGE и�пользован более одного раза"
-
 #~ msgid "Invalid graphics state"
 #~ msgstr "�еправильное графиче�кое �о�то�ние"
-
 #~ msgid "invalid mode to pass to Fortran (arg %d)"
 #~ msgstr "неправильный режим дл� передачи в Fortran (аргумент %d)"
-
 #~ msgid "invalid function in call_R"
 #~ msgstr "неправильна� функци� в call_R"
-
 #~ msgid "invalid argument count in call_R"
 #~ msgstr "неправильный �чет аргументов в call_R"
-
 #~ msgid "invalid return value count in call_R"
 #~ msgstr "неправильный �чет возвращаемого значени� в call_R"
-
 #~ msgid "can't use R profiling while byte code profiling"
 #~ msgstr ""
 #~ "не могу и�пользовать R-профилирование до тех пор, пока не включено "
 #~ "побайтное профилирование"
-
 #~ msgid "bad character switch offsets"
 #~ msgstr "неверное �мещение �троковых переключателей"
-
 #~ msgid "bad switch names"
 #~ msgstr "неправильное им� переключател�"
-
 #~ msgid "bad numeric switch offsets"
 #~ msgstr "неверное �мещение чи�ловых переключателей"
-
 #~ msgid "constBuf must be a generic vector"
 #~ msgstr "constBuf должен быть общим вектором"
-
 #~ msgid "bad constCount value"
 #~ msgstr "неверное значение constCount"
-
 #~ msgid "lapack routines cannot be accessed in module"
 #~ msgstr "�ред�тва lapack не до�тупны из модул�"
-
 #~ msgid "lapack routines cannot be loaded"
 #~ msgstr "�ред�тва lapack не могут быть загружены"
-
 #~ msgid "'UseMethod' called from outside a closure"
 #~ msgstr "'UseMethod' вызван �наружи замыкани�"
-
 #~ msgid "invalid `which' in TeX"
 #~ msgstr "неправильное указание 'which' в TeX"
-
 #~ msgid "internal error in do_random1"
 #~ msgstr "внутренн�� ошибка в 'do_random1'"
-
 #~ msgid "internal error in do_random2"
 #~ msgstr "внутренн�� ошибка в 'do_random2'"
-
 #~ msgid "internal error in do_random3"
 #~ msgstr "внутренн�� ошибка в 'do_random3'"
-
 #~ msgid "%s%d:%d: %s"
 #~ msgstr "%s%d:%d: %s"
-
 #~ msgid ""
 #~ "%s%d:%d: %s\n"
 #~ "%d: %s\n"
@@ -7595,7 +8311,6 @@
 #~ "%s%d:%d: %s\n"
 #~ "%d: %s\n"
 #~ "%*s"
-
 #~ msgid ""
 #~ "%s%d:%d: %s\n"
 #~ "%d: %s\n"
@@ -7606,13 +8321,10 @@
 #~ "%d: %s\n"
 #~ "%d: %s\n"
 #~ "%*s"
-
 #~ msgid "%s"
 #~ msgstr "%s"
-
 #~ msgid "%s in \"%s\""
 #~ msgstr "%s в \"%s\""
-
 #~ msgid ""
 #~ "%s in:\n"
 #~ "\"%s\n"
@@ -7621,171 +8333,119 @@
 #~ "%s в:\n"
 #~ "\"%s\n"
 #~ "%s\""
-
 #~ msgid "cannot mkdir R_TempDir"
 #~ msgstr "не могу �оздать каталог 'R_TempDir'"
-
 #~ msgid "csduplicated not called on a STRSXP"
 #~ msgstr "'csduplicated' не вызван на 'STRSXP'"
-
 #~ msgid "color intensity %g, not in [0,1]"
 #~ msgstr "интен�ивно�ть цвета %g, не в [0,1]"
-
 #~ msgid "color intensity %d, not in 0:255"
 #~ msgstr "интен�ивно�ть цвета %d, не в 0:255"
-
 #~ msgid "alpha level %g, not in [0,1]"
 #~ msgstr "альфа-уровень %g, не в [0,1]"
-
 #~ msgid "alpha level %d, not in 0:255"
 #~ msgstr "альфа-уровень %d, не в 0:255"
-
 #~ msgid "invalid hsv color"
 #~ msgstr "неправильный hsv-цвет"
-
 #~ msgid "invalid hcl color"
 #~ msgstr "неправильный hcl-цвет"
-
 #~ msgid "invalid 'names' vector"
 #~ msgstr "неправильный вектор 'names'"
-
 #~ msgid "invalid gray level, must be in [0,1]."
 #~ msgstr "неправильный уровень �ерого, должен быть в [0,1]."
-
 #~ msgid "rgb is not a matrix (internally)"
 #~ msgstr "rgb не �вл�ет�� матрицей (внутренне)"
-
 #~ msgid "rgb must have 3 rows (internally)"
 #~ msgstr "rgb должен иметь 3 �троки (внутренне)"
-
 #~ msgid "invalid bind address specification"
 #~ msgstr "неправильна� �пецификаци� адре�а �в�зи"
-
 #~ msgid "'outFile' must be a single file"
 #~ msgstr "'outFile' должен быть одиночным файлом"
 
 #, fuzzy
 #~ msgid "'fmt' must be length 1"
 #~ msgstr "'fromLast' должен быть единичной длины"
-
 #~ msgid "unknown type"
 #~ msgstr "неизве�тный тип"
-
 #~ msgid "Menu functions can only be used in the GUI"
 #~ msgstr "Функции меню могут быть и�пользованы только в GUI"
-
 #~ msgid "unable to retrieve items for %s (%s)"
 #~ msgstr "не могу извлечь пункты дл� %s (%s)"
-
 #~ msgid "unable to add menu (%s)"
 #~ msgstr "не могу добавить меню (%s)"
-
 #~ msgid "unable to add menu item (%s)"
 #~ msgstr "не могу добавить пункт меню (%s)"
-
 #~ msgid "menu does not exist"
 #~ msgstr "меню не �уще�твует"
-
 #~ msgid "unable to delete menu item (%s)"
 #~ msgstr "не могу удалить пункт меню (%s)"
-
 #~ msgid "'savehistory' can only be used in Rgui and Rterm"
 #~ msgstr "'savehistory' можно и�пользовать только в Rgui и в Rterm"
-
 #~ msgid "'loadhistory' can only be used in Rgui and Rterm"
 #~ msgstr "'loadhistory' можно и�пользовать только в Rgui и в Rterm"
-
 #~ msgid "Select one or more"
 #~ msgstr "Выберите один или более "
-
 #~ msgid "Select one"
 #~ msgstr "Выберите один"
-
 #~ msgid "argument must be a character vector or a raw vector"
 #~ msgstr "аргумент должен быть тек�товым вектором или про�тым вектором"
-
 #~ msgid "'default' must be a character string"
 #~ msgstr "'default' должен быть тек�товой �трокой"
-
 #~ msgid "'default' is overlong"
 #~ msgstr "'default' �лишком длинный"
-
 #~ msgid "'caption' must be a character string"
 #~ msgstr "'caption' должен быть тек�товой �трокой"
-
 #~ msgid "'multi' must be a logical value"
 #~ msgstr "'multi' должен быть логиче�ким значением"
-
 #~ msgid "'filterindex' must be an integer value"
 #~ msgstr "'filterindex' должен быть целым чи�лом"
-
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title' должен быть тек�товой �трокой"
-
 #~ msgid "'text' must be a character string"
 #~ msgstr "'text' должен быть тек�товой �трокой"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s' должен быть единичной длины"
-
 #~ msgid "'%s' element %d is not a window handle"
 #~ msgstr "�лемент '%s' %d не �вл�ет�� правильным вызовом окна"
-
 #~ msgid "Registry key '%ls' not found"
 #~ msgstr "Ключ рее�тра '%ls' не найден"
-
 #~ msgid "string terminated by newline or EOF"
 #~ msgstr "�трока заканчивает�� �имволом новой �троки либо EOF"
-
 #~ msgid "the first argument must be of mode character"
 #~ msgstr "первый аргумент должен быть тек�тового типа"
-
 #~ msgid "Selection: "
 #~ msgstr "Выбор: "
-
 #~ msgid "cannot allocate buffer in 'readTableHead'"
 #~ msgstr "не могу выделить буфер в 'readTableHead'"
-
 #~ msgid "\\ followed by EOF"
 #~ msgstr "за \\ �ледует EOF"
-
 #~ msgid "incomplete final line found by readTableHeader on '%s'"
 #~ msgstr "'readTableHeader' нашел неполную концевую �троку в '%s'"
-
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' не �вл�ет�� �оединением"
-
 #~ msgid "'dec' must be a single character"
 #~ msgstr "'dec' должен быть одиночным �имволом"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr ""
 #~ "поврежденна� таблица данных -- длина колонки %d не �оответ�твует 'nrow'"
-
 #~ msgid "corrupt matrix -- dims not not match length"
 #~ msgstr "поврежденна� матрица -- размерно�ть не �оответ�твует длине"
-
 #~ msgid "NA's in .C(\"bincode\",... NAOK=FALSE)"
 #~ msgstr "NA в .C(\"bincode\",... NAOK=FALSE)"
-
 #~ msgid "NA's in .C(\"bincount\",... NAOK=FALSE)"
 #~ msgstr "NA в .C(\"bincount\",... NAOK=FALSE)"
-
 #~ msgid "non-numeric matrix in rowsum(): this cannot happen"
 #~ msgstr "нечи�лова� матрица в 'rowsum()': �то не должно прои�ходить"
-
 #~ msgid "'method' must be a character string"
 #~ msgstr "'method' должен быть тек�товой �трокой"
-
 #~ msgid "no dyn.load support in this R version"
 #~ msgstr "в �той вер�ии R нет поддержки dyn.load"
-
 #~ msgid "vector size cannot be negative"
 #~ msgstr "размер вектора не может быть отрицательным"
 
 #, fuzzy
 #~ msgid "long vectors are not supported for index.return"
 #~ msgstr "�имволиче�кие ��ылки на �той платформе не поддерживают��"
-
 #~ msgid "'R_get_primname' called on a non-primitive"
 #~ msgstr "'R_get_primname' вызван на непримитив"
+
diff -Nru r-base-3.2.3/src/library/base/po/R-zh_CN.po r-base-3.3.1/src/library/base/po/R-zh_CN.po
--- r-base-3.2.3/src/library/base/po/R-zh_CN.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/R-zh_CN.po	2016-04-27 22:15:37.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -224,6 +224,11 @@
 msgid "cannot coerce class \"%s\" to a data.frame"
 msgstr "�能把\"%s\"类别强迫��数�框"
 
+msgid ""
+"'row.names' is not a character vector of length %d -- omitting it. Will be "
+"an error!"
+msgstr ""
+
 msgid "options(\"stringsAsFactors\") not set to TRUE or FALSE"
 msgstr "options(\"stringsAsFactors\")�能�TRUE或FALSE值"
 
@@ -494,6 +499,15 @@
 "�对行的开头为：\n"
 "%s"
 
+msgid "failed to load the methods package for debugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for undebugging by signature"
+msgstr ""
+
+msgid "failed to load methods package for handling signature"
+msgstr ""
+
 msgid "'x' must be a square matrix"
 msgstr "'x'必需是正方形矩阵"
 
@@ -606,12 +620,14 @@
 msgid "invalid 'time' argument"
 msgstr "'time'�数�对"
 
-msgid "'vec' contains NAs"
-msgstr "'vec'内有NA值"
-
-msgid "'vec' must be sorted non-decreasingly"
+#, fuzzy
+msgid "'vec' must be sorted non-decreasingly and not contain NAs"
 msgstr "'vec'的顺�一定得从�到大"
 
+#, fuzzy
+msgid "'fun' is not a function"
+msgstr "處置程�必需是函数"
+
 msgid "using the first element of 'value' of type \"expression\""
 msgstr "用�类为\"expression\"的'value'的第一个元素"
 
@@ -638,15 +654,19 @@
 msgid "corrupt data frame: columns will be truncated or padded with NAs"
 msgstr "破�的数�框：縮短列的长度或用NA�填充空白"
 
-msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
-msgstr ""
-
 msgid "'zero.print' has length > 1"
 msgstr "'zero.print'的长度一定得大于一"
 
 msgid "'zero.print' must be character, logical or NULL"
 msgstr "'zero.print'�能�字符，逻辑或NULL值"
 
+msgid "'big.mark' and 'decimal.mark' are both '%s', which could be confusing"
+msgstr ""
+
+#, fuzzy
+msgid "'input.d.mark' has no characters"
+msgstr "'input'和'target'一定都得是字符串"
+
 msgid "'subset' must be logical"
 msgstr "'subset'必需是逻辑值"
 
@@ -727,13 +747,19 @@
 msgid "package %s has a license that you need to accept after viewing"
 msgstr "程辑包%s的使用许���求你在看完�接�它"
 
-msgid ""
-"package %s has a license that you need to accept:\n"
-"according to the DESCRIPTION file it is"
+#, fuzzy
+msgid "package %s has a license that you need to accept:"
+msgstr "程辑包%s的使用许���求你在看完�接�它"
+
+#, fuzzy
+msgid "according to the DESCRIPTION file it is"
 msgstr ""
 "程辑包%s的使用许���求你接�它:\n"
 "按照DESCRIPTION文件它是"
 
+msgid "%s"
+msgstr ""
+
 msgid "license for package %s not accepted"
 msgstr "程辑包%s的使用许��没有被接�"
 
@@ -905,6 +931,15 @@
 msgid "must specify names of formal arguments for 'vectorize'"
 msgstr "用'vectorize'时必需设定正��数"
 
+msgid "FUN"
+msgstr ""
+
+msgid "may not have argument(s) named"
+msgstr ""
+
+msgid ","
+msgstr "，"
+
 msgid "'arg' must be NULL or a character vector"
 msgstr "'arg'�么是NULL，�么是字符矢�。"
 
@@ -1082,15 +1117,20 @@
 msgid "found methods to import for function %s but not the generic itself"
 msgstr "%s函数有�进�的方法，但找�到它的�属方法"
 
+#, fuzzy
+msgid "replacing previous import %s by %s when loading %s"
+msgstr "输入%2$s将代替�次引进%1$s"
+
 msgid "No methods found in \"%s\" for requests: %s"
 msgstr "在\"%s\"找�到%s需�的索�"
 
 msgid "requested methods not found in environment/package %s: %s"
 msgstr "环境/程辑包%s里找�到所�求的方法：%s"
 
+#, fuzzy
 msgid ""
-"No generic function found corresponding to requested imported methods for "
-"\"%s\" from package \"%s\" (malformed exports?)"
+"No generic function %s found corresponding to requested imported methods "
+"from package %s when loading %s (malformed exports?)"
 msgstr ""
 "程�包\"%2$s\"里没有相应于为\"%1$s\"所�求的进�方法的泛型函数（是�是出�的"
 "格��对？）"
@@ -1250,6 +1290,10 @@
 msgid "too many arguments"
 msgstr "太多�数"
 
+#, fuzzy
+msgid "invalid 'compress' argument:"
+msgstr "'name'�数�对"
+
 msgid "'compress' is ignored unless 'file' is a file name"
 msgstr "除�'file'是文件�，'compress'将被略过�用"
 
@@ -1285,6 +1329,9 @@
 "Did you intend to set 'partial'?"
 msgstr "'decreasing'必需是长度为一的矢�，你是�是想设'partial'的值？"
 
+msgid "'partial' sorting not supported by radix method"
+msgstr ""
+
 msgid "'index.return' only for non-factors"
 msgstr "'index.return'�能适用于�因�"
 
@@ -1313,9 +1360,6 @@
 msgid "method = \"quick\" is only for numeric 'x'"
 msgstr "method=\"quick\"�适用于数值的'x'"
 
-msgid "method = \"radix\" is only for integer 'x'"
-msgstr "method=\"radix\"�适用于整数的'x'"
-
 msgid "'local' must be TRUE, FALSE or an environment"
 msgstr "'local'的值必需是'TRUE'，或是'FALSE'，或是环境"
 
@@ -1368,9 +1412,6 @@
 msgid "probably wrong encoding in names(.) of column"
 msgstr "列�称的编��能�对"
 
-msgid ","
-msgstr "，"
-
 msgid "STATS is longer than the extent of 'dim(x)[MARGIN]'"
 msgstr "STATS大于'dim(x)[MARGIN]'的范围"
 
@@ -1413,6 +1454,10 @@
 msgid "arguments must have same length"
 msgstr "�数的长度必需相�"
 
+#, fuzzy
+msgid "total number of levels >= 2^31"
+msgstr "层次数目��"
+
 msgid "handler must be a function"
 msgstr "處置程�必需是函数"
 
@@ -1658,10 +1703,6 @@
 msgid_plural "S3 methods %s were declared in NAMESPACE but not found"
 msgstr[0] "S3方法%s在NAMESPACE里有声明但�存在"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "�外�数%s忽略�用"
-
 msgid "%s is not TRUE"
 msgid_plural "%s are not all TRUE"
 msgstr[0] "�是所有的%s都是TRUE"
@@ -1671,13 +1712,28 @@
 msgstr[0] "警告信�：\n"
 
 #, fuzzy
-#~ msgid "cannot be unloaded."
-#~ msgstr "无法�下%s这个�字空间："
+msgid ""
+"In %s :\n"
+" extra argument %s will be disregarded"
+msgid_plural ""
+"In %s :\n"
+" extra arguments %s will be disregarded"
+msgstr[0] "�外�数%s忽略�用"
+
+#~ msgid "'vec' contains NAs"
+#~ msgstr "'vec'内有NA值"
+
+#~ msgid "method = \"radix\" is only for integer 'x'"
+#~ msgstr "method=\"radix\"�适用于整数的'x'"
 
 #, fuzzy
 #~ msgid "re-exports %s not exported by %s"
 #~ msgstr "'namespace:%2$s'没有出�%1$s这个对象"
 
+#, fuzzy
+#~ msgid "cannot be unloaded."
+#~ msgstr "无法�下%s这个�字空间："
+
 #~ msgid "package %s %s was found, but %s %s is required by %s"
 #~ msgstr "找到了程辑包%1$s %2$s，但%5$s需�%3$s %4$s"
 
diff -Nru r-base-3.2.3/src/library/base/po/tr.po r-base-3.3.1/src/library/base/po/tr.po
--- r-base-3.2.3/src/library/base/po/tr.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/tr.po	2016-04-27 22:15:37.000000000 +0000
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-04-02 18:24+0200\n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -129,174 +129,175 @@
 msgid "problem in displaying '%ls'"
 msgstr "'%ls' gösterilirken hata"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "hatalı '%s' argümanı"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "desteklenmeyen Windows sürümü"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "hatalı argüman"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "aptal olma!:bilgisayarının 4Gb adresleme sınırı var"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "bellek sınırı azaltılamadı: görmezden geliniyor"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' bir karakter vektörü olmalıdır"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "geçersiz aygıt"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "SDI modu gereklidir"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "geçersiz grafik aygıtı numarası"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "hatalı aygıt"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 #, fuzzy
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "Rmbstowcs'da geçersiz giriş"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "dosya seçimi iptal edildi"
 
@@ -338,192 +339,191 @@
 msgid "'names' is not a character vector"
 msgstr "'fmt' bir karakter vektörü değil"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "karakter dizesi ilk argüman olarak beklendi"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "karakter dizesi üçüncü argüman olarak beklendi"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "'%s' komutunu çalıştırırken %d durumu oluştu"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "kalan oturum zaman limitine eriÅŸildi"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "kalan zaman limitine eriÅŸildi"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "oturum iÅŸlemci zaman limitine eriÅŸildi"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "iÅŸlemci zaman limitine eriÅŸildi"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "Ölümcül hata: %s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "'%s' kodlaması tanınmadı"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<HATA: '%s' kodlamasını tekrar kodlamada hata>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "dosya '%s' açılamadı: %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): dosya '%s' mevcut deÄŸil\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, fuzzy, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "UYARI: '%s' değeri geçersiz: görmezden gelindi\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "UYARI: max-mem-size verilmemiÅŸ\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "UYARI: --max-mem-size değeri geçersiz: görmezden gelindi\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "UYARI: --max-mem-size=%lu%c: çok büyük, görmezden gelindi\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "UYARI: --max-mem-size=%4.1fM: çok küçük, görmezden gelindi\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "UYARI: --max-mem-size=%4.0fM: çok büyük, %uM olarak olarak alındı\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "binary işlemleri iki argüman gerektirir"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "binary işlemleri iki argüman gerektirir"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "UYARI: '-e %s' giriş çok uzun olduğu için ihmal edildi\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "UYARI: bilinmeyen seçecek '%s'\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "ARGÜMAN '%s' __yoksayıldı__\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "-e argümanı -f veye --file ile kullanılamaz"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr ""
 "geçicidosya oluşturulması sırasında hata -- TMPDIR uygun olarak belirlendi "
 "mi?"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "'--save', '--no-save' veya '--vanilla' seçmek zorundasınız"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr ""
 "'reader thread' oluşturmak imkansız; sistem kaynaklarından bir miktar "
 "boşaltmalısınız"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "altindis sınırlar dışında"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "'%s' tipi nesne alt küme yapılamaz"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 #, fuzzy
 msgid "WARNING: no value given for --encoding"
 msgstr "UYARI: verilen --encoding için değer verilmedi\n"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, fuzzy, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "UYARI: '%s' seçeğeni artık desteklenmiyor\n"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, fuzzy, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "UYARI: '%s' için değer girilmedi\n"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, fuzzy, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "UYARI: '%s' değeri geçersiz: görmezden gelindi\n"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, fuzzy, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "UYARI: %s: çok büyük, görmezden gelindi\n"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 #, fuzzy
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "UYARI: '--max-ppsize' için değer verilmedi\n"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "UYARI: '--max-ppsize' değeri negatif: görmezden gelindi\n"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "UYARI: '--max-ppsize' değeri çok küçük: görmezden gelindi\n"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 #, fuzzy
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "UYARI: '--max-ppsize' değeri çok büyük: görmezden gelindi\n"
@@ -631,7 +631,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "'name' için yer ayrılamadı"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "karakterli argüman bekleniyor"
 
@@ -686,7 +686,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "zaman dilimini ayarlarken bir sorun oluÅŸtu"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "'code' argümanı bir karakter dizesi olmalı"
@@ -717,9 +717,9 @@
 msgid "invalid multibyte format string"
 msgstr "geçersiz çokbaytlı biçim dizesi "
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr "'%s' argümanı boyutu > 1, sadece ilk öğe kullanılacak"
@@ -730,7 +730,7 @@
 msgstr "'title' bir karakter dizesi olmalıdır"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "düzenli ifade bu yerelde geçersiz"
 
@@ -741,8 +741,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "giriş dizesi %d bu yerelde geçersiz"
@@ -750,7 +750,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "argüman '%s' görmezden gelinecek"
@@ -765,7 +765,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "giriş dizesi %d bu yerelde geçersiz"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, fuzzy, c-format
 msgid "regcomp error: '%s'"
 msgstr "regcomp hatası: '%s'"
@@ -775,29 +775,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "FUN.VALUE bir vektör olmalıdır"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "geçersiz '%s' değeri"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "geçersiz uzunluk"
 
@@ -833,7 +833,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr ""
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "NaNs üretimi"
 
@@ -846,218 +846,218 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "modülde tam doğruluk kaybı muhtemel"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "Tamsayı taşmasından üretilen NAs"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "operatör bir veya iki argümana ihtiyaç duyar"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "ikili operatöre sayısal olmayan argüman"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "uygun olmayan diziler"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "uygun olmayan zaman-serileri"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr "uzun olan nesne uzunluğu kısa olan nesne uzunluğunun bir katı değil "
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "birli operatöre geçersiz argüman"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "geçersiz birli operatör"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "1 argümanın tanımlanmamış gerçek fonksiyonu"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "tanımlanmamış (uygulanamayan) kompleks fonksiyon"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "%d sayısal argümanın tanımlanmamış gerçek fonksiyonu"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d argüman aktarıldı ('%s' 1 veya 2 argüman gerektiriyor)"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "0 uzunluğunda geçersiz ikinci argüman"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "varsayılanı olmayan \"%s\" argümanı yok"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "0 birim uzunluğunda geçersiz argüman 'base'"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, fuzzy, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data' bir vektörü tipinde olmalıdır"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "sayısal olmayan matris boyutu"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "geçersiz 'nrow' değeri (çok büyük veya NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "geçersiz 'nrow' değeri (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "geçersiz 'ncol' değeri (çok büyük veya YOK)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "geçersiz 'ncol' değeri (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr "veri uzunluğu [%d] dize sayısının [%d] böleni veya tam böleni değil"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr "veri uzunluğu [%d] sütun sayılarının böleni veya tam böleni değil [%d]"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "veri uzunluğu matris boyutunu aşıyor"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "çok fazla eleman seçildi"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "negatif boyutlu matris"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: çok fazla eleman seçildi"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "negatif 3B dizi"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 #, fuzzy
 msgid "'alloc3Darray': too many elements specified"
 msgstr "alloc3Darray: çok fazla eleman seçildi"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 #, fuzzy
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "allocArray: 'dims' ile çok fazla eleman belirlenmiş"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x' bir karakter vektörü olmalı"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, fuzzy, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "'row/col'a bir matris benzeri nesne gereklidir"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "sayısal/karmaşık sayısal matris/vektör argümanları gerektirir"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "uygun olmayan argümanlar"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "argüman bir matris değil"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "geçersiz ilk argüman, bir dizi olmalı"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, fuzzy, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "yanlış uzunlukta 'perm'"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a' boyut ismi olarak isimlendirilemez"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, fuzzy, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "perm[%d] bir boyut ismiyle uyuÅŸmuyo"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "'perm' de değer sınırlar dışında"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'resize' DOĞRU yada YANLIŞ olmalı"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' sayısal olmalı"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "'object' çok kısa"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 #, fuzzy
 msgid "'dims' cannot be of length 0"
 msgstr "'hadj' bir birim uzunluğunda olmalıdır"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 #, fuzzy
 msgid "'x' must have positive length"
 msgstr "'value' pozitif bir değer olmalı"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1120,149 +1120,150 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "geçersiz 'class' niteliği belirleme denemesi"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr ""
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr ""
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr ""
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "uyumsuz 'names' argümanı"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "'names' niteliği belirlemek için geçersiz tip (%s)"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' dizi olmayana uygulandı"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' bir liste olmalıdır"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' bir liste olmalıdır"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "'dimnames' uzunluÄŸu [%d] bu 'dims' [%d] ile eÅŸleÅŸmelidir"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "'dimnames' için geçersiz tip (%s) (vektör olmalıdır)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "'dimnames' [%d] uzunluğu dizi uzattmasına eşit değil"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "geçersiz ilk argüman"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "geçeriz ikinci argüman"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "0-uzunluk boyut vektörü geçersiz"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "dimler eksik değerler içeriyor"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "dimler negatif değerler içeriyor"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 #, fuzzy
 msgid "dims do not match the length of object"
 msgstr "dims [product %d] [%d] nesnesinin uzunluÄŸuyla eÅŸleÅŸmiyor"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "dims [product %d] [%d] nesnesinin uzunluÄŸuyla eÅŸleÅŸmiyor"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "nitelikler bir liste veya NULL olmalıdır"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "nitelikler isimlendirilmelidir"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "bütün nitelikler isime sahip olmalıdır [%d değil]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "'which' mod karakterinin olmalıdır"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "tam olarak bir 'which' nitelik verilmelidir"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "'%s' den '%s' e kısmi eşleşme"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, fuzzy, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "slot ismi için geçersiz tip yada uzunluk"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name' boş olmayan bir karakter dizesi olmalıdır"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "slot ismi için geçersiz tip yada uzunluk"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "(\"%s\") slotu alınamıyor (\"%s\" tipinde nesneden)"
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "\"%s\" adında bir slot yok (\"%s\" sınıfında bir nesne için)"
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "NULL nesnede slot belirleme denemesi"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 #, fuzzy
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "biçimsel sınıfsal methods paketi olmadan kullanılamaz"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
@@ -1271,7 +1272,7 @@
 "slot \"%s\" alınmaya çalışılıyor (slotu olmayan bir temel sınıf -\"%s\"-'in "
 "bir nesnesinden)"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
@@ -1280,46 +1281,46 @@
 "slot \"%s\" alınmaya çalışılıyor (\"%s\" sınıfından S4 nesnesi olmayan bir "
 "nesneden)"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr ""
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "tip '%s' '%s' de tanımlanmamış"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "tekrarlanan biçimsel argüman 'recursive'"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "tekrarlanmış biçimsel argüman 'use.names'"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "argüman bir liste değil"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "sınıf ismi '%s' de çok uzun"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "bu tiplerden bir matris oluşturulamadı"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "matrislerin dize sayıları eşleşmelidir (bknz arg %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "matrislerin sütun sayıları eşleşmelidir (bknz arg %d)"
@@ -1328,229 +1329,247 @@
 msgid "vector size cannot be NA"
 msgstr "vektör boyutu NA olamaz"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "vektör boyutu NA/NaN olamaz"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "vektör boyutu sonsuz olamaz"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "seçilen vektör boyutu çok büyük"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "NULL ortamı kullanımı artık geçersiz"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "argğman bir fonksiyon olmalı"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "deÄŸiÅŸtirme nesnesi bir ortam deÄŸil"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' bir ortam olmalı"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "argüman bir ortam değil"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "boş ortamın üst öğesi yok"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "boş ortamın üst öğesi ayarlanamadı"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "boş ortamın üst öğesi ayarlanamadı"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "boş ortamın üst öğesi ayarlanamadı"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' bir ortam deÄŸil"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "bu bağlantıya yazılamıyor"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "geçersiz '%s' tanımlaması"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "pozitif olmayan 'fill' argümanı göz ardı edilecek"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "%d argümanı ('%s' tipi) 'cat' tarafından kullanılamıyor"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "vektör: mod '%s' in vektörü oluşturulamadı"
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "vektör olmayanın uzunluğu ayarlanamadı"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "geçersiz argüman"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "geçersiz değer"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' yanlış içerikte kullanıldı"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr ""
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "'EXPR' eksik"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR 1 uzunluğunda bir vektör olmalıdır"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+msgid "'switch' with no alternatives"
+msgstr ""
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "1 veya 2 argüman gerektiren 'log'a %d argüman verildi"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s' bir karakter vektörü gerektirir"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "geçersiz çokbaytlı dize  %d"
 
-#: src/main/character.c:203
+#: src/main/character.c:159
 #, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr ""
 
-#: src/main/character.c:232
+#: src/main/character.c:188
 #, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr ""
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "karakter olmayan bir nesneden altdizeler açılıyor"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 #, fuzzy
 msgid "invalid substring arguments"
 msgstr "geçersiz altmetin argümanı/argümanları"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "karakter olmayan isimler"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "bir karakter olmayan nesnenin içindeki altmetinler değiştiriliyor"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "ilk argüman karakter vektörü olmalıdır"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "ASCII olmayan karakterlerde kısaltma kullanıldı"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "karakter olmayan isimler"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "geçersiz çokbaytlı dize  %d"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "karakter olmayan argüman"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "azalan aralık özelliği ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "azalan aralık özelliği ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "geçersiz UTF-8 dizesi 'old'"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "geçersiz çokbaytlı dize 'old'"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "geçersiz UTF-8 dizesi 'new'"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "geçersiz çokbaytlı dize 'new' "
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old' 'new' den daha uzun"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "çokbaytlı dize geçersiz girişi %d"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim() bir karakter verktörü gerektirir"
 
@@ -1562,7 +1581,7 @@
 msgid "applies only to lists and vectors"
 msgstr "sadece listelere ve vektörlere uygulanır"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "Zorlamadan dolayı ortaya çıkan NAs"
 
@@ -1571,7 +1590,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "Zorlamadan dolayı ortaya çıkan NAs"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "zorlamadaki hayali kısımlar çıkarıldı"
 
@@ -1579,119 +1598,115 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "ham veriye zorlamada sınırlar dışındaki değerler 0 kabul edildi"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "'%s' modunun geçersiz verisi (çok kısa)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "'parlist' nesnesi '%s' tipine zorlanamıyor"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "(list) nesne '%s' tipine zorlanamaz"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(symbol) nesne '%s' tipine zorlanamaz"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "bu S4 sınıfını bir vektöre zorlamak için yöntem yok"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "ortamlar baÅŸka tiplere zorlanamaz"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "faktör olmayanı zorlama deneniyor"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "argüman listesi beklendi"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "geçersiz ortam"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "argüman en az 1 uzunluğunda olmalıdır"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "fonksiyon için geçersiz gövde"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "geçersiz 0 uzunluktaki argüman"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "geçersiz argüman listesi"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "\"single\" tipi R'de tanımlanmamış"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "tanımlanmamış karşılaştırma"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() (liste veya vektör) olmayan '%s' tipinin"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, fuzzy, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "tanımlanmamış tip '%s', '%s' içinde\n"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "'name' eksik"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "ilk argüman karakter dizesi olmalıdır"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what' bir karakter dizesi veya bir fonksiyon olmalıdır"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'text' bir karakter dizesi olmalıdır"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "'args' bir liste olmalıdır"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' bir liste olmalıdır"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' bir ortam olmalıdır"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "geçersiz ortam seçildi"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "class(x) NULL'e ayarlanıyor;   sonuç artık bir S4 nesnesi olmayacak"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
@@ -1700,7 +1715,7 @@
 "Çoklu dizeler (\"%s\", \"%s\", ...)'e class(x) ayarlanıyor; sonuç artık bir "
 "S4 nesnesi olmayacak"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
@@ -1709,11 +1724,11 @@
 "class(x)'i \"%s\"e ayarlamak özelliği NULL'e ayarlar; sonuç arık bir S4 "
 "nesnesi olmayacak"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "sınıf dizesi olması için geçersiz yerine koyma işlemi"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
@@ -1721,7 +1736,7 @@
 "\"%s\" nesne bu tipe sahipse sadece sınıf olarak ayarlanabilir, \"%s\" "
 "bulundu"
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
@@ -1730,37 +1745,37 @@
 "boyut özelliği 2 uzunluğunda olmadığı sürece (%d idi) matrise sınıf "
 "ayarlanamaz"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr ""
 "boyut özelliği 0'dan büyük uzunluk almadıkça \"array\"'a sınıf ayarlanamaz"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value' boş olmayan bir karakter dizesi olmalıdır"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "bir faktörün depolama modunu değiştirmek için geçersiz"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "geçersiz karmaşık tekli operatör"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "tanımlanmamış karmaşık sayı işlemi"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "fonksiyona sayısal olmayan argüman"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "geçersiz çok terimli (polinomial) katsayı"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "kök bulan kod başarısız"
 
@@ -1772,7 +1787,7 @@
 msgid "connection not found"
 msgstr "bağlantı bulunamadı"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "geçersiz bağlantı"
 
@@ -1781,9 +1796,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "kullanılmayan bağlantı kapatılıyor %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "'%s' den '%s' e desteklenmeyen dönüşüm"
@@ -1865,8 +1880,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "çok geniş bir alan seçildi"
 
@@ -1896,8 +1911,8 @@
 msgstr "fifo bağlantısı yer ayırması başarısız"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "'description' argümanın sadece ilk öğesi kullanıldı"
 
@@ -1908,14 +1923,14 @@
 "fifo(\"\") sadece open = \"w+\" ve open = \"w+b\" destekler:ilki kullanılıyor"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "bağlantı açılamadı"
@@ -1983,7 +1998,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "bzfile bağlanıtısı yer ayırması başarısız"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "lzma çözücüsü başlatılamadı, hata %d"
@@ -2003,12 +2018,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr "bu bir R'nin bu derlemesinin desteklemediği %s-sıkıştırılmış dosya"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "panoyu kopyalama için bellek yer ayırması başarısız"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "pano açılamıyor veya metin içermiyor"
 
@@ -2114,267 +2129,267 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' bir çıktı textConnection'ı değil"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "soketler bu sistemde mevcut deÄŸil"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' bir bağlantı değil"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "standart bağlantılar açılamıyor"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "bağlantı zaten açık"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "bilinmeyen 'rw' deÄŸeri"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "standart bağlantılar kapatılamıyor"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 #, fuzzy
 msgid "cannot close 'output' sink connection"
 msgstr "sink çıktı bağlantısı kapatılamaz"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 #, fuzzy
 msgid "cannot close 'message' sink connection"
 msgstr "sink bağlantısı mesajları kapatılamaz"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "bağlantı açık değil"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 #, fuzzy
 msgid "line longer than buffer size"
 msgstr "Dize önbellek boyutundan uzun"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "bu bağlantıdan okunamıyor"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "readLines içinde önbellek ayrılamıyor"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "tamamlanmamış son dize bulundu: '%s'"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "readLines'da çok az dize"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "dosya sonundaki eksik dize görmezden gelindi"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr "null sonlandırıcısı bulunamadı: 10000 baytta dize sonlandırılıyor"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "sadece ikili bir bağlantıdan okunabilir"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "karmaşık vektörler için boyut değiştirme desteklenmiyor"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "%d boyutu bu makinede desteklenmiyor"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "ham hep 1 uzunluğundadır"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr ""
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x' bir atomik vektör tipi değil"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "sadece ikili bir bağlantıya yazabilir"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "bir ham vektöre sadece only 2^31-1 bayt yazılabilir"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 #, fuzzy
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "tek bir readBin() çağrısına sadece 2^31-1 bayt yazılabilir"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "bağlantıya yazılırken hata"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "ham vektörler için boyut değişikliği desteklenmiyor"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "readChar()'da geçersiz UTF-8 girişi"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "sadece UTF-8 MBCS yerelinde olmayanlardan bayt okuyabilir"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "'object' çok kısa"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: dizede bulunandan daha fazla bayt talep edildi - sıfır eklenecek"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr ""
 "writeChar: dizede bulunandan daha fazla karakter talep edildi - sıfır "
 "eklenecek"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 #, fuzzy
 msgid "maximum number of pushback lines exceeded"
 msgstr "maksimum renk sayısı aşıldı"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 #, fuzzy
 msgid "could not allocate space for pushback"
 msgstr "pushBack için yer ayrılamadı"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "sadece açık okunabilir bağlantılara geri zorlanabilir"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "sadece metin-modu bağlantılara geri zorlanabilir"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "sink yığını tamamen dolu"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "çıktı stdin'e değiştirilemez"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "kaldırılcak sink yok"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 #, fuzzy
 msgid "there is no connection NA"
 msgstr "bağlantı yok %d"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "bağlantı yok %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "nsl() bu platformda desteklenmiyor"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr ""
 "file(\"\") sadece open = \"w+\" ve open = \"w+b\" destekler: ilki "
 "kullanılıyor"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "bu derlemede ICU desteklenmiyor"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "dosya akışı gzip magic numarasına sahip değil"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "dosya akışı geçerli gzip başlığı içermiyor"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "'gzcon' bağlantısını temizlerken yazma hatası"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "crc hatası %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "'gzcon' bağlantısında yazma hatası"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' 0 ... 9'dan biri olmalı"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression' TRUE veya FALSE olmalı"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x' TRUE veya FALSE olmalı"
+
+#: src/main/connections.c:5502
 #, fuzzy
 msgid "this is already a 'gzcon' connection"
 msgstr "bir zaten bir gzcon bağlantısı"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "ikili bağlantılarda sadece read- veya write- işlemi yapılabilir"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr "bir metin modu 'file' bağlantısı düzgün olarak çalışmayabilir"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 #, fuzzy
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
@@ -2383,76 +2398,72 @@
 "yazılabilir textConnection'dan bir gzcon bağlantısı oluşturulamaz; "
 "rawConnection deneyin"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "'gzcon' bağlantısı ayırması başarısız"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "bir soket listesi deÄŸil"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "hatalı yazma göstericileri"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "bir soket bağlantısı değil"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "bilinmeyen sıkıştırma, sıkıştırma olmadığı varsayılıyor"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, fuzzy, c-format
 msgid "allocation of %s connection failed"
 msgstr "ham bağlantı yer ayırması başarısız"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 #, fuzzy
 msgid "no loop for break/next, jumping to top level"
 msgstr "sonlandırma noktası olan döngü yok, üst seviyeye atlanıyor"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "geri dönülecek fonksiyon yok, en üst seviyeye atlanıyor"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "hedef içerik yığında değil"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "yığında o kadar çok çerçeve yok"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "'n'in sadece pozitif deÄŸerlerine izin veriliyor"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "yeniden başlatılacak fonksiyon yok"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "içerik numaraları pozitif olmalı"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "sorgulanacak tarayıcı içeriği yok"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "tarayıcıya yapılan çok fazla çağrı yok"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "çağrı yığınında o kadar çok fonksiyon yok"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "'do_sys'de iç hata"
 
@@ -2461,40 +2472,40 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "'cumsum'da tamsayı taşması; 'cumsum(as.numeric(.))' kullanın"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 #, fuzzy
 msgid "'cummax' not defined for complex numbers"
 msgstr "min/maks karmaşık sayılar için tanımlanmamış"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 #, fuzzy
 msgid "'cummin' not defined for complex numbers"
 msgstr "min/maks karmaşık sayılar için tanımlanmamış"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "bilinmeyen cumxxx fonksiyonu"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "zaman dilimini ayarlarken bir sorun oluÅŸtu"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "bu sistem zaman dilimleri ayarlanamıyor"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "saat dilimini kaldırırken sorun"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 #, fuzzy
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "boş olmayan POSIXIt yapısında sıfır uzunluğunda bileşen"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "'read.dcf' için bellek ayrılamıyor"
 
@@ -2508,11 +2519,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "'%s ...' ile baÅŸlayan dize kusurlu!"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "argüman bir kapama olmalı"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "argüman bir fonksiyon olmalı"
 
@@ -2521,7 +2528,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x' TRUE veya FALSE olmalı"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "argğman bir fonksiyon olmalı"
 
@@ -2539,61 +2546,61 @@
 msgstr ""
 "'tracemem' zayıf referanslar veya dış işaretçi nesneleri için uygun değil"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R bellek profilleme özelliğiyle derlenmedi"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "çok az argüman"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 #, fuzzy
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "deparse için geçersiz 'cutoff', varsayılan kullanılıyor"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "bir S4 nesnesinin deparse edilmesi source() yapılamaz olacak"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "deparse eksik olabilir"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "deparse R'nin 2.7.0 sürümünden önce source() yapılamayabilir"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "'what' bir karakter dizesi veya bir fonksiyon olmalıdır"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "çok az karakter yazıldı"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "karakter argümanı beklendi"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 #, fuzzy
 msgid "zero-length argument"
 msgstr "sıfır uzunlukta argüman"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts' negatif olmayan bir tamsayı olmalı"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "'%s' nesnesi bulunamadı"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "hatalı biçimde fonksiyon ifadesi"
 
@@ -2606,15 +2613,15 @@
 msgid "no active or default device"
 msgstr "aktif ya da varsayılan aygıt yok"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "çok fazla açık aygıt"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "aygıtı yerleştirmek için yeterli bellek yok (GEcreateDevDes içinde)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "Sonraki çizimi görmek için <Enter>'a basın: "
 
@@ -2702,7 +2709,7 @@
 msgid "too many arguments, sorry"
 msgstr "çok fazla argüman, üzgünüm"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "geçersiz grafik durumu"
 
@@ -2859,7 +2866,7 @@
 msgid "invalid argument to edit()"
 msgstr "edit()'e geçersiz argüman"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "dosya açılamadı"
 
@@ -2923,12 +2930,12 @@
 msgstr "kaydı kaldırılacak grafik sistemi bulunmuyor"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "geçersiz dize sonu "
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "geçersiz dize girişi"
 
@@ -2961,84 +2968,98 @@
 msgid "raster capture is not available for this device"
 msgstr "%s bu aygıt için mevcut değil"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "%d yazıtipi yüzü, '%s' yazıtipi ailesi için desteklenmiyor"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "aktif grafik aygıtı yok"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "pch değeri '%d' bu yerelde geçersiz"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "tanımlanmamış pch değeri '%d'"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "geçersiz eksen uzatımı [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "sonsuz eksen uzatımı [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo = %g < %g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up = %g > %g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 #, fuzzy
 msgid "display list redraw incomplete"
 msgstr "Görünüm listesi yeniden çizimi eksik"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "geçersiz argüman listesi"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "'expr' argümanı bir ifade olmalı"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "'list' argümanı bir liste olmalı"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "'env' argümanı bir ortam olmalı"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "pch=\"c\"'de geçersiz çokbaytlı karakter"
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "'color' veya 'lty' içinde geçersiz hex rakamı"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "geçersiz çizgi tipi: 2, 4, 6, veya 8 uzunluğunda olmalıdır"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "geçersiz çizgi tipi: sıfırlara izin verilmiyor "
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "geçersiz çizgi tipi"
 
@@ -3047,7 +3068,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "kilitlenmiş bağlayıcı '%s' in değeri değiştirilemez"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "kilitlenmiş bir ortama bağlayıcı eklenemez"
 
@@ -3063,434 +3084,430 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "temel ortamda ayırma tanımlanmadı"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "kilitlenmiş bir ortamdan bağlayıcılar kaldırılamaz"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "'%s' e verilen argüman bir ortam değil"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, fuzzy, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "... listesi %d eleman içermiyor"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d hatalı bir içerikte kullanıldı,  bakılcak ... yok"
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "\"%s\" fonksiyonu bulunamadı"
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "boÅŸ bir ortamda deÄŸer atanamaz"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "bu veritabanına değişken atanamaz"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "'%s' in bağlayıcısı temel ortama eklenemez"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "sadece ilk öğe değişken ismi olarak kullanıldı"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "ilk argüman isimlendirilmiş bir liste olmalıdır"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 #, fuzzy
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "'hostname' 1 birim uzunlukta bir karakter vektörü olmalı"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 #, fuzzy
 msgid "'envir' argument must be an environment"
 msgstr "'env' argümanı bir ortam olmalı"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "temel isimlendirmeden deÄŸiÅŸken silinemez"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "temel ortamdan deÄŸiÅŸken silinemez"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "boÅŸ ortamdan deÄŸiÅŸken silinemez"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "bu veritabanından değişken silinemez"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "'%s' nesnesi ('%s' modunun) bulunamadı"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "konum %d de geçersiz isim"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "ikinci argüman bir ortam olmalıdır"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "'%s' argümanı için yanlış uzunluk"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "'missing'in geçersiz kullanımı"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' sadece argümanlar için kullanılabilir"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos' bir tamsayı olmalıdır"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "bir listenin bütün elemanları isimlendirilmiş olmalıdır"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach' sadece listeler, veri çerçeveleri ve ortamlar için çalışır"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "\"package:base\" i çıkarmaya izin yok"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "argüman bir ortam olmalıdır"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "argüman sembolik olmalıdır"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "kapsayıcı bir ortam yok"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "arama listesinde \"%s\" adında öğe yok"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "'as.environment(NULL)' kullanımı artık geçersiz"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "S4 nesnesi \"environment\" sınıfını genişletmiyor"
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "'as.environment' için geçersiz nesne"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "bir ortam deÄŸil"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "bir sembol deÄŸil"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "\"%s\" için bağlayıcı yok"
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "bir fonksiyon deÄŸil"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "sembol halihazırda düzgün bağlayıcıya sahip"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "bağlayıcı kilitli ise aktif bağlayıcı değiştirilemez"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "bilinmeyen op"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "kilitlenmiş bağlayıcı ayrılamaz"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "aktif bir bağlayıcı ayrılamaz"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 #, fuzzy
 msgid "bad namespace name"
 msgstr "hatalı "
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 #, fuzzy
 msgid "namespace already registered"
 msgstr "isim alanı halihazırda kayıtlı"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 #, fuzzy
 msgid "namespace not registered"
 msgstr "isim alanı kayıtlı değil"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "hatalı içe aktarma ortam argümanı"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "hatalı dışa aktarma argümanı"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "içe ve dışa aktarma isimleri uzunlukları eşit olmalıdır"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "'%s' dışa aktarılmış sembolünün değeri yok"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "bilinmeyen kodlama: %d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "'%s' dizesi gömülü nul"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "kesmeler durduruldu; sinyal görmezden gelindi"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "geçersiz seçenek \"warning.expression\""
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "%s (uyarıdan çevirildi)"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "Uyarı: %s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "%s'de uyarı: %s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "Kayıp uyarı mesajları\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "Uyarı mesajları:\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "%d hata oluştu (görmek için warnings() kullanın)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr ""
 "50 yada daha fazla uyarı oluştu (ilk 50'sini görmek için warnings() "
 "kullanın)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "wrapup sırasında hata: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "Hata oluÅŸtu: "
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "Hata oluÅŸtu: "
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "Hata: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "Ek olarak: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "geçersiz seçenecek \"error\"\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "Çalıştırma durduruldu\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep' bir karakter dizesi olmalı"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [stop(.)'da geçersiz dize]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [warning(.)'de geçersiz dize]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "\"%s\" e hatalı sayıda argüman"
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "%s de tanımlanmamış özellik"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "geçersiz sayıda argüman"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "geçersiz argüman tipi"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "zaman-serisi/vektör uzunluğu uyuşmazlığı"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "uyumsuz argümanlar"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "bilinmeyen hata (rapor gönderin!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "zorlamadaki hatalı tamsayı çevrimi"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "bilinmeyen uyarı (rapor edin!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "Geri dönülecek fonksiyon yok, en üst seviyeye atlanıyor"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "üst seviye tutarsızlık?"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "hatalı "
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "hata mesajı bir dize değil"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr ""
 "önceki yeniden başlatmada yönetici yada yeniden başlatma yığını uyuşmazlığı"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "yanlış hata mesajı"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "yanlış yeniden başlatma"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "restart yığında değil"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "bir deneme içereiğinde değil"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "hata mesajı bir karakter dizesi olmalıdır"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: profil dosyası '%s' açılamadı"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "R profilleme bu sistemde mevcut deÄŸil"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
@@ -3498,259 +3515,267 @@
 "promise zaten hesaplama altında: tekrarlamalı varsayılan argüman referansı "
 "veya "
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "yeniden başlatma promise hesaplamasını durdurdu"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr "hesaplama çok dallanmış: sonsuz döngü / options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "varsayılanı olmayan argüman eksik"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "fonksiyon olmayana uygulama denemesi"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s (%s#%d'de): "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "argüman %d boş"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "genel fonksiyonun ortamında \"%s\" sembolü bulunamadı"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "sembol \"%s\" yöntemin ortamında değil"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "koşul >1 uzunluğa sahip ve sadece ilk öğe kullanılacak"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "TRUE/FALSE gereken yerde eksik deÄŸer"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "argüman mantıksal olarak yorumlanabilir değil"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "sıfır uzunluğunda argüman"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "sembol olmayan döngü değişkeni"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "geçersiz for() döngüsü dizilişi"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "çoklu argüman geri dönüşlerine izin verilmiyor"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "atamada geçersiz (NULL) sol taraf"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "atama hedefi dil olmayan nesneye yayılıyor"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "'%s' de uzun isim"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "temel isim alanında karmaşık atamalar yapılamaz"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "temel çevrebirimde karmaşık atamalar yapılamaz"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "karışık atamada geçersiz fonksiyon"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "atamaya geçersiz (do_set) sol taraf"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "'%s' eksik"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "\"function\" için geçersiz biçimsel argüman"
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, fuzzy, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "hatalı '%s' argümanı"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "sayısal 'envir' argümanı bir uzunluğunda değil"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "'eval' de yeniden baÅŸlatma desteklenmiyor"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' bir kapanmadan sonra çağırıldı"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "'...' içindeki değer bir promise değil"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "Uyumsuz metodlar (\"%s\", \"%s\") -> \"%s\" için"
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "grup dağıtımında dağıtım hatası"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, fuzzy, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "'fn' bir fonksiyon deÄŸil"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "ağ yığın taşması"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "tamsayı yığın taşması"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 #, fuzzy
 msgid "bad opcode"
 msgstr "Yanlış işlemci kodu"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, fuzzy, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "geçersiz 'x' tipi ('x %s y' içinde)"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "baytkodu sürüm uyuşmazlığı; eval kullanılıyor"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "baytkodu sürümü çok eski"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "baytkodu sürümü çok yeni"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr ""
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "döngü için geçersiz sıralama argümanı"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, fuzzy, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "iç fonksiyonlarda \"%s\" yok"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "hatalı fonksiyon"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "bir BUILTIN fonksiyon deÄŸil"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+msgid "bad numeric 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr ""
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+msgid "bad character 'switch' offsets"
+msgstr ""
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "iş parçası kod adresi için indeks bulunamadı"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 #, fuzzy
 msgid "invalid body"
 msgstr "geçersiz sembol"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "geçersiz sembol"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "argüman bir bayt kodu nesnesi değil"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "hatalı dosya ismi"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "dosya açılamadı"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'dosya' boş olmayan bir dize olmalı"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' mantıksal olmalı"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 #, fuzzy
 msgid "constant buffer must be a generic vector"
 msgstr "kod genel bir vektör olmalıdır"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr ""
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "profil zamanlayıcı kullanımda"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "bayt kod profillemesi zaten açık"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "profil zamanlayıcıyı ayarlama başarısız"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr ""
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "bu derlemede ICU desteklenmiyor"
@@ -3768,16 +3793,16 @@
 msgid "this graphics device does not support event handling"
 msgstr "grafik aygıtı olay yönetimini desteklemiyor"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "geçersiz ileti"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 #, fuzzy
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "getGraphicsEvent 'in yinelemeli kullanımı desteklenmiyor"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "grafik olay yöneticisi seti yok"
 
@@ -3968,7 +3993,7 @@
 msgstr "geçersiz düzenli ifade: '%s'"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "giriş dizesi %d bir geçersiz UTF-8"
@@ -4061,26 +4086,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "internet rutinlerine bu modülden erişilemez"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "internet rutinleri yüklenemez"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "hatalı değer"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "soket rutinleri yüklenemez"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "geçersiz 'comment' niteliği belirleme denemesi"
+
 #: src/main/lapack.c:39
 #, fuzzy
 msgid "LAPACK routines cannot be accessed in module"
@@ -4091,39 +4115,39 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "soket rutinleri yüklenemez"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr ""
 "işlemler sadece sayısal, mantıksal veya karmaşık sayı tiplerinde mümkündür"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "uygun olmayan dizilerde ikili iÅŸlem"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "uygun olmayan zaman serileri"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "'%s' operatörü 2 argüman gerektirir"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "geçersiz 'x' tipi ('x %s y' içinde)"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "geçersiz 'y' tipi ('x %s y' içinde)"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "Birli operatör '!' iki argümanla çağırıldı"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "'%s' tipinin argümanı mantıksala zorlanıyor"
@@ -4132,64 +4156,78 @@
 msgid "dummy - do not translate"
 msgstr ""
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "wrapup sırasında hata: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "Çalıştırma durduruldu\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "Hata: C stack taşmasından segfault\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "base paketi açılamadı\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, fuzzy, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr ".RData'da kayıtlı veri geri alınamadı\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "Başlangıç sırasında - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "okumak için dosya açılamadı"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "tarayıcıdan çıkılamıyor"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr ""
 "\"yes\", \"no\", \"ask\", veya \"default\" seçeneklerinden biri beklendi."
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr ""
 "etkileşimli olmayan kullanımda save=\"ask\" kullanımı: komut dizesi "
 "varsayılanı kullanılacak"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "'save' in tanınmayan değeri"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "geçersiz 'status', 0 varsayıldı"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "geçersiz 'runLast', YANLIŞ varsayıldı"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr "üst seviye geri çağrı öğesi için yer ayrılamıyor"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "R_removeTaskCallbackByIndex'e negatif indis verildi"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "üst seviye görev geri çağrılarından uyarı mesajları '%s'\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "üst seviye görev geri çağrısı mantıksal bir değer döndürmedi"
 
@@ -4231,163 +4269,168 @@
 msgid_plural "unused arguments %s"
 msgstr[0] "kullanılmayan argüman(lar) %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "referans nesneler sadece zayıf referanslık/sonlandırma olabilir"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "sonuçlandırıcı bir fonksiyon yada NULL olmalı"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "bir zayıf referans değil"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "ilk argüman bir ortam veya dış gösterici olmalıdır"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "ikinci argüman bir fonksiyon olmalıdır"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "üçüncü argüman 'TRUE' yada 'FALSE' olmalı"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "vektör belleği bitti (limite erişildi?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "cons belleği tükendi (limite erişildi?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "bellek tükendi (limite erişildi?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "%0.1f Gb boyutunda bellek bölgesi oluşturulamadı"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "%0.1f Gb boyutunda bellek bölgesi oluşturulamadı"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 #, fuzzy
 msgid "vector is too large"
 msgstr "seçilen vektör boyutu çok büyük"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "negatif uzunlukta vektörlere izin verilmiyor"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "%d uzunluğunda vektör oluşturulamadı"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "vektör ayırmasında geçersiz tip/uzunluk (%s/%d)"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "%0.1f Gb boyutunda vektör ayrılamıyor"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "%0.1f Mb boyutunda vektör ayrılamıyor"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "%0.f Kb boyutunda vektör ayrılamıyor"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect(): yığın taşması koruması"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect(): sadece %d korunmuş öğe var"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "uprotect_prt: işaretçi bulunamadı"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] "unprotect(): sadece %d korunmuş öğe var"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, fuzzy, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "Calloc bellekte (%d / %d)  yer ayıramıyor"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, fuzzy, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "Realloc bellekte (%d boyutunda) yeniden yer ayırm yapamadı"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "vektör işaretçisine geri döndürme güvenli değil"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "hatalı değer"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "bellek profilleme bu sistemde mevcut deÄŸil"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: çıktı dosyası '%s' açılamadı"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "dize argümanı gerekli"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "böyle bir basit fonksiyon yok"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "sıfır uzunlukta değişken ismi kullanımı denemesi"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "değişken isimleri %d karakterle sınırlıdır"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr "geçersiz .Internal() argüman"
 
@@ -4431,92 +4474,92 @@
 "'%s' için uygulanabilir bir metod yok (\"%s\" sınıfının bir nesnesine "
 "uygulanan)"
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod' bir fonksiyon dışından çağırıldı"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod' isimsiz bir fonksiyondan çağırıldı"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "çağırılan genel bulunamadı: bir metod direk olarak mı çağırıldı?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' bir fonksiyon deÄŸil, ancak %d tipinde"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "yanlış argüman ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "nesne belirtilmedi"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "genel fonksiyon belirtilmedi"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 #, fuzzy
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "NextMethod a geçersiz genel argüman"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 #, fuzzy
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "NextMethod da geçersiz 'group' argümanı bulundu"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ".Method için yanlış değer"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "Uyumsuz metodlar görmezden gelindi"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "baÅŸvuralacak metod yok"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "bir ortam sınıfsızlandırılamaz"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "dış işaretci sınıfsızlandırılamaz"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' bir karakter vektörü olmalı"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which' 1 uzunluğunda mantıksal bir vektör olmalı"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "S4 nesnelerinde 'inherits()' yerine 'is()' kullanın"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 #, fuzzy
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'all.x' TRUE veya FALSE olmalı"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "\"%s\" fonksiyonunun genel olmayan sürümü bulunamadı"
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 #, fuzzy
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
@@ -4524,12 +4567,12 @@
 "standardGeneric metod dağıtımı etkin olmadığı durumda çağırıldı (görmezden "
 "gelinecek)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 #, fuzzy
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr "standardGeneric argümanı bir boş olmayan karakter dizesi olmalı"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
@@ -4538,7 +4581,7 @@
 "standardGeneric(\"%s\")'e çağrı görünürde genel fonksiyonun gövdesinden "
 "deÄŸil "
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4547,11 +4590,11 @@
 "geçersiz basit metod kodu (\"%s\"): \"clear\", \"reset\", \"set\", veya "
 "\"suppress\" olabilir"
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "geçersiz nesne: bir basit fonksiyon olmalı"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
@@ -4560,20 +4603,20 @@
 "bir basit genelin biçimsel tanımı bir fonksiyon nesnesi olmalı ('%s' tipi "
 "var)"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, fuzzy, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "genel fonksiyon \"%s\" olarak dönen nesne doğru gözükmüyor"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "dağıtım için verilen basit operasyon geçersiz"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "dağıtım hatası"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
@@ -4582,86 +4625,91 @@
 "basit fonksiyon \"%s\" yöntemler için belirlendi ancak genel fonksiyon "
 "verilmedi"
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "C seviye MAKE_CLASS makro NULL dize işaretçisiyle çağırıldı"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "Hershey yazıtipleri yüklenemedi"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "R_getClassDef(.) bir NULL dize işaretçisiyle çağırıldı"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "C seviye NEW makro null sınıf tanım işaretçisiyle çağırıldı"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "bir sanal sınıf olan (\"%s\")'den bir nesne oluşturulmaya çalışılıyor"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, fuzzy, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "\"%s\" sınıfının nesnesi geçerli bir S3 nesnesiyle uyuşmuyor"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "seçenekler listesi bozuk"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "geçersiz yazdırma genişliği, 80 kullanıldı"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "geçersiz yazdırma hanesi, 7 kullanıldı"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "\"device.ask.default\" için geçersiz değer, FALSE kullanılıyor"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "liste argümanı uygun isimlere sahip değil"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "geçersiz 'width' parametresi, izin verilen %d...%d"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "geçersiz 'digits' parametresi, izin verilen %d...%d"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "'expressions' parametresi geçersiz, izin verilen %d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "'%s' için geçersiz değer"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec' tek bir karakter olmalıdır"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" \"device.ask.default\" ile deÄŸiÅŸtirildi"
 
@@ -4686,11 +4734,16 @@
 msgid "first argument must be atomic"
 msgstr "ilk argüman atomik olmalı"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec' tek bir karakter olmalıdır"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "İmkansız mod ( x )"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "sadece atomik vektör argümanları"
 
@@ -4698,217 +4751,199 @@
 msgid "invalid filename specification"
 msgstr "geçersiz dosyaadı değeri"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "dosyaya eklenirken yazma hatası"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "eklenecek bir ÅŸey yok"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "geçersiz dosya adı argümanı"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "dosya '%s' oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "geçersiz ilk dosya adı"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "dosya '%s' silinemiyor, sebep: '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "geçersiz ikinci dosya adı"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "baÄŸlanacak birÅŸey yok"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 #, fuzzy
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "sembolik bağlantılar bu sistemde desteklenmiyor"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, fuzzy, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "'%s'den '%s'e sembolik bağlantı oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "'%s'den '%s'e sembolik bağlantı oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 #, fuzzy
 msgid "symbolic links are not supported on this platform"
 msgstr "sembolik bağlantılar bu sistemde desteklenmiyor"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, fuzzy, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "'%s'den '%s'e sembolik bağlantı oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, fuzzy, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "'%s'den '%s'e sembolik bağlantı oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 #, fuzzy
 msgid "(hard) links are not supported on this platform"
 msgstr "sembolik bağlantılar bu sistemde desteklenmiyor"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr ""
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "genişletilen 'from' ismi çok uzun"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "genişletilen 'to'  ismi çok uzun"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "'%s' dosyası '%s' olarak yeniden adlandırılamıyor, sebep: '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "geçersiz 'pattern' düzenli ifadesi"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "R ev dizini belirlenemedi"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "dosya ismi çok uzun"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "iç yetersiz-bellek durumu"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "'%s' de okuma hatası"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "'LC_NUMERIC' belirlemek R'nin tuhaf çalışmasına sebep olabilir"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr ""
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr ""
 "İşletim Sistemi yereli \"%s\" e ayarlama isteğinin gerçekleştirelemeyeceğini "
 "raporladı"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' 1 birim uzunlukta bir karakter vektörü olmalı"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "nsl() '%s' sunucusunu çözümleyemedi"
-
-#: src/main/platform.c:2161
-#, fuzzy
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "gethostbyname'den döndürülen bilinmeyen biçim"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "nsl() bu platformda desteklenmiyor"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' zaten mevcut"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "'%s' dizini oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls' zaten var"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, fuzzy, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "'%s' dizini oluşturulamıyor, sebep: '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "sıfır uzunlukta model"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, fuzzy, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "düzenleyici %s çalıştırırken sorun oluştu"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, fuzzy, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "düzenleyici %s çalıştırırken sorun oluştu"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 #, fuzzy
 msgid "over-long path length"
 msgstr "sıfır uzunlukta model"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr ""
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, fuzzy, c-format
 msgid "problem creating directory %s: %s"
 msgstr "düzenleyici %s çalıştırırken sorun oluştu"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, fuzzy, c-format
 msgid "problem reading directory %s: %s"
 msgstr "düzenleyici %s çalıştırırken sorun oluştu"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr ""
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode' uzunluğu en az bir olmalıdır"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "bu platform için yetersiz işletim sistemi desteği"
 
@@ -4953,70 +4988,75 @@
 msgid "Metric information not available for this family/device"
 msgstr "Bu aile/aygıt için metrik bilgisi bulunmuyor"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "geçersiz 'na.print' özelliği"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "geçersiz dize etiketleri"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "geçersiz sütun etiketleri"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ".Internal(print.function(.))'a fonksiyon olmayan argüman"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' negatif olmayan bir tamsayı olmalıdır"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "geçersiz 'tryS4' iç argümanı"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "%d. satırda girdi önbellek taşması"
+
+#: src/main/print.c:1043
 #, fuzzy
 msgid "invalid character length in 'dblepr'"
 msgstr "dblepr de geçersiz karakter uzunluğu"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 #, fuzzy
 msgid "invalid character length in 'intpr'"
 msgstr "intpr de geçersiz karakter uzunluğu"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 #, fuzzy
 msgid "invalid character length in 'realpr'"
 msgstr "realpr de geçersiz karakter uzunluğu"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 #, fuzzy
 msgid "memory allocation error in 'realpr'"
 msgstr "realpr de bellek ayırma hatası"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "BLAS/LAPACK fonksiyonu '%6s' hata kodu %d verdi"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "çok az dize etiketi"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "çok az sütun etiketi"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] ""
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 #, fuzzy
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "nsl() bu platformda desteklenmiyor"
@@ -5025,355 +5065,355 @@
 msgid "argument is not a numeric vector"
 msgstr "argüman bir sayısal vektörü değil"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "geçersiz argümanlar"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "NAs oluÅŸtu"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "olasılık vektöründe NA"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "pozitif olmayan olasılık"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "çok az pozitif olasılık"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr "'replace = FALSE' iken ana kütleden büyük bir örneklem alınamaz"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "hatalı olasılık sayısı"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 #, fuzzy
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "'dirmark = TRUE' bu platformda desteklenmiyor"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 #, fuzzy
 msgid "argument must be a character vector of length 1"
 msgstr "'hostname' 1 birim uzunlukta bir karakter vektörü olmalı"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 #, fuzzy
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr "'%s' argümanı boyutu > 1, sadece ilk öğe kullanılacak"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 #, fuzzy
 msgid "argument 'x' must be a raw vector"
 msgstr "ilk karakter bir vektör olmalı"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 #, fuzzy
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "'resize' DOĞRU yada YANLIŞ olmalı"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 #, fuzzy
 msgid "argument 'shift' must be a small integer"
 msgstr "'size' argümanı bir pozitif tam sayı olmalı"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 #, fuzzy
 msgid "argument 'x' must be an integer vector"
 msgstr "ilk argüman bir karakter vektörü olmalıdır"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 #, fuzzy
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "'logarithm' argümanı mantıksal olmalı"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, fuzzy, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "argüman bir fonksiyon olmalı"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 #, fuzzy
 msgid "argument 'x' must not contain NAs"
 msgstr "argğman bir fonksiyon olmalı"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 #, fuzzy
 msgid "invalid UTF-8 string"
 msgstr "geçersiz UTF-8 dizesi 'old'"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "karşılaştırma (%d) sadece atomik ve liste tiplerinde mümkün"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "ifadeleri karşılaştırmaya izin verilmiyor"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "bu tipler için karşılaştırma tanımlanmadı"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "karışık değerlerle geçersiz karşılaştırma "
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 #, fuzzy
 msgid "'a' and 'b' must have the same type"
 msgstr "'data' bir vektörü tipinde olmalıdır"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "okuma hatası"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "bir I okuma hatası oluştu"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "bir R okuma hatası oluştu"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "bir C okuma hatası oluştu"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "bir S okuma hatası oluştu"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "bir okuma hatası oluştu"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "geri yükleme sırasında çözümlenemeyen ağ"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "geri yükleme uyumluluk hatası - %d sürümü uyumluluğu yok"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "veri dosyasında yanlış SEXP tipi"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "eÅŸleÅŸmeyen tipler"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "\"%s\" fonksiyonu bulunamadı"
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "veri geri yüklerken dosya konumu kaydedilemedi"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr "veri geri yüklerken dosya konumu geri yüklenemedi"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr "sürüm 1 çalışma alanlarında temel isimlendirme ayırt edilmedi"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "sürüm 1 çalışma alanlarında temel isimlendirme kaydedilemedi"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 #, fuzzy
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr "ortam sürüm 1 çalışma alanlarında kilitli/aktif bağlar kaydedilemez"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "sürüm 1 çalışma alanlarında zayıf referanslar kaydedilemez"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "vektör olmayan tiple NewWriteVec çağırıldı"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr "sürüm 1 çalışma alanlarında bayt kodu nesneleri kaydedilemez"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: bilinmeyen tip %i"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec vektör olmayan bir tiple çağırıldı"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr "sürüm 1 çalışmaalanlarında bayt kodu nesneleri okunamaz"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: bilinmeyen tip %i"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "ascii dizesi okunurken yetersiz bellek"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "bir ikili okuma hatası oluştu"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "ikili dize okunurken yetersiz bellek"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "ikili dize okuma hatası oluştu"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "bir xdr tamsayı verisi yazma hatası oluştu"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "bir xdr tamsayı verisi okuma hatası oluştu"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "bir xdr dize verisi yazma hatası oluştu"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "bir xdr gerçek sayı verisi yazma hatası oluştu"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "bir xdr gerçek sayı verisi okuma hatası oluştu"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "bir karmaşık sayı verisi yazma hatası oluştu"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "bir xdr karışık sayı verisi okuma hatası oluştu"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "yazma başarısız"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "geri yükleme dosyası boş olabilir -- veri yüklenmedi"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr ""
 "geri yükleme dosyası R'nin yeni bir sürümünden olabilir -- veri yüklenmedi"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr ""
 "hatalı geri yükleme dosyası magic numarası (dosya bozuk olabilir) -- veri "
 "yüklenmedi"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "ilk argüman bir karakter vektörü olmalıdır"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "uygun bir isimlendirilmiÅŸ liste deÄŸil"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr "'%s' bir 2.4.0 öncesi nesneye benziyor: lütfen yeniden oluşturun"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "yüklenen veri liste biçimiyle eş değil"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "ilk argüman bir dosya ismi olmalıdır"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "XDR yazma başarısız"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "XDR okuma başarısız"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "veri kaydedilemedi -- '%s': %s açılamadı"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "sürüm %d biçiminde  bağlantılara kaydedilemez"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "bağlantı yazma için açık değil"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "XDR biçimi bir metin modlu bağlantıya kaydedilemiyor"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "bağlantıya yazılırken hata"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "bağlantı okumak için açık değil"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 #, fuzzy
 msgid "can only load() from a binary connection"
 msgstr "sadece ikili bir bağlantıdan okunabilir"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "giriÅŸ mevcut deÄŸil"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5388,7 +5428,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "'%s' scan() beklendi , %s alındı"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 #, fuzzy
 msgid "too many items"
 msgstr "çok fazla argüman"
@@ -5397,7 +5437,7 @@
 msgid "empty 'what' specified"
 msgstr "boÅŸ 'what' belirlendi"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "%d . dize %d öğeye sahip değil"
@@ -5431,33 +5471,33 @@
 msgid "embedded nul(s) found in input"
 msgstr "'%s' dizesi gömülü nul"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "eşit olmayan faktör uzunlukları"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "sonuç çok uzun bir vektör olacak"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "0 uzunluğunda argüman"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "sayısal gösterim %d öğeye sahip: sadece ilki kullanıldı"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "NA/NaN argüman"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "ikinci argüman için yanlış tip"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, fuzzy, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "vektör olmayanı kopyalama denemesi"
@@ -5695,53 +5735,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "sadece atomik vektörler sıralanmak için sınanabilir"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'decreasing' TRUE ya da FALSE olmalı"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "sadece atomik vektörler sıralanabilir"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "ham vektörler sıralanamaz"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, fuzzy, c-format
 msgid "index %ld outside bounds"
 msgstr "indis %d sınırlar dışında"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "NA indis"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "indis %d sınırlar dışında"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "%d argümanı bir vektör değil"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "argüman uzunlukları farklı"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "rank() için geçersiz ties.method [gerçekleşmemesi gerekirdi]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "'x'de çok geniş değer aralığı"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "karakterden 'text'e zorlama başarılı olmadı"
@@ -5751,24 +5787,24 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "argüman '%s = \"%s\"' görmezden gelinecek"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "ilk karakter bir vektör olmalı"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "ikinci argüman bir faktör olmalı"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 #, fuzzy
 msgid "group length is 0 but data length > 0"
 msgstr "Grup uzunluÄŸu 0 ancak veri uzunluÄŸu > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "veri uzunluğu bölünmüş değişkenin bir katı değil"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "faktör hatalı seviyeye sahip"
 
@@ -5823,38 +5859,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "zorlama vektör uzunluğunu 0 yaptı"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "geçersiz biçim '%s'; %s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "mantıksal nesneler için %d veya %i biçimini kullanın"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "tamsayı nesneler için %d, %i, %o, %x veya %X  biçimini kullanın"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "sayısal nesneler için %f, %e, %g veya %a biçimini kullanın"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "karakter nesneleri için %s biçimini kullanın"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "karakter dizesinin %d karaktere kırpılmış hali olası"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "desteklenmeyen tip"
 
@@ -5862,252 +5898,248 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: önbellek çok küçük"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "vektör olmayanı genişletme denemesi"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "vektör/liste sınırları dışına atama (%d'den %d'e uzatılıyor)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "altatama düzeltmesinde uyumsuz tipler (%s'den %s'e)"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "altindislenmiÅŸ atamalarda NA'lara izin verilmiyor"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "değiştirme sıfır uzunluğunda"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr "değiştirilecek öğelerin sayısı değiştirme uzunluğunun bir katı değil"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "matriste hatalı sayıda altindis"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr "matris altküme atamasında uyumsuz tipler (%s'den %s'e)"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "geçersiz sayıda altbetik"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr "dizi altküme atamasında uyumsuz tipler (%s'den %s'e)"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "liste atamasında geçersiz altindis"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "liste ataması için geçersiz sayıda altindis"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: geçersiz sayıda argüman"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr "sonuç sıfır uzunluğunda ve bir dil nesnesi olamaz"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr ""
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "çevrebirim altataması için hatalı argümanlar"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "değiştirileceklerden fazla öğe verildi"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "eksik altindisli [[ ]]"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] altindis sınırlar dışında"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] uygun olmayan sayıda altindis"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "[[ atamasında uyumsuz tipler (%s'den %s'e)"
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] altindis (%d) sınırlar dışında"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "geçersiz altindis tipi '%s'"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "bu S4 sınıfının alt küme ataması için yöntem yok"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "LHS bir listeye zorlanıyor"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "birden az öğe seçme denemesi"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "birden fazla öğe seçme denemesi"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "yinelemeli indisleme kullanımında iç hata"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "'%s'den '%s'e daha fazla kısmi uyuşma"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "yinelemeli indisleme seyive %d'da başarısız oldu\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "seviye %d'de böyle bir indis yok\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "matris altindisinde hatalı sayıda sütun"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "bir matris altindisinde negatif deÄŸerlere izin verilmiyor"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(altindis) mantıksal altindiz çok uzun"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "negatif altindislerle sadece 0'lar karıştırılabilir"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "dizi için 'dimnames' özelliği yok"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "vektör olmayan altindisleniyor"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "matris altindisleri bu tip için yöneltilmiyor"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "dize altindisleri bu tip için yöneltilmiyor"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "yanlış sayıda boyut"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "indis belirlenmedi"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "bu S4 sınıfı alt küme yapılamaz"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "bir çevrebirimi altkümelemek için yanlış argüman"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "argümanın geçersiz 'type' (%s)"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 #, fuzzy
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "Tamsayı taşması - sum(as.numeric(.)) kullanın"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "iç hata (do_summary içinde 'op = %d') \t Bir uzman çağırın"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "Tamsayı taşması - sum(as.numeric(.)) kullanın"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "eksik olmayan argüman yok, NA döndürülüyor"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "min için eksik olmayan argüman yok; Inf döndürülüyor"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "max için eksik olmayan argüman yok; -Inf döndürülüyor"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "sayısal olmayan argüman"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "'which' verilan argüman mantıksal değil"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "argüman yok"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "geçersiz giriş biçimi"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 #, fuzzy
 msgid "an argument will be fractionally recycled"
 msgstr "argüman '%s' görmezden gelinecek"
@@ -6121,8 +6153,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr ""
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "'%s' den '%s' e desteklenmeyen dönüşüm"
@@ -6156,100 +6188,100 @@
 msgid "no 'fileext'"
 msgstr ""
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "%s'de tarama hatası"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "argüman için yanlış tip"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "argüman için yanlış uzunluk"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "'Sys.setenv' bu sistemde mevcut deÄŸil"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr "bu sistem çevrebirim değişkenlerini kaldıramaz, şuna ayarlanıyor: \"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "'Sys.unsetenv' bu sistemde mevcut deÄŸil"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, fuzzy, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "'%s' den '%s' e desteklenmeyen dönüşüm"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' bir karakter vektörü olmalı"
 
-#: src/main/sysutils.c:652
+#: src/main/sysutils.c:658
 #, fuzzy
-msgid "'x' must be a list of NULL or raw vectors"
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x' bir karakter vektörü olmalı"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' bir CHARSXP den çağırılmalı"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr ""
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "unz kodunda iç hata"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, fuzzy, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "'%s' den '%s' e desteklenmeyen dönüşüm"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "geçersiz dize girişi"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 #, fuzzy
 msgid "cannot create 'R_TempDir'"
 msgstr "R_TempDir bellek yeri ayrılamıyor"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "R_SESSION_TMPDIR belirlenemiyor"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 #, fuzzy
 msgid "cannot allocate 'R_TempDir'"
 msgstr "R_TempDir bellek yeri ayrılamıyor"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 #, fuzzy
 msgid "temporary name too long"
 msgstr "dosya ismi çok uzun"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "kullanılmayan geçiçi dosya ismi bulunamıyor"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 #, fuzzy
 msgid "allocation failed in R_tmpnam2"
 msgstr "R_tmpnam için bellek ayırma hatası"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "'dirmark = TRUE' bu platformda desteklenmiyor"
 
@@ -6287,34 +6319,34 @@
 msgid "'nmax' must be positive"
 msgstr "'value' pozitif bir değer olmalı"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' vektör argüman gerektirir"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 #, fuzzy
 msgid "argument is not of mode character"
 msgstr "argüman mod karakterinin değil "
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 #, fuzzy
 msgid "... used in a situation where it does not exist"
 msgstr "... var olmayan bir durumda kullanıldı"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "'...' içindeki değer bir promise değil"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "rowsum içinde sayısal olmayan veri çerçevesi"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "gerçekleştirilemez"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' bir karakter vektörü olmalı"
 
@@ -6322,142 +6354,142 @@
 msgid "object is not a matrix"
 msgstr "nesne bir matris deÄŸil"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "%d tipi '%s' içinde tanımlanmış değil"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "tanımlanmamış tip '%s', '%s' içinde\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "tanımlanmamış tip (%d), '%s' içinde\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "isim açılışında geçersiz etiket"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ""
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] ""
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "verilen argüman ismi '%s' '%s' ile eşleşmiyor"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "'nthcdr' listesi %d'den kısa"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'ntchdr' CDR down işlemi için bir listeye ihtiyaç duyar"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' TRUE veya FALSE olmalı"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' TRUE veya FALSE olmalı"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "eksik değer geçersiz"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "çalışma dizini değiştirilemiyor"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "bir karakter vektörü argümanı beklendi"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "dosya yolu çok uzun"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "'quote' un sadece ilk karakteri kullanılacak"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "bir karakter"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "'value' pozitif bir değer olmalı"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "'%s' girişi geçersiz ('utf8towscs' içinde)"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "'%s' içinde geçersiz çokbaytlı dize"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "hata mesajı 255 karaktere indirildi"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "uyarı mesajı 255 karaktere indirgendi"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 #, fuzzy
 msgid "all arguments must be named"
 msgstr "nitelikler isimlendirilmelidir"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "bu derlemede ICU desteklenmiyor"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 #, fuzzy
 msgid "'breaks' is not sorted"
 msgstr "tip '%s' desteklenmiyor"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, fuzzy, c-format
 msgid "long vector '%s' is not supported"
 msgstr "tip '%s' desteklenmiyor"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 #, fuzzy
 msgid "'x' must be a vector"
 msgstr "'x' bir karakter vektörü olmalı"
@@ -6521,7 +6553,7 @@
 msgid "There must be at least three control points"
 msgstr "En az üç kontrol noktası olmaldırı"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "X11 protokol hatası: %s"
@@ -6546,7 +6578,7 @@
 "Hata: X11 ek grafik renklerini yerleÅŸtiremiyor.\n"
 "X11'i colortype=\"pseudo.cube\" veya \"gray\" ile kullanmayı deneyin."
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6554,17 +6586,17 @@
 "herhangi bir X11 yazıtipi bulunamadı\n"
 "Yazıtipi Dizininin doğru olduğunu kontrol edin."
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 yazıtipi boyutunu %d olarak kullandı (%d istenmişti)"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "X11 yazıtipi %s, yüz %d (boyut %d) yüklenemedi"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -6572,191 +6604,197 @@
 "yarı-şeffaflık bu aygıtta desteklenmiyor: sayfa başına yalnızca bir kez "
 "rapor edidi"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "'%s' e X11 bağlantısı açılırken Girdi/Çıktı hatası oluştu"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "X11 GÇ hatası: lütfen çalışmanızı kaydedip R'yi kapatın"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr ""
 "yerel Xlib tarafından desteklenmiyor: bazı X işlemleri C yerelinde çalışacak"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X yerelleştirme düzelticilerini belirleyemez"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "R'nin bu sürümünde png desteği yok"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "png() çağrısında dosya ismi çok uzun"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "PNG dosyası '%s' açılamadı"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "R'nin bu sürümünde jpeg desteği yok"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "jpeg() çağrısında dosya ismi çok uzun"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "JPEG dosyası '%s' açılamadı"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "R'nin bu sürümünde tiff desteği yok"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "tiff() çağrısında dosya ismi çok uzun"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "bmp() çağrısında dosya ismi çok uzun"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "BMP dosyası '%s' açılamadı"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "X11 ekranı '%s'e bağlantı açılamadı"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr ""
 "Halihazırda bir X11 aygıtı açık olduğu için 'display' argümanı görmezden "
 "geliniyor"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr ""
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg() şeffalığı desteklemiyor: beyaz arkaplan kullanılıyor"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "'%s' ekranından bilgi alınamadı"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "X11 penceresi oluşturulamadı"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "'width=%d, height=%d' piksel cinsine benzemiyor"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "pixmap oluşturulamadı"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "geçersiz yazıtipi özelliği"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "X11 yazıtipi veritabanında yazıtipi ailesi bulunamadı"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "%d < 0'in geçersiz kullanımı, ('%s' içinde)"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "dosya '%s' açılamadı"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "%s bu aygıt için mevcut değil"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "XImage oluşturulamadı"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr ""
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "%s aygıtı başlatılamadı"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "geçersiz 'width' veya 'height'"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "X11 sürücüsüne geçersiz renk biçimi iletildi"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "bilinmeyen X11 renk modeli -- siyah-beyaz kullanılıyor"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "kaydedilecek çizim aygıtı yok"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "bir açık X11cairo aygıtı değil"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "'%s' dosyası açılamıyor"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "savePlot() bu derlemede desteklenmiyor"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "X11 ekranıyla iletişim kurulamadı"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "pano okunamadı (hata kodu %d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "X11Routines yapısı için bellek ayrılamadı"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "'eval' de yeniden baÅŸlatma desteklenmiyor"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "url bağlantısı yerleştirmesinde hata"
 
@@ -6768,29 +6806,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "'destfile' argümanının sadece ilk öğesi kullanıldı"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "Ä°ndirme durumu"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "'%s' adresi açılamıyor, sebep:'%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "hedefdosya '%s' açılamıyor, sebep: '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "URL '%s' deneniyor\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "indirme uzunluÄŸu %d belirtilen uzunluk %d'e eÅŸit deÄŸil"
@@ -6800,140 +6838,166 @@
 msgid "cannot open URL '%s'"
 msgstr "URL '%s' açılamıyor"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "desteklenmeyen URL şeması"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "açılamadı: HTTP durumu '%d %s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "InternetOpenUrl başarısız: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "açılamadı: HTTP durumu '%d %s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "nsl() bu platformda desteklenmiyor"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "hatalı '%s' argümanı"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() bu platformda desteklenmiyor"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "içe ve dışa aktarma isimleri uzunlukları eşit olmalıdır"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "hedefdosya '%s' açılamıyor, sebep: '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "'%s' dosyası açılamıyor"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "bu bağlantıdan okunamıyor"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "bağlantı açılamadı"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "nsl() bu platformda desteklenmiyor"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: çok uzun (geçersiz?) URL"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "FTP vekil sunucu bilgisi kaldırılıyor"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "FTP vekil sunucusu kullanılıyor '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: çok uzun (geçersiz?) URL"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "sunucu ismi çözümlenemedi"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "sunucuya bağlanma başarısız"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "sunucundan cevap alma başarısız"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: soket oluşturma başarısız"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "veri bağlantısı oluşturma başarısız"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "port'a bağlanma başarısız"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "%d .porttan dinleme yapılamıyor"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: çok uzun (geçersiz?) URL"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "HTTP vekil sunucu bilgisi kaldırılıyor"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "HTTP vekil sunucu kullanılıyor '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: çok uzun (geçersiz?) URL"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "'%s' çözümlenemedi"
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "'%s' adresine %d numaralı porttan bağlanıldı"
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "'%s' adresine %d numaralı porttan bağlanılamadı"
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "yönlendiriliyor: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "çok fazla yönlendirme, iptal ediliyor ..."
 
@@ -7167,8 +7231,8 @@
 msgstr "bessel_i bellek ayırma hatası"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g Argüman sınırlar dışında "
 "mı?\n"
@@ -7178,18 +7242,23 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): sonuçta hassasiyet kayboldu\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "bessel_j bellek ayırma hatası"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g.Argüman sınırlar dışında "
 "mı?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): sonuçta hassasiyet kayboldu\n"
@@ -7199,8 +7268,8 @@
 msgstr "bessel_k bellek ayırma hatası"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argüman sınırlar dışında "
 "mı?\n"
@@ -7210,18 +7279,23 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): sonuçta hassasiyet kayboldu\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "bessel_y bellek ayırma hatası"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr ""
 "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Argüman sınırlar dışında "
 "mı?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): sonuçta hassasiyet kayboldu\n"
@@ -7231,42 +7305,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "'%s' içinde argüman bölge dışında\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "'%s' içinde değer sınırlar dışında\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "'%s' içinde yakınsama başarısız\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "'%s' içinde tam hassasiyet başarılamamış olabilir\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "'%s' aşağı taşma oluştu\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): %d iterasyon içinde  yakınsamadı"
@@ -7342,7 +7416,7 @@
 "Açık ağır dinamik yükleme bu platformda desteklenmiyor. Varsayılan "
 "kullanılacak"
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "çalışma dizini alınamıyor!"
 
@@ -7358,12 +7432,12 @@
 "Okunan giriş yerleştirilirken olağandışı bir durum ortaya çıktı. Lütfen buf."
 "report() kullanarak rapor gönderin."
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "geçmiş dosyası '%s'i kaydederken hata"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7372,87 +7446,124 @@
 "Dosya açılamıyor '%s': %s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "'file' argüman çok uzun"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "geçmiş mekanizma bulunmuyor"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "geçmiş dosyası kırpılerken bir sorun oluştu"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "kaydedilecek geçmiş yok"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "geçersiz zaman aralığı"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "boş olmayan karakter argümanı beklendi"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' NA olmamalı ve mantıksal olmalıdır"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "'%s' popen yapılamadı, muhtemel sebep: '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr "sisteme çağrıda dize %d kırpılabilir (, intern = TRUE)"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "komutu çalıştırırken hata: '%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "komutu çalıştırırken hata"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr ""
 "'%s' komutunu çalıştırırken %d durumuna geldi ve '%s' hata mesajı oluştu"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "Sys.info() bu sistemde tanımlanmamış"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "UYARI: değersiz --gui veya -g  görmezden gelindi"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "UYARI: bilinmeyen grafiksel arabirim '%s', X11 kullanılıyor\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr ""
 "UYARI: bilinmeyen grafiksel arabirim '%s', grafiksel arabirim kullanılmıyor\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "'-e' için geçici dosya oluşturması başarısız"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "UYARI: Dosya listesinde sadece ilk öğe düzenleniyor"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "'what' bir karakter dizesi veya bir fonksiyon olmalıdır"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "soketler bu sistemde mevcut deÄŸil"
+
+#~ msgid "no function to restart"
+#~ msgstr "yeniden başlatılacak fonksiyon yok"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "argüman bir kapama olmalı"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname' 1 birim uzunlukta bir karakter vektörü olmalı"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "nsl() '%s' sunucusunu çözümleyemedi"
+
+#, fuzzy
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "gethostbyname'den döndürülen bilinmeyen biçim"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "nsl() bu platformda desteklenmiyor"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "'x'de çok geniş değer aralığı"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "sayısal olmayan argüman"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "desteklenmeyen URL şeması"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' bir liste olmalıdır"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' bir liste olmalıdır"
 
@@ -7799,9 +7910,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title' bir karakter dizesi olmalıdır"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "'text' bir karakter dizesi olmalıdır"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s' 1 uzunluğunda olmalıdır"
 
@@ -7832,9 +7940,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' bir bağlantı değil"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec' tek bir karakter olmalıdır"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr "bozuk veri çerçevesi -- kolon %d'in uzunluğu nrows'a uymuyor"
 
diff -Nru r-base-3.2.3/src/library/base/po/zh_CN.po r-base-3.3.1/src/library/base/po/zh_CN.po
--- r-base-3.2.3/src/library/base/po/zh_CN.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/zh_CN.po	2016-04-27 22:15:37.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-05-20 18:26+0800\n"
 "Last-Translator: ronggui\n"
 "Language-Team: Chinese\n"
@@ -123,173 +123,174 @@
 msgid "problem in displaying '%ls'"
 msgstr "在显示'%ls'时出了问题"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "'%s'�数�对"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "�支�这版本的Windows"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "�数�对"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "��愚蠢!: 你的机器有4Gb的地�上�"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "无法�少内存��：忽视�用"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path'必需为字符矢�"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "设备�对"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "必需用SDI方�"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "图形设备��对"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "设备有错"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "'Rmbstowcs'里的输入�对"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "撤消文件选择"
 
@@ -330,184 +331,183 @@
 msgid "'names' is not a character vector"
 msgstr "'names'必需是字符矢�"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "第一个�数应当是字符串"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "第三个�数应当是字符串"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "�行命令'%s'的状�是%d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "到达了对���时间�制"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "到达了��时间�制"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "到达了对�CPU时间�制"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "到达了CPU时间�制"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "致命错误:%s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "编�'%s'�存在"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<错误: 无法将编�'%s'�新进行编�>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "无法打开文件'%s': %s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show():�存在'%s'这个文件\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "警告: R_MAX_MEM_SIZE的值�对: 略过�用\n"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "警告: 没有设定max-mem-size\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "警告: --max-mem-size值�对: 略过�用\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "警告: --max-mem-size=%lu%c: 太大，略过�用\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "警告: --max-mem-size=%4.1fM太�，略过�用\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "警告: --max-mem-size=%4.0fM太大，当作%uM�用\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "二进列�算需�两个�数"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "二进列�算需�两个�数"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "警告: 因为太长了，'-e %s'这个输入略过�用\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "警告: 没有'%s'这样的选项\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "�数’%s’略过�用\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "-e选项�能�时和-f或--file一起出现"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "建立tmpfile失败--设了TMPDIR没有？"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "你必需选用'--save'，’--no-save'或'--vanilla'其中的一个"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr "无法建立‘reader thread’，系统资��够"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "下标出界"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "类别为'%s'的对象��以��集"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr "警告: 没有设定--enconding的值"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "警告: 本版本��支�'%s'这一选项"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "警告: 没有设定'%s'的值"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "警告: '%s'的值�对: 略过�用"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "警告: %s: 太大，略过�用"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "警告: 没有设定'--max-ppsize'的值"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "警告: '--max-ppsize'的值是负数: 略过�用"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "警告: '--max-ppsize'的值太�: 略过�用"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "警告: '--max-ppsize'的值太大: 略过�用"
 
@@ -609,7 +609,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "无法为'name'分�空间"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "需�字符�数"
 
@@ -664,7 +664,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "在Renviron里设定'%s'��时出了问题"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "�数'x'必需是字符串"
@@ -695,9 +695,9 @@
 msgid "invalid multibyte format string"
 msgstr "多字节格�字符串�对"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr "�数'%s'的长度大于一，因此�能用其第一元素"
@@ -707,7 +707,7 @@
 msgstr "'pattern'必需为�空字符串"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "正规表现�适用于此语言环境"
 
@@ -718,8 +718,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "输入的字符串%d�适用于此语言环境"
@@ -727,7 +727,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "略过'%s'�数值"
@@ -742,7 +742,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "输入的字符串y[%d]�适用于此语言环境"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "regcomp出错：'%s'"
@@ -751,29 +751,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "'FUN.VALUE'必需是矢�"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "'%s'值�对"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "长度�对"
 
@@ -809,7 +809,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<value>)的值�是NULL也�是长度为%d的串列 "
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "产生了NaNs"
 
@@ -821,214 +821,214 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "系数精确度很�能完全�失"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "整数上溢产生了NA"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "�算符需�一个或两个�数"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "二进列�算符中有�数值�数"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "�整�陈列"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "�整�时间系列"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr "长的对象长度�是短的对象长度的整�数"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "一进列�算符的�数�对"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "一进列�算符�对"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "一�数的实数函数目�还没有实现"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "目�没有实现�数功能"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "%d数值�数的实数函数目�没有实现"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "给了%d个�数到'%s'，但它最多�能用两个�数"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "第二�数长度为零是�对的"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "缺少�数\"%s\",也没有缺�值"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "�能有长度为零的'base'�数"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data'的�类必需为矢�，但现在是'%s'"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "�数值的矩阵范围"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "'nrow'值�对(�么是太大，�么是�NA)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "'nrow'值�对(< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "'ncol'值�对(�么是太大，�么是�NA)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "'ncol'值�对(< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr "数�长度[%d]�是矩阵行数[%d]的整�"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr "数�长度[%d]�是矩阵列数[%d]的整�数"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "数�长度超过了矩阵的大�"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "设定了太多的元素"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "矩阵的范围�能是负值"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: 设定了太多的元素"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "三维排列的范围�能是负值"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 msgid "'alloc3Darray': too many elements specified"
 msgstr "'alloc3Darray': 设定了太多的元素"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "'allocArray': 'dims'设定了太多的元素"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x'必需是NULL串列或原始矢�"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "'%s'必需用矩阵目标对象作�数"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "需�数值/�数矩阵/矢��数"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "�整��数"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "�数�是矩阵"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "第一个�数�对, 必需是陈列"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm'的长度�对 %d (!= %d)"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a'必需有带�字的dimnames"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "'perm[%d]'和维度�字�相�"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "'perm'里的值在范围外"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'resize'的值必需是TRUE或是FALSE"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x'必需为数值"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "'object'太短"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 msgid "'dims' cannot be of length 0"
 msgstr "'dims'的长度�能为零"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 msgid "'x' must have positive length"
 msgstr "'x'的长度必需是正数"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr "'backsolve'里出现了奇异矩阵。对角线[%d]里第一个零"
@@ -1091,200 +1091,201 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "无法设�适当'class'属性"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr "'%s'�类没有'names'这个的槽 "
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr "'%s'�类没有'names'这个槽；在为其分��称属性时会创建一个无效对象"
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr "在�矢�类别('%s')里�能用names()<-�设'names'这个槽"
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "�兼容'names'�数"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "设'names'属性时�类(%s)出错"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames'�能用于陈列"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames'必需是串列"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "'%s'必需是串列"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "'dimnames'的长度[%d]必需�'dims'的长度[%d]相等"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "设'dimnames'时的�类(%s)�对(必需为矢�)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "'dimnames'的长度[%d]必需与陈列范围相等"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "第一个�数�对"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "第二个�数�对"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "�能有零长度的大�矢�"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "dims�能包�缺少值"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "dims�能包�负值级"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 msgid "dims do not match the length of object"
 msgstr "dims与对象长度�匹�"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "dims [product %d]与对象长度[%d]�匹�"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "属性必需是串列或NULL值"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "属性必需��"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "所有的属性都必需有�字[%d没有]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "'which'属性的状�必需是字符"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "�能给一个'which'属性"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "'%s'部分匹�到'%s'"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "槽�字的类别'%s'�对"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name'必需为�空字符"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "�字槽的类别或长度�对"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "类别\"%2$s\"的对象中没有\"%1$s\"这样一个槽"
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "\"%1$s\"槽��存在于\"%2$s\"类别对象中"
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "�能为NULL目标对象设属性"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "一定�有'methods'程�包�能用正�类别"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr "无法从没有槽的基本类别(\"%2$s\") 的对象中�得\"%1$s\"槽"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr "�S4类别的对象(类别为\"%2$s\")没有\"%1$s\"这样的槽"
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr "'%s'产生了长度超过�制的矢�"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "'%2$s'里目�还没有实现'%1$s'这一�类"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "�能有��的正��数'recursive' "
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "�能有��的正��数'use.names' "
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "�数�是串列"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "'%s'里的类别�字太长"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "无法按这些�类建立矩阵"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "矩阵的行数必需相符(�arg%d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "矩阵的列数必需相符(�arg%d)"
@@ -1293,228 +1294,247 @@
 msgid "vector size cannot be NA"
 msgstr "矢�size�能是NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "矢�大��能是NA/NaN值"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "矢�大��能是无�值"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "矢�size设得太大了"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "NULL环境��有用"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "�数�能是函数"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "替�对象�是环境"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos'必需是环境"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "�数�是环境"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "空环境没有父�环境"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "无法为空环境设父�环境"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "无法为空环境设父�环境"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "无法为空环境设父�环境"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent'�是环境"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "无法写入此链结"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "'%s'设定�对"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "略过负的'fill'�数值"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "cat目�还�能处�%d(�类为'%s')�数"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "矢�: 无法建立状�为\"%s\"的矢�."
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "�能设�矢�的长度"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "�数�对"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "值�对"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...'用在的上下文�对"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "��'switch'默认值：'%s'和'%s'"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "缺少'EXPR'"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR必需是长度为一的矢�"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+#, fuzzy
+msgid "'switch' with no alternatives"
+msgstr "没有�字替代的'switch'需�数值EXPR"
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "%d个�数给'%s'，但它�需�%d个"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s'需�字符矢�"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "多字节字符串%d有错"
 
-#: src/main/character.c:203
-#, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:159
+#, fuzzy, c-format
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr "\"bytes\"编�里无法为％%d元素计算字符数"
 
-#: src/main/character.c:232
-#, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:188
+#, fuzzy, c-format
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr "\"bytes\"编�里无法为％%d元素计算长度"
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "无法从�字符对象里抽��字串"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 msgid "invalid substring arguments"
 msgstr "�字符串�数�对"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "�能有�字符�字"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "无法在�字符的对象里替��字串"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "第一�数必需是字符矢�"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abbreviate�适用于�ASCII字元"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "�能有�字符�字"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "多字节字符串%d有错"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "�字符�数"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "�能设定递�的范围('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "�能设定递�的范围('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "UTF-8字符串'old'有错"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "多字节字符串'old'有错"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "UTF-8字符串'new'有错"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "多字节字符串'new'有错"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old'比'new'�长"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "输入的多字节字符串%d有错"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim()需�字符矢�"
 
@@ -1526,7 +1546,7 @@
 msgid "applies only to lists and vectors"
 msgstr "�能用于串列和矢�"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "强制改�过程中产生了NA"
 
@@ -1535,7 +1555,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "强制改�过程中产生了NA"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "强制改�时丢弃了虚数部分"
 
@@ -1543,179 +1563,175 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "在强制改��原始值时，任何溢�值当作零�处�"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "数�状�为\"%s\"�对(太短了)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "'pairlist'对象�能被强制改��'%s'�类"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "(串列)对象�能强制改��'%s'�类"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(符�)对象�能强制改��'%s'�类"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "没有�用�把这个S4类别强迫改为矢�的方法"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "环境�能被强制改��其他�类"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "�能强迫改��因�"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "需�串列�数"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "环境�对"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "�数的长度至少�为一"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "函数定义本体�对"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "长度为零的�数是�对的"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "�数串列�对"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "\"single\"�类目�在R里还没有实现"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "没有实现的谓�"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s()�适用于类别为'%s'的�串列或�矢�"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "没有为'%s'类型实现默认的方法"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "缺少'name'"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "第一个�数必需是字符串"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what'必需是字符串或函数"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'text'必需为字符串"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "'args'必需是串列"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'%s'必需是串列"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir'必需是环境"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "环境设定有错"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "把class(x)设�NULL；其结果��是S4目标对象"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr "把class(x)设�多结字符串(\"%s\", \"%s\", ...); 其结果��是S4目标对象"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr "把class(x)设�\"%s\"集空属性; 其结果��是S4目标对象"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "字符串类别的替�对象�对"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr "�有在对象有这一类别的情况下�能设\"%s\"；�应该有\"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr "除�维度的长度为二(目�是%d)，�则�能设为矩阵类别"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr "除�维度的长度大于零，�则�能设为\"array\"类别"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value'必需为�空字符"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "�能改�因�的存储方�"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "�数一进列�算符有错"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "�数�算目�还没有实现"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "函数�能有�数值�数"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "多项�系数�对"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "寻根��行失败"
 
@@ -1727,7 +1743,7 @@
 msgid "connection not found"
 msgstr "找�到链结"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "链结�对"
 
@@ -1736,9 +1752,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "关闭��使用的链结%d(%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "�支�'%s'到'%s'的这�转�"
@@ -1820,8 +1836,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "区组太大"
 
@@ -1851,8 +1867,8 @@
 msgstr "先进先出链结分�失败"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "�用了'description'�数的第一个元素"
 
@@ -1862,14 +1878,14 @@
 msgstr "fifo(\"\")�支�open = \"w+\"和open = \"w+b\"这两�模�：现在使用�者"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "无法打开链结"
@@ -1936,7 +1952,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "分�bz文件链结失败"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "无法为lzma译�器进行�始化，错误是%d"
@@ -1956,12 +1972,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr "这一版本的R�支�%s-压缩文件"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "抄写�剪�时内存分�失败"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "打�开�剪�，或是�剪���文字"
 
@@ -2064,328 +2080,324 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con'�是输出链结"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "本系统没有��这个功能"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con'�是链结"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "无法打开标准链结"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "链结已打开"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "没有这样的'rw'值"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "无法关闭标准链结"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 msgid "cannot close 'output' sink connection"
 msgstr "无法关闭'output'汇集链结"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 msgid "cannot close 'message' sink connection"
 msgstr "无法关闭'message'汇集链结"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "链结没有打开"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 msgid "line longer than buffer size"
 msgstr "行�比缓冲区�大"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "无法从此链结读�"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "无法给readLines分�缓冲区"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "读'%s'时最�一行未�"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "readLines读的行数�够"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "略过文件末�完整的字符串"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr "没有null终止符: 字符串截断于10000个字节"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "无法读二进列链结"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "�支��数矢�大�的改�"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "本系统没有%d这样大�的值"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw的大��能是一"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr "'signed = FALSE'唯一有效的尺寸是1和2"
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x'�基元矢��类"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "�能写入二进列链结"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "写原始矢�最多�能用2^31-1字节"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "�次调用writeBin()的�最多�能写2^31-1字节"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "写入链结有问题"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "�支�原始矢�大�的改�"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "readChar()的UTF-8输入有错"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "在non-UTF-8 MBCS语言环境里�能读�字节"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "'object'太短"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr "writeChar：字符串的长度比需�的字节数目短-用零�补上"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr "writeChar：字符串的长度比需�的字节数目短-用零�补上"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 msgid "maximum number of pushback lines exceeded"
 msgstr "超出推回线的最大数�"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 msgid "could not allocate space for pushback"
 msgstr "无法为推回分�空间"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "�能推回已打开的�读链结"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "�能推回文字状�的链结"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "汇集堆�满了"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "无法将输出转到stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "没有�以除去的汇集"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 msgid "there is no connection NA"
 msgstr "没有NA链结"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "没有%d链结"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "本平��支�nsl()"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr "file(\"\")�支�open = \"w+\"和open = \"w+b\"这两�模�：现在使用�者"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "本平��支�ICU"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "文件串�没有gzip幻数"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "文件串�的gzip表头有错"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "清除'gzcon'链结时书写出错"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "crc错误%x%x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "'gzcon'链结书写出错"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level’必需是0 ... 9之一"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression'的值�么是TRUE�么是FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x'必需是TRUE或FALSE"
+
+#: src/main/connections.c:5502
 msgid "this is already a 'gzcon' connection"
 msgstr "这已�是'gzcon'链结"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "�用读或写的二进列链结"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr "文字方�的'file'�结有�能会出错"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr "�能创建一个�写的textConnection的'gzcon'连接；试用rawConnection一下"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "分�'gzcon'链结失败"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "���串列"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "书写指示器有错"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "���链结"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "�知�这�压缩格�，因此�设没有压缩"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, c-format
 msgid "allocation of %s connection failed"
 msgstr "链结%s分�失败"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr "没有�中断/下一步骤的循环, 跳到最高层"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "没有�回归的函数, 跳到最高层"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "目标上下文�在堆�上"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "堆�上没有这么多的环境框"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "'n'��许是正数"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "没有�新开始的功能"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "上下文数目必需是正数"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "询问缺��览器上下文"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "没有么多�览器得指令"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "堆�上没有这么多函数"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "'do_sys'里�生了内部错误"
 
@@ -2393,37 +2405,37 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "'cumsum'中整数上溢；请用'cumsum(as.numeric(.))'"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 msgid "'cummax' not defined for complex numbers"
 msgstr "'cummax'�适用于�数"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 msgid "'cummin' not defined for complex numbers"
 msgstr "'cummin'�适用于�数"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "没有cumxxx这个功能"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "设定时区时出了问题"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "无法为本系统设时差区"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "�消时区设制时出了问题"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "�空的\"POSIXlt\"结构里�长度为零的部件"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "无法为'read.dcf'分�内存"
 
@@ -2437,11 +2449,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "畸形'%s ...'开头行!"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "�数必需为闭�"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "�数必需为函数"
 
@@ -2450,7 +2458,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x'必需是TRUE或FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "�数�能是函数"
 
@@ -2466,59 +2474,59 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr "'tracemem'对弱引用或外指针对象没有作用"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "在编译R程�时没有建立存储轮廓这一功能"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "�数数目太少"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "'deparse'的'cutoff'值�对, 用缺�值"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "��分�S4目标对象是�能被source()"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "��分��能�完全"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "在R < 2.7.0的版本里deparse�能��以被source()"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "'what'必需是字符串或函数"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "写了的字符数目太�"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "需�字符�数"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 msgid "zero-length argument"
 msgstr "�数长度为零"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts'必需是�的�负整数"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "找�到对象'%s'"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "函数表达�形��对"
 
@@ -2530,15 +2538,15 @@
 msgid "no active or default device"
 msgstr "没有在使用中的或缺�的设备"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "太多已打开的设备"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "分�设备内存�够(GEcreateDevDesc)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "按<Return>键�看下一个图: "
 
@@ -2624,7 +2632,7 @@
 msgid "too many arguments, sorry"
 msgstr "对�起，�数太多"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "图形狀態�对"
 
@@ -2775,7 +2783,7 @@
 msgid "invalid argument to edit()"
 msgstr "edit()�数�对"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "无法打开文件"
 
@@ -2835,12 +2843,12 @@
 msgstr "没有�以�消注册的图形系统"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "行终点出错"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "行接�出错"
 
@@ -2869,83 +2877,97 @@
 msgid "raster capture is not available for this device"
 msgstr "栅格���适用于这个设备"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "模�%1$d�支�字模家�'%2$s'"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "没有活动图形设备"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "'%d'这个pch值在本语言环境下�适用"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "目�没有实现pch '%d'这样一个值"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "座标范围�对[GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "座标范围�能是无�值[GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo =%g <%g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up =%g >%g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 msgid "display list redraw incomplete"
 msgstr "显示串列没有完全被刷新"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "�数串列�对"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "'expr'�数必需是表达�"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "'list'�数必需是串列"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "'env'�数必需是环境"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "pch=\"c\"里的多字节字元�对"
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "�六进制'color'设定或lty设定�对"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "行类�对: 长度必需是2, 4, 6或8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "排类别�对：�能有零值"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "行类�对"
 
@@ -2954,7 +2976,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "无法改�被�定的�编'%s'的值"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "无法为被�定的环境添加�编"
 
@@ -2970,681 +2992,687 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "在基本环境里切断�编这功能还没有被实现"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "无法从�定的环境中删除�编"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "�数'%s'�是环境"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "... 串列�包�%d元素"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d所在的上下文出了错, 没有�以�索的..."
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "没有\"%s\"这个函数"
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "无法在空环境里分派数值"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "无法给这个数�库指定�数"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "无法在基本环境里加�编'%s' "
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "�用了第一个元素作为�数�"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "第一个�数必需是带�字的串列"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "name(x)必需是长度与x一样的字符矢�"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 msgid "'envir' argument must be an environment"
 msgstr "'envir'�数必需是环境"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "无法从基本�字空间里删除�数"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "无法从基本环境中删除�数"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "无法从空环境中删除�数"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "无法从这个数�库中删除�数"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "没有状�为\"%2$s\"的\"%1$s\"目标对象"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "在%d�置的�字�对"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "第二�数必需是环境"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "'%s'�数的长度�对"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "’missing'的用法�对"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing'�能用于这些�数"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos'的值必需是整数"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "所有的串列都必需带�字"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach'�适用于串列，数�框和环境"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "\"package:base\"�能被拆离"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "�数必需是环境"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "�数必需为符�"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "没有�闭环境"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "寻找串列里没有\"%s\"这样一个项目"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "'as.environment(NULL)'��有用"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "替�对象�是环境"
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "as.environment的对象�对"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "�是环境"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "�是符�"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "\"%s\"没有�编"
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "�是函数"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "符�已�有了正��编"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "无法改�被�定的�编"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "没有这��算符"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "无法切斷已��定了的�编"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "无法切斷正在使用中的�编"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr "�字空间�字�对"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr "�字空间已�注册了"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr "�字空间没有注册"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "引进环境�数�对"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "引出环境�数�对"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "引进和引出�字的长度必需相等"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "引出的符�’%s'没有值"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "�支�'%d'这个编�"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "字符串里嵌入了nul：'%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "暫�中断; 略过信�"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "\"warning.expression\"选项�对"
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(由警告转��)%s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "警告: %s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "%s里有警告: %s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "警告信�丢失\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "警告信�：\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "共有%d个警告 (用warnings()�显示)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr "警告多于%d个(用warnings()�显示第一个到第%d个)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "收�时出错: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "错误于"
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, fuzzy, c-format
 msgid "Error in %s (from %s) : "
 msgstr " (从%s) : "
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "错误于"
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "错误: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "此外: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "选项\"error\"�对\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "�止执行\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep'必需是字符串"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [stop(.)里的字符串�对]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [warning(.)里的字符串�对]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "\"%s\"里的�数数目�对"
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "%s里的功能目�没有实现"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "�数数目�对"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "�数�类�对"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "时间系列/矢�长度�等"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "��兼容的�数"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "�知是什么错误(请报告!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "强制改�整数�精确"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "�知是什么警告(请报告!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "没有�回归的函数, 跳到最高层"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "最高层�一致？"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "处�器数�有错"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "错误信��是字符串"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr "旧�新�动里的处�器或�新�动堆��相�"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "错误信��对"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "�新�动出错"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "�能在堆�上�新�动"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "�在try的上下文中"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "错误信�必需是字符串"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr "�文件跳过Rprof，请增加“%s�"
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: 无法打开程�概�分�文件'%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "本系统没有R程�概�分�这个功能"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr "已�在评估：递归缺��数�考还是早先原�的问题？"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "�新评估被中断的许诺"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr "评估嵌套太深：无穷递归/ options(expressions=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "缺少�数, 也没有缺�值"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "�适用于�函数"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s在%s#%d: "
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "%d元素是空的"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "类属函数环境里没有这个\"%s\"符�"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "方法环境里没有\"%s\"这个符�"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "�件的长度大于一，因此�能用其第一元素"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "需�TRUE/FALSE值的地方��以用缺少值"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "�数�能作为逻辑值�用"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "�数长度为零"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "�符�循环�数"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "for()循环顺��对"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "��许多�数回覆值"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "赋值公�左手�能是(NULL)值"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "赋值目标擴充到�语言对象"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "'%s'中的�字太长"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "无法在基本�字空间里赋�数值"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "无法在基本环境里赋�数值"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "�数赋值里的函数�对"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "(do_set)赋值公�左手�对"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "缺少'%s'"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "\"function\"正��数串列�对"
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "�类'%2$s'的�数'%1$s'�对"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "数值'envir'�数的长度�是一"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "'eval'�支��新�动"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall'在�閉包外调用"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "'... '里的值�是�諾"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "��兼容的方法(\"%s\", \"%s\")和\"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "组分派错误"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "\"%s\"�是%s函数"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "节点堆�上溢"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "整数堆�上溢"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 msgid "bad opcode"
 msgstr "opcode�对"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "'x %2$s y'中%1$s�类�对"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "�元組碼版本��; 用eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "�元組碼版本太旧"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "�元組碼版本太新"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "�元組碼版本��"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "循环里的顺��数�对"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "没有'%s'这个内部函数"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "函数�对"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "�BUILTIN函数"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+#, fuzzy
+msgid "bad numeric 'switch' offsets"
+msgstr "数字开关�移设定�对"
+
+#: src/main/eval.c:6072
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr "没有�字替代的'switch'需�数值EXPR"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+#, fuzzy
+msgid "bad character 'switch' offsets"
+msgstr "字符开关�移�对"
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "找�到线程代�地�的索引"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr "函数体�对"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "符��对"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "�数�是�元组�对象"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "文件�字�对"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "无法打开'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file'必需是�空字符串"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii’必需是逻辑值"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr "常�缓冲区必须是矢�类属"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr "常�数目�对"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "程�概�分�计时器在�行中"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "已�在进行�元组�程�概�分�"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "程�概�分�计时器设制失败"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "��元组�程�概�分�"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "本平��支�ICU"
@@ -3662,15 +3690,15 @@
 msgid "this graphics device does not support event handling"
 msgstr "图形设备�支�事件处�"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "�示�对"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "�支�'getGraphicsEvent'的递归应用"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "还没有设定图形事件处�机"
 
@@ -3851,7 +3879,7 @@
 msgstr "正规表现�对, 原因是'%s'"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "输入的字符串%d�是UTF-8"
@@ -3944,26 +3972,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "无法读写模�里的互�网例行程�"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "无法载入互�网例行程�"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "值�对"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "无法载入��例行程�"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "无法设定'comment'属性"
+
 #: src/main/lapack.c:39
 msgid "LAPACK routines cannot be accessed in module"
 msgstr "LAPACK例行程�无法使用在模�中"
@@ -3972,38 +3999,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "无法载入LAPACK例行程�"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr "此�算�适用于数值，逻辑值或�数值�类"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "二进列�算�能在�整�陈列上进行"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "�整�时间系列"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "'%s'�算符需�两个�数"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "'x %s y'里的'x'�类�对"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "'x %s y'里的'y'�类�对"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "�进列�算`!'�能有两个�数"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "将�类为'%s'的�数强迫转化为逻辑值"
@@ -4012,61 +4039,75 @@
 msgid "dummy - do not translate"
 msgstr "dummy - do not translate"
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "收�时出错: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "�止执行\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "错误：C堆�上溢\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "无法打开基本程�包\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "无法復原�存在%s里的数�\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "在�动过程中 - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "无法打开文件�读�数�"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "无法退出�覽器"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "�能用\"yes\", \"no\", \"ask\"或\"default\"中的一个."
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr "save=\"ask\"�能在�交互型状�时使用，改用命令行缺�值"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "没有这�'save'值"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "'status'�对, �設为零"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "'runLast'�对, �設为FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr "无法为最高层回�元素分�空间"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "R_removeTaskCallbackByIndex�能用负的索引值"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "最高层任务回�'%s'时产生了警告信�\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "最高层任务回�没有回覆逻辑值"
 
@@ -4108,162 +4149,167 @@
 msgid_plural "unused arguments %s"
 msgstr[0] "�数没有用%s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "�能微弱引用或定局引用对象"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "定局器必需是函数或NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "�微弱引用"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "第一�数必需是环境或外部指针"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "第二�数必需是函数"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "第三个的值�么是TRUE�么是FALSE"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "矢�内存用完了(达到了��?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "cons内存用完了(达到了��?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "内存用完了(达到了��?)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "无法分�大�为%0.f Tb的内存�"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "无法分�大�为%0.1f Gb的内存�"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 msgid "vector is too large"
 msgstr "矢�设得太大了"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "�能有负长度矢�"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "无法分�长度为%d的矢�"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "矢�分�的�类/长度(%s/%d)�对"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "无法分�大�为%0.1f Gb的矢�"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "无法分�大�为%0.1f Mb的矢�"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "无法分�大�为%0.f Kb的矢�"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect()：防护堆�上溢"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect():�有%d个�护项"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: 找�到指针"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] "R_Reprotect:�有%d个�护项, �能�新�护索引%d"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "'Calloc'无法分�(%2$u字节的%1$.0f)内存"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "'Realloc'无法�新分�(大�为%.0f字节)的内存"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "回覆矢�指针�是安全的�法"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "值�对"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "本系统没有记忆概�分�这个功能"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem: 无法输出文件'%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr "现在还没有支�长��：%s:%d"
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "需�字符串�数"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "没有这�原始函数"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "�能用零长度�数�"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "����制于%d字节"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ".Internal()�数�对"
 
@@ -4302,105 +4348,105 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "\"%s\"没有适用于\"%s\"目标对象的方法"
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "�能在函数外调用'NextMethod' "
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "�能在匿�函数内调用'NextMethod' "
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "找�到调用此方法的类属函数: 是�是已�直接调用这个方法?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function'�是函数, 而是�类%d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "�数�对 ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "没有设定对象"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "没有设定类属功能"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "'NextMethod'里�能有类属�数"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "'NextMethod'里的'group'�数�对"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ".Method的值�对"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "��兼容方法，略过�用"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "没有�以调用的方法"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "无法�消环境的类别"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "无法�消外部指针的类别"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what'必需是字符矢�"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which'必需是长度为一的逻辑矢�"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "对S4目标对象请用'is()'而�是'inherits()'"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr "找�到正确的环境；请报告!"
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'onOff'必需是TRUE或FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "无法找到函数\"%s\"�类属的版本"
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr "'methods'分派没有激活，因此�能调用'standardGeneric' (略过�用)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr "'standardGeneric'的�数必需是�空字符串"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr "�能从�泛型函数体内调用standardGeneric(\"%s\") "
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4408,117 +4454,122 @@
 msgstr ""
 "原始方法代�(\"%s\")有错：应该是\"clear\", \"reset\", \"set\", 或\"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "对象�对: 必需是原始函数"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr "原始�属函数的正�定义必需是函数对象(�能是'%s'类)"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "回归为�属函数的目标对象\"%s\"看起��象"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "�能分派原始�算"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "分派错误"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr "原始函数\"%s\"有了设定的方法，但�没有�属函数 "
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "调用C层的MAKE_TYPE�时�能用NULL字符串指针"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "无法载入Hershey字形"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "调用R_getClassDef(.) 时�能用NULL字符串指针"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "调用C级的NEW�时�能用null类别定义指针"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "无法从虚拟类别(\"%s\")中产生对象"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "类别为\"%s\"的目标对象�符�一个有效的S3目标对象"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "选择项��败�"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "�刷宽度�对，用80"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "�刷数字无效，用7"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr "'deparse.cutoff'无效，用了60"
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "\"device.ask.default\"的值无效，用FALSE"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "串列�数的�字�对"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "'width'�数�对，�用%d...%d"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "'digits'�数�对，�用%d...%d"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "'expressions'�数�对，，�用%d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "'%s'的值�对"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec'必需为�节字符"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"device.ask.default\"代替了\"par.ask.default\" "
 
@@ -4542,11 +4593,16 @@
 msgid "first argument must be atomic"
 msgstr "第一个�数必需是基元"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec'必需为�节字符"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "��能出现这�状�(x)"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "�能用原�矢��数"
 
@@ -4554,210 +4610,193 @@
 msgid "invalid filename specification"
 msgstr "文件�字设定�对"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "文件追加时书写出错"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "没有�以追加的文件"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "filename�数�对"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "由于'%2$s'的原因，无法建立'%1$s'文件"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "第一个文件�字�对"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "无法删除文件'%s'，原因是'%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "第二个文件�字�对"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "没有�以链结的文件"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "此版本的Windows�支�符�链结"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "无法打开'%ls'到'%ls'的链结，原因是'%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "无法打开'%s'到'%s'的链结，原因是'%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 msgid "symbolic links are not supported on this platform"
 msgstr "这个平��支�符�链结"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "无法打开'%ls'到'%ls'的链结，原因是'%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "无法打开'%s'到'%s'的链结，原因是'%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr "这个平��支�(硬)链结"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "from'和'to'的长度�一样"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "扩展�的'from'�字太长"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "扩展�的'to'�字太长"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "由于'%3$s'的原因，无法将文件�字'%1$s'改�'%2$s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "'pattern'正规表现�对"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "无法确定R本录�置"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "文件�太长"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "内部出现了内存�够情况"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "读�'%s'时出了错"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "设定'LC_NUMERIC'�有�能会使R�转出现问题"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr "LC_MESSAGES存在于Windows里，但没有用"
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr "�作系统报告说无法执行将本地化设�\"%s\"的请求"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname'必需是长度为一的字符矢�"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "nsl()无法分辨主机'%s'"
-
-#: src/main/platform.c:2161
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "'gethostbyname'回覆了错误的格�"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "本平��支�nsl()"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s'已存在"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "由于'%2$s'的原因，无法建立'%1$s'文件目录"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls'已存在"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "由于'%2$s'的原因，无法建立'%1$ls'文件目录"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr "嵌套过深"
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "路径长度太长了"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "建立文件目录%ls时出了问题：%s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "读�文件目录%ls时出了问题：%s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 msgid "over-long path length"
 msgstr "路径长度太长了"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr "拷�%ls到%ls时出了问题：%s "
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr "建立文件目录%s时出了问题：%s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr "读�文件目录%s时出了问题：%s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "拷�%s到%s出了问题: %s "
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode'的长度至少需�是一"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "本平��作系统支��够"
 
@@ -4802,66 +4841,71 @@
 msgid "Metric information not available for this family/device"
 msgstr "公制信��适用此系列/设备"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "'na.print'设定�对"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "行標記�对"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "列標記�对"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ".Internal(print.function(.))�数是�函数"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap'必需是正整数"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "'tryS4'内部�数�对"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "%d行输入缓冲区上溢"
+
+#: src/main/print.c:1043
 msgid "invalid character length in 'dblepr'"
 msgstr "'dblepr'字符长度�对"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 msgid "invalid character length in 'intpr'"
 msgstr "'intpr'字符长度�对"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 msgid "invalid character length in 'realpr'"
 msgstr "'realpr'字符长度�对"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 msgid "memory allocation error in 'realpr'"
 msgstr "'realpr'内存分�错误"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "BLAS/LAPACK 例行程�'%6s'产生了错误%d信�"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "行標記�够"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "列標記�够"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] "[到达getOption(\"max.print\") -- 略过%d行]]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr " wchar_t在本平�上�应该是Unicode"
 
@@ -4869,341 +4913,341 @@
 msgid "argument is not a numeric vector"
 msgstr "�数�是数值矢�"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "�数�对"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "产生了NA"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "机率矢�中有NA"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "�能有�负机率"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "正值机率太少"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr ""
 "'replace = FALSE'，因此�能�比总体�大的样本\n"
 " "
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "机率数目�对"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "n >= 2^31, replace = FALSE�能在64�平�上�能用"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 msgid "argument must be a character vector of length 1"
 msgstr "�数必需是长度为一的字符矢�"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr "�数应该是长度为一的字符矢�，因此�能用其第一元素"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 msgid "argument 'x' must be a raw vector"
 msgstr "�数'x'必需是矢�"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "'multiple'的�数值必需是TRUE或是FALSE"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 msgid "argument 'shift' must be a small integer"
 msgstr "'shift'�数必需是整数"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 msgid "argument 'x' must be an integer vector"
 msgstr "'x'�数必需是整数矢�"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "�数'x'必需是原始，整数或逻辑值"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "�数'x'必需是长%d的�数"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 msgid "argument 'x' must not contain NAs"
 msgstr "'x'�数�能带NA"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 msgid "invalid UTF-8 string"
 msgstr "UTF-8字符串有错"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "�能比较(%d)基元或串列�类"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "�能比较表达�"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "这些�类的比较方法还没有实现"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "�能比较�数值"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 msgid "'a' and 'b' must have the same type"
 msgstr "'a'和'b'的�类必需相�"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "读�错误"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "�生了I类读�错误"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "�生了R类读�错误"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "�生了C类读�错误"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "�生了S类读�错误"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "�生了读�错误"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "復原时�到了无法解�的节点"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "復原相容错误：没有�版本%d相容的功能"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "数�文件里SEXP�类出错"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "�类�相�"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "没有\"%s\"这个函数"
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "在�原数�时无法�存文件�置"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr "在�原数�时无法�原文件�置"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr "一�版本的工作空间�能�全基本�字空间"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "一�版本的工作空间无法�存�字空间"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr "一�版本的工作空间�能�存�定的/活动的�编"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "一�版本的工作空间无法�存弱引用"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec�适用于�矢��类"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr "一�版本的工作空间无法�存�元组�对象"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: 没有%i这一�类"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec�适用于�矢��类"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr "无法从一�版本的工作空间里读��元组�对象"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: 没有%i这一�类"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "读�ascii字符串时内存�够"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "二进列读�时�生了错误"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "读�二进列字符串时内存�够"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "读�二进列字符串时�生了错误"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "xdr整数数�书写错误"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "xdr整数数�读�错误"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "xdr字符串数�书写错误"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "xdr实数数�书写错误"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "xdr实数数�读�错误"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "xdr�数数�书写错误"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "xdr�数数�读�错误"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "书写失败"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "復原文件�能是空的 -- 没有载入任何数�"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr "復原文件�能是由比目�R版本�新的R�存的 -- 没有载入任何数�"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr "復原文件幻数出错(文件�能有��)-- 没有载入任何数�"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "第一�数必需是字符矢�"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "带�字的串列�对"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr "'%s'看起�好象是2.4.0�的S4目标对象；请�新创造"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "载入数�没有��串列形�"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "第一�数必需是文件�字"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "XDR书写失败"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "XDR读�失败"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "无法�存数� -- 无法打开%s: %s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "无法用%d版本的格���存链结"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "无法打开链结进行书写"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "�能将XDR格��存到文字状�链结"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "链结书写�生了错误"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "链结没有打开，�能读"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr "二进列链结�能用load()这个方法"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "没有输入值"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5218,7 +5262,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan()需�'%s', 而�是'%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 msgid "too many items"
 msgstr "项目太多"
 
@@ -5226,7 +5270,7 @@
 msgid "empty 'what' specified"
 msgstr "'what'设定�能是空的"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "%d行没有%d元素"
@@ -5260,33 +5304,33 @@
 msgid "embedded nul(s) found in input"
 msgstr "字符串里嵌入了nul：'%s'"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "因�长度�相等"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "答案矢�会太长"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "�数长度为零"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "数值表达�一共有%d元素: �用了第一个"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "NA/NaN�数"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "第二�数�类�对"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "�类为'%s'的目标对象�能被�制"
@@ -5520,53 +5564,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "�有基元矢��能被检验排�"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'increasing'必需是TRUE或是FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "�有基元矢��能被排�"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "无法排�原始矢�"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr "出现了NA或无�大的index "
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, c-format
 msgid "index %ld outside bounds"
 msgstr "索引%ld在界�外"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "NA索引"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "索引%d在界�外"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "�数%d�是矢�"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "�数长度��"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "rank()的ties.method�对[这是�应该�生的]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "'x'里的值的范围太大"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "将'text'强迫改��字符串失败"
@@ -5576,23 +5616,23 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "略过'%s = \"%s\"'�数值"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "第一�数必需是矢�"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "第二�数必需是因�"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 msgid "group length is 0 but data length > 0"
 msgstr "组的长度为零但数�的长度大于零"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "数�长度�是分割�数的�数"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "因�的水平�对"
 
@@ -5647,38 +5687,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "矢�长度被強制改��零"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "'%s'的格��对；%s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "逻辑对象使用的格�应该是%d或%i"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "整数对象使用的格�应该是%d，%i，%o，%x或%X"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "数值对象使用的格�应该是%f,%e,%g或%a"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "字符对象使用的格�应该是%s"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "字符串很�能被缩短到%d个字符"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "�支�这一�类"
 
@@ -5686,251 +5726,247 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_Library文件�字�对: 缓冲区太�"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "�能把�矢��大"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "�能在矢�/串列��外赋值(%d加大到%d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "下赋值fix�类里有��兼容的�类(从%s到%s)"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "下标赋值里��许NA"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "更��数长度为零"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr "被替�的项目�是替�值长度的�数"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "矩阵里的下标数目�对"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr "矩阵�集赋值里有��兼容的�类(从%s到%s)"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "下标数目�对"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr "陈列�集赋值有��兼容的�类(从%s到%s)"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "串列赋值里的下标�对"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "串列赋值里的下标数目�对"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: �数数目�对"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr "计算结果的长度为零，因此��能是语言目标对象"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr "给\"S4\"类型的对象所定义的[[<-�能在环境�类内有用"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "环境下赋值的�数�对"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "用�替�的元素比所�替�的值多"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] 缺少下标"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] 下标在界�外"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] 下标数目�对"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr " [[ 赋值里有��兼容的�类(从%s到%s)"
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] 下标(%d)在界�外"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "类别为'%s'的下标�对"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "�存在给这个S4类别分��集的方法"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "把公�左手强迫��串列"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "至少�选择一个元素"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "最多�能选择一个元素"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "递回索引在�行时�生了内部错误"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "'%s'进一部分匹�到'%s'"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "递回索引在%d层失败\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "在%d层没有这一索引\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "矩阵下标里列的数目�对"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "矩阵下标里�能有负数值"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(下标)逻辑下标太长"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "�有负下标里�能有零"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr "标过大，因为是32�的R "
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "陈列中没有'dimnames'这一属性"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "�矢��能有下标"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr "尺寸会超过阵列最大大�"
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "这一�类�能有矩阵下标"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "这一�类�能有阵列下标"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "�度数目�对"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "没有索引设定"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "S4对象��以��集"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "��集环境时的�数�对"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "'type'(%s)�数�对"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "整数上溢-请用sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "内部错误(do_summary里的'op = %d').\t 请�专家请教"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "整数上溢；请用sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "所有的�数都�存在; 回覆NA"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "min里所有的�数都�存在; 回覆Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "max里所有的�数都�存在；回覆-Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "�数值�数"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "�数'which'必需是逻辑值"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "没有�数"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "输入�类�对"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr "�数值将数�略微回收"
 
@@ -5943,8 +5979,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "编�的文件��能是'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "�支�代�页%2$d里由'%1$s'�这�转�"
@@ -5977,95 +6013,96 @@
 msgid "no 'fileext'"
 msgstr "没有'fileext'"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "读�%s失败"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "�数�类�对"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "�数的长度�对"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "本系统没有'Sys.setenv'这个功能"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr "本系统无法復原环境��：设�\"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "本系统没有'Sys.unsetenv'这个功能"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "�支�代�页%3$d里从'%1$s'到'%2$s'的这�转�"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x'必需是字符矢�"
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+#, fuzzy
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x'必需是NULL串列或原始矢�"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s'�能调用在CHARSXP上"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr "��许用\"bytes\"编�进行字符翻译�"
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "unz写��生了内部错误"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "�支�从代�页%2$d里到'%1$s'的转�"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "行接�出错"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 msgid "cannot create 'R_TempDir'"
 msgstr "无法创建'R_TempDir'"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "无法设制R_SESSION_TMPDIR "
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 msgid "cannot allocate 'R_TempDir'"
 msgstr "无法分�'R_TempDir'"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr "临时文件�太长"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "临时文件�都用完了"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr "分�R_tmpnam2失败"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "本平��支�'dirmark = TRUE'"
 
@@ -6100,32 +6137,32 @@
 msgid "'nmax' must be positive"
 msgstr "'nmax'的长度必需是正数"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match'需�矢��数"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "�数�是字符状�"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 msgid "... used in a situation where it does not exist"
 msgstr "... 用于了在它�存在的地方"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "'... '里的值�是�諾"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "rowsum里�能有�数值数�框"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "这�应该�生"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names'必需是字符矢�"
 
@@ -6133,140 +6170,140 @@
 msgid "object is not a matrix"
 msgstr "对象�是矩阵"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "'%2$s'里的%1$d�类还没有被实现"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "�类'%s'目�没有在'%s'里实现\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "(%d)�类目�没有在'%s'里实现\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "抽��字的标记�对"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] ".Internal(%2$s)收到了%1$d个�数，但它最多�能用%3$d个�数"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "%d个�数给'%s'，但它�需�%d个"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "�供的�数�'%s'�'%s'�匹�"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "'nthcdr'串列比%d�短"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr'需�CDR串列"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x'必需是TRUE或FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y'必需是TRUE或FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "��值�对"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "无法改�工作目录"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "需�字符矢��数"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "路径太长"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "�用了'quote'的第一个字符"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "需�字符矢�'value'"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "'value'的长度必需是正数"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "'utf8towcs'里的输入'%s'�对"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "'%s'多字节字符串有错"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "错误信�缩短到255个字节"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "警告信�缩短到255个字节"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 msgid "all arguments must be named"
 msgstr "所有的�数都必需��"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "本平��支�ICU"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 msgid "'breaks' is not sorted"
 msgstr "'breaks'没有排�"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, c-format
 msgid "long vector '%s' is not supported"
 msgstr "�支�'%s'这�长��"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr "'eps.correct' 的值必需是0，1，或2"
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 msgid "'x' must be a vector"
 msgstr "'x'必需是��"
 
@@ -6327,7 +6364,7 @@
 msgid "There must be at least three control points"
 msgstr "至少得有三个控制点"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "X11�定错误:%s"
@@ -6350,7 +6387,7 @@
 "错误：X11无法分��外的图案颜色。\n"
 "请考虑用colortype=\"pseudo.cube\"或\"gray\"选项�调用X11。"
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6358,204 +6395,210 @@
 "找�到任何X11字形\n"
 "请检查字形路径设得是�是对。"
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "虽然需�的是%2$d，但X11�大�为%1$d的字形"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "无法载入X11字�为%2$d,大�为%3$d的字形%1$s"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr "这装置�支���明输出：�一页��醒一次"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "在打开'%s'链结的时候X11 I/O出错"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "X11致命的IO错误: 请�存工作数�，然��新�动R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr "Xlib�支�语言环境: �些X�作指令将在C语言环境中起动"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X无法设定语言环境修飾器"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "本R版本�支�png"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "png()调用时文件�字太长"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "无法打开PNG文件'%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "本R版本�支�jpeg"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "jpeg()调用时文件�字太长"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "无法打开JPEG文件'%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "本R版本�支�tiff"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "tiff()调用时文件�字太长"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "bmp()调用时文件�字太长"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "无法打开BMP文件'%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "无法打开链结到X11显示'%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr "因为X11设备已�打开了，'display'�数略过�用"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr "以cairo为基础的类型�能�在TrueColor视觉里�能正常工作"
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg()�支��明绘图: 用白色的背景"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "找�到关于'%s'显示的信�"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "无法建立X11窗�"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "'width=%d, height=%d'作为象素值很有�能�对"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "无法建立�映"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "字形设定�对"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "X11字形数�库里没有这一字形家�"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "'%2$s'里%1$d < 0用得�对"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "无法打开文件'%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "%s�适用于这个设备"
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "无法建立XImage"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr "调用了dev.hold()�就�能�用定�器了"
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "无法打开%s设备"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width'或'height'�对"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "传给X11驅動器的颜色�类�对"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "没有这�X11颜色/颜色模型 --用黑白色的"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "没有�以�存的设备"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "�是已打开的X11cairo设备"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "无法打开文件'%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "本平��支�savePlot()"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "无法链结到X11显示"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "读��剪�失败(错误�%d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "无法为X11Routines结构分�内存"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "'eval'�支��新�动"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "url链结分�失败"
 
@@ -6567,29 +6610,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "�用'destfile'�数的第一个元素"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "正在下载"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "无法打开URL'%s'，原因是'%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "无法打开目的文件'%s'，原因是'%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "试开URL’%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "下载的长度%d�等于报告的长度%d"
@@ -6599,140 +6642,166 @@
 msgid "cannot open URL '%s'"
 msgstr "无法打开URL'%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "�支�这�URL方案"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "无法打开: HTTP状�是'%d%s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "InternetOpenUrl失败:’%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "无法打开: HTTP状�是'%d%s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "本平��支�nsl()"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "'%s'�数�对"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "本平��支�nsl()"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "引进和引出�字的长度必需相等"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "无法打开目的文件'%s'，原因是'%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "无法打开文件'%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "无法从此链结读�"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "无法打开链结"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "本平��支�nsl()"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL: URL太长了(或格��对？)"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "删除FTP代�主机信�"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "用FTP代�主机'%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy: URL太长了(或格��对？)"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "无法分辨主机"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "连接�上伺�器"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "伺�器没有�应"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: 建立��失败"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "建立数�链结失败"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "连接通訊埠失败"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "无法从通訊埠%d��数�"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL: URL太长了(或格��对？)"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "删除HTTP代�主机信�"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "用HTTP代�主机'%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy: URL太长了(或格��对？)"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "无法解决'%s'."
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "由通訊埠%2$d接通到'%1$s'."
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "无法通过通訊埠%2$d连接到'%1$s'."
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "�新寄�到: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "太多�新寄�，中断工作 ..."
 
@@ -6963,8 +7032,8 @@
 msgstr "bessel_i分�错误"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_i(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. �数在范围外?\n"
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -6972,16 +7041,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): 结果的精确度有�害\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "Bessel_j分�错误"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_j(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. �数在范围外?\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): 结果的精确度有�害\n"
@@ -6991,8 +7065,8 @@
 msgstr "bessel_k分�错误"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_k(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. �数在范围外?\n"
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -7000,16 +7074,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): 结果的精确度有�害\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "bessel_y分�错误"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_y(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. �数在范围外?\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): 结果的精确度有�害\n"
@@ -7019,42 +7098,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr "'k' (%.2f)必需是整数，四�五入时到%.0f"
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "'%s'里的�数值在范围外\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "'%s'里的值在范围外\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "'%s'收敛失败\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "'%s'�能达�到全精度\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "'%s'下溢\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, fuzzy, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr "pbeta_raw() -> bratio()得到了错误代�%d"
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr "pnbinom_mu() -> bratio()得到了错误代�%d "
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..):%d次循环�还没有��."
@@ -7122,7 +7201,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr "本系统�支�明晰缓慢动�载入。用缺席值。"
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "找�到工作目录"
 
@@ -7136,97 +7215,133 @@
 "report using bug.report()"
 msgstr "读行输入嵌套出了�寻常的错，请用bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "在�存履历文件'%s'时出了问题"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
 "\n"
 msgstr "无法打开文件'%s': %s\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "'file'�数太长"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "没有历�功能"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "截短履历文件时出了问题"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "没有�以�存的历�"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "时间标签�对"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "需��空字符�数"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern’必需是逻辑值而�是NA"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "无法popen'%s'，原因�能是'%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr "调用system(, intern = TRUE)时%d行�能会被截断"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "�行命令时出错：'%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "调用命令时�生了错误"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "�行命令'%s'的状�是%d：错误消�是'%s'"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "本系统没有实现Sys.info()这一功能"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "警告: --gui或-g选项没有值，因此略过�用"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "警告: 没有这�gui ’%s', 用X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "警告: 没有这�gui ’%s', 因此什么都�用\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "为'-e'建立临时文件失败"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "警告: �修改文件串列中的第一个元素"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "'what'必需是字符串或函数"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "本系统没有��这个功能"
+
+#~ msgid "no function to restart"
+#~ msgstr "没有�新开始的功能"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "�数必需为闭�"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname'必需是长度为一的字符矢�"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "nsl()无法分辨主机'%s'"
+
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "'gethostbyname'回覆了错误的格�"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "本平��支�nsl()"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "'x'里的值的范围太大"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "�数值�数"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "�支�这�URL方案"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames'必需是串列"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args'必需是串列"
 
@@ -7413,15 +7528,9 @@
 #~ msgid "can't use R profiling while byte code profiling"
 #~ msgstr "在进行一�元組碼程�概�分�的�时�能用R�进行程�概�分�"
 
-#~ msgid "bad character switch offsets"
-#~ msgstr "字符开关�移�对"
-
 #~ msgid "bad switch names"
 #~ msgstr "开关�字�对"
 
-#~ msgid "bad numeric switch offsets"
-#~ msgstr "数字开关�移设定�对"
-
 #~ msgid "constBuf must be a generic vector"
 #~ msgstr "constBuf必需是矢�类属"
 
@@ -7587,9 +7696,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title'必需为字符串"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "'text'必需为字符串"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s'的长度必需为一"
 
@@ -7620,9 +7726,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file'�是链结"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec'必需为�节字符"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr "数�框��了--列的长度%d�等于行的数目"
 
diff -Nru r-base-3.2.3/src/library/base/po/zh_TW.po r-base-3.3.1/src/library/base/po/zh_TW.po
--- r-base-3.2.3/src/library/base/po/zh_TW.po	2015-06-06 22:15:38.000000000 +0000
+++ r-base-3.3.1/src/library/base/po/zh_TW.po	2016-04-27 22:15:37.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.14.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-10-13 17:30+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -127,174 +127,175 @@
 msgid "problem in displaying '%ls'"
 msgstr "顯示 '%ls' 時發生�題"
 
-#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:334
-#: src/gnuwin32/extra.c:560 src/gnuwin32/extra.c:585 src/main/agrep.c:131
+#: src/gnuwin32/extra.c:116 src/gnuwin32/extra.c:158 src/gnuwin32/extra.c:348
+#: src/gnuwin32/extra.c:574 src/gnuwin32/extra.c:599 src/main/agrep.c:131
 #: src/main/agrep.c:135 src/main/agrep.c:776 src/main/agrep.c:781
-#: src/main/apply.c:327 src/main/apply.c:329 src/main/apply.c:332
-#: src/main/array.c:87 src/main/array.c:1241 src/main/array.c:1367
-#: src/main/array.c:1369 src/main/array.c:1370 src/main/array.c:1713
-#: src/main/array.c:1715 src/main/array.c:1717 src/main/attrib.c:190
+#: src/main/apply.c:330 src/main/apply.c:332 src/main/apply.c:335
+#: src/main/array.c:90 src/main/array.c:1272 src/main/array.c:1411
+#: src/main/array.c:1413 src/main/array.c:1414 src/main/array.c:1758
+#: src/main/array.c:1760 src/main/array.c:1762 src/main/attrib.c:190
 #: src/main/builtin.c:88 src/main/builtin.c:97 src/main/builtin.c:116
-#: src/main/builtin.c:118 src/main/builtin.c:148 src/main/builtin.c:559
-#: src/main/builtin.c:575 src/main/builtin.c:764 src/main/builtin.c:766
-#: src/main/builtin.c:768 src/main/character.c:159 src/main/character.c:162
-#: src/main/character.c:167 src/main/character.c:1086
-#: src/main/character.c:1090 src/main/character.c:1325
-#: src/main/character.c:1329 src/main/character.c:1390
-#: src/main/character.c:1393 src/main/connections.c:1208
-#: src/main/connections.c:1214 src/main/connections.c:1217
-#: src/main/connections.c:1221 src/main/connections.c:1367
-#: src/main/connections.c:1383 src/main/connections.c:1388
-#: src/main/connections.c:1989 src/main/connections.c:1995
-#: src/main/connections.c:1999 src/main/connections.c:2003
-#: src/main/connections.c:2008 src/main/connections.c:2659
-#: src/main/connections.c:2664 src/main/connections.c:2667
-#: src/main/connections.c:2670 src/main/connections.c:3053
-#: src/main/connections.c:3058 src/main/connections.c:3064
-#: src/main/connections.c:3067 src/main/connections.c:3071
-#: src/main/connections.c:3086 src/main/connections.c:3136
-#: src/main/connections.c:3141 src/main/connections.c:3145
-#: src/main/connections.c:3149 src/main/connections.c:3153
-#: src/main/connections.c:3159 src/main/connections.c:3207
-#: src/main/connections.c:3213 src/main/connections.c:3217
-#: src/main/connections.c:3268 src/main/connections.c:3271
-#: src/main/connections.c:3545 src/main/connections.c:3548
-#: src/main/connections.c:3551 src/main/connections.c:3557
-#: src/main/connections.c:3664 src/main/connections.c:3670
-#: src/main/connections.c:3673 src/main/connections.c:3825
-#: src/main/connections.c:3828 src/main/connections.c:3832
-#: src/main/connections.c:3835 src/main/connections.c:3956
-#: src/main/connections.c:4078 src/main/connections.c:4081
-#: src/main/connections.c:4418 src/main/connections.c:4443
-#: src/main/connections.c:4478 src/main/connections.c:4493
-#: src/main/connections.c:4501 src/main/connections.c:4527
-#: src/main/connections.c:4673 src/main/connections.c:4677
-#: src/main/connections.c:4805 src/main/connections.c:4807
-#: src/main/connections.c:4809 src/main/connections.c:4837
-#: src/main/connections.c:4975 src/main/connections.c:5004
-#: src/main/connections.c:5008 src/main/connections.c:5012
-#: src/main/connections.c:5016 src/main/context.c:611 src/main/context.c:620
-#: src/main/context.c:624 src/main/datetime.c:785 src/main/datetime.c:875
-#: src/main/datetime.c:877 src/main/datetime.c:881 src/main/datetime.c:1042
-#: src/main/datetime.c:1044 src/main/datetime.c:1249 src/main/debug.c:241
-#: src/main/deparse.c:407 src/main/dotcode.c:496 src/main/dotcode.c:500
-#: src/main/dotcode.c:505 src/main/dounzip.c:323 src/main/dounzip.c:330
-#: src/main/dounzip.c:340 src/main/dounzip.c:345 src/main/dounzip.c:349
-#: src/main/dounzip.c:353 src/main/envir.c:1750 src/main/envir.c:1753
-#: src/main/envir.c:1874 src/main/envir.c:1879 src/main/envir.c:1943
-#: src/main/envir.c:1959 src/main/envir.c:1965 src/main/envir.c:2077
-#: src/main/envir.c:2085 src/main/envir.c:2092 src/main/envir.c:2103
-#: src/main/envir.c:2335 src/main/envir.c:2456 src/main/envir.c:2752
-#: src/main/envir.c:3006 src/main/envir.c:3020 src/main/envir.c:3027
-#: src/main/envir.c:3043 src/main/envir.c:3626 src/main/errors.c:1044
-#: src/main/eval.c:396 src/main/eval.c:405 src/main/eval.c:408
-#: src/main/grep.c:780 src/main/grep.c:785 src/main/grep.c:1079
-#: src/main/grep.c:1081 src/main/grep.c:1083 src/main/grep.c:1528
-#: src/main/grep.c:1532 src/main/grep.c:1537 src/main/grep.c:2345
-#: src/main/grep.c:2350 src/main/grep.c:2649 src/main/grep.c:2654
-#: src/main/memory.c:3796 src/main/paste.c:96 src/main/paste.c:392
-#: src/main/paste.c:399 src/main/paste.c:406 src/main/paste.c:411
-#: src/main/paste.c:416 src/main/paste.c:421 src/main/paste.c:424
-#: src/main/paste.c:432 src/main/paste.c:599 src/main/paste.c:604
+#: src/main/builtin.c:118 src/main/builtin.c:149 src/main/builtin.c:569
+#: src/main/builtin.c:585 src/main/builtin.c:773 src/main/builtin.c:775
+#: src/main/builtin.c:777 src/main/character.c:239 src/main/character.c:242
+#: src/main/character.c:247 src/main/character.c:788 src/main/character.c:791
+#: src/main/character.c:1289 src/main/character.c:1293
+#: src/main/character.c:1528 src/main/character.c:1532
+#: src/main/character.c:1593 src/main/character.c:1596
+#: src/main/connections.c:1208 src/main/connections.c:1214
+#: src/main/connections.c:1217 src/main/connections.c:1221
+#: src/main/connections.c:1367 src/main/connections.c:1383
+#: src/main/connections.c:1388 src/main/connections.c:1989
+#: src/main/connections.c:1995 src/main/connections.c:1999
+#: src/main/connections.c:2003 src/main/connections.c:2008
+#: src/main/connections.c:2659 src/main/connections.c:2664
+#: src/main/connections.c:2667 src/main/connections.c:2670
+#: src/main/connections.c:3053 src/main/connections.c:3058
+#: src/main/connections.c:3064 src/main/connections.c:3067
+#: src/main/connections.c:3071 src/main/connections.c:3086
+#: src/main/connections.c:3135 src/main/connections.c:3140
+#: src/main/connections.c:3144 src/main/connections.c:3148
+#: src/main/connections.c:3152 src/main/connections.c:3158
+#: src/main/connections.c:3203 src/main/connections.c:3209
+#: src/main/connections.c:3213 src/main/connections.c:3264
+#: src/main/connections.c:3267 src/main/connections.c:3543
+#: src/main/connections.c:3546 src/main/connections.c:3549
+#: src/main/connections.c:3555 src/main/connections.c:3662
+#: src/main/connections.c:3668 src/main/connections.c:3671
+#: src/main/connections.c:3823 src/main/connections.c:3826
+#: src/main/connections.c:3830 src/main/connections.c:3833
+#: src/main/connections.c:3954 src/main/connections.c:4085
+#: src/main/connections.c:4088 src/main/connections.c:4425
+#: src/main/connections.c:4450 src/main/connections.c:4485
+#: src/main/connections.c:4500 src/main/connections.c:4508
+#: src/main/connections.c:4534 src/main/connections.c:4680
+#: src/main/connections.c:4684 src/main/connections.c:4814
+#: src/main/connections.c:4816 src/main/connections.c:4818
+#: src/main/connections.c:4846 src/main/connections.c:4980
+#: src/main/connections.c:5019 src/main/connections.c:5024
+#: src/main/connections.c:5029 src/main/connections.c:5050
+#: src/main/context.c:607 src/main/context.c:616 src/main/context.c:620
+#: src/main/datetime.c:781 src/main/datetime.c:869 src/main/datetime.c:872
+#: src/main/datetime.c:876 src/main/datetime.c:1043 src/main/datetime.c:1045
+#: src/main/datetime.c:1250 src/main/debug.c:245 src/main/deparse.c:408
+#: src/main/dotcode.c:496 src/main/dotcode.c:500 src/main/dotcode.c:505
+#: src/main/dounzip.c:323 src/main/dounzip.c:330 src/main/dounzip.c:340
+#: src/main/dounzip.c:345 src/main/dounzip.c:349 src/main/dounzip.c:353
+#: src/main/envir.c:1752 src/main/envir.c:1755 src/main/envir.c:1876
+#: src/main/envir.c:1881 src/main/envir.c:1945 src/main/envir.c:1961
+#: src/main/envir.c:1967 src/main/envir.c:2079 src/main/envir.c:2087
+#: src/main/envir.c:2094 src/main/envir.c:2105 src/main/envir.c:2337
+#: src/main/envir.c:2458 src/main/envir.c:2755 src/main/envir.c:3022
+#: src/main/envir.c:3036 src/main/envir.c:3043 src/main/envir.c:3059
+#: src/main/envir.c:3642 src/main/errors.c:1011 src/main/eval.c:454
+#: src/main/eval.c:463 src/main/eval.c:466 src/main/grep.c:780
+#: src/main/grep.c:785 src/main/grep.c:1079 src/main/grep.c:1081
+#: src/main/grep.c:1083 src/main/grep.c:1528 src/main/grep.c:1532
+#: src/main/grep.c:1537 src/main/grep.c:2345 src/main/grep.c:2350
+#: src/main/grep.c:2652 src/main/grep.c:2657 src/main/memory.c:3823
+#: src/main/paste.c:96 src/main/paste.c:392 src/main/paste.c:399
+#: src/main/paste.c:406 src/main/paste.c:411 src/main/paste.c:416
+#: src/main/paste.c:421 src/main/paste.c:424 src/main/paste.c:432
+#: src/main/paste.c:437 src/main/paste.c:619 src/main/paste.c:624
 #: src/main/platform.c:306 src/main/platform.c:308 src/main/platform.c:310
 #: src/main/platform.c:326 src/main/platform.c:337 src/main/platform.c:390
-#: src/main/platform.c:392 src/main/platform.c:705 src/main/platform.c:707
-#: src/main/platform.c:796 src/main/platform.c:1134 src/main/platform.c:1140
-#: src/main/platform.c:1143 src/main/platform.c:1146 src/main/platform.c:1149
-#: src/main/platform.c:1152 src/main/platform.c:1155 src/main/platform.c:1158
-#: src/main/platform.c:1255 src/main/platform.c:1258 src/main/platform.c:1261
-#: src/main/platform.c:1299 src/main/platform.c:1357 src/main/platform.c:1360
-#: src/main/platform.c:1569 src/main/platform.c:1572 src/main/platform.c:1575
-#: src/main/platform.c:1611 src/main/platform.c:1614 src/main/platform.c:1617
-#: src/main/platform.c:1700 src/main/platform.c:1716 src/main/platform.c:1749
-#: src/main/platform.c:1751 src/main/platform.c:1822 src/main/platform.c:1906
-#: src/main/platform.c:2199 src/main/platform.c:2259 src/main/platform.c:2436
-#: src/main/platform.c:2439 src/main/platform.c:2442 src/main/platform.c:2445
-#: src/main/platform.c:2448 src/main/platform.c:2451 src/main/platform.c:2656
-#: src/main/platform.c:2659 src/main/platform.c:2662 src/main/platform.c:2665
-#: src/main/platform.c:2668 src/main/platform.c:2671 src/main/platform.c:2749
-#: src/main/platform.c:2757 src/main/platform.c:2793 src/main/platform.c:2843
-#: src/main/print.c:242 src/main/print.c:248 src/main/print.c:270
-#: src/main/print.c:276 src/main/print.c:283 src/main/random.c:467
-#: src/main/random.c:471 src/main/random.c:478 src/main/random.c:506
-#: src/main/saveload.c:1950 src/main/saveload.c:1953 src/main/saveload.c:1956
-#: src/main/saveload.c:2072 src/main/saveload.c:2252 src/main/saveload.c:2257
-#: src/main/saveload.c:2260 src/main/saveload.c:2364 src/main/scan.c:684
-#: src/main/scan.c:853 src/main/scan.c:867 src/main/scan.c:871
-#: src/main/scan.c:873 src/main/scan.c:884 src/main/scan.c:911
-#: src/main/scan.c:914 src/main/scan.c:917 src/main/scan.c:972
-#: src/main/seq.c:622 src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666
-#: src/main/seq.c:670 src/main/seq.c:676 src/main/seq.c:684
-#: src/main/sort.c:175 src/main/sysutils.c:591 src/main/sysutils.c:595
-#: src/main/sysutils.c:599 src/main/sysutils.c:605 src/main/sysutils.c:609
-#: src/main/sysutils.c:1781 src/main/sysutils.c:1785 src/main/unique.c:969
-#: src/main/unique.c:1277 src/main/unique.c:1281 src/main/unique.c:1291
-#: src/main/unique.c:1685 src/main/util.c:638 src/main/util.c:641
-#: src/main/util.c:1940 src/main/util.c:2161 src/main/util.c:2162
-#: src/main/util.c:2163 src/main/util.c:2180 src/main/util.c:2204
-#: src/main/util.c:2208 src/main/util.c:2210 src/main/util.c:2235
-#: src/main/util.c:2237 src/main/util.c:2239 src/main/util.c:2242
+#: src/main/platform.c:392 src/main/platform.c:708 src/main/platform.c:710
+#: src/main/platform.c:800 src/main/platform.c:1138 src/main/platform.c:1144
+#: src/main/platform.c:1147 src/main/platform.c:1150 src/main/platform.c:1153
+#: src/main/platform.c:1156 src/main/platform.c:1159 src/main/platform.c:1162
+#: src/main/platform.c:1259 src/main/platform.c:1262 src/main/platform.c:1265
+#: src/main/platform.c:1303 src/main/platform.c:1361 src/main/platform.c:1364
+#: src/main/platform.c:1573 src/main/platform.c:1576 src/main/platform.c:1579
+#: src/main/platform.c:1615 src/main/platform.c:1618 src/main/platform.c:1621
+#: src/main/platform.c:1657 src/main/platform.c:1690 src/main/platform.c:1692
+#: src/main/platform.c:1763 src/main/platform.c:1848 src/main/platform.c:2089
+#: src/main/platform.c:2149 src/main/platform.c:2334 src/main/platform.c:2337
+#: src/main/platform.c:2340 src/main/platform.c:2343 src/main/platform.c:2346
+#: src/main/platform.c:2349 src/main/platform.c:2555 src/main/platform.c:2558
+#: src/main/platform.c:2561 src/main/platform.c:2564 src/main/platform.c:2567
+#: src/main/platform.c:2570 src/main/platform.c:2648 src/main/platform.c:2656
+#: src/main/platform.c:2692 src/main/platform.c:2742 src/main/print.c:235
+#: src/main/print.c:241 src/main/print.c:263 src/main/print.c:269
+#: src/main/print.c:276 src/main/random.c:470 src/main/random.c:474
+#: src/main/random.c:481 src/main/random.c:509 src/main/saveload.c:1952
+#: src/main/saveload.c:1955 src/main/saveload.c:1958 src/main/saveload.c:2074
+#: src/main/saveload.c:2254 src/main/saveload.c:2259 src/main/saveload.c:2262
+#: src/main/saveload.c:2366 src/main/scan.c:684 src/main/scan.c:853
+#: src/main/scan.c:867 src/main/scan.c:871 src/main/scan.c:873
+#: src/main/scan.c:884 src/main/scan.c:911 src/main/scan.c:914
+#: src/main/scan.c:917 src/main/scan.c:972 src/main/seq.c:622
+#: src/main/seq.c:627 src/main/seq.c:635 src/main/seq.c:666 src/main/seq.c:670
+#: src/main/seq.c:676 src/main/seq.c:684 src/main/sort.c:175
+#: src/main/sysutils.c:597 src/main/sysutils.c:601 src/main/sysutils.c:605
+#: src/main/sysutils.c:611 src/main/sysutils.c:615 src/main/sysutils.c:1787
+#: src/main/sysutils.c:1791 src/main/unique.c:1029 src/main/unique.c:1337
+#: src/main/unique.c:1341 src/main/unique.c:1351 src/main/unique.c:1747
+#: src/main/util.c:636 src/main/util.c:639 src/main/util.c:1379
+#: src/main/util.c:1393 src/main/util.c:1975 src/main/util.c:2198
+#: src/main/util.c:2199 src/main/util.c:2200 src/main/util.c:2217
 #: src/main/util.c:2245 src/main/util.c:2249 src/main/util.c:2251
-#: src/modules/X11/devX11.c:3241 src/modules/X11/devX11.c:3244
-#: src/modules/X11/devX11.c:3247 src/modules/X11/devX11.c:3271
-#: src/modules/internet/internet.c:453 src/modules/internet/internet.c:459
-#: src/modules/internet/internet.c:465 src/modules/internet/internet.c:468
-#: src/modules/internet/internet.c:472 src/modules/internet/internet.c:476
-#: src/modules/internet/libcurl.c:316 src/modules/internet/libcurl.c:320
-#: src/modules/internet/libcurl.c:325 src/modules/internet/libcurl.c:328
-#: src/modules/internet/libcurl.c:332 src/modules/lapack/Lapack.c:155
-#: src/modules/lapack/Lapack.c:261 src/modules/lapack/Lapack.c:709
-#: src/modules/lapack/Lapack.c:818 src/modules/lapack/Lapack.c:880
-#: src/modules/lapack/Lapack.c:1215 src/unix/sys-std.c:1220
-#: src/unix/sys-std.c:1243
+#: src/main/util.c:2277 src/main/util.c:2279 src/main/util.c:2281
+#: src/main/util.c:2284 src/main/util.c:2287 src/main/util.c:2291
+#: src/main/util.c:2293 src/modules/X11/devX11.c:3247
+#: src/modules/X11/devX11.c:3250 src/modules/X11/devX11.c:3253
+#: src/modules/X11/devX11.c:3277 src/modules/internet/internet.c:453
+#: src/modules/internet/internet.c:459 src/modules/internet/internet.c:465
+#: src/modules/internet/internet.c:468 src/modules/internet/internet.c:472
+#: src/modules/internet/internet.c:477 src/modules/internet/libcurl.c:414
+#: src/modules/internet/libcurl.c:418 src/modules/internet/libcurl.c:423
+#: src/modules/internet/libcurl.c:426 src/modules/internet/libcurl.c:430
+#: src/modules/lapack/Lapack.c:155 src/modules/lapack/Lapack.c:261
+#: src/modules/lapack/Lapack.c:709 src/modules/lapack/Lapack.c:818
+#: src/modules/lapack/Lapack.c:880 src/modules/lapack/Lapack.c:1215
+#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "'%s' 引數�正確"
 
-#: src/gnuwin32/extra.c:182
+#: src/gnuwin32/extra.c:183
 msgid "unsupported version of Windows"
 msgstr "�支�的 Windows 版本"
 
-#: src/gnuwin32/extra.c:299 src/gnuwin32/extra.c:310
+#: src/gnuwin32/extra.c:313 src/gnuwin32/extra.c:324
 msgid "incorrect argument"
 msgstr "引數�正確"
 
-#: src/gnuwin32/extra.c:302
+#: src/gnuwin32/extra.c:316
 msgid "don't be silly!: your machine has a 4Gb address limit"
 msgstr "別傻了�：您的機器有 4Gb 的��上�"
 
-#: src/gnuwin32/extra.c:306
+#: src/gnuwin32/extra.c:320
 msgid "cannot decrease memory limit: ignored"
 msgstr "無法減少記憶體�制：已忽略"
 
-#: src/gnuwin32/extra.c:413 src/gnuwin32/extra.c:514 src/main/util.c:960
+#: src/gnuwin32/extra.c:427 src/gnuwin32/extra.c:528 src/main/util.c:962
 msgid "'path' must be a character vector"
 msgstr "'path' 必須是字元��"
 
-#: src/gnuwin32/extra.c:562 src/gnuwin32/extra.c:564 src/gnuwin32/extra.c:587
-#: src/gnuwin32/extra.c:589 src/gnuwin32/extra.c:624 src/main/gevents.c:61
+#: src/gnuwin32/extra.c:576 src/gnuwin32/extra.c:578 src/gnuwin32/extra.c:601
+#: src/gnuwin32/extra.c:603 src/gnuwin32/extra.c:638 src/main/gevents.c:61
 #: src/main/gevents.c:98
 msgid "invalid device"
 msgstr "無效�置"
 
-#: src/gnuwin32/extra.c:565
+#: src/gnuwin32/extra.c:579
 msgid "requires SDI mode"
 msgstr "需�用 SDI 模�"
 
-#: src/gnuwin32/extra.c:618 src/main/gevents.c:58 src/main/gevents.c:95
+#: src/gnuwin32/extra.c:632 src/main/gevents.c:58 src/main/gevents.c:95
 msgid "invalid graphical device number"
 msgstr "無效的繪圖�置號碼"
 
-#: src/gnuwin32/extra.c:628
+#: src/gnuwin32/extra.c:642
 msgid "bad device"
 msgstr "�當�置"
 
-#: src/gnuwin32/extra.c:782 src/gnuwin32/extra.c:790
+#: src/gnuwin32/extra.c:796 src/gnuwin32/extra.c:804
 #, fuzzy
 msgid "invalid input in 'Rmbstowcs'"
 msgstr "Rmbstowcs 中的輸入無效"
 
-#: src/gnuwin32/extra.c:813 src/main/platform.c:1332
+#: src/gnuwin32/extra.c:827 src/main/platform.c:1336
 msgid "file choice cancelled"
 msgstr "已�消檔案�擇"
 
@@ -336,184 +337,183 @@
 msgid "'names' is not a character vector"
 msgstr "'fmt' 並�字元��"
 
-#: src/gnuwin32/sys-win32.c:179
+#: src/gnuwin32/sys-win32.c:180
 msgid "character string expected as first argument"
 msgstr "第一個引數應當是字串"
 
-#: src/gnuwin32/sys-win32.c:188
+#: src/gnuwin32/sys-win32.c:189
 msgid "character string expected as third argument"
 msgstr "第三個引數應當是字串"
 
-#: src/gnuwin32/sys-win32.c:254 src/unix/sys-unix.c:295
+#: src/gnuwin32/sys-win32.c:255 src/unix/sys-unix.c:312
 #, c-format
 msgid "running command '%s' had status %d"
 msgstr "執行中命令 '%s' 已有狀態 %d"
 
-#: src/gnuwin32/system.c:122 src/unix/sys-unix.c:423
+#: src/gnuwin32/system.c:121 src/unix/sys-unix.c:440
 msgid "reached session elapsed time limit"
 msgstr "�到了作業階段經�時間的�制"
 
-#: src/gnuwin32/system.c:124 src/unix/sys-unix.c:425
+#: src/gnuwin32/system.c:123 src/unix/sys-unix.c:442
 msgid "reached elapsed time limit"
 msgstr "�到了經�時間的�制"
 
-#: src/gnuwin32/system.c:130 src/unix/sys-unix.c:431
+#: src/gnuwin32/system.c:129 src/unix/sys-unix.c:448
 msgid "reached session CPU time limit"
 msgstr "�到了作業階段 CPU 時間的�制"
 
-#: src/gnuwin32/system.c:132 src/unix/sys-unix.c:433
+#: src/gnuwin32/system.c:131 src/unix/sys-unix.c:450
 msgid "reached CPU time limit"
 msgstr "�到了 CPU 時間的�制"
 
-#: src/gnuwin32/system.c:157
+#: src/gnuwin32/system.c:156
 #, c-format
 msgid "Fatal error: %s\n"
 msgstr "嚴�錯誤：%s\n"
 
-#: src/gnuwin32/system.c:335 src/unix/sys-std.c:866
+#: src/gnuwin32/system.c:334 src/unix/sys-std.c:866
 #, c-format
 msgid "encoding '%s' is not recognised"
 msgstr "編碼 '%s' 無法確�"
 
-#: src/gnuwin32/system.c:341 src/unix/sys-std.c:872
+#: src/gnuwin32/system.c:340 src/unix/sys-std.c:872
 #, c-format
 msgid "<ERROR: re-encoding failure from encoding '%s'>\n"
 msgstr "<錯誤：從編碼 '%s' �新編碼時失敗>\n"
 
-#: src/gnuwin32/system.c:555 src/gnuwin32/system.c:1047
-#: src/gnuwin32/system.c:1059 src/main/connections.c:581
-#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1961
+#: src/gnuwin32/system.c:562 src/gnuwin32/system.c:1058
+#: src/gnuwin32/system.c:1070 src/main/connections.c:581
+#: src/main/connections.c:586 src/main/dounzip.c:178 src/main/saveload.c:1963
 #: src/main/serialize.c:2598 src/main/serialize.c:2603
-#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:321
-#: src/unix/system.c:341
+#: src/main/serialize.c:2688 src/main/serialize.c:2733 src/unix/system.c:328
 #, c-format
 msgid "cannot open file '%s': %s"
 msgstr "無法開啟檔案 '%s' ：%s"
 
-#: src/gnuwin32/system.c:569
+#: src/gnuwin32/system.c:576
 #, c-format
 msgid "file.show(): file '%s' does not exist\n"
 msgstr "file.show(): 檔案 '%s' �存在\n"
 
-#: src/gnuwin32/system.c:968
+#: src/gnuwin32/system.c:979
 #, fuzzy, c-format
 msgid "WARNING: R_MAX_MEM_SIZE value is invalid: ignored\n"
 msgstr "警告：'%s' 值無效：已忽略"
 
-#: src/gnuwin32/system.c:1000
+#: src/gnuwin32/system.c:1011
 msgid "WARNING: no max-mem-size given\n"
 msgstr "警告: max-mem-size 沒有定義\n"
 
-#: src/gnuwin32/system.c:1007
+#: src/gnuwin32/system.c:1018
 #, c-format
 msgid "WARNING: --max-mem-size value is invalid: ignored\n"
 msgstr "警告: --max-mem-size 值�正確: 忽略�用\n"
 
-#: src/gnuwin32/system.c:1010
+#: src/gnuwin32/system.c:1021
 #, c-format
 msgid "WARNING: --max-mem-size=%lu%c: too large and ignored\n"
 msgstr "警告：--max-mem-size=%lu%c：太大因而忽略\n"
 
-#: src/gnuwin32/system.c:1016
+#: src/gnuwin32/system.c:1027
 #, c-format
 msgid "WARNING: --max-mem-size=%4.1fM: too small and ignored\n"
 msgstr "警告：--max-mem-size=%4.1fM：太�因而忽略\n"
 
-#: src/gnuwin32/system.c:1021
+#: src/gnuwin32/system.c:1032
 #, c-format
 msgid "WARNING: --max-mem-size=%4.0fM: too large and taken as %uM\n"
 msgstr "警告：--max-mem-size=%4.0fM：太大因而視為 %uM\n"
 
-#: src/gnuwin32/system.c:1037
+#: src/gnuwin32/system.c:1048
 #, fuzzy, c-format
 msgid "option '%s' requires an argument"
 msgstr "二元�算需�兩個引數"
 
-#: src/gnuwin32/system.c:1068
+#: src/gnuwin32/system.c:1079
 #, fuzzy, c-format
 msgid "option '%s' requires a non-empty argument"
 msgstr "二元�算需�兩個引數"
 
-#: src/gnuwin32/system.c:1076 src/unix/system.c:360
+#: src/gnuwin32/system.c:1087 src/unix/system.c:347
 #, c-format
 msgid "WARNING: '-e %s' omitted as input is too long\n"
 msgstr "警告：'-e %s' 因為輸入太長而被�略\n"
 
-#: src/gnuwin32/system.c:1080 src/unix/system.c:373
+#: src/gnuwin32/system.c:1091 src/unix/system.c:360
 #, c-format
 msgid "WARNING: unknown option '%s'\n"
 msgstr "警告: 沒有 '%s' 這樣的�項\n"
 
-#: src/gnuwin32/system.c:1102 src/unix/system.c:377
+#: src/gnuwin32/system.c:1113 src/unix/system.c:364
 #, c-format
 msgid "ARGUMENT '%s' __ignored__\n"
 msgstr "引數 '%s' 忽略�用\n"
 
-#: src/gnuwin32/system.c:1108 src/unix/system.c:384
+#: src/gnuwin32/system.c:1119 src/unix/system.c:371
 msgid "cannot use -e with -f or --file"
 msgstr "無法將 -e 與 -f 或 --file 共�使用"
 
-#: src/gnuwin32/system.c:1126
+#: src/gnuwin32/system.c:1137
 msgid "creation of tmpfile failed -- set TMPDIR suitably?"
 msgstr "建立暫存檔時失敗 -- 已�當設定了 TMPDIR？"
 
-#: src/gnuwin32/system.c:1145 src/unix/system.c:435
+#: src/gnuwin32/system.c:1156 src/unix/system.c:422
 msgid "you must specify '--save', '--no-save' or '--vanilla'"
 msgstr "您必須指定 '--save'�'--no-save' 或 '--vanilla' 其中的一個"
 
-#: src/gnuwin32/system.c:1150
+#: src/gnuwin32/system.c:1161
 msgid ""
 "impossible to create 'reader thread'; you must free some system resources"
 msgstr "無法建立 'reader thread'；您必須釋放一些系統資�"
 
-#: src/include/Errormsg.h:25 src/main/subscript.c:390 src/main/subscript.c:408
-#: src/main/subscript.c:432 src/main/subscript.c:471 src/main/subscript.c:652
-#: src/main/subscript.c:691 src/main/subscript.c:834
+#: src/include/Errormsg.h:27 src/main/subscript.c:383 src/main/subscript.c:401
+#: src/main/subscript.c:425 src/main/subscript.c:464 src/main/subscript.c:662
+#: src/main/subscript.c:701 src/main/subscript.c:844
 msgid "subscript out of bounds"
 msgstr "下標超出邊界"
 
-#: src/include/Errormsg.h:26
+#: src/include/Errormsg.h:28
 #, c-format
 msgid "object of type '%s' is not subsettable"
 msgstr "'%s' 類型的物件無法具有�集�"
 
-#: src/main/CommandLineArgs.c:170
+#: src/main/CommandLineArgs.c:171
 msgid "WARNING: no value given for --encoding"
 msgstr "警告：沒有設定 --enconding 的值"
 
-#: src/main/CommandLineArgs.c:195
+#: src/main/CommandLineArgs.c:196
 #, c-format
 msgid "WARNING: option '%s' no longer supported"
 msgstr "警告：��支��項 '%s'"
 
-#: src/main/CommandLineArgs.c:206
+#: src/main/CommandLineArgs.c:207
 #, c-format
 msgid "WARNING: no value given for '%s'"
 msgstr "警告：沒有設定 '%s' 的值"
 
-#: src/main/CommandLineArgs.c:216
+#: src/main/CommandLineArgs.c:217
 #, c-format
 msgid "WARNING: '%s' value is invalid: ignored"
 msgstr "警告：'%s' 值無效：已忽略"
 
-#: src/main/CommandLineArgs.c:220
+#: src/main/CommandLineArgs.c:221
 #, c-format
 msgid "WARNING: %s: too large and ignored"
 msgstr "警告：%s：�大因而忽略"
 
-#: src/main/CommandLineArgs.c:234
+#: src/main/CommandLineArgs.c:235
 msgid "WARNING: no value given for '--max-ppsize'"
 msgstr "警告：沒有設定 '--max-ppsize' 的值"
 
-#: src/main/CommandLineArgs.c:239
+#: src/main/CommandLineArgs.c:240
 msgid "WARNING: '--max-ppsize' value is negative: ignored"
 msgstr "警告：'--max-ppsize' 值是負數：已忽略"
 
-#: src/main/CommandLineArgs.c:241
+#: src/main/CommandLineArgs.c:242
 msgid "WARNING: '--max-ppsize' value is too small: ignored"
 msgstr "警告：'--max-ppsize' 的值太�：已忽略"
 
-#: src/main/CommandLineArgs.c:244
+#: src/main/CommandLineArgs.c:245
 msgid "WARNING: '--max-ppsize' value is too large: ignored"
 msgstr "警告：'--max-ppsize' 的值太大：已忽略"
 
@@ -619,7 +619,7 @@
 msgid "could not allocate space for 'name'"
 msgstr "無法為 'name' �置空間"
 
-#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:760
+#: src/main/Rdynload.c:881 src/main/Rdynload.c:897 src/main/util.c:762
 msgid "character argument expected"
 msgstr "需�字元引數"
 
@@ -674,7 +674,7 @@
 msgid "problem in setting variable '%s' in Renviron"
 msgstr "設定時�時發生�題"
 
-#: src/main/Renviron.c:311 src/main/objects.c:1147 src/main/raw.c:150
+#: src/main/Renviron.c:311 src/main/objects.c:1174 src/main/raw.c:155
 #, fuzzy, c-format
 msgid "argument '%s' must be a character string"
 msgstr "引數 'code' 必須是字串"
@@ -705,9 +705,9 @@
 msgid "invalid multibyte format string"
 msgstr "無效的多�元組格�字串"
 
-#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1088
-#: src/main/character.c:1092 src/main/grep.c:782 src/main/grep.c:1530
-#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2651
+#: src/main/agrep.c:133 src/main/agrep.c:778 src/main/character.c:1291
+#: src/main/character.c:1295 src/main/grep.c:782 src/main/grep.c:1530
+#: src/main/grep.c:1534 src/main/grep.c:2347 src/main/grep.c:2654
 #, c-format
 msgid "argument '%s' has length > 1 and only the first element will be used"
 msgstr "引數 '%s' 長度 > 1 且�有第一個元素將被使用"
@@ -717,7 +717,7 @@
 msgstr "'pattern' 必須是�空字串"
 
 #: src/main/agrep.c:201 src/main/agrep.c:829 src/main/grep.c:853
-#: src/main/grep.c:2405 src/main/grep.c:2690
+#: src/main/grep.c:2405 src/main/grep.c:2707
 msgid "regular expression is invalid in this locale"
 msgstr "正�表示���用於此語言環境"
 
@@ -728,8 +728,8 @@
 
 #: src/main/agrep.c:239 src/main/agrep.c:874 src/main/grep.c:233
 #: src/main/grep.c:323 src/main/grep.c:434 src/main/grep.c:590
-#: src/main/grep.c:907 src/main/grep.c:2507 src/main/grep.c:2576
-#: src/main/grep.c:2727
+#: src/main/grep.c:907 src/main/grep.c:2510 src/main/grep.c:2579
+#: src/main/grep.c:2744
 #, c-format
 msgid "input string %d is invalid in this locale"
 msgstr "輸入的字串 %d ��用於此語言環境"
@@ -737,7 +737,7 @@
 #: src/main/agrep.c:526 src/main/agrep.c:766 src/main/grep.c:159
 #: src/main/grep.c:773 src/main/grep.c:775 src/main/grep.c:1065
 #: src/main/grep.c:1073 src/main/grep.c:1521 src/main/grep.c:1523
-#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2639
+#: src/main/grep.c:2337 src/main/grep.c:2339 src/main/grep.c:2642
 #, c-format
 msgid "argument '%s' will be ignored"
 msgstr "引數 '%s' 將被忽略"
@@ -752,7 +752,7 @@
 msgid "input string y[%d] is invalid in this locale"
 msgstr "輸入字串 y[%d] 在這個語�無效"
 
-#: src/main/agrep.c:835 src/main/grep.c:2696
+#: src/main/agrep.c:835 src/main/grep.c:2713
 #, c-format
 msgid "regcomp error: '%s'"
 msgstr "正�表示�編譯錯誤：'%s'"
@@ -762,29 +762,29 @@
 msgid "'FUN.VALUE' must be a vector"
 msgstr "FUN.VALUE 必須是��"
 
-#: src/main/apply.c:100 src/main/array.c:480 src/main/character.c:644
-#: src/main/connections.c:3553 src/main/context.c:657 src/main/context.c:676
-#: src/main/datetime.c:685 src/main/datetime.c:787 src/main/datetime.c:1046
-#: src/main/dotcode.c:222 src/main/errors.c:943 src/main/errors.c:976
-#: src/main/errors.c:1079 src/main/errors.c:1104 src/main/errors.c:1109
-#: src/main/errors.c:1382 src/main/identical.c:66 src/main/identical.c:67
-#: src/main/identical.c:68 src/main/identical.c:69 src/main/identical.c:70
-#: src/main/platform.c:3083 src/main/seq.c:191 src/main/seq.c:347
-#: src/main/seq.c:352 src/main/seq.c:356 src/main/seq.c:397 src/main/seq.c:401
-#: src/main/seq.c:405 src/main/sort.c:1224 src/main/sort.c:1307
-#: src/main/sort.c:1311 src/main/sort.c:1318 src/main/sort.c:1393
-#: src/main/source.c:225 src/main/summary.c:901 src/main/sysutils.c:250
-#: src/main/util.c:1049 src/main/util.c:1054 src/main/util.c:1061
-#: src/main/util.c:1064 src/main/util.c:2000 src/modules/X11/devX11.c:3142
-#: src/modules/X11/devX11.c:3169 src/modules/X11/devX11.c:3174
-#: src/modules/X11/devX11.c:3179 src/modules/X11/devX11.c:3189
-#: src/modules/X11/devX11.c:3194 src/modules/X11/devX11.c:3198
-#: src/modules/X11/devX11.c:3202
+#: src/main/apply.c:100 src/main/array.c:506 src/main/character.c:847
+#: src/main/character.c:1655 src/main/connections.c:3551
+#: src/main/context.c:653 src/main/context.c:672 src/main/datetime.c:681
+#: src/main/datetime.c:783 src/main/datetime.c:1047 src/main/dotcode.c:222
+#: src/main/errors.c:910 src/main/errors.c:943 src/main/errors.c:1049
+#: src/main/errors.c:1074 src/main/errors.c:1079 src/main/errors.c:1349
+#: src/main/identical.c:66 src/main/identical.c:67 src/main/identical.c:68
+#: src/main/identical.c:69 src/main/identical.c:70 src/main/platform.c:2982
+#: src/main/seq.c:192 src/main/seq.c:343 src/main/seq.c:348 src/main/seq.c:352
+#: src/main/seq.c:397 src/main/seq.c:401 src/main/seq.c:405
+#: src/main/sort.c:1244 src/main/sort.c:1327 src/main/sort.c:1331
+#: src/main/sort.c:1338 src/main/source.c:225 src/main/summary.c:954
+#: src/main/sysutils.c:250 src/main/util.c:1051 src/main/util.c:1056
+#: src/main/util.c:1063 src/main/util.c:1066 src/main/util.c:2035
+#: src/modules/X11/devX11.c:3148 src/modules/X11/devX11.c:3175
+#: src/modules/X11/devX11.c:3180 src/modules/X11/devX11.c:3185
+#: src/modules/X11/devX11.c:3195 src/modules/X11/devX11.c:3200
+#: src/modules/X11/devX11.c:3204 src/modules/X11/devX11.c:3208
 #, c-format
 msgid "invalid '%s' value"
 msgstr "'%s' 值�正確"
 
-#: src/main/apply.c:103 src/main/complex.c:761
+#: src/main/apply.c:103 src/main/complex.c:753
 msgid "invalid length"
 msgstr "長度�正確"
 
@@ -820,7 +820,7 @@
 msgid "dimnames(<value>) is neither NULL nor list of length %d"
 msgstr "dimnames(<值>) 既�是空值也�是長度 %d 的串列"
 
-#: src/main/arithmetic.c:42
+#: src/main/arithmetic.c:42 src/main/eval.c:3633
 msgid "NaNs produced"
 msgstr "產生了 NaNs"
 
@@ -833,218 +833,218 @@
 msgid "probable complete loss of accuracy in modulus"
 msgstr "係數的精確度很�能完全�失"
 
-#: src/main/arithmetic.c:294
+#: src/main/arithmetic.c:298
 msgid "NAs produced by integer overflow"
 msgstr "整數�上溢�產生了 NA"
 
-#: src/main/arithmetic.c:495
+#: src/main/arithmetic.c:499
 msgid "operator needs one or two arguments"
 msgstr "�算�需�一或兩個引數"
 
-#: src/main/arithmetic.c:511
+#: src/main/arithmetic.c:515
 msgid "non-numeric argument to binary operator"
 msgstr "二元�算�中有�數值引數"
 
-#: src/main/arithmetic.c:572 src/main/relop.c:227
+#: src/main/arithmetic.c:576 src/main/relop.c:221
 msgid "non-conformable arrays"
 msgstr "�調和陣列"
 
-#: src/main/arithmetic.c:615
+#: src/main/arithmetic.c:619
 msgid "non-conformable time-series"
 msgstr "�調和時間�列"
 
-#: src/main/arithmetic.c:637 src/main/logic.c:134 src/main/relop.c:166
-#: src/main/relop.c:265
+#: src/main/arithmetic.c:641 src/main/logic.c:135 src/main/relop.c:160
+#: src/main/relop.c:259
 msgid "longer object length is not a multiple of shorter object length"
 msgstr "較長的物件長度並�較短物件長度的�數"
 
-#: src/main/arithmetic.c:708
+#: src/main/arithmetic.c:712
 msgid "invalid argument to unary operator"
 msgstr "一元�算�的引數�正確"
 
-#: src/main/arithmetic.c:737 src/main/arithmetic.c:762
-#: src/main/arithmetic.c:781
+#: src/main/arithmetic.c:741 src/main/arithmetic.c:766
+#: src/main/arithmetic.c:785
 msgid "invalid unary operator"
 msgstr "一元�算��正確"
 
-#: src/main/arithmetic.c:1193
+#: src/main/arithmetic.c:1191
 msgid "unimplemented real function of 1 argument"
 msgstr "單引數的實數函數目�還沒有實作"
 
-#: src/main/arithmetic.c:1207 src/main/complex.c:648 src/main/complex.c:718
+#: src/main/arithmetic.c:1205 src/main/complex.c:638 src/main/complex.c:708
 msgid "unimplemented complex function"
 msgstr "尚未實作複數功能"
 
-#: src/main/arithmetic.c:1486 src/main/arithmetic.c:1885
-#: src/main/arithmetic.c:2064 src/main/arithmetic.c:2176
+#: src/main/arithmetic.c:1484 src/main/arithmetic.c:1877
+#: src/main/arithmetic.c:2049 src/main/arithmetic.c:2152
 #, c-format
 msgid "unimplemented real function of %d numeric arguments"
 msgstr "%d 個數值引數的實數函數尚未實作"
 
-#: src/main/arithmetic.c:1513
+#: src/main/arithmetic.c:1511
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires 1 or 2 arguments"
 msgid_plural "%d arguments passed to '%s'which requires 1 or 2 arguments"
 msgstr[0] "%d 個引數傳�給 '%s'，但它最多�能用兩個引數"
 
-#: src/main/arithmetic.c:1532
+#: src/main/arithmetic.c:1530
 msgid "invalid second argument of length 0"
 msgstr "第二引數長度為 0，�正確"
 
-#: src/main/arithmetic.c:1627 src/main/arithmetic.c:1645 src/main/envir.c:1462
-#: src/main/envir.c:1970 src/main/eval.c:572 src/main/eval.c:4086
+#: src/main/arithmetic.c:1625 src/main/arithmetic.c:1643 src/main/envir.c:1464
+#: src/main/envir.c:1972 src/main/eval.c:630 src/main/eval.c:4237
 #, c-format
 msgid "argument \"%s\" is missing, with no default"
 msgstr "缺少引數 \"%s\"，也沒有�設值"
 
-#: src/main/arithmetic.c:1651
+#: src/main/arithmetic.c:1649
 msgid "invalid argument 'base' of length 0"
 msgstr "長度為 0 的無效引數 '基底'"
 
-#: src/main/array.c:79 src/main/array.c:1547
+#: src/main/array.c:82 src/main/array.c:1591
 #, fuzzy, c-format
 msgid "'data' must be of a vector type, was '%s'"
 msgstr "'data' 必須是��類型"
 
-#: src/main/array.c:94 src/main/array.c:102
+#: src/main/array.c:97 src/main/array.c:105
 msgid "non-numeric matrix extent"
 msgstr "�數值的矩陣範�"
 
-#: src/main/array.c:97 src/main/array.c:1656
+#: src/main/array.c:100 src/main/array.c:1695
 msgid "invalid 'nrow' value (too large or NA)"
 msgstr "無效的 'nrow' 值 (太大或無法�得)"
 
-#: src/main/array.c:99 src/main/array.c:1658
+#: src/main/array.c:102 src/main/array.c:1697
 msgid "invalid 'nrow' value (< 0)"
 msgstr "無效的 'nrow' 值 (< 0)"
 
-#: src/main/array.c:105 src/main/array.c:1661
+#: src/main/array.c:108 src/main/array.c:1700
 msgid "invalid 'ncol' value (too large or NA)"
 msgstr "無效的 'ncol' 值 (太大或無法�得)"
 
-#: src/main/array.c:107 src/main/array.c:1663
+#: src/main/array.c:110 src/main/array.c:1702
 msgid "invalid 'ncol' value (< 0)"
 msgstr "無效的 'ncol' 值 (< 0)"
 
-#: src/main/array.c:116
+#: src/main/array.c:119
 msgid "nc = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:124
+#: src/main/array.c:127
 msgid "nr = 0 for non-null data"
 msgstr ""
 
-#: src/main/array.c:135
+#: src/main/array.c:138
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of rows [%d]"
 msgstr "資料長度 [%d] 並�列數� [%d] 的因數或�數"
 
-#: src/main/array.c:138
+#: src/main/array.c:141
 #, c-format
 msgid ""
 "data length [%d] is not a sub-multiple or multiple of the number of columns "
 "[%d]"
 msgstr "資料長度 [%d] 並�欄�數� [%d] 的因數或�數"
 
-#: src/main/array.c:141
+#: src/main/array.c:144
 msgid "data length exceeds size of matrix"
 msgstr "資料長度超�矩陣的大�"
 
-#: src/main/array.c:147 src/main/array.c:1559 src/main/array.c:1670
+#: src/main/array.c:150 src/main/array.c:1603 src/main/array.c:1709
 msgid "too many elements specified"
 msgstr "指定了太多的元素"
 
-#: src/main/array.c:205
+#: src/main/array.c:208
 msgid "negative extents to matrix"
 msgstr "矩陣的範��能是負值"
 
-#: src/main/array.c:208
+#: src/main/array.c:211
 msgid "allocMatrix: too many elements specified"
 msgstr "allocMatrix: 指定了太多的元素"
 
-#: src/main/array.c:236
+#: src/main/array.c:239
 msgid "negative extents to 3D array"
 msgstr "負值延伸到 3D 陣列"
 
-#: src/main/array.c:239
+#: src/main/array.c:242
 #, fuzzy
 msgid "'alloc3Darray': too many elements specified"
 msgstr "alloc3Darray：指定了太多的元素"
 
-#: src/main/array.c:264
+#: src/main/array.c:267
 #, fuzzy
 msgid "'allocArray': too many elements specified by 'dims'"
 msgstr "allocArray: 'dims' 指定了太多的元素"
 
-#: src/main/array.c:493
+#: src/main/array.c:523
 #, fuzzy, c-format
 msgid "'%s' must be a list or atomic vector"
 msgstr "'x' 必須是空值或純���串列"
 
-#: src/main/array.c:531
+#: src/main/array.c:561
 #, fuzzy, c-format
 msgid "a matrix-like object is required as argument to '%s'"
 msgstr "'row/col'需�一個類矩陣物件"
 
-#: src/main/array.c:745
+#: src/main/array.c:776
 msgid "requires numeric/complex matrix/vector arguments"
 msgstr "需�數值/複數矩陣/��引數"
 
-#: src/main/array.c:855 src/main/array.c:859 src/main/array.c:863
+#: src/main/array.c:886 src/main/array.c:890 src/main/array.c:894
 msgid "non-conformable arguments"
 msgstr "�調和引數"
 
-#: src/main/array.c:1162
+#: src/main/array.c:1193
 msgid "argument is not a matrix"
 msgstr "引數�是矩陣"
 
-#: src/main/array.c:1197
+#: src/main/array.c:1228
 msgid "invalid first argument, must be an array"
 msgstr "第一個引數�正確, 必須是陣列"
 
-#: src/main/array.c:1211
+#: src/main/array.c:1242
 #, fuzzy, c-format
 msgid "'perm' is of wrong length %d (!= %d)"
 msgstr "'perm' 的長度�正確"
 
-#: src/main/array.c:1216 src/main/array.c:1219
+#: src/main/array.c:1247 src/main/array.c:1250
 msgid "'a' does not have named dimnames"
 msgstr "'a' 沒有具�的 dimnames"
 
-#: src/main/array.c:1226
+#: src/main/array.c:1257
 #, fuzzy, c-format
 msgid "'perm[%d]' does not match a dimension name"
 msgstr "perm[%d] �符�維度�稱"
 
-#: src/main/array.c:1239
+#: src/main/array.c:1270
 msgid "value out of range in 'perm'"
 msgstr "'perm' 的值在範�外"
 
-#: src/main/array.c:1321
+#: src/main/array.c:1352
 msgid "'resize' must be TRUE or FALSE"
 msgstr "'resize' 必須為真或�"
 
-#: src/main/array.c:1378
+#: src/main/array.c:1422
 msgid "'x' must be numeric"
 msgstr "'x' 必須是數值"
 
-#: src/main/array.c:1381
+#: src/main/array.c:1425
 #, fuzzy
-msgid "'X' is too short"
+msgid "'x' is too short"
 msgstr "'object' 太短"
 
-#: src/main/array.c:1555
+#: src/main/array.c:1599
 #, fuzzy
 msgid "'dims' cannot be of length 0"
 msgstr "'hadj' 的長度必須是 1"
 
-#: src/main/array.c:1666
+#: src/main/array.c:1705
 #, fuzzy
 msgid "'x' must have positive length"
 msgstr "'value' 必須是正值的長度"
 
-#: src/main/array.c:1726
+#: src/main/array.c:1771
 #, c-format
 msgid "singular matrix in 'backsolve'. First zero in diagonal [%d]"
 msgstr ""
@@ -1107,202 +1107,203 @@
 msgid "attempt to set invalid 'class' attribute"
 msgstr "試圖設定無效的 'class' 屬性"
 
-#: src/main/attrib.c:865
+#: src/main/attrib.c:872
 #, fuzzy, c-format
 msgid "class '%s' has no 'names' slot"
 msgstr "類別 '%s' 沒有任何 'names' �槽"
 
-#: src/main/attrib.c:867
+#: src/main/attrib.c:874
 #, fuzzy, c-format
 msgid ""
 "class '%s' has no 'names' slot; assigning a names attribute will create an "
 "invalid object"
 msgstr "類別 '%s' 沒有任何 'names' �槽；指派�稱屬性將建立無效的物件"
 
-#: src/main/attrib.c:870
+#: src/main/attrib.c:877
 #, fuzzy, c-format
 msgid ""
 "invalid to use names()<- to set the 'names' slot in a non-vector class ('%s')"
 msgstr "在���類別 ('%s') 中使用 names()<- 以設定 'names' �槽是��法的"
 
-#: src/main/attrib.c:900
+#: src/main/attrib.c:907
 msgid "incompatible 'names' argument"
 msgstr "�相容的 'names' 引數"
 
-#: src/main/attrib.c:955
+#: src/main/attrib.c:962
 #, c-format
 msgid "invalid type (%s) to set 'names' attribute"
 msgstr "以無效的類型 (%s) 設定 'names' 屬性"
 
-#: src/main/attrib.c:1028
+#: src/main/attrib.c:1035
 msgid "'dimnames' applied to non-array"
 msgstr "'dimnames' 被應用於�陣列"
 
-#: src/main/attrib.c:1033
-msgid "'dimnames' must be a list"
-msgstr "'dimnames' 必須是串列"
+#: src/main/attrib.c:1040 src/main/coerce.c:2471
+#, fuzzy, c-format
+msgid "'%s' must be a list"
+msgstr "'%s' 必須是串列"
 
-#: src/main/attrib.c:1036 src/main/attrib.c:1064
+#: src/main/attrib.c:1043 src/main/attrib.c:1071
 #, c-format
 msgid "length of 'dimnames' [%d] must match that of 'dims' [%d]"
 msgstr "'dimnames' 的長度 [%d] 必須� 'dims' 的長度 [%d] 相等"
 
-#: src/main/attrib.c:1070
+#: src/main/attrib.c:1077
 #, c-format
 msgid "invalid type (%s) for 'dimnames' (must be a vector)"
 msgstr "設 'dimnames' 時的類型 (%s) �正確 (必須是��)"
 
-#: src/main/attrib.c:1073
+#: src/main/attrib.c:1080
 #, c-format
 msgid "length of 'dimnames' [%d] not equal to array extent"
 msgstr "'dimnames' 的長度 [%d] 必須與陣列範�相等"
 
-#: src/main/attrib.c:1145 src/main/builtin.c:75 src/main/builtin.c:112
-#: src/main/envir.c:1738 src/main/envir.c:1866 src/main/envir.c:1926
-#: src/main/envir.c:2063 src/main/paste.c:74 src/main/paste.c:293
-#: src/main/random.c:476 src/main/random.c:505 src/main/unique.c:1684
+#: src/main/attrib.c:1152 src/main/builtin.c:75 src/main/builtin.c:112
+#: src/main/envir.c:1740 src/main/envir.c:1868 src/main/envir.c:1928
+#: src/main/envir.c:2065 src/main/paste.c:74 src/main/paste.c:293
+#: src/main/random.c:479 src/main/random.c:508 src/main/unique.c:1746
 msgid "invalid first argument"
 msgstr "第一個引數�正確"
 
-#: src/main/attrib.c:1148
+#: src/main/attrib.c:1155
 msgid "invalid second argument"
 msgstr "第二個引數�正確"
 
-#: src/main/attrib.c:1156
+#: src/main/attrib.c:1163
 msgid "length-0 dimension vector is invalid"
 msgstr "長度為零的維度��無效"
 
-#: src/main/attrib.c:1161
+#: src/main/attrib.c:1168
 msgid "the dims contain missing values"
 msgstr "維度包�缺少值"
 
-#: src/main/attrib.c:1163
+#: src/main/attrib.c:1170
 msgid "the dims contain negative values"
 msgstr "維度包�負值"
 
-#: src/main/attrib.c:1168
+#: src/main/attrib.c:1175
 #, fuzzy
 msgid "dims do not match the length of object"
 msgstr "維度 [product %d] �符�物件 [%d] 的長度"
 
-#: src/main/attrib.c:1170
+#: src/main/attrib.c:1177
 #, c-format
 msgid "dims [product %d] do not match the length of object [%d]"
 msgstr "維度 [product %d] �符�物件 [%d] 的長度"
 
-#: src/main/attrib.c:1272
+#: src/main/attrib.c:1284
 msgid "attributes must be a list or NULL"
 msgstr "屬性必須是串列或空值"
 
-#: src/main/attrib.c:1277
+#: src/main/attrib.c:1289
 msgid "attributes must be named"
 msgstr "屬性必須命�"
 
-#: src/main/attrib.c:1281
+#: src/main/attrib.c:1293
 #, c-format
 msgid "all attributes must have names [%d does not]"
 msgstr "所有的屬性都必須有�稱 [%d �沒有]"
 
-#: src/main/attrib.c:1381
+#: src/main/attrib.c:1393
 msgid "'which' must be of mode character"
 msgstr "'which' 的模�必須是字元"
 
-#: src/main/attrib.c:1383
+#: src/main/attrib.c:1395
 msgid "exactly one attribute 'which' must be given"
 msgstr "必須給定 'which' 剛好一個屬性"
 
-#: src/main/attrib.c:1441 src/main/attrib.c:1464 src/main/subscript.c:248
-#: src/main/subscript.c:252 src/main/subset.c:1230 src/main/subset.c:1281
+#: src/main/attrib.c:1456 src/main/attrib.c:1479 src/main/subscript.c:245
+#: src/main/subscript.c:249 src/main/subset.c:1257 src/main/subset.c:1311
 #, c-format
 msgid "partial match of '%s' to '%s'"
 msgstr "'%s' 部份匹�到 '%s'"
 
-#: src/main/attrib.c:1503
+#: src/main/attrib.c:1525
 #, fuzzy, c-format
 msgid "invalid type '%s' for slot name"
 msgstr "�稱�槽的類型或長度�正確"
 
-#: src/main/attrib.c:1539
+#: src/main/attrib.c:1563
 msgid "'name' must be non-null character string"
 msgstr "'name' 必須是�空字串"
 
-#: src/main/attrib.c:1663 src/main/attrib.c:1734 src/main/attrib.c:1771
+#: src/main/attrib.c:1688 src/main/attrib.c:1759 src/main/attrib.c:1797
 msgid "invalid type or length for slot name"
 msgstr "�稱�槽的類型或長度�正確"
 
-#: src/main/attrib.c:1697
+#: src/main/attrib.c:1722
 #, c-format
 msgid "cannot get a slot (\"%s\") from an object of type \"%s\""
 msgstr "類型 \"%2$s\" 的物件中沒有 \"%1$s\" 這樣一個�槽"
 
-#: src/main/attrib.c:1708
+#: src/main/attrib.c:1733
 #, c-format
 msgid "no slot of name \"%s\" for this object of class \"%s\""
 msgstr "\"%1$s\" �槽��存在於 \"%2$s\" 類型物件中"
 
-#: src/main/attrib.c:1725
+#: src/main/attrib.c:1750
 msgid "attempt to set slot on NULL object"
 msgstr "試圖設在空值物件上定�槽"
 
-#: src/main/attrib.c:1766
+#: src/main/attrib.c:1792
 #, fuzzy
 msgid "formal classes cannot be used without the 'methods' package"
 msgstr "一定�有方法套件�能使用正�類別"
 
-#: src/main/attrib.c:1778
+#: src/main/attrib.c:1804
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object of a basic class (\"%s\") with no "
 "slots"
 msgstr "無法從沒有�槽的基本類別 (\"%2$s\") 的物件中�得 \"%1$s\" �槽"
 
-#: src/main/attrib.c:1782
+#: src/main/attrib.c:1808
 #, c-format
 msgid ""
 "trying to get slot \"%s\" from an object (class \"%s\") that is not an S4 "
 "object "
 msgstr "嘗試從一個�是 S4 物件的物件 (類別 \"%2$s\") 中���槽 \"%1$s\" "
 
-#: src/main/bind.c:161
+#: src/main/bind.c:164
 #, c-format
 msgid "resulting vector exceeds vector length limit in '%s'"
 msgstr "所產生的��超出 '%s' 中的��長度�制"
 
-#: src/main/bind.c:291 src/main/bind.c:327 src/main/bind.c:376
-#: src/main/bind.c:449 src/main/bind.c:477
+#: src/main/bind.c:294 src/main/bind.c:330 src/main/bind.c:379
+#: src/main/bind.c:452 src/main/bind.c:480
 #, c-format
 msgid "type '%s' is unimplemented in '%s'"
 msgstr "'%2$s' 中尚未實作類型 '%1$s'"
 
-#: src/main/bind.c:685
+#: src/main/bind.c:688
 msgid "repeated formal argument 'recursive'"
 msgstr "正�引數 'recursive' 出��複"
 
-#: src/main/bind.c:696
+#: src/main/bind.c:699
 msgid "repeated formal argument 'use.names'"
 msgstr "正�引數 'use.names' 出��複"
 
-#: src/main/bind.c:894
+#: src/main/bind.c:900
 msgid "argument not a list"
 msgstr "引數�是串列"
 
-#: src/main/bind.c:1038 src/main/names.c:1270 src/main/names.c:1275
-#: src/main/names.c:1280 src/main/names.c:1285
+#: src/main/bind.c:1044 src/main/names.c:1273 src/main/names.c:1278
+#: src/main/names.c:1283 src/main/names.c:1288
 #, c-format
 msgid "class name too long in '%s'"
 msgstr "'%s' 中的類別�稱太長"
 
-#: src/main/bind.c:1122
+#: src/main/bind.c:1128
 #, fuzzy, c-format
 msgid "cannot create a matrix from type '%s'"
 msgstr "無法從這些類型建立矩陣"
 
-#: src/main/bind.c:1192
+#: src/main/bind.c:1198
 #, c-format
 msgid "number of rows of matrices must match (see arg %d)"
 msgstr "矩陣的列數必須相符 (�看引數 %d)"
 
-#: src/main/bind.c:1439
+#: src/main/bind.c:1455
 #, c-format
 msgid "number of columns of matrices must match (see arg %d)"
 msgstr "矩陣的行數必須相符 (�看引數 %d)"
@@ -1311,229 +1312,248 @@
 msgid "vector size cannot be NA"
 msgstr "��大��能是 NA"
 
-#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1303
+#: src/main/builtin.c:49 src/main/builtin.c:57 src/main/sort.c:1323
 msgid "vector size cannot be NA/NaN"
 msgstr "��大��能是 NA/NaN"
 
-#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1304
+#: src/main/builtin.c:50 src/main/builtin.c:58 src/main/sort.c:1324
 msgid "vector size cannot be infinite"
 msgstr "��大��能是無�大"
 
-#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:941
-#: src/main/sort.c:1305
+#: src/main/builtin.c:51 src/main/builtin.c:59 src/main/builtin.c:950
+#: src/main/sort.c:1325
 msgid "vector size specified is too large"
 msgstr "指定的��大�太大"
 
-#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:294
-#: src/main/builtin.c:327 src/main/builtin.c:384 src/main/builtin.c:398
-#: src/main/coerce.c:1524 src/main/connections.c:3062 src/main/engine.c:2967
-#: src/main/envir.c:999 src/main/envir.c:1052 src/main/envir.c:1208
-#: src/main/envir.c:1747 src/main/envir.c:1871 src/main/envir.c:1937
-#: src/main/envir.c:2070 src/main/envir.c:2788 src/main/envir.c:2874
-#: src/main/envir.c:3166 src/main/envir.c:3195 src/main/envir.c:3216
-#: src/main/envir.c:3239 src/main/envir.c:3274 src/main/envir.c:3295
-#: src/main/envir.c:3616 src/main/envir.c:3621 src/main/eval.c:6081
-#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2070
-#: src/main/saveload.c:2362 src/main/serialize.c:2755
+#: src/main/builtin.c:84 src/main/builtin.c:93 src/main/builtin.c:304
+#: src/main/builtin.c:337 src/main/builtin.c:394 src/main/builtin.c:408
+#: src/main/coerce.c:1536 src/main/connections.c:3062 src/main/engine.c:2987
+#: src/main/envir.c:1001 src/main/envir.c:1054 src/main/envir.c:1210
+#: src/main/envir.c:1749 src/main/envir.c:1873 src/main/envir.c:1939
+#: src/main/envir.c:2072 src/main/envir.c:2791 src/main/envir.c:2877
+#: src/main/envir.c:3182 src/main/envir.c:3211 src/main/envir.c:3232
+#: src/main/envir.c:3255 src/main/envir.c:3290 src/main/envir.c:3311
+#: src/main/envir.c:3632 src/main/envir.c:3637 src/main/eval.c:6251
+#: src/main/objects.c:191 src/main/objects.c:199 src/main/saveload.c:2072
+#: src/main/saveload.c:2364 src/main/serialize.c:2755
 msgid "use of NULL environment is defunct"
 msgstr "NULL 環境的使用已經廢止"
 
-#: src/main/builtin.c:307
+#: src/main/builtin.c:250 src/main/builtin.c:263
+#, fuzzy
+msgid "argument is not a function"
+msgstr "引數必須�是函數"
+
+#: src/main/builtin.c:317
 msgid "replacement object is not an environment"
 msgstr "替�物件�是環境物件"
 
-#: src/main/builtin.c:332
+#: src/main/builtin.c:342
 msgid "'enclos' must be an environment"
 msgstr "'enclos' 必須是環境物件"
 
-#: src/main/builtin.c:353 src/main/builtin.c:389
+#: src/main/builtin.c:363 src/main/builtin.c:399
 msgid "argument is not an environment"
 msgstr "引數�是環境物件"
 
-#: src/main/builtin.c:355
+#: src/main/builtin.c:365
 msgid "the empty environment has no parent"
 msgstr "空環境沒有上一層"
 
-#: src/main/builtin.c:391
+#: src/main/builtin.c:401
 msgid "can not set parent of the empty environment"
 msgstr "無法設定空環境的上層"
 
-#: src/main/builtin.c:393
+#: src/main/builtin.c:403
 #, fuzzy
 msgid "can not set the parent environment of a namespace"
 msgstr "無法設定空環境的上層"
 
-#: src/main/builtin.c:395
+#: src/main/builtin.c:405
 #, fuzzy
 msgid "can not set the parent environment of package imports"
 msgstr "無法設定空環境的上層"
 
-#: src/main/builtin.c:403
+#: src/main/builtin.c:413
 msgid "'parent' is not an environment"
 msgstr "'parent' �是環境物件"
 
-#: src/main/builtin.c:546 src/main/connections.c:3689
-#: src/main/connections.c:4072 src/main/connections.c:4106
-#: src/main/connections.c:4484 src/main/connections.c:4554
-#: src/main/connections.c:4763 src/main/connections.c:4767
-#: src/main/connections.c:5212 src/main/deparse.c:368 src/main/deparse.c:457
+#: src/main/builtin.c:556 src/main/connections.c:3687
+#: src/main/connections.c:4079 src/main/connections.c:4113
+#: src/main/connections.c:4491 src/main/connections.c:4561
+#: src/main/connections.c:4772 src/main/connections.c:4776
+#: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
 #: src/main/serialize.c:2045
 msgid "cannot write to this connection"
 msgstr "無法寫入此連�"
 
-#: src/main/builtin.c:551 src/main/builtin.c:581
+#: src/main/builtin.c:561 src/main/builtin.c:591
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "'%s' 設定�正確"
 
-#: src/main/builtin.c:568
+#: src/main/builtin.c:578
 msgid "non-positive 'fill' argument will be ignored"
 msgstr "�正數的 'fill' 引數將會被忽略"
 
-#: src/main/builtin.c:643
+#: src/main/builtin.c:653
 #, c-format
 msgid "argument %d (type '%s') cannot be handled by 'cat'"
 msgstr "'cat' 目�還�能用 %d 引數 (類型 '%s')"
 
-#: src/main/builtin.c:788
+#: src/main/builtin.c:797
 #, c-format
 msgid "vector: cannot make a vector of mode '%s'."
 msgstr "��：無法建立模�為 '%s' 的��。"
 
-#: src/main/builtin.c:814
+#: src/main/builtin.c:823
 msgid "cannot set length of non-vector"
 msgstr "�能設定���的長度"
 
-#: src/main/builtin.c:922 src/main/builtin.c:932 src/main/options.c:653
+#: src/main/builtin.c:931 src/main/builtin.c:941 src/main/options.c:659
 msgid "invalid argument"
 msgstr "引數�正確"
 
-#: src/main/builtin.c:924 src/main/builtin.c:934 src/main/builtin.c:936
-#: src/main/character.c:415 src/main/coerce.c:2817
+#: src/main/builtin.c:933 src/main/builtin.c:943 src/main/builtin.c:945
+#: src/main/character.c:525 src/main/coerce.c:2832
 msgid "invalid value"
 msgstr "無效的值"
 
-#: src/main/builtin.c:967 src/main/coerce.c:2526 src/main/coerce.c:2569
-#: src/main/eval.c:562 src/main/eval.c:682 src/main/eval.c:2175
-#: src/main/eval.c:2255 src/main/eval.c:2316 src/main/eval.c:2654
-#: src/main/eval.c:5426 src/main/eval.c:5543
+#: src/main/builtin.c:976 src/main/coerce.c:2541 src/main/coerce.c:2584
+#: src/main/eval.c:620 src/main/eval.c:740 src/main/eval.c:2266
+#: src/main/eval.c:2346 src/main/eval.c:2407 src/main/eval.c:2745
+#: src/main/eval.c:5584 src/main/eval.c:5701
 msgid "'...' used in an incorrect context"
 msgstr "'...' 的上下文用得�正確"
 
-#: src/main/builtin.c:989
+#: src/main/builtin.c:998
 #, fuzzy, c-format
 msgid "duplicate 'switch' defaults: '%s' and '%s'"
 msgstr "�複切��設值：'%s' 和 '%s'"
 
-#: src/main/builtin.c:1022
+#: src/main/builtin.c:1031
 msgid "'EXPR' is missing"
 msgstr "缺少 'EXPR'"
 
-#: src/main/builtin.c:1026 src/main/eval.c:5898
+#: src/main/builtin.c:1035 src/main/eval.c:6056
 msgid "EXPR must be a length 1 vector"
 msgstr "EXPR 必須是長度為 1 的��"
 
-#: src/main/builtin.c:1029 src/main/eval.c:5901
+#: src/main/builtin.c:1038 src/main/eval.c:6059
 #, c-format
 msgid ""
 "EXPR is a \"factor\", treated as integer.\n"
 " Consider using '%s' instead."
 msgstr ""
 
-#: src/main/character.c:104 src/main/character.c:146
+#: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
+#, fuzzy
+msgid "'switch' with no alternatives"
+msgstr "switch() 需�數值而無需具�的替代方案"
+
+#: src/main/character.c:103 src/main/character.c:224
 #, fuzzy, c-format
 msgid "%d argument passed to '%s' which requires %d to %d"
 msgid_plural "%d arguments passed to '%s' which requires %d to %d"
 msgstr[0] "傳�了 %d 個引數給 '%s' 但它需� %d 個"
 
-#: src/main/character.c:111 src/main/character.c:114 src/main/character.c:152
-#: src/main/character.c:155
+#: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
+#: src/main/character.c:235
 #, c-format
 msgid "'%s' requires a character vector"
 msgstr "'%s' 需�字元��"
 
-#: src/main/character.c:193 src/main/character.c:209 src/main/character.c:219
-#: src/main/character.c:244 src/main/character.c:702 src/main/character.c:799
-#, c-format
-msgid "invalid multibyte string %d"
+#: src/main/character.c:150 src/main/character.c:165 src/main/character.c:175
+#: src/main/character.c:203
+#, fuzzy, c-format
+msgid "invalid multibyte string, %s"
 msgstr "多�元組字串 %d �正確"
 
-#: src/main/character.c:203
-#, c-format
-msgid ""
-"number of characters is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:159
+#, fuzzy, c-format
+msgid "number of characters is not computable in \"bytes\" encoding, %s"
 msgstr "�於 \"bytes\" 編碼中的元素 %d 而言，字元數�並��計算的"
 
-#: src/main/character.c:232
-#, c-format
-msgid "width is not computable for element %d in \"bytes\" encoding"
+#: src/main/character.c:188
+#, fuzzy, c-format
+msgid "width is not computable for %s in \"bytes\" encoding"
 msgstr "�於 \"bytes\" 編碼中的元素 %d 而言，寬度並��計算的"
 
-#: src/main/character.c:312
+#: src/main/character.c:311
 msgid "extracting substrings from a non-character object"
 msgstr "從�字元物件中抽��字串"
 
-#: src/main/character.c:317 src/main/character.c:412
+#: src/main/character.c:321 src/main/character.c:522
 #, fuzzy
 msgid "invalid substring arguments"
 msgstr "無效的�字串引數"
 
-#: src/main/character.c:407
+#: src/main/character.c:361
+#, fuzzy
+msgid "non-character object(s)"
+msgstr "�能有�字元�稱"
+
+#: src/main/character.c:517
 msgid "replacing substrings in a non-character object"
 msgstr "在�字元的物件中替��字串"
 
-#: src/main/character.c:600
+#: src/main/character.c:785
 msgid "the first argument must be a character vector"
 msgstr "第一個引數必須是字元��"
 
-#: src/main/character.c:619
+#: src/main/character.c:822
 msgid "abbreviate used with non-ASCII chars"
 msgstr "abbreviate ��用於� ASCII 字元"
 
-#: src/main/character.c:640
+#: src/main/character.c:843
 msgid "non-character names"
 msgstr "�能有�字元�稱"
 
-#: src/main/character.c:745 src/main/grep.c:163
+#: src/main/character.c:905 src/main/character.c:1002
+#, c-format
+msgid "invalid multibyte string %d"
+msgstr "多�元組字串 %d �正確"
+
+#: src/main/character.c:948 src/main/grep.c:163
 msgid "non-character argument"
 msgstr "�字元引數"
 
-#: src/main/character.c:854
+#: src/main/character.c:1057
 #, c-format
 msgid "decreasing range specification ('%lc-%lc')"
 msgstr "正在�減範�設定 ('%lc-%lc')"
 
-#: src/main/character.c:940
+#: src/main/character.c:1143
 #, c-format
 msgid "decreasing range specification ('%c-%c')"
 msgstr "正在�減範�設定 ('%c-%c')"
 
-#: src/main/character.c:1128
+#: src/main/character.c:1331
 msgid "invalid UTF-8 string 'old'"
 msgstr "無效的 UTF-8 字串 'old'"
 
-#: src/main/character.c:1134
+#: src/main/character.c:1337
 msgid "invalid multibyte string 'old'"
 msgstr "多�元組字串 'old' �正確"
 
-#: src/main/character.c:1147
+#: src/main/character.c:1350
 msgid "invalid UTF-8 string 'new'"
 msgstr "無效的 UTF-8 字串 'new'"
 
-#: src/main/character.c:1153
+#: src/main/character.c:1356
 msgid "invalid multibyte string 'new'"
 msgstr "多�元組字串 'new' �正確"
 
-#: src/main/character.c:1181 src/main/character.c:1270
+#: src/main/character.c:1384 src/main/character.c:1473
 msgid "'old' is longer than 'new'"
 msgstr "'old' 比 'new' �長"
 
-#: src/main/character.c:1213
+#: src/main/character.c:1416
 #, c-format
 msgid "invalid input multibyte string %d"
 msgstr "輸入的多�元組字串 %d �正確"
 
-#: src/main/character.c:1320
+#: src/main/character.c:1523
 msgid "strtrim() requires a character vector"
 msgstr "strtrim() 需�字元��"
 
@@ -1545,7 +1565,7 @@
 msgid "applies only to lists and vectors"
 msgstr "�能用於串列和��"
 
-#: src/main/coerce.c:77 src/main/errors.c:1222
+#: src/main/coerce.c:77 src/main/errors.c:1194
 msgid "NAs introduced by coercion"
 msgstr "強制變更�程中產生了 NA"
 
@@ -1554,7 +1574,7 @@
 msgid "NAs introduced by coercion to integer range"
 msgstr "強制變更�程中產生了 NA"
 
-#: src/main/coerce.c:81 src/main/errors.c:1224
+#: src/main/coerce.c:81 src/main/errors.c:1196
 msgid "imaginary parts discarded in coercion"
 msgstr "強制變更時丟棄了虛數部分"
 
@@ -1562,179 +1582,175 @@
 msgid "out-of-range values treated as 0 in coercion to raw"
 msgstr "在強制變更�純�值時，任何溢�值當作 0 來處�"
 
-#: src/main/coerce.c:392
+#: src/main/coerce.c:399
 #, c-format
 msgid "invalid data of mode '%s' (too short)"
 msgstr "無效的模� '%s' 資料 (太短)"
 
-#: src/main/coerce.c:995
+#: src/main/coerce.c:1002
 #, c-format
 msgid "'pairlist' object cannot be coerced to type '%s'"
 msgstr "'pairlist' 物件無法強制變更� '%s'"
 
-#: src/main/coerce.c:1113
+#: src/main/coerce.c:1120
 #, c-format
 msgid "(list) object cannot be coerced to type '%s'"
 msgstr "(串列) 物件無法強制變更� '%s'"
 
-#: src/main/coerce.c:1136
+#: src/main/coerce.c:1143
 #, c-format
 msgid "(symbol) object cannot be coerced to type '%s'"
 msgstr "(符號) 物件無法強制變更� '%s'"
 
-#: src/main/coerce.c:1152 src/main/coerce.c:1472
+#: src/main/coerce.c:1159 src/main/coerce.c:1484
 msgid "no method for coercing this S4 class to a vector"
 msgstr "沒有方法�將這個 S4 類別強制變更���"
 
-#: src/main/coerce.c:1215
+#: src/main/coerce.c:1222
 msgid "environments cannot be coerced to other types"
 msgstr "環境物件�能被強制變更�其它類型"
 
-#: src/main/coerce.c:1362
+#: src/main/coerce.c:1374
 msgid "attempting to coerce non-factor"
 msgstr "試圖強制變更���"
 
-#: src/main/coerce.c:1367 src/main/coerce.c:1377
+#: src/main/coerce.c:1379 src/main/coerce.c:1389
 msgid "malformed factor"
 msgstr ""
 
-#: src/main/coerce.c:1520
+#: src/main/coerce.c:1532
 msgid "list argument expected"
 msgstr "需�串列引數"
 
-#: src/main/coerce.c:1528 src/main/eval.c:6085
+#: src/main/coerce.c:1540 src/main/eval.c:6255
 msgid "invalid environment"
 msgstr "環境物件�正確"
 
-#: src/main/coerce.c:1532
+#: src/main/coerce.c:1544
 msgid "argument must have length at least 1"
 msgstr "引數的長度至少�為 1"
 
-#: src/main/coerce.c:1554
+#: src/main/coerce.c:1566
 msgid "invalid body for function"
 msgstr "函數本體�正確"
 
-#: src/main/coerce.c:1577
+#: src/main/coerce.c:1589
 msgid "invalid length 0 argument"
 msgstr "長度為 0 的引數是�正確的"
 
-#: src/main/coerce.c:1592
+#: src/main/coerce.c:1604
 msgid "invalid argument list"
 msgstr "引數串列�正確"
 
-#: src/main/coerce.c:1904
+#: src/main/coerce.c:1916
 msgid "type \"single\" unimplemented in R"
 msgstr "類型 \"single\" 目�在 R 中還沒有實作"
 
-#: src/main/coerce.c:1906
+#: src/main/coerce.c:1918
 msgid "unimplemented predicate"
 msgstr "尚未實作 predicate"
 
-#: src/main/coerce.c:2057
+#: src/main/coerce.c:2070
 #, c-format
 msgid "%s() applied to non-(list or vector) of type '%s'"
 msgstr "%s() 套用到�串列或��類型 '%s'"
 
-#: src/main/coerce.c:2254 src/main/coerce.c:2317 src/main/coerce.c:2388
+#: src/main/coerce.c:2267 src/main/coerce.c:2331 src/main/coerce.c:2403
 #, c-format
 msgid "default method not implemented for type '%s'"
 msgstr "�設方法尚未於類型 '%s' 中實作"
 
-#: src/main/coerce.c:2409
+#: src/main/coerce.c:2425
 msgid "'name' is missing"
 msgstr "缺少 'name'"
 
-#: src/main/coerce.c:2416
+#: src/main/coerce.c:2432
 msgid "first argument must be a character string"
 msgstr "第一個引數必須是字串"
 
-#: src/main/coerce.c:2449
-msgid "'what' must be a character string or a function"
-msgstr "'what' 必須是字串或函數"
+#: src/main/coerce.c:2464
+#, fuzzy
+msgid "'what' must be a function or character string"
+msgstr "'text' 必須是字串"
 
-#: src/main/coerce.c:2453
+#: src/main/coerce.c:2468
 #, fuzzy
 msgid "'args' must be a list or expression"
 msgstr "'args' 必須是串列"
 
-#: src/main/coerce.c:2456
-#, fuzzy, c-format
-msgid "'%s' must be a list"
-msgstr "'%s' 必須是串列"
-
-#: src/main/coerce.c:2460 src/main/unique.c:1285
+#: src/main/coerce.c:2475 src/main/unique.c:1345
 msgid "'envir' must be an environment"
 msgstr "'envir' 必須是環境物件"
 
-#: src/main/coerce.c:2619
+#: src/main/coerce.c:2634
 msgid "invalid environment specified"
 msgstr "環境設定�正確"
 
-#: src/main/coerce.c:2685
+#: src/main/coerce.c:2700
 msgid "Setting class(x) to NULL;   result will no longer be an S4 object"
 msgstr "設定 class(x) 為空值； �果將��是 S4 物件"
 
-#: src/main/coerce.c:2688
+#: src/main/coerce.c:2703
 #, c-format
 msgid ""
 "Setting class(x) to multiple strings (\"%s\", \"%s\", ...); result will no "
 "longer be an S4 object"
 msgstr "設定 class(x) 為多�字串 (\"%s\", \"%s\", ...)；�果將��是 S4 物件"
 
-#: src/main/coerce.c:2692
+#: src/main/coerce.c:2707
 #, c-format
 msgid ""
 "Setting class(x) to \"%s\" sets attribute to NULL; result will no longer be "
 "an S4 object"
 msgstr "設定 class(x) 為 \"%s\" 設定屬性為空值；�果將��是 S4 物件"
 
-#: src/main/coerce.c:2725
+#: src/main/coerce.c:2740
 msgid "invalid replacement object to be a class string"
 msgstr "字串類別的替�物件�正確"
 
-#: src/main/coerce.c:2746
+#: src/main/coerce.c:2761
 #, c-format
 msgid ""
 "\"%s\" can only be set as the class if the object has this type; found \"%s\""
 msgstr "�有在物件有此一類別的情�下�能設 \"%s\"；�應該有 \"%s\""
 
-#: src/main/coerce.c:2764
+#: src/main/coerce.c:2779
 #, c-format
 msgid ""
 "invalid to set the class to matrix unless the dimension attribute is of "
 "length 2 (was %d)"
 msgstr "除�維度的長度為 2(目�是 %d)，�則�能設為矩陣類別"
 
-#: src/main/coerce.c:2772
+#: src/main/coerce.c:2787
 msgid ""
 "cannot set class to \"array\" unless the dimension attribute has length > 0"
 msgstr "除�維度的長度 >0，�則�能設為 \"array\" 類別"
 
-#: src/main/coerce.c:2808
+#: src/main/coerce.c:2823
 msgid "'value' must be non-null character string"
 msgstr "'value' 必須是�空字串"
 
-#: src/main/coerce.c:2821
+#: src/main/coerce.c:2836
 msgid "invalid to change the storage mode of a factor"
 msgstr "變更因�的儲存體模�無效"
 
-#: src/main/complex.c:126
+#: src/main/complex.c:123
 msgid "invalid complex unary operator"
 msgstr "單一複數�算��正確"
 
-#: src/main/complex.c:261
+#: src/main/complex.c:251
 msgid "unimplemented complex operation"
 msgstr "複數�算目�還沒有實作"
 
-#: src/main/complex.c:363
+#: src/main/complex.c:353
 msgid "non-numeric argument to function"
 msgstr "函數�能有�數值引數"
 
-#: src/main/complex.c:830
+#: src/main/complex.c:822
 msgid "invalid polynomial coefficient"
 msgstr "多項�係數�正確"
 
-#: src/main/complex.c:835
+#: src/main/complex.c:827
 msgid "root finding code failed"
 msgstr "求根�算執行失敗"
 
@@ -1746,7 +1762,7 @@
 msgid "connection not found"
 msgstr "找�到連�"
 
-#: src/main/connections.c:172
+#: src/main/connections.c:172 src/main/connections.c:5213
 msgid "invalid connection"
 msgstr "連��正確"
 
@@ -1755,9 +1771,9 @@
 msgid "closing unused connection %d (%s)\n"
 msgstr "關閉未使用的連接 %d (%s)\n"
 
-#: src/main/connections.c:229 src/main/sysutils.c:625 src/main/sysutils.c:828
-#: src/main/sysutils.c:843 src/main/sysutils.c:972 src/main/sysutils.c:1045
-#: src/main/sysutils.c:1055 src/main/sysutils.c:1068 src/main/sysutils.c:1466
+#: src/main/connections.c:229 src/main/sysutils.c:631 src/main/sysutils.c:834
+#: src/main/sysutils.c:849 src/main/sysutils.c:978 src/main/sysutils.c:1051
+#: src/main/sysutils.c:1061 src/main/sysutils.c:1074 src/main/sysutils.c:1472
 #, c-format
 msgid "unsupported conversion from '%s' to '%s'"
 msgstr "�支�從 '%s' 到 '%s' 的轉�"
@@ -1839,8 +1855,8 @@
 #: src/main/connections.c:1524 src/main/connections.c:1534
 #: src/main/connections.c:1653 src/main/connections.c:1713
 #: src/main/connections.c:2240 src/main/connections.c:2257
-#: src/main/connections.c:2566 src/main/connections.c:5393
-#: src/main/connections.c:5457
+#: src/main/connections.c:2566 src/main/connections.c:5385
+#: src/main/connections.c:5449
 msgid "too large a block specified"
 msgstr "指定的�塊太大"
 
@@ -1870,8 +1886,8 @@
 msgstr "先進先出連��置失敗"
 
 #: src/main/connections.c:1210 src/main/connections.c:1369
-#: src/main/connections.c:1991 src/main/connections.c:3209
-#: src/main/connections.c:4977
+#: src/main/connections.c:1991 src/main/connections.c:3205
+#: src/main/connections.c:4982
 msgid "only first element of 'description' argument used"
 msgstr "�用了 'description' 引數的第一個元素"
 
@@ -1881,14 +1897,14 @@
 msgstr "fifo (\"\") �有支�開啟= \"w+\" 和開啟= \"w+b\"：使用�項"
 
 #: src/main/connections.c:1242 src/main/connections.c:1407
-#: src/main/connections.c:2058 src/main/connections.c:3176
-#: src/main/connections.c:3230 src/main/connections.c:3278
-#: src/main/connections.c:3565 src/main/connections.c:3681
-#: src/main/connections.c:3843 src/main/connections.c:4099
-#: src/main/connections.c:4427 src/main/connections.c:4547
-#: src/main/connections.c:4759 src/main/connections.c:5193 src/main/dcf.c:94
-#: src/main/deparse.c:360 src/main/deparse.c:449 src/main/saveload.c:2267
-#: src/main/saveload.c:2348 src/main/scan.c:933 src/main/serialize.c:2216
+#: src/main/connections.c:2058 src/main/connections.c:3175
+#: src/main/connections.c:3226 src/main/connections.c:3274
+#: src/main/connections.c:3563 src/main/connections.c:3679
+#: src/main/connections.c:3841 src/main/connections.c:4106
+#: src/main/connections.c:4434 src/main/connections.c:4554
+#: src/main/connections.c:4768 src/main/connections.c:5180 src/main/dcf.c:93
+#: src/main/deparse.c:361 src/main/deparse.c:450 src/main/saveload.c:2269
+#: src/main/saveload.c:2350 src/main/scan.c:933 src/main/serialize.c:2216
 #: src/main/serialize.c:2267 src/main/source.c:270
 msgid "cannot open the connection"
 msgstr "無法開啟連�"
@@ -1955,7 +1971,7 @@
 msgid "allocation of bzfile connection failed"
 msgstr "�置 bz 檔案連�失敗"
 
-#: src/main/connections.c:1797 src/main/connections.c:6050
+#: src/main/connections.c:1797 src/main/connections.c:6046
 #, c-format
 msgid "cannot initialize lzma decoder, error %d"
 msgstr "無法�始化 lzma 解碼器，錯誤 %d"
@@ -1975,12 +1991,12 @@
 msgid "this is a %s-compressed file which this build of R does not support"
 msgstr "這是 %s 壓縮�的檔案，這版組建的 R 並�支�它"
 
-#: src/main/connections.c:2124 src/modules/X11/devX11.c:3375
+#: src/main/connections.c:2124 src/modules/X11/devX11.c:3381
 msgid "memory allocation to copy clipboard failed"
 msgstr "複製剪貼簿時記憶體�置失敗"
 
-#: src/main/connections.c:2129 src/modules/X11/devX11.c:3354
-#: src/modules/X11/devX11.c:3359
+#: src/main/connections.c:2129 src/modules/X11/devX11.c:3360
+#: src/modules/X11/devX11.c:3365
 msgid "clipboard cannot be opened or contains no text"
 msgstr "打�開剪貼簿，或是剪貼簿��文字"
 
@@ -2086,336 +2102,332 @@
 msgid "'con' is not an output textConnection"
 msgstr "'con' �是個輸出 textConnection"
 
-#: src/main/connections.c:3189
-msgid "sockets are not available on this system"
-msgstr "本系統沒有�槽這個功能"
-
-#: src/main/connections.c:3258 src/main/connections.c:3307
-#: src/main/connections.c:3318 src/main/connections.c:3365
-#: src/main/connections.c:3390 src/main/connections.c:3413
-#: src/main/connections.c:3425 src/main/connections.c:3541
-#: src/main/connections.c:3666 src/main/connections.c:5496
+#: src/main/connections.c:3254 src/main/connections.c:3303
+#: src/main/connections.c:3314 src/main/connections.c:3361
+#: src/main/connections.c:3388 src/main/connections.c:3411
+#: src/main/connections.c:3423 src/main/connections.c:3539
+#: src/main/connections.c:3664 src/main/connections.c:5489
 msgid "'con' is not a connection"
 msgstr "'con' �是個連�"
 
-#: src/main/connections.c:3261
+#: src/main/connections.c:3257
 msgid "cannot open standard connections"
 msgstr "無法開啟標準連�"
 
-#: src/main/connections.c:3263
+#: src/main/connections.c:3259
 msgid "connection is already open"
 msgstr "連�已開啟"
 
-#: src/main/connections.c:3296
+#: src/main/connections.c:3292
 msgid "unknown 'rw' value"
 msgstr "�明的 'rw' 值"
 
-#: src/main/connections.c:3367
+#: src/main/connections.c:3363
 msgid "cannot close standard connections"
 msgstr "無法關閉標準連�"
 
-#: src/main/connections.c:3370
+#: src/main/connections.c:3366
 #, fuzzy
 msgid "cannot close 'output' sink connection"
 msgstr "無法關閉輸出匯集連�"
 
-#: src/main/connections.c:3372
+#: src/main/connections.c:3368
 #, fuzzy
 msgid "cannot close 'message' sink connection"
 msgstr "無法關閉訊�匯集連�"
 
-#: src/main/connections.c:3392 src/main/connections.c:5211
-#: src/main/connections.c:5219 src/main/serialize.c:2035
+#: src/main/connections.c:3390 src/main/connections.c:5198
+#: src/main/connections.c:5206 src/main/serialize.c:2035
 #: src/main/serialize.c:2043
 msgid "connection is not open"
 msgstr "連�沒有開啟"
 
-#: src/main/connections.c:3488 src/main/connections.c:3500
+#: src/main/connections.c:3486 src/main/connections.c:3498
 #, fuzzy
 msgid "line longer than buffer size"
 msgstr "列長大於緩��"
 
-#: src/main/connections.c:3572 src/main/connections.c:3574
-#: src/main/connections.c:3851 src/main/connections.c:4410
-#: src/main/connections.c:4435 src/main/connections.c:5220 src/main/dcf.c:101
+#: src/main/connections.c:3570 src/main/connections.c:3572
+#: src/main/connections.c:3849 src/main/connections.c:4417
+#: src/main/connections.c:4442 src/main/connections.c:5207 src/main/dcf.c:100
 #: src/main/scan.c:936 src/main/scan.c:940 src/main/serialize.c:2037
 #: src/main/source.c:277
 msgid "cannot read from this connection"
 msgstr "無法從此連�讀�"
 
-#: src/main/connections.c:3586 src/main/connections.c:3608
+#: src/main/connections.c:3584 src/main/connections.c:3606
 msgid "cannot allocate buffer in readLines"
 msgstr "無法給 readLines �置緩��"
 
-#: src/main/connections.c:3621
+#: src/main/connections.c:3619
 #, c-format
 msgid "line %d appears to contain an embedded nul"
 msgstr ""
 
-#: src/main/connections.c:3638
+#: src/main/connections.c:3636
 #, c-format
 msgid "incomplete final line found on '%s'"
 msgstr "於 '%s' 找到�完整的最後一列"
 
-#: src/main/connections.c:3644
+#: src/main/connections.c:3642
 msgid "too few lines read in readLines"
 msgstr "readLines 讀的列數�夠"
 
-#: src/main/connections.c:3748
+#: src/main/connections.c:3746
 msgid "incomplete string at end of file has been discarded"
 msgstr "忽略檔案末端�完整的字串"
 
-#: src/main/connections.c:3754
+#: src/main/connections.c:3752
 msgid "null terminator not found: breaking string at 10000 bytes"
 msgstr "空值終止符找�到：中斷字串於 10000 �元組"
 
-#: src/main/connections.c:3819
+#: src/main/connections.c:3817
 msgid "can only read from a binary connection"
 msgstr "無法讀�二進�連�"
 
-#: src/main/connections.c:3868 src/main/connections.c:4180
+#: src/main/connections.c:3866 src/main/connections.c:4187
 msgid "size changing is not supported for complex vectors"
 msgstr "�支�複數��大�的變更"
 
-#: src/main/connections.c:3907 src/main/connections.c:3925
-#: src/main/connections.c:3951 src/main/connections.c:4013
-#: src/main/connections.c:4034 src/main/connections.c:4161
-#: src/main/connections.c:4174 src/main/connections.c:4233
-#: src/main/connections.c:4265
+#: src/main/connections.c:3905 src/main/connections.c:3923
+#: src/main/connections.c:3949 src/main/connections.c:3993
+#: src/main/connections.c:4024 src/main/connections.c:4044
+#: src/main/connections.c:4168 src/main/connections.c:4181
+#: src/main/connections.c:4240 src/main/connections.c:4272
 #, c-format
 msgid "size %d is unknown on this machine"
 msgstr "本系統沒有 %d 這樣大�的值"
 
-#: src/main/connections.c:3936
+#: src/main/connections.c:3934
 msgid "raw is always of size 1"
 msgstr "raw 的大��能是 1"
 
-#: src/main/connections.c:3959
+#: src/main/connections.c:3957
 msgid "'signed = FALSE' is only valid for integers of sizes 1 and 2"
 msgstr "'signed = FALSE' 用�於大�為 1 和 2 的整數有效"
 
-#: src/main/connections.c:4064
+#: src/main/connections.c:4071
 msgid "'x' is not an atomic vector type"
 msgstr "'x' �基元��類型"
 
-#: src/main/connections.c:4070
+#: src/main/connections.c:4077
 msgid "can only write to a binary connection"
 msgstr "�能寫入二進�連�"
 
-#: src/main/connections.c:4089
+#: src/main/connections.c:4096
 msgid "only 2^31-1 bytes can be written to a raw vector"
 msgstr "�有 2^31-1 �元組�以被寫入純���"
 
-#: src/main/connections.c:4091
+#: src/main/connections.c:4098
 msgid "only 2^31-1 bytes can be written in a single writeBin() call"
 msgstr "�有 2^31-1 �元組�以被寫入單一 writeBin() 呼�"
 
-#: src/main/connections.c:4140 src/main/connections.c:4293
-#: src/main/connections.c:4574 src/main/connections.c:4614
+#: src/main/connections.c:4147 src/main/connections.c:4300
+#: src/main/connections.c:4581 src/main/connections.c:4621
 msgid "problem writing to connection"
 msgstr "寫入連�有�題"
 
-#: src/main/connections.c:4185
+#: src/main/connections.c:4192
 msgid "size changing is not supported for raw vectors"
 msgstr "�支�純���大�的變更"
 
-#: src/main/connections.c:4328 src/main/connections.c:4332
-#: src/main/connections.c:4371
+#: src/main/connections.c:4335 src/main/connections.c:4339
+#: src/main/connections.c:4378
 msgid "invalid UTF-8 input in readChar()"
 msgstr "readChar() 的 UTF-8 輸入�正確"
 
-#: src/main/connections.c:4438
+#: src/main/connections.c:4445
 msgid "can only read in bytes in a non-UTF-8 MBCS locale"
 msgstr "在� UTF-8 MBCS 語�中�能以�元組為單�讀�"
 
-#: src/main/connections.c:4510
+#: src/main/connections.c:4517
 msgid "'object' is too short"
 msgstr "'object' 太短"
 
-#: src/main/connections.c:4563
+#: src/main/connections.c:4570
 msgid "writeChar: more bytes requested than are in the string - will zero-pad"
 msgstr "writeChar：�求的�元組比字串中的還多 - 將用零填補"
 
-#: src/main/connections.c:4588
+#: src/main/connections.c:4595
 msgid ""
 "writeChar: more characters requested than are in the string - will zero-pad"
 msgstr "writeChar：字串的長度比需�的�元組數目短 - 將用零填補"
 
-#: src/main/connections.c:4642
+#: src/main/connections.c:4649
 #, fuzzy
 msgid "maximum number of pushback lines exceeded"
 msgstr "�色的數目已超�最大值"
 
-#: src/main/connections.c:4648 src/main/connections.c:4652
-#: src/main/connections.c:4689 src/main/connections.c:4697
+#: src/main/connections.c:4655 src/main/connections.c:4659
+#: src/main/connections.c:4696 src/main/connections.c:4704
 #, fuzzy
 msgid "could not allocate space for pushback"
 msgstr "無法為 pushBack �置空間"
 
-#: src/main/connections.c:4680
+#: src/main/connections.c:4687
 msgid "can only push back on open readable connections"
 msgstr "�能推回已開啟的�讀連�"
 
-#: src/main/connections.c:4682
+#: src/main/connections.c:4689
 msgid "can only push back on text-mode connections"
 msgstr "�能推回文字狀態的連�"
 
-#: src/main/connections.c:4744 src/main/connections.c:4814
+#: src/main/connections.c:4753 src/main/connections.c:4823
 msgid "sink stack is full"
 msgstr "匯集堆疊已滿"
 
-#: src/main/connections.c:4747
+#: src/main/connections.c:4756
 msgid "cannot switch output to stdin"
 msgstr "無法將輸出轉往stdin"
 
-#: src/main/connections.c:4774
+#: src/main/connections.c:4783
 msgid "no sink to remove"
 msgstr "沒有�以除去的匯集"
 
-#: src/main/connections.c:4894
+#: src/main/connections.c:4903
 #, fuzzy
 msgid "there is no connection NA"
 msgstr "沒有任何連接 %d"
 
-#: src/main/connections.c:4896
+#: src/main/connections.c:4905
 #, c-format
 msgid "there is no connection %d"
 msgstr "沒有任何連接 %d"
 
-#: src/main/connections.c:5026
+#: src/main/connections.c:5039
 #, fuzzy
 msgid "method = \"wininet\" is only supported on Windows"
 msgstr "本平臺�支� nsl()"
 
-#: src/main/connections.c:5116
+#: src/main/connections.c:5103
 msgid ""
 "file(\"\") only supports open = \"w+\" and open = \"w+b\": using the former"
 msgstr "file(\"\") �支� open = \"w+\" 與 open = \"w+b\": 使用�者"
 
-#: src/main/connections.c:5170 src/modules/internet/internet.c:153
-#: src/modules/internet/internet.c:274
+#: src/main/connections.c:5157
 #, fuzzy
 msgid "URL scheme unsupported by this method"
 msgstr "這個組建�支� ICU"
 
-#: src/main/connections.c:5261
+#: src/main/connections.c:5253
 msgid "file stream does not have gzip magic number"
 msgstr "檔案串�沒有 gzip 魔術數字"
 
-#: src/main/connections.c:5272
+#: src/main/connections.c:5264
 msgid "file stream does not have valid gzip header"
 msgstr "檔案串�的 gzip 表頭�正確"
 
-#: src/main/connections.c:5337
+#: src/main/connections.c:5329
 msgid "writing error whilst flushing 'gzcon' connection"
 msgstr "清除 'gzcon' 連�時寫入發生錯誤"
 
-#: src/main/connections.c:5439
+#: src/main/connections.c:5431
 #, c-format
 msgid "crc error %x %x\n"
 msgstr "crc 錯誤 %x %x\n"
 
-#: src/main/connections.c:5466
+#: src/main/connections.c:5458
 msgid "write error on 'gzcon' connection"
 msgstr "'gzcon' 連�寫入發生錯誤"
 
-#: src/main/connections.c:5500
+#: src/main/connections.c:5493
 msgid "'level' must be one of 0 ... 9"
 msgstr "'level' 必須是 0...9 之一"
 
-#: src/main/connections.c:5503
+#: src/main/connections.c:5496
 msgid "'allowNonCompression' must be TRUE or FALSE"
 msgstr "'allowNonCompression' 的值必須是 TRUE 或是 FALSE"
 
-#: src/main/connections.c:5506
+#: src/main/connections.c:5499
+#, fuzzy
+msgid "'text' must be TRUE or FALSE"
+msgstr "'all.x' 必須是 TRUE 或 FALSE"
+
+#: src/main/connections.c:5502
 #, fuzzy
 msgid "this is already a 'gzcon' connection"
 msgstr "這已經是 gzcon 連�"
 
-#: src/main/connections.c:5512
+#: src/main/connections.c:5508
 msgid "can only use read- or write- binary connections"
 msgstr "�用讀或寫的二元連�"
 
-#: src/main/connections.c:5515
+#: src/main/connections.c:5511
 msgid "using a text-mode 'file' connection may not work correctly"
 msgstr "使用�個文字模� 'file' 連��能�會正確作用"
 
-#: src/main/connections.c:5518
+#: src/main/connections.c:5514
 #, fuzzy
 msgid ""
 "cannot create a 'gzcon' connection from a writable textConnection; maybe use "
 "rawConnection"
 msgstr "無法從�寫入的 textConnection 建立 gzcon 連接；也許使用 rawConnection"
 
-#: src/main/connections.c:5521 src/main/connections.c:5525
-#: src/main/connections.c:5532 src/main/connections.c:5546
+#: src/main/connections.c:5517 src/main/connections.c:5521
+#: src/main/connections.c:5528 src/main/connections.c:5542
 msgid "allocation of 'gzcon' connection failed"
 msgstr "�置 'gzcon' 連�失敗"
 
-#: src/main/connections.c:5733
+#: src/main/connections.c:5729
 msgid "not a list of sockets"
 msgstr "��槽串列"
 
-#: src/main/connections.c:5738
+#: src/main/connections.c:5734
 msgid "bad write indicators"
 msgstr "寫入指示器�正確"
 
-#: src/main/connections.c:5749
+#: src/main/connections.c:5745
 msgid "not a socket connection"
 msgstr "��槽連�"
 
-#: src/main/connections.c:5994
+#: src/main/connections.c:5990
 msgid "unknown compression, assuming none"
 msgstr "�明壓縮，�設為沒有"
 
-#: src/main/connections.c:6112 src/main/connections.c:6116
-#: src/main/connections.c:6122
+#: src/main/connections.c:6108 src/main/connections.c:6112
+#: src/main/connections.c:6118
 #, fuzzy, c-format
 msgid "allocation of %s connection failed"
 msgstr "原始連接的�置失敗"
 
-#: src/main/context.c:294
+#: src/main/context.c:316
 msgid "no loop for break/next, jumping to top level"
 msgstr "沒有�中斷/下一個的迴圈，跳到頂層"
 
-#: src/main/context.c:302
+#: src/main/context.c:324
 msgid "no function to return from, jumping to top level"
 msgstr "沒有�回返的函數, 跳到最高層"
 
-#: src/main/context.c:317
+#: src/main/context.c:339
 msgid "target context is not on the stack"
 msgstr "目的上下文�在堆疊上"
 
-#: src/main/context.c:339 src/main/context.c:355 src/main/context.c:422
-#: src/main/context.c:443 src/main/context.c:455 src/main/context.c:467
+#: src/main/context.c:361 src/main/context.c:377 src/main/context.c:444
+#: src/main/context.c:465 src/main/context.c:477 src/main/context.c:489
 msgid "not that many frames on the stack"
 msgstr "堆疊上沒有這麼多的框格"
 
-#: src/main/context.c:372
+#: src/main/context.c:394
 msgid "only positive values of 'n' are allowed"
 msgstr "'n' ��許是正數"
 
-#: src/main/context.c:493
-msgid "no function to restart"
-msgstr "沒有�新開始的功能"
-
-#: src/main/context.c:530
+#: src/main/context.c:526
 msgid "number of contexts must be positive"
 msgstr "狀態組�數�必須是正值"
 
-#: src/main/context.c:543
+#: src/main/context.c:539
 msgid "no browser context to query"
 msgstr "無�覽器狀態組�到查詢"
 
-#: src/main/context.c:561
+#: src/main/context.c:557
 msgid "not that many calls to browser are active"
 msgstr "無法有那麼多�於�覽器的呼�作用中"
 
-#: src/main/context.c:575
+#: src/main/context.c:571
 msgid "not that many functions on the call stack"
 msgstr "無法有那麼多函數在呼�堆疊之上"
 
-#: src/main/context.c:660
+#: src/main/context.c:656
 msgid "internal error in 'do_sys'"
 msgstr "內部錯誤 'do_sys'"
 
@@ -2424,40 +2436,40 @@
 msgid "integer overflow in 'cumsum'; use 'cumsum(as.numeric(.))'"
 msgstr "'cumsum' 中的整數溢�；使用 'cumsum(as.numeric(.))'"
 
-#: src/main/cum.c:180
+#: src/main/cum.c:179
 #, fuzzy
 msgid "'cummax' not defined for complex numbers"
 msgstr "min/max �能�用於複數"
 
-#: src/main/cum.c:183
+#: src/main/cum.c:182
 #, fuzzy
 msgid "'cummin' not defined for complex numbers"
 msgstr "min/max �能�用於複數"
 
-#: src/main/cum.c:210 src/main/cum.c:237
+#: src/main/cum.c:209 src/main/cum.c:236
 msgid "unknown cumxxx function"
 msgstr "�明的 cumxxx 功能"
 
-#: src/main/datetime.c:558 src/main/datetime.c:566 src/main/datetime.c:580
-#: src/main/datetime.c:585
+#: src/main/datetime.c:554 src/main/datetime.c:562 src/main/datetime.c:576
+#: src/main/datetime.c:581
 msgid "problem with setting timezone"
 msgstr "設定時�時發生�題"
 
-#: src/main/datetime.c:570
+#: src/main/datetime.c:566
 msgid "cannot set timezones on this system"
 msgstr "無法為本系統設定時�"
 
-#: src/main/datetime.c:592 src/main/datetime.c:594
+#: src/main/datetime.c:588 src/main/datetime.c:590
 msgid "problem with unsetting timezone"
 msgstr "解除設定時�發生�題"
 
-#: src/main/datetime.c:814 src/main/datetime.c:816 src/main/datetime.c:911
-#: src/main/datetime.c:1257 src/main/datetime.c:1259
+#: src/main/datetime.c:810 src/main/datetime.c:812 src/main/datetime.c:908
+#: src/main/datetime.c:1258 src/main/datetime.c:1260
 #, fuzzy
 msgid "zero-length component in non-empty \"POSIXlt\" structure"
 msgstr "�空的 POSIXlt �構內�長度為零的�分"
 
-#: src/main/dcf.c:113 src/main/dcf.c:181 src/main/dcf.c:253
+#: src/main/dcf.c:112 src/main/dcf.c:181 src/main/dcf.c:253
 msgid "could not allocate memory for 'read.dcf'"
 msgstr "無法為 'read.dcf' �置記憶體"
 
@@ -2471,11 +2483,7 @@
 msgid "Line starting '%s ...' is malformed!"
 msgstr "起始 '%s…' 的列異常�"
 
-#: src/main/debug.c:45
-msgid "argument must be a closure"
-msgstr "引數必須是個��"
-
-#: src/main/debug.c:76
+#: src/main/debug.c:46 src/main/debug.c:76
 msgid "argument must be a function"
 msgstr "引數必須是個函數"
 
@@ -2484,7 +2492,7 @@
 msgid "Value for '%s' must be TRUE or FALSE"
 msgstr "'all.x' 必須是 TRUE 或 FALSE"
 
-#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:237
+#: src/main/debug.c:139 src/main/debug.c:167 src/main/debug.c:241
 msgid "argument must not be a function"
 msgstr "引數必須�是函數"
 
@@ -2500,61 +2508,61 @@
 msgid "'tracemem' is not useful for weak reference or external pointer objects"
 msgstr "'tracemem' �於弱型�考或外部指標物件�太有用"
 
-#: src/main/debug.c:178 src/main/debug.c:183
+#: src/main/debug.c:180 src/main/debug.c:187
 msgid "R was not compiled with support for memory profiling"
 msgstr "R 未被編譯以支�記憶體�寫"
 
-#: src/main/deparse.c:155 src/main/sprintf.c:216 src/main/sprintf.c:248
+#: src/main/deparse.c:156 src/main/sprintf.c:216 src/main/sprintf.c:248
 msgid "too few arguments"
 msgstr "引數數目太少"
 
-#: src/main/deparse.c:162
+#: src/main/deparse.c:163
 #, fuzzy
 msgid "invalid 'cutoff' value for 'deparse', using default"
 msgstr "deparse的 'cutoff' 值�正確，用�設值"
 
-#: src/main/deparse.c:253
+#: src/main/deparse.c:254
 msgid "deparse of an S4 object will not be source()able"
 msgstr "S4 物件的�解�將無法進行 source()"
 
-#: src/main/deparse.c:255
+#: src/main/deparse.c:256
 msgid "deparse may be incomplete"
 msgstr "�解��能�完整"
 
-#: src/main/deparse.c:257
+#: src/main/deparse.c:258
 msgid "deparse may be not be source()able in R < 2.7.0"
 msgstr "�解�也許無法在 R < 2.7.0 中進行 source()"
 
-#: src/main/deparse.c:349 src/main/deparse.c:399 src/main/source.c:206
+#: src/main/deparse.c:350 src/main/deparse.c:400 src/main/source.c:206
 #, fuzzy
 msgid "'file' must be a character string or connection"
 msgstr "'what' 必須是字串或函數"
 
-#: src/main/deparse.c:377 src/main/deparse.c:472 src/main/deparse.c:478
+#: src/main/deparse.c:378 src/main/deparse.c:473 src/main/deparse.c:479
 msgid "wrote too few characters"
 msgstr "字元寫得�夠"
 
-#: src/main/deparse.c:401
+#: src/main/deparse.c:402
 msgid "character arguments expected"
 msgstr "需�字元引數"
 
-#: src/main/deparse.c:404
+#: src/main/deparse.c:405
 #, fuzzy
 msgid "zero-length argument"
 msgstr "引數長度為零"
 
-#: src/main/deparse.c:411
+#: src/main/deparse.c:412
 msgid "'opts' should be small non-negative integer"
 msgstr "'opts' 應該是�的�負值整數"
 
-#: src/main/deparse.c:421 src/main/envir.c:1896 src/main/envir.c:1981
-#: src/main/eval.c:568 src/main/eval.c:1332 src/main/eval.c:4095
-#: src/main/saveload.c:1978 src/main/saveload.c:2310 src/main/serialize.c:2773
+#: src/main/deparse.c:422 src/main/envir.c:1898 src/main/envir.c:1983
+#: src/main/eval.c:626 src/main/eval.c:1423 src/main/eval.c:4246
+#: src/main/saveload.c:1980 src/main/saveload.c:2312 src/main/serialize.c:2773
 #, c-format
 msgid "object '%s' not found"
 msgstr "找�到物件 '%s'"
 
-#: src/main/deparse.c:1573
+#: src/main/deparse.c:1592
 msgid "badly formed function expression"
 msgstr "�當形�的函數敘述"
 
@@ -2567,15 +2575,15 @@
 msgid "no active or default device"
 msgstr "沒有在使用中的或�設的�置"
 
-#: src/main/devices.c:387 src/main/devices.c:449
+#: src/main/devices.c:388 src/main/devices.c:450
 msgid "too many open devices"
 msgstr "太多已經開啟的�置"
 
-#: src/main/devices.c:490
+#: src/main/devices.c:491
 msgid "not enough memory to allocate device (in GEcreateDevDesc)"
 msgstr "所需記憶體�足以�置�置 (在 GEcreateDevDesc 中)"
 
-#: src/main/devices.c:531
+#: src/main/devices.c:532
 msgid "Hit <Return> to see next plot: "
 msgstr "按 <return> �來看下一張圖: "
 
@@ -2663,7 +2671,7 @@
 msgid "too many arguments, sorry"
 msgstr "��起，引數太多"
 
-#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:2993
+#: src/main/dotcode.c:1284 src/main/dotcode.c:1301 src/main/engine.c:3013
 msgid "invalid graphics state"
 msgstr "繪圖狀態�正確"
 
@@ -2816,7 +2824,7 @@
 msgid "invalid argument to edit()"
 msgstr "edit() 引數�正確"
 
-#: src/main/edit.c:121 src/main/saveload.c:2076
+#: src/main/edit.c:121 src/main/saveload.c:2078
 msgid "unable to open file"
 msgstr "無法開啟檔案"
 
@@ -2880,12 +2888,12 @@
 msgstr "沒有�以�消登記的繪圖系統"
 
 #: src/main/engine.c:443 src/main/engine.c:448 src/main/engine.c:456
-#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1157
+#: src/main/engine.c:463 src/main/engine.c:477 src/modules/X11/devX11.c:1159
 msgid "invalid line end"
 msgstr "線�終點發生錯誤"
 
 #: src/main/engine.c:508 src/main/engine.c:513 src/main/engine.c:521
-#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1175
+#: src/main/engine.c:528 src/main/engine.c:542 src/modules/X11/devX11.c:1177
 msgid "invalid line join"
 msgstr "線�接�發生錯誤"
 
@@ -2918,84 +2926,98 @@
 msgid "raster capture is not available for this device"
 msgstr "點陣擷�於這個�置上無法使用"
 
-#: src/main/engine.c:1656
+#: src/main/engine.c:1662
 #, c-format
 msgid "font face %d not supported for font family '%s'"
 msgstr "字模家� '%2$s' 中沒有字模 %1$d"
 
-#: src/main/engine.c:1972
+#: src/main/engine.c:1978
 msgid "no graphics device is active"
 msgstr "沒有作用中的繪圖�置"
 
-#: src/main/engine.c:2049
+#: src/main/engine.c:2055
 #, c-format
 msgid "pch value '%d' is invalid in this locale"
 msgstr "pch 值 '%d' 在這個語�中無效"
 
-#: src/main/engine.c:2307
+#: src/main/engine.c:2313
 #, c-format
 msgid "unimplemented pch value '%d'"
 msgstr "尚未實作pch '%d' 的值"
 
-#: src/main/engine.c:2330
+#: src/main/engine.c:2336
 #, c-format
 msgid "invalid axis extents [GEPretty(.,.,n=%d)"
 msgstr "座標範��正確 [GEPretty(.,.,n=%d)"
 
-#: src/main/engine.c:2334
+#: src/main/engine.c:2340
 #, c-format
 msgid "infinite axis extents [GEPretty(%g,%g,%d)]"
 msgstr "無�的座標範�值 [GEPretty(%g,%g,%d)]"
 
-#: src/main/engine.c:2371
+#: src/main/engine.c:2377
 #, c-format
 msgid " .. GEPretty(.): new *lo = %g < %g = x1"
 msgstr " .. GEPretty(.): new *lo =%g <%g = x1"
 
-#: src/main/engine.c:2373
+#: src/main/engine.c:2379
 #, c-format
 msgid " .. GEPretty(.): new *up = %g > %g = x2"
 msgstr " .. GEPretty(.): new *up =%g >%g = x2"
 
-#: src/main/engine.c:2773
+#: src/main/engine.c:2784
 #, fuzzy
 msgid "display list redraw incomplete"
 msgstr "顯示串列�新整�時�完整"
 
-#: src/main/engine.c:2777
+#: src/main/engine.c:2788
 #, fuzzy
 msgid "invalid display list"
 msgstr "引數串列�正確"
 
-#: src/main/engine.c:2963
+#: src/main/engine.c:2900
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (pre 11 - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2904
+#, c-format
+msgid ""
+"snapshot recorded with different graphics engine version (%d - this is "
+"version %d)"
+msgstr ""
+
+#: src/main/engine.c:2983
 msgid "'expr' argument must be an expression"
 msgstr "'expr' 引數必須是�算�"
 
-#: src/main/engine.c:2965
+#: src/main/engine.c:2985
 msgid "'list' argument must be a list"
 msgstr "'list' 引數必須是串列"
 
-#: src/main/engine.c:2971
+#: src/main/engine.c:2991
 msgid "'env' argument must be an environment"
 msgstr "'env' 引數必須是環境物件"
 
-#: src/main/engine.c:3051 src/main/engine.c:3059
+#: src/main/engine.c:3071 src/main/engine.c:3079
 msgid "invalid multibyte char in pch=\"c\""
 msgstr "pch=\"c\" 中的多�元組字元�正確"
 
-#: src/main/engine.c:3106
+#: src/main/engine.c:3126
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "�六進� 'color' 設定或 'lty' 設定�正確"
 
-#: src/main/engine.c:3129
+#: src/main/engine.c:3149
 msgid "invalid line type: must be length 2, 4, 6 or 8"
 msgstr "無效的列類型: 長度必須是 2, 4, 6 或 8"
 
-#: src/main/engine.c:3133
+#: src/main/engine.c:3153
 msgid "invalid line type: zeroes are not allowed"
 msgstr "無效的線�類型：��許多個零"
 
-#: src/main/engine.c:3142 src/main/engine.c:3150 src/main/engine.c:3157
+#: src/main/engine.c:3162 src/main/engine.c:3170 src/main/engine.c:3177
 msgid "invalid line type"
 msgstr "無效的列類型"
 
@@ -3004,7 +3026,7 @@
 msgid "cannot change value of locked binding for '%s'"
 msgstr "無法變更用於 '%s' 的鎖定繫�值"
 
-#: src/main/envir.c:251 src/main/envir.c:1528
+#: src/main/envir.c:251 src/main/envir.c:1530
 msgid "cannot add bindings to a locked environment"
 msgstr "無法給鎖定環境加上繫�"
 
@@ -3020,684 +3042,690 @@
 msgid "unbind in the base environment is unimplemented"
 msgstr "尚未實作在基本環境中解除繫�"
 
-#: src/main/envir.c:840 src/main/envir.c:1816
+#: src/main/envir.c:840 src/main/envir.c:1818
 msgid "cannot remove bindings from a locked environment"
 msgstr "無法從鎖定的環境中刪除繫�"
 
-#: src/main/envir.c:1211
+#: src/main/envir.c:1213
 #, c-format
 msgid "argument to '%s' is not an environment"
 msgstr "用於 '%s' 的引數�是環境物件"
 
-#: src/main/envir.c:1372
+#: src/main/envir.c:1374
 #, fuzzy, c-format
 msgid "the ... list does not contain %d elements"
 msgstr "... 串列�包� %d 個元素"
 
-#: src/main/envir.c:1374
+#: src/main/envir.c:1376
 #, c-format
 msgid "..%d used in an incorrect context, no ... to look in"
 msgstr "..%d 所用的上下文發生錯誤, 找�到..."
 
-#: src/main/envir.c:1467
+#: src/main/envir.c:1469
 #, c-format
 msgid "could not find function \"%s\""
 msgstr "沒有這個函數 \"%s\""
 
-#: src/main/envir.c:1490
+#: src/main/envir.c:1492
 msgid "cannot assign values in the empty environment"
 msgstr "無法在空環境中指派值"
 
-#: src/main/envir.c:1496 src/main/envir.c:1626
+#: src/main/envir.c:1498 src/main/envir.c:1628
 msgid "cannot assign variables to this database"
 msgstr "無法給這個資料庫指派變數"
 
-#: src/main/envir.c:1712
+#: src/main/envir.c:1714
 #, c-format
 msgid "cannot add binding of '%s' to the base environment"
 msgstr "無法將繫�的 '%s' 加入基本環境"
 
-#: src/main/envir.c:1741
+#: src/main/envir.c:1743
 msgid "only the first element is used as variable name"
 msgstr "�用了第一個元素�為變數�"
 
-#: src/main/envir.c:1773
+#: src/main/envir.c:1775
 msgid "first argument must be a named list"
 msgstr "第一個引數必須是具�串列"
 
-#: src/main/envir.c:1778
+#: src/main/envir.c:1780
 msgid "names(x) must be a character vector of the same length as x"
 msgstr "names(x) 必須是與 x 相�長度的字元��"
 
-#: src/main/envir.c:1781
+#: src/main/envir.c:1783
 #, fuzzy
 msgid "'envir' argument must be an environment"
 msgstr "'env' 引數必須是環境物件"
 
-#: src/main/envir.c:1810
+#: src/main/envir.c:1812
 msgid "cannot remove variables from base namespace"
 msgstr "無法從基本�稱空間刪除變數"
 
-#: src/main/envir.c:1812
+#: src/main/envir.c:1814
 msgid "cannot remove variables from the base environment"
 msgstr "無法從基本環境移除變數"
 
-#: src/main/envir.c:1814
+#: src/main/envir.c:1816
 msgid "cannot remove variables from the empty environment"
 msgstr "無法從空環境中刪除變數"
 
-#: src/main/envir.c:1822
+#: src/main/envir.c:1824
 msgid "cannot remove variables from this database"
 msgstr "無法從這個資料庫中刪除變數"
 
-#: src/main/envir.c:1983
+#: src/main/envir.c:1985
 #, c-format
 msgid "object '%s' of mode '%s' was not found"
 msgstr "找�到模� '%2$s' 的物件 '%1$s'"
 
-#: src/main/envir.c:2066
+#: src/main/envir.c:2068
 #, c-format
 msgid "invalid name in position %d"
 msgstr "在 %d �置的�稱�正確"
 
-#: src/main/envir.c:2072
+#: src/main/envir.c:2074
 msgid "second argument must be an environment"
 msgstr "第二引數必須是環境物件"
 
-#: src/main/envir.c:2080 src/main/envir.c:2088
+#: src/main/envir.c:2082 src/main/envir.c:2090
 #, c-format
 msgid "wrong length for '%s' argument"
 msgstr "'%s' 引數的長度錯誤"
 
-#: src/main/envir.c:2219
+#: src/main/envir.c:2221
 msgid "invalid use of 'missing'"
 msgstr "無效的 'missing' 使用"
 
-#: src/main/envir.c:2245
+#: src/main/envir.c:2247
 msgid "'missing' can only be used for arguments"
 msgstr "'missing' �能用�引數"
 
-#: src/main/envir.c:2331
+#: src/main/envir.c:2333
 msgid "'pos' must be an integer"
 msgstr "'pos' 必須是整數"
 
-#: src/main/envir.c:2345
+#: src/main/envir.c:2347
 msgid "all elements of a list must be named"
 msgstr "串列的所有元素都必須具�"
 
-#: src/main/envir.c:2368
+#: src/main/envir.c:2370
 msgid "'attach' only works for lists, data frames and environments"
 msgstr "'attach' �作用於串列�資料框和環境"
 
-#: src/main/envir.c:2451
+#: src/main/envir.c:2453
 msgid "detaching \"package:base\" is not allowed"
 msgstr "\"package:base\" �能被拆離"
 
-#: src/main/envir.c:2795 src/main/envir.c:2876
+#: src/main/envir.c:2798 src/main/envir.c:2879
 msgid "argument must be an environment"
 msgstr "引數必須是環境物件"
 
-#: src/main/envir.c:2880
+#: src/main/envir.c:2883
 msgid "arguments must be symbolic"
 msgstr "引數必須是符號"
 
-#: src/main/envir.c:3016
+#: src/main/envir.c:3032
 msgid "no enclosing environment"
 msgstr "沒有�閉的環境"
 
-#: src/main/envir.c:3069
+#: src/main/envir.c:3085
 #, c-format
 msgid "no item called \"%s\" on the search list"
 msgstr "�尋串列中沒有所謂的 \"%s\" 項目"
 
-#: src/main/envir.c:3094
+#: src/main/envir.c:3110
 msgid "using 'as.environment(NULL)' is defunct"
 msgstr "'as.environment(NULL)' 已廢止使用"
 
-#: src/main/envir.c:3100
+#: src/main/envir.c:3116
 msgid "S4 object does not extend class \"environment\""
 msgstr "S4 物件並�延伸類別 \"environment\""
 
-#: src/main/envir.c:3115
+#: src/main/envir.c:3131
 msgid "invalid object for 'as.environment'"
 msgstr "無效的物件用於 'as.environment'"
 
-#: src/main/envir.c:3141 src/main/envir.c:3169 src/main/envir.c:3198
-#: src/main/envir.c:3219 src/main/envir.c:3242 src/main/envir.c:3277
-#: src/main/envir.c:3298
+#: src/main/envir.c:3157 src/main/envir.c:3185 src/main/envir.c:3214
+#: src/main/envir.c:3235 src/main/envir.c:3258 src/main/envir.c:3293
+#: src/main/envir.c:3314
 msgid "not an environment"
 msgstr "�是環境物件"
 
-#: src/main/envir.c:3193 src/main/envir.c:3214 src/main/envir.c:3235
-#: src/main/envir.c:3272 src/main/envir.c:3293 src/main/envir.c:3392
+#: src/main/envir.c:3209 src/main/envir.c:3230 src/main/envir.c:3251
+#: src/main/envir.c:3288 src/main/envir.c:3309 src/main/envir.c:3408
 msgid "not a symbol"
 msgstr "�是符號"
 
-#: src/main/envir.c:3206 src/main/envir.c:3227 src/main/envir.c:3285
-#: src/main/envir.c:3306
+#: src/main/envir.c:3222 src/main/envir.c:3243 src/main/envir.c:3301
+#: src/main/envir.c:3322
 #, c-format
 msgid "no binding for \"%s\""
 msgstr "沒有 \"%s\" 繫�"
 
-#: src/main/envir.c:3237
+#: src/main/envir.c:3253
 msgid "not a function"
 msgstr "�是函數"
 
-#: src/main/envir.c:3245 src/main/envir.c:3261
+#: src/main/envir.c:3261 src/main/envir.c:3277
 msgid "symbol already has a regular binding"
 msgstr "符號已經有了正�繫�"
 
-#: src/main/envir.c:3247 src/main/envir.c:3263
+#: src/main/envir.c:3263 src/main/envir.c:3279
 msgid "cannot change active binding if binding is locked"
 msgstr "如果繫�被鎖定就無法變更作用中繫�"
 
-#: src/main/envir.c:3351 src/main/envir.c:3588
+#: src/main/envir.c:3367 src/main/envir.c:3604
 msgid "unknown op"
 msgstr "沒有這種�算�"
 
-#: src/main/envir.c:3396
+#: src/main/envir.c:3412
 msgid "cannot unbind a locked binding"
 msgstr "無法切斷已經鎖定的繫�"
 
-#: src/main/envir.c:3398
+#: src/main/envir.c:3414
 msgid "cannot unbind an active binding"
 msgstr "無法切斷正在使用中的繫�"
 
-#: src/main/envir.c:3539
+#: src/main/envir.c:3555
 msgid "bad namespace name"
 msgstr "�當的命�空間�稱"
 
-#: src/main/envir.c:3551
+#: src/main/envir.c:3567
 msgid "namespace already registered"
 msgstr "命�空間已註冊"
 
-#: src/main/envir.c:3563
+#: src/main/envir.c:3579
 msgid "namespace not registered"
 msgstr "命�空間尚未註冊"
 
-#: src/main/envir.c:3619
+#: src/main/envir.c:3635
 msgid "bad import environment argument"
 msgstr "�當導入環境引數"
 
-#: src/main/envir.c:3624
+#: src/main/envir.c:3640
 msgid "bad export environment argument"
 msgstr "�當導出環境引數"
 
-#: src/main/envir.c:3628
+#: src/main/envir.c:3644
 msgid "length of import and export names must match"
 msgstr "導入和導出�稱的長度必須相等"
 
-#: src/main/envir.c:3651
+#: src/main/envir.c:3667
 #, c-format
 msgid "exported symbol '%s' has no value"
 msgstr "導出的符號 '%s' 沒有值"
 
-#: src/main/envir.c:3816
+#: src/main/envir.c:3833
 #, c-format
 msgid "unknown encoding: %d"
 msgstr "�明編碼：%d"
 
-#: src/main/envir.c:3836
+#: src/main/envir.c:3853
 #, c-format
 msgid "embedded nul in string: '%s'"
 msgstr "空值嵌入於字串中：'%s'"
 
-#: src/main/errors.c:171 src/main/errors.c:208
+#: src/main/errors.c:163 src/main/errors.c:200
 msgid "interrupts suspended; signal ignored"
 msgstr "暫�被中斷; 信號忽略�用"
 
-#: src/main/errors.c:258
+#: src/main/errors.c:250
 msgid "[... truncated]"
 msgstr ""
 
-#: src/main/errors.c:318
+#: src/main/errors.c:310
 msgid "invalid option \"warning.expression\""
 msgstr "\"warning.expression\" �項�正確"
 
-#: src/main/errors.c:347
+#: src/main/errors.c:339
 #, c-format
 msgid "(converted from warning) %s"
 msgstr "(從警告轉��) %s"
 
-#: src/main/errors.c:357
+#: src/main/errors.c:349
 #, fuzzy
 msgid "Warning:"
 msgstr "警告：%s\n"
 
-#: src/main/errors.c:359
+#: src/main/errors.c:351
 #, fuzzy, c-format
 msgid "Warning in %s :"
 msgstr "%s 中的警告：%s\n"
 
-#: src/main/errors.c:368 src/main/errors.c:382 src/main/errors.c:695
+#: src/main/errors.c:360 src/main/errors.c:374 src/main/errors.c:687
 msgid "Calls:"
 msgstr ""
 
-#: src/main/errors.c:429 src/main/errors.c:448 src/main/errors.c:610
+#: src/main/errors.c:421 src/main/errors.c:440 src/main/errors.c:602
 msgid "Lost warning messages\n"
 msgstr "警告訊��失\n"
 
-#: src/main/errors.c:460
+#: src/main/errors.c:452
 #, fuzzy
 msgid "Warning message:"
 msgid_plural "Warning messages:"
 msgstr[0] "警告訊�：\n"
 
-#: src/main/errors.c:470 src/main/errors.c:498
+#: src/main/errors.c:462 src/main/errors.c:490
 #, c-format
 msgid "In %s :"
 msgstr ""
 
-#: src/main/errors.c:523
+#: src/main/errors.c:515
 #, fuzzy, c-format
 msgid "There was %d warning (use warnings() to see it)"
 msgid_plural "There were %d warnings (use warnings() to see them)"
 msgstr[0] "共有 %d 個警告 (用 warnings() 來顯示)\n"
 
-#: src/main/errors.c:528
+#: src/main/errors.c:520
 #, fuzzy, c-format
 msgid "There were %d or more warnings (use warnings() to see the first %d)"
 msgstr "警告多於50個 (用 warnings() 來顯示最先的50個)\n"
 
-#: src/main/errors.c:601
+#: src/main/errors.c:593
 msgid "Error during wrapup: "
 msgstr "收�時發生錯誤: "
 
-#: src/main/errors.c:626
+#: src/main/errors.c:618
 msgid "Error in "
 msgstr "錯誤在"
 
-#: src/main/errors.c:648 src/main/errors.c:655
+#: src/main/errors.c:640 src/main/errors.c:647
 #, c-format
 msgid "Error in %s (from %s) : "
 msgstr ""
 
-#: src/main/errors.c:657
+#: src/main/errors.c:649
 #, fuzzy, c-format
 msgid "Error in %s : "
 msgstr "錯誤在"
 
-#: src/main/errors.c:677 src/main/errors.c:683
+#: src/main/errors.c:669 src/main/errors.c:675
 #, c-format
 msgid "Error: "
 msgstr "錯誤: "
 
-#: src/main/errors.c:704 src/main/errors.c:1333
+#: src/main/errors.c:696 src/main/errors.c:1300
 msgid "In addition: "
 msgstr "此外: "
 
-#: src/main/errors.c:825
+#: src/main/errors.c:818
 msgid "invalid option \"error\"\n"
 msgstr "�項 \"error\" �正確\n"
 
-#: src/main/errors.c:907
-msgid "Execution halted\n"
-msgstr "�止執行\n"
-
-#: src/main/errors.c:1046 src/main/errors.c:1048 src/main/options.c:338
-#: src/main/unique.c:1578
+#: src/main/errors.c:1013 src/main/errors.c:1015 src/main/options.c:339
+#: src/main/unique.c:1638
 #, fuzzy, c-format
 msgid "'%s' must be a character string"
 msgstr "'sep' 必須是字串"
 
-#: src/main/errors.c:1145
+#: src/main/errors.c:1116
 msgid " [invalid string in stop(.)]"
 msgstr " [stop(.) 中的字串�正確]"
 
-#: src/main/errors.c:1176
+#: src/main/errors.c:1148
 msgid " [invalid string in warning(.)]"
 msgstr " [warning(.) 中的字串�正確]"
 
-#: src/main/errors.c:1192
+#: src/main/errors.c:1164
 #, c-format
 msgid "incorrect number of arguments to \"%s\""
 msgstr "\"%s\" 中的引數數目�正確"
 
-#: src/main/errors.c:1198 src/main/errors.c:1213
+#: src/main/errors.c:1170 src/main/errors.c:1185
 #, c-format
 msgid "unimplemented feature in %s"
 msgstr "%s 中的功能尚未實作"
 
-#: src/main/errors.c:1207
+#: src/main/errors.c:1179
 msgid "invalid number of arguments"
 msgstr "引數數目�正確"
 
-#: src/main/errors.c:1208 src/main/logic.c:180
+#: src/main/errors.c:1180 src/main/logic.c:181
 msgid "invalid argument type"
 msgstr "引數類型�正確"
 
-#: src/main/errors.c:1210
+#: src/main/errors.c:1182
 msgid "time-series/vector length mismatch"
 msgstr "時間�列/��長度�等"
 
-#: src/main/errors.c:1211
+#: src/main/errors.c:1183
 msgid "incompatible arguments"
 msgstr "�相容的引數"
 
-#: src/main/errors.c:1214
+#: src/main/errors.c:1186
 msgid "unknown error (report this!)"
 msgstr "�明錯誤 (請報告!)"
 
-#: src/main/errors.c:1223
+#: src/main/errors.c:1195
 msgid "inaccurate integer conversion in coercion"
 msgstr "強制變更造�整數�精確"
 
-#: src/main/errors.c:1226
+#: src/main/errors.c:1198
 msgid "unknown warning (report this!)"
 msgstr "�明警告 (請報告!)"
 
-#: src/main/errors.c:1297
+#: src/main/errors.c:1269
 msgid "No function to return from, jumping to top level"
 msgstr "沒有�回返的函數, 跳到最高層"
 
-#: src/main/errors.c:1313
+#: src/main/errors.c:1285
 msgid "top level inconsistency?"
 msgstr "最高層�一致？"
 
-#: src/main/errors.c:1492
+#: src/main/errors.c:1459
 msgid "bad handler data"
 msgstr "�當的控柄資料"
 
-#: src/main/errors.c:1642
+#: src/main/errors.c:1613
 msgid "error message not a string"
 msgstr "錯誤訊��是字串"
 
-#: src/main/errors.c:1717
+#: src/main/errors.c:1688
 msgid "handler or restart stack mismatch in old restart"
 msgstr "舊�新啟動中的控柄或�新啟動堆疊�符�"
 
-#: src/main/errors.c:1743 src/main/errors.c:1759
+#: src/main/errors.c:1714 src/main/errors.c:1730
 msgid "bad error message"
 msgstr "�當的錯誤訊�"
 
-#: src/main/errors.c:1800
+#: src/main/errors.c:1771
 msgid "bad restart"
 msgstr "�當的�新啟動"
 
-#: src/main/errors.c:1832
+#: src/main/errors.c:1803
 msgid "restart not on stack"
 msgstr "未在堆疊上�新啟動"
 
-#: src/main/errors.c:1848
+#: src/main/errors.c:1819
 msgid "not in a try context"
 msgstr "�在 try 的上下文中"
 
-#: src/main/errors.c:1861
+#: src/main/errors.c:1832
 msgid "error message must be a character string"
 msgstr "錯誤訊�必須是字串"
 
-#: src/main/eval.c:307
+#: src/main/eval.c:365
 #, c-format
 msgid "source files skipped by Rprof; please increase '%s'"
 msgstr ""
 
-#: src/main/eval.c:327
+#: src/main/eval.c:385
 #, c-format
 msgid "Rprof: cannot open profile file '%s'"
 msgstr "Rprof: 打�開程�概�分�檔案 '%s'"
 
-#: src/main/eval.c:421
+#: src/main/eval.c:479
 msgid "R profiling is not available on this system"
 msgstr "本系統沒有 R 程�概�分�這個功能"
 
-#: src/main/eval.c:445
+#: src/main/eval.c:503
 msgid ""
 "promise already under evaluation: recursive default argument reference or "
 "earlier problems?"
 msgstr "約定已進行求值：�迴�設引數�考或是之�的�題？"
 
-#: src/main/eval.c:447
+#: src/main/eval.c:505
 msgid "restarting interrupted promise evaluation"
 msgstr "�新啟動�斷的約定求值"
 
-#: src/main/eval.c:543
+#: src/main/eval.c:601
 msgid ""
 "evaluation nested too deeply: infinite recursion / options(expressions=)?"
 msgstr "評估巢狀太深：無窮�迴/�項(表示�=)?"
 
-#: src/main/eval.c:574 src/main/eval.c:4087
+#: src/main/eval.c:632 src/main/eval.c:4238
 msgid "argument is missing, with no default"
 msgstr "缺少引數, 也沒有�設值"
 
-#: src/main/eval.c:678 src/main/eval.c:1215 src/main/eval.c:5377
+#: src/main/eval.c:736 src/main/eval.c:1306 src/main/eval.c:5533
 msgid "attempt to apply non-function"
 msgstr "��用於�函數"
 
-#: src/main/eval.c:701
+#: src/main/eval.c:759
 #, c-format
 msgid "%s at %s#%d: "
 msgstr "%s 於 %s#%d："
 
-#: src/main/eval.c:1207 src/main/eval.c:2180
+#: src/main/eval.c:1298 src/main/eval.c:2271
 #, c-format
 msgid "argument %d is empty"
 msgstr "引數 %d 是空的"
 
-#: src/main/eval.c:1259
+#: src/main/eval.c:1350
 #, c-format
 msgid "could not find symbol \"%s\" in environment of the generic function"
 msgstr "一般函數環境中沒有 \"%s\" 符號"
 
-#: src/main/eval.c:1277
+#: src/main/eval.c:1368
 #, c-format
 msgid "symbol \"%s\" not in environment of method"
 msgstr "方法環境中沒有 \"%s\" 符號"
 
-#: src/main/eval.c:1390
+#: src/main/eval.c:1481
 msgid "the condition has length > 1 and only the first element will be used"
 msgstr "�件的長度 > 1，因此�能用其第一元素"
 
-#: src/main/eval.c:1409
+#: src/main/eval.c:1500
 msgid "missing value where TRUE/FALSE needed"
 msgstr "需� TRUE/FALSE 值的地方有缺值"
 
-#: src/main/eval.c:1410
+#: src/main/eval.c:1501
 msgid "argument is not interpretable as logical"
 msgstr "引數無法解譯為�輯值"
 
-#: src/main/eval.c:1411
+#: src/main/eval.c:1502
 msgid "argument is of length zero"
 msgstr "引數長度為零"
 
-#: src/main/eval.c:1504
+#: src/main/eval.c:1596
 msgid "non-symbol loop variable"
 msgstr "�符號循環變數"
 
-#: src/main/eval.c:1596 src/main/eval.c:5150
+#: src/main/eval.c:1687 src/main/eval.c:5301
 msgid "invalid for() loop sequence"
 msgstr "�當的 for() 循環�列"
 
-#: src/main/eval.c:1736
+#: src/main/eval.c:1826
 msgid "multi-argument returns are not permitted"
 msgstr "��許多引數回傳"
 
-#: src/main/eval.c:1783
+#: src/main/eval.c:1873
 msgid "invalid (NULL) left side of assignment"
 msgstr "賦值公�左�是無效 (NULL) 值"
 
-#: src/main/eval.c:1817
+#: src/main/eval.c:1907
 msgid "target of assignment expands to non-language object"
 msgstr "賦值目標擴充到�語言的物件"
 
-#: src/main/eval.c:1900
+#: src/main/eval.c:1990
 #, c-format
 msgid "overlong name in '%s'"
 msgstr "'%s' 中的�稱太長"
 
-#: src/main/eval.c:1990
+#: src/main/eval.c:2080
 msgid "cannot do complex assignments in base namespace"
 msgstr "無法在基本�稱空間中賦予複數值"
 
-#: src/main/eval.c:1992
+#: src/main/eval.c:2082
 msgid "cannot do complex assignments in base environment"
 msgstr "無法在基本環境中賦予複數值"
 
-#: src/main/eval.c:2030 src/main/eval.c:2057
+#: src/main/eval.c:2121 src/main/eval.c:2148
 msgid "invalid function in complex assignment"
 msgstr "複數賦值中的函數�正確"
 
-#: src/main/eval.c:2117
+#: src/main/eval.c:2208
 msgid "invalid (do_set) left-hand side to assignment"
 msgstr "(do_set) 賦值公�左��正確"
 
-#: src/main/eval.c:2193
+#: src/main/eval.c:2284
 #, c-format
 msgid "'%s' is missing"
 msgstr "缺少 '%s'"
 
-#: src/main/eval.c:2348
+#: src/main/eval.c:2439
 msgid "invalid formal argument list for \"function\""
 msgstr "\"function\" 正�引數串列�正確"
 
-#: src/main/eval.c:2406 src/main/eval.c:2437 src/main/eval.c:2442
+#: src/main/eval.c:2497 src/main/eval.c:2528 src/main/eval.c:2533
 #, fuzzy, c-format
 msgid "invalid '%s' argument of type '%s'"
 msgstr "'%s' 引數�正確"
 
-#: src/main/eval.c:2434
+#: src/main/eval.c:2525
 msgid "numeric 'envir' arg not of length one"
 msgstr "數值 'envir' 引數的長度�是 1"
 
-#: src/main/eval.c:2458 src/main/eval.c:2482
+#: src/main/eval.c:2549 src/main/eval.c:2573
 msgid "restarts not supported in 'eval'"
 msgstr "'eval' �支��新啟動"
 
-#: src/main/eval.c:2541 src/main/eval.c:2554
+#: src/main/eval.c:2632 src/main/eval.c:2645
 msgid "'Recall' called from outside a closure"
 msgstr "'Recall' 從閉包外部呼�"
 
-#: src/main/eval.c:2647
+#: src/main/eval.c:2738
 msgid "value in '...' is not a promise"
 msgstr "'...' 中的值�是一個約定"
 
-#: src/main/eval.c:2908
+#: src/main/eval.c:2999
 #, c-format
 msgid "Incompatible methods (\"%s\", \"%s\") for \"%s\""
 msgstr "�相容的方法 (\"%s\", \"%s\") 用於 \"%s\""
 
-#: src/main/eval.c:2957
+#: src/main/eval.c:3048
 msgid "dispatch error in group dispatch"
 msgstr "群組派�時發生錯誤"
 
-#: src/main/eval.c:3409
+#: src/main/eval.c:3532
 #, c-format
 msgid "\"%s\" is not a %s function"
 msgstr "\"%s\" 並� %s 函數"
 
-#: src/main/eval.c:3896
+#: src/main/eval.c:4047
 msgid "node stack overflow"
 msgstr "節點堆疊�上溢�"
 
-#: src/main/eval.c:3902
+#: src/main/eval.c:4053
 msgid "integer stack overflow"
 msgstr "整數堆疊�上溢�"
 
-#: src/main/eval.c:3956
+#: src/main/eval.c:4107
 #, fuzzy
 msgid "bad opcode"
 msgstr "�當的�作代碼"
 
-#: src/main/eval.c:4932
+#: src/main/eval.c:5083
 #, c-format
 msgid "invalid %s type in 'x %s y'"
 msgstr "'x %2$s y' 中無效的 %1$s 類型"
 
-#: src/main/eval.c:5044
+#: src/main/eval.c:5195
 msgid "bytecode version mismatch; using eval"
 msgstr "�元組碼版本�符；使用 eval"
 
-#: src/main/eval.c:5049
+#: src/main/eval.c:5200
 msgid "bytecode version is too old"
 msgstr "�元組碼版本太舊"
 
-#: src/main/eval.c:5050
+#: src/main/eval.c:5201
 msgid "bytecode version is too new"
 msgstr "�元組碼版本太新"
 
-#: src/main/eval.c:5084
+#: src/main/eval.c:5235
 msgid "byte code version mismatch"
 msgstr "�元組碼版本�符"
 
-#: src/main/eval.c:5231
+#: src/main/eval.c:5383
 msgid "invalid sequence argument in for loop"
 msgstr "迴圈中的�列引數�正確"
 
-#: src/main/eval.c:5366 src/main/names.c:1309
+#: src/main/eval.c:5522 src/main/names.c:1312
 #, fuzzy, c-format
 msgid "there is no .Internal function '%s'"
 msgstr "沒有 \"%s\" 這個內部函數"
 
-#: src/main/eval.c:5464 src/main/eval.c:5810 src/main/eval.c:5850
+#: src/main/eval.c:5622 src/main/eval.c:5968 src/main/eval.c:6008
 msgid "bad function"
 msgstr "�當的函數"
 
-#: src/main/eval.c:5477
+#: src/main/eval.c:5635
 msgid "not a BUILTIN function"
 msgstr "� BUILTIN 函數"
 
-#: src/main/eval.c:5907
+#: src/main/eval.c:6066
+#, fuzzy
+msgid "bad numeric 'switch' offsets"
+msgstr "�當的數值切��移值"
+
+#: src/main/eval.c:6072
 #, fuzzy
 msgid "numeric EXPR required for 'switch' without named alternatives"
 msgstr "switch() 需�數值而無需具�的替代方案"
 
-#: src/main/eval.c:6018
+#: src/main/eval.c:6076
+#, fuzzy
+msgid "bad character 'switch' offsets"
+msgstr "�當的字元切��移值"
+
+#: src/main/eval.c:6188
 msgid "cannot find index for threaded code address"
 msgstr "找�到執行緒程�碼��的索引"
 
-#: src/main/eval.c:6078
+#: src/main/eval.c:6248
 msgid "invalid body"
 msgstr "無效的主體"
 
-#: src/main/eval.c:6098
+#: src/main/eval.c:6268
 msgid "invalid symbol"
 msgstr "符號�正確"
 
-#: src/main/eval.c:6142
+#: src/main/eval.c:6312
 msgid "argument is not a byte code object"
 msgstr "引數�是�元組碼物件"
 
-#: src/main/eval.c:6163
+#: src/main/eval.c:6334
 msgid "bad file name"
 msgstr "�當的檔案�稱"
 
-#: src/main/eval.c:6167 src/main/eval.c:6188
+#: src/main/eval.c:6338 src/main/eval.c:6359
 msgid "unable to open 'file'"
 msgstr "無法開啟 'file'"
 
-#: src/main/eval.c:6182 src/main/saveload.c:1942
+#: src/main/eval.c:6353 src/main/saveload.c:1944
 msgid "'file' must be non-empty string"
 msgstr "'file' 必須是�空字串"
 
-#: src/main/eval.c:6184 src/main/saveload.c:1944 src/main/saveload.c:2244
+#: src/main/eval.c:6355 src/main/saveload.c:1946 src/main/saveload.c:2246
 #: src/main/serialize.c:2189
 msgid "'ascii' must be logical"
 msgstr "'ascii' 必須是�輯值"
 
-#: src/main/eval.c:6255 src/main/eval.c:6274 src/main/eval.c:6304
+#: src/main/eval.c:6426 src/main/eval.c:6445 src/main/eval.c:6475
 msgid "constant buffer must be a generic vector"
 msgstr "常數緩��必須是個一般��"
 
-#: src/main/eval.c:6306
+#: src/main/eval.c:6477
 msgid "bad constant count"
 msgstr "�當的常數計數"
 
-#: src/main/eval.c:6342
+#: src/main/eval.c:6515
 msgid "profile timer in use"
 msgstr "程�概�分�計時器在使用中"
 
-#: src/main/eval.c:6344
+#: src/main/eval.c:6517
 msgid "already byte code profiling"
 msgstr "已經在進行�元組碼程�概�分�"
 
-#: src/main/eval.c:6362
+#: src/main/eval.c:6535
 msgid "setting profile timer failed"
 msgstr "程�概�分�計時器設置失敗"
 
-#: src/main/eval.c:6379
+#: src/main/eval.c:6553
 msgid "not byte code profiling"
 msgstr "��元組碼程�概�分�"
 
-#: src/main/eval.c:6394 src/main/eval.c:6397 src/main/eval.c:6400
+#: src/main/eval.c:6569 src/main/eval.c:6573 src/main/eval.c:6577
 #, fuzzy
 msgid "byte code profiling is not supported in this build"
 msgstr "這個組建�支� ICU"
@@ -3715,16 +3743,16 @@
 msgid "this graphics device does not support event handling"
 msgstr "這個圖形�置�支�事件處�"
 
-#: src/main/gevents.c:136
+#: src/main/gevents.c:135
 msgid "invalid prompt"
 msgstr "�示�正確"
 
-#: src/main/gevents.c:148
+#: src/main/gevents.c:146
 #, fuzzy
 msgid "recursive use of 'getGraphicsEvent' not supported"
 msgstr "�支� getGraphicsEvent 的�迴使用"
 
-#: src/main/gevents.c:158
+#: src/main/gevents.c:157
 msgid "no graphics event handlers set"
 msgstr "沒有任何圖形事件處�常�被設定"
 
@@ -3905,7 +3933,7 @@
 msgstr "無效的正�表示�，原因是 '%s'"
 
 #: src/main/grep.c:225 src/main/grep.c:315 src/main/grep.c:426
-#: src/main/grep.c:900 src/main/grep.c:2499
+#: src/main/grep.c:900 src/main/grep.c:2502
 #, c-format
 msgid "input string %d is invalid UTF-8"
 msgstr "輸入字串 %d 是無效的 UTF-8"
@@ -3998,26 +4026,25 @@
 msgid "internet routines cannot be accessed in module"
 msgstr "無法讀寫模組中的網際網路例行程�"
 
-#: src/main/internet.c:94 src/main/internet.c:128 src/main/internet.c:141
-#: src/main/internet.c:152 src/main/internet.c:163 src/main/internet.c:174
-#: src/main/internet.c:183 src/main/internet.c:194 src/main/internet.c:205
-#: src/main/internet.c:214 src/main/internet.c:224 src/main/internet.c:338
-#: src/main/internet.c:349 src/main/internet.c:360 src/main/internet.c:372
+#: src/main/internet.c:94 src/main/internet.c:106 src/main/internet.c:119
+#: src/main/internet.c:130 src/main/internet.c:141 src/main/internet.c:152
+#: src/main/internet.c:161 src/main/internet.c:172 src/main/internet.c:183
+#: src/main/internet.c:192 src/main/internet.c:202 src/main/internet.c:318
+#: src/main/internet.c:330 src/main/internet.c:342 src/main/internet.c:354
 msgid "internet routines cannot be loaded"
 msgstr "無法載入網際網路例行程�"
 
-#: src/main/internet.c:109 src/main/memory.c:3487 src/main/memory.c:3497
-#: src/main/memory.c:3509 src/main/memory.c:3523 src/main/memory.c:3538
-#: src/main/memory.c:3556
-msgid "bad value"
-msgstr "�當的值"
-
-#: src/main/internet.c:238 src/main/internet.c:252 src/main/internet.c:268
-#: src/main/internet.c:280 src/main/internet.c:294 src/main/internet.c:314
-#: src/main/internet.c:327
+#: src/main/internet.c:216 src/main/internet.c:230 src/main/internet.c:247
+#: src/main/internet.c:259 src/main/internet.c:273 src/main/internet.c:293
+#: src/main/internet.c:306
 msgid "socket routines cannot be loaded"
 msgstr "無法載入�槽例行程�"
 
+#: src/main/internet.c:242
+#, fuzzy
+msgid "attempt to close invalid socket"
+msgstr "試圖設定無效的 'comment' 屬性"
+
 #: src/main/lapack.c:39
 #, fuzzy
 msgid "LAPACK routines cannot be accessed in module"
@@ -4028,38 +4055,38 @@
 msgid "LAPACK routines cannot be loaded"
 msgstr "無法載入�槽例行程�"
 
-#: src/main/logic.c:79 src/main/logic.c:141
+#: src/main/logic.c:80 src/main/logic.c:142
 msgid "operations are possible only for numeric, logical or complex types"
 msgstr "�算��用於數值��輯或複數類型"
 
-#: src/main/logic.c:89
+#: src/main/logic.c:90
 msgid "binary operation on non-conformable arrays"
 msgstr "二元�算�能在�調和陣列上進行"
 
-#: src/main/logic.c:115 src/main/relop.c:247
+#: src/main/logic.c:116 src/main/relop.c:241
 msgid "non-conformable time series"
 msgstr "�調和時間�列"
 
-#: src/main/logic.c:245
+#: src/main/logic.c:247
 #, c-format
 msgid "'%s' operator requires 2 arguments"
 msgstr "'%s' �算�需�兩個引數"
 
-#: src/main/logic.c:252
+#: src/main/logic.c:254
 #, c-format
 msgid "invalid 'x' type in 'x %s y'"
 msgstr "'x %s y' 中的 'x' 類型�正確"
 
-#: src/main/logic.c:259
+#: src/main/logic.c:261
 #, c-format
 msgid "invalid 'y' type in 'x %s y'"
 msgstr "'x %s y' 中的 'y' 類型�正確"
 
-#: src/main/logic.c:332
+#: src/main/logic.c:334
 msgid "Unary operator `!' called with two arguments"
 msgstr "呼�一元�算 '!' 時用了兩個引數"
 
-#: src/main/logic.c:437
+#: src/main/logic.c:439
 #, c-format
 msgid "coercing argument of type '%s' to logical"
 msgstr "強制變更 '%s' 類型的引數為�輯類型"
@@ -4068,61 +4095,75 @@
 msgid "dummy - do not translate"
 msgstr "dummy - do not translate"
 
-#: src/main/main.c:481
+#: src/main/main.c:329
+#, fuzzy
+msgid "error during cleanup\n"
+msgstr "收�時發生錯誤: "
+
+#: src/main/main.c:336
+msgid "Execution halted\n"
+msgstr "�止執行\n"
+
+#: src/main/main.c:505
 msgid "Error: segfault from C stack overflow\n"
 msgstr "錯誤: C 堆疊�上溢�的�段錯誤\n"
 
-#: src/main/main.c:853
+#: src/main/main.c:888
 msgid "unable to open the base package\n"
 msgstr "無法開啟基本套件\n"
 
-#: src/main/main.c:931
+#: src/main/main.c:971
 #, c-format
 msgid "unable to restore saved data in %s\n"
 msgstr "無法還原儲存在 %s 中的資料\n"
 
-#: src/main/main.c:978
+#: src/main/main.c:1020
 msgid "During startup - "
 msgstr "於啟動期間 - "
 
-#: src/main/main.c:1232
+#: src/main/main.c:1036
+#, fuzzy
+msgid "unable to initialize the JIT\n"
+msgstr "無法開啟檔案來讀�資料"
+
+#: src/main/main.c:1290
 msgid "cannot quit from browser"
 msgstr "無法離開�覽器"
 
-#: src/main/main.c:1236
+#: src/main/main.c:1294
 msgid "one of \"yes\", \"no\", \"ask\" or \"default\" expected."
 msgstr "�能用 \"yes\"�\"no\"�\"ask\" 或 \"default\" 中的一個。"
 
-#: src/main/main.c:1241
+#: src/main/main.c:1299
 msgid "save=\"ask\" in non-interactive use: command-line default will be used"
 msgstr "save=\"ask\" �能在�交互狀態時使用：改用命令列�設值"
 
-#: src/main/main.c:1249
+#: src/main/main.c:1307
 msgid "unrecognized value of 'save'"
 msgstr "沒有這種 'save' 值"
 
-#: src/main/main.c:1252
+#: src/main/main.c:1310
 msgid "invalid 'status', 0 assumed"
 msgstr "'status' �正確, �定為 0"
 
-#: src/main/main.c:1257
+#: src/main/main.c:1315
 msgid "invalid 'runLast', FALSE assumed"
 msgstr "'runLast' �正確, �定為 FALSE"
 
-#: src/main/main.c:1288
+#: src/main/main.c:1346
 msgid "cannot allocate space for toplevel callback element"
 msgstr "無法為最高層回呼元素�置空間"
 
-#: src/main/main.c:1366
+#: src/main/main.c:1424
 msgid "negative index passed to R_removeTaskCallbackByIndex"
 msgstr "負的索引值被傳�給 R_removeTaskCallbackByIndex"
 
-#: src/main/main.c:1476
+#: src/main/main.c:1534
 #, c-format
 msgid "warning messages from top-level task callback '%s'\n"
 msgstr "最高層任務回呼 '%s' 產生了警告訊�\n"
 
-#: src/main/main.c:1532
+#: src/main/main.c:1591
 msgid "top-level task callback did not return a logical value"
 msgstr "最高層任務回呼沒回傳�輯值"
 
@@ -4164,163 +4205,168 @@
 msgid_plural "unused arguments %s"
 msgstr[0] "未使用的引數 %s"
 
-#: src/main/memory.c:1238
+#: src/main/memory.c:1234
 msgid "can only weakly reference/finalize reference objects"
 msgstr "�考物件�能被弱型�考或被終了"
 
-#: src/main/memory.c:1272
+#: src/main/memory.c:1268
 msgid "finalizer must be a function or NULL"
 msgstr "終了程�必須是函數或 NULL"
 
-#: src/main/memory.c:1328 src/main/memory.c:1336 src/main/memory.c:1347
+#: src/main/memory.c:1324 src/main/memory.c:1332 src/main/memory.c:1343
 msgid "not a weak reference"
 msgstr "�弱型�考"
 
-#: src/main/memory.c:1478
+#: src/main/memory.c:1474
 msgid "first argument must be environment or external pointer"
 msgstr "第一引數必須是環境或外部指標"
 
-#: src/main/memory.c:1480
+#: src/main/memory.c:1476
 msgid "second argument must be a function"
 msgstr "第二引數必須是函數"
 
-#: src/main/memory.c:1484
+#: src/main/memory.c:1480
 msgid "third argument must be 'TRUE' or 'FALSE'"
 msgstr "第三引數的值必須是 'TRUE' 或 'FALSE'"
 
-#: src/main/memory.c:1975
+#: src/main/memory.c:1979
 msgid "vector memory exhausted (limit reached?)"
 msgstr "��記憶體已用完 (�到了極值?)"
 
-#: src/main/memory.c:1981
+#: src/main/memory.c:1985
 msgid "cons memory exhausted (limit reached?)"
 msgstr "cons 記憶體已用完 (�到了極值?)"
 
-#: src/main/memory.c:1986
+#: src/main/memory.c:1990
 msgid "memory exhausted (limit reached?)"
 msgstr "記憶體已耗盡 (�到了極值？)"
 
-#: src/main/memory.c:2122
+#: src/main/memory.c:2126
 #, fuzzy, c-format
 msgid "cannot allocate memory block of size %0.f Tb"
 msgstr "無法�置大�為 %0.1f Gb 的記憶體�塊"
 
-#: src/main/memory.c:2127
+#: src/main/memory.c:2131
 #, c-format
 msgid "cannot allocate memory block of size %0.1f Gb"
 msgstr "無法�置大�為 %0.1f Gb 的記憶體�塊"
 
-#: src/main/memory.c:2454
+#: src/main/memory.c:2458
 #, fuzzy
 msgid "vector is too large"
 msgstr "指定的��大�太大"
 
-#: src/main/memory.c:2457
+#: src/main/memory.c:2461
 msgid "negative length vectors are not allowed"
 msgstr "��許負長度的��"
 
-#: src/main/memory.c:2483 src/main/memory.c:2496 src/main/memory.c:2509
-#: src/main/memory.c:2524
+#: src/main/memory.c:2487 src/main/memory.c:2500 src/main/memory.c:2513
+#: src/main/memory.c:2528
 #, c-format
 msgid "cannot allocate vector of length %d"
 msgstr "無法分派長度為 %d 的��"
 
-#: src/main/memory.c:2545
+#: src/main/memory.c:2549
 #, c-format
 msgid "invalid type/length (%s/%d) in vector allocation"
 msgstr "���置的類型/長度 (%s/%d) 無效"
 
-#: src/main/memory.c:2644
+#: src/main/memory.c:2648
 #, c-format
 msgid "cannot allocate vector of size %0.1f Gb"
 msgstr "無法�置大�為 %0.1f Gb 的��"
 
-#: src/main/memory.c:2648
+#: src/main/memory.c:2652
 #, c-format
 msgid "cannot allocate vector of size %0.1f Mb"
 msgstr "無法�置大�為 %0.1f Mb 的��"
 
-#: src/main/memory.c:2652
+#: src/main/memory.c:2656
 #, c-format
 msgid "cannot allocate vector of size %0.f Kb"
 msgstr "無法�置大�為 %0.f Kb 的��"
 
-#: src/main/memory.c:3049
+#: src/main/memory.c:3071
 msgid "protect(): protection stack overflow"
 msgstr "protect()：防止堆疊�上溢�"
 
-#: src/main/memory.c:3056
+#: src/main/memory.c:3078
 #, fuzzy, c-format
 msgid "unprotect(): only %d protected item"
 msgid_plural "unprotect(): only %d protected items"
 msgstr[0] "unprotect()：�有 %d 個��護項目"
 
-#: src/main/memory.c:3091
+#: src/main/memory.c:3113
 msgid "unprotect_ptr: pointer not found"
 msgstr "unprotect_ptr: 找�到指標"
 
-#: src/main/memory.c:3129
+#: src/main/memory.c:3151
 #, fuzzy, c-format
 msgid "R_Reprotect: only %d protected item, can't reprotect index %d"
 msgid_plural "R_Reprotect: only %d protected items, can't reprotect index %d"
 msgstr[0] "unprotect()：�有 %d 個��護項目"
 
-#: src/main/memory.c:3181
+#: src/main/memory.c:3203
 #, fuzzy, c-format
 msgid "'Calloc' could not allocate memory (%.0f of %u bytes)"
 msgstr "Calloc 無法�置記憶體 (%.0f 於 %u �元組)"
 
-#: src/main/memory.c:3192
+#: src/main/memory.c:3214
 #, fuzzy, c-format
 msgid "'Realloc' could not re-allocate memory (%.0f bytes)"
 msgstr "Realloc 無法�新�置記憶體 (%.0f �元組)"
 
-#: src/main/memory.c:3433
+#: src/main/memory.c:3460
 msgid "not safe to return vector pointer"
 msgstr "回傳��指標�是安全的�法"
 
-#: src/main/memory.c:3444
+#: src/main/memory.c:3471
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_STRING_ELT"
 msgstr ""
 
-#: src/main/memory.c:3460
+#: src/main/memory.c:3487
 #, c-format
 msgid "attempt to set index %lu/%lu in SET_VECTOR_ELT"
 msgstr ""
 
-#: src/main/memory.c:3719
+#: src/main/memory.c:3514 src/main/memory.c:3524 src/main/memory.c:3536
+#: src/main/memory.c:3550 src/main/memory.c:3565 src/main/memory.c:3583
+msgid "bad value"
+msgstr "�當的值"
+
+#: src/main/memory.c:3746
 msgid "memory profiling is not available on this system"
 msgstr "這個系統上無法�得記憶體�寫檔"
 
-#: src/main/memory.c:3783
+#: src/main/memory.c:3810
 #, c-format
 msgid "Rprofmem: cannot open output file '%s'"
 msgstr "Rprofmem：無法開啟輸出檔案 '%s'"
 
-#: src/main/memory.c:3891
+#: src/main/memory.c:3915
 #, c-format
 msgid "long vectors not supported yet: %s:%d"
 msgstr ""
 
-#: src/main/names.c:1018
+#: src/main/names.c:1021
 msgid "string argument required"
 msgstr "需�字串引數"
 
-#: src/main/names.c:1021
+#: src/main/names.c:1024
 msgid "no such primitive function"
 msgstr "沒有此一原始函數"
 
-#: src/main/names.c:1209 src/main/names.c:1239
+#: src/main/names.c:1212 src/main/names.c:1242
 msgid "attempt to use zero-length variable name"
 msgstr "�能用零長度的變數�"
 
-#: src/main/names.c:1211 src/main/names.c:1241
+#: src/main/names.c:1214 src/main/names.c:1244
 #, c-format
 msgid "variable names are limited to %d bytes"
 msgstr "變數�稱��為 %d �元組"
 
-#: src/main/names.c:1304 src/main/names.c:1307
+#: src/main/names.c:1307 src/main/names.c:1310
 msgid "invalid .Internal() argument"
 msgstr ".Internal() 引數�正確"
 
@@ -4361,110 +4407,110 @@
 msgid "no applicable method for '%s' applied to an object of class \"%s\""
 msgstr "沒有�用的方法�將 '%s' 套用到 \"%s\" 類別的物件"
 
-#: src/main/objects.c:558
+#: src/main/objects.c:582
 msgid "'NextMethod' called from outside a function"
 msgstr "'NextMethod' �能在函數外呼�"
 
-#: src/main/objects.c:564
+#: src/main/objects.c:588
 msgid "'NextMethod' called from an anonymous function"
 msgstr "'NextMethod' �能在匿�函數內呼�"
 
-#: src/main/objects.c:585
+#: src/main/objects.c:609
 msgid "no calling generic was found: was a method called directly?"
 msgstr "找�到呼�此方法的一般函數: 是�是已經直接呼�這個方法?"
 
-#: src/main/objects.c:588
+#: src/main/objects.c:612
 #, c-format
 msgid "'function' is not a function, but of type %d"
 msgstr "'function' �是函數, 而是類型 %d"
 
-#: src/main/objects.c:615
+#: src/main/objects.c:639
 msgid "wrong argument ..."
 msgstr "引數�正確 ..."
 
-#: src/main/objects.c:627
+#: src/main/objects.c:651
 msgid "object not specified"
 msgstr "物件沒有指定"
 
-#: src/main/objects.c:635 src/main/objects.c:642
+#: src/main/objects.c:659 src/main/objects.c:666
 msgid "generic function not specified"
 msgstr "一般功能沒有指定"
 
-#: src/main/objects.c:639
+#: src/main/objects.c:663
 #, fuzzy
 msgid "invalid generic argument to 'NextMethod'"
 msgstr "NextMethod �能用一般引數"
 
-#: src/main/objects.c:651
+#: src/main/objects.c:675
 #, fuzzy
 msgid "invalid 'group' argument found in 'NextMethod'"
 msgstr "NextMethod �能用 'group' 引數"
 
-#: src/main/objects.c:668
+#: src/main/objects.c:692
 msgid "wrong value for .Method"
 msgstr ".Method 的值�正確"
 
-#: src/main/objects.c:678
+#: src/main/objects.c:702
 msgid "Incompatible methods ignored"
 msgstr "�相容方法，忽略�用"
 
-#: src/main/objects.c:735 src/main/objects.c:740
+#: src/main/objects.c:759 src/main/objects.c:766
 msgid "no method to invoke"
 msgstr "沒有�以呼�的方法"
 
-#: src/main/objects.c:790
+#: src/main/objects.c:817
 msgid "cannot unclass an environment"
 msgstr "無法�消環境的類別"
 
-#: src/main/objects.c:793
+#: src/main/objects.c:820
 msgid "cannot unclass an external pointer"
 msgstr "無法�消外部指標的類別"
 
-#: src/main/objects.c:829
+#: src/main/objects.c:856
 msgid "'what' must be a character vector"
 msgstr "'what' 必須是字元��"
 
-#: src/main/objects.c:833
+#: src/main/objects.c:860
 msgid "'which' must be a length 1 logical vector"
 msgstr "'which' 必須是長度為 1 的�輯��"
 
-#: src/main/objects.c:839
+#: src/main/objects.c:866
 msgid "use 'is()' instead of 'inherits()' on S4 objects"
 msgstr "在 S4 物件上使用 'is()' 來代替 'inherits()'"
 
-#: src/main/objects.c:968
+#: src/main/objects.c:995
 msgid "could not find correct environment; please report!"
 msgstr ""
 
-#: src/main/objects.c:1012
+#: src/main/objects.c:1039
 #, fuzzy
 msgid "'onOff' must be TRUE or FALSE"
 msgstr "'all.x' 必須是 TRUE 或 FALSE"
 
-#: src/main/objects.c:1077
+#: src/main/objects.c:1104
 #, c-format
 msgid "unable to find a non-generic version of function \"%s\""
 msgstr "無法找到�一般版本的函數 \"%s\""
 
-#: src/main/objects.c:1109
+#: src/main/objects.c:1136
 #, fuzzy
 msgid ""
 "'standardGeneric' called without 'methods' dispatch enabled (will be ignored)"
 msgstr "standardGeneric 被呼�，但方法分派沒有啟用 (忽略�用)"
 
-#: src/main/objects.c:1118
+#: src/main/objects.c:1145
 #, fuzzy
 msgid "argument to 'standardGeneric' must be a non-empty character string"
 msgstr "standardGeneric 的引數必須是�空字串"
 
-#: src/main/objects.c:1123
+#: src/main/objects.c:1150
 #, c-format
 msgid ""
 "call to standardGeneric(\"%s\") apparently not from the body of that generic "
 "function"
 msgstr "�能從��屬函數中呼� standardGeneric(\"%s\") "
 
-#: src/main/objects.c:1214
+#: src/main/objects.c:1249
 #, c-format
 msgid ""
 "invalid primitive methods code (\"%s\"): should be \"clear\", \"reset\", "
@@ -4473,117 +4519,122 @@
 "原始方法程�碼 (\"%s\") �正確：應該是 \"clear\"�\"reset\"�\"set\" 或 "
 "\"suppress\""
 
-#: src/main/objects.c:1222
+#: src/main/objects.c:1257
 msgid "invalid object: must be a primitive function"
 msgstr "物件�正確: 必須是原始函數"
 
-#: src/main/objects.c:1269
+#: src/main/objects.c:1304
 #, c-format
 msgid ""
 "the formal definition of a primitive generic must be a function object (got "
 "type '%s')"
 msgstr "原始一般函數的正�定義必須是函數物件 (�能是 '%s' 類別)"
 
-#: src/main/objects.c:1299
+#: src/main/objects.c:1334
 #, fuzzy, c-format
 msgid "object returned as generic function \"%s\" does not appear to be one"
 msgstr "以通用函數 \"%s\" 型�回傳的物件看來�是一個"
 
-#: src/main/objects.c:1404
+#: src/main/objects.c:1439
 msgid "invalid primitive operation given for dispatch"
 msgstr "�能分派原始�算"
 
-#: src/main/objects.c:1430 src/main/objects.c:1449
+#: src/main/objects.c:1468 src/main/objects.c:1487
 msgid "dispatch error"
 msgstr "分派錯誤"
 
-#: src/main/objects.c:1443
+#: src/main/objects.c:1481
 #, c-format
 msgid ""
 "primitive function \"%s\" has been set for methods but no generic function "
 "supplied"
 msgstr "原始函數 \"%s\" 設定了方法，但沒有一般函數 "
 
-#: src/main/objects.c:1468
+#: src/main/objects.c:1506
 msgid "C level MAKE_CLASS macro called with NULL string pointer"
 msgstr "C 級的 MAKE_TYPE 巨集�能用 NULL 字串指標來呼�"
 
-#: src/main/objects.c:1484
+#: src/main/objects.c:1522
 #, fuzzy
 msgid "'methods' package not yet loaded"
 msgstr "無法載入 Hershey 字型"
 
-#: src/main/objects.c:1494
+#: src/main/objects.c:1532
 msgid "R_getClassDef(.) called with NULL string pointer"
 msgstr "R_getClassDef(.)  以空字串指標來呼�"
 
-#: src/main/objects.c:1539
+#: src/main/objects.c:1577
 msgid "C level NEW macro called with null class definition pointer"
 msgstr "C 級的 NEW 巨集�能用 null 類別定義指標來呼�"
 
-#: src/main/objects.c:1543
+#: src/main/objects.c:1581
 #, c-format
 msgid "trying to generate an object from a virtual class (\"%s\")"
 msgstr "試著從虛擬類別 (\"%s\") 產生物件"
 
-#: src/main/objects.c:1625
+#: src/main/objects.c:1663
 #, fuzzy, c-format
 msgid "object of class \"%s\" does not correspond to a valid S3 object"
 msgstr "\"%s\" 類別的物件並�相應於有效的 S3 物件"
 
-#: src/main/options.c:120 src/main/options.c:181
+#: src/main/options.c:121 src/main/options.c:182
 msgid "corrupted options list"
 msgstr "已�壞的�項串列"
 
-#: src/main/options.c:130
+#: src/main/options.c:131
 msgid "invalid printing width, used 80"
 msgstr "無效的�出寬度，使用 80"
 
-#: src/main/options.c:141
+#: src/main/options.c:142
 msgid "invalid printing digits, used 7"
 msgstr "無效的�出�數，使用 7"
 
-#: src/main/options.c:153
+#: src/main/options.c:154
 msgid "invalid 'deparse.cutoff', used 60"
 msgstr ""
 
-#: src/main/options.c:165
+#: src/main/options.c:166
 msgid "invalid value for \"device.ask.default\", using FALSE"
 msgstr "用於 \"device.ask.default\" 的值無效，使用 FALSE"
 
-#: src/main/options.c:414
+#: src/main/options.c:416
 msgid "list argument has no valid names"
 msgstr "串列引數沒有任何有效�稱"
 
-#: src/main/options.c:443
+#: src/main/options.c:445
 #, c-format
 msgid "invalid 'width' parameter, allowed %d...%d"
 msgstr "無效的 'width' �數，�許 %d...%d"
 
-#: src/main/options.c:454
+#: src/main/options.c:456
 #, c-format
 msgid "invalid 'digits' parameter, allowed %d...%d"
 msgstr "無效的 'digits' �數，�許 %d...%d"
 
-#: src/main/options.c:461
+#: src/main/options.c:463
 #, c-format
 msgid "'expressions' parameter invalid, allowed %d...%d"
 msgstr "'expressions' �數無效，�許 %d...%d"
 
-#: src/main/options.c:468 src/main/options.c:476 src/main/options.c:482
-#: src/main/options.c:490 src/main/options.c:497 src/main/options.c:502
-#: src/main/options.c:509 src/main/options.c:515 src/main/options.c:521
-#: src/main/options.c:526 src/main/options.c:531 src/main/options.c:540
-#: src/main/options.c:546 src/main/options.c:552 src/main/options.c:562
-#: src/main/options.c:572 src/main/options.c:578 src/main/options.c:586
-#: src/main/options.c:593 src/main/options.c:600 src/main/options.c:607
-#: src/main/options.c:614 src/main/options.c:622 src/main/options.c:631
-#: src/main/options.c:634 src/main/options.c:640
+#: src/main/options.c:470 src/main/options.c:478 src/main/options.c:484
+#: src/main/options.c:492 src/main/options.c:499 src/main/options.c:504
+#: src/main/options.c:511 src/main/options.c:517 src/main/options.c:523
+#: src/main/options.c:528 src/main/options.c:533 src/main/options.c:542
+#: src/main/options.c:548 src/main/options.c:554 src/main/options.c:564
+#: src/main/options.c:578 src/main/options.c:584 src/main/options.c:592
+#: src/main/options.c:599 src/main/options.c:606 src/main/options.c:613
+#: src/main/options.c:620 src/main/options.c:628 src/main/options.c:637
+#: src/main/options.c:640 src/main/options.c:646
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "無效的值用於 '%s'"
 
-#: src/main/options.c:627 src/main/options.c:656
+#: src/main/options.c:569
+#, fuzzy
+msgid "'OutDec' must be a string of one character"
+msgstr "'dec' 必須是單一字元"
+
+#: src/main/options.c:633 src/main/options.c:662
 msgid "\"par.ask.default\" has been replaced by \"device.ask.default\""
 msgstr "\"par.ask.default\" 已被 \"device.ask.default\" 所置�"
 
@@ -4608,11 +4659,16 @@
 msgid "first argument must be atomic"
 msgstr "第一個引數必須是基元"
 
-#: src/main/paste.c:558
+#: src/main/paste.c:448
+#, fuzzy
+msgid "'decimal.mark' must be a string of one character"
+msgstr "'dec' 必須是單一字元"
+
+#: src/main/paste.c:579
 msgid "Impossible mode ( x )"
 msgstr "這種狀態 (x) 是��能的"
 
-#: src/main/paste.c:643
+#: src/main/paste.c:663
 msgid "atomic vector arguments only"
 msgstr "�能用基元��引數"
 
@@ -4620,214 +4676,196 @@
 msgid "invalid filename specification"
 msgstr "檔案�稱設定�正確"
 
-#: src/main/platform.c:375 src/main/platform.c:419
+#: src/main/platform.c:375 src/main/platform.c:420
 msgid "write error during file append"
 msgstr "檔案附加時寫入發生錯誤"
 
-#: src/main/platform.c:394
+#: src/main/platform.c:395
 msgid "nothing to append to"
 msgstr "沒有�以附加的檔案"
 
-#: src/main/platform.c:448 src/main/platform.c:793 src/main/platform.c:975
+#: src/main/platform.c:449 src/main/platform.c:797 src/main/platform.c:979
 msgid "invalid filename argument"
 msgstr "filename 引數�正確"
 
-#: src/main/platform.c:460
+#: src/main/platform.c:461
 #, c-format
 msgid "cannot create file '%s', reason '%s'"
 msgstr "無法建立檔案 '%s' ，原因是 '%s'"
 
-#: src/main/platform.c:475 src/main/platform.c:545 src/main/platform.c:627
+#: src/main/platform.c:476 src/main/platform.c:546 src/main/platform.c:629
 msgid "invalid first filename"
 msgstr "第一個檔案�稱�正確"
 
-#: src/main/platform.c:487
+#: src/main/platform.c:488
 #, c-format
 msgid "cannot remove file '%s', reason '%s'"
 msgstr "無法移除檔案 '%s' ，原因是 '%s'"
 
-#: src/main/platform.c:547 src/main/platform.c:629
+#: src/main/platform.c:548 src/main/platform.c:631
 msgid "invalid second filename"
 msgstr "第二個檔案�稱�正確"
 
-#: src/main/platform.c:549 src/main/platform.c:631
+#: src/main/platform.c:551 src/main/platform.c:634
 msgid "nothing to link"
 msgstr "沒有�以連�的檔案"
 
-#: src/main/platform.c:559
+#: src/main/platform.c:561
 #, fuzzy
 msgid "symbolic links are not supported on this version of Windows"
 msgstr "這個平臺�支�符號連�"
 
-#: src/main/platform.c:581
+#: src/main/platform.c:583
 #, fuzzy, c-format
 msgid "cannot symlink '%ls' to '%ls', reason '%s'"
 msgstr "無法將 '%s' 符號連�到 '%s' ，原因是 '%s'"
 
-#: src/main/platform.c:601
+#: src/main/platform.c:603
 #, c-format
 msgid "cannot symlink '%s' to '%s', reason '%s'"
 msgstr "無法將 '%s' 符號連�到 '%s' ，原因是 '%s'"
 
-#: src/main/platform.c:609
+#: src/main/platform.c:611
 #, fuzzy
 msgid "symbolic links are not supported on this platform"
 msgstr "這個平臺�支�符號連�"
 
-#: src/main/platform.c:649
+#: src/main/platform.c:652
 #, c-format
 msgid "cannot link '%ls' to '%ls', reason '%s'"
 msgstr "無法將 '%ls' ��到 '%ls' ，原因是 '%s'"
 
-#: src/main/platform.c:669
+#: src/main/platform.c:672
 #, c-format
 msgid "cannot link '%s' to '%s', reason '%s'"
 msgstr "無法將 '%s' ��到 '%s' ，原因是 '%s'"
 
-#: src/main/platform.c:678
+#: src/main/platform.c:681
 msgid "(hard) links are not supported on this platform"
 msgstr "這個平臺�支� (硬�) ��"
 
-#: src/main/platform.c:709
+#: src/main/platform.c:713
 msgid "'from' and 'to' are of different lengths"
 msgstr "'from' 和 'to' 具有��的長度"
 
-#: src/main/platform.c:720 src/main/platform.c:730
+#: src/main/platform.c:724 src/main/platform.c:734
 msgid "expanded 'from' name too long"
 msgstr "展開後的 'from' �稱太長"
 
-#: src/main/platform.c:724 src/main/platform.c:734
+#: src/main/platform.c:728 src/main/platform.c:738
 msgid "expanded 'to' name too long"
 msgstr "展開後的 'to' �稱太長"
 
-#: src/main/platform.c:738
+#: src/main/platform.c:742
 #, c-format
 msgid "cannot rename file '%s' to '%s', reason '%s'"
 msgstr "無法將檔案 '%s' �新命�為 ' %s' ，原因是 '%s'"
 
-#: src/main/platform.c:1164
+#: src/main/platform.c:1168
 msgid "invalid 'pattern' regular expression"
 msgstr "'pattern' 正�表示��正確"
 
-#: src/main/platform.c:1281
+#: src/main/platform.c:1285
 msgid "unable to determine R home location"
 msgstr "無法確定 R 家目錄�置"
 
-#: src/main/platform.c:1334
+#: src/main/platform.c:1338
 msgid "file name too long"
 msgstr "檔案�稱太長"
 
-#: src/main/platform.c:1582 src/main/platform.c:1629 src/main/sysutils.c:1800
-#: src/main/sysutils.c:1814
+#: src/main/platform.c:1586 src/main/platform.c:1633 src/main/sysutils.c:1806
+#: src/main/sysutils.c:1820
 msgid "internal out-of-memory condition"
 msgstr "內部記憶體�足的狀�"
 
-#: src/main/platform.c:1625 src/main/sysutils.c:1810
+#: src/main/platform.c:1629 src/main/sysutils.c:1816
 #, c-format
 msgid "read error on '%s'"
 msgstr "於 '%s' 讀�錯誤"
 
-#: src/main/platform.c:1787
+#: src/main/platform.c:1728
 msgid "setting 'LC_NUMERIC' may cause R to function strangely"
 msgstr "正在設定 'LC_NUMERIC' �能會使得 R 的�作異常"
 
-#: src/main/platform.c:1801
+#: src/main/platform.c:1742
 msgid "LC_MESSAGES exists on Windows but is not operational"
 msgstr "LC_MESSAGES 存在於 Windows 但是�作�正常"
 
-#: src/main/platform.c:1828
+#: src/main/platform.c:1769
 #, c-format
 msgid "OS reports request to set locale to \"%s\" cannot be honored"
 msgstr "作業系統回報無法實�設定語�為 \"%s\" 的�求"
 
-#: src/main/platform.c:2148
-msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' 必須是長度為 1 的字元��"
-
-#: src/main/platform.c:2154
-#, c-format
-msgid "nsl() was unable to resolve host '%s'"
-msgstr "nsl() 無法分辨主機 '%s'"
-
-#: src/main/platform.c:2161
-#, fuzzy
-msgid "unknown format returned by C function 'gethostbyname'"
-msgstr "gethostbyname 回傳了錯誤的格�"
-
-#: src/main/platform.c:2170
-msgid "nsl() is not supported on this platform"
-msgstr "本平臺�支� nsl()"
-
-#: src/main/platform.c:2241
+#: src/main/platform.c:2131
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已存在"
 
-#: src/main/platform.c:2244
+#: src/main/platform.c:2134
 #, c-format
 msgid "cannot create dir '%s', reason '%s'"
 msgstr "無法建立目錄 '%s' ，原因是 '%s'"
 
-#: src/main/platform.c:2290
+#: src/main/platform.c:2181
 #, c-format
 msgid "'%ls' already exists"
 msgstr "'%ls' 已經存在"
 
-#: src/main/platform.c:2294
+#: src/main/platform.c:2183 src/main/platform.c:2189
 #, c-format
 msgid "cannot create dir '%ls', reason '%s'"
 msgstr "無法建立目錄 '%ls' ，原因是 '%s'"
 
-#: src/main/platform.c:2328 src/main/platform.c:2537
+#: src/main/platform.c:2223 src/main/platform.c:2435
 msgid "too deep nesting"
 msgstr ""
 
-#: src/main/platform.c:2336 src/main/platform.c:2349 src/main/platform.c:2367
+#: src/main/platform.c:2231 src/main/platform.c:2244 src/main/platform.c:2262
 #, fuzzy
 msgid "over-long path"
 msgstr "胚騰長度為零"
 
-#: src/main/platform.c:2356
+#: src/main/platform.c:2251
 #, c-format
 msgid "problem creating directory %ls: %s"
 msgstr "建立目錄 %ls 時出了�題：%s"
 
-#: src/main/platform.c:2376
+#: src/main/platform.c:2271
 #, c-format
 msgid "problem reading dir %ls: %s"
 msgstr "讀�目錄 %ls 時出了�題：%s"
 
-#: src/main/platform.c:2387 src/main/platform.c:2553 src/main/platform.c:2566
-#: src/main/platform.c:2586 src/main/platform.c:2608
+#: src/main/platform.c:2282 src/main/platform.c:2451 src/main/platform.c:2464
+#: src/main/platform.c:2484 src/main/platform.c:2506
 #, fuzzy
 msgid "over-long path length"
 msgstr "胚騰長度為零"
 
-#: src/main/platform.c:2395
+#: src/main/platform.c:2290
 #, c-format
 msgid "problem copying %ls to %ls: %s"
 msgstr "複製 %ls 到 %ls 時出了�題：%s"
 
-#: src/main/platform.c:2575
+#: src/main/platform.c:2473
 #, c-format
 msgid "problem creating directory %s: %s"
 msgstr "建立目錄 %s 時出了�題：%s"
 
-#: src/main/platform.c:2595
+#: src/main/platform.c:2493
 #, c-format
 msgid "problem reading directory %s: %s"
 msgstr "讀�目錄 %s 時出了�題：%s"
 
-#: src/main/platform.c:2617
+#: src/main/platform.c:2515
 #, c-format
 msgid "problem copying %s to %s: %s"
 msgstr "複製 %s 到 %s 時出了�題：%s"
 
-#: src/main/platform.c:2754
+#: src/main/platform.c:2653
 msgid "'mode' must be of length at least one"
 msgstr "'mode' 的長度必須是至少一個"
 
-#: src/main/platform.c:2821
+#: src/main/platform.c:2720
 msgid "insufficient OS support on this platform"
 msgstr "這個平臺的作業系統支��足"
 
@@ -4872,70 +4910,75 @@
 msgid "Metric information not available for this family/device"
 msgstr "度�資訊無法用於這個家�/�置"
 
-#: src/main/print.c:148 src/main/print.c:254
+#: src/main/print.c:140 src/main/print.c:247
 msgid "invalid 'na.print' specification"
 msgstr "'na.print' 設定�正確"
 
-#: src/main/print.c:157
+#: src/main/print.c:149
 msgid "invalid row labels"
 msgstr "列標記�正確"
 
-#: src/main/print.c:159
+#: src/main/print.c:151
 msgid "invalid column labels"
 msgstr "行標記�正確"
 
-#: src/main/print.c:183
+#: src/main/print.c:176
 msgid "non-function argument to .Internal(print.function(.))"
 msgstr ".Internal (print.function(.)) 的�函數引數"
 
-#: src/main/print.c:264
+#: src/main/print.c:257
 msgid "'gap' must be non-negative integer"
 msgstr "'gap' 必須是正整數"
 
-#: src/main/print.c:289
+#: src/main/print.c:282
 msgid "invalid 'tryS4' internal argument"
 msgstr "'tryS4' 內部引數�正確"
 
-#: src/main/print.c:1052
+#: src/main/print.c:851
+#, fuzzy
+msgid "print buffer overflow"
+msgstr "輸入緩��溢�於第 %d 列"
+
+#: src/main/print.c:1043
 #, fuzzy
 msgid "invalid character length in 'dblepr'"
 msgstr "dblepr 字元長度�正確"
 
-#: src/main/print.c:1070
+#: src/main/print.c:1061
 #, fuzzy
 msgid "invalid character length in 'intpr'"
 msgstr "intpr 字元長度�正確"
 
-#: src/main/print.c:1089
+#: src/main/print.c:1080
 #, fuzzy
 msgid "invalid character length in 'realpr'"
 msgstr "realpr 字元長度�正確"
 
-#: src/main/print.c:1099
+#: src/main/print.c:1090
 #, fuzzy
 msgid "memory allocation error in 'realpr'"
 msgstr "realpr 記憶體�置錯誤"
 
-#: src/main/print.c:1115
+#: src/main/print.c:1106
 #, c-format
 msgid "BLAS/LAPACK routine '%6s' gave error code %d"
 msgstr "BLAS/LAPACK 例行程� '%6s' 產生了錯誤碼 %d"
 
-#: src/main/printarray.c:327
+#: src/main/printarray.c:332
 msgid "too few row labels"
 msgstr "列標記�夠"
 
-#: src/main/printarray.c:329
+#: src/main/printarray.c:334
 msgid "too few column labels"
 msgstr "行標記�夠"
 
-#: src/main/printarray.c:363
+#: src/main/printarray.c:368
 #, fuzzy, c-format
 msgid " [ reached getOption(\"max.print\") -- omitted %d row ]\n"
 msgid_plural " [ reached getOption(\"max.print\") -- omitted %d rows ]\n"
 msgstr[0] " [ �到了 getOption (\"max.print\") -- �略最後 %d 列 ]]\n"
 
-#: src/main/printutils.c:688
+#: src/main/printutils.c:710
 #, fuzzy
 msgid "it is not known that wchar_t is Unicode on this platform"
 msgstr "本平臺�支� nsl()"
@@ -4944,350 +4987,350 @@
 msgid "argument is not a numeric vector"
 msgstr "引數�是數值��"
 
-#: src/main/random.c:37
+#: src/main/random.c:39
 msgid "invalid arguments"
 msgstr "引數�正確"
 
-#: src/main/random.c:93 src/main/random.c:110 src/main/random.c:175
-#: src/main/random.c:201 src/main/random.c:274 src/main/random.c:288
+#: src/main/random.c:95 src/main/random.c:112 src/main/random.c:178
+#: src/main/random.c:204 src/main/random.c:277 src/main/random.c:291
 msgid "NAs produced"
 msgstr "產生了 NA"
 
-#: src/main/random.c:435
+#: src/main/random.c:438
 msgid "NA in probability vector"
 msgstr "機率��中有 NA"
 
-#: src/main/random.c:437
+#: src/main/random.c:440
 #, fuzzy
 msgid "negative probability"
 msgstr "出��正值機率"
 
-#: src/main/random.c:444
+#: src/main/random.c:447
 msgid "too few positive probabilities"
 msgstr "正值機率太少"
 
-#: src/main/random.c:480 src/main/random.c:508
+#: src/main/random.c:483 src/main/random.c:511
 msgid "cannot take a sample larger than the population when 'replace = FALSE'"
 msgstr "當 'replace = FALSE' 時�能�用比總體還�大的樣本"
 
-#: src/main/random.c:487
+#: src/main/random.c:490
 msgid "incorrect number of probabilities"
 msgstr "機率數目�正確"
 
-#: src/main/random.c:526
+#: src/main/random.c:529
 #, fuzzy
 msgid "n >= 2^31, replace = FALSE is only supported on 64-bit platforms"
 msgstr "這個平臺�支� 'dirmark = TRUE'"
 
-#: src/main/raw.c:37 src/main/raw.c:272
+#: src/main/raw.c:37 src/main/raw.c:277
 #, fuzzy
 msgid "argument must be a character vector of length 1"
 msgstr "'hostname' 必須是長度為 1 的字元��"
 
-#: src/main/raw.c:39 src/main/raw.c:274
+#: src/main/raw.c:39 src/main/raw.c:279
 #, fuzzy
 msgid ""
 "argument should be a character vector of length 1\n"
 "all but the first element will be ignored"
 msgstr "引數 '%s' 長度 > 1 且�有第一個元素將被使用"
 
-#: src/main/raw.c:53 src/main/raw.c:89 src/main/raw.c:110
+#: src/main/raw.c:53 src/main/raw.c:90 src/main/raw.c:113
 #, fuzzy
 msgid "argument 'x' must be a raw vector"
 msgstr "第一引數必須是��"
 
-#: src/main/raw.c:56 src/main/raw.c:331
+#: src/main/raw.c:56 src/main/raw.c:336
 #, fuzzy
 msgid "argument 'multiple' must be TRUE or FALSE"
 msgstr "'resize' 必須為真或�"
 
-#: src/main/raw.c:91
+#: src/main/raw.c:92
 #, fuzzy
 msgid "argument 'shift' must be a small integer"
 msgstr "'size' 引數必須是正整數"
 
-#: src/main/raw.c:129 src/main/raw.c:328
+#: src/main/raw.c:133 src/main/raw.c:333
 #, fuzzy
 msgid "argument 'x' must be an integer vector"
 msgstr "第一引數必須是字元��"
 
-#: src/main/raw.c:148
+#: src/main/raw.c:153
 #, fuzzy
 msgid "argument 'x' must be raw, integer or logical"
 msgstr "引數 'logarithm' 必須是�輯值"
 
-#: src/main/raw.c:154
+#: src/main/raw.c:159
 #, fuzzy, c-format
 msgid "argument 'x' must be a multiple of %d long"
 msgstr "引數必須是個函數"
 
-#: src/main/raw.c:167 src/main/raw.c:181
+#: src/main/raw.c:172 src/main/raw.c:186
 #, fuzzy
 msgid "argument 'x' must not contain NAs"
 msgstr "引數必須�是函數"
 
-#: src/main/raw.c:286
+#: src/main/raw.c:291
 #, fuzzy
 msgid "invalid UTF-8 string"
 msgstr "無效的 UTF-8 字串 'old'"
 
-#: src/main/relop.c:202
+#: src/main/relop.c:196
 #, c-format
 msgid "comparison (%d) is possible only for atomic and list types"
 msgstr "�有基元或串列類型�能�比較 (%d)"
 
-#: src/main/relop.c:207
+#: src/main/relop.c:201
 msgid "comparison is not allowed for expressions"
 msgstr "�算��能作比較"
 
-#: src/main/relop.c:296
+#: src/main/relop.c:293
 msgid "comparison of these types is not implemented"
 msgstr "這些類型的比較還沒有實作"
 
-#: src/main/relop.c:509
+#: src/main/relop.c:425
 msgid "invalid comparison with complex values"
 msgstr "�能與複數值進行比較"
 
-#: src/main/relop.c:767
+#: src/main/relop.c:683
 #, fuzzy
 msgid "'a' and 'b' must have the same type"
 msgstr "'data' 必須是��類型"
 
-#: src/main/saveload.c:200 src/main/saveload.c:205 src/main/saveload.c:214
-#: src/main/saveload.c:223 src/main/saveload.c:232 src/main/saveload.c:241
-#: src/main/saveload.c:245 src/main/saveload.c:254 src/main/saveload.c:1381
-#: src/main/saveload.c:1386 src/main/saveload.c:1430 src/main/saveload.c:1498
-#: src/main/saveload.c:1507 src/main/serialize.c:354 src/main/serialize.c:361
+#: src/main/saveload.c:202 src/main/saveload.c:207 src/main/saveload.c:216
+#: src/main/saveload.c:225 src/main/saveload.c:234 src/main/saveload.c:243
+#: src/main/saveload.c:247 src/main/saveload.c:256 src/main/saveload.c:1383
+#: src/main/saveload.c:1388 src/main/saveload.c:1432 src/main/saveload.c:1500
+#: src/main/saveload.c:1509 src/main/serialize.c:354 src/main/serialize.c:361
 #: src/main/serialize.c:374 src/main/serialize.c:378 src/main/serialize.c:405
 #: src/main/serialize.c:421 src/main/serialize.c:2429
 #: src/main/serialize.c:2437
 msgid "read error"
 msgstr "讀�錯誤"
 
-#: src/main/saveload.c:332
+#: src/main/saveload.c:334
 msgid "a I read error occurred"
 msgstr "發生了 I 類別讀�錯誤"
 
-#: src/main/saveload.c:342
+#: src/main/saveload.c:344
 msgid "a R read error occurred"
 msgstr "發生了 R 類別讀�錯誤"
 
-#: src/main/saveload.c:352
+#: src/main/saveload.c:354
 msgid "a C read error occurred"
 msgstr "發生了 C 類別讀�錯誤"
 
-#: src/main/saveload.c:362
+#: src/main/saveload.c:364
 msgid "a S read error occurred"
 msgstr "發生了 S 類別讀�錯誤"
 
-#: src/main/saveload.c:387 src/main/saveload.c:395 src/main/saveload.c:403
-#: src/main/saveload.c:1594 src/main/saveload.c:1602
+#: src/main/saveload.c:389 src/main/saveload.c:397 src/main/saveload.c:405
+#: src/main/saveload.c:1596 src/main/saveload.c:1604
 msgid "a read error occurred"
 msgstr "發生了讀�錯誤"
 
-#: src/main/saveload.c:467
+#: src/main/saveload.c:469
 msgid "unresolved node during restore"
 msgstr "復原時�到了無法解�的節點"
 
-#: src/main/saveload.c:488
+#: src/main/saveload.c:490
 #, c-format
 msgid "restore compatibility error - no version %d compatibility"
 msgstr "復原相容錯誤：沒有�版本 %d 相容的功能"
 
-#: src/main/saveload.c:572 src/main/saveload.c:645
+#: src/main/saveload.c:574 src/main/saveload.c:647
 msgid "bad SEXP type in data file"
 msgstr "資料檔案中 SEXP 類型發生錯誤"
 
-#: src/main/saveload.c:586
+#: src/main/saveload.c:588
 msgid "mismatch on types"
 msgstr "類型�符�"
 
-#: src/main/saveload.c:607 src/main/saveload.c:1270 src/main/serialize.c:1675
+#: src/main/saveload.c:609 src/main/saveload.c:1272 src/main/serialize.c:1675
 #, fuzzy, c-format
 msgid "unrecognized internal function name \"%s\""
 msgstr "沒有這個函數 \"%s\""
 
-#: src/main/saveload.c:709
+#: src/main/saveload.c:711
 msgid "cannot save file position while restoring data"
 msgstr "復原資料的時候無法儲存檔案�置"
 
-#: src/main/saveload.c:722
+#: src/main/saveload.c:724
 msgid "cannot restore file position while restoring data"
 msgstr "復原資料的時候無法復原檔案�置"
 
-#: src/main/saveload.c:915
+#: src/main/saveload.c:917
 msgid "base namespace is not preserved in version 1 workspaces"
 msgstr "1 號版本工作空間�能�留基本�稱空間"
 
-#: src/main/saveload.c:917
+#: src/main/saveload.c:919
 msgid "cannot save namespace in version 1 workspaces"
 msgstr "1 號版本工作空間無法儲存�稱空間"
 
-#: src/main/saveload.c:919
+#: src/main/saveload.c:921
 msgid ""
 "cannot save environment with locked/active bindings in version 1 workspaces"
 msgstr "1 號版本工作空間�能儲存鎖�的或是�在用的繫�環境"
 
-#: src/main/saveload.c:943
+#: src/main/saveload.c:945
 msgid "cannot save weak references in version 1 workspaces"
 msgstr "1 號版本工作空間無法儲存弱型�考"
 
-#: src/main/saveload.c:1021
+#: src/main/saveload.c:1023
 msgid "NewWriteVec called with non-vector type"
 msgstr "NewWriteVec ��用於���類型"
 
-#: src/main/saveload.c:1084
+#: src/main/saveload.c:1086
 msgid "cannot save byte code objects in version 1 workspaces"
 msgstr "1 號版本工作空間無法儲存�元組碼物件"
 
-#: src/main/saveload.c:1086
+#: src/main/saveload.c:1088
 #, c-format
 msgid "NewWriteItem: unknown type %i"
 msgstr "NewWriteItem: �明類型 %i"
 
-#: src/main/saveload.c:1216
+#: src/main/saveload.c:1218
 msgid "NewReadVec called with non-vector type"
 msgstr "NewReadVec ��用於���類型"
 
-#: src/main/saveload.c:1286
+#: src/main/saveload.c:1288
 msgid "cannot read byte code objects from version 1 workspaces"
 msgstr "無法從 1 號版本工作空間中讀��元組碼物件"
 
-#: src/main/saveload.c:1288
+#: src/main/saveload.c:1290
 #, c-format
 msgid "NewReadItem: unknown type %i"
 msgstr "NewReadItem: �明類型 %i"
 
-#: src/main/saveload.c:1440
+#: src/main/saveload.c:1442
 msgid "out of memory reading ascii string"
 msgstr "讀� ascii 字串時記憶體�足"
 
-#: src/main/saveload.c:1565
+#: src/main/saveload.c:1567
 msgid "a binary read error occurred"
 msgstr "二進�讀�時發生了錯誤"
 
-#: src/main/saveload.c:1580 src/main/saveload.c:1681
+#: src/main/saveload.c:1582 src/main/saveload.c:1683
 msgid "out of memory reading binary string"
 msgstr "讀�二進�字串時記憶體�足"
 
-#: src/main/saveload.c:1585
+#: src/main/saveload.c:1587
 msgid "a binary string read error occurred"
 msgstr "讀�二進�字串時發生了錯誤"
 
-#: src/main/saveload.c:1645
+#: src/main/saveload.c:1647
 msgid "an xdr integer data write error occurred"
 msgstr "發生了 xdr 整數資料寫入錯誤"
 
-#: src/main/saveload.c:1652
+#: src/main/saveload.c:1654
 msgid "an xdr integer data read error occurred"
 msgstr "發生了 xdr 整數資料讀�錯誤"
 
-#: src/main/saveload.c:1667 src/main/saveload.c:1686
+#: src/main/saveload.c:1669 src/main/saveload.c:1688
 msgid "an xdr string data write error occurred"
 msgstr "發生了 xdr 字串資料寫入錯誤"
 
-#: src/main/saveload.c:1694
+#: src/main/saveload.c:1696
 msgid "an xdr real data write error occurred"
 msgstr "發生了 xdr 實數資料寫入錯誤"
 
-#: src/main/saveload.c:1701
+#: src/main/saveload.c:1703
 msgid "an xdr real data read error occurred"
 msgstr "發生了 xdr 實數資料讀�錯誤"
 
-#: src/main/saveload.c:1708
+#: src/main/saveload.c:1710
 msgid "an xdr complex data write error occurred"
 msgstr "發生了 xdr 複數資料寫入錯誤"
 
-#: src/main/saveload.c:1715
+#: src/main/saveload.c:1717
 msgid "an xdr complex data read error occurred"
 msgstr "發生了 xdr 複數資料讀�錯誤"
 
-#: src/main/saveload.c:1783 src/main/serialize.c:1997
-#: src/main/serialize.c:2614 src/modules/internet/internet.c:513
+#: src/main/saveload.c:1785 src/main/serialize.c:1997
+#: src/main/serialize.c:2614 src/modules/internet/internet.c:514
 #: src/modules/internet/internet.c:590 src/modules/internet/internet.c:701
 msgid "write failed"
 msgstr "寫入失敗"
 
-#: src/main/saveload.c:1910
+#: src/main/saveload.c:1912
 msgid "restore file may be empty -- no data loaded"
 msgstr "復原檔案�能是空的 -- 沒有載入任何資料"
 
-#: src/main/saveload.c:1912
+#: src/main/saveload.c:1914
 msgid "restore file may be from a newer version of R -- no data loaded"
 msgstr "復原檔案�能是由比本 R 版本�新的 R 所儲存的 -- 沒有載入任何資料"
 
-#: src/main/saveload.c:1914
+#: src/main/saveload.c:1916
 msgid "bad restore file magic number (file may be corrupted) -- no data loaded"
 msgstr "復原檔案魔術數字發生錯誤 (檔案�能有�壞)-- 沒有載入任何資料"
 
-#: src/main/saveload.c:1940 src/main/saveload.c:2238
+#: src/main/saveload.c:1942 src/main/saveload.c:2240
 msgid "first argument must be a character vector"
 msgstr "第一引數必須是字元��"
 
-#: src/main/saveload.c:2012
+#: src/main/saveload.c:2014
 msgid "not a valid named list"
 msgstr "�是有效的具�串列"
 
-#: src/main/saveload.c:2019 src/main/saveload.c:2040
+#: src/main/saveload.c:2021 src/main/saveload.c:2042
 #, c-format
 msgid "'%s' looks like a pre-2.4.0 S4 object: please recreate it"
 msgstr "'%s' 看來�是 pre-2.4.0 S4 物件：請�新建立它"
 
-#: src/main/saveload.c:2027
+#: src/main/saveload.c:2029
 msgid "loaded data is not in pair list form"
 msgstr "載入資料�是�雙的串列形�"
 
-#: src/main/saveload.c:2063
+#: src/main/saveload.c:2065
 msgid "first argument must be a file name"
 msgstr "第一引數必須是檔案�稱"
 
-#: src/main/saveload.c:2108 src/main/saveload.c:2134 src/main/serialize.c:864
+#: src/main/saveload.c:2110 src/main/saveload.c:2136 src/main/serialize.c:864
 #: src/main/serialize.c:901 src/main/serialize.c:939
 msgid "XDR write failed"
 msgstr "XDR 寫入失敗"
 
-#: src/main/saveload.c:2121 src/main/saveload.c:2146 src/main/serialize.c:1400
+#: src/main/saveload.c:2123 src/main/saveload.c:2148 src/main/serialize.c:1400
 #: src/main/serialize.c:1436 src/main/serialize.c:1474
 msgid "XDR read failed"
 msgstr "XDR 讀�失敗"
 
-#: src/main/saveload.c:2157
+#: src/main/saveload.c:2159
 #, c-format
 msgid "cannot save data -- unable to open '%s': %s"
 msgstr "無法儲存資料 -- 無法開啟 '%s' ：%s"
 
-#: src/main/saveload.c:2254 src/main/serialize.c:2202
+#: src/main/saveload.c:2256 src/main/serialize.c:2202
 #, c-format
 msgid "cannot save to connections in version %d format"
 msgstr "��使用版本 %d 的格�來儲存連�"
 
-#: src/main/saveload.c:2277 src/main/serialize.c:2227
+#: src/main/saveload.c:2279 src/main/serialize.c:2227
 msgid "connection not open for writing"
 msgstr "無法開啟連�來進行寫入"
 
-#: src/main/saveload.c:2286
+#: src/main/saveload.c:2288
 msgid "cannot save XDR format to a text-mode connection"
 msgstr "�能將XDR格�儲存到文字狀態連�"
 
-#: src/main/saveload.c:2296 src/main/serialize.c:2105
+#: src/main/saveload.c:2298 src/main/serialize.c:2105
 #: src/main/serialize.c:2119 src/main/serialize.c:2303
 #: src/main/serialize.c:2325
 msgid "error writing to connection"
 msgstr "連�寫入發生了錯誤"
 
-#: src/main/saveload.c:2357 src/main/serialize.c:2275
+#: src/main/saveload.c:2359 src/main/serialize.c:2275
 msgid "connection not open for reading"
 msgstr "連接未開啟而無法讀�"
 
-#: src/main/saveload.c:2358
+#: src/main/saveload.c:2360
 msgid "can only load() from a binary connection"
 msgstr "�能從二進�連接 load()"
 
-#: src/main/saveload.c:2369
+#: src/main/saveload.c:2371
 msgid "no input is available"
 msgstr "沒有�用的輸入"
 
-#: src/main/saveload.c:2381
+#: src/main/saveload.c:2383
 msgid ""
 "the input does not start with a magic number compatible with loading from a "
 "connection"
@@ -5302,7 +5345,7 @@
 msgid "scan() expected '%s', got '%s'"
 msgstr "scan() 需� '%s'，而�是 '%s'"
 
-#: src/main/scan.c:585 src/main/scan.c:732
+#: src/main/scan.c:585 src/main/scan.c:735
 #, fuzzy
 msgid "too many items"
 msgstr "引數太多"
@@ -5311,7 +5354,7 @@
 msgid "empty 'what' specified"
 msgstr "'what' 設定是空的"
 
-#: src/main/scan.c:722
+#: src/main/scan.c:725
 #, c-format
 msgid "line %d did not have %d elements"
 msgstr "第 %d 列沒有 %d 個元素"
@@ -5345,33 +5388,33 @@
 msgid "embedded nul(s) found in input"
 msgstr "空值嵌入於字串中：'%s'"
 
-#: src/main/seq.c:48
+#: src/main/seq.c:49
 msgid "unequal factor lengths"
 msgstr "因�長度�相等"
 
-#: src/main/seq.c:100
+#: src/main/seq.c:101
 msgid "result would be too long a vector"
 msgstr "答案��會太長"
 
-#: src/main/seq.c:159
+#: src/main/seq.c:160
 msgid "argument of length 0"
 msgstr "長度為 0 的引數"
 
-#: src/main/seq.c:162 src/main/seq.c:167
+#: src/main/seq.c:163 src/main/seq.c:168
 #, fuzzy, c-format
 msgid "numerical expression has %d element: only the first used"
 msgid_plural "numerical expression has %d elements: only the first used"
 msgstr[0] "數值�算�一共有 %d 個元素: �用了第一個"
 
-#: src/main/seq.c:173
+#: src/main/seq.c:174
 msgid "NA/NaN argument"
 msgstr "NA/NaN 引數"
 
-#: src/main/seq.c:337
+#: src/main/seq.c:333
 msgid "incorrect type for second argument"
 msgstr "第二引數的類型�正確"
 
-#: src/main/seq.c:340
+#: src/main/seq.c:336
 #, fuzzy, c-format
 msgid "attempt to replicate an object of type '%s'"
 msgstr "����能被複製"
@@ -5607,53 +5650,49 @@
 msgid "only atomic vectors can be tested to be sorted"
 msgstr "�有基元���能被試著排�"
 
-#: src/main/sort.c:326 src/main/sort.c:1228 src/main/sort.c:1396
+#: src/main/sort.c:325 src/main/sort.c:1248
 msgid "'decreasing' must be TRUE or FALSE"
 msgstr "'increasing' 必須是 TRUE 或是 FALSE"
 
-#: src/main/sort.c:329 src/main/sort.c:600
+#: src/main/sort.c:328 src/main/sort.c:599
 msgid "only atomic vectors can be sorted"
 msgstr "�有基元���能被排�"
 
-#: src/main/sort.c:331 src/main/sort.c:602 src/main/sort.c:1297
+#: src/main/sort.c:330 src/main/sort.c:601 src/main/sort.c:1317
 msgid "raw vectors cannot be sorted"
 msgstr "無法排�純���"
 
-#: src/main/sort.c:613
+#: src/main/sort.c:612
 msgid "NA or infinite index"
 msgstr ""
 
-#: src/main/sort.c:616
+#: src/main/sort.c:615
 #, fuzzy, c-format
 msgid "index %ld outside bounds"
 msgstr "索引 %d 在界�外"
 
-#: src/main/sort.c:621 src/main/sort.c:634
+#: src/main/sort.c:620 src/main/sort.c:633
 msgid "NA index"
 msgstr "NA 索引"
 
-#: src/main/sort.c:623 src/main/sort.c:636
+#: src/main/sort.c:622 src/main/sort.c:635
 #, c-format
 msgid "index %d outside bounds"
 msgstr "索引 %d 在界�外"
 
-#: src/main/sort.c:1237
+#: src/main/sort.c:1257
 #, c-format
 msgid "argument %d is not a vector"
 msgstr "引數 %d �是��"
 
-#: src/main/sort.c:1239
+#: src/main/sort.c:1259
 msgid "argument lengths differ"
 msgstr "引數長度��"
 
-#: src/main/sort.c:1324
+#: src/main/sort.c:1344
 msgid "invalid ties.method for rank() [should never happen]"
 msgstr "rank() 的 ties.method �正確 [這是�應該發生的]"
 
-#: src/main/sort.c:1429
-msgid "too large a range of values in 'x'"
-msgstr "'x' 中的值的範�太大"
-
 #: src/main/source.c:220
 msgid "coercion of 'text' to character was unsuccessful"
 msgstr "將 'text' 強制變更為字元未能�功"
@@ -5663,24 +5702,24 @@
 msgid "argument '%s = \"%s\"' will be ignored"
 msgstr "引數 '%s = \"%s\"' 將被忽略"
 
-#: src/main/split.c:38
+#: src/main/split.c:39
 msgid "first argument must be a vector"
 msgstr "第一引數必須是��"
 
-#: src/main/split.c:40
+#: src/main/split.c:41
 msgid "second argument must be a factor"
 msgstr "第二引數必須是因�"
 
-#: src/main/split.c:45
+#: src/main/split.c:46
 #, fuzzy
 msgid "group length is 0 but data length > 0"
 msgstr "Group 長度為零但資料長度 > 0"
 
-#: src/main/split.c:47
+#: src/main/split.c:48
 msgid "data length is not a multiple of split variable"
 msgstr "資料長度�是 split 變數的�數"
 
-#: src/main/split.c:56
+#: src/main/split.c:58
 msgid "factor has bad level"
 msgstr "因�有�當的等級"
 
@@ -5735,38 +5774,38 @@
 msgid "coercion has changed vector length to 0"
 msgstr "強制變更時將��長度改為 0"
 
-#: src/main/sprintf.c:342 src/main/sprintf.c:356 src/main/sprintf.c:370
-#: src/main/sprintf.c:405
+#: src/main/sprintf.c:343 src/main/sprintf.c:357 src/main/sprintf.c:371
+#: src/main/sprintf.c:406
 #, c-format
 msgid "invalid format '%s'; %s"
 msgstr "無效的格� '%s'；%s"
 
-#: src/main/sprintf.c:343
+#: src/main/sprintf.c:344
 #, c-format
 msgid "use format %d or %i for logical objects"
 msgstr "�輯物件套用格� %d 或 %i"
 
-#: src/main/sprintf.c:357
+#: src/main/sprintf.c:358
 #, c-format
 msgid "use format %d, %i, %o, %x or %X for integer objects"
 msgstr "使用格� %d, %i, %o, %x 或 %X 於整數物件"
 
-#: src/main/sprintf.c:371
+#: src/main/sprintf.c:372
 #, c-format
 msgid "use format %f, %e, %g or %a for numeric objects"
 msgstr "使用格� %f, %e, %g 或 %a 於數值物件"
 
-#: src/main/sprintf.c:406
+#: src/main/sprintf.c:407
 #, c-format
 msgid "use format %s for character objects"
 msgstr "字元物件套用格� %s"
 
-#: src/main/sprintf.c:411
+#: src/main/sprintf.c:412
 #, c-format
 msgid "likely truncation of character string to %d characters"
 msgstr "字串似乎被截斷� %d 個字元"
 
-#: src/main/sprintf.c:420
+#: src/main/sprintf.c:421
 msgid "unsupported type"
 msgstr "�支�此一類型"
 
@@ -5774,252 +5813,248 @@
 msgid "R_LibraryFileName: buffer too small"
 msgstr "R_LibraryFileName: 緩��太�"
 
-#: src/main/subassign.c:117
+#: src/main/subassign.c:118
 msgid "attempt to enlarge non-vector"
 msgstr "�能加大���"
 
-#: src/main/subassign.c:122
+#: src/main/subassign.c:123
 #, c-format
 msgid "assignment outside vector/list limits (extending from %d to %d)"
 msgstr "�能在��/串列極值外賦值(%d 加大到 %d)"
 
-#: src/main/subassign.c:367
+#: src/main/subassign.c:391
 #, c-format
 msgid "incompatible types (from %s to %s) in subassignment type fix"
 msgstr "下賦值 fix 類型中有�相容的類型 (從 %s 到 %s)"
 
-#: src/main/subassign.c:503 src/main/subassign.c:783 src/main/subassign.c:786
-#: src/main/subassign.c:1077
+#: src/main/subassign.c:550 src/main/subassign.c:830 src/main/subassign.c:833
+#: src/main/subassign.c:1133
 msgid "NAs are not allowed in subscripted assignments"
 msgstr "下標賦值中��許 NA"
 
-#: src/main/subassign.c:521 src/main/subassign.c:797 src/main/subassign.c:1069
-#: src/main/subassign.c:1647
+#: src/main/subassign.c:568 src/main/subassign.c:844 src/main/subassign.c:1125
+#: src/main/subassign.c:1705
 msgid "replacement has length zero"
 msgstr "置�的長度為零"
 
-#: src/main/subassign.c:523 src/main/subassign.c:799 src/main/subassign.c:1071
+#: src/main/subassign.c:570 src/main/subassign.c:846 src/main/subassign.c:1127
 msgid "number of items to replace is not a multiple of replacement length"
 msgstr "被替�的項目�是替�值長度的�數"
 
-#: src/main/subassign.c:767
+#: src/main/subassign.c:814
 msgid "incorrect number of subscripts on matrix"
 msgstr "矩陣中的下標數目�正確"
 
-#: src/main/subassign.c:1023
+#: src/main/subassign.c:1079
 #, c-format
 msgid "incompatible types (from %s to %s) in matrix subset assignment"
 msgstr "矩陣�集賦值中有�相容的類型 (從 %s 到 %s)"
 
-#: src/main/subassign.c:1039 src/main/subset.c:947
+#: src/main/subassign.c:1095 src/main/subset.c:957
 msgid "incorrect number of subscripts"
 msgstr "下標數目�正確"
 
-#: src/main/subassign.c:1215
+#: src/main/subassign.c:1272
 #, c-format
 msgid "incompatible types (from %s to %s) in array subset assignment"
 msgstr "陣列�集賦值有�相容的類型 (從 %s 到 %s)"
 
-#: src/main/subassign.c:1250 src/main/subassign.c:1271
+#: src/main/subassign.c:1308 src/main/subassign.c:1329
 msgid "invalid subscript in list assign"
 msgstr "串列賦值中的下標數目無效"
 
-#: src/main/subassign.c:1264
+#: src/main/subassign.c:1322
 msgid "invalid number of subscripts to list assign"
 msgstr "串列賦值中的下標數目�正確"
 
-#: src/main/subassign.c:1363
+#: src/main/subassign.c:1421
 msgid "SubAssignArgs: invalid number of arguments"
 msgstr "SubAssignArgs: 引數數目�正確"
 
-#: src/main/subassign.c:1508
+#: src/main/subassign.c:1566
 msgid "result is zero-length and so cannot be a language object"
 msgstr "�果長度為零因而無法�為一個語言物件"
 
-#: src/main/subassign.c:1607
+#: src/main/subassign.c:1665
 msgid ""
 "[[<- defined for objects of type \"S4\" only for subclasses of environment"
 msgstr "[[<- �有在�類別用於定義 \"S4\" 類型的物件"
 
-#: src/main/subassign.c:1619
+#: src/main/subassign.c:1677
 msgid "wrong args for environment subassignment"
 msgstr "環境下賦值的引數�正確"
 
-#: src/main/subassign.c:1649
+#: src/main/subassign.c:1707
 msgid "more elements supplied than there are to replace"
 msgstr "用來替�的元素比所�替�的值多"
 
-#: src/main/subassign.c:1651
+#: src/main/subassign.c:1709
 msgid "[[ ]] with missing subscript"
 msgstr "[[ ]] 缺少下標"
 
-#: src/main/subassign.c:1669 src/main/subassign.c:1687
+#: src/main/subassign.c:1727 src/main/subassign.c:1745
 msgid "[[ ]] subscript out of bounds"
 msgstr "[[ ]] 下標在界�外"
 
-#: src/main/subassign.c:1675 src/main/subassign.c:1856
+#: src/main/subassign.c:1733 src/main/subassign.c:1914
 msgid "[[ ]] improper number of subscripts"
 msgstr "[[ ]] 下標數目�正確"
 
-#: src/main/subassign.c:1821
+#: src/main/subassign.c:1879
 #, c-format
 msgid "incompatible types (from %s to %s) in [[ assignment"
 msgstr "[[ 賦值中有�相容的類型 (從 %s 到 %s)"
 
-#: src/main/subassign.c:1867
+#: src/main/subassign.c:1925
 #, c-format
 msgid "[[ ]] subscript (%d) out of bounds"
 msgstr "[[ ]] 下標 (%d) 在界�外"
 
-#: src/main/subassign.c:1923 src/main/subscript.c:151 src/main/subscript.c:153
-#: src/main/subscript.c:282 src/main/subscript.c:284 src/main/subscript.c:894
-#: src/main/subscript.c:896 src/main/subscript.c:987 src/main/subscript.c:989
-#: src/main/subset.c:1149
+#: src/main/subassign.c:1986 src/main/subscript.c:151 src/main/subscript.c:278
+#: src/main/subscript.c:903 src/main/subscript.c:996 src/main/subset.c:1176
 #, c-format
 msgid "invalid subscript type '%s'"
 msgstr "無效的下標類型 '%s'"
 
-#: src/main/subassign.c:1968
+#: src/main/subassign.c:2037
 msgid "no method for assigning subsets of this S4 class"
 msgstr "沒有方法�用於指派這個 S4 類別的�集"
 
-#: src/main/subassign.c:2026
+#: src/main/subassign.c:2095
 msgid "Coercing LHS to a list"
 msgstr "把公�左�強迫變�串列"
 
-#: src/main/subscript.c:58 src/main/subscript.c:80 src/main/subscript.c:188
-#: src/main/subscript.c:212
-msgid "attempt to select less than one element"
+#: src/main/subscript.c:59 src/main/subscript.c:81 src/main/subscript.c:185
+#: src/main/subscript.c:209
+#, fuzzy, c-format
+msgid "attempt to select less than one element in %s"
 msgstr "至少��擇一個元素"
 
-#: src/main/subscript.c:62 src/main/subscript.c:77 src/main/subscript.c:186
-#: src/main/subscript.c:216 src/main/subscript.c:312
-msgid "attempt to select more than one element"
+#: src/main/subscript.c:63 src/main/subscript.c:78 src/main/subscript.c:183
+#: src/main/subscript.c:213 src/main/subscript.c:305
+#, fuzzy, c-format
+msgid "attempt to select more than one element in %s"
 msgstr "最多�能�擇一個元素"
 
-#: src/main/subscript.c:192
+#: src/main/subscript.c:189
 msgid "internal error in use of recursive indexing"
 msgstr "用�迴索引時發生了內部錯誤"
 
-#: src/main/subscript.c:260
+#: src/main/subscript.c:257
 #, c-format
 msgid "further partial match of '%s' to '%s'"
 msgstr "進一步部份匹� '%s' 到 '%s'"
 
-#: src/main/subscript.c:310
+#: src/main/subscript.c:303
 #, c-format
 msgid "recursive indexing failed at level %d\n"
 msgstr "�迴索引在 %d 層失敗\n"
 
-#: src/main/subscript.c:320
+#: src/main/subscript.c:313
 #, c-format
 msgid "no such index at level %d\n"
 msgstr "在 %d 層沒有此一索引\n"
 
-#: src/main/subscript.c:367
+#: src/main/subscript.c:360
 msgid "incorrect number of columns in matrix subscript"
 msgstr "矩陣下標中行數�正確"
 
-#: src/main/subscript.c:386 src/main/subscript.c:404 src/main/subscript.c:428
+#: src/main/subscript.c:379 src/main/subscript.c:397 src/main/subscript.c:421
 msgid "negative values are not allowed in a matrix subscript"
 msgstr "矩陣下標中��許負值"
 
-#: src/main/subscript.c:507
+#: src/main/subscript.c:500
 msgid "(subscript) logical subscript too long"
 msgstr "(下標) �輯下標太長"
 
-#: src/main/subscript.c:658 src/main/subscript.c:713
+#: src/main/subscript.c:668 src/main/subscript.c:723
 msgid "only 0's may be mixed with negative subscripts"
 msgstr "�有負數下標中�能有 0"
 
-#: src/main/subscript.c:686
+#: src/main/subscript.c:696
 msgid "subscript too large for 32-bit R"
 msgstr ""
 
-#: src/main/subscript.c:885
+#: src/main/subscript.c:895
 msgid "no 'dimnames' attribute for array"
 msgstr "陣列中沒有 'dimnames' 此一屬性"
 
-#: src/main/subscript.c:925
+#: src/main/subscript.c:931
 msgid "subscripting on non-vector"
 msgstr "����能有下標"
 
-#: src/main/subset.c:262
+#: src/main/subset.c:260
 msgid "dimensions would exceed maximum size of array"
 msgstr ""
 
-#: src/main/subset.c:305 src/main/subset.c:334
+#: src/main/subset.c:304 src/main/subset.c:334
 msgid "matrix subscripting not handled for this type"
 msgstr "此一類型無法處�矩陣下標"
 
-#: src/main/subset.c:490
+#: src/main/subset.c:493
 msgid "array subscripting not handled for this type"
 msgstr "此一類型無法處�陣列下標"
 
-#: src/main/subset.c:846
+#: src/main/subset.c:856
 msgid "incorrect number of dimensions"
 msgstr "維度數目�正確"
 
-#: src/main/subset.c:943
+#: src/main/subset.c:953
 msgid "no index specified"
 msgstr "沒有指定的索引"
 
-#: src/main/subset.c:953
+#: src/main/subset.c:963
 msgid "this S4 class is not subsettable"
 msgstr "這個 S4 類別�是�集�表格"
 
-#: src/main/subset.c:960
+#: src/main/subset.c:970
 msgid "wrong arguments for subsetting an environment"
 msgstr "��集環境時的引數�正確"
 
-#: src/main/summary.c:30
+#: src/main/summary.c:33
 #, c-format
 msgid "invalid 'type' (%s) of argument"
 msgstr "'type' (%s) 的引數無效"
 
-#: src/main/summary.c:66 src/main/summary.c:78 src/main/summary.c:103
+#: src/main/summary.c:69 src/main/summary.c:81 src/main/summary.c:106
 #, fuzzy
 msgid "integer overflow - use sum(as.numeric(.))"
 msgstr "整數溢� - 請使用 sum(as.numeric(.))"
 
-#: src/main/summary.c:522
+#: src/main/summary.c:526
 #, c-format
 msgid "internal error ('op = %d' in do_summary).\t Call a Guru"
 msgstr "內部錯誤 (do_summary 中的 'op = %d')。\t 請�專家請教"
 
-#: src/main/summary.c:633
+#: src/main/summary.c:637
 msgid "Integer overflow - use sum(as.numeric(.))"
 msgstr "整數溢� - 請使用 sum(as.numeric(.))"
 
-#: src/main/summary.c:746
+#: src/main/summary.c:750
 msgid "no non-missing arguments, returning NA"
 msgstr "沒有��失的引數，回傳 NA"
 
-#: src/main/summary.c:749
+#: src/main/summary.c:753
 msgid "no non-missing arguments to min; returning Inf"
 msgstr "min 中沒有無�失的引數; 回傳 Inf"
 
-#: src/main/summary.c:751
+#: src/main/summary.c:755
 msgid "no non-missing arguments to max; returning -Inf"
 msgstr "max 中沒有無�失的引數；回傳 -Inf"
 
-#: src/main/summary.c:816
-msgid "non-numeric argument"
-msgstr "�數值引數"
-
-#: src/main/summary.c:860
+#: src/main/summary.c:913
 msgid "argument to 'which' is not logical"
 msgstr "'which' 的引數�是�輯值"
 
-#: src/main/summary.c:904
+#: src/main/summary.c:957
 msgid "no arguments"
 msgstr "沒有引數"
 
-#: src/main/summary.c:915 src/main/summary.c:932
+#: src/main/summary.c:968 src/main/summary.c:985
 msgid "invalid input type"
 msgstr "無效的輸入類型"
 
-#: src/main/summary.c:949
+#: src/main/summary.c:1002
 msgid "an argument will be fractionally recycled"
 msgstr "�個引數將被部分�新利用"
 
@@ -6032,8 +6067,8 @@
 msgid "encoding of a filename cannot be 'bytes'"
 msgstr "檔�的編碼��以是 'bytes'"
 
-#: src/main/sysutils.c:169 src/main/sysutils.c:825 src/main/sysutils.c:840
-#: src/main/sysutils.c:969
+#: src/main/sysutils.c:169 src/main/sysutils.c:831 src/main/sysutils.c:846
+#: src/main/sysutils.c:975
 #, c-format
 msgid "unsupported conversion from '%s' in codepage %d"
 msgstr "�支�在編碼� %2$d 中來自 '%1$s' 的轉�"
@@ -6066,97 +6101,98 @@
 msgid "no 'fileext'"
 msgstr "沒有 'fileext'"
 
-#: src/main/sysutils.c:322
+#: src/main/sysutils.c:328
 #, fuzzy, c-format
 msgid "system call failed: %s"
 msgstr "�索 %s 失敗"
 
-#: src/main/sysutils.c:351 src/main/sysutils.c:354 src/main/sysutils.c:445
-#: src/main/sysutils.c:447 src/main/sysutils.c:483
+#: src/main/sysutils.c:357 src/main/sysutils.c:360 src/main/sysutils.c:451
+#: src/main/sysutils.c:453 src/main/sysutils.c:489
 msgid "wrong type for argument"
 msgstr "引數類型�正確"
 
-#: src/main/sysutils.c:449
+#: src/main/sysutils.c:455
 msgid "wrong length for argument"
 msgstr "引數的長度錯誤"
 
-#: src/main/sysutils.c:470
+#: src/main/sysutils.c:476
 msgid "'Sys.setenv' is not available on this system"
 msgstr "這個系統無法使用 'Sys.setenv'"
 
-#: src/main/sysutils.c:514
+#: src/main/sysutils.c:520
 msgid "this system cannot unset environment variables: setting to \"\""
 msgstr "這個系統無法解除設定環境變數：設定為 \"\""
 
-#: src/main/sysutils.c:525
+#: src/main/sysutils.c:531
 msgid "'Sys.unsetenv' is not available on this system"
 msgstr "這個系統無法使用 'Sys.unsetenv'"
 
-#: src/main/sysutils.c:622
+#: src/main/sysutils.c:628
 #, c-format
 msgid "unsupported conversion from '%s' to '%s' in codepage %d"
 msgstr "在編碼� %3$d 中�支�從 '%1$s' 轉�到 '%2$s'"
 
-#: src/main/sysutils.c:637
+#: src/main/sysutils.c:643
 msgid "'x' must be a character vector"
 msgstr "'x' 必須是字元��"
 
-#: src/main/sysutils.c:652
-msgid "'x' must be a list of NULL or raw vectors"
+#: src/main/sysutils.c:658
+#, fuzzy
+msgid "'x' must be a character vector or a list of NULL or raw vectors"
 msgstr "'x' 必須是空值或純���串列"
 
-#: src/main/sysutils.c:730 src/main/sysutils.c:908 src/main/sysutils.c:926
-#: src/main/sysutils.c:943 src/main/sysutils.c:959 src/main/sysutils.c:1036
+#: src/main/sysutils.c:736 src/main/sysutils.c:914 src/main/sysutils.c:932
+#: src/main/sysutils.c:949 src/main/sysutils.c:965 src/main/sysutils.c:1042
 #, c-format
 msgid "'%s' must be called on a CHARSXP"
 msgstr "'%s' 必須於 CHARSXP 之上被呼�"
 
-#: src/main/sysutils.c:799 src/main/sysutils.c:964 src/main/sysutils.c:1039
+#: src/main/sysutils.c:805 src/main/sysutils.c:970 src/main/sysutils.c:1045
 msgid "translating strings with \"bytes\" encoding is not allowed"
 msgstr "��許以 \"bytes\" 編碼的翻譯字串"
 
-#: src/main/sysutils.c:812
+#: src/main/sysutils.c:818
 #, fuzzy
 msgid "internal error: no translation needed"
 msgstr "unz 程�碼中有內部錯誤"
 
-#: src/main/sysutils.c:1065
+#: src/main/sysutils.c:1071
 #, c-format
 msgid "unsupported conversion to '%s' from codepage %d"
 msgstr "�支�從編碼� %2$d 轉�到 '%1$s'"
 
-#: src/main/sysutils.c:1480
+#: src/main/sysutils.c:1486
 #, fuzzy, c-format
 msgid "invalid Unicode point %u"
 msgstr "線�接�發生錯誤"
 
-#: src/main/sysutils.c:1582
+#: src/main/sysutils.c:1588
 #, fuzzy
 msgid "cannot create 'R_TempDir'"
 msgstr "無法�置 R_TempDir"
 
-#: src/main/sysutils.c:1586 src/main/sysutils.c:1594 src/main/sysutils.c:1597
+#: src/main/sysutils.c:1592 src/main/sysutils.c:1600 src/main/sysutils.c:1603
 msgid "unable to set R_SESSION_TMPDIR"
 msgstr "無法設定 R_SESSION_TMPDIR"
 
-#: src/main/sysutils.c:1606
+#: src/main/sysutils.c:1612
 #, fuzzy
 msgid "cannot allocate 'R_TempDir'"
 msgstr "無法�置 R_TempDir"
 
-#: src/main/sysutils.c:1643
+#: src/main/sysutils.c:1649
 msgid "temporary name too long"
 msgstr "暫時�稱太長"
 
-#: src/main/sysutils.c:1658
+#: src/main/sysutils.c:1664
 msgid "cannot find unused tempfile name"
 msgstr "暫時檔�已用盡"
 
-#: src/main/sysutils.c:1661
+#: src/main/sysutils.c:1667
 msgid "allocation failed in R_tmpnam2"
 msgstr "在 R_tmpnam2 中�置失敗"
 
-#: src/main/sysutils.c:1788
+#: src/main/sysutils.c:1794
 msgid "'dirmark = TRUE' is not supported on this platform"
 msgstr "這個平臺�支� 'dirmark = TRUE'"
 
@@ -6192,33 +6228,33 @@
 msgid "'nmax' must be positive"
 msgstr "'value' 必須是正值的長度"
 
-#: src/main/unique.c:925
+#: src/main/unique.c:985
 msgid "'match' requires vector arguments"
 msgstr "'match' 需���引數"
 
-#: src/main/unique.c:973 src/main/unique.c:1111
+#: src/main/unique.c:1033 src/main/unique.c:1171
 msgid "argument is not of mode character"
 msgstr "引數�是字元狀態"
 
-#: src/main/unique.c:1236
+#: src/main/unique.c:1296
 #, fuzzy
 msgid "... used in a situation where it does not exist"
 msgstr "... 用在它�存在的地方了"
 
-#: src/main/unique.c:1242
+#: src/main/unique.c:1302
 #, fuzzy
 msgid "... is not a pairlist"
 msgstr "'...' 中的值�是一個約定"
 
-#: src/main/unique.c:1471
+#: src/main/unique.c:1531
 msgid "non-numeric data frame in rowsum"
 msgstr "rowsum 中�能有�數值資料框"
 
-#: src/main/unique.c:1503
+#: src/main/unique.c:1563
 msgid "this cannot happen"
 msgstr "這��能發生"
 
-#: src/main/unique.c:1574
+#: src/main/unique.c:1634
 msgid "'names' must be a character vector"
 msgstr "'names' 必須是字元��"
 
@@ -6226,142 +6262,142 @@
 msgid "object is not a matrix"
 msgstr "物件�是矩陣"
 
-#: src/main/util.c:305 src/main/util.c:317 src/main/util.c:328
-#: src/main/util.c:343
+#: src/main/util.c:303 src/main/util.c:315 src/main/util.c:326
+#: src/main/util.c:341
 #, c-format
 msgid "type %d is unimplemented in '%s'"
 msgstr "'%2$s' 中尚未實作類型 %1$d"
 
-#: src/main/util.c:354
+#: src/main/util.c:352
 #, c-format
 msgid "unimplemented type '%s' in '%s'\n"
 msgstr "類型 '%s' 尚未在 '%s' 中實作\n"
 
-#: src/main/util.c:356
+#: src/main/util.c:354
 #, c-format
 msgid "unimplemented type (%d) in '%s'\n"
 msgstr "(%d) 類型尚未在 '%s' 中實作\n"
 
-#: src/main/util.c:481
+#: src/main/util.c:479
 msgid "invalid tag in name extraction"
 msgstr "抽��稱的標記�正確"
 
-#: src/main/util.c:491
+#: src/main/util.c:489
 #, c-format
 msgid "%d argument passed to .Internal(%s) which requires %d"
 msgid_plural "%d arguments passed to .Internal(%s) which requires %d"
 msgstr[0] "傳� %d 個引數給 .Internal(%s) 但它需� %d 個"
 
-#: src/main/util.c:497
+#: src/main/util.c:495
 #, c-format
 msgid "%d argument passed to '%s' which requires %d"
 msgid_plural "%d arguments passed to '%s' which requires %d"
 msgstr[0] "傳�了 %d 個引數給 '%s' 但它需� %d 個"
 
-#: src/main/util.c:512
+#: src/main/util.c:510
 #, c-format
 msgid "supplied argument name '%s' does not match '%s'"
 msgstr "給定引數�稱 '%s' �匹� '%s'"
 
-#: src/main/util.c:522
+#: src/main/util.c:520
 #, c-format
 msgid "'nthcdr' list shorter than %d"
 msgstr "'nthcdr' 串列比 %d �短"
 
-#: src/main/util.c:527
+#: src/main/util.c:525
 msgid "'nthcdr' needs a list to CDR down"
 msgstr "'nthcdr' 需� CDR �下串列"
 
-#: src/main/util.c:643
+#: src/main/util.c:641
 msgid "'all.x' must be TRUE or FALSE"
 msgstr "'all.x' 必須是 TRUE 或 FALSE"
 
-#: src/main/util.c:645
+#: src/main/util.c:643
 msgid "'all.y' must be TRUE or FALSE"
 msgstr "'all.y' 必須是 TRUE 或 FALSE"
 
-#: src/main/util.c:670
+#: src/main/util.c:672
 msgid "number of rows in the result exceeds maximum vector length"
 msgstr ""
 
-#: src/main/util.c:762
+#: src/main/util.c:764
 msgid "missing value is invalid"
 msgstr "缺少值為無效"
 
-#: src/main/util.c:771 src/main/util.c:778
+#: src/main/util.c:773 src/main/util.c:780
 msgid "cannot change working directory"
 msgstr "無法變更工作目錄"
 
-#: src/main/util.c:798 src/main/util.c:832 src/main/util.c:873
-#: src/main/util.c:915 src/main/util.c:1044 src/main/util.c:1103
-#: src/main/util.c:1126
+#: src/main/util.c:800 src/main/util.c:834 src/main/util.c:875
+#: src/main/util.c:917 src/main/util.c:1046 src/main/util.c:1105
+#: src/main/util.c:1128
 msgid "a character vector argument expected"
 msgstr "需�字元��引數"
 
-#: src/main/util.c:805 src/main/util.c:840 src/main/util.c:882
-#: src/main/util.c:923
+#: src/main/util.c:807 src/main/util.c:842 src/main/util.c:884
+#: src/main/util.c:925
 msgid "path too long"
 msgstr "路徑太長"
 
-#: src/main/util.c:1058
+#: src/main/util.c:1060
 msgid "only the first character of 'quote' will be used"
 msgstr "�用了 'quote' 的第一個字元"
 
-#: src/main/util.c:1128
+#: src/main/util.c:1130
 msgid "a character vector 'value' expected"
 msgstr "�期有一個字元�� 'value'"
 
-#: src/main/util.c:1131
+#: src/main/util.c:1133
 msgid "'value' must be of positive length"
 msgstr "'value' 必須是正值的長度"
 
-#: src/main/util.c:1260 src/main/util.c:1268
+#: src/main/util.c:1262 src/main/util.c:1270
 #, c-format
 msgid "invalid input '%s' in 'utf8towcs'"
 msgstr "在 'utf8towcs' 中無效的輸入'%s'"
 
-#: src/main/util.c:1353
+#: src/main/util.c:1355
 #, c-format
 msgid "invalid multibyte string at '%s'"
 msgstr "無效的多�元組字串於 '%s'"
 
-#: src/main/util.c:1462
+#: src/main/util.c:1497
 msgid "error message truncated to 255 chars"
 msgstr "錯誤訊�截短到 255 個�元組"
 
-#: src/main/util.c:1475
+#: src/main/util.c:1510
 msgid "warning message truncated to 255 chars"
 msgstr "警告訊�截短到 255 個�元組"
 
-#: src/main/util.c:1624
+#: src/main/util.c:1659
 #, c-format
 msgid "accuracy loss in conversion from \"%s\" to numeric"
 msgstr ""
 
-#: src/main/util.c:1934
+#: src/main/util.c:1969
 #, fuzzy
 msgid "all arguments must be named"
 msgstr "屬性必須命�"
 
-#: src/main/util.c:2054
+#: src/main/util.c:2091
 msgid "ICU is not supported on this build"
 msgstr "這個組建�支� ICU"
 
-#: src/main/util.c:2121
+#: src/main/util.c:2158
 #, fuzzy
 msgid "'breaks' is not sorted"
 msgstr "類型 '%s' 未被支�"
 
-#: src/main/util.c:2155 src/main/util.c:2201
+#: src/main/util.c:2192 src/main/util.c:2242
 #, fuzzy, c-format
 msgid "long vector '%s' is not supported"
 msgstr "類型 '%s' 未被支�"
 
-#: src/main/util.c:2254
+#: src/main/util.c:2296
 msgid "'eps.correct' must be 0, 1, or 2"
 msgstr ""
 
-#: src/main/util.c:2282
+#: src/main/util.c:2324
 #, fuzzy
 msgid "'x' must be a vector"
 msgstr "'x' 必須是字元��"
@@ -6425,7 +6461,7 @@
 msgid "There must be at least three control points"
 msgstr "至少必須有三個控制點"
 
-#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1246
+#: src/modules/X11/dataentry.c:1874 src/modules/X11/devX11.c:1248
 #, c-format
 msgid "X11 protocol error: %s"
 msgstr "X11 �定錯誤：%s"
@@ -6448,7 +6484,7 @@
 "錯誤：X11 無法�置�外的圖案�色。\n"
 "請考慮用 colortype=\"pseudo.cube\" 或 \"gray\" �項來呼� X11。"
 
-#: src/modules/X11/devX11.c:1027
+#: src/modules/X11/devX11.c:1029
 msgid ""
 "could not find any X11 fonts\n"
 "Check that the Font Path is correct."
@@ -6456,204 +6492,210 @@
 "找�到任何 X11 字型\n"
 "請檢查字型路徑設得是�是�。"
 
-#: src/modules/X11/devX11.c:1087
+#: src/modules/X11/devX11.c:1089
 #, c-format
 msgid "X11 used font size %d when %d was requested"
 msgstr "X11 用了字型大� %d 但需�的是 %d"
 
-#: src/modules/X11/devX11.c:1121
+#: src/modules/X11/devX11.c:1123
 #, c-format
 msgid "X11 font %s, face %d at size %d could not be loaded"
 msgstr "X11 字型 %s，字體 %d 於大� %d 時無法載入"
 
-#: src/modules/X11/devX11.c:1130
+#: src/modules/X11/devX11.c:1132
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr "這個�置�支���明：���會回報一次"
 
-#: src/modules/X11/devX11.c:1254
+#: src/modules/X11/devX11.c:1256
 #, c-format
 msgid "X11 I/O error while opening X11 connection to '%s'"
 msgstr "當開啟 X11 連線到 '%s' 時 X11 I/O 錯誤"
 
-#: src/modules/X11/devX11.c:1271
+#: src/modules/X11/devX11.c:1273
 msgid "X11 fatal IO error: please save work and shut down R"
 msgstr "X11 致命的 IO 錯誤: 請儲存工作資料，然後�新啟動 R"
 
-#: src/modules/X11/devX11.c:1326
+#: src/modules/X11/devX11.c:1328
 msgid "locale not supported by Xlib: some X ops will operate in C locale"
 msgstr "Xlib �支�語言環境: �些 X 作業指令將在 C 語言環境中啟動"
 
-#: src/modules/X11/devX11.c:1327
+#: src/modules/X11/devX11.c:1329
 msgid "X cannot set locale modifiers"
 msgstr "X 無法設定語言環境修飾器"
 
-#: src/modules/X11/devX11.c:1331
+#: src/modules/X11/devX11.c:1333
 msgid "no png support in this version of R"
 msgstr "這個版本的 R �支� png"
 
-#: src/modules/X11/devX11.c:1337
+#: src/modules/X11/devX11.c:1339
 msgid "filename too long in png() call"
 msgstr "png() 呼�時檔案�稱太長"
 
-#: src/modules/X11/devX11.c:1341
+#: src/modules/X11/devX11.c:1343
 #, c-format
 msgid "could not open PNG file '%s'"
 msgstr "無法開啟 PNG 檔案 '%s'"
 
-#: src/modules/X11/devX11.c:1353
+#: src/modules/X11/devX11.c:1355
 msgid "no jpeg support in this version of R"
 msgstr "這個版本的 R �支� jpeg"
 
-#: src/modules/X11/devX11.c:1363
+#: src/modules/X11/devX11.c:1365
 msgid "filename too long in jpeg() call"
 msgstr "jpeg() 呼�時檔案�稱太長"
 
-#: src/modules/X11/devX11.c:1367
+#: src/modules/X11/devX11.c:1369
 #, c-format
 msgid "could not open JPEG file '%s'"
 msgstr "無法開啟 JPEG 檔案 '%s'"
 
-#: src/modules/X11/devX11.c:1379
+#: src/modules/X11/devX11.c:1381
 msgid "no tiff support in this version of R"
 msgstr "這個版本的 R �支� tiff"
 
-#: src/modules/X11/devX11.c:1387
+#: src/modules/X11/devX11.c:1389
 msgid "filename too long in tiff() call"
 msgstr "tiff() 呼�時檔案�稱太長"
 
-#: src/modules/X11/devX11.c:1399
+#: src/modules/X11/devX11.c:1401
 msgid "filename too long in bmp() call"
 msgstr "bmp() 呼�時檔案�稱太長"
 
-#: src/modules/X11/devX11.c:1403
+#: src/modules/X11/devX11.c:1405
 #, c-format
 msgid "could not open BMP file '%s'"
 msgstr "無法開啟 BMP 檔案 '%s'"
 
-#: src/modules/X11/devX11.c:1433
+#: src/modules/X11/devX11.c:1435
 #, c-format
 msgid "unable to open connection to X11 display '%s'"
 msgstr "無法開啟連�到 X11 顯示 '%s'"
 
-#: src/modules/X11/devX11.c:1443
+#: src/modules/X11/devX11.c:1445
 msgid "ignoring 'display' argument as an X11 device is already open"
 msgstr "�個 X11 �置已經開啟因而忽略 'display' 引數"
 
-#: src/modules/X11/devX11.c:1449
+#: src/modules/X11/devX11.c:1451
 msgid "cairo-based types may only work correctly on TrueColor visuals"
 msgstr "基於 cairo 的類型�會在 TrueColor 視訊中正常作用"
 
-#: src/modules/X11/devX11.c:1459
+#: src/modules/X11/devX11.c:1461
 msgid "jpeg() does not support transparency: using white bg"
 msgstr "jpeg() �支��明繪圖：使用白色背景"
 
-#: src/modules/X11/devX11.c:1564
+#: src/modules/X11/devX11.c:1566
 #, c-format
 msgid "unable to obtain information on display '%s'"
 msgstr "無法在顯示 '%s' 上得到資訊"
 
-#: src/modules/X11/devX11.c:1582
+#: src/modules/X11/devX11.c:1584
 msgid "unable to create X11 window"
 msgstr "無法建立 X11 視窗"
 
-#: src/modules/X11/devX11.c:1717
+#: src/modules/X11/devX11.c:1719
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "'寬度=%d, 高度=%d' 是�太�能的�素值"
 
-#: src/modules/X11/devX11.c:1722
+#: src/modules/X11/devX11.c:1724
 msgid "unable to create pixmap"
 msgstr "無法建立�素圖"
 
-#: src/modules/X11/devX11.c:1753
+#: src/modules/X11/devX11.c:1755
 msgid "invalid font specification"
 msgstr "字型設定�正確"
 
-#: src/modules/X11/devX11.c:1793
+#: src/modules/X11/devX11.c:1795
 msgid "font family not found in X11 font database"
 msgstr "X11 字型資料庫中沒有此一字型家�"
 
-#: src/modules/X11/devX11.c:1832
+#: src/modules/X11/devX11.c:1834
 #, c-format
 msgid "invalid use of %d < 0 in '%s'"
 msgstr "在 '%2$s' 中使用 %1$d < 0 是無效的"
 
-#: src/modules/X11/devX11.c:1953
+#: src/modules/X11/devX11.c:1955
 #, c-format
 msgid "could not open file '%s'"
 msgstr "無法開啟檔案 '%s'"
 
-#: src/modules/X11/devX11.c:2183
+#: src/modules/X11/devX11.c:2185
 #, c-format
 msgid "%s not available for this device"
 msgstr "這個�置無法使用 %s "
 
-#: src/modules/X11/devX11.c:2328
+#: src/modules/X11/devX11.c:2330
 msgid "Unable to create XImage"
 msgstr "無法建立 XImage"
 
-#: src/modules/X11/devX11.c:2527
+#: src/modules/X11/devX11.c:2529
 msgid "attempt to use the locator after dev.hold()"
 msgstr "於 dev.hold() 之後試圖使用定�器"
 
-#: src/modules/X11/devX11.c:3111
+#: src/modules/X11/devX11.c:3117
 #, c-format
 msgid "unable to start device %s"
 msgstr "無法開啟�置 %s"
 
-#: src/modules/X11/devX11.c:3138
+#: src/modules/X11/devX11.c:3144
 msgid "invalid 'width' or 'height'"
 msgstr "'width' 或 'height' �正確"
 
-#: src/modules/X11/devX11.c:3145
+#: src/modules/X11/devX11.c:3151
 msgid "invalid colortype passed to X11 driver"
 msgstr "傳給 X11 驅動器的�色類型�正確"
 
-#: src/modules/X11/devX11.c:3159
+#: src/modules/X11/devX11.c:3165
 msgid "unknown X11 color/colour model -- using monochrome"
 msgstr "沒有這種 X11 �色/�色模型 -- 使用黑白�色"
 
-#: src/modules/X11/devX11.c:3249
+#: src/modules/X11/devX11.c:3255
 msgid "no plot on device to save"
 msgstr "�置上沒有�槽�以儲存"
 
-#: src/modules/X11/devX11.c:3251
+#: src/modules/X11/devX11.c:3257
 msgid "not an open X11cairo device"
 msgstr "�是一個開啟的 X11cairo �置"
 
-#: src/modules/X11/devX11.c:3260
+#: src/modules/X11/devX11.c:3266
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "無法開啟檔案 '%s'"
 
-#: src/modules/X11/devX11.c:3277
+#: src/modules/X11/devX11.c:3283
 msgid "savePlot() is not supported on this build"
 msgstr "這次組建並未支� savePlot()"
 
-#: src/modules/X11/devX11.c:3317
+#: src/modules/X11/devX11.c:3323
 msgid "unable to contact X11 display"
 msgstr "無法連�到 X11 顯示"
 
-#: src/modules/X11/devX11.c:3366
+#: src/modules/X11/devX11.c:3372
 #, c-format
 msgid "clipboard cannot be read (error code %d)"
 msgstr "無法讀�剪貼簿 (錯誤碼 %d)"
 
-#: src/modules/X11/devX11.c:3402
+#: src/modules/X11/devX11.c:3408
 msgid "cannot allocate memory for X11Routines structure"
 msgstr "無法為 X11Routines �構�置記憶體"
 
 #: src/modules/internet/internet.c:113
-msgid "for https:// URLs use setInternet2(TRUE)"
+msgid "for https:// URLs use method = \"wininet\""
 msgstr ""
 
+#: src/modules/internet/internet.c:153 src/modules/internet/internet.c:274
+#: src/modules/internet/internet.c:758
+#, fuzzy, c-format
+msgid "scheme not supported in URL '%s'"
+msgstr "'eval' �支��新啟動"
+
 #: src/modules/internet/internet.c:348 src/modules/internet/internet.c:352
 #: src/modules/internet/internet.c:357 src/modules/internet/internet.c:381
-#: src/modules/internet/libcurl.c:655 src/modules/internet/libcurl.c:659
-#: src/modules/internet/libcurl.c:665 src/modules/internet/libcurl.c:677
-#: src/modules/internet/libcurl.c:685
+#: src/modules/internet/libcurl.c:791 src/modules/internet/libcurl.c:795
+#: src/modules/internet/libcurl.c:801 src/modules/internet/libcurl.c:814
+#: src/modules/internet/libcurl.c:822
 msgid "allocation of url connection failed"
 msgstr "url 連��置失敗"
 
@@ -6665,29 +6707,29 @@
 msgid "only first element of 'destfile' argument used"
 msgstr "�用 'destfile' 引數的第一個元素"
 
-#: src/modules/internet/internet.c:479 src/modules/internet/libcurl.c:367
+#: src/modules/internet/internet.c:480 src/modules/internet/libcurl.c:499
 msgid "Download progress"
 msgstr "正在下載"
 
-#: src/modules/internet/internet.c:501
+#: src/modules/internet/internet.c:502
 #, c-format
 msgid "cannot open URL '%s', reason '%s'"
 msgstr "無法開啟網� '%s' ，原因是 '%s'"
 
-#: src/modules/internet/internet.c:508 src/modules/internet/internet.c:536
-#: src/modules/internet/internet.c:661 src/modules/internet/libcurl.c:408
+#: src/modules/internet/internet.c:509 src/modules/internet/internet.c:536
+#: src/modules/internet/internet.c:661
 #, c-format
 msgid "cannot open destfile '%s', reason '%s'"
 msgstr "無法開啟目標檔案 '%s' ，原因是 '%s'"
 
 #: src/modules/internet/internet.c:541 src/modules/internet/internet.c:666
-#: src/modules/internet/libcurl.c:412
+#: src/modules/internet/libcurl.c:530
 #, c-format
 msgid "trying URL '%s'\n"
 msgstr "嘗試 URL '%s'\n"
 
 #: src/modules/internet/internet.c:640 src/modules/internet/internet.c:751
-#: src/modules/internet/libcurl.c:460
+#: src/modules/internet/libcurl.c:578
 #, fuzzy, c-format
 msgid "downloaded length %0.f != reported length %0.f"
 msgstr "下載的長度 %d != 報告的長度 %d"
@@ -6697,140 +6739,166 @@
 msgid "cannot open URL '%s'"
 msgstr "無法開啟 URL '%s'"
 
-#: src/modules/internet/internet.c:760
-msgid "unsupported URL scheme"
-msgstr "�支�這種 URL 方案"
-
-#: src/modules/internet/internet.c:783 src/modules/internet/internet.c:949
-#, c-format
-msgid "cannot open: HTTP status was '%d %s'"
+#: src/modules/internet/internet.c:779 src/modules/internet/internet.c:944
+#, fuzzy, c-format
+msgid "cannot open URL '%s': HTTP status was '%d %s'"
 msgstr "無法開啟: HTTP 狀態是 '%d%s'"
 
-#: src/modules/internet/internet.c:920 src/modules/internet/internet.c:934
-#: src/modules/internet/internet.c:1021 src/modules/internet/internet.c:1030
+#: src/modules/internet/internet.c:915 src/modules/internet/internet.c:929
+#: src/modules/internet/internet.c:1019 src/modules/internet/internet.c:1028
 #, c-format
 msgid "InternetOpenUrl failed: '%s'"
 msgstr "InternetOpenUrl 失敗: '%s'"
 
-#: src/modules/internet/libcurl.c:142
+#: src/modules/internet/libcurl.c:159
+#, fuzzy, c-format
+msgid "URL '%s': status was '%d %s'"
+msgstr "無法開啟: HTTP 狀態是 '%d%s'"
+
+#: src/modules/internet/libcurl.c:163
+#, c-format
+msgid "URL '%s': status was '%s'"
+msgstr ""
+
+#: src/modules/internet/libcurl.c:240
 #, fuzzy
 msgid "curlGetHeaders is not supported on this platform"
 msgstr "本平臺�支� nsl()"
 
-#: src/modules/internet/libcurl.c:151 src/modules/internet/libcurl.c:154
+#: src/modules/internet/libcurl.c:249 src/modules/internet/libcurl.c:252
 #, fuzzy, c-format
 msgid "invalid %s argument"
 msgstr "'%s' 引數�正確"
 
-#: src/modules/internet/libcurl.c:171
+#: src/modules/internet/libcurl.c:269
 #, c-format
 msgid ""
 "libcurl error code %d\n"
 "\t%s\n"
 msgstr ""
 
-#: src/modules/internet/libcurl.c:306
+#: src/modules/internet/libcurl.c:404
 #, fuzzy
 msgid "download.file(method = \"libcurl\") is not supported on this platform"
 msgstr "本平臺�支� nsl()"
 
-#: src/modules/internet/libcurl.c:322
+#: src/modules/internet/libcurl.c:420
 #, fuzzy
 msgid "lengths of 'url' and 'destfile' must match"
 msgstr "導入和導出�稱的長度必須相等"
 
-#: src/modules/internet/libcurl.c:689
+#: src/modules/internet/libcurl.c:481
+#, fuzzy, c-format
+msgid "URL %s: cannot open destfile '%s', reason '%s'"
+msgstr "無法開啟目標檔案 '%s' ，原因是 '%s'"
+
+#: src/modules/internet/libcurl.c:593
+#, fuzzy
+msgid "cannot download all files"
+msgstr "無法開啟檔案 '%s'"
+
+#: src/modules/internet/libcurl.c:727
+#, fuzzy
+msgid "cannot read from connection"
+msgstr "無法從此連�讀�"
+
+#: src/modules/internet/libcurl.c:763
+#, fuzzy
+msgid "cannot open connection"
+msgstr "無法開啟連�"
+
+#: src/modules/internet/libcurl.c:826
 #, fuzzy
 msgid "url(method = \"libcurl\") is not supported on this platform"
 msgstr "本平臺�支� nsl()"
 
-#: src/modules/internet/nanoftp.c:290 src/modules/internet/nanoftp.c:303
-#: src/modules/internet/nanoftp.c:314 src/modules/internet/nanoftp.c:348
-#: src/modules/internet/nanoftp.c:358
+#: src/modules/internet/nanoftp.c:289 src/modules/internet/nanoftp.c:302
+#: src/modules/internet/nanoftp.c:313 src/modules/internet/nanoftp.c:347
+#: src/modules/internet/nanoftp.c:357
 msgid "RxmlNanoFTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanURL：�長 (無效？) 網�"
 
-#: src/modules/internet/nanoftp.c:391
+#: src/modules/internet/nanoftp.c:390
 msgid "removing FTP proxy info"
 msgstr "刪除 FTP 代�主機資訊"
 
-#: src/modules/internet/nanoftp.c:393
+#: src/modules/internet/nanoftp.c:392
 #, c-format
 msgid "using FTP proxy '%s'"
 msgstr "用 FTP 代�主機 '%s'"
 
-#: src/modules/internet/nanoftp.c:404 src/modules/internet/nanoftp.c:433
+#: src/modules/internet/nanoftp.c:403 src/modules/internet/nanoftp.c:432
 msgid "RxmlNanoFTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoFTPScanProxy：�長 (無效？) 網�"
 
-#: src/modules/internet/nanoftp.c:834
+#: src/modules/internet/nanoftp.c:833
 msgid "cannot resolve host"
 msgstr "無法分辨主機"
 
-#: src/modules/internet/nanoftp.c:864
+#: src/modules/internet/nanoftp.c:863
 msgid "failed to connect to server"
 msgstr "連線�上伺�器"
 
-#: src/modules/internet/nanoftp.c:875
+#: src/modules/internet/nanoftp.c:874
 msgid "failed to get response from server"
 msgstr "伺�器沒有�應"
 
-#: src/modules/internet/nanoftp.c:1138
+#: src/modules/internet/nanoftp.c:1137
 msgid "RxmlNanoFTPGetConnection: failed to create socket"
 msgstr "RxmlNanoFTPGetConnection: 建立�槽失敗"
 
-#: src/modules/internet/nanoftp.c:1184
+#: src/modules/internet/nanoftp.c:1183
 msgid "failed to create a data connection"
 msgstr "建立資料連�失敗"
 
-#: src/modules/internet/nanoftp.c:1192
+#: src/modules/internet/nanoftp.c:1191
 msgid "failed to bind a port"
 msgstr "連線通訊埠失敗"
 
-#: src/modules/internet/nanoftp.c:1199
+#: src/modules/internet/nanoftp.c:1198
 #, c-format
 msgid "could not listen on port %d"
 msgstr "無法從通訊埠 %d ��資料"
 
-#: src/modules/internet/nanohttp.c:370 src/modules/internet/nanohttp.c:398
-#: src/modules/internet/nanohttp.c:407
+#: src/modules/internet/nanohttp.c:369 src/modules/internet/nanohttp.c:400
+#: src/modules/internet/nanohttp.c:412
 msgid "RxmlNanoHTTPScanURL: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanURL：�長 (無效？) 網�"
 
-#: src/modules/internet/nanohttp.c:441
+#: src/modules/internet/nanohttp.c:446
 msgid "removing HTTP proxy info"
 msgstr "刪除 HTTP 代�主機資訊"
 
-#: src/modules/internet/nanohttp.c:443
+#: src/modules/internet/nanohttp.c:448
 #, c-format
 msgid "using HTTP proxy '%s'"
 msgstr "使用 HTTP 代�主機 '%s'"
 
-#: src/modules/internet/nanohttp.c:454 src/modules/internet/nanohttp.c:490
+#: src/modules/internet/nanohttp.c:459 src/modules/internet/nanohttp.c:497
 msgid "RxmlNanoHTTPScanProxy: overlong (invalid?) URL"
 msgstr "RxmlNanoHTTPScanProxy：�長 (無效？) 網�"
 
-#: src/modules/internet/nanohttp.c:1124
+#: src/modules/internet/nanohttp.c:1135
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "無法解� '%s'"
 
-#: src/modules/internet/nanohttp.c:1157
+#: src/modules/internet/nanohttp.c:1168
 #, c-format
 msgid "connected to '%s' on port %d."
 msgstr "��通訊埠 %2$d 接通到 '%1$s'。"
 
-#: src/modules/internet/nanohttp.c:1162
+#: src/modules/internet/nanohttp.c:1173
 #, c-format
 msgid "unable to connect to '%s' on port %d."
 msgstr "無法��通訊埠 %2$d 連線到 '%1$s'。"
 
-#: src/modules/internet/nanohttp.c:1466
+#: src/modules/internet/nanohttp.c:1477
 #, c-format
 msgid "redirect to: '%s'"
 msgstr "�新傳�到: '%s'"
 
-#: src/modules/internet/nanohttp.c:1477
+#: src/modules/internet/nanohttp.c:1488
 msgid "too many redirects, aborting ..."
 msgstr "太多�新傳�，中斷工作 ..."
 
@@ -7063,8 +7131,8 @@
 msgstr "bessel_i �置錯誤"
 
 #: src/nmath/bessel_i.c:77 src/nmath/bessel_i.c:122
-#, c-format
-msgid "bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_i(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. 引數在範�外？\n"
 
 #: src/nmath/bessel_i.c:80 src/nmath/bessel_i.c:125
@@ -7072,16 +7140,21 @@
 msgid "bessel_i(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_i(%g,nu=%g): �果的精確度有�害\n"
 
-#: src/nmath/bessel_j.c:71
+#: src/nmath/bessel_j.c:64 src/nmath/bessel_j.c:118
+#, c-format
+msgid "besselJ(x, nu): nu=%g too large for bessel_j() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_j.c:72
 msgid "bessel_j allocation error"
 msgstr "bessel_j �置錯誤"
 
-#: src/nmath/bessel_j.c:79 src/nmath/bessel_j.c:125
-#, c-format
-msgid "bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_j.c:80 src/nmath/bessel_j.c:127
+#, fuzzy, c-format
+msgid "bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_j(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. 引數在範�外？\n"
 
-#: src/nmath/bessel_j.c:82 src/nmath/bessel_j.c:128
+#: src/nmath/bessel_j.c:83 src/nmath/bessel_j.c:130
 #, c-format
 msgid "bessel_j(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_j(%g,nu=%g): �果的精確度有�害\n"
@@ -7091,8 +7164,8 @@
 msgstr "bessel_k �置錯誤"
 
 #: src/nmath/bessel_k.c:71 src/nmath/bessel_k.c:108
-#, c-format
-msgid "bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#, fuzzy, c-format
+msgid "bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_k(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. 引數在範�外？\n"
 
 #: src/nmath/bessel_k.c:74 src/nmath/bessel_k.c:111
@@ -7100,16 +7173,21 @@
 msgid "bessel_k(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_k(%g,nu=%g): �果的精確度有�害\n"
 
-#: src/nmath/bessel_y.c:70
+#: src/nmath/bessel_y.c:63 src/nmath/bessel_y.c:125
+#, c-format
+msgid "besselY(x, nu): nu=%g too large for bessel_y() algorithm"
+msgstr ""
+
+#: src/nmath/bessel_y.c:71
 msgid "bessel_y allocation error"
 msgstr "bessel_y �置錯誤"
 
-#: src/nmath/bessel_y.c:86 src/nmath/bessel_y.c:134
-#, c-format
-msgid "bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"
+#: src/nmath/bessel_y.c:87 src/nmath/bessel_y.c:136
+#, fuzzy, c-format
+msgid "bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"
 msgstr "bessel_y(%g): ncalc (=%ld)!= nb (=%ld); alpha=%g. 引數在範�外？\n"
 
-#: src/nmath/bessel_y.c:89 src/nmath/bessel_y.c:137
+#: src/nmath/bessel_y.c:90 src/nmath/bessel_y.c:139
 #, c-format
 msgid "bessel_y(%g,nu=%g): precision lost in result\n"
 msgstr "bessel_y(%g,nu=%g): �果的精確度有�害\n"
@@ -7119,42 +7197,42 @@
 msgid "'k' (%.2f) must be integer, rounded to %.0f"
 msgstr ""
 
-#: src/nmath/nmath.h:143
+#: src/nmath/nmath.h:156
 #, c-format
 msgid "argument out of domain in '%s'\n"
 msgstr "在 '%s' 中引數超出領域\n"
 
-#: src/nmath/nmath.h:146
+#: src/nmath/nmath.h:159
 #, c-format
 msgid "value out of range in '%s'\n"
 msgstr "在 '%s' 中的值超出範�\n"
 
-#: src/nmath/nmath.h:149
+#: src/nmath/nmath.h:162
 #, c-format
 msgid "convergence failed in '%s'\n"
 msgstr "在 '%s' 中收斂失敗\n"
 
-#: src/nmath/nmath.h:152
+#: src/nmath/nmath.h:165
 #, c-format
 msgid "full precision may not have been achieved in '%s'\n"
 msgstr "在 '%s' 中�能尚未�到完全精確\n"
 
-#: src/nmath/nmath.h:155
+#: src/nmath/nmath.h:168
 #, c-format
 msgid "underflow occurred in '%s'\n"
 msgstr "下�溢�發生於 '%s'\n"
 
-#: src/nmath/pbeta.c:67
+#: src/nmath/pbeta.c:64
 #, c-format
 msgid "pbeta_raw(%g, a=%g, b=%g, ..) -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnbinom.c:79
+#: src/nmath/pnbinom.c:82
 #, c-format
 msgid "pnbinom_mu() -> bratio() gave error code %d"
 msgstr ""
 
-#: src/nmath/pnchisq.c:292
+#: src/nmath/pnchisq.c:295
 #, c-format
 msgid "pnchisq(x=%g, ..): not converged in %d iter."
 msgstr "pnchisq(x=%g, ..): %d 次循環後還沒有��。"
@@ -7222,7 +7300,7 @@
 "Explicit lazy dynamic loading not supported on this platform. Using default."
 msgstr "本系統�支�明確的緩慢動態載入。使用�設值。"
 
-#: src/unix/dynload.c:240
+#: src/unix/dynload.c:232
 msgid "cannot get working directory!"
 msgstr "找�到工作目錄"
 
@@ -7236,12 +7314,12 @@
 "report using bug.report()"
 msgstr "巢狀 readline 輸入出了�尋常的錯，請用 bug.report()"
 
-#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1252
+#: src/unix/sys-std.c:1085 src/unix/sys-std.c:1255
 #, c-format
 msgid "problem in saving the history file '%s'"
 msgstr "儲存歷�檔案 '%s' 時出了�題"
 
-#: src/unix/sys-std.c:1159
+#: src/unix/sys-std.c:1162
 #, c-format
 msgid ""
 "Cannot open file '%s': %s\n"
@@ -7250,85 +7328,122 @@
 "無法開啟檔案 '%s' ：%s\n"
 "\n"
 
-#: src/unix/sys-std.c:1223 src/unix/sys-std.c:1246
+#: src/unix/sys-std.c:1226 src/unix/sys-std.c:1249
 msgid "'file' argument is too long"
 msgstr "'file' 引數太長"
 
-#: src/unix/sys-std.c:1229 src/unix/sys-std.c:1231
+#: src/unix/sys-std.c:1232 src/unix/sys-std.c:1234
 msgid "no history mechanism available"
 msgstr "沒有歷�功能"
 
-#: src/unix/sys-std.c:1258
+#: src/unix/sys-std.c:1261
 msgid "problem in truncating the history file"
 msgstr "截斷歷�檔案時發生�題"
 
-#: src/unix/sys-std.c:1260 src/unix/sys-std.c:1262
+#: src/unix/sys-std.c:1263 src/unix/sys-std.c:1265
 msgid "no history available to save"
 msgstr "沒有�以儲存的歷�紀錄"
 
-#: src/unix/sys-std.c:1274
+#: src/unix/sys-std.c:1277
 msgid "invalid timestamp"
 msgstr "時間戳記�正確"
 
-#: src/unix/sys-unix.c:247
+#: src/unix/sys-unix.c:248
 msgid "non-empty character argument expected"
 msgstr "需��空字元引數"
 
-#: src/unix/sys-unix.c:250
+#: src/unix/sys-unix.c:251
 msgid "'intern' must be logical and not NA"
 msgstr "'intern' 必須是�輯值且�無定義"
 
-#: src/unix/sys-unix.c:262
+#: src/unix/sys-unix.c:269
 #, c-format
 msgid "cannot popen '%s', probable reason '%s'"
 msgstr "無法 popen '%s' ，�能的原因是 '%s'"
 
-#: src/unix/sys-unix.c:267
+#: src/unix/sys-unix.c:279
 #, c-format
 msgid "line %d may be truncated in call to system(, intern = TRUE)"
 msgstr "第 %d 列也許在呼� system(, intern = TRUE) 時被截斷"
 
-#: src/unix/sys-unix.c:284
+#: src/unix/sys-unix.c:301
 #, c-format
 msgid "error in running command: '%s'"
 msgstr "執行命令時發生錯誤：'%s'"
 
-#: src/unix/sys-unix.c:286
+#: src/unix/sys-unix.c:303
 msgid "error in running command"
 msgstr "執行命令時發生錯誤"
 
-#: src/unix/sys-unix.c:290
+#: src/unix/sys-unix.c:307
 #, c-format
 msgid "running command '%s' had status %d and error message '%s'"
 msgstr "執行命令 '%s' 時出�狀態 %d 和錯誤訊� '%s'"
 
-#: src/unix/sys-unix.c:395
+#: src/unix/sys-unix.c:412
 msgid "Sys.info() is not implemented on this system"
 msgstr "本系統沒有實作 Sys.info() 此一功能"
 
-#: src/unix/system.c:255
+#: src/unix/system.c:267
 #, c-format
 msgid "WARNING: --gui or -g without value ignored"
 msgstr "警告: --gui 或 -g �項沒有值，因此忽略�用"
 
-#: src/unix/system.c:273
+#: src/unix/system.c:285
 #, c-format
 msgid "WARNING: unknown gui '%s', using X11\n"
 msgstr "警告: 沒有這種 gui '%s', 使用 X11\n"
 
-#: src/unix/system.c:276
+#: src/unix/system.c:288
 #, c-format
 msgid "WARNING: unknown gui '%s', using none\n"
 msgstr "警告: 沒有這種 gui '%s', 因此什麼都�用\n"
 
-#: src/unix/system.c:386
+#: src/unix/system.c:373
 msgid "creating temporary file for '-e' failed"
 msgstr "為 '-e' 建立暫存檔時失敗"
 
-#: src/unix/system.c:467
+#: src/unix/system.c:454
 msgid "WARNING: Only editing the first in the list of files"
 msgstr "警告: �修改檔案串列中的第一個元素"
 
+#~ msgid "'what' must be a character string or a function"
+#~ msgstr "'what' 必須是字串或函數"
+
+#~ msgid "sockets are not available on this system"
+#~ msgstr "本系統沒有�槽這個功能"
+
+#~ msgid "no function to restart"
+#~ msgstr "沒有�新開始的功能"
+
+#~ msgid "argument must be a closure"
+#~ msgstr "引數必須是個��"
+
+#~ msgid "'hostname' must be a character vector of length 1"
+#~ msgstr "'hostname' 必須是長度為 1 的字元��"
+
+#~ msgid "nsl() was unable to resolve host '%s'"
+#~ msgstr "nsl() 無法分辨主機 '%s'"
+
+#, fuzzy
+#~ msgid "unknown format returned by C function 'gethostbyname'"
+#~ msgstr "gethostbyname 回傳了錯誤的格�"
+
+#~ msgid "nsl() is not supported on this platform"
+#~ msgstr "本平臺�支� nsl()"
+
+#~ msgid "too large a range of values in 'x'"
+#~ msgstr "'x' 中的值的範�太大"
+
+#~ msgid "non-numeric argument"
+#~ msgstr "�數值引數"
+
+#~ msgid "unsupported URL scheme"
+#~ msgstr "�支�這種 URL 方案"
+
+#~ msgid "'dimnames' must be a list"
+#~ msgstr "'dimnames' 必須是串列"
+
 #~ msgid "'args' must be a list"
 #~ msgstr "'args' 必須是串列"
 
@@ -7515,15 +7630,9 @@
 #~ msgid "can't use R profiling while byte code profiling"
 #~ msgstr "在�元組碼程�概�分�時�能用 R 來�時進行程�概�分�"
 
-#~ msgid "bad character switch offsets"
-#~ msgstr "�當的字元切��移值"
-
 #~ msgid "bad switch names"
 #~ msgstr "�當的切��稱"
 
-#~ msgid "bad numeric switch offsets"
-#~ msgstr "�當的數值切��移值"
-
 #~ msgid "constBuf must be a generic vector"
 #~ msgstr "constBuf 必須是一般��"
 
@@ -7689,9 +7798,6 @@
 #~ msgid "'title' must be a character string"
 #~ msgstr "'title' 必須是字串"
 
-#~ msgid "'text' must be a character string"
-#~ msgstr "'text' 必須是字串"
-
 #~ msgid "'%s' must be length 1"
 #~ msgstr "'%s' 的長度必須是 1"
 
@@ -7722,9 +7828,6 @@
 #~ msgid "'file' is not a connection"
 #~ msgstr "'file' �是連�"
 
-#~ msgid "'dec' must be a single character"
-#~ msgstr "'dec' 必須是單一字元"
-
 #~ msgid "corrupt data frame -- length of column %d does not not match nrows"
 #~ msgstr "資料框毀�-- 行的長度 %d 與 nrows �相等"
 
diff -Nru r-base-3.2.3/src/library/base/R/all.equal.R r-base-3.3.1/src/library/base/R/all.equal.R
--- r-base-3.2.3/src/library/base/R/all.equal.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/all.equal.R	2016-03-16 23:03:52.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/all.equal.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,8 +18,7 @@
 
 all.equal <- function(target, current, ...) UseMethod("all.equal")
 
-all.equal.default <-
-    function(target, current, ...)
+all.equal.default <- function(target, current, ...)
 {
     ## Really a dispatcher given mode() of args :
     ## use data.class as unlike class it does not give "integer"
@@ -46,7 +45,7 @@
 }
 
 all.equal.numeric <-
-    function(target, current, tolerance = .Machine$double.eps ^ .5,
+    function(target, current, tolerance = sqrt(.Machine$double.eps),
              scale = NULL, ..., check.attributes = TRUE)
 {
     if (!is.numeric(tolerance))
@@ -149,8 +148,8 @@
 ## In 'base' these are all visible, so need to test both args:
 
 all.equal.envRefClass <- function (target, current, ...) {
-    if(!is (target, "envRefClass")) return("'target' is not an envRefClass")
-    if(!is(current, "envRefClass")) return("'current' is not an envRefClass")
+    if(!methods::is(target, "envRefClass")) return("'target' is not an envRefClass")
+    if(!methods::is(current, "envRefClass")) return("'current' is not an envRefClass")
     if(!isTRUE(ae <- all.equal(class(target), class(current), ...)))
 	return(sprintf("Classes differ: %s", paste(ae, collapse=" ")))
     getCl <- function(x) { cl <- tryCatch(x$getClass(), error=function(e) NULL)
@@ -179,7 +178,8 @@
     sns <- names(cld@slots); sns <- sns[sns != ".xData"]
     msg <- if(length(sns)) {
 	L <- lapply(sns, function(sn)
-	    all.equal(slot(target, sn), slot(current, sn), ...))
+	    all.equal(methods::slot(target, sn),
+                      methods::slot(current, sn), ...))
 	unlist(L[vapply(L, is.character, NA)])
     }
     if(is.character(n)) msg <- c(msg, n)
diff -Nru r-base-3.2.3/src/library/base/R/array.R r-base-3.3.1/src/library/base/R/array.R
--- r-base-3.2.3/src/library/base/R/array.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/array.R	2016-03-16 23:03:52.000000000 +0000
@@ -60,7 +60,7 @@
     y
 }
 
-provideDimnames <- function(x, sep = "", base = list(LETTERS))
+provideDimnames <- function(x, sep = "", base = list(LETTERS), unique = TRUE)
 {
     ## provide dimnames where missing - not copying x unnecessarily
     dx <- dim(x)
@@ -71,7 +71,8 @@
     for(i in which(vapply(dnx, is.null, NA))) {
 	ii <- 1L+(i-1L) %% k # recycling
         ss <- seq_len(dx[i]) - 1L # dim could be zero
-	dnx[[i]] <- make.unique(base[[ii]][1L+ (ss %% M[ii])], sep = sep)
+	bi <- base[[ii]][1L+ (ss %% M[ii])]
+	dnx[[i]] <- if(unique) make.unique(bi, sep = sep) else bi
 	new <- TRUE
     }
     if(new) dimnames(x) <- dnx
diff -Nru r-base-3.2.3/src/library/base/R/as.R r-base-3.3.1/src/library/base/R/as.R
--- r-base-3.2.3/src/library/base/R/as.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/as.R	2016-03-16 23:03:48.000000000 +0000
@@ -24,6 +24,7 @@
 # preserve the semantics that for a call with an object argument
 # dispatching is done first on as.character and then on as.vector.
 as.character.default <- function(x,...) .Internal(as.vector(x, "character"))
+### FIXME: why are we not doing this for all atomic vector types?
 
 as.expression <- function(x,...) UseMethod("as.expression")
 as.expression.default <- function(x,...) .Internal(as.vector(x, "expression"))
diff -Nru r-base-3.2.3/src/library/base/R/attach.R r-base-3.3.1/src/library/base/R/attach.R
--- r-base-3.2.3/src/library/base/R/attach.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/attach.R	2016-03-16 23:03:52.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/attach.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,6 +16,10 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
+## Abstraction for "The fastest way" to do this [no if(), no substr(), ...],
+## to be used in many places:
+.rmpkg <- function(pkg) sub("package:", "", pkg, fixed=TRUE)
+
 ## also used by library() :
 .maskedMsg <- function(same, pkg, by) {
     objs <- strwrap(paste(same, collapse=", "), indent = 4L, exdent = 4L)
@@ -48,9 +52,9 @@
                 break
             }
         }
-        ob <- objects(db.pos, all.names = TRUE)
+        ob <- names(as.environment(db.pos))
         if(.isMethodsDispatchOn()) { ## {see note in library() about this}
-            these <- ob[substr(ob, 1L, 6L) == ".__T__"]
+            these <- ob[startsWith(ob,".__T__")]
             gen  <- gsub(".__T__(.*):([^:]+)", "\\1", these)
             from <- gsub(".__T__(.*):([^:]+)", "\\2", these)
             gen <- gen[from != ".GlobalEnv"]
@@ -58,11 +62,11 @@
         }
         ipos <- seq_along(sp)[-c(db.pos, match(c("Autoloads", "CheckExEnv"), sp, 0L))]
         for (i in ipos) {
-            obj.same <- match(objects(i, all.names = TRUE), ob, nomatch = 0L)
+            obj.same <- match(names(as.environment(i)), ob, nomatch = 0L)
             if (any(obj.same > 0L)) {
                 same <- ob[obj.same]
                 same <- same[!(same %in% dont.mind)]
-                Classobjs <- grep("^\\.__", same)
+                Classobjs <- which(startsWith(same,".__"))
                 if(length(Classobjs)) same <- same[-Classobjs]
                 ## report only objects which are both functions or
                 ## both non-functions.
@@ -73,7 +77,8 @@
                 if(length(same)) {
 		    pkg <- if (sum(sp == sp[i]) > 1L) # 'pos = *' needs no translation
 			sprintf("%s (pos = %d)", sp[i], i) else sp[i]
-		    message(.maskedMsg(same, pkg, by = i < db.pos), domain=NA)
+		    message(.maskedMsg(sort(same), pkg, by = i < db.pos),
+                            domain = NA)
 		}
             }
         }
@@ -98,7 +103,7 @@
         checkConflicts(value)
     }
     if (length(names(value)) && .isMethodsDispatchOn() )
-        methods:::cacheMetaData(value, TRUE)
+        methods::cacheMetaData(value, TRUE)
     invisible(value)
 }
 
@@ -120,22 +125,22 @@
 
     ## we need to treat packages differently from other objects, so get those
     ## out of the way now
-    if (! grepl("^package:", packageName) )
+    if (!startsWith(packageName, "package:"))
         return(invisible(.Internal(detach(pos))))
 
     ## From here down we are detaching a package.
-    pkgname <- sub("^package:", "", packageName)
+    pkgname <- .rmpkg(packageName)
     for(pkg in search()[-1L]) {
-        if(grepl("^package:", pkg) &&
+	if(startsWith(pkg, "package:") &&
            exists(".Depends", pkg, inherits = FALSE) &&
            pkgname %in% get(".Depends", pkg, inherits = FALSE))
             if(force)
                 warning(gettextf("package %s is required by %s, which may no longer work correctly",
-                                 sQuote(pkgname), sQuote(sub("^package:", "", pkg))),
+				 sQuote(pkgname), sQuote(.rmpkg(pkg))),
                      call. = FALSE, domain = NA)
             else
                 stop(gettextf("package %s is required by %s so will not be detached",
-                              sQuote(pkgname), sQuote(sub("^package:", "", pkg))),
+			      sQuote(pkgname), sQuote(.rmpkg(pkg))),
                      call. = FALSE, domain = NA)
     }
     env <- as.environment(pos)
@@ -187,7 +192,7 @@
         }
     } else {
         if(.isMethodsDispatchOn() && methods:::.hasS4MetaData(env))
-            methods:::cacheMetaData(env, FALSE)
+            methods::cacheMetaData(env, FALSE)
         .Internal(lazyLoadDBflush(paste0(libpath, "/R/", pkgname, ".rdb")))
     }
     invisible()
@@ -213,7 +218,7 @@
     all.names <- .Internal(ls(envir, all.names, sorted))
     if (!missing(pattern)) {
         if ((ll <- length(grep("[", pattern, fixed = TRUE))) &&
-            ll != length(grep("]", pattern, fixed = TRUE))) {
+             ll != length(grep("]", pattern, fixed = TRUE))) {
             if (pattern == "[") {
                 pattern <- "\\["
                 warning("replaced regular expression pattern '[' by  '\\\\['")
diff -Nru r-base-3.2.3/src/library/base/R/by.R r-base-3.3.1/src/library/base/R/by.R
--- r-base-3.2.3/src/library/base/R/by.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/by.R	2016-03-16 23:03:48.000000000 +0000
@@ -61,7 +61,7 @@
     dn <- dimnames(x)
     dnn <- names(dn)
     if(missing(vsep))
-        vsep <- paste(rep.int("-", 0.75*getOption("width")), collapse = "")
+        vsep <- strrep("-", 0.75 * getOption("width"))
     lapply(X = seq_along(x), FUN = function(i, x, vsep, ...) {
         if(i != 1L && !is.null(vsep)) cat(vsep, "\n")
         ii <- i - 1L
diff -Nru r-base-3.2.3/src/library/base/R/character.R r-base-3.3.1/src/library/base/R/character.R
--- r-base-3.2.3/src/library/base/R/character.R	2015-09-13 22:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/character.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/character.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -30,6 +30,9 @@
     .Internal(substr(text, as.integer(first), as.integer(last)))
 }
 
+startsWith <- function(x, prefix) .Internal(startsWith(x, prefix))
+endsWith   <- function(x, suffix) .Internal(endsWith  (x, suffix))
+
 `substr<-` <- function(x, start, stop, value)
     .Internal(`substr<-`(x, as.integer(start), as.integer(stop), value))
 
@@ -40,21 +43,19 @@
     function(names.arg, minlength = 4L, use.classes = TRUE, dot = FALSE,
              strict = FALSE, method = c("left.kept", "both.sides"))
 {
-    ## we just ignore use.classes
     if(minlength <= 0L) {
-        x <- rep.int("", length(names.arg)); names(x) <- names.arg
+        x <- rep.int("", length(names.arg))
+        names(x) <- names.arg
         return(x)
     }
     ## need to remove leading/trailing spaces before we check for dups
-    ## This is inefficient but easier than modifying do_abbrev (=> FIXME !)
     names.arg <- sub("^ +", "", sub(" +$", "", as.character(names.arg)))
     dups <- duplicated(names.arg)
     old <- names.arg
-    if(any(dups))
-	names.arg <- names.arg[!dups]
+    if(any(dups)) names.arg <- names.arg[!dups]
     x <- names.arg
     if(strict) {
-	x[] <- .Internal(abbreviate(x, minlength, use.classes))
+        x[] <- .Internal(abbreviate(x, minlength, use.classes))
     } else {
 	method <- match.arg(method)
 	if(method == "both.sides")
@@ -193,3 +194,10 @@
 strtoi <-
 function(x, base = 0L)
     .Internal(strtoi(as.character(x), as.integer(base)))
+
+strrep <-
+function(x, times)
+{
+    if(!is.character(x)) x <- as.character(x)
+    .Internal(strrep(x, as.integer(times)))
+}
diff -Nru r-base-3.2.3/src/library/base/R/colSums.R r-base-3.3.1/src/library/base/R/colSums.R
--- r-base-3.2.3/src/library/base/R/colSums.R	2015-08-25 22:17:34.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/colSums.R	2016-03-16 23:03:51.000000000 +0000
@@ -100,12 +100,12 @@
     z
 }
 
-.colSums <- function(X, m, n, na.rm = FALSE)
-    .Internal(colSums(X, m, n, na.rm))
-.colMeans <- function(X, m, n, na.rm = FALSE)
-    .Internal(colMeans(X, m, n, na.rm))
+.colSums <- function(x, m, n, na.rm = FALSE)
+    .Internal(colSums(x, m, n, na.rm))
+.colMeans <- function(x, m, n, na.rm = FALSE)
+    .Internal(colMeans(x, m, n, na.rm))
 
-.rowSums <- function(X, m, n, na.rm = FALSE)
-    .Internal(rowSums(X, m, n, na.rm))
-.rowMeans <- function(X, m, n, na.rm = FALSE)
-    .Internal(rowMeans(X, m, n, na.rm))
+.rowSums <- function(x, m, n, na.rm = FALSE)
+    .Internal(rowSums(x, m, n, na.rm))
+.rowMeans <- function(x, m, n, na.rm = FALSE)
+    .Internal(rowMeans(x, m, n, na.rm))
diff -Nru r-base-3.2.3/src/library/base/R/connections.R r-base-3.3.1/src/library/base/R/connections.R
--- r-base-3.2.3/src/library/base/R/connections.R	2015-08-25 22:17:22.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/connections.R	2016-03-30 22:02:04.000000000 +0000
@@ -75,9 +75,10 @@
     .Internal(flush(con))
 
 file <- function(description = "", open = "", blocking = TRUE,
-                 encoding = getOption("encoding"), raw = FALSE)
-    .Internal(file(description, open, blocking, encoding, raw))
-
+                 encoding = getOption("encoding"), raw = FALSE,
+                 method = getOption("url.method", "default")) {
+    .Internal(file(description, open, blocking, encoding, method, raw))
+}
 pipe <- function(description, open = "", encoding = getOption("encoding"))
     .Internal(pipe(description, open, encoding))
 
@@ -86,10 +87,9 @@
     .Internal(fifo(description, open, blocking, encoding))
 
 url <- function(description, open = "", blocking = TRUE,
-                encoding = getOption("encoding"), method)
+                encoding = getOption("encoding"),
+                method = getOption("url.method", "default"))
 {
-    if(missing(method))
-        method <- getOption("url.method", "default")
     method <- match.arg(method, c("default", "internal", "libcurl", "wininet"))
     .Internal(url(description, open, blocking, encoding, method))
 }
@@ -162,7 +162,7 @@
 {
     # match.arg doesn't work on "" default
     if (length(encoding) > 1L) encoding <- encoding[1]
-    if (nchar(encoding)) encoding <- match.arg(encoding)
+    if (nzchar(encoding)) encoding <- match.arg(encoding)
     type <- match(encoding, c("", "bytes", "UTF-8"))
     .Internal(pushBack(data, connection, newLine, type))
 }
@@ -267,8 +267,8 @@
     .Internal(writeChar(object, con, as.integer(nchars), eos, useBytes))
 }
 
-gzcon <- function(con, level = 6, allowNonCompressed = TRUE)
-    .Internal(gzcon(con, level, allowNonCompressed))
+gzcon <- function(con, level = 6, allowNonCompressed = TRUE, text = FALSE)
+    .Internal(gzcon(con, level, allowNonCompressed, text))
 
 socketSelect <- function(socklist, write = FALSE, timeout = NULL) {
     if (is.null(timeout))
diff -Nru r-base-3.2.3/src/library/base/R/dataframe.R r-base-3.3.1/src/library/base/R/dataframe.R
--- r-base-3.2.3/src/library/base/R/dataframe.R	2015-08-25 22:17:34.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/dataframe.R	2016-03-16 23:03:51.000000000 +0000
@@ -15,7 +15,7 @@
 #  https://www.R-project.org/Licenses/
 
 # Statlib code by John Chambers, Bell Labs, 1994
-# Changes Copyright (C) 1998-2015 The R Core Team
+# Changes Copyright (C) 1998-2016 The R Core Team
 
 
 ## As from R 2.4.0, row.names can be either character or integer.
@@ -170,50 +170,60 @@
 ## prior to 1.8.0 this coerced names - PR#3280
 as.data.frame.list <-
     function(x, row.names = NULL, optional = FALSE, ...,
+	     cut.names = FALSE, col.names = names(x), fix.empty.names = TRUE,
              stringsAsFactors = default.stringsAsFactors())
 {
     ## need to protect names in x.
-    cn <- names(x)
-    m <- match(c("row.names", "check.rows", "check.names", "stringsAsFactors"),
-               cn, 0L)
-    if(any(m)) {
-        cn[m] <- paste0("..adfl.", cn[m])
-        names(x) <- cn
-    }
-    x <- eval(as.call(c(expression(data.frame), x, check.names = !optional,
-                        stringsAsFactors = stringsAsFactors)))
-    if(any(m)) names(x) <- sub("^\\.\\.adfl\\.", "", names(x))
-    if(!is.null(row.names)) {
-	# row.names <- as.character(row.names)
-	if(length(row.names) != dim(x)[[1L]])
-            stop(sprintf(ngettext(length(row.names),
-                                  "supplied %d row name for %d rows",
-                                  "supplied %d row names for %d rows"),
-                         length(row.names), dim(x)[[1L]]), domain = NA)
-	attr(x, "row.names") <- row.names
-    }
+    ## truncate any of more than 256 (or cut.names) bytes:
+    new.nms <- !missing(col.names)
+    if(cut.names) {
+	maxL <- if(is.logical(cut.names)) 256L else as.integer(cut.names)
+	if(any(long <- nchar(col.names, "bytes", keepNA = FALSE) > maxL))
+	    col.names[long] <- paste(substr(col.names[long], 1L, maxL - 6L), "...")
+	else cut.names <- FALSE
+    }
+    m <- match(names(formals(data.frame))[-1L],
+	       ## c("row.names", "check.rows", ...., "stringsAsFactors"),
+	       col.names, 0L)
+    if(any.m <- any(m)) col.names[m] <- paste0("..adfl.", col.names[m])
+    if(new.nms || any.m || cut.names) names(x) <- col.names
+    if(is.null(check.n <- list(...)$check.names)) check.n <- !optional
+    ## data.frame() is picky with its 'row.names':
+    alis <- c(list(check.names = check.n, fix.empty.names = fix.empty.names,
+		   stringsAsFactors = stringsAsFactors),
+	      if(!is.null(row.names)) list(row.names = row.names))
+    x <- do.call(data.frame, c(x, alis))
+    if(any.m) names(x) <- sub("^\\.\\.adfl\\.", "", names(x))
     x
 }
 
 as.data.frame.vector <- function(x, row.names = NULL, optional = FALSE, ...,
-                                 nm = paste(deparse(substitute(x),
-                                 width.cutoff = 500L), collapse=" ")  )
+				 nm = paste(deparse(substitute(x),
+						    width.cutoff = 500L),
+					    collapse = " "))
 {
     force(nm)
     nrows <- length(x)
+    ## ## row.names -- for now warn about and "forget" illegal row.names
+    ## ##           -- can simplify much (move this *after* the is.null(.) case) once we stop() !
+    if(!(is.null(row.names) || (is.character(row.names) && length(row.names) == nrows))) {
+	warning(gettextf(
+	    "'row.names' is not a character vector of length %d -- omitting it. Will be an error!",
+	    nrows), domain = NA)
+	row.names <- NULL
+    }
     if(is.null(row.names)) {
 	if (nrows == 0L)
 	    row.names <- character()
-	else if(length(row.names <- names(x)) == nrows &&
-		!anyDuplicated(row.names)) {}
-	else row.names <- .set_row_names(nrows)
+	else if(length(row.names <- names(x)) != nrows || anyDuplicated(row.names))
+	    row.names <- .set_row_names(nrows)
     }
+    ## else if(length(row.names) != nrows) # same behavior as the 'matrix' method
+    ##     row.names <- .set_row_names(nrows)
     if(!is.null(names(x))) names(x) <- NULL # remove names as from 2.0.0
     value <- list(x)
     if(!optional) names(value) <- nm
-    attr(value, "row.names") <- row.names
-    class(value) <- "data.frame"
-    value
+    structure(value, row.names = row.names, class = "data.frame")
 }
 
 as.data.frame.ts <- function(x, ...)
@@ -265,6 +275,7 @@
     ## changed in 1.8.0
     if(is.null(row.names)) row.names <- dn[[1L]]
     collabs <- dn[[2L]]
+    ## These might be NA
     if(any(empty <- !nzchar(collabs)))
 	collabs[empty] <- paste0("V", ic)[empty]
     value <- vector("list", ncols)
@@ -339,7 +350,6 @@
 
 as.data.frame.AsIs <- function(x, row.names = NULL, optional = FALSE, ...)
 {
-    ## why not remove class and NextMethod here?
     if(length(dim(x)) == 2L)
 	as.data.frame.model.matrix(x, row.names, optional)
     else { # as.data.frame.vector without removing names
@@ -366,6 +376,7 @@
 
 data.frame <-
     function(..., row.names = NULL, check.rows = FALSE, check.names = TRUE,
+	     fix.empty.names = TRUE,
              stringsAsFactors = default.stringsAsFactors())
 {
     data.row.names <-
@@ -379,14 +390,17 @@
 		    return(new)
 		if(all(current == new) || all(current == ""))
 		    return(new)
-		stop(gettextf("mismatch of row names in arguments of 'data.frame\', item %d", i), domain = NA)
+		stop(gettextf(
+		    "mismatch of row names in arguments of 'data.frame\', item %d", i),
+		    domain = NA)
 	    }
 	else function(current, new, i) {
 	    if(is.null(current)) {
 		if(anyDuplicated(new)) {
-		    warning(gettextf("some row.names duplicated: %s --> row.names NOT used",
-                                     paste(which(duplicated(new)), collapse=",")),
-                            domain = NA)
+		    warning(gettextf(
+                        "some row.names duplicated: %s --> row.names NOT used",
+                        paste(which(duplicated(new)), collapse=",")),
+                        domain = NA)
 		    current
 		} else new
 	    } else current
@@ -421,36 +435,32 @@
     for(i in seq_len(n)) {
         ## do it this way until all as.data.frame methods have been updated
 	xi <- if(is.character(x[[i]]) || is.list(x[[i]]))
-                 as.data.frame(x[[i]], optional = TRUE,
-                               stringsAsFactors = stringsAsFactors)
-        else as.data.frame(x[[i]], optional = TRUE)
+		  as.data.frame(x[[i]], optional = TRUE,
+				stringsAsFactors = stringsAsFactors)
+	      else as.data.frame(x[[i]], optional = TRUE)
 
         nrows[i] <- .row_names_info(xi) # signed for now
 	ncols[i] <- length(xi)
 	namesi <- names(xi)
 	if(ncols[i] > 1L) {
 	    if(length(namesi) == 0L) namesi <- seq_len(ncols[i])
-	    if(no.vn[i]) vnames[[i]] <- namesi
-	    else vnames[[i]] <- paste(vnames[[i]], namesi, sep=".")
-	}
-	else {
-            if(length(namesi)) vnames[[i]] <- namesi
-            else if (no.vn[[i]]) {
-                tmpname <- deparse(object[[i]], nlines = 1L)[1L]
-                if( substr(tmpname, 1L, 2L) == "I(" ) {
-                    ntmpn <- nchar(tmpname, "c")
-                    if(substr(tmpname, ntmpn, ntmpn) == ")")
-                        tmpname <- substr(tmpname, 3L, ntmpn - 1L)
-                }
-                vnames[[i]] <- tmpname
-            }
-        } # end of ncols[i] <= 1
+	    vnames[[i]] <- if(no.vn[i]) namesi
+			   else paste(vnames[[i]], namesi, sep=".")
+	} else if(length(namesi)) {
+	    vnames[[i]] <- namesi
+	} else if (fix.empty.names && no.vn[[i]]) {
+	    tmpname <- deparse(object[[i]], nlines = 1L)[1L]
+	    if(substr(tmpname, 1L, 2L) == "I(") { ## from 'I(*)', only keep '*':
+		ntmpn <- nchar(tmpname, "c")
+		if(substr(tmpname, ntmpn, ntmpn) == ")")
+		    tmpname <- substr(tmpname, 3L, ntmpn - 1L)
+	    }
+	    vnames[[i]] <- tmpname
+	} ## else vnames[[i]] are not changed
 	if(mirn && nrows[i] > 0L) {
             rowsi <- attr(xi, "row.names")
             ## Avoid all-blank names
-            nc <- nchar(rowsi, allowNA = FALSE)
-            nc <- nc[!is.na(nc)]
-            if(length(nc) && any(nc))
+            if(any(nzchar(rowsi)))
                 row.names <- data.row.names(row.names, rowsi, i)
         }
         nrows[i] <- abs(nrows[i])
@@ -489,11 +499,16 @@
     value <- unlist(vlist, recursive=FALSE, use.names=FALSE)
     ## unlist() drops i-th component if it has 0 columns
     vnames <- unlist(vnames[ncols > 0L])
-    noname <- !nzchar(vnames)
-    if(any(noname))
+    if(fix.empty.names && any(noname <- !nzchar(vnames)))
 	vnames[noname] <- paste("Var", seq_along(vnames), sep = ".")[noname]
-    if(check.names)
-	vnames <- make.names(vnames, unique=TRUE)
+    if(check.names) {
+	if(fix.empty.names)
+	    vnames <- make.names(vnames, unique=TRUE)
+	else { ## do not fix ""
+	    nz <- nzchar(vnames)
+	    vnames[nz] <- make.names(vnames[nz], unique=TRUE)
+	}
+    }
     names(value) <- vnames
     if(!mrn) { # non-null row.names arg was supplied
         if(length(row.names) == 1L && nr != 1L) {  # one of the variables
@@ -865,6 +880,9 @@
     n <- length(iseq)
     if(n == 0L) n <- nrows
     p <- length(jseq)
+    if (is.null(value)) {
+        value <- list(NULL)
+    }
     m <- length(value)
     if(!is.list(value)) {
         if(p == 1L) {
@@ -943,7 +961,7 @@
     ncolv <- dimv[2L]
     jvseq <- seq_len(p)
     if(ncolv < p) jvseq <- rep_len(seq_len(ncolv), p)
-    else if(ncolv > p) {
+    else if(p != 0L && ncolv > p) {
         warning(sprintf(ngettext(ncolv,
                                  "provided %d variable to replace %d variables",
                                  "provided %d variables to replace %d variables"),
@@ -1180,7 +1198,9 @@
 	    x[[i]] <- y
 	}
     }
-    attr(x, "row.names") <- c(old.rows, new.rows)
+    nm <- c(old.rows, new.rows)
+    if (any(duplicated(nm))) nm <- make.unique(as.character(nm))
+    attr(x, "row.names") <- nm
     x
 }
 
@@ -1190,7 +1210,8 @@
 cbind.data.frame <- function(..., deparse.level = 1)
     data.frame(..., check.names = FALSE)
 
-rbind.data.frame <- function(..., deparse.level = 1, make.row.names = TRUE)
+rbind.data.frame <- function(..., deparse.level = 1, make.row.names = TRUE,
+                             stringsAsFactors = default.stringsAsFactors())
 {
     match.names <- function(clabs, nmi)
     {
@@ -1211,18 +1232,20 @@
 	    else if(ni > 1L) paste(nmi, ri, sep = ".")
 	    else nmi
 	}
-	else if(nrow > 0L && identical(ri, seq_len(ni)))
+	else if(nrow > 0L && identical(ri, seq_len(ni)) &&
+		identical(unlist(rlabs, FALSE, FALSE), seq_len(nrow)))
 	    as.integer(seq.int(from = nrow + 1L, length.out = ni))
 	else ri
     }
     allargs <- list(...)
     allargs <- allargs[lengths(allargs) > 0L]
     if(length(allargs)) {
-    ## drop any zero-row data frames, as they may not have proper column
-    ## types (e.g. NULL).
+        ## drop any zero-row data frames, as they may not have proper column
+        ## types (e.g. NULL).
         nr <- vapply(allargs, function(x)
                      if(is.data.frame(x)) .row_names_info(x, 2L)
-                     else if(is.list(x)) length(x[[1L]]) # mismatched lists are checked later
+                     else if(is.list(x)) length(x[[1L]])
+					# mismatched lists are checked later
                      else length(x), 1L)
         if(any(nr > 0L)) allargs <- allargs[nr > 0L]
         else return(allargs[[1L]]) # pretty arbitrary
@@ -1246,7 +1269,8 @@
 	xi <- allargs[[i]]
 	nmi <- nms[i]
         ## coerce matrix to data frame
-        if(is.matrix(xi)) allargs[[i]] <- xi <- as.data.frame(xi)
+        if(is.matrix(xi)) allargs[[i]] <- xi <-
+            as.data.frame(xi, stringsAsFactors = stringsAsFactors)
 	if(inherits(xi, "data.frame")) {
 	    if(is.null(cl))
 		cl <- oldClass(xi)
@@ -1270,10 +1294,12 @@
 		has.dim <- facCol <- ordCol <- logical(nvar)
 		for(j in seq_len(nvar)) {
 		    xj <- value[[j]]
-		    if( !is.null(levels(xj)) ) {
-			all.levs[[j]] <- levels(xj)
-                        facCol[j] <- TRUE # turn categories into factors
-                    } else facCol[j] <- is.factor(xj)
+                    facCol[j] <-
+                        if(!is.null(levels(xj))) {
+                            all.levs[[j]] <- levels(xj)
+                            TRUE # turn categories into factors
+                        } else
+                            is.factor(xj)
                     ordCol[j] <- is.ordered(xj)
 		    has.dim[j] <- length(dim(xj)) == 2L
 		}
@@ -1310,9 +1336,10 @@
 		}
 	    }
 	}
-	else if(length(xi)) {
+	else if(length(xi)) { # 1 new row
 	    rows[[i]] <- nrow <- nrow + 1L
-            if(make.row.names) rlabs[[i]] <- if(nzchar(nmi)) nmi else as.integer(nrow)
+            if(make.row.names)
+		rlabs[[i]] <- if(nzchar(nmi)) nmi else as.integer(nrow)
 	}
     }
     nvar <- length(clabs)
@@ -1375,7 +1402,8 @@
 	    rlabs <- make.unique(as.character(rlabs), sep = "")
     }
     if(is.null(cl)) {
-	as.data.frame(value, row.names = rlabs)
+	as.data.frame(value, row.names = rlabs, fix.empty.names = TRUE,
+		      stringsAsFactors = stringsAsFactors)
     } else {
 	structure(value, class = cl,
 		  row.names = if(is.null(rlabs)) .set_row_names(nrow) else rlabs)
@@ -1391,9 +1419,9 @@
 {
     n <- length(row.names(x))
     if(length(x) == 0L) {
-        cat(sprintf(ngettext(n, "data frame with 0 columns and %d row",
-                             "data frame with 0 columns and %d rows",
-                             domain = "R-base"), n), "\n", sep = "")
+	cat(sprintf(ngettext(n, "data frame with 0 columns and %d row",
+			     "data frame with 0 columns and %d rows"),
+		    n), "\n", sep = "")
     } else if(n == 0L) {
         ## FIXME: header format is inconsistent here
 	print.default(names(x), quote = FALSE)
@@ -1413,8 +1441,9 @@
 {
     dm <- dim(x)
     rn <- if(rownames.force %in% FALSE) NULL
-    else if(rownames.force %in% TRUE) row.names(x)
-    else {if(.row_names_info(x) <= 0L) NULL else row.names(x)}
+	  else if(rownames.force %in% TRUE) row.names(x)
+	  else if(.row_names_info(x) <= 0L) NULL
+	  else row.names(x)
     dn <- list(rn, names(x))
     if(any(dm == 0L))
 	return(array(NA, dim = dm, dimnames = dn))
@@ -1436,7 +1465,7 @@
 	   || (!is.null(cl <- attr(xj, "class")) && # numeric classed objects to format:
 	       any(cl %in% c("Date", "POSIXct", "POSIXlt"))))
 	    non.numeric <- TRUE
-	if(!is.atomic(xj))
+	if(!is.atomic(xj) && !inherits(xj, "POSIXlt"))
 	    non.atomic <- TRUE
     }
     if(non.atomic) {
diff -Nru r-base-3.2.3/src/library/base/R/dates.R r-base-3.3.1/src/library/base/R/dates.R
--- r-base-3.2.3/src/library/base/R/dates.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/dates.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/dates.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -356,7 +356,7 @@
 	    start$mday <- 1L
             start$isdst <- -1L
 	    end <- as.POSIXlt(max(x, na.rm = TRUE))
-	    step <- ifelse(length(by2) == 2L, as.integer(by2[1L]), 1L)
+	    step <- if(length(by2) == 2L) as.integer(by2[1L]) else 1L
 	    end <- as.POSIXlt(end + (31 * step * 86400))
 	    end$mday <- 1L
             end$isdst <- -1L
@@ -366,7 +366,7 @@
 	    start$mday <- 1L
             start$isdst <- -1L
 	    end <- as.POSIXlt(max(x, na.rm = TRUE))
-	    step <- ifelse(length(by2) == 2L, as.integer(by2[1L]), 1L)
+	    step <- if(length(by2) == 2L) as.integer(by2[1L]) else 1L
 	    end <- as.POSIXlt(end + (366 * step * 86400))
 	    end$mon <- 0L
 	    end$mday <- 1L
@@ -379,7 +379,7 @@
             start$isdst <- -1L
 	    maxx <- max(x, na.rm = TRUE)
 	    end <- as.POSIXlt(maxx)
-	    step <- ifelse(length(by2) == 2L, as.integer(by2[1L]), 1L)
+	    step <- if(length(by2) == 2L) as.integer(by2[1L]) else 1L
 	    end <- as.POSIXlt(end + (93 * step * 86400))
 	    end$mon <- qtr[end$mon + 1L]
 	    end$mday <- 1L
diff -Nru r-base-3.2.3/src/library/base/R/datetime.R r-base-3.3.1/src/library/base/R/datetime.R
--- r-base-3.2.3/src/library/base/R/datetime.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/datetime.R	2016-06-10 22:02:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/datetime.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -162,21 +162,22 @@
 format.POSIXlt <- function(x, format = "", usetz = FALSE, ...)
 {
     if(!inherits(x, "POSIXlt")) stop("wrong class")
-    if(format == "") {
+    if(any(f0 <- format == "")) {
         ## need list [ method here.
-        times <- unlist(unclass(x)[1L:3L])
-        secs <- x$sec; secs <- secs[!is.na(secs)]
+	times <- unlist(unclass(x)[1L:3L])[f0]
+	secs <- x$sec[f0]; secs <- secs[!is.na(secs)]
         np <- getOption("digits.secs")
-        if(is.null(np)) np <- 0L else np <- min(6L, np)
+        np <- if(is.null(np)) 0L else min(6L, np)
         if(np >= 1L)
             for (i in seq_len(np)- 1L)
                 if(all( abs(secs - round(secs, i)) < 1e-6 )) {
                     np <- i
                     break
                 }
-        format <- if(all(times[!is.na(times)] == 0)) "%Y-%m-%d"
-        else if(np == 0L) "%Y-%m-%d %H:%M:%S"
-        else paste0("%Y-%m-%d %H:%M:%OS", np)
+	format[f0] <-
+	    if(all(times[!is.na(times)] == 0)) "%Y-%m-%d"
+	    else if(np == 0L) "%Y-%m-%d %H:%M:%S"
+	    else paste0("%Y-%m-%d %H:%M:%OS", np)
     }
     ## <FIXME>
     ## Move names handling to C code eventually ...
@@ -542,6 +543,11 @@
     val
 }
 
+diff.difftime <- function(x, ...)
+    ## assume class is preserved (it is in diff.default):
+    structure(NextMethod("diff"), units = attr(x, "units"))
+
+
 Ops.difftime <- function(e1, e2)
 {
     coerceTimeUnit <- function(x)
@@ -652,6 +658,32 @@
     }
 }
 
+c.difftime <-
+function(..., recursive = FALSE)
+{
+    coerceTimeUnit <- function(x) {
+        switch(attr(x, "units"),
+               secs = x, mins = 60*x, hours = 60*60*x,
+               days = 60*60*24*x, weeks = 60*60*24*7*x)
+    }
+    args <- list(...)
+    if(!length(args)) return(.difftime(double(), "secs"))
+    ind <- sapply(args, inherits, "difftime")
+    pos <- which(!ind)
+    units <- sapply(args[ind], attr, "units")
+    if(all(units == (un1 <- units[1L]))) {
+        if(length(pos))
+            args[pos] <-
+                lapply(args[pos], as.difftime, units = un1)
+        .difftime(unlist(args), un1)
+    } else {
+        if(length(pos))
+            args[pos] <-
+                lapply(args[pos], as.difftime, units = "secs")
+        args[ind] <- lapply(args[ind], coerceTimeUnit)
+        .difftime(unlist(args), "secs")
+    }
+}
 
 ## ----- convenience functions -----
 
@@ -792,7 +824,7 @@
         if(valid == 6L) {               # months
             start$mday <- 1L
             end <- as.POSIXlt(max(x, na.rm = TRUE))
-            step <- ifelse(length(by2) == 2L, as.integer(by2[1L]), 1L)
+            step <- if(length(by2) == 2L) as.integer(by2[1L]) else 1L
             end <- as.POSIXlt(end + (31 * step * 86400))
             end$mday <- 1L
             end$isdst <- -1L
@@ -801,7 +833,7 @@
             start$mon <- 0L
             start$mday <- 1L
             end <- as.POSIXlt(max(x, na.rm = TRUE))
-            step <- ifelse(length(by2) == 2L, as.integer(by2[1L]), 1L)
+            step <- if(length(by2) == 2L) as.integer(by2[1L]) else 1L
             end <- as.POSIXlt(end + (366 * step* 86400))
             end$mon <- 0L
             end$mday <- 1L
@@ -813,7 +845,7 @@
             start$mday <- 1L
             maxx <- max(x, na.rm = TRUE)
             end <- as.POSIXlt(maxx)
-            step <- ifelse(length(by2) == 2L, as.integer(by2[1L]), 1L)
+            step <- if(length(by2) == 2L) as.integer(by2[1L]) else 1L
             end <- as.POSIXlt(end + (93 * step * 86400))
             end$mon <- qtr[end$mon + 1L]
             end$mday <- 1L
@@ -885,13 +917,12 @@
 
 round.POSIXt <- function(x, units = c("secs", "mins", "hours", "days"))
 {
-    ## this gets the default from the generic, as that has two args.
-    if(is.numeric(units) && units == 0.0) units <-"secs"
-    units <- match.arg(units)
-    x <- as.POSIXct(x)
-    x <- x + switch(units,
-                    "secs" = 0.5, "mins" = 30, "hours" = 1800, "days" = 43200)
-    trunc.POSIXt(x, units = units)
+    ## this gets the default from the generic's 2nd arg 'digits = 0' :
+    units <- if(is.numeric(units) && units == 0.) "secs" else match.arg(units)
+    trunc.POSIXt(as.POSIXct(x) +
+		 switch(units,
+			"secs" = 0.5, "mins" = 30, "hours" = 1800, "days" = 43200),
+		 units = units)
 }
 
 ## ---- additions in 1.5.0 -----
diff -Nru r-base-3.2.3/src/library/base/R/dcf.R r-base-3.3.1/src/library/base/R/dcf.R
--- r-base-3.2.3/src/library/base/R/dcf.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/dcf.R	2016-03-16 23:03:48.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/dcf.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -139,7 +139,7 @@
     if(file == "")
         file <- stdout()
     else if(is.character(file)) {
-        file <- file(file, ifelse(append, "a", "w"))
+        file <- file(file, if(append) "a" else "w")
         on.exit(close(file))
     }
     if(!inherits(file, "connection"))
diff -Nru r-base-3.2.3/src/library/base/R/dump.R r-base-3.3.1/src/library/base/R/dump.R
--- r-base-3.2.3/src/library/base/R/dump.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/dump.R	2016-03-16 23:03:52.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/dump.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 	ex <- sapply(list, exists, envir=envir)
 	if(!any(ex)) return(invisible(character()))
 	if(nzchar(file)) {
-	    file <- file(file, ifelse(append, "a", "w"))
+	    file <- file(file, if(append) "a" else "w")
 	    on.exit(close(file), add = TRUE)
 	} else file <- stdout()
     }
diff -Nru r-base-3.2.3/src/library/base/R/factor.R r-base-3.3.1/src/library/base/R/factor.R
--- r-base-3.2.3/src/library/base/R/factor.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/factor.R	2016-06-01 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/factor.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -56,6 +56,7 @@
         levels <- sort(unique.default(x)) # avoid array methods
         f <- match(x, levels)
         levels(f) <- as.character(levels)
+	if(!is.null(nx <- names(x))) names(f) <- nx
         class(f) <- "factor"
         f
     } else factor(x)
@@ -108,7 +109,7 @@
 	as.vector(unclass(x), mode)
 }
 
-as.character.factor <- function(x,...) levels(x)[x]
+as.character.factor <- function(x,...) .Internal(asCharacterFactor(x))
 
 as.logical.factor <- function(x,...) as.logical(levels(x))[x]
 
diff -Nru r-base-3.2.3/src/library/base/R/findInt.R r-base-3.3.1/src/library/base/R/findInt.R
--- r-base-3.2.3/src/library/base/R/findInt.R	2015-11-18 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/findInt.R	2016-03-16 23:03:51.000000000 +0000
@@ -17,7 +17,8 @@
 #  https://www.R-project.org/Licenses/
 
 ### This is a `variant' of  approx( method = "constant" ) :
-findInterval <- function(x, vec, rightmost.closed = FALSE, all.inside = FALSE)
+findInterval <- function(x, vec, rightmost.closed = FALSE, all.inside = FALSE,
+                         left.open = FALSE)
 {
     ## Purpose: returns the indices of  x in vec;  vec[] sorted
     ## ---------------------------------------------------------
@@ -25,5 +26,5 @@
     if(!identical(FALSE, is.unsorted(vec)))
 	stop("'vec' must be sorted non-decreasingly and not contain NAs")
     .Internal(findInterval(as.double(vec), as.double(x),
-                           rightmost.closed, all.inside))
+                           rightmost.closed, all.inside, left.open))
 }
diff -Nru r-base-3.2.3/src/library/base/R/format.R r-base-3.3.1/src/library/base/R/format.R
--- r-base-3.2.3/src/library/base/R/format.R	2015-11-23 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/format.R	2016-05-17 22:15:08.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/format.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -164,10 +164,10 @@
     else if(digits < 0L)
 	digits <- 6L
     else {
-	maxDigits <- if(format != "f") 50L else ceiling(-(.Machine$double.neg.ulp.digits + .Machine$double.min.exp) / log2(10))
+	maxDigits <- if(format != "f") 50L else
+	    ceiling(-(.Machine$double.neg.ulp.digits + .Machine$double.min.exp) / log2(10))
 	if (digits > maxDigits) {
-            warning(gettextf("'digits' reduced to %d", maxDigits),
-                    domain = NA)
+            warning(gettextf("'digits' reduced to %d", maxDigits), domain = NA)
 	    digits <- maxDigits
 	}
     }
@@ -221,8 +221,9 @@
 
 format.data.frame <- function(x, ..., justify = "none")
 {
-    nr <- .row_names_info(x, 2L)
     nc <- length(x)
+    if(!nc) return(x) # 0 columns: evade problems, notably for nrow() > 0
+    nr <- .row_names_info(x, 2L)
     rval <- vector("list", nc)
     for(i in seq_len(nc))
 	rval[[i]] <- format(x[[i]], ..., justify = justify)
@@ -246,20 +247,9 @@
 	if(is.character(rval[[i]]) && inherits(rval[[i]], "character"))
 	    oldClass(rval[[i]]) <- "AsIs"
     }
-    cn <- names(x)
-    m <- match(c("row.names", "check.rows", "check.names", ""), cn, 0L)
-    if(any(m)) cn[m] <- paste0("..dfd.", cn[m])
-    ## This requires valid symbols for the columns, so we need to
-    ## truncate any of more than 256 bytes.
-    long <- nchar(cn, "bytes", keepNA = FALSE) > 256L
-    cn[long] <- paste(substr(cn[long], 1L, 250L), "...")
-    names(rval) <- cn
-    rval$check.names <- FALSE
-    rval$row.names <- row.names(x)
-    x <- do.call("data.frame", rval)
-    ## x will have more cols than rval if there are matrix/data.frame cols
-    if(any(m)) names(x) <- sub("^..dfd.", "", names(x))
-    x
+    as.data.frame.list(rval, row.names = row.names(x), col.names = names(x),
+		       optional = TRUE, # <=> check.names = FALSE
+		       fix.empty.names = FALSE, cut.names = TRUE)
 }
 
 format.AsIs <- function(x, width = 12, ...)
@@ -292,10 +282,8 @@
 	nz <- nchar(zero.print, "c")
 	nc <- nchar(x[i0], "c")
 	ind0 <- regexpr("0", x[i0], fixed = TRUE)# first '0' in string
-	blank.chars <- function(no) # as in formatC()
-	    vapply(no+1L, function(n) paste(character(n), collapse=" "), "")
 	substr(x[i0], ind0, (i1 <- ind0+nz-1L)) <- zero.print
-	substr(x[i0], ind0+nz, nc) <- blank.chars(nc - i1)
+	substr(x[i0], ind0+nz, nc) <- strrep(" ", nc - i1)
     }
     x
 }
@@ -336,7 +324,7 @@
 	ina <- is.na(x) | x == "NA"
 	is.cmplx <-
 	    if(all(ina)) FALSE
-	    else length(grep("[0-9].*[-+][0-9].*i$", x)) > 0
+	    else any(grepl("[0-9].*[-+][0-9].*i$", x))
     }
     preserve.width <- match.arg(preserve.width)
     if(is.cmplx) {
@@ -345,7 +333,7 @@
 	z.sp <- strsplit(sub("([0-9] *)([-+])( *[0-9])",
 			     "\\1::\\2::\\3", x), "::", fixed=TRUE)
 	## be careful, if x had an  "	NA":
-	i3 <- vapply(z.sp, length, 0L) == 3L # those are re + im *i
+	i3 <- lengths(z.sp) == 3L # those are re + im *i
 	if(any(i3)) {
 	    z.sp <- z.sp[i3]
 	    z.im <- vapply(z.sp, `[[`, "", 3L)
@@ -370,11 +358,10 @@
         stop("'input.d.mark' has no characters")
     x.sp <- strsplit(x, input.d.mark, fixed=TRUE)
     ## can have "1.005.987" here, if all *.mark == "."
-    if(any((lx.sp <- lengths(x.sp)) > 2)) { # partly more than two parts
+    if(any(lengths(x.sp) > 2)) { # partly more than two parts
 	x.sp <- lapply(x.sp, function(xs) {
 	    lx <- length(xs)
-	    if(lx <= 2) xs else c(paste(xs[1:(lx-1)], collapse=input.d.mark),
-				  xs[lx])
+	    if(lx <= 2) xs else c(paste(xs[-lx], collapse=input.d.mark), xs[lx])
 	})
     }
     B. <- vapply(x.sp, `[`, "", 1L)	# Before input.d.mark (".")
diff -Nru r-base-3.2.3/src/library/base/R/funprog.R r-base-3.3.1/src/library/base/R/funprog.R
--- r-base-3.2.3/src/library/base/R/funprog.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/funprog.R	2016-03-16 23:03:51.000000000 +0000
@@ -95,7 +95,7 @@
         ## If all results have length one, we can simplify.
         ## (Note that we do not simplify to arrays in case all results
         ## have a common length > 1.)
-	if(all(vapply(out, length, 1.) == 1L))
+	if(all(lengths(out) == 1L))
             out <- unlist(out, recursive = FALSE)
         out
     }
@@ -105,7 +105,7 @@
 function(f, x)
 {
     ind <- as.logical(unlist(lapply(x, f)))
-    x[!is.na(ind) & ind]
+    x[which(ind)]
 }
 
 
diff -Nru r-base-3.2.3/src/library/base/R/grep.R r-base-3.3.1/src/library/base/R/grep.R
--- r-base-3.2.3/src/library/base/R/grep.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/grep.R	2016-03-16 23:03:48.000000000 +0000
@@ -16,6 +16,11 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
+
+## Q: Why are we using   as.character(.)   all over the place instead of doing that in C ?
+## A: These must work for objects which have their own as.character(.) methods *and*
+##    as.character() is fast [Primitive]
+
 strsplit <-
 function(x, split, fixed = FALSE, perl = FALSE, useBytes = FALSE)
     .Internal(strsplit(x, as.character(split), fixed, perl, useBytes))
@@ -85,9 +90,44 @@
 }
 
 regexec <-
-function(pattern, text, ignore.case = FALSE,
+function(pattern, text, ignore.case = FALSE, perl = FALSE,
          fixed = FALSE, useBytes = FALSE)
-    .Internal(regexec(pattern, text, ignore.case, fixed, useBytes))
+{
+    if(!perl || fixed)
+        return(.Internal(regexec(pattern, text, ignore.case, fixed,
+                                 useBytes)))
+
+    ## For perl = TRUE, re-use regexpr(perl = TRUE) which always
+    ## captures subexpressions.
+
+    match_data_from_pos_and_len <- function(pos, len) {
+        attr(pos, "match.length") <- len
+        pos
+    }
+
+    m <- regexpr(pattern, text,
+                 ignore.case = ignore.case, useBytes = useBytes,
+                 perl = TRUE)
+    y <- vector("list", length(text))
+    ind <- (m == -1L)
+    if(any(ind)) {
+        y[ind] <- rep.int(list(match_data_from_pos_and_len(-1L, -1L)),
+                          sum(ind))
+    }
+    ind <- !ind
+    if(any(ind)) {
+        pos <- cbind(m[ind],
+                     attr(m, "capture.start")[ind, , drop = FALSE])
+        len <- cbind(attr(m, "match.length")[ind],
+                     attr(m, "capture.length")[ind, , drop = FALSE])
+        y[ind] <- Map(match_data_from_pos_and_len,
+                      split(pos, row(pos)),
+                      split(len, row(len)))
+    }
+    if(identical(attr(m, "useBytes"), TRUE))
+        y <- lapply(y, `attr<-`, "useBytes", TRUE)
+    y
+}
 
 agrep <-
 function(pattern, x, max.distance = 0.1, costs = NULL,
@@ -238,50 +278,76 @@
     ## direct matches give nothing and inverse matches give NA (as
     ## nothing was matched).
 
-    if(!ili && !invert) {
+    if(!ili && identical(invert, FALSE)) {
         so <- m[ind <- (!is.na(m) & (m > -1L))]
         eo <- so + attr(m, "match.length")[ind] - 1L
         return(substring(x[ind], so, eo))
     }
 
-    y <- if(invert) {
+    y <- if(is.na(invert)) {
         Map(function(u, so, ml) {
-            if((n <- length(so)) == 1L) {
-                if(is.na(so) )
-                    return(NA_character_) # Or u ...
-                else if(so == -1L)
-                    return(u)
-            }
-            beg <- if(n > 1L) {
-                ## regexec() could give overlapping matches.
-                ## Matches are non-overlapping iff
-                ##   eo[i] < so[i + 1], i = 1, ..., n - 1.
+                if((n <- length(so)) == 1L) {
+                    if(is.na(so) )
+                        return(NA_character_) # Or u ...
+                    else if(so == -1L)
+                        return(u)
+                }
                 eo <- so + ml - 1L
-                if(any(eo[-n] >= so[-1L]))
-                    stop(gettextf("need non-overlapping matches for %s",
-                                  sQuote("invert = TRUE")),
-                         domain = NA)
-                c(1L, eo + 1L)
-            } else {
-                c(1L, so + ml)
-            }
-            end <- c(so - 1L, nchar(u))
-            substring(u, beg, end)
-        },
+                if(n > 1L) {
+                    ## regexec() could give overlapping matches.
+                    ## Matches are non-overlapping iff
+                    ##   eo[i] < so[i + 1], i = 1, ..., n - 1.
+                    if(any(eo[-n] >= so[-1L]))
+                        stop(gettextf("need non-overlapping matches for %s",
+                                      sQuote("invert = NA")),
+                             domain = NA)
+                }
+                beg <- c(1L, c(rbind(so, eo + 1L)))
+                end <- c(c(rbind(so - 1L, eo)), nchar(u))
+                substring(u, beg, end)
+            },
+            x, m,
+            if(ili)
+                lapply(m, attr, "match.length")
+            else
+                attr(m, "match.length"),
+            USE.NAMES = FALSE)
+    } else if(invert) {
+        Map(function(u, so, ml) {
+                if((n <- length(so)) == 1L) {
+                    if(is.na(so) )
+                        return(NA_character_) # Or u ...
+                    else if(so == -1L)
+                        return(u)
+                }
+                beg <- if(n > 1L) {
+                    ## See above.
+                    eo <- so + ml - 1L
+                    if(any(eo[-n] >= so[-1L]))
+                        stop(gettextf("need non-overlapping matches for %s",
+                                      sQuote("invert = TRUE")),
+                             domain = NA)
+                    c(1L, eo + 1L)
+                } else {
+                    c(1L, so + ml)
+                }
+                end <- c(so - 1L, nchar(u))
+                substring(u, beg, end)
+            },
             x, m,
             if(ili)
-            lapply(m, attr, "match.length")
+                lapply(m, attr, "match.length")
             else
-            attr(m, "match.length"),
+                attr(m, "match.length"),
             USE.NAMES = FALSE)
     } else {
         Map(function(u, so, ml) {
-            if(length(so) == 1L) {
-                if(is.na(so) || (so == -1L))
-                    return(character())
-            }
-            substring(u, so, so + ml - 1L)
-        },
+                if(length(so) == 1L) {
+                    if(is.na(so) || (so == -1L))
+                        return(character())
+                }
+                substring(u, so, so + ml - 1L)
+            },
             x, m,
             lapply(m, attr, "match.length"),
             USE.NAMES = FALSE)
diff -Nru r-base-3.2.3/src/library/base/R/lazyload.R r-base-3.3.1/src/library/base/R/lazyload.R
--- r-base-3.2.3/src/library/base/R/lazyload.R	2015-08-25 22:17:22.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/lazyload.R	2016-03-16 23:03:47.000000000 +0000
@@ -44,8 +44,8 @@
     `parent.env<-` <-
         function (env, value) .Internal(`parent.env<-`(env, value))
     existsInFrame <- function (x, env) .Internal(exists(x, env, "any", FALSE))
-    getFromFrame <- function (x, env) .Internal(get(x, env, "any", FALSE))
-    set <- function (x, value, env) .Internal(assign(x, value, env, FALSE))
+    ## getFromFrame <- function (x,  env) .Internal(get(x,  env,  "any",  FALSE))
+    ## set <- function (x,  value,  env) .Internal(assign(x,  value,  env,  FALSE))
     environment <- function () .Internal(environment(NULL))
     mkenv <- function() .Internal(new.env(TRUE, baseenv(), 29L))
 
@@ -57,18 +57,16 @@
     env <- mkenv()
     map <- readRDS(mapfile)
     vars <- names(map$variables)
-    rvars <- names(map$references)
     compressed <- map$compressed
-    for (i in seq_along(rvars))
-        set(rvars[i], map$references[[i]], env)
+    list2env(map$references, env)
     envenv <- mkenv()
     envhook <- function(n) {
         if (existsInFrame(n, envenv))
-            getFromFrame(n, envenv)
+            envenv[[n]]
         else {
             e <- mkenv()
-            set(n, e, envenv)           # MUST do this immediately
-            key <- getFromFrame(n, env)
+            envenv[[n]] <- e           # MUST do this immediately
+            key <- env[[n]]
             data <- lazyLoadDBfetch(key, datafile, compressed, envhook)
             ## comment from r41494
             ## modified the loading of old environments, so that those
@@ -76,13 +74,8 @@
             ## parent.env=emptyenv(); and yes an alternative would have been
             ## baseenv(), but that was seldom the intention of folks that
             ## set the environment to NULL.
-            if (is.null(data$enclos))
-                parent.env(e) <- emptyenv()
-            else
-                parent.env(e) <- data$enclos
-            vars <- names(data$bindings)
-            for (i in seq_along(vars))
-                set(vars[i], data$bindings[[i]], e)
+            parent.env(e) <- if(!is.null(data$enclos)) data$enclos else emptyenv()
+            list2env(data$bindings, e)
             if (! is.null(data$attributes))
                 attributes(e) <- data$attributes
             if (! is.null(data$isS4) && data$isS4)
diff -Nru r-base-3.2.3/src/library/base/R/lengths.R r-base-3.3.1/src/library/base/R/lengths.R
--- r-base-3.2.3/src/library/base/R/lengths.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/lengths.R	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#  File src/library/base/R/Bessel.R
-#  Part of the R package, https://www.R-project.org
-#
-#  Copyright (C) 1995-2015 The R Core Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  A copy of the GNU General Public License is available at
-#  https://www.R-project.org/Licenses/
-
-lengths <- function(x, use.names=TRUE) .Internal(lengths(x, use.names))
-
diff -Nru r-base-3.2.3/src/library/base/R/library.R r-base-3.3.1/src/library/base/R/library.R
--- r-base-3.2.3/src/library/base/R/library.R	2015-08-25 22:17:34.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/library.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/library.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
     built <- gsub("([^-]*)-([^-]*)-(.*)", "\\1-\\3", built)
     run <- gsub("([^-]*)-([^-]*)-(.*)", "\\1-\\3", run)
     ## Mac OS X supports multiple CPUs by using 'universal' binaries
-    if (grepl("^universal-darwin", built) && nzchar(.Platform$r_arch))
+    if (startsWith(built, "universal-darwin") && nzchar(.Platform$r_arch))
         built <- sub("^universal", R.version$arch, built)
     ## allow for small mismatches, e.g. OS version number and i686 vs i586.
     length(agrep(built, run)) > 0
@@ -82,7 +82,7 @@
             ## allow mismatches if r_arch is in use, e.g.
             ## i386-gnu-linux vs x86-gnu-linux depending on
             ## build system.
-            if(!nzchar(r_arch) && length(grep("\\w", platform)) &&
+            if(!nzchar(r_arch) && grepl("\\w", platform) &&
                !testPlatformEquivalence(platform, R.version$platform))
                 stop(gettextf("package %s was built for %s",
                               sQuote(pkgname), platform),
@@ -118,11 +118,15 @@
                 if(pkg %in% agreed) return()
             } else agreed <- character()
             if(!interactive())
-                stop(gettextf("package %s has a license that you need to accept in an interactive session", sQuote(pkg)), domain = NA)
+                stop(gettextf(
+                    "package %s has a license that you need to accept in an interactive session",
+                              sQuote(pkg)), domain = NA)
             lfiles <- file.path(pkgpath, c("LICENSE", "LICENCE"))
             lfiles <- lfiles[file.exists(lfiles)]
             if(length(lfiles)) {
-                message(gettextf("package %s has a license that you need to accept after viewing", sQuote(pkg)), domain = NA)
+                message(gettextf(
+                    "package %s has a license that you need to accept after viewing",
+                                 sQuote(pkg)), domain = NA)
                 readline("press RETURN to view license")
                 encoding <- pkgInfo$DESCRIPTION["Encoding"]
                 if(is.na(encoding)) encoding <- ""
@@ -130,11 +134,14 @@
                 if(encoding == "latin1") encoding <- "cp1252"
                 file.show(lfiles[1L], encoding = encoding)
             } else {
-                message(gettextf("package %s has a license that you need to accept:\naccording to the DESCRIPTION file it is", sQuote(pkg)), domain = NA)
-                message(pkgInfo$DESCRIPTION["License"], domain = NA)
+                message(gettextf(paste("package %s has a license that you need to accept:",
+				       "according to the DESCRIPTION file it is",
+				       "%s", sep="\n"),
+				 sQuote(pkg),
+				 pkgInfo$DESCRIPTION["License"]), domain = NA)
             }
-            choice <- menu(c("accept", "decline"),
-                           title = paste("License for", sQuote(pkg)))
+            choice <- utils::menu(c("accept", "decline"),
+                                  title = paste("License for", sQuote(pkg)))
             if(choice != 1)
                 stop(gettextf("license for package %s not accepted",
                               sQuote(package)), domain = NA, call. = FALSE)
@@ -153,7 +160,7 @@
         else {
             ## A package will have created a generic
             ## only if it has created a formal method.
-            length(objects(env, pattern="^\\.__T", all.names=TRUE)) == 0L
+            length(grep(pattern="^\\.__T", names(env))) == 0L
         }
     }
 
@@ -165,15 +172,15 @@
                        ".packageName", ".noGenerics", ".required",
                        ".no_S3_generics", ".Depends", ".requireCachedGenerics")
         sp <- search()
-        lib.pos <- match(pkgname, sp)
+        lib.pos <- which(sp == pkgname)
         ## ignore generics not defined for the package
-        ob <- objects(lib.pos, all.names = TRUE)
+        ob <- names(as.environment(lib.pos))
         if(!nogenerics) {
             ##  Exclude generics that are consistent with implicit generic
             ## from another package.  A better test would be to move this
             ## down into the loop and test against specific other package name
             ## but subtle conflicts like that are likely to be found elsewhere
-	    these <- ob[substr(ob, 1L, 6L) == ".__T__"]
+	    these <- ob[startsWith(ob,".__T__")]
             gen  <- gsub(".__T__(.*):([^:]+)", "\\1", these)
             from <- gsub(".__T__(.*):([^:]+)", "\\2", these)
             gen <- gen[from != package]
@@ -183,11 +190,11 @@
 	ipos <- seq_along(sp)[-c(lib.pos,
 				 match(c("Autoloads", "CheckExEnv"), sp, 0L))]
         for (i in ipos) {
-            obj.same <- match(objects(i, all.names = TRUE), ob, nomatch = 0L)
+            obj.same <- match(names(as.environment(i)), ob, nomatch = 0L)
             if (any(obj.same > 0)) {
                 same <- ob[obj.same]
                 same <- same[!(same %in% dont.mind)]
-                Classobjs <- grep("^\\.__", same)
+                Classobjs <- which(startsWith(same,".__"))
                 if(length(Classobjs)) same <- same[-Classobjs]
                 ## report only objects which are both functions or
                 ## both non-functions.
@@ -213,7 +220,8 @@
                                                        sQuote(package)),
                                               domain = NA)
                     }
-		    msg <- .maskedMsg(same, pkg = sQuote(sp[i]), by = i < lib.pos)
+		    msg <- .maskedMsg(sort(same), pkg = sQuote(sp[i]),
+                                      by = i < lib.pos)
 		    packageStartupMessage(msg, domain = NA)
                 }
             }
@@ -243,7 +251,10 @@
             ## The methods package caches all other pkgs when it is
             ## attached.
 
-            pkgpath <- find.package(package, lib.loc, quiet = TRUE,
+            ## Too extreme (unfortunately; warning too often):
+	    ## pkgpath <- find.package(package, lib.loc, quiet = TRUE, verbose = !quietly)
+	    ##   'verbose' here means to warn about packages found more than once
+	    pkgpath <- find.package(package, lib.loc, quiet = TRUE,
                                     verbose = verbose)
             if(length(pkgpath) == 0L) {
                 txt <- if(length(lib.loc))
@@ -275,7 +286,8 @@
             if(is.character(pos)) {
                 npos <- match(pos, search())
                 if(is.na(npos)) {
-                    warning(gettextf("%s not found on search path, using pos = 2", sQuote(pos)), domain = NA)
+                    warning(gettextf("%s not found on search path, using pos = 2",
+                                     sQuote(pos)), domain = NA)
                     pos <- 2
                 } else pos <- npos
             }
@@ -287,20 +299,23 @@
             ## takes over.
             if (packageHasNamespace(package, which.lib.loc)) {
 		if (isNamespaceLoaded(package)) {
-                    # Already loaded.  Does the version match?
+                    ## Already loaded.  Does the version match?
                     newversion <- as.numeric_version(pkgInfo$DESCRIPTION["Version"])
                     oldversion <- as.numeric_version(getNamespaceVersion(package))
                     if (newversion != oldversion) {
-                    	# No, so try to unload the previous one
+                    	## No, so try to unload the previous one
                     	res <- try(unloadNamespace(package))
                     	if (inherits(res, "try-error"))
-                    	    stop(gettextf("Package %s version %s cannot be unloaded", sQuote(package), oldversion, domain = "R-base"))
+                    	    stop(gettextf("Package %s version %s cannot be unloaded",
+					  sQuote(package), oldversion), domain=NA)
                     }
                 }
                 tt <- try({
-                    ns <- loadNamespace(package, c(which.lib.loc, lib.loc))
+                    attr(package, "LibPath") <- which.lib.loc
+                    ns <- loadNamespace(package, lib.loc)
                     env <- attachNamespace(ns, pos = pos, deps)
                 })
+                attr(package, "LibPath") <- NULL
                 if (inherits(tt, "try-error"))
                     if (logical.return)
                         return(FALSE)
@@ -436,7 +451,7 @@
     if (logical.return)
 	TRUE
     else invisible(.packages())
-}
+} ## {library}
 
 format.libraryIQR <-
 function(x, ...)
@@ -626,7 +641,7 @@
         return(unique(ans))
     } ## else
     s <- search()
-    return(invisible(substring(s[substr(s, 1L, 8L) == "package:"], 9)))
+    invisible(.rmpkg(s[substr(s, 1L, 8L) == "package:"]))
 }
 
 path.package <-
@@ -675,14 +690,10 @@
                       "splines", "stats4", "tcltk"))
         return(file.path(.Library, package))
 
-    use_loaded <- FALSE
     if(is.null(package)) package <- .packages()
-    if(is.null(lib.loc)) {
-        use_loaded <- TRUE
-        lib.loc <- .libPaths()
-    }
-
     if(!length(package)) return(character())
+    if(use_loaded <- is.null(lib.loc))
+	lib.loc <- .libPaths()
 
     bad <- character()
     out <- character()
@@ -738,7 +749,7 @@
         if(length(paths) > 1L) {
             ## If a package was found more than once ...
             paths <- paths[1L]
-            if(verbose)
+	    if(verbose)
                 warning(gettextf("package %s found more than once,\nusing the one found in %s",
                                  sQuote(pkg), sQuote(paths)), domain = NA)
         }
@@ -819,14 +830,7 @@
                              package = pkg, lib.loc = lib.loc)
         if (nzchar(pfile))
             as.numeric_version(readRDS(pfile)$DESCRIPTION["Version"])
-        else
-            NULL
-    }
-    .findAllVersions <- function(pkg, lib.loc = NULL) {
-        if (is.null(lib.loc))
-            lib.loc <- .libPaths()
-        do.call(c, Filter(Negate(is.null),
-                          lapply(lib.loc, .findVersion, pkg=pkg)))
+        ## else NULL
     }
     pkgs <- unique(names(pkgInfo$Depends))
     pkgname <- pkgInfo$DESCRIPTION["Package"]
@@ -846,20 +850,21 @@
             if (!sufficient) {
                 if (is.null(lib.loc))
                     lib.loc <- .libPaths()
-                versions <- .findAllVersions(pkg, lib.loc)
+		allV <- lapply(lib.loc, .findVersion, pkg=pkg)
+		versions <- do.call(c, allV[iV <- which(!vapply(allV, is.null, NA))])
                 sufficient <- vapply(versions, dep$op, logical(1L), target)
                 if (any(sufficient)) {
                     warning(gettextf("version %s of %s masked by %s in %s",
                                      versions[which(sufficient)[1L]],
                                      sQuote(pkg),
                                      current,
-                                     lib.loc[which(sufficient)[1L]-1L]),
+				     lib.loc[iV[!sufficient][1L]]),
                             call. = FALSE, domain = NA)
                 }
-                if (attached)
-                    msg <- "package %s %s is loaded, but %s %s is required by %s"
-                else
-                    msg <- "package %s %s was found, but %s %s is required by %s"
+		msg <- if (attached)
+			   "package %s %s is loaded, but %s %s is required by %s"
+		       else
+			   "package %s %s was found, but %s %s is required by %s"
                 stop(gettextf(msg, sQuote(pkg), current, dep$op,
                               target, sQuote(pkgname)),
                      call. = FALSE, domain = NA)
diff -Nru r-base-3.2.3/src/library/base/R/mapply.R r-base-3.3.1/src/library/base/R/mapply.R
--- r-base-3.2.3/src/library/base/R/mapply.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/mapply.R	2015-12-14 23:15:03.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/mapply.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -50,7 +50,13 @@
 
     if (!all(vectorize.args %in% arg.names))
     	stop("must specify names of formal arguments for 'vectorize'")
-
+    	
+    collisions <- arg.names %in% c("FUN", "SIMPLIFY", "USE.NAMES", 
+                                   "vectorize.args")
+    if (any(collisions))
+	stop(sQuote("FUN"), " may not have argument(s) named ", 
+	     paste(sQuote(arg.names[collisions]), collapse = ", "))
+	     
     FUNV <- function() { ## will set the formals below
         args <- lapply(as.list(match.call())[-1L], eval, parent.frame())
         names <- if(is.null(names(args))) character(length(args))
diff -Nru r-base-3.2.3/src/library/base/R/match.R r-base-3.3.1/src/library/base/R/match.R
--- r-base-3.2.3/src/library/base/R/match.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/match.R	2016-03-16 23:03:52.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/match.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 {
     if (missing(choices)) {
 	formal.args <- formals(sys.function(sys.parent()))
-	choices <- eval(formal.args[[deparse(substitute(arg))]])
+	choices <- eval(formal.args[[as.character(substitute(arg))]])
     }
     if (is.null(arg)) return(choices[1L])
     else if(!is.character(arg))
diff -Nru r-base-3.2.3/src/library/base/R/methodsSupport.R r-base-3.3.1/src/library/base/R/methodsSupport.R
--- r-base-3.2.3/src/library/base/R/methodsSupport.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/methodsSupport.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/methodsSupport.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-trace <- function(what, tracer, exit, at, print, signature, where = topenv(parent.frame()), edit = FALSE)
+trace <- function(what, tracer, exit, at, print, signature,
+                  where = topenv(parent.frame()), edit = FALSE)
 {
-    needsAttach <- nargs() > 1L && !.isMethodsDispatchOn()
-    if(needsAttach) {
+    if(nargs() > 1L && !.isMethodsDispatchOn()) {
         ns <- try(loadNamespace("methods"))
         if(isNamespace(ns))
             message("(loaded the methods namespace)", domain = NA)
-        else
+        else ## (should not be possible)
             stop("tracing functions requires the 'methods' package, but unable to load the 'methods' namespace")
     }
     else if(nargs() == 1L)
@@ -35,32 +35,22 @@
     call <- sys.call()
     call[[1L]] <- quote(methods::.TraceWithMethods)
     call$where <- where
-    value <- eval.parent(call)
-    on.exit() ## no error
-    tracingState(tState)
-    value
+    eval.parent(call)
 }
 
 untrace <- function(what, signature = NULL, where = topenv(parent.frame())) {
-    ## NOTE: following test is TRUE after loadNamespace("methods") (even if not in search())
-    MethodsDispatchOn <- .isMethodsDispatchOn()
-    if(MethodsDispatchOn) {
-        tState <- tracingState(FALSE)
-        on.exit(tracingState(tState))
-    }
-    if(!MethodsDispatchOn)
-        return(.primUntrace(what)) ## can't have called trace except in primitive form
+    if(!.isMethodsDispatchOn()) ## can't have called trace except in primitive form
+        return(.primUntrace(what))
     ## at this point we can believe that the methods namespace was successfully loaded
+    tState <- tracingState(FALSE)
+    on.exit(tracingState(tState))
     ## now call the version in the methods package, to ensure we get
     ## the correct namespace (e.g., correct version of class())
     call <- sys.call()
     call[[1L]] <- quote(methods::.TraceWithMethods)
     call$where <- where
     call$untrace <- TRUE
-    value <- eval.parent(call)
-    on.exit() ## no error
-    tracingState(tState)
-    invisible(value)
+    invisible(eval.parent(call))
 }
 
 
diff -Nru r-base-3.2.3/src/library/base/R/namespace.R r-base-3.3.1/src/library/base/R/namespace.R
--- r-base-3.2.3/src/library/base/R/namespace.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/namespace.R	2016-05-11 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/namespace.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@
 	    get0(oNam, envir = ns)
 	} else { ##  <pkg> :: <dataset>  for lazydata :
 	    ld <- .getNamespaceInfo(ns, "lazydata")
-	    if (!is.null(obj <- get0(name, envir = ld, inherits = FALSE)))
+	    if (!is.null(obj <- ld[[name]]))
 		obj
 	    else { ## if there's a lazydata object with value NULL:
 		if(exists(name, envir = ld, inherits = FALSE))
@@ -126,7 +126,7 @@
 {
     ## only used to run .onAttach
     runHook <- function(hookname, env, libname, pkgname) {
-        if (!is.null(fun <- get0(hookname, envir = env, inherits = FALSE))) {
+        if (!is.null(fun <- env[[hookname]])) {
             res <- tryCatch(fun(libname, pkgname), error = identity)
             if (inherits(res, "error")) {
                 stop(gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",
@@ -162,7 +162,7 @@
     dimpenv <- .getNamespaceInfo(ns, "lazydata")
     dnames <- names(dimpenv)
     .Internal(importIntoEnv(env, dnames, dimpenv, dnames))
-    if(length(depends)) assign(".Depends", depends, env)
+    if(length(depends) > 0L) env$.Depends <- depends
     Sys.setenv("_R_NS_LOAD_" = nsname)
     on.exit(Sys.unsetenv("_R_NS_LOAD_"), add = TRUE)
     runHook(".onAttach", ns, dirname(nspath), nsname)
@@ -192,6 +192,7 @@
                            keep.source = getOption("keep.source.pkgs"),
                            partial = FALSE, versionCheck = NULL)
 {
+    libpath <- attr(package, "LibPath")
     package <- as.character(package)[[1L]]
 
     loading <- dynGet("__NameSpacesLoading__", NULL)
@@ -216,7 +217,7 @@
     } else {
         ## only used here for .onLoad
         runHook <- function(hookname, env, libname, pkgname) {
-	    if (!is.null(fun <- get0(hookname, envir = env, inherits = FALSE))) {
+	    if (!is.null(fun <- env[[hookname]])) {
                 res <- tryCatch(fun(libname, pkgname), error = identity)
                 if (inherits(res, "error")) {
                     stop(gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",
@@ -238,8 +239,8 @@
             name <- as.character(as.name(name))
             version <- as.character(version)
             info <- new.env(hash = TRUE, parent = baseenv())
-            assign(".__NAMESPACE__.", info, envir = env)
-            assign("spec", c(name = name, version = version), envir = info)
+            env$.__NAMESPACE__. <- info
+            info$spec <- c(name = name, version = version)
             setNamespaceInfo(env, "exports", new.env(hash = TRUE, parent = baseenv()))
             dimpenv <- new.env(parent = baseenv(), hash = TRUE)
             attr(dimpenv, "name") <- paste("lazydata", name, sep = ":")
@@ -250,9 +251,8 @@
                              normalizePath(file.path(lib, name), "/", TRUE))
             setNamespaceInfo(env, "dynlibs", NULL)
             setNamespaceInfo(env, "S3methods", matrix(NA_character_, 0L, 3L))
-            assign(".__S3MethodsTable__.",
-                   new.env(hash = TRUE, parent = baseenv()),
-                   envir = env)
+            env$.__S3MethodsTable__. <-
+                new.env(hash = TRUE, parent = baseenv())
             .Internal(registerNamespace(name, env))
             env
         }
@@ -299,9 +299,9 @@
                                       if(exists(varName, envir = env))
                                           warning(gettextf("failed to assign RegisteredNativeSymbol for %s to %s since %s is already defined in the %s namespace",
                                                            sym$name, varName, varName, sQuote(package)),
-                                                  domain = NA)
+                                                  domain = NA, call. = FALSE)
                                       else
-                                          assign(varName, sym, envir = env)
+                                          env[[varName]] <- sym
                                   })
                        })
 
@@ -323,11 +323,11 @@
                            if(origVarName != varName)
                                warning(gettextf("failed to assign NativeSymbolInfo for %s to %s since %s is already defined in the %s namespace",
                                                 origVarName, varName, varName, sQuote(package)),
-                                       domain = NA)
+                                       domain = NA, call. = FALSE)
                            else
                                warning(gettextf("failed to assign NativeSymbolInfo for %s since %s is already defined in the %s namespace",
                                                 origVarName, varName, sQuote(package)),
-                                       domain = NA)
+                                       domain = NA, call. = FALSE)
                        else
                            assign(varName, symbols[[origVarName]], envir = env)
 
@@ -336,7 +336,7 @@
         }
 
         ## find package and check it has a namespace
-        pkgpath <- find.package(package, lib.loc, quiet = TRUE)
+        pkgpath <- find.package(package, c(libpath, lib.loc), quiet = TRUE)
         if (length(pkgpath) == 0L)
             stop(gettextf("there is no package called %s", sQuote(package)),
                  domain = NA)
@@ -401,6 +401,13 @@
                                 loadNamespace(i, c(lib.loc, .libPaths()),
                                               versionCheck = vI[[i]]),
                                 from = package)
+            else if (!is.null(i$except))
+                namespaceImport(ns,
+                                loadNamespace(j <- i[[1L]],
+                                              c(lib.loc, .libPaths()),
+                                              versionCheck = vI[[j]]),
+                                from = package,
+                                except = i$except)
             else
                 namespaceImportFrom(ns,
                                     loadNamespace(j <- i[[1L]],
@@ -425,7 +432,7 @@
 
         env <- asNamespace(ns)
         ## save the package name in the environment
-        assign(".packageName", package, envir = env)
+        env$.packageName <- package
 
         ## load the code
         codename <- strsplit(package, "_", fixed = TRUE)[[1L]][1L]
@@ -472,7 +479,7 @@
             ## dynlibs vector.
             if(!is.null(names(nsInfo$dynlibs))
                && nzchar(names(nsInfo$dynlibs)[i]))
-                assign(names(nsInfo$dynlibs)[i], dlls[[lib]], envir = env)
+                env[[names(nsInfo$dynlibs)[i]]] <- dlls[[lib]]
             setNamespaceInfo(env, "DLLs", dlls)
         }
         addNamespaceDynLibs(env, nsInfo$dynlibs)
@@ -494,7 +501,7 @@
            !identical(package, "methods") ) {
             ## cache generics, classes in this namespace (but not methods itself,
             ## which pre-cached at install time
-            methods:::cacheMetaData(ns, TRUE, ns)
+            methods::cacheMetaData(ns, TRUE, ns)
             ## This also ran .doLoadActions
             ## load actions may have added objects matching patterns
             for (p in nsInfo$exportPatterns) {
@@ -507,7 +514,7 @@
             expClasses <- nsInfo$exportClasses
             ##we take any pattern, but check to see if the matches are classes
             pClasses <- character()
-            aClasses <- methods:::getClasses(ns)
+            aClasses <- methods::getClasses(ns)
             classPatterns <- nsInfo$exportClassPatterns
             ## defaults to exportPatterns
             if(!length(classPatterns))
@@ -517,7 +524,7 @@
             }
             pClasses <- unique(pClasses)
             if( length(pClasses) ) {
-                good <- vapply(pClasses, methods:::isClass, NA, where = ns)
+                good <- vapply(pClasses, methods::isClass, NA, where = ns)
                 if( !any(good) && length(nsInfo$exportClassPatterns))
                     warning(gettextf("'exportClassPattern' specified in 'NAMESPACE' but no matching classes in package %s", sQuote(package)),
                             call. = FALSE, domain = NA)
@@ -525,14 +532,14 @@
             }
             if(length(expClasses)) {
                 missingClasses <-
-                    !vapply(expClasses, methods:::isClass, NA, where = ns)
+                    !vapply(expClasses, methods::isClass, NA, where = ns)
                 if(any(missingClasses))
                     stop(gettextf("in package %s classes %s were specified for export but not defined",
                                   sQuote(package),
                                   paste(expClasses[missingClasses],
                                         collapse = ", ")),
                          domain = NA)
-                expClasses <- paste0(methods:::classMetaName(""), expClasses)
+                expClasses <- paste0(methods::classMetaName(""), expClasses)
             }
             ## process methods metadata explicitly exported or
             ## implied by exporting the generic function.
@@ -563,7 +570,7 @@
                         msg <-
                             ngettext(length(bad),
                                      "Function found when exporting methods from the namespace %s which is not S4 generic: %s",
-                                     "Functions found when exporting methods from the namespace %s which are not S4 generic: %s", domain = "R-base")
+                                     "Functions found when exporting methods from the namespace %s which are not S4 generic: %s")
                         stop(sprintf(msg, sQuote(package),
                                      paste(sQuote(bad), collapse = ", ")),
                              domain = NA, call. = FALSE)
@@ -608,11 +615,11 @@
                 ## the internal table.
                 pm <- allGenerics[!(allGenerics %in% expMethods)]
                 if(length(pm)) {
-                    prim <- logical(length(pm))
-                    for(i in seq_along(prim)) {
-                        f <- methods:::getFunction(pm[[i]], FALSE, FALSE, ns)
-                        prim[[i]] <- is.primitive(f)
-                    }
+                    prim <- vapply(pm, function(pmi) {
+                                       f <- methods::getFunction(pmi, FALSE,
+                                                                 FALSE, ns)
+                                       is.primitive(f)
+                                   }, logical(1L))
                     expMethods <- c(expMethods, pm[prim])
                 }
                 for(i in seq_along(expMethods)) {
@@ -690,56 +697,46 @@
 
 topenv <- function(envir = parent.frame(),
                    matchThisEnv = getOption("topLevelEnvironment")) {
-    ## while (! identical(envir, emptyenv())) {
-    ##     nm <- attributes(envir)[["names", exact = TRUE]]
-    ##     if ((is.character(nm) && length(grep("^package:" , nm))) ||
-    ##         ## matchThisEnv is used in sys.source
-    ##         identical(envir, matchThisEnv) ||
-    ##         identical(envir, .GlobalEnv) ||
-    ##         identical(envir, baseenv()) ||
-    ##         .Internal(isNamespaceEnv(envir)) ||
-    ##         ## packages except base and those with a separate namespace have .packageName
-    ##         exists(".packageName", envir = envir, inherits = FALSE))
-    ##         return(envir)
-    ##     else envir <- parent.env(envir)
-    ## }
-    ## return(.GlobalEnv)
     .Internal(topenv(envir, matchThisEnv))
 }
 
 unloadNamespace <- function(ns)
 {
-    ## only used to run .onUnload
-    runHook <- function(hookname, env, ...) {
-	if (!is.null(fun <- get0(hookname, envir = env, inherits = FALSE))) {
-            res <- tryCatch(fun(...), error=identity)
-            if (inherits(res, "error")) {
-                warning(gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",
-                                 hookname, "unloadNamespace", nsname,
-                                 deparse(conditionCall(res))[1L],
-                                 conditionMessage(res)),
-                        call. = FALSE, domain = NA)
-            }
-        }
+    ## check, so we do not load & unload:
+    if ((is.character(ns) && any(ns == loadedNamespaces())) ||
+        (is.environment(ns) && any(getNamespaceName(ns) == loadedNamespaces()))) {
+	## only used to run .onUnload
+	runHook <- function(hookname, env, ...) {
+	    if (!is.null(fun <- env[[hookname]])) {
+		res <- tryCatch(fun(...), error=identity)
+		if (inherits(res, "error")) {
+		    warning(gettextf("%s failed in %s() for '%s', details:\n  call: %s\n  error: %s",
+				     hookname, "unloadNamespace", nsname,
+				     deparse(conditionCall(res))[1L],
+				     conditionMessage(res)),
+			    call. = FALSE, domain = NA)
+		}
+	    }
+	}
+	ns <- asNamespace(ns, base.OK = FALSE)
+	nsname <- getNamespaceName(ns)
+	pos <- match(paste("package", nsname, sep = ":"), search())
+	if (! is.na(pos)) detach(pos = pos)
+	users <- getNamespaceUsers(ns)
+	if (length(users))
+	    stop(gettextf("namespace %s is imported by %s so cannot be unloaded",
+			  sQuote(getNamespaceName(ns)),
+			  paste(sQuote(users), collapse = ", ")),
+		 domain = NA)
+	nspath <- .getNamespaceInfo(ns, "path")
+	hook <- getHook(packageEvent(nsname, "onUnload")) # might be list()
+	for(fun in rev(hook)) try(fun(nsname, nspath))
+	runHook(".onUnload", ns, nspath)
+	.Internal(unregisterNamespace(nsname))
+	if(.isMethodsDispatchOn() && methods:::.hasS4MetaData(ns))
+	    methods::cacheMetaData(ns, FALSE, ns)
+	.Internal(lazyLoadDBflush(paste0(nspath, "/R/", nsname, ".rdb")))
     }
-    ns <- asNamespace(ns, base.OK = FALSE)
-    nsname <- getNamespaceName(ns)
-    pos <- match(paste("package", nsname, sep = ":"), search())
-    if (! is.na(pos)) detach(pos = pos)
-    users <- getNamespaceUsers(ns)
-    if (length(users))
-        stop(gettextf("namespace %s is imported by %s so cannot be unloaded",
-                      sQuote(getNamespaceName(ns)),
-                      paste(sQuote(users), collapse = ", ")),
-             domain = NA)
-    nspath <- .getNamespaceInfo(ns, "path")
-    hook <- getHook(packageEvent(nsname, "onUnload")) # might be list()
-    for(fun in rev(hook)) try(fun(nsname, nspath))
-    runHook(".onUnload", ns, nspath)
-    .Internal(unregisterNamespace(nsname))
-    if(.isMethodsDispatchOn() && methods:::.hasS4MetaData(ns))
-        methods:::cacheMetaData(ns, FALSE, ns)
-    .Internal(lazyLoadDBflush(paste0(nspath, "/R/", nsname, ".rdb")))
     invisible()
 }
 
@@ -772,11 +769,14 @@
     else ns
 }
 
-namespaceImport <- function(self, ..., from = NULL)
+namespaceImport <- function(self, ..., from = NULL, except = character(0L))
     for (ns in list(...))
-        namespaceImportFrom(self, asNamespace(ns), from = from)
+        namespaceImportFrom(self, asNamespace(ns), from = from,
+                            except = except)
 
-namespaceImportFrom <- function(self, ns, vars, generics, packages, from = "non-package environment")
+namespaceImportFrom <- function(self, ns, vars, generics, packages,
+                                from = "non-package environment",
+                                except = character(0L))
 {
     addImports <- function(ns, from, what) {
         imp <- structure(list(what), names = getNamespaceName(from))
@@ -821,6 +821,7 @@
         vars <- getNamespaceExports(ns)
         vars <- vars[! vars %in% stoplist]
     } else vars
+    impvars <- impvars[! impvars %in% except]
     impvars <- makeImportExportNames(impvars)
     impnames <- names(impvars)
     if (anyDuplicated(impnames)) {
@@ -828,17 +829,19 @@
                       paste(sQuote(impnames[duplicated(impnames)]),
                             collapse = ", ")), domain = NA)
     }
-    if (isNamespace(self) && isBaseNamespace(self)) {
-        impenv <- self
-        msg <- gettext("replacing local value with import %s when loading %s")
-        register <- FALSE
-    }
-    else if (isNamespace(self)) {
-        if (namespaceIsSealed(self))
-            stop("cannot import into a sealed namespace")
-        impenv <- parent.env(self)
-        msg <- gettext("replacing previous import by %s when loading %s")
-        register <- TRUE
+    if (isNamespace(self)) {
+        if(isBaseNamespace(self)) {
+            impenv <- self
+            msg <- gettext("replacing local value with import %s when loading %s")
+            register <- FALSE
+        }
+        else {
+            if (namespaceIsSealed(self))
+                stop("cannot import into a sealed namespace")
+            impenv <- parent.env(self)
+            msg <- gettext("replacing previous import by %s when loading %s")
+            register <- TRUE
+        }
     }
     else if (is.environment(self)) {
         impenv <- self
@@ -860,9 +863,9 @@
 		    genName <- generics[[i]]
                     ## if(i > length(generics) || !nzchar(genName))
                     ##   {warning("got invalid index for importing ",mlname); next}
-		    fdef <- methods:::getGeneric(genName,
-                                                 where = impenv,
-                                                 package = packages[[i]])
+		    fdef <- methods::getGeneric(genName,
+                                                where = impenv,
+                                                package = packages[[i]])
 		    if(is.null(fdef))
 			warning(gettextf("found methods to import for function %s but not the generic itself",
 					 sQuote(genName)),
@@ -878,8 +881,8 @@
 	}
     }
     for (n in impnames)
-	if (!is.null(genImp <- get0(n, envir = impenv, inherits = FALSE))) {
-	    if (.isMethodsDispatchOn() && methods:::isGeneric(n, ns)) {
+	if (!is.null(genImp <- impenv[[n]])) {
+	    if (.isMethodsDispatchOn() && methods::isGeneric(n, ns)) {
 		## warn only if generic overwrites a function which
 		## it was not derived from
 		genNs <- genericPackage(get(n, envir = ns))
@@ -889,14 +892,36 @@
                 ## "feature" of environment() is that it returns a special
                 ## attribute for non-functions, usually NULL
 		if (!identical(genNs, genImpenv) ||
-                    methods:::isGeneric(n, impenv)) {}
+                    methods::isGeneric(n, impenv)) {}
                 else next
 	    }
-            ## this is always called from another function, so reporting call
-            ## is unhelpful
-            warning(sprintf(msg, sQuote(paste(nsname, n, sep = "::")),
-                            sQuote(from)),
-                    call. = FALSE, domain = NA)
+            if (identical(genImp, get(n, ns))) next
+            if (isNamespace(self) && !isBaseNamespace(self)) {
+                ## Now try to figure out where we imported from
+                ## The 'imports' list is named by where-from
+                ## and is in order of adding.
+                current <- getNamespaceInfo(self, "imports")
+                poss <- lapply(rev(current), "[", n)
+                poss <- poss[!sapply(poss, is.na)]
+                if(length(poss) >= 1L) {
+                    msg <- gettext("replacing previous import %s by %s when loading %s")
+                    prev <- names(poss)[1L]
+                    warning(sprintf(msg,
+                                    sQuote(paste(prev, n, sep = "::")),
+                                    sQuote(paste(nsname, n, sep = "::")),
+                                    sQuote(from)),
+                            call. = FALSE, domain = NA)
+                } else
+                    warning(sprintf(msg, sQuote(paste(nsname, n, sep = "::")),
+                                    sQuote(from)),
+                            call. = FALSE, domain = NA)
+            } else {
+                ## this is always called from another function,
+                ## so reporting call is unhelpful
+                warning(sprintf(msg, sQuote(paste(nsname, n, sep = "::")),
+                                sQuote(from)),
+                        call. = FALSE, domain = NA)
+            }
 	}
     importIntoEnv(impenv, impnames, ns, impvars)
     if (register)
@@ -906,7 +931,7 @@
 namespaceImportClasses <- function(self, ns, vars, from = NULL)
 {
     for(i in seq_along(vars))
-        vars[[i]] <- methods:::classMetaName(vars[[i]])
+        vars[[i]] <- methods::classMetaName(vars[[i]])
     namespaceImportFrom(self, asNamespace(ns), vars, from = from)
 }
 
@@ -917,7 +942,7 @@
     packages <- character()
     allFuns <- methods:::.getGenerics(ns) # all the methods tables in ns
     allPackages <- attr(allFuns, "package")
-    pkg <- methods:::getPackageName(ns)
+    pkg <- methods::getPackageName(ns)
     if(!all(vars %in% allFuns)) {
         message(gettextf("No methods found in \"%s\" for requests: %s",
                          pkg, paste(vars[is.na(match(vars, allFuns))], collapse = ", ")),
@@ -944,18 +969,19 @@
             }
         }
         if(g %in% vars && !exists(g, envir = self, inherits = FALSE)) {
-	    if(!is.null(f <- get0(g, envir = ns)) && methods:::is(f, "genericFunction")) {
+	    if(!is.null(f <- get0(g, envir = ns)) && methods::is(f, "genericFunction")) {
                 allVars <- c(allVars, g)
                 generics <- c(generics, g)
                 packages <- c(packages, p)
-            }
-            else { # should be primitive
+            } else if (g %in% c("as.vector", "is.unsorted", "unlist")) {
+                ## implicit generics
+            } else { # should be primitive
                 fun <- methods::getFunction(g, mustFind = FALSE, where = self)
                 if(is.primitive(fun) || methods::is(fun, "genericFunction")) {}
                 else
-                    warning(gettextf("No generic function found corresponding to requested imported methods for \"%s\" from package \"%s\" (malformed exports?)",
-                                 g, pkg),
-                        domain = NA)
+                    warning(gettextf("No generic function %s found corresponding to requested imported methods from package %s when loading %s (malformed exports?)",
+                                 sQuote(g), sQuote(pkg), sQuote(from)),
+                        domain = NA, call. = FALSE)
             }
         }
     }
@@ -970,7 +996,7 @@
         miss <- expnames[!eie]
         ## if called (indirectly) for namespaceImportClasses
         ## these are all classes
-        if(all(grepl("^\\.__C__", miss))) {
+        if(all(startsWith(miss, ".__C__"))) {
             miss <- sub("^\\.__C__", "", miss)
             stop(sprintf(ngettext(length(miss),
                                   "class %s is not exported by 'namespace:%s'",
@@ -987,7 +1013,7 @@
                  call. = FALSE, domain = NA)
         }
     }
-    expnames <- unlist(lapply(expnames, get, envir = exports, inherits = FALSE))
+    expnames <- unlist(mget(expnames, envir = exports, inherits = FALSE), recursive=FALSE)
     if (is.null(impnames)) impnames <- character()
     if (is.null(expnames)) expnames <- character()
     .Internal(importIntoEnv(impenv, impnames, expenv, expnames))
@@ -1003,7 +1029,6 @@
         addExports <- function(ns, new) {
             exports <- .getNamespaceInfo(ns, "exports")
             expnames <- names(new)
-            intnames <- new
             objs <- names(exports)
             ex <- expnames %in% objs
             if(any(ex))
@@ -1012,8 +1037,7 @@
                                          "previous exports '%s' are being replaced"),
                                 paste(sQuote(expnames[ex]), collapse = ", ")),
                         call. = FALSE, domain = NA)
-            for (i in seq_along(new))
-                assign(expnames[i], intnames[i], envir = exports)
+            list2env(as.list(new), exports)
         }
         makeImportExportNames <- function(spec) {
             old <- as.character(spec)
@@ -1039,26 +1063,23 @@
     }
 }
 
-.mergeExportMethods <- function(new, ns) {
-##    if(!.isMethodsDispatchOn()) return(FALSE)
-    mm <- methods:::methodsPackageMetaName("M","")
+.mergeExportMethods <- function(new, ns)
+{
+    ## avoid bootstrapping issues
+    ##    mm <- methods:::methodsPackageMetaName("M","")
+    mm <- ".__M__"
     newMethods <- new[substr(new, 1L, nchar(mm, type = "c")) == mm]
     nsimports <- parent.env(ns)
     for(what in newMethods) {
-	if(!is.null(m1 <- get0(what, envir = nsimports, inherits = FALSE))) {
+	if(!is.null(m1 <- nsimports[[what]])) {
             m2 <- get(what, envir = ns)
-            assign(what, envir = ns, methods:::mergeMethods(m1, m2))
+            ns[[what]] <- methods::mergeMethods(m1, m2)
         }
     }
 }
 
-
-## NB this needs a decorated name, foo_ver, if appropriate
-packageHasNamespace <- function(package, package.lib) {
-    namespaceFilePath <- function(package, package.lib)
-        file.path(package.lib, package, "NAMESPACE")
-    file.exists(namespaceFilePath(package, package.lib))
-}
+packageHasNamespace <- function(package, package.lib)
+    file.exists(file.path(package.lib, package, "NAMESPACE"))
 
 parseNamespaceFile <- function(package, package.lib, mustExist = TRUE)
 {
@@ -1133,6 +1154,11 @@
 		     domain = NA)
 	    r
 	}
+        evalToChar <- function(cc) {
+            vars <- all.vars(cc)
+            names(vars) <- vars
+            as.character(eval(eval(call("substitute", cc, as.list(vars)))))
+        }
         switch(as.character(e[[1L]]),
                "if" = if (eval(e[[2L]], .GlobalEnv))
                parseDirective(e[[3L]])
@@ -1164,7 +1190,15 @@
                exportMethods = {
                    exportMethods <<- c(asChar(e[-1L]), exportMethods)
                },
-               import = imports <<- c(imports, as.list(asChar(e[-1L]))),
+               import = {
+                   except <- e$except
+                   e$except <- NULL
+                   pkgs <- as.list(asChar(e[-1L]))
+                   if (!is.null(except)) {
+                       pkgs <- lapply(pkgs, list, except=evalToChar(except))
+                   }
+                   imports <<- c(imports, pkgs)
+               },
                importFrom = {
                    imp <- e[-1L]
                    ivars <- imp[-1L]
@@ -1233,7 +1267,7 @@
                            warning(gettextf("duplicate symbol names %s in useDynLib(\"%s\")",
                                             paste(sQuote(names(symNames)[dup]),
                                                   collapse = ", "), dyl),
-                                   domain = NA)
+                                   domain = NA, call. = FALSE)
 
                        symNames <- symNames[!dup]
 
@@ -1328,14 +1362,14 @@
     defenv <- if(genname %in% groupGenerics) .BaseNamespaceEnv
     else {
         genfun <- get(genname, envir = envir)
-        if(.isMethodsDispatchOn() && methods:::is(genfun, "genericFunction"))
-            genfun <- methods:::finalDefaultMethod(genfun@default)
+        if(.isMethodsDispatchOn() && methods::is(genfun, "genericFunction"))
+            genfun <- methods::finalDefaultMethod(genfun@default)
         if (typeof(genfun) == "closure") environment(genfun)
 	else .BaseNamespaceEnv
     }
-    if (is.null(table <- get0(".__S3MethodsTable__.", envir = defenv, inherits = FALSE))) {
+    if (is.null(table <- defenv[[".__S3MethodsTable__."]])) {
 	table <- new.env(hash = TRUE, parent = baseenv())
-	assign(".__S3MethodsTable__.", table, envir = defenv)
+	defenv[[".__S3MethodsTable__."]] <- table
     }
 
     if (is.character(method)) {
@@ -1386,14 +1420,14 @@
 	    if(is.null(genfun <- get0(genname, envir = parent.env(envir))))
 		stop(gettextf("object '%s' not found whilst loading namespace '%s'",
 			      genname, package), call. = FALSE, domain = NA)
-            if(.isMethodsDispatchOn() && methods:::is(genfun, "genericFunction"))
+            if(.isMethodsDispatchOn() && methods::is(genfun, "genericFunction"))
 		genfun <- genfun@default  # nearly always, the S3 generic
             if (typeof(genfun) == "closure") environment(genfun)
             else .BaseNamespaceEnv
         }
-	if (is.null(table <- get0(".__S3MethodsTable__.", envir = defenv, inherits = FALSE))) {
+	if (is.null(table <- defenv[[".__S3MethodsTable__."]])) {
 	    table <- new.env(hash = TRUE, parent = baseenv())
-	    assign(".__S3MethodsTable__.", table, envir = defenv)
+	    defenv[[".__S3MethodsTable__."]] <- table
 	}
         if(!is.null(e <- table[[nm]])) {
             current <- environmentName(environment(e))
@@ -1424,15 +1458,14 @@
     if(.isMethodsDispatchOn())
         for(i in which(localGeneric)) {
             genfun <- get(Info[i, 1], envir = env)
-            if(methods:::is(genfun, "genericFunction")) {
+            if(methods::is(genfun, "genericFunction")) {
                 localGeneric[i] <- FALSE
                 registerS3method(Info[i, 1], Info[i, 2], Info[i, 3], env)
             }
         }
     if(any(localGeneric)) {
         lin <- Info[localGeneric, , drop = FALSE]
-        S3MethodsTable <-
-            get(".__S3MethodsTable__.", envir = env, inherits = FALSE)
+        S3MethodsTable <- env[[".__S3MethodsTable__."]]
         ## we needed to move this to C for speed.
         ## for(i in seq_len(nrow(lin)))
         ##    assign(lin[i,4], get(lin[i,3], envir = env),
@@ -1467,12 +1500,11 @@
 
 .mergeImportMethods <- function(impenv, expenv, metaname)
 {
-    expMethods <- get(metaname, envir = expenv)
-    if(!is.null(impMethods <- get0(metaname, envir = impenv, inherits = FALSE))) {
-	assign(metaname,
-	       methods:::.mergeMethodsTable2(impMethods,
-					     expMethods, expenv, metaname),
-	       envir = impenv)
-	impMethods
-    } ## else NULL
+    impMethods <- impenv[[metaname]]
+    if(!is.null(impMethods))
+	impenv[[metaname]] <-
+	    methods:::.mergeMethodsTable2(impMethods,
+					  newtable = expenv[[metaname]], # known to exist by caller
+					  expenv, metaname)
+    impMethods # possibly NULL
 }
diff -Nru r-base-3.2.3/src/library/base/R/New-Internal.R r-base-3.3.1/src/library/base/R/New-Internal.R
--- r-base-3.2.3/src/library/base/R/New-Internal.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/New-Internal.R	2016-03-16 23:03:52.000000000 +0000
@@ -165,7 +165,7 @@
     .Internal(is.unsorted(x, strictly))
 }
 
-nchar <- function(x, type = "chars", allowNA = FALSE, keepNA = FALSE)
+nchar <- function(x, type = "chars", allowNA = FALSE, keepNA = NA)
     .Internal(nchar(x, type, allowNA, keepNA))
 
 polyroot <- function(z) .Internal(polyroot(z))
@@ -292,5 +292,7 @@
     .Internal(curlGetHeaders(url, redirect, verify))
 
 
+lengths <- function(x, use.names=TRUE) .Internal(lengths(x, use.names))
+
 ## base has no S4 generics
 .noGenerics <- TRUE
diff -Nru r-base-3.2.3/src/library/base/R/qr.R r-base-3.3.1/src/library/base/R/qr.R
--- r-base-3.2.3/src/library/base/R/qr.R	2015-08-25 22:17:22.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/qr.R	2016-03-16 23:03:47.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/qr.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -217,15 +217,9 @@
     qr.qy(qr, D)
 }
 
-qr.R <- function (qr, complete = FALSE, ...)
+qr.R <- function (qr, complete = FALSE)
 {
     if(!is.qr(qr)) stop("argument is not a QR decomposition")
-    if(!missing(...))
-	warning(sprintf(ngettext(length(list(...)),
-				 "extra argument %s will be disregarded",
-				 "extra arguments %s will be disregarded"),
-			 paste(sQuote(names(list(...))), collapse = ", ")),
-		domain = NA)
     R <- qr$qr
     if (!complete)
 	R <- R[seq.int(min(dim(R))), , drop = FALSE]
diff -Nru r-base-3.2.3/src/library/base/R/rank.R r-base-3.3.1/src/library/base/R/rank.R
--- r-base-3.2.3/src/library/base/R/rank.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/rank.R	2016-03-16 23:03:51.000000000 +0000
@@ -17,7 +17,7 @@
 #  https://www.R-project.org/Licenses/
 
 rank <- function(x, na.last = TRUE,
-		 ties.method = c("average", "first", "random", "max", "min"))
+		 ties.method = c("average", "first", "last", "random", "max", "min"))
 {
     nas <- is.na(x)
     nm <- names(x)
@@ -30,6 +30,8 @@
 		"average" = , "min" = , "max" =
 		.Internal(rank(x, length(x), ties.method)),
 		"first" = sort.list(sort.list(x)),
+		"last"  = ## == rev(sort.list(sort.list(rev(x)))) :
+		    sort.list(rev.default(sort.list(x, decreasing=TRUE))),
 		"random" = sort.list(order(x, stats::runif(sum(!nas)))))
     ## the internal code has ranks in [1, length(y)]
     if(!is.na(na.last) && any(nas)) {
diff -Nru r-base-3.2.3/src/library/base/R/raw.R r-base-3.3.1/src/library/base/R/raw.R
--- r-base-3.2.3/src/library/base/R/raw.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/raw.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/raw.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -36,3 +36,6 @@
 
 utf8ToInt <- function(x) .Internal(utf8ToInt(x))
 intToUtf8 <- function(x, multiple=FALSE) .Internal(intToUtf8(x, multiple))
+
+validUTF8 <- function(x) .Internal(validUTF8(x))
+validEnc <- function(x) .Internal(validEnc(x))
diff -Nru r-base-3.2.3/src/library/base/R/seq.R r-base-3.3.1/src/library/base/R/seq.R
--- r-base-3.2.3/src/library/base/R/seq.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/seq.R	2016-03-16 23:03:48.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/seq.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -42,12 +42,7 @@
         }
 	length.out <- ceiling(length.out)
     }
-    if(!missing(...))
-        warning(sprintf(ngettext(length(list(...)),
-                                 "extra argument %s will be disregarded",
-                                 "extra arguments %s will be disregarded"),
-			 paste(sQuote(names(list(...))), collapse = ", ")),
-		domain = NA)
+    chkDots(...)
     if (!missing(from) && length(from) != 1L) stop("'from' must be of length 1")
     if (!missing(to) && length(to) != 1L) stop("'to' must be of length 1")
     if (!missing(from) && !is.finite(from))
diff -Nru r-base-3.2.3/src/library/base/R/serialize.R r-base-3.3.1/src/library/base/R/serialize.R
--- r-base-3.2.3/src/library/base/R/serialize.R	2015-08-25 22:17:22.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/serialize.R	2016-02-03 23:15:08.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/serialize.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -21,11 +21,16 @@
              compress = TRUE, refhook = NULL)
 {
     if(is.character(file)) {
-        if(file == "") stop("'file' must be non-empty string")
-        mode <- if(ascii %in% FALSE) "wb" else "w"
-        con <- if (identical(compress, "bzip2")) bzfile(file, mode)
-            else if (identical(compress, "xz")) xzfile(file, mode)
-            else if(compress) gzfile(file, mode) else file(file, mode)
+	if(file == "") stop("'file' must be non-empty string")
+	mode <- if(ascii %in% FALSE) "wb" else "w"
+	con <- if (is.logical(compress))
+		   if(compress) gzfile(file, mode) else file(file, mode)
+	       else
+		   switch(compress,
+			  "bzip2" = bzfile(file, mode),
+			  "xz"    = xzfile(file, mode),
+			  "gzip"  = gzfile(file, mode),
+			  stop("invalid 'compress' argument: ", compress))
         on.exit(close(con))
     }
     else if(inherits(file, "connection")) {
@@ -61,10 +66,7 @@
     if (!ascii && inherits(connection, "sockconn"))
         .Internal(serializeb(object, connection, xdr, version, refhook))
     else {
-        if(is.na(ascii)) type <- 2L
-        else if(ascii) type <- 1L
-        else if(!xdr) type <- 3L
-        else type <- 0L
+	type <- if(is.na(ascii)) 2L else if(ascii) 1L else if(!xdr) 3L else 0L
         .Internal(serialize(object, connection, type, version, refhook))
     }
 }
diff -Nru r-base-3.2.3/src/library/base/R/sink.R r-base-3.3.1/src/library/base/R/sink.R
--- r-base-3.2.3/src/library/base/R/sink.R	2015-08-25 22:17:34.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/sink.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/sink.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
         closeOnExit <- FALSE
         if(is.null(file)) file <- -1L
         else if(is.character(file)) {
-            file <- file(file, ifelse(append, "a", "w"))
+            file <- file(file, if(append) "a" else "w")
             closeOnExit <- TRUE
         } else if(!inherits(file, "connection"))
             stop("'file' must be NULL, a connection or a character string")
diff -Nru r-base-3.2.3/src/library/base/R/sort.R r-base-3.3.1/src/library/base/R/sort.R
--- r-base-3.2.3/src/library/base/R/sort.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/sort.R	2016-03-16 23:03:48.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/sort.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -32,8 +32,23 @@
 
 sort.int <-
     function(x, partial = NULL, na.last = NA, decreasing = FALSE,
-             method = c("shell", "quick"), index.return = FALSE)
+             method = c("shell", "quick", "radix"), index.return = FALSE)
 {
+    useRadix <- (!missing(method) && method == "radix") ||
+        (missing(method) && is.null(partial) &&
+             (is.integer(x) || is.factor(x) || is.logical(x)))
+    if (useRadix) {
+        if (!is.null(partial)) {
+            stop("'partial' sorting not supported by radix method")
+        }
+        o <- order(x, na.last = na.last, decreasing = decreasing,
+                   method = "radix")
+        y <- x[o]
+        if (index.return)
+            return(list(x = y, ix = o))
+        else return(y)
+    }
+    
     if(isfact <- is.factor(x)) {
         if(index.return) stop("'index.return' only for non-factors")
 	lev <- levels(x)
@@ -58,12 +73,10 @@
             .Internal(psort(x, partial))
         } else if (is.double(x)) .Internal(qsort(x, FALSE))
         else .Internal(sort(x, FALSE))
-    } else if(isfact && missing(method) && nlev < 100000) {
-        o <- sort.list(x, decreasing = decreasing, method = "radix")
-        y <- x[o]
     } else {
         nms <- names(x)
-        method <- if(is.numeric(x)) match.arg(method) else "shell"
+	method <- if(is.numeric(x) && !missing(method)) match.arg(method)
+		  else "shell"
         switch(method,
                "quick" = {
                    if(!is.null(nms)) {
@@ -96,36 +109,49 @@
     y
 }
 
-order <- function(..., na.last = TRUE, decreasing = FALSE)
+order <- function(..., na.last = TRUE, decreasing = FALSE,
+                  method = c("shell", "radix"))
 {
     z <- list(...)
+
+    if (missing(method)) {
+        ints <- all(vapply(z, function(x) is.integer(x) || is.factor(x),
+                           logical(1L)))
+        method <- if (ints) "radix" else "shell"
+    } else {
+        method <- match.arg(method)
+    }
+    
     if(any(unlist(lapply(z, is.object)))) {
-        z <- lapply(z, function(x) if(is.object(x)) xtfrm(x) else x)
-        if(!is.na(na.last))
+        z <- lapply(z, function(x) if(is.object(x)) as.vector(xtfrm(x)) else x)
+        if(method == "radix" || !is.na(na.last))
             return(do.call("order", c(z, na.last = na.last,
-                                      decreasing = decreasing)))
-    } else if(!is.na(na.last)) {
-        if (length(z) == 1L && is.factor(zz <- z[[1L]]) && nlevels(zz) < 100000)
-            return(.Internal(radixsort(zz, na.last, decreasing)))
-        else return(.Internal(order(na.last, decreasing, ...)))
+                                      decreasing = decreasing,
+                                      method = method)))
+    } else if(method != "radix" && !is.na(na.last)) {
+        return(.Internal(order(na.last, decreasing, ...)))
     }
-
+    
+    if (method == "radix") {
+        decreasing <- rep_len(as.logical(decreasing), length(z))
+        return(.Internal(radixsort(na.last, decreasing, FALSE, TRUE, ...)))
+    }
+    
     ## na.last = NA case: remove nas
-    if(any(diff(l.z <- vapply(z, length, 1L)) != 0L))
+    if(any(diff((l.z <- lengths(z)) != 0L)))
         stop("argument lengths differ")
-    ans <- vapply(z, is.na, rep.int(NA, l.z[1L]))
-    ok <- if(is.matrix(ans)) !apply(ans, 1, any) else !any(ans)
+    na <- vapply(z, is.na, rep.int(NA, l.z[1L]))
+    ok <- if(is.matrix(na)) rowSums(na) == 0L else !any(na)
     if(all(!ok)) return(integer())
     z[[1L]][!ok] <- NA
     ans <- do.call("order", c(z, decreasing = decreasing))
-    keep <- seq_along(ok)[ok]
-    ans[ans %in% keep]
+    ans[ok[ans]]
 }
 
 sort.list <- function(x, partial = NULL, na.last = TRUE, decreasing = FALSE,
                       method = c("shell", "quick", "radix"))
 {
-    if (missing(method) && is.factor(x) && nlevels(x) < 100000) method <-"radix"
+    if (is.integer(x) || is.factor(x)) method <- "radix"
     method <- match.arg(method)
     if(!is.atomic(x))
         stop("'x' must be atomic for 'sort.list'\nHave you called 'sort' on a list?")
@@ -138,17 +164,15 @@
                         method = "quick", index.return = TRUE)$ix)
         else stop("method = \"quick\" is only for numeric 'x'")
     }
+    if (is.na(na.last)) {
+        x <- x[!is.na(x)]
+        na.last <- TRUE
+    }
     if(method == "radix") {
-        if(!typeof(x) == "integer") # we do want to allow factors here
-            stop("method = \"radix\" is only for integer 'x'")
-        if(is.na(na.last))
-            return(.Internal(radixsort(x[!is.na(x)], TRUE, decreasing)))
-        else
-            return(.Internal(radixsort(x, na.last, decreasing)))
+        return(order(x, na.last=na.last, decreasing=decreasing, method="radix"))
     }
     ## method == "shell"
-    if(is.na(na.last)) .Internal(order(TRUE, decreasing, x[!is.na(x)]))
-    else .Internal(order(na.last, decreasing, x))
+    .Internal(order(na.last, decreasing, x))
 }
 
 
@@ -179,3 +203,16 @@
     n <- length(x)
     if(strictly) !all(x[-1L] > x[-n]) else !all(x[-1L] >= x[-n])
 }
+
+grouping <- function(...) {
+    z <- list(...)
+    if(any(vapply(z, is.object, logical(1L)))) {
+        z <- lapply(z, function(x) if(is.object(x)) as.vector(xtfrm(x)) else x)
+        return(do.call("grouping", z))
+    }
+    nalast <- FALSE
+    decreasing <- rep_len(FALSE, length(z))
+    group <- TRUE
+    sortStr <- FALSE
+    return(.Internal(radixsort(nalast, decreasing, group, sortStr, ...)))
+}
diff -Nru r-base-3.2.3/src/library/base/R/source.R r-base-3.3.1/src/library/base/R/source.R
--- r-base-3.2.3/src/library/base/R/source.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/source.R	2016-03-16 23:03:48.000000000 +0000
@@ -122,10 +122,9 @@
 
     if (chdir){
         if(is.character(ofile)) {
-            isURL <- length(grep("^(ftp|http|file)://", ofile)) > 0L
-            if(isURL)
+	    if(grepl("^(ftp|http|file)://", ofile)) ## is URL
                 warning("'chdir = TRUE' makes no sense for a URL")
-            if(!isURL && (path <- dirname(ofile)) != ".") {
+	    else if((path <- dirname(ofile)) != ".") {
                 owd <- getwd()
                 if(is.null(owd))
                     stop("cannot 'chdir' as current directory is unknown")
@@ -173,7 +172,7 @@
 	    	    if (length(dep)) {
 			leading <- if(tail) length(dep) else srcref[1L]-lastshown
 			lastshown <- srcref[3L]
-			while (length(dep) && length(grep("^[[:blank:]]*$", dep[1L]))) {
+			while (length(dep) && grepl("^[[:blank:]]*$", dep[1L])) {
 			    dep <- dep[-1L]
 			    leading <- leading - 1L
 			}
@@ -200,7 +199,7 @@
 		do.trunc <- nd > max.deparse.length
 		dep <- substr(dep, 1L, if (do.trunc) max.deparse.length else nd)
 		cat("\n", dep, if (do.trunc)
-		    paste(if (length(grep(sd, dep)) && length(grep(oddsd, dep)))
+		    paste(if (grepl(sd, dep) && grepl(oddsd, dep))
 			  " ...\" ..." else " ....", "[TRUNCATED] "),
 		    "\n", sep = "")
 	    }
diff -Nru r-base-3.2.3/src/library/base/R/srcfile.R r-base-3.3.1/src/library/base/R/srcfile.R
--- r-base-3.2.3/src/library/base/R/srcfile.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/srcfile.R	2016-03-16 23:03:48.000000000 +0000
@@ -223,9 +223,9 @@
     	x[c(3L, 4L, 6L, 8L)] <- to[c(3L, 4L, 6L, 8L)]
     }	
     if (!is.null(srcfile) && !inherits(srcfile, "srcfile")) {
-       cat("forcing class on") ## debug
-	print(str(srcfile))
-       class(srcfile) <- c("srcfilealias", "srcfile")
+        cat("forcing class on") ## debug
+        print(utils::str(srcfile))
+        class(srcfile) <- c("srcfilealias", "srcfile")
     }
     
     if (useSource) {
diff -Nru r-base-3.2.3/src/library/base/R/strwrap.R r-base-3.3.1/src/library/base/R/strwrap.R
--- r-base-3.2.3/src/library/base/R/strwrap.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/strwrap.R	2016-03-16 23:03:48.000000000 +0000
@@ -28,8 +28,8 @@
 {
     if(!is.character(x)) x <- as.character(x)
     ## Useful variables.
-    indentString <- paste(rep.int(" ", indent), collapse = "")
-    exdentString <- paste(rep.int(" ", exdent), collapse = "")
+    indentString <- strrep(" ", indent)
+    exdentString <- strrep(" ", exdent)
     y <- list()                         # return value
     UB <- TRUE
     ## input need not be valid in this locale, e.g. from write.dcf
@@ -175,7 +175,7 @@
     if(indent > 0.5 * width)
         stop("incorrect values of 'indent' and 'width'")
 
-    indentString <- paste(rep.int(" ", indent), collapse = "")
+    indentString <- strrep(" ", indent)
 
     if(style == "table") {
         i <- (nchar(x, type="w") > indent - 3L)
diff -Nru r-base-3.2.3/src/library/base/R/summary.R r-base-3.3.1/src/library/base/R/summary.R
--- r-base-3.2.3/src/library/base/R/summary.R	2015-08-25 22:17:26.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/summary.R	2016-03-01 23:15:07.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/summary.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -64,7 +64,11 @@
 
 format.summaryDefault <- function(x, ...)
 {
-    xx <- if(is.numeric(x) || is.complex(x)) zapsmall(x) else x
+    xx <- x
+    if(is.numeric(x) || is.complex(x)) {
+      finite <- is.finite(x)
+      xx[finite] <- zapsmall(x[finite])
+    }
     class(xx) <- class(x)[-1]
     m <- match("NA's", names(x), 0)
     if(inherits(x, "Date") || inherits(x, "POSIXct")) {
@@ -78,7 +82,11 @@
 
 print.summaryDefault <- function(x, ...)
 {
-    xx <- if(is.numeric(x) || is.complex(x)) zapsmall(x) else x
+    xx <- x
+    if(is.numeric(x) || is.complex(x)) {
+      finite <- is.finite(x)
+      xx[finite] <- zapsmall(x[finite])
+    }
     class(xx) <- class(x)[-1] # for format
     m <- match("NA's", names(xx), 0)
     if(inherits(x, "Date") || inherits(x, "POSIXct")) {
@@ -131,7 +139,9 @@
     nv <- length(object)
     nm <- names(object)
     lw <- numeric(nv)
-    nr <- if (nv) max(unlist(lapply(z, NROW))) else 0
+    nr <- if (nv)
+	      max(vapply(z, function(x) NROW(x) + !is.null(attr(x, "NAs")), integer(1)))
+	  else 0
     for(i in seq_len(nv)) {
         sms <- z[[i]]
         if(is.matrix(sms)) {
diff -Nru r-base-3.2.3/src/library/base/R/table.R r-base-3.3.1/src/library/base/R/table.R
--- r-base-3.2.3/src/library/base/R/table.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/table.R	2016-03-16 23:03:51.000000000 +0000
@@ -245,3 +245,13 @@
     class(z) <- oldClass(x) # avoid adding "matrix"
     z
 }
+
+`[.table` <-
+function(x, i, j, ..., drop = TRUE)
+{
+    ret <- NextMethod()
+    ldr <- length(dim(ret))
+    if((ldr > 1L) || (ldr == length(dim(x))))
+        class(ret) <- "table"
+    ret
+}    
diff -Nru r-base-3.2.3/src/library/base/R/tapply.R r-base-3.3.1/src/library/base/R/tapply.R
--- r-base-3.2.3/src/library/base/R/tapply.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/tapply.R	2016-03-16 23:03:52.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/tapply.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,27 +20,29 @@
 {
     FUN <- if (!is.null(FUN)) match.fun(FUN)
     if (!is.list(INDEX)) INDEX <- list(INDEX)
-    nI <- length(INDEX)
+    INDEX <- lapply(INDEX, as.factor)
+    nI <- length(INDEX)  # now, 'INDEX' is not classed
     if (!nI) stop("'INDEX' is of length zero")
-    namelist <- vector("list", nI)
-    names(namelist) <- names(INDEX)
-    extent <- integer(nI)
-    nx <- length(X)
-    one <- 1L
-    group <- rep.int(one, nx) #- to contain the splitting vector
-    ngroup <- one
-    for (i in seq_along(INDEX)) {
-	index <- as.factor(INDEX[[i]])
-	if (length(index) != nx)
-	    stop("arguments must have same length")
-	namelist[[i]] <- levels(index)#- all of them, yes !
-	extent[i] <- nlevels(index)
-	group <- group + ngroup * (as.integer(index) - one)
-	ngroup <- ngroup * nlevels(index)
-    }
+    if (!all(lengths(INDEX) == length(X)))
+        stop("arguments must have same length")
+    namelist <- lapply(INDEX, levels)#- all of them, yes !
+    extent <- lengths(namelist, use.names = FALSE)
+    cumextent <- cumprod(extent)
+    if (cumextent[nI] > .Machine$integer.max)
+        stop("total number of levels >= 2^31")
+    storage.mode(cumextent) <- "integer"
+    ngroup <- cumextent[nI]
+    group <- as.integer(INDEX[[1L]]) #- to contain the splitting vector
+    if (nI > 1L)
+        for (i in 2L:nI)
+           group <- group + cumextent[i - 1L] * (as.integer(INDEX[[i]]) - 1L)
     if (is.null(FUN)) return(group)
-    ans <- lapply(X = split(X, group), FUN = FUN, ...)
-    index <- as.integer(names(ans))
+    levels(group) <- as.character(seq_len(ngroup))
+    class(group) <- "factor"
+    ans <- split(X, group) # use generic, e.g. for 'Date'
+    names(ans) <- NULL
+    index <- as.logical(lengths(ans))  # equivalently, lengths(ans) > 0L
+    ans <- lapply(X = ans[index], FUN = FUN, ...)
     if (simplify && all(lengths(ans) == 1L)) {
 	ansmat <- array(dim = extent, dimnames = namelist)
 	ans <- unlist(ans, recursive = FALSE)
@@ -48,14 +50,8 @@
 	ansmat <- array(vector("list", prod(extent)),
 			dim = extent, dimnames = namelist)
     }
-    if(length(index)) {
-        names(ans) <- NULL
-        ansmat[index] <- ans
+    if(length(ans)) {
+	ansmat[index] <- ans
     }
     ansmat
 }
-
-
-
-
-
diff -Nru r-base-3.2.3/src/library/base/R/traceback.R r-base-3.3.1/src/library/base/R/traceback.R
--- r-base-3.2.3/src/library/base/R/traceback.R	2015-10-26 23:15:04.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/traceback.R	2016-03-16 23:03:48.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/traceback.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,14 +16,17 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-traceback <-
-function(x = NULL, max.lines = getOption("deparse.max.lines"))
-{
+.traceback <- function(x = NULL) {
     if(is.null(x) && !is.null(x <- get0(".Traceback", envir = baseenv())))
 	{}
     else if (is.numeric(x))
     	x <- .Internal(traceback(x))
-    n <- length(x)
+    x
+}
+
+traceback <- function(x = NULL, max.lines = getOption("deparse.max.lines"))
+{
+    n <- length(x <- .traceback(x))
     if(n == 0L)
         cat(gettext("No traceback available"), "\n")
     else {
@@ -31,12 +34,12 @@
             xi <- x[[i]]
             label <- paste0(n-i+1L, ": ")
             m <- length(xi)
-            # Find source location (NULL if not available)
+            ## Find source location (NULL if not available)
             srcloc <- if (!is.null(srcref <- attr(xi, "srcref"))) {
                 srcfile <- attr(srcref, "srcfile")
                 paste0(" at ", basename(srcfile$filename), "#", srcref[1L])
             }
-            # Truncate deparsed code (destroys attributes of xi)
+            ## Truncate deparsed code (destroys attributes of xi)
             if(is.numeric(max.lines) && max.lines > 0L && max.lines < m) {
                 xi <- c(xi[seq_len(max.lines)], " ...")
                 m <- length(xi)
diff -Nru r-base-3.2.3/src/library/base/R/unix/system.unix.R r-base-3.3.1/src/library/base/R/unix/system.unix.R
--- r-base-3.2.3/src/library/base/R/unix/system.unix.R	2015-08-25 22:17:27.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/unix/system.unix.R	2016-03-16 23:03:48.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/unix/system.unix.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -65,9 +65,9 @@
     command <- paste(c(env, shQuote(command), args), collapse = " ")
 
     if(is.null(stdout)) stdout <- FALSE
-    if(is.null(stderr)) stderr <- FALSE
-
-    if (isTRUE(stderr)) {
+    if(is.null(stderr))
+	stderr <- FALSE
+    else if (isTRUE(stderr)) {
         if (!isTRUE(stdout)) warning("setting stdout = TRUE")
         stdout <- TRUE
     }
@@ -79,8 +79,8 @@
         if(length(stdout) != 1L) stop("'stdout' must be of length 1")
         if(nzchar(stdout)) {
             command <- if (identical(stdout, stderr))
-                paste(command, ">", shQuote(stdout), "2>&1")
-            else command <- paste(command, ">", shQuote(stdout))
+		paste (command, ">", shQuote(stdout), "2>&1")
+	    else paste(command, ">", shQuote(stdout))
         }
     }
     if (identical(stderr, FALSE))
diff -Nru r-base-3.2.3/src/library/base/R/utils.R r-base-3.3.1/src/library/base/R/utils.R
--- r-base-3.2.3/src/library/base/R/utils.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/utils.R	2016-03-16 23:03:51.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/utils.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-shQuote <- function(string, type = c("sh", "csh", "cmd"))
+shQuote <- function(string, type = c("sh", "csh", "cmd", "cmd2"))
 {
     cshquote <- function(x) {
         xx <- strsplit(x, "'", fixed = TRUE)[[1L]]
@@ -24,21 +24,20 @@
     }
     if(missing(type) && .Platform$OS.type == "windows") type <- "cmd"
     type <- match.arg(type)
-    if(type == "cmd") {
-        paste0('"', gsub('"', '\\\\"', string), '"')
-    } else {
-        if(!length(string)) return("")
-        has_single_quote <- grep("'", string)
-        if(!length(has_single_quote))
-            return(paste0("'", string, "'"))
-        if(type == "sh")
-            paste0('"', gsub('(["$`\\])', "\\\\\\1", string), '"')
-        else {
-            if(!length(grep("([$`])", string))) {
-                paste0('"', gsub('(["!\\])', "\\\\\\1", string), '"')
-            } else vapply(string, cshquote, "")
-        }
-    }
+    if(type == "cmd")
+	paste0('"', gsub('"', '\\\\"', string), '"')
+    else if (type == "cmd2")
+        gsub('([()%!^"<>&|])', "^\\1", string)
+    else if(!length(string))
+	""
+    else if(!any(grepl("'", string))) # has single quote
+	paste0("'", string, "'")
+    else if(type == "sh")
+	paste0('"', gsub('(["$`\\])', "\\\\\\1", string), '"')
+    else if(!any(grepl("([$`])", string)))
+	paste0('"', gsub('(["!\\])' , "\\\\\\1", string), '"')
+    else
+	vapply(string, cshquote, "")
 }
 
 .standard_regexps <-
diff -Nru r-base-3.2.3/src/library/base/R/version.R r-base-3.3.1/src/library/base/R/version.R
--- r-base-3.2.3/src/library/base/R/version.R	2015-08-25 22:17:35.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/version.R	2016-03-16 23:03:51.000000000 +0000
@@ -134,19 +134,11 @@
 .encode_numeric_version <-
 function(x)
 {
-    strings <- function(char, n) {
-        vapply(Map(rep.int,
-                   rep_len(char, length(n)),
-                   n,
-                   USE.NAMES = FALSE),
-               paste, "", collapse = "")
-    }
-
     strlpad <- function(x, char, width)
-        paste0(strings(char, width - nchar(x)), x)
+        paste0(strrep(char, width - nchar(x)), x)
 
     strrpad <- function(x, char, width)
-        paste0(x, strings(char, width - nchar(x)))
+        paste0(x, strrep(char, width - nchar(x)))
 
     if(!is.numeric_version(x)) stop("wrong class")
 
diff -Nru r-base-3.2.3/src/library/base/R/warnings.R r-base-3.3.1/src/library/base/R/warnings.R
--- r-base-3.2.3/src/library/base/R/warnings.R	2015-08-25 22:17:36.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/warnings.R	2016-03-16 23:03:52.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/base/R/warnings.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -57,3 +57,21 @@
     }
     invisible(x)
 }
+
+##' @title Warn about extraneous arguments in the "..."	 (of its caller).
+##' @author Martin Maechler, June 2012, May 2014
+##' @param ...
+##' @param which.call passed to sys.call().  A caller may use -2 if the message should
+##' mention *its* caller
+##' @param allowed not yet implemented: character vector of *named* elements in '...'
+##' which are \dQuote{allowed} and hence not warned about
+chkDots <- function(..., which.call = -1, allowed = character(0)) {
+    if(nx <- length(list(...))) ## <- or  if(missing(...)) ?
+	warning(sprintf(ngettext(nx,
+				 "In %s :\n extra argument %s will be disregarded",
+				 "In %s :\n extra arguments %s will be disregarded"),
+			paste(deparse(sys.call(which.call), control=c()), collapse="\n"),
+			## sub(")$", '', sub("^list\\(", '', deparse(list(...), control=c())))
+			paste(sQuote(names(list(...))), collapse = ", ")),
+		call. = FALSE, domain=NA)
+}
diff -Nru r-base-3.2.3/src/library/base/R/windows/system.R r-base-3.3.1/src/library/base/R/windows/system.R
--- r-base-3.2.3/src/library/base/R/windows/system.R	2015-08-25 22:17:22.000000000 +0000
+++ r-base-3.3.1/src/library/base/R/windows/system.R	2016-05-31 22:15:04.000000000 +0000
@@ -74,7 +74,10 @@
 
     if(is.null(stdout)) stdout <- FALSE
     if(is.null(stderr)) stderr <- FALSE
-
+    
+    if(length(stdout) != 1L) stop("'stdout' must be of length 1")
+    if(length(stderr) != 1L) stop("'stderr' must be of length 1")
+    
     if (!is.null(input)) {
         f <- tempfile()
         on.exit(unlink(f))
diff -Nru r-base-3.2.3/src/library/compiler/man/compile.Rd r-base-3.3.1/src/library/compiler/man/compile.Rd
--- r-base-3.2.3/src/library/compiler/man/compile.Rd	2015-08-25 22:17:21.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/man/compile.Rd	2016-03-16 23:03:45.000000000 +0000
@@ -72,9 +72,11 @@
   is 2, then in addition closures are also compiled before they are
   duplicated (useful for some packages, like \code{lattice}, that store
   closures in lists).  If \code{enable} is 3 then in addition all loops
-  are compiled before they are executed.  JIT can also be enabled by
-  starting \R with the environment variable \code{R_ENABLE_JIT} set to
-  one of these values.
+  are compiled before they are executed.  JIT level 3 requires
+  optimization level 2 or 3. JIT can also be enabled by starting \R with
+  the environment variable \code{R_ENABLE_JIT} set to one of these
+  values. Calling \code{enableJIT} with a negative argument returns the
+  current JIT level.
 
   \code{compilePKGS} enables or disables compiling packages when they
   are installed.  This requires that the package use lazy loading as
diff -Nru r-base-3.2.3/src/library/compiler/noweb/compiler.nw r-base-3.3.1/src/library/compiler/noweb/compiler.nw
--- r-base-3.2.3/src/library/compiler/noweb/compiler.nw	2015-08-25 22:17:21.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/noweb/compiler.nw	2016-03-16 23:03:45.000000000 +0000
@@ -241,7 +241,7 @@
 in the constant pool of a symbol. The opcode for this instruction is
 [[GETVAR.OP]].  The instruction retrieves the symbol from the constant
 pool, looks up its value in the current environment, and pushes the
-value on the stack.  If [[sym]] is a variable with value a symbol,
+value on the stack.  If [[sym]] is a variable with value of a symbol,
 then code to enter the symbol in the constant pool and emit an
 instruction to get its value would be
 <<example of emitting a [[GETVAR]] instruction>>=
@@ -267,7 +267,7 @@
 then the result is compiled as a constant.  Otherwise, the standard
 code generation process is used.
 %% **** comment on alternative of doing constant folding as an
-%% **** optimization on the butecode or an intermediate representation?
+%% **** optimization on the bytecode or an intermediate representation?
 
 In the interpreter there are four types of objects that are not
 treated as constants, i.e. as evaluating to themselves: function calls
@@ -352,14 +352,12 @@
 %% **** check out if small integers is worth doing.
 %% **** mention peephole optimization as alternative
 
-Ideally the implementation should be able to mark the values in the
-constant pool of a byte code object as read-only by setting the
-[[NAMED]] field to 2, but experience in testing shows that there are
-several packages in the wild that assume that an expression [[TRUE]],
-for example, appearing in code will result in a freshly allocated
-value that can be freely modified in [[.C]] calls. It would be good to
-educate users not to do this, but for now the implementation
-duplicates all values as they are retrieved from the constant pool.
+The implementation marks values in the constant pool as read-only after they
+are loaded, by setting the [[NAMED]] field to 2. In the past, all values
+were duplicated as they were retrieved from the constant pool as a
+precaution against bad package code: several packages in the wild assumed
+that an expression [[TRUE]], for example, appearing in code would result in a
+freshly allocated value that could be freely modified in [[.C]] calls.
 
 
 \subsection{Compiling variable references}
@@ -450,8 +448,6 @@
 %% **** Neal's em by about 10% (just lookup, not assignment -- with
 %% **** assignment should be a bit better)
 
-%% **** Avoid using ftype variable in bcEval. Could just look at the
-%% **** fun on the stack, or use the intstack instead.
 %% **** Is it really necessary for bcEval to save/restore stack tops?
 %% **** Shouldn't that happen automatically?
 %% **** Is it possible to have closure calling stay in the same bc?
@@ -874,7 +870,7 @@
 Once code generation is complete the symbolic labels in the code
 stream need to be converted to numerical offset values.  This is done
 by [[patchlabels]].  Labels can appear directly in the instruction
-stream os in lists that have been placed in the instruction stream;
+stream and in lists that have been placed in the instruction stream;
 this is used for the [[SWITCH]] instruction.
 <<label management interface>>=
 patchlabels <- function() {
@@ -1219,6 +1215,11 @@
                    cntxt)
 @ %def notifyMultipleSwitchDefaults
 
+<<[[notifyNoSwitchcases]] function>>=
+notifyNoSwitchcases <- function(cntxt)
+    if (! suppressAll(cntxt))
+        cntxt$warn(gettext("'switch' with no alternatives"), cntxt)
+@ %def notifyNoSwitchcases
 
 \section{Compilation environments}
 \label{sec:environments}
@@ -1782,9 +1783,11 @@
 The function [[getInlineInfo]] implements the optimization rules
 described at the beginning of this section.
 <<[[getInlineInfo]] function>>=
+noInlineSymbols <- c("standardGeneric")
+
 getInlineInfo <- function(name, cntxt) {
     optimize <- cntxt$optimize
-    if (optimize > 0) {
+    if (optimize > 0 && ! (name %in% noInlineSymbols)) {
         info <- findCenvVar(name, cntxt$env)
         if (is.null(info))
             NULL
@@ -3548,13 +3551,17 @@
 The first step in processing the [[switch]] expression is to extract
 the selector expression [[expr]] and the case expressions, to identify
 which, if any, of the cases are empty, and to extract the names of the
-cases as [[nm]].  If there is only one case and that case is not named
-then setting [[nm = ""]] allows this situation to be processed by code
-used when names are present.
+cases as [[nm]].  A warning is issued if there are no cases.  If there
+is only one case and that case is not named then setting [[nm = ""]]
+allows this situation to be processed by code used when names are
+present.
 <<extract the [[switch]] expression components>>=
 expr <- e[[2]]
 cases <-e[-c(1, 2)]
 
+if (is.null(cases))
+    notifyNoSwitchcases(cntxt)
+
 miss <- missingArgs(cases)
 nm <- names(cases)
 
@@ -3663,7 +3670,7 @@
 @ %def
 
 The switch instruction takes the selector off the stack and four
-operands form the instruction stream: the call index, an index for the
+operands from the instruction stream: the call index, an index for the
 names, or [[NULL]] if there are none, and indices for the labels for a
 character selector and for a numeric selector.  At this point lists of
 labels are placed in the instruction buffer.  At code extraction time
@@ -4293,7 +4300,7 @@
         TRUE
     }
     else FALSE
-}, "methods")
+})
 @ 
 
 
@@ -4629,7 +4636,7 @@
             val <- asS4(val)
         val
     }
-    else if (typeof(f) == "builtin" || type == "special")
+    else if (type == "builtin" || type == "special")
         f
     else stop("cannot compile a non-function")
 }
@@ -4643,6 +4650,12 @@
     tryCatch(cmpfun(f), error = function(e) f)
 @ %def tryCmpfun
 
+A similar usility for expressions for use in JIT compilation of loops:
+<<[[tryCompile]] function>>=
+tryCompile <- function(e, ...)
+    tryCatch(compile(e, ...), error = function(err) e)
+@ %def tryCompile
+
 
 \subsection{Compiling and loading files}
 A file can be compiled with [[cmpfile]] and loaded with [[loadcmp]].
@@ -4798,6 +4811,7 @@
             stop(gettextf("'%s' is not a valid compiler option", n),
                  domain = NA)
     old <- list()
+    newOptions <- as.list(compilerOptions) # copy options
     for (n in nm) {
         op <- options[[n]]
         switch(n,
@@ -4806,14 +4820,14 @@
                    if (length(op) == 1 && 0 <= op && op <= 3) {
                        old <- c(old, list(optimize =
                                           compilerOptions$optimize))
-                       compilerOptions$optimize <- op
+                       newOptions$optimize <- op
                    }
                },
                suppressAll = {
                    if (identical(op, TRUE) || identical(op, FALSE)) {
                        old <- c(old, list(suppressAll =
                                           compilerOptions$suppressAll))
-                       compilerOptions$suppressAll <- op
+                       newOptions$suppressAll <- op
                    }
                },
                suppressUndefined = {
@@ -4821,10 +4835,14 @@
                        is.character(op)) {
                        old <- c(old, list(suppressUndefined =
                                           compilerOptions$suppressUndefined))
-                       compilerOptions$suppressUndefined <- op
+                       newOptions$suppressUndefined <- op
                    }
                })
     }
+    jitEnabled <- enableJIT(-1)
+    if (checkCompilerOptions(jitEnabled, newOptions))
+        for(n in names(newOptions)) # commit the new options
+            assign(n, newOptions[[n]], compilerOptions)
     invisible(old)
 }
 @ %def
@@ -4850,6 +4868,27 @@
 }
 @ %def .onLoad
 
+When [[enableJIT]] is set to 3, loops should be compiled before executing. 
+However, if the [[optimize]] option is set to 0 or 1, a compiled loop will
+call to the same primitive function as is used by the AST interpretter (e.g. 
+[[do_for]]), and the compilation would run into infinite recursion. 
+[[checkCompilerOptions]] will detect invalid combinations of [[enableJIT]]
+and [[optimize]] and report a warning.
+%% **** could also change the interface and atomically set enableJIT and optimize
+<<[[checkCompilerOptions]] function>>=
+checkCompilerOptions <- function(jitEnabled, options = NULL) {
+    optimize <- getCompilerOption("optimize", options)
+    if (jitEnabled <= 2 || optimize >= 2)
+        TRUE
+    else {
+        stop(gettextf(
+            "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2",
+            optimize, jitEnabled))
+        FALSE
+    }
+}
+@ %def checkCompilerOptions
+
 
 \subsection{Disassembler}
 A minimal disassembler is provided by [[disassemble]]. This is
@@ -5255,6 +5294,7 @@
 frameTypes <- function(env) {
     top <- topenv(env)
     empty <- emptyenv()
+    base <- baseenv()
     <<find the number [[nl]] of local frames>>
     <<find the number [[nn]] of namespace frames>>
     <<find the number [[ng]] of global frames>>
@@ -5266,6 +5306,8 @@
 <<find the number [[nl]] of local frames>>=
 nl <- 0
 while (! identical(env, top)) {
+    if (isNamespace(env))
+        stop("namespace found within local environments")
     env <- parent.env(env)
     nl <- nl + 1
     if (identical(env, empty))
@@ -5278,6 +5320,11 @@
 nn <- 0
 if (isNamespace(env)) {
     while (! identical(env, .GlobalEnv)) {
+        if (!isNamespace(env)) {
+            name <- attr(env, "name")
+            if (!is.character(name) || !startsWith(name, "imports:"))
+		stop("non-namespace found within namespace environments")
+        }
         env <- parent.env(env)
         nn <- nn + 1
         if (identical(env, empty))
@@ -5291,6 +5338,8 @@
 <<find the number [[ng]] of global frames>>=
 ng <- 0
 while (! identical(env, empty)) {
+    if (isNamespace(env))
+	stop("namespace found within global environments")
     env <- parent.env(env)
     ng <- ng + 1
 }
@@ -5440,7 +5489,7 @@
     expr
     .Internal(bcprofstop())
     val <- structure(.Internal(bcprofcounts()),
-                     names = compiler:::Opcodes.names)
+                     names = Opcodes.names)
     hits <- sort(val[val > 0], decreasing = TRUE)
     pct <- round(100 * hits / sum(hits), 1)
     data.frame(hits = hits, pct = pct)
@@ -6195,6 +6244,8 @@
 
 <<[[notifyMultipleSwitchDefaults]] function>>
 
+<<[[notifyNoSwitchcases]] function>>
+
 
 ##
 ## Compiler interface
@@ -6206,6 +6257,8 @@
 
 <<[[tryCmpfun]] function>>
 
+<<[[tryCompile]] function>>
+
 <<[[cmpframe]] function>>
 
 <<[[cmplib]] function>>
@@ -6222,6 +6275,8 @@
 
 <<[[.onLoad]] function>>
 
+<<[[checkCompilerOptions]] function>>
+
 
 ##
 ## Disassembler
diff -Nru r-base-3.2.3/src/library/compiler/po/R-compiler.pot r-base-3.3.1/src/library/compiler/po/R-compiler.pot
--- r-base-3.2.3/src/library/compiler/po/R-compiler.pot	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-compiler.pot	2016-04-27 22:15:31.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: compiler 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,9 +10,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr ""
 
+msgid "non-namespace found within namespace environments"
+msgstr ""
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr ""
 
@@ -50,7 +58,7 @@
 msgid "invalid function in complex assignment"
 msgstr ""
 
-msgid "%s is not a registered math1 function"
+msgid "is not a registered math1 function"
 msgstr ""
 
 msgid "missing arguments are not allowed"
@@ -74,6 +82,9 @@
 msgid "more than one default provided in switch() call"
 msgstr ""
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr ""
 
@@ -101,6 +112,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr ""
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/compiler/po/R-da.po r-base-3.3.1/src/library/compiler/po/R-da.po
--- r-base-3.2.3/src/library/compiler/po/R-da.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-da.po	2016-04-27 22:15:31.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R /3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-11-29 17:20+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,9 +13,19 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr "ikke et korrekt evuleringsmiljø"
 
+#, fuzzy
+msgid "non-namespace found within namespace environments"
+msgstr "'ns' skal være et navnerum eller et importmiljø for navnerum"
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr "'ns' skal være et navnerum eller et importmiljø for navnerum"
 
@@ -52,7 +62,7 @@
 msgid "invalid function in complex assignment"
 msgstr "ugyldig funktion i kompleks tildeling"
 
-msgid "%s is not a registered math1 function"
+msgid "is not a registered math1 function"
 msgstr ""
 
 msgid "missing arguments are not allowed"
@@ -77,6 +87,9 @@
 msgid "more than one default provided in switch() call"
 msgstr "mere end en standard tilbudt i kontaktkald"
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr "kan ikke kompilere en ikkefunktion"
 
@@ -104,6 +117,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr "'%s' er ikke et gyldigt kompilertilvalg"
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr "funktion er ikke kompileret"
 
diff -Nru r-base-3.2.3/src/library/compiler/po/R-de.po r-base-3.3.1/src/library/compiler/po/R-de.po
--- r-base-3.2.3/src/library/compiler/po/R-de.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-de.po	2016-04-27 22:15:31.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-20 16:00+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-07 10:44+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsuhh.de>\n"
 "Language-Team: R-core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -30,7 +30,7 @@
 msgstr "kann literale Promises nicht konstant falten"
 
 msgid "cannot constant fold literal bytecode objects"
-msgstr "kann literale Bytecodeobjecte nicht konstant falten"
+msgstr "kann literale Bytecode-Objekte nicht konstant falten"
 
 msgid "no offset recorded for label \"%s\""
 msgstr "kein Offset aufgezeichnet für Label \"%s\""
@@ -39,7 +39,7 @@
 msgstr "kann Bytecode Literale im Code nicht kompilieren"
 
 msgid "cannot compile promise literals in code"
-msgstr "kann literatle promises nicht in Programm kompilieren"
+msgstr "kann literale promises nicht in Programm kompilieren"
 
 msgid "possible error in '%s': %s"
 msgstr "möglicher Fehler in '%s': %s"
@@ -56,9 +56,8 @@
 msgid "invalid function in complex assignment"
 msgstr "unzulässige Funktion in komplexer Zuweisung"
 
-#, fuzzy
 msgid "%s is not a registered math1 function"
-msgstr "ist keine regisitrierte math1 Funktion"
+msgstr "%S ist keine registrierte math1 Funktion"
 
 msgid "missing arguments are not allowed"
 msgstr "fehlende Argumente sind nicht zugelassen"
@@ -106,7 +105,7 @@
 msgstr "Datei '%s' existiert nicht"
 
 msgid "'%s' is not a valid compiler option"
-msgstr "'%s' ist keine zulässige Kompileroption"
+msgstr "'%s' ist keine zulässige Compiler-Option"
 
 msgid "function is not compiled"
 msgstr "Funktion ist nicht kompiliert"
diff -Nru r-base-3.2.3/src/library/compiler/po/R-fr.po r-base-3.3.1/src/library/compiler/po/R-fr.po
--- r-base-3.2.3/src/library/compiler/po/R-fr.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-fr.po	2016-04-27 22:15:31.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2013-03-18 22:00+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -18,9 +18,21 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.5\n"
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr "ceci n'est pas un environnement adéquat pour l'évaluation"
 
+#, fuzzy
+msgid "non-namespace found within namespace environments"
+msgstr ""
+"'ns' doit être être un espace de noms (namespace) ou un environnement "
+"d'importation d'espace de noms"
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr ""
 "'ns' doit être être un espace de noms (namespace) ou un environnement "
@@ -63,7 +75,7 @@
 msgid "invalid function in complex assignment"
 msgstr "function incorrecte dans une affectation complexe"
 
-msgid "%s is not a registered math1 function"
+msgid "is not a registered math1 function"
 msgstr ""
 
 msgid "missing arguments are not allowed"
@@ -87,6 +99,9 @@
 msgid "more than one default provided in switch() call"
 msgstr "plus d'une valeur par défaut fournie dans une construction switch()"
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr "impossible de compiler autre chose qu'une fonction"
 
@@ -114,6 +129,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr "'%s' n'est pas une option de compilation reconnue"
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr "la fonction n'est pas compilée"
 
diff -Nru r-base-3.2.3/src/library/compiler/po/R-ja.po r-base-3.3.1/src/library/compiler/po/R-ja.po
--- r-base-3.2.3/src/library/compiler/po/R-ja.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-ja.po	2016-04-27 22:15:31.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 14:15+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -14,9 +14,21 @@
 "X-Generator: Pootle 2.5.1.1 \n"
 "X-POOTLE-MTIME: 1427433312.000000 \n"
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr " 評価環境��切���り��ん "
 
+#, fuzzy
+msgid "non-namespace found within namespace environments"
+msgstr ""
+" 'ns' ��ームスペース���る��環境をイン�ート���ームスペース���れ"
+"��り��ん "
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr ""
 " 'ns' ��ームスペース���る��環境をイン�ート���ームスペース���れ"
@@ -55,7 +67,8 @@
 msgid "invalid function in complex assignment"
 msgstr " complex �付値��正�関数��り�� "
 
-msgid "%s is not a registered math1 function"
+#, fuzzy
+msgid "is not a registered math1 function"
 msgstr " %s �登録�れ� math1 関数���り��ん "
 
 msgid "missing arguments are not allowed"
@@ -79,6 +92,9 @@
 msgid "more than one default provided in switch() call"
 msgstr " switch() 呼�出��中��デフォルト�択肢� 2 �以上�り�� "
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr " �関数�コンパイル����ん "
 
@@ -106,6 +122,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr " '%s' �有効�コンパイルオプション���り��ん "
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr " 関数�コンパイル�れ��ん "
 
diff -Nru r-base-3.2.3/src/library/compiler/po/R-ko.po r-base-3.3.1/src/library/compiler/po/R-ko.po
--- r-base-3.2.3/src/library/compiler/po/R-ko.po	2015-03-31 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-ko.po	2016-04-27 22:15:31.000000000 +0000
@@ -1,34 +1,47 @@
 # Korean translation for R compiler package
-# src/library/compiler/po/R-ko.po
-# 
-# Copyright (C) 1995-2015 The R Core Team
+# ./compiler/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R compiler package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 20:05\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr "올바른 �밸류��션 �바�런먼트가 아닙니다"
 
+msgid "non-namespace found within namespace environments"
+msgstr ""
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
-msgstr "'ns'는 반드시 네임스페�스 �는 환경�  불러오는 네임스페�스�어야 합니다"
+msgstr ""
+"'ns'는 반드시 네임스페�스 �는 환경�  불러오는 네임스페�스�어야 합니다"
 
 msgid "bad assignment: %s"
 msgstr ""
@@ -63,7 +76,7 @@
 msgid "invalid function in complex assignment"
 msgstr ""
 
-msgid "%s is not a registered math1 function"
+msgid "is not a registered math1 function"
 msgstr ""
 
 msgid "missing arguments are not allowed"
@@ -87,6 +100,9 @@
 msgid "more than one default provided in switch() call"
 msgstr "switch() 함수호출시 주어진 기본값� 하나��입니다"
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr "함수가 아닌 것� 컴파� 할 수 없습니다"
 
@@ -114,6 +130,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr "'%s'� 선�가능한 컴파�러가 아닙니다"
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr "함수가 컴파� �지 않았습니다"
 
diff -Nru r-base-3.2.3/src/library/compiler/po/R-pl.po r-base-3.3.1/src/library/compiler/po/R-pl.po
--- r-base-3.2.3/src/library/compiler/po/R-pl.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-pl.po	2016-04-27 22:15:31.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,112 +13,220 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "not a proper evaluation environment"
-msgstr ""
-"dostarczony argument 'env' nie jest odpowiednim środowiskiem obliczeniowym"
+#. R/cmp.R: gettextf("'%s' is not a valid compiler option", n)
+#: R/cmp.R:0
+msgid "'%s' is not a valid compiler option"
+msgstr "'%s' nie jest prawidłową opcją kompilatora"
+
+#. R/cmp.R: stop("'env' must be a top level environment")
+#: R/cmp.R:0
+msgid "'env' must be a top level environment"
+msgstr "'env' musi być środowiskiem o najwyższym poziomie"
 
+#. R/cmp.R: stop("'ns' must be a namespace or a namespace imports environment")
+#: R/cmp.R:0
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr ""
 "'ns' musi być przestrzenią nazw lub przestrzenią nazw importującą środowisko"
 
+#. R/cmp.R: gettext("'switch' with no alternatives")
+#: R/cmp.R:0
+msgid "'switch' with no alternatives"
+msgstr "funkcja 'switch()' bez żadnych alternatyw"
+
+#. R/cmp.R: stop("bad assignment 1")
+#: R/cmp.R:0
+msgid "bad assignment 1"
+msgstr "złe przypisanie 1"
+
+#. R/cmp.R: stop("bad assignment 2")
+#: R/cmp.R:0
+msgid "bad assignment 2"
+msgstr "złe przypisanie 2"
+
+#. R/cmp.R: gettextf("bad assignment: %s", pasteExpr(e))
+#. R/cmp.R: gettextf("bad assignment: %s", pasteExpr(e))
+#. R/cmp.R: gettextf("bad assignment: %s", pasteExpr(e))
+#. R/cmp.R: gettextf("bad assignment: %s", pasteExpr(e))
+#: R/cmp.R:0
 msgid "bad assignment: %s"
 msgstr "złe przypisanie: %s"
 
-msgid "cannot constant fold literal promises"
-msgstr "nie można ukryć stałych z dosłownymi obietnicami"
-
-msgid "cannot constant fold literal bytecode objects"
-msgstr "nie można ukryć stałych dosłownych obiektów kodu bajtowego"
+#. R/cmp.R: gettext("bad namespace import frame")
+#: R/cmp.R:0
+msgid "bad namespace import frame"
+msgstr "zła przestrzeń nazw importowanej ramki"
 
-msgid "no offset recorded for label \"%s\""
-msgstr "nie zarejestrowano przesunięcia dla etykiety \"%s\""
+#. R/cmp.R: stop("cannot compile a non-function")
+#: R/cmp.R:0
+msgid "cannot compile a non-function"
+msgstr "nie można skompilować nie-funkcji"
 
+#. R/cmp.R: gettext("cannot compile byte code literals in code")
+#. R/cmp.R: gettext("cannot compile byte code literals in code")
+#. R/cmp.R: gettext("cannot compile byte code literals in code")
+#: R/cmp.R:0
 msgid "cannot compile byte code literals in code"
 msgstr "nie można skompilować dosłownych bajtów kodu w kod"
 
+#. R/cmp.R: gettext("cannot compile promise literals in code")
+#. R/cmp.R: gettext("cannot compile promise literals in code")
+#. R/cmp.R: gettext("cannot compile promise literals in code")
+#: R/cmp.R:0
 msgid "cannot compile promise literals in code"
 msgstr "nie można skompilować dosłownych obietnic w kod"
 
-msgid "possible error in '%s': %s"
-msgstr "prawdopodobny błąd w '%s': %s"
-
-msgid "bad namespace import frame"
-msgstr "zła przestrzeń nazw importowanej ramki"
-
-msgid "bad assignment 1"
-msgstr "złe przypisanie 1"
+#. R/cmp.R: gettext("cannot compile this expression")
+#. R/cmp.R: gettext("cannot compile this expression")
+#. R/cmp.R: gettext("cannot compile this expression")
+#. R/cmp.R: gettext("cannot compile this expression")
+#: R/cmp.R:0
+msgid "cannot compile this expression"
+msgstr "nie można skompilować tego wyrażenia"
 
-msgid "bad assignment 2"
-msgstr "złe przypisanie 2"
+#. R/cmp.R: gettext("cannot constant fold literal bytecode objects")
+#: R/cmp.R:0
+msgid "cannot constant fold literal bytecode objects"
+msgstr "nie można ukryć stałych dosłownych obiektów kodu bajtowego"
 
-msgid "invalid function in complex assignment"
-msgstr "niepoprawna funkcja w zespolonym przypisaniu"
+#. R/cmp.R: gettext("cannot constant fold literal promises")
+#: R/cmp.R:0
+msgid "cannot constant fold literal promises"
+msgstr "nie można ukryć stałych z dosłownymi obietnicami"
 
-msgid "%s is not a registered math1 function"
-msgstr "%s nie jest zarejestrowanÄ… funkcjÄ… 'math1'"
+#. R/cmp.R: gettextf("compiling '%s'", f)
+#: R/cmp.R:0
+msgid "compiling '%s'"
+msgstr "kompilowanie '%s'"
 
-msgid "missing arguments are not allowed"
-msgstr "brakujÄ…ce argumenty nie sÄ… dozwolone"
+#. R/cmp.R: gettext("done")
+#. R/cmp.R: gettext("done")
+#: R/cmp.R:0
+msgid "done"
+msgstr "wykonano"
 
+#. R/cmp.R: stop("empty alternative in numeric switch")
+#: R/cmp.R:0
 msgid "empty alternative in numeric switch"
 msgstr "pusta alternatywa w numerycznej instrukcji 'switch'"
 
-msgid "no visible global function definition for '%s'"
-msgstr "brak widocznej globalnej definicji funkcji dla '%s'"
+#. R/cmp.R: warning("empty input file; no output written")
+#: R/cmp.R:0
+msgid "empty input file; no output written"
+msgstr "pusty plik wejściowy; brak zapisanego wyjścia"
 
-msgid "no visible binding for global variable '%s'"
-msgstr "brak widocznego wiÄ…zania dla zmiennej globalnej '%s'"
+#. R/cmp.R: gettextf("file '%s' does not exist", file)
+#: R/cmp.R:0
+msgid "file '%s' does not exist"
+msgstr "plik '%s' nie istnieje"
 
-msgid "no visible binding for '<<-' assignment to '%s'"
-msgstr "brak widocznego wiÄ…zania dla przypisania '<<-' do '%s'"
+#. R/cmp.R: stop("function is not compiled")
+#: R/cmp.R:0
+msgid "function is not compiled"
+msgstr "funkcja nie jest skompilowana"
 
-msgid "wrong number of arguments to '%s'"
-msgstr "błędna liczba argumentów w '%s'"
+#. R/cmp.R: stop("input and output file names are the same")
+#: R/cmp.R:0
+msgid "input and output file names are the same"
+msgstr "nazwy plików wejścia i wyjścia są takie same"
 
+#. R/cmp.R: gettextf("invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2",     optimize, jitEnabled)
+#: R/cmp.R:0
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+"niepoprawne opcje kompilatora: 'optimize(==%d)<2' oraz 'jitEnabled(==%d)>2'"
+
+#. R/cmp.R: gettext("invalid function in complex assignment")
+#. R/cmp.R: gettext("invalid function in complex assignment")
+#: R/cmp.R:0
+msgid "invalid function in complex assignment"
+msgstr "niepoprawna funkcja w zespolonym przypisaniu"
+
+#. R/cmp.R: stop(sQuote(name), "is not a registered math1 function")
+#: R/cmp.R:0
+msgid "is not a registered math1 function"
+msgstr ": to nie jest zarejestrowana funkcja math1"
+
+#. R/cmp.R: gettext("missing arguments are not allowed")
+#: R/cmp.R:0
+msgid "missing arguments are not allowed"
+msgstr "brakujÄ…ce argumenty nie sÄ… dozwolone"
+
+#. R/cmp.R: gettext("more than one default provided in switch() call")
+#: R/cmp.R:0
 msgid "more than one default provided in switch() call"
 msgstr "więcej niż jedna wartość domyślna dostarczona w wywołaniu 'switch()'"
 
-msgid "cannot compile a non-function"
-msgstr "nie można skompilować nie-funkcji"
-
-msgid "compiling '%s'"
-msgstr "kompilowanie '%s'"
+#. R/cmp.R: stop("namespace found within global environments")
+#: R/cmp.R:0
+msgid "namespace found within global environments"
+msgstr "przestrzeń nazw znaleziona wewnątrz globalnych środowisk"
+
+#. R/cmp.R: stop("namespace found within local environments")
+#: R/cmp.R:0
+msgid "namespace found within local environments"
+msgstr "przestrzeń nazw znaleziona wewnątrz lokalnych środowisk"
 
-msgid "saving to file \"%s\" ..."
-msgstr "zapisywanie do pliku '%s' ..."
+#. R/cmp.R: gettextf("no offset recorded for label \"%s\"", lbl)
+#: R/cmp.R:0
+msgid "no offset recorded for label \"%s\""
+msgstr "nie zarejestrowano przesunięcia dla etykiety \"%s\""
 
-msgid "done"
-msgstr "wykonano"
+#. R/cmp.R: gettextf("no visible binding for '<<-' assignment to '%s'", as.character(symbol))
+#: R/cmp.R:0
+msgid "no visible binding for '<<-' assignment to '%s'"
+msgstr "brak widocznego wiÄ…zania dla przypisania '<<-' do '%s'"
 
-msgid "'env' must be a top level environment"
-msgstr "'env' musi być środowiskiem o najwyższym poziomie"
+#. R/cmp.R: gettextf("no visible binding for global variable '%s'", as.character(var))
+#: R/cmp.R:0
+msgid "no visible binding for global variable '%s'"
+msgstr "brak widocznego wiÄ…zania dla zmiennej globalnej '%s'"
 
-msgid "input and output file names are the same"
-msgstr "nazwy plików wejścia i wyjścia są takie same"
+#. R/cmp.R: gettextf("no visible global function definition for '%s'", as.character(fun))
+#: R/cmp.R:0
+msgid "no visible global function definition for '%s'"
+msgstr "brak widocznej globalnej definicji funkcji dla '%s'"
 
-msgid "empty input file; no output written"
-msgstr "pusty plik wejściowy; brak zapisanego wyjścia"
+#. R/cmp.R: stop("non-namespace found within namespace environments")
+#: R/cmp.R:0
+msgid "non-namespace found within namespace environments"
+msgstr ""
+"obiekt niebędący przestrzenią nazw znaleziony wewnątrz środowisk przestrzeni "
+"nazw"
 
-msgid "file '%s' does not exist"
-msgstr "plik '%s' nie istnieje"
+#. R/cmp.R: stop("not a proper evaluation environment")
+#. R/cmp.R: stop("not a proper evaluation environment")
+#: R/cmp.R:0
+msgid "not a proper evaluation environment"
+msgstr ""
+"dostarczony argument 'env' nie jest odpowiednim środowiskiem obliczeniowym"
 
-msgid "'%s' is not a valid compiler option"
-msgstr "'%s' nie jest prawidłową opcją kompilatora"
+#. R/cmp.R: gettextf("possible error in '%s': %s", deparse(call, 20)[1],     msg)
+#: R/cmp.R:0
+msgid "possible error in '%s': %s"
+msgstr "prawdopodobny błąd w '%s': %s"
 
-msgid "function is not compiled"
-msgstr "funkcja nie jest skompilowana"
+#. R/cmp.R: gettextf("saving to file \"%s\" ... ", file)
+#. R/cmp.R: gettextf("saving to file \"%s\" ... ", outfile)
+#: R/cmp.R:0
+msgid "saving to file \"%s\" ..."
+msgstr "zapisywanie do pliku '%s' ..."
 
-msgid "cannot compile this expression"
-msgstr "nie można skompilować tego wyrażenia"
+#. R/cmp.R: gettextf("wrong number of arguments to '%s'", as.character(fun))
+#: R/cmp.R:0
+msgid "wrong number of arguments to '%s'"
+msgstr "błędna liczba argumentów w '%s'"
 
+#. R/cmp.R: ngettext(sum(rdsf), "local assignment to syntactic function: ",     "local assignments to syntactic functions: ")
+#: R/cmp.R:0
 msgid "local assignment to syntactic function: "
 msgid_plural "local assignments to syntactic functions: "
 msgstr[0] "lokalne przypisanie do funkcji syntaktycznej:"
 msgstr[1] "lokalne przypisania do funkcji syntaktycznych:"
 msgstr[2] "lokalne przypisania do funkcji syntaktycznych:"
 
-#~ msgid "is not a registered math1 function"
-#~ msgstr ": to nie jest zarejestrowana funkcja math1"
+#~ msgid "%s is not a registered math1 function"
+#~ msgstr "%s nie jest zarejestrowanÄ… funkcjÄ… 'math1'"
diff -Nru r-base-3.2.3/src/library/compiler/po/R-pt_BR.po r-base-3.3.1/src/library/compiler/po/R-pt_BR.po
--- r-base-3.2.3/src/library/compiler/po/R-pt_BR.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-pt_BR.po	2016-04-27 22:15:31.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:55-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -13,9 +13,20 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr "não é um ambiente apropriado para avaliação"
 
+#, fuzzy
+msgid "non-namespace found within namespace environments"
+msgstr ""
+"'ns' deve ser um espaço de nomes ou um ambiente importado de espaço de nomes"
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr ""
 "'ns' deve ser um espaço de nomes ou um ambiente importado de espaço de nomes"
@@ -53,7 +64,7 @@
 msgid "invalid function in complex assignment"
 msgstr "função inválida em atribuição complexa"
 
-msgid "%s is not a registered math1 function"
+msgid "is not a registered math1 function"
 msgstr ""
 
 msgid "missing arguments are not allowed"
@@ -78,6 +89,9 @@
 msgid "more than one default provided in switch() call"
 msgstr "mais de um valor default fornecido na chamada de switch"
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr "não é possível compilar algo que não seja uma função"
 
@@ -105,6 +119,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr "'%s' não é uma opção válida de compilação"
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr "função não está compilada"
 
diff -Nru r-base-3.2.3/src/library/compiler/po/R-ru.po r-base-3.3.1/src/library/compiler/po/R-ru.po
--- r-base-3.2.3/src/library/compiler/po/R-ru.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-ru.po	2016-04-27 22:15:31.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-26 18:50-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:15-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -11,17 +11,14 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
 msgid "not a proper evaluation environment"
 msgstr "не �вл�ет�� подход�щим окружением дл� вычи�лени�"
 
 msgid "'ns' must be a namespace or a namespace imports environment"
-msgstr ""
-"'ns' должно быть про�тран�твом имен или про�тран�тво имен импортирует�� из "
-"окружени�"
+msgstr "'ns' должно быть про�тран�твом имен или про�тран�тво имен импортирует�� из окружени�"
 
 msgid "bad assignment: %s"
 msgstr "неверное назначение: %s"
@@ -56,9 +53,8 @@
 msgid "invalid function in complex assignment"
 msgstr "неверна� функци� в �ложном назначении"
 
-#, fuzzy
 msgid "%s is not a registered math1 function"
-msgstr "незареги�трированна� math1-функци�"
+msgstr "%s -- незареги�трированна� math1-функци�"
 
 msgid "missing arguments are not allowed"
 msgstr "пропущенные аргументы не допу�тимы"
@@ -122,3 +118,4 @@
 
 #~ msgid "expected a single logical value for the S4 state flag"
 #~ msgstr "ожидает�� одиночное логиче�кое значение дл� флага �о�то�ни� S4"
+
diff -Nru r-base-3.2.3/src/library/compiler/po/R-zh_CN.po r-base-3.3.1/src/library/compiler/po/R-zh_CN.po
--- r-base-3.2.3/src/library/compiler/po/R-zh_CN.po	2015-06-06 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/po/R-zh_CN.po	2016-04-27 22:15:31.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.15.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-03-15 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -17,9 +17,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=0;\n"
 
+msgid "namespace found within local environments"
+msgstr ""
+
 msgid "not a proper evaluation environment"
 msgstr "�是一个正确的评估环境"
 
+#, fuzzy
+msgid "non-namespace found within namespace environments"
+msgstr "'ns'必须是一个命�空间或命�空间的进�环境"
+
+msgid "namespace found within global environments"
+msgstr ""
+
 msgid "'ns' must be a namespace or a namespace imports environment"
 msgstr "'ns'必须是一个命�空间或命�空间的进�环境"
 
@@ -56,7 +66,7 @@
 msgid "invalid function in complex assignment"
 msgstr "��分�里的函数�对"
 
-msgid "%s is not a registered math1 function"
+msgid "is not a registered math1 function"
 msgstr ""
 
 msgid "missing arguments are not allowed"
@@ -80,6 +90,9 @@
 msgid "more than one default provided in switch() call"
 msgstr "调用switch()时�能有一个默认值"
 
+msgid "'switch' with no alternatives"
+msgstr ""
+
 msgid "cannot compile a non-function"
 msgstr "无法编译�函数"
 
@@ -107,6 +120,9 @@
 msgid "'%s' is not a valid compiler option"
 msgstr "没有'%s'这样的编译器选项"
 
+msgid "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2"
+msgstr ""
+
 msgid "function is not compiled"
 msgstr "函数没有被编制"
 
diff -Nru r-base-3.2.3/src/library/compiler/R/cmp.R r-base-3.3.1/src/library/compiler/R/cmp.R
--- r-base-3.2.3/src/library/compiler/R/cmp.R	2015-08-25 22:24:46.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/R/cmp.R	2016-03-16 23:03:45.000000000 +0000
@@ -89,8 +89,11 @@
 frameTypes <- function(env) {
     top <- topenv(env)
     empty <- emptyenv()
+    base <- baseenv()
     nl <- 0
     while (! identical(env, top)) {
+        if (isNamespace(env))
+            stop("namespace found within local environments")
         env <- parent.env(env)
         nl <- nl + 1
         if (identical(env, empty))
@@ -99,6 +102,11 @@
     nn <- 0
     if (isNamespace(env)) {
         while (! identical(env, .GlobalEnv)) {
+            if (!isNamespace(env)) {
+                name <- attr(env, "name")
+                if (!is.character(name) || !startsWith(name, "imports:"))
+                    stop("non-namespace found within namespace environments")
+            }
             env <- parent.env(env)
             nn <- nn + 1
             if (identical(env, empty))
@@ -107,6 +115,8 @@
     }
     ng <- 0
     while (! identical(env, empty)) {
+        if (isNamespace(env))
+            stop("namespace found within global environments")
         env <- parent.env(env)
         ng <- ng + 1
     }
@@ -1134,9 +1144,11 @@
 ## Inlining is controlled by the optimize compiler option, with possible
 ## values 0, 1, 2, 3.
 
+noInlineSymbols <- c("standardGeneric")
+
 getInlineInfo <- function(name, cntxt) {
     optimize <- cntxt$optimize
-    if (optimize > 0) {
+    if (optimize > 0 && ! (name %in% noInlineSymbols)) {
         info <- findCenvVar(name, cntxt$env)
         if (is.null(info))
             NULL
@@ -2369,6 +2381,9 @@
         expr <- e[[2]]
         cases <-e[-c(1, 2)]
 
+        if (is.null(cases))
+            notifyNoSwitchcases(cntxt)
+
         miss <- missingArgs(cases)
         nm <- names(cases)
 
@@ -2556,7 +2571,7 @@
         TRUE
     }
     else FALSE
-}, "methods")
+})
 
 setInlineHandler("with", function(e, cb, cntxt) {
     cntxt$suppressUndefined <- TRUE
@@ -2656,6 +2671,10 @@
         cntxt$warn(gettext("more than one default provided in switch() call"),
                    cntxt)
 
+notifyNoSwitchcases <- function(cntxt)
+    if (! suppressAll(cntxt))
+        cntxt$warn(gettext("'switch' with no alternatives"), cntxt)
+
 
 ##
 ## Compiler interface
@@ -2682,7 +2701,7 @@
             val <- asS4(val)
         val
     }
-    else if (typeof(f) == "builtin" || type == "special")
+    else if (type == "builtin" || type == "special")
         f
     else stop("cannot compile a non-function")
 }
@@ -2690,6 +2709,9 @@
 tryCmpfun <- function(f)
     tryCatch(cmpfun(f), error = function(e) f)
 
+tryCompile <- function(e, ...)
+    tryCatch(compile(e, ...), error = function(err) e)
+
 cmpframe <- function(inpos, file) {
     expr.needed <- 1000
     expr.old <- getOption("expressions")
@@ -2803,6 +2825,7 @@
             stop(gettextf("'%s' is not a valid compiler option", n),
                  domain = NA)
     old <- list()
+    newOptions <- as.list(compilerOptions) # copy options
     for (n in nm) {
         op <- options[[n]]
         switch(n,
@@ -2811,14 +2834,14 @@
                    if (length(op) == 1 && 0 <= op && op <= 3) {
                        old <- c(old, list(optimize =
                                           compilerOptions$optimize))
-                       compilerOptions$optimize <- op
+                       newOptions$optimize <- op
                    }
                },
                suppressAll = {
                    if (identical(op, TRUE) || identical(op, FALSE)) {
                        old <- c(old, list(suppressAll =
                                           compilerOptions$suppressAll))
-                       compilerOptions$suppressAll <- op
+                       newOptions$suppressAll <- op
                    }
                },
                suppressUndefined = {
@@ -2826,10 +2849,14 @@
                        is.character(op)) {
                        old <- c(old, list(suppressUndefined =
                                           compilerOptions$suppressUndefined))
-                       compilerOptions$suppressUndefined <- op
+                       newOptions$suppressUndefined <- op
                    }
                })
     }
+    jitEnabled <- enableJIT(-1)
+    if (checkCompilerOptions(jitEnabled, newOptions))
+        for(n in names(newOptions)) # commit the new options
+            assign(n, newOptions[[n]], compilerOptions)
     invisible(old)
 }
 
@@ -2846,6 +2873,18 @@
         }, error = function(e) e, warning = function(w) w)
 }
 
+checkCompilerOptions <- function(jitEnabled, options = NULL) {
+    optimize <- getCompilerOption("optimize", options)
+    if (jitEnabled <= 2 || optimize >= 2)
+        TRUE
+    else {
+        stop(gettextf(
+            "invalid compiler options: optimize(==%d)<2 and jitEnabled(==%d)>2",
+            optimize, jitEnabled))
+        FALSE
+    }
+}
+
 
 ##
 ## Disassembler
@@ -2898,7 +2937,7 @@
     expr
     .Internal(bcprofstop())
     val <- structure(.Internal(bcprofcounts()),
-                     names = compiler:::Opcodes.names)
+                     names = Opcodes.names)
     hits <- sort(val[val > 0], decreasing = TRUE)
     pct <- round(100 * hits / sum(hits), 1)
     data.frame(hits = hits, pct = pct)
diff -Nru r-base-3.2.3/src/library/compiler/tests/switch.R r-base-3.3.1/src/library/compiler/tests/switch.R
--- r-base-3.2.3/src/library/compiler/tests/switch.R	2012-03-23 23:05:05.000000000 +0000
+++ r-base-3.3.1/src/library/compiler/tests/switch.R	2016-03-16 23:03:45.000000000 +0000
@@ -84,3 +84,15 @@
 stopifnot(identical(ev(quote(lc(2))), ev(quote(l(2)))))
 stopifnot(identical(ev(quote(lc(3))), ev(quote(l(3)))))
 stopifnot(identical(ev(quote(lc(4))), ev(quote(l(4)))))
+
+l <- function(x) switch(x)
+lc <- cmpfun(l)
+
+cw <- function(expr) tryCatch(expr, warning = function(w) w)
+
+stopifnot(identical(cw(l(1)), cw(lc(1))))
+stopifnot(identical(cw(l("A")), cw(lc("A"))))
+suppressWarnings(stopifnot(identical(withVisible(l(1)),
+                                     withVisible(lc(1)))))
+suppressWarnings(stopifnot(identical(withVisible(l("A")),
+                                     withVisible(lc("A")))))
diff -Nru r-base-3.2.3/src/library/datasets/man/Nile.Rd r-base-3.3.1/src/library/datasets/man/Nile.Rd
--- r-base-3.2.3/src/library/datasets/man/Nile.Rd	2015-08-25 22:17:20.000000000 +0000
+++ r-base-3.3.1/src/library/datasets/man/Nile.Rd	2016-06-08 22:15:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/datasets/man/Nile.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Nile}
@@ -9,7 +9,9 @@
 \title{Flow of the River Nile}
 \usage{Nile}
 \description{
-  Measurements of the annual flow of the river Nile at Ashwan 1871--1970.
+  Measurements of the annual flow of the river Nile at Aswan (formerly
+  \code{Assuan}), 1871--1970, in \eqn{10^8 m^3},
+  \dQuote{with apparent changepoint near 1898} (Cobb(1978), Table 1, p.249).
 }
 \format{
   A time series of length 100.
diff -Nru r-base-3.2.3/src/library/datasets/NAMESPACE r-base-3.3.1/src/library/datasets/NAMESPACE
--- r-base-3.2.3/src/library/datasets/NAMESPACE	2011-10-02 22:02:25.000000000 +0000
+++ r-base-3.3.1/src/library/datasets/NAMESPACE	2016-03-16 23:03:45.000000000 +0000
@@ -1,2 +1,2 @@
-# This package exports nothing (it uses lazydata)
-# exportPattern(".")
+# This package exports nothing (it uses lazydata)
+# exportPattern(".")
diff -Nru r-base-3.2.3/src/library/graphics/man/dotchart.Rd r-base-3.3.1/src/library/graphics/man/dotchart.Rd
--- r-base-3.2.3/src/library/graphics/man/dotchart.Rd	2015-10-01 22:15:14.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/dotchart.Rd	2016-03-16 23:03:36.000000000 +0000
@@ -11,7 +11,8 @@
 }
 \usage{
 dotchart(x, labels = NULL, groups = NULL, gdata = NULL,
-         cex = par("cex"), pch = 21, gpch = 21, bg = par("bg"),
+         cex = par("cex"), pt.cex = cex,
+         pch = 21, gpch = 21, bg = par("bg"),
          color = par("fg"), gcolor = par("fg"), lcolor = "gray",
          xlim = range(x[is.finite(x)]),
          main = NULL, xlab = NULL, ylab = NULL, \dots)
@@ -37,6 +38,8 @@
     to a value smaller than one can be a useful way of avoiding label
     overlap.  Unlike many other graphics functions, this sets the actual
     size, not a multiple of \code{par("cex")}.}
+  \item{pt.cex}{the \code{cex} to be applied to plotting symbols.
+    This behaves like \code{cex} in \code{plot()}.}
   \item{pch}{the plotting character or symbol to be used.}
   \item{gpch}{the plotting character or symbol to be used for group
     values.}
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/graphics/man/figures/mai.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/graphics/man/figures/mai.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/graphics/man/figures/mai.png and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/graphics/man/figures/mai.png differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/graphics/man/figures/oma.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/graphics/man/figures/oma.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/graphics/man/figures/oma.png and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/graphics/man/figures/oma.png differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/graphics/man/figures/pch.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/graphics/man/figures/pch.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/graphics/man/figures/pch.png and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/graphics/man/figures/pch.png differ
diff -Nru r-base-3.2.3/src/library/graphics/man/hist.POSIXt.Rd r-base-3.3.1/src/library/graphics/man/hist.POSIXt.Rd
--- r-base-3.2.3/src/library/graphics/man/hist.POSIXt.Rd	2015-08-25 22:17:08.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/hist.POSIXt.Rd	2016-03-16 23:03:36.000000000 +0000
@@ -14,12 +14,12 @@
 \method{hist}{POSIXt}(x, breaks, \dots,
      xlab = deparse(substitute(x)),
      plot = TRUE, freq = FALSE,
-     start.on.monday = TRUE, format)
+     start.on.monday = TRUE, format, right = TRUE)
 
 \method{hist}{Date}(x, breaks, \dots,
      xlab = deparse(substitute(x)),
      plot = TRUE, freq = FALSE,
-     start.on.monday = TRUE, format)
+     start.on.monday = TRUE, format, right = TRUE)
 }
 \arguments{
   \item{x}{an object inheriting from class \code{"POSIXt"} or \code{"Date"}.}
@@ -44,6 +44,8 @@
   \item{start.on.monday}{logical. If \code{breaks = "weeks"}, should the
     week start on Mondays or Sundays?}
   \item{format}{for the x-axis labels. See \code{\link{strptime}}.}
+  \item{right}{logical; if \code{TRUE}, the histogram cells are
+    right-closed (left open) intervals.}
 }
 \details{
   Note that unlike the default method, \code{breaks} is a required argument.
@@ -51,6 +53,12 @@
   Using \code{breaks = "quarters"} will create intervals of 3 calendar
   months, with the intervals beginning on January 1, April 1,
   July 1 or October 1, based upon \code{min(x)} as appropriate.
+  
+  With the default \code{right = TRUE}, breaks will be set
+  on the last day of the previous period when \code{breaks} is
+  \code{"months"}, \code{"quarters"} or \code{"years"}.  Use 
+  \code{right = FALSE} to set them to the first day of the
+  interval shown in each bar.
 }
 \value{
   An object of class \code{"histogram"}: see \code{\link{hist}}.
diff -Nru r-base-3.2.3/src/library/graphics/man/legend.Rd r-base-3.3.1/src/library/graphics/man/legend.Rd
--- r-base-3.2.3/src/library/graphics/man/legend.Rd	2015-08-25 22:17:07.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/legend.Rd	2016-05-17 22:15:08.000000000 +0000
@@ -72,8 +72,9 @@
     text.  Useful for y-adjustment when \code{labels} are
     \link{plotmath} expressions.}
   \item{text.width}{the width of the legend text in x (\code{"user"})
-    coordinates.  (Should be positive even for a reversed x axis.)
-    Defaults to the proper value computed by \code{\link{strwidth}(legend)}.}
+    coordinates.  (Should be a single positive number even for a reversed 
+    x axis.)  Defaults to the proper value computed by 
+    \code{\link{strwidth}(legend)}.}
   \item{text.col}{the color used for the legend text.}
   \item{text.font}{the font used for the legend text, see \code{\link{text}}.}
   \item{merge}{logical; if \code{TRUE}, merge points and lines but
diff -Nru r-base-3.2.3/src/library/graphics/man/par.Rd r-base-3.3.1/src/library/graphics/man/par.Rd
--- r-base-3.2.3/src/library/graphics/man/par.Rd	2015-11-25 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/par.Rd	2016-03-16 23:03:36.000000000 +0000
@@ -300,7 +300,7 @@
       \code{"serif"}, \code{"sans"} and \code{"mono"}, and the
       \link{Hershey} font families are also available.  (Devices may
       define others, and some devices will ignore this setting
-      completely.  Names starting with \code{"Her"} are treated
+      completely.  Names starting with \code{"Hershey"} are treated
       specially and should only be used for the built-in Hershey font
       families.)  This can be specified inline for \code{\link{text}}.}
     \item{\code{fg}}{The color to be used for the foreground of plots.
diff -Nru r-base-3.2.3/src/library/graphics/man/smoothScatter.Rd r-base-3.3.1/src/library/graphics/man/smoothScatter.Rd
--- r-base-3.2.3/src/library/graphics/man/smoothScatter.Rd	2015-08-25 22:17:08.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/smoothScatter.Rd	2016-03-16 23:03:36.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/graphics/man/smoothscatter.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{smoothScatter}
@@ -8,15 +8,14 @@
 \title{Scatterplots with Smoothed Densities Color Representation}
 
 \description{\code{smoothScatter} produces a smoothed color density
-  representation of the scatterplot, obtained through a kernel
-  density estimate. \code{densCols} produces a vector containing
-  colors which encode the local densities at each point in a
-  scatterplot.
+  representation of a scatterplot, obtained through a (2D) kernel
+  density estimate.
 }
 \usage{
 smoothScatter(x, y = NULL, nbin = 128, bandwidth,
               colramp = colorRampPalette(c("white", blues9)),
-              nrpoints = 100, pch = ".", cex = 1, col = "black",
+              nrpoints = 100, ret.selection = FALSE,
+              pch = ".", cex = 1, col = "black",
               transformation = function(x) x^.25,
               postPlotHook = box,
               xlab = NULL, ylab = NULL, xlim, ylim,
@@ -42,6 +41,8 @@
     regional densities will be plotted.  Adding points to the plot
     allows for the identification of outliers.  If all points are to be
     plotted, choose \code{nrpoints = Inf}.}
+  \item{ret.selection}{\code{\link{logical}} indicating to return the
+    ordered indices of \dQuote{low density} points if \code{nrpoints > 0}.}
   \item{pch, cex, col}{arguments passed to \code{\link{points}},
     when \code{nrpoints > 0}: point symbol, character expansion factor
     and color, see also \code{\link{par}}.}
@@ -51,9 +52,15 @@
   \item{xlab, ylab}{character strings to be used as axis labels, passed
     to \code{\link{image}}.}
   \item{xlim, ylim}{numeric vectors of length 2 specifying axis limits.}
-  \item{xaxs, yaxs, \dots}{further arguments, passed to \code{\link{image}}.}
+  \item{xaxs, yaxs, \dots}{further arguments passed to \code{\link{image}},
+    e.g., \code{add=TRUE} or \code{useRaster=TRUE}.}
+}
+\value{
+  If \code{ret.selection} is true, a vector of integers of length
+  \code{nrpoints} (or smaller, if there are less finite points inside
+  \code{xlim} and \code{ylim}) with the indices of the low-density
+  points drawn, ordered with lowest density first.
 }
-
 \details{
   \code{smoothScatter} produces a smoothed version of a scatter plot.
   Two dimensional (kernel density) smoothing is performed by
@@ -77,13 +84,18 @@
 x2  <- matrix(rnorm(n, mean = 3, sd = 1.5), ncol = 2)
 x   <- rbind(x1, x2)
 
-oldpar <- par(mfrow = c(2, 2))
+oldpar <- par(mfrow = c(2, 2), mar=.1+c(3,3,1,1), mgp = c(1.5, 0.5, 0))
 smoothScatter(x, nrpoints = 0)
 smoothScatter(x)
 
 ## a different color scheme:
 Lab.palette <- colorRampPalette(c("blue", "orange", "red"), space = "Lab")
-smoothScatter(x, colramp = Lab.palette)
+i.s <- smoothScatter(x, colramp = Lab.palette,
+                     ## pch=NA: do not draw them
+                     nrpoints = 250, ret.selection=TRUE)
+## label the 20 very lowest-density points,the "outliers" (with obs.number):
+i.20 <- i.s[1:20]
+text(x[i.20,], labels = i.20, cex= 0.75)
 
 ## somewhat similar, using identical smoothing computations,
 ## but considerably *less* efficient for really large data:
@@ -93,7 +105,8 @@
 par(mfrow = c(1, 1))
 y <- matrix(rnorm(40000), ncol = 4) + 3*rnorm(10000)
 y[, c(2,4)] <-  -y[, c(2,4)]
-pairs(y, panel = function(...) smoothScatter(..., nrpoints = 0, add = TRUE))
+pairs(y, panel = function(...) smoothScatter(..., nrpoints = 0, add = TRUE),
+      gap = 0.2)
 
 par(oldpar)
 }}
diff -Nru r-base-3.2.3/src/library/graphics/man/text.Rd r-base-3.3.1/src/library/graphics/man/text.Rd
--- r-base-3.2.3/src/library/graphics/man/text.Rd	2015-11-26 23:15:14.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/text.Rd	2016-05-23 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/graphics/man/text.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{text}
@@ -9,7 +9,7 @@
 \usage{
 text(x, \dots)
 
-\method{text}{default} (x, y = NULL, labels = seq_along(x), adj = NULL,
+\method{text}{default} (x, y = NULL, labels = seq_along(x$x), adj = NULL,
      pos = NULL, offset = 0.5, vfont = NULL,
      cex = 1, col = NULL, font = NULL, \dots)
 }
diff -Nru r-base-3.2.3/src/library/graphics/man/title.Rd r-base-3.3.1/src/library/graphics/man/title.Rd
--- r-base-3.2.3/src/library/graphics/man/title.Rd	2015-08-25 22:17:08.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/man/title.Rd	2016-03-16 23:03:36.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/graphics/man/title.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2008 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{title}
@@ -11,13 +11,12 @@
 }
 \alias{title}
 \arguments{
-  \item{main}{The main title (on top) using font and size (character
-    expansion) \code{par("font.main")} and color
-    \code{par("col.main")}.}
-  \item{sub}{Sub-title (at bottom) using font and size
-    \code{par("font.sub")} and color \code{par("col.sub")}.}
-  \item{xlab}{X axis label using font and character expansion
-    \code{par("font.lab")} and color \code{par("col.lab")}.}
+  \item{main}{The main title (on top) using font, size (character
+    expansion) and color \code{par(c("font.main", "cex.main", "col.main"))}.}
+  \item{sub}{Sub-title (at bottom) using font, size and color 
+    \code{par(c("font.sub", "cex.sub", "col.sub"))}.}
+  \item{xlab}{X axis label using font, size and color 
+    \code{par(c("font.lab", "cex.lab", "col.lab"))}.}
   \item{ylab}{Y axis label, same font attributes as \code{xlab}.}
   \item{line}{specifying a value for \code{line} overrides the
     default placement of labels, and places them this many lines
diff -Nru r-base-3.2.3/src/library/graphics/po/da.po r-base-3.3.1/src/library/graphics/po/da.po
--- r-base-3.2.3/src/library/graphics/po/da.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/da.po	2016-04-27 22:15:29.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-11-29 21:34+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,11 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+msgid "Incompatible graphics state"
+msgstr ""
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/graphics/po/de.po r-base-3.3.1/src/library/graphics/po/de.po
--- r-base-3.2.3/src/library/graphics/po/de.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/de.po	2016-04-27 22:15:29.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-3.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-02-28 16:20+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
@@ -20,7 +20,12 @@
 msgid "no base graphics system is registered"
 msgstr "kein Basisgrafiksystem registriert"
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "ungültiger Grafikzustand"
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr "das Basisgrafiksystem ist nicht registriert"
 
@@ -35,11 +40,11 @@
 
 #: graphics.c:1843
 msgid "outer margins too large (figure region too small)"
-msgstr "äußere Ränder zu groß (figure region zu klein)"
+msgstr "äußere Ränder zu groß (figure Bereich zu klein)"
 
 #: graphics.c:1845
 msgid "figure region too large"
-msgstr "figure region zu groß"
+msgstr "figure Bereich zu groß"
 
 #: graphics.c:1847
 msgid "figure margins too large"
@@ -47,7 +52,7 @@
 
 #: graphics.c:1849
 msgid "plot region too large"
-msgstr "plot region zu groß"
+msgstr "plot Bereich zu groß"
 
 #: graphics.c:1896
 #, c-format
@@ -217,7 +222,7 @@
 
 #: plot.c:492
 msgid "\"log=\" specification must be character"
-msgstr "\"log=\" Spezifikation muss ein Charakter sein"
+msgstr "\"log=\" Spezifikation muss eine Zeichenkette sein"
 
 #: plot.c:503
 #, c-format
@@ -257,7 +262,7 @@
 #: plot.c:776
 #, c-format
 msgid "invalid axis number %d"
-msgstr "ungültige Achsnummer %d"
+msgstr "ungültige Achsennummer %d"
 
 #: plot.c:866
 msgid "'hadj' must be of length one"
@@ -340,7 +345,7 @@
 
 #: plot.c:1924
 msgid "invalid arrow head specification"
-msgstr "ungültige Pfeilsitzenspezifikation"
+msgstr "ungültige Pfeilspitzenspezifikation"
 
 #: plot.c:2158
 msgid "no coordinates were supplied"
@@ -509,15 +514,15 @@
 
 #: plot3d.c:1137
 msgid "'xlab' must be a character vector of length 1"
-msgstr "'xlab' muss ein Charktervektor der Länge 1 sein"
+msgstr "'xlab' muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: plot3d.c:1139
 msgid "'ylab' must be a character vector of length 1"
-msgstr "'ylab' muss ein Charktervektor der Länge 1 sein"
+msgstr "'ylab' muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: plot3d.c:1141
 msgid "'zlab' must be a character vector of length 1"
-msgstr "'zlab' muss ein Charktervektor der Länge 1 sein"
+msgstr "'zlab' muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: plot3d.c:1161
 msgid "invalid viewing parameters"
diff -Nru r-base-3.2.3/src/library/graphics/po/es.po r-base-3.3.1/src/library/graphics/po/es.po
--- r-base-3.2.3/src/library/graphics/po/es.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/es.po	2016-04-27 22:15:28.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2012-03-16 15:59+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <pabloemilio.verde@uni-duesseldorf.de>\n"
@@ -22,7 +22,12 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "estado gráfico inválido"
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/graphics/po/fr.po r-base-3.3.1/src/library/graphics/po/fr.po
--- r-base-3.2.3/src/library/graphics/po/fr.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/fr.po	2016-04-27 22:15:28.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2014-03-17 10:43+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -22,7 +22,12 @@
 msgid "no base graphics system is registered"
 msgstr "aucun système graphique de base n'est enregistré"
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "état des graphiques incorrect"
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr "le système graphique de base n'est pas enregistré"
 
diff -Nru r-base-3.2.3/src/library/graphics/po/graphics.pot r-base-3.3.1/src/library/graphics/po/graphics.pot
--- r-base-3.2.3/src/library/graphics/po/graphics.pot	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/graphics.pot	2016-04-27 22:15:29.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: graphics 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,11 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+msgid "Incompatible graphics state"
+msgstr ""
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/graphics/po/it.po r-base-3.3.1/src/library/graphics/po/it.po
--- r-base-3.2.3/src/library/graphics/po/it.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/it.po	2016-04-27 22:15:28.000000000 +0000
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2006-01-16 09:11+0100\n"
 "Last-Translator: Daniele Medri <daniele.medri2@unibo.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -28,7 +28,12 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "stato grafico non valido"
+
+#: base.c:385 base.c:392 base.c:400
 #, fuzzy
 msgid "the base graphics system is not registered"
 msgstr "troppi sistemi grafici registrati"
diff -Nru r-base-3.2.3/src/library/graphics/po/ja.po r-base-3.3.1/src/library/graphics/po/ja.po
--- r-base-3.2.3/src/library/graphics/po/ja.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/ja.po	2016-04-27 22:15:29.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.5.0 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2014-03-26 13:54+0200 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: R-core <R-core@R-project.org> \n"
@@ -21,7 +21,12 @@
 msgid "no base graphics system is registered"
 msgstr " ベース��るグラフィックシステム�登録�れ����ん "
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr " グラフィックス�状態��正�� "
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr " 基本グラフィックシステム�登録�れ����ん "
 
diff -Nru r-base-3.2.3/src/library/graphics/po/ko.po r-base-3.3.1/src/library/graphics/po/ko.po
--- r-base-3.2.3/src/library/graphics/po/ko.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/ko.po	2016-04-27 22:15:28.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R graphics package
-# src/library/graphics/po/ko.po
+# ./graphics/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R graphics package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +31,11 @@
 msgid "no base graphics system is registered"
 msgstr "등�� base 그래픽 시스템� 없습니다"
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+msgid "Incompatible graphics state"
+msgstr ""
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr "base 그래픽 시스템� 등��지 않았습니다"
 
diff -Nru r-base-3.2.3/src/library/graphics/po/nn.po r-base-3.3.1/src/library/graphics/po/nn.po
--- r-base-3.2.3/src/library/graphics/po/nn.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/nn.po	2016-04-27 22:15:28.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-02-18 09:09+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -22,7 +22,12 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "ugyldig grafikktilstand"
+
+#: base.c:385 base.c:392 base.c:400
 #, fuzzy
 msgid "the base graphics system is not registered"
 msgstr "for mange grafikksystem registrerte"
diff -Nru r-base-3.2.3/src/library/graphics/po/pl.po r-base-3.3.1/src/library/graphics/po/pl.po
--- r-base-3.2.3/src/library/graphics/po/pl.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/pl.po	2016-04-27 22:15:28.000000000 +0000
@@ -1,25 +1,29 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 21:38+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-04 11:19+0200\n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: base.c:43
 msgid "no base graphics system is registered"
 msgstr "nie zarejestrowano żadnego bazowego systemu graficznego"
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+msgid "Incompatible graphics state"
+msgstr "Niepoprawny stan grafiki"
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr "bazowy system graficzny nie jest zarejestrowany"
 
diff -Nru r-base-3.2.3/src/library/graphics/po/pt_BR.po r-base-3.3.1/src/library/graphics/po/pt_BR.po
--- r-base-3.2.3/src/library/graphics/po/pt_BR.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/pt_BR.po	2016-04-27 22:15:28.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:56-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -21,7 +21,12 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "estado gráfico inválido"
+
+#: base.c:385 base.c:392 base.c:400
 #, fuzzy
 msgid "the base graphics system is not registered"
 msgstr "muitos sistemas gráficos registrados"
diff -Nru r-base-3.2.3/src/library/graphics/po/R-da.po r-base-3.3.1/src/library/graphics/po/R-da.po
--- r-base-3.2.3/src/library/graphics/po/R-da.po	2015-03-18 23:03:22.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-da.po	2016-04-27 22:15:29.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-08 00:28+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -329,6 +329,9 @@
 msgid "invalid table 'x'"
 msgstr ""
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr ""
 
@@ -449,8 +452,3 @@
 msgid_plural "arguments %s are not made use of"
 msgstr[0] ""
 msgstr[1] ""
-
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] ""
-msgstr[1] ""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-de.po r-base-3.3.1/src/library/graphics/po/R-de.po
--- r-base-3.2.3/src/library/graphics/po/R-de.po	2015-03-26 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-de.po	2016-04-27 22:15:29.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: R 3.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
-"PO-Revision-Date: 2015-03-20 16:03+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-08 11:14+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-Core <R-core@r-project.org>\n"
 "Language: de\n"
@@ -35,7 +35,7 @@
 msgstr "alle Einträge in 'x' müssen nicht-negativ und endlich sein"
 
 msgid "at least one entry of 'x' must be positive"
-msgstr "midestens ein Eintrag in 'x' muss positiv sein"
+msgstr "mindestens ein Eintrag in 'x' muss positiv sein"
 
 msgid "incorrect 'col': must be length 2"
 msgstr "ungültiger Wert für 'col': muss Länge 2 haben"
@@ -101,7 +101,7 @@
 
 msgid "y axis is on a cumulative probability scale, 'ylim' must be in [0,1]"
 msgstr ""
-"Y-Achse ist eine kumulative Wahscheinlichkeitsskala, 'ylim' muss in [0,1] "
+"Y-Achse ist eine kumulative Wahrscheinlichkeitsskala, 'ylim' muss in [0,1] "
 "sein"
 
 msgid "no 'z' matrix specified"
@@ -123,7 +123,7 @@
 msgstr "'number' muss eine ganze Zahl >= 1 sein"
 
 msgid "'overlap' must be < 1 (and typically >= 0)."
-msgstr "'overlap' muss , 1 (und typisch >= 0 ) sein"
+msgstr "'overlap' muss < 1 (und typischerweise >= 0) sein"
 
 msgid "invalid 'given.values'"
 msgstr "ungültige 'given.values'"
@@ -140,7 +140,7 @@
 "enthält"
 
 msgid "'add' will be ignored as there is no existing plot"
-msgstr "'add' wird ignoriert, da noch keine Grafik exisitiert"
+msgstr "'add' wird ignoriert, da noch keine Grafik existiert"
 
 msgid "'from' and 'to' must be > 0 with log=\"x\""
 msgstr "'from' und 'to' müssen > 0 sein mit log=\"x\""
@@ -161,7 +161,7 @@
 msgstr "In hist(<Date>) müssen 'breaks' angegeben werden"
 
 msgid "'x' must be a numeric vector or matrix"
-msgstr "'x' muss ein nummerischer Vektor oder eine Matrix sein"
+msgstr "'x' muss ein numerischer Vektor oder eine Matrix sein"
 
 msgid "'x' is neither a vector nor a matrix: using as.numeric(x)"
 msgstr "'x' ist weder Vektor noch Matrix: nutze as.numeric(x)"
@@ -182,10 +182,10 @@
 msgstr "ungültige Spezifikation von 'margin'"
 
 msgid "incorrect geometry specification"
-msgstr "ungültige Spzifikation der Geometrie"
+msgstr "ungültige Spezifikation der Geometrie"
 
 msgid "'x' must be numeric"
-msgstr "'x' muss nummerisch sein"
+msgstr "'x' muss numerisch sein"
 
 msgid "invalid length(x)"
 msgstr "ungültige length(x)"
@@ -200,7 +200,7 @@
 msgstr "unbekannter Algorithmus für 'breaks'"
 
 msgid "invalid number of 'breaks'"
-msgstr "unzulässige Anzahle für 'breaks'"
+msgstr "unzulässige Anzahl für 'breaks'"
 
 msgid "hist.default: pretty() error, breaks=%s"
 msgstr "hist.default: Fehler in pretty(), breaks=%s"
@@ -238,13 +238,13 @@
 msgstr "'z' muss eine Matrix sein"
 
 msgid "'z' must be numeric or logical"
-msgstr "'z' muss nummerisch oder logisch sein"
+msgstr "'z' muss numerisch oder logisch sein"
 
 msgid "invalid z limits"
 msgstr "unzulässige Grenzen für z"
 
 msgid "must have one more break than colour"
-msgstr "es muss eine Stützstelle mehr gebe als Farben"
+msgstr "es muss eine Stützstelle mehr geben als Farben"
 
 msgid "'breaks' must all be finite"
 msgstr "alle 'breaks' müssen endlich sein"
@@ -263,7 +263,7 @@
 
 msgid "'respect' must be logical or matrix with same dimension as 'mat'"
 msgstr ""
-"'respect' muss boolesch oder eine Matrix mit dem selben Format wie 'mat' sein"
+"'respect' muss boolesch oder eine Matrix mit demselben Format wie 'mat' sein"
 
 msgid ""
 "layout matrix must contain at least one reference\n"
@@ -282,7 +282,7 @@
 msgstr "unzulässige Koordinatenlängen"
 
 msgid "'text.width' must be numeric, >= 0"
-msgstr "'text.width' muss nummerisch >= 0 sein"
+msgstr "'text.width' muss numerisch >= 0 sein"
 
 msgid "horizontal specification overrides: Number of columns := %d"
 msgstr "horizontale Spezifikation überschreibt Anzahl der Spalten := %d"
@@ -314,13 +314,13 @@
 msgstr "'x' darf nicht Dimension 0 haben"
 
 msgid "invalid 'shade' specification"
-msgstr "unzulässige spezifikation für 'shade'"
+msgstr "unzulässige Spezifikation für 'shade'"
 
 msgid "length of 'sort' does not conform to 'dim(x)'"
 msgstr "Länge von 'sort' passt nicht zu 'dim(x)'"
 
 msgid "non-numeric argument to 'pairs'"
-msgstr "nicht-nummerisches Argument für 'pairs'"
+msgstr "nicht-numerisches Argument für 'pairs'"
 
 msgid "only one column in the argument to 'pairs'"
 msgstr "nur eine Spalte im Argument zu 'pairs'"
@@ -353,7 +353,7 @@
 msgstr "'plot.data.frame' auf etwas anderes als einen Dataframe angewendet"
 
 msgid "'y' must be a numeric vector"
-msgstr "'z' muss nummerischer Vektor sein"
+msgstr "'z' muss numerischer Vektor sein"
 
 msgid "'x' must be a data frame"
 msgstr "'x' muss Dataframe sein"
@@ -368,10 +368,10 @@
 msgstr "'x' muss entweder Dataframe oder Formel sein"
 
 msgid "a variable in 'y' is not numeric"
-msgstr "a variable in 'y' ist nicht nummerisch"
+msgstr "a variable in 'y' ist nicht numerisch"
 
 msgid "there must be at least one numeric variable!"
-msgstr "es muss zumindest eine nummerische Varable vorhanden sein!"
+msgstr "es muss zumindest eine numerische Varable vorhanden sein!"
 
 msgid "cannot hatch with logarithmic scale active"
 msgstr "bei logarithmischer Skala hatch nicht möglich"
@@ -409,10 +409,10 @@
 msgstr "'x' muss eine Matrix oder ein Dataframe sein"
 
 msgid "data in 'x' must be numeric"
-msgstr "die Daten in 'x' müssen nummerisch sein"
+msgstr "die Daten in 'x' müssen numerisch sein"
 
 msgid "'nrow * ncol' is less than the number of observations"
-msgstr "'nrow * ncol' kleiner als die  Anzahl der Beobachtungen"
+msgstr "'nrow * ncol' ist kleiner als die Anzahl der Beobachtungen"
 
 msgid "labels do not make sense for a single location"
 msgstr "Labels haben keine Sinn für eine einzelne Position"
@@ -424,10 +424,10 @@
 msgstr "Anzahl der Zeilen von 'locations' und 'x' müssen gleich sein"
 
 msgid "length of 'angles' must equal 'ncol(x)'"
-msgstr "Länge von 'angels' muss 'ncol(x)' entsprechen"
+msgstr "Länge von 'angles' muss 'ncol(x)' entsprechen"
 
 msgid "no finite and non-missing values"
-msgstr "keine endliche nicht-fehlenden Werte"
+msgstr "keine endlichen, nicht-fehlenden Werte"
 
 msgid "'scale' must be positive"
 msgstr "'scale' muss positiv sein"
@@ -466,10 +466,10 @@
 msgstr[0] "Argument (%s) wird nicht benutzt"
 msgstr[1] "Argumente (%s) werden nicht benutzt"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "zusätzliches Argument %s wird verworfen"
-msgstr[1] "zusätzliche Argumente %s werden verworfen"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "zusätzliches Argument %s wird verworfen"
+#~ msgstr[1] "zusätzliche Argumente %s werden verworfen"
 
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr "negative 'counts'. Interner Fehler im C-Kode für\"bincount\""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-fr.po r-base-3.3.1/src/library/graphics/po/R-fr.po
--- r-base-3.2.3/src/library/graphics/po/R-fr.po	2015-03-18 23:03:22.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-fr.po	2016-04-27 22:15:28.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 10:44+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -355,6 +355,9 @@
 msgid "invalid table 'x'"
 msgstr "tableau 'x' incorrect"
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr "incapable de traiter plus d'une coordonnée 'x'"
 
@@ -481,10 +484,10 @@
 msgstr[0] "l'argument %s n'est pas utilisé par"
 msgstr[1] "les arguments %s ne sont pas utilisés par"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "l'argument supplémentaire %s sera ignoré"
-msgstr[1] "les arguments supplémentaires %s seront ignorés"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "l'argument supplémentaire %s sera ignoré"
+#~ msgstr[1] "les arguments supplémentaires %s seront ignorés"
 
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr "'counts' négatif. Erreur interne dans le code C pour \"bincount\""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-graphics.pot r-base-3.3.1/src/library/graphics/po/R-graphics.pot
--- r-base-3.2.3/src/library/graphics/po/R-graphics.pot	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-graphics.pot	2016-04-27 22:15:29.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: graphics 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -323,6 +322,9 @@
 msgid "invalid table 'x'"
 msgstr ""
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr ""
 
@@ -443,8 +445,3 @@
 msgid_plural "arguments %s are not made use of"
 msgstr[0]    ""
 msgstr[1]    ""
-
-msgid        "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0]    ""
-msgstr[1]    ""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-it.po r-base-3.3.1/src/library/graphics/po/R-it.po
--- r-base-3.2.3/src/library/graphics/po/R-it.po	2015-03-18 23:03:22.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-it.po	2016-04-27 22:15:28.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-26 22:56+0100\n"
 "Last-Translator: Stefano M. Iacus <Stefano.Iacus@R-project.org>\n"
 "Language-Team: Italian\n"
@@ -355,6 +355,9 @@
 msgid "invalid table 'x'"
 msgstr "table 'x' non valida"
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr "non possono lavorare con piu' di una coordinata 'x'"
 
@@ -483,10 +486,10 @@
 msgstr[1] ""
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "gli argomenti in eccesso %s verranno ignorati"
-msgstr[1] "gli argomenti in eccesso %s verranno ignorati"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "gli argomenti in eccesso %s verranno ignorati"
+#~ msgstr[1] "gli argomenti in eccesso %s verranno ignorati"
 
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr "'counts' negativi. Errore interno nel codice C oer \"bincount\""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-ja.po r-base-3.3.1/src/library/graphics/po/R-ja.po
--- r-base-3.2.3/src/library/graphics/po/R-ja.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-ja.po	2016-04-27 22:15:29.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 14:16+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -339,6 +339,9 @@
 msgid "invalid table 'x'"
 msgstr " テーブル 'x' ��正�� "
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr " 二�以上� 'x' 座標を扱��������ん "
 
@@ -459,9 +462,9 @@
 msgid_plural "arguments %s are not made use of"
 msgstr[0] " 引数 %s �使用�れ����ん "
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] " 余分�引数 %s �無視�れ�� "
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] " 余分�引数 %s �無視�れ�� "
 
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr ""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-ko.po r-base-3.3.1/src/library/graphics/po/R-ko.po
--- r-base-3.2.3/src/library/graphics/po/R-ko.po	2015-03-31 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-ko.po	2016-04-27 22:15:28.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R graphics package
-# src/library/graphics/po/R-ko.po
+# ./graphics/po/R-ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R graphics package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +43,8 @@
 msgstr "'x'는 반드시 2차� 분할표�어야 합니다"
 
 msgid "all entries of 'x' must be nonnegative and finite"
-msgstr "'x'� 모든 항목들� 반드시 �수가 아니어야 하며, 유한한 값�어야 합니다"
+msgstr ""
+"'x'� 모든 항목들� 반드시 �수가 아니어야 하며, 유한한 값�어야 합니다"
 
 msgid "at least one entry of 'x' must be positive"
 msgstr "'x'� 항목들 중 �어� 하나는 양수�어야 합니다"
@@ -73,7 +77,9 @@
 msgstr "로그 스케�� 사용�때� bars� shading lines� 사용할 수 없습니다"
 
 msgid "log scale error: at least one 'height + offset' value <= 0"
-msgstr "로그스케� �러: 'height + offset' 값들중 �어� 하나가 0 보다 작거나 같습니다"
+msgstr ""
+"로그스케� �러: 'height + offset' 값들중 �어� 하나가 0 보다 작거나 같습니"
+"다"
 
 msgid "log scale error: 'xlim' <= 0"
 msgstr "로그스케� �러: 'xlim'� 값� 0 보다 작거나 같습니다"
@@ -106,7 +112,8 @@
 msgstr "종�변수는 요��어야 합니다"
 
 msgid "y axis is on a cumulative probability scale, 'ylim' must be in [0,1]"
-msgstr "y 축� 누�확률스케��므로 'ylim'� 값� 반드시 [0,1]내� 있어야 합니다"
+msgstr ""
+"y 축� 누�확률스케��므로 'ylim'� 값� 반드시 [0,1]내� 있어야 합니다"
 
 msgid "no 'z' matrix specified"
 msgstr "지정� 'z'가 없습니다"
@@ -127,7 +134,8 @@
 msgstr "'number'는 반드시 1 보다 �거나 같아야 합니다"
 
 msgid "'overlap' must be < 1 (and typically >= 0)."
-msgstr "'overlap'� 반드시 1 보다 작아야 합니다 (�반�으로 0 보다 �거나 같습니다)."
+msgstr ""
+"'overlap'� 반드시 1 보다 작아야 합니다 (�반�으로 0 보다 �거나 같습니다)."
 
 msgid "invalid 'given.values'"
 msgstr "유효하지 않� 'given.values'입니다"
@@ -139,7 +147,8 @@
 msgstr "누�� 행들: %s"
 
 msgid "'expr' must be a function, or a call or an expression containing '%s'"
-msgstr "'expr'� 반드시 함수, �는 호출, �는 '%s'를 �함하는 표현��어야 합니다"
+msgstr ""
+"'expr'� 반드시 함수, �는 호출, �는 '%s'를 �함하는 표현��어야 합니다"
 
 msgid "'add' will be ignored as there is no existing plot"
 msgstr "존재하는 플롯� 없기 때문� 'add'는 무시�어질 것입니다"
@@ -220,7 +229,9 @@
 msgstr "'probability'� '!freq'� alias�지만, � 둘� 다릅니다"
 
 msgid "some 'x' not counted; maybe 'breaks' do not span range of 'x'"
-msgstr "�부 'x'가 세어지지 않았습니다; 아마� 'breaks'가 'x'� 범위를 모� �함하지 않� 것 같습니다"
+msgstr ""
+"�부 'x'가 세어지지 않았습니다; 아마� 'breaks'가 'x'� 범위를 모� �함하지 "
+"않� 것 같습니다"
 
 msgid "the AREAS in the plot are wrong -- rather use 'freq = FALSE'"
 msgstr "플�내� AREAS가 잘못�었으므로 'freq = FALSE'를 사용합니다"
@@ -238,7 +249,7 @@
 msgstr "'z'는 반드시 행렬�어야 합니다"
 
 msgid "'z' must be numeric or logical"
-msgstr ""
+msgstr "'z'는 반드시 수치형 �는 논리형�어야 합니다."
 
 msgid "invalid z limits"
 msgstr "유효하지 않� z limits입니다"
@@ -262,7 +273,8 @@
 msgstr ""
 
 msgid "'respect' must be logical or matrix with same dimension as 'mat'"
-msgstr "'respect'는 반드시 논리��거나 'mat'과 같� �기를 가지는 행렬�어야 합니다"
+msgstr ""
+"'respect'는 반드시 논리��거나 'mat'과 같� �기를 가지는 행렬�어야 합니다"
 
 msgid ""
 "layout matrix must contain at least one reference\n"
@@ -285,7 +297,9 @@
 msgstr ""
 
 msgid "'merge = TRUE' has no effect when no line segments are drawn"
-msgstr "'merge = TRUE'� line segments가 그려지지 않았� 경우�는 아무런 �향� 가지지 않습니다"
+msgstr ""
+"'merge = TRUE'� line segments가 그려지지 않았� 경우�는 아무런 �향� 가지"
+"지 않습니다"
 
 msgid "not using pch[2..] since pch[1L] has multiple chars"
 msgstr ""
@@ -338,6 +352,9 @@
 msgid "invalid table 'x'"
 msgstr "유효하지 않� 테�블 'x'입니다"
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr "한개 ��� 'x'좌표를 처리할 수 없습니다"
 
@@ -390,13 +407,15 @@
 msgstr "'figs'는 최소 1개� 스�린� 반드시 지정해야 합니다"
 
 msgid "'nrpoints' should be numeric scalar with value >= 0."
-msgstr "'nrpoints'는 반드시 0 보다 �거나 같� 숫�를 가지는 스칼��어야 합니다"
+msgstr ""
+"'nrpoints'는 반드시 0 보다 �거나 같� 숫�를 가지는 스칼��어야 합니다"
 
 msgid "a 2-way table has to be specified"
 msgstr "2� 분할표가 반드시 지정�어져야 합니다"
 
 msgid "x axis is on a cumulative probability scale, 'xlim' must be in [0,1]"
-msgstr "x 축� 누�확률스케��므로 'xlim'� 값� 반드시 [0,1]사�� 있어야 합니다"
+msgstr ""
+"x 축� 누�확률스케��므로 'xlim'� 값� 반드시 [0,1]사�� 있어야 합니다"
 
 msgid "'x' must be a matrix or a data frame"
 msgstr "'x'는 반드시 행렬 �는 ��터 프레임입니다"
@@ -457,6 +476,6 @@
 msgid_plural "arguments %s are not made use of"
 msgstr[0] ""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "추가�� ��들 %s� 무시�어질 것입니다"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "추가�� ��들 %s� 무시�어질 것입니다"
diff -Nru r-base-3.2.3/src/library/graphics/po/R-pl.po r-base-3.3.1/src/library/graphics/po/R-pl.po
--- r-base-3.2.3/src/library/graphics/po/R-pl.po	2015-03-27 23:15:14.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-pl.po	2016-04-27 22:15:28.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,453 +13,774 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "'a' is overridden by 'reg'"
-msgstr "'a' jest nadpisane przez 'reg'"
-
-msgid "only using the first two of %d regression coefficients"
-msgstr "używanie tylko pierwszych dwóch z %d współczynników regresji"
+#. R/image.R: gettextf("%s can only be used with a regular grid", sQuote("useRaster = TRUE"))
+#: R/image.R:0
+msgid "%s can only be used with a regular grid"
+msgstr "%s może być użyte tylko z regularną siatką"
 
+#. R/abline.R: warning("'a' and 'b' are overridden by 'coef'")
+#: R/abline.R:0
 msgid "'a' and 'b' are overridden by 'coef'"
 msgstr "'a' oraz 'b' sÄ… zastÄ…pione przez 'coef'"
 
-msgid "one of 'x1' and 'y1' must be given"
-msgstr "jeden z 'x1' oraz 'y1' musi być podany"
-
-msgid "'x' must be a 2-d contingency table"
-msgstr "'x' musi być 2-wymiarową tabelą kontyngencji"
-
-msgid "all entries of 'x' must be nonnegative and finite"
-msgstr "wszystkie wpisy 'x' muszą być nieujemne oraz skończone"
-
-msgid "at least one entry of 'x' must be positive"
-msgstr "przynajmniej jeden wpis w 'x' musi być dodatni"
-
-msgid "incorrect 'col': must be length 2"
-msgstr "niepoprawne 'col': długość musi wynosić 2"
-
-msgid "only for 1-D table"
-msgstr "tylko dla tabeli 1-wymiarowej"
+#. R/abline.R: warning("'a' is overridden by 'reg'")
+#: R/abline.R:0
+msgid "'a' is overridden by 'reg'"
+msgstr "'a' jest nadpisane przez 'reg'"
 
-msgid "'side' must be in {1:4}"
-msgstr "argument 'side' musi być w przedziale {1:4}"
+#. R/curve.R: warning("'add' will be ignored as there is no existing plot")
+#: R/curve.R:0
+msgid "'add' will be ignored as there is no existing plot"
+msgstr "'add' zostanie zignorowane ponieważ nie ma istniejącego wykresu"
 
-msgid "invalid 'axp'"
-msgstr "niepoprawna wartość 'axp'"
+#. R/stripchart.R: gettextf("'at' must have length equal to the number %d of groups",     n)
+#: R/stripchart.R:0
+msgid "'at' must have length equal to the number %d of groups"
+msgstr "argument 'at' musi mieć długość równą liczbie %d grup"
 
-msgid "invalid 'log'"
-msgstr "niepoprawna wartość 'log'"
+#. R/boxplot.R: gettextf("'at' must have same length as 'z$n', i.e. %d", n)
+#: R/boxplot.R:0
+msgid "'at' must have same length as 'z$n', i.e. %d"
+msgstr "'at' musi mieć tę samą długość co 'z$n', tzn. %d"
 
-msgid "invalid positive 'axp[3]'"
-msgstr "niepoprawne dodatnie 'axp[3]'"
+#. R/hist.R: stop("'breaks' are not strictly increasing")
+#: R/hist.R:0
+msgid "'breaks' are not strictly increasing"
+msgstr "'breaks' nie są ściśle rosnące"
 
-msgid "invalid 'usr'"
-msgstr "niepoprawny argument 'usr'"
+#. R/image.R: stop("'breaks' must all be finite")
+#: R/image.R:0
+msgid "'breaks' must all be finite"
+msgstr "wszystkie 'breaks' muszą być skończone"
 
-msgid "'height' must be a vector or a matrix"
-msgstr "'height' musi być wektorem lub macierzą"
+#. R/fourfoldplot.R: stop("'conf.level' must be a single number between 0 and 1")
+#: R/fourfoldplot.R:0
+msgid "'conf.level' must be a single number between 0 and 1"
+msgstr "'conf.level' musi być pojedynczą liczbą pomiędzy 0 a 1"
 
-msgid "Cannot use shading lines in bars when log scale is used"
-msgstr ""
-"Nie można użyć linii cieniujących w słupkach kiedy używana jest skala "
-"logarytmiczna"
+#. R/curve.R: stop("'expr' did not evaluate to an object of length 'n'")
+#: R/curve.R:0
+msgid "'expr' did not evaluate to an object of length 'n'"
+msgstr "funkcja 'expr' nie została obliczona w obiekt o długości 'n'"
 
-msgid "log scale error: at least one 'height + offset' value <= 0"
+#. R/curve.R: gettextf("'expr' must be a function, or a call or an expression containing '%s'",     xname)
+#: R/curve.R:0
+msgid "'expr' must be a function, or a call or an expression containing '%s'"
 msgstr ""
-"błąd skali logarytmicznej: przynajmniej jedna wartość 'height + offset'  "
-"musi być <= 0"
-
-msgid "log scale error: 'xlim' <= 0"
-msgstr "błąd skali logarytmicznej: 'xlim' <= 0"
-
-msgid "log scale error: 'ylim' <= 0"
-msgstr "błąd skali logarytmicznej: 'ylim' <= 0"
+"'expr' musi być funkcją lub wywołaniem lub wyrażeniem zawierającym '%s'"
 
-msgid "incorrect number of names"
-msgstr "nieprawidłowa liczba nazw"
+#. R/screen.R: stop("'figs' must be a vector or a matrix with 4 columns")
+#: R/screen.R:0
+msgid "'figs' must be a vector or a matrix with 4 columns"
+msgstr "'figs' musi być wektorem lub macierzą z 4-ma kolumnami"
 
-msgid "invalid first argument"
-msgstr "niepoprawny pierwszy argument"
+#. R/screen.R: stop("'figs' must specify at least one screen")
+#: R/screen.R:0
+msgid "'figs' must specify at least one screen"
+msgstr "'figs' musi określać przynajmniej jeden ekran"
 
+#. R/boxplot.R: stop("'formula' missing or incorrect")
+#: R/boxplot.R:0
 msgid "'formula' missing or incorrect"
 msgstr "brakujÄ…ca lub niepoprawna 'formula'"
 
-msgid "'at' must have same length as 'z$n', i.e. %d"
-msgstr "'at' musi mieć tę samą długość co 'z$n', tzn. %d"
-
-msgid "invalid boxplot widths"
-msgstr "niepoprawne szerokości wykresu pudełkowego"
-
-msgid "some notches went outside hinges ('box'): maybe set notch=FALSE"
-msgstr "niektóre wcięcia wyszły poza oś ('box'): może ustaw 'notch=FALSE'"
-
+#. R/cdplot.R: stop("'formula' should specify exactly two variables")
+#. R/spineplot.R: stop("'formula' should specify exactly two variables")
+#. R/sunflowerplot.R: stop("'formula' should specify exactly two variables")
+#: R/cdplot.R:0 R/spineplot.R:0 R/sunflowerplot.R:0
 msgid "'formula' should specify exactly two variables"
 msgstr "'formula' powinna określać dokładnie dwie zmienne"
 
-msgid "dependent variable should be a factor"
-msgstr "zmienna zależna powinna być czynnikiem"
+#. R/curve.R: stop("'from' and 'to' must be > 0 with log=\"x\"")
+#: R/curve.R:0
+msgid "'from' and 'to' must be > 0 with log=\"x\""
+msgstr "'from' oraz 'to' muszą być > 0 z log=\"x\""
 
-msgid "y axis is on a cumulative probability scale, 'ylim' must be in [0,1]"
-msgstr ""
-"oś y jest w skali skumulowanego prawdopodobieństwa, 'ylim' musi być w "
-"przedziale [0,1]"
+#. R/barplot.R: stop("'height' must be a vector or a matrix")
+#: R/barplot.R:0
+msgid "'height' must be a vector or a matrix"
+msgstr "'height' musi być wektorem lub macierzą"
 
-msgid "no 'z' matrix specified"
-msgstr "nie określono macierzy 'z'"
+#. R/hist.R: warning("'include.lowest' ignored as 'breaks' is not a vector")
+#: R/hist.R:0
+msgid "'include.lowest' ignored as 'breaks' is not a vector"
+msgstr "'include.lowest' zignorowano ponieważ 'breaks' nie jest wektorem"
 
-msgid "increasing 'x' and 'y' values expected"
-msgstr "oczekiwano zwiększających się wartości 'x' oraz 'y'"
+#. R/legend.R: stop("'legend' is of length 0")
+#: R/legend.R:0
+msgid "'legend' is of length 0"
+msgstr "argument 'legend' ma długość 0"
 
-msgid "no proper 'z' matrix specified"
-msgstr "nie określono odpowiedniej macierzy 'z'"
+#. R/stars.R: stop("'locations' must be a 2-column matrix.")
+#: R/stars.R:0
+msgid "'locations' must be a 2-column matrix."
+msgstr "'locations' musi być 2-kolumnową macierzą"
 
-msgid "invalid conditioning formula"
-msgstr "niepoprawna formuła warunkowa"
+#. R/legend.R: warning("'merge = TRUE' has no effect when no line segments are drawn")
+#: R/legend.R:0
+msgid "'merge = TRUE' has no effect when no line segments are drawn"
+msgstr "'merge = TRUE' nie ma efektu gdy nie są rysowane żadne linie segmentów"
 
-msgid "incompatible variable lengths"
-msgstr "niespójne długości zmiennych"
+#. R/hist.R: warning("'nclass' not used when 'breaks' is specified")
+#: R/hist.R:0
+msgid "'nclass' not used when 'breaks' is specified"
+msgstr "'nclass' nie jest używane gdy określony jest argument 'breaks'"
+
+#. R/stars.R: stop("'nrow * ncol' is less than the number of observations")
+#: R/stars.R:0
+msgid "'nrow * ncol' is less than the number of observations"
+msgstr "'ncol * nrow' jest mniejsze niż liczba obserwacji"
+
+#. R/smoothScatter.R: stop("'nrpoints' should be numeric scalar with value >= 0.")
+#: R/smoothScatter.R:0
+msgid "'nrpoints' should be numeric scalar with value >= 0."
+msgstr "'nrpoints' powinien być liczbą o wartości >= 0"
 
+#. R/coplot.R: stop("'number' must be integer >= 1")
+#: R/coplot.R:0
 msgid "'number' must be integer >= 1"
 msgstr "'number' musi być liczbą całkowitą >= 1"
 
+#. R/sunflowerplot.R: stop("'number' must have same length as 'x' and 'y'")
+#: R/sunflowerplot.R:0
+msgid "'number' must have same length as 'x' and 'y'"
+msgstr "'number' musi mieć tę samą długość co 'x' oraz 'y'"
+
+#. R/coplot.R: stop("'overlap' must be < 1 (and typically >= 0).")
+#: R/coplot.R:0
 msgid "'overlap' must be < 1 (and typically >= 0)."
 msgstr "'overlap' musi być < 1 (oraz zazwyczaj >= 0)."
 
-msgid "invalid 'given.values'"
-msgstr "niepoprawna wartość 'given.values'"
-
-msgid "rows * columns too small"
-msgstr "liczba wierszy * liczba kolumn jest zbyt mała"
+#. R/plot.R: stop("'plot.data.frame' applied to non data frame")
+#: R/plot.R:0
+msgid "'plot.data.frame' applied to non data frame"
+msgstr "'plot.data.frame' zastosowano do danych niebędących ramką danych"
 
-msgid "Missing rows: %s"
-msgstr "BrakujÄ…ce wiersze %s"
+#. R/hist.R: stop("'probability' is an alias for '!freq', however they differ.")
+#: R/hist.R:0
+msgid "'probability' is an alias for '!freq', however they differ."
+msgstr "'probability' jest aliasem dla '!freq', jednakże różnią się"
 
-msgid "'expr' must be a function, or a call or an expression containing '%s'"
+#. R/layout.R: stop("'respect' must be logical or matrix with same dimension as 'mat'")
+#: R/layout.R:0
+msgid "'respect' must be logical or matrix with same dimension as 'mat'"
 msgstr ""
-"'expr' musi być funkcją lub wywołaniem lub wyrażeniem zawierającym '%s'"
-
-msgid "'add' will be ignored as there is no existing plot"
-msgstr "'add' zostanie zignorowane ponieważ nie ma istniejącego wykresu"
-
-msgid "'from' and 'to' must be > 0 with log=\"x\""
-msgstr "'from' oraz 'to' muszą być > 0 z log=\"x\""
+"'respect' musi być wartością logiczną lub macierzą o tym samym wymiarze co "
+"'mat'"
 
-msgid "'expr' did not evaluate to an object of length 'n'"
-msgstr "funkcja 'expr' nie została obliczona w obiekt o długości 'n'"
+#. R/stem.R: stop("'scale' must be positive")
+#: R/stem.R:0
+msgid "'scale' must be positive"
+msgstr "argument 'scale' musi być dodatni"
 
-msgid "wrong method"
-msgstr "błędna metoda"
+#. R/axis.R: stop("'side' must be in {1:4}")
+#: R/axis.R:0
+msgid "'side' must be in {1:4}"
+msgstr "argument 'side' musi być w przedziale {1:4}"
 
-msgid "Must specify 'breaks' in hist(<POSIXt>)"
-msgstr "'breaks' w 'hist(<POSIXt>)' muszą być określone"
+#. R/legend.R: stop("'text.width' must be numeric, >= 0")
+#: R/legend.R:0
+msgid "'text.width' must be numeric, >= 0"
+msgstr "argument 'text.width' musi być liczbą >= 0"
 
-msgid "invalid specification of 'breaks'"
-msgstr "niepoprawne określenie dla 'breaks'"
+#. R/matplot.R: stop("'x' and 'y' must have only 1 or the same number of columns")
+#: R/matplot.R:0
+msgid "'x' and 'y' must have only 1 or the same number of columns"
+msgstr "'x' oraz 'y' muszą mieć tylko 1 lub tę samą liczbę kolumn"
 
-msgid "Must specify 'breaks' in hist(<Date>)"
-msgstr "'breaks' w 'hist(<Date>)' muszą być określone"
+#. R/matplot.R: stop("'x' and 'y' must have same number of rows")
+#: R/matplot.R:0
+msgid "'x' and 'y' must have same number of rows"
+msgstr "'x' oraz 'y' muszą mieć tę samą liczbę wierszy"
 
-msgid "'x' must be a numeric vector or matrix"
-msgstr "'x' musi być wektorem liczbowym lub macierzą"
+#. R/image.R: stop("'x' and 'y' values must be finite and non-missing")
+#: R/image.R:0
+msgid "'x' and 'y' values must be finite and non-missing"
+msgstr ""
+"wartości 'x' oraz 'y' muszą być skończone i nie mogą być wartościami "
+"brakujÄ…cymi"
 
+#. R/dotchart.R: warning("'x' is neither a vector nor a matrix: using as.numeric(x)")
+#: R/dotchart.R:0
 msgid "'x' is neither a vector nor a matrix: using as.numeric(x)"
 msgstr "'x' nie jest ani wektorem ani macierzą: używanie 'as.numeric(x)'"
 
-msgid "'x' must be an array"
-msgstr "'x' musi być tablicą"
+#. R/hist.R: stop("'x' is wrongly structured")
+#: R/hist.R:0
+msgid "'x' is wrongly structured"
+msgstr "'x' jest błędnie skonstruowany"
 
+#. R/fourfoldplot.R: stop("'x' must be 2- or 3-dimensional")
+#: R/fourfoldplot.R:0
 msgid "'x' must be 2- or 3-dimensional"
 msgstr "'x' musi być 2- lub 3-wymiarowe"
 
-msgid "table for each stratum must be 2 by 2"
-msgstr "tablica dla każdej warstwy musi być rozmiaru 2 na 2"
+#. R/assocplot.R: stop("'x' must be a 2-d contingency table")
+#: R/assocplot.R:0
+msgid "'x' must be a 2-d contingency table"
+msgstr "'x' musi być 2-wymiarową tabelą kontyngencji"
 
-msgid "'conf.level' must be a single number between 0 and 1"
-msgstr "'conf.level' musi być pojedynczą liczbą pomiędzy 0 a 1"
+#. R/plot.design.R: stop("'x' must be a data frame")
+#: R/plot.design.R:0
+msgid "'x' must be a data frame"
+msgstr "'x' musi być ramką danych"
 
-msgid "incorrect 'margin' specification"
-msgstr "niepoprawne określenie 'margin'"
+#. R/plot.design.R: stop("'x' must be a dataframe or a formula")
+#: R/plot.design.R:0
+msgid "'x' must be a dataframe or a formula"
+msgstr "'x' musi być ramką danych lub formułą"
 
-msgid "incorrect geometry specification"
-msgstr "niepoprawne określenie geometrii"
+#. R/stars.R: stop("'x' must be a matrix or a data frame")
+#: R/stars.R:0
+msgid "'x' must be a matrix or a data frame"
+msgstr "'x' musi być macierzą lub ramką danych"
+
+#. R/dotchart.R: stop("'x' must be a numeric vector or matrix")
+#: R/dotchart.R:0
+msgid "'x' must be a numeric vector or matrix"
+msgstr "'x' musi być wektorem liczbowym lub macierzą"
+
+#. R/fourfoldplot.R: stop("'x' must be an array")
+#: R/fourfoldplot.R:0
+msgid "'x' must be an array"
+msgstr "'x' musi być tablicą"
 
+#. R/hist.R: stop("'x' must be numeric")
+#. R/stem.R: stop("'x' must be numeric")
+#: R/hist.R:0 R/stem.R:0
 msgid "'x' must be numeric"
 msgstr "argument 'x' musi być liczbą"
 
-msgid "invalid length(x)"
-msgstr "niepoprawna wartość 'length(x)'"
+#. R/mosaicplot.R: stop("'x' must not have 0 dimensionality")
+#: R/mosaicplot.R:0
+msgid "'x' must not have 0 dimensionality"
+msgstr "argument 'x' nie może być 0-wymiarowy"
 
-msgid "'nclass' not used when 'breaks' is specified"
-msgstr "'nclass' nie jest używane gdy określony jest argument 'breaks'"
+#. R/pie.R: stop("'x' values must be positive.")
+#: R/pie.R:0
+msgid "'x' values must be positive."
+msgstr "wartości 'x' muszą być dodatnie"
 
-msgid "'include.lowest' ignored as 'breaks' is not a vector"
-msgstr "'include.lowest' zignorowano ponieważ 'breaks' nie jest wektorem"
+#. R/plot.design.R: stop("'y' must be a numeric vector")
+#: R/plot.design.R:0
+msgid "'y' must be a numeric vector"
+msgstr "'y' musi być wektorem liczbowym"
 
-msgid "unknown 'breaks' algorithm"
-msgstr "nieznany algorytm 'breaks'"
+#. R/image.R: stop("'z' must be a matrix")
+#: R/image.R:0
+msgid "'z' must be a matrix"
+msgstr "'z' musi być macierzą"
 
-msgid "invalid number of 'breaks'"
-msgstr "niepoprawna liczba 'breaks'"
+#. R/image.R: stop("'z' must be numeric or logical")
+#: R/image.R:0
+msgid "'z' must be numeric or logical"
+msgstr "argument 'z' musi być liczbą lub wartością logiczną"
 
-msgid "hist.default: pretty() error, breaks=%s"
-msgstr "hist.default: błąd 'pretty()', przerwy=%s"
+#. R/barplot.R: stop("Cannot use shading lines in bars when log scale is used")
+#: R/barplot.R:0
+msgid "Cannot use shading lines in bars when log scale is used"
+msgstr ""
+"Nie można użyć linii cieniujących w słupkach kiedy używana jest skala "
+"logarytmiczna"
 
+#. R/hist.R: gettextf("Invalid breakpoints produced by 'breaks(x)': %s", format(breaks))
+#: R/hist.R:0
 msgid "Invalid breakpoints produced by 'breaks(x)': %s"
 msgstr "niepoprawne punkty przerw wyprodukowane przez funkcjÄ™ 'breaks(x)': %s"
 
-msgid "invalid length(breaks)"
-msgstr "niepoprawna wartość 'length(breaks)'"
+#. R/polygon.R: stop("Invalid fill rule for graphics path")
+#: R/polygon.R:0
+msgid "Invalid fill rule for graphics path"
+msgstr "Niepoprawna reguła wypełnienia dla ścieżki graficznej"
 
-msgid "'breaks' are not strictly increasing"
-msgstr "'breaks' nie są ściśle rosnące"
+#. R/coplot.R: gettextf("Missing rows: %s", paste0(missingrows, collapse = ", "))
+#: R/coplot.R:0
+msgid "Missing rows: %s"
+msgstr "BrakujÄ…ce wiersze %s"
 
-msgid "'probability' is an alias for '!freq', however they differ."
-msgstr "'probability' jest aliasem dla '!freq', jednakże różnią się"
+#. R/datetime.R: stop("Must specify 'breaks' in hist(<Date>)")
+#: R/datetime.R:0
+msgid "Must specify 'breaks' in hist(<Date>)"
+msgstr "'breaks' w 'hist(<Date>)' muszą być określone"
 
-msgid "some 'x' not counted; maybe 'breaks' do not span range of 'x'"
-msgstr ""
-"niektóre wartości zmiennej 'x' nie zostały zliczone; być może wartości "
-"argumentu 'breaks' nie rozciągają się na cały zakres zmiennej 'x'"
+#. R/datetime.R: stop("Must specify 'breaks' in hist(<POSIXt>)")
+#: R/datetime.R:0
+msgid "Must specify 'breaks' in hist(<POSIXt>)"
+msgstr "'breaks' w 'hist(<POSIXt>)' muszą być określone"
 
-msgid "the AREAS in the plot are wrong -- rather use 'freq = FALSE'"
-msgstr "OBSZARY na wykresie są błędne -- użyj raczej 'freq=FALSE'"
+#. R/spineplot.R: stop("a 2-way table has to be specified")
+#: R/spineplot.R:0
+msgid "a 2-way table has to be specified"
+msgstr "2-kierunkowa tabela musi zostać określona"
 
-msgid "'x' is wrongly structured"
-msgstr "'x' jest błędnie skonstruowany"
+#. R/plot.design.R: stop("a variable in 'y' is not numeric")
+#: R/plot.design.R:0
+msgid "a variable in 'y' is not numeric"
+msgstr "zmienna w 'y' nie jest liczbÄ…"
+
+#. R/plot.design.R: stop("all columns/components of 'x' must be factors")
+#: R/plot.design.R:0
+msgid "all columns/components of 'x' must be factors"
+msgstr "wszystkie kolumny/komponenty 'x' muszą być czynnikami"
 
+#. R/assocplot.R: stop("all entries of 'x' must be nonnegative and finite")
+#: R/assocplot.R:0
+msgid "all entries of 'x' must be nonnegative and finite"
+msgstr "wszystkie wpisy 'x' muszą być nieujemne oraz skończone"
+
+#. R/image.R: stop("argument must be matrix-like")
+#: R/image.R:0
 msgid "argument must be matrix-like"
 msgstr "argument musi być w stylu macierzy"
 
-msgid "'x' and 'y' values must be finite and non-missing"
-msgstr ""
-"wartości 'x' oraz 'y' muszą być skończone i nie mogą być wartościami "
-"brakujÄ…cymi"
-
-msgid "'z' must be a matrix"
-msgstr "'z' musi być macierzą"
+#. R/assocplot.R: stop("at least one entry of 'x' must be positive")
+#: R/assocplot.R:0
+msgid "at least one entry of 'x' must be positive"
+msgstr "przynajmniej jeden wpis w 'x' musi być dodatni"
 
-msgid "'z' must be numeric or logical"
-msgstr "argument 'z' musi być liczbą lub wartością logiczną"
+#. R/plot.R: stop("cannot handle more than one 'x' coordinate")
+#. R/plot.R: stop("cannot handle more than one 'x' coordinate")
+#. R/plot.R: stop("cannot handle more than one 'x' coordinate")
+#: R/plot.R:0
+msgid "cannot handle more than one 'x' coordinate"
+msgstr "nie można obsłużyć więcej niż jedną współrzędną 'x'"
 
-msgid "invalid z limits"
-msgstr "niepoprawne granice 'z'"
+#. R/polygon.R: warning("cannot hatch with logarithmic scale active")
+#: R/polygon.R:0
+msgid "cannot hatch with logarithmic scale active"
+msgstr "nie można utworzyć gdy aktywna jest skala logarytmiczna"
 
-msgid "must have one more break than colour"
-msgstr "wymagane jest posiadanie o jedną przerwę więcej niż jest kolorów"
+#. R/stars.R: stop("data in 'x' must be numeric")
+#: R/stars.R:0
+msgid "data in 'x' must be numeric"
+msgstr "dane w 'x' muszą być liczbami"
 
-msgid "'breaks' must all be finite"
-msgstr "wszystkie 'breaks' muszą być skończone"
+#. R/matplot.R: warning("default 'pch' is smaller than number of columns and hence recycled")
+#: R/matplot.R:0
+msgid "default 'pch' is smaller than number of columns and hence recycled"
+msgstr ""
+"domyślna wartość dla 'pch' jest mniejsza niż liczba kolumn dlatego też "
+"kolumny zostały zapętlone"
 
-msgid "unsorted 'breaks' will be sorted before use"
-msgstr "nieposortowane 'breaks' zostaną posortowane przed użyciem"
+#. R/cdplot.R: stop("dependent variable should be a factor")
+#. R/cdplot.R: stop("dependent variable should be a factor")
+#. R/spineplot.R: stop("dependent variable should be a factor")
+#. R/spineplot.R: stop("dependent variable should be a factor")
+#: R/cdplot.R:0 R/spineplot.R:0
+msgid "dependent variable should be a factor"
+msgstr "zmienna zależna powinna być czynnikiem"
 
+#. R/image.R: stop("dimensions of z are not length(x)(-1) times length(y)(-1)")
+#: R/image.R:0
 msgid "dimensions of z are not length(x)(-1) times length(y)(-1)"
 msgstr "wymiary 'z' nie są równe 'length(x)(-1) * length(y)(-1)'"
 
-msgid "%s can only be used with a regular grid"
-msgstr "%s może być użyte tylko z regularną siatką"
-
-msgid "integer colors must be non-negative"
-msgstr "kolory całkowite muszą być nieujemne"
-
-msgid "'respect' must be logical or matrix with same dimension as 'mat'"
-msgstr ""
-"'respect' musi być wartością logiczną lub macierzą o tym samym wymiarze co "
-"'mat'"
-
-msgid ""
-"layout matrix must contain at least one reference\n"
-"to each of the values {1 ... %d}"
-msgstr ""
-"macierz layoutu musi zawierać przynajmniej jedną referencję\n"
-"do każdej z wartości {1 ... %d}"
-
-msgid "invalid 'title'"
-msgstr "niepoprawny argument 'title'"
-
-msgid "'legend' is of length 0"
-msgstr "argument 'legend' ma długość 0"
+#. R/symbols.R: stop("exactly one symbol type must be specified")
+#: R/symbols.R:0
+msgid "exactly one symbol type must be specified"
+msgstr "dokładnie jeden typ symbolu musi być określony"
 
-msgid "invalid coordinate lengths"
-msgstr "niepoprawne długości współrzędnych"
+#. R/stripchart.R: stop("formula missing or incorrect")
+#. R/sunflowerplot.R: stop("formula missing or incorrect")
+#: R/stripchart.R:0 R/sunflowerplot.R:0
+msgid "formula missing or incorrect"
+msgstr "brakuje formuły lub jest ona niepoprawna"
 
-msgid "'text.width' must be numeric, >= 0"
-msgstr "argument 'text.width' musi być liczbą >= 0"
+#. R/hist.R: gettextf("hist.default: pretty() error, breaks=%s", format(breaks))
+#: R/hist.R:0
+msgid "hist.default: pretty() error, breaks=%s"
+msgstr "hist.default: błąd 'pretty()', przerwy=%s"
 
+#. R/legend.R: gettextf("horizontal specification overrides: Number of columns := %d",     n.leg)
+#: R/legend.R:0
 msgid "horizontal specification overrides: Number of columns := %d"
 msgstr "obejścia określenia poziomu: Liczba kolumn := %d"
 
-msgid "'merge = TRUE' has no effect when no line segments are drawn"
-msgstr "'merge = TRUE' nie ma efektu gdy nie są rysowane żadne linie segmentów"
+#. R/coplot.R: stop("incompatible variable lengths")
+#: R/coplot.R:0
+msgid "incompatible variable lengths"
+msgstr "niespójne długości zmiennych"
 
-msgid "not using pch[2..] since pch[1L] has multiple chars"
-msgstr "nie używam 'pch[2..]' skoro 'pch[1L]' ma wielokrotne znaki"
+#. R/assocplot.R: stop("incorrect 'col': must be length 2")
+#: R/assocplot.R:0
+msgid "incorrect 'col': must be length 2"
+msgstr "niepoprawne 'col': długość musi wynosić 2"
 
-msgid "must specify at least one of 'x' and 'y'"
-msgstr "wymagane jest określenie przynajmniej jednej z 'x' oraz 'y'"
+#. R/fourfoldplot.R: stop("incorrect 'margin' specification")
+#: R/fourfoldplot.R:0
+msgid "incorrect 'margin' specification"
+msgstr "niepoprawne określenie 'margin'"
 
-msgid "'x' and 'y' must have same number of rows"
-msgstr "'x' oraz 'y' muszą mieć tę samą liczbę wierszy"
+#. R/fourfoldplot.R: stop("incorrect geometry specification")
+#: R/fourfoldplot.R:0
+msgid "incorrect geometry specification"
+msgstr "niepoprawne określenie geometrii"
 
-msgid "'x' and 'y' must have only 1 or the same number of columns"
-msgstr "'x' oraz 'y' muszą mieć tylko 1 lub tę samą liczbę kolumn"
+#. R/barplot.R: stop("incorrect number of names")
+#: R/barplot.R:0
+msgid "incorrect number of names"
+msgstr "nieprawidłowa liczba nazw"
 
-msgid "default 'pch' is smaller than number of columns and hence recycled"
-msgstr ""
-"domyślna wartość dla 'pch' jest mniejsza niż liczba kolumn dlatego też "
-"kolumny zostały zapętlone"
+#. R/contour.R: stop("increasing 'x' and 'y' values expected")
+#. R/filled.contour.R: stop("increasing 'x' and 'y' values expected")
+#. R/image.R: stop("increasing 'x' and 'y' values expected")
+#. R/persp.R: stop("increasing 'x' and 'y' values expected")
+#: R/contour.R:0 R/filled.contour.R:0 R/image.R:0 R/persp.R:0
+msgid "increasing 'x' and 'y' values expected"
+msgstr "oczekiwano zwiększających się wartości 'x' oraz 'y'"
 
-msgid "missing values in contingency table"
-msgstr "brakujące wartości w tabeli kontyngencji"
+#. R/image.R: stop("integer colors must be non-negative")
+#: R/image.R:0
+msgid "integer colors must be non-negative"
+msgstr "kolory całkowite muszą być nieujemne"
 
-msgid "'x' must not have 0 dimensionality"
-msgstr "argument 'x' nie może być 0-wymiarowy"
+#. R/axis.R: stop("invalid 'axp'")
+#: R/axis.R:0
+msgid "invalid 'axp'"
+msgstr "niepoprawna wartość 'axp'"
+
+#. R/coplot.R: stop("invalid 'given.values'")
+#: R/coplot.R:0
+msgid "invalid 'given.values'"
+msgstr "niepoprawna wartość 'given.values'"
 
+#. R/axis.R: stop("invalid 'log'")
+#: R/axis.R:0
+msgid "invalid 'log'"
+msgstr "niepoprawna wartość 'log'"
+
+#. R/mosaicplot.R: stop("invalid 'shade' specification")
+#: R/mosaicplot.R:0
 msgid "invalid 'shade' specification"
 msgstr "niepoprawne określenie 'shade'"
 
-msgid "length of 'sort' does not conform to 'dim(x)'"
-msgstr "długość  'sort' nie jest zgodna z 'dim(x)'"
-
-msgid "non-numeric argument to 'pairs'"
-msgstr "argument nieliczbowy przekazywany do 'pairs'"
+#. R/legend.R: stop("invalid 'title'")
+#: R/legend.R:0
+msgid "invalid 'title'"
+msgstr "niepoprawny argument 'title'"
 
-msgid "only one column in the argument to 'pairs'"
-msgstr "tylko jedna kolumna w argumencie przekazywanym do 'pairs'"
+#. R/axis.R: stop("invalid 'usr'")
+#: R/axis.R:0
+msgid "invalid 'usr'"
+msgstr "niepoprawny argument 'usr'"
 
+#. R/pairs.R: stop("invalid argument 'horInd'")
+#: R/pairs.R:0
 msgid "invalid argument 'horInd'"
 msgstr "niepoprawny argument 'horInd'"
 
+#. R/pairs.R: stop("invalid argument 'verInd'")
+#: R/pairs.R:0
 msgid "invalid argument 'verInd'"
 msgstr "niepoprawny argument 'verInd'"
 
-msgid "the 'panel' function made a new plot"
-msgstr "funkcja 'panel' utworzyła nowy wykres"
+#. R/boxplot.R: stop("invalid boxplot widths")
+#: R/boxplot.R:0
+msgid "invalid boxplot widths"
+msgstr "niepoprawne szerokości wykresu pudełkowego"
 
-msgid "surface extends beyond the box"
-msgstr "powierzchnia rozciąga się poza pudełko"
+#. R/coplot.R: stop("invalid conditioning formula")
+#: R/coplot.R:0
+msgid "invalid conditioning formula"
+msgstr "niepoprawna formuła warunkowa"
 
-msgid "'x' values must be positive."
-msgstr "wartości 'x' muszą być dodatnie"
+#. R/legend.R: stop("invalid coordinate lengths")
+#: R/legend.R:0
+msgid "invalid coordinate lengths"
+msgstr "niepoprawne długości współrzędnych"
 
-msgid "invalid table 'x'"
-msgstr "niepoprawna tabela 'x'"
+#. R/boxplot.R: stop("invalid first argument")
+#. R/boxplot.R: stop("invalid first argument")
+#. R/stripchart.R: stop("invalid first argument")
+#: R/boxplot.R:0 R/stripchart.R:0
+msgid "invalid first argument"
+msgstr "niepoprawny pierwszy argument"
 
-msgid "cannot handle more than one 'x' coordinate"
-msgstr "nie można obsłużyć więcej niż jedną współrzędną 'x'"
+#. R/hist.R: stop("invalid length(breaks)")
+#: R/hist.R:0
+msgid "invalid length(breaks)"
+msgstr "niepoprawna wartość 'length(breaks)'"
 
-msgid "must have a response variable"
-msgstr "wymagana jest zmienna zależna"
+#. R/hist.R: stop("invalid length(x)")
+#. R/stem.R: stop("invalid length(x)")
+#: R/hist.R:0 R/stem.R:0
+msgid "invalid length(x)"
+msgstr "niepoprawna wartość 'length(x)'"
 
-msgid "'plot.data.frame' applied to non data frame"
-msgstr "'plot.data.frame' zastosowano do danych niebędących ramką danych"
+#. R/hist.R: stop("invalid number of 'breaks'")
+#: R/hist.R:0
+msgid "invalid number of 'breaks'"
+msgstr "niepoprawna liczba 'breaks'"
 
-msgid "'y' must be a numeric vector"
-msgstr "'y' musi być wektorem liczbowym"
+#. R/stripchart.R: stop("invalid plotting method")
+#: R/stripchart.R:0
+msgid "invalid plotting method"
+msgstr "niepoprawna metoda rysowania wykresu"
 
-msgid "'x' must be a data frame"
-msgstr "'x' musi być ramką danych"
+#. R/axis.R: stop("invalid positive 'axp[3]'")
+#: R/axis.R:0
+msgid "invalid positive 'axp[3]'"
+msgstr "niepoprawne dodatnie 'axp[3]'"
 
-msgid "all columns/components of 'x' must be factors"
-msgstr "wszystkie kolumny/komponenty 'x' muszą być czynnikami"
+#. R/rect.R: stop("invalid rectangle specification")
+#: R/rect.R:0
+msgid "invalid rectangle specification"
+msgstr "niepoprawne określenie prostokąta"
 
-msgid "some levels of the factors are empty"
-msgstr "niektóre poziomy czynników są puste"
+#. R/screen.R: stop("invalid screen number")
+#. R/screen.R: stop("invalid screen number")
+#. R/screen.R: stop("invalid screen number")
+#: R/screen.R:0
+msgid "invalid screen number"
+msgstr "niepoprawny numer ekranu"
 
-msgid "'x' must be a dataframe or a formula"
-msgstr "'x' musi być ramką danych lub formułą"
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#. R/datetime.R: stop("invalid specification of 'breaks'")
+#: R/datetime.R:0
+msgid "invalid specification of 'breaks'"
+msgstr "niepoprawne określenie dla 'breaks'"
 
-msgid "a variable in 'y' is not numeric"
-msgstr "zmienna w 'y' nie jest liczbÄ…"
+#. R/plot.R: stop("invalid table 'x'")
+#: R/plot.R:0
+msgid "invalid table 'x'"
+msgstr "niepoprawna tabela 'x'"
 
-msgid "there must be at least one numeric variable!"
-msgstr "musi być przynajmniej jedna zmienna liczbowa!"
+#. R/image.R: stop("invalid z limits")
+#: R/image.R:0
+msgid "invalid z limits"
+msgstr "niepoprawne granice 'z'"
 
-msgid "cannot hatch with logarithmic scale active"
-msgstr "nie można utworzyć gdy aktywna jest skala logarytmiczna"
+#. R/stars.R: warning("labels do not make sense for a single location")
+#: R/stars.R:0
+msgid "labels do not make sense for a single location"
+msgstr "etykiety nie mają sensu dla pojedynczego położenia"
 
-msgid "Invalid fill rule for graphics path"
-msgstr "Niepoprawna reguła wypełnienia dla ścieżki graficznej"
+#. R/layout.R: gettextf("layout matrix must contain at least one reference\nto each of the values {1 ... %d}\n",     num.figures)
+#: R/layout.R:0
+msgid ""
+"layout matrix must contain at least one reference\n"
+"to each of the values {1 ... %d}"
+msgstr ""
+"macierz layoutu musi zawierać przynajmniej jedną referencję\n"
+"do każdej z wartości {1 ... %d}"
 
-msgid "invalid rectangle specification"
-msgstr "niepoprawne określenie prostokąta"
+#. R/stars.R: stop("length of 'angles' must equal 'ncol(x)'")
+#: R/stars.R:0
+msgid "length of 'angles' must equal 'ncol(x)'"
+msgstr "długość 'angles' musi równać się 'ncol(x)'"
 
-msgid "some values will be clipped"
-msgstr "niektóre wartości będą przycięte"
+#. R/mosaicplot.R: stop("length of 'sort' does not conform to 'dim(x)'")
+#: R/mosaicplot.R:0
+msgid "length of 'sort' does not conform to 'dim(x)'"
+msgstr "długość  'sort' nie jest zgodna z 'dim(x)'"
 
-msgid "invalid screen number"
-msgstr "niepoprawny numer ekranu"
+#. R/barplot.R: stop("log scale error: 'xlim' <= 0")
+#: R/barplot.R:0
+msgid "log scale error: 'xlim' <= 0"
+msgstr "błąd skali logarytmicznej: 'xlim' <= 0"
 
-msgid "'figs' must be a vector or a matrix with 4 columns"
-msgstr "'figs' musi być wektorem lub macierzą z 4-ma kolumnami"
+#. R/barplot.R: stop("log scale error: 'ylim' <= 0")
+#: R/barplot.R:0
+msgid "log scale error: 'ylim' <= 0"
+msgstr "błąd skali logarytmicznej: 'ylim' <= 0"
 
-msgid "'figs' must specify at least one screen"
-msgstr "'figs' musi określać przynajmniej jeden ekran"
+#. R/barplot.R: stop("log scale error: at least one 'height + offset' value <= 0")
+#: R/barplot.R:0
+msgid "log scale error: at least one 'height + offset' value <= 0"
+msgstr ""
+"błąd skali logarytmicznej: przynajmniej jedna wartość 'height + offset'  "
+"musi być <= 0"
 
-msgid "'nrpoints' should be numeric scalar with value >= 0."
-msgstr "'nrpoints' powinien być liczbą o wartości >= 0"
+#. R/units.R: warning("log scale:  xyinch() is nonsense")
+#: R/units.R:0
+msgid "log scale:  xyinch() is nonsense"
+msgstr "skala logarytmiczna:  'xyinch()' nie ma sensu"
 
-msgid "a 2-way table has to be specified"
-msgstr "2-kierunkowa tabela musi zostać określona"
+#. R/mosaicplot.R: stop("missing values in contingency table")
+#: R/mosaicplot.R:0
+msgid "missing values in contingency table"
+msgstr "brakujące wartości w tabeli kontyngencji"
 
-msgid "x axis is on a cumulative probability scale, 'xlim' must be in [0,1]"
-msgstr ""
-"oś x jest w skali skumulowanego prawdopodobieństwa, 'xlim' musi być pomiędzy "
-"[0,1]"
+#. R/plot.R: stop("must have a response variable")
+#. R/plot.R: stop("must have a response variable")
+#. R/plot.R: stop("must have a response variable")
+#: R/plot.R:0
+msgid "must have a response variable"
+msgstr "wymagana jest zmienna zależna"
 
-msgid "'x' must be a matrix or a data frame"
-msgstr "'x' musi być macierzą lub ramką danych"
+#. R/image.R: stop("must have one more break than colour")
+#: R/image.R:0
+msgid "must have one more break than colour"
+msgstr "wymagane jest posiadanie o jedną przerwę więcej niż jest kolorów"
 
-msgid "data in 'x' must be numeric"
-msgstr "dane w 'x' muszą być liczbami"
+#. R/matplot.R: stop("must specify at least one of 'x' and 'y'")
+#: R/matplot.R:0
+msgid "must specify at least one of 'x' and 'y'"
+msgstr "wymagane jest określenie przynajmniej jednej z 'x' oraz 'y'"
 
-msgid "'nrow * ncol' is less than the number of observations"
-msgstr "'ncol * nrow' jest mniejsze niż liczba obserwacji"
+#. R/contour.R: stop("no 'z' matrix specified")
+#. R/filled.contour.R: stop("no 'z' matrix specified")
+#. R/image.R: stop("no 'z' matrix specified")
+#. R/persp.R: stop("no 'z' matrix specified")
+#: R/contour.R:0 R/filled.contour.R:0 R/image.R:0 R/persp.R:0
+msgid "no 'z' matrix specified"
+msgstr "nie określono macierzy 'z'"
 
-msgid "labels do not make sense for a single location"
-msgstr "etykiety nie mają sensu dla pojedynczego położenia"
+#. R/stem.R: stop("no finite and non-missing values")
+#: R/stem.R:0
+msgid "no finite and non-missing values"
+msgstr "brak skończonych i niebrakujących wartości"
 
-msgid "'locations' must be a 2-column matrix."
-msgstr "'locations' musi być 2-kolumnową macierzą"
+#. R/contour.R: stop("no proper 'z' matrix specified")
+#. R/filled.contour.R: stop("no proper 'z' matrix specified")
+#: R/contour.R:0 R/filled.contour.R:0
+msgid "no proper 'z' matrix specified"
+msgstr "nie określono odpowiedniej macierzy 'z'"
 
+#. R/pairs.R: stop("non-numeric argument to 'pairs'")
+#. R/pairs.R: stop("non-numeric argument to 'pairs'")
+#: R/pairs.R:0
+msgid "non-numeric argument to 'pairs'"
+msgstr "argument nieliczbowy przekazywany do 'pairs'"
+
+#. R/legend.R: warning("not using pch[2..] since pch[1L] has multiple chars")
+#: R/legend.R:0
+msgid "not using pch[2..] since pch[1L] has multiple chars"
+msgstr "nie używam 'pch[2..]' skoro 'pch[1L]' ma wielokrotne znaki"
+
+#. R/stars.R: stop("number of rows of 'locations' and 'x' must be equal.")
+#: R/stars.R:0
 msgid "number of rows of 'locations' and 'x' must be equal."
 msgstr "liczba wierszy dla 'locations' oraz 'x' muszą być równe"
 
-msgid "length of 'angles' must equal 'ncol(x)'"
-msgstr "długość 'angles' musi równać się 'ncol(x)'"
+#. R/arrows.R: stop("one of 'x1' and 'y1' must be given")
+#. R/segments.R: stop("one of 'x1' and 'y1' must be given")
+#: R/arrows.R:0 R/segments.R:0
+msgid "one of 'x1' and 'y1' must be given"
+msgstr "jeden z 'x1' oraz 'y1' musi być podany"
 
-msgid "no finite and non-missing values"
-msgstr "brak skończonych i niebrakujących wartości"
+#. R/axis.R: stop("only for 1-D table")
+#. R/lines.R: stop("only for 1-D table")
+#. R/points.R: stop("only for 1-D table")
+#: R/axis.R:0 R/lines.R:0 R/points.R:0
+msgid "only for 1-D table"
+msgstr "tylko dla tabeli 1-wymiarowej"
 
-msgid "'scale' must be positive"
-msgstr "argument 'scale' musi być dodatni"
+#. R/pairs.R: stop("only one column in the argument to 'pairs'")
+#: R/pairs.R:0
+msgid "only one column in the argument to 'pairs'"
+msgstr "tylko jedna kolumna w argumencie przekazywanym do 'pairs'"
 
-msgid "invalid plotting method"
-msgstr "niepoprawna metoda rysowania wykresu"
+#. R/abline.R: gettextf("only using the first two of %d regression coefficients",     p)
+#: R/abline.R:0
+msgid "only using the first two of %d regression coefficients"
+msgstr "używanie tylko pierwszych dwóch z %d współczynników regresji"
 
-msgid "'at' must have length equal to the number %d of groups"
-msgstr "argument 'at' musi mieć długość równą liczbie %d grup"
+#. R/coplot.R: stop("rows * columns too small")
+#: R/coplot.R:0
+msgid "rows * columns too small"
+msgstr "liczba wierszy * liczba kolumn jest zbyt mała"
 
-msgid "formula missing or incorrect"
-msgstr "brakuje formuły lub jest ona niepoprawna"
+#. R/hist.R: stop("some 'x' not counted; maybe 'breaks' do not span range of 'x'")
+#: R/hist.R:0
+msgid "some 'x' not counted; maybe 'breaks' do not span range of 'x'"
+msgstr ""
+"niektóre wartości zmiennej 'x' nie zostały zliczone; być może wartości "
+"argumentu 'breaks' nie rozciągają się na cały zakres zmiennej 'x'"
 
-msgid "'number' must have same length as 'x' and 'y'"
-msgstr "'number' musi mieć tę samą długość co 'x' oraz 'y'"
+#. R/plot.design.R: warning("some levels of the factors are empty", call. = FALSE)
+#: R/plot.design.R:0
+msgid "some levels of the factors are empty"
+msgstr "niektóre poziomy czynników są puste"
 
-msgid "exactly one symbol type must be specified"
-msgstr "dokładnie jeden typ symbolu musi być określony"
+#. R/boxplot.R: warning("some notches went outside hinges ('box'): maybe set notch=FALSE")
+#: R/boxplot.R:0
+msgid "some notches went outside hinges ('box'): maybe set notch=FALSE"
+msgstr "niektóre wcięcia wyszły poza oś ('box'): może ustaw 'notch=FALSE'"
 
+#. R/rug.R: warning("some values will be clipped")
+#: R/rug.R:0
+msgid "some values will be clipped"
+msgstr "niektóre wartości będą przycięte"
+
+#. R/persp.R: warning("surface extends beyond the box")
+#: R/persp.R:0
+msgid "surface extends beyond the box"
+msgstr "powierzchnia rozciąga się poza pudełko"
+
+#. R/fourfoldplot.R: stop("table for each stratum must be 2 by 2")
+#: R/fourfoldplot.R:0
+msgid "table for each stratum must be 2 by 2"
+msgstr "tablica dla każdej warstwy musi być rozmiaru 2 na 2"
+
+#. R/pairs.R: stop("the 'panel' function made a new plot")
+#: R/pairs.R:0
+msgid "the 'panel' function made a new plot"
+msgstr "funkcja 'panel' utworzyła nowy wykres"
+
+#. R/hist.R: warning("the AREAS in the plot are wrong -- rather use 'freq = FALSE'")
+#: R/hist.R:0
+msgid "the AREAS in the plot are wrong -- rather use 'freq = FALSE'"
+msgstr "OBSZARY na wykresie są błędne -- użyj raczej 'freq=FALSE'"
+
+#. R/plot.R: gettextf("the formula '%s' is treated as '%s'", format(formula),     format(local({        f <- formula        f[[3L]] <- quote(1)        f    })))
+#: R/plot.R:0
+msgid "the formula '%s' is treated as '%s'"
+msgstr "formuła '%s' jest traktowana jako '%s'"
+
+#. R/plot.design.R: stop("there must be at least one numeric variable!")
+#: R/plot.design.R:0
+msgid "there must be at least one numeric variable!"
+msgstr "musi być przynajmniej jedna zmienna liczbowa!"
+
+#. R/hist.R: stop("unknown 'breaks' algorithm")
+#: R/hist.R:0
+msgid "unknown 'breaks' algorithm"
+msgstr "nieznany algorytm 'breaks'"
+
+#. R/image.R: warning("unsorted 'breaks' will be sorted before use")
+#: R/image.R:0
+msgid "unsorted 'breaks' will be sorted before use"
+msgstr "nieposortowane 'breaks' zostaną posortowane przed użyciem"
+
+#. R/datetime.R: stop("wrong method")
+#. R/datetime.R: stop("wrong method")
+#: R/datetime.R:0
+msgid "wrong method"
+msgstr "błędna metoda"
+
+#. R/spineplot.R: warning("x axis is on a cumulative probability scale, 'xlim' must be in [0,1]")
+#: R/spineplot.R:0
+msgid "x axis is on a cumulative probability scale, 'xlim' must be in [0,1]"
+msgstr ""
+"oś x jest w skali skumulowanego prawdopodobieństwa, 'xlim' musi być pomiędzy "
+"[0,1]"
+
+#. R/units.R: warning("x log scale:  xinch() is nonsense")
+#: R/units.R:0
 msgid "x log scale:  xinch() is nonsense"
 msgstr "skala logarytmiczna x:  'xinch()' nie ma sensu"
 
+#. R/cdplot.R: warning("y axis is on a cumulative probability scale, 'ylim' must be in [0,1]")
+#. R/spineplot.R: warning("y axis is on a cumulative probability scale, 'ylim' must be in [0,1]")
+#: R/cdplot.R:0 R/spineplot.R:0
+msgid "y axis is on a cumulative probability scale, 'ylim' must be in [0,1]"
+msgstr ""
+"oś y jest w skali skumulowanego prawdopodobieństwa, 'ylim' musi być w "
+"przedziale [0,1]"
+
+#. R/units.R: warning("y log scale:  yinch() is nonsense")
+#: R/units.R:0
 msgid "y log scale:  yinch() is nonsense"
 msgstr "skala logarytmiczna y:  'yinch()' nie ma sensu"
 
-msgid "log scale:  xyinch() is nonsense"
-msgstr "skala logarytmiczna:  'xyinch()' nie ma sensu"
-
+#. R/boxplot.R: ngettext(length(unique(out[inf])), "Outlier (%s) in boxplot %d is not drawn",     "Outliers (%s) in boxplot %d are not drawn")
+#: R/boxplot.R:0
 msgid "Outlier (%s) in boxplot %d is not drawn"
 msgid_plural "Outliers (%s) in boxplot %d are not drawn"
 msgstr[0] ""
@@ -469,14 +790,16 @@
 msgstr[2] ""
 "Wartości oddalone (%s) na wykresie pudełkowym %d nie zostały narysowane"
 
+#. R/hist.R: ngettext(sum(not.miss), "argument %s is not made use of", "arguments %s are not made use of")
+#: R/hist.R:0
 msgid "argument %s is not made use of"
 msgid_plural "arguments %s are not made use of"
 msgstr[0] "argument %s nie robi użytku z"
 msgstr[1] "argumenty %s nie robią użytku z"
 msgstr[2] "argumenty %s nie robią użytku z"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "dodatkowy argument %s zostanie odrzucony"
-msgstr[1] "dodatkowe argumenty %s zostanÄ… odrzucone"
-msgstr[2] "dodatkowe argumenty %s zostanÄ… odrzucone"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "dodatkowy argument %s zostanie odrzucony"
+#~ msgstr[1] "dodatkowe argumenty %s zostanÄ… odrzucone"
+#~ msgstr[2] "dodatkowe argumenty %s zostanÄ… odrzucone"
diff -Nru r-base-3.2.3/src/library/graphics/po/R-pt_BR.po r-base-3.3.1/src/library/graphics/po/R-pt_BR.po
--- r-base-3.2.3/src/library/graphics/po/R-pt_BR.po	2015-03-18 23:03:22.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-pt_BR.po	2016-04-27 22:15:28.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:55-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -354,6 +354,9 @@
 msgid "invalid table 'x'"
 msgstr "tabela 'x' inválida"
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr "não é possível lidar com mais de uma coordenada 'x'"
 
@@ -483,10 +486,10 @@
 msgstr[1] "argumentos %s não estão sendo utilizados"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "os argumento(s) extras %s serão desconsiderados"
-msgstr[1] "os argumento(s) extras %s serão desconsiderados"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "os argumento(s) extras %s serão desconsiderados"
+#~ msgstr[1] "os argumento(s) extras %s serão desconsiderados"
 
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr "'counts' negativo. Erro interno no código C para \"bincount\""
diff -Nru r-base-3.2.3/src/library/graphics/po/R-ru.po r-base-3.3.1/src/library/graphics/po/R-ru.po
--- r-base-3.2.3/src/library/graphics/po/R-ru.po	2015-03-28 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-ru.po	2016-04-27 22:15:29.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: R 2.10.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
-"PO-Revision-Date: 2015-03-26 18:56-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:07-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -461,12 +461,11 @@
 msgstr[1] "ÁÒÇÕÍÅÎÔÙ %s ÎÅ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ"
 msgstr[2] "ÁÒÇÕÍÅÎÔÙ %s ÎÅ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ %s ÂÕÄÅÔ ÏÔÂÒÏÛÅÎ"
-msgstr[1] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
-msgstr[2] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
-
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ %s ÂÕÄÅÔ ÏÔÂÒÏÛÅÎ"
+#~ msgstr[1] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
+#~ msgstr[2] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr "ÎÅÇÁÔÉ×ÎÙÅ 'counts'. ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ C-ËÏÄÁ ÄÌÑ \"bincount\""
 #~ msgid "explanatory variable should be numeric"
diff -Nru r-base-3.2.3/src/library/graphics/po/ru.po r-base-3.3.1/src/library/graphics/po/ru.po
--- r-base-3.2.3/src/library/graphics/po/ru.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/ru.po	2016-04-27 22:15:29.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 18:57-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:07-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -19,14 +19,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "First-Translator: Dmitri I GOULIAEV <dmitri.gouliaev@telkel.net\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: base.c:43
 msgid "no base graphics system is registered"
 msgstr "не зареги�трирована базова� графиче�ка� �и�тема"
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:333
+#: base.c:340
+#: base.c:348
 msgid "the base graphics system is not registered"
 msgstr "базова� графиче�ка� �и�тема не зареги�трирована"
 
@@ -35,7 +36,8 @@
 msgid "bad units specified in '%s'"
 msgstr "в %s указаны неправильные единицы"
 
-#: graphics.c:1791 graphics.c:1813
+#: graphics.c:1791
+#: graphics.c:1813
 msgid "attempt to plot on null device"
 msgstr "попытка ри�овать на null-у�трой�тве"
 
@@ -121,7 +123,8 @@
 msgid "graphical parameter \"%s\" has the wrong length"
 msgstr "графиче�кий параметр \"%s\" неправильной длины"
 
-#: par.c:262 par.c:673
+#: par.c:262
+#: par.c:673
 #, c-format
 msgid "graphical parameter \"%s\" cannot be set"
 msgstr "графиче�кий параметр \"%s\" не может быть у�тановлен"
@@ -150,12 +153,14 @@
 msgid "calling par(new=TRUE) with no plot"
 msgstr "вызов par(new=TRUE) без графика"
 
-#: par.c:665 par.c:1063
+#: par.c:665
+#: par.c:1063
 #, c-format
 msgid "graphical parameter \"%s\" is obsolete"
 msgstr "графиче�кий параметр \"%s\" у�тарел"
 
-#: par.c:669 par.c:1067
+#: par.c:669
+#: par.c:1067
 #, c-format
 msgid "\"%s\" is not a graphical parameter"
 msgstr "\"%s\" -- не графиче�кий параметр"
@@ -195,9 +200,20 @@
 msgid "invalid font specification"
 msgstr "неправильное указание шрифта"
 
-#: plot.c:276 plot.c:290 plot.c:481 plot.c:486 plot.c:2112 plot.c:2119
-#: plot.c:3141 plot.c:3143 plot.c:3145 plot.c:3300 plot3d.c:1163 plot3d.c:1167
-#: plot3d.c:1169 plot3d.c:1903
+#: plot.c:276
+#: plot.c:290
+#: plot.c:481
+#: plot.c:486
+#: plot.c:2112
+#: plot.c:2119
+#: plot.c:3141
+#: plot.c:3143
+#: plot.c:3145
+#: plot.c:3300
+#: plot3d.c:1163
+#: plot3d.c:1167
+#: plot3d.c:1169
+#: plot3d.c:1903
 #, c-format
 msgid "invalid '%s' value"
 msgstr "неправильное значение '%s'"
@@ -253,9 +269,24 @@
 msgid "invalid type for axis labels"
 msgstr "неправильный тип меток о�ей"
 
-#: plot.c:765 plot.c:1298 plot.c:1621 plot.c:1686 plot.c:1761 plot.c:1827
-#: plot.c:1901 plot.c:1996 plot.c:2072 plot.c:2350 plot.c:2524 plot.c:2740
-#: plot.c:3282 plot.c:3409 plot.c:3485 plot.c:3651 plot.c:3931 plot3d.c:1872
+#: plot.c:765
+#: plot.c:1298
+#: plot.c:1621
+#: plot.c:1686
+#: plot.c:1761
+#: plot.c:1827
+#: plot.c:1901
+#: plot.c:1996
+#: plot.c:2072
+#: plot.c:2350
+#: plot.c:2524
+#: plot.c:2740
+#: plot.c:3282
+#: plot.c:3409
+#: plot.c:3485
+#: plot.c:3651
+#: plot.c:3931
+#: plot3d.c:1872
 msgid "too few arguments"
 msgstr "�лишком мало аргументов"
 
@@ -268,8 +299,18 @@
 msgid "'hadj' must be of length one"
 msgstr "'hadj' должен быть единичной длины"
 
-#: plot.c:873 plot.c:2084 plot.c:2361 plot.c:2367 plot.c:2374 plot.c:2382
-#: plot.c:2389 plot.c:2396 plot.c:2403 plot.c:2410 plot.c:2418 plot.c:2425
+#: plot.c:873
+#: plot.c:2084
+#: plot.c:2361
+#: plot.c:2367
+#: plot.c:2374
+#: plot.c:2382
+#: plot.c:2389
+#: plot.c:2396
+#: plot.c:2403
+#: plot.c:2410
+#: plot.c:2418
+#: plot.c:2425
 #: plot.c:3148
 #, c-format
 msgid "zero-length '%s' specified"
@@ -302,7 +343,8 @@
 msgid "plot type '%s' will be truncated to first character"
 msgstr "тип графика '%s' будет обрезан до первого знака"
 
-#: plot.c:1331 plot.c:3002
+#: plot.c:1331
+#: plot.c:3002
 msgid "invalid plot type"
 msgstr "неправильный тип графика"
 
@@ -359,15 +401,31 @@
 msgid "'a' and 'b' must be finite"
 msgstr "'a' и 'b' должны быть конечными"
 
-#: plot.c:2925 plot.c:4051 plot.c:4055 plot.c:4058 plot.c:4078 plot.c:4082
-#: plot.c:4085 plot3d.c:1085 plot3d.c:1089 plot3d.c:1094 plot3d.c:1098
-#: plot3d.c:1102 plot3d.c:1106 stem.c:158 stem.c:159 stem.c:161 stem.c:162
-#: stem.c:208 stem.c:209
+#: plot.c:2925
+#: plot.c:4051
+#: plot.c:4055
+#: plot.c:4058
+#: plot.c:4078
+#: plot.c:4082
+#: plot.c:4085
+#: plot3d.c:1085
+#: plot3d.c:1089
+#: plot3d.c:1094
+#: plot3d.c:1098
+#: plot3d.c:1102
+#: plot3d.c:1106
+#: stem.c:158
+#: stem.c:159
+#: stem.c:161
+#: stem.c:162
+#: stem.c:208
+#: stem.c:209
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "неправильный аргумент '%s'"
 
-#: plot.c:2997 plot.c:3137
+#: plot.c:2997
+#: plot.c:3137
 #, c-format
 msgid "invalid number of points in %s"
 msgstr "неправильное количе�тво точек в %s"
@@ -397,7 +455,8 @@
 msgid "invalid units"
 msgstr "неправильные единицы"
 
-#: plot.c:3469 plot.c:3576
+#: plot.c:3469
+#: plot.c:3576
 msgid "invalid dendrogram input"
 msgstr "неправильный ввод дендрограммы"
 
@@ -417,7 +476,10 @@
 msgid "invalid circles data"
 msgstr "неправильные данные о кругах"
 
-#: plot.c:3685 plot.c:3706 plot.c:3731 plot.c:3761
+#: plot.c:3685
+#: plot.c:3706
+#: plot.c:3731
+#: plot.c:3761
 msgid "invalid symbol parameter"
 msgstr "неправильный �имвольный параметр"
 
@@ -467,20 +529,26 @@
 msgid "invalid symbol type"
 msgstr "неправильный тип �имвола"
 
-#: plot.c:3944 plot.c:3946 plot.c:3951 plot.c:3953
+#: plot.c:3944
+#: plot.c:3946
+#: plot.c:3951
+#: plot.c:3953
 #, c-format
 msgid "incorrect length for '%s' argument"
 msgstr "неправильна� длина аргумента '%s''"
 
-#: plot3d.c:181 plot3d.c:1929
+#: plot3d.c:181
+#: plot3d.c:1929
 msgid "insufficient 'x' or 'y' values"
 msgstr "недо�таточные значени� 'x' или 'y'"
 
-#: plot3d.c:185 plot3d.c:1932
+#: plot3d.c:185
+#: plot3d.c:1932
 msgid "dimension mismatch"
 msgstr "не�оответ�твие размерно�ти"
 
-#: plot3d.c:193 plot3d.c:1935
+#: plot3d.c:193
+#: plot3d.c:1935
 msgid "no contour values"
 msgstr "нет значений контура"
 
@@ -492,7 +560,8 @@
 msgid "invalid contour levels: must be strictly increasing"
 msgstr "неправильные уровни контура: должны четко увеличивать��"
 
-#: plot3d.c:1049 plot3d.c:1062
+#: plot3d.c:1049
+#: plot3d.c:1062
 msgid "Axis orientation not calculated"
 msgstr "Положение о�ей не вычи�лено"
 
@@ -528,7 +597,8 @@
 msgid "invalid viewing parameters"
 msgstr "неправильные параметры про�мотра"
 
-#: plot3d.c:1179 plot3d.c:1183
+#: plot3d.c:1179
+#: plot3d.c:1183
 #, c-format
 msgid "invalid '%s' specification"
 msgstr "неправильное определение '%s'"
@@ -573,48 +643,34 @@
 
 #~ msgid "unable to allocate memory (in GPolygon)"
 #~ msgstr "не могу разме�тить пам�ть (в GPolygon)"
-
 #~ msgid "invalid number of points in identify()"
 #~ msgstr "неправильное количе�тво точек в identify()"
-
 #~ msgid "Event GE_ScalePS requires a single numeric value"
 #~ msgstr "Событие GE_ScalePS требует единичного чи�лового значени�"
-
 #~ msgid "zero length 'padj' specified"
 #~ msgstr "указан 'padj' нулевой длины"
-
 #~ msgid "unable to allocate memory (in GPath)"
 #~ msgstr "не могу разме�тить пам�ть (в GPath)"
-
 #~ msgid "invalid x or y (in GPath)"
 #~ msgstr "неправильный x или y (в GPath)"
-
 #~ msgid "zero length 'labels'"
 #~ msgstr "нулевые 'labels'"
-
 #~ msgid "zero length 'text' specified"
 #~ msgstr "указана нулева� длина 'text'"
-
 #~ msgid "zero length 'line' specified"
 #~ msgstr "указан нулева� длина 'line'"
-
 #~ msgid "zero length 'outer' specified"
 #~ msgstr "указана нулева� длина 'outer'"
-
 #~ msgid "zero length 'at' specified"
 #~ msgstr "указана нулева� длина 'at'"
-
 #~ msgid "zero length 'adj' specified"
 #~ msgstr "указана нулева� длина 'adj'"
-
 #~ msgid "zero length 'cex' specified"
 #~ msgstr "указана нулева� длина 'cex'"
-
 #~ msgid "zero length 'col' specified"
 #~ msgstr "указана нулева� длина 'col'"
-
 #~ msgid "zero length 'font' specified"
 #~ msgstr "указана нулева� длина 'font'"
-
 #~ msgid "unable to allocate memory (in xspline)"
 #~ msgstr "не могу разме�тить пам�ть (в xspline)"
+
diff -Nru r-base-3.2.3/src/library/graphics/po/R-zh_CN.po r-base-3.3.1/src/library/graphics/po/R-zh_CN.po
--- r-base-3.2.3/src/library/graphics/po/R-zh_CN.po	2015-03-18 23:03:22.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/R-zh_CN.po	2016-04-27 22:15:29.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-01 13:19\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -334,6 +334,9 @@
 msgid "invalid table 'x'"
 msgstr "'x'表�对"
 
+msgid "the formula '%s' is treated as '%s'"
+msgstr ""
+
 msgid "cannot handle more than one 'x' coordinate"
 msgstr "�能处�多个'x'座标"
 
@@ -454,9 +457,9 @@
 msgid_plural "arguments %s are not made use of"
 msgstr[0] "没有用%s这个�数"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "多余的�数%s略过�用"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "多余的�数%s略过�用"
 
 #~ msgid "negative 'counts'. Internal Error in C-code for \"bincount\""
 #~ msgstr "负的'counts'。\"bincount\"的C�里出现了内部错误"
diff -Nru r-base-3.2.3/src/library/graphics/po/tr.po r-base-3.3.1/src/library/graphics/po/tr.po
--- r-base-3.2.3/src/library/graphics/po/tr.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/tr.po	2016-04-27 22:15:29.000000000 +0000
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-04-02 18:24+0200\n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -24,7 +24,12 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "geçersiz grafik durumu"
+
+#: base.c:385 base.c:392 base.c:400
 #, fuzzy
 msgid "the base graphics system is not registered"
 msgstr "çok fazla grafik sistemi kayıtlı"
diff -Nru r-base-3.2.3/src/library/graphics/po/zh_CN.po r-base-3.3.1/src/library/graphics/po/zh_CN.po
--- r-base-3.2.3/src/library/graphics/po/zh_CN.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/zh_CN.po	2016-04-27 22:15:29.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-05-20 18:26+0800\n"
 "Last-Translator: ronggui\n"
 "Language-Team: Chinese\n"
@@ -21,7 +21,12 @@
 msgid "no base graphics system is registered"
 msgstr "没有注册的基础图形系统"
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "图形狀態�对"
+
+#: base.c:385 base.c:392 base.c:400
 msgid "the base graphics system is not registered"
 msgstr "没有注册基础图形系统"
 
diff -Nru r-base-3.2.3/src/library/graphics/po/zh_TW.po r-base-3.3.1/src/library/graphics/po/zh_TW.po
--- r-base-3.2.3/src/library/graphics/po/zh_TW.po	2015-06-06 22:15:33.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/po/zh_TW.po	2016-04-27 22:15:29.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.14.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-10-13 17:30+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -22,7 +22,12 @@
 msgid "no base graphics system is registered"
 msgstr ""
 
-#: base.c:333 base.c:340 base.c:348
+#: base.c:310
+#, fuzzy
+msgid "Incompatible graphics state"
+msgstr "繪圖狀態�正確"
+
+#: base.c:385 base.c:392 base.c:400
 #, fuzzy
 msgid "the base graphics system is not registered"
 msgstr "登記了太多的繪圖系統"
diff -Nru r-base-3.2.3/src/library/graphics/R/datetime.R r-base-3.3.1/src/library/graphics/R/datetime.R
--- r-base-3.2.3/src/library/graphics/R/datetime.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/datetime.R	2016-03-16 23:03:35.000000000 +0000
@@ -85,7 +85,7 @@
 
 hist.POSIXt <- function(x, breaks, ..., xlab = deparse(substitute(x)),
                         plot = TRUE, freq = FALSE,
-                        start.on.monday = TRUE, format)
+                        start.on.monday = TRUE, format, right = TRUE)
 {
     if(!inherits(x, "POSIXt")) stop("wrong method")
     xlab
@@ -136,7 +136,9 @@
                 end$isdst <- -1L
                 breaks <- seq(start, end, "months")
                 ind <- seq_along(breaks[-1L])
-                breaks[ind] <- breaks[ind] - 86400
+                if (right)
+                    breaks[ind] <- breaks[ind] - 86400
+		if (missing(format)) format <- "%Y-%m-%d"
             } else if(valid == 7L) { # "years"
                 start$mon <- 0L
                 start$mday <- 1L
@@ -147,7 +149,9 @@
                 end$isdst <- -1L
                 breaks <- seq(start, end, "years")
                 ind <- seq_along(breaks[-1L])
-                breaks[ind] <- breaks[ind] - 86400
+                if (right)
+                    breaks[ind] <- breaks[ind] - 86400
+		if (missing(format)) format <- "%Y-%m-%d"
             } else if(valid == 8L) { # "quarters"
                 qtr <- rep(c(0L, 3L, 6L, 9L), each = 3L)
                 start$mon <- qtr[start$mon + 1L]
@@ -159,7 +163,9 @@
                 end$isdst <- -1L
                 breaks <- seq(start, end, "3 months")
                 ind <- seq_along(breaks[-1L])
-                breaks[ind] <- breaks[ind] - 86400
+                if (right)
+                    breaks[ind] <- breaks[ind] - 86400
+		if (missing(format)) format <- "%Y-%m-%d"
            } else { # "days" or "weeks"
                 maxx <- max(x, na.rm = TRUE)
                 breaks <- seq(start, maxx + incr, breaks)
@@ -169,7 +175,7 @@
         else stop("invalid specification of 'breaks'")
     }
     res <- hist.default(unclass(x), unclass(breaks), plot = FALSE,
-                        warn.unused = FALSE, ...)
+                        warn.unused = FALSE, right = right, ...)
     res$equidist <- TRUE # years are of uneven lengths
     res$intensities <- res$intensities*incr
     res$xname <- xlab
@@ -245,7 +251,7 @@
 
 hist.Date <- function(x, breaks, ..., xlab = deparse(substitute(x)),
                       plot = TRUE, freq = FALSE,
-                      start.on.monday = TRUE, format)
+                      start.on.monday = TRUE, format, right = TRUE)
 {
     if(!inherits(x, "Date")) stop("wrong method")
     force(xlab)
@@ -285,7 +291,10 @@
                 end <- as.POSIXlt(end + (31 * 86400))
                 end$mday <- 1
                 end$isdst <- -1
-                breaks <- as.Date(seq(start, end, "months")) - 1
+                breaks <- as.Date(seq(start, end, "months"))
+                if (right)
+                    breaks <- breaks - 1
+		if (missing(format)) format <- "%Y-%m-%d"
             } else if(valid == 4L) { ## "years"
                 start$mon <- 0L
                 start$mday <- 1L
@@ -294,7 +303,10 @@
                 end$mon <- 0L
                 end$mday <- 1L
                 end$isdst <- -1
-                breaks <- as.Date(seq(start, end, "years")) - 1
+                breaks <- as.Date(seq(start, end, "years"))
+                if (right)
+                    breaks <- breaks - 1
+		if (missing(format)) format <- "%Y-%m-%d"
             } else if(valid == 5L) { ## "quarters"
                 qtr <- rep(c(0L, 3L, 6L, 9L), each = 3L)
                 start$mon <- qtr[start$mon + 1L]
@@ -304,7 +316,10 @@
                 end$mon <- qtr[end$mon + 1L]
                 end$mday <- 1L
                 end$isdst <- -1
-                breaks <- as.Date(seq(start, end, "3 months")) - 1
+                breaks <- as.Date(seq(start, end, "3 months"))
+                if (right)
+                    breaks <- breaks - 1
+		if (missing(format)) format <- "%Y-%m-%d"
             } else { ## "days" (or "weeks")
                 start <- as.Date(start)
                 maxx <- max(x, na.rm = TRUE)
@@ -313,7 +328,7 @@
             }
         } else stop("invalid specification of 'breaks'")
     }
-    res <- hist.default(unclass(x), unclass(breaks), plot = FALSE, warn.unused = FALSE, ...)
+    res <- hist.default(unclass(x), unclass(breaks), plot = FALSE, warn.unused = FALSE, right = right, ...)
     res$equidist <- TRUE # years are of uneven lengths
     res$intensities <- res$intensities*incr
     res$xname <- xlab
diff -Nru r-base-3.2.3/src/library/graphics/R/dotchart.R r-base-3.3.1/src/library/graphics/R/dotchart.R
--- r-base-3.2.3/src/library/graphics/R/dotchart.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/dotchart.R	2016-03-16 23:03:34.000000000 +0000
@@ -17,7 +17,8 @@
 #  https://www.R-project.org/Licenses/
 
 dotchart <-
-function(x, labels = NULL, groups = NULL, gdata = NULL, cex = par("cex"),
+function(x, labels = NULL, groups = NULL, gdata = NULL,
+         cex = par("cex"), pt.cex = cex,
 	 pch = 21, gpch = 21, bg = par("bg"), color = par("fg"),
 	 gcolor = par("fg"), lcolor = "gray",
 	 xlim = range(x[is.finite(x)]),
@@ -97,7 +98,7 @@
               col = color, las = 2, cex = cex, ...)
     }
     abline(h = y, lty = "dotted", col = lcolor)
-    points(x, y, pch = pch, col = color, bg = bg)
+    points(x, y, pch = pch, col = color, bg = bg, cex = pt.cex/cex)
     if (!is.null(groups)) {
 	gpos <- rev(cumsum(rev(tapply(groups, groups, length)) + 2) - 1)
 	ginch <- max(strwidth(glabels, "inch"), na.rm = TRUE)
@@ -106,7 +107,8 @@
               adj = 0, col = gcolor, las = 2, cex = cex, ...)
 	if (!is.null(gdata)) {
 	    abline(h = gpos, lty = "dotted")
-	    points(gdata, gpos, pch = gpch, col = gcolor, bg = bg, ...)
+	    points(gdata, gpos, pch = gpch, col = gcolor, bg = bg,
+                   cex = pt.cex/cex, ...)
 	}
     }
     axis(1)
diff -Nru r-base-3.2.3/src/library/graphics/R/fourfoldplot.R r-base-3.3.1/src/library/graphics/R/fourfoldplot.R
--- r-base-3.2.3/src/library/graphics/R/fourfoldplot.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/fourfoldplot.R	2016-03-16 23:03:35.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/graphics/R/fourfoldplot.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -160,7 +160,7 @@
     angle.f <- c( 90, 180,  0, 270)     # 'f' for 'from'
     angle.t <- c(180, 270, 90, 360)     # 't' for 'to'
 
-    opar <- par(mar = c(0, 0, ifelse(is.null(main), 0, 2.5), 0))
+    opar <- par(mar = c(0, 0, if(is.null(main)) 0 else 2.5, 0))
     on.exit(par(opar))
 
     byrow <- FALSE
diff -Nru r-base-3.2.3/src/library/graphics/R/mosaicplot.R r-base-3.3.1/src/library/graphics/R/mosaicplot.R
--- r-base-3.2.3/src/library/graphics/R/mosaicplot.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/mosaicplot.R	2016-03-16 23:03:35.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/graphics/R/mosaicplot.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -180,12 +180,7 @@
     dimd <- length(dx <- dim(x))
     if(dimd == 0L || any(dx == 0L))
         stop("'x' must not have 0 dimensionality")
-    if(!missing(...))
-        warning(sprintf(ngettext(length(list(...)),
-                                 "extra argument %s will be disregarded",
-                                 "extra arguments %s will be disregarded"),
-                         paste(sQuote(names(list(...))), collapse = ", ")),
-                domain = NA)
+    chkDots(...)
     ##-- Set up 'Ind' matrix : to contain indices and data
     Ind <- 1L:dx[1L]
     if(dimd > 1L) {
@@ -400,7 +395,7 @@
        || inherits(edata, "table")
        || length(dim(edata)) > 2) {
         data <- as.table(data)
-        varnames <- attr(stats:::terms.formula(formula), "term.labels")
+        varnames <- attr(stats::terms.formula(formula), "term.labels")
         if(all(varnames != "."))
             data <- margin.table(data,
                                  match(varnames, names(dimnames(data))))
diff -Nru r-base-3.2.3/src/library/graphics/R/plot.R r-base-3.3.1/src/library/graphics/R/plot.R
--- r-base-3.2.3/src/library/graphics/R/plot.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/plot.R	2016-03-16 23:03:35.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/graphics/R/plot.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -206,7 +206,15 @@
                 do.call(funname,
                         c(list(mf[[i]], y, ylab = yl, xlab = xl), dots))
                }
-	} else do.call(funname, c(list(y, ylab = ylab), dots))
+	} else {
+	    if(length(varnames) == 1L && length(formula) == 3L &&
+	       identical(formula[[2L]], formula[[3L]]))
+		warning(gettextf("the formula '%s' is treated as '%s'",
+				 format(formula),
+				 format(local({ f <- formula; f[[3L]] <- quote(1); f}))),
+			domain=NA)
+	    do.call(funname, c(list(y, ylab = ylab), dots))
+	}
     } else do.call("plot.data.frame", c(list(mf), dots))
     invisible()
 }
diff -Nru r-base-3.2.3/src/library/graphics/R/screen.R r-base-3.3.1/src/library/graphics/R/screen.R
--- r-base-3.2.3/src/library/graphics/R/screen.R	2015-08-25 22:17:01.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/screen.R	2016-03-16 23:03:34.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/graphics/R/screen.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,6 +16,9 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
+utils::globalVariables(c(".split.valid.screens", ".split.cur.screen",
+                         ".split.saved.pars", ".split.screens",
+                         ".split.par.list"))
 ## An environment not exported from namespace:graphics used to
 ## store the split.screen settings
 .SSenv <- new.env()
diff -Nru r-base-3.2.3/src/library/graphics/R/smoothScatter.R r-base-3.3.1/src/library/graphics/R/smoothScatter.R
--- r-base-3.2.3/src/library/graphics/R/smoothScatter.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/smoothScatter.R	2016-03-16 23:03:35.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/graphics/R/smoothScatter.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,14 +19,16 @@
 
 smoothScatter <- function(x, y=NULL, nbin=128, bandwidth,
 			  colramp=colorRampPalette(c("white", blues9)),
-			  nrpoints=100, pch=".", cex=1, col="black",
+			  nrpoints=100, ret.selection=FALSE, pch=".", cex=1, col="black",
 			  transformation = function(x) x^.25,
                           postPlotHook = box,
 			  xlab=NULL, ylab=NULL, xlim, ylim,
 			  xaxs=par("xaxs"), yaxs=par("yaxs"), ...)
 {
-    if (!is.numeric(nrpoints) | (nrpoints<0) | (length(nrpoints)!=1) )
+    if (!is.numeric(nrpoints) || nrpoints < 0 || length(nrpoints) != 1)
 	stop("'nrpoints' should be numeric scalar with value >= 0.")
+    nrpoints <- round(nrpoints)
+    ret.selection <- ret.selection && nrpoints > 0
 
     ## similar as in plot.default
     xlabel <- if (!missing(x)) deparse(substitute(x))
@@ -36,18 +38,22 @@
     ylab <- if (is.null(ylab)) xy$ylab else ylab
 
     ## eliminate non-finite (incl. NA) values
-    x <- cbind(xy$x, xy$y)[ is.finite(xy$x) & is.finite(xy$y), , drop = FALSE]
+    ## want to keep rownames
+    x <- cbind(xy$x, xy$y)[ I <- is.finite(xy$x) & is.finite(xy$y), , drop=FALSE]
+    if(ret.selection) iS <- which(I)
 
     ## xlim and ylim
     if(!missing(xlim)) {
 	stopifnot(is.numeric(xlim), length(xlim)==2, is.finite(xlim))
-	x <- x[ min(xlim) <= x[,1] & x[,1] <= max(xlim), ]
+	x <- x[ I <- min(xlim) <= x[,1] & x[,1] <= max(xlim), , drop=FALSE]
+        if(ret.selection) iS <- iS[I]
     } else {
 	xlim <- range(x[,1])
     }
     if(!missing(ylim)) {
 	stopifnot(is.numeric(ylim), length(ylim)==2, is.finite(ylim))
-	x <- x[ min(ylim) <= x[,2] & x[,2] <= max(ylim), ]
+	x <- x[ I <- min(ylim) <= x[,2] & x[,2] <= max(ylim), , drop=FALSE]
+        if(ret.selection) iS <- iS[I]
     } else {
 	ylim <- range(x[,2])
     }
@@ -61,7 +67,7 @@
 
     ## plot color image
     image(xm, ym, z=dens, col=colramp(256),
-	  xlab=xlab, ylab=ylab, xlim=xlim, ylim=ylim, xaxs=xaxs, yaxs=yaxs, ...)
+          xlab=xlab, ylab=ylab, xlim=xlim, ylim=ylim, xaxs=xaxs, yaxs=yaxs, ...)
     if(!is.null(postPlotHook))
 	postPlotHook()
 
@@ -75,6 +81,8 @@
 	ixm <- 1L + as.integer((nx-1)*(x[,1]-xm[1])/(xm[nx]-xm[1]))
 	iym <- 1L + as.integer((ny-1)*(x[,2]-ym[1])/(ym[ny]-ym[1]))
 	sel <- order(dens[cbind(ixm, iym)])[seq_len(nrpoints)]
-	points(x[sel,], pch=pch, cex=cex, col=col)
+	x <- x[sel, , drop=FALSE]
+	points(x, pch=pch, cex=cex, col=col)
+        if(ret.selection) iS[sel]
     }
 }
diff -Nru r-base-3.2.3/src/library/graphics/R/text.R r-base-3.3.1/src/library/graphics/R/text.R
--- r-base-3.2.3/src/library/graphics/R/text.R	2015-08-25 22:17:02.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/R/text.R	2016-05-23 22:15:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/graphics/R/text.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,18 +19,19 @@
 text <- function(x, ...) UseMethod("text")
 
 text.default <-
-function(x, y = NULL, labels = seq_along(x),
+function(x, y = NULL, labels = seq_along(x$x),
          adj = NULL, pos = NULL, offset = 0.5,
          vfont = NULL, cex = 1, col = NULL, font = NULL, ...)
 {
     if (!missing(y) && (is.character(y) || is.expression(y))) {
 	labels <- y; y <- NULL
     }
+    x <- xy.coords(x,y, recycle = TRUE)
     labels <- as.graphicsAnnot(labels)
     if (!is.null(vfont))
         vfont <- c(typeface = pmatch(vfont[1L], Hershey$typeface),
                    fontindex = pmatch(vfont[2L], Hershey$fontindex))
-    .External.graphics(C_text, xy.coords(x,y, recycle = TRUE), labels,
+    .External.graphics(C_text, x, labels,
                        adj, pos, offset, vfont, cex, col, font, ...)
     invisible()
 }
diff -Nru r-base-3.2.3/src/library/graphics/src/base.c r-base-3.3.1/src/library/graphics/src/base.c
--- r-base-3.2.3/src/library/graphics/src/base.c	2015-08-25 22:17:03.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/src/base.c	2016-03-16 23:03:35.000000000 +0000
@@ -261,21 +261,73 @@
 	GReset(dd);
 	break;
     case GE_SaveSnapshotState:
-	/* called from GEcreateSnapshot */
-	bss = dd->gesd[baseRegisterIndex]->systemSpecific;
-	/* Changed from INTSXP in 2.7.0: but saved graphics lists
-	   are protected by an R version number */
-	PROTECT(result = allocVector(RAWSXP, sizeof(GPar)));
-	copyGPar(&(bss->dpSaved), (GPar*) RAW(result));
-	UNPROTECT(1);
+        /* called from GEcreateSnapshot */
+        { 
+            SEXP pkgName;
+            bss = dd->gesd[baseRegisterIndex]->systemSpecific;
+            /* Changed from INTSXP in 2.7.0: but saved graphics lists
+               are protected by an R version number */
+            PROTECT(result = allocVector(RAWSXP, sizeof(GPar)));
+            copyGPar(&(bss->dpSaved), (GPar*) RAW(result));
+            PROTECT(pkgName = mkString("graphics"));
+            setAttrib(result, install("pkgName"), pkgName);
+            UNPROTECT(2);
+        }
 	break;
     case GE_RestoreSnapshotState:
-	/* called from GEplaySnapshot */
-	bss = dd->gesd[baseRegisterIndex]->systemSpecific;
-	copyGPar((GPar*) RAW(data), &(bss->dpSaved));
-	restoredpSaved(dd);
-	copyGPar(&(bss->dp), &(bss->gp));
-	GReset(dd);
+        /* called from GEplaySnapshot */
+        {
+            int i, nState = LENGTH(data) - 1;
+            SEXP graphicsState, snapshotEngineVersion;
+            PROTECT(graphicsState = R_NilValue);
+            /* Prior to engine version 11, "pkgName" was not stored.
+             * (can tell because "engineVersion" was not stored either.)
+             * Assume 'graphics' is first state in snapshot
+             * (though this could be fatal).
+             */
+            PROTECT(snapshotEngineVersion = 
+                    getAttrib(data, install("engineVersion")));
+            if (isNull(snapshotEngineVersion)) {
+                graphicsState = VECTOR_ELT(data, 1);
+            } else {
+                for (i=0; i<nState; i++) {
+                    SEXP state = VECTOR_ELT(data, i + 1);
+                    if (!strcmp(CHAR(STRING_ELT(getAttrib(state, 
+                                                          install("pkgName")), 
+                                                0)), 
+                                "graphics")) {
+                        graphicsState = state;
+                    }
+                }
+            }
+            if (!isNull(graphicsState)) {
+                /* Check that RAW blob being restored is same size
+                 * as GPar struct in current R version.
+                 * Any version difference will have been warned about,
+                 * but a difference here means STOP.
+                 */
+                if (LENGTH(graphicsState) != sizeof(GPar)) {
+                    error(_("Incompatible graphics state"));
+                }
+                bss = dd->gesd[baseRegisterIndex]->systemSpecific;
+                copyGPar((GPar*) RAW(graphicsState), &(bss->dpSaved));
+                /* These are probably redundant because GE_RestoreState
+                 * will follow from GEplayDisplayList(), but no harm
+                 * is done 
+                 * AND there is at least one place that
+                 * depends on this ('gridGraphics' package replays
+                 * an empty DL to do restoredpSaved() on new page)
+                 */
+                restoredpSaved(dd);
+                copyGPar(&(bss->dp), &(bss->gp));
+                GReset(dd);
+                /* Make the device "clean" with respect to 'graphics'
+                 * so that the display list replay starts from scratch
+                 */
+                bss->baseDevice = FALSE;
+            }
+            UNPROTECT(2);
+        }
 	break;
     case GE_CheckPlot:
 	/* called from GEcheckState:
diff -Nru r-base-3.2.3/src/library/graphics/src/graphics.c r-base-3.3.1/src/library/graphics/src/graphics.c
--- r-base-3.2.3/src/library/graphics/src/graphics.c	2015-08-25 22:17:03.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/src/graphics.c	2016-04-08 22:15:13.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2014  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *  Copyright (C) 2002--2011  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -2547,12 +2547,21 @@
 */
 static void (*old_close)(pDevDesc) = NULL;
 
-static void NORET locator_close(pDevDesc dd)
+static void 
+#ifndef WIN32
+NORET 
+#endif
+locator_close(pDevDesc dd)
 {
     if(old_close) old_close(dd);
     dd->close = old_close;
     old_close = NULL;
+    /* It's not safe to call error() in a Windows event handler, so 
+       the GA_Close method records the close event separately.
+    */
+#ifndef WIN32
     error(_("graphics device closed during call to locator or identify"));
+#endif
 }
 
 
@@ -3379,7 +3388,7 @@
  * Could be removed if Rgraphics.h ever gets REPLACED by new API
  * NOTE that base graphics code no longer calls this -- the base
  * graphics system directly calls the graphics engine for mathematical
- * annotation (GEMathText)
+ * annotation (GEMathText in ../../../main/plotmath.c )
  */
 void GMathText(double x, double y, int coords, SEXP expr,
 	       double xc, double yc, double rot,
diff -Nru r-base-3.2.3/src/library/graphics/src/plot3d.c r-base-3.3.1/src/library/graphics/src/plot3d.c
--- r-base-3.2.3/src/library/graphics/src/plot3d.c	2015-08-25 22:17:03.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/src/plot3d.c	2016-03-16 23:03:35.000000000 +0000
@@ -1905,8 +1905,8 @@
     PROTECT(vfont = FixupVFont(CAR(args)));
     if (!isNull(vfont)) {
 	strncpy(familysave, gpptr(dd)->family, 201);
-	strncpy(gpptr(dd)->family, "Her ", 201);
-	gpptr(dd)->family[3] = (char) INTEGER(vfont)[0];
+	strncpy(gpptr(dd)->family, "Hershey ", 201);
+	gpptr(dd)->family[7] = (char) INTEGER(vfont)[0];
 	fontsave = gpptr(dd)->font;
 	gpptr(dd)->font = INTEGER(vfont)[1];
     }
diff -Nru r-base-3.2.3/src/library/graphics/src/plot.c r-base-3.3.1/src/library/graphics/src/plot.c
--- r-base-3.2.3/src/library/graphics/src/plot.c	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/graphics/src/plot.c	2016-03-16 23:03:35.000000000 +0000
@@ -2148,8 +2148,8 @@
 
     /* Done here so 'vfont' trumps inline 'family' */
     if (!isNull(vfont) && !isExpression(txt)) {
-	strncpy(gpptr(dd)->family, "Her ", 201);
-	gpptr(dd)->family[3] = (char) INTEGER(vfont)[0];
+	strncpy(gpptr(dd)->family, "Hershey ", 201);
+	gpptr(dd)->family[7] = (char) INTEGER(vfont)[0];
 	vectorFonts = TRUE;
     }
 
@@ -3306,8 +3306,8 @@
 									\
     /* 'vfont' trumps inline 'family' */				\
     if (!isNull(vfont) && !isExpression(str)) {				\
-	strncpy(gpptr(dd)->family, "Her ", 201);			\
-	gpptr(dd)->family[3] = (char)INTEGER(vfont)[0];			\
+	strncpy(gpptr(dd)->family, "Hershey ", 201);			\
+	gpptr(dd)->family[7] = (char)INTEGER(vfont)[0];			\
 	gpptr(dd)->font = INTEGER(vfont)[1];				\
     } else gpptr(dd)->font = INTEGER(font)[0];				\
 									\
diff -Nru r-base-3.2.3/src/library/grDevices/Makefile.in r-base-3.3.1/src/library/grDevices/Makefile.in
--- r-base-3.2.3/src/library/grDevices/Makefile.in	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/Makefile.in	2013-03-05 23:02:39.000000000 +0000
@@ -27,7 +27,7 @@
 	@$(MAKE) mksrc
 @BYTE_COMPILE_PACKAGES_FALSE@	@$(MAKE) mklazy
 @BYTE_COMPILE_PACKAGES_TRUE@	@$(MAKE) mklazycomp
-	@$(R_GZIPCMD) -9nf $(top_builddir)/library/grDevices/afm/*.afm
+	@$(R_GZIPCMD) -9f $(top_builddir)/library/grDevices/afm/*.afm
 
 mkR: mkR1
 
diff -Nru r-base-3.2.3/src/library/grDevices/man/as.raster.Rd r-base-3.3.1/src/library/grDevices/man/as.raster.Rd
--- r-base-3.2.3/src/library/grDevices/man/as.raster.Rd	2015-12-06 23:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/as.raster.Rd	2016-03-16 23:04:07.000000000 +0000
@@ -8,6 +8,7 @@
 \alias{as.raster}
 \alias{as.raster.logical}
 \alias{as.raster.numeric}
+\alias{as.raster.raw}
 \alias{as.raster.character}
 \alias{as.raster.matrix}
 \alias{as.raster.array}
@@ -21,16 +22,16 @@
 is.raster(x)
 as.raster(x, \dots)
 
+\method{as.raster}{matrix}(x, max = 1, \dots)
+\method{as.raster}{array}(x, max = 1, \dots)
+
 \method{as.raster}{logical}(x, max = 1, \dots)
 \method{as.raster}{numeric}(x, max = 1, \dots)
 \method{as.raster}{character}(x, max = 1, \dots)
-\method{as.raster}{matrix}(x, max = 1, \dots)
-\method{as.raster}{array}(x, max = 1, \dots)
+\method{as.raster}{raw}(x, max = 255L, \dots)
 }
 \arguments{
-  \item{x}{
-    Any R object.
-  }
+  \item{x}{any \R object.}
   \item{max}{number giving the maximum of the color values range.}
   \item{\dots}{further arguments passed to or from other methods.}
 }
@@ -43,8 +44,8 @@
   make use of the \code{as.raster()} function to generate a raster
   object from their input.
 
-  The \code{as.raster()} function is generic so methods can be
-  written to convert other R objects to a raster object.
+  The \code{as.raster()} function is (S3) generic so methods can be
+  written to convert other \R objects to a raster object.
 
   The default implementation for numeric matrices interprets scalar
   values on black-to-white scale.
@@ -52,12 +53,11 @@
   Raster objects can be subsetted like a matrix and it is
   possible to assign to a subset of a raster object.
 
-  There is a method for converting a raster object to a matrix
-  (of colour strings).
+  There is a method for converting a raster object to a
+  \code{\link{matrix}} (of colour strings).
 
-  Raster objects can be compared
-  for equality or inequality (with each other or with a
-  colour string).
+  Raster objects can be compared for equality or inequality (with each
+  other or with a colour string).
 
   There is a \code{\link{is.na}} method which returns a logical matrix
   of the same dimensions as the raster object.  Note that \code{NA}
@@ -92,7 +92,7 @@
 # ... unless nrow/ncol are supplied ...
 as.raster(1:10 \%\% 2 == 0, nrow = 1)
 
-# Matrix can also be logical or numeric ...
+# Matrix can also be logical or numeric (or raw) ...
 as.raster(matrix(c(TRUE, FALSE), nrow = 3, ncol = 2))
 as.raster(matrix(1:3/4, nrow = 3, ncol = 4))
 
diff -Nru r-base-3.2.3/src/library/grDevices/man/cairo.Rd r-base-3.3.1/src/library/grDevices/man/cairo.Rd
--- r-base-3.2.3/src/library/grDevices/man/cairo.Rd	2015-08-25 22:18:27.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/cairo.Rd	2016-03-16 23:04:06.000000000 +0000
@@ -21,12 +21,14 @@
 cairo_pdf(filename = if(onefile) "Rplots.pdf" else "Rplot\%03d.pdf",
           width = 7, height = 7, pointsize = 12,
           onefile = FALSE, family = "sans", bg = "white",
-          antialias = c("default", "none", "gray", "subpixel"))
+          antialias = c("default", "none", "gray", "subpixel"),
+          fallback_resolution = 300)
 
 cairo_ps(filename = if(onefile) "Rplots.ps" else "Rplot\%03d.ps",
          width = 7, height = 7, pointsize = 12,
          onefile = FALSE, family = "sans", bg = "white",
-         antialias = c("default", "none", "gray", "subpixel"))
+         antialias = c("default", "none", "gray", "subpixel"),
+         fallback_resolution = 300)
 }
 \arguments{
   \item{filename}{the name of the output file.
@@ -51,6 +53,9 @@
     par("bg").}
   \item{antialias}{string, the type of anti-aliasing (if any) to be used;
     defaults to \code{"default"}.}
+  \item{fallback_resolution}{numeric: the resolution in dpi used when
+    falling back to bitmap output.  Prior to \R 3.3.0 this depended on
+    the cairo implementation but was commonly 300.}
 }
 \details{
   SVG (Scalar Vector Graphics) is a W3C standard for vector graphics.
@@ -61,8 +66,7 @@
 
   Note that unlike \code{\link{postscript}} and \code{\link{pdf}},
   \code{cairo_pdf} and \code{cairo_ps} sometimes record \emph{bitmaps}
-  and not vector graphics: the resolution may depend on the version of
-  cairo but typically 300dpi is used.  On the other hand, they can
+  and not vector graphics.  On the other hand, they can
   (on suitable platforms) include a much wider range of UTF-8 glyphs,
   and embed the fonts used.
 
diff -Nru r-base-3.2.3/src/library/grDevices/man/colorRamp.Rd r-base-3.3.1/src/library/grDevices/man/colorRamp.Rd
--- r-base-3.2.3/src/library/grDevices/man/colorRamp.Rd	2015-08-25 22:18:28.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/colorRamp.Rd	2016-03-25 23:15:12.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/grDevices/man/colorRamp.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{colorRamp}
@@ -26,7 +26,7 @@
   \item{space}{a character string; interpolation in RGB or CIE Lab
     color spaces.}
   \item{interpolate}{use spline or linear interpolation.}
-  \item{alpha}{logical: should alpha channel (opacity) values should be
+  \item{alpha}{logical: should alpha channel (opacity) values be
     returned?   It is an error to give a true value if
     \code{space} is specified.}
   \item{\dots}{arguments to pass to \code{colorRamp}.}
diff -Nru r-base-3.2.3/src/library/grDevices/man/pdf.Rd r-base-3.3.1/src/library/grDevices/man/pdf.Rd
--- r-base-3.2.3/src/library/grDevices/man/pdf.Rd	2015-08-25 22:18:28.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/pdf.Rd	2016-03-16 23:04:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/grDevices/man/pdf.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{pdf}
@@ -14,7 +14,7 @@
   graphics.
 }
 \usage{
-pdf(file = ifelse(onefile, "Rplots.pdf", "Rplot\%03d.pdf"),
+pdf(file = if(onefile) "Rplots.pdf" else "Rplot\%03d.pdf",
     width, height, onefile, family, title, fonts, version,
     paper, encoding, bg, fg, pointsize, pagecentre, colormodel,
     useDingbats, useKerning, fillOddEven, compress)
diff -Nru r-base-3.2.3/src/library/grDevices/man/postscript.Rd r-base-3.3.1/src/library/grDevices/man/postscript.Rd
--- r-base-3.2.3/src/library/grDevices/man/postscript.Rd	2015-09-10 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/postscript.Rd	2016-03-16 23:04:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/grDevices/man/postscript.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{postscript}
@@ -15,7 +15,7 @@
 %% The definitive doc is the source :-)
 %%      ../../../main/devices.c  &   ../../../unix/devPS.c
 \usage{
-postscript(file = ifelse(onefile, "Rplots.ps", "Rplot\%03d.ps"),
+postscript(file = if(onefile) "Rplots.ps" else "Rplot\%03d.ps",
            onefile, family, title, fonts, encoding, bg, fg,
            width, height, horizontal, pointsize,
            paper, pagecentre, print.it, command,
@@ -40,7 +40,7 @@
   \item{onefile}{logical: if true (the default) allow multiple figures
     in one file.  If false, generate a file name containing the page
     number for each page and use an EPSF header and no
-    \code{DocumentMedia} comment.  Defaults to the \code{TRUE}.}
+    \code{DocumentMedia} comment.  Defaults to \code{TRUE}.}
   \item{family}{the initial font family to be used, normally as a
     character string.  See the section \sQuote{Families}.  Defaults to
     \code{"Helvetica"}.}
diff -Nru r-base-3.2.3/src/library/grDevices/man/pretty.Date.Rd r-base-3.3.1/src/library/grDevices/man/pretty.Date.Rd
--- r-base-3.2.3/src/library/grDevices/man/pretty.Date.Rd	2015-08-25 22:18:28.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/pretty.Date.Rd	2016-04-23 22:15:05.000000000 +0000
@@ -1,11 +1,11 @@
 % File src/library/grDevices/man/pretty.Date.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2010 R Core Team
+% Copyright 2010-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{pretty.Date}
 \title{Pretty Breakpoints for Date-Time Classes}
-\alias{pretty.Date}
+\alias{pretty.Date}%- keep alias{}es - such that ?pretty.Date  works
 \alias{pretty.POSIXt}
 \usage{
 \method{pretty}{Date}(x, n = 5, min.n = n \%/\% 2, sep = " ", \dots)
@@ -14,18 +14,19 @@
 \arguments{
   \item{x}{an object of class \code{"Date"} or \code{"POSIXt"} (i.e.,
     \code{"POSIXct"} or \code{"POSIXlt"}). }
-  \item{n}{integer giving the \emph{desired} number of
-    intervals.  }
+  \item{n}{integer giving the \emph{desired} number of intervals.}
   \item{min.n}{nonnegative integer giving the \emph{minimal} number of
-    intervals.  }
+    intervals.}
   \item{sep}{character string, serving as a separator for certain
     formats (e.g., between month and year). }
   \item{\dots}{further arguments for compatibility with the generic,
     ignored.}
 }
 \description{
-  Compute a  sequence of about \code{n+1} equally spaced \sQuote{nice}
-  values which cover the range of the values in \code{x}.
+  Compute a sequence of about \code{n+1} equally spaced \sQuote{nice}
+  values which cover the range of the values in \code{x}, possibly of
+  length one, when \code{min.n = 0} and there is only one unique
+  \code{x}.
 }
 \value{
   A vector (of the suitable class) of locations, with attribute
@@ -35,20 +36,23 @@
   \code{\link{pretty}} for the default method.
 }
 \examples{
+\donttest{% time-dependent
+pretty(Sys.Date())
+pretty(Sys.time(), n = 10)
+}
+pretty(as.Date("2000-03-01")) # R 1.0.0 came in a leap year
 
-steps <-
-    list("10 secs", "1 min", "5 mins", "30 mins", "6 hours", "12 hours",
-         "1 DSTday", "2 weeks", "1 month", "6 months", "1 year",
-         "10 years", "50 years", "1000 years")
-
-names(steps) <- paste("span =", unlist(steps))
-
+## time ranges in diverse scales:% also in ../../../../tests/reg-tests-1c.R
+require(stats)
+steps <- setNames(,
+    c("10 secs", "1 min", "5 mins", "30 mins", "6 hours", "12 hours",
+      "1 DSTday", "2 weeks", "1 month", "6 months", "1 year",
+      "10 years", "50 years", "1000 years"))
 x <- as.POSIXct("2002-02-02 02:02")
 lapply(steps,
        function(s) {
            at <- pretty(seq(x, by = s, length = 2), n = 5)
            attr(at, "labels")
        })
-
 }
 \keyword{dplot}
diff -Nru r-base-3.2.3/src/library/grDevices/man/recordplot.Rd r-base-3.3.1/src/library/grDevices/man/recordplot.Rd
--- r-base-3.2.3/src/library/grDevices/man/recordplot.Rd	2015-08-25 22:18:28.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/recordplot.Rd	2016-03-16 23:04:07.000000000 +0000
@@ -12,11 +12,17 @@
   Functions to save the current plot in an \R variable, and to replay it.
 }
 \usage{
-recordPlot()
-replayPlot(x)
+recordPlot(load=NULL, attach=NULL)
+replayPlot(x, reloadPkgs=FALSE)
 }
 \arguments{
- \item{x}{A saved plot.}
+  \item{load}{If not \code{NULL}, a character vector of package names,
+    which are saved as part of the recorded plot.}
+  \item{attach}{If not \code{NULL}, a character vector of package names,
+    which are saved as part of the recorded plot.}
+  \item{x}{A saved plot.}
+  \item{reloadPkgs}{A logical indicating whether to reload and/or
+    reattach any packages that were saved as part of the recorded plot.}
 }
 \details{
   These functions record and replay the displaylist of the current
@@ -29,10 +35,32 @@
   \code{\link{str}} are liable to mislead.
 }
 \section{Warning}{
-  The format of recorded plots may change between \R versions.
-  Recorded plots can \strong{not} be used as a permanent
-  storage format for \R plots.  There were extensive changes in \R
-  3.0.0, and now only plots from the current session can be replayed.
+  The format of recorded plots may change between \R versions, so
+  recorded plots should \strong{not} be used as a permanent
+  storage format for \R plots.
+  
+  As of \R 3.3.0, it is possible (again)
+  to replay a plot from another \R session using, for example,
+  \code{\link{saveRDS}} and \code{\link{readRDS}}.
+  It is even possible to replay a plot from another \R version,
+  however, this will produce warnings, may produce errors,
+  or something worse.
+}
+\section{Note}{
+  Replay of a recorded plot may not produce the correct result
+  (or may just fail) if the display list contains a call to
+  \code{\link{recordGraphics}} which in turn contains an expression
+  that calls code from a non-base package other than \pkg{graphics}
+  or \pkg{grid}.  The most well-known example of this is a plot
+  drawn with the package \pkg{ggplot2}.  One solution is to load
+  the relevant package(s) before replaying the recorded plot.
+  The \code{load} and \code{attach} arguments to \code{recordPlot}
+  can be used to automate this - any packages named in \code{load}
+  will be reloaded, via \code{\link{loadNamespace}}, and any packages
+  named in \code{attach} will be reattached, via \code{\link{library}},
+  as long as \code{reloadPkgs} is \code{TRUE} in the call to
+  \code{replayPlot}.  This is only relevant when attempting to
+  replay in one R session a plot that was recorded in a different R session.
 }
 \value{
   \code{recordPlot} returns an object of class \code{"recordedplot"}.
diff -Nru r-base-3.2.3/src/library/grDevices/man/xfig.Rd r-base-3.3.1/src/library/grDevices/man/xfig.Rd
--- r-base-3.2.3/src/library/grDevices/man/xfig.Rd	2015-08-25 22:18:28.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/man/xfig.Rd	2016-03-16 23:04:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/grDevices/man/xfig.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{xfig}
@@ -15,7 +15,7 @@
   \code{xfig} and \code{postscript}.
 }
 \usage{
-xfig(file = ifelse(onefile, "Rplots.fig", "Rplot\%03d.fig"),
+xfig(file = if(onefile) "Rplots.fig" else "Rplot\%03d.fig",
      onefile = FALSE, encoding = "none",
      paper = "default", horizontal = TRUE,
      width = 0, height = 0, family = "Helvetica",
diff -Nru r-base-3.2.3/src/library/grDevices/NAMESPACE r-base-3.3.1/src/library/grDevices/NAMESPACE
--- r-base-3.2.3/src/library/grDevices/NAMESPACE	2015-03-18 23:03:46.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/NAMESPACE	2016-03-19 23:15:07.000000000 +0000
@@ -48,8 +48,8 @@
 
 S3method("print", "raster")
 
-S3method(pretty, Date)
-S3method(pretty, POSIXt)
+S3method(pretty, Date,   prettyDate)
+S3method(pretty, POSIXt, prettyDate)
 
 
 if(tools:::.OStype() == "windows") {
@@ -58,6 +58,7 @@
 
     S3method("[", SavedPlots)
     S3method(print, SavedPlots)
+    importFrom("utils", "shortPathName")
 } else {
     export(X11.options, X11Font, X11Fonts,
            quartz, quartz.options, quartz.save, quartzFont, quartzFonts)
diff -Nru r-base-3.2.3/src/library/grDevices/po/da.po r-base-3.3.1/src/library/grDevices/po/da.po
--- r-base-3.2.3/src/library/grDevices/po/da.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/da.po	2016-04-27 22:15:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-11-29 09:07+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,7 +144,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "mødte ukendt AFM-entitet"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -242,32 +242,32 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr "skrift-CMAP ikke fundet i skriftdatabasen"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "kan ikke indlæse afm-fil '%s'"
 
-#: devPS.c:2386
+#: devPS.c:2388
 #, fuzzy
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "Ødelagte indlæste kodninger;  kodning ikke optaget"
 
-#: devPS.c:2397
+#: devPS.c:2399
 #, fuzzy
 msgid "failed to record device encoding"
 msgstr "Kunne ikke optage enhedskodning"
 
-#: devPS.c:2568
+#: devPS.c:2570
 #, fuzzy
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "Object.ps.prolog er ikke en tegnvektor"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 #, fuzzy
 msgid "invalid line end"
 msgstr "Ugyldig linjeafslutning"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 #, fuzzy
 msgid "invalid line join"
 msgstr "Ugyldig linjeforbindelse"
@@ -275,71 +275,71 @@
 # http://en.wikipedia.org/wiki/Miter_joint
 # må være gering på dansk
 # http://www.denstoredanske.dk/It,_teknik_og_naturvidenskab/Teknik/Boring,_s%C3%A6nkning_og_rivning/gering
-#: devPS.c:2670
+#: devPS.c:2672
 #, fuzzy
 msgid "invalid line mitre"
 msgstr "Ugyldig linjegering"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "forsøg på at bruge ugyldig skrifttype %d erstattet af skrifttype 1"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr "filnavn er for langt i %s()"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "allokeringsproblem for hukommelsen i %s()"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "kodningssti er for lang i %s()"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "kunne ikke indlæse kodningsfil i %s()"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 #, fuzzy
 msgid "invalid font type"
 msgstr "Ugyldig skrifttype"
 
-#: devPS.c:3207
+#: devPS.c:3209
 #, fuzzy
 msgid "failed to initialise default PostScript font"
 msgstr "Kunne ikke initialisere standardskriften for PostScript"
 
-#: devPS.c:3273
+#: devPS.c:3275
 #, fuzzy
 msgid "failed to initialise additional PostScript fonts"
 msgstr "Kunne ikke initialisere yderligere PostScript-skrifter"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "ugyldig forgrund- eller baggrundsfarve (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'kommando' er for lang"
 
-#: devPS.c:3299
+#: devPS.c:3301
 #, fuzzy
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr "postscript(print.it=TRUE) brugt med en tom print-kommando"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "ugyldig sidetype '%s' (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -347,17 +347,17 @@
 "semitransparens er ikke understøttet på denne enhed: kun rapporteret en gang "
 "per side"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "kan ikke åbne postscript-datakanal til '%s'"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "kan ikke åbne fil '%s'"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -366,187 +366,187 @@
 "fejl fra postscript() under kørsel af:\n"
 "    %s"
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, fuzzy, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "CID-familie '%s' er ikke inkluderet i PostScript-enhed"
 
 # 91%
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, fuzzy, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "familie '%s' er ikke inkluderet i PostScript-enhed"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr "ukendt kodning '%s' i 'mbcsToSbcs'"
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr "konverteringsfejl på '%s' i 'mbcsToSbcs': punktum erstattet for <%02x>"
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "fejlede åbn af omdannelsesprogram for kodning af '%s'"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "fejlede i tekstomdannelse til kodning '%s'"
 
-#: devPS.c:4589
+#: devPS.c:4591
 #, fuzzy
 msgid "ran out of colors in xfig()"
 msgstr "løb ud af farver i xfig()"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "uimplementeret linjetekstur %08x: bruger Bindestreg-dobbelt-prikket"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr "ukendt postscript-skriftfamilie '%s', bruger Helvetica"
 
 # 81%
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "ugyldig forgrund- eller baggrundsfarve (xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 #, fuzzy
 msgid "only Type 1 fonts supported for XFig"
 msgstr "Kun Type 1-skrifter understøttet for XFig"
 
 # 79%
-#: devPS.c:4802
+#: devPS.c:4804
 #, fuzzy
 msgid "failed to initialise default XFig font"
 msgstr "Kunne ikke initialisere standardskriften for XFig"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "ugyldig sidetype '%s' (xfig)"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "xfig(%s, onefile=FALSE) vil kun returnere det sidste plot"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "tomt filnavn"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr "skrivning fejlede"
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr "kan ikke bruge kodning '%s'"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr "kan ikke øge 'maxRaster'"
 
-#: devPS.c:5570
+#: devPS.c:5572
 #, fuzzy
 msgid "unable to allocate raster image"
 msgstr "Kan ikke allokere raster-billede"
 
 # 77%
-#: devPS.c:5771
+#: devPS.c:5773
 #, fuzzy
 msgid "corrupt loaded encodings;  font not added"
 msgstr "Ødelagte indlæste kodninger;  skrift ikke tilføjet"
 
-#: devPS.c:5780
+#: devPS.c:5782
 #, fuzzy
 msgid "failed to record device encoding; font not added"
 msgstr "Kunne ikke optage enhedskodning: skrifttype ikke tilføjet"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr "øger PDF-versionen til 1.2"
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "kunne ikke indlæse standardkodning"
 
 # 79%
-#: devPS.c:5987
+#: devPS.c:5989
 #, fuzzy
 msgid "failed to initialise default PDF font"
 msgstr "Kunne ikke initialisere standardskriften for PDF"
 
 # 81%
-#: devPS.c:6042
+#: devPS.c:6044
 #, fuzzy
 msgid "failed to initialise additional PDF fonts"
 msgstr "Kunne ikke initialisere yderligere PDF-skrifter"
 
 # 75%
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr "kunne ikke allokere rastere"
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr "kunne ikke allokere masker"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "ugyldig papirtype '%s' (pdf)"
 
 # 81%
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "ugyldig forgrund- eller baggrundsfarve (pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 #, fuzzy
 msgid "invalid 'alpha' value in PDF"
 msgstr "Ugyldig alfaværdi i PDF"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr "øger PDF-versionen til 1.4"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "ukendt 'colormodel', bruger 'srgb'"
 
-#: devPS.c:6585
+#: devPS.c:6587
 #, fuzzy
 msgid "failed to load sRGB colorspace file"
 msgstr "Kunne ikke indlæse sRGB-farverumsfil"
 
-#: devPS.c:6849
+#: devPS.c:6851
 #, fuzzy
 msgid "corrupt encodings in PDF device"
 msgstr "Ødelagte kodninger i PDF-enhed"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr "øger PDF-versionen til 1.3"
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, fuzzy, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "kan ikke åbne postscript-datakanal til '%s'"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr ""
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -555,27 +555,27 @@
 "kan ikke åbne 'pdf-filargument' '%s'\n"
 "  luk venligst PDF-enheden ned"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 #, fuzzy
 msgid "failed to find or load PDF font"
 msgstr "Kunne ikke finde eller indlæse PDF-skrift"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 #, fuzzy
 msgid "failed to find or load PDF CID font"
 msgstr "Kunne ikke finde eller indlæse PDF CID-skrift"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "ugyldigt 'family'-parameter i %s"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "ugyldigt 'fonts'-parameter i %s"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
@@ -583,7 +583,7 @@
 msgstr "ugyldig værdi for '%s'"
 
 # 85%
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "kan ikke starte %s()-enhed"
diff -Nru r-base-3.2.3/src/library/grDevices/po/de.po r-base-3.3.1/src/library/grDevices/po/de.po
--- r-base-3.2.3/src/library/grDevices/po/de.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/de.po	2016-04-27 22:15:39.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2015-03-20 16:05+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-Core <R-core@r-project.org>\n"
@@ -139,7 +139,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "unbekannte AFM Entität aufgetreten"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -241,93 +241,93 @@
 msgstr ""
 "Zeichensatz CMap für Familie '%s' in der Zeichensatzdatenbank nicht gefunden"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "kann afm Datei '%s' nicht laden"
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "Beschädigte geladene Kodierung; Kodierung nicht aufgezeichnet"
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr "Speichern der Gerätekodierung fehlgeschlagen"
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "Objekt '.ps.prolog' ist keine Zeichenkette"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr "unzulässiges Zeilenende"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr "unzulässige Zeilenverbindung"
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr "unzulässige Zeilenkappung"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr ""
 "Versuch den unzulässigen Zeichensatz %d zu benutzen, nutze stattdessen "
 "Zeichensatz 1"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr "Dateiname in %s() zu lang"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "Speicherreservierungsproblem in %s()"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "Kodierungspfad ist zu lang in %s()"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "Laden der Kodierungsdatei in %s() fehlgeschlagen"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr "unzulässiger Zeichensatztyp"
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr "konnte den standard Postscriptzeichensatz nicht initialisieren"
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr "konnte zusätzliche PostScript Zeichensätze nicht initialisieren"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "unzulässige Vordergrund-/Hintergrundfarbe (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'command' ist zu lang"
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr "'postscript(print.it=TRUE)' mit leerem 'print' Befehl benutzt"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "ungültiger Seitentyp '%s' (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -335,17 +335,17 @@
 "Semi-Transparenz ist für dieses Gerät nicht unterstützt; nur eine Meldung "
 "pro Seite"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "kann die 'postscript' Pipe nach '%s' nicht öffnen"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "kann Datei '%s' nicht öffnen"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -354,169 +354,169 @@
 "Fehler aus postscript() bei der Ausführung:\n"
 "    %s"
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "Die CID Familie '%s' ist nicht im postscript() Gerät enthalten"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "Familie '%s' ist nicht im postscript() Gerät enthalten"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr "unbekannte Kodierung '%s' in 'mbcsToSbcs'"
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr "Konvertierungsfehler für '%s' in 'mbcsToSbcs': Punkt ersetzt <%02x>"
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "konnte Konverter für Kodierung '%s' nicht öffnen"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "konnte Text nicht in Kodierung '%s' konvertieren"
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr "keine Farben mehr übrig in xfig()"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "unimplementierte Zeilentextur %08x: nutze Strich-Punkt-Punkt"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr "unbekannte Postscript-Zeichensatzfamilie '%s', nutzt Helvetica"
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "ungültige Vorder-/Hintergrundfarbe (xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr "es werden nur Type 1 Zeichensätze für XFig unterstützt"
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr "konnte den Standard-Zeichensatz für XFig nicht initialisieren"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "unzulässiger Seitentyp '%s' (xfig)"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "xfig(%s, onfile=FALSE) liefert nur die letzte Grafik"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "leerer Dateinamen"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr "Schreiben fehlgeschlagen"
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr "kann Kodierung '%s' nicht nutzen"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr "konnte 'maxRaster' nicht vergrößern"
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr "kann Rasterimage nicht allozieren"
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr "Geladene Kodierungen sind beschädigt; Zeichensatz nicht hinzugefügt"
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 "konnte Gerätekodierung nicht aufzeichnen; Zeichensatz nicht hinzugefügt"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr "PDF Version auf 1.2 erhöht"
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "konnte Standardkodierung nicht laden"
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr "Konnte den Standard-Zeichensatz für PDF nicht initialisieren"
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr "Konnte zusätzliche PDF Zeichensätze nicht initialisieren"
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr "konnte Raster nicht allozieren"
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr "konnte Masken nicht allozieren"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "ungültiger Papiertyp '%s' (pdf)"
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "ungültige Vorder-/Hintergrundfarbe (pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr "unzulässiger alpha Wert in PDF"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr "PDF Version auf 1.4 erhöht"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "unbekanntes 'colormodel', nutze 'srgb'"
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr "Laden der sRGB Farbraumdatei fehlgeschlagen"
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr "Beschädigte Kodierungen im PDF Gerät"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr "PDF Version auf 1.3 erhöht"
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "kann die 'pdf' Pipe nach '%s' nicht öffnen"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr "file = \"|cmd\" impliziert 'onefile = TRUE'"
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -525,32 +525,32 @@
 "kann das 'pdf' Dateiargument '%s' nicht öffnen;\n"
 " bitte das PDF gerät schließen"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr "konnte PDF Zeichensatz nicht finden oder nicht laden"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr "Konnte PDF CID Zeichensatz nicht finden oder nicht laden"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "ungültiger 'family' Parameter in %s"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "ungültiger 'fonts' Parameter in %s<"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr "unzulässiger Wert von '%s'"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "kann %s()-Gerät nicht starten"
diff -Nru r-base-3.2.3/src/library/grDevices/po/en_GB.po r-base-3.3.1/src/library/grDevices/po/en_GB.po
--- r-base-3.2.3/src/library/grDevices/po/en_GB.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/en_GB.po	2016-04-27 22:15:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-22 16:55+0000\n"
 "Last-Translator: Prof Brian Ripley <ripley@stats.ox.ac.uk>\n"
 "Language-Team: English\n"
@@ -141,7 +141,7 @@
 msgid "unknown AFM entity encountered"
 msgstr ""
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -235,312 +235,312 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr ""
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr ""
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr ""
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr ""
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr ""
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 #, fuzzy
 msgid "invalid line end"
 msgstr "invalid hcl colour"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 #, fuzzy
 msgid "invalid line join"
 msgstr "invalid hcl colour"
 
-#: devPS.c:2670
+#: devPS.c:2672
 #, fuzzy
 msgid "invalid line mitre"
 msgstr "invalid hcl colour"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr ""
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr ""
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr ""
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr ""
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr ""
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr ""
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr ""
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr ""
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "invalid foreground/background colour (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr ""
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr ""
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr ""
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr ""
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
 "    %s"
 msgstr ""
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr ""
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr ""
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr ""
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr ""
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4589
+#: devPS.c:4591
 #, fuzzy
 msgid "ran out of colors in xfig()"
 msgstr "run out of colours in xfig()"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr ""
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr ""
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "invalid foreground/background colour (xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr ""
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr ""
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr ""
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr ""
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr ""
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr ""
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr ""
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr ""
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr ""
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr ""
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr ""
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr ""
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr ""
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr ""
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr ""
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr ""
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr ""
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "invalid foreground/background colour (pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr ""
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr ""
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr ""
 
-#: devPS.c:6585
+#: devPS.c:6587
 #, fuzzy
 msgid "failed to load sRGB colorspace file"
 msgstr "Failed to load sRGB colourspace file"
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr ""
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr ""
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr ""
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr ""
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
 "  please shut down the PDF device"
 msgstr ""
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr ""
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr ""
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr ""
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr ""
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr ""
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/grDevices/po/fr.po r-base-3.3.1/src/library/grDevices/po/fr.po
--- r-base-3.2.3/src/library/grDevices/po/fr.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/fr.po	2016-04-27 22:15:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2014-03-17 10:45+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -144,7 +144,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "entité AFM inconnue rencontrée"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -246,91 +246,91 @@
 "la police CMap pour la famille '%s' introuvable dans la base de données des "
 "polices"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "impossible de lire fichier afm '%s'"
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "Encodages chargés corrompus : encodage non enregistré"
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr "Echec d'enregistrement de l'encodage du périphérique"
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "L'objet '.ps.prolog' n'est pas un vecteur de mode caractère"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr "Extrémité de ligne incorrecte"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr "Jointure de ligne incorrecte"
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr "Mitre (jointure pointue) de ligne incorrecte"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "tentative d'utiliser la police incorrecte %d remplacée par police 1"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr "nom de fichier trop long dans %s()"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "problème d'allocation mémoire dans %s()"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "chemin d'accès à l'encodage trop long dans %s()"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "Echec de chargement du fichier d'encodage dans %s"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr "Spécification de police incorrecte"
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr "échec d'initialisation des polices PostScript par défaut"
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr "échec d'initialisation des polices PostScript supplémentaires"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "couleurs de premier/arrière plans incorrectes (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'command' est trop long"
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr "'postscript(print.it=TRUE)' utilisé avec une commande 'print' vide"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "type de page incorrect '%s' (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -338,17 +338,17 @@
 "la semi-transparence n'est pas supportée sur ce périphérique : reporté "
 "seulement une fois par page"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "impossible d'ouvrir une conduite 'postscript' vers '%s'"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -357,171 +357,171 @@
 "erreur de la part de postscript() en exécutant :\n"
 "    %s"
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "famille CID '%s' non incluse dans le périphérique postscript()"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "famille '%s' non incluse dans le périphérique postscript()"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr "encodage inconnu '%s' dans 'mbcsToSbcs'"
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr ""
 "erreur de conversion de '%s' dans 'mbcsToSbcs' : le point est substitué pour "
 "<%02x>"
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "erreur d'ouverture du convertisseur vers l'encodage '%s'"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "erreur dans la conversion du texte vers l'encodage '%s'"
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr "trop de couleurs pour xfig()"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "texture de lignes non implémentée %08x : utilise 'Dash-double-dotted'"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr "famille de police postscript '%s' inconnue, utilisation d'Helvetica"
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "couleurs de premier/arrière plans incorrectes (xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr "seules les fontes Type 1 sont supportées pour XFig"
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr "échec d'initialisation des polices XFig par défaut"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "type de page '%s' incorrect (xfig)"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "xfig(%s, onefile=FALSE) ne retournera que le dernier graphe"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "nom de fichier vide"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr "écriture non exécutée"
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr "Impossible d'utiliser l'encodage '%s'"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr "Echec d'augmentation de 'maxRaster'"
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr "impossible d'allouer une image en mode pixel"
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr "encodages chargés corrompus ; police non ajoutée"
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 "échec d'enregistrement de l'encodage du périphérique ; police non ajoutée"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr "la version du PDF est augmentée à 1.2"
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "Echec de chargement du fichier d'encodage par défaut"
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr "échec d'initialisation des polices PDF par défaut"
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr "échec d'initialisation des polices PDF supplémentaires"
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr "Echec d'allocation d'images en mode pixel"
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr "Echec d'allocation pour des masques"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "type de papier '%s' incorrect (pdf)"
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "couleurs de premier/arrière plans incorrectes (pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr "valeur 'alpha' incorrecte dans PDF"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr "la version du PDF est augmentée à 1.4"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "'colormodel' inconnu, utilisation de 'rgb'"
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr "échec de chargement de l'espace de couleur sRGB"
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr "encodage corrompus dans le périphérique PDF"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr "la version du PDF est augmentée à 1.3"
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "impossible d'ouvrir une conduite 'pdf' vers '%s'"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr "file = \"|cmd\" implique 'onefile = TRUE'"
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -530,32 +530,32 @@
 "impossible d'ouvrir le fichier en argument de 'pdf' '%s'\n"
 "  fermez le périphérique PDF"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr "impossible de trouver ou de charger la police PDF"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr "impossible de trouver ou de charger la police PDF CID"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "paramètre 'family' incorrect dans %s"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "paramètre 'fonts' incorrect dans %s"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr "valeur incorrecte de '%s'"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "impossible de démarrer le périphérique %s()"
diff -Nru r-base-3.2.3/src/library/grDevices/po/grDevices.pot r-base-3.3.1/src/library/grDevices/po/grDevices.pot
--- r-base-3.2.3/src/library/grDevices/po/grDevices.pot	2015-06-06 22:15:40.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/grDevices.pot	2016-04-27 22:15:39.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: grDevices 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -140,7 +140,7 @@
 msgid "unknown AFM entity encountered"
 msgstr ""
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -234,307 +234,307 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr ""
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr ""
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr ""
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr ""
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr ""
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr ""
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr ""
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr ""
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr ""
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr ""
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr ""
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr ""
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr ""
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr ""
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr ""
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr ""
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr ""
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr ""
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr ""
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr ""
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr ""
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
 "    %s"
 msgstr ""
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr ""
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr ""
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr ""
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr ""
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr ""
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr ""
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr ""
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr ""
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr ""
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr ""
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr ""
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr ""
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr ""
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr ""
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr ""
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr ""
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr ""
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr ""
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr ""
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr ""
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr ""
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr ""
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr ""
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr ""
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr ""
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr ""
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr ""
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr ""
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr ""
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr ""
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr ""
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr ""
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr ""
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr ""
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
 "  please shut down the PDF device"
 msgstr ""
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr ""
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr ""
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr ""
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr ""
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr ""
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/grDevices/po/it.po r-base-3.3.1/src/library/grDevices/po/it.po
--- r-base-3.2.3/src/library/grDevices/po/it.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/it.po	2016-04-27 22:15:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-27 14:01+0100\n"
 "Last-Translator: Stefano M. Iacus <Stefano.Iacus@R-project.org>\n"
 "Language-Team: Italian\n"
@@ -144,7 +144,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "entità AFM sconosciuta"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, fuzzy, c-format
 msgid "invalid string in '%s'"
@@ -239,117 +239,117 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr "Famiglia font non presente nel database font di Quartz"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "non posso leggere file afm '%s'"
 
-#: devPS.c:2386
+#: devPS.c:2388
 #, fuzzy
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "Encoding caricato danneggiato; encoding non registrato"
 
-#: devPS.c:2397
+#: devPS.c:2399
 #, fuzzy
 msgid "failed to record device encoding"
 msgstr "Registrazione endocing device non riuscita"
 
-#: devPS.c:2568
+#: devPS.c:2570
 #, fuzzy
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "L'ogetto .ps.prolog non è un vettore di caratteri"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 #, fuzzy
 msgid "invalid line end"
 msgstr "'line end' non valida"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 #, fuzzy
 msgid "invalid line join"
 msgstr "'line join' non valida"
 
-#: devPS.c:2670
+#: devPS.c:2672
 #, fuzzy
 msgid "invalid line mitre"
 msgstr "'line mitre' non valida"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "tentativo di usare il font %d non valido sostituito con il font 1"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, fuzzy, c-format
 msgid "filename too long in %s()"
 msgstr "nome file troppo lungo in %s()"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr ""
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, fuzzy, c-format
 msgid "encoding path is too long in %s()"
 msgstr "percorso encoding troppo lungo"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, fuzzy, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "Caricamento file encoding '%s' fallito"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 #, fuzzy
 msgid "invalid font type"
 msgstr "Specificazione font non valida"
 
-#: devPS.c:3207
+#: devPS.c:3209
 #, fuzzy
 msgid "failed to initialise default PostScript font"
 msgstr "Inizializzazione font PostScript fallita"
 
-#: devPS.c:3273
+#: devPS.c:3275
 #, fuzzy
 msgid "failed to initialise additional PostScript fonts"
 msgstr "Inizializzazione font PostScript aggiuntivi fallita"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "colore foreground/background non valida (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'command' è troppo lungo"
 
-#: devPS.c:3299
+#: devPS.c:3301
 #, fuzzy
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr "postscript(print.it=TRUE) usato con un comando print vuoto"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "tipo pagina '%s' non valida (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "non posso aprire pipe 'postscript' su '%s'"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, fuzzy, c-format
 msgid "cannot open file '%s'"
 msgstr "non posso leggere file afm '%s'"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -358,182 +358,182 @@
 "errore esecuzione postscript() in:\n"
 "    %s"
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, fuzzy, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "famiglia CID '%s' non inclusa nel dispositivo PostScript"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, fuzzy, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "famiglia '%s' non inclusa nel dispositivo PostScript"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr ""
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr ""
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, fuzzy, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "Caricamento file encoding '%s' fallito"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4589
+#: devPS.c:4591
 #, fuzzy
 msgid "ran out of colors in xfig()"
 msgstr "usati tutti i colori in xfig()"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "'line texture' %08x non implementata: uso Dash-double-dotted"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, fuzzy, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr "famiglia font postscript sconosciuta, uso %s"
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "colore foreground/background non valido (xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr ""
 
-#: devPS.c:4802
+#: devPS.c:4804
 #, fuzzy
 msgid "failed to initialise default XFig font"
 msgstr "Inizializzazione font XFig fallita"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "typo pagina '%s' non valido (xfig)"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "xfig(%s, onefile=FALSE) restituirà solo l'ultimo grafico"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "nome file vuoto"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr ""
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, fuzzy, c-format
 msgid "unable to use encoding '%s'"
 msgstr "Caricamento file encoding fallito"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 #, fuzzy
 msgid "failed to increase 'maxRaster'"
 msgstr "allocazione lista font fallita"
 
-#: devPS.c:5570
+#: devPS.c:5572
 #, fuzzy
 msgid "unable to allocate raster image"
 msgstr "Impossibile allocare bitmap"
 
-#: devPS.c:5771
+#: devPS.c:5773
 #, fuzzy
 msgid "corrupt loaded encodings;  font not added"
 msgstr "Encoding caricato danneggiato; il font non viene aggiunto"
 
-#: devPS.c:5780
+#: devPS.c:5782
 #, fuzzy
 msgid "failed to record device encoding; font not added"
 msgstr ""
 "Registrazione encoding dispositivo non riuscita; il font non verrà aggiunto"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr ""
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "caricamento file encoding fallito"
 
-#: devPS.c:5987
+#: devPS.c:5989
 #, fuzzy
 msgid "failed to initialise default PDF font"
 msgstr "Inizializzazione font XFig fallita"
 
-#: devPS.c:6042
+#: devPS.c:6044
 #, fuzzy
 msgid "failed to initialise additional PDF fonts"
 msgstr "Inizializzazione font PostScript aggiuntivi fallita"
 
-#: devPS.c:6055
+#: devPS.c:6057
 #, fuzzy
 msgid "failed to allocate rasters"
 msgstr "allocazione lista font fallita"
 
-#: devPS.c:6062
+#: devPS.c:6064
 #, fuzzy
 msgid "failed to allocate masks"
 msgstr "allocazione lista font fallita"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "tipo foglio '%s' non valido (pdf)"
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "colore foreground/background non valido (pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 #, fuzzy
 msgid "invalid 'alpha' value in PDF"
 msgstr "valore alpha non valido in PDF"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr ""
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr ""
 
-#: devPS.c:6585
+#: devPS.c:6587
 #, fuzzy
 msgid "failed to load sRGB colorspace file"
 msgstr "caricamento file encoding fallito"
 
-#: devPS.c:6849
+#: devPS.c:6851
 #, fuzzy
 msgid "corrupt encodings in PDF device"
 msgstr "Encoding danneggiato nel dispositivo PDF"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr ""
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, fuzzy, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "non posso aprire pipe 'postscript' su '%s'"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr ""
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, fuzzy, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -542,34 +542,34 @@
 "non posso aprire il file '%s' in 'pdf'\n"
 "  si prega di chiudere il dispositivo PDF"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 #, fuzzy
 msgid "failed to find or load PDF font"
 msgstr "Impossibile caricare o trovare il font PDF"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 #, fuzzy
 msgid "failed to find or load PDF CID font"
 msgstr "Impossibile caricare o trovare il font PDF CID"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "parametro 'family' non valido in %s"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "parametro 'fonts' non valido in %s"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, fuzzy, c-format
 msgid "invalid value of '%s'"
 msgstr "valore di 'bg' non valido in devWindows"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, fuzzy, c-format
 msgid "unable to start %s() device"
 msgstr "impossibile aprire dispositivo pdf"
diff -Nru r-base-3.2.3/src/library/grDevices/po/ja.po r-base-3.3.1/src/library/grDevices/po/ja.po
--- r-base-3.2.3/src/library/grDevices/po/ja.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/ja.po	2016-04-27 22:15:39.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.5.0 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2015-02-17 08:52+0200 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -144,7 +144,7 @@
 msgid "unknown AFM entity encountered"
 msgstr " 未知� AFM 項目�出会���� "
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -248,93 +248,93 @@
 " フォント�データベース� '%s' ファミリ�対�る CMap フォント�見付�り��"
 "ã‚“ "
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr " afm ファイル '%s' をロード����ん��� "
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr ""
 " ロード�れ�エンコーディング�破������;  エンコーディング�記録�れ�"
 "�ん��� "
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr " デ�イス�エンコーディングを記録�る���失敗���� "
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr " オブジェクト '.ps.prolog' �文字ベクトル���り��ん "
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr " 線分�線端形状�指定��正�� "
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr " 線分�接続方法�指定��正�� "
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr " 線分�マイターリミット�指定��正�� "
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr " �正�フォント %d を使���������フォント 1 �置������ "
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr " %s() 中�ファイル��長���� "
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr " %s() 中�メモリ割り当��トラブル��り�� "
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr " %s() 中�エンコーディング�パス�長���� "
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr " %s() 中�エンコーディングファイををロード����ん��� "
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr " フォントタイプ��正�� "
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr " 既定��ストスクリプトフォント��期化�失敗���� "
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr " 追加��ストスクリプトフォント��期化�失敗���� "
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr " �正��景/背景色 (�ストスクリプト) "
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr " 'command' �長���� "
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr " 'postscript(print.it=TRUE)' �空��画命令��も�使�れ��� "
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr " �正�ページ '%s' (�ストスクリプト) "
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -342,17 +342,17 @@
 " ���機能���デ�イス��サ�ート�れ����ん: ページ毎�一度��レ�ー"
 "ト�れ�� "
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr " '%s' �対�る 'postscript' パイプを開��������ん "
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr " ファイル '%s' を開���ん "
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -361,171 +361,171 @@
 " 実行中� postscript() �ら�エラー: \n"
 " %s "
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr " postscript() デ�イス中� CID ファミリ '%s' ���れ����ん "
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr " postscript() デ�イス中�フォントファミリ '%s' ���れ����ん "
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr " 'mbcsToSbcs' 中�未知�エンコーディング '%s' ��り�� "
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr " 'mbcsToSbcs' 中� '%s' �変��失敗: <%02x> をドット�置������ "
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr " エンコーディング '%s' ��コン�ータを開���ん��� "
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr " テキストをエンコーディング '%s' �変��る���失敗���� "
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr " xfig() 中�色数�多����� "
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr " 実装�れ����線種 %08x: Dash-double-dotted を使��� "
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr ""
 " 未知��ストスクリプトフォントファミリ '%s' ��。Helvetica を使��� "
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr " �正��景/背景色�� (xfig) "
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr " XFig �対��� Type 1 フォント���サ�ート�れ���� "
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr " 既定� XFig フォント��期化�失敗���� "
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr " �正�ページタイプ '%s' (xfig) "
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr " xfig(%s, onefile=FALSE) �最後�プロット��を返��� "
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr " ファイル���り��ん "
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr " 書�込��失敗���� "
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr " エンコーディング '%s' を使��������ん "
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr " 'maxRaster' を増や��������ん��� "
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr " ラスター画�を割り当�られ��ん "
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr ""
 " ロード�れ�エンコーディング�破������;  フォント�追加�れ��ん "
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 " デ�イスエンコーディング�記録�失敗����; フォント�追加�れ��ん "
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr " PDF ��ージョンを 1.2 �更新����� "
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr " 既定�エンコーディング�ロード�失敗���� "
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr " 既定� PDF フォント��期化�失敗���� "
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr " 追加� PDF フォント��期化�失敗���� "
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr " ラスターを割り当�る�������ん��� "
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr " マスクを割り当�る�������ん��� "
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr " �正�ペーパサイズ '%s' (pdf) "
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr " �正��景/背景色 (pdf) "
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr " PDF 中��正�アルファ値 "
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr " PDF ��ージョンを 1.4 �更新 "
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr " 未知� 'colormodel' ��。'srgb' を使��� "
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr " sRGB 色空間ファイル�ロード�失敗���� "
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr " PDF デ�イス中�破���エンコーディング "
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr " PDF ��ージョンを 1.3 �更新 "
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr " '%s' �対�る 'postscript' パイプを開��������ん "
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr " file = \"|cmd\" � 'onefile = TRUE' を�味��� "
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -534,32 +534,32 @@
 " 'pdf' ファイル引数 '%s' を開��������ん \n"
 " PDF デ�イスを閉������ "
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr " PDF フォント�見付�ら���ロード����ん��� "
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr " PDF CID フォント�見付�ら���ロード����ん��� "
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr " %s 中��正� 'family' パラメータ "
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr " %s 中��正� 'fonts' パラメータ "
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr " '%s' �値��正�� "
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr " デ�イス %s() を開始����ん��� "
diff -Nru r-base-3.2.3/src/library/grDevices/po/ko.po r-base-3.3.1/src/library/grDevices/po/ko.po
--- r-base-3.2.3/src/library/grDevices/po/ko.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/ko.po	2016-04-27 22:15:38.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R grDevices package
-# src/library/grDevices/po/ko.po
+# ./grDevices/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R grDevices package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -147,7 +150,7 @@
 msgid "unknown AFM entity encountered"
 msgstr ""
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -175,19 +178,12 @@
 
 #: devPS.c:881
 #, c-format
-msgid ""
-"invalid character (%04x) sent to 'PostScriptCIDMetricInfo' in a single-byte "
-"locale"
-msgstr ""
-"단�바�트 로케�� 있는 'PostScriptCIDMetricInfo'� 보내진 유효하지 않� 문"
-"� (%04x)입니다"
+msgid "invalid character (%04x) sent to 'PostScriptCIDMetricInfo' in a single-byte locale"
+msgstr "단�바�트 로케�� 있는 'PostScriptCIDMetricInfo'� 보내진 유효하지 않� 문� (%04x)입니다"
 
 #: devPS.c:889
-msgid ""
-"invalid character sent to 'PostScriptCIDMetricInfo' in a single-byte locale"
-msgstr ""
-"단�바�트 로케�� 있는 'PostScriptCIDMetricInfo'� 보내진 유효하지 않� 문"
-"�입니다"
+msgid "invalid character sent to 'PostScriptCIDMetricInfo' in a single-byte locale"
+msgstr "단�바�트 로케�� 있는 'PostScriptCIDMetricInfo'� 보내진 유효하지 않� 문�입니다"
 
 #: devPS.c:994
 msgid "failed to allocate CID font info"
@@ -238,287 +234,280 @@
 #: devPS.c:1703 devPS.c:1785 devPS.c:1812
 #, c-format
 msgid "font encoding for family '%s' not found in font database"
-msgstr ""
-"페밀리 '%s'� 대한 �트 �코딩� �트 ��터베�스�서 찾� 수 없습니다"
+msgstr "페밀리 '%s'� 대한 �트 �코딩� �트 ��터베�스�서 찾� 수 없습니다"
 
 #: devPS.c:1730 devPS.c:1757
 #, c-format
 msgid "font CMap for family '%s' not found in font database"
 msgstr "페밀리 '%s'� 대한 �트 CMap� �트 ��터베�스�서 찾� 수 없습니다"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "afm 파� '%s'를 로드할 수 없습니다"
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "로드� �코딩� ���어 기�� �코딩� 없습니다"
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr "장치 �코딩� 기�하는� 실패했습니다"
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "�체 '.ps.prolog'는 문�형 벡터가 아닙니다"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr "유효하지 않� ��� �입니다"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr "유효하지 않� ��� 결합입니다"
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr ""
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "font 1� �해서 대체� 유효하지 않� �트 %d를 사용하려고 시�합니다"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr "%s()� 있는 파�명� 너무 �니다"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "%s()�서 메모리 할당 문제가 발�했습니다"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "%s()� �코딩 패스가 너무 �니다"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "%s()� �코딩 파�� 로드하는� 실패했습니다"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr "유효하지 않� �트타입입니다"
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr "기본 PostScript �트를 초기화하는� 실패했습니다"
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr "추가�� PostScript �트들� 초기화하는� 실패했습니다"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "유효하지 않� 전방/후방색입니다 (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'command'가 너무 �니다"
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
-msgstr ""
-"비어있는 'print' 명령어와 함께 사용� 'postscript(print.it=TRUE)'입니다"
+msgstr "비어있는 'print' 명령어와 함께 사용� 'postscript(print.it=TRUE)'입니다"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "유효하지 않� 페�지 타입 '%s' (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
-msgid ""
-"semi-transparency is not supported on this device: reported only once per "
-"page"
-msgstr ""
-"� 장치�서는 반투명 기능� 지��지 않습니다: 페�당 오로지 한번만 보고�니"
-"다"
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
+msgid "semi-transparency is not supported on this device: reported only once per page"
+msgstr "� 장치�서는 반투명 기능� 지��지 않습니다: 페�당 오로지 한번만 보고�니다"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "'%s'� 파�프하는 'postscript'를 열 수 없습니다"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "파� '%s'를 열 수 없습니다"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
 "    %s"
 msgstr ""
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "postscript() 장치� �함�어 있지 않� CID 페밀리 '%s'입니다"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "postscript() 장치� �함�어 있지 않� 페밀리 '%s'입니다"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr "'mbcsToSbcs'� 알 수 없는 �코딩 '%s'가 있습니다"
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr ""
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "�코딩 '%s'로 전환해주는 장치를 여는� 실패했습니다"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "�코딩 '%s'로 �스트컨버전�서 실패했습니다"
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr ""
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "구현�지 않� �� �스츄어 %08x�므로 Dash-double-dotted를 �용합니다"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
-msgstr ""
-"알 수 없는 �스트스�립트 �트 페밀리 '%s'�므로 Helvetica를 사용합니다"
+msgstr "알 수 없는 �스트스�립트 �트 페밀리 '%s'�므로 Helvetica를 사용합니다"
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "유효하지 않� 전경/배격색 (xfig)입니다"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr "XFig� 지��는 Type 1 �트입니다"
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr "기본 XFig �트를 초기화하는� 실패했습니다"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "유효하지 않� 페�지 타입 '%s' (xfig)입니다"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "xfig(%s, onefile=FALSE)는 오로지 마지막 플�� 반환만 할 것입니다"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "비어있는 파�명입니다"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr "쓰기� 실패했습니다"
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr "�코딩 '%s'를 사용할 수 없습니다"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr "'maxRaster'를 �가시키는� 실패했습니다"
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr "래스터 �미지를 할당할 수 없습니다"
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr "로드� �코딩� ���어 추가�지 않� �트입니다"
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr "PDF 버전� 1.2로 올립니다"
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "기본 �코딩� 로드하는� 실패했습니다"
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr "기본 PDF �트를 초기화하는� 실패했습니다"
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr "추가�� PDF �트를 초기화하는� 실패했습니다"
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr "래스터를 할당하는� 실패했습니다"
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr "매스�를 할당하는� 실패했습니다"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "유효하지 않� 페�� 종류 '%s' (pdf)입니다"
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "유효하지 않� 전방/배경색 (pdf)입니다"
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr "PDF� 유효하지 않� 'alpha'값입니다"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr "PDF 버전� 1.4로 올립니다"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "알 수 없는 'colormodel'�므로 'srgb'를 사용합니다"
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr "sRGB 색공간 파�� 로드하는� 실패했습니다"
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr ""
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr "PDF 버전� 1.3으로 올립니다"
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "'%s'� 파�프 하는 'pdf'를 열 수 없습니다"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr "file = \"|cmd\"� 'onefile = TRUE'� �미합니다"
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -527,32 +516,32 @@
 "'pdf' 파� �� '%s'를 열 수 없습니다\n"
 "  PDF 장치를 닫아주세요"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr "PDF �트를 찾거나 로드하는� 실패했습니다"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr "PDF CID �트를 찾거나 로드하는� 실패했습니다"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "%s� 유효하지 않� 'family' 파�미터가 있습니다"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "%s� 유효하지 않� 'fonts' 파�미터가 있습니다"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr "유효하지 않� '%s'� 값입니다"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "%s() 장치를 시작할 수 없습니다"
@@ -584,11 +573,8 @@
 msgstr "device description� �성할 수 없습니다"
 
 #: devQuartz.c:1479
-msgid ""
-"unable to create quartz() device target, given type may not be supported"
-msgstr ""
-"quartz() 장치대�� �성할 수 없었습니다.  아마� 타입� 지��지 않는 것 같"
-"습니다"
+msgid "unable to create quartz() device target, given type may not be supported"
+msgstr "quartz() 장치대�� �성할 수 없었습니다.  아마� 타입� 지��지 않는 것 같습니다"
 
 #: devQuartz.c:1609
 msgid "Quartz device is not available on this platform"
diff -Nru r-base-3.2.3/src/library/grDevices/po/pl.po r-base-3.3.1/src/library/grDevices/po/pl.po
--- r-base-3.2.3/src/library/grDevices/po/pl.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/pl.po	2016-04-27 22:15:38.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,8 +13,8 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: axis_scales.c:37 axis_scales.c:38 axis_scales.c:55
 #, c-format
@@ -139,7 +139,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "napotkano nieznany obiekt AFM"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -241,92 +241,92 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr "czcionka CMap dla rodziny '%s' nie została znaleziona w bazie danych"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "nie można załadować pliku afm '%s'"
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr ""
 "załadowane kodowania są uszkodzone; kodowanie nie zostało zarejestrowane"
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr "nie udało się zapisać kodowania urządzenia"
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "obiekt '.ps.prolog' nie jest wektorem tekstowym"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr "błędny koniec linii"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr "błędny łącznik linii"
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr "niepoprawny ukośnik linii"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "próba użycia niepoprawnej czcionki %d zastąpionej przez czcionkę 1"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr "nazwa pliku w '%s()' jest zbyt długa"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "problem przydziału pamięci w '%s()'"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "ścieżka kodowa w '%s()' jest zbyt długa"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "nie udało się załadować pliku kodowego w %s()"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr "niepoprawny typ czcionki"
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr "nie udało się zainicjalizować domyślnej czcionki PostScript"
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr "nie udało się zainicjalizować dodatkowych czcionek PostScript"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "niepoprawny kolor pierwszego planu/tła (postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'command' jest zbyt długie"
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr "'postscript(print.it=TRUE)' użyte z pustą komendą 'print'"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "niepoprawny typ '%s' strony (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
@@ -334,17 +334,17 @@
 "półprzezroczystość nie jest wspierana na tym urządzeniu: zaraportowane tylko "
 "raz na stronÄ™"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "nie można otworzyć kanału 'postscript' w '%s'"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "nie można otworzyć pliku '%s'"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -353,169 +353,169 @@
 "błąd pochodzący z funkcji 'postscript()' w działającym:\n"
 "    %s"
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "rodzina CID '%s' nie jest uwzględniona w urządzeniu 'postScript()'"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "rodzina '%s' nie jest uwzględniona w urządzeniu 'postScript()'"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr "nieznana strona kodowa '%s' w 'mbcsToSbcs'"
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr "niepowodzenie konwersji '%s' w 'mbcsToSbcs': kropka zastÄ…piona <%02x>"
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "nie udało się otworzyć konwertera dla kodowania '%s'"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "konwersja tesktu dla kodowania '%s' nie powiodła się"
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr "zabrakło kolorów w 'xfig()'"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "niezaimplementowana tekstura linii %08x: używanie kreska-dwie-kropki"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr "nieznana rodzina czcionki postscript '%s', używanie Helvetica"
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "niepoprawny kolor pierwszego planu/tła (xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr "tylko czcionki 'Type 1' sÄ… wspierane w XFig"
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr "nie udało się zainicjalizować domyślnej czcionki XFig"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "niepoprawny typ '%s' strony ('xfig')"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "'xfig(%s, onefile=FALSE)' zwróci tylko ostatni wykres"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "pusta nazwa pliku"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr "zapis nie powiódł się"
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr "nie można użyć strony kodowej '%s'"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr "nie udało się zwiększyć 'maxRaster'"
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr "nie można przydzielić obrazu rastrowego"
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr "załadowane kodowania są uszkodzone; czcionka nie została dodana"
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr ""
 "nie udało się zarejestrować kodowania urządzenia; czcionka nie została dodana"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr "zwiększanie wersji PDF do 1.2"
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "nie udało się załadować domyślnej strony kodowej"
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr "nie udało się zainicjalizować domyślnej czcionki PDF"
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr "nie udało się zainicjalizować dodatkowych czcionek PDF"
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr "nie udało się przydzielić rastrów"
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr "nie udało się przydzielić masek"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "niepoprawny typ '%s' papieru (pdf)"
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "niepoprawny kolor pierwszego planu/tła (pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr "niepoprawna wartość 'alpha' w PDF"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr "zwiększanie wersji PDF do 1.4"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "nieznany 'colormodel', używanie 'srgb'"
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr "nie udało się załadować pliku przestrzeni kolorów sRGB"
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr "uszkodzone kodowania w urzÄ…dzeniu PDF"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr "zwiększanie wersji PDF do 1.3"
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "nie można otworzyć kanału 'pdf' w '%s'"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr "file = \"|cmd\" sugeruje, że 'onefile = TRUE'"
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -524,32 +524,32 @@
 "nie można otworzyć argumentu pliku 'pdf' '%s'\n"
 "  proszę wyłączyć urządzenie PDF"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr "nie udało się znaleźć lub załadować czcionkę PDF"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr "nie udało się znaleźć lub załadować czcionkę CID PDF"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "niepoprawny parametr 'family' w %s"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "niepoprawny parametr 'fonts' w %s"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr "niepoprawna wartość '%s'"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "nie można uruchomić urządzenia '%s()'"
diff -Nru r-base-3.2.3/src/library/grDevices/po/pt_BR.po r-base-3.3.1/src/library/grDevices/po/pt_BR.po
--- r-base-3.2.3/src/library/grDevices/po/pt_BR.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/pt_BR.po	2016-04-27 22:15:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:54-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -141,7 +141,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "entidade AFM desconhecida encontrada"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -241,323 +241,323 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr ""
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr ""
 
-#: devPS.c:2386
+#: devPS.c:2388
 #, fuzzy
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "falha ao alocar informação de codificação"
 
-#: devPS.c:2397
+#: devPS.c:2399
 #, fuzzy
 msgid "failed to record device encoding"
 msgstr "falha ao alocar informação de codificação"
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr ""
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 #, fuzzy
 msgid "invalid line end"
 msgstr "cadeia de caracteres inválida em '%s'"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 #, fuzzy
 msgid "invalid line join"
 msgstr "cadeia de caracteres inválida em '%s'"
 
-#: devPS.c:2670
+#: devPS.c:2672
 #, fuzzy
 msgid "invalid line mitre"
 msgstr "cadeia de caracteres inválida em '%s'"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr ""
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr ""
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr ""
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr ""
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, fuzzy, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "falha ao carregar arquivo de codificação '%s'"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr ""
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr ""
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr ""
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr ""
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr ""
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr ""
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr ""
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr ""
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr ""
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr ""
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
 "    %s"
 msgstr ""
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr ""
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr ""
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr ""
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr ""
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr ""
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr ""
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr ""
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr ""
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr ""
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr ""
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr ""
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr ""
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr ""
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr ""
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr ""
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr ""
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 #, fuzzy
 msgid "failed to increase 'maxRaster'"
 msgstr "falha ao alocar lista de fonte"
 
-#: devPS.c:5570
+#: devPS.c:5572
 #, fuzzy
 msgid "unable to allocate raster image"
 msgstr "falha ao alocar lista de fonte"
 
-#: devPS.c:5771
+#: devPS.c:5773
 #, fuzzy
 msgid "corrupt loaded encodings;  font not added"
 msgstr "falha ao alocar informação de codificação"
 
-#: devPS.c:5780
+#: devPS.c:5782
 #, fuzzy
 msgid "failed to record device encoding; font not added"
 msgstr "falha ao alocar informação de codificação"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr ""
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr ""
 
-#: devPS.c:5987
+#: devPS.c:5989
 #, fuzzy
 msgid "failed to initialise default PDF font"
 msgstr "falha ao alocar informação de fonte CID"
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr ""
 
-#: devPS.c:6055
+#: devPS.c:6057
 #, fuzzy
 msgid "failed to allocate rasters"
 msgstr "falha ao alocar lista de fonte"
 
-#: devPS.c:6062
+#: devPS.c:6064
 #, fuzzy
 msgid "failed to allocate masks"
 msgstr "falha ao alocar lista de fonte"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr ""
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr ""
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr ""
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr ""
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr ""
 
-#: devPS.c:6585
+#: devPS.c:6587
 #, fuzzy
 msgid "failed to load sRGB colorspace file"
 msgstr "falha ao carregar arquivo de codificação '%s'"
 
-#: devPS.c:6849
+#: devPS.c:6851
 #, fuzzy
 msgid "corrupt encodings in PDF device"
 msgstr "falha ao alocar informação de codificação"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr ""
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr ""
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr ""
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
 "  please shut down the PDF device"
 msgstr ""
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 #, fuzzy
 msgid "failed to find or load PDF font"
 msgstr "falha ao alocar informação de fonte CID"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 #, fuzzy
 msgid "failed to find or load PDF CID font"
 msgstr "falha ao alocar informação de fonte CID"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr ""
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr ""
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr ""
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "não é possível iniciar dispositivo %s()"
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-da.po r-base-3.3.1/src/library/grDevices/po/R-da.po
--- r-base-3.2.3/src/library/grDevices/po/R-da.po	2015-03-18 23:03:48.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-da.po	2016-04-27 22:15:38.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-28 17:40+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -232,10 +232,6 @@
 msgstr "status %d i kørende kommando »%s«"
 
 #, fuzzy
-msgid "range too small for 'min.n'"
-msgstr "interval for lille for min.n"
-
-#, fuzzy
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr "En bitmapmatrix skal være tegn eller numerisk eller logisk"
 
@@ -272,9 +268,16 @@
 msgstr "argument er ikke af klasse »recordedplot«"
 
 #, fuzzy
-msgid "loading snapshot from a different session"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr "Indlæser øjebliksbillede fra anden R version"
+
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
 msgstr "Indlæser øjebliksbillede fra anden R version"
 
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr "»nbin« skal være numerisk og af længde 1 eller 2"
 
@@ -419,6 +422,10 @@
 msgstr[0] "%d z værdi <= 0 udeladt fra logaritmisk plot"
 msgstr[1] "%d z værdier <= 0 udeladt fra logaritmisk plot"
 
+#, fuzzy
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "interval for lille for min.n"
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr "beklager, »gs« kan ikke findes"
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-de.po r-base-3.3.1/src/library/grDevices/po/R-de.po
--- r-base-3.2.3/src/library/grDevices/po/R-de.po	2015-03-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-de.po	2016-04-27 22:15:39.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: R 3.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-20 16:07+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-Core <R-core@r-project.org>\n"
@@ -26,7 +26,7 @@
 msgstr "keine 'z' Matrix angegeben"
 
 msgid "increasing 'x' and 'y' values expected"
-msgstr "ansteigende 'x' und 'y' Werte erwarted"
+msgstr "ansteigende 'x' und 'y' Werte erwartet"
 
 msgid "no proper 'z' matrix specified"
 msgstr "keine geeignete 'z' Matrix angegeben"
@@ -47,7 +47,7 @@
 msgstr "zumindest 3 Spalten benötigt"
 
 msgid "rgb matrix must be numeric"
-msgstr "RGB Matrix muss nummerisch sein"
+msgstr "RGB Matrix muss numerisch sein"
 
 msgid "rgb matrix must have 3 rows"
 msgstr "RGB Matrix muss 3 Zeilen haben"
@@ -86,7 +86,7 @@
 msgstr "Farbräume nutzen unterschiedliches Referenz-Weiß"
 
 msgid "'name' must be a character vector"
-msgstr "'name' muss Charakter-Vektor sein"
+msgstr "'name' muss Zeichenkettenvektor sein"
 
 msgid "cannot shut down device 1 (the null device)"
 msgstr "kann Device 1 (Null Device) nicht schließen"
@@ -125,7 +125,7 @@
 msgstr "dev.displaylist() ohne geöffnetes Grafik-Device aufgerufen"
 
 msgid "invalid setting for 'getOption(\"device\")'"
-msgstr "unzulässige einstellung für 'getOption(\"device\")'"
+msgstr "unzulässige Einstellung für 'getOption(\"device\")'"
 
 msgid "device '%s' not found"
 msgstr "Device '%s' nicht gefunden"
@@ -143,11 +143,11 @@
 msgstr "dev.new(): nutze postscript(file=\"%s\")"
 
 msgid "invalid arguments in '%s' (need named args)"
-msgstr "unzulässige Argumente in '%s' (benannte Argumente benötigt"
+msgstr "unzulässige Argumente in '%s' (benannte Argumente benötigt)"
 
 msgid "'name.opt' must be character, name of an existing list"
 msgstr ""
-"'name.opt' muss ein Charkter, ein Name oder eine exisitierende Liste sein"
+"'name.opt' muss eine Zeichenkette sein, der Name einer existierenden Liste"
 
 msgid "cannot reset non-existent '%s'"
 msgstr "kann nicht existierendes ' %s' nicht zurücksetzen"
@@ -224,12 +224,9 @@
 msgid "status %d in running command '%s'"
 msgstr "Status %d im laufenden Kommando '%s'"
 
-msgid "range too small for 'min.n'"
-msgstr "Spannweite zu klein für 'min.n'"
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr ""
-"Eine Rastermatrix muss entweder character, nummerisch oder boole'sch sein"
+"Eine Rastermatrix muss entweder character, numerisch oder boolesch sein"
 
 msgid "a raster array must be numeric"
 msgstr "ein Raster-Array muss numerisch sein"
@@ -238,16 +235,16 @@
 msgstr "ein Raster-Array muss genau 3 Dimensionen haben"
 
 msgid "a raster array must have exactly 3 or 4 planes"
-msgstr "ein Rater-Array muss genau 3 oder 4 Ebenen haben"
+msgstr "ein Raster-Array muss genau 3 oder 4 Ebenen haben"
 
 msgid "'drop' is always implicitly FALSE in '[.raster'"
 msgstr "'drop' ist implizit immer FALSE in '[.raster'"
 
 msgid "invalid raster subsetting"
-msgstr "ungültiges Rastersubsetting"
+msgstr "ungültiges Raster-Subsetting"
 
 msgid "invalid raster subassignment"
-msgstr "ungültige Rasterteilzuweisung"
+msgstr "ungültige Raster-Teilzuweisung"
 
 msgid "operator not meaningful for raster objects"
 msgstr "Operator hat für Rasterobjekte keine Bedeutung"
@@ -258,14 +255,22 @@
 msgid "argument is not of class %s"
 msgstr "Argument ist nicht von Klasse %s"
 
-msgid "loading snapshot from a different session"
+#, fuzzy
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr "lade Snapshot einer anderen R Sitzung"
+
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
 msgstr "lade Snapshot einer anderen R Sitzung"
 
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
-msgstr "'nbin' muss nummerisch mit Länge 1 oder 2 sein"
+msgstr "'nbin' muss numerisch mit Länge 1 oder 2 sein"
 
 msgid "'bandwidth' must be numeric"
-msgstr "'bandwidth' muss nummerisch sein"
+msgstr "'bandwidth' muss numerisch sein"
 
 msgid "'bandwidth' must be positive"
 msgstr "'bandwidth' muss positiv sein"
@@ -280,7 +285,7 @@
 msgstr "'x' ist eine Liste, hat aber keine Komponenten 'x' und 'y'"
 
 msgid "'x' and 'y' lengths differ"
-msgstr "Längen von 'x' nud 'y' unterscheiden sich"
+msgstr "Längen von 'x' und 'y' unterscheiden sich"
 
 msgid "invalid first argument [bad language object]"
 msgstr "ungültiges erstes Argument [schlechtes Sprachobjekt]"
@@ -307,7 +312,7 @@
 "Available devices are:\n"
 "%s"
 msgstr ""
-"Verfügbar Devices sind:\n"
+"Verfügbare Devices sind:\n"
 "%s"
 
 msgid "'res' must be specified unless 'units = \"px\"'"
@@ -334,7 +339,7 @@
 "nutze \"Xlib\""
 
 msgid "unknown family for X11(type = \"XLib\")"
-msgstr "unbekannte Famiile für X11(type = \"XLib\")"
+msgstr "unbekannte Familie für X11(type = \"XLib\")"
 
 msgid "invalid X11 font specification:"
 msgstr "ungültige X11 Zeichensatzspezifikation"
@@ -355,7 +360,7 @@
 msgstr "unzulässiger Wert für 'rescale'"
 
 msgid "can only bring windows devices to the front"
-msgstr "kann nur windows-Devices nach Vorne bringen"
+msgstr "kann nur Windows-Devices nach vorne bringen"
 
 msgid "'type' not applicable to the R console"
 msgstr "'type' für die R-Konsole nicht anwendbar"
@@ -403,6 +408,9 @@
 msgstr[0] "%d z Wert <= 0 ausgelassen in logarithmischem Plot"
 msgstr[1] "%d z Werte <= 0 ausgelassen in logarithmischem Plot"
 
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "Spannweite zu klein für 'min.n'"
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr "'gs' kann leider nicht gefunden werden"
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-en_GB.po r-base-3.3.1/src/library/grDevices/po/R-en_GB.po
--- r-base-3.2.3/src/library/grDevices/po/R-en_GB.po	2015-03-18 23:03:48.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-en_GB.po	2016-04-27 22:15:38.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-08-15 11:43+0000\n"
 "Last-Translator: Prof Brian Ripley <ripley@stats.ox.ac.uk>\n"
 "Language-Team: English\n"
@@ -219,9 +219,6 @@
 msgid "status %d in running command '%s'"
 msgstr ""
 
-msgid "range too small for 'min.n'"
-msgstr ""
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr ""
 
@@ -252,7 +249,13 @@
 msgid "argument is not of class %s"
 msgstr ""
 
-msgid "loading snapshot from a different session"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr ""
+
+msgid "snapshot recorded in different R version (%s)"
+msgstr ""
+
+msgid "snapshot contains invalid graphics call"
 msgstr ""
 
 msgid "'nbin' must be numeric of length 1 or 2"
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-fr.po r-base-3.3.1/src/library/grDevices/po/R-fr.po
--- r-base-3.2.3/src/library/grDevices/po/R-fr.po	2015-03-18 23:03:48.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-fr.po	2016-04-27 22:15:38.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 10:46+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -230,9 +230,6 @@
 msgid "status %d in running command '%s'"
 msgstr "statut %d dans la commande en cours d'exécution '%s'"
 
-msgid "range too small for 'min.n'"
-msgstr "étendue des valeurs trop petite pour 'min.n'"
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr ""
 "une matrice de pixels doit contenir des chaînes de caractères, des nombres "
@@ -265,9 +262,17 @@
 msgid "argument is not of class %s"
 msgstr "l'argument n'est pas de classe %s"
 
-msgid "loading snapshot from a different session"
+#, fuzzy
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr "chargement d'un instantané graphique à partir d'une version différente"
+
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
 msgstr "chargement d'un instantané graphique à partir d'une version différente"
 
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr "'nbin' doit être numérique et de longueur 1 ou 2"
 
@@ -416,6 +421,9 @@
 msgstr[0] "%d valeur z <= 0 est ignorée pour le graphe logarithmique"
 msgstr[1] "%d valeurs z <= 0 sont ignorées pour le graphe logarithmique"
 
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "étendue des valeurs trop petite pour 'min.n'"
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr "désolé, 'gs' est introuvable"
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-grDevices.pot r-base-3.3.1/src/library/grDevices/po/R-grDevices.pot
--- r-base-3.2.3/src/library/grDevices/po/R-grDevices.pot	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-grDevices.pot	2016-04-27 22:15:39.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: grDevices 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -218,9 +217,6 @@
 msgid "status %d in running command '%s'"
 msgstr ""
 
-msgid "range too small for 'min.n'"
-msgstr ""
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr ""
 
@@ -251,7 +247,13 @@
 msgid "argument is not of class %s"
 msgstr ""
 
-msgid "loading snapshot from a different session"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr ""
+
+msgid "snapshot recorded in different R version (%s)"
+msgstr ""
+
+msgid "snapshot contains invalid graphics call"
 msgstr ""
 
 msgid "'nbin' must be numeric of length 1 or 2"
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-it.po r-base-3.3.1/src/library/grDevices/po/R-it.po
--- r-base-3.2.3/src/library/grDevices/po/R-it.po	2015-03-18 23:03:48.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-it.po	2016-04-27 22:15:38.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-27 13:33+0100\n"
 "Last-Translator: Stefano M. Iacus <Stefano.Iacus@R-project.org>\n"
 "Language-Team: Italian\n"
@@ -247,9 +247,6 @@
 msgid "status %d in running command '%s'"
 msgstr ""
 
-msgid "range too small for 'min.n'"
-msgstr ""
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr ""
 
@@ -286,9 +283,16 @@
 msgstr "l'argomento non è di classe \"recordedplot\""
 
 #, fuzzy
-msgid "loading snapshot from a different session"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
 msgstr "carico uno snapshot da una versione differente di R"
 
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
+msgstr "carico uno snapshot da una versione differente di R"
+
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-ja.po r-base-3.3.1/src/library/grDevices/po/R-ja.po
--- r-base-3.2.3/src/library/grDevices/po/R-ja.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-ja.po	2016-04-27 22:15:39.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.1.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 14:17+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -227,9 +227,6 @@
 msgid "status %d in running command '%s'"
 msgstr " 状態 %d �命令 '%s' 実行中�起���� "
 
-msgid "range too small for 'min.n'"
-msgstr " 'min.n' �対��範囲������� "
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr " ラスター行列�文字�数値も���論�値���れ��り��ん "
 
@@ -260,9 +257,17 @@
 msgid "argument is not of class %s"
 msgstr " 引数�クラス %s ���り��ん "
 
-msgid "loading snapshot from a different session"
+#, fuzzy
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr " 異�るセッション�らスナップショット�読�込�れ���� "
+
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
 msgstr " 異�るセッション�らスナップショット�読�込�れ���� "
 
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr " 'nbin' �長� 1 ��� 2 �数値���れ��り��ん "
 
@@ -401,6 +406,9 @@
 msgid_plural "%d z values <= 0 omitted from logarithmic plot"
 msgstr[0] " %d 個�正��� x �値�対数プロット�ら除�れ��� "
 
+#~ msgid "range too small for 'min.n'"
+#~ msgstr " 'min.n' �対��範囲������� "
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr " ����ん，'gs' �見��り��ん "
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-ko.po r-base-3.3.1/src/library/grDevices/po/R-ko.po
--- r-base-3.2.3/src/library/grDevices/po/R-ko.po	2015-03-31 22:15:13.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-ko.po	2016-04-27 22:15:38.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R grDevices package
-# src/library/grDevices/po/R-ko.po
+# ./grDevices/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
 #
-# Copyright (C) 1995-2015 The R Core Team
-# 
 # This file is distributed under the same license as the R grDevices package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,16 +229,12 @@
 msgid "GhostScript was not found"
 msgstr ""
 
-#, fuzzy
 msgid "invalid output format"
-msgstr "유효하지 않� 출력 �맷입니다"
+msgstr "올바른 출력형�(output format)� 아닙니다."
 
 msgid "status %d in running command '%s'"
 msgstr "명령어 '%2$s'를 실행하� 중 �태 %1$d가 �었습니다"
 
-msgid "range too small for 'min.n'"
-msgstr "'min.n'� 대한 범위가 너무 작습니다"
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr "래스터 행렬� 반드시 문�, �는 숫�, �는 논리값�어야 합니다"
 
@@ -267,8 +266,14 @@
 msgid "argument is not of class %s"
 msgstr "��는 �래스 %s가 아닙니다"
 
-msgid "loading snapshot from a different session"
-msgstr "다른 세션으로부터 스냅샷� 로딩합니다"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr ""
+
+msgid "snapshot recorded in different R version (%s)"
+msgstr ""
+
+msgid "snapshot contains invalid graphics call"
+msgstr ""
 
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr "'nbin'� 반드시 길�가 1 �는 2� 수치형입니다"
@@ -313,11 +318,12 @@
 msgid "device '%s' is not available"
 msgstr "장치 '%s'를 사용할 수 없습니다"
 
-#, fuzzy
 msgid ""
 "Available devices are:\n"
 "%s"
-msgstr "사용가능한 장치들� %s입니다"
+msgstr ""
+"사용가능한 장치들� 다�과 같습니다:\n"
+"%s"
 
 msgid "'res' must be specified unless 'units = \"px\"'"
 msgstr "만약 'units = \"px\"'� 아니�면 'res'는 반드시 지정�야 합니다"
@@ -413,6 +419,12 @@
 msgid_plural "%d z values <= 0 omitted from logarithmic plot"
 msgstr[0] ""
 
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "'min.n'� 대한 범위가 너무 작습니다"
+
+#~ msgid "loading snapshot from a different session"
+#~ msgstr "다른 세션으로부터 스냅샷� 로딩합니다"
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr "미안합니다, 'gs'를 찾� 수 없습니다"
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-pl.po r-base-3.3.1/src/library/grDevices/po/R-pl.po
--- r-base-3.2.3/src/library/grDevices/po/R-pl.po	2015-03-27 23:15:16.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-pl.po	2016-04-27 22:15:38.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,405 +13,704 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "invalid 'filename'"
-msgstr "niepoprawny argument 'filename'"
+#. R/colorRamp.R: stop("'alpha' must be false if 'space' is specified")
+#: R/colorRamp.R:0
+msgid "'alpha' must be false if 'space' is specified"
+msgstr ""
+"argument 'alpha' musi mieć wartość FALSE, jeśli określono argument 'space'"
+
+#. R/smooth2d.R: stop("'bandwidth' must be numeric")
+#: R/smooth2d.R:0
+msgid "'bandwidth' must be numeric"
+msgstr "wartość 'bandwidth' musi być liczbą"
 
+#. R/smooth2d.R: stop("'bandwidth' must be positive")
+#: R/smooth2d.R:0
+msgid "'bandwidth' must be positive"
+msgstr "argument 'bandwidth' musi być dodatni"
+
+#. R/colorRamp.R: stop("'bias' must be positive")
+#: R/colorRamp.R:0
+msgid "'bias' must be positive"
+msgstr "argument 'bias' musi być dodatni"
+
+#. R/calc.R: stop("'coef' must not be negative")
+#: R/calc.R:0
 msgid "'coef' must not be negative"
 msgstr "wartość 'coef' musi być nieujemna"
 
-msgid "no 'z' matrix specified"
-msgstr "brak określonej macierzy 'z'"
+#. R/device.R: stop("'device' should be a function")
+#: R/device.R:0
+msgid "'device' should be a function"
+msgstr "'device' powinno być funkcją"
 
-msgid "increasing 'x' and 'y' values expected"
-msgstr "oczekiwano rosnących wartości 'x' oraz 'y'"
+#. R/raster.R: warning("'drop' is always implicitly FALSE in '[.raster'")
+#: R/raster.R:0
+msgid "'drop' is always implicitly FALSE in '[.raster'"
+msgstr "'drop' jest zawsze rozumiany jako FALSE w '[.raster'"
 
-msgid "no proper 'z' matrix specified"
-msgstr "nie określono odpowiedniej macierzy 'z'"
+#. R/unix/dev2bitmap.R: stop("'file' is missing with no default")
+#. R/unix/dev2bitmap.R: stop("'file' is missing with no default")
+#. R/windows/dev2bitmap.R: stop("'file' is missing with no default")
+#. R/windows/dev2bitmap.R: stop("'file' is missing with no default")
+#: R/unix/dev2bitmap.R:0 R/windows/dev2bitmap.R:0
+msgid "'file' is missing with no default"
+msgstr "brakuje argumentu 'file', a brak zdefiniowanej wartości domyślnej"
 
-msgid "dimensions of 'x', 'y' and 'z' do not match"
-msgstr "wymiary 'x', 'y' oraz 'z' nie zgadzajÄ… siÄ™"
+#. R/postscript.R: stop("'file' must be a non-empty character string")
+#. R/unix/dev2bitmap.R: stop("'file' must be a non-empty character string")
+#. R/unix/dev2bitmap.R: stop("'file' must be a non-empty character string")
+#. R/windows/dev2bitmap.R: stop("'file' must be a non-empty character string")
+#. R/windows/dev2bitmap.R: stop("'file' must be a non-empty character string")
+#: R/postscript.R:0 R/unix/dev2bitmap.R:0 R/windows/dev2bitmap.R:0
+msgid "'file' must be a non-empty character string"
+msgstr "argument 'file' musi być niepustym łańcuchem tekstowym"
 
-msgid "finite coordinates are needed"
-msgstr "wymagane są skończone współrzędne"
+#. R/convertColor.R: stop("'from' must be a \"colorConverter\" object or a string")
+#: R/convertColor.R:0
+msgid "'from' must be a \"colorConverter\" object or a string"
+msgstr ""
+"argument 'from' musi być obiektem klasy \"colorConverter\" lub łańcuchem "
+"tekstowym"
 
-msgid "'bias' must be positive"
-msgstr "argument 'bias' musi być dodatni"
+#. R/convertColor.R: gettextf("'from.ref.white' disagrees with definition of %s",     from$name)
+#: R/convertColor.R:0
+msgid "'from.ref.white' disagrees with definition of %s"
+msgstr "'from.ref.white' nie zgadza siÄ™ z definicjÄ… %s"
 
-msgid "'alpha' must be false if 'space' is specified"
-msgstr ""
-"argument 'alpha' musi mieć wartość FALSE, jeśli określono argument 'space'"
+#. R/convertColor.R: stop("'gamma' must be a scalar or 'sRGB'")
+#: R/convertColor.R:0
+msgid "'gamma' must be a scalar or 'sRGB'"
+msgstr "argument 'gamma' musi być liczbą lub wartością 'sRGB'"
 
-msgid "at least 3 columns needed"
-msgstr "przynajmniej 3 kolumny sÄ… potrzebne"
+#. R/device.R: stop("'name' must be a character vector")
+#: R/device.R:0
+msgid "'name' must be a character vector"
+msgstr "argument 'name' musi być wektorem tekstowym"
 
-msgid "rgb matrix must be numeric"
-msgstr "macierz RGB musi być liczbowa"
+#. R/postscript.R: stop("'name.opt' must be character, name of an existing list")
+#: R/postscript.R:0
+msgid "'name.opt' must be character, name of an existing list"
+msgstr "argument 'name.opt' musi być tekstem, nazwą istniejącej listy"
 
-msgid "rgb matrix must have 3 rows"
-msgstr "macierz RGB musi mieć 3 wiersze"
+#. R/smooth2d.R: stop("'nbin' must be numeric of length 1 or 2")
+#: R/smooth2d.R:0
+msgid "'nbin' must be numeric of length 1 or 2"
+msgstr "argument 'nbin' musi być liczbą o długości 1 lub 2"
 
-msgid "rgb values must be in [0, maxColorValue]"
-msgstr "argumenty 'r', 'g' oraz 'b' muszą być w przedziale [0, maxColorValue]"
+#. R/utils.R: stop("'r' must be a \"range\", hence of length 2")
+#: R/utils.R:0
+msgid "'r' must be a \"range\", hence of length 2"
+msgstr "'r' musi być wynikiem funkcji 'range()', a więc o długości 2"
+
+#. R/unix/png.R: stop("'res' must be specified unless 'units = \"px\"'")
+#. R/windows/png.R: stop("'res' must be specified unless 'units = \"px\"'")
+#: R/unix/png.R:0 R/windows/png.R:0
+msgid "'res' must be specified unless 'units = \"px\"'"
+msgstr "wartość 'res' musi być określona chyba, że 'units = \"px\"'"
 
+#. R/colorstuff.R: stop("'start' and 'end' must be distinct and in [0, 1].")
+#: R/colorstuff.R:0
 msgid "'start' and 'end' must be distinct and in [0, 1]."
 msgstr ""
 "wartości 'start' oraz 'end' muszą być różne oraz zawierać się w przedziale "
 "[0, 1]."
 
-msgid "'gamma' must be a scalar or 'sRGB'"
-msgstr "argument 'gamma' musi być liczbą lub wartością 'sRGB'"
+#. R/convertColor.R: stop("'to' must be a \"colorConverter\" object or a string")
+#: R/convertColor.R:0
+msgid "'to' must be a \"colorConverter\" object or a string"
+msgstr "'to' musi być obiektem klasy \"colorConverter\" lub łańcuchem"
+
+#. R/convertColor.R: gettextf("'to.ref.white' disagrees with definition of %s", to$name)
+#: R/convertColor.R:0
+msgid "'to.ref.white' disagrees with definition of %s"
+msgstr "'to.ref.white' nie zgadza siÄ™ z definicjÄ… %s"
+
+#. R/windows/windows.R: stop("'type' not applicable to the R console")
+#: R/windows/windows.R:0
+msgid "'type' not applicable to the R console"
+msgstr "'type' nie ma zastosowania w konsoli R"
+
+#. R/xyz.coords.R: stop("'x' and 'y' lengths differ")
+#: R/xyz.coords.R:0
+msgid "'x' and 'y' lengths differ"
+msgstr "długości zmiennych 'x' oraz 'y' różnią się"
+
+#. R/xyz.coords.R: stop("'x' is a list, but does not have components 'x' and 'y'")
+#: R/xyz.coords.R:0
+msgid "'x' is a list, but does not have components 'x' and 'y'"
+msgstr "obiekt 'x' jest listą, ale nie zawiera komponentów 'x' oraz 'y'"
+
+#. R/xyz.coords.R: stop("'x' is a list, but does not have components 'x', 'y'  and 'z'")
+#: R/xyz.coords.R:0
+msgid "'x' is a list, but does not have components 'x', 'y'  and 'z'"
+msgstr "obiekt 'x' jest listą, ale nie zawiera komponentów 'x', 'y' oraz 'z'"
+
+#. R/xyz.coords.R: stop("'x', 'y' and 'z' lengths differ")
+#: R/xyz.coords.R:0
+msgid "'x', 'y' and 'z' lengths differ"
+msgstr "długości zmiennych 'x', 'y' oraz 'z' różnią się"
+
+#. R/unix/dev2bitmap.R: gettextf("Available devices are:\n%s", paste(gsdevs, collapse = "\n"))
+#. R/windows/dev2bitmap.R: gettextf("Available devices are:\n%s", paste(gsdevs, collapse = "\n"))
+#: R/unix/dev2bitmap.R:0 R/windows/dev2bitmap.R:0
+msgid ""
+"Available devices are:\n"
+"%s"
+msgstr ""
+"Dostępne urządzenia to:\n"
+"%s"
 
+#. R/convertColor.R: gettextf("Color space converter: %s", x$name)
+#: R/convertColor.R:0
 msgid "Color space converter: %s"
 msgstr "Konwerter przestrzeni kolorów: %s"
 
+#. R/postscript.R: stop("GhostScript was not found")
+#. R/unix/dev2bitmap.R: stop("GhostScript was not found")
+#. R/unix/dev2bitmap.R: stop("GhostScript was not found")
+#. R/windows/dev2bitmap.R: stop("GhostScript was not found")
+#. R/windows/dev2bitmap.R: stop("GhostScript was not found")
+#: R/postscript.R:0 R/unix/dev2bitmap.R:0 R/windows/dev2bitmap.R:0
+msgid "GhostScript was not found"
+msgstr "program 'GhostScript' nie został znaleziony"
+
+#. R/postscript.R: stop("Invalid font database name")
+#: R/postscript.R:0
+msgid "Invalid font database name"
+msgstr "Niepoprawna nazwa bazy danych czcionek"
+
+#. R/postscript.R: stop("Invalid font type")
+#: R/postscript.R:0
+msgid "Invalid font type"
+msgstr "Niepoprawny typ czcionki"
+
+#. R/postscript.R: gettextf("NOT changing %s", paste(sQuote(names(prev[do.keep])),     collapse = " & "))
+#: R/postscript.R:0
+msgid "NOT changing %s"
+msgstr "NIE zmienianie %s"
+
+#. R/postscript.R: stop("Not a CID font")
+#: R/postscript.R:0
+msgid "Not a CID font"
+msgstr "To nie jest czcionka CID"
+
+#. R/convertColor.R: gettextf("Reference white: %s", x$reference.white)
+#: R/convertColor.R:0
 msgid "Reference white: %s"
 msgstr "Referencyjna biel: %s"
 
-msgid "display gamma = %s"
-msgstr "wyświetl gamma = %s"
+#. R/raster.R: stop("a raster array must be numeric")
+#: R/raster.R:0
+msgid "a raster array must be numeric"
+msgstr "tablica rastrowa musi być liczbowa"
 
-msgid "'from' must be a \"colorConverter\" object or a string"
+#. R/raster.R: stop("a raster array must have exactly 3 dimensions")
+#: R/raster.R:0
+msgid "a raster array must have exactly 3 dimensions"
+msgstr "tablica rastrowa musi mieć dokładnie 3 wymiary"
+
+#. R/raster.R: stop("a raster array must have exactly 3 or 4 planes")
+#: R/raster.R:0
+msgid "a raster array must have exactly 3 or 4 planes"
+msgstr "tablica rastrowa musi mieć dokładnie 3 lub 4 płaszczyzny"
+
+#. R/raster.R: stop("a raster matrix must be character, or numeric, or logical")
+#: R/raster.R:0
+msgid "a raster matrix must be character, or numeric, or logical"
 msgstr ""
-"argument 'from' musi być obiektem klasy \"colorConverter\" lub łańcuchem "
-"tekstowym"
+"macierz rastrowa musi być tekstem lub liczbą lub być wartością logiczną"
 
-msgid "'to' must be a \"colorConverter\" object or a string"
-msgstr "'to' musi być obiektem klasy \"colorConverter\" lub łańcuchem"
+#. R/postscript.R: warning("argument 'append' is for back-compatibility and will be ignored",     immediate. = TRUE)
+#: R/postscript.R:0
+msgid "argument 'append' is for back-compatibility and will be ignored"
+msgstr ""
+"argument 'append' jest dla zapewnienia wstecznej kompatybilności i będzie "
+"zignorowany"
 
-msgid "'from.ref.white' disagrees with definition of %s"
-msgstr "'from.ref.white' nie zgadza siÄ™ z definicjÄ… %s"
+#. R/device.R: stop("argument is missing with no default")
+#: R/device.R:0
+msgid "argument is missing with no default"
+msgstr "brakuje argumentu, a brak zdefiniowanej dla niego wartości domyślnej"
 
-msgid "'to.ref.white' disagrees with definition of %s"
-msgstr "'to.ref.white' nie zgadza siÄ™ z definicjÄ… %s"
+#. R/recordplot.R: gettextf("argument is not of class %s", dQuote("recordedplot"))
+#: R/recordplot.R:0
+msgid "argument is not of class %s"
+msgstr "argument nie jest obiektem klasy %s"
 
-msgid "color spaces use different reference whites"
-msgstr "przestrzenie kolorów używają różnych referencyjnych bieli"
+#. R/xyz.coords.R: stop("at least 2 columns needed")
+#: R/xyz.coords.R:0
+msgid "at least 2 columns needed"
+msgstr "przynajmniej 2 kolumny sÄ… potrzebne"
 
-msgid "'name' must be a character vector"
-msgstr "argument 'name' musi być wektorem tekstowym"
+#. R/colorstuff.R: stop("at least 3 columns needed")
+#: R/colorstuff.R:0
+msgid "at least 3 columns needed"
+msgstr "przynajmniej 3 kolumny sÄ… potrzebne"
 
-msgid "cannot shut down device 1 (the null device)"
-msgstr "nie można zamknąć urządzenia 1 (urządzenie 'null')"
+#. R/unix/x11.R: warning("cairo-based types are not supported on this build - using \"Xlib\"")
+#: R/unix/x11.R:0
+msgid "cairo-based types are not supported on this build - using \"Xlib\""
+msgstr ""
+"czcionki oparte o cairo nie są wspierane w tej kompilacji - używanie \"Xlib\""
 
-msgid "cannot supply 'which' and 'device' at the same time"
-msgstr "nie można dostarczyć 'which' oraz 'device' w tym samym czasie"
+#. R/windows/windows.R: stop("can only bring windows devices to the front")
+#: R/windows/windows.R:0
+msgid "can only bring windows devices to the front"
+msgstr "można jedynie przywołać urządzenia okien na wierzch"
+
+#. R/unix/x11.R: stop("can only copy from 'X11(type=\"*cairo\")' devices")
+#: R/unix/x11.R:0
+msgid "can only copy from 'X11(type=\"*cairo\")' devices"
+msgstr "można kopiować jedynie z urządzeń 'X11(type=\"*cairo\")'"
+
+#. R/windows/windows.R: stop("can only copy from 'windows' devices")
+#: R/windows/windows.R:0
+msgid "can only copy from 'windows' devices"
+msgstr "można kopiować jedynie z urządzeń 'windows'"
+
+#. R/windows/windows.R: stop("can only manipulate windows devices")
+#: R/windows/windows.R:0
+msgid "can only manipulate windows devices"
+msgstr "można działać tylko z urządzeniami 'windows'"
 
+#. R/device.R: stop("can only print from a screen device")
+#. R/device.R: stop("can only print from a screen device")
+#. R/device.R: stop("can only print from a screen device")
+#. R/unix/quartz.R: stop("can only print from a screen device")
+#: R/device.R:0 R/unix/quartz.R:0
+msgid "can only print from a screen device"
+msgstr "można drukować jedynie z ekranu urządzenia"
+
+#. R/device.R: stop("cannot copy device to itself")
+#: R/device.R:0
+msgid "cannot copy device to itself"
+msgstr "nie można kopiować urządzenia na siebie samego"
+
+#. R/device.R: stop("cannot copy from the null device")
+#: R/device.R:0
 msgid "cannot copy from the null device"
 msgstr "nie można kopiować z urządzenia 'null'"
 
+#. R/device.R: stop("cannot copy to the null device")
+#: R/device.R:0
 msgid "cannot copy to the null device"
 msgstr "nie można kopiować do urządzenia 'null'"
 
-msgid "cannot copy device to itself"
-msgstr "nie można kopiować urządzenia na siebie samego"
-
-msgid "'device' should be a function"
-msgstr "'device' powinno być funkcją"
+#. R/postscript.R: gettextf("cannot reset non-existent '%s'", name.opt)
+#: R/postscript.R:0
+msgid "cannot reset non-existent '%s'"
+msgstr "nie można zresetować nieistniejące '%s'"
 
-msgid "no device to print from"
-msgstr "brak urządzenia z którego można drukować"
+#. R/device.R: stop("cannot shut down device 1 (the null device)")
+#: R/device.R:0
+msgid "cannot shut down device 1 (the null device)"
+msgstr "nie można zamknąć urządzenia 1 (urządzenie 'null')"
 
-msgid "can only print from a screen device"
-msgstr "można drukować jedynie z ekranu urządzenia"
+#. R/device.R: stop("cannot supply 'which' and 'device' at the same time")
+#: R/device.R:0
+msgid "cannot supply 'which' and 'device' at the same time"
+msgstr "nie można dostarczyć 'which' oraz 'device' w tym samym czasie"
 
-msgid "need to specify one of 'width' and 'height'"
-msgstr "potrzeba określić jeden z 'width' oraz 'height'"
+#. R/convertColor.R: warning("color spaces use different reference whites")
+#: R/convertColor.R:0
+msgid "color spaces use different reference whites"
+msgstr "przestrzenie kolorów używają różnych referencyjnych bieli"
 
+#. R/device.R: stop("dev.control() called without an open graphics device")
+#: R/device.R:0
 msgid "dev.control() called without an open graphics device"
 msgstr "funkcja 'dev.control()' wywołana bez otwartego urządzenia graficznego"
 
-msgid "argument is missing with no default"
-msgstr "brakuje argumentu, a brak zdefiniowanej dla niego wartości domyślnej"
-
+#. R/device.R: stop("dev.displaylist() called without an open graphics device")
+#: R/device.R:0
 msgid "dev.displaylist() called without an open graphics device"
 msgstr ""
 "funkcja 'dev.displaylist()' wywołana bez otwartego urządzenia graficznego"
 
-msgid "invalid setting for 'getOption(\"device\")'"
-msgstr "niepoprawne ustawienie dla 'getOption(\"device\")'"
-
-msgid "device '%s' not found"
-msgstr "urządzenie '%s' nie zostało znalezione"
-
-msgid "no suitable unused file name for pdf()"
-msgstr "brak odpowiedniej nieużywanej nazwy pliku dla 'pdf()'"
-
+#. R/device.R: gettextf("dev.new(): using pdf(file=\"%s\")", tmp[!fe][1L])
+#: R/device.R:0
 msgid "dev.new(): using pdf(file=\"%s\")"
 msgstr "dev.new(): używanie 'pdf(file=\"%s\")'"
 
-msgid "no suitable unused file name for postscript()"
-msgstr "brak odpowiedniej nieużywanej nazwy pliku dla 'postscript()'"
-
+#. R/device.R: gettextf("dev.new(): using postscript(file=\"%s\")", tmp[!fe][1L])
+#: R/device.R:0
 msgid "dev.new(): using postscript(file=\"%s\")"
 msgstr "dev.new(): używanie 'postscript(file=\"%s\")'"
 
-msgid "invalid arguments in '%s' (need named args)"
-msgstr "niepoprawne argumenty w '%s' (potrzebne sÄ… nazwane argumenty)"
+#. R/unix/dev2bitmap.R: gettextf("device '%s' is not available\n", type)
+#. R/windows/dev2bitmap.R: gettextf("device '%s' is not available\n", type)
+#: R/unix/dev2bitmap.R:0 R/windows/dev2bitmap.R:0
+msgid "device '%s' is not available"
+msgstr "urządzenie '%s' nie jest dostępne"
 
-msgid "'name.opt' must be character, name of an existing list"
-msgstr "argument 'name.opt' musi być tekstem, nazwą istniejącej listy"
+#. R/device.R: gettextf("device '%s' not found", dev)
+#: R/device.R:0
+msgid "device '%s' not found"
+msgstr "urządzenie '%s' nie zostało znalezione"
 
-msgid "cannot reset non-existent '%s'"
-msgstr "nie można zresetować nieistniejące '%s'"
+#. R/calc.R: stop("dimensions of 'x', 'y' and 'z' do not match")
+#: R/calc.R:0
+msgid "dimensions of 'x', 'y' and 'z' do not match"
+msgstr "wymiary 'x', 'y' oraz 'z' nie zgadzajÄ… siÄ™"
 
-msgid "invalid options in '%s'"
-msgstr "niepoprawne opcje w '%s'"
+#. R/convertColor.R: gettextf("display gamma = %s", format(x$gamma))
+#: R/convertColor.R:0
+msgid "display gamma = %s"
+msgstr "wyświetl gamma = %s"
 
-msgid "NOT changing %s"
-msgstr "NIE zmienianie %s"
+#. R/calc.R: stop("finite coordinates are needed")
+#: R/calc.R:0
+msgid "finite coordinates are needed"
+msgstr "wymagane są skończone współrzędne"
 
-msgid "argument 'append' is for back-compatibility and will be ignored"
-msgstr ""
-"argument 'append' jest dla zapewnienia wstecznej kompatybilności i będzie "
-"zignorowany"
+#. R/postscript.R: gettextf("font %s already in use", i)
+#: R/postscript.R:0
+msgid "font %s already in use"
+msgstr "czcionka '%s' jest już w użyciu"
 
-msgid "unknown family '%s'"
-msgstr "nieznana rodzina '%s'"
+#. R/postscript.R: gettextf("font encoding mismatch '%s'/'%s'", font$encoding, encoding)
+#: R/postscript.R:0
+msgid "font encoding mismatch '%s'/'%s'"
+msgstr "niezgodność strony kodowej czcionki '%s'/'%s'"
 
+#. R/calc.R: stop("increasing 'x' and 'y' values expected")
+#: R/calc.R:0
+msgid "increasing 'x' and 'y' values expected"
+msgstr "oczekiwano rosnących wartości 'x' oraz 'y'"
+
+#. R/postscript.R: stop("invalid 'cmapEncoding' in font specification")
+#: R/postscript.R:0
+msgid "invalid 'cmapEncoding' in font specification"
+msgstr "niepoprawne 'cmapEncoding' w specyfikacji czcionki"
+
+#. R/postscript.R: stop("invalid 'family' argument")
+#. R/postscript.R: stop("invalid 'family' argument")
+#: R/postscript.R:0
 msgid "invalid 'family' argument"
 msgstr "niepoprawny argument 'family'"
 
+#. R/unix/quartz.R: stop("invalid 'file'")
+#: R/unix/quartz.R:0
+msgid "invalid 'file'"
+msgstr "niepoprawny argument 'file'"
+
+#. R/postscript.R: gettextf("invalid 'file' argument '%s'", file)
+#. R/postscript.R: gettextf("invalid 'file' argument '%s'", file)
+#. R/postscript.R: gettextf("invalid 'file' argument '%s'", file)
+#: R/postscript.R:0
 msgid "invalid 'file' argument '%s'"
 msgstr "niepoprawny argument 'file' '%s'"
 
-msgid "invalid PDF version"
-msgstr "niepoprawna wersja PDF"
-
-msgid "Invalid font type"
-msgstr "Niepoprawny typ czcionki"
-
-msgid "invalid family name in font specification"
-msgstr "niepoprawna rodzina czcionki w specyfikacji czcionki"
-
-msgid "invalid metric information in font specification"
-msgstr "niepoprawna informacja metryczna w specyfikacji czcionki"
-
-msgid "invalid encoding in font specification"
-msgstr "niepoprawna strona kodowa w specyfikacji czcionki"
+#. R/cairo.R: stop("invalid 'filename'")
+#. R/cairo.R: stop("invalid 'filename'")
+#. R/cairo.R: stop("invalid 'filename'")
+#. R/unix/png.R: stop("invalid 'filename'")
+#. R/unix/png.R: stop("invalid 'filename'")
+#. R/unix/png.R: stop("invalid 'filename'")
+#. R/unix/png.R: stop("invalid 'filename'")
+#. R/windows/png.R: stop("invalid 'filename'")
+#. R/windows/png.R: stop("invalid 'filename'")
+#. R/windows/png.R: stop("invalid 'filename'")
+#. R/windows/png.R: stop("invalid 'filename'")
+#. R/windows/windows.R: stop("invalid 'filename'")
+#: R/cairo.R:0 R/unix/png.R:0 R/windows/png.R:0 R/windows/windows.R:0
+msgid "invalid 'filename'"
+msgstr "niepoprawny argument 'filename'"
 
-msgid "Not a CID font"
-msgstr "To nie jest czcionka CID"
+#. R/unix/quartz.R: stop("invalid 'title'")
+#. R/unix/x11.R: stop("invalid 'title'")
+#: R/unix/quartz.R:0 R/unix/x11.R:0
+msgid "invalid 'title'"
+msgstr "niepoprawny argument 'title'"
 
+#. R/postscript.R: stop("invalid CMap name in font specification")
+#: R/postscript.R:0
 msgid "invalid CMap name in font specification"
 msgstr "niepoprawna nazwa 'CMap' w specyfikacji czcionki"
 
-msgid "invalid 'cmapEncoding' in font specification"
-msgstr "niepoprawne 'cmapEncoding' w specyfikacji czcionki"
-
+#. R/postscript.R: stop("invalid PDF resource in font specification")
+#: R/postscript.R:0
 msgid "invalid PDF resource in font specification"
 msgstr "niepoprawne źródło PDF w specyfikacji czcionki"
 
-msgid "Invalid font database name"
-msgstr "Niepoprawna nazwa bazy danych czcionek"
-
-msgid "font %s already in use"
-msgstr "czcionka '%s' jest już w użyciu"
-
-msgid "invalid arguments in '%s' (must be font names)"
-msgstr "niepoprawne argumenty w '%s' (muszą być nazwy czcionek)"
-
-msgid "unknown font"
-msgstr "nieznana czcionka"
-
-msgid "font encoding mismatch '%s'/'%s'"
-msgstr "niezgodność strony kodowej czcionki '%s'/'%s'"
-
-msgid "'file' must be a non-empty character string"
-msgstr "argument 'file' musi być niepustym łańcuchem tekstowym"
-
-msgid "GhostScript was not found"
-msgstr "program 'GhostScript' nie został znaleziony"
-
-msgid "invalid output format"
-msgstr "niepoprawny format wyjściowy"
-
-msgid "status %d in running command '%s'"
-msgstr "status '%d' w działającym poleceniu '%s'"
+#. R/postscript.R: stop("invalid PDF version")
+#: R/postscript.R:0
+msgid "invalid PDF version"
+msgstr "niepoprawna wersja PDF"
 
-msgid "range too small for 'min.n'"
-msgstr "zakres jest zbyt mały dla 'min.m'"
+#. R/unix/quartz.R: stop("invalid Quartz font:  must be 4 strings")
+#: R/unix/quartz.R:0
+msgid "invalid Quartz font:  must be 4 strings"
+msgstr "niepoprawna czcionka 'Quartz': muszą być 4 łańcuchy"
 
-msgid "a raster matrix must be character, or numeric, or logical"
+#. R/windows/windows.R: stop("invalid Windows font:  must be a single font family name")
+#: R/windows/windows.R:0
+msgid "invalid Windows font:  must be a single font family name"
 msgstr ""
-"macierz rastrowa musi być tekstem lub liczbą lub być wartością logiczną"
-
-msgid "a raster array must be numeric"
-msgstr "tablica rastrowa musi być liczbowa"
-
-msgid "a raster array must have exactly 3 dimensions"
-msgstr "tablica rastrowa musi mieć dokładnie 3 wymiary"
-
-msgid "a raster array must have exactly 3 or 4 planes"
-msgstr "tablica rastrowa musi mieć dokładnie 3 lub 4 płaszczyzny"
+"niepoprawna czcionka Windows:  musi być nazwa pojedynczej rodziny czcionek"
 
-msgid "'drop' is always implicitly FALSE in '[.raster'"
-msgstr "'drop' jest zawsze rozumiany jako FALSE w '[.raster'"
+#. R/unix/x11.R: stop("invalid X11 font specification: ", errDesc)
+#: R/unix/x11.R:0
+msgid "invalid X11 font specification:"
+msgstr "niepoprawne określenie czcionki X11:"
 
-msgid "invalid raster subsetting"
-msgstr "niepoprawny podzbiór rastra"
+#. R/postscript.R: gettextf("invalid arguments in '%s' (must be font names)", "postscriptFonts")
+#. R/postscript.R: gettextf("invalid arguments in '%s' (must be font names)", "pdfFonts")
+#: R/postscript.R:0
+msgid "invalid arguments in '%s' (must be font names)"
+msgstr "niepoprawne argumenty w '%s' (muszą być nazwy czcionek)"
 
-msgid "invalid raster subassignment"
-msgstr "niepoprawny wymiana elementu rastra"
+#. R/postscript.R: gettextf("invalid arguments in '%s' (need named args)", deparse(sys.call(sys.parent())))
+#. R/postscript.R: gettextf("invalid arguments in '%s' (need named args)", "postscriptFonts")
+#. R/postscript.R: gettextf("invalid arguments in '%s' (need named args)", "pdfFonts")
+#: R/postscript.R:0
+msgid "invalid arguments in '%s' (need named args)"
+msgstr "niepoprawne argumenty w '%s' (potrzebne sÄ… nazwane argumenty)"
 
-msgid "operator not meaningful for raster objects"
-msgstr "operator nie ma znaczenia dla obiektów rastrowych"
+#. R/unix/x11.R: stop("invalid arguments in 'X11Fonts' (must be font names)")
+#: R/unix/x11.R:0
+msgid "invalid arguments in 'X11Fonts' (must be font names)"
+msgstr "niepoprawne argumenty w 'X11Fonts' (muszą być nazwy czcionek)"
 
-msgid "no current device to record from"
-msgstr "brak bieżącego urządzenia z którego można nagrywać"
+#. R/unix/x11.R: stop("invalid arguments in 'X11Fonts' (need named args)")
+#: R/unix/x11.R:0
+msgid "invalid arguments in 'X11Fonts' (need named args)"
+msgstr "niepoprawne argumenty w 'X11Fonts' (potrzebne sÄ… nazwane argumenty)"
 
-msgid "argument is not of class %s"
-msgstr "argument nie jest obiektem klasy %s"
+#. R/unix/quartz.R: stop("invalid arguments in 'quartzFonts' (must be font names)")
+#: R/unix/quartz.R:0
+msgid "invalid arguments in 'quartzFonts' (must be font names)"
+msgstr "niepoprawne argumenty w 'quatzFonts' (muszą być nazwy czcionek)"
 
-msgid "loading snapshot from a different session"
-msgstr "Å‚adowanie zrzutu z innej sesji"
+#. R/unix/quartz.R: stop("invalid arguments in 'quartzFonts' (need named args)")
+#: R/unix/quartz.R:0
+msgid "invalid arguments in 'quartzFonts' (need named args)"
+msgstr "niepoprawne argumenty w 'quatzFonts' (potrzebne sÄ… nazwane argumenty)"
 
-msgid "'nbin' must be numeric of length 1 or 2"
-msgstr "argument 'nbin' musi być liczbą o długości 1 lub 2"
+#. R/windows/windows.R: stop("invalid arguments in 'windowsFonts' (must be font names)")
+#: R/windows/windows.R:0
+msgid "invalid arguments in 'windowsFonts' (must be font names)"
+msgstr "niepoprawne argumenty w 'windowsFonts' (muszą być nazwy czcionek)"
 
-msgid "'bandwidth' must be numeric"
-msgstr "wartość 'bandwidth' musi być liczbą"
+#. R/windows/windows.R: stop("invalid arguments in 'windowsFonts' (need named args)")
+#: R/windows/windows.R:0
+msgid "invalid arguments in 'windowsFonts' (need named args)"
+msgstr ""
+"niepoprawne argumenty w 'windowsFonts' (potrzebne sÄ… nazwane argumenty)"
 
-msgid "'bandwidth' must be positive"
-msgstr "argument 'bandwidth' musi być dodatni"
+#. R/postscript.R: stop("invalid encoding in font specification")
+#: R/postscript.R:0
+msgid "invalid encoding in font specification"
+msgstr "niepoprawna strona kodowa w specyfikacji czcionki"
 
-msgid "'r' must be a \"range\", hence of length 2"
-msgstr "'r' musi być wynikiem funkcji 'range()', a więc o długości 2"
+#. R/postscript.R: stop("invalid family name in font specification")
+#. R/postscript.R: stop("invalid family name in font specification")
+#: R/postscript.R:0
+msgid "invalid family name in font specification"
+msgstr "niepoprawna rodzina czcionki w specyfikacji czcionki"
 
+#. R/xyz.coords.R: stop("invalid first argument")
+#: R/xyz.coords.R:0
 msgid "invalid first argument"
 msgstr "niepoprawny pierwszy argument"
 
-msgid "'x' is a list, but does not have components 'x' and 'y'"
-msgstr "obiekt 'x' jest listą, ale nie zawiera komponentów 'x' oraz 'y'"
-
-msgid "'x' and 'y' lengths differ"
-msgstr "długości zmiennych 'x' oraz 'y' różnią się"
-
+#. R/xyz.coords.R: stop("invalid first argument [bad language object]")
+#: R/xyz.coords.R:0
 msgid "invalid first argument [bad language object]"
 msgstr "niepoprawny pierwszy argument [niepoprawny obiekt języka]"
 
-msgid "at least 2 columns needed"
-msgstr "przynajmniej 2 kolumny sÄ… potrzebne"
-
-msgid "'x' is a list, but does not have components 'x', 'y'  and 'z'"
-msgstr "obiekt 'x' jest listą, ale nie zawiera komponentów 'x', 'y' oraz 'z'"
-
-msgid "'x', 'y' and 'z' lengths differ"
-msgstr "długości zmiennych 'x', 'y' oraz 'z' różnią się"
-
-msgid "'file' is missing with no default"
-msgstr "brakuje argumentu 'file', a brak zdefiniowanej wartości domyślnej"
-
-msgid "unrecognized format of gs -help"
-msgstr "nierozpoznany format 'gs -help'"
-
-msgid "device '%s' is not available"
-msgstr "urządzenie '%s' nie jest dostępne"
-
-msgid ""
-"Available devices are:\n"
-"%s"
-msgstr ""
-"Dostępne urządzenia to:\n"
-"%s"
+#. R/postscript.R: stop("invalid metric information in font specification")
+#. R/postscript.R: stop("invalid metric information in font specification")
+#: R/postscript.R:0
+msgid "invalid metric information in font specification"
+msgstr "niepoprawna informacja metryczna w specyfikacji czcionki"
 
-msgid "'res' must be specified unless 'units = \"px\"'"
-msgstr "wartość 'res' musi być określona chyba, że 'units = \"px\"'"
+#. R/postscript.R: gettextf("invalid options in '%s'", name.opt)
+#: R/postscript.R:0
+msgid "invalid options in '%s'"
+msgstr "niepoprawne opcje w '%s'"
 
-msgid "invalid 'title'"
-msgstr "niepoprawny argument 'title'"
+#. R/postscript.R: stop("invalid output format")
+#: R/postscript.R:0
+msgid "invalid output format"
+msgstr "niepoprawny format wyjściowy"
 
-msgid "invalid 'file'"
-msgstr "niepoprawny argument 'file'"
+#. R/raster.R: stop("invalid raster subassignment")
+#: R/raster.R:0
+msgid "invalid raster subassignment"
+msgstr "niepoprawny wymiana elementu rastra"
 
-msgid "invalid Quartz font:  must be 4 strings"
-msgstr "niepoprawna czcionka 'Quartz': muszą być 4 łańcuchy"
+#. R/raster.R: stop("invalid raster subsetting")
+#: R/raster.R:0
+msgid "invalid raster subsetting"
+msgstr "niepoprawny podzbiór rastra"
 
-msgid "invalid arguments in 'quartzFonts' (must be font names)"
-msgstr "niepoprawne argumenty w 'quatzFonts' (muszą być nazwy czcionek)"
+#. R/device.R: stop("invalid setting for 'getOption(\"device\")'")
+#: R/device.R:0
+msgid "invalid setting for 'getOption(\"device\")'"
+msgstr "niepoprawne ustawienie dla 'getOption(\"device\")'"
 
-msgid "invalid arguments in 'quartzFonts' (need named args)"
-msgstr "niepoprawne argumenty w 'quatzFonts' (potrzebne sÄ… nazwane argumenty)"
+#. R/windows/windows.R: stop("invalid value for 'rescale'")
+#: R/windows/windows.R:0
+msgid "invalid value for 'rescale'"
+msgstr "niepoprawna wartość dla 'rescale'"
 
-msgid "cairo-based types are not supported on this build - using \"Xlib\""
-msgstr ""
-"czcionki oparte o cairo nie są wspierane w tej kompilacji - używanie \"Xlib\""
+#. R/device.R: warning("need to specify one of 'width' and 'height'")
+#: R/device.R:0
+msgid "need to specify one of 'width' and 'height'"
+msgstr "potrzeba określić jeden z 'width' oraz 'height'"
 
-msgid "unknown family for X11(type = \"XLib\")"
-msgstr "nieznana rodzina dla  'X11(type = \"XLib\")'"
+#. R/calc.R: stop("no 'z' matrix specified")
+#: R/calc.R:0
+msgid "no 'z' matrix specified"
+msgstr "brak określonej macierzy 'z'"
 
-msgid "invalid X11 font specification:"
-msgstr "niepoprawne określenie czcionki X11:"
+#. R/recordplot.R: stop("no current device to record from")
+#: R/recordplot.R:0
+msgid "no current device to record from"
+msgstr "brak bieżącego urządzenia z którego można nagrywać"
 
-msgid "invalid arguments in 'X11Fonts' (must be font names)"
-msgstr "niepoprawne argumenty w 'X11Fonts' (muszą być nazwy czcionek)"
+#. R/device.R: stop("no device to print from")
+#. R/device.R: stop("no device to print from")
+#. R/device.R: stop("no device to print from")
+#. R/unix/quartz.R: stop("no device to print from")
+#: R/device.R:0 R/unix/quartz.R:0
+msgid "no device to print from"
+msgstr "brak urządzenia z którego można drukować"
 
-msgid "invalid arguments in 'X11Fonts' (need named args)"
-msgstr "niepoprawne argumenty w 'X11Fonts' (potrzebne sÄ… nazwane argumenty)"
+#. R/calc.R: stop("no proper 'z' matrix specified")
+#: R/calc.R:0
+msgid "no proper 'z' matrix specified"
+msgstr "nie określono odpowiedniej macierzy 'z'"
 
+#. R/unix/x11.R: stop("no such device")
+#. R/windows/windows.R: stop("no such device")
+#: R/unix/x11.R:0 R/windows/windows.R:0
 msgid "no such device"
 msgstr "brak takiego urzÄ…dzenia"
 
-msgid "can only copy from 'X11(type=\"*cairo\")' devices"
-msgstr "można kopiować jedynie z urządzeń 'X11(type=\"*cairo\")'"
+#. R/device.R: stop("no suitable unused file name for pdf()")
+#: R/device.R:0
+msgid "no suitable unused file name for pdf()"
+msgstr "brak odpowiedniej nieużywanej nazwy pliku dla 'pdf()'"
 
-msgid "invalid value for 'rescale'"
-msgstr "niepoprawna wartość dla 'rescale'"
+#. R/device.R: stop("no suitable unused file name for postscript()")
+#: R/device.R:0
+msgid "no suitable unused file name for postscript()"
+msgstr "brak odpowiedniej nieużywanej nazwy pliku dla 'postscript()'"
 
-msgid "can only bring windows devices to the front"
-msgstr "można jedynie przywołać urządzenia okien na wierzch"
+#. R/raster.R: stop("operator not meaningful for raster objects")
+#: R/raster.R:0
+msgid "operator not meaningful for raster objects"
+msgstr "operator nie ma znaczenia dla obiektów rastrowych"
 
-msgid "'type' not applicable to the R console"
-msgstr "'type' nie ma zastosowania w konsoli R"
+#. R/colorstuff.R: stop("rgb matrix must be numeric")
+#: R/colorstuff.R:0
+msgid "rgb matrix must be numeric"
+msgstr "macierz RGB musi być liczbowa"
 
-msgid "can only manipulate windows devices"
-msgstr "można działać tylko z urządzeniami 'windows'"
+#. R/colorstuff.R: stop("rgb matrix must have 3 rows")
+#: R/colorstuff.R:0
+msgid "rgb matrix must have 3 rows"
+msgstr "macierz RGB musi mieć 3 wiersze"
 
-msgid "can only copy from 'windows' devices"
-msgstr "można kopiować jedynie z urządzeń 'windows'"
+#. R/colorstuff.R: stop("rgb values must be in [0, maxColorValue]")
+#: R/colorstuff.R:0
+msgid "rgb values must be in [0, maxColorValue]"
+msgstr "argumenty 'r', 'g' oraz 'b' muszą być w przedziale [0, maxColorValue]"
+
+#. R/recordplot.R: stop("snapshot contains invalid graphics call")
+#: R/recordplot.R:0
+msgid "snapshot contains invalid graphics call"
+msgstr "zrzut zawiera niepoprawne wywołania grafiki"
+
+#. R/recordplot.R: gettextf("snapshot recorded in different R version (%s)", snapshotRversion)
+#: R/recordplot.R:0
+msgid "snapshot recorded in different R version (%s)"
+msgstr "zrzut zapisany w innej wersji R (%s)"
+
+#. R/recordplot.R: warning("snapshot recorded in different R version (pre 3.3.0)")
+#: R/recordplot.R:0
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr "zrzut zapisany w innej wersji R (przed 3.3.0)"
+
+#. R/postscript.R: gettextf("status %d in running command '%s'", ret, cmd)
+#: R/postscript.R:0
+msgid "status %d in running command '%s'"
+msgstr "status '%d' w działającym poleceniu '%s'"
 
+#. R/windows/windows.R: stop("subscript out of range")
+#: R/windows/windows.R:0
 msgid "subscript out of range"
 msgstr "indeks jest poza zakresem"
 
-msgid "invalid Windows font:  must be a single font family name"
-msgstr ""
-"niepoprawna czcionka Windows:  musi być nazwa pojedynczej rodziny czcionek"
-
-msgid "invalid arguments in 'windowsFonts' (must be font names)"
-msgstr "niepoprawne argumenty w 'windowsFonts' (muszą być nazwy czcionek)"
+#. R/postscript.R: gettextf("unknown family '%s'", family)
+#. R/postscript.R: gettextf("unknown family '%s'", family)
+#: R/postscript.R:0
+msgid "unknown family '%s'"
+msgstr "nieznana rodzina '%s'"
 
-msgid "invalid arguments in 'windowsFonts' (need named args)"
-msgstr ""
-"niepoprawne argumenty w 'windowsFonts' (potrzebne sÄ… nazwane argumenty)"
+#. R/unix/x11.R: stop("unknown family for X11(type = \"XLib\")")
+#: R/unix/x11.R:0
+msgid "unknown family for X11(type = \"XLib\")"
+msgstr "nieznana rodzina dla  'X11(type = \"XLib\")'"
 
-msgid "invalid argument name %s in '%s'"
-msgid_plural "invalid argument names %s in '%s'"
-msgstr[0] "niepoprawna nazwa argumentu %s w '%s'"
-msgstr[1] "niepoprawne nazwy argumentów %s w '%s'"
-msgstr[2] "niepoprawne nazwy argumentów %s w '%s'"
+#. R/postscript.R: stop("unknown font")
+#: R/postscript.R:0
+msgid "unknown font"
+msgstr "nieznana czcionka"
 
-msgid "differs between new and previous"
-msgid_plural "differ between new and previous"
-msgstr[0] "różni się pomiędzy nowym a poprzednim"
-msgstr[1] "różnią się pomiędzy nowym a poprzednim"
-msgstr[2] "różnią się pomiędzy nowym a poprzednim"
+#. R/unix/dev2bitmap.R: warning("unrecognized format of gs -help")
+#. R/windows/dev2bitmap.R: warning("unrecognized format of gs -help")
+#: R/unix/dev2bitmap.R:0 R/windows/dev2bitmap.R:0
+msgid "unrecognized format of gs -help"
+msgstr "nierozpoznany format 'gs -help'"
 
+#. R/xyz.coords.R: ngettext(n, "%d x value <= 0 omitted from logarithmic plot",     "%d x values <= 0 omitted from logarithmic plot")
+#. R/xyz.coords.R: ngettext(n, "%d x value <= 0 omitted from logarithmic plot",     "%d x values <= 0 omitted from logarithmic plot")
+#: R/xyz.coords.R:0
 msgid "%d x value <= 0 omitted from logarithmic plot"
 msgid_plural "%d x values <= 0 omitted from logarithmic plot"
 msgstr[0] "%d wartość x <= 0 pominięto na wykresie logarytmicznym"
 msgstr[1] "%d wartości x <= 0 pominięto na wykresie logarytmicznym"
 msgstr[2] "%d wartości x <= 0 pominięto na wykresie logarytmicznym"
 
+#. R/xyz.coords.R: ngettext(n, "%d y value <= 0 omitted from logarithmic plot",     "%d y values <= 0 omitted from logarithmic plot")
+#. R/xyz.coords.R: ngettext(n, "%d y value <= 0 omitted from logarithmic plot",     "%d y values <= 0 omitted from logarithmic plot")
+#: R/xyz.coords.R:0
 msgid "%d y value <= 0 omitted from logarithmic plot"
 msgid_plural "%d y values <= 0 omitted from logarithmic plot"
 msgstr[0] "%d wartość y <= 0 pominięto na wykresie logarytmicznym"
 msgstr[1] "%d wartości y <= 0 pominięto na wykresie logarytmicznym"
 msgstr[2] "%d wartości y <= 0 pominięto na wykresie logarytmicznym"
 
+#. R/xyz.coords.R: ngettext(n, "%d z value <= 0 omitted from logarithmic plot",     "%d z values <= 0 omitted from logarithmic plot")
+#: R/xyz.coords.R:0
 msgid "%d z value <= 0 omitted from logarithmic plot"
 msgid_plural "%d z values <= 0 omitted from logarithmic plot"
 msgstr[0] "%d wartość z <= 0 pominięto na wykresie logarytmicznym"
 msgstr[1] "%d wartości z <= 0 pominięto na wykresie logarytmicznym"
 msgstr[2] "%d wartości z <= 0 pominięto na wykresie logarytmicznym"
+
+#. R/postscript.R: ngettext(as.integer(sum(ii)), "differs between new and previous",     "differ between new and previous")
+#: R/postscript.R:0
+msgid "differs between new and previous"
+msgid_plural "differ between new and previous"
+msgstr[0] "różni się pomiędzy nowym a poprzednim"
+msgstr[1] "różnią się pomiędzy nowym a poprzednim"
+msgstr[2] "różnią się pomiędzy nowym a poprzednim"
+
+#. R/postscript.R: ngettext(as.integer(sum(is.na(matches))), "invalid argument name %s in '%s'",     "invalid argument names %s in '%s'")
+#: R/postscript.R:0
+msgid "invalid argument name %s in '%s'"
+msgid_plural "invalid argument names %s in '%s'"
+msgstr[0] "niepoprawna nazwa argumentu %s w '%s'"
+msgstr[1] "niepoprawne nazwy argumentów %s w '%s'"
+msgstr[2] "niepoprawne nazwy argumentów %s w '%s'"
+
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "zakres jest zbyt mały dla 'min.m'"
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-pt_BR.po r-base-3.3.1/src/library/grDevices/po/R-pt_BR.po
--- r-base-3.2.3/src/library/grDevices/po/R-pt_BR.po	2015-03-18 23:03:48.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-pt_BR.po	2016-04-27 22:15:38.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:56-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -234,10 +234,6 @@
 msgstr "estado %d em executar comando '%s'"
 
 #, fuzzy
-msgid "range too small for 'min.n'"
-msgstr "faixa pequena demais para min.n"
-
-#, fuzzy
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr "Uma matriz raster deve ser caractere, ou numérica, ou lógica"
 
@@ -274,9 +270,16 @@
 msgstr "argumento não é da classe \"recordedplot\""
 
 #, fuzzy
-msgid "loading snapshot from a different session"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr "carregando snapshot de versão R diferente"
+
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
 msgstr "carregando snapshot de versão R diferente"
 
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr "'nbin' deve ser numérico de comprimento 1 ou 2"
 
@@ -421,6 +424,10 @@
 msgstr[0] "valores %d z <= 0 omitidos do gráfico logarítmico"
 msgstr[1] ""
 
+#, fuzzy
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "faixa pequena demais para min.n"
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr "desculpe, 'gs' não pode ser encontrado"
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-ru.po r-base-3.3.1/src/library/grDevices/po/R-ru.po
--- r-base-3.2.3/src/library/grDevices/po/R-ru.po	2015-03-28 23:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-ru.po	2016-04-27 22:15:38.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-05-26 08:40\n"
-"PO-Revision-Date: 2015-03-26 18:54-0600\n"
+"PO-Revision-Date: 2016-04-05 18:07-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
diff -Nru r-base-3.2.3/src/library/grDevices/po/ru.po r-base-3.3.1/src/library/grDevices/po/ru.po
--- r-base-3.2.3/src/library/grDevices/po/ru.po	2015-06-06 22:15:39.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/ru.po	2016-04-27 22:15:39.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 18:55-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:07-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -18,10 +18,11 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: axis_scales.c:37 axis_scales.c:38 axis_scales.c:55
+#: axis_scales.c:37
+#: axis_scales.c:38
+#: axis_scales.c:55
 #, c-format
 msgid "'%s' must be numeric of length %d"
 msgstr "'%s' ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ ÄÌÉÎÙ %d"
@@ -70,11 +71,13 @@
 msgid "bad hsv to rgb color conversion"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ hsv × rgb"
 
-#: colors.c:218 colors.c:232
+#: colors.c:218
+#: colors.c:232
 msgid "invalid hsv color"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ Ã×ÅÔ hsv"
 
-#: colors.c:344 colors.c:364
+#: colors.c:344
+#: colors.c:364
 msgid "invalid hcl color"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ Ã×ÅÔ hcl"
 
@@ -86,7 +89,8 @@
 msgid "invalid 'names' vector"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ×ÅËÔÏÒ 'names'"
 
-#: colors.c:483 colors.c:492
+#: colors.c:483
+#: colors.c:492
 msgid "invalid gray level, must be in [0,1]."
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÕÒÏ×ÅÎØ ÓÅÒÏÇÏ, ÄÏÌÖÅÎ ÂÙÔØ × [0,1]."
 
@@ -99,7 +103,8 @@
 msgid "invalid hex digit in 'color' or 'lty'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ÃÉÆÒÁ × 'color' ÉÌÉ 'lty'"
 
-#: colors.c:1350 colors.c:1360
+#: colors.c:1350
+#: colors.c:1360
 msgid "invalid RGB specification"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÕËÁÚÁÎÉÅ RGB"
 
@@ -108,7 +113,8 @@
 msgid "invalid color name '%s'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÎÁÚ×ÁÎÉÅ Ã×ÅÔÁ '%s'"
 
-#: colors.c:1443 colors.c:1452
+#: colors.c:1443
+#: colors.c:1452
 #, c-format
 msgid "invalid color specification \"%s\""
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÕËÁÚÁÎÉÅ Ã×ÅÔÁ \"%s\""
@@ -130,7 +136,8 @@
 msgid "unknown palette (need >= 2 colors)"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÁÌÉÔÒÁ (ÎÁÄÏ >= 2 Ã×ÅÔÏ×)"
 
-#: colors.c:1510 colors.c:1532
+#: colors.c:1510
+#: colors.c:1532
 #, c-format
 msgid "maximum number of colors is %d"
 msgstr "ÍÁËÓÉÍÁÌØÎÏÅ ËÏÌÉÞÅÓÔ×Ï Ã×ÅÔÏ× %d"
@@ -144,7 +151,11 @@
 msgid "unknown AFM entity encountered"
 msgstr "×ÓÔÒÅÞÅÎ ÎÅÉÚ×ÅÓÔÎÙÊ ÒÁÚÄÅÌ AFM"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740
+#: devPS.c:743
+#: devPS.c:4425
+#: devPS.c:7916
+#: devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -160,7 +171,8 @@
 msgid "unknown encoding '%s' in 'PostScriptMetricInfo'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÄÉÒÏ×ËÁ '%s' × 'PostScriptMetricInfo'"
 
-#: devPS.c:848 devPS.c:859
+#: devPS.c:848
+#: devPS.c:859
 #, c-format
 msgid "font metrics unknown for Unicode character U+%04x"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙ ÛÒÉÆÔÏ×ÙÅ ÍÅÔÒÉËÉ ÄÌÑ ÓÉÍ×ÏÌÁ àÎÉËÏÄÁ U+%04x"
@@ -172,18 +184,12 @@
 
 #: devPS.c:881
 #, c-format
-msgid ""
-"invalid character (%04x) sent to 'PostScriptCIDMetricInfo' in a single-byte "
-"locale"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÉÍ×ÏÌ (%04x) ÐÏÓÌÁÎ × 'PostScriptCIDMetricInfo' ÎÁ ÏÄÎÏÂÁÊÔÎÏÊ "
-"ÌÏËÁÌÉ"
+msgid "invalid character (%04x) sent to 'PostScriptCIDMetricInfo' in a single-byte locale"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÉÍ×ÏÌ (%04x) ÐÏÓÌÁÎ × 'PostScriptCIDMetricInfo' ÎÁ ÏÄÎÏÂÁÊÔÎÏÊ ÌÏËÁÌÉ"
 
 #: devPS.c:889
-msgid ""
-"invalid character sent to 'PostScriptCIDMetricInfo' in a single-byte locale"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÉÍ×ÏÌ ÐÏÓÌÁÎ × 'PostScriptCIDMetricInfo' ÎÁ ÏÄÎÏÂÁÊÔÎÏÊ ÌÏËÁÌÉ"
+msgid "invalid character sent to 'PostScriptCIDMetricInfo' in a single-byte locale"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÉÍ×ÏÌ ÐÏÓÌÁÎ × 'PostScriptCIDMetricInfo' ÎÁ ÏÄÎÏÂÁÊÔÎÏÊ ÌÏËÁÌÉ"
 
 #: devPS.c:994
 msgid "failed to allocate CID font info"
@@ -205,7 +211,8 @@
 msgid "failed to allocate Type 1 font family"
 msgstr "ÎÅ ÍÏÇÕ ÒÁÚÍÅÓÔÉÔØ ÓÅÍÅÊÓÔ×Ï ÛÒÉÆÔÏ× Type 1"
 
-#: devPS.c:1099 devPS.c:1110
+#: devPS.c:1099
+#: devPS.c:1110
 msgid "failed to allocate font list"
 msgstr "ÎÅ ÍÏÇÕ ÒÁÚÍÅÓÔÉÔØ ÓÐÉÓÏË ÛÒÉÆÔÏ×"
 
@@ -222,26 +229,33 @@
 msgid "failed to load encoding file '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ ÆÁÊÌ ËÏÄÉÒÏ×ËÉ '%s'"
 
-#: devPS.c:1442 devPS.c:1475
+#: devPS.c:1442
+#: devPS.c:1475
 msgid "invalid font name or more than one font name"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÛÒÉÆÔÁ ÉÌÉ ÂÏÌØÛÅ ÏÄÎÏÇÏ ÉÍÅÎÉ ÛÒÉÆÔÁ"
 
-#: devPS.c:1596 devPS.c:1631
+#: devPS.c:1596
+#: devPS.c:1631
 #, c-format
 msgid "font family '%s' not found in PostScript font database"
 msgstr "ÓÅÍÅÊÓÔ×Ï ÛÒÉÆÔÏ× '%s' ÎÅ ÎÁÊÄÅÎÏ × ÂÁÚÅ ÄÁÎÎÙÈ ÛÒÉÆÔÏ× PostScript"
 
-#: devPS.c:1703 devPS.c:1785 devPS.c:1812
+#: devPS.c:1703
+#: devPS.c:1785
+#: devPS.c:1812
 #, c-format
 msgid "font encoding for family '%s' not found in font database"
 msgstr "ËÏÄÉÒÏ×ËÁ ÛÒÉÆÔÁ ÓÅÍÅÊÓÔ×Á '%s' ÎÅ ÎÁÊÄÅÎÁ × ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: devPS.c:1730 devPS.c:1757
+#: devPS.c:1730
+#: devPS.c:1757
 #, c-format
 msgid "font CMap for family '%s' not found in font database"
 msgstr "ÛÒÉÆÔÏ×ÁÑ CMap ÓÅÍÅÊÓÔ×Á '%s' ÎÅ ÎÁÊÄÅÎÁ × ÂÁÚÅ ÄÁÎÎÙÈ ÛÒÉÆÔÏ×"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1951
+#: devPS.c:2030
+#: devPS.c:2098
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ afm-ÆÁÊÌ '%s'"
@@ -258,11 +272,15 @@
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "ÏÂßÅËÔ '.ps.prolog' ÎÅ Ñ×ÌÑÅÔÓÑ ÔÅËÓÔÏ×ÙÍ ×ÅËÔÏÒÏÍ"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2643
+#: devPS.c:6420
+#: devWindows.c:801
 msgid "invalid line end"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ËÏÎÅà ÓÔÒÏËÉ"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2662
+#: devPS.c:6439
+#: devWindows.c:814
 msgid "invalid line join"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÓÏÅÄÉÎÅÎÉÅ ÌÉÎÉÊ"
 
@@ -270,33 +288,48 @@
 msgid "invalid line mitre"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ËÏÎÅà ÌÉÎÉÉ"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2879
+#: devPS.c:3775
+#: devPS.c:4223
+#: devPS.c:4250
+#: devPS.c:5260
+#: devPS.c:7766
+#: devPS.c:7811
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "ÐÏÐÙÔËÁ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÎÅÐÒÁ×ÉÌØÎÏÇÏ ÛÒÉÆÔÁ %d; ÚÁÍÅÎÉÌ ÛÒÉÆÔÏÍ 1"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3101
+#: devPS.c:4725
+#: devPS.c:5839
 #, c-format
 msgid "filename too long in %s()"
 msgstr "ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ ÉÍÑ ÆÁÊÌÁ × ×ÙÚÏ×Å %s()"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3107
+#: devPS.c:4731
+#: devPS.c:5845
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "ÐÒÏÂÌÅÍÁ Ó ×ÙÄÅÌÅÎÉÅÍ ÐÁÍÑÔÉ × %s()"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3124
+#: devPS.c:5905
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "ÐÕÔØ Ë ËÏÄÉÒÏ×ËÅ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ × %s()"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3138
+#: devPS.c:4771
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "ÎÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ ÆÁÊÌ ËÏÄÉÒÏ×ËÉ × %s()"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3183
+#: devPS.c:3246
+#: devPS.c:5964
+#: devPS.c:6019
+#: devPS.c:7646
 msgid "invalid font type"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ ÛÒÉÆÔÁ"
 
@@ -325,25 +358,29 @@
 msgid "invalid page type '%s' (postscript)"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ ÓÔÒÁÎÉÃÙ '%s' (postscript)"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
-msgid ""
-"semi-transparency is not supported on this device: reported only once per "
-"page"
-msgstr ""
-"ÐÏÌÕÐÒÏÚÒÁÞÎÏÓÔØ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÜÔÉÍ ÕÓÔÒÏÊÓÔ×ÏÍ: ÓÏÏÂÝÁÅÔÓÑ ÒÁÚ ÎÁ "
-"ÓÔÒÁÎÉÃÕ"
+#: devPS.c:3462
+#: devPS.c:4575
+#: devWindows.c:2346
+msgid "semi-transparency is not supported on this device: reported only once per page"
+msgstr "ÐÏÌÕÐÒÏÚÒÁÞÎÏÓÔØ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÜÔÉÍ ÕÓÔÒÏÊÓÔ×ÏÍ: ÓÏÏÂÝÁÅÔÓÑ ÒÁÚ ÎÁ ÓÔÒÁÎÉÃÕ"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3568
+#: devPS.c:3577
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ËÁÎÁÌ 'postscript' × '%s'"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3588
+#: devPS.c:4980
+#: devPS.c:4991
+#: devPS.c:7071
+#: qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ '%s'"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3716
+#: devPS.c:3731
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -357,7 +394,11 @@
 msgid "CID family '%s' not included in postscript() device"
 msgstr "CID-ÓÅÍÅÊÓÔ×Ï '%s' ÎÅ ×ËÌÀÞÅÎÏ × postscript() ÕÓÔÒÏÊÓÔ×Ï"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3781
+#: devPS.c:3792
+#: devPS.c:4230
+#: devPS.c:4260
+#: devPS.c:4365
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr "ÓÅÍÅÊÓÔ×Ï '%s' ÎÅ ×ËÌÀÞÅÎÏ × postscript() ÕÓÔÒÏÊÓÔ×Ï"
@@ -377,7 +418,9 @@
 msgid "failed open converter to encoding '%s'"
 msgstr "ÎÅ ÕÄÁÌÁÓØ ËÏÎ×ÅÒÓÉÑ × ËÏÄÉÒÏ×ËÕ '%s'"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4411
+#: devPS.c:5305
+#: devPS.c:7901
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "ÎÅ ÕÄÁÌÁÓØ ËÏÎ×ÅÒÓÉÑ ÔÅËÓÔÁ × ËÏÄÉÒÏ×ËÕ '%s'"
@@ -422,7 +465,11 @@
 msgid "empty file name"
 msgstr "ÐÕÓÔÏÅ ÉÍÑ ÆÁÊÌÁ"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5037
+#: devPS.c:5089
+#: devPS.c:5667
+#: devPS.c:5711
+#: devPS.c:7131
 msgid "write failed"
 msgstr "ÚÁÐÉÓØ ÎÅ ÕÄÁÌÁÓØ"
 
@@ -431,7 +478,8 @@
 msgid "unable to use encoding '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÉÓÐÏÌØÚÏ×ÁÔØ ËÏÄÉÒÏ×ËÕ '%s'"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5555
+#: devPS.c:5558
 msgid "failed to increase 'maxRaster'"
 msgstr "ÎÅ ÍÏÇÕ Õ×ÅÌÉÞÉÔØ 'maxRaster'"
 
@@ -488,7 +536,8 @@
 msgid "increasing the PDF version to 1.4"
 msgstr "Õ×ÅÌÉÞÉ×ÁÀ ×ÅÒÓÉÀ PDF ÄÏ 1.4"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6344
+#: devPS.c:6391
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ 'colormodel', ÉÓÐÏÌØÚÕÀ 'srgb'"
 
@@ -522,32 +571,51 @@
 "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ 'pdf'-ÆÁÊÌ ÁÒÇÕÍÅÎÔÁ '%s'\n"
 "  ÐÏÖÁÌÕÊÓÔÁ, ×ÙËÌÀÞÉÔÅ PDFdevice"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7671
+#: devPS.c:8033
+#: devPS.c:8080
 msgid "failed to find or load PDF font"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÉÌÉ ÚÁÇÒÕÚÉÔØ ÛÒÉÆÔ PDF"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7855
+#: devPS.c:7988
 msgid "failed to find or load PDF CID font"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÉÌÉ ÚÁÇÒÕÚÉÔØ CID-ÛÒÉÆÔ PDF"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8219
+#: devPS.c:8223
+#: devPS.c:8383
+#: devPS.c:8387
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ 'family' × %s"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8241
+#: devPS.c:8399
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ 'fonts' × %s"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
-#: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
-#: devWindows.c:3689 devWindows.c:3693
+#: devPS.c:8247
+#: devPS.c:8409
+#: devPS.c:8412
+#: devWindows.c:3646
+#: devWindows.c:3650
+#: devWindows.c:3658
+#: devWindows.c:3669
+#: devWindows.c:3675
+#: devWindows.c:3682
+#: devWindows.c:3689
+#: devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ '%s'"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8260
+#: devPS.c:8327
+#: devPS.c:8426
+#: devPicTeX.c:740
+#: devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï %s()"
@@ -579,25 +647,27 @@
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÏÐÉÓÁÎÉÅ ÕÓÔÒÏÊÓÔ×Á."
 
 #: devQuartz.c:1479
-msgid ""
-"unable to create quartz() device target, given type may not be supported"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÃÅÌÅ×ÏÅ ÕÓÔÒÏÊÓÔ×Ï quartz(), ÕËÁÚÁÎÎÙÊ ÔÉÐ ÎÅ ÍÏÖÅÔ ÂÙÔØ "
-"ÐÏÄÄÅÒÖÁÎ"
+msgid "unable to create quartz() device target, given type may not be supported"
+msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÃÅÌÅ×ÏÅ ÕÓÔÒÏÊÓÔ×Ï quartz(), ÕËÁÚÁÎÎÙÊ ÔÉÐ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÏÄÄÅÒÖÁÎ"
 
 #: devQuartz.c:1609
 msgid "Quartz device is not available on this platform"
 msgstr "õÓÔÒÏÊÓÔ×Ï Quartz ÎÁ ÜÔÏÊ ÐÌÁÔÆÏÒÍÅ ÎÅÄÏÓÔÕÐÎÏ"
 
-#: devWindows.c:358 devWindows.c:404 devWindows.c:475
+#: devWindows.c:358
+#: devWindows.c:404
+#: devWindows.c:475
 msgid "Not enough memory to copy graphics window"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ, ÞÔÏÂÙ ÓËÏÐÉÒÏ×ÁÔØ ÏËÎÏ ÇÒÁÆÉËÉ"
 
-#: devWindows.c:363 devWindows.c:409 devWindows.c:480
+#: devWindows.c:363
+#: devWindows.c:409
+#: devWindows.c:480
 msgid "No device available to copy graphics window"
 msgstr "îÅÔ ÕÓÔÒÏÊÓÔ×Á, ÞÔÏÂÙ ÓËÏÐÉÒÏ×ÁÔØ ÏËÎÏ ÇÒÁÆÉËÉ"
 
-#: devWindows.c:413 devWindows.c:484
+#: devWindows.c:413
+#: devWindows.c:484
 #, c-format
 msgid "'%%' is not allowed in file name"
 msgstr "'%%' × ÉÍÅÎÉ ÆÁÊÌÁ ÎÅ ÒÁÚÒÅÛÁÅÔÓÑ"
@@ -623,17 +693,25 @@
 msgid "filename too long in %s() call"
 msgstr "ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ ÉÍÑ ÆÁÊÌÁ × ×ÙÚÏ×Å %s()"
 
-#: devWindows.c:1820 devWindows.c:1855 devWindows.c:1885
+#: devWindows.c:1820
+#: devWindows.c:1855
+#: devWindows.c:1885
 #, c-format
 msgid "'width=%d, height=%d' are unlikely values in pixels"
 msgstr "ÎÅ ÐÏÈÏÖÅ, ÞÔÏ 'width=%d, height=%d' × ÐÉËÓÅÌÑÈ"
 
-#: devWindows.c:1828 devWindows.c:1833 devWindows.c:1858 devWindows.c:1863
-#: devWindows.c:1888 devWindows.c:1893
+#: devWindows.c:1828
+#: devWindows.c:1833
+#: devWindows.c:1858
+#: devWindows.c:1863
+#: devWindows.c:1888
+#: devWindows.c:1893
 msgid "unable to allocate bitmap"
 msgstr "ÎÅ ÍÏÇÕ ÒÁÚÍÅÓÔÉÔØ bitmap"
 
-#: devWindows.c:1839 devWindows.c:1869 devWindows.c:2189
+#: devWindows.c:1839
+#: devWindows.c:1869
+#: devWindows.c:2189
 #, c-format
 msgid "unable to open file '%s' for writing"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ '%s' ÄÌÑ ÚÁÐÉÓÉ"
@@ -676,7 +754,8 @@
 msgid "metafile '%s' could not be created"
 msgstr "ÍÅÔÁÆÁÊÌ '%s' ÎÅ ÐÏÌÕÞÁÅÔÓÑ ÓÏÚÄÁÔØ"
 
-#: devWindows.c:3117 devWindows.c:3758
+#: devWindows.c:3117
+#: devWindows.c:3758
 msgid "R Graphics"
 msgstr "R-ÇÒÁÆÉËÁ"
 
@@ -708,7 +787,10 @@
 msgid "unknown type in savePlot"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ × savePlot"
 
-#: devWindows.c:3500 devWindows.c:3532 devWindows.c:3560 devWindows.c:3591
+#: devWindows.c:3500
+#: devWindows.c:3532
+#: devWindows.c:3560
+#: devWindows.c:3591
 #: devWindows.c:3612
 msgid "processing of the plot ran out of memory"
 msgstr "ÏÂÒÁÂÏÔËÁ ÇÒÁÆÉËÁ ÉÓÞÅÒÐÁÌÁ ÐÁÍÑÔØ"
@@ -745,121 +827,83 @@
 
 #~ msgid "Impossible to load Rbitmap.dll"
 #~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ Rbitmap.dll"
-
 #~ msgid "Invalid line end"
 #~ msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ËÏÎÅà ÓÔÒÏËÉ"
-
 #~ msgid "Invalid line join"
 #~ msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÓÏÅÄÉÎÅÎÉÅ ÌÉÎÉÊ"
-
 #~ msgid "Unable to load Rbitmap.dll"
 #~ msgstr "îÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ Rbitmap.dll"
-
 #~ msgid "Unable to load winCairo.dll: was it built?"
 #~ msgstr "îÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ winCairo.dll: ÅÇÏ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÂÒÁÌÉ?"
-
 #~ msgid "FontBBox could not be parsed"
 #~ msgstr "FontBBox ÎÅ ÒÁÚÂÉÒÁÅÔÓÑ"
-
 #~ msgid "CharInfo could not be parsed"
 #~ msgstr "CharInfo ÎÅ ÒÁÚÂÉÒÁÅÔÓÑ"
-
 #~ msgid "unable to start NULL device"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ NULL-ÕÓÔÒÏÊÓÔ×Ï"
-
 #~ msgid "printing via file = \"\" is not implemented in this version"
 #~ msgstr "ÐÅÞÁÔØ ÞÅÒÅÚ file = \"\" ÎÅÄÏÓÔÕÐÎÁ × ÜÔÏÊ ×ÅÒÓÉÉ"
-
 #~ msgid "file = \"|cmd\" is not implemented in this version"
 #~ msgstr "file = \"|cmd\" ÎÅÄÏÓÔÕÐÅÎ × ÜÔÏÊ ×ÅÒÓÉÉ"
-
 #~ msgid "%s not available for this device"
 #~ msgstr "%s ÎÅÄÏÓÔÕÐÅÎ ÄÌÑ ÜÔÏÇÏ ÕÓÔÒÏÊÓÔ×Á"
-
 #~ msgid "%s not yet implemented for this device"
 #~ msgstr "%s ÄÌÑ ÜÔÏÇÏ ÕÓÔÒÏÊÓÔ×Á ÅÝÅ ÒÅ ÓÏÚÄÁÎ"
-
 #~ msgid "Too many raster images"
 #~ msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÓÔÒÏ×ÙÈ ËÁÒÔÉÎÏË"
-
 #~ msgid "cannot allocate pd->pos"
 #~ msgstr "ÎÅ ÍÏÇÕ ÒÁÚÍÅÓÔÉÔØ pd->pos"
-
 #~ msgid "cannot allocate pd->pageobj"
 #~ msgstr "ÎÅ ÍÏÇÕ ÒÁÚÍÅÓÔÉÔØ pd->pageobj"
-
 #~ msgid "unable to increase page limit: please shutdown the pdf device"
 #~ msgstr ""
 #~ "ÎÅ ÍÏÇÕ Õ×ÅÌÉÞÉÔØ ÌÉÍÉÔ ÓÔÒÁÎÉÃ: ÐÏÖÁÌÕÊÓÔÁ, ×ÙËÌÀÞÉÔÅ ÕÓÔÒÏÊÓÔ×Ï PDF"
-
 #~ msgid "invalid 'maxRasters' parameter in %s"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ 'maxRasters' × %s"
-
 #~ msgid "only gray colors are allowed in this color model"
 #~ msgstr "× ÜÔÏÊ Ã×ÅÔÏ×ÏÊ ÍÏÄÅÌÉ ÒÁÚÒÅÛÅÎÙ ÔÏÌØËÏ ÏÔÔÅÎËÉ ÓÅÒÏÇÏ"
-
 #~ msgid "cannot open 'postscript' file argument '%s'"
 #~ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ 'postscript'-ÆÁÊÌ ÁÒÇÕÍÅÎÔÁ '%s'"
-
 #~ msgid "cannot open 'pdf' file argument '%s'"
 #~ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ 'pdf'-ÆÁÊÌ × ÁÒÇÕÍÅÎÔÅ '%s'"
-
 #~ msgid "filename too long in postscript"
 #~ msgstr "ÉÍÑ ÆÁÊÌÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÏ ÄÌÑ postscript"
-
 #~ msgid "filename too long in xfig"
 #~ msgstr "ÉÍÑ ÆÁÊÌÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ ÄÌÑ xfig"
-
 #~ msgid "filename too long in pdf"
 #~ msgstr "ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ ÉÍÑ ÆÁÊÌÁ ÄÌÑ pdf"
-
 #~ msgid "unable to start device PostScript"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï PostScript"
-
 #~ msgid "unable to start device xfig"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï xfig"
-
 #~ msgid "unable to start device pdf"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï pdf"
-
 #~ msgid "unable to start device PicTeX"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï PicTeX"
-
 #~ msgid "recursive use of getGraphicsEvent not supported"
 #~ msgstr "ÒÅËÕÒÓÉ×ÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ getGraphicsEvent ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
 #~ msgid "CID fonts are not supported on this platform"
 #~ msgstr "ÛÒÉÆÔÙ CID ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÎÁ ÜÔÏÊ ÐÌÁÔÆÏÒÍÅ"
-
 #~ msgid "re-encoding is not possible on this system"
 #~ msgstr "× ÜÔÏÊ ÓÉÓÔÅÍÅ ÐÅÒÅËÏÄÉÒÏ×ËÁ ÎÅ×ÏÚÍÏÖÎÁ"
-
 #~ msgid "invalid value of 'record' in devWindows"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ 'record' × devWindows"
-
 #~ msgid "invalid value of 'rescale' in devWindows"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ 'rescale' × devWindows"
-
 #~ msgid "invalid value of 'canvas' in devWindows"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ 'canvas' × devWindows"
-
 #~ msgid "invalid value of 'buffered' in devWindows"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ 'buffered' × devWindows"
-
 #~ msgid "invalid value of 'title' in devWindows"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ 'title' × devWindows"
-
 #~ msgid "unable to start device devWindows"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï devWindows"
-
 #~ msgid "can't find any fonts"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÉËÁËÉÈ ÛÒÉÆÔÏ×"
-
 #~ msgid "invalid width or height in quartz"
 #~ msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÛÉÒÉÎÁ ÉÌÉ ×ÙÓÏÔÁ × quartz"
-
 #~ msgid "unable to start device Quartz"
 #~ msgstr "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÕÓÔÒÏÊÓÔ×Ï Quartz"
-
 #~ msgid "Font family not found in Quartz font database"
 #~ msgstr "óÅÍÅÊÓÔ×Ï ÛÒÉÆÔÏ× ÎÅ ÎÁÊÄÅÎÏ × ÂÁÚÅ ÄÁÎÎÙÈ Quartz"
+
diff -Nru r-base-3.2.3/src/library/grDevices/po/R-zh_CN.po r-base-3.3.1/src/library/grDevices/po/R-zh_CN.po
--- r-base-3.2.3/src/library/grDevices/po/R-zh_CN.po	2015-03-18 23:03:48.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/R-zh_CN.po	2016-04-27 22:15:39.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-05-26 08:40\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2008-04-05 10:53+0100\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -226,9 +226,6 @@
 msgid "status %d in running command '%s'"
 msgstr "调用命令'%2$s'的�行状况为%1$d"
 
-msgid "range too small for 'min.n'"
-msgstr "'min.n'的范围太�了"
-
 msgid "a raster matrix must be character, or numeric, or logical"
 msgstr "光栅矩阵必需是字符，数字或逻辑值"
 
@@ -260,9 +257,16 @@
 msgstr "�数的类别必需为%s"
 
 #, fuzzy
-msgid "loading snapshot from a different session"
+msgid "snapshot recorded in different R version (pre 3.3.0)"
+msgstr "从�外一个R版本载入快照"
+
+#, fuzzy
+msgid "snapshot recorded in different R version (%s)"
 msgstr "从�外一个R版本载入快照"
 
+msgid "snapshot contains invalid graphics call"
+msgstr ""
+
 msgid "'nbin' must be numeric of length 1 or 2"
 msgstr "'nbin'的值应该是长度1或2的数值"
 
@@ -397,6 +401,9 @@
 msgid_plural "%d z values <= 0 omitted from logarithmic plot"
 msgstr[0] "对数图里略过%d个�于等于零的z值"
 
+#~ msgid "range too small for 'min.n'"
+#~ msgstr "'min.n'的范围太�了"
+
 #~ msgid "sorry, 'gs' cannot be found"
 #~ msgstr "对�起，'gs'�存在"
 
diff -Nru r-base-3.2.3/src/library/grDevices/po/zh_CN.po r-base-3.3.1/src/library/grDevices/po/zh_CN.po
--- r-base-3.2.3/src/library/grDevices/po/zh_CN.po	2015-06-06 22:15:40.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/po/zh_CN.po	2016-04-27 22:15:39.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -141,7 +141,7 @@
 msgid "unknown AFM entity encountered"
 msgstr "�到未知AFM值这个错误"
 
-#: devPS.c:740 devPS.c:743 devPS.c:4425 devPS.c:7916 devPicTeX.c:484
+#: devPS.c:740 devPS.c:743 devPS.c:4427 devPS.c:7918 devPicTeX.c:484
 #: devPicTeX.c:486
 #, c-format
 msgid "invalid string in '%s'"
@@ -235,107 +235,107 @@
 msgid "font CMap for family '%s' not found in font database"
 msgstr "字体数�库里找�到用于'%s'字体系列的CMap这个字体"
 
-#: devPS.c:1951 devPS.c:2030 devPS.c:2098
+#: devPS.c:1952 devPS.c:2032 devPS.c:2100
 #, c-format
 msgid "cannot load afm file '%s'"
 msgstr "无法载入afm文本'%s'"
 
-#: devPS.c:2386
+#: devPS.c:2388
 msgid "corrupt loaded encodings;  encoding not recorded"
 msgstr "载入的编���了; 没有记录编�"
 
-#: devPS.c:2397
+#: devPS.c:2399
 msgid "failed to record device encoding"
 msgstr "无法记录装置编�"
 
-#: devPS.c:2568
+#: devPS.c:2570
 msgid "object '.ps.prolog' is not a character vector"
 msgstr "对象'.ps.prolog'�是字符��"
 
-#: devPS.c:2643 devPS.c:6420 devWindows.c:801
+#: devPS.c:2645 devPS.c:6422 devWindows.c:801
 msgid "invalid line end"
 msgstr "行尾出错"
 
-#: devPS.c:2662 devPS.c:6439 devWindows.c:814
+#: devPS.c:2664 devPS.c:6441 devWindows.c:814
 msgid "invalid line join"
 msgstr "行接連處出错"
 
-#: devPS.c:2670
+#: devPS.c:2672
 msgid "invalid line mitre"
 msgstr "行斜接出错"
 
-#: devPS.c:2879 devPS.c:3775 devPS.c:4223 devPS.c:4250 devPS.c:5260
-#: devPS.c:7766 devPS.c:7811
+#: devPS.c:2881 devPS.c:3777 devPS.c:4225 devPS.c:4252 devPS.c:5262
+#: devPS.c:7768 devPS.c:7813
 #, c-format
 msgid "attempt to use invalid font %d replaced by font 1"
 msgstr "�能用%d这个字体，代用一字体"
 
-#: devPS.c:3101 devPS.c:4725 devPS.c:5839
+#: devPS.c:3103 devPS.c:4727 devPS.c:5841
 #, c-format
 msgid "filename too long in %s()"
 msgstr "%s()里的文本�字太长"
 
-#: devPS.c:3107 devPS.c:4731 devPS.c:5845
+#: devPS.c:3109 devPS.c:4733 devPS.c:5847
 #, c-format
 msgid "memory allocation problem in %s()"
 msgstr "%s()内存分�出了问题"
 
-#: devPS.c:3124 devPS.c:5905
+#: devPS.c:3126 devPS.c:5907
 #, c-format
 msgid "encoding path is too long in %s()"
 msgstr "%s()里的编�路径太长"
 
-#: devPS.c:3138 devPS.c:4771
+#: devPS.c:3140 devPS.c:4773
 #, c-format
 msgid "failed to load encoding file in %s()"
 msgstr "%s()中载入编�文本失败了'"
 
-#: devPS.c:3183 devPS.c:3246 devPS.c:5964 devPS.c:6019 devPS.c:7646
+#: devPS.c:3185 devPS.c:3248 devPS.c:5966 devPS.c:6021 devPS.c:7648
 msgid "invalid font type"
 msgstr "字体类别出错"
 
-#: devPS.c:3207
+#: devPS.c:3209
 msgid "failed to initialise default PostScript font"
 msgstr "无法�始化PostScript字体的默认值"
 
-#: devPS.c:3273
+#: devPS.c:3275
 msgid "failed to initialise additional PostScript fonts"
 msgstr "无法�始化外加的PostScript字体"
 
-#: devPS.c:3289
+#: devPS.c:3291
 msgid "invalid foreground/background color (postscript)"
 msgstr "�景/�景颜色�对(postscript)"
 
-#: devPS.c:3294
+#: devPS.c:3296
 msgid "'command' is too long"
 msgstr "'command'太长"
 
-#: devPS.c:3299
+#: devPS.c:3301
 msgid "'postscript(print.it=TRUE)' used with an empty 'print' command"
 msgstr "'postscript(print.it=TRUE)'�能用在空'print'命令里"
 
-#: devPS.c:3348
+#: devPS.c:3350
 #, c-format
 msgid "invalid page type '%s' (postscript)"
 msgstr "页类别'%s'(postscript)�对"
 
-#: devPS.c:3462 devPS.c:4575 devWindows.c:2346
+#: devPS.c:3464 devPS.c:4577 devWindows.c:2346
 msgid ""
 "semi-transparency is not supported on this device: reported only once per "
 "page"
 msgstr "此装置�支���明：�一页将被报告一次"
 
-#: devPS.c:3568 devPS.c:3577
+#: devPS.c:3570 devPS.c:3579
 #, c-format
 msgid "cannot open 'postscript' pipe to '%s'"
 msgstr "无法打开'postscript'管�至'%s'"
 
-#: devPS.c:3588 devPS.c:4980 devPS.c:4991 devPS.c:7071 qdPDF.c:98
+#: devPS.c:3590 devPS.c:4982 devPS.c:4993 devPS.c:7073 qdPDF.c:98
 #, c-format
 msgid "cannot open file '%s'"
 msgstr "无法打开'%s'文件"
 
-#: devPS.c:3716 devPS.c:3731
+#: devPS.c:3718 devPS.c:3733
 #, c-format
 msgid ""
 "error from postscript() in running:\n"
@@ -344,168 +344,168 @@
 "postscript()出了错，是在�行这个命令时�生的:\n"
 "    %s"
 
-#: devPS.c:3763
+#: devPS.c:3765
 #, c-format
 msgid "CID family '%s' not included in postscript() device"
 msgstr "postscript()装置里没有CID系列'%s'"
 
-#: devPS.c:3781 devPS.c:3792 devPS.c:4230 devPS.c:4260 devPS.c:4365
+#: devPS.c:3783 devPS.c:3794 devPS.c:4232 devPS.c:4262 devPS.c:4367
 #, c-format
 msgid "family '%s' not included in postscript() device"
 msgstr " postscript()装置里没有'%s'系列"
 
-#: devPS.c:4305
+#: devPS.c:4307
 #, c-format
 msgid "unknown encoding '%s' in 'mbcsToSbcs'"
 msgstr "'mbcsToSbcs'�存在'%s'这样的编�"
 
-#: devPS.c:4315
+#: devPS.c:4317
 #, c-format
 msgid "conversion failure on '%s' in 'mbcsToSbcs': dot substituted for <%02x>"
 msgstr "'mbcsToSbcs'里转�'%s'出错：<%02x>代替了dot"
 
-#: devPS.c:4393
+#: devPS.c:4395
 #, c-format
 msgid "failed open converter to encoding '%s'"
 msgstr "编�'%s'时文字转�器出了错"
 
-#: devPS.c:4411 devPS.c:5305 devPS.c:7901
+#: devPS.c:4413 devPS.c:5307 devPS.c:7903
 #, c-format
 msgid "failed in text conversion to encoding '%s'"
 msgstr "文字转�到编�'%s'时出了错"
 
-#: devPS.c:4589
+#: devPS.c:4591
 msgid "ran out of colors in xfig()"
 msgstr "xfig()里的颜色�够用"
 
-#: devPS.c:4618
+#: devPS.c:4620
 #, c-format
 msgid "unimplemented line texture %08x: using Dash-double-dotted"
 msgstr "没有实现%08x这样的字行结构: 用Dash-double-dotted"
 
-#: devPS.c:4684
+#: devPS.c:4686
 #, c-format
 msgid "unknown postscript font family '%s', using Helvetica"
 msgstr "�存在postscript字体系列'%s', 用Helvetica"
 
-#: devPS.c:4756
+#: devPS.c:4758
 msgid "invalid foreground/background color (xfig)"
 msgstr "�景/�景颜色�对(xfig)"
 
-#: devPS.c:4789
+#: devPS.c:4791
 msgid "only Type 1 fonts supported for XFig"
 msgstr "XFig�支�Type 1字体"
 
-#: devPS.c:4802
+#: devPS.c:4804
 msgid "failed to initialise default XFig font"
 msgstr "无法�始化XFig默认字体"
 
-#: devPS.c:4839
+#: devPS.c:4841
 #, c-format
 msgid "invalid page type '%s' (xfig)"
 msgstr "页类别'%s'出错(xfig)"
 
-#: devPS.c:4847
+#: devPS.c:4849
 #, c-format
 msgid "xfig(%s, onefile=FALSE) will only return the last plot"
 msgstr "xfig(%s, onefile=FALSE)�会返回最�的一张图"
 
-#: devPS.c:4972
+#: devPS.c:4974
 msgid "empty file name"
 msgstr "空文本�字"
 
-#: devPS.c:5037 devPS.c:5089 devPS.c:5667 devPS.c:5711 devPS.c:7131
+#: devPS.c:5039 devPS.c:5091 devPS.c:5669 devPS.c:5713 devPS.c:7133
 msgid "write failed"
 msgstr "讀寫失败"
 
-#: devPS.c:5294
+#: devPS.c:5296
 #, c-format
 msgid "unable to use encoding '%s'"
 msgstr "无法用编�'%s'"
 
-#: devPS.c:5555 devPS.c:5558
+#: devPS.c:5557 devPS.c:5560
 msgid "failed to increase 'maxRaster'"
 msgstr "无法增加’maxRaster’"
 
-#: devPS.c:5570
+#: devPS.c:5572
 msgid "unable to allocate raster image"
 msgstr "无法分�光栅图�"
 
-#: devPS.c:5771
+#: devPS.c:5773
 msgid "corrupt loaded encodings;  font not added"
 msgstr "载入的编��了; 字体没有加入"
 
-#: devPS.c:5780
+#: devPS.c:5782
 msgid "failed to record device encoding; font not added"
 msgstr "无法记录装置编�; 字体没有加入"
 
-#: devPS.c:5891
+#: devPS.c:5893
 msgid "increasing the PDF version to 1.2"
 msgstr "增加PDF版本到1.2"
 
-#: devPS.c:5921
+#: devPS.c:5923
 msgid "failed to load default encoding"
 msgstr "无法载入默认编�"
 
-#: devPS.c:5987
+#: devPS.c:5989
 msgid "failed to initialise default PDF font"
 msgstr "无法�始化PDF默认字体"
 
-#: devPS.c:6042
+#: devPS.c:6044
 msgid "failed to initialise additional PDF fonts"
 msgstr "无法�始化外加的PDF字体"
 
-#: devPS.c:6055
+#: devPS.c:6057
 msgid "failed to allocate rasters"
 msgstr "无法分�栅格"
 
-#: devPS.c:6062
+#: devPS.c:6064
 msgid "failed to allocate masks"
 msgstr "无法分��具"
 
-#: devPS.c:6125
+#: devPS.c:6127
 #, c-format
 msgid "invalid paper type '%s' (pdf)"
 msgstr "纸张类别'%s'�对(pdf)"
 
-#: devPS.c:6149
+#: devPS.c:6151
 msgid "invalid foreground/background color (pdf)"
 msgstr "�景/�景颜色�对(pdf)"
 
-#: devPS.c:6268
+#: devPS.c:6270
 msgid "invalid 'alpha' value in PDF"
 msgstr "PDF里的'alpha'值�对"
 
-#: devPS.c:6293
+#: devPS.c:6295
 msgid "increasing the PDF version to 1.4"
 msgstr "增加PDF版本到1.4"
 
-#: devPS.c:6344 devPS.c:6391
+#: devPS.c:6346 devPS.c:6393
 msgid "unknown 'colormodel', using 'srgb'"
 msgstr "没有这�'colormodel'，用'srgb'"
 
-#: devPS.c:6585
+#: devPS.c:6587
 msgid "failed to load sRGB colorspace file"
 msgstr "无法载入sRGB色彩文件"
 
-#: devPS.c:6849
+#: devPS.c:6851
 msgid "corrupt encodings in PDF device"
 msgstr "PDF装置里的编��了"
 
-#: devPS.c:6930
+#: devPS.c:6932
 msgid "increasing the PDF version to 1.3"
 msgstr "增加PDF版本到1.3"
 
-#: devPS.c:7055
+#: devPS.c:7057
 #, c-format
 msgid "cannot open 'pdf' pipe to '%s'"
 msgstr "无法打开通到'%s'的'pdf'管�"
 
-#: devPS.c:7061
+#: devPS.c:7063
 msgid "file = \"|cmd\" implies 'onefile = TRUE'"
 msgstr "file = \"|cmd\"�味�'onefile = TRUE'"
 
-#: devPS.c:7204
+#: devPS.c:7206
 #, c-format
 msgid ""
 "cannot open 'pdf' file argument '%s'\n"
@@ -514,32 +514,32 @@
 "无法打开'pdf'文本�数'%s'\n"
 "  请关闭PDF装置"
 
-#: devPS.c:7671 devPS.c:8033 devPS.c:8080
+#: devPS.c:7673 devPS.c:8035 devPS.c:8082
 msgid "failed to find or load PDF font"
 msgstr "没有能够找到或载入PDF字体"
 
-#: devPS.c:7855 devPS.c:7988
+#: devPS.c:7857 devPS.c:7990
 msgid "failed to find or load PDF CID font"
 msgstr "没有能够找到或载入PDF CID字体"
 
-#: devPS.c:8219 devPS.c:8223 devPS.c:8383 devPS.c:8387
+#: devPS.c:8221 devPS.c:8225 devPS.c:8386 devPS.c:8390
 #, c-format
 msgid "invalid 'family' parameter in %s"
 msgstr "%s里的'system'�数�对"
 
-#: devPS.c:8241 devPS.c:8399
+#: devPS.c:8243 devPS.c:8402
 #, c-format
 msgid "invalid 'fonts' parameter in %s"
 msgstr "%s里的'fonts'�数�对"
 
-#: devPS.c:8247 devPS.c:8409 devPS.c:8412 devWindows.c:3646 devWindows.c:3650
+#: devPS.c:8249 devPS.c:8412 devPS.c:8415 devWindows.c:3646 devWindows.c:3650
 #: devWindows.c:3658 devWindows.c:3669 devWindows.c:3675 devWindows.c:3682
 #: devWindows.c:3689 devWindows.c:3693
 #, c-format
 msgid "invalid value of '%s'"
 msgstr "'%s'的值�对"
 
-#: devPS.c:8260 devPS.c:8327 devPS.c:8426 devPicTeX.c:740 devWindows.c:3734
+#: devPS.c:8262 devPS.c:8329 devPS.c:8429 devPicTeX.c:740 devWindows.c:3734
 #, c-format
 msgid "unable to start %s() device"
 msgstr "无法�动%s()装置"
diff -Nru r-base-3.2.3/src/library/grDevices/R/cairo.R r-base-3.3.1/src/library/grDevices/R/cairo.R
--- r-base-3.2.3/src/library/grDevices/R/cairo.R	2015-08-25 22:18:20.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/cairo.R	2016-03-16 23:04:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/cairo.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -25,34 +25,37 @@
     if(!checkIntFormat(filename)) stop("invalid 'filename'")
     antialiases <- eval(formals()$antialias)
     antialias <- match(match.arg(antialias, antialiases), antialiases)
-    invisible(.External(C_devCairo, filename, 4L, 72*width, 72*height, pointsize,
-                        bg, NA_integer_, antialias, onefile, family))
+    invisible(.External(C_devCairo, filename, 4L, 72*width, 72*height,
+                        pointsize, bg, NA_integer_, antialias, onefile,
+                        family, 300))
 }
 
 cairo_pdf <- function(filename = if(onefile) "Rplots.pdf" else "Rplot%03d.pdf",
                       width = 7, height = 7, pointsize = 12,
                       onefile = FALSE, family = "sans", bg = "white",
-                      antialias = c("default", "none", "gray", "subpixel"))
+                      antialias = c("default", "none", "gray", "subpixel"),
+                      fallback_resolution = 300)
 {
     if(!checkIntFormat(filename)) stop("invalid 'filename'")
     antialiases <- eval(formals()$antialias)
     antialias <- match(match.arg(antialias, antialiases), antialiases)
     invisible(.External(C_devCairo, filename, 6L, 72*width, 72*height,
                         pointsize, bg, NA_integer_, antialias, onefile,
-                        family))
+                        family, fallback_resolution))
 }
 
 cairo_ps <- function(filename = if(onefile) "Rplots.ps" else "Rplot%03d.ps",
                      width = 7, height = 7, pointsize = 12,
                      onefile = FALSE, family = "sans", bg = "white",
-                     antialias = c("default", "none", "gray", "subpixel"))
+                     antialias = c("default", "none", "gray", "subpixel"),
+                     fallback_resolution = 300)
 {
     if(!checkIntFormat(filename)) stop("invalid 'filename'")
     antialiases <- eval(formals()$antialias)
     antialias <- match(match.arg(antialias, antialiases), antialiases)
     invisible(.External(C_devCairo, filename, 7L, 72*width, 72*height,
                         pointsize, bg, NA_integer_, antialias, onefile,
-                        family))
+                        family, fallback_resolution))
 }
 
 cairoVersion <- function() .Call(C_cairoVersion)
diff -Nru r-base-3.2.3/src/library/grDevices/R/device.R r-base-3.3.1/src/library/grDevices/R/device.R
--- r-base-3.2.3/src/library/grDevices/R/device.R	2015-10-06 22:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/device.R	2016-03-16 23:04:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/device.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -161,9 +161,9 @@
             ## fits portrait but not landscape
             hz <- FALSE
         } else {
-            h0 <- ifelse(hz, wp, hp)
+            h0 <- if(hz) wp else hp
             if(h > h0) { w <- w * h0/h; h <- h0 }
-            w0 <- ifelse(hz, hp, wp)
+            w0 <- if(hz) hp else wp
             if(w > w0) { h <- h * w0/w; w <- w0 }
         }
         if(is.null(oc$pointsize)) {
@@ -382,14 +382,12 @@
         else {
             if(.Platform$OS.type == "windows") windows
             else {
-                dsp <- Sys.getenv("DISPLAY")
-                ## the first condition is running under R.app.
-                ## Recentish OS X with XQuartz installed sets DISPLAY
-                ## on X11 startup: we ignore such a setting
-                if(.Platform$GUI == "AQUA" ||
-                    ((!nzchar(dsp) || grepl("org.macosforge.xquartz", dsp, fixed = TRUE))
-                     && .Call(C_makeQuartzDefault))) quartz
-                else if(nzchar(dsp) && .Platform$GUI %in% c("X11", "Tk")) X11
+                ## This detects if quartz() was built and if we are
+                ## running at the OS X console (both of which have to
+                ## be true under R.app).
+                if(.Platform$GUI == "AQUA" ||.Call(C_makeQuartzDefault)) quartz
+                else if(nzchar(Sys.getenv("DISPLAY"))
+                        && .Platform$GUI %in% c("X11", "Tk")) X11
                 else defdev
             }
         }
diff -Nru r-base-3.2.3/src/library/grDevices/R/postscript.R r-base-3.3.1/src/library/grDevices/R/postscript.R
--- r-base-3.2.3/src/library/grDevices/R/postscript.R	2015-08-25 22:18:20.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/postscript.R	2016-03-16 23:04:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/postscript.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -191,7 +191,7 @@
 
 ##--> source in devPS.c :
 
-postscript <- function(file = ifelse(onefile, "Rplots.ps", "Rplot%03d.ps"),
+postscript <- function(file = if(onefile) "Rplots.ps" else "Rplot%03d.ps",
                        onefile, family, title , fonts, encoding, bg, fg,
                        width, height, horizontal, pointsize,
                        paper, pagecentre, print.it, command, colormodel,
@@ -272,7 +272,7 @@
     invisible()
 }
 
-xfig <- function (file = ifelse(onefile,"Rplots.fig", "Rplot%03d.fig"),
+xfig <- function (file = if(onefile) "Rplots.fig" else "Rplot%03d.fig",
                   onefile = FALSE, encoding = "none",
                   paper = "default", horizontal = TRUE,
                   width = 0, height = 0, family = "Helvetica",
@@ -291,7 +291,7 @@
     invisible()
 }
 
-pdf <- function(file = ifelse(onefile, "Rplots.pdf", "Rplot%03d.pdf"),
+pdf <- function(file = if(onefile) "Rplots.pdf" else "Rplot%03d.pdf",
                 width, height, onefile, family, title, fonts, version,
                 paper, encoding, bg, fg, pointsize, pagecentre, colormodel,
                 useDingbats, useKerning, fillOddEven, compress)
diff -Nru r-base-3.2.3/src/library/grDevices/R/prettyDate.R r-base-3.3.1/src/library/grDevices/R/prettyDate.R
--- r-base-3.2.3/src/library/grDevices/R/prettyDate.R	2015-08-25 22:18:19.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/prettyDate.R	2016-05-26 22:15:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/prettyDate.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 # Original code Copyright (C) 2010 Felix Andrews
 # Modifications Copyright (C) 2010 The R Core Team
@@ -19,33 +19,44 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-pretty.Date <- function(x, n = 5, min.n = n %/% 2, sep = " ", ...)
-{
-    prettyDate(x = x, n = n, min.n = min.n, sep = sep, ...)
-}
-
-pretty.POSIXt <- function(x, n = 5, min.n = n %/% 2, sep = " ", ...)
-{
-    prettyDate(x = x, n = n, min.n = min.n, sep = sep, ...)
-}
-
-
+##' S3 method =:  pretty.Date() and pretty.POSIXt [in ../NAMESPACE]
 prettyDate <- function(x, n = 5, min.n = n %/% 2, sep = " ", ...)
 {
+    stopifnot(min.n <= n)
     isDate <- inherits(x, "Date")
     x <- as.POSIXct(x)
     if (isDate) # the timezone *does* matter
 	attr(x, "tzone") <- "GMT"
-    zz <- range(x, na.rm = TRUE)
-    xspan <- as.numeric(diff(zz), units = "secs")
-    if (diff(as.numeric(zz)) == 0) # one value only
-	zz <- zz + c(0,60)
-    ## specify the set of pretty timesteps
+    zz <- rx <- range(x, na.rm = TRUE)
+    D <- diff(nzz <- as.numeric(zz))
     MIN <- 60
     HOUR <- MIN * 60
     DAY <- HOUR * 24
     YEAR <- DAY * 365.25
     MONTH <- YEAR / 12
+    makeOutput <- function(at, s, round = TRUE, do) {
+	structure(if(isDate)
+		      if(round) as.Date(round(at, units = "days")) else at
+		  else as.POSIXct(at),
+		  labels = format(at, s$format))
+    }
+    if(isDate && D <= n * DAY) { # D <= 'n days' & Date  ==> use days
+	zz <- as.Date(zz)
+	r <- round(n - D/DAY)
+	m <- max(0, r %/% 2)
+        m2 <- m + (r %% 2)
+	while(length(dd <- seq.Date(zz[1] - m, zz[2] + m2, by = "1 day")) < min.n + 1)
+	    if(m < m2) m <- m+1 else m2 <- m2+1
+	return(makeOutput(dd, round = FALSE, ## "1 DSTday" from steps:
+			  list(format = paste("%b", "%d", sep = sep))))
+    }
+    else if(D < 1) { # unique values / sub-second ranges: [? or use "1 ms" steps below?]
+	m <- min(30, max(D == 0, n/2))
+	zz <- structure(c(floor(nzz[1] - m), ceiling(nzz[2] + m)),
+			class = class(x), tzone = attr(x, "tzone"))
+    }
+    xspan <- as.numeric(diff(zz), units = "secs")
+    ## specify the set of pretty timesteps
     steps <-
         list("1 sec" = list(1, format = "%S", start = "mins"),
              "2 secs" = list(2),
@@ -60,7 +71,8 @@
              "15 mins" = list(15*MIN),
              "30 mins" = list(30*MIN),
              ## "1 hour" = list(1*HOUR),
-             "1 hour" = list(1*HOUR, format = if (xspan <= DAY) "%H:%M" else paste("%b %d", "%H:%M", sep = sep)),
+	     "1 hour" = list(1*HOUR, format = if (xspan <= DAY) "%H:%M"
+					      else paste("%b %d", "%H:%M", sep = sep)),
              "3 hours" = list(3*HOUR, start = "days"),
              "6 hours" = list(6*HOUR, format = paste("%b %d", "%H:%M", sep = sep)),
              "12 hours" = list(12*HOUR),
@@ -69,7 +81,8 @@
              "1 week" = list(7*DAY, start = "weeks"),
              "halfmonth" = list(MONTH/2, start = "months"),
              ## "1 month" = list(1*MONTH, format = "%b"),
-             "1 month" = list(1*MONTH, format = if (xspan < YEAR) "%b" else paste("%b", "%Y", sep = sep)),
+	     "1 month" = list(1*MONTH, format = if (xspan < YEAR) "%b"
+						else paste("%b", "%Y", sep = sep)),
              "3 months" = list(3*MONTH, start = "years"),
              "6 months" = list(6*MONTH, format = "%Y-%m"),
              "1 year" = list(1*YEAR, format = "%Y"),
@@ -91,64 +104,128 @@
         steps[[i]]$spec <- names(steps)[i]
     }
     ## crudely work out number of steps in the given interval
-    nsteps <- sapply(steps, function(s) {
-        xspan / s[[1]]
-    })
-    init.i <- which.min(abs(nsteps - n))
+    nsteps <- xspan / vapply(steps, `[[`, numeric(1), 1L, USE.NAMES=FALSE)
+    init.i <- init.i0 <- which.min(abs(nsteps - n))
     ## calculate actual number of ticks in the given interval
-    calcSteps <- function(s) {
-        startTime <- trunc_POSIXt(min(zz), units = s$start) ## FIXME: should be trunc() eventually
-        if (identical(s$spec, "halfmonth")) {
-            at <- seq(startTime, max(zz), by = "months")
-            at2 <- as.POSIXlt(at)
-            at2$mday <- 15L
-            at <- structure(sort(c(as.POSIXct(at), as.POSIXct(at2))),
-                            tzone = attr(at, "tzone"))
-        } else {
-            at <- seq(startTime, max(zz), by = s$spec)
-        }
-        at <- at[(min(zz) <= at) & (at <= max(zz))]
-        at
+    calcSteps <- function(s, lim = range(zz)) {
+        startTime <- trunc_POSIXt(lim[1], units = s$start) ## FIXME: should be trunc() eventually
+        at <- seqDtime(startTime, end = lim[2], by = s$spec)
+	if(anyNA(at)) { at <- at[!is.na(at)]; if(!length(at)) return(at) }
+	r1 <- sum(at <= lim[1])
+	r2 <- length(at) + 1 - sum(at >= lim[2])
+	if(r2 == length(at) + 1) { # not covering at right -- add point at right
+	    nat <- seqDtime(at[length(at)], by = s$spec, length=2)[2]
+	    if(is.na(nat) || !(nat > at[length(at)])) # failed
+		r2 <- length(at)
+	    else
+		at[r2] <- nat
+	}
+	## Now we could see if we are *smaller* than 'n+1' and add even more at[] on both sides
+	at[r1:r2]
     }
-    init.at <- calcSteps(steps[[init.i]])
-    init.n <- length(init.at) - 1L
+    init.at <- calcSteps(st.i <- steps[[init.i]])
     ## bump it up if below acceptable threshold
-    while (init.n < min.n) {
-        init.i <- init.i - 1L
-        if (init.i == 0) stop("range too small for 'min.n'")
-        init.at <- calcSteps(steps[[init.i]])
-        init.n <- length(init.at) - 1L
-    }
-    makeOutput <- function(at, s) {
-        flabels <- format(at, s$format)
-        ans <-
-            if (isDate) as.Date(round(at, units = "days"))
-            else as.POSIXct(at)
-        attr(ans, "labels") <- flabels
-        ans
+    R <- TRUE # R := TRUE iff "right"
+    L.fail <- R.fail <- FALSE
+    while ((init.n <- length(init.at) - 1L) < min.n) {
+	if(init.i == 1L) { ## keep steps[[1]]
+	    ## add new interval right or left
+            if(R) {
+                nat <- seqDtime(init.at[length(init.at)], by = st.i$spec, length=2)[2]
+                R.fail <- is.na(nat) || !(nat > init.at[length(init.at)])
+                if(!R.fail)
+                    init.at[length(init.at) + 1] <- nat
+            } else { # left
+                nat <- seqDtime(init.at[1], by = paste0("-",st.i$spec), length=2)[2]
+                L.fail <- is.na(nat) || !(nat < init.at[1])
+                if(!L.fail) {
+                    init.at[seq_along(init.at) + 1] <- init.at
+                    init.at[1] <- nat
+                }
+            }
+            if(R.fail && L.fail)
+                stop("failed to add more ticks; 'min.n' too large?")
+	    R <- !R # alternating right <-> left
+	} else { # smaller step sizes
+	    init.i <- init.i - 1L
+	    init.at <- calcSteps(st.i <- steps[[init.i]])
+	}
     }
     if (init.n == n) ## perfect
-        return(makeOutput(init.at, steps[[init.i]]))
-    if (init.n > n) {
-        ## too many ticks
-        new.i <- init.i + 1L
-        new.i <- min(new.i, length(steps))
-    } else {
-        ## too few ticks
-        new.i <- init.i - 1L
-        new.i <- max(new.i, 1L)
+        return(makeOutput(init.at, st.i))
+    ## else : have a difference dn :
+    dn <- init.n - n
+    if(dn > 0L) {  ## too many ticks
+	## ticks "outside", on left and right, keep at least one on each side
+	nl <- sum(init.at <= rx[1]) - 1L
+	nr <- sum(init.at >= rx[2]) - 1L
+	if(nl > 0L || nr > 0L) {
+	    n.c <- nl+nr # number of removable ticks
+	    if(dn < n.c) { # remove dn, not all
+		nl <- round(dn * nl/n.c)
+		nr <- dn - nl
+	    }
+	    ## remove nl on left,  nr on right:
+	    init.at <- init.at[-c(seq_len(nl), length(init.at)+1L-seq_len(nr))]
+	}
+    } else { ## too few ticks
+        ## warning("trying to add more points -- not yet implemented")
+        ## but after all, 'n' is approximate
+	## init.at <- calcSteps(st.i, "more ticks")
     }
+    if ((dn <- length(init.at) - 1L - n) == 0L  ## perfect
+	|| (dn > 0L && init.i < init.i0) # too many, but we tried init.i + 1 already
+        || (dn < 0L && init.i == 1)) # too few, but init.i = 1
+	return(makeOutput(init.at, st.i))
+
+    new.i <- if (dn > 0L) ## too many ticks
+		 min(init.i + 1L, length(steps))
+	     else ## too few ticks (and init.i > 1):
+		 init.i - 1L
     new.at <- calcSteps(steps[[new.i]])
     new.n <- length(new.at) - 1L
     ## work out whether new.at or init.at is better
     if (new.n < min.n)
         new.n <- -Inf
-    if (abs(new.n - n) < abs(init.n - n))
+    if (abs(new.n - n) < abs(dn))
 	makeOutput(new.at, steps[[new.i]])
     else
-	makeOutput(init.at, steps[[init.i]])
+	makeOutput(init.at, st.i)
 }
 
+
+## Utility, a generalization/special case of seq.POSIXct() / seq.Date()
+seqDtime <- function(beg, end, by, length=NULL) {
+    if(missing(by) || !identical(by, "halfmonth"))
+        return( seq(beg, end, by = by, length.out=length) )
+    ## else  by == "halfmonth" => can only go forward (!)
+    if(is.null(length)) {
+        l2 <- NULL; i <- TRUE
+    } else {
+        l2 <- ceiling(length/2); i <- seq_len(length)
+    }
+    at <- seq(beg, end, by = "months", length.out = l2)
+    at2 <- as.POSIXlt(at)
+    stopifnot(length(md <- unique(at2$mday)) == 1)
+    at <- as.POSIXct(at)
+    ## intersperse at and at2 := 15-day-shifted( at ), via rbind():
+    if(md == 1) {
+        at2$mday <- 15L
+    } else if(md >= 15) { # (md == 16 may happen; not seen yet)
+        at2$mday <- 1L
+        at2$mon <- at2$mon + 1L
+        fix <- at2$mon == 13L # -> january, next year
+        at2$mon [fix] <- 1L
+        at2$year[fix] <- at2$year[fix] + 1L
+        ## at2 now has wrong 'yday','wday',.. and we rely on as.POSIXct():
+    } else if(md < 15) { ## e.g., southern hemisphere, seen 14
+        at2$mday <- md + 14L # consistent w (1 -> 15) in 1st case; ok even in Feb.
+    }
+    at2 <- rbind(at, as.POSIXct(at2), deparse.level = 0L)
+    structure(at2[i], class = class(at), tzone = attr(at, "tzone"))
+}
+
+
 ## utility function, extending the base function trunc.POSIXt.
 ## Ideally this should replace the original, but that should be done
 ## with a little more thought (what about round.POSIXt etc.?)
@@ -159,10 +236,9 @@
              start.on.monday = TRUE)
 {
     x <- as.POSIXlt(x)
-    ## Why is base:: here?  The namespace implicitly imports base
     if (units %in% c("secs", "mins", "hours", "days"))
-        return(base::trunc.POSIXt(x, units))
-    x <- base::trunc.POSIXt(x, "days")
+	return(trunc.POSIXt(x, units))
+    x <- trunc.POSIXt(x, "days")
     if (length(x$sec))
         switch(units,
                weeks = {
diff -Nru r-base-3.2.3/src/library/grDevices/R/raster.R r-base-3.3.1/src/library/grDevices/R/raster.R
--- r-base-3.2.3/src/library/grDevices/R/raster.R	2015-08-25 22:18:20.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/raster.R	2016-03-16 23:04:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/raster.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -42,10 +42,14 @@
 as.raster.logical <- function(x, max = 1, ...)
     as.raster(matrix(x, ...), max)
 
+as.raster.raw <- function(x, max = 255L, ...)
+    as.raster(matrix(x, ...), max=max)
+
 as.raster.numeric <- as.raster.logical
 
 as.raster.character <- as.raster.logical
 
+
 as.raster.matrix <- function(x, max = 1, ...)
 {
     if (is.character(x)) {
@@ -60,6 +64,10 @@
         if (length(tx.na)) tx[tx.na] <- 0
         r <- rgb(tx, tx, tx, maxColorValue = max)
         if (length(tx.na)) r[tx.na] <- NA
+    } else if (is.raw(x)) { ## non NA's here
+	storage.mode(x) <- "integer"
+	tx <- t(x)
+	r <- rgb(tx, tx, tx, maxColorValue = 255L)
     } else
         stop("a raster matrix must be character, or numeric, or logical")
     ## Transposed, but retain original dimensions
@@ -70,17 +78,22 @@
 
 as.raster.array <- function(x, max = 1, ...)
 {
-    if (!is.numeric(x))
-        stop("a raster array must be numeric")
-    if (length(dim(x)) != 3L)
+    if (!is.numeric(x)) {
+	if (is.raw(x)) {
+	    storage.mode(x) <- "integer" # memory x 4 (!)
+	    max <- 255L
+	} else
+	    stop("a raster array must be numeric")
+    }
+    if (length(d <- dim(x)) != 3L)
         stop("a raster array must have exactly 3 dimensions")
-    r <- if (dim(x)[3L] == 3L)
+    r <- array(if (d[3L] == 3L)
         rgb(t(x[,,1L]), t(x[,,2L]), t(x[,,3L]), maxColorValue = max)
-    else if (dim(x)[3] == 4L)
+    else if (d[3L] == 4L)
         rgb(t(x[,,1L]), t(x[,,2L]), t(x[,,3L]), t(x[,,4L]), maxColorValue = max)
     else
-        stop("a raster array must have exactly 3 or 4 planes")
-    dim(r) <- dim(x)[1:2]
+        stop("a raster array must have exactly 3 or 4 planes"),
+    dim = d[1:2])
     class(r) <- "raster"
     r
 }
@@ -89,8 +102,7 @@
 as.matrix.raster <- function(x, ...)
 {
     dim <- dim(x)
-    m <- matrix(x, nrow = dim[1L], ncol = dim[2L], byrow = TRUE)
-    m
+    matrix(x, nrow = dim[1L], ncol = dim[2L], byrow = TRUE)
 }
 
 is.na.raster <- function(x) is.na(as.matrix(x))
diff -Nru r-base-3.2.3/src/library/grDevices/R/recordplot.R r-base-3.3.1/src/library/grDevices/R/recordplot.R
--- r-base-3.2.3/src/library/grDevices/R/recordplot.R	2015-08-25 22:18:20.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/recordplot.R	2016-03-16 23:04:05.000000000 +0000
@@ -16,24 +16,30 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-recordPlot <- function()
+# 'load' and 'attach' should be character vectors of package names
+recordPlot <- function(load=NULL, attach=NULL)
 {
     if(dev.cur() == 1L)
         stop("no current device to record from")
     res <- .External2(C_getSnapshot)
     attr(res, "pid") <- Sys.getpid()
+    attr(res, "Rversion") <- getRversion()
+    attr(res, "load") <- as.character(load)
+    attr(res, "attach") <- as.character(attach)
     class(res) <- "recordedplot"
     res
 }
 
-replayPlot <- function(x)
+replayPlot <- function(x, reloadPkgs=FALSE)
 {
     if(!inherits(x, "recordedplot"))
         stop(gettextf("argument is not of class %s", dQuote("recordedplot")),
              domain = NA)
     pid <- attr(x, "pid") ## added after R 3.0.2
-    if (is.null(pid) || pid != Sys.getpid())
-        stop("loading snapshot from a different session")
+    if (is.null(pid) || pid != Sys.getpid()) {
+        # This is a "recordedplot" loaded from another session
+        x <- restoreRecordedPlot(x, reloadPkgs)
+    }
     invisible(.External2(C_playSnapshot, x))
 }
 
@@ -43,3 +49,68 @@
     invisible(x)
 }
 
+# If this is a "recordedplot" that has been saved and reloaded
+# (possibly across sessions) then we need to ...
+# - warn if have R version mismatch
+# - restore NativeSymbolInfo on each element of the snapshot display list
+# - bail out gracefully if something is not right
+restoreRecordedPlot <- function(x, reloadPkgs) {
+    snapshotRversion <- attr(x, "Rversion")
+    if (is.null(snapshotRversion)) {
+        warning("snapshot recorded in different R version (pre 3.3.0)")
+    } else if (snapshotRversion != getRversion()) {
+        warning(gettextf("snapshot recorded in different R version (%s)",
+                         snapshotRversion))
+    }
+    # Ensure that all graphics systems in the snapshot are available
+    # (snapshots only started recording pkgName in R 3.3.0)
+    # Similar for any 'pkgs' saved with the snapshot
+    n <- length(x)
+    if (n > 1 &&
+        !is.null(snapshotRversion) &&
+        snapshotRversion >= R_system_version("3.3.0")) {
+        for (i in 2:n) {
+            library(attr(x[[i]], "pkgName"), character.only=TRUE)
+        }
+        if (reloadPkgs) {
+            load <- attr(x, "load")
+            for (i in load) {
+                loadNamespace(i)
+            }
+            attach <- attr(x, "attach")
+            for (i in attach) {
+                library(i, character.only=TRUE)
+            }
+        }
+    }
+    # The display list is the first component of the snapshot
+    plot <- x
+    for (i in 1:length(plot[[1]])) {
+        # get the symbol then test if it's a native symbol
+        symbol <- plot[[1]][[i]][[2]][[1]]
+        if ("NativeSymbolInfo" %in% class(symbol)) {
+            # determine the dll that the symbol lives in
+            if (!is.null(symbol$package))
+                name <- symbol$package[["name"]]
+            else
+                name <- symbol$dll[["name"]]
+            pkgDLL <- getLoadedDLLs()[[name]]
+            # reconstruct the native symbol and assign it into the plot
+            # This will error out if it fails to find the symbol, which
+            # is some protection against running "recordedplot" in
+            # R session where the recorded function does not exist!
+            nativeSymbol <- getNativeSymbolInfo(name = symbol$name,
+                                                PACKAGE = pkgDLL,
+                                                withRegistrationInfo = TRUE)
+            # Check that the 'numParameters' matches.
+            # If it does not, we would also receive a redundant WARNING
+            # about R version or graphics engine version mismatch,
+            # but this mismatch is serious enough to put a STOP to things.
+            if (nativeSymbol$numParameters != symbol$numParameters) {
+                stop("snapshot contains invalid graphics call")
+            }
+            plot[[1]][[i]][[2]][[1]] <- nativeSymbol
+        }
+    }
+    plot
+}
diff -Nru r-base-3.2.3/src/library/grDevices/R/smooth2d.R r-base-3.3.1/src/library/grDevices/R/smooth2d.R
--- r-base-3.2.3/src/library/grDevices/R/smooth2d.R	2015-08-25 22:18:20.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/smooth2d.R	2016-03-16 23:04:05.000000000 +0000
@@ -29,7 +29,7 @@
 	stop("'nbin' must be numeric of length 1 or 2")
 
     if (missing(bandwidth)) { ## cheap
-	bandwidth <- diff(apply(x, 2, quantile,
+	bandwidth <- diff(apply(x, 2, stats::quantile,
 				probs = c(0.05, 0.95),
                                 na.rm = TRUE, names = FALSE)) / 25
 	bandwidth[bandwidth==0] <- 1
diff -Nru r-base-3.2.3/src/library/grDevices/R/unix/png.R r-base-3.3.1/src/library/grDevices/R/unix/png.R
--- r-base-3.2.3/src/library/grDevices/R/unix/png.R	2015-08-25 22:18:18.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/unix/png.R	2016-03-16 23:04:03.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/unix/png.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -56,10 +56,10 @@
                             "white", if(is.na(res)) NULL else res))
     } else if (type == "cairo" && capabilities("cairo"))
         invisible(.External(C_devCairo, filename, 2L, g$width, g$height,
-                            pointsize, bg, res, antialias, 100L, d$family))
+                            pointsize, bg, res, antialias, 100L, d$family, 300))
     else if (type == "cairo-png" && capabilities("cairo"))
         invisible(.External(C_devCairo, filename, 5L, g$width, g$height,
-                            pointsize, bg, res, antialias, 100L, d$family))
+                            pointsize, bg, res, antialias, 100L, d$family, 300))
     else
         invisible(.External2(C_X11,
                              paste("png::", filename, sep=""),
@@ -90,7 +90,8 @@
                             "white", if(is.na(res)) NULL else res))
     } else if (type == "cairo" && capabilities("cairo"))
         invisible(.External(C_devCairo, filename, 3L, g$width, g$height,
-                            pointsize, bg, res, antialias, quality, d$family))
+                            pointsize, bg, res, antialias, quality, d$family,
+                            300))
     else
         invisible(.External2(C_X11,
                             paste("jpeg::", quality, ":", filename, sep=""),
@@ -125,7 +126,8 @@
                             "white", if(is.na(res)) NULL else res))
     } else if (type == "cairo" && capabilities("cairo"))
         invisible(.External(C_devCairo, filename, 8L, g$width, g$height,
-                            pointsize, bg, res, antialias, comp, d$family))
+                            pointsize, bg, res, antialias, comp, d$family,
+                            300))
     else
         invisible(.External2(C_X11,
                              paste("tiff::", comp, ":", filename, sep=""),
@@ -155,7 +157,8 @@
                             "white", if(is.na(res)) NULL else res))
     } else if (type == "cairo" && capabilities("cairo"))
         invisible(.External(C_devCairo, filename, 9L, g$width, g$height,
-                            pointsize, bg, res, antialias, 100L, d$family))
+                            pointsize, bg, res, antialias, 100L, d$family,
+                            300))
     else
         invisible(.External2(C_X11, paste("bmp::", filename, sep=""),
                              g$width, g$height, pointsize, d$gamma,
diff -Nru r-base-3.2.3/src/library/grDevices/R/windows/cairo.R r-base-3.3.1/src/library/grDevices/R/windows/cairo.R
--- r-base-3.2.3/src/library/grDevices/R/windows/cairo.R	2013-03-05 23:02:37.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/windows/cairo.R	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-#  File src/library/grDevices/R/windows/cairo.R
-#  Part of the R package, http://www.R-project.org
-#
-#  Copyright (C) 1995-2012 The R Core Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  A copy of the GNU General Public License is available at
-#  http://www.r-project.org/Licenses/
-
-## These interfaces are undocumented and unexported.
-cairo_png <-
-    function(filename = "Rplot%03d.png",
-             width = 480, height = 480, units = "px", pointsize = 12,
-             bg = "white", res = NA, family = "sans",
-             antialias = c("default", "none", "gray", "subpixel"))
-{
-    if(!checkIntFormat(filename)) stop("invalid 'filename'")
-    units <- match.arg(units, c("in", "px", "cm", "mm"))
-    if(units != "px" && is.na(res))
-        stop("'res' must be specified unless 'units = \"px\"'")
-    height <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * height
-    width <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * width
-    antialiases <- eval(formals()$antialias)
-    antialias <- match(match.arg(antialias, antialiases), antialiases)
-    invisible(.External(C_devCairo, filename, 2L, width, height, pointsize, bg,
-                        res, antialias, 100L, family))
-}
-
-cairo_jpeg <-
-    function(filename = "Rplot%03d.jpeg",
-             width = 480, height = 480, units = "px", pointsize = 12,
-             quality = 75,
-             bg = "white", res = NA, family = "sans",
-             antialias = c("default", "none", "gray", "subpixel"))
-{
-    if(!checkIntFormat(filename)) stop("invalid 'filename'")
-    units <- match.arg(units, c("in", "px", "cm", "mm"))
-    if(units != "px" && is.na(res))
-        stop("'res' must be specified unless 'units = \"px\"'")
-    height <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * height
-    width <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * width
-    antialiases <- eval(formals()$antialias)
-    antialias <- match(match.arg(antialias, antialiases), antialiases)
-    invisible(.External(C_devCairo, filename, 3L, width, height, pointsize, bg,
-                        res, antialias, quality, family))
-}
-
-cairo_tiff <-
-    function(filename = "Rplot%03d.tiff",
-             width = 480, height = 480, units = "px", pointsize = 12,
-             compression = c("none", "rle", "lzw", "jpeg", "zip"),
-             bg = "white", res = NA, family = "sans",
-             antialias = c("default", "none", "gray", "subpixel"))
-{
-    if(!checkIntFormat(filename)) stop("invalid 'filename'")
-    units <- match.arg(units, c("in", "px", "cm", "mm"))
-    if(units != "px" && is.na(res))
-        stop("'res' must be specified unless 'units = \"px\"'")
-    height <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * height
-    width <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * width
-    antialiases <- eval(formals()$antialias)
-    antialias <- match(match.arg(antialias, antialiases), antialiases)
-    comp <- switch( match.arg(compression),
-                   "none" = 1, "rle" = 2, "lzw" = 5, "jpeg" = 7, "zip" = 8)
-    invisible(.External(C_devCairo, filename, 8L, width, height, pointsize, bg,
-                        res, antialias, comp, family))
-}
-
-cairo_bmp <-
-    function(filename = "Rplot%03d.bmp",
-             width = 480, height = 480, units = "px", pointsize = 12,
-             bg = "white", res = NA, family = "sans",
-             antialias = c("default", "none", "gray", "subpixel"))
-{
-    if(!checkIntFormat(filename)) stop("invalid 'filename'")
-    units <- match.arg(units, c("in", "px", "cm", "mm"))
-    if(units != "px" && is.na(res))
-        stop("'res' must be specified unless 'units = \"px\"'")
-    height <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * height
-    width <-
-        switch(units, "in"=res, "cm"=res/2.54, "mm"=res/25.4, "px"=1) * width
-    antialiases <- eval(formals()$antialias)
-    antialias <- match(match.arg(antialias, antialiases), antialiases)
-    invisible(.External(C_devCairo, filename, 9L, width, height, pointsize, bg,
-                        res, antialias, 100L, family))
-}
diff -Nru r-base-3.2.3/src/library/grDevices/R/windows/png.R r-base-3.3.1/src/library/grDevices/R/windows/png.R
--- r-base-3.2.3/src/library/grDevices/R/windows/png.R	2015-08-25 22:18:19.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/R/windows/png.R	2016-03-16 23:04:04.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grDevices/R/windows/png.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -48,13 +48,13 @@
         invisible(.External(C_devCairo, filename, 2L,
                             g$width, g$height, pointsize,
                             bg, res, antialias, 100L,
-                            if(nzchar(family)) family else "sans"))
+                            if(nzchar(family)) family else "sans", 300))
     } else if(match.arg(type) == "cairo-png") {
         antialias <- match(match.arg(antialias), aa.cairo)
         invisible(.External(C_devCairo, filename, 5L,
                             g$width, g$height, pointsize,
                             bg, res, antialias, 100L,
-                            if(nzchar(family)) family else "sans"))
+                            if(nzchar(family)) family else "sans", 300))
     } else {
         new <- if (!missing(antialias)) {
             list(bitmap.aa.win = match.arg(antialias, aa.win))
@@ -86,7 +86,7 @@
         invisible(.External(C_devCairo, filename,
                             9L, g$width, g$height, pointsize,
                             bg, res, antialias, 100L,
-                            if(nzchar(family)) family else "sans"))
+                            if(nzchar(family)) family else "sans", 300))
     } else {
         new <- if (!missing(antialias)) {
             list(bitmap.aa.win = match.arg(antialias, aa.win))
@@ -117,7 +117,7 @@
         antialias <- match(match.arg(antialias), aa.cairo)
         invisible(.External(C_devCairo, filename, 3L, g$width, height, pointsize,
                             bg, res, antialias, quality,
-                            if(nzchar(family)) family else "sans"))
+                            if(nzchar(family)) family else "sans", 300))
     } else {
         new <- if (!missing(antialias)) {
             list(bitmap.aa.win = match.arg(antialias, aa.win))
@@ -156,7 +156,7 @@
         invisible(.External(C_devCairo, filename, 8L,
                             g$width, g$height, pointsize,
                             bg, res, antialias, comp,
-                            if(nzchar(family)) family else "sans"))
+                            if(nzchar(family)) family else "sans", 300))
     } else {
         new <- if (!missing(antialias)) {
             list(bitmap.aa.win = match.arg(antialias, aa.win))
diff -Nru r-base-3.2.3/src/library/grDevices/src/cairo/cairoBM.c r-base-3.3.1/src/library/grDevices/src/cairo/cairoBM.c
--- r-base-3.2.3/src/library/grDevices/src/cairo/cairoBM.c	2015-08-25 22:18:22.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/cairo/cairoBM.c	2016-03-16 23:04:05.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2014  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
     cairo_pdf_surface_create (1.2)
     cairo_ps_surface_create  (1.2)
     cairo_ps_surface_set_eps  (1.6)
+    cairo_surface_set_fallback_resolution (1.2)
     cairo_surface_write_to_png
     cairo_svg_surface_create (1.2)
     cairo_svg_surface_restrict_to_version (1.2)
@@ -244,6 +245,8 @@
 	    if (res != CAIRO_STATUS_SUCCESS) {
 		error("cairo error '%s'", cairo_status_to_string(res));
 	    }
+	    cairo_surface_set_fallback_resolution(xd->cs, xd->fallback_dpi,
+						  xd->fallback_dpi);
 	    xd->cc = cairo_create(xd->cs);
 	    res = cairo_status(xd->cc);
 	    if (res != CAIRO_STATUS_SUCCESS) {
@@ -274,6 +277,8 @@
 	    if(!xd->onefile)
 		cairo_ps_surface_set_eps(xd->cs, TRUE);
 #endif
+	    cairo_surface_set_fallback_resolution(xd->cs, xd->fallback_dpi,
+						  xd->fallback_dpi);
 	    xd->cc = cairo_create(xd->cs);
 	    res = cairo_status(xd->cc);
 	    if (res != CAIRO_STATUS_SUCCESS) {
@@ -321,7 +326,8 @@
 static Rboolean
 BMDeviceDriver(pDevDesc dd, int kind, const char *filename,
 	       int quality, int width, int height, int ps,
-	       int bg, int res, int antialias, const char *family)
+	       int bg, int res, int antialias, const char *family,
+	       double dpi)
 {
     pX11Desc xd;
     int res0 = (res > 0) ? res : 72;
@@ -343,6 +349,7 @@
     xd->pointsize = dps;
     xd->bg = bg;
     xd->res_dpi = res;
+    xd->fallback_dpi = dpi;
     switch(antialias){
     case 1: xd->antialias = CAIRO_ANTIALIAS_DEFAULT; break;
     case 2: xd->antialias = CAIRO_ANTIALIAS_NONE; break;
@@ -435,6 +442,7 @@
     dd->startfill = xd->fill;
     dd->startlty = LTY_SOLID;
     dd->startfont = 1;
+    dd->startgamma = 1;
     dd->displayListOn = FALSE;
     dd->deviceSpecific = (void *) xd;
 
@@ -467,6 +475,7 @@
     SEXP sc;
     const char *filename, *family;
     int type, quality, width, height, pointsize, bgcolor, res, antialias;
+    double dpi;
     const void *vmax = vmaxget();
 
     args = CDR(args); /* skip entry point name */
@@ -508,6 +517,10 @@
     if (!isString(CAR(args)) || LENGTH(CAR(args)) < 1)
 	error(_("invalid '%s' argument"), "family");
     family = translateChar(STRING_ELT(CAR(args), 0));
+    args = CDR(args);
+    dpi = asReal(CAR(args));
+    if(ISNAN(dpi) || dpi <= 0)
+	error(_("invalid '%s' argument"), "dpi");
 
     R_GE_checkVersionOrDie(R_GE_version);
     R_CheckDeviceAvailable();
@@ -517,7 +530,7 @@
 	if (!(dev = (pDevDesc) calloc(1, sizeof(DevDesc)))) return 0;
 	if (!BMDeviceDriver(dev, devtable[type].gtype, filename, quality,
 			    width, height, pointsize,
-			    bgcolor, res, antialias, family)) {
+			    bgcolor, res, antialias, family, dpi)) {
 	    free(dev);
 	    error(_("unable to start device '%s'"), devtable[type].name);
 	}
diff -Nru r-base-3.2.3/src/library/grDevices/src/cairo/cairoBM.h r-base-3.3.1/src/library/grDevices/src/cairo/cairoBM.h
--- r-base-3.2.3/src/library/grDevices/src/cairo/cairoBM.h	2015-08-25 22:18:22.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/cairo/cairoBM.h	2016-03-16 23:04:05.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1997--2011  R Core Team
+ *  Copyright (C) 1997--2015  R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -86,6 +86,7 @@
     int quality;			/* JPEG quality/TIFF compression */
 
     int res_dpi;			/* used for png/jpeg */
+    double fallback_dpi;		/* used for ps/pdf */
     char title[101];
     Rboolean onefile;
 
diff -Nru r-base-3.2.3/src/library/grDevices/src/cairo/Makefile.in r-base-3.3.1/src/library/grDevices/src/cairo/Makefile.in
--- r-base-3.2.3/src/library/grDevices/src/cairo/Makefile.in	2013-09-26 22:05:06.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/cairo/Makefile.in	2016-03-16 23:04:05.000000000 +0000
@@ -24,8 +24,9 @@
 OBJECTS = $(SOURCES:.c=.o) $(top_builddir)/src/modules/X11/rbitmap.o
 
 cairo_la = cairo$(SHLIB_EXT)
+## This order has to be consistent with the other use of rbitmap.o
 ## AIX needs LIBM
-cairo_la_LIBADD = @CAIRO_LIBS@ @BITMAP_LIBS@ $(LIBR) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
+cairo_la_LIBADD = @BITMAP_LIBS@ @CAIRO_LIBS@ $(LIBR) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
 
 all: Makedeps
 	@$(MAKE) R
diff -Nru r-base-3.2.3/src/library/grDevices/src/devPS.c r-base-3.3.1/src/library/grDevices/src/devPS.c
--- r-base-3.2.3/src/library/grDevices/src/devPS.c	2015-09-04 22:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/devPS.c	2016-01-04 23:15:05.000000000 +0000
@@ -8375,8 +8375,9 @@
     args = CDR(args); /* skip entry point name */
     if (isNull(CAR(args)))
         file = NULL;
-    else 
-        file = translateChar(asChar(CAR(args)));  args = CDR(args);
+    else
+        file = translateChar(asChar(CAR(args)));  
+    args = CDR(args);
     paper = CHAR(asChar(CAR(args))); args = CDR(args);
     fam = CAR(args); args = CDR(args);
     if(length(fam) == 1)
diff -Nru r-base-3.2.3/src/library/grDevices/src/devWindows.c r-base-3.3.1/src/library/grDevices/src/devWindows.c
--- r-base-3.2.3/src/library/grDevices/src/devWindows.c	2015-10-23 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/devWindows.c	2016-04-08 22:15:13.000000000 +0000
@@ -3,7 +3,7 @@
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
  *  Copyright (C) 1998--2003  Guido Masarotto and Brian Ripley
  *  Copyright (C) 2004        The R Foundation
- *  Copyright (C) 2004-2015   The R Core Team
+ *  Copyright (C) 2004-2016   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -2251,9 +2251,11 @@
     gadesc *xd = (gadesc *) dd->deviceSpecific;
     SEXP vDL;
 
+    if (xd->cntxt)
+    	((RCNTXT *)xd->cntxt)->cend = NULL;  /* Don't try to run cleanup; it will have already happened */
+
     if (dd->onExit) {
 	dd->onExit(dd);
-	UserBreak = TRUE;
     }
 
     if (xd->kind == SCREEN) {
@@ -2287,6 +2289,7 @@
        device (but also on the console and others) */
     doevent();
     free(xd);
+    dd->deviceSpecific = NULL;
 }
 
 	/********************************************************/
@@ -3156,6 +3159,11 @@
 	SH;
 	R_WaitEvent();
 	R_ProcessEvents();
+	if (!dd->deviceSpecific) { /* closing the window on other systems calls error().  
+	                             But that is not safe on Windows, so we NULL the device
+	                             specific field and call error() here instead. */
+	    error(_("graphics device closed during call to locator or identify"));
+	}
     }
 
     dd->onExit = NULL;
diff -Nru r-base-3.2.3/src/library/grDevices/src/init.c r-base-3.3.1/src/library/grDevices/src/init.c
--- r-base-3.2.3/src/library/grDevices/src/init.c	2015-08-25 22:18:22.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/init.c	2016-03-16 23:04:05.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2004-13   The R Core Team.
+ *  Copyright (C) 2004-2015   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -90,7 +90,7 @@
     EXTDEF(PostScript, 19),
     EXTDEF(XFig, 14),
     EXTDEF(PDF, 20),
-    EXTDEF(devCairo, 10),
+    EXTDEF(devCairo, 11),
     EXTDEF(devcap, 0),
     EXTDEF(devcapture, 1),
     EXTDEF(devcontrol, 1),
diff -Nru r-base-3.2.3/src/library/grDevices/src/Makefile.in r-base-3.3.1/src/library/grDevices/src/Makefile.in
--- r-base-3.2.3/src/library/grDevices/src/Makefile.in	2015-03-18 23:03:44.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/Makefile.in	2016-03-16 23:04:05.000000000 +0000
@@ -23,14 +23,11 @@
 
 SHLIB = $(pkg)@SHLIB_EXT@
 
-ZLIB_CPPFLAGS = @BUILD_ZLIB_TRUE@ -I$(top_srcdir)/src/extra/zlib
 # need Defn.h etc, and config.h
-PKG_CPPFLAGS =-I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H $(ZLIB_CPPFLAGS)
+PKG_CPPFLAGS =-I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H
 
 @BUILD_AQUA_TRUE@AQUA_LIBS = -framework AppKit
-@BUILD_ZLIB_TRUE@R_ZLIBS = $(top_builddir)/src/extra/zlib/libz.a
-@BUILD_ZLIB_FALSE@R_ZLIBS = -lz
-PKG_LIBS = $(AQUA_LIBS) $(R_ZLIBS)
+PKG_LIBS = $(AQUA_LIBS) -lz
 
 all: Makedeps
 	@$(MAKE) shlib @BUILD_DEVCAIRO_TRUE@ cairodevice
diff -Nru r-base-3.2.3/src/library/grDevices/src/qdPDF.c r-base-3.3.1/src/library/grDevices/src/qdPDF.c
--- r-base-3.2.3/src/library/grDevices/src/qdPDF.c	2015-08-25 22:18:21.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/src/qdPDF.c	2016-03-16 23:04:05.000000000 +0000
@@ -28,9 +28,9 @@
 
 #include "qdPDF.h"
 
-#include <R.h>
+//#include <R.h>
 #include <Rinternals.h>
-#include <R_ext/QuartzDevice.h>
+//#include <R_ext/QuartzDevice.h>
 #define _(String) (String)
 
 typedef struct {
diff -Nru r-base-3.2.3/src/library/grDevices/tests/ps-tests.Rout.save r-base-3.3.1/src/library/grDevices/tests/ps-tests.Rout.save
--- r-base-3.2.3/src/library/grDevices/tests/ps-tests.Rout.save	2015-12-03 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/tests/ps-tests.Rout.save	2016-06-14 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -95,4 +95,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.344   0.021   0.354 
+  0.393   0.022   0.402 
diff -Nru r-base-3.2.3/src/library/grDevices/tests/xfig-tests.Rout.save r-base-3.3.1/src/library/grDevices/tests/xfig-tests.Rout.save
--- r-base-3.2.3/src/library/grDevices/tests/xfig-tests.Rout.save	2015-12-03 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/grDevices/tests/xfig-tests.Rout.save	2016-06-14 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -102,4 +102,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.180   0.017   0.186 
+  0.159   0.024   0.172 
diff -Nru r-base-3.2.3/src/library/grid/DESCRIPTION.in r-base-3.3.1/src/library/grid/DESCRIPTION.in
--- r-base-3.2.3/src/library/grid/DESCRIPTION.in	2015-02-06 23:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/grid/DESCRIPTION.in	2016-03-16 23:02:45.000000000 +0000
@@ -6,6 +6,6 @@
 Maintainer: R Core Team <R-core@r-project.org>
 Description: A rewrite of the graphics layout capabilities, plus some
   support for interaction.
-Imports: grDevices
+Imports: grDevices, utils
 Suggests: lattice
 License: Part of R @VERSION@
diff -Nru r-base-3.2.3/src/library/grid/inst/doc/changes.txt r-base-3.3.1/src/library/grid/inst/doc/changes.txt
--- r-base-3.2.3/src/library/grid/inst/doc/changes.txt	2015-03-18 23:02:43.000000000 +0000
+++ r-base-3.3.1/src/library/grid/inst/doc/changes.txt	2016-03-16 23:02:48.000000000 +0000
@@ -1,4 +1,30 @@
 
+Changes from grid_3.2.* to grid_3.3.0:
+-------------------------------------
+
+1.  Added "pseudonym" units to check made in absolute.size() so that,
+    for example, absolute.size(unit(1, "in")) works properly
+    (reported by Baptiste Auguie).
+
+2.  Registered absolute.units() methods in NAMESPACE, so that, for
+    example, a call to absolute.size(unit(1,"npc") + unit(2,"mm"))
+    works outside of 'grid' (reported by Baptiste Auguie).
+
+3.  Refactored grid.draw() so that grid.draw(NULL) now works 
+    (by doing nothing).  Reported by Hadley Wickham.
+
+4.  Modified grid.ls() so that it returns nothing if there are no
+    active devices (rather than opening a new device).
+  
+5.  Modified grid.grep() so that it returns an empty list (rather than
+    throwing an error) when the 'grid' display list is empty.
+
+6.  Added subassignment methods for unit objects
+    (e.g., x <- unit(1:3, "cm"); x[2] <- unit(.5, "npc"))
+
+    Thanks to Baptiste Auguie for code suggestions.
+
+
 Changes from grid_3.1.* to grid_3.2.0:
 -------------------------------------
 
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/displaylist.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/displaylist.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/frame.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/frame.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/grid.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/grid.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/grobs.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/grobs.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/interactive.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/interactive.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/locndimn.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/locndimn.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/moveline.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/moveline.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/nonfinite.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/nonfinite.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/plotexample.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/plotexample.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/rotated.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/rotated.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/saveload.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/saveload.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/sharing.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/sharing.pdf differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/grid/inst/doc/viewports.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/grid/inst/doc/viewports.pdf differ
diff -Nru r-base-3.2.3/src/library/grid/man/showViewport.Rd r-base-3.3.1/src/library/grid/man/showViewport.Rd
--- r-base-3.2.3/src/library/grid/man/showViewport.Rd	2015-08-25 22:15:47.000000000 +0000
+++ r-base-3.3.1/src/library/grid/man/showViewport.Rd	2016-03-16 23:02:47.000000000 +0000
@@ -68,6 +68,11 @@
 \examples{
 showViewport(viewport(width=.5, height=.5, name="vp"))
 
+grid.newpage()
+pushViewport(viewport(width=.5, height=.5, name="vp"))
+upViewport()
+showViewport(vpPath("vp"))
+
 showViewport(vpStack(viewport(width=.5, height=.5, name="vp1"),
                      viewport(width=.5, height=.5, name="vp2")),
              newpage=TRUE)
diff -Nru r-base-3.2.3/src/library/grid/man/unit.Rd r-base-3.3.1/src/library/grid/man/unit.Rd
--- r-base-3.2.3/src/library/grid/man/unit.Rd	2015-08-25 22:15:47.000000000 +0000
+++ r-base-3.3.1/src/library/grid/man/unit.Rd	2016-03-16 23:02:48.000000000 +0000
@@ -82,8 +82,9 @@
   data = list(NULL, "my string", NULL))
 }.
 
-  It is possible to subset unit objects in the normal way
-  (e.g., \code{unit(1:5, "npc")[2:4]}), but a special function
+  It is possible to subset unit objects in the normal way and to perform
+  subassignment (see the examples),
+  but a special function
   \code{unit.c} is provided for combining unit objects.
 
   Certain arithmetic and summary operations are defined for
@@ -120,5 +121,9 @@
 min(unit(0.5, "npc"), unit(1, "inches"))
 unit.c(unit(0.5, "npc"), unit(2, "inches") + unit(1:3/4, "npc"),
        unit(1, "strwidth", "hi there"))
+x <- unit(1:5, "npc")
+x[2:4]
+x[2:4] <- unit(1, "mm")
+x
 }
 \keyword{dplot}
diff -Nru r-base-3.2.3/src/library/grid/NAMESPACE r-base-3.3.1/src/library/grid/NAMESPACE
--- r-base-3.2.3/src/library/grid/NAMESPACE	2014-03-12 23:02:28.000000000 +0000
+++ r-base-3.3.1/src/library/grid/NAMESPACE	2016-03-16 23:02:48.000000000 +0000
@@ -1,6 +1,7 @@
 useDynLib("grid", .registration = TRUE)
 
 import(grDevices)
+importFrom(utils, str)
 
 export(
        "arcCurvature", "arrow",
@@ -131,6 +132,7 @@
 S3method("[", "unit.arithmetic")
 S3method("[", "unit.list")
 S3method("[", "vpPath")
+S3method("[<-", "unit")
 S3method("Ops", "unit")
 S3method("Summary", "unit")
 S3method("as.character", "grob")
@@ -333,6 +335,10 @@
 S3method("forceGrob", "grob")
 S3method("forceGrob", "gTree")
 
+S3method("absolute.units", "unit")
+S3method("absolute.units", "unit.list")
+S3method("absolute.units", "unit.arithmetic")
+
 # S3 methods for internal generics that are used in calls to external fns
 S3method("depth", "viewport")
 S3method("depth", "vpList")
diff -Nru r-base-3.2.3/src/library/grid/po/da.po r-base-3.3.1/src/library/grid/po/da.po
--- r-base-3.2.3/src/library/grid/po/da.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/da.po	2016-04-27 22:15:16.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2011-11-28 23:18+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,11 +83,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "ugyldig layout.pos.col"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr "entalstransformationsmatrix"
 
-#: state.c:169
+#: state.c:170
 #, fuzzy
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "Kan ikke lagre gittertilstand.  For mange enheder åbne?"
diff -Nru r-base-3.2.3/src/library/grid/po/de.po r-base-3.3.1/src/library/grid/po/de.po
--- r-base-3.2.3/src/library/grid/po/de.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/de.po	2016-04-27 22:15:16.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2015-03-20 16:09+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team:  <R-core@r-project.org>\n"
@@ -29,7 +29,7 @@
 
 #: grid.c:977
 msgid "attempt to plot on null device"
-msgstr "Versuch in das NUll-Gerät zu zeichnen"
+msgstr "Versuch in das Null-Device zu zeichnen"
 
 #: grid.c:1309
 msgid "there is no layout defined"
@@ -75,11 +75,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "unzulässige 'layout.pos.col'"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr "singuläre Transformationsmatrix"
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "kann den Status von 'grid' nicht speichern. Zu viele geöffnete Geräte?"
 
diff -Nru r-base-3.2.3/src/library/grid/po/fr.po r-base-3.3.1/src/library/grid/po/fr.po
--- r-base-3.2.3/src/library/grid/po/fr.po	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/fr.po	2016-04-27 22:15:16.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2014-03-17 10:48+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -76,11 +76,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "'layout.pos.col' incorrect"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr "matrice de transformation singulière"
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr ""
 "Impossible de conserver l'état de 'grid'. Trop de périphériques ouverts ?"
diff -Nru r-base-3.2.3/src/library/grid/po/grid.pot r-base-3.3.1/src/library/grid/po/grid.pot
--- r-base-3.2.3/src/library/grid/po/grid.pot	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/grid.pot	2016-04-27 22:15:16.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: grid 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,11 +73,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr ""
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr ""
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/grid/po/it.po r-base-3.3.1/src/library/grid/po/it.po
--- r-base-3.2.3/src/library/grid/po/it.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/it.po	2016-04-27 22:15:16.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2005-04-17 17:30+0200\n"
 "Last-Translator: stefano iacus <>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -82,11 +82,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "layout.pos.col non valido"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr ""
 
-#: state.c:169
+#: state.c:170
 #, fuzzy
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "Impossibile memorizzare lo stato di grid. Troppi dispositivi aperti?"
diff -Nru r-base-3.2.3/src/library/grid/po/ja.po r-base-3.3.1/src/library/grid/po/ja.po
--- r-base-3.2.3/src/library/grid/po/ja.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/ja.po	2016-04-27 22:15:16.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.1 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2014-03-26 10:02+0200 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -76,11 +76,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr " �正� 'layout.pos.col' �� "
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr " 特異�変�行列�� "
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr ""
 " �在� 'grid' �状態を���る���出���ん。デ�イスを開�������ん"
diff -Nru r-base-3.2.3/src/library/grid/po/ko.po r-base-3.3.1/src/library/grid/po/ko.po
--- r-base-3.2.3/src/library/grid/po/ko.po	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/ko.po	2016-04-27 22:15:16.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R grid package
-# src/library/grid/po/ko.po
+# ./grid/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R grid package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,9 +33,7 @@
 
 #: grid.c:697 grid.c:702 grid.c:792 grid.c:797
 msgid "cannot pop the top-level viewport ('grid' and 'graphics' output mixed?)"
-msgstr ""
-"최�단 뷰�트를 �울 수 없습니다 ('grid'와 'graphics' 출력� 혼용하고 있나"
-"ìš”?)"
+msgstr "최�단 뷰�트를 �울 수 없습니다 ('grid'와 'graphics' 출력� 혼용하고 있나요?)"
 
 #: grid.c:977
 msgid "attempt to plot on null device"
@@ -82,11 +83,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "유효하지 않� 'layout.pos.col'입니다"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr ""
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "'grid'�태를 저장할 수 없는� 혹시 너무 많� 장치가 열려있나요?"
 
diff -Nru r-base-3.2.3/src/library/grid/po/pl.po r-base-3.3.1/src/library/grid/po/pl.po
--- r-base-3.2.3/src/library/grid/po/pl.po	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/pl.po	2016-04-27 22:15:16.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,8 +13,8 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: grid.c:212
 msgid "cannot clip to rotated viewport"
@@ -75,11 +75,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "niepoprawny 'layout.pos.col'"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr "osobliwa macierz transformacyjna"
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "nie można zachować stanu siatki. Zbyt duża liczba otwartych urządzeń?"
 
diff -Nru r-base-3.2.3/src/library/grid/po/pt_BR.po r-base-3.3.1/src/library/grid/po/pt_BR.po
--- r-base-3.2.3/src/library/grid/po/pt_BR.po	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/pt_BR.po	2016-04-27 22:15:16.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2011-03-26 08:54-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -85,11 +85,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "layout.pos.col inválido"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr "matriz de transformação singular"
 
-#: state.c:169
+#: state.c:170
 #, fuzzy
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/grid/po/R-da.po r-base-3.3.1/src/library/grid/po/R-da.po
--- r-base-3.2.3/src/library/grid/po/R-da.po	2014-03-12 23:02:29.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-da.po	2016-04-27 22:15:16.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-02-27 17:14\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-29 12:58+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -281,9 +281,6 @@
 msgid "grob '%s' not found"
 msgstr ""
 
-msgid "invalid element in the display list"
-msgstr ""
-
 #, fuzzy
 msgid "Invalid force target"
 msgstr "Ugyldig »frame«"
@@ -351,9 +348,6 @@
 msgid "invalid 'listing'"
 msgstr "Ugyldig »grob«"
 
-msgid "Nothing on the display list"
-msgstr ""
-
 #, fuzzy
 msgid "invalid 'origin'"
 msgstr "Ugyldig »grob«"
@@ -493,6 +487,9 @@
 msgid "index out of bounds (unit list subsetting)"
 msgstr ""
 
+msgid "Value being assigned must be a unit"
+msgstr ""
+
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-de.po r-base-3.3.1/src/library/grid/po/R-de.po
--- r-base-3.2.3/src/library/grid/po/R-de.po	2015-03-26 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-de.po	2016-04-27 22:15:16.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: R 3.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-02-27 17:14\n"
-"PO-Revision-Date: 2015-03-20 16:09+0100\n"
+"PO-Revision-Date: 2016-04-08 11:20+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-Core <R-core@r-project.org>\n"
 "Language: de\n"
@@ -112,7 +112,7 @@
 msgstr "es darf nur entweder 'font' oder 'fontface' angegeben werden"
 
 msgid "invalid fontface"
-msgstr "ungültige Zeichensatzerscheinung"
+msgstr "ungültiger 'fontface' Wert"
 
 msgid "argument must be a 'gpar' object"
 msgstr "Argument muss ein 'gpar' Objekt sein"
@@ -145,14 +145,16 @@
 msgstr "es muss zumindest ein Viewport angegeben werden"
 
 msgid "Down viewport failed to record on display list"
-msgstr "Abgeschalteter Viewport konnte nicht in die Displayliste aufnehmen"
+msgstr ""
+"Abgeschalteter Viewport konnte nicht in die Display-Liste "
+"aufgenommen werde"
 
 msgid "Down viewport incorrectly recorded on display list"
 msgstr ""
-"Abgeschalteter Viewport fälschlicherweise  in die Displayliste aufgenommen"
+"Abgeschalteter Viewport fälschlicherweise in die Displayliste aufgenommen"
 
 msgid "must pop at least one viewport"
-msgstr "es muss zumindest ein Viewport von Stack geholt werden"
+msgstr "es muss zumindest ein Viewport vom Stack geholt werden"
 
 msgid "must navigate up at least one viewport"
 msgstr "es muss mindestens ein Viewport nach oben navigiert werden"
@@ -164,7 +166,7 @@
 msgstr "unzulässiges Objekt in die Displayliste eingefügt"
 
 msgid "invalid modification of the display list"
-msgstr "unzulässige Modifikation der Display-Liste"
+msgstr "unzulässige Modifikation der Displayliste"
 
 msgid "'expr' must return a grob or gList"
 msgstr "'expr' muss ein grob oder eine gList zurückgeben"
@@ -191,7 +193,7 @@
 msgstr "nur 'grobs' in \"gList\" erlaubt"
 
 msgid "invalid element to add to \"gList\""
-msgstr "unzulässiges Element für Hinzufügen in \"gList\""
+msgstr "unzulässiges Element zum Hinzufügen zu \"gList\""
 
 msgid "can only set 'children' for a \"gTree\""
 msgstr "kann nur 'children' für einen \"gTree\" setzen"
@@ -292,10 +294,10 @@
 msgstr "'vgap' muss eine einzelne Stelle sein"
 
 msgid "'nrow' must be >= 1"
-msgstr "'nrow' must >= 1 sein"
+msgstr "'nrow' muss >= 1 sein"
 
 msgid "'ncol' must be >= 1"
-msgstr "'ncol' must >= 1 sein"
+msgstr "'ncol' muss >= 1 sein"
 
 msgid "nrow * ncol < #{legend labels}"
 msgstr "nrow * ncol < #{legend labels}"
@@ -364,13 +366,13 @@
 msgstr "'x' und 'y' müssen Einheiten oder NULL sein"
 
 msgid "corrupt 'arrows' object"
-msgstr "korruptes 'arrows' Objekt"
+msgstr "beschädigtes 'arrows' Objekt"
 
 msgid "x and y must be units"
 msgstr "x und y müssen Einheiten sein"
 
 msgid "must have exactly 4 control points"
-msgstr "nuss exakt 4 Kontrollpunkte haben"
+msgstr "muss exakt 4 Kontrollpunkte haben"
 
 msgid "must have exactly 4 control points per Bezier curve"
 msgstr "muss je Bezier-Kurve exakt 4 Kontrollpunkte haben"
@@ -433,22 +435,22 @@
 msgstr "nur ein Operand darf eine Einheit sein"
 
 msgid "non-unit operand must be numeric"
-msgstr "Nicht-unit Operand muss numerisch sein"
+msgstr "non-unit Operand muss numerisch sein"
 
 msgid "both operands must be units"
-msgstr "Beide Operanden müssen Einheiten sein"
+msgstr "beide Operanden müssen Einheiten sein"
 
 msgid "'Summary' function '%s' not meaningful for units"
 msgstr "'Summary'-Funktion '%s' hat für Einheiten keine Bedeutung"
 
 msgid "no arguments where at least one expected"
-msgstr "Kein Argument, wo zumindest eines erwartet"
+msgstr "kein Argument, wo zumindest eines erwartet"
 
 msgid "Zero arguments where at least one expected"
 msgstr "Kein Argument, wo zumindest eines erwartet"
 
 msgid "cannot mix signs of indices"
-msgstr "Vorzeichen von Indices können nicht gemischt werden"
+msgstr "Vorzeichen von Indizes können nicht gemischt werden"
 
 msgid "index out of bounds ('unit' subsetting)"
 msgstr "Index außerhalb des Bereichs ('unit' Teilauswahl)"
@@ -461,7 +463,7 @@
 
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr ""
-"unzulässig 'unit' Objekte können nicht mit anderen Typen zu kombinieren"
+"unzulässig 'unit' Objekte mit anderen Typen zu kombinieren"
 
 msgid "invalid 'unit' object"
 msgstr "Unzulässiges 'unit' Objekt"
@@ -470,7 +472,7 @@
 msgstr "unzulässiges 'theta'"
 
 msgid "'range' must be numeric"
-msgstr "'range' muss nummerisch sein"
+msgstr "'range' muss numerisch sein"
 
 msgid "invalid 'gp' value"
 msgstr "ungültiger 'gp' Wert"
@@ -517,7 +519,7 @@
 msgstr "mindestens 'y' oder 'yscale' muss angegeben werden"
 
 msgid "shutting down all devices when unloading 'grid' namespace"
-msgstr "schließe alle Geräte, wenn der 'grid' Namensraum entfernt wird "
+msgstr "schließe alle Devices, wenn der 'grid' Namensraum entfernt wird "
 
 msgid "invalid grob name"
 msgid_plural "invalid grob names"
diff -Nru r-base-3.2.3/src/library/grid/po/R-fr.po r-base-3.3.1/src/library/grid/po/R-fr.po
--- r-base-3.2.3/src/library/grid/po/R-fr.po	2014-03-19 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-fr.po	2016-04-27 22:15:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-02-27 17:14\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 10:52+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -281,9 +281,6 @@
 msgid "grob '%s' not found"
 msgstr "grob '%s' introuvable"
 
-msgid "invalid element in the display list"
-msgstr "élément incorrect dans la liste d'affichage (display list)"
-
 msgid "Invalid force target"
 msgstr "Cible incorrecte pour 'force'"
 
@@ -343,9 +340,6 @@
 msgid "invalid 'listing'"
 msgstr "'listing' incorrect"
 
-msgid "Nothing on the display list"
-msgstr "Il n'y a rien dans la liste d'affichage (display list)"
-
 msgid "invalid 'origin'"
 msgstr "'origin' incorrecte"
 
@@ -482,6 +476,10 @@
 msgid "index out of bounds (unit list subsetting)"
 msgstr "indice hors plage (indiçage de liste d'unités)"
 
+#, fuzzy
+msgid "Value being assigned must be a unit"
+msgstr "'x' et 'y' doivent être des unités"
+
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr "il n'est pas permis de combiner des objets unités avec d'autres types"
 
@@ -553,6 +551,12 @@
 msgstr[0] "nom de vue incorrect"
 msgstr[1] "noms de vues incorrects"
 
+#~ msgid "invalid element in the display list"
+#~ msgstr "élément incorrect dans la liste d'affichage (display list)"
+
+#~ msgid "Nothing on the display list"
+#~ msgstr "Il n'y a rien dans la liste d'affichage (display list)"
+
 #~ msgid "the 'vp' argument is deprecated"
 #~ msgstr "l'argument 'vp' est obsolète"
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-grid.pot r-base-3.3.1/src/library/grid/po/R-grid.pot
--- r-base-3.2.3/src/library/grid/po/R-grid.pot	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-grid.pot	2016-04-27 22:15:16.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: grid 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -242,9 +241,6 @@
 msgid "grob '%s' not found"
 msgstr ""
 
-msgid "invalid element in the display list"
-msgstr ""
-
 msgid "Invalid force target"
 msgstr ""
 
@@ -302,9 +298,6 @@
 msgid "invalid 'listing'"
 msgstr ""
 
-msgid "Nothing on the display list"
-msgstr ""
-
 msgid "invalid 'origin'"
 msgstr ""
 
@@ -437,6 +430,9 @@
 msgid "index out of bounds (unit list subsetting)"
 msgstr ""
 
+msgid "Value being assigned must be a unit"
+msgstr ""
+
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-ja.po r-base-3.3.1/src/library/grid/po/R-ja.po
--- r-base-3.2.3/src/library/grid/po/R-ja.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-ja.po	2016-04-27 22:15:16.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-26 10:01+0200 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -265,9 +265,6 @@
 msgid "grob '%s' not found"
 msgstr " grob '%s' �見��り��ん "
 
-msgid "invalid element in the display list"
-msgstr " ディスプレイリスト�中��正��素��り�� "
-
 msgid "Invalid force target"
 msgstr " �正� force target �� "
 
@@ -325,9 +322,6 @@
 msgid "invalid 'listing'"
 msgstr " �正� 'listing' "
 
-msgid "Nothing on the display list"
-msgstr " ディスプレイリスト�何も�り��ん "
-
 msgid "invalid 'origin'"
 msgstr " �正� 'origin' �� "
 
@@ -465,6 +459,10 @@
 msgid "index out of bounds (unit list subsetting)"
 msgstr " 添�字�範囲を超����� (unit list subsetting) "
 
+#, fuzzy
+msgid "Value being assigned must be a unit"
+msgstr " x � y ��� (units) ���れ��り��ん "
+
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr ""
 " �� ('unit') オブジェクト��れ以外�型�オブジェクトを���る���出��"
@@ -536,6 +534,12 @@
 msgid_plural "invalid viewport names"
 msgstr[0] " �正� viewport ��� "
 
+#~ msgid "invalid element in the display list"
+#~ msgstr " ディスプレイリスト�中��正��素��り�� "
+
+#~ msgid "Nothing on the display list"
+#~ msgstr " ディスプレイリスト�何も�り��ん "
+
 #~ msgid "the 'vp' argument is deprecated"
 #~ msgstr " 引数 'vp' �廃止予定�� "
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-ko.po r-base-3.3.1/src/library/grid/po/R-ko.po
--- r-base-3.2.3/src/library/grid/po/R-ko.po	2015-03-31 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-ko.po	2016-04-27 22:15:16.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R grid package
-# src/library/grid/po/R-ko.po
+# ./grid/po/R-ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R grid package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
-# 
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
+#
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-02-27 17:14\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -271,9 +274,6 @@
 msgid "grob '%s' not found"
 msgstr "grob '%s'를 찾� 수 없습니다"
 
-msgid "invalid element in the display list"
-msgstr "디스플레� 목�� 유효하지 않� 항목� 있습니다"
-
 msgid "Invalid force target"
 msgstr ""
 
@@ -332,9 +332,6 @@
 msgid "invalid 'listing'"
 msgstr "유효하지 않� 'listing'입니다"
 
-msgid "Nothing on the display list"
-msgstr "디스플레� 목�� 아무것� 없습니다"
-
 msgid "invalid 'origin'"
 msgstr "유효하지 않� 'origin'입니다"
 
@@ -468,6 +465,9 @@
 msgid "index out of bounds (unit list subsetting)"
 msgstr ""
 
+msgid "Value being assigned must be a unit"
+msgstr ""
+
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr "'unit'�체들과 다른 타입들� 결합� 유효하지 않습니다"
 
@@ -535,6 +535,12 @@
 msgid_plural "invalid viewport names"
 msgstr[0] "유효하지 않� 뷰�트 �름입니다"
 
+#~ msgid "invalid element in the display list"
+#~ msgstr "디스플레� 목�� 유효하지 않� 항목� 있습니다"
+
+#~ msgid "Nothing on the display list"
+#~ msgstr "디스플레� 목�� 아무것� 없습니다"
+
 #~ msgid "the 'vp' argument is deprecated"
 #~ msgstr "'vp' ��는 ��� 지��지 않습니다"
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-pl.po r-base-3.3.1/src/library/grid/po/R-pl.po
--- r-base-3.2.3/src/library/grid/po/R-pl.po	2015-03-27 23:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-pl.po	2016-04-27 22:15:16.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,542 +13,954 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "invalid 'at' location in 'axis'"
-msgstr "niepoprawne położenie 'at' w 'axis'"
+#. R/unit.R: gettextf("'Summary' function '%s' not meaningful for units",     .Generic)
+#: R/unit.R:0
+msgid "'Summary' function '%s' not meaningful for units"
+msgstr "Funkcja 'summary' '%s' nie ma znaczenia dla jednostek"
 
-msgid "invalid to specify axis labels when 'at' is NULL"
-msgstr ""
-"nie można określać etykiet osi kiedy komponent 'at' argumentu 'x' ma wartość "
-"NULL"
+#. R/grob.R: stop("'allDevices' not yet implemented")
+#. R/grob.R: stop("'allDevices' not yet implemented")
+#. R/grob.R: stop("'allDevices' not yet implemented")
+#. R/grob.R: stop("'allDevices' not yet implemented")
+#: R/grob.R:0
+msgid "'allDevices' not yet implemented"
+msgstr "argument 'allDevices' nie jest jeszcze zaimplementowany"
 
-msgid "'labels' and 'at' locations must have same length"
-msgstr "argument 'labels' oraz położenia 'at' muszą mieć tę samą długość"
+#. R/curve.R: stop("'arrow' must be an arrow object or NULL")
+#: R/curve.R:0
+msgid "'arrow' must be an arrow object or NULL"
+msgstr "'arrow' musi być obiektem klasy \"arrow\" lub wartością NULL"
 
-msgid "logical 'label' supplied of length 0"
-msgstr "dostarczono logiczną wartość argumentu 'label' o długości 0"
+#. R/grob.R: stop("'children' must be a \"gList\"")
+#: R/grob.R:0
+msgid "'children' must be a \"gList\""
+msgstr "argument 'children' musi być obiektem klasy \"gList\""
 
-msgid "end points must not be identical"
-msgstr "punkty końcowe nie mogą być identyczne"
+#. R/frames.R: stop("'col' can only be a range of existing columns")
+#: R/frames.R:0
+msgid "'col' can only be a range of existing columns"
+msgstr "'col' może być tylko z zakresu istniejących kolumn"
 
-msgid "'x1', 'y1', 'x2', and 'y2' must be units"
-msgstr "argumenty Wielkości 'x1', 'y1', 'x2', oraz 'y2' muszą być jednostkami"
+#. R/grid.R: stop("'expr' must return a grob or gList")
+#: R/grid.R:0
+msgid "'expr' must return a grob or gList"
+msgstr "'expr' musi zwrócić obiekt klasy \"grob\" lub \"gList\""
 
-msgid "'shape' must be between -1 and 1"
-msgstr "argument 'shape' musi być pomiędzy -1 a 1"
+#. R/edit.R: stop("'gEditList' can only contain 'gEdit' objects")
+#: R/edit.R:0
+msgid "'gEditList' can only contain 'gEdit' objects"
+msgstr "'gEditList()' może zawierać tylko obiekty klasy \"gEdit\""
 
-msgid "'squareShape' must be between -1 and 1"
-msgstr "argument 'squareShape' musi być pomiędzy -1 a 1"
+#. R/grob.R: gettextf("'gPath' (%s) not found", as.character(gPath))
+#. R/grob.R: gettextf("'gPath' (%s) not found", as.character(gPath))
+#. R/grob.R: gettextf("'gPath' (%s) not found", as.character(gPath))
+#. R/grob.R: gettextf("'gPath' (%s) not found", as.character(gPath))
+#. R/grob.R: gettextf("'gPath' (%s) not found", gPath)
+#: R/grob.R:0
+msgid "'gPath' (%s) not found"
+msgstr "'gPath' (%s) nie został znaleziony"
 
-msgid "'arrow' must be an arrow object or NULL"
-msgstr "'arrow' musi być obiektem klasy \"arrow\" lub wartością NULL"
+#. R/grob.R: stop("'gPath' does not specify a valid child")
+#. R/grob.R: stop("'gPath' does not specify a valid child")
+#. R/grob.R: stop("'gPath' does not specify a valid child")
+#: R/grob.R:0
+msgid "'gPath' does not specify a valid child"
+msgstr "'gPath' nie określa poprawnego dziecka"
 
-msgid "how did we get here?"
-msgstr "jak się tu dostaliśmy?"
+#. R/unit.R: stop("'gPath' must have depth 1 in 'grobwidth/height' units")
+#: R/unit.R:0
+msgid "'gPath' must have depth 1 in 'grobwidth/height' units"
+msgstr "'gPath' musi mieć głębokość 1 w jednostkach 'grobwidth/height'"
 
-msgid "must start new page if showing leaves separately"
-msgstr ""
-"trzeba rozpocząć nową stronę jeśli liście mają być pokazywane oddzielnie"
+#. R/gpar.R: warning("'gamma' 'gpar' element is defunct")
+#. R/gpar.R: warning("'gamma' 'gpar' element is defunct")
+#. R/gpar.R: warning("'gamma' 'gpar' element is defunct")
+#: R/gpar.R:0
+msgid "'gamma' 'gpar' element is defunct"
+msgstr "'gamma' w 'gpar' jest przestarzałe"
 
-msgid "invalid 'edit' information"
-msgstr "niepoprawne wartość 'edit'"
+#. R/gpar.R: gettextf("'gpar' element '%s' must not be length 0", gparname)
+#: R/gpar.R:0
+msgid "'gpar' element '%s' must not be length 0"
+msgstr "element '%s' w 'gpar' nie może mieć długości 0"
 
-msgid "'gEditList' can only contain 'gEdit' objects"
-msgstr "'gEditList()' może zawierać tylko obiekty klasy \"gEdit\""
+#. R/highlevel.R: stop("'hgap' must be single unit")
+#. R/highlevel.R: stop("'hgap' must be single unit")
+#: R/highlevel.R:0
+msgid "'hgap' must be single unit"
+msgstr "'hgap' musi być pojedynczą jednostką"
 
-msgid "invalid 'frame'"
-msgstr "niepoprawny argument 'frame'"
+#. R/highlevel.R: stop("'l' must be a layout")
+#: R/highlevel.R:0
+msgid "'l' must be a layout"
+msgstr "argument 'l' musi być layoutem"
 
-msgid "invalid 'grob'"
-msgstr "niepoprawny argument 'grob'"
+#. R/components.R: stop("'labels' and 'at' locations must have same length")
+#: R/components.R:0
+msgid "'labels' and 'at' locations must have same length"
+msgstr "argument 'labels' oraz położenia 'at' muszą mieć tę samą długość"
 
-msgid "invalid 'row' and/or 'col' (no such cell in frame layout)"
+#. R/primitives.R: stop("'length' must be a 'unit' object")
+#. R/primitives.R: stop("'length' must be a 'unit' object")
+#: R/primitives.R:0
+msgid "'length' must be a 'unit' object"
+msgstr "argument 'length' musi być obiektem klasy \"unit\""
+
+#. R/highlevel.R: stop("'ncol' must be >= 1")
+#: R/highlevel.R:0
+msgid "'ncol' must be >= 1"
+msgstr "argument 'ncol' musi mieć wartość >= 1"
+
+#. R/highlevel.R: stop("'nrow' must be >= 1")
+#: R/highlevel.R:0
+msgid "'nrow' must be >= 1"
+msgstr "argument 'nrow' musi mieć wartość >= 1"
+
+#. R/viewport.R: stop("'parent' must be a viewport and 'children' must be a 'vpList' in 'vpTree'")
+#: R/viewport.R:0
+msgid ""
+"'parent' must be a viewport and 'children' must be a 'vpList' in 'vpTree'"
 msgstr ""
-"niepoprawne argumenty 'row' oraz/lub 'col' (brak takiej komórki w ramce "
-"layoutu)"
+"argument 'parent' musi być oknem ekranu oraz argument 'children' musi być "
+"'vpList' w 'vpTree'"
 
-msgid "'col' can only be a range of existing columns"
-msgstr "'col' może być tylko z zakresu istniejących kolumn"
+#. R/highlevel.R: stop("'pch' and 'labels' not the same length")
+#: R/highlevel.R:0
+msgid "'pch' and 'labels' not the same length"
+msgstr "argumenty 'pch' oraz 'labels' nie są tej samej długości"
 
-msgid "invalid 'col' specification"
-msgstr "niepoprawne określenie 'col'"
+#. R/roundRect.R: stop("'r' must be a 'unit' object")
+#: R/roundRect.R:0
+msgid "'r' must be a 'unit' object"
+msgstr "'r' musi być obiektem klasy \"unit\""
+
+#. R/util.R: stop("'range' must be numeric")
+#: R/util.R:0
+msgid "'range' must be numeric"
+msgstr "'range' musi być liczbą"
+
+#. R/layout.R: stop("'respect' must be logical or an 'nrow' by 'ncol' matrix")
+#: R/layout.R:0
+msgid "'respect' must be logical or an 'nrow' by 'ncol' matrix"
+msgstr ""
+"'respect' musi być wartością logiczną lub macierzą o rozmiarze 'nrow' na "
+"'ncol'"
 
+#. R/frames.R: stop("'row' can only be a range of existing rows")
+#: R/frames.R:0
 msgid "'row' can only be a range of existing rows"
 msgstr "'row' może być tylko z zakresu istniejących wierszy"
 
-msgid "invalid 'row' specification"
-msgstr "niepoprawne określenie 'row'"
+#. R/curve.R: stop("'shape' must be between -1 and 1")
+#. R/primitives.R: stop("'shape' must be between -1 and 1")
+#: R/curve.R:0 R/primitives.R:0
+msgid "'shape' must be between -1 and 1"
+msgstr "argument 'shape' musi być pomiędzy -1 a 1"
 
-msgid ""
-"cannot specify more than one of 'side=[\"left\", \"right\"]', 'col', 'col."
-"before', or 'col.after'"
-msgstr ""
-"nie można określić więcej niż jeden z 'side=[\"left\", \"right\"]', 'col', "
-"'col.before', lub 'col.after'"
+#. R/curve.R: stop("'squareShape' must be between -1 and 1")
+#: R/curve.R:0
+msgid "'squareShape' must be between -1 and 1"
+msgstr "argument 'squareShape' musi być pomiędzy -1 a 1"
 
-msgid ""
-"must specify exactly one of 'side=[\"top\", \"bottom\"]', 'row', 'row."
-"before', or 'row.after'"
-msgstr ""
-"potrzeba określić dokładnie jeden z 'side=[\"top\", \"bottom\"]', 'row', "
-"'row.before', lub 'row.after'"
+#. R/highlevel.R: stop("'vgap' must be single unit")
+#. R/highlevel.R: stop("'vgap' must be single unit")
+#: R/highlevel.R:0
+msgid "'vgap' must be single unit"
+msgstr "'vgap' musi być pojedynczą jednostką"
 
-msgid "invalid 'n'"
-msgstr "niepoprawny argument 'n'"
+#. R/unit.R: stop("'x' and 'units' must have length > 0")
+#: R/unit.R:0
+msgid "'x' and 'units' must have length > 0"
+msgstr "argumenty 'x' oraz 'units' muszą mieć długość > 0"
 
-msgid "invalid 'f'"
-msgstr "niepoprawna wartość 'f'"
+#. R/primitives.R: stop("'x' and 'y' and 'id' must all be same length")
+#. R/primitives.R: stop("'x' and 'y' and 'id' must all be same length")
+#. R/primitives.R: stop("'x' and 'y' and 'id' must all be same length")
+#. R/primitives.R: stop("'x' and 'y' and 'id' must all be same length")
+#. R/primitives.R: stop("'x' and 'y' and 'id' must all be same length")
+#: R/primitives.R:0
+msgid "'x' and 'y' and 'id' must all be same length"
+msgstr ""
+"komponenty 'x' oraz 'y' oraz 'z' argumentu 'x' muszą wszystkie mieć tę samą "
+"długość"
 
-msgid "'gpar' element '%s' must not be length 0"
-msgstr "element '%s' w 'gpar' nie może mieć długości 0"
+#. R/primitives.R: stop("'x' and 'y' and 'id.lengths' must specify same overall length")
+#. R/primitives.R: stop("'x' and 'y' and 'id.lengths' must specify same overall length")
+#. R/primitives.R: stop("'x' and 'y' and 'id.lengths' must specify same overall length")
+#. R/primitives.R: stop("'x' and 'y' and 'id.lengths' must specify same overall length")
+#. R/primitives.R: stop("'x' and 'y' and 'id.lengths' must specify same overall length")
+#: R/primitives.R:0
+msgid "'x' and 'y' and 'id.lengths' must specify same overall length"
+msgstr ""
+"komponenty 'x' oraz 'y' oraz 'id.lengths' argumentu 'x' muszą określać tę "
+"samą całościową długość"
 
-msgid "'gamma' 'gpar' element is defunct"
-msgstr "'gamma' w 'gpar' jest przestarzałe"
+#. R/primitives.R: stop("'x' and 'y' must all be units of length 1")
+#: R/primitives.R:0
+msgid "'x' and 'y' must all be units of length 1"
+msgstr "'x' oraz 'y' muszą być jednostkami o długości 1"
 
-msgid "invalid 'linemitre' value"
-msgstr "niepoprawna wartość 'linemitre'"
+#. R/primitives.R: stop("'x' and 'y' must be 'unit' objects and have the same length")
+#: R/primitives.R:0
+msgid "'x' and 'y' must be 'unit' objects and have the same length"
+msgstr ""
+"komponenty 'x' oraz 'y' argumentu 'x' muszą być obiektami klasy \"unit\" "
+"oraz muszą mieć tę samą długość"
 
-msgid "invalid 'alpha' value"
-msgstr "niepoprawna wartość 'alpha'"
+#. R/primitives.R: stop("'x' and 'y' must be same length")
+#. R/primitives.R: stop("'x' and 'y' must be same length")
+#. R/primitives.R: stop("'x' and 'y' must be same length")
+#. R/primitives.R: stop("'x' and 'y' must be same length")
+#. R/primitives.R: stop("'x' and 'y' must be same length")
+#: R/primitives.R:0
+msgid "'x' and 'y' must be same length"
+msgstr "argumenty 'x' oraz 'units' muszą mieć tę samą długość"
 
-msgid "must specify only one of 'font' and 'fontface'"
-msgstr "potrzeba określić tylko jeden z 'font' oraz 'fontface'"
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#. R/primitives.R: stop("'x' and 'y' must be units")
+#: R/primitives.R:0
+msgid "'x' and 'y' must be units"
+msgstr "argumenty 'x' oraz 'y' muszą być jednostkami"
 
-msgid "invalid fontface"
-msgstr "niepoprawny krój czcionki"
+#. R/primitives.R: stop("'x' and 'y' must be units or NULL")
+#: R/primitives.R:0
+msgid "'x' and 'y' must be units or NULL"
+msgstr "'x' oraz 'y' muszą być jednostkami"
 
-msgid "argument must be a 'gpar' object"
-msgstr "argument musi być obiektem klasy \"gpar\""
+#. R/primitives.R: stop("'x' and 'y' must have length 1")
+#. R/primitives.R: stop("'x' and 'y' must have length 1")
+#: R/primitives.R:0
+msgid "'x' and 'y' must have length 1"
+msgstr "argumenty 'x' oraz 'y' muszą mieć długość 1"
 
-msgid "must specify only valid 'gpar' names"
-msgstr "potrzeba określić tylko poprawne nazwy 'gpar'"
+#. R/unit.R: stop("'x' argument must be a unit object")
+#: R/unit.R:0
+msgid "'x' argument must be a unit object"
+msgstr "argument 'x' musi być obiektem klasy \"unit\""
 
-msgid "invalid display list element"
-msgstr "niepoprawne element listy wyświetleń"
+#. R/primitives.R: stop("'x', 'y' and 'size' must be units")
+#: R/primitives.R:0
+msgid "'x', 'y' and 'size' must be units"
+msgstr "'x', 'y' oraz 'size' muszą być jednostkami"
 
-msgid ""
-"one of more grobs overwritten (grab WILL not be faithful; try 'wrap = TRUE')"
+#. R/primitives.R: stop("'x', 'y', 'width', and 'height' must all be units of length 1")
+#. R/viewport.R: stop("'x', 'y', 'width', and 'height' must all be units of length 1")
+#: R/primitives.R:0 R/viewport.R:0
+msgid "'x', 'y', 'width', and 'height' must all be units of length 1"
 msgstr ""
-"jeden lub więcej 'grob' nadpisane ('grab' NIE BĘDZIE wiarygodne; spróbuj "
-"'wrap=TRUE')"
+"argumenty 'x', 'y', 'width' oraz 'height' muszą wszystkie być jednostkami o "
+"długości 1"
 
-msgid "viewport overwritten (grab MAY not be faithful)"
-msgstr "okno ekranu nadpisane ('grab' MOŻE nie być wiarygodne)"
+#. R/primitives.R: stop("'x', 'y', 'width', and 'height' must be units")
+#. R/primitives.R: stop("'x', 'y', 'width', and 'height' must be units")
+#. R/primitives.R: stop("'x', 'y', 'width', and 'height' must be units")
+#. R/roundRect.R: stop("'x', 'y', 'width', and 'height' must be units")
+#: R/primitives.R:0 R/roundRect.R:0
+msgid "'x', 'y', 'width', and 'height' must be units"
+msgstr "'x', 'y', 'width', oraz 'height' muszą być jednostkami"
 
-msgid ""
-"grob pushed viewports and did not pop/up them (grab MAY not be faithful)"
-msgstr ""
-"'grob' wypchnął okna ekranów i nie wyświetlił ich ('grab' MOŻE nie być "
-"wiarygodny)"
+#. R/roundRect.R: stop("'x', 'y', 'width', and 'height' must have length 1")
+#: R/roundRect.R:0
+msgid "'x', 'y', 'width', and 'height' must have length 1"
+msgstr "'x', 'y', 'width', oraz 'height' muszą mieć długość 1"
 
-msgid "only valid to push viewports"
-msgstr "poprawne tylko dla wypychanych okien ekranów"
+#. R/primitives.R: stop("'x', 'y', and 'r' must be units")
+#: R/primitives.R:0
+msgid "'x', 'y', and 'r' must be units"
+msgstr "'x', 'y', oraz 'r' muszą być jednostkami"
 
-msgid "must specify at least one viewport"
-msgstr "przynajmniej jedno okno ekranu musi być określone"
+#. R/primitives.R: stop("'x0', 'y0', 'x1', and 'y1' must be units")
+#: R/primitives.R:0
+msgid "'x0', 'y0', 'x1', and 'y1' must be units"
+msgstr "Wielkości 'x0', 'y0', 'x1', oraz 'y1' muszą być jednostkami"
 
+#. R/curve.R: stop("'x1', 'y1', 'x2', and 'y2' must be units")
+#: R/curve.R:0
+msgid "'x1', 'y1', 'x2', and 'y2' must be units"
+msgstr "argumenty Wielkości 'x1', 'y1', 'x2', oraz 'y2' muszą być jednostkami"
+
+#. R/grid.R: stop("Down viewport failed to record on display list")
+#: R/grid.R:0
 msgid "Down viewport failed to record on display list"
 msgstr "Nie udało się poprawnie zarejestrować okna ekranu na liście wyświetleń"
 
+#. R/grid.R: warning("Down viewport incorrectly recorded on display list")
+#: R/grid.R:0
 msgid "Down viewport incorrectly recorded on display list"
 msgstr "Okno ekranu nie poprawnie zarejestrowane na liście wyświetleń"
 
-msgid "must pop at least one viewport"
-msgstr "potrzeba wyświetlić przynajmniej jedno okno ekranu"
+#. R/grob.R: stop("Invalid 'order'")
+#: R/grob.R:0
+msgid "Invalid 'order'"
+msgstr "niepoprawna wartość 'order'"
 
-msgid "must navigate up at least one viewport"
-msgstr "potrzeba przenieść w górę przynajmniej jedno okno ekranu"
+#. R/grob.R: stop("Invalid force target")
+#: R/grob.R:0
+msgid "Invalid force target"
+msgstr "niepoprawny cel 'force'"
 
+#. R/grid.R: stop("Invalid number of generations")
+#. R/grid.R: stop("Invalid number of generations")
+#: R/grid.R:0
 msgid "Invalid number of generations"
 msgstr "niepoprawna liczba generacji"
 
-msgid "invalid object inserted on the display list"
-msgstr "niepoprawne obiekty wstawione na listę wyświetleń"
-
-msgid "invalid modification of the display list"
-msgstr "niepoprawna modyfikacja listy wyświetleń"
-
-msgid "'expr' must return a grob or gList"
-msgstr "'expr' musi zwrócić obiekt klasy \"grob\" lub \"gList\""
-
-msgid "invalid 'grob' argument"
-msgstr "niepoprawny argument 'grob'"
+#. R/grob.R: stop("Invalid revert target")
+#: R/grob.R:0
+msgid "Invalid revert target"
+msgstr "niepoprawny cel 'revert'"
 
-msgid "invalid 'vp' slot"
-msgstr "niepoprawne gniazdo 'vp'"
+#. R/grob.R: gettextf("New 'grob' name (%s) does not match 'gPath' (%s)",     newGrob$name, gPath)
+#: R/grob.R:0
+msgid "New 'grob' name (%s) does not match 'gPath' (%s)"
+msgstr "Nowa nazwa 'grob' (%s) nie zgadza siÄ™ z 'gPath' (%s)"
 
-msgid "invalid 'gp' slot"
-msgstr "niepoprawne gniazdo 'gp'"
+#. R/unit.R: stop("Value being assigned must be a unit")
+#: R/unit.R:0
+msgid "Value being assigned must be a unit"
+msgstr "Wartość przypisywana musi być jednostką"
 
-msgid "invalid 'grob' class"
-msgstr "niepoprawna klasa 'grob'"
+#. R/unit.R: stop("Zero arguments where at least one expected")
+#: R/unit.R:0
+msgid "Zero arguments where at least one expected"
+msgstr "Zero argumentów gdzie oczekiwano przynajmniej jednego"
 
+#. R/grob.R: stop("a 'grob' path must contain at least one 'grob' name")
+#: R/grob.R:0
 msgid "a 'grob' path must contain at least one 'grob' name"
 msgstr "ścieżka 'grob' musi zawierać przynajmniej jedną nazwę 'grob'"
 
-msgid "unable to coerce to \"gList\""
-msgstr "nie można przekształcić argumentu 'x' na obiekt klasy \"gList\""
+#. R/viewport.R: stop("a viewport path must contain at least one viewport name")
+#: R/viewport.R:0
+msgid "a viewport path must contain at least one viewport name"
+msgstr "ścieżka okna ekranu musi zawierać przynajmniej jedną nazwę okna ekranu"
 
-msgid "only 'grobs' allowed in \"gList\""
-msgstr "tylko 'grobs' sÄ… dozwolone w \"gList\""
+#. R/gpar.R: stop("argument must be a 'gpar' object")
+#: R/gpar.R:0
+msgid "argument must be a 'gpar' object"
+msgstr "argument musi być obiektem klasy \"gpar\""
 
-msgid "invalid element to add to \"gList\""
-msgstr "niepoprawny element do dodania do obiektu klasy \"gList\""
+#. R/unit.R: stop("both operands must be units")
+#: R/unit.R:0
+msgid "both operands must be units"
+msgstr "oba operatory muszą być jednostkami"
 
+#. R/grob.R: stop("can only reorder 'children' for a \"gTree\"")
+#: R/grob.R:0
+msgid "can only reorder 'children' for a \"gTree\""
+msgstr "można jedynie zmienić kolejność argumentu 'children' dla \"gTree\""
+
+#. R/grob.R: stop("can only set 'children' for a \"gTree\"")
+#: R/grob.R:0
 msgid "can only set 'children' for a \"gTree\""
 msgstr "można jedynie ustwić dzieci dla \"gTree\""
 
-msgid "'children' must be a \"gList\""
-msgstr "argument 'children' musi być obiektem klasy \"gList\""
+#. R/unit.R: stop("cannot mix signs of indices")
+#. R/unit.R: stop("cannot mix signs of indices")
+#. R/unit.R: stop("cannot mix signs of indices")
+#: R/unit.R:0
+msgid "cannot mix signs of indices"
+msgstr "nie można mieszać znaków indeksów"
 
-msgid "it is only valid to get 'children' from a \"gTree\""
-msgstr "poprawne jest jedynie uzyskanie dzieci z \"gTree\""
+#. R/frames.R: stop("cannot specify more than one of 'side=[\"left\", \"right\"]', 'col', 'col.before', or 'col.after'")
+#: R/frames.R:0
+msgid ""
+"cannot specify more than one of 'side=[\"left\", \"right\"]', 'col', 'col."
+"before', or 'col.after'"
+msgstr ""
+"nie można określić więcej niż jeden z 'side=[\"left\", \"right\"]', 'col', "
+"'col.before', lub 'col.after'"
+
+#. R/primitives.R: stop("corrupt 'arrows' object")
+#. R/primitives.R: stop("corrupt 'arrows' object")
+#. R/primitives.R: stop("corrupt 'arrows' object")
+#: R/primitives.R:0
+msgid "corrupt 'arrows' object"
+msgstr "uszkodzony obiekt 'arrows'"
+
+#. R/curve.R: stop("end points must not be identical")
+#: R/curve.R:0
+msgid "end points must not be identical"
+msgstr "punkty końcowe nie mogą być identyczne"
+
+#. R/grob.R: gettextf("gPath (%s) not found", paste(gPath, name, sep = .grid.pathSep))
+#. R/grob.R: gettextf("gPath (%s) not found", name)
+#: R/grob.R:0
+msgid "gPath (%s) not found"
+msgstr "'gPath' (%s) nie został znaleziony"
+
+#. R/grob.R: gettextf("grob '%s' not found", name)
+#. R/grob.R: gettextf("grob '%s' not found", name)
+#: R/grob.R:0
+msgid "grob '%s' not found"
+msgstr "'grob' (%s) nie został znaleziony"
+
+#. R/grab.R: warning("grob pushed viewports and did not pop/up them (grab MAY not be faithful)")
+#: R/grab.R:0
+msgid ""
+"grob pushed viewports and did not pop/up them (grab MAY not be faithful)"
+msgstr ""
+"'grob' wypchnął okna ekranów i nie wyświetlił ich ('grab' MOŻE nie być "
+"wiarygodny)"
 
+#. R/debug.R: stop("how did we get here?")
+#: R/debug.R:0
+msgid "how did we get here?"
+msgstr "jak się tu dostaliśmy?"
+
+#. R/unit.R: stop("index out of bounds ('unit' subsetting)")
+#: R/unit.R:0
+msgid "index out of bounds ('unit' subsetting)"
+msgstr "indeks poza zakresem (podzbiór 'unit')"
+
+#. R/unit.R: stop("index out of bounds (unit arithmetic subsetting)")
+#: R/unit.R:0
+msgid "index out of bounds (unit arithmetic subsetting)"
+msgstr "indeks poza zakresem (arytmetyczny podzbiór jednostki)"
+
+#. R/unit.R: stop("index out of bounds (unit list subsetting)")
+#: R/unit.R:0
+msgid "index out of bounds (unit list subsetting)"
+msgstr "indeks poza zakresem (podzbiór listy jednostek)"
+
+#. R/grob.R: stop("invalid \"gTree\" class")
+#: R/grob.R:0
 msgid "invalid \"gTree\" class"
 msgstr "niepoprawna klasa \"gTree\""
 
-msgid "'allDevices' not yet implemented"
-msgstr "argument 'allDevices' nie jest jeszcze zaimplementowany"
+#. R/gpar.R: stop("invalid 'alpha' value")
+#: R/gpar.R:0
+msgid "invalid 'alpha' value"
+msgstr "niepoprawna wartość 'alpha'"
 
-msgid "invalid 'gPath'"
-msgstr "niepoprawne wartość 'gPath'"
+#. R/viewport.R: stop("invalid 'angle' in viewport")
+#: R/viewport.R:0
+msgid "invalid 'angle' in viewport"
+msgstr "niepoprawny argument 'angle' w oknie ekranu"
 
-msgid "invalid 'grep' value"
-msgstr "niepoprawna wartość 'grep'"
+#. R/primitives.R: stop("invalid 'arrow' argument")
+#. R/primitives.R: stop("invalid 'arrow' argument")
+#. R/primitives.R: stop("invalid 'arrow' argument")
+#. R/primitives.R: stop("invalid 'arrow' argument")
+#. R/primitives.R: stop("invalid 'arrow' argument")
+#. R/primitives.R: stop("invalid 'arrow' argument")
+#: R/primitives.R:0
+msgid "invalid 'arrow' argument"
+msgstr "niepoprawny argument 'arrow'"
 
-msgid "it is only valid to get a child from a \"gTree\""
-msgstr "poprawne jest jedynie uzyskanie dziecka z \"gTree\""
+#. R/components.R: stop("invalid 'at' location in 'axis'")
+#: R/components.R:0
+msgid "invalid 'at' location in 'axis'"
+msgstr "niepoprawne położenie 'at' w 'axis'"
 
-msgid "'gPath' does not specify a valid child"
-msgstr "'gPath' nie określa poprawnego dziecka"
+#. R/unit.R: stop("invalid 'axis' or 'type'")
+#: R/unit.R:0
+msgid "invalid 'axis' or 'type'"
+msgstr "niepoprawna wartość 'axis' lub 'type'"
 
-msgid "it is only valid to set a child of a \"gTree\""
-msgstr "poprawne jest jedynie ustawienie dziecka \"gTree\""
+#. R/viewport.R: stop("invalid 'clip' value")
+#: R/viewport.R:0
+msgid "invalid 'clip' value"
+msgstr "niepoprawna wartość 'clip'"
 
-msgid "it is only valid to set a 'grob' as child of a \"gTree\""
-msgstr "poprawne jest jedynie ustawienie'grob' jako dziecka \"gTree\""
+#. R/frames.R: stop("invalid 'col' specification")
+#: R/frames.R:0
+msgid "invalid 'col' specification"
+msgstr "niepoprawne określenie 'col'"
 
-msgid "New 'grob' name (%s) does not match 'gPath' (%s)"
-msgstr "Nowa nazwa 'grob' (%s) nie zgadza siÄ™ z 'gPath' (%s)"
+#. R/edit.R: stop("invalid 'edit' information")
+#. R/edit.R: stop("invalid 'edit' information")
+#: R/edit.R:0
+msgid "invalid 'edit' information"
+msgstr "niepoprawne wartość 'edit'"
 
-msgid "it is only valid to add a 'grob' to a \"gTree\""
-msgstr "poprawne jest jedynie dodanie 'grob' do \"gTree\""
+#. R/primitives.R: stop("invalid 'ends' or 'type' argument")
+#. R/primitives.R: stop("invalid 'ends' or 'type' argument")
+#: R/primitives.R:0
+msgid "invalid 'ends' or 'type' argument"
+msgstr "niepoprawny argument 'ends' lub 'type'"
 
-msgid "it is only valid to add a child to a \"gTree\""
-msgstr "poprawne jest jedynie dodanie dziecka do \"gTree\""
+#. R/function.R: stop("invalid 'f'")
+#: R/function.R:0
+msgid "invalid 'f'"
+msgstr "niepoprawna wartość 'f'"
 
-msgid "'gPath' (%s) not found"
-msgstr "'gPath' (%s) nie został znaleziony"
+#. R/frames.R: stop("invalid 'frame'")
+#. R/frames.R: stop("invalid 'frame'")
+#: R/frames.R:0
+msgid "invalid 'frame'"
+msgstr "niepoprawny argument 'frame'"
 
-msgid "it is only valid to remove a child from a \"gTree\""
-msgstr "poprawne jest jedynie usunięcie dziecka do \"gTree\""
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#. R/grob.R: stop("invalid 'gPath'")
+#: R/grob.R:0
+msgid "invalid 'gPath'"
+msgstr "niepoprawne wartość 'gPath'"
 
-msgid "it is only valid to edit a child of a \"gTree\""
-msgstr "poprawna jest jedynie edycja dziecka \"gTree\""
+#. R/grob.R: stop("invalid 'gp' slot")
+#: R/grob.R:0
+msgid "invalid 'gp' slot"
+msgstr "niepoprawne gniazdo 'gp'"
 
-msgid "it is invalid to directly edit the 'children' or 'childrenOrder' slot"
-msgstr ""
-"niepoprawne jest bezpośrednie edytowanie gniazda 'children' lub "
-"'childrenOrder'"
+#. R/viewport.R: stop("invalid 'gp' value")
+#: R/viewport.R:0
+msgid "invalid 'gp' value"
+msgstr "niepoprawna wartość 'gp'"
 
-msgid "invalid 'result'"
-msgstr "niepoprawna wartość 'result'"
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#. R/grob.R: stop("invalid 'grep' value")
+#: R/grob.R:0
+msgid "invalid 'grep' value"
+msgstr "niepoprawna wartość 'grep'"
 
-msgid "the new 'grob' must have the same name as the old 'grob'"
-msgstr "nowy 'grob' musi mieć tę samą nazwę jak stary 'grob'"
+#. R/frames.R: stop("invalid 'grob'")
+#. R/frames.R: stop("invalid 'grob'")
+#: R/frames.R:0
+msgid "invalid 'grob'"
+msgstr "niepoprawny argument 'grob'"
 
-msgid "slot '%s' not found"
-msgstr "gniazdo '%s' nie zostało znalezione"
+#. R/grob.R: stop("invalid 'grob' argument")
+#: R/grob.R:0
+msgid "invalid 'grob' argument"
+msgstr "niepoprawny argument 'grob'"
 
-msgid "gPath (%s) not found"
-msgstr "'gPath' (%s) nie został znaleziony"
+#. R/grob.R: stop("invalid 'grob' class")
+#: R/grob.R:0
+msgid "invalid 'grob' class"
+msgstr "niepoprawna klasa 'grob'"
 
-msgid "grob '%s' not found"
-msgstr "'grob' (%s) nie został znaleziony"
+#. R/viewport.R: stop("invalid 'layout' in viewport")
+#: R/viewport.R:0
+msgid "invalid 'layout' in viewport"
+msgstr "niepoprawny argument 'layout' w oknie ekranu"
 
-msgid "invalid element in the display list"
-msgstr "niepoprawny element w liście wyświetleń"
+#. R/viewport.R: stop("invalid 'layout.pos.col' in viewport")
+#: R/viewport.R:0
+msgid "invalid 'layout.pos.col' in viewport"
+msgstr "niepoprawny argument 'layout.pos.col' w oknie ekranu"
 
-msgid "Invalid force target"
-msgstr "niepoprawny cel 'force'"
+#. R/viewport.R: stop("invalid 'layout.pos.row' in viewport")
+#: R/viewport.R:0
+msgid "invalid 'layout.pos.row' in viewport"
+msgstr "niepoprawny argument 'layout.pos.row' w oknie ekranu"
 
-msgid "Invalid revert target"
-msgstr "niepoprawny cel 'revert'"
+#. R/gpar.R: stop("invalid 'linemitre' value")
+#: R/gpar.R:0
+msgid "invalid 'linemitre' value"
+msgstr "niepoprawna wartość 'linemitre'"
 
-msgid "can only reorder 'children' for a \"gTree\""
-msgstr "można jedynie zmienić kolejność argumentu 'children' dla \"gTree\""
+#. R/ls.R: stop("invalid 'listing'")
+#: R/ls.R:0
+msgid "invalid 'listing'"
+msgstr "niepoprawna wartość 'listing'"
 
-msgid "Invalid 'order'"
-msgstr "niepoprawna wartość 'order'"
+#. R/function.R: stop("invalid 'n'")
+#: R/function.R:0
+msgid "invalid 'n'"
+msgstr "niepoprawny argument 'n'"
 
-msgid "'l' must be a layout"
-msgstr "argument 'l' musi być layoutem"
+#. R/origin.R: stop("invalid 'origin'")
+#: R/origin.R:0
+msgid "invalid 'origin'"
+msgstr "niepoprawna wartość \"origin\""
 
-msgid "'pch' and 'labels' not the same length"
-msgstr "argumenty 'pch' oraz 'labels' nie są tej samej długości"
+#. R/ls.R: stop("invalid 'print' argument")
+#: R/ls.R:0
+msgid "invalid 'print' argument"
+msgstr "niepoprawny argument 'print'"
 
-msgid "'hgap' must be single unit"
-msgstr "'hgap' musi być pojedynczą jednostką"
+#. R/grob.R: stop("invalid 'result'")
+#: R/grob.R:0
+msgid "invalid 'result'"
+msgstr "niepoprawna wartość 'result'"
 
-msgid "'vgap' must be single unit"
-msgstr "'vgap' musi być pojedynczą jednostką"
+#. R/primitives.R: stop("invalid 'rot' value")
+#: R/primitives.R:0
+msgid "invalid 'rot' value"
+msgstr "niepoprawna wartość 'rot'"
 
-msgid "'nrow' must be >= 1"
-msgstr "argument 'nrow' musi mieć wartość >= 1"
+#. R/frames.R: stop("invalid 'row' and/or 'col' (no such cell in frame layout)")
+#: R/frames.R:0
+msgid "invalid 'row' and/or 'col' (no such cell in frame layout)"
+msgstr ""
+"niepoprawne argumenty 'row' oraz/lub 'col' (brak takiej komórki w ramce "
+"layoutu)"
 
-msgid "'ncol' must be >= 1"
-msgstr "argument 'ncol' musi mieć wartość >= 1"
+#. R/frames.R: stop("invalid 'row' specification")
+#: R/frames.R:0
+msgid "invalid 'row' specification"
+msgstr "niepoprawne określenie 'row'"
 
-msgid "nrow * ncol < #{legend labels}"
-msgstr "nrow * ncol < liczba etykiet legendy"
+#. R/unit.R: stop("invalid 'theta'")
+#: R/unit.R:0
+msgid "invalid 'theta'"
+msgstr "niepoprawna wartość 'theta'"
 
-msgid "invalid justification"
-msgstr "niepoprawne justowanie"
+#. R/unit.R: stop("invalid 'unit' object")
+#: R/unit.R:0
+msgid "invalid 'unit' object"
+msgstr "niepoprawny obiekt 'unit'"
 
-msgid "invalid horizontal justification"
-msgstr "niepoprawne poziome justowanie"
+#. R/grob.R: stop("invalid 'vp' slot")
+#: R/grob.R:0
+msgid "invalid 'vp' slot"
+msgstr "niepoprawne gniazdo 'vp'"
 
-msgid "invalid vertical justification"
-msgstr "niepoprawne pionowe justowanie"
+#. R/viewport.R: stop("invalid 'xscale' in viewport")
+#: R/viewport.R:0
+msgid "invalid 'xscale' in viewport"
+msgstr "niepoprawny argument 'xscale' w oknie ekranu"
 
-msgid "'respect' must be logical or an 'nrow' by 'ncol' matrix"
-msgstr ""
-"'respect' musi być wartością logiczną lub macierzą o rozmiarze 'nrow' na "
-"'ncol'"
+#. R/viewport.R: stop("invalid 'yscale' in viewport")
+#: R/viewport.R:0
+msgid "invalid 'yscale' in viewport"
+msgstr "niepoprawny argument 'yscale' w oknie ekranu"
+
+#. R/grab.R: stop("invalid display list element")
+#: R/grab.R:0
+msgid "invalid display list element"
+msgstr "niepoprawne element listy wyświetleń"
+
+#. R/grob.R: stop("invalid element to add to \"gList\"")
+#: R/grob.R:0
+msgid "invalid element to add to \"gList\""
+msgstr "niepoprawny element do dodania do obiektu klasy \"gList\""
 
-msgid "invalid 'print' argument"
-msgstr "niepoprawny argument 'print'"
+#. R/gpar.R: stop("invalid fontface ", ch)
+#: R/gpar.R:0
+msgid "invalid fontface"
+msgstr "niepoprawny krój czcionki"
 
-msgid "invalid object in 'listing'"
-msgstr "niepoprawny obiekt w listing'"
+#. R/just.R: stop("invalid horizontal justification")
+#: R/just.R:0
+msgid "invalid horizontal justification"
+msgstr "niepoprawne poziome justowanie"
 
-msgid "invalid listing"
-msgstr "niepoprawna wartość 'listing'"
+#. R/just.R: stop("invalid justification")
+#. R/just.R: stop("invalid justification")
+#: R/just.R:0
+msgid "invalid justification"
+msgstr "niepoprawne justowanie"
 
-msgid "invalid 'listing'"
+#. R/ls.R: stop("invalid listing")
+#: R/ls.R:0
+msgid "invalid listing"
 msgstr "niepoprawna wartość 'listing'"
 
-msgid "Nothing on the display list"
-msgstr "Nic na liście wyświetlania"
+#. R/grid.R: stop("invalid modification of the display list")
+#: R/grid.R:0
+msgid "invalid modification of the display list"
+msgstr "niepoprawna modyfikacja listy wyświetleń"
 
-msgid "invalid 'origin'"
-msgstr "niepoprawna wartość \"origin\""
+#. R/ls.R: stop("invalid object in 'listing'")
+#: R/ls.R:0
+msgid "invalid object in 'listing'"
+msgstr "niepoprawny obiekt w listing'"
 
-msgid "'length' must be a 'unit' object"
-msgstr "argument 'length' musi być obiektem klasy \"unit\""
+#. R/grid.R: stop("invalid object inserted on the display list")
+#: R/grid.R:0
+msgid "invalid object inserted on the display list"
+msgstr "niepoprawne obiekty wstawione na listę wyświetleń"
 
-msgid "invalid 'ends' or 'type' argument"
-msgstr "niepoprawny argument 'ends' lub 'type'"
+#. R/components.R: stop("invalid to specify axis labels when 'at' is NULL")
+#: R/components.R:0
+msgid "invalid to specify axis labels when 'at' is NULL"
+msgstr ""
+"nie można określać etykiet osi kiedy komponent 'at' argumentu 'x' ma wartość "
+"NULL"
 
-msgid "'x' and 'y' must be units"
-msgstr "argumenty 'x' oraz 'y' muszą być jednostkami"
+#. R/just.R: stop("invalid vertical justification")
+#: R/just.R:0
+msgid "invalid vertical justification"
+msgstr "niepoprawne pionowe justowanie"
 
-msgid "'x' and 'y' must have length 1"
-msgstr "argumenty 'x' oraz 'y' muszą mieć długość 1"
+#. R/unit.R: stop("it is invalid to combine 'unit' objects with other types")
+#: R/unit.R:0
+msgid "it is invalid to combine 'unit' objects with other types"
+msgstr "niepoprawne jest łączenie obiektów 'unit' z innymi typami"
 
-msgid "invalid 'arrow' argument"
-msgstr "niepoprawny argument 'arrow'"
+#. R/grob.R: stop("it is invalid to directly edit the 'children' or 'childrenOrder' slot")
+#: R/grob.R:0
+msgid "it is invalid to directly edit the 'children' or 'childrenOrder' slot"
+msgstr ""
+"niepoprawne jest bezpośrednie edytowanie gniazda 'children' lub "
+"'childrenOrder'"
 
+#. R/primitives.R: stop("it is invalid to specify both 'id' and 'id.lengths'")
+#. R/primitives.R: stop("it is invalid to specify both 'id' and 'id.lengths'")
+#. R/primitives.R: stop("it is invalid to specify both 'id' and 'id.lengths'")
+#. R/primitives.R: stop("it is invalid to specify both 'id' and 'id.lengths'")
+#. R/primitives.R: stop("it is invalid to specify both 'id' and 'id.lengths'")
+#: R/primitives.R:0
 msgid "it is invalid to specify both 'id' and 'id.lengths'"
 msgstr ""
 "nie jest poprawnie określać oba komponenty 'id' oraz 'id.lengths' argumentu "
 "'x'"
 
-msgid "'x' and 'y' must be same length"
-msgstr "argumenty 'x' oraz 'units' muszą mieć tę samą długość"
+#. R/grob.R: stop("it is only valid to add a 'grob' to a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to add a 'grob' to a \"gTree\""
+msgstr "poprawne jest jedynie dodanie 'grob' do \"gTree\""
 
-msgid "'x' and 'y' and 'id' must all be same length"
-msgstr ""
-"komponenty 'x' oraz 'y' oraz 'z' argumentu 'x' muszą wszystkie mieć tę samą "
-"długość"
+#. R/grob.R: stop("it is only valid to add a child to a \"gTree\"")
+#. R/grob.R: stop("it is only valid to add a child to a \"gTree\"")
+#. R/grob.R: stop("it is only valid to add a child to a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to add a child to a \"gTree\""
+msgstr "poprawne jest jedynie dodanie dziecka do \"gTree\""
 
-msgid "'x' and 'y' and 'id.lengths' must specify same overall length"
-msgstr ""
-"komponenty 'x' oraz 'y' oraz 'id.lengths' argumentu 'x' muszą określać tę "
-"samą całościową długość"
+#. R/grob.R: stop("it is only valid to edit a child of a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to edit a child of a \"gTree\""
+msgstr "poprawna jest jedynie edycja dziecka \"gTree\""
 
-msgid "'x0', 'y0', 'x1', and 'y1' must be units"
-msgstr "Wielkości 'x0', 'y0', 'x1', oraz 'y1' muszą być jednostkami"
+#. R/grob.R: stop("it is only valid to get 'children' from a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to get 'children' from a \"gTree\""
+msgstr "poprawne jest jedynie uzyskanie dzieci z \"gTree\""
 
-msgid "'x' and 'y' must be units or NULL"
-msgstr "'x' oraz 'y' muszą być jednostkami"
+#. R/grob.R: stop("it is only valid to get a child from a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to get a child from a \"gTree\""
+msgstr "poprawne jest jedynie uzyskanie dziecka z \"gTree\""
 
-msgid "corrupt 'arrows' object"
-msgstr "uszkodzony obiekt 'arrows'"
+#. R/grob.R: stop("it is only valid to remove a child from a \"gTree\"")
+#. R/grob.R: stop("it is only valid to remove a child from a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to remove a child from a \"gTree\""
+msgstr "poprawne jest jedynie usunięcie dziecka do \"gTree\""
 
-msgid "x and y must be units"
-msgstr "'x' oraz 'y' muszą być jednostkami"
+#. R/grob.R: stop("it is only valid to set a 'grob' as child of a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to set a 'grob' as child of a \"gTree\""
+msgstr "poprawne jest jedynie ustawienie'grob' jako dziecka \"gTree\""
+
+#. R/grob.R: stop("it is only valid to set a child of a \"gTree\"")
+#: R/grob.R:0
+msgid "it is only valid to set a child of a \"gTree\""
+msgstr "poprawne jest jedynie ustawienie dziecka \"gTree\""
 
+#. R/components.R: stop("logical 'label' supplied of length 0")
+#. R/components.R: stop("logical 'label' supplied of length 0")
+#: R/components.R:0
+msgid "logical 'label' supplied of length 0"
+msgstr "dostarczono logiczną wartość argumentu 'label' o długości 0"
+
+#. R/primitives.R: stop("must have exactly 4 control points")
+#: R/primitives.R:0
 msgid "must have exactly 4 control points"
 msgstr "potrzeba mieć dokładnie 4 punkty kontrolne"
 
+#. R/primitives.R: stop("must have exactly 4 control points per Bezier curve")
+#: R/primitives.R:0
 msgid "must have exactly 4 control points per Bezier curve"
 msgstr "potrzeba mieć dokładnie 4 punkty kontrolne na każdą krzywą Beziera"
 
-msgid "'x', 'y', and 'r' must be units"
-msgstr "'x', 'y', oraz 'r' muszą być jednostkami"
-
-msgid "'x', 'y', 'width', and 'height' must be units"
-msgstr "'x', 'y', 'width', oraz 'height' muszą być jednostkami"
+#. R/grid.R: stop("must navigate up at least one viewport")
+#: R/grid.R:0
+msgid "must navigate up at least one viewport"
+msgstr "potrzeba przenieść w górę przynajmniej jedno okno ekranu"
 
-msgid "invalid 'rot' value"
-msgstr "niepoprawna wartość 'rot'"
+#. R/grid.R: stop("must pop at least one viewport")
+#: R/grid.R:0
+msgid "must pop at least one viewport"
+msgstr "potrzeba wyświetlić przynajmniej jedno okno ekranu"
 
-msgid "zero-length 'pch'"
-msgstr "argument 'pch' ma zerową długość"
+#. R/viewport.R: stop("must specify at least one of 'x' or 'xscale'")
+#: R/viewport.R:0
+msgid "must specify at least one of 'x' or 'xscale'"
+msgstr "przynajmniej jeden z 'x' oraz 'xscale' musi być określony"
 
-msgid "'x', 'y' and 'size' must be units"
-msgstr "'x', 'y' oraz 'size' muszą być jednostkami"
+#. R/viewport.R: stop("must specify at least one of 'y' or 'yscale'")
+#: R/viewport.R:0
+msgid "must specify at least one of 'y' or 'yscale'"
+msgstr "tylko jeden z 'font' oraz 'fontface' może być określony"
 
-msgid "'x' and 'y' must be 'unit' objects and have the same length"
-msgstr ""
-"komponenty 'x' oraz 'y' argumentu 'x' muszą być obiektami klasy \"unit\" "
-"oraz muszą mieć tę samą długość"
+#. R/grid.R: stop("must specify at least one viewport")
+#: R/grid.R:0
+msgid "must specify at least one viewport"
+msgstr "przynajmniej jedno okno ekranu musi być określone"
 
-msgid "'x', 'y', 'width', and 'height' must all be units of length 1"
+#. R/frames.R: stop("must specify exactly one of 'side=[\"top\", \"bottom\"]', 'row', 'row.before', or 'row.after'")
+#: R/frames.R:0
+msgid ""
+"must specify exactly one of 'side=[\"top\", \"bottom\"]', 'row', 'row."
+"before', or 'row.after'"
 msgstr ""
-"argumenty 'x', 'y', 'width' oraz 'height' muszą wszystkie być jednostkami o "
-"długości 1"
-
-msgid "'x' and 'y' must all be units of length 1"
-msgstr "'x' oraz 'y' muszą być jednostkami o długości 1"
+"potrzeba określić dokładnie jeden z 'side=[\"top\", \"bottom\"]', 'row', "
+"'row.before', lub 'row.after'"
 
-msgid "'r' must be a 'unit' object"
-msgstr "'r' musi być obiektem klasy \"unit\""
+#. R/gpar.R: stop("must specify only one of 'font' and 'fontface'")
+#: R/gpar.R:0
+msgid "must specify only one of 'font' and 'fontface'"
+msgstr "potrzeba określić tylko jeden z 'font' oraz 'fontface'"
 
-msgid "'x', 'y', 'width', and 'height' must have length 1"
-msgstr "'x', 'y', 'width', oraz 'height' muszą mieć długość 1"
+#. R/gpar.R: stop("must specify only valid 'gpar' names")
+#: R/gpar.R:0
+msgid "must specify only valid 'gpar' names"
+msgstr "potrzeba określić tylko poprawne nazwy 'gpar'"
 
-msgid "'x' and 'units' must have length > 0"
-msgstr "argumenty 'x' oraz 'units' muszą mieć długość > 0"
+#. R/debug.R: stop("must start new page if showing leaves separately")
+#: R/debug.R:0
+msgid "must start new page if showing leaves separately"
+msgstr ""
+"trzeba rozpocząć nową stronę jeśli liście mają być pokazywane oddzielnie"
 
-msgid "'x' argument must be a unit object"
-msgstr "argument 'x' musi być obiektem klasy \"unit\""
+#. R/unit.R: stop("no 'grob' supplied for 'grobwidth/height' unit")
+#: R/unit.R:0
+msgid "no 'grob' supplied for 'grobwidth/height' unit"
+msgstr "nie dostarczono 'grob' dla jednostki 'grobwidth/height'"
 
-msgid "invalid 'axis' or 'type'"
-msgstr "niepoprawna wartość 'axis' lub 'type'"
+#. R/unit.R: stop("no arguments where at least one expected")
+#: R/unit.R:0
+msgid "no arguments where at least one expected"
+msgstr "brak argumentów gdzie oczekiwano przynajmniej jednego"
 
+#. R/unit.R: stop("no string supplied for 'strwidth/height' unit")
+#: R/unit.R:0
 msgid "no string supplied for 'strwidth/height' unit"
 msgstr "nie dostarczono łańcuchów dla jednostki 'strwidth/height'"
 
-msgid "no 'grob' supplied for 'grobwidth/height' unit"
-msgstr "nie dostarczono 'grob' dla jednostki 'grobwidth/height'"
-
-msgid "'gPath' must have depth 1 in 'grobwidth/height' units"
-msgstr "'gPath' musi mieć głębokość 1 w jednostkach 'grobwidth/height'"
-
+#. R/unit.R: stop("non-NULL value supplied for plain unit")
+#: R/unit.R:0
 msgid "non-NULL value supplied for plain unit"
 msgstr "wartość inna niż NULL dostarczona dla zwykłej jednostki"
 
-msgid "operator '%s' not meaningful for units"
-msgstr "operator '%s' nie posiada znaczenia dla jednostek"
-
-msgid "only one operand may be a unit"
-msgstr "tylko jeden operator może być jednostką"
-
+#. R/unit.R: stop("non-unit operand must be numeric")
+#. R/unit.R: stop("non-unit operand must be numeric")
+#: R/unit.R:0
 msgid "non-unit operand must be numeric"
 msgstr "niejednostkowy operator musi być liczbą"
 
-msgid "both operands must be units"
-msgstr "oba operatory muszą być jednostkami"
-
-msgid "'Summary' function '%s' not meaningful for units"
-msgstr "Funkcja 'summary' '%s' nie ma znaczenia dla jednostek"
-
-msgid "no arguments where at least one expected"
-msgstr "brak argumentów gdzie oczekiwano przynajmniej jednego"
-
-msgid "Zero arguments where at least one expected"
-msgstr "Zero argumentów gdzie oczekiwano przynajmniej jednego"
-
-msgid "cannot mix signs of indices"
-msgstr "nie można mieszać znaków indeksów"
-
-msgid "index out of bounds ('unit' subsetting)"
-msgstr "indeks poza zakresem (podzbiór 'unit')"
-
-msgid "index out of bounds (unit arithmetic subsetting)"
-msgstr "indeks poza zakresem (arytmetyczny podzbiór jednostki)"
-
-msgid "index out of bounds (unit list subsetting)"
-msgstr "indeks poza zakresem (podzbiór listy jednostek)"
-
-msgid "it is invalid to combine 'unit' objects with other types"
-msgstr "niepoprawne jest łączenie obiektów 'unit' z innymi typami"
-
-msgid "invalid 'unit' object"
-msgstr "niepoprawny obiekt 'unit'"
-
-msgid "invalid 'theta'"
-msgstr "niepoprawna wartość 'theta'"
-
-msgid "'range' must be numeric"
-msgstr "'range' musi być liczbą"
-
-msgid "invalid 'gp' value"
-msgstr "niepoprawna wartość 'gp'"
-
-msgid "invalid 'clip' value"
-msgstr "niepoprawna wartość 'clip'"
-
-msgid "invalid 'xscale' in viewport"
-msgstr "niepoprawny argument 'xscale' w oknie ekranu"
-
-msgid "invalid 'yscale' in viewport"
-msgstr "niepoprawny argument 'yscale' w oknie ekranu"
+#. R/highlevel.R: stop("nrow * ncol < #{legend labels}")
+#: R/highlevel.R:0
+msgid "nrow * ncol < #{legend labels}"
+msgstr "nrow * ncol < liczba etykiet legendy"
 
-msgid "invalid 'angle' in viewport"
-msgstr "niepoprawny argument 'angle' w oknie ekranu"
+#. R/grab.R: warning("one of more grobs overwritten (grab WILL not be faithful; try 'wrap = TRUE')")
+#: R/grab.R:0
+msgid ""
+"one of more grobs overwritten (grab WILL not be faithful; try 'wrap = TRUE')"
+msgstr ""
+"jeden lub więcej 'grob' nadpisane ('grab' NIE BĘDZIE wiarygodne; spróbuj "
+"'wrap=TRUE')"
 
-msgid "invalid 'layout' in viewport"
-msgstr "niepoprawny argument 'layout' w oknie ekranu"
+#. R/grob.R: stop("only 'grobs' allowed in \"gList\"")
+#: R/grob.R:0
+msgid "only 'grobs' allowed in \"gList\""
+msgstr "tylko 'grobs' sÄ… dozwolone w \"gList\""
 
-msgid "invalid 'layout.pos.row' in viewport"
-msgstr "niepoprawny argument 'layout.pos.row' w oknie ekranu"
+#. R/unit.R: stop("only one operand may be a unit")
+#: R/unit.R:0
+msgid "only one operand may be a unit"
+msgstr "tylko jeden operator może być jednostką"
 
-msgid "invalid 'layout.pos.col' in viewport"
-msgstr "niepoprawny argument 'layout.pos.col' w oknie ekranu"
+#. R/grid.R: stop("only valid to push viewports")
+#: R/grid.R:0
+msgid "only valid to push viewports"
+msgstr "poprawne tylko dla wypychanych okien ekranów"
 
+#. R/viewport.R: stop("only viewports allowed in 'vpList'")
+#: R/viewport.R:0
 msgid "only viewports allowed in 'vpList'"
 msgstr "tylko okna ekranów są dozwolone w 'vpList'"
 
+#. R/viewport.R: stop("only viewports allowed in 'vpStack'")
+#: R/viewport.R:0
 msgid "only viewports allowed in 'vpStack'"
 msgstr "tylko okna ekranów są dozwolone w 'vpStack'"
 
-msgid ""
-"'parent' must be a viewport and 'children' must be a 'vpList' in 'vpTree'"
-msgstr ""
-"argument 'parent' musi być oknem ekranu oraz argument 'children' musi być "
-"'vpList' w 'vpTree'"
-
-msgid "a viewport path must contain at least one viewport name"
-msgstr "ścieżka okna ekranu musi zawierać przynajmniej jedną nazwę okna ekranu"
-
-msgid "must specify at least one of 'x' or 'xscale'"
-msgstr "przynajmniej jeden z 'x' oraz 'xscale' musi być określony"
-
-msgid "must specify at least one of 'y' or 'yscale'"
-msgstr "tylko jeden z 'font' oraz 'fontface' może być określony"
+#. R/unit.R: gettextf("operator '%s' not meaningful for units", .Generic)
+#: R/unit.R:0
+msgid "operator '%s' not meaningful for units"
+msgstr "operator '%s' nie posiada znaczenia dla jednostek"
 
+#. R/zzz.R: warning("shutting down all devices when unloading 'grid' namespace",     call. = FALSE)
+#: R/zzz.R:0
 msgid "shutting down all devices when unloading 'grid' namespace"
 msgstr ""
 "zamykanie wszystkich urządzeń kiedy wykonywane jest zwalnianie przestrzeni "
 "nazw 'grid'"
 
+#. R/grob.R: gettextf("slot '%s' not found", i)
+#: R/grob.R:0
+msgid "slot '%s' not found"
+msgstr "gniazdo '%s' nie zostało znalezione"
+
+#. R/grob.R: stop("the new 'grob' must have the same name as the old 'grob'")
+#. R/grob.R: stop("the new 'grob' must have the same name as the old 'grob'")
+#. R/grob.R: stop("the new 'grob' must have the same name as the old 'grob'")
+#: R/grob.R:0
+msgid "the new 'grob' must have the same name as the old 'grob'"
+msgstr "nowy 'grob' musi mieć tę samą nazwę jak stary 'grob'"
+
+#. R/grob.R: stop("unable to coerce to \"gList\"")
+#: R/grob.R:0
+msgid "unable to coerce to \"gList\""
+msgstr "nie można przekształcić argumentu 'x' na obiekt klasy \"gList\""
+
+#. R/grab.R: warning("viewport overwritten (grab MAY not be faithful)")
+#. R/grab.R: warning("viewport overwritten (grab MAY not be faithful)")
+#: R/grab.R:0
+msgid "viewport overwritten (grab MAY not be faithful)"
+msgstr "okno ekranu nadpisane ('grab' MOŻE nie być wiarygodne)"
+
+#. R/primitives.R: stop("x and y must be units")
+#. R/primitives.R: stop("x and y must be units")
+#: R/primitives.R:0
+msgid "x and y must be units"
+msgstr "'x' oraz 'y' muszą być jednostkami"
+
+#. R/primitives.R: stop("zero-length 'pch'")
+#: R/primitives.R:0
+msgid "zero-length 'pch'"
+msgstr "argument 'pch' ma zerową długość"
+
+#. R/grob.R: ngettext(sum(bad), "invalid grob name", "invalid grob names")
+#: R/grob.R:0
 msgid "invalid grob name"
 msgid_plural "invalid grob names"
 msgstr[0] "niepoprawna nazwa 'grob'"
 msgstr[1] "niepoprawne nazwy 'grob'"
 msgstr[2] "niepoprawne nazwy 'grob'"
 
+#. R/viewport.R: ngettext(sum(bad), "invalid viewport name", "invalid viewport names")
+#: R/viewport.R:0
 msgid "invalid viewport name"
 msgid_plural "invalid viewport names"
 msgstr[0] "niepoprawna nazwa okna ekranu"
 msgstr[1] "niepoprawne nazwy okien ekranu"
 msgstr[2] "niepoprawne nazwy okien ekranu"
 
+#~ msgid "invalid element in the display list"
+#~ msgstr "niepoprawny element w liście wyświetleń"
+
+#~ msgid "Nothing on the display list"
+#~ msgstr "Nic na liście wyświetlania"
+
 #~ msgid "the 'vp' argument is deprecated"
 #~ msgstr "argument 'vp' jest przestarzały"
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-pt_BR.po r-base-3.3.1/src/library/grid/po/R-pt_BR.po
--- r-base-3.2.3/src/library/grid/po/R-pt_BR.po	2014-03-12 23:02:29.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-pt_BR.po	2016-04-27 22:15:16.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-02-27 17:14\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:56-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -318,10 +318,6 @@
 msgstr "Grob '%s' não encontrado"
 
 #, fuzzy
-msgid "invalid element in the display list"
-msgstr "Elemento Inválido na lista de exibição"
-
-#, fuzzy
 msgid "Invalid force target"
 msgstr "'frame' inválido"
 
@@ -392,10 +388,6 @@
 msgstr "listing inválido"
 
 #, fuzzy
-msgid "Nothing on the display list"
-msgstr "Elemento Inválido na lista de exibição"
-
-#, fuzzy
 msgid "invalid 'origin'"
 msgstr "'origin' inválido"
 
@@ -552,6 +544,10 @@
 msgstr "�ndice fora dos limites (tentando fazer subset de lista unitária)"
 
 #, fuzzy
+msgid "Value being assigned must be a unit"
+msgstr "x e y devem ser unidades"
+
+#, fuzzy
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr "É inválido combinar objetos unitários com outros tipos"
 
@@ -641,6 +637,14 @@
 msgstr[1] "Nome(s) de vista inválido(s)"
 
 #, fuzzy
+#~ msgid "invalid element in the display list"
+#~ msgstr "Elemento Inválido na lista de exibição"
+
+#, fuzzy
+#~ msgid "Nothing on the display list"
+#~ msgstr "Elemento Inválido na lista de exibição"
+
+#, fuzzy
 #~ msgid "the 'vp' argument is deprecated"
 #~ msgstr "O argumento \"vp\" é obsoleto"
 
diff -Nru r-base-3.2.3/src/library/grid/po/R-ru.po r-base-3.3.1/src/library/grid/po/R-ru.po
--- r-base-3.2.3/src/library/grid/po/R-ru.po	2015-03-28 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-ru.po	2016-04-27 22:15:16.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-02-27 17:14\n"
-"PO-Revision-Date: 2015-03-26 19:01-0600\n"
+"PO-Revision-Date: 2016-04-05 18:07-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
diff -Nru r-base-3.2.3/src/library/grid/po/ru.po r-base-3.3.1/src/library/grid/po/ru.po
--- r-base-3.2.3/src/library/grid/po/ru.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/ru.po	2016-04-27 22:15:16.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 19:02-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:07-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -18,18 +18,18 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: grid.c:212
 msgid "cannot clip to rotated viewport"
 msgstr "ÎÅ ÍÏÇÕ ÏÂÒÅÚÁÔØ ÄÏ ÐÏ×ÅÒÎÕÔÏÊ ÏËÏÎÎÉÃÙ"
 
-#: grid.c:697 grid.c:702 grid.c:792 grid.c:797
+#: grid.c:697
+#: grid.c:702
+#: grid.c:792
+#: grid.c:797
 msgid "cannot pop the top-level viewport ('grid' and 'graphics' output mixed?)"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÉÚ×ÌÅÞØ ÏËÏÎÎÉÃÕ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ (×Ù×ÏÄÙ 'grid' É 'graphics' "
-"ÓÍÅÛÁÌÉÓØ?)"
+msgstr "ÎÅ ÍÏÇÕ ÉÚ×ÌÅÞØ ÏËÏÎÎÉÃÕ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ (×Ù×ÏÄÙ 'grid' É 'graphics' ÓÍÅÛÁÌÉÓØ?)"
 
 #: grid.c:977
 msgid "attempt to plot on null device"
@@ -87,19 +87,29 @@
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÓÏÓÔÏÑÎÉÅ 'grid'. ïÔËÒÙÔÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÕÓÔÒÏÊÓÔ×?"
 
-#: unit.c:260 unit.c:410 unit.c:1210 unit.c:1290 unit.c:1370 unit.c:1450
+#: unit.c:260
+#: unit.c:410
+#: unit.c:1210
+#: unit.c:1290
+#: unit.c:1370
+#: unit.c:1450
 msgid "unimplemented unit function"
 msgstr "ÎÅ ÒÁÚÒÁÂÏÔÁÎÎÁÑ ÅÄÉÎÉÞÎÁÑ ÆÕÎËÃÉÑ"
 
-#: unit.c:893 unit.c:1645
+#: unit.c:893
+#: unit.c:1645
 msgid "invalid unit or unit not yet implemented"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÉÌÉ ÎÅ ÒÁÚÒÁÂÏÔÁÎÎÁÑ ÅÄÉÎÉÃÁ"
 
-#: unit.c:1702 unit.c:1733
+#: unit.c:1702
+#: unit.c:1733
 msgid "Viewport has zero dimension(s)"
 msgstr "ïËÏÎÎÉÃÁ ÉÍÅÅÔ ÎÏÌØ ÉÚÍÅÒÅÎÉÊ"
 
-#: unit.c:1765 unit.c:1780 unit.c:1795 unit.c:1810
+#: unit.c:1765
+#: unit.c:1780
+#: unit.c:1795
+#: unit.c:1810
 msgid "Unsupported unit conversion"
 msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÁÑ ËÏÎ×ÅÒÓÉÑ ÅÄÉÎÉà ÉÚÍÅÒÅÎÉÑ"
 
@@ -121,3 +131,4 @@
 
 #~ msgid "Invalid circle radius (must be non-negative)"
 #~ msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÒÁÄÉÕÓ ËÒÕÇÁ (ÄÏÌÖÅÎ ÂÙÔØ ÎÅÏÔÒÉÃÁÔÅÌØÎÙÍ)"
+
diff -Nru r-base-3.2.3/src/library/grid/po/R-zh_CN.po r-base-3.3.1/src/library/grid/po/R-zh_CN.po
--- r-base-3.2.3/src/library/grid/po/R-zh_CN.po	2015-03-18 23:02:44.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/R-zh_CN.po	2016-04-27 22:15:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-02-27 17:14\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -261,9 +261,6 @@
 msgid "grob '%s' not found"
 msgstr "�存在grob'%s'这个值"
 
-msgid "invalid element in the display list"
-msgstr "显示�里的�分�对"
-
 #, fuzzy
 msgid "Invalid force target"
 msgstr "'order'的值�对"
@@ -325,10 +322,6 @@
 msgid "invalid 'listing'"
 msgstr "'listing'�对"
 
-#, fuzzy
-msgid "Nothing on the display list"
-msgstr "显示�修改得�对"
-
 msgid "invalid 'origin'"
 msgstr "'origin'的值�对"
 
@@ -461,6 +454,10 @@
 msgid "index out of bounds (unit list subsetting)"
 msgstr "索引值出界(��元串�集时)"
 
+#, fuzzy
+msgid "Value being assigned must be a unit"
+msgstr "x和y必需为�元值"
+
 msgid "it is invalid to combine 'unit' objects with other types"
 msgstr "�能将'unit'对象�其它类别的对象相结�"
 
@@ -527,6 +524,13 @@
 msgid_plural "invalid viewport names"
 msgstr[0] "视��字�对"
 
+#~ msgid "invalid element in the display list"
+#~ msgstr "显示�里的�分�对"
+
+#, fuzzy
+#~ msgid "Nothing on the display list"
+#~ msgstr "显示�修改得�对"
+
 #~ msgid "the 'vp' argument is deprecated"
 #~ msgstr "'vp'�数已���有用"
 
diff -Nru r-base-3.2.3/src/library/grid/po/zh_CN.po r-base-3.3.1/src/library/grid/po/zh_CN.po
--- r-base-3.2.3/src/library/grid/po/zh_CN.po	2015-06-06 22:15:26.000000000 +0000
+++ r-base-3.3.1/src/library/grid/po/zh_CN.po	2016-04-27 22:15:16.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -73,11 +73,11 @@
 msgid "invalid 'layout.pos.col'"
 msgstr "'layout.pos.col'的值�对"
 
-#: matrix.c:49
+#: matrix.c:50
 msgid "singular transformation matrix"
 msgstr "奇异转�矩阵"
 
-#: state.c:169
+#: state.c:170
 msgid "unable to store 'grid' state.  Too many devices open?"
 msgstr "无法�留'grid'的状况。是�是因为你打开了太多的装置?"
 
diff -Nru r-base-3.2.3/src/library/grid/R/debug.R r-base-3.3.1/src/library/grid/R/debug.R
--- r-base-3.2.3/src/library/grid/R/debug.R	2015-08-25 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/grid/R/debug.R	2016-03-16 23:02:44.000000000 +0000
@@ -124,7 +124,7 @@
         # To remove labels use grid.redraw()
         if (is.null(gPath)) {
             # Show the current scene
-            dl <- grid.Call(L_getDisplayList)[1L:grid:::grid.Call(L_getDLindex)]
+            dl <- grid.Call(L_getDisplayList)[1L : grid.Call(L_getDLindex)]
             grid.newpage(recording=FALSE)
             # -1 because first element on DL is ROOT viewport
             lapply(dl[-1],
diff -Nru r-base-3.2.3/src/library/grid/R/grob.R r-base-3.3.1/src/library/grid/R/grob.R
--- r-base-3.2.3/src/library/grid/R/grob.R	2015-08-25 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/grid/R/grob.R	2016-03-16 23:02:44.000000000 +0000
@@ -1694,13 +1694,9 @@
 #   temp <- function() { grid.lines(); grid.rect() }
 #   temp()
 grid.draw <- function(x, recording=TRUE) {
-  UseMethod("grid.draw")
-}
-
-grid.draw.default <- function(x, recording) {
-  # Allow for "holes" in the DL if a grob has been removed
-  if (!is.null(x))
-    stop("invalid element in the display list")
+    # If 'x' is NULL, draw nothing
+    if (!is.null(x))
+        UseMethod("grid.draw")
 }
 
 grid.draw.viewport <- function(x, recording) {
diff -Nru r-base-3.2.3/src/library/grid/R/ls.R r-base-3.3.1/src/library/grid/R/ls.R
--- r-base-3.2.3/src/library/grid/R/ls.R	2015-08-25 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/grid/R/ls.R	2016-03-16 23:02:44.000000000 +0000
@@ -68,12 +68,16 @@
 
 gridListDL <- function(x, grobs=TRUE, viewports=FALSE,
                        fullNames=FALSE, recursive=TRUE) {
-    display.list <- grid.Call(L_getDisplayList)
-    dl.index <- grid.Call(L_getDLindex)
-    result <- lapply(display.list[1L:dl.index], gridList,
-                     grobs=grobs, viewports=viewports,
-                     fullNames=fullNames, recursive=recursive)
-    names(result) <- NULL
+    if (is.null(dev.list())) {
+        result <- list(gridList(NULL))
+    } else {
+        display.list <- grid.Call(L_getDisplayList)
+        dl.index <- grid.Call(L_getDLindex)
+        result <- lapply(display.list[1L:dl.index], gridList,
+                         grobs=grobs, viewports=viewports,
+                         fullNames=fullNames, recursive=recursive)
+        names(result) <- NULL
+    }
     class(result) <- c("gridListListing", "gridListing")
     result
 }
@@ -709,14 +713,7 @@
     }
 
     padPrefix <- function(path, maxLen) {
-        numSpaces <- maxLen - nchar(path)
-        if (length(path) == 1L) {
-            paste0(path, paste(rep.int(" ", numSpaces), collapse=""))
-        } else {
-            padding <- rep(" ", length(path))
-            padding <- mapply(rep.int, padding, numSpaces)
-            paste0(path, sapply(padding, paste, collapse=""))
-        }
+        paste0(path, strrep(" ", maxLen - nchar(path)))
     }
 
     if (!inherits(x, "flatGridListing"))
@@ -790,7 +787,7 @@
         dl <- grid.ls(x, grobs=grobs, viewports=viewports, print = FALSE)
     }
     if (!length(dl$name))
-        stop("Nothing on the display list")
+        return(no.match)
     # Only keep vpListing and grobListing
     names <- names(dl)
     dl <- lapply(dl,
diff -Nru r-base-3.2.3/src/library/grid/R/unit.R r-base-3.3.1/src/library/grid/R/unit.R
--- r-base-3.2.3/src/library/grid/R/unit.R	2015-08-25 22:15:35.000000000 +0000
+++ r-base-3.3.1/src/library/grid/R/unit.R	2016-03-16 23:02:44.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/grid/R/unit.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -34,13 +34,10 @@
 }
 
 valid.unit <- function(x, units, data) {
-  valid.units <- valid.units(units)
-  data <- valid.data(rep(units, length.out=length(x)), data)
-  attr(x, "unit") <- units
-  attr(x, "valid.unit") <- valid.units
-  attr(x, "data") <- data
-  class(x) <- "unit"
-  x
+    structure(x, class = "unit",
+              "valid.unit" = valid.units(units),
+              "data" = valid.data(rep(units, length.out=length(x)), data),
+              "unit" = units)
 }
 
 grid.convert <- function(x, unitTo, axisFrom="x", typeFrom="location",
@@ -165,11 +162,10 @@
             n <- length(data)
         original <- data
         length(data) <- n
-        if (length(original) < length(data)) {
-            for (i in (length(original) + 1):length(data)) {
-                data[[i]] <- original[[(i - 1) %% length(original) + 1]]
-            }
-        }
+        n.o <- length(original)
+        if (n.o < n)
+            for (i in (n.o + 1L):n)
+                data[[i]] <- original[[(i - 1L) %% n.o + 1L]]
     }
     data
 }
@@ -337,16 +333,11 @@
 
 # create a unit list from a unit, unit.arithmetic, or unit.list object
 unit.list <- function(unit) {
-  if (is.unit.list(unit))
-    unit
-  else {
-    l <- length(unit)
-    result <- vector("list", l)
-    for (i in seq_len(l))
-      result[[i]] <- unit[i]
-    class(result) <- c("unit.list", "unit")
-    result
-  }
+    if (is.unit.list(unit))
+	unit
+    else
+	structure(class = c("unit.list", "unit"),
+		  lapply(seq_along(unit), function(i) unit[i]))
 }
 
 is.unit.list <- function(x) {
@@ -354,11 +345,8 @@
 }
 
 as.character.unit.list <- function(x, ...) {
-  l <- length(x)
-  result <- character(l)
-  for (i in seq_len(l))
-    result[i] <- as.character(x[[i]])
-  result
+  ## *apply cannot work on 'x' directly because of "wrong" length()s
+  vapply(seq_along(x), function(i) as.character(x[[i]]), "")
 }
 
 #########################
@@ -369,10 +357,9 @@
   inherits(unit, "unit")
 }
 
-print.unit <- function(x, ...) {
+print.unit <- function(x, ...)
   print(as.character(x), quote=FALSE, ...)
-  invisible(x)
-}
+
 
 #########################
 # Unit subsetting
@@ -388,28 +375,30 @@
 `[.unit` <- function(x, index, top=TRUE, ...) {
   this.length <- length(x)
   if (is.logical(index))
-    index <- (1L:this.length)[index]
-  # Allow for negative integer index
-  if (any(index < 0)) {
-      if (any(index > 0))
-          stop("cannot mix signs of indices")
-      else
-          index <- (1L:this.length)[index]
+      index <- which(index)
+  else { # Allow for negative integer index
+      if (any(index < 0)) {
+          if (any(index > 0))
+              stop("cannot mix signs of indices")
+          else
+              index <- (1L:this.length)[index]
+      }
+      if (top && any(index > this.length))
+          stop("index out of bounds ('unit' subsetting)")
   }
-  if (top && any(index > this.length))
-    stop("index out of bounds ('unit' subsetting)")
   cl <- class(x)
   units <- attr(x, "unit")
   valid.units <- attr(x, "valid.unit")
   data <- attr(x, "data")
   class(x) <- NULL
+  i_1 <- index - 1L
   # The line below may seem slightly odd, but it should only be
   # used to recycle values when this method is called to
   # subset an argument in a unit.arithmetic object
-  x <- x[(index - 1) %% this.length + 1]
-  attr(x, "unit") <- units[(index - 1) %% length(units) + 1]
-  attr(x, "valid.unit") <- valid.units[(index - 1) %% length(valid.units) + 1]
-  data.list <- data[(index - 1) %% length(data) + 1]
+  x <- x[i_1 %% this.length + 1L]
+  attr(x, "unit") <- units[i_1 %% length(units) + 1L]
+  attr(x, "valid.unit") <- valid.units[i_1 %% length(valid.units) + 1L]
+  data.list <- data[i_1 %% length(data) + 1L]
   attr(x, "data") <- data.list
   class(x) <- cl
   x
@@ -420,31 +409,32 @@
 `[.unit.arithmetic` <- function(x, index, top=TRUE, ...) {
   this.length <- length(x)
   if (is.logical(index))
-    index <- (1L:this.length)[index]
-  # Allow for negative integer index
-  if (any(index < 0)) {
+    index <- which(index)
+  else { # Allow for negative integer index
+    if (any(index < 0)) {
       if (any(index > 0))
-          stop("cannot mix signs of indices")
+        stop("cannot mix signs of indices")
       else
-          index <- (1L:this.length)[index]
+        index <- (1L:this.length)[index]
+    }
+    if (top && any(index > this.length))
+      stop("index out of bounds (unit arithmetic subsetting)")
   }
-  if (top && any(index > this.length))
-    stop("index out of bounds (unit arithmetic subsetting)")
-
   repSummaryUnit <- function(x, n) {
-      newUnits <- lapply(seq_len(n), function(z) { get(x$fname)(x$arg1) })
+      val <- get(x$fname)(x$arg1)
+      newUnits <- lapply(integer(n), function(z) val)
       class(newUnits) <- c("unit.list", "unit")
       newUnits
   }
 
   switch(x$fname,
-         "+"=`[`(x$arg1, (index - 1) %% this.length + 1, top=FALSE) +
-             `[`(x$arg2, (index - 1) %% this.length + 1, top=FALSE),
-         "-"=`[`(x$arg1, (index - 1) %% this.length + 1, top=FALSE) -
-             `[`(x$arg2, (index - 1) %% this.length + 1, top=FALSE),
+         "+"=`[`(x$arg1, (index - 1L) %% this.length + 1L, top=FALSE) +
+             `[`(x$arg2, (index - 1L) %% this.length + 1L, top=FALSE),
+         "-"=`[`(x$arg1, (index - 1L) %% this.length + 1L, top=FALSE) -
+             `[`(x$arg2, (index - 1L) %% this.length + 1L, top=FALSE),
          # Recycle multiplier if necessary
-         "*"=x$arg1[(index - 1) %% length(x$arg1) + 1] *
-             `[`(x$arg2, (index - 1) %% this.length + 1, top=FALSE),
+         "*"=`[`(x$arg1, (index - 1L) %% length(x$arg1) + 1L) *
+             `[`(x$arg2, (index - 1L) %% this.length + 1L, top=FALSE),
          "min"=repSummaryUnit(x, length(index)),
          "max"=repSummaryUnit(x, length(index)),
          "sum"=repSummaryUnit(x, length(index)))
@@ -453,23 +443,35 @@
 `[.unit.list` <- function(x, index, top=TRUE, ...) {
   this.length <- length(x)
   if (is.logical(index))
-    index <- (1L:this.length)[index]
-  # Allow for negative integer index
-  if (any(index < 0)) {
+    index <- which(index)
+  else { # Allow for negative integer index
+    if (any(index < 0)) {
       if (any(index > 0))
-          stop("cannot mix signs of indices")
+        stop("cannot mix signs of indices")
       else
-          index <- (1L:this.length)[index]
+        index <- (1L:this.length)[index]
+    }
+    if (top && any(index > this.length))
+      stop("index out of bounds (unit list subsetting)")
   }
-  if (top && any(index > this.length))
-    stop("index out of bounds (unit list subsetting)")
-  cl <- class(x)
-  result <- unclass(x)[(index - 1) %% this.length + 1]
-  class(result) <- cl
-  result
+  structure(class = class(x),
+            unclass(x)[(index - 1L) %% this.length + 1L])
 }
 
-# Write `[<-.unit` methods too ??
+# `[<-.unit` methods
+#
+# The basic approach is to convert everything to a unit.list,
+# unclass (so everything is list), rely on list subassignment, reclass
+
+`[<-.unit` <- function(x, i, value) {
+    if (!is.unit(value))
+        stop("Value being assigned must be a unit")
+    valueList <- unclass(unit.list(value))
+    xList <- unclass(unit.list(x))
+    xList[i] <- valueList
+    class(xList) <- c("unit.list", "unit")
+    xList
+}
 
 #########################
 # str() method
@@ -528,11 +530,10 @@
     }
 }
 
-unit.list.from.list <- function(x) {
-    result <- do.call("c", lapply(x, unit.list))
-    class(result) <- c("unit.list", "unit")
-    result
-}
+unit.list.from.list <- function(x)
+  structure(class = c("unit.list", "unit"),
+            do.call("c", lapply(x, unit.list)))
+
 
 #########################
 # rep'ing unit objects
@@ -786,7 +787,13 @@
                  "mm", "points", "picas", "bigpts",
                  "dida", "cicero", "scaledpts",
                  "strwidth", "strheight", "strascent", "strdescent", "char",
-                 "mylines", "mychar", "mystrwidth", "mystrheight")))
+                 "mylines", "mychar", "mystrwidth", "mystrheight",
+                 # pseudonyms (from unit.c)
+                 "centimetre", "centimetres", "centimeter",  "centimeters",
+                 "in", "inch",
+                 "line",
+                 "millimetre", "millimetres", "millimeter", "millimeters",
+                 "point", "pt")))
 }
 
 # OLD absolute.unit
@@ -796,24 +803,15 @@
 
 absolute.units.unit <- function(unit) {
   n <- length(unit)
-  if (absolute(unit[1L]))
-    abs.unit <- unit[1L]
-  else
-    abs.unit <- unit(1, "null")
-  new.unit <- abs.unit
-  count <- 1
-  while (count < n) {
-    count <- count + 1
-    new.unit <- unit.c(new.unit, absolute.units(unit[count]))
-  }
+  new.unit <- if (absolute(unit[1L])) unit[1L] else unit(1, "null")
+  if(n > 1) for(i in 2L:n)
+    new.unit <- unit.c(new.unit, absolute.units(unit[i]))
   new.unit
 }
 
 absolute.units.unit.list <- function(unit) {
-  cl <- class(unit)
-  abs.ul <- lapply(unit, absolute.units)
-  class(abs.ul) <- cl
-  abs.ul
+  structure(class = class(unit),
+            lapply(unit, absolute.units))
 }
 
 absolute.units.unit.arithmetic <- function(unit) {
@@ -827,5 +825,3 @@
          "max"=unit.arithmetic("max", absolute.units(unit$arg1)),
          "sum"=unit.arithmetic("sum", absolute.units(unit$arg1)))
 }
-
-
diff -Nru r-base-3.2.3/src/library/grid/src/grid.h r-base-3.3.1/src/library/grid/src/grid.h
--- r-base-3.2.3/src/library/grid/src/grid.h	2015-08-25 22:15:37.000000000 +0000
+++ r-base-3.3.1/src/library/grid/src/grid.h	2016-03-16 23:02:45.000000000 +0000
@@ -18,6 +18,7 @@
  *  https://www.R-project.org/Licenses/
  */
 
+#include <R.h>
 #include <Rconfig.h>
 #include <Rinternals.h>
 #include <Rmath.h>
@@ -611,6 +612,8 @@
 /* This is, confusingly, a wrapper for GEcurrentDevice */
 pGEDevDesc getDevice();
 
+void dirtyGridDevice(pGEDevDesc dd);
+
 void getViewportTransform(SEXP currentvp, 
 			  pGEDevDesc dd, 
 			  double *vpWidthCM, double *vpHeightCM,
diff -Nru r-base-3.2.3/src/library/grid/src/matrix.c r-base-3.3.1/src/library/grid/src/matrix.c
--- r-base-3.2.3/src/library/grid/src/matrix.c	2015-08-25 22:15:37.000000000 +0000
+++ r-base-3.3.1/src/library/grid/src/matrix.c	2016-03-16 23:02:45.000000000 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "grid.h" 
+#include <math.h>
 
 /* Code for matrices, matrix multiplication, etc for performing
  *  2D affine transformations:  translations, scaling, and rotations.
diff -Nru r-base-3.2.3/src/library/grid/src/state.c r-base-3.3.1/src/library/grid/src/state.c
--- r-base-3.2.3/src/library/grid/src/state.c	2015-08-25 22:15:37.000000000 +0000
+++ r-base-3.3.1/src/library/grid/src/state.c	2016-03-16 23:02:45.000000000 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "grid.h"
+#include <string.h>
 
 int gridRegisterIndex;
 
@@ -240,26 +241,41 @@
 		/* The graphics engine is about to replay the display list
 		 * So we "clear" the device and reset the grid graphics state
 		 */
-		/* There are two main situations in which this occurs:
-		 * (i) a screen is resized
-		 *     In this case, it is ok-ish to do a GENewPage
-		 *     because that has the desired effect and no 
-		 *     undesirable effects because it only happens on
-		 *     a screen device -- a new page is the same as
-		 *     clearing the screen
-		 * (ii) output on one device is copied to another device
-		 *     In this case, a GENewPage is NOT a good thing, however,
-		 *     here we will start with a new device and it will not
-		 *     have any grid output so this section will not get called
-		 *     SO we will not get any unwanted blank pages.
-		 *
-		 * All this is a bit fragile;  ultimately, what would be ideal
-		 * is a dev->clearPage primitive for all devices in addition
-		 * to the dev->newPage primitive
+		/* 
+                 * ONLY start a new page if 'grid' drawing is first entry
+                 * on the DL.
+                 * Determine this by checking for "C_par" or "C_plot_new"
+                 * at head of DL (assumes that 'graphics' is only other
+                 * possible graphics system).
+                 * This is a NASTY solution to a RARE problem.
+                 * RARE because it will only occur when resizing a 
+                 * window, copying between devices, or replaying a
+                 * recorded plot when the engine DL contains a mix
+                 * of 'graphics' and 'grid'.
+                 * NASTY because it requires 'grid' to know about
+                 * 'graphics' internals and the engine DL internals.
 		 */ 
-		currentgp = gridStateElement(dd, GSS_GPAR);
-		gcontextFromgpar(currentgp, 0, &gc, dd);
-		GENewPage(&gc, dd);
+                /* 'data' is engine DL */
+                if (data != R_NilValue) {
+                    SEXP firstDLentry = CAR(data);
+                    SEXP args = CADR(firstDLentry);
+                    int newpage = 1;
+                    if (isVector(CAR(args))) {
+                        SEXP name = VECTOR_ELT(CAR(args), 0);
+                        if (isString(name) &&
+                            (!strcmp(CHAR(STRING_ELT(name, 0)), 
+                                     "C_par") ||
+                             !strcmp(CHAR(STRING_ELT(name, 0)), 
+                                     "C_plot_new"))) {
+                            newpage = 0;
+                        }
+                    }
+                    if (newpage) {
+                        currentgp = gridStateElement(dd, GSS_GPAR);
+                        gcontextFromgpar(currentgp, 0, &gc, dd);
+                        GENewPage(&gc, dd);
+                    }
+                }
 		initGPar(dd);
 		initVP(dd);
 		initOtherState(dd);
@@ -276,16 +292,128 @@
 	}
 	break;
     case GE_CopyState:
+        { 
+            if (!isNull(gridStateElement(dd, GSS_DL))) {
+                int dlIndex = INTEGER(gridStateElement(dd, GSS_DLINDEX))[0];
+                if (dlIndex > 0) {
+                    /* called from GEcopyDisplayList */
+                    pGEDevDesc curdd = GEcurrentDevice();
+                    /* See GE_RestoreSnapshotState for explanation of this 
+                     * dirtying 
+                     */
+                    SEXP gsd, griddev;
+                    gsd = (SEXP) curdd->gesd[gridRegisterIndex]->systemSpecific;
+                    PROTECT(griddev = allocVector(LGLSXP, 1));
+                    LOGICAL(griddev)[0] = TRUE;
+                    SET_VECTOR_ELT(gsd, GSS_GRIDDEVICE, griddev);
+                    UNPROTECT(1);
+                    GEdirtyDevice(curdd);
+                    setGridStateElement(curdd, GSS_DL, 
+                                        gridStateElement(dd, GSS_DL));
+                    setGridStateElement(curdd, GSS_DLINDEX, 
+                                        gridStateElement(dd, GSS_DLINDEX));
+                }
+            }
+        }
 	break;
     case GE_CheckPlot:
 	PROTECT(valid = allocVector(LGLSXP, 1));
 	LOGICAL(valid)[0] = TRUE;
 	UNPROTECT(1);
 	result = valid;
+        break;
     case GE_SaveSnapshotState:
+        {
+            SEXP pkgName;
+            /*
+             * Save the current 'grid' DL.
+             */
+            PROTECT(result = allocVector(VECSXP, 2));
+            SET_VECTOR_ELT(result, 0, gridStateElement(dd, GSS_DL));
+            SET_VECTOR_ELT(result, 1, gridStateElement(dd, GSS_DLINDEX));
+            PROTECT(pkgName = mkString("grid"));
+            setAttrib(result, install("pkgName"), pkgName);
+            UNPROTECT(2);
+        }
 	break;
     case GE_RestoreSnapshotState:
-	break;
+        { 
+            int i, nState = LENGTH(data) - 1;
+            SEXP gridState, snapshotEngineVersion;
+            PROTECT(gridState = R_NilValue);
+            /* Prior to engine version 11, "pkgName" was not stored.
+             * (can tell because "engineVersion" was not stored either.)
+             * Assume 'grid' is second state in snapshot
+             * (or first, if only one state)
+             * (though this could be fatal).
+             */
+            PROTECT(snapshotEngineVersion = 
+                    getAttrib(data, install("engineVersion")));
+            if (isNull(snapshotEngineVersion)) {
+                gridState = VECTOR_ELT(data, imin2(nState, 2));
+            } else {
+                for (i=0; i<nState; i++) {
+                    SEXP state = VECTOR_ELT(data, i + 1);
+                    if (!strcmp(CHAR(STRING_ELT(getAttrib(state, 
+                                                          install("pkgName")), 
+                                                0)), 
+                                "grid")) {
+                        gridState = state;
+                    }
+                }
+            }
+            /* The recorded plot may have been recorded WITHOUT 'grid' loaded
+             * OR it might have been recorded with 'grid' loaded, but WITHOUT
+             * any grid drawing
+             */
+            if (!isNull(gridState) && !isNull(VECTOR_ELT(gridState, 0))) {
+                int dlIndex = INTEGER(VECTOR_ELT(gridState, 1))[0];
+                if (dlIndex > 0) {
+                    /*
+                     * Dirty the device, in a 'grid' sense, 
+                     * (in case this is first 'grid' drawing on device) 
+                     * to stop first element on 'grid' DL
+                     * (which will be a call to L_gridDirty()) 
+                     * from resetting the 'grid' DL.
+                     * This will have the side effect of stopping L_gridDirty()
+                     * from starting a new page (if the device is clean)
+                     * which is important because this 
+                     * GE_RestoreSnapshotState will be followed by 
+                     * GE_RestoreState, which will start a new page
+                     * (and which will call initVP() by the way).
+                     *
+                     * NOTE to my future self:  don't try to do this with
+                     * a call to dirtyGridDevice() - seriously, I tried it
+                     * and it's a BAD idea.  The logic and interactions
+                     * with device drivers is just insanely complicated.
+                     * Leave it alone.
+                     */
+                    if (!LOGICAL(gridStateElement(dd, GSS_GRIDDEVICE))[0]) {
+                        SEXP gsd, griddev;
+                        gsd = (SEXP) dd->gesd[gridRegisterIndex]->systemSpecific;
+                        PROTECT(griddev = allocVector(LGLSXP, 1));
+                        LOGICAL(griddev)[0] = TRUE;
+                        SET_VECTOR_ELT(gsd, GSS_GRIDDEVICE, griddev);
+                        UNPROTECT(1);
+                        /* If the device is 'grid' dirty, make sure it is
+                         * also dirty overall
+                         */
+                        GEdirtyDevice(dd);
+                    }
+                    /*
+                     * Restore the saved 'grid' DL.
+                     * (the 'grid' vpTree will be recreated by replay of 
+                     *  'grid' DL)
+                     */
+                    setGridStateElement(dd, GSS_DL, 
+                                        VECTOR_ELT(gridState, 0));
+                    setGridStateElement(dd, GSS_DLINDEX, 
+                                        VECTOR_ELT(gridState, 1));
+                }
+            }
+            UNPROTECT(2);
+        }
+        break;
     case GE_ScalePS:
 	/*
 	 * data is a numeric scale factor
diff -Nru r-base-3.2.3/src/library/grid/tests/testls.Rout.save r-base-3.3.1/src/library/grid/tests/testls.Rout.save
--- r-base-3.2.3/src/library/grid/tests/testls.Rout.save	2015-12-03 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/grid/tests/testls.Rout.save	2016-06-14 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -340,4 +340,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.184   0.014   0.187 
+  0.213   0.023   0.225 
diff -Nru r-base-3.2.3/src/library/grid/tests/units.R r-base-3.3.1/src/library/grid/tests/units.R
--- r-base-3.2.3/src/library/grid/tests/units.R	2010-11-25 23:05:03.000000000 +0000
+++ r-base-3.3.1/src/library/grid/tests/units.R	2016-03-16 23:02:45.000000000 +0000
@@ -133,3 +133,39 @@
 stopifnot(length(unit.pmax(x)) == 1L, length(unit.pmin(x)) == 1L)
 ## was 3 in R <= 2.12.0
 
+# Unit subassignment
+a <- unit(1:3, c("cm", "in", "npc"))
+b <- a + unit(1, "npc")
+a[2] <- unit(2,"pt")
+b[2] <- unit(2,"npc")
+
+unitCheck(a, unit(1:3, c("cm", "pt", "npc")))
+unitCheck(b, unit.c(unit(1, "cm") + unit(1, "npc"),
+                    unit(2, "npc"),
+                    unit(3, "npc") + unit(1, "npc")))
+
+c <- unit(1:10, "mm")
+
+# assign to range
+c[5:9] <- unit(9:5, "pt")
+unitCheck(c, unit(c(1:4, 9:5, 10),
+                  c(rep("mm", 4), rep("pt", 5), "mm")))
+
+# recycle
+c[2:3] <- unit(1, "in") + unit(.5, "npc")
+unitCheck(c, unit.c(unit(1, "mm"),
+                    rep(unit(1, "in") + unit(.5, "npc"), 2),
+                    unit(4, "mm"),
+                    unit(9:5, "pt"),
+                    unit(10, "mm")))
+
+# recycle non-multiple
+c[6:8] <- stringWidth(c("a", "b"))
+unitCheck(c, unit.c(unit(1, "mm"),
+                    rep(unit(1, "in") + unit(.5, "npc"), 2),
+                    unit(4, "mm"),
+                    unit(9, "pt"),
+                    stringWidth(c("a", "b", "a")),
+                    unit(5, "pt"),
+                    unit(10, "mm")))
+
diff -Nru r-base-3.2.3/src/library/methods/DESCRIPTION.in r-base-3.3.1/src/library/methods/DESCRIPTION.in
--- r-base-3.2.3/src/library/methods/DESCRIPTION.in	2015-08-31 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/methods/DESCRIPTION.in	2016-03-16 23:03:41.000000000 +0000
@@ -1,7 +1,7 @@
 Package: methods
 Version: @VERSION@
 Priority: base
-Imports: utils
+Imports: utils, stats
 Title: Formal Methods and Classes
 Author: R Core Team
 Maintainer: R Core Team <R-core@r-project.org>
diff -Nru r-base-3.2.3/src/library/methods/man/languageEl.Rd r-base-3.3.1/src/library/methods/man/languageEl.Rd
--- r-base-3.2.3/src/library/methods/man/languageEl.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/languageEl.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -15,7 +15,6 @@
 languageEl(object, which)
 
 isGrammarSymbol(symbol)
-
 }
 \section{Summary of Functions}{
   \describe{
diff -Nru r-base-3.2.3/src/library/methods/man/MethodsList.Rd r-base-3.3.1/src/library/methods/man/MethodsList.Rd
--- r-base-3.2.3/src/library/methods/man/MethodsList.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/MethodsList.Rd	2016-03-16 23:03:42.000000000 +0000
@@ -1,13 +1,15 @@
 % File src/library/methods/man/MethodsList.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{MethodsList}
 \title{MethodsList Objects}
 %
-\alias{listFromMlist}
-\alias{linearizeMlist}
+\alias{listFromMlist}%  only used in listFromMlist(), deprecated below
+\alias{linearizeMlist}% only used in showMlist(), deprecated below
+%
+% but finalDefaultMethod() and loadMethod() seem somewhat important :
 \alias{finalDefaultMethod}
 \alias{loadMethod}
 \alias{loadMethod-methods}
@@ -28,7 +30,7 @@
 \alias{MethodsListSelect}
 \description{
   These functions create and manipulate \code{MethodsList} objects, the
-  objects formerly used in R to store methods for dispatch.  Use of
+  objects formerly used in \R to store methods for dispatch.  Use of
   these objects is deprecated since \R 3.2.0, as it will rarely be a
   good idea.  Where methods dispatch is
   to be studied, see \code{\link{selectMethod}}.  For computations
diff -Nru r-base-3.2.3/src/library/methods/man/Methods.Rd r-base-3.3.1/src/library/methods/man/Methods.Rd
--- r-base-3.2.3/src/library/methods/man/Methods.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/Methods.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -540,7 +540,7 @@
 
 
 setClass("classA", contains = "numeric",
-   representation(realData = "numeric"))
+         representation(realData = "numeric"))
 
 Math.classA <- function(x) {(getFunction(.Generic))(x@realData)}
 setMethod("Math", "classA", Math.classA)
@@ -554,7 +554,7 @@
 
 y <- new("classB", x)
 
-stopifnot(identical(abs(y), 1:10)) # (version 2.9.0 or earlier fails here)
+stopifnot(identical(abs(y), abs(x))) # (version 2.9.0 or earlier fails here)
 
 ## an S3 generic: just for demonstration purposes
 f3 <- function(x, ...) UseMethod("f3")
diff -Nru r-base-3.2.3/src/library/methods/man/MethodSupport.Rd r-base-3.3.1/src/library/methods/man/MethodSupport.Rd
--- r-base-3.2.3/src/library/methods/man/MethodSupport.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/MethodSupport.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -5,13 +5,12 @@
 
 \name{MethodSupport}
 \title{Additional (Support) Functions for Methods}
-\alias{OldEvalSelectedMethod}
 \alias{getMethodsForDispatch}
 \alias{cacheMethod}
 \alias{resetGeneric}
 \alias{listFromMethods}
 \description{
-  These are support routines for computations on formal methods.
+  These are \emph{internal} support routines for computations on formal methods.
 }
 \usage{
 listFromMethods(generic, where, table)
diff -Nru r-base-3.2.3/src/library/methods/man/methodUtilities.Rd r-base-3.3.1/src/library/methods/man/methodUtilities.Rd
--- r-base-3.2.3/src/library/methods/man/methodUtilities.Rd	2015-08-25 22:17:14.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/methodUtilities.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -20,9 +20,9 @@
 \alias{methodSignatureMatrix}
 \title{Utility Functions for Methods and S-Plus Compatibility}
 \description{
-  These are utilities, currently in the \pkg{methods} package, that
-  either provide some functionality needed by the package (e.g., element
-  matching by name), or add compatibility with S-Plus, or both.
+  These are \emph{internal} utilities, currently in the \pkg{methods}
+  package, that either provide some functionality needed by the package
+  (e.g., element matching by name), or add compatibility with S-Plus, or both.
 }
 \usage{
 functionBody(fun=sys.function(sys.parent()))
@@ -37,7 +37,7 @@
 
 formalArgs(def)
 
-Quote()
+Quote(expr)
 
 showDefault(object, oldMethods = TRUE)
 
@@ -54,9 +54,12 @@
     \item{\code{getFunction}:}{
       find the object as a function.
     }
+    \item{\code{el}:}{\code{el(object, i)} is equivalent to
+      \code{object[i][[1]]} (and should typically be replaceable by object[[i]]).
+    }
     \item{\code{elNamed}:}{
       get the element of the vector corresponding to name.  Unlike the
-      \code{[}, \code{[[}, and \code{$} operators, this function %$
+      \code{\link{[}}, \code{\link{[[}}, and \code{\link{$}} operators, this function
       requires \code{name} to match the element name exactly (no partial
       matching).
     }
@@ -89,12 +92,15 @@
       \code{.isMethodsDispatchOn(FALSE)}---a very gutsy thing to do),
       calling this function should turn dispatch back on again.
     }
-  \item{\code{methodSignatureMatrix}:}{
+    \item{\code{methodSignatureMatrix}:}{
       Returns a matrix with the contents of the specified slots as
       rows.  The slots should be named character strings of the same
       length.  Basically used to turn the signatures of a
       \code{"MethodDefinition"} object into a matrix for printing.
     }
+    \item{\code{Quote}:}{is a synonym of \code{\link{quote}()} and
+      considered deprecated.
+    }
   }
 }
 \keyword{internal}
diff -Nru r-base-3.2.3/src/library/methods/man/refClass.Rd r-base-3.3.1/src/library/methods/man/refClass.Rd
--- r-base-3.2.3/src/library/methods/man/refClass.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/refClass.Rd	2016-03-16 23:03:42.000000000 +0000
@@ -99,9 +99,11 @@
 in the section \dQuote{Reference Object Generators}.
 
 If a \code{finalize} method is defined, a function will be
-\link[=reg.finalizer]{registered} to invoke it before the environment
-in the object is discarded by the garbage collector. See the matrix
-viewer example for both initialize and finalize methods.}
+\link[=reg.finalizer]{registered} to invoke it before the environment in
+the object is discarded by the garbage collector; finalizers are
+registered with \code{atexit=TRUE}, and so are also run at the end of
+\R{} sessions. See the matrix viewer example for both initialize and
+finalize methods.}
 
   \item{where}{
 the environment in which to store the class definition (or to begin the
@@ -563,6 +565,12 @@
 They are more work to write, harder to read and (slightly) slower to
 execute.
 
+\emph{NOTE:} If you are the author of a package whose reference
+classes are likely to be subclassed in other packages, you can avoid
+these questions entirely by writing methods that \emph{only} use
+exported functions from your package, so that all the methods will
+work from another package that imports yours.
+
 }
 
 \section{Reference Class Generators}{
diff -Nru r-base-3.2.3/src/library/methods/man/RMethodUtils.Rd r-base-3.3.1/src/library/methods/man/RMethodUtils.Rd
--- r-base-3.2.3/src/library/methods/man/RMethodUtils.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/RMethodUtils.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -16,6 +16,7 @@
 \alias{PossibleMethod-class}
 \alias{optionalMethod-class}
 \alias{derivedDefaultMethod-class}
+\alias{internalDispatchMethod-class}
 %%
 \alias{substituteFunctionArgs}
 \alias{makeGeneric}
@@ -61,7 +62,7 @@
 getGroupMembers(group, recursive = FALSE, character = TRUE)
 
 getMethodsMetaData(f, where)
-assignMethodsMetaData (f, value, fdef, where, deflt)
+assignMethodsMetaData (f, value, fdef, where)
 
 makeGeneric(f, fdef, fdefault =, group=list(), valueClass=character(),
             package =, signature = NULL, genericFunction = NULL,
diff -Nru r-base-3.2.3/src/library/methods/man/S3Part.Rd r-base-3.3.1/src/library/methods/man/S3Part.Rd
--- r-base-3.2.3/src/library/methods/man/S3Part.Rd	2015-08-25 22:17:14.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/S3Part.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -1,9 +1,10 @@
 % File src/library/methods/man/S3Part.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2008 R Core Team
+% Copyright 2008-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{S3Part}
+\title{ S3-style Objects and S4-class Objects}
 \alias{S3Part}
 \alias{S3Part<-}
 \alias{S3Class}
@@ -16,24 +17,20 @@
 \alias{coerce,oldClass,S3-method}
 \alias{coerce,ANY,S4-method}
 \alias{S3-class}
-\title{ S3-style Objects and S4-class Objects}
 \description{
   Old-style (S3) classes may be registered as S4 classes (by calling
-  \code{\link{setOldClass}}, and many have been.  These classes can
-  then be contained in (that is, superclasses of) regular S4 classes, allowing formal methods
-  and slots to be added to the S3 behavior.  The function
-  \code{S3Part} extracts or replaces
-  the S3 part of such an object.
+  \code{\link{setOldClass}}), and many have been.  These classes can
+  then be contained in (that is, superclasses of) regular S4 classes,
+  allowing formal methods and slots to be added to the S3 behavior.  The
+  function \code{S3Part} extracts or replaces the S3 part of such an object.
   \code{S3Class} extracts or
   replaces the S3-style class.  \code{S3Class} also applies to object
   from an S4 class with \code{S3methods=TRUE} in the call to \code{\link{setClass}}.
 
-See the details below.
-  Also discussed are S3 <-> S4 coercion; see the section
-  \dQuote{S3 and S4 objects}
+  See the details below.  Also discussed are S3 <-> S4 coercion; see the
+  section \dQuote{S3 and S4 objects}
 }
 \usage{
-
 S3Part(object, strictS3 = FALSE, S3Class)
 
 S3Part(object, strictS3 = FALSE, needClass = ) <- value
@@ -45,54 +42,46 @@
 isXS3Class(classDef)
 
 slotsFromS3(object)
-
 }
-%- maybe also 'usage' for other objects documented here.
 \arguments{
-
-  \item{object}{ An object from some class that extends a registered
-      S3 class,
-      usually because the class has as
-      one of its superclasses an S3 class registered by a call to
-      \code{\link{setOldClass}}, or from a class that extends a basic
-      vector, matrix or array object type.  See the details.
-
-      For most of the functions, an S3 object can also be supplied,
-      with the interpretation that it is its own S3 part.
- }
-    \item{strictS3}{  If \code{TRUE}, the value returned by
-        \code{S3Part} will be an S3 object, with all the S4 slots
-        removed.  Otherwise, an S4 object will always
-        be returned; for example, from the S4 class created by
-  \code{\link{setOldClass}} as a proxy for an S3 class, rather than
-  the underlying S3 object.
-        }
-  \item{S3Class}{ The character vector to be stored as the S3 class
-      slot in the object.  Usually, and by default, retains
-      the slot from \code{object}.
-      }
+  \item{object}{an object from some class that extends a registered
+    S3 class, usually because the class has as
+    one of its superclasses an S3 class registered by a call to
+    \code{\link{setOldClass}}, or from a class that extends a basic
+    vector, matrix or array object type.  See the details.
+
+    For most of the functions, an S3 object can also be supplied,
+    with the interpretation that it is its own S3 part.
+  }
+  \item{strictS3}{If \code{TRUE}, the value returned by
+    \code{S3Part} will be an S3 object, with all the S4 slots
+    removed.  Otherwise, an S4 object will always
+    be returned; for example, from the S4 class created by
+    \code{\link{setOldClass}} as a proxy for an S3 class, rather than
+    the underlying S3 object.
+  }
+  \item{S3Class}{the \code{\link{character}} vector to be stored as the
+    S3 class slot in the object.  Usually, and by default, retains
+    the slot from \code{object}.
+  }
 
   \item{needClass}{Require that the replacement value be this class or a
-      subclass of it.
-      }
-
-  \item{value}{ For \code{S3Part<-}, the replacement value for the S3 part of the object.
-      This does \emph{not} need to be an S4 object; in fact, the
-      usual way to create objects from these classes is by giving an
-      S3 object of the right class as an argument to
-      \code{\link{new}}.
-
-      For \code{S3Class<-}, the character vector that will be used as
-      a proxy for \code{class(x)} in S3 method dispatch.  This
-      replacement function can be used to control S3 per-object method
-      selection.
-    }
-
-
-    \item{classDef}{ A class definition object, as returned by \code{\link{getClass}}.
-        }
+    subclass of it.}
 
+  \item{value}{For \code{S3Part<-}, the replacement value for the
+    S3 part of the object.  This does \emph{not} need to be an S4
+    object; in fact, the usual way to create objects from these
+    classes is by giving an S3 object of the right class as an
+    argument to \code{\link{new}}.
+
+    For \code{S3Class<-}, the character vector that will be used as
+    a proxy for \code{class(x)} in S3 method dispatch.  This
+    replacement function can be used to control S3 per-object method
+    selection.
+  }
 
+  \item{classDef}{a class definition object, as returned by
+    \code{\link{getClass}}.}
 }
 \details{
   Classes that register S3 classes by a call to
@@ -114,9 +103,10 @@
   an S3 class corresponding to the value in the prototype or to an
   (S3) subclass of that value.  See the examples below.
 
-  \code{S3Part()}  with \code{strictS3 = TRUE} constructs the underlying S3 object by eliminating
+  \code{S3Part()} with \code{strictS3 = TRUE} constructs the underlying
+  S3 object by eliminating
   all the formally defined slots and turning off the S4 bit of the
-  object.  With  \code{strictS3 = FALSE} the object returned is from
+  object.  With \code{strictS3 = FALSE} the object returned is from
   the corresponding S4 class.  For consistency and generality,
   \code{S3Part()} works also for classes that extend the basic vector,
   matrix and array classes.  Since \R is somewhat arbitrary about what
@@ -226,6 +216,7 @@
  \emph{Programming with Data}
  Springer (For the original S4 version.)
 }
+\seealso{  \code{\link{setOldClass}} }
 \examples{
 ## two examples extending S3 class "lm", class "xlm" directly
 ## and "ylm" indirectly
@@ -239,9 +230,9 @@
 lm.D9 <- lm(weight ~ group)
 }
 ## lm.D9 is as computed in the example for stats::lm
-y1 = new("ylm", lm.D9, header = "test", eps = .1)
-xx = new("xlm", lm.D9, eps =.1)
-y2 = new("ylm", xx, header = "test")
+y1 <- new("ylm", lm.D9, header = "test", eps = .1)
+xx <- new("xlm", lm.D9, eps =.1)
+y2 <- new("ylm", xx, header = "test")
 stopifnot(inherits(y2, "lm"))
 stopifnot(identical(y1, y2))
 stopifnot(identical(S3Part(y1, strict = TRUE), lm.D9))
@@ -249,7 +240,7 @@
 ## note the these classes can insert an S3 subclass of "lm" as the S3 part:
 myData <- data.frame(time = 1:10, y = (1:10)^.5)
 myLm <- lm(cbind(y, y^3)  ~ time, myData) # S3 class: c("mlm", "lm")
-ym1 = new("ylm", myLm, header = "Example", eps = 0.)
+ym1 <- new("ylm", myLm, header = "Example", eps = 0.)
 
 ##similar classes to "xlm" and "ylm", but extending S3 class c("mlm", "lm")
 setClass("xmm", representation(eps = "numeric"), contains = "mlm")
@@ -259,6 +250,8 @@
 
 # but for class "ymm", an S3 part of class "lm" is an error:
 try(new("ymm", lm.D9, header = "Example2", eps = .001))
+\dontshow{tools::assertError(
+    new("ymm", lm.D9, header = "Example2", eps = .001))}
 
 setClass("dataFrameD", representation(date = "Date"),
          contains = "data.frame")
@@ -267,21 +260,18 @@
 ## S3Part() applied to classes with a data part (.Data slot)
 
 setClass("NumX", contains="numeric", representation(id="character"))
-nn = new("NumX", 1:10, id="test")
+nn <- new("NumX", 1:10, id="test")
 stopifnot(identical(1:10, S3Part(nn, strict = TRUE)))
 
-m1 = cbind(group, weight)
+m1 <- cbind(group, weight)
 setClass("MatX", contains = "matrix", representation(date = "Date"))
-mx1 = new("MatX", m1, date = Sys.Date())
+mx1 <- new("MatX", m1, date = Sys.Date())
 stopifnot(identical(m1, S3Part(mx1, strict = TRUE)))
 
 \dontshow{
-
 for(cl in c("ylm", "xlm", "ymm", "xmm", "dataFrameD", "NumX", "MatX"))
     removeClass(cl)
-
 }
 }
-\seealso{  \code{\link{setOldClass}} }
 \keyword{ programming }
 \keyword{ classes }
diff -Nru r-base-3.2.3/src/library/methods/man/setClass.Rd r-base-3.3.1/src/library/methods/man/setClass.Rd
--- r-base-3.2.3/src/library/methods/man/setClass.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/setClass.Rd	2016-05-17 22:15:08.000000000 +0000
@@ -37,8 +37,7 @@
     It is allowed to provide an unnamed character vector as a limiting
     case, with the elements taken as slot names and all slots having
     the unrestricted class \code{"ANY"}.
-
-    }
+  }
   \item{contains}{ the names (and optionally package slots) for the
     \emph{superclasses} of this class.  The special superclass
     \code{"VIRTUAL"} causes the new class to be created as a
@@ -58,21 +57,22 @@
     its argument is a valid object of this class and one or more strings
     describing the failures otherwise).  See \code{\link{validObject}}
     for details.}
-  \item{S3methods, representation, access, version }{ All these
-      arguments are deprecated from version 3.0.0 of \R and should be
-      avoided.
-      
-      \code{S3methods} is a flag indicating that old-style methods
-      will be written involving this class.  Modern versions of \R
-      attempt to match formal and old-style methods consistently, so
-      this argument is largely irrelevant.
-
-      \code{representation} is an argument inherited from S that
-      included both \code{slots} and \code{contains}, but the use of
-      the latter two arguments is clearer and recommended.
+  \item{S3methods, representation, access, version }{All these
+    arguments are deprecated from version 3.0.0 of \R and should be
+    \emph{avoided}.
+
+    \code{S3methods} is a flag indicating that old-style methods
+    will be written involving this class.  Modern versions of \R
+    attempt to match formal and old-style methods consistently, so
+    this argument is largely irrelevant.
+
+    \code{representation} is an argument inherited from S that
+    included both \code{slots} and \code{contains}, but the use of
+    the latter two arguments is clearer and recommended.
 
-      \code{access} and \code{version} are included for
-      historical compatibility with S-Plus, but ignored.}
+    \code{access} and \code{version} are included for
+    historical compatibility with S-Plus, but ignored.
+  }
   \item{sealed}{ if \code{TRUE}, the class definition will be sealed,
     so that another call to \code{setClass} will fail on this class name.
   }
@@ -247,7 +247,7 @@
  Springer (For the original S4 version.)
 }
 \seealso{
-\code{\link{Classes}} for a general discussion of classes,
+  \code{\link{Classes}} for a general discussion of classes,
   \code{\link{Methods}} for an analogous discussion of methods,
   \code{\link{makeClassRepresentation}}
 }
@@ -258,15 +258,14 @@
  if(isClass("track"))           removeClass("track")
 }
 ## A simple class with two slots
-track <- setClass("track",
-         slots = c(x="numeric", y="numeric"))
+track <- setClass("track", slots = c(x="numeric", y="numeric"))
 ## an object from the class
 t1 <- track(x = 1:10, y = 1:10 + rnorm(10))
 
 ## A class extending the previous, adding one more slot
 trackCurve <- setClass("trackCurve",
-    slots = c(smooth = "numeric"),
-    contains = "track")
+		slots = c(smooth = "numeric"),
+		contains = "track")
 
 ## an object containing a superclass object
 t1s <- trackCurve(t1, smooth = 1:10)
@@ -287,8 +286,8 @@
 numWithId(1:3, id = "An Example")
 
 ## inherit from reference object of type "environment"
-stampedEnv <-setClass("stampedEnv", contains = "environment",
-      slots = c(update = "POSIXct"))
+stampedEnv <- setClass("stampedEnv", contains = "environment",
+                       slots = c(update = "POSIXct"))
 setMethod("[[<-", c("stampedEnv", "character", "missing"),
    function(x, i, j, ..., value) {
        ev <- as(x, "environment")
diff -Nru r-base-3.2.3/src/library/methods/man/setGeneric.Rd r-base-3.3.1/src/library/methods/man/setGeneric.Rd
--- r-base-3.2.3/src/library/methods/man/setGeneric.Rd	2015-10-19 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/setGeneric.Rd	2016-03-16 23:03:42.000000000 +0000
@@ -157,6 +157,10 @@
   others cannot be made generic.  See the section on Primitive Functions
   below.
 
+  It is also unnecessary to create explicit generic versions of
+  non-primitive functions that dispatch internally. These include
+  \code{unlist} and \code{as.vector}.
+
   The description above is the effect when the package that owns the
   non-generic function has not created an implicit generic version.
   Otherwise, it is this implicit generic function that is used. See the
diff -Nru r-base-3.2.3/src/library/methods/man/setMethod.Rd r-base-3.3.1/src/library/methods/man/setMethod.Rd
--- r-base-3.2.3/src/library/methods/man/setMethod.Rd	2015-08-25 22:17:15.000000000 +0000
+++ r-base-3.3.1/src/library/methods/man/setMethod.Rd	2016-03-16 23:03:41.000000000 +0000
@@ -18,7 +18,9 @@
 removeMethod(f, signature, where)
 }
 \arguments{
-  \item{f}{ A generic function or the character-string name of the function. }
+  \item{f}{ A generic function or the character-string name of the
+  function. Non-primitive base functions that dispatch internally need
+  to be specified by character-string.}
   \item{signature}{ A match of formal argument names for \code{f} with
     the character-string names of corresponding classes.  See the
     details below; however, if the signature is not trivial, you should use \code{\link{method.skeleton}} to generate a valid call to \code{setMethod}.}
diff -Nru r-base-3.2.3/src/library/methods/NAMESPACE r-base-3.3.1/src/library/methods/NAMESPACE
--- r-base-3.2.3/src/library/methods/NAMESPACE	2015-10-06 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/methods/NAMESPACE	2016-03-16 23:03:44.000000000 +0000
@@ -4,7 +4,6 @@
 ## (if in R_DEFAULT_PACKAGES), so adding other namespaces here has the
 ## undesirable effect of loading them early too (e.g. onLoad hooks are
 ## likely to be not yet set).
-importFrom(utils, find)
 
 
 exportPattern("^\\.__C__")
@@ -65,7 +64,7 @@
 export(doPrimitiveMethod)
 export(dumpMethod)
 export(dumpMethods)
-export(el, "el<-")
+export(el, "el<-")# (now unused)
 export(elNamed, "elNamed<-")
 export(empty.dump)
 export(emptyMethodsList)
@@ -75,6 +74,7 @@
 export(existsFunction)
 export(existsMethod)
 export(extends)
+export(externalRefMethod)
 export(finalDefaultMethod)
 export(findClass)
 export(findFunction)
diff -Nru r-base-3.2.3/src/library/methods/po/da.po r-base-3.3.1/src/library/methods/po/da.po
--- r-base-3.2.3/src/library/methods/po/da.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/da.po	2016-04-27 22:15:30.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2011-11-29 09:10+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,16 +67,16 @@
 msgid "no direct or inherited method for function '%s' for this call"
 msgstr "ingen direkte eller arvet metode for funktion '%s' for dette kald"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr "ugyldig objekt (ikkefunktion) brugt som metode"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "kunne ikke finde symbol '%s' i kaldramme"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -85,11 +85,11 @@
 "ugyldigt symbol under kontrol af manglende argument i metodeafsendelse: "
 "forventede et navn, fik et objekt af klasse »%s«"
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "brug af NULL-miljø er ikke længere i brug"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -98,7 +98,7 @@
 "ugyldigt miljø under kontrol af manglende argument, '%s', i "
 "metodeafsendelse: fik et objekt af klasse »%s«"
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -107,7 +107,7 @@
 "objekt af klasse »%s« brugt som metodeliste for funktion '%s' (intet "
 "'argument'-slot)"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
@@ -116,7 +116,7 @@
 "(under valg af metode for funktion '%s') '...' og relaterede variabler kan "
 "ikke bruges for metodeafsendelse"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -125,8 +125,8 @@
 "(under valg af metode for funktion '%s') 'miljø'-argumentet for afsendelse "
 "skal være et R-miljø; fik et objekt af klasse »%s«"
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
@@ -135,49 +135,49 @@
 "fejl under evaluering af argument '%s' under valg af metode for funktion "
 "'%s': %s"
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
 "ingen matchende metode for funktion '%s' (argument '%s', med klasse »%s«)"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
 msgstr "rekursiv brug af funktion '%s' i metodevalg, uden en standardmetode"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr "fejl under evaluering af en 'primitive' next-metode: %s"
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr "'%s' skal være en enkelt streng (fik en tegnvektor med længden %d)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr "'%s' skal være en udfyldt streng; fik en tom streng"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr "'%s' skal være en enkel streng (fik et objekt af klasse »%s«)"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 #, fuzzy
 msgid "class should be either a character-string name or a class definition"
 msgstr "Klasse skal enten være et tegn-streng navn eller en klassedefinition"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, fuzzy, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "Kunne ikke indhente den generiske for primitive »%s«"
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, fuzzy, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/de.po r-base-3.3.1/src/library/methods/po/de.po
--- r-base-3.2.3/src/library/methods/po/de.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/de.po	2016-04-27 22:15:30.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-3.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2013-03-12 10:39+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
@@ -32,7 +32,7 @@
 "very bad things to happen"
 msgstr ""
 "konnte die Skelettaufrufe für 'methods' nicht finden (Paket entfernt?): "
-"erwarte,dass wirklich schlimme Dinge passieren"
+"erwarte, dass wirklich schlimme Dinge passieren"
 
 #: methods_list_dispatch.c:215
 #, c-format
@@ -72,16 +72,16 @@
 msgstr ""
 "keine direkte oder vererbte Methode für Funktion '%s' für diesen Aufruf"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr "unzulässiges Objekt (keine Funktion) als Methode benutzt"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "konnte Symbol '%s' nicht im Rahmen des Aufrufs finden"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -90,11 +90,11 @@
 "unzulässiges Symbol bei der Überprüfung auf fehlende Argumente im "
 "Methodendispatch: erwartete einen Namen, bekam Objekt der Klasse \"%s\""
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "Nutzen der NULL Umgebung nicht mehr möglich"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -103,7 +103,7 @@
 "unzulässige Umgebung bei der Überprüfung auf fehlende Argumente, '%s', im "
 "Methodendispatch: bekam Objekt der Klasse \"%s\""
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -112,16 +112,16 @@
 "Objekt der Klasse \"%s\" als Methodenliste für Funktion '%s' genutzt (kein "
 "'argument' Slot)"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
 "be used for methods dispatch"
 msgstr ""
 "(bei der Auswahl einer Methode für Funktion '%s') '...' und damit "
-"zusammenhängende Variablenkönnen nicht für Methodendispatch gennutzt werden"
+"zusammenhängende Variablen können nicht für Methodendispatch gennutzt werden"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -130,23 +130,24 @@
 "(bei der Auswahl einer Methode für Funktion '%s') das 'environment' Argument "
 "für den Dispatch muss eine R Umgebung sein; bekam Objekt der Klasse \"%s\""
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
 "'%s': %s"
 msgstr ""
-"Fehler bei der Auswertung des Argumentes '%s' bei der Methodenauswahl\n"
-"für Funktion '%s': %s"
+"Fehler bei der Auswertung des Argumentes '%s' bei der Methodenauswahl für "
+"Funktion '%s': %s"
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
-"kein passende Methode für die Funktion '%s' (Argument '%s', mit Klasse \"%s\""
+"kein passende Methode für die Funktion '%s' (Argument '%s', mit Klasse \"%s"
+"\")"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
@@ -154,42 +155,42 @@
 "rekursive Benutzung der Funktion '%s' in der Methodenwahl, ohne "
 "Standardmethode"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr "Fehler in der Bestimmung einer 'primitive' next-Methode: %s"
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 "\"%s\" muss eine einzelne Zeichenkette sein (bekam Zeichenkettenvektor der "
 "Länge %d)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr ""
 "'%s' muss eine nicht-leere Zeichenkette sein; bekam eine leere Zeichenkette"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr ""
 "'%s' muss eine einzelne Zeichenkette sein (bekam ein Objekt der Klasse \"%s"
 "\")"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr ""
 "class sollte entweder ein Zeichenkettenname oder eine Klassendefinition sein"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "bekam keine Generische für die Primitive \"%s\""
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/fr.po r-base-3.3.1/src/library/methods/po/fr.po
--- r-base-3.2.3/src/library/methods/po/fr.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/fr.po	2016-04-27 22:15:30.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2013-03-18 22:05+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -73,17 +73,17 @@
 msgid "no direct or inherited method for function '%s' for this call"
 msgstr "pas de méthode directe ou héritée pour la fonction '%s' dans cet appel"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr ""
 "objet incorrect (autre chose qu'une fonction) utilisé dans cette méthode"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "impossible de trouver le symbole '%s' dans le cadre de l'appel"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -93,11 +93,11 @@
 "dispatcheur de méthode : un nom est attendu et un objet de classe \"%s\" est "
 "renvoyé"
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "l'utilisation de l'environnement NULL n'est plus autorisée"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -106,7 +106,7 @@
 "environnmenet incorrect lors de la vérification de l'argument manquant, "
 "'%s', dans le dispatcheur de méthodes : un objet de classe \"%s\" est renvoyé"
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -115,7 +115,7 @@
 "l'objet de classe \"%s\" utilisé comme méthode pour la fonction '%s' (pas de "
 "slot 'argument')"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
@@ -125,7 +125,7 @@
 "variables correspondantes ne peuvent  être utilisés pour le dispatching des "
 "méthodes"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -135,8 +135,8 @@
 "'environnement' pour le dispatching doit être un environnement R ; Un objet "
 "de classe \"%s\" est renvoyé"
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
@@ -145,14 +145,14 @@
 "erreur d'évaluation de l'argument '%s' lors de la sélection d'une méthode "
 "pour la fonction '%s' : %s"
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
 "pas de méthode correspondante pour la fonction '%s' (argument '%s', avec la "
 "classe \"%s\")"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
@@ -160,45 +160,45 @@
 "utilisation récursive de la fonction '%s' dans la sélection de méthode, avec "
 "aucune méthode définie par défaut"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr ""
 "erreur lors de l'évaluation d'une 'primitive' comme méthode suivante : %s"
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 "'%s' doit être une chaîne de caractères unique (un vecteur de caractères de "
 "longueur %d est renvoyé)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr ""
 "'%s' doit être une chaîne de caractères non vide ; Une chaîne de caractères "
 "vide est renvoyée"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr ""
 "'%s' doit être une chaîne de caractères unique (un objet de classe \"%s\" "
 "est renvoyé)"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr ""
 "class doit être soit un nom sous forme de chaîne de caractères, soit une "
 "définition de classe"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "Impossible de trouver la fonction générique pour la primitive \"%s\""
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/ja.po r-base-3.3.1/src/library/methods/po/ja.po
--- r-base-3.2.3/src/library/methods/po/ja.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/ja.po	2016-04-27 22:15:30.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.5.0 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2013-03-01 04:12+0200 \n"
 "Last-Translator: Triad sou  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -70,16 +70,16 @@
 msgstr ""
 " ��呼�出��� 関数 '%s' �対�る直接的���継承メソッド��り��ん "
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr " (関数����) �正�オブジェクト�メソッド���使�れ��� "
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr " 呼�出��フレーム中��シンボル '%s' を見付�られ��ん��� "
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -88,11 +88,11 @@
 " メソッド割り当�時�欠�引数��ェック��正�シンボル��り���: ��を期"
 "待�����クラス \"%s\" �オブジェクト��� "
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr " NULL 環境�使用�廃止予定�� "
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -101,7 +101,7 @@
 " メソッド割り当�時�欠�引数 '%s' �対�る�ェック��正�環境��り���: "
 "クラス \"%s\" �オブジェクト��� "
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -110,7 +110,7 @@
 " クラス \"%s\" �オブジェクト�関数 '%s' �メソッドリスト����使�れ��"
 "� ('argument' スロット��り��ん) "
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
@@ -119,7 +119,7 @@
 " (関数 '%s' �対�るメソッド��択時) '...' �関連�る変数�メソッド割り当�"
 "��使���ん "
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -128,8 +128,8 @@
 " (関数 '%s' �対�るメソッド��択時) 割り当�用� 'environment' 引数� R 環"
 "境���れ��り��ん; クラス \"%s\" �オブジェクト��� "
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
@@ -138,52 +138,52 @@
 " 引数 '%s' �評価中�エラー�起���� (関数 '%s' �対�るメソッド��択"
 "時): %s "
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
 " 関数 '%s' �対�るマッ��るメソッド (引数 '%s' �クラス \"%s\" を��) ��"
 "り��ん��� "
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
 msgstr " 既定メソッド無���メソッド�択時�関数 '%s' ��帰的使用�� "
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr " 'primitive' �メソッド %s �評価中�エラー�起���� "
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 " '%s' ��一�文字列���れ��り��ん(長� %d �文字ベクトル���) "
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr " '%s' �空���文字列���れ��り��ん; 空�文字列��� "
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr ""
 " '%s' ��一�文字列���れ��り��ん (クラス \"%s\" �オブジェクト��"
 "�) "
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr " クラス�文字列����クラス定義���ら����れ��り��ん "
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr " プリミティブ� \"%s\" �対�る�称 (generic) を得る��失敗���� "
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/ko.po r-base-3.3.1/src/library/methods/po/ko.po
--- r-base-3.2.3/src/library/methods/po/ko.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/ko.po	2016-04-27 22:15:30.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R methods package
-# src/library/methods/po/ko.po
+# ./methods/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R methods package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,16 +77,16 @@
 msgid "no direct or inherited method for function '%s' for this call"
 msgstr "� 호출� 위해 함수 '%s'� 대한 �접� �는 ���� 메소드가 없습니다"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr "메소드로서 사용� 유효하지 않� �체입니다"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "호출 프레임�서 심볼 '%s'를 찾� 수 없었습니다"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -92,11 +95,11 @@
 "메소드 디스패치�서 누�� ��를 확�하는� 유효하지 않� 심볼입니다:  �름"
 "� 와야하는� �래스 \"%s\"� �체를 얻었습니다"
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "NULL environment� 사용� ��� 지��지 않습니다"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -105,7 +108,7 @@
 "메소드 디스패치� 누�� �� '%1$s'를 확�하는� 유효하지 않� environment�"
 "�, �래스 \"%2$s\"� �체를 얻었습니다"
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -114,7 +117,7 @@
 "함수 '%2$s'를 위한 메소드 목�으로서 사용� �래스 \"%1$s\"� �체입니다 "
 "('argument' 슬롯� 없습니다)"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
@@ -123,7 +126,7 @@
 "(함수 '%s'를 위한 메소드를 선�� 할 때) '...'와 관계가 있는 변수들� 메소드 "
 "디스패치� 사용� 수 없습니다"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -132,8 +135,8 @@
 "(함수 '%1$s'를 위한 메소드를 선�할 때) 디스패치를 위한 'environment' ��는 "
 "반드시 R environment�어야 하는�, �래스 \"%2$s\"를 얻습니다"
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
@@ -142,51 +145,51 @@
 "함수 '%2$s'를 위한 메소드 선�시 �수 '%1$s'를 �가하는� 오류가 발�했습니"
 "다: %3$s"
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
 "함수 '%1$s'� �치하는 메소드가 없습니다 (�래스 \"%3$s\"� 가지는 �� "
 "'%2$s')"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
 msgstr "메소드 선�시 기본 메소드가 없는 함수 '%s'� 재귀� 사용입니다"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr "'primitive' 다� 메소드를 �가하는 중� �러가 발�했습니다:%s"
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 "'%s'는 반드시 단� 문�열�어야 합니다 (길�가 %d� 문�형 벡터를 얻습니다)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr "'%s'는 반드시 빈 문�열�어야 하는�, 빈 문�열� 얻었습니다"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr ""
 "'%s'는 반드시 단� 문�열�어야 합니다 (�래스 \"%s\"� �체를 얻었습니다)"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr "�래스는 문�열 �름 �는 �래스 정� 중 하나 �어야 합니다"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "프리미티브 \"%s\"를 위한 제네릭� 얻는� 실패했습니다"
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/methods.pot r-base-3.3.1/src/library/methods/po/methods.pot
--- r-base-3.2.3/src/library/methods/po/methods.pot	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/methods.pot	2016-04-27 22:15:30.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: methods 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,103 +61,103 @@
 msgid "no direct or inherited method for function '%s' for this call"
 msgstr ""
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr ""
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr ""
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
 "a name, got an object of class \"%s\""
 msgstr ""
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
 "dispatch: got an object of class \"%s\""
 msgstr ""
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
 "'argument' slot)"
 msgstr ""
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
 "be used for methods dispatch"
 msgstr ""
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
 "dispatch must be an R environment; got an object of class \"%s\""
 msgstr ""
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
 "'%s': %s"
 msgstr ""
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
 msgstr ""
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr ""
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr ""
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr ""
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr ""
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr ""
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/pl.po r-base-3.3.1/src/library/methods/po/pl.po
--- r-base-3.2.3/src/library/methods/po/pl.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/pl.po	2016-04-27 22:15:30.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,8 +13,8 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: class_support.c:32
 msgid "calling the C routine used as an initializer for 'externalptr' objects"
@@ -70,16 +70,16 @@
 "Brak bezpośredniej lub dziedziczonej metody dla funkcji '%s' dla tego "
 "wywołania"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr "niepoprawny obiekt (nie-funkcja) użyty jako metoda"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "nie można było znaleźć symbolu '%s' w strukturze wywołania"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -88,11 +88,11 @@
 "niepoprawny symbol w sprawdzaniu brakującego argumentu w wysyłaniu metody: "
 "oczekiwano nazwy, otrzymano obiekt klasy '%s'"
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "użycie środowiska NULL jest przestarzałe"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -101,7 +101,7 @@
 "niepoprawne środowisko w sprawdzaniu brakującego argumentu '%s' w wysyłaniu "
 "metod: otrzymano obiekt klasy '%s'"
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -110,7 +110,7 @@
 "obiekt klasy '%s' został użyty jako lista metod dla funkcji '%s' ( brak "
 "gniazda 'argument')"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
@@ -119,7 +119,7 @@
 "(przy wybieraniu metody dla funkcji '%s') '...' oraz powiÄ…zane zmienne nie "
 "mogą być użyte dla wysyłania metod"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -128,8 +128,8 @@
 "(przy wybieraniu metody dla funkcji '%s') argument 'environment' dla "
 "wysyłania musi być środowiskiem R; otrzymano obiekt klasy '%s'"
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
@@ -138,12 +138,12 @@
 "błąd podczas obliczania argumentu '%s' przy wybieraniu metody dla funkcji "
 "'%s': %s"
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr "brak pasujÄ…cej metody dla funkcji '%s' (argument '%s', z klasÄ… '%s')"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
@@ -151,37 +151,37 @@
 "rekursywne użycie funkcji '%s' w wyborze metody, z brakiem określonej metody "
 "domyślnej"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr "błąd w trakcie obliczania 'primitive' następnej metody: %s"
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 "'%s' musi być pojedynczym łańcuchem (otrzymano wektor tekstowy o długości %d)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr "'%s' musi być niepustym łańcuchem; otrzymano pusty łańcuch"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr "'%s' musi być pojedynczym łańcuchem (otrzymano obiekt klasy '%s')"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr "klasa powinna być albo nazwą tekstową albo definicją klasy"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "nie udało się uzyskać ogólnej funkcji dla typu prymitywnego \"%s\""
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/pt_BR.po r-base-3.3.1/src/library/methods/po/pt_BR.po
--- r-base-3.2.3/src/library/methods/po/pt_BR.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/pt_BR.po	2016-04-27 22:15:30.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2011-03-26 08:54-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -72,16 +72,16 @@
 msgstr ""
 "nenhum método direto ou obtido por herança para a função '%s' nessa chamada"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr "objeto inválido (não-função) usado como método"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "não foi possível encontrar o símbolo '%s' no escopo da chamada"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -90,11 +90,11 @@
 "símbolo inválido na verificação de argumento faltante no dispacho de método: "
 "um nome era esperado, mas foi especificado um objeto de classe \"%s\""
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "uso do ambiente NULL foi extinto"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
@@ -103,7 +103,7 @@
 "ambiente inválido na verificação de argumento faltante, '%s',  no "
 "despachamento dos métodos: foi especificado um objeto de classe \"%s\""
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -112,7 +112,7 @@
 "objeto de classe \"%s\" usado como lista de métodos para a função '%s' (sem "
 "slot 'argument')"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
@@ -121,7 +121,7 @@
 "(na seleção de um método para a função '%s') '...' e variáveis relacionadas "
 "não podem ser usadas no despachamento dos métodos"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -130,8 +130,8 @@
 "(na seleção de um método para a função '%s') o argumento 'environment' para "
 "o dispachamento deve ser um ambiente R; foi obtido um objeto de classe \"%s\""
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
@@ -140,54 +140,54 @@
 "erro na avaliação do argumento '%s' na seleção do método para a função '%s': "
 "'%s'"
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr ""
 "nenhum método correspondente encontrado para a função '%s' (argumento '%s', "
 "com classe \"%s\")"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
 msgstr ""
 "uso recursivo da função '%s' na seleção do método, sem um método padrão"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr "erro na avaliação de um próximo método 'primitive': %s"
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr ""
 "'%s' deve ser uma única string (foi especificado um vetor de caracteres de "
 "comprimento %d)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr "'%s' deve ser uma string não-vazia; foi obtida uma string vazia"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr "'%s' deve ser uma string única (foi obtido um objeto da classe \"%s\")"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 #, fuzzy
 msgid "class should be either a character-string name or a class definition"
 msgstr ""
 "Class deve ser ou um nome cadeia de caracteres ou uma definição de classe"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, fuzzy, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "Falha ao obter a genérica primitiva '%s"
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, fuzzy, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/po/R-da.po r-base-3.3.1/src/library/methods/po/R-da.po
--- r-base-3.2.3/src/library/methods/po/R-da.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-da.po	2016-04-27 22:15:30.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-12-01 22:45+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@
 "X-Generator: Pootle 2.1.6\n"
 
 #, fuzzy
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr "UPS: Noget galt med linjen"
 
 msgid ""
@@ -131,8 +131,8 @@
 msgstr ""
 
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
 
 msgid ""
@@ -621,12 +621,6 @@
 msgstr ""
 
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-
-msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
@@ -637,6 +631,11 @@
 "from package %s: not turning on duplicate class definitions for this class."
 msgstr ""
 
+msgid ""
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr ""
 
@@ -712,19 +711,12 @@
 "ordinary function"
 msgstr ""
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr ""
-
 msgid "no generic function found for %s"
 msgstr ""
 
 msgid "Empty function name in .getGeneric"
 msgstr ""
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
 
@@ -803,9 +795,6 @@
 msgid "no definition found for class %s"
 msgstr "\", fik en af klasse \""
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr ""
-
 msgid "missing function for load action: %s"
 msgstr ""
 
@@ -1001,6 +990,12 @@
 "methods currently exist for coercing from %s to %s; they will be replaced."
 msgstr ""
 
+msgid "Function must be an S4 generic"
+msgstr ""
+
+msgid "method is not being debugged"
+msgstr ""
+
 msgid "object %s not found"
 msgstr ""
 
@@ -1248,6 +1243,9 @@
 msgid "%s is not a field in this class"
 msgstr ""
 
+msgid "Methods not found: %s"
+msgstr ""
+
 msgid ""
 "the definition of class %s in package %s is locked, methods may not be "
 "redefined"
@@ -1348,6 +1346,11 @@
 msgstr ""
 
 msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
+msgstr ""
+
+msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr ""
@@ -1390,8 +1393,7 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr ""
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+msgid "making a traced version of a special; arguments may be altered"
 msgstr ""
 
 msgid ""
diff -Nru r-base-3.2.3/src/library/methods/po/R-de.po r-base-3.3.1/src/library/methods/po/R-de.po
--- r-base-3.2.3/src/library/methods/po/R-de.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-de.po	2016-04-27 22:15:30.000000000 +0000
@@ -4,10 +4,10 @@
 # Detlef Steuer <steuer@hsu-hh.de>, 2007-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: R-3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-26 14:56+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-08 11:31+0200\n"
 "Last-Translator: Detlef Steuer <detlef.steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
 "Language: de\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
-msgstr "OOPS: irgendetwas falsch mit der Zeile %d in '.OldClassesPrototype'"
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
+msgstr "OOPS: irgendetwas ist falsch mit '.OldClassesPrototypes[[%d]]'"
 
 msgid ""
 "unnamed argument to initialize() for S3 class must have a class definition; "
@@ -80,9 +80,7 @@
 
 msgid ""
 "the 'S3Class' argument must be a superclass of %s:  not true of class %s"
-msgstr ""
-"das S3Class Argument muss eine Oberklasse von %s sein: gilt nicht für Klasse "
-"%s"
+msgstr "das 'S3Class' Argument muss eine Superklasse von %s sein: gilt nicht für Klasse %s"
 
 msgid "replacement value must extend class %s, got %s"
 msgstr "Ersetzung muss die Klasse %s erweitern, bekam %s"
@@ -106,9 +104,9 @@
 "the computation: 'as(object,\"%s\") <- value' is valid when object has class "
 "%s only if 'is(value, \"%s\")' is TRUE ('class(value)' was %s)"
 msgstr ""
-"Die Berechnung: 'as(object,\"%s\") <- value' ist nur zulässig für ein\n"
-"Objekt aus der Klasse %s nur, wenn 'is(value, \"%s\")'  TRUE ergibt "
-"('class(value)' war %s)"
+"Die Berechnung: 'as(object,\"%s\") <- value' ist nur zulässig für ein Objekt "
+"aus der Klasse %s, wenn 'is(value, \"%s\")' TRUE ergibt ('class(value)' war "
+"%s)"
 
 msgid ""
 "there is no automatic definition for 'as(object, \"%s\") <- value' when "
@@ -116,8 +114,8 @@
 "be an error"
 msgstr ""
 "es gibt keine automatische Definition für 'as(object, \"%s\") <- value', \n"
-"wenn das Objekt aus der Klasse %s ist und kein 'replace' Argument\n"
-"angegeben wird; Ersetzen wird einen Fehler erzeugen"
+"wenn das Objekt aus der Klasse %s ist und kein 'replace' Argument angegeben "
+"wird; Ersetzen wird einen Fehler erzeugen"
 
 msgid ""
 "the 'replace' argument to setIs() should be a function of 2 or 3 arguments, "
@@ -147,15 +145,15 @@
 "if the 'def' argument is supplied, it must be a function that calls "
 "standardGeneric(\"%s\") or is the default"
 msgstr ""
-"wenn das 'def' Argument angegeben wird, muss es eine Funktion sein,\n"
-"die standardGeneric(\"%s\") aufruft oder der default ist"
+"wenn das 'def' Argument angegeben wird, muss es eine Funktion sein, die "
+"standardGeneric(\"%s\") aufruft oder der default ist"
 
 msgid ""
 "must supply a function skeleton for %s, explicitly or via an existing "
 "function"
 msgstr ""
 "es muss ein Funktionsskelett für %s angegeben werden, entweder explizit oder "
-"über eine exisitierende Funktion"
+"über eine existierende Funktion"
 
 msgid ""
 "Creating a generic function for %s from %s in %s\n"
@@ -171,12 +169,12 @@
 "no generic version of %s on package %s is allowed;\n"
 "   a new generic will be assigned for %s"
 msgstr ""
-"Generische Version von %s für Paket %s ist nicht erlaubt; \n"
+"generische Version von %s für Paket %s ist nicht erlaubt; \n"
 "  eine neue Generische wird für %s zugewiesen"
 
 msgid "function %s appears to be a generic function, but with generic name %s"
 msgstr ""
-"Funkton %s scheint eine generische Funktion zu sein, aber mit dem "
+"Funktion %s scheint eine generische Funktion zu sein, aber mit dem "
 "generischen Namen %s"
 
 msgid "generic function %s not found for removal"
@@ -327,7 +325,7 @@
 
 msgid "%s is a primitive function; its generic form cannot be redefined"
 msgstr ""
-"%s ist eine primitive Funktion, generische Form und kann nicht umdefiniert "
+"%s ist eine primitive Funktion, ihre generische Form kann nicht umdefiniert "
 "werden"
 
 msgid ""
@@ -362,7 +360,7 @@
 msgstr "Signaturen unterscheiden sich: (%s), (%s)"
 
 msgid "package slots  differ: %s, %s"
-msgstr "Paketslots unterscheiden sich: %s, %s"
+msgstr "Paket-Slots unterscheiden sich: %s, %s"
 
 msgid "groups differ: %s, %s"
 msgstr "Gruppen unterscheiden sich: %s, %s"
@@ -374,8 +372,8 @@
 "argument %s must be a generic function or a single character string; got an "
 "object of class %s"
 msgstr ""
-"Argument %s muss eine generische Funktion oder eine Zeichenkette sein;\n"
-"bekam ein Objekt aus Klasse %s"
+"Argument %s muss eine generische Funktion oder eine Zeichenkette sein; bekam "
+"ein Objekt aus Klasse %s"
 
 msgid "non-generic function '%s' given to findMethods()"
 msgstr "nicht-generische Funktion '%s' an findMethods() übergeben"
@@ -383,8 +381,7 @@
 msgid ""
 "only FALSE is meaningful for 'inherited', when 'where' is supplied (got %s)"
 msgstr ""
-"nur FALSE sinnvoll für 'inherited', wenn 'where' angegeben wurde\n"
-"(bekam %s)"
+"nur FALSE sinnvoll für 'inherited', wenn 'where' angegeben wurde (bekam %s)"
 
 msgid "argument 'f' must be a generic function or %s"
 msgstr "Argument 'f' muss eine generische Funktion oder %s sein"
@@ -447,8 +444,7 @@
 "object of class %s"
 msgstr ""
 "die Standardmethode muss eine Methodendefinition, eine Primitive oder NULL "
-"sein:\n"
-" Bekam Objekt der Klasse %s"
+"sein: Bekam Objekt der Klasse %s"
 
 msgid ""
 "trying to match a method signature to an object (of class %s) that is not a "
@@ -464,14 +460,14 @@
 "invalid element in a list for \"signature\" argument; element %d is neither "
 "a class definition nor a class name"
 msgstr ""
-"unzlässiges Element in einer Liste für das \"signature\" Argument;\n"
-"Element %d ist weder eine Klassendefinition noch ein Klassenname"
+"unzlässiges Element in einer Liste für das \"signature\" Argument; Element "
+"%d ist weder eine Klassendefinition noch ein Klassenname"
 
 msgid ""
 "trying to match a method signature of class %s; expects a list or a "
 "character vector"
 msgstr ""
-"Vesuche eine Methodensignatur mit Klasse %s einzupassen; erwartet eine Liste "
+"Versuche eine Methodensignatur mit Klasse %s zu matchen; erwartet eine Liste "
 "oder einen Zeichenkettenvektor "
 
 msgid ""
@@ -487,8 +483,8 @@
 "more elements in the method signature (%d) than in the generic signature "
 "(%d) for function %s"
 msgstr ""
-"mehr Elemente in der Methodensignatur (%d) als in der generischen\n"
-"Signatur (%d) für Funktion %s"
+"mehr Elemente in der Methodensignatur (%d) als in der generischen Signatur "
+"(%d) für Funktion %s"
 
 msgid "no generic function found corresponding to %s"
 msgstr "keine generische Funktion korrespondierend mit %s gefunden"
@@ -500,7 +496,7 @@
 "%s, along with other use of the \"MethodsList\" metadata objects, is "
 "deprecated."
 msgstr ""
-"%s ist, zusammen mit der Nutzung der \"MethodsList\" Metsdatenobjekte. "
+"%s ist, zusammen mit der Nutzung der \"MethodsList\" Metadatenobjekte, "
 "veraltet."
 
 msgid "in %s: use of \"MethodsList\" metadata objects is deprecated."
@@ -509,23 +505,22 @@
 msgid "use %s instead."
 msgstr "nutze stattdessen %s."
 
-#, fuzzy
 msgid ""
 "%s, along with other use of the \"MethodsList\" metadata objects, is defunct."
 msgstr ""
-"%s ist, zusammen mit der Nutzung der \"MethodsList\" Metsdatenobjekte. "
-"veraltet."
+"%s ist, zusammen mit der Nutzung der \"MethodsList\" Metadatenobjekte,\n"
+" nicht mehr vorhanden."
 
-#, fuzzy
 msgid "in %s: use of \"MethodsList\" metadata objects is defunct."
-msgstr "In %s: Nutzung der \"MethodsList\" Metadatenobjekte ist veraltet"
+msgstr "In %s: Nutzung der \"MethodsList\" Metadatenobjekte ist nicht mehr möglich"
 
 msgid "invalid object for formal method definition: type %s"
 msgstr "unzulässiges Objekt für die formale Methodendefinition: Typ %s"
 
 msgid "missing package slot (%s) in object of class %s (package info added)"
 msgstr ""
-"fehender Paketslot (%s) in Objekt der Klasse %s (Paketinformation hinzugefügt"
+"fehlender Paketslot (%s) in Objekt der Klasse %s (Paketinformation "
+"hinzugefügt)"
 
 msgid ""
 "'initialize' method returned an object of class %s instead of the required "
@@ -573,7 +568,7 @@
 msgstr "ungültiges Objekt als Methode (Klasse %s) gefunden"
 
 msgid "No next method available"
-msgstr "Keine weiter Methode verfügbar"
+msgstr "Keine weitere Methode verfügbar"
 
 msgid ""
 "in constructing the prototype for class %s: prototype has class %s, but the "
@@ -613,7 +608,7 @@
 "in definition of class %s, information for superclass %s is of class %s "
 "(expected \"SClassExtension\")"
 msgstr ""
-"in der Definition der Klasse %s: Information über Oberklasse %s ist aus "
+"in der Definition der Klasse %s: Information über Superklasse %s ist aus "
 "Klasse %s (erwartet \"SClassExtension\")"
 
 msgid "class %s extends an undefined class, %s"
@@ -630,7 +625,7 @@
 "muss ein \"classRepresentation\"-Objekt angegeben werden"
 
 msgid "assigning as %s a class representation with internal name %s"
-msgstr "Zuweisen als %s einer Klassenrepresentation mit internem Namen %s"
+msgstr "Zuweisen als %s einer Klassenrepräsentation mit internem Namen %s"
 
 msgid "class %s has a locked definition in package %s"
 msgstr "Klasse %s besitzt eine gesicherte Definition in Paket %s"
@@ -655,7 +650,7 @@
 msgid ""
 "no definition was found for superclass %s in the specification of class %s"
 msgstr ""
-"keine Definiton für  Oberklasse %s in der Spezifikation der Klasse %s "
+"keine Definition für Superklasse %s in der Spezifikation der Klasse %s "
 "gefunden"
 
 msgid "conflicting definition of data part: .Data = %s, superclass implies %s"
@@ -699,7 +694,7 @@
 "function prototype() to avoid trouble."
 msgstr ""
 "Prototyp ist eine Liste mit benannten Elementen (könnte zweideutig sein): "
-"sicherheitshalber lieber die Funktion prototype() nutzen)"
+"sicherheitshalber lieber die Funktion prototype() nutzen"
 
 msgid "the '%s' list for class %s, includes an undefined class %s"
 msgstr "die '%s' Liste für Klasse %s enhält eine undefinierte Klasse %s"
@@ -737,7 +732,7 @@
 msgid "class cannot have both an ordinary and hidden data type"
 msgstr ""
 "Eine Klasse kann nicht sowohl einen gewöhnlichen und einen versteckten "
-"Datentypen haben"
+"Datentyp haben"
 
 msgid ""
 "a validity method must be a function of one argument, got an object of class "
@@ -757,35 +752,36 @@
 "one from package %s: not turning on duplicate class definitions for this "
 "class."
 msgstr ""
-"die Spezifikation für die S3 Klasse %s in Paket %s scheint äquivlant\n"
-"zu einer aus Paket %s; für diese Klasse werden  die\n"
-"Klassendefinitionen nicht dubliziert"
+"die Spezifikation für die S3 Klasse %s in Paket %s scheint äquivalent zu "
+"einer aus Paket %s; für diese Klasse werden  die Klassendefinitionen nicht "
+"dupliziert"
 
 msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
 msgstr ""
-"Einige Oberklassen der Klasse %s in Paket %s haben dublizierte Definitionen. "
-"Diese Definition wird nicht als äquivalent zu der aus Paket %s behandelt."
+"Einige Superklassen der Klasse %s in Paket %s haben duplizierte "
+"Definitionen. Diese Definition wird nicht als äquivalent zu der aus Paket %s "
+"behandelt."
 
 msgid ""
 "Note: the specification for class %s in package %s seems equivalent to one "
 "from package %s: not turning on duplicate class definitions for this class."
 msgstr ""
-"Die Spezifikation für die Klasse %s in Paket %s scheint äquivalent\n"
-"zu einer aus Paket %s; für diese Klasse werden  die\n"
-"Klassendefinitionen nicht dubliziert"
+"Die Spezifikation für die Klasse %s in Paket %s scheint äquivalent zu einer "
+"aus Paket %s; für diese Klasse werden  die Klassendefinitionen nicht "
+"dupliziert"
 
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr ""
-"Nicht definierte Unterklasse %s  von Klasse %s; Definition nicht aktualisiert"
+"Nicht definierte Subklasse %s von Klasse %s; Definition nicht aktualisiert"
 
 msgid ""
 "subclass %s of class %s is not local and cannot be updated for new "
 "inheritance information; consider setClassUnion()"
 msgstr ""
-"Unterklasse %s der Klasse %s ist nicht lokal und kann nicht für neue "
+"Subklasse %s der Klasse %s ist nicht lokal und kann nicht für neue "
 "Vererbungsinformation aktualisiert werden; evtl. setClassUnion() nutzen?"
 
 msgid ""
@@ -799,7 +795,7 @@
 "argument 'includeSubclasses' must be a logical, either one value or a vector "
 "of the same length as argument 'classes'"
 msgstr ""
-"Argument 'includeSubclasses' muss Boole'sch sein, entweder ein Wert oder ein "
+"Argument 'includeSubclasses' muss boolesch sein, entweder ein Wert oder ein "
 "Vektor der Länge der Argumentklassen"
 
 msgid "argument 'abbreviate' must be 0, 1, 2, or 3"
@@ -813,7 +809,7 @@
 "currently traced; the function used will have tracing removed"
 msgstr ""
 "die als %s zur Erzeugung einer generischen Funktion %s genutzte Funktion "
-"wird momentan verfolgt; die aktuell genutzte Funktion wird die  Verfolgung "
+"wird momentan verfolgt; die aktuell genutzte Funktion wird die Verfolgung "
 "entfernen"
 
 msgid "must supply either a generic function or a function as default for %s"
@@ -825,7 +821,7 @@
 "the %s argument must be NULL or a generic function object; got an object of "
 "class %s"
 msgstr ""
-"das Argument %s muss NULL oder eine generisches Funktionsobjekt sein; bekam "
+"das Argument %s muss NULL oder ein generisches Funktionsobjekt sein; bekam "
 "Objekt der Klasse %s"
 
 msgid "no suitable arguments to dispatch methods in this function"
@@ -851,7 +847,7 @@
 "signature"
 msgstr ""
 "formale Argumente (%s), die in der Methodendefinition ausgelassen wurden, "
-"können nicht in der Signatur  sein"
+"können nicht in der Signatur sein"
 
 msgid "expanding the signature to include omitted arguments in definition: %s"
 msgstr "erweitere Signatur um ausgelassene Argumente in Definition: %s"
@@ -867,7 +863,7 @@
 "arguments (%s) after '...' in the generic must appear in the method, in the "
 "same place at the end of the argument list"
 msgstr ""
-"Argumente (%s) nach '...' in der Generischen  müssen in der Methode an "
+"Argumente (%s) nach '...' in der Generischen müssen in der Methode an "
 "derselben Stelle am Ende der Argumentliste auftreten"
 
 msgid ""
@@ -902,14 +898,14 @@
 "unzulässiger Wert aus der generischen Funktion %s, Klasse %s, erwartet war %s"
 
 msgid "\"MethodsList\" is defunct; allMethods now are empty"
-msgstr ""
+msgstr "\"MethodsList\" exisitiert nicht mehr; allMethods sind jetzt leer"
 
 msgid ""
 "the body of the generic function for %s calls 'standardGeneric' to dispatch "
 "on a different name (\"%s\")!"
 msgstr ""
-"Der Funktionsbody der generischen Funktion für %s ruft\n"
-"'standardGeneric' auf, um in einen anderen Namen (\"%s\") zu dispatchen!"
+"Der Funktionsbody der generischen Funktion für %s ruft 'standardGeneric' "
+"auf, um in einen anderen Namen (\"%s\") zu dispatchen!"
 
 msgid ""
 "trying to change the formal arguments in %s in an object of class %s; "
@@ -922,7 +918,7 @@
 "trying to change the formal arguments in %s, but getting the new formals "
 "from an object of class %s; expected a function definition"
 msgstr ""
-"Versuch die formalen Argumente in %s  zu ändern, bekomme aber die neuen "
+"Versuch die formalen Argumente in %s zu ändern, bekomme aber die neuen "
 "Formalen von einem Objekt der Klasse %s; erwartet war eine "
 "Funktionsdefinition"
 
@@ -930,7 +926,7 @@
 "trying to change the formal arguments in %s, but the number of existing "
 "arguments is less than the number of new arguments: (%s) vs (%s)"
 msgstr ""
-"Versuch die formalen Argumente in %s  zu ändern,  aber die Zahl der "
+"Versuch die formalen Argumente in %s zu ändern, aber die Zahl der "
 "existierenden Argumente ist kleiner als die Zahl der neuen Argumente: (%s) "
 "vs. (%s)"
 
@@ -939,7 +935,7 @@
 "arguments is greater than the number of new arguments (the extra arguments "
 "won't be used): (%s) vs (%s)"
 msgstr ""
-"Versuch die formalen Argumente in %s  zu ändern,  aber die Zahl der "
+"Versuch die formalen Argumente in %s zu ändern, aber die Zahl der "
 "existierenden Argumente ist kleiner als die Zahl der neuen Argumente "
 "(zusätzliche Argumente werden nicht genutzt): (%s) vs. (%s)"
 
@@ -947,7 +943,7 @@
 "in changing formal arguments in %s, some of the old names are not in fact "
 "arguments: %s"
 msgstr ""
-"beim Ändern der formalen Argumente in %s; Einige der alten Namen sind keine "
+"beim Ändern der formalen Argumente in %s; einige der alten Namen sind keine "
 "Argumente: %s"
 
 msgid "got a negative maximum number of frames to look at"
@@ -966,11 +962,11 @@
 msgstr "keine Methode und kein Standard passen auf  \"...\" in %s"
 
 msgid "multiple direct matches: %s; using the first of these"
-msgstr "mehrfache direkte Ãœbereinstimmungen: %s; nutze den ersten von diesen"
+msgstr "mehrfache direkte Ãœbereinstimmungen: %s; nutze die erste von diesen"
 
 msgid "multiple equivalent inherited matches: %s; using the first of these"
 msgstr ""
-"mehrfache äquivalente, vererbte Übereinstimmungen: %s; nutze den ersten von "
+"mehrfache äquivalente, vererbte Übereinstimmungen: %s; nutze die erste von "
 "diesen"
 
 msgid "single string; got an object of class %s"
@@ -980,14 +976,14 @@
 "multiple definitions exist for class %s, but the supplied package (%s) is "
 "not one of them (%s)"
 msgstr ""
-"Mehrfache Definitionen existieren für Klasse %s, aber dasangegebenen Paket "
+"Mehrfache Definitionen existieren für Klasse %s, aber das angegebene Paket "
 "(%s) ist keins davon (%s)"
 
 msgid ""
 "multiple definitions exist for class %s; should specify one of them (%s), e."
 "g. by className()"
 msgstr ""
-"es existieren mehrere Definitionen für die Klasse %s; z.B. durchclassName() "
+"es existieren mehrere Definitionen für die Klasse %s; z.B. durch className() "
 "sollte eine von diesen (%s) spezifiziert werden"
 
 msgid "no definition found for class %s"
@@ -1019,8 +1015,8 @@
 msgid ""
 "Argument \"representation\" cannot be used if argument \"slots\" is supplied"
 msgstr ""
-"Argument \"representation\" kann nicht benutzt werden, wenn Argumen\n"
-"\"slot\" angegeben wird"
+"Argument \"representation\" kann nicht benutzt werden, wenn Argument \"slot"
+"\" angegeben wird"
 
 msgid ""
 "only arguments 'Class' and 'where' can be supplied when argument "
@@ -1047,8 +1043,8 @@
 "error in contained classes (%s) for class %s and unable to restore previous "
 "definition from %s"
 msgstr ""
-"Fehler in den enthaltenen Klassen (%s) für Klasse %s und kann die "
-"frühereDefinition nicht aus %s wiederherstellen"
+"Fehler in den enthaltenen Klassen (%s) für Klasse %s und kann die frühere "
+"Definition nicht aus %s wiederherstellen"
 
 msgid ""
 "error in contained classes (%s) for class %s; previous definition restored "
@@ -1100,13 +1096,13 @@
 "eine Validitätsmethode muss NULL oder eine Funktion eines Argumentes sein"
 
 msgid "class %s not found on %s; 'resetClass' will have no effect"
-msgstr "Klasse %s nicht in %s gefunden; 'resetClass' hat keinen Effekt "
+msgstr "Klasse %s nicht in %s gefunden; 'resetClass' hat keinen Effekt"
 
 msgid ""
 "argument 'classDef' must be a string or a class representation; got an "
 "object of class %s"
 msgstr ""
-"Argument 'classDef' muss eine Zeichenkette oder eine Klassenrepresentation "
+"Argument 'classDef' muss eine Zeichenkette oder eine Klassenrepräsentation "
 "sein; bekam ein Objekt aus Klasse %s"
 
 msgid "class %s is sealed; 'resetClass' will have no effect"
@@ -1173,8 +1169,8 @@
 msgid ""
 "argument %s must be a list or a character vector; got an object of class %s"
 msgstr ""
-"Argument %s muss eine Liste oder eine Zeichenkette sein;\n"
-"bekam ein Objekt aus Klasse %s"
+"Argument %s muss eine Liste oder eine Zeichenkette sein; bekam ein Objekt "
+"aus Klasse %s"
 
 msgid "no function %s found"
 msgstr "keine Funktion %s gefunden"
@@ -1190,7 +1186,7 @@
 
 msgid "no method or default for as() replacement of %s with Class=\"%s\""
 msgstr ""
-"keine Methode und keine Standard für einen Ersatz mit as() von %s mit Class="
+"keine Methode und kein Standard für einen Ersatz mit as() von %s mit Class="
 "\"%s\""
 
 msgid "trying to set an 'as' relation from %s to itself"
@@ -1210,8 +1206,8 @@
 "'as' method should have one argument, or match the arguments of coerce(): "
 "got  (%s)"
 msgstr ""
-"'as' Methode sollte ein Argument haben oder mit coerce() übereinstimmen:\n"
-" bekam (%s)"
+"'as' Methode sollte ein Argument haben oder mit coerce() übereinstimmen:  "
+"bekam (%s)"
 
 msgid ""
 "a 'replace' method definition in 'setAs' must be a function of two "
@@ -1288,7 +1284,7 @@
 "revise %s information---not exported?  Making a copy in package %s"
 msgstr ""
 "Klasse %s ist definiert (mit Paketslot %s) aber kein Metadatenobjekt "
-"gefunden, um %s Inforation zu überprüfen -- nicht exportiert? Erzeuge Kopie "
+"gefunden, um %s Information zu überprüfen -- nicht exportiert? Erzeuge Kopie "
 "in Paket %s"
 
 msgid "class %s cannot extend class %s"
@@ -1311,15 +1307,12 @@
 
 msgid "invalid object in meta table of methods for %s, label %s, had class %s"
 msgstr ""
-"Ungültiges Objekt im Metatable der Methoden für %s, Label %s, hatte Klasse %s"
+"ungültiges Objekt im Metatable der Methoden für %s, Label %s, hatte Klasse %s"
 
-#, fuzzy
 msgid ""
 "invalid mlist element for signature %s at level %d (should be "
 "MethodDefinition or .Primitive, had class %s)"
-msgstr ""
-"ungültiges mlist Element für die Signatur %s auf Stufe %d (sollte\n"
-"Methodenliste oder Methode sein, hat Klasse %s)"
+msgstr "ungültiges mlist Element für die Signatur %s auf Stufe %d (sollte MethodDefinition oder .Primitive sein, hat Klasse %s)"
 
 msgid "bad method object stored in method table, class %s"
 msgstr "ungültiges Methodenobjekt in der Methodentabelle, Klasse %s"
@@ -1328,8 +1321,8 @@
 "invalid object in methods table (%s), expected a method, got an object of "
 "class %s"
 msgstr ""
-"ungültiges Objekt in der Methodentabelle (%s), Methode war erwartet,\n"
-"bekam Objekt der Klasse %s"
+"ungültiges Objekt in der Methodentabelle (%s), Methode war erwartet, bekam "
+"Objekt der Klasse %s"
 
 msgid "invalid or unset methods table in generic function %s"
 msgstr ""
@@ -1380,21 +1373,21 @@
 "trying to check signature length of group generic '%s', but it is not a "
 "group generic"
 msgstr ""
-"Versuch der Überprüfung der Signaturlänge der Gruppengenerischen '%s',\n"
-"ist aber gar keine Gruppengenerische"
+"Versuch der Überprüfung der Signaturlänge der Gruppengenerischen '%s', ist "
+"aber gar keine Gruppengenerische"
 
 msgid ""
 "trying to check signature length of generic '%s', but it is not a generic "
 "function: i = %d, funs = %s, gnames = %s"
 msgstr ""
-"Versuch der Überprüfung der Signaturlänge der Generischen '%s',ist aber gar "
+"Versuch der Überprüfung der Signaturlänge der Generischen '%s', ist aber gar "
 "keine Generische: i = %d, funs = %s, gnames = %s"
 
 msgid "no methods table for generic %s from package %s in package %s"
-msgstr "keine Methodentabelle für generische %s aus  Paket %s in Paket %s"
+msgstr "keine Methodentabelle für generische %s aus Paket %s in Paket %s"
 
 msgid "undefined classes (%s) will be ignored for argument '%s'"
-msgstr "nicht definerte Klassen (%s) werden für Argument '%s' ignoriert"
+msgstr "nicht definierte Klassen (%s) werden für Argument '%s' ignoriert"
 
 msgid ""
 "argument 'signatures' must be a character matrix whose rows are method "
@@ -1436,7 +1429,7 @@
 "invalid S4 class corresponding to S3 class: slots in  S4 version must extend "
 "corresponding slots in S3 version: fails for %s"
 msgstr ""
-"Unzulässige S4 Klasse korrespondiert mit S3 Klasse: Slots in der S4 Version  "
+"Unzulässige S4 Klasse korrespondiert mit S3 Klasse: Slots in der S4 Version "
 "müssen entsprechende Slots in der S3 Version erweitern; schlägt fehl für %s"
 
 msgid "explicit coercion of old-style class (%s) is not defined"
@@ -1460,8 +1453,8 @@
 "inconsistent old-style class information for %s (maybe mixing old and new "
 "classes?)"
 msgstr ""
-"inkonsistente Klasseninformation für %s im alten Stil (werden evtl. alten "
-"und neue Klassen vermischt?)"
+"inkonsistente Klasseninformation für %s im alten Stil (werden evtl. alte und "
+"neue Klassen vermischt?)"
 
 msgid ""
 "'S3Class' only defined for extensions of %s or classes with a data part:  "
@@ -1488,7 +1481,7 @@
 
 msgid "%s is not a valid field or method name for reference class %s"
 msgstr ""
-"Feld %s ist keine gültiges Feld und kein Methodenname für die Referenzklasse "
+"Feld %s ist kein gültiges Feld und kein Methodenname für die Referenzklasse "
 "%s"
 
 msgid ""
@@ -1496,7 +1489,7 @@
 "definition of this method for class %s"
 msgstr ""
 "in der Methode \"%s\" ist ein Aufruf von superClass(), aber es gibt keine "
-"Oberklassendefiniton dieser Methode für die Klasse %s"
+"Superklassendefiniton dieser Methode für die Klasse %s"
 
 msgid "methods declared in usingMethods() but not found: %s"
 msgstr "Methoden deklariert in usingMethods() aber nicht gefunden: %s"
@@ -1512,7 +1505,7 @@
 "object of class %s"
 msgstr ""
 "Unbenannte Argumente für $new() müssen Objekte einer Referenzklasse sein; "
-"bekan ein Objekt der Klasse %s"
+"bekam ein Objekt der Klasse %s"
 
 msgid "%s is not a valid field or method name for this class"
 msgstr "%s ist keine gültiges Feld und kein Methodenname für diese Klasse"
@@ -1538,8 +1531,7 @@
 "method"
 msgstr ""
 "direkte Aufrufe von callSuper() sind unzulässig: sollte nur von einer "
-"anderen\n"
-"Methode aufgerufen werden"
+"anderen Methode aufgerufen werden"
 
 msgid "%s is not a field in this class"
 msgstr "%s ist kein Feld dieser Klasse"
@@ -1574,15 +1566,15 @@
 "the overriding class (\"%s\") of field %s is not a subclass of the existing "
 "field definition (\"%s\")"
 msgstr ""
-"Die überschreibende Klasse (\"%s\") des Feldes %s ist keine Unterklasse\n"
+"die überschreibende Klasse (\"%s\") des Feldes %s ist keine Subklasse\n"
 "der existierenden Felddefinition (\"%s\")"
 
 msgid ""
 "invalid assignment for reference class field %s, should be from class %s or "
 "a subclass (was class %s)"
 msgstr ""
-"Unzulässige Zueiwsung für Referenzklassenfeld %s, sollte aus Klasse %s oder "
-"eine Unterklasse sein (war Klasse %s)"
+"unzulässige Zuweiwsung für Referenzklassenfeld %s, sollte aus Klasse %s oder "
+"eine Subklasse sein (war Klasse %s)"
 
 msgid "invalid replacement: reference class field %s is read-only"
 msgstr "ungültige Ersetzung: Referenzklassenfeld %s ist nur lesbar"
@@ -1591,7 +1583,7 @@
 "the 'contains' argument should be the names of superclasses:  got an element "
 "of class %s"
 msgstr ""
-"Das 'contains' Argument sollten Namen von Oberklassen sein: bekam Element "
+"Das 'contains' Argument sollten Namen von Superklassen sein: bekam Element "
 "der Klasse %s"
 
 msgid "no definition found for inherited class: %s"
@@ -1668,15 +1660,15 @@
 
 msgid "field %s of class %s has a non-default binding and cannot be locked"
 msgstr ""
-"Feld %s der Klasse %s hat eine nicht-standard Bindung und kann\n"
-"nicht gesichert werden."
+"Feld %s der Klasse %s hat eine nicht-standard Bindung und kann nicht "
+"gesichert werden."
 
 msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr ""
-"Klasse %s ist keine Unterklasse von %s: funktionale Semantik nicht\n"
-"definiert für diese Klasse"
+"Klasse %s ist keine Subklasse von %s: funktionale Semantik nicht definiert "
+"für diese Klasse"
 
 msgid "Could not find local object in supplied environment"
 msgstr "konnte lokales Objekt in angegebener Umgebung nicht finden"
@@ -1686,8 +1678,7 @@
 "vector, got an object of class %s"
 msgstr ""
 "Unzulässiges 'ignore' Argument; sollte eine Klassendefinition oder eine "
-"Zeichenkette sein;\n"
-" bekam ein Objekt aus Klasse \"%s\""
+"Zeichenkette sein; bekam ein Objekt aus Klasse \"%s\""
 
 msgid "An object of class %s"
 msgstr "Ein Objekt der Klasse %s"
@@ -1749,7 +1740,7 @@
 msgid ""
 "cannot use 'at' argument unless the function body has the form '{ ... }'"
 msgstr ""
-"kann das 'at' Argument nur nutzen, wenn der Funtionskörper die Form "
+"kann das 'at' Argument nur nutzen, wenn der Funktionskörper die Form "
 "'{ ... }' besitzt"
 
 msgid "assigning over the binding of symbol %s in environment/package %s"
@@ -1773,7 +1764,7 @@
 "specify the package"
 msgstr ""
 "keines der Objekte aus dem Quelltext konnte gefunden werden; entweder muss "
-"das Paket attached werden oder zumindest spezifiziert"
+"das Paket attached oder zumindest spezifiziert werden"
 
 msgid "objects found in multiple packages: using %s and ignoring %s"
 msgstr "Objekte in mehreren Paketen gefunden: nutze %s, ignoriere %s"
@@ -1803,11 +1794,11 @@
 "source): %s"
 msgstr ""
 "kann keine Methoden für diese Funktionen einfügen (Methodentabelle nicht im "
-"Quelltext: %s"
+"Quelltext): %s"
 
 msgid "Non-function objects are not currently inserted (not traceable): %s"
 msgstr ""
-"nicht-funktionen Objekte sind aktuell nicht eingefügt (nicht verfolgbar): %s"
+"Nicht-Funktionen Objekte sind aktuell nicht eingefügt (nicht verfolgbar): %s"
 
 msgid "New functions are not currently inserted (not untraceable): %s"
 msgstr "Neue Funktionen sind aktuell nicht eingefügt (nicht verfolgbar): %s"
@@ -1823,7 +1814,7 @@
 "nicht eingefügt"
 
 msgid "Methods inserted for function %s(): %s"
-msgstr "Methoden eingefügt für Funktion %s(). %s"
+msgstr "Methoden eingefügt für Funktion %s(): %s"
 
 msgid "no definition for object %s found in tracing environment"
 msgstr "keine Definition für das Objekt %s in der Verfolgungsumgebung gefunden"
@@ -1838,7 +1829,7 @@
 "Verfolgungsumgebung zu sein"
 
 msgid "no method in methods table for %s for signature %s"
-msgstr "keine Methode in der Methodentabelle für  %s für Signatur %s"
+msgstr "keine Methode in der Methodentabelle für %s für Signatur %s"
 
 msgid "unloading 'methods' package ..."
 msgstr "entferne 'methods' Paket ... "
diff -Nru r-base-3.2.3/src/library/methods/po/R-fr.po r-base-3.3.1/src/library/methods/po/R-fr.po
--- r-base-3.2.3/src/library/methods/po/R-fr.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-fr.po	2016-04-27 22:15:30.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 10:55+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -18,7 +18,8 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.6.4\n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+#, fuzzy
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr ""
 "OOPS : il y a un problème avec la ligne %d dans '.OldClassesPrototypes'"
 
@@ -143,9 +144,10 @@
 msgid "invalid argument 'name': %s"
 msgstr "argument 'name' erroné : %s"
 
+#, fuzzy
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
 "%s est une fonction primitive ; Les méthodes peuvent être définies, mais la "
 "fonction générique est implicite et ne peut être modifiée."
@@ -777,15 +779,6 @@
 msgstr "impossible de trouver un environnement contenant la classe %s"
 
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-"Note: une spécification de classe S3 %s dans le package %s semble "
-"équivalente de celle dans le package %s et ne conduit pas à une définition "
-"dupliquée de classe"
-
-msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
@@ -802,6 +795,11 @@
 "celle du package %s et ne conduit donc pas à une définition dupliquée pour "
 "cette classe"
 
+msgid ""
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr ""
 "Sous-classe indéfinie, %s, de la classe %s ; la définition n'est pas mise à "
@@ -909,21 +907,12 @@
 "L'argument 'f' doit être une chaîne de caractères, une fonction générique, "
 "ou une primitive : il s'agit d'une fonction ordinaire"
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr "des méthodes ne peuvent être définies pour la fonction primitive %s"
-
 msgid "no generic function found for %s"
 msgstr "aucune fonction générique n'est trouvée pour %s"
 
 msgid "Empty function name in .getGeneric"
 msgstr "nom de fonction vide dans .getGeneric"
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-"le package %s semble avoir des méthodes périmées ; il faut le réinstaller "
-"depuis ses sources"
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
 "aucune méthode n'est trouvée pour %s ; cacheGenericMetaData() n'aura aucun "
@@ -1032,10 +1021,6 @@
 msgid "no definition found for class %s"
 msgstr "aucune définition de la classe %s n'est trouvée"
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr ""
-"tentative d'exécution les actions de chargement sans le package 'methods'"
-
 msgid "missing function for load action: %s"
 msgstr "aucune définition n'existe pour la fonction load : %s"
 
@@ -1291,6 +1276,13 @@
 "des méthodes existent actuellement pour convertir automatiquement de %s vers "
 "%s ; Elles seront remplacées."
 
+#, fuzzy
+msgid "Function must be an S4 generic"
+msgstr "nom de fonction vide dans .getGeneric"
+
+msgid "method is not being debugged"
+msgstr ""
+
 msgid "object %s not found"
 msgstr "objet %s introuvable"
 
@@ -1611,6 +1603,10 @@
 msgid "%s is not a field in this class"
 msgstr "%s n'est pas un champ de cette classe"
 
+#, fuzzy
+msgid "Methods not found: %s"
+msgstr "objet %s introuvable"
+
 msgid ""
 "the definition of class %s in package %s is locked, methods may not be "
 "redefined"
@@ -1743,6 +1739,11 @@
 "le champ %s de la classe %s a un lien non standard et ne peut être verrouillé"
 
 msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
+msgstr ""
+
+msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr ""
@@ -1794,8 +1795,8 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr "la méthode pour %s pour cette signature ne sera pas déboguée (tracée)"
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+#, fuzzy
+msgid "making a traced version of a special; arguments may be altered"
 msgstr ""
 "création d'une version de déboguage d'une primitive ; Les arguments seront "
 "traités comme '...'"
@@ -2065,6 +2066,29 @@
 "aucune définition de la classe %s n'existe à la position spécifiée, %s, "
 "définitions dans : %s"
 
+#~ msgid ""
+#~ "Note: the specification for S3 class %s in package %s seems equivalent to "
+#~ "one from package %s: not turning on duplicate class definitions for this "
+#~ "class."
+#~ msgstr ""
+#~ "Note: une spécification de classe S3 %s dans le package %s semble "
+#~ "équivalente de celle dans le package %s et ne conduit pas à une "
+#~ "définition dupliquée de classe"
+
+#~ msgid "methods cannot be defined for the primitive function %s"
+#~ msgstr "des méthodes ne peuvent être définies pour la fonction primitive %s"
+
+#~ msgid ""
+#~ "package %s seems to have out-of-date methods; need to reinstall from "
+#~ "source"
+#~ msgstr ""
+#~ "le package %s semble avoir des méthodes périmées ; il faut le réinstaller "
+#~ "depuis ses sources"
+
+#~ msgid "trying to execute load actions without 'methods' package"
+#~ msgstr ""
+#~ "tentative d'exécution les actions de chargement sans le package 'methods'"
+
 #~ msgid "special function %s is not permitted to have methods"
 #~ msgstr ""
 #~ "la fonction spéciale %s ne peut recevoir des définitions de méthodes"
diff -Nru r-base-3.2.3/src/library/methods/po/R-ja.po r-base-3.3.1/src/library/methods/po/R-ja.po
--- r-base-3.2.3/src/library/methods/po/R-ja.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-ja.po	2016-04-27 22:15:30.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.5.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 14:52+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -14,7 +14,8 @@
 "X-Generator: Pootle 2.5.1.1 \n"
 "X-POOTLE-MTIME: 1427435556.000000 \n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+#, fuzzy
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr " �や�'.OldClassesPrototypes' �第 %d 行目�何�変�� "
 
 msgid ""
@@ -139,9 +140,10 @@
 msgid "invalid argument 'name': %s"
 msgstr " �正�引数 'name' ��: %s "
 
+#, fuzzy
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
 " %s �プリミティブ�関数��; メソッドを定義�������称的関数�隠匿�れ"
 "��り�変更����ん "
@@ -741,14 +743,6 @@
 msgstr " クラス %s を�む環境を見付�る���出���ん "
 
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-" 注�: パッケージ %2$s 中� S3 クラス %1$s  �パッケージ %3$s �ら�も���"
-"値�見��������クラス�対�る�複クラス定義�行���ん "
-
-msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
@@ -763,6 +757,11 @@
 " 注�: パッケージ %2$s 中� S3 クラス %1$s �パッケージ %3$s �ら�も���値"
 "�見��������クラス�対�る�複クラス定義�行���ん "
 
+msgid ""
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr " 未定義�サブクラス %s (クラス� %s) ��; 定義�更新�れ��ん "
 
@@ -857,21 +856,12 @@
 " 引数 'f' �文字列��称的関数���プリミティブ��る必���り����普通"
 "�関数�得られ��� "
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr " プリミティブ関数 %s �対���メソッドを定義����ん "
-
 msgid "no generic function found for %s"
 msgstr " %s �対�る�称的関数�見付�り��ん "
 
 msgid "Empty function name in .getGeneric"
 msgstr " .getGeneric �中�空�関数� "
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-" パッケージ %s �時代�れ�メソッドを��よ���; ソース�ら�インストール�"
-"る必���り�� "
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
 " %s �対�るメソッド��り��ん; cacheGenericsMetaData() �効果を����ん "
@@ -966,9 +956,6 @@
 msgid "no definition found for class %s"
 msgstr " クラス %s �対�る定義��り��ん "
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr " 'methods' パッケージ無��ロード動作�実行を試����� "
-
 msgid "missing function for load action: %s"
 msgstr " ロード動作�対�る関数��り��ん; %s "
 
@@ -1207,6 +1194,13 @@
 " %s �ら %s ��強制変�����メソッド��在存在���; �れらを交���"
 "�。 "
 
+#, fuzzy
+msgid "Function must be an S4 generic"
+msgstr " .getGeneric �中�空�関数� "
+
+msgid "method is not being debugged"
+msgstr ""
+
 msgid "object %s not found"
 msgstr " オブジェクト %s �存在���ん "
 
@@ -1511,6 +1505,10 @@
 msgid "%s is not a field in this class"
 msgstr " %s ���クラス中�欄���り��ん "
 
+#, fuzzy
+msgid "Methods not found: %s"
+msgstr " オブジェクト %s �存在���ん "
+
 msgid ""
 "the definition of class %s in package %s is locked, methods may not be "
 "redefined"
@@ -1637,6 +1635,11 @@
 " フィールド %s （クラス %s）�既定���を������ロック����ん "
 
 msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
+msgstr ""
+
+msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr ""
@@ -1686,8 +1689,8 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr " ��シグナ�ャ� %s �対�るメソッド�トレース�れ����ん��� "
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+#, fuzzy
+msgid "making a traced version of a special; arguments may be altered"
 msgstr ""
 " プリミティブ� traced �ージョンを作�����; 引数� '...' ���扱�れ�"
 "� "
@@ -1910,6 +1913,27 @@
 msgstr[0] ""
 " クラス %s �定義�指定�れ��置 %s ��り��ん�以下�関�る定義��: %s "
 
+#~ msgid ""
+#~ "Note: the specification for S3 class %s in package %s seems equivalent to "
+#~ "one from package %s: not turning on duplicate class definitions for this "
+#~ "class."
+#~ msgstr ""
+#~ " 注�: パッケージ %2$s 中� S3 クラス %1$s  �パッケージ %3$s �ら�も��"
+#~ "�値�見��������クラス�対�る�複クラス定義�行���ん "
+
+#~ msgid "methods cannot be defined for the primitive function %s"
+#~ msgstr " プリミティブ関数 %s �対���メソッドを定義����ん "
+
+#~ msgid ""
+#~ "package %s seems to have out-of-date methods; need to reinstall from "
+#~ "source"
+#~ msgstr ""
+#~ " パッケージ %s �時代�れ�メソッドを��よ���; ソース�ら�インストー"
+#~ "ル�る必���り�� "
+
+#~ msgid "trying to execute load actions without 'methods' package"
+#~ msgstr " 'methods' パッケージ無��ロード動作�実行を試����� "
+
 #~ msgid "special function %s is not permitted to have methods"
 #~ msgstr " 特殊関数 %s �メソッドを�����出���ん "
 
diff -Nru r-base-3.2.3/src/library/methods/po/R-ko.po r-base-3.3.1/src/library/methods/po/R-ko.po
--- r-base-3.2.3/src/library/methods/po/R-ko.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-ko.po	2016-04-27 22:15:30.000000000 +0000
@@ -1,32 +1,36 @@
 # Korean translation for R methods package
-# src/library/methods/po/R-ko.po
+# ./methods/po/R-ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R methods package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr ""
-"아�쿠: '.OldClassesPrototypes'내� %d번째 줄� 무엇�가 잘못�었습니다"
+"OOPS: 무엇�가가 '.OldClassesPrototypes[[%d]]'를 사용함� 있어서 잘못�었습니"
+"다."
 
 msgid ""
 "unnamed argument to initialize() for S3 class must have a class definition; "
@@ -147,11 +151,9 @@
 msgstr "�� 'name'� 올바르지 않습니다: %s"
 
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
-"%s는 프리미티브 함수입니다; 따�서 메소드들� 정��어 질 수 있지만, 제네릭 "
-"함수는 절대��고, 변경�어 질 수 없습니다."
 
 msgid ""
 "if the 'def' argument is supplied, it must be a function that calls "
@@ -292,7 +294,7 @@
 msgstr ""
 
 msgid "must supply 'generic.function' or 'class'"
-msgstr ""
+msgstr "반드시 'generic.function' �는 'class'를 제공해야 합니다."
 
 msgid "%s is not an S4 generic function in %s; methods not removed"
 msgstr ""
@@ -509,17 +511,12 @@
 msgid "use %s instead."
 msgstr "대신 %s� 사용하세요."
 
-#, fuzzy
 msgid ""
 "%s, along with other use of the \"MethodsList\" metadata objects, is defunct."
 msgstr ""
-"\"MethodsList\" 메타��터 �체� 다른 용�� 함께 �용�는 %s는 � �� 제공"
-"�지 않습니다."
 
-#, fuzzy
 msgid "in %s: use of \"MethodsList\" metadata objects is defunct."
 msgstr ""
-"%s내�서:  \"MethodsList\" 메타��터 �체들� 사용� 지��지 않습니다."
 
 msgid "invalid object for formal method definition: type %s"
 msgstr "형� 메소드 정�� 대한 �체가 올바르지 않습니다: 유형 %s"
@@ -741,15 +738,6 @@
 msgstr "�래스 %s를 �함하고 있는 환경� 찾� 수 없습니다"
 
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-"노트: 패키지 %2$s내� 있는 S3 �래스 %1$s� 대한 세부사항들� 패키지 %3$s내"
-"� 있는 것과 같아 보입니다: � �래스� 대한 �래스 정�들� 중복�어 있는 "
-"것 같습니다."
-
-msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
@@ -765,6 +753,11 @@
 "노트: 패키지 %2$s내 �래스 %1$s는 패키지 %3$s과 같아보입니다: � �래스� 대"
 "하여 중복� �래스를 실행시키지 않습니다."
 
+msgid ""
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr ""
 "�래스 %2$s� 서브 �래스 %1$s가 정��지 않았습니다; 업��트� 정�가 아닙"
@@ -857,20 +850,12 @@
 "�� 'f'는 반드시 문�열, 제네릭 함수, �는 프리미티브�어야합니다: 그러나 �"
 "반 함수를 가지고 있습니다"
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr "프리미티브 함수 %s� 대해서 메소드들� 정�� 수 없습니다"
-
 msgid "no generic function found for %s"
 msgstr "%s� 대한 제네릭 함수를 찾� 수 없습니다"
 
 msgid "Empty function name in .getGeneric"
 msgstr ".getGeneric내� �름� 없는 함수가 있습니다"
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-"패키지 %s는  seems to have out-of-date methods; need to reinstall from source"
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
 "%s� 대한 메소드를 찾� 수 없습니다; 따�서 cacheGenericsMetaData()는 아무런 "
@@ -965,9 +950,6 @@
 msgid "no definition found for class %s"
 msgstr "�래스 %s� 대한 정�를 찾� 수 없습니다"
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr "'methods' 패키지 없� 로드 액션들� 실행� 시�합니다"
-
 msgid "missing function for load action: %s"
 msgstr "로드 액션� 대하여 다� 함수들� 누��었습니다: %s"
 
@@ -1197,6 +1179,12 @@
 "%1$s�서 %2$s로� 강제로 변환하는 메소드는 현재 존재하지 않습니다; �것들� "
 "대체�어질 것입니다."
 
+msgid "Function must be an S4 generic"
+msgstr ""
+
+msgid "method is not being debugged"
+msgstr ""
+
 msgid "object %s not found"
 msgstr "�체 %s를 찾� 수 없습니다"
 
@@ -1268,13 +1256,10 @@
 msgid "invalid object in meta table of methods for %s, label %s, had class %s"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "invalid mlist element for signature %s at level %d (should be "
 "MethodDefinition or .Primitive, had class %s)"
 msgstr ""
-"\"signature\" ��� 대한 리스트내� 잘못� 구성요소가 있습니다; 구성요소 %d"
-"는 �래스 정�� 아니고 �래스명� 아닙니다"
 
 msgid "bad method object stored in method table, class %s"
 msgstr ""
@@ -1472,6 +1457,9 @@
 msgid "%s is not a field in this class"
 msgstr "%s는 � �래스 내� 있는 항목� 아닙니다"
 
+msgid "Methods not found: %s"
+msgstr ""
+
 msgid ""
 "the definition of class %s in package %s is locked, methods may not be "
 "redefined"
@@ -1589,6 +1577,11 @@
 "�래스 %2$s� 항목 %1$s는 디�트 바�딩� 아니기 때문� 잠겨질 수 없습니다"
 
 msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
+msgstr ""
+
+msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr ""
@@ -1636,8 +1629,7 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr "� 서명� 대하여 %s� 대한 메소드는 추�� 수 없습니다"
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+msgid "making a traced version of a special; arguments may be altered"
 msgstr ""
 
 msgid ""
@@ -1860,6 +1852,39 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid ""
+#~ "%s is a primitive function;  methods can be defined, but the generic "
+#~ "function is implicit, and cannot be changed."
+#~ msgstr ""
+#~ "%s는 프리미티브 함수입니다; 따�서 메소드들� 정��어 질 수 있지만, 제네"
+#~ "릭 함수는 절대��고, 변경�어 질 수 없습니다."
+
+#~ msgid ""
+#~ "Note: the specification for S3 class %s in package %s seems equivalent to "
+#~ "one from package %s: not turning on duplicate class definitions for this "
+#~ "class."
+#~ msgstr ""
+#~ "노트: 패키지 %2$s내� 있는 S3 �래스 %1$s� 대한 세부사항들� 패키지 %3$s"
+#~ "내� 있는 것과 같아 보입니다: � �래스� 대한 �래스 정�들� 중복�어 있"
+#~ "는 것 같습니다."
+
+#~ msgid "methods cannot be defined for the primitive function %s"
+#~ msgstr "프리미티브 함수 %s� 대해서 메소드들� 정�� 수 없습니다"
+
+#~ msgid ""
+#~ "package %s seems to have out-of-date methods; need to reinstall from "
+#~ "source"
+#~ msgstr ""
+#~ "패키지 %s는  seems to have out-of-date methods; need to reinstall from "
+#~ "source"
+
+#~ msgid "trying to execute load actions without 'methods' package"
+#~ msgstr "'methods' 패키지 없� 로드 액션들� 실행� 시�합니다"
+
+#~ msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+#~ msgstr ""
+#~ "아�쿠: '.OldClassesPrototypes'내� %d번째 줄� 무엇�가 잘못�었습니다"
+
 #~ msgid "special function %s is not permitted to have methods"
 #~ msgstr "특� 함수 %s는 메소드를 가질 수 없습니다"
 
diff -Nru r-base-3.2.3/src/library/methods/po/R-methods.pot r-base-3.3.1/src/library/methods/po/R-methods.pot
--- r-base-3.2.3/src/library/methods/po/R-methods.pot	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-methods.pot	2016-04-27 22:15:30.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: methods 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,7 +10,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr ""
 
 msgid "unnamed argument to initialize() for S3 class must have a class definition; %s does not"
@@ -80,7 +79,7 @@
 msgid "invalid argument 'name': %s"
 msgstr ""
 
-msgid "%s is a primitive function;  methods can be defined, but the generic function is implicit, and cannot be changed."
+msgid "%s dispatches internally;  methods can be defined, but the generic function is implicit, and cannot be changed."
 msgstr ""
 
 msgid "if the 'def' argument is supplied, it must be a function that calls standardGeneric(\"%s\") or is the default"
@@ -473,15 +472,15 @@
 msgid "unable to find an environment containing class %s"
 msgstr ""
 
-msgid "Note: the specification for S3 class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class."
-msgstr ""
-
 msgid "Note: some superclasses of class %s in package %s have duplicate definitions.  This definition is not being treated as equivalent to that from package %s"
 msgstr ""
 
 msgid "Note: the specification for class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class."
 msgstr ""
 
+msgid "Found more than one class \"%s\" in cache; using the first, from namespace '%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr ""
 
@@ -539,18 +538,12 @@
 msgid "argument 'f' must be a string, generic function, or primitive: got an ordinary function"
 msgstr ""
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr ""
-
 msgid "no generic function found for %s"
 msgstr ""
 
 msgid "Empty function name in .getGeneric"
 msgstr ""
 
-msgid "package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
 
@@ -611,9 +604,6 @@
 msgid "no definition found for class %s"
 msgstr ""
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr ""
-
 msgid "missing function for load action: %s"
 msgstr ""
 
@@ -773,6 +763,12 @@
 msgid "methods currently exist for coercing from %s to %s; they will be replaced."
 msgstr ""
 
+msgid "Function must be an S4 generic"
+msgstr ""
+
+msgid "method is not being debugged"
+msgstr ""
+
 msgid "object %s not found"
 msgstr ""
 
@@ -962,6 +958,9 @@
 msgid "%s is not a field in this class"
 msgstr ""
 
+msgid "Methods not found: %s"
+msgstr ""
+
 msgid "the definition of class %s in package %s is locked, methods may not be redefined"
 msgstr ""
 
@@ -1028,6 +1027,9 @@
 msgid "field %s of class %s has a non-default binding and cannot be locked"
 msgstr ""
 
+msgid "Reference superclasses must come from the same package for the environment to be defined:  got %s and %s"
+msgstr ""
+
 msgid "Class %s is not a subclass of %s; functional semantics not defined for this class"
 msgstr ""
 
@@ -1064,7 +1066,7 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr ""
 
-msgid "making a traced version of a primitive; arguments will be treated as '...'"
+msgid "making a traced version of a special; arguments may be altered"
 msgstr ""
 
 msgid "the editing in trace() can only change the body of the function; got an object of class %s"
diff -Nru r-base-3.2.3/src/library/methods/po/R-pl.po r-base-3.3.1/src/library/methods/po/R-pl.po
--- r-base-3.2.3/src/library/methods/po/R-pl.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-pl.po	2016-04-27 22:15:30.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,184 +13,295 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
-msgstr "OOPS: coÅ› nie tak z liniÄ… %d w '.OldClassesPrototypes'"
+#. R/RMethodUtils.R: warning("\"MethodsList\" is defunct; allMethods now are empty")
+#: R/RMethodUtils.R:0
+msgid "\"MethodsList\" is defunct; allMethods now are empty"
+msgstr "\"MethodsList\" zostało zlikwidowane; 'allMethods' są teraz puste"
 
-msgid ""
-"unnamed argument to initialize() for S3 class must have a class definition; "
-"%s does not"
+#. R/RClassUtils.R: stop("\"class\" is a reserved slot name and cannot be redefined")
+#: R/RClassUtils.R:0
+msgid "\"class\" is a reserved slot name and cannot be redefined"
 msgstr ""
-"nienazwany argument przekazany do metody 'initialize()' dla klasy S3 musi "
-"posiadać definicję klasy; a %s takiej nie posiada"
+"'class' jest zarezerwowaną nazwą gniazda i nie może zostać przedefiniowana"
 
+#. R/MethodsListClass.R: gettextf("%d: target \"%s\": chose \"%s\" (others: %s)", i, target[[i]],     selected[[i]], paste0("\"", these, "\"", collapse = ", "))
+#: R/MethodsListClass.R:0
+msgid "%d: target \"%s\": chose \"%s\" (others: %s)"
+msgstr "%d: cel \"%s\": wybrano \"%s\" (inne: %s)"
+
+#. R/MethodsList.R: gettextf("%f is not a valid generic function: methods list was an object of class %s",     sQuote(f), dQuote(class(mlist)))
+#: R/MethodsList.R:0
 msgid ""
-"unnamed argument must extend either the S3 class or the class of the data "
-"part; not true of class %s"
+"%f is not a valid generic function: methods list was an object of class %s"
 msgstr ""
-"nienazwany argument musi rozszerzać albo klasę S3 albo klasę części danych; "
-"nie jest to prawdÄ… dla klasy %s"
+"%f nie jest poprawną ogólną funkcją: lista metod była obiektem klasy %s"
 
+#. R/Methods.R: gettextf("%s dispatches internally;  methods can be defined, but the generic function is implicit, and cannot be changed.",     sQuote(name))
+#: R/Methods.R:0
 msgid ""
-"class %s does not have an S3 data part, and so is of type \"S4\"; no S3 "
-"equivalent"
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
-"klasa %s nie ma części danych S3, i dlatego też jest typu S4; brak "
-"ekwiwalentu S3"
+"%s rozdziela wewnętrzne; metody mogą zostać zdefiniowane, ale ogólna funkcja "
+"jest niejawna i nie może być zmieniona."
 
-msgid ""
-"class %s is VIRTUAL; not meaningful to create an S4 object from this class"
-msgstr "klasa %s jest WIRTUALNA; nie ma sensu tworzyć obiektu S4 z tej klasy"
+#. R/SClasses.R: gettextf("%s has a sealed class definition and cannot be redefined",     dQuote(Class))
+#: R/SClasses.R:0
+msgid "%s has a sealed class definition and cannot be redefined"
+msgstr "Klasa %s ma zablokowaną definicję klasy i nie może być przedefiniowana"
 
-msgid "object must be a valid data part for class %s; not true of type %s"
-msgstr ""
-"obiekt musi być poprawną częścią danych dla klasy %s; nie jest to prawdą dla "
-"typu %s"
+#. R/Methods.R: gettextf("%s has no methods defined", sQuote(f))
+#: R/Methods.R:0
+msgid "%s has no methods defined"
+msgstr "%s nie ma zdefiniowanych metod"
 
-msgid "cannot specify matrix() arguments when specifying '.Data'"
+#. R/Methods.R: gettextf("%s is a primitive function; its generic form cannot be redefined",     sQuote(name))
+#: R/Methods.R:0
+msgid "%s is a primitive function; its generic form cannot be redefined"
 msgstr ""
-"nie można określić argumentów metody 'matrix()' gdy określane jest '.Data'"
+"%s jest prymitywną funkcją; jej ogólna forma nie może zostać przedefiniowana"
 
-msgid "cannot specify array() arguments when specifying '.Data'"
-msgstr ""
-"nie można określić argumentów metody 'array()' gdy określane jest '.Data'"
+#. R/SClasses.R: gettextf("%s is not a defined class", dQuote(Class))
+#: R/SClasses.R:0
+msgid "%s is not a defined class"
+msgstr "%s nie jest zdefiniowanÄ… klasÄ…"
 
-msgid "cannot have more than one unnamed argument as environment"
-msgstr "nie można mieć więcej niż jeden nienazwany argument jako środowisko"
+#. R/refClass.R: gettextf("%s is not a defined class in this environment", dQuote(Class))
+#: R/refClass.R:0
+msgid "%s is not a defined class in this environment"
+msgstr " %s nie jest zdefiniowaną klasą w tym środowisku"
 
-msgid "unnamed argument to new() must be an environment for the new object"
+#. R/refClass.R: gettextf("%s is not a field in class %s", sQuote(field), dQuote(thisClass@className))
+#. R/refClass.R: gettextf("%s is not a field in class %s", sQuote(what), dQuote(def@className))
+#. R/refClass.R: gettextf("%s is not a field in class %s", sQuote(what), dQuote(className))
+#: R/refClass.R:0
+msgid "%s is not a field in class %s"
+msgstr "%s nie jest polem w klasie %s"
+
+#. R/refClass.R: gettextf("%s is not a field in this class", sQuote(name))
+#: R/refClass.R:0
+msgid "%s is not a field in this class"
+msgstr "%s nie jest polem w tej klasie"
+
+#. R/RMethodUtils.R: gettextf("%s is not a generic function (or not visible here)",     sQuote(f))
+#: R/RMethodUtils.R:0
+msgid "%s is not a generic function (or not visible here)"
+msgstr "%s nie jest ogólną funkcją (albo nie jest widoczna)"
+
+#. R/trace.R: gettextf("%s is not a method for reference class %s", sQuote(as.character(if (is.symbol(thisName)) thisName else what)),     dQuote(class(where)))
+#: R/trace.R:0
+msgid "%s is not a method for reference class %s"
+msgstr "%s nie jest metodÄ… dla klasy referencyjnej %s"
+
+#. R/refClass.R: gettextf("%s is not a reference class", dQuote(Class))
+#. R/refClass.R: gettextf("%s is not a reference class", dQuote(def@className))
+#: R/refClass.R:0
+msgid "%s is not a reference class"
+msgstr "%s nie jest klasÄ… referencyjnÄ…"
+
+#. R/SClasses.R: gettextf("%s is not a slot in class %s", sQuote(name), dQuote(cl))
+#. R/SClasses.R: gettextf("%s is not a slot in class %s", sQuote(name), dQuote(cl))
+#: R/SClasses.R:0
+msgid "%s is not a slot in class %s"
+msgstr "%s nie jest gniazdem w klasie %s"
+
+#. R/refClass.R: gettextf("%s is not a valid field or method name for reference class %s",     sQuote(field), dQuote(thisClass@className))
+#: R/refClass.R:0
+msgid "%s is not a valid field or method name for reference class %s"
 msgstr ""
-"nienazwany argument przekazywany do metody 'new()' musi być środowiskiem dla "
-"nowego obiektu"
+"%s nie jest poprawnym polem lub nazwÄ… metody dla klasy referencyjnej %s"
 
-msgid ""
-"methods may not be defined for primitive function %s in this version of R"
+#. R/refClass.R: gettextf("%s is not a valid field or method name for this class",     sQuote(what))
+#: R/refClass.R:0
+msgid "%s is not a valid field or method name for this class"
+msgstr "%s nie jest poprawnym polem lub nazwÄ… metody dla tej klasy"
+
+#. R/Methods.R: gettextf("%s is not an S4 generic function in %s; methods not removed",     sQuote(f), sQuote(getPackageName(where)))
+#: R/Methods.R:0
+msgid "%s is not an S4 generic function in %s; methods not removed"
 msgstr ""
-"metody nie mogą być zdefiniowane dla prymitywnej funkcji %s w tej wersji R"
+"'%s' nie jest ogólną funkcją S4 w pakiecie %s; metody nie zostały usunięte"
 
+#. R/Methods.R: gettextf("%s is not currently a generic:  define it first to create a non-default implicit form",     sQuote(name))
+#: R/Methods.R:0
 msgid ""
-"S3Part() is only defined for classes set up by setOldCLass(), basic classes "
-"or subclasses of these:  not true of class %s"
+"%s is not currently a generic:  define it first to create a non-default "
+"implicit form"
 msgstr ""
-"metoda 'S3Part()' jest zdefiniowana tylko dla klas ustawionych przez metodÄ™ "
-"'setOldCLass()', podstawowe klasy lub ich podklasy: nie jest to prawdÄ… dla "
-"klasy %s"
+"%s nie jest aktualnie funkcją ogólną: zdefiniuj ją najpierw aby utworzyć "
+"niedomyślną niejawną formę"
 
+#. R/RClassUtils.R: gettextf("%s is not eligible to be the data part of another class (must be a basic class or a virtual class with no slots)",     dQuote(dataPartClass))
+#: R/RClassUtils.R:0
 msgid ""
-"the 'S3Class' argument must be a superclass of %s:  not true of class %s"
+"%s is not eligible to be the data part of another class (must be a basic "
+"class or a virtual class with no slots)"
 msgstr ""
-"argument 'S3Class' musi być superklasą %s: nie jest to prawdą dla klasy %s"
+"%s nie kwalifikuje się aby być częścią danych innej klasy (musi być "
+"podstawowÄ… klasÄ… albo klasÄ… wirtualnÄ… bez gniazd)"
 
-msgid "replacement value must extend class %s, got %s"
-msgstr "wartość zastępcza musi rozszerzać klasę %s, otrzymano %s"
+#. R/addedFunctions.R: gettextf("%s is not one of the element names", sQuote(name))
+#: R/addedFunctions.R:0
+msgid "%s is not one of the element names"
+msgstr "%s nie jest jedną z nazw elementów"
 
-msgid "replacement value must be of class %s, got one of class %s"
-msgstr "wartość zastępcza musi być klasy %s, otrzymano jedną klasy %s"
+#. R/refClass.R: gettextf("%s is not one of the reference super classes for this object",     dQuote(Class))
+#: R/refClass.R:0
+msgid "%s is not one of the reference super classes for this object"
+msgstr "Klasa %s nie jest jednÄ… z referencyjnych superklas dla tego obiektu"
 
+#. R/MethodsList.R: gettextf("%s must be TRUE, FALSE, or a named logical vector of those values; got an object of class %s",     sQuote("useInherited"), dQuote(class(useInherited)))
+#: R/MethodsList.R:0
 msgid ""
-"no 'replace' method was defined for 'as(x, \"%s\") <- value' for class %s"
+"%s must be TRUE, FALSE, or a named logical vector of those values; got an "
+"object of class %s"
 msgstr ""
-"nie zdefiniowano metody 'replace' dla 'as(x, \"%s\") <- value' dla klasy %s"
+"%s musi być TRUE, FALSE, lub nazwanym wektorem logicznym tych wartości; "
+"otrzymano obiekt klasy %s"
 
+#. R/trace.R: gettextf("%s() is not a generic function in the target environment -- methods will not be inserted",     f)
+#: R/trace.R:0
 msgid ""
-"the 'coerce' argument to 'setIs' should be a function of one argument, got "
-"an object of class %s"
+"%s() is not a generic function in the target environment -- methods will not "
+"be inserted"
 msgstr ""
-"argument 'coerce' przekazywany do 'setIs' powinien być funkcją jednego "
-"argumentu, otrzymano obiekt klasy %s"
+"'%s()' nie jest ogólną funkcją w docelowym środowisku -- metody nie zostaną "
+"wstawione"
 
+#. R/MethodsList.R: gettextf("%s, along with other use of the \"MethodsList\" metadata objects, is defunct.",     dQuote(this))
+#: R/MethodsList.R:0
 msgid ""
-"the computation: 'as(object,\"%s\") <- value' is valid when object has class "
-"%s only if 'is(value, \"%s\")' is TRUE ('class(value)' was %s)"
+"%s, along with other use of the \"MethodsList\" metadata objects, is defunct."
 msgstr ""
-"obliczenie: 'as(object,\"%s\") <- value' jest poprawne gdy obiekt posiada "
-"klasę %s tylko jeśli 'is(value, \"%s\")' jest TRUE ('class(value)' było %s)"
+"%s, razem z innym użyciem obiektów metadanych 'MethodsList' zostało "
+"zlikwidowane."
 
+#. R/MethodsList.R: gettextf("%s, along with other use of the \"MethodsList\" metadata objects, is deprecated.",     dQuote(this))
+#: R/MethodsList.R:0
 msgid ""
-"there is no automatic definition for 'as(object, \"%s\") <- value' when "
-"object has class %s and no 'replace' argument was supplied; replacement will "
-"be an error"
+"%s, along with other use of the \"MethodsList\" metadata objects, is "
+"deprecated."
 msgstr ""
-"nie ma automatycznej definicji dla 'as(obiekt, \"%s\") <- value', gdy obiekt "
-"posiada klasę %s oraz brak dostarczonego argumentu 'replace'; wartość "
-"zastępcza będzie błędem"
+"%s, razem z innym użyciem obiektów metadanych 'MethodsList' jest "
+"przestarzałe."
 
-msgid ""
-"the 'replace' argument to setIs() should be a function of 2 or 3 arguments, "
-"got an object of class %s"
+#. R/Methods.R: gettextf("'%s' is not a known generic function {and 'package' not specified}",     f)
+#: R/Methods.R:0
+msgid "'%s' is not a known generic function {and 'package' not specified}"
 msgstr ""
-"argument 'replace' przekazywany do 'setIs()' powinien być funkcją 2 lub 3 "
-"argumentów, otrzymano obiekt klasy %s"
-
-msgid "the member classes must be defined: not true of %s"
-msgstr "klasy członkowe muszą być zdefiniowane: nie jest to prawda dla %s"
-
-msgid "unable to create union class:  could not set members %s"
-msgstr "nie można utworzyć uni klas:  nie można ustawić członków %s"
+"'%s' nie jest znaną ogólną funkcją {oraz 'package' nie został określony}"
 
-msgid "invalid argument 'name': %s"
-msgstr "niepoprawny argument 'name': %s"
+#. R/RClassUtils.R: stop("'Class' must be a valid class definition or class")
+#: R/RClassUtils.R:0
+msgid "'Class' must be a valid class definition or class"
+msgstr "Argument 'Class' musi być poprawną definicją klasy lub klasą"
 
+#. R/oldClass.R: gettextf("'S3Class' can only assign to S4 objects that extend \"oldClass\"; not true of class %s",     dQuote(class(object)))
+#: R/oldClass.R:0
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"'S3Class' can only assign to S4 objects that extend \"oldClass\"; not true "
+"of class %s"
 msgstr ""
-"%s jest prymitywną funkcją; metody mogą zostać zdefiniowane, ale ogólna "
-"funkcja jest niejawna i nie może być zmieniona."
+"'S3Class' może być przypisana do obiektów S4, które rozszerzają \"oldClass"
+"\"; nie jest to prawda dla klasy %s"
 
+#. R/oldClass.R: gettextf("'S3Class' only defined for extensions of %s or classes with a data part:  not true of class %s",     dQuote("oldClass"), dQuote(class(object)))
+#: R/oldClass.R:0
 msgid ""
-"if the 'def' argument is supplied, it must be a function that calls "
-"standardGeneric(\"%s\") or is the default"
+"'S3Class' only defined for extensions of %s or classes with a data part:  "
+"not true of class %s"
 msgstr ""
-"jeśli dostarczono argument 'def', musi być funkcją, która wywołuje "
-"standardGeneric(\"%s\") lub musi być funkcją domyślną"
+"'S3Class' zdefiniowana tylko dla rozszerzeń %s lub klas z częściami danych: "
+"nie jest to prawda dla klasy %s"
 
+#. R/as.R: gettextf("'as' method should have one argument, or match the arguments of coerce(): got  (%s)",     paste(formalArgs(def), collapse = ", "))
+#: R/as.R:0
 msgid ""
-"must supply a function skeleton for %s, explicitly or via an existing "
-"function"
+"'as' method should have one argument, or match the arguments of coerce(): "
+"got  (%s)"
 msgstr ""
-"potrzeba dostarczyć strukturę funkcji dla %s, jawnie lub poprzez istniejącą "
-"funkcjÄ™"
+"metod 'as()' powinna mieć jeden argument lub zgadzać się z argumentami "
+"'coerce()': otrzymano (%s)"
+
+#. R/is.R: stop("'class1' must be the name of a class or a class definition")
+#: R/is.R:0
+msgid "'class1' must be the name of a class or a class definition"
+msgstr "'class1' musi być nazwą klasy albo definicją klasy"
+
+#. R/is.R: stop("'class2' must be the name of a class or a class definition")
+#: R/is.R:0
+msgid "'class2' must be the name of a class or a class definition"
+msgstr "'class2' musi być nazwą klasy albo definicją klasy"
+
+#. R/RClassUtils.R: stop("'externalptr' objects cannot be initialized from new()")
+#: R/RClassUtils.R:0
+msgid "'externalptr' objects cannot be initialized from new()"
+msgstr "obiekty 'externalptr' nie mogą być inicjalizowane z funkcji 'new()'"
+
+#. R/Methods.R: stop("'file' must be a character string or a connection")
+#. R/Methods.R: stop("'file' must be a character string or a connection")
+#: R/Methods.R:0
+msgid "'file' must be a character string or a connection"
+msgstr "'file' musi być łańcuchem tekstowym lub połączeniem"
 
+#. R/MethodsListClass.R: gettextf("'initialize' method returned an object of class %s instead of the required class %s",     paste(dQuote(class(value)), collapse = ", "), dQuote(class(.Object)))
+#: R/MethodsListClass.R:0
 msgid ""
-"Creating a generic function for %s from %s in %s\n"
-"    (from the saved implicit definition)"
+"'initialize' method returned an object of class %s instead of the required "
+"class %s"
 msgstr ""
-"Tworzenie ogólnej funkcji dla %s z pakietu %s w pakiecie %s (z zachowanej "
-"niejawnej definicji)"
+"metoda 'initialize' zwróciła obiekt klasy %s zamiast wymaganej klasy %s"
 
-msgid "Creating a new generic function for %s in %s"
-msgstr "Tworzenie nowej ogólnej funkcji dla %s w pakiecie %s"
+#. R/RClassUtils.R: gettextf("(class %s)", .dQ(unlist(properties, recursive = FALSE)[undefClasses]))
+#: R/RClassUtils.R:0
+msgid "(class %s)"
+msgstr "(klasa %s)"
 
+#. R/SClasses.R: gettextf("All %s names must be distinct in:\n(%s)", what, paste(sQuote(propNames),     collapse = ", "))
+#: R/SClasses.R:0
 msgid ""
-"no generic version of %s on package %s is allowed;\n"
-"   a new generic will be assigned for %s"
+"All %s names must be distinct in:\n"
+"(%s)"
 msgstr ""
-"żadna ogólna wersja %s w pakiecie %s nie jest dozwolona; nowa ogólna funkcja "
-"będzie przypisana dla pakietu %s"
-
-msgid "function %s appears to be a generic function, but with generic name %s"
-msgstr "funkcja %s wygląda na ogólną funkcję ale z ogólną nazwą %s"
+"Wszystkie nazwy %s muszą być różne w:\n"
+"(%s)"
 
-msgid "generic function %s not found for removal"
-msgstr "nie znaleziono ogólnej funkcji %s do usunięcia"
+#. R/SClasses.R: gettextf("All %s names must be nonempty in:\n(%s)", what, paste(sQuote(propNames),     collapse = ", "))
+#: R/SClasses.R:0
+msgid ""
+"All %s names must be nonempty in:\n"
+"(%s)"
+msgstr ""
+"Wszystkie nazwy %s muszą być niepuste w:\n"
+"(%s)"
 
-msgid "a function for argument 'f' must be a generic function"
-msgstr "funkcja dla argumentu 'f' musi być ogólną funkcją"
+#. R/show.R: gettextf("An object of class %s", dQuote(class(object)))
+#: R/show.R:0
+msgid "An object of class %s"
+msgstr "Obiekt klasy %s"
 
-msgid "the environment %s is locked; cannot assign methods for function %s"
+#. R/SClasses.R: stop("Argument \"representation\" cannot be used if argument \"slots\" is supplied")
+#: R/SClasses.R:0
+msgid ""
+"Argument \"representation\" cannot be used if argument \"slots\" is supplied"
 msgstr ""
-"środowisko %s jest zablokowane; nie można przypisać metod dla funkcji %s"
+"Argument 'representation' nie może być użyty, jeśli dostarczony został "
+"argument 'slots'"
 
+#. R/refClass.R: gettextf("Class %s is not a subclass of %s; functional semantics not defined for this class",     dQuote(class(object)), dQuote("envRefClass"))
+#: R/refClass.R:0
 msgid ""
-"the 'where' environment (%s) is a locked namespace; cannot assign methods "
-"there"
+"Class %s is not a subclass of %s; functional semantics not defined for this "
+"class"
 msgstr ""
-"środowisko 'where' (%s) jest zablokowaną przestrzenią nazw; nie można "
-"przypisać tam metod"
+"Klasa %s nie jest podklasÄ… %s; semantyka funkcjonalna nie jest zdefiniowana "
+"dla tej klasy"
 
+#. R/Methods.R: gettextf("Copying the generic function %s to environment %s, because the previous version was in a sealed namespace (%s)",     sQuote(f), sQuote(getPackageName(where)), sQuote(getPackageName(gwhere)))
+#: R/Methods.R:0
 msgid ""
 "Copying the generic function %s to environment %s, because the previous "
 "version was in a sealed namespace (%s)"
@@ -198,22 +309,61 @@
 "Kopiowanie ogólnej funkcji %s do środowiska %s, ponieważ poprzednia wersja "
 "była w zamkniętej przestrzeni nazw (%s)"
 
-msgid "no existing definition for function %s"
-msgstr "brak istniejÄ…cej definicji dla funkcji %s"
+#. R/refClass.R: stop("Could not find local object in supplied environment")
+#: R/refClass.R:0
+msgid "Could not find local object in supplied environment"
+msgstr "Nie można znaleźć lokalnego obiektu w dostarczonym środowisku"
 
-msgid "Creating a generic function from function %s in %s"
-msgstr "Tworzenie nowej ogólnej funkcji z funkcji %s w pakiecie %s"
+#. R/packageName.R: gettextf("Created a package name, %s, when none found", sQuote(pkg))
+#: R/packageName.R:0
+msgid "Created a package name, %s, when none found"
+msgstr "Utworzono nazwę pakietu, %s, gdy nie znaleziono żadnej"
+
+#. R/Methods.R: gettextf("Creating a generic function for %s from %s in %s\n    (from the saved implicit definition)",     sQuote(name), sQuote(package), thisPName)
+#: R/Methods.R:0
+msgid ""
+"Creating a generic function for %s from %s in %s\n"
+"    (from the saved implicit definition)"
+msgstr ""
+"Tworzenie ogólnej funkcji dla %s z pakietu %s w pakiecie %s (z zachowanej "
+"niejawnej definicji)"
 
+#. R/Methods.R: gettextf("Creating a generic function for %s from package %s in %s",     sQuote(f), sQuote(fdef@package), thisPName)
+#: R/Methods.R:0
 msgid "Creating a generic function for %s from package %s in %s"
 msgstr "Tworzenie ogólnej funkcji dla %s z pakietu %s w pakiecie %s"
 
-msgid ""
-"the method for function %s and signature %s is sealed and cannot be re-"
-"defined"
+#. R/Methods.R: gettextf("Creating a generic function from function %s in %s",     sQuote(f), thisPName)
+#: R/Methods.R:0
+msgid "Creating a generic function from function %s in %s"
+msgstr "Tworzenie nowej ogólnej funkcji z funkcji %s w pakiecie %s"
+
+#. R/Methods.R: gettextf("Creating a new generic function for %s in %s", sQuote(name),     thisPName)
+#: R/Methods.R:0
+msgid "Creating a new generic function for %s in %s"
+msgstr "Tworzenie nowej ogólnej funkcji dla %s w pakiecie %s"
+
+#. R/RClassUtils.R: stop("Data part is undefined for general S4 object")
+#: R/RClassUtils.R:0
+msgid "Data part is undefined for general S4 object"
 msgstr ""
-"metoda dla funkcji %s oraz sygnatury %s jest zamknięta i nie może być "
-"przedefiniowana"
+"Część 'Data' (gniazdo '.Data') jest niezdefiniowana dla ogólnego obiektu S4"
+
+#. R/RMethodUtils.R: message("Empty function name in .getGeneric")
+#: R/RMethodUtils.R:0
+msgid "Empty function name in .getGeneric"
+msgstr "Pusta nazwa funkcji w '.getGeneric'"
 
+#. R/trace.R: gettextf("Environment of class %s is locked; using global environment for new class",     dQuote(className))
+#: R/trace.R:0
+msgid ""
+"Environment of class %s is locked; using global environment for new class"
+msgstr ""
+"Środowisko klasy %s jest zablokowane; używanie globalnego środowiska dla "
+"nowej klasy"
+
+#. R/Methods.R: gettextf("For function %s, signature %s: argument in method definition changed from (%s) to (%s)",     sQuote(f), sQuote(signature), mnames, fnames)
+#: R/Methods.R:0
 msgid ""
 "For function %s, signature %s: argument in method definition changed from "
 "(%s) to (%s)"
@@ -221,149 +371,240 @@
 "Dla funkcji %s, sygnatura %s: argument w definicji metody zmienił się z (%s) "
 "na (%s)"
 
+#. R/RClassUtils.R: gettextf("Found more than one class \"%s\" in cache; using the first, from namespace '%s'",     name, pkgs[1])
+#: R/RClassUtils.R:0
 msgid ""
-"primitive functions cannot be methods; they must be enclosed in a regular "
-"function"
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
 msgstr ""
-"prymitywne funkcje nie mogą być metodami; muszą być zawarte w regularnej "
-"funkcji"
+"Znaleziono więcej niż jedną klasę \"%s\" w cache; używanie pierwszej, z "
+"przestrzeni nazw '%s'"
 
-msgid ""
-"invalid method definition: expected a function, got an object of class %s"
-msgstr ""
-"niepoprawna definicja metody: oczekiwano funkcji, otrzymano obiekt klasy %s"
+#. R/Methods.R: gettextf("Function %s is a group generic; do not call it directly",     sQuote(name))
+#: R/Methods.R:0
+msgid "Function %s is a group generic; do not call it directly"
+msgstr "Funkcja %s jest w grupie ogólnej; nie wywołuj jej bezpośrednio"
 
-msgid "function supplied as argument 'f' must be a generic"
-msgstr "funkcja dostarczona jako argument 'f' musi być ogólną funkcją"
+#. R/Methods.R: gettextf("Function %s is already a group generic; no change",     sQuote(name))
+#: R/Methods.R:0
+msgid "Function %s is already a group generic; no change"
+msgstr "funkcja %s już jest w grupie ogólnej; brak zmian"
 
-msgid "no generic function %s found"
-msgstr "nie znaleziono ogólnej funkcji %s "
+#. R/debug.R: stop("Function must be an S4 generic")
+#: R/debug.R:0
+msgid "Function must be an S4 generic"
+msgstr "Funkcja musi być generyczną funkcją klasy S4"
 
-msgid "no method found for function %s and signature %s"
-msgstr "nie znaleziono metody dla funkcji %s oraz sygnatury %s"
+#. R/trace.R: gettextf("Methods inserted for function %s(): %s", f, paste(methodsInserted,     collapse = ", "))
+#: R/trace.R:0
+msgid "Methods inserted for function %s(): %s"
+msgstr "Metody wstawione dla funkcji '%s()': %s"
 
-msgid "no environment or package corresponding to argument where=%s"
-msgstr "brak środowiska lub pakietu odpowiadającego argumentowi 'where=%s'"
+#. R/refClass.R: gettextf("Methods not found: %s", paste(dQuote(methods[missing]),     collapse = ", "))
+#: R/refClass.R:0
+msgid "Methods not found: %s"
+msgstr "Metody nie zostały znalezione: %s"
 
-msgid "no generic function found for '%s'"
-msgstr "nie znaleziono ogólnej funkcji dla '%s'"
+#. R/trace.R: gettextf("Modified functions inserted through trace(): %s", paste(objectsDone,     collapse = ", "))
+#: R/trace.R:0
+msgid "Modified functions inserted through trace(): %s"
+msgstr "Zmodyfikowane funkcje wstawione poprzez 'trace()': %s"
 
-msgid "no method found for function '%s' and signature %s"
-msgstr "nie znaleziono metody dla funkcji '%s' oraz sygnatury %s"
+#. R/trace.R: gettextf("New functions are not currently inserted (not untraceable): %s",     paste(newObjects, collapse = ", "))
+#: R/trace.R:0
+msgid "New functions are not currently inserted (not untraceable): %s"
+msgstr "nowe funkcje nie są aktualnie wstawione (nie są śledzone): %s"
 
-msgid "'file' must be a character string or a connection"
-msgstr "'file' musi być łańcuchem tekstowym lub połączeniem"
+#. R/SClasses.R: gettextf("No %s names supplied", what)
+#: R/SClasses.R:0
+msgid "No %s names supplied"
+msgstr "Nie dostarczono nazw %s"
 
+#. R/NextMethod.R: stop("No next method available")
+#: R/NextMethod.R:0
+msgid "No next method available"
+msgstr "Brak dostępnej następnej metody"
+
+#. R/methodsTable.R: gettextf("No simply inherited methods found for function %s; using non-simple method",     sQuote(fdef@generic))
+#: R/methodsTable.R:0
 msgid ""
-"argument 'signature' is not meaningful with the current implementation and "
-"is ignored \n"
-"(extract a subset of the methods list instead)"
+"No simply inherited methods found for function %s; using non-simple method"
 msgstr ""
-"argument 'signature' nie ma sensu razem z bieżącą implementacją tak więc "
-"zostaje zignorowany \n"
-"(zamiast tego wyodrębnij podzbiór listy metod)"
-
-msgid "no method for %s matches class %s"
-msgstr "żadna metoda dla %s nie zgadza się z klasą %s"
+"Nie znaleziono prostych dziedziczonych metod dla funkcji %s; używanie "
+"nieprostej metody"
 
-msgid "no method found for signature %s"
-msgstr "nie znaleziono metody dla sygnatury %s"
+#. R/trace.R: gettextf("Non-function objects are not currently inserted (not traceable): %s",     paste(notTraceable, collapse = ", "))
+#: R/trace.R:0
+msgid "Non-function objects are not currently inserted (not traceable): %s"
+msgstr ""
+"niefunkcjonalne obiekty nie są aktualnie wstawione (nie są śledzone): %s"
 
-msgid "%s has no methods defined"
-msgstr "%s nie ma zdefiniowanych metod"
+#. R/methodsTable.R: gettextf("Note: method with signature %s chosen for function %s,\n target signature %s.\n %s would also be valid",     sQuote(selected), sQuote(attr(cond, "generic")), sQuote(attr(cond,         "target")), paste0("\"", possible[is.na(match(possible,         selected))], "\"", collapse = ", "))
+#: R/methodsTable.R:0
+msgid ""
+"Note: method with signature %s chosen for function %s,\n"
+" target signature %s.\n"
+" %s would also be valid"
+msgstr ""
+"Uwaga: metoda z sygnaturÄ… %s wybrana dla funkcji %s,\n"
+" docelowa sygnatura %s.\n"
+" %s również byłaby poprawna"
 
+#. R/RClassUtils.R: gettextf("Note: some superclasses of class %s in package %s have duplicate definitions.  This definition is not being treated as equivalent to that from package %s",     dQuote(def@className), sQuote(def@package), sQuote(prev@package))
+#: R/RClassUtils.R:0
 msgid ""
-"bad class specified for element %d (should be a single character string)"
+"Note: some superclasses of class %s in package %s have duplicate "
+"definitions.  This definition is not being treated as equivalent to that "
+"from package %s"
 msgstr ""
-"określono błędną klasę dla elementu %d (powinien być jednym łańcuchem "
-"tekstowym)"
+"Uwaga: niektóre superklasy klasy %s w pakiecie %s posiadają powtórzone "
+"definicje. Ta definicja nie jest traktowana jako równoważna tej z pakietu %s"
 
+#. R/RClassUtils.R: gettextf("Note: the specification for class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class.",     dQuote(def@className), sQuote(def@package), sQuote(prev@package))
+#: R/RClassUtils.R:0
 msgid ""
-"first argument should be the names of one of more generic functions (got "
-"object of class %s)"
+"Note: the specification for class %s in package %s seems equivalent to one "
+"from package %s: not turning on duplicate class definitions for this class."
 msgstr ""
-"pierwszy argument powinien być nazwami jeden lub więcej ogólnych funkcji "
-"(otrzymano obiekt klasy %s)"
+"Uwaga: specyfikacja dla klasy S3 %s w pakiecie %s wydaje się być równoważna "
+"tej z pakietu %s i nie jest duplikatem definicji klasy dla tej klasy"
 
-msgid "must supply 'generic.function' or 'class'"
-msgstr "'generic.function' lub 'class' muszą być dostarczone"
+#. R/MethodsListClass.R: gettextf("\n    Notes: %s.\n", notei)
+#: R/MethodsListClass.R:0
+msgid "Notes: %s."
+msgstr "Uwagi: %s."
 
-msgid "%s is not an S4 generic function in %s; methods not removed"
+#. R/BasicClasses.R: gettextf("OOPS: something wrong with '.OldClassesPrototypes[[%d]]'",     i)
+#: R/BasicClasses.R:0
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
+msgstr "OOPS: coÅ› nie tak z '.OldClassesPrototypes[[%d]]'"
+
+#. R/refClass.R: gettextf("Reference superclasses must come from the same package for the environment to be defined:  got %s and %s",     .nQuote(clRefMethods$.objectPackage), .nQuote(pkg))
+#: R/refClass.R:0
+msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
 msgstr ""
-"'%s' nie jest ogólną funkcją S4 w pakiecie %s; metody nie zostały usunięte"
-
-msgid "cannot remove methods for %s in locked environment/package %s"
-msgstr "nie można usunąć metod dla %s w zablokowanym środowisku/pakiecie %s"
+"Referencyjna superklasa musi pochodzi z tego samego pakietu aby środowisko "
+"było zdefiniowane: otrzymano %s oraz %s"
 
+#. R/Methods.R: gettextf("Restoring default function definition of %s", sQuote(f))
+#: R/Methods.R:0
 msgid "Restoring default function definition of %s"
 msgstr "Przywracanie domyślnej definicji funkcji %s"
 
+#. R/ClassExtensions.R: gettextf("S3Part() is only defined for classes set up by setOldCLass(), basic classes or subclasses of these:  not true of class %s",     dQuote(class(object)))
+#: R/ClassExtensions.R:0
 msgid ""
-"error in updating S4 generic function %s; the function definition is not an "
-"S4 generic function (class %s)"
+"S3Part() is only defined for classes set up by setOldCLass(), basic classes "
+"or subclasses of these:  not true of class %s"
 msgstr ""
-"błąd w aktualizacji ogólnej funkcji S4 %s; definicja funkcji nie jest ogólną "
-"funkcjÄ… S4 (klasa %s)"
-
-msgid "Function %s is already a group generic; no change"
-msgstr "funkcja %s już jest w grupie ogólnej; brak zmian"
-
-msgid "Function %s is a group generic; do not call it directly"
-msgstr "Funkcja %s jest w grupie ogólnej; nie wywołuj jej bezpośrednio"
-
-msgid "callGeneric() must be called from within a method body"
-msgstr "'callGeneric()' musi być wywołana z wewnątrz ciała ogólnej metody"
-
-msgid "expected a non-empty character string for argument name"
-msgstr "oczekiwano niepustego łańcucha tekstowego dla nazwy argumentu"
+"metoda 'S3Part()' jest zdefiniowana tylko dla klas ustawionych przez metodÄ™ "
+"'setOldCLass()', podstawowe klasy lub ich podklasy: nie jest to prawdÄ… dla "
+"klasy %s"
 
-msgid "generic function supplied was not created for %s"
-msgstr "dostarczona funkcja ogólna nie została utworzona dla %s"
+#. R/method.skeleton.R: gettextf("Skeleton of method written to %s", if (is.character(file)) file else "connection")
+#: R/method.skeleton.R:0
+msgid "Skeleton of method written to %s"
+msgstr "struktura metody zapisana w %s"
 
-msgid "%s is a primitive function; its generic form cannot be redefined"
+#. R/as.R: gettextf("a 'replace' method definition in 'setAs' must be a function of two arguments, got %d",     length(args))
+#: R/as.R:0
+msgid ""
+"a 'replace' method definition in 'setAs' must be a function of two "
+"arguments, got %d"
 msgstr ""
-"%s jest prymitywną funkcją; jej ogólna forma nie może zostać przedefiniowana"
+"definicja metody 'replace' w 'setAs' musi być funkcją dwóch argumentów, "
+"otrzymano %d"
 
+#. R/NextMethod.R: gettextf("a call to callNextMethod() appears in a call to %s, but the call does not seem to come from either a generic function or another 'callNextMethod'",     sQuote(f))
+#: R/NextMethod.R:0
 msgid ""
-"%s is not currently a generic:  define it first to create a non-default "
-"implicit form"
+"a call to callNextMethod() appears in a call to %s, but the call does not "
+"seem to come from either a generic function or another 'callNextMethod'"
 msgstr ""
-"%s nie jest aktualnie funkcją ogólną: zdefiniuj ją najpierw aby utworzyć "
-"niedomyślną niejawną formę"
+"wywołanie 'callNextMethod()' pojawia się w wywołaniu %s, ale wywołanie nie "
+"wygląda na pochodzące ani z ogólnej funkcji albo drugiego 'callNextMethod'"
 
-msgid "must provide an environment table; got class %s"
-msgstr "potrzeba dostarczyć tablicę środowiska; otrzymano klasę %s"
+#. R/refClass.R: gettextf("a call to superClass() is in the method %s but there is no superclass definition of this method for class %s",     sQuote(me), dQuote(thisClass@className))
+#: R/refClass.R:0
+msgid ""
+"a call to superClass() is in the method %s but there is no superclass "
+"definition of this method for class %s"
+msgstr ""
+"wywołanie 'superClass()' jest w metodzie %s, ale brak tam definicji "
+"superklasy tej metody dla klasy %s"
 
-msgid "original function is prohibited as a generic function"
-msgstr "oryginalna funkcja jest zakazana jako ogólna funkcja"
+#. R/Methods.R: stop("a function for argument 'f' must be a generic function")
+#. R/trace.R: stop("a function for argument 'f' must be a generic function")
+#: R/Methods.R:0 R/trace.R:0
+msgid "a function for argument 'f' must be a generic function"
+msgstr "funkcja dla argumentu 'f' musi być ogólną funkcją"
 
-msgid "not both functions!"
-msgstr "jeden z argumentów nie jest funkcją!"
+#. R/RClassUtils.R: gettextf("a prototype object was supplied with object slot of class %s, but the class definition requires an object that is class %s",     dQuote(class(prototype@object)), dQuote(dataPartClass))
+#: R/RClassUtils.R:0
+msgid ""
+"a prototype object was supplied with object slot of class %s, but the class "
+"definition requires an object that is class %s"
+msgstr ""
+"obiekt prototypu został dostarczony z gniazdami klasy %s, ale definicja "
+"klasy wymaga obiektu klasy %s"
 
-msgid "argument %s is not S4"
-msgstr "argument '%s' nie jest S4"
+#. R/RClassUtils.R: gettextf("a prototype was supplied of class %s, but the class definition requires an object that is class %s",     dQuote(class(prototype)), dQuote(dataPartClass))
+#: R/RClassUtils.R:0
+msgid ""
+"a prototype was supplied of class %s, but the class definition requires an "
+"object that is class %s"
+msgstr ""
+"został dostarczony prototyp klasy %s, ale definicja klasy wymaga obiektu "
+"klasy %s"
 
-msgid "formal arguments differ (in default values?)"
-msgstr "formalne argumenty różnią się (w wartościach domyślnych?)"
+#. R/refClass.R: gettextf("a single class name is needed for field %s, got a character vector of length %d",     sQuote(thisName), length(thisField))
+#: R/refClass.R:0
+msgid ""
+"a single class name is needed for field %s, got a character vector of length "
+"%d"
+msgstr ""
+"potrzeba pojedynczej nazwy klasy dla pola %s, otrzymano wektor tekstowy o "
+"długości %d"
 
-msgid "formal arguments differ: (%s), (%s)"
-msgstr "formalne argumenty różnią się: (%s), (%s)"
+#. R/RClassUtils.R: gettextf("a validity method must be a function of one argument, got an object of class %s",     dQuote(class(validity)))
+#: R/RClassUtils.R:0
+msgid ""
+"a validity method must be a function of one argument, got an object of class "
+"%s"
+msgstr ""
+"metoda poprawności musi być funkcją jednego argumentu, otrzymano obiekt "
+"klasy %s"
 
-msgid "value classes differ: %s, %s"
-msgstr "wartości klas różnią się: %s, %s"
+#. R/SClasses.R: gettextf("abnormal type %s is not supported as a superclass of a class definition",     dQuote(type))
+#: R/SClasses.R:0
+msgid "abnormal type %s is not supported as a superclass of a class definition"
+msgstr "nienormalny typ %s nie jest wspierany jako superklasa definicji klasy"
 
-msgid "signatures differ:  (%s), (%s)"
-msgstr "sygnatury różnią się:  (%s), (%s)"
+#. R/RMethodUtils.R: gettextf("action function %s has no arguments, should have at least 1",     sQuote(fname))
+#: R/RMethodUtils.R:0
+msgid "action function %s has no arguments, should have at least 1"
+msgstr "funkcja akcji %s nie posiada argumentów, a powinna mieć przynajmniej 1"
 
-msgid "package slots  differ: %s, %s"
-msgstr "gniazda pakietów różnią się: %s, %s"
+#. R/as.R: warning("ambiguous object (length != 1) to coerce to \"name\"")
+#: R/as.R:0
+msgid "ambiguous object (length != 1) to coerce to \"name\""
+msgstr "dwuznaczny obiekt (długość różna od 1) do przekształcenia w \"name\""
 
-msgid "groups differ: %s, %s"
-msgstr "grupy różnią się: %s, %s"
+#. R/zzz.R: warning("apparently bad method or class metadata in saved environment;\n",     "move the file or remove the class/method")
+#: R/zzz.R:0
+msgid "apparently bad method or class metadata in saved environment;"
+msgstr "najwyraźniej złe metadane metody lub klasy w zapisanym środowisku;"
 
-msgid "generic names differ: %s, %s"
-msgstr "ogólne nazwy różnią się: %s, %s"
+#. R/Methods.R: gettextf("argument %s is not S4", deparse(substitute(f1)))
+#. R/Methods.R: gettextf("argument %s is not S4", deparse(substitute(f2)))
+#: R/Methods.R:0
+msgid "argument %s is not S4"
+msgstr "argument '%s' nie jest S4"
 
+#. R/Methods.R: gettextf("argument %s must be a generic function or a single character string; got an object of class %s",     sQuote("f"), dQuote(class(f)))
+#: R/Methods.R:0
 msgid ""
 "argument %s must be a generic function or a single character string; got an "
 "object of class %s"
@@ -371,460 +612,613 @@
 "argument %s musi być funkcją ogólną lub pojedynczym łańcuchem tekstowym; "
 "otrzymano obiekt klasy %s"
 
-msgid "non-generic function '%s' given to findMethods()"
-msgstr "nieogólna funkcja '%s' przekazana do 'findMethods()'"
+#. R/SClasses.R: gettextf("argument %s must be a list or a character vector; got an object of class %s",     dQuote(what), dQuote(class(fields)))
+#: R/SClasses.R:0
+msgid ""
+"argument %s must be a list or a character vector; got an object of class %s"
+msgstr ""
+"argument %s musi być listą  lub wektorem tekstowym; otrzymano obiekt klasy %s"
 
+#. R/oldClass.R: gettextf("argument 'Classes' must be a vector of two classes; got an argument of length %d",     length(Classes))
+#: R/oldClass.R:0
 msgid ""
-"only FALSE is meaningful for 'inherited', when 'where' is supplied (got %s)"
+"argument 'Classes' must be a vector of two classes; got an argument of "
+"length %d"
 msgstr ""
-"tylko FALSE ma sens dla 'inherited', gdy dostarczono 'where' (otrzymano %s)"
+"argument 'Classes' musi być wektorem dwóch klas; otrzymano argument o "
+"długości %d"
 
-msgid "argument 'f' must be a generic function or %s"
-msgstr "argument 'f' musi być funkcją ogólną lub %s"
+#. R/oldClass.R: gettextf("argument 'S4Class' must be a class definition: got an object of class %s",     dQuote(class(S4Class)))
+#: R/oldClass.R:0
+msgid ""
+"argument 'S4Class' must be a class definition: got an object of class %s"
+msgstr "argument 'S4Class' musi być definicją klasy: otrzymano obiekt klasy %s"
 
-msgid "'%s' is not a known generic function {and 'package' not specified}"
-msgstr ""
-"'%s' nie jest znaną ogólną funkcją {oraz 'package' nie został określony}"
+#. R/RClassUtils.R: stop("argument 'abbreviate' must be 0, 1, 2, or 3")
+#: R/RClassUtils.R:0
+msgid "argument 'abbreviate' must be 0, 1, 2, or 3"
+msgstr "argument 'abbreviate' musi mieć wartość 0, 1, 2, lub 3"
+
+#. R/SClasses.R: stop("argument 'classDef' must be a class definition or the name of a class")
+#: R/SClasses.R:0
+msgid "argument 'classDef' must be a class definition or the name of a class"
+msgstr "argument 'classDef' musi być definicją klasy lub nazwą klasy"
 
+#. R/SClasses.R: gettextf("argument 'classDef' must be a string or a class representation; got an object of class %s",     dQuote(class(classDef)))
+#: R/SClasses.R:0
 msgid ""
-"invalid first argument: should be the name of the first argument in the "
-"dispatch"
+"argument 'classDef' must be a string or a class representation; got an "
+"object of class %s"
 msgstr ""
-"niepoprawny pierwszy argument: powinna to być nazwa pierwszego argumentu w "
-"wysyłce"
+"argument 'classDef' musi być łańcuchem albo reprezentacją klasy; otrzymano "
+"obiekt klasy %s"
 
-msgid "duplicate element names in 'MethodsList' at level %d: %s"
-msgstr "powtórzone nazwy elementów w 'MethodsList' na poziomie %d: %s"
+#. R/Methods.R: gettextf("argument 'f' must be a generic function or %s", .notSingleString(f))
+#: R/Methods.R:0
+msgid "argument 'f' must be a generic function or %s"
+msgstr "argument 'f' musi być funkcją ogólną lub %s"
 
+#. R/RMethodUtils.R: stop("argument 'f' must be a string, generic function, or primitive: got an ordinary function")
+#: R/RMethodUtils.R:0
 msgid ""
-"element %d at level %d (class %s) cannot be interpreted as a function or "
-"named list"
+"argument 'f' must be a string, generic function, or primitive: got an "
+"ordinary function"
 msgstr ""
-"element %d na poziomie %d (klasa %s) nie może być interpretowany jak funkcja "
-"lub nazwana lista"
-
-msgid "arguments 'names' and 'signature' must have the same length"
-msgstr "argumenty 'names' oraz 'signature' muszą posiadać tę samą długość"
+"argument 'f' musi być łańcuchem, ogólną funkcją, lub funkcją prymitywną: "
+"otrzymano zwykłą funkcję"
 
+#. R/RClassUtils.R: stop("argument 'includeSubclasses' must be a logical, either one value or a vector of the same length as argument 'classes'")
+#: R/RClassUtils.R:0
 msgid ""
-"inserting method with invalid signature matching argument '...' to class %s"
+"argument 'includeSubclasses' must be a logical, either one value or a vector "
+"of the same length as argument 'classes'"
 msgstr ""
-"wstawianie metody z niepoprawnÄ… sygnaturÄ… pasujÄ…cÄ… do argumentu '...' do "
-"klasy %s"
+"argument 'includeSubclasses' musi być argumentem logicznym posiadającym "
+"jedną wartość lub wektorem o tej samej długości jak argument 'classes'"
 
-msgid "inserting method corresponding to empty signature"
-msgstr "wstawienie metody odpowiadajÄ…cej pustej sygnaturze"
-
-msgid "inserting method into non-methods-list object (class %s)"
-msgstr "wstawienie metody w obiekt nie będący listą metod (klasa %s)"
-
-msgid "invalid method sublist"
-msgstr "niepoprawne podlista metod"
+#. R/trace.R: stop("argument 'signature' is not meaningful for tracing reference methods")
+#: R/trace.R:0
+msgid "argument 'signature' is not meaningful for tracing reference methods"
+msgstr "argument 'signature' nie ma sensu dla śledzenia metod referencyjnych"
 
+#. R/Methods.R: warning("argument 'signature' is not meaningful with the current implementation and is ignored \n(extract a subset of the methods list instead)")
+#: R/Methods.R:0
 msgid ""
-"%f is not a valid generic function: methods list was an object of class %s"
+"argument 'signature' is not meaningful with the current implementation and "
+"is ignored \n"
+"(extract a subset of the methods list instead)"
 msgstr ""
-"%f nie jest poprawną ogólną funkcją: lista metod była obiektem klasy %s"
+"argument 'signature' nie ma sensu razem z bieżącą implementacją tak więc "
+"zostaje zignorowany \n"
+"(zamiast tego wyodrębnij podzbiór listy metod)"
 
+#. R/methodsTable.R: stop("argument 'signatures' must be a character matrix whose rows are method signatures")
+#: R/methodsTable.R:0
 msgid ""
-"%s must be TRUE, FALSE, or a named logical vector of those values; got an "
-"object of class %s"
+"argument 'signatures' must be a character matrix whose rows are method "
+"signatures"
 msgstr ""
-"%s musi być TRUE, FALSE, lub nazwanym wektorem logicznym tych wartości; "
-"otrzymano obiekt klasy %s"
+"argument 'signatures' musi być macierzą tekstową której wiersze są "
+"sygnaturami metod"
+
+#. R/trace.R: stop("argument 'what' should be the name of a function")
+#: R/trace.R:0
+msgid "argument 'what' should be the name of a function"
+msgstr "argument 'what' musi być nazwą funkcji"
 
+#. R/RMethodUtils.R: stop("argument f must be a generic function with signature \"...\"")
+#: R/RMethodUtils.R:0
+msgid "argument f must be a generic function with signature \"...\""
+msgstr "argument 'f' musi być ogólną funkcją z sygnaturą '...'"
+
+#. R/as.R: gettextf("argument names in 'replace' changed to agree with 'coerce<-' generic:\n%s",     paste(deparse(replace), sep = "\n    "))
+#: R/as.R:0
 msgid ""
-"default method must be a method definition, a primitive or NULL: got an "
-"object of class %s"
+"argument names in 'replace' changed to agree with 'coerce<-' generic:\n"
+"%s"
 msgstr ""
-"domyślna metoda musi być definicją metody, prymitywną funkcją lub wartością "
-"NULL: otrzymano obiekt klasy %s"
+"nazwy argumentów w metodzie 'replace' zostały zmienione aby zgadzać się z "
+"ogólnym 'coerce<-':\n"
+"%s"
 
+#. R/MethodsList.R: stop("arguments 'names' and 'signature' must have the same length")
+#: R/MethodsList.R:0
+msgid "arguments 'names' and 'signature' must have the same length"
+msgstr "argumenty 'names' oraz 'signature' muszą posiadać tę samą długość"
+
+#. R/RMethodUtils.R: gettextf("arguments (%s) after '...' in the generic must appear in the method, in the same place at the end of the argument list",     paste(trailingArgs, collapse = ", "))
+#: R/RMethodUtils.R:0
 msgid ""
-"trying to match a method signature to an object (of class %s) that is not a "
-"generic function"
+"arguments (%s) after '...' in the generic must appear in the method, in the "
+"same place at the end of the argument list"
 msgstr ""
-"próba dopasowania sygnatury metody do obiektu (klasy %s), który nie jest "
-"ogólną funkcją"
+"argumenty (%s) po '...' w ogólnej funkcji muszą pojawić się w metodzie w tym "
+"samym miejscu na końcu listy argumentów"
 
-msgid "invalid 'package' slot or attribute, wrong length"
-msgstr "niepoprawna gniazdo 'package' lub atrybut; niepoprawna długość"
+#. R/refClass.R: stop("arguments must all be character string names of fields")
+#: R/refClass.R:0
+msgid "arguments must all be character string names of fields"
+msgstr "wszystkie argumenty muszą być łańcuchami tekstowymi nazw pól"
 
-msgid ""
-"invalid element in a list for \"signature\" argument; element %d is neither "
-"a class definition nor a class name"
+#. R/refClass.R: stop("arguments to methods() must be named, or one named list")
+#: R/refClass.R:0
+msgid "arguments to methods() must be named, or one named list"
 msgstr ""
-"niepoprawny element na liście dla argumentu 'signature'; element %d nie jest "
-"ani definicjÄ… klasy ani nazwÄ… klasy"
+"argumenty przekazane do 'methods()' muszą być nazwane lub być jedną nazwaną "
+"listÄ…"
+
+#. R/RClassUtils.R: gettextf("assigning as %s a class representation with internal name %s",     dQuote(Class), dQuote(def@className))
+#: R/RClassUtils.R:0
+msgid "assigning as %s a class representation with internal name %s"
+msgstr "przypisywanie jako %s reprezentacji klasy z wewnętrzną nazwą %s"
+
+#. R/trace.R: gettextf("assigning over the binding of symbol %s in environment/package %s",     sQuote(what), sQuote(pname))
+#: R/trace.R:0
+msgid "assigning over the binding of symbol %s in environment/package %s"
+msgstr "przypisywanie poprzez powiązanie symbolu %s w środowisku/pakiecie %s"
 
+#. R/SClasses.R: gettextf("assignment of an object of class %s is not valid for @%s in an object of class %s; is(value, \"%s\") is not TRUE",     dQuote(valueClass), sQuote(name), dQuote(cl), slotClass)
+#: R/SClasses.R:0
 msgid ""
-"trying to match a method signature of class %s; expects a list or a "
-"character vector"
+"assignment of an object of class %s is not valid for @%s in an object of "
+"class %s; is(value, \"%s\") is not TRUE"
 msgstr ""
-"próba dopasowania sygnatury metody klasy %s; oczekuje listy lub wektor "
-"tekstowego"
+"przypisanie obiektu klasy %s nie jest poprawny dla @%s w obiekcie klasy %s; "
+"'is(value, \"%s\")' nie ma wartości TRUE"
 
+#. R/SClasses.R: gettextf("assignment of an object of class %s is not valid for slot %s in an object of class %s; is(value, \"%s\") is not TRUE",     dQuote(valueClass), sQuote(name), dQuote(cl), slotClass)
+#: R/SClasses.R:0
 msgid ""
-"object to use as a method signature for function %s does not look like a "
-"legitimate signature (a vector of single class names): there were %d class "
-"names, but %d elements in the signature object"
+"assignment of an object of class %s is not valid for slot %s in an object of "
+"class %s; is(value, \"%s\") is not TRUE"
 msgstr ""
-"obiekt do użycia jako sygnatura metody dla funkcji %s nie wygląda na "
-"poprawną sygnaturę (wektor pojedynczych nazw klas): było %d nazw klas, ale "
-"%d elementów w obiekcie sygnatury"
+"przypisanie obiektu klasy %s nie jest poprawny dla gniazda %s w obiekcie "
+"klasy %s; 'is(value, %s)' nie ma wartości TRUE"
 
+#. R/Methods.R: gettextf("bad class specified for element %d (should be a single character string)",     i)
+#: R/Methods.R:0
 msgid ""
-"more elements in the method signature (%d) than in the generic signature "
-"(%d) for function %s"
+"bad class specified for element %d (should be a single character string)"
 msgstr ""
-"więcej elementów w sygnaturze metody (%d) niż w ogólnej sygnaturze (%d) dla "
-"funkcji %s"
+"określono błędną klasę dla elementu %d (powinien być jednym łańcuchem "
+"tekstowym)"
 
-msgid "no generic function found corresponding to %s"
-msgstr "nie znaleziono ogólnej funkcji odpowiadającej %s"
+#. R/methodsTable.R: gettextf("bad method object stored in method table, class %s",     dQuote(class(current)))
+#: R/methodsTable.R:0
+msgid "bad method object stored in method table, class %s"
+msgstr "błędny obiekt metody przechowywany w tablicy metod, klasy %s"
 
-msgid "skipping methods list element %s of unexpected class %s"
-msgstr "pomijanie elementów listy metod %s nieoczekiwanej klasy %s"
+#. R/NextMethod.R: gettextf("bad object found as method (class %s)", dQuote(class(method)))
+#: R/NextMethod.R:0
+msgid "bad object found as method (class %s)"
+msgstr "znaleziono błędny obiekt jako metodę (klasa %s)"
+
+#. R/is.R: gettext("both classes must be defined")
+#: R/is.R:0
+msgid "both classes must be defined"
+msgstr "obie klasy muszą być zdefiniowane"
 
+#. R/NextMethod.R: stop("call to 'callNextMethod' does not appear to be in a 'method' or 'callNextMethod' context")
+#: R/NextMethod.R:0
 msgid ""
-"%s, along with other use of the \"MethodsList\" metadata objects, is "
-"deprecated."
+"call to 'callNextMethod' does not appear to be in a 'method' or "
+"'callNextMethod' context"
 msgstr ""
-"%s, razem z innym użyciem obiektów metadanych 'MethodsList' jest "
-"przestarzałe."
-
-msgid "in %s: use of \"MethodsList\" metadata objects is deprecated."
-msgstr "w %s: użycie obiektów metadanych \"MethodsList\" jest przestarzałe."
+"wywołanie 'callNextMethod' nie wygląda aby było w kontekście 'method' lub "
+"'callNextMethod'"
 
-msgid "use %s instead."
-msgstr "użyj wzamian %s."
+#. R/Methods.R: stop("callGeneric() must be called from within a method body")
+#: R/Methods.R:0
+msgid "callGeneric() must be called from within a method body"
+msgstr "'callGeneric()' musi być wywołana z wewnątrz ciała ogólnej metody"
 
-#, fuzzy
+#. R/is.R: gettextf("cannot create a 'setIs' relation when neither of the classes (%s and %s) is local and modifiable in this package",     dQuote(class1), dQuote(class2))
+#: R/is.R:0
 msgid ""
-"%s, along with other use of the \"MethodsList\" metadata objects, is defunct."
+"cannot create a 'setIs' relation when neither of the classes (%s and %s) is "
+"local and modifiable in this package"
 msgstr ""
-"%s, razem z innym użyciem obiektów metadanych 'MethodsList' jest "
-"przestarzałe."
-
-#, fuzzy
-msgid "in %s: use of \"MethodsList\" metadata objects is defunct."
-msgstr "w %s: użycie obiektów metadanych \"MethodsList\" jest przestarzałe."
+"nie można utworzyć relacji 'setIs' kiedy żadna z klas (%s oraz %s) nie jest "
+"lokalna oraz modyfikowalna w tym pakiecie"
 
-msgid "invalid object for formal method definition: type %s"
-msgstr "niepoprawny obiekt dla definicji formalnej metody: typ %s"
+#. R/trace.R: gettextf("cannot find an environment corresponding to package name '%s\"",     package)
+#: R/trace.R:0
+msgid "cannot find an environment corresponding to package name '%s\""
+msgstr "nie można znaleźć środowiska odpowiadającego nazwie pakietu '%s'"
 
-msgid "missing package slot (%s) in object of class %s (package info added)"
-msgstr ""
-"brakujÄ…ce gniazdo pakietu (%s) w obiekcie klasy %s (dodana informacja o "
-"pakiecie)"
+#. R/BasicClasses.R: stop("cannot have more than one unnamed argument as environment")
+#: R/BasicClasses.R:0
+msgid "cannot have more than one unnamed argument as environment"
+msgstr "nie można mieć więcej niż jeden nienazwany argument jako środowisko"
 
+#. R/trace.R: gettextf("cannot insert methods for these functions (methods table not found in source): %s",     paste("\"", methods[notThere], "\"", sep = "", collapse = ", "))
+#: R/trace.R:0
 msgid ""
-"'initialize' method returned an object of class %s instead of the required "
-"class %s"
+"cannot insert methods for these functions (methods table not found in "
+"source): %s"
 msgstr ""
-"metoda 'initialize' zwróciła obiekt klasy %s zamiast wymaganej klasy %s"
-
-msgid "%d: target \"%s\": chose \"%s\" (others: %s)"
-msgstr "%d: cel \"%s\": wybrano \"%s\" (inne: %s)"
+"nie można wstawić metod dla tych funkcji (tablica metod nie została "
+"znaleziona w źródle): %s"
 
-msgid "Notes: %s."
-msgstr "Uwagi: %s."
+#. R/trace.R: gettextf("cannot insert these (not found in source): %s", paste("\"",     functions[notThere], "\"", sep = "", collapse = ", "))
+#: R/trace.R:0
+msgid "cannot insert these (not found in source): %s"
+msgstr "nie można ich wstawić (nie znaleziono w źródle): %s"
 
-msgid "class generator function for class %s from package %s"
-msgstr "funkcja generatora klas dla klasy %s z pakietu %s"
+#. R/Methods.R: gettextf("cannot remove methods for %s in locked environment/package %s",     sQuote(f), sQuote(getPackageName(db)))
+#: R/Methods.R:0
+msgid "cannot remove methods for %s in locked environment/package %s"
+msgstr "nie można usunąć metod dla %s w zablokowanym środowisku/pakiecie %s"
 
-msgid "the names in signature for method (%s) do not match %s's arguments (%s)"
+#. R/BasicClasses.R: stop("cannot specify array() arguments when specifying '.Data'")
+#: R/BasicClasses.R:0
+msgid "cannot specify array() arguments when specifying '.Data'"
 msgstr ""
-"nazwy w sygnaturze dla metody (%s) nie zgadzajÄ… siÄ™ z argumentami %s (%s)"
+"nie można określić argumentów metody 'array()' gdy określane jest '.Data'"
 
-msgid ""
-"the names in signature for method (%s) do not match function's arguments (%s)"
+#. R/BasicClasses.R: stop("cannot specify matrix() arguments when specifying '.Data'")
+#: R/BasicClasses.R:0
+msgid "cannot specify matrix() arguments when specifying '.Data'"
 msgstr ""
-"nazwy w sygnaturze dla metody (%s) nie zgadzajÄ… siÄ™ z argumentami funkcji "
-"(%s)"
+"nie można określić argumentów metody 'matrix()' gdy określane jest '.Data'"
 
-msgid ""
-"a call to callNextMethod() appears in a call to %s, but the call does not "
-"seem to come from either a generic function or another 'callNextMethod'"
+#. R/trace.R: gettextf("cannot untrace method for %s; no method defined for this signature: %s",     sQuote(what), paste(signature, collapse = ", "))
+#: R/trace.R:0
+msgid "cannot untrace method for %s; no method defined for this signature: %s"
 msgstr ""
-"wywołanie 'callNextMethod()' pojawia się w wywołaniu %s, ale wywołanie nie "
-"wygląda na pochodzące ani z ogólnej funkcji albo drugiego 'callNextMethod'"
+"nie można zwolnić śledzenia metody dla %s; nie zdefiniowano metody dla tej "
+"sygnatury: %s"
 
+#. R/trace.R: stop("cannot use 'at' argument unless the function body has the form '{ ... }'")
+#: R/trace.R:0
 msgid ""
-"call to 'callNextMethod' does not appear to be in a 'method' or "
-"'callNextMethod' context"
-msgstr ""
-"wywołanie 'callNextMethod' nie wygląda aby było w kontekście 'method' lub "
-"'callNextMethod'"
-
-msgid "bad object found as method (class %s)"
-msgstr "znaleziono błędny obiekt jako metodę (klasa %s)"
+"cannot use 'at' argument unless the function body has the form '{ ... }'"
+msgstr "nie można użyć argumentu 'at' o ile ciało funkcji ma formę '{ ... }'"
 
-msgid "No next method available"
-msgstr "Brak dostępnej następnej metody"
+#. R/trace.R: stop("cannot use 'at' argument without a trace expression")
+#: R/trace.R:0
+msgid "cannot use 'at' argument without a trace expression"
+msgstr "nie można użyć argumentu 'at' bez wyrażenia śledzenia"
 
+#. R/SClasses.R: gettextf("cannot use object of class %s in new():  class %s does not extend that class",     dQuote(Classi), dQuote(Class))
+#: R/SClasses.R:0
 msgid ""
-"in constructing the prototype for class %s: prototype has class %s, but the "
-"data part specifies class %s"
+"cannot use object of class %s in new():  class %s does not extend that class"
 msgstr ""
-"podczas konstruowaniu prototypu dla klasy %s: prototyp posiada klasÄ™ %s, ale "
-"dane określają klasę %s"
+"nie można użyć obiektu klasy %s w 'new()': klasa %s nie rozszerza tej klasy"
 
-msgid ""
-"in constructing the prototype for class %s, slots in prototype and not in "
-"class: %s"
-msgstr ""
-"podczas konstruowaniu prototypu dla klasy %s, gniazda sÄ… w prototypie a nie "
-"w klasie: %s"
+#. R/is.R: gettextf("class %s cannot extend class %s", dQuote(class1), dQuote(class2))
+#: R/is.R:0
+msgid "class %s cannot extend class %s"
+msgstr "klasa %s nie może rozszerzyć klasy %s"
 
-msgid ""
-"in making the prototype for class %s elements of the prototype failed to "
-"match the corresponding slot class: %s"
-msgstr ""
-"podczas tworzenia prototypu dla klasy %s elementy prototypu nie zgodziły się "
-"z odpowiadajÄ…cymi gniazdami klasy: %s"
+#. R/RClassUtils.R: gettextf("class %s does not have a data part (a .Data slot) defined",     dQuote(class(object)))
+#: R/RClassUtils.R:0
+msgid "class %s does not have a data part (a .Data slot) defined"
+msgstr "klasa %s nie ma zdefiniowanej części danych (gniazdo '.Data')"
 
+#. R/BasicClasses.R: gettextf("class %s does not have an S3 data part, and so is of type \"S4\"; no S3 equivalent",     dQuote(class(from)))
+#: R/BasicClasses.R:0
 msgid ""
-"potential cycle in class inheritance: %s has duplicates in superclasses and "
-"subclasses (%s)"
+"class %s does not have an S3 data part, and so is of type \"S4\"; no S3 "
+"equivalent"
 msgstr ""
-"potencjalny cykl w dziedziczeniu klasy: %s ma powtórzenia w superklasach "
-"oraz podklasach (%s)"
-
-msgid "undefined slot classes in definition of %s: %s"
-msgstr "niezdefiniowane gniazda klas w definicji %s: %s"
-
-msgid "(class %s)"
-msgstr "(klasa %s)"
+"klasa %s nie ma części danych S3, i dlatego też jest typu S4; brak "
+"ekwiwalentu S3"
 
-msgid ""
-"in definition of class %s, information for superclass %s is of class %s "
-"(expected \"SClassExtension\")"
-msgstr ""
-"w definicji klasy %s, informacja dla superklasy %s jest klasy %s (oczekiwano "
-"'SClassExtension')"
+#. R/RClassUtils.R: gettextf("class %s extends an undefined class (%s)", dQuote(name),     dQuote(cl))
+#: R/RClassUtils.R:0
+msgid "class %s extends an undefined class (%s)"
+msgstr "klasa %s rozszerza niezdefiniowanÄ… klasÄ™ (%s)"
 
+#. R/RClassUtils.R: gettextf("class %s extends an undefined class, %s", dQuote(ClassDef@className),     dQuote(what))
+#: R/RClassUtils.R:0
 msgid "class %s extends an undefined class, %s"
 msgstr "klasa %s rozszerza niezdefiniowanÄ… klasÄ™, %s"
 
-msgid "'Class' must be a valid class definition or class"
-msgstr "Argument 'Class' musi być poprawną definicją klasy lub klasą"
-
-msgid ""
-"trying to assign an object of class %s as the definition of class %s: must "
-"supply a \"classRepresentation\" object"
-msgstr ""
-"próba przypisania obiekt klasy %s jako definicję klasy %s: potrzeba "
-"dostarczyć obiekt 'classRepresentation'"
-
-msgid "assigning as %s a class representation with internal name %s"
-msgstr "przypisywanie jako %s reprezentacji klasy z wewnętrzną nazwą %s"
+#. R/refClass.R: gettextf("class %s for field %s is not defined", dQuote(thisField),     sQuote(thisName))
+#: R/refClass.R:0
+msgid "class %s for field %s is not defined"
+msgstr "klasa %s dla pola %s nie jest zdefiniowana"
 
+#. R/RClassUtils.R: gettextf("class %s has a locked definition in package %s", dQuote(Class),     sQuote(getPackageName(where)))
+#: R/RClassUtils.R:0
 msgid "class %s has a locked definition in package %s"
 msgstr "klasa %s ma zablokowanÄ… definicjÄ™ w pakiecie %s"
 
-msgid "'externalptr' objects cannot be initialized from new()"
-msgstr "obiekty 'externalptr' nie mogą być inicjalizowane z funkcji 'new()'"
-
-msgid ""
-"initializing objects from class %s with these arguments is not supported"
+#. R/SClasses.R: gettextf("class %s has multiple definitions visible; only the first removed",     dQuote(Class))
+#: R/SClasses.R:0
+msgid "class %s has multiple definitions visible; only the first removed"
 msgstr ""
-"inicjalizowanie obiektów z klasy %s z tymi argumentami nie jest wspierane"
+"klasa %s posiada widoczne wielokrotne definicje; usunięto tylko pierwszą"
 
-msgid ""
-"in defining class %s, the supplied data part class, %s is not valid (must be "
-"a basic class or a virtual class combining basic classes)"
-msgstr ""
-"podczas definiowania klasy %s, dostarczona część danych klasy, %s nie jest "
-"poprawna (musi być podstawową klasą lub klasą wirtualną łączącą podstawowe "
-"klasy)"
-
-msgid ""
-"no definition was found for superclass %s in the specification of class %s"
-msgstr "nie znaleziono definicji dla superklasy %s w specyfikacji klasy %s"
-
-msgid "conflicting definition of data part: .Data = %s, superclass implies %s"
-msgstr ""
-"sprzeczne definicje części danych: '.Data = %s', superklasa sugeruje %s"
+#. R/is.R: gettextf("class %s has no visible definition from package or environment %s",     dQuote(class2), sQuote(getPackageName(where)))
+#: R/is.R:0
+msgid "class %s has no visible definition from package or environment %s"
+msgstr "klasa %s nie ma widocznej definicji w pakiecie lub środowisku %s"
 
+#. R/BasicClasses.R: gettextf("class %s is VIRTUAL; not meaningful to create an S4 object from this class",     dQuote(cl))
+#: R/BasicClasses.R:0
 msgid ""
-"a prototype object was supplied with object slot of class %s, but the class "
-"definition requires an object that is class %s"
-msgstr ""
-"obiekt prototypu został dostarczony z gniazdami klasy %s, ale definicja "
-"klasy wymaga obiektu klasy %s"
+"class %s is VIRTUAL; not meaningful to create an S4 object from this class"
+msgstr "klasa %s jest WIRTUALNA; nie ma sensu tworzyć obiektu S4 z tej klasy"
 
+#. R/as.R: gettextf("class %s is a class union: 'coerce' relations to a class union are not meaningful",     dQuote(to))
+#: R/as.R:0
 msgid ""
-"a prototype was supplied of class %s, but the class definition requires an "
-"object that is class %s"
-msgstr ""
-"został dostarczony prototyp klasy %s, ale definicja klasy wymaga obiektu "
-"klasy %s"
+"class %s is a class union: 'coerce' relations to a class union are not "
+"meaningful"
+msgstr "klasa %s jest uniÄ… klas: relacje 'coerce' dla uni klas nie majÄ… sensu"
 
+#. R/is.R: gettextf("class %s is defined (with package slot %s) but no metadata object found to revise %s information---not exported?  Making a copy in package %s",     .dQ(class), sQuote(classDef@package), purpose, sQuote(getPackageName(where,         FALSE)))
+#: R/is.R:0
 msgid ""
-"slot %s in class %s currently defined (or inherited) as \"%s\", conflicts "
-"with an inherited definition in class %s"
+"class %s is defined (with package slot %s) but no metadata object found to "
+"revise %s information---not exported?  Making a copy in package %s"
 msgstr ""
-"gniazdo %s w klasie %s aktualnie zdefiniowane (lub odziedziczone) jako %s, "
-"jest w konflikcie z odziedziczonÄ… definicjÄ… w klasie %s"
-
-msgid "class %s extends an undefined class (%s)"
-msgstr "klasa %s rozszerza niezdefiniowanÄ… klasÄ™ (%s)"
+"klasa %s jest zdefiniowana (z gniazdem pakietu %s), ale nie znaleziono "
+"obiektu metadanych do przeglÄ…du informacji %s -- nie wyeksportowano? "
+"Tworzenie kopii w pakiecie %s"
 
-msgid ""
-"%s is not eligible to be the data part of another class (must be a basic "
-"class or a virtual class with no slots)"
-msgstr ""
-"%s nie kwalifikuje się aby być częścią danych innej klasy (musi być "
-"podstawowÄ… klasÄ… albo klasÄ… wirtualnÄ… bez gniazd)"
+#. R/refClass.R: gettextf("class %s is defined but is not a reference class",     dQuote(Class))
+#: R/refClass.R:0
+msgid "class %s is defined but is not a reference class"
+msgstr "klasa %s jest zdefiniowana, ale nie jest referencyjnÄ… klasÄ…"
 
+#. R/SClasses.R: gettextf("class %s is defined, with package %s, but no corresponding metadata object was found (not exported?)",     dQuote(Class), sQuote(classDef@package))
+#: R/SClasses.R:0
 msgid ""
-"prototype is a list with named elements (could be ambiguous):  better to use "
-"function prototype() to avoid trouble."
+"class %s is defined, with package %s, but no corresponding metadata object "
+"was found (not exported?)"
 msgstr ""
-"prototyp jest listą z nazwanymi elementami (mogą być niejednoznaczne):  "
-"lepiej używać funkcji 'prototype()' aby uniknąć kłopotów."
-
-msgid "the '%s' list for class %s, includes an undefined class %s"
-msgstr "lista '%s' dla klasy %s, zawiera w sobie niezdefiniowanÄ… klasÄ™ %s"
+"klasa %s jest zdefiniowana z pakietem %s, ale nie znaleziono odpowiadajÄ…cego "
+"jej obiektu metadanych (nie wyeksportowano?)"
 
+#. R/RClassUtils.R: gettextf("class %s is inheriting an inconsistent superclass structure from class %s, inconsistent with %s",     .dQ(className), .dQ(by), paste(.dQ(coni), collapse = ", "))
+#: R/RClassUtils.R:0
 msgid ""
 "class %s is inheriting an inconsistent superclass structure from class %s, "
 "inconsistent with %s"
 msgstr ""
 "klasa %s dziedziczy niespójną strukturę superklasy z klasy %s, niespójną z %s"
 
+#. R/as.R: gettextf("class %s is not defined in this environment", dQuote(to))
+#: R/as.R:0
+msgid "class %s is not defined in this environment"
+msgstr "klasa %s nie jest zdefiniowana w tym środowisku"
+
+#. R/SClasses.R: gettextf("class %s is sealed; 'resetClass' will have no effect",     dQuote(Class))
+#: R/SClasses.R:0
+msgid "class %s is sealed; 'resetClass' will have no effect"
+msgstr "klasa %s jest zamknięta; 'resetClass' nie będzie mieć efektu"
+
+#. R/is.R: gettextf("class %s is sealed; new superclasses can not be defined, except by 'setClassUnion'",     dQuote(class1))
+#: R/is.R:0
 msgid ""
-"unable to find a consistent ordering of superclasses for class %s: order "
-"chosen is inconsistent with the superclasses of %s"
+"class %s is sealed; new superclasses can not be defined, except by "
+"'setClassUnion'"
 msgstr ""
-"nie można znaleźć spójnego uporządkowania superklas dla klasy %s: wybrany "
-"porządek jest niespójny z superklasami %s"
+"klasa %s jest zamknięta; nowa superklasa nie może zostać zdefiniowana, za "
+"wyjÄ…tkiem 'setClassUnion'"
 
-msgid "\"class\" is a reserved slot name and cannot be redefined"
+#. R/SClasses.R: gettextf("class %s not found on %s; 'resetClass' will have no effect",     dQuote(Class), sQuote(getPackageName(where)))
+#: R/SClasses.R:0
+msgid "class %s not found on %s; 'resetClass' will have no effect"
 msgstr ""
-"'class' jest zarezerwowaną nazwą gniazda i nie może zostać przedefiniowana"
+"klasa %s nie została znaleziona w %s; 'resetClass' nie będzie miał efektu"
 
-msgid "Data part is undefined for general S4 object"
+#. R/RClassUtils.R: stop("class cannot have both an ordinary and hidden data type")
+#: R/RClassUtils.R:0
+msgid "class cannot have both an ordinary and hidden data type"
+msgstr "klasa nie może mieć jednocześnie zwykłego oraz ukrytego typu danych"
+
+#. R/SClasses.R: gettextf("class definition cannot extend more than one of these data types: %s",     paste0("\"", type, "\"", collapse = ", "))
+#: R/SClasses.R:0
+msgid "class definition cannot extend more than one of these data types: %s"
 msgstr ""
-"Część 'Data' (gniazdo '.Data') jest niezdefiniowana dla ogólnego obiektu S4"
+"definicja klasy nie może rozszerzać więcej niż jednego z tych typów danych: "
+"%s"
 
-msgid "no '.Data' slot defined for class %s"
-msgstr "nie zdefiniowano gniazda '.Data' dla klasy %s"
+#. R/SClasses.R: gettextf("class definition for %s not found (no action taken)",     dQuote(Class))
+#: R/SClasses.R:0
+msgid "class definition for %s not found (no action taken)"
+msgstr "nie znaleziono definicji klasy dla %s (nie podjęto żadnej akcji)"
 
-msgid "class %s does not have a data part (a .Data slot) defined"
-msgstr "klasa %s nie ma zdefiniowanej części danych (gniazdo '.Data')"
+#. R/MethodsListClass.R: gettextf("class generator function for class %s from package %s\n",     dQuote(object@className), sQuote(object@package))
+#: R/MethodsListClass.R:0
+msgid "class generator function for class %s from package %s"
+msgstr "funkcja generatora klas dla klasy %s z pakietu %s"
 
-msgid "more than one possible class for the data part: using %s rather than %s"
+#. R/refClass.R: gettextf("class must be a reference class representation or a character string; got an object of class %s",     dQuote(class(Class)))
+#: R/refClass.R:0
+msgid ""
+"class must be a reference class representation or a character string; got an "
+"object of class %s"
 msgstr ""
-"więcej niż jedna możliwa klasa dla części danych: używanie %s zamiast %s"
-
-msgid "class cannot have both an ordinary and hidden data type"
-msgstr "klasa nie może mieć jednocześnie zwykłego oraz ukrytego typu danych"
+"klasa musi być referencyjną reprezentacją klasy lub łańcuchem tekstowym; "
+"otrzymano obiekt klasy %s"
 
+#. R/refClass.R: gettextf("code for methods in class %s was not checked for suspicious field assignments (recommended package %s not available?)",     dQuote(Class), sQuote("codetools"))
+#: R/refClass.R:0
 msgid ""
-"a validity method must be a function of one argument, got an object of class "
-"%s"
+"code for methods in class %s was not checked for suspicious field "
+"assignments (recommended package %s not available?)"
 msgstr ""
-"metoda poprawności musi być funkcją jednego argumentu, otrzymano obiekt "
-"klasy %s"
-
-msgid "unable to find required package %s"
-msgstr "nie można znaleźć wymaganego pakietu %s"
+"kod dla metod w klasie %s nie był sprawdzony pod kątem podejrzanych "
+"przypisań pól (rekomendowany pakiet %s nie jest dostępny?)"
 
-msgid "unable to find an environment containing class %s"
-msgstr "nie można znaleźć środowiska zawierającego klasę %s"
+#. R/RClassUtils.R: gettextf("conflicting definition of data part: .Data = %s, superclass implies %s",     dQuote(elNamed(properties, ".Data")), dQuote(dataPartClass))
+#: R/RClassUtils.R:0
+msgid "conflicting definition of data part: .Data = %s, superclass implies %s"
+msgstr ""
+"sprzeczne definicje części danych: '.Data = %s', superklasa sugeruje %s"
 
+#. R/MethodsList.R: gettextf("default method must be a method definition, a primitive or NULL: got an object of class %s",     dQuote(class(method)))
+#: R/MethodsList.R:0
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
+"default method must be a method definition, a primitive or NULL: got an "
+"object of class %s"
 msgstr ""
-"Uwaga: specyfikacja dla klasy S3 %s w pakiecie %s wydaje się być równoważna "
-"tej z pakietu %s i nie jest duplikatem definicji klasy dla tej klasy"
+"domyślna metoda musi być definicją metody, prymitywną funkcją lub wartością "
+"NULL: otrzymano obiekt klasy %s"
 
+#. R/refClass.R: stop("direct calls to callSuper() are invalid:  should only be called from another method")
+#: R/refClass.R:0
 msgid ""
-"Note: some superclasses of class %s in package %s have duplicate "
-"definitions.  This definition is not being treated as equivalent to that "
-"from package %s"
+"direct calls to callSuper() are invalid:  should only be called from another "
+"method"
 msgstr ""
-"Uwaga: niektóre superklasy klasy %s w pakiecie %s posiadają powtórzone "
-"definicje. Ta definicja nie jest traktowana jako równoważna tej z pakietu %s"
+"bezpośrednie wywołania 'callSuper()' są niepoprawne:  powinna być wywoływana "
+"tylko z innej metody"
 
+#. R/trace.R: gettextf("does not seem to be a method table for generic %s in tracing environment",     sQuote(what))
+#: R/trace.R:0
 msgid ""
-"Note: the specification for class %s in package %s seems equivalent to one "
-"from package %s: not turning on duplicate class definitions for this class."
+"does not seem to be a method table for generic %s in tracing environment"
 msgstr ""
-"Uwaga: specyfikacja dla klasy S3 %s w pakiecie %s wydaje się być równoważna "
-"tej z pakietu %s i nie jest duplikatem definicji klasy dla tej klasy"
+"nie wygląda na tablicę metod dla funkcji ogólnej %s w śledzonym środowisku"
 
-msgid "undefined subclass %s of class %s; definition not updated"
+#. R/SClasses.R: gettextf("duplicate class names among superclasses: %s", paste(.dQ(includes[duplicated(includes)]),     collapse = ", "))
+#: R/SClasses.R:0
+msgid "duplicate class names among superclasses: %s"
+msgstr "powtórzone nazwy klasy pośród superklas: %s"
+
+#. R/MethodsList.R: gettextf("duplicate element names in 'MethodsList' at level %d: %s",     level, paste("\"", unique(mnames[duplicated(mnames)]), "\"",         collapse = ", "))
+#: R/MethodsList.R:0
+msgid "duplicate element names in 'MethodsList' at level %d: %s"
+msgstr "powtórzone nazwy elementów w 'MethodsList' na poziomie %d: %s"
+
+#. R/SClasses.R: gettextf("duplicated slot names: %s", paste(sQuote(snames[duplicated(snames)]),     collapse = ", "))
+#: R/SClasses.R:0
+msgid "duplicated slot names: %s"
+msgstr "powtórzona nazwa gniazda: %s"
+
+#. R/MethodsList.R: gettextf("element %d at level %d (class %s) cannot be interpreted as a function or named list",     i, level, dQuote(class(eli)))
+#: R/MethodsList.R:0
+msgid ""
+"element %d at level %d (class %s) cannot be interpreted as a function or "
+"named list"
 msgstr ""
-"niezdefiniowana podklasa %s klasy %s; definicja nie została zaktualizowana"
+"element %d na poziomie %d (klasa %s) nie może być interpretowany jak funkcja "
+"lub nazwana lista"
 
+#. R/SClasses.R: gettextf("element %d of the representation was not a single character string",     i)
+#: R/SClasses.R:0
+msgid "element %d of the representation was not a single character string"
+msgstr "element %d reprezentacji nie był pojedynczym łańcuchem tekstowym"
+
+#. R/SClasses.R: gettextf("error in contained classes (%s) for class %s and unable to remove definition from %s",     msg, dQuote(Class), sQuote(getPackageName(where)))
+#: R/SClasses.R:0
 msgid ""
-"subclass %s of class %s is not local and cannot be updated for new "
-"inheritance information; consider setClassUnion()"
+"error in contained classes (%s) for class %s and unable to remove definition "
+"from %s"
 msgstr ""
-"podklasa %s klasy %s nie jest lokalna i nie może być zaktualizowana dla "
-"nowych dziedziczonych informacji; rozważ 'setClassUnion()'"
+"błąd w zawartych klasach (%s) dla klasy %s przez co nie można usunąć "
+"definicji z %s"
 
+#. R/SClasses.R: gettextf("error in contained classes (%s) for class %s and unable to restore previous definition from %s",     msg, dQuote(Class), sQuote(getPackageName(where)))
+#: R/SClasses.R:0
 msgid ""
-"no definition of inheritance from %s to %s, though the relation was implied "
-"by the setIs() from %s"
+"error in contained classes (%s) for class %s and unable to restore previous "
+"definition from %s"
 msgstr ""
-"brak definicji dziedziczenia z %s do %s mimo, że relacja została "
-"zasugerowana przez 'setIs()' z %s"
+"błąd w zawartych klasach (%s) dla klasy %s przez co nie można przywrócić "
+"poprzedniej definicji z %s"
 
+#. R/SClasses.R: gettextf("error in contained classes (%s) for class %s; class definition removed from %s",     msg, dQuote(Class), sQuote(getPackageName(where)))
+#: R/SClasses.R:0
 msgid ""
-"argument 'includeSubclasses' must be a logical, either one value or a vector "
-"of the same length as argument 'classes'"
+"error in contained classes (%s) for class %s; class definition removed from "
+"%s"
 msgstr ""
-"argument 'includeSubclasses' musi być argumentem logicznym posiadającym "
-"jedną wartość lub wektorem o tej samej długości jak argument 'classes'"
+"błąd w zawartych klasach (%s) dla klasy %s; definicja klasy została usunięta "
+"z %s"
 
-msgid "argument 'abbreviate' must be 0, 1, 2, or 3"
-msgstr "argument 'abbreviate' musi mieć wartość 0, 1, 2, lub 3"
+#. R/SClasses.R: gettextf("error in contained classes (%s) for class %s; previous definition restored to %s",     msg, dQuote(Class), sQuote(getPackageName(where)))
+#: R/SClasses.R:0
+msgid ""
+"error in contained classes (%s) for class %s; previous definition restored "
+"to %s"
+msgstr ""
+"błąd w zawartych klasach (%s) dla klasy %s; poprzednia definicja została "
+"przywrócona w %s"
 
-msgid "needed the supplied labels vector of length %d, got %d"
-msgstr "potrzebowano dostarczyć wektora etykiet o długości %d, otrzymano %d"
+#. R/RMethodUtils.R: gettextf("error in load action %s for package %s: %s: %s", aname,     getPackageName(where), callString, value$message)
+#: R/RMethodUtils.R:0
+msgid "error in load action %s for package %s: %s: %s"
+msgstr "błąd w akcji ładowania %s dla pakietu %s: %s: %s"
 
+#. R/Methods.R: gettextf("error in updating S4 generic function %s; the function definition is not an S4 generic function (class %s)",     sQuote(f), dQuote(class(fdef)))
+#: R/Methods.R:0
 msgid ""
-"the function being used as %s in making a generic function for %s is "
-"currently traced; the function used will have tracing removed"
+"error in updating S4 generic function %s; the function definition is not an "
+"S4 generic function (class %s)"
 msgstr ""
-"funkcja użyta jako %s podczas tworzenia ogólnej funkcji dla %s jest "
-"aktualnie śledzona; użyta funkcja będzie miała usunięte śledzenie"
+"błąd w aktualizacji ogólnej funkcji S4 %s; definicja funkcji nie jest ogólną "
+"funkcjÄ… S4 (klasa %s)"
 
-msgid "must supply either a generic function or a function as default for %s"
+#. R/RMethodUtils.R: gettextf("expanding the signature to include omitted arguments in definition: %s",     paste(sigNames[omittedSig], "= \"missing\"", collapse = ", "))
+#: R/RMethodUtils.R:0
+msgid "expanding the signature to include omitted arguments in definition: %s"
 msgstr ""
-"potrzeba dostarczyć albo ogólną funkcję albo funkcję jako domyślną dla %s"
+"rozszerzanie sygnatury aby uwzględnić pominięte argumenty w definicji: %s"
+
+#. R/Methods.R: gettextf("expected a non-empty character string for argument name")
+#. R/addedFunctions.R: gettextf("expected a non-empty character string for argument name")
+#: R/Methods.R:0 R/addedFunctions.R:0
+msgid "expected a non-empty character string for argument name"
+msgstr "oczekiwano niepustego łańcucha tekstowego dla nazwy argumentu"
+
+#. R/oldClass.R: gettextf("explicit coercion of old-style class (%s) is not defined",     paste(class(from), collapse = ", "))
+#: R/oldClass.R:0
+msgid "explicit coercion of old-style class (%s) is not defined"
+msgstr "nie zdefiniowano jawnego przekształcenia klasy starego stylu (%s)"
 
+#. R/oldClass.R: gettextf("explicit replacement not defined for as(x, \"%s\") <- value for old-style class %s",     to, dQuote(class(from)[1L]))
+#: R/oldClass.R:0
 msgid ""
-"the %s argument must be NULL or a generic function object; got an object of "
+"explicit replacement not defined for as(x, \"%s\") <- value for old-style "
 "class %s"
 msgstr ""
-"argument %s musi być wartością NULL lub obiektem ogólnej funkcji; otrzymano "
-"obiekt klasy %s"
+"nie zdefiniowano jawnej zamiany dla 'as(x, \"%s\") <- value' dla klasy "
+"starego stylu %s"
 
-msgid "no suitable arguments to dispatch methods in this function"
-msgstr "brak odpowiednich argumentów do rozdzielenia metod w tej funkcji"
+#. R/methodsTable.R: stop("failed to find expected group generic function: ", what)
+#: R/methodsTable.R:0
+msgid "failed to find expected group generic function:"
+msgstr "nie udało się znaleźć oczekiwanej funkcji grupy ogólnej:"
 
-msgid "making a generic for special function %s"
-msgstr "tworzenie ogólnej funkcji dla funkcji specjalnej %s"
+#. R/refClass.R: gettextf("field %s is already locked", sQuote(what))
+#: R/refClass.R:0
+msgid "field %s is already locked"
+msgstr "pole %s jest już zablokowane"
 
-msgid "invalid call in method dispatch to '%s' (no default method)"
+#. R/refClass.R: gettextf("field %s of class %s has a non-default binding and cannot be locked",     sQuote(what), dQuote(className))
+#: R/refClass.R:0
+msgid "field %s of class %s has a non-default binding and cannot be locked"
 msgstr ""
-"niepoprawne wywołanie w metodzie rozdziału do %s (brak domyślnej metody)"
+"pole %s klasy %s posiada niedomyślne powiązanie i nie może zostać zablokowane"
 
-msgid "in method for %s with signature %s:"
-msgstr "W metodzie dla %s z sygnaturÄ… %s:"
+#. R/refClass.R: gettextf("field %s was supplied as an object of class %s; must be a class name or a binding function",     sQuote(thisName), dQuote(class(thisField)))
+#: R/refClass.R:0
+msgid ""
+"field %s was supplied as an object of class %s; must be a class name or a "
+"binding function"
+msgstr ""
+"pole %s zostało dostarczone jako obiekt klasy %s; musi być nazwa klasy lub "
+"funkcja wiążąca"
 
-msgid "formal arguments in method and generic do not appear in the same order"
+#. R/Methods.R: gettextf("first argument should be the names of one of more generic functions (got object of class %s)",     dQuote(class(f)))
+#: R/Methods.R:0
+msgid ""
+"first argument should be the names of one of more generic functions (got "
+"object of class %s)"
 msgstr ""
-"formalne argumenty w metodzie i ogólnej funkcji nie pojawiają się w tej "
-"samej kolejności"
+"pierwszy argument powinien być nazwami jeden lub więcej ogólnych funkcji "
+"(otrzymano obiekt klasy %s)"
 
+#. R/RMethodUtils.R: gettextf("formal arguments (%s) omitted in the method definition cannot be in the signature",     bad2)
+#: R/RMethodUtils.R:0
 msgid ""
 "formal arguments (%s) omitted in the method definition cannot be in the "
 "signature"
@@ -832,701 +1226,1049 @@
 "formalne argumenty (%s) pominięte w definicji metody nie mogą pojawić się w "
 "sygnaturze"
 
-msgid "expanding the signature to include omitted arguments in definition: %s"
-msgstr ""
-"rozszerzanie sygnatury aby uwzględnić pominięte argumenty w definicji: %s"
+#. R/Methods.R: gettext("formal arguments differ (in default values?)")
+#: R/Methods.R:0
+msgid "formal arguments differ (in default values?)"
+msgstr "formalne argumenty różnią się (w wartościach domyślnych?)"
 
-msgid ""
-"methods can add arguments to the generic %s only if '...' is an argument to "
-"the generic"
-msgstr ""
-"metody mogą dodawać argumenty do ogólnej funkcji %s tylko jeśli '...' jest "
-"argumentem dla ogólnej funkcji"
+#. R/Methods.R: gettextf("formal arguments differ: (%s), (%s)", paste(a1, collapse = ", "),     paste(a2, collapse = ", "))
+#: R/Methods.R:0
+msgid "formal arguments differ: (%s), (%s)"
+msgstr "formalne argumenty różnią się: (%s), (%s)"
 
-msgid ""
-"arguments (%s) after '...' in the generic must appear in the method, in the "
-"same place at the end of the argument list"
+#. R/RMethodUtils.R: stop(.renderSignature(f, signature), "formal arguments in method and generic do not appear in the same order",     call. = FALSE)
+#. R/RMethodUtils.R: stop(.renderSignature(generic@generic, signature), "formal arguments in method and generic do not appear in the same order",     call. = FALSE)
+#: R/RMethodUtils.R:0
+msgid "formal arguments in method and generic do not appear in the same order"
 msgstr ""
-"argumenty (%s) po '...' w ogólnej funkcji muszą pojawić się w metodzie w tym "
-"samym miejscu na końcu listy argumentów"
+"formalne argumenty w metodzie i ogólnej funkcji nie pojawiają się w tej "
+"samej kolejności"
 
-msgid ""
-"argument 'f' must be a string, generic function, or primitive: got an "
-"ordinary function"
-msgstr ""
-"argument 'f' musi być łańcuchem, ogólną funkcją, lub funkcją prymitywną: "
-"otrzymano zwykłą funkcję"
+#. R/Methods.R: gettextf("function %s appears to be a generic function, but with generic name %s",     sQuote(f), sQuote(gen))
+#: R/Methods.R:0
+msgid "function %s appears to be a generic function, but with generic name %s"
+msgstr "funkcja %s wygląda na ogólną funkcję ale z ogólną nazwą %s"
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr "metody nie mogą być zdefiniowane dla prymitywnej funkcji %s"
+#. R/Methods.R: stop("function supplied as argument 'f' must be a generic")
+#: R/Methods.R:0
+msgid "function supplied as argument 'f' must be a generic"
+msgstr "funkcja dostarczona jako argument 'f' musi być ogólną funkcją"
 
-msgid "no generic function found for %s"
-msgstr "nie znaleziono ogólnej funkcji dla %s"
+#. R/Methods.R: gettextf("generic function %s not found for removal", sQuote(f))
+#: R/Methods.R:0
+msgid "generic function %s not found for removal"
+msgstr "nie znaleziono ogólnej funkcji %s do usunięcia"
 
-msgid "Empty function name in .getGeneric"
-msgstr "Pusta nazwa funkcji w '.getGeneric'"
+#. R/Methods.R: gettextf("generic function supplied was not created for %s",     sQuote(name))
+#: R/Methods.R:0
+msgid "generic function supplied was not created for %s"
+msgstr "dostarczona funkcja ogólna nie została utworzona dla %s"
+
+#. R/Methods.R: gettextf("generic names differ: %s, %s", .dQ(f1@generic), .dQ(f2@generic))
+#: R/Methods.R:0
+msgid "generic names differ: %s, %s"
+msgstr "ogólne nazwy różnią się: %s, %s"
+
+#. R/RMethodUtils.R: stop("got a negative maximum number of frames to look at")
+#: R/RMethodUtils.R:0
+msgid "got a negative maximum number of frames to look at"
+msgstr "utrzymano ujemnÄ… maksymalnÄ… liczbÄ™ ramek"
 
+#. R/Methods.R: gettextf("groups differ: %s, %s", .dQ(gpString(f1@group)), .dQ(gpString(f2@group)))
+#: R/Methods.R:0
+msgid "groups differ: %s, %s"
+msgstr "grupy różnią się: %s, %s"
+
+#. R/Methods.R: gettextf("if the 'def' argument is supplied, it must be a function that calls standardGeneric(\"%s\") or is the default",     name)
+#: R/Methods.R:0
 msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
+"if the 'def' argument is supplied, it must be a function that calls "
+"standardGeneric(\"%s\") or is the default"
 msgstr ""
-"pakiet %s wydaje się mieć nieaktualne metody; potrzeba przeinstalować ze "
-"źródła"
+"jeśli dostarczono argument 'def', musi być funkcją, która wywołuje "
+"standardGeneric(\"%s\") lub musi być funkcją domyślną"
 
-msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
-msgstr ""
-"nie znaleziono metod dla %s; 'cacheGenericsMetaData()' nie będzie miał efektu"
+#. R/MethodsList.R: gettextf("in %s: use of \"MethodsList\" metadata objects is defunct.",     deparse(this))
+#: R/MethodsList.R:0
+msgid "in %s: use of \"MethodsList\" metadata objects is defunct."
+msgstr "w %s: użycie obiektów metadanych \"MethodsList\" zostało zlikwidowane."
 
-msgid "invalid value from generic function %s, class %s, expected %s"
-msgstr ""
-"niepoprawna wartość z ogólnej funkcji %s, klasa %s, oczekiwano jednego z %s"
+#. R/MethodsList.R: gettextf("in %s: use of \"MethodsList\" metadata objects is deprecated.",     deparse(this))
+#: R/MethodsList.R:0
+msgid "in %s: use of \"MethodsList\" metadata objects is deprecated."
+msgstr "w %s: użycie obiektów metadanych \"MethodsList\" jest przestarzałe."
 
-msgid "\"MethodsList\" is defunct; allMethods now are empty"
+#. R/RMethodUtils.R: gettextf("in changing formal arguments in %s, some of the old names are not in fact arguments: %s",     msg, paste0("\"", old[is.na(match(old, names(dlist)))], "\"",         collapse = ", "))
+#: R/RMethodUtils.R:0
+msgid ""
+"in changing formal arguments in %s, some of the old names are not in fact "
+"arguments: %s"
 msgstr ""
+"podczas zmiany formalnych argumentów w %s, niektóre ze starych nazw nie są "
+"tak naprawdÄ™ argumentami: %s"
 
+#. R/RClassUtils.R: gettextf("in constructing the prototype for class %s, slots in prototype and not in class: %s",     dQuote(className), paste(extra, collapse = ", "))
+#: R/RClassUtils.R:0
 msgid ""
-"the body of the generic function for %s calls 'standardGeneric' to dispatch "
-"on a different name (\"%s\")!"
+"in constructing the prototype for class %s, slots in prototype and not in "
+"class: %s"
 msgstr ""
-"ciało ogólnej funkcji dla %s wywołuje 'standardGeneric' by rozdzielić pod "
-"inna nazwÄ… ('%s')!"
+"podczas konstruowaniu prototypu dla klasy %s, gniazda sÄ… w prototypie a nie "
+"w klasie: %s"
 
+#. R/RClassUtils.R: gettextf("in constructing the prototype for class %s: prototype has class %s, but the data part specifies class %s",     dQuote(className), dQuote(.class1(prototype)), dQuote(dataPartClass))
+#: R/RClassUtils.R:0
 msgid ""
-"trying to change the formal arguments in %s in an object of class %s; "
-"expected a function definition"
+"in constructing the prototype for class %s: prototype has class %s, but the "
+"data part specifies class %s"
 msgstr ""
-"próba zmiany formalnych argumentów w %s w obiekcie klasy %s; oczekiwano "
-"definicji funkcji"
+"podczas konstruowaniu prototypu dla klasy %s: prototyp posiada klasÄ™ %s, ale "
+"dane określają klasę %s"
 
+#. R/RClassUtils.R: gettextf("in defining class %s, the supplied data part class, %s is not valid (must be a basic class or a virtual class combining basic classes)",     dQuote(name), dQuote(dataPartClass))
+#: R/RClassUtils.R:0
 msgid ""
-"trying to change the formal arguments in %s, but getting the new formals "
-"from an object of class %s; expected a function definition"
+"in defining class %s, the supplied data part class, %s is not valid (must be "
+"a basic class or a virtual class combining basic classes)"
 msgstr ""
-"próba zmiany formalnych argumentów w %s, ale otrzymano nowe argumenty "
-"formalne z obiektu klasy %s; oczekiwano definicji funkcji"
+"podczas definiowania klasy %s, dostarczona część danych klasy, %s nie jest "
+"poprawna (musi być podstawową klasą lub klasą wirtualną łączącą podstawowe "
+"klasy)"
 
+#. R/RClassUtils.R: gettextf("in definition of class %s, information for superclass %s is of class %s (expected \"SClassExtension\")",     dQuote(ClassDef@className), dQuote(what), dQuote(class(exti)))
+#: R/RClassUtils.R:0
 msgid ""
-"trying to change the formal arguments in %s, but the number of existing "
-"arguments is less than the number of new arguments: (%s) vs (%s)"
+"in definition of class %s, information for superclass %s is of class %s "
+"(expected \"SClassExtension\")"
 msgstr ""
-"próba zmiany formalnych argumentów w %s, ale liczba istniejących argumentów "
-"jest mniejsza niż liczba nowych argumentów: (%s) względem (%s)"
+"w definicji klasy %s, informacja dla superklasy %s jest klasy %s (oczekiwano "
+"'SClassExtension')"
 
+#. R/RClassUtils.R: gettextf("in making the prototype for class %s elements of the prototype failed to match the corresponding slot class: %s",     dQuote(className), paste(pnames[check], "(class", .dQ(slotDefs[match(pnames[check],         slotNames)]), ")", collapse = ", "))
+#: R/RClassUtils.R:0
 msgid ""
-"trying to change the formal arguments in %s, but the number of existing "
-"arguments is greater than the number of new arguments (the extra arguments "
-"won't be used): (%s) vs (%s)"
+"in making the prototype for class %s elements of the prototype failed to "
+"match the corresponding slot class: %s"
 msgstr ""
-"próba zmiany formalnych argumentów w %s, ale liczba istniejących argumentów "
-"jest większa niż liczba nowych argumentów (dodatkowe argumenty nie będą "
-"użyte): (%s) względem (%s)"
+"podczas tworzenia prototypu dla klasy %s elementy prototypu nie zgodziły się "
+"z odpowiadajÄ…cymi gniazdami klasy: %s"
+
+#. R/RMethodUtils.R: gettextf("in method for %s with signature %s: ", sQuote(f), sQuote(msig))
+#: R/RMethodUtils.R:0
+msgid "in method for %s with signature %s:"
+msgstr "W metodzie dla %s z sygnaturÄ… %s:"
 
+#. R/oldClass.R: gettextf("inconsistent old-style class information for %s (maybe mixing old and new classes?)",     dQuote(cl))
+#: R/oldClass.R:0
 msgid ""
-"in changing formal arguments in %s, some of the old names are not in fact "
-"arguments: %s"
+"inconsistent old-style class information for %s (maybe mixing old and new "
+"classes?)"
 msgstr ""
-"podczas zmiany formalnych argumentów w %s, niektóre ze starych nazw nie są "
-"tak naprawdÄ™ argumentami: %s"
+"niespójna informacja o starym stylu klasy dla %s (być może mieszanie starych "
+"oraz nowych klas?)"
 
-msgid "got a negative maximum number of frames to look at"
-msgstr "utrzymano ujemnÄ… maksymalnÄ… liczbÄ™ ramek"
+#. R/oldClass.R: gettextf("inconsistent old-style class information for %s; the class is defined but does not extend %s and is not valid as the data part",     dQuote(cl), dQuote(prevClass))
+#: R/oldClass.R:0
+msgid ""
+"inconsistent old-style class information for %s; the class is defined but "
+"does not extend %s and is not valid as the data part"
+msgstr ""
+"niespójny stary styl informacji o klasie dla %s; klasa jest zdefiniowana, "
+"ale nie rozszerza %s oraz nie jest poprawna jako część danych"
 
-msgid "%s is not a generic function (or not visible here)"
-msgstr "%s nie jest ogólną funkcją (albo nie jest widoczna)"
+#. R/RClassUtils.R: gettextf("initializing objects from class %s with these arguments is not supported",     dQuote(Class))
+#: R/RClassUtils.R:0
+msgid ""
+"initializing objects from class %s with these arguments is not supported"
+msgstr ""
+"inicjalizowanie obiektów z klasy %s z tymi argumentami nie jest wspierane"
 
-msgid "invalid element in the \"groupMembers\" slot (class %s)"
-msgstr "niepoprawny element w gnieździe \"groupMembers\" (klasa %s)"
+#. R/MethodsList.R: stop("inserting method corresponding to empty signature")
+#: R/MethodsList.R:0
+msgid "inserting method corresponding to empty signature"
+msgstr "wstawienie metody odpowiadajÄ…cej pustej sygnaturze"
 
-msgid "argument f must be a generic function with signature \"...\""
-msgstr "argument 'f' musi być ogólną funkcją z sygnaturą '...'"
+#. R/MethodsList.R: gettextf("inserting method into non-methods-list object (class %s)",     dQuote(.class1(mlist)))
+#: R/MethodsList.R:0
+msgid "inserting method into non-methods-list object (class %s)"
+msgstr "wstawienie metody w obiekt nie będący listą metod (klasa %s)"
 
-msgid "no method or default matching the \"...\" arguments in %s"
-msgstr "brak metody lub domyślnego dopasowania argumentów \"...\" w %s"
+#. R/MethodsList.R: gettextf("inserting method with invalid signature matching argument '...' to class %s",     dQuote(signature[[1L]]))
+#: R/MethodsList.R:0
+msgid ""
+"inserting method with invalid signature matching argument '...' to class %s"
+msgstr ""
+"wstawianie metody z niepoprawnÄ… sygnaturÄ… pasujÄ…cÄ… do argumentu '...' do "
+"klasy %s"
 
-msgid "multiple direct matches: %s; using the first of these"
-msgstr "wielokrotne bezpośrednie dopasowania: %s; używanie pierwszego z nich"
+#. R/refClass.R: stop("invalid 'Class' argument:  should be a single string")
+#: R/refClass.R:0
+msgid "invalid 'Class' argument:  should be a single string"
+msgstr "niepoprawny argument 'Class': powinien być pojedycznym łańcuchem"
 
-msgid "multiple equivalent inherited matches: %s; using the first of these"
+#. R/show.R: gettextf("invalid 'ignore' argument; should be a class definition or a character vector, got an object of class %s",     dQuote(class(ignore)))
+#: R/show.R:0
+msgid ""
+"invalid 'ignore' argument; should be a class definition or a character "
+"vector, got an object of class %s"
 msgstr ""
-"wiele równoważnie dziedziczonych dopasowań: %s; używanie pierwszego z nich"
+"niepoprawny argument 'ignore'; powinien być definicją klasy lub łańcuchem "
+"tekstowym; otrzymano obiekt klasy %s"
 
-msgid "single string; got an object of class %s"
-msgstr "pojedynczy łańcuch; otrzymano obiekt klasy %s"
+#. R/MethodsList.R: stop("invalid 'package' slot or attribute, wrong length")
+#: R/MethodsList.R:0
+msgid "invalid 'package' slot or attribute, wrong length"
+msgstr "niepoprawna gniazdo 'package' lub atrybut; niepoprawna długość"
 
+#. R/trace.R: gettextf("invalid 'source' argument: expected file names or a connection but got an object of class %s",     dQuote(class(source)[[1L]]))
+#: R/trace.R:0
 msgid ""
-"multiple definitions exist for class %s, but the supplied package (%s) is "
-"not one of them (%s)"
+"invalid 'source' argument: expected file names or a connection but got an "
+"object of class %s"
 msgstr ""
-"istniejÄ… wielokrotne definicje dla klasy %s, ale dostarczony pakiet (%s) nie "
-"jest jednÄ… z nich (%s)"
+"niepoprawny argument 'source': oczekiwano nazw plików lub połączenia, a "
+"otrzymano obiekt klasy %s"
 
+#. R/oldClass.R: gettextf("invalid S4 class corresponding to S3 class: slots in  S4 version must extend corresponding slots in S3 version: fails for %s",     paste0("\"", bad, "\"", collapse = ", "))
+#: R/oldClass.R:0
 msgid ""
-"multiple definitions exist for class %s; should specify one of them (%s), e."
-"g. by className()"
+"invalid S4 class corresponding to S3 class: slots in  S4 version must extend "
+"corresponding slots in S3 version: fails for %s"
 msgstr ""
-"istnieją wielokrotne definicje dla klasy %s; powinieneś określić jedną z "
-"nich (%s), na przykład poprzez 'className()'"
-
-msgid "no definition found for class %s"
-msgstr "nie znaleziono definicji dla klasy %s"
-
-msgid "trying to execute load actions without 'methods' package"
-msgstr "próba wykonania akcji ładowania bez pakietu 'methods'"
-
-msgid "missing function for load action: %s"
-msgstr "brakujÄ…ca funkcja dla akcji Å‚adowania: %s"
-
-msgid "error in load action %s for package %s: %s: %s"
-msgstr "błąd w akcji ładowania %s dla pakietu %s: %s: %s"
-
-msgid "non-function action: %s"
-msgstr "akcja nie-funkcji: %s"
-
-msgid "action function %s has no arguments, should have at least 1"
-msgstr "funkcja akcji %s nie posiada argumentów, a powinna mieć przynajmniej 1"
-
-msgid "some actions are missing: %s"
-msgstr "brakuje niektórych akcji: %s"
+"niepoprawna klasa S4 odpowiadajÄ…ca klasie S3: gniazda w wersji S4 muszÄ… "
+"rozszerzać odpowiadające im sloty w wersji S3: nie powiodło się dla %s"
 
-msgid "%s has a sealed class definition and cannot be redefined"
-msgstr "Klasa %s ma zablokowaną definicję klasy i nie może być przedefiniowana"
+#. R/Methods.R: gettextf("invalid argument 'name': %s", .isSingleName(name))
+#: R/Methods.R:0
+msgid "invalid argument 'name': %s"
+msgstr "niepoprawny argument 'name': %s"
 
+#. R/refClass.R: gettextf("invalid assignment for reference class field %s, should be from class %s or a subclass (was class %s)",     sQuote(fieldName), dQuote(fieldClass), dQuote(class(value)))
+#: R/refClass.R:0
 msgid ""
-"Argument \"representation\" cannot be used if argument \"slots\" is supplied"
+"invalid assignment for reference class field %s, should be from class %s or "
+"a subclass (was class %s)"
 msgstr ""
-"Argument 'representation' nie może być użyty, jeśli dostarczony został "
-"argument 'slots'"
+"niepoprawne przypisanie dla pola %s klasy referencyjnej, powinien być z "
+"klasy %s lub podklasy (była klasa %s)"
 
-msgid ""
-"only arguments 'Class' and 'where' can be supplied when argument "
-"'representation' is a 'classRepresentation' object"
+#. R/RMethodUtils.R: gettextf("invalid call in method dispatch to '%s' (no default method)",     name)
+#: R/RMethodUtils.R:0
+msgid "invalid call in method dispatch to '%s' (no default method)"
 msgstr ""
-"tylko argumenty 'Class' oraz 'where' mogą być dostarczone gdy argument "
-"'representation' jest obiektem klasy \"classRepresentation\""
+"niepoprawne wywołanie w metodzie rozdziału do %s (brak domyślnej metody)"
 
+#. R/show.R: gettextf("invalid call to 'classLabel': expected a name or a class definition, got an object of class %s",     classLabel(class(Class)))
+#: R/show.R:0
 msgid ""
-"error in contained classes (%s) for class %s and unable to remove definition "
-"from %s"
+"invalid call to 'classLabel': expected a name or a class definition, got an "
+"object of class %s"
 msgstr ""
-"błąd w zawartych klasach (%s) dla klasy %s przez co nie można usunąć "
-"definicji z %s"
+"niepoprawne wywołanie przekazane do 'classLabel': oczekiwano nazwy lub "
+"definicji klasy, otrzymano obiekt klasy %s"
+
+#. R/SClasses.R: gettextf("invalid class %s object", dQuote(Class))
+#: R/SClasses.R:0
+msgid "invalid class %s object"
+msgstr "niepoprawny obiekt klasy %s"
 
+#. R/MethodsList.R: gettextf("invalid element in a list for \"signature\" argument; element %d is neither a class definition nor a class name",     i)
+#: R/MethodsList.R:0
 msgid ""
-"error in contained classes (%s) for class %s; class definition removed from "
-"%s"
+"invalid element in a list for \"signature\" argument; element %d is neither "
+"a class definition nor a class name"
 msgstr ""
-"błąd w zawartych klasach (%s) dla klasy %s; definicja klasy została usunięta "
-"z %s"
+"niepoprawny element na liście dla argumentu 'signature'; element %d nie jest "
+"ani definicjÄ… klasy ani nazwÄ… klasy"
 
+#. R/RMethodUtils.R: gettextf("invalid element in the \"groupMembers\" slot (class %s)",     dQuote(class(x)))
+#: R/RMethodUtils.R:0
+msgid "invalid element in the \"groupMembers\" slot (class %s)"
+msgstr "niepoprawny element w gnieździe \"groupMembers\" (klasa %s)"
+
+#. R/MethodsList.R: stop("invalid first argument: should be the name of the first argument in the dispatch")
+#: R/MethodsList.R:0
 msgid ""
-"error in contained classes (%s) for class %s and unable to restore previous "
-"definition from %s"
+"invalid first argument: should be the name of the first argument in the "
+"dispatch"
 msgstr ""
-"błąd w zawartych klasach (%s) dla klasy %s przez co nie można przywrócić "
-"poprzedniej definicji z %s"
+"niepoprawny pierwszy argument: powinna to być nazwa pierwszego argumentu w "
+"wysyłce"
 
+#. R/methodsTable.R: gettextf("invalid group generic function in search for inherited method (class %s)",     dQuote(class(gen)))
+#: R/methodsTable.R:0
 msgid ""
-"error in contained classes (%s) for class %s; previous definition restored "
-"to %s"
+"invalid group generic function in search for inherited method (class %s)"
 msgstr ""
-"błąd w zawartych klasach (%s) dla klasy %s; poprzednia definicja została "
-"przywrócona w %s"
+"niepoprawna funkcja grupy ogólnej w poszukiwaniu dziedziczonej metody (klasa "
+"%s)"
 
-msgid "element %d of the representation was not a single character string"
-msgstr "element %d reprezentacji nie był pojedynczym łańcuchem tekstowym"
+#. R/languageEl.R: stop("invalid index for function argument")
+#: R/languageEl.R:0
+msgid "invalid index for function argument"
+msgstr "niepoprawny indeks dla argumentu funkcji"
 
-msgid "duplicate class names among superclasses: %s"
-msgstr "powtórzone nazwy klasy pośród superklas: %s"
-
-msgid "only one data object (unnamed argument to prototype) allowed"
+#. R/Methods.R: gettextf("invalid method definition: expected a function, got an object of class %s",     dQuote(class(definition)))
+#: R/Methods.R:0
+msgid ""
+"invalid method definition: expected a function, got an object of class %s"
 msgstr ""
-"tylko jeden obiekt danych (nienazwany argument przekazany do funkcji "
-"'prototype()') jest dozwolony"
+"niepoprawna definicja metody: oczekiwano funkcji, otrzymano obiekt klasy %s"
 
-msgid "%s is not a defined class"
-msgstr "%s nie jest zdefiniowanÄ… klasÄ…"
+#. R/MethodsList.R: stop("invalid method sublist")
+#: R/MethodsList.R:0
+msgid "invalid method sublist"
+msgstr "niepoprawne podlista metod"
 
-msgid "%s is not a slot in class %s"
-msgstr "%s nie jest gniazdem w klasie %s"
+#. R/methodsTable.R: stop("invalid methods table request")
+#: R/methodsTable.R:0
+msgid "invalid methods table request"
+msgstr "niepoprawne żądanie tablicy metod"
 
+#. R/methodsTable.R: gettextf("invalid mlist element for signature %s at level %d (should be MethodDefinition or .Primitive, had class %s)",     sQuote(classes[[j]]), i, dQuote(class(el)))
+#: R/methodsTable.R:0
 msgid ""
-"assignment of an object of class %s is not valid for slot %s in an object of "
-"class %s; is(value, \"%s\") is not TRUE"
+"invalid mlist element for signature %s at level %d (should be "
+"MethodDefinition or .Primitive, had class %s)"
 msgstr ""
-"przypisanie obiektu klasy %s nie jest poprawny dla gniazda %s w obiekcie "
-"klasy %s; 'is(value, %s)' nie ma wartości TRUE"
+"niepoprawny element 'mlist' dla sygnatury %s na poziomie %d (powinno być "
+"'MethodDefinition' lub '.Primitive', otrzymano klasÄ™ %s)"
+
+#. R/MethodsListClass.R: gettextf("invalid object for formal method definition: type %s",     dQuote(typeof(def)))
+#: R/MethodsListClass.R:0
+msgid "invalid object for formal method definition: type %s"
+msgstr "niepoprawny obiekt dla definicji formalnej metody: typ %s"
 
+#. R/methodsTable.R: gettextf("invalid object in meta table of methods for %s, label %s, had class %s",     sQuote(generic@generic), sQuote(what), dQuote(class(obj)))
+#: R/methodsTable.R:0
+msgid "invalid object in meta table of methods for %s, label %s, had class %s"
+msgstr ""
+"niepoprawny obiekt w meta tablicy metod dla %s, etykieta %s, otrzymano klasÄ™ "
+"%s"
+
+#. R/methodsTable.R: gettextf("invalid object in methods table (%s), expected a method, got an object of class %s",     sQuote(what), dQuote(class(method)))
+#: R/methodsTable.R:0
 msgid ""
-"assignment of an object of class %s is not valid for @%s in an object of "
-"class %s; is(value, \"%s\") is not TRUE"
+"invalid object in methods table (%s), expected a method, got an object of "
+"class %s"
 msgstr ""
-"przypisanie obiektu klasy %s nie jest poprawny dla @%s w obiekcie klasy %s; "
-"'is(value, \"%s\")' nie ma wartości TRUE"
+"niepoprawny obiekt w tablicy metod (%s), oczekiwano metody, otrzymano obiekt "
+"klasy %s"
 
-msgid "class definition for %s not found (no action taken)"
-msgstr "nie znaleziono definicji klasy dla %s (nie podjęto żadnej akcji)"
+#. R/methodsTable.R: gettextf("invalid or unset methods table in generic function %s",     sQuote(fdef@generic))
+#: R/methodsTable.R:0
+msgid "invalid or unset methods table in generic function %s"
+msgstr "niepoprawna lub nieustawiona tablica metod w ogólnej funkcji %s"
 
-msgid "class %s has multiple definitions visible; only the first removed"
-msgstr ""
-"klasa %s posiada widoczne wielokrotne definicje; usunięto tylko pierwszą"
+#. R/refClass.R: gettextf("invalid replacement: reference class field %s is read-only",     sQuote(fieldName))
+#: R/refClass.R:0
+msgid "invalid replacement: reference class field %s is read-only"
+msgstr "niepoprawna zamiana: pole %s klasy referencyjnej jest tylko do odczytu"
 
-msgid "invalid class %s object"
-msgstr "niepoprawny obiekt klasy %s"
+#. R/RMethodUtils.R: gettextf("invalid value from generic function %s, class %s, expected %s",     sQuote(fname), dQuote(class(object)), paste(dQuote(classes),         collapse = " or "))
+#: R/RMethodUtils.R:0
+msgid "invalid value from generic function %s, class %s, expected %s"
+msgstr ""
+"niepoprawna wartość z ogólnej funkcji %s, klasa %s, oczekiwano jednego z %s"
 
-msgid "validity method must be NULL or a function of one argument"
+#. R/refClass.R: gettextf("local assignment to field name will not change the field:\n    %s\n Did you mean to use \"<<-\"? ( in method %s for class %s)",     paste(unlist(assigned$locals)[localsAreFields], collapse = "; "),     methodName, className)
+#: R/refClass.R:0
+msgid ""
+"local assignment to field name will not change the field:\n"
+"    %s\n"
+" Did you mean to use \"<<-\"? ( in method %s for class %s)"
 msgstr ""
-"metoda poprawności musi być wartością NULL lub funkcją jednego argumentu"
+"lokalne przypisanie do nazwy pola nie zmieni pola:\n"
+"    %s\n"
+" Czy chciałeś użyć \"<<-\"? ( w metodzie %s klasy %s)"
 
-msgid "class %s not found on %s; 'resetClass' will have no effect"
+#. R/RMethodUtils.R: gettextf("making a generic for special function %s", sQuote(f))
+#: R/RMethodUtils.R:0
+msgid "making a generic for special function %s"
+msgstr "tworzenie ogólnej funkcji dla funkcji specjalnej %s"
+
+#. R/trace.R: warning("making a traced version of a special; arguments may be altered")
+#: R/trace.R:0
+msgid "making a traced version of a special; arguments may be altered"
+msgstr ""
+"tworzenie śledzonej wersji specjalnej funkcji; argumenty mogą zostać "
+"zmienione"
+
+#. R/debug.R: warning("method is not being debugged")
+#: R/debug.R:0
+msgid "method is not being debugged"
+msgstr "metoda nie jest debugowana"
+
+#. R/RMethodUtils.R: gettextf("methods can add arguments to the generic %s only if '...' is an argument to the generic",     sQuote(generic@generic))
+#: R/RMethodUtils.R:0
+msgid ""
+"methods can add arguments to the generic %s only if '...' is an argument to "
+"the generic"
 msgstr ""
-"klasa %s nie została znaleziona w %s; 'resetClass' nie będzie miał efektu"
+"metody mogą dodawać argumenty do ogólnej funkcji %s tylko jeśli '...' jest "
+"argumentem dla ogólnej funkcji"
 
+#. R/as.R: gettextf("methods currently exist for coercing from %s to %s; they will be replaced.",     dQuote(from), dQuote(to))
+#: R/as.R:0
 msgid ""
-"argument 'classDef' must be a string or a class representation; got an "
-"object of class %s"
+"methods currently exist for coercing from %s to %s; they will be replaced."
 msgstr ""
-"argument 'classDef' musi być łańcuchem albo reprezentacją klasy; otrzymano "
-"obiekt klasy %s"
+"metody aktualnie istnieją dla przekształcenia z %s w %s; będą zastąpione."
 
-msgid "class %s is sealed; 'resetClass' will have no effect"
-msgstr "klasa %s jest zamknięta; 'resetClass' nie będzie mieć efektu"
+#. R/refClass.R: gettextf("methods declared in usingMethods() but not found: %s",     paste0(declared[!declared %in% allMethods], collapse = ", "))
+#: R/refClass.R:0
+msgid "methods declared in usingMethods() but not found: %s"
+msgstr ""
+"metody zostały zadeklarowanie w 'usingMethods() ', ale nie znaleziono: %s"
 
+#. R/BasicFunsList.R: gettextf("methods may not be defined for primitive function %s in this version of R",     sQuote(f))
+#: R/BasicFunsList.R:0
 msgid ""
-"cannot use object of class %s in new():  class %s does not extend that class"
+"methods may not be defined for primitive function %s in this version of R"
 msgstr ""
-"nie można użyć obiektu klasy %s w 'new()': klasa %s nie rozszerza tej klasy"
+"metody nie mogą być zdefiniowane dla prymitywnej funkcji %s w tej wersji R"
 
-msgid "duplicated slot names: %s"
-msgstr "powtórzona nazwa gniazda: %s"
+#. R/RMethodUtils.R: gettextf("missing function for load action: %s", what)
+#: R/RMethodUtils.R:0
+msgid "missing function for load action: %s"
+msgstr "brakujÄ…ca funkcja dla akcji Å‚adowania: %s"
 
-msgid ""
-"class %s is defined, with package %s, but no corresponding metadata object "
-"was found (not exported?)"
+#. R/MethodsListClass.R: gettextf("missing package slot (%s) in object of class %s (package info added)",     packageSlot(co), dQuote(class(.Object)))
+#: R/MethodsListClass.R:0
+msgid "missing package slot (%s) in object of class %s (package info added)"
 msgstr ""
-"klasa %s jest zdefiniowana z pakietem %s, ale nie znaleziono odpowiadajÄ…cego "
-"jej obiektu metadanych (nie wyeksportowano?)"
+"brakujÄ…ce gniazdo pakietu (%s) w obiekcie klasy %s (dodana informacja o "
+"pakiecie)"
 
-msgid "no definition of %s to use for %s"
-msgstr "brak definicji %s do użycia dla %s"
+#. R/MethodsList.R: gettextf("more elements in the method signature (%d) than in the generic signature (%d) for function %s",     length(which), length(anames), sQuote(fun@generic))
+#: R/MethodsList.R:0
+msgid ""
+"more elements in the method signature (%d) than in the generic signature "
+"(%d) for function %s"
+msgstr ""
+"więcej elementów w sygnaturze metody (%d) niż w ogólnej sygnaturze (%d) dla "
+"funkcji %s"
 
-msgid "class definition cannot extend more than one of these data types: %s"
+#. R/RClassUtils.R: gettextf("more than one possible class for the data part: using %s rather than %s",     .dQ(prevDataPartClass), .dQ(value))
+#: R/RClassUtils.R:0
+msgid "more than one possible class for the data part: using %s rather than %s"
 msgstr ""
-"definicja klasy nie może rozszerzać więcej niż jednego z tych typów danych: "
-"%s"
+"więcej niż jedna możliwa klasa dla części danych: używanie %s zamiast %s"
 
-msgid "abnormal type %s is not supported as a superclass of a class definition"
-msgstr "nienormalny typ %s nie jest wspierany jako superklasa definicji klasy"
+#. R/zzz.R: warning("apparently bad method or class metadata in saved environment;\n",     "move the file or remove the class/method")
+#: R/zzz.R:0
+msgid "move the file or remove the class/method"
+msgstr "przenieś plik lub usuń klasę/metodę"
 
+#. R/SClasses.R: gettextf("multiple class definitions for %s from packages: %s; picking the first",     dQuote(className), paste(sQuote(pkgs), collapse = ", "))
+#: R/SClasses.R:0
 msgid "multiple class definitions for %s from packages: %s; picking the first"
 msgstr ""
 "wielokrotne definicje klasy dla %s z pakietów: %s; wybieranie pierwszego"
 
-msgid "no package name supplied and no class definition found for %s"
+#. R/RMethodUtils.R: gettextf("multiple definitions exist for class %s, but the supplied package (%s) is not one of them (%s)",     dQuote(classi), sQuote(pkgi), paste(dQuote(get(classi, envir = .classTable)),         collapse = ", "))
+#: R/RMethodUtils.R:0
+msgid ""
+"multiple definitions exist for class %s, but the supplied package (%s) is "
+"not one of them (%s)"
 msgstr ""
-"nie dostarczono nazwy pakietu oraz nie znaleziono definicji klasy dla klasy "
-"%s"
-
-msgid "argument 'classDef' must be a class definition or the name of a class"
-msgstr "argument 'classDef' musi być definicją klasy lub nazwą klasy"
-
-msgid "No %s names supplied"
-msgstr "Nie dostarczono nazw %s"
+"istniejÄ… wielokrotne definicje dla klasy %s, ale dostarczony pakiet (%s) nie "
+"jest jednÄ… z nich (%s)"
 
+#. R/RMethodUtils.R: gettextf("multiple definitions exist for class %s; should specify one of them (%s), e.g. by className()",     dQuote(classi), paste(dQuote(get(classi, envir = .classTable)),         collapse = ", "))
+#: R/RMethodUtils.R:0
 msgid ""
-"All %s names must be nonempty in:\n"
-"(%s)"
+"multiple definitions exist for class %s; should specify one of them (%s), e."
+"g. by className()"
 msgstr ""
-"Wszystkie nazwy %s muszą być niepuste w:\n"
-"(%s)"
+"istnieją wielokrotne definicje dla klasy %s; powinieneś określić jedną z "
+"nich (%s), na przykład poprzez 'className()'"
 
-msgid ""
-"All %s names must be distinct in:\n"
-"(%s)"
+#. R/promptClass.R: gettextf("multiple definitions of %s found; using the one on %s",     dQuote(clName), whereClass)
+#: R/promptClass.R:0
+msgid "multiple definitions of %s found; using the one on %s"
+msgstr "znaleziono wielokrotne definicje %s; używanie jednej z %s"
+
+#. R/RMethodUtils.R: gettextf("multiple direct matches: %s; using the first of these",     .pasteC(classes))
+#: R/RMethodUtils.R:0
+msgid "multiple direct matches: %s; using the first of these"
+msgstr "wielokrotne bezpośrednie dopasowania: %s; używanie pierwszego z nich"
+
+#. R/RMethodUtils.R: gettextf("multiple equivalent inherited matches: %s; using the first of these",     .pasteC(classes))
+#: R/RMethodUtils.R:0
+msgid "multiple equivalent inherited matches: %s; using the first of these"
 msgstr ""
-"Wszystkie nazwy %s muszą być różne w:\n"
-"(%s)"
+"wiele równoważnie dziedziczonych dopasowań: %s; używanie pierwszego z nich"
+
+#. R/trace.R: gettextf("multiple generics match pattern, using table %s", table)
+#: R/trace.R:0
+msgid "multiple generics match pattern, using table %s"
+msgstr "wielokrotne dopasowania wzorca funkcji ogólnej, używanie tablicy %s"
 
+#. R/Methods.R: gettextf("must provide an environment table; got class %s", dQuote(class(what)))
+#: R/Methods.R:0
+msgid "must provide an environment table; got class %s"
+msgstr "potrzeba dostarczyć tablicę środowiska; otrzymano klasę %s"
+
+#. R/Methods.R: stop("must supply 'generic.function' or 'class'")
+#: R/Methods.R:0
+msgid "must supply 'generic.function' or 'class'"
+msgstr "'generic.function' lub 'class' muszą być dostarczone"
+
+#. R/Methods.R: gettextf("must supply a function skeleton for %s, explicitly or via an existing function",     sQuote(name))
+#: R/Methods.R:0
 msgid ""
-"argument %s must be a list or a character vector; got an object of class %s"
+"must supply a function skeleton for %s, explicitly or via an existing "
+"function"
 msgstr ""
-"argument %s musi być listą  lub wektorem tekstowym; otrzymano obiekt klasy %s"
+"potrzeba dostarczyć strukturę funkcji dla %s, jawnie lub poprzez istniejącą "
+"funkcjÄ™"
 
-msgid "no function %s found"
-msgstr "nie znaleziono funkcji %s"
+#. R/RMethodUtils.R: gettextf("must supply either a generic function or a function as default for %s",     sQuote(f))
+#: R/RMethodUtils.R:0
+msgid "must supply either a generic function or a function as default for %s"
+msgstr ""
+"potrzeba dostarczyć albo ogólną funkcję albo funkcję jako domyślną dla %s"
 
-msgid "no non-generic function %s found"
-msgstr "nie znaleziono nie-ogólnej funkcji %s"
+#. R/method.skeleton.R: stop("need a definition for the method here")
+#: R/method.skeleton.R:0
+msgid "need a definition for the method here"
+msgstr "potrzeba tutaj definicji dla metody"
 
-msgid "%s is not one of the element names"
-msgstr "%s nie jest jedną z nazw elementów"
+#. R/RClassUtils.R: gettextf("needed the supplied labels vector of length %d, got %d",     length(nodes), length(short))
+#: R/RClassUtils.R:0
+msgid "needed the supplied labels vector of length %d, got %d"
+msgstr "potrzebowano dostarczyć wektora etykiet o długości %d, otrzymano %d"
 
-msgid "no method or default for coercing %s to %s"
-msgstr "brak metody lub domyślnego schematu przekształcania %s w %s"
+#. R/RClassUtils.R: gettextf("no '.Data' slot defined for class %s", dQuote(class(object)))
+#: R/RClassUtils.R:0
+msgid "no '.Data' slot defined for class %s"
+msgstr "nie zdefiniowano gniazda '.Data' dla klasy %s"
 
-msgid "no method or default for as() replacement of %s with Class=\"%s\""
+#. R/ClassExtensions.R: gettextf("no 'replace' method was defined for 'as(x, \"%s\") <- value' for class %s",     to, dQuote(class(from)))
+#: R/ClassExtensions.R:0
+msgid ""
+"no 'replace' method was defined for 'as(x, \"%s\") <- value' for class %s"
 msgstr ""
-"brak metody lub wartości domyślnej dla zamiany 'as()' %s z 'class=\"%s\"'"
+"nie zdefiniowano metody 'replace' dla 'as(x, \"%s\") <- value' dla klasy %s"
 
-msgid "trying to set an 'as' relation from %s to itself"
-msgstr "próba ustawienia relacji 'as' z %s na siebie samą"
+#. R/trace.R: gettextf("no definition for object %s found in tracing environment",     sQuote(what), source)
+#: R/trace.R:0
+msgid "no definition for object %s found in tracing environment"
+msgstr "nie znaleziono definicji dla obiektu %s w śledzonym środowisku"
 
-msgid "class %s is not defined in this environment"
-msgstr "klasa %s nie jest zdefiniowana w tym środowisku"
+#. R/fixPrevious.R: gettextf("no definition for the class of %s (class %s) found",     sQuote(what), dQuote(class))
+#: R/fixPrevious.R:0
+msgid "no definition for the class of %s (class %s) found"
+msgstr "nie znaleziono definicji dla klasy z %s (klasa %s)"
 
-msgid ""
-"class %s is a class union: 'coerce' relations to a class union are not "
-"meaningful"
-msgstr "klasa %s jest uniÄ… klas: relacje 'coerce' dla uni klas nie majÄ… sensu"
+#. R/RMethodUtils.R: gettextf("no definition found for class %s", dQuote(classi))
+#: R/RMethodUtils.R:0
+msgid "no definition found for class %s"
+msgstr "nie znaleziono definicji dla klasy %s"
+
+#. R/refClass.R: gettextf("no definition found for inherited class: %s", paste0("\"",     contains[missingDefs], "\"", collapse = ", "))
+#: R/refClass.R:0
+msgid "no definition found for inherited class: %s"
+msgstr "nie znaleziono definicji dla dziedziczonej klasy: %s"
 
+#. R/SClasses.R: gettextf("no definition of %s to use for %s", dQuote(Class),     unique)
+#: R/SClasses.R:0
+msgid "no definition of %s to use for %s"
+msgstr "brak definicji %s do użycia dla %s"
+
+#. R/promptClass.R: gettextf("no definition of class %s found", dQuote(clName))
+#: R/promptClass.R:0
+msgid "no definition of class %s found"
+msgstr "nie znaleziono definicji klasy %s"
+
+#. R/RClassUtils.R: gettextf("no definition of inheritance from %s to %s, though the relation was implied by the setIs() from %s",     .dQ(what), .dQ(def2@className), .dQ(class))
+#: R/RClassUtils.R:0
 msgid ""
-"'as' method should have one argument, or match the arguments of coerce(): "
-"got  (%s)"
+"no definition of inheritance from %s to %s, though the relation was implied "
+"by the setIs() from %s"
 msgstr ""
-"metod 'as()' powinna mieć jeden argument lub zgadzać się z argumentami "
-"'coerce()': otrzymano (%s)"
+"brak definicji dziedziczenia z %s do %s mimo, że relacja została "
+"zasugerowana przez 'setIs()' z %s"
 
+#. R/RClassUtils.R: gettextf("no definition was found for superclass %s in the specification of class %s",     dQuote(cl), dQuote(name))
+#: R/RClassUtils.R:0
 msgid ""
-"a 'replace' method definition in 'setAs' must be a function of two "
-"arguments, got %d"
-msgstr ""
-"definicja metody 'replace' w 'setAs' musi być funkcją dwóch argumentów, "
-"otrzymano %d"
+"no definition was found for superclass %s in the specification of class %s"
+msgstr "nie znaleziono definicji dla superklasy %s w specyfikacji klasy %s"
+
+#. R/Methods.R: gettextf("no environment or package corresponding to argument where=%s",     deparse(where))
+#: R/Methods.R:0
+msgid "no environment or package corresponding to argument where=%s"
+msgstr "brak środowiska lub pakietu odpowiadającego argumentowi 'where=%s'"
 
+#. R/Methods.R: gettextf("no existing definition for function %s", sQuote(f))
+#: R/Methods.R:0
+msgid "no existing definition for function %s"
+msgstr "brak istniejÄ…cej definicji dla funkcji %s"
+
+#. R/addedFunctions.R: gettextf("no function %s found", sQuote(name))
+#: R/addedFunctions.R:0
+msgid "no function %s found"
+msgstr "nie znaleziono funkcji %s"
+
+#. R/trace.R: gettextf("no function definition for %s found", sQuote(what))
+#: R/trace.R:0
+msgid "no function definition for %s found"
+msgstr "nie znaleziono definicji funkcji dla %s"
+
+#. R/method.skeleton.R: gettextf("no function definition found for %s", sQuote(generic))
+#: R/method.skeleton.R:0
+msgid "no function definition found for %s"
+msgstr "nie znaleziono definicji funkcji dla %s"
+
+#. R/Methods.R: gettextf("no generic function %s found", sQuote(f))
+#. R/Methods.R: gettextf("no generic function %s found", sQuote(f))
+#. R/Methods.R: gettextf("no generic function %s found", sQuote(f))
+#: R/Methods.R:0
+msgid "no generic function %s found"
+msgstr "nie znaleziono ogólnej funkcji %s "
+
+#. R/MethodsList.R: gettextf("no generic function found corresponding to %s", sQuote(f))
+#: R/MethodsList.R:0
+msgid "no generic function found corresponding to %s"
+msgstr "nie znaleziono ogólnej funkcji odpowiadającej %s"
+
+#. R/RMethodUtils.R: gettextf("no generic function found for %s", sQuote(f))
+#: R/RMethodUtils.R:0
+msgid "no generic function found for %s"
+msgstr "nie znaleziono ogólnej funkcji dla %s"
+
+#. R/Methods.R: gettextf("no generic function found for '%s'", f)
+#: R/Methods.R:0
+msgid "no generic function found for '%s'"
+msgstr "nie znaleziono ogólnej funkcji dla '%s'"
+
+#. R/Methods.R: gettextf("no generic version of %s on package %s is allowed;\n   a new generic will be assigned for %s",     sQuote(name), sQuote(package), thisPName)
+#: R/Methods.R:0
 msgid ""
-"argument names in 'replace' changed to agree with 'coerce<-' generic:\n"
-"%s"
+"no generic version of %s on package %s is allowed;\n"
+"   a new generic will be assigned for %s"
 msgstr ""
-"nazwy argumentów w metodzie 'replace' zostały zmienione aby zgadzać się z "
-"ogólnym 'coerce<-':\n"
-"%s"
+"żadna ogólna wersja %s w pakiecie %s nie jest dozwolona; nowa ogólna funkcja "
+"będzie przypisana dla pakietu %s"
 
-msgid "ambiguous object (length != 1) to coerce to \"name\""
-msgstr "dwuznaczny obiekt (długość różna od 1) do przekształcenia w \"name\""
+#. R/Methods.R: gettextf("no method for %s matches class %s", sQuote("..."),     dQuote(signature))
+#: R/Methods.R:0
+msgid "no method for %s matches class %s"
+msgstr "żadna metoda dla %s nie zgadza się z klasą %s"
 
-msgid "undefined 'coerce' method"
-msgstr "nieokreślona metoda 'coerce'"
+#. R/Methods.R: gettextf("no method found for function %s and signature %s",     sQuote(fdef@generic), paste(.dQ(signature), collapse = ", "))
+#: R/Methods.R:0
+msgid "no method found for function %s and signature %s"
+msgstr "nie znaleziono metody dla funkcji %s oraz sygnatury %s"
 
-msgid ""
-"methods currently exist for coercing from %s to %s; they will be replaced."
+#. R/Methods.R: gettextf("no method found for function '%s' and signature %s",     f, paste(signature, collapse = ", "))
+#: R/Methods.R:0
+msgid "no method found for function '%s' and signature %s"
+msgstr "nie znaleziono metody dla funkcji '%s' oraz sygnatury %s"
+
+#. R/Methods.R: gettextf("no method found for signature %s", paste(signature,     collapse = ", "))
+#: R/Methods.R:0
+msgid "no method found for signature %s"
+msgstr "nie znaleziono metody dla sygnatury %s"
+
+#. R/trace.R: gettextf("no method in methods table for %s for signature %s",     sQuote(what), sQuote(signature))
+#: R/trace.R:0
+msgid "no method in methods table for %s for signature %s"
+msgstr "brak metod w tablicy metod dla %s dla sygnatury %s"
+
+#. R/as.R: gettextf("no method or default for as() replacement of %s with Class=\"%s\"",     dQuote(thisClass), Class)
+#: R/as.R:0
+msgid "no method or default for as() replacement of %s with Class=\"%s\""
 msgstr ""
-"metody aktualnie istnieją dla przekształcenia z %s w %s; będą zastąpione."
+"brak metody lub wartości domyślnej dla zamiany 'as()' %s z 'class=\"%s\"'"
 
-msgid "object %s not found"
-msgstr "obiekt %s nie został znaleziony"
+#. R/as.R: gettextf("no method or default for coercing %s to %s", dQuote(thisClass),     dQuote(Class))
+#: R/as.R:0
+msgid "no method or default for coercing %s to %s"
+msgstr "brak metody lub domyślnego schematu przekształcania %s w %s"
 
-msgid ""
-"object %s not changed (it is not consistent with the current definition of "
-"class %s from %s)"
+#. R/RMethodUtils.R: gettextf("no method or default matching the \"...\" arguments in %s",     deparse(sys.call(sys.parent()), nlines = 1))
+#: R/RMethodUtils.R:0
+msgid "no method or default matching the \"...\" arguments in %s"
+msgstr "brak metody lub domyślnego dopasowania argumentów \"...\" w %s"
+
+#. R/RMethodUtils.R: gettextf("no methods found for %s; cacheGenericsMetaData() will have no effect",     sQuote(f))
+#: R/RMethodUtils.R:0
+msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
-"obiekt %s nie został zmieniony (nie jest spójny z bieżącą definicją klasy %s "
-"z %s)"
+"nie znaleziono metod dla %s; 'cacheGenericsMetaData()' nie będzie miał efektu"
 
-msgid "no definition for the class of %s (class %s) found"
-msgstr "nie znaleziono definicji dla klasy z %s (klasa %s)"
+#. R/methodsTable.R: gettextf("no methods table for generic %s from package %s in package %s",     sQuote(generic@generic), sQuote(generic@package), sQuote(getPackageName(where)))
+#: R/methodsTable.R:0
+msgid "no methods table for generic %s from package %s in package %s"
+msgstr "brak tablicy metod dla ogolnej funkcji %s z pakietu %s w pakiecie %s"
 
-msgid ""
-"object %s not changed (it does not appear to be from a version of R earlier "
-"than 1.8.0)"
+#. R/addedFunctions.R: gettextf("no non-generic function %s found", sQuote(name))
+#: R/addedFunctions.R:0
+msgid "no non-generic function %s found"
+msgstr "nie znaleziono nie-ogólnej funkcji %s"
+
+#. R/SClasses.R: gettextf("no package name supplied and no class definition found for %s",     dQuote(className))
+#: R/SClasses.R:0
+msgid "no package name supplied and no class definition found for %s"
 msgstr ""
-"obiekt %s nie został zmieniony (nie wygląda aby był z wersji R wcześniejszej "
-"niż 1.8.0)"
+"nie dostarczono nazwy pakietu oraz nie znaleziono definicji klasy dla klasy "
+"%s"
 
-msgid "'class1' must be the name of a class or a class definition"
-msgstr "'class1' musi być nazwą klasy albo definicją klasy"
+#. R/RMethodUtils.R: stop("no suitable arguments to dispatch methods in this function")
+#. R/RMethodUtils.R: stop("no suitable arguments to dispatch methods in this function")
+#: R/RMethodUtils.R:0
+msgid "no suitable arguments to dispatch methods in this function"
+msgstr "brak odpowiednich argumentów do rozdzielenia metod w tej funkcji"
 
-msgid "'class2' must be the name of a class or a class definition"
-msgstr "'class2' musi być nazwą klasy albo definicją klasy"
+#. R/RMethodUtils.R: gettextf("non-function action: %s", sQuote(fname))
+#: R/RMethodUtils.R:0
+msgid "non-function action: %s"
+msgstr "akcja nie-funkcji: %s"
 
-msgid "class %s has no visible definition from package or environment %s"
-msgstr "klasa %s nie ma widocznej definicji w pakiecie lub środowisku %s"
+#. R/Methods.R: gettextf("non-generic function '%s' given to findMethods()",     f)
+#: R/Methods.R:0
+msgid "non-generic function '%s' given to findMethods()"
+msgstr "nieogólna funkcja '%s' przekazana do 'findMethods()'"
 
+#. R/refClass.R: gettextf("non-local assignment to method names is not allowed\n    %s\n( in method %s for class %s)",     paste(unlist(assigned$globals)[globalsInMethods], collapse = "; "),     methodName, className)
+#: R/refClass.R:0
 msgid ""
-"cannot create a 'setIs' relation when neither of the classes (%s and %s) is "
-"local and modifiable in this package"
+"non-local assignment to method names is not allowed\n"
+"    %s\n"
+"( in method %s for class %s)"
 msgstr ""
-"nie można utworzyć relacji 'setIs' kiedy żadna z klas (%s oraz %s) nie jest "
-"lokalna oraz modyfikowalna w tym pakiecie"
+"nielokalne przypisanie do nazw metod nie jest dozwolone\n"
+"    %s\n"
+"(w metodzie %s dla klasy %s)"
 
+#. R/refClass.R: gettextf("non-local assignment to non-field names (possibly misspelled?)\n    %s\n( in method %s for class %s)",     paste(unlist(assigned$globals)[globalsNotFields], collapse = "; "),     methodName, className)
+#: R/refClass.R:0
 msgid ""
-"class %s is sealed; new superclasses can not be defined, except by "
-"'setClassUnion'"
+"non-local assignment to non-field names (possibly misspelled?)\n"
+"    %s\n"
+"( in method %s for class %s)"
 msgstr ""
-"klasa %s jest zamknięta; nowa superklasa nie może zostać zdefiniowana, za "
-"wyjÄ…tkiem 'setClassUnion'"
+"nielokalne przypisanie do nazw nie-pól (prawdopodobne literówki?)\n"
+"    %s\n"
+"( w metodzie %s klasy %s)"
 
+#. R/trace.R: stop("none of the objects in the source code could be found:  need to attach or specify the package")
+#: R/trace.R:0
 msgid ""
-"class %s is defined (with package slot %s) but no metadata object found to "
-"revise %s information---not exported?  Making a copy in package %s"
+"none of the objects in the source code could be found:  need to attach or "
+"specify the package"
 msgstr ""
-"klasa %s jest zdefiniowana (z gniazdem pakietu %s), ale nie znaleziono "
-"obiektu metadanych do przeglÄ…du informacji %s -- nie wyeksportowano? "
-"Tworzenie kopii w pakiecie %s"
-
-msgid "class %s cannot extend class %s"
-msgstr "klasa %s nie może rozszerzyć klasy %s"
-
-msgid "both classes must be defined"
-msgstr "obie klasy muszą być zdefiniowane"
-
-msgid "invalid index for function argument"
-msgstr "niepoprawny indeks dla argumentu funkcji"
+"żaden z obiektów w kodzie źródłowym nie mógł zostać znaleziony:  potrzeba "
+"dołączyć lub określić pakiet"
 
-msgid "no function definition found for %s"
-msgstr "nie znaleziono definicji funkcji dla %s"
+#. R/refClass.R: gettextf("not a reference class: %s", ClassDef@name)
+#. R/refClass.R: gettextf("not a reference class: %s", ClassDef@name)
+#: R/refClass.R:0
+msgid "not a reference class: %s"
+msgstr "to nie jest referencja klasy: %s"
 
-msgid "need a definition for the method here"
-msgstr "potrzeba tutaj definicji dla metody"
+#. R/oldClass.R: stop("not allowed to have test==TRUE and an S4Class definition")
+#: R/oldClass.R:0
+msgid "not allowed to have test==TRUE and an S4Class definition"
+msgstr "niedozwolone by mieć 'test==TRUE' oraz definicję S4Class"
 
-msgid "Skeleton of method written to %s"
-msgstr "struktura metody zapisana w %s"
+#. R/Methods.R: gettext("not both functions!")
+#: R/Methods.R:0
+msgid "not both functions!"
+msgstr "jeden z argumentów nie jest funkcją!"
 
-msgid "invalid object in meta table of methods for %s, label %s, had class %s"
+#. R/fixPrevious.R: gettextf("object %s not changed (it does not appear to be from a version of R earlier than 1.8.0)",     sQuote(what))
+#: R/fixPrevious.R:0
+msgid ""
+"object %s not changed (it does not appear to be from a version of R earlier "
+"than 1.8.0)"
 msgstr ""
-"niepoprawny obiekt w meta tablicy metod dla %s, etykieta %s, otrzymano klasÄ™ "
-"%s"
+"obiekt %s nie został zmieniony (nie wygląda aby był z wersji R wcześniejszej "
+"niż 1.8.0)"
 
-#, fuzzy
+#. R/fixPrevious.R: gettextf("object %s not changed (it is not consistent with the current definition of class %s from %s)",     sQuote(what), dQuote(Class), sQuote(ClassDef@package))
+#: R/fixPrevious.R:0
 msgid ""
-"invalid mlist element for signature %s at level %d (should be "
-"MethodDefinition or .Primitive, had class %s)"
+"object %s not changed (it is not consistent with the current definition of "
+"class %s from %s)"
 msgstr ""
-"niepoprawny element 'mlist' dla sygnatury %s na poziomie %d (powinna być "
-"lista metod lub metoda, otrzymano klasÄ™ %s)"
+"obiekt %s nie został zmieniony (nie jest spójny z bieżącą definicją klasy %s "
+"z %s)"
 
-msgid "bad method object stored in method table, class %s"
-msgstr "błędny obiekt metody przechowywany w tablicy metod, klasy %s"
+#. R/fixPrevious.R: gettextf("object %s not found", sQuote(what))
+#: R/fixPrevious.R:0
+msgid "object %s not found"
+msgstr "obiekt %s nie został znaleziony"
 
-msgid ""
-"invalid object in methods table (%s), expected a method, got an object of "
-"class %s"
+#. R/BasicClasses.R: gettextf("object must be a valid data part for class %s; not true of type %s",     dQuote(cl), dQuote(class(data)))
+#: R/BasicClasses.R:0
+msgid "object must be a valid data part for class %s; not true of type %s"
 msgstr ""
-"niepoprawny obiekt w tablicy metod (%s), oczekiwano metody, otrzymano obiekt "
-"klasy %s"
+"obiekt musi być poprawną częścią danych dla klasy %s; nie jest to prawdą dla "
+"typu %s"
 
-msgid "invalid or unset methods table in generic function %s"
-msgstr "niepoprawna lub nieustawiona tablica metod w ogólnej funkcji %s"
+#. R/MethodsList.R: gettextf("object to use as a method signature for function %s does not look like a legitimate signature (a vector of single class names): there were %d class names, but %d elements in the signature object",     sQuote(fun@generic), length(sigClasses), length(signature))
+#: R/MethodsList.R:0
+msgid ""
+"object to use as a method signature for function %s does not look like a "
+"legitimate signature (a vector of single class names): there were %d class "
+"names, but %d elements in the signature object"
+msgstr ""
+"obiekt do użycia jako sygnatura metody dla funkcji %s nie wygląda na "
+"poprawną sygnaturę (wektor pojedynczych nazw klas): było %d nazw klas, ale "
+"%d elementów w obiekcie sygnatury"
 
-msgid "trying to find a methods table in a non-generic function"
-msgstr "próba znalezienia tablicy metod w nieogólnej funkcji"
+#. R/trace.R: gettextf("objects found in multiple packages: using %s and ignoring %s",     sQuote(names(possible[[1L]])), paste(sQuote(names(possible[-1L])),         collapse = ", "))
+#: R/trace.R:0
+msgid "objects found in multiple packages: using %s and ignoring %s"
+msgstr ""
+"obiekty zostały znalezione w wielu pakietach: używanie %s oraz ignorowanie %s"
 
+#. R/Methods.R: gettextf("only FALSE is meaningful for 'inherited', when 'where' is supplied (got %s)",     inherited)
+#: R/Methods.R:0
 msgid ""
-"the \"ambiguousMethodSelection\" option should be a function to be called as "
-"the condition action; got an object of class %s"
+"only FALSE is meaningful for 'inherited', when 'where' is supplied (got %s)"
 msgstr ""
-"opcja \"ambiguousMethodSelection\" powinna być funkcją wywoływaną jako akcja "
-"warunkowa; otrzymano obiekt klasy %s"
+"tylko FALSE ma sens dla 'inherited', gdy dostarczono 'where' (otrzymano %s)"
 
+#. R/SClasses.R: stop("only arguments 'Class' and 'where' can be supplied when argument 'representation' is a 'classRepresentation' object")
+#: R/SClasses.R:0
 msgid ""
-"No simply inherited methods found for function %s; using non-simple method"
+"only arguments 'Class' and 'where' can be supplied when argument "
+"'representation' is a 'classRepresentation' object"
 msgstr ""
-"Nie znaleziono prostych dziedziczonych metod dla funkcji %s; używanie "
-"nieprostej metody"
+"tylko argumenty 'Class' oraz 'where' mogą być dostarczone gdy argument "
+"'representation' jest obiektem klasy \"classRepresentation\""
 
-msgid ""
-"Note: method with signature %s chosen for function %s,\n"
-" target signature %s.\n"
-" %s would also be valid"
+#. R/SClasses.R: stop("only one data object (unnamed argument to prototype) allowed")
+#: R/SClasses.R:0
+msgid "only one data object (unnamed argument to prototype) allowed"
 msgstr ""
-"Uwaga: metoda z sygnaturÄ… %s wybrana dla funkcji %s,\n"
-" docelowa sygnatura %s.\n"
-" %s również byłaby poprawna"
+"tylko jeden obiekt danych (nienazwany argument przekazany do funkcji "
+"'prototype()') jest dozwolony"
 
-msgid "unable to find an inherited method for function %s for signature %s"
-msgstr "nie można znaleźć dziedziczonej metody dla funkcji %s dla sygnatury %s"
+#. R/Methods.R: gettext("original function is prohibited as a generic function")
+#: R/Methods.R:0
+msgid "original function is prohibited as a generic function"
+msgstr "oryginalna funkcja jest zakazana jako ogólna funkcja"
 
-msgid "failed to find expected group generic function:"
-msgstr "nie udało się znaleźć oczekiwanej funkcji grupy ogólnej:"
+#. R/trace.R: gettextf("package %s is not attached and no namespace found for it",     sQuote(package))
+#: R/trace.R:0
+msgid "package %s is not attached and no namespace found for it"
+msgstr ""
+"pakiet %s nie jest dołączony przez co nie znaleziono dla niego przestrzeni "
+"nazw"
+
+#. R/Methods.R: gettextf("package slots  differ: %s, %s", .dQ(gpString(f1@package)),     .dQ(gpString(f2@package)))
+#: R/Methods.R:0
+msgid "package slots  differ: %s, %s"
+msgstr "gniazda pakietów różnią się: %s, %s"
 
+#. R/RClassUtils.R: gettextf("potential cycle in class inheritance: %s has duplicates in superclasses and subclasses (%s)",     dQuote(Class), paste(bad, collapse = ", "))
+#: R/RClassUtils.R:0
 msgid ""
-"invalid group generic function in search for inherited method (class %s)"
+"potential cycle in class inheritance: %s has duplicates in superclasses and "
+"subclasses (%s)"
 msgstr ""
-"niepoprawna funkcja grupy ogólnej w poszukiwaniu dziedziczonej metody (klasa "
-"%s)"
-
-msgid "invalid methods table request"
-msgstr "niepoprawne żądanie tablicy metod"
+"potencjalny cykl w dziedziczeniu klasy: %s ma powtórzenia w superklasach "
+"oraz podklasach (%s)"
 
+#. R/Methods.R: stop("primitive functions cannot be methods; they must be enclosed in a regular function")
+#: R/Methods.R:0
 msgid ""
-"trying to check signature length of group generic '%s', but it is not a "
-"group generic"
+"primitive functions cannot be methods; they must be enclosed in a regular "
+"function"
 msgstr ""
-"próba sprawdzenia długości sygnatury grupy ogólnej '%s', ale to nie jest "
-"grupa ogólna"
+"prymitywne funkcje nie mogą być metodami; muszą być zawarte w regularnej "
+"funkcji"
 
+#. R/RClassUtils.R: warning("prototype is a list with named elements (could be ambiguous):  better to use function prototype() to avoid trouble.")
+#: R/RClassUtils.R:0
 msgid ""
-"trying to check signature length of generic '%s', but it is not a generic "
-"function: i = %d, funs = %s, gnames = %s"
+"prototype is a list with named elements (could be ambiguous):  better to use "
+"function prototype() to avoid trouble."
 msgstr ""
-"próba sprawdzenia długości sygnatury funkcji ogólnej '%s', ale to nie jest "
-"funkcja ogólna: i = %d, funs = %s, gnames = %s"
+"prototyp jest listą z nazwanymi elementami (mogą być niejednoznaczne):  "
+"lepiej używać funkcji 'prototype()' aby uniknąć kłopotów."
 
-msgid "no methods table for generic %s from package %s in package %s"
-msgstr "brak tablicy metod dla ogolnej funkcji %s z pakietu %s w pakiecie %s"
+#. R/ClassExtensions.R: gettextf("replacement value must be of class %s, got one of class %s",     dQuote(CLASS), dQuote(class(value)[[1L]]))
+#: R/ClassExtensions.R:0
+msgid "replacement value must be of class %s, got one of class %s"
+msgstr "wartość zastępcza musi być klasy %s, otrzymano jedną klasy %s"
 
-msgid "undefined classes (%s) will be ignored for argument '%s'"
-msgstr "niezdefiniowane klasy (%s) zostanÄ… zignorowane dla argumentu '%s'"
+#. R/ClassExtensions.R: gettextf("replacement value must extend class %s, got %s", dQuote(needClass),     dQuote(S3Class[[1L]]))
+#: R/ClassExtensions.R:0
+msgid "replacement value must extend class %s, got %s"
+msgstr "wartość zastępcza musi rozszerzać klasę %s, otrzymano %s"
+
+#. R/oldClass.R: gettextf("restoring definition of class %s", dQuote(cl))
+#: R/oldClass.R:0
+msgid "restoring definition of class %s"
+msgstr "przywracanie definicji klasy %s"
 
+#. R/trace.R: gettextf("setting a method over the binding of symbol %s in environment/package %s",     sQuote(what), sQuote(getPackageName(where)))
+#: R/trace.R:0
 msgid ""
-"argument 'signatures' must be a character matrix whose rows are method "
-"signatures"
+"setting a method over the binding of symbol %s in environment/package %s"
 msgstr ""
-"argument 'signatures' musi być macierzą tekstową której wiersze są "
-"sygnaturami metod"
+"ustawianie metody poprzez powiązanie symbolu %s w środowisku/pakiecie %s"
 
-msgid "not allowed to have test==TRUE and an S4Class definition"
-msgstr "niedozwolone by mieć 'test==TRUE' oraz definicję S4Class"
+#. R/Methods.R: gettextf("signatures differ:  (%s), (%s)", paste(f1@signature,     collapse = ", "), paste(f2@signature, collapse = ", "))
+#: R/Methods.R:0
+msgid "signatures differ:  (%s), (%s)"
+msgstr "sygnatury różnią się:  (%s), (%s)"
 
-msgid ""
-"argument 'S4Class' must be a class definition: got an object of class %s"
-msgstr "argument 'S4Class' musi być definicją klasy: otrzymano obiekt klasy %s"
+#. R/RMethodUtils.R: gettextf("single string; got an object of class %s", dQuote(class(what)[[1L]]))
+#: R/RMethodUtils.R:0
+msgid "single string; got an object of class %s"
+msgstr "pojedynczy łańcuch; otrzymano obiekt klasy %s"
 
-msgid ""
-"inconsistent old-style class information for %s; the class is defined but "
-"does not extend %s and is not valid as the data part"
-msgstr ""
-"niespójny stary styl informacji o klasie dla %s; klasa jest zdefiniowana, "
-"ale nie rozszerza %s oraz nie jest poprawna jako część danych"
+#. R/MethodsList.R: gettextf("skipping methods list element %s of unexpected class %s\n\n",     paste(cnames[i], collapse = ", "), dQuote(.class1(mi)))
+#: R/MethodsList.R:0
+msgid "skipping methods list element %s of unexpected class %s"
+msgstr "pomijanie elementów listy metod %s nieoczekiwanej klasy %s"
 
+#. R/RClassUtils.R: gettextf("slot %s in class %s currently defined (or inherited) as \"%s\", conflicts with an inherited definition in class %s",     sQuote(dup), dQuote(name), elNamed(allProps, dup), dQuote(cl))
+#: R/RClassUtils.R:0
 msgid ""
-"the S3 class of the prototype, \"%s\", is undefined; only allowed when this "
-"is the S3 class being registered (\"%s\")"
+"slot %s in class %s currently defined (or inherited) as \"%s\", conflicts "
+"with an inherited definition in class %s"
 msgstr ""
-"klasa S3 prototypu, \"%s\", jest niezdefiniowana; dozwolone tylko jeśli jest "
-"to klasa S3 będąca w trakcie rejestracji (\"%s\")"
-
-msgid "restoring definition of class %s"
-msgstr "przywracanie definicji klasy %s"
+"gniazdo %s w klasie %s aktualnie zdefiniowane (lub odziedziczone) jako %s, "
+"jest w konflikcie z odziedziczonÄ… definicjÄ… w klasie %s"
 
+#. R/oldClass.R: gettextf("slot %s: class %s should extend class %s", sQuote(what),     dQuote(slots1[[what]]), dQuote(slots2[[what]]))
+#: R/oldClass.R:0
 msgid "slot %s: class %s should extend class %s"
 msgstr "gniazdo %s: klasa %s powinna rozszerzać klasę %s"
 
+#. R/RMethodUtils.R: gettextf("some actions are missing: %s", paste(actions[!allExists],     collapse = ", "))
+#: R/RMethodUtils.R:0
+msgid "some actions are missing: %s"
+msgstr "brakuje niektórych akcji: %s"
+
+#. R/RClassUtils.R: gettextf("subclass %s of class %s is not local and cannot be updated for new inheritance information; consider setClassUnion()",     .dQ(what), .dQ(class))
+#: R/RClassUtils.R:0
 msgid ""
-"invalid S4 class corresponding to S3 class: slots in  S4 version must extend "
-"corresponding slots in S3 version: fails for %s"
+"subclass %s of class %s is not local and cannot be updated for new "
+"inheritance information; consider setClassUnion()"
 msgstr ""
-"niepoprawna klasa S4 odpowiadajÄ…ca klasie S3: gniazda w wersji S4 muszÄ… "
-"rozszerzać odpowiadające im sloty w wersji S3: nie powiodło się dla %s"
+"podklasa %s klasy %s nie jest lokalna i nie może być zaktualizowana dla "
+"nowych dziedziczonych informacji; rozważ 'setClassUnion()'"
 
-msgid "explicit coercion of old-style class (%s) is not defined"
-msgstr "nie zdefiniowano jawnego przekształcenia klasy starego stylu (%s)"
+#. R/trace.R: gettextf("supplied package, %s, differs from package inferred from source, %s",     sQuote(package), sQuote(envPackage))
+#: R/trace.R:0
+msgid "supplied package, %s, differs from package inferred from source, %s"
+msgstr ""
+"dostarczony pakiet, %s, różni się od pakietu wywnioskowanego ze źródła, %s"
 
+#. R/methodsTable.R: gettextf("the \"ambiguousMethodSelection\" option should be a function to be called as the condition action; got an object of class %s",     dQuote(class(condAction)))
+#: R/methodsTable.R:0
 msgid ""
-"explicit replacement not defined for as(x, \"%s\") <- value for old-style "
-"class %s"
+"the \"ambiguousMethodSelection\" option should be a function to be called as "
+"the condition action; got an object of class %s"
 msgstr ""
-"nie zdefiniowano jawnej zamiany dla 'as(x, \"%s\") <- value' dla klasy "
-"starego stylu %s"
+"opcja \"ambiguousMethodSelection\" powinna być funkcją wywoływaną jako akcja "
+"warunkowa; otrzymano obiekt klasy %s"
 
+#. R/RMethodUtils.R: gettextf("the %s argument must be NULL or a generic function object; got an object of class %s",     sQuote("genericFunction"), dQuote(class(genericFunction)))
+#: R/RMethodUtils.R:0
 msgid ""
-"argument 'Classes' must be a vector of two classes; got an argument of "
-"length %d"
+"the %s argument must be NULL or a generic function object; got an object of "
+"class %s"
 msgstr ""
-"argument 'Classes' musi być wektorem dwóch klas; otrzymano argument o "
-"długości %d"
+"argument %s musi być wartością NULL lub obiektem ogólnej funkcji; otrzymano "
+"obiekt klasy %s"
+
+#. R/RClassUtils.R: gettextf("the '%s' list for class %s, includes an undefined class %s",     if (superClassCase) "superClass" else "subClass", dQuote(className),     dQuote(.className(by)))
+#: R/RClassUtils.R:0
+msgid "the '%s' list for class %s, includes an undefined class %s"
+msgstr "lista '%s' dla klasy %s, zawiera w sobie niezdefiniowanÄ… klasÄ™ %s"
 
+#. R/ClassExtensions.R: gettextf("the 'S3Class' argument must be a superclass of %s:  not true of class %s",     dQuote(class(object)), dQuote(S3Class))
+#: R/ClassExtensions.R:0
 msgid ""
-"inconsistent old-style class information for %s (maybe mixing old and new "
-"classes?)"
+"the 'S3Class' argument must be a superclass of %s:  not true of class %s"
 msgstr ""
-"niespójna informacja o starym stylu klasy dla %s (być może mieszanie starych "
-"oraz nowych klas?)"
+"argument 'S3Class' musi być superklasą %s: nie jest to prawdą dla klasy %s"
 
+#. R/ClassExtensions.R: gettextf("the 'coerce' argument to 'setIs' should be a function of one argument, got an object of class %s",     dQuote(class(coerce)))
+#: R/ClassExtensions.R:0
 msgid ""
-"'S3Class' only defined for extensions of %s or classes with a data part:  "
-"not true of class %s"
+"the 'coerce' argument to 'setIs' should be a function of one argument, got "
+"an object of class %s"
 msgstr ""
-"'S3Class' zdefiniowana tylko dla rozszerzeń %s lub klas z częściami danych: "
-"nie jest to prawda dla klasy %s"
+"argument 'coerce' przekazywany do 'setIs' powinien być funkcją jednego "
+"argumentu, otrzymano obiekt klasy %s"
 
+#. R/refClass.R: gettextf("the 'contains' argument should be the names of superclasses:  got an element of class %s",     dQuote(class(what)))
+#: R/refClass.R:0
 msgid ""
-"'S3Class' can only assign to S4 objects that extend \"oldClass\"; not true "
+"the 'contains' argument should be the names of superclasses:  got an element "
 "of class %s"
 msgstr ""
-"'S3Class' może być przypisana do obiektów S4, które rozszerzają \"oldClass"
-"\"; nie jest to prawda dla klasy %s"
-
-msgid "Created a package name, %s, when none found"
-msgstr "Utworzono nazwę pakietu, %s, gdy nie znaleziono żadnej"
-
-msgid "no definition of class %s found"
-msgstr "nie znaleziono definicji klasy %s"
-
-msgid "multiple definitions of %s found; using the one on %s"
-msgstr "znaleziono wielokrotne definicje %s; używanie jednej z %s"
+"argument 'contains' powinien być nazwami superklas: otrzymano element klasy "
+"%s"
 
-msgid "%s is not a valid field or method name for reference class %s"
+#. R/ClassExtensions.R: gettextf("the 'replace' argument to setIs() should be a function of 2 or 3 arguments, got an object of class %s",     dQuote(class(replace)))
+#: R/ClassExtensions.R:0
+msgid ""
+"the 'replace' argument to setIs() should be a function of 2 or 3 arguments, "
+"got an object of class %s"
 msgstr ""
-"%s nie jest poprawnym polem lub nazwÄ… metody dla klasy referencyjnej %s"
+"argument 'replace' przekazywany do 'setIs()' powinien być funkcją 2 lub 3 "
+"argumentów, otrzymano obiekt klasy %s"
 
+#. R/Methods.R: gettextf("the 'where' environment (%s) is a locked namespace; cannot assign methods there",     getPackageName(where))
+#: R/Methods.R:0
 msgid ""
-"a call to superClass() is in the method %s but there is no superclass "
-"definition of this method for class %s"
+"the 'where' environment (%s) is a locked namespace; cannot assign methods "
+"there"
 msgstr ""
-"wywołanie 'superClass()' jest w metodzie %s, ale brak tam definicji "
-"superklasy tej metody dla klasy %s"
+"środowisko 'where' (%s) jest zablokowaną przestrzenią nazw; nie można "
+"przypisać tam metod"
 
-msgid "methods declared in usingMethods() but not found: %s"
+#. R/oldClass.R: gettextf("the S3 class of the prototype, \"%s\", is undefined; only allowed when this is the S3 class being registered (\"%s\")",     .class1(prototype), mainClass)
+#: R/oldClass.R:0
+msgid ""
+"the S3 class of the prototype, \"%s\", is undefined; only allowed when this "
+"is the S3 class being registered (\"%s\")"
 msgstr ""
-"metody zostały zadeklarowanie w 'usingMethods() ', ale nie znaleziono: %s"
-
-msgid "%s is not a reference class"
-msgstr "%s nie jest klasÄ… referencyjnÄ…"
-
-msgid "%s is not a field in class %s"
-msgstr "%s nie jest polem w klasie %s"
+"klasa S3 prototypu, \"%s\", jest niezdefiniowana; dozwolone tylko jeśli jest "
+"to klasa S3 będąca w trakcie rejestracji (\"%s\")"
 
+#. R/RMethodUtils.R: gettextf("the body of the generic function for %s calls 'standardGeneric' to dispatch on a different name (\"%s\")!",     sQuote(fname), paste(as.character(x[[2L]]), collapse = "\n"))
+#: R/RMethodUtils.R:0
 msgid ""
-"unnamed arguments to $new() must be objects from a reference class; got an "
-"object of class %s"
+"the body of the generic function for %s calls 'standardGeneric' to dispatch "
+"on a different name (\"%s\")!"
 msgstr ""
-"nienazwane argumenty przekazane do '$new()' muszą być obiektami z klasy "
-"referencyjnej; otrzymano obiekt klasy %s"
-
-msgid "%s is not a valid field or method name for this class"
-msgstr "%s nie jest poprawnym polem lub nazwÄ… metody dla tej klasy"
+"ciało ogólnej funkcji dla %s wywołuje 'standardGeneric' by rozdzielić pod "
+"inna nazwÄ… ('%s')!"
 
+#. R/refClass.R: gettextf("the class of field %s in the object is not compatible with the desired class %s in the target",     sQuote(field), dQuote(fieldClasses[[field]]))
+#. R/refClass.R: gettextf("the class of field %s in the object is not compatible with the desired class %s in the target",     sQuote(field), dQuote(fieldClasses[[field]]))
+#: R/refClass.R:0
 msgid ""
 "the class of field %s in the object is not compatible with the desired class "
 "%s in the target"
 msgstr "klasa pola %s w obiekcie nie jest zgodna z pożądaną klasą %s w celu"
 
-msgid "%s is not a defined class in this environment"
-msgstr " %s nie jest zdefiniowaną klasą w tym środowisku"
-
-msgid "invalid 'Class' argument:  should be a single string"
-msgstr "niepoprawny argument 'Class': powinien być pojedycznym łańcuchem"
-
-msgid "%s is not one of the reference super classes for this object"
-msgstr "Klasa %s nie jest jednÄ… z referencyjnych superklas dla tego obiektu"
-
-msgid ""
-"direct calls to callSuper() are invalid:  should only be called from another "
-"method"
-msgstr ""
-"bezpośrednie wywołania 'callSuper()' są niepoprawne:  powinna być wywoływana "
-"tylko z innej metody"
-
-msgid "%s is not a field in this class"
-msgstr "%s nie jest polem w tej klasie"
-
-msgid ""
-"the definition of class %s in package %s is locked, methods may not be "
-"redefined"
-msgstr ""
-"definicja klasy %s w pakiecie %s jest zablokowana, metody nie mogą zostać "
-"przedefiniowane"
-
-msgid "arguments to methods() must be named, or one named list"
-msgstr ""
-"argumenty przekazane do 'methods()' muszą być nazwane lub być jedną nazwaną "
-"listÄ…"
-
+#. R/ClassExtensions.R: gettextf("the computation: 'as(object,\"%s\") <- value' is valid when object has class %s only if 'is(value, \"%s\")' is TRUE ('class(value)' was %s)\n",     TO, dQuote(FROM), TO, dQuote(class(value)))
+#: R/ClassExtensions.R:0
 msgid ""
-"topic %s is not a method name in class %s\n"
-"The class definition follows"
+"the computation: 'as(object,\"%s\") <- value' is valid when object has class "
+"%s only if 'is(value, \"%s\")' is TRUE ('class(value)' was %s)"
 msgstr ""
-"temat %s nie jest nazwÄ… metody w klasie %s\n"
-"Definicja klasy przedstawia się następująco"
+"obliczenie: 'as(object,\"%s\") <- value' jest poprawne gdy obiekt posiada "
+"klasę %s tylko jeśli 'is(value, \"%s\")' jest TRUE ('class(value)' było %s)"
 
+#. R/refClass.R: gettextf("the definition of class %s in package %s is locked so fields may not be modified",     dQuote(def@className), sQuote(def@package))
+#. R/refClass.R: gettextf("the definition of class %s in package %s is locked so fields may not be modified",     dQuote(def@className), sQuote(def@package))
+#: R/refClass.R:0
 msgid ""
 "the definition of class %s in package %s is locked so fields may not be "
 "modified"
@@ -1534,303 +2276,324 @@
 "definicja klasy %s w pakiecie %s jest zablokowana, pola nie mogą zostać "
 "zmodyfikowane"
 
+#. R/refClass.R: gettextf("the definition of class %s in package %s is locked, methods may not be redefined",     dQuote(def@className), sQuote(def@package))
+#: R/refClass.R:0
 msgid ""
-"the overriding class (\"%s\") of field %s is not a subclass of the existing "
-"field definition (\"%s\")"
-msgstr ""
-"nadrzędna 'class(\"%s\")' pola %s nie jest podklasą istniejącej definicji "
-"pola (\"%s\")"
-
-msgid ""
-"invalid assignment for reference class field %s, should be from class %s or "
-"a subclass (was class %s)"
+"the definition of class %s in package %s is locked, methods may not be "
+"redefined"
 msgstr ""
-"niepoprawne przypisanie dla pola %s klasy referencyjnej, powinien być z "
-"klasy %s lub podklasy (była klasa %s)"
-
-msgid "invalid replacement: reference class field %s is read-only"
-msgstr "niepoprawna zamiana: pole %s klasy referencyjnej jest tylko do odczytu"
+"definicja klasy %s w pakiecie %s jest zablokowana, metody nie mogą zostać "
+"przedefiniowane"
 
+#. R/trace.R: stop("the editing in trace() can only change the body of the function, not the arguments or defaults")
+#: R/trace.R:0
 msgid ""
-"the 'contains' argument should be the names of superclasses:  got an element "
-"of class %s"
+"the editing in trace() can only change the body of the function, not the "
+"arguments or defaults"
 msgstr ""
-"argument 'contains' powinien być nazwami superklas: otrzymano element klasy "
-"%s"
-
-msgid "no definition found for inherited class: %s"
-msgstr "nie znaleziono definicji dla dziedziczonej klasy: %s"
+"edytowanie w 'trace()' może zmienić jedynie ciało funkcji, a nie argumenty "
+"lub wartości domyślne"
 
+#. R/trace.R: gettextf("the editing in trace() can only change the body of the function; got an object of class %s",     dQuote(class(def2)))
+#: R/trace.R:0
 msgid ""
-"a single class name is needed for field %s, got a character vector of length "
-"%d"
+"the editing in trace() can only change the body of the function; got an "
+"object of class %s"
 msgstr ""
-"potrzeba pojedynczej nazwy klasy dla pola %s, otrzymano wektor tekstowy o "
-"długości %d"
-
-msgid "class %s for field %s is not defined"
-msgstr "klasa %s dla pola %s nie jest zdefiniowana"
+"edytowanie w 'trace()' może zmienić jedynie ciało funkcji; otrzymano obiekt "
+"klasy %s"
 
-msgid ""
-"field %s was supplied as an object of class %s; must be a class name or a "
-"binding function"
+#. R/Methods.R: gettextf("the environment %s is locked; cannot assign methods for function %s",     sQuote(getPackageName(where)), sQuote(f))
+#: R/Methods.R:0
+msgid "the environment %s is locked; cannot assign methods for function %s"
 msgstr ""
-"pole %s zostało dostarczone jako obiekt klasy %s; musi być nazwa klasy lub "
-"funkcja wiążąca"
+"środowisko %s jest zablokowane; nie można przypisać metod dla funkcji %s"
 
+#. R/RMethodUtils.R: gettextf("the function being used as %s in making a generic function for %s is currently traced; the function used will have tracing removed",     what, sQuote(f))
+#: R/RMethodUtils.R:0
 msgid ""
-"code for methods in class %s was not checked for suspicious field "
-"assignments (recommended package %s not available?)"
+"the function being used as %s in making a generic function for %s is "
+"currently traced; the function used will have tracing removed"
 msgstr ""
-"kod dla metod w klasie %s nie był sprawdzony pod kątem podejrzanych "
-"przypisań pól (rekomendowany pakiet %s nie jest dostępny?)"
-
-msgid "class %s is defined but is not a reference class"
-msgstr "klasa %s jest zdefiniowana, ale nie jest referencyjnÄ… klasÄ…"
+"funkcja użyta jako %s podczas tworzenia ogólnej funkcji dla %s jest "
+"aktualnie śledzona; użyta funkcja będzie miała usunięte śledzenie"
 
-msgid ""
-"class must be a reference class representation or a character string; got an "
-"object of class %s"
-msgstr ""
-"klasa musi być referencyjną reprezentacją klasy lub łańcuchem tekstowym; "
-"otrzymano obiekt klasy %s"
+#. R/ClassUnion.R: gettextf("the member classes must be defined: not true of %s",     paste(.dQ(as(members[!membersDefined], "character")), collapse = ", "))
+#: R/ClassUnion.R:0
+msgid "the member classes must be defined: not true of %s"
+msgstr "klasy członkowe muszą być zdefiniowane: nie jest to prawda dla %s"
 
-msgid "not a reference class: %s"
-msgstr "to nie jest referencja klasy: %s"
+#. R/trace.R: gettextf("the method for %s for this signature was not being traced",     sQuote(what))
+#: R/trace.R:0
+msgid "the method for %s for this signature was not being traced"
+msgstr "metoda dla %s dla tej sygnatury nie była śledzona"
 
+#. R/Methods.R: gettextf("the method for function %s and signature %s is sealed and cannot be re-defined",     sQuote(f), .signatureString(fdef, signature))
+#: R/Methods.R:0
 msgid ""
-"local assignment to field name will not change the field:\n"
-"    %s\n"
-" Did you mean to use \"<<-\"? ( in method %s for class %s)"
+"the method for function %s and signature %s is sealed and cannot be re-"
+"defined"
 msgstr ""
-"lokalne przypisanie do nazwy pola nie zmieni pola:\n"
-"    %s\n"
-" Czy chciałeś użyć \"<<-\"? ( w metodzie %s klasy %s)"
+"metoda dla funkcji %s oraz sygnatury %s jest zamknięta i nie może być "
+"przedefiniowana"
 
-msgid ""
-"non-local assignment to non-field names (possibly misspelled?)\n"
-"    %s\n"
-"( in method %s for class %s)"
+#. R/MethodsListClass.R: gettext("the names in signature for method (%s) do not match %s's arguments (%s)",     domain = "R-methods")
+#: R/MethodsListClass.R:0
+msgid "the names in signature for method (%s) do not match %s's arguments (%s)"
 msgstr ""
-"nielokalne przypisanie do nazw nie-pól (prawdopodobne literówki?)\n"
-"    %s\n"
-"( w metodzie %s klasy %s)"
+"nazwy w sygnaturze dla metody (%s) nie zgadzajÄ… siÄ™ z argumentami %s (%s)"
 
+#. R/MethodsListClass.R: gettext("the names in signature for method (%s) do not match function's arguments (%s)",     domain = "R-methods")
+#: R/MethodsListClass.R:0
 msgid ""
-"non-local assignment to method names is not allowed\n"
-"    %s\n"
-"( in method %s for class %s)"
-msgstr ""
-"nielokalne przypisanie do nazw metod nie jest dozwolone\n"
-"    %s\n"
-"(w metodzie %s dla klasy %s)"
-
-msgid "arguments must all be character string names of fields"
-msgstr "wszystkie argumenty muszą być łańcuchami tekstowymi nazw pól"
-
-msgid "field %s is already locked"
-msgstr "pole %s jest już zablokowane"
-
-msgid "field %s of class %s has a non-default binding and cannot be locked"
+"the names in signature for method (%s) do not match function's arguments (%s)"
 msgstr ""
-"pole %s klasy %s posiada niedomyślne powiązanie i nie może zostać zablokowane"
+"nazwy w sygnaturze dla metody (%s) nie zgadzajÄ… siÄ™ z argumentami funkcji "
+"(%s)"
 
+#. R/refClass.R: gettextf("the overriding class (\"%s\") of field %s is not a subclass of the existing field definition (\"%s\")",     value[[field]], sQuote(field), fieldList[[field]])
+#: R/refClass.R:0
 msgid ""
-"Class %s is not a subclass of %s; functional semantics not defined for this "
-"class"
+"the overriding class (\"%s\") of field %s is not a subclass of the existing "
+"field definition (\"%s\")"
 msgstr ""
-"Klasa %s nie jest podklasÄ… %s; semantyka funkcjonalna nie jest zdefiniowana "
-"dla tej klasy"
-
-msgid "Could not find local object in supplied environment"
-msgstr "Nie można znaleźć lokalnego obiektu w dostarczonym środowisku"
+"nadrzędna 'class(\"%s\")' pola %s nie jest podklasą istniejącej definicji "
+"pola (\"%s\")"
 
+#. R/ClassExtensions.R: gettextf("there is no automatic definition for 'as(object, \"%s\") <- value' when object has class %s and no 'replace' argument was supplied; replacement will be an error",     to, dQuote(Class))
+#: R/ClassExtensions.R:0
 msgid ""
-"invalid 'ignore' argument; should be a class definition or a character "
-"vector, got an object of class %s"
+"there is no automatic definition for 'as(object, \"%s\") <- value' when "
+"object has class %s and no 'replace' argument was supplied; replacement will "
+"be an error"
 msgstr ""
-"niepoprawny argument 'ignore'; powinien być definicją klasy lub łańcuchem "
-"tekstowym; otrzymano obiekt klasy %s"
-
-msgid "An object of class %s"
-msgstr "Obiekt klasy %s"
+"nie ma automatycznej definicji dla 'as(obiekt, \"%s\") <- value', gdy obiekt "
+"posiada klasę %s oraz brak dostarczonego argumentu 'replace'; wartość "
+"zastępcza będzie błędem"
 
+#. R/refClass.R: gettextf("topic %s is not a method name in class %s\nThe class definition follows\n",     sQuote(topic), dQuote(className))
+#: R/refClass.R:0
 msgid ""
-"invalid call to 'classLabel': expected a name or a class definition, got an "
-"object of class %s"
+"topic %s is not a method name in class %s\n"
+"The class definition follows"
 msgstr ""
-"niepoprawne wywołanie przekazane do 'classLabel': oczekiwano nazwy lub "
-"definicji klasy, otrzymano obiekt klasy %s"
-
-msgid "argument 'signature' is not meaningful for tracing reference methods"
-msgstr "argument 'signature' nie ma sensu dla śledzenia metod referencyjnych"
-
-msgid "%s is not a method for reference class %s"
-msgstr "%s nie jest metodÄ… dla klasy referencyjnej %s"
-
-msgid "argument 'what' should be the name of a function"
-msgstr "argument 'what' musi być nazwą funkcji"
+"temat %s nie jest nazwÄ… metody w klasie %s\n"
+"Definicja klasy przedstawia się następująco"
 
+#. R/trace.R: gettextf("tracing the internal function %s is not allowed", sQuote(what))
+#: R/trace.R:0
 msgid "tracing the internal function %s is not allowed"
 msgstr "śledzenie wewnętrznej funkcji %s nie jest dozwolone"
 
-msgid "no function definition for %s found"
-msgstr "nie znaleziono definicji funkcji dla %s"
-
-msgid "cannot untrace method for %s; no method defined for this signature: %s"
+#. R/RClassUtils.R: gettextf("trying to assign an object of class %s as the definition of class %s: must supply a \"classRepresentation\" object",     dQuote(class(def)), dQuote(Class))
+#: R/RClassUtils.R:0
+msgid ""
+"trying to assign an object of class %s as the definition of class %s: must "
+"supply a \"classRepresentation\" object"
 msgstr ""
-"nie można zwolnić śledzenia metody dla %s; nie zdefiniowano metody dla tej "
-"sygnatury: %s"
-
-msgid "the method for %s for this signature was not being traced"
-msgstr "metoda dla %s dla tej sygnatury nie była śledzona"
+"próba przypisania obiekt klasy %s jako definicję klasy %s: potrzeba "
+"dostarczyć obiekt 'classRepresentation'"
 
+#. R/RMethodUtils.R: gettextf("trying to change the formal arguments in %s in an object of class %s; expected a function definition",     msg, dQuote(class(def)))
+#: R/RMethodUtils.R:0
 msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+"trying to change the formal arguments in %s in an object of class %s; "
+"expected a function definition"
 msgstr ""
-"tworzenie śledzonej wersji funkcji prymitywnej; argumenty będą traktowane "
-"jak  '...'"
+"próba zmiany formalnych argumentów w %s w obiekcie klasy %s; oczekiwano "
+"definicji funkcji"
 
+#. R/RMethodUtils.R: gettextf("trying to change the formal arguments in %s, but getting the new formals from an object of class %s; expected a function definition",     msg, dQuote(class(def)))
+#: R/RMethodUtils.R:0
 msgid ""
-"the editing in trace() can only change the body of the function; got an "
-"object of class %s"
+"trying to change the formal arguments in %s, but getting the new formals "
+"from an object of class %s; expected a function definition"
 msgstr ""
-"edytowanie w 'trace()' może zmienić jedynie ciało funkcji; otrzymano obiekt "
-"klasy %s"
+"próba zmiany formalnych argumentów w %s, ale otrzymano nowe argumenty "
+"formalne z obiektu klasy %s; oczekiwano definicji funkcji"
 
+#. R/RMethodUtils.R: gettextf("trying to change the formal arguments in %s, but the number of existing arguments is greater than the number of new arguments (the extra arguments won't be used): (%s) vs (%s)",     msg, paste0("\"", old, "\"", collapse = ", "), paste0("\"",         new, "\"", collapse = ", "))
+#: R/RMethodUtils.R:0
 msgid ""
-"the editing in trace() can only change the body of the function, not the "
-"arguments or defaults"
+"trying to change the formal arguments in %s, but the number of existing "
+"arguments is greater than the number of new arguments (the extra arguments "
+"won't be used): (%s) vs (%s)"
 msgstr ""
-"edytowanie w 'trace()' może zmienić jedynie ciało funkcji, a nie argumenty "
-"lub wartości domyślne"
-
-msgid "cannot use 'at' argument without a trace expression"
-msgstr "nie można użyć argumentu 'at' bez wyrażenia śledzenia"
+"próba zmiany formalnych argumentów w %s, ale liczba istniejących argumentów "
+"jest większa niż liczba nowych argumentów (dodatkowe argumenty nie będą "
+"użyte): (%s) względem (%s)"
 
+#. R/RMethodUtils.R: gettextf("trying to change the formal arguments in %s, but the number of existing arguments is less than the number of new arguments: (%s) vs (%s)",     msg, paste0("\"", old, "\"", collapse = ", "), paste0("\"",         new, "\"", collapse = ", "))
+#: R/RMethodUtils.R:0
 msgid ""
-"cannot use 'at' argument unless the function body has the form '{ ... }'"
-msgstr "nie można użyć argumentu 'at' o ile ciało funkcji ma formę '{ ... }'"
-
-msgid "assigning over the binding of symbol %s in environment/package %s"
-msgstr "przypisywanie poprzez powiązanie symbolu %s w środowisku/pakiecie %s"
+"trying to change the formal arguments in %s, but the number of existing "
+"arguments is less than the number of new arguments: (%s) vs (%s)"
+msgstr ""
+"próba zmiany formalnych argumentów w %s, ale liczba istniejących argumentów "
+"jest mniejsza niż liczba nowych argumentów: (%s) względem (%s)"
 
+#. R/methodsTable.R: gettextf("trying to check signature length of generic '%s', but it is not a generic function: i = %d, funs = %s, gnames = %s",     what, i, paste(unlist(funs), collapse = ", "), paste(as.character(gnames),         collapse = ", "))
+#: R/methodsTable.R:0
 msgid ""
-"setting a method over the binding of symbol %s in environment/package %s"
+"trying to check signature length of generic '%s', but it is not a generic "
+"function: i = %d, funs = %s, gnames = %s"
 msgstr ""
-"ustawianie metody poprzez powiązanie symbolu %s w środowisku/pakiecie %s"
+"próba sprawdzenia długości sygnatury funkcji ogólnej '%s', ale to nie jest "
+"funkcja ogólna: i = %d, funs = %s, gnames = %s"
 
+#. R/methodsTable.R: gettextf("trying to check signature length of group generic '%s', but it is not a group generic",     what)
+#: R/methodsTable.R:0
 msgid ""
-"Environment of class %s is locked; using global environment for new class"
+"trying to check signature length of group generic '%s', but it is not a "
+"group generic"
 msgstr ""
-"Środowisko klasy %s jest zablokowane; używanie globalnego środowiska dla "
-"nowej klasy"
+"próba sprawdzenia długości sygnatury grupy ogólnej '%s', ale to nie jest "
+"grupa ogólna"
 
+#. R/methodsTable.R: stop("trying to find a methods table in a non-generic function")
+#: R/methodsTable.R:0
+msgid "trying to find a methods table in a non-generic function"
+msgstr "próba znalezienia tablicy metod w nieogólnej funkcji"
+
+#. R/MethodsList.R: gettextf("trying to match a method signature of class %s; expects a list or a character vector",     dQuote(class(signature)))
+#: R/MethodsList.R:0
 msgid ""
-"none of the objects in the source code could be found:  need to attach or "
-"specify the package"
+"trying to match a method signature of class %s; expects a list or a "
+"character vector"
 msgstr ""
-"żaden z obiektów w kodzie źródłowym nie mógł zostać znaleziony:  potrzeba "
-"dołączyć lub określić pakiet"
+"próba dopasowania sygnatury metody klasy %s; oczekuje listy lub wektor "
+"tekstowego"
 
-msgid "objects found in multiple packages: using %s and ignoring %s"
+#. R/MethodsList.R: gettextf("trying to match a method signature to an object (of class %s) that is not a generic function",     dQuote(class(fun)))
+#: R/MethodsList.R:0
+msgid ""
+"trying to match a method signature to an object (of class %s) that is not a "
+"generic function"
 msgstr ""
-"obiekty zostały znalezione w wielu pakietach: używanie %s oraz ignorowanie %s"
+"próba dopasowania sygnatury metody do obiektu (klasy %s), który nie jest "
+"ogólną funkcją"
 
-msgid "package %s is not attached and no namespace found for it"
-msgstr ""
-"pakiet %s nie jest dołączony przez co nie znaleziono dla niego przestrzeni "
-"nazw"
+#. R/as.R: gettextf("trying to set an 'as' relation from %s to itself",     dQuote(.class1(from)))
+#: R/as.R:0
+msgid "trying to set an 'as' relation from %s to itself"
+msgstr "próba ustawienia relacji 'as' z %s na siebie samą"
 
+#. R/ClassUnion.R: gettextf("unable to create union class:  could not set members %s",     paste(.dQ(failed), collapse = ", "))
+#: R/ClassUnion.R:0
+msgid "unable to create union class:  could not set members %s"
+msgstr "nie można utworzyć uni klas:  nie można ustawić członków %s"
+
+#. R/RClassUtils.R: gettextf("unable to find a consistent ordering of superclasses for class %s: order chosen is inconsistent with the superclasses of %s",     .dQ(className), paste(.dQ(setdiff(newconflicts, conflicts)),         collapse = ", "))
+#: R/RClassUtils.R:0
 msgid ""
-"invalid 'source' argument: expected file names or a connection but got an "
-"object of class %s"
+"unable to find a consistent ordering of superclasses for class %s: order "
+"chosen is inconsistent with the superclasses of %s"
 msgstr ""
-"niepoprawny argument 'source': oczekiwano nazw plików lub połączenia, a "
-"otrzymano obiekt klasy %s"
+"nie można znaleźć spójnego uporządkowania superklas dla klasy %s: wybrany "
+"porządek jest niespójny z superklasami %s"
 
-msgid "cannot find an environment corresponding to package name '%s\""
-msgstr "nie można znaleźć środowiska odpowiadającego nazwie pakietu '%s'"
+#. R/RClassUtils.R: gettextf("unable to find an environment containing class %s",     dQuote(Class))
+#: R/RClassUtils.R:0
+msgid "unable to find an environment containing class %s"
+msgstr "nie można znaleźć środowiska zawierającego klasę %s"
+
+#. R/methodsTable.R: gettextf("unable to find an inherited method for function %s for signature %s",     sQuote(fdef@generic), sQuote(cnames))
+#: R/methodsTable.R:0
+msgid "unable to find an inherited method for function %s for signature %s"
+msgstr "nie można znaleźć dziedziczonej metody dla funkcji %s dla sygnatury %s"
+
+#. R/RClassUtils.R: gettextf("unable to find required package %s", sQuote(package))
+#: R/RClassUtils.R:0
+msgid "unable to find required package %s"
+msgstr "nie można znaleźć wymaganego pakietu %s"
 
-msgid "supplied package, %s, differs from package inferred from source, %s"
-msgstr ""
-"dostarczony pakiet, %s, różni się od pakietu wywnioskowanego ze źródła, %s"
+#. R/as.R: stop("undefined 'coerce' method")
+#: R/as.R:0
+msgid "undefined 'coerce' method"
+msgstr "nieokreślona metoda 'coerce'"
 
-msgid "cannot insert these (not found in source): %s"
-msgstr "nie można ich wstawić (nie znaleziono w źródle): %s"
+#. R/methodsTable.R: gettextf("undefined classes (%s) will be ignored for argument '%s'",     paste0("\"", unique(.undefClasses), "\"", collapse = ", "),     colnames(sigs)[[j]])
+#: R/methodsTable.R:0
+msgid "undefined classes (%s) will be ignored for argument '%s'"
+msgstr "niezdefiniowane klasy (%s) zostanÄ… zignorowane dla argumentu '%s'"
 
-msgid ""
-"cannot insert methods for these functions (methods table not found in "
-"source): %s"
-msgstr ""
-"nie można wstawić metod dla tych funkcji (tablica metod nie została "
-"znaleziona w źródle): %s"
+#. R/RClassUtils.R: gettext("undefined slot classes in definition of %s: %s", domain = "R-methods")
+#: R/RClassUtils.R:0
+msgid "undefined slot classes in definition of %s: %s"
+msgstr "niezdefiniowane gniazda klas w definicji %s: %s"
 
-msgid "Non-function objects are not currently inserted (not traceable): %s"
+#. R/RClassUtils.R: gettextf("undefined subclass %s of class %s; definition not updated",     .dQ(what), .dQ(def@className))
+#: R/RClassUtils.R:0
+msgid "undefined subclass %s of class %s; definition not updated"
 msgstr ""
-"niefunkcjonalne obiekty nie są aktualnie wstawione (nie są śledzone): %s"
-
-msgid "New functions are not currently inserted (not untraceable): %s"
-msgstr "nowe funkcje nie są aktualnie wstawione (nie są śledzone): %s"
+"niezdefiniowana podklasa %s klasy %s; definicja nie została zaktualizowana"
 
-msgid "Modified functions inserted through trace(): %s"
-msgstr "Zmodyfikowane funkcje wstawione poprzez 'trace()': %s"
+#. R/zzz.R: message("unloading 'methods' package ...")
+#: R/zzz.R:0
+msgid "unloading 'methods' package ..."
+msgstr "zwalnianie pakietu 'methods'..."
 
+#. R/BasicClasses.R: gettextf("unnamed argument must extend either the S3 class or the class of the data part; not true of class %s",     dQuote(Classi))
+#: R/BasicClasses.R:0
 msgid ""
-"%s() is not a generic function in the target environment -- methods will not "
-"be inserted"
+"unnamed argument must extend either the S3 class or the class of the data "
+"part; not true of class %s"
 msgstr ""
-"'%s()' nie jest ogólną funkcją w docelowym środowisku -- metody nie zostaną "
-"wstawione"
-
-msgid "Methods inserted for function %s(): %s"
-msgstr "Metody wstawione dla funkcji '%s()': %s"
-
-msgid "no definition for object %s found in tracing environment"
-msgstr "nie znaleziono definicji dla obiektu %s w śledzonym środowisku"
-
-msgid "multiple generics match pattern, using table %s"
-msgstr "wielokrotne dopasowania wzorca funkcji ogólnej, używanie tablicy %s"
+"nienazwany argument musi rozszerzać albo klasę S3 albo klasę części danych; "
+"nie jest to prawdÄ… dla klasy %s"
 
+#. R/BasicClasses.R: gettextf("unnamed argument to initialize() for S3 class must have a class definition; %s does not",     dQuote(Classi))
+#: R/BasicClasses.R:0
 msgid ""
-"does not seem to be a method table for generic %s in tracing environment"
+"unnamed argument to initialize() for S3 class must have a class definition; "
+"%s does not"
 msgstr ""
-"nie wygląda na tablicę metod dla funkcji ogólnej %s w śledzonym środowisku"
+"nienazwany argument przekazany do metody 'initialize()' dla klasy S3 musi "
+"posiadać definicję klasy; a %s takiej nie posiada"
 
-msgid "no method in methods table for %s for signature %s"
-msgstr "brak metod w tablicy metod dla %s dla sygnatury %s"
+#. R/BasicClasses.R: stop("unnamed argument to new() must be an environment for the new object")
+#: R/BasicClasses.R:0
+msgid "unnamed argument to new() must be an environment for the new object"
+msgstr ""
+"nienazwany argument przekazywany do metody 'new()' musi być środowiskiem dla "
+"nowego obiektu"
 
-msgid "unloading 'methods' package ..."
-msgstr "zwalnianie pakietu 'methods'..."
+#. R/refClass.R: gettextf("unnamed arguments to $new() must be objects from a reference class; got an object of class %s",     dQuote(class(super)))
+#: R/refClass.R:0
+msgid ""
+"unnamed arguments to $new() must be objects from a reference class; got an "
+"object of class %s"
+msgstr ""
+"nienazwane argumenty przekazane do '$new()' muszą być obiektami z klasy "
+"referencyjnej; otrzymano obiekt klasy %s"
 
-msgid "apparently bad method or class metadata in saved environment;"
-msgstr "najwyraźniej złe metadane metody lub klasy w zapisanym środowisku;"
+#. R/MethodsList.R: gettextf("use %s instead.", dQuote(instead))
+#. R/MethodsList.R: gettextf("use %s instead.", dQuote(instead))
+#: R/MethodsList.R:0
+msgid "use %s instead."
+msgstr "użyj wzamian %s."
 
-msgid "move the file or remove the class/method"
-msgstr "przenieś plik lub usuń klasę/metodę"
+#. R/SClasses.R: stop("validity method must be NULL or a function of one argument")
+#: R/SClasses.R:0
+msgid "validity method must be NULL or a function of one argument"
+msgstr ""
+"metoda poprawności musi być wartością NULL lub funkcją jednego argumentu"
 
-msgid "no definition for class %s"
-msgid_plural "no definition for classes %s"
-msgstr[0] "brak definicji dla klasy %s"
-msgstr[1] "brak definicji dla klas %s"
-msgstr[2] "brak definicji dla klas %s"
+#. R/Methods.R: gettextf("value classes differ: %s, %s", .dQ(gpString(f1@valueClass)),     .dQ(gpString(f2@valueClass)))
+#: R/Methods.R:0
+msgid "value classes differ: %s, %s"
+msgstr "wartości klas różnią się: %s, %s"
 
-msgid ""
-"in the method signature for function %s invalid argument name in the "
-"signature: %s"
-msgid_plural ""
-"in the method signature for function %s invalid argument names in the "
-"signature: %s"
-msgstr[0] ""
-"w sygnaturze metody dla funkcji %s znajduje siÄ™ niepoprawna nazwa argumentu "
-"w sygnaturze: %s"
-msgstr[1] ""
-"w sygnaturze metody dla funkcji %s znajdują się niepoprawne nazwy argumentów "
-"w sygnaturze: %s"
-msgstr[2] ""
-"w sygnaturze metody dla funkcji %s znajdują się niepoprawne nazwy argumentów "
-"w sygnaturze: %s"
+#. R/methodsTable.R: ngettext(length(candidates), "Choosing method %s from %d ambiguous possibility",     "Choosing method %s from %d ambiguous possibilities")
+#: R/methodsTable.R:0
+msgid "Choosing method %s from %d ambiguous possibility"
+msgid_plural "Choosing method %s from %d ambiguous possibilities"
+msgstr[0] "Wybieranie metody %s z %d niejednoznacznej możliwości"
+msgstr[1] "Wybieranie metody %s z %d niejednoznacznych możliwości"
+msgstr[2] "Wybieranie metody %s z %d niejednoznacznych możliwości"
 
+#. R/MethodsListClass.R: ngettext(nreport, "Reported %d ambiguous selection out of %d for function %s\n",     "Reported %d ambiguous selections out of %d for function %s\n")
+#: R/MethodsListClass.R:0
 msgid "Reported %d ambiguous selection out of %d for function %s\n"
 msgid_plural "Reported %d ambiguous selections out of %d for function %s\n"
 msgstr[0] "Odnotowano %d niejednoznaczny wybór z możliwych %d dla funkcji %s\n"
@@ -1839,46 +2602,92 @@
 msgstr[2] ""
 "Odnotowano %d niejednoznacznych wyborów z możliwych %d dla funkcji %s\n"
 
-msgid "named elements of prototype do not correspond to slot name: %s"
-msgid_plural "named elements of prototype do not correspond to slot names: %s"
-msgstr[0] "nazwane elementy prototypu nie odnoszÄ… siÄ™ do nazwy gniazda: %s"
-msgstr[1] "nazwane elementy prototypu nie odnoszÄ… siÄ™ do nazw gniazd: %s"
-msgstr[2] "nazwane elementy prototypu nie odnoszÄ… siÄ™ do nazw gniazd: %s"
+#. R/methodsTable.R: ngettext(which2, "Selecting %d method of minimum distance", "Selecting %d methods of minimum distance")
+#: R/methodsTable.R:0
+msgid "Selecting %d method of minimum distance"
+msgid_plural "Selecting %d methods of minimum distance"
+msgstr[0] "Wybieranie %d metody minimalnej odległości"
+msgstr[1] "Wybieranie %d metod minimalnej odległości"
+msgstr[2] "Wybieranie %d metod minimalnej odległości"
 
-msgid "non-argument found in the signature: %s"
-msgid_plural "non-arguments found in the signature: %s"
-msgstr[0] "nie znaleziono argumentu w sygnaturze: %s"
-msgstr[1] "nie znaleziono argumentów w sygnaturze: %s"
-msgstr[2] "nie znaleziono argumentów w sygnaturze: %s"
+#. R/methodsTable.R: ngettext(length(which), "Selecting %d non-group method", "Selecting %d non-group methods")
+#: R/methodsTable.R:0
+msgid "Selecting %d non-group method"
+msgid_plural "Selecting %d non-group methods"
+msgstr[0] "Wybieranie %d nie-grupowej metody"
+msgstr[1] "Wybieranie %d nie-grupowych metod"
+msgstr[2] "Wybieranie %d nie-grupowych metod"
+
+#. R/methodsTable.R: ngettext(length(which), "Selecting %d partially exact-matching method",     "Selecting %d partially exact-matching methods")
+#: R/methodsTable.R:0
+msgid "Selecting %d partially exact-matching method"
+msgid_plural "Selecting %d partially exact-matching methods"
+msgstr[0] "Wybieranie %d w pełni pasującej metody"
+msgstr[1] "Wybieranie %d w pełni pasujących metod"
+msgstr[2] "Wybieranie %d w pełni pasujących metod"
 
+#. R/is.R: ngettext(sum(is.na(match(n2, n1))), "class %s is missing slot from class %s (%s), and no coerce method was supplied",     "class %s is missing slots from class %s (%s), and no coerce method was supplied")
+#: R/is.R:0
 msgid ""
-"the formal argument of the generic function for %s (%s) differs from that of "
-"the non-generic to be used as the default (%s)"
+"class %s is missing slot from class %s (%s), and no coerce method was "
+"supplied"
 msgid_plural ""
-"the formal arguments of the generic function for %s (%s) differ from those "
-"of the non-generic to be used as the default (%s)"
+"class %s is missing slots from class %s (%s), and no coerce method was "
+"supplied"
 msgstr[0] ""
-"formalny argument ogólnej funkcji dla %s (%s) różni się od tej dla "
-"nieogólnej, która ma być użyta jako domyślna (%s)"
+"klasie %s brakuje gniazda z klasy %s (%s), przez co nie dostarczono żadnej "
+"metody przekształcenia"
 msgstr[1] ""
-"formalne argumenty ogólnej funkcji dla %s (%s) różnią się od tych dla "
-"nieogólnej, która ma być użyta jako domyślna (%s)"
+"klasie %s brakuje gniazd z klasy %s (%s), przez co nie dostarczono żadnej "
+"metody przekształcenia"
 msgstr[2] ""
-"formalne argumenty ogólnej funkcji dla %s (%s) różnią się od tych dla "
-"nieogólnej, która ma być użyta jako domyślna (%s)"
+"klasie %s brakuje gniazd z klasy %s (%s), przez co nie dostarczono żadnej "
+"metody przekształcenia"
 
+#. R/SClasses.R: ngettext(length(dslots), "duplicated slot name: %s", "duplicated slot names: %s")
+#: R/SClasses.R:0
 msgid "duplicated slot name: %s"
 msgid_plural "duplicated slot names: %s"
 msgstr[0] "powtórzona nazwa gniazda: %s"
 msgstr[1] "powtórzone nazwy gniazd: %s"
 msgstr[2] "powtórzone nazwy gniazd: %s"
 
+#. R/methodsTable.R: ngettext(length(methods), "found %d equally good next method",     "found %d equally good next methods")
+#: R/methodsTable.R:0
+msgid "found %d equally good next method"
+msgid_plural "found %d equally good next methods"
+msgstr[0] "znaleziono %d równie dobrą kolejną metodę"
+msgstr[1] "znaleziono %d równie dobre kolejne metody"
+msgstr[2] "znaleziono %d równie dobrych kolejnych metod"
+
+#. R/MethodsList.R: ngettext(sum(is.na(which)), "in the method signature for function %s invalid argument name in the signature: %s",     "in the method signature for function %s invalid argument names in the signature: %s")
+#: R/MethodsList.R:0
+msgid ""
+"in the method signature for function %s invalid argument name in the "
+"signature: %s"
+msgid_plural ""
+"in the method signature for function %s invalid argument names in the "
+"signature: %s"
+msgstr[0] ""
+"w sygnaturze metody dla funkcji %s znajduje siÄ™ niepoprawna nazwa argumentu "
+"w sygnaturze: %s"
+msgstr[1] ""
+"w sygnaturze metody dla funkcji %s znajdują się niepoprawne nazwy argumentów "
+"w sygnaturze: %s"
+msgstr[2] ""
+"w sygnaturze metody dla funkcji %s znajdują się niepoprawne nazwy argumentów "
+"w sygnaturze: %s"
+
+#. R/SClasses.R: ngettext(sum(is.na(which)), "invalid name for slot of class %s: %s",     "invalid names for slots of class %s: %s")
+#: R/SClasses.R:0
 msgid "invalid name for slot of class %s: %s"
 msgid_plural "invalid names for slots of class %s: %s"
 msgstr[0] "niepoprawna nazwa gniazda klasy %s: %s"
 msgstr[1] "niepoprawne nazwy gniazd klasy %s: %s"
 msgstr[2] "niepoprawne nazwy gniazd klasy %s: %s"
 
+#. R/SClasses.R: ngettext(length(pkgs), "multiple definition of class %s visible (%s); using the definition\n   in package %s for %s",     "multiple definitions of class %s visible (%s); using the definition\n   in package %s for %s")
+#: R/SClasses.R:0
 msgid ""
 "multiple definition of class %s visible (%s); using the definition\n"
 "   in package %s for %s"
@@ -1895,22 +2704,43 @@
 "wielokrotne definicje klasy %s są widoczne (%s); używanie definicji\n"
 "   w pakiecie %s dla %s"
 
+#. R/RClassUtils.R: ngettext(sum(is.na(match(pnames, slots))), "named elements of prototype do not correspond to slot name: %s",     "named elements of prototype do not correspond to slot names: %s")
+#: R/RClassUtils.R:0
+msgid "named elements of prototype do not correspond to slot name: %s"
+msgid_plural "named elements of prototype do not correspond to slot names: %s"
+msgstr[0] "nazwane elementy prototypu nie odnoszÄ… siÄ™ do nazwy gniazda: %s"
+msgstr[1] "nazwane elementy prototypu nie odnoszÄ… siÄ™ do nazw gniazd: %s"
+msgstr[2] "nazwane elementy prototypu nie odnoszÄ… siÄ™ do nazw gniazd: %s"
+
+#. R/MethodsList.R: ngettext(length(unknown), "no definition for class %s", "no definition for classes %s")
+#: R/MethodsList.R:0
+msgid "no definition for class %s"
+msgid_plural "no definition for classes %s"
+msgstr[0] "brak definicji dla klasy %s"
+msgstr[1] "brak definicji dla klas %s"
+msgstr[2] "brak definicji dla klas %s"
+
+#. R/promptClass.R: ngettext(length(whereClass), "no definition of class %s in the specified position, %s, definition on : %s",     "no definition of class %s in the specified position, %s, definitions on : %s")
+#: R/promptClass.R:0
 msgid ""
-"class %s is missing slot from class %s (%s), and no coerce method was "
-"supplied"
+"no definition of class %s in the specified position, %s, definition on : %s"
 msgid_plural ""
-"class %s is missing slots from class %s (%s), and no coerce method was "
-"supplied"
-msgstr[0] ""
-"klasie %s brakuje gniazda z klasy %s (%s), przez co nie dostarczono żadnej "
-"metody przekształcenia"
-msgstr[1] ""
-"klasie %s brakuje gniazd z klasy %s (%s), przez co nie dostarczono żadnej "
-"metody przekształcenia"
-msgstr[2] ""
-"klasie %s brakuje gniazd z klasy %s (%s), przez co nie dostarczono żadnej "
-"metody przekształcenia"
+"no definition of class %s in the specified position, %s, definitions on : %s"
+msgstr[0] "brak definicji klasy %s we wskazanym położeniu, %s, definicja: %s"
+msgstr[1] "brak definicji klasy %s we wskazanym położeniu, %s, definicje: %s"
+msgstr[2] "brak definicji klasy %s we wskazanym położeniu, %s, definicje: %s"
 
+#. R/RMethodUtils.R: ngettext(sum(is.na(match(signature, args))), "non-argument found in the signature: %s",     "non-arguments found in the signature: %s")
+#. R/RMethodUtils.R: ngettext(sum(is.na(match(signature, args))), "non-argument found in the signature: %s",     "non-arguments found in the signature: %s")
+#: R/RMethodUtils.R:0
+msgid "non-argument found in the signature: %s"
+msgid_plural "non-arguments found in the signature: %s"
+msgstr[0] "nie znaleziono argumentu w sygnaturze: %s"
+msgstr[1] "nie znaleziono argumentów w sygnaturze: %s"
+msgstr[2] "nie znaleziono argumentów w sygnaturze: %s"
+
+#. R/is.R: ngettext(length(bad), "slot in class %s must extend corresponding slot in class %s: fails for %s",     "slots in class %s must extend corresponding slots in class %s: fails for %s")
+#: R/is.R:0
 msgid ""
 "slot in class %s must extend corresponding slot in class %s: fails for %s"
 msgid_plural ""
@@ -1925,40 +2755,42 @@
 "gniazda w klasie %s muszą rozszerzać odpowiadające im gniazda w klasie %s: "
 "nie udało się dla %s"
 
-msgid "found %d equally good next method"
-msgid_plural "found %d equally good next methods"
-msgstr[0] "znaleziono %d równie dobrą kolejną metodę"
-msgstr[1] "znaleziono %d równie dobre kolejne metody"
-msgstr[2] "znaleziono %d równie dobrych kolejnych metod"
-
-msgid "Selecting %d method of minimum distance"
-msgid_plural "Selecting %d methods of minimum distance"
-msgstr[0] "Wybieranie %d metody minimalnej odległości"
-msgstr[1] "Wybieranie %d metod minimalnej odległości"
-msgstr[2] "Wybieranie %d metod minimalnej odległości"
-
-msgid "Selecting %d non-group method"
-msgid_plural "Selecting %d non-group methods"
-msgstr[0] "Wybieranie %d nie-grupowej metody"
-msgstr[1] "Wybieranie %d nie-grupowych metod"
-msgstr[2] "Wybieranie %d nie-grupowych metod"
-
-msgid "Selecting %d partially exact-matching method"
-msgid_plural "Selecting %d partially exact-matching methods"
-msgstr[0] "Wybieranie %d w pełni pasującej metody"
-msgstr[1] "Wybieranie %d w pełni pasujących metod"
-msgstr[2] "Wybieranie %d w pełni pasujących metod"
-
-msgid "Choosing method %s from %d ambiguous possibility"
-msgid_plural "Choosing method %s from %d ambiguous possibilities"
-msgstr[0] "Wybieranie metody %s z %d niejednoznacznej możliwości"
-msgstr[1] "Wybieranie metody %s z %d niejednoznacznych możliwości"
-msgstr[2] "Wybieranie metody %s z %d niejednoznacznych możliwości"
-
+#. R/RMethodUtils.R: ngettext(length(fdef), "the formal argument of the generic function for %s (%s) differs from that of the non-generic to be used as the default (%s)",     "the formal arguments of the generic function for %s (%s) differ from those of the non-generic to be used as the default (%s)")
+#: R/RMethodUtils.R:0
 msgid ""
-"no definition of class %s in the specified position, %s, definition on : %s"
+"the formal argument of the generic function for %s (%s) differs from that of "
+"the non-generic to be used as the default (%s)"
 msgid_plural ""
-"no definition of class %s in the specified position, %s, definitions on : %s"
-msgstr[0] "brak definicji klasy %s we wskazanym położeniu, %s, definicja: %s"
-msgstr[1] "brak definicji klasy %s we wskazanym położeniu, %s, definicje: %s"
-msgstr[2] "brak definicji klasy %s we wskazanym położeniu, %s, definicje: %s"
+"the formal arguments of the generic function for %s (%s) differ from those "
+"of the non-generic to be used as the default (%s)"
+msgstr[0] ""
+"formalny argument ogólnej funkcji dla %s (%s) różni się od tej dla "
+"nieogólnej, która ma być użyta jako domyślna (%s)"
+msgstr[1] ""
+"formalne argumenty ogólnej funkcji dla %s (%s) różnią się od tych dla "
+"nieogólnej, która ma być użyta jako domyślna (%s)"
+msgstr[2] ""
+"formalne argumenty ogólnej funkcji dla %s (%s) różnią się od tych dla "
+"nieogólnej, która ma być użyta jako domyślna (%s)"
+
+#~ msgid ""
+#~ "Note: the specification for S3 class %s in package %s seems equivalent to "
+#~ "one from package %s: not turning on duplicate class definitions for this "
+#~ "class."
+#~ msgstr ""
+#~ "Uwaga: specyfikacja dla klasy S3 %s w pakiecie %s wydaje się być "
+#~ "równoważna tej z pakietu %s i nie jest duplikatem definicji klasy dla tej "
+#~ "klasy"
+
+#~ msgid "methods cannot be defined for the primitive function %s"
+#~ msgstr "metody nie mogą być zdefiniowane dla prymitywnej funkcji %s"
+
+#~ msgid ""
+#~ "package %s seems to have out-of-date methods; need to reinstall from "
+#~ "source"
+#~ msgstr ""
+#~ "pakiet %s wydaje się mieć nieaktualne metody; potrzeba przeinstalować ze "
+#~ "źródła"
+
+#~ msgid "trying to execute load actions without 'methods' package"
+#~ msgstr "próba wykonania akcji ładowania bez pakietu 'methods'"
diff -Nru r-base-3.2.3/src/library/methods/po/R-pt_BR.po r-base-3.3.1/src/library/methods/po/R-pt_BR.po
--- r-base-3.2.3/src/library/methods/po/R-pt_BR.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-pt_BR.po	2016-04-27 22:15:30.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: R 2.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:56-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -18,7 +18,7 @@
 "X-Generator: Pootle 2.0.5\n"
 
 #, fuzzy
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr "OOPS: algo errado com a linha"
 
 #, fuzzy
@@ -156,9 +156,10 @@
 msgid "invalid argument 'name': %s"
 msgstr "Argumento inválido  \"name\": %s"
 
+#, fuzzy
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
 "'%s' é uma função primitiva; métodos podem ser definidos, mas a função "
 "genérica está implícita e não pode ser modificada"
@@ -861,12 +862,6 @@
 msgstr "não foi possível encontrar um ambiente contendo a classe \"%s\""
 
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-
-msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
@@ -877,6 +872,11 @@
 "from package %s: not turning on duplicate class definitions for this class."
 msgstr ""
 
+msgid ""
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr "subclasse %s da classe %s não definida; definição não atualizada"
 
@@ -960,21 +960,12 @@
 msgstr "argumento \"f\" deve ser uma função genérica ou %s"
 
 #, fuzzy
-msgid "methods cannot be defined for the primitive function %s"
-msgstr ""
-"métodos não podem ser definidos para função primitiva '%s' nessa versão do R"
-
-#, fuzzy
 msgid "no generic function found for %s"
 msgstr "nenhuma função genérica '%s' encontrada"
 
 msgid "Empty function name in .getGeneric"
 msgstr ""
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr ""
 
@@ -1063,9 +1054,6 @@
 msgid "no definition found for class %s"
 msgstr "nenhuma definição existente para função '%s'"
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr ""
-
 #, fuzzy
 msgid "missing function for load action: %s"
 msgstr "nenhuma definição existente para função \"%s\""
@@ -1284,6 +1272,13 @@
 msgstr ""
 
 #, fuzzy
+msgid "Function must be an S4 generic"
+msgstr "Função fornecida como argumento \"f\" deve ser genérica"
+
+msgid "method is not being debugged"
+msgstr ""
+
+#, fuzzy
 msgid "object %s not found"
 msgstr "nenhuma função genérica '%s' encontrada"
 
@@ -1591,6 +1586,10 @@
 msgstr "\"%s\" não é um campo definido nessa classe"
 
 #, fuzzy
+msgid "Methods not found: %s"
+msgstr "nenhuma função genérica '%s' encontrada"
+
+#, fuzzy
 msgid ""
 "the definition of class %s in package %s is locked, methods may not be "
 "redefined"
@@ -1707,6 +1706,11 @@
 msgstr ""
 
 msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
+msgstr ""
+
+msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr ""
@@ -1762,8 +1766,7 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr "no método %s com assinatura %s:"
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+msgid "making a traced version of a special; arguments may be altered"
 msgstr ""
 
 #, fuzzy
@@ -2005,6 +2008,12 @@
 msgstr[0] "nenhuma definição existente para função '%s'"
 msgstr[1] "nenhuma definição existente para função '%s'"
 
+#, fuzzy
+#~ msgid "methods cannot be defined for the primitive function %s"
+#~ msgstr ""
+#~ "métodos não podem ser definidos para função primitiva '%s' nessa versão "
+#~ "do R"
+
 #~ msgid ""
 #~ "'callGeneric' with a primitive needs explicit arguments (no formal args "
 #~ "defined)"
diff -Nru r-base-3.2.3/src/library/methods/po/R-ru.po r-base-3.3.1/src/library/methods/po/R-ru.po
--- r-base-3.2.3/src/library/methods/po/R-ru.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-ru.po	2016-04-27 22:15:30.000000000 +0000
@@ -10,50 +10,33 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-26 19:07-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:14-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
-msgstr "OOPS: ÞÔÏ-ÔÏ ÎÅ ÔÁË ÓÏ ÓÔÒÏËÏÊ %d × '.OldClassesPrototypes'"
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
+msgstr "OOPS: ÞÔÏ-ÔÏ ÎÅ ÔÁË Ó '.OldClassesPrototypes[[%d]]'"
 
-msgid ""
-"unnamed argument to initialize() for S3 class must have a class definition; "
-"%s does not"
-msgstr ""
-"ÂÅÚÙÍÑÎÎÙÊ ÁÒÇÕÍÅÎÔ × initialize() ÄÌÑ S3-ËÌÁÓÓÁ ÄÏÌÖÅÎ ÉÍÅÔØ ÏÐÒÅÄÅÌÅÎÉÅ "
-"ËÌÁÓÓÁ; Á %s -- ÎÅ ÉÍÅÅÔ"
+msgid "unnamed argument to initialize() for S3 class must have a class definition; %s does not"
+msgstr "ÂÅÚÙÍÑÎÎÙÊ ÁÒÇÕÍÅÎÔ × initialize() ÄÌÑ S3-ËÌÁÓÓÁ ÄÏÌÖÅÎ ÉÍÅÔØ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ; Á %s -- ÎÅ ÉÍÅÅÔ"
 
-msgid ""
-"unnamed argument must extend either the S3 class or the class of the data "
-"part; not true of class %s"
-msgstr ""
-"ÂÅÚÙÍÑÎÎÙÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÒÁÓÛÉÒÑÔØ ÌÉÂÏ S3-ËÌÁÓÓ, ÌÉÂÏ ËÌÁÓÓ ÞÁÓÔÉ ÄÁÎÎÙÈ; "
-"ÜÔÏ ÎÅ ÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
+msgid "unnamed argument must extend either the S3 class or the class of the data part; not true of class %s"
+msgstr "ÂÅÚÙÍÑÎÎÙÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÒÁÓÛÉÒÑÔØ ÌÉÂÏ S3-ËÌÁÓÓ, ÌÉÂÏ ËÌÁÓÓ ÞÁÓÔÉ ÄÁÎÎÙÈ; ÜÔÏ ÎÅ ÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
 
-msgid ""
-"class %s does not have an S3 data part, and so is of type \"S4\"; no S3 "
-"equivalent"
-msgstr ""
-"ËÌÁÓÓ %s ÎÅ ÉÍÅÅÔ ÏÐÒÅÄÅÌÅÎÎÏÇÏ S3-ÒÁÚÄÅÌÁ ÄÁÎÎÙÈ, É ÐÏÜÔÏÍÕ ÏÎ ÔÉÐÁ \"S4\"; "
-"S3 ÜË×É×ÁÌÅÎÔÁ ÎÅÔ"
+msgid "class %s does not have an S3 data part, and so is of type \"S4\"; no S3 equivalent"
+msgstr "ËÌÁÓÓ %s ÎÅ ÉÍÅÅÔ ÏÐÒÅÄÅÌÅÎÎÏÇÏ S3-ÒÁÚÄÅÌÁ ÄÁÎÎÙÈ, É ÐÏÜÔÏÍÕ ÏÎ ÔÉÐÁ \"S4\"; S3 ÜË×É×ÁÌÅÎÔÁ ÎÅÔ"
 
-msgid ""
-"class %s is VIRTUAL; not meaningful to create an S4 object from this class"
-msgstr ""
-"rÌÁÓÓ %s ÷éòôõáìåî; ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ÓÏÚÄÁ×ÁÔØ S4-ÏÂßÅËÔ ÉÚ ÜÔÏÇÏ ËÌÁÓÓÁ"
+msgid "class %s is VIRTUAL; not meaningful to create an S4 object from this class"
+msgstr "rÌÁÓÓ %s ÷éòôõáìåî; ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ÓÏÚÄÁ×ÁÔØ S4-ÏÂßÅËÔ ÉÚ ÜÔÏÇÏ ËÌÁÓÓÁ"
 
 msgid "object must be a valid data part for class %s; not true of type %s"
-msgstr ""
-"ÏÂßÅËÔ ÄÏÌÖÅÎ ÂÙÔØ ÐÒÁ×ÉÌØÎÏÊ ÞÁÓÔØÀ ÄÁÎÎÙÈ ÄÌÑ ËÌÁÓÓÁ %s; ÜÔÏ ÎÅ ÔÁË Õ ÔÉÐÁ "
-"%s"
+msgstr "ÏÂßÅËÔ ÄÏÌÖÅÎ ÂÙÔØ ÐÒÁ×ÉÌØÎÏÊ ÞÁÓÔØÀ ÄÁÎÎÙÈ ÄÌÑ ËÌÁÓÓÁ %s; ÜÔÏ ÎÅ ÔÁË Õ ÔÉÐÁ %s"
 
 msgid "cannot specify matrix() arguments when specifying '.Data'"
 msgstr "ÎÅ ÍÏÇÕ ÏÐÒÅÄÅÌÉÔØ ÁÒÇÕÍÅÎÔÙ matrix(), ËÏÇÄÁ ÏÐÒÅÄÅÌÑÀ '.Data'"
@@ -65,25 +48,16 @@
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÉÍÅÔØ ÂÏÌÅÅ ÏÄÎÏÇÏ ÎÅÉÍÅÎÏ×ÁÎÎÏÇÏ ÁÒÇÕÍÅÎÔÁ × ÏËÒÕÖÅÎÉÉ"
 
 msgid "unnamed argument to new() must be an environment for the new object"
-msgstr ""
-"ÎÅÉÍÅÎÏ×ÁÎÎÙÊ ÁÒÇÕÍÅÎÔ Õ new() ÄÏÌÖÅÎ ÂÙÔØ ÏËÒÕÖÅÎÉÅÍ ÄÌÑ ÎÏ×ÏÇÏ ÏÂßÅËÔÁ"
+msgstr "ÎÅÉÍÅÎÏ×ÁÎÎÙÊ ÁÒÇÕÍÅÎÔ Õ new() ÄÏÌÖÅÎ ÂÙÔØ ÏËÒÕÖÅÎÉÅÍ ÄÌÑ ÎÏ×ÏÇÏ ÏÂßÅËÔÁ"
 
-msgid ""
-"methods may not be defined for primitive function %s in this version of R"
-msgstr ""
-"× ÜÔÏÊ ×ÅÒÓÉÉ R ÍÅÔÏÄÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ ÄÌÑ ÜÌÅÍÅÎÔÁÒÎÏÊ ÆÕÎËÃÉÉ %s"
+msgid "methods may not be defined for primitive function %s in this version of R"
+msgstr "× ÜÔÏÊ ×ÅÒÓÉÉ R ÍÅÔÏÄÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ ÄÌÑ ÜÌÅÍÅÎÔÁÒÎÏÊ ÆÕÎËÃÉÉ %s"
 
-msgid ""
-"S3Part() is only defined for classes set up by setOldCLass(), basic classes "
-"or subclasses of these:  not true of class %s"
-msgstr ""
-"S3Part() ÏÐÒÅÄÅÌÅÎÁ ÔÏÌØËÏ ÄÌÑ ËÌÁÓÓÏ× ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÞÅÒÅÚ setOldCLass(), ÉÈ "
-"ÂÁÚÏ×ÙÅ ËÌÁÓÓÙ ÉÌÉ ÓÕÂËÌÁÓÓÙ: ÜÔÏ ÎÅÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
+msgid "S3Part() is only defined for classes set up by setOldCLass(), basic classes or subclasses of these:  not true of class %s"
+msgstr "S3Part() ÏÐÒÅÄÅÌÅÎÁ ÔÏÌØËÏ ÄÌÑ ËÌÁÓÓÏ× ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÞÅÒÅÚ setOldCLass(), ÉÈ ÂÁÚÏ×ÙÅ ËÌÁÓÓÙ ÉÌÉ ÓÕÂËÌÁÓÓÙ: ÜÔÏ ÎÅÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
 
-msgid ""
-"the 'S3Class' argument must be a superclass of %s:  not true of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'S3Class' ÄÏÌÖÅÎ ÂÙÔØ ÓÕÐÅÒËÌÁÓÓÏÍ %s: ÜÔÏ ÎÅ ÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
+msgid "the 'S3Class' argument must be a superclass of %s:  not true of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ 'S3Class' ÄÏÌÖÅÎ ÂÙÔØ ÓÕÐÅÒËÌÁÓÓÏÍ %s: ÜÔÏ ÎÅ ÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
 
 msgid "replacement value must extend class %s, got %s"
 msgstr "ÚÁÍÅÎÑÀÝÅÅ ÚÎÁÞÅÎÉÅ ÄÏÌÖÎÏ ÒÁÓÛÉÒÑÔØ ËÌÁÓÓ %s, ÐÏÌÕÞÉÌ %s"
@@ -91,41 +65,20 @@
 msgid "replacement value must be of class %s, got one of class %s"
 msgstr "ÚÁÍÅÎÑÀÝÅÅ ÚÎÁÞÅÎÉÅ ÄÏÌÖÎÏ ÒÁÓÛÉÒÑÔØ ËÌÁÓÓ %s, ÐÏÌÕÞÉÌ %s"
 
-msgid ""
-"no 'replace' method was defined for 'as(x, \"%s\") <- value' for class %s"
-msgstr ""
-"ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ 'replace' ÍÅÔÏÄÁ ÄÌÑ 'as(x, \"%s\") <- value' ÄÌÑ ËÌÁÓÓÁ "
-"%s"
+msgid "no 'replace' method was defined for 'as(x, \"%s\") <- value' for class %s"
+msgstr "ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ 'replace' ÍÅÔÏÄÁ ÄÌÑ 'as(x, \"%s\") <- value' ÄÌÑ ËÌÁÓÓÁ %s"
 
-msgid ""
-"the 'coerce' argument to 'setIs' should be a function of one argument, got "
-"an object of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'coerce' ÄÌÑ 'setIs' ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ ÏÄÎÏÇÏ ÁÒÇÕÍÅÎÔÁ, ÐÏÌÕÞÅÎ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "the 'coerce' argument to 'setIs' should be a function of one argument, got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ 'coerce' ÄÌÑ 'setIs' ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ ÏÄÎÏÇÏ ÁÒÇÕÍÅÎÔÁ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"the computation: 'as(object,\"%s\") <- value' is valid when object has class "
-"%s only if 'is(value, \"%s\")' is TRUE ('class(value)' was %s)"
-msgstr ""
-"×ÙÞÉÓÌÅÎÉÅ: 'as(object,\"%s\") <- value' ÐÒÁ×ÉÌØÎÏ, ËÏÇÄÁ ÏÂßÅËÔ ÉÍÅÅÔ ËÌÁÓÓ "
-"%s ÔÏÌØËÏ ÅÓÌÉ 'is(value, \"%s\")' Ñ×ÌÑÅÔÓÑ TRUE ('class(value)' ÂÙÌÏ %s)"
+msgid "the computation: 'as(object,\"%s\") <- value' is valid when object has class %s only if 'is(value, \"%s\")' is TRUE ('class(value)' was %s)"
+msgstr "×ÙÞÉÓÌÅÎÉÅ: 'as(object,\"%s\") <- value' ÐÒÁ×ÉÌØÎÏ, ËÏÇÄÁ ÏÂßÅËÔ ÉÍÅÅÔ ËÌÁÓÓ %s ÔÏÌØËÏ ÅÓÌÉ 'is(value, \"%s\")' Ñ×ÌÑÅÔÓÑ TRUE ('class(value)' ÂÙÌÏ %s)"
 
-msgid ""
-"there is no automatic definition for 'as(object, \"%s\") <- value' when "
-"object has class %s and no 'replace' argument was supplied; replacement will "
-"be an error"
-msgstr ""
-"ÎÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ 'as(ÏÂßÅËÔ, \"%s\") <- value', ÇÄÅ "
-"ÏÂßÅËÔ ÉÍÅÅÔ ËÌÁÓÓ %s É ÁÒÇÕÍÅÎÔ 'replace' ÎÅ ÂÙÌ ÐÒÅÄÏÓÔÁ×ÌÅÎ; ÚÁÍÅÎÁ ÂÕÄÅÔ "
-"ÏÛÉÂËÏÊ"
+msgid "there is no automatic definition for 'as(object, \"%s\") <- value' when object has class %s and no 'replace' argument was supplied; replacement will be an error"
+msgstr "ÎÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ 'as(ÏÂßÅËÔ, \"%s\") <- value', ÇÄÅ ÏÂßÅËÔ ÉÍÅÅÔ ËÌÁÓÓ %s É ÁÒÇÕÍÅÎÔ 'replace' ÎÅ ÂÙÌ ÐÒÅÄÏÓÔÁ×ÌÅÎ; ÚÁÍÅÎÁ ÂÕÄÅÔ ÏÛÉÂËÏÊ"
 
-msgid ""
-"the 'replace' argument to setIs() should be a function of 2 or 3 arguments, "
-"got an object of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'replace' ÄÌÑ setIs() ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ 2 ÉÌÉ 3 ÁÒÇÕÍÅÎÔÏ×, Á "
-"ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "the 'replace' argument to setIs() should be a function of 2 or 3 arguments, got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ 'replace' ÄÌÑ setIs() ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ 2 ÉÌÉ 3 ÁÒÇÕÍÅÎÔÏ×, Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "the member classes must be defined: not true of %s"
 msgstr "ËÌÁÓÓÙ-ÞÌÅÎÙ ËÌÁÓÓÁ ÄÏÌÖÎÙ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ: ÎÅ ×ÅÒÎÏ ÄÌÑ %s"
@@ -136,25 +89,14 @@
 msgid "invalid argument 'name': %s"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ 'name' ÁÒÇÕÍÅÎÔÁ: %s"
 
-msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
-msgstr ""
-"\"%s\" Ñ×ÌÑÅÔÓÑ ÜÌÅÍÅÎÔÁÒÎÏÊ ÆÕÎËÃÉÅÊ; ÍÅÔÏÄÙ ÍÏÇÕÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ, ÎÏ "
-"ÏÂÝÁÑ ÆÕÎËÃÉÑ ÐÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÚÍÅÎÅÎÁ."
+msgid "%s is a primitive function;  methods can be defined, but the generic function is implicit, and cannot be changed."
+msgstr "\"%s\" Ñ×ÌÑÅÔÓÑ ÜÌÅÍÅÎÔÁÒÎÏÊ ÆÕÎËÃÉÅÊ; ÍÅÔÏÄÙ ÍÏÇÕÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ, ÎÏ ÏÂÝÁÑ ÆÕÎËÃÉÑ ÐÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÚÍÅÎÅÎÁ."
 
-msgid ""
-"if the 'def' argument is supplied, it must be a function that calls "
-"standardGeneric(\"%s\") or is the default"
-msgstr ""
-"ÅÓÌÉ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÁÒÇÕÍÅÎÔ 'def' , ÏÎ ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ, ËÏÔÏÒÁÑ ×ÙÚÙ×ÁÅÔ "
-"standardGeneric(\"%s\") ÉÌÉ ÕÍÏÌÞÁÎÉÅ"
+msgid "if the 'def' argument is supplied, it must be a function that calls standardGeneric(\"%s\") or is the default"
+msgstr "ÅÓÌÉ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÁÒÇÕÍÅÎÔ 'def' , ÏÎ ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ, ËÏÔÏÒÁÑ ×ÙÚÙ×ÁÅÔ standardGeneric(\"%s\") ÉÌÉ ÕÍÏÌÞÁÎÉÅ"
 
-msgid ""
-"must supply a function skeleton for %s, explicitly or via an existing "
-"function"
-msgstr ""
-"ÎÅÏÂÈÏÄÉÍÏ ÐÒÅÄÏÓÔÁ×ÉÔØ ËÁÒËÁÓ %s, Ñ×ÎÏ ÌÉÂÏ ÞÅÒÅÚ ×ÙÚÏ× ÓÕÝÅÓÔ×ÕÀÝÅÊ ÆÕÎËÃÉÉ"
+msgid "must supply a function skeleton for %s, explicitly or via an existing function"
+msgstr "ÎÅÏÂÈÏÄÉÍÏ ÐÒÅÄÏÓÔÁ×ÉÔØ ËÁÒËÁÓ %s, Ñ×ÎÏ ÌÉÂÏ ÞÅÒÅÚ ×ÙÚÏ× ÓÕÝÅÓÔ×ÕÀÝÅÊ ÆÕÎËÃÉÉ"
 
 msgid ""
 "Creating a generic function for %s from %s in %s\n"
@@ -185,19 +127,11 @@
 msgid "the environment %s is locked; cannot assign methods for function %s"
 msgstr "ÏËÒÕÖÅÎÉÅ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ; ÎÅ ÍÏÇÕ ÎÁÚÎÁÞÉÔØ ÍÅÔÏÄÙ ÄÌÑ ÆÕÎËÃÉÉ %s"
 
-msgid ""
-"the 'where' environment (%s) is a locked namespace; cannot assign methods "
-"there"
-msgstr ""
-"ÏËÒÕÖÅÎÉÅ 'where' (%s) Ñ×ÌÑÅÔÓÑ ÚÁÂÌÏËÉÒÏ×ÁÎÎÙÍ ÐÒÏÓÔÒÁÎÓÔ×ÏÍ ÉÍÅÎ; ÎÅ ÍÏÇÕ "
-"ÏÐÒÅÄÅÌÉÔØ ÔÁÍ ÍÅÔÏÄÙ"
+msgid "the 'where' environment (%s) is a locked namespace; cannot assign methods there"
+msgstr "ÏËÒÕÖÅÎÉÅ 'where' (%s) Ñ×ÌÑÅÔÓÑ ÚÁÂÌÏËÉÒÏ×ÁÎÎÙÍ ÐÒÏÓÔÒÁÎÓÔ×ÏÍ ÉÍÅÎ; ÎÅ ÍÏÇÕ ÏÐÒÅÄÅÌÉÔØ ÔÁÍ ÍÅÔÏÄÙ"
 
-msgid ""
-"Copying the generic function %s to environment %s, because the previous "
-"version was in a sealed namespace (%s)"
-msgstr ""
-"ëÏÐÉÒÕÀ ÏÂÝÕÀ ÆÕÎËÃÉÀ %s × ÏËÒÕÖÅÎÉÅ %s, ÐÏÔÏÍÕ ÞÔÏ ÐÒÅÄÙÄÕÝÁÑ ×ÅÒÓÉÑ ÂÙÌÁ × "
-"ÚÁÐÅÞÁÔÁÎÎÏÍ ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ (%s)"
+msgid "Copying the generic function %s to environment %s, because the previous version was in a sealed namespace (%s)"
+msgstr "ëÏÐÉÒÕÀ ÏÂÝÕÀ ÆÕÎËÃÉÀ %s × ÏËÒÕÖÅÎÉÅ %s, ÐÏÔÏÍÕ ÞÔÏ ÐÒÅÄÙÄÕÝÁÑ ×ÅÒÓÉÑ ÂÙÌÁ × ÚÁÐÅÞÁÔÁÎÎÏÍ ÐÒÏÓÔÒÁÎÓÔ×Å ÉÍÅÎ (%s)"
 
 msgid "no existing definition for function %s"
 msgstr "ÎÅÔ ÓÕÝÅÓÔ×ÕÀÝÅÇÏ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ ÆÕÎËÃÉÉ %s"
@@ -208,29 +142,17 @@
 msgid "Creating a generic function for %s from package %s in %s"
 msgstr "óÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ %s ÉÚ ÐÁËÅÔÁ %s × %s"
 
-msgid ""
-"the method for function %s and signature %s is sealed and cannot be re-"
-"defined"
+msgid "the method for function %s and signature %s is sealed and cannot be re-defined"
 msgstr "ÍÅÔÏÄ ÄÌÑ ÆÕÎËÃÉÉ %s É ÐÏÄÐÉÓØ %s ÚÁÐÅÞÁÔÁÎÙ É ÎÅ ÍÏÇÕÔ ÂÙÔØ ÉÚÍÅÎÅÎÙ"
 
-msgid ""
-"For function %s, signature %s: argument in method definition changed from "
-"(%s) to (%s)"
-msgstr ""
-"äÌÑ ÆÕÎËÃÉÉ %s, ÉÄÅÎÔÉÆÉËÁÔÏÒÁ %s: ÁÒÇÕÍÅÎÔ × ÏÐÒÅÄÅÌÅÎÉÉ ÍÅÔÏÄÁ ÉÚÍÅÎÅÎ Ó "
-"(%s) ÎÁ (%s)"
+msgid "For function %s, signature %s: argument in method definition changed from (%s) to (%s)"
+msgstr "äÌÑ ÆÕÎËÃÉÉ %s, ÉÄÅÎÔÉÆÉËÁÔÏÒÁ %s: ÁÒÇÕÍÅÎÔ × ÏÐÒÅÄÅÌÅÎÉÉ ÍÅÔÏÄÁ ÉÚÍÅÎÅÎ Ó (%s) ÎÁ (%s)"
 
-msgid ""
-"primitive functions cannot be methods; they must be enclosed in a regular "
-"function"
-msgstr ""
-"ÜÌÅÍÅÎÔÁÒÎÙÅ ÆÕÎËÃÉÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÍÅÔÏÄÁÍÉ; ÏÎÉ ÄÏÌÖÎÙ ÂÙÔØ ×ÌÏÖÅÎÙ × "
-"ÒÅÇÕÌÑÒÎÕÀ ÆÕÎËÃÉÀ"
+msgid "primitive functions cannot be methods; they must be enclosed in a regular function"
+msgstr "ÜÌÅÍÅÎÔÁÒÎÙÅ ÆÕÎËÃÉÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÍÅÔÏÄÁÍÉ; ÏÎÉ ÄÏÌÖÎÙ ÂÙÔØ ×ÌÏÖÅÎÙ × ÒÅÇÕÌÑÒÎÕÀ ÆÕÎËÃÉÀ"
 
-msgid ""
-"invalid method definition: expected a function, got an object of class %s"
-msgstr ""
-"îÅ×ÅÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÍÅÔÏÄÁ: ÏÖÉÄÁÌÁÓØ ÆÕÎËÃÉÑ, Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "invalid method definition: expected a function, got an object of class %s"
+msgstr "îÅ×ÅÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÍÅÔÏÄÁ: ÏÖÉÄÁÌÁÓØ ÆÕÎËÃÉÑ, Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "function supplied as argument 'f' must be a generic"
 msgstr "ÆÕÎËÃÉÑ, ÐÒÅÄÏÓÔÁ×ÌÅÎÎÁÑ ÁÒÇÕÍÅÎÔÏÍ 'f' ÄÏÌÖÎÁ ÂÙÔØ ÏÂÝÅÊ"
@@ -254,8 +176,7 @@
 msgstr "'file' ÄÏÌÖÅÎ ÂÙÔØ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ ÉÌÉ ÓÏÅÄÉÎÅÎÉÅÍ"
 
 msgid ""
-"argument 'signature' is not meaningful with the current implementation and "
-"is ignored \n"
+"argument 'signature' is not meaningful with the current implementation and is ignored \n"
 "(extract a subset of the methods list instead)"
 msgstr ""
 "ÁÒÇÕÍÅÎÔ 'signature' ÎÉÞÅÇÏ ÎÅ ÚÎÁÞÉÔ × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ É ÐÒÏÐÕÝÅÎ \n"
@@ -270,18 +191,11 @@
 msgid "%s has no methods defined"
 msgstr "%s ÎÅ ÓÏÄÅÒÖÉÔ ÏÐÒÅÄÅÌÅÎÎÙÈ ÍÅÔÏÄÏ×"
 
-msgid ""
-"bad class specified for element %d (should be a single character string)"
-msgstr ""
-"ÄÌÑ ÜÌÅÍÅÎÔÁ %d ÕÓÔÁÎÏ×ÌÅÎ ÎÅ×ÅÒÎÙÊ ËÌÁÓÓ (ÄÏÌÖÅÎ ÂÙÔØ ÏÄÎÏÓÉÍ×ÏÌØÎÏÊ "
-"ÓÔÒÏËÏÊ)"
+msgid "bad class specified for element %d (should be a single character string)"
+msgstr "ÄÌÑ ÜÌÅÍÅÎÔÁ %d ÕÓÔÁÎÏ×ÌÅÎ ÎÅ×ÅÒÎÙÊ ËÌÁÓÓ (ÄÏÌÖÅÎ ÂÙÔØ ÏÄÎÏÓÉÍ×ÏÌØÎÏÊ ÓÔÒÏËÏÊ)"
 
-msgid ""
-"first argument should be the names of one of more generic functions (got "
-"object of class %s)"
-msgstr ""
-"ÐÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÉÍÅÎÅÍ(-ÁÍÉ) ÏÂÝÉÈ ÆÕÎËÃÉÊ (Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ "
-"ËÌÁÓÓÁ %s)"
+msgid "first argument should be the names of one of more generic functions (got object of class %s)"
+msgstr "ÐÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÉÍÅÎÅÍ(-ÁÍÉ) ÏÂÝÉÈ ÆÕÎËÃÉÊ (Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s)"
 
 msgid "must supply 'generic.function' or 'class'"
 msgstr "ÎÁÄÏ ÕËÁÚÁÔØ 'generic.function' ÉÌÉ 'class'"
@@ -295,12 +209,8 @@
 msgid "Restoring default function definition of %s"
 msgstr "×ÏÓÓÔÁÎÁ×ÌÉ×ÁÀ ÏÐÒÅÄÅÌÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÆÕÎËÃÉÉ %s"
 
-msgid ""
-"error in updating S4 generic function %s; the function definition is not an "
-"S4 generic function (class %s)"
-msgstr ""
-"ÏÛÉÂËÁ × ÏÂÎÏ×ÌÅÎÉÉ ÏÂÝÅÊ ÆÕÎËÃÉÉ S4 %s; ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ ÎÅ Ñ×ÌÑÅÔÓÑ "
-"ÏÂÝÅÊ ÆÕÎËÃÉÅÊ S4 (ËÌÁÓÓ %s)"
+msgid "error in updating S4 generic function %s; the function definition is not an S4 generic function (class %s)"
+msgstr "ÏÛÉÂËÁ × ÏÂÎÏ×ÌÅÎÉÉ ÏÂÝÅÊ ÆÕÎËÃÉÉ S4 %s; ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ S4 (ËÌÁÓÓ %s)"
 
 msgid "Function %s is already a group generic; no change"
 msgstr "æÕÎËÃÉÑ %s ÕÖÅ × ÇÒÕÐÐÅ ÏÂÝÉÅ; ÂÅÚ ÉÚÍÅÎÅÎÉÊ"
@@ -320,12 +230,8 @@
 msgid "%s is a primitive function; its generic form cannot be redefined"
 msgstr "%s Ñ×ÌÑÅÔÓÑ ÐÒÉÍÉÔÉ×ÎÏÊ ÆÕÎËÃÉÅÊ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÏÐÒÅÄÅÌÅÎÁ"
 
-msgid ""
-"%s is not currently a generic:  define it first to create a non-default "
-"implicit form"
-msgstr ""
-"%s × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ: ÏÐÒÅÄÅÌÉÔÅ ÅÅ ÐÅÒ×ÏÊ, ÞÔÏÂÙ "
-"ÓÏÚÄÁÔØ ÎÅ ÕÍÁÌÞÉ×ÁÅÍÕÀ ÐÏÄÒÁÚÕÍÅ×ÁÅÍÕÀ ÆÏÒÍÕ"
+msgid "%s is not currently a generic:  define it first to create a non-default implicit form"
+msgstr "%s × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ: ÏÐÒÅÄÅÌÉÔÅ ÅÅ ÐÅÒ×ÏÊ, ÞÔÏÂÙ ÓÏÚÄÁÔØ ÎÅ ÕÍÁÌÞÉ×ÁÅÍÕÀ ÐÏÄÒÁÚÕÍÅ×ÁÅÍÕÀ ÆÏÒÍÕ"
 
 msgid "must provide an environment table; got class %s"
 msgstr "ÎÕÖÎÏ ÕËÁÚÁÔØ ÔÁÂÌÉÃÕ ÏËÒÕÖÅÎÉÑ; ÐÏÌÕÞÅÎ ËÌÁÓÓ %s"
@@ -360,21 +266,14 @@
 msgid "generic names differ: %s, %s"
 msgstr "ÏÂÝÉÅ ÉÍÅÎÁ ÒÁÚÌÉÞÁÀÔÓÑ: %s, %s"
 
-msgid ""
-"argument %s must be a generic function or a single character string; got an "
-"object of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ ÏÄÎÏÊ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "argument %s must be a generic function or a single character string; got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ ÏÄÎÏÊ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "non-generic function '%s' given to findMethods()"
 msgstr "ÎÅ ÏÂÝÁÑ ÆÕÎËÃÉÑ '%s' ÏÔÄÁÎÁ findMethods()"
 
-msgid ""
-"only FALSE is meaningful for 'inherited', when 'where' is supplied (got %s)"
-msgstr ""
-"ÔÏÌØËÏ FALSE ÉÍÅÅÔ ÚÎÁÞÅÎÉÅ ÄÌÑ 'inherited', ËÏÇÄÁ ÕËÁÚÁÎÏ 'where' (ÐÏÌÕÞÅÎ "
-"%s)"
+msgid "only FALSE is meaningful for 'inherited', when 'where' is supplied (got %s)"
+msgstr "ÔÏÌØËÏ FALSE ÉÍÅÅÔ ÚÎÁÞÅÎÉÅ ÄÌÑ 'inherited', ËÏÇÄÁ ÕËÁÚÁÎÏ 'where' (ÐÏÌÕÞÅÎ %s)"
 
 msgid "argument 'f' must be a generic function or %s"
 msgstr "ÁÒÇÕÍÅÎÔ 'f' ÄÏÌÖÅÎ ÂÙÔØ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ %s"
@@ -382,29 +281,20 @@
 msgid "'%s' is not a known generic function {and 'package' not specified}"
 msgstr "'%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÉÚ×ÅÓÔÎÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ {É 'package' ÎÅ ÕËÁÚÁÎ}"
 
-msgid ""
-"invalid first argument: should be the name of the first argument in the "
-"dispatch"
+msgid "invalid first argument: should be the name of the first argument in the dispatch"
 msgstr "ÎÅ×ÅÒÎÙÊ ÐÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ: ÄÏÌÖÎÏ ÂÙÔØ ÉÍÑ ÐÅÒ×ÏÇÏ ÁÒÇÕÍÅÎÔÁ × ÏÔÐÒÁ×ËÅ"
 
 msgid "duplicate element names in 'MethodsList' at level %d: %s"
 msgstr "ÐÏ×ÔÏÒÑÀÝÉÅÓÑ ÉÍÅÎÁ ÜÌÅÍÅÎÔÏ× × 'MethodsList' ÎÁ ÕÒÏ×ÎÅ %d: %s"
 
-msgid ""
-"element %d at level %d (class %s) cannot be interpreted as a function or "
-"named list"
-msgstr ""
-"ÜÌÅÍÅÎÔ %d ÎÁ ÕÒÏ×ÎÅ %d (ËÌÁÓÓ %s) ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÎÔÅÒÐÒÅÔÉÒÏ×ÁÎ ËÁË ÆÕÎËÃÉÑ "
-"ÉÌÉ ÉÍÅÎÏ×ÁÎÎÙÊ ÓÐÉÓÏË"
+msgid "element %d at level %d (class %s) cannot be interpreted as a function or named list"
+msgstr "ÜÌÅÍÅÎÔ %d ÎÁ ÕÒÏ×ÎÅ %d (ËÌÁÓÓ %s) ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÎÔÅÒÐÒÅÔÉÒÏ×ÁÎ ËÁË ÆÕÎËÃÉÑ ÉÌÉ ÉÍÅÎÏ×ÁÎÎÙÊ ÓÐÉÓÏË"
 
 msgid "arguments 'names' and 'signature' must have the same length"
 msgstr "ÁÒÇÕÍÅÎÔÙ 'ÉÍÅÎÁ' É 'ÉÄÅÎÔÉÆÉËÁÔÏÒ' ÄÏÌÖÎÙ ÂÙÔØ ÏÄÉÎÁËÏ×ÏÊ ÄÌÉÎÙ"
 
-msgid ""
-"inserting method with invalid signature matching argument '...' to class %s"
-msgstr ""
-"×ÓÔÁ×ËÁ ÍÅÔÏÄÁ Ó ÎÅ×ÅÒÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ, ÓÏ×ÐÁÄÁÀÝÉÍ Ó ÁÒÇÕÍÅÎÔÏÍ '...' × "
-"ËÌÁÓÓ %s"
+msgid "inserting method with invalid signature matching argument '...' to class %s"
+msgstr "×ÓÔÁ×ËÁ ÍÅÔÏÄÁ Ó ÎÅ×ÅÒÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ, ÓÏ×ÐÁÄÁÀÝÉÍ Ó ÁÒÇÕÍÅÎÔÏÍ '...' × ËÌÁÓÓ %s"
 
 msgid "inserting method corresponding to empty signature"
 msgstr "×ÓÔÁ×ÌÑÀ ÍÅÔÏÄ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÐÕÓÔÏÍÕ ÉÄÅÎÔÉÆÉËÁÔÏÒÕ"
@@ -415,65 +305,32 @@
 msgid "invalid method sublist"
 msgstr "ÎÅ×ÅÒÎÙÊ ÐÏÄÓÐÉÓÏË ÍÅÔÏÄÏ×"
 
-msgid ""
-"%f is not a valid generic function: methods list was an object of class %s"
-msgstr ""
-"%f ÎÅ Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ: ÓÐÉÓÏË ÍÅÔÏÄÏ× ÂÙÌ ÏÂßÅËÔÏÍ ËÌÁÓÓÁ "
-"%s"
+msgid "%f is not a valid generic function: methods list was an object of class %s"
+msgstr "%f ÎÅ Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ: ÓÐÉÓÏË ÍÅÔÏÄÏ× ÂÙÌ ÏÂßÅËÔÏÍ ËÌÁÓÓÁ %s"
 
-msgid ""
-"%s must be TRUE, FALSE, or a named logical vector of those values; got an "
-"object of class %s"
-msgstr ""
-"%s ÄÏÌÖÅÎ ÂÙÔØ TRUE, FALSE, ÉÌÉ ÉÍÅÎÏ×ÁÎÎÙÍ ÌÏÇÉÞÅÓËÉÍ ×ÅËÔÏÒÏÍ ÜÔÉÈ "
-"ÚÎÁÞÅÎÉÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "%s must be TRUE, FALSE, or a named logical vector of those values; got an object of class %s"
+msgstr "%s ÄÏÌÖÅÎ ÂÙÔØ TRUE, FALSE, ÉÌÉ ÉÍÅÎÏ×ÁÎÎÙÍ ÌÏÇÉÞÅÓËÉÍ ×ÅËÔÏÒÏÍ ÜÔÉÈ ÚÎÁÞÅÎÉÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"default method must be a method definition, a primitive or NULL: got an "
-"object of class %s"
-msgstr ""
-"ÍÅÔÏÄ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÉÅÍ ÍÅÔÏÄÁ, ÐÒÉÍÉÔÉ×ÏÍ ÉÌÉ NULL: "
-"ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "default method must be a method definition, a primitive or NULL: got an object of class %s"
+msgstr "ÍÅÔÏÄ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÉÅÍ ÍÅÔÏÄÁ, ÐÒÉÍÉÔÉ×ÏÍ ÉÌÉ NULL: ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"trying to match a method signature to an object (of class %s) that is not a "
-"generic function"
-msgstr ""
-"ÐÏÐÙÔËÁ ÓÏÐÏÓÔÁ×ÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÍÅÔÏÄÁ Ó ÏÂßÅËÔÏÍ (ËÌÁÓÓÁ %s), ËÏÔÏÒÙÊ ÎÅ "
-"Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ"
+msgid "trying to match a method signature to an object (of class %s) that is not a generic function"
+msgstr "ÐÏÐÙÔËÁ ÓÏÐÏÓÔÁ×ÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÍÅÔÏÄÁ Ó ÏÂßÅËÔÏÍ (ËÌÁÓÓÁ %s), ËÏÔÏÒÙÊ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ"
 
 msgid "invalid 'package' slot or attribute, wrong length"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÚÉÃÉÑ ÓÌÏÔÁ ÉÌÉ ÁÔÒÉÂÕÔÁ, ÎÅÐÒÁ×ÉÌØÎÁÑ ÄÌÉÎÁ"
 
-msgid ""
-"invalid element in a list for \"signature\" argument; element %d is neither "
-"a class definition nor a class name"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ ÜÌÅÍÅÎÔ × ÓÐÉÓËÅ ÁÒÇÕÍÅÎÔÏ× \"signature\"; ÜÌÅÍÅÎÔ %d -- ÎÅ "
-"ÏÐÒÅÄÅÌÅÎÉÅ É ÎÅ ÉÍÑ ËÌÁÓÓÁ"
+msgid "invalid element in a list for \"signature\" argument; element %d is neither a class definition nor a class name"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÜÌÅÍÅÎÔ × ÓÐÉÓËÅ ÁÒÇÕÍÅÎÔÏ× \"signature\"; ÜÌÅÍÅÎÔ %d -- ÎÅ ÏÐÒÅÄÅÌÅÎÉÅ É ÎÅ ÉÍÑ ËÌÁÓÓÁ"
 
-msgid ""
-"trying to match a method signature of class %s; expects a list or a "
-"character vector"
-msgstr ""
-"ÐÏÐÙÔËÁ ÐÏÄÏÂÒÁÔØ ÍÅÔÏÄ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ËÌÁÓÓÁ %s; ÏÖÉÄÁÅÔÓÑ ÓÐÉÓÏË ÉÌÉ "
-"ÓÉÍ×ÏÌØÎÙÊ ×ÅËÔÏÒ"
+msgid "trying to match a method signature of class %s; expects a list or a character vector"
+msgstr "ÐÏÐÙÔËÁ ÐÏÄÏÂÒÁÔØ ÍÅÔÏÄ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ËÌÁÓÓÁ %s; ÏÖÉÄÁÅÔÓÑ ÓÐÉÓÏË ÉÌÉ ÓÉÍ×ÏÌØÎÙÊ ×ÅËÔÏÒ"
 
-msgid ""
-"object to use as a method signature for function %s does not look like a "
-"legitimate signature (a vector of single class names): there were %d class "
-"names, but %d elements in the signature object"
-msgstr ""
-"ÏÂßÅËÔ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ËÁÞÅÓÔ×Å ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ "
-"×ÙÇÌÑÄÉÔ ÐÒÁ×ÉÌØÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ (×ÅËÔÏÒÏÍ ÏÄÉÎÏÞÎÏÇÏ ËÌÁÓÓÁ ÉÍÅÎ): ÔÁÍ "
-"ÂÙÌÏ %d ËÌÁÓÓÏ× ÉÍÅÎ, ÎÏ %d ÜÌÅÍÅÎÔÏ× × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ"
+msgid "object to use as a method signature for function %s does not look like a legitimate signature (a vector of single class names): there were %d class names, but %d elements in the signature object"
+msgstr "ÏÂßÅËÔ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ËÁÞÅÓÔ×Å ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ ×ÙÇÌÑÄÉÔ ÐÒÁ×ÉÌØÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ (×ÅËÔÏÒÏÍ ÏÄÉÎÏÞÎÏÇÏ ËÌÁÓÓÁ ÉÍÅÎ): ÔÁÍ ÂÙÌÏ %d ËÌÁÓÓÏ× ÉÍÅÎ, ÎÏ %d ÜÌÅÍÅÎÔÏ× × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ"
 
-msgid ""
-"more elements in the method signature (%d) than in the generic signature "
-"(%d) for function %s"
-msgstr ""
-"× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ (%d) ÂÏÌØÛÅ ÜÌÅÍÅÎÔÏ×, ÞÅÍ × ÏÂÝÅÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÅ "
-"(%d) ÆÕÎËÃÉÉ %s"
+msgid "more elements in the method signature (%d) than in the generic signature (%d) for function %s"
+msgstr "× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ (%d) ÂÏÌØÛÅ ÜÌÅÍÅÎÔÏ×, ÞÅÍ × ÏÂÝÅÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÅ (%d) ÆÕÎËÃÉÉ %s"
 
 msgid "no generic function found corresponding to %s"
 msgstr "ÎÅÔ ÏÂÝÅÊ ÆÕÎËÃÉÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ %s"
@@ -481,45 +338,29 @@
 msgid "skipping methods list element %s of unexpected class %s"
 msgstr "ÐÒÏÐÕÓËÁÀ ÜÌÅÍÅÎÔ ÓÐÉÓËÁ ÍÅÔÏÄÏ× %s ÎÅÏÖÉÄÁÎÎÏÇÏ ËÌÁÓÓÁ %s"
 
-msgid ""
-"%s, along with other use of the \"MethodsList\" metadata objects, is "
-"deprecated."
-msgstr ""
-"%s, ÔÁËÖÅ ËÁË É ÉÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂßÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\", ÎÅ "
-"ÒÅËÏÍÅÎÄÕÅÔÓÑ."
+msgid "%s, along with other use of the \"MethodsList\" metadata objects, is deprecated."
+msgstr "%s, ÔÁËÖÅ ËÁË É ÉÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂßÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\", ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ."
 
 msgid "in %s: use of \"MethodsList\" metadata objects is deprecated."
-msgstr ""
-"× %s: ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\" ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ."
+msgstr "× %s: ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\" ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ."
 
 msgid "use %s instead."
 msgstr "×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ %s."
 
-#, fuzzy
-msgid ""
-"%s, along with other use of the \"MethodsList\" metadata objects, is defunct."
-msgstr ""
-"%s, ÔÁËÖÅ ËÁË É ÉÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂßÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\", ÎÅ "
-"ÒÅËÏÍÅÎÄÕÅÔÓÑ."
+msgid "%s, along with other use of the \"MethodsList\" metadata objects, is defunct."
+msgstr "%s, ÔÁËÖÅ ËÁË É ÉÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂßÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\", ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÅÔ."
 
-#, fuzzy
 msgid "in %s: use of \"MethodsList\" metadata objects is defunct."
-msgstr ""
-"× %s: ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\" ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ."
+msgstr "× %s: ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÂÅËÔÏ× ÍÅÔÁÄÁÎÎÙÈ \"MethodsList\" ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÅÔ."
 
 msgid "invalid object for formal method definition: type %s"
 msgstr "ÎÅ×ÅÒÎÙÊ ÏÂßÅËÔ ÄÌÑ ÆÏÒÍÁÌØÎÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ ÍÅÔÏÄÁ: ÔÉÐ %s"
 
 msgid "missing package slot (%s) in object of class %s (package info added)"
-msgstr ""
-"ÏÔÓÕÔÓÔ×ÕÅÔ ÐÏÚÉÃÉÑ ÐÁËÅÔÁ (%s) × ÏÂßÅËÔÅ ËÌÁÓÓÁ %s (ÄÏÂÁ×ÌÅÎÁ ÉÎÆÏÒÍÁÃÉÑ Ï "
-"ÐÁËÅÔÅ)"
+msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÐÏÚÉÃÉÑ ÐÁËÅÔÁ (%s) × ÏÂßÅËÔÅ ËÌÁÓÓÁ %s (ÄÏÂÁ×ÌÅÎÁ ÉÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÅ)"
 
-msgid ""
-"'initialize' method returned an object of class %s instead of the required "
-"class %s"
-msgstr ""
-"ÍÅÔÏÄ 'initialize' ×ÏÚ×ÒÁÔÉÌ ÏÂßÅËÔ ËÌÁÓÓÁ %s ×ÍÅÓÔÏ ÔÒÅÂÕÅÍÏÇÏ ËÌÁÓÓÁ %s"
+msgid "'initialize' method returned an object of class %s instead of the required class %s"
+msgstr "ÍÅÔÏÄ 'initialize' ×ÏÚ×ÒÁÔÉÌ ÏÂßÅËÔ ËÌÁÓÓÁ %s ×ÍÅÓÔÏ ÔÒÅÂÕÅÍÏÇÏ ËÌÁÓÓÁ %s"
 
 msgid "%d: target \"%s\": chose \"%s\" (others: %s)"
 msgstr "%d: ÃÅÌØ \"%s\": ×ÙÂÒÁÎÏ \"%s\" (ÄÒÕÇÉÅ: %s)"
@@ -531,29 +372,16 @@
 msgstr "ÓÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÐÒÏÉÚ×ÏÄÑÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ ËÌÁÓÓÁ %s ÉÚ ÐÁËÅÔÁ %s"
 
 msgid "the names in signature for method (%s) do not match %s's arguments (%s)"
-msgstr ""
-"ÉÍÅÎÁ × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÄÌÑ ÍÅÔÏÄÁ (%s) ÎÅ ÓÏ×ÐÁÄÁÀÔ Ó %s ÁÒÇÕÍÅÎÔÁÍÉ ÆÕÎËÃÉÉ "
-"(%s)"
+msgstr "ÉÍÅÎÁ × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÄÌÑ ÍÅÔÏÄÁ (%s) ÎÅ ÓÏ×ÐÁÄÁÀÔ Ó %s ÁÒÇÕÍÅÎÔÁÍÉ ÆÕÎËÃÉÉ (%s)"
 
-msgid ""
-"the names in signature for method (%s) do not match function's arguments (%s)"
-msgstr ""
-"ÉÍÅÎÁ × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÄÌÑ ÍÅÔÏÄÁ (%s) ÎÅ ÓÏ×ÐÁÄÁÀÔ Ó ÁÒÇÕÍÅÎÔÁÍÉ ÆÕÎËÃÉÉ "
-"(%s)"
+msgid "the names in signature for method (%s) do not match function's arguments (%s)"
+msgstr "ÉÍÅÎÁ × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÄÌÑ ÍÅÔÏÄÁ (%s) ÎÅ ÓÏ×ÐÁÄÁÀÔ Ó ÁÒÇÕÍÅÎÔÁÍÉ ÆÕÎËÃÉÉ (%s)"
 
-msgid ""
-"a call to callNextMethod() appears in a call to %s, but the call does not "
-"seem to come from either a generic function or another 'callNextMethod'"
-msgstr ""
-"ÐÒÉ ÏÂÒÁÝÅÎÉÉ Ë %s, ÐÏÈÏÖÅ ÂÙÌ ×ÙÚ×ÁÎ callNextMethod(), ÎÏ ÄÁÎÎÙÊ ×ÙÚÏ× ÎÅ "
-"ÂÙÌ, ÐÏÈÏÖÅ, ÐÒÏÉÚ×ÅÄÅÎ ÄÒÕÇÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ ÄÒÕÇÉÍ 'callNextMethod'"
+msgid "a call to callNextMethod() appears in a call to %s, but the call does not seem to come from either a generic function or another 'callNextMethod'"
+msgstr "ÐÒÉ ÏÂÒÁÝÅÎÉÉ Ë %s, ÐÏÈÏÖÅ ÂÙÌ ×ÙÚ×ÁÎ callNextMethod(), ÎÏ ÄÁÎÎÙÊ ×ÙÚÏ× ÎÅ ÂÙÌ, ÐÏÈÏÖÅ, ÐÒÏÉÚ×ÅÄÅÎ ÄÒÕÇÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ ÄÒÕÇÉÍ 'callNextMethod'"
 
-msgid ""
-"call to 'callNextMethod' does not appear to be in a 'method' or "
-"'callNextMethod' context"
-msgstr ""
-"×ÙÚÏ× 'callNextMethod' ÐÏÈÏÖÅ, ÎÅ ×ÈÏÄÉÔ × ËÏÎÔÅËÓÔ 'method' ÌÉÂÏ "
-"'callNextMethod'"
+msgid "call to 'callNextMethod' does not appear to be in a 'method' or 'callNextMethod' context"
+msgstr "×ÙÚÏ× 'callNextMethod' ÐÏÈÏÖÅ, ÎÅ ×ÈÏÄÉÔ × ËÏÎÔÅËÓÔ 'method' ÌÉÂÏ 'callNextMethod'"
 
 msgid "bad object found as method (class %s)"
 msgstr "ÐÌÏÈÏÊ ÏÂßÅËÔ ÎÁÊÄÅÎ × ËÁÞÅÓÔ×Å ÍÅÔÏÄÁ (ËÌÁÓÓ %s)"
@@ -561,32 +389,17 @@
 msgid "No next method available"
 msgstr "îÅÔ ÄÏÓÔÕÐÎÏÇÏ ÓÌÅÄÕÀÝÅÇÏ ÍÅÔÏÄÁ"
 
-msgid ""
-"in constructing the prototype for class %s: prototype has class %s, but the "
-"data part specifies class %s"
-msgstr ""
-"ÐÒÉ ËÏÎÓÔÒÕÉÒÏ×ÁÎÉÉ ÐÒÏÔÏÔÉÐÁ ÄÌÑ ËÌÁÓÓÁ %s: ÐÒÏÔÏÔÉÐ Ñ×ÌÑÅÔÓÑ ËÌÁÓÓÏÍ %s, "
-"ÎÏ ÅÇÏ ÄÁÎÎÙÅ ÕËÁÚÙ×ÁÀÔ ÎÁ ËÌÁÓÓ %s"
+msgid "in constructing the prototype for class %s: prototype has class %s, but the data part specifies class %s"
+msgstr "ÐÒÉ ËÏÎÓÔÒÕÉÒÏ×ÁÎÉÉ ÐÒÏÔÏÔÉÐÁ ÄÌÑ ËÌÁÓÓÁ %s: ÐÒÏÔÏÔÉÐ Ñ×ÌÑÅÔÓÑ ËÌÁÓÓÏÍ %s, ÎÏ ÅÇÏ ÄÁÎÎÙÅ ÕËÁÚÙ×ÁÀÔ ÎÁ ËÌÁÓÓ %s"
 
-msgid ""
-"in constructing the prototype for class %s, slots in prototype and not in "
-"class: %s"
-msgstr ""
-"ÐÒÉ ËÏÎÓÔÒÕÉÒÏ×ÁÎÉÉ ÐÒÏÔÏÔÉÐÁ ËÌÁÓÓÁ %s, ÓÌÏÔÙ × ÐÒÏÔÏÔÉÐÅ É ÎÅ × ËÌÁÓÓÅ: %s"
+msgid "in constructing the prototype for class %s, slots in prototype and not in class: %s"
+msgstr "ÐÒÉ ËÏÎÓÔÒÕÉÒÏ×ÁÎÉÉ ÐÒÏÔÏÔÉÐÁ ËÌÁÓÓÁ %s, ÓÌÏÔÙ × ÐÒÏÔÏÔÉÐÅ É ÎÅ × ËÌÁÓÓÅ: %s"
 
-msgid ""
-"in making the prototype for class %s elements of the prototype failed to "
-"match the corresponding slot class: %s"
-msgstr ""
-"ÐÒÉ ÓÏÚÄÁÎÉÉ ÐÒÏÔÏÔÉÐÁ ÄÌÑ ËÌÁÓÓÁ %s ÜÌÅÍÅÎÔÙ ÐÒÏÔÏÔÉÐÁ ÎÅ ÓÏ×ÐÁÄÁÀÔ Ó "
-"ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÓÌÏÔÏÍ ËÌÁÓÓÁ: %s"
+msgid "in making the prototype for class %s elements of the prototype failed to match the corresponding slot class: %s"
+msgstr "ÐÒÉ ÓÏÚÄÁÎÉÉ ÐÒÏÔÏÔÉÐÁ ÄÌÑ ËÌÁÓÓÁ %s ÜÌÅÍÅÎÔÙ ÐÒÏÔÏÔÉÐÁ ÎÅ ÓÏ×ÐÁÄÁÀÔ Ó ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÓÌÏÔÏÍ ËÌÁÓÓÁ: %s"
 
-msgid ""
-"potential cycle in class inheritance: %s has duplicates in superclasses and "
-"subclasses (%s)"
-msgstr ""
-"×ÏÚÍÏÖÎÙÊ ÃÉËÌ × ÎÁÓÌÅÄÏ×ÁÎÉÉ ËÌÁÓÓÁ: %s ÉÍÅÅÔ ÐÏ×ÔÏÒÙ × ÓÕÐÅÒËÌÁÓÓÁÈ É "
-"ÐÏÄËÌÁÓÓÁÈ (%s)"
+msgid "potential cycle in class inheritance: %s has duplicates in superclasses and subclasses (%s)"
+msgstr "×ÏÚÍÏÖÎÙÊ ÃÉËÌ × ÎÁÓÌÅÄÏ×ÁÎÉÉ ËÌÁÓÓÁ: %s ÉÍÅÅÔ ÐÏ×ÔÏÒÙ × ÓÕÐÅÒËÌÁÓÓÁÈ É ÐÏÄËÌÁÓÓÁÈ (%s)"
 
 msgid "undefined slot classes in definition of %s: %s"
 msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÅ ÓÌÏÔÏ×ÙÅ ËÌÁÓÓÙ × ÏÐÒÅÄÅÌÅÎÉÉ %s: %s"
@@ -594,12 +407,8 @@
 msgid "(class %s)"
 msgstr "(ËÌÁÓÓ %s)"
 
-msgid ""
-"in definition of class %s, information for superclass %s is of class %s "
-"(expected \"SClassExtension\")"
-msgstr ""
-"× ÏÐÒÅÄÅÌÅÎÉÉ ËÌÁÓÓÁ %s, ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ ÓÕÐÅÒËÌÁÓÓÁ %s ÐÒÉÎÁÄÌÅÖÉÔ ËÌÁÓÓÕ %s "
-"(ÏÖÉÄÁÌÏÓØ \"SClassExtension\")"
+msgid "in definition of class %s, information for superclass %s is of class %s (expected \"SClassExtension\")"
+msgstr "× ÏÐÒÅÄÅÌÅÎÉÉ ËÌÁÓÓÁ %s, ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ ÓÕÐÅÒËÌÁÓÓÁ %s ÐÒÉÎÁÄÌÅÖÉÔ ËÌÁÓÓÕ %s (ÏÖÉÄÁÌÏÓØ \"SClassExtension\")"
 
 msgid "class %s extends an undefined class, %s"
 msgstr "ËÌÁÓÓ %s ÒÁÓÛÉÒÑÅÔ ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ËÌÁÓÓ, %s"
@@ -607,12 +416,8 @@
 msgid "'Class' must be a valid class definition or class"
 msgstr "'Class' ÄÏÌÖÅÎ ÂÙÔØ ÐÒÁ×ÉÌØÎÙÍ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ ÌÉÂÏ ËÌÁÓÓÏÍ"
 
-msgid ""
-"trying to assign an object of class %s as the definition of class %s: must "
-"supply a \"classRepresentation\" object"
-msgstr ""
-"ÐÏÐÙÔËÁ ÎÁÚÎÁÞÉÔØ ÏÂßÅËÔ ËÌÁÓÓÁ %s ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ %s: ÎÅÏÂÈÏÄÉÍÏ "
-"ÐÒÅÄÏÓÔÁ×ÉÔØ ÏÂßÅËÔ \"classRepresentation\""
+msgid "trying to assign an object of class %s as the definition of class %s: must supply a \"classRepresentation\" object"
+msgstr "ÐÏÐÙÔËÁ ÎÁÚÎÁÞÉÔØ ÏÂßÅËÔ ËÌÁÓÓÁ %s ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ %s: ÎÅÏÂÈÏÄÉÍÏ ÐÒÅÄÏÓÔÁ×ÉÔØ ÏÂßÅËÔ \"classRepresentation\""
 
 msgid "assigning as %s a class representation with internal name %s"
 msgstr "ÎÁÚÎÁÞÁÀ ËÁË %s ÐÒÅÄÓÔÁ×ÌÅÎÉÅ ËÌÁÓÓÁ Ó ×ÎÕÔÒÅÎÎÉÍ ÉÍÅÎÅÍ %s"
@@ -623,88 +428,47 @@
 msgid "'externalptr' objects cannot be initialized from new()"
 msgstr "'externalptr' ÏÂßÅËÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÙ ÉÚ new()"
 
-msgid ""
-"initializing objects from class %s with these arguments is not supported"
-msgstr ""
-"ÉÎÉÃÉÁÌÉÚÁÃÉÑ ÏÂßÅËÔÏ× ÉÚ ËÌÁÓÓÁ %s Ó ÔÁËÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+msgid "initializing objects from class %s with these arguments is not supported"
+msgstr "ÉÎÉÃÉÁÌÉÚÁÃÉÑ ÏÂßÅËÔÏ× ÉÚ ËÌÁÓÓÁ %s Ó ÔÁËÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-msgid ""
-"in defining class %s, the supplied data part class, %s is not valid (must be "
-"a basic class or a virtual class combining basic classes)"
-msgstr ""
-"ÐÒÉ ÏÐÒÅÄÅÌÅÎÉÉ ËÌÁÓÓÁ %s, ÐÒÅÄÏÓÔÁ×ÌÅÎÎÁÑ ÞÁÓÔØ ÄÁÎÎÙÈ ËÌÁÓÓÁ, %s ÎÅ ×ÅÒÎÁ "
-"(ÄÏÌÖÎÁ ÂÙÔØ ÏÓÎÏ×ÎÙÍ ËÌÁÓÓÏÍ ÉÌÉ ×ÉÒÔÕÁÌØÎÙÍ ËÌÁÓÓÏÍ, ×ËÌÀÞÁÀÝÅÍ ÏÓÎÏ×ÎÙÅ "
-"ËÌÁÓÓÙ)"
+msgid "in defining class %s, the supplied data part class, %s is not valid (must be a basic class or a virtual class combining basic classes)"
+msgstr "ÐÒÉ ÏÐÒÅÄÅÌÅÎÉÉ ËÌÁÓÓÁ %s, ÐÒÅÄÏÓÔÁ×ÌÅÎÎÁÑ ÞÁÓÔØ ÄÁÎÎÙÈ ËÌÁÓÓÁ, %s ÎÅ ×ÅÒÎÁ (ÄÏÌÖÎÁ ÂÙÔØ ÏÓÎÏ×ÎÙÍ ËÌÁÓÓÏÍ ÉÌÉ ×ÉÒÔÕÁÌØÎÙÍ ËÌÁÓÓÏÍ, ×ËÌÀÞÁÀÝÅÍ ÏÓÎÏ×ÎÙÅ ËÌÁÓÓÙ)"
 
-msgid ""
-"no definition was found for superclass %s in the specification of class %s"
+msgid "no definition was found for superclass %s in the specification of class %s"
 msgstr "× ÓÐÅÃÉÆÉËÁÃÉÉ ËÌÁÓÓÁ %s ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ ÓÕÐÅÒËÌÁÓÓÁ %s"
 
 msgid "conflicting definition of data part: .Data = %s, superclass implies %s"
-msgstr ""
-"ËÏÎÆÌÉËÔÕÀÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ ÞÁÓÔÉ ÄÁÎÎÙÈ: .Data = %s, ÓÕÐÅÒËÌÁÓÓ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ "
-"%s"
+msgstr "ËÏÎÆÌÉËÔÕÀÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ ÞÁÓÔÉ ÄÁÎÎÙÈ: .Data = %s, ÓÕÐÅÒËÌÁÓÓ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ %s"
 
-msgid ""
-"a prototype object was supplied with object slot of class %s, but the class "
-"definition requires an object that is class %s"
-msgstr ""
-"ÐÒÏÔÏÔÉÐ ÂÙÌ ÐÒÅÄÏÓÔÁ×ÌÅÎ ×ÍÅÓÔÅ Ó ÏÂßÅËÔÎÙÍ ÓÌÏÔÏÍ ËÌÁÓÓÁ %s, ÎÏ "
-"ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÔÒÅÂÕÅÔ ÏÂßÅËÔ, Ñ×ÌÑÀÝÉÊÓÑ ËÌÁÓÓÏÍ %s"
+msgid "a prototype object was supplied with object slot of class %s, but the class definition requires an object that is class %s"
+msgstr "ÐÒÏÔÏÔÉÐ ÂÙÌ ÐÒÅÄÏÓÔÁ×ÌÅÎ ×ÍÅÓÔÅ Ó ÏÂßÅËÔÎÙÍ ÓÌÏÔÏÍ ËÌÁÓÓÁ %s, ÎÏ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÔÒÅÂÕÅÔ ÏÂßÅËÔ, Ñ×ÌÑÀÝÉÊÓÑ ËÌÁÓÓÏÍ %s"
 
-msgid ""
-"a prototype was supplied of class %s, but the class definition requires an "
-"object that is class %s"
-msgstr ""
-"ÐÒÏÔÏÔÉÐ ÂÙÌ ÐÒÅÄÏÓÔÁ×ÌÅÎ ËÌÁÓÓÏÍ %s, ÎÏ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÔÒÅÂÕÅÔ ÏÂßÅËÔ, "
-"Ñ×ÌÑÀÝÉÊÓÑ ËÌÁÓÓÏÍ %s"
+msgid "a prototype was supplied of class %s, but the class definition requires an object that is class %s"
+msgstr "ÐÒÏÔÏÔÉÐ ÂÙÌ ÐÒÅÄÏÓÔÁ×ÌÅÎ ËÌÁÓÓÏÍ %s, ÎÏ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÔÒÅÂÕÅÔ ÏÂßÅËÔ, Ñ×ÌÑÀÝÉÊÓÑ ËÌÁÓÓÏÍ %s"
 
-msgid ""
-"slot %s in class %s currently defined (or inherited) as \"%s\", conflicts "
-"with an inherited definition in class %s"
-msgstr ""
-"ÓÌÏÔ %s × ËÌÁÓÓÅ %s × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÏÐÒÅÄÅÌÅÎ (ÉÌÉ ÎÁÓÌÅÄÏ×ÁÎ) ËÁË \"%s\", "
-"ËÏÎÆÌÉËÔÕÑ Ó ÎÁÓÌÅÄÏ×ÁÎÎÙÍ ÏÐÒÅÄÅÌÅÎÉÅÍ × ËÌÁÓÓÅ %s"
+msgid "slot %s in class %s currently defined (or inherited) as \"%s\", conflicts with an inherited definition in class %s"
+msgstr "ÓÌÏÔ %s × ËÌÁÓÓÅ %s × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÏÐÒÅÄÅÌÅÎ (ÉÌÉ ÎÁÓÌÅÄÏ×ÁÎ) ËÁË \"%s\", ËÏÎÆÌÉËÔÕÑ Ó ÎÁÓÌÅÄÏ×ÁÎÎÙÍ ÏÐÒÅÄÅÌÅÎÉÅÍ × ËÌÁÓÓÅ %s"
 
 msgid "class %s extends an undefined class (%s)"
 msgstr "ËÌÁÓÓ %s ÒÁÓÛÉÒÑÅÔ ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ËÌÁÓÓ (%s)"
 
-msgid ""
-"%s is not eligible to be the data part of another class (must be a basic "
-"class or a virtual class with no slots)"
-msgstr ""
-"%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÎÁÚÎÁÞÅÎ ÞÁÓÔØÀ ÄÁÎÎÙÈ ÄÒÕÇÏÇÏ ËÌÁÓÓÁ (ÄÏÌÖÅÎ ÂÙÔØ ÏÓÎÏ×ÎÙÍ "
-"ËÌÁÓÓÏÍ ÌÉÂÏ ×ÉÒÔÕÁÌØÎÙÍ ËÌÁÓÓÏÍ ÂÅÚ ÓÌÏÔÏ×)"
+msgid "%s is not eligible to be the data part of another class (must be a basic class or a virtual class with no slots)"
+msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÎÁÚÎÁÞÅÎ ÞÁÓÔØÀ ÄÁÎÎÙÈ ÄÒÕÇÏÇÏ ËÌÁÓÓÁ (ÄÏÌÖÅÎ ÂÙÔØ ÏÓÎÏ×ÎÙÍ ËÌÁÓÓÏÍ ÌÉÂÏ ×ÉÒÔÕÁÌØÎÙÍ ËÌÁÓÓÏÍ ÂÅÚ ÓÌÏÔÏ×)"
 
-msgid ""
-"prototype is a list with named elements (could be ambiguous):  better to use "
-"function prototype() to avoid trouble."
-msgstr ""
-"ÐÒÏÔÏÔÉÐ Ñ×ÌÑÅÔÓÑ ÓÐÉÓËÏÍ Ó ÉÍÅÎÏ×ÁÎÎÙÍÉ ÜÌÅÍÅÎÔÁÍÉ (ÍÏÖÅÔ ×ÙÚ×ÁÔØ "
-"ÎÅÏÄÎÏÚÎÁÞÎÏÓÔØ):  ÌÕÞÛÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÕÎËÃÉÀ prototype() ÞÔÏÂÙ ÉÚÂÅÖÁÔØ "
-"ÎÅÐÒÉÑÔÎÏÓÔÉ."
+msgid "prototype is a list with named elements (could be ambiguous):  better to use function prototype() to avoid trouble."
+msgstr "ÐÒÏÔÏÔÉÐ Ñ×ÌÑÅÔÓÑ ÓÐÉÓËÏÍ Ó ÉÍÅÎÏ×ÁÎÎÙÍÉ ÜÌÅÍÅÎÔÁÍÉ (ÍÏÖÅÔ ×ÙÚ×ÁÔØ ÎÅÏÄÎÏÚÎÁÞÎÏÓÔØ):  ÌÕÞÛÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÕÎËÃÉÀ prototype() ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÎÅÐÒÉÑÔÎÏÓÔÉ."
 
 msgid "the '%s' list for class %s, includes an undefined class %s"
 msgstr "ÓÐÉÓÏË '%s' ÄÌÑ ËÌÁÓÓÁ %s, ×ËÌÀÞÁÅÔ ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ËÌÁÓÓ %s"
 
-msgid ""
-"class %s is inheriting an inconsistent superclass structure from class %s, "
-"inconsistent with %s"
-msgstr ""
-"ëÌÁÓÓ %s ÎÁÓÌÅÄÕÅÔ ÎÅÓÏ×ÍÅÓÔÉÍÕÀ ÓÔÒÕËÔÕÒÕ ÓÕÐÅÒËÌÁÓÓÁ ÉÚ ËÌÁÓÓÁ %s, "
-"ÎÅÓÏ×ÍÅÓÔÉÍÕÀ Ó %s"
+msgid "class %s is inheriting an inconsistent superclass structure from class %s, inconsistent with %s"
+msgstr "ëÌÁÓÓ %s ÎÁÓÌÅÄÕÅÔ ÎÅÓÏ×ÍÅÓÔÉÍÕÀ ÓÔÒÕËÔÕÒÕ ÓÕÐÅÒËÌÁÓÓÁ ÉÚ ËÌÁÓÓÁ %s, ÎÅÓÏ×ÍÅÓÔÉÍÕÀ Ó %s"
 
-msgid ""
-"unable to find a consistent ordering of superclasses for class %s: order "
-"chosen is inconsistent with the superclasses of %s"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÏ×ÍÅÓÔÉÍÏÇÏ ÐÏÒÑÄËÁ ÓÕÐÅÒËÌÁÓÓÏ× ÄÌÑ ËÌÁÓÓÁ %s: ×ÙÂÒÁÎÎÙÊ "
-"ÐÏÒÑÄÏË ÎÅÓÏ×ÍÅÓÔÉÍ Ó ÓÕÐÅÒËÌÁÓÓÁÍÉ %s"
+msgid "unable to find a consistent ordering of superclasses for class %s: order chosen is inconsistent with the superclasses of %s"
+msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÏ×ÍÅÓÔÉÍÏÇÏ ÐÏÒÑÄËÁ ÓÕÐÅÒËÌÁÓÓÏ× ÄÌÑ ËÌÁÓÓÁ %s: ×ÙÂÒÁÎÎÙÊ ÐÏÒÑÄÏË ÎÅÓÏ×ÍÅÓÔÉÍ Ó ÓÕÐÅÒËÌÁÓÓÁÍÉ %s"
 
 msgid "\"class\" is a reserved slot name and cannot be redefined"
-msgstr ""
-"\"class\" Ñ×ÌÑÅÔÓÑ ÚÁÒÅÚÅÒ×ÉÒÏ×ÁÎÎÙÍ ÎÁÚ×ÁÎÉÅÍ ÓÌÏÔÁ É ÎÅ ÍÏÖÅÔ ÂÙÔØ "
-"ÐÅÒÅÏÐÒÅÄÅÌÅÎÏ"
+msgstr "\"class\" Ñ×ÌÑÅÔÓÑ ÚÁÒÅÚÅÒ×ÉÒÏ×ÁÎÎÙÍ ÎÁÚ×ÁÎÉÅÍ ÓÌÏÔÁ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÏÐÒÅÄÅÌÅÎÏ"
 
 msgid "Data part is undefined for general S4 object"
 msgstr "õ ÏÂÝÅÇÏ S4 ÏÂßÅËÔÁ ÎÅ ÏÐÒÅÄÅÌÅÎÁ ËÏÍÐÏÎÅÎÔÁ ÄÁÎÎÙÈ"
@@ -721,12 +485,8 @@
 msgid "class cannot have both an ordinary and hidden data type"
 msgstr "Õ ËÌÁÓÓÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÏÂÙÞÎÏÇÏ É ÓËÒÙÔÏÇÏ ÔÉÐÁ ÄÁÎÎÙÈ"
 
-msgid ""
-"a validity method must be a function of one argument, got an object of class "
-"%s"
-msgstr ""
-"ÍÅÔÏÄ ÐÒÏ×ÅÒËÉ ÐÒÁ×ÉÌØÎÏÓÔÉ ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ ÏÄÎÏÇÏ ÁÒÇÕÍÅÎÔÁ, ÐÏÌÕÞÅÎ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "a validity method must be a function of one argument, got an object of class %s"
+msgstr "ÍÅÔÏÄ ÐÒÏ×ÅÒËÉ ÐÒÁ×ÉÌØÎÏÓÔÉ ÄÏÌÖÅÎ ÂÙÔØ ÆÕÎËÃÉÅÊ ÏÄÎÏÇÏ ÁÒÇÕÍÅÎÔÁ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "unable to find required package %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÒÅÂÕÅÍÙÊ ÐÁËÅÔ %s"
@@ -734,53 +494,26 @@
 msgid "unable to find an environment containing class %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏËÒÕÖÅÎÉÅ, ÓÏÄÅÒÖÁÝÅÅ ËÌÁÓÓ %s"
 
-msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-"úÁÍÅÞÁÎÉÅ: ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÁÓÓÁ S3 %s × ÐÁËÅÔÅ %s ÐÏÈÏÖÁ ÎÁ ÓÐÅÃÉÆÉËÁÃÉÀ ÉÚ "
-"ÐÁËÅÔÁ %s: ÎÅ ÐÒÅ×ÒÁÝÁÅÔÓÑ × ÄÕÂÌÉÒÏ×ÁÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ËÌÁÓÓÁ."
+msgid "Note: the specification for S3 class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class."
+msgstr "úÁÍÅÞÁÎÉÅ: ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÁÓÓÁ S3 %s × ÐÁËÅÔÅ %s ÐÏÈÏÖÁ ÎÁ ÓÐÅÃÉÆÉËÁÃÉÀ ÉÚ ÐÁËÅÔÁ %s: ÎÅ ÐÒÅ×ÒÁÝÁÅÔÓÑ × ÄÕÂÌÉÒÏ×ÁÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ËÌÁÓÓÁ."
 
-msgid ""
-"Note: some superclasses of class %s in package %s have duplicate "
-"definitions.  This definition is not being treated as equivalent to that "
-"from package %s"
-msgstr ""
-"úÁÍÅÞÁÎÉÅ: ÎÅËÏÔÏÒÙÅ ÓÕÐÅÒ-ËÌÁÓÓÙ ËÌÁÓÓÁ %s ÐÁËÅÔÁ %s ÉÍÅÀÔ Ä×ÏÊÎÙÅ "
-"ÏÐÒÅÄÅÌÅÎÉÑ. üÔÏ ÏÐÒÅÄÅÌÅÎÉÅ ÎÅ ÂÕÄÅÔ ÒÁÓÓÍÁÔÒÉ×ÁÔØÓÑ ËÁË ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ "
-"ÏÐÒÅÄÅÌÅÎÉÀ ÉÚ ÐÁËÅÔÁ %s"
+msgid "Note: some superclasses of class %s in package %s have duplicate definitions.  This definition is not being treated as equivalent to that from package %s"
+msgstr "úÁÍÅÞÁÎÉÅ: ÎÅËÏÔÏÒÙÅ ÓÕÐÅÒ-ËÌÁÓÓÙ ËÌÁÓÓÁ %s ÐÁËÅÔÁ %s ÉÍÅÀÔ Ä×ÏÊÎÙÅ ÏÐÒÅÄÅÌÅÎÉÑ. üÔÏ ÏÐÒÅÄÅÌÅÎÉÅ ÎÅ ÂÕÄÅÔ ÒÁÓÓÍÁÔÒÉ×ÁÔØÓÑ ËÁË ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÏÐÒÅÄÅÌÅÎÉÀ ÉÚ ÐÁËÅÔÁ %s"
 
-msgid ""
-"Note: the specification for class %s in package %s seems equivalent to one "
-"from package %s: not turning on duplicate class definitions for this class."
-msgstr ""
-"úÁÍÅÞÁÎÉÅ: ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÁÓÓÁ %s ÐÁËÅÔÁ %s ÐÏÈÏÖÅ ÎÁ ÓÐÅÃÉÆÉËÁÃÉÀ ÉÚ ÐÁËÅÔÁ "
-"%s: ÎÅ ÂÕÄÅÔ ÄÕÂÌÉËÁÔÏÍ ÏÐÒÅÄÅÌÅÎÉÊ ÜÔÏÇÏ ËÌÁÓÓÁ."
+msgid "Note: the specification for class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class."
+msgstr "úÁÍÅÞÁÎÉÅ: ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÁÓÓÁ %s ÐÁËÅÔÁ %s ÐÏÈÏÖÅ ÎÁ ÓÐÅÃÉÆÉËÁÃÉÀ ÉÚ ÐÁËÅÔÁ %s: ÎÅ ÂÕÄÅÔ ÄÕÂÌÉËÁÔÏÍ ÏÐÒÅÄÅÌÅÎÉÊ ÜÔÏÇÏ ËÌÁÓÓÁ."
 
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÐÏÄËÌÁÓÓ %s ËÌÁÓÓÁ \"%s\"; ÏÐÒÅÄÅÌÅÎÉÅ ÎÅ ÏÂÎÏ×ÌÅÎÏ"
 
-msgid ""
-"subclass %s of class %s is not local and cannot be updated for new "
-"inheritance information; consider setClassUnion()"
-msgstr ""
-"ÐÏÄËÌÁÓÓ %s ËÌÁÓÓÁ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÌÏËÁÌØÎÙÍ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÂÎÏ×ÌÅÎ; "
-"ÒÁÓÓÍÏÔÒÉÔÅ setClassUnion()"
+msgid "subclass %s of class %s is not local and cannot be updated for new inheritance information; consider setClassUnion()"
+msgstr "ÐÏÄËÌÁÓÓ %s ËÌÁÓÓÁ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÌÏËÁÌØÎÙÍ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÂÎÏ×ÌÅÎ; ÒÁÓÓÍÏÔÒÉÔÅ setClassUnion()"
 
-msgid ""
-"no definition of inheritance from %s to %s, though the relation was implied "
-"by the setIs() from %s"
-msgstr ""
-"ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÎÁÓÌÅÄÏ×ÁÎÉÑ ÏÔ %s Ë %s, ÏÄÎÁËÏ ÐÏÄÒÁÚÕÍÅ×ÁÌÁÓØ ÚÁ×ÉÓÉÍÏÓÔØ "
-"ÞÅÒÅÚ setIs() ÏÔ %s"
+msgid "no definition of inheritance from %s to %s, though the relation was implied by the setIs() from %s"
+msgstr "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÎÁÓÌÅÄÏ×ÁÎÉÑ ÏÔ %s Ë %s, ÏÄÎÁËÏ ÐÏÄÒÁÚÕÍÅ×ÁÌÁÓØ ÚÁ×ÉÓÉÍÏÓÔØ ÞÅÒÅÚ setIs() ÏÔ %s"
 
-msgid ""
-"argument 'includeSubclasses' must be a logical, either one value or a vector "
-"of the same length as argument 'classes'"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'includeSubclasses' ÄÏÌÖÅÎ ÂÙÔØ ÌÏÇÉÞÅÓËÉÍ, ÌÉÂÏ ÉÍÅÔØ ÏÄÎÏ "
-"ÚÎÁÞÅÎÉÅ ÉÌÉ ÂÙÔØ ×ÅËÔÏÒÏÍ ÔÏÊ ÖÅ ÄÌÉÎÙ, ÞÔÏ É ËÌÁÓÓÙ ÁÒÇÕÍÅÎÔÁ"
+msgid "argument 'includeSubclasses' must be a logical, either one value or a vector of the same length as argument 'classes'"
+msgstr "ÁÒÇÕÍÅÎÔ 'includeSubclasses' ÄÏÌÖÅÎ ÂÙÔØ ÌÏÇÉÞÅÓËÉÍ, ÌÉÂÏ ÉÍÅÔØ ÏÄÎÏ ÚÎÁÞÅÎÉÅ ÉÌÉ ÂÙÔØ ×ÅËÔÏÒÏÍ ÔÏÊ ÖÅ ÄÌÉÎÙ, ÞÔÏ É ËÌÁÓÓÙ ÁÒÇÕÍÅÎÔÁ"
 
 msgid "argument 'abbreviate' must be 0, 1, 2, or 3"
 msgstr "ÁÒÇÕÍÅÎÔ 'abbreviate' ÄÏÌÖÅÎ ÂÙÔØ 0, 1, 2, ÉÌÉ 3"
@@ -788,22 +521,14 @@
 msgid "needed the supplied labels vector of length %d, got %d"
 msgstr "ÎÕÖÎÙ ÄÏÂÁ×ÏÞÎÙÅ ÍÅÔËÉ ×ÅËÔÏÒÁ ÄÌÉÎÙ %d, Á ÐÏÌÕÞÅÎÏ %d"
 
-msgid ""
-"the function being used as %s in making a generic function for %s is "
-"currently traced; the function used will have tracing removed"
-msgstr ""
-"ÆÕÎËÃÉÑ, ÉÓÐÏÌØÚÕÅÍÁÑ ËÁË %s ÐÒÉ ÓÏÚÄÁÎÉÉ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ %s × ÄÁÎÎÙÊ "
-"ÍÏÍÅÎÔ ÏÔÓÌÅÖÉ×ÁÅÔÓÑ; ÄÌÑ ÉÓÐÏÌØÚÕÅÍÏÊ ÆÕÎËÃÉÉ ÔÒÁÓÓÉÒÏ×ËÁ ÂÕÄÅÔ ÕÄÁÌÅÎÁ"
+msgid "the function being used as %s in making a generic function for %s is currently traced; the function used will have tracing removed"
+msgstr "ÆÕÎËÃÉÑ, ÉÓÐÏÌØÚÕÅÍÁÑ ËÁË %s ÐÒÉ ÓÏÚÄÁÎÉÉ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ %s × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÏÔÓÌÅÖÉ×ÁÅÔÓÑ; ÄÌÑ ÉÓÐÏÌØÚÕÅÍÏÊ ÆÕÎËÃÉÉ ÔÒÁÓÓÉÒÏ×ËÁ ÂÕÄÅÔ ÕÄÁÌÅÎÁ"
 
 msgid "must supply either a generic function or a function as default for %s"
 msgstr "ÎÁÄÏ ÏÐÒÅÄÅÌÉÔØ ÌÉÂÏ ÏÂÝÕÀ ÆÕÎËÃÉÀ, ÌÉÂÏ ÆÕÎËÃÉÀ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ %s"
 
-msgid ""
-"the %s argument must be NULL or a generic function object; got an object of "
-"class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ NULL ÉÌÉ ÏÂßÅËÔÏÍ ÏÂÝÅÊ ÆÕÎËÃÉÉ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ "
-"ËÌÁÓÓÁ %s"
+msgid "the %s argument must be NULL or a generic function object; got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ NULL ÉÌÉ ÏÂßÅËÔÏÍ ÏÂÝÅÊ ÆÕÎËÃÉÉ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "no suitable arguments to dispatch methods in this function"
 msgstr "ÎÅÔ ÐÏÄÈÏÄÑÝÉÈ ÁÒÇÕÍÅÎÔÏ× ÄÌÑ ÍÅÔÏÄÏ× ÏÔÐÒÁ×ËÉ × ÄÁÎÎÏÊ ÆÕÎËÃÉÉ"
@@ -818,41 +543,22 @@
 msgstr "× ÍÅÔÏÄÅ ÄÌÑ %s Ó ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ %s:"
 
 msgid "formal arguments in method and generic do not appear in the same order"
-msgstr ""
-"ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × ÍÅÔÏÄÅ É ÏÂÝÅÊ ÆÕÎËÃÉÉ ÐÏÑ×ÌÑÀÔÓÑ ÎÅ × ÏÄÉÎÁËÏ×ÏÍ "
-"ÐÏÒÑÄËÅ"
+msgstr "ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × ÍÅÔÏÄÅ É ÏÂÝÅÊ ÆÕÎËÃÉÉ ÐÏÑ×ÌÑÀÔÓÑ ÎÅ × ÏÄÉÎÁËÏ×ÏÍ ÐÏÒÑÄËÅ"
 
-msgid ""
-"formal arguments (%s) omitted in the method definition cannot be in the "
-"signature"
-msgstr ""
-"ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ (%s), ÏÐÕÝÅÎÎÙÅ × ÏÐÒÅÄÅÌÅÎÉÉ ÍÅÔÏÄÁ, ÎÅ ÍÏÇÕÔ ÂÙÔØ × "
-"ÉÄÅÎÔÉÆÉËÁÔÏÒÅ"
+msgid "formal arguments (%s) omitted in the method definition cannot be in the signature"
+msgstr "ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ (%s), ÏÐÕÝÅÎÎÙÅ × ÏÐÒÅÄÅÌÅÎÉÉ ÍÅÔÏÄÁ, ÎÅ ÍÏÇÕÔ ÂÙÔØ × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ"
 
 msgid "expanding the signature to include omitted arguments in definition: %s"
-msgstr ""
-"ÒÁÓÛÉÒÑÀ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÄÌÑ ×ËÌÀÞÅÎÉÑ ÏÐÕÝÅÎÎÙÈ ÁÒÇÕÍÅÎÔÏ× × ÏÐÒÅÄÅÌÅÎÉÉ: %s"
+msgstr "ÒÁÓÛÉÒÑÀ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÄÌÑ ×ËÌÀÞÅÎÉÑ ÏÐÕÝÅÎÎÙÈ ÁÒÇÕÍÅÎÔÏ× × ÏÐÒÅÄÅÌÅÎÉÉ: %s"
 
-msgid ""
-"methods can add arguments to the generic %s only if '...' is an argument to "
-"the generic"
-msgstr ""
-"ÍÅÔÏÄÙ ÍÏÇÕÔ ÄÏÂÁ×ÌÑÔØ ÁÒÇÕÍÅÎÔÙ × ÏÂÝÕÀ %s ÔÏÌØËÏ ÅÓÌÉ '...' Ñ×ÌÑÅÔÓÑ "
-"ÁÒÇÕÍÅÎÔÏÍ ÄÌÑ ÏÂÝÅÊ"
+msgid "methods can add arguments to the generic %s only if '...' is an argument to the generic"
+msgstr "ÍÅÔÏÄÙ ÍÏÇÕÔ ÄÏÂÁ×ÌÑÔØ ÁÒÇÕÍÅÎÔÙ × ÏÂÝÕÀ %s ÔÏÌØËÏ ÅÓÌÉ '...' Ñ×ÌÑÅÔÓÑ ÁÒÇÕÍÅÎÔÏÍ ÄÌÑ ÏÂÝÅÊ"
 
-msgid ""
-"arguments (%s) after '...' in the generic must appear in the method, in the "
-"same place at the end of the argument list"
-msgstr ""
-"ÁÒÇÕÍÅÎÔÙ (%s) ÐÏÓÌÅ '...' × ÏÂÝÅÊ ÄÏÌÖÎÙ ÐÏÑ×ÉÔØÓÑ × ÍÅÔÏÄÅ, × ÔÏÊ ÖÅ "
-"ÐÏÚÉÃÉÉ × ËÏÎÃÅ ÓÐÉÓËÁ ÁÒÇÕÍÅÎÔÏ×"
+msgid "arguments (%s) after '...' in the generic must appear in the method, in the same place at the end of the argument list"
+msgstr "ÁÒÇÕÍÅÎÔÙ (%s) ÐÏÓÌÅ '...' × ÏÂÝÅÊ ÄÏÌÖÎÙ ÐÏÑ×ÉÔØÓÑ × ÍÅÔÏÄÅ, × ÔÏÊ ÖÅ ÐÏÚÉÃÉÉ × ËÏÎÃÅ ÓÐÉÓËÁ ÁÒÇÕÍÅÎÔÏ×"
 
-msgid ""
-"argument 'f' must be a string, generic function, or primitive: got an "
-"ordinary function"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'f' ÄÏÌÖÅÎ ÂÙÔØ ÓÔÒÏËÏÊ, ÏÂÝÅÊ ÆÕÎËÃÉÅÊ, ÉÌÉ ÐÒÉÍÉÔÉ×ÏÍ: ÐÏÌÕÞÅÎÁ "
-"ÏÂÙÞÎÁÑ ÆÕÎËÃÉÑ"
+msgid "argument 'f' must be a string, generic function, or primitive: got an ordinary function"
+msgstr "ÁÒÇÕÍÅÎÔ 'f' ÄÏÌÖÅÎ ÂÙÔØ ÓÔÒÏËÏÊ, ÏÂÝÅÊ ÆÕÎËÃÉÅÊ, ÉÌÉ ÐÒÉÍÉÔÉ×ÏÍ: ÐÏÌÕÞÅÎÁ ÏÂÙÞÎÁÑ ÆÕÎËÃÉÑ"
 
 msgid "methods cannot be defined for the primitive function %s"
 msgstr "ÍÅÔÏÄÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ ÄÌÑ ÜÌÅÍÅÎÔÁÒÎÏÊ ÆÕÎËÃÉÉ %s"
@@ -863,65 +569,35 @@
 msgid "Empty function name in .getGeneric"
 msgstr "ðÕÓÔÏÅ ÉÍÑ ÆÕÎËÃÉÉ × .getGeneric"
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr ""
-"ÐÁËÅÔ %s ×ÏÚÍÏÖÎÏ, ÓÏÄÅÒÖÉÔ ÕÓÔÁÒÅ×ÛÉÅ ÍÅÔÏÄÙ; ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÅÇÏ "
-"ÉÚ ÉÓÔÏÞÎÉËÁ"
+msgid "package %s seems to have out-of-date methods; need to reinstall from source"
+msgstr "ÐÁËÅÔ %s ×ÏÚÍÏÖÎÏ, ÓÏÄÅÒÖÉÔ ÕÓÔÁÒÅ×ÛÉÅ ÍÅÔÏÄÙ; ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÅÇÏ ÉÚ ÉÓÔÏÞÎÉËÁ"
 
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
-msgstr ""
-"ÎÅ ÎÁÊÄÅÎÏ ÍÅÔÏÄÏ× ÄÌÑ %s; cacheGenericsMetaData() ÎÅ ÂÕÄÅÔ ÉÍÅÔØ ÜÆÆÅËÔÁ"
+msgstr "ÎÅ ÎÁÊÄÅÎÏ ÍÅÔÏÄÏ× ÄÌÑ %s; cacheGenericsMetaData() ÎÅ ÂÕÄÅÔ ÉÍÅÔØ ÜÆÆÅËÔÁ"
 
 msgid "invalid value from generic function %s, class %s, expected %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÉÚ ÏÂÝÅÊ ÆÕÎËÃÉÉ %s, ËÌÁÓÓ %s, ÏÖÉÄÁÌÏÓØ %s"
 
 msgid "\"MethodsList\" is defunct; allMethods now are empty"
-msgstr ""
+msgstr "\"MethodsList\" ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ; allMethods ÔÅÐÅÒØ ÐÕÓÔÙ"
 
-msgid ""
-"the body of the generic function for %s calls 'standardGeneric' to dispatch "
-"on a different name (\"%s\")!"
-msgstr ""
-"ÔÅÌÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ %s ×ÙÚÙ×ÁÅÔ 'standardGeneric' ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÏÄ ÄÒÕÇÉÍ "
-"ÉÍÅÎÅÍ (\"%s\")!"
+msgid "the body of the generic function for %s calls 'standardGeneric' to dispatch on a different name (\"%s\")!"
+msgstr "ÔÅÌÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ %s ×ÙÚÙ×ÁÅÔ 'standardGeneric' ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÏÄ ÄÒÕÇÉÍ ÉÍÅÎÅÍ (\"%s\")!"
 
-msgid ""
-"trying to change the formal arguments in %s in an object of class %s; "
-"expected a function definition"
-msgstr ""
-"ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÏÂßÅËÔÅ ËÌÁÓÓÁ %s; ÏÖÉÄÁÌÏÓØ "
-"ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ"
+msgid "trying to change the formal arguments in %s in an object of class %s; expected a function definition"
+msgstr "ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÏÂßÅËÔÅ ËÌÁÓÓÁ %s; ÏÖÉÄÁÌÏÓØ ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ"
 
-msgid ""
-"trying to change the formal arguments in %s, but getting the new formals "
-"from an object of class %s; expected a function definition"
-msgstr ""
-"ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÎÏ ÐÏÌÕÞÁÀ ÎÏ×ÙÅ ÆÏÒÍÁÌØÎÙÅ "
-"ÁÒÇÕÍÅÎÔÙ ÏÔ ÏÂßÅËÔÁ ËÌÁÓÓÁ %s; ÏÖÉÄÁÌÏÓØ ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ"
+msgid "trying to change the formal arguments in %s, but getting the new formals from an object of class %s; expected a function definition"
+msgstr "ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÎÏ ÐÏÌÕÞÁÀ ÎÏ×ÙÅ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÏÔ ÏÂßÅËÔÁ ËÌÁÓÓÁ %s; ÏÖÉÄÁÌÏÓØ ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ"
 
-msgid ""
-"trying to change the formal arguments in %s, but the number of existing "
-"arguments is less than the number of new arguments: (%s) vs (%s)"
-msgstr ""
-"ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÎÏ ÞÉÓÌÏ ÓÕÝÅÓÔ×ÕÀÝÉÈ ÁÒÇÕÍÅÎÔÏ× "
-"ÍÅÎØÛÅ, ÞÅÍ ÞÉÓÌÏ ÎÏ×ÙÈ ÁÒÇÕÍÅÎÔÏ×: (%s) ÐÒÏÔÉ× (%s)"
+msgid "trying to change the formal arguments in %s, but the number of existing arguments is less than the number of new arguments: (%s) vs (%s)"
+msgstr "ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÎÏ ÞÉÓÌÏ ÓÕÝÅÓÔ×ÕÀÝÉÈ ÁÒÇÕÍÅÎÔÏ× ÍÅÎØÛÅ, ÞÅÍ ÞÉÓÌÏ ÎÏ×ÙÈ ÁÒÇÕÍÅÎÔÏ×: (%s) ÐÒÏÔÉ× (%s)"
 
-msgid ""
-"trying to change the formal arguments in %s, but the number of existing "
-"arguments is greater than the number of new arguments (the extra arguments "
-"won't be used): (%s) vs (%s)"
-msgstr ""
-"ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÎÏ ÞÉÓÌÏ ÓÕÝÅÓÔ×ÕÀÝÉÈ ÁÒÇÕÍÅÎÔÏ× "
-"ÂÏÌØÛÅ, ÞÅÍ ÞÉÓÌÏ ÎÏ×ÙÈ ÁÒÇÕÍÅÎÔÏ× (ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÎÅ ÂÕÄÕÔ "
-"ÉÓÐÏÌØÚÏ×ÁÎÙ): (%s) ÐÒÏÔÉ× (%s)"
+msgid "trying to change the formal arguments in %s, but the number of existing arguments is greater than the number of new arguments (the extra arguments won't be used): (%s) vs (%s)"
+msgstr "ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ × %s, ÎÏ ÞÉÓÌÏ ÓÕÝÅÓÔ×ÕÀÝÉÈ ÁÒÇÕÍÅÎÔÏ× ÂÏÌØÛÅ, ÞÅÍ ÞÉÓÌÏ ÎÏ×ÙÈ ÁÒÇÕÍÅÎÔÏ× (ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÎÅ ÂÕÄÕÔ ÉÓÐÏÌØÚÏ×ÁÎÙ): (%s) ÐÒÏÔÉ× (%s)"
 
-msgid ""
-"in changing formal arguments in %s, some of the old names are not in fact "
-"arguments: %s"
-msgstr ""
-"ÐÒÉ ÉÚÍÅÎÅÎÉÉ ÆÏÒÍÁÌØÎÙÈ ÁÒÇÕÍÅÎÔÏ× × %s, ÎÅËÏÔÏÒÙÅ ÓÔÁÒÙÅ ÉÍÅÎÁ ÎÅ Ñ×ÌÑÀÔÓÑ "
-"ÁÒÇÕÍÅÎÔÁÍÉ: %s"
+msgid "in changing formal arguments in %s, some of the old names are not in fact arguments: %s"
+msgstr "ÐÒÉ ÉÚÍÅÎÅÎÉÉ ÆÏÒÍÁÌØÎÙÈ ÁÒÇÕÍÅÎÔÏ× × %s, ÎÅËÏÔÏÒÙÅ ÓÔÁÒÙÅ ÉÍÅÎÁ ÎÅ Ñ×ÌÑÀÔÓÑ ÁÒÇÕÍÅÎÔÁÍÉ: %s"
 
 msgid "got a negative maximum number of frames to look at"
 msgstr "ÐÏÌÕÞÅÎÏ ÏÔÒÉÃÁÔÅÌØÎÏÅ ÍÁËÓÉÍÁÌØÎÏÅ ÞÉÓÌÏ ÓÔÒÕËÔÕÒ ÄÌÑ ÐÏÉÓËÁ"
@@ -947,19 +623,11 @@
 msgid "single string; got an object of class %s"
 msgstr "ÐÒÏÓÔÁÑ ÓÔÒÏËÁ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"multiple definitions exist for class %s, but the supplied package (%s) is "
-"not one of them (%s)"
-msgstr ""
-"ÓÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÁ %s, ÎÏ ÐÒÅÄÓÔÁ×ÌÅÎÎÙÊ ÐÁËÅÔ (%s) ÎÅ "
-"ÉÚ ÎÉÈ (%s)"
+msgid "multiple definitions exist for class %s, but the supplied package (%s) is not one of them (%s)"
+msgstr "ÓÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÁ %s, ÎÏ ÐÒÅÄÓÔÁ×ÌÅÎÎÙÊ ÐÁËÅÔ (%s) ÎÅ ÉÚ ÎÉÈ (%s)"
 
-msgid ""
-"multiple definitions exist for class %s; should specify one of them (%s), e."
-"g. by className()"
-msgstr ""
-"ÅÓÔØ ÍÎÏÇÏ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÁ %s; ÎÁÄÏ ÕËÁÚÁÔØ ÏÄÎÏ ÉÚ ÎÉÈ (%s), ÎÁÐÒÉÍÅÒ, "
-"ÞÅÒÅÚ className()"
+msgid "multiple definitions exist for class %s; should specify one of them (%s), e.g. by className()"
+msgstr "ÅÓÔØ ÍÎÏÇÏ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÁ %s; ÎÁÄÏ ÕËÁÚÁÔØ ÏÄÎÏ ÉÚ ÎÉÈ (%s), ÎÁÐÒÉÍÅÒ, ÞÅÒÅÚ className()"
 
 msgid "no definition found for class %s"
 msgstr "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ËÌÁÓÓÁ %s"
@@ -983,49 +651,25 @@
 msgstr "ÎÅËÏÔÏÒÙÅ ÄÅÊÓÔ×ÉÑ ÐÒÏÐÕÝÅÎÙ: %s"
 
 msgid "%s has a sealed class definition and cannot be redefined"
-msgstr ""
-"%s ÉÍÅÅÔ ÚÁÐÅÞÁÔÁÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÏÐÒÅÄÅÌÅÎÏ"
+msgstr "%s ÉÍÅÅÔ ÚÁÐÅÞÁÔÁÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÏÐÒÅÄÅÌÅÎÏ"
 
-msgid ""
-"Argument \"representation\" cannot be used if argument \"slots\" is supplied"
-msgstr ""
-"áÒÇÕÍÅÎÔ \"representation\" ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÅÓÌÉ ÕËÁÚÁÎ ÁÒÇÕÍÅÎÔ \"slots"
-"\""
+msgid "Argument \"representation\" cannot be used if argument \"slots\" is supplied"
+msgstr "áÒÇÕÍÅÎÔ \"representation\" ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÅÓÌÉ ÕËÁÚÁÎ ÁÒÇÕÍÅÎÔ \"slots\""
 
-msgid ""
-"only arguments 'Class' and 'where' can be supplied when argument "
-"'representation' is a 'classRepresentation' object"
-msgstr ""
-"ÔÏÌØËÏ ÁÒÇÕÍÅÎÔÙ 'Class' É 'where' ÍÏÇÕÔ ÂÙÔØ ÐÒÅÄÏÓÔÁ×ÌÅÎÙ ËÏÇÄÁ ÁÒÇÕÍÅÎÔ "
-"'representation' Ñ×ÌÑÅÔÓÑ ÏÂßÅËÔÏÍ ËÌÁÓÓÁ 'classRepresentation'"
+msgid "only arguments 'Class' and 'where' can be supplied when argument 'representation' is a 'classRepresentation' object"
+msgstr "ÔÏÌØËÏ ÁÒÇÕÍÅÎÔÙ 'Class' É 'where' ÍÏÇÕÔ ÂÙÔØ ÐÒÅÄÏÓÔÁ×ÌÅÎÙ ËÏÇÄÁ ÁÒÇÕÍÅÎÔ 'representation' Ñ×ÌÑÅÔÓÑ ÏÂßÅËÔÏÍ ËÌÁÓÓÁ 'classRepresentation'"
 
-msgid ""
-"error in contained classes (%s) for class %s and unable to remove definition "
-"from %s"
-msgstr ""
-"ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s É ÎÅ ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ "
-"ÏÐÒÅÄÅÌÅÎÉÅ ÉÚ %s"
+msgid "error in contained classes (%s) for class %s and unable to remove definition from %s"
+msgstr "ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s É ÎÅ ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÏÐÒÅÄÅÌÅÎÉÅ ÉÚ %s"
 
-msgid ""
-"error in contained classes (%s) for class %s; class definition removed from "
-"%s"
-msgstr ""
-"ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s; ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÕÄÁÌÅÎÏ "
-"ÉÚ %s"
+msgid "error in contained classes (%s) for class %s; class definition removed from %s"
+msgstr "ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s; ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÕÄÁÌÅÎÏ ÉÚ %s"
 
-msgid ""
-"error in contained classes (%s) for class %s and unable to restore previous "
-"definition from %s"
-msgstr ""
-"ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s É ÎÅ ×ÏÚÍÏÖÎÏ ×ÏÓÓÔÁÎÏ×ÉÔØ "
-"ÐÒÅÄÙÄÕÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ ÉÚ %s"
+msgid "error in contained classes (%s) for class %s and unable to restore previous definition from %s"
+msgstr "ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s É ÎÅ ×ÏÚÍÏÖÎÏ ×ÏÓÓÔÁÎÏ×ÉÔØ ÐÒÅÄÙÄÕÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ ÉÚ %s"
 
-msgid ""
-"error in contained classes (%s) for class %s; previous definition restored "
-"to %s"
-msgstr ""
-"ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s; ÐÒÅÄÙÄÕÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ "
-"×ÏÓÓÔÁÎÏ×ÌÅÎÏ Ë %s"
+msgid "error in contained classes (%s) for class %s; previous definition restored to %s"
+msgstr "ÏÛÉÂËÁ × ÓÏÄÅÒÖÁÝÉÈÓÑ ËÌÁÓÓÁÈ (%s) ÄÌÑ ËÌÁÓÓÁ %s; ÐÒÅÄÙÄÕÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ ×ÏÓÓÔÁÎÏ×ÌÅÎÏ Ë %s"
 
 msgid "element %d of the representation was not a single character string"
 msgstr "ÜÌÅÍÅÎÔ %d ÐÒÅÄÓÔÁ×ÌÅÎÉÑ ÎÅ ÂÙÌ ÏÄÉÎÏÞÎÏÊ ÓÉÍ×ÏÌØÎÏÊ ÓÔÒÏËÏÊ"
@@ -1042,23 +686,14 @@
 msgid "%s is not a slot in class %s"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÚÉÃÉÅÊ ËÌÁÓÓÁ %s"
 
-msgid ""
-"assignment of an object of class %s is not valid for slot %s in an object of "
-"class %s; is(value, \"%s\") is not TRUE"
-msgstr ""
-"ÎÁÚÎÁÞÅÎÉÅ ÏÂßÅËÔÁ ËÌÁÓÓÁ %s ÎÅ×ÅÒÎÏ ÄÌÑ ÐÏÚÉÃÉÉ %s × ÏÂßÅËÔÅ ËÌÁÓÓÁ %s; "
-"is(value, \"%s\") ÎÅ Ñ×ÌÑÅÔÓÑ TRUE"
+msgid "assignment of an object of class %s is not valid for slot %s in an object of class %s; is(value, \"%s\") is not TRUE"
+msgstr "ÎÁÚÎÁÞÅÎÉÅ ÏÂßÅËÔÁ ËÌÁÓÓÁ %s ÎÅ×ÅÒÎÏ ÄÌÑ ÐÏÚÉÃÉÉ %s × ÏÂßÅËÔÅ ËÌÁÓÓÁ %s; is(value, \"%s\") ÎÅ Ñ×ÌÑÅÔÓÑ TRUE"
 
-msgid ""
-"assignment of an object of class %s is not valid for @%s in an object of "
-"class %s; is(value, \"%s\") is not TRUE"
-msgstr ""
-"ÎÁÚÎÁÞÅÎÉÅ ÏÂßÅËÔÁ ËÌÁÓÓÁ %s ÎÅ×ÅÒÎÏ ÄÌÑ ÐÏÚÉÃÉÉ %s × ÏÂßÅËÔÅ ËÌÁÓÓÁ %s; "
-"is(value, \"%s\") ÎÅ Ñ×ÌÑÅÔÓÑ TRUE"
+msgid "assignment of an object of class %s is not valid for @%s in an object of class %s; is(value, \"%s\") is not TRUE"
+msgstr "ÎÁÚÎÁÞÅÎÉÅ ÏÂßÅËÔÁ ËÌÁÓÓÁ %s ÎÅ×ÅÒÎÏ ÄÌÑ ÐÏÚÉÃÉÉ %s × ÏÂßÅËÔÅ ËÌÁÓÓÁ %s; is(value, \"%s\") ÎÅ Ñ×ÌÑÅÔÓÑ TRUE"
 
 msgid "class definition for %s not found (no action taken)"
-msgstr ""
-"ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÄÌÑ %s ÎÅ ÎÁÊÄÅÎÏ  (ÎÅ ÐÒÅÄÐÒÉÎÑÔÏ ÎÉËÁËÉÈ ÄÅÊÓÔ×ÉÊ)"
+msgstr "ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÄÌÑ %s ÎÅ ÎÁÊÄÅÎÏ  (ÎÅ ÐÒÅÄÐÒÉÎÑÔÏ ÎÉËÁËÉÈ ÄÅÊÓÔ×ÉÊ)"
 
 msgid "class %s has multiple definitions visible; only the first removed"
 msgstr "ËÌÁÓÓ %s ÉÍÅÅÔ ÎÅÓËÏÌØËÏ ×ÉÄÉÍÙÈ ÏÐÒÅÄÅÌÅÎÉÊ; ÕÄÁÌÅÎÏ ÔÏÌØËÏ ÐÅÒ×ÏÅ"
@@ -1072,42 +707,29 @@
 msgid "class %s not found on %s; 'resetClass' will have no effect"
 msgstr "ËÌÁÓÓ %s ÎÅ ÎÁÊÄÅÎ ÎÁ %s; 'resetClass' ÏÓÔÁÎÅÔÓÑ ÂÅÚ ÜÆÆÅËÔÁ"
 
-msgid ""
-"argument 'classDef' must be a string or a class representation; got an "
-"object of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'classDef' ÄÏÌÖÅÎ ÂÙÔØ ÓÔÒÏËÏÊ ÌÉÂÏ ÐÒÅÄÓÔÁ×ÌÅÎÉÅÍ ËÌÁÓÓÁ; ÐÏÌÕÞÅÎ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "argument 'classDef' must be a string or a class representation; got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ 'classDef' ÄÏÌÖÅÎ ÂÙÔØ ÓÔÒÏËÏÊ ÌÉÂÏ ÐÒÅÄÓÔÁ×ÌÅÎÉÅÍ ËÌÁÓÓÁ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "class %s is sealed; 'resetClass' will have no effect"
 msgstr "ËÌÁÓÓ %s ÚÁÐÅÞÁÔÁÎ; 'resetClass' ÎÅ ÂÕÄÅÔ ÉÍÅÔØ ÜÆÆÅËÔÁ"
 
-msgid ""
-"cannot use object of class %s in new():  class %s does not extend that class"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂßÅËÔ ËÌÁÓÓÁ %s × new():  ËÌÁÓÓ %s ÎÅ ÍÏÖÅÔ ÒÁÓÛÉÒÉÔØ "
-"ÄÁÎÎÙÊ ËÌÁÓÓ"
+msgid "cannot use object of class %s in new():  class %s does not extend that class"
+msgstr "ÎÅ ÍÏÇÕ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂßÅËÔ ËÌÁÓÓÁ %s × new():  ËÌÁÓÓ %s ÎÅ ÍÏÖÅÔ ÒÁÓÛÉÒÉÔØ ÄÁÎÎÙÊ ËÌÁÓÓ"
 
 msgid "duplicated slot names: %s"
 msgstr "ÓÏ×ÐÁÄÁÀÝÉÅ ÉÍÅÎÁ ÓÌÏÔÏ×: %s"
 
-msgid ""
-"class %s is defined, with package %s, but no corresponding metadata object "
-"was found (not exported?)"
-msgstr ""
-"ËÌÁÓÓ %s ÏÐÒÅÄÅÌÅÎ Ó ÐÁËÅÔÏÍ %s, ÎÏ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÂßÅËÔÁ ÍÅÔÁÄÁÎÎÙÈ ÎÅ "
-"ÎÁÊÄÅÎÏ (ÎÅ ÜËÓÐÏÒÔÉÒÏ×ÁÎ?)"
+msgid "class %s is defined, with package %s, but no corresponding metadata object was found (not exported?)"
+msgstr "ËÌÁÓÓ %s ÏÐÒÅÄÅÌÅÎ Ó ÐÁËÅÔÏÍ %s, ÎÏ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÂßÅËÔÁ ÍÅÔÁÄÁÎÎÙÈ ÎÅ ÎÁÊÄÅÎÏ (ÎÅ ÜËÓÐÏÒÔÉÒÏ×ÁÎ?)"
 
 msgid "no definition of %s to use for %s"
 msgstr "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ %s ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ Ó %s"
 
 msgid "class definition cannot extend more than one of these data types: %s"
-msgstr ""
-"ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÎÁ ÍÏÖÅÔ ÒÁÓÛÉÒÉÔØ ÂÏÌÅÅ ÞÅÍ ÏÄÉÎ ÉÚ ÜÔÉÈ ÔÉÐÏ× ÄÁÎÎÙÈ: %s"
+msgstr "ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÎÁ ÍÏÖÅÔ ÒÁÓÛÉÒÉÔØ ÂÏÌÅÅ ÞÅÍ ÏÄÉÎ ÉÚ ÜÔÉÈ ÔÉÐÏ× ÄÁÎÎÙÈ: %s"
 
 msgid "abnormal type %s is not supported as a superclass of a class definition"
-msgstr ""
-"ÎÅÎÏÒÍÁÌØÎÙÊ ÔÉÐ %s ÎÅ ÂÏÄÄÅÒÖÉ×ÁÅÔÓÑ ËÁË ÓÕÐÅÒËÌÁÓÓ ÉÌÉ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ"
+msgstr "ÎÅÎÏÒÍÁÌØÎÙÊ ÔÉÐ %s ÎÅ ÂÏÄÄÅÒÖÉ×ÁÅÔÓÑ ËÁË ÓÕÐÅÒËÌÁÓÓ ÉÌÉ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ"
 
 msgid "multiple class definitions for %s from packages: %s; picking the first"
 msgstr "ÍÎÏÇÏ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÁ ÄÌÑ %s ÉÚ ÐÁËÅÔÏ×: %s; ÂÅÒÕ ÐÅÒ×ÏÅ"
@@ -1135,11 +757,8 @@
 "÷ÓÅ ÉÍÅÎÁ %s ÄÏÌÖÎÙ ÂÙÔØ ÎÅÐÕÓÔÙÍÉ ×:\n"
 "(%s)"
 
-msgid ""
-"argument %s must be a list or a character vector; got an object of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ ÏÄÎÏÊ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "argument %s must be a list or a character vector; got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ ÉÌÉ ÏÄÎÏÊ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "no function %s found"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÆÕÎËÃÉÉ %s"
@@ -1154,8 +773,7 @@
 msgstr "ÎÅÔ ÍÅÔÏÄÁ ÉÌÉ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÐÒÉ×ÅÄÅÎÉÑ %s Ë %s"
 
 msgid "no method or default for as() replacement of %s with Class=\"%s\""
-msgstr ""
-"ÎÅÔ ÍÅÔÏÄÁ ÉÌÉ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ as() ÚÁÍÅÝÅÎÉÑ %s ÎÁ Class=\"%s\""
+msgstr "ÎÅÔ ÍÅÔÏÄÁ ÉÌÉ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ as() ÚÁÍÅÝÅÎÉÑ %s ÎÁ Class=\"%s\""
 
 msgid "trying to set an 'as' relation from %s to itself"
 msgstr "ÐÙÔÁÀÓØ ÕÓÔÁÎÏ×ÉÔØ ÏÔÎÏÛÅÎÉÅ 'as' ÏÔ %s ÎÁ ÓÅÂÑ"
@@ -1163,26 +781,14 @@
 msgid "class %s is not defined in this environment"
 msgstr "ËÌÁÓÓ %s ÎÅ ÏÐÒÅÄÅÌÅÎ × ÜÔÏÍ ÏËÒÕÖÅÎÉÉ"
 
-msgid ""
-"class %s is a class union: 'coerce' relations to a class union are not "
-"meaningful"
-msgstr ""
-"ËÌÁÓÓ %s Ñ×ÌÑÅÔÓÑ ÏÂßÅÄÉÎÅÎÉÅÍ ËÌÁÓÓÏ×: ÏÔÎÏÛÅÎÉÑ 'coerce' ÄÌÑ ÏÂßÅÄÉÎÅÎÉÑ "
-"ËÌÁÓÓÏ× ÂÅÓÓÍÙÓÌÅÎÎÙ"
+msgid "class %s is a class union: 'coerce' relations to a class union are not meaningful"
+msgstr "ËÌÁÓÓ %s Ñ×ÌÑÅÔÓÑ ÏÂßÅÄÉÎÅÎÉÅÍ ËÌÁÓÓÏ×: ÏÔÎÏÛÅÎÉÑ 'coerce' ÄÌÑ ÏÂßÅÄÉÎÅÎÉÑ ËÌÁÓÓÏ× ÂÅÓÓÍÙÓÌÅÎÎÙ"
 
-msgid ""
-"'as' method should have one argument, or match the arguments of coerce(): "
-"got  (%s)"
-msgstr ""
-"ÍÅÔÏÄ 'as' ÄÏÌÖÅÎ ÉÍÅÔØ ÏÄÉÎ ÁÒÇÕÍÅÎÔ, ÉÌÉ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÁÒÇÕÍÅÎÔÁÍ "
-"coerce(): ÐÏÌÕÞÅÎÏ (%s)"
+msgid "'as' method should have one argument, or match the arguments of coerce(): got  (%s)"
+msgstr "ÍÅÔÏÄ 'as' ÄÏÌÖÅÎ ÉÍÅÔØ ÏÄÉÎ ÁÒÇÕÍÅÎÔ, ÉÌÉ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÁÒÇÕÍÅÎÔÁÍ coerce(): ÐÏÌÕÞÅÎÏ (%s)"
 
-msgid ""
-"a 'replace' method definition in 'setAs' must be a function of two "
-"arguments, got %d"
-msgstr ""
-"ÏÐÒÅÄÅÌÅÎÉÅ ÍÅÔÏÄÁ 'replace' × 'setAs' ÄÏÌÖÎÏ ÂÙÔØ ÆÕÎËÃÉÅÊ Ä×ÕÈ ÁÒÇÕÍÅÎÔÏ×, "
-"ÐÏÌÕÞÅÎÏ %d"
+msgid "a 'replace' method definition in 'setAs' must be a function of two arguments, got %d"
+msgstr "ÏÐÒÅÄÅÌÅÎÉÅ ÍÅÔÏÄÁ 'replace' × 'setAs' ÄÏÌÖÎÏ ÂÙÔØ ÆÕÎËÃÉÅÊ Ä×ÕÈ ÁÒÇÕÍÅÎÔÏ×, ÐÏÌÕÞÅÎÏ %d"
 
 msgid ""
 "argument names in 'replace' changed to agree with 'coerce<-' generic:\n"
@@ -1197,27 +803,20 @@
 msgid "undefined 'coerce' method"
 msgstr "ÍÅÔÏÄ \"coerce' ÎÅ ÏÐÒÅÄÅÌÅÎ"
 
-msgid ""
-"methods currently exist for coercing from %s to %s; they will be replaced."
+msgid "methods currently exist for coercing from %s to %s; they will be replaced."
 msgstr "ÍÅÔÏÄÙ ÄÌÑ ÐÒÉ×ÅÄÅÎÉÑ %s Ë %s ÕÖÅ ÓÕÝÅÓÔ×ÕÀÔ; ÏÎÉ ÂÕÄÕÔ ÚÁÍÅÎÅÎÙ."
 
 msgid "object %s not found"
 msgstr "ÏÂßÅËÔ %s ÎÅ ÎÁÊÄÅÎ"
 
-msgid ""
-"object %s not changed (it is not consistent with the current definition of "
-"class %s from %s)"
-msgstr ""
-"ÏÂßÅËÔ %s ÎÅ ÉÚÍÅÎÅÎ (ÏÎ ÎÅ ÓÏ×ÍÅÓÔÉÍ Ó ÔÅËÕÝÉÍ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ %s ÉÚ %s)"
+msgid "object %s not changed (it is not consistent with the current definition of class %s from %s)"
+msgstr "ÏÂßÅËÔ %s ÎÅ ÉÚÍÅÎÅÎ (ÏÎ ÎÅ ÓÏ×ÍÅÓÔÉÍ Ó ÔÅËÕÝÉÍ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ %s ÉÚ %s)"
 
 msgid "no definition for the class of %s (class %s) found"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ ËÌÁÓÓÁ ÉÚ %s (ËÌÁÓÓ %s)"
 
-msgid ""
-"object %s not changed (it does not appear to be from a version of R earlier "
-"than 1.8.0)"
-msgstr ""
-"ÏÂßÅËÔ %s ÎÅ ÉÚÍÅÎÅÎ (ËÁÖÅÔÓÑ, ÞÔÏ ÏÎ ÎÅ ÉÚ ×ÅÒÓÉÉ R ÂÏÌÅÅ ÒÁÎÎÅÊ, ÞÅÍ 1.8.0)"
+msgid "object %s not changed (it does not appear to be from a version of R earlier than 1.8.0)"
+msgstr "ÏÂßÅËÔ %s ÎÅ ÉÚÍÅÎÅÎ (ËÁÖÅÔÓÑ, ÞÔÏ ÏÎ ÎÅ ÉÚ ×ÅÒÓÉÉ R ÂÏÌÅÅ ÒÁÎÎÅÊ, ÞÅÍ 1.8.0)"
 
 msgid "'class1' must be the name of a class or a class definition"
 msgstr "'class1' ÄÏÌÖÅÎ ÂÙÔØ ÉÍÅÎÅÍ ËÌÁÓÓÁ ÌÉÂÏ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ"
@@ -1228,26 +827,14 @@
 msgid "class %s has no visible definition from package or environment %s"
 msgstr "ËÌÁÓÓ %s ÎÅ ÉÍÅÅÔ ×ÉÄÉÍÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ × ÐÁËÅÔÅ ÌÉÂÏ ÏËÒÕÖÅÎÉÉ %s"
 
-msgid ""
-"cannot create a 'setIs' relation when neither of the classes (%s and %s) is "
-"local and modifiable in this package"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ 'setIs' ÏÔÎÏÛÅÎÉÅ Ô.Ë. ÎÉ ÏÄÉÎ ÉÚ ËÌÁÓÓÏ× (%s É %s) ÎÅ "
-"Ñ×ÌÑÅÔÓÑ ÌÏËÁÌØÎÙÍ É ÍÏÄÉÆÉÃÉÒÕÅÍÙÍ × ÜÔÏÍ ÐÁËÅÔÅ"
+msgid "cannot create a 'setIs' relation when neither of the classes (%s and %s) is local and modifiable in this package"
+msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ 'setIs' ÏÔÎÏÛÅÎÉÅ Ô.Ë. ÎÉ ÏÄÉÎ ÉÚ ËÌÁÓÓÏ× (%s É %s) ÎÅ Ñ×ÌÑÅÔÓÑ ÌÏËÁÌØÎÙÍ É ÍÏÄÉÆÉÃÉÒÕÅÍÙÍ × ÜÔÏÍ ÐÁËÅÔÅ"
 
-msgid ""
-"class %s is sealed; new superclasses can not be defined, except by "
-"'setClassUnion'"
-msgstr ""
-"ËÌÁÓÓ %s ÚÁÐÅÞÁÔÁÎ; ÎÏ×ÙÅ ÓÕÐÅÒËÌÁÓÓÙ ÎÅÌØÚÑ ÏÐÒÅÄÅÌÉÔØ, ÚÁ ÉÓËÌÀÞÅÎÉÅÍ "
-"'setClassUnion'"
+msgid "class %s is sealed; new superclasses can not be defined, except by 'setClassUnion'"
+msgstr "ËÌÁÓÓ %s ÚÁÐÅÞÁÔÁÎ; ÎÏ×ÙÅ ÓÕÐÅÒËÌÁÓÓÙ ÎÅÌØÚÑ ÏÐÒÅÄÅÌÉÔØ, ÚÁ ÉÓËÌÀÞÅÎÉÅÍ 'setClassUnion'"
 
-msgid ""
-"class %s is defined (with package slot %s) but no metadata object found to "
-"revise %s information---not exported?  Making a copy in package %s"
-msgstr ""
-"ËÌÁÓÓ %s ÏÐÒÅÄÅÌÅÎ (ÓÏ ÓÌÏÔÏÍ ÐÁËÅÔÁ %s), ÎÏ ÎÅ ÎÁÊÄÅÎ ÏÂßÅËÔ ÍÅÔÁÄÁÎÎÙÈ ÄÌÑ "
-"ÐÒÏ×ÅÒËÉ %s ÉÎÆÏÒÍÁÃÉÉ -- ÎÅ ÜËÓÐÏÒÔÉÒÏ×ÁÎ? äÅÌÁÀ ËÏÐÉÀ × ÐÁËÅÔÅ %s"
+msgid "class %s is defined (with package slot %s) but no metadata object found to revise %s information---not exported?  Making a copy in package %s"
+msgstr "ËÌÁÓÓ %s ÏÐÒÅÄÅÌÅÎ (ÓÏ ÓÌÏÔÏÍ ÐÁËÅÔÁ %s), ÎÏ ÎÅ ÎÁÊÄÅÎ ÏÂßÅËÔ ÍÅÔÁÄÁÎÎÙÈ ÄÌÑ ÐÒÏ×ÅÒËÉ %s ÉÎÆÏÒÍÁÃÉÉ -- ÎÅ ÜËÓÐÏÒÔÉÒÏ×ÁÎ? äÅÌÁÀ ËÏÐÉÀ × ÐÁËÅÔÅ %s"
 
 msgid "class %s cannot extend class %s"
 msgstr "ËÌÁÓÓ %s ÎÅ ÍÏÖÅÔ ÒÁÓÛÉÒÉÔØ ËÌÁÓÓ %s"
@@ -1268,26 +855,16 @@
 msgstr "ËÁÒËÁÓ ÍÅÔÏÄÁ ÚÁÐÉÓÁÎ × %s"
 
 msgid "invalid object in meta table of methods for %s, label %s, had class %s"
-msgstr ""
-"ÎÅ×ÅÒÎÙÊ ÏÂßÅËÔ × ÍÅÔÁ-ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ× ÄÌÑ %s, ÍÅÔËÁ %s, ÉÍÅÅÔ ËÌÁÓÓ %s"
+msgstr "ÎÅ×ÅÒÎÙÊ ÏÂßÅËÔ × ÍÅÔÁ-ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ× ÄÌÑ %s, ÍÅÔËÁ %s, ÉÍÅÅÔ ËÌÁÓÓ %s"
 
-#, fuzzy
-msgid ""
-"invalid mlist element for signature %s at level %d (should be "
-"MethodDefinition or .Primitive, had class %s)"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ ÜÌÅÍÅÎÔ mlist ÄÌÑ ÐÏÄÐÉÓÉ %s ÎÁ ÕÒÏ×ÎÅ %d (ÄÏÌÖÅÎ ÂÙÔØ ÓÐÉÓËÏÍ "
-"ÍÅÔÏÄÏ× ÌÉÂÏ ÍÅÔÏÄÏÍ, ÉÍÅÅÔ ËÌÁÓÓ %s)"
+msgid "invalid mlist element for signature %s at level %d (should be MethodDefinition or .Primitive, had class %s)"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÜÌÅÍÅÎÔ mlist ÄÌÑ ÐÏÄÐÉÓÉ %s ÎÁ ÕÒÏ×ÎÅ %d (ÄÏÌÖÅÎ ÂÙÔØ MethodDefinition ÌÉÂÏ .Primitive, ÉÍÅÅÔ ËÌÁÓÓ %s)"
 
 msgid "bad method object stored in method table, class %s"
 msgstr "ÐÌÏÈÏÊ ÏÂßÅËÔ ÎÁÊÄÅÎ × ËÁÞÅÓÔ×Å ÍÅÔÏÄÁ (ËÌÁÓÓ %s)"
 
-msgid ""
-"invalid object in methods table (%s), expected a method, got an object of "
-"class %s"
-msgstr ""
-"ÎÅ×ÅÒÎÙÊ ÏÂßÅËÔ × ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ× (%s): ÏÖÉÄÁÌÓÑ ÍÅÔÏÄ, Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ "
-"ËÌÁÓÓÁ %s"
+msgid "invalid object in methods table (%s), expected a method, got an object of class %s"
+msgstr "ÎÅ×ÅÒÎÙÊ ÏÂßÅËÔ × ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ× (%s): ÏÖÉÄÁÌÓÑ ÍÅÔÏÄ, Á ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "invalid or unset methods table in generic function %s"
 msgstr "ÎÅ×ÅÒÎÁÑ ÉÌÉ ÎÅÕÓÔÁÎÏ×ÌÅÎÎÁÑ ÔÁÂÌÉÃÁ ÍÅÔÏÄÏ× × ÏÂÝÅÊ ÆÕÎËÃÉÉ %s"
@@ -1295,18 +872,11 @@
 msgid "trying to find a methods table in a non-generic function"
 msgstr "ÐÙÔÁÀÓØ ÎÁÊÔÉ ÔÁÂÌÉÃÕ ÍÅÔÏÄÏ× × ÎÅ-ÏÂÝÅÊ ÆÕÎËÃÉÉ"
 
-msgid ""
-"the \"ambiguousMethodSelection\" option should be a function to be called as "
-"the condition action; got an object of class %s"
-msgstr ""
-"ÏÐÃÉÑ \"ambiguousMethodSelection\" ÄÏÌÖÎÁ ÂÙÔØ ÆÕÎËÃÉÅÊ ÄÌÑ ×ÙÚÏ×Á × "
-"ËÁÞÅÓÔ×Å ÕÓÌÏ×ÎÏÇÏ ÓÏÂÙÔÉÑ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "the \"ambiguousMethodSelection\" option should be a function to be called as the condition action; got an object of class %s"
+msgstr "ÏÐÃÉÑ \"ambiguousMethodSelection\" ÄÏÌÖÎÁ ÂÙÔØ ÆÕÎËÃÉÅÊ ÄÌÑ ×ÙÚÏ×Á × ËÁÞÅÓÔ×Å ÕÓÌÏ×ÎÏÇÏ ÓÏÂÙÔÉÑ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"No simply inherited methods found for function %s; using non-simple method"
-msgstr ""
-"îÅ ÎÁÊÄÅÎÏ ÐÒÏÓÔÏ ÕÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s; ÉÓÐÏÌØÚÕÀ ÎÅÐÒÏÓÔÏÊ "
-"ÍÅÔÏÄ"
+msgid "No simply inherited methods found for function %s; using non-simple method"
+msgstr "îÅ ÎÁÊÄÅÎÏ ÐÒÏÓÔÏ ÕÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s; ÉÓÐÏÌØÚÕÀ ÎÅÐÒÏÓÔÏÊ ÍÅÔÏÄ"
 
 msgid ""
 "Note: method with signature %s chosen for function %s,\n"
@@ -1323,28 +893,17 @@
 msgid "failed to find expected group generic function:"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏÖÉÄÁÅÍÕÀ ÇÒÕÐÐÏ×ÕÀ ÏÂÝÕÀ ÆÕÎËÃÉÀ:"
 
-msgid ""
-"invalid group generic function in search for inherited method (class %s)"
-msgstr ""
-"ÎÅ×ÅÒÎÁÑ ÇÒÕÐÐÏ×ÁÑ ÏÂÝÁÑ ÆÕÎËÃÉÑ × ÐÏÉÓËÅ ÄÌÑ ÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ÍÅÔÏÄÁ (ËÌÁÓÓ "
-"%s)"
+msgid "invalid group generic function in search for inherited method (class %s)"
+msgstr "ÎÅ×ÅÒÎÁÑ ÇÒÕÐÐÏ×ÁÑ ÏÂÝÁÑ ÆÕÎËÃÉÑ × ÐÏÉÓËÅ ÄÌÑ ÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ÍÅÔÏÄÁ (ËÌÁÓÓ %s)"
 
 msgid "invalid methods table request"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÁÐÒÏÓ Ë ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ×"
 
-msgid ""
-"trying to check signature length of group generic '%s', but it is not a "
-"group generic"
-msgstr ""
-"ÐÙÔÁÀÓØ ÐÒÏ×ÅÒÉÔØ ÄÌÉÎÕ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÏÂÝÅÊ ÇÒÕÐÐÙ '%s', ÎÏ ÜÔÏ ÎÅ ÏÂÝÁÑ "
-"ÇÒÕÐÐÁ"
+msgid "trying to check signature length of group generic '%s', but it is not a group generic"
+msgstr "ÐÙÔÁÀÓØ ÐÒÏ×ÅÒÉÔØ ÄÌÉÎÕ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÏÂÝÅÊ ÇÒÕÐÐÙ '%s', ÎÏ ÜÔÏ ÎÅ ÏÂÝÁÑ ÇÒÕÐÐÁ"
 
-msgid ""
-"trying to check signature length of generic '%s', but it is not a generic "
-"function: i = %d, funs = %s, gnames = %s"
-msgstr ""
-"ÐÏÐÙÔËÁ ÐÒÏ×ÅÒÉÔØ ÄÌÉÎÕ ÐÏÄÐÉÓÉ ÏÂÝÅÊ '%s', ÎÏ ÜÔÏ ÎÅ ÏÂÝÁÑ ÆÕÎËÃÉÑ: i = %d, "
-"funs = %s, gnames = %s"
+msgid "trying to check signature length of generic '%s', but it is not a generic function: i = %d, funs = %s, gnames = %s"
+msgstr "ÐÏÐÙÔËÁ ÐÒÏ×ÅÒÉÔØ ÄÌÉÎÕ ÐÏÄÐÉÓÉ ÏÂÝÅÊ '%s', ÎÏ ÜÔÏ ÎÅ ÏÂÝÁÑ ÆÕÎËÃÉÑ: i = %d, funs = %s, gnames = %s"
 
 msgid "no methods table for generic %s from package %s in package %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÁÂÌÉÃÕ ÍÅÔÏÄÏ× ÄÌÑ ÏÂÝÅÇÏ %s ÉÚ ÐÁËÅÔÁ %s × ÐÁËÅÔÅ %s"
@@ -1352,34 +911,20 @@
 msgid "undefined classes (%s) will be ignored for argument '%s'"
 msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÅ ËÌÁÓÓÙ (%s) ÂÕÄÕÔ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s'"
 
-msgid ""
-"argument 'signatures' must be a character matrix whose rows are method "
-"signatures"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'signatures' ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌØÎÏÊ ÍÁÔÒÉÃÅÊ, ÞØÉ ÓÔÒÏËÉ -- ÐÏÄÐÉÓÉ "
-"ÍÅÔÏÄÁ"
+msgid "argument 'signatures' must be a character matrix whose rows are method signatures"
+msgstr "ÁÒÇÕÍÅÎÔ 'signatures' ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌØÎÏÊ ÍÁÔÒÉÃÅÊ, ÞØÉ ÓÔÒÏËÉ -- ÐÏÄÐÉÓÉ ÍÅÔÏÄÁ"
 
 msgid "not allowed to have test==TRUE and an S4Class definition"
 msgstr "ÎÅ ÒÁÚÒÅÛÁÅÔÓÑ ÉÍÅÔØ test==TRUE É S4Class-ÏÐÒÅÄÅÌÅÎÉÅ"
 
-msgid ""
-"argument 'S4Class' must be a class definition: got an object of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'S4Class' ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ: ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "argument 'S4Class' must be a class definition: got an object of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ 'S4Class' ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ: ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"inconsistent old-style class information for %s; the class is defined but "
-"does not extend %s and is not valid as the data part"
-msgstr ""
-"ÐÒÏÔÉ×ÏÒÅÞÉ×ÁÑ, × ÓÔÁÒÏÍ ÓÔÉÌÅ ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ %s; ËÌÁÓÓ ÏÐÒÅÄÅÌÅÎ, ÎÏ ÎÅ "
-"ÒÁÓÛÉÒÑÅÔ %s É ÎÅÐÒÁ×ÉÌÅÎ ËÁË ÞÁÓÔØ ÄÁÎÎÙÈ"
+msgid "inconsistent old-style class information for %s; the class is defined but does not extend %s and is not valid as the data part"
+msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÁÑ, × ÓÔÁÒÏÍ ÓÔÉÌÅ ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ %s; ËÌÁÓÓ ÏÐÒÅÄÅÌÅÎ, ÎÏ ÎÅ ÒÁÓÛÉÒÑÅÔ %s É ÎÅÐÒÁ×ÉÌÅÎ ËÁË ÞÁÓÔØ ÄÁÎÎÙÈ"
 
-msgid ""
-"the S3 class of the prototype, \"%s\", is undefined; only allowed when this "
-"is the S3 class being registered (\"%s\")"
-msgstr ""
-"S3-ËÌÁÓÓ ÐÒÏÔÏÔÉÐÁ, \"%s\", ÎÅ ÏÐÒÅÄÅÌÅÎ; ÔÁËÏÅ ÒÁÚÒÅÛÁÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÜÔÏ "
-"S3-ËÌÁÓÓ × ÐÒÏÃÅÓÓÅ ÒÅÇÉÓÔÒÁÃÉÉ (\"%s\")"
+msgid "the S3 class of the prototype, \"%s\", is undefined; only allowed when this is the S3 class being registered (\"%s\")"
+msgstr "S3-ËÌÁÓÓ ÐÒÏÔÏÔÉÐÁ, \"%s\", ÎÅ ÏÐÒÅÄÅÌÅÎ; ÔÁËÏÅ ÒÁÚÒÅÛÁÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÜÔÏ S3-ËÌÁÓÓ × ÐÒÏÃÅÓÓÅ ÒÅÇÉÓÔÒÁÃÉÉ (\"%s\")"
 
 msgid "restoring definition of class %s"
 msgstr "×ÏÓÓÔÁÎÁ×ÌÉ×ÁÀ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ %s"
@@ -1387,50 +932,26 @@
 msgid "slot %s: class %s should extend class %s"
 msgstr "ÐÏÚÉÃÉÑ %s: ËÌÁÓÓ %s ÄÏÌÖÅÎ ÒÁÓÛÉÒÉÔØ ËÌÁÓÓ %s"
 
-msgid ""
-"invalid S4 class corresponding to S3 class: slots in  S4 version must extend "
-"corresponding slots in S3 version: fails for %s"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ S4 ËÌÁÓÓ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ S3 ËÌÁÓÓÕ: ÓÌÏÔÙ × S4 ×ÅÒÓÉÉ ÄÏÌÖÎÙ "
-"ÒÁÓÛÉÒÑÔØ ÓÏÏÔ×ÅÔÓÔ×ÓÕÀÝÉÅ ÓÌÏÔÙ × S3 ×ÅÒÓÉÉ: ÎÅ ÕÄÁÅÔÓÑ ÄÌÑ %s"
+msgid "invalid S4 class corresponding to S3 class: slots in  S4 version must extend corresponding slots in S3 version: fails for %s"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ S4 ËÌÁÓÓ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ S3 ËÌÁÓÓÕ: ÓÌÏÔÙ × S4 ×ÅÒÓÉÉ ÄÏÌÖÎÙ ÒÁÓÛÉÒÑÔØ ÓÏÏÔ×ÅÔÓÔ×ÓÕÀÝÉÅ ÓÌÏÔÙ × S3 ×ÅÒÓÉÉ: ÎÅ ÕÄÁÅÔÓÑ ÄÌÑ %s"
 
 msgid "explicit coercion of old-style class (%s) is not defined"
 msgstr "ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÞÅÔËÏÇÏ ÐÒÉ×ÅÄÅÎÉÑ ÄÌÑ ÕÓÔÁÒÅ×ÛÅÇÏ ËÌÁÓÓÁ (%s)"
 
-msgid ""
-"explicit replacement not defined for as(x, \"%s\") <- value for old-style "
-"class %s"
-msgstr ""
-"ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÞÅÔËÏÊ ÚÁÍÅÎÙ ÄÌÑ as(x, \"%s\") <- value ÄÌÑ ÕÓÔÁÒÅ×ÛÅÇÏ "
-"ËÌÁÓÓÁ %s"
+msgid "explicit replacement not defined for as(x, \"%s\") <- value for old-style class %s"
+msgstr "ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÞÅÔËÏÊ ÚÁÍÅÎÙ ÄÌÑ as(x, \"%s\") <- value ÄÌÑ ÕÓÔÁÒÅ×ÛÅÇÏ ËÌÁÓÓÁ %s"
 
-msgid ""
-"argument 'Classes' must be a vector of two classes; got an argument of "
-"length %d"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'Classes' ÄÏÌÖÅÎ ÂÙÔØ ×ÅËÔÏÒÏÍ Ä×ÕÈ ËÌÁÓÓÏ×; ÐÏÌÕÞÅÎ ÁÒÇÕÍÅÎÔ ÄÌÉÎÙ "
-"%d"
+msgid "argument 'Classes' must be a vector of two classes; got an argument of length %d"
+msgstr "ÁÒÇÕÍÅÎÔ 'Classes' ÄÏÌÖÅÎ ÂÙÔØ ×ÅËÔÏÒÏÍ Ä×ÕÈ ËÌÁÓÓÏ×; ÐÏÌÕÞÅÎ ÁÒÇÕÍÅÎÔ ÄÌÉÎÙ %d"
 
-msgid ""
-"inconsistent old-style class information for %s (maybe mixing old and new "
-"classes?)"
-msgstr ""
-"ÐÒÏÔÉ×ÏÒÅÞÉ×ÁÑ, × ÓÔÁÒÏÍ ÓÔÉÌÅ ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ ËÌÁÓÓÁ %s (×ÏÚÍÏÖÎÏ ÉÍÅÅÔ "
-"ÍÅÓÔÏ ÓÍÅÛÅÎÉÅ ÓÔÁÒÙÈ É ÎÏ×ÙÈ ËÌÁÓÓÏ×?)"
+msgid "inconsistent old-style class information for %s (maybe mixing old and new classes?)"
+msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÁÑ, × ÓÔÁÒÏÍ ÓÔÉÌÅ ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ ËÌÁÓÓÁ %s (×ÏÚÍÏÖÎÏ ÉÍÅÅÔ ÍÅÓÔÏ ÓÍÅÛÅÎÉÅ ÓÔÁÒÙÈ É ÎÏ×ÙÈ ËÌÁÓÓÏ×?)"
 
-msgid ""
-"'S3Class' only defined for extensions of %s or classes with a data part:  "
-"not true of class %s"
-msgstr ""
-"'S3Class' ÏÐÒÅÄÅÌÅÎ ÔÏÌØËÏ ÄÌÑ ÒÁÓÛÉÒÅÎÉÊ %s ÉÌÉ ËÌÁÓÓÏ× Ó ÞÁÓÔÑÍÉ-ÄÁÎÎÙÍÉ: "
-"ÜÔÏ ÎÅ ÔÁË Õ ËÌÁÓÓÁ %s"
+msgid "'S3Class' only defined for extensions of %s or classes with a data part:  not true of class %s"
+msgstr "'S3Class' ÏÐÒÅÄÅÌÅÎ ÔÏÌØËÏ ÄÌÑ ÒÁÓÛÉÒÅÎÉÊ %s ÉÌÉ ËÌÁÓÓÏ× Ó ÞÁÓÔÑÍÉ-ÄÁÎÎÙÍÉ: ÜÔÏ ÎÅ ÔÁË Õ ËÌÁÓÓÁ %s"
 
-msgid ""
-"'S3Class' can only assign to S4 objects that extend \"oldClass\"; not true "
-"of class %s"
-msgstr ""
-"'S3Class' ÍÏÖÅÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎ ÔÏÌØËÏ ÄÌÑ ÔÁËÉÈ S4-ÏÂßÅËÔÏ×, ËÏÔÏÒÙÅ "
-"ÒÁÓÛÉÒÑÀÔ \"oldClass\"; ÜÔÏ ÎÅ ÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
+msgid "'S3Class' can only assign to S4 objects that extend \"oldClass\"; not true of class %s"
+msgstr "'S3Class' ÍÏÖÅÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎ ÔÏÌØËÏ ÄÌÑ ÔÁËÉÈ S4-ÏÂßÅËÔÏ×, ËÏÔÏÒÙÅ ÒÁÓÛÉÒÑÀÔ \"oldClass\"; ÜÔÏ ÎÅ ÔÁË ÄÌÑ ËÌÁÓÓÁ %s"
 
 msgid "Created a package name, %s, when none found"
 msgstr "óÏÚÄÁÎÏ ÉÍÑ ÐÁËÅÔÁ, %s, × ÔÏ ×ÒÅÍÑ ËÁË ÎÉ ÏÄÎÏÇÏ ÎÅ ÎÁÊÄÅÎÏ"
@@ -1442,15 +963,10 @@
 msgstr "ÎÁÊÄÅÎÏ ÎÅÓËÏÌØËÏ ÏÐÒÅÄÅÌÅÎÉÊ %s; ÉÓÐÏÌØÚÕÀ ÏÄÎÏ ÉÚ %s"
 
 msgid "%s is not a valid field or method name for reference class %s"
-msgstr ""
-"ÐÏÌÅ \"%s\" -- ÎÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ ÉÌÉ ÉÍÑ ÍÅÔÏÄÁ ÄÌÑ ÓÓÙÌÏÞÎÏÇÏ ËÌÁÓÓÁ %s"
+msgstr "ÐÏÌÅ \"%s\" -- ÎÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ ÉÌÉ ÉÍÑ ÍÅÔÏÄÁ ÄÌÑ ÓÓÙÌÏÞÎÏÇÏ ËÌÁÓÓÁ %s"
 
-msgid ""
-"a call to superClass() is in the method %s but there is no superclass "
-"definition of this method for class %s"
-msgstr ""
-"×ÙÚÏ× superClass() ÅÓÔØ × ÍÅÔÏÄÅ %s, ÎÏ ÔÁÍ ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÓÕÐÅÒËÌÁÓÓÁÜÔÏÇÏ "
-"ÍÅÔÏÄÁ ÄÌÑ ËÌÁÓÓÁ %s"
+msgid "a call to superClass() is in the method %s but there is no superclass definition of this method for class %s"
+msgstr "×ÙÚÏ× superClass() ÅÓÔØ × ÍÅÔÏÄÅ %s, ÎÏ ÔÁÍ ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÓÕÐÅÒËÌÁÓÓÁÜÔÏÇÏ ÍÅÔÏÄÁ ÄÌÑ ËÌÁÓÓÁ %s"
 
 msgid "methods declared in usingMethods() but not found: %s"
 msgstr "ÍÅÔÏÄÙ ÏÂßÑ×ÌÅÎÙ × usingMethods(), ÎÏ ÎÅ ÎÁÊÄÅÎÙ: %s"
@@ -1461,19 +977,13 @@
 msgid "%s is not a field in class %s"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÌÅÍ ËÌÁÓÓÁ %s"
 
-msgid ""
-"unnamed arguments to $new() must be objects from a reference class; got an "
-"object of class %s"
-msgstr ""
-"ÎÅÐÏÉÍÅÎÏ×ÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ $new() ÄÏÌÖÎÙ ÂÙÔØ ÏÂßÅËÔÁÍÉ ÓÓÙÌÏÞÎÏÇÏ ËÌÁÓÓÁ; "
-"ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "unnamed arguments to $new() must be objects from a reference class; got an object of class %s"
+msgstr "ÎÅÐÏÉÍÅÎÏ×ÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ $new() ÄÏÌÖÎÙ ÂÙÔØ ÏÂßÅËÔÁÍÉ ÓÓÙÌÏÞÎÏÇÏ ËÌÁÓÓÁ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "%s is not a valid field or method name for this class"
 msgstr "ÐÏÌÅ %s -- ÎÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ ÉÌÉ ÉÍÑ ÍÅÔÏÄÁ ÄÌÑ ÜÔÏÇÏ ËÌÁÓÓÁ"
 
-msgid ""
-"the class of field %s in the object is not compatible with the desired class "
-"%s in the target"
+msgid "the class of field %s in the object is not compatible with the desired class %s in the target"
 msgstr "ËÌÁÓÓ ÉÌÉ ÐÏÌÅ %s ÏÂßÅËÔÁ ÎÅÓÏ×ÍÅÓÔÉÍÏ Ó ÖÅÌÁÅÍÙÍ ËÌÁÓÓÏÍ %s ÃÅÌÉ"
 
 msgid "%s is not a defined class in this environment"
@@ -1485,26 +995,17 @@
 msgid "%s is not one of the reference super classes for this object"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÄÎÏÊ ÉÚ ÓÓÙÌÏË ÓÕÐÅÒËÌÁÓÓÁ ÎÁ ÜÔÏÔ ÏÂßÅËÔ"
 
-msgid ""
-"direct calls to callSuper() are invalid:  should only be called from another "
-"method"
-msgstr ""
-"ÐÒÑÍÙÅ ×ÙÚÏ×Ù callSuper() ÎÅÐÒÁ×ÉÌØÎÙ:  ÍÏÖÎÏ ×ÙÚÙ×ÁÔØ ÔÏÌØËÏ ÉÚ ÄÒÕÇÏÇÏ "
-"ÍÅÔÏÄÁ"
+msgid "direct calls to callSuper() are invalid:  should only be called from another method"
+msgstr "ÐÒÑÍÙÅ ×ÙÚÏ×Ù callSuper() ÎÅÐÒÁ×ÉÌØÎÙ:  ÍÏÖÎÏ ×ÙÚÙ×ÁÔØ ÔÏÌØËÏ ÉÚ ÄÒÕÇÏÇÏ ÍÅÔÏÄÁ"
 
 msgid "%s is not a field in this class"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÌÅÍ × ÜÔÏÍ ËÌÁÓÓÅ"
 
-msgid ""
-"the definition of class %s in package %s is locked, methods may not be "
-"redefined"
-msgstr ""
-"ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ %s × ÐÁËÅÔÅ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ, ÍÅÔÏÄÙ ÎÅÌØÚÑ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ"
+msgid "the definition of class %s in package %s is locked, methods may not be redefined"
+msgstr "ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ %s × ÐÁËÅÔÅ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ, ÍÅÔÏÄÙ ÎÅÌØÚÑ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ"
 
 msgid "arguments to methods() must be named, or one named list"
-msgstr ""
-"ÁÒÇÕÍÅÎÔÙ × methods() ÄÏÌÖÎÙ ÂÙÔØ ÐÏÉÍÅÎÏ×ÁÎÙ, ÉÌÉ ÄÁ×ÁÊÔÅ ÏÄÉÎ ÉÍÅÎÏ×ÁÎÎÙÊ "
-"ÓÐÉÓÏË"
+msgstr "ÁÒÇÕÍÅÎÔÙ × methods() ÄÏÌÖÎÙ ÂÙÔØ ÐÏÉÍÅÎÏ×ÁÎÙ, ÉÌÉ ÄÁ×ÁÊÔÅ ÏÄÉÎ ÉÍÅÎÏ×ÁÎÎÙÊ ÓÐÉÓÏË"
 
 msgid ""
 "topic %s is not a method name in class %s\n"
@@ -1513,70 +1014,41 @@
 "ÔÏÐÉË %s ÎÅ Ñ×ÌÑÅÔÓÑ ÉÍÅÎÅÍ ÍÅÔÏÄÁ × ËÌÁÓÓÅ %s\n"
 "ïÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ ÎÉÖÅ"
 
-msgid ""
-"the definition of class %s in package %s is locked so fields may not be "
-"modified"
-msgstr ""
-"ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ %s × ÐÁËÅÔÅ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ, ÔÁË ÞÔÏ ÐÏÌÑ ÉÚÍÅÎÉÔØ ÎÅÌØÚÑ"
+msgid "the definition of class %s in package %s is locked so fields may not be modified"
+msgstr "ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ %s × ÐÁËÅÔÅ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ, ÔÁË ÞÔÏ ÐÏÌÑ ÉÚÍÅÎÉÔØ ÎÅÌØÚÑ"
 
-msgid ""
-"the overriding class (\"%s\") of field %s is not a subclass of the existing "
-"field definition (\"%s\")"
-msgstr ""
-"ÐÅÒÅÐÉÓÙ×ÁÎÉÅ class(\"%s\") ÉÌÉ ÐÏÌÑ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄËÌÁÓÓÏÍ × ÔÅËÕÝÅÍ "
-"ÏÐÒÅÄÅÌÅÎÉÉ ÐÏÌÑ (\"%s\")"
+msgid "the overriding class (\"%s\") of field %s is not a subclass of the existing field definition (\"%s\")"
+msgstr "ÐÅÒÅÐÉÓÙ×ÁÎÉÅ class(\"%s\") ÉÌÉ ÐÏÌÑ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄËÌÁÓÓÏÍ × ÔÅËÕÝÅÍ ÏÐÒÅÄÅÌÅÎÉÉ ÐÏÌÑ (\"%s\")"
 
-msgid ""
-"invalid assignment for reference class field %s, should be from class %s or "
-"a subclass (was class %s)"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÁÑ ÚÁÍÅÎÁ ÄÌÑ ÐÏÌÑ ËÌÁÓÓÁ %s, ÄÏÌÖÎÁ ÂÙÔØ ÉÚ ËÌÁÓÓÁ %s ÉÌÉ "
-"ÐÏÄËÌÁÓÓÁ (ÂÙÌ ËÌÁÓÓ %s)"
+msgid "invalid assignment for reference class field %s, should be from class %s or a subclass (was class %s)"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÚÁÍÅÎÁ ÄÌÑ ÐÏÌÑ ËÌÁÓÓÁ %s, ÄÏÌÖÎÁ ÂÙÔØ ÉÚ ËÌÁÓÓÁ %s ÉÌÉ ÐÏÄËÌÁÓÓÁ (ÂÙÌ ËÌÁÓÓ %s)"
 
 msgid "invalid replacement: reference class field %s is read-only"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÚÁÍÅÎÁ: ÐÏÌÅ ÓÓÙÌÏÞÎÏÇÏ ËÌÁÓÓÁ %s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-msgid ""
-"the 'contains' argument should be the names of superclasses:  got an element "
-"of class %s"
-msgstr ""
-"ÁÒÇÕÍÅÎÔ 'contains' ÄÏÌÖÅÎ ÂÙÔØ ÉÍÅÎÁÍÉ ÓÕÐÅÒËÌÁÓÓÏ×: ÐÏÌÕÞÅÎ ÜÌÅÍÅÎÔ ËÌÁÓÓÁ "
-"%s"
+msgid "the 'contains' argument should be the names of superclasses:  got an element of class %s"
+msgstr "ÁÒÇÕÍÅÎÔ 'contains' ÄÏÌÖÅÎ ÂÙÔØ ÉÍÅÎÁÍÉ ÓÕÐÅÒËÌÁÓÓÏ×: ÐÏÌÕÞÅÎ ÜÌÅÍÅÎÔ ËÌÁÓÓÁ %s"
 
 msgid "no definition found for inherited class: %s"
 msgstr "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ ÕÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ËÌÁÓÓÁ: %s"
 
-msgid ""
-"a single class name is needed for field %s, got a character vector of length "
-"%d"
+msgid "a single class name is needed for field %s, got a character vector of length %d"
 msgstr "ÎÕÖÎÏ ÏÄÎÏ ÉÍÑ ËÌÁÓÓÁ ÄÌÑ ÐÏÌÑ %s, Á ÐÏÓÔÕÐÉÌ ÔÅËÓÔÏ×ÙÊ ×ÅËÔÏÒ %d"
 
 msgid "class %s for field %s is not defined"
 msgstr "ËÌÁÓÓ %s ÄÌÑ ÐÏÌÑ %s ÎÅ ÏÐÒÅÄÅÌÅÎ"
 
-msgid ""
-"field %s was supplied as an object of class %s; must be a class name or a "
-"binding function"
-msgstr ""
-"ÐÏÌÅ %s ÐÒÅÄÌÏÖÅÎÏ ËÁË ÏÂßÅËÔ ËÌÁÓÓÁ %s; Á ÄÏÌÖÎÏ ÂÙÔØ ÉÍÅÎÅÍ ËÌÁÓÓÁ ÉÌÉ "
-"ÆÕÎËÃÉÅÊ ÐÒÉ×ÑÚËÉ"
+msgid "field %s was supplied as an object of class %s; must be a class name or a binding function"
+msgstr "ÐÏÌÅ %s ÐÒÅÄÌÏÖÅÎÏ ËÁË ÏÂßÅËÔ ËÌÁÓÓÁ %s; Á ÄÏÌÖÎÏ ÂÙÔØ ÉÍÅÎÅÍ ËÌÁÓÓÁ ÉÌÉ ÆÕÎËÃÉÅÊ ÐÒÉ×ÑÚËÉ"
 
-msgid ""
-"code for methods in class %s was not checked for suspicious field "
-"assignments (recommended package %s not available?)"
-msgstr ""
-"ËÏÄ ÍÅÔÏÄÏ× × ËÌÁÓÓÅ %s ÎÅ ÂÙÌ ÐÒÏ×ÅÒÅÎ ÎÁ ÐÏÄÏÚÒÉÔÅÌØÎÙÅ ÎÁÚÎÁÞÅÎÉÑ ÐÏÌÅÊ "
-"(ÒÅËÏÍÍÅÎÄÕÅÍÙÊ ÐÁËÅÔ %s ÎÅ ÄÏÓÔÕÐÅÎ?)"
+msgid "code for methods in class %s was not checked for suspicious field assignments (recommended package %s not available?)"
+msgstr "ËÏÄ ÍÅÔÏÄÏ× × ËÌÁÓÓÅ %s ÎÅ ÂÙÌ ÐÒÏ×ÅÒÅÎ ÎÁ ÐÏÄÏÚÒÉÔÅÌØÎÙÅ ÎÁÚÎÁÞÅÎÉÑ ÐÏÌÅÊ (ÒÅËÏÍÍÅÎÄÕÅÍÙÊ ÐÁËÅÔ %s ÎÅ ÄÏÓÔÕÐÅÎ?)"
 
 msgid "class %s is defined but is not a reference class"
 msgstr "ËÌÁÓÓ %s ÎÅ  ÏÐÒÅÄÅÌÅÎ ËÁË ÓÓÙÌÏÞÎÙÊ ËÌÁÓÓ"
 
-msgid ""
-"class must be a reference class representation or a character string; got an "
-"object of class %s"
-msgstr ""
-"ËÌÁÓÓ ÄÏÌÖÅÎ ÂÙÔØ ÓÓÙÌÏÞÎÙÍ ÐÒÅÄÓÔÁ×ÌÅÎÉÅÍ ËÌÁÓÓÁ ÉÌÉ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; "
-"ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "class must be a reference class representation or a character string; got an object of class %s"
+msgstr "ËÌÁÓÓ ÄÏÌÖÅÎ ÂÙÔØ ÓÓÙÌÏÞÎÙÍ ÐÒÅÄÓÔÁ×ÌÅÎÉÅÍ ËÌÁÓÓÁ ÉÌÉ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "not a reference class: %s"
 msgstr "ÎÅ ÓÓÙÌÏÞÎÙÊ ËÌÁÓÓ: %s"
@@ -1615,36 +1087,22 @@
 msgstr "ÐÏÌÅ %s ÕÖÅ ÚÁÂÌÏËÉÒÏ×ÁÎÏ"
 
 msgid "field %s of class %s has a non-default binding and cannot be locked"
-msgstr ""
-"ÐÏÌÅ %s  ËÌÁÓÓÁ %s ÉÍÅÅÔ ÐÒÉÓÏÅÄÉÎÅÎÉÅ ÎÅ ÐÏ ÕÍÏÌÞÁÎÉÀ É ÎÅ ÍÏÖÅÔ ÂÙÔØ "
-"ÚÁÂÌÏËÉÒÏ×ÁÎÏ"
+msgstr "ÐÏÌÅ %s  ËÌÁÓÓÁ %s ÉÍÅÅÔ ÐÒÉÓÏÅÄÉÎÅÎÉÅ ÎÅ ÐÏ ÕÍÏÌÞÁÎÉÀ É ÎÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÂÌÏËÉÒÏ×ÁÎÏ"
 
-msgid ""
-"Class %s is not a subclass of %s; functional semantics not defined for this "
-"class"
-msgstr ""
-"ëÌÁÓÓ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄËÌÁÓÓÏÍ %s; ÆÕÎËÃÉÏÎÁÌØÎÁÑ ÓÅÍÁÎÔÉËÁ × ÜÔÏÍ ËÌÁÓÓÅ "
-"ÎÅ ÏÐÒÅÄÅÌÅÎÁ"
+msgid "Class %s is not a subclass of %s; functional semantics not defined for this class"
+msgstr "ëÌÁÓÓ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄËÌÁÓÓÏÍ %s; ÆÕÎËÃÉÏÎÁÌØÎÁÑ ÓÅÍÁÎÔÉËÁ × ÜÔÏÍ ËÌÁÓÓÅ ÎÅ ÏÐÒÅÄÅÌÅÎÁ"
 
 msgid "Could not find local object in supplied environment"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÌÏËÁÌØÎÙÊ ÏÂßÅËÔ × ÐÒÅÄÓÔÁ×ÌÅÎÎÏÍ ÏËÒÕÖÅÎÉÉ"
 
-msgid ""
-"invalid 'ignore' argument; should be a class definition or a character "
-"vector, got an object of class %s"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ 'ignore' argument; ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÅÍ ËÌÁÓÓÁ ÉÌÉ ÔÅËÓÔÏ×ÏÊ "
-"ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "invalid 'ignore' argument; should be a class definition or a character vector, got an object of class %s"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ 'ignore' argument; ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÅÍ ËÌÁÓÓÁ ÉÌÉ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "An object of class %s"
 msgstr "ïÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"invalid call to 'classLabel': expected a name or a class definition, got an "
-"object of class %s"
-msgstr ""
-"ÎÅ×ÅÒÎÙÊ ×ÙÚÏ× 'classLabel': ÏÖÉÄÁÌÏÓØ ÉÍÑ ÌÉÂÏ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ, ÐÏÌÕÞÅÎ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "invalid call to 'classLabel': expected a name or a class definition, got an object of class %s"
+msgstr "ÎÅ×ÅÒÎÙÊ ×ÙÚÏ× 'classLabel': ÏÖÉÄÁÌÏÓØ ÉÍÑ ÌÉÂÏ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁÓÓÁ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "argument 'signature' is not meaningful for tracing reference methods"
 msgstr "ÁÒÇÕÍÅÎÔ 'signature' ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ ×ÙÑÓÎÅÎÉÑ ÍÅÔÏÄÏ× ÓÓÙÌËÉ"
@@ -1662,59 +1120,37 @@
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÏÐÒÅÄÅÌÅÎÉÅ ÆÕÎËÃÉÉ ÄÌÑ %s"
 
 msgid "cannot untrace method for %s; no method defined for this signature: %s"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÄÅÔÒÁÓÓÉÒÏ×ÁÔØ ÍÅÔÏÄ ÄÌÑ %s; ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÍÅÔÏÄÁ ÄÌÑ ÄÁÎÎÏÊ "
-"ÐÏÄÐÉÓÉ: %s"
+msgstr "ÎÅ ÍÏÇÕ ÄÅÔÒÁÓÓÉÒÏ×ÁÔØ ÍÅÔÏÄ ÄÌÑ %s; ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÍÅÔÏÄÁ ÄÌÑ ÄÁÎÎÏÊ ÐÏÄÐÉÓÉ: %s"
 
 msgid "the method for %s for this signature was not being traced"
 msgstr "ÄÁÎÎÙÊ ÍÅÔÏÄ ÄÌÑ %s ÄÌÑ ÄÁÎÎÏÊ ÐÏÄÐÉÓÉ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÔÓÌÅÖÅÎ"
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
-msgstr ""
-"ÓÏÚÄÁÀ ÏÔÓÌÅÖÉ×ÁÅÍÕÀ ×ÅÒÓÉÀ ÐÒÉÍÉÔÉ×Á; ÁÒÇÕÍÅÎÔÙ ÂÕÄÕÔ ÏÂÒÁÂÏÔÁÎÙ ËÁË  '...'"
+msgid "making a traced version of a primitive; arguments will be treated as '...'"
+msgstr "ÓÏÚÄÁÀ ÏÔÓÌÅÖÉ×ÁÅÍÕÀ ×ÅÒÓÉÀ ÐÒÉÍÉÔÉ×Á; ÁÒÇÕÍÅÎÔÙ ÂÕÄÕÔ ÏÂÒÁÂÏÔÁÎÙ ËÁË  '...'"
 
-msgid ""
-"the editing in trace() can only change the body of the function; got an "
-"object of class %s"
-msgstr ""
-"ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ × trace() ÍÏÖÅÔ ÍÅÎÑÔØ ÔÏÌØËÏ ÔÅÌÏ ÆÕÎËÃÉÉ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ "
-"ËÌÁÓÓÁ %s"
+msgid "the editing in trace() can only change the body of the function; got an object of class %s"
+msgstr "ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ × trace() ÍÏÖÅÔ ÍÅÎÑÔØ ÔÏÌØËÏ ÔÅÌÏ ÆÕÎËÃÉÉ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
-msgid ""
-"the editing in trace() can only change the body of the function, not the "
-"arguments or defaults"
-msgstr ""
-"ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ × trace() ÍÏÖÅÔ ÍÅÎÑÔØ ÔÏÌØËÏ ÔÅÌÏ ÆÕÎËÃÉÉ, Á ÎÅ ÁÒÇÕÍÅÎÔÙ "
-"ÉÌÉ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgid "the editing in trace() can only change the body of the function, not the arguments or defaults"
+msgstr "ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ × trace() ÍÏÖÅÔ ÍÅÎÑÔØ ÔÏÌØËÏ ÔÅÌÏ ÆÕÎËÃÉÉ, Á ÎÅ ÁÒÇÕÍÅÎÔÙ ÉÌÉ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
 msgid "cannot use 'at' argument without a trace expression"
 msgstr "ÎÅ ÍÏÇÕ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÒÇÕÍÅÎÔ 'at' ÂÅÚ ÏÔÓÌÅÖÉ×ÁÅÍÏÇÏ ×ÙÒÁÖÅÎÉÑ"
 
-msgid ""
-"cannot use 'at' argument unless the function body has the form '{ ... }'"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÒÇÕÍÅÎÔ 'at' ÐÏËÁ ÔÅÌÏ ÆÕÎËÃÉÉ ÉÍÅÅÔ ÆÏÒÍÕ '{ ... }'"
+msgid "cannot use 'at' argument unless the function body has the form '{ ... }'"
+msgstr "ÎÅ ÍÏÇÕ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÒÇÕÍÅÎÔ 'at' ÐÏËÁ ÔÅÌÏ ÆÕÎËÃÉÉ ÉÍÅÅÔ ÆÏÒÍÕ '{ ... }'"
 
 msgid "assigning over the binding of symbol %s in environment/package %s"
 msgstr "ÐÒÉÓ×ÏÅÎÉÅ ÞÅÒÅÚ Ó×ÑÚØ ÓÉÍ×ÏÌÁ %s × ÏËÒÕÖÅÎÉÉ/ÐÁËÅÔÅ %s"
 
-msgid ""
-"setting a method over the binding of symbol %s in environment/package %s"
+msgid "setting a method over the binding of symbol %s in environment/package %s"
 msgstr "ÕÓÔÁÎÏ×ËÁ ÍÅÔÏÄÁ ÞÅÒÅÚ Ó×ÑÚÙ×ÁÎÉÅ ÓÉÍ×ÏÌÁ %s × ÏËÒÕÖÅÎÉÉ/ÐÁËÅÔÅ %s"
 
-msgid ""
-"Environment of class %s is locked; using global environment for new class"
-msgstr ""
-"ïËÒÕÖÅÎÉÅ ËÌÁÓÓÁ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ; ÉÓÐÏÌØÚÕÀ ÇÌÏÂÁÌØÎÏÅ ÏËÒÕÖÅÎÉÅ ÄÌÑ ÎÏ×ÏÇÏ "
-"ËÌÁÓÓÁ"
+msgid "Environment of class %s is locked; using global environment for new class"
+msgstr "ïËÒÕÖÅÎÉÅ ËÌÁÓÓÁ %s ÚÁÂÌÏËÉÒÏ×ÁÎÏ; ÉÓÐÏÌØÚÕÀ ÇÌÏÂÁÌØÎÏÅ ÏËÒÕÖÅÎÉÅ ÄÌÑ ÎÏ×ÏÇÏ ËÌÁÓÓÁ"
 
-msgid ""
-"none of the objects in the source code could be found:  need to attach or "
-"specify the package"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÉ ÏÄÎÏÇÏ ÏÂßÅËÔÁ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ: ÎÕÖÎÏ ÐÒÉÌÏÖÉÔØ ÉÌÉ ÕËÁÚÁÔØ "
-"ÐÁËÅÔ"
+msgid "none of the objects in the source code could be found:  need to attach or specify the package"
+msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÉ ÏÄÎÏÇÏ ÏÂßÅËÔÁ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ: ÎÕÖÎÏ ÐÒÉÌÏÖÉÔØ ÉÌÉ ÕËÁÚÁÔØ ÐÁËÅÔ"
 
 msgid "objects found in multiple packages: using %s and ignoring %s"
 msgstr "ÏÂßÅËÔÙ ÎÁÊÄÅÎÙ ×Ï ÍÎÏÇÉÈ ÐÁËÅÔÁÈ: ÉÓÐÏÌØÚÕÀ %s É ÐÒÏÐÕÓËÁÀ %s"
@@ -1722,34 +1158,23 @@
 msgid "package %s is not attached and no namespace found for it"
 msgstr "ÐÁËÅÔ %s ÎÅ ÐÒÉÓÏÅÄÉÎÅÎ É ÅÇÏ ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ ÎÅ ÎÁÊÄÅÎÏ"
 
-msgid ""
-"invalid 'source' argument: expected file names or a connection but got an "
-"object of class %s"
-msgstr ""
-"ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÓÈÏÄÎÙÊ ÁÒÇÕÍÅÎÔ: ÖÄÁÌ ÉÍÅÎÉ ÆÁÊÌÏ× ÉÌÉ ÓÏÅÄÉÎÅÎÉÑ, Á ÐÏÌÕÞÉÌ "
-"ÏÂßÅËÔ ËÌÁÓÓÁ %s"
+msgid "invalid 'source' argument: expected file names or a connection but got an object of class %s"
+msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÓÈÏÄÎÙÊ ÁÒÇÕÍÅÎÔ: ÖÄÁÌ ÉÍÅÎÉ ÆÁÊÌÏ× ÉÌÉ ÓÏÅÄÉÎÅÎÉÑ, Á ÐÏÌÕÞÉÌ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
 
 msgid "cannot find an environment corresponding to package name '%s\""
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏËÒÕÖÅÎÉÅ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÉÍÅÎÉ ÐÁËÅÔÁ '%s\""
 
 msgid "supplied package, %s, differs from package inferred from source, %s"
-msgstr ""
-"ÐÒÅÄÌÏÖÅÎÎÙÊ ÐÁËÅÔ, %s, ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÐÁËÅÔÁ, ÎÁÊÄÅÎÎÏÇÏ × ÉÓÈÏÄÎÉËÁÈ, %s"
+msgstr "ÐÒÅÄÌÏÖÅÎÎÙÊ ÐÁËÅÔ, %s, ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÐÁËÅÔÁ, ÎÁÊÄÅÎÎÏÇÏ × ÉÓÈÏÄÎÉËÁÈ, %s"
 
 msgid "cannot insert these (not found in source): %s"
 msgstr "ÎÅ ÍÏÇÕ ×ÓÔÁ×ÉÔØ ÜÔÏ (× ÉÓÈÏÄÎÉËÁÈ ÎÅ ÎÁÊÄÅÎÏ): %s"
 
-msgid ""
-"cannot insert methods for these functions (methods table not found in "
-"source): %s"
-msgstr ""
-"ÎÅ ÍÏÇÕ ×ÓÔÁ×ÉÔØ ÍÅÔÏÄÙ ÄÌÑ ÜÔÉÈ ÆÕÎËÃÉÊ (ÔÁÂÌÉÃÁ ÍÅÔÏÄÏ× ÎÅ ÎÁÊÄÅÎÁ × "
-"ÉÓÈÏÄÎÉËÁÈ): %s"
+msgid "cannot insert methods for these functions (methods table not found in source): %s"
+msgstr "ÎÅ ÍÏÇÕ ×ÓÔÁ×ÉÔØ ÍÅÔÏÄÙ ÄÌÑ ÜÔÉÈ ÆÕÎËÃÉÊ (ÔÁÂÌÉÃÁ ÍÅÔÏÄÏ× ÎÅ ÎÁÊÄÅÎÁ × ÉÓÈÏÄÎÉËÁÈ): %s"
 
 msgid "Non-function objects are not currently inserted (not traceable): %s"
-msgstr ""
-"ÎÅÆÕÎËÃÉÏÎÉÒÕÀÝÉÅ ÏÂßÅËÔÙ × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÎÅ ×ÓÔÁ×ÌÅÎÙ (ÎÅ ÏÔÓÌÅÖÉ×ÁÅÍÙ): "
-"%s"
+msgstr "ÎÅÆÕÎËÃÉÏÎÉÒÕÀÝÉÅ ÏÂßÅËÔÙ × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÎÅ ×ÓÔÁ×ÌÅÎÙ (ÎÅ ÏÔÓÌÅÖÉ×ÁÅÍÙ): %s"
 
 msgid "New functions are not currently inserted (not untraceable): %s"
 msgstr "ÎÏ×ÙÅ ÆÕÎËÃÉÉ ÓÅÊÞÁÓ ÎÅ ×ÓÔÁ×ÌÅÎÙ (ÎÅ ÎÅ-ÏÔÓÌÅÖÉ×ÁÅÍÙ): %s"
@@ -1757,12 +1182,8 @@
 msgid "Modified functions inserted through trace(): %s"
 msgstr "éÚÍÅÎÅÎÎÙÅ ÆÕÎËÃÉÉ ×ÓÔÁ×ÌÅÎÙ ÞÅÒÅÚ trace(): %s"
 
-msgid ""
-"%s() is not a generic function in the target environment -- methods will not "
-"be inserted"
-msgstr ""
-"%s() ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ × ÃÅÌÅ×ÏÍ ÏËÒÕÖÅÎÉÉ -- ÍÅÔÏÄÙ ÎÅ ÕÄÕÔ "
-"×ÓÔÁ×ÌÅÎÙ"
+msgid "%s() is not a generic function in the target environment -- methods will not be inserted"
+msgstr "%s() ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÅÊ × ÃÅÌÅ×ÏÍ ÏËÒÕÖÅÎÉÉ -- ÍÅÔÏÄÙ ÎÅ ÕÄÕÔ ×ÓÔÁ×ÌÅÎÙ"
 
 msgid "Methods inserted for function %s(): %s"
 msgstr "íÅÔÏÄÙ, ×ÓÔÁ×ÌÅÎÎÙÅ ÄÌÑ ÆÕÎËÃÉÉ %s(): %s"
@@ -1773,10 +1194,8 @@
 msgid "multiple generics match pattern, using table %s"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÂÝÉÅ ÓÏ×ÐÁÄÁÀÝÉÅ ÐÁÔÔÅÒÎÙ, ÉÓÐÏÌØÚÕÀ ÔÁÂÌÉÃÕ %s"
 
-msgid ""
-"does not seem to be a method table for generic %s in tracing environment"
-msgstr ""
-"ÐÏÈÏÖÅ, ÞÔÏ ÄÌÑ ÏÂÝÅÇÏ  %s ÎÅÔ ÔÁÂÌÉÃÙ ÍÅÔÏÄÏ× × ÏÔÓÌÅÖÉ×ÁÅÍÏÍ ÏËÒÕÖÅÎÉÉ"
+msgid "does not seem to be a method table for generic %s in tracing environment"
+msgstr "ÐÏÈÏÖÅ, ÞÔÏ ÄÌÑ ÏÂÝÅÇÏ  %s ÎÅÔ ÔÁÂÌÉÃÙ ÍÅÔÏÄÏ× × ÏÔÓÌÅÖÉ×ÁÅÍÏÍ ÏËÒÕÖÅÎÉÉ"
 
 msgid "no method in methods table for %s for signature %s"
 msgstr "× ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ× ÎÅÔ ÍÅÔÏÄÁ ÄÌÑ %s ÄÌÑ ÐÏÄÐÉÓÉ %s"
@@ -1796,21 +1215,11 @@
 msgstr[1] "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÏ× \"%s\""
 msgstr[2] "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÏ× \"%s\""
 
-msgid ""
-"in the method signature for function %s invalid argument name in the "
-"signature: %s"
-msgid_plural ""
-"in the method signature for function %s invalid argument names in the "
-"signature: %s"
-msgstr[0] ""
-"× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ×ÅÒÎÏÅ ÉÍÅÎÑ ÁÒÇÕÍÅÎÔÁ × "
-"ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
-msgstr[1] ""
-"× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ×ÅÒÎÙÅ ÉÍÅÎÁ ÁÒÇÕÍÅÎÔÏ× × "
-"ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
-msgstr[2] ""
-"× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ×ÅÒÎÙÅ ÉÍÅÎÁ ÁÒÇÕÍÅÎÔÏ× × "
-"ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
+msgid "in the method signature for function %s invalid argument name in the signature: %s"
+msgid_plural "in the method signature for function %s invalid argument names in the signature: %s"
+msgstr[0] "× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ×ÅÒÎÏÅ ÉÍÅÎÑ ÁÒÇÕÍÅÎÔÁ × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
+msgstr[1] "× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ×ÅÒÎÙÅ ÉÍÅÎÁ ÁÒÇÕÍÅÎÔÏ× × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
+msgstr[2] "× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s ÎÅ×ÅÒÎÙÅ ÉÍÅÎÁ ÁÒÇÕÍÅÎÔÏ× × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
 
 msgid "Reported %d ambiguous selection out of %d for function %s\n"
 msgid_plural "Reported %d ambiguous selections out of %d for function %s\n"
@@ -1830,21 +1239,11 @@
 msgstr[1] "ÎÅ ÎÁÊÄÅÎÏ ÁÒÇÕÍÅÎÔÏ× × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
 msgstr[2] "ÎÅ ÎÁÊÄÅÎÏ ÁÒÇÕÍÅÎÔÏ× × ÉÄÅÎÔÉÆÉËÁÔÏÒÅ: %s"
 
-msgid ""
-"the formal argument of the generic function for %s (%s) differs from that of "
-"the non-generic to be used as the default (%s)"
-msgid_plural ""
-"the formal arguments of the generic function for %s (%s) differ from those "
-"of the non-generic to be used as the default (%s)"
-msgstr[0] ""
-"ÆÏÒÍÁÌØÎÙÊ ÁÒÇÕÍÅÎÔ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\" (%s) ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÎÅ-ÏÂÝÅÇÏ, "
-"ÉÓÐÏÌØÚÕÅÍÏÇÏ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
-msgstr[1] ""
-"ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\" (%s) ÏÔÌÉÞÁÀÔÓÑ ÏÔ ÎÅ-ÏÂÝÉÈ, "
-"ÉÓÐÏÌØÚÕÅÍÙÈ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
-msgstr[2] ""
-"ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\" (%s) ÏÔÌÉÞÁÀÔÓÑ ÏÔ ÎÅ-ÏÂÝÉÈ, "
-"ÉÓÐÏÌØÚÕÅÍÙÈ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
+msgid "the formal argument of the generic function for %s (%s) differs from that of the non-generic to be used as the default (%s)"
+msgid_plural "the formal arguments of the generic function for %s (%s) differ from those of the non-generic to be used as the default (%s)"
+msgstr[0] "ÆÏÒÍÁÌØÎÙÊ ÁÒÇÕÍÅÎÔ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\" (%s) ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÎÅ-ÏÂÝÅÇÏ, ÉÓÐÏÌØÚÕÅÍÏÇÏ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
+msgstr[1] "ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\" (%s) ÏÔÌÉÞÁÀÔÓÑ ÏÔ ÎÅ-ÏÂÝÉÈ, ÉÓÐÏÌØÚÕÅÍÙÈ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
+msgstr[2] "ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\" (%s) ÏÔÌÉÞÁÀÔÓÑ ÏÔ ÎÅ-ÏÂÝÉÈ, ÉÓÐÏÌØÚÕÅÍÙÈ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
 
 msgid "duplicated slot name: %s"
 msgid_plural "duplicated slot names: %s"
@@ -1874,34 +1273,17 @@
 "ÎÁÊÄÅÎÏ ÎÅÓËÏÌØËÏ ×ÉÄÉÍÙÈ ÏÐÒÅÄÅÌÅÎÉÊ ËÌÁÓÓÁ %s (%s); ÉÓÐÏÌØÚÕÀ ÏÐÒÅÄÅÌÅÎÉÅ\n"
 "   × ÐÁËÅÔÅ %s ÄÌÑ %s"
 
-msgid ""
-"class %s is missing slot from class %s (%s), and no coerce method was "
-"supplied"
-msgid_plural ""
-"class %s is missing slots from class %s (%s), and no coerce method was "
-"supplied"
-msgstr[0] ""
-"Õ ËÌÁÓÓÁ %s ÏÔÓÕÔÓÔ×ÕÅÔ ÓÌÏÔ ÉÚ ËÌÁÓÓÁ %s (%s), É ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÍÅÔÏÄ "
-"ÐÒÉ×ÅÄÅÎÉÑ"
-msgstr[1] ""
-"Õ ËÌÁÓÓÁ %s ÏÔÓÕÔÓÔ×ÕÀÔ ÓÌÏÔÙ ÉÚ ËÌÁÓÓÁ %s (%s), É ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÍÅÔÏÄ "
-"ÐÒÉ×ÅÄÅÎÉÑ"
-msgstr[2] ""
-"Õ ËÌÁÓÓÁ %s ÏÔÓÕÔÓÔ×ÕÀÔ ÓÌÏÔÙ ÉÚ ËÌÁÓÓÁ %s (%s), É ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÍÅÔÏÄ "
-"ÐÒÉ×ÅÄÅÎÉÑ"
-
-msgid ""
-"slot in class %s must extend corresponding slot in class %s: fails for %s"
-msgid_plural ""
-"slots in class %s must extend corresponding slots in class %s: fails for %s"
-msgstr[0] ""
-"ÓÌÏÔ × ËÌÁÓÓÅ %s ÄÏÌÖÅÎ ÒÁÓÛÉÒÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÓÌÏÔ × ËÌÁÓÓÅ %s: ÓÂÏÉ × %s"
-msgstr[1] ""
-"ÓÌÏÔÙ × ËÌÁÓÓÅ %s ÄÏÌÖÎÙ ÒÁÓÛÉÒÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÓÌÏÔÙ × ËÌÁÓÓÅ %s: ÓÂÏÉ × "
-"%s"
-msgstr[2] ""
-"ÓÌÏÔÙ × ËÌÁÓÓÅ %s ÄÏÌÖÎÙ ÒÁÓÛÉÒÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÓÌÏÔÙ × ËÌÁÓÓÅ %s: ÓÂÏÉ × "
-"%s"
+msgid "class %s is missing slot from class %s (%s), and no coerce method was supplied"
+msgid_plural "class %s is missing slots from class %s (%s), and no coerce method was supplied"
+msgstr[0] "Õ ËÌÁÓÓÁ %s ÏÔÓÕÔÓÔ×ÕÅÔ ÓÌÏÔ ÉÚ ËÌÁÓÓÁ %s (%s), É ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÍÅÔÏÄ ÐÒÉ×ÅÄÅÎÉÑ"
+msgstr[1] "Õ ËÌÁÓÓÁ %s ÏÔÓÕÔÓÔ×ÕÀÔ ÓÌÏÔÙ ÉÚ ËÌÁÓÓÁ %s (%s), É ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÍÅÔÏÄ ÐÒÉ×ÅÄÅÎÉÑ"
+msgstr[2] "Õ ËÌÁÓÓÁ %s ÏÔÓÕÔÓÔ×ÕÀÔ ÓÌÏÔÙ ÉÚ ËÌÁÓÓÁ %s (%s), É ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ ÍÅÔÏÄ ÐÒÉ×ÅÄÅÎÉÑ"
+
+msgid "slot in class %s must extend corresponding slot in class %s: fails for %s"
+msgid_plural "slots in class %s must extend corresponding slots in class %s: fails for %s"
+msgstr[0] "ÓÌÏÔ × ËÌÁÓÓÅ %s ÄÏÌÖÅÎ ÒÁÓÛÉÒÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÓÌÏÔ × ËÌÁÓÓÅ %s: ÓÂÏÉ × %s"
+msgstr[1] "ÓÌÏÔÙ × ËÌÁÓÓÅ %s ÄÏÌÖÎÙ ÒÁÓÛÉÒÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÓÌÏÔÙ × ËÌÁÓÓÅ %s: ÓÂÏÉ × %s"
+msgstr[2] "ÓÌÏÔÙ × ËÌÁÓÓÅ %s ÄÏÌÖÎÙ ÒÁÓÛÉÒÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÓÌÏÔÙ × ËÌÁÓÓÅ %s: ÓÂÏÉ × %s"
 
 msgid "found %d equally good next method"
 msgid_plural "found %d equally good next methods"
@@ -1933,49 +1315,39 @@
 msgstr[1] "÷ÙÂÒÁÎ ÍÅÔÏÄ %s ÉÚ %d ÓÏÍÎÉÔÅÌØÎÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ"
 msgstr[2] "÷ÙÂÒÁÎ ÍÅÔÏÄ %s ÉÚ %d ÓÏÍÎÉÔÅÌØÎÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ"
 
-msgid ""
-"no definition of class %s in the specified position, %s, definition on : %s"
-msgid_plural ""
-"no definition of class %s in the specified position, %s, definitions on : %s"
+msgid "no definition of class %s in the specified position, %s, definition on : %s"
+msgid_plural "no definition of class %s in the specified position, %s, definitions on : %s"
 msgstr[0] "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ËÌÁÓÓÁ %s × ÕËÁÚÁÎÎÏÊ ÐÏÚÉÃÉÉ, %s, ÏÐÒÅÄÅÌÅÎÉÅ: %s"
 msgstr[1] "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ËÌÁÓÓÁ %s × ÕËÁÚÁÎÎÏÊ ÐÏÚÉÃÉÉ, %s, ÏÐÒÅÄÅÌÅÎÉÑ: %s"
 msgstr[2] "ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ËÌÁÓÓÁ %s × ÕËÁÚÁÎÎÏÊ ÐÏÚÉÃÉÉ, %s, ÏÐÒÅÄÅÌÅÎÉÑ: %s"
 
 #~ msgid "special function %s is not permitted to have methods"
 #~ msgstr "ÓÐÅÃÉÁÌØÎÏÊ ÆÕÎËÃÉÉ %s ÎÅ ÒÁÚÒÅÛÅÎÏ ÉÍÅÔØ ÍÅÔÏÄÏ×"
-
 #~ msgid ""
 #~ "special function %s has no known argument list; will assume '(x, ...)'"
 #~ msgstr ""
 #~ "ÓÐÅÃÉÁÌØÎÁÑ ÆÕÎËÃÉÑ %s ÎÅ ÉÍÅÅÔ ÉÚ×ÅÓÔÎÏÇÏ ÓÐÉÓËÁ ÁÒÇÕÍÅÎÔÏ×; ÂÕÄÅÔ "
 #~ "ÐÒÉÓ×ÏÅÎÏ '(x, ...)'"
-
 #~ msgid ""
 #~ "'callGeneric' with a primitive needs explicit arguments (no formal args "
 #~ "defined)"
 #~ msgstr ""
 #~ "'callGeneric' Ó ÐÒÉÍÉÔÉ×ÏÍ ÎÕÖÄÁÅÔÓÑ × Ñ×ÎÙÈ ÁÒÇÕÍÅÎÔÁÈ (ÎÅ ÏÐÒÅÄÅÌÅÎÙ "
 #~ "ÆÏÒÍÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ)"
-
 #~ msgid "\""
 #~ msgstr "\""
-
 #~ msgid ""
 #~ "could not find superclass %s to clean up when removing subclass "
 #~ "references to class %s"
 #~ msgstr ""
 #~ "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÕÐÅÒËÌÁÓÓ %s ÄÌÑ ÏÞÉÓÔËÉ ÐÒÉ ÕÄÁÌÅÎÉÉ ÓÓÙÌÏË ÐÏÄËÌÁÓÓÁ ÎÁ "
 #~ "ËÌÁÓÓ %s"
-
 #~ msgid "no class %s found as expected in removing subclass %s"
 #~ msgstr "ÎÅ ÎÁÊÄÅÎÏ ËÌÁÓÓÁ %s, ÏÖÉÄÁÅÍÏÇÏ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÏÄËÌÁÓÓÁ %s"
-
 #~ msgid "replacement value is not a matrix"
 #~ msgstr "ÚÁÍÅÝÁÀÝÅÅ ÚÎÁÞÅÎÉÅ ÎÅ Ñ×ÌÑÅÔÓÑ ÍÁÔÒÉÃÅÊ"
-
 #~ msgid "field %s is read-only"
 #~ msgstr "ÐÏÌÅ %s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
-
 #~ msgid "not a package name: %s"
 #~ msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ ÉÍÅÎÅÍ ÐÁËÅÔÁ: %s"
 
@@ -1992,48 +1364,39 @@
 #~ msgstr ""
 #~ "ðÏÌÑ ÁÒÇÕÍÅÎÔÁ ÄÏÌÖÎÙ ÂÙÔØ ÓÐÉÓËÏÍ ËÌÁÓÓÏ× ÐÏÌÑ ÉÌÉ ÏÐÒÅÄÅÌÅÎÉÊ, ÉÌÉ "
 #~ "ÐÒÏÓÔÏ ÉÍÅÎÁÍÉ ÐÏÌÅÊ, Á ÐÏÌÕÞÉÌ ÏÂßÅËÔ ËÌÁÓÓÁ %s"
-
 #~ msgid "Warning:  using defunct methods list search"
 #~ msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÐÏÌØÚÕÀ ÎÅÒÁÂÏÞÉÅ ÍÅÔÏÄÙ ÐÏÉÓËÁ × ÓÐÉÓËÅ"
-
 #~ msgid ""
 #~ "apparent inconsistency in the methods for function %s; argument %s in the "
 #~ "signature corresponds to %s in the methods list object"
 #~ msgstr ""
 #~ "ÏÞÅ×ÉÄÎÁÑ ÐÒÏÔÉ×ÏÒÅÞÉ×ÏÓÔØ × ÍÅÔÏÄÁÈ ÆÕÎËÃÉÉ %s; ÁÒÇÕÍÅÎÔ %s × "
 #~ "ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ %s × ÏÂßÅËÔÅ ÓÐÉÓËÁ ÍÅÔÏÄÏ×."
-
 #~ msgid ""
 #~ "no S4 method for function %s and signature %s; consider getS3method() if "
 #~ "you wanted the S3 method"
 #~ msgstr ""
 #~ "ÎÅÔ S4 ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s É ÉÄÅÎÔÉÆÉËÁÔÏÒÁ %s; ÏÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ ÎÁ "
 #~ "getS3method() ÅÓÌÉ ÈÏÄÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ S3 ÍÅÔÏÄ"
-
 #~ msgid ""
 #~ "no method defined in methods list object for function %s and signature %s"
 #~ msgstr "ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ %s É ÉÄÅÎÔÉÆÉËÁÔÏÒÁ %s"
-
 #~ msgid ""
 #~ "Methods list objects are not maintained in this version of R:  request "
 #~ "for function %s may return incorrect information"
 #~ msgstr ""
 #~ "íÅÔÏÄÙ, ÐÅÒÅÞÉÓÌÑÀÝÉÅ ÏÂßÅËÔÙ, ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ × ÜÔÏÊ ×ÅÒÓÉÉ R:  ÚÁÐÒÏÓ "
 #~ "ÆÕÎËÃÉÉ %s ÍÏÖÅÔ ×ÅÒÎÕÔØ ÎÅÐÒÁ×ÉÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ"
-
 #~ msgid "multiple equivalent inherited matches:"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÜË×É×ÁÌÅÎÔÎÙÅ ÕÎÁÓÌÅÄÏ×ÁÎÎÙÅ ÓÏÏÔ×ÅÔÓÔ×ÉÑ:"
-
 #~ msgid "; using the first of these"
 #~ msgstr "; ÉÓÐÏÌØÚÕÀ ÐÅÒ×ÙÊ ÉÚ ÎÉÈ"
-
 #~ msgid ""
 #~ "'traceOn' is deprecated: use the function 'trace' in the 'methods' "
 #~ "package instead"
 #~ msgstr ""
 #~ "'traceOn' ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ: ×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ "
 #~ "ÆÕÎËÃÉÀ 'trace' × ÐÁËÅÔÅ 'methods'"
-
 #~ msgid ""
 #~ "'traceOff' is deprecated: use the function 'untrace' in the 'methods' "
 #~ "package instead"
@@ -2047,44 +1410,35 @@
 #~ "class %s in the target"
 #~ msgstr ""
 #~ "ëÌÁÓÓ ÉÌÉ ÐÏÌÅ \"%s\" ÏÂßÅËÔÁ ÎÅÓÏ×ÍÅÓÔÉÍÏ Ó ÖÅÌÁÅÍÙÍ ËÌÁÓÓÏÍ %s ÃÅÌÉ"
-
 #~ msgid "in .OldClassesPrototypes"
 #~ msgstr "× .OldClassesPrototypes"
-
 #~ msgid ""
 #~ "internal error: did not get a valid generic function object for function "
 #~ "%s"
 #~ msgstr ""
 #~ "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÎÅ ÐÏÌÕÞÅÎ ×ÅÒÎÙÊ ÏÂßÅËÔ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ ÆÕÎËÃÉÉ %s"
-
 #~ msgid ""
 #~ "apparent internal error: a generic function was found for \"%s\", but no "
 #~ "corresponding object was found searching from \"%s\""
 #~ msgstr ""
 #~ "ÏÞÅ×ÉÄÎÁÑ ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÄÌÑ \"%s\" ÂÙÌÁ ÎÁÊÄÅÎÁ ÏÂÝÁÑ ÆÕÎËÃÉÑ, ÎÏ "
 #~ "ÐÏÉÓËÏÍ ÐÏ \"%s\" ÎÅ ÂÙÌÏ ÎÁÊÄÅÎÏ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÂßÅËÔÁ"
-
 #~ msgid "selectMethod(): mlist is not an environment or NULL :"
 #~ msgstr "selectMethod(): mlist ÎÅ Ñ×ÌÑÅÔÓÑ ÏËÒÕÖÅÎÉÅÍ ÉÌÉ NULL :"
-
 #~ msgid "** should no longer happen!"
 #~ msgstr "** ÂÏÌØÛÅ ÎÅ ÄÏÌÖÎÏ ÓÌÕÞÁÔØÓÑ!"
-
 #~ msgid "Classes: %s, %s"
 #~ msgstr "ëÌÁÓÓÙ: %s, %s"
-
 #~ msgid ""
 #~ "internal error: Bad methods list object in fixing methods for primitive "
 #~ "function %s"
 #~ msgstr ""
 #~ "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ðÌÏÈÏÊ ÏÂßÅËÔ ÓÐÉÓËÁ ÍÅÔÏÄÏ× × ÆÉËÓÉÒÏ×ÁÎÎÙÈ ÍÅÔÏÄÁÈ "
 #~ "ÄÌÑ ÜÌÅÍÅÎÔÁÒÎÏÊ ÆÕÎËÃÉÉ %s"
-
 #~ msgid "botched namespace: failed to find 'base' namespace in its parents"
 #~ msgstr ""
 #~ "ÐÏ×ÒÅÖÄÅÎÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÐÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ 'base' × "
 #~ "ÅÇÏ ÒÏÄÉÔÅÌÅ"
-
 #~ msgid "multiple direct matches:"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÐÒÑÍÙÅ ÓÏÏÔ×ÅÔÓÔ×ÉÑ:"
 
@@ -2100,125 +1454,91 @@
 #~ msgstr ""
 #~ "×ÎÕÔÒÅÎÎÑÑ ÐÒÏÂÌÅÍÁ × as(): \"%s\" is(ÏÂßÅËÔ, \"%s\") Ñ×ÌÑÅÔÓÑ TRUE, ÎÏ "
 #~ "ÍÅÔÁÄÁÎÎÙÅ ÕÔ×ÅÒÖÄÁÀÔ, ÞÔÏ 'is' ÚÁ×ÉÓÉÍÏÓÔØ Ñ×ÌÑÅÔÓÑ FALSE"
-
 #~ msgid "connection"
 #~ msgstr "ÓÏÅÄÉÎÅÎÉÅ"
-
 #~ msgid ""
 #~ "Internal error in finding inherited methods; didn't return a unique method"
 #~ msgstr ""
 #~ "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÎÁÓÌÅÄÏ×ÁÎÎÙÈ ÍÅÔÏÄÏ×; ÎÅ ×ÏÚ×ÒÁÝÅÎ "
 #~ "ÕÎÉËÁÌØÎÙÊ ÍÅÔÏÄ"
-
 #~ msgid "\", but it is not a group generic"
 #~ msgstr "\", ÎÏ ÎÅ Ñ×ÌÑÅÔÓÑ ÇÒÕÐÐÏ×ÏÊ ÏÂÝÅÊ"
-
 #~ msgid "Trying to check signature length of generic \""
 #~ msgstr "ðÙÔÁÀÓØ ÐÒÏ×ÅÒÉÔØ ÄÌÉÎÕ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÏÂÝÅÊ \""
-
 #~ msgid "\", but it is not a  generic function: i ="
 #~ msgstr "\", ÎÏ ÎÅ Ñ×ÌÑÅÔÓÑ  ÏÂÝÅÊ ÆÕÎËÃÉÅÊ: i ="
-
 #~ msgid ", funs ="
 #~ msgstr ", funs ="
-
 #~ msgid ","
 #~ msgstr ","
-
 #~ msgid "; gnames ="
 #~ msgstr "; gnames ="
-
 #~ msgid ""
 #~ "Something weird:  inconsistent number of args in methods table strings:"
 #~ msgstr ""
 #~ "þÔÏ-ÔÏ ÎÅ ÔÁË: ÎÅÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ËÏÌÉÞÅÓÔ×Ï ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÁÈ ÔÁÂÌÉÃÙ "
 #~ "ÍÅÔÏÄÏ×:"
-
 #~ msgid "(using the largest value)"
 #~ msgstr "(ÉÓÐÏÌØÚÕÀ ÎÁÉÂÏÌØÛÅÅ ÚÎÁÞÅÎÉÅ)"
-
 #~ msgid "Undefined classes ("
 #~ msgstr "îÅÏÐÒÅÄÅÌÅÎÎÙÅ ËÌÁÓÓÙ ("
-
 #~ msgid ""
 #~ "Method %s from class %s was not processed into a class method until being "
 #~ "installed.  Possible corruption of the methods in the class."
 #~ msgstr ""
 #~ "íÅÔÏÄ %s ÉÚ ËÌÁÓÓÁ %s ÎÅ ÂÙÌ ÐÒÅÏÂÒÁÚÏ×ÁÎ × ÍÅÔÏÄ ËÌÁÓÓÁ, ÐÏËÕÄÁ ÎÅ ÂÙÌ "
 #~ "ÕÓÔÁÎÏ×ÌÅÎ. ÷ÏÚÍÏÖÎÏ ÐÏ×ÒÅÖÄÅÎÉÅ ÍÅÔÏÄÏ× × ËÌÁÓÓÅ."
-
 #~ msgid "for method %s()"
 #~ msgstr "ÄÌÑ ÍÅÔÏÄÁ %s()"
-
 #~ msgid ".TraceWithMethods: after computing what, whereF"
 #~ msgstr ".TraceWithMethods: ÐÏÓÌÅ ÒÁÓÞÅÔÁ, ÞÔÏ, whereF"
-
 #~ msgid ".TraceWithMethods: untrace case"
 #~ msgstr ".TraceWithMethods: ÎÅ ÔÒÁÓÓÉÒÕÅÍÙÊ ÓÌÕÞÁÊ"
-
 #~ msgid ".TraceWithMethods: about to assign or setMethod"
 #~ msgstr ".TraceWithMethods: ÇÏÔÏ×Ï Ë ÐÒÉÓ×ÏÅÎÉÀ ÌÉÂÏ Ë setMethod"
 
 #, fuzzy
 #~ msgid "Constructing traceable class %s"
 #~ msgstr "ëÏÎÓÔÒÕÉÒÏ×ÁÎÉÅ ÏÔÓÌÅÖÉ×ÁÅÍÏÇÏ ËÌÁÓÓÁ \""
-
 #~ msgid "Pretend we inserted class"
 #~ msgstr "ðÒÅÄÐÏÌÏÖÉÍ, ÍÙ ×ÓÔÁ×ÉÌÉ ËÌÁÓÓ"
-
 #~ msgid "= \"missing\""
 #~ msgstr "= \"ÏÔÓÕÔÓÔ×ÕÅÔ\""
-
 #~ msgid "found"
 #~ msgstr "ÎÁÊÄÅÎÏ"
-
 #~ msgid "Invalid mlist element for signature \""
 #~ msgstr "îÅ×ÅÒÎÙÊ mlist ÜÌÅÍÅÎÔ ÄÌÑ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ \""
-
 #~ msgid "\" at level"
 #~ msgstr "\" ÎÁ ÕÒÏ×ÎÅ"
-
 #~ msgid "\")"
 #~ msgstr "\")"
-
 #~ msgid "Invalid object in methods table (\""
 #~ msgstr "ÎÅ×ÅÒÎÙÊ ÏÂßÅËÔ × ÔÁÂÌÉÃÅ ÍÅÔÏÄÏ× (\""
-
 #~ msgid "\"), expected a method, got an object of class \""
 #~ msgstr "\"), ÏÖÉÄÁÌÓÑ ÍÅÔÏÄ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \""
-
 #~ msgid "Environment of class \""
 #~ msgstr "ïËÒÕÖÅÎÉÅ ËÌÁÓÓÁ \""
-
 #~ msgid "Replacement value must be of class \""
 #~ msgstr "úÁÍÅÝÁÀÝÅÅ ÚÎÁÞÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ËÌÁÓÓÁ \""
-
 #~ msgid "\", got one of class \""
 #~ msgstr "\", ÐÏÌÕÞÉÌ ËÌÁÓÓÁ \""
-
 #~ msgid "\", for signature"
 #~ msgstr "\", ÄÌÑ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ"
-
 #~ msgid "Field \""
 #~ msgstr "ðÏÌÅ \""
-
 #~ msgid "the supplied generic function definition for"
 #~ msgstr "ÕËÁÚÁÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ"
-
 #~ msgid ""
 #~ "does not seem to call 'standardGeneric'; no methods will be dispatched!"
 #~ msgstr "ÐÏÈÏÖÅ, ÎÅ ×ÙÚ×ÁÎÏ 'standardGeneric'; ÍÅÔÏÄÙ ÎÅ ÂÕÄÕÔ ÐÅÒÅÄÁÎÙ!"
-
 #~ msgid "no generic function \"'%s\" found"
 #~ msgstr "îÅ ÎÁÊÄÅÎÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ \"'%s\""
-
 #~ msgid ""
 #~ "Restoring the implicit generic function for %s from package %s\n"
 #~ "    into package %s; the generic differs from the default conversion (%s)"
 #~ msgstr ""
 #~ "÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÉÍÐÌÉÃÉÔÎÏÊ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ %s ÉÚ ÐÁËÅÔÁ %s\n"
 #~ "    × ÐÁËÅÔ %s; ÏÂÝÉÅ ÒÁÚÌÉÞÁÀÔÓÑ ÐÏÓÌÅ ËÏÎ×ÅÒÓÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ (%s)"
-
 #~ msgid ""
 #~ "Creating a generic for %s in package %s\n"
 #~ "    (the supplied definition differs from and overrides the implicit "
@@ -2229,17 +1549,14 @@
 #~ "    (ÐÒÅÄÌÏÖÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÏÔÌÉÞÁÅÔÓÑ ÏÔ É ÐÅÒÅÐÉÓÙ×ÁÅÔ ÉÍÐÌÉÃÉÔÎÏÅ "
 #~ "ÏÂÝÅÅ\n"
 #~ "    × ÐÁËÅÔÅ %s: %s)"
-
 #~ msgid ""
 #~ "\" is not a known action (warn, stop, once, ignore); no action recorded "
 #~ "for function \""
 #~ msgstr ""
 #~ "\" ÎÅ ÏÔÎÏÓÉÔÓÑ Ë ÉÚ×ÅÓÔÎÙÍ ÁËÃÉÑÍ (warn, stop, once, ignore); ÁËÃÉÑ ÄÌÑ "
 #~ "ÆÕÎËÃÉÉ ÎÅ ÚÁÐÉÓÁÎÁ \""
-
 #~ msgid "must give named list of refdefined fields"
 #~ msgstr "ÎÁÄÏ ÄÁÔØ ÓÐÉÓÏË ÐÅÒÅÏÐÒÅÄÅÌÅÎÎÙÈ ÐÏÌÅÊ"
-
 #~ msgid "Only accessor fields can be replaced:  field \"%s\" has class \"%s\""
 #~ msgstr ""
 #~ "ôÏÌØËÏ ÓÏÐÒÏ×ÏÄÉÔÅÌØÎÙÅ ÐÏÌÑ ÍÏÇÕÔ ÂÙÔØ ÚÁÍÅÎÅÎÙ:  ÐÏÌÅ \"%s\" ÉÍÅÅÔ "
@@ -2268,7 +1585,6 @@
 #, fuzzy
 #~ msgid "Trying to set a read-only field ("
 #~ msgstr "ÐÙÔÁÀÓØ ÕÓÔÁÎÏ×ÉÔØ ÏÔÎÏÛÅÎÉÅ 'as' ÏÔ \"%s\" ÎÁ ÓÅÂÑ"
-
 #~ msgid ")"
 #~ msgstr ")"
 
@@ -2279,7 +1595,6 @@
 #, fuzzy
 #~ msgid "Invalid accessor function list: %s"
 #~ msgstr "ÎÅ×ÅÒÎÙÊ ÉÎÄÅËÓ ÄÌÑ ÁÒÇÕÍÅÎÔÁ ÆÕÎËÃÉÉ"
-
 #~ msgid "Defining type \"%s\" as a superclass via class \"%s\""
 #~ msgstr "ïÐÒÅÄÅÌÑÀ ÔÉÐ \"%s\" ËÁË ÓÕÐÅÒËÌÁÓÓ ÞÅÒÅÚ ËÌÁÓÓ \"%s\""
 
@@ -2290,7 +1605,6 @@
 #~ msgstr ""
 #~ "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ \"f\", ÏÖÉÄÁÅÔÓÑ ÆÕÎËÃÉÑ ÉÌÉ ÅÅ ÉÍÑ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ "
 #~ "ËÌÁÓÓÁ \"%s\""
-
 #~ msgid ""
 #~ "in the method signature for function \"%s\" no definition for class: %s"
 #~ msgid_plural ""
@@ -2301,7 +1615,6 @@
 #~ "× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ \"%s\" ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ ËÌÁÓÓÏ×: %s"
 #~ msgstr[2] ""
 #~ "× ÉÄÅÎÔÉÆÉËÁÔÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ \"%s\" ÎÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÄÌÑ ËÌÁÓÓÏ×: %s"
-
 #~ msgid ""
 #~ "None of the orderings of the superclasses of class \"%s\" is consistent "
 #~ "with the superclass ordering of  its direct superclasses; using an "
@@ -2310,39 +1623,30 @@
 #~ "îÉ ÏÄÎÏ ÉÚ ÕÐÏÒÑÄÏÞÅÎÉÊ ÓÕÐÅÒËÌÁÓÓÏ× ËÌÁÓÓÁ \"%s\" ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ "
 #~ "ÕÐÏÒÑÄÏÞÉ×ÁÎÉÀ ÓÕÐÅÒËÌÁÓÓÁ ÅÇÏ ÐÒÑÍÙÈ ÓÕÐÅÒËÌÁÓÓÏ×; ÉÓÐÏÌØÚÕÀ "
 #~ "ÕÐÏÒÑÄÏÞÉ×ÁÎÉÅ, ËÏÔÏÒÏÅ ËÏÎÆÌÉËÔÕÅÔ Ó %s"
-
 #~ msgid "Some of the superclasses in the definition of class \""
 #~ msgstr "îÅËÏÔÏÒÙÅ ÓÕÐÅÒËÌÁÓÓÙ × ÏÐÒÅÄÅÌÅÎÉÉ ËÌÁÓÓÁ \""
-
 #~ msgid ""
 #~ "S3 methods written for S4 classes will fail inheritance!\n"
 #~ "Package"
 #~ msgstr ""
 #~ "S3 ÍÅÔÏÄÙ, ÎÁÐÉÓÁÎÎÙÅ ÄÌÑ S4 ËÌÁÓÓÏ×, ÎÅ ÓÍÏÇÕÔ ÎÁÓÌÅÄÏ×ÁÔØÓÑ!\n"
 #~ "ðÁËÅÔ"
-
 #~ msgid "apparently has"
 #~ msgstr "ÏÞÅ×ÉÄÎÏ ÉÍÅÅÔ"
-
 #~ msgid "such methods  for the functions"
 #~ msgstr "ÔÁËÉÅ ÍÅÔÏÄÙ ÄÌÑ ÆÕÎËÃÉÊ"
-
 #~ msgid "Possible dangerous methods:"
 #~ msgstr "÷ÏÚÍÏÖÎÙÅ ÏÐÁÓÎÙÅ ÍÅÔÏÄÙ:"
-
 #~ msgid "(Warnings generated once per package per session)"
 #~ msgstr "(ðÒÅÄÕÐÒÅÖÄÅÎÉÑ ×ÙÄÁÀÔÓÑ ÏÄÎÏ ÎÁ ÐÁËÅÔ ÎÁ ÓÅÓÓÉÀ)"
-
 #~ msgid "There are apparent S3 methods for class \""
 #~ msgstr "åÓÔØ ÏÞÅ×ÉÄÎÙÅ S3 ÍÅÔÏÄÙ ÄÌÑ ËÌÁÓÓÁ \""
-
 #~ msgid ""
 #~ "\"\n"
 #~ "DANGER: any subclasses of this class will not inherit the methods"
 #~ msgstr ""
 #~ "\"\n"
 #~ "ïðáóîï: ÌÀÂÏÊ ÓÕÂËÌÁÓÓ ÜÔÏÇÏ ËÌÁÓÓÁ ÎÅ ÂÕÄÅÔ ÎÁÓÌÅÄÏ×ÁÔØ ÍÅÔÏÄÙ"
-
 #~ msgid ""
 #~ "\" have apparent S3 methods.\n"
 #~ "\n"
@@ -2353,59 +1657,45 @@
 #~ "\n"
 #~ "ïðáóîï: ÎÏ×ÙÊ ËÌÁÓÓ ÎÁ ÂÕÄÅÔ ÎÁÓÌÅÄÏ×ÁÔØ ÜÔÉ ÍÅÔÏÄÙ.\n"
 #~ "ðÏÖÁÌÕÊÔÅÓØ Á×ÔÏÒÕ ÏÐÒÅÄÅÌÅÎÉÊ ÓÕÐÅÒËÌÁÓÓÁ."
-
 #~ msgid "signature must be a vector of classes or an environment"
 #~ msgstr "ÉÄÅÎÔÉÆÉËÁÔÏÒ ÄÏÌÖÅÎ ÂÙÔØ ×ÅËÔÏÒÏÍ ËÌÁÓÓÏ× ÉÌÉ ÏËÒÕÖÅÎÉÅÍ"
-
 #~ msgid "selectMethod(): .SelectMethodOn - old stuff - please report"
 #~ msgstr "selectMethod(): .SelectMethodOn - ÜÔÏ ÓÔÁÒØÅ - ÐÏÖÁÌÕÊÓÔÁ, ÓÏÏÂÝÉÔÅ"
-
 #~ msgid "no unique method corresponding to this signature"
 #~ msgstr ""
 #~ "ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÅÄÉÎÓÔ×ÅÎÎÏÇÏ ÍÅÔÏÄÁ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÄÁÎÎÏÍÕ ÉÄÅÎÔÉÆÉËÁÔÏÒÕ"
-
 #~ msgid "unable to match signature to methods"
 #~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÐÏÓÔÁ×ÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ Ë ÍÅÔÏÄÁÍ"
-
 #~ msgid "class \"%s\" cannot be used as the data part of another class"
 #~ msgstr ""
 #~ "ËÌÁÓÓ \"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ËÁË ÞÁÓÔØ ÄÁÎÎÙÈ ÄÒÕÇÏÇÏ ËÌÁÓÓÁ"
-
 #~ msgid "internal error: bad code for 'setPrimitiveMethods': %s"
 #~ msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÐÌÏÈÏÊ ËÏÄ ÄÌÑ 'setPrimitiveMethods': %s"
-
 #~ msgid "Ambiguous method selection for \"%s\", target \"%s\""
 #~ msgstr "îÅÏÞÅ×ÉÄÎÙÊ ×ÙÂÏÒ ÍÅÔÏÄÁ ÄÌÑ \"%s\", ÃÅÌØ \"%s\""
-
 #~ msgid ""
 #~ "(the first of the signatures shown will be used)\n"
 #~ "%s"
 #~ msgstr ""
 #~ "(ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ ÐÅÒ×ÙÊ ÉÚ ÐÏËÁÚÁÎÎÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ×)\n"
 #~ "%s"
-
 #~ msgid ""
 #~ "Couldn't find methods table for \"%s\", package \"%s\" may be out of date"
 #~ msgstr ""
 #~ "îÅ ÍÏÇÕ ÎÁÊÔÉ ÔÁÂÌÉÃÕ ÍÅÔÏÄÏ× ÄÌÑ \"%s\", ÐÁËÅÔ \"%s\" ÍÏÖÅÔ ÂÙÔØ "
 #~ "ÕÓÔÁÒÅ×ÛÉÍ"
-
 #~ msgid "The class to be removed  (\""
 #~ msgstr "äÁÎÎÙÊ ËÌÁÓÓ ÂÕÄÅÔ ÕÄÁÌÅÎ  (\""
-
 #~ msgid "\") has defined subclasses that should also be removed: ("
 #~ msgstr "\") ÓÏÄÅÒÖÉÔ ÏÐÒÅÄÅÌÅÎÎÙÅ ÐÏÄËÌÁÓÓÙ, ËÏÔÏÒÙÅ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ: ("
-
 #~ msgid ""
 #~ "'NextMethod' not defined because the current method is not a "
 #~ "'MethodDefinition' object"
 #~ msgstr ""
 #~ "'NextMethod' ÎÅ ÏÐÒÅÄÅÌÅÎ, ÐÏÔÏÍÕ-ÞÔÏ ÔÅËÕÝÉÊ ÍÅÔÏÄ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂßÅËÔÏÍ "
 #~ "'MethodDefinition'"
-
 #~ msgid "expected a list of signature objects, got \"%s\""
 #~ msgstr "ÏÖÉÄÁÌÓÑ ÓÐÉÓÏË ÉÄÅÎÔÉÆÉËÁÔÏÒÏ×, ÐÏÌÕÞÅÎ \"%s\""
-
 #~ msgid ""
 #~ "New generic for \"%s\" does not agree with implicit generic from package "
 #~ "\"%s\"; a new generic will be assigned with package \"%s\""
@@ -2413,40 +1703,34 @@
 #~ "îÏ×ÁÑ ÏÂÝÁÑ ÆÕÎËÃÉÑ ÄÌÑ \"%s\" ÎÅ ÓÏÇÌÁÓÕÅÔÓÑ Ó ÐÏÄÒÁÚÕÍÅ×ÁÅÍÏÊ ÏÂÝÅÊ "
 #~ "ÆÕÎËÃÉÅÊ ÉÚ ÐÁËÅÔÁ \"%s\"; ÎÏ×ÁÑ ÏÂÝÁÑ ÆÕÎËÃÉÑ ÂÕÄÅÔ ÐÒÉÓ×ÏÅÎÁ ÐÁËÅÔÕ \"%s"
 #~ "\""
-
 #~ msgid "Function \"%s\" may not be used as a generic (implicitly prohibited)"
 #~ msgstr ""
 #~ "æÕÎËÃÉÑ \"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ × ËÁÞÅÓÔ×Å ÏÂÝÅÊ (ÚÁÐÒÅÝÁÅÔÓÑ "
 #~ "ÂÅÚÏÇÏ×ÏÒÏÞÎÏ)"
-
 #~ msgid ""
 #~ "Implicit generic exists for \"%s\", but will be overriden by explicit "
 #~ "call to setGeneric()"
 #~ msgstr ""
 #~ "ðÏÄÒÁÚÕÍÅ×ÁÅÍÁÑ ÏÂÝÁÑ ÆÕÎËÃÉÑ ÄÌÑ \"%s\" ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÂÕÄÅÔ ÐÅÒÅÐÉÓÁÎÁ "
 #~ "ÞÅÔËÉÍ ×ÙÚÏ×ÏÍ setGeneric()"
-
 #~ msgid ""
 #~ "Unable to find package environment for class \"%s\" to revise subclass "
 #~ "information"
 #~ msgstr ""
 #~ "îÅ ÍÏÇÕ ÎÁÊÔÉ ÏËÒÕÖÅÎÉÅ ÐÁËÅÔÁ ÄÌÑ ËÌÁÓÓÁ \"%s\" ÄÌÑ ÐÅÒÅÓÍÏÔÒÁ "
 #~ "ÉÎÆÏÒÍÁÃÉÉ ÐÏÄËÌÁÓÓÁ"
-
 #~ msgid ""
 #~ "No generic function found for \"%s\"; no action taken in "
 #~ "removeMethodsObject"
 #~ msgstr ""
 #~ "îÅ ÎÁÊÄÅÎÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ \"%s\"; ÎÅ ÐÒÅÄÐÒÉÎÑÔÏ ÎÉËÁËÉÈ ÄÅÊÓÔ×ÉÊ × "
 #~ "removeMethodsObject"
-
 #~ msgid ""
 #~ "the environment/package \"%s\" is locked; cannot remove methods data for "
 #~ "\"%s\""
 #~ msgstr ""
 #~ "ÏËÒÕÖÅÎÉÅ/ÐÁËÅÔ \"%s\" ÚÁÂÌÏËÉÒÏ×ÁÎÏ; ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ ÄÁÎÎÙÅ ÍÅÔÏÄÏ× ÄÌÑ "
 #~ "\"%s\""
-
 #~ msgid ""
 #~ "the methods object name for \"%s\" must include the name of the package "
 #~ "that contains the generic function, but no generic function of this name "
@@ -2454,50 +1738,39 @@
 #~ msgstr ""
 #~ "ÉÍÑ ÏÂßÅËÔÁ ÍÅÔÏÄÏ× ÄÌÑ \"%s\" ÄÏÌÖÎÏ ×ËÌÀÞÁÔØ ÉÍÑ ÐÁËÅÔÁ, ÓÏÄÅÒÖÁÝÅÇÏ "
 #~ "ÏÂÝÕÀ ÆÕÎËÃÉÀ, ÎÏ ÏÂÝÅÊ ÆÕÎËÃÉÉ Ó ÔÁËÉÍ ÉÍÅÎÅÍ ÎÅ ÎÁÊÄÅÎÏ"
-
 #~ msgid ""
 #~ "no way to associate a generic function with an object of class \"%s\""
 #~ msgstr "ÎÅÔ ÓÐÏÓÏÂÁ ÁÓÓÏÃÉÉÒÏ×ÁÔØ ÏÂÝÕÀ ÆÕÎËÃÉÀ Ó ÏÂßÅËÔÏÍ ËÌÁÓÓÁ \"%s\""
-
 #~ msgid "Could not find generic function \"%s\" to initialize cached methods"
 #~ msgstr ""
 #~ "îÅ ÍÏÇÕ ÎÁÊÔÉ ÏÂÝÕÀ ÆÕÎËÃÉÀ \"%s\" ÄÌÑ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ËÜÛÉÒÏ×ÁÎÎÙÈ ÍÅÔÏÄÏ×"
-
 #~ msgid ""
 #~ "trying to change the argument list of %s with %d arguments to have "
 #~ "arguments (%s)"
 #~ msgstr ""
 #~ "ÐÙÔÁÀÓØ ÉÚÍÅÎÉÔØ ÓÐÉÓÏË ÁÒÇÕÍÅÎÔÏ× %s Ó %d ÁÒÇÕÍÅÎÔÁÍÉ ÞÔÏÂÙ ÉÍÅÔØ "
 #~ "ÁÒÇÕÍÅÎÔÙ (%s)"
-
 #~ msgid ""
 #~ "get rid of variables in definition %s (%s); they conflict with the needed "
 #~ "change to argument names (%s)"
 #~ msgstr ""
 #~ "ÉÚÂÁ×ÌÑÀÓØ ÏÔ ÐÅÒÅÍÅÎÎÙÈ × ÏÐÒÅÄÅÌÅÎÉÉ %s (%s); ÏÎÉ ËÏÎÆÌÉËÔÕÀÔ Ó "
 #~ "ÎÅÏÂÈÏÄÉÍÙÍ ÉÚÍÅÎÅÎÉÅÍ × ÉÍÅÎÁÈ ÁÒÇÕÍÅÎÔÁ (%s)"
-
 #~ msgid "arguments in definition %s changed from (%s) to (%s)"
 #~ msgstr "ÁÒÇÕÍÅÎÔÙ × ÏÐÒÅÄÅÌÅÎÉÉ %s ÉÚÍÅÎÅÎÙ Ó (%s) ÎÁ (%s)"
-
 #~ msgid "no methods found for generic \"%s\""
 #~ msgstr "ÎÅ ÎÁÊÄÅÎÏ ÍÅÔÏÄÏ× ÄÌÑ ÏÂÝÅÊ ÆÕÎËÃÉÉ \"%s\""
-
 #~ msgid "\"%s\" is not one of the basic functions"
 #~ msgstr "\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÏÄÎÏÊ ÉÚ ÏÓÎÏ×ÎÙÈ ÆÕÎËÃÉÊ"
-
 #~ msgid "cannot reset \"%s\", the definition is not a generic function object"
 #~ msgstr ""
 #~ "ÎÅ ÍÏÇÕ ÓÂÒÏÓÉÔØ \"%s\", ÏÐÒÅÄÅÌÅÎÉÅ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂßÅËÔÏÍ ÏÂÝÅÊ ÆÕÎËÃÉÉ"
-
 #~ msgid "No nongeneric version of function \"%s\" exists to be restored"
 #~ msgstr ""
 #~ "îÅ ÏÂÎÁÒÕÖÅÎÏ ÎÅ ÏÂÝÅÊ ×ÅÒÓÉÉ ÆÕÎËÃÉÉ \"%s\" ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÅÅ "
 #~ "×ÏÓÓÔÁÎÏ×ÉÔØ"
-
 #~ msgid "\"%s\" from \"%s\" is a non-generic function; no methods available"
 #~ msgstr "\"%s\" ÉÚ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÊ ÆÕÎËÃÉÉ; ÎÅÔ ÄÏÓÔÕÐÎÙÈ ÍÅÔÏÄÏ×"
-
 #~ msgid ""
 #~ "invalid 'fdef' for \"%s\" in 'getAllMethods'; expected either a "
 #~ "'genericFunction object' or a primitive function, got an object of class "
@@ -2506,15 +1779,12 @@
 #~ "ÎÅ×ÅÒÎÙÊ 'fdef' ÄÌÑ \"%s\" × 'getAllMethods'; ÏÖÉÄÁÌÁÓØ ÌÉÂÏ "
 #~ "'genericFunction object' ÌÉÂÏ ÜÌÅÍÅÎÔÁÒÎÁÑ ÆÕÎËÃÉÑ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ "
 #~ "\"%s\""
-
 #~ msgid "Methods list for generic \""
 #~ msgstr "óÐÉÓÏË ÍÅÔÏÄÏ× ÄÌÑ ÏÂÝÅÊ \""
-
 #~ msgid "\" not found"
 #~ msgstr "\" ÎÅ ÎÁÊÄÅÎÏ"
-
 #~ msgid ".UsingMethodsTables: 'onOff' is not TRUE or FALSE"
 #~ msgstr ".UsingMethodsTables: 'onOff' ÎÅ Ñ×ÌÑÅÔÓÑ TRUE ÌÉÂÏ FALSE"
-
 #~ msgid "Package \"%s\" is not loaded"
 #~ msgstr "ðÁËÅÔ \"%s\" ÎÅ ÚÁÇÒÕÖÅÎ"
+
diff -Nru r-base-3.2.3/src/library/methods/po/ru.po r-base-3.3.1/src/library/methods/po/ru.po
--- r-base-3.2.3/src/library/methods/po/ru.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/ru.po	2016-04-27 22:15:30.000000000 +0000
@@ -9,42 +9,32 @@
 msgstr ""
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2013-03-19 21:02-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:14-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian <dactylorhiza at gmail>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: class_support.c:32
 msgid "calling the C routine used as an initializer for 'externalptr' objects"
-msgstr ""
-"×ÙÚÙ×ÁÀ C ÐÒÏÃÅÄÕÒÕ, ÉÓÐÏÌØÚÕÅÍÕÀ ËÁË ÉÎÉÃÉÁÔÏÒ ÄÌÑ 'externalptr' ÏÂßÅËÔÏ×"
+msgstr "×ÙÚÙ×ÁÀ C ÐÒÏÃÅÄÕÒÕ, ÉÓÐÏÌØÚÕÅÍÕÀ ËÁË ÉÎÉÃÉÁÔÏÒ ÄÌÑ 'externalptr' ÏÂßÅËÔÏ×"
 
 #: do_substitute_direct.c:41
 msgid "invalid list for substitution"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÐÉÓÏË ÄÌÑ ÐÏÄÓÔÁÎÏ×ËÉ"
 
 #: methods_list_dispatch.c:149
-msgid ""
-"could not find the skeleton calls for 'methods' (package detached?): expect "
-"very bad things to happen"
-msgstr ""
-"ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏÓÎÏ×ÎÙÅ ×ÙÚÏ×Ù ÄÌÑ 'methods' (ÐÁËÅÔ ÏÔËÌÀÞÅÎ?): ÏÞÅ×ÉÄÎÏ "
-"ÓÌÕÞÉÌÏÓØ ÞÔÏ-ÔÏ ÏÞÅÎØ ÐÌÏÈÏÅ"
+msgid "could not find the skeleton calls for 'methods' (package detached?): expect very bad things to happen"
+msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏÓÎÏ×ÎÙÅ ×ÙÚÏ×Ù ÄÌÑ 'methods' (ÐÁËÅÔ ÏÔËÌÀÞÅÎ?): ÏÞÅ×ÉÄÎÏ ÓÌÕÞÉÌÏÓØ ÞÔÏ-ÔÏ ÏÞÅÎØ ÐÌÏÈÏÅ"
 
 #: methods_list_dispatch.c:215
 #, c-format
-msgid ""
-"no \"allMethods\" slot found in object of class \"%s\" used as methods list "
-"for function '%s'"
-msgstr ""
-"ÎÅ ÎÁÊÄÅÎ \"allMethods\" ÓÌÏÔ × ÏÂßÅËÔÅ ËÌÁÓÓÁ \"%s\", ÉÓÐÏÌØÚÏ×Á×ÛÉÊÓÑ ËÁË "
-"ÓÐÉÓÏË ÍÅÔÏÄÏ× ÄÌÑ ÆÕÎËÃÉÉ '%s'"
+msgid "no \"allMethods\" slot found in object of class \"%s\" used as methods list for function '%s'"
+msgstr "ÎÅ ÎÁÊÄÅÎ \"allMethods\" ÓÌÏÔ × ÏÂßÅËÔÅ ËÌÁÓÓÁ \"%s\", ÉÓÐÏÌØÚÏ×Á×ÛÉÊÓÑ ËÁË ÓÐÉÓÏË ÍÅÔÏÄÏ× ÄÌÑ ÆÕÎËÃÉÉ '%s'"
 
 #: methods_list_dispatch.c:443
 #, c-format
@@ -53,27 +43,21 @@
 
 #: methods_list_dispatch.c:446
 #, c-format
-msgid ""
-"no generic function definition found for '%s' in the supplied environment"
-msgstr ""
-"ÎÅ ÎÁÊÄÅÎÏ ÏÐÒÅÄÅÌÅÎÉÑ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ '%s' × ÐÒÅÄÏÓÔÁ×ÌÅÎÎÏÍ ÏËÒÕÖÅÎÉÉ"
+msgid "no generic function definition found for '%s' in the supplied environment"
+msgstr "ÎÅ ÎÁÊÄÅÎÏ ÏÐÒÅÄÅÌÅÎÉÑ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ '%s' × ÐÒÅÄÏÓÔÁ×ÌÅÎÎÏÍ ÏËÒÕÖÅÎÉÉ"
 
 #: methods_list_dispatch.c:481
 #, c-format
-msgid ""
-"invalid generic function object for method selection for function '%s': "
-"expected a function or a primitive, got an object of class \"%s\""
-msgstr ""
-"ÎÅ ×ÅÒÎÙÊ ÏÂßÅËÔ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ ×ÙÂÏÒÁ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s': ÏÖÉÄÁÌÁÓØ "
-"ÆÕÎËÃÉÑ ÉÌÉ ÐÒÉÍÉÔÉ×, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
+msgid "invalid generic function object for method selection for function '%s': expected a function or a primitive, got an object of class \"%s\""
+msgstr "ÎÅ ×ÅÒÎÙÊ ÏÂßÅËÔ ÏÂÝÅÊ ÆÕÎËÃÉÉ ÄÌÑ ×ÙÂÏÒÁ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s': ÏÖÉÄÁÌÁÓØ ÆÕÎËÃÉÑ ÉÌÉ ÐÒÉÍÉÔÉ×, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
 
 #: methods_list_dispatch.c:496
 #, c-format
 msgid "no direct or inherited method for function '%s' for this call"
-msgstr ""
-"ÎÅÔ ÐÒÑÍÏÇÏ ÉÌÉ ÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s' ÄÌÑ ÄÁÎÎÏÇÏ ×ÙÚÏ×Á"
+msgstr "ÎÅÔ ÐÒÑÍÏÇÏ ÉÌÉ ÎÁÓÌÅÄÏ×ÁÎÎÏÇÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s' ÄÌÑ ÄÁÎÎÏÇÏ ×ÙÚÏ×Á"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:522
+#: methods_list_dispatch.c:1045
 msgid "invalid object (non-function) used as method"
 msgstr "ÎÅ ×ÅÒÎÙÊ ÏÂßÅËÔ (ÎÅ ÆÕÎËÃÉÑ) ÉÓÐÏÌØÚÏ×ÁÎ ËÁË ÍÅÔÏÄ"
 
@@ -84,12 +68,8 @@
 
 #: methods_list_dispatch.c:551
 #, c-format
-msgid ""
-"invalid symbol in checking for missing argument in method dispatch: expected "
-"a name, got an object of class \"%s\""
-msgstr ""
-"ÐÒÉ ÐÒÏ×ÅÒËÉ ÏÔÓÕÔÓÔ×ÕÀÝÅÇÏ ÁÒÇÕÍÅÎÔÁ × ÏÔÐÒÁ×ËÅ ÍÅÔÏÄÁ ÎÁÊÄÅÎ ÎÅÄÏÐÕÓÔÉÍÙÊ "
-"ÓÉÍ×ÏÌ: ÏÖÉÄÁÌÏÓØ ÉÍÑ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
+msgid "invalid symbol in checking for missing argument in method dispatch: expected a name, got an object of class \"%s\""
+msgstr "ÐÒÉ ÐÒÏ×ÅÒËÉ ÏÔÓÕÔÓÔ×ÕÀÝÅÇÏ ÁÒÇÕÍÅÎÔÁ × ÏÔÐÒÁ×ËÅ ÍÅÔÏÄÁ ÎÁÊÄÅÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ: ÏÖÉÄÁÌÏÓØ ÉÍÑ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
 
 #: methods_list_dispatch.c:554
 msgid "use of NULL environment is defunct"
@@ -97,63 +77,40 @@
 
 #: methods_list_dispatch.c:558
 #, c-format
-msgid ""
-"invalid environment in checking for missing argument, '%s', in methods "
-"dispatch: got an object of class \"%s\""
-msgstr ""
-"ÐÒÉ ÐÒÏ×ÅÒËÅ ÏÔÓÕÔÓÔ×ÕÀÝÅÇÏ ÁÒÇÕÍÅÎÔÁ ÏÂÎÁÒÕÖÅÎÏ ÎÅ×ÅÒÎÏÅ ÏËÒÕÖÅÎÉÅ, '%s', × "
-"ÍÅÔÏÄÁÈ ÏÔÐÒÁ×ËÉ: ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
+msgid "invalid environment in checking for missing argument, '%s', in methods dispatch: got an object of class \"%s\""
+msgstr "ÐÒÉ ÐÒÏ×ÅÒËÅ ÏÔÓÕÔÓÔ×ÕÀÝÅÇÏ ÁÒÇÕÍÅÎÔÁ ÏÂÎÁÒÕÖÅÎÏ ÎÅ×ÅÒÎÏÅ ÏËÒÕÖÅÎÉÅ, '%s', × ÍÅÔÏÄÁÈ ÏÔÐÒÁ×ËÉ: ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
 
 #: methods_list_dispatch.c:584
 #, c-format
-msgid ""
-"object of class \"%s\" used as methods list for function '%s' ( no "
-"'argument' slot)"
-msgstr ""
-"ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\" ÉÓÐÏÌØÚÏ×ÁÎ ËÁË ÓÐÉÓÏË ÍÅÔÏÄÏ× ÄÌÑ ÆÕÎËÃÉÉ '%s' ( ÎÅÔ "
-"ÓÌÏÔÁ 'argument' )"
+msgid "object of class \"%s\" used as methods list for function '%s' ( no 'argument' slot)"
+msgstr "ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\" ÉÓÐÏÌØÚÏ×ÁÎ ËÁË ÓÐÉÓÏË ÍÅÔÏÄÏ× ÄÌÑ ÆÕÎËÃÉÉ '%s' ( ÎÅÔ ÓÌÏÔÁ 'argument' )"
 
 #: methods_list_dispatch.c:595
 #, c-format
-msgid ""
-"(in selecting a method for function '%s') '...' and related variables cannot "
-"be used for methods dispatch"
-msgstr ""
-"(ÐÒÉ ×ÙÂÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s') '...' É ÒÏÄÓÔ×ÅÎÎÙÅ ÐÅÒÅÍÅÎÎÙÅ ÎÅ ÍÏÇÕÔ "
-"ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ ÏÔÐÒÁ×ËÉ ÍÅÔÏÄÏ×"
+msgid "(in selecting a method for function '%s') '...' and related variables cannot be used for methods dispatch"
+msgstr "(ÐÒÉ ×ÙÂÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s') '...' É ÒÏÄÓÔ×ÅÎÎÙÅ ÐÅÒÅÍÅÎÎÙÅ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ ÏÔÐÒÁ×ËÉ ÍÅÔÏÄÏ×"
 
 #: methods_list_dispatch.c:598
 #, c-format
-msgid ""
-"(in selecting a method for function '%s') the 'environment' argument for "
-"dispatch must be an R environment; got an object of class \"%s\""
-msgstr ""
-"(ÐÒÉ ×ÙÂÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s') ÁÒÇÕÍÅÎÔ 'environment' ÄÌÑ ÏÔÐÒÁ×ËÉ "
-"ÄÏÌÖÅÎ ÂÙÔØ R ÏËÒÕÖÅÎÉÅÍ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
+msgid "(in selecting a method for function '%s') the 'environment' argument for dispatch must be an R environment; got an object of class \"%s\""
+msgstr "(ÐÒÉ ×ÙÂÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s') ÁÒÇÕÍÅÎÔ 'environment' ÄÌÑ ÏÔÐÒÁ×ËÉ ÄÏÌÖÅÎ ÂÙÔØ R ÏËÒÕÖÅÎÉÅÍ; ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
+#: methods_list_dispatch.c:612
+#: methods_list_dispatch.c:624
 #: methods_list_dispatch.c:995
 #, c-format
-msgid ""
-"error in evaluating the argument '%s' in selecting a method for function "
-"'%s': %s"
-msgstr ""
-"ÏÛÉÂËÁ ÐÒÉ ÏÃÅÎËÅ ÁÒÇÕÍÅÎÔÁ '%s' ÐÒÉ ×ÙÂÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s': %s"
+msgid "error in evaluating the argument '%s' in selecting a method for function '%s': %s"
+msgstr "ÏÛÉÂËÁ ÐÒÉ ÏÃÅÎËÅ ÁÒÇÕÍÅÎÔÁ '%s' ÐÒÉ ×ÙÂÏÒÅ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s': %s"
 
 #: methods_list_dispatch.c:632
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
-msgstr ""
-"ÎÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s' (ÁÒÇÕÍÅÎÔ '%s', Ó ËÌÁÓÓÏÍ \"%s"
-"\")"
+msgstr "ÎÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÍÅÔÏÄÁ ÄÌÑ ÆÕÎËÃÉÉ '%s' (ÁÒÇÕÍÅÎÔ '%s', Ó ËÌÁÓÓÏÍ \"%s\")"
 
 #: methods_list_dispatch.c:639
 #, c-format
-msgid ""
-"recursive use of function '%s' in method selection, with no default method"
-msgstr ""
-"ÒÅËÕÒÓÉ×ÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÆÕÎËÃÉÉ '%s' × ×ÙÂÏÒÅ ÍÅÔÏÄÁ, Ó ÏÔÓÕÔÓÔ×ÉÅÍ ÍÅÔÏÄÁ "
-"ÐÏ-ÕÍÏÌÞÁÎÉÀ"
+msgid "recursive use of function '%s' in method selection, with no default method"
+msgstr "ÒÅËÕÒÓÉ×ÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÆÕÎËÃÉÉ '%s' × ×ÙÂÏÒÅ ÍÅÔÏÄÁ, Ó ÏÔÓÕÔÓÔ×ÉÅÍ ÍÅÔÏÄÁ ÐÏ-ÕÍÏÌÞÁÎÉÀ"
 
 #: methods_list_dispatch.c:698
 #, c-format
@@ -163,8 +120,7 @@
 #: methods_list_dispatch.c:796
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
-msgstr ""
-"'%s' ÄÏÌÖÎÁ ÂÙÔØ ÏÄÉÎÏÞÎÏÊ ÓÔÒÏËÏÊ (ÐÏÌÕÞÅÎ ÓÉÍ×ÏÌØÎÙÊ ×ÅËÔÏÒ ÄÌÉÎÙ %d)"
+msgstr "'%s' ÄÏÌÖÎÁ ÂÙÔØ ÏÄÉÎÏÞÎÏÊ ÓÔÒÏËÏÊ (ÐÏÌÕÞÅÎ ÓÉÍ×ÏÌØÎÙÊ ×ÅËÔÏÒ ÄÌÉÎÙ %d)"
 
 #: methods_list_dispatch.c:800
 #, c-format
@@ -178,8 +134,7 @@
 
 #: methods_list_dispatch.c:875
 msgid "class should be either a character-string name or a class definition"
-msgstr ""
-"ËÌÁÓÓ ÄÏÌÖÅÎ ÂÙÔØ ÌÉÂÏ ÉÍÅÎÅÍ-ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ ÌÉÂÏ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ"
+msgstr "ËÌÁÓÓ ÄÏÌÖÅÎ ÂÙÔØ ÌÉÂÏ ÉÍÅÎÅÍ-ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ ÌÉÂÏ ÏÐÒÅÄÅÌÅÎÉÅÍ ËÌÁÓÓÁ"
 
 #: methods_list_dispatch.c:955
 #, c-format
@@ -188,12 +143,8 @@
 
 #: methods_list_dispatch.c:961
 #, c-format
-msgid ""
-"expected a generic function or a primitive for dispatch, got an object of "
-"class \"%s\""
-msgstr ""
-"ÏÖÉÄÁÌÁÓØ ÏÂÝÁÑ ÆÕÎËÃÉÑ ÌÉÂÏ ÐÒÉÍÉÔÉ× ÄÌÑ ÏÔÐÒÁ×ËÉ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ "
-"\"%s\""
+msgid "expected a generic function or a primitive for dispatch, got an object of class \"%s\""
+msgstr "ÏÖÉÄÁÌÁÓØ ÏÂÝÁÑ ÆÕÎËÃÉÑ ÌÉÂÏ ÐÒÉÍÉÔÉ× ÄÌÑ ÏÔÐÒÁ×ËÉ, ÐÏÌÕÞÅÎ ÏÂßÅËÔ ËÌÁÓÓÁ \"%s\""
 
 #~ msgid ""
 #~ "in processing 'callNextMethod', found a '...' in the matched call, but no "
@@ -201,24 +152,22 @@
 #~ msgstr ""
 #~ "ÐÒÉ ÒÁÚÂÏÒÅ 'callNextMethod', ÎÁÊÄÅÎ '...' × ÓÏ×ÐÁÄÁÀÝÅÍ ×ÙÚÏ×Å, ÎÏ ÎÅÔ "
 #~ "ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÁÒÇÕÍÅÎÔÁ '...'"
-
 #~ msgid ""
 #~ "S language method selection got an error when called from internal "
 #~ "dispatch for function '%s'"
 #~ msgstr ""
 #~ "×ÙÂÏÒ ÍÅÔÏÄÁ ÑÚÙËÁ S ×ÙÚ×ÁÌ ÏÛÉÂËÕ, ËÏÇÄÁ ÂÙÌ ×ÙÚ×ÁÎ ÉÚ ×ÎÕÔÒÅÎÎÅÊ "
 #~ "ÏÔÐÒÁ×ËÉ ÄÌÑ ÆÕÎËÃÉÉ '%s'"
-
 #~ msgid ""
 #~ "internal error in 'callNextMethod': '.nextMethod' was not assigned in the "
 #~ "frame of the method call"
 #~ msgstr ""
 #~ "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ × 'callNextMethod': '.nextMethod' ÎÅ ÂÙÌ ÎÁÚÎÁÞÅÎ ×  "
 #~ "ÓÔÒÕËÔÕÒÅ ×ÙÚÏ×Á ÍÅÔÏÄÁ"
-
 #~ msgid ""
 #~ "Generic \"%s\" seems not to have been initialized for table dispatch---"
 #~ "need to have .SigArgs and .AllMtable assigned in its environment"
 #~ msgstr ""
 #~ "ïÂÝÁÑ \"%s\", ËÁÖÅÔÓÑ, ÎÅ ÂÙÌÁ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÁ ÄÌÑ ÔÁÂÌÉÃÙ ÏÔÐÒÁ×ËÉ---"
 #~ "ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ .SigArgs É .AllMtable ÕÓÔÁÎÏ×ÌÅÎÎÙÍÉ × ÜÔÏÍ ÏËÒÕÖÅÎÉÉ"
+
diff -Nru r-base-3.2.3/src/library/methods/po/R-zh_CN.po r-base-3.3.1/src/library/methods/po/R-zh_CN.po
--- r-base-3.2.3/src/library/methods/po/R-zh_CN.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/R-zh_CN.po	2016-04-27 22:15:30.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-03-15 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -17,7 +17,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "OOPS: something wrong with line %d in '.OldClassesPrototypes'"
+#, fuzzy
+msgid "OOPS: something wrong with '.OldClassesPrototypes[[%d]]'"
 msgstr "啊呀：'.OldClassesPrototypes'里第%d行哪里出错了"
 
 msgid ""
@@ -114,9 +115,10 @@
 msgid "invalid argument 'name': %s"
 msgstr "�数'name'无效: %s"
 
+#, fuzzy
 msgid ""
-"%s is a primitive function;  methods can be defined, but the generic "
-"function is implicit, and cannot be changed."
+"%s dispatches internally;  methods can be defined, but the generic function "
+"is implicit, and cannot be changed."
 msgstr ""
 "%s是基元函数; 能够为其设定方法，但泛型函数是隱�定义的，无法对之进行改动。"
 
@@ -636,15 +638,6 @@
 
 #, fuzzy
 msgid ""
-"Note: the specification for S3 class %s in package %s seems equivalent to "
-"one from package %s: not turning on duplicate class definitions for this "
-"class."
-msgstr ""
-"程�包%2$s里的%1$s S3类别定义似乎与程�包%3$s里的类别定义相当，因此�打开��"
-"的类别定义"
-
-#, fuzzy
-msgid ""
 "Note: some superclasses of class %s in package %s have duplicate "
 "definitions.  This definition is not being treated as equivalent to that "
 "from package %s"
@@ -660,6 +653,11 @@
 "程�包%2$s里的%1$s类别定义似乎与程�包%3$s里的类别定义相当，因此�打开��的"
 "类别定义"
 
+msgid ""
+"Found more than one class \"%s\" in cache; using the first, from namespace "
+"'%s'"
+msgstr ""
+
 msgid "undefined subclass %s of class %s; definition not updated"
 msgstr "%2$s类别的�类别%1$s没有定义；因此没有更新"
 
@@ -743,19 +741,12 @@
 msgstr ""
 "'f'�数�么是字符，�么是泛型函数，�么是原始函数：现在得到的�是普通函数"
 
-msgid "methods cannot be defined for the primitive function %s"
-msgstr "无法为基元函数%s定义方法"
-
 msgid "no generic function found for %s"
 msgstr "为'%s'找�到泛型函数"
 
 msgid "Empty function name in .getGeneric"
 msgstr ".getGeneric里�能有空的函数�字"
 
-msgid ""
-"package %s seems to have out-of-date methods; need to reinstall from source"
-msgstr "程�包%s里的方法好象过时了；请�新安装"
-
 msgid "no methods found for %s; cacheGenericsMetaData() will have no effect"
 msgstr "%s找�到方法；'cacheGenericsMetaData()'没有作用"
 
@@ -839,9 +830,6 @@
 msgid "no definition found for class %s"
 msgstr "类别%s的定义�存在"
 
-msgid "trying to execute load actions without 'methods' package"
-msgstr "没有'methods'程�包时进行加载�作"
-
 msgid "missing function for load action: %s"
 msgstr "�载�作时找�到函数：%s"
 
@@ -1050,6 +1038,13 @@
 "methods currently exist for coercing from %s to %s; they will be replaced."
 msgstr "目�存在�強制转�%s�%s的方法；这些方法将会被替�掉。"
 
+#, fuzzy
+msgid "Function must be an S4 generic"
+msgstr ".getGeneric里�能有空的函数�字"
+
+msgid "method is not being debugged"
+msgstr ""
+
 msgid "object %s not found"
 msgstr "找�到%s这个对象"
 
@@ -1309,6 +1304,10 @@
 msgid "%s is not a field in this class"
 msgstr "%s�是这个类别里的场"
 
+#, fuzzy
+msgid "Methods not found: %s"
+msgstr "找�到%s这个对象"
+
 msgid ""
 "the definition of class %s in package %s is locked, methods may not be "
 "redefined"
@@ -1417,6 +1416,11 @@
 msgstr "%1$s类别的%2$s场有�默认的约�力，因此�能被�定"
 
 msgid ""
+"Reference superclasses must come from the same package for the environment "
+"to be defined:  got %s and %s"
+msgstr ""
+
+msgid ""
 "Class %s is not a subclass of %s; functional semantics not defined for this "
 "class"
 msgstr "%s类别�是%s的�类别；这没有功能语义定义"
@@ -1462,8 +1466,8 @@
 msgid "the method for %s for this signature was not being traced"
 msgstr "此标记的%s方法没有被追踪"
 
-msgid ""
-"making a traced version of a primitive; arguments will be treated as '...'"
+#, fuzzy
+msgid "making a traced version of a special; arguments may be altered"
 msgstr "创造一个被追踪的基元函数版本；其�数将被当作'...'�用"
 
 msgid ""
@@ -1652,6 +1656,26 @@
 "no definition of class %s in the specified position, %s, definitions on : %s"
 msgstr[0] "在指定的%2$s这个�置�存在类别%1$s的定义, 定义在: %3$s"
 
+#, fuzzy
+#~ msgid ""
+#~ "Note: the specification for S3 class %s in package %s seems equivalent to "
+#~ "one from package %s: not turning on duplicate class definitions for this "
+#~ "class."
+#~ msgstr ""
+#~ "程�包%2$s里的%1$s S3类别定义似乎与程�包%3$s里的类别定义相当，因此�打开"
+#~ "��的类别定义"
+
+#~ msgid "methods cannot be defined for the primitive function %s"
+#~ msgstr "无法为基元函数%s定义方法"
+
+#~ msgid ""
+#~ "package %s seems to have out-of-date methods; need to reinstall from "
+#~ "source"
+#~ msgstr "程�包%s里的方法好象过时了；请�新安装"
+
+#~ msgid "trying to execute load actions without 'methods' package"
+#~ msgstr "没有'methods'程�包时进行加载�作"
+
 #~ msgid "special function %s is not permitted to have methods"
 #~ msgstr "特殊函数%s��以有方法"
 
diff -Nru r-base-3.2.3/src/library/methods/po/zh_CN.po r-base-3.3.1/src/library/methods/po/zh_CN.po
--- r-base-3.2.3/src/library/methods/po/zh_CN.po	2015-06-06 22:15:34.000000000 +0000
+++ r-base-3.3.1/src/library/methods/po/zh_CN.po	2016-04-27 22:15:30.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -66,16 +66,16 @@
 msgid "no direct or inherited method for function '%s' for this call"
 msgstr "调用时找�到用于'%s'函数的直接或继承的方法"
 
-#: methods_list_dispatch.c:522 methods_list_dispatch.c:1045
+#: methods_list_dispatch.c:526 methods_list_dispatch.c:1071
 msgid "invalid object (non-function) used as method"
 msgstr "当方法用的对象(�函数)出了错"
 
-#: methods_list_dispatch.c:543
+#: methods_list_dispatch.c:547
 #, c-format
 msgid "could not find symbol '%s' in frame of call"
 msgstr "调用框里找�到'%s'这个符�"
 
-#: methods_list_dispatch.c:551
+#: methods_list_dispatch.c:555
 #, c-format
 msgid ""
 "invalid symbol in checking for missing argument in method dispatch: expected "
@@ -84,18 +84,18 @@
 "方法调度在检查短少�数时符�出了错：需�的是个�字，得到的�是类别为\"%s\"的"
 "对象"
 
-#: methods_list_dispatch.c:554
+#: methods_list_dispatch.c:558
 msgid "use of NULL environment is defunct"
 msgstr "NULL环境��有用"
 
-#: methods_list_dispatch.c:558
+#: methods_list_dispatch.c:562
 #, c-format
 msgid ""
 "invalid environment in checking for missing argument, '%s', in methods "
 "dispatch: got an object of class \"%s\""
 msgstr "方法调度在检查短少�数'%s'时环境出了错：�需�类别为\"%s\"的对象"
 
-#: methods_list_dispatch.c:584
+#: methods_list_dispatch.c:588
 #, c-format
 msgid ""
 "object of class \"%s\" used as methods list for function '%s' ( no "
@@ -103,14 +103,14 @@
 msgstr ""
 "函数'%s'里�能把类别为\"%s\"的对象当作方法串列�用(没有'argument'这样一个槽)"
 
-#: methods_list_dispatch.c:595
+#: methods_list_dispatch.c:599
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') '...' and related variables cannot "
 "be used for methods dispatch"
 msgstr "(在为'%s'函数选择方法时)'...'和其他有关的���能在方法调度时使用"
 
-#: methods_list_dispatch.c:598
+#: methods_list_dispatch.c:602
 #, c-format
 msgid ""
 "(in selecting a method for function '%s') the 'environment' argument for "
@@ -119,55 +119,55 @@
 "(在为'%s'函数选择方法时) 调度时的'environment'�数必需是R环境；�需�类别为"
 "\"%s\"的对象"
 
-#: methods_list_dispatch.c:612 methods_list_dispatch.c:624
-#: methods_list_dispatch.c:995
+#: methods_list_dispatch.c:616 methods_list_dispatch.c:628
+#: methods_list_dispatch.c:1017
 #, c-format
 msgid ""
 "error in evaluating the argument '%s' in selecting a method for function "
 "'%s': %s"
 msgstr "在为'%2$s'函数选择方法时评估'%1$s'�数出了错: %3$s "
 
-#: methods_list_dispatch.c:632
+#: methods_list_dispatch.c:636
 #, c-format
 msgid "no matching method for function '%s' (argument '%s', with class \"%s\")"
 msgstr "找�到与'%s'函数相�的方法(�数是'%s'，类别为\"%s\")"
 
-#: methods_list_dispatch.c:639
+#: methods_list_dispatch.c:643
 #, c-format
 msgid ""
 "recursive use of function '%s' in method selection, with no default method"
 msgstr "在方法选择时函数'%s'�能有无默认方法的递归使用"
 
-#: methods_list_dispatch.c:698
+#: methods_list_dispatch.c:712
 #, c-format
 msgid "error in evaluating a 'primitive' next method: %s"
 msgstr "評估'primitive'其次方法时出了错: %s "
 
-#: methods_list_dispatch.c:796
+#: methods_list_dispatch.c:810
 #, c-format
 msgid "'%s' must be a single string (got a character vector of length %d)"
 msgstr "'%s'必需是�一字符串(现在它是长度为%d的字符��)"
 
-#: methods_list_dispatch.c:800
+#: methods_list_dispatch.c:814
 #, c-format
 msgid "'%s' must be a non-empty string; got an empty string"
 msgstr "'%s'必需是�空字符串；现在它是空的字符串"
 
-#: methods_list_dispatch.c:804
+#: methods_list_dispatch.c:818
 #, c-format
 msgid "'%s' must be a single string (got an object of class \"%s\")"
 msgstr "'%s'必需是�一字符串(现在它是类别为\"%s\"的对象)"
 
-#: methods_list_dispatch.c:875
+#: methods_list_dispatch.c:895
 msgid "class should be either a character-string name or a class definition"
 msgstr "类别必需是字符串�字或类别定义"
 
-#: methods_list_dispatch.c:955
+#: methods_list_dispatch.c:975
 #, c-format
 msgid "failed to get the generic for the primitive \"%s\""
 msgstr "没有能够为原始\"%s\"找到�属函数"
 
-#: methods_list_dispatch.c:961
+#: methods_list_dispatch.c:982
 #, c-format
 msgid ""
 "expected a generic function or a primitive for dispatch, got an object of "
diff -Nru r-base-3.2.3/src/library/methods/R/addedFunctions.R r-base-3.3.1/src/library/methods/R/addedFunctions.R
--- r-base-3.2.3/src/library/methods/R/addedFunctions.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/addedFunctions.R	2016-03-16 23:03:40.000000000 +0000
@@ -17,14 +17,9 @@
 #  https://www.R-project.org/Licenses/
 
 
-functionBody <- base::body #was get("body", mode = "function")
+functionBody <- body
 
-`functionBody<-` <- base::`body<-`
-## was
-## .ff <- function(fun, envir = environment(fun), value) fun
-## body(.ff, envir = .GlobalEnv) <- body(get("body<-"))
-## "functionBody<-" <- .ff
-## rm(.ff)
+`functionBody<-` <- `body<-`
 
 allNames <-
   ## the character vector of names (unlike names(), never returns NULL)
@@ -90,7 +85,7 @@
         else NULL
     }
     else
-        el(x,i)
+        x[[i]]
 }
 
 "elNamed<-" <-
diff -Nru r-base-3.2.3/src/library/methods/R/as.R r-base-3.3.1/src/library/methods/R/as.R
--- r-base-3.2.3/src/library/methods/R/as.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/as.R	2016-03-16 23:03:40.000000000 +0000
@@ -125,7 +125,7 @@
     ## be the equivalent of new("toClass", fromObject)
     ## But must check that replacement is defined, in the case
     ## of nonstandard superclass relations
-    replaceMethod <- elNamed(ClassDef@contains, fromClass)
+    replaceMethod <- ClassDef@contains[[fromClass]]
     if(is(replaceMethod, "SClassExtension") &&
        !identical(as(replaceMethod@replace, "function"), .ErrorReplace)) {
         f <- function(from, to) NULL
@@ -261,7 +261,7 @@
                             domain = NA)
                 }
                 method <- eval(function(from, to, value)NULL)
-                functionBody(method, envir = .GlobalEnv) <- replace
+                body(method, envir = .GlobalEnv) <- replace
             }
             setMethod("coerce<-", c(from, to), method, where = where)
         }
@@ -338,6 +338,17 @@
             as.name(from)
         })
   setMethod("coerce", c("ANY","name"), method, where = where)
+  ## Proposed on R-devel, Dec. 7, 2015, by JMC, this is too radical,
+  ## coercing to "double" in too many cases where "numeric" data remained "integer":
+  ## setMethod("coerce", c("integer", "numeric"),
+  ##           ## getMethod("coerce", c("ANY", "numeric"), where = envir) -- not yet available
+  ##           function (from, to, strict = TRUE) {
+  ##               value <- as.numeric(from)
+  ##               if(strict)
+  ##                   attributes(value) <- NULL
+  ##               value
+  ##           }, where = where)
+
   ## not accounted for and maybe not needed:  real, pairlist, double
 }
 
diff -Nru r-base-3.2.3/src/library/methods/R/BasicClasses.R r-base-3.3.1/src/library/methods/R/BasicClasses.R
--- r-base-3.2.3/src/library/methods/R/BasicClasses.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/BasicClasses.R	2016-03-16 23:03:40.000000000 +0000
@@ -16,6 +16,7 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
+
 ## a few class name definitions needed elsewhere
 .anyClassName <- structure("ANY", package = "methods")
 .signatureClassName <- structure("signature", package = "methods")
@@ -34,11 +35,9 @@
            function(name, properties, prototype, extends, where) {
                list(properties=properties, prototype = prototype, extends = extends)
            }, envir)
-    clList = character()
-    setClass("VIRTUAL", where = envir); clList <- c(clList, "VIRTUAL")
-    setClass("ANY", where = envir); clList <- c(clList, "ANY")
-    setClass("vector", where = envir); clList <- c(clList, "vector")
-    setClass("missing", where = envir); clList <- c(clList, "missing")
+    clList <- c("VIRTUAL", "ANY", "vector", "missing")
+    for(.class in clList)
+        setClass(.class, where = envir)
     ## "numeric" is the class returned by class() for double vectors
     vClasses <- c("logical", "numeric", "character",
                   "complex", "integer", "raw",
@@ -156,7 +155,8 @@
         if(is.list(el) && length(el) > 1)
             setOldClass(el[[1L]], prototype = el[[2L]],  where = envir)
         else
-            warning(gettextf("OOPS: something wrong with line %d in '.OldClassesPrototypes'", i), domain = NA)
+	    warning(gettextf("OOPS: something wrong with '.OldClassesPrototypes[[%d]]'", i),
+		    domain = NA)
     }
     setGeneric("slotsFromS3", where = envir)
     ## the method for "oldClass" is really a constant, just hard to express that way
@@ -235,16 +235,16 @@
         }
         NULL
     }, where = envir)
-   .initS3 <- function(.Object, ...) {
-         if(nargs() < 2)
-           return(.Object)
-         Class <- class(.Object)
-         ClassDef <- getClass(Class)
-         S3Class <- attr(ClassDef@prototype, ".S3Class")
-         if(is.null(S3Class)) # not a class set up by setOldClass()
-             return(callNextMethod())
+    .initS3 <- function(.Object, ...) {
+	if(nargs() < 2)
+	    return(.Object)
+	Class <- class(.Object)
+	ClassDef <- getClass(Class)
+	S3Class <- attr(ClassDef@prototype, ".S3Class")
+	if(is.null(S3Class)) # not a class set up by setOldClass()
+	    return(callNextMethod())
         S3ClassP <- S3Class[[1L]]
-         args <- list(...)
+	args <- list(...)
         ## separate the slots, superclass objects
         snames <- allNames(args)
         which <- nzchar(snames)
@@ -252,32 +252,32 @@
         supers <- args[!which]
         thisExtends <- names(ClassDef@contains)
         slotDefs <- ClassDef@slots
-        dataPart <- elNamed(slotDefs, ".Data")
+        dataPart <- slotDefs[[".Data"]]
         if(is.null(dataPart))
           dataPart <- "missing" # nothing will extend this => no data part args allowed
-        if(length(supers) > 0) {
-            for(i in rev(seq_along(supers))) {
-                obj <- el(supers, i)
-                Classi <- class(obj)
-                defi <- getClassDef(Classi)
-                if(is.null(defi))
-                  stop(gettextf("unnamed argument to initialize() for S3 class must have a class definition; %s does not",
-                                dQuote(Classi)),
-                       domain = NA)
-                if(is(obj, S3ClassP)) {
-                    ## eligible to be the S3 part; merge other slots from prototype;
-                    ## obj then becomes the object, with its original class as the S3Class
-                    if(is.null(attr(obj, ".S3Class"))) # must be an S3 object; use its own class
-                       attr(obj, ".S3Class") <- Classi
-                    .Object <- .asS4(.mergeAttrs(obj, .Object))
-                }
-                else if(is(obj, dataPart)) {
-                    ## the S3Class stays from the prototype
-                    .Object <- .mergeAttrs(obj, .Object)
-                }
-                else stop(gettextf("unnamed argument must extend either the S3 class or the class of the data part; not true of class %s", dQuote(Classi)), domain = NA)
-
+        for(i in rev(seq_along(supers))) {
+            obj <- supers[[i]]
+            Classi <- class(obj)
+            defi <- getClassDef(Classi)
+            if(is.null(defi))
+                stop(gettextf(
+                    "unnamed argument to initialize() for S3 class must have a class definition; %s does not",
+                    dQuote(Classi)),
+                     domain = NA)
+            if(is(obj, S3ClassP)) {
+                ## eligible to be the S3 part; merge other slots from prototype;
+                ## obj then becomes the object, with its original class as the S3Class
+                if(is.null(attr(obj, ".S3Class"))) # must be an S3 object; use its own class
+                    attr(obj, ".S3Class") <- Classi
+                .Object <- .asS4(.mergeAttrs(obj, .Object))
+            }
+            else if(is(obj, dataPart)) {
+                ## the S3Class stays from the prototype
+                .Object <- .mergeAttrs(obj, .Object)
             }
+            else stop(gettextf(
+	"unnamed argument must extend either the S3 class or the class of the data part; not true of class %s",
+			       dQuote(Classi)), domain = NA)
         }
         ## named slots are done as in the default method, which will also call validObject()
         if(length(elements)>0) {
@@ -373,7 +373,8 @@
                       if(match(".Data", names(slots), 0L) > 0L) {
                           data <- unclass(from)
                           if(!is(data, slots[[".Data"]]))
-                            stop(gettextf("object must be a valid data part for class %s; not true of type %s", dQuote(cl), dQuote(class(data))),
+                            stop(gettextf("object must be a valid data part for class %s; not true of type %s",
+					  dQuote(cl), dQuote(class(data))),
                                  domain = NA)
                           value@.Data <- unclass(from)
                       }
@@ -457,7 +458,7 @@
     setMethod("initialize", "matrix", where = where,
               function(.Object, ...) {
 		  if(nargs() < 2) # guaranteed to be called with .Object from new
-                    return(.Object)
+                      return(.Object)
 		  else {
                       if(isMixin(getClass(class(.Object)))) # other superclasses
                           callNextMethod()
@@ -518,17 +519,18 @@
 
 }
 
-## .OldClassList is a purely heuristic list of known old-style classes, with emphasis
+## .OldClassesList is a purely heuristic list of known old-style classes, with emphasis
 ## on old-style class inheritiance.  Used in .InitBasicClasses to call setOldClass for
 ## each known class pattern.
 ## .OldClassesPrototypes is a list of S3 classes for which prototype
-## objects are known & reasonable.  The classes will reappear in
-## .OldClassesList, but will have been initialized first in
-## .InitBasicClasses.  NB:  the methods package will NOT set up
-## prototypes for S3 classes except those in package base and for "ts"
-## (and would rather not do those either).  The package that owns the
-## S3 class should have code to call setOldClass in its
-## initialization.
+## objects are known & reasonable.
+## Its classes should not reappear in .OldClassesList (as these become VIRTUAL)
+## and will have been initialized first in .InitBasicClasses().
+## NB: the methods package will NOT set up prototypes for S3 classes
+##     except those in package base and for "ts" and "formula"
+##     (and would rather not do those either).
+## Ideally, the package that owns the S3 class should have code to call
+## setOldClass in its initialization.
 .OldClassesPrototypes <-
   list(
        list("data.frame",  data.frame(), "data.frame"),
@@ -537,6 +539,7 @@
        list("table",  table(factor())),
        list("summary.table",  summary.table(table(factor())))
        , list("ts", stats::ts())
+       , list("formula", stats::formula())
        )
 .OldClassesList <-
     list(
@@ -551,7 +554,6 @@
          c("POSIXlt", "POSIXt"),
          "Date",
          "dump.frames",
-         c("ordered", "factor"),
          c("glm.null", "glm", "lm"),
          c("anova.glm.null", "anova.glm"),
          "hsearch",
@@ -560,14 +562,11 @@
          "libraryIQR",
          "packageIQR",
          "mtable",
-         "table",
          c("summaryDefault","table"),
-         "summary.table",
          "recordedplot",
          "socket",
          "packageIQR",
          "density",
-         "formula",
          "logLik",
          "rle"
 )
@@ -599,8 +598,9 @@
         print(structure(object@.Data, names=object@names))
         showExtraSlots(object, getClass("namedList"))
     })
-    setClass("listOfMethods", representation(  arguments = "character",
-                                                 signatures = "list", generic = "genericFunction"), contains = "namedList",
+    setClass("listOfMethods", representation(arguments = "character",
+					     signatures = "list", generic = "genericFunction"),
+             contains = "namedList",
              where = where)
     specialClasses <- c(specialClasses, "namedList", "listOfMethods")
     assign(".SealedClasses", c(get(".SealedClasses", where), specialClasses), where)
@@ -639,7 +639,7 @@
                       localObjs <- is.na(match(objs, slots))
                       if(any(localObjs)) {
                           for(what in objs[localObjs])
-                              assign(what, elNamed(args, what), envir = selfEnv)
+                              selfEnv[[what]] <- args[[what]]
                           objs <- objs[!localObjs]
                           args <- args[!localObjs]
                       }
diff -Nru r-base-3.2.3/src/library/methods/R/BasicFunsList.R r-base-3.3.1/src/library/methods/R/BasicFunsList.R
--- r-base-3.2.3/src/library/methods/R/BasicFunsList.R	2015-08-25 22:17:11.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/BasicFunsList.R	2016-03-16 23:03:40.000000000 +0000
@@ -22,9 +22,8 @@
 ## needs to have a special form (e.g., belonging to one of the
 ## predefined groups of functions).
 
-## The list is expanded in .makeBasicFuns by adding the S4 group generics
-## and the remaining primitives.
-
+##' The list is expanded in .makeBasicFuns() -> ./makeBasicFunsList.R by
+##' adding the S4 group generics and the remaining primitives.
 .BasicFunsList <-
 list(
 ### subset/subassignment ops are regarded as language elements
@@ -77,26 +76,38 @@
 ## functions.
 
 .addBasicGeneric <-
-    function(funslist, f, fdef, group = list())
+    function(funslist, f, fdef, group = list(), internal = FALSE,
+             internalArgs = names(formals(deflt)))
 {
-    signature <- attr(fdef, "signature") #typically NULL, but see the case for "$"
-    deflt <- get(f, "package:base")
+    deflt <- .BaseNamespaceEnv[[f]]
     ## use the arguments of the base package function
     ##FIXME:  should also deal with the functions having ... as the first
     ## argument, but needs to create a generic with different args from the deflt
     ## => constructing a call to the base function from the default
     if(is.primitive(deflt)) {
-        body(fdef, envir = globalenv()) <-
+        signature <- attr(fdef, "signature") #typically NULL, but see the case for "$"
+        body(fdef, envir = topenv()) <-
             substitute(standardGeneric(FNAME, DEFLT), list(FNAME=f, DEFLT=deflt))
     }
     else {
+        if (internal) {
+	    ## "forgets" the *defaults* of arguments, e.g. the "any" of as.vector():
+	    ## formals(deflt) <- setNames(rep(alist(x=), length(internalArgs)),
+	    ##                            internalArgs)
+            call <- as.call(c(as.name(f), lapply(internalArgs, as.name)))
+            body(deflt, envir = baseenv()) <-
+                substitute(.Internal(CALL), list(CALL=call))
+        }
         fdef <- deflt
-        body(fdef, envir = globalenv()) <-
+        body(fdef, envir = topenv()) <-
             substitute(standardGeneric(FNAME), list(FNAME=f))
     }
-    deflt <- .derivedDefaultMethod(deflt)
-    elNamed(funslist, f) <- makeGeneric(f, fdef, deflt, group = group, package = "base",
-                                        signature = signature)
+    deflt <- .derivedDefaultMethod(deflt, internal = if (internal) f)
+    if (internal) {
+        signature <- names(formals(deflt))[1L]
+    }
+    funslist[[f]] <- makeGeneric(f, fdef, deflt, group = group, package = "base",
+                                 signature = signature)
     funslist
 }
 
@@ -122,8 +133,20 @@
 
 ## temporary versions while primitives are still handled by a global table
 
-genericForPrimitive <- function(f, where = topenv(parent.frame()),
-                                mustFind = TRUE)
+isBaseFun <- function(fun) {
+    is.primitive(fun) || identical(environment(fun), .BaseNamespaceEnv)
+}
+
+inBasicFuns <- function(f) {
+    !is.null(.BasicFunsList[[f]])
+}
+
+dispatchIsInternal <- function(fdef) {
+    is.primitive(fdef@default) || is(fdef@default, "internalDispatchMethod")
+}
+
+genericForBasic <- function(f, where = topenv(parent.frame()),
+                            mustFind = TRUE)
 {
     ans <- .BasicFunsList[[f]]
     ## this element may not exist (yet, during loading), don't test null
diff -Nru r-base-3.2.3/src/library/methods/R/ClassExtensions.R r-base-3.3.1/src/library/methods/R/ClassExtensions.R
--- r-base-3.2.3/src/library/methods/R/ClassExtensions.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/ClassExtensions.R	2016-03-16 23:03:40.000000000 +0000
@@ -185,7 +185,7 @@
     distance <- 1
     ##FIX ME:  when by is supplied, should use the existing extension information
     ## to compute distance
-    dataPartClass <- elNamed(slots, ".Data")
+    dataPartClass <- elNamed(slots, ".Data") # This seems to be the only elNamed that has to stay
     dataPart <- FALSE
     if(simple && !is.null(dataPartClass)) {
         if(!(is.null(getClassDef(dataPartClass)) || is.null(getClassDef(to)))) {
@@ -234,7 +234,7 @@
     }
     if(is.null(replace)) {
         if(dataPart) {
-            extn <- elNamed(classDef2@contains, dataPartClass)
+            extn <- classDef2@contains[[dataPartClass]]
             if(is(extn, "SClassExtension"))
                 easy <- extn@simple
             else
diff -Nru r-base-3.2.3/src/library/methods/R/fixPrevious.R r-base-3.3.1/src/library/methods/R/fixPrevious.R
--- r-base-3.2.3/src/library/methods/R/fixPrevious.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/fixPrevious.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/fixPrevious.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 fixPre1.8 <- function(names, where = topenv(parent.frame())) {
     done <- character()
     for(what in names) {
-        objWhere <- methods:::.findAll(what, where)
+        objWhere <- .findAll(what, where)
         if(length(objWhere) == 0) {
             warning(gettextf("object %s not found",
                              sQuote(what)),
diff -Nru r-base-3.2.3/src/library/methods/R/is.R r-base-3.3.1/src/library/methods/R/is.R
--- r-base-3.2.3/src/library/methods/R/is.R	2015-08-25 22:17:11.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/is.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/is.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -25,14 +25,14 @@
     cl <- class(object)
     S3Case <- length(cl) > 1L
     if(S3Case)
-      cl <- cl[[1L]]
+        cl <- cl[[1L]]
     if(missing(class2))
         return(extends(cl))
     class1Def <- getClassDef(cl)
     if(is.null(class1Def)) # an unregistered S3 class
-      return(inherits(object, class2))
+        return(inherits(object, class2))
     if(is.character(class2))
-      class2Def <- getClassDef(class2, .classDefEnv(class1Def))
+        class2Def <- getClassDef(class2, .classDefEnv(class1Def))
     else {
         class2Def <- class2
         class2 <- class2Def@ className
@@ -41,18 +41,17 @@
     ## class or an S3 class (registered or not)
     S3Case <- S3Case || (is.object(object) && !isS4(object)) # first requirement
     S3Case <- S3Case && (is.null(class2Def) || class2 %in% .BasicClasses ||
-                         extends(class2Def, "oldClass"))
+			 extends(class2Def, "oldClass"))
     if(S3Case)
-        return(inherits(object, class2))
-    if(.identC(cl, class2) || .identC(class2, "ANY"))
-        return(TRUE)
-    ext <- possibleExtends(cl, class2, class1Def, class2Def)
-    if(is.logical(ext))
+        inherits(object, class2)
+    else if(.identC(cl, class2) || .identC(class2, "ANY"))
+        TRUE
+    else if(is.logical(ext <- possibleExtends(cl, class2, class1Def, class2Def)))
         ext
     else if(ext@simple)
         TRUE
     else
-       ext@test(object)
+        ext@test(object)
 }
 
 extends <-
@@ -76,11 +75,11 @@
         ext <- classDef1@contains
         if(!identical(maybe, TRUE) && length(ext) > 0)
         {
-            noTest <- sapply(ext, function(obj)identical(body(obj@test), TRUE))
+            noTest <- vapply(ext, function(obj)identical(body(obj@test), TRUE), NA)
             ext <- ext[noTest]
         }
         if(fullInfo) {
-            elNamed(ext, class1) <- TRUE
+            ext[[class1]] <- TRUE
             return(ext)
         }
         else
@@ -172,7 +171,7 @@
     if(!identical(ok, TRUE))
       stop(ok)
     where2 <- .findOrCopyClass(class2, classDef2, where, "subclass")
-    elNamed(classDef2@subclasses, class1) <- obj
+    classDef2@subclasses[[class1]] <- obj
     if(doComplete)
         classDef2@subclasses <- completeSubclasses(classDef2, class1, obj, where)
     ## try to provide a valid prototype for virtual classes
@@ -244,7 +243,7 @@
                                  paste(n2[is.na(match(n2, n1))], collapse = ", "))))
             bad <- character()
             for(what in n2)
-                if(!extends(elNamed(slots1, what), elNamed(slots2, what)))
+                if(!extends(slots1[[what]], slots2[[what]]))
                     bad <- c(bad, what)
             if(length(bad))
                 return(c(.msg(class1, class2), ": ",
@@ -263,7 +262,7 @@
     superclasses <- names(contains)
     if(length(superclasses2) == 0 || length(superclasses) == 0 ||
        all(is.na(match(superclasses2, superclasses))))
-      elNamed(contains, class2) <- value
+      contains[[class2]] <- value
     else {
         sq <- seq_along(superclasses)
         before <- (sq[match(superclasses, superclasses2,0)>0])[[1]]
diff -Nru r-base-3.2.3/src/library/methods/R/makeBasicFunsList.R r-base-3.3.1/src/library/methods/R/makeBasicFunsList.R
--- r-base-3.2.3/src/library/methods/R/makeBasicFunsList.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/makeBasicFunsList.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,11 +1,11 @@
 #  File src/library/methods/R/makeBasicFunsList.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
 #
 #  This program is distributed in the hope that it will be useful,
@@ -41,7 +41,7 @@
     prims <- names(.GenericArgsEnv)
     new_prims <- setdiff(prims, names(funs))
     for(nm in new_prims) {
-        f <- get(nm, envir = .GenericArgsEnv)
+        f <- .GenericArgsEnv[[nm]]
         body(f) <- substitute(standardGeneric(ff), list(ff=val))
         funs <- .addBasicGeneric(funs, nm, f, "")
     }
@@ -158,6 +158,12 @@
     setGroupGeneric(where=where,"Complex", function(z)NULL,
 		    knownMembers = members, package = "base")
 
+    funs <- .addBasicGeneric(funs, "unlist", internal=TRUE)
+### TODO: bring back if/when .Internal(is.unsorted()) is useful to override 
+    ## funs <- .addBasicGeneric(funs, "is.unsorted", internal=TRUE,
+    ##                          internalArgs=c("x", "strictly"))
+    funs <- .addBasicGeneric(funs, "as.vector", internal=TRUE)
+    
     assign(".BasicFunsList", funs, envir=where)
     rm(.addBasicGeneric, envir=where)
 }
@@ -246,6 +252,19 @@
 	       signature = c("x", "size"), where = where)
     setGenericImplicit("sample", where, FALSE)
 
+    ## qr.R(): signature should only have "qr", args should have "..."
+    setGeneric("qr.R", function(qr, complete = FALSE, ...) standardGeneric("qr.R"),
+	       useAsDefault= function(qr, complete = FALSE, ...)
+                   base::qr.R(qr, complete=complete),
+	       signature = "qr", where = where)
+    setGenericImplicit("qr.R", where, FALSE)
+
+    ## our toeplitz() only has 'x'; want the generic "here" rather than "out there"
+    setGeneric("toeplitz", function(x, ...) standardGeneric("toeplitz"),
+	       useAsDefault= function(x, ...) stats::toeplitz(x),
+	       signature = "x", where = where)
+    setGenericImplicit("toeplitz", where, FALSE)
+
     ## not implicitGeneric() which is not yet available "here"
     registerImplicitGenerics(where = where)
 }
diff -Nru r-base-3.2.3/src/library/methods/R/MethodsListClass.R r-base-3.3.1/src/library/methods/R/MethodsListClass.R
--- r-base-3.2.3/src/library/methods/R/MethodsListClass.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/MethodsListClass.R	2016-03-16 23:03:40.000000000 +0000
@@ -55,6 +55,9 @@
              where = envir); clList <- c(clList, "MethodDefinition")
     ## class for default methods made from ordinary functions
     setClass("derivedDefaultMethod", "MethodDefinition")
+    ## class for methods that call and dispatch inside .Internal()
+    setClass("internalDispatchMethod", contains = "derivedDefaultMethod",
+             representation(internal = "character"))
     ## class for methods with precomputed information for callNextMethod
     setClass("MethodWithNext",
              representation("MethodDefinition", nextMethod = "PossibleMethod", excluded = "list"), where = envir); clList <- c(clList, "MethodWithNext")
@@ -193,7 +196,7 @@
                   args <- list(...)
                   objs <- names(args)
                   for(what in objs)
-                      assign(what, elNamed(args, what), envir = value)
+                      value[[what]] <- args[[what]]
                   value
               }, where = envir)
     ## from 2.11.0, the MethodsList class is deprecated
diff -Nru r-base-3.2.3/src/library/methods/R/MethodsList.R r-base-3.3.1/src/library/methods/R/MethodsList.R
--- r-base-3.2.3/src/library/methods/R/MethodsList.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/MethodsList.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/MethodsList.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
     i <- match("", mnames)
     if(!is.na(i)) {
         ## convert to ANY
-        el(mnames, i) <- "ANY"
+        mnames[[i]] <- "ANY"
         names(object) <- mnames
     }
     if(anyDuplicated(mnames))
@@ -65,12 +65,12 @@
              level, paste("\"", unique(mnames[duplicated(mnames)]), "\"",
                           collapse=", ")), domain = NA)
     for(i in seq_along(object)) {
-        eli <- el(object, i)
+        eli <- object[[i]]
         if(is(eli, "function")
            || is(eli, "MethodsList")) {}
         else if(is(eli, "list") ||
                 is(eli, "named"))
-            el(object, i) <- Recall(eli, NULL, level+1)
+            object[[i]] <- Recall(eli, NULL, level+1)
         else
             stop(gettextf("element %d at level %d (class %s) cannot be interpreted as a function or named list",
                           i, level, dQuote(class(eli))),
@@ -97,10 +97,10 @@
         stop("arguments 'names' and 'signature' must have the same length")
     if(n == 0)
         return(definition)
-    Class <- el(signature,n)
-    name <- el(names, n)
+    Class <- signature[[n]]
+    name <- names[[n]]
     m <- MethodsList(name)
-    elNamed(slot(m, "methods"), Class) <- definition
+    slot(m, "methods")[[Class]] <- definition
     slot(m, "argument") <- as.name(name)
     SignatureMethod(names[-n], signature[-n], m)
 }
@@ -134,9 +134,9 @@
              domain = NA)
     if(length(args) > 1 && !cacheOnly)
         mlist <- balanceMethodsList(mlist, args)
-    Class <- el(signature, 1)
+    Class <- signature[[1]]
     methods <- if(cacheOnly) mlist@allMethods else mlist@methods
-    current <- elNamed(methods, Class)
+    current <- methods[[Class]]
     if(is(current, "MethodsList")) {
         nextArg <- as.character(current@argument)
         sigArgs <- args
@@ -155,7 +155,7 @@
     if(length(signature) == 1) {
         if(is.null(current)) {
             if(!is.null(def))
-                elNamed(methods, Class) <- def
+                methods[[Class]] <- def
             ## else, no change
         }
         else {
@@ -164,7 +164,7 @@
                 ## delete the method
                 methods <- methods[-which]
             else
-                el(methods, which) <- def
+                methods[[which]] <- def
         }
     }
     else { ## recursively merge, initializing current if necessary
@@ -173,7 +173,7 @@
         else if(is.function(current))
             current <- new("MethodsList", argument = as.name(args[2L]),
 			   methods = list(ANY = current))
-        elNamed(methods, Class) <-
+        methods[[Class]] <-
             Recall(current, signature[-1L], args[-1L], def, cacheOnly)
     }
     mlist@allMethods <- methods
@@ -349,7 +349,7 @@
                 if(is.null(value)) resetMlist <- mlist else resetMlist <- value
             }
             .setMethodsForDispatch(f, fdef, resetMlist)
-            if(is.primitive(finalDefault))
+            if(dispatchIsInternal(fdef))
                 setPrimitiveMethods(f, finalDefault, "set", fdef, resetMlist)
         }
 
@@ -391,7 +391,7 @@
           break
         if(is(method, "MethodsList")) {
 	    .MlistDeprecated()
-            method <-  elNamed(slot(method, "methods"), "ANY")
+            method <-  slot(method, "methods")[["ANY"]]
         } else
           stop(gettextf(
 	"default method must be a method definition, a primitive or NULL: got an object of class %s",
@@ -414,7 +414,7 @@
 {
   .MlistDeprecated("inheritedSubMethodLists()")
   methods <- slot(mlist, "methods")## only direct methods
-  defaultMethod <- elNamed(methods, "ANY")## maybe NULL
+  defaultMethod <- methods[["ANY"]]## maybe NULL
   classes <- names(methods)
   value <- list()
   if(.identC(thisClass, "missing")) {
@@ -433,28 +433,28 @@
           superClasses <- names(classDef@contains)
           classes <- superClasses[!is.na(match(superClasses, classes))]
           for(which in seq_along(classes)) {
-              tryClass <- el(classes, which)
+              tryClass <- classes[[which]]
               ## TODO:  There is potential bug here:  If the is relation is conditional,
               ## we should not cache this selection.  Needs another trick in the environment
               ## to FORCE no caching regardless of what happens elsewhere; e.g., storing a
               ## special object in .Class
               if(is.null(object) || is(object, tryClass)) {
-                  elNamed(value, tryClass) <- elNamed(methods, tryClass)
+                  value[[tryClass]] <- methods[[tryClass]]
               }
           }
       }
       else {
           for(which in seq_along(classes)) {
-              tryClass <- el(classes, which)
+              tryClass <- classes[[which]]
               tryClassDef <- getClassDef(tryClass, ev)
               if(!is.null(tryClassDef) &&
                  !is.na(match(thisClass, names(tryClassDef@subclasses))))
-                  elNamed(value, tryClass) <- el(methods, which)
+                  value[[tryClass]] <- methods[[which]]
           }
       }
   }
   if(!is.null(defaultMethod))
-      elNamed(value, "ANY") <- defaultMethod
+      value[["ANY"]] <- defaultMethod
   value
 }
 
@@ -542,40 +542,40 @@
 	       length(which), length(anames), sQuote(fun@generic)), domain = NA)
     }
     else {
-    ## construct a function call with the same naming pattern  &
-      ## values as signature
-    sigList <- signature
-    for(i in seq_along(sigList))
-        sigList[[i]] <- c(sigClasses[[i]], pkgs[[i]])
-    fcall <- do.call("call", c("fun", sigList))
-    ## match the call to the formal signature (usually the formal args)
-    if(identical(anames, formalArgs(fun)))
-        smatch <- match.call(fun, fcall)
-    else {
-        fmatch <- fun
-        ff <- as.list(anames); names(ff) <- anames
-        formals(fmatch, envir = environment(fun)) <- ff
-        smatch <- match.call(fmatch, fcall)
-    }
-    snames <- names(smatch)[-1L]
-    which <- match(snames, anames)
-    ## Assertion:  match.call has permuted the args into the order of formal args,
-    ## and carried along the values.  Get the supplied classes in that
-    ## order, from the matched args in the call object.
-    if(anyNA(which))
-        stop(sprintf(ngettext(sum(is.na(which)),
-                              "in the method signature for function %s invalid argument name in the signature: %s",
-                              "in the method signature for function %s invalid argument names in the signature: %s"),
-                     sQuote(fun@generic),
-                     paste(snames[is.na(which)], collapse = ", ")),
-             domain = NA)
-    smatch <- smatch[-1]
-    for(i in seq_along(smatch)) {
-        eli <- smatch[[i]]
-        sigClasses[[i]] <- eli[[1]]
-        pkgs[[i]] <- eli[[2]]
+        ## construct a function call with the same naming pattern  &
+        ## values as signature
+        sigList <- signature
+        for(i in seq_along(sigList))
+            sigList[[i]] <- c(sigClasses[[i]], pkgs[[i]])
+        fcall <- do.call("call", c("fun", sigList))
+        ## match the call to the formal signature (usually the formal args)
+        if(identical(anames, formalArgs(fun)))
+            smatch <- match.call(fun, fcall)
+        else {
+            fmatch <- fun
+            ff <- as.list(anames); names(ff) <- anames
+            formals(fmatch, envir = environment(fun)) <- ff
+            smatch <- match.call(fmatch, fcall)
+        }
+        snames <- names(smatch)[-1L]
+        which <- match(snames, anames)
+        ## Assertion:  match.call has permuted the args into the order of formal args,
+        ## and carried along the values.  Get the supplied classes in that
+        ## order, from the matched args in the call object.
+        if(anyNA(which))
+            stop(sprintf(ngettext(sum(is.na(which)),
+                                  "in the method signature for function %s invalid argument name in the signature: %s",
+                                  "in the method signature for function %s invalid argument names in the signature: %s"),
+                         sQuote(fun@generic),
+                         paste(snames[is.na(which)], collapse = ", ")),
+                 domain = NA)
+        smatch <- smatch[-1]
+        for(i in seq_along(smatch)) {
+            eli <- smatch[[i]]
+            sigClasses[[i]] <- eli[[1]]
+            pkgs[[i]] <- eli[[2]]
+        }
     }
-}
     n <- length(anames)
     value <- rep("ANY", n)
     valueP <- rep("methods", n)
@@ -747,6 +747,7 @@
     invisible(filename)
 }
 
+##' only called from showMlist() above, which has been deprecated in R 3.2.0 (Apr.2015):
 linearizeMlist <-
     ## Undo the recursive nature of the methods list, making a list of
     ## function definitions, with the names of the list being the
@@ -799,6 +800,7 @@
     showMlist(x)
 
 
+## In R's own code, this is *only* used in mergeMethods(), deprecated in R 3.2.0 (Apr.2015)
 listFromMlist <-
   ## linearizes the MethodsList object into list(sigs, methods); `prefix' is the partial
   ## signature (a named list of classes) to be prepended to the signatures in this object.
@@ -812,17 +814,17 @@
     sigs <- list()
     methods <- list()
     for(i in seq_along(methodSlot)) {
-        thisMethod <- el(methodSlot, i)
-        thisClass <- el(mnames, i)
-        elNamed(prefix, argName) <- thisClass
+        thisMethod <- methodSlot[i]
+        thisClass <- mnames[[i]]
+        prefix[[argName]] <- thisClass
         if(is.function(thisMethod)) {
             if(sigs.) sigs <- c(sigs, list(prefix))
             if(methods.) methods <- c(methods, list(thisMethod))
         }
         else {
             more <- Recall(thisMethod, prefix)
-            if(sigs.) sigs <- c(sigs, el(more, 1))
-            if(methods.) methods <- c(methods, el(more, 2))
+            if(sigs.) sigs <- c(sigs, more[[1]])
+            if(methods.) methods <- c(methods, more[[2]])
         }
     }
     list(sigs, methods)
@@ -860,7 +862,7 @@
 ## The real version requires several class definitions as well as
 ## methods for as<-
 asMethodDefinition <- function(def, signature = list(.anyClassName), sealed = FALSE, fdef = def) {
-  if(is.primitive(def))
+  if(is.primitive(def) || is(def, "MethodDefinition"))
     def
   else {
     value = new("MethodDefinition")
diff -Nru r-base-3.2.3/src/library/methods/R/Methods.R r-base-3.3.1/src/library/methods/R/Methods.R
--- r-base-3.2.3/src/library/methods/R/Methods.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/Methods.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/Methods.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,6 +16,10 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
+## copy here to avoid importing from stats and hence loading stats
+## namespace when methods if loaded
+setNames <- stats::setNames
+
 
 setGeneric <-
   ## Define `name' to be a generic  function, for which methods will be defined.
@@ -37,12 +41,13 @@
     if(is.character(.isSingleName(name)))
         stop(gettextf("invalid argument 'name': %s",
                       .isSingleName(name)), domain = NA)
-    if(exists(name, "package:base") &&
-       is.primitive(get(name, "package:base"))) { # primitives
+    if(exists(name, "package:base") && inBasicFuns(name)) {
 
         name <- switch(name, "as.double" = "as.numeric", name)
         fdef <- getGeneric(name) # will fail if this can't have methods
-        if(nargs() <= 1) {
+        compatibleSignature <- nargs() == 2L && !missing(signature) &&
+            identical(signature, fdef@signature)
+        if(nargs() <= 1 || compatibleSignature) {
             ## generics for primitives are global, so can & must always be cached
             .cacheGeneric(name, fdef)
             return(name)
@@ -50,7 +55,7 @@
         ## you can only conflict with a primitive if you supply
         ## useAsDefault to signal you really mean a different function
         if(!is.function(useAsDefault) && !identical(useAsDefault, FALSE)) {
-            msg <- gettextf("%s is a primitive function;  methods can be defined, but the generic function is implicit, and cannot be changed.", sQuote(name))
+            msg <- gettextf("%s dispatches internally;  methods can be defined, but the generic function is implicit, and cannot be changed.", sQuote(name))
             stop(msg, domain = NA)
         }
     }
@@ -216,7 +221,7 @@
     assign(name, fdef, where)
     .cacheGeneric(name, fdef)
     methods <- fdef@default # empty or containing the default
-    assignMethodsMetaData(name, methods, fdef, where, finalDefaultMethod(fdef@default))
+    assignMethodsMetaData(name, methods, fdef, where)
     .assignMethodsTableMetaData(name, fdef, where)
     name
 }
@@ -268,11 +273,11 @@
     if(is.null(fdef))
       return(FALSE)
     ## check primitives. These are never found as explicit generic functions.
-    if(is.primitive(fdef)) {
+    if(isBaseFun(fdef)) {
         if(is.character(f) && f %in% "as.double") f <- "as.numeric"
-        ## the definition of isGeneric() for a primitive is that methods are defined
+        ## the definition of isGeneric() for a base function is that methods are defined
         ## (other than the default primitive)
-        gen <- genericForPrimitive(f, mustFind = FALSE)
+        gen <- genericForBasic(f, mustFind = FALSE)
         return(is.function(gen) && length(names(.getMethodsTable(gen))) > 1L)
     }
     if(!is(fdef, "genericFunction"))
@@ -438,7 +443,7 @@
     else if(is.function(f)) {
         if(is.primitive(f)) {
             f <- .primname(f)
-            fdef <- genericForPrimitive(f)
+            fdef <- genericForBasic(f)
             gwhere <- .genEnv(f)
         }
         else
@@ -516,7 +521,7 @@
     }
     else if(identical(gwhere, NA)) {
         ## better be a primitive since getGeneric returned a generic, but none was found
-        if(is.null(elNamed(.BasicFunsList, f)))
+	if(is.null(.BasicFunsList[[f]]))
             stop(sprintf("apparent internal error: a generic function was found for \"%s\", but no corresponding object was found searching from \"%s\"",
                           f, getPackageName(where)), domain = NA)
         if(!isGeneric(f))
@@ -585,13 +590,11 @@
         definition@generic <- fdef@generic
     }
     is.not.base <- !identical(where, baseenv())
-##    do.mlist <- is.not.base && (!.noMlists() || all(signature == "ANY"))
-    do.mlist <- is.not.base && !.noMlists()
-    if(do.mlist)
-        whereMethods <- insertMethod(.getOrMakeMethodsList(f, where, fdef),
-                                     signature, margs, definition)
-    else
-        whereMethods <- NULL
+    whereMethods <-
+	## do.mlist <- is.not.base && (!.noMlists() || all(signature == "ANY"))
+	if(is.not.base && !.noMlists()) # do.mlist
+	    insertMethod(.getOrMakeMethodsList(f, where, fdef),
+			 signature, margs, definition) ## else NULL
     mtable <- getMethodsForDispatch(fdef)
     if(cacheOnAssign(where)) { # will be FALSE for sourceEnvironment's
         ## cache in both direct and inherited tables
@@ -603,7 +606,7 @@
     }
     ## assigns the methodslist object
     ## and deals with flags for primitives & for updating group members
-    assignMethodsMetaData(f, whereMethods, fdef, where, deflt)
+    assignMethodsMetaData(f, whereMethods, fdef, where)
     f
 }
 
@@ -612,7 +615,7 @@
       if(is(f, "genericFunction"))
          { fdef <- f; f <- f@generic}
       else if(is.primitive(f))
-        { f <- .primname(f); fdef <- genericForPrimitive(f, mustFind=FALSE)}
+        { f <- .primname(f); fdef <- genericForBasic(f, mustFind=FALSE)}
       else
         stop("function supplied as argument 'f' must be a generic")
     }
@@ -653,7 +656,7 @@
         f <- fdef@generic
     }
     else
-      fdef <- getGeneric(f, where = where)
+	fdef <- getGeneric(f, where = where)
     if(is.null(fdef)) {
         warning(gettextf("no generic function %s found",
                          sQuote(f)),
@@ -708,12 +711,12 @@
 	if(!is.character(f)) f <- deparse(substitute(f))
 	stop(gettextf("no generic function found for '%s'", f), domain = NA)
     }
-    if(missing(mlist)) {
-	if(missing(where))
-	    mlist <- getMethodsForDispatch(fdef)
-	else
-	    mlist <- .getMethodsTableMetaData(fdef, where, optional)
-    }
+    if(missing(mlist))
+	mlist <-
+	    if(missing(where))
+		getMethodsForDispatch(fdef)
+	    else
+		.getMethodsTableMetaData(fdef, where, optional)
     if(is.environment(mlist)) {
 	signature <- matchSignature(signature, fdef)
 	value <- .findMethodInTable(signature, mlist, fdef)
@@ -889,13 +892,14 @@
     value <- list(...)
     names <- names(value)
     for(i in seq_along(value)) {
-        sigi <- el(value, i)
+        sigi <- value[[i]]
         if(!is.character(sigi) || length(sigi) != 1L)
-            stop(gettextf("bad class specified for element %d (should be a single character string)", i), domain = NA)
+            stop(gettextf(
+		"bad class specified for element %d (should be a single character string)",
+		i), domain = NA)
+
     }
-      value <- as.character(value)
-      names(value) <- names
-      value
+    setNames(as.character(value), names)
 }
 
 showMethods <-
@@ -995,37 +999,32 @@
     if (is.null(def))
         return(.methods_info())
 
-    mtable <- ".MTable"
     classes <- c(class, names(getClass(class)@contains))
-    generics <- getGenerics(where=search())
-    nms <- setNames(as.vector(generics), as.vector(generics))
+    generics <- as.vector(getGenerics(where=search()))
+    nms <- setNames(generics, generics)
 
     packages <- lapply(nms, function(generic) {
-        table <- get(mtable, environment(getGeneric(generic)))
-        lapply(names(table), function(nm, table) {
-            environmentName(environment(table[[nm]]))
-        }, table)
+	table <- environment(getGeneric(generic))[[".MTable"]]
+	lapply(table, function(m) environmentName(environment(m)))
     })
-    methods <- lapply(nms, function(generic, classes) {
-        table <- get(mtable, environment(getGeneric(generic)))
-        methods <- names(table)
-        lapply(methods, function(method, classes) {
-            m <- table[[method]]
+    methods <- lapply(nms, function(generic) {
+	table <- environment(getGeneric(generic))[[".MTable"]]
+	lapply(table, function(m) {
             if (is(m, "MethodDefinition") && any(m@defined %in% classes))
                 setNames(as.vector(m@defined), names(m@defined))
-            else
-                NULL
-        }, classes)
-    }, classes)
+            ## else NULL
+        })
+    })
 
     geom <- lapply(methods, function(method) {
         !vapply(method, is.null, logical(1))
     })
     filter <- function(elt, geom) elt[geom]
     packages <- Map(filter, packages, geom)
-    methods <- Map(filter, methods, geom)
-    packages <- packages[lengths(methods) != 0L]
-    methods <- methods[lengths(methods) != 0L]
+    methods  <- Map(filter, methods,  geom)
+    non0 <- lengths(methods) != 0L
+    packages <- packages[non0]
+    methods  <-  methods[non0]
 
     ## only derived methods
     geom <- lapply(methods, function(method, classes) {
@@ -1048,9 +1047,9 @@
             lapply(split(score, sig0), function(elt) elt == min(elt))
         score == 1
     }, classes)
-    filter <- function(elt, geom) elt[geom]
+
     packages <- Map(filter, packages, geom)
-    methods <- Map(filter, methods, geom)
+    methods  <- Map(filter, methods,  geom)
 
     generic <- rep(names(methods), lengths(methods))
     signature <- unlist(lapply(methods, function(method) {
@@ -1259,11 +1258,8 @@
     generic <- methodEnv$.Generic
     if(is.null(generic)) {
         fdef <- if (is.name(call[[1L]]))
-            get(as.character(call[[1L]]), envir = methodEnv)
+            getGeneric(as.character(call[[1L]]), mustFind=TRUE, where=methodEnv)
         else call[[1L]]
-        if (is.primitive(fdef)) {
-            fdef <- getGeneric(fdef, mustFind=TRUE)
-        }
         generic <- environment(fdef)$.Generic
     }
     generic
@@ -1389,13 +1385,16 @@
             return(NULL)  # no implicit generic
           env <- environment(fdefault) # the environment for an implicit generic table
           fdefault <- .derivedDefaultMethod(fdefault)
-          if(is.primitive(fdefault)) {
-              value <- genericForPrimitive(name)
-              if(!missing(generic) && !identical(value, generic))
-                  stop(gettextf("%s is a primitive function; its generic form cannot be redefined",
-                                sQuote(name)),
-                       domain = NA)
-              generic <- value
+          if(isBaseFun(fdefault)) {
+              value <- genericForBasic(name)
+              if (is.function(value)) {
+                  if(!missing(generic) && !identical(value, generic))
+                      stop(gettextf("%s is a primitive function; its generic form cannot be redefined",
+                                    sQuote(name)),
+                           domain = NA)
+                  generic <- value
+                  fdefault <- generic@default
+              }
               package <- "base"
           }
           else
@@ -1473,11 +1472,10 @@
 .getImplicitGeneric <- function(name, where, pkg = "")
 {
     value <- .getImplicitGenericFromCache(name, where, pkg)
-    if(is.null(value) && !is.null(tbl <-
-		where[[.ImplicitGenericsMetaName]])) {
-       value <- .getGenericFromCacheTable(name, where, pkg, tbl)
-    }
-    value
+    if(is.null(value) && !is.null(tbl <- where[[.ImplicitGenericsMetaName]]))
+       .getGenericFromCacheTable(name, where, pkg, tbl)
+    else
+        value
 }
 
 ## only called from setGeneric, f1 = supplied, f2 = implicit
diff -Nru r-base-3.2.3/src/library/methods/R/methodsTable.R r-base-3.3.1/src/library/methods/R/methodsTable.R
--- r-base-3.2.3/src/library/methods/R/methodsTable.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/methodsTable.R	2016-03-16 23:03:40.000000000 +0000
@@ -62,7 +62,7 @@
 ##  anyLabel <- .sigLabel(anySig)
   newMethods <- names(newtable)
   for(what in newMethods) {
-    obj <- get(what, envir = newtable)
+    obj <- newtable[[what]]
     if(is.primitive(obj))
       sig <- anySig
     else if(is(obj, "MethodDefinition"))
@@ -73,7 +73,7 @@
            next # empty environment, ignore
        isDef <- vapply(objsWhat, is, logical(1L), "MethodDefinition")
        if (any(isDef)) {
-           sig <- tail(objsWhat[isDef], 1L)@defined
+           sig <- utils::tail(objsWhat[isDef], 1L)@defined
        } else {
            sig <- anySig
        }
@@ -103,7 +103,7 @@
         signames <- generic@signature
         length(signames) <- ns
         .resetTable(table, ns, signames)
-        assign(".SigLength", ns, envir = fenv)
+        fenv[[".SigLength"]] <- ns
         n <- ns
       }
     }
@@ -113,9 +113,9 @@
             ## must replace in .AllMTable also
             if(is.null(allTable))
                 allTable <- get(".AllMTable", envir = fenv)
-            assign(what, obj, envir = allTable)
+            allTable[[what]] <- obj
         }
-        assign(what, obj, envir = table)
+        table[[what]] <- obj
     }
     else if(exists(what, envir = table, inherits = FALSE) &&
             !all(obj@defined == "ANY") ) {
@@ -148,7 +148,7 @@
                 objw@defined <- objw@target <- sigw
                 remove(list = what, envir = obj)
                 var <- .pkgMethodLabel(objw)
-                if(nzchar(var)) assign(var, objw, envir = obj)
+                if(nzchar(var)) obj[[var]] <- objw
             }
         }
     }
diff -Nru r-base-3.2.3/src/library/methods/R/NextMethod.R r-base-3.3.1/src/library/methods/R/NextMethod.R
--- r-base-3.2.3/src/library/methods/R/NextMethod.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/NextMethod.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/NextMethod.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -29,14 +29,14 @@
         callEnv <- methodEnv <- parent.frame(1)
         mcall <- sys.call(parent)
         dotsenv <- parent.frame(2)
-        i <- 1
+        i <- 1L
     }
     else {
         callEnv <- parent.frame(1)
         methodEnv <- parent.frame(2)
         mcall <- sys.call(sys.parent(2))
         dotsenv <- parent.frame(3)
-        i <- 2
+        i <- 2L
     }
     ## set up the nextMethod object, load it
     ## into the calling environment, and cache it
@@ -47,7 +47,7 @@
     }
     else if(identical(mcall[[1L]], dotNextMethod)) {
         ## a call from another callNextMethod()
-        nextMethodEnv <- parent.frame(i+1)
+        nextMethodEnv <- parent.frame(i+1L)
         nextMethod <- nextMethodEnv$.nextMethod
         f <- nextMethodEnv$.Generic
     }
@@ -58,7 +58,7 @@
         } else {
             f <- as.character(mcall[[1L]])
         }
-        fdef <- genericForPrimitive(f)
+        fdef <- genericForBasic(f)
         ## check that this could be a basic function with methods
         if(is.null(fdef))
             stop(gettextf("a call to callNextMethod() appears in a call to %s, but the call does not seem to come from either a generic function or another 'callNextMethod'",
@@ -119,10 +119,12 @@
                if(is.na(i) || i > length(call))
                    length(fnames) <- length(call)
                else {
-                   i <- i-1
+                   i <- i-1L
                    length(fnames) <- i
                    fnames <- c(fnames, rep("", length(call) - i))
                }
+               if (substring(f, nchar(f)-1L) == "<-")
+                   fnames[length(fnames)] <- "value"
                names(call) <- fnames
                call <- as.call(call)
            }
diff -Nru r-base-3.2.3/src/library/methods/R/oldClass.R r-base-3.3.1/src/library/methods/R/oldClass.R
--- r-base-3.2.3/src/library/methods/R/oldClass.R	2015-08-25 22:17:11.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/oldClass.R	2016-03-16 23:03:40.000000000 +0000
@@ -184,11 +184,11 @@
         n1 <- names(slots1)
         bad <- character()
         for(what in n2[match(n2, n1, 0) > 0])
-          if(!extends(elNamed(slots1, what), elNamed(slots2, what))) {
+          if(!extends(slots1[[what]], slots2[[what]])) {
               message(gettextf("slot %s: class %s should extend class %s",
                                sQuote(what),
-                               dQuote(elNamed(slots1, what)),
-                               dQuote(elNamed(slots2, what))),
+                               dQuote(slots1[[what]]),
+                               dQuote(slots2[[what]])),
                       domain = NA)
               bad <- c(bad, what)
           }
diff -Nru r-base-3.2.3/src/library/methods/R/packageName.R r-base-3.3.1/src/library/methods/R/packageName.R
--- r-base-3.2.3/src/library/methods/R/packageName.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/packageName.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/packageName.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,18 +19,16 @@
 ## utilities to manage package names
 
 getPackageName <- function(where = topenv(parent.frame()), create = TRUE) {
-    pkg <- ""
-    hasNameSaved <- exists(".packageName", where, inherits = FALSE)
-    if(hasNameSaved)
-        pkg <- get(".packageName", where)
-    else  if(identical(where, 1) || identical(as.environment(where), topenv(parent.frame())))
-        pkg <- Sys.getenv("R_PACKAGE_NAME")
     env <- as.environment(where)
-    envName <- environmentName(env)
-    if(nzchar(envName)) {
-        if(regexpr("package:", envName, fixed = TRUE) == 1L)
-          pkg <- sub("package:","", envName, fixed = TRUE)
+    notSaved <- is.null(pkg <- get0(".packageName", env, inherits = FALSE))
+    if(notSaved) {
+	pkg <- if(identical(where, 1) || identical(env, topenv(parent.frame())))
+	    Sys.getenv("R_PACKAGE_NAME")
+	else ""
     }
+    envName <- environmentName(env)
+    if(nzchar(envName) && regexpr("package:", envName, fixed = TRUE) == 1L)
+	pkg <- .rmpkg(envName)
     if(!nzchar(pkg)) { ## is still ""
         if(identical(env, .GlobalEnv))
             pkg <- ".GlobalEnv"
@@ -45,12 +43,12 @@
                         pkg <- db; break
                     }
             }
-            else if(nzchar(environmentName(env)))
-                pkg <- environmentName(env)
+            else if(nzchar(envName))
+                pkg <- envName
             else
                 pkg <- as.character(where)
-            if(identical(substr(pkg, 1L, 8L), "package:"))
-                pkg <- substr(pkg, 9L, nchar(pkg, "c"))
+
+	    pkg <- .rmpkg(pkg)
         }
 #  Problem:  the library() function should now be putting .packageName in package environments
 #   but namespace makes them invisible from outside.
@@ -75,7 +73,7 @@
                          sQuote(pkg)),
                 domain = NA)
         assign(pkg, env, envir = .PackageEnvironments)
-        if(!(hasNameSaved || environmentIsLocked(env)))
+	if(notSaved && !environmentIsLocked(env))
             setPackageName(pkg, env)
     }
     pkg
diff -Nru r-base-3.2.3/src/library/methods/R/promptClass.R r-base-3.3.1/src/library/methods/R/promptClass.R
--- r-base-3.2.3/src/library/methods/R/promptClass.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/promptClass.R	2016-03-16 23:03:40.000000000 +0000
@@ -68,7 +68,7 @@
     cleanPrompt <- function(object, name) {
         ## get the prompt() result and clean out the junk
         ## lines that prompt() creates
-        value <- prompt(object, name = name, filename = NA)
+        value <- utils::prompt(object, name = name, filename = NA)
         for(i in seq_along(value)) {
             item <- value[[i]]
             bad <- grepl("^ *%", item)
@@ -90,7 +90,7 @@
     if(!missing(where) && !is.na(match(clName, getClasses(where))))
       whereClass <- where
     else {
-        whereClass <- find(classMetaName(clName))
+        whereClass <- utils::find(classMetaName(clName))
         if(length(whereClass) == 0L)
             stop(gettextf("no definition of class %s found",
                           dQuote(clName)), domain = NA)
diff -Nru r-base-3.2.3/src/library/methods/R/RClassUtils.R r-base-3.3.1/src/library/methods/R/RClassUtils.R
--- r-base-3.2.3/src/library/methods/R/RClassUtils.R	2015-08-25 22:17:11.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/RClassUtils.R	2016-03-16 23:03:40.000000000 +0000
@@ -752,8 +752,7 @@
       }
       ## check for conflicts in the slots
       allProps <- properties
-      for(i in seq_along(superClasses)) {
-          cl <- superClasses[[i]]
+      for(cl in superClasses) {
           clDef <- getClassDef(cl, where)
           if(is(clDef, "classRepresentation")) {
               theseProperties <- getSlots(clDef)
@@ -977,37 +976,28 @@
 {
     if(.identC(class1[[1L]], class2) || .identC(class2, "ANY"))
         return(TRUE)
-    ## ext <- TRUE # may become a list of extends definitions
     if(is.null(ClassDef1)) # class1 not defined
         return(FALSE)
     ## else
     ext <- ClassDef1@contains
-    nm1 <- names(ext)
-    i <- match(class2, nm1)
-    if(is.na(i)) {
-        ## look for class1 in the known subclasses of class2
-        if(!is.null(ClassDef2)) {
-            ext <- ClassDef2@subclasses
-            ## check for a classUnion definition, not a plain "classRepresentation"
-            if(!.identC(class(ClassDef2), "classRepresentation") &&
-               isClassUnion(ClassDef2))
-                ## a simple TRUE iff class1 or one of its superclasses belongs to the union
-                i <- any(c(class1, nm1) %in% names(ext))
-            else {
-                ## class1 could be multiple classes here.
-                ## I think we want to know if any extend
-                i <- match(class1, names(ext))
-                ii <- i[!is.na(i)]
-                i <- if(length(ii)) ii[1L] else i[1L]
-            }
-        }
+    if(!is.null(contained <- ext[[class2]]))
+	contained
+    else if (is.null(ClassDef2))
+	FALSE
+    else { ## look for class1 in the known subclasses of class2
+	subs <- ClassDef2@subclasses
+	## check for a classUnion definition, not a plain "classRepresentation"
+	if(!.identC(class(ClassDef2), "classRepresentation") && isClassUnion(ClassDef2))
+	    ## a simple TRUE iff class1 or one of its superclasses belongs to the union
+	    any(c(class1, names(ext)) %in% names(subs))
+	else {
+	    ## class1 could be multiple classes here.
+	    ## I think we want to know if any extend
+	    i <- match(class1, names(subs))
+	    i <- i[!is.na(i)]
+	    if(length(i)) subs[[ i[1L] ]] else FALSE
+	}
     }
-    if(is.na(i))
-        FALSE
-    else if(is.logical(i))
-        i
-    else
-        el(ext, i)
 }
 
   ## complete the extends information in the class definition, by following
@@ -1293,9 +1283,12 @@
         method <- getMethod(f, optional = TRUE)
         if(!is.function(method))
             method <- getGeneric(f, where = where)
-	body(method) <- substitute(stop(methods:::.missingMethod(FF, MESSAGE,
-								 if(exists(".Method")).Method),
-					domain=NA), list(FF=f, MESSAGE=message))
+        ## this is not eval()ed in this namespace
+	body(method) <-
+            substitute(stop(methods:::.missingMethod(FF, MESSAGE,
+                                                     if(exists(".Method")) .Method),
+                            domain = NA),
+                       list(FF = f, MESSAGE = message))
         environment(method) <- .GlobalEnv
         setMethod(f, signature, method, where = where)
     }
@@ -1916,6 +1909,7 @@
 ## See .cacheGeneric, etc. for analogous computations for generics
 .classTable <- new.env(TRUE, baseenv())
 assign("#HAS_DUPLICATE_CLASS_NAMES", FALSE, envir = .classTable)
+## FIXME We've seen duplicated classes in .classTable
 .duplicateClassesExist <- function(on) {
     value <- get("#HAS_DUPLICATE_CLASS_NAMES", envir = .classTable)
     if(nargs())
@@ -1926,35 +1920,36 @@
 .cacheClass <- function(name, def, doSubclasses = FALSE, env) {
     if(!identical(doSubclasses, FALSE))
       .recacheSubclasses(def@className, def, doSubclasses, env)
-    if(exists(name, envir = .classTable, inherits = FALSE)) {
-        newpkg <- def@package
-        prev <- get(name, envir = .classTable)
-        if(is(prev, "classRepresentation")) {
-            if(identical(prev, def))
-               return()
-            pkg <- prev@package # start a per-package list
-            if(identical(pkg, newpkg)) { # redefinition
-                ## cache for S3, to override possible previous cache
-                base:::.cache_class(name, .extendsForS3(def))
-##                base:::.cache_class(name, extends(def))
-                return(assign(name, def, envir = .classTable))
-            }
-            else if(.simpleDuplicateClass(def, prev))
-                return()
-            prev <- list(prev)
-            names(prev) <- pkg
-        }
-        i <- match(newpkg, names(prev))
-        if(is.na(i))
-           prev[[newpkg]] <- def
-        else if(identical(def, prev[[i]]))
-          return()
-        else
-            prev[[i]] <- def
-        def <- prev
-        .duplicateClassesExist(TRUE)
+    if(!is.null(prev <- .classTable[[name]])) {
+	newpkg <- def@package
+	if(is(prev, "classRepresentation")) {
+	    if(identical(prev, def))
+		return()
+	    pkg <- prev@package # start a per-package list
+	    if(identical(pkg, newpkg)) { # redefinition
+		## cache for S3, to override possible previous cache
+		.cache_class(name, .extendsForS3(def))
+		return(.classTable[[name]] <- def)
+	    }
+	    else if(.simpleDuplicateClass(def, prev))
+		return()
+	    prev <- list(prev)
+	    names(prev) <- pkg
+	}
+	## now  prev  is a named list of class definitions (>= 1),
+	## where the names are names of packages (rather: namespaces)
+	i <- match(newpkg, names(prev))
+	if(is.na(i))
+	    prev[[newpkg]] <- def
+	else if(identical(def, prev[[i]]))
+	    return()
+	else # replace previous
+	    prev[[i]] <- def
+	def <- prev
+	if(length(def) > 1L)
+	    .duplicateClassesExist(TRUE)
     }
-    assign(name, def, envir = .classTable)
+    .classTable[[name]] <- def # return()s invisibly
 }
 
 ## test for identical def, prev class definitions
@@ -1966,17 +1961,11 @@
     if(length(supers) != length(prevSupers) ||
        any(is.na(match(supers, prevSupers))))
         return(FALSE)
-    warnLevel <- getOption("warn")
+    verbose <- getOption("verbose")
     S3 <- "oldClass" %in% supers
     if(S3) {
         ## it is possible one  of these is inconsistent, but unlikely
-        ## and we will get here often from multiple setOldClass(...)'s
-        if(warnLevel)
-            message(gettextf("Note: the specification for S3 class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class.",
-                             dQuote(def@className),
-                             sQuote(def@package),
-                             sQuote(prev@package)),
-                    domain = NA)
+        ## and S3 class attributes have no package so duplicates are useless
         return(TRUE)
     }
     ## if there are already duplicate classes, we check duplicates
@@ -1985,7 +1974,7 @@
     if(dupsExist) {
         dups <- match(supers, multipleClasses(), 0) > 0
         if(any(dups)) {
-            if(warnLevel)
+            if(verbose)
                 message(gettextf("Note: some superclasses of class %s in package %s have duplicate definitions.  This definition is not being treated as equivalent to that from package %s",
                                  dQuote(def@className),
                                  sQuote(def@package),
@@ -2010,7 +1999,7 @@
               as.character(packageSlot(prevWhat)))))
             return(FALSE)
     }
-    if(warnLevel)
+    if(verbose)
         message(gettextf("Note: the specification for class %s in package %s seems equivalent to one from package %s: not turning on duplicate class definitions for this class.",
                          dQuote(def@className),
                          sQuote(def@package),
@@ -2020,23 +2009,22 @@
 }
 
 .uncacheClass <- function(name, def) {
-  if(!is.null(prev <- .classTable[[name]])) {
+    if(!is.null(prev <- .classTable[[name]])) {
         if(is(def, "classRepresentation")) # paranoia: should only be called this way
             newpkg <- def@package
         else
             newpkg <- ""
-        if(is(prev, "classRepresentation") &&
-           identical(prev@package, newpkg) )
+        if(is(prev, "classRepresentation") && identical(prev@package, newpkg) )
             return(remove(list = name, envir = .classTable))
-         i <- match(newpkg, names(prev))
+        i <- match(newpkg, names(prev))
         if(!is.na(i))
-           prev[[i]] <- NULL
+            prev[[i]] <- NULL
         else # we might warn about unchaching more than once
-          return()
+            return()
         if(length(prev) == 0L)
-          return(remove(list = name, envir = .classTable))
+            return(remove(list = name, envir = .classTable))
         else if(length(prev) == 1L)
-          prev <- prev[[1L]]
+            prev <- prev[[1L]]
         assign(name, prev, envir  = .classTable)
     }
 }
@@ -2283,9 +2271,9 @@
   if(length(abbr) != 1 || is.na(abbr))
     stop("argument 'abbreviate' must be 0, 1, 2, or 3")
   if(abbr %% 2)
-    dimnames(value)[[1]] <- base::abbreviate(dimnames(value)[[1]])
+    dimnames(value)[[1]] <- abbreviate(dimnames(value)[[1]])
   if(abbr %/% 2)
-    dimnames(value)[[2]] <- base::abbreviate(dimnames(value)[[2]])
+    dimnames(value)[[2]] <- abbreviate(dimnames(value)[[2]])
   value
 }
 
diff -Nru r-base-3.2.3/src/library/methods/R/refClass.R r-base-3.3.1/src/library/methods/R/refClass.R
--- r-base-3.2.3/src/library/methods/R/refClass.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/refClass.R	2016-03-16 23:03:40.000000000 +0000
@@ -47,14 +47,12 @@
 }
 
 installClassMethod <- function(def, self, me, selfEnv, thisClass) {
-    if(!is(def, "refMethodDef")) {  #should not happen? => need warning
-        warning(sprintf("method %s from class %s was not processed into a class method until being installed.  Possible corruption of the methods in the class.",
-                         me, thisClass@className),
-                domain = NA)
-        def <- makeClassMethod(def, me, thisClass@className, "", names(thisClass@refMethods))
-        .checkFieldsInMethod(def, names(thisClass@fieldClasses))
-        ## cache the analysed method definition
+    if(is(def, "externalMethodDef") || !is(def, "refMethodDef")) {
+        ## Don't process either an external method (not needed),
+        ## or a special object in the class refMethods
+        ## environment (will cause an error).  Assign it unchanged.
         assign(me, def, envir = thisClass@refMethods)
+        return(def)
     }
     depends <- def@mayCall
     environment(def) <- selfEnv # for access to fields and methods
@@ -202,7 +200,7 @@
         }
     }
     if(is.function(classDef@refMethods$finalize))
-        reg.finalizer(selfEnv, function(x) x$.self$finalize())
+        reg.finalizer(selfEnv, function(x) x$.self$finalize(), TRUE)
     lockBinding(".self", selfEnv)
     lockBinding(".refClassDef", selfEnv)
     .Object
@@ -300,7 +298,7 @@
                  value
              }
              else if(is(classDef, "classRepresentation")) # use standard S4 as()
-                 methods::as(.self, Class)
+                  methods::as(.self, Class)
              else if(is.character(Class) && length(Class) == 1)
                  stop(gettextf("%s is not a defined class in this environment",
                                dQuote(Class)),
@@ -707,7 +705,7 @@
     methods(accessors)
     invisible(accessors)
 }
-)
+)## end{ .GeneratorMethods }
 
 .localRefMethods <-
     list(
@@ -772,6 +770,7 @@
             if(missing(value))
                 dummyFieldName
             else {
+                ## this is not eval()ed in this namespace
                 methods:::.setDummyField(.self, dummyField, dummyClass, thisField, TRUE, value)
                 value
             }
@@ -782,6 +781,7 @@
             if(missing(value))
                 dummyFieldName
             else {
+                ## this is not eval()ed in this namespace
                 methods:::.setDummyField(.self, dummyField, dummyClass, thisField, FALSE, value)
                 value
             }
@@ -803,12 +803,15 @@
     if(is(value, fieldClass))
         value <- as(value, fieldClass, strict = FALSE) # could be more efficient?
     else
-        stop(gettextf("invalid assignment for reference class field %s, should be from class %s or a subclass (was class %s)",
-                       sQuote(fieldName), dQuote(fieldClass), dQuote(class(value))), call. = FALSE)
+        stop(gettextf(
+	"invalid assignment for reference class field %s, should be from class %s or a subclass (was class %s)",
+		      sQuote(fieldName), dQuote(fieldClass), dQuote(class(value))),
+             call. = FALSE)
     selfEnv <- as.environment(self)
     if(onceOnly) {
         if(bindingIsLocked(metaName, selfEnv))
-            stop(gettextf("invalid replacement: reference class field %s is read-only", sQuote(fieldName)),
+            stop(gettextf("invalid replacement: reference class field %s is read-only",
+                          sQuote(fieldName)),
                  call. = FALSE)
         else {
             assign(metaName, value, envir = selfEnv)
@@ -928,19 +931,14 @@
     theseMethods <- names(value)
     prevMethods <- names(methods) # catch refs to inherited methods as well
     allMethods <- unique(c(theseMethods, prevMethods))
-    if(returnAll)
-        returnMethods <- methods
-    else
-        returnMethods <- value
+    returnMethods <- if(returnAll) methods else value
     check <- TRUE
     for(method in theseMethods) {
         prevMethod <- methods[[method]] # NULL or superClass method
         if(is.null(prevMethod)) {
             ## kludge because default version of $initialize() breaks bootstrapping of methods package
-            if(identical(method, "initialize"))
-                superClassMethod <- "initFields"
-            else
-                superClassMethod <- ""
+            superClassMethod <- if(identical(method, "initialize"))
+                "initFields" else ""
         }
         else if(identical(prevMethod@refClassName, Class))
             superClassMethod <- prevMethod@superClassMethod
@@ -1116,10 +1114,9 @@
 
 .mergeAssigns <- function(previous, new) {
     for(what in names(new)) {
-        if(is.null(previous[[what]]))
-            previous[[what]] <- new[[what]]
-        else
-            previous[[what]] <- paste(previous[[what]], new[[what]], sep="; ")
+	previous[[what]] <-
+	    if(is.null(previous[[what]])) new[[what]]
+	    else paste(previous[[what]],  new[[what]], sep="; ")
     }
     previous
 }
diff -Nru r-base-3.2.3/src/library/methods/R/RMethodUtils.R r-base-3.3.1/src/library/methods/R/RMethodUtils.R
--- r-base-3.2.3/src/library/methods/R/RMethodUtils.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/RMethodUtils.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/RMethodUtils.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -47,8 +47,11 @@
             stop(gettextf("must supply either a generic function or a function as default for %s",
                           sQuote(f)),
                  domain = NA)
-        else if(is.primitive(fdefault)) {
-            return(genericForPrimitive(f))
+        else if(isBaseFun(fdefault)) {
+            fun <- genericForBasic(f)
+            if (is.function(fun)) {
+                return(fun)
+            }
         }
         fdef <- fdefault
         body(fdef) <- substitute(standardGeneric(NAME), list(NAME = f))
@@ -206,7 +209,7 @@
     if(typeof(fdef) != "closure") {
         ## Look in a list of pre-defined functions (and also of
         ## functions for which methods are prohibited)
-        fgen <- genericForPrimitive(f)
+        fgen <- genericForBasic(f)
         message(gettextf("making a generic for special function %s",
                          sQuote(f)),
                 domain = NA)
@@ -230,8 +233,10 @@
     }
     if(is.null(fdefault)) {
         fdefault <- fdef
-        body(fdefault) <- substitute(stop(MESSAGE, domain = NA), list(MESSAGE=
-                                                   gettextf("invalid call in method dispatch to '%s' (no default method)", name)))
+	msg <- gettextf("invalid call in method dispatch to '%s' (no default method)",
+			name)
+	body(fdefault) <- substitute(stop(MESSAGE, domain = NA),
+				     list(MESSAGE = msg))
         environment(fdefault) <- baseenv()
     }
     skeleton[[1L]] <- fdefault
@@ -261,14 +266,14 @@
     if(is.null(m1) || is(m1, "EmptyMethodsList"))
         return(m2)
     tmp <- listFromMlist(m2)
-    sigs <- el(tmp, 1)
-    methods <- el(tmp, 2)
+    sigs <- tmp[[1]]
+    methods <- tmp[[2]]
     for(i in seq_along(sigs)) {
-        sigi <- el(sigs, i)
+        sigi <- sigs[[i]]
         if(.noMlists() && !identical(unique(sigi), "ANY"))
           next
         args <- names(sigi)
-        m1 <- insertMethod(m1, as.character(sigi), args, el(methods, i), FALSE)
+        m1 <- insertMethod(m1, as.character(sigi), args, methods[[i]], FALSE)
     }
     m1
 }
@@ -351,8 +356,7 @@
         n <- n - 1L
     length(signature) <- n
     length(fsig) <- n
-    names(signature) <- fsig
-    signature
+    setNames(signature, fsig)
 }
 
 rematchDefinition <- function(definition, generic, mnames, fnames, signature)
@@ -437,7 +441,7 @@
         if(is(f, "genericFunction"))
             return(f)
         else if(is.primitive(f))
-            return(genericForPrimitive(.primname(f), mustFind=mustFind))
+            return(genericForBasic(.primname(f), mustFind=mustFind))
         else
             stop("argument 'f' must be a string, generic function, or primitive: got an ordinary function")
     }
@@ -445,12 +449,8 @@
 		  .getGeneric(f,      , package)
 	     else .getGeneric(f, where, package)
     if(is.null(value) && !is.null(baseDef <- baseenv()[[f]])) {
-        ## check for primitives
-        if(is.primitive(baseDef)) {
-            value <- genericForPrimitive(f)
-            if(!is.function(value) && mustFind)
-                stop(gettextf("methods cannot be defined for the primitive function %s",
-                              sQuote(f)), domain = NA)
+        if(is.function(baseDef)) {
+            value <- genericForBasic(f, mustFind=FALSE)
             if(is(value, "genericFunction"))
                 value <- .cacheGeneric(f, value)
         }
@@ -481,10 +481,8 @@
                         package = "")
 {
     ## do not search the cache if getGeneric() was called with explicit where=
-    if(missing(where))
-        value <- .getGenericFromCache(f, where,  package)
-    else
-        value <- NULL
+    value <- if(missing(where))
+        .getGenericFromCache(f, where,  package) ## else NULL
     if(is.null(value)) {
         if(is.character(f) && f %in% "as.double") f <- "as.numeric"
         if(is.character(f) && !nzchar(f)) {
@@ -494,7 +492,7 @@
         value <- .Call(C_R_getGeneric, f, FALSE, as.environment(where), package)
         ## cache public generics (usually these will have been cached already
         ## and we get to this code for non-exported generics)
-        if(!is.null(value) && !is.null(vv <- get0(f, .GlobalEnv)) &&
+        if(!is.null(value) && !is.null(vv <- .GlobalEnv[[f]]) &&
            identical(vv, value))
             .cacheGeneric(f, value)
     }
@@ -579,10 +577,10 @@
 }
 
 .getGenericFromCache <- function(name, where,  pkg = "")
-   .getGenericFromCacheTable(name,where, pkg, .genericTable)
+   .getGenericFromCacheTable(name, where, pkg, .genericTable)
 
 .getImplicitGenericFromCache <- function(name, where,  pkg = "")
-   .getGenericFromCacheTable(name,where, pkg, .implicitTable)
+   .getGenericFromCacheTable(name, where, pkg, .implicitTable)
 
 .getGenericFromCacheTable <- function(name, where, pkg = "", table)
 {
@@ -635,7 +633,7 @@
         fdef <- getFunction(name, TRUE, FALSE, penv)
         if(!is(fdef, "genericFunction")) {
             if(is.primitive(fdef))
-                fdef <- genericForPrimitive(name, penv)
+                fdef <- genericForBasic(name, penv)
             else
                 fdef <- implicitGeneric(name, penv)
         }
@@ -720,7 +718,7 @@
   ## assign value to be the methods metadata for generic f on database where.
   ## as of R 2.7.0 the mlist metadata is deprecated.
   ## If value is not a MethodsList,  only turns on primitives & groups
-  function(f, value, fdef, where, deflt)
+  function(f, value, fdef, where)
 {
     where <- as.environment(where)
     if(is(value, "MethodsList")) {
@@ -732,8 +730,8 @@
         else
           assign(mname, value, where)
     }
-    if(is.primitive(deflt))
-        setPrimitiveMethods(f, deflt, "reset", fdef, NULL)
+    if(dispatchIsInternal(fdef))
+        setPrimitiveMethods(f, fdef@default, "reset", fdef, NULL)
     if(is(fdef, "groupGenericFunction")) # reset or turn on members of group
         cacheGenericsMetaData(f, fdef, where = where, package = fdef@package)
 }
@@ -764,6 +762,7 @@
     }
     else {
         if(is.environment(where)) where <- list(where)
+        ## The order matters ... and there might be no objects.
         these <- unlist(lapply(where, objects, all.names=TRUE), use.names=FALSE)
         metaNameUndo(unique(these), prefix = "T", searchForm = searchForm)
     }
@@ -780,26 +779,24 @@
     else if(is.environment(where)) where <- list(where)
     these <- unlist(lapply(where, objects, all.names=TRUE), use.names=FALSE)
     these <- unique(these)
-    these <- these[substr(these, 1L, 6L) == ".__T__"]
+    these <- these[startsWith(these, ".__T__")]
     if(length(these) == 0L)
         return(character())
-    funNames <- gsub(".__T__(.*):([^:]+)", "\\1", these)
-    if(length(funNames) == 0L &&
-       length(these[substr(these, 1L, 6L) == ".__M__"]))
-        warning(sprintf("package %s seems to have out-of-date methods; need to reinstall from source",
-                         sQuote(getPackageName(where[[1L]]))))
+    funNames <- gsub("^.__T__(.*):([^:]+)", "\\1", these)
+    ## FIXME: length(funNames) == length(these) != 0   ==> this never triggers:
+    ## if(length(funNames) == 0L && any(startsWith(these, ".__M__")))
+    ##     warning(sprintf("package %s seems to have out-of-date methods; need to reinstall from source",
+    ##                      sQuote(getPackageName(where[[1L]]))))
     packageNames <- gsub(".__T__(.*):([^:]+(.*))", "\\2", these)
     attr(funNames, "package") <- packageNames
     ## Would prefer following, but may be trouble bootstrapping methods
     ## funNames <- new("ObjectsWithPackage", funNames, package = packageNames)
     if(identical(trim, TRUE))
         funNames
-    else {
-        if(identical(trim, FALSE))
-            these
-        else
-            gsub(".__T__", as.character(trim), these)
-    }
+    else if(identical(trim, FALSE))
+        these
+    else
+        gsub(".__T__", as.character(trim), these)
 }
 
 cacheMetaData <-
@@ -893,7 +890,7 @@
 ### Assertion: methods argument unused except for primitives
 ### and then only for the old non-table case.
     deflt <- finalDefaultMethod(fdef@default) #only to detect primitives
-    if(is.primitive(deflt)) {
+    if(dispatchIsInternal(fdef)) {
 	if(missing(methods)) ## "reset"
 	    setPrimitiveMethods(f, deflt, "reset", fdef, NULL)
 	else ## "set"
@@ -1371,10 +1368,14 @@
 }
 
 ## Mark the method as derived from a non-generic.
-.derivedDefaultMethod <- function(fdef)
+.derivedDefaultMethod <- function(fdef, internal = NULL)
 {
     if(is.function(fdef) && !is.primitive(fdef)) {
-        value <- new("derivedDefaultMethod")
+        if (!is.null(internal)) {
+            value <- new("internalDispatchMethod", internal = internal)
+        } else {
+            value <- new("derivedDefaultMethod")
+        }
         value@.Data <- fdef
         value@target <- value@defined <- .newSignature(.anyClassName, formalArgs(fdef))
         value
@@ -1534,10 +1535,14 @@
     value
 }
 
-
-.hasS4MetaData <- function(env)
-  (length(objects(env, all.names = TRUE,
-                          pattern = "^[.]__[CTA]_")))
+## is this really right?
+## cf .methodsPackageMetaNamePattern <- "^[.]__[A-Z]+__"
+.hasS4MetaData <- function(env) {
+    nms <- names(env)
+    any(startsWith(nms, ".__C__")) ||
+    any(startsWith(nms, ".__T__")) ||
+    any(startsWith(nms, ".__A__"))
+}
 
 ## turn ordinary generic into one that dispatches on "..."
 ## currently only called in one place from setGeneric()
@@ -1557,6 +1562,8 @@
 
 utils::globalVariables(c(".MTable", ".AllMTable", ".dotsCall"))
 
+## NB this is used with a modified environment in .dotsGeneric,
+## so methods::: calls are necessary.
 .standardGenericDots <- function(name)
 {
     env <- sys.frame(sys.parent())
@@ -1574,7 +1581,7 @@
 .quoteCall <- quote(.Method(...))
 .makeDotsCall <- function(formals)
 {
-    call <- methods:::.quoteCall
+    call <- .quoteCall
     if(length(formals)  > 1L) {
         idots <- match("...", formals)
         for(what in formals[-idots]) {
@@ -1714,8 +1721,7 @@
         classi <- classes[[i]]
         pkgi <- pkgs[[i]]
         classDefi <- getClass(classi, where = where)
-        if(checkDups &&
-           classi %in% mulipleClasses()) { # hardly ever, we hope
+        if(checkDups && classi %in% multipleClasses()) { # hardly ever, we hope
             clDefsi <- get(classi, envir = .classTable)
             if(nzchar(pkgi) && pkgi %in% names(clDefsi))
                 ## use the chosen class, no message
@@ -1791,11 +1797,6 @@
     if(!exists(actionListName, envir = where, inherits = FALSE))
         return(list())
     actions <- get(actionListName, envir = where)
-    ## check sanity:  methods must be loaded
-    if(! "package:methods" %in% search()) {
-        warning("trying to execute load actions without 'methods' package")
-        library(methods)
-    }
     for(what in actions) {
         aname <- .actionMetaName(what)
         if(!exists(aname, envir = where, inherits = FALSE)) {
diff -Nru r-base-3.2.3/src/library/methods/R/SClasses.R r-base-3.3.1/src/library/methods/R/SClasses.R
--- r-base-3.2.3/src/library/methods/R/SClasses.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/SClasses.R	2016-03-16 23:03:40.000000000 +0000
@@ -127,7 +127,7 @@
     ## since set SClass works separately with the slots and extends arguments.
     anames <- allNames(value)
     for(i in seq_along(value)) {
-        ei <- el(value, i)
+        ei <- value[[i]]
         if(!is.character(ei) || length(ei) != 1L)
             stop(gettextf("element %d of the representation was not a single character string", i), domain = NA)
     }
@@ -179,7 +179,9 @@
   ## The formal definition of the class is set according to the arguments.
   ##
   ## Users should call setClass instead of this function.
-  function(name, slots = list(), superClasses = character(), prototype = NULL, package, validity = NULL, access = list(), version = .newExternalptr(), sealed = FALSE, virtual = NA, where)
+  function(name, slots = list(), superClasses = character(), prototype = NULL,
+	   package, validity = NULL, access = list(), version = .newExternalptr(),
+	   sealed = FALSE, virtual = NA, where)
 {
     if(any(superClasses %in% .AbnormalTypes))
         superClasses <- .addAbnormalDataType(superClasses)
@@ -193,23 +195,24 @@
     if(nzchar(package))
         packageSlot(name) <- package
     for(what in superClasses) {
-        if(is(what, "classRepresentation"))
-            whatClassDef <- what
-        else if(is.null(packageSlot(what)))
-            whatClassDef <- getClass(what, where = where)
-        else
-            whatClassDef <- getClass(what)
+	whatClassDef <-
+	    if(is(what, "classRepresentation"))
+		what
+	    else if(is.null(packageSlot(what)))
+		getClass(what, where = where)
+	    else
+		getClass(what)
         what <- whatClassDef@className # includes package name as attribute
         ## Create the SClassExtension objects (will be simple, possibly dataPart).
         ## The slots are supplied explicitly, since `name' is currently an undefined class
-        elNamed(contains, what) <- makeExtends(name, what, slots = slots,
+        contains[[what]] <- makeExtends(name, what, slots = slots,
                                               classDef2 = whatClassDef, package = package)
     }
     validity <- .makeValidityMethod(name, validity)
     if(is.na(virtual)) {
         virtual <- testVirtual(slots, contains, prototype, where)
         if(virtual && !is.na(match("VIRTUAL", superClasses)))
-            elNamed(contains, "VIRTUAL") <- NULL
+            contains[["VIRTUAL"]] <- NULL
     }
     # new() must return an S4 object, except perhaps for basic classes
     if(!is.null(prototype) && is.na(match(name, .BasicClasses)))
@@ -245,11 +248,10 @@
 	## should be in that package.
 	if(identical(nzchar(package), TRUE)) {
 	    whereP <- .requirePackage(package)
-	    if(exists(cname, whereP, inherits = inherits))
-		value <- get(cname, whereP)
+	    value <- get0(cname, whereP, inherits = inherits) # NULL if not existing
 	}
-	if(is.null(value) && exists(cname, where, inherits = inherits))
-	    value <- get(cname, where)
+	if(is.null(value))
+	    value <- get0(cname, where, inherits = inherits) # NULL if not existing
     }
     value
 }
@@ -303,7 +305,7 @@
 {
     cl <- class(obj)
     ClassDef <- getClass(cl) # fails if cl not a defined class (!)
-    slotClass <- elNamed(ClassDef@slots, name)
+    slotClass <- ClassDef@slots[[name]]
     if(is.null(slotClass))
         stop(gettextf("%s is not a slot in class %s",
                       sQuote(name), dQuote(cl)),
@@ -329,7 +331,7 @@
 checkAtAssignment <- function(cl, name, valueClass)
 {
     ClassDef <- getClass(cl) # fails if cl not a defined class (!)
-    slotClass <- elNamed(ClassDef@slots, name)
+    slotClass <- ClassDef@slots[[name]]
     if(is.null(slotClass))
         stop(gettextf("%s is not a slot in class %s",
                       sQuote(name), dQuote(cl)),
@@ -439,15 +441,17 @@
   function(where = .externalCallerEnv(), inherits = missing(where))
 {
     pat <- paste0("^",classMetaName(""))
+    if(!is.environment(where)) ## e.g. for "package:stats4"
+	where <- as.environment(where)
     if(inherits) {
         evList <- .parentEnvList(where)
         clNames <- character()
         for(ev in evList)
-            clNames <- c(clNames, objects(ev, pattern = pat, all.names = TRUE))
+            clNames <- c(clNames, grep(pat, names(ev), value=TRUE))
         clNames <- unique(clNames)
     }
     else
-        clNames <- objects(where, pattern = pat, all.names = TRUE)
+        clNames <- grep(pat, names(where), value=TRUE)
     ## strip off the leading pattern (this implicitly assumes the characters
     ## in classMetaName("") are either "." or not metacharacters
     substring(clNames, nchar(pat, "c"))
@@ -639,11 +643,11 @@
         supers <- args[!which]
         thisExtends <- names(ClassDef@contains)
         slotDefs <- ClassDef@slots
-        dataPart <- elNamed(slotDefs, ".Data")
+        dataPart <- slotDefs[[".Data"]]
         if(is.null(dataPart)) dataPart <- "missing"
         if(length(supers)) {
             for(i in rev(seq_along(supers))) {
-                obj <- el(supers, i)
+                obj <- supers[[i]]
                 Classi <- class(obj)
                 if(length(Classi) > 1L)
                     Classi <- Classi[[1L]] #possible S3 inheritance
@@ -696,10 +700,10 @@
                      domain = NA)
             firstTime <- TRUE
             for(i in seq_along(snames)) {
-                slotName <- el(snames, i)
-                slotClass <- elNamed(slotDefs, slotName)
+                slotName <- snames[[i]]
+                slotClass <- slotDefs[[slotName]]
                 slotClassDef <- getClassDef(slotClass, package = ClassDef@package)
-                slotVal <- el(elements, i)
+                slotVal <- elements[[i]]
                 ## perform non-strict coercion, but leave the error messages for
                 ## values not conforming to the slot definitions to validObject(),
                 ## hence the check = FALSE argument in the slot assignment
diff -Nru r-base-3.2.3/src/library/methods/R/trace.R r-base-3.3.1/src/library/methods/R/trace.R
--- r-base-3.2.3/src/library/methods/R/trace.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/trace.R	2016-03-16 23:03:40.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/methods/R/trace.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -38,27 +38,27 @@
 .InvalidTracedFunctions <- c("if", "where", "for", "repeat", "(", "{",
                             "next", "break", ".Call", ".Internal", ".Primitive")
 
-.TraceWithMethods <- function(what, tracer = NULL, exit = NULL, at =
-                              numeric(), print = TRUE, signature =
-                              NULL, where = .GlobalEnv, edit = FALSE,
-                              from = NULL, untrace = FALSE, classMethod = FALSE) {
-    if(is.function(where)) {
-        ## start from the function's environment:  important for
-        ## tracing from a namespace
-        if(is(where, "genericFunction"))
-            where <- parent.env(environment(where))
-        else
-            where <- environment(where)
-        fromPackage <- getPackageName(where)
-    }
-    else fromPackage <- ""
+.TraceWithMethods <- function(what, tracer = NULL, exit = NULL, at = numeric(),
+			      print = TRUE, signature = NULL,
+			      where = .GlobalEnv, edit = FALSE, from = NULL,
+			      untrace = FALSE, classMethod = FALSE) {
+    fromPackage <-
+        if(is.function(where)) {
+            ## start from the function's environment:  important for
+            ## tracing from a namespace
+            where <- if(is(where, "genericFunction"))
+                parent.env(environment(where))
+            else
+                environment(where)
+            getPackageName(where)
+        } else ""
     doEdit <- !identical(edit, FALSE)
     whereF <- NULL
     pname <- character()
     def <- NULL
     tracingWhere <- "in package"
     refCase <- isS4(where) && (is(where, "envRefClass") ||
-                       is(where, "refClassRepresentation"))
+                               is(where, "refClassRepresentation"))
     if(refCase) {
         ## some error checking
         if(!is.null(signature))
@@ -81,7 +81,8 @@
         if(!is(def, "refMethodDef")) {
             thisName <- substitute(what)
             stop(gettextf("%s is not a method for reference class %s",
-                          sQuote(as.character(if(is.symbol(thisName)) thisName else what)),
+			  sQuote(as.character(if(is.symbol(thisName)) thisName
+					      else what)),
                           dQuote(class(where))),
                  domain = NA)
         }
@@ -133,21 +134,23 @@
         temp <- .findFunEnvAndName(what, where, signature)
         whereF <- temp$whereF
         pname <- temp$pname
+        fname <- what
     }
     if(what %in% .InvalidTracedFunctions)
         stop(gettextf("tracing the internal function %s is not allowed",
-                      sQuote(what)))
+		      sQuote(what)), domain = NA)
     if(.traceTraceState) {
         message(".TraceWithMethods: after computing what, whereF", domain = NA)
         browser()
     }
-    if(nargs() == 1)
-        return(.primTrace(what)) # for back compatibility
+    if(nargs() == 1) # for back compatibility
+	return(if(untrace) .primUntrace(what) else .primTrace(what))
+## FIXME: for trace(stats:::.....)  we really want -- how can this be solved
+##    	return(if(untrace) .primUntrace(frame) else .primTrace(fname))
     if(is.null(whereF)) {
         allWhere <- findFunction(what, where = where)
         if(length(allWhere)==0)
-            stop(gettextf("no function definition for %s found",
-                          sQuote(what)),
+	    stop(gettextf("no function definition for %s found", sQuote(what)),
                  domain = NA)
         whereF <- as.environment(allWhere[[1L]])
     }
@@ -159,7 +162,9 @@
     if(is(def, "traceable") && identical(edit, FALSE) && !untrace)
         def <- .untracedFunction(def)
     if(!is.null(signature)) {
-        fdef <- if(is.primitive(def))  getGeneric(what, TRUE, where) else def
+        fdef <- if (!is(def, "genericFunction"))
+                    getGeneric(as.character(fname), TRUE, where)
+                else def
         def <- selectMethod(what, signature, fdef = fdef, optional = TRUE)
         if(is.null(def)) {
             warning(gettextf("cannot untrace method for %s; no method defined for this signature: %s",
@@ -184,6 +189,8 @@
             }
             else {
                 .primUntrace(what) # to be safe--no way to know if it's traced or not
+### or sometimes rather _FIXME_ ?
+###             .primUntrace(fname) # (rather than 'what')
                 return(what)
             }
         }
@@ -248,14 +255,26 @@
             .assignOverBinding(what, newFun, whereF, global)
         else
             assign(what, newFun, whereF)
+        if (length(pname) != 0) {
+            ## update the function also in "imports:" environments of already
+            ## loaded packages that import package pname
+
+            spname <- sub("^namespace:", "", pname)
+                # catching error in case when spname is not a name of a namespace, but
+                # e.g. a reference class
+            ipkgs <- tryCatch(getNamespaceUsers(spname), error=function(e){c()})
+            for(importingPkg in ipkgs) {
+              .updateInImportsEnv(what, newFun, importingPkg)
+            }
+        }
         if(length(grep("[^.]+[.][^.]+", what)) > 0) { #possible S3 method
             ## check for a registered version of the object
             S3MTableName <- ".__S3MethodsTable__."
-            tracedFun <- get(what, envir = whereF, inherits = TRUE)
-            if(exists(S3MTableName, envir = whereF, inherits = FALSE)) {
-                tbl <- get(S3MTableName, envir = whereF, inherits = FALSE)
-                if(exists(what, envir = tbl, inherits = FALSE))
-                    assign(what, tracedFun, envir = tbl)
+            if(!is.null(tbl <- get0(S3MTableName, envir = whereF, inherits = FALSE))) {
+                if(exists(what, envir = tbl, inherits = FALSE)) {
+		    tracedFun <- get(what, envir = whereF, inherits = TRUE)
+		    assign(what, tracedFun, envir = tbl)
+                }
             }
         }
     }
@@ -289,13 +308,16 @@
             }
         }
         else paste0(" as seen from package \"", fromPackage, "\"")
-        object <- if(refCase) "reference method" else if(is.null(signature)) "function" else "specified method for function"
+	object <- if(refCase) "reference method"
+		  else if(is.null(signature)) "function"
+		  else "specified method for function"
         object <- paste0(" ", object, " \"", what, "\" ")
         .message(action, object, location)
         if(nameSpaceCase && !untrace && exists(what, envir = .GlobalEnv)) {
-            untcall<- paste("untrace(\"", what, "\", where = getNamespace(\"",
-                            pname, "\"))", sep="")
-            .message("Warning: Tracing only in the namespace; to untrace you will need:\n    ",untcall, "\n")
+	    untcall <- paste0("untrace(\"", what,
+			      "\", where = getNamespace(\"", pname, "\"))")
+            .message("Warning: Tracing only in the namespace; to untrace you will need:\n    ",
+                     untcall, "\n")
         }
     }
     what
@@ -303,12 +325,18 @@
 
 .makeTracedFunction <- function(def, tracer, exit, at, print, doEdit) {
     switch(typeof(def),
-           builtin = , special = {
+           builtin = {
                fBody <- substitute({.prim <- DEF; .prim(...)},
                                    list(DEF = def))
                def <- eval(function(...)NULL)
                body(def, envir = .GlobalEnv) <- fBody
-               warning("making a traced version of a primitive; arguments will be treated as '...'")
+           },
+           special = {
+               fBody <- substitute({do.call(DEF, list(...))},
+                                   list(DEF = def))
+               def <- eval(function(...)NULL)
+               body(def, envir = .GlobalEnv) <- fBody
+               warning("making a traced version of a special; arguments may be altered")
            }
            )
     if(!identical(doEdit, FALSE)) {
@@ -450,8 +478,8 @@
         as(.Object, oldClass) <- def # to get other slots in def
     .Object@original <- def
     if(nargs() > 2) {
-        if(!is.null(elNamed(getSlots(getClass(class(def))), ".Data")))
-          def <- def@.Data
+	if(!is.null(elNamed(getSlots(getClass(class(def))), ".Data")))
+	    def <- def@.Data
         .Object@.Data <- .makeTracedFunction(def, tracer, exit, at, print, doEdit)
     }
     .Object
@@ -537,6 +565,26 @@
     }
 }
 
+.getImportsEnv <- function(pkg) {
+    iname = paste("imports:", pkg, sep="")
+    empty = emptyenv()
+    env = asNamespace(pkg)
+
+    while(!identical(env, empty)) {
+        if (identical(attr(env, "name"), iname))
+            return(env)
+        env = parent.env(env)
+    }
+    NULL
+}
+
+.updateInImportsEnv <- function(what, newFun, importingPkg) {
+    where = .getImportsEnv(importingPkg)
+    if (!is.null(where) && (what %in% names(where))) {
+        .assignOverBinding(what, newFun, where, FALSE)
+    }
+}
+
 ### finding the package name for a loaded namespace
 .searchNamespaceNames <- function(env)
     paste("namespace", getNamespaceName(env), sep=":")
@@ -618,7 +666,8 @@
     allObjects <- names(env)
     allObjects <- allObjects[is.na(match(allObjects, .functionsOverriden))]
     ## counts of packaages containing objects; objects not found don't count
-    possible <- sort(table(unlist(lapply(allObjects, find))), decreasing = TRUE)
+    possible <- sort(table(unlist(lapply(allObjects, utils::find))),
+                     decreasing = TRUE)
 ##    message <- ""
     if(length(possible) == 0)
         stop("none of the objects in the source code could be found:  need to attach or specify the package")
@@ -634,7 +683,7 @@
                                    collapse = ", ")),
                     domain = NA)
     }
-    sub("package:","", names(possible[1L])) # the package name, or .GlobalEnv
+    .rmpkg(names(possible[1L])) # the package name, or .GlobalEnv
 }
 
 ## extract the new definitions from the source file
diff -Nru r-base-3.2.3/src/library/methods/R/zzz.R r-base-3.3.1/src/library/methods/R/zzz.R
--- r-base-3.2.3/src/library/methods/R/zzz.R	2015-08-25 22:17:10.000000000 +0000
+++ r-base-3.3.1/src/library/methods/R/zzz.R	2016-03-16 23:03:40.000000000 +0000
@@ -16,8 +16,6 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-## utils::globalVariables("...onLoad")
-
 ## Initial version of .onLoad
 ...onLoad  <-
   ## Initialize the methods package.
@@ -112,14 +110,14 @@
     ## assign to baseenv also, signalling methods loaded
     assign(".methodsNamespace", where, baseenv())
     if(Sys.getenv("R_S4_BIND") == "active")
-        methods:::bind_activation(TRUE)
+        bind_activation(TRUE)
 }
 
 .onUnload <- function(libpath)
 {
     message("unloading 'methods' package ...") # see when this is called
     .isMethodsDispatchOn(FALSE)
-    methods:::bind_activation(FALSE)
+    bind_activation(FALSE)
     library.dynam.unload("methods", libpath)
 }
 
@@ -129,7 +127,7 @@
     env <- environment(sys.function())
     ## unlock some bindings that must be modifiable
     unlockBinding(".BasicFunsList", env)
-    if(methods:::.hasS4MetaData(.GlobalEnv)) {
+    if(.hasS4MetaData(.GlobalEnv)) {
         result <- try(cacheMetaData(.GlobalEnv, TRUE))
         ## still attach  methods package if global env has bad objets
         if(inherits(result, "try-error"))
diff -Nru r-base-3.2.3/src/library/methods/src/methods_list_dispatch.c r-base-3.3.1/src/library/methods/src/methods_list_dispatch.c
--- r-base-3.2.3/src/library/methods/src/methods_list_dispatch.c	2015-08-25 22:17:11.000000000 +0000
+++ r-base-3.3.1/src/library/methods/src/methods_list_dispatch.c	2016-03-16 23:03:41.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2015   The R Core Team.
+ *  Copyright (C) 2001-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -506,9 +506,13 @@
     switch(TYPEOF(f)) {
     case CLOSXP:
 	{
-	    SEXP R_execMethod(SEXP, SEXP);
-	    PROTECT(f); nprotect++; /* is this needed?? */
-	    val = R_execMethod(f, ev);
+	    if (inherits(f, "internalDispatchMethod")) {
+                val = R_deferred_default_method();
+            } else {
+                SEXP R_execMethod(SEXP, SEXP);
+                PROTECT(f); nprotect++; /* is this needed?? */
+                val = R_execMethod(f, ev);
+            }
 	}
 	break;
     case SPECIALSXP: case BUILTINSXP:
@@ -539,7 +543,7 @@
     /* Sanity check, so don't translate */
     if (!isSymbol(symbol)) error("'symbol' must be a SYMSXP");
     loc = R_findVarLocInFrame(ev, symbol);
-    if (loc == NULL)
+    if (R_VARLOC_IS_NULL(loc))
 	error(_("could not find symbol '%s' in frame of call"),
 	      CHAR(PRINTNAME(symbol)));
     return R_GetVarLocMISSING(loc);
@@ -672,6 +676,15 @@
 	error("internal error in 'callNextMethod': '.nextMethod' was not assigned in the frame of the method call");
     PROTECT(e = duplicate(matched_call));
     prim_case = isPrimitive(op);
+    if (!prim_case) {
+        if (inherits(op, "internalDispatchMethod")) {
+	    SEXP generic = findVarInFrame3(ev, R_dot_Generic, TRUE);
+	    if(generic == R_UnboundValue)
+	        error("internal error in 'callNextMethod': '.Generic' was not assigned in the frame of the method call");
+	    op = INTERNAL(install(CHAR(asChar(generic))));
+	    prim_case = TRUE;
+	}
+    }
     if(prim_case) {
 	/* retain call to primitive function, suppress method
 	   dispatch for it */
@@ -685,7 +698,8 @@
     appears) in which case ... was appended. */
     for(i=0; i<nargs; i++) {
 	this_sym = TAG(args);
-        if(CAR(args) != R_MissingArg) /* "missing" only possible in primitive */
+  /* "missing" only possible in primitive */
+        if(this_sym != R_NilValue && CAR(args) != R_MissingArg)
 	    SETCAR(args, this_sym);
 	args = CDR(args);
     }
@@ -822,7 +836,12 @@
 }
 
 /* internal version of paste(".", prefix, name, sep="__"),
-   for speed so few checks */
+   for speed so few checks
+
+   If you decide to change this:
+   - don't, you will break all installed S4-using packages!
+   - change the hard-coded ".__M__" in namespace.R
+*/
 SEXP R_methodsPackageMetaName(SEXP prefix, SEXP name, SEXP pkg)
 {
     char str[501];
@@ -845,7 +864,7 @@
 {
     if(TYPEOF(e1) == STRSXP && TYPEOF(e2) == STRSXP &&
        LENGTH(e1) == 1 && LENGTH(e2) == 1 &&
-       streql(CHAR(STRING_ELT(e1, 0)), CHAR(STRING_ELT(e2, 0))))
+       STRING_ELT(e1, 0) == STRING_ELT(e2, 0))
 	return R_TRUE;
     else
 	return R_FALSE;
@@ -855,6 +874,7 @@
 {
     SEXP value;
     if(TYPEOF(class) == STRSXP) {
+	if (LENGTH(class) == 0) return R_NilValue;
 	SEXP package = PACKAGE_SLOT(class);
 	value = findVarInFrame(table, installChar(STRING_ELT(class, 0)));
 	if(value == R_UnboundValue)
@@ -952,7 +972,8 @@
     case SPECIALSXP: case BUILTINSXP:
 	PROTECT(fdef = R_primitive_generic(fdef)); nprotect++;
 	if(TYPEOF(fdef) != CLOSXP) {
-	    error(_("failed to get the generic for the primitive \"%s\""), CHAR(asChar(fname)));
+	    error(_("failed to get the generic for the primitive \"%s\""),
+		  CHAR(asChar(fname)));
 	    return R_NilValue;
 	}
 	f_env = CLOENV(fdef);
@@ -981,19 +1002,20 @@
 	    thisClass = s_missing;
 	else {
 	    /*  get its class */
-	    SEXP arg; int check_err;
+	    SEXP arg; int check_err = 0;
 	    if(arg_sym == R_dots) {
 		thisClass = dots_class(ev, &check_err);
 	    }
 	    else {
-		PROTECT(arg = R_tryEvalSilent(arg_sym, ev, &check_err));
-		if(!check_err)
-		    thisClass = R_data_class(arg, TRUE);
-		UNPROTECT(1); /* for arg */
+		arg = eval(arg_sym, ev);
+		/* PROTECT(arg = R_tryEvalSilent(arg_sym, ev, &check_err)); // <- related to bug PR#16111 */
+		/* if(!check_err) */
+		thisClass = R_data_class(arg, TRUE);
+		/* UNPROTECT(1); /\* for arg *\/ */
 	    }
 	    if(check_err)
 		error(_("error in evaluating the argument '%s' in selecting a method for function '%s': %s"),
-		      CHAR(PRINTNAME(arg_sym)),CHAR(asChar(fname)),
+		      CHAR(PRINTNAME(arg_sym)), CHAR(asChar(fname)),
 		      R_curErrorBuf());
 	}
 	SET_VECTOR_ELT(classes, i, thisClass);
@@ -1024,14 +1046,18 @@
     /* the rest of this is identical to R_standardGeneric;
        hence the f=method to remind us  */
     f = method;
-    if(isObject(f))
-	f = R_loadMethod(f, fname, ev);
     switch(TYPEOF(f)) {
     case CLOSXP:
     {
-	SEXP R_execMethod(SEXP, SEXP);
-	PROTECT(f); nprotect++; /* is this needed?? */
-	val = R_execMethod(f, ev);
+        if (inherits(f, "internalDispatchMethod")) {
+            val = R_deferred_default_method();
+        } else {
+            SEXP R_execMethod(SEXP, SEXP);
+            if(isObject(f))
+                f = R_loadMethod(f, fname, ev);
+            PROTECT(f); nprotect++; /* is this needed?? */
+            val = R_execMethod(f, ev);
+        }
     }
     break;
     case SPECIALSXP: case BUILTINSXP:
diff -Nru r-base-3.2.3/src/library/methods/tests/testGroupGeneric.R r-base-3.3.1/src/library/methods/tests/testGroupGeneric.R
--- r-base-3.2.3/src/library/methods/tests/testGroupGeneric.R	2015-08-30 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/methods/tests/testGroupGeneric.R	2016-03-16 23:03:40.000000000 +0000
@@ -14,7 +14,7 @@
 removeClass("A")
 
 ### Find inherited group methods:
-if(require(Matrix)) {
+if(require(Matrix)) { ## , lib.loc = .Library
     sm <- selectMethod("-", c("dgCMatrix", "numeric"))# direct match with "Arith"
     s2 <- selectMethod("-", c("dtCMatrix", "numeric"))# ambiguity match with "Arith"
     stopifnot(sm@generic == "Arith", s2@generic == "Arith")
diff -Nru r-base-3.2.3/src/library/methods/tests/testIs.R r-base-3.3.1/src/library/methods/tests/testIs.R
--- r-base-3.2.3/src/library/methods/tests/testIs.R	2012-03-01 23:02:19.000000000 +0000
+++ r-base-3.3.1/src/library/methods/tests/testIs.R	2016-05-17 22:15:08.000000000 +0000
@@ -29,3 +29,33 @@
 stopifnot(identical(size(xyc), length(x1)))
 removeClass("xy")
 removeGeneric("size")
+
+
+### Related to  numeric <-> double <-> integer  proposals, end of 2015, on R-devel
+myN   <- setClass("myN",   contains="numeric")
+myNid <- setClass("myNid", contains="numeric", representation(id="character"))
+NN <-    setClass("NN", representation(x="numeric"))
+
+(m1 <- myN  (1:3))
+(m2 <- myNid(1:3, id = "i3"))
+tools::assertError(NN (1:3))# in all R versions
+nn <- myN(2*pi)
+##                     # current R  |  (not existing)
+##                     # -----------|----------
+class(getDataPart(m1)) # integer    |  numeric
+class(getDataPart(m2)) # integer    |  numeric
+## check for now [[conceivably, these *could* change !]] :
+stopifnot(identical(getDataPart(m1), 1:3),
+	  identical(getDataPart(m2), 1:3),
+	  identical(S3Part(m1, strict=TRUE), 1:3),
+	  identical(S3Part(m2, strict=TRUE), 1:3),
+	  identical(2*pi, S3Part(nn, strict = TRUE)))
+
+if(FALSE) ## --- all these fail still:
+stopifnot(
+    identical(as(1L, "numeric"), as.numeric(1L))
+    ,
+    identical(as(1L, "numeric"), 1.0)
+    ,
+    is.double(as(1L, "double"))
+    )
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/parallel/inst/doc/parallel.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/parallel/inst/doc/parallel.pdf differ
diff -Nru r-base-3.2.3/src/library/parallel/man/detectCores.Rd r-base-3.3.1/src/library/parallel/man/detectCores.Rd
--- r-base-3.2.3/src/library/parallel/man/detectCores.Rd	2015-12-03 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/man/detectCores.Rd	2016-03-16 23:02:51.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/parallel/man/detectCores.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2011-2015 R Core Team
+% Copyright 2011-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{detectCores}
@@ -10,34 +10,36 @@
   Attempt to detect the number of CPU cores on the current host.
 }
 \usage{
-#ifdef windows
 detectCores(all.tests = FALSE, logical = TRUE)
-#endif
-#ifdef unix
-detectCores(all.tests = FALSE, logical = FALSE)
-#endif
 }
 \arguments{
   \item{all.tests}{Logical: if true apply all known tests.}
   \item{logical}{Logical: if possible, use the number of physical CPUs/cores
-    (if \code{FALSE}) or logical CPUs (if \code{TRUE}).}
+    (if \code{FALSE}) or logical CPUs (if \code{TRUE}).  Currently this
+    is honoured only on Linux, OS X, Sparc Solaris and Windows.}
 }
 \details{
-  This attempts to detect the number of CPU cores in the current
-  machine.
+  This attempts to detect the number of available CPU cores.
 
   It has methods to do so for Linux, OS X, FreeBSD, OpenBSD, Solaris,
   Irix and Windows.  \code{detectCores(TRUE)} could be tried on other
   Unix-alike systems.
+
+  Prior to \R 3.3.0 the default was \code{logical = FALSE} except on
+  Windows, but \code{logical = TRUE} had an effect only on Sparc Solaris
+  and Windows (where it was the default).
 }
 \value{
   An integer, \code{NA} if the answer is unknown.
 
   Exactly what this represents is OS-dependent: where possible by
-  default it represents physical cores and not logical
-  (e.g., hyperthreaded) CPUs.
+  default it counts logical (e.g., hyperthreaded) CPUs and not physical
+  cores or packages.
+
+  Under OS X there is a further distinction between \sQuote{available in
+    the current power management mode} and \sQuote{could be available
+    this boot}, and this function returns the first.
 
-  On Windows the default is the number of logical CPUs.
 #ifdef windows
   Only versions of Windows since XP SP3 are supported.  Microsoft
   documents that \code{logical = FALSE} it will report the number of
@@ -47,14 +49,13 @@
 #endif
 % https://msdn.microsoft.com/en-us/library/ms683194%28v=VS.85%29.aspx
 
-  Currently \code{logical} makes a difference on Sparc Solaris: there
-  \code{logical = FALSE} returns the number of physical cores and
-  \code{logical = TRUE} returns the number of available hardware
-  threads. (Some Sparc CPUs which do have multiple cores per CPU, others
-  have multiple threads per core and some have both.)  For example, the
-  UltraSparc T2 CPU in the CRAN check server is a single physical CPU
-  with 8 cores, and each core supports 8 hardware threads.  So
-  \code{detectCores(logical = FALSE)} returns 8, and
+  On Sparc Solaris \code{logical = FALSE} returns the number of physical
+  cores and \code{logical = TRUE} returns the number of available
+  hardware threads. (Some Sparc CPUs which do have multiple cores per
+  CPU, others have multiple threads per core and some have both.)  For
+  example, the UltraSparc T2 CPU in the CRAN check server is a single
+  physical CPU with 8 cores, and each core supports 8 hardware threads.
+  So \code{detectCores(logical = FALSE)} returns 8, and
   \code{detectCores(logical = TRUE)} returns 64.
 
   Where virtual machines are in use, one would hope that the result
@@ -67,15 +68,12 @@
 \note{
   This is not suitable for use directly for the \code{mc.cores} argument
   of \code{mclapply} nor specifying the number of cores in
-  \code{makeCluster}.  First because it may return \code{NA}, and second
-  because it does not give the number of \emph{allowed} cores.
+  \code{makeCluster}.  First because it may return \code{NA}, second
+  because it does not give the number of \emph{allowed} cores, and third
+  because on Sparc Solaris and some Windows boxes it is not reasonable
+  to try to use all the logical CPUs at once.
 }
 \examples{
 detectCores()
-#ifdef unix
-detectCores(logical = TRUE)
-#endif
-#ifdef windows
 detectCores(logical = FALSE)
-#endif
 }
diff -Nru r-base-3.2.3/src/library/parallel/po/da.po r-base-3.3.1/src/library/parallel/po/da.po
--- r-base-3.2.3/src/library/parallel/po/da.po	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/da.po	2016-04-27 22:15:18.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-11-29 09:15+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,76 +17,76 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
 msgstr "kan ikke oprette en datakanal"
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
 msgstr "kan ikke forgrene, mulig årsag: %s"
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr "allokeringsfejl for hukommelse"
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
 msgstr "kun underprocesser kan sende data til overprocessen"
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
 msgstr "der er ingen datakanal til overprocessen"
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr "indhold at sende skal være RAW (RÅ), brug serialize() hvis krævet"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
 msgstr "skrivefejl, lukke datakanal til overproces"
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr "kun overprocessen kan sende data til en underproces"
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr "underproces %d findes ikke"
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
 msgstr "skrivefejl"
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
 msgstr "fejl '%s' i select"
 
-#: fork.c:699
+#: fork.c:697
 #, fuzzy
 msgid "'mckill' failed"
 msgstr "mckill fejlede"
 
-#: fork.c:709
+#: fork.c:707
 #, fuzzy
 msgid "'mcexit' can only be used in a child process"
 msgstr "mcexit kan kun bruges i en underproces"
 
-#: fork.c:730
+#: fork.c:728
 #, fuzzy
 msgid "'mcexit' failed"
 msgstr "mcexit fejlede"
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr ""
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr ""
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/parallel/po/de.po r-base-3.3.1/src/library/parallel/po/de.po
--- r-base-3.2.3/src/library/parallel/po/de.po	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/de.po	2016-04-27 22:15:18.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-01 16:29+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
@@ -16,73 +16,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
 msgstr "kann keine pipe erzeugen"
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
 msgstr "kann nicht forken, möglicher Grund: %s"
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr "Speicherallozierungsfehler"
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
 msgstr "nur Kindprozesse können Daten zum Elternprozess schicken"
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
 msgstr "es gibt keine pipe zum Elternprozess"
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr "zu schickender Inhalt muss RAW sein, nutze serialize() wenn nötig"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
 msgstr "Schreibfehler, schließe pipe zum Elternprozess"
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr "nur der Elternprozess kann Daten zum Kindprozess schicken"
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr "Kindprozess %d existiert nicht"
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
 msgstr "Schreibfehler"
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
 msgstr "Fehler '%s' in select"
 
-#: fork.c:699
+#: fork.c:697
 msgid "'mckill' failed"
 msgstr "'mckill' fehlgeschlagen"
 
-#: fork.c:709
+#: fork.c:707
 msgid "'mcexit' can only be used in a child process"
 msgstr "'mcexit' kann nur von Kindprozessen genutzt werden"
 
-#: fork.c:730
+#: fork.c:728
 msgid "'mcexit' failed"
 msgstr "'mcexit' fehlgeschlagen"
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr "unzulässige CPU-Affinitätsspezifikation "
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr "angeforderte CPU Menge ist für dieses System zu groß"
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr "anfordern einer CPU-Affinitätsmenge fehlgeschlagen"
diff -Nru r-base-3.2.3/src/library/parallel/po/fr.po r-base-3.3.1/src/library/parallel/po/fr.po
--- r-base-3.2.3/src/library/parallel/po/fr.po	2015-06-06 22:15:27.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/fr.po	2016-04-27 22:15:18.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.14.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-18 22:07+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -18,75 +18,75 @@
 "Plural-Forms: nplurals=2;plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
 msgstr "impossible de créer un canal (pipe)"
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
 msgstr "impossible de créer une nouvelle branche, raison possible : %s"
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr "erreur d'allocation mémoire"
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
 msgstr ""
 "seuls des processus enfants peuvent envoyer des données à un processus maître"
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
 msgstr "aucun canal vers le processus maître"
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr "le contenu à envoyer doit être RAW, utilisez serialize() si nécessaire"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
 msgstr "erreur d'écriture, fermeture du canal vers le processus maître"
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr ""
 "seul le processus maître peut envoyer des données vers un processus fils"
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr "le processus fils %d n'existe pas"
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
 msgstr "erreur d'écriture"
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
 msgstr "erreur '%s' lors de la sélection"
 
-#: fork.c:699
+#: fork.c:697
 msgid "'mckill' failed"
 msgstr "'mckill' a échoué"
 
-#: fork.c:709
+#: fork.c:707
 msgid "'mcexit' can only be used in a child process"
 msgstr "'mcexit' peut seulement être utilisé avec un processus fils"
 
-#: fork.c:730
+#: fork.c:728
 msgid "'mcexit' failed"
 msgstr "'mcexit' a échoué"
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr "spécification d'affinité CPU incorrecte"
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr "le set de CPU demandé est trop large pour ce système"
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr "la récupération de l'affinité CPU a échoué"
diff -Nru r-base-3.2.3/src/library/parallel/po/ko.po r-base-3.3.1/src/library/parallel/po/ko.po
--- r-base-3.2.3/src/library/parallel/po/ko.po	2015-06-06 22:15:27.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/ko.po	2016-04-27 22:15:18.000000000 +0000
@@ -1,97 +1,99 @@
 # Korean translation for R parallel package
-# src/library/parallel/po/ko.po
+# ./parallel/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R parallel package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
-msgstr "파�프를 �성할 수 없습니다"
+msgstr "파�프(pipe)를 �성할 수 없습니다."
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
-msgstr "��할 수 없습니다. 가능한 �유는 다�과 같습니다: %s"
+msgstr "��할 수 없습니다. 아마� 다�과 같� �유때문입니다: %s"
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr "메모리 할당 �러입니다"
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
-msgstr "오로지  ��들만� ��터를 마스터 프로세스� 보낼 수 있습니다"
+msgstr "오로지 �� 프로세스들만� ��터를 마스터 프로세스� 보낼 수 있습니다"
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
-msgstr "마스터 프로세스로 연결� 파�프가 없습니다"
+msgstr "마스터 프로세스� 연결� 파�프가 없습니다."
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
-msgstr ""
-"보내야할 컨�츠는 반드시 RAW�어야 하며, 필요하다면 serialize()를 �용하세요"
+msgstr "보내야할 컨�츠는 반드시 RAW�어야 하며, 필요하다면 serialize()를 �용하세요"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
-msgstr "쓰기 �러입니다.  마스� 연결� 파�프를 닫습니다"
+msgstr "쓰기 �러입니다.  마스터� 연결� 파�프를 닫습니다"
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr "오로지 마스터 프로세스만� ��터를 ��프로세스� 보낼 수 있습니다"
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr "child %d는 존재하지 않습니다"
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
-msgstr "쓰기 �러입니다"
+msgstr "쓰기 �러가 발�했습니다."
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
-msgstr "선�중 �러 '%s'가 발�했습니다"
+msgstr "select �서 �러 '%s'가 발�했습니다"
 
-#: fork.c:699
+#: fork.c:697
 msgid "'mckill' failed"
 msgstr "'mckill' 실패했습니다"
 
-#: fork.c:709
+#: fork.c:707
 msgid "'mcexit' can only be used in a child process"
 msgstr "'mcexit'는 오로지 �� 프로세스�서만 사용�니다"
 
-#: fork.c:730
+#: fork.c:728
 msgid "'mcexit' failed"
 msgstr "'mcexit' 실패했습니다"
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr "유효하지 않� CPU affinity 지정입니다"
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr "요청� CPU 셋� � 시스템� 너무 �니다"
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr "CPU affiniy 셋� 검색하는� 실패했습니다"
diff -Nru r-base-3.2.3/src/library/parallel/po/parallel.pot r-base-3.3.1/src/library/parallel/po/parallel.pot
--- r-base-3.2.3/src/library/parallel/po/parallel.pot	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/parallel.pot	2016-04-27 22:15:18.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: parallel 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,73 +17,73 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
 msgstr ""
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
 msgstr ""
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr ""
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
 msgstr ""
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
 msgstr ""
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr ""
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
 msgstr ""
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr ""
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr ""
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
 msgstr ""
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
 msgstr ""
 
-#: fork.c:699
+#: fork.c:697
 msgid "'mckill' failed"
 msgstr ""
 
-#: fork.c:709
+#: fork.c:707
 msgid "'mcexit' can only be used in a child process"
 msgstr ""
 
-#: fork.c:730
+#: fork.c:728
 msgid "'mcexit' failed"
 msgstr ""
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr ""
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr ""
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/parallel/po/pl.po r-base-3.3.1/src/library/parallel/po/pl.po
--- r-base-3.2.3/src/library/parallel/po/pl.po	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/pl.po	2016-04-27 22:15:18.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,78 +13,78 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
 msgstr "nie można utworzyć potoku"
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
 msgstr "nie można rozdzielić, prawdopodobny powód: %s"
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr "błąd przydziału pamięci"
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
 msgstr "tylko potomne procesy mogą przesłać dane do procesu głównego"
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
 msgstr "nie ma potoku do procesu głównego"
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr ""
 "zawartość do wysłania musi być PUSTA, użyj 'serialize()' jeśli konieczne"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
 msgstr "błąd zapisu, zamykanie potoku do procesu głównego"
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr "tylko główny proces może przesłać dane do potomnego procesu"
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr "potomny proces %d nie istnieje"
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
 msgstr "błąd zapisu"
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
 msgstr "błąd '%s' przy wyborze"
 
-#: fork.c:699
+#: fork.c:697
 msgid "'mckill' failed"
 msgstr "'mckill' nie powiodło się"
 
-#: fork.c:709
+#: fork.c:707
 msgid "'mcexit' can only be used in a child process"
 msgstr "'mcexit' może być użyty jedynie w potomnym procesie"
 
-#: fork.c:730
+#: fork.c:728
 msgid "'mcexit' failed"
 msgstr "'mcexit' nie powiodło się"
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr "niepoprawne określenie koligacji CPU"
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr "zażądane ustawienie CPU jest zbyt duże dla tego systemu"
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr "pozyskiwanie ustawienia koligacji CPU nie powiodło się"
 
diff -Nru r-base-3.2.3/src/library/parallel/po/R-de.po r-base-3.3.1/src/library/parallel/po/R-de.po
--- r-base-3.2.3/src/library/parallel/po/R-de.po	2015-03-26 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/R-de.po	2016-03-16 23:02:51.000000000 +0000
@@ -24,7 +24,7 @@
 
 msgid "zero-length inputs cannot be mixed with those of non-zero length"
 msgstr ""
-"Eingaben mit Länge Null können nicht mit Eingaben anderer Länge\n"
+"Eingaben mit Länge Null können nicht mit Eingaben anderer Länge "
 "gemischt werden"
 
 msgid "dim(X) must have a positive length"
@@ -84,7 +84,7 @@
 
 msgid "Zero-length inputs cannot be mixed with those of non-zero length"
 msgstr ""
-"Eingaben mit Länge Null können nicht mit Eingaben anderer Länge\n"
+"Eingaben mit Länge Null können nicht mit Eingaben anderer Länge "
 "gemischt werden"
 
 msgid "invalid 'jobs' argument"
@@ -115,7 +115,7 @@
 "scheduled cores %s encountered errors in user code, all values of the jobs "
 "will be affected"
 msgstr[0] ""
-"eingeplanter Kern %s widerfuhr Fehler in Benutzerkode, alle Werte des Jobs "
+"eingeplanter Kern %s berichtet Fehler in Benutzerkode, alle Werte des Jobs "
 "werden betroffen sein"
 msgstr[1] ""
 "eingeplante Kerne %s berichten Fehler in Benutzerkode, alle Werte der Jobs "
diff -Nru r-base-3.2.3/src/library/parallel/po/R-ko.po r-base-3.3.1/src/library/parallel/po/R-ko.po
--- r-base-3.2.3/src/library/parallel/po/R-ko.po	2015-03-31 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/R-ko.po	2016-04-27 22:15:18.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R parallel package
-# src/library/parallel/po/R-ko.po
+# ./parallel/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
 #
-# Copyright (C) 1995-2015 The R Core Team
-# 
 # This file is distributed under the same license as the R parallel package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-09-21 07:12\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,10 +28,10 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "invalid value of 'seed'"
-msgstr "유효하지 않� 'seed'값입니다"
+msgstr "'seed'값� 올바르지 않습니다."
 
 msgid "need at least one argument"
-msgstr "최소한 하나� �수를 필요로 합니다"
+msgstr "최소한 하나 ��� ��가 필요합니다."
 
 msgid "zero-length inputs cannot be mixed with those of non-zero length"
 msgstr "길�가 0� 입력� 길�가 0� 아닌 입력들과 혼용� 수 없습니다"
@@ -79,7 +82,7 @@
 msgstr "'what'� 반드시 문� �는 raw 벡터�어야 합니다"
 
 msgid "'mc.cores' must be >= 1"
-msgstr "'mc.cores'는 반드시 1보다 �거나 같아야 합니다"
+msgstr "'mc.cores'는 1보다 �거나 같아야 합니다."
 
 msgid "%d function calls resulted in an error"
 msgstr "%d번� 함수 호출결과 �러가 발�했습니다"
@@ -91,10 +94,10 @@
 msgstr "길�가 0� 입력� 길�가 0� 아닌 입력들과 혼용� 수 없습니다"
 
 msgid "invalid 'jobs' argument"
-msgstr "유효하지 않� 'jobs' ��입니다"
+msgstr "올바르지 않� 'jobs' ��입니다."
 
 msgid "'v' must be a vector"
-msgstr "'v'는 반드시 벡터�어야 합니다"
+msgstr "'v'는 벡터�어야 합니다."
 
 msgid "some results may be missing, folded or caused an error"
 msgstr "�부 결과가 누�� 수� 있고, 오류를 접하거나 발�시켰� 수 있습니다"
diff -Nru r-base-3.2.3/src/library/parallel/po/R-parallel.pot r-base-3.3.1/src/library/parallel/po/R-parallel.pot
--- r-base-3.2.3/src/library/parallel/po/R-parallel.pot	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/R-parallel.pot	2016-04-27 22:15:18.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: parallel 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru r-base-3.2.3/src/library/parallel/po/R-pl.po r-base-3.3.1/src/library/parallel/po/R-pl.po
--- r-base-3.2.3/src/library/parallel/po/R-pl.po	2015-03-27 23:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/R-pl.po	2016-04-27 22:15:18.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,102 +13,162 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "invalid value of 'seed'"
-msgstr "niepoprawna wartość 'seed'"
-
-msgid "need at least one argument"
-msgstr "co najmniej jeden argument jest wymagany"
-
-msgid "zero-length inputs cannot be mixed with those of non-zero length"
-msgstr ""
-"wejścia o zerowej długości nie mogą być pomieszane z tymi o niezerowej "
-"długości"
-
-msgid "dim(X) must have a positive length"
-msgstr "'dim(X)' musi mieć dodatnią długość"
+#. R/unix/mclapply.R: gettextf("%d function calls resulted in an error", has.errors)
+#: R/unix/mclapply.R:0
+msgid "%d function calls resulted in an error"
+msgstr "wywołania funkcji %d spowodowało błąd"
 
+#. R/clusterApply.R: stop("'X' must have named dimnames")
+#: R/clusterApply.R:0
 msgid "'X' must have named dimnames"
 msgstr "'X' musi mieć nazwane wymiary"
 
-msgid "not all elements of 'MARGIN' are names of dimensions"
-msgstr "nie wszystkie elementy 'MARGIN' są nazwami wymiarów"
-
-msgid "no cluster 'cl' supplied and none is registered"
-msgstr ""
-"nie dostarczono argumentu klastr 'cl' oraz żaden nie jest zarejestrowany"
-
-msgid "not a valid cluster"
-msgstr "to nie jest poprawny klaster"
-
-msgid "unknown cluster type"
-msgstr "nieznany typ klastra"
+#. R/unix/mcfork.R: stop("'child' must be a valid child process")
+#: R/unix/mcfork.R:0
+msgid "'child' must be a valid child process"
+msgstr "argument 'child' musi być poprawnym procesem potomnym"
 
-msgid "numeric 'names' must be >= 1"
-msgstr "argument 'names' musi być >= 1"
+#. R/unix/mcfork.R: stop("'children' must be a list of processes or a single process")
+#. R/unix/mcfork.R: stop("'children' must be a list of processes or a single process")
+#: R/unix/mcfork.R:0
+msgid "'children' must be a list of processes or a single process"
+msgstr "argument 'children' musi być listą procesów lub pojedynczym procesem"
 
-msgid "node of a socket cluster on host %s with pid %d"
-msgstr "węzeł gniazda klastra na hoście %s z pid %d"
+#. R/windows/mcdummies.R: stop("'mc.cores' > 1 is not supported on Windows")
+#. R/windows/mcdummies.R: stop("'mc.cores' > 1 is not supported on Windows")
+#. R/windows/mcdummies.R: stop("'mc.cores' > 1 is not supported on Windows")
+#: R/windows/mcdummies.R:0
+msgid "'mc.cores' > 1 is not supported on Windows"
+msgstr "argument 'mc.cores' > 1 nie jest wspierany w systemach Windows"
 
-msgid "PORT must be specified"
-msgstr "argument 'port' musi być określony"
+#. R/unix/mclapply.R: stop("'mc.cores' must be >= 1")
+#. R/unix/pvec.R: stop("'mc.cores' must be >= 1")
+#. R/windows/mcdummies.R: stop("'mc.cores' must be >= 1")
+#. R/windows/mcdummies.R: stop("'mc.cores' must be >= 1")
+#. R/windows/mcdummies.R: stop("'mc.cores' must be >= 1")
+#: R/unix/mclapply.R:0 R/unix/pvec.R:0 R/windows/mcdummies.R:0
+msgid "'mc.cores' must be >= 1"
+msgstr "argument 'mc.cores' musi być >= 1"
 
+#. R/unix/forkCluster.R: stop("'nnodes' must be >= 1")
+#: R/unix/forkCluster.R:0
 msgid "'nnodes' must be >= 1"
 msgstr "argument 'nnodes' musi być >= 1"
 
-msgid "invalid 'child' argument"
-msgstr "niepoprawny argument 'child'"
-
-msgid "'children' must be a list of processes or a single process"
-msgstr "argument 'children' musi być listą procesów lub pojedynczym procesem"
-
+#. R/unix/mcfork.R: gettextf("'process' must be of class %s", dQuote("process"))
+#: R/unix/mcfork.R:0
 msgid "'process' must be of class %s"
 msgstr "argument 'process' musi być klasy %s"
 
-msgid "'child' must be a valid child process"
-msgstr "argument 'child' musi być poprawnym procesem potomnym"
+#. R/unix/pvec.R: stop("'v' must be a vector")
+#. R/windows/mcdummies.R: stop("'v' must be a vector")
+#: R/unix/pvec.R:0 R/windows/mcdummies.R:0
+msgid "'v' must be a vector"
+msgstr "argument 'v' musi być wektorem"
 
+#. R/unix/mcfork.R: stop("'what' must be a character or raw vector")
+#: R/unix/mcfork.R:0
 msgid "'what' must be a character or raw vector"
 msgstr "argument 'what' musi być tekstem albo pustym wektorem"
 
-msgid "'mc.cores' must be >= 1"
-msgstr "argument 'mc.cores' musi być >= 1"
-
-msgid "%d function calls resulted in an error"
-msgstr "wywołania funkcji %d spowodowało błąd"
-
-msgid "all scheduled cores encountered errors in user code"
-msgstr "wszystkie zaplanowane jądra napotkały błędy w kodzie użytkownika"
+#. R/snowSOCK.R: stop("PORT must be specified")
+#: R/snowSOCK.R:0
+msgid "PORT must be specified"
+msgstr "argument 'port' musi być określony"
 
+#. R/unix/mcmapply.R: stop("Zero-length inputs cannot be mixed with those of non-zero length")
+#: R/unix/mcmapply.R:0
 msgid "Zero-length inputs cannot be mixed with those of non-zero length"
 msgstr ""
 "Wejścia o zerowej długości nie mogą być pomieszane z tymi o niezerowej "
 "długości"
 
+#. R/unix/mclapply.R: warning("all scheduled cores encountered errors in user code")
+#: R/unix/mclapply.R:0
+msgid "all scheduled cores encountered errors in user code"
+msgstr "wszystkie zaplanowane jądra napotkały błędy w kodzie użytkownika"
+
+#. R/clusterApply.R: stop("dim(X) must have a positive length")
+#: R/clusterApply.R:0
+msgid "dim(X) must have a positive length"
+msgstr "'dim(X)' musi mieć dodatnią długość"
+
+#. R/windows/forkCluster.R: stop("fork clusters are not supported on Windows")
+#: R/windows/forkCluster.R:0
+msgid "fork clusters are not supported on Windows"
+msgstr "rozgałęzione klastry nie są obsługiwane w systemie Windows"
+
+#. R/unix/mcfork.R: stop("invalid 'child' argument")
+#. R/unix/mcfork.R: stop("invalid 'child' argument")
+#: R/unix/mcfork.R:0
+msgid "invalid 'child' argument"
+msgstr "niepoprawny argument 'child'"
+
+#. R/unix/mcparallel.R: stop("invalid 'jobs' argument")
+#: R/unix/mcparallel.R:0
 msgid "invalid 'jobs' argument"
 msgstr "niepoprawny argument 'jobs'"
 
-msgid "'v' must be a vector"
-msgstr "argument 'v' musi być wektorem"
+#. R/RngStream.R: stop("invalid value of 'seed'")
+#. R/RngStream.R: stop("invalid value of 'seed'")
+#: R/RngStream.R:0
+msgid "invalid value of 'seed'"
+msgstr "niepoprawna wartość 'seed'"
+
+#. R/clusterApply.R: stop("need at least one argument")
+#: R/clusterApply.R:0
+msgid "need at least one argument"
+msgstr "co najmniej jeden argument jest wymagany"
 
+#. R/snow.R: stop("no cluster 'cl' supplied and none is registered")
+#: R/snow.R:0
+msgid "no cluster 'cl' supplied and none is registered"
+msgstr ""
+"nie dostarczono argumentu klastr 'cl' oraz żaden nie jest zarejestrowany"
+
+#. R/snowSOCK.R: gettextf("node of a socket cluster on host %s with pid %d", sQuote(x[["host"]]),     pid)
+#: R/snowSOCK.R:0
+msgid "node of a socket cluster on host %s with pid %d"
+msgstr "węzeł gniazda klastra na hoście %s z pid %d"
+
+#. R/snow.R: stop("not a valid cluster")
+#: R/snow.R:0
+msgid "not a valid cluster"
+msgstr "to nie jest poprawny klaster"
+
+#. R/clusterApply.R: stop("not all elements of 'MARGIN' are names of dimensions")
+#: R/clusterApply.R:0
+msgid "not all elements of 'MARGIN' are names of dimensions"
+msgstr "nie wszystkie elementy 'MARGIN' są nazwami wymiarów"
+
+#. R/snowSOCK.R: stop("numeric 'names' must be >= 1")
+#: R/snowSOCK.R:0
+msgid "numeric 'names' must be >= 1"
+msgstr "argument 'names' musi być >= 1"
+
+#. R/unix/pvec.R: warning("some results may be missing, folded or caused an error")
+#: R/unix/pvec.R:0
 msgid "some results may be missing, folded or caused an error"
 msgstr ""
 "niektórych wyników może brakować, mogą być zwinięte lub spowodowały błąd"
 
-msgid "fork clusters are not supported on Windows"
-msgstr "rozgałęzione klastry nie są obsługiwane w systemie Windows"
-
-msgid "'mc.cores' > 1 is not supported on Windows"
-msgstr "argument 'mc.cores' > 1 nie jest wspierany w systemach Windows"
+#. R/snow.R: stop("unknown cluster type")
+#: R/snow.R:0
+msgid "unknown cluster type"
+msgstr "nieznany typ klastra"
 
-msgid "socket cluster with %d nodes on host %s"
-msgid_plural "socket cluster with %d nodes on hosts %s"
-msgstr[0] "gniazdo klastra z %d węzłem na hoście %s"
-msgstr[1] "gniazdo klastra z %d węzłami na hoście %s"
-msgstr[2] "gniazdo klastra z %d węzłami na hoście %s"
+#. R/clusterApply.R: stop("zero-length inputs cannot be mixed with those of non-zero length")
+#: R/clusterApply.R:0
+msgid "zero-length inputs cannot be mixed with those of non-zero length"
+msgstr ""
+"wejścia o zerowej długości nie mogą być pomieszane z tymi o niezerowej "
+"długości"
 
+#. R/unix/mclapply.R: ngettext(has.errors, "scheduled core %s encountered error in user code, all values of the job will be affected",     "scheduled cores %s encountered errors in user code, all values of the jobs will be affected")
+#: R/unix/mclapply.R:0
 msgid ""
 "scheduled core %s encountered error in user code, all values of the job will "
 "be affected"
@@ -124,3 +184,11 @@
 msgstr[2] ""
 "zaplanowane jądra '%s' napotkały błędy w kodzie użytkownika, wpłynie to na "
 "wszystkie wartości zadań"
+
+#. R/snowSOCK.R: ngettext(length(hosts), "socket cluster with %d nodes on host %s",     "socket cluster with %d nodes on hosts %s")
+#: R/snowSOCK.R:0
+msgid "socket cluster with %d nodes on host %s"
+msgid_plural "socket cluster with %d nodes on hosts %s"
+msgstr[0] "gniazdo klastra z %d węzłem na hoście %s"
+msgstr[1] "gniazdo klastra z %d węzłami na hoście %s"
+msgstr[2] "gniazdo klastra z %d węzłami na hoście %s"
diff -Nru r-base-3.2.3/src/library/parallel/po/R-ru.po r-base-3.3.1/src/library/parallel/po/R-ru.po
--- r-base-3.2.3/src/library/parallel/po/R-ru.po	2015-03-28 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/R-ru.po	2016-04-27 22:15:18.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: R 2.14.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-09-21 07:12\n"
-"PO-Revision-Date: 2015-03-26 19:08-0600\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
diff -Nru r-base-3.2.3/src/library/parallel/po/ru.po r-base-3.3.1/src/library/parallel/po/ru.po
--- r-base-3.2.3/src/library/parallel/po/ru.po	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/ru.po	2016-04-27 22:15:18.000000000 +0000
@@ -8,18 +8,18 @@
 msgstr ""
 "Project-Id-Version: R 2.14.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2013-03-19 21:05-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:253
+#: fork.c:256
 msgid "unable to create a pipe"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÔÒÕÂÕ"
 
@@ -44,7 +44,9 @@
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr "ÐÏÓÙÌÁÅÍÙÊ ËÏÎÔÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ RAW, ÉÓÐÏÌØÚÕÊÔÅ serialize(), ÅÓÌÉ ÎÁÄÏ"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:386
+#: fork.c:393
+#: fork.c:717
 msgid "write error, closing pipe to the master"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ, ÚÁËÒÙ×ÁÀ ÔÒÕÂÕ Ë ÍÁÓÔÅÒÕ"
 
@@ -61,7 +63,8 @@
 msgid "write error"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ"
 
-#: fork.c:487 fork.c:611
+#: fork.c:487
+#: fork.c:611
 #, c-format
 msgid "error '%s' in select"
 msgstr "ÏÛÉÂËÁ '%s' × ×ÙÂÏÒÅ"
@@ -78,7 +81,8 @@
 msgid "'mcexit' failed"
 msgstr "'mcexit' ÎÅ ÕÄÁÌÓÑ"
 
-#: fork.c:759 fork.c:768
+#: fork.c:759
+#: fork.c:768
 msgid "invalid CPU affinity specification"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÏÐÉÓÁÎÉÅ ÐÒÉ×ÑÚËÉ CPU"
 
@@ -89,3 +93,4 @@
 #: fork.c:802
 msgid "retrieving CPU affinity set failed"
 msgstr "ÚÁÇÒÕÚËÁ ÐÒÉ×ÑÚËÉ ÕÓÔÁÎÏ×ËÉ CPU ÎÅ ÕÄÁÌÁÓØ"
+
diff -Nru r-base-3.2.3/src/library/parallel/po/zh_CN.po r-base-3.3.1/src/library/parallel/po/zh_CN.po
--- r-base-3.2.3/src/library/parallel/po/zh_CN.po	2015-06-06 22:15:28.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/po/zh_CN.po	2016-04-27 22:15:18.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.15.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2012-02-29 14:00+0000\n"
 "Last-Translator: Fei Chen <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -16,73 +16,73 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fork.c:253 fork.c:256
+#: fork.c:251 fork.c:254
 msgid "unable to create a pipe"
 msgstr "无法建立管�"
 
-#: fork.c:274
+#: fork.c:272
 #, c-format
 msgid "unable to fork, possible reason: %s"
 msgstr "无法分�，�能的原因是：%s"
 
-#: fork.c:320
+#: fork.c:318
 msgid "memory allocation error"
 msgstr "内存分�错误"
 
-#: fork.c:373
+#: fork.c:371
 msgid "only children can send data to the master process"
 msgstr "�有�进程�能给主进程��数�"
 
-#: fork.c:375
+#: fork.c:373
 msgid "there is no pipe to the master process"
 msgstr "有没�以接到主进程的管�"
 
-#: fork.c:377
+#: fork.c:375
 msgid "content to send must be RAW, use serialize() if needed"
 msgstr "��的内容必须是原始的，如果需�的�请用serialize（）"
 
-#: fork.c:386 fork.c:393 fork.c:717
+#: fork.c:384 fork.c:391 fork.c:715
 msgid "write error, closing pipe to the master"
 msgstr "书写错误，请关闭通往主进程的管�"
 
-#: fork.c:406
+#: fork.c:404
 msgid "only the master process can send data to a child process"
 msgstr "�有主进程�能给�进程��数�"
 
-#: fork.c:413
+#: fork.c:411
 #, c-format
 msgid "child %d does not exist"
 msgstr "�存在%d这个�进程"
 
-#: fork.c:419
+#: fork.c:417
 msgid "write error"
 msgstr "书写错误"
 
-#: fork.c:487 fork.c:611
+#: fork.c:485 fork.c:609
 #, c-format
 msgid "error '%s' in select"
 msgstr "选择时出了'%s'这样一个错"
 
-#: fork.c:699
+#: fork.c:697
 msgid "'mckill' failed"
 msgstr "'mckill'失败"
 
-#: fork.c:709
+#: fork.c:707
 msgid "'mcexit' can only be used in a child process"
 msgstr "'mcexit'�能用于�进程"
 
-#: fork.c:730
+#: fork.c:728
 msgid "'mcexit' failed"
 msgstr "'mcexit'失败"
 
-#: fork.c:759 fork.c:768
+#: fork.c:757 fork.c:766
 msgid "invalid CPU affinity specification"
 msgstr "CPU亲和力规范�对"
 
-#: fork.c:779
+#: fork.c:777
 msgid "requested CPU set is too large for this system"
 msgstr "所需�的CPU设置对于这个系统�说太大了"
 
-#: fork.c:802
+#: fork.c:800
 msgid "retrieving CPU affinity set failed"
 msgstr "无法收�CPU亲和力"
diff -Nru r-base-3.2.3/src/library/parallel/R/clusterApply.R r-base-3.3.1/src/library/parallel/R/clusterApply.R
--- r-base-3.2.3/src/library/parallel/R/clusterApply.R	2015-08-25 22:15:48.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/R/clusterApply.R	2016-04-09 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/parallel/R/clusterApply.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -143,7 +143,7 @@
     else if (ncl == 1L || nx == 1L) list(i)
     else {
         fuzz <- min((nx - 1L) / 1000, 0.4 * nx / ncl)
-        breaks <- seq(1 - fuzz, nx + fuzz, length = ncl + 1L)
+        breaks <- seq(1 - fuzz, nx + fuzz, length.out = ncl + 1L)
         structure(split(i, cut(i, breaks)), names = NULL)
     }
 }
diff -Nru r-base-3.2.3/src/library/parallel/R/detectCores.R r-base-3.3.1/src/library/parallel/R/detectCores.R
--- r-base-3.2.3/src/library/parallel/R/detectCores.R	2015-09-04 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/R/detectCores.R	2016-03-16 23:02:49.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/parallel/R/detectCores.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -26,11 +26,13 @@
             ifelse(logical, res[2L], res[1L]);
         }
     } else {
-        function(all.tests = FALSE, logical = FALSE) {
+        function(all.tests = FALSE, logical = TRUE) {
             ## Commoner OSes first
             systems <-
-                list(linux = "grep processor /proc/cpuinfo 2>/dev/null | wc -l",
-                     darwin = "/usr/sbin/sysctl -n hw.ncpu 2>/dev/null",
+                list(linux =
+                     if(logical) "grep processor /proc/cpuinfo 2>/dev/null | wc -l" else "cat /proc/cpuinfo | grep 'cpu cores'| uniq | cut -f2 -d:",
+                     ## hw.physicalcpu is not documented for 10.9, but works
+                     darwin = if(logical) "/usr/sbin/sysctl -n hw.logicalcpu 2>/dev/null" else "/usr/sbin/sysctl -n hw.physicalcpu 2>/dev/null",
                      solaris = if(logical) "/usr/sbin/psrinfo -v | grep 'Status of.*processor' | wc -l" else "/bin/kstat -p -m cpu_info | grep :core_id | cut -f2 | uniq | wc -l",
                      freebsd = "/sbin/sysctl -n hw.ncpu 2>/dev/null",
                      openbsd = "/sbin/sysctl -n hw.ncpu 2>/dev/null",
diff -Nru r-base-3.2.3/src/library/parallel/R/RngStream.R r-base-3.3.1/src/library/parallel/R/RngStream.R
--- r-base-3.2.3/src/library/parallel/R/RngStream.R	2015-09-04 22:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/R/RngStream.R	2016-03-16 23:02:49.000000000 +0000
@@ -62,7 +62,7 @@
 mc.reset.stream <- function() {
     if (RNGkind()[1L] == "L'Ecuyer-CMRG") {
         if (!exists(".Random.seed", envir = .GlobalEnv, inherits = FALSE))
-            stats::runif(1)
+            sample.int(1L)
         assign("LEcuyer.seed",
                get(".Random.seed", envir = .GlobalEnv, inherits = FALSE),
                envir = RNGenv)
@@ -76,7 +76,7 @@
         if (reset ||
             !exists("LEcuyer.seed", envir = RNGenv, inherits = FALSE)) {
             if (!exists(".Random.seed", envir = .GlobalEnv, inherits = FALSE))
-                stats::runif(1)
+                sample.int(1L)
             assign("LEcuyer.seed",
                    get(".Random.seed", envir = .GlobalEnv, inherits = FALSE),
                    envir = RNGenv)
diff -Nru r-base-3.2.3/src/library/parallel/R/snow.R r-base-3.3.1/src/library/parallel/R/snow.R
--- r-base-3.2.3/src/library/parallel/R/snow.R	2015-09-04 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/R/snow.R	2016-03-16 23:02:49.000000000 +0000
@@ -84,8 +84,10 @@
     rscript <- file.path(R.home("bin"), "Rscript")
     port <- Sys.getenv("R_PARALLEL_PORT")
     port <- if (identical(port, "random")) NA else as.integer(port)
-    if (is.na(port))
-        port <- 11000 + 1000 * ((stats::runif(1L) + unclass(Sys.time())/300) %% 1)
+    if (is.na(port)) {
+        ran1 <- sample.int(.Machine$integer.max - 1L, 1L) / .Machine$integer.max
+        port <- 11000 + 1000 * ((ran1 + unclass(Sys.time()) / 300) %% 1)
+    }
     Sys.i <- Sys.info()
     options <- list(port = as.integer(port),
                     timeout = 60 * 60 * 24 * 30, # 30 days
diff -Nru r-base-3.2.3/src/library/parallel/R/snowSOCK.R r-base-3.3.1/src/library/parallel/R/snowSOCK.R
--- r-base-3.2.3/src/library/parallel/R/snowSOCK.R	2015-08-25 22:15:48.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/R/snowSOCK.R	2016-03-16 23:02:49.000000000 +0000
@@ -41,13 +41,13 @@
                  " PORT=", port,
                  " OUT=", outfile,
                  " TIMEOUT=", timeout,
-                 " METHODS=", methods,
                  " XDR=", useXDR)
     arg <- "parallel:::.slaveRSOCK()"
     rscript <- if (getClusterOption("homogeneous", options)) {
         shQuote(getClusterOption("rscript", options))
     } else "Rscript"
     rscript_args <- getClusterOption("rscript_args", options)
+    if(methods) rscript_args <-c("--default-packages=datasets,utils,grDevices,graphics,stats,methods",  rscript_args)
 
     ## in principle we should quote these,
     ## but the current possible values do not need quoting
@@ -65,7 +65,7 @@
 
     if (manual) {
         cat("Manually start worker on", machine, "with\n    ", cmd, "\n")
-        flush.console()
+        utils::flush.console()
     } else {
         ## add the remote shell command if needed
         if (machine != "localhost") {
@@ -186,12 +186,10 @@
                PORT = {port <- value},
                OUT = {outfile <- value},
                TIMEOUT = {timeout <- value},
-               METHODS = {methods <- value},
                XDR = {useXDR <- as.logical(value)})
     }
     if (is.na(port)) stop("PORT must be specified")
 
-    if(as.logical(methods)) library("methods") ## because Rscript does not load methods by default
     ## We should not need to attach parallel, as we are running in the namespace.
 
     sinkWorkerOutput(outfile)
diff -Nru r-base-3.2.3/src/library/parallel/src/fork.c r-base-3.3.1/src/library/parallel/src/fork.c
--- r-base-3.2.3/src/library/parallel/src/fork.c	2015-08-25 22:15:49.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/src/fork.c	2016-03-16 23:02:50.000000000 +0000
@@ -108,7 +108,6 @@
 	if (ci->pid == pid) {
 	    if (ci->pfd > 0) { close(ci->pfd); ci->pfd = -1; }
             if (ci->sifd > 0) { close(ci->sifd); ci->sifd = -1; }
-	    ci->pid = 0;
 	    break;
 	}
 	ci = ci->next;
@@ -208,7 +207,6 @@
 #endif			
 			if (ci->pfd > 0)  { close(ci->pfd); ci->pfd = -1; }
 			if (ci->sifd > 0) { close(ci->sifd); ci->sifd = -1; }
-			ci->pid = 0;
 		    }
 		    break;
 		}
diff -Nru r-base-3.2.3/src/library/parallel/tests/multicore2.Rout.save r-base-3.3.1/src/library/parallel/tests/multicore2.Rout.save
--- r-base-3.2.3/src/library/parallel/tests/multicore2.Rout.save	2015-12-03 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/tests/multicore2.Rout.save	2016-06-14 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -45,4 +45,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.120   0.017   0.188 
+  0.146   0.026   0.262 
diff -Nru r-base-3.2.3/src/library/parallel/tests/snow2.Rout.save r-base-3.3.1/src/library/parallel/tests/snow2.Rout.save
--- r-base-3.2.3/src/library/parallel/tests/snow2.Rout.save	2015-12-03 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/tests/snow2.Rout.save	2016-06-14 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -50,4 +50,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.178   0.027   0.580 
+  0.151   0.024   0.571 
diff -Nru r-base-3.2.3/src/library/parallel/vignettes/parallel.Rnw r-base-3.3.1/src/library/parallel/vignettes/parallel.Rnw
--- r-base-3.2.3/src/library/parallel/vignettes/parallel.Rnw	2015-08-25 22:15:50.000000000 +0000
+++ r-base-3.3.1/src/library/parallel/vignettes/parallel.Rnw	2016-03-16 23:02:50.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/parallel/vignettes/parallel.Rnw
 % Part of the R package, https://www.R-project.org
-% Copyright 2011-2015  R Core Team
+% Copyright 2011-2016  R Core Team
 % Distributed under GPL 2 or later
 
 \documentclass[a4paper]{article}
@@ -105,7 +105,7 @@
   `cluster' of nodes.
 
 \item \emph{Via} forking.  \emph{Fork} is a
-  concept\footnote{\url{http://en.wikipedia.org/wiki/Fork_(operating_system)}}
+  concept\footnote{\url{https://en.wikipedia.org/wiki/Fork_(operating_system)}}
   from POSIX operating systems, and should be available on all \R{}
   platforms except Windows.  This creates a new \R{} process by taking
   a complete copy of the master process, including the workspace and
@@ -197,7 +197,7 @@
 \code{detectCores()} tries to determine the number of CPU cores in the
 machine on which \R{} is running: it has ways to do so on all known
 current \R{} platforms.  What exactly it measures is OS-specific: we
-try where possible to report the number of physical cores available.
+try where possible to report the number of logical cores available.
 
 On Windows the default is to report the number of logical CPUs.  On
 modern hardware (e.g.{} Intel \emph{Core i7}) the latter may not be
@@ -766,10 +766,6 @@
 graphics device.  This has been replaced by recording a flag in the
 \R{} executable for a child process.
 
-The version of \code{detectCores} here is biased towards the number of
-physical CPUs.  This was occasioned by serious problems on Sparc Solaris
-where \CRANpkg{multicore} defaulted to a silly number of processes.
-
 Functions \code{fork} and \code{kill} have \code{mc} prefixes and are
 not exported.  This avoids confusion with other packages (such as
 package \CRANpkg{fork}), and note that \code{mckill} is not as general as
diff -Nru r-base-3.2.3/src/library/profile/Common.R r-base-3.3.1/src/library/profile/Common.R
--- r-base-3.2.3/src/library/profile/Common.R	2012-08-05 22:05:09.000000000 +0000
+++ r-base-3.3.1/src/library/profile/Common.R	2016-04-18 22:15:07.000000000 +0000
@@ -1,9 +1,9 @@
 ### This is the system Rprofile file. It is always run on startup.
 ### Additional commands can be placed in site or user Rprofile files
-#
-#  Copyright (C) 1995-2012 The R Core Team
 ### (see ?Rprofile).
 
+### Copyright (C) 1995-2015 The R Core Team
+
 ### Notice that it is a bad idea to use this file as a template for
 ### personal startup files, since things will be executed twice and in
 ### the wrong environment (user profiles are run in .GlobalEnv).
@@ -40,7 +40,7 @@
     options(showErrorCalls = TRUE)
 
 local({dp <- Sys.getenv("R_DEFAULT_PACKAGES")
-       if(identical(dp, "")) # marginally faster to do methods last
+       if(identical(dp, "")) ## it fact methods is done first
            dp <- c("datasets", "utils", "grDevices", "graphics",
                    "stats", "methods")
        else if(identical(dp, "NULL")) dp <- character(0)
@@ -55,6 +55,13 @@
 Sys.setenv(R_LIBS_USER =
            .expand_R_libs_env_var(Sys.getenv("R_LIBS_USER")))
 
+local({
+    if(nzchar(tl <- Sys.getenv("R_SESSION_TIME_LIMIT_CPU")))
+        setSessionTimeLimit(cpu = tl)
+    if(nzchar(tl <- Sys.getenv("R_SESSION_TIME_LIMIT_ELAPSED")))
+        setSessionTimeLimit(elapsed = tl)
+})
+
 .First.sys <- function()
 {
     for(pkg in getOption("defaultPackages")) {
@@ -62,18 +69,19 @@
                        character.only = TRUE)
         if(!res)
             warning(gettextf('package %s in options("defaultPackages") was not found', sQuote(pkg)),
-                    call.=FALSE, domain = NA)
+                    call. = FALSE, domain = NA)
     }
 }
 
+## called at C level in the startup process prior to .First.sys
 .OptRequireMethods <- function()
 {
-      if("methods" %in% getOption("defaultPackages")) {
-        res <- require("methods", quietly = TRUE, warn.conflicts = FALSE,
-                       character.only = TRUE)
-        if(!res)
-            warning('package "methods" in options("defaultPackages") was not found', call.=FALSE)
-    }
+    pkg <- "methods" # done this way to avoid R CMD check warning
+    if(pkg %in% getOption("defaultPackages"))
+        if(!require(pkg, quietly = TRUE, warn.conflicts = FALSE,
+                    character.only = TRUE))
+            warning('package "methods" in options("defaultPackages") was not found',
+                    call. = FALSE)
 }
 
 if(nzchar(Sys.getenv("R_BATCH"))) {
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/boot_1.3-17.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/boot_1.3-17.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/boot_1.3-18.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/boot_1.3-18.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/boot.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/boot.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/class_7.3-14.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/class_7.3-14.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/class.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/class.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/cluster_2.0.3.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/cluster_2.0.3.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/cluster_2.0.4.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/cluster_2.0.4.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/cluster.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/cluster.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/KernSmooth_2.23-15.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/KernSmooth_2.23-15.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/KernSmooth.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/KernSmooth.tgz differ
diff -Nru r-base-3.2.3/src/library/Recommended/Makefile.in r-base-3.3.1/src/library/Recommended/Makefile.in
--- r-base-3.2.3/src/library/Recommended/Makefile.in	2014-03-13 23:15:03.000000000 +0000
+++ r-base-3.3.1/src/library/Recommended/Makefile.in	2016-04-17 22:15:04.000000000 +0000
@@ -116,6 +116,7 @@
 mgcv.ts: nlme.ts MASS.ts Matrix.ts
 nlme.ts: lattice.ts
 class.ts: MASS.ts
+survival.ts: Matrix.ts
 ## and for static html links
 boot.ts: MASS.ts survival.ts
 cluster.ts: MASS.ts
diff -Nru r-base-3.2.3/src/library/Recommended/Makefile.win r-base-3.3.1/src/library/Recommended/Makefile.win
--- r-base-3.2.3/src/library/Recommended/Makefile.win	2013-07-23 22:05:03.000000000 +0000
+++ r-base-3.3.1/src/library/Recommended/Makefile.win	2016-04-17 22:15:04.000000000 +0000
@@ -58,6 +58,7 @@
 mgcv.ts: nlme.ts MASS.ts Matrix.ts
 nlme.ts: lattice.ts
 class.ts: MASS.ts
+survival.ts: Matrix.ts
 ## and for static html links
 boot.ts: MASS.ts survival.ts
 cluster.ts: MASS.ts
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/MASS_7.3-45.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/MASS_7.3-45.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/MASS.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/MASS.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/Matrix_1.2-3.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/Matrix_1.2-3.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/Matrix_1.2-6.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/Matrix_1.2-6.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/Matrix.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/Matrix.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/mgcv_1.8-12.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/mgcv_1.8-12.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/mgcv_1.8-9.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/mgcv_1.8-9.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/mgcv.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/mgcv.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/nlme_3.1-122.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/nlme_3.1-122.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/nlme_3.1-128.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/nlme_3.1-128.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/nlme.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/nlme.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/nnet_7.3-11.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/nnet_7.3-11.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/nnet_7.3-12.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/nnet_7.3-12.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/nnet.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/nnet.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/rpart_4.1-10.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/rpart_4.1-10.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/rpart.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/rpart.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/spatial_7.3-11.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/spatial_7.3-11.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/spatial.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/spatial.tgz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/survival_2.38-3.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/survival_2.38-3.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/survival_2.39-4.tar.gz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/survival_2.39-4.tar.gz differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/Recommended/survival.tgz and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/Recommended/survival.tgz differ
diff -Nru r-base-3.2.3/src/library/splines/po/da.po r-base-3.3.1/src/library/splines/po/da.po
--- r-base-3.2.3/src/library/splines/po/da.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/da.po	2016-04-27 22:15:40.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-11-28 22:23+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr "'ord' skal være et positivt heltal"
diff -Nru r-base-3.2.3/src/library/splines/po/de.po r-base-3.3.1/src/library/splines/po/de.po
--- r-base-3.2.3/src/library/splines/po/de.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/de.po	2016-04-27 22:15:40.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2009-10-07 14:28+0200\n"
 "Last-Translator: Detlef Steuer <detlef.steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr "'ord' muss eine positive ganze Zahl sein"
diff -Nru r-base-3.2.3/src/library/splines/po/fr.po r-base-3.3.1/src/library/splines/po/fr.po
--- r-base-3.2.3/src/library/splines/po/fr.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/fr.po	2016-04-27 22:15:40.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2010-10-01 21:00+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -18,6 +18,6 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: French\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr "'ord' doit être un entier positif"
diff -Nru r-base-3.2.3/src/library/splines/po/ja.po r-base-3.3.1/src/library/splines/po/ja.po
--- r-base-3.2.3/src/library/splines/po/ja.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/ja.po	2016-04-27 22:15:40.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.1 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-06-02 16:10+0900 \n"
 "Last-Translator: Nobuo Funao \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -16,6 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8 \n"
 "Content-Transfer-Encoding: 8bit \n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr " 'ord' �正�値���れ�����ん "
diff -Nru r-base-3.2.3/src/library/splines/po/ko.po r-base-3.3.1/src/library/splines/po/ko.po
--- r-base-3.2.3/src/library/splines/po/ko.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/ko.po	2016-04-27 22:15:40.000000000 +0000
@@ -1,29 +1,32 @@
 # Korean translation for R splines package
-# src/library/splines/po/ko.po
+# ./splines/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R splines package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
-msgstr "'ord'는 반드시 양� 정수�어야 합니다"
+msgstr "'ord'는 반드시 양� 정수�어야 합니다."
diff -Nru r-base-3.2.3/src/library/splines/po/pl.po r-base-3.3.1/src/library/splines/po/pl.po
--- r-base-3.2.3/src/library/splines/po/pl.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/pl.po	2016-04-27 22:15:40.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,9 +13,9 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr "argument 'ord' musi być dodatnią liczbą całkowitą"
diff -Nru r-base-3.2.3/src/library/splines/po/pt_BR.po r-base-3.3.1/src/library/splines/po/pt_BR.po
--- r-base-3.2.3/src/library/splines/po/pt_BR.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/pt_BR.po	2016-04-27 22:15:40.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:57-0300\n"
 "Last-Translator: Fernando Henrique Ferraz P. da Rosa <feferraz@.ime.usp.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -17,6 +17,6 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Translate Toolkit 1.7.0\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr "'ord' deve ser um inteiro positivo"
diff -Nru r-base-3.2.3/src/library/splines/po/R-da.po r-base-3.3.1/src/library/splines/po/R-da.po
--- r-base-3.2.3/src/library/splines/po/R-da.po	2013-03-05 23:02:39.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-da.po	2016-04-27 22:15:40.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2012-09-24 08:30\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-28 15:52+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,9 +16,13 @@
 msgid "must have at least 'ord' knots"
 msgstr "skal have mindst »ord« knob"
 
-msgid "length of 'derivs' must match length of 'x'"
+#, fuzzy
+msgid "length of 'derivs' is larger than length of 'x'"
 msgstr "længden for »drivs« skal matche længden for »x«"
 
+msgid "empty 'derivs'"
+msgstr ""
+
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr "»ord« skal være et positivt heltal, højst antallet af knob"
 
diff -Nru r-base-3.2.3/src/library/splines/po/R-de.po r-base-3.3.1/src/library/splines/po/R-de.po
--- r-base-3.2.3/src/library/splines/po/R-de.po	2015-03-26 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-de.po	2016-04-27 22:15:40.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 3.1.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2012-09-24 08:30\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2013-03-01 16:34+0100\n"
 "Last-Translator: Detlef Steuer <detlef.steuer@hsu-hh.de>\n"
 "Language-Team: R-core <R-core@r-project.org>\n"
@@ -20,9 +20,13 @@
 msgid "must have at least 'ord' knots"
 msgstr "muss zumindest 'ord' Knoten haben"
 
-msgid "length of 'derivs' must match length of 'x'"
+#, fuzzy
+msgid "length of 'derivs' is larger than length of 'x'"
 msgstr "Länge von 'derivs' muss der Länge von 'x' entsprechen"
 
+msgid "empty 'derivs'"
+msgstr ""
+
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr ""
 "'ord' muss eine positive ganze Zahl sein, maximal die Anzahl der Knoten"
@@ -78,5 +82,5 @@
 
 msgid "some 'x' values beyond boundary knots may cause ill-conditioned bases"
 msgstr ""
-"einige 'x' Werte ausserhalb der Begrenzungsknoten erzeugen eventuwll "
+"einige 'x' Werte ausserhalb der Begrenzungsknoten erzeugen eventuell "
 "schlecht konditionierte Basis"
diff -Nru r-base-3.2.3/src/library/splines/po/R-fr.po r-base-3.3.1/src/library/splines/po/R-fr.po
--- r-base-3.2.3/src/library/splines/po/R-fr.po	2013-03-20 23:05:06.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-fr.po	2016-04-27 22:15:40.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2012-09-24 08:30\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2013-03-18 22:10+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -21,9 +21,13 @@
 msgid "must have at least 'ord' knots"
 msgstr "il faut au moins 'ord' noeuds"
 
-msgid "length of 'derivs' must match length of 'x'"
+#, fuzzy
+msgid "length of 'derivs' is larger than length of 'x'"
 msgstr "la longueur de 'derivs' doit correspondre à la longueur de 'x'"
 
+msgid "empty 'derivs'"
+msgstr ""
+
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr "'ord' doit être un entier positif, au nombre de noeuds au mieux"
 
diff -Nru r-base-3.2.3/src/library/splines/po/R-ja.po r-base-3.3.1/src/library/splines/po/R-ja.po
--- r-base-3.2.3/src/library/splines/po/R-ja.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-ja.po	2016-04-27 22:15:40.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2013-02-28 04:15+0200 \n"
 "Last-Translator: Triad sou  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -16,9 +16,13 @@
 msgid "must have at least 'ord' knots"
 msgstr " 少���も 'ord' 個�ノットを����れ��り��ん "
 
-msgid "length of 'derivs' must match length of 'x'"
+#, fuzzy
+msgid "length of 'derivs' is larger than length of 'x'"
 msgstr " 'derivs' �長�� 'x' �長�����る必���り�� "
 
+msgid "empty 'derivs'"
+msgstr ""
+
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr " 'ord' �正�整数��多��もノット数�� "
 
diff -Nru r-base-3.2.3/src/library/splines/po/R-ko.po r-base-3.3.1/src/library/splines/po/R-ko.po
--- r-base-3.2.3/src/library/splines/po/R-ko.po	2015-03-31 22:15:14.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-ko.po	2016-04-27 22:15:40.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R splines package
-# src/library/splines/po/R-ko.po
-# 
-# Copyright (C) 1995-2015 The R Core Team
-# 
+# ./splines/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
+#
 # This file is distributed under the same license as the R splines package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2012-12-10 18:35\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +30,11 @@
 msgid "must have at least 'ord' knots"
 msgstr "반드시 �어� 'ord' 놋트를 가져야 합니다"
 
-msgid "length of 'derivs' must match length of 'x'"
-msgstr "'derivs'� 길�는 반드시 'x'� 길�와 �치해야 합니다"
+msgid "length of 'derivs' is larger than length of 'x'"
+msgstr "'derivs'� 길�가 'x'� 길�보다 �니다."
+
+msgid "empty 'derivs'"
+msgstr ""
 
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr "'ord'는 반드시 양� 정수�며 최대 놋트� 수만�입니다"
@@ -87,3 +93,6 @@
 msgstr ""
 "boundary knots를 넘어서는 �부 'x'값들� 올바르지 ill-conditioned bases를 유"
 "발할 수 있습니다"
+
+#~ msgid "length of 'derivs' must match length of 'x'"
+#~ msgstr "'derivs'� 길�는 반드시 'x'� 길�와 �치해야 합니다"
diff -Nru r-base-3.2.3/src/library/splines/po/R-pl.po r-base-3.3.1/src/library/splines/po/R-pl.po
--- r-base-3.2.3/src/library/splines/po/R-pl.po	2015-03-27 23:15:16.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-pl.po	2016-04-27 22:15:40.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,68 +13,118 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
-
-msgid "must have at least 'ord' knots"
-msgstr "potrzeba mieć przynajmniej węzły 'ord'"
-
-msgid "length of 'derivs' must match length of 'x'"
-msgstr "długość 'derivs' musi zgadzać się z długością 'x'"
-
-msgid "'ord' must be positive integer, at most the number of knots"
-msgstr ""
-"'ord' musi być dodatnią liczbą całkowitą, równą co najwyżej liczbie węzłów"
-
-msgid "need at least %s (=%d) knots"
-msgstr "potrzeba przynamniej %s (=%d) wezłów"
-
-msgid "the 'x' data must be in the range %g to %g unless you set '%s'"
-msgstr "dane 'x' muszą być w przedziale od %g do %g chyba, że ustawiono '%s'"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
+#. R/splineClasses.R: gettextf("%s needs package 'Matrix' correctly installed", "splineDesign(*, sparse=TRUE)")
+#: R/splineClasses.R:0
 msgid "%s needs package 'Matrix' correctly installed"
 msgstr "'%s' potrzebuje poprawnie zainstalowanego pakietu 'Matrix'"
 
-msgid "values of 'x' must be distinct"
-msgstr "wartości 'x' muszą być różne"
+#. R/splines.R: stop("'degree' must be integer >= 1")
+#: R/splines.R:0
+msgid "'degree' must be integer >= 1"
+msgstr "'degree' musi być liczbą całkowitą >= 1"
 
-msgid "'formula' must be of the form \"y ~ x\""
-msgstr "'formula' musi posiadać formę \"y ~ x\""
+#. R/splineClasses.R: gettextf("'deriv' must be between 0 and %d", ord - 1)
+#. R/splineClasses.R: gettextf("'deriv' must be between 0 and %d", ord - 1)
+#: R/splineClasses.R:0
+msgid "'deriv' must be between 0 and %d"
+msgstr "'deriv' musi być pomiędzy 0 a %d"
 
-msgid "lengths of 'x' and 'y' must match"
-msgstr "długości 'x' oraz 'y' muszą być zgodne"
+#. R/splines.R: gettextf("'df' was too small; have used %d", ord - (1L - intercept))
+#. R/splines.R: gettextf("'df' was too small; have used %d", 1L + intercept)
+#: R/splines.R:0
+msgid "'df' was too small; have used %d"
+msgstr "'df' było zbyt małe; użyto %d"
 
-msgid "values of 'x' must be strictly increasing"
-msgstr "wartości 'x' muszą być ściśle rosnące"
+#. R/splineClasses.R: stop("'formula' must be of the form \"y ~ x\"")
+#. R/splineClasses.R: stop("'formula' must be of the form \"y ~ x\"")
+#: R/splineClasses.R:0
+msgid "'formula' must be of the form \"y ~ x\""
+msgstr "'formula' musi posiadać formę \"y ~ x\""
 
+#. R/splineClasses.R: stop("'ord' must be >= 2")
+#: R/splineClasses.R:0
 msgid "'ord' must be >= 2"
 msgstr "'ord' musi być >= 2"
 
-msgid "the range of 'x' values exceeds one period"
-msgstr "zakres wartości 'x' przekracza jeden okres"
+#. R/splineClasses.R: stop("'ord' must be positive integer, at most the number of knots")
+#: R/splineClasses.R:0
+msgid "'ord' must be positive integer, at most the number of knots"
+msgstr ""
+"'ord' musi być dodatnią liczbą całkowitą, równą co najwyżej liczbie węzłów"
 
+#. R/splineClasses.R: stop("empty 'derivs'")
+#: R/splineClasses.R:0
+msgid "empty 'derivs'"
+msgstr "puste 'derivs'"
+
+#. R/splineClasses.R: stop("knot positions must be non-decreasing")
+#. R/splineClasses.R: stop("knot positions must be non-decreasing")
+#: R/splineClasses.R:0
 msgid "knot positions must be non-decreasing"
 msgstr "pozycje węzłów muszą być niemalejące"
 
-msgid "lengths of 'x' and 'y' must be the same"
-msgstr "długości 'x' oraz 'y' muszą być takie same"
-
-msgid "'deriv' must be between 0 and %d"
-msgstr "'deriv' musi być pomiędzy 0 a %d"
-
+#. R/splineClasses.R: stop("knot positions must be strictly increasing")
+#: R/splineClasses.R:0
 msgid "knot positions must be strictly increasing"
 msgstr "pozycje węzłów muszą być ściśle rosnące"
 
-msgid "spline must be monotone"
-msgstr "funkcja sklejana musi być funkcją monotoniczną"
+#. R/splineClasses.R: stop("length of 'derivs' is larger than length of 'x'")
+#: R/splineClasses.R:0
+msgid "length of 'derivs' is larger than length of 'x'"
+msgstr "długość 'derivs' jest większa niż długość 'x'"
 
-msgid "'degree' must be integer >= 1"
-msgstr "'degree' musi być liczbą całkowitą >= 1"
+#. R/splineClasses.R: stop("lengths of 'x' and 'y' must be the same")
+#: R/splineClasses.R:0
+msgid "lengths of 'x' and 'y' must be the same"
+msgstr "długości 'x' oraz 'y' muszą być takie same"
 
-msgid "'df' was too small; have used %d"
-msgstr "'df' było zbyt małe; użyto %d"
+#. R/splineClasses.R: stop("lengths of 'x' and 'y' must match")
+#: R/splineClasses.R:0
+msgid "lengths of 'x' and 'y' must match"
+msgstr "długości 'x' oraz 'y' muszą być zgodne"
+
+#. R/splineClasses.R: stop("must have at least 'ord' knots")
+#: R/splineClasses.R:0
+msgid "must have at least 'ord' knots"
+msgstr "potrzeba mieć przynajmniej węzły 'ord'"
 
+#. R/splineClasses.R: gettextf("need at least %s (=%d) knots", "2*ord -1", 2 * ord -     1)
+#: R/splineClasses.R:0
+msgid "need at least %s (=%d) knots"
+msgstr "potrzeba przynamniej %s (=%d) wezłów"
+
+#. R/splines.R: warning("some 'x' values beyond boundary knots may cause ill-conditioned bases")
+#: R/splines.R:0
 msgid "some 'x' values beyond boundary knots may cause ill-conditioned bases"
 msgstr ""
 "niektóre wartości 'x' poza zakresem węzłów mogą powodować źle uwarunkowane "
 "bazy"
+
+#. R/splineClasses.R: stop("spline must be monotone")
+#: R/splineClasses.R:0
+msgid "spline must be monotone"
+msgstr "funkcja sklejana musi być funkcją monotoniczną"
+
+#. R/splineClasses.R: gettextf("the 'x' data must be in the range %g to %g unless you set '%s'",     knots[ord], knots[nk - o1], "outer.ok = TRUE")
+#: R/splineClasses.R:0
+msgid "the 'x' data must be in the range %g to %g unless you set '%s'"
+msgstr "dane 'x' muszą być w przedziale od %g do %g chyba, że ustawiono '%s'"
+
+#. R/splineClasses.R: stop("the range of 'x' values exceeds one period")
+#: R/splineClasses.R:0
+msgid "the range of 'x' values exceeds one period"
+msgstr "zakres wartości 'x' przekracza jeden okres"
+
+#. R/splineClasses.R: stop("values of 'x' must be distinct")
+#. R/splineClasses.R: stop("values of 'x' must be distinct")
+#: R/splineClasses.R:0
+msgid "values of 'x' must be distinct"
+msgstr "wartości 'x' muszą być różne"
+
+#. R/splineClasses.R: stop("values of 'x' must be strictly increasing")
+#: R/splineClasses.R:0
+msgid "values of 'x' must be strictly increasing"
+msgstr "wartości 'x' muszą być ściśle rosnące"
diff -Nru r-base-3.2.3/src/library/splines/po/R-pt_BR.po r-base-3.3.1/src/library/splines/po/R-pt_BR.po
--- r-base-3.2.3/src/library/splines/po/R-pt_BR.po	2015-03-18 23:03:49.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-pt_BR.po	2016-04-27 22:15:40.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2012-09-24 08:30\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:57-0300\n"
 "Last-Translator: Fernando Henrique Ferraz P. da Rosa <feferraz@.ime.usp.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -20,9 +20,13 @@
 msgid "must have at least 'ord' knots"
 msgstr "pelo menos os nós 'ord' devem estar presentes"
 
-msgid "length of 'derivs' must match length of 'x'"
+#, fuzzy
+msgid "length of 'derivs' is larger than length of 'x'"
 msgstr "comprimento de 'derivs' deve ser igual ao comprimento de 'x'"
 
+msgid "empty 'derivs'"
+msgstr ""
+
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr ""
 "'ord' deve ser um inteiro positivo, sendo no máximo igual ao número de nós"
diff -Nru r-base-3.2.3/src/library/splines/po/R-ru.po r-base-3.3.1/src/library/splines/po/R-ru.po
--- r-base-3.2.3/src/library/splines/po/R-ru.po	2015-03-18 23:03:49.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-ru.po	2016-04-27 22:15:40.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2012-09-24 08:30\n"
-"PO-Revision-Date: 2013-03-19 21:07-0600\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
diff -Nru r-base-3.2.3/src/library/splines/po/R-splines.pot r-base-3.3.1/src/library/splines/po/R-splines.pot
--- r-base-3.2.3/src/library/splines/po/R-splines.pot	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-splines.pot	2016-04-27 22:15:40.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: splines 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +13,10 @@
 msgid "must have at least 'ord' knots"
 msgstr ""
 
-msgid "length of 'derivs' must match length of 'x'"
+msgid "length of 'derivs' is larger than length of 'x'"
+msgstr ""
+
+msgid "empty 'derivs'"
 msgstr ""
 
 msgid "'ord' must be positive integer, at most the number of knots"
diff -Nru r-base-3.2.3/src/library/splines/po/ru.po r-base-3.3.1/src/library/splines/po/ru.po
--- r-base-3.2.3/src/library/splines/po/ru.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/ru.po	2016-04-27 22:15:40.000000000 +0000
@@ -9,17 +9,17 @@
 msgstr ""
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2013-03-19 21:07-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: splines.c:147
 msgid "'ord' must be a positive integer"
 msgstr "'ord' ÄÏÌÖÅÎ ÂÙÔØ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÃÅÌÙÍ"
+
diff -Nru r-base-3.2.3/src/library/splines/po/R-zh_CN.po r-base-3.3.1/src/library/splines/po/R-zh_CN.po
--- r-base-3.2.3/src/library/splines/po/R-zh_CN.po	2015-03-18 23:03:49.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/R-zh_CN.po	2016-04-27 22:15:40.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2013-03-07 08:36\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -20,9 +20,13 @@
 msgid "must have at least 'ord' knots"
 msgstr "至少需�有'ord'个结"
 
-msgid "length of 'derivs' must match length of 'x'"
+#, fuzzy
+msgid "length of 'derivs' is larger than length of 'x'"
 msgstr "'derivs'和'x'的长度必需匹�"
 
+msgid "empty 'derivs'"
+msgstr ""
+
 msgid "'ord' must be positive integer, at most the number of knots"
 msgstr "'ord'必需为正整数，最多�能超过结的数目"
 
diff -Nru r-base-3.2.3/src/library/splines/po/splines.pot r-base-3.3.1/src/library/splines/po/splines.pot
--- r-base-3.2.3/src/library/splines/po/splines.pot	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/splines.pot	2016-04-27 22:15:40.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: splines 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/splines/po/zh_CN.po r-base-3.3.1/src/library/splines/po/zh_CN.po
--- r-base-3.2.3/src/library/splines/po/zh_CN.po	2015-06-06 22:15:41.000000000 +0000
+++ r-base-3.3.1/src/library/splines/po/zh_CN.po	2016-04-27 22:15:40.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@avaya.com>\n"
 "Language-Team: Chinese\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: splines.c:147
+#: splines.c:153
 msgid "'ord' must be a positive integer"
 msgstr "'ord'的值必需为正整数"
diff -Nru r-base-3.2.3/src/library/splines/src/Makefile.in r-base-3.3.1/src/library/splines/src/Makefile.in
--- r-base-3.2.3/src/library/splines/src/Makefile.in	2013-09-26 22:05:06.000000000 +0000
+++ r-base-3.3.1/src/library/splines/src/Makefile.in	2016-03-16 23:04:09.000000000 +0000
@@ -18,6 +18,8 @@
 DEPENDS = $(SOURCES_C:.c=.d)
 OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)
 
+PKG_CFLAGS = $(C_VISIBILITY)
+
 SHLIB = $(pkg)@SHLIB_EXT@
 
 all: Makedeps
diff -Nru r-base-3.2.3/src/library/splines/src/splines.c r-base-3.3.1/src/library/splines/src/splines.c
--- r-base-3.2.3/src/library/splines/src/splines.c	2015-10-15 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/splines/src/splines.c	2016-03-16 23:04:09.000000000 +0000
@@ -23,6 +23,7 @@
 
 #include <R.h>
 #include <Rinternals.h>
+#include <string.h> // for memcpy
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -238,9 +239,12 @@
 
 
 void
+#ifdef HAVE_VISIBILITY_ATTRIBUTE
+__attribute__ ((visibility ("default")))
+#endif
 R_init_splines(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, R_CallDef, NULL, NULL);
     R_useDynamicSymbols(dll, FALSE);
-//    R_forceSymbols(dll, TRUE); // too few to worry about, used in cobs*
+//    R_forceSymbols(dll, TRUE); // too few to worry about
 }
diff -Nru r-base-3.2.3/src/library/splines/tests/sparse-tst.R r-base-3.3.1/src/library/splines/tests/sparse-tst.R
--- r-base-3.2.3/src/library/splines/tests/sparse-tst.R	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/splines/tests/sparse-tst.R	2016-03-16 23:04:08.000000000 +0000
@@ -0,0 +1,35 @@
+###----------------- sparse / dense   interpSpline() ---------------------------
+
+## This requires recommended package Matrix.
+
+if(!requireNamespace("Matrix", quietly = TRUE)) q()
+
+require("splines")
+
+## from  help(interpSpline) -- ../man/interpSpline.Rd
+ispl <- interpSpline( women$height, women$weight)
+isp. <- interpSpline( women$height, women$weight, sparse=TRUE)
+stopifnot(all.equal(ispl, isp., tol = 1e-12)) # seen 1.65e-14
+
+##' @title Interpolate size-n version of the 'women' data sparsely and densely
+##' @param n size of "women-like" data to interpolate
+##' @return list with dense and sparse \code{\link{system.time}()}s
+##' @author Martin Maechler
+ipStime <- function(n) { # and using 'ispl'
+    h <- seq(55, 75, length.out = n)
+    w <- predict(ispl, h)$y
+    c.d <- system.time(is.d <- interpSpline(h, w, sparse=FALSE))
+    c.s <- system.time(is.s <- interpSpline(h, w, sparse=TRUE ))
+    stopifnot(all.equal(is.d, is.s, tol = 1e-7)) # seen 9.4e-10 (n=1000), 1.3e-7 (n=5000)
+    list(d.time = c.d, s.time = c.s)
+}
+
+n.s <- 25 * round(2^seq(1,6, by=.5))
+if(!interactive())# save 'check time'
+    n.s <- n.s[100 <= n.s & n.s <= 800]
+(ipL <- lapply(setNames(n.s, paste0("n=",n.s)), ipStime))
+## sparse is *an order of magnitude* faster for n ~= 1000 but somewhat slower for n ~< 200:
+sapply(ipL, function(ip) round(ip$d.time / ip$s.time, 1)[c(1,3)])
+##           n=50 n=75 n=100 n=150 n=200 n=275 n=400 n=575 n=800 n=1125 n=1600 -- nb-mm4, i7-5600U
+## user.self  0.5  0.5   0.5   0.5   0.7   2.5   4.3  12.3  33.7   70.5  116.1
+## elapsed    0.5  0.3   0.5   0.7   1.0   2.5   4.3  13.0  26.2   57.4  117.3
diff -Nru r-base-3.2.3/src/library/splines/tests/spline-tst.R r-base-3.3.1/src/library/splines/tests/spline-tst.R
--- r-base-3.2.3/src/library/splines/tests/spline-tst.R	2015-10-27 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/splines/tests/spline-tst.R	2016-03-16 23:04:08.000000000 +0000
@@ -4,99 +4,191 @@
 ## Date: Wed, 30 Sep 2015 12:12:47 +0000
 ## https://bugs.r-project.org/bugzilla/show_bug.cgi?id=16549
 
-## Reporter: roconnor@health.usf.edu
+## Reporter: roconnor@health.usf.edu  (extended original example code)
 
-knots <- c(0,0,0,0,1,1,1,1)
-m1 <- rbind(c(1, 0,0,0))
+kn8.01 <- c(0,0,0,0,1,1,1,1)
+m1  <- rbind(c(1, 0,0,0))
+m.1 <- rbind(c(0,0,0, 1))
 stopifnot(
     ## the first gave (0 0 0 0) instead of m1 :
-    all.equal(splineDesign(knots, c(0,2), outer.ok = TRUE), rbind(m1, 0)),
-    all.equal(splineDesign(knots, 0, outer.ok = TRUE), m1),
-    all.equal(splineDesign(knots, 0), m1),
+    all.equal(splineDesign(kn8.01, c(0,2),    outer.ok = TRUE), rbind(m1, 0)),
+    all.equal(splineDesign(kn8.01, c( 0,1,2), outer.ok = TRUE), rbind(m1, m.1, 0)),
+    all.equal(splineDesign(kn8.01, c(-1,0,1), outer.ok = TRUE), rbind(0, m1, m.1)),
+    all.equal(splineDesign(kn8.01, 0, outer.ok = TRUE), m1),
+    all.equal(splineDesign(kn8.01, 0), m1),
     TRUE)
 
 ## The original fix proposal introduced a new bug, visible here:
 S <- splineDesign(c(-3, -3, -2, 0, 2, 3, 3), x= -3:3, outer.ok=TRUE)
 ## (had a NaN in the lower-right corner)
 stopifnot(all.equal(S,
-                    rbind(0, c(22,3,0)/45, c(193, 6*23, 9)/360,
-                          c(1,3,1)/5,
-                          c(9, 6*23, 193)/360,
-                          c(0,3,22)/45, 0),
-                    tolerance = 1e-14))
+		    rbind(0, c(22,3,0)/45, c(193, 6*23, 9)/360,
+			  c(1,3,1)/5,
+			  c(9, 6*23, 193)/360,
+			  c(0,3,22)/45, 0),
+		    tolerance = 1e-14))
 
 chkSum.Ok <- TRUE ## for check
 chkSum <- function(knots, n = 1 + 2^9, ord = 4) {
     stopifnot(is.numeric(knots), !is.unsorted(knots), (n.k <- length(knots)) >= ord)
-    dk <- diff(rk <- range(knots))
+    dk <- diff(rk <- range(uk <- unique(knots)))
+    if(dk == 0) dk <- uk[1]/4
     d.x <- dk / (2*n.k)
-    x <- seq(min(knots)-d.x, max(knots)+d.x, length.out = n)
+    ## x: the unique knots
+    x <- sort(c(uk, seq.int(min(knots)-d.x, max(knots)+d.x, length.out = n)))
     bb <- splineDesign(knots, x = x, ord = ord, outer.ok = TRUE)
-    is.x.in <- knots[ord] <= x & x < knots[n.k-(ord-1)]
-    ##                   ~~~~     ~~~  same as in splineDesign(*, outer.ok=TRUE)
+    is.x.in <- knots[ord] <= x & x <= knots[n.k-(ord-1)]
+    ##                   ~~~~     ~~~~  same as in splineDesign(*, outer.ok=TRUE)
+    ##
+### no longer needed:
+    ## work around "infelicity" (or not; not sure if to call "bug")
+    ## n.RHk := #{duplicated RHS boundary knots}
+    ## n.RHk <- match(FALSE, rev(duplicated(knots)))
+    ## if(ord > 1 && n.RHk > ord) { ## the (ord == 1) case "works" via spike = 1
+    ##     ## <==> knots[n.k -j ] == knots[n.k] for j = 0,1,..,(n.RHk-1)
+    ##     ## then spl(x= RHS-knot, knots) == 0, even though "should" be 1
+    ##     ## "FIX it up" for here. FIXME: do in splineDesign() or it's C code ?!
+    ##     iR <- which(x == knots[n.k])
+    ##     ## ncol(bb) == n.k - ord
+    ##     j <- n.k - n.RHk # == ncol(bb) - (n.RHk - ord)
+    ##     if(any(bb[iR, j] == 0)) bb[iR, j] <- 1
+    ## }
     sumB <- rowSums(bb)
     if(any(iBad <- !is.finite(sumB))) {
 	chkSum.Ok <<- FALSE ## for check
 	cat("** _FIXME_ NON-finite values in sumB: ord = ", ord, "; |knots| =", n.k,"\n")
 	cat("knots <- "); dput(knots)
-        cat("non-finite at x = "); dput(x[iBad])
-    } else {
-	eps <- 2*.Machine$double.eps
-	stopifnot(abs(1 - sumB[is.x.in]) <= 2*eps, 0 <= sumB+eps, sumB-eps <= 1)
+	cat("non-finite at x = "); dput(x[iBad])
+    } else if(length(bb)) { # only when bb[] is not 0-dimensional
+	eps <- 3*.Machine$double.eps
+	stopifnot(abs(1 - sumB[is.x.in]) <= 2*eps, 0 <= sumB+eps, sumB-2*eps <= 1)
 	## TODO: now also check derivatives
     }
     invisible(bb)
 }
 
+plotSplD <- function(knots, n = 2^10, ord = 4, type = "l",
+		     ylim = c(0,1), ylab = "B-splines", ...) {
+    stopifnot(is.numeric(knots), !is.unsorted(knots), (n.k <- length(knots)) >= ord)
+    dk <- diff(range(uk <- unique(knots)))
+    if(dk == 0) dk <- uk[1]/4
+    d.x <- dk / (2*n.k)
+    ## x: will contain the unique knots uk
+    x <- sort(c(uk, seq.int(min(knots)-d.x, max(knots)+d.x, length.out = n)))
+    bb <- splineDesign(knots, x = x, ord = ord, outer.ok = TRUE)
+    matplot(x, bb, type=type, ylim=ylim, ylab=ylab, ...)
+    sumB <- rowSums(bb)
+    abline(v = knots, lty = 3, col = "light gray")
+    abline(v = knots[c(ord, n.k-(ord-1))], lty = 3, col = "gray10")
+    lines(x, sumB, col = adjustcolor("red", 0.4), lwd = 3)
+    abline(h=1, lty=2, col = adjustcolor(1, 0.4), lwd = 2)
+    ## lty, col,: from matplot()
+    legend(mean(x), 0.98, legend = paste0("B_", 1:ncol(bb)), lty=1:5, col=1:6,
+	   bty = "n", xjust = 0.5)
+    invisible(list(x=x, splineDesign = bb))
+}
+
+if(!dev.interactive(orNone=TRUE)) pdf("spline-tst.pdf")
+
+plotSplD(kn8.01)
+chkSum  (kn8.01)
+
 ## from ../man/splineDesign.Rd :
 knots <- c(1,1.8,3:5,6.5,7,8.1,9.2,10)  # 10 => 10-4 = 6 Basis splines
+str(plotSplD(knots))       # cubic     splines, adding to 1 in [ 4, 7 ]
+str(plotSplD(knots, ord=3))# quadratic splines, adding to 1 in [ 3, 8.1]
+str(plotSplD(knots, ord=2))# linear    splines, adding to 1 in [1.8,9.2]
+str(plotSplD(knots, ord=1))# constant  splines, adding to 1 in [1, 10]
+
 chkSum(knots)
 chkSum(knots, ord=3)
 chkSum(knots, ord=2)
 chkSum(knots, ord=1)
 
+## cases that failed too {Linux lynne 4.1.6 x86_64}
+chkSum(c(1:5, 9,9),     ord=2) # ok for ord in {1,3,4}
+chkSum(c(1:4, 9,9,9),   ord=3)
+chkSum(c(1:3, 9,9,9,9), ord=4)
+## These failed in R <= 3.2.2 (but not after first fix):
+chkSum(c(0,0,0,0, 1:3), ord=4)
+chkSum(c(0,0,0,   1:4), ord=3)
+chkSum(c(0,0,     1:5), ord=2)
+
+## This should be symmetric, but was not;
+## the graphic is maybe most convincing:
+k6.01 <- c(0,0,0, 1,1,1)
+round(with(plotSplD(k6.01, ord=2, n=16), cbind(x, splineDesign)), 4)
+x8 <- (0:8)/8
+sp8 <- splineDesign(k6.01, x=x8, ord=2)
+print.table(8*sp8, zero.print=".")
+stopifnot(all.equal(8*sp8,
+		    cbind(0, 8:0, 0:8, 0), tol = 1e-14))
+## or just
+splineDesign(k6.01, x=0:1, ord=2)
+##  0 1 0 0
+##  0 0 1 0 --- [finally !]
+stopifnot(identical(cbind(0, diag(2), 0),
+		    splineDesign(k6.01, x=0:1, ord=2)))
+
+## Further:
+for(k in 0:8)
+    chkSum(c(0:k, 9,9,9),     ord=2)
+for(k in 0:8)
+    chkSum(c(0:k, 9,9,9,9),   ord=3)
+for(k in 0:8)
+    chkSum(c(0:k, 9,9,9,9,9), ord=4)
+
+## look at two examples
+r  <- plotSplD(c(0:4, 8.9,9,9,9), ord=3)# B_6 is narrow spike
+r. <- plotSplD(c(0:4,  9, 9,9,9), ord=3)# B_6 diverged to all zero.
+if(interactive())
+    round(with(r., cbind(x, splineDesign)), 4)
+stopifnot(r.$splineDesign[, 6] == 0)
+## one could argue that B_6 should also have finite area, and hence be "a delta".
+## ==> sum_j B_j(x = 9) would then be Inf or undefined ..
+## more sensible: B_6 should be omitted and should have B_5(9) == 1
+## now implemented:
+stopifnot(identical(c(0, 0, 0, 0, 1, 0),
+		    with(r., splineDesign[x == 9,])))
+
+## Everything is fine, if  left-right  mirrored / reversed :
+r03 <- plotSplD(c(0,0,0,0,  1:5), ord=3)
+## here, B_1 is "delta" and should rather be omitted
+stopifnot(identical(c(0, 1, 0, 0, 0, 0),
+		    with(r03, splineDesign[x == 0,])))
+## 0 1 0 0 0 0 -- as it should be ..
+round(with(r03, cbind(x, splineDesign)[50:60,]), 4)
+
+r04 <- plotSplD(c(0,0,0,0,  1:5), ord=4)
+## here, B_1 is "delta" and should rather be omitted
+stopifnot(identical(c(1, 0, 0, 0, 0),
+		    with(r04, splineDesign[x == 0,])))
+round(with(r04, cbind(x, splineDesign)[50:60,]), 4)
+
+r0.4 <- plotSplD(c(0,0,0, 1:5), ord=4) # basis is nice and correct
+
+
 set.seed(17)
 
 for(n in 1:1000) {
     if(n %% 50 == 0) cat(sprintf("n = %4d\n",n))
     kn <- sort.int(round(10* rnorm(4 + rpois(1, lambda=4))))
     for(oo in 1:4)
-        chkSum(kn, ord = oo)
+	## if(inherits(r <- tryCatch(chkSum(kn, ord=oo), error=identity), "error"))
+	##     cat(r$message, "\n chkSum(", deparse(kn), ", ord = ", oo, ")\n")
+	chkSum(kn, ord = oo)
 }
 
 ## One of the cases with NaN {when used  ( . <= x & x <= . )}:
+
 bb <- chkSum(c(-14, -4, 3, 5, 6, 15, 15))
-which(!is.finite(rowSums(bb)))
-## now integer(0)
+stopifnot(is.finite(rowSums(bb)))
+
 
 stopifnot(chkSum.Ok)
 
 proc.time()
 
-###----------------- sparse / dense   interpSpline() ---------------------------
-
-## from  help(interpSpline) -- ../man/interpSpline.Rd
-ispl <- interpSpline( women$height, women$weight)
-isp. <- interpSpline( women$height, women$weight, sparse=TRUE)
-stopifnot(all.equal(ispl, isp., tol = 1e-12)) # seen 1.65e-14
-
-ipStime <- function(n) { # and using 'ispl'
-    h <- seq(55, 75, length.out = n)
-    w1k <- data.frame(height = h, weight = predict(ispl, h)$y)
-    c.d <- system.time(is.d <- interpSpline(weight ~ height, w1k, sparse=FALSE))
-    c.s <- system.time(is.s <- interpSpline(weight ~ height, w1k, sparse=TRUE ))
-    stopifnot(all.equal(is.d, is.s, tol = 1e-7)) # seen 9.4e-10 (n=1000), 1.3e-7 (n=5000)
-    list(d.time = c.d, s.time = c.s)
-}
-
-n.s <- 25 * round(2^seq(1,6, by=.5))
-(ipL <- lapply(setNames(n.s, paste0("n=",n.s)), ipStime))
-## sparse is *an order of magnitude* faster for n ~= 1000 but somewhat slower for n ~< 200:
-sapply(ipL, function(ip) round(ip$d.time / ip$s.time, 1)[c(1,3)])
-##           n=50 n=75 n=100 n=150 n=200 n=275 n=400 n=575 n=800 n=1125 n=1600 -- nb-mm4, i7-5600U
-## user.self  0.5  0.5   0.5   0.5   0.7   2.5   4.3  12.3  33.7   70.5  116.1
-## elapsed    0.5  0.3   0.5   0.7   1.0   2.5   4.3  13.0  26.2   57.4  117.3
-
 ###---- "Bug report" (to R-core) from Trevor Hastie ---
 ###---->  bs(*, Boundary.knots = .)
 ### needing boundary ajustment for correct extrapolation
diff -Nru r-base-3.2.3/src/library/stats/COPYRIGHTS.modreg r-base-3.3.1/src/library/stats/COPYRIGHTS.modreg
--- r-base-3.2.3/src/library/stats/COPYRIGHTS.modreg	2012-04-15 22:05:10.000000000 +0000
+++ r-base-3.3.1/src/library/stats/COPYRIGHTS.modreg	2016-05-09 22:15:08.000000000 +0000
@@ -17,7 +17,7 @@
   From the public domain source of the package GAMFIT by T. Hastie and
   R. Tibshirani, converted to double precision and with consistency
   changes to the calls to bvalue. 
-  Original at http://lib.stat.cmu.edu/general/gamfit.
+  Originally derived from http://lib.stat.cmu.edu/general/gamfit (now defunct).
 
 src/loessc.c
 src/loessf.f
diff -Nru r-base-3.2.3/src/library/stats/DESCRIPTION.in r-base-3.3.1/src/library/stats/DESCRIPTION.in
--- r-base-3.2.3/src/library/stats/DESCRIPTION.in	2015-08-31 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/DESCRIPTION.in	2016-03-16 23:03:08.000000000 +0000
@@ -6,4 +6,5 @@
 Maintainer: R Core Team <R-core@r-project.org>
 Description: R statistical functions.
 License: Part of R @VERSION@
+Imports: utils, grDevices, graphics
 Suggests: MASS, Matrix, SuppDists, methods, stats4
diff -Nru r-base-3.2.3/src/library/stats/man/aggregate.Rd r-base-3.3.1/src/library/stats/man/aggregate.Rd
--- r-base-3.2.3/src/library/stats/man/aggregate.Rd	2015-08-25 22:16:27.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/aggregate.Rd	2016-03-16 23:03:09.000000000 +0000
@@ -15,7 +15,7 @@
 
 \method{aggregate}{default}(x, \dots)
 
-\method{aggregate}{data.frame}(x, by, FUN, \dots, simplify = TRUE)
+\method{aggregate}{data.frame}(x, by, FUN, \dots, simplify = TRUE, drop = TRUE)
 
 \method{aggregate}{formula}(formula, data, FUN, \dots,
           subset, na.action = na.omit)
@@ -36,6 +36,8 @@
     applied to all data subsets.}
   \item{simplify}{a logical indicating whether results should be
     simplified to a vector or matrix if possible.}
+  \item{drop}{a logical indicating whether to drop unused combinations
+    of grouping values.}
   \item{formula}{a \link{formula}, such as \code{y ~ x} or
     \code{cbind(y1, y2) ~ x1 + x2}, where the \code{y} variables are
     numeric data to be split into groups according to the grouping
diff -Nru r-base-3.2.3/src/library/stats/man/cmdscale.Rd r-base-3.3.1/src/library/stats/man/cmdscale.Rd
--- r-base-3.2.3/src/library/stats/man/cmdscale.Rd	2015-08-25 22:16:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/cmdscale.Rd	2016-03-16 23:03:13.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/cmdscale.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{cmdscale}
@@ -9,10 +9,11 @@
 \concept{MDS}
 \title{Classical (Metric) Multidimensional Scaling}
 \usage{
-cmdscale(d, k = 2, eig = FALSE, add = FALSE, x.ret = FALSE)
+cmdscale(d, k = 2, eig = FALSE, add = FALSE, x.ret = FALSE,
+         list. = eig || add || x.ret)
 }
 \description{
-  Classical multidimensional scaling of a data matrix.
+  Classical multidimensional scaling (MDS) of a data matrix.
   Also known as \emph{principal coordinates analysis} (Gower, 1966).
 }
 \arguments{
@@ -26,6 +27,8 @@
     the modified dissimilarities are Euclidean.}
   \item{x.ret}{indicates whether the doubly centred symmetric distance
     matrix should be returned.}
+  \item{list.}{logical indicating if a \code{\link{list}} should be
+    returned or just the \eqn{n \times k}{n * k} matrix, see \sQuote{Value:}.}
 }
 \details{
   Multidimensional scaling takes a set of dissimilarities and returns a
@@ -46,7 +49,7 @@
   \R platforms (see \code{\link{prcomp}}).
 
   When \code{add = TRUE}, a minimal additive constant \eqn{c*} is
-  computed such that the the dissimilarities \eqn{d_{ij} + c*}{d[i,j] +
+  computed such that the dissimilarities \eqn{d_{ij} + c*}{d[i,j] +
   c*} are Euclidean and hence can be represented in \code{n - 1}
   dimensions.  Whereas S (Becker \emph{et al}, 1988) computes this
   constant using an approximation suggested by Torgerson, \R uses the
@@ -56,11 +59,11 @@
   could be in fewer than \code{n - 1} dimensions.
 }
 \value{
-  If \code{eig = FALSE}, \code{add = FALSE} and \code{x.ret = FALSE}
-  (default), a matrix with \code{k} columns whose rows give the
-  coordinates of the points chosen to represent the dissimilarities.
+  If \code{.list} is false (as per default), a matrix with \code{k}
+  columns whose rows give the coordinates of the points chosen to
+  represent the dissimilarities.
 
-  Otherwise, a list containing the following components.
+  Otherwise, a \code{\link{list}} containing the following components.
   \item{points}{a matrix with up to \code{k} columns whose rows give the
     coordinates of the points chosen to represent the dissimilarities.}
   \item{eig}{the \eqn{n} eigenvalues computed during the scaling process if
diff -Nru r-base-3.2.3/src/library/stats/man/coef.Rd r-base-3.3.1/src/library/stats/man/coef.Rd
--- r-base-3.2.3/src/library/stats/man/coef.Rd	2015-08-25 22:16:27.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/coef.Rd	2016-03-16 23:03:10.000000000 +0000
@@ -33,6 +33,7 @@
   Coefficients extracted from the model object \code{object}.
 
   For standard model fitting classes this will be a named numeric vector.
+  For \code{"maov"} objects (produced by \code{\link{aov}}) it will be a matrix.
 }
 \seealso{
   \code{\link{fitted.values}} and \code{\link{residuals}} for related methods;
diff -Nru r-base-3.2.3/src/library/stats/man/complete.cases.Rd r-base-3.3.1/src/library/stats/man/complete.cases.Rd
--- r-base-3.2.3/src/library/stats/man/complete.cases.Rd	2015-08-25 22:16:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/complete.cases.Rd	2016-01-02 23:15:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/complete.cases.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{complete.cases}
@@ -20,6 +20,14 @@
   A logical vector specifying which observations/rows have no missing
   values across the entire sequence.
 }
+\note{
+  A current limitation of this function is that it uses low level
+  functions to determine lengths and missingness, ignoring the 
+  class.  This will lead to spurious errors when some columns
+  have classes with \code{\link{length}} or \code{\link{is.na}}
+  methods, for example \code{"\link{POSIXlt}"}, as described
+  in \PR{16648}.
+}
 \seealso{
   \code{\link{is.na}},
   \code{\link{na.omit}},
diff -Nru r-base-3.2.3/src/library/stats/man/cor.Rd r-base-3.3.1/src/library/stats/man/cor.Rd
--- r-base-3.2.3/src/library/stats/man/cor.Rd	2015-08-25 22:16:26.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/cor.Rd	2016-03-16 23:03:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/cor.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{cor}
@@ -49,7 +49,7 @@
     covariance matrix.}
 }
 \value{For \code{r <- cor(*, use = "all.obs")}, it is now guaranteed that
-  \code{all(r <= 1)}.
+  \code{all(abs(r) <= 1)}.
 }
 \details{
   For \code{cov} and \code{cor} one must \emph{either} give a matrix or
diff -Nru r-base-3.2.3/src/library/stats/man/dendrapply.Rd r-base-3.3.1/src/library/stats/man/dendrapply.Rd
--- r-base-3.2.3/src/library/stats/man/dendrapply.Rd	2015-08-25 22:16:30.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/dendrapply.Rd	2016-03-16 23:03:14.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/dendrapply.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{dendrapply}
@@ -30,8 +30,13 @@
   i.e., returning the node with some attributes added or changed.
 }
 \author{Martin Maechler}
-\note{this is still somewhat experimental, and suggestions for
-  enhancements (or nice examples of usage) are very welcome.}
+\note{
+  The implementation is somewhat experimental and suggestions for
+  enhancements (or nice examples of usage) are very welcome.  The
+  current implementation is \emph{recursive} and inefficient for
+  dendrograms with many non-leaves.  See the \sQuote{Warning} in
+  \code{\link{dendrogram}}.
+}
 \seealso{\code{\link{as.dendrogram}}, \code{\link{lapply}} for applying
   a function to each component of a \code{list}, \code{\link{rapply}}
   for doing so to each non-list component of a nested list.
diff -Nru r-base-3.2.3/src/library/stats/man/dendrogram.Rd r-base-3.3.1/src/library/stats/man/dendrogram.Rd
--- r-base-3.2.3/src/library/stats/man/dendrogram.Rd	2015-10-01 22:15:13.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/dendrogram.Rd	2016-05-17 22:15:07.000000000 +0000
@@ -1,7 +1,7 @@
 % File src/library/stats/man/dendrogram.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
-% Copyright 2002-2014 The R Foundation
+% Copyright 1995-2016 R Core Team
+% Copyright 2002-2015 The R Foundation
 % Distributed under GPL 2 or later
 
 \name{dendrogram}
@@ -211,10 +211,11 @@
   }
 }
 \section{Warning}{
-  Some operations on dendrograms (including plotting) make use of
-  recursion.  For very deep trees It may be necessary to increase
-  \code{\link{options}("expressions")}: if you do you are likely to need
-  to set the C stack size larger than the default where possible.
+  Some operations on dendrograms such as \code{merge()} make use of
+  recursion.  For deep trees it may be necessary to increase
+  \code{\link{options}("expressions")}: if you do, you are likely to need
+  to set the C stack size (\code{\link{Cstack_info}()[["size"]]}) larger
+  than the default where possible.
 }
 \seealso{
   \code{\link{dendrapply}} for applying a function to \emph{each} node.
diff -Nru r-base-3.2.3/src/library/stats/man/deriv.Rd r-base-3.3.1/src/library/stats/man/deriv.Rd
--- r-base-3.2.3/src/library/stats/man/deriv.Rd	2015-08-25 22:16:30.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/deriv.Rd	2016-05-17 22:15:07.000000000 +0000
@@ -4,6 +4,7 @@
 % Distributed under GPL 2 or later
 
 \name{deriv}
+\title{Symbolic and Algorithmic Derivatives of Simple Expressions}
 \alias{D}
 \alias{deriv}
 \alias{deriv.default}
@@ -11,9 +12,8 @@
 \alias{deriv3}
 \alias{deriv3.default}
 \alias{deriv3.formula}
-\title{Symbolic and Algorithmic Derivatives of Simple Expressions}
 \description{
-  Compute derivatives of simple expressions, symbolically.
+  Compute derivatives of simple expressions, symbolically and algorithmically.
 }
 \usage{
     D (expr, name)
@@ -31,12 +31,12 @@
        hessian = TRUE, \dots)
 }
 \arguments{
-  \item{expr}{A \code{\link{expression}} or \code{\link{call}} or
+  \item{expr}{a \code{\link{expression}} or \code{\link{call}} or
     (except \code{D}) a formula with no lhs.}
   \item{name,namevec}{character vector, giving the variable names (only
     one for \code{D()}) with respect to which derivatives will be
     computed.}
-  \item{function.arg}{If specified and non-\code{NULL}, a character
+  \item{function.arg}{if specified and non-\code{NULL}, a character
     vector of arguments for a function return, or a function (with empty
     body) or \code{TRUE}, the latter indicating that a function with
     argument names \code{namevec} should be used.}
@@ -134,6 +134,11 @@
              function(b0, b1, th, x = 1:7){} ) )
 fx(2, 3, 4)
 
+## First derivative
+
+D(expression(x^2), "x")
+stopifnot(D(as.name("x"), "x") == 1)
+
 ## Higher derivatives
 deriv3(y ~ b0 + b1 * 2^(-x/th), c("b0", "b1", "th"),
      c("b0", "b1", "th", "x") )
@@ -153,5 +158,3 @@
 }
 \keyword{math}
 \keyword{nonlinear}
-
-
diff -Nru r-base-3.2.3/src/library/stats/man/ecdf.Rd r-base-3.3.1/src/library/stats/man/ecdf.Rd
--- r-base-3.2.3/src/library/stats/man/ecdf.Rd	2015-08-25 22:16:26.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/ecdf.Rd	2016-03-16 23:03:08.000000000 +0000
@@ -1,7 +1,7 @@
 % File src/library/stats/man/ecdf.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
-% Copyright 2002-2011 The R Foundation
+% Copyright 1995-2016 R Core Team
+% Copyright 2002-2016 The R Foundation
 % Distributed under GPL 2 or later
 
 \name{ecdf}
@@ -102,7 +102,7 @@
 summary.stepfun(Fn12)
 
 ## Advanced: What's inside the function closure?
-print(ls.Fn12 <- ls(environment(Fn12)))
+ls(environment(Fn12))
 ##[1] "f"  "method"  "n"  "x"  "y"  "yleft"  "yright"
 utils::ls.str(environment(Fn12))
 stopifnot(all.equal(quantile(Fn12), quantile(y)))
diff -Nru r-base-3.2.3/src/library/stats/man/family.Rd r-base-3.3.1/src/library/stats/man/family.Rd
--- r-base-3.2.3/src/library/stats/man/family.Rd	2015-08-25 22:16:27.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/family.Rd	2015-12-30 23:15:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/family.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{family}
@@ -137,9 +137,9 @@
   \item{initialize}{expression.  This needs to set up whatever data
     objects are needed for the family as well as \code{n} (needed for
     AIC in the binomial family) and \code{mustart} (see \code{\link{glm}}.}
-  \item{valid.mu}{logical function.  Returns \code{TRUE} if a mean
+  \item{validmu}{logical function.  Returns \code{TRUE} if a mean
     vector \code{mu} is within the domain of \code{variance}.}
-  \item{valid.eta}{logical function.   Returns \code{TRUE} if a linear
+  \item{valideta}{logical function.   Returns \code{TRUE} if a linear
     predictor \code{eta} is within the domain of \code{linkinv}.}
   \item{simulate}{(optional) function \code{simulate(object, nsim)} to be
     called by the \code{"lm"} method of \code{\link{simulate}}.  It will
diff -Nru r-base-3.2.3/src/library/stats/man/Hypergeometric.Rd r-base-3.3.1/src/library/stats/man/Hypergeometric.Rd
--- r-base-3.2.3/src/library/stats/man/Hypergeometric.Rd	2015-08-25 22:16:27.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/Hypergeometric.Rd	2016-03-16 23:03:09.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/Hypergeometric.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Hypergeometric}
@@ -28,7 +28,7 @@
   \item{n}{the number of black balls in the urn.}
   \item{k}{the number of balls drawn from the urn.}
   \item{p}{probability, it must be between 0 and 1.}
-  \item{nn}{number of observations. If \code{length(nn) > 1}, the length
+  \item{nn}{number of observations.  If \code{length(nn) > 1}, the length
     is taken to be the number required.}
   \item{log, log.p}{logical; if TRUE, probabilities p are given as log(p).}
   \item{lower.tail}{logical; if TRUE (default), probabilities are
@@ -44,8 +44,8 @@
 
   The length of the result is determined by \code{n} for
   \code{rhyper}, and is the maximum of the lengths of the
-  numerical arguments for the other functions.  
-  
+  numerical arguments for the other functions.
+
   The numerical arguments other than \code{n} are recycled to the
   length of the result.  Only the first elements of the logical
   arguments are used.
@@ -60,8 +60,23 @@
   }{p(x) =      choose(m, x) choose(n, k-x) / choose(m+n, k)}
   for \eqn{x = 0, \ldots, k}.
 
+  Note that \eqn{p(x)} is non-zero only for
+  \eqn{\max(0, k-n) \le x \le \min(k, m)}{max(0, k-n) <= x <= min(k, m)}.
+
+  With \eqn{p := m/(m+n)} (hence \eqn{Np = N \times p} in the
+  reference's notation), the first two moments are mean
+  \deqn{E[X] = \mu = k p} and variance
+  \deqn{\mbox{Var}(X) = k p (1 - p) \frac{m+n-k}{m+n-1},}{%
+               Var(X) = k p (1 - p) * (m+n-k)/(m+n-1),}
+  which shows the closeness to the Binomial\eqn{(k,p)} (where the
+  hypergeometric has smaller variance unless \eqn{k = 1}).
+
   The quantile is defined as the smallest value \eqn{x} such that
   \eqn{F(x) \ge p}, where \eqn{F} is the distribution function.
+
+  If one of \eqn{m, n, k}, exceeds \code{\link{.Machine}$integer.max},
+  currently the equivalent of \code{qhyper(runif(nn), m,n,k)} is used,
+  when a binomial approximation may be considerably more efficient.
 }
 \source{
   \code{dhyper} computes via binomial probabilities, using code
diff -Nru r-base-3.2.3/src/library/stats/man/manova.Rd r-base-3.3.1/src/library/stats/man/manova.Rd
--- r-base-3.2.3/src/library/stats/man/manova.Rd	2015-08-25 22:16:26.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/manova.Rd	2016-03-16 23:03:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/manova.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{manova}
@@ -36,6 +36,10 @@
   \emph{Multivariate Analysis of Variance and Repeated Measures.}
   Chapman and Hall.
 }
+\seealso{
+  \code{\link{aov}}, \code{\link{summary.manova}}, the latter containing
+  more examples.
+}
 \examples{
 ## Set orthogonal contrasts.
 op <- options(contrasts = c("contr.helmert", "contr.poly"))
@@ -47,11 +51,5 @@
 
 ( npk2.aovE <- manova(cbind(yield, foo) ~  N*P*K + Error(block), npk2) )
 summary(npk2.aovE)
-
-
-}
-\seealso{
-  \code{\link{aov}}, \code{\link{summary.manova}}, the latter containing
-  examples.
 }
 \keyword{models}
diff -Nru r-base-3.2.3/src/library/stats/man/median.Rd r-base-3.3.1/src/library/stats/man/median.Rd
--- r-base-3.2.3/src/library/stats/man/median.Rd	2015-08-25 22:16:28.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/median.Rd	2016-05-16 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/median.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{median}
@@ -29,8 +29,8 @@
 }
 \value{
   The default method returns a length-one object of the same type as
-  \code{x}, except when \code{x} is integer of even length, when the
-  result will be double.
+  \code{x}, except when \code{x} is logical or integer of even length,
+  when the result will be double.
 
   If there are no values or if \code{na.rm = FALSE} and there are \code{NA}
   values the result is \code{NA} of the same type as \code{x} (or more
diff -Nru r-base-3.2.3/src/library/stats/man/model.matrix.Rd r-base-3.3.1/src/library/stats/man/model.matrix.Rd
--- r-base-3.2.3/src/library/stats/man/model.matrix.Rd	2015-08-25 22:16:30.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/model.matrix.Rd	2016-05-17 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/model.matrix.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{model.matrix}
@@ -29,7 +29,9 @@
   \item{\dots}{further arguments passed to or from other methods.}
 }
 \description{
-  \code{model.matrix} creates a design (or model) matrix.
+  \code{model.matrix} creates a design (or model) matrix, e.g., by
+  expanding factors to a set of dummary variables (depending on the
+  contrasts) and expanding interactions similarly.
 }
 \details{
   \code{model.matrix} creates a design matrix from the description
@@ -81,6 +83,10 @@
 \seealso{
   \code{\link{model.frame}}, \code{\link{model.extract}},
   \code{\link{terms}}
+
+  \code{\link[Matrix]{sparse.model.matrix}} from package
+  \CRANpkg{Matrix} for creating \emph{sparse} model matrices, which may
+  be more efficient in large dimensions.
 }
 \examples{
 ff <- log(Volume) ~ log(Height) + log(Girth)
diff -Nru r-base-3.2.3/src/library/stats/man/optimize.Rd r-base-3.3.1/src/library/stats/man/optimize.Rd
--- r-base-3.2.3/src/library/stats/man/optimize.Rd	2015-08-25 22:16:28.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/optimize.Rd	2016-03-16 23:03:11.000000000 +0000
@@ -1,16 +1,16 @@
 % File src/library/stats/man/optimize.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{optimize}
 \title{One Dimensional Optimization}
 \usage{
-optimize(f = , interval = ,  \dots, lower = min(interval),
-         upper = max(interval), maximum = FALSE,
+optimize(f, interval, \dots, lower = min(interval), upper = max(interval),
+         maximum = FALSE,
          tol = .Machine$double.eps^0.25)
-optimise(f = , interval = ,  \dots, lower = min(interval),
-         upper = max(interval), maximum = FALSE,
+optimise(f, interval, \dots, lower = min(interval), upper = max(interval),
+         maximum = FALSE,
          tol = .Machine$double.eps^0.25)
 }
 \alias{optimize}
diff -Nru r-base-3.2.3/src/library/stats/man/ppoints.Rd r-base-3.3.1/src/library/stats/man/ppoints.Rd
--- r-base-3.2.3/src/library/stats/man/ppoints.Rd	2015-08-25 22:16:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/ppoints.Rd	2016-03-16 23:03:12.000000000 +0000
@@ -1,12 +1,12 @@
 % File src/library/stats/man/ppoints.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{ppoints}
 \title{Ordinates for Probability Plotting}
 \usage{
-ppoints(n, a = ifelse(n <= 10, 3/8, 1/2))
+ppoints(n, a = if(n <= 10) 3/8 else 1/2)
 }
 \alias{ppoints}
 \arguments{
@@ -50,6 +50,31 @@
 ppoints(4) # the same as  ppoints(1:4)
 ppoints(10)
 ppoints(10, a = 1/2)
+
+## Visualize including the fractions :
+require(graphics)\dontshow{lNs <- loadedNamespaces()}
+p.ppoints <- function(n, ..., add = FALSE, col = par("col")) {
+  pn <- ppoints(n, ...)
+  if(add)
+      points(pn, pn, col=col)
+  else {
+      tit <- match.call(); tit[[1]] <- quote(ppoints)
+      plot(pn,pn, main = deparse(tit), col=col,
+           xlim=0:1, ylim=0:1, xaxs="i", yaxs="i")
+      abline(0,1, col = adjustcolor(1, 1/4), lty = 3)
+  }
+  if(requireNamespace("MASS", quietly=TRUE))
+    text(pn, pn, as.character(MASS::fractions(pn)),
+         adj = c(0,0)-1/4, cex = 3/4, xpd = NA, col=col)
+  abline(h=pn, v=pn, col = adjustcolor(col, 1/2), lty = 2, lwd = 1/2)
+}
+
+p.ppoints(4)
+p.ppoints(10)
+p.ppoints(10, a = 1/2)
+p.ppoints(21)
+p.ppoints(8) ; p.ppoints(8, a = 1/2, add=TRUE, col="tomato")
+\dontshow{if(!any("MASS" == lNs)) unloadNamespace("MASS")}
 }
 \keyword{dplot}
 \keyword{arith}
diff -Nru r-base-3.2.3/src/library/stats/man/relevel.Rd r-base-3.3.1/src/library/stats/man/relevel.Rd
--- r-base-3.2.3/src/library/stats/man/relevel.Rd	2015-08-25 22:16:30.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/relevel.Rd	2016-05-26 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/relevel.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2007, 2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{relevel}
@@ -13,9 +13,9 @@
 relevel(x, ref, \dots)
 }
 \arguments{
-    \item{x}{An unordered factor.}
-    \item{ref}{The reference level.}
-    \item{\dots}{Additional arguments for future methods.}
+  \item{x}{an unordered factor.}
+  \item{ref}{the reference level, typically a string.}
+  \item{\dots}{additional arguments for future methods.}
 }
 \description{
     The levels of a factor are re-ordered so that the level specified by
@@ -26,7 +26,10 @@
 \value{
   A factor of the same length as \code{x}.
 }
-
+\details{
+  This, as \code{\link{reorder}()}, is a special case of simply calling
+  \code{\link{factor}(x, levels = levels(x)[....])}.
+}
 \seealso{
   \code{\link{factor}}, \code{\link{contr.treatment}},
   \code{\link{levels}}, \code{\link{reorder}}.
diff -Nru r-base-3.2.3/src/library/stats/man/reorder.factor.Rd r-base-3.3.1/src/library/stats/man/reorder.factor.Rd
--- r-base-3.2.3/src/library/stats/man/reorder.factor.Rd	2015-08-25 22:16:26.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/reorder.factor.Rd	2016-05-26 22:15:05.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/reorder.factor.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{reorder.default}
@@ -21,20 +21,18 @@
 
 }
 \arguments{
-  \item{x}{
-    An atomic vector, usually a factor (possibly ordered).  The vector
-    is treated as a categorical variable whose levels will be reordered.
-    If \code{x} is not a factor, its unique values will be used as
-    the implicit levels.
+  \item{x}{an atomic vector, usually a \code{\link{factor}} (possibly
+    ordered).  The vector is treated as a categorical variable whose
+    levels will be reordered.  If \code{x} is not a factor, its unique
+    values will be used as the implicit levels.
   }
   \item{X}{ a vector of the same length as \code{x}, whose subset
     of values for each unique level of \code{x} determines the
     eventual order of that level.
   }
-  \item{FUN}{ a function whose first argument is a vector and
-    returns a scalar, to be applied to each subset of \code{X}
-    determined by the levels of \code{x}.
-  }
+  \item{FUN}{a \code{\link{function}} whose first argument is a vector
+    and returns a scalar, to be applied to each subset of \code{X}
+    determined by the levels of \code{x}.}
   \item{\dots}{ optional: extra arguments supplied to \code{FUN}}
   \item{order}{ logical, whether return value will be an ordered factor
     rather than a factor.
@@ -52,7 +50,10 @@
   \code{X} (in the original order of the levels of \code{x}) is returned
   as the \code{"scores"} attribute.
 }
-
+\details{
+  This, as \code{\link{relevel}()}, is a special case of simply calling
+  \code{\link{factor}(x, levels = levels(x)[....])}.
+}
 \author{Deepayan Sarkar \email{deepayan.sarkar@r-project.org}}
 
 \seealso{
diff -Nru r-base-3.2.3/src/library/stats/man/shapiro.test.Rd r-base-3.3.1/src/library/stats/man/shapiro.test.Rd
--- r-base-3.2.3/src/library/stats/man/shapiro.test.Rd	2015-08-25 22:16:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/shapiro.test.Rd	2016-05-09 22:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/shapiro.test.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{shapiro.test}
@@ -40,7 +40,7 @@
 }
 \source{
   The algorithm used is a C translation of the Fortran code described in
-  Royston (1995) and found at \url{http://lib.stat.cmu.edu/apstat/R94}.
+  Royston (1995). % and was found at \url{http://lib.stat.cmu.edu/apstat/R94}.
   The calculation of the p value is exact for \eqn{n = 3}, otherwise
   approximations are used, separately for \eqn{4 \le n \le 11} and
   \eqn{n \ge 12}.
diff -Nru r-base-3.2.3/src/library/stats/man/sigma.Rd r-base-3.3.1/src/library/stats/man/sigma.Rd
--- r-base-3.2.3/src/library/stats/man/sigma.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/sigma.Rd	2016-04-28 22:15:13.000000000 +0000
@@ -0,0 +1,103 @@
+\name{sigma}
+\title{Extract Residual Standard Deviation 'Sigma'}
+\alias{sigma}
+\alias{sigma.default}% lm, nls, glm
+\alias{sigma.mlm}
+\description{
+  Extract the estimated standard deviation of the errors, the
+  \dQuote{residual standard deviation} (misnomed also
+  \dQuote{residual standard error}, e.g., in
+  \code{\link{summary.lm}()}'s output, from a fitted model).
+
+  Many classical statistical models have a \emph{scale parameter},
+  typically the standard deviation of a zero-mean normal (or Gaussian)
+  random variable which is denoted as \eqn{\sigma}.
+  \code{sigma(.)} extracts the \emph{estimated} parameter from a fitted
+  model, i.e., \eqn{\hat\sigma}{sigma^}.
+}
+\usage{
+sigma(object, ...)
+
+\S3method{sigma}{default}(object, use.fallback = TRUE, ...)
+}
+\arguments{
+  \item{object}{an \R object, typically resulting from a model fitting
+    function such as \code{\link{lm}}.}
+  \item{use.fallback}{logical, passed to \code{\link{nobs}}.}
+  \item{\dots}{potentially further arguments passed to and from
+    methods.  Passed to \code{\link{deviance}(*, ...)} for the default method.}
+}
+\details{
+ The \pkg{stats} package provides the S3 generic and a default method.
+ The latter is correct typically for (asymptotically / approximately)
+ generalized gaussian (\dQuote{least squares}) problems, since it is
+ defined as \preformatted{%
+   sigma.default <- function (object, use.fallback = TRUE, ...)
+                      sqrt( deviance(object, ...) / (NN - PP) )
+ } where \code{NN <- \link{nobs}(object, use.fallback = use.fallback)}
+ and \code{PP <- length(\link{coef}(object))}.
+}
+\value{
+  typically a number, the estimated standard deviation of the
+  errors (\dQuote{residual standard deviation}) for Gaussian
+  models, and---less interpretably---the square root of the residual
+  deviance per degree of freedom in more general models.
+  In some generalized linear modelling (\code{\link{glm}}) contexts,
+  \eqn{sigma^2} (\code{sigma(.)^2}) is called \dQuote{dispersion
+    (parameter)}.  Consequently, for well-fitting binomial or Poisson
+  GLMs, \code{sigma} is around 1.
+
+  Very strictly speaking, \eqn{\hat{\sigma}}{\sigma^} (\dQuote{\eqn{\sigma} hat})
+  is actually \eqn{\sqrt{\widehat{\sigma^2}}}{\sqrt(hat(\sigma^2))}.
+
+  For multivariate linear models (class \code{"mlm"}), a \emph{vector}
+  of sigmas is returned, each corresponding to one column of \eqn{Y}.
+}
+\note{
+  The misnomer \dQuote{Residual standard \bold{error}} has been part of
+  too many \R (and S) outputs to be easily changed there.
+}
+\seealso{
+  \code{\link{deviance}}, \code{\link{nobs}}, \code{\link{vcov}}.
+}
+\examples{
+## -- lm() ------------------------------
+lm1 <- lm(Fertility ~ . , data = swiss)
+sigma(lm1) # ~= 7.165  = "Residual standard error"  printed from summary(lm1)
+stopifnot(all.equal(sigma(lm1), summary(lm1)$sigma, tol=1e-15))
+
+## -- nls() -----------------------------
+DNase1 <- subset(DNase, Run == 1)
+fm.DN1 <- nls(density ~ SSlogis(log(conc), Asym, xmid, scal), DNase1)
+sigma(fm.DN1) # ~= 0.01919  as from summary(..)
+stopifnot(all.equal(sigma(fm.DN1), summary(fm.DN1)$sigma, tol=1e-15))
+
+% example from ./predict.glm.R
+## -- glm() -----------------------------
+## -- a) Binomial -- Example from MASS
+ldose <- rep(0:5, 2)
+numdead <- c(1, 4, 9, 13, 18, 20, 0, 2, 6, 10, 12, 16)
+sex <- factor(rep(c("M", "F"), c(6, 6)))
+SF <- cbind(numdead, numalive = 20-numdead)
+sigma(budworm.lg <- glm(SF ~ sex*ldose, family = binomial))
+
+## -- b) Poisson -- from ?glm :
+## Dobson (1990) Page 93: Randomized Controlled Trial :
+counts <- c(18,17,15,20,10,20,25,13,12)
+outcome <- gl(3,1,9)
+treatment <- gl(3,3)
+sigma(glm.D93 <- glm(counts ~ outcome + treatment, family = poisson()))
+## (currently) *differs* from
+summary(glm.D93)$dispersion # == 1
+## and the *Quasi*poisson's dispersion
+sigma(glm.qD93 <- update(glm.D93, family = quasipoisson()))
+sigma (glm.qD93)^2 # 1.282285 is close, but not the same
+summary(glm.qD93)$dispersion # == 1.2933
+
+## -- Multivariate lm() "mlm" -----------
+utils::example("SSD", echo=FALSE)
+sigma(mlmfit) # is the same as {but more efficient than}
+sqrt(diag(estVar(mlmfit)))
+\dontshow{stopifnot(all.equal(sigma(mlmfit), sqrt(diag(estVar(mlmfit)))))}
+}
+\keyword{models}
diff -Nru r-base-3.2.3/src/library/stats/man/smooth.Rd r-base-3.3.1/src/library/stats/man/smooth.Rd
--- r-base-3.2.3/src/library/stats/man/smooth.Rd	2015-08-25 22:16:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/smooth.Rd	2016-02-10 23:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/smooth.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{smooth}
@@ -11,7 +11,7 @@
 }
 \usage{
 smooth(x, kind = c("3RS3R", "3RSS", "3RSR", "3R", "3", "S"),
-       twiceit = FALSE, endrule = "Tukey", do.ends = FALSE)
+       twiceit = FALSE, endrule = c("Tukey", "copy"), do.ends = FALSE)
 }
 \arguments{
   \item{x}{a vector or time series}
diff -Nru r-base-3.2.3/src/library/stats/man/smooth.spline.Rd r-base-3.3.1/src/library/stats/man/smooth.spline.Rd
--- r-base-3.2.3/src/library/stats/man/smooth.spline.Rd	2015-08-25 22:16:28.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/smooth.spline.Rd	2016-05-09 22:15:08.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/stats/man/smooth.spline.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{smooth.spline}
@@ -26,15 +26,18 @@
  \item{w}{optional vector of weights of the same length as \code{x};
    defaults to all 1.}
  \item{df}{the desired equivalent number of degrees of freedom (trace of
-   the smoother matrix).}
+   the smoother matrix).  Must be in \eqn{(1,n_x]}{(1,nx]},
+   \eqn{n_x}{nx} the number of unique x values, see below.}
  \item{spar}{smoothing parameter, typically (but not necessarily) in
    \eqn{(0,1]}.  The coefficient \eqn{\lambda} of the integral of the
    squared second derivative in the fit (penalized log likelihood)
    criterion is a monotone function of \code{spar}, see the details
    below.}
  \item{cv}{ordinary (\code{TRUE}) or \sQuote{generalized} cross-validation
-   (GCV) when \code{FALSE}; setting it to \code{NA} skips the evaluation
-   of leverages and any score.}
+   (GCV) when \code{FALSE}; is used for smoothing parameter computation
+   only when \code{df} is not specified; it is used however
+   to determine \code{cv.crit} in the result.  Setting it to \code{NA}
+   for speedup skips the evaluation of leverages and any score.}
  \item{all.knots}{if \code{TRUE}, all distinct points in \code{x} are used as
    knots.  If \code{FALSE} (default), a subset of \code{x[]} is used,
    specifically \code{x[j]} where the \code{nknots} indices are evenly
@@ -174,7 +177,9 @@
     on \code{cv}.}
   \item{pen.crit}{penalized criterion}
   \item{crit}{the criterion value minimized in the underlying
-    \code{.Fortran} routine \file{sslvrg}.}
+    \code{.Fortran} routine \file{sslvrg}.  When \code{df} has been specified,
+    the criterion is \eqn{3 + (tr(S_\lambda) - df)^2}{3 + (tr(S[lambda]) - df)^2},
+    where the \eqn{3 +} is there for numerical (and historical) reasons.}
   \item{df}{equivalent degrees of freedom used.  Note that (currently)
     this value may become quite imprecise when the true \code{df} is
     between and 1 and 2.
@@ -215,7 +220,9 @@
 }
 \source{
   This function is based on code in the \code{GAMFIT} Fortran program by
-  T. Hastie and R. Tibshirani (\url{http://lib.stat.cmu.edu/general/}),
+  T. Hastie and R. Tibshirani (originally taken from
+  \url{http://lib.stat.cmu.edu/general/}, which is now defunct but
+  mirrors may still be available),
   which makes use of spline code by Finbarr O'Sullivan.  Its design
   parallels the \code{smooth.spline} function of Chambers & Hastie (1992).
 }
@@ -277,7 +284,7 @@
 lines(predict(s02, xx), col = 3); mtext(deparse(s02$call), col = 3)
 
 \dontshow{
-stopifnot(all.equal(predict(s02, xx),
+stopifnot(all.equal(predict(s02 , xx),
 		    predict(s02., xx), tolerance = 1e-15))
 }
 \donttest{
diff -Nru r-base-3.2.3/src/library/stats/man/summary.manova.Rd r-base-3.3.1/src/library/stats/man/summary.manova.Rd
--- r-base-3.2.3/src/library/stats/man/summary.manova.Rd	2015-08-25 22:16:26.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/summary.manova.Rd	2016-03-16 23:03:08.000000000 +0000
@@ -87,8 +87,8 @@
 opacity <- c(4.4, 6.4, 3.0, 4.1, 0.8, 5.7, 2.0, 3.9, 1.9, 5.7,
              2.8, 4.1, 3.8, 1.6, 3.4, 8.4, 5.2, 6.9, 2.7, 1.9)
 Y <- cbind(tear, gloss, opacity)
-rate <- factor(gl(2,10), labels = c("Low", "High"))
-additive <- factor(gl(2, 5, length = 20), labels = c("Low", "High"))
+rate     <- gl(2,10, labels = c("Low", "High"))
+additive <- gl(2, 5, length = 20, labels = c("Low", "High"))
 
 fit <- manova(Y ~ rate * additive)
 summary.aov(fit)             # univariate ANOVA tables
diff -Nru r-base-3.2.3/src/library/stats/man/toeplitz.Rd r-base-3.3.1/src/library/stats/man/toeplitz.Rd
--- r-base-3.2.3/src/library/stats/man/toeplitz.Rd	2015-08-25 22:16:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/man/toeplitz.Rd	2016-03-16 23:03:12.000000000 +0000
@@ -1,17 +1,16 @@
 % File src/library/stats/man/toeplitz.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{toeplitz}
 \title{Form Symmetric Toeplitz Matrix}
 \usage{
-toeplitz(x, \dots)
+toeplitz(x)
 }
 \alias{toeplitz}
 \arguments{
   \item{x}{the first row to form the Toeplitz matrix.}
-  \item{\dots}{potential further arguments (for methods); none here.}
 }
 \description{
   Forms a symmetric Toeplitz matrix given its first row.
diff -Nru r-base-3.2.3/src/library/stats/NAMESPACE r-base-3.3.1/src/library/stats/NAMESPACE
--- r-base-3.2.3/src/library/stats/NAMESPACE	2014-09-18 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/library/stats/NAMESPACE	2016-03-16 23:03:16.000000000 +0000
@@ -2,9 +2,10 @@
 useDynLib(stats, .registration = TRUE, .fixes = "C_")
 
 import(graphics)
-importFrom(grDevices, dev.interactive, palette, extendrange, xy.coords)
-importFrom(utils, str)
-
+importFrom(grDevices, as.graphicsAnnot, dev.cur, dev.flush, dev.hold,
+           dev.interactive, dev.new, dev.set, devAskNewPage,
+           extendrange, n2mfrow, palette, xy.coords)
+importFrom(utils, count.fields, flush.console, str, tail)
 
 export(.checkMFClasses, .getXlevels, .MFclass, .nknots.smspl,
        acf, acf2AR, add.scope,
@@ -62,7 +63,7 @@
        rlnorm, rlogis, rmultinom, rnbinom, rnorm, rpois, rsignrank,
        rstandard, rstudent, rt, runif, runmed, rweibull, rwilcox,
        rWishart, scatter.smooth, screeplot, sd, se.contrast,
-       selfStart, setNames, simulate, smooth, smooth.spline,
+       selfStart, setNames, sigma, simulate, smooth, smooth.spline,
        smoothEnds, sortedXyData, spec.ar, spec.pgram, spec.taper,
        spectrum, spline, splinefun, splinefunH, SSD, SSasymp,
        SSasympOff, SSasympOrig, SSbiexp, SSfol, SSfpl, SSgompertz,
@@ -165,6 +166,7 @@
 S3method(coef, Arima)
 S3method(coef, default)
 S3method(coef, listof)
+S3method(coef, maov)
 S3method(coef, nls)
 S3method(confint, default)
 S3method(confint, glm)
@@ -453,6 +455,8 @@
 S3method(se.contrast, aovlist)
 S3method(selfStart, default)
 S3method(selfStart, formula)
+S3method(sigma, default)
+S3method(sigma, mlm)
 S3method(simulate, lm)
 S3method(sortedXyData, default)
 S3method(str, dendrogram)
diff -Nru r-base-3.2.3/src/library/stats/po/da.po r-base-3.3.1/src/library/stats/po/da.po
--- r-base-3.2.3/src/library/stats/po/da.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/da.po	2016-04-27 22:15:22.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2011-12-01 20:24+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "båndbredde/spænd for kørende medianer er større end n"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "sandsynligheder uden for [0,1] i qansari()"
 
@@ -41,7 +41,7 @@
 msgid "invalid argument type"
 msgstr "ugyldig argumenttype"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "kan kun transformere 100 par i arima0"
 
@@ -67,31 +67,41 @@
 msgid "not all arguments have the same length"
 msgstr ""
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr ""
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr ""
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+#, fuzzy
+msgid "'x' is a factor"
+msgstr "Ugyldig vmethod"
+
+#: cov.c:665
+#, fuzzy
+msgid "'y' is a factor"
+msgstr "Ugyldig vmethod"
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr ""
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr ""
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr ""
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr ""
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr ""
 
@@ -104,38 +114,42 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr ""
 
-#: deriv.c:642
-msgid "variable must be a character string"
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
 msgstr ""
 
 #: deriv.c:644
+msgid "variable must be a character string"
+msgstr ""
+
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr ""
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 #, fuzzy
 msgid "invalid variable names"
 msgstr "ugyldig værdi for lag.max"
 
-#: deriv.c:944
+#: deriv.c:946
 #, fuzzy
 msgid "invalid tag"
 msgstr "ugyldig argumenttype"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr "behandler ikkebegrænsende værdier som NA"
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance(): ugyldig p"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance(): ugyldig afstand"
 
@@ -147,17 +161,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr ""
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr "Værdi %g uden for interval (0, 1)"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "Argument %s skal være en numerisk vektor som ikke er tom"
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "argument %s skal være en numerisk vektor af længde 1 eller længde %d"
@@ -183,7 +197,12 @@
 msgid "invalid factors"
 msgstr "Ugyldig vmethod"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, fuzzy, c-format
+msgid "'%s' must be of length one"
+msgstr "'m' skal være en liste"
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr "kun 2.500 rækker er tilladt for sm.method=\"spline\""
 
@@ -201,7 +220,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr ""
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "spænd er for lille"
 
@@ -230,19 +249,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr ""
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "Entalsmatrix i qr_solve"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "Entalsmatrix i ldet"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "Ugyldig vmethod"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr "Burgs algoritme fejlede i at finde delvis korrelation"
 
@@ -281,192 +300,192 @@
 msgid "invalid result from na.action"
 msgstr ""
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, fuzzy, c-format
 msgid "invalid '%s' argument"
 msgstr "ugyldig argumenttype"
 
-#: model.c:388
+#: model.c:391
 #, fuzzy
 msgid "invalid model frame"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr ""
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr ""
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, fuzzy, c-format
 msgid "variable %d has no levels"
 msgstr "variabel '%s' er ikke numerisk"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr ""
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr ""
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr ""
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr ""
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr ""
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr ""
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr ""
 
-#: model.c:881
+#: model.c:884
 #, fuzzy
 msgid "invalid formula in 'update'"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr ""
 
-#: model.c:1046
+#: model.c:1049
 #, fuzzy
 msgid "invalid term in model formula"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:1121
+#: model.c:1124
 #, fuzzy
 msgid "invalid model formula"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 #, fuzzy
 msgid "invalid power in formula"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:1183
+#: model.c:1186
 #, fuzzy
 msgid "invalid model formula in ExtractVars"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr ""
 
-#: model.c:1579
+#: model.c:1594
 #, fuzzy
 msgid "invalid model formula in EncodeVars"
 msgstr "ugyldig værdi for lag.max"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr ""
 
-#: model.c:1675
+#: model.c:1690
 #, fuzzy
 msgid "'specials' must be NULL or a character vector"
 msgstr "'path' skal være en tegnvektor"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr ""
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr ""
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr "n skal mindst være to"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr "Argument m skal være numerisk"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr "length(m) skal være mindst to"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr "Argument Sx skal være en numerisk vektor en kortere end m[]"
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "'control' skal være en liste"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "'m' skal være en liste"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s' mangler"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr "entalsgradient"
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr "trinfaktor %g reduceret under 'minFactor' af %g"
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "antal iterationer overskred maksimum på %d"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr "begrænset"
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "'theta' skal være type-tegn"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "brug af NULL-miljø er ude af drift"
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "'rho' skal være et miljø"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir' er ikke en numerisk vektor med korrekt længde"
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr "Manglende værdi eller en uendelig lavet under evaluering af modellen"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr "variable '%s' er et heltal, ikke numerisk"
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr "variabel '%s' er ikke numerisk"
@@ -686,21 +705,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr ""
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr "ugyldig Starma struct"
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr "fejlkode for starma %d"
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr "fejlkode for forkal %d"
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "ugyldig værdi for lag.max"
 
@@ -728,7 +747,7 @@
 msgid "'rho' must be an environment"
 msgstr "'rho' skal være et miljø"
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d' skal være en numerisk vektor som ikke er tom"
 
@@ -768,23 +787,23 @@
 msgid "invalid type for eval_check_store"
 msgstr "ugyldig type for eval_check_store"
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "m skal være en liste"
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr "'lowerb' og 'upperb' skal være numeriske vektorer"
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr ""
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr ""
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr ""
 
@@ -825,12 +844,12 @@
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 msgstr ""
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr "ugyldig end-rule for kørende median af 3: %d"
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr "manglende værdi i sidste %d observationer"
diff -Nru r-base-3.2.3/src/library/stats/po/de.po r-base-3.3.1/src/library/stats/po/de.po
--- r-base-3.2.3/src/library/stats/po/de.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/de.po	2016-04-27 22:15:22.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: R-3.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-20 16:21+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-07 10:58+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R-core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -22,7 +22,7 @@
 
 #: ansari.c:116
 msgid "probabilities outside [0,1] in qansari()"
-msgstr "Wahrscheinlichkeiten außerhalb von [0,1] in qansar()"
+msgstr "Wahrscheinlichkeiten außerhalb von [0,1] in qansari()"
 
 #: approx.c:102
 msgid "approx(): invalid f value"
@@ -103,24 +103,28 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "Funktion '%s' ist nicht in der Tabelle der Ableitungen"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr "'expr' muss eine expression oder ein call sein"
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "Variable muss eine Zeichenkette sein"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "nur das erste Element wird als Variablenname genutzt"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "ungültiger Ausdruck in '%s'"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "ungültige Variablennamen"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "ungültiger tag"
 
@@ -219,7 +223,7 @@
 
 #: lowess.c:295
 msgid "'iter' must be finite and >= 0"
-msgstr "'iter' muss endlich und >= 0  sein"
+msgstr "'iter' muss endlich und >= 0 sein"
 
 #: lowess.c:298
 msgid "'delta' must be finite and > 0"
@@ -227,15 +231,15 @@
 
 #: mAR.c:467
 msgid "Singular matrix in qr_solve"
-msgstr "singläre Matrix in qr_solve"
+msgstr "Singuläre Matrix in qr_solve"
 
 #: mAR.c:510
 msgid "Singular matrix in ldet"
-msgstr "singläre Matrix in ldet"
+msgstr "Singuläre Matrix in ldet"
 
 #: mAR.c:697
 msgid "Invalid vmethod"
-msgstr "unzulässige vmethod"
+msgstr "Unzulässige vmethod"
 
 #: mAR.c:833
 msgid "Burg's algorithm failed to find partial correlation"
@@ -324,7 +328,7 @@
 
 #: model.c:635
 msgid "complex variables are not currently allowed in model matrices"
-msgstr "Komplexe Variablen sind momentan in Modellmatrizen nicht erlaubt"
+msgstr "komplexe Variablen sind momentan in Modellmatrizen nicht erlaubt"
 
 #: model.c:659
 #, c-format
@@ -358,7 +362,7 @@
 #: model.c:1518
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
-msgstr "verdoppelter Name '%s' in Data Frame bei Benutzung von '.'"
+msgstr "verdoppelter Name '%s' in Dataframe bei Benutzung von '.'"
 
 #: model.c:1579
 msgid "invalid model formula in EncodeVars"
@@ -370,7 +374,7 @@
 
 #: model.c:1675
 msgid "'specials' must be NULL or a character vector"
-msgstr "'specials' muss NULL oder eine Charaktervektor sein"
+msgstr "'specials' muss NULL oder eine Zeichenkettenvektor sein"
 
 #: model.c:1687
 msgid "'data' argument is of the wrong type"
@@ -563,7 +567,7 @@
 
 #: optimize.c:600
 msgid "conflicting parameter lengths"
-msgstr "Parameter Längen passen nicht"
+msgstr "Parameterlängen passen nicht"
 
 #: optimize.c:604
 msgid "invalid parameter length"
@@ -669,7 +673,7 @@
 #: optimize.c:745 optimize.c:750 optimize.c:754 optimize.c:758 optimize.c:762
 #: optimize.c:766 optimize.c:771
 msgid "invalid NA value in parameter"
-msgstr "ungültige NA Wert in Parameter"
+msgstr "ungültiger NA Wert in Parameter"
 
 #: optimize.c:800
 msgid "hessian supplied is of the wrong length or mode, so ignored"
@@ -704,7 +708,7 @@
 #: port.c:133
 #, c-format
 msgid "Rf_divset: alg = %d must be 1, 2, 3, or 4"
-msgstr "RF_divset: alg = %d muss 1, 2, 3 oder 4 sein"
+msgstr "Rf_divset: alg = %d muss 1, 2, 3 oder 4 sein"
 
 #: port.c:149
 msgid "port algorithms 3 or higher are not supported"
@@ -720,7 +724,7 @@
 #, c-format
 msgid "Hessian function must return a square numeric matrix of order %d"
 msgstr ""
-"Hessematrixfunktion muss eine quadratische numerische Matrix mit Rang %d "
+"Hessematrix-Funktion muss eine quadratische numerische Matrix mit Rang %d "
 "zurückgeben"
 
 #: port.c:380
@@ -768,7 +772,7 @@
 
 #: port.c:528
 msgid "invalid type for eval_check_store"
-msgstr "unzulässiger Typ für eval_check_source"
+msgstr "unzulässiger Typ für eval_check_store"
 
 #: port.c:547
 msgid "m must be a list"
@@ -784,7 +788,7 @@
 
 #: rWishart.c:84
 msgid "'scal' must be a square, real matrix"
-msgstr "'scal' muss eine quadratische, reelwertige Matrix sein"
+msgstr "'scal' muss eine quadratische, reellwertige Matrix sein"
 
 #: rWishart.c:96
 msgid "'scal' matrix is not positive-definite"
diff -Nru r-base-3.2.3/src/library/stats/po/fr.po r-base-3.3.1/src/library/stats/po/fr.po
--- r-base-3.2.3/src/library/stats/po/fr.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/fr.po	2016-04-27 22:15:21.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2014-03-17 10:58+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -18,11 +18,11 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.6.4\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "largeur de fenêtre de médiane mobile supérieure à n"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "probabilités en dehors de [0,1] dans qansari()"
 
@@ -42,7 +42,7 @@
 msgid "invalid argument type"
 msgstr "type d'argument incorrect"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "impossible de transformer plus de 100 pars dans arima0"
 
@@ -68,31 +68,41 @@
 msgid "not all arguments have the same length"
 msgstr "les arguments n'ont pas tous la même taille"
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr "observations manquantes dans cov / cor"
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr "'x' est 'NULL'"
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+#, fuzzy
+msgid "'x' is a factor"
+msgstr "'x' n'est pas une matrice"
+
+#: cov.c:665
+#, fuzzy
+msgid "'y' is a factor"
+msgstr "'fn' n'est pas une fonction"
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr "dimensions incompatibles"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr "paires d'éléments incomplètes"
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr "'use' incorrect (méthode de calcul)"
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr "'x' est vide"
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr "l'écart type est nulle"
 
@@ -105,36 +115,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "La fonction '%s' n'est pas dans la table des dérivées"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr ""
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "la variable doit être une chaîne de caractères"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "seulement le premier élément est utilisé comme nom de variable"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "expression incorrecte dans '%s'"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "nom de variable incorrect"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "marque (tag) incorrecte"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr "valeurs infinies traitées comme NA"
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance() : p incorrect"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance() : distance incorrecte"
 
@@ -146,17 +160,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr "Argument non numérique pour une fonction mathématique"
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr "Valeur %g hors de l'intervalle (0, 1)"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "L'argument %s doit être un vecteur numérique non vide"
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "l'argument %s doit être un vecteur numérique de longueur 1 ou %d"
@@ -181,7 +195,12 @@
 msgid "invalid factors"
 msgstr "variables facteur incorrectes"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, fuzzy, c-format
+msgid "'%s' must be of length one"
+msgstr "'m' doit être une liste"
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr "seulement 2500 lignes autorisées pour sm.method=\"spline\""
 
@@ -199,7 +218,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr "NA/NaN/Inf dans '%s'"
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "fenêtre trop étroite"
 
@@ -227,19 +246,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr "'delta' doit être fini et > 0"
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "Matrice singulière dans qr_solve"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "Matrice singulière dans ldet"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "vmethod incorrecte"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr "l'algorithme de Burg n'a pas trouvé la correlation partielle"
 
@@ -278,190 +297,190 @@
 msgid "invalid result from na.action"
 msgstr "résultat incorrect de na.action"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argument '%s' incorrect"
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr "trame de modèle incorrect"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr "nombre de cas inconnu"
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr "les longueurs des variables diffèrent (trouvé pour la variable %d)"
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr "la variable %d n'a pas de niveaux"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr "la réponse est apparue dans le membre de droite et y a été éliminée"
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr "le terme %d nécessite %.0g colonnes "
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr "la matrice nécessite %.0g colonnes"
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr ""
 "problème avec le terme %d dans model.matrix : aucune colonne n'est assignée"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr "les noms des termes seront tronqués"
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr ""
 "des variables complexes ne sont pas encore acceptées dans les matrices de "
 "modèle"
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr ""
 "les variables de type '%s' ne sont pas autorisées dans des matrices de modèle"
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr "formule de modèle incorrecte dans 'update'"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr "formule de modèle attendue"
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr "terme incorrect dans une formule de modèle"
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr "formule de modèle incorrecte"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr "puissance incorrecte dans une formule de modèle"
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr "formule de modèle incorrecte dans ExtractVars"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr "nom dupliqué '%s' dans le data frame utilisant '.'"
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr "formule de modèle incorrecte dans EncodeVars"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr "l'argument n'est pas un modèle correct"
 
-#: model.c:1675
+#: model.c:1690
 msgid "'specials' must be NULL or a character vector"
 msgstr "'specials' doit être NULL ou un vecteur de chaîne de caractères"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr "l'argument 'data' est d'un mauvais type"
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr "'.' dans la formule et pas d'argument 'data'"
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr "n doit valoir deux ou plus"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr "L'argument m doit être numérique"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr "length(m) doit valoir deux ou plus"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr ""
 "L'argument Sx doit être un vecteur numérique plus court que m[] d'un élément"
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "'control' doit être une liste"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "'m' doit être une liste"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s' absent"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr "gradient singulier"
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr "le pas %g est devenu inférieur à 'minFactor' de %g"
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "le nombre d'itérations a dépassé le maximum de %d"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr "convergence obtenue"
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "'theta' doit être de type caractère"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "l'utilisation de l'environnement NULL n'est plus autorisée"
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "'rho' doit être un environnement"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir' n'est pas un vecteur numérique de longueur correcte"
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr "Valeur manquante ou infinie obtenue au cours du calcul du modèle"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr ""
 "la variable '%s' est une valeur entière, non un nombre à virgule flottante"
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr "la variable '%s' n'est pas numérique"
@@ -688,21 +707,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr "le gradient fourni est de mauvaise longueur ou mode, et est ignoré"
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr "Starma struct incorrecte"
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr "code d'erreur starma %d"
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr "code d'erreur forkal %d"
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "valeur incorrecte de 'lag.max'"
 
@@ -731,7 +750,7 @@
 msgid "'rho' must be an environment"
 msgstr "'rho' doit être un environnement"
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d' doit être un vecteur numérique non vide"
 
@@ -775,23 +794,23 @@
 msgid "invalid type for eval_check_store"
 msgstr "type incorrect pour 'eval_check_store'"
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "'m' doit être une liste"
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr "'lowerb' et 'upperb' doivent tous deux être des vecteurs numériques"
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr "degrés de libertés et dimension incohérents"
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr "'scal' doit être une matrice carrée de réels"
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr "la matrice 'scal' n'est pas définie et positive"
 
@@ -831,12 +850,12 @@
 "rcont2 [%d,%d]: exp provoque un dépassement mémoire vers le bas à 0; "
 "l'algorithme a échoué"
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr "règle finale incorrecte pour une médiane mobile de 3 : %d"
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr "valeur manquante dans les %d dernières observations"
diff -Nru r-base-3.2.3/src/library/stats/po/it.po r-base-3.3.1/src/library/stats/po/it.po
--- r-base-3.2.3/src/library/stats/po/it.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/it.po	2016-04-27 22:15:21.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2005-04-14 18:06+0200\n"
 "Last-Translator: stefano iacus <stefano.iacus@r-project.org>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,11 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "ampiezza/copertura mediane più grande di n"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "probabilità esterne a [0,1] in qansari()"
 
@@ -41,7 +41,7 @@
 msgid "invalid argument type"
 msgstr "tipo argomento non valido"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "posso trasformare al più 100 parametri in arima0"
 
@@ -67,32 +67,42 @@
 msgid "not all arguments have the same length"
 msgstr "non tutti gli argomenti hanno la stessa lunghezza"
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr "osservazioni mancanti in cov/cor"
 
-#: cov.c:644
+#: cov.c:643
 #, fuzzy
 msgid "'x' is NULL"
 msgstr "'x' è vuoto"
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+#, fuzzy
+msgid "'x' is a factor"
+msgstr "'tmax' non è un intero"
+
+#: cov.c:665
+#, fuzzy
+msgid "'y' is a factor"
+msgstr "'fn' non è una funzione"
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr "dimensioni incompatibili"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr ""
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr "'use' non valido (metodo computazionale)"
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr "'x' è vuoto"
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr "la deviazione standard è zero"
 
@@ -105,36 +115,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "Funzione '%s' non presente nelle tavole delle derivate"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr ""
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "la variabile deve essere una stringa character"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "solo il primo elemento è utilizzato come nome di variabile"
 
-#: deriv.c:657
+#: deriv.c:659
 #, fuzzy, c-format
 msgid "invalid expression in '%s'"
 msgstr "espressione non valida in \"%s\""
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "nomi variabili non validi"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "'tag' non valido"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr ""
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance(): p non valido"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance(): distanza non valida"
 
@@ -146,17 +160,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr "Argomento non numerico in una funzione matematica"
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr ""
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr ""
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr ""
@@ -181,7 +195,12 @@
 msgid "invalid factors"
 msgstr "fattori non validi"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, fuzzy, c-format
+msgid "'%s' must be of length one"
+msgstr "'m' deve essere di tipo list"
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr "sm.method=\"spline\" permette solo 2500 righe"
 
@@ -200,7 +219,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr ""
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "ampiezza troppo piccola"
 
@@ -229,19 +248,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr ""
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "Matrice singolare in qr_solve"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "Matrice singolare in ldet"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "metodo non valido"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr "l'alrgoritmo di Burg non è riuscito a trovare correlazione parziale"
 
@@ -280,190 +299,190 @@
 msgid "invalid result from na.action"
 msgstr "risultato non valido da na.action"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argomento '%s' non valido"
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr "frame modello non valido"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr "numero di casi sconosciuto"
 
-#: model.c:414
+#: model.c:417
 #, fuzzy, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr "la lunghezza delle variabili differisce"
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr "la variabile %d non ha livelli"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr ""
 "la variabile risposta appare anche nel membro di destra ed è stata eliminata"
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr ""
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr ""
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr "problema nel termine %d in model.matrix: nessuna colonna assegnata"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr "i nomi dei termini saranno troncati"
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr ""
 
-#: model.c:659
+#: model.c:662
 #, fuzzy, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr "valori negativi non ammessi come indici di matrice"
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr "formula non valida in 'update'"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr "necessaria formula"
 
-#: model.c:1046
+#: model.c:1049
 #, fuzzy
 msgid "invalid term in model formula"
 msgstr "valore di lag.max non valido"
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr "formula modello non valida"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr "potenza non valida nella formula"
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr "formula modello non valida in ExtractVars"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr "duplicazione nome '%s' nel data frame nell'usare '.'"
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr "formula modello non valida in EncodeVars"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr "l'argomento non è un modello valido"
 
-#: model.c:1675
+#: model.c:1690
 #, fuzzy
 msgid "'specials' must be NULL or a character vector"
 msgstr "'path' deve essere un vettore di tipo character"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr "l'argomento 'data' è di tipo sbagliato"
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr "nella formula c'è il '.' ma nessun argomento 'data'"
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 #, fuzzy
 msgid "n must be at least two"
 msgstr "m deve essere di tipo list"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 #, fuzzy
 msgid "Argument m must be numeric"
 msgstr "'x' deve essere di tipo numeric"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 #, fuzzy
 msgid "length(m) must be at least two"
 msgstr "m deve essere di tipo list"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr ""
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "'control' deve essere di tipo list"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "'m' deve essere di tipo list"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s' assente"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr "gradiente singolare"
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr "fattore di incremento %g sotto 'minFactor' %g"
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "il numero di iterazioni ha superato il massimo di %d"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr ""
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "'theta' deve essere di tipo character"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "'rho' deve essere un environment"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr ""
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr "Valore mancante o infinito generato durante il calcolo del modello"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr ""
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr ""
@@ -694,21 +713,21 @@
 msgstr ""
 "il gradiente fornito è della lunghezza o modalità sbagliata, viene ignorato"
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr "struttura Starma errata"
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr "codice di errore starma %d"
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr "codei di errore forkal %d"
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "valore di lag.max non valido"
 
@@ -735,7 +754,7 @@
 msgid "'rho' must be an environment"
 msgstr "'rho' deve essere un environment"
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr ""
 
@@ -775,23 +794,23 @@
 msgid "invalid type for eval_check_store"
 msgstr ""
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "m deve essere di tipo list"
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr ""
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr ""
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr ""
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr ""
 
@@ -829,12 +848,12 @@
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 msgstr ""
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr ""
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr "valori mancanti nelle ultime %d osservazioni"
diff -Nru r-base-3.2.3/src/library/stats/po/ja.po r-base-3.3.1/src/library/stats/po/ja.po
--- r-base-3.2.3/src/library/stats/po/ja.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/ja.po	2016-04-27 22:15:22.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.1 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2015-03-27 15:09+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -19,11 +19,11 @@
 "X-Generator: Pootle 2.5.1.1 \n"
 "X-POOTLE-MTIME: 1427436568.000000 \n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr " 移動中央値��ンド幅・�ンド範囲 (span) � n より大�������� "
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr " qansari() 中�確率� [0, 1] �範囲外�� "
 
@@ -43,7 +43,7 @@
 msgid "invalid argument type"
 msgstr " �正�引数�型�� "
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr " arima0 �� 100 個�パラメータ����変�出���ん "
 
@@ -69,31 +69,41 @@
 msgid "not all arguments have the same length"
 msgstr " 引数�中�異���長��も���り�� "
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr " cov/cor 関数�欠���観測値��り�� "
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr " 'x' � NULL �� "
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+#, fuzzy
+msgid "'x' is a factor"
+msgstr " 'x' �行列���り��ん "
+
+#: cov.c:665
+#, fuzzy
+msgid "'y' is a factor"
+msgstr " 'fn' �関数���り��ん "
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr " 互�性���次元�� "
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr " 完全��素�ペア��り��ん "
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr " 'use' (計算法) ��正�� "
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr " 'x' �空�� "
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr " 標準�差� 0 �� "
 
@@ -106,36 +116,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr " 関数 '%s' �導関数�表中��り��ん "
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr ""
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr " 変数�文字列���れ�����ん "
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr " 最���素���変数����使�れ��� "
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr " '%s' 中����正�� "
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr " 変数���正�� "
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr " タグ��正�� "
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr " 有����値を NA ����り扱��� "
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr " distance(): �正� p "
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr " distance(): �正��離 "
 
@@ -147,17 +161,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr " 数学関数��数値引数�渡�れ��� "
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr " 値 %g �範囲 (0, 1) 外�� "
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr " 引数 %s �空���数値ベクトル���れ��り��ん "
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr " 引数 %s �長�� 1 � %d �数値ベクトル���れ��り��ん "
@@ -182,7 +196,12 @@
 msgid "invalid factors"
 msgstr " 因� (factor) ��正�� "
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, fuzzy, c-format
+msgid "'%s' must be of length one"
+msgstr " 'm' �リスト���れ��り��ん "
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr " sm.method=\"spline\" �� 2500 行����扱���ん "
 
@@ -200,7 +219,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr " '%s' �中� NA/NaN/Inf ��り�� "
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr " 範囲 (span) ������� "
 
@@ -228,19 +247,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr " 'delta' �有���正数������り��ん "
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr " qr_solve 中�特異行列�� "
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr " ldet 中�特異行列�� "
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr " �正� vmethod �� "
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr " Burg �アルゴリズム��相関を見�������� "
 
@@ -279,185 +298,185 @@
 msgid "invalid result from na.action"
 msgstr " na.action ��果��正�� "
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr " '%s' 引数��正�� "
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr " モデルフレーム��正�� "
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr " ケース�数�幾��る�分�り��ん "
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr " 変数 (%d 変数�基��) �長��異�り�� "
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr " 変数 %d �水準を����ん "
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr " 目的変数��辺��る�����去られ��� "
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr " 項 %d � %.0g 行を必���る�も�れ��ん "
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr " 行列� %.0g 行を必���る�も�れ��ん "
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr ""
 " model.matrix 中�項 %d ��題��り��: ���る列も指定�れ����ん "
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr " 項����切り��らられる��ょ� "
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr " モデル行列中��複素数��在許�れ����ん "
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr " タイプ '%s' �変数�モデル行列中��許�れ��ん "
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr " 'update' 中����正�� "
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr " ��期待�れ���� "
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr " モデル���正�項��り�� "
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr " モデル���正�� "
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr " モデル�中��正���乗��り�� "
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr " ExtractVars 中�モデル���正�� "
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr " データフレーム中��複���� '%s' を '.' を使��複製���� "
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr " EncodeVars 中�モデル���正�� "
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr " 引数�有効�モデル���り��ん "
 
-#: model.c:1675
+#: model.c:1690
 msgid "'specials' must be NULL or a character vector"
 msgstr " 'specials' � NULL ���文字ベクタ������り��ん "
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr " 'data' 引数�誤��型�� "
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr " '.' ��中��り���, 'data' 引数��り��ん "
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr " n �最低�も 2 ���れ��り��ん "
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr " 引数 m �数値���れ��り��ん "
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr " length(m) �少���も 2 ���れ��り��ん "
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr " 引数 Sx �長�� m[] より 1 ��短�数値ベクトル���れ��り��ん "
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr " 'control' �リスト���れ��り��ん "
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr " 'm' �リスト���れ��り��ん "
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr " '%s' ��り��ん "
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr " 勾��特異�� "
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr " step 因� %g � %g � 'minFactor' 以下�縮����� "
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr " 繰り返�数�最大値 %d を超���� "
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr " ������ "
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr " 'theta' �文字型���れ��り��ん "
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr " NULL 環境�使用�廃止�れ��� "
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr " 'rho' �環境 (environment) ���れ��り��ん "
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr " 'dir' �正��長��数値ベクトル���り��ん "
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr " モデルを評価�る際，欠�値���無�大�生��れ��� "
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr " 変数 '%s' �整数���数値���り��ん "
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr " 変数 '%s' �数値���り��ん "
@@ -681,21 +700,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr " �供�れ�勾���正�長��モード������無視�れ��� "
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr " ��� Starma struct �� "
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr " starma エラーコード %d �� "
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr " forkal エラーコード %d �� "
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr " �正� lag.max 値�� "
 
@@ -722,7 +741,7 @@
 msgid "'rho' must be an environment"
 msgstr " 'rho' �環境 (environment) ���れ��り��ん "
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr " 'd' �空���数値ベクトル���れ��り��ん "
 
@@ -763,23 +782,23 @@
 msgid "invalid type for eval_check_store"
 msgstr " eval_check_store �対�る�正�タイプ�� "
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr " m �リスト���れ��り��ん "
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr " 'lowerb' � 'upperb' �数値ベクトル���れ��り��ん "
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr " 自由度�次元�矛盾����� "
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr " 'scal' �正方�実行列��る必���り�� "
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr " 行列 'scal' �正定値行列���り��ん "
 
@@ -819,12 +838,12 @@
 " rcont2 [%d, %d]: exp �アンダーフロー�� 0 ��り���; アルゴリズム�失敗"
 "���� "
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr " 3 点移動中央値計算�終了ルール��正��: %d "
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr " 直�� %d 個�観測値中�欠�値��り�� "
diff -Nru r-base-3.2.3/src/library/stats/po/ko.po r-base-3.3.1/src/library/stats/po/ko.po
--- r-base-3.2.3/src/library/stats/po/ko.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/ko.po	2016-04-27 22:15:21.000000000 +0000
@@ -1,34 +1,37 @@
 # Korean translation for R stats package
-# src/library/stats/po/ko.po
+# ./stats/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R stats package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
-# Notes: 
+# Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "연��� 중앙값들� 브로드밴드/범위가 n보다 �니다"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "qansari()내� 있는 확률� 값들� [0,1] 범위외� 있습니다"
 
@@ -48,7 +51,7 @@
 msgid "invalid argument type"
 msgstr "유효하지 않� �� 타입입니다"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "arima0�서는 최대 100개� 파�미터들� 변환할 수 있습니다"
 
@@ -74,31 +77,39 @@
 msgid "not all arguments have the same length"
 msgstr "모든 ��들� 같� 길�를 가지고 있지 않습니다"
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr "cov/cor� 결측치들� 있습니다"
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr "'x'는 NULL입니다"
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+msgid "'x' is a factor"
+msgstr "'x'는 요�입니다."
+
+#: cov.c:665
+msgid "'y' is a factor"
+msgstr "'y'는 요�입니다."
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr "호환�지 않는 차�들입니다"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr ""
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr "유효하지 않� 'use'입니다 (computational method)"
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr "'x'가 비어있습니다"
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr "표준편차가 0입니다"
 
@@ -111,36 +122,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "함수 '%s'는 미분함수 목�� 없습니다"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr "'expr'는 표현�(expression) �는 호출(call)�어야 합니다."
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "변수는 반드시 문�열�어야 합니다"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "오로지 첫번째 요소만� 변수명으로서 사용�었습니다"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "'%s'� 유효하지 않� 표현�� 있습니다"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "유효하지 않� 변수명입니다"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "유효하지 않� 태그입니다"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr "유한하지 않� 값들� NA로 처리합니다"
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance(): 유효하지 않� p입니다"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance(): 유효하지 않� 거리입니다"
 
@@ -152,17 +167,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr "수치형� 아닌 ��가 수학함수� �용�었습니다"
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr "%g� 값� (0,1)� 범위외� 있습니다"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "�� %s는 반드시 비어있지 않� 수치형 벡터�어야 합니다"
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "�� %s는 반드시 길�가 1 �거나 %d� 수치형 벡터�어야 합니다"
@@ -187,11 +202,14 @@
 msgid "invalid factors"
 msgstr "유효하지 않� 요�입니다"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, c-format
+msgid "'%s' must be of length one"
+msgstr "'%s'� 길�는 반드시 1�어야 합니다."
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
-msgstr ""
-"sm.method� \"spline\"� 주어졌� 때�는 최대로 사용할 수 있는 행� 개수는 "
-"2500개입니다"
+msgstr "sm.method� \"spline\"� 주어졌� 때�는 최대로 사용할 수 있는 행� 개수는 2500개입니다"
 
 #: lm.c:57
 msgid "'x' is not a matrix"
@@ -207,7 +225,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr "'%s' 내� NA/NaN/Inf가 있습니다"
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "범위가 너무 작습니다"
 
@@ -235,19 +253,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr "'delta'는 반드시 유한해야 하고 0 보다 커야 합니다"
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "qr_solve� 비가역행렬� 있습니다"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "ldet� 비가역행렬� 있습니다"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "유효하지 않� vmethod입니다"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr "partial correlation� 찾기 위해 사용� Burg� 알고리즘� 실패했습니다"
 
@@ -286,193 +304,191 @@
 msgid "invalid result from na.action"
 msgstr "na.action으로부터 결과가 유효하지 않습니다"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "유효하지 않� '%s' ��입니다"
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr "유효하지 않� 모�프레임입니다"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr "얼마나 많� 경우들� 있는지 모릅니다"
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr "변수� 길�들� 다릅니다 (변수 %d�서 찾았습니다)"
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr "변수 %d� 아무런 level� 가지고 있지 않습니다"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr "종�변수가 우변�서 발견�어 �를 �함시키지 않았습니다"
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr "항 %d는 %.0g 열들� 필요로 합니다"
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr "행렬� %.0g 열들� 필요로 합니다"
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
-msgstr ""
-"model.matrix� 있는 항 %d� 문제가 있습니다: 아무런 열들� 할당�지 않았습니"
-"다"
+msgstr "model.matrix� 있는 항 %d� 문제가 있습니다: 아무런 열들� 할당�지 않았습니다"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr "항 �름들� 잘려질 것입니다"
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr "복소수 변수들� 현재 model matrices�서는 허용�지 않습니다"
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr "유형 '%s'를 가지는 변수들� model matrices�서 허용�지 않습니다"
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr "'update'내� 유효하지 않� formula가 있습니다"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr "formula가 와야 합니다"
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr "모��� 유효하지 않� 항� 있습니다"
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr "유효하지 않� 모��입니다"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr ""
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr "ExtractVars� 유효하지 않� 모��� 있습니다"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr "'.'를 �용한 ��터 프레임�서 중복� �름 '%s'� 발견했습니다"
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr "EncodeVars내� 유효하지 않� 모��� 발견�었습니다"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr "��가 유효한 모�� 아닙니다"
 
-#: model.c:1675
+#: model.c:1690
 msgid "'specials' must be NULL or a character vector"
 msgstr "'specials'는 반드시 NULL �는 문�형 벡터�어야 합니다"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr "'data' ��� 유형� 잘못�었습니다"
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr "formula 안�  '.'가 사용�었는� 'data' ��가 없습니다"
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr "n� 반드시 최소 2���어야 합니다"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr "�� m� 반드시 수치형�어야 합니다"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr "length(m)� 반드시 최소 2�어야 합니다"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr "�� Sx� 반드시 m[]� 길�보다 하나가 �� 숫�형 벡터�어야 합니다"
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "'control'� 반드시 리스트�어야 합니다"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "'m'� 반드시 리스트�어야 합니다"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s'가 빠졌습니다"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr ""
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr ""
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "지정� 최대 반복수 %d를 초과하였습니다"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr "수렴했습니다"
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "'theta'는 반드시 문�형�어야 합니다"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "NULL environment� 사용� � �� 지��지 않습니다"
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "'rho'는 반드시 environment�어야 합니다"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir'� 올바른 길�를 가지는 수치형 벡터가 아닙니다"
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr "모� �가시� 값� 누��거나 무한값� �성�었습니다"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr "변수 '%s'는 약분할 수 없는 정수입니다"
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr "변수 '%s'는 수치형� 아닙니다"
 
 #: optim.c:80 optim.c:107
 msgid "non-finite value supplied by optim"
-msgstr ""
+msgstr "optim으로부터 유한(finite)하지 않� 값� �성�었습니다."
 
 #: optim.c:87
 #, c-format
@@ -674,7 +690,7 @@
 #: optimize.c:745 optimize.c:750 optimize.c:754 optimize.c:758 optimize.c:762
 #: optimize.c:766 optimize.c:771
 msgid "invalid NA value in parameter"
-msgstr ""
+msgstr "파�미터�는 NA를 사용할 수 없습니다."
 
 #: optimize.c:800
 msgid "hessian supplied is of the wrong length or mode, so ignored"
@@ -684,21 +700,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr "얻어진 gradient� 길� �는 모드가 잘못�었으므로, 사용하지 않습니다."
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr ""
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr ""
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr ""
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "lag.max� 값� 올바르지 않습니다."
 
@@ -719,14 +735,13 @@
 #: port.c:325
 #, c-format
 msgid "Hessian function must return a square numeric matrix of order %d"
-msgstr ""
-"Hessian function� 반드시 사�즈가 %d� 수치형 정방행렬� 반환해야 합니다"
+msgstr "Hessian function� 반드시 사�즈가 %d� 수치형 정방행렬� 반환해야 합니다"
 
 #: port.c:380
 msgid "'rho' must be an environment"
 msgstr "'rho'는 반드시 �바�런먼트(environment)�어야 합니다."
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d'는 반드시 비어있지 않� 수치형 벡터�어야 합니다"
 
@@ -737,8 +752,7 @@
 #: port.c:387
 #, c-format
 msgid "environment 'rho' must contain a numeric vector '.par' of length %d"
-msgstr ""
-"environment 'rho'는 반드시 길�가 %d� 수치형 벡터 '.par'를 �함해야 합니다"
+msgstr "environment 'rho'는 반드시 길�가 %d� 수치형 벡터 '.par'를 �함해야 합니다"
 
 #: port.c:401
 msgid "'lower' and 'upper' must be numeric vectors"
@@ -746,9 +760,7 @@
 
 #: port.c:460
 msgid "'getElement' applies only to named lists"
-msgstr ""
-"'getElement'는 오로지 �소� �름� 주어진 리스트(list)들�만 �용할 수 있습"
-"니다."
+msgstr "'getElement'는 오로지 �소� �름� 주어진 리스트(list)들�만 �용할 수 있습니다."
 
 #: port.c:481
 #, c-format
@@ -763,31 +775,29 @@
 #: port.c:515
 #, c-format
 msgid "fcn produced mode %d, length %d - wanted mode %d, length %d"
-msgstr ""
-"fcn� 본래 모드 %3$d와 길� %4$d�어야 하는� 모드 %1$d와 길� %2$d를 �성하"
-"였습니다."
+msgstr "fcn� 본래 모드 %3$d와 길� %4$d�어야 하는� 모드 %1$d와 길� %2$d를 �성하였습니다."
 
 #: port.c:528
 msgid "invalid type for eval_check_store"
 msgstr "eval_check_store� 올바르지 않� 유형(type)입니다."
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "m� 반드시 리스트(list)�어야 합니다."
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr "'lowerb'와 'upperb'는 반드시 수치형 벡터들�어야 합니다."
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr ""
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr "'scal'� 반드시 실수형 정방행렬�어야 합니다."
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr "'scal'행렬� 양정치(positive-definite)가 아닙니다."
 
@@ -823,15 +833,14 @@
 #: rcont.c:83
 #, c-format
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
-msgstr ""
-"rcont2 [%d,%d]: exp� 값� 0보다 작기(underflow)하므로 알고리즘 실패입니다."
+msgstr "rcont2 [%d,%d]: exp� 값� 0보다 작기(underflow)하므로 알고리즘 실패입니다."
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr ""
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
-msgstr ""
+msgstr "마지막 %d개� 관측치들� 결측입니다."
diff -Nru r-base-3.2.3/src/library/stats/po/pl.po r-base-3.3.1/src/library/stats/po/pl.po
--- r-base-3.2.3/src/library/stats/po/pl.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/pl.po	2016-04-27 22:15:21.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,14 +13,14 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "pasmo/rozpiętość ruchomych median jest większe niż 'n'"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "prawdopodobieństwa poza przedziałem [0,1] w 'qansari()'"
 
@@ -40,7 +40,7 @@
 msgid "invalid argument type"
 msgstr "niepoprawny typ argumentu"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "można przekształcić tylko do 100 par w 'arima0'"
 
@@ -66,31 +66,39 @@
 msgid "not all arguments have the same length"
 msgstr "nie wszystkie argumenty mają tę samą długość"
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr "brakujÄ…ce obserwacje w macierzy kowariancji/korelacji"
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr "'x' ma wartość NULL"
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+msgid "'x' is a factor"
+msgstr "argument 'x' jest czynnikiem"
+
+#: cov.c:665
+msgid "'y' is a factor"
+msgstr "argument 'y' jest czynnikiem"
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr "niezgodne wymiary"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr "brak kompletnych par elementów"
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr "niepoprawne 'use' (metoda obliczeniowa)"
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr "'x' jest puste"
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr "odchylenie standardowe wynosi zero"
 
@@ -103,36 +111,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "Funkcja '%s' nie znajduje siÄ™ w tablicy pochodnych"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr "argument 'expr' musi być wyrażeniem lub wywołaniem"
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "zmienna musi być łańcuchem tekstowym"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "tylko pierwszy element jest używany jako nazwa zmiennej"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "niepoprawne wyrażenie w '%s'"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "niepoprawne nazwy zmiennych"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "niepoprawny znacznik"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr "traktowanie nieskończonych wartości jako NA"
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance(): niepoprawne 'p'"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance(): niepoprawna odległość"
 
@@ -144,17 +156,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr "Argument nieliczbowy przekazany do funkcji matematycznej"
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr "Wartość %g jest poza zakresem (0, 1)"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "Argument '%s' musi być niepustym wektorem liczbowym"
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "argument '%s' musi być wektorem liczbowym o długości 1 lub długości %d"
@@ -179,7 +191,12 @@
 msgid "invalid factors"
 msgstr "niepoprawne czynniki"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, c-format
+msgid "'%s' must be of length one"
+msgstr "argument '%s' musi mieć długość 1"
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr "tylko 2500 wierszy jest dozwolonych dla 'sm.method=\"spline\"'"
 
@@ -197,7 +214,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr "wartości NA/NaN/Inf w '%s'"
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "argument 'span' jest zbyt mały"
 
@@ -225,19 +242,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr "argument 'delta' musi być skończony oraz > 0"
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "Osobliwa macierz w 'qr_solve'"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "Osobliwa macierz w 'qr_solve'"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "Niepoprawne 'vmethod'"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr ""
 "Algorytm Burga nie powiódł się przy próbie znalezienia częściowej korelacji"
@@ -277,188 +294,188 @@
 msgid "invalid result from na.action"
 msgstr "niepoprawny wynik z 'na.action'"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "niepoprawny argument '%s'"
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr "niepoprawna ramka modelu"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr "nie wiadomo jak wiele przypadków"
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr "długości zmiennej różnią się (znaleziono dla zmiennej %d)"
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr "zmienna %d nie posiada poziomów"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr ""
 "zmienna zależna pojawiła się po prawej stronie równania więc została "
 "odrzucona"
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr "człon %d wymaga %.0g kolumn"
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr "macierz wymaga %.0g kolumn"
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr "problem z członem %d w 'model.matrix()': brak przypisanych kolumn"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr "nazwy członów będą przycięte"
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr "zmienne zespolone nie sÄ… aktualnie dozwolone w macierzach modelu"
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr "zmienne typu '%s' nie sÄ… dozwolone w macierzach modelu"
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr "niepoprawna formuła w 'update'"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr "oczekiwano formuły"
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr "niepoprawny człon w formule modelu"
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr "niepoprawna formuła modelu"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr "niepoprawna potęga w formule"
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr "niepoprawna formuła modelu w funkcji 'ExtractVars()'"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr "powtórzona nazwa '%s' w ramce danych używając '.'"
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr "niepoprawna formuła modelu w funkcji 'EncodeVars()'"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr "argument nie jest poprawnym modelem"
 
-#: model.c:1675
+#: model.c:1690
 msgid "'specials' must be NULL or a character vector"
 msgstr "'specials' musi być wektorem tekstowym lub wartością 'NULL'"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr "argument 'data' posiada niepoprawny typ"
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr "'.' w formule oraz brak argumentu 'data'"
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr "argument 'n' musi wynosić co najmniej 2"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr "argument 'm' musi być liczbą"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr "'length(m)' musi wynosić co najmniej dwa"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr "Argument 'Sx' musi być wektorem liczbowym o jeden którszym niż 'm[]'"
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "argument 'control' musi być listą"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "argument 'm' musi być listą"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s' jest niedostępne"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr "osobliwy gradient"
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr "czynnik kroku %g zmiejszony poniżej  'minFactor' %g"
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "liczba iteracji przekroczyła maksymalną liczbę %d"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr "zbiegł się"
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "argument 'theta' powinien być typu tekstowego"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "użycie wartości NULL dla środowiska zostało zlikwidowane"
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "argument 'rho' musi być środowiskiem"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir' nie jest wektorem liczbowym o poprawnej długości"
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr ""
 "Brakuje wartości lub wyprodukowano wartości nieskończone podczas wyliczania "
 "modelu"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr "zmienna '%s' jest liczbą całkowitą, a nie rzeczywistą"
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr "zmienna '%s' nie jest liczbÄ… rzeczywistÄ…"
@@ -688,21 +705,21 @@
 "dostarczony gradient posiada niepoprawną długość lub tryb, tak więc został "
 "zignorowany"
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr "zła struktura 'Starma'"
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr "starma: kod błędu %d"
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr "forkal: kod błędu %d"
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "niepoprawna wartość 'lag.max'"
 
@@ -729,7 +746,7 @@
 msgid "'rho' must be an environment"
 msgstr "'rho' musi być środowiskiem"
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d' musi być niepustym wektorem liczbowym"
 
@@ -770,23 +787,23 @@
 msgid "invalid type for eval_check_store"
 msgstr "niepoprawny typ dla funkcji 'eval_check_store()'"
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "argument 'm' musi być listą"
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr "'lowerb' oraz 'upperb' muszą być wektorami liczbowymi"
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr "niespójna liczba stopni swodoby oraz wymiaru"
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr "'scal' musi być kwadratową, rzeczywistą macierzą"
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr "macierz 'scal' nie jest dodatnio określona"
 
@@ -824,12 +841,12 @@
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 msgstr "rcont2 [%d,%d]: wyrażenie spadło do 0; niepowodzenie algorytmu"
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr "niepoprawna końcowa reguła dla ruchomiej mediany 3: %d"
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr "brakuje wartości w ostatnich %d obserwacjach"
diff -Nru r-base-3.2.3/src/library/stats/po/pt_BR.po r-base-3.3.1/src/library/stats/po/pt_BR.po
--- r-base-3.2.3/src/library/stats/po/pt_BR.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/pt_BR.po	2016-04-27 22:15:21.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.1\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2011-03-26 08:58-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -20,11 +20,11 @@
 "X-Poedit-Country: BRAZIL\n"
 "X-Poedit-Language: Portuguese\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "largura de banda/vão das medianas móveis é maior que n"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "probabilidades em qansari() fora do intervalo [0,1] "
 
@@ -44,7 +44,7 @@
 msgid "invalid argument type"
 msgstr "tipo de argumento inválido"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "pode-se transformar apenas 100 pares em arima0"
 
@@ -70,31 +70,41 @@
 msgid "not all arguments have the same length"
 msgstr "nem todos os argumentos tem o mesmo comprimento"
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr "observações faltantas em cov/cor"
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr "'x' é NULL"
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+#, fuzzy
+msgid "'x' is a factor"
+msgstr "'tmax' não é um inteiro"
+
+#: cov.c:665
+#, fuzzy
+msgid "'y' is a factor"
+msgstr "'fn' não é uma função"
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr "dimensões incompatíveis"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr "nenhum par de elementos completo"
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr "'use' inválido (método computacional)"
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr "'x' é vazio"
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr "o desvio padrão é zero"
 
@@ -107,36 +117,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "Função '%s' não está na tabela de derivadas"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr ""
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "variável deve ser uma string de caracteres"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "apenas o primeiro elemento é usado como nome da variável"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "expressão inválida em '%s'"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "nomes inválidos de variável"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "etiqueta inválida"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr "considerando valores não-finitos como NA"
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance(): p inválido"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance(): distância inválida"
 
@@ -148,17 +162,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr "Argumento não-numérico para função matemática"
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr "Valor %g fora do intervalo (0,1)"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "Argumento %s deve ser um vetor numérico não-vazio"
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "argumento %s deve ser um vetor numérico com comprimento 1 ou %d"
@@ -183,7 +197,12 @@
 msgid "invalid factors"
 msgstr "fatores inválidos"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, fuzzy, c-format
+msgid "'%s' must be of length one"
+msgstr "'m' deve ser uma lista"
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr "são permitidas apenas 2500 linhas para sm.method=\"spline\""
 
@@ -202,7 +221,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr ""
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "vão é muito pequeno"
 
@@ -231,19 +250,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr ""
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "Matriz singular em qr_solve"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "Matriz singular em ldet"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "vmethod inválido"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr "algoritmo de Burg não conseguiu encontrar correlação parcial"
 
@@ -282,187 +301,187 @@
 msgid "invalid result from na.action"
 msgstr "resultado inválido de na.action"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argumento '%s' inválido"
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr "estrutura de modelo inválida"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr "não é possível determinar o número de casos"
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr "comprimentos das variáveis diferem (encontrados para a variável %d)"
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr "variável %d não tem níveis"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr "a resposta apareceu no lado direito e foi descartada"
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr "termo %d requeriria %.0g colunas"
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr "matrix requeriria %.0g colunas"
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr ""
 "problema com o termo %d na matriz do modelo: nenhuma coluna foi atribuida"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr "nomes dos termos serão truncados"
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr ""
 "variáveis complexas não são atualmente permitidas em matrizes de modelo"
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr "variáveis de tipo '%s' não são permitidas em matrizes de modelo"
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr "fórmula inválida em 'update'"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr "fórmula esperada"
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr "termo inválido na fórmula de modelo"
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr "fórmula de modelo inválida"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr "potenciação inválida na fórmula"
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr "fórmula de modelo inválida em ExtractVars"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr "nome duplicado '%s' em data frame usando '.'"
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr "fórmula de modelo inválida em EncodeVars"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr "argumento não é um modelo válido"
 
-#: model.c:1675
+#: model.c:1690
 #, fuzzy
 msgid "'specials' must be NULL or a character vector"
 msgstr "'path' deve ser um vetor de caracteres"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr "argumento 'data' é do tipo errado"
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr "'.' na fórmula e nenhum argumento 'data'"
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr "n deve ser pelo menos dois"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr "Argumento m deve ser numérico"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr "length(m) deve ser pelo menos dois"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr "Argumento Sx deve ser um vetor numérico com comprimento menor que m[]"
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "'control' deve ser uma lista"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "'m' deve ser uma lista"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s' ausente"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr "gradiente singular"
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr "fator de passos %g reduzido abaixo de 'minFactor' de %g"
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "número de iterações excedeu o máximo de %d"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr "convergiu"
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "'theta' deve ser do tipo caractere"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "uso do ambiente NULL é obsoleto"
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "'rho' deve ser um ambiente"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir' não é um vetor numérico de comprimento correto"
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr "Obtido valor faltante ou infinito quando avaliando o modelo"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr "variável '%s' é inteira, não numérica"
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr "variável '%s' não é numérica"
@@ -688,21 +707,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr "gradiente fornecido tem comprimento ou modo errados; ignorado"
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr "estrutura Starma inválida"
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr "erro starma código %d"
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr "erro forkal código %d"
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "valor inválido para lag.max"
 
@@ -729,7 +748,7 @@
 msgid "'rho' must be an environment"
 msgstr "'rho' deve ser um ambiente"
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d' deve ser um vetor numérico não-vazio"
 
@@ -771,23 +790,23 @@
 msgid "invalid type for eval_check_store"
 msgstr "tipo inválido para eval_check_store"
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "m deve ser uma lista"
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr "'lowerb' e 'upperb' devem ser vetores numéricos"
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr ""
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr ""
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr ""
 
@@ -825,12 +844,12 @@
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 msgstr ""
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr "regra final inválida para mediana móvel de 3: %d"
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr "valor faltante nas últimas %d observações"
diff -Nru r-base-3.2.3/src/library/stats/po/R-da.po r-base-3.3.1/src/library/stats/po/R-da.po
--- r-base-3.2.3/src/library/stats/po/R-da.po	2015-03-18 23:03:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-da.po	2016-04-27 22:15:21.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-28 01:18+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -466,6 +466,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr ""
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr ""
 
@@ -478,6 +484,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr ""
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr ""
 
@@ -519,6 +528,9 @@
 msgid "arguments must have the same length"
 msgstr ""
 
+msgid "wrong number of columns in new data:"
+msgstr ""
+
 msgid "contrasts apply only to factors"
 msgstr ""
 
@@ -668,9 +680,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr ""
 
-msgid "non-matched further arguments are disregarded"
-msgstr ""
-
 msgid "argument 'x' must be numeric"
 msgstr ""
 
@@ -758,6 +767,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr ""
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr ""
 
@@ -861,7 +873,9 @@
 msgid "positive values only are allowed for the 'inverse.gaussian' family"
 msgstr ""
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr ""
 
 msgid "using weights as inverse variances"
@@ -1135,7 +1149,7 @@
 msgid "invalid parameter values"
 msgstr ""
 
-msgid "a limit is missing"
+msgid "a limit is NA or NaN"
 msgstr ""
 
 msgid "missing values not allowed"
@@ -1342,6 +1356,9 @@
 msgid "only 1-4 predictors are allowed"
 msgstr ""
 
+msgid "invalid NROW(X)"
+msgstr ""
+
 msgid "invalid 'y'"
 msgstr ""
 
@@ -1366,6 +1383,13 @@
 msgid "invalid argument 'degree'"
 msgstr ""
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr "ikke nok »y-observationer«"
+
 msgid "first argument must be a \"loess\" object"
 msgstr ""
 
@@ -1869,7 +1893,7 @@
 msgid "'varying' arguments must be the same length"
 msgstr ""
 
-msgid "'times' is wrong length"
+msgid "'lengths(varying)' must all match 'length(times)'"
 msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
@@ -2332,11 +2356,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] ""
diff -Nru r-base-3.2.3/src/library/stats/po/R-de.po r-base-3.3.1/src/library/stats/po/R-de.po
--- r-base-3.2.3/src/library/stats/po/R-de.po	2015-03-26 23:15:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-de.po	2016-04-27 22:15:22.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: R-3.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
-"PO-Revision-Date: 2015-03-26 14:46+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-08 12:31+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R Core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -83,10 +83,11 @@
 msgstr "'which' spezifizierte keine Faktoren"
 
 msgid "'which' specified some non-factors which will be dropped"
-msgstr "'which' spezifizert einige Nicht-Faktoren, diese werden nicht beachtet"
+msgstr ""
+"'which' spezifiziert einige Nicht-Faktoren, diese werden nicht beachtet"
 
 msgid "'sampleT' and 'nser' must be integer"
-msgstr "'sampleT' und 'nser' müssemn ganzzahlig sein"
+msgstr "'sampleT' und 'nser' müssen ganzzahlig sein"
 
 msgid "'lag.max' must be at least 0"
 msgstr "'lag.max' muss mindestens 0 sein"
@@ -151,7 +152,9 @@
 msgid ""
 "length of FUN, %d,\n"
 " does not match the length of the margins, %d"
-msgstr "Länge von FUN, %d,\\n entspricht nicht der Länge der Ränder, %d"
+msgstr ""
+"Länge von FUN, %d,\n"
+" entspricht nicht der Länge der Ränder, %d"
 
 msgid "no rows to aggregate"
 msgstr "keine Zeile für die Aggregation"
@@ -175,7 +178,7 @@
 msgstr "'x' muss eine Koeffizientenmatrix oder Dataframe sein"
 
 msgid "option \"show.coef.Pvalues\" is invalid: assuming TRUE"
-msgstr "option \"show.coef.Pvalues\" is unzulässig: nehme TRUE an"
+msgstr "option \"show.coef.Pvalues\" ist unzulässig: nehme TRUE an"
 
 msgid "'P.values' is TRUE, but 'has.Pvalue' is not"
 msgstr "'P.values' ist TRUE, aber 'has.Pvalue' nicht"
@@ -184,7 +187,7 @@
 msgstr "falsches k / cs.ind"
 
 msgid "option \"show.signif.stars\" is invalid: assuming TRUE"
-msgstr "Option \"show.signif.starts\" is unzulässig: nehme TRUE an"
+msgstr "Option \"show.signif.stars\" ist unzulässig: nehme TRUE an"
 
 msgid "'anova' object must have colnames"
 msgstr "'anova' Objekt muss Spaltennamen haben"
@@ -200,14 +203,14 @@
 
 msgid "samples differ in location: cannot compute confidence set, returning NA"
 msgstr ""
-"Stichproben unterscheiden sich in der Lage: kann keinenKonfidenzbereich "
+"Stichproben unterscheiden sich in der Lage: kann keinen Konfidenzbereich "
 "angeben, gebe NA zurück"
 
 msgid "cannot compute confidence set, returning NA"
 msgstr "kann keinen Konfidenzbereich berechnen, gebe NA zurück"
 
 msgid "cannot compute asymptotic confidence set or estimator"
-msgstr "kann keinen asymptotischen Konfidenzbereich oder Schäter berechnen"
+msgstr "kann keinen asymptotischen Konfidenzbereich oder Schätzer berechnen"
 
 msgid "cannot compute estimate, returning NA"
 msgstr "kann keinen Schätzer berechnen, gebe NA zurück"
@@ -264,7 +267,7 @@
 msgstr "Reduktion auf einmalige 'x' Werte"
 
 msgid "invalid interpolation method"
-msgstr "unzulässige Interpolationsmehtode"
+msgstr "unzulässige Interpolationsmethode"
 
 msgid "need at least two non-NA values to interpolate"
 msgstr "benötige mindestens zwei nicht-NA Werte zur Interpolation"
@@ -385,7 +388,7 @@
 msgstr "vergrößere bw.SJ() Suchintervall (%d) auf [%.4g,%.4g]"
 
 msgid "minimum occurred at one end of the range"
-msgstr "Minimum trat am Rand der Bereichs auf"
+msgstr "Minimum trat am Rand des Bereichs auf"
 
 msgid "'x' must be a list with at least 2 elements"
 msgstr "'x' muss eine Liste mit höchstens 2 Elementen sein"
@@ -400,7 +403,7 @@
 msgstr "es müssen zumindest 2 Beobachtungen in jeder Gruppe sein"
 
 msgid "'formula' should be of the form response ~ group"
-msgstr "'formul' sollte von der Art response ~ group sein"
+msgstr "'formula' sollte von der Art response ~ group sein"
 
 msgid "'x' must be nonnegative and integer"
 msgstr "'x' muss nicht-negativ und ganzzahlig sein"
@@ -415,7 +418,7 @@
 msgstr "'p' muss eine einzelne Zahl zwischen 0 und 1 sein"
 
 msgid "length of choices must be 2"
-msgstr "Länge der Auswahlen muss 2 sein"
+msgstr "Länge der Auswahl muss 2 sein"
 
 msgid "object '%s' has no scores"
 msgstr "Objekt '%s' hat keine Scores"
@@ -439,7 +442,7 @@
 msgstr "'y' hat Rang 0"
 
 msgid "'x' and 'y' must have the same length"
-msgstr "'x' und 'y'müssen dieselbe Länge haben"
+msgstr "'x' und 'y' müssen dieselbe Länge haben"
 
 msgid "'x' and 'y' must have at least 2 levels"
 msgstr "'x' und 'y' müssen mindestens 2 Stufen haben"
@@ -494,7 +497,7 @@
 msgstr "Zielfunktion angestiegen bei der äußeren Iteration %d"
 
 msgid "Objective function decreased at outer iteration %d"
-msgstr "Zilfunktion gefallen bei der äußeren Iteration %d"
+msgstr "Zielfunktion gefallen bei der äußeren Iteration %d"
 
 msgid "contrasts not defined for %d degrees of freedom"
 msgstr "Kontraste für %d Freiheitsgrade nicht definiert"
@@ -544,7 +547,7 @@
 msgstr "numerische Kontraste oder ein Kontrastname erwartet"
 
 msgid "%s needs package 'Matrix' correctly installed"
-msgstr "%s benötig das Paket 'Matrix' korrekt installiert"
+msgstr "%s benötigt das korrekt installierte Paket 'Matrix'"
 
 msgid "not enough degrees of freedom to define contrasts"
 msgstr "zu wenig Freiheitsgrade, um Kontraste zu definieren"
@@ -616,7 +619,7 @@
 msgstr "entweder 'k' oder 'h' muss angegeben werden"
 
 msgid "the 'height' component of 'tree' is not sorted (increasingly)"
-msgstr "die Koponente 'height' von 'tree' ist nicht (aufsteigend) sortiert"
+msgstr "die Komponente 'height' von 'tree' ist nicht (aufsteigend) sortiert"
 
 msgid "elements of 'k' must be between 1 and %d"
 msgstr "Elemente von 'k' müssen zwischen 1 und %d sein"
@@ -625,8 +628,8 @@
 "dendrogram entries must be 1,2,..,%d (in any order), to be coercible to "
 "\"hclust\""
 msgstr ""
-"Dendogrammeinträge müssen 1,2,..,%d (in beliebiger Reihenfolge) sein,\n"
-"damit sie in \"hclust\" umgewandelt werden können"
+"Dendogrammeinträge müssen 1,2,..,%d (in beliebiger Reihenfolge) sein, damit "
+"sie in \"hclust\" umgewandelt werden können"
 
 msgid "dendrogram node with non-positive #{branches}"
 msgstr "Dendrogrammknoten mit nicht-positiver #{Verzweigungen}"
@@ -659,7 +662,7 @@
 msgstr "'x' muss numerische Matrix sein"
 
 msgid "'x' must have at least 2 rows and 2 columns"
-msgstr "'x' muss mindestens 2 Spalten und 2 Zeilen haben"
+msgstr "'x' muss mindestens 2 Zeilen und 2 Spalten haben"
 
 msgid "'margins' must be a numeric vector of length 2"
 msgstr "'margins' muss ein numerischer Vektor der Länge 2 sein"
@@ -679,9 +682,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr "'RowSideColors' muss ein Zeichenkettenvektor der Länge nrow(x) sein"
 
-msgid "non-matched further arguments are disregarded"
-msgstr "übrige Argumente ohne Entsprechung werden verworfen"
-
 msgid "argument 'x' must be numeric"
 msgstr "Argument 'x' muss numerisch sein"
 
@@ -728,7 +728,7 @@
 msgstr "'x' ist kein Vektor"
 
 msgid "bad value for 'lag' or 'differences'"
-msgstr "ungültiger Wert für lag' oder 'differences'"
+msgstr "ungültiger Wert für 'lag' oder 'differences'"
 
 msgid "'xi' does not have the right length"
 msgstr "'xi' hat nicht die richtige Länge"
@@ -827,14 +827,14 @@
 
 msgid "link \"%s\" not available for gaussian family; available links are %s"
 msgstr ""
-"Link \"%s\" ist für die Gaussfamilie nicht verfügbar; verfügbar sind %s"
+"Link \"%s\" ist für die Gauss-Familie nicht verfügbar; verfügbar sind %s"
 
 msgid "cannot find valid starting values: please specify some"
 msgstr "kann keine Startwerte finden; bitte welche angeben"
 
 msgid "link \"%s\" not available for binomial family; available links are %s"
 msgstr ""
-"Link \"%s\"ist für die Binomialfamilie nicht verfügbar; verfügbar sind %s"
+"Link \"%s\"ist für die Binomial-Familie nicht verfügbar; verfügbar sind %s"
 
 msgid "y values must be 0 <= y <= 1"
 msgstr "y Werte müssen in [0, 1] liegen"
@@ -849,9 +849,9 @@
 "for the 'binomial' family, y must be a vector of 0 and 1's\n"
 "or a 2 column matrix where col 1 is no. successes and col 2 is no. failures"
 msgstr ""
-"für die 'binmial'-Familie muss y entweder ein Vektor aus Nullen und\n"
+"für die 'binomial'-Familie muss y entweder ein Vektor aus Nullen und\n"
 "Einsen oder eine zweispaltige Matrix mit Erfolgen in der ersten und "
-"Mißerfolgen in der zweiten Spalte sein"
+"Misserfolgen in der zweiten Spalte sein"
 
 msgid "cannot simulate from non-integer prior.weights"
 msgstr ""
@@ -860,15 +860,15 @@
 msgid ""
 "link \"%s\" not available for quasibinomial family; available links are %s"
 msgstr ""
-"Link \"%s\" für die Quasibinomialfamilie nicht verfügbar; verfügbar sind %s"
+"Link \"%s\" für die Quasibinomial-Familie nicht verfügbar; verfügbar sind %s"
 
 msgid ""
 "for the 'quasibinomial' family, y must be a vector of 0 and 1's\n"
 "or a 2 column matrix where col 1 is no. successes and col 2 is no. failures"
 msgstr ""
-"für die 'quasibinmial'-Familie muss y entweder ein Vektor aus Nullen und\n"
+"für die 'quasibinomial'-Familie muss y entweder ein Vektor aus Nullen und\n"
 "Einsen oder eine zweispaltige Matrix mit Erfolgen in der ersten und "
-"Mißerfolgen in der zweiten Spalte sein"
+"Misserfolgen in der zweiten Spalte sein"
 
 msgid "link \"%s\" not available for gamma family; available links are %s"
 msgstr ""
@@ -916,7 +916,7 @@
 msgstr "Argument 'sides' muss 1 oder 2 sein"
 
 msgid "'circular' must be logical and not NA"
-msgstr "'circular' muss boole'sch und nicht NA sein"
+msgstr "'circular' muss boolesch und nicht NA sein"
 
 msgid "length of 'init' must equal length of 'filter'"
 msgstr "Länge von 'init' muss der Länge von 'filter' entsprechen"
@@ -925,7 +925,7 @@
 msgstr "'x' muss mindestens 2 Zeilen und Spalten haben"
 
 msgid "'x' has entries too large to be integer"
-msgstr "'x' enthält Einträge, die zu groß für ein Ingeger sind"
+msgstr "'x' enthält Einträge, die zu groß für ein Integer sind"
 
 msgid "'x' has been rounded to integer: %s"
 msgstr "'x' wurde gerundet auf ganze Zahl: %s"
@@ -1034,7 +1034,7 @@
 msgid ""
 "fitting to calculate the null deviance did not converge -- increase 'maxit'?"
 msgstr ""
-"Anpassung um die Null-Abweichung zu berechnen hat nicht konvergiert --\n"
+"Anpassung um die Null-Abweichung zu berechnen hat nicht konvergiert -- "
 "'maxit' erhöhen?"
 
 msgid "value of 'epsilon' must be > 0"
@@ -1118,7 +1118,7 @@
 
 msgid "models with response %s removed because response differs from model 1"
 msgstr ""
-"Modelle mit Antwortvariable %s entfernt, diese sich von Modell 1 "
+"Modelle mit Antwortvariable %s entfernt, da diese sich von Modell 1 "
 "unterscheidet"
 
 msgid "models were not all fitted to the same size of dataset"
@@ -1161,7 +1161,7 @@
 msgstr "Evtl. eine as.hclust.%s()-Methode bereitstellen"
 
 msgid "need dendrograms where all leaves have labels"
-msgstr "benötige Dendrogramme in denen alle Blätter Label haben"
+msgstr "benötige Dendrogramme, in denen alle Blätter Label haben"
 
 msgid "'k' and 'h' must be a scalar"
 msgstr "'k' und 'h' muss ein Skalar sein"
@@ -1176,7 +1176,7 @@
 msgstr "es muss enweder nur 'which' oder nur 'x' angegeben werden"
 
 msgid "all elements of 'which' must be between 1 and %d"
-msgstr "all Elemente von 'which' müssen zwischen 1 und %d liegen"
+msgstr "alle Elemente von 'which' müssen zwischen 1 und %d liegen"
 
 msgid "invalid parameter values"
 msgstr "unzulässige Parameterwerte"
@@ -1197,7 +1197,7 @@
 msgstr "'r' ist kleiner als 0"
 
 msgid "'m' must be numeric with non-negative integers"
-msgstr "'m' muss numerishc mit nicht-negativen, ganzen Zahlen sein"
+msgstr "'m' muss numerisch mit nicht-negativen, ganzen Zahlen sein"
 
 msgid "unknown named kernel"
 msgstr "unbekannter, benannter Kernel"
@@ -1209,7 +1209,7 @@
 msgstr "'coef' hat falsche Länge"
 
 msgid "coefficients do not add to 1"
-msgstr "Koeffizienten addieren sich nicht zu 1 auf"
+msgstr "Koeffizienten addieren sich nicht zu 1"
 
 msgid "'k' is not a kernel"
 msgstr "'k' ist kein Kernel"
@@ -1258,7 +1258,7 @@
 msgstr "'iter.max' muss positiv sein"
 
 msgid "must have same number of columns in 'x' and 'centers'"
-msgstr "'x' und 'centers' müssen die selbe Zahl von Spalten haben"
+msgstr "'x' und 'centers' müssen dieselbe Zahl von Spalten haben"
 
 msgid "'x' is a list, so ignoring argument 'g'"
 msgstr "'x' ist eine Liste, also ignoriere Argument 'g'"
@@ -1328,7 +1328,7 @@
 "Fit handelt"
 
 msgid "essentially perfect fit: summary may be unreliable"
-msgstr "Essentiell ein perfekter Fit: summary kann unzuverlässig sein"
+msgstr "im Wesentlichen ein perfekter Fit: summary kann unzuverlässig sein"
 
 msgid ""
 "lm object does not have a proper 'qr' component.\n"
@@ -1360,11 +1360,11 @@
 "assuming prediction variance inversely proportional to weights used for "
 "fitting"
 msgstr ""
-"nehme die Vorhersagevarianz als umgehrt proportional zu den beim Fit "
+"nehme die Vorhersagevarianz als umgekehrt proportional zu den beim Fit "
 "genutzten Gewichten an"
 
 msgid "Assuming constant prediction variance even though model fit is weighted"
-msgstr "Nehme konstante Vorhersagevarianz an, obwphl gewichtet gefittet wurde"
+msgstr "Nehme konstante Vorhersagevarianz an, obwohl gewichtet gefittet wurde"
 
 msgid "'weights' as formula should be one-sided"
 msgstr "'weights' als Formel sollte einseitig sein"
@@ -1379,13 +1379,13 @@
 msgstr "ungültige Modell QR Matrix"
 
 msgid "non-NA residual length does not match cases used in fitting"
-msgstr "Länge der nicht-NA Rsiduen passt nicht zur Anzahl Fälle im Fit"
+msgstr "Länge der nicht-NA Residuen passt nicht zur Anzahl Fälle im Fit"
 
 msgid "too few cases, n < k"
 msgstr "zu wenig Fälle, n < k"
 
 msgid "predictors must all be numeric"
-msgstr "Prediktoren müssen alle numerisch sein"
+msgstr "Prädiktoren müssen alle numerisch sein"
 
 msgid "'degree' must be 0, 1 or 2"
 msgstr "'degree' muss 0, 1 oder 2 sein"
@@ -1408,18 +1408,18 @@
 msgid ""
 "specified the square of a factor predictor to be dropped when degree = 1"
 msgstr ""
-"das Quadrat eines Faktors als Predictor als zu vernachlässigen angenommen, "
+"das Quadrat eines Faktors als Prädiktor als zu vernachlässigen angenommen, "
 "wenn Grad = 1"
 
 msgid ""
 "specified the square of a predictor to be dropped with only one numeric "
 "predictor"
 msgstr ""
-"das Quadrat eines Predictor als zu vernachlässigen angenommen, wenn nur ein "
-"numerischer Prediktor angegeben"
+"das Quadrat eines Prädiktors als zu vernachlässigen angenommen, wenn nur ein "
+"numerischer Prädiktor angegeben"
 
 msgid "specified parametric for all predictors"
-msgstr "alle Prediktoren als parametrisch spezifiziert"
+msgstr "alle Prädiktoren als parametrisch spezifiziert"
 
 msgid "invalid argument 'span'"
 msgstr "unzulässiges Argument 'span'"
@@ -1443,14 +1443,14 @@
 msgstr "'logLik.lm' ist für multiple Zielgrößen nicht implementiert"
 
 msgid "no \"nobs\" attribute is available"
-msgstr "keine \"nobs\" Attribut verfügbar"
+msgstr "kein \"nobs\" Attribut verfügbar"
 
 msgid "no 'nobs' method is available"
 msgstr "keine 'nobs' Methode verfügbar"
 
 msgid "'margin' must contain names or numbers corresponding to 'table'"
 msgstr ""
-"'margin' muss Namen oder Zahlen enthalten die mit 'table' korrespondieren"
+"'margin' muss Namen oder Zahlen enthalten, die mit 'table' korrespondieren"
 
 msgid "'start' and 'table' must be same length"
 msgstr "'start' und 'table' müssen dieselbe Länge haben"
@@ -1494,10 +1494,10 @@
 msgstr "'x' muss ein 3-dimensionales Array sein"
 
 msgid "if 'x' is not an array, 'y' must be given"
-msgstr "wenn 'x' kein array ist, muss 'y' angegeben werden"
+msgstr "wenn 'x' kein Array ist, muss 'y' angegeben werden"
 
 msgid "if 'x' is not an array, 'z' must be given"
-msgstr "wenn 'x' kein array ist, muss 'z' angegeben werden"
+msgstr "wenn 'x' kein Array ist, muss 'z' angegeben werden"
 
 msgid "'x', 'y', and 'z' must have the same length"
 msgstr "'x', 'y' und 'z' müssen gleich lang sein"
@@ -1509,10 +1509,10 @@
 msgstr "'x' muss quadratisch sein, mindestens 2x2"
 
 msgid "'x' and 'y' must have the same number of levels (minimum 2)"
-msgstr "'x' und 'y' müssen die selbe Zahl Faktorstufen haben (>= 2)"
+msgstr "'x' und 'y' müssen dieselbe Zahl Faktorstufen haben (>= 2)"
 
 msgid "need numeric data"
-msgstr "benötige nummerische Daten"
+msgstr "benötige numerische Daten"
 
 msgid "'mlm' objects with weights are not supported"
 msgstr "Gewichtete 'mlm' Objekte werden nicht unterstützt"
@@ -1524,7 +1524,7 @@
 msgstr "Residuen haben Rang %s < %s"
 
 msgid "'model.tables' is not implemented for multiple responses"
-msgstr "'model.tablee' für multiple Antworten nicht implementiert"
+msgstr "'model.tables' für multiple Antworten nicht implementiert"
 
 msgid "type '%s' is not implemented yet"
 msgstr "Typ '%s' noch nicht implementiert"
@@ -1550,7 +1550,7 @@
 "Standardfehler können über 'se.contrast' berechnet werden"
 
 msgid "SEs for type '%s' are not yet implemented"
-msgstr "SES für Typ '%s' sind noch nicht implementiert"
+msgstr "SEs für Typ '%s' sind noch nicht implementiert"
 
 msgid "na.action must be a function"
 msgstr "na.action muss eine Funktion sein"
@@ -1566,7 +1566,7 @@
 msgstr "kann aus einem Dataframe ohne Spalten keine Formel generieren"
 
 msgid "no terms component nor attribute"
-msgstr "keine terms Komponente noch Attribut"
+msgstr "weder terms Komponente noch Attribut"
 
 msgid "'termlabels' must be a character vector of length at least one"
 msgstr "'termlabels' muss ein Zeichenkettenvektor mit Länge >= 1 sein"
@@ -1582,13 +1582,13 @@
 msgstr "die Variablen %s wurden mit anderen Typen als im Fit angegeben"
 
 msgid "'data' must be a data.frame, not a matrix or an array"
-msgstr "'data' muss ein Dataframe sein, weder Matrix noch array"
+msgstr "'data' muss ein Dataframe sein, weder Matrix noch Array"
 
 msgid "variable '%s' is not a factor"
 msgstr "Variable '%s' is kein Faktor"
 
 msgid "'offset' must be numeric"
-msgstr "'offset' muss nummerisch sein"
+msgstr "'offset' muss numerisch sein"
 
 msgid "model frame and formula mismatch in model.matrix()"
 msgstr "Modellframe und Formel passen in model.matrix() nicht zusammen"
@@ -1655,7 +1655,7 @@
 msgstr "'control' Argument muss eine benannte Liste sein"
 
 msgid "logical 'hessian' argument not allowed.  See documentation."
-msgstr "Boolesches 'hessian' Argument nicht erlaubt. Siehe Dokumentation'"
+msgstr "Boolesches 'hessian' Argument nicht erlaubt. Siehe Dokumentation."
 
 msgid "'params' has wrong length"
 msgstr "'params' hat falsche Länge"
@@ -1667,7 +1667,7 @@
 msgstr "'varying' hat falsche Länge"
 
 msgid "'varying' must be logical, integer or character"
-msgstr "'varying' muss logisch, ganzzahlig oder Charakter sein "
+msgstr "'varying' muss logisch, ganzzahlig oder Zeichenkette sein "
 
 msgid "invalid argument to 'getProfile'"
 msgstr "unzulässiges Argument für 'getProfile'"
@@ -1791,7 +1791,7 @@
 " and there are no factor predictors; no plot no. 5"
 msgstr ""
 "Schätzwerte sind alle = %s\n"
-"und es gibt keine faktoriellen Prediktoren; kein Plot Nr. 5"
+"und es gibt keine faktoriellen Prädiktoren; keinen Plot Nr. 5"
 
 msgid "'x' and 'T' have incompatible length"
 msgstr "'x' und 'T' haben inkompatible Längen"
@@ -1822,8 +1822,8 @@
 
 msgid "exactly one of 'n', 'p1', 'p2', 'power', and 'sig.level' must be NULL"
 msgstr ""
-"genau eine der Variablen  'n', 'p1', 'p2', 'power', und 'sig.level' muss "
-"NULL sein"
+"genau eine der Variablen 'n', 'p1', 'p2', 'power', und 'sig.level' muss NULL "
+"sein"
 
 msgid ""
 "exactly one of 'groups', 'n', 'between.var', 'within.var', 'power', and 'sig."
@@ -1876,7 +1876,8 @@
 msgstr "sowohl 'x' als auch 'covmat' sind angegeben: 'x' wird ignoriert"
 
 msgid "'princomp' can only be used with more units than variables"
-msgstr "'princomp' kann nur mit mehr Einheiten als Variablen genutzt werden"
+msgstr ""
+"'princomp' kann nur mit mehr Beobachtungen als Variablen genutzt werden"
 
 msgid "cannot use 'cor = TRUE' with a constant variable"
 msgstr "kann 'cor=TRUE' mit einer konstanten Variablen nicht nutzen"
@@ -1900,7 +1901,7 @@
 msgstr "Elemente von 'n' müsse positiv sein"
 
 msgid "elements of 'x' must be nonnegative"
-msgstr "Elemente von 'x' myssen nicht-negativ sein"
+msgstr "Elemente von 'x' müssen nicht-negativ sein"
 
 msgid "elements of 'x' must not be greater than those of 'n'"
 msgstr "Elemente von 'x' dürfen nicht größer sein als die in 'n'"
@@ -1936,7 +1937,7 @@
 msgstr "unzulässiges Argument 'c'"
 
 msgid "arguments 'r' and 'c' must have the same sums"
-msgstr "Argumente 'r' und 'c' müssen die selben Summen besitzen"
+msgstr "Argumente 'r' und 'c' müssen dieselben Summen besitzen"
 
 msgid "'relevel' only for factors"
 msgstr "'relevel' nur für Faktoren"
@@ -1945,7 +1946,7 @@
 msgstr "'ref' muss Länge eins haben"
 
 msgid "'ref' must be an existing level"
-msgstr "'ref' muss eine exisiterende Faktorstufe sein"
+msgstr "'ref' muss eine existierende Faktorstufe sein"
 
 msgid "ref = %d must be in 1L:%d"
 msgstr "ref = %d muss in 1L:%d liegen"
@@ -1954,7 +1955,7 @@
 msgstr "'sep' muss eine Zeichenkette sein"
 
 msgid "failed to guess time-varying variables from their names"
-msgstr "konnte die zeit-veränderlichen Variablen nicht aus den Namen raten"
+msgstr "konnte die zeit-veränderlichen Variablen nicht aus den Namen erraten"
 
 msgid "'varying' arguments must be the same length"
 msgstr "'varying' Argumente müssen gleich lang sein"
@@ -2072,7 +2073,7 @@
 msgstr "sowohl 'df' als auch 'cv' angegeben; letzteres wird ignoriert"
 
 msgid "you must supply 1 < df <= n,  n = #{unique x} ="
-msgstr "Es muss df angegeben werden. 1< df <= n, n=#{verschiedene x} ="
+msgstr "Es muss df angegeben werden. 1 < df <= n, n = #{verschiedene x} ="
 
 msgid "NA lev[]; probably smoothing parameter 'spar' way too large!"
 msgstr ""
@@ -2088,13 +2089,13 @@
 msgstr "type = \"partial' ist noch nicht implementiert"
 
 msgid "not a valid \"smooth.spline\" object"
-msgstr "kein zulässiges \"smooth.splie\" Objekt"
+msgstr "kein zulässiges \"smooth.spline\" Objekt"
 
 msgid "'y' must be numeric vector"
 msgstr "'y' muss ein numerischer Vektor sein"
 
 msgid "number of observations in 'x' and 'y' must match."
-msgstr "Anzahl der Beobahtungen in 'x' und 'y' muss übereinstimmen"
+msgstr "Anzahl der Beobachtungen in 'x' und 'y' muss übereinstimmen"
 
 msgid "number of weights must match number of observations."
 msgstr "Anzahl der Gewichte muss mit der Zahl der Beobachtungen übereinstimmen"
@@ -2175,10 +2176,10 @@
 msgstr "unbekannter Zeichenkettenwert für s.window"
 
 msgid "'cutpoints' must be unique in 0 < cuts < 1, but are ="
-msgstr "'cutpoints'müssen in 0 < cuts < 1 eindeutig sein, aber sind ="
+msgstr "'cutpoints' müssen in 0 < cuts < 1 eindeutig sein, aber sind ="
 
 msgid "'cutpoints' must be unique, but are ="
-msgstr "'cutpoits' müssen eindeutig sein, aber sind ="
+msgstr "'cutpoints' müssen eindeutig sein, aber sind ="
 
 msgid "'x' must be between -1 and 1"
 msgstr "'x' muss zwischen -1 und 1 liegen"
@@ -2191,13 +2192,14 @@
 "Anzahl der 'cutpoints' muss eins kleiner sein als die Anzahl der Symbole"
 
 msgid "number of 'cutpoints' must be one more than number of symbols"
-msgstr "Anzahl der 'cutpoint' muss eins kleiner sein als die Zahl der Symbole"
+msgstr ""
+"Anzahl der 'cutpoints' muss eins kleiner sein als die Anzahl der Symbole"
 
 msgid "must have 2 'symbols' for logical 'x' argument"
 msgstr "benötige 2 'symbols' für boolesches 'x' Argument"
 
 msgid "invalid 'abbr.colnames'"
-msgstr "unzulässige 'abbr.collnames'"
+msgstr "unzulässige 'abbr.colnames'"
 
 msgid "'mu' must be a single number"
 msgstr "'mu' muss einzelne Zahl sein"
@@ -2230,31 +2232,31 @@
 msgstr "nicht alle Zeitreihen haben gleiche Frequenz"
 
 msgid "non-intersecting series"
-msgstr "schnittfreie Zeireihen"
+msgstr "schnittfreie Zeitreihen"
 
 msgid "non-time series not of the correct length"
-msgstr "nicht-Zeitreihe het falsche Länge"
+msgstr "nicht-Zeitreihe hat falsche Länge"
 
 msgid "time series contains internal NAs"
-msgstr "Zeireihe enthält innere NAs"
+msgstr "Zeitreihe enthält innere NAs"
 
 msgid "series is corrupt, with no 'tsp' attribute"
-msgstr "Zeitreihe ist korrupt, kein 'tsp' Attribut"
+msgstr "Zeitreihe ist beschädigt, kein 'tsp' Attribut"
 
 msgid "series is corrupt: length %d with 'tsp' implying %d"
-msgstr "Zeitreihe ist korrupt: Länge %d bei 'tsp' das %d impliziert"
+msgstr "Zeitreihe ist beschädigt: Länge %d bei 'tsp' das %d impliziert"
 
 msgid "cannot plot more than 10 series as \"multiple\""
-msgstr "kann nicht mehr als 10 Reihe als \"multiple\" plotten"
+msgstr "kann nicht mehr als 10 Reihen als \"multiple\" plotten"
 
 msgid "scatter plots only for univariate time series"
 msgstr "Scatterplots nur für univariate Zeitreihen"
 
 msgid "'xy.labels' must be logical or character"
-msgstr "'xy.labels' müssen boolesch oder Charakter sein"
+msgstr "'xy.labels' müssen boolesch oder Zeichenkette sein"
 
 msgid "'frequency' and 'deltat' are both supplied and are inconsistent"
-msgstr "'frequncy' und 'deltat' angegeben aber inkosistent."
+msgstr "'frequency' und 'deltat' angegeben aber inkosistent"
 
 msgid "'frequency' not changed"
 msgstr "'frequency' nicht geändert"
@@ -2306,7 +2308,7 @@
 msgstr "'ar' Teil des Modells ist nicht stationär"
 
 msgid "burn-in 'n.start' must be as long as 'ar + ma'"
-msgstr "Vorlaudf 'n.start' muss so lang sein wie 'ar + ma'"
+msgstr "Vorlauf 'n.start' muss so lang sein wie 'ar + ma'"
 
 msgid "'model$order' must be of length 3"
 msgstr "'model$order' muss Länge 3 haben"
@@ -2359,7 +2361,7 @@
 
 msgid "too few distinct input values to fit an asymptotic regression model"
 msgstr ""
-"zu wenig verschiedene Eingabewerte, um asymtotisches REgreesionsmodell "
+"zu wenig verschiedene Eingabewerte, um asymtotisches Regressionsmodell "
 "anzupassen"
 
 msgid "cannot fit an asymptotic regression model to these data"
@@ -2382,10 +2384,11 @@
 "anzupassen"
 
 msgid "must have length of response = length of second argument to 'SSfol'"
-msgstr "es muss Länge der Zielgröße = Länge des zweiten Argumentes gelten"
+msgstr ""
+"es muss Länge der Zielgröße = Länge des zweiten Argumentes für 'SSfol' gelten"
 
 msgid "must have at least 4 observations to fit an 'SSfol' model"
-msgstr "mindestens 4 Beobachtungen nötig, um ein 'ssfol' Modell anzupassen"
+msgstr "mindestens 4 Beobachtungen nötig, um ein 'SSfol' Modell anzupassen"
 
 msgid "too few distinct input values to fit a four-parameter logistic"
 msgstr ""
@@ -2442,11 +2445,6 @@
 msgstr[0] "zusätzliches Argument %s ist nicht aus Klasse \"%s\""
 msgstr[1] "zusätzliche Argumente %s sind nicht aus Klasse \"%s\""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "zusätzliches Argument %s wird verworfen"
-msgstr[1] "zusätzliche Argumente %s werden verworfen"
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%d Faktor ist zu viel für %d Variablen"
@@ -2464,8 +2462,8 @@
 
 msgid "'init' must have %d column"
 msgid_plural "'init' must have 1 or %d columns"
-msgstr[0] "'init'  muss  %d Spalte haben"
-msgstr[1] "'init'  muss  1 oder %d Spalten haben"
+msgstr[0] "'init' muss %d Spalte haben"
+msgstr[1] "'init' muss 1 oder %d Spalten haben"
 
 msgid "X matrix has rank %d, but only %d observation"
 msgid_plural "X matrix has rank %d, but only %d observations"
@@ -2557,6 +2555,14 @@
 msgstr[0] "'start.innov' ist zu kurz: benötige %d Punkt"
 msgstr[1] "'start.innov' ist zu kurz: benötige %d Punkte"
 
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "übrige Argumente ohne Entsprechung werden verworfen"
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "zusätzliches Argument %s wird verworfen"
+#~ msgstr[1] "zusätzliche Argumente %s werden verworfen"
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge' und 'height' passen nicht"
 
diff -Nru r-base-3.2.3/src/library/stats/po/R-fr.po r-base-3.3.1/src/library/stats/po/R-fr.po
--- r-base-3.2.3/src/library/stats/po/R-fr.po	2015-03-18 23:03:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-fr.po	2016-04-27 22:15:21.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 11:23+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -486,6 +486,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr "NA non autorisées dans 'd'"
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr "les distances doivent provenir de 'dist' ou d'une matrice carrée"
 
@@ -498,6 +504,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr "seulement %d des premières  %d valeurs propres sont positives"
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr ""
 "la valeur initiale ne se trouve pas à l'intérieur de la région admissible"
@@ -544,6 +553,10 @@
 msgid "arguments must have the same length"
 msgstr "les arguments doivent avoir la même longueur"
 
+#, fuzzy
+msgid "wrong number of columns in new data:"
+msgstr "le nombre de colonnes de 'x' est incorrect"
+
 msgid "contrasts apply only to factors"
 msgstr "les contrastes s'appliquent uniquement aux facteurs"
 
@@ -701,9 +714,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr "'RowSideColors' doit être un vecteur de caractères de longueur nrow(x)"
 
-msgid "non-matched further arguments are disregarded"
-msgstr "les arguments non nommés ultérieurs sont ignorés"
-
 msgid "argument 'x' must be numeric"
 msgstr "l'argument 'x' doit être numérique"
 
@@ -795,6 +805,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr "certains termes auront des NAs du fait des limites de la méthode"
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr "'x' doit avoir au moins une valeur non manquante"
 
@@ -924,7 +937,10 @@
 "seules les valeurs positives sont autorisées pour la famille 'inverse."
 "gaussian'"
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+#, fuzzy
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr ""
 "le package 'SuppDists' de CRAN est nécessaire pour la famille 'inverse."
 "gaussian'"
@@ -1217,8 +1233,8 @@
 msgid "invalid parameter values"
 msgstr "valeurs des paramètres incorrectes"
 
-msgid "a limit is missing"
-msgstr "il manque une limite"
+msgid "a limit is NA or NaN"
+msgstr ""
 
 msgid "missing values not allowed"
 msgstr "valeurs manquantes non autorisées"
@@ -1451,6 +1467,10 @@
 msgid "only 1-4 predictors are allowed"
 msgstr "pas plus de 4 prédicteurs autorisés"
 
+#, fuzzy
+msgid "invalid NROW(X)"
+msgstr "NCOL(X) incorrect"
+
 msgid "invalid 'y'"
 msgstr "'y' incorrect"
 
@@ -1479,6 +1499,13 @@
 msgid "invalid argument 'degree'"
 msgstr "argument 'degree' incorrect"
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr "aucune observation finie"
+
 msgid "first argument must be a \"loess\" object"
 msgstr "le premier argument doit être un objet \"loess\""
 
@@ -2025,8 +2052,8 @@
 msgid "'varying' arguments must be the same length"
 msgstr "les arguments varying doivent avoir la même longueur"
 
-msgid "'times' is wrong length"
-msgstr "'times' n'a pas la bonne longueur"
+msgid "'lengths(varying)' must all match 'length(times)'"
+msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
 msgstr ""
@@ -2531,11 +2558,6 @@
 msgstr[0] "l'argument supplémentaire %s n'est pas un \"%s\""
 msgstr[1] "les arguments supplémentaires %s ne sont pas des \"%s\""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "argument supplémentaire %s ignorés"
-msgstr[1] "arguments supplémentaires %s ignorés"
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%d facteur, c'est trop pour %d variables"
@@ -2647,6 +2669,20 @@
 msgstr[0] "'start.innov' est trop court : il faut %d point"
 msgstr[1] "'start.innov' est trop court : il faut %d points"
 
+#~ msgid "a limit is missing"
+#~ msgstr "il manque une limite"
+
+#~ msgid "'times' is wrong length"
+#~ msgstr "'times' n'a pas la bonne longueur"
+
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "les arguments non nommés ultérieurs sont ignorés"
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "argument supplémentaire %s ignorés"
+#~ msgstr[1] "arguments supplémentaires %s ignorés"
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge' et 'height' ne se correspondent pas"
 
diff -Nru r-base-3.2.3/src/library/stats/po/R-it.po r-base-3.3.1/src/library/stats/po/R-it.po
--- r-base-3.2.3/src/library/stats/po/R-it.po	2015-03-18 23:03:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-it.po	2016-04-27 22:15:21.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-04-14 18:07+0200\n"
 "Last-Translator: stefano iacus <>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -492,6 +492,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr "valori NA non ammessi in 'd'"
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr ""
 "le distanze devono essere il risultato di 'dist' o una matrice quadrata"
@@ -507,6 +513,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr "alcuni dei primi %d autovalori sono < 0"
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 #, fuzzy
 msgid "initial value is not in the interior of the feasible region"
 msgstr "valore iniziale non ammissimibile"
@@ -553,6 +562,10 @@
 msgid "arguments must have the same length"
 msgstr "gli argomenti devono avere la stessa lunghezza"
 
+#, fuzzy
+msgid "wrong number of columns in new data:"
+msgstr "numero di colonne sbagliate in 'x'"
+
 msgid "contrasts apply only to factors"
 msgstr "i contrasti si applicano solo a variabili factor"
 
@@ -716,10 +729,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr "'RowSideColors' deve essere un vettore carattere di lunghezza nrow(x)"
 
-#, fuzzy
-msgid "non-matched further arguments are disregarded"
-msgstr "argometni extra ignorati"
-
 msgid "argument 'x' must be numeric"
 msgstr "l'argomento 'x' deve essere numerico"
 
@@ -813,6 +822,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr "alcuni termini saranno NA a causa della limitazione del metodo"
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr "'x' deve avere 1 o più valori non mancanti"
 
@@ -951,7 +963,9 @@
 msgstr "sono ammessi solo valori positivi per la famiglia gaussiana inversa"
 
 #, fuzzy
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr "sono ammessi solo valori positivi per la famiglia gaussiana inversa"
 
 msgid "using weights as inverse variances"
@@ -1245,8 +1259,8 @@
 msgid "invalid parameter values"
 msgstr "valori dei parametri non validi"
 
-msgid "a limit is missing"
-msgstr "manca un limite"
+msgid "a limit is NA or NaN"
+msgstr ""
 
 #, fuzzy
 msgid "missing values not allowed"
@@ -1470,6 +1484,10 @@
 msgid "only 1-4 predictors are allowed"
 msgstr "permessi solo 1-4 predittori"
 
+#, fuzzy
+msgid "invalid NROW(X)"
+msgstr "'x' non valida"
+
 msgid "invalid 'y'"
 msgstr "'y' non valida"
 
@@ -1497,6 +1515,13 @@
 msgid "invalid argument 'degree'"
 msgstr "argomento 'omit' non valido"
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr "non ci sono abbastanza osservazioni finite"
+
 msgid "first argument must be a \"loess\" object"
 msgstr "il primo argomento deve essere un oggetto \"loess\""
 
@@ -2058,8 +2083,8 @@
 msgid "'varying' arguments must be the same length"
 msgstr "gli argomenti 'varying' devono avere la stessa lunghezza"
 
-msgid "'times' is wrong length"
-msgstr "'times' ha lunghezza sbagliata"
+msgid "'lengths(varying)' must all match 'length(times)'"
+msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
 msgstr "ci sono record con 'times' mancanti, saranno ignorati"
@@ -2577,12 +2602,6 @@
 msgstr[1] "argometni extra ignorati"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "argometni extra ignorati"
-msgstr[1] "argometni extra ignorati"
-
-#, fuzzy
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%d variabili factor sono troppe per %d variabili"
@@ -2709,6 +2728,22 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "a limit is missing"
+#~ msgstr "manca un limite"
+
+#~ msgid "'times' is wrong length"
+#~ msgstr "'times' ha lunghezza sbagliata"
+
+#, fuzzy
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "argometni extra ignorati"
+
+#, fuzzy
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "argometni extra ignorati"
+#~ msgstr[1] "argometni extra ignorati"
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge' e 'height' in disaccordo!"
 
diff -Nru r-base-3.2.3/src/library/stats/po/R-ja.po r-base-3.3.1/src/library/stats/po/R-ja.po
--- r-base-3.2.3/src/library/stats/po/R-ja.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-ja.po	2016-04-27 22:15:22.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 14:18+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -472,6 +472,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr " 'd' 中�� NA 値�許�れ��ん "
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr " �離� 'dist' ��果��る��正方行列��る必���り�� "
 
@@ -484,6 +490,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr " %d 個�固有値 (最�� %d 個���) ���正�� "
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr " �期値�実行�能�範囲�内部��り��ん "
 
@@ -525,6 +534,10 @@
 msgid "arguments must have the same length"
 msgstr " 引数���長����れ��り��ん "
 
+#, fuzzy
+msgid "wrong number of columns in new data:"
+msgstr " 'x' �列数�間������ "
+
 msgid "contrasts apply only to factors"
 msgstr " 対比�因�����用����ん "
 
@@ -679,9 +692,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr " 'RowSideColors' �長� nrow(x) �文字ベクトル���れ��り��ん "
 
-msgid "non-matched further arguments are disregarded"
-msgstr " 余計�引数���られ��� "
-
 msgid "argument 'x' must be numeric"
 msgstr " 引数 'x' �数値���れ��り��ん "
 
@@ -771,6 +781,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr " メソッド��界����幾���項� NA 値を����ょ� "
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr " 'x' � 1 �以上��欠�値を����れ��り��ん "
 
@@ -894,7 +907,10 @@
 msgid "positive values only are allowed for the 'inverse.gaussian' family"
 msgstr " 'inverse.gaussian' ファミリ��正�値��許�れ��ん "
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+#, fuzzy
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr ""
 " 'inverse.gaussian' ファミリ�� CRAN パッケージ 'SuppDists' �必��� "
 
@@ -1179,8 +1195,8 @@
 msgid "invalid parameter values"
 msgstr " 無効�パラメータ値�� "
 
-msgid "a limit is missing"
-msgstr " �界��り��ん "
+msgid "a limit is NA or NaN"
+msgstr ""
 
 msgid "missing values not allowed"
 msgstr " 欠測値�許�れ��ん "
@@ -1395,6 +1411,10 @@
 msgid "only 1-4 predictors are allowed"
 msgstr " 1-4 個�予測���許�れ��ん "
 
+#, fuzzy
+msgid "invalid NROW(X)"
+msgstr " 無効� NCOL(X) "
+
 msgid "invalid 'y'"
 msgstr " 無効� 'y' "
 
@@ -1419,6 +1439,13 @@
 msgid "invalid argument 'degree'"
 msgstr " 無効�引数 'degree' �� "
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr " 有��観測値��り��ん "
+
 msgid "first argument must be a \"loess\" object"
 msgstr " 最��引数� \"loess\" オブジェクト���れ��り��ん "
 
@@ -1943,8 +1970,8 @@
 msgid "'varying' arguments must be the same length"
 msgstr " 'varying' 引数���長����れ��り��ん "
 
-msgid "'times' is wrong length"
-msgstr " 'times' �長��誤����� "
+msgid "'lengths(varying)' must all match 'length(times)'"
+msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
 msgstr " 時間�欠���記録��り������り除��� "
@@ -2411,10 +2438,6 @@
 msgid_plural "extra arguments %s are not of class \"%s\"s"
 msgstr[0] " 追加入力�れ�引数 %s � \"%s\" クラス���り��ん "
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] " 追加入力�れ�引数 %s �無視�れ��� "
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] " %d 個�因�� %d 個�変数�対���多���� "
@@ -2503,6 +2526,19 @@
 msgid_plural "'start.innov' is too short: need %d points"
 msgstr[0] " 'start.innov' �短����: %d 個�点�必��� "
 
+#~ msgid "a limit is missing"
+#~ msgstr " �界��り��ん "
+
+#~ msgid "'times' is wrong length"
+#~ msgstr " 'times' �長��誤����� "
+
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr " 余計�引数���られ��� "
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] " 追加入力�れ�引数 %s �無視�れ��� "
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr " 'merge' � 'height' ��致�����ん! "
 
diff -Nru r-base-3.2.3/src/library/stats/po/R-ko.po r-base-3.3.1/src/library/stats/po/R-ko.po
--- r-base-3.2.3/src/library/stats/po/R-ko.po	2015-03-31 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-ko.po	2016-04-27 22:15:21.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R stats package
-# src/library/stats/po/R-ko.po
-# 
-# Copyright (C) 1995-2015 The R Core Team
-# 
+# ./stats/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
+#
 # This file is distributed under the same license as the R stats package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,10 +28,10 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "models are not all fitted to the same number of observations"
-msgstr ""
+msgstr "모��합� 사용� 관측치� 개수들� 같지 않습니다."
 
 msgid "empty model supplied"
-msgstr ""
+msgstr "주어진 모�� 없습니다."
 
 msgid "'acf' must be of length two or more"
 msgstr "'acf'는 반드시 길�가 2 �는 그 ���어야 합니다"
@@ -487,6 +490,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr "NA값들� 'd'�서 사용할 수 없습니다"
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr "list.=FALSE가 주어진 경우� eig=TRUE는 사용�지 않습니다."
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr "list.=FALSE가 주어진 경우� x.ret=TRUE는 사용�지 않습니다."
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr "distances는 반드시 'dist'� 결과�거나 정방행렬�어야 합니다"
 
@@ -499,6 +508,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr "처� %2$d개� 고유치들 중 %1$d개만� 양수입니다"
 
+msgid "package 'MASS' must be installed"
+msgstr "패키지 'MASS'가 반드시 설치�어야 합니다."
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr "초기값� feasible region� 내부� 있지 않습니다"
 
@@ -541,6 +553,9 @@
 msgid "arguments must have the same length"
 msgstr "��들� 반드시 같� 길�를 가지고 있어야 합니다"
 
+msgid "wrong number of columns in new data:"
+msgstr ""
+
 msgid "contrasts apply only to factors"
 msgstr "contrasts는 요�들�만 �용합니다"
 
@@ -694,9 +709,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr "'RowSideColors'는 반드시 길� nrow(x)� 문�형 벡터�어야 합니다"
 
-msgid "non-matched further arguments are disregarded"
-msgstr ""
-
 msgid "argument 'x' must be numeric"
 msgstr "�� 'x'는 반드시 수치형�어야 합니다"
 
@@ -710,7 +722,7 @@
 msgstr "'x'와 'weights'는 서로 다른 길�를 가지고 있습니다"
 
 msgid "'weights' must all be finite"
-msgstr ""
+msgstr "'weights'는 모� 유한한 값� 가지고 있어야 합니다. "
 
 msgid "'weights' must not be negative"
 msgstr "'weights'는 반드시 �수�어야 합니다"
@@ -771,7 +783,9 @@
 msgstr "x[]와 prob[]는 반드시 같� 길�를 가지는 벡터�어야 합니다"
 
 msgid "probabilities must be finite, non-negative and not all 0"
-msgstr "확률값들� 반드시 유한(finite)하고, �� 값� 가지지 않아야 하며 모�가 0�어야서는 안�니다."
+msgstr ""
+"확률값들� 반드시 유한(finite)하고, �� 값� 가지지 않아야 하며 모�가 0�어"
+"야서는 안�니다."
 
 msgid "'x' must be non-negative"
 msgstr "'x'는 반드시 �수가 아니어야 합니다"
@@ -785,6 +799,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr "메소드� 한계로 �하여 �부 항들� NA를 가질 것입니다"
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr "'x'는 반드시 한 개 �는 그 ��� 결측�지 않� 값들� 있어야 합니다"
 
@@ -907,8 +924,10 @@
 msgid "positive values only are allowed for the 'inverse.gaussian' family"
 msgstr "'inverse.gaussian' 페밀��서는 양수값들만 사용할 수 있습니다"
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
-msgstr "'inverse.gaussian' 페밀리는 CRAN 패키지 'SuppDists'를 필요로 합니다"
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
+msgstr ""
 
 msgid "using weights as inverse variances"
 msgstr "weights를 inverse variances 로 사용합니다"
@@ -1191,11 +1210,11 @@
 msgid "invalid parameter values"
 msgstr "유효하지 않� 파�미터 값입니다"
 
-msgid "a limit is missing"
-msgstr ""
+msgid "a limit is NA or NaN"
+msgstr "limit� NA �는 NaN�어야 합니다."
 
 msgid "missing values not allowed"
-msgstr ""
+msgstr "결측값들� 사용할 수 없습니다."
 
 msgid "'r' is less than 1"
 msgstr "'r'� 1보다 �습니다"
@@ -1378,7 +1397,7 @@
 msgstr "'object'는 'effects' 구성요소를 가지고 있지 않습니다"
 
 msgid "the 'se.fit' argument is not yet implemented for \"mlm\" objects"
-msgstr ""
+msgstr "'se.fit' ��는 아� \"mlm\" �체� 경우� 구현�지 않았습니다."
 
 msgid "invalid model QR matrix"
 msgstr ""
@@ -1405,6 +1424,9 @@
 msgstr "유효하지 않� NCOL(X)입니다"
 
 msgid "only 1-4 predictors are allowed"
+msgstr "오로지 1-4개� 설명변수만� 허용�니다."
+
+msgid "invalid NROW(X)"
 msgstr ""
 
 msgid "invalid 'y'"
@@ -1431,6 +1453,12 @@
 msgid "invalid argument 'degree'"
 msgstr "유효하지 않� �� 'degree'입니다"
 
+msgid "iterTrace ="
+msgstr ""
+
+msgid "not obeyed as iterations ="
+msgstr ""
+
 msgid "first argument must be a \"loess\" object"
 msgstr "첫번째 ��는 반드시 \"loess\" �체�어야 합니다"
 
@@ -1951,8 +1979,8 @@
 msgid "'varying' arguments must be the same length"
 msgstr "'varying' ��들� 반드시 같� 길��어야 합니다"
 
-msgid "'times' is wrong length"
-msgstr "'times'� 길�가 잘 못�었습니다"
+msgid "'lengths(varying)' must all match 'length(times)'"
+msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
 msgstr "누�� times와 함께 있는 레코드는 �용�지 않� 것입니다"
@@ -2240,7 +2268,8 @@
 msgstr ""
 
 msgid "'xy.labels' must be logical or character"
-msgstr "'xy.labels'는 반드시 논리형(logical) �는 문�형(character)�어야 합니다."
+msgstr ""
+"'xy.labels'는 반드시 논리형(logical) �는 문�형(character)�어야 합니다."
 
 msgid "'frequency' and 'deltat' are both supplied and are inconsistent"
 msgstr "'frequency'와 'deltat' 모� 제공�었으나 서로 �치하지 않습니다."
@@ -2345,47 +2374,73 @@
 
 msgid "too few distinct input values to fit an asymptotic regression model"
 msgstr ""
-"�근회귀모형(asymptotic regression model)� �합하기 하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+"�근회귀모형(asymptotic regression model)� �합하기 하기�는 너무 �� 개수"
+"� 고유한 값(distinct input values)들� 입력�었습니다."
 
 msgid "cannot fit an asymptotic regression model to these data"
-msgstr "�근회귀모형(asymptotic regression model)� 주어진 ��터� �합할 수 없습니다."
+msgstr ""
+"�근회귀모형(asymptotic regression model)� 주어진 ��터� �합할 수 없습니"
+"다."
 
 msgid "too few observations to fit an asymptotic regression model"
-msgstr "�근회귀모형(asymptotic regression model)� �합하기�는 관측치� 수가 너무 �습니다."
+msgstr ""
+"�근회귀모형(asymptotic regression model)� �합하기�는 관측치� 수가 너무 "
+"�습니다."
 
 msgid "too few distinct input values to fit the 'asympOff' model"
-msgstr "'asympOff' 모형� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"'asympOff' 모형� �합하기�는 너무 �� 개수� 고유한 값(distinct input "
+"values)들� 입력�었습니다."
 
 msgid "too few distinct input values to fit the 'asympOrig' model"
-msgstr "'asympOrig' 모형� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"'asympOrig' 모형� �합하기�는 너무 �� 개수� 고유한 값(distinct input "
+"values)들� 입력�었습니다."
 
 msgid "too few distinct input values to fit a biexponential"
-msgstr "biexponent 모형� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"biexponent 모형� �합하기�는 너무 �� 개수� 고유한 값(distinct input "
+"values)들� 입력�었습니다."
 
 msgid "must have length of response = length of second argument to 'SSfol'"
-msgstr "�답변수(response)� 길�는 반드시 'SSfol'� 전달�는 �번째 ��� 길�와 같아야 합니다."
+msgstr ""
+"�답변수(response)� 길�는 반드시 'SSfol'� 전달�는 �번째 ��� 길�와 같"
+"아야 합니다."
 
 msgid "must have at least 4 observations to fit an 'SSfol' model"
-msgstr "'SSfol' 모형� �합하기 위해서는 �어� 4개� 관측치들� 가지고 있어야 합니다. "
+msgstr ""
+"'SSfol' 모형� �합하기 위해서는 �어� 4개� 관측치들� 가지고 있어야 합니"
+"다. "
 
 msgid "too few distinct input values to fit a four-parameter logistic"
-msgstr "4개� 파�미터를 가지는 로지스틱(logistic)� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"4개� 파�미터를 가지는 로지스틱(logistic)� �합하기�는 너무 �� 개수� 고"
+"유한 값(distinct input values)들� 입력�었습니다."
 
 msgid "too few distinct input values to fit a logistic model"
-msgstr "로지스틱 모형(logistic model)� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"로지스틱 모형(logistic model)� �합하기�는 너무 �� 개수� 고유한 값"
+"(distinct input values)들� 입력�었습니다."
 
 msgid "too few distinct input values to fit a Michaelis-Menten model"
-msgstr "Michaelis-Menten model� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"Michaelis-Menten model� �합하기�는 너무 �� 개수� 고유한 값(distinct "
+"input values)들� 입력�었습니다."
 
 msgid "too few distinct input values to fit the Gompertz model"
-msgstr "곰페르츠 모형(Gompertz model)� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+msgstr ""
+"곰페르츠 모형(Gompertz model)� �합하기�는 너무 �� 개수� 고유한 값"
+"(distinct input values)들� 입력�었습니다."
 
 msgid "too few distinct input values to fit the Weibull growth model"
 msgstr ""
-"와�블 성장모형(Weibull growth model)� �합하기�는 너무 �� 개수� 고유한 값(distinct input values)들� 입력�었습니다."
+"와�블 성장모형(Weibull growth model)� �합하기�는 너무 �� 개수� 고유한 "
+"값(distinct input values)들� 입력�었습니다."
 
 msgid "all 'x' values must be non-negative to fit the Weibull growth model"
-msgstr "와�블 성장모형(Weibuill growth model)� �합하기 위해서는 모든 'x'� 값들� 반드시 �� 아닌 수�어야 합니다."
+msgstr ""
+"와�블 성장모형(Weibuill growth model)� �합하기 위해서는 모든 'x'� 값들� "
+"반드시 �� 아닌 수�어야 합니다."
 
 msgid "using the %d/%d row from a combined fit"
 msgid_plural "using the %d/%d rows from a combined fit"
@@ -2411,10 +2466,6 @@
 msgid_plural "extra arguments %s are not of class \"%s\"s"
 msgstr[0] "추가 �� %1$s는 �래스 \"%2$s\"가 아닙니다"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "추가 �� %s는 사용�지 않� 것입니다."
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] ""
@@ -2498,12 +2549,23 @@
 
 msgid "%d observation with NA, NaN or Inf deleted"
 msgid_plural "%d observations with NAs, NaNs and/or Infs deleted"
-msgstr[0] "NA, NaNs 그리고/�는 Infs를 가지는 %d 개� 관측치들� 삭제�었습니다."
+msgstr[0] ""
+"NA, NaNs 그리고/�는 Infs를 가지는 %d 개� 관측치들� 삭제�었습니다."
 
 msgid "'start.innov' is too short: need %d point"
 msgid_plural "'start.innov' is too short: need %d points"
 msgstr[0] ""
 
+#~ msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+#~ msgstr "'inverse.gaussian' 페밀리는 CRAN 패키지 'SuppDists'를 필요로 합니다"
+
+#~ msgid "'times' is wrong length"
+#~ msgstr "'times'� 길�가 잘 못�었습니다"
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "추가 �� %s는 사용�지 않� 것입니다."
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge'와 'height'가 서로 맞아떨어지지 않습니다!"
 
diff -Nru r-base-3.2.3/src/library/stats/po/R-pl.po r-base-3.3.1/src/library/stats/po/R-pl.po
--- r-base-3.2.3/src/library/stats/po/R-pl.po	2015-03-27 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-pl.po	2016-04-27 22:15:21.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 19:01\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,2622 +13,4481 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Poedit-Bookmarks: -1,20,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-msgid "models are not all fitted to the same number of observations"
-msgstr "nie wszystkie modele sÄ… dopasowane do tej samej liczby obserwacji"
+#. R/xtabs.R: gettextf("%s applies only to two-way tables", "xtabs(*, sparse=TRUE)")
+#: R/xtabs.R:0
+msgid "%s applies only to two-way tables"
+msgstr "'%s' stosuje siÄ™ jedynie do dwukierunkowych tabel"
 
-msgid "empty model supplied"
-msgstr "dostarczono pusty model"
+#. R/family.R: gettextf("%s link not recognised", sQuote(link))
+#: R/family.R:0
+msgid "%s link not recognised"
+msgstr "link %s nie został rozpoznany"
 
-msgid "'acf' must be of length two or more"
-msgstr "'acf' musi być długości równej dwa lub więcej"
+#. R/stl.R: gettextf("%s must be 0 or 1", degname)
+#: R/stl.R:0
+msgid "%s must be 0 or 1"
+msgstr "%s musi wynosić 0 lub 1"
 
-msgid "object not interpretable as a factor"
-msgstr "argument 'object' nie jest interpretowalny jako czynnik"
+#. R/contrast.R: gettextf("%s needs package 'Matrix' correctly installed", "contr*(.., sparse=TRUE)")
+#. R/contrast.R: gettextf("%s needs package 'Matrix' correctly installed", "contr*(.., sparse=TRUE)")
+#. R/xtabs.R: gettextf("%s needs package 'Matrix' correctly installed", "xtabs(*, sparse=TRUE)")
+#: R/contrast.R:0 R/xtabs.R:0
+msgid "%s needs package 'Matrix' correctly installed"
+msgstr "'%s' potrzebuje poprawnie zainstalowanego pakietu 'Matrix'"
 
-msgid "cannot fit models without level ('alpha' must not be 0 or FALSE)"
-msgstr ""
-"nie można dopasować do modeli bez poziomu ('alpha' nie może być zerem lub "
-"wartością FALSE)"
+#. R/nlsFunc.R: gettextf("'%s' cannot be of mode '%s'", substitute(object), mode(object))
+#: R/nlsFunc.R:0
+msgid "'%s' cannot be of mode '%s'"
+msgstr "argument '%s' nie może być trybu '%s'"
 
-msgid "'alpha', 'beta' and 'gamma' must be within the unit interval"
+#. R/addmargins.R: stop("'A' must be an array or table")
+#: R/addmargins.R:0
+msgid "'A' must be an array or table"
+msgstr "argument 'A' musi być tablicą lub tabelą"
+
+#. R/dendrogram.R: stop("'ColSideColors' must be a character vector of length ncol(x)")
+#: R/dendrogram.R:0
+msgid "'ColSideColors' must be a character vector of length ncol(x)"
 msgstr ""
-"'alpha', 'beta' oraz 'gamma' muszą być wewnątrz jednostkowego przedziału"
+"argument 'ColSideColors' musi być wektorem tekstowym o długości 'ncol(x)'"
 
-msgid "data must be non-zero for multiplicative Holt-Winters"
-msgstr "dane muszą być niezerowe dla multiplikatywnego modelu Holta-Wintersa"
+#. R/anova.R: stop("'P.values' is TRUE, but 'has.Pvalue' is not")
+#: R/anova.R:0
+msgid "'P.values' is TRUE, but 'has.Pvalue' is not"
+msgstr "argument 'P.values' wynosi TRUE, ale argument 'has.Pvalue' już nie"
 
-msgid "need at least 2 periods to compute seasonal start values"
-msgstr "potrzeba co najmniej 2 okresów aby obliczyć sezonowe wartości startowe"
+#. R/dendrogram.R: stop("'RowSideColors' must be a character vector of length nrow(x)")
+#: R/dendrogram.R:0
+msgid "'RowSideColors' must be a character vector of length nrow(x)"
+msgstr ""
+"argument 'RowSideColors' musi być wektorem tekstowym o długości 'nrow(x)'"
 
-msgid "invalid length(x)"
-msgstr "niepoprawna wartość 'length(x)'"
+#. R/poisson.test.R: stop("'T' must be nonnegative")
+#: R/poisson.test.R:0
+msgid "'T' must be nonnegative"
+msgstr "argument 'T' musi być nieujemny"
 
-msgid "optimization difficulties: %s"
-msgstr "problemy optymalizacji: %s"
+#. R/cor.R: stop("'V' is not a square numeric matrix")
+#: R/cor.R:0
+msgid "'V' is not a square numeric matrix"
+msgstr "'V' nie jest kwadratowÄ… macierzÄ… liczbowÄ…"
 
-msgid "optimization failure"
-msgstr "niepowodzenie optymalizacji"
+#. R/dendrogram.R: stop("'X' is not a dendrogram")
+#: R/dendrogram.R:0
+msgid "'X' is not a dendrogram"
+msgstr "'X' nie jest drzewem celu"
 
-msgid "time series has no or less than 2 periods"
-msgstr "szereg czasowy nie posiada okresów lub ma ich mniej niż 2"
+#. R/lsfit.R: warning("'X' matrix was collinear")
+#: R/lsfit.R:0
+msgid "'X' matrix was collinear"
+msgstr "macierz 'X' była współliniowa"
 
-msgid "the series is entirely NA"
-msgstr "seria jest całkowicie wypełniona wartościami 'NA'"
+#. R/ARMAtheory.R: stop("'acf' must be of length two or more")
+#: R/ARMAtheory.R:0
+msgid "'acf' must be of length two or more"
+msgstr "'acf' musi być długości równej dwa lub więcej"
 
-msgid "frequency must be a positive integer >= 2 for BSM"
+#. R/smspline.R: warning("'all.knots' is TRUE; 'nknots' specification is disregarded")
+#: R/smspline.R:0
+msgid "'all.knots' is TRUE; 'nknots' specification is disregarded"
 msgstr ""
-"częstotliwość musi być dodatnią liczbą całkowitą >= 2 dla Podstawowego "
-"Modelowania Strukturalnego (BSM)"
+"argument 'all.knots' ma wartość TRUE; specyfikacja 'nknots' została odrzucona"
 
-msgid "only implemented for univariate time series"
-msgstr "zaimplementowane tylko dla jednowymiarowego szeregu czasowego"
+#. R/HoltWinters.R: stop("'alpha', 'beta' and 'gamma' must be within the unit interval")
+#: R/HoltWinters.R:0
+msgid "'alpha', 'beta' and 'gamma' must be within the unit interval"
+msgstr ""
+"'alpha', 'beta' oraz 'gamma' muszą być wewnątrz jednostkowego przedziału"
 
-msgid "'x' must be numeric"
-msgstr "argument 'x' musi być liczbą"
+#. R/nls.R: stop("'anova' is only defined for sequences of \"nls\" objects")
+#: R/nls.R:0
+msgid "'anova' is only defined for sequences of \"nls\" objects"
+msgstr "'anova' jest zdefiniowana jedynie dla sekwencji obiektów 'nls'"
 
-msgid "the first value of the time series must not be missing"
-msgstr "pierwsza wartość szeregu czasowego nie może być brakującą"
+#. R/anova.R: stop("'anova' object must have colnames")
+#: R/anova.R:0
+msgid "'anova' object must have colnames"
+msgstr "obiekt klasy \"anova\" musi posiadać nazwy kolumn"
 
-msgid "all parameters were fixed"
-msgstr "wszystkie parametry zostały ustalone"
+#. R/approx.R: stop("'approx' requires n >= 1")
+#: R/approx.R:0
+msgid "'approx' requires n >= 1"
+msgstr "'approx' wymaga n >= 1"
 
-msgid "possible convergence problem: 'optim' gave code = %d and message %s"
-msgstr ""
-"prawdopodobny problem zbieżności: 'optim' zwrócił kod= %d oraz wiadomość %s"
+#. R/ts.R: stop("'ar' part of model is not stationary")
+#: R/ts.R:0
+msgid "'ar' part of model is not stationary"
+msgstr "część 'ar' modelu nie jest stacjonarna"
 
-msgid "no factors in the fitted model"
-msgstr "brak czynników w dopasowanym modelu"
+#. R/density.R: stop("'bw' is not positive.")
+#: R/density.R:0
+msgid "'bw' is not positive."
+msgstr "argument 'bw' nie jest dodatni"
 
-msgid "'which' specified no factors"
-msgstr "'which' nie określa czynników"
+#. R/aggregate.R: stop("'by' must be a list")
+#: R/aggregate.R:0
+msgid "'by' must be a list"
+msgstr "argument 'by' musi być listą"
 
-msgid "'which' specified some non-factors which will be dropped"
-msgstr "'which' określił kilka nie-czynników które zostaną usunięte"
+#. R/kmeans.R: stop("'centers' must be a number or a matrix")
+#: R/kmeans.R:0
+msgid "'centers' must be a number or a matrix"
+msgstr "'centers' musi być liczbą lub macierzą"
 
-msgid "'sampleT' and 'nser' must be integer"
-msgstr "argumenty 'sampleT' oraz 'nser' muszą być liczbami całkowitymi"
+#. R/filter.R: stop("'circular' must be logical and not NA")
+#: R/filter.R:0
+msgid "'circular' must be logical and not NA"
+msgstr ""
+"argument 'circular' musi być wartością logiczną oraz nie może być wartością "
+"NA"
 
-msgid "'lag.max' must be at least 0"
-msgstr "argument 'lag.max' musi wynosić co najmniej 0"
+#. R/kernel.R: stop("'coef' does not have the correct length")
+#: R/kernel.R:0
+msgid "'coef' does not have the correct length"
+msgstr "argument 'coef' nie ma poprawnej długości"
 
-msgid "'lag.max' must be at least 1"
-msgstr "argument 'lag.max' musi wynosić co najmniej 1"
+#. R/kernel.R: stop("'coef' must be a vector")
+#: R/kernel.R:0
+msgid "'coef' must be a vector"
+msgstr "argument 'coef' musi być wektorem"
 
-msgid "NAs in 'x'"
-msgstr "wartości NA w 'x'"
+#. R/aov.R: stop("'coef' must define a contrast, i.e., sum to 0")
+#. R/aov.R: stop("'coef' must define a contrast, i.e., sum to 0")
+#: R/aov.R:0
+msgid "'coef' must define a contrast, i.e., sum to 0"
+msgstr "argument 'coef' musi definiować kontrast, tzn., musi sumować się do 0"
 
-msgid "x$lag must have at least 1 column"
-msgstr "'x$lag' musi mieć jak przynajmniej 1 kolumnę"
+#. R/aov.R: stop("'coef' must have same length as 'contrast.obj'")
+#. R/aov.R: stop("'coef' must have same length as 'contrast.obj'")
+#: R/aov.R:0
+msgid "'coef' must have same length as 'contrast.obj'"
+msgstr "argument 'coef' musi mieć tę samą długość co argument 'contrast.obj'"
 
-msgid "can use ci.type=\"ma\" only if first lag is 0"
-msgstr "można użyć 'ci.type=\"ma\"' tylko jeśli pierwsze opóźnienie wynosi 0"
+#. R/ftable.R: stop("'col.vars' missing or incorrect")
+#: R/ftable.R:0
+msgid "'col.vars' missing or incorrect"
+msgstr "brakuje argumentu 'col.vars' lub jest niepoprawny"
 
-msgid "Page [%d,%d]: i =%s; j =%s"
-msgstr "Strona [%d,%d]: i =%s; j =%s"
+#. R/ansari.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/binom.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/cor.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/fisher.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/mantelhaen.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/prop.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/t.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/var.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#. R/wilcox.test.R: stop("'conf.level' must be a single number between 0 and 1")
+#: R/ansari.test.R:0 R/binom.test.R:0 R/cor.test.R:0 R/fisher.test.R:0
+#: R/mantelhaen.test.R:0 R/prop.test.R:0 R/t.test.R:0 R/var.test.R:0
+#: R/wilcox.test.R:0
+msgid "'conf.level' must be a single number between 0 and 1"
+msgstr "'conf.level' musi być pojedynczą liczbą pomiędzy 0 a 1"
 
-msgid "univariate time series only"
-msgstr "tylko jednowymiarowe szeregi czasowe"
+#. R/nlminb.R: stop("'control' argument must be a named list")
+#. R/nls.R: stop("'control' argument must be a named list")
+#: R/nlminb.R:0 R/nls.R:0
+msgid "'control' argument must be a named list"
+msgstr "argument 'control' musi być nazwaną listą"
 
-msgid "no terms in scope"
-msgstr "brak członów w zakresie"
+#. R/factanal.R: stop("'covmat' is not a valid covariance list")
+#. R/princomp.R: stop("'covmat' is not a valid covariance list")
+#: R/factanal.R:0 R/princomp.R:0
+msgid "'covmat' is not a valid covariance list"
+msgstr "'covmat' nie jest poprawnÄ… listÄ… kowariancji"
 
-msgid "no terms in scope for adding to object"
-msgstr "brak członów w zakresie do dodania do obiektu"
+#. R/factanal.R: stop("'covmat' is of unknown type")
+#. R/princomp.R: stop("'covmat' is of unknown type")
+#: R/factanal.R:0 R/princomp.R:0
+msgid "'covmat' is of unknown type"
+msgstr "'covmat' jest nieznanego typu"
 
-msgid "number of rows in use has changed: remove missing values?"
-msgstr "liczba wierszy w użyciu zmieniła się: usunąć brakujące wartości?"
+#. R/model.tables.R: stop("'cterms' argument must match terms in model object")
+#: R/model.tables.R:0
+msgid "'cterms' argument must match terms in model object"
+msgstr "argument 'cterms' musi zgadzać się z członami w obiekcie modelu"
 
-msgid "attempting model selection on an essentially perfect fit is nonsense"
-msgstr "próba wyboru modelu dla idealnego dopasowania jest bez sensu"
+#. R/symnum.R: gettext("'cutpoints' must be unique in 0 < cuts < 1, but are = ")
+#: R/symnum.R:0
+msgid "'cutpoints' must be unique in 0 < cuts < 1, but are ="
+msgstr "'cutpoints' muszą być unikalne w przedziale '0 < cuts < 1', ale są ="
 
-msgid "F test assumes quasi%s family"
-msgstr "Test Fishera zakłada rodzinę kwazi-%s"
+#. R/symnum.R: gettext("'cutpoints' must be unique, but are = ")
+#: R/symnum.R:0
+msgid "'cutpoints' must be unique, but are ="
+msgstr "'cutpoints' muszą być unikalne, ale są ="
 
-msgid "no 'add1' method implemented for \"mlm\" models"
-msgstr "brak zaimplementowanej metody 'add1' dla modeli 'mlm'"
+#. R/smspline.R: stop("'cv' must not be NA when 'df' is specified")
+#: R/smspline.R:0
+msgid "'cv' must not be NA when 'df' is specified"
+msgstr "argument 'cv' nie może mieć wartości NA, gdy określono argument 'df'"
 
-msgid "scope is not a subset of term labels"
-msgstr "zakres nie jest podzbiorem etykiet członów"
+#. R/models.R: stop("'data' must be a data.frame, not a matrix or an array")
+#. R/models.R: stop("'data' must be a data.frame, not a matrix or an array")
+#: R/models.R:0
+msgid "'data' must be a data.frame, not a matrix or an array"
+msgstr "'data' musi być ramką danych, nie macierzą lub tablicą"
 
-msgid "no 'drop1' method for \"mlm\" models"
-msgstr "brak metody 'drop1' dla modeli 'mlm'"
+#. R/nls.R: stop("'data' must be a list or an environment")
+#: R/nls.R:0
+msgid "'data' must be a list or an environment"
+msgstr "'data' musi być listą albo środowiskiem"
 
-msgid "F test assumes 'quasi%s' family"
-msgstr "Test Fishera zakłada rodzinę kwazi-%s"
+#. R/loess.R: stop("'degree' must be 0, 1 or 2")
+#: R/loess.R:0
+msgid "'degree' must be 0, 1 or 2"
+msgstr "argument 'degree' musi mieć wartość 0, 1, lub 2"
 
-msgid "AIC is not defined for this model, so 'step' cannot proceed"
-msgstr ""
-"Kryterium informacyjne Akaikego nie jest zdefiniowane dla tego modelu, tak "
-"więc 'step' nie może zostać wykonany"
+#. R/contr.poly.R: stop("'degree' must be at least 1")
+#: R/contr.poly.R:0
+msgid "'degree' must be at least 1"
+msgstr "argument 'degree' musi wynosić co najmniej 1"
 
-msgid "AIC is -infinity for this model, so 'step' cannot proceed"
-msgstr ""
-"AIC wynosi minus nieskończoność dla tego modelu, tak więc 'step' nie może "
-"zostać wykonany"
+#. R/contr.poly.R: stop("'degree' must be less than number of unique points")
+#. R/contr.poly.R: stop("'degree' must be less than number of unique points")
+#: R/contr.poly.R:0
+msgid "'degree' must be less than number of unique points"
+msgstr "'degree' musi być mniejsze niż liczba unikalnych punktów"
 
-msgid "'A' must be an array or table"
-msgstr "argument 'A' musi być tablicą lub tabelą"
+#. R/splinefun.R: stop("'deriv' must be between 0 and 3")
+#. R/splinefun.R: stop("'deriv' must be between 0 and 3")
+#: R/splinefun.R:0
+msgid "'deriv' must be between 0 and 3"
+msgstr "argument 'deriv' musi być pomiędzy 0 a 3"
 
-msgid ""
-"length of FUN, %d,\n"
-" does not match the length of the margins, %d"
-msgstr "długość 'FUN', %d, nie zgadza się z długością marginesów, %d"
+#. R/ts.R: warning("'end' value not changed")
+#: R/ts.R:0
+msgid "'end' value not changed"
+msgstr "argument 'end' nie został zmieniony"
 
-msgid "no rows to aggregate"
-msgstr "brak wierszy do zagregowania"
+#. R/glm.R: stop("'family' argument seems not to be a valid family object",     call. = FALSE)
+#: R/glm.R:0
+msgid "'family' argument seems not to be a valid family object"
+msgstr "argument 'family' nie wyglÄ…da na poprawny obiekt rodziny"
 
-msgid "'by' must be a list"
-msgstr "argument 'by' musi być listą"
+#. R/glm.R: stop("'family' not recognized")
+#: R/glm.R:0
+msgid "'family' not recognized"
+msgstr "argument 'family' nie został rozpoznany"
 
-msgid "arguments must have same length"
-msgstr "argumenty muszą mieć tę samą długość"
+#. R/ftable.R: stop("'file' must be a character string or connection")
+#: R/ftable.R:0
+msgid "'file' must be a character string or connection"
+msgstr "argument 'file' musi być łańcuchem tekstowym lub połączeniem"
+
+#. R/filter.R: stop("'filter' is longer than time series")
+#: R/filter.R:0
+msgid "'filter' is longer than time series"
+msgstr "'filter' jest dłuższy niż szeregi czasowe"
+
+#. R/ftable.R: stop("'formula' has '.' in both left and right hand sides")
+#: R/ftable.R:0
+msgid "'formula' has '.' in both left and right hand sides"
+msgstr "'formula' ma '.' po lewej oraz prawej stronie"
+
+#. R/quade.test.R: stop("'formula' missing")
+#: R/quade.test.R:0
+msgid "'formula' missing"
+msgstr "brakuje argumentu 'formula'"
 
+#. R/aggregate.R: stop("'formula' missing or incorrect")
+#. R/ansari.test.R: stop("'formula' missing or incorrect")
+#. R/bartlett.test.R: stop("'formula' missing or incorrect")
+#. R/fligner.test.R: stop("'formula' missing or incorrect")
+#. R/ftable.R: stop("'formula' missing or incorrect")
+#. R/kruskal.test.R: stop("'formula' missing or incorrect")
+#. R/mood.test.R: stop("'formula' missing or incorrect")
+#. R/oneway.test.R: stop("'formula' missing or incorrect")
+#. R/t.test.R: stop("'formula' missing or incorrect")
+#. R/var.test.R: stop("'formula' missing or incorrect")
+#. R/wilcox.test.R: stop("'formula' missing or incorrect")
+#. R/xtabs.R: stop("'formula' missing or incorrect")
+#: R/aggregate.R:0 R/ansari.test.R:0 R/bartlett.test.R:0 R/fligner.test.R:0
+#: R/ftable.R:0 R/kruskal.test.R:0 R/mood.test.R:0 R/oneway.test.R:0
+#: R/t.test.R:0 R/var.test.R:0 R/wilcox.test.R:0 R/xtabs.R:0
 msgid "'formula' missing or incorrect"
 msgstr "brakuje argumentu 'formula' lub jest niepoprawny"
 
+#. R/cor.test.R: stop("'formula' missing or invalid")
+#: R/cor.test.R:0
+msgid "'formula' missing or invalid"
+msgstr "brakuje argumentu 'formula' lub jest niepoprawny"
+
+#. R/aggregate.R: stop("'formula' must have both left and right hand sides")
+#. R/ftable.R: stop("'formula' must have both left and right hand sides")
+#: R/aggregate.R:0 R/ftable.R:0
 msgid "'formula' must have both left and right hand sides"
 msgstr "'formula' musi mieć jednocześnie lewą i prawą stronę"
 
-msgid "cannot change frequency from %g to %g"
-msgstr "nie można zmienić częstotliwości z %g na %g"
-
-msgid "'x' must be coefficient matrix/data frame"
-msgstr "argument 'x' musi być macierzą współczynników lub ramką danych"
+#. R/bartlett.test.R: stop("'formula' should be of the form response ~ group")
+#. R/fligner.test.R: stop("'formula' should be of the form response ~ group")
+#. R/kruskal.test.R: stop("'formula' should be of the form response ~ group")
+#: R/bartlett.test.R:0 R/fligner.test.R:0 R/kruskal.test.R:0
+msgid "'formula' should be of the form response ~ group"
+msgstr "argument 'formula' powinien mieć formę 'zmienna zależna ~ grupa'"
 
-msgid "option \"show.coef.Pvalues\" is invalid: assuming TRUE"
-msgstr "opcja \"show.coef.Pvalues\" jest niepoprawna: zakładanie TRUE"
+#. R/ts.R: stop("'frequency' and 'deltat' are both supplied and are inconsistent")
+#: R/ts.R:0
+msgid "'frequency' and 'deltat' are both supplied and are inconsistent"
+msgstr ""
+"oba argumenty 'frequency' oraz 'deltat' zostały dostarczone oraz oba są "
+"niezgodne"
 
-msgid "'P.values' is TRUE, but 'has.Pvalue' is not"
-msgstr "argument 'P.values' wynosi TRUE, ale argument 'has.Pvalue' już nie"
+#. R/ts.R: warning("'frequency' not changed")
+#: R/ts.R:0
+msgid "'frequency' not changed"
+msgstr "argument 'frequency' nie został zmieniony"
 
-msgid "wrong k / cs.ind"
-msgstr "niepoprawny 'k' / 'cs.ind'"
+#. R/dendrogram.R: gettextf("'height' must be at least %g, the maximal height of its components",     h.max)
+#: R/dendrogram.R:0
+msgid "'height' must be at least %g, the maximal height of its components"
+msgstr ""
+"'height' musi być równe co najmniej %g, maksymalnej wysokości jego "
+"komponentów"
 
-msgid "option \"show.signif.stars\" is invalid: assuming TRUE"
-msgstr "opcja \"show.signif.stars\" jest niepoprawna: zakładanie TRUE"
+#. R/fisher.test.R: warning("'hybrid' is ignored for a 2 x 2 table")
+#: R/fisher.test.R:0
+msgid "'hybrid' is ignored for a 2 x 2 table"
+msgstr "argument 'hybrid' jest ignorowany dla tabeli o wymiarach 2 x 2"
 
-msgid "'anova' object must have colnames"
-msgstr "obiekt klasy \"anova\" musi posiadać nazwy kolumn"
+#. R/plot.lm.R: gettextf("'id.n' must be in {1,..,%d}", n)
+#: R/plot.lm.R:0
+msgid "'id.n' must be in {1,..,%d}"
+msgstr "argument 'id.n' musi być w przedziale {1,..,%d}"
 
-msgid "'conf.level' must be a single number between 0 and 1"
-msgstr "'conf.level' musi być pojedynczą liczbą pomiędzy 0 a 1"
+#. R/arima.R: stop("'init' is of the wrong length")
+#. R/arma0.R: stop("'init' is of the wrong length")
+#: R/arima.R:0 R/arma0.R:0
+msgid "'init' is of the wrong length"
+msgstr "argument 'init' ma niepoprawną długość"
 
-msgid "not enough 'x' observations"
-msgstr "niewystarczajÄ…ca liczba obserwacji 'x'"
+#. R/nlm.R: stop("'interval' must be a vector of length 2")
+#: R/nlm.R:0
+msgid "'interval' must be a vector of length 2"
+msgstr "argument 'interval' musi być wektorem liczbowym o długości 2"
 
-msgid "not enough 'y' observations"
-msgstr "niewystarczajÄ…ca liczba obserwacji 'y'"
+#. R/kmeans.R: stop("'invalid value of 'k'")
+#: R/kmeans.R:0
+msgid "'invalid value of 'k'"
+msgstr "niepoprawna wartość 'k'"
 
-msgid "samples differ in location: cannot compute confidence set, returning NA"
-msgstr ""
-"próby różnią się położeniem: nie można obliczyć przedziału ufności, "
-"zwracanie wartości NA"
+#. R/kmeans.R: stop("'iter.max' must be positive")
+#: R/kmeans.R:0
+msgid "'iter.max' must be positive"
+msgstr "argument 'iter.max' musi być dodatni"
 
-msgid "cannot compute confidence set, returning NA"
-msgstr "nie można obliczyć przedziału ufności, zwracanie wartości NA"
+#. R/loess.R: gettextf("'iterTrace = %s' not obeyed as iterations = %d", iterTrace,     iterations)
+#: R/loess.R:0
+msgid "'iterTrace = %s' not obeyed as iterations = %d"
+msgstr "'iterTrace = %s' nie jest przestrzegane, ponieważ iteracje = %d"
 
-msgid "cannot compute asymptotic confidence set or estimator"
-msgstr "nie można obliczyć asymptotycznego przedziału ufności lub estymatora"
+#. R/identify.hclust.R: stop("'k' and 'h' must be a scalar")
+#: R/identify.hclust.R:0
+msgid "'k' and 'h' must be a scalar"
+msgstr "argumenty 'k' oraz 'h' muszą być skalarami"
 
-msgid "cannot compute estimate, returning NA"
-msgstr "nie można obliczyć estymatora, zwracanie wartości NA"
+#. R/runmed.R: gettextf("'k' is bigger than 'n'!  Changing 'k' to %d", k <- as.integer(1 +     2 * ((n - 1)%/%2)))
+#: R/runmed.R:0
+msgid "'k' is bigger than 'n'!  Changing 'k' to %d"
+msgstr "'k' jest większe niż 'n'!  Zmienianie 'k' na %d"
 
-msgid "cannot compute exact p-value with ties"
-msgstr ""
-"nie można obliczyć dokładnej wartości prawdopodobieństwa z powtórzonymi "
-"wartościami"
+#. R/kernel.R: stop("'k' is not a kernel")
+#. R/kernel.R: stop("'k' is not a kernel")
+#: R/kernel.R:0
+msgid "'k' is not a kernel"
+msgstr "argument 'k' nie jest jÄ…drem"
 
-msgid "cannot compute exact confidence intervals with ties"
-msgstr ""
-"nie można obliczyć dokładnych przedziałów ufności z powtórzonymi wartościami"
+#. R/lag.R: warning("'k' is not an integer")
+#: R/lag.R:0
+msgid "'k' is not an integer"
+msgstr "argument 'k' nie jest liczbą całkowitą"
 
-msgid "grouping factor must have exactly 2 levels"
-msgstr "grupujący czynnik musi mieć dokładnie 2 poziomy"
+#. R/cmdscale.R: stop("'k' must be in {1, 2, ..  n - 1}")
+#: R/cmdscale.R:0
+msgid "'k' must be in {1, 2, ..  n - 1}"
+msgstr "'k' musi być w zakresie {1, 2, ..  n - 1}"
 
-msgid "weights are not supported in a multistratum aov() fit"
-msgstr "wagi nie sÄ… wspierane w wielowarstwowym dopasowaniu 'aov()'"
+#. R/runmed.R: gettextf("'k' must be odd!  Changing 'k' to %d", k <- as.integer(1 +     2 * (k%/%2)))
+#: R/runmed.R:0
+msgid "'k' must be odd!  Changing 'k' to %d"
+msgstr "'k' musi być nieparzyste!  Zmienianie 'k' na %d"
 
-msgid "Error() model is singular"
-msgstr "model 'Error()' jest osobliwy"
+#. R/runmed.R: stop("'k' must be positive")
+#: R/runmed.R:0
+msgid "'k' must be positive"
+msgstr "argument 'k' musi być dodatni"
 
-msgid "the 'split' argument must be a list"
-msgstr "argument 'split' musi być listą"
+#. R/kernel.R: stop("'kernapply' is not available for object 'x'")
+#: R/kernel.R:0
+msgid "'kernapply' is not available for object 'x'"
+msgstr "'kernapply' nie jest dostępny dla obiektu 'x'"
 
-msgid "'coef' must define a contrast, i.e., sum to 0"
-msgstr "argument 'coef' musi definiować kontrast, tzn., musi sumować się do 0"
+#. R/acf.R: stop("'lag.max' must be at least 0")
+#: R/acf.R:0
+msgid "'lag.max' must be at least 0"
+msgstr "argument 'lag.max' musi wynosić co najmniej 0"
 
-msgid "'coef' must have same length as 'contrast.obj'"
-msgstr "argument 'coef' musi mieć tę samą długość co argument 'contrast.obj'"
+#. R/acf.R: stop("'lag.max' must be at least 1")
+#: R/acf.R:0
+msgid "'lag.max' must be at least 1"
+msgstr "argument 'lag.max' musi wynosić co najmniej 1"
 
-msgid "each element of '%s' must be logical"
-msgstr "każdy element '%s' musi być elementem logicznym"
+#. R/logLik.R: stop("'logLik.lm' does not support multiple responses")
+#: R/logLik.R:0
+msgid "'logLik.lm' does not support multiple responses"
+msgstr "funkcja 'logLik.lm()' nie wspiera wielokrotnych zmiennych zależnych"
 
-msgid "the contrast defined is empty (has no TRUE elements)"
-msgstr "zdefiniowany kontrast jest pusty (nie ma elementów TRUE)"
+#. R/mad.R: stop("'low' and 'high' cannot be both TRUE")
+#: R/mad.R:0
+msgid "'low' and 'high' cannot be both TRUE"
+msgstr "'low' oraz 'high' nie mogą jednocześnie być TRUE"
 
-msgid "columns of 'contrast.obj' must define a contrast (sum to zero)"
-msgstr "kolumny 'contrast.obj' muszą określać konstrast (sumować się do zera)"
+#. R/optim.R: stop("'lower' and 'upper' must be finite values")
+#: R/optim.R:0
+msgid "'lower' and 'upper' must be finite values"
+msgstr "'lower' oraz 'upper' muszą być skończonymi wartościami"
 
-msgid "no degrees of freedom for residuals"
-msgstr "brak stopni swobody dla reszt"
+#. R/kernel.R: stop("'m' is less than 1")
+#. R/kernel.R: stop("'m' is less than 1")
+#: R/kernel.R:0
+msgid "'m' is less than 1"
+msgstr "wartość argumentu 'm' jest mniejsza niż 1"
 
-msgid "'object' does not include an error 'qr' component"
-msgstr "argument 'object' nie uwzględnia komponentu błędu 'qr'"
+#. R/kernel.R: stop("'m' must be numeric with non-negative integers")
+#: R/kernel.R:0
+msgid "'m' must be numeric with non-negative integers"
+msgstr "argument 'm' musi być wektorem z nieujemnymi liczbami całkowitymi"
 
-msgid "Refitting model to allow projection"
-msgstr "Ponowne dopasowywanie modelu aby umożliwić rzutowanie"
+#. R/termplot.R: stop("'main' must be TRUE, FALSE, NULL or character (vector).")
+#. R/termplot.R: stop("'main' must be TRUE, FALSE, NULL or character (vector).")
+#: R/termplot.R:0
+msgid "'main' must be TRUE, FALSE, NULL or character (vector)."
+msgstr "'main' musi być TRUE, FALSE, NULL lub być tekstem (wektor)."
 
-msgid "columns of 'contrast.obj' must define a contrast(sum to zero)"
-msgstr "kolumny 'contrast.obj' muszą określać kontrast (sumować się do zera)"
+#. R/loglin.R: stop("'margin' must contain names or numbers corresponding to 'table'")
+#: R/loglin.R:0
+msgid "'margin' must contain names or numbers corresponding to 'table'"
+msgstr ""
+"argument 'margin' musi zawierać nazwy lub liczby odpowiadające argumentowi "
+"'table'"
 
-msgid "collapsing to unique 'x' values"
-msgstr "zwijanie do unikalnych wartości 'x'"
+#. R/dendrogram.R: stop("'margins' must be a numeric vector of length 2")
+#: R/dendrogram.R:0
+msgid "'margins' must be a numeric vector of length 2"
+msgstr "argument 'margins' musi być wektorem liczbowym o długości 2"
 
-msgid "invalid interpolation method"
-msgstr "niepoprawna metoda interpolacji"
+#. R/mlm.R: stop("'mlm' objects with weights are not supported")
+#: R/mlm.R:0
+msgid "'mlm' objects with weights are not supported"
+msgstr "obiekty klasy \"mlm\" z wagami nie sÄ… wspierane"
 
-msgid "need at least two non-NA values to interpolate"
-msgstr "co najmniej dwie wartości nie-NA są wymagane do interpolacji"
+#. R/ts.R: stop("'model$order' must be of length 3")
+#: R/ts.R:0
+msgid "'model$order' must be of length 3"
+msgstr "'model$order' musi być długości 3"
 
-msgid "zero non-NA points"
-msgstr "zero punktów o wartości nie-NA"
+#. R/ts.R: stop("'model' must be list")
+#: R/ts.R:0
+msgid "'model' must be list"
+msgstr "argument 'model' musi być listą"
 
-msgid "'approx' requires n >= 1"
-msgstr "'approx' wymaga n >= 1"
+#. R/model.tables.R: stop("'model.tables' is not implemented for multiple responses")
+#: R/model.tables.R:0
+msgid "'model.tables' is not implemented for multiple responses"
+msgstr ""
+"funkcja 'model.tables()' nie jest zaimplementowana dla wielu zmiennych "
+"zależnych"
 
-msgid "'order.max' must be >= 1"
-msgstr "'order.max' musi być >= 1"
+#. R/t.test.R: stop("'mu' must be a single number")
+#. R/wilcox.test.R: stop("'mu' must be a single number")
+#: R/t.test.R:0 R/wilcox.test.R:0
+msgid "'mu' must be a single number"
+msgstr "argument 'mu' musi być pojedynczą liczbą"
 
-msgid "'order.max' must be < 'n.used'"
-msgstr "argument 'order.max' musi być < argument 'n.used'"
+#. R/fisher.test.R: stop("'mult' must be integer >= 2, typically = 30")
+#: R/fisher.test.R:0
+msgid "'mult' must be integer >= 2, typically = 30"
+msgstr "argument 'mult' musi być liczbą całkowitą >= 2, na ogół = 30"
 
-msgid "zero-variance series"
-msgstr "seria o zerowej wariancji"
+#. R/binom.test.R: stop("'n' must be a positive integer >= 'x'")
+#: R/binom.test.R:0
+msgid "'n' must be a positive integer >= 'x'"
+msgstr "argument 'n' musi być dodatnią liczbą całkowitą >= argumentu 'x'"
+
+#. R/ts.R: stop("'n' must be strictly positive")
+#: R/ts.R:0
+msgid "'n' must be strictly positive"
+msgstr "argument 'n' musi być ściśle dodatni"
 
+#. R/ar.R: stop("'n.ahead' must be at least 1")
+#: R/ar.R:0
 msgid "'n.ahead' must be at least 1"
 msgstr "argument 'n.ahead' musi wynosić co najmniej 1"
 
-msgid "number of series in 'object' and 'newdata' do not match"
-msgstr "liczba serii w 'object' oraz 'newdata' nie zgadzajÄ… siÄ™"
-
-msgid "'se.fit' not yet implemented for multivariate models"
-msgstr ""
-"funkcja 'se.fit()' nie jest jeszcze zaimplementowana dla wielowymiarowych "
-"modeli"
-
-msgid "MLE only implemented for univariate series"
+#. R/prcomp.R: stop("'newdata' does not have named columns matching one or more of the original columns")
+#. R/princomp-add.R: stop("'newdata' does not have named columns matching one or more of the original columns")
+#: R/prcomp.R:0 R/princomp-add.R:0
+msgid ""
+"'newdata' does not have named columns matching one or more of the original "
+"columns"
 msgstr ""
-"Estymacja największej wiarygodności jest zaimplementowana jedynie dla "
-"jednowymiarowych serii"
+"'newdata' nie ma nazwanych kolumn pasujących do jednej lub więcej "
+"oryginalnych kolumn"
 
-msgid "'order.max' must be >= 0"
-msgstr "'order.max' musi być >= 0"
+#. R/prcomp.R: stop("'newdata' does not have the correct number of columns")
+#. R/princomp-add.R: stop("'newdata' does not have the correct number of columns")
+#: R/prcomp.R:0 R/princomp-add.R:0
+msgid "'newdata' does not have the correct number of columns"
+msgstr "'newdata' nie ma poprawnej liczby kolumn"
 
-msgid "'order' must be a non-negative numeric vector of length 3"
-msgstr "'order' musi być nieujemnym wektorem liczbowym o długości 3"
+#. R/prcomp.R: stop("'newdata' must be a matrix or data frame")
+#. R/princomp-add.R: stop("'newdata' must be a matrix or data frame")
+#: R/prcomp.R:0 R/princomp-add.R:0
+msgid "'newdata' must be a matrix or data frame"
+msgstr "'newdata' musi być macierzą lub ramką danych"
 
-msgid "'seasonal' must be a list with component 'order'"
-msgstr "'seasonal' musi być listą z komponentem 'order'"
+#. R/smspline.R: stop("'nknots' must be at least 1")
+#: R/smspline.R:0
+msgid "'nknots' must be at least 1"
+msgstr "argument 'nknots' musi wynosić co najmniej 1"
 
-msgid "'seasonal$order' must be a non-negative numeric vector of length 3"
-msgstr "'seasonal$order' musi być nieujemnym wektorem liczbowym o długości 3"
+#. R/smspline.R: stop("'nknots' must be numeric (in {1,..,n})")
+#: R/smspline.R:0
+msgid "'nknots' must be numeric (in {1,..,n})"
+msgstr "'nknots' musi być liczbą (w przedziale {1,..,n})"
 
-msgid "lengths of 'x' and 'xreg' do not match"
-msgstr "długości argumentów 'x' oraz 'xreg' muszą się zgadzać"
+#. R/ppr.R: stop("'nterms' is missing with no default")
+#: R/ppr.R:0
+msgid "'nterms' is missing with no default"
+msgstr "brakuje wartości dla 'nterms', a nie ma określonej wartości domyślnej"
 
-msgid "wrong length for 'fixed'"
-msgstr "niepoprawna długość dla argumentu 'fixed'"
+#. R/aov.R: stop("'object' does not include an error 'qr' component")
+#: R/aov.R:0
+msgid "'object' does not include an error 'qr' component"
+msgstr "argument 'object' nie uwzględnia komponentu błędu 'qr'"
 
-msgid "some AR parameters were fixed: setting transform.pars = FALSE"
-msgstr ""
-"niektóre parametry autoregresji zostały ustalone: ustawianie 'transform.pars "
-"= FALSE'"
+#. R/lm.R: stop("'object' has no 'effects' component")
+#: R/lm.R:0
+msgid "'object' has no 'effects' component"
+msgstr "'object' nie ma komponentu 'effects'"
 
-msgid "too few non-missing observations"
-msgstr "zbyt mało niebrakujących obserwacji"
+#. R/models.R: stop("'offset' must be numeric")
+#: R/models.R:0
+msgid "'offset' must be numeric"
+msgstr "argument 'offset' musi być liczbą"
 
-msgid "'init' is of the wrong length"
-msgstr "argument 'init' ma niepoprawną długość"
+#. R/fisher.test.R: stop("'or' must be a single number between 0 and Inf")
+#: R/fisher.test.R:0
+msgid "'or' must be a single number between 0 and Inf"
+msgstr "argument 'or' musi być pojedynczą liczbą pomiędzy 0 a Inf"
 
-msgid "non-stationary AR part"
-msgstr "niestacjonarna część autoregresji"
+#. R/arima.R: stop("'order' must be a non-negative numeric vector of length 3")
+#. R/arma0.R: stop("'order' must be a non-negative numeric vector of length 3")
+#: R/arima.R:0 R/arma0.R:0
+msgid "'order' must be a non-negative numeric vector of length 3"
+msgstr "'order' musi być nieujemnym wektorem liczbowym o długości 3"
 
-msgid "non-stationary seasonal AR part"
-msgstr "niestacjonarna sezonowa część autoregresji"
+#. R/dendrogram.R: stop("'order.dendrogram' requires a dendrogram")
+#: R/dendrogram.R:0
+msgid "'order.dendrogram' requires a dendrogram"
+msgstr "'order.dendrogram' wymaga drzewa celu"
 
-msgid "possible convergence problem: optim gave code = %d"
-msgstr "prawdopodobny problem zbieżności: 'optim' zwrócił kod= %d"
+#. R/ar.R: stop("'order.max' must be < 'n.used'")
+#. R/ar.R: stop("'order.max' must be < 'n.used'")
+#. R/ar.R: stop("'order.max' must be < 'n.used'")
+#. R/ar.R: stop("'order.max' must be < 'n.used'")
+#: R/ar.R:0
+msgid "'order.max' must be < 'n.used'"
+msgstr "argument 'order.max' musi być < argument 'n.used'"
 
-msgid "non-stationary AR part from CSS"
-msgstr "niestacjonarna część autoregresji z warunkowej sumy kwadratów"
+#. R/ar.R: stop("'order.max' must be >= 0")
+#. R/ar.R: stop("'order.max' must be >= 0")
+#: R/ar.R:0
+msgid "'order.max' must be >= 0"
+msgstr "'order.max' musi być >= 0"
 
-msgid "non-stationary seasonal AR part from CSS"
-msgstr "niestacjonarna sezonowa część autoregresji z warunkowej sumy kwadratów"
+#. R/ar.R: stop("'order.max' must be >= 1")
+#. R/ar.R: stop("'order.max' must be >= 1")
+#. R/ar.R: stop("'order.max' must be >= 1")
+#: R/ar.R:0
+msgid "'order.max' must be >= 1"
+msgstr "'order.max' musi być >= 1"
 
-msgid "'xreg' and 'newxreg' have different numbers of columns"
-msgstr "'xreg' oraz 'newxreg' mają różne liczby kolumn"
+#. R/binom.test.R: stop("'p' must be a single number between 0 and 1")
+#: R/binom.test.R:0
+msgid "'p' must be a single number between 0 and 1"
+msgstr "argument 'p' musi być pojedynczą liczbą pomiędzy 0 a 1"
 
-msgid "MA part of model is not invertible"
-msgstr "część średniej kroczącej modelu nie jest odwracalna"
+#. R/spectrum.R: stop("'p' must be between 0 and 0.5")
+#: R/spectrum.R:0
+msgid "'p' must be between 0 and 0.5"
+msgstr "argument 'p' musi być pomiędzy 0 a 0.5"
 
-msgid "seasonal MA part of model is not invertible"
-msgstr "sezonowa część średniej kroczącej modelu nie jest odwracalna"
+#. R/prop.test.R: stop("'p' must have the same length as 'x' and 'n'")
+#: R/prop.test.R:0
+msgid "'p' must have the same length as 'x' and 'n'"
+msgstr "argumenty 'p' musi mieć tę samą długość co 'x' oraz 'n'"
 
-msgid "NAs in '%s'"
-msgstr "wartości NA w '%s'"
+#. R/nls-profile.R: stop("'params' has wrong length")
+#: R/nls-profile.R:0
+msgid "'params' has wrong length"
+msgstr "argument 'params' ma niepoprawną długość"
 
-msgid "invalid 'SSinit'"
-msgstr "niepoprawna wartość 'SSinit'"
+#. R/stepfun.R: stop("'plot.stepfun' called with wrong type of argument 'x'")
+#: R/stepfun.R:0
+msgid "'plot.stepfun' called with wrong type of argument 'x'"
+msgstr "'plot.stepfun' wywołana z błędnym typem argumentu 'x'"
 
-msgid "converting non-invertible initial MA values"
-msgstr "konwertowanie nieodwracalnych wartości początkowych kroczącej średniej"
+#. R/ppr.R: stop("'ppr' applies only to numerical variables")
+#: R/ppr.R:0
+msgid "'ppr' applies only to numerical variables"
+msgstr "'ppr' stosuje siÄ™ jedynie do zmiennych liczbowych"
 
-msgid "some ARMA parameters were fixed: setting transform.pars = FALSE"
+#. R/princomp.R: stop("'princomp' can only be used with more units than variables")
+#: R/princomp.R:0
+msgid "'princomp' can only be used with more units than variables"
 msgstr ""
-"niektóre parametry modelu kroczącej średniej autoregresji zostały ustalone: "
-"ustawianie 'transform.pars = FALSE'"
+"'princomp' może zostać użyte jedynie, gdy jednostek jest więcej niż zmiennych"
 
-msgid "'xreg' is collinear"
-msgstr "argument 'xreg' jest współliniowy"
+#. R/nlm.R: stop("'print.level' must be in {0,1,2}")
+#: R/nlm.R:0
+msgid "'print.level' must be in {0,1,2}"
+msgstr "argument 'print.level' musi być liczbą w przedziale [0, 1, 2]"
 
-msgid "NAs present: setting 'delta' to -1"
-msgstr "wartości NA są obecne: ustawianie 'delta' na wartość -1"
+#. R/distn.R: stop("'prob' and 'mu' both specified")
+#. R/distn.R: stop("'prob' and 'mu' both specified")
+#. R/distn.R: stop("'prob' and 'mu' both specified")
+#. R/distn.R: stop("'prob' and 'mu' both specified")
+#: R/distn.R:0
+msgid "'prob' and 'mu' both specified"
+msgstr "określono jednocześnie argumenty 'prob' oraz 'mu'"
 
-msgid "transformed ARMA parameters were fixed"
-msgstr ""
-"przetransformowane parametry kroczącej średniej autoregresji zostały ustalone"
+#. R/quantile.R: stop("'probs' outside [0,1]")
+#: R/quantile.R:0
+msgid "'probs' outside [0,1]"
+msgstr "argument 'probs' jest poza przedziałem [0,1]"
 
-msgid "need at least 2 data points"
-msgstr "potrzeba przynajmniej 2 punktów"
+#. R/proj.R: stop("'proj' is not implemented for multiple responses")
+#. R/proj.R: stop("'proj' is not implemented for multiple responses")
+#: R/proj.R:0
+msgid "'proj' is not implemented for multiple responses"
+msgstr ""
+"funkcja 'proj()' nie jest zaimplementowana dla wielokrotnych zmiennych "
+"zależnych"
 
-msgid "invalid 'x'"
-msgstr "niepoprawna wartość 'x'"
+#. R/kernel.R: stop("'r' is less than 0")
+#: R/kernel.R:0
+msgid "'r' is less than 0"
+msgstr "wartość argumentu 'r' jest mniejsza niż 0"
 
-msgid "invalid 'nb'"
-msgstr "niepoprawna wartość 'nb'"
+#. R/kernel.R: stop("'r' is less than 1")
+#: R/kernel.R:0
+msgid "'r' is less than 1"
+msgstr "wartość argumentu 'r' jest mniejsza niż 1"
 
-msgid "no solution in the specified range of bandwidths"
-msgstr "brak rozwiÄ…zania we wskazanym zakresie pasma"
+#. R/poisson.test.R: stop("'r' must be a single positive number")
+#: R/poisson.test.R:0
+msgid "'r' must be a single positive number"
+msgstr "argument 'r' musi być pojedynczą dodatnią liczbą"
 
-msgid "increasing bw.SJ() search interval (%d) to [%.4g,%.4g]"
-msgstr "zwiększanie przeszukiwanego przedziału 'bw.SJ()' (%d) do [%.4g,%.4g]"
+#. R/var.test.R: stop("'ratio' must be a single positive number")
+#: R/var.test.R:0
+msgid "'ratio' must be a single positive number"
+msgstr "argument 'ratio' musi być pojedynczą dodatnią liczbą"
 
-msgid "minimum occurred at one end of the range"
-msgstr "odnotowano wartość minimalną na jednym z końców zakresu"
-
-msgid "'x' must be a list with at least 2 elements"
-msgstr "'x' musi być listą z co najmniej 2 elementami"
+#. R/relevel.R: stop("'ref' must be an existing level")
+#: R/relevel.R:0
+msgid "'ref' must be an existing level"
+msgstr "'ref' musi być istniejącym poziomem"
 
-msgid "'x' and 'g' must have the same length"
-msgstr "argumenty 'x' oraz 'g' muszą mieć tę samą długość"
+#. R/relevel.R: stop("'ref' must be of length one")
+#: R/relevel.R:0
+msgid "'ref' must be of length one"
+msgstr "argument 'ref' musi być długości 1"
 
-msgid "all observations are in the same group"
-msgstr "wszystkie obserwacje sÄ… w tej samej grupie"
+#. R/relevel.R: stop("'relevel' only for factors")
+#. R/relevel.R: stop("'relevel' only for factors")
+#: R/relevel.R:0
+msgid "'relevel' only for factors"
+msgstr "'relevel' tylko dla czynników"
 
-msgid "there must be at least 2 observations in each group"
-msgstr "potrzeba co najmniej 2 obserwacji w każdej grupie"
+#. R/dendrogram.R: stop("'reorder.dendrogram' requires a dendrogram")
+#: R/dendrogram.R:0
+msgid "'reorder.dendrogram' requires a dendrogram"
+msgstr "'reorder.dendrogram' wymaga drzewa celu"
 
-msgid "'formula' should be of the form response ~ group"
-msgstr "argument 'formula' powinien mieć formę 'zmienna zależna ~ grupa'"
+#. R/ftable.R: stop("'row.var.names' missing")
+#: R/ftable.R:0
+msgid "'row.var.names' missing"
+msgstr "brakuje 'row.var.names'"
 
-msgid "'x' must be nonnegative and integer"
-msgstr "argument 'x' musi być nieujemną liczbą całkowitą"
+#. R/acf.R: stop("'sampleT' and 'nser' must be integer")
+#: R/acf.R:0
+msgid "'sampleT' and 'nser' must be integer"
+msgstr "argumenty 'sampleT' oraz 'nser' muszą być liczbami całkowitymi"
 
-msgid "'n' must be a positive integer >= 'x'"
-msgstr "argument 'n' musi być dodatnią liczbą całkowitą >= argumentu 'x'"
+#. R/biplot.R: warning("'scale' is outside [0, 1]")
+#. R/biplot.R: warning("'scale' is outside [0, 1]")
+#: R/biplot.R:0
+msgid "'scale' is outside [0, 1]"
+msgstr "argument 'scale' jest poza przedziałem [0,1]"
 
-msgid "incorrect length of 'x'"
-msgstr "niepoprawna długość argumentu 'x'"
+#. R/contr.poly.R: stop("'scores' argument is of the wrong length")
+#: R/contr.poly.R:0
+msgid "'scores' argument is of the wrong length"
+msgstr "argument 'scores' ma niepoprawną długość"
 
-msgid "'p' must be a single number between 0 and 1"
-msgstr "argument 'p' musi być pojedynczą liczbą pomiędzy 0 a 1"
+#. R/contr.poly.R: stop("'scores' must all be different numbers")
+#: R/contr.poly.R:0
+msgid "'scores' must all be different numbers"
+msgstr "wszystkie wartości 'scores' muszą być różnymi liczbami"
 
-msgid "length of choices must be 2"
-msgstr "długość 'choices' musi wynosić 2"
+#. R/ar.R: warning("'se.fit' not yet implemented for multivariate models")
+#: R/ar.R:0
+msgid "'se.fit' not yet implemented for multivariate models"
+msgstr ""
+"funkcja 'se.fit()' nie jest jeszcze zaimplementowana dla wielowymiarowych "
+"modeli"
 
-msgid "object '%s' has no scores"
-msgstr "obiekt '%s' nie ma punktów"
+#. R/arima.R: stop("'seasonal$order' must be a non-negative numeric vector of length 3")
+#. R/arma0.R: stop("'seasonal$order' must be a non-negative numeric vector of length 3")
+#: R/arima.R:0 R/arma0.R:0
+msgid "'seasonal$order' must be a non-negative numeric vector of length 3"
+msgstr "'seasonal$order' musi być nieujemnym wektorem liczbowym o długości 3"
 
-msgid "'scale' is outside [0, 1]"
-msgstr "argument 'scale' jest poza przedziałem [0,1]"
+#. R/arima.R: stop("'seasonal' must be a list with component 'order'")
+#. R/arima.R: stop("'seasonal' must be a list with component 'order'")
+#. R/arma0.R: stop("'seasonal' must be a list with component 'order'")
+#. R/arma0.R: stop("'seasonal' must be a list with component 'order'")
+#: R/arima.R:0 R/arma0.R:0
+msgid "'seasonal' must be a list with component 'order'"
+msgstr "'seasonal' musi być listą z komponentem 'order'"
 
-msgid "biplots are not defined for complex PCA"
-msgstr ""
-"wykresy dwuwymiarowego modelu dyspersji dla grup nie sÄ… zdefiniowane dla "
-"analizy zespolonych głównych komponentów"
+#. R/reshape.R: stop("'sep' must be a character string")
+#: R/reshape.R:0
+msgid "'sep' must be a character string"
+msgstr "'sep' musi być łańcuchem tekstowym"
 
-msgid "unequal number of rows in 'cancor'"
-msgstr "nierówna liczba wierszy w 'cancor()'"
+#. R/power.R: stop("'sig.level' must be numeric in [0, 1]")
+#. R/power.R: stop("'sig.level' must be numeric in [0, 1]")
+#. R/power.anova.test.R: stop("'sig.level' must be numeric in [0, 1]")
+#: R/power.R:0 R/power.anova.test.R:0
+msgid "'sig.level' must be numeric in [0, 1]"
+msgstr "argument 'sig.level' musi być liczbą w przedziale [0, 1]"
 
-msgid "dimension 0 in 'x' or 'y'"
-msgstr "zerowy wymiar w argumencie 'x' lub 'y'"
+#. R/smspline.R: stop("'span' must be between 0 and 1.")
+#: R/smspline.R:0
+msgid "'span' must be between 0 and 1."
+msgstr "argument 'span' musi być pomiędzy 0 a 1"
 
-msgid "'x' has rank 0"
-msgstr "argument 'x' ma rangÄ™ 0"
+#. R/smspline.R: stop("'spar' must be of length 1")
+#: R/smspline.R:0
+msgid "'spar' must be of length 1"
+msgstr "argument 'spar' musi mieć długość 1"
 
-msgid "'y' has rank 0"
-msgstr "argument 'y' ma rangÄ™ 0"
+#. R/spline.R: stop("'spline' requires n >= 1")
+#: R/spline.R:0
+msgid "'spline' requires n >= 1"
+msgstr "'spline' wymaga n >= 1"
 
-msgid "'x' and 'y' must have the same length"
-msgstr "argumenty 'x' oraz 'y' muszą mieć tę samą długość"
+#. R/ts.R: stop("'start' > 'end'")
+#: R/ts.R:0
+msgid "'start' > 'end'"
+msgstr "'start' > 'end'"
 
-msgid "'x' and 'y' must have at least 2 levels"
-msgstr "argumenty 'x' oraz 'y' muszą mieć co najmniej 2 poziomy"
+#. R/loglin.R: stop("'start' and 'table' must be same length")
+#: R/loglin.R:0
+msgid "'start' and 'table' must be same length"
+msgstr "argumenty 'start' oraz 'table' muszą mieć tę samą długość"
 
-msgid "all entries of 'x' must be nonnegative and finite"
-msgstr "wszystkie wpisy 'x' muszą być nieujemne oraz skończone"
+#. R/ts.R: stop("'start' cannot be after 'end'")
+#. R/ts.R: stop("'start' cannot be after 'end'")
+#: R/ts.R:0
+msgid "'start' cannot be after 'end'"
+msgstr "'start' nie może być po 'end'"
 
-msgid "at least one entry of 'x' must be positive"
-msgstr "przynajmniej jeden wpis w 'x' musi być dodatni"
+#. R/ts.R: warning("'start' value not changed")
+#: R/ts.R:0
+msgid "'start' value not changed"
+msgstr "argument 'start' nie został zmieniony"
 
-msgid "cannot compute simulated p-value with zero marginals"
+#. R/models.R: stop("'termlabels' must be a character vector of length at least one")
+#: R/models.R:0
+msgid "'termlabels' must be a character vector of length at least one"
 msgstr ""
-"nie można obliczyć symulowanej wartości prawdopodobieństwa z zerowymi "
-"granicami"
-
-msgid "'x' must at least have 2 elements"
-msgstr "'x' musi mieć przynajmniej 2 elementy"
-
-msgid "'x' and 'p' must have the same number of elements"
-msgstr "argumenty 'x' oraz 'p' muszą mieć tę samą liczbę elementów"
+"argument 'termlabels' musi być wektorem tekstowym o długości co najmniej 1"
 
-msgid "probabilities must be non-negative."
-msgstr "prawdopodobieństwa muszą być nieujemne."
+#. R/models.R: gettextf("'termobj' must be a object of class %s", dQuote("terms"))
+#: R/models.R:0
+msgid "'termobj' must be a object of class %s"
+msgstr "argument 'termobj' musi być obiektem klasy %s"
 
-msgid "probabilities must sum to 1."
-msgstr "prawdopodobieństwa muszą sumować się do 1."
+#. R/reshape.R: stop("'times' is wrong length")
+#: R/reshape.R:0
+msgid "'times' is wrong length"
+msgstr "argument 'times' ma niepoprawną długość"
 
-msgid "Chi-squared approximation may be incorrect"
-msgstr "Aproksymacja chi-kwadrat może być niepoprawna"
+#. R/smspline.R: stop("'tol' must be strictly positive and finite")
+#: R/smspline.R:0
+msgid "'tol' must be strictly positive and finite"
+msgstr "argument 'tol' musi być ściśle dodatni i skończony"
 
-msgid "NA values not allowed in 'd'"
-msgstr "wartości NA w argumencie 'd' nie są dozwolone"
+#. R/optim.R: stop("'trace != 0' needs 'REPORT >= 1'")
+#: R/optim.R:0
+msgid "'trace != 0' needs 'REPORT >= 1'"
+msgstr "'trace != 0' potrzebuje 'REPORT >= 1'"
 
-msgid "distances must be result of 'dist' or a square matrix"
-msgstr "odległości muszą być wynikiem 'dist' lub być kwadratową macierzą"
+#. R/ts.R: stop("'ts' object must have one or more observations")
+#: R/ts.R:0
+msgid "'ts' object must have one or more observations"
+msgstr "obiekt 'ts' musi mieć jedną lub więcej obserwacji"
 
-msgid "invalid value of 'n'"
-msgstr "niepoprawna wartość 'n'"
+#. R/family.R: gettextf("'variance' \"%s\" is invalid: possible values are \"mu(1-mu)\", \"mu\", \"mu^2\", \"mu^3\" and \"constant\"",     variance_nm)
+#: R/family.R:0
+msgid ""
+"'variance' \"%s\" is invalid: possible values are \"mu(1-mu)\", \"mu\", "
+"\"mu^2\", \"mu^3\" and \"constant\""
+msgstr ""
+"'variance' '%s' jest niepoprawna: możliwe wartości to: 'mu(1-mu)', 'mu', "
+"'mu^2', 'mu^3' oraz 'constant'"
 
-msgid "'k' must be in {1, 2, ..  n - 1}"
-msgstr "'k' musi być w zakresie {1, 2, ..  n - 1}"
+#. R/reshape.R: stop("'varying' arguments must be the same length")
+#: R/reshape.R:0
+msgid "'varying' arguments must be the same length"
+msgstr "argumenty 'varying' muszą być tej samej długości"
 
-msgid "only %d of the first %d eigenvalues are > 0"
-msgstr "tylko %d pierwszych %d wartości własnych jest > 0"
+#. R/nls-profile.R: stop("'varying' has wrong length")
+#: R/nls-profile.R:0
+msgid "'varying' has wrong length"
+msgstr "argument 'varying' ma niepoprawną długość"
 
-msgid "initial value is not in the interior of the feasible region"
-msgstr "wartość początkowa nie jest wewnątrz możliwego regionu"
+#. R/nls-profile.R: stop("'varying' must be in seq_along(pars)")
+#. R/nls-profile.R: stop("'varying' must be in seq_along(pars)")
+#: R/nls-profile.R:0
+msgid "'varying' must be in seq_along(pars)"
+msgstr "'varying' musi być w przedziale 'seq_along(pars)'"
 
-msgid "Barrier algorithm ran out of iterations and did not converge"
-msgstr "Algorytmowi bariery zabrakło iteracji przez co nie zbiegł się"
+#. R/nls-profile.R: stop("'varying' must be logical, integer or character")
+#: R/nls-profile.R:0
+msgid "'varying' must be logical, integer or character"
+msgstr "'varying' musi być wartością tekstową, logiczną lub liczbą całkowitą"
 
-msgid "Objective function increased at outer iteration %d"
-msgstr "Funkcja celu zwiększyła się w zewnętrznej iteracji %d"
+#. R/reshape.R: stop("'varying' must be nonempty list or vector")
+#: R/reshape.R:0
+msgid "'varying' must be nonempty list or vector"
+msgstr "'varying' musi być niepustą listą lub wektorem"
 
-msgid "Objective function decreased at outer iteration %d"
-msgstr "Funkcja celu zmalała w zewnętrznej iteracji %d"
+#. R/lm.R: stop("'weights' as formula should be one-sided")
+#: R/lm.R:0
+msgid "'weights' as formula should be one-sided"
+msgstr "'weights' jako formuła powinna być jednostronna"
 
-msgid "contrasts not defined for %d degrees of freedom"
-msgstr "kontrasty nie sÄ… zdefiniowane dla %d stopni swobody"
+#. R/density.R: stop("'weights' must all be finite")
+#: R/density.R:0
+msgid "'weights' must all be finite"
+msgstr "argument 'weights' musi w całości być skończony"
 
-msgid ""
-"orthogonal polynomials cannot be represented accurately enough for %d "
-"degrees of freedom"
-msgstr ""
-"ortogonalne wielomiany nie mogą być reprezentowane wystarczająco dokładnie "
-"dla %d stopni swobody"
+#. R/glm.R: stop("'weights' must be a numeric vector")
+#. R/lm.R: stop("'weights' must be a numeric vector")
+#: R/glm.R:0 R/lm.R:0
+msgid "'weights' must be a numeric vector"
+msgstr "argument 'weight' musi być wektorem liczbowym"
 
-msgid "'scores' argument is of the wrong length"
-msgstr "argument 'scores' ma niepoprawną długość"
+#. R/density.R: stop("'weights' must not be negative")
+#: R/density.R:0
+msgid "'weights' must not be negative"
+msgstr "argument 'weights' nie może być ujemny"
 
-msgid "'scores' must all be different numbers"
-msgstr "wszystkie wartości 'scores' muszą być różnymi liczbami"
+#. R/plot.lm.R: stop("'which' must be in 1:6")
+#: R/plot.lm.R:0
+msgid "'which' must be in 1:6"
+msgstr "'which' musi być w przedziale 1:6"
 
-msgid "'degree' must be at least 1"
-msgstr "argument 'degree' musi wynosić co najmniej 1"
+#. R/TukeyHSD.R: stop("'which' specified no factors")
+#: R/TukeyHSD.R:0
+msgid "'which' specified no factors"
+msgstr "'which' nie określa czynników"
 
-msgid "missing values are not allowed in 'poly'"
-msgstr "brakujące wartości w 'poly()' nie są dozwolone"
+#. R/TukeyHSD.R: warning("'which' specified some non-factors which will be dropped")
+#: R/TukeyHSD.R:0
+msgid "'which' specified some non-factors which will be dropped"
+msgstr "'which' określił kilka nie-czynników które zostaną usunięte"
 
-msgid "'degree' must be less than number of unique points"
-msgstr "'degree' musi być mniejsze niż liczba unikalnych punktów"
+#. R/poisson.test.R: stop("'x' and 'T' have incompatible length")
+#: R/poisson.test.R:0
+msgid "'x' and 'T' have incompatible length"
+msgstr "argumenty 'x' oraz 'T' mają niezgodne długości"
 
-msgid "must supply one or more vectors"
-msgstr "potrzeba dostarczyć jeden lub więecj wektorów"
+#. R/bartlett.test.R: stop("'x' and 'g' must have the same length")
+#. R/fligner.test.R: stop("'x' and 'g' must have the same length")
+#. R/kruskal.test.R: stop("'x' and 'g' must have the same length")
+#: R/bartlett.test.R:0 R/fligner.test.R:0 R/kruskal.test.R:0
+msgid "'x' and 'g' must have the same length"
+msgstr "argumenty 'x' oraz 'g' muszą mieć tę samą długość"
 
-msgid "arguments must have the same length"
-msgstr "argumenty muszą mieć tę samą długość"
+#. R/pairwise.R: stop("'x' and 'n' must have the same length")
+#. R/prop.test.R: stop("'x' and 'n' must have the same length")
+#: R/pairwise.R:0 R/prop.test.R:0
+msgid "'x' and 'n' must have the same length"
+msgstr "argumenty 'x' oraz 'n' muszą mieć tę samą długość"
 
-msgid "contrasts apply only to factors"
-msgstr "kontrasty mają zastosowanie jedynie do czynników"
+#. R/chisq.test.R: stop("'x' and 'p' must have the same number of elements")
+#: R/chisq.test.R:0
+msgid "'x' and 'p' must have the same number of elements"
+msgstr "argumenty 'x' oraz 'p' muszą mieć tę samą liczbę elementów"
 
-msgid "contrasts can be applied only to factors with 2 or more levels"
-msgstr ""
-"kontrasty można zastosować jedynie do czynników z dwoma lub więcej poziomami"
+#. R/weighted.mean.R: stop("'x' and 'w' must have the same length")
+#: R/weighted.mean.R:0
+msgid "'x' and 'w' must have the same length"
+msgstr "argumenty 'x' oraz 'w' muszą mieć tę samą długość"
 
-msgid "wrong number of contrast matrix rows"
-msgstr "niepoprawna liczba wierszy macierzy kontrastu"
+#. R/density.R: stop("'x' and 'weights' have unequal length")
+#: R/density.R:0
+msgid "'x' and 'weights' have unequal length"
+msgstr "argumenty 'x' oraz 'weights' mają niezgodne długości"
 
-msgid "singular contrast matrix"
-msgstr "osobliwa macierz kontrastów"
+#. R/chisq.test.R: stop("'x' and 'y' must have at least 2 levels")
+#. R/fisher.test.R: stop("'x' and 'y' must have at least 2 levels")
+#. R/mantelhaen.test.R: stop("'x' and 'y' must have at least 2 levels")
+#: R/chisq.test.R:0 R/fisher.test.R:0 R/mantelhaen.test.R:0
+msgid "'x' and 'y' must have at least 2 levels"
+msgstr "argumenty 'x' oraz 'y' muszą mieć co najmniej 2 poziomy"
 
-msgid "numeric contrasts or contrast name expected"
-msgstr "oczekiwano kontrastów liczbowych lub nazwy kontrastu"
+#. R/chisq.test.R: stop("'x' and 'y' must have the same length")
+#. R/cor.test.R: stop("'x' and 'y' must have the same length")
+#. R/fisher.test.R: stop("'x' and 'y' must have the same length")
+#. R/mcnemar.test.R: stop("'x' and 'y' must have the same length")
+#. R/wilcox.test.R: stop("'x' and 'y' must have the same length")
+#: R/chisq.test.R:0 R/cor.test.R:0 R/fisher.test.R:0 R/mcnemar.test.R:0
+#: R/wilcox.test.R:0
+msgid "'x' and 'y' must have the same length"
+msgstr "argumenty 'x' oraz 'y' muszą mieć tę samą długość"
 
-msgid "%s needs package 'Matrix' correctly installed"
-msgstr "'%s' potrzebuje poprawnie zainstalowanego pakietu 'Matrix'"
+#. R/mcnemar.test.R: stop("'x' and 'y' must have the same number of levels (minimum 2)")
+#: R/mcnemar.test.R:0
+msgid "'x' and 'y' must have the same number of levels (minimum 2)"
+msgstr "'x' oraz 'y' muszą mieć tę samą liczbę poziomów (minimum 2)"
 
-msgid "not enough degrees of freedom to define contrasts"
-msgstr "niewystarczająca liczba stopni swobody do zdefiniowania kontrastów"
+#. R/density.R: stop("'x' contains missing values")
+#: R/density.R:0
+msgid "'x' contains missing values"
+msgstr "argument 'x' zawiera brakujące wartości"
 
-msgid "baseline group number out of range"
-msgstr "numer grupy bazowej jest poza zakresem"
+#. R/fisher.test.R: gettextf("'x' has been rounded to integer: %s", ax)
+#: R/fisher.test.R:0
+msgid "'x' has been rounded to integer: %s"
+msgstr "argument 'x' został zaokrąglony do wartości całkowitej: %s"
 
-msgid "invalid 'use' argument"
-msgstr "niepoprawny argument 'use'"
+#. R/fisher.test.R: stop("'x' has entries too large to be integer")
+#: R/fisher.test.R:0
+msgid "'x' has entries too large to be integer"
+msgstr "argument 'x' posiada wpisy zbyt duże aby były liczbami całkowitymi"
 
-msgid "supply both 'x' and 'y' or a matrix-like 'x'"
-msgstr "dostarcz oba 'x' oraz 'y' lub 'x' przypominajÄ…ce macierz"
+#. R/cancor.R: stop("'x' has rank 0")
+#: R/cancor.R:0
+msgid "'x' has rank 0"
+msgstr "argument 'x' ma rangÄ™ 0"
 
-msgid "'y' must be numeric"
-msgstr "argument 'y' musi być liczbą"
+#. R/kruskal.test.R: warning("'x' is a list, so ignoring argument 'g'")
+#: R/kruskal.test.R:0
+msgid "'x' is a list, so ignoring argument 'g'"
+msgstr "argument 'x' jest listą, więc ignorowanie argumentu 'g'"
 
+#. R/cor.R: stop("'x' is empty")
+#: R/cor.R:0
 msgid "'x' is empty"
 msgstr "argument 'x' jest pusty"
 
-msgid "both 'x' and 'y' must be non-empty"
-msgstr "oba 'x' oraz 'y' muszą być niepuste"
+#. R/kernel.R: stop("'x' is not a kernel")
+#: R/kernel.R:0
+msgid "'x' is not a kernel"
+msgstr "argument 'x' nie jest jÄ…drem"
 
-msgid "cannot handle 'pairwise.complete.obs'"
-msgstr "nie można obsłużyć 'pairwise.complete.obs'"
+#. R/diffinv.R: stop("'x' is not a vector")
+#. R/diffinv.R: stop("'x' is not a vector")
+#. R/kernel.R: stop("'x' is not a vector")
+#: R/diffinv.R:0 R/kernel.R:0
+msgid "'x' is not a vector"
+msgstr "argument 'x' nie jest wektorem"
 
-msgid "'V' is not a square numeric matrix"
-msgstr "'V' nie jest kwadratowÄ… macierzÄ… liczbowÄ…"
+#. R/diffinv.R: stop("'x' is not a vector or matrix")
+#. R/embed.R: stop("'x' is not a vector or matrix")
+#: R/diffinv.R:0 R/embed.R:0
+msgid "'x' is not a vector or matrix"
+msgstr "argument 'x' nie jest wektorem ani macierzÄ…"
 
-msgid "diag(.) had 0 or NA entries; non-finite result is doubtful"
-msgstr "'diag(.)' miał 0 lub wpisy NA; nieskończony rezultat jest wątpliwy"
+#. R/kernel.R: stop("'x' is shorter than kernel 'k'")
+#: R/kernel.R:0
+msgid "'x' is shorter than kernel 'k'"
+msgstr "'x' jest krótsze niż jądro 'k'"
 
-msgid "'x' must be a numeric vector"
-msgstr "argument 'x' musi być wektorem liczbowym"
-
-msgid "'y' must be a numeric vector"
-msgstr "argument 'y' musi być wektorem liczbowym"
+#. R/chisq.test.R: stop("'x' must at least have 2 elements")
+#: R/chisq.test.R:0
+msgid "'x' must at least have 2 elements"
+msgstr "'x' musi mieć przynajmniej 2 elementy"
 
-msgid "not enough finite observations"
-msgstr "niewystarczająca liczba skończonych obserwacji"
+#. R/splinefun.R: stop("'x' must be *strictly* increasing (non - NA)")
+#: R/splinefun.R:0
+msgid "'x' must be *strictly* increasing (non - NA)"
+msgstr "'x' musi być *ściśle* rosnące (nie - NA)"
 
-msgid "Cannot compute exact p-value with ties"
-msgstr ""
-"nie można obliczyć dokładnej wartości prawdopodobieństwa z powtórzonymi "
-"wartościami"
+#. R/mantelhaen.test.R: stop("'x' must be a 3-dimensional array")
+#: R/mantelhaen.test.R:0
+msgid "'x' must be a 3-dimensional array"
+msgstr "'x' musi być 3-wymiarową tablicą"
 
-msgid "'formula' missing or invalid"
-msgstr "brakuje argumentu 'formula' lub jest niepoprawny"
+#. R/bartlett.test.R: stop("'x' must be a list with at least 2 elements")
+#. R/fligner.test.R: stop("'x' must be a list with at least 2 elements")
+#. R/kruskal.test.R: stop("'x' must be a list with at least 2 elements")
+#: R/bartlett.test.R:0 R/fligner.test.R:0 R/kruskal.test.R:0
+msgid "'x' must be a list with at least 2 elements"
+msgstr "'x' musi być listą z co najmniej 2 elementami"
 
-msgid "invalid formula"
-msgstr "niepoprawna formuła"
+#. R/lm.R: stop("'x' must be a matrix")
+#. R/lm.R: stop("'x' must be a matrix")
+#: R/lm.R:0
+msgid "'x' must be a matrix"
+msgstr "'x' musi być macierzą"
 
+#. R/cov.wt.R: stop("'x' must be a matrix or a data frame")
+#: R/cov.wt.R:0
 msgid "'x' must be a matrix or a data frame"
 msgstr "'x' musi być macierzą lub ramką danych"
 
-msgid "'x' must contain finite values only"
-msgstr "'x' musi zawierać tylko skończone wartości"
-
-msgid "length of 'wt' must equal the number of rows in 'x'"
-msgstr "długość 'wt' musi być równa liczbie wierszy w 'x'"
-
-msgid "weights must be non-negative and not all zero"
-msgstr "wagi muszą być nieujemne oraz nie wszystkie równe zero"
-
-msgid "length of 'center' must equal the number of columns in 'x'"
-msgstr "długość 'center' musi równać się liczbie kolumn w 'x'"
-
-msgid "invalid 'tree' ('merge' component)"
-msgstr "niepoprawny argument 'tree' (komponent 'merge')"
+#. R/dendrogram.R: stop("'x' must be a numeric matrix")
+#: R/dendrogram.R:0
+msgid "'x' must be a numeric matrix"
+msgstr "'x' musi być macierzą liczbową"
 
-msgid "either 'k' or 'h' must be specified"
-msgstr "jedno z 'k' lub 'h' musi zostać określone"
+#. R/cor.test.R: stop("'x' must be a numeric vector")
+#: R/cor.test.R:0
+msgid "'x' must be a numeric vector"
+msgstr "argument 'x' musi być wektorem liczbowym"
 
-msgid "the 'height' component of 'tree' is not sorted (increasingly)"
-msgstr "komponent 'height' w 'tree' nie jest (rosnÄ…co) posortowany"
+#. R/spectrum.R: stop("'x' must be a time series or an ar() fit")
+#: R/spectrum.R:0
+msgid "'x' must be a time series or an ar() fit"
+msgstr "'x' musi być szeregiem czasowym lub dopasowaniem 'ar()'"
 
-msgid "elements of 'k' must be between 1 and %d"
-msgstr "elementy 'k' muszą być pomiędzy 1 a %d"
+#. R/ftable.R: stop("'x' must be an \"ftable\" object")
+#. R/ftable.R: stop("'x' must be an \"ftable\" object")
+#. R/ftable.R: stop("'x' must be an \"ftable\" object")
+#: R/ftable.R:0
+msgid "'x' must be an \"ftable\" object"
+msgstr "argument 'mu' musi być obiektem klasy \"ftable\""
 
-msgid ""
-"dendrogram entries must be 1,2,..,%d (in any order), to be coercible to "
-"\"hclust\""
-msgstr ""
-"wpisy dendrogramu muszą wynosić 1,2,..,%d (w dowolnej kolejności), aby mogły "
-"być przekształcale na obiekt klasy \"hclust\""
+#. R/symnum.R: gettextf("'x' must be between %s and %s", format(minc), format(maxc))
+#: R/symnum.R:0
+msgid "'x' must be between %s and %s"
+msgstr "argument 'x' musi być pomiędzy %s a %s"
 
-msgid "dendrogram node with non-positive #{branches}"
-msgstr "węzeł drzewa celów z wartościami nie-dodatnimi #{gałęziami}"
+#. R/symnum.R: gettext("'x' must be between -1 and 1")
+#: R/symnum.R:0
+msgid "'x' must be between -1 and 1"
+msgstr "wartość 'x' musi być pomiędzy -1 a 1"
 
-msgid "midcache() of non-binary dendrograms only partly implemented"
-msgstr ""
-"'midcache()' dla niebinarnych drzew celu tylko częściowo zaimplementowane"
+#. R/smspline.R: stop("'x' must be between 0 and 1 for periodic smooth")
+#: R/smspline.R:0
+msgid "'x' must be between 0 and 1 for periodic smooth"
+msgstr "'x' musi być pomiedzy 0 a 1 dla periodycznego wygładzania"
 
-msgid "non-leaf subtree of length 0"
-msgstr "bezlistne poddrzewo o długości 0"
+#. R/anova.R: stop("'x' must be coefficient matrix/data frame")
+#: R/anova.R:0
+msgid "'x' must be coefficient matrix/data frame"
+msgstr "argument 'x' musi być macierzą współczynników lub ramką danych"
 
-msgid "'order.dendrogram' requires a dendrogram"
-msgstr "'order.dendrogram' wymaga drzewa celu"
+#. R/poisson.test.R: stop("'x' must be finite, nonnegative, and integer")
+#: R/poisson.test.R:0
+msgid "'x' must be finite, nonnegative, and integer"
+msgstr "argument 'x' musi być skończoną nieujemną liczbą całkowitą"
 
-msgid "'reorder.dendrogram' requires a dendrogram"
-msgstr "'reorder.dendrogram' wymaga drzewa celu"
+#. R/distn.R: stop("'x' must be non-negative")
+#: R/distn.R:0
+msgid "'x' must be non-negative"
+msgstr "argument 'x' musi być nieujemny"
 
-msgid "invalid (length 0) node in dendrogram"
-msgstr "niepoprawny (długość równa 0) węzeł w drzewie celu"
+#. R/binom.test.R: stop("'x' must be nonnegative and integer")
+#: R/binom.test.R:0
+msgid "'x' must be nonnegative and integer"
+msgstr "argument 'x' musi być nieujemną liczbą całkowitą"
 
-msgid "dendrogram non-leaf node with non-positive #{branches}"
-msgstr "bezliściowy węzeł drzewa celu z wartościami nie-dodatnimi #{gałęziami}"
+#. R/StructTS.R: stop("'x' must be numeric")
+#. R/acf.R: stop("'x' must be numeric")
+#. R/acf.R: stop("'x' must be numeric")
+#. R/ar.R: stop("'x' must be numeric")
+#. R/ar.R: stop("'x' must be numeric")
+#. R/ar.R: stop("'x' must be numeric")
+#. R/arima.R: stop("'x' must be numeric")
+#. R/arma0.R: stop("'x' must be numeric")
+#. R/cor.R: stop("'x' must be numeric")
+#. R/wilcox.test.R: stop("'x' must be numeric")
+#: R/StructTS.R:0 R/acf.R:0 R/ar.R:0 R/arima.R:0 R/arma0.R:0 R/cor.R:0
+#: R/wilcox.test.R:0
+msgid "'x' must be numeric"
+msgstr "argument 'x' musi być liczbą"
 
-msgid "'height' must be at least %g, the maximal height of its components"
+#. R/mcnemar.test.R: stop("'x' must be square with at least two rows and columns")
+#: R/mcnemar.test.R:0
+msgid "'x' must be square with at least two rows and columns"
 msgstr ""
-"'height' musi być równe co najmniej %g, maksymalnej wysokości jego "
-"komponentów"
+"'x' musi być kwadratową macierzą z co najmniej dwoma wierszami oraz kolumnami"
 
-msgid "'X' is not a dendrogram"
-msgstr "'X' nie jest drzewem celu"
+#. R/cov.wt.R: stop("'x' must contain finite values only")
+#: R/cov.wt.R:0
+msgid "'x' must contain finite values only"
+msgstr "'x' musi zawierać tylko skończone wartości"
 
-msgid "'x' must be a numeric matrix"
-msgstr "'x' musi być macierzą liczbową"
+#. R/ecdf.R: stop("'x' must have 1 or more non-missing values")
+#: R/ecdf.R:0
+msgid "'x' must have 1 or more non-missing values"
+msgstr "'x' musi mieć 1 lub więcej niebrakujących wartości"
+
+#. R/pairwise.R: stop("'x' must have 2 columns")
+#. R/prop.test.R: stop("'x' must have 2 columns")
+#: R/pairwise.R:0 R/prop.test.R:0
+msgid "'x' must have 2 columns"
+msgstr "'x' musi mieć 2 kolumny"
 
+#. R/dendrogram.R: stop("'x' must have at least 2 rows and 2 columns")
+#: R/dendrogram.R:0
 msgid "'x' must have at least 2 rows and 2 columns"
 msgstr "'x' musi mieć przynajmniej 2 wiersze oraz 2 kolumny"
 
-msgid "'margins' must be a numeric vector of length 2"
-msgstr "argument 'margins' musi być wektorem liczbowym o długości 2"
+#. R/fisher.test.R: stop("'x' must have at least 2 rows and columns")
+#: R/fisher.test.R:0
+msgid "'x' must have at least 2 rows and columns"
+msgstr "argument 'x' musi mieć przynajmniej 2 wiersze oraz 2 kolumny"
 
-msgid "row dendrogram ordering gave index of wrong length"
-msgstr ""
-"porządkowanie drzewa celu względem wierszy zwróciło indeks o niepoprawnej "
-"długości"
+#. R/stepfun.R: stop("'x' must have length >= 1")
+#: R/stepfun.R:0
+msgid "'x' must have length >= 1"
+msgstr "argument 'x' musi mieć długość >= 1"
 
-msgid "Colv = \"Rowv\" but nrow(x) != ncol(x)"
-msgstr "'Colv = \"Rowv\"', ale 'nrow(x) != ncol(x)'"
+#. R/mantelhaen.test.R: stop("'x', 'y', and 'z' must have the same length")
+#: R/mantelhaen.test.R:0
+msgid "'x', 'y', and 'z' must have the same length"
+msgstr "argumenty 'x', 'y' oraz 'z' muszą mieć tę samą długość"
 
-msgid "column dendrogram ordering gave index of wrong length"
-msgstr ""
-"porządkowanie drzewa celu względem kolumn zwróciło indeks o niepoprawnej "
-"długości"
+#. R/diffinv.R: stop("'xi' does not have the right length")
+#: R/diffinv.R:0
+msgid "'xi' does not have the right length"
+msgstr "'xi' nie ma poprawnej długości"
 
-msgid "'ColSideColors' must be a character vector of length ncol(x)"
-msgstr ""
-"argument 'ColSideColors' musi być wektorem tekstowym o długości 'ncol(x)'"
+#. R/arima.R: stop("'xreg' and 'newxreg' have different numbers of columns")
+#. R/arma0.R: stop("'xreg' and 'newxreg' have different numbers of columns")
+#: R/arima.R:0 R/arma0.R:0
+msgid "'xreg' and 'newxreg' have different numbers of columns"
+msgstr "'xreg' oraz 'newxreg' mają różne liczby kolumn"
 
-msgid "'RowSideColors' must be a character vector of length nrow(x)"
-msgstr ""
-"argument 'RowSideColors' musi być wektorem tekstowym o długości 'nrow(x)'"
+#. R/arma0.R: stop("'xreg' is collinear")
+#: R/arma0.R:0
+msgid "'xreg' is collinear"
+msgstr "argument 'xreg' jest współliniowy"
 
-msgid "non-matched further arguments are disregarded"
-msgstr "dalsze niedopasowane argumenty zostały odrzucone"
+#. R/ts.R: stop("'xy.labels' must be logical or character")
+#: R/ts.R:0
+msgid "'xy.labels' must be logical or character"
+msgstr "'xy.labels' musi być tekstem lub zmienną logiczną"
 
-msgid "argument 'x' must be numeric"
-msgstr "argument 'x' musi być liczbą"
+#. R/cancor.R: stop("'y' has rank 0")
+#: R/cancor.R:0
+msgid "'y' has rank 0"
+msgstr "argument 'y' ma rangÄ™ 0"
 
-msgid "'x' contains missing values"
-msgstr "argument 'x' zawiera brakujące wartości"
+#. R/t.test.R: stop("'y' is missing for paired test")
+#. R/wilcox.test.R: stop("'y' is missing for paired test")
+#: R/t.test.R:0 R/wilcox.test.R:0
+msgid "'y' is missing for paired test"
+msgstr "brakuje 'y' do sparowanego testu"
 
-msgid "invalid value of length(x)"
-msgstr "niepoprawna wartość 'length(x)'"
+#. R/cor.test.R: stop("'y' must be a numeric vector")
+#: R/cor.test.R:0
+msgid "'y' must be a numeric vector"
+msgstr "argument 'y' musi być wektorem liczbowym"
 
-msgid "'x' and 'weights' have unequal length"
-msgstr "argumenty 'x' oraz 'weights' mają niezgodne długości"
+#. R/spline.R: stop("'y' must be increasing or decreasing")
+#. R/splinefun.R: stop("'y' must be increasing or decreasing")
+#: R/spline.R:0 R/splinefun.R:0
+msgid "'y' must be increasing or decreasing"
+msgstr "'y' musi być rosnące lub malejące"
 
-msgid "'weights' must all be finite"
-msgstr "argument 'weights' musi w całości być skończony"
+#. R/cor.R: stop("'y' must be numeric")
+#. R/wilcox.test.R: stop("'y' must be numeric")
+#: R/cor.R:0 R/wilcox.test.R:0
+msgid "'y' must be numeric"
+msgstr "argument 'y' musi być liczbą"
 
-msgid "'weights' must not be negative"
-msgstr "argument 'weights' nie może być ujemny"
+#. R/ks.test.R: stop("'y' must be numeric or a function or a string naming a valid function")
+#: R/ks.test.R:0
+msgid "'y' must be numeric or a function or a string naming a valid function"
+msgstr ""
+"'y' musi być liczbą lub funkcją lub łańcuchem o poprawnej nazwie funkcji"
 
-msgid "sum(weights) != 1  -- will not get true density"
-msgstr "'sum(weights)  !=  1' -- nie uzyska się prawdziwej gęstości"
+#. R/smspline.R: stop("'y' must be numeric vector")
+#: R/smspline.R:0
+msgid "'y' must be numeric vector"
+msgstr "argument 'y' musi być wektorem liczbowym"
 
-msgid "need at least 2 points to select a bandwidth automatically"
+#. R/stepfun.R: stop("'y' must be one longer than 'x'")
+#: R/stepfun.R:0
+msgid "'y' must be one longer than 'x'"
+msgstr "'y' musi być o jeden dłuższy niż 'x'"
+
+#. R/friedman.test.R: stop("'y', 'groups' and 'blocks' must have the same length")
+#. R/quade.test.R: stop("'y', 'groups' and 'blocks' must have the same length")
+#: R/friedman.test.R:0 R/quade.test.R:0
+msgid "'y', 'groups' and 'blocks' must have the same length"
+msgstr "argumenty 'y', 'groups' oraz 'block' muszą mieć tę samą długość"
+
+#. R/smspline.R: message(".nknots.smspl() is now exported; use it instead of n.knots()")
+#: R/smspline.R:0
+msgid ".nknots.smspl() is now exported; use it instead of n.knots()"
 msgstr ""
-"co najmniej 2 punkty są potrzebne aby automatycznie wybrać szerokość pasma"
+"funkcja '.nknots.smspl()' jest już eksportowana,; użyj jej zamiast funkcji "
+"'n.knots()'"
 
-msgid "unknown bandwidth rule"
-msgstr "nieznana reguła szerokości pasma"
+#. R/lm.R: stop("0 (non-NA) cases")
+#. R/lm.R: stop("0 (non-NA) cases")
+#: R/lm.R:0
+msgid "0 (non-NA) cases"
+msgstr "0 przypadków (nie o wartości NA)"
 
-msgid "non-finite 'bw'"
-msgstr "nieskończony argument 'bw'"
+#. R/glm.R: stop("0s in V(mu)")
+#: R/glm.R:0
+msgid "0s in V(mu)"
+msgstr "zera w 'V(mu)'"
 
-msgid "'bw' is not positive."
-msgstr "argument 'bw' nie jest dodatni"
+#. R/add.R: stop("AIC is -infinity for this model, so 'step' cannot proceed")
+#: R/add.R:0
+msgid "AIC is -infinity for this model, so 'step' cannot proceed"
+msgstr ""
+"AIC wynosi minus nieskończoność dla tego modelu, tak więc 'step' nie może "
+"zostać wykonany"
 
-msgid "non-finite 'from'"
-msgstr "nieskończony argument 'from'"
+#. R/add.R: stop("AIC is not defined for this model, so 'step' cannot proceed")
+#: R/add.R:0
+msgid "AIC is not defined for this model, so 'step' cannot proceed"
+msgstr ""
+"Kryterium informacyjne Akaikego nie jest zdefiniowane dla tego modelu, tak "
+"więc 'step' nie może zostać wykonany"
 
-msgid "non-finite 'to'"
-msgstr "nieskończony argument 'to'"
+#. R/lm.R: warning("ANOVA F-tests on an essentially perfect fit are unreliable")
+#: R/lm.R:0
+msgid "ANOVA F-tests on an essentially perfect fit are unreliable"
+msgstr "Testy ANOVA Fishera w istocie na idealnym dopasowaniu sÄ… niewiarygodne"
 
-msgid "invalid formula in deriv"
-msgstr "niepoprawna formuła w 'deriv()'"
+#. R/lm.R: warning("Assuming constant prediction variance even though model fit is weighted\n")
+#: R/lm.R:0
+msgid "Assuming constant prediction variance even though model fit is weighted"
+msgstr ""
+"Zakładanie stałości przewidywanej wariancji mimo iż dopasowanie modelu jest "
+"ważone"
 
-msgid "'x' is not a vector"
-msgstr "argument 'x' nie jest wektorem"
+#. R/constrOptim.R: gettext("Barrier algorithm ran out of iterations and did not converge")
+#: R/constrOptim.R:0
+msgid "Barrier algorithm ran out of iterations and did not converge"
+msgstr "Algorytmowi bariery zabrakło iteracji przez co nie zbiegł się"
 
-msgid "bad value for 'lag' or 'differences'"
-msgstr "niepoprawna wartość dla argumentów 'lag' lub 'differences'"
+#. R/cor.test.R: warning("Cannot compute exact p-value with ties")
+#. R/cor.test.R: warning("Cannot compute exact p-value with ties")
+#: R/cor.test.R:0
+msgid "Cannot compute exact p-value with ties"
+msgstr ""
+"nie można obliczyć dokładnej wartości prawdopodobieństwa z powtórzonymi "
+"wartościami"
 
-msgid "'xi' does not have the right length"
-msgstr "'xi' nie ma poprawnej długości"
+#. R/chisq.test.R: warning("Chi-squared approximation may be incorrect")
+#. R/prop.test.R: warning("Chi-squared approximation may be incorrect")
+#: R/chisq.test.R:0 R/prop.test.R:0
+msgid "Chi-squared approximation may be incorrect"
+msgstr "Aproksymacja chi-kwadrat może być niepoprawna"
 
-msgid "incorrect dimensions for 'xi'"
-msgstr "niepoprawne wymiary dla 'xi'"
+#. R/dendrogram.R: stop("Colv = \"Rowv\" but nrow(x) != ncol(x)")
+#: R/dendrogram.R:0
+msgid "Colv = \"Rowv\" but nrow(x) != ncol(x)"
+msgstr "'Colv = \"Rowv\"', ale 'nrow(x) != ncol(x)'"
 
-msgid "'x' is not a vector or matrix"
-msgstr "argument 'x' nie jest wektorem ani macierzÄ…"
+#. R/hclust.R: gettextf("\n Consider providing an as.hclust.%s() method", oldClass(x)[1L])
+#: R/hclust.R:0
+msgid "Consider providing an as.hclust.%s() method"
+msgstr "rozważ dostarczenie metody 'as.hclust.%s()'"
 
-msgid "invalid distance method"
-msgstr "niepoprawna metoda wyznaczania odległości"
+#. R/model.tables.R: message("Design is unbalanced - use se.contrast() for se's")
+#: R/model.tables.R:0
+msgid "Design is unbalanced - use se.contrast() for se's"
+msgstr "Projekt nie jest zrównoważony -- użyj 'se.contrast()' dla 'se'"
 
-msgid "ambiguous distance method"
-msgstr "niejednoznaczna metoda wyznaczania odległości"
+#. R/aov.R: warning("Error() model is singular")
+#: R/aov.R:0
+msgid "Error() model is singular"
+msgstr "model 'Error()' jest osobliwy"
 
-msgid "non-square matrix"
-msgstr "macierz niekwadratowa"
+#. R/add.R: gettextf("F test assumes 'quasi%s' family", fam)
+#: R/add.R:0
+msgid "F test assumes 'quasi%s' family"
+msgstr "Test Fishera zakłada rodzinę kwazi-%s"
 
-msgid "specify 'rate' or 'scale' but not both"
-msgstr "określ 'rate' lub 'scale', ale nie oba jednocześnie"
+#. R/add.R: gettextf("F test assumes quasi%s family", fam)
+#: R/add.R:0
+msgid "F test assumes quasi%s family"
+msgstr "Test Fishera zakłada rodzinę kwazi-%s"
 
-msgid "x[] and prob[] must be equal length vectors."
-msgstr "argumenty 'x' oraz 'prob' muszą być wektorami o jednakowej długości"
+#. R/arima.R: warning("MA part of model is not invertible")
+#. R/arma0.R: warning("MA part of model is not invertible")
+#: R/arima.R:0 R/arma0.R:0
+msgid "MA part of model is not invertible"
+msgstr "część średniej kroczącej modelu nie jest odwracalna"
 
-msgid "probabilities must be finite, non-negative and not all 0"
+#. R/ar.R: stop("MLE only implemented for univariate series")
+#: R/ar.R:0
+msgid "MLE only implemented for univariate series"
 msgstr ""
-"prawdopodobieństwa muszą być skończone, nieujemne i nie wszystkie ustawione "
-"na 0"
+"Estymacja największej wiarygodności jest zaimplementowana jedynie dla "
+"jednowymiarowych serii"
 
-msgid "'x' must be non-negative"
-msgstr "argument 'x' musi być nieujemny"
-
-msgid "size != sum(x), i.e. one is wrong"
-msgstr "'size != sum(x)', tzn. jeden jest niepoprawny"
-
-msgid "'prob' and 'mu' both specified"
-msgstr "określono jednocześnie argumenty 'prob' oraz 'mu'"
-
-msgid "some terms will have NAs due to the limits of the method"
+#. R/smspline.R: stop("NA lev[]; probably smoothing parameter 'spar' way too large!")
+#: R/smspline.R:0
+msgid "NA lev[]; probably smoothing parameter 'spar' way too large!"
 msgstr ""
-"niektóre wyrażenia będą miały wartości NA z uwagi na ograniczenia metody"
-
-msgid "'x' must have 1 or more non-missing values"
-msgstr "'x' musi mieć 1 lub więcej niebrakujących wartości"
+"NA lev[]; prawdopodobnie parametr wygładzający 'spar' jest stanowczo zbyt "
+"duży!"
 
-msgid "wrong embedding dimension"
-msgstr "niepoprawnie osadzony wymiar"
+#. R/cmdscale.R: stop("NA values not allowed in 'd'")
+#: R/cmdscale.R:0
+msgid "NA values not allowed in 'd'"
+msgstr "wartości NA w argumencie 'd' nie są dozwolone"
 
-msgid "'covmat' is not a valid covariance list"
-msgstr "'covmat' nie jest poprawnÄ… listÄ… kowariancji"
+#. R/friedman.test.R: stop("NA's are not allowed in 'groups' or 'blocks'")
+#. R/quade.test.R: stop("NA's are not allowed in 'groups' or 'blocks'")
+#: R/friedman.test.R:0 R/quade.test.R:0
+msgid "NA's are not allowed in 'groups' or 'blocks'"
+msgstr "wartości NA nie są dozwolone w argumentach 'groups' oraz 'blocks'"
 
-msgid "neither 'x' nor 'covmat' supplied"
-msgstr "nie dostarczono 'x' ani 'covmat'"
+#. R/mantelhaen.test.R: stop("NAs are not allowed")
+#: R/mantelhaen.test.R:0
+msgid "NAs are not allowed"
+msgstr "wartości NA nie są dozwolone"
 
-msgid "response not allowed in formula"
-msgstr "zmienna zależna nie jest dozwolona w formule"
+#. R/arima.R: gettextf("NAs in '%s'", "phi")
+#. R/arima.R: gettextf("NAs in '%s'", "theta")
+#: R/arima.R:0
+msgid "NAs in '%s'"
+msgstr "wartości NA w '%s'"
 
-msgid "factor analysis applies only to numerical variables"
-msgstr "analiza czynnikowa stosuje siÄ™ tylko zmiennych liczbowych"
+#. R/acf.R: stop("NAs in 'x'")
+#. R/ar.R: stop("NAs in 'x'")
+#. R/ar.R: stop("NAs in 'x'")
+#. R/ar.R: stop("NAs in 'x'")
+#. R/ar.R: stop("NAs in 'x'")
+#. R/ar.R: stop("NAs in 'x'")
+#. R/ar.R: stop("NAs in 'x'")
+#: R/acf.R:0 R/ar.R:0
+msgid "NAs in 'x'"
+msgstr "wartości NA w 'x'"
 
-msgid "'covmat' is of unknown type"
-msgstr "'covmat' jest nieznanego typu"
+#. R/glm.R: stop("NAs in V(mu)")
+#: R/glm.R:0
+msgid "NAs in V(mu)"
+msgstr "wartości NA w 'V(mu)'"
 
-msgid "requested scores without an 'x' matrix"
-msgstr "zażądano punktacji bez macierzy 'x'"
+#. R/glm.R: stop("NAs in d(mu)/d(eta)")
+#: R/glm.R:0
+msgid "NAs in d(mu)/d(eta)"
+msgstr "wartości NA w 'd(mu)/d(eta)'"
 
-msgid "factor analysis requires at least three variables"
-msgstr "analiza czynnikowa wymaga przynajmniej trzech zmiennych"
+#. R/arma0.R: warning("NAs present: setting 'delta' to -1")
+#: R/arma0.R:0
+msgid "NAs present: setting 'delta' to -1"
+msgstr "wartości NA są obecne: ustawianie 'delta' na wartość -1"
 
-msgid "no starting values supplied"
-msgstr "nie określono wartości początkowych"
+#. R/constrOptim.R: gettextf("Objective function decreased at outer iteration %d",     i)
+#: R/constrOptim.R:0
+msgid "Objective function decreased at outer iteration %d"
+msgstr "Funkcja celu zmalała w zewnętrznej iteracji %d"
 
-msgid "invalid argument 'lambda'"
-msgstr "niepoprawny argument 'lambda'"
+#. R/constrOptim.R: gettextf("Objective function increased at outer iteration %d",     i)
+#: R/constrOptim.R:0
+msgid "Objective function increased at outer iteration %d"
+msgstr "Funkcja celu zwiększyła się w zewnętrznej iteracji %d"
 
-msgid "%s link not recognised"
-msgstr "link %s nie został rozpoznany"
+#. R/prcomp.R: stop("PCA applies only to numerical variables")
+#. R/princomp.R: stop("PCA applies only to numerical variables")
+#. R/princomp.R: stop("PCA applies only to numerical variables")
+#: R/prcomp.R:0 R/princomp.R:0
+msgid "PCA applies only to numerical variables"
+msgstr ""
+"analiza głównych komponentów stosuje się jedynie do zmiennych liczbowych"
 
-msgid "link \"%s\" not available for poisson family; available links are %s"
-msgstr "link '%s' nie jest dostępny dla rodziny Poissona; dostępne linki to %s"
+#. R/acf.R: gettextf("Page [%d,%d]: i =%s; j =%s", I, J, paste(iind, collapse = ","),     paste(jind, collapse = ","))
+#: R/acf.R:0
+msgid "Page [%d,%d]: i =%s; j =%s"
+msgstr "Strona [%d,%d]: i =%s; j =%s"
 
-msgid "negative values not allowed for the 'Poisson' family"
-msgstr "ujemne wartości nie są dozwolone dla rodziny 'Poisson'"
+#. R/kmeans.R: gettextf("Quick-TRANSfer stage steps exceeded maximum (= %d)",     isteps.Qtran)
+#: R/kmeans.R:0
+msgid "Quick-TRANSfer stage steps exceeded maximum (= %d)"
+msgstr "Kroki etapu Quick-TRANSfer przekroczyły maksimum (= %d)"
 
-msgid "ignoring prior weights"
-msgstr "ignorowanie wag a priori"
+#. R/aov.R: message("Refitting model to allow projection")
+#: R/aov.R:0
+msgid "Refitting model to allow projection"
+msgstr "Ponowne dopasowywanie modelu aby umożliwić rzutowanie"
 
-msgid ""
-"link \"%s\" not available for quasipoisson family; available links are %s"
-msgstr ""
-"link '%s' nie jest dostępny dla rodziny kwazi-Poissona; dostępne linki to %s"
+#. R/wilcox.test.R: warning("Requested conf.level not achievable")
+#: R/wilcox.test.R:0
+msgid "Requested conf.level not achievable"
+msgstr "żądany 'conf.level' nie jest osiągalny"
 
-msgid "negative values not allowed for the 'quasiPoisson' family"
-msgstr "ujemne wartości nie są dozwolone dla rodziny 'quasiPoisson'"
+#. R/model.tables.R: gettextf("SEs for type '%s' are not yet implemented", type)
+#. R/model.tables.R: gettextf("SEs for type '%s' are not yet implemented", type)
+#: R/model.tables.R:0
+msgid "SEs for type '%s' are not yet implemented"
+msgstr "błędy standardowe dla typu '%s' nie są jeszcze zaimplementowane"
 
-msgid "link \"%s\" not available for gaussian family; available links are %s"
+#. R/model.tables.R: message("Standard error information not returned as design is unbalanced. \nStandard errors can be obtained through 'se.contrast'.")
+#: R/model.tables.R:0
+msgid ""
+"Standard error information not returned as design is unbalanced. \n"
+"Standard errors can be obtained through 'se.contrast'."
 msgstr ""
-"link '%s' nie jest dostępny dla rodziny gaussowskiej; dostępne linki to %s"
+"Standardowa informacja o błędzie nie została zwrócona z powodu "
+"niezrównoważenia projektu. \n"
+"Błędy standardowe mogą zostać uzyskane poprzez 'se.contrast'."
 
-msgid "cannot find valid starting values: please specify some"
+#. R/hclust.R: message("The \"ward\" method has been renamed to \"ward.D\"; note new \"ward.D2\"")
+#: R/hclust.R:0
+msgid ""
+"The \"ward\" method has been renamed to \"ward.D\"; note new \"ward.D2\""
 msgstr ""
-"nie można znaleźć poprawnych wartości startowych; proszę określić kilka"
+"metoda 'ward' została przemianowana na 'ward.D'; zwróć uwagę na nową metodę "
+"'ward.D2'"
 
-msgid "link \"%s\" not available for binomial family; available links are %s"
-msgstr ""
-"link '%s' nie jest dostępny dla rodziny Bernoulliego; dostępne linki to %s"
+#. R/mlm.R: stop("X does not define a subspace of M")
+#. R/mlm.R: stop("X does not define a subspace of M")
+#. R/mlm.R: stop("X does not define a subspace of M")
+#. R/mlm.R: stop("X does not define a subspace of M")
+#: R/mlm.R:0
+msgid "X does not define a subspace of M"
+msgstr "X nie definiuje podprzestrzeni M"
 
-msgid "y values must be 0 <= y <= 1"
-msgstr "wartości 'y' muszą być z przedziału 0 <= y <= 1"
+#. R/integrate.R: stop("a limit is NA or NaN")
+#: R/integrate.R:0
+msgid "a limit is NA or NaN"
+msgstr "granica wynosi NA lub NaN"
 
-msgid "non-integer #successes in a binomial glm!"
-msgstr ""
-"niecałkowita liczba sukcesów w rozkładzie Bernoulliego w funkcji 'glm()'!"
+#. R/oneway.test.R: stop("a two-sided formula is required")
+#: R/oneway.test.R:0
+msgid "a two-sided formula is required"
+msgstr "wymagana jest dwustronna formuła"
 
-msgid "non-integer counts in a binomial glm!"
-msgstr "niecałkowita liczba zliczeń w rozkładzie Bernoulliego w 'glm'!"
+#. R/shapiro.test.R: stop("all 'x' values are identical")
+#: R/shapiro.test.R:0
+msgid "all 'x' values are identical"
+msgstr "wszystkie wartości 'x' są identyczne"
 
-msgid ""
-"for the 'binomial' family, y must be a vector of 0 and 1's\n"
-"or a 2 column matrix where col 1 is no. successes and col 2 is no. failures"
+#. R/zzModels.R: stop("all 'x' values must be non-negative to fit the Weibull growth model")
+#: R/zzModels.R:0
+msgid "all 'x' values must be non-negative to fit the Weibull growth model"
 msgstr ""
-"dla rodziny 'binomial, argument 'y' musi być wektorem zer i jedynek lub 2 "
-"kolumnową macierzą, gdzie pierwsza kolumna jest liczbą sukcesów, a druga "
-"kolumna jest liczbą porażek"
+"wszystkie wartości 'x' musi być nieujemne aby dopasować model wzrostu "
+"Weibull'a"
 
-msgid "cannot simulate from non-integer prior.weights"
-msgstr "nie można symulować z niecałkowitych 'prior.weights'"
+#. R/identify.hclust.R: gettextf("all elements of 'which' must be between 1 and %d",     k)
+#: R/identify.hclust.R:0
+msgid "all elements of 'which' must be between 1 and %d"
+msgstr "wszystkie elementy 'which' muszą być pomiędzy 1 a %d"
 
-msgid ""
-"link \"%s\" not available for quasibinomial family; available links are %s"
-msgstr ""
-"link '%s' nie jest dostępny dla rodziny kwazi-Bernoulliego; dostępne linki "
-"to %s"
+#. R/chisq.test.R: stop("all entries of 'x' must be nonnegative and finite")
+#. R/fisher.test.R: stop("all entries of 'x' must be nonnegative and finite")
+#. R/mcnemar.test.R: stop("all entries of 'x' must be nonnegative and finite")
+#: R/chisq.test.R:0 R/fisher.test.R:0 R/mcnemar.test.R:0
+msgid "all entries of 'x' must be nonnegative and finite"
+msgstr "wszystkie wpisy 'x' muszą być nieujemne oraz skończone"
 
-msgid ""
-"for the 'quasibinomial' family, y must be a vector of 0 and 1's\n"
-"or a 2 column matrix where col 1 is no. successes and col 2 is no. failures"
-msgstr ""
-"dla rodziny 'quasibinomial', argument 'y' musi być wektorem zer i jedynek "
-"lub 2 kolumnową macierzą, gdzie pierwsza kolumna jest liczbą sukcesów, a "
-"druga kolumna jest liczbą porażek"
+#. R/fligner.test.R: stop("all group levels must be finite")
+#. R/kruskal.test.R: stop("all group levels must be finite")
+#: R/fligner.test.R:0 R/kruskal.test.R:0
+msgid "all group levels must be finite"
+msgstr "wszystkie poziomy grup muszą być skończone"
 
-msgid "link \"%s\" not available for gamma family; available links are %s"
-msgstr "link '%s' nie jest dostępny dla rodziny Gamma; dostępne linki to %s"
+#. R/fligner.test.R: stop("all groups must contain data")
+#. R/kruskal.test.R: stop("all groups must contain data")
+#: R/fligner.test.R:0 R/kruskal.test.R:0
+msgid "all groups must contain data"
+msgstr "wszystkie grupy muszą zawierać dane"
 
-msgid "non-positive values not allowed for the 'gamma' family"
-msgstr "niedodatnie wartości nie są dozwolone dla rodziny 'gamma'"
+#. R/bartlett.test.R: stop("all observations are in the same group")
+#. R/fligner.test.R: stop("all observations are in the same group")
+#. R/kruskal.test.R: stop("all observations are in the same group")
+#: R/bartlett.test.R:0 R/fligner.test.R:0 R/kruskal.test.R:0
+msgid "all observations are in the same group"
+msgstr "wszystkie obserwacje sÄ… w tej samej grupie"
 
-msgid "using weights as shape parameters"
-msgstr "używanie wag jako parametrów kształtu"
+#. R/StructTS.R: stop("all parameters were fixed")
+#. R/arma0.R: stop("all parameters were fixed")
+#: R/StructTS.R:0 R/arma0.R:0
+msgid "all parameters were fixed"
+msgstr "wszystkie parametry zostały ustalone"
 
-msgid ""
-"link \"%s\" not available for inverse.gaussian family; available links are %s"
-msgstr ""
-"link '%s' nie jest dostępny dla rodziny 'inverse.gaussian'; dostępne linki "
-"to %s"
+#. R/na.ts.R: stop("all times contain an NA")
+#. R/ts.R: stop("all times contain an NA")
+#: R/na.ts.R:0 R/ts.R:0
+msgid "all times contain an NA"
+msgstr "wszystkie czasy zawierają wartość NA"
 
-msgid "positive values only are allowed for the 'inverse.gaussian' family"
-msgstr "dodanie wartości są dozwolone jedynie dla rodziny 'inverse.gaussian'"
+#. R/smspline.R: stop("all weights should be non-negative")
+#: R/smspline.R:0
+msgid "all weights should be non-negative"
+msgstr "wszystkie wagi muszą być nieujemne"
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
-msgstr "potrzeba pakietu 'SuppDists' z CRAN dla rodziny 'inverse.gaussian'"
+#. R/fisher.test.R: stop("alternative must be \"two.sided\", \"less\" or \"greater\"")
+#: R/fisher.test.R:0
+msgid "alternative must be \"two.sided\", \"less\" or \"greater\""
+msgstr "alternatywa musi być 'two.sided', 'less' lub 'greater'"
 
-msgid "using weights as inverse variances"
-msgstr "używanie wag jako odwrotności wariancji"
+#. R/hclust.R: stop("ambiguous clustering method", paste("", method))
+#: R/hclust.R:0
+msgid "ambiguous clustering method"
+msgstr "niejednoznaczna metoda grupowania"
 
-msgid ""
-"'variance' \"%s\" is invalid: possible values are \"mu(1-mu)\", \"mu\", "
-"\"mu^2\", \"mu^3\" and \"constant\""
-msgstr ""
-"'variance' '%s' jest niepoprawna: możliwe wartości to: 'mu(1-mu)', 'mu', "
-"'mu^2', 'mu^3' oraz 'constant'"
+#. R/dist.R: stop("ambiguous distance method")
+#: R/dist.R:0
+msgid "ambiguous distance method"
+msgstr "niejednoznaczna metoda wyznaczania odległości"
 
-msgid "length mismatch in convolution"
-msgstr "niezgodność długości w splocie"
+#. R/nls.R: stop("anova is only defined for sequences of \"nls\" objects")
+#: R/nls.R:0
+msgid "anova is only defined for sequences of \"nls\" objects"
+msgstr "'anova' jest zdefiniowana jedynie dla sekwencji obiektów 'nls'"
 
-msgid "missing values in 'filter'"
-msgstr "brakujące wartości w argumencie 'filter'"
+#. R/nls.R: warning("argument 'na.action' will be ignored")
+#: R/nls.R:0
+msgid "argument 'na.action' will be ignored"
+msgstr "argument 'na.action' zostanie zignornowany"
 
-msgid "'filter' is longer than time series"
-msgstr "'filter' jest dłuższy niż szeregi czasowe"
+#. R/selfStart.R: stop("argument 'object' has an impossible length")
+#: R/selfStart.R:0
+msgid "argument 'object' has an impossible length"
+msgstr "argument 'object' ma nieprawdopodobną długość"
 
+#. R/filter.R: stop("argument 'sides' must be 1 or 2")
+#: R/filter.R:0
 msgid "argument 'sides' must be 1 or 2"
 msgstr "argument 'sides' musi mieć wartość 1 lub 2"
 
-msgid "'circular' must be logical and not NA"
-msgstr ""
-"argument 'circular' musi być wartością logiczną oraz nie może być wartością "
-"NA"
-
-msgid "length of 'init' must equal length of 'filter'"
-msgstr "długość argumentu 'init' musi równać się długości argumentu 'filter'"
+#. R/nls.R: warning("argument 'subset' will be ignored")
+#: R/nls.R:0
+msgid "argument 'subset' will be ignored"
+msgstr "argument 'subset' zostanie zignornowany"
 
-msgid "'x' must have at least 2 rows and columns"
-msgstr "argument 'x' musi mieć przynajmniej 2 wiersze oraz 2 kolumny"
+#. R/hclust.R: gettextf("argument 'x' cannot be coerced to class %s", dQuote("hclust"))
+#: R/hclust.R:0
+msgid "argument 'x' cannot be coerced to class %s"
+msgstr "argument 'x' nie może zostać przekształcony w klasę %s"
 
-msgid "'x' has entries too large to be integer"
-msgstr "argument 'x' posiada wpisy zbyt duże aby były liczbami całkowitymi"
+#. R/density.R: stop("argument 'x' must be numeric")
+#. R/ks.test.R: stop("argument 'x' must be numeric")
+#: R/density.R:0 R/ks.test.R:0
+msgid "argument 'x' must be numeric"
+msgstr "argument 'x' musi być liczbą"
 
-msgid "'x' has been rounded to integer: %s"
-msgstr "argument 'x' został zaokrąglony do wartości całkowitej: %s"
+#. R/proj.R: stop("argument does not include a 'qr' component")
+#: R/proj.R:0
+msgid "argument does not include a 'qr' component"
+msgstr "argument nie uwzględnia komponentu 'qr'"
 
-msgid "if 'x' is not a matrix, 'y' must be given"
-msgstr "jeśli argument 'x' nie jest macierzą, argument 'y' musi zostać podane"
+#. R/proj.R: stop("argument does not include an 'effects' component")
+#: R/proj.R:0
+msgid "argument does not include an 'effects' component"
+msgstr "argument nie uwzględnia komponentu 'effects'"
 
-msgid "'mult' must be integer >= 2, typically = 30"
-msgstr "argument 'mult' musi być liczbą całkowitą >= 2, na ogół = 30"
+#. R/r2dtable.R: stop("arguments 'r' and 'c' must have the same sums")
+#: R/r2dtable.R:0
+msgid "arguments 'r' and 'c' must have the same sums"
+msgstr "argumenty 'r' oraz 'c' muszą mieć jednakowe sumy"
 
-msgid "alternative must be \"two.sided\", \"less\" or \"greater\""
-msgstr "alternatywa musi być 'two.sided', 'less' lub 'greater'"
+#. R/aggregate.R: stop("arguments must have same length")
+#: R/aggregate.R:0
+msgid "arguments must have same length"
+msgstr "argumenty muszą mieć tę samą długość"
 
-msgid "'or' must be a single number between 0 and Inf"
-msgstr "argument 'or' musi być pojedynczą liczbą pomiędzy 0 a Inf"
+#. R/contr.poly.R: stop("arguments must have the same length")
+#: R/contr.poly.R:0
+msgid "arguments must have the same length"
+msgstr "argumenty muszą mieć tę samą długość"
 
-msgid "need 2 or more non-zero row marginals"
-msgstr "2 lub więcej niezerowych granic wiersza jest wymagane"
+#. R/lm.R: warning("assuming prediction variance inversely proportional to weights used for fitting\n")
+#: R/lm.R:0
+msgid ""
+"assuming prediction variance inversely proportional to weights used for "
+"fitting"
+msgstr ""
+"zakładanie przewidywanej wariancji odwrotnie proporcjonalnej do wag użytych "
+"do dopasowania"
 
-msgid "need 2 or more non-zero column marginals"
-msgstr "2 lub więcej niezerowych granic kolumny jest wymagane"
+#. R/chisq.test.R: stop("at least one entry of 'x' must be positive")
+#: R/chisq.test.R:0
+msgid "at least one entry of 'x' must be positive"
+msgstr "przynajmniej jeden wpis w 'x' musi być dodatni"
 
-msgid "'hybrid' is ignored for a 2 x 2 table"
-msgstr "argument 'hybrid' jest ignorowany dla tabeli o wymiarach 2 x 2"
+#. R/smooth.R: stop("attempt to smooth NA values")
+#: R/smooth.R:0
+msgid "attempt to smooth NA values"
+msgstr "próba wygładzenia wartości NA"
 
-msgid "all groups must contain data"
-msgstr "wszystkie grupy muszą zawierać dane"
+#. R/smooth.R: stop("attempt to smooth non-numeric values")
+#: R/smooth.R:0
+msgid "attempt to smooth non-numeric values"
+msgstr "próba wygładzenia wartości nieliczbowych"
 
-msgid "all group levels must be finite"
-msgstr "wszystkie poziomy grup muszą być skończone"
+#. R/add.R: warning("attempting model selection on an essentially perfect fit is nonsense",     call. = FALSE)
+#: R/add.R:0
+msgid "attempting model selection on an essentially perfect fit is nonsense"
+msgstr "próba wyboru modelu dla idealnego dopasowania jest bez sensu"
 
-msgid "not enough observations"
-msgstr "niewystarczajÄ…ca liczba obserwacji"
+#. R/ts.R: stop("bad value for 'end'")
+#: R/ts.R:0
+msgid "bad value for 'end'"
+msgstr "niepoprawna wartość dla argumentu 'end'"
 
-msgid "NA's are not allowed in 'groups' or 'blocks'"
-msgstr "wartości NA nie są dozwolone w argumentach 'groups' oraz 'blocks'"
-
-msgid "'y', 'groups' and 'blocks' must have the same length"
-msgstr "argumenty 'y', 'groups' oraz 'block' muszą mieć tę samą długość"
+#. R/diffinv.R: stop("bad value for 'lag' or 'differences'")
+#. R/ts.R: stop("bad value for 'lag' or 'differences'")
+#: R/diffinv.R:0 R/ts.R:0
+msgid "bad value for 'lag' or 'differences'"
+msgstr "niepoprawna wartość dla argumentów 'lag' lub 'differences'"
 
-msgid "not an unreplicated complete block design"
-msgstr "to nie jest niezreplikowana kompletna konstrukcja bloku"
+#. R/ts.R: stop("bad value for 'start'")
+#: R/ts.R:0
+msgid "bad value for 'start'"
+msgstr "niepoprawna wartość dla 'start'"
 
-msgid "formula missing"
-msgstr "brakuje argumentu 'formula'"
+#. R/runmed.R: stop("bandwidth 'k' must be >= 1 and odd!")
+#: R/runmed.R:0
+msgid "bandwidth 'k' must be >= 1 and odd!"
+msgstr "pasmo 'k' musi być >= 1 i musi być nieparzyste!"
 
-msgid "incorrect specification for 'formula'"
-msgstr "niepoprawne określenie dla argumentu 'formula'"
+#. R/contrast.R: stop("baseline group number out of range")
+#: R/contrast.R:0
+msgid "baseline group number out of range"
+msgstr "numer grupy bazowej jest poza zakresem"
 
-msgid "nothing to tabulate"
-msgstr "nic do tabulowania"
+#. R/biplot.R: stop("biplots are not defined for complex PCA")
+#: R/biplot.R:0
+msgid "biplots are not defined for complex PCA"
+msgstr ""
+"wykresy dwuwymiarowego modelu dyspersji dla grup nie sÄ… zdefiniowane dla "
+"analizy zespolonych głównych komponentów"
 
-msgid "incorrect specification for 'row.vars'"
-msgstr "niepoprawne określenie dla argumentu 'row.vars'"
+#. R/loess.R: warning("both 'span' and 'enp.target' specified: 'span' will be used")
+#: R/loess.R:0
+msgid "both 'span' and 'enp.target' specified: 'span' will be used"
+msgstr "określono 'span' oraz 'enp.target': zostanie użyty 'span'"
 
-msgid "incorrect specification for 'col.vars'"
-msgstr "niepoprawne określenie dla argumentu 'col.vars'"
+#. R/princomp.R: warning("both 'x' and 'covmat' were supplied: 'x' will be ignored")
+#: R/princomp.R:0
+msgid "both 'x' and 'covmat' were supplied: 'x' will be ignored"
+msgstr "dostarczono jednocześnie 'x' oraz 'covmat': 'x' zostanie zignorowany"
 
-msgid "interactions are not allowed"
-msgstr "interakcje nie sÄ… dozwolone"
+#. R/cor.R: stop("both 'x' and 'y' must be non-empty")
+#: R/cor.R:0
+msgid "both 'x' and 'y' must be non-empty"
+msgstr "oba 'x' oraz 'y' muszą być niepuste"
 
-msgid "'formula' has '.' in both left and right hand sides"
-msgstr "'formula' ma '.' po lewej oraz prawej stronie"
+#. R/optim.R: warning("bounds can only be used with method L-BFGS-B (or Brent)")
+#: R/optim.R:0
+msgid "bounds can only be used with method L-BFGS-B (or Brent)"
+msgstr "granice mogą być użyte jedynie z metodą L-BFGS-B (lub Brent)"
 
-msgid "incorrect variable names in rhs of formula"
-msgstr "niepoprawne nazwy zmiennych po prawej stronie formuły"
+#. R/ts.R: stop("burn-in 'n.start' must be as long as 'ar + ma'")
+#: R/ts.R:0
+msgid "burn-in 'n.start' must be as long as 'ar + ma'"
+msgstr "oryginał 'n.start' musi być tak długi jak 'ar + ma'"
 
-msgid "incorrect variable names in lhs of formula"
-msgstr "niepoprawne nazwy zmiennych po lewej stronie formuły"
+#. R/lm.R: warning("calling anova.lm(<fake-lm-object>) ...")
+#: R/lm.R:0
+msgid "calling anova.lm(<fake-lm-object>) ..."
+msgstr "wywoływanie 'anova.lm(<fake-lm-object>)' ..."
 
-msgid "cannot use dots in formula with given data"
-msgstr "nie można używać kropek w formule z zadanymi danymi"
+#. R/lm.R: warning("calling predict.lm(<fake-lm-object>) ...")
+#: R/lm.R:0
+msgid "calling predict.lm(<fake-lm-object>) ..."
+msgstr "wywoływanie 'predict.lm(<fake-lm-object>)' ..."
 
-msgid "'x' must be an \"ftable\" object"
-msgstr "argument 'mu' musi być obiektem klasy \"ftable\""
+#. R/lm.R: warning("calling summary.lm(<fake-lm-object>) ...")
+#: R/lm.R:0
+msgid "calling summary.lm(<fake-lm-object>) ..."
+msgstr "wywoływanie 'summary.lm(<fake-lm-object>)' ..."
 
-msgid "wrong method"
-msgstr "błędna metoda"
+#. R/acf.R: warning("can use ci.type=\"ma\" only if first lag is 0")
+#: R/acf.R:0
+msgid "can use ci.type=\"ma\" only if first lag is 0"
+msgstr "można użyć 'ci.type=\"ma\"' tylko jeśli pierwsze opóźnienie wynosi 0"
 
-msgid "'file' must be a character string or connection"
-msgstr "argument 'file' musi być łańcuchem tekstowym lub połączeniem"
+#. R/nls.R: stop("cannot calculate REML log-likelihood for \"nls\" objects")
+#: R/nls.R:0
+msgid "cannot calculate REML log-likelihood for \"nls\" objects"
+msgstr ""
+"nie można obliczyć REML logarytmu funkcji wiarygodności dla obiektów 'nls'"
 
-msgid "'row.var.names' missing"
-msgstr "brakuje 'row.var.names'"
+#. R/aggregate.R: gettextf("cannot change frequency from %g to %g", ofrequency,     nfrequency)
+#: R/aggregate.R:0
+msgid "cannot change frequency from %g to %g"
+msgstr "nie można zmienić częstotliwości z %g na %g"
 
-msgid "'col.vars' missing or incorrect"
-msgstr "brakuje argumentu 'col.vars' lub jest niepoprawny"
+#. R/ansari.test.R: warning("cannot compute asymptotic confidence set or estimator")
+#: R/ansari.test.R:0
+msgid "cannot compute asymptotic confidence set or estimator"
+msgstr "nie można obliczyć asymptotycznego przedziału ufności lub estymatora"
 
-msgid "'family' not recognized"
-msgstr "argument 'family' nie został rozpoznany"
+#. R/wilcox.test.R: stop("cannot compute confidence interval when all observations are tied",     call. = FALSE)
+#. R/wilcox.test.R: stop("cannot compute confidence interval when all observations are tied",     call. = FALSE)
+#: R/wilcox.test.R:0
+msgid "cannot compute confidence interval when all observations are tied"
+msgstr ""
+"nie można obliczyć przedziału ufności gdy wszystkie obserwacje są powtórzone"
 
-msgid "invalid 'method' argument"
-msgstr "niepoprawny argument 'method'"
+#. R/ansari.test.R: warning("cannot compute confidence set, returning NA")
+#: R/ansari.test.R:0
+msgid "cannot compute confidence set, returning NA"
+msgstr "nie można obliczyć przedziału ufności, zwracanie wartości NA"
 
-msgid "'weights' must be a numeric vector"
-msgstr "argument 'weight' musi być wektorem liczbowym"
+#. R/ansari.test.R: warning("cannot compute estimate, returning NA")
+#: R/ansari.test.R:0
+msgid "cannot compute estimate, returning NA"
+msgstr "nie można obliczyć estymatora, zwracanie wartości NA"
 
-msgid "negative weights not allowed"
-msgstr "ujemne wagi nie sÄ… dozwolone"
+#. R/wilcox.test.R: warning("cannot compute exact confidence interval with ties")
+#: R/wilcox.test.R:0
+msgid "cannot compute exact confidence interval with ties"
+msgstr ""
+"nie można obliczyć dokładnego przedziału ufności z wartościami powtórzonymi"
 
-msgid "number of offsets is %d should equal %d (number of observations)"
-msgstr "liczba przesunięć (%d) powinna być równa liczbie obserwacji (%d)"
+#. R/wilcox.test.R: warning("cannot compute exact confidence interval with zeroes")
+#: R/wilcox.test.R:0
+msgid "cannot compute exact confidence interval with zeroes"
+msgstr "nie można obliczyć dokładnego przedziału ufności z zerami"
 
-msgid ""
-"fitting to calculate the null deviance did not converge -- increase 'maxit'?"
+#. R/ansari.test.R: warning("cannot compute exact confidence intervals with ties")
+#. R/wilcox.test.R: warning("cannot compute exact confidence intervals with ties")
+#: R/ansari.test.R:0 R/wilcox.test.R:0
+msgid "cannot compute exact confidence intervals with ties"
 msgstr ""
-"dopasowanie aby wyliczyć zerowe odchylenie nie uzbieżniło się -- zwiększyć "
-"wartość 'maxit'?"
-
-msgid "value of 'epsilon' must be > 0"
-msgstr "wartość 'epsilon' musi być > 0"
+"nie można obliczyć dokładnych przedziałów ufności z powtórzonymi wartościami"
 
-msgid "maximum number of iterations must be > 0"
-msgstr "maksymalna liczba iteracji musi być > 0"
+#. R/ansari.test.R: warning("cannot compute exact p-value with ties")
+#. R/ks.test.R: warning("cannot compute exact p-value with ties")
+#. R/wilcox.test.R: warning("cannot compute exact p-value with ties")
+#. R/wilcox.test.R: warning("cannot compute exact p-value with ties")
+#: R/ansari.test.R:0 R/ks.test.R:0 R/wilcox.test.R:0
+msgid "cannot compute exact p-value with ties"
+msgstr ""
+"nie można obliczyć dokładnej wartości prawdopodobieństwa z powtórzonymi "
+"wartościami"
 
-msgid "'family' argument seems not to be a valid family object"
-msgstr "argument 'family' nie wyglÄ…da na poprawny obiekt rodziny"
+#. R/wilcox.test.R: warning("cannot compute exact p-value with zeroes")
+#: R/wilcox.test.R:0
+msgid "cannot compute exact p-value with zeroes"
+msgstr "nie można obliczyć dokładnej wartości prawdopodobieństwa z zerami"
 
-msgid "invalid linear predictor values in empty model"
-msgstr "niepoprawne wartości liniowego predyktora w pustym modelu"
+#. R/chisq.test.R: warning("cannot compute simulated p-value with zero marginals")
+#: R/chisq.test.R:0
+msgid "cannot compute simulated p-value with zero marginals"
+msgstr ""
+"nie można obliczyć symulowanej wartości prawdopodobieństwa z zerowymi "
+"granicami"
 
-msgid "invalid fitted means in empty model"
-msgstr "niepoprawnie dopasowane średnie w pustym modelu"
+#. R/models.R: stop("cannot create a formula from a zero-column data frame")
+#: R/models.R:0
+msgid "cannot create a formula from a zero-column data frame"
+msgstr "nie można utworzyć formuły z ramki danych o zerowej liczbie kolumn"
 
-msgid ""
-"length of 'start' should equal %d and correspond to initial coefs for %s"
+#. R/family.R: stop("cannot find valid starting values: please specify some")
+#. R/glm.R: stop("cannot find valid starting values: please specify some",     call. = FALSE)
+#: R/family.R:0 R/glm.R:0
+msgid "cannot find valid starting values: please specify some"
 msgstr ""
-"długość 'start' powinna równać się %d i odnosić się do współczynników "
-"poczÄ…tkowych dla %s"
+"nie można znaleźć poprawnych wartości startowych; proszę określić kilka"
 
-msgid "NAs in V(mu)"
-msgstr "wartości NA w 'V(mu)'"
+#. R/zzModels.R: stop("cannot fit an asymptotic regression model to these data")
+#: R/zzModels.R:0
+msgid "cannot fit an asymptotic regression model to these data"
+msgstr "nie można dopasować modelu regresji asymptotycznej do tych danych"
 
-msgid "0s in V(mu)"
-msgstr "zera w 'V(mu)'"
+#. R/HoltWinters.R: stop("cannot fit models without level ('alpha' must not be 0 or FALSE)")
+#: R/HoltWinters.R:0
+msgid "cannot fit models without level ('alpha' must not be 0 or FALSE)"
+msgstr ""
+"nie można dopasować do modeli bez poziomu ('alpha' nie może być zerem lub "
+"wartością FALSE)"
 
-msgid "NAs in d(mu)/d(eta)"
-msgstr "wartości NA w 'd(mu)/d(eta)'"
+#. R/cor.R: stop("cannot handle 'pairwise.complete.obs'")
+#: R/cor.R:0
+msgid "cannot handle 'pairwise.complete.obs'"
+msgstr "nie można obsłużyć 'pairwise.complete.obs'"
 
-msgid "no observations informative at iteration %d"
-msgstr "brak obserwacji informacyjnych w iteracji %d"
+#. R/ts.R: stop("cannot plot more than 10 series as \"multiple\"")
+#: R/ts.R:0
+msgid "cannot plot more than 10 series as \"multiple\""
+msgstr "nie można narysować więcej niż 10 szeregów jako 'multiple'"
 
-msgid "non-finite coefficients at iteration %d"
-msgstr "nieskończone współczynniki w %d iteracji"
+#. R/nls-profile.R: stop("cannot recognize parameter name")
+#: R/nls-profile.R:0
+msgid "cannot recognize parameter name"
+msgstr "nie można rozpoznać nazwy parametru"
 
-msgid ""
-"no valid set of coefficients has been found: please supply starting values"
+#. R/prcomp.R: stop("cannot rescale a constant/zero column to unit variance")
+#: R/prcomp.R:0
+msgid "cannot rescale a constant/zero column to unit variance"
 msgstr ""
-"nie znaleziono poprawnego zestawu współczynników: proszę dostarczyć wartości "
-"poczÄ…tkowe"
+"nie można przeskalować kolumny stałych wartości/zer na jednostkową wariancję"
 
-msgid "step size truncated due to divergence"
-msgstr "rozmiar kroku został przycięty ze względu na rozbieżność"
+#. R/family.R: stop("cannot simulate from non-integer prior.weights")
+#: R/family.R:0
+msgid "cannot simulate from non-integer prior.weights"
+msgstr "nie można symulować z niecałkowitych 'prior.weights'"
 
-msgid "inner loop 1; cannot correct step size"
-msgstr "wewnętrzna pętla 1; nie można poprawić rozmiaru kroku"
+#. R/princomp.R: stop("cannot use 'cor = TRUE' with a constant variable")
+#: R/princomp.R:0
+msgid "cannot use 'cor = TRUE' with a constant variable"
+msgstr "nie można użyć 'cor=TRUE' ze zmienną przyjmującą stałą wartość"
 
-msgid "step size truncated: out of bounds"
-msgstr "rozmiar kroku został przycięty: poza granicami"
+#. R/ftable.R: stop("cannot use dots in formula with given data")
+#: R/ftable.R:0
+msgid "cannot use dots in formula with given data"
+msgstr "nie można używać kropek w formule z zadanymi danymi"
 
-msgid "inner loop 2; cannot correct step size"
-msgstr "wewnętrzna pętla 2; nie można poprawić rozmiaru kroku"
+#. R/smspline.R: stop("cannot use more inner knots than unique 'x' values")
+#: R/smspline.R:0
+msgid "cannot use more inner knots than unique 'x' values"
+msgstr "nie można użyć więcej wewnętrznych węzłów niż unikalnych wartości 'x'"
 
-msgid "glm.fit: algorithm did not converge"
-msgstr "glm.fit: algorytm nie zbiegł się"
+#. R/kernel.R: stop("coefficients do not add to 1")
+#: R/kernel.R:0
+msgid "coefficients do not add to 1"
+msgstr "współczynniki nie sumują się do 1"
 
-msgid "glm.fit: algorithm stopped at boundary value"
-msgstr "glm.fit: algorytm zatrzymał się na wartości granicznej"
+#. R/approx.R: warning("collapsing to unique 'x' values")
+#: R/approx.R:0
+msgid "collapsing to unique 'x' values"
+msgstr "zwijanie do unikalnych wartości 'x'"
 
-msgid "glm.fit: fitted probabilities numerically 0 or 1 occurred"
+#. R/dendrogram.R: stop("column dendrogram ordering gave index of wrong length")
+#: R/dendrogram.R:0
+msgid "column dendrogram ordering gave index of wrong length"
 msgstr ""
-"glm.fit: dopasowane prawdopodobieństwa numerycznie okazały się być 0 lub 1"
+"porządkowanie drzewa celu względem kolumn zwróciło indeks o niepoprawnej "
+"długości"
 
-msgid "glm.fit: fitted rates numerically 0 occurred"
-msgstr "glm.fit: dopasowane stosunki numerycznie okazały się być 0"
+#. R/aov.R: stop("columns of 'contrast.obj' must define a contrast (sum to zero)")
+#: R/aov.R:0
+msgid "columns of 'contrast.obj' must define a contrast (sum to zero)"
+msgstr "kolumny 'contrast.obj' muszą określać konstrast (sumować się do zera)"
 
-msgid "the following arguments to 'anova.glm' are invalid and dropped:"
+#. R/aov.R: stop("columns of 'contrast.obj' must define a contrast(sum to zero)")
+#: R/aov.R:0
+msgid "columns of 'contrast.obj' must define a contrast(sum to zero)"
+msgstr "kolumny 'contrast.obj' muszą określać kontrast (sumować się do zera)"
+
+#. R/contrast.R: stop("contrasts apply only to factors")
+#. R/contrast.R: stop("contrasts apply only to factors")
+#: R/contrast.R:0
+msgid "contrasts apply only to factors"
+msgstr "kontrasty mają zastosowanie jedynie do czynników"
+
+#. R/contrast.R: stop("contrasts can be applied only to factors with 2 or more levels")
+#: R/contrast.R:0
+msgid "contrasts can be applied only to factors with 2 or more levels"
 msgstr ""
-"następujące argumenty przekazane do 'anova.glm' są niepoprawne i zostały "
-"pominięte:"
+"kontrasty można zastosować jedynie do czynników z dwoma lub więcej poziomami"
 
-msgid ","
-msgstr ","
+#. R/contr.poly.R: gettextf("contrasts not defined for %d degrees of freedom", n -     1)
+#. R/contrast.R: gettextf("contrasts not defined for %d degrees of freedom", n -     1L)
+#: R/contr.poly.R:0 R/contrast.R:0
+msgid "contrasts not defined for %d degrees of freedom"
+msgstr "kontrasty nie sÄ… zdefiniowane dla %d stopni swobody"
 
-msgid "using F test with a '%s' family is inappropriate"
-msgstr "używanie testu Fishera z rodziną '%s' jest niepoprawne"
+#. R/nlm.R: stop("convergence problem in zero finding: ", conditionMessage(val))
+#: R/nlm.R:0
+msgid "convergence problem in zero finding:"
+msgstr "problem zbieżności podczas znajdywania zer"
 
-msgid "using F test with a fixed dispersion is inappropriate"
-msgstr "używanie testu Fishera z ustaloną dyspersją jest niepoprawne"
+#. R/arma0.R: warning("converting non-invertible initial MA values")
+#: R/arma0.R:0
+msgid "converting non-invertible initial MA values"
+msgstr "konwertowanie nieodwracalnych wartości początkowych kroczącej średniej"
 
-msgid "models with response %s removed because response differs from model 1"
-msgstr ""
-"modele ze zmienną zależną %s zostały usunięte, ponieważ zmienna zależna "
-"różni się od tego w modelu 1"
+#. R/princomp.R: stop("covariance matrix is not non-negative definite")
+#: R/princomp.R:0
+msgid "covariance matrix is not non-negative definite"
+msgstr "macierz kowariancji nie jest nieujemnie określona"
 
-msgid "models were not all fitted to the same size of dataset"
-msgstr ""
-"nie wszystkie modele zostały dopasowane do zbioru danych tego samego rozmiaru"
+#. R/spectrum.R: stop("coverage probability out of range [0,1)")
+#: R/spectrum.R:0
+msgid "coverage probability out of range [0,1)"
+msgstr "prawdopodobieństwo pokrycia poza przedziałem [0,1)"
 
-msgid "observations with zero weight not used for calculating dispersion"
-msgstr ""
-"obserwacje z zerową wagą nie zostały użyte podczas kalkulacji dyspersji"
+#. R/smspline.R: warning("cross-validation with non-unique 'x' values seems doubtful")
+#: R/smspline.R:0
+msgid "cross-validation with non-unique 'x' values seems doubtful"
+msgstr "krzyżowa walidacja z nieunikalnymi wartościami 'x' wydaje się wątpliwa"
+
+#. R/t.test.R: stop("data are essentially constant")
+#. R/t.test.R: stop("data are essentially constant")
+#: R/t.test.R:0
+msgid "data are essentially constant"
+msgstr "dane są w zasadzie stałe"
+
+#. R/HoltWinters.R: stop("data must be non-zero for multiplicative Holt-Winters")
+#: R/HoltWinters.R:0
+msgid "data must be non-zero for multiplicative Holt-Winters"
+msgstr "dane muszą być niezerowe dla multiplikatywnego modelu Holta-Wintersa"
 
+#. R/dendrogram.R: gettextf("dendrogram entries must be 1,2,..,%d (in any order), to be coercible to \"hclust\"",     n)
+#: R/dendrogram.R:0
 msgid ""
-"The \"ward\" method has been renamed to \"ward.D\"; note new \"ward.D2\""
+"dendrogram entries must be 1,2,..,%d (in any order), to be coercible to "
+"\"hclust\""
 msgstr ""
-"metoda 'ward' została przemianowana na 'ward.D'; zwróć uwagę na nową metodę "
-"'ward.D2'"
+"wpisy dendrogramu muszą wynosić 1,2,..,%d (w dowolnej kolejności), aby mogły "
+"być przekształcale na obiekt klasy \"hclust\""
 
-msgid "invalid clustering method"
-msgstr "niepoprawna metoda grupowania"
+#. R/dendrogram.R: stop("dendrogram node with non-positive #{branches}")
+#: R/dendrogram.R:0
+msgid "dendrogram node with non-positive #{branches}"
+msgstr "węzeł drzewa celów z wartościami nie-dodatnimi #{gałęziami}"
 
-msgid "ambiguous clustering method"
-msgstr "niejednoznaczna metoda grupowania"
+#. R/dendrogram.R: stop("dendrogram non-leaf node with non-positive #{branches}")
+#: R/dendrogram.R:0
+msgid "dendrogram non-leaf node with non-positive #{branches}"
+msgstr "bezliściowy węzeł drzewa celu z wartościami nie-dodatnimi #{gałęziami}"
 
-msgid "invalid dissimilarities"
-msgstr "niepoprawne odmienności"
+#. R/model.tables.R: stop("design is unbalanced so cannot proceed")
+#: R/model.tables.R:0
+msgid "design is unbalanced so cannot proceed"
+msgstr "projekt nie jest zrównoważony, dlatego też nie można kontynuować"
 
-msgid "size cannot be NA nor exceed 65536"
-msgstr "rozmiar nie może wynosić NA ani też przekraczać wartość 65536"
+#. R/cor.R: warning("diag(.) had 0 or NA entries; non-finite result is doubtful")
+#: R/cor.R:0
+msgid "diag(.) had 0 or NA entries; non-finite result is doubtful"
+msgstr "'diag(.)' miał 0 lub wpisy NA; nieskończony rezultat jest wątpliwy"
 
-msgid "must have n >= 2 objects to cluster"
-msgstr "co najmniej 2 obiekty są potrzebne aby móc grupować"
-
-msgid "invalid length of members"
-msgstr "niepoprawna długość argumentu 'members'"
-
-msgid "argument 'x' cannot be coerced to class %s"
-msgstr "argument 'x' nie może zostać przekształcony w klasę %s"
-
-msgid "Consider providing an as.hclust.%s() method"
-msgstr "rozważ dostarczenie metody 'as.hclust.%s()'"
+#. R/nlm.R: if (doX) "did not succeed extending the interval endpoints for f(lower) * f(upper) <= 0" else "f() values at end points not of opposite sign"
+#: R/nlm.R:0
+msgid ""
+"did not succeed extending the interval endpoints for f(lower) * f(upper) <= 0"
+msgstr ""
+"nie udało się rozszerzenie końców przedziału dla f(dolny) * f(górny) <= 0"
 
-msgid "need dendrograms where all leaves have labels"
-msgstr "potrzeba drzew celu, gdzie liście nie posiadają etykiet"
+#. R/cancor.R: stop("dimension 0 in 'x' or 'y'")
+#: R/cancor.R:0
+msgid "dimension 0 in 'x' or 'y'"
+msgstr "zerowy wymiar w argumencie 'x' lub 'y'"
 
-msgid "'k' and 'h' must be a scalar"
-msgstr "argumenty 'k' oraz 'h' muszą być skalarami"
+#. R/cmdscale.R: stop("distances must be result of 'dist' or a square matrix")
+#: R/cmdscale.R:0
+msgid "distances must be result of 'dist' or a square matrix"
+msgstr "odległości muszą być wynikiem 'dist' lub być kwadratową macierzą"
 
-msgid "specify exactly one of 'k' and 'h'"
-msgstr "określ dokładnie jeden z 'k' oraz 'h'"
+#. R/mantelhaen.test.R: stop("each dimension in table must be >= 2")
+#: R/mantelhaen.test.R:0
+msgid "each dimension in table must be >= 2"
+msgstr "każdy wymiar w tabeli musi być >= 2"
 
-msgid "k must be between 2 and %d"
-msgstr "elementy 'k' muszą być pomiędzy 2 a %d"
+#. R/aov.R: gettextf("each element of '%s' must be logical", substitute(contrasts.list))
+#. R/aov.R: gettextf("each element of '%s' must be logical", substitute(contrasts.obj))
+#: R/aov.R:0
+msgid "each element of '%s' must be logical"
+msgstr "każdy element '%s' musi być elementem logicznym"
 
-msgid "specify exactly one of 'which' and 'x'"
-msgstr "określ dokładnie jeden z 'which' oraz 'x'"
+#. R/model.tables.R: stop("eff.aovlist: non-orthogonal contrasts would give an incorrect answer")
+#: R/model.tables.R:0
+msgid "eff.aovlist: non-orthogonal contrasts would give an incorrect answer"
+msgstr "eff.aovlist: nieortogonalne kontrasty dałyby niepoprawną odpowiedź"
 
-msgid "all elements of 'which' must be between 1 and %d"
-msgstr "wszystkie elementy 'which' muszą być pomiędzy 1 a %d"
+#. R/cmdscale.R: warning("eig=TRUE is disregarded when list.=FALSE")
+#: R/cmdscale.R:0
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr "'eig=TRUE' jest nieuwzględniane gdy 'list.=FALSE'"
 
-msgid "invalid parameter values"
-msgstr "niepoprawne wartości parametrów"
+#. R/cutree.R: stop("either 'k' or 'h' must be specified")
+#: R/cutree.R:0
+msgid "either 'k' or 'h' must be specified"
+msgstr "jedno z 'k' lub 'h' musi zostać określone"
 
-msgid "a limit is missing"
-msgstr "brakuje co najmniej jednej granicy całkowania"
+#. R/cutree.R: gettextf("elements of 'k' must be between 1 and %d", n)
+#: R/cutree.R:0
+msgid "elements of 'k' must be between 1 and %d"
+msgstr "elementy 'k' muszą być pomiędzy 1 a %d"
 
-msgid "missing values not allowed"
-msgstr "brakujące wartości są niedozwolone"
+#. R/prop.test.R: stop("elements of 'n' must be positive")
+#: R/prop.test.R:0
+msgid "elements of 'n' must be positive"
+msgstr "elementy 'n' muszą być dodatnie"
 
-msgid "'r' is less than 1"
-msgstr "wartość argumentu 'r' jest mniejsza niż 1"
+#. R/prop.test.R: stop("elements of 'p' must be in (0,1)")
+#: R/prop.test.R:0
+msgid "elements of 'p' must be in (0,1)"
+msgstr "elementy 'p' muszą być w przedziale (0,1)"
 
-msgid "'m' is less than 1"
-msgstr "wartość argumentu 'm' jest mniejsza niż 1"
+#. R/prop.test.R: stop("elements of 'x' must be nonnegative")
+#: R/prop.test.R:0
+msgid "elements of 'x' must be nonnegative"
+msgstr "elementy 'x' muszą być nieujemne"
 
-msgid "'r' is less than 0"
-msgstr "wartość argumentu 'r' jest mniejsza niż 0"
+#. R/prop.test.R: stop("elements of 'x' must not be greater than those of 'n'")
+#: R/prop.test.R:0
+msgid "elements of 'x' must not be greater than those of 'n'"
+msgstr "elementy 'x' nie mogą być większe niż elementy 'n'"
 
-msgid "'m' must be numeric with non-negative integers"
-msgstr "argument 'm' musi być wektorem z nieujemnymi liczbami całkowitymi"
+#. R/kmeans.R: stop("empty cluster: try a better set of initial centers", call. = FALSE)
+#. R/kmeans.R: warning("empty cluster: try a better set of initial centers",     call. = FALSE)
+#. R/kmeans.R: warning("empty cluster: try a better set of initial centers",     call. = FALSE)
+#: R/kmeans.R:0
+msgid "empty cluster: try a better set of initial centers"
+msgstr "pusta grupa: spróbuj lepszego zestawu początkowych centrów"
 
-msgid "unknown named kernel"
-msgstr "nieznane nazwane jÄ…dro"
+#. R/ARMAtheory.R: stop("empty model supplied")
+#: R/ARMAtheory.R:0
+msgid "empty model supplied"
+msgstr "dostarczono pusty model"
 
-msgid "'coef' must be a vector"
-msgstr "argument 'coef' musi być wektorem"
+#. R/lm.R: warning("essentially perfect fit: summary may be unreliable")
+#: R/lm.R:0
+msgid "essentially perfect fit: summary may be unreliable"
+msgstr "idealne dopasowanie: podsumowanie może nie być wiarygodne"
 
-msgid "'coef' does not have the correct length"
-msgstr "argument 'coef' nie ma poprawnej długości"
+#. R/power.anova.test.R: stop("exactly one of 'groups', 'n', 'between.var', 'within.var', 'power', and 'sig.level' must be NULL")
+#: R/power.anova.test.R:0
+msgid ""
+"exactly one of 'groups', 'n', 'between.var', 'within.var', 'power', and 'sig."
+"level' must be NULL"
+msgstr ""
+"dokładnie jeden z 'groups', 'n', 'between.var', 'within.var', 'power', oraz "
+"'sig.level' musi mieć wartość NULL"
 
-msgid "coefficients do not add to 1"
-msgstr "współczynniki nie sumują się do 1"
+#. R/power.R: stop("exactly one of 'n', 'delta', 'sd', 'power', and 'sig.level' must be NULL")
+#: R/power.R:0
+msgid ""
+"exactly one of 'n', 'delta', 'sd', 'power', and 'sig.level' must be NULL"
+msgstr ""
+"dokładnie jeden z 'groups', 'n', 'between.var', 'within.var', 'power', oraz "
+"'sig.level' musi mieć wartość NULL"
 
-msgid "'k' is not a kernel"
-msgstr "argument 'k' nie jest jÄ…drem"
+#. R/power.R: stop("exactly one of 'n', 'p1', 'p2', 'power', and 'sig.level' must be NULL")
+#: R/power.R:0
+msgid "exactly one of 'n', 'p1', 'p2', 'power', and 'sig.level' must be NULL"
+msgstr ""
+"dokładnie jeden z 'n', 'p1', 'p2', 'power', oraz 'sig.level' musi mieć "
+"wartość NULL"
 
-msgid "'x' is shorter than kernel 'k'"
-msgstr "'x' jest krótsze niż jądro 'k'"
+#. R/ts.R: warning("extending time series when replacing values", call. = FALSE)
+#: R/ts.R:0
+msgid "extending time series when replacing values"
+msgstr "rozszerzanie szeregów czasowych przy wymianie wartości"
 
-msgid "'kernapply' is not available for object 'x'"
-msgstr "'kernapply' nie jest dostępny dla obiektu 'x'"
+#. R/logLik.R: warning("extra arguments discarded")
+#: R/logLik.R:0
+msgid "extra arguments discarded"
+msgstr "dodatkowe argumenty zostały odrzucone"
 
-msgid "'x' is not a kernel"
-msgstr "argument 'x' nie jest jÄ…drem"
+#. R/nlm.R: if (doX) "did not succeed extending the interval endpoints for f(lower) * f(upper) <= 0" else "f() values at end points not of opposite sign"
+#: R/nlm.R:0
+msgid "f() values at end points not of opposite sign"
+msgstr "wartości 'f()' na końcach nie są przeciwnego znaku"
 
-msgid "empty cluster: try a better set of initial centers"
-msgstr "pusta grupa: spróbuj lepszego zestawu początkowych centrów"
+#. R/nlm.R: stop("f.lower = f(lower) is NA")
+#: R/nlm.R:0
+msgid "f.lower = f(lower) is NA"
+msgstr "'f.lower = f(lower)' ma wartość NA"
 
-msgid "number of cluster centres must lie between 1 and nrow(x)"
-msgstr "liczba centrów grup musi leżeć pomiędzy 1 a 'nrow(x)'"
+#. R/nlm.R: stop("f.upper = f(upper) is NA")
+#: R/nlm.R:0
+msgid "f.upper = f(upper) is NA"
+msgstr "'f.upper = f(upper)' ma wartość NA"
 
-msgid "Quick-TRANSfer stage steps exceeded maximum (= %d)"
-msgstr "Kroki etapu Quick-TRANSfer przekroczyły maksimum (= %d)"
+#. R/factanal.R: stop("factor analysis applies only to numerical variables")
+#. R/factanal.R: stop("factor analysis applies only to numerical variables")
+#: R/factanal.R:0
+msgid "factor analysis applies only to numerical variables"
+msgstr "analiza czynnikowa stosuje siÄ™ tylko zmiennych liczbowych"
 
-msgid "invalid nrow(x)"
-msgstr "niepoprawna wartość 'nrow(x)'"
+#. R/factanal.R: stop("factor analysis requires at least three variables")
+#: R/factanal.R:0
+msgid "factor analysis requires at least three variables"
+msgstr "analiza czynnikowa wymaga przynajmniej trzech zmiennych"
 
-msgid "invalid ncol(x)"
-msgstr "niepoprawna wartość 'ncol(x)'"
+#. R/quantile.R: stop("factors are not allowed")
+#: R/quantile.R:0
+msgid "factors are not allowed"
+msgstr "czynniki nie sÄ… dozwolone"
 
-msgid "'centers' must be a number or a matrix"
-msgstr "'centers' musi być liczbą lub macierzą"
+#. R/reshape.R: stop("failed to guess time-varying variables from their names")
+#: R/reshape.R:0
+msgid "failed to guess time-varying variables from their names"
+msgstr "nie udało się odgadnąć zmiennych zależnych od czasu z ich nazw"
 
-msgid "more cluster centers than distinct data points."
-msgstr "więcej centrów grup niż odmiennych punktów danych."
+#. R/lm.R: gettextf("family '%s' not implemented", fam)
+#: R/lm.R:0
+msgid "family '%s' not implemented"
+msgstr "rodzina '%s' nie jest zaimplementowana"
 
-msgid "initial centers are not distinct"
-msgstr "początkowe centra nie są różne"
+#. R/loess.R: stop("first argument must be a \"loess\" object")
+#: R/loess.R:0
+msgid "first argument must be a \"loess\" object"
+msgstr "pierwszy argument musi być obiektem klasu \"loess\""
 
-msgid "more cluster centers than data points"
-msgstr "więcej centrów grup niż punktów danych"
+#. R/glm.R: warning("fitting to calculate the null deviance did not converge -- increase 'maxit'?")
+#: R/glm.R:0
+msgid ""
+"fitting to calculate the null deviance did not converge -- increase 'maxit'?"
+msgstr ""
+"dopasowanie aby wyliczyć zerowe odchylenie nie uzbieżniło się -- zwiększyć "
+"wartość 'maxit'?"
 
-msgid "'invalid value of 'k'"
-msgstr "niepoprawna wartość 'k'"
+#. R/family.R: stop("for the 'binomial' family, y must be a vector of 0 and 1's\nor a 2 column matrix where col 1 is no. successes and col 2 is no. failures")
+#: R/family.R:0
+msgid ""
+"for the 'binomial' family, y must be a vector of 0 and 1's\n"
+"or a 2 column matrix where col 1 is no. successes and col 2 is no. failures"
+msgstr ""
+"dla rodziny 'binomial, argument 'y' musi być wektorem zer i jedynek lub 2 "
+"kolumnową macierzą, gdzie pierwsza kolumna jest liczbą sukcesów, a druga "
+"kolumna jest liczbą porażek"
 
-msgid "'iter.max' must be positive"
-msgstr "argument 'iter.max' musi być dodatni"
+#. R/family.R: stop("for the 'quasibinomial' family, y must be a vector of 0 and 1's\nor a 2 column matrix where col 1 is no. successes and col 2 is no. failures")
+#: R/family.R:0
+msgid ""
+"for the 'quasibinomial' family, y must be a vector of 0 and 1's\n"
+"or a 2 column matrix where col 1 is no. successes and col 2 is no. failures"
+msgstr ""
+"dla rodziny 'quasibinomial', argument 'y' musi być wektorem zer i jedynek "
+"lub 2 kolumnową macierzą, gdzie pierwsza kolumna jest liczbą sukcesów, a "
+"druga kolumna jest liczbą porażek"
 
-msgid "must have same number of columns in 'x' and 'centers'"
-msgstr "potrzeba mieć tę samą liczbę kolumn w 'x' oraz 'centers'"
+#. R/nlsFunc.R: gettextf("formula '%s' must be of the form '~expr'", deparse(as.vector(object)))
+#: R/nlsFunc.R:0
+msgid "formula '%s' must be of the form '~expr'"
+msgstr "formuła '%s' musi mieć formę '~expr'"
 
-msgid "'x' is a list, so ignoring argument 'g'"
-msgstr "argument 'x' jest listą, więc ignorowanie argumentu 'g'"
+#. R/friedman.test.R: stop("formula missing")
+#: R/friedman.test.R:0
+msgid "formula missing"
+msgstr "brakuje argumentu 'formula'"
 
-msgid "some elements of 'x' are not numeric and will be coerced to numeric"
+#. R/StructTS.R: stop("frequency must be a positive integer >= 2 for BSM")
+#: R/StructTS.R:0
+msgid "frequency must be a positive integer >= 2 for BSM"
 msgstr ""
-"niektóre elementy 'x' nie są liczbami, więc zostaną przekształcone na liczby"
+"częstotliwość musi być dodatnią liczbą całkowitą >= 2 dla Podstawowego "
+"Modelowania Strukturalnego (BSM)"
 
-msgid "not enough 'x' data"
-msgstr "zbyt mało danych 'x'"
+#. R/glm.R: warning("glm.fit: algorithm did not converge", call. = FALSE)
+#: R/glm.R:0
+msgid "glm.fit: algorithm did not converge"
+msgstr "glm.fit: algorytm nie zbiegł się"
 
-msgid "not enough 'y' data"
-msgstr "zbyt mało danych 'y'"
+#. R/glm.R: warning("glm.fit: algorithm stopped at boundary value", call. = FALSE)
+#: R/glm.R:0
+msgid "glm.fit: algorithm stopped at boundary value"
+msgstr "glm.fit: algorytm zatrzymał się na wartości granicznej"
 
-msgid "p-value will be approximate in the presence of ties"
+#. R/glm.R: warning("glm.fit: fitted probabilities numerically 0 or 1 occurred",     call. = FALSE)
+#: R/glm.R:0
+msgid "glm.fit: fitted probabilities numerically 0 or 1 occurred"
 msgstr ""
-"wartość prawdopodobieństwa w obecności powtórzonych wartości będzie "
-"przybliżona"
+"glm.fit: dopasowane prawdopodobieństwa numerycznie okazały się być 0 lub 1"
 
-msgid "'y' must be numeric or a function or a string naming a valid function"
-msgstr ""
-"'y' musi być liczbą lub funkcją lub łańcuchem o poprawnej nazwie funkcji"
+#. R/glm.R: warning("glm.fit: fitted rates numerically 0 occurred", call. = FALSE)
+#: R/glm.R:0
+msgid "glm.fit: fitted rates numerically 0 occurred"
+msgstr "glm.fit: dopasowane stosunki numerycznie okazały się być 0"
 
-msgid "ties should not be present for the Kolmogorov-Smirnov test"
-msgstr ""
-"wartości powtórzone nie powinny być obecne w teście Kolmogorowa-Smirnowa"
+#. R/ansari.test.R: stop("grouping factor must have exactly 2 levels")
+#. R/mood.test.R: stop("grouping factor must have exactly 2 levels")
+#. R/t.test.R: stop("grouping factor must have exactly 2 levels")
+#. R/var.test.R: stop("grouping factor must have exactly 2 levels")
+#. R/wilcox.test.R: stop("grouping factor must have exactly 2 levels")
+#: R/ansari.test.R:0 R/mood.test.R:0 R/t.test.R:0 R/var.test.R:0
+#: R/wilcox.test.R:0
+msgid "grouping factor must have exactly 2 levels"
+msgstr "grupujący czynnik musi mieć dokładnie 2 poziomy"
 
+#. R/plot.lm.R: gettextf("hat values (leverages) are all = %s\n and there are no factor predictors; no plot no. 5",     format(mean(r.hat)))
+#: R/plot.lm.R:0
 msgid ""
-"numeric y must be supplied.\n"
-"For density estimation use density()"
+"hat values (leverages) are all = %s\n"
+" and there are no factor predictors; no plot no. 5"
 msgstr ""
-"liczbowy argument 'y' musi zostać dostarczony.\n"
-"Dla estymacji gęstości użyj 'density()'"
-
-msgid "'k' is not an integer"
-msgstr "argument 'k' nie jest liczbą całkowitą"
+"wszystkie dopasowane wartości (zależne) są = %s\n"
+"oraz nie ma czynnikowych predyktorów; brak wykresu nr. 5"
 
-msgid "method = '%s' is not supported. Using 'qr'"
-msgstr "'method = %s' nie jest wspierane. Używanie 'qr'"
+#. R/fisher.test.R: stop("if 'x' is not a matrix, 'y' must be given")
+#. R/mcnemar.test.R: stop("if 'x' is not a matrix, 'y' must be given")
+#: R/fisher.test.R:0 R/mcnemar.test.R:0
+msgid "if 'x' is not a matrix, 'y' must be given"
+msgstr "jeśli argument 'x' nie jest macierzą, argument 'y' musi zostać podane"
 
-msgid "number of offsets is %d, should equal %d (number of observations)"
-msgstr "liczba przesunięć (%d) powinna być równa liczbie obserwacji (%d)"
+#. R/mantelhaen.test.R: stop("if 'x' is not an array, 'y' must be given")
+#: R/mantelhaen.test.R:0
+msgid "if 'x' is not an array, 'y' must be given"
+msgstr "jeśli argument 'x' nie jest tablicą, argument 'y' musi być podany"
 
-msgid "'x' must be a matrix"
-msgstr "'x' musi być macierzą"
+#. R/mantelhaen.test.R: stop("if 'x' is not an array, 'z' must be given")
+#: R/mantelhaen.test.R:0
+msgid "if 'x' is not an array, 'z' must be given"
+msgstr "jeśli argument 'x' nie jest tablicą, argument 'z' musi być podany"
 
-msgid "0 (non-NA) cases"
-msgstr "0 przypadków (nie o wartości NA)"
+#. R/family.R: warning("ignoring prior weights")
+#: R/family.R:0
+msgid "ignoring prior weights"
+msgstr "ignorowanie wag a priori"
 
+#. R/lm.R: stop("incompatible dimensions")
+#. R/lm.R: stop("incompatible dimensions")
+#: R/lm.R:0
 msgid "incompatible dimensions"
 msgstr "niezgodne wymiary"
 
-msgid "singular fit encountered"
-msgstr "napotkano osobliwe dopasowanie"
+#. R/ts.R: stop("inconsistent specification of 'ar' order")
+#: R/ts.R:0
+msgid "inconsistent specification of 'ar' order"
+msgstr "niespójna specyfikacja porządku 'ar'"
 
-msgid "missing or negative weights not allowed"
-msgstr "brakujÄ…ce lub ujemne wagi nie sÄ… dozwolone"
+#. R/ts.R: stop("inconsistent specification of 'ma' order")
+#: R/ts.R:0
+msgid "inconsistent specification of 'ma' order"
+msgstr "niespójna specyfikacja porządku 'ma'"
 
-msgid "invalid 'lm' object:  no 'terms' component"
-msgstr "niepoprawny obiekt 'lm':  brak komponentu 'terms'"
+#. R/diffinv.R: stop("incorrect dimensions for 'xi'")
+#: R/diffinv.R:0
+msgid "incorrect dimensions for 'xi'"
+msgstr "niepoprawne wymiary dla 'xi'"
 
-msgid "calling summary.lm(<fake-lm-object>) ..."
-msgstr "wywoływanie 'summary.lm(<fake-lm-object>)' ..."
+#. R/binom.test.R: stop("incorrect length of 'x'")
+#: R/binom.test.R:0
+msgid "incorrect length of 'x'"
+msgstr "niepoprawna długość argumentu 'x'"
 
-msgid "residual degrees of freedom in object suggest this is not an \"lm\" fit"
-msgstr ""
-"stopnie swobody reszty w obiekcie sugerują, że nie jest do dopasowanie 'lm'"
+#. R/ftable.R: stop("incorrect specification for 'col.vars'")
+#. R/ftable.R: stop("incorrect specification for 'col.vars'")
+#: R/ftable.R:0
+msgid "incorrect specification for 'col.vars'"
+msgstr "niepoprawne określenie dla argumentu 'col.vars'"
 
-msgid "essentially perfect fit: summary may be unreliable"
-msgstr "idealne dopasowanie: podsumowanie może nie być wiarygodne"
+#. R/friedman.test.R: stop("incorrect specification for 'formula'")
+#. R/quade.test.R: stop("incorrect specification for 'formula'")
+#: R/friedman.test.R:0 R/quade.test.R:0
+msgid "incorrect specification for 'formula'"
+msgstr "niepoprawne określenie dla argumentu 'formula'"
 
-msgid ""
-"lm object does not have a proper 'qr' component.\n"
-" Rank zero or should not have used lm(.., qr=FALSE)."
-msgstr ""
-"obiekt 'lm' nie ma poprawnego komponentu 'qr'. Ranga powinna być zerem lub "
-"nie powinieneś był użyć 'lm(.., qr=FALSE)'."
+#. R/ftable.R: stop("incorrect specification for 'row.vars'")
+#. R/ftable.R: stop("incorrect specification for 'row.vars'")
+#: R/ftable.R:0
+msgid "incorrect specification for 'row.vars'"
+msgstr "niepoprawne określenie dla argumentu 'row.vars'"
 
-msgid "family '%s' not implemented"
-msgstr "rodzina '%s' nie jest zaimplementowana"
+#. R/ftable.R: stop("incorrect variable names in lhs of formula")
+#: R/ftable.R:0
+msgid "incorrect variable names in lhs of formula"
+msgstr "niepoprawne nazwy zmiennych po lewej stronie formuły"
 
-msgid "calling anova.lm(<fake-lm-object>) ..."
-msgstr "wywoływanie 'anova.lm(<fake-lm-object>)' ..."
+#. R/ftable.R: stop("incorrect variable names in rhs of formula")
+#: R/ftable.R:0
+msgid "incorrect variable names in rhs of formula"
+msgstr "niepoprawne nazwy zmiennych po prawej stronie formuły"
 
-msgid "ANOVA F-tests on an essentially perfect fit are unreliable"
-msgstr "Testy ANOVA Fishera w istocie na idealnym dopasowaniu sÄ… niewiarygodne"
+#. R/bandwidths.R: gettextf("increasing bw.SJ() search interval (%d) to [%.4g,%.4g]",     itry, lower, upper)
+#: R/bandwidths.R:0
+msgid "increasing bw.SJ() search interval (%d) to [%.4g,%.4g]"
+msgstr "zwiększanie przeszukiwanego przedziału 'bw.SJ()' (%d) do [%.4g,%.4g]"
 
-msgid "calling predict.lm(<fake-lm-object>) ..."
-msgstr "wywoływanie 'predict.lm(<fake-lm-object>)' ..."
+#. R/kmeans.R: stop("initial centers are not distinct")
+#: R/kmeans.R:0
+msgid "initial centers are not distinct"
+msgstr "początkowe centra nie są różne"
 
-msgid "prediction from a rank-deficient fit may be misleading"
-msgstr "predykcja z dopasowania z niedoborem rang może być myląca"
+#. R/constrOptim.R: stop("initial value is not in the interior of the feasible region")
+#: R/constrOptim.R:0
+msgid "initial value is not in the interior of the feasible region"
+msgstr "wartość początkowa nie jest wewnątrz możliwego regionu"
 
-msgid "predictions on current data refer to _future_ responses"
-msgstr ""
-"predykcje na bieżących danych odnoszą się do _przyszłych_ wartości zmiennej "
-"zależnej"
+#. R/glm.R: stop("inner loop 1; cannot correct step size", call. = FALSE)
+#: R/glm.R:0
+msgid "inner loop 1; cannot correct step size"
+msgstr "wewnętrzna pętla 1; nie można poprawić rozmiaru kroku"
 
-msgid ""
-"assuming prediction variance inversely proportional to weights used for "
-"fitting"
-msgstr ""
-"zakładanie przewidywanej wariancji odwrotnie proporcjonalnej do wag użytych "
-"do dopasowania"
+#. R/glm.R: stop("inner loop 2; cannot correct step size", call. = FALSE)
+#: R/glm.R:0
+msgid "inner loop 2; cannot correct step size"
+msgstr "wewnętrzna pętla 2; nie można poprawić rozmiaru kroku"
 
-msgid "Assuming constant prediction variance even though model fit is weighted"
-msgstr ""
-"Zakładanie stałości przewidywanej wariancji mimo iż dopasowanie modelu jest "
-"ważone"
+#. R/ftable.R: stop("interactions are not allowed")
+#. R/xtabs.R: stop("interactions are not allowed")
+#: R/ftable.R:0 R/xtabs.R:0
+msgid "interactions are not allowed"
+msgstr "interakcje nie sÄ… dozwolone"
 
-msgid "'weights' as formula should be one-sided"
-msgstr "'weights' jako formuła powinna być jednostronna"
+#. R/arima.R: stop("invalid 'SSinit'")
+#: R/arima.R:0
+msgid "invalid 'SSinit'"
+msgstr "niepoprawna wartość 'SSinit'"
 
-msgid "'object' has no 'effects' component"
-msgstr "'object' nie ma komponentu 'effects'"
+#. R/symnum.R: stop("invalid 'abbr.colnames'")
+#: R/symnum.R:0
+msgid "invalid 'abbr.colnames'"
+msgstr "niepoprawna wartość 'abbr.colnames'"
 
-msgid "the 'se.fit' argument is not yet implemented for \"mlm\" objects"
-msgstr "argument 'se.fit' dla obiektów 'mlm' nie jest jeszcze zaimplementowany"
+#. R/models.R: stop("invalid 'contrasts.arg' argument")
+#: R/models.R:0
+msgid "invalid 'contrasts.arg' argument"
+msgstr "niepoprawny argument 'contrasts.arg'"
 
-msgid "invalid model QR matrix"
-msgstr "niepoprawna macierz QR modelu"
+#. R/loess.R: stop("invalid 'control' argument")
+#: R/loess.R:0
+msgid "invalid 'control' argument"
+msgstr "niepoprawny argument 'control'"
 
-msgid "non-NA residual length does not match cases used in fitting"
-msgstr ""
-"długości nie-NA reszt nie zgadzają się z przypadkami użytymi w dopasowaniu"
+#. R/smspline.R: stop("invalid 'control.spar'")
+#: R/smspline.R:0
+msgid "invalid 'control.spar'"
+msgstr "niepoprawna wartość 'control.spar'"
 
-msgid "too few cases, n < k"
-msgstr "zbyt mało przypadków, n < k"
+#. R/models.R: stop("invalid 'data' argument")
+#: R/models.R:0
+msgid "invalid 'data' argument"
+msgstr "niepoprawny argument 'data'"
 
-msgid "predictors must all be numeric"
-msgstr "wszystkie predyktory muszą być liczbami"
+#. R/smooth.R: stop("invalid 'endrule' argument")
+#: R/smooth.R:0
+msgid "invalid 'endrule' argument"
+msgstr "niepoprawny argument 'endrule'"
 
-msgid "'degree' must be 0, 1 or 2"
-msgstr "argument 'degree' musi mieć wartość 0, 1, lub 2"
+#. R/nlm.R: stop("invalid 'extendInt'; please report")
+#: R/nlm.R:0
+msgid "invalid 'extendInt'; please report"
+msgstr "niepoprawny argument 'extendInt'; proszę zgłosić raport"
 
-msgid "both 'span' and 'enp.target' specified: 'span' will be used"
-msgstr "określono 'span' oraz 'enp.target': zostanie użyty 'span'"
+#. R/lm.R: stop("invalid 'lm' object:  no 'terms' component")
+#: R/lm.R:0
+msgid "invalid 'lm' object:  no 'terms' component"
+msgstr "niepoprawny obiekt 'lm':  brak komponentu 'terms'"
 
-msgid "invalid 'control' argument"
-msgstr "niepoprawny argument 'control'"
+#. R/glm.R: stop("invalid 'method' argument")
+#: R/glm.R:0
+msgid "invalid 'method' argument"
+msgstr "niepoprawny argument 'method'"
 
-msgid "invalid NCOL(X)"
-msgstr "niepoprawna wartość 'NCOL(X)'"
+#. R/bandwidths.R: stop("invalid 'nb'")
+#. R/bandwidths.R: stop("invalid 'nb'")
+#. R/bandwidths.R: stop("invalid 'nb'")
+#: R/bandwidths.R:0
+msgid "invalid 'nb'"
+msgstr "niepoprawna wartość 'nb'"
 
-msgid "only 1-4 predictors are allowed"
-msgstr "tylko od 1 do 4 predyktorów jest dozwolone"
+#. R/cutree.R: stop("invalid 'tree' ('merge' component)")
+#: R/cutree.R:0
+msgid "invalid 'tree' ('merge' component)"
+msgstr "niepoprawny argument 'tree' (komponent 'merge')"
+
+#. R/cor.R: stop("invalid 'use' argument")
+#. R/cor.R: stop("invalid 'use' argument")
+#. R/cor.R: stop("invalid 'use' argument")
+#: R/cor.R:0
+msgid "invalid 'use' argument"
+msgstr "niepoprawny argument 'use'"
 
+#. R/bandwidths.R: stop("invalid 'x'")
+#. R/bandwidths.R: stop("invalid 'x'")
+#. R/bandwidths.R: stop("invalid 'x'")
+#. R/chisq.test.R: stop("invalid 'x'")
+#. R/loess.R: stop("invalid 'x'")
+#: R/bandwidths.R:0 R/chisq.test.R:0 R/loess.R:0
+msgid "invalid 'x'"
+msgstr "niepoprawna wartość 'x'"
+
+#. R/loess.R: stop("invalid 'y'")
+#: R/loess.R:0
 msgid "invalid 'y'"
 msgstr "niepoprawna wartość 'y'"
 
-msgid ""
-"specified the square of a factor predictor to be dropped when degree = 1"
-msgstr ""
-"określono kwadrat predyktora czynnika, który ma zostać pominięty, gdy "
-"stopień = 1"
+#. R/dendrogram.R: stop("invalid (length 0) node in dendrogram")
+#: R/dendrogram.R:0
+msgid "invalid (length 0) node in dendrogram"
+msgstr "niepoprawny (długość równa 0) węzeł w drzewie celu"
 
-msgid ""
-"specified the square of a predictor to be dropped with only one numeric "
-"predictor"
-msgstr ""
-"określono kwadrat predyktora, który ma zostać pominięty z tylko jednym "
-"liczbowym predyktorem"
+#. R/loess.R: stop("invalid NCOL(X)")
+#: R/loess.R:0
+msgid "invalid NCOL(X)"
+msgstr "niepoprawna wartość 'NCOL(X)'"
 
-msgid "specified parametric for all predictors"
-msgstr "określono parametry dla wszystkich predyktorów"
+#. R/loess.R: stop("invalid NROW(X)")
+#: R/loess.R:0
+msgid "invalid NROW(X)"
+msgstr "niepoprawna wartość 'NROW(X)'"
 
-msgid "invalid argument 'span'"
-msgstr "niepoprawny argument 'span'"
+#. R/r2dtable.R: stop("invalid argument 'c'")
+#: R/r2dtable.R:0
+msgid "invalid argument 'c'"
+msgstr "niepoprawny argument 'c'"
 
+#. R/loess.R: stop("invalid argument 'cell'")
+#: R/loess.R:0
 msgid "invalid argument 'cell'"
 msgstr "niepoprawny argument 'cell'"
 
+#. R/loess.R: stop("invalid argument 'degree'")
+#: R/loess.R:0
 msgid "invalid argument 'degree'"
 msgstr "niepoprawny argument 'degree'"
 
-msgid "first argument must be a \"loess\" object"
-msgstr "pierwszy argument musi być obiektem klasu \"loess\""
+#. R/family.R: stop("invalid argument 'lambda'")
+#: R/family.R:0
+msgid "invalid argument 'lambda'"
+msgstr "niepoprawny argument 'lambda'"
 
-msgid "no models to compare"
-msgstr "brak modeli do porównania"
+#. R/r2dtable.R: stop("invalid argument 'n'")
+#: R/r2dtable.R:0
+msgid "invalid argument 'n'"
+msgstr "niepoprawny argument 'n'"
 
-msgid "extra arguments discarded"
-msgstr "dodatkowe argumenty zostały odrzucone"
+#. R/nafns.R: stop("invalid argument 'omit'")
+#: R/nafns.R:0
+msgid "invalid argument 'omit'"
+msgstr "niepoprawny argument 'omit'"
 
-msgid "'logLik.lm' does not support multiple responses"
-msgstr "funkcja 'logLik.lm()' nie wspiera wielokrotnych zmiennych zależnych"
+#. R/r2dtable.R: stop("invalid argument 'r'")
+#: R/r2dtable.R:0
+msgid "invalid argument 'r'"
+msgstr "niepoprawny argument 'r'"
 
-msgid "no \"nobs\" attribute is available"
-msgstr "brak dostępnego atrybutu 'nobs'"
+#. R/loess.R: stop("invalid argument 'span'")
+#: R/loess.R:0
+msgid "invalid argument 'span'"
+msgstr "niepoprawny argument 'span'"
 
-msgid "no 'nobs' method is available"
-msgstr "brak dostępnej metody 'nobs()'"
+#. R/nls-profile.R: stop("invalid argument to 'getProfile'")
+#: R/nls-profile.R:0
+msgid "invalid argument to 'getProfile'"
+msgstr "niepoprawny argument przekazany do funkcji 'getProfile()'"
 
-msgid "'margin' must contain names or numbers corresponding to 'table'"
-msgstr ""
-"argument 'margin' musi zawierać nazwy lub liczby odpowiadające argumentowi "
-"'table'"
+#. R/hclust.R: stop("invalid clustering method", paste("", method))
+#: R/hclust.R:0
+msgid "invalid clustering method"
+msgstr "niepoprawna metoda grupowania"
 
-msgid "'start' and 'table' must be same length"
-msgstr "argumenty 'start' oraz 'table' muszą mieć tę samą długość"
+#. R/hclust.R: stop("invalid dissimilarities")
+#: R/hclust.R:0
+msgid "invalid dissimilarities"
+msgstr "niepoprawne odmienności"
 
-msgid "number of weights = %d should equal %d (number of responses)"
-msgstr "liczba wag = %d powinna być równa %d (liczbie zmiennych zależnych)"
+#. R/dist.R: stop("invalid distance method")
+#: R/dist.R:0
+msgid "invalid distance method"
+msgstr "niepoprawna metoda wyznaczania odległości"
 
-msgid "'X' matrix was collinear"
-msgstr "macierz 'X' była współliniowa"
+#. R/glm.R: stop("invalid fitted means in empty model", call. = FALSE)
+#: R/glm.R:0
+msgid "invalid fitted means in empty model"
+msgstr "niepoprawnie dopasowane średnie w pustym modelu"
 
-msgid "missing observations deleted"
-msgstr "brakujące obserwacje zostały usunięte"
+#. R/cor.test.R: stop("invalid formula")
+#. R/models.R: stop("invalid formula")
+#: R/cor.test.R:0 R/models.R:0
+msgid "invalid formula"
+msgstr "niepoprawna formuła"
 
-msgid "observations with 0 weight not used in calculating standard deviation"
-msgstr ""
-"obserwacje z zerową wagą nie zostały użyte podczas obliczania odchylenia "
-"standardowego"
+#. R/deriv.R: stop("invalid formula in deriv")
+#. R/deriv.R: stop("invalid formula in deriv")
+#: R/deriv.R:0
+msgid "invalid formula in deriv"
+msgstr "niepoprawna formuła w 'deriv()'"
 
-msgid "observations with 0 weights not used"
-msgstr "obserwacje z zerową wagą nie zostały użyte"
+#. R/approx.R: stop("invalid interpolation method")
+#. R/approx.R: stop("invalid interpolation method")
+#. R/spline.R: stop("invalid interpolation method")
+#: R/approx.R:0 R/spline.R:0
+msgid "invalid interpolation method"
+msgstr "niepoprawna metoda interpolacji"
 
-msgid "'low' and 'high' cannot be both TRUE"
-msgstr "'low' oraz 'high' nie mogą jednocześnie być TRUE"
+#. R/hclust.R: stop("invalid length of members")
+#: R/hclust.R:0
+msgid "invalid length of members"
+msgstr "niepoprawna długość argumentu 'members'"
 
-msgid "need multiple responses"
-msgstr "potrzeba wielokrotnych zmiennych zależnych"
+#. R/HoltWinters.R: stop("invalid length(x)")
+#. R/approx.R: stop("invalid length(x)")
+#. R/approx.R: stop("invalid length(x)")
+#. R/bandwidths.R: stop("invalid length(x)")
+#. R/bandwidths.R: stop("invalid length(x)")
+#. R/bandwidths.R: stop("invalid length(x)")
+#. R/stl.R: stop("invalid length(x)")
+#: R/HoltWinters.R:0 R/approx.R:0 R/bandwidths.R:0 R/stl.R:0
+msgid "invalid length(x)"
+msgstr "niepoprawna wartość 'length(x)'"
 
-msgid "object must be of class %s or %s"
-msgstr "obiekt musi być klasy %s lub %s"
+#. R/glm.R: stop("invalid linear predictor values in empty model", call. = FALSE)
+#: R/glm.R:0
+msgid "invalid linear predictor values in empty model"
+msgstr "niepoprawne wartości liniowego predyktora w pustym modelu"
 
-msgid "residuals have rank %d < %d"
-msgstr "reszty majÄ… rangÄ™ %d < %d"
+#. R/lm.influence.R: stop("invalid model QR matrix")
+#: R/lm.influence.R:0
+msgid "invalid model QR matrix"
+msgstr "niepoprawna macierz QR modelu"
 
-msgid "NAs are not allowed"
-msgstr "wartości NA nie są dozwolone"
+#. R/kmeans.R: stop("invalid ncol(x)")
+#: R/kmeans.R:0
+msgid "invalid ncol(x)"
+msgstr "niepoprawna wartość 'ncol(x)'"
 
-msgid "each dimension in table must be >= 2"
-msgstr "każdy wymiar w tabeli musi być >= 2"
+#. R/kmeans.R: stop("invalid nrow(x)")
+#: R/kmeans.R:0
+msgid "invalid nrow(x)"
+msgstr "niepoprawna wartość 'nrow(x)'"
 
-msgid "'x' must be a 3-dimensional array"
-msgstr "'x' musi być 3-wymiarową tablicą"
+#. R/smspline.R: stop("invalid number of points")
+#: R/smspline.R:0
+msgid "invalid number of points"
+msgstr "niepoprawna liczba punktów"
 
-msgid "if 'x' is not an array, 'y' must be given"
-msgstr "jeśli argument 'x' nie jest tablicą, argument 'y' musi być podany"
+#. R/integrate.R: stop("invalid parameter values")
+#: R/integrate.R:0
+msgid "invalid parameter values"
+msgstr "niepoprawne wartości parametrów"
 
-msgid "if 'x' is not an array, 'z' must be given"
-msgstr "jeśli argument 'x' nie jest tablicą, argument 'z' musi być podany"
+#. R/models.R: stop("invalid response type")
+#: R/models.R:0
+msgid "invalid response type"
+msgstr "niepoprawny typ zmiennej zależnej"
 
-msgid "'x', 'y', and 'z' must have the same length"
-msgstr "argumenty 'x', 'y' oraz 'z' muszą mieć tę samą długość"
+#. R/runmed.R: stop("invalid value of 'k'")
+#: R/runmed.R:0
+msgid "invalid value of 'k'"
+msgstr "niepoprawna wartość 'k'"
 
-msgid "sample size in each stratum must be > 1"
-msgstr "rozmiar próby w każdej warstwie musi być > 1"
+#. R/cmdscale.R: stop("invalid value of 'n'")
+#: R/cmdscale.R:0
+msgid "invalid value of 'n'"
+msgstr "niepoprawna wartość 'n'"
 
-msgid "'x' must be square with at least two rows and columns"
-msgstr ""
-"'x' musi być kwadratową macierzą z co najmniej dwoma wierszami oraz kolumnami"
+#. R/density.R: stop("invalid value of length(x)")
+#. R/diffinv.R: stop("invalid value of length(x)")
+#. R/runmed.R: stop("invalid value of length(x)")
+#. R/spline.R: stop("invalid value of length(x)")
+#. R/splinefun.R: stop("invalid value of length(x)")
+#: R/density.R:0 R/diffinv.R:0 R/runmed.R:0 R/spline.R:0 R/splinefun.R:0
+msgid "invalid value of length(x)"
+msgstr "niepoprawna wartość 'length(x)'"
 
-msgid "'x' and 'y' must have the same number of levels (minimum 2)"
-msgstr "'x' oraz 'y' muszą mieć tę samą liczbę poziomów (minimum 2)"
+#. R/identify.hclust.R: gettextf("k must be between 2 and %d", length(tree$height))
+#: R/identify.hclust.R:0
+msgid "k must be between 2 and %d"
+msgstr "elementy 'k' muszą być pomiędzy 2 a %d"
 
-msgid "need numeric data"
-msgstr "potrzeba danych liczbowych"
+#. R/fft.R: stop("length mismatch in convolution")
+#: R/fft.R:0
+msgid "length mismatch in convolution"
+msgstr "niezgodność długości w splocie"
 
-msgid "'mlm' objects with weights are not supported"
-msgstr "obiekty klasy \"mlm\" z wagami nie sÄ… wspierane"
+#. R/cov.wt.R: stop("length of 'center' must equal the number of columns in 'x'")
+#: R/cov.wt.R:0
+msgid "length of 'center' must equal the number of columns in 'x'"
+msgstr "długość 'center' musi równać się liczbie kolumn w 'x'"
 
-msgid "X does not define a subspace of M"
-msgstr "X nie definiuje podprzestrzeni M"
+#. R/filter.R: stop("length of 'init' must equal length of 'filter'")
+#: R/filter.R:0
+msgid "length of 'init' must equal length of 'filter'"
+msgstr "długość argumentu 'init' musi równać się długości argumentu 'filter'"
 
-msgid "residuals have rank %s < %s"
-msgstr "reszty majÄ… rangÄ™ %s < %s"
+#. R/spectrum.R: stop("length of 'p' must be 1 or equal the number of columns of 'x'")
+#: R/spectrum.R:0
+msgid "length of 'p' must be 1 or equal the number of columns of 'x'"
+msgstr "długość 'p' musi być 1 lub równa liczbie kolumn 'x'"
 
-msgid "'model.tables' is not implemented for multiple responses"
+#. R/glm.R: gettextf("length of 'start' should equal %d and correspond to initial coefs for %s",     nvars, paste(deparse(xnames), collapse = ", "))
+#: R/glm.R:0
+msgid ""
+"length of 'start' should equal %d and correspond to initial coefs for %s"
 msgstr ""
-"funkcja 'model.tables()' nie jest zaimplementowana dla wielu zmiennych "
-"zależnych"
-
-msgid "type '%s' is not implemented yet"
-msgstr "typ '%s' nie jest jeszcze zaimplementowany"
+"długość 'start' powinna równać się %d i odnosić się do współczynników "
+"poczÄ…tkowych dla %s"
 
-msgid "this fit does not inherit from \"lm\""
-msgstr "to dopasowanie nie dziedziczy z 'lm'"
+#. R/reshape.R: stop("length of 'v.names' does not evenly divide length of 'varying'")
+#: R/reshape.R:0
+msgid "length of 'v.names' does not evenly divide length of 'varying'"
+msgstr "długość 'v.names' nie dzieli równo długości 'varying'"
 
-msgid "'cterms' argument must match terms in model object"
-msgstr "argument 'cterms' musi zgadzać się z członami w obiekcie modelu"
-
-msgid "Design is unbalanced - use se.contrast() for se's"
-msgstr "Projekt nie jest zrównoważony -- użyj 'se.contrast()' dla 'se'"
+#. R/reshape.R: stop("length of 'varying' must be the product of length of 'v.names' and length of 'times'")
+#: R/reshape.R:0
+msgid ""
+"length of 'varying' must be the product of length of 'v.names' and length of "
+"'times'"
+msgstr ""
+"długość 'varying' musi być iloczynem długości 'v.names' oraz długości 'times'"
 
-msgid "design is unbalanced so cannot proceed"
-msgstr "projekt nie jest zrównoważony, dlatego też nie można kontynuować"
+#. R/cov.wt.R: stop("length of 'wt' must equal the number of rows in 'x'")
+#: R/cov.wt.R:0
+msgid "length of 'wt' must equal the number of rows in 'x'"
+msgstr "długość 'wt' musi być równa liczbie wierszy w 'x'"
 
+#. R/addmargins.R: gettextf("length of FUN, %d,\n does not match the length of the margins, %d",     length(FUN), n.sid)
+#: R/addmargins.R:0
 msgid ""
-"Standard error information not returned as design is unbalanced. \n"
-"Standard errors can be obtained through 'se.contrast'."
-msgstr ""
-"Standardowa informacja o błędzie nie została zwrócona z powodu "
-"niezrównoważenia projektu. \n"
-"Błędy standardowe mogą zostać uzyskane poprzez 'se.contrast'."
+"length of FUN, %d,\n"
+" does not match the length of the margins, %d"
+msgstr "długość 'FUN', %d, nie zgadza się z długością marginesów, %d"
 
-msgid "SEs for type '%s' are not yet implemented"
-msgstr "błędy standardowe dla typu '%s' nie są jeszcze zaimplementowane"
+#. R/biplot.R: stop("length of choices must be 2")
+#. R/biplot.R: stop("length of choices must be 2")
+#: R/biplot.R:0
+msgid "length of choices must be 2"
+msgstr "długość 'choices' musi wynosić 2"
 
-msgid "na.action must be a function"
-msgstr "argument 'na.action' musi być funkcją"
+#. R/smspline.R: stop("lengths of 'x' and 'w' must match")
+#: R/smspline.R:0
+msgid "lengths of 'x' and 'w' must match"
+msgstr "długości argumentów 'x' oraz 'w' muszą się zgadzać"
 
-msgid "non-factors ignored: %s"
-msgstr "zignorowano nie-czynniki: %s"
+#. R/arima.R: stop("lengths of 'x' and 'xreg' do not match")
+#. R/arma0.R: stop("lengths of 'x' and 'xreg' do not match")
+#: R/arima.R:0 R/arma0.R:0
+msgid "lengths of 'x' and 'xreg' do not match"
+msgstr "długości argumentów 'x' oraz 'xreg' muszą się zgadzać"
 
-msgid "eff.aovlist: non-orthogonal contrasts would give an incorrect answer"
-msgstr "eff.aovlist: nieortogonalne kontrasty dałyby niepoprawną odpowiedź"
+#. R/nls-profile.R: warning("levels truncated to positive values only")
+#: R/nls-profile.R:0
+msgid "levels truncated to positive values only"
+msgstr "poziomy przycięto tylko do wartości dodatnich"
 
-msgid "cannot create a formula from a zero-column data frame"
-msgstr "nie można utworzyć formuły z ramki danych o zerowej liczbie kolumn"
+#. R/family.R: gettextf("link \"%s\" not available for binomial family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid "link \"%s\" not available for binomial family; available links are %s"
+msgstr ""
+"link '%s' nie jest dostępny dla rodziny Bernoulliego; dostępne linki to %s"
 
-msgid "no terms component nor attribute"
-msgstr "brak komponentu 'terms' oraz atrybutu"
+#. R/family.R: gettextf("link \"%s\" not available for gamma family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid "link \"%s\" not available for gamma family; available links are %s"
+msgstr "link '%s' nie jest dostępny dla rodziny Gamma; dostępne linki to %s"
 
-msgid "'termlabels' must be a character vector of length at least one"
+#. R/family.R: gettextf("link \"%s\" not available for gaussian family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid "link \"%s\" not available for gaussian family; available links are %s"
 msgstr ""
-"argument 'termlabels' musi być wektorem tekstowym o długości co najmniej 1"
+"link '%s' nie jest dostępny dla rodziny gaussowskiej; dostępne linki to %s"
 
-msgid "'termobj' must be a object of class %s"
-msgstr "argument 'termobj' musi być obiektem klasy %s"
+#. R/family.R: gettextf("link \"%s\" not available for inverse.gaussian family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid ""
+"link \"%s\" not available for inverse.gaussian family; available links are %s"
+msgstr ""
+"link '%s' nie jest dostępny dla rodziny 'inverse.gaussian'; dostępne linki "
+"to %s"
 
-msgid "variable '%s' was fitted with type \"%s\" but type \"%s\" was supplied"
-msgstr "zmienna '%s' została dopasowana z typem '%s', ale dostarczono typ '%s'"
+#. R/family.R: gettextf("link \"%s\" not available for poisson family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid "link \"%s\" not available for poisson family; available links are %s"
+msgstr "link '%s' nie jest dostępny dla rodziny Poissona; dostępne linki to %s"
 
-msgid "variables %s were specified with different types from the fit"
-msgstr "zmienne %s zostały określone z typami innymi od tych z dopasowania"
+#. R/family.R: gettextf("link \"%s\" not available for quasibinomial family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid ""
+"link \"%s\" not available for quasibinomial family; available links are %s"
+msgstr ""
+"link '%s' nie jest dostępny dla rodziny kwazi-Bernoulliego; dostępne linki "
+"to %s"
 
-msgid "'data' must be a data.frame, not a matrix or an array"
-msgstr "'data' musi być ramką danych, nie macierzą lub tablicą"
+#. R/family.R: gettextf("link \"%s\" not available for quasipoisson family; available links are %s",     linktemp, paste(sQuote(okLinks), collapse = ", "))
+#: R/family.R:0
+msgid ""
+"link \"%s\" not available for quasipoisson family; available links are %s"
+msgstr ""
+"link '%s' nie jest dostępny dla rodziny kwazi-Poissona; dostępne linki to %s"
 
-msgid "variable '%s' is not a factor"
-msgstr "zmienna '%s' nie jest czynnikiem"
+#. R/lm.R: stop("lm object does not have a proper 'qr' component.\n Rank zero or should not have used lm(.., qr=FALSE).")
+#: R/lm.R:0
+msgid ""
+"lm object does not have a proper 'qr' component.\n"
+" Rank zero or should not have used lm(.., qr=FALSE)."
+msgstr ""
+"obiekt 'lm' nie ma poprawnego komponentu 'qr'. Ranga powinna być zerem lub "
+"nie powinieneś był użyć 'lm(.., qr=FALSE)'."
 
-msgid "'offset' must be numeric"
-msgstr "argument 'offset' musi być liczbą"
+#. R/nlminb.R: stop("logical 'hessian' argument not allowed.  See documentation.")
+#: R/nlminb.R:0
+msgid "logical 'hessian' argument not allowed.  See documentation."
+msgstr "logiczny argument 'hessian' nie jest dozwolony. Zobacz dokumentacjÄ™."
 
-msgid "model frame and formula mismatch in model.matrix()"
-msgstr "ramka modelu oraz fomuła nie zgadzają się w 'model.matrix()'"
+#. R/nlm.R: stop("lower < upper  is not fulfilled")
+#: R/nlm.R:0
+msgid "lower < upper  is not fulfilled"
+msgstr "warunek 'dolna < górna' nie został spełniony"
 
-msgid "invalid 'contrasts.arg' argument"
-msgstr "niepoprawny argument 'contrasts.arg'"
+#. R/glm.R: stop("maximum number of iterations must be > 0")
+#: R/glm.R:0
+msgid "maximum number of iterations must be > 0"
+msgstr "maksymalna liczba iteracji musi być > 0"
 
-msgid "variable '%s' is absent, its contrast will be ignored"
-msgstr "zmienna '%s' jest nieobecna, jej kontrast będzie zignorowany"
+#. R/optim.R: stop("method = \"Brent\" is only available for one-dimensional optimization")
+#: R/optim.R:0
+msgid "method = \"Brent\" is only available for one-dimensional optimization"
+msgstr ""
+"'metod = \"Brent\"' jest dostępna jedynie dla jednowymiarowej optymalizacji"
 
-msgid "using type = \"numeric\" with a factor response will be ignored"
+#. R/lm.R: gettextf("method = '%s' is not supported. Using 'qr'", method)
+#. R/lm.R: gettextf("method = '%s' is not supported. Using 'qr'", method)
+#. R/lm.R: gettextf("method = '%s' is not supported. Using 'qr'", method)
+#: R/lm.R:0
+msgid "method = '%s' is not supported. Using 'qr'"
+msgstr "'method = %s' nie jest wspierane. Używanie 'qr'"
+
+#. R/optim.R: warning("method L-BFGS-B uses 'factr' (and 'pgtol') instead of 'reltol' and 'abstol'")
+#: R/optim.R:0
+msgid ""
+"method L-BFGS-B uses 'factr' (and 'pgtol') instead of 'reltol' and 'abstol'"
 msgstr ""
-"użycie 'type=\"numeric\"' z czynnikową zmienną zależną zostanie zignorowane"
+"metoda L-BFGS-B używa 'factr' (oraz 'pgtol') zamiast 'reltol' oraz 'abstol'"
 
-msgid "invalid response type"
-msgstr "niepoprawny typ zmiennej zależnej"
+#. R/dendrogram.R: warning("midcache() of non-binary dendrograms only partly implemented")
+#: R/dendrogram.R:0
+msgid "midcache() of non-binary dendrograms only partly implemented"
+msgstr ""
+"'midcache()' dla niebinarnych drzew celu tylko częściowo zaimplementowane"
 
-msgid "invalid 'data' argument"
-msgstr "niepoprawny argument 'data'"
+#. R/bandwidths.R: warning("minimum occurred at one end of the range")
+#. R/bandwidths.R: warning("minimum occurred at one end of the range")
+#: R/bandwidths.R:0
+msgid "minimum occurred at one end of the range"
+msgstr "odnotowano wartość minimalną na jednym z końców zakresu"
 
-msgid "all times contain an NA"
-msgstr "wszystkie czasy zawierają wartość NA"
+#. R/ppr.R: stop("mismatched 'x' and 'y'")
+#: R/ppr.R:0
+msgid "mismatched 'x' and 'y'"
+msgstr "niezgodne 'x' oraz 'y'"
 
-msgid "missing values in object"
-msgstr "brakujące wartości w argumencie 'object'"
+#. R/lsfit.R: warning("missing observations deleted")
+#: R/lsfit.R:0
+msgid "missing observations deleted"
+msgstr "brakujące obserwacje zostały usunięte"
 
-msgid "invalid argument 'omit'"
-msgstr "niepoprawny argument 'omit'"
+#. R/smspline.R: stop("missing or infinite values in inputs are not allowed")
+#: R/smspline.R:0
+msgid "missing or infinite values in inputs are not allowed"
+msgstr "wartości brakujące lub nieskończone nie są dozwolone na wejściach"
 
-msgid "'print.level' must be in {0,1,2}"
-msgstr "argument 'print.level' musi być liczbą w przedziale [0, 1, 2]"
+#. R/lm.R: stop("missing or negative weights not allowed")
+#. R/nls.R: stop("missing or negative weights not allowed")
+#: R/lm.R:0 R/nls.R:0
+msgid "missing or negative weights not allowed"
+msgstr "brakujÄ…ce lub ujemne wagi nie sÄ… dozwolone"
 
-msgid "'interval' must be a vector of length 2"
-msgstr "argument 'interval' musi być wektorem liczbowym o długości 2"
+#. R/quantile.R: stop("missing values and NaN's not allowed if 'na.rm' is FALSE")
+#: R/quantile.R:0
+msgid "missing values and NaN's not allowed if 'na.rm' is FALSE"
+msgstr ""
+"brakujące wartości oraz wartości NaN nie są dozwolone jeśli 'na.rm = FALSE'"
 
-msgid "lower < upper  is not fulfilled"
-msgstr "warunek 'dolna < górna' nie został spełniony"
+#. R/contr.poly.R: stop("missing values are not allowed in 'poly'")
+#: R/contr.poly.R:0
+msgid "missing values are not allowed in 'poly'"
+msgstr "brakujące wartości w 'poly()' nie są dozwolone"
 
-msgid "f.lower = f(lower) is NA"
-msgstr "'f.lower = f(lower)' ma wartość NA"
+#. R/filter.R: stop("missing values in 'filter'")
+#: R/filter.R:0
+msgid "missing values in 'filter'"
+msgstr "brakujące wartości w argumencie 'filter'"
 
-msgid "f.upper = f(upper) is NA"
-msgstr "'f.upper = f(upper)' ma wartość NA"
+#. R/nafns.R: stop("missing values in object")
+#: R/nafns.R:0
+msgid "missing values in object"
+msgstr "brakujące wartości w argumencie 'object'"
 
-msgid "invalid 'extendInt'; please report"
-msgstr "niepoprawny argument 'extendInt'; proszę zgłosić raport"
+#. R/isoreg.R: stop("missing values not allowed")
+#: R/isoreg.R:0
+msgid "missing values not allowed"
+msgstr "brakujące wartości są niedozwolone"
 
-msgid "no sign change found in %d iterations"
-msgstr "nie zaobserwowano zmiany znaku w %d iteracjach"
+#. R/models.R: stop("model frame and formula mismatch in model.matrix()")
+#: R/models.R:0
+msgid "model frame and formula mismatch in model.matrix()"
+msgstr "ramka modelu oraz fomuła nie zgadzają się w 'model.matrix()'"
 
-msgid ""
-"did not succeed extending the interval endpoints for f(lower) * f(upper) <= 0"
+#. R/AIC.R: warning("models are not all fitted to the same number of observations")
+#. R/AIC.R: warning("models are not all fitted to the same number of observations")
+#: R/AIC.R:0
+msgid "models are not all fitted to the same number of observations"
+msgstr "nie wszystkie modele sÄ… dopasowane do tej samej liczby obserwacji"
+
+#. R/glm.R: stop("models were not all fitted to the same size of dataset")
+#. R/lm.R: stop("models were not all fitted to the same size of dataset")
+#. R/mlm.R: stop("models were not all fitted to the same size of dataset")
+#: R/glm.R:0 R/lm.R:0 R/mlm.R:0
+msgid "models were not all fitted to the same size of dataset"
 msgstr ""
-"nie udało się rozszerzenie końców przedziału dla f(dolny) * f(górny) <= 0"
+"nie wszystkie modele zostały dopasowane do zbioru danych tego samego rozmiaru"
 
-msgid "f() values at end points not of opposite sign"
-msgstr "wartości 'f()' na końcach nie są przeciwnego znaku"
+#. R/glm.R: gettextf("models with response %s removed because response differs from model 1",     sQuote(deparse(responses[!sameresp])))
+#. R/lm.R: gettextf("models with response %s removed because response differs from model 1",     sQuote(deparse(responses[!sameresp])))
+#. R/loess.R: gettextf("models with response %s removed because response differs from model 1",     sQuote(deparse(responses[!sameresp])))
+#. R/mlm.R: gettextf("models with response %s removed because response differs from model 1",     sQuote(deparse(responses[!sameresp])))
+#. R/nls.R: gettextf("models with response %s removed because response differs from model 1",     sQuote(deparse(responses[!sameresp])))
+#: R/glm.R:0 R/lm.R:0 R/loess.R:0 R/mlm.R:0 R/nls.R:0
+msgid "models with response %s removed because response differs from model 1"
+msgstr ""
+"modele ze zmienną zależną %s zostały usunięte, ponieważ zmienna zależna "
+"różni się od tego w modelu 1"
 
-msgid "convergence problem in zero finding:"
-msgstr "problem zbieżności podczas znajdywania zer"
+#. R/kmeans.R: stop("more cluster centers than data points")
+#: R/kmeans.R:0
+msgid "more cluster centers than data points"
+msgstr "więcej centrów grup niż punktów danych"
 
-msgid "'control' argument must be a named list"
-msgstr "argument 'control' musi być nazwaną listą"
+#. R/kmeans.R: stop("more cluster centers than distinct data points.")
+#: R/kmeans.R:0
+msgid "more cluster centers than distinct data points."
+msgstr "więcej centrów grup niż odmiennych punktów danych."
 
-msgid "logical 'hessian' argument not allowed.  See documentation."
-msgstr "logiczny argument 'hessian' nie jest dozwolony. Zobacz dokumentacjÄ™."
+#. R/dummy.coef.R: stop("multivariate case with missing coefficients is not yet implemented")
+#. R/dummy.coef.R: stop("multivariate case with missing coefficients is not yet implemented")
+#: R/dummy.coef.R:0
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+"wielowymiarowy przypadek z brakującymi współczynnikami nie jest jeszcze "
+"zaimplementowany"
 
-msgid "'params' has wrong length"
-msgstr "argument 'params' ma niepoprawną długość"
+#. R/symnum.R: stop("must have 2 'symbols' for logical 'x' argument")
+#: R/symnum.R:0
+msgid "must have 2 'symbols' for logical 'x' argument"
+msgstr "potrzeba mieć dwa 'symbols' dla argumentu logicznego 'x'"
 
-msgid "'varying' must be in seq_along(pars)"
-msgstr "'varying' musi być w przedziale 'seq_along(pars)'"
+#. R/zzModels.R: stop("must have at least 4 observations to fit an 'SSfol' model")
+#: R/zzModels.R:0
+msgid "must have at least 4 observations to fit an 'SSfol' model"
+msgstr "potrzeba mieć co najmniej 4 obserwacje aby dopasować model 'SSfol'"
 
-msgid "'varying' has wrong length"
-msgstr "argument 'varying' ma niepoprawną długość"
+#. R/zzModels.R: stop("must have length of response = length of second argument to 'SSfol'")
+#: R/zzModels.R:0
+msgid "must have length of response = length of second argument to 'SSfol'"
+msgstr ""
+"potrzeba, aby długość zmiennej zależnej = długości drugiego argumentu 'SSfol'"
 
-msgid "'varying' must be logical, integer or character"
-msgstr "'varying' musi być wartością tekstową, logiczną lub liczbą całkowitą"
+#. R/hclust.R: stop("must have n >= 2 objects to cluster")
+#: R/hclust.R:0
+msgid "must have n >= 2 objects to cluster"
+msgstr "co najmniej 2 obiekty są potrzebne aby móc grupować"
 
-msgid "invalid argument to 'getProfile'"
-msgstr "niepoprawny argument przekazany do funkcji 'getProfile()'"
+#. R/kmeans.R: stop("must have same number of columns in 'x' and 'centers'")
+#: R/kmeans.R:0
+msgid "must have same number of columns in 'x' and 'centers'"
+msgstr "potrzeba mieć tę samą liczbę kolumn w 'x' oraz 'centers'"
 
-msgid "cannot recognize parameter name"
-msgstr "nie można rozpoznać nazwy parametru"
+#. R/spectrum.R: stop("must specify 'spans' or a valid kernel")
+#: R/spectrum.R:0
+msgid "must specify 'spans' or a valid kernel"
+msgstr "potrzeba określić 'spans' lub poprawne jądro"
 
-msgid "levels truncated to positive values only"
-msgstr "poziomy przycięto tylko do wartości dodatnich"
+#. R/xtabs.R: stop("must supply either 'formula' or 'data'")
+#: R/xtabs.R:0
+msgid "must supply either 'formula' or 'data'"
+msgstr "potrzeba dostarczyć albo 'formula' albo 'data'"
 
-msgid "setVarying : 'vary' length must match length of parameters"
-msgstr "setVarying : długość 'vary' musi zgadzać się z długością parametrów"
+#. R/contr.poly.R: stop("must supply one or more vectors")
+#: R/contr.poly.R:0
+msgid "must supply one or more vectors"
+msgstr "potrzeba dostarczyć jeden lub więecj wektorów"
 
-msgid "singular gradient matrix at initial parameter estimates"
-msgstr "osobliwa macierz gradientu w poczÄ…tkowych oszacowaniach parametru"
+#. R/model.tables.R: stop("na.action must be a function")
+#: R/model.tables.R:0
+msgid "na.action must be a function"
+msgstr "argument 'na.action' musi być funkcją"
 
-msgid "'data' must be a list or an environment"
-msgstr "'data' musi być listą albo środowiskiem"
+#. R/fisher.test.R: stop("need 2 or more non-zero column marginals")
+#: R/fisher.test.R:0
+msgid "need 2 or more non-zero column marginals"
+msgstr "2 lub więcej niezerowych granic kolumny jest wymagane"
 
-msgid "no starting values specified"
-msgstr "nie określono wartości początkowych"
+#. R/fisher.test.R: stop("need 2 or more non-zero row marginals")
+#: R/fisher.test.R:0
+msgid "need 2 or more non-zero row marginals"
+msgstr "2 lub więcej niezerowych granic wiersza jest wymagane"
 
-msgid "parameters without starting value in 'data': %s"
-msgstr "parametry bez początkowej wartości w 'data': %s"
+#. R/family.R: stop("need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' family")
+#: R/family.R:0
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
+msgstr ""
+"pakiet CRAN 'SuppDists' jest potrzebny do symulacji z rodziny 'inverse."
+"gaussian'"
 
-msgid "no parameters to fit"
-msgstr "brak parametrów dla dopasowania"
+#. R/update.R: stop("need an object with call component")
+#: R/update.R:0
+msgid "need an object with call component"
+msgstr "potrzeba obiektu z komponentem wywołania"
 
-msgid "argument 'subset' will be ignored"
-msgstr "argument 'subset' zostanie zignornowany"
+#. R/bandwidths.R: stop("need at least 2 data points")
+#. R/bandwidths.R: stop("need at least 2 data points")
+#. R/bandwidths.R: stop("need at least 2 data points")
+#. R/bandwidths.R: stop("need at least 2 data points")
+#. R/bandwidths.R: stop("need at least 2 data points")
+#: R/bandwidths.R:0
+msgid "need at least 2 data points"
+msgstr "potrzeba przynajmniej 2 punktów"
 
-msgid "argument 'na.action' will be ignored"
-msgstr "argument 'na.action' zostanie zignornowany"
+#. R/HoltWinters.R: stop("need at least 2 periods to compute seasonal start values")
+#: R/HoltWinters.R:0
+msgid "need at least 2 periods to compute seasonal start values"
+msgstr "potrzeba co najmniej 2 okresów aby obliczyć sezonowe wartości startowe"
 
-msgid "upper and lower bounds ignored unless algorithm = \"port\""
+#. R/density.R: stop("need at least 2 points to select a bandwidth automatically")
+#: R/density.R:0
+msgid "need at least 2 points to select a bandwidth automatically"
 msgstr ""
-"górne oraz dolne granice zostały zignorowane, dopóki nie będzie 'algorithm = "
-"\"port\"'"
+"co najmniej 2 punkty są potrzebne aby automatycznie wybrać szerokość pasma"
 
-msgid "cannot calculate REML log-likelihood for \"nls\" objects"
-msgstr ""
-"nie można obliczyć REML logarytmu funkcji wiarygodności dla obiektów 'nls'"
+#. R/smspline.R: stop("need at least four unique 'x' values")
+#: R/smspline.R:0
+msgid "need at least four unique 'x' values"
+msgstr "potrzeba przynajmniej czterech unikalnych wartości 'x'"
 
-msgid "anova is only defined for sequences of \"nls\" objects"
-msgstr "'anova' jest zdefiniowana jedynie dla sekwencji obiektów 'nls'"
+#. R/approx.R: stop("need at least two non-NA values to interpolate")
+#. R/approx.R: stop("need at least two non-NA values to interpolate")
+#: R/approx.R:0
+msgid "need at least two non-NA values to interpolate"
+msgstr "co najmniej dwie wartości nie-NA są wymagane do interpolacji"
 
-msgid "'anova' is only defined for sequences of \"nls\" objects"
-msgstr "'anova' jest zdefiniowana jedynie dla sekwencji obiektów 'nls'"
+#. R/hclust.R: stop("need dendrograms where all leaves have labels")
+#: R/hclust.R:0
+msgid "need dendrograms where all leaves have labels"
+msgstr "potrzeba drzew celu, gdzie liście nie posiadają etykiet"
 
-msgid "formula '%s' must be of the form '~expr'"
-msgstr "formuła '%s' musi mieć formę '~expr'"
+#. R/manova.R: stop("need multiple responses")
+#. R/manova.R: stop("need multiple responses")
+#. R/manova.R: stop("need multiple responses")
+#: R/manova.R:0
+msgid "need multiple responses"
+msgstr "potrzeba wielokrotnych zmiennych zależnych"
 
-msgid "'%s' cannot be of mode '%s'"
-msgstr "argument '%s' nie może być trybu '%s'"
+#. R/median.R: stop("need numeric data")
+#: R/median.R:0
+msgid "need numeric data"
+msgstr "potrzeba danych liczbowych"
 
-msgid "a two-sided formula is required"
-msgstr "wymagana jest dwustronna formuła"
+#. R/smspline.R: stop("need result of smooth.spline(keep.data = TRUE)")
+#. R/smspline.R: stop("need result of smooth.spline(keep.data = TRUE)")
+#: R/smspline.R:0
+msgid "need result of smooth.spline(keep.data = TRUE)"
+msgstr "potrzeba wyniku 'smooth.spline(keep.data=TRUE)'"
 
-msgid "not enough groups"
-msgstr "niewystarczajÄ…ca liczba grup"
+#. R/family.R: stop("negative values not allowed for the 'Poisson' family")
+#: R/family.R:0
+msgid "negative values not allowed for the 'Poisson' family"
+msgstr "ujemne wartości nie są dozwolone dla rodziny 'Poisson'"
 
-msgid "bounds can only be used with method L-BFGS-B (or Brent)"
-msgstr "granice mogą być użyte jedynie z metodą L-BFGS-B (lub Brent)"
+#. R/family.R: stop("negative values not allowed for the 'quasiPoisson' family")
+#: R/family.R:0
+msgid "negative values not allowed for the 'quasiPoisson' family"
+msgstr "ujemne wartości nie są dozwolone dla rodziny 'quasiPoisson'"
 
-msgid "unknown names in control:"
-msgstr "nieznane nazwy w kontroli:"
+#. R/glm.R: stop("negative weights not allowed")
+#. R/lsfit.R: stop("negative weights not allowed")
+#: R/glm.R:0 R/lsfit.R:0
+msgid "negative weights not allowed"
+msgstr "ujemne wagi nie sÄ… dozwolone"
 
-msgid "read the documentation for 'trace' more carefully"
-msgstr "przeczytaj dokumentację dotyczącą 'trace' bardziej uważnie"
+#. R/factanal.R: stop("neither 'x' nor 'covmat' supplied")
+#: R/factanal.R:0
+msgid "neither 'x' nor 'covmat' supplied"
+msgstr "nie dostarczono 'x' ani 'covmat'"
 
-msgid "'trace != 0' needs 'REPORT >= 1'"
-msgstr "'trace != 0' potrzebuje 'REPORT >= 1'"
+#. R/logLik.R: stop("no \"nobs\" attribute is available")
+#: R/logLik.R:0
+msgid "no \"nobs\" attribute is available"
+msgstr "brak dostępnego atrybutu 'nobs'"
 
-msgid ""
-"method L-BFGS-B uses 'factr' (and 'pgtol') instead of 'reltol' and 'abstol'"
-msgstr ""
-"metoda L-BFGS-B używa 'factr' (oraz 'pgtol') zamiast 'reltol' oraz 'abstol'"
+#. R/add.R: stop("no 'add1' method implemented for \"mlm\" models")
+#: R/add.R:0
+msgid "no 'add1' method implemented for \"mlm\" models"
+msgstr "brak zaimplementowanej metody 'add1' dla modeli 'mlm'"
 
-msgid ""
-"one-dimensional optimization by Nelder-Mead is unreliable:\n"
-"use \"Brent\" or optimize() directly"
-msgstr ""
-"jednowymiarowa optymalizacja metodÄ… Neldera-Meada nie jest wiarygodna:\n"
-"użyj 'Brent' lub 'optimize()' bezpośrednio"
+#. R/stepfun.R: stop("no 'as.stepfun' method available for 'x'")
+#: R/stepfun.R:0
+msgid "no 'as.stepfun' method available for 'x'"
+msgstr "brak dostępnej metody 'as.stepfun' dla 'x'"
 
-msgid "method = \"Brent\" is only available for one-dimensional optimization"
-msgstr ""
-"'metod = \"Brent\"' jest dostępna jedynie dla jednowymiarowej optymalizacji"
+#. R/add.R: stop("no 'drop1' method for \"mlm\" models")
+#: R/add.R:0
+msgid "no 'drop1' method for \"mlm\" models"
+msgstr "brak metody 'drop1' dla modeli 'mlm'"
 
-msgid "'lower' and 'upper' must be finite values"
-msgstr "'lower' oraz 'upper' muszą być skończonymi wartościami"
+#. R/selfStart.R: gettextf("no 'getInitial' method found for \"%s\" objects", data.class(object))
+#: R/selfStart.R:0
+msgid "no 'getInitial' method found for \"%s\" objects"
+msgstr "nie znaleziono metody 'getInitial()' dla obiektów klasy \"%s\""
 
-msgid "pooling of SD is incompatible with paired tests"
-msgstr ""
-"zbieranie standardowego odchylenia jest niezgodne ze sparowanymi testami"
+#. R/logLik.R: warning("no 'nobs' method is available")
+#. R/logLik.R: stop("no 'nobs' method is available")
+#: R/logLik.R:0
+msgid "no 'nobs' method is available"
+msgstr "brak dostępnej metody 'nobs()'"
 
-msgid "'x' must have 2 columns"
-msgstr "'x' musi mieć 2 kolumny"
+#. R/reshape.R: stop("no 'reshapeWide' attribute, must specify 'varying'")
+#: R/reshape.R:0
+msgid "no 'reshapeWide' attribute, must specify 'varying'"
+msgstr "brak atrybutu 'reshapeWide', potrzeba określić 'varying'"
 
-msgid "'x' and 'n' must have the same length"
-msgstr "argumenty 'x' oraz 'n' muszą mieć tę samą długość"
+#. R/aov.R: stop("no degrees of freedom for residuals")
+#: R/aov.R:0
+msgid "no degrees of freedom for residuals"
+msgstr "brak stopni swobody dla reszt"
 
-msgid "too few groups"
-msgstr "zbyt mało grup"
+#. R/TukeyHSD.R: stop("no factors in the fitted model")
+#: R/TukeyHSD.R:0
+msgid "no factors in the fitted model"
+msgstr "brak czynników w dopasowanym modelu"
 
-msgid ""
-"not plotting observations with leverage one:\n"
-"  %s"
-msgstr ""
-"brak wykreślalnych obserwacji z jednej transmisji:\n"
-"  %s"
+#. R/smspline.R: stop("no finite observations")
+#: R/smspline.R:0
+msgid "no finite observations"
+msgstr "brak skończonych obserwacji"
 
-msgid "use only with \"lm\" objects"
-msgstr "używaj tylko z obiektami klasy \"lm\""
+#. R/loess.R: stop("no models to compare")
+#: R/loess.R:0
+msgid "no models to compare"
+msgstr "brak modeli do porównania"
 
-msgid "'which' must be in 1:6"
-msgstr "'which' musi być w przedziale 1:6"
+#. R/glm.R: gettextf("no observations informative at iteration %d", iter)
+#: R/glm.R:0
+msgid "no observations informative at iteration %d"
+msgstr "brak obserwacji informacyjnych w iteracji %d"
 
-msgid "'id.n' must be in {1,..,%d}"
-msgstr "argument 'id.n' musi być w przedziale {1,..,%d}"
+#. R/nls.R: stop("no parameters to fit")
+#: R/nls.R:0
+msgid "no parameters to fit"
+msgstr "brak parametrów dla dopasowania"
 
-msgid ""
-"hat values (leverages) are all = %s\n"
-" and there are no factor predictors; no plot no. 5"
-msgstr ""
-"wszystkie dopasowane wartości (zależne) są = %s\n"
-"oraz nie ma czynnikowych predyktorów; brak wykresu nr. 5"
+#. R/ts.R: stop("no replacement values supplied")
+#: R/ts.R:0
+msgid "no replacement values supplied"
+msgstr "nie dostarczono wartości zamiennych"
 
-msgid "'x' and 'T' have incompatible length"
-msgstr "argumenty 'x' oraz 'T' mają niezgodne długości"
+#. R/aggregate.R: stop("no rows to aggregate")
+#: R/aggregate.R:0
+msgid "no rows to aggregate"
+msgstr "brak wierszy do zagregowania"
 
-msgid "'x' must be finite, nonnegative, and integer"
-msgstr "argument 'x' musi być skończoną nieujemną liczbą całkowitą"
+#. R/prcomp.R: stop("no scores are available: refit with 'retx=TRUE'")
+#: R/prcomp.R:0
+msgid "no scores are available: refit with 'retx=TRUE'"
+msgstr "brak dostępnych punktacji: dopasuj ponownie z 'retx=TRUE'"
 
-msgid "'T' must be nonnegative"
-msgstr "argument 'T' musi być nieujemny"
+#. R/nlm.R: gettextf("no sign change found in %d iterations", it - 1)
+#. R/nlm.R: gettextf("no sign change found in %d iterations", it - 1)
+#. R/nlm.R: gettextf("no sign change found in %d iterations", it - 1)
+#: R/nlm.R:0
+msgid "no sign change found in %d iterations"
+msgstr "nie zaobserwowano zmiany znaku w %d iteracjach"
 
-msgid "not enough data"
-msgstr "zbyt mało danych"
+#. R/bandwidths.R: stop("no solution in the specified range of bandwidths")
+#: R/bandwidths.R:0
+msgid "no solution in the specified range of bandwidths"
+msgstr "brak rozwiÄ…zania we wskazanym zakresie pasma"
 
-msgid "the case k > 2 is unimplemented"
-msgstr "przypadek dla k > 2 nie jest zaimplementowany"
+#. R/nls.R: stop("no starting values specified")
+#: R/nls.R:0
+msgid "no starting values specified"
+msgstr "nie określono wartości początkowych"
 
-msgid "'r' must be a single positive number"
-msgstr "argument 'r' musi być pojedynczą dodatnią liczbą"
+#. R/factanal.R: stop("no starting values supplied")
+#: R/factanal.R:0
+msgid "no starting values supplied"
+msgstr "nie określono wartości początkowych"
 
-msgid ""
-"exactly one of 'n', 'delta', 'sd', 'power', and 'sig.level' must be NULL"
-msgstr ""
-"dokładnie jeden z 'groups', 'n', 'between.var', 'within.var', 'power', oraz "
-"'sig.level' musi mieć wartość NULL"
+#. R/models.R: stop("no terms component nor attribute")
+#: R/models.R:0
+msgid "no terms component nor attribute"
+msgstr "brak komponentu 'terms' oraz atrybutu"
 
-msgid "'sig.level' must be numeric in [0, 1]"
-msgstr "argument 'sig.level' musi być liczbą w przedziale [0, 1]"
+#. R/add.R: stop("no terms in scope")
+#. R/add.R: stop("no terms in scope")
+#: R/add.R:0
+msgid "no terms in scope"
+msgstr "brak członów w zakresie"
 
-msgid "exactly one of 'n', 'p1', 'p2', 'power', and 'sig.level' must be NULL"
-msgstr ""
-"dokładnie jeden z 'n', 'p1', 'p2', 'power', oraz 'sig.level' musi mieć "
-"wartość NULL"
+#. R/add.R: stop("no terms in scope for adding to object")
+#. R/add.R: stop("no terms in scope for adding to object")
+#. R/add.R: stop("no terms in scope for adding to object")
+#: R/add.R:0
+msgid "no terms in scope for adding to object"
+msgstr "brak członów w zakresie do dodania do obiektu"
+
+#. R/ts.R: stop("no time series supplied")
+#: R/ts.R:0
+msgid "no time series supplied"
+msgstr "nie dostarczono szeregu czasowego"
 
+#. R/glm.R: stop("no valid set of coefficients has been found: please supply starting values",     call. = FALSE)
+#. R/glm.R: stop("no valid set of coefficients has been found: please supply starting values",     call. = FALSE)
+#: R/glm.R:0
 msgid ""
-"exactly one of 'groups', 'n', 'between.var', 'within.var', 'power', and 'sig."
-"level' must be NULL"
+"no valid set of coefficients has been found: please supply starting values"
 msgstr ""
-"dokładnie jeden z 'groups', 'n', 'between.var', 'within.var', 'power', oraz "
-"'sig.level' musi mieć wartość NULL"
+"nie znaleziono poprawnego zestawu współczynników: proszę dostarczyć wartości "
+"poczÄ…tkowe"
 
-msgid "number of groups must be at least 2"
-msgstr "liczba grup musi być przynajmniej równa 2"
+#. R/lm.influence.R: stop("non-NA residual length does not match cases used in fitting")
+#: R/lm.influence.R:0
+msgid "non-NA residual length does not match cases used in fitting"
+msgstr ""
+"długości nie-NA reszt nie zgadzają się z przypadkami użytymi w dopasowaniu"
 
-msgid "number of observations in each group must be at least 2"
-msgstr "liczba obserwacji w każdej grupie musi wynosić minimum 2"
+#. R/model.tables.R: gettextf("non-factors ignored: %s", paste(names(nn), collapse = ", "))
+#: R/model.tables.R:0
+msgid "non-factors ignored: %s"
+msgstr "zignorowano nie-czynniki: %s"
 
-msgid "'nterms' is missing with no default"
-msgstr "brakuje wartości dla 'nterms', a nie ma określonej wartości domyślnej"
+#. R/density.R: stop("non-finite 'bw'")
+#: R/density.R:0
+msgid "non-finite 'bw'"
+msgstr "nieskończony argument 'bw'"
 
-msgid "'ppr' applies only to numerical variables"
-msgstr "'ppr' stosuje siÄ™ jedynie do zmiennych liczbowych"
+#. R/density.R: stop("non-finite 'from'")
+#: R/density.R:0
+msgid "non-finite 'from'"
+msgstr "nieskończony argument 'from'"
 
-msgid "mismatched 'x' and 'y'"
-msgstr "niezgodne 'x' oraz 'y'"
+#. R/density.R: stop("non-finite 'to'")
+#: R/density.R:0
+msgid "non-finite 'to'"
+msgstr "nieskończony argument 'to'"
 
-msgid "wrong number of columns in 'x'"
-msgstr "niepoprawna liczba kolumn w 'x'"
+#. R/glm.R: gettextf("non-finite coefficients at iteration %d", iter)
+#: R/glm.R:0
+msgid "non-finite coefficients at iteration %d"
+msgstr "nieskończone współczynniki w %d iteracji"
 
-msgid "cannot rescale a constant/zero column to unit variance"
+#. R/family.R: warning("non-integer #successes in a binomial glm!")
+#: R/family.R:0
+msgid "non-integer #successes in a binomial glm!"
 msgstr ""
-"nie można przeskalować kolumny stałych wartości/zer na jednostkową wariancję"
+"niecałkowita liczba sukcesów w rozkładzie Bernoulliego w funkcji 'glm()'!"
 
-msgid "PCA applies only to numerical variables"
-msgstr ""
-"analiza głównych komponentów stosuje się jedynie do zmiennych liczbowych"
+#. R/family.R: warning("non-integer counts in a binomial glm!")
+#: R/family.R:0
+msgid "non-integer counts in a binomial glm!"
+msgstr "niecałkowita liczba zliczeń w rozkładzie Bernoulliego w 'glm'!"
 
-msgid "no scores are available: refit with 'retx=TRUE'"
-msgstr "brak dostępnych punktacji: dopasuj ponownie z 'retx=TRUE'"
+#. R/ts.R: warning("non-intersecting series")
+#: R/ts.R:0
+msgid "non-intersecting series"
+msgstr "nieprzecinajÄ…ce siÄ™ szeregi"
 
-msgid "'newdata' must be a matrix or data frame"
-msgstr "'newdata' musi być macierzą lub ramką danych"
+#. R/dendrogram.R: stop("non-leaf subtree of length 0")
+#: R/dendrogram.R:0
+msgid "non-leaf subtree of length 0"
+msgstr "bezlistne poddrzewo o długości 0"
 
-msgid ""
-"'newdata' does not have named columns matching one or more of the original "
-"columns"
-msgstr ""
-"'newdata' nie ma nazwanych kolumn pasujących do jednej lub więcej "
-"oryginalnych kolumn"
+#. R/family.R: stop("non-positive values not allowed for the 'gamma' family")
+#: R/family.R:0
+msgid "non-positive values not allowed for the 'gamma' family"
+msgstr "niedodatnie wartości nie są dozwolone dla rodziny 'gamma'"
 
-msgid "'newdata' does not have the correct number of columns"
-msgstr "'newdata' nie ma poprawnej liczby kolumn"
+#. R/dist.R: warning("non-square matrix")
+#: R/dist.R:0
+msgid "non-square matrix"
+msgstr "macierz niekwadratowa"
 
-msgid "both 'x' and 'covmat' were supplied: 'x' will be ignored"
-msgstr "dostarczono jednocześnie 'x' oraz 'covmat': 'x' zostanie zignorowany"
+#. R/arima.R: stop("non-stationary AR part")
+#. R/arma0.R: stop("non-stationary AR part")
+#: R/arima.R:0 R/arma0.R:0
+msgid "non-stationary AR part"
+msgstr "niestacjonarna część autoregresji"
 
-msgid "'princomp' can only be used with more units than variables"
-msgstr ""
-"'princomp' może zostać użyte jedynie, gdy jednostek jest więcej niż zmiennych"
+#. R/arima.R: stop("non-stationary AR part from CSS")
+#: R/arima.R:0
+msgid "non-stationary AR part from CSS"
+msgstr "niestacjonarna część autoregresji z warunkowej sumy kwadratów"
 
-msgid "cannot use 'cor = TRUE' with a constant variable"
-msgstr "nie można użyć 'cor=TRUE' ze zmienną przyjmującą stałą wartość"
+#. R/arima.R: stop("non-stationary seasonal AR part")
+#. R/arma0.R: stop("non-stationary seasonal AR part")
+#: R/arima.R:0 R/arma0.R:0
+msgid "non-stationary seasonal AR part"
+msgstr "niestacjonarna sezonowa część autoregresji"
 
-msgid "covariance matrix is not non-negative definite"
-msgstr "macierz kowariancji nie jest nieujemnie określona"
+#. R/arima.R: stop("non-stationary seasonal AR part from CSS")
+#: R/arima.R:0
+msgid "non-stationary seasonal AR part from CSS"
+msgstr "niestacjonarna sezonowa część autoregresji z warunkowej sumy kwadratów"
 
-msgid "argument does not include a 'qr' component"
-msgstr "argument nie uwzględnia komponentu 'qr'"
+#. R/ts.R: stop("non-time series not of the correct length")
+#: R/ts.R:0
+msgid "non-time series not of the correct length"
+msgstr "szeregi nie-czasowe nie mają poprawnej długości"
 
-msgid "argument does not include an 'effects' component"
-msgstr "argument nie uwzględnia komponentu 'effects'"
+#. R/smspline.R: stop("not a valid \"smooth.spline\" object")
+#: R/smspline.R:0
+msgid "not a valid \"smooth.spline\" object"
+msgstr "to nie jest poprawny obiekt klasy \"smooth.spline\""
 
-msgid "'proj' is not implemented for multiple responses"
-msgstr ""
-"funkcja 'proj()' nie jest zaimplementowana dla wielokrotnych zmiennych "
-"zależnych"
+#. R/stepfun.R: stop("not a valid step function")
+#: R/stepfun.R:0
+msgid "not a valid step function"
+msgstr "to nie jest poprawna funkcja krokowa"
 
-msgid "table 'x' should have 2 entries"
-msgstr "tabela 'x' powinna mieć 2 wpisy"
+#. R/ts.R: stop("not all series have the same frequency")
+#: R/ts.R:0
+msgid "not all series have the same frequency"
+msgstr "nie wszystkie szeregi mają tę samą częstotliwość"
 
-msgid "elements of 'n' must be positive"
-msgstr "elementy 'n' muszą być dodatnie"
+#. R/friedman.test.R: stop("not an unreplicated complete block design")
+#. R/quade.test.R: stop("not an unreplicated complete block design")
+#: R/friedman.test.R:0 R/quade.test.R:0
+msgid "not an unreplicated complete block design"
+msgstr "to nie jest niezreplikowana kompletna konstrukcja bloku"
 
-msgid "elements of 'x' must be nonnegative"
-msgstr "elementy 'x' muszą być nieujemne"
+#. R/ks.test.R: stop("not enough 'x' data")
+#: R/ks.test.R:0
+msgid "not enough 'x' data"
+msgstr "zbyt mało danych 'x'"
 
-msgid "elements of 'x' must not be greater than those of 'n'"
-msgstr "elementy 'x' nie mogą być większe niż elementy 'n'"
+#. R/ansari.test.R: stop("not enough 'x' observations")
+#. R/t.test.R: stop("not enough 'x' observations")
+#. R/t.test.R: stop("not enough 'x' observations")
+#. R/var.test.R: stop("not enough 'x' observations")
+#: R/ansari.test.R:0 R/t.test.R:0 R/var.test.R:0
+msgid "not enough 'x' observations"
+msgstr "niewystarczajÄ…ca liczba obserwacji 'x'"
 
-msgid "'p' must have the same length as 'x' and 'n'"
-msgstr "argumenty 'p' musi mieć tę samą długość co 'x' oraz 'n'"
+#. R/ks.test.R: stop("not enough 'y' data")
+#: R/ks.test.R:0
+msgid "not enough 'y' data"
+msgstr "zbyt mało danych 'y'"
 
-msgid "elements of 'p' must be in (0,1)"
-msgstr "elementy 'p' muszą być w przedziale (0,1)"
+#. R/ansari.test.R: stop("not enough 'y' observations")
+#. R/t.test.R: stop("not enough 'y' observations")
+#. R/var.test.R: stop("not enough 'y' observations")
+#. R/wilcox.test.R: stop("not enough 'y' observations")
+#: R/ansari.test.R:0 R/t.test.R:0 R/var.test.R:0 R/wilcox.test.R:0
+msgid "not enough 'y' observations"
+msgstr "niewystarczajÄ…ca liczba obserwacji 'y'"
 
-msgid "y is empty or has only NAs"
-msgstr "argument 'y' jest pusty lub posiada jedynie wartości NA"
+#. R/wilcox.test.R: stop("not enough (finite) 'x' observations")
+#: R/wilcox.test.R:0
+msgid "not enough (finite) 'x' observations"
+msgstr "niewystarczająca liczba skończonych obserwacji"
 
-msgid "'formula' missing"
-msgstr "brakuje argumentu 'formula'"
+#. R/poisson.test.R: stop("not enough data")
+#. R/prop.test.R: stop("not enough data")
+#: R/poisson.test.R:0 R/prop.test.R:0
+msgid "not enough data"
+msgstr "zbyt mało danych"
 
-msgid "factors are not allowed"
-msgstr "czynniki nie sÄ… dozwolone"
+#. R/contrast.R: stop("not enough degrees of freedom to define contrasts")
+#. R/contrast.R: stop("not enough degrees of freedom to define contrasts")
+#. R/contrast.R: stop("not enough degrees of freedom to define contrasts")
+#: R/contrast.R:0
+msgid "not enough degrees of freedom to define contrasts"
+msgstr "niewystarczająca liczba stopni swobody do zdefiniowania kontrastów"
 
-msgid "missing values and NaN's not allowed if 'na.rm' is FALSE"
-msgstr ""
-"brakujące wartości oraz wartości NaN nie są dozwolone jeśli 'na.rm = FALSE'"
+#. R/cor.test.R: stop("not enough finite observations")
+#. R/cor.test.R: stop("not enough finite observations")
+#: R/cor.test.R:0
+msgid "not enough finite observations"
+msgstr "niewystarczająca liczba skończonych obserwacji"
 
-msgid "'probs' outside [0,1]"
-msgstr "argument 'probs' jest poza przedziałem [0,1]"
+#. R/oneway.test.R: stop("not enough groups")
+#: R/oneway.test.R:0
+msgid "not enough groups"
+msgstr "niewystarczajÄ…ca liczba grup"
 
-msgid "invalid argument 'n'"
-msgstr "niepoprawny argument 'n'"
+#. R/fligner.test.R: stop("not enough observations")
+#. R/kruskal.test.R: stop("not enough observations")
+#. R/mood.test.R: stop("not enough observations")
+#. R/oneway.test.R: stop("not enough observations")
+#. R/t.test.R: stop("not enough observations")
+#: R/fligner.test.R:0 R/kruskal.test.R:0 R/mood.test.R:0 R/oneway.test.R:0
+#: R/t.test.R:0
+msgid "not enough observations"
+msgstr "niewystarczajÄ…ca liczba obserwacji"
 
-msgid "invalid argument 'r'"
-msgstr "niepoprawny argument 'r'"
+#. R/plot.lm.R: gettextf("not plotting observations with leverage one:\n  %s",     paste(which(isInf), collapse = ", "))
+#: R/plot.lm.R:0
+msgid ""
+"not plotting observations with leverage one:\n"
+"  %s"
+msgstr ""
+"brak wykreślalnych obserwacji z jednej transmisji:\n"
+"  %s"
 
-msgid "invalid argument 'c'"
-msgstr "niepoprawny argument 'c'"
+#. R/ftable.R: stop("nothing to tabulate")
+#: R/ftable.R:0
+msgid "nothing to tabulate"
+msgstr "nic do tabulowania"
 
-msgid "arguments 'r' and 'c' must have the same sums"
-msgstr "argumenty 'r' oraz 'c' muszą mieć jednakowe sumy"
+#. R/symnum.R: stop("number of 'cutpoints' must be one less than number of symbols")
+#: R/symnum.R:0
+msgid "number of 'cutpoints' must be one less than number of symbols"
+msgstr "liczba 'cutpoints' musi być o jeden mniejsza niż liczba symboli"
 
-msgid "'relevel' only for factors"
-msgstr "'relevel' tylko dla czynników"
+#. R/symnum.R: stop("number of 'cutpoints' must be one more than number of symbols")
+#: R/symnum.R:0
+msgid "number of 'cutpoints' must be one more than number of symbols"
+msgstr "liczba 'cutpoints' musi być o jeden większa niż liczba symboli"
 
-msgid "'ref' must be of length one"
-msgstr "argument 'ref' musi być długości 1"
+#. R/kmeans.R: stop("number of cluster centres must lie between 1 and nrow(x)",     call. = FALSE)
+#: R/kmeans.R:0
+msgid "number of cluster centres must lie between 1 and nrow(x)"
+msgstr "liczba centrów grup musi leżeć pomiędzy 1 a 'nrow(x)'"
 
-msgid "'ref' must be an existing level"
-msgstr "'ref' musi być istniejącym poziomem"
+#. R/ts.R: stop("number of differences must be a positive integer")
+#: R/ts.R:0
+msgid "number of differences must be a positive integer"
+msgstr "liczba różnic musi być dodatnią liczbą całkowitą"
 
-msgid "ref = %d must be in 1L:%d"
-msgstr "ref = %d musi być w przedziale 1L:%d"
+#. R/power.anova.test.R: stop("number of groups must be at least 2")
+#: R/power.anova.test.R:0
+msgid "number of groups must be at least 2"
+msgstr "liczba grup musi być przynajmniej równa 2"
 
-msgid "'sep' must be a character string"
-msgstr "'sep' musi być łańcuchem tekstowym"
+#. R/smspline.R: stop("number of observations in 'x' and 'y' must match.")
+#: R/smspline.R:0
+msgid "number of observations in 'x' and 'y' must match."
+msgstr "liczba obserwacji w argumentach 'x' oraz 'y' musi się zgadzać"
 
-msgid "failed to guess time-varying variables from their names"
-msgstr "nie udało się odgadnąć zmiennych zależnych od czasu z ich nazw"
+#. R/power.anova.test.R: stop("number of observations in each group must be at least 2")
+#: R/power.anova.test.R:0
+msgid "number of observations in each group must be at least 2"
+msgstr "liczba obserwacji w każdej grupie musi wynosić minimum 2"
 
-msgid "'varying' arguments must be the same length"
-msgstr "argumenty 'varying' muszą być tej samej długości"
+#. R/glm.R: gettextf("number of offsets is %d should equal %d (number of observations)",     length(offset), NROW(Y))
+#: R/glm.R:0
+msgid "number of offsets is %d should equal %d (number of observations)"
+msgstr "liczba przesunięć (%d) powinna być równa liczbie obserwacji (%d)"
 
-msgid "'times' is wrong length"
-msgstr "argument 'times' ma niepoprawną długość"
+#. R/lm.R: gettextf("number of offsets is %d, should equal %d (number of observations)",     length(offset), NROW(y))
+#: R/lm.R:0
+msgid "number of offsets is %d, should equal %d (number of observations)"
+msgstr "liczba przesunięć (%d) powinna być równa liczbie obserwacji (%d)"
 
-msgid "there are records with missing times, which will be dropped."
-msgstr "pojawiają się rekordy z brakującymi czasami, które zostaną pominięte."
+#. R/add.R: stop("number of rows in use has changed: remove missing values?")
+#. R/add.R: stop("number of rows in use has changed: remove missing values?")
+#. R/add.R: stop("number of rows in use has changed: remove missing values?")
+#: R/add.R:0
+msgid "number of rows in use has changed: remove missing values?"
+msgstr "liczba wierszy w użyciu zmieniła się: usunąć brakujące wartości?"
 
-msgid "some constant variables (%s) are really varying"
-msgstr "niektóre zmienne o stałej wartości (%s) tak naprawdę się zmieniają"
+#. R/ar.R: stop("number of series in 'object' and 'newdata' do not match")
+#: R/ar.R:0
+msgid "number of series in 'object' and 'newdata' do not match"
+msgstr "liczba serii w 'object' oraz 'newdata' nie zgadzajÄ… siÄ™"
 
-msgid "no 'reshapeWide' attribute, must specify 'varying'"
-msgstr "brak atrybutu 'reshapeWide', potrzeba określić 'varying'"
+#. R/ts.R: stop("number of values supplied is not a sub-multiple of the number of values to be replaced")
+#: R/ts.R:0
+msgid ""
+"number of values supplied is not a sub-multiple of the number of values to "
+"be replaced"
+msgstr ""
+"liczba dostarczonych wartości nie jest pod-wielokrotnością liczby wartości "
+"do zamiany"
 
-msgid "'varying' must be nonempty list or vector"
-msgstr "'varying' musi być niepustą listą lub wektorem"
+#. R/lsfit.R: gettextf("number of weights = %d should equal %d (number of responses)",     nwts, nry)
+#: R/lsfit.R:0
+msgid "number of weights = %d should equal %d (number of responses)"
+msgstr "liczba wag = %d powinna być równa %d (liczbie zmiennych zależnych)"
 
-msgid "length of 'v.names' does not evenly divide length of 'varying'"
-msgstr "długość 'v.names' nie dzieli równo długości 'varying'"
+#. R/smspline.R: stop("number of weights must match number of observations.")
+#: R/smspline.R:0
+msgid "number of weights must match number of observations."
+msgstr "liczba wag musi zgadzać się z liczbą obserwacji"
 
+#. R/contrast.R: stop("numeric contrasts or contrast name expected")
+#: R/contrast.R:0
+msgid "numeric contrasts or contrast name expected"
+msgstr "oczekiwano kontrastów liczbowych lub nazwy kontrastu"
+
+#. R/ksmooth.R: stop("numeric y must be supplied.\nFor density estimation use density()")
+#: R/ksmooth.R:0
 msgid ""
-"length of 'varying' must be the product of length of 'v.names' and length of "
-"'times'"
+"numeric y must be supplied.\n"
+"For density estimation use density()"
 msgstr ""
-"długość 'varying' musi być iloczynem długości 'v.names' oraz długości 'times'"
+"liczbowy argument 'y' musi zostać dostarczony.\n"
+"Dla estymacji gęstości użyj 'density()'"
 
-msgid "invalid value of 'k'"
-msgstr "niepoprawna wartość 'k'"
+#. R/biplot.R: gettextf("object '%s' has no scores", deparse(substitute(x)))
+#. R/biplot.R: gettextf("object '%s' has no scores", deparse(substitute(x)))
+#: R/biplot.R:0
+msgid "object '%s' has no scores"
+msgstr "obiekt '%s' nie ma punktów"
 
-msgid "'k' must be positive"
-msgstr "argument 'k' musi być dodatni"
+#. R/manova.R: gettextf("object must be of class %s or %s", dQuote("manova"),     dQuote("maov"))
+#: R/manova.R:0
+msgid "object must be of class %s or %s"
+msgstr "obiekt musi być klasy %s lub %s"
 
-msgid "'k' must be odd!  Changing 'k' to %d"
-msgstr "'k' musi być nieparzyste!  Zmienianie 'k' na %d"
+#. R/C.R: stop("object not interpretable as a factor")
+#: R/C.R:0
+msgid "object not interpretable as a factor"
+msgstr "argument 'object' nie jest interpretowalny jako czynnik"
 
-msgid "'k' is bigger than 'n'!  Changing 'k' to %d"
-msgstr "'k' jest większe niż 'n'!  Zmienianie 'k' na %d"
+#. R/lsfit.R: warning("observations with 0 weight not used in calculating standard deviation")
+#: R/lsfit.R:0
+msgid "observations with 0 weight not used in calculating standard deviation"
+msgstr ""
+"obserwacje z zerową wagą nie zostały użyte podczas obliczania odchylenia "
+"standardowego"
 
-msgid "bandwidth 'k' must be >= 1 and odd!"
-msgstr "pasmo 'k' musi być >= 1 i musi być nieparzyste!"
+#. R/lsfit.R: warning("observations with 0 weights not used")
+#: R/lsfit.R:0
+msgid "observations with 0 weights not used"
+msgstr "obserwacje z zerową wagą nie zostały użyte"
 
-msgid "argument 'object' has an impossible length"
-msgstr "argument 'object' ma nieprawdopodobną długość"
+#. R/glm.R: warning("observations with zero weight not used for calculating dispersion")
+#: R/glm.R:0
+msgid "observations with zero weight not used for calculating dispersion"
+msgstr ""
+"obserwacje z zerową wagą nie zostały użyte podczas kalkulacji dyspersji"
 
-msgid "no 'getInitial' method found for \"%s\" objects"
-msgstr "nie znaleziono metody 'getInitial()' dla obiektów klasy \"%s\""
+#. R/optim.R: warning("one-dimensional optimization by Nelder-Mead is unreliable:\nuse \"Brent\" or optimize() directly")
+#: R/optim.R:0
+msgid ""
+"one-dimensional optimization by Nelder-Mead is unreliable:\n"
+"use \"Brent\" or optimize() directly"
+msgstr ""
+"jednowymiarowa optymalizacja metodÄ… Neldera-Meada nie jest wiarygodna:\n"
+"użyj 'Brent' lub 'optimize()' bezpośrednio"
 
-msgid "sample size must be between 3 and 5000"
-msgstr "długość argumentu 'x' musi być pomiędzy 3 a 5000"
+#. R/cmdscale.R: gettextf("only %d of the first %d eigenvalues are > 0", k1, k)
+#: R/cmdscale.R:0
+msgid "only %d of the first %d eigenvalues are > 0"
+msgstr "tylko %d pierwszych %d wartości własnych jest > 0"
 
-msgid "all 'x' values are identical"
-msgstr "wszystkie wartości 'x' są identyczne"
+#. R/loess.R: stop("only 1-4 predictors are allowed")
+#: R/loess.R:0
+msgid "only 1-4 predictors are allowed"
+msgstr "tylko od 1 do 4 predyktorów jest dozwolone"
 
-msgid "attempt to smooth non-numeric values"
-msgstr "próba wygładzenia wartości nieliczbowych"
+#. R/StructTS.R: stop("only implemented for univariate time series")
+#. R/arima.R: stop("only implemented for univariate time series")
+#. R/arma0.R: stop("only implemented for univariate time series")
+#. R/cpgram.R: stop("only implemented for univariate time series")
+#: R/StructTS.R:0 R/arima.R:0 R/arma0.R:0 R/cpgram.R:0
+msgid "only implemented for univariate time series"
+msgstr "zaimplementowane tylko dla jednowymiarowego szeregu czasowego"
 
-msgid "attempt to smooth NA values"
-msgstr "próba wygładzenia wartości NA"
+#. R/ts.R: stop("only replacement of elements is allowed")
+#: R/ts.R:0
+msgid "only replacement of elements is allowed"
+msgstr "dozwolona jest tylko zamiana elementów"
 
-msgid "invalid 'endrule' argument"
-msgstr "niepoprawny argument 'endrule'"
+#. R/stl.R: stop("only univariate series are allowed")
+#: R/stl.R:0
+msgid "only univariate series are allowed"
+msgstr "tylko jednowymiarowe serie sÄ… dozwolone"
 
-msgid ".nknots.smspl() is now exported; use it instead of n.knots()"
+#. R/HoltWinters.R: gettextf("optimization difficulties: %s", sol$message)
+#. R/HoltWinters.R: gettextf("optimization difficulties: %s", sol$message)
+#. R/HoltWinters.R: gettextf("optimization difficulties: %s", sol$message)
+#. R/HoltWinters.R: gettextf("optimization difficulties: %s", sol$message)
+#: R/HoltWinters.R:0
+msgid "optimization difficulties: %s"
+msgstr "problemy optymalizacji: %s"
+
+#. R/HoltWinters.R: stop("optimization failure")
+#. R/HoltWinters.R: stop("optimization failure")
+#. R/HoltWinters.R: stop("optimization failure")
+#. R/HoltWinters.R: stop("optimization failure")
+#: R/HoltWinters.R:0
+msgid "optimization failure"
+msgstr "niepowodzenie optymalizacji"
+
+#. R/anova.R: warning("option \"show.coef.Pvalues\" is invalid: assuming TRUE")
+#: R/anova.R:0
+msgid "option \"show.coef.Pvalues\" is invalid: assuming TRUE"
+msgstr "opcja \"show.coef.Pvalues\" jest niepoprawna: zakładanie TRUE"
+
+#. R/anova.R: warning("option \"show.signif.stars\" is invalid: assuming TRUE")
+#: R/anova.R:0
+msgid "option \"show.signif.stars\" is invalid: assuming TRUE"
+msgstr "opcja \"show.signif.stars\" jest niepoprawna: zakładanie TRUE"
+
+#. R/contr.poly.R: gettextf("orthogonal polynomials cannot be represented accurately enough for %d degrees of freedom",     n - 1)
+#: R/contr.poly.R:0
+msgid ""
+"orthogonal polynomials cannot be represented accurately enough for %d "
+"degrees of freedom"
 msgstr ""
-"funkcja '.nknots.smspl()' jest już eksportowana,; użyj jej zamiast funkcji "
-"'n.knots()'"
+"ortogonalne wielomiany nie mogą być reprezentowane wystarczająco dokładnie "
+"dla %d stopni swobody"
 
-msgid "invalid 'control.spar'"
-msgstr "niepoprawna wartość 'control.spar'"
+#. R/ks.test.R: warning("p-value will be approximate in the presence of ties")
+#: R/ks.test.R:0
+msgid "p-value will be approximate in the presence of ties"
+msgstr ""
+"wartość prawdopodobieństwa w obecności powtórzonych wartości będzie "
+"przybliżona"
 
-msgid "missing or infinite values in inputs are not allowed"
-msgstr "wartości brakujące lub nieskończone nie są dozwolone na wejściach"
+#. R/confint.R: stop("package 'MASS' must be installed")
+#. R/confint.R: stop("package 'MASS' must be installed")
+#: R/confint.R:0
+msgid "package 'MASS' must be installed"
+msgstr "pakiet 'MASS' musi być zainstalowany"
 
-msgid "invalid number of points"
-msgstr "niepoprawna liczba punktów"
+#. R/nls.R: gettextf("parameters without starting value in 'data': %s", paste(nnn,     collapse = ", "))
+#: R/nls.R:0
+msgid "parameters without starting value in 'data': %s"
+msgstr "parametry bez początkowej wartości w 'data': %s"
 
-msgid "lengths of 'x' and 'w' must match"
-msgstr "długości argumentów 'x' oraz 'w' muszą się zgadzać"
+#. R/pairwise.R: stop("pooling of SD is incompatible with paired tests")
+#: R/pairwise.R:0
+msgid "pooling of SD is incompatible with paired tests"
+msgstr ""
+"zbieranie standardowego odchylenia jest niezgodne ze sparowanymi testami"
 
-msgid "all weights should be non-negative"
-msgstr "wszystkie wagi muszą być nieujemne"
+#. R/family.R: stop("positive values only are allowed for the 'inverse.gaussian' family")
+#: R/family.R:0
+msgid "positive values only are allowed for the 'inverse.gaussian' family"
+msgstr "dodanie wartości są dozwolone jedynie dla rodziny 'inverse.gaussian'"
 
-msgid "some weights should be positive"
-msgstr "niektóre wagi powinny być dodatnie"
+#. R/StructTS.R: gettextf("possible convergence problem: 'optim' gave code = %d and message %s",     res$convergence, sQuote(res$message))
+#: R/StructTS.R:0
+msgid "possible convergence problem: 'optim' gave code = %d and message %s"
+msgstr ""
+"prawdopodobny problem zbieżności: 'optim' zwrócił kod= %d oraz wiadomość %s"
 
-msgid "'tol' must be strictly positive and finite"
-msgstr "argument 'tol' musi być ściśle dodatni i skończony"
+#. R/arima.R: gettextf("possible convergence problem: optim gave code = %d",     res$convergence)
+#. R/arima.R: gettextf("possible convergence problem: optim gave code = %d",     res$convergence)
+#. R/arma0.R: gettextf("possible convergence problem: optim gave code = %d",     code)
+#: R/arima.R:0 R/arma0.R:0
+msgid "possible convergence problem: optim gave code = %d"
+msgstr "prawdopodobny problem zbieżności: 'optim' zwrócił kod= %d"
 
-msgid "need at least four unique 'x' values"
-msgstr "potrzeba przynajmniej czterech unikalnych wartości 'x'"
+#. R/lm.R: warning("prediction from a rank-deficient fit may be misleading")
+#: R/lm.R:0
+msgid "prediction from a rank-deficient fit may be misleading"
+msgstr "predykcja z dopasowania z niedoborem rang może być myląca"
 
-msgid "'cv' must not be NA when 'df' is specified"
-msgstr "argument 'cv' nie może mieć wartości NA, gdy określono argument 'df'"
+#. R/lm.R: warning("predictions on current data refer to _future_ responses\n")
+#: R/lm.R:0
+msgid "predictions on current data refer to _future_ responses"
+msgstr ""
+"predykcje na bieżących danych odnoszą się do _przyszłych_ wartości zmiennej "
+"zależnej"
 
-msgid "cross-validation with non-unique 'x' values seems doubtful"
-msgstr "krzyżowa walidacja z nieunikalnymi wartościami 'x' wydaje się wątpliwa"
+#. R/loess.R: stop("predictors must all be numeric")
+#: R/loess.R:0
+msgid "predictors must all be numeric"
+msgstr "wszystkie predyktory muszą być liczbami"
 
-msgid "'all.knots' is TRUE; 'nknots' specification is disregarded"
+#. R/distn.R: stop("probabilities must be finite, non-negative and not all 0")
+#: R/distn.R:0
+msgid "probabilities must be finite, non-negative and not all 0"
 msgstr ""
-"argument 'all.knots' ma wartość TRUE; specyfikacja 'nknots' została odrzucona"
+"prawdopodobieństwa muszą być skończone, nieujemne i nie wszystkie ustawione "
+"na 0"
 
-msgid "'nknots' must be numeric (in {1,..,n})"
-msgstr "'nknots' musi być liczbą (w przedziale {1,..,n})"
+#. R/chisq.test.R: stop("probabilities must be non-negative.")
+#: R/chisq.test.R:0
+msgid "probabilities must be non-negative."
+msgstr "prawdopodobieństwa muszą być nieujemne."
 
-msgid "'nknots' must be at least 1"
-msgstr "argument 'nknots' musi wynosić co najmniej 1"
+#. R/chisq.test.R: stop("probabilities must sum to 1.")
+#: R/chisq.test.R:0
+msgid "probabilities must sum to 1."
+msgstr "prawdopodobieństwa muszą sumować się do 1."
 
-msgid "cannot use more inner knots than unique 'x' values"
-msgstr "nie można użyć więcej wewnętrznych węzłów niż unikalnych wartości 'x'"
+#. R/optim.R: warning("read the documentation for 'trace' more carefully")
+#: R/optim.R:0
+msgid "read the documentation for 'trace' more carefully"
+msgstr "przeczytaj dokumentację dotyczącą 'trace' bardziej uważnie"
 
-msgid "'spar' must be of length 1"
-msgstr "argument 'spar' musi mieć długość 1"
+#. R/relevel.R: gettextf("ref = %d must be in 1L:%d", ref, nlev)
+#: R/relevel.R:0
+msgid "ref = %d must be in 1L:%d"
+msgstr "ref = %d musi być w przedziale 1L:%d"
 
-msgid "specified both 'df' and 'cv'; will disregard the latter"
-msgstr "określono jednocześnie 'df' oraz 'cv'; drugi zostanie odrzucony"
+#. R/wilcox.test.R: warning("requested conf.level not achievable")
+#. R/wilcox.test.R: warning("requested conf.level not achievable")
+#. R/wilcox.test.R: warning("requested conf.level not achievable")
+#. R/wilcox.test.R: warning("requested conf.level not achievable")
+#: R/wilcox.test.R:0
+msgid "requested conf.level not achievable"
+msgstr "żądany 'conf.level' nie jest osiągalny"
 
-msgid "you must supply 1 < df <= n,  n = #{unique x} ="
-msgstr "musisz dostarczyć 1 < df <= n,  n = #{unikalne x} ="
+#. R/factanal.R: stop("requested scores without an 'x' matrix")
+#: R/factanal.R:0
+msgid "requested scores without an 'x' matrix"
+msgstr "zażądano punktacji bez macierzy 'x'"
 
-msgid "NA lev[]; probably smoothing parameter 'spar' way too large!"
+#. R/lm.R: warning("residual degrees of freedom in object suggest this is not an \"lm\" fit")
+#: R/lm.R:0
+msgid "residual degrees of freedom in object suggest this is not an \"lm\" fit"
 msgstr ""
-"NA lev[]; prawdopodobnie parametr wygładzający 'spar' jest stanowczo zbyt "
-"duży!"
+"stopnie swobody reszty w obiekcie sugerują, że nie jest do dopasowanie 'lm'"
 
-msgid "setting df = 1  __use with care!__"
-msgstr "ustawianie 'df = 1'  __używaj z ostrożnością!__"
+#. R/manova.R: gettextf("residuals have rank %d < %d", rss.qr$rank, ncol(resid))
+#: R/manova.R:0
+msgid "residuals have rank %d < %d"
+msgstr "reszty majÄ… rangÄ™ %d < %d"
 
-msgid "need result of smooth.spline(keep.data = TRUE)"
-msgstr "potrzeba wyniku 'smooth.spline(keep.data=TRUE)'"
+#. R/mlm.R: gettextf("residuals have rank %s < %s", rss.qr$rank, pp)
+#. R/mlm.R: gettextf("residuals have rank %s < %s", rss.qr$rank, pp)
+#: R/mlm.R:0
+msgid "residuals have rank %s < %s"
+msgstr "reszty majÄ… rangÄ™ %s < %s"
 
-msgid "type = \"partial\" is not yet implemented"
-msgstr "'type = \"partial\"' nie jest jeszcze zaimplementowany"
+#. R/factanal.R: stop("response not allowed in formula")
+#. R/prcomp.R: stop("response not allowed in formula")
+#. R/princomp.R: stop("response not allowed in formula")
+#: R/factanal.R:0 R/prcomp.R:0 R/princomp.R:0
+msgid "response not allowed in formula"
+msgstr "zmienna zależna nie jest dozwolona w formule"
 
-msgid "not a valid \"smooth.spline\" object"
-msgstr "to nie jest poprawny obiekt klasy \"smooth.spline\""
+#. R/dendrogram.R: stop("row dendrogram ordering gave index of wrong length")
+#: R/dendrogram.R:0
+msgid "row dendrogram ordering gave index of wrong length"
+msgstr ""
+"porządkowanie drzewa celu względem wierszy zwróciło indeks o niepoprawnej "
+"długości"
 
-msgid "'y' must be numeric vector"
-msgstr "argument 'y' musi być wektorem liczbowym"
+#. R/mantelhaen.test.R: stop("sample size in each stratum must be > 1")
+#: R/mantelhaen.test.R:0
+msgid "sample size in each stratum must be > 1"
+msgstr "rozmiar próby w każdej warstwie musi być > 1"
 
-msgid "number of observations in 'x' and 'y' must match."
-msgstr "liczba obserwacji w argumentach 'x' oraz 'y' musi się zgadzać"
+#. R/shapiro.test.R: stop("sample size must be between 3 and 5000")
+#: R/shapiro.test.R:0
+msgid "sample size must be between 3 and 5000"
+msgstr "długość argumentu 'x' musi być pomiędzy 3 a 5000"
 
-msgid "number of weights must match number of observations."
-msgstr "liczba wag musi zgadzać się z liczbą obserwacji"
+#. R/ansari.test.R: warning("samples differ in location: cannot compute confidence set, returning NA")
+#. R/ansari.test.R: warning("samples differ in location: cannot compute confidence set, returning NA")
+#: R/ansari.test.R:0
+msgid "samples differ in location: cannot compute confidence set, returning NA"
+msgstr ""
+"próby różnią się położeniem: nie można obliczyć przedziału ufności, "
+"zwracanie wartości NA"
 
-msgid "'span' must be between 0 and 1."
-msgstr "argument 'span' musi być pomiędzy 0 a 1"
+#. R/ts.R: stop("scatter plots only for univariate time series")
+#: R/ts.R:0
+msgid "scatter plots only for univariate time series"
+msgstr "wykresy punktowe tylko dla jednowymiarowych szeregów czasowych"
 
-msgid "'x' must be between 0 and 1 for periodic smooth"
-msgstr "'x' musi być pomiedzy 0 a 1 dla periodycznego wygładzania"
+#. R/add.R: stop("scope is not a subset of term labels")
+#. R/add.R: stop("scope is not a subset of term labels")
+#. R/add.R: stop("scope is not a subset of term labels")
+#: R/add.R:0
+msgid "scope is not a subset of term labels"
+msgstr "zakres nie jest podzbiorem etykiet członów"
 
-msgid "no finite observations"
-msgstr "brak skończonych obserwacji"
+#. R/arima.R: warning("seasonal MA part of model is not invertible")
+#. R/arma0.R: warning("seasonal MA part of model is not invertible")
+#: R/arima.R:0 R/arma0.R:0
+msgid "seasonal MA part of model is not invertible"
+msgstr "sezonowa część średniej kroczącej modelu nie jest odwracalna"
 
-msgid "'p' must be between 0 and 0.5"
-msgstr "argument 'p' musi być pomiędzy 0 a 0.5"
+#. R/ts.R: warning("series is corrupt, with no 'tsp' attribute")
+#. R/ts.R: stop("series is corrupt, with no 'tsp' attribute")
+#: R/ts.R:0
+msgid "series is corrupt, with no 'tsp' attribute"
+msgstr "szereg jest uszkodzony, bez atrybutu 'tsp'"
 
-msgid "length of 'p' must be 1 or equal the number of columns of 'x'"
-msgstr "długość 'p' musi być 1 lub równa liczbie kolumn 'x'"
+#. R/ts.R: gettextf("series is corrupt: length %d with 'tsp' implying %d",     NROW(x), nn)
+#. R/ts.R: gettextf("series is corrupt: length %d with 'tsp' implying %d",     NROW(x), nn)
+#: R/ts.R:0
+msgid "series is corrupt: length %d with 'tsp' implying %d"
+msgstr "szereg jest uszkodzony: długość %d z 'tsp' sugerującym %d"
 
-msgid "'x' must be a time series or an ar() fit"
-msgstr "'x' musi być szeregiem czasowym lub dopasowaniem 'ar()'"
+#. R/stl.R: stop("series is not periodic or has less than two periods")
+#: R/stl.R:0
+msgid "series is not periodic or has less than two periods"
+msgstr "szereg nie jest periodyczny lyb ma mniej niż dwa okresy"
 
-msgid "must specify 'spans' or a valid kernel"
-msgstr "potrzeba określić 'spans' lub poprawne jądro"
+#. R/nls.R: stop("setVarying : 'vary' length must match length of parameters")
+#. R/nls.R: stop("setVarying : 'vary' length must match length of parameters")
+#: R/nls.R:0
+msgid "setVarying : 'vary' length must match length of parameters"
+msgstr "setVarying : długość 'vary' musi zgadzać się z długością parametrów"
 
-msgid "coverage probability out of range [0,1)"
-msgstr "prawdopodobieństwo pokrycia poza przedziałem [0,1)"
+#. R/smspline.R: warning(wtxt, "\nsetting df = 1  __use with care!__")
+#: R/smspline.R:0
+msgid "setting df = 1  __use with care!__"
+msgstr "ustawianie 'df = 1'  __używaj z ostrożnością!__"
 
-msgid "spline: first and last y values differ - using y[1] for both"
-msgstr ""
-"spline: pierwsza oraz ostatnia wartość 'y' różnią się -- używanie 'y[1]' dla "
-"obu"
+#. R/contrast.R: stop("singular contrast matrix")
+#: R/contrast.R:0
+msgid "singular contrast matrix"
+msgstr "osobliwa macierz kontrastów"
 
-msgid "'y' must be increasing or decreasing"
-msgstr "'y' musi być rosnące lub malejące"
+#. R/lm.R: stop("singular fit encountered")
+#. R/lm.R: stop("singular fit encountered")
+#: R/lm.R:0
+msgid "singular fit encountered"
+msgstr "napotkano osobliwe dopasowanie"
 
-msgid "'spline' requires n >= 1"
-msgstr "'spline' wymaga n >= 1"
+#. R/nls.R: stop("singular gradient matrix at initial parameter estimates")
+#: R/nls.R:0
+msgid "singular gradient matrix at initial parameter estimates"
+msgstr "osobliwa macierz gradientu w poczÄ…tkowych oszacowaniach parametru"
 
-msgid "spline: first and last y values differ - using y[1L] for both"
-msgstr ""
-"spline: pierwsza oraz ostatnia wartość 'y' różnią się -- używanie 'y[1L]' "
-"dla obu"
+#. R/ts-tests.R: stop("singularities in regression")
+#: R/ts-tests.R:0
+msgid "singularities in regression"
+msgstr "osobliwości w regresji"
 
-msgid "'deriv' must be between 0 and 3"
-msgstr "argument 'deriv' musi być pomiędzy 0 a 3"
+#. R/distn.R: stop("size != sum(x), i.e. one is wrong")
+#: R/distn.R:0
+msgid "size != sum(x), i.e. one is wrong"
+msgstr "'size != sum(x)', tzn. jeden jest niepoprawny"
 
-msgid "'x' must be *strictly* increasing (non - NA)"
-msgstr "'x' musi być *ściśle* rosnące (nie - NA)"
+#. R/hclust.R: stop("size cannot be NA nor exceed 65536")
+#: R/hclust.R:0
+msgid "size cannot be NA nor exceed 65536"
+msgstr "rozmiar nie może wynosić NA ani też przekraczać wartość 65536"
 
-msgid "stepfun: 'x' must be ordered increasingly"
-msgstr "stepfun: 'x' musi być uporządkowany rosnąco"
+#. R/arima.R: warning("some AR parameters were fixed: setting transform.pars = FALSE")
+#: R/arima.R:0
+msgid "some AR parameters were fixed: setting transform.pars = FALSE"
+msgstr ""
+"niektóre parametry autoregresji zostały ustalone: ustawianie 'transform.pars "
+"= FALSE'"
 
-msgid "'x' must have length >= 1"
-msgstr "argument 'x' musi mieć długość >= 1"
+#. R/arma0.R: warning("some ARMA parameters were fixed: setting transform.pars = FALSE")
+#: R/arma0.R:0
+msgid "some ARMA parameters were fixed: setting transform.pars = FALSE"
+msgstr ""
+"niektóre parametry modelu kroczącej średniej autoregresji zostały ustalone: "
+"ustawianie 'transform.pars = FALSE'"
 
-msgid "'y' must be one longer than 'x'"
-msgstr "'y' musi być o jeden dłuższy niż 'x'"
+#. R/reshape.R: gettextf("some constant variables (%s) are really varying", paste(names(rval)[!really.constant],     collapse = ","))
+#: R/reshape.R:0
+msgid "some constant variables (%s) are really varying"
+msgstr "niektóre zmienne o stałej wartości (%s) tak naprawdę się zmieniają"
 
-msgid "no 'as.stepfun' method available for 'x'"
-msgstr "brak dostępnej metody 'as.stepfun' dla 'x'"
+#. R/kruskal.test.R: warning("some elements of 'x' are not numeric and will be coerced to numeric")
+#: R/kruskal.test.R:0
+msgid "some elements of 'x' are not numeric and will be coerced to numeric"
+msgstr ""
+"niektóre elementy 'x' nie są liczbami, więc zostaną przekształcone na liczby"
 
-msgid "not a valid step function"
-msgstr "to nie jest poprawna funkcja krokowa"
+#. R/dummy.coef.R: warning("some terms will have NAs due to the limits of the method")
+#: R/dummy.coef.R:0
+msgid "some terms will have NAs due to the limits of the method"
+msgstr ""
+"niektóre wyrażenia będą miały wartości NA z uwagi na ograniczenia metody"
 
-msgid "'plot.stepfun' called with wrong type of argument 'x'"
-msgstr "'plot.stepfun' wywołana z błędnym typem argumentu 'x'"
+#. R/smspline.R: stop("some weights should be positive")
+#: R/smspline.R:0
+msgid "some weights should be positive"
+msgstr "niektóre wagi powinny być dodatnie"
 
-msgid "%s must be 0 or 1"
-msgstr "%s musi wynosić 0 lub 1"
+#. R/smspline.R: warning("specified both 'df' and 'cv'; will disregard the latter")
+#: R/smspline.R:0
+msgid "specified both 'df' and 'cv'; will disregard the latter"
+msgstr "określono jednocześnie 'df' oraz 'cv'; drugi zostanie odrzucony"
 
-msgid "only univariate series are allowed"
-msgstr "tylko jednowymiarowe serie sÄ… dozwolone"
+#. R/loess.R: stop("specified parametric for all predictors")
+#: R/loess.R:0
+msgid "specified parametric for all predictors"
+msgstr "określono parametry dla wszystkich predyktorów"
 
-msgid "series is not periodic or has less than two periods"
-msgstr "szereg nie jest periodyczny lyb ma mniej niż dwa okresy"
+#. R/loess.R: stop("specified the square of a factor predictor to be dropped when degree = 1")
+#: R/loess.R:0
+msgid ""
+"specified the square of a factor predictor to be dropped when degree = 1"
+msgstr ""
+"określono kwadrat predyktora czynnika, który ma zostać pominięty, gdy "
+"stopień = 1"
 
-msgid "unknown string value for s.window"
-msgstr "nieznana wartość łańcucha dla argumentu 's.window'"
+#. R/loess.R: stop("specified the square of a predictor to be dropped with only one numeric predictor")
+#: R/loess.R:0
+msgid ""
+"specified the square of a predictor to be dropped with only one numeric "
+"predictor"
+msgstr ""
+"określono kwadrat predyktora, który ma zostać pominięty z tylko jednym "
+"liczbowym predyktorem"
 
-msgid "'cutpoints' must be unique in 0 < cuts < 1, but are ="
-msgstr "'cutpoints' muszą być unikalne w przedziale '0 < cuts < 1', ale są ="
+#. R/distn.R: warning("specify 'rate' or 'scale' but not both")
+#. R/distn.R: stop("specify 'rate' or 'scale' but not both")
+#. R/distn.R: warning("specify 'rate' or 'scale' but not both")
+#. R/distn.R: stop("specify 'rate' or 'scale' but not both")
+#. R/distn.R: warning("specify 'rate' or 'scale' but not both")
+#. R/distn.R: stop("specify 'rate' or 'scale' but not both")
+#. R/distn.R: warning("specify 'rate' or 'scale' but not both")
+#. R/distn.R: stop("specify 'rate' or 'scale' but not both")
+#: R/distn.R:0
+msgid "specify 'rate' or 'scale' but not both"
+msgstr "określ 'rate' lub 'scale', ale nie oba jednocześnie"
 
-msgid "'cutpoints' must be unique, but are ="
-msgstr "'cutpoints' muszą być unikalne, ale są ="
+#. R/identify.hclust.R: stop("specify exactly one of 'k' and 'h'")
+#. R/identify.hclust.R: stop("specify exactly one of 'k' and 'h'")
+#: R/identify.hclust.R:0
+msgid "specify exactly one of 'k' and 'h'"
+msgstr "określ dokładnie jeden z 'k' oraz 'h'"
 
-msgid "'x' must be between -1 and 1"
-msgstr "wartość 'x' musi być pomiędzy -1 a 1"
+#. R/identify.hclust.R: stop("specify exactly one of 'which' and 'x'")
+#: R/identify.hclust.R:0
+msgid "specify exactly one of 'which' and 'x'"
+msgstr "określ dokładnie jeden z 'which' oraz 'x'"
 
-msgid "'x' must be between %s and %s"
-msgstr "argument 'x' musi być pomiędzy %s a %s"
+#. R/splinefun.R: warning("spline: first and last y values differ - using y[1L] for both")
+#: R/splinefun.R:0
+msgid "spline: first and last y values differ - using y[1L] for both"
+msgstr ""
+"spline: pierwsza oraz ostatnia wartość 'y' różnią się -- używanie 'y[1L]' "
+"dla obu"
 
-msgid "number of 'cutpoints' must be one less than number of symbols"
-msgstr "liczba 'cutpoints' musi być o jeden mniejsza niż liczba symboli"
+#. R/spline.R: warning("spline: first and last y values differ - using y[1] for both")
+#: R/spline.R:0
+msgid "spline: first and last y values differ - using y[1] for both"
+msgstr ""
+"spline: pierwsza oraz ostatnia wartość 'y' różnią się -- używanie 'y[1]' dla "
+"obu"
 
-msgid "number of 'cutpoints' must be one more than number of symbols"
-msgstr "liczba 'cutpoints' musi być o jeden większa niż liczba symboli"
+#. R/glm.R: warning("step size truncated due to divergence", call. = FALSE)
+#: R/glm.R:0
+msgid "step size truncated due to divergence"
+msgstr "rozmiar kroku został przycięty ze względu na rozbieżność"
+
+#. R/glm.R: warning("step size truncated: out of bounds", call. = FALSE)
+#: R/glm.R:0
+msgid "step size truncated: out of bounds"
+msgstr "rozmiar kroku został przycięty: poza granicami"
+
+#. R/stepfun.R: stop("stepfun: 'x' must be ordered increasingly")
+#: R/stepfun.R:0
+msgid "stepfun: 'x' must be ordered increasingly"
+msgstr "stepfun: 'x' musi być uporządkowany rosnąco"
 
-msgid "must have 2 'symbols' for logical 'x' argument"
-msgstr "potrzeba mieć dwa 'symbols' dla argumentu logicznego 'x'"
+#. R/density.R: warning("sum(weights) != 1  -- will not get true density")
+#: R/density.R:0
+msgid "sum(weights) != 1  -- will not get true density"
+msgstr "'sum(weights)  !=  1' -- nie uzyska się prawdziwej gęstości"
 
-msgid "invalid 'abbr.colnames'"
-msgstr "niepoprawna wartość 'abbr.colnames'"
+#. R/cor.R: stop("supply both 'x' and 'y' or a matrix-like 'x'")
+#. R/cor.R: stop("supply both 'x' and 'y' or a matrix-like 'x'")
+#: R/cor.R:0
+msgid "supply both 'x' and 'y' or a matrix-like 'x'"
+msgstr "dostarcz oba 'x' oraz 'y' lub 'x' przypominajÄ…ce macierz"
 
-msgid "'mu' must be a single number"
-msgstr "argument 'mu' musi być pojedynczą liczbą"
+#. R/prop.test.R: stop("table 'x' should have 2 entries")
+#: R/prop.test.R:0
+msgid "table 'x' should have 2 entries"
+msgstr "tabela 'x' powinna mieć 2 wpisy"
 
-msgid "'y' is missing for paired test"
-msgstr "brakuje 'y' do sparowanego testu"
+#. R/cutree.R: stop("the 'height' component of 'tree' is not sorted (increasingly)")
+#: R/cutree.R:0
+msgid "the 'height' component of 'tree' is not sorted (increasingly)"
+msgstr "komponent 'height' w 'tree' nie jest (rosnÄ…co) posortowany"
 
-msgid "data are essentially constant"
-msgstr "dane są w zasadzie stałe"
+#. R/lm.R: stop("the 'se.fit' argument is not yet implemented for \"mlm\" objects")
+#: R/lm.R:0
+msgid "the 'se.fit' argument is not yet implemented for \"mlm\" objects"
+msgstr "argument 'se.fit' dla obiektów 'mlm' nie jest jeszcze zaimplementowany"
 
-msgid "'main' must be TRUE, FALSE, NULL or character (vector)."
-msgstr "'main' musi być TRUE, FALSE, NULL lub być tekstem (wektor)."
+#. R/aov.R: stop("the 'split' argument must be a list")
+#: R/aov.R:0
+msgid "the 'split' argument must be a list"
+msgstr "argument 'split' musi być listą"
 
-msgid "x is not a vector or univariate time series"
-msgstr "'x' nie jest wektorem ani jednowymiarowym szeregiem czasowym"
+#. R/poisson.test.R: stop("the case k > 2 is unimplemented")
+#: R/poisson.test.R:0
+msgid "the case k > 2 is unimplemented"
+msgstr "przypadek dla k > 2 nie jest zaimplementowany"
 
-msgid "singularities in regression"
-msgstr "osobliwości w regresji"
+#. R/aov.R: stop("the contrast defined is empty (has no TRUE elements)")
+#. R/aov.R: stop("the contrast defined is empty (has no TRUE elements)")
+#: R/aov.R:0
+msgid "the contrast defined is empty (has no TRUE elements)"
+msgstr "zdefiniowany kontrast jest pusty (nie ma elementów TRUE)"
 
-msgid "'ts' object must have one or more observations"
-msgstr "obiekt 'ts' musi mieć jedną lub więcej obserwacji"
+#. R/StructTS.R: stop("the first value of the time series must not be missing")
+#: R/StructTS.R:0
+msgid "the first value of the time series must not be missing"
+msgstr "pierwsza wartość szeregu czasowego nie może być brakującą"
 
-msgid "'start' cannot be after 'end'"
-msgstr "'start' nie może być po 'end'"
+#. R/glm.R: gettextf("the following arguments to 'anova.glm' are invalid and dropped: %s",     paste(deparse(dotargs[named]), collapse = ", "))
+#: R/glm.R:0
+msgid "the following arguments to 'anova.glm' are invalid and dropped: %s"
+msgstr ""
+"następujące argumenty przekazane do 'anova.glm()' są niepoprawne i zostały "
+"pominięte: %s"
+
+#. R/StructTS.R: stop("the series is entirely NA")
+#. R/StructTS.R: stop("the series is entirely NA")
+#. R/StructTS.R: stop("the series is entirely NA")
+#: R/StructTS.R:0
+msgid "the series is entirely NA"
+msgstr "seria jest całkowicie wypełniona wartościami 'NA'"
 
-msgid "no time series supplied"
-msgstr "nie dostarczono szeregu czasowego"
+#. R/reshape.R: warning("there are records with missing times, which will be dropped.")
+#: R/reshape.R:0
+msgid "there are records with missing times, which will be dropped."
+msgstr "pojawiają się rekordy z brakującymi czasami, które zostaną pominięte."
 
-msgid "not all series have the same frequency"
-msgstr "nie wszystkie szeregi mają tę samą częstotliwość"
+#. R/bartlett.test.R: stop("there must be at least 2 observations in each group")
+#: R/bartlett.test.R:0
+msgid "there must be at least 2 observations in each group"
+msgstr "potrzeba co najmniej 2 obserwacji w każdej grupie"
 
-msgid "non-intersecting series"
-msgstr "nieprzecinajÄ…ce siÄ™ szeregi"
+#. R/model.tables.R: stop("this fit does not inherit from \"lm\"")
+#: R/model.tables.R:0
+msgid "this fit does not inherit from \"lm\""
+msgstr "to dopasowanie nie dziedziczy z 'lm'"
 
-msgid "non-time series not of the correct length"
-msgstr "szeregi nie-czasowe nie mają poprawnej długości"
+#. R/ks.test.R: warning("ties should not be present for the Kolmogorov-Smirnov test")
+#: R/ks.test.R:0
+msgid "ties should not be present for the Kolmogorov-Smirnov test"
+msgstr ""
+"wartości powtórzone nie powinny być obecne w teście Kolmogorowa-Smirnowa"
 
+#. R/ts.R: stop("time series contains internal NAs")
+#: R/ts.R:0
 msgid "time series contains internal NAs"
 msgstr "szeregi czasowe zawierają wewnętrznie wartości NA"
 
-msgid "series is corrupt, with no 'tsp' attribute"
-msgstr "szereg jest uszkodzony, bez atrybutu 'tsp'"
+#. R/HoltWinters.R: stop("time series has no or less than 2 periods")
+#: R/HoltWinters.R:0
+msgid "time series has no or less than 2 periods"
+msgstr "szereg czasowy nie posiada okresów lub ma ich mniej niż 2"
 
-msgid "series is corrupt: length %d with 'tsp' implying %d"
-msgstr "szereg jest uszkodzony: długość %d z 'tsp' sugerującym %d"
+#. R/ts.R: stop("times to be replaced do not match")
+#: R/ts.R:0
+msgid "times to be replaced do not match"
+msgstr "czasy do zastÄ…pienia nie zgadzajÄ… siÄ™"
 
-msgid "cannot plot more than 10 series as \"multiple\""
-msgstr "nie można narysować więcej niż 10 szeregów jako 'multiple'"
+#. R/lm.influence.R: stop("too few cases, n < k")
+#: R/lm.influence.R:0
+msgid "too few cases, n < k"
+msgstr "zbyt mało przypadków, n < k"
 
-msgid "scatter plots only for univariate time series"
-msgstr "wykresy punktowe tylko dla jednowymiarowych szeregów czasowych"
+#. R/zzModels.R: stop("too few distinct input values to fit a Michaelis-Menten model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit a Michaelis-Menten model"
+msgstr ""
+"zbyt mało różnych wartości wejściowych aby dopasować model Michaelisa-Mentena"
 
-msgid "'xy.labels' must be logical or character"
-msgstr "'xy.labels' musi być tekstem lub zmienną logiczną"
+#. R/zzModels.R: stop("too few distinct input values to fit a biexponential")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit a biexponential"
+msgstr "zbyt mało różnych wartości wejściowych aby dopasować 'biexponential'"
 
-msgid "'frequency' and 'deltat' are both supplied and are inconsistent"
+#. R/zzModels.R: stop("too few distinct input values to fit a four-parameter logistic")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit a four-parameter logistic"
 msgstr ""
-"oba argumenty 'frequency' oraz 'deltat' zostały dostarczone oraz oba są "
-"niezgodne"
+"zbyt mało różnych wartości wejściowych aby dopasować 4 parametrową funkcję "
+"logistycznÄ…"
 
-msgid "'frequency' not changed"
-msgstr "argument 'frequency' nie został zmieniony"
+#. R/zzModels.R: stop("too few distinct input values to fit a logistic model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit a logistic model"
+msgstr "zbyt mało różnych wartości wejściowych aby dopasować model logistyczny"
 
-msgid "bad value for 'start'"
-msgstr "niepoprawna wartość dla 'start'"
+#. R/zzModels.R: stop("too few distinct input values to fit an asymptotic regression model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit an asymptotic regression model"
+msgstr ""
+"zbyt mało różnych wartości wejściowych aby dopasować model regresji "
+"asymptotycznej"
 
-msgid "'start' value not changed"
-msgstr "argument 'start' nie został zmieniony"
+#. R/zzModels.R: stop("too few distinct input values to fit the 'asympOff' model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit the 'asympOff' model"
+msgstr "zbyt mało różnych wartości wejściowych aby dopasować model 'asympOff'"
 
-msgid "bad value for 'end'"
-msgstr "niepoprawna wartość dla argumentu 'end'"
+#. R/zzModels.R: stop("too few distinct input values to fit the 'asympOrig' model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit the 'asympOrig' model"
+msgstr "zbyt mało różnych wartości wejściowych aby dopasować model 'asympOrig'"
 
-msgid "'end' value not changed"
-msgstr "argument 'end' nie został zmieniony"
+#. R/zzModels.R: stop("too few distinct input values to fit the Gompertz model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit the Gompertz model"
+msgstr "zbyt mało różnych wartości wejściowych aby dopasować model Gompertza"
 
-msgid "'start' > 'end'"
-msgstr "'start' > 'end'"
+#. R/zzModels.R: stop("too few distinct input values to fit the Weibull growth model")
+#: R/zzModels.R:0
+msgid "too few distinct input values to fit the Weibull growth model"
+msgstr ""
+"zbyt mało różnych wartości wejściowych aby dopasować model wzrostu Weibull'a"
 
-msgid "extending time series when replacing values"
-msgstr "rozszerzanie szeregów czasowych przy wymianie wartości"
+#. R/pairwise.R: stop("too few groups")
+#: R/pairwise.R:0
+msgid "too few groups"
+msgstr "zbyt mało grup"
 
-msgid "times to be replaced do not match"
-msgstr "czasy do zastÄ…pienia nie zgadzajÄ… siÄ™"
+#. R/arima.R: stop("too few non-missing observations")
+#: R/arima.R:0
+msgid "too few non-missing observations"
+msgstr "zbyt mało niebrakujących obserwacji"
 
-msgid "no replacement values supplied"
-msgstr "nie dostarczono wartości zamiennych"
+#. R/zzModels.R: stop("too few observations to fit an asymptotic regression model")
+#: R/zzModels.R:0
+msgid "too few observations to fit an asymptotic regression model"
+msgstr "zbyt mało obserwacji aby dopasować model regresji asymptotycznej "
 
+#. R/ts.R: stop("too many replacement values supplied")
+#: R/ts.R:0
 msgid "too many replacement values supplied"
 msgstr "dostarczono zbyt dużo wartości zamiennych"
 
-msgid ""
-"number of values supplied is not a sub-multiple of the number of values to "
-"be replaced"
+#. R/arma0.R: warning("transformed ARMA parameters were fixed")
+#: R/arma0.R:0
+msgid "transformed ARMA parameters were fixed"
 msgstr ""
-"liczba dostarczonych wartości nie jest pod-wielokrotnością liczby wartości "
-"do zamiany"
-
-msgid "only replacement of elements is allowed"
-msgstr "dozwolona jest tylko zamiana elementów"
-
-msgid "'model' must be list"
-msgstr "argument 'model' musi być listą"
-
-msgid "'n' must be strictly positive"
-msgstr "argument 'n' musi być ściśle dodatni"
+"przetransformowane parametry kroczącej średniej autoregresji zostały ustalone"
 
-msgid "'ar' part of model is not stationary"
-msgstr "część 'ar' modelu nie jest stacjonarna"
+#. R/model.tables.R: gettextf("type '%s' is not implemented yet", type)
+#. R/model.tables.R: gettextf("type '%s' is not implemented yet", type)
+#: R/model.tables.R:0
+msgid "type '%s' is not implemented yet"
+msgstr "typ '%s' nie jest jeszcze zaimplementowany"
 
-msgid "burn-in 'n.start' must be as long as 'ar + ma'"
-msgstr "oryginał 'n.start' musi być tak długi jak 'ar + ma'"
+#. R/smspline.R: stop("type = \"partial\" is not yet implemented")
+#: R/smspline.R:0
+msgid "type = \"partial\" is not yet implemented"
+msgstr "'type = \"partial\"' nie jest jeszcze zaimplementowany"
 
-msgid "'model$order' must be of length 3"
-msgstr "'model$order' musi być długości 3"
+#. R/cancor.R: stop("unequal number of rows in 'cancor'")
+#: R/cancor.R:0
+msgid "unequal number of rows in 'cancor'"
+msgstr "nierówna liczba wierszy w 'cancor()'"
 
-msgid "inconsistent specification of 'ar' order"
-msgstr "niespójna specyfikacja porządku 'ar'"
+#. R/acf.R: stop("univariate time series only")
+#: R/acf.R:0
+msgid "univariate time series only"
+msgstr "tylko jednowymiarowe szeregi czasowe"
 
-msgid "inconsistent specification of 'ma' order"
-msgstr "niespójna specyfikacja porządku 'ma'"
+#. R/density.R: stop("unknown bandwidth rule")
+#: R/density.R:0
+msgid "unknown bandwidth rule"
+msgstr "nieznana reguła szerokości pasma"
 
-msgid "number of differences must be a positive integer"
-msgstr "liczba różnic musi być dodatnią liczbą całkowitą"
+#. R/kernel.R: stop("unknown named kernel")
+#: R/kernel.R:0
+msgid "unknown named kernel"
+msgstr "nieznane nazwane jÄ…dro"
 
-msgid "need an object with call component"
-msgstr "potrzeba obiektu z komponentem wywołania"
+#. R/optim.R: gettextf("unknown names in control: %s", paste(noNms, collapse = ", "))
+#: R/optim.R:0
+msgid "unknown names in control: %s"
+msgstr "nieznane nazwy w kontroli: %s"
 
-msgid "'ratio' must be a single positive number"
-msgstr "argument 'ratio' musi być pojedynczą dodatnią liczbą"
+#. R/stl.R: stop("unknown string value for s.window")
+#: R/stl.R:0
+msgid "unknown string value for s.window"
+msgstr "nieznana wartość łańcucha dla argumentu 's.window'"
 
-msgid "'x' and 'w' must have the same length"
-msgstr "argumenty 'x' oraz 'w' muszą mieć tę samą długość"
+#. R/nls.R: warning("upper and lower bounds ignored unless algorithm = \"port\"")
+#: R/nls.R:0
+msgid "upper and lower bounds ignored unless algorithm = \"port\""
+msgstr ""
+"górne oraz dolne granice zostały zignorowane, dopóki nie będzie 'algorithm = "
+"\"port\"'"
 
-msgid "not enough (finite) 'x' observations"
-msgstr "niewystarczająca liczba skończonych obserwacji"
+#. R/plot.lm.R: stop("use only with \"lm\" objects")
+#: R/plot.lm.R:0
+msgid "use only with \"lm\" objects"
+msgstr "używaj tylko z obiektami klasy \"lm\""
 
-msgid "requested conf.level not achievable"
-msgstr "żądany 'conf.level' nie jest osiągalny"
+#. R/glm.R: gettextf("using F test with a '%s' family is inappropriate",     fam)
+#. R/glm.R: gettextf("using F test with a '%s' family is inappropriate",     fam)
+#: R/glm.R:0
+msgid "using F test with a '%s' family is inappropriate"
+msgstr "używanie testu Fishera z rodziną '%s' jest niepoprawne"
 
-msgid "cannot compute confidence interval when all observations are tied"
-msgstr ""
-"nie można obliczyć przedziału ufności gdy wszystkie obserwacje są powtórzone"
+#. R/glm.R: warning("using F test with a fixed dispersion is inappropriate")
+#. R/glm.R: warning("using F test with a fixed dispersion is inappropriate")
+#: R/glm.R:0
+msgid "using F test with a fixed dispersion is inappropriate"
+msgstr "używanie testu Fishera z ustaloną dyspersją jest niepoprawne"
 
-msgid "cannot compute exact confidence interval with ties"
+#. R/models.R: warning("using type = \"numeric\" with a factor response will be ignored")
+#: R/models.R:0
+msgid "using type = \"numeric\" with a factor response will be ignored"
 msgstr ""
-"nie można obliczyć dokładnego przedziału ufności z wartościami powtórzonymi"
-
-msgid "cannot compute exact p-value with zeroes"
-msgstr "nie można obliczyć dokładnej wartości prawdopodobieństwa z zerami"
+"użycie 'type=\"numeric\"' z czynnikową zmienną zależną zostanie zignorowane"
 
-msgid "cannot compute exact confidence interval with zeroes"
-msgstr "nie można obliczyć dokładnego przedziału ufności z zerami"
+#. R/family.R: message("using weights as inverse variances")
+#: R/family.R:0
+msgid "using weights as inverse variances"
+msgstr "używanie wag jako odwrotności wariancji"
 
-msgid "Requested conf.level not achievable"
-msgstr "żądany 'conf.level' nie jest osiągalny"
+#. R/family.R: message("using weights as shape parameters")
+#: R/family.R:0
+msgid "using weights as shape parameters"
+msgstr "używanie wag jako parametrów kształtu"
 
-msgid "must supply either 'formula' or 'data'"
-msgstr "potrzeba dostarczyć albo 'formula' albo 'data'"
+#. R/glm.R: stop("value of 'epsilon' must be > 0")
+#: R/glm.R:0
+msgid "value of 'epsilon' must be > 0"
+msgstr "wartość 'epsilon' musi być > 0"
 
-msgid "%s applies only to two-way tables"
-msgstr "'%s' stosuje siÄ™ jedynie do dwukierunkowych tabel"
+#. R/models.R: gettextf("variable '%s' is absent, its contrast will be ignored",     nn)
+#: R/models.R:0
+msgid "variable '%s' is absent, its contrast will be ignored"
+msgstr "zmienna '%s' jest nieobecna, jej kontrast będzie zignorowany"
 
-msgid "too few distinct input values to fit an asymptotic regression model"
-msgstr ""
-"zbyt mało różnych wartości wejściowych aby dopasować model regresji "
-"asymptotycznej"
+#. R/models.R: gettextf("variable '%s' is not a factor", nm)
+#: R/models.R:0
+msgid "variable '%s' is not a factor"
+msgstr "zmienna '%s' nie jest czynnikiem"
 
-msgid "cannot fit an asymptotic regression model to these data"
-msgstr "nie można dopasować modelu regresji asymptotycznej do tych danych"
+#. R/models.R: gettextf("variable '%s' was fitted with type \"%s\" but type \"%s\" was supplied",     names(old)[wrong], old[wrong], new[wrong])
+#: R/models.R:0
+msgid "variable '%s' was fitted with type \"%s\" but type \"%s\" was supplied"
+msgstr "zmienna '%s' została dopasowana z typem '%s', ale dostarczono typ '%s'"
 
-msgid "too few observations to fit an asymptotic regression model"
-msgstr "zbyt mało obserwacji aby dopasować model regresji asymptotycznej "
+#. R/models.R: gettextf("variables %s were specified with different types from the fit",     paste(sQuote(names(old)[wrong]), collapse = ", "))
+#: R/models.R:0
+msgid "variables %s were specified with different types from the fit"
+msgstr "zmienne %s zostały określone z typami innymi od tych z dopasowania"
 
-msgid "too few distinct input values to fit the 'asympOff' model"
-msgstr "zbyt mało różnych wartości wejściowych aby dopasować model 'asympOff'"
+#. R/aov.R: stop("weights are not supported in a multistratum aov() fit")
+#: R/aov.R:0
+msgid "weights are not supported in a multistratum aov() fit"
+msgstr "wagi nie sÄ… wspierane w wielowarstwowym dopasowaniu 'aov()'"
 
-msgid "too few distinct input values to fit the 'asympOrig' model"
-msgstr "zbyt mało różnych wartości wejściowych aby dopasować model 'asympOrig'"
+#. R/cov.wt.R: stop("weights must be non-negative and not all zero")
+#: R/cov.wt.R:0
+msgid "weights must be non-negative and not all zero"
+msgstr "wagi muszą być nieujemne oraz nie wszystkie równe zero"
 
-msgid "too few distinct input values to fit a biexponential"
-msgstr "zbyt mało różnych wartości wejściowych aby dopasować 'biexponential'"
+#. R/embed.R: stop("wrong embedding dimension")
+#. R/embed.R: stop("wrong embedding dimension")
+#: R/embed.R:0
+msgid "wrong embedding dimension"
+msgstr "niepoprawnie osadzony wymiar"
 
-msgid "must have length of response = length of second argument to 'SSfol'"
-msgstr ""
-"potrzeba, aby długość zmiennej zależnej = długości drugiego argumentu 'SSfol'"
+#. R/anova.R: stop("wrong k / cs.ind")
+#: R/anova.R:0
+msgid "wrong k / cs.ind"
+msgstr "niepoprawny 'k' / 'cs.ind'"
 
-msgid "must have at least 4 observations to fit an 'SSfol' model"
-msgstr "potrzeba mieć co najmniej 4 obserwacje aby dopasować model 'SSfol'"
+#. R/arima.R: stop("wrong length for 'fixed'")
+#. R/arma0.R: stop("wrong length for 'fixed'")
+#: R/arima.R:0 R/arma0.R:0
+msgid "wrong length for 'fixed'"
+msgstr "niepoprawna długość dla argumentu 'fixed'"
 
-msgid "too few distinct input values to fit a four-parameter logistic"
-msgstr ""
-"zbyt mało różnych wartości wejściowych aby dopasować 4 parametrową funkcję "
-"logistycznÄ…"
+#. R/ftable.R: stop("wrong method")
+#: R/ftable.R:0
+msgid "wrong method"
+msgstr "błędna metoda"
 
-msgid "too few distinct input values to fit a logistic model"
-msgstr "zbyt mało różnych wartości wejściowych aby dopasować model logistyczny"
+#. R/ppr.R: stop("wrong number of columns in 'x'")
+#: R/ppr.R:0
+msgid "wrong number of columns in 'x'"
+msgstr "niepoprawna liczba kolumn w 'x'"
 
-msgid "too few distinct input values to fit a Michaelis-Menten model"
-msgstr ""
-"zbyt mało różnych wartości wejściowych aby dopasować model Michaelisa-Mentena"
+#. R/contr.poly.R: stop("wrong number of columns in new data: ", deparse(substitute(...)))
+#: R/contr.poly.R:0
+msgid "wrong number of columns in new data:"
+msgstr "niepoprawna liczba kolumn w nowych danych:"
 
-msgid "too few distinct input values to fit the Gompertz model"
-msgstr "zbyt mało różnych wartości wejściowych aby dopasować model Gompertza"
+#. R/contrast.R: stop("wrong number of contrast matrix rows")
+#: R/contrast.R:0
+msgid "wrong number of contrast matrix rows"
+msgstr "niepoprawna liczba wierszy macierzy kontrastu"
 
-msgid "too few distinct input values to fit the Weibull growth model"
-msgstr ""
-"zbyt mało różnych wartości wejściowych aby dopasować model wzrostu Weibull'a"
+#. R/ts-tests.R: stop("x is not a vector or univariate time series")
+#. R/ts-tests.R: stop("x is not a vector or univariate time series")
+#: R/ts-tests.R:0
+msgid "x is not a vector or univariate time series"
+msgstr "'x' nie jest wektorem ani jednowymiarowym szeregiem czasowym"
 
-msgid "all 'x' values must be non-negative to fit the Weibull growth model"
-msgstr ""
-"wszystkie wartości 'x' musi być nieujemne aby dopasować model wzrostu "
-"Weibull'a"
+#. R/acf.R: stop("x$lag must have at least 1 column")
+#: R/acf.R:0
+msgid "x$lag must have at least 1 column"
+msgstr "'x$lag' musi mieć jak przynajmniej 1 kolumnę"
 
-msgid "using the %d/%d row from a combined fit"
-msgid_plural "using the %d/%d rows from a combined fit"
-msgstr[0] "używanie %d/%d wiersza z połączonego dopasowania"
-msgstr[1] "używanie %d/%d wierszy z połączonego dopasowania"
-msgstr[2] "używanie %d/%d wierszy z połączonego dopasowania"
+#. R/cmdscale.R: warning("x.ret=TRUE is disregarded when list.=FALSE")
+#: R/cmdscale.R:0
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr "'x.ret=TRUE' jest nieuwzględniane gdy  'list.=FALSE'"
 
-msgid "lower scope has term %s not included in model"
-msgid_plural "lower scope has terms %s not included in model"
-msgstr[0] ""
-"niższy zakres posiada człon %s, które nie jest uwzględniony w modelu"
-msgstr[1] "niższy zakres posiada człony %s, które nie są uwzględnione w modelu"
-msgstr[2] "niższy zakres posiada człony %s, które nie są uwzględnione w modelu"
+#. R/distn.R: stop("x[] and prob[] must be equal length vectors.")
+#: R/distn.R:0
+msgid "x[] and prob[] must be equal length vectors."
+msgstr "argumenty 'x' oraz 'prob' muszą być wektorami o jednakowej długości"
 
-msgid "upper scope has term %s not included in model"
-msgid_plural "upper scope has terms %s not included in model"
-msgstr[0] "górny zakres posiada człon %s, które nie jest uwzględniony w modelu"
-msgstr[1] "górny zakres posiada człony %s, które nie są uwzględnione w modelu"
-msgstr[2] "górny zakres posiada człony %s, które nie są uwzględnione w modelu"
+#. R/qqnorm.R: stop("y is empty or has only NAs")
+#: R/qqnorm.R:0
+msgid "y is empty or has only NAs"
+msgstr "argument 'y' jest pusty lub posiada jedynie wartości NA"
 
-msgid "there are %d Error terms: only 1 is allowed"
-msgid_plural "there are %d Error terms: only 1 is allowed"
-msgstr[0] "jest %d człon błędu: tylko 1 jest dozwolony"
-msgstr[1] "są %d człony błędu: tylko 1 jest dozwolony"
-msgstr[2] "jest %d członów błędu: tylko 1 jest dozwolony"
+#. R/family.R: stop("y values must be 0 <= y <= 1")
+#. R/family.R: stop("y values must be 0 <= y <= 1")
+#: R/family.R:0
+msgid "y values must be 0 <= y <= 1"
+msgstr "wartości 'y' muszą być z przedziału 0 <= y <= 1"
 
-msgid "unknown name %s in the 'split' list"
-msgid_plural "unknown names %s in the 'split' list"
-msgstr[0] "nieznana nazwa %s w liście 'split'"
-msgstr[1] "nieznane nazwy %s w liście 'split'"
-msgstr[2] "nieznane nazwy %s w liście 'split'"
+#. R/smspline.R: warning("you must supply 1 < df <= n,  n = #{unique x} = ", nx)
+#: R/smspline.R:0
+msgid "you must supply 1 < df <= n,  n = #{unique x} ="
+msgstr "musisz dostarczyć 1 < df <= n,  n = #{unikalne x} ="
 
-msgid "extra argument %s is not of class \"%s\""
-msgid_plural "extra arguments %s are not of class \"%s\"s"
-msgstr[0] "dodatkowy argument %s nie jest obiektem klasy \"%s\""
-msgstr[1] "dodatkowe argumenty %s nie sÄ… obiektami klasy \"%s\""
-msgstr[2] "dodatkowe argumenty %s nie sÄ… obiektami klasy \"%s\""
+#. R/approx.R: stop("zero non-NA points")
+#. R/approx.R: stop("zero non-NA points")
+#. R/spline.R: stop("zero non-NA points")
+#. R/splinefun.R: stop("zero non-NA points")
+#: R/approx.R:0 R/spline.R:0 R/splinefun.R:0
+msgid "zero non-NA points"
+msgstr "zero punktów o wartości nie-NA"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "dodatkowy argument %s został odrzucony"
-msgstr[1] "dodatkowe argumenty %s zostały odrzucone"
-msgstr[2] "dodatkowe argumenty %s zostały odrzucone"
+#. R/ar.R: stop("zero-variance series")
+#. R/ar.R: stop("zero-variance series")
+#: R/ar.R:0
+msgid "zero-variance series"
+msgstr "seria o zerowej wariancji"
 
+#. R/factanal.R: ngettext(factors, "%d factor is too many for %d variables", "%d factors are too many for %d variables")
+#: R/factanal.R:0
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%d czynnik to zbyt dużo dla %d zmiennych"
 msgstr[1] "%d czynniki to zbyt dużo dla %d zmiennych"
 msgstr[2] "%d czynników to zbyt dużo dla %d zmiennych"
 
-msgid "'start' must have %d row"
-msgid_plural "'start' must have %d rows"
-msgstr[0] "'start' musi mieć %d wiersz"
-msgstr[1] "'start' musi mieć %d wiersze"
-msgstr[2] "'start' musi mieć %d wierszy"
-
-msgid "unable to optimize from this starting value"
-msgid_plural "unable to optimize from these starting values"
-msgstr[0] "nie można zoptymalizować z tej wartości startowej"
-msgstr[1] "nie można zoptymalizować z tych wartości startowych"
-msgstr[2] "nie można zoptymalizować z tych wartości startowych"
-
-msgid "'init' must have %d column"
-msgid_plural "'init' must have 1 or %d columns"
-msgstr[0] "'init' musi mieć %d kolumnę"
-msgstr[1] "'init' musi mieć 1 lub %d kolumny"
-msgstr[2] "'init' musi mieć 1 lub %d kolumn"
-
-msgid "X matrix has rank %d, but only %d observation"
-msgid_plural "X matrix has rank %d, but only %d observations"
-msgstr[0] "macierz 'X' ma rangÄ™ %d, ale tylko %d obserwacjÄ™"
-msgstr[1] "macierz 'X' ma rangÄ™ %d, ale tylko %d obserwacje"
-msgstr[2] "macierz 'X' ma rangÄ™ %d, ale tylko %d obserwacji"
-
-msgid "did not converge in %d iteration"
-msgid_plural "did not converge in %d iterations"
-msgstr[0] "'medpolish()' nie zbiegł się w %d iteracji"
-msgstr[1] "'medpolish()' nie zbiegł się w %d iteracjach"
-msgstr[2] "'medpolish()' nie zbiegł się w %d iteracjach"
-
+#. R/lsfit.R: ngettext(sum(!good), "%d missing value deleted", "%d missing values deleted")
+#: R/lsfit.R:0
 msgid "%d missing value deleted"
 msgid_plural "%d missing values deleted"
 msgstr[0] "%d brakująca wartość została skasowana"
 msgstr[1] "%d brakujące wartości zostały skasowane"
 msgstr[2] "%d brakujących wartości zostało skasowanych"
 
+#. R/nafns.R: ngettext(n <- length(x), "%d observation deleted due to missingness",     "%d observations deleted due to missingness")
+#: R/nafns.R:0
+msgid "%d observation deleted due to missingness"
+msgid_plural "%d observations deleted due to missingness"
+msgstr[0] "%d obserwacja została skasowana z uwagi na braki w niej zawarte"
+msgstr[1] "%d obserwacje zostały skasowane z uwagi na braki w nich zawarte"
+msgstr[2] "%d obserwacji zostało skasowanych z uwagi na braki w nich zawarte"
+
+#. R/smspline.R: ngettext(diff, "%d observation with NA, NaN or Inf deleted",     "%d observations with NAs, NaNs and/or Infs deleted")
+#: R/smspline.R:0
+msgid "%d observation with NA, NaN or Inf deleted"
+msgid_plural "%d observations with NAs, NaNs and/or Infs deleted"
+msgstr[0] "%d obserwacji z wartością NA, NaN lub Inf została skasowana"
+msgstr[1] "%d obserwacje z wartościami NA, NaN oraz/lub Inf zostały skasowane"
+msgstr[2] ""
+"%d obserwacji z wartościami NA, NaN oraz/lub Inf zostało skasowanych"
+
+#. R/lsfit.R: ngettext(nrx, "'X' matrix has %d case (row)", "'X' matrix has %d cases (rows)")
+#: R/lsfit.R:0
 msgid "'X' matrix has %d case (row)"
 msgid_plural "'X' matrix has %d cases (rows)"
 msgstr[0] "macierz 'X' ma %d przypadek (wiersz)"
 msgstr[1] "macierz 'X' ma %d przypadki (wiersze)"
 msgstr[2] "macierz 'X' ma %d przypadków (wierszy)"
 
+#. R/lsfit.R: ngettext(nry, "'Y' has %d case (row)", "'Y' has %d cases (rows)")
+#: R/lsfit.R:0
 msgid "'Y' has %d case (row)"
 msgid_plural "'Y' has %d cases (rows)"
 msgstr[0] "'Y' ma %d przypadek (wiersz)"
 msgstr[1] "'Y' ma %d przypadki (wiersze)"
 msgstr[2] "'Y' ma %d przypadków (wierszy)"
 
-msgid "only %d case"
-msgid_plural "only %d cases"
-msgstr[0] "tylko %d przypadek"
-msgstr[1] "tylko %d przypadki"
-msgstr[2] "tylko %d przypadków"
-
-msgid "but %d variable"
-msgid_plural "but %d variables"
-msgstr[0] "ale %d zmienna"
-msgstr[1] "ale %d zmienne"
-msgstr[2] "ale %d zmiennych"
-
-msgid "medpolish() did not converge in %d iteration"
-msgid_plural "medpolish() did not converge in %d iterations"
-msgstr[0] "'medpolish()' nie zbiegł się w %d iteracji"
-msgstr[1] "'medpolish()' nie zbiegł się w %d iteracjach"
-msgstr[2] "'medpolish()' nie zbiegł się w %d iteracjach"
+#. R/filter.R: ngettext(nser, "'init' must have %d column", "'init' must have 1 or %d columns",     domain = "R-stats")
+#: R/filter.R:0
+msgid "'init' must have %d column"
+msgid_plural "'init' must have 1 or %d columns"
+msgstr[0] "'init' musi mieć %d kolumnę"
+msgstr[1] "'init' musi mieć 1 lub %d kolumny"
+msgstr[2] "'init' musi mieć 1 lub %d kolumn"
 
+#. R/models.R: ngettext(nr, "'newdata' had %d row", "'newdata' had %d rows")
+#: R/models.R:0
 msgid "'newdata' had %d row"
 msgid_plural "'newdata' had %d rows"
 msgstr[0] "'newdata' miała %d wiersz"
 msgstr[1] "'newdata' miała %d wiersze"
 msgstr[2] "'newdata' miała %d wierszy"
 
+#. R/factanal.R: ngettext(p, "'start' must have %d row", "'start' must have %d rows")
+#: R/factanal.R:0
+msgid "'start' must have %d row"
+msgid_plural "'start' must have %d rows"
+msgstr[0] "'start' musi mieć %d wiersz"
+msgstr[1] "'start' musi mieć %d wiersze"
+msgstr[2] "'start' musi mieć %d wierszy"
+
+#. R/ts.R: ngettext(n.start, "'start.innov' is too short: need %d point",     "'start.innov' is too short: need %d points")
+#: R/ts.R:0
+msgid "'start.innov' is too short: need %d point"
+msgid_plural "'start.innov' is too short: need %d points"
+msgstr[0] "argument 'start.innov' jest zbyt krótki: potrzeba %d punktu"
+msgstr[1] "argument 'start.innov' jest zbyt krótki: potrzeba %d punktów"
+msgstr[2] "argument 'start.innov' jest zbyt krótki: potrzeba %d punktów"
+
+#. R/glm.R: ngettext(nobs, "X matrix has rank %d, but only %d observation",     "X matrix has rank %d, but only %d observations")
+#: R/glm.R:0
+msgid "X matrix has rank %d, but only %d observation"
+msgid_plural "X matrix has rank %d, but only %d observations"
+msgstr[0] "macierz 'X' ma rangÄ™ %d, ale tylko %d obserwacjÄ™"
+msgstr[1] "macierz 'X' ma rangÄ™ %d, ale tylko %d obserwacje"
+msgstr[2] "macierz 'X' ma rangÄ™ %d, ale tylko %d obserwacji"
+
+#. R/nlm.R: ngettext(maxiter, "_NOT_ converged in %d iteration", "_NOT_ converged in %d iterations")
+#: R/nlm.R:0
+msgid "_NOT_ converged in %d iteration"
+msgid_plural "_NOT_ converged in %d iterations"
+msgstr[0] "metoda 'uniroot()' nie zbiegła się w %d iteracji"
+msgstr[1] "metoda 'uniroot()' nie zbiegła się w %d iteracjach"
+msgstr[2] "metoda 'uniroot()' nie zbiegła się w %d iteracjach"
+
+#. R/lsfit.R: ngettext(ncx, "but %d variable", "but %d variables")
+#: R/lsfit.R:0
+msgid "but %d variable"
+msgid_plural "but %d variables"
+msgstr[0] "ale %d zmienna"
+msgstr[1] "ale %d zmienne"
+msgstr[2] "ale %d zmiennych"
+
+#. R/models.R: ngettext(nr2, "but variable found had %d row", "but variables found have %d rows")
+#: R/models.R:0
 msgid "but variable found had %d row"
 msgid_plural "but variables found have %d rows"
 msgstr[0] "ale znaleziona zmienna ma %d wiersz"
 msgstr[1] "ale znalezione zmienne majÄ… %d wiersze"
 msgstr[2] "ale znalezione zmienne majÄ… %d wierszy"
 
+#. R/kmeans.R: ngettext(iter.max, "did not converge in %d iteration", "did not converge in %d iterations")
+#: R/kmeans.R:0
+msgid "did not converge in %d iteration"
+msgid_plural "did not converge in %d iterations"
+msgstr[0] "'medpolish()' nie zbiegł się w %d iteracji"
+msgstr[1] "'medpolish()' nie zbiegł się w %d iteracjach"
+msgstr[2] "'medpolish()' nie zbiegł się w %d iteracjach"
+
+#. R/dendrogram.R: ngettext(length(nms), "extra argument %s is not of class \"%s\"",     "extra arguments %s are not of class \"%s\"s")
+#: R/dendrogram.R:0
+msgid "extra argument %s is not of class \"%s\""
+msgid_plural "extra arguments %s are not of class \"%s\"s"
+msgstr[0] "dodatkowy argument %s nie jest obiektem klasy \"%s\""
+msgstr[1] "dodatkowe argumenty %s nie sÄ… obiektami klasy \"%s\""
+msgstr[2] "dodatkowe argumenty %s nie sÄ… obiektami klasy \"%s\""
+
+#. R/models.R: ngettext(length(m), "factor %s has new level %s", "factor %s has new levels %s")
+#: R/models.R:0
 msgid "factor %s has new level %s"
 msgid_plural "factor %s has new levels %s"
 msgstr[0] "czynnik %s ma nowy poziom %s"
 msgstr[1] "czynnik %s ma nowe poziomy %s"
 msgstr[2] "czynnik %s ma nowe poziomy %s"
 
-msgid "%d observation deleted due to missingness"
-msgid_plural "%d observations deleted due to missingness"
-msgstr[0] "%d obserwacja została skasowana z uwagi na braki w niej zawarte"
-msgstr[1] "%d obserwacje zostały skasowane z uwagi na braki w nich zawarte"
-msgstr[2] "%d obserwacji zostało skasowanych z uwagi na braki w nich zawarte"
-
-msgid "_NOT_ converged in %d iteration"
-msgid_plural "_NOT_ converged in %d iterations"
-msgstr[0] "metoda 'uniroot()' nie zbiegła się w %d iteracji"
-msgstr[1] "metoda 'uniroot()' nie zbiegła się w %d iteracjach"
-msgstr[2] "metoda 'uniroot()' nie zbiegła się w %d iteracjach"
-
-msgid "unrecognized control element named %s ignored"
-msgid_plural "unrecognized control elements named %s ignored"
-msgstr[0] "nierozpoznany element kontrolny o nazwie %s został zignorowany"
-msgstr[1] "nierozpoznane elementy kontrolne o nazwach %s zostały zignorowane"
-msgstr[2] "nierozpoznane elementy kontrolne o nazwach %s zostały zignorowane"
-
+#. R/nls.R: ngettext(sum(np == -1), "fitting parameter %s without any variables",     "fitting parameters %s without any variables")
+#: R/nls.R:0
 msgid "fitting parameter %s without any variables"
 msgid_plural "fitting parameters %s without any variables"
 msgstr[0] "parametr dopasowania %s bez jakichkolwiek zmiennych"
 msgstr[1] "parametry dopasowania %s bez jakichkolwiek zmiennych"
 msgstr[2] "parametry dopasowania %s bez jakichkolwiek zmiennych"
 
+#. R/add.R: ngettext(sum(where == 0), "lower scope has term %s not included in model",     "lower scope has terms %s not included in model")
+#: R/add.R:0
+msgid "lower scope has term %s not included in model"
+msgid_plural "lower scope has terms %s not included in model"
+msgstr[0] ""
+"niższy zakres posiada człon %s, które nie jest uwzględniony w modelu"
+msgstr[1] "niższy zakres posiada człony %s, które nie są uwzględnione w modelu"
+msgstr[2] "niższy zakres posiada człony %s, które nie są uwzględnione w modelu"
+
+#. R/medpolish.R: ngettext(maxiter, "medpolish() did not converge in %d iteration",     "medpolish() did not converge in %d iterations")
+#: R/medpolish.R:0
+msgid "medpolish() did not converge in %d iteration"
+msgid_plural "medpolish() did not converge in %d iterations"
+msgstr[0] "'medpolish()' nie zbiegł się w %d iteracji"
+msgstr[1] "'medpolish()' nie zbiegł się w %d iteracjach"
+msgstr[2] "'medpolish()' nie zbiegł się w %d iteracjach"
+
+#. R/lsfit.R: ngettext(nry, "only %d case", "only %d cases")
+#: R/lsfit.R:0
+msgid "only %d case"
+msgid_plural "only %d cases"
+msgstr[0] "tylko %d przypadek"
+msgstr[1] "tylko %d przypadki"
+msgstr[2] "tylko %d przypadków"
+
+#. R/selfStart.R: ngettext(sum(msng), "parameter %s does not occur in the model formula",     "parameters %s do not occur in the model formula")
+#: R/selfStart.R:0
 msgid "parameter %s does not occur in the model formula"
 msgid_plural "parameters %s do not occur in the model formula"
 msgstr[0] "parametr %s nie pojawia siÄ™ w formule modelu"
 msgstr[1] "parametry %s nie pojawiajÄ… siÄ™ w formule modelu"
 msgstr[2] "parametry %s nie pojawiajÄ… siÄ™ w formule modelu"
 
-msgid "%d observation with NA, NaN or Inf deleted"
-msgid_plural "%d observations with NAs, NaNs and/or Infs deleted"
-msgstr[0] "%d obserwacji z wartością NA, NaN lub Inf została skasowana"
-msgstr[1] "%d obserwacje z wartościami NA, NaN oraz/lub Inf zostały skasowane"
-msgstr[2] ""
-"%d obserwacji z wartościami NA, NaN oraz/lub Inf zostało skasowanych"
+#. R/aov.R: ngettext(length(indError), "there are %d Error terms: only 1 is allowed",     "there are %d Error terms: only 1 is allowed")
+#: R/aov.R:0
+msgid "there are %d Error terms: only 1 is allowed"
+msgid_plural "there are %d Error terms: only 1 is allowed"
+msgstr[0] "jest %d człon błędu: tylko 1 jest dozwolony"
+msgstr[1] "są %d człony błędu: tylko 1 jest dozwolony"
+msgstr[2] "jest %d członów błędu: tylko 1 jest dozwolony"
 
-msgid "'start.innov' is too short: need %d point"
-msgid_plural "'start.innov' is too short: need %d points"
-msgstr[0] "argument 'start.innov' jest zbyt krótki: potrzeba %d punktu"
-msgstr[1] "argument 'start.innov' jest zbyt krótki: potrzeba %d punktów"
-msgstr[2] "argument 'start.innov' jest zbyt krótki: potrzeba %d punktów"
+#. R/factanal.R: ngettext(nc, "unable to optimize from this starting value", "unable to optimize from these starting values")
+#: R/factanal.R:0
+msgid "unable to optimize from this starting value"
+msgid_plural "unable to optimize from these starting values"
+msgstr[0] "nie można zoptymalizować z tej wartości startowej"
+msgstr[1] "nie można zoptymalizować z tych wartości startowych"
+msgstr[2] "nie można zoptymalizować z tych wartości startowych"
+
+#. R/aov.R: ngettext(na, "unknown name %s in the 'split' list", "unknown names %s in the 'split' list")
+#: R/aov.R:0
+msgid "unknown name %s in the 'split' list"
+msgid_plural "unknown names %s in the 'split' list"
+msgstr[0] "nieznana nazwa %s w liście 'split'"
+msgstr[1] "nieznane nazwy %s w liście 'split'"
+msgstr[2] "nieznane nazwy %s w liście 'split'"
+
+#. R/nlminb.R: ngettext(length(nap), "unrecognized control element named %s ignored",     "unrecognized control elements named %s ignored")
+#. R/nls.R: ngettext(length(nap), "unrecognized control element named %s ignored",     "unrecognized control elements named %s ignored")
+#: R/nlminb.R:0 R/nls.R:0
+msgid "unrecognized control element named %s ignored"
+msgid_plural "unrecognized control elements named %s ignored"
+msgstr[0] "nierozpoznany element kontrolny o nazwie %s został zignorowany"
+msgstr[1] "nierozpoznane elementy kontrolne o nazwach %s zostały zignorowane"
+msgstr[2] "nierozpoznane elementy kontrolne o nazwach %s zostały zignorowane"
+
+#. R/add.R: ngettext(sum(where == 0), "upper scope has term %s not included in model",     "upper scope has terms %s not included in model")
+#: R/add.R:0
+msgid "upper scope has term %s not included in model"
+msgid_plural "upper scope has terms %s not included in model"
+msgstr[0] "górny zakres posiada człon %s, które nie jest uwzględniony w modelu"
+msgstr[1] "górny zakres posiada człony %s, które nie są uwzględnione w modelu"
+msgstr[2] "górny zakres posiada człony %s, które nie są uwzględnione w modelu"
+
+#. R/add.R: ngettext(newn, "using the %d/%d row from a combined fit", "using the %d/%d rows from a combined fit")
+#. R/add.R: ngettext(newn, "using the %d/%d row from a combined fit", "using the %d/%d rows from a combined fit")
+#: R/add.R:0
+msgid "using the %d/%d row from a combined fit"
+msgid_plural "using the %d/%d rows from a combined fit"
+msgstr[0] "używanie %d/%d wiersza z połączonego dopasowania"
+msgstr[1] "używanie %d/%d wierszy z połączonego dopasowania"
+msgstr[2] "używanie %d/%d wierszy z połączonego dopasowania"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "iterTrace ="
+#~ msgstr "iterTrace ="
+
+#~ msgid "a limit is missing"
+#~ msgstr "brakuje co najmniej jednej granicy całkowania"
+
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "dalsze niedopasowane argumenty zostały odrzucone"
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "dodatkowy argument %s został odrzucony"
+#~ msgstr[1] "dodatkowe argumenty %s zostały odrzucone"
+#~ msgstr[2] "dodatkowe argumenty %s zostały odrzucone"
diff -Nru r-base-3.2.3/src/library/stats/po/R-pt_BR.po r-base-3.3.1/src/library/stats/po/R-pt_BR.po
--- r-base-3.2.3/src/library/stats/po/R-pt_BR.po	2015-03-18 23:03:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-pt_BR.po	2016-04-27 22:15:21.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:57-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -484,6 +484,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr "valores NA não permitidos em 'd'"
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr "distâncias deve ser resultado de \"dist\", ou de uma matriz quadrada"
 
@@ -497,6 +503,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr "somente %d do primeiro %d autovalor são > 0"
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr "valor inicial não está na região viável"
 
@@ -541,6 +550,10 @@
 msgid "arguments must have the same length"
 msgstr "argumentos devem ter o mesmo comprimento"
 
+#, fuzzy
+msgid "wrong number of columns in new data:"
+msgstr "número errado de linhas na matriz de contraste"
+
 msgid "contrasts apply only to factors"
 msgstr "contrastes aplicam-se apenas a fatores"
 
@@ -707,9 +720,6 @@
 "nrow(x)'RowSideColors'  deve ser um vetor de caracteres de comprimento "
 "nrow(x)"
 
-msgid "non-matched further arguments are disregarded"
-msgstr "outros argumentos não-pareados são ignorados"
-
 msgid "argument 'x' must be numeric"
 msgstr "argumento 'x ' deve ser numérico"
 
@@ -801,6 +811,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr "alguns termos terão NAs devido aos limites do método"
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr "'x' deve ter um ou mais valores  ausentes"
 
@@ -932,7 +945,9 @@
 msgstr "somente valores positivos permitidos para a família inverse.gaussian"
 
 #, fuzzy
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr "É preciso o pacote CRAN 'SuppDists' para a família 'inverse.gaussian'"
 
 msgid "using weights as inverse variances"
@@ -1219,8 +1234,8 @@
 msgid "invalid parameter values"
 msgstr "valores de parâmetros são inválidos"
 
-msgid "a limit is missing"
-msgstr "está faltando um limite"
+msgid "a limit is NA or NaN"
+msgstr ""
 
 msgid "missing values not allowed"
 msgstr "valores que faltam não são permitidos"
@@ -1445,6 +1460,10 @@
 msgid "only 1-4 predictors are allowed"
 msgstr "somente 1-4 prognosticadores são permitidos"
 
+#, fuzzy
+msgid "invalid NROW(X)"
+msgstr "'x' inválido"
+
 msgid "invalid 'y'"
 msgstr "'y' inválido"
 
@@ -1476,6 +1495,13 @@
 msgid "invalid argument 'degree'"
 msgstr "argumento 'omit' inválido"
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr "não convergiu em %d iterações"
+
 msgid "first argument must be a \"loess\" object"
 msgstr "primeiro argumento deve ser um objeto \"loess\""
 
@@ -2014,7 +2040,7 @@
 msgid "'varying' arguments must be the same length"
 msgstr ""
 
-msgid "'times' is wrong length"
+msgid "'lengths(varying)' must all match 'length(times)'"
 msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
@@ -2497,12 +2523,6 @@
 msgstr[1] "argumentos extras descartados"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "argumentos extras descartados"
-msgstr[1] "argumentos extras descartados"
-
-#, fuzzy
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "existem %d fatores, isto é demais para as %d variáveis"
@@ -2633,6 +2653,18 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "a limit is missing"
+#~ msgstr "está faltando um limite"
+
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "outros argumentos não-pareados são ignorados"
+
+#, fuzzy
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "argumentos extras descartados"
+#~ msgstr[1] "argumentos extras descartados"
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge' e 'height' não se encaixam!"
 
diff -Nru r-base-3.2.3/src/library/stats/po/R-ru.po r-base-3.3.1/src/library/stats/po/R-ru.po
--- r-base-3.2.3/src/library/stats/po/R-ru.po	2015-03-28 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-ru.po	2016-04-27 22:15:22.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
-"PO-Revision-Date: 2015-03-26 19:18-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -664,9 +664,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr "'RowSideColors' ÄÏÌÖÅÎ ÂÙÔØ ÔÅËÓÔÏ×ÙÍ ×ÅËÔÏÒÏÍ Ó ÄÌÉÎÏÊ = nrow(x)"
 
-msgid "non-matched further arguments are disregarded"
-msgstr "ÄÁÌØÎÅÊÛÉÅ ÎÅÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
-
 msgid "argument 'x' must be numeric"
 msgstr "ÁÒÇÕÍÅÎÔ 'x' ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ"
 
@@ -2319,12 +2316,6 @@
 msgstr[1] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÎÅ ËÌÁÓÓÁ \"%s\"s"
 msgstr[2] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÎÅ ËÌÁÓÓÁ \"%s\"s"
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ %s ÂÕÄÅÔ ÏÔÂÒÏÛÅÎ"
-msgstr[1] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
-msgstr[2] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%d ÆÁËÔÏÒ -- ÜÔÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÄÌÑ %d ÐÅÒÅÍÅÎÎÙÈ"
@@ -2457,6 +2448,13 @@
 msgstr[1] "'start.innov' ÓÌÉÛËÏÍ ËÏÒÏÔËÉÊ: ÎÕÖÎÏ %d ÔÏÞËÉ"
 msgstr[2] "'start.innov' ÓÌÉÛËÏÍ ËÏÒÏÔËÉÊ: ÎÕÖÎÏ %d ÔÏÞÅË"
 
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "ÄÁÌØÎÅÊÛÉÅ ÎÅÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ %s ÂÕÄÅÔ ÏÔÂÒÏÛÅÎ"
+#~ msgstr[1] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
+#~ msgstr[2] "ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ %s ÂÕÄÕÔ ÏÔÂÒÏÛÅÎÙ"
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge' É 'height' ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ!"
 #~ msgid "invalid dendrogram"
diff -Nru r-base-3.2.3/src/library/stats/po/R-stats.pot r-base-3.3.1/src/library/stats/po/R-stats.pot
--- r-base-3.2.3/src/library/stats/po/R-stats.pot	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-stats.pot	2016-04-27 22:15:21.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: stats 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -452,6 +451,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr ""
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr ""
 
@@ -464,6 +469,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr ""
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr ""
 
@@ -503,6 +511,9 @@
 msgid "arguments must have the same length"
 msgstr ""
 
+msgid "wrong number of columns in new data:"
+msgstr ""
+
 msgid "contrasts apply only to factors"
 msgstr ""
 
@@ -650,9 +661,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr ""
 
-msgid "non-matched further arguments are disregarded"
-msgstr ""
-
 msgid "argument 'x' must be numeric"
 msgstr ""
 
@@ -740,6 +748,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr ""
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr ""
 
@@ -836,7 +847,7 @@
 msgid "positive values only are allowed for the 'inverse.gaussian' family"
 msgstr ""
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+msgid "need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' family"
 msgstr ""
 
 msgid "using weights as inverse variances"
@@ -1103,7 +1114,7 @@
 msgid "invalid parameter values"
 msgstr ""
 
-msgid "a limit is missing"
+msgid "a limit is NA or NaN"
 msgstr ""
 
 msgid "missing values not allowed"
@@ -1304,6 +1315,9 @@
 msgid "only 1-4 predictors are allowed"
 msgstr ""
 
+msgid "invalid NROW(X)"
+msgstr ""
+
 msgid "invalid 'y'"
 msgstr ""
 
@@ -1325,6 +1339,12 @@
 msgid "invalid argument 'degree'"
 msgstr ""
 
+msgid "iterTrace ="
+msgstr ""
+
+msgid "not obeyed as iterations ="
+msgstr ""
+
 msgid "first argument must be a \"loess\" object"
 msgstr ""
 
@@ -1811,7 +1831,7 @@
 msgid "'varying' arguments must be the same length"
 msgstr ""
 
-msgid "'times' is wrong length"
+msgid "'lengths(varying)' must all match 'length(times)'"
 msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
@@ -2267,11 +2287,6 @@
 msgstr[0]    ""
 msgstr[1]    ""
 
-msgid        "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0]    ""
-msgstr[1]    ""
-
 msgid        "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0]    ""
diff -Nru r-base-3.2.3/src/library/stats/po/R-tr.po r-base-3.3.1/src/library/stats/po/R-tr.po
--- r-base-3.2.3/src/library/stats/po/R-tr.po	2015-03-18 23:03:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-tr.po	2016-04-27 22:15:22.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-04-02 \n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -474,6 +474,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr "'d' içinde NA değerlerine izin verilmiyor"
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr ""
 
@@ -487,6 +493,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr ""
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr ""
 
@@ -528,6 +537,10 @@
 msgid "arguments must have the same length"
 msgstr ""
 
+#, fuzzy
+msgid "wrong number of columns in new data:"
+msgstr "'x'de hatalı sütun sayısı"
+
 msgid "contrasts apply only to factors"
 msgstr ""
 
@@ -681,9 +694,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr ""
 
-msgid "non-matched further arguments are disregarded"
-msgstr ""
-
 msgid "argument 'x' must be numeric"
 msgstr "'x' argümanı nümerik olmalı"
 
@@ -774,6 +784,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr "metodun sınırları nedeniyle bazı terimler NA ya sahip olacak"
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr "'x' 1 veya daha fazla eksik-olmayan değere sahip olmalı"
 
@@ -891,7 +904,9 @@
 msgstr "pozitif değerlere sadece ters gauss ailesi için izin verilir"
 
 #, fuzzy
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr "'inverse.gaussian' ailesi için CRAN paketi 'SuppDists' gerekli"
 
 msgid "using weights as inverse variances"
@@ -1173,8 +1188,8 @@
 msgid "invalid parameter values"
 msgstr "geçersiz parametre değerleri"
 
-msgid "a limit is missing"
-msgstr "a sınırı eksik"
+msgid "a limit is NA or NaN"
+msgstr ""
 
 msgid "missing values not allowed"
 msgstr "eksik deÄŸerlere izin verilmiyor"
@@ -1386,6 +1401,10 @@
 msgid "only 1-4 predictors are allowed"
 msgstr ""
 
+#, fuzzy
+msgid "invalid NROW(X)"
+msgstr "geçersiz 'x'"
+
 msgid "invalid 'y'"
 msgstr "geçersiz 'y'"
 
@@ -1413,6 +1432,13 @@
 msgid "invalid argument 'degree'"
 msgstr "geçersiz argüman 'r'"
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr "sonlu gözlem yok"
+
 msgid "first argument must be a \"loess\" object"
 msgstr ""
 
@@ -1929,8 +1955,8 @@
 msgid "'varying' arguments must be the same length"
 msgstr ""
 
-msgid "'times' is wrong length"
-msgstr "'times' yanlış uzunluk"
+msgid "'lengths(varying)' must all match 'length(times)'"
+msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
 msgstr ""
@@ -2412,12 +2438,6 @@
 msgstr[1] "ekstra argümanlar çıkarıldı"
 
 #, fuzzy
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "ekstra argümanlar çıkarıldı"
-msgstr[1] "ekstra argümanlar çıkarıldı"
-
-#, fuzzy
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%d faktör %d değişken için çok fazla"
@@ -2545,6 +2565,18 @@
 msgstr[0] "'start.innov' çok kısa: %d nokta gerekli"
 msgstr[1] "'start.innov' çok kısa: %d nokta gerekli"
 
+#~ msgid "a limit is missing"
+#~ msgstr "a sınırı eksik"
+
+#~ msgid "'times' is wrong length"
+#~ msgstr "'times' yanlış uzunluk"
+
+#, fuzzy
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "ekstra argümanlar çıkarıldı"
+#~ msgstr[1] "ekstra argümanlar çıkarıldı"
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge' ve 'height' uymuyor!"
 
diff -Nru r-base-3.2.3/src/library/stats/po/ru.po r-base-3.3.1/src/library/stats/po/ru.po
--- r-base-3.2.3/src/library/stats/po/ru.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/ru.po	2016-04-27 22:15:22.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 19:21-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:09-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -19,8 +19,7 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: Srunmed.c:55
 msgid "bandwidth/span of running medians is larger than n"
@@ -42,11 +41,17 @@
 msgid "approx(): attempted to interpolate NA values"
 msgstr "approx(): ÐÏÐÙÔËÁ ÉÎÔÅÒÐÏÌÉÒÏ×ÁÔØ ÐÒÏÐÕÝÅÎÎÙÅ ÚÎÁÞÅÎÉÑ"
 
-#: arima.c:81 arima.c:192 arima.c:377 arima.c:608
+#: arima.c:81
+#: arima.c:192
+#: arima.c:377
+#: arima.c:608
 msgid "invalid argument type"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ ÁÒÇÕÍÅÎÔÁ"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444
+#: arima.c:530
+#: pacf.c:327
+#: pacf.c:366
 msgid "can only transform 100 pars in arima0"
 msgstr "ÍÏÇÕ ÔÒÁÎÓÆÏÒÍÉÒÏ×ÁÔØ ÔÏÌØËÏ 100 ÐÁÒ × arima0"
 
@@ -80,11 +85,14 @@
 msgid "'x' is NULL"
 msgstr "'x' -- ÜÔÏ NULL"
 
-#: cov.c:663 cov.c:669
+#: cov.c:663
+#: cov.c:669
 msgid "incompatible dimensions"
 msgstr "ÎÅÓÏ×ÍÅÓÔÉÍÙÅ ÒÁÚÍÅÒÎÏÓÔÉ"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:688
+#: cov.c:729
+#: cov.c:762
 msgid "no complete element pairs"
 msgstr "ÎÅÔ ÐÏÌÎÙÈ ÐÁÒ ÜÌÅÍÅÎÔÏ×"
 
@@ -109,24 +117,29 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "æÕÎËÃÉÑ '%s' ÏÔÓÕÔÓÔ×ÕÅÔ × ÔÁÂÌÉÃÅ ÐÒÏÉÚ×ÏÄÎÙÈ"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr "'expr' ÄÏÌÖÎÏ ÂÙÔØ ×ÙÒÁÖÅÎÉÅÍ ÉÌÉ ×ÙÚÏ×ÏÍ"
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "ÐÅÒÅÍÅÎÎÁÑ ÄÏÌÖÎÁ ÂÙÔØ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "ÔÏÌØËÏ ÐÅÒ×ÙÊ ÜÌÅÍÅÎÔ ÉÓÐÏÌØÚÏ×ÁÎ ËÁË ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ×ÙÒÁÖÅÎÉÅ × '%s'"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937
+#: model.c:99
 msgid "invalid variable names"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÅ ÉÍÅÎÁ ÐÅÒÅÍÅÎÎÙÈ"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÅÇ"
 
@@ -155,21 +168,27 @@
 msgid "Value %g out of range (0, 1)"
 msgstr "úÎÁÞÅÎÉÅ %g ×ÎÅ ÐÒÏÍÅÖÕÔËÁ (0, 1)"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:65
+#: family.c:79
+#: family.c:97
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "áÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÎÅÐÕÓÔÙÍ ÞÉÓÌÏ×ÙÍ ×ÅËÔÏÒÏÍ"
 
-#: family.c:130 family.c:133
+#: family.c:130
+#: family.c:133
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ ×ÅËÔÏÒÏÍ ÄÌÉÎÙ 1 ÉÌÉ %d"
 
-#: fourier.c:66 fourier.c:161
+#: fourier.c:66
+#: fourier.c:161
 msgid "non-numeric argument"
 msgstr "ÎÅÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ"
 
-#: fourier.c:84 fourier.c:102 fourier.c:175
+#: fourier.c:84
+#: fourier.c:102
+#: fourier.c:175
 msgid "fft factorization error"
 msgstr "ÏÛÉÂËÁ ÆÁËÔÏÒÉÚÁÃÉÉ × fft"
 
@@ -198,7 +217,8 @@
 msgid "dimensions of 'x' (%d,%d) and 'y' (%d) do not match"
 msgstr "ÉÚÍÅÒÅÎÉÑ 'x' (%d,%d) É 'y' (%d) ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÄÒÕÇ ÄÒÕÇÕ"
 
-#: lm.c:77 lm.c:81
+#: lm.c:77
+#: lm.c:81
 #, c-format
 msgid "NA/NaN/Inf in '%s'"
 msgstr "NA/NaN/Inf × '%s'"
@@ -251,7 +271,8 @@
 msgid "invalid variables"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÅ ÐÅÒÅÍÅÎÎÙÅ"
 
-#: model.c:101 model.c:106
+#: model.c:101
+#: model.c:106
 msgid "number of variables != number of variable names"
 msgstr "ËÏÌÉÞÅÓÔ×Ï ÐÅÒÅÍÅÎÎÙÈ != ËÏÌÉÞÅÓÔ×Õ ÉÍÅÎ ÐÅÒÅÍÅÎÎÙÈ"
 
@@ -282,7 +303,9 @@
 msgid "invalid result from na.action"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÒÅÚÕÌØÔÁÔ 'na.action'"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:369
+#: model.c:377
+#: optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ '%s'"
@@ -300,7 +323,8 @@
 msgid "variable lengths differ (found for variable %d)"
 msgstr "ÄÌÉÎÙ ÐÅÒÅÍÅÎÎÙÈ ÒÁÚÌÉÞÁÀÔÓÑ (ÎÁÊÄÅÎÏ ÄÌÑ ÐÅÒÅÍÅÎÎÏÊ %d)"
 
-#: model.c:418 model.c:425
+#: model.c:418
+#: model.c:425
 #, c-format
 msgid "variable %d has no levels"
 msgstr "Õ ÐÅÒÅÍÅÎÎÏÊ %d ÎÅÔ ÕÒÏ×ÎÅÊ"
@@ -324,7 +348,12 @@
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr "ÐÒÏÂÌÅÍÁ Ó ÔÅÒÍÏÍ %d × 'model.matrix': ÎÅ ÐÒÉÓ×ÏÅÎÙ ËÏÌÏÎËÉ"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:621
+#: model.c:626
+#: model.c:632
+#: model.c:643
+#: model.c:649
+#: model.c:655
 msgid "term names will be truncated"
 msgstr "ÉÍÅÎÁ ÔÅÒÍÏ× ÂÕÄÕÔ ÕËÏÒÏÞÅÎÙ"
 
@@ -353,7 +382,8 @@
 msgid "invalid model formula"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÍÏÄÅÌØÎÁÑ ÆÏÒÍÕÌÁ"
 
-#: model.c:1147 model.c:1395
+#: model.c:1147
+#: model.c:1395
 msgid "invalid power in formula"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÓÔÅÐÅÎØ × ÆÏÒÍÕÌÅ"
 
@@ -410,8 +440,17 @@
 msgid "'m' must be a list"
 msgstr "'m' ÄÏÌÖÅÎ ÂÙÔØ ÓÐÉÓËÏÍ"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:105
+#: nls.c:110
+#: nls.c:115
+#: nls.c:120
+#: nls.c:125
+#: nls.c:166
+#: nls.c:171
+#: nls.c:176
+#: nls.c:181
+#: nls.c:186
+#: nls.c:191
 #, c-format
 msgid "'%s' absent"
 msgstr "'%s' ÏÔÓÕÔÓÔ×ÕÅÔ"
@@ -438,7 +477,8 @@
 msgid "'theta' should be of type character"
 msgstr "'theta' ÄÏÌÖÎÁ ÂÙÔØ ÔÅËÓÔÏ×ÏÇÏ ÔÉÐÁ"
 
-#: nls.c:290 port.c:376
+#: nls.c:290
+#: port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏËÒÕÖÅÎÉÑ NULL ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÅÔ"
 
@@ -450,10 +490,10 @@
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir' ÎÅ Ñ×ÌÑÅÔÓÑ ÞÉÓÌÏ×ÙÍ ×ÅËÔÏÒÏÍ ×ÅËÔÏÒ ÐÒÁ×ÉÌØÎÏÊ ÄÌÉÎÙ ÄÌÉÎÁ"
 
-#: nls.c:311 nls.c:345
+#: nls.c:311
+#: nls.c:345
 msgid "Missing value or an infinity produced when evaluating the model"
-msgstr ""
-"ðÒÏÐÕÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÉÌÉ ÎÅÏÐÒÅÄÅÌÅÎÎÏÓÔØ ÐÏÌÕÞÅÎÏ ÐÒÉ ×ÙÞÉÓÌÅÎÉÉ ÍÏÄÅÌÉ"
+msgstr "ðÒÏÐÕÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÉÌÉ ÎÅÏÐÒÅÄÅÌÅÎÎÏÓÔØ ÐÏÌÕÞÅÎÏ ÐÒÉ ×ÙÞÉÓÌÅÎÉÉ ÍÏÄÅÌÉ"
 
 #: nls.c:319
 #, c-format
@@ -465,7 +505,8 @@
 msgid "variable '%s' is not numeric"
 msgstr "ÐÅÒÅÍÅÎÎÁÑ '%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÞÉÓÌÏ×ÏÊ"
 
-#: optim.c:80 optim.c:107
+#: optim.c:80
+#: optim.c:107
 msgid "non-finite value supplied by optim"
 msgstr "ÂÅÓËÏÎÅÞÎÏÅ ÚÎÁÞÅÎÉÅ ÐÅÒÅÄÁÎÏ ÉÚ 'optim'"
 
@@ -479,11 +520,13 @@
 msgid "gradient in optim evaluated to length %d not %d"
 msgstr "ÐÏÌÕÞÅÎÎÁÑ ÄÌÉÎÁ ÇÒÁÄÉÅÎÔÁ × 'optim' -- %d, Á ÎÅ %d"
 
-#: optim.c:193 optim.c:399
+#: optim.c:193
+#: optim.c:399
 msgid "'fn' is not a function"
 msgstr "'fn' ÎÅ Ñ×ÌÑÅÔÓÑ ÆÕÎËÃÉÅÊ"
 
-#: optim.c:211 optim.c:405
+#: optim.c:211
+#: optim.c:405
 msgid "'parscale' is of the wrong length"
 msgstr "'parscale' ÎÅÐÒÁ×ÉÌØÎÏÊ ÄÌÉÎÙ"
 
@@ -495,11 +538,18 @@
 msgid "'tmax' is not a positive integer"
 msgstr "'tmax' ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
-#: optim.c:262 optim.c:279 optim.c:304 optim.c:334 optim.c:413
+#: optim.c:262
+#: optim.c:279
+#: optim.c:304
+#: optim.c:334
+#: optim.c:413
 msgid "'gr' is not a function"
 msgstr "'gr' ÎÅ Ñ×ÌÑÅÔÓÑ ÆÕÎËÃÉÅÊ"
 
-#: optim.c:285 optim.c:310 optim.c:340 optim.c:419
+#: optim.c:285
+#: optim.c:310
+#: optim.c:340
+#: optim.c:419
 msgid "'ndeps' is of the wrong length"
 msgstr "'ndeps' ÎÅÐÒÁ×ÉÌØÎÏÊ ÄÌÉÎÙ"
 
@@ -507,11 +557,15 @@
 msgid "unknown 'method'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ 'method'"
 
-#: optimize.c:220 optimize.c:306 optimize.c:528
+#: optimize.c:220
+#: optimize.c:306
+#: optimize.c:528
 msgid "NA replaced by maximum positive value"
 msgstr "NA ÚÁÍÅÎÅÎÙ ÍÁËÓÉÍÁÌØÎÙÍ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÚÎÁÞÅÎÉÅÍ"
 
-#: optimize.c:228 optimize.c:318 optimize.c:536
+#: optimize.c:228
+#: optimize.c:318
+#: optimize.c:536
 msgid "NA/Inf replaced by maximum positive value"
 msgstr "NA/Inf ÚÁÍÅÎÅÎÙ ÍÁËÓÉÍÁÌØÎÙÍ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÚÎÁÞÅÎÉÅÍ"
 
@@ -519,17 +573,24 @@
 msgid "invalid function value in 'optimize'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÆÕÎËÃÉÉ × 'optimize'"
 
-#: optimize.c:255 optimize.c:347 optimize.c:721
+#: optimize.c:255
+#: optimize.c:347
+#: optimize.c:721
 msgid "attempt to minimize non-function"
 msgstr "ÐÏÐÙÔËÁ ÍÉÎÉÍÉÚÉÒÏ×ÁÔØ ÎÅ-ÆÕÎËÃÉÀ"
 
-#: optimize.c:262 optimize.c:269 optimize.c:278 optimize.c:352 optimize.c:357
+#: optimize.c:262
+#: optimize.c:269
+#: optimize.c:278
+#: optimize.c:352
+#: optimize.c:357
 #: optimize.c:373
 #, c-format
 msgid "invalid '%s' value"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ '%s'"
 
-#: optimize.c:271 optimize.c:358
+#: optimize.c:271
+#: optimize.c:358
 msgid "'xmin' not less than 'xmax'"
 msgstr "'xmin' ÎÅ ÍÅÎØÛÅ ÞÅÍ 'xmax'"
 
@@ -541,7 +602,8 @@
 msgid "invalid function value in 'zeroin'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÆÕÎËÃÉÉ × 'zeroin'"
 
-#: optimize.c:363 optimize.c:368
+#: optimize.c:363
+#: optimize.c:368
 #, c-format
 msgid "NA value for '%s' is not allowed"
 msgstr "NA × '%s' ÎÅ ÒÁÚÒÅÛÁÅÔÓÑ"
@@ -558,7 +620,8 @@
 msgid "invalid function value in 'nlm' optimizer"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÆÕÎËÃÉÉ × ÏÐÔÉÍÉÚÁÔÏÒÅ 'nlm'"
 
-#: optimize.c:566 optimize.c:581
+#: optimize.c:566
+#: optimize.c:581
 msgid "function value caching for optimization is seriously confused"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÐÒÅÄ×ÙÞÉÓÌÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÆÕÎËÃÉÉ"
 
@@ -574,7 +637,8 @@
 msgid "invalid parameter length"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ ÄÌÉÎÙ"
 
-#: optimize.c:614 optimize.c:621
+#: optimize.c:614
+#: optimize.c:621
 msgid "missing value in parameter"
 msgstr "ÐÒÏÐÕÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ × ÐÁÒÁÍÅÔÒÅ"
 
@@ -631,7 +695,8 @@
 msgid "Relative gradient close to zero.\n"
 msgstr "ïÔÎÏÓÉÔÅÌØÎÙÊ ÇÒÁÄÉÅÎÔ ÂÌÉÚÏË Ë 0.\n"
 
-#: optimize.c:667 optimize.c:671
+#: optimize.c:667
+#: optimize.c:671
 msgid "Current iterate is probably solution.\n"
 msgstr "ôÅËÕÝÁÑ ÉÔÅÒÁÃÉÑ, ×ÏÚÍÏÖÎÏ, Ñ×ÌÑÅÔÓÑ ÒÅÛÅÎÉÅÍ.\n"
 
@@ -641,8 +706,7 @@
 
 #: optimize.c:674
 msgid "Last global step failed to locate a point lower than x.\n"
-msgstr ""
-"ðÏÓÌÅÄÎÅÍÕ ÇÌÏÂÁÌØÎÏÍÕ ÛÁÇÕ ÎÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÔÏÞËÕ, ÍÅÎØÛÕÀ ÞÅÍ x.\n"
+msgstr "ðÏÓÌÅÄÎÅÍÕ ÇÌÏÂÁÌØÎÏÍÕ ÛÁÇÕ ÎÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÔÏÞËÕ, ÍÅÎØÛÕÀ ÞÅÍ x.\n"
 
 #: optimize.c:675
 msgid ""
@@ -672,8 +736,13 @@
 "Ó×ÅÒÈÕ × ÔÏÍ ÖÅ ÎÁÐÒÁ×ÌÅÎÉÉ,\n"
 "ÌÉÂÏ 'stepmx' ÓÌÉÛËÏÍ ÍÁÌÏ.\n"
 
-#: optimize.c:745 optimize.c:750 optimize.c:754 optimize.c:758 optimize.c:762
-#: optimize.c:766 optimize.c:771
+#: optimize.c:745
+#: optimize.c:750
+#: optimize.c:754
+#: optimize.c:758
+#: optimize.c:762
+#: optimize.c:766
+#: optimize.c:771
 msgid "invalid NA value in parameter"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ NA-ÚÎÁÞÅÎÉÅ × ÐÁÒÁÍÅÔÒÅ"
 
@@ -720,22 +789,20 @@
 #: port.c:325
 #, c-format
 msgid "Hessian function must return a square numeric matrix of order %d"
-msgstr ""
-"ÆÕÎËÃÉÑ ÇÅÓÓÉÁÎÁ ÄÏÌÖÎÁ ×ÏÚ×ÒÁÝÁÔØ Ë×ÁÄÒÁÔÎÕÀ ÞÉÓÌÏ×ÕÀ ÍÁÔÒÉÃÕ ÐÏÒÑÄËÁ %d"
+msgstr "ÆÕÎËÃÉÑ ÇÅÓÓÉÁÎÁ ÄÏÌÖÎÁ ×ÏÚ×ÒÁÝÁÔØ Ë×ÁÄÒÁÔÎÕÀ ÞÉÓÌÏ×ÕÀ ÍÁÔÒÉÃÕ ÐÏÒÑÄËÁ %d"
 
 #: port.c:380
 msgid "'rho' must be an environment"
 msgstr "'rho' ÄÏÌÖÎÏ ÂÙÔØ ÏËÒÕÖÅÎÉÅÍ"
 
-#: port.c:382 port.c:546
+#: port.c:382
+#: port.c:546
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d' ÄÏÌÖÅÎ ÂÙÔØ ÎÅÐÕÓÔÙÍ ÞÉÓÌÏ×ÙÍ ×ÅËÔÏÒÏÍ"
 
 #: port.c:384
 msgid "When Hessian defined must also have gradient defined"
-msgstr ""
-"ëÏÇÄÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ÆÕÎËÃÉÑ, ×ÙÞÉÓÌÑÀÝÁÑ ÇÅÓÓÉÁÎ, ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎ É "
-"ÇÒÁÄÉÅÎÔ"
+msgstr "ëÏÇÄÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ÆÕÎËÃÉÑ, ×ÙÞÉÓÌÑÀÝÁÑ ÇÅÓÓÉÁÎ, ÄÏÌÖÅÎ ÂÙÔØ ÏÐÒÅÄÅÌÅÎ É ÇÒÁÄÉÅÎÔ"
 
 #: port.c:387
 #, c-format
@@ -758,8 +825,7 @@
 #: port.c:494
 #, c-format
 msgid "'gradient' must be a numeric matrix of dimension (%d,%d)"
-msgstr ""
-"'gradient' ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÏÊ ÍÁÔÒÉÃÅÊ ÍÁÔÒÉÃÅÊ Ó ÉÚÍÅÒÅÎÉÑÍÉ (%d,%d)"
+msgstr "'gradient' ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÏÊ ÍÁÔÒÉÃÅÊ ÍÁÔÒÉÃÅÊ Ó ÉÚÍÅÒÅÎÉÑÍÉ (%d,%d)"
 
 #: port.c:515
 #, c-format
@@ -790,11 +856,19 @@
 msgid "'scal' matrix is not positive-definite"
 msgstr "ÍÁÔÒÉÃÁ 'scal' ÎÅ ÐÏÌÏÖÉÔÅÌØÎÏ-ÏÐÒÅÄÅÌÅÎÎÁÑ"
 
-#: random.c:53 random.c:128 random.c:200 random.c:284
+#: random.c:53
+#: random.c:128
+#: random.c:200
+#: random.c:284
 msgid "NAs produced"
 msgstr "ÐÏÌÕÞÉÌÉÓØ NA"
 
-#: random.c:60 random.c:66 random.c:72 random.c:90 random.c:161 random.c:242
+#: random.c:60
+#: random.c:66
+#: random.c:72
+#: random.c:90
+#: random.c:161
+#: random.c:242
 #: random.c:376
 msgid "invalid arguments"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ"
@@ -836,9 +910,8 @@
 
 #~ msgid "allocation error in smooth(*, '3RSR')."
 #~ msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ × smooth(*, '3RSR')."
-
 #~ msgid "allocation error in smooth(*, '3RSS')."
 #~ msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ × smooth(*, '3RSS')."
-
 #~ msgid "allocation error in smooth(*, '3R')."
 #~ msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ × smooth(*, '3R')."
+
diff -Nru r-base-3.2.3/src/library/stats/po/R-zh_CN.po r-base-3.3.1/src/library/stats/po/R-zh_CN.po
--- r-base-3.2.3/src/library/stats/po/R-zh_CN.po	2015-03-18 23:03:00.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/R-zh_CN.po	2016-04-27 22:15:22.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.2.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2014-11-20 11:48\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-04-08 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -465,6 +465,12 @@
 msgid "NA values not allowed in 'd'"
 msgstr "'d'里��许有NA值"
 
+msgid "eig=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
+msgid "x.ret=TRUE is disregarded when list.=FALSE"
+msgstr ""
+
 msgid "distances must be result of 'dist' or a square matrix"
 msgstr "�离必需是'dist'计算出结果或是正方形矩阵"
 
@@ -477,6 +483,9 @@
 msgid "only %d of the first %d eigenvalues are > 0"
 msgstr "�%2$d个特�值里�有%1$d个大于零"
 
+msgid "package 'MASS' must be installed"
+msgstr ""
+
 msgid "initial value is not in the interior of the feasible region"
 msgstr "�始值�是在�行区域内"
 
@@ -518,6 +527,10 @@
 msgid "arguments must have the same length"
 msgstr "�数的长度必需一样"
 
+#, fuzzy
+msgid "wrong number of columns in new data:"
+msgstr "'x'里的列数�对"
+
 msgid "contrasts apply only to factors"
 msgstr "对比�适用于因�"
 
@@ -667,9 +680,6 @@
 msgid "'RowSideColors' must be a character vector of length nrow(x)"
 msgstr "'RowSideColors'必需是长度为nrow(x)的字节矢�"
 
-msgid "non-matched further arguments are disregarded"
-msgstr "�匹�的�外�数略过�用"
-
 msgid "argument 'x' must be numeric"
 msgstr "�数'x'必需是数值"
 
@@ -758,6 +768,9 @@
 msgid "some terms will have NAs due to the limits of the method"
 msgstr "因为这个方法的�制，有些项的值为NA"
 
+msgid "multivariate case with missing coefficients is not yet implemented"
+msgstr ""
+
 msgid "'x' must have 1 or more non-missing values"
 msgstr "'x'必需�一个或多个���值"
 
@@ -865,7 +878,10 @@
 msgid "positive values only are allowed for the 'inverse.gaussian' family"
 msgstr "'inverse.gaussian'分布���许正值"
 
-msgid "need CRAN package 'SuppDists' for the 'inverse.gaussian' family"
+#, fuzzy
+msgid ""
+"need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' "
+"family"
 msgstr "'inverse.gaussian'分布�需�CRAN程�包'SuppDists'"
 
 msgid "using weights as inverse variances"
@@ -1141,8 +1157,8 @@
 msgid "invalid parameter values"
 msgstr "�数值�对"
 
-msgid "a limit is missing"
-msgstr "極�有��"
+msgid "a limit is NA or NaN"
+msgstr ""
 
 msgid "missing values not allowed"
 msgstr "�能有��值"
@@ -1353,6 +1369,10 @@
 msgid "only 1-4 predictors are allowed"
 msgstr "��许有一到四个従属変数"
 
+#, fuzzy
+msgid "invalid NROW(X)"
+msgstr "NCOL(X)�对"
+
 msgid "invalid 'y'"
 msgstr "'y'�对"
 
@@ -1377,6 +1397,13 @@
 msgid "invalid argument 'degree'"
 msgstr "�数'degree'�对"
 
+msgid "iterTrace ="
+msgstr ""
+
+#, fuzzy
+msgid "not obeyed as iterations ="
+msgstr "没有有�观察�"
+
 msgid "first argument must be a \"loess\" object"
 msgstr "第一个�数必需为\"loess\"对象"
 
@@ -1891,8 +1918,8 @@
 msgid "'varying' arguments must be the same length"
 msgstr "'varying'�数的长度必需相�"
 
-msgid "'times' is wrong length"
-msgstr "'times'的长度�对"
+msgid "'lengths(varying)' must all match 'length(times)'"
+msgstr ""
 
 msgid "there are records with missing times, which will be dropped."
 msgstr "���时间的记录略过�用。"
@@ -2346,10 +2373,6 @@
 msgid_plural "extra arguments %s are not of class \"%s\"s"
 msgstr[0] "�外�数%s的类别�是\"%s\""
 
-msgid "extra argument %s will be disregarded"
-msgid_plural "extra arguments %s will be disregarded"
-msgstr[0] "�用�外的�数%s"
-
 msgid "%d factor is too many for %d variables"
 msgid_plural "%d factors are too many for %d variables"
 msgstr[0] "%2$d���能有%1$d这么多的因�"
@@ -2443,6 +2466,19 @@
 msgid_plural "'start.innov' is too short: need %d points"
 msgstr[0] "'start.innov'太短了，需�%d个点"
 
+#~ msgid "a limit is missing"
+#~ msgstr "極�有��"
+
+#~ msgid "'times' is wrong length"
+#~ msgstr "'times'的长度�对"
+
+#~ msgid "non-matched further arguments are disregarded"
+#~ msgstr "�匹�的�外�数略过�用"
+
+#~ msgid "extra argument %s will be disregarded"
+#~ msgid_plural "extra arguments %s will be disregarded"
+#~ msgstr[0] "�用�外的�数%s"
+
 #~ msgid "'merge' and 'height' do not fit!"
 #~ msgstr "'merge'和'height'��!"
 
diff -Nru r-base-3.2.3/src/library/stats/po/stats.pot r-base-3.3.1/src/library/stats/po/stats.pot
--- r-base-3.2.3/src/library/stats/po/stats.pot	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/stats.pot	2016-04-27 22:15:21.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: stats 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr ""
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr ""
 
@@ -41,7 +41,7 @@
 msgid "invalid argument type"
 msgstr ""
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr ""
 
@@ -67,31 +67,39 @@
 msgid "not all arguments have the same length"
 msgstr ""
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr ""
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr ""
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+msgid "'x' is a factor"
+msgstr ""
+
+#: cov.c:665
+msgid "'y' is a factor"
+msgstr ""
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr ""
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr ""
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr ""
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr ""
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr ""
 
@@ -104,36 +112,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr ""
 
-#: deriv.c:642
-msgid "variable must be a character string"
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
 msgstr ""
 
 #: deriv.c:644
+msgid "variable must be a character string"
+msgstr ""
+
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr ""
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr ""
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr ""
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr ""
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr ""
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr ""
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr ""
 
@@ -145,17 +157,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr ""
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr ""
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr ""
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr ""
@@ -180,7 +192,12 @@
 msgid "invalid factors"
 msgstr ""
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, c-format
+msgid "'%s' must be of length one"
+msgstr ""
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr ""
 
@@ -198,7 +215,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr ""
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr ""
 
@@ -226,19 +243,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr ""
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr ""
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr ""
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr ""
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr ""
 
@@ -277,184 +294,184 @@
 msgid "invalid result from na.action"
 msgstr ""
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr ""
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr ""
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr ""
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr ""
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr ""
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr ""
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr ""
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr ""
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr ""
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr ""
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr ""
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr ""
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr ""
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr ""
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr ""
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr ""
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr ""
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr ""
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr ""
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr ""
 
-#: model.c:1675
+#: model.c:1690
 msgid "'specials' must be NULL or a character vector"
 msgstr ""
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr ""
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr ""
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr ""
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr ""
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr ""
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr ""
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr ""
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr ""
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr ""
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr ""
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr ""
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr ""
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr ""
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr ""
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr ""
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr ""
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr ""
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr ""
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr ""
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr ""
@@ -668,21 +685,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr ""
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr ""
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr ""
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr ""
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr ""
 
@@ -709,7 +726,7 @@
 msgid "'rho' must be an environment"
 msgstr ""
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr ""
 
@@ -749,23 +766,23 @@
 msgid "invalid type for eval_check_store"
 msgstr ""
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr ""
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr ""
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr ""
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr ""
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr ""
 
@@ -803,12 +820,12 @@
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 msgstr ""
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr ""
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/stats/po/zh_CN.po r-base-3.3.1/src/library/stats/po/zh_CN.po
--- r-base-3.2.3/src/library/stats/po/zh_CN.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/stats/po/zh_CN.po	2016-04-27 22:15:22.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:01-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -17,11 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Srunmed.c:55
+#: Srunmed.c:54
 msgid "bandwidth/span of running medians is larger than n"
 msgstr "移动中�数的帶寬/跨�的值�能大于n"
 
-#: ansari.c:116
+#: ansari.c:118
 msgid "probabilities outside [0,1] in qansari()"
 msgstr "qansari()里的概率值在[0,1]范围外"
 
@@ -41,7 +41,7 @@
 msgid "invalid argument type"
 msgstr "�数�类�对"
 
-#: arima.c:444 arima.c:530 pacf.c:327 pacf.c:366
+#: arima.c:444 arima.c:530 pacf.c:324 pacf.c:363
 msgid "can only transform 100 pars in arima0"
 msgstr "arima0里�能转�100个�数"
 
@@ -67,31 +67,41 @@
 msgid "not all arguments have the same length"
 msgstr "�是所有的�数都一样长"
 
-#: cov.c:566
+#: cov.c:569
 msgid "missing observations in cov/cor"
 msgstr "cov/cor中有��值"
 
-#: cov.c:644
+#: cov.c:643
 msgid "'x' is NULL"
 msgstr "'x'为NULL"
 
-#: cov.c:663 cov.c:669
+#: cov.c:645
+#, fuzzy
+msgid "'x' is a factor"
+msgstr "'tmax'�是整数"
+
+#: cov.c:665
+#, fuzzy
+msgid "'y' is a factor"
+msgstr "'fn'�是函数"
+
+#: cov.c:673 cov.c:679
 msgid "incompatible dimensions"
 msgstr "�兼容的�度"
 
-#: cov.c:688 cov.c:729 cov.c:762
+#: cov.c:698 cov.c:739 cov.c:772
 msgid "no complete element pairs"
 msgstr "�存在完的一对"
 
-#: cov.c:701
+#: cov.c:711
 msgid "invalid 'use' (computational method)"
 msgstr "'use'�对(计算方法)"
 
-#: cov.c:704
+#: cov.c:714
 msgid "'x' is empty"
 msgstr "'x'是空的"
 
-#: cov.c:798
+#: cov.c:808
 msgid "the standard deviation is zero"
 msgstr "标准差为零"
 
@@ -104,36 +114,40 @@
 msgid "Function '%s' is not in the derivatives table"
 msgstr "微分表里没有这个函数'%s'"
 
-#: deriv.c:642
+#: deriv.c:641
+msgid "'expr' must be an expression or call"
+msgstr ""
+
+#: deriv.c:644
 msgid "variable must be a character string"
 msgstr "�数必需是字符串"
 
-#: deriv.c:644
+#: deriv.c:646
 msgid "only the first element is used as variable name"
 msgstr "�用了第一个元素作为�数�"
 
-#: deriv.c:657
+#: deriv.c:659
 #, c-format
 msgid "invalid expression in '%s'"
 msgstr "'%s'的表达��对"
 
-#: deriv.c:935 model.c:99
+#: deriv.c:937 model.c:99
 msgid "invalid variable names"
 msgstr "�数�字�对"
 
-#: deriv.c:944
+#: deriv.c:946
 msgid "invalid tag"
 msgstr "标签�对"
 
-#: distance.c:153
+#: distance.c:152
 msgid "treating non-finite values as NA"
 msgstr "所有无�值都作为NA�处�"
 
-#: distance.c:226
+#: distance.c:225
 msgid "distance(): invalid p"
 msgstr "distance(): p值�对"
 
-#: distance.c:229
+#: distance.c:228
 msgid "distance(): invalid distance"
 msgstr "distance()：�离值�对"
 
@@ -145,17 +159,17 @@
 msgid "Non-numeric argument to mathematical function"
 msgstr "数学函数中用了�数值�数"
 
-#: family.c:44
+#: family.c:45
 #, c-format
 msgid "Value %g out of range (0, 1)"
 msgstr "%g值出界在(0, 1)外"
 
-#: family.c:65 family.c:79 family.c:97
+#: family.c:66 family.c:80 family.c:98
 #, c-format
 msgid "Argument %s must be a nonempty numeric vector"
 msgstr "�数%s必需为�空数字��"
 
-#: family.c:130 family.c:133
+#: family.c:131 family.c:134
 #, c-format
 msgid "argument %s must be a numeric vector of length 1 or length %d"
 msgstr "�数%s必需为长度为一或长度为%d的数字��"
@@ -180,7 +194,12 @@
 msgid "invalid factors"
 msgstr "因��对"
 
-#: ksmooth.c:67
+#: integrate.c:84 integrate.c:86 integrate.c:128
+#, fuzzy, c-format
+msgid "'%s' must be of length one"
+msgstr "'m'的值必需是串列"
+
+#: ksmooth.c:68
 msgid "only 2500 rows are allowed for sm.method=\"spline\""
 msgstr "sm.method=\"spline\"最多�能算2500行"
 
@@ -199,7 +218,7 @@
 msgid "NA/NaN/Inf in '%s'"
 msgstr ""
 
-#: loessc.c:233
+#: loessc.c:240
 msgid "span is too small"
 msgstr "跨�太�"
 
@@ -227,19 +246,19 @@
 msgid "'delta' must be finite and > 0"
 msgstr "'delta'必需是正数"
 
-#: mAR.c:467
+#: mAR.c:470
 msgid "Singular matrix in qr_solve"
 msgstr "gr_solve里出现了奇异矩阵"
 
-#: mAR.c:510
+#: mAR.c:513
 msgid "Singular matrix in ldet"
 msgstr "ldet里出现了奇异矩阵"
 
-#: mAR.c:697
+#: mAR.c:700
 msgid "Invalid vmethod"
 msgstr "vmethod�对"
 
-#: mAR.c:833
+#: mAR.c:836
 msgid "Burg's algorithm failed to find partial correlation"
 msgstr "Burg的算法没有能够找到�相关数"
 
@@ -278,184 +297,184 @@
 msgid "invalid result from na.action"
 msgstr "na.action的结果有错"
 
-#: model.c:369 model.c:377 optim.c:197
+#: model.c:372 model.c:380 optim.c:197
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "'%s'�数�对"
 
-#: model.c:388
+#: model.c:391
 msgid "invalid model frame"
 msgstr "模型框�对"
 
-#: model.c:390
+#: model.c:393
 msgid "do not know how many cases"
 msgstr "案例数目�清"
 
-#: model.c:414
+#: model.c:417
 #, c-format
 msgid "variable lengths differ (found for variable %d)"
 msgstr "�数的长度�一样(�数%d)"
 
-#: model.c:418 model.c:425
+#: model.c:421 model.c:428
 #, c-format
 msgid "variable %d has no levels"
 msgstr "�数%d没有因�层"
 
-#: model.c:537
+#: model.c:540
 msgid "the response appeared on the right-hand side and was dropped"
 msgstr "在公��手的�应略过�用"
 
-#: model.c:557
+#: model.c:560
 #, c-format
 msgid "term %d would require %.0g columns"
 msgstr "%d项需�%.0g个列"
 
-#: model.c:561
+#: model.c:564
 #, c-format
 msgid "matrix would require %.0g columns"
 msgstr "矩阵需�%.0g个列"
 
-#: model.c:572
+#: model.c:575
 #, c-format
 msgid "problem with term %d in model.matrix: no columns are assigned"
 msgstr "模型矩阵的%d项有问题: 没有指定的列"
 
-#: model.c:621 model.c:626 model.c:632 model.c:643 model.c:649 model.c:655
+#: model.c:624 model.c:629 model.c:635 model.c:646 model.c:652 model.c:658
 msgid "term names will be truncated"
 msgstr "项�字太长，被缩短了"
 
-#: model.c:635
+#: model.c:638
 msgid "complex variables are not currently allowed in model matrices"
 msgstr "模型矩阵里目��能有�数"
 
-#: model.c:659
+#: model.c:662
 #, c-format
 msgid "variables of type '%s' are not allowed in model matrices"
 msgstr "模型矩阵里�能有�类为'%s'的�数"
 
-#: model.c:881
+#: model.c:884
 msgid "invalid formula in 'update'"
 msgstr "'update'里的公��对"
 
-#: model.c:915
+#: model.c:918
 msgid "formula expected"
 msgstr "需�公�"
 
-#: model.c:1046
+#: model.c:1049
 msgid "invalid term in model formula"
 msgstr "模型公�里有错误的项"
 
-#: model.c:1121
+#: model.c:1124
 msgid "invalid model formula"
 msgstr "模型公��对"
 
-#: model.c:1147 model.c:1395
+#: model.c:1150 model.c:1410
 msgid "invalid power in formula"
 msgstr "公�里的幂�对"
 
-#: model.c:1183
+#: model.c:1186
 msgid "invalid model formula in ExtractVars"
 msgstr "ExtractVars里的模型公��对"
 
-#: model.c:1518
+#: model.c:1533
 #, c-format
 msgid "duplicated name '%s' in data frame using '.'"
 msgstr "在数�框里用'.'时�能有��的�字’%s'"
 
-#: model.c:1579
+#: model.c:1594
 msgid "invalid model formula in EncodeVars"
 msgstr "EncodeVars中的模型公��对"
 
-#: model.c:1665
+#: model.c:1680
 msgid "argument is not a valid model"
 msgstr "�数�是正确的模型"
 
-#: model.c:1675
+#: model.c:1690
 msgid "'specials' must be NULL or a character vector"
 msgstr "'specials'的值�么是NULL�么是字符矢�"
 
-#: model.c:1687
+#: model.c:1702
 msgid "'data' argument is of the wrong type"
 msgstr "'data'�数�类有错"
 
-#: model.c:1957
+#: model.c:1972
 msgid "'.' in formula and no 'data' argument"
 msgstr "公�里有'.'，而没有'data'这一�数"
 
-#: monoSpl.c:34
+#: monoSpl.c:36
 msgid "n must be at least two"
 msgstr "n至少需�是二"
 
-#: monoSpl.c:67
+#: monoSpl.c:69
 msgid "Argument m must be numeric"
 msgstr "�数m必需为数值"
 
-#: monoSpl.c:70
+#: monoSpl.c:72
 msgid "length(m) must be at least two"
 msgstr "length(m)的值必需为二"
 
-#: monoSpl.c:72
+#: monoSpl.c:74
 msgid "Argument Sx must be numeric vector one shorter than m[]"
 msgstr "�数Sx必需是长度比m[]�一的数值��"
 
-#: nls.c:97
+#: nls.c:99
 msgid "'control' must be a list"
 msgstr "'control'的值必需为串列"
 
-#: nls.c:99
+#: nls.c:101
 msgid "'m' must be a list"
 msgstr "'m'的值必需是串列"
 
-#: nls.c:105 nls.c:110 nls.c:115 nls.c:120 nls.c:125 nls.c:166 nls.c:171
-#: nls.c:176 nls.c:181 nls.c:186 nls.c:191
+#: nls.c:107 nls.c:112 nls.c:117 nls.c:122 nls.c:127 nls.c:168 nls.c:173
+#: nls.c:178 nls.c:183 nls.c:188 nls.c:193
 #, c-format
 msgid "'%s' absent"
 msgstr "需�设定'%s'"
 
-#: nls.c:232
+#: nls.c:234
 msgid "singular gradient"
 msgstr "奇异梯度"
 
-#: nls.c:253
+#: nls.c:255
 #, c-format
 msgid "step factor %g reduced below 'minFactor' of %g"
 msgstr "算法的步因素%g的大�被�少到�于%g的'minFactor'值"
 
-#: nls.c:262
+#: nls.c:264
 #, c-format
 msgid "number of iterations exceeded maximum of %d"
 msgstr "循环次数超过了%d这个最大值"
 
-#: nls.c:267
+#: nls.c:269
 msgid "converged"
 msgstr "收敛了"
 
-#: nls.c:288
+#: nls.c:290
 msgid "'theta' should be of type character"
 msgstr "'theta'的�类必需是字符"
 
-#: nls.c:290 port.c:376
+#: nls.c:292 port.c:376
 msgid "use of NULL environment is defunct"
 msgstr "NULL环境��有用了"
 
-#: nls.c:294
+#: nls.c:296
 msgid "'rho' should be an environment"
 msgstr "'rho'必需为环境"
 
-#: nls.c:297
+#: nls.c:299
 msgid "'dir' is not a numeric vector of the correct length"
 msgstr "'dir'这个数字��的长度�对"
 
-#: nls.c:311 nls.c:345
+#: nls.c:313 nls.c:347
 msgid "Missing value or an infinity produced when evaluating the model"
 msgstr "在计算模型的时候产生了缺�值或无�值"
 
-#: nls.c:319
+#: nls.c:321
 #, c-format
 msgid "variable '%s' is integer, not numeric"
 msgstr "��'%s'应该为整数，�能是数值"
 
-#: nls.c:321
+#: nls.c:323
 #, c-format
 msgid "variable '%s' is not numeric"
 msgstr "��'%s'�是数值"
@@ -675,21 +694,21 @@
 msgid "gradient supplied is of the wrong length or mode, so ignored"
 msgstr "梯度的长度或其状��对，因此略过�用"
 
-#: pacf.c:90
+#: pacf.c:87
 msgid "bad Starma struct"
 msgstr "Starma结构�对"
 
-#: pacf.c:236
+#: pacf.c:233
 #, c-format
 msgid "starma error code %d"
 msgstr "starma出错编�%d"
 
-#: pacf.c:296
+#: pacf.c:293
 #, c-format
 msgid "forkal error code %d"
 msgstr "forkal出错编�%d"
 
-#: pacf.c:469
+#: pacf.c:466
 msgid "invalid value of lag.max"
 msgstr "lag.max的值�对"
 
@@ -716,7 +735,7 @@
 msgid "'rho' must be an environment"
 msgstr "'rho'必需是环境"
 
-#: port.c:382 port.c:546
+#: port.c:382 port.c:548
 msgid "'d' must be a nonempty numeric vector"
 msgstr "'d'必需是�空数字��"
 
@@ -756,23 +775,23 @@
 msgid "invalid type for eval_check_store"
 msgstr "eval_check_store的�类�对"
 
-#: port.c:547
+#: port.c:549
 msgid "m must be a list"
 msgstr "m必需为串列"
 
-#: port.c:567
+#: port.c:569
 msgid "'lowerb' and 'upperb' must be numeric vectors"
 msgstr "'lowerb'和'upperb'必需为数字��"
 
-#: rWishart.c:51
+#: rWishart.c:53
 msgid "inconsistent degrees of freedom and dimension"
 msgstr "自由度和维度�相符"
 
-#: rWishart.c:84
+#: rWishart.c:86
 msgid "'scal' must be a square, real matrix"
 msgstr "'scal'必需是正文形的实数矩阵"
 
-#: rWishart.c:96
+#: rWishart.c:98
 msgid "'scal' matrix is not positive-definite"
 msgstr "'scal'�是正定矩阵"
 
@@ -810,12 +829,12 @@
 msgid "rcont2 [%d,%d]: exp underflow to 0; algorithm failure"
 msgstr " rcont2 [%d,%d]: exp下益到0； 算法失败"
 
-#: smooth.c:101
+#: smooth.c:107
 #, c-format
 msgid "invalid end-rule for running median of 3: %d"
 msgstr "三移动中�数的结尾规则出了错: %d"
 
-#: starma.c:366
+#: starma.c:364
 #, c-format
 msgid "missing value in last %d observations"
 msgstr "最�%d个观测值里出现了缺�值"
diff -Nru r-base-3.2.3/src/library/stats/R/addmargins.R r-base-3.3.1/src/library/stats/R/addmargins.R
--- r-base-3.2.3/src/library/stats/R/addmargins.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/addmargins.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/addmargins.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 2004-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,17 +19,17 @@
 addmargins <-
     function(A, margin = seq_along(dim(A)), FUN = sum, quiet = FALSE)
 {
-### The workhorse for this margin-expansion is the function
-### expand.one, which is defined and called at the bottom.
-###
-### All this initial stuff is just to check consistency of
-### specifications, and form maximally sensible margin names
-###
-### BxC, August 2003
-###	 Sept	2003: Single margins caused crash. Fixed.
-### Duncan Murdoch, Feb 2004: Machinery to derive functionnames
-###			      from unnamed lists
-###-------------------------------------------------------------
+    ## The workhorse for this margin-expansion is the function
+    ## expand.one, which is defined and called at the bottom.
+    ##
+    ## All this initial stuff is just to check consistency of
+    ## specifications, and form maximally sensible margin names
+    ##
+    ## BxC, August 2003
+    ##	 Sept	2003: Single margins caused crash. Fixed.
+    ## Duncan Murdoch, Feb 2004: Machinery to derive functionnames
+    ##			      from unnamed lists
+    ##-------------------------------------------------------------
 
     if(is.null(dim(A))) stop("'A' must be an array or table")
     ## How many dimensions of A, and how many sides do we touch?
@@ -76,7 +76,8 @@
 	if(length(FUN) == 1L)
 	    FUN <- rep(FUN, n.sid)
 	else
-	    stop(gettextf("length of FUN, %d,\n does not match the length of the margins, %d",
+	    stop(gettextf(
+		"length of FUN, %d,\n does not match the length of the margins, %d",
 			  length(FUN), n.sid), domain = NA)
     }
 
@@ -97,13 +98,12 @@
 	    fnames[[i]][blank] <- seq_along(blank)[blank]
 	    if (topname == "") {
 		fnames[[i]][blank] <-
-		    paste("Margin ", margin[i], ".", fnames[[i]][blank],
-			  sep = "")
+		    paste0("Margin ", margin[i], ".", fnames[[i]][blank])
 	    } else {
 		fnames[[i]] <- paste0(topname, ".", fnames[[i]])
 	    }
-	} else
-	    if (fnames[[i]] == "") fnames[[i]] <- paste("Margin", margin[i])
+	} else if (fnames[[i]] == "")
+            fnames[[i]] <- paste("Margin", margin[i])
     }
 
     ## So finally we have the relevant form of FUN and fnames to pass
@@ -128,8 +128,10 @@
 	## Define the dimensions of the new table with the margins
 	newdim <- d
 	newdim[margin] <- newdim[margin] + n.mar
-	newdimnames <- dimnames(A)
-	newdimnames[[margin]] <- c(newdimnames[[margin]], fnames)
+	if(is.null(dnA <- dimnames(A))) dnA <- vector("list", n.dim)
+	dnA[[margin]] <-
+	    c(if(is.null(dnA[[margin]])) rep("", d[[margin]]) else dnA[[margin]],
+	      fnames)
 
 	## Number of elements in the expanded array
 	n.new <- prod(newdim)
@@ -149,9 +151,10 @@
 
 	## Then sucessively compute and fill in the required margins
 	for(i in 1L:n.mar) {
-	    mtab <- if(n.dim > 1) {
-		apply(A, (1L:n.dim)[-margin], FUN[[i]])
-	    } else FUN[[i]](A)
+	    mtab <- if(n.dim > 1)
+			apply(A, (1L:n.dim)[-margin], FUN[[i]])
+		    else
+			FUN[[i]](A)
 	    ## Vector the same length as the number of margins
 	    select <- rep_len(FALSE, n.mar)
 	    ## The position of the current margin
@@ -163,12 +166,8 @@
 	    values[mpos] <- as.vector(mtab)
 	}
 
-	## Then define the new table with contents and margins
-	##
-	new.A <- array(values, dim=newdim, dimnames=newdimnames)
-	if(inherits(A, "table")) # result shall be table, too
-	    class(new.A) <- c("table", class(new.A))
-	new.A
+	## the new table with contents and margins
+	array(values, dim=newdim, dimnames=dnA)
     }
 
     ## Once defined, we can use the expand.one function repeatedly
@@ -176,6 +175,8 @@
     for(i in 1L:n.sid)
 	new.A <- expand.one(A = new.A, margin = margin[i], FUN = FUN[[i]],
 			    fnames = fnames[[i]])
+    if(inherits(A, "table")) # result shall be table, too
+        class(new.A) <- c("table", class(new.A))
 
     ## Done! Now print it.
     ##
diff -Nru r-base-3.2.3/src/library/stats/R/add.R r-base-3.3.1/src/library/stats/R/add.R
--- r-base-3.2.3/src/library/stats/R/add.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/add.R	2016-03-16 23:02:55.000000000 +0000
@@ -58,7 +58,7 @@
 	tt <- scope[i]
 	if(trace > 1) {
 	    cat("trying +", tt, "\n", sep = "")
-	    utils::flush.console()
+	    flush.console()
 	}
 	nfit <- update(object, as.formula(paste("~ . +", tt)),
                        evaluate = FALSE)
@@ -384,7 +384,7 @@
 	tt <- scope[i]
 	if(trace > 1) {
 	    cat("trying -", tt, "\n", sep = "")
-	    utils::flush.console()
+	    flush.console()
         }
         nfit <- update(object, as.formula(paste("~ . -", tt)),
                        evaluate = FALSE)
@@ -779,7 +779,7 @@
     if(trace) {
 	cat("Start:  AIC=", format(round(bAIC, 2)), "\n",
 	    cut.string(deparse(formula(fit))), "\n\n", sep = "")
-        utils::flush.console()
+        flush.console()
     }
 
     ## FIXME think about df.residual() here
@@ -843,7 +843,7 @@
 	if(trace) {
 	    cat("\nStep:  AIC=", format(round(bAIC, 2)), "\n",
 		cut.string(deparse(formula(fit))), "\n\n", sep = "")
-            utils::flush.console()
+            flush.console()
         }
         ## add a tolerance as dropping 0-df terms might increase AIC slightly
 	if(bAIC >= AIC + 1e-7) break
diff -Nru r-base-3.2.3/src/library/stats/R/aggregate.R r-base-3.3.1/src/library/stats/R/aggregate.R
--- r-base-3.2.3/src/library/stats/R/aggregate.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/aggregate.R	2016-03-16 23:02:54.000000000 +0000
@@ -30,7 +30,7 @@
 }
 
 aggregate.data.frame <-
-function(x, by, FUN, ..., simplify = TRUE)
+function(x, by, FUN, ..., simplify = TRUE, drop = TRUE)
 {
     if(!is.data.frame(x)) x <- as.data.frame(x)
     ## Do this here to avoid masking by non-function (could happen)
@@ -65,18 +65,25 @@
 
     # Generate a group identifier vector with integers and dots.
     ident <- function(x){
-           y <- as.integer(as.factor(x))
-           z <- gsub(" ", "0", format(y, scientific = FALSE)) # for right sort order
-           return(z)
+        y <- as.integer(as.factor(x))
+        z <- gsub(" ", "0", format(y, scientific = FALSE)) # for right sort order
+        return(z)
        }
     grp <- if(ncol(y)) {
         grp <- lapply(rev(y), ident)
         names(grp) <- NULL
-	do.call(paste, c(grp, list(sep = ".")))
+        do.call(paste, c(grp, list(sep = ".")))
     } else
 	integer(nrx)
 
-    y <- y[match(sort(unique(grp)), grp, 0L), , drop = FALSE]
+    if(!drop && ncol(y)) {
+        y <- expand.grid(lapply(y, function(e) sort(unique(e))))
+        lev <- lapply(rev(y), ident)
+        names(lev) <- NULL
+        lev <- do.call(paste, c(lev, list(sep = ".")))
+        grp <- factor(grp, levels = lev)
+    } else
+        y <- y[match(sort(unique(grp)), grp, 0L), , drop = FALSE]
     nry <- NROW(y)
     z <- lapply(x,
                 function(e) {
diff -Nru r-base-3.2.3/src/library/stats/R/aov.R r-base-3.3.1/src/library/stats/R/aov.R
--- r-base-3.2.3/src/library/stats/R/aov.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/aov.R	2016-03-16 23:02:54.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/aov.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #  Copyright (C) 1998 B. D. Ripley
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,9 @@
 aov <- function(formula, data = NULL, projections = FALSE, qr = TRUE,
                 contrasts = NULL, ...)
 {
-    Terms <- if(missing(data)) terms(formula, "Error")
-    else terms(formula, "Error", data = data)
+    Terms <- if(missing(data))
+		  terms(formula, "Error")
+	     else terms(formula, "Error", data = data)
     indError <- attr(Terms, "specials")$Error
     ## NB: this is only used for n > 1, so singular form makes no sense
     ## in English.  But some languages have multiple plurals.
@@ -37,15 +38,15 @@
     if(projections) qr <- lmcall$qr <- TRUE
     lmcall$projections <- NULL
     if(is.null(indError)) {
-        ## no Error term
-        fit <- eval(lmcall, parent.frame())
-        if(projections) fit$projections <- proj(fit)
-        class(fit) <- if(inherits(fit, "mlm"))
-            c("maov", "aov", oldClass(fit)) else c("aov", oldClass(fit))
-        fit$call <- Call
-        return(fit)
+	## no Error term
+	fit <- eval(lmcall, parent.frame())
+	fit$call <- Call # fixup 'lmcall'
+	structure(fit,
+		  class = c(if(inherits(fit, "mlm")) "maov",
+			    "aov", oldClass(fit)),
+		  projections = if(projections) proj(fit))
     } else {
-        if(pmatch("weights", names(match.call()), 0L))
+	if(pmatch("weights", names(Call), 0L))
             stop("weights are not supported in a multistratum aov() fit")
         ##  Helmert contrasts can be helpful: do we want to force them?
         ##  this version does for the Error model.
@@ -53,7 +54,7 @@
         options(contrasts = c("contr.helmert", "contr.poly"))
         on.exit(options(opcons))
         allTerms <- Terms
-        errorterm <-  attr(Terms, "variables")[[1 + indError]]
+        errorterm <- attr(Terms, "variables")[[1L + indError]]
         eTerm <- deparse(errorterm[[2L]], width.cutoff = 500L, backtick = TRUE)
         intercept <- attr(Terms, "intercept")
         ecall <- lmcall
@@ -83,13 +84,15 @@
         maxasgn <- length(nmstrata) - 1L
         nobs <- NROW(qty)
 	len <- if(nobs > rank.e) {
-	    asgn.e[(rank.e+1):nobs] <- maxasgn + 1L
+	    asgn.e[(rank.e+1L):nobs] <- maxasgn + 1L
 	    nmstrata <- c(nmstrata, "Within")
 	    maxasgn + 2L
 	} else maxasgn + 1L
         result <- setNames(vector("list", len), nmstrata)
         lmcall$formula <- form <-
-            update(formula, paste(". ~ .-", deparse(errorterm, width.cutoff = 500L, backtick = TRUE)))
+            update(formula,
+                   paste(". ~ .-",
+                         deparse(errorterm, width.cutoff = 500L, backtick = TRUE)))
         Terms <- terms(form)
         lmcall$method <- "model.frame"
         mf <- eval(lmcall, parent.frame())
@@ -134,21 +137,20 @@
             class(fiti) <- c(if(maov) "maov", "aov", oldClass(er.fit))
             result[[i]] <- fiti
         }
-        ## drop empty strata
-        result <- result[!sapply(result, is.null)]
-        class(result) <- c("aovlist", "listof")
-        if(qr) attr(result, "error.qr") <- qr.e
-        attr(result, "call") <- Call
-        if(length(wts)) attr(result, "weights") <- wts
-        attr(result, "terms") <- allTerms
-        attr(result, "contrasts") <- cons
-        attr(result, "xlevels") <- xlev
-        result
+        structure(class = c("aovlist", "listof"),
+                  ## drop empty strata:
+                  result[!vapply(result, is.null, NA)],
+                  error.qr = if(qr) qr.e,
+                  call = Call,
+                  weights = if(length(wts)) wts,
+                  terms = allTerms,
+                  contrasts = cons,
+                  xlevels = xlev)
     }
 }
 
 print.aov <-
-function(x, intercept = FALSE, tol = .Machine$double.eps^0.5, ...)
+function(x, intercept = FALSE, tol = sqrt(.Machine$double.eps), ...)
 {
     if(!is.null(cl <- x$call)) {
         cat("Call:\n   ")
@@ -162,7 +164,7 @@
     rdf <- x$df.residual
     resid <- as.matrix(x$residuals)
     wt <- x$weights
-    if(!is.null(wt)) resid <- resid * wt^0.5
+    if(!is.null(wt)) resid <- resid * sqrt(wt)
     RSS <- colSums(resid^2)
     uasgn <- unique(asgn)
     nmeffect <- c("(Intercept)", attr(x$terms, "term.labels"))[1+uasgn]
@@ -302,7 +304,7 @@
     coef <- as.matrix(object$coefficients)
     resid <- as.matrix(object$residuals)
     wt <- object$weights
-    if(!is.null(wt)) resid <- resid * wt^0.5
+    if(!is.null(wt)) resid <- resid * sqrt(wt)
     nresp <- NCOL(resid)
     ans <- vector("list", nresp)
     if(nresp > 1) {
@@ -408,6 +410,12 @@
     z[!is.na(z)]
 }
 
+# For maov objects, the coefficients are a matrix and
+# NAs can't sensibly be removed (PR#16380)
+
+coef.maov <- function(object, ...)
+    object$coefficients
+
 alias <- function(object, ...) UseMethod("alias")
 
 alias.formula <- function(object, data, ...)
@@ -594,7 +602,7 @@
     if(rdf == 0L) stop("no degrees of freedom for residuals")
     resid <- as.matrix(object$residuals)
     wt <- object$weights
-    if(!is.null(wt)) resid <- resid * wt^0.5
+    if(!is.null(wt)) resid <- resid * sqrt(wt)
     rse <- sum(resid^2)/rdf
     if(!is.matrix(contrast.obj)) sqrt(sum(weights) * rse)
     else sqrt(rse * colSums(weights))
@@ -648,7 +656,7 @@
         if(rdf == 0L) return(NA)
         resid <- as.matrix(aov.object$residuals)
         wt <- aov.object$weights
-        if(!is.null(wt)) resid <- resid * wt^0.5
+        if(!is.null(wt)) resid <- resid * sqrt(wt)
         sum(resid^2)/rdf
     }
     if(is.null(attr(object, "error.qr"))) {
diff -Nru r-base-3.2.3/src/library/stats/R/cmdscale.R r-base-3.3.1/src/library/stats/R/cmdscale.R
--- r-base-3.2.3/src/library/stats/R/cmdscale.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/cmdscale.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/cmdscale.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,10 +16,15 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-cmdscale <- function (d, k = 2, eig = FALSE, add = FALSE, x.ret = FALSE)
+cmdscale <- function (d, k = 2, eig = FALSE, add = FALSE, x.ret = FALSE,
+		      list. = eig || add || x.ret)
 {
     if (anyNA(d))
 	stop("NA values not allowed in 'd'")
+    if(!list.) {
+	if (eig)  warning(  "eig=TRUE is disregarded when list.=FALSE")
+	if(x.ret) warning("x.ret=TRUE is disregarded when list.=FALSE")
+    }
     if (is.null(n <- attr(d, "Size"))) {
         if(add) d <- as.matrix(d)
 	x <- as.matrix(d^2)
@@ -27,7 +32,7 @@
 	if ((n <- nrow(x)) != ncol(x))
 	    stop("distances must be result of 'dist' or a square matrix")
         rn <- rownames(x)
-    } else {
+    } else { # d is  dist()-like  object
         rn <- attr(d, "Labels")
 	x <- matrix(0, n, n) # must be double
         if (add) d0 <- x
@@ -73,7 +78,7 @@
     }
     points <- evec * rep(sqrt(ev), each=n)
     dimnames(points) <- list(rn, NULL)
-    if (eig || x.ret || add) {
+    if (list.) {
         evalus <- e$values # Cox & Cox have sum up to n-1, though
         list(points = points, eig = if(eig) evalus, x = if(x.ret) x,
              ac = if(add) add.c else 0,
diff -Nru r-base-3.2.3/src/library/stats/R/confint.R r-base-3.3.1/src/library/stats/R/confint.R
--- r-base-3.2.3/src/library/stats/R/confint.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/confint.R	2016-03-16 23:02:55.000000000 +0000
@@ -42,12 +42,23 @@
     ci
 }
 
-
+## loading the MASS namespace will overwrite these in the registry.
+## stub is a specialized version of MASS:::confint.xxx with specific message
 confint.glm <- function(object, parm, level = 0.95, ...)
-    try(MASS:::confint.glm(object, parm, level, ...))
+{
+    if(!requireNamespace("MASS", quietly = TRUE))
+        stop("package 'MASS' must be installed")
+    confint.glm <- get("confint.glm", asNamespace("MASS"), inherits = FALSE)
+    confint.glm(object, parm, level, ...)
+}
 
 confint.nls <- function(object, parm, level = 0.95, ...)
-    try(MASS:::confint.nls(object, parm, level, ...))
+{
+    if(!requireNamespace("MASS", quietly = TRUE))
+        stop("package 'MASS' must be installed")
+    confint.nls <- get("confint.nls", asNamespace("MASS"), inherits = FALSE)
+    confint.nls(object, parm, level, ...)
+}
 
 confint.default <- function (object, parm, level = 0.95, ...)
 {
diff -Nru r-base-3.2.3/src/library/stats/R/cor.test.R r-base-3.3.1/src/library/stats/R/cor.test.R
--- r-base-3.2.3/src/library/stats/R/cor.test.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/cor.test.R	2016-02-09 23:15:04.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/cor.test.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
     y <- y[OK]
     n <- length(x)
 
-    PVAL <- NULL
     NVAL <- 0
     conf.int <- FALSE
 
@@ -50,7 +49,6 @@
 	ESTIMATE <- c(cor = r)
 	PARAMETER <- c(df = df)
 	STATISTIC <- c(t = sqrt(df) * r / sqrt(1 - r^2))
-	p <- pt(STATISTIC, df)
         if(n > 3) { ## confidence int.
             if(!missing(conf.level) &&
                (length(conf.level) != 1 || !is.finite(conf.level) ||
@@ -68,6 +66,11 @@
             cint <- tanh(cint)
             attr(cint, "conf.level") <- conf.level
         }
+	PVAL <- switch(alternative,
+		       "less" = pt(STATISTIC, df),
+		       "greater" = pt(STATISTIC, df, lower.tail=FALSE),
+		       "two.sided" = 2 * min(pt(STATISTIC, df),
+					     pt(STATISTIC, df, lower.tail=FALSE)))
     }
     else {
 	if(n < 2)
@@ -90,6 +93,7 @@
                     exact <- (n < 50)
                 if(exact && !TIES) {
                     q <- round((r + 1) * n * (n - 1) / 4)
+                    STATISTIC <- c(T = q)
                     pkendall <- function(q, n) .Call(C_pKendall, q, n)
                     PVAL <-
                         switch(alternative,
@@ -102,7 +106,6 @@
                                },
                                "greater" = 1 - pkendall(q - 1, n),
                                "less" = pkendall(q, n))
-                    STATISTIC <- c(T = q)
                 } else {
                     xties <- table(x[duplicated(x)]) + 1
                     yties <- table(y[duplicated(y)]) + 1
@@ -121,11 +124,15 @@
                         v1 / (2 * n * (n - 1)) +
                             v2 / (9 * n * (n - 1) * (n - 2))
 
-                    if (continuity) S <- sign(S) * (abs(S) - 1)
-                    STATISTIC <- c(z = S / sqrt(var_S))
-                    p <- pnorm(STATISTIC)
                     if(exact && TIES)
                         warning("Cannot compute exact p-value with ties")
+                    if (continuity) S <- sign(S) * (abs(S) - 1)
+                    STATISTIC <- c(z = S / sqrt(var_S))
+		    PVAL <- switch(alternative,
+				   "less" = pnorm(STATISTIC),
+				   "greater" = pnorm(STATISTIC, lower.tail=FALSE),
+				   "two.sided" = 2 * min(pnorm(STATISTIC),
+							 pnorm(STATISTIC, lower.tail=FALSE)))
                 }
             }
 	} else {
@@ -178,12 +185,6 @@
         }
     }
 
-    if(is.null(PVAL)) # for "pearson" only, currently
-	PVAL <- switch(alternative,
-		       "less" = p,
-		       "greater" = 1 - p,
-		       "two.sided" = 2 * min(p, 1 - p))
-
     RVAL <- list(statistic = STATISTIC,
                  parameter = PARAMETER,
                  p.value = as.numeric(PVAL),
diff -Nru r-base-3.2.3/src/library/stats/R/dendrogram.R r-base-3.3.1/src/library/stats/R/dendrogram.R
--- r-base-3.2.3/src/library/stats/R/dendrogram.R	2015-08-25 22:16:03.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/dendrogram.R	2016-02-09 23:15:04.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/dendrogram.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -98,7 +98,6 @@
     labsu <- unlist(labels(x))
     labs <- labsu[iOrd]
     x <- .add.dendrInd(x)
-
     SIMP <- function(d) {
 	if(is.leaf(d)) {
 	    - as.vector(d)# dropping attributes
@@ -114,16 +113,18 @@
     }
 
     height <- numeric(n.h);  inds <- vector("list",n.h);  j <- 0L
-    xS <- SIMP(x)
-    ii <- sort.list(height) ## FIXME? - May only work if there are no 'inversion's !
-
+    xS <- SIMP(x) # -> a simplified version of 'x' [nested list]  *plus* 'height' and 'inds'
+    ## ties: break ties "compatibly" with .add.dendrInd() -- relies on stable sort here:
+    ii <- sort.list(height, decreasing=TRUE)[n.h:1L]
+    verbose <- getOption("as.hclust.dendr", FALSE)
     merge <- matrix(NA_integer_, 2L, n.h)
     for(k in seq_len(n.h)) {
-	if(k < n.h) { in.k <- inds[[ ii[k] ]] ; s <- xS[[in.k]] } else s <- xS
-	if(getOption("as.hclust.dendr", FALSE)) {
-	    cat(sprintf("ii[k=%2d]=%2d -> s=xS[[in.k]]=", k, ii[k]))
-	    str(s)
-	}
+        if(verbose) cat(sprintf("ii[k=%2d]=%2d ", k, ii[k]))
+	s <- if(k < n.h) {
+		 if(length(in.k <- inds[[ ii[k] ]]))
+		     xS[[in.k]]
+	     } else xS
+	if(verbose) { cat("-> s=xS[[in.k]]="); str(s) }
 	stopifnot(length(s) == 2L, all( vapply(s, is.integer, NA) ))# checking..
 	merge[,k] <- unlist(s)
 	if(k < n.h)
@@ -140,6 +141,7 @@
 	      class = "hclust")
 }
 
+##' Auxiliary for as.hclust.dendrogram() :
 ##' add the c(i1,i2,..) list indices to each non-leaf of a dendrogram
 ##' --> allowing "random access" into the dendrogram
 .add.dendrInd <- function(x)
@@ -184,23 +186,46 @@
 
     type <- match.arg(type) ## currently only "hclust"
     stopifnot( inherits(x, "dendrogram") )
+    verbose <- getOption("verbose", 0) >= 2 # non-public
     setmid <- function(d, type) {
-	if(is.leaf(d))# no "midpoint"
-	    return(d)
-	k <- length(d)
-	if(k < 1)
-	    stop("dendrogram node with non-positive #{branches}")
-	r <- d # incl. attributes!
-	midS <- 0
-	for(j in 1L:k) {
-	    r[[j]] <- unclass(setmid(d[[j]], type))
-	    midS <- midS + .midDend(r[[j]])
-	}
-	if(!quiet && type == "hclust" && k != 2)
-	    warning("midcache() of non-binary dendrograms only partly implemented")
-	## compatible to as.dendrogram.hclust() {MM: doubtful if k > 2}
-	attr(r, "midpoint") <- (.memberDend(d[[1L]]) + midS) / 2
-	r
+	depth <- 0L
+	kk <- integer()
+	jj <- integer()
+	dd <- list()
+	repeat {
+	    if(!is.leaf(d)) {# no "midpoint" for leaf
+		k <- length(d)
+		if(k < 1)
+		    stop("dendrogram node with non-positive #{branches}")
+		depth <- depth + 1L
+		if(verbose) cat(sprintf(" depth(+)=%4d, k=%d\n", depth, k))
+		kk[depth] <- k
+		if(storage.mode(jj) != storage.mode(kk)) # (long vectors)
+		    storage.mode(jj) <- storage.mode(kk)
+		dd[[depth]] <- d
+		d <- d[[jj[depth] <- 1L]]
+		next
+	    }
+	    while(depth) {
+		k <- kk[depth]
+		j <- jj[depth]
+		r <- dd[[depth]] # incl. attributes!
+		r[[j]] <- unclass(d)
+		if(j < k) break
+		depth <- depth - 1L
+		if(verbose) cat(sprintf(" depth(-)=%4d, k=%d\n", depth, k))
+		midS <- sum(vapply(r, .midDend, 0))
+		if(!quiet && type == "hclust" && k != 2)
+		    warning("midcache() of non-binary dendrograms only partly implemented")
+		## compatible to as.dendrogram.hclust() {MM: doubtful if k > 2}
+		attr(r, "midpoint") <- (.memberDend(r[[1L]]) + midS) / 2
+		d <- r
+	    }
+	    if(!depth) break
+	    dd[[depth]] <- r
+	    d <- r[[jj[depth] <- j + 1L]]
+	}
+	d
     }
     setmid(x, type=type)
 }
@@ -533,21 +558,21 @@
     ## get the left borders limit[k] of all children k=1..K, and
     ## the handle point `x' for the edge connecting to the parent.
     inner <- !is.leaf(subtree) && x1 != x2
-    if(inner) {
-	K <- length(subtree)
-	mTop <- .memberDend(subtree)
-	limit <- integer(K)
-	xx1 <- x1
-	for(k in 1L:K) {
-	    m <- .memberDend(subtree[[k]])
-	    ##if(is.null(m)) m <- 1
-	    xx1 <- xx1 + (if(center) (x2-x1) * m/mTop else m)
-	    limit[k] <- xx1
-	}
-	limit <- c(x1, limit)
-    } else { ## leaf
-	limit <- c(x1, x2)
-    }
+    limit <- c(x1,
+	       if(inner) {
+		   K <- length(subtree)
+		   mTop <- .memberDend(subtree)
+		   limit <- integer(K)
+		   xx1 <- x1
+		   for(k in 1L:K) {
+		       m <- .memberDend(subtree[[k]])
+		       ##if(is.null(m)) m <- 1
+		       xx1 <- xx1 + (if(center) (x2-x1) * m/mTop else m)
+		       limit[k] <- xx1
+		   }
+		   limit
+	       } else ## leaf
+		   x2)
     mid <- attr(subtree, "midpoint")
     center <- center || (inner && !is.numeric(mid))
     x <- if(center) mean(c(x1,x2)) else x1 + (if(inner) mid else 0)
@@ -626,22 +651,40 @@
 	stop("'reorder.dendrogram' requires a dendrogram")
     agglo.FUN <- match.fun(agglo.FUN)
     oV <- function(x, wts) {
-	if(is.leaf(x)) {
-	    attr(x, "value") <- wts[x[1L]]
-	    return(x)
-	}
-        k <- length(x)
-        if(k == 0L) stop("invalid (length 0) node in dendrogram")
-        vals <- numeric(k)
-        for(j in 1L:k) {
-            ## insert/compute 'wts' recursively down the branches:
-            b <- oV(x[[j]], wts)
-            x[[j]] <- b
-            vals[j] <- attr(b, "value")
-        }
-        iOrd <- sort.list(vals)
-	attr(x, "value") <- agglo.FUN(vals[iOrd])
-        x[] <- x[iOrd]
+	depth <- 0L
+	kk <- jj <- integer()
+	xx <- list()
+	repeat {
+	    if(is.leaf(x))
+		attr(x, "value") <- wts[x[1L]]
+	    else {
+		k <- length(x)
+		if(k == 0L) stop("invalid (length 0) node in dendrogram")
+		depth <- depth + 1L
+		kk[depth] <- k
+		if(storage.mode(jj) != storage.mode(kk))
+		    storage.mode(jj) <- storage.mode(kk)
+		## insert/compute 'wts' recursively down the branches:
+		xx[[depth]] <- x
+		x <- x[[jj[depth] <- 1L]]
+		next
+	    }
+	    while(depth) {
+		b <- x
+		x <- xx[[depth]]
+		j <- jj[depth]
+		x[[j]] <- b
+		if(j < kk[depth]) break
+		depth <- depth - 1L
+		vals <- vapply(x, attr, numeric(1L), which="value")
+		iOrd <- sort.list(vals)
+		attr(x, "value") <- agglo.FUN(vals[iOrd])
+		x[] <- x[iOrd]
+	    }
+	    if(!depth) break
+	    xx[[depth]] <- x
+	    x <- x[[jj[depth] <- j + 1L]]
+	}
         x
     }
     midcache.dendrogram( oV(x, wts) )
@@ -885,7 +928,7 @@
     if(!is.null(ylab)) mtext(ylab, side = 4, line = margins[2L] - 1.25)
 
     if (!missing(add.expr))
-	eval(substitute(add.expr))
+	eval.parent(substitute(add.expr))
 
     ## the two dendrograms :
     par(mar = c(margins[1L], 0, 0, 0))
diff -Nru r-base-3.2.3/src/library/stats/R/density.R r-base-3.3.1/src/library/stats/R/density.R
--- r-base-3.2.3/src/library/stats/R/density.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/density.R	2016-03-16 23:02:54.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/density.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 	     give.Rkern = FALSE,
 	     n = 512, from, to, cut = 3, na.rm = FALSE, ...)
 {
-    if(!missing(...)) warning("non-matched further arguments are disregarded")
+    chkDots(...)
     if(!missing(window) && missing(kernel))
 	kernel <- window
     kernel <- match.arg(kernel)
diff -Nru r-base-3.2.3/src/library/stats/R/diffinv.R r-base-3.3.1/src/library/stats/R/diffinv.R
--- r-base-3.2.3/src/library/stats/R/diffinv.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/diffinv.R	2016-03-16 23:02:56.000000000 +0000
@@ -14,8 +14,8 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-## Copyright (C) 1997-1999  Adrian Trapletti
-## Cppyright (C) 2003-2013  R Core Team
+## Copyright     1997-1999  Adrian Trapletti
+## Cppyright (C) 2003-2015  R Core Team
 ## This version distributed under GPL (version 2 or later)
 
 diffinv <- function (x, ...) { UseMethod("diffinv") }
@@ -73,17 +73,9 @@
     ts(y, frequency = frequency(x), end = end(x))
 }
 
-toeplitz <- function (x, ...)
+toeplitz <- function (x)
 {
     if(!is.vector(x)) stop("'x' is not a vector")
-    if(!missing(...)) {
-        na <- length(list(...))
-        warning(sprintf(ngettext(na,
-                                 "extra argument %s will be disregarded",
-                                 "extra arguments %s will be disregarded"),
-                        paste(sQuote(names(list(...))), collapse = ", ")),
-		domain = NA)
-    }
     n <- length(x)
     A <- matrix(raw(), n, n)
     matrix(x[abs(col(A) - row(A)) + 1L], n, n)
diff -Nru r-base-3.2.3/src/library/stats/R/distn.R r-base-3.3.1/src/library/stats/R/distn.R
--- r-base-3.2.3/src/library/stats/R/distn.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/distn.R	2016-03-01 23:15:07.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/distn.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -251,10 +251,10 @@
 {
     if (!missing(mu)) {
 	if (!missing(prob)) stop("'prob' and 'mu' both specified")
-### FIXME: implement qnbinom_mu(...) properly
-	prob <- size/(size + mu)
+	.Call(C_qnbinom_mu, p, size, mu, lower.tail, log.p)
     }
-    .Call(C_qnbinom, p, size, prob, lower.tail, log.p)
+    else
+	.Call(C_qnbinom, p, size, prob, lower.tail, log.p)
 }
 rnbinom <- function(n, size, prob, mu)
 {
diff -Nru r-base-3.2.3/src/library/stats/R/dummy.coef.R r-base-3.3.1/src/library/stats/R/dummy.coef.R
--- r-base-3.2.3/src/library/stats/R/dummy.coef.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/dummy.coef.R	2016-02-11 23:15:07.000000000 +0000
@@ -2,7 +2,7 @@
 #  Part of the R package, https://www.R-project.org
 #
 #  Copyright (C) 1998 B. D. Ripley
-#  Copyright (C) 1998-2015 The R Core Team
+#  Copyright (C) 1998-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -29,40 +29,47 @@
     int <- attr(Terms, "intercept")
     facs <- attr(Terms, "factors")[-1, , drop=FALSE]
     Terms <- delete.response(Terms)
-    vars <- all.vars(Terms) # e.g. drops I(.), ...
-    nxl <- setNames(rep.int(1, length(vars)), vars)
-    tmp <- lengths(xl)
-    nxl[names(tmp)] <- tmp
+    mf <- object$model
+    if (is.null(mf)) mf <- model.frame(object)
+    vars <- dimnames(facs)[[1]] # names
+    xtlv <- lapply(mf[,vars, drop=FALSE], levels) ## levels
+    nxl <- pmax(lengths(xtlv), 1L)  ## (named) number of levels
     lterms <- apply(facs, 2L, function(x) prod(nxl[x > 0]))
     nl <- sum(lterms)
-    args <- setNames(vector("list", length(vars)), vars)
-    for(i in vars)
-	args[[i]] <- if(nxl[[i]] == 1) rep.int(1, nl)
-	else factor(rep.int(xl[[i]][1L], nl), levels = xl[[i]])
-    dummy <- do.call("data.frame", args)
-    pos <- 0
+    ## dummy: data frame of vars
+    args <- sapply(vars, function(i)
+	if (nxl[i] == 1) rep.int(1, nl)
+	else factor(rep.int(xtlv[[i]][1L], nl), levels = xtlv[[i]]),
+	simplify=FALSE)
+    ## dummy <- as.data.frame(args) # slightly more efficiently:
+    dummy <- do.call(data.frame, args); names(dummy) <- vars
+    pos <- 0L
     rn <- rep.int(tl, lterms)
-    rnn <- rep.int("", nl)
+    rnn <- character(nl) # all "" --- will be names of rows
     for(j in tl) {
 	i <- vars[facs[, j] > 0]
 	ifac <- i[nxl[i] > 1]
+	lt.j <- lterms[[j]]
 	if(length(ifac) == 0L) {        # quantitative factor
-	    rnn[pos+1] <- j
-	} else if(length(ifac) == 1L) {	# main effect
-	    dummy[ pos+1L:lterms[j], ifac ] <- xl[[ifac]]
-	    rnn[ pos+1L:lterms[j] ] <- as.character(xl[[ifac]])
-	} else {			# interaction
-	    tmp <- expand.grid(xl[ifac])
-	    dummy[ pos+1L:lterms[j], ifac ] <- tmp
-	    rnn[ pos+1L:lterms[j] ] <-
-		apply(as.matrix(tmp), 1L, function(x) paste(x, collapse=":"))
+	    rnn[pos+1L] <- j
+	} else {
+	    p.j <- pos + seq_len(lt.j)
+	    if(length(ifac) == 1L) {	# main effect
+		dummy[p.j, ifac] <- x.i <- xtlv[[ifac]]
+		rnn[p.j] <- as.character(x.i)
+	    } else {			# interaction
+		tmp <- expand.grid(xtlv[ifac], KEEP.OUT.ATTRS=FALSE)
+		dummy[p.j, ifac] <- tmp
+		rnn[p.j] <- apply(as.matrix(tmp), 1L, paste, collapse = ":")
+	    }
 	}
-	pos <- pos + lterms[j]
+	pos <- pos + lt.j
     }
-    ## some terms like poly(x,1) will give problems here, so allow
-    ## NaNs and set to NA afterwards.
-    mf <- model.frame(Terms, dummy, na.action=function(x)x, xlev=xl)
-    mm <- model.matrix(Terms, mf, object$contrasts, xl)
+    attr(dummy,"terms") <- attr(mf,"terms")
+    lcontr <- object$contrasts
+    lci <- vapply(dummy, is.factor, NA)
+    lcontr <- lcontr[names(lci)[lci]] ## factors with 1 level have disappeared (?)
+    mm <- model.matrix(Terms, dummy, lcontr, xl)
     if(anyNA(mm)) {
         warning("some terms will have NAs due to the limits of the method")
         mm[is.na(mm)] <- NA
@@ -71,115 +78,214 @@
     if(!use.na) coef[is.na(coef)] <- 0
     asgn <- attr(mm,"assign")
     res <- setNames(vector("list", length(tl)), tl)
-    for(j in seq_along(tl)) {
-	keep <- asgn == j
-	ij <- rn == tl[j]
-	res[[j]] <-
-	    setNames(drop(mm[ij, keep, drop=FALSE] %*% coef[keep]), rnn[ij])
-    }
-    if(int > 0) {
-	res <- c(list("(Intercept)" = coef[int]), res)
+    if(isM <- is.matrix(coef)) { # isM is true for "mlm", multivariate lm (incl manova)
+	for(j in seq_along(tl)) {
+	    keep <- which(asgn == j)
+	    cf <- coef[keep, , drop=FALSE]
+	    ij <- rn == tl[j]
+	    cf <-
+		if (any(na <- is.na(cf))) {
+		    if(ncol(cf) >= 2)
+			stop("multivariate case with missing coefficients is not yet implemented")
+		    ## else: 1 column --> treat 'cf' as vector
+		    rj <- t( mm[ij, keep[!na], drop=FALSE] %*% cf[!na])
+		    rj[apply(mm[ij, keep[ na], drop=FALSE] != 0, 1L, any)] <- NA
+		    rj
+		} else
+		    t(mm[ij, keep, drop = FALSE] %*% cf)
+	    dimnames(cf) <- list(colnames(coef), rnn[ij])
+	    res[[j]] <- cf
+	}
+    } else { ## regular univariate lm case
+	for(j in seq_along(tl)) {
+	    keep <- which(asgn == j)
+	    cf <- coef[keep]
+	    ij <- rn == tl[j]
+	    res[[j]] <-
+		if (any(na <- is.na(cf))) {
+		    rj <- setNames(drop(mm[ij, keep[!na], drop = FALSE] %*%
+					cf[!na]), rnn[ij])
+		    rj[apply(mm[ij, keep[na], drop=FALSE] != 0, 1L, any)] <- NA
+		    rj
+		} else
+		    setNames(drop(mm[ij, keep, drop = FALSE] %*% cf), rnn[ij])
+	}
     }
-    class(res) <- "dummy_coef"
-    res
+    if(int > 0)
+	res <- c(list("(Intercept)" = if(isM) coef[int, ] else coef[int]), res)
+    structure(res, class = "dummy_coef",  matrix = isM)
 }
 
+## NB: This is very much duplication from dummy.coef.lm -- keep in sync !
 dummy.coef.aovlist <- function(object, use.na = FALSE, ...)
 {
+    xl <- attr(object, "xlevels")
+    if(!length(xl)) # no factors in model
+	return(as.list(coef(object)))
     Terms <- terms(object, specials="Error")
     err <- attr(Terms,"specials")$Error - 1
     tl <- attr(Terms, "term.labels")[-err]
     int <- attr(Terms, "intercept")
     facs <- attr(Terms, "factors")[-c(1,1+err), -err, drop=FALSE]
-    vars <- rownames(facs)
-    xl <- attr(object, "xlevels")
-    if(!length(xl)) {			# no factors in model
-	return(as.list(coef(object)))
-    }
-    nxl <- setNames(rep.int(1, length(vars)), vars)
-    tmp <- lengths(xl)
-    nxl[names(tmp)] <- tmp
+    stopifnot(length(names(object)) == (N <- length(object)))
+    mf <- object$model
+    if (is.null(mf)) mf <- model.frame(object)
+    vars <- dimnames(facs)[[1]] # names
+    xtlv <- lapply(mf[,vars, drop=FALSE], levels) ## levels
+    nxl <- pmax(lengths(xtlv), 1L)  ## (named) number of levels
     lterms <- apply(facs, 2L, function(x) prod(nxl[x > 0]))
     nl <- sum(lterms)
     args <- setNames(vector("list", length(vars)), vars)
     for(i in vars)
 	args[[i]] <- if(nxl[[i]] == 1) rep.int(1, nl)
-	else factor(rep.int(xl[[i]][1L], nl), levels = xl[[i]])
-    dummy <- do.call("data.frame", args)
-    pos <- 0
+                     else factor(rep.int(xl[[i]][1L], nl), levels = xl[[i]])
+    ## dummy <- as.data.frame(args) # slightly more efficiently:
+    dummy <- do.call(data.frame, args); names(dummy) <- vars
+    pos <- 0L
     rn <- rep.int(tl, lterms)
-    rnn <- rep.int("", nl)
+    rnn <- character(nl) # all "" --- will be names of rows
     for(j in tl) {
 	i <- vars[facs[, j] > 0]
 	ifac <- i[nxl[i] > 1]
+	lt.j <- lterms[[j]]
 	if(length(ifac) == 0L) {        # quantitative factor
-	    rnn[pos + 1] <- j
-	} else if(length(ifac) == 1L) {	# main effect
-	    dummy[ pos+1L:lterms[j], ifac ] <- xl[[ifac]]
-	    rnn[ pos+1L:lterms[j] ] <- as.character(xl[[ifac]])
-	} else {			# interaction
-	    tmp <- expand.grid(xl[ifac])
-	    dummy[ pos+1L:lterms[j], ifac ] <- tmp
-	    rnn[ pos+1L:lterms[j] ] <-
-		apply(as.matrix(tmp), 1L, function(x) paste(x, collapse=":"))
-	}
-	pos <- pos + lterms[j]
+	    rnn[pos+1L] <- j
+	} else {
+	    p.j <- pos + seq_len(lt.j)
+	    if(length(ifac) == 1L) {	# main effect
+		dummy[p.j, ifac] <- x.i <- xtlv[[ifac]]
+		rnn[p.j] <- as.character(x.i)
+	    } else {			# interaction
+		tmp <- expand.grid(xtlv[ifac], KEEP.OUT.ATTRS=FALSE)
+		dummy[p.j, ifac] <- tmp
+		rnn[p.j] <- apply(as.matrix(tmp), 1L, paste, collapse = ":")
+	    }
+        }
+	pos <- pos + lt.j
     }
-    form <- paste("~", paste(tl, collapse = " + "))
-    if (!int) form <- paste(form, "- 1")
-    mm <- model.matrix(terms(formula(form)), dummy,
-		       attr(object, "contrasts"), xl)
+    form <- paste0("~", paste0(tl, collapse = " + "), if(!int) "- 1")
+    lcontr <- object$contrasts
+    lci <- vapply(dummy, is.factor, NA)
+    lcontr <- lcontr[names(lci)[lci]] ## factors with 1 level have disappeared
+    mm <- model.matrix(terms(formula(form)), dummy, lcontr, xl)
     tl <- c("(Intercept)", tl)
-    res <- setNames(vector("list", length(object)), names(object))
+    res <- setNames(vector("list", N), names(object))
     allasgn <- attr(mm, "assign")
     for(i in names(object)) {
 	coef <- object[[i]]$coefficients
 	if(!use.na) coef[is.na(coef)] <- 0
 	asgn <- object[[i]]$assign
 	uasgn <- unique(asgn)
-	tll <- tl[1 + uasgn]
+	tll <- tl[1L + uasgn]
 	mod <- setNames(vector("list", length(tll)), tll)
-	for(j in uasgn) {
-	    mod[[tl[1+j]]] <-
-		if(j == 0) {
-		    structure(coef[asgn == j], names="(Intercept)")
-		} else {
-		    ij <- rn == tl[1+j]
-		    setNames(drop(mm[ij, allasgn == j, drop=FALSE] %*%
-				  coef[asgn == j]),
-			     rnn[ij])
-		}
+### FIXME --- npk.aovE --- fails : "N"  gets  length 0 !!!!
+	if((isM <- is.matrix(coef))) { # "mlm", multivariate lm (incl manova)
+	    for(j in uasgn) {
+		keep <- which(asgn == j)
+		cf <- coef[keep, , drop=FALSE]
+		ij <- rn == tl[j]
+		cf <-
+		    if (any(na <- is.na(cf))) {
+			if(ncol(cf) >= 2)
+			    stop("multivariate case with missing coefficients is not yet implemented")
+			if(j == 0) {
+			    structure(cf[!na], names="(Intercept)")
+			} else {
+			    ## else: 1 column --> treat 'cf' as vector
+			    rj <- t( mm[ij, keep[!na], drop=FALSE] %*% cf[!na])
+			    rj[apply(mm[ij, keep[ na], drop=FALSE] != 0, 1L, any)] <- NA
+			    rj
+			}
+		    } else { # no NA's
+			if(j == 0)
+			    structure(cf, names="(Intercept)")
+			else
+			    t(mm[ij, keep, drop=FALSE] %*% cf)
+		    }
+		dimnames(cf) <- list(colnames(coef), rnn[ij])
+		mod[[tl[j+1L]]] <- cf
+	    }
+	} else { ## regular univariate lm case
+	    for(j in uasgn) {
+		keep <- which(asgn == j)
+		cf <- coef[keep]
+		mod[[tl[j+1L]]] <-
+		    if(j == 0) {
+			structure(cf, names="(Intercept)")
+		    } else {
+			ij <- rn == tl[j+1L]
+			if (any(na <- is.na(cf))) {
+			    rj <- setNames(drop(mm[ij, keep[!na], drop = FALSE] %*%
+						cf[!na]), rnn[ij])
+			    rj[apply(mm[ij, keep[na], drop=FALSE] != 0, 1L, any)] <- NA
+			    rj
+			} else
+			    setNames(drop(mm[ij, allasgn == j, drop=FALSE] %*% cf),
+				     rnn[ij])
+		    }
+	    }
 	}
-	res[[i]] <- mod
-    }
-    class(res) <- "dummy_coef_list"
-    res
+	res[[i]] <- structure(mod, matrix = isM)
+    } ## for( i )
+
+    structure(res, class = "dummy_coef_list")
 }
 
 print.dummy_coef <- function(x, ..., title)
 {
     terms <- names(x)
     n <- length(x)
-    nm <- max(lengths(x))
-    ans <- matrix("", 2L*n, nm)
-    rn <- rep.int("", 2L*n)
-    line <- 0
-    for (j in seq_len(n)) {
-	this <- x[[j]]
-	n1 <- length(this)
-	if(n1 > 1) {
-	    line <- line + 2
-	    ans[line-1, 1L:n1] <- names(this)
-	    ans[line, 1L:n1] <- format(this, ...)
-	    rn[line-1] <- paste0(terms[j], ":   ")
-	} else {
-	    line <- line + 1
-	    ans[line, 1L:n1] <- format(this, ...)
-	    rn[line] <- paste0(terms[j], ":   ")
+    isM <- attr(x, "matrix")
+    nr.x <- if(isM) vapply(x, NROW, 1L) else lengths(x)
+    line <- 0L # 'lineEnd'
+    if(isM) { # "mlm" - multivariate case
+	ansnrow <- sum(1L + nr.x)
+	addcol <- max(nr.x) - 1L
+	nm <- addcol + if(isM) max(vapply(x, NCOL, 1L)) else 1L
+	ans <- matrix("", ansnrow , nm)
+	rn <- character(ansnrow)
+	for (j in seq_len(n)) {
+	    this <- as.matrix(x[[j]])
+	    nr1 <- nrow(this)
+	    nc1 <- ncol(this)
+	    dn <- dimnames(this)
+	    dimnames(this) <-
+		list(if(is.null(dn[[1]])) character(nr1) else dn[[1]],
+		     if(is.null(dn[[2]])) character(nc1) else dn[[2]])
+	    if(nc1 > 1L) {
+		lin0 <- line + 2L
+		line <- line + nr1 + 1L
+		ans[lin0 - 1L, addcol + (1L:nc1)] <- colnames(this)
+		ans[lin0:line, addcol + (1L:nc1)] <- format(this, ...)
+		rn[lin0 - 1L] <- paste0(terms[j], ":   ")
+	    } else {
+		lin0 <- line + 1L
+		line <- line + nr1
+		ans[lin0:line, addcol + 1L] <- format(this, ...)
+		rn[lin0] <- paste0(terms[j], ":   ")
+	    }
+	    if(addcol > 0) ans[lin0:line, addcol] <- rownames(this)
+	}
+    } else { ## regular univariate lm case
+	nm <- max(nr.x)
+	ans <- matrix("", 2L*n, nm)
+	rn <- character(2L*n) # ""
+	for (j in seq_len(n)) {
+	    this <- x[[j]]
+	    n1 <- length(this)
+	    if(n1 > 1) {
+		line <- line + 2L
+		ans[line-1L, 1L:n1] <- names(this)
+		ans[line,    1L:n1] <- format(this, ...)
+		rn [line-1L] <- paste0(terms[j], ":   ")
+	    } else {
+		line <- line + 1L
+		ans[line, 1L:n1] <- format(this, ...)
+		rn[line] <- paste0(terms[j], ":   ")
+	    }
 	}
     }
-    rownames(ans) <- rn
-    colnames(ans) <- rep.int("", nm)
+    dimnames(ans) <- list(rn, character(nm))
     cat(if(missing(title)) "Full coefficients are" else title, "\n")
     print(ans[1L:line, , drop=FALSE], quote=FALSE, right=TRUE)
     invisible(x)
diff -Nru r-base-3.2.3/src/library/stats/R/factanal.R r-base-3.3.1/src/library/stats/R/factanal.R
--- r-base-3.2.3/src/library/stats/R/factanal.R	2015-08-25 22:16:03.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/factanal.R	2016-03-16 23:02:57.000000000 +0000
@@ -250,7 +250,7 @@
     cat("\nLoadings:\n")
     fx <- setNames(format(round(Lambda, digits)), NULL)
     nc <- nchar(fx[1L], type="c")
-    fx[abs(Lambda) < cutoff] <- paste(rep(" ", nc), collapse = "")
+    fx[abs(Lambda) < cutoff] <- strrep(" ", nc)
     print(fx, quote = FALSE, ...)
     vx <- colSums(x^2)
     varex <- rbind("SS loadings" = vx)
diff -Nru r-base-3.2.3/src/library/stats/R/family.R r-base-3.3.1/src/library/stats/R/family.R
--- r-base-3.2.3/src/library/stats/R/family.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/family.R	2016-01-29 23:15:06.000000000 +0000
@@ -532,9 +532,8 @@
     })
     validmu <- function(mu) TRUE
     simfun <- function(object, nsim) {
-        if(is.null(tryCatch(loadNamespace("SuppDists"),
-                            error = function(e) NULL)))
-            stop("need CRAN package 'SuppDists' for the 'inverse.gaussian' family")
+        if(!requireNamespace("SuppDists", quietly = TRUE))
+            stop("need CRAN package 'SuppDists' for simulation from the 'inverse.gaussian' family")
         wts <- object$prior.weights
         if (any(wts != 1)) message("using weights as inverse variances")
         ftd <- fitted(object)
diff -Nru r-base-3.2.3/src/library/stats/R/ftable.R r-base-3.3.1/src/library/stats/R/ftable.R
--- r-base-3.2.3/src/library/stats/R/ftable.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/ftable.R	2016-03-16 23:02:55.000000000 +0000
@@ -288,7 +288,7 @@
         on.exit({close(file);unlink(tmpf)}, add=TRUE)
     }
 
-    z <- utils::count.fields(file, sep, quote, skip)
+    z <- count.fields(file, sep, quote, skip)
     n.row.vars <- z[max(which(z == max(z)))] - z[length(z)] + 1
 
     seek(file, where = 0)
diff -Nru r-base-3.2.3/src/library/stats/R/glm.R r-base-3.3.1/src/library/stats/R/glm.R
--- r-base-3.2.3/src/library/stats/R/glm.R	2015-08-25 22:16:03.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/glm.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/glm.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -190,7 +190,7 @@
         if (!validmu(mu))
             stop("invalid fitted means in empty model", call. = FALSE)
         dev <- sum(dev.resids(y, mu, weights))
-        w <- ((weights * mu.eta(eta)^2)/variance(mu))^0.5
+        w <- sqrt((weights * mu.eta(eta)^2)/variance(mu))
         residuals <- (y - mu)/mu.eta(eta)
         good <- rep_len(TRUE, length(residuals))
         boundary <- conv <- TRUE
diff -Nru r-base-3.2.3/src/library/stats/R/hclust.R r-base-3.3.1/src/library/stats/R/hclust.R
--- r-base-3.2.3/src/library/stats/R/hclust.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/hclust.R	2016-04-09 22:15:07.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/hclust.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -263,7 +263,7 @@
     lens <- sapply(children, attr, "Size")
     m <- matrix(attr(x, "height"), sum(lens), sum(lens))
     ## This seems a bit slower:
-    ##    inds <- split(seq(length = sum(lens)),
+    ##    inds <- split(seq(length.out = sum(lens)),
     ##                  rep.int(seq_along(lens), lens))
     ##    for(i in seq_along(inds))
     ##         m[inds[[i]], inds[[i]]] <- as.matrix(children[[i]])
diff -Nru r-base-3.2.3/src/library/stats/R/identify.hclust.R r-base-3.3.1/src/library/stats/R/identify.hclust.R
--- r-base-3.2.3/src/library/stats/R/identify.hclust.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/identify.hclust.R	2016-03-16 23:02:56.000000000 +0000
@@ -78,11 +78,11 @@
     retval <- list()
     oldk <- NULL
     oldx <- NULL
-    DEV.x <- grDevices::dev.cur()
+    DEV.x <- dev.cur()
 
     for(n in 1L:N){
 
-        grDevices::dev.set(DEV.x)
+        dev.set(DEV.x)
         X <- locator(1)
         if(is.null(X))
             break
@@ -98,7 +98,7 @@
                                           border = "red"))
         if(!is.null(FUN)){
             if(!is.null(DEV.FUN)){
-                grDevices::dev.set(DEV.FUN)
+                dev.set(DEV.FUN)
             }
             retval[[n]] <- FUN(retval[[n]], ...)
         }
@@ -106,6 +106,6 @@
         oldx <- X$x
         oldk <- k
     }
-    grDevices::dev.set(DEV.x)
+    dev.set(DEV.x)
     invisible(retval)
 }
diff -Nru r-base-3.2.3/src/library/stats/R/kmeans.R r-base-3.3.1/src/library/stats/R/kmeans.R
--- r-base-3.2.3/src/library/stats/R/kmeans.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/kmeans.R	2015-12-10 23:15:14.000000000 +0000
@@ -93,7 +93,6 @@
                     "MacQueen" = 3L)
     storage.mode(x) <- "double"
     if(length(centers) == 1L) {
-	if (centers == 1) nmeth <- 3L
 	k <- centers
         ## we need to avoid duplicates here
         if(nstart == 1L)
@@ -116,6 +115,7 @@
     }
     k <- as.integer(k)
     if(is.na(k)) stop("'invalid value of 'k'")
+    if (k == 1L) nmeth <- 3L # Hartigan-Wong, (Fortran) needs k > 1
     iter.max <- as.integer(iter.max)
     if(is.na(iter.max) || iter.max < 1L) stop("'iter.max' must be positive")
     if(ncol(x) != ncol(centers))
diff -Nru r-base-3.2.3/src/library/stats/R/lag.plot.R r-base-3.3.1/src/library/stats/R/lag.plot.R
--- r-base-3.2.3/src/library/stats/R/lag.plot.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/lag.plot.R	2016-03-16 23:02:54.000000000 +0000
@@ -53,7 +53,7 @@
     if(is.null(layout))
         layout <-
             if(prod(pmf <- par("mfrow")) >= tot.lags) pmf
-            else grDevices::n2mfrow(tot.lags)
+            else n2mfrow(tot.lags)
 
     ## Plotting
     ## avoid resetting mfrow and using outer margins for just one plot
diff -Nru r-base-3.2.3/src/library/stats/R/lm.R r-base-3.3.1/src/library/stats/R/lm.R
--- r-base-3.2.3/src/library/stats/R/lm.R	2015-08-25 22:16:03.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/lm.R	2016-03-16 23:02:57.000000000 +0000
@@ -110,13 +110,7 @@
     if(method != "qr")
 	warning(gettextf("method = '%s' is not supported. Using 'qr'", method),
                 domain = NA)
-    dots <- list(...)
-    if(length(dots) > 1L)
-	warning("extra arguments ", paste(sQuote(names(dots)), sep=", "),
-                " are disregarded.", domain = NA)
-    else if(length(dots) == 1L)
-	warning("extra argument ", sQuote(names(dots)),
-                " is disregarded.", domain = NA)
+    chkDots(...)
     z <- .Call(C_Cdqrls, x, y, tol, FALSE)
     if(!singular.ok && z$rank < p) stop("singular fit encountered")
     coef <- z$coefficients
@@ -169,13 +163,7 @@
     if(method != "qr")
 	warning(gettextf("method = '%s' is not supported. Using 'qr'", method),
                 domain = NA)
-    dots <- list(...)
-    if(length(dots) > 1L)
-	warning("extra arguments ", paste(sQuote(names(dots)), sep=", "),
-                " are disregarded.", domain = NA)
-    else if(length(dots) == 1L)
-	warning("extra argument ", sQuote(names(dots)),
-                " is disregarded.", domain = NA)
+    chkDots(...)
     x.asgn <- attr(x, "assign")# save
     zero.weights <- any(w == 0)
     if (zero.weights) {
@@ -764,10 +752,6 @@
 	asgn <- split(order(aa), aaa)
 	if (hasintercept) {
 	    asgn$"(Intercept)" <- NULL
-	    if(!mmDone) {
-                mm <- model.matrix(object)
-                mmDone <- TRUE
-            }
 	    avx <- colMeans(mm)
 	    termsconst <- sum(avx[piv] * beta[piv])
 	}
diff -Nru r-base-3.2.3/src/library/stats/R/lsfit.R r-base-3.3.1/src/library/stats/R/lsfit.R
--- r-base-3.2.3/src/library/stats/R/lsfit.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/lsfit.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/lsfit.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@
 	if(any(wt < 0)) stop("negative weights not allowed")
 	if(nwts != nry)
             stop(gettextf("number of weights = %d should equal %d (number of responses)", nwts, nry), domain = NA)
-	wtmult <- wt^0.5
+	wtmult <- sqrt(wt)
 	if(any(wt == 0)) {
 	    xzero <- as.matrix(x)[wt == 0, ]
 	    yzero <- as.matrix(y)[wt == 0, ]
@@ -167,7 +167,7 @@
     if( !is.null(ls.out$wt) ) {
 	if( any(ls.out$wt[good] == 0) )
 	    warning("observations with 0 weight not used in calculating standard deviation")
-	resids <- resids * ls.out$wt[good]^0.5
+	resids <- resids * sqrt(ls.out$wt[good])
     }
 
     ## initialize
@@ -186,12 +186,12 @@
 
     ## calculate diagnostics
 
-    stddev <- (colSums(as.matrix(resids^2))/(n - p))^0.5
+    stddev <- sqrt(colSums(as.matrix(resids^2))/(n - p))
     stddevmat <- matrix(stddev, nrow=sum(good), ncol=ncol(resids), byrow=TRUE)
-    stdres[good, ] <- resids/((1-hatdiag[good])^0.5 * stddevmat)
-    studres[good, ] <- (stdres[good, ]*stddevmat)/
-        (((n-p)*stddevmat^2 - resids^2/(1-hatdiag[good]))/(n-p-1))^0.5
-    dfits[good, ] <- (hatdiag[good]/(1-hatdiag[good]))^0.5 * studres[good, ]
+    stdres[good, ] <- resids/(sqrt(1-hatdiag[good]) * stddevmat)
+    studres[good, ] <- (stdres[good, ]*stddevmat) /
+        sqrt(((n-p)*stddevmat^2 - resids^2/(1-hatdiag[good]))/(n-p-1))
+    dfits[good, ] <- sqrt(hatdiag[good]/(1-hatdiag[good])) * studres[good, ]
     Cooks[good, ] <- ((stdres[good, ]^2 * hatdiag[good])/p)/(1-hatdiag[good])
     if(ncol(resids)==1 && is.null(yname)) {
 	stdres <- as.vector(stdres)
@@ -214,8 +214,8 @@
 
     ## calculate correlation matrix
 
-    cormat <- covmat.scaled/
-	(outer(diag(covmat.scaled), diag(covmat.scaled))^0.5)
+    cormat <- covmat.scaled /
+	sqrt(outer(diag(covmat.scaled), diag(covmat.scaled)))
 
     ## calculate standard error
 
@@ -236,7 +236,7 @@
     if( !is.null(ls.out$wt) ) {
 	if(any(ls.out$wt == 0))
 	    warning("observations with 0 weights not used")
-	resids <- resids * ls.out$wt^0.5
+	resids <- resids * sqrt(ls.out$wt)
     }
     n <- apply(resids, 2L, length) - colSums(is.na(resids))
     lsqr <- ls.out$qr
diff -Nru r-base-3.2.3/src/library/stats/R/manova.R r-base-3.3.1/src/library/stats/R/manova.R
--- r-base-3.2.3/src/library/stats/R/manova.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/manova.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/manova.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
     nmeffect <- c("(Intercept)", attr(object$terms, "term.labels"))
     resid <- as.matrix(object$residuals)
     wt <- object$weights
-    if (!is.null(wt)) resid <- resid * wt^0.5
+    if (!is.null(wt)) resid <- resid * sqrt(wt)
     nresp <- NCOL(resid)
     if(nresp <= 1) stop("need multiple responses")
 
diff -Nru r-base-3.2.3/src/library/stats/R/models.R r-base-3.3.1/src/library/stats/R/models.R
--- r-base-3.2.3/src/library/stats/R/models.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/models.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/models.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #  https://www.R-project.org/Licenses/
 
 formula <- function(x, ...) UseMethod("formula")
-formula.default <- function (x, env = parent.frame(), ...)
+formula.default <- function (x = NULL, env = parent.frame(), ...)
 {
     notAtomic <- !is.atomic(x)
     notnull <- function(z) notAtomic && !is.null(z)
@@ -82,7 +82,7 @@
 `[.formula` <- function(x,i) {
     ans <- NextMethod("[")
     ## as.character gives a vector.
-    if(as.character(ans[[1L]])[1L] == "~") {
+    if(length(ans) == 0L || as.character(ans[[1L]])[1L] == "~") {
 	class(ans) <- "formula"
         environment(ans) <- environment(x)
     }
diff -Nru r-base-3.2.3/src/library/stats/R/plot.lm.R r-base-3.3.1/src/library/stats/R/plot.lm.R
--- r-base-3.2.3/src/library/stats/R/plot.lm.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/plot.lm.R	2016-03-16 23:02:54.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/plot.lm.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -172,7 +172,7 @@
 	    text.id(yhn0[show.rs], sqrtabsr[show.rs], show.rs)
         dev.flush()
     }
-    if (show[4L]) {
+    if (show[4L]) { ## Cook's Distances
 	if(id.n > 0) {
 	    show.r <- order(-cook)[iid]# index of largest 'id.n' ones
 	    ymx <- cook[show.r[1L]] * 1.075
diff -Nru r-base-3.2.3/src/library/stats/R/ppoints.R r-base-3.3.1/src/library/stats/R/ppoints.R
--- r-base-3.2.3/src/library/stats/R/ppoints.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/ppoints.R	2016-03-16 23:02:56.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/ppoints.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-ppoints <- function (n, a = ifelse(n <= 10, 3/8, 1/2))
+ppoints <- function (n, a = if(n <= 10) 3/8 else 1/2)
 {
     if(length(n) > 1L) n <- length(n)
     if(n > 0) (1L:n - a)/(n + 1-2*a) else numeric()
diff -Nru r-base-3.2.3/src/library/stats/R/prcomp.R r-base-3.3.1/src/library/stats/R/prcomp.R
--- r-base-3.2.3/src/library/stats/R/prcomp.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/prcomp.R	2016-03-16 23:02:56.000000000 +0000
@@ -21,6 +21,7 @@
 prcomp.default <-
     function(x, retx = TRUE, center = TRUE, scale. = FALSE, tol = NULL, ...)
 {
+    chkDots(...)
     x <- as.matrix(x)
     x <- scale(x, center = center, scale = scale.)
     cen <- attr(x, "scaled:center")
@@ -95,6 +96,7 @@
 
 summary.prcomp <- function(object, ...)
 {
+    chkDots(...)
     vars <- object$sdev^2
     vars <- vars/sum(vars)
     importance <- rbind("Standard deviation" = object$sdev,
@@ -116,6 +118,7 @@
 
 predict.prcomp <- function(object, newdata, ...)
 {
+    chkDots(...)
     if (missing(newdata)) {
         if(!is.null(object$x)) return(object$x)
         else stop("no scores are available: refit with 'retx=TRUE'")
diff -Nru r-base-3.2.3/src/library/stats/R/princomp-add.R r-base-3.3.1/src/library/stats/R/princomp-add.R
--- r-base-3.2.3/src/library/stats/R/princomp-add.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/princomp-add.R	2016-03-16 23:02:56.000000000 +0000
@@ -57,7 +57,7 @@
         cat("\nLoadings:\n")
         cx <- format(round(x$loadings, digits = digits))
         cx[abs(x$loadings) < cutoff] <-
-            paste(rep(" ", nchar(cx[1,1], type="w")), collapse="")
+            strrep(" ", nchar(cx[1,1], type="w"))
         print(cx, quote = FALSE, ...)
     }
     invisible(x)
diff -Nru r-base-3.2.3/src/library/stats/R/princomp.R r-base-3.3.1/src/library/stats/R/princomp.R
--- r-base-3.2.3/src/library/stats/R/princomp.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/princomp.R	2016-03-16 23:02:55.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/princomp.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@
     function(x, cor = FALSE, scores = TRUE, covmat = NULL,
              subset = rep_len(TRUE, nrow(as.matrix(x))), ...)
 {
+    chkDots(...)
     cl <- match.call()
     cl[[1L]] <- as.name("princomp")
     z <- if(!missing(x)) as.matrix(x)[subset, , drop = FALSE]
diff -Nru r-base-3.2.3/src/library/stats/R/runmed.R r-base-3.3.1/src/library/stats/R/runmed.R
--- r-base-3.2.3/src/library/stats/R/runmed.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/runmed.R	2016-05-17 22:15:07.000000000 +0000
@@ -109,7 +109,7 @@
         if (k >= 3L) {
             for (i in 3:k) {
                 j <- 2L*i - 1L
-                sm  [i]   <- med.odd( y [1L:j] ,     j) #- left border
+                sm  [i]    <- med.odd( y[1L:j]      , j) #- left border
                 sm[n-i+1L] <- med.odd( y[(n+1L-j):n], j) #- right border
             }
         }
@@ -118,6 +118,6 @@
     ##--- For the very first and last pt.:  Use Tukey's end-point rule: ---
     ## Ysm[1L]:= Median(Ysm[2L],X1,Z_0), where Z_0 is extrapol. from Ysm[2L],Ysm[3L]
     sm[1L] <- med3(y[1L], sm [2L] , 3*sm [2L]  - 2*sm [3L])
-    sm[n] <- med3(y[n], sm[n-1L], 3*sm[n-1L] - 2*sm[n-2L])
+    sm[n]  <- med3(y[n],  sm[n-1L], 3*sm[n-1L] - 2*sm[n-2L])
     sm
 }
diff -Nru r-base-3.2.3/src/library/stats/R/smooth.R r-base-3.3.1/src/library/stats/R/smooth.R
--- r-base-3.2.3/src/library/stats/R/smooth.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/smooth.R	2016-02-10 23:15:07.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/smooth.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -21,16 +21,15 @@
 
 smooth <- function(x, kind = c("3RS3R", "3RSS", "3RSR", "3R", "3", "S"),
                    twiceit = FALSE,
-                   endrule = "Tukey", do.ends = FALSE)
+                   endrule = c("Tukey", "copy"), do.ends = FALSE)
 {
     if(!is.numeric(x)) stop("attempt to smooth non-numeric values")
     if(anyNA(x)) stop("attempt to smooth NA values")
+    endrule <- match.arg(endrule)
     rules <- c("copy","Tukey")#- exact order matters!
     if(is.na(iend <- pmatch(endrule, rules))) stop("invalid 'endrule' argument")
-    n <- as.integer(length(x))
-    if(is.na(n)) stop("invalid length(x)")
     kind <- match.arg(kind)
-    if(substr(kind ,1L, 3L) == "3RS" && !do.ends) iend <- -iend
+    if(substr(kind, 1L, 3L) == "3RS" && !do.ends) iend <- -iend
     else if(kind == "S") iend <- as.logical(do.ends)
     type <- match(kind, c("3RS3R", "3RSS", "3RSR", "3R", "3", "S"))
     smo <- .Call(C_Rsm, as.double(x), type, iend)
diff -Nru r-base-3.2.3/src/library/stats/R/smspline.R r-base-3.3.1/src/library/stats/R/smspline.R
--- r-base-3.2.3/src/library/stats/R/smspline.R	2015-08-25 22:16:01.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/smspline.R	2016-04-19 22:15:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/stats/R/smspline.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -138,11 +138,9 @@
     dofoff <- df.offset
     if(!missing(df)) { # not when cv was NA
 	if(df > 1 && df <= nx) {
-	    if(!missing(cv))
-		warning("specified both 'df' and 'cv'; will disregard the latter")
 	    icrit <- 3L
 	    dofoff <- df
-	} else warning("you must supply 1 < df <= n,  n = #{unique x} = ", nx)
+	} else warning("not using invalid df; must have 1 < df <= n := #{unique x} = ", nx)
     }
     iparms <- c(icrit=icrit, ispar=ispar, iter=as.integer(contr.sp$maxit))
 
@@ -171,8 +169,11 @@
 		    ldnk = 1L,
 		    ier = integer(1L)
 		    )[ans.names]
+
+### FIXME only was needed, when we had  DUP=FALSE
+    stopifnot(identical(wbar, tmp[,1]))
     ## now we have clobbered wbar, recompute it.
-    wbar <- tmp[, 1]
+    ## wbar <- tmp[, 1]
 
     if(is.na(cv)) lev <- df <- NA
     else {
diff -Nru r-base-3.2.3/src/library/stats/R/ts.R r-base-3.3.1/src/library/stats/R/ts.R
--- r-base-3.2.3/src/library/stats/R/ts.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/ts.R	2016-03-23 23:15:12.000000000 +0000
@@ -90,10 +90,13 @@
 {
     cl <- oldClass(x)
     attr(x, "tsp") <- value # does error-checking internally
-    if (inherits(x, "ts") && is.null(value))
-        class(x) <- if(!identical(cl,"ts")) cl["ts" != cl]
-    else if (inherits(x, "mts") && is.null(value))
-        class(x) <- if(!identical(cl,"mts")) cl["mts" != cl]
+    if (is.null(value)) {
+        if (inherits(x, "ts"))
+	    cl <- cl["ts" != cl]
+        if (inherits(x, "mts"))
+	    cl <- cl["mts" != cl]
+        class(x) <- cl
+    }
     x
 }
 
@@ -495,10 +498,10 @@
 		do.xax <- i %% nr == 0 || i == nser
 		if(axes) {
 		    axis(y.side, xpd = NA, cex.axis = cex.axis,
-                         col.axis = col.axis, font.axis = font.axis)
+			 col.axis = col.axis, font.axis = font.axis, ...)
 		    if(do.xax)
 			axis(1, xpd = NA, cex.axis = cex.axis,
-                             col.axis = col.axis, font.axis = font.axis)
+			     col.axis = col.axis, font.axis = font.axis, ...)
 		}
 		if(ann) {
 		    mtext(nm[i], y.side, line=3, cex=cex.lab, col=col.lab,
diff -Nru r-base-3.2.3/src/library/stats/R/vcov.R r-base-3.3.1/src/library/stats/R/vcov.R
--- r-base-3.2.3/src/library/stats/R/vcov.R	2015-08-25 22:16:02.000000000 +0000
+++ r-base-3.3.1/src/library/stats/R/vcov.R	2016-03-16 23:02:55.000000000 +0000
@@ -43,3 +43,16 @@
 
 ## gls and lme methods moved to nlme in 2.6.0
 
+
+### "The" sigma in lm/nls - "like" models:
+
+sigma <- function(object, ...) UseMethod("sigma")
+
+## works whenever deviance(), nobs() and coef() do fine:
+sigma.default <- function (object, use.fallback=TRUE, ...)
+    sqrt(deviance(object, ...) /
+             (nobs(object, use.fallback=use.fallback) - length(coef(object))))
+
+sigma.mlm <- function (object, ...)
+    sqrt(colSums(object$residuals^2) / object$df.residual)
+
diff -Nru r-base-3.2.3/src/library/stats/src/ansari.c r-base-3.3.1/src/library/stats/src/ansari.c
--- r-base-3.2.3/src/library/stats/src/ansari.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/ansari.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999-2012  The R Core Team
+ *  Copyright (C) 1999-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,7 +22,9 @@
    Compute the exact distribution of the Ansari-Bradley test statistic.
    */
 
+#include <string.h>
 #include <R.h>
+#include <math.h>  // for floor
 #include <Rmath.h>		/* uses choose() */
 #include "stats.h"
 
diff -Nru r-base-3.2.3/src/library/stats/src/approx.c r-base-3.3.1/src/library/stats/src/approx.c
--- r-base-3.2.3/src/library/stats/src/approx.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/approx.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996   Robert Gentleman and Ross Ihaka
- *		  1997-2014   The R Core Team
+ *		  1997-2016   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -83,13 +83,13 @@
     if(Meth->kind == 1) /* linear */
 	return y[i] + (y[j] - y[i]) * ((v - x[i])/(x[j] - x[i]));
     else /* 2 : constant */
-	return (Meth->f1 != 0.0 ? y[i] * Meth->f1 : 0.0) 
+	return (Meth->f1 != 0.0 ? y[i] * Meth->f1 : 0.0)
 	     + (Meth->f2 != 0.0 ? y[j] * Meth->f2 : 0.0);
 }/* approx1() */
 
 
 /* Testing done only once - in a separate function */
-static void 
+static void
 R_approxtest(double *x, double *y, int nxy, int method, double f)
 {
     int i;
@@ -107,13 +107,13 @@
     }
     /* check interpolation method */
     for(i = 0; i < nxy; i++)
-	if(ISNA(x[i]) || ISNA(y[i]))
+	if(ISNAN(x[i]) || ISNAN(y[i]))
 	    error(_("approx(): attempted to interpolate NA values"));
 }
 
 /* R Frontend for Linear and Constant Interpolation, no testing */
 
-static void 
+static void
 R_approxfun(double *x, double *y, int nxy, double *xout, double *yout,
 	    int nout, int method, double yleft, double yright, double f)
 {
@@ -126,8 +126,7 @@
     M.ylow = yleft;
     M.yhigh = yright;
     for(i = 0; i < nout; i++)
-	if(!ISNA(xout[i])) yout[i] = approx1(xout[i], x, y, nxy, &M);
-	else yout[i] = xout[i];
+	yout[i] = ISNAN(xout[i]) ? xout[i] : approx1(xout[i], x, y, nxy, &M);
 }
 
 #include <Rinternals.h>
@@ -140,14 +139,14 @@
     return R_NilValue;
 }
 
-SEXP Approx(SEXP x, SEXP y, SEXP v, SEXP method, 
+SEXP Approx(SEXP x, SEXP y, SEXP v, SEXP method,
 	    SEXP yleft, SEXP yright, SEXP sf)
 {
     SEXP xout = PROTECT(coerceVector(v, REALSXP));
     int nx = LENGTH(x), nout = LENGTH(xout), m = asInteger(method);
     double yl = asReal(yleft), yr = asReal(yright), f = asReal(sf);
     SEXP yout = PROTECT(allocVector(REALSXP, nout));
-    R_approxfun(REAL(x), REAL(y), nx, REAL(xout), REAL(yout), nout, 
+    R_approxfun(REAL(x), REAL(y), nx, REAL(xout), REAL(yout), nout,
 		m, yl, yr, f);
     UNPROTECT(2);
     return yout;
diff -Nru r-base-3.2.3/src/library/stats/src/arima.c r-base-3.3.1/src/library/stats/src/arima.c
--- r-base-3.2.3/src/library/stats/src/arima.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/arima.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2002-2015   The R Core Team.
+ *  Copyright (C) 2002-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 # include <config.h>
 #endif
 
-/* do this first to get the right options for math.h */
-#include <R_ext/Arith.h>
+#include <stdlib.h> // for abs
+#include <string.h>
 
 #include <R.h>
 #include "ts.h"
diff -Nru r-base-3.2.3/src/library/stats/src/burg.c r-base-3.3.1/src/library/stats/src/burg.c
--- r-base-3.2.3/src/library/stats/src/burg.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/burg.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
 
- *  Copyright (C) 1999-2012  The R Core Team
+ *  Copyright (C) 1999-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff -Nru r-base-3.2.3/src/library/stats/src/chisqsim.c r-base-3.3.1/src/library/stats/src/chisqsim.c
--- r-base-3.2.3/src/library/stats/src/chisqsim.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/chisqsim.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-5   The R Core Team.
+ *  Copyright (C) 2001-2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include <R.h>
 #include <Rinternals.h>
+#include <math.h>
 #include <Rmath.h>
 #include <R_ext/Random.h>
 #include "stats.h" // for rcont2
diff -Nru r-base-3.2.3/src/library/stats/src/cov.c r-base-3.3.1/src/library/stats/src/cov.c
--- r-base-3.2.3/src/library/stats/src/cov.c	2015-11-03 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/cov.c	2016-03-16 23:03:02.000000000 +0000
@@ -62,6 +62,7 @@
 		    }
 
 #define ANS(I,J)  ans[I + J * ncx]
+#define CLAMP(X)  (X >= 1. ? 1. : (X <= -1. ? -1. : X))
 
 /* Note that "if (kendall)" and	 "if (cor)" are used inside a double for() loop;
    which makes the code better readable -- and is hopefully dealt with
@@ -126,8 +127,8 @@
 			    ysd /= n1;					\
 			    sum /= n1;					\
 			}						\
-			sum /= (SQRTL(xsd) * SQRTL(ysd));	       	\
-			if(sum > 1.) sum = 1.;				\
+			sum /= (SQRTL(xsd) * SQRTL(ysd));		\
+			sum = CLAMP(sum);				\
 		    }							\
 		}							\
 		else if(!kendall)					\
@@ -297,8 +298,7 @@
 		}
 		else {
 		    sum = ANS(i,j) / (xm[i] * xm[j]);
-		    if(sum > 1.) sum = 1.;
-		    ANS(j,i) = ANS(i,j) = (double)sum;
+		    ANS(j,i) = ANS(i,j) = (double)CLAMP(sum);
 		}
 	    }
 	    ANS(i,i) = 1.0;
@@ -367,8 +367,7 @@
 		}
 		else {
 		    sum = ANS(i,j) / (xm[i] * xm[j]);
-		    if(sum > 1.) sum = 1.;
-		    ANS(j,i) = ANS(i,j) = (double)sum;
+		    ANS(j,i) = ANS(i,j) = (double)CLAMP(sum);
 		}
 	    }
 	    ANS(i,i) = 1.0;
@@ -451,7 +450,7 @@
 		}
 		else {
 		    ANS(i,j) /= (xm[i] * ym[j]);
-		    if(ANS(i,j) > 1.) ANS(i,j) = 1.;
+		    ANS(i,j) = CLAMP(ANS(i,j));
 		}
     }/* cor */
 
@@ -542,7 +541,7 @@
 			}
 			else {
 			    ANS(i,j) /= (xm[i] * ym[j]);
-			    if(ANS(i,j) > 1.) ANS(i,j) = 1.;
+			    ANS(i,j) = CLAMP(ANS(i,j));
 			}
 		    }
 	    }
diff -Nru r-base-3.2.3/src/library/stats/src/d2x2xk.c r-base-3.3.1/src/library/stats/src/d2x2xk.c
--- r-base-3.2.3/src/library/stats/src/d2x2xk.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/d2x2xk.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-12   The R Core Team.
+ *  Copyright (C) 2000-2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff -Nru r-base-3.2.3/src/library/stats/src/deriv.c r-base-3.3.1/src/library/stats/src/deriv.c
--- r-base-3.2.3/src/library/stats/src/deriv.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/deriv.c	2016-05-17 22:15:07.000000000 +0000
@@ -637,6 +637,8 @@
     args = CDR(args);
     if (isExpression(CAR(args))) expr = VECTOR_ELT(CAR(args), 0);
     else expr = CAR(args);
+    if (!(isLanguage(expr) || isSymbol(expr) || isNumeric(expr) || isComplex(expr)))
+        error(_("expression must not be type '%s'"), type2char(TYPEOF(expr)));
     var = CADR(args);
     if (!isString(var) || length(var) < 1)
 	error(_("variable must be a character string"));
diff -Nru r-base-3.2.3/src/library/stats/src/distance.c r-base-3.3.1/src/library/stats/src/distance.c
--- r-base-3.2.3/src/library/stats/src/distance.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/distance.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998-2013  The R Core Team
+ *  Copyright (C) 1998-2016   The R Core Team
  *  Copyright (C) 2002, 2004  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,12 +22,11 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-/* do this first to get the right options for math.h */
-#include <R_ext/Arith.h>
+
+#include <float.h>
 
 #include <R.h>
 #include <Rmath.h>
-#include <float.h>
 #include "stats.h"
 #ifdef _OPENMP
 # include <R_ext/MathThreads.h>
@@ -124,7 +123,7 @@
 		dev = diff/sum;
 		if(!ISNAN(dev) ||
 		   (!R_FINITE(diff) && diff == sum &&
-		    /* use Inf = lim x -> oo */ (dev = 1.))) {
+		    /* use Inf = lim x -> oo */ (int) (dev = 1.))) {
 		    dist += dev;
 		    count++;
 		}
diff -Nru r-base-3.2.3/src/library/stats/src/distn.c r-base-3.3.1/src/library/stats/src/distn.c
--- r-base-3.2.3/src/library/stats/src/distn.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/distn.c	2016-03-16 23:03:02.000000000 +0000
@@ -49,28 +49,28 @@
 	i2 = (++i2 == n2) ? 0 : i2,\
 	++i)
 
-#define SETUP_Math2				\
-    na = XLENGTH(sa);				\
-    nb = XLENGTH(sb);				\
-    if ((na == 0) || (nb == 0))	{		\
-	PROTECT(sy = allocVector(REALSXP, 0));	\
-	if (na == 0) DUPLICATE_ATTRIB(sy, sa);	\
-	UNPROTECT(1);				\
-	return(sy);				\
-    }						\
-    n = (na < nb) ? nb : na;			\
-    PROTECT(sa = coerceVector(sa, REALSXP));	\
-    PROTECT(sb = coerceVector(sb, REALSXP));	\
-    PROTECT(sy = allocVector(REALSXP, n));	\
-    a = REAL(sa);				\
-    b = REAL(sb);				\
-    y = REAL(sy);				\
+#define SETUP_Math2					\
+    na = XLENGTH(sa);					\
+    nb = XLENGTH(sb);					\
+    if ((na == 0) || (nb == 0))	{			\
+	PROTECT(sy = allocVector(REALSXP, 0));		\
+	if (na == 0) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+	UNPROTECT(1);					\
+	return(sy);					\
+    }							\
+    n = (na < nb) ? nb : na;				\
+    PROTECT(sa = coerceVector(sa, REALSXP));		\
+    PROTECT(sb = coerceVector(sb, REALSXP));		\
+    PROTECT(sy = allocVector(REALSXP, n));		\
+    a = REAL(sa);					\
+    b = REAL(sb);					\
+    y = REAL(sy);					\
     naflag = 0
 
-#define FINISH_Math2				\
-    if(naflag) warning(R_MSG_NA);		\
-    if (n == na)  DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
+#define FINISH_Math2					\
+    if(naflag) warning(R_MSG_NA);			\
+    if (n == na)  SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
     UNPROTECT(3)
 
 #define if_NA_Math2_set(y,a,b)				\
@@ -199,12 +199,12 @@
     y = REAL(sy);						\
     naflag = 0
 
-#define FINISH_Math3				\
-    if(naflag)  warning(R_MSG_NA);		\
-						\
-    if (n == na) DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
-    else if (n == nc) DUPLICATE_ATTRIB(sy, sc);	\
+#define FINISH_Math3					\
+    if(naflag)  warning(R_MSG_NA);			\
+    							\
+    if (n == na) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
+    else if (n == nc) SHALLOW_DUPLICATE_ATTRIB(sy, sc);	\
     UNPROTECT(4)
 
 static SEXP math3_1(SEXP sa, SEXP sb, SEXP sc, SEXP sI,
@@ -360,13 +360,13 @@
     y = REAL(sy);							\
     naflag = 0
 
-#define FINISH_Math4				\
-    if(naflag) warning(R_MSG_NA);		\
-						\
-    if (n == na) DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
-    else if (n == nc) DUPLICATE_ATTRIB(sy, sc);	\
-    else if (n == nd) DUPLICATE_ATTRIB(sy, sd);	\
+#define FINISH_Math4					\
+    if(naflag) warning(R_MSG_NA);			\
+    							\
+    if (n == na) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
+    else if (n == nc) SHALLOW_DUPLICATE_ATTRIB(sy, sc);	\
+    else if (n == nd) SHALLOW_DUPLICATE_ATTRIB(sy, sd);	\
     UNPROTECT(5)
 
 static SEXP math4_1(SEXP sa, SEXP sb, SEXP sc, SEXP sd, SEXP sI, double (*f)(double, double, double, double, int))
diff -Nru r-base-3.2.3/src/library/stats/src/family.c r-base-3.3.1/src/library/stats/src/family.c
--- r-base-3.2.3/src/library/stats/src/family.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/family.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2005-10  The R Core Team
+ *  Copyright (C) 2005-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include <Rconfig.h>
 #include <R_ext/Constants.h>
 #include <float.h>
+#include <math.h>
 #include "stats.h"
 #include "statsR.h"
 
@@ -58,7 +59,7 @@
 SEXP logit_link(SEXP mu)
 {
     int i, n = LENGTH(mu);
-    SEXP ans = PROTECT(duplicate(mu));
+    SEXP ans = PROTECT(shallow_duplicate(mu));
     double *rans = REAL(ans), *rmu=REAL(mu);
 
     if (!n || !isReal(mu))
@@ -71,7 +72,7 @@
 
 SEXP logit_linkinv(SEXP eta)
 {
-    SEXP ans = PROTECT(duplicate(eta));
+    SEXP ans = PROTECT(shallow_duplicate(eta));
     int i, n = LENGTH(eta);
     double *rans = REAL(ans), *reta = REAL(eta);
 
@@ -89,7 +90,7 @@
 
 SEXP logit_mu_eta(SEXP eta)
 {
-    SEXP ans = PROTECT(duplicate(eta));
+    SEXP ans = PROTECT(shallow_duplicate(eta));
     int i, n = LENGTH(eta);
     double *rans = REAL(ans), *reta = REAL(eta);
 
@@ -120,7 +121,7 @@
 
     if (!isReal(y)) {y = PROTECT(coerceVector(y, REALSXP)); nprot++;}
     ry = REAL(y);
-    ans = PROTECT(duplicate(y));
+    ans = PROTECT(shallow_duplicate(y));
     rans = REAL(ans);
     if (!isReal(mu)) {mu = PROTECT(coerceVector(mu, REALSXP)); nprot++;}
     if (!isReal(wt)) {wt = PROTECT(coerceVector(wt, REALSXP)); nprot++;}
diff -Nru r-base-3.2.3/src/library/stats/src/fexact.c r-base-3.3.1/src/library/stats/src/fexact.c
--- r-base-3.2.3/src/library/stats/src/fexact.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/fexact.c	2016-03-16 23:03:03.000000000 +0000
@@ -30,9 +30,10 @@
 
 /* <UTF8> chars are handled as whole strings */
 
-#include <R.h>
 #include <stdio.h>
 #include <limits.h>
+#include <math.h>
+#include <R.h>
 
 static void f2xact(int nrow, int ncol, int *table, int ldtabl,
 		   double *expect, double *percnt, double *emin,
diff -Nru r-base-3.2.3/src/library/stats/src/filter.c r-base-3.3.1/src/library/stats/src/filter.c
--- r-base-3.2.3/src/library/stats/src/filter.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/filter.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
 
- *  Copyright (C) 1999-2015   The R Core Team
+ *  Copyright (C) 1999-2016   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-/* do this first to get the right options for math.h */
-#include <R_ext/Arith.h>
 
 #include <R.h>
 #include "ts.h"
diff -Nru r-base-3.2.3/src/library/stats/src/HoltWinters.c r-base-3.3.1/src/library/stats/src/HoltWinters.c
--- r-base-3.2.3/src/library/stats/src/HoltWinters.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/HoltWinters.c	2016-03-16 23:03:02.000000000 +0000
@@ -19,9 +19,11 @@
 
 /* Originally contributed by David Meyer */
 
+#include <stdlib.h>
+#include <string.h>  // memcpy
+
 #include <R.h>
 #include "ts.h"
-#include <stdlib.h>
 
 void HoltWinters (double *x,
 		  int    *xl,
diff -Nru r-base-3.2.3/src/library/stats/src/init.c r-base-3.3.1/src/library/stats/src/init.c
--- r-base-3.2.3/src/library/stats/src/init.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/init.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2012   The R Core Team.
+ *  Copyright (C) 2001-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,9 +17,6 @@
  *  https://www.R-project.org/Licenses/
  */
 
-#include <R.h>
-#include <Rinternals.h>
-
 #include "modreg.h"
 #include "nls.h"
 #include "port.h"
diff -Nru r-base-3.2.3/src/library/stats/src/integrate.c r-base-3.3.1/src/library/stats/src/integrate.c
--- r-base-3.2.3/src/library/stats/src/integrate.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/integrate.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2012  the R Core Team
+ *  Copyright (C) 2001-2016  the R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <config.h>
 #endif
 
+#include <math.h> // for isfinite
 #include <Rinternals.h>
 #include <R_ext/Applic.h>
 
diff -Nru r-base-3.2.3/src/library/stats/src/isoreg.c r-base-3.3.1/src/library/stats/src/isoreg.c
--- r-base-3.2.3/src/library/stats/src/isoreg.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/isoreg.c	2016-03-16 23:03:03.000000000 +0000
@@ -19,7 +19,7 @@
  *  along with this program; if not, a copy is available at
  *  https://www.R-project.org/Licenses/
  */
-#include <R.h>
+
 #include "modreg.h"
 
 SEXP isoreg(SEXP y)
diff -Nru r-base-3.2.3/src/library/stats/src/kendall.c r-base-3.3.1/src/library/stats/src/kendall.c
--- r-base-3.2.3/src/library/stats/src/kendall.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/kendall.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999-2012   The R Core Team.
+ *  Copyright (C) 1999-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,10 @@
 
 /* Kendall's rank correlation tau and its exact distribution in case of no ties
 */
+
+#include <string.h>
 #include <R.h>
+#include <math.h> // for floor
 #include <Rmath.h>
 
 /*
diff -Nru r-base-3.2.3/src/library/stats/src/kmeans.c r-base-3.3.1/src/library/stats/src/kmeans.c
--- r-base-3.2.3/src/library/stats/src/kmeans.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/kmeans.c	2016-03-16 23:03:02.000000000 +0000
@@ -17,7 +17,6 @@
  *  https://www.R-project.org/Licenses/
  */
 
-#include <R.h>
 #include "modreg.h" /* for declarations for registration */
 
 void kmeans_Lloyd(double *x, int *pn, int *pp, double *cen, int *pk, int *cl,
diff -Nru r-base-3.2.3/src/library/stats/src/ks.c r-base-3.3.1/src/library/stats/src/ks.c
--- r-base-3.2.3/src/library/stats/src/ks.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/ks.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999-2012   The R Core Team.
+ *  Copyright (C) 1999-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
    in the two-sided one-sample and two-sample cases.
 */
 
+#include <math.h>
 #include <R.h>
 #include <Rinternals.h>
 #include <Rmath.h>		/* constants */
diff -Nru r-base-3.2.3/src/library/stats/src/ksmooth.c r-base-3.3.1/src/library/stats/src/ksmooth.c
--- r-base-3.2.3/src/library/stats/src/ksmooth.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/ksmooth.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998-2012	The R Foundation
+ *  Copyright (C) 1998-2016	The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  *  https://www.R-project.org/Licenses/
  */
 
+#include <math.h>
 #include <R.h>			/* for NA_REAL, includes math.h */
 #include <Rinternals.h>
 
diff -Nru r-base-3.2.3/src/library/stats/src/line.c r-base-3.3.1/src/library/stats/src/line.c
--- r-base-3.2.3/src/library/stats/src/line.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/line.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1997-2012   The R Core Team.
+ *  Copyright (C) 1997-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff -Nru r-base-3.2.3/src/library/stats/src/lm.c r-base-3.3.1/src/library/stats/src/lm.c
--- r-base-3.2.3/src/library/stats/src/lm.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/lm.c	2016-03-16 23:03:03.000000000 +0000
@@ -83,12 +83,12 @@
     const char *ansNms[] = {"qr", "coefficients", "residuals", "effects",
 			    "rank", "pivot", "qraux", "tol", "pivoted", ""};
     PROTECT(ans = mkNamed(VECSXP, ansNms));
-    SET_VECTOR_ELT(ans, 0, qr = duplicate(x));
+    SET_VECTOR_ELT(ans, 0, qr = shallow_duplicate(x));
     coefficients = (ny > 1) ? allocMatrix(REALSXP, p, ny) : allocVector(REALSXP, p);
     PROTECT(coefficients);
     SET_VECTOR_ELT(ans, 1, coefficients);
-    SET_VECTOR_ELT(ans, 2, residuals = duplicate(y));
-    SET_VECTOR_ELT(ans, 3, effects = duplicate(y));
+    SET_VECTOR_ELT(ans, 2, residuals = shallow_duplicate(y));
+    SET_VECTOR_ELT(ans, 3, effects = shallow_duplicate(y));
     PROTECT(pivot = allocVector(INTSXP, p));
     int *ip = INTEGER(pivot);
     for(int i = 0; i < p; i++) ip[i] = i+1;
diff -Nru r-base-3.2.3/src/library/stats/src/loessc.c r-base-3.3.1/src/library/stats/src/loessc.c
--- r-base-3.2.3/src/library/stats/src/loessc.c	2015-11-13 23:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/loessc.c	2016-03-16 23:03:02.000000000 +0000
@@ -24,6 +24,8 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <math.h>
+#include <limits.h>
 #include <R.h>
 
 #ifdef ENABLE_NLS
diff -Nru r-base-3.2.3/src/library/stats/src/lowess.c r-base-3.3.1/src/library/stats/src/lowess.c
--- r-base-3.2.3/src/library/stats/src/lowess.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/lowess.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Langage for Statistical Data Analysis
  *  Copyright (C) 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1999-20012 The R Core Team
+ *  Copyright (C) 1999-2016 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff -Nru r-base-3.2.3/src/library/stats/src/Makefile.in r-base-3.3.1/src/library/stats/src/Makefile.in
--- r-base-3.2.3/src/library/stats/src/Makefile.in	2013-09-26 22:05:05.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/Makefile.in	2016-03-16 23:03:02.000000000 +0000
@@ -12,6 +12,7 @@
 R_HOME = $(top_builddir)
 ## for $(R_HOME)/etc${R_ARCH}/Makeconf
 R_SHARE_DIR = $(R_HOME)/share
+R_INCLUDE_DIR = $(R_HOME)/include
 
 SOURCES_C = init.c kmeans.c \
   ansari.c bandwidths.c chisqsim.c d2x2xk.c fexact.c kendall.c ks.c \
diff -Nru r-base-3.2.3/src/library/stats/src/mAR.c r-base-3.3.1/src/library/stats/src/mAR.c
--- r-base-3.2.3/src/library/stats/src/mAR.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/mAR.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,5 +1,6 @@
 /*
  *  Copyright (C) 1999 Martyn Plummer
+ *  Copyright (C) 1999-2016 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,6 +17,8 @@
  *  https://www.R-project.org/Licenses/.
  */
 
+#include <math.h>
+#include <string.h>
 #include <R.h>
 #include <R_ext/Applic.h>	/* Fortran routines */
 #include "ts.h"
diff -Nru r-base-3.2.3/src/library/stats/src/massdist.c r-base-3.3.1/src/library/stats/src/massdist.c
--- r-base-3.2.3/src/library/stats/src/massdist.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/massdist.c	2016-03-16 23:03:03.000000000 +0000
@@ -28,8 +28,7 @@
 #include <config.h>
 #endif
 
-#include <R_ext/Arith.h>
-
+#include <R_ext/Arith.h> // includes math.h
 #include <Rinternals.h>
 
 /* NB: this only works in the lower half of y, but pads with zeros. */
diff -Nru r-base-3.2.3/src/library/stats/src/model.c r-base-3.3.1/src/library/stats/src/model.c
--- r-base-3.2.3/src/library/stats/src/model.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/model.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -216,7 +216,7 @@
 	/* need to transfer _all but tsp and dim_ attributes, possibly lost
 	   by subsetting in na.action. */
 	/* But if data is unchanged, don't mess with it (PR#16436) */
-	
+
 	for ( i = length(ans) ; i-- ; )
 	    if (VECTOR_ELT(data, i) != VECTOR_ELT(ans, i))
 		copyMostAttribNoTs(VECTOR_ELT(data, i),VECTOR_ELT(ans, i));
@@ -1242,14 +1242,11 @@
 }
 
 
-/* BitCount counts the number of ``on'' */
-/* bits in a term */
-
+// BitCount counts the number of ``on'' bits in a term
 static int BitCount(SEXP term)
 {
-    int i, sum;
-    sum = 0;
-    for (i = 1; i <= nvar; i++)
+    int sum = 0;
+    for (int i = 1; i <= nvar; i++)
 	sum += GetBit(term, i);
     return sum;
 }
@@ -1259,11 +1256,10 @@
 
 static int TermZero(SEXP term)
 {
-    int i, val;
-    val = 1;
-    for (i = 0; i < nwords; i++)
-	val = val && (INTEGER(term)[i] == 0);
-    return val;
+    for (int i = 0; i < nwords; i++)
+        if (INTEGER(term)[i] != 0)
+	    return 0;
+    return 1;
 }
 
 
@@ -1271,11 +1267,10 @@
 
 static int TermEqual(SEXP term1, SEXP term2)
 {
-    int i, val;
-    val = 1;
-    for (i = 0; i < nwords; i++)
-	val = val && (INTEGER(term1)[i] == INTEGER(term2)[i]);
-    return val;
+    for (int i = 0; i < nwords; i++)
+        if (INTEGER(term1)[i] != INTEGER(term2)[i])
+            return 0;
+    return 1;
 }
 
 
@@ -1302,19 +1297,36 @@
 }
 
 
-/* TrimRepeats removes duplicates of (bit string) terms 
-   in a model formula by repeated use of ``StripTerm''.
+/* TrimRepeats removes duplicates of (bit string) terms in a model formula.
    Also drops zero terms. */
 
 static SEXP TrimRepeats(SEXP list)
 {
-    if (list == R_NilValue)
-	return R_NilValue;
-    /* Highly recursive */
-    R_CheckStack();
-    if (TermZero(CAR(list)))
-	return TrimRepeats(CDR(list));
-    SETCDR(list, TrimRepeats(StripTerm(CAR(list), CDR(list))));
+    // Drop zero terms at the start of the list.
+    while (list != R_NilValue && TermZero(CAR(list))) {
+	list = CDR(list);
+    }
+    if (list == R_NilValue || CDR(list) == R_NilValue)
+	return list;
+
+    PROTECT(list);
+    // Find out which terms are duplicates.
+    SEXP all_terms = PROTECT(PairToVectorList(list)),
+	duplicate_sexp = PROTECT(duplicated(all_terms, FALSE));
+    int i_p1 = 1, *is_duplicate = LOGICAL(duplicate_sexp);
+
+    // Remove the zero terms and duplicates from the list.
+    for (SEXP current = list; CDR(current) != R_NilValue; i_p1++) {
+	SEXP next = CDR(current);
+	if (is_duplicate[i_p1] || TermZero(CAR(next))) {
+	    // Remove the node from the list.
+	    SETCDR(current, CDR(next));
+	} else {
+	    current = next;
+	}
+    }
+
+    UNPROTECT(3);
     return list;
 }
 
diff -Nru r-base-3.2.3/src/library/stats/src/monoSpl.c r-base-3.3.1/src/library/stats/src/monoSpl.c
--- r-base-3.2.3/src/library/stats/src/monoSpl.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/monoSpl.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,5 +1,6 @@
 /*  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 2010	The R Foundation
+ *  Copyright (C) 2016	The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,6 +18,7 @@
  */
 
 #include "modreg.h"
+#include <math.h>
 
 /* To be "exported" (as part of R's C API): */
 /**
diff -Nru r-base-3.2.3/src/library/stats/src/nls.c r-base-3.3.1/src/library/stats/src/nls.c
--- r-base-3.2.3/src/library/stats/src/nls.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/nls.c	2016-03-16 23:03:03.000000000 +0000
@@ -5,7 +5,7 @@
  *  Copyright 1999-2001 Douglas M. Bates
  *                      Saikat DebRoy
  *
- *  Copyright 2005--2014  The R Core Team
+ *  Copyright 2005--2016  The R Core Team
  *  Copyright 2006	  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,10 +24,12 @@
  *  https://www.R-project.org/Licenses/
  */
 
-#include <R.h>
-#include <Rinternals.h>
 #include <stdlib.h>
+#include <string.h>
+#include <math.h>
 #include <float.h>
+#include <R.h>
+#include <Rinternals.h>
 #include "nls.h"
 
 #ifndef MIN
diff -Nru r-base-3.2.3/src/library/stats/src/pacf.c r-base-3.3.1/src/library/stats/src/pacf.c
--- r-base-3.2.3/src/library/stats/src/pacf.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/pacf.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*  R : A Computer Language for Statistical Data Analysis
  *
- *  Copyright (C) 1999-2012	The R Core Team
+ *  Copyright (C) 1999-2016	The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@
 # include <config.h>
 #endif
 
-/* do this first to get the right options for math.h */
-#include <R_ext/Arith.h>
-
 #include <R.h>
 #include "ts.h"
 
diff -Nru r-base-3.2.3/src/library/stats/src/port.c r-base-3.3.1/src/library/stats/src/port.c
--- r-base-3.2.3/src/library/stats/src/port.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/port.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2005-2007   The R Core Team.
+ *  Copyright (C) 2005-2015   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -393,7 +393,7 @@
     if ((LENGTH(lowerb) == n) && (LENGTH(upperb) == n)) {
 	if (isReal(lowerb) && isReal(upperb)) {
 	    double *rl=REAL(lowerb), *ru=REAL(upperb);
-	    b = Calloc(2*n, double);
+	    b = (double *)R_alloc(2*n, sizeof(double));
 	    for (i = 0; i < n; i++) {
 		b[2*i] = rl[i];
 		b[2*i + 1] = ru[i];
@@ -401,8 +401,9 @@
 	} else error(_("'lower' and 'upper' must be numeric vectors"));
     }
     if (gr != R_NilValue) {
-	g = Calloc(n, double);
-	if (hs != R_NilValue) h = Calloc((n * (n + 1))/2, double);
+	g = (double *)R_alloc(n, sizeof(double));
+	if (hs != R_NilValue)
+	    h = (double *)R_alloc((n * (n + 1))/2, sizeof(double));
     }
 
     do {
@@ -425,7 +426,6 @@
 	PROTECT(xpt);
     } while(INTEGER(iv)[0] < 3);
 
-    if (b) Free(b); if (g) Free(g); if (h) Free(h);
     UNPROTECT(1); /* xpt */
     return R_NilValue;
 }
@@ -539,8 +539,10 @@
     SEXP getPars, setPars, resid, gradient,
 	rr = PROTECT(allocVector(REALSXP, nd)),
 	x = PROTECT(allocVector(REALSXP, n));
+    // This used to use Calloc, but that will leak if 
+    // there is a premature return (and did in package drfit)
     double *b = (double *) NULL,
-	*rd = Calloc(nd, double);
+	*rd = (double *)R_alloc(nd, sizeof(double));
 
     if (!isReal(d) || n < 1)
 	error(_("'d' must be a nonempty numeric vector"));
@@ -558,8 +560,8 @@
 
     if ((LENGTH(lowerb) == n) && (LENGTH(upperb) == n)) {
 	if (isReal(lowerb) && isReal(upperb)) {
-	    double *rl=REAL(lowerb), *ru=REAL(upperb);
-	    b = Calloc(2*n, double);
+	    double *rl = REAL(lowerb), *ru = REAL(upperb);
+	    b = (double *)R_alloc(2*n, sizeof(double));
 	    for (i = 0; i < n; i++) {
 		b[2*i] = rl[i];
 		b[2*i + 1] = ru[i];
@@ -600,7 +602,6 @@
 	}
     } while(INTEGER(iv)[0] < 3);
 
-    Free(rd); if (b) Free(b);
     UNPROTECT(6);
     return R_NilValue;
 }
diff -Nru r-base-3.2.3/src/library/stats/src/port.h r-base-3.3.1/src/library/stats/src/port.h
--- r-base-3.2.3/src/library/stats/src/port.h	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/port.h	2016-03-16 23:03:03.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2005   The R Core Team.
+ *  Copyright (C) 2005-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@
  * Licensed under the GNU General Public License, version 2 or later.
  */
 
+#include <math.h>
+#include <string.h> // for memmove, memcpy, strcmp
 #include <Rinternals.h>
 #include <R_ext/RS.h>
 
diff -Nru r-base-3.2.3/src/library/stats/src/PPsum.c r-base-3.3.1/src/library/stats/src/PPsum.c
--- r-base-3.2.3/src/library/stats/src/PPsum.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/PPsum.c	2016-03-16 23:03:03.000000000 +0000
@@ -16,6 +16,7 @@
    https://www.R-project.org/Licenses/
 */
 
+#include <string.h>
 #include <R.h>
 
 static double R_pp_sum (double *u, int n, int l)
diff -Nru r-base-3.2.3/src/library/stats/src/prho.c r-base-3.3.1/src/library/stats/src/prho.c
--- r-base-3.2.3/src/library/stats/src/prho.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/prho.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000		R Core Team
+ *  Copyright (C) 2000-2016     The R Core Team
  *  Copyright (C) 2003		The R Foundation
  *  based on AS 89 (C) 1975 Royal Statistical Society
  *
@@ -20,6 +20,7 @@
  *
  */
 
+#include <math.h>
 #include <Rmath.h>
 
 /* Was
diff -Nru r-base-3.2.3/src/library/stats/src/rWishart.c r-base-3.3.1/src/library/stats/src/rWishart.c
--- r-base-3.2.3/src/library/stats/src/rWishart.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/rWishart.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2012   The R Core Team
+ *  Copyright (C) 2012-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 # include <config.h>
 #endif
 
+#include <math.h>
+#include <string.h>  // memset, memcpy
 #include <R.h>
 #include <Rinternals.h>
 #include <Rmath.h>
diff -Nru r-base-3.2.3/src/library/stats/src/sbart.c r-base-3.3.1/src/library/stats/src/sbart.c
--- r-base-3.2.3/src/library/stats/src/sbart.c	2013-03-05 23:02:23.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/sbart.c	2016-03-16 23:03:02.000000000 +0000
@@ -4,10 +4,10 @@
  * According to the GAMFIT sources, this was derived from code by
  * Finbarr O'Sullivan.
  */
-#include <R.h>
-#include <Rmath.h>
 
 #include "modreg.h"
+#include <math.h>
+#include <Rmath.h>
 
 /* sbart() : The cubic spline smoother
    -------
diff -Nru r-base-3.2.3/src/library/stats/src/smooth.c r-base-3.3.1/src/library/stats/src/smooth.c
--- r-base-3.2.3/src/library/stats/src/smooth.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/smooth.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1997-2008   The R Core Team.
+ *  Copyright (C) 1997-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,12 +25,11 @@
 
 #include <stdlib.h> /* for abs */
 #include <math.h>
-#include <R_ext/Boolean.h>
-#include <R_ext/Error.h>
-#include <R_ext/Memory.h>
 
-typedef enum { 
-    sm_NO_ENDRULE, sm_COPY_ENDRULE, sm_TUKEY_ENDRULE 
+#include <Rinternals.h> /* Arith.h, Boolean.h, Error.h, Memory.h .. */
+
+typedef enum {
+    sm_NO_ENDRULE, sm_COPY_ENDRULE, sm_TUKEY_ENDRULE
 } R_SM_ENDRULE;
 
 #ifdef ENABLE_NLS
@@ -67,13 +66,20 @@
     /* else */ return -1;
 }
 
-static Rboolean sm_3(double *x, double *y, int n, int end_rule)
+static Rboolean sm_3(double *x, double *y, R_xlen_t n, int end_rule)
 {
     /* y[] := Running Median of three (x) = "3 (x[])" with "copy ends"
      * ---  return chg := ( y != x ) */
-    int i,j;
+    R_xlen_t i;
+    int j;
     Rboolean chg = FALSE;
 
+    if (n <= 2) {
+        for(i=0; i < n; i++)
+	   y[i] = x[i];
+        return FALSE;
+    }
+
     for(i = 1; i < n-1; i++) {
 	j = imed3(x[i-1], x[i], x[i+1]);
 	y[i] = x[i + j];
@@ -82,22 +88,22 @@
 /* [y, chg]  :=  sm_DO_ENDRULE(x, y, end_rule, chg) : */
 #define sm_DO_ENDRULE(y)						\
     switch(end_rule) {							\
-	   case sm_NO_ENDRULE:						\
+    case sm_NO_ENDRULE:							\
 	   /* do nothing : don't even assign them */ break;		\
 									\
-	   case sm_COPY_ENDRULE:					\
+    case sm_COPY_ENDRULE: /* 1 */					\
 	   y[0] = x[0];							\
 	   y[n-1] = x[n-1];						\
 	   break;							\
 									\
-	   case sm_TUKEY_ENDRULE:					\
+    case sm_TUKEY_ENDRULE: /* 2 */					\
 	   y[0] = med3(3*y[1] - 2*y[2], x[0], y[1]);			\
 	   chg = chg || (y[0] != x[0]);					\
 	   y[n-1] = med3(y[n-2], x[n-1], 3*y[n-2] - 2*y[n-3]);		\
 	   chg = chg || (y[n-1] != x[n-1]);				\
 	   break;							\
 									\
-	   default:							\
+    default:								\
 	   error(_("invalid end-rule for running median of 3: %d"),	\
 		 end_rule);						\
     }
@@ -107,10 +113,10 @@
     return chg;
 }
 
-static int sm_3R(double *x, double *y, double *z, int n, int end_rule)
+static int sm_3R(double *x, double *y, double *z, R_xlen_t n, int end_rule)
 {
     /* y[] := "3R"(x) ; 3R = Median of three, repeated until convergence */
-    int i, iter;
+    int iter;
     Rboolean chg;
 
     iter = chg = sm_3(x, y, n, sm_COPY_ENDRULE);
@@ -118,12 +124,12 @@
     while(chg) {
 	if((chg = sm_3(y, z, n, sm_NO_ENDRULE))) {
 	    iter++;
-	    for(i=1; i < n-1; i++)
+	    for(R_xlen_t i=1; i < n-1; i++)
 		y[i] = z[i];
 	}
     }
 
-    sm_DO_ENDRULE(y);/* =>  chg = TRUE  iff  ends changed */
+    if (n > 2) sm_DO_ENDRULE(y);/* =>  chg = TRUE  iff  ends changed */
 
     return(iter ? iter : chg);
     /* = 0   <==>  only one "3" w/o any change
@@ -133,7 +139,7 @@
 }
 
 
-static Rboolean sptest(double *x, int i)
+static Rboolean sptest(double *x, R_xlen_t i)
 {
     /* Split test:
        Are we at a /-\ or \_/ location => split should be made ?
@@ -145,15 +151,17 @@
 }
 
 
-static Rboolean sm_split3(double *x, double *y, int n, Rboolean do_ends)
+static Rboolean sm_split3(double *x, double *y, R_xlen_t n, Rboolean do_ends)
 {
     /* y[] := S(x[])  where S() = "sm_split3"  */
-    int i, j;
+    R_xlen_t i;
     Rboolean chg = FALSE;
 
     for(i=0; i < n; i++)
 	y[i] = x[i];
 
+    if (n <= 4) return FALSE;
+
     /* Colin Goodall doesn't do splits near ends
        in spl() in Statlib's "smoother" code !! */
     if(do_ends && sptest(x, 1)) {
@@ -164,6 +172,7 @@
 
     for(i=2; i < n-3; i++)
 	if(sptest(x, i)) { /* plateau at x[i] == x[i+1] */
+	    int j;
 	    /* at left : */
 	    if(-1 < (j = imed3(x[i ], x[i-1], 3*x[i-1] - 2*x[i-2]))) {
 		y[i]   = /* med3(.) = */ (j == 0)? x[i-1] : 3*x[i-1] - 2*x[i-2];
@@ -183,7 +192,7 @@
     return(chg);
 }
 
-static int sm_3RS3R(double *x, double *y, double *z, double *w, int n,
+static int sm_3RS3R(double *x, double *y, double *z, double *w, R_xlen_t n,
 	     int end_rule, Rboolean split_ends)
 {
     /* y[1:n] := "3R S 3R"(x[1:n]);  z = "work"; */
@@ -198,7 +207,7 @@
     return(iter + (int)chg);
 }
 
-static int sm_3RSS(double *x, double *y, double *z, int n,
+static int sm_3RSS(double *x, double *y, double *z, R_xlen_t n,
 	    int end_rule, Rboolean split_ends)
 {
     /* y[1:n] := "3RSS"(x[1:n]);  z = "work"; */
@@ -213,14 +222,15 @@
     return(iter + (int)chg);
 }
 
-static int sm_3RSR(double *x, double *y, double *z, double *w, int n,
+static int sm_3RSR(double *x, double *y, double *z, double *w, R_xlen_t n,
 	    int end_rule, Rboolean split_ends)
 {
     /* y[1:n] := "3RSR"(x[1:n]);  z := residuals; w = "work"; */
 
 /*== "SR" (as follows) is stupid ! (MM) ==*/
 
-    int i, iter;
+    R_xlen_t i;
+    int iter;
     Rboolean chg, ch2;
 
     iter = sm_3R(x, y, z, n, end_rule);
@@ -248,7 +258,7 @@
 SEXP Rsm(SEXP x, SEXP stype, SEXP send)
 {
     int iend = asInteger(send), type = asInteger(stype);
-    int n = LENGTH(x);
+    R_xlen_t n = XLENGTH(x);
     SEXP ans = PROTECT(allocVector(VECSXP, 2));
     SEXP y = allocVector(REALSXP, n);
     SET_VECTOR_ELT(ans, 0, y);
@@ -262,40 +272,40 @@
 	{
 	    double *z = (double *) R_alloc(n, sizeof(double));
 	    double *w = (double *) R_alloc(n, sizeof(double));
-	    iter = sm_3RS3R(REAL(x), REAL(y), z, w, n, abs(iend), 
-			      iend ? TRUE : FALSE);
+	    iter = sm_3RS3R(REAL(x), REAL(y), z, w, n, abs(iend),
+			    /* split_ends: */ (iend < 0) ? TRUE : FALSE);
 	    break;
 	}
 	case 2:
 	{
 	    double *z = (double *) R_alloc(n, sizeof(double));
-	    iter = sm_3RSS(REAL(x), REAL(y), z, n, abs(iend), 
-			      iend ? TRUE : FALSE);
+	    iter = sm_3RSS(REAL(x), REAL(y), z, n, abs(iend),
+			   /* split_ends: */ (iend < 0) ? TRUE : FALSE);
 	    break;
 	}
 	case 3:
 	{
 	    double *z = (double *) R_alloc(n, sizeof(double));
 	    double *w = (double *) R_alloc(n, sizeof(double));
-	    iter = sm_3RSR(REAL(x), REAL(y), z, w, n, abs(iend), 
-			   iend ? TRUE : FALSE);
+	    iter = sm_3RSR(REAL(x), REAL(y), z, w, n, abs(iend),
+			   /* split_ends: */ (iend < 0) ? TRUE : FALSE);
 	    break;
 	}
-	case 4:
+	case 4: // "3R"
 	{
 	    double *z = (double *) R_alloc(n, sizeof(double));
 	    iter = sm_3R(REAL(x), REAL(y), z, n, iend);
 	}
 	    break;
-	case 5:
+	case 5: // "3"
 	    iter = sm_3(REAL(x), REAL(y), n, iend);
 	}
 	SET_VECTOR_ELT(ans, 1, ScalarInteger(iter));
-	SET_STRING_ELT(nm, 1, mkChar("iter"));	
-    } else {
+	SET_STRING_ELT(nm, 1, mkChar("iter"));
+    } else { // type > 5  ==> =~ "S"
 	int changed = sm_split3(REAL(x), REAL(y), n, (Rboolean) iend);
 	SET_VECTOR_ELT(ans, 1, ScalarLogical(changed));
-	SET_STRING_ELT(nm, 1, mkChar("changed"));	
+	SET_STRING_ELT(nm, 1, mkChar("changed"));
     }
     UNPROTECT(1);
     return ans;
diff -Nru r-base-3.2.3/src/library/stats/src/splines.c r-base-3.3.1/src/library/stats/src/splines.c
--- r-base-3.2.3/src/library/stats/src/splines.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/splines.c	2016-03-16 23:03:02.000000000 +0000
@@ -43,10 +43,10 @@
 #endif
 
 #include <R.h>
-#include <R_ext/Arith.h>
 #include <R_ext/Applic.h>
 #include <stdio.h>
 #include <errno.h>
+#include <math.h>
 
 /*
  *	Natural Splines
diff -Nru r-base-3.2.3/src/library/stats/src/Srunmed.c r-base-3.3.1/src/library/stats/src/Srunmed.c
--- r-base-3.2.3/src/library/stats/src/Srunmed.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/Srunmed.c	2016-03-16 23:03:02.000000000 +0000
@@ -2,7 +2,7 @@
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995--2002 Martin Maechler <maechler@stat.math.ethz.ch>
  *  Copyright (C) 2003       The R Foundation
- *  Copyright (C) 2012-2013  The R Core Team
+ *  Copyright (C) 2012-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
  *  https://www.R-project.org/Licenses/
  */
 
-#include <R.h>
 #include "modreg.h"
 
 #include "Trunmed.c"
diff -Nru r-base-3.2.3/src/library/stats/src/starma.c r-base-3.3.1/src/library/stats/src/starma.c
--- r-base-3.2.3/src/library/stats/src/starma.c	2015-08-25 22:16:08.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/starma.c	2016-03-16 23:03:02.000000000 +0000
@@ -20,8 +20,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-/* do this first to get the right options for math.h */
-#include <R_ext/Arith.h>
 
 #include <R.h>
 #include "ts.h"
diff -Nru r-base-3.2.3/src/library/stats/src/swilk.c r-base-3.3.1/src/library/stats/src/swilk.c
--- r-base-3.2.3/src/library/stats/src/swilk.c	2015-08-25 22:16:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/swilk.c	2016-03-16 23:03:03.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-12   The R Core Team.
+ *  Copyright (C) 2000-2016   The R Core Team.
  *
  *  Based on Applied Statistics algorithms AS181, R94
  *    (C) Royal Statistical Society 1982, 1995
@@ -23,6 +23,8 @@
 /* swilk.f -- translated by f2c (version 19980913).
  * ------- and produced by f2c-clean,v 1.8 --- and hand polished: M.Maechler
  */
+
+#include <math.h>
 #include <Rmath.h>
 
 #ifndef min
diff -Nru r-base-3.2.3/src/library/stats/src/Trunmed.c r-base-3.3.1/src/library/stats/src/Trunmed.c
--- r-base-3.2.3/src/library/stats/src/Trunmed.c	2014-01-05 23:05:11.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/Trunmed.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,7 +1,7 @@
 /* Copyright (C) 1995   Berwin A. Turlach <berwin@alphasun.anu.edu.au>
  * Copyright (C) 2000-2 Martin Maechler <maechler@stat.math.ethz.ch>
  * Copyright (C) 2003   The R Foundation
- * Copyright (C) 2012-2013   The R Core Team
+ * Copyright (C) 2012-2016   The R Core Team
 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,6 +44,8 @@
  * ...		 j	2nd permuter  X[i +j[m]] == H[m]
  */
 
+#include <math.h>
+
 static void
 swap(int l, int r, double *window, int *outlist, int *nrlist, int print_level)
 {
diff -Nru r-base-3.2.3/src/library/stats/src/zeroin.c r-base-3.3.1/src/library/stats/src/zeroin.c
--- r-base-3.2.3/src/library/stats/src/zeroin.c	2015-08-25 22:16:07.000000000 +0000
+++ r-base-3.3.1/src/library/stats/src/zeroin.c	2016-03-16 23:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999, 2001 the R Core Team
+ *  Copyright (C) 1999-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/stats/tests/anorexia.rda and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/stats/tests/anorexia.rda differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/stats/tests/birthwt.rda and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/stats/tests/birthwt.rda differ
diff -Nru r-base-3.2.3/src/library/stats/tests/glm.Rout.save r-base-3.3.1/src/library/stats/tests/glm.Rout.save
--- r-base-3.2.3/src/library/stats/tests/glm.Rout.save	2015-12-03 23:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/tests/glm.Rout.save	2016-06-14 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -29,4 +29,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.101   0.014   0.107 
+  0.112   0.020   0.123 
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/stats/tests/hills.rda and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/stats/tests/hills.rda differ
diff -Nru r-base-3.2.3/src/library/stats/tests/ks-test.Rout.save r-base-3.3.1/src/library/stats/tests/ks-test.Rout.save
--- r-base-3.2.3/src/library/stats/tests/ks-test.Rout.save	2015-12-03 23:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/tests/ks-test.Rout.save	2016-06-14 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -114,4 +114,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.127   0.017   0.135 
+  0.144   0.017   0.148 
diff -Nru r-base-3.2.3/src/library/stats/tests/nls.Rout.save r-base-3.3.1/src/library/stats/tests/nls.Rout.save
--- r-base-3.2.3/src/library/stats/tests/nls.Rout.save	2015-12-03 23:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/tests/nls.Rout.save	2016-06-14 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -703,4 +703,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  1.095   0.021   1.106 
+  1.110   0.022   1.120 
diff -Nru r-base-3.2.3/src/library/stats/tests/offsets.R r-base-3.3.1/src/library/stats/tests/offsets.R
--- r-base-3.2.3/src/library/stats/tests/offsets.R	2015-08-30 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/library/stats/tests/offsets.R	2016-03-16 23:02:58.000000000 +0000
@@ -1,9 +1,6 @@
 ## tests of offsets, and prediction from them.
 
-have_MASS <- requireNamespace('MASS', quietly = TRUE)
-if(!have_MASS) q()
-
-data(anorexia, package = "MASS")
+load("anorexia.rda") # copied from package MASS
 
 ## via formula
 fit1 <- lm(Postwt ~ Prewt + Treat + offset(Prewt), data = anorexia)
diff -Nru r-base-3.2.3/src/library/stats/tests/simulate.R r-base-3.3.1/src/library/stats/tests/simulate.R
--- r-base-3.2.3/src/library/stats/tests/simulate.R	2015-08-30 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/stats/tests/simulate.R	2016-03-16 23:02:58.000000000 +0000
@@ -2,10 +2,8 @@
 
 options(digits = 5)
 
-# recommended packages should be present
-if(!require("MASS")) q()
-
 ## cases should be named
+load("hills.rda") # copied from package MASS
 fit1 <- lm(time ~ dist, data = hills)
 set.seed(1)
 simulate(fit1, nsim = 3)
@@ -19,6 +17,7 @@
     print(coef(summary(update(fit2, ys[, i] ~ .))))
 
 ## Poisson fit
+load("anorexia.rda") # copied from package MASS
 fit3 <- glm(Postwt ~ Prewt + Treat + offset(Prewt),
             family = gaussian, data = anorexia)
 coef(summary(fit3))
@@ -47,6 +46,7 @@
 
 
 ## factor binomial fit
+load("birthwt.rda") # copied from package MASS
 bwt <- with(birthwt, {
     race <- factor(race, labels = c("white", "black", "other"))
     table(ptl)
@@ -65,11 +65,13 @@
 for(i in seq_len(3))
     print(coef(summary(update(fit6, ys[, i] ~ .))))
 
+## This requires MASS::gamma.shape
+if(!require("MASS")) q()
 
 ## gamma fit, from example(glm)
 clotting <- data.frame(u = c(5,10,15,20,30,40,60,80,100),
                        lot1 = c(118,58,42,35,27,25,21,19,18))
-fit7 <- glm(lot1 ~ log(u), data=clotting, family=Gamma)
+fit7 <- glm(lot1 ~ log(u), data = clotting, family = Gamma)
 coef(summary(fit7))
 set.seed(1)
 ( ys <- simulate(fit7, nsim = 3) )
diff -Nru r-base-3.2.3/src/library/stats/tests/simulate.Rout.save r-base-3.3.1/src/library/stats/tests/simulate.Rout.save
--- r-base-3.2.3/src/library/stats/tests/simulate.Rout.save	2015-12-03 23:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats/tests/simulate.Rout.save	2016-06-14 22:15:06.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -19,11 +19,8 @@
 > 
 > options(digits = 5)
 > 
-> # recommended packages should be present
-> if(!require("MASS")) q()
-Loading required package: MASS
-> 
 > ## cases should be named
+> load("hills.rda") # copied from package MASS
 > fit1 <- lm(time ~ dist, data = hills)
 > set.seed(1)
 > simulate(fit1, nsim = 3)
@@ -120,6 +117,7 @@
 climb 0.0090388   0.001496  6.0422 9.6065e-07
 > 
 > ## Poisson fit
+> load("anorexia.rda") # copied from package MASS
 > fit3 <- glm(Postwt ~ Prewt + Treat + offset(Prewt),
 +             family = gaussian, data = anorexia)
 > coef(summary(fit3))
@@ -293,6 +291,7 @@
 > 
 > 
 > ## factor binomial fit
+> load("birthwt.rda") # copied from package MASS
 > bwt <- with(birthwt, {
 +     race <- factor(race, labels = c("white", "black", "other"))
 +     table(ptl)
@@ -370,11 +369,14 @@
 ftv1        -0.7388479  0.5090637 -1.451386 0.14667244
 ftv2+       -0.0097438  0.4670024 -0.020865 0.98335371
 > 
+> ## This requires MASS::gamma.shape
+> if(!require("MASS")) q()
+Loading required package: MASS
 > 
 > ## gamma fit, from example(glm)
 > clotting <- data.frame(u = c(5,10,15,20,30,40,60,80,100),
 +                        lot1 = c(118,58,42,35,27,25,21,19,18))
-> fit7 <- glm(lot1 ~ log(u), data=clotting, family=Gamma)
+> fit7 <- glm(lot1 ~ log(u), data = clotting, family = Gamma)
 > coef(summary(fit7))
              Estimate Std. Error t value   Pr(>|t|)
 (Intercept) -0.016554 0.00092755 -17.847 4.2791e-07
@@ -406,4 +408,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.164   0.021   0.176 
+  0.202   0.021   0.213 
diff -Nru r-base-3.2.3/src/library/stats4/po/R-de.po r-base-3.3.1/src/library/stats4/po/R-de.po
--- r-base-3.2.3/src/library/stats4/po/R-de.po	2015-03-26 23:15:04.000000000 +0000
+++ r-base-3.3.1/src/library/stats4/po/R-de.po	2016-03-16 23:02:44.000000000 +0000
@@ -20,7 +20,7 @@
 "some named arguments in 'fixed' are not arguments to the supplied log-"
 "likelihood"
 msgstr ""
-"einige benannte Argumentes in 'fixed' sind keine Argumente für die "
+"einige benannte Argumente in 'fixed' sind keine Argumente für die "
 "angegebene Log-Likelihood"
 
 msgid "'start' must be a named list"
diff -Nru r-base-3.2.3/src/library/stats4/po/R-ja.po r-base-3.3.1/src/library/stats4/po/R-ja.po
--- r-base-3.2.3/src/library/stats4/po/R-ja.po	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/stats4/po/R-ja.po	2016-03-16 23:02:44.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
 "PO-Revision-Date: 2013-02-23 17:49+0200 \n"
 "Last-Translator: Triad sou  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
diff -Nru r-base-3.2.3/src/library/stats4/po/R-ko.po r-base-3.3.1/src/library/stats4/po/R-ko.po
--- r-base-3.2.3/src/library/stats4/po/R-ko.po	2015-03-31 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/stats4/po/R-ko.po	2016-04-27 22:15:13.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R stats4 package
-# src/library/stats4/po/R-ko.po
-# 
-# Copyright (C) 1995-2015 The R Core Team
-# 
+# ./stats4/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
+#
 # This file is distributed under the same license as the R stats4 package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2012-12-10 18:35\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru r-base-3.2.3/src/library/stats4/po/R-pl.po r-base-3.3.1/src/library/stats4/po/R-pl.po
--- r-base-3.2.3/src/library/stats4/po/R-pl.po	2015-03-27 23:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/stats4/po/R-pl.po	2016-04-27 22:15:13.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,9 +13,34 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
+#. R/mle.R: stop("'start' must be a named list")
+#: R/mle.R:0
+msgid "'start' must be a named list"
+msgstr "'start' musi być nazwaną listą"
+
+#. R/mle.R: warning("extra arguments discarded")
+#: R/mle.R:0
+msgid "extra arguments discarded"
+msgstr "dodatkowe argumenty zostały odrzucone"
+
+#. R/mle.R: warning("levels truncated to positive values only")
+#: R/mle.R:0
+msgid "levels truncated to positive values only"
+msgstr "poziomy przycięto do wartości dodatnich"
+
+#. R/mle.R: stop("profiling has found a better solution, so original fit had not converged")
+#: R/mle.R:0
+msgid ""
+"profiling has found a better solution, so original fit had not converged"
+msgstr ""
+"profilowanie znalazło lepsze rozwiązanie, tak więc oryginalne dopasowanie "
+"nie uzbieżniło się"
+
+#. R/mle.R: stop("some named arguments in 'fixed' are not arguments to the supplied log-likelihood")
+#: R/mle.R:0
 msgid ""
 "some named arguments in 'fixed' are not arguments to the supplied log-"
 "likelihood"
@@ -23,24 +48,11 @@
 "niektóre nazwane argumenty w funkcji 'fixed' nie są argumentami do "
 "dostarczonej logarytmicznej funkcji wiarygodności"
 
-msgid "'start' must be a named list"
-msgstr "'start' musi być nazwaną listą"
-
+#. R/mle.R: stop("some named arguments in 'start' are not arguments to the supplied log-likelihood")
+#: R/mle.R:0
 msgid ""
 "some named arguments in 'start' are not arguments to the supplied log-"
 "likelihood"
 msgstr ""
 "niektóre nazwane argumenty w funkcji 'start' nie są argumentami do "
 "dostarczonej logarytmicznej funkcji wiarygodności"
-
-msgid ""
-"profiling has found a better solution, so original fit had not converged"
-msgstr ""
-"profilowanie znalazło lepsze rozwiązanie, tak więc oryginalne dopasowanie "
-"nie uzbieżniło się"
-
-msgid "levels truncated to positive values only"
-msgstr "poziomy przycięto do wartości dodatnich"
-
-msgid "extra arguments discarded"
-msgstr "dodatkowe argumenty zostały odrzucone"
diff -Nru r-base-3.2.3/src/library/stats4/po/R-ru.po r-base-3.3.1/src/library/stats4/po/R-ru.po
--- r-base-3.2.3/src/library/stats4/po/R-ru.po	2015-03-18 23:02:42.000000000 +0000
+++ r-base-3.3.1/src/library/stats4/po/R-ru.po	2016-04-27 22:15:13.000000000 +0000
@@ -11,7 +11,7 @@
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2012-07-12 12:59\n"
-"PO-Revision-Date: 2013-03-19 21:49-0600\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
diff -Nru r-base-3.2.3/src/library/stats4/po/R-stats4.pot r-base-3.3.1/src/library/stats4/po/R-stats4.pot
--- r-base-3.2.3/src/library/stats4/po/R-stats4.pot	2015-06-06 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/library/stats4/po/R-stats4.pot	2016-04-27 22:15:13.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: stats4 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/da.po r-base-3.3.1/src/library/tcltk/po/da.po
--- r-base-3.2.3/src/library/tcltk/po/da.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/da.po	2016-04-27 22:15:13.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-11-28 23:40+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/de.po r-base-3.3.1/src/library/tcltk/po/de.po
--- r-base-3.2.3/src/library/tcltk/po/de.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/de.po	2016-04-27 22:15:13.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-3.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-01 16:24+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R Core <r-core@r-project.org>\n"
@@ -35,7 +35,7 @@
 #: tcltk.c:625
 msgid "argument list is too long in tcltk internal function 'callback_closure'"
 msgstr ""
-"Argumentliste ist für internen tcltk Funktion 'calback_closure' zu lang"
+"Argumentliste ist für interne tcltk Funktion 'callback_closure' zu lang"
 
 #: tcltk.c:658
 msgid "argument is not of correct type"
@@ -51,7 +51,7 @@
 
 #: tcltk_unix.c:98
 msgid "Tcl is not last loaded handler"
-msgstr "Tcl ist nicht der letztw geladenen Handler"
+msgstr "Tcl ist nicht der letzte geladene Handler"
 
 #~ msgid "Tcl already loaded"
 #~ msgstr "Tcl ist bereits geladen"
diff -Nru r-base-3.2.3/src/library/tcltk/po/fr.po r-base-3.3.1/src/library/tcltk/po/fr.po
--- r-base-3.2.3/src/library/tcltk/po/fr.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/fr.po	2016-04-27 22:15:13.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2010-10-01 21:01+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/ja.po r-base-3.3.1/src/library/tcltk/po/ja.po
--- r-base-3.2.3/src/library/tcltk/po/ja.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/ja.po	2016-04-27 22:15:13.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.5.0 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-02-23 17:50+0200 \n"
 "Last-Translator: Triad sou  \n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net> \n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/ko.po r-base-3.3.1/src/library/tcltk/po/ko.po
--- r-base-3.2.3/src/library/tcltk/po/ko.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/ko.po	2016-04-27 22:15:13.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R tcltk package
-# src/library/tcltk/po/ko.po
+# ./tcltk/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R tcltk package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +29,7 @@
 
 #: tcltk.c:67
 msgid "parse error in R expression"
-msgstr "R 표현�(expression)� 구문분�(parse) �중� �러가 발�했습니다."
+msgstr "R 표현�(expression)� 구문분�(parse) 하� �중� �러가 발�했습니다."
 
 #: tcltk.c:176 tcltk.c:253
 msgid "tcl error.\n"
@@ -38,8 +41,7 @@
 
 #: tcltk.c:309 tcltk.c:327 tcltk.c:400 tcltk.c:463 tcltk.c:515
 msgid "invalid tclObj -- perhaps saved from another session?"
-msgstr ""
-"올바르지 않� tclObj입니다 -- 혹시 다른 세션으로부터 저장�것� 아�까요?"
+msgstr "올바르지 않� tclObj입니다 -- 혹시 다른 세션으로부터 저장�것� 아�까요?"
 
 #: tcltk.c:625
 msgid "argument list is too long in tcltk internal function 'callback_closure'"
@@ -47,7 +49,7 @@
 
 #: tcltk.c:658
 msgid "argument is not of correct type"
-msgstr "올바른 유형� ��가 아닙니다."
+msgstr "올바른 유형(correct type)� ��가 아닙니다."
 
 #: tcltk.c:709
 msgid "no DISPLAY variable so Tk is not available"
diff -Nru r-base-3.2.3/src/library/tcltk/po/pl.po r-base-3.3.1/src/library/tcltk/po/pl.po
--- r-base-3.2.3/src/library/tcltk/po/pl.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/pl.po	2016-04-27 22:15:13.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,8 +13,8 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: tcltk.c:67
 msgid "parse error in R expression"
diff -Nru r-base-3.2.3/src/library/tcltk/po/pt_BR.po r-base-3.3.1/src/library/tcltk/po/pt_BR.po
--- r-base-3.2.3/src/library/tcltk/po/pt_BR.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/pt_BR.po	2016-04-27 22:15:13.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:58-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/R-de.po r-base-3.3.1/src/library/tcltk/po/R-de.po
--- r-base-3.2.3/src/library/tcltk/po/R-de.po	2015-03-18 23:02:41.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/R-de.po	2016-03-16 23:02:43.000000000 +0000
@@ -17,7 +17,7 @@
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
 msgid "cannot handle object of mode '%s'"
-msgstr "kann object mit Modus '%s' nicht bedienen"
+msgstr "kann Objekt mit Modus '%s' nicht bedienen"
 
 msgid "cannot change names on Tcl array"
 msgstr "kann Namen eines Tcl Arrays nicht ändern"
@@ -101,7 +101,7 @@
 msgstr "Tcl/Tk auf diesem System nicht verfügbar"
 
 msgid "Tcl/Tk support files were not installed"
-msgstr "Tcl/TK Unterstützung nciht installiert"
+msgstr "Tcl/TK Unterstützung nicht installiert"
 
 #~ msgid "Loading Tcl/Tk interface ..."
 #~ msgstr "Lade Tcl/Tk Interface ..."
diff -Nru r-base-3.2.3/src/library/tcltk/po/R-ja.po r-base-3.3.1/src/library/tcltk/po/R-ja.po
--- r-base-3.2.3/src/library/tcltk/po/R-ja.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/R-ja.po	2016-03-16 23:02:43.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
 "PO-Revision-Date: 2013-02-28 04:14+0200 \n"
 "Last-Translator: Triad sou  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/R-ko.po r-base-3.3.1/src/library/tcltk/po/R-ko.po
--- r-base-3.2.3/src/library/tcltk/po/R-ko.po	2015-03-31 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/R-ko.po	2016-04-27 22:15:13.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R tcltk package
-# src/library/tcltk/po/R-ko.po
-# 
-# Copyright (C) 1995-2015 The R Core Team
-# 
+# ./tcltk/po/R-ko.po
+#
+# Copyright (C) 1995-2016 The R Core Team
+#
 # This file is distributed under the same license as the R tcltk package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-08-03 12:17\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +28,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "cannot handle object of mode '%s'"
-msgstr "모드(mode)가 '%s'� �체는 다룰 수 없습니다."
+msgstr "모드(mode)가 '%s'� �체를 다룰 수 없습니다."
 
 msgid "cannot change names on Tcl array"
 msgstr "Tcl 배열� 있는 �름� 변경할 수 없습니다."
@@ -103,10 +106,10 @@
 msgstr "'pb'는 �래스 %s로부터 나온것� 아닙니다."
 
 msgid "'filters' must be a 2-column character matrix"
-msgstr "'filters'는 반드시 2개� 열� 가진 문�형 행렬�어야 합니다."
+msgstr "'filters'는 반드시 2개� 열로 �루어진 문�형 행렬�어야 합니다."
 
 msgid "Tcl/Tk support is not available on this system"
-msgstr "� 시스템�서는 Tcl/Tk� 지��지 않습니다."
+msgstr "� 시스템�서 Tcl/Tk를 사용할 수 없습니다."
 
 msgid "Tcl/Tk support files were not installed"
-msgstr "Tcl/Tk� 지�하는 파�들� 설치�지 않았습니다."
+msgstr "Tcl/Tk� 사용하는� 필요한 파�들� 설치�지 않았습니다."
diff -Nru r-base-3.2.3/src/library/tcltk/po/R-pl.po r-base-3.3.1/src/library/tcltk/po/R-pl.po
--- r-base-3.2.3/src/library/tcltk/po/R-pl.po	2015-03-27 23:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/R-pl.po	2016-04-27 22:15:13.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-02 10:09\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,92 +13,151 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-msgid "cannot handle object of mode '%s'"
-msgstr "nie można obsłużyć obiektu o trybie '%s'"
+#. R/utils.R: stop("'filters' must be a 2-column character matrix")
+#: R/utils.R:0
+msgid "'filters' must be a 2-column character matrix"
+msgstr "'filters' muszą być 2-kolumnowymi macierzami znaków"
 
-msgid "cannot change names on Tcl array"
-msgstr "nie można zmienić nazw w tablicy Tcl"
+#. R/utils.R: gettextf("'pb' is not from class %s", dQuote("tkProgressBar"))
+#. R/utils.R: gettextf("'pb' is not from class %s", dQuote("tkProgressBar"))
+#: R/utils.R:0
+msgid "'pb' is not from class %s"
+msgstr "'pb' nie pochodzi z klasy %s"
 
-msgid "cannot set length of Tcl array"
-msgstr "nie można ustawić długości tablicy Tcl"
+#. R/utils.R: gettext("Cancel")
+#: R/utils.R:0
+msgid "Cancel"
+msgstr "Anuluj"
 
-msgid "Tcl package '%s' not found"
-msgstr "Pakiet Tcl '%s' nie został znaleziony"
+#. R/tkGUI.R: gettext("Demos")
+#: R/tkGUI.R:0
+msgid "Demos"
+msgstr "Dema"
 
-msgid "The tkGUI is not available under Windows"
-msgstr "tkGUI nie jest dostępne w systemie Windows"
+#. R/tkGUI.R: gettext("Density")
+#: R/tkGUI.R:0
+msgid "Density"
+msgstr "Gęstość"
 
+#. R/tkGUI.R: gettext("Don't save workspace")
+#: R/tkGUI.R:0
+msgid "Don't save workspace"
+msgstr "Nie zapisuj obszaru roboczego"
+
+#. R/tkGUI.R: gettext("File")
+#: R/tkGUI.R:0
 msgid "File"
 msgstr "Plik"
 
-msgid "Demos"
-msgstr "Dema"
-
-msgid "Packages"
-msgstr "Pakiety"
+#. R/tkGUI.R: gettext("Go get them!")
+#: R/tkGUI.R:0
+msgid "Go get them!"
+msgstr "Bierz je!"
 
+#. R/tkGUI.R: gettext("Help")
+#: R/tkGUI.R:0
 msgid "Help"
 msgstr "Pomoc"
 
-msgid "Source R code"
-msgstr "Źródłowy kod R"
-
-msgid "Quit"
-msgstr "Wyjście"
-
-msgid "Save workspace"
-msgstr "Zapisz obszar roboczy"
-
-msgid "Don't save workspace"
-msgstr "Nie zapisuj obszaru roboczego"
-
-msgid "t test"
-msgstr "test t-Studenta"
+#. R/tkGUI.R: gettext("Help topic:")
+#: R/tkGUI.R:0
+msgid "Help topic:"
+msgstr "Temat pomocy:"
 
-msgid "Density"
-msgstr "Gęstość"
+#. R/tkGUI.R: gettext("Install packages from CRAN")
+#: R/tkGUI.R:0
+msgid "Install packages from CRAN"
+msgstr "Zainstaluj pakiety z repozytorium CRAN"
 
+#. R/tkGUI.R: gettext("Interactive linear fitting")
+#: R/tkGUI.R:0
 msgid "Interactive linear fitting"
 msgstr "Interaktywne dopasowanie liniowe"
 
-msgid "R FAQ"
-msgstr "FAQ dla R"
-
+#. R/tkGUI.R: gettext("Load")
+#: R/tkGUI.R:0
 msgid "Load"
 msgstr "Załaduj"
 
-msgid "Go get them!"
-msgstr "Bierz je!"
-
+#. R/tkGUI.R: gettext("Load packages")
+#: R/tkGUI.R:0
 msgid "Load packages"
 msgstr "Załaduj pakiety"
 
-msgid "Install packages from CRAN"
-msgstr "Zainstaluj pakiety z repozytorium CRAN"
-
-msgid "Help topic:"
-msgstr "Temat pomocy:"
-
+#. R/tkGUI.R: gettext("Manuals in PDF format")
+#: R/tkGUI.R:0
 msgid "Manuals in PDF format"
 msgstr "Podręczniki w formacie PDF"
 
+#. R/utils.R: gettext("OK")
+#: R/utils.R:0
 msgid "OK"
 msgstr "OK"
 
-msgid "Cancel"
-msgstr "Anuluj"
+#. R/tkGUI.R: gettext("Packages")
+#: R/tkGUI.R:0
+msgid "Packages"
+msgstr "Pakiety"
 
-msgid "'pb' is not from class %s"
-msgstr "'pb' nie pochodzi z klasy %s"
+#. R/tkGUI.R: gettext("Quit")
+#: R/tkGUI.R:0
+msgid "Quit"
+msgstr "Wyjście"
 
-msgid "'filters' must be a 2-column character matrix"
-msgstr "'filters' muszą być 2-kolumnowymi macierzami znaków"
+#. R/tkGUI.R: gettext("R FAQ")
+#: R/tkGUI.R:0
+msgid "R FAQ"
+msgstr "FAQ dla R"
 
-msgid "Tcl/Tk support is not available on this system"
-msgstr "Obsługa Tcl/Tk nie jest dostępna dla tego systemu"
+#. R/tkGUI.R: gettext("Save workspace")
+#: R/tkGUI.R:0
+msgid "Save workspace"
+msgstr "Zapisz obszar roboczy"
+
+#. R/tkGUI.R: gettext("Source R code")
+#: R/tkGUI.R:0
+msgid "Source R code"
+msgstr "Źródłowy kod R"
+
+#. R/tclsearch.R: gettextf("Tcl package '%s' not found", package)
+#: R/tclsearch.R:0
+msgid "Tcl package '%s' not found"
+msgstr "Pakiet Tcl '%s' nie został znaleziony"
 
+#. R/windows/zzz.R: stop("Tcl/Tk support files were not installed", call. = FALSE)
+#: R/windows/zzz.R:0
 msgid "Tcl/Tk support files were not installed"
 msgstr "Pliki obsługujące Tcl/Tk nie zostały zainstalowane"
+
+#. R/unix/zzzstub.R: stop("Tcl/Tk support is not available on this system", domain = "R-tcltk")
+#: R/unix/zzzstub.R:0
+msgid "Tcl/Tk support is not available on this system"
+msgstr "Obsługa Tcl/Tk nie jest dostępna dla tego systemu"
+
+#. R/tkGUI.R: stop("The tkGUI is not available under Windows")
+#: R/tkGUI.R:0
+msgid "The tkGUI is not available under Windows"
+msgstr "tkGUI nie jest dostępne w systemie Windows"
+
+#. R/tclarray.R: stop("cannot change names on Tcl array")
+#: R/tclarray.R:0
+msgid "cannot change names on Tcl array"
+msgstr "nie można zmienić nazw w tablicy Tcl"
+
+#. R/Tk.R: gettextf("cannot handle object of mode '%s'", storage.mode(x))
+#: R/Tk.R:0
+msgid "cannot handle object of mode '%s'"
+msgstr "nie można obsłużyć obiektu o trybie '%s'"
+
+#. R/tclarray.R: stop("cannot set length of Tcl array")
+#: R/tclarray.R:0
+msgid "cannot set length of Tcl array"
+msgstr "nie można ustawić długości tablicy Tcl"
+
+#. R/tkGUI.R: gettext("t test")
+#: R/tkGUI.R:0
+msgid "t test"
+msgstr "test t-Studenta"
diff -Nru r-base-3.2.3/src/library/tcltk/po/R-ru.po r-base-3.3.1/src/library/tcltk/po/R-ru.po
--- r-base-3.2.3/src/library/tcltk/po/R-ru.po	2015-03-18 23:02:41.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/R-ru.po	2016-04-27 22:15:13.000000000 +0000
@@ -11,7 +11,7 @@
 "Project-Id-Version: R 2.9.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
 "POT-Creation-Date: 2014-08-03 12:17\n"
-"PO-Revision-Date: 2013-03-19 21:49-0600\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -19,8 +19,7 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "First-Translator: Dmitri I GOULIAEV <dmitri.gouliaev@telkel.net\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgid "cannot handle object of mode '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÒÁÂÏÔÁÔØ Ó ÏÂßÅËÔÏÍ ×ÉÄÁ '%s'"
@@ -111,6 +110,6 @@
 
 #~ msgid "Loading Tcl/Tk interface ..."
 #~ msgstr "úÁÇÒÕÖÁÀ ÉÎÔÅÒÆÅÊÓ Tcl/Tk..."
-
 #~ msgid "done"
 #~ msgstr "ÇÏÔÏ×Ï"
+
diff -Nru r-base-3.2.3/src/library/tcltk/po/R-tcltk.pot r-base-3.3.1/src/library/tcltk/po/R-tcltk.pot
--- r-base-3.2.3/src/library/tcltk/po/R-tcltk.pot	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/R-tcltk.pot	2016-04-27 22:15:12.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: tcltk 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/ru.po r-base-3.3.1/src/library/tcltk/po/ru.po
--- r-base-3.2.3/src/library/tcltk/po/ru.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/ru.po	2016-04-27 22:15:13.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: R 2.10.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2013-03-19 21:49-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:08-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -18,30 +18,33 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: tcltk.c:67
 msgid "parse error in R expression"
 msgstr "ÏÛÉÂËÁ ÒÁÚÂÏÒÁ ×ÙÒÁÖÅÎÉÑ R"
 
-#: tcltk.c:176 tcltk.c:253
+#: tcltk.c:176
+#: tcltk.c:253
 msgid "tcl error.\n"
 msgstr "ÏÛÉÂËÁ tcl.\n"
 
-#: tcltk.c:205 tcltk.c:750
+#: tcltk.c:205
+#: tcltk.c:750
 msgid "invalid argument"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ"
 
-#: tcltk.c:309 tcltk.c:327 tcltk.c:400 tcltk.c:463 tcltk.c:515
+#: tcltk.c:309
+#: tcltk.c:327
+#: tcltk.c:400
+#: tcltk.c:463
+#: tcltk.c:515
 msgid "invalid tclObj -- perhaps saved from another session?"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ tclObj -- ÍÏÖÅÔ ÂÙÔØ, ÓÏÈÒÁÎÅÎÎÙÊ × ÄÒÕÇÏÊ ÓÅÓÓÉÉ?"
 
 #: tcltk.c:625
 msgid "argument list is too long in tcltk internal function 'callback_closure'"
-msgstr ""
-"ÓÐÉÓÏË ÁÒÇÕÍÅÎÔÏ× ÓÌÉÛËÏÍ ÄÌÉÎÅÎ ×Ï ×ÎÕÔÒÅÎÎÅÊ ÆÕÎËÃÉÉ tcltk "
-"'callback_closure'"
+msgstr "ÓÐÉÓÏË ÁÒÇÕÍÅÎÔÏ× ÓÌÉÛËÏÍ ÄÌÉÎÅÎ ×Ï ×ÎÕÔÒÅÎÎÅÊ ÆÕÎËÃÉÉ tcltk 'callback_closure'"
 
 #: tcltk.c:658
 msgid "argument is not of correct type"
@@ -61,3 +64,4 @@
 
 #~ msgid "Tcl already loaded"
 #~ msgstr "Tcl ÕÖÅ ÚÁÇÒÕÖÅÎ"
+
diff -Nru r-base-3.2.3/src/library/tcltk/po/tcltk.pot r-base-3.3.1/src/library/tcltk/po/tcltk.pot
--- r-base-3.2.3/src/library/tcltk/po/tcltk.pot	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/tcltk.pot	2016-04-27 22:15:13.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: tcltk 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru r-base-3.2.3/src/library/tcltk/po/zh_CN.po r-base-3.3.1/src/library/tcltk/po/zh_CN.po
--- r-base-3.2.3/src/library/tcltk/po/zh_CN.po	2015-06-06 22:15:24.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/po/zh_CN.po	2016-04-27 22:15:13.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@avaya.com>\n"
 "Language-Team: Chinese\n"
diff -Nru r-base-3.2.3/src/library/tcltk/R/unix/zzz.R r-base-3.3.1/src/library/tcltk/R/unix/zzz.R
--- r-base-3.2.3/src/library/tcltk/R/unix/zzz.R	2015-08-25 22:15:27.000000000 +0000
+++ r-base-3.3.1/src/library/tcltk/R/unix/zzz.R	2016-03-16 23:02:41.000000000 +0000
@@ -42,10 +42,9 @@
         ## common cause of problems with CRAN binary installs reported
         ## for Rcmdr.
         if (file.exists("/usr/bin/otool")) {
-            ## This is part of the OS nowadays.
-            r_arch <- .Platform$r_arch
-            DLL <- file.path(libname, pkgname, "libs", r_arch, "tcltk.so")
-            out <- system2("/usr/bin/otool", c("-L", shQuote(DLL)), stdout = TRUE)
+            ## otool is part of the OS nowadays.
+            DSO <- file.path(libname, pkgname, "libs", .Platform$r_arch, "tcltk.so")
+            out <- system2("/usr/bin/otool", c("-L", shQuote(DSO)), stdout = TRUE)
             ind <- grep("libtk[.0-9]+[.]dylib", out)
             if(length(ind)) {
                 this <- sub(" .*", "", sub("^\t", "", out[ind]))
diff -Nru r-base-3.2.3/src/library/tools/DESCRIPTION.in r-base-3.3.1/src/library/tools/DESCRIPTION.in
--- r-base-3.2.3/src/library/tools/DESCRIPTION.in	2015-08-31 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/tools/DESCRIPTION.in	2016-03-16 23:03:31.000000000 +0000
@@ -6,4 +6,4 @@
 Maintainer: R Core Team <R-core@r-project.org>
 Description: Tools for package development, administration and documentation.
 License: Part of R @VERSION@
-Suggests: XML, codetools, methods
+Suggests: codetools, methods, xml2
diff -Nru r-base-3.2.3/src/library/tools/man/dependsOnPkgs.Rd r-base-3.3.1/src/library/tools/man/dependsOnPkgs.Rd
--- r-base-3.2.3/src/library/tools/man/dependsOnPkgs.Rd	2015-09-06 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/dependsOnPkgs.Rd	2016-03-16 23:03:32.000000000 +0000
@@ -22,7 +22,8 @@
   \item{dependencies}{a character vector listing the types of
     dependencies, a subset of
     \code{c("Depends", "Imports", "LinkingTo", "Suggests", "Enhances")}.
-    Character string \code{"all"} is shorthand for that vector.}
+    Character string \code{"all"} is shorthand for that vector, and
+    \code{"most"} currently shorthand for these apart from \code{"Enhances"}.}
   \item{recursive}{logical: should reverse dependencies of reverse
     dependencies (and so on) be included?}
   \item{lib.loc}{a character vector of \R library trees, or \code{NULL}
diff -Nru r-base-3.2.3/src/library/tools/man/getDepList.Rd r-base-3.3.1/src/library/tools/man/getDepList.Rd
--- r-base-3.2.3/src/library/tools/man/getDepList.Rd	2015-08-25 22:16:58.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/getDepList.Rd	2016-03-16 23:03:31.000000000 +0000
@@ -8,10 +8,17 @@
 \alias{pkgDepends}
 \title{Functions to Retrieve Dependency Information}
 \description{
-  Given a dependency matrix, will create a \code{DependsList} object for that
-  package which will include the dependencies for that matrix, which
-  ones are installed, which unresolved dependencies were found online,
-  which unresolved dependencies were not found online, and any R dependencies.
+  These functions retrieve information about the dependencies of
+  a package or a dependency matrix, resulting in a \code{DependsList} object.
+
+  Given a dependency matrix, \code{getDepList()} creates a
+  \code{DependsList} object for that package.  That object includes the
+  dependencies for that matrix, which ones are installed, which
+  unresolved dependencies were found online, which unresolved
+  dependencies were not found online, and any R dependencies.
+
+  \code{pkgDepends()} for convenience takes a package name, builds a
+  dependency matrix and then returns a corresponding \code{getDepList()}.
 }
 \usage{
 getDepList(depMtrx, instPkgs, recursive = TRUE, local = TRUE,
@@ -21,42 +28,26 @@
            lib.loc = NULL)
 }
 \arguments{
-  \item{depMtrx}{A dependency matrix as from \code{package.dependencies}}
-  \item{pkg}{The name of the package}
-  \item{instPkgs}{A matrix specifying all packages installed on the
+  \item{depMtrx}{a dependency matrix as from \code{\link{package.dependencies}()}.}
+  \item{pkg}{the name of the package}
+  \item{instPkgs}{a matrix specifying all packages installed on the
     local system, as from \code{installed.packages}}
-  \item{recursive}{Whether or not to include indirect dependencies}
-  \item{local}{Whether or not to search only locally}
-  \item{reduce}{Whether or not to collapse all sets of dependencies to a
+  \item{recursive}{whether or not to include indirect dependencies.}
+  \item{local}{whether or not to search only locally}
+  \item{reduce}{whether or not to collapse all sets of dependencies to a
     minimal value}
-  \item{lib.loc}{What libraries to use when looking for installed
+  \item{lib.loc}{what libraries to use when looking for installed
     packages.  \code{NULL} indicates all library directories in the
-    user's \code{.libPaths()}.}
+    current \code{.libPaths()}.
+    Note that \code{lib.loc} is not used in \code{getDepList()} and
+    deprecated there.}
 }
 \details{
-  The function \code{pkgDepends} is a convenience function which wraps
-  \code{getDepList} and takes as input a package name.  It will then
-  query \code{\link{installed.packages}}
-  and also generate a dependency
+  The convenience function \code{pkgDepends(pkg)} queries
+  \code{\link{installed.packages}} and generates a dependency
   matrix, calling \code{getDepList} with this information and returning
   the result.
 
-  These functions will retrieve information about the dependencies of
-  the matrix, resulting in a \code{DependsList} object.  This is a
-  list with four elements:
-  \describe{
-    \item{Depends}{A vector of the dependencies for this package.}
-    \item{Installed}{A vector of the dependencies which have been
-      satisfied by the currently installed packages.}
-    \item{Found}{A list representing the dependencies which are not in
-      \code{Installed} but were found online.  This list has element
-      names which are the URLs for the repositories in which packages
-      were found and the elements themselves are vectors of package
-      names which were found in the respective repositories.  If
-      \code{local = TRUE}, the \code{Found} element will always be empty.}
-    \item{R}{Any R version dependencies.}
-  }
-
   If \code{recursive} is \code{TRUE}, any package that is specified as a
   dependency will in turn have its dependencies included (and so on),
   these are known as indirect dependencies.  If \code{recursive} is
@@ -73,7 +64,19 @@
   \samp{foo (>= 1.3.0)}).
 }
 \value{
-  An object of class \code{"DependsList"}.
+  An object of S3 class \code{"DependsList"}, which is a \code{\link{list}}
+  with components
+  \item{Depends}{A vector of the dependencies for this package.}
+  \item{Installed}{A vector of the dependencies which have been
+    satisfied by the currently installed packages.}
+  \item{Found}{A list representing the dependencies which are not in
+    \code{Installed} but were found online.  This list has element
+    names which are the URLs for the repositories in which packages
+    were found and the elements themselves are vectors of package
+    names which were found in the respective repositories.  If
+    \code{local = TRUE}, the \code{Found} element will always be empty.}
+  \item{NotFound}{...}
+  \item{R}{Any R version dependencies.}
 }
 \author{ Jeff Gentry }
 \seealso{\code{\link{installFoundDepends}}}
diff -Nru r-base-3.2.3/src/library/tools/man/installFoundDepends.Rd r-base-3.3.1/src/library/tools/man/installFoundDepends.Rd
--- r-base-3.2.3/src/library/tools/man/installFoundDepends.Rd	2015-08-25 22:16:59.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/installFoundDepends.Rd	2016-03-16 23:03:32.000000000 +0000
@@ -10,6 +10,8 @@
   This function will take the \code{Found} element of a
   \code{pkgDependsList} object and attempt to install
   all of the listed packages from the specified repositories.
+
+  \emph{This function is deprecated since \code{pkgDependsList} objects are.}
 }
 \usage{
 installFoundDepends(depPkgList, ...)
diff -Nru r-base-3.2.3/src/library/tools/man/loadRdMacros.Rd r-base-3.3.1/src/library/tools/man/loadRdMacros.Rd
--- r-base-3.2.3/src/library/tools/man/loadRdMacros.Rd	2015-08-25 22:16:59.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/loadRdMacros.Rd	2016-03-16 23:03:32.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/tools/man/loadRdMacros.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2014 R Core Team
+% Copyright 2016 R Core Team
 % Distributed under GPL 2 or later
 
 
@@ -8,11 +8,11 @@
 \alias{loadRdMacros}
 \alias{loadPkgRdMacros}
 \title{
-Load user-defined Rd help system macros.
+  Load user-defined Rd help system macros.
 }
 \description{
-Loads macros from an \file{.Rd} file, or from several \file{.Rd}
-files contained in a package.
+  Loads macros from an \file{.Rd} file, or from several \file{.Rd}
+  files contained in a package.
 }
 \usage{
 loadRdMacros(file, macros = TRUE)
@@ -20,42 +20,44 @@
 }
 \arguments{
   \item{file}{
-A file in Rd format containing macro definitions.
-}
+    A file in Rd format containing macro definitions.
+  }
   \item{macros}{
-\code{TRUE} or a previous set of macro definitions, in the format expected by the
-\code{\link{parse_Rd}} \code{macros} argument.
-}
+    \code{TRUE} or a previous set of macro definitions, in the format
+    expected by the \code{\link{parse_Rd}} \code{macros} argument. 
+  }
   \item{pkgdir}{
-The base directory of a source package or an installed package.
-}
+    The base directory of a source package or an installed package.
+  }
 }
 \details{
-The files parsed by this function should contain only macro definitions;
-a warning will be issued if anything else other than comments or white space
-is found.
+  The files parsed by this function should contain only macro
+  definitions; a warning will be issued if anything else other than
+  comments or white space is found.
 
-The \code{macros} argument may be a filename of a base set of macros,
-or the result of a previous call to \code{loadRdMacros} or \code{loadPkgRdMacros}
-in the same session.  These results should be assumed to be valid only within
-the current session.
+  The \code{macros} argument may be a filename of a base set of macros,
+  or the result of a previous call to \code{loadRdMacros} or
+  \code{loadPkgRdMacros} in the same session.  These results should be
+  assumed to be valid only within the current session.
 
-The \code{loadPkgMacros} function first looks for an \code{"RdMacros"} 
-entry in the package \file{DESCRIPTION} file.  If present, it should contain
-a comma-separated list of other package names; their macros will be loaded
-before those of the current package.  It will then look in the current 
-package for \file{.Rd} files in the \file{man/macros} or \file{help/macros}
-subdirectories, and load those.
+  The \code{loadPkgMacros} function first looks for an \code{"RdMacros"}
+  entry in the package \file{DESCRIPTION} file.  If present, it should
+  contain a comma-separated list of other package names; their macros
+  will be loaded before those of the current package.  It will then look
+  in the current package for \file{.Rd} files in the \file{man/macros}
+  or \file{help/macros} subdirectories, and load those.
 }
 \value{
-These functions each return an environment containing objects with the names
-of the newly defined macros from the last file processed.  The parent
-environment will be macros from the previous file, and so on.  The first
-file processed will have \code{\link{emptyenv}()} as its parent.
+  These functions each return an environment containing objects with the
+  names of the newly defined macros from the last file processed.  The
+  parent environment will be macros from the previous file, and so on.
+  The first file processed will have \code{\link{emptyenv}()} as its
+  parent.
 }
 \references{
-See the \sQuote{Writing \R Extensions} manual for the syntax of Rd files,
-or \url{http://developer.r-project.org/parseRd.pdf} for a technical discussion.
+  See the \sQuote{Writing \R Extensions} manual for the syntax of Rd files,
+  or \url{https://developer.r-project.org/parseRd.pdf} for a technical
+  discussion.
 }
 \author{
 Duncan Murdoch
@@ -66,8 +68,8 @@
 \examples{
 \donttest{
 f <- tempfile()
-writeLines(paste0("\\\\newcommand{\\\\logo}{\\\\if{html}{\\\\figure{logo.jpg}}",
-                  "\\\\if{latex}{\\\\figure{logo.jpg}{options: width=0.5in}}}"),
+writeLines(paste0("\\\\newcommand{\\\\logo}{\\\\if{html}{\\\\figure{Rlogo.svg}{options: width=100}",
+                  "\\\\if{latex}{\\\\figure{Rlogo.pdf}{options: width=0.5in}}}"),
 	    f)
 m <- loadRdMacros(f)
 ls(m)
diff -Nru r-base-3.2.3/src/library/tools/man/makevars.Rd r-base-3.3.1/src/library/tools/man/makevars.Rd
--- r-base-3.2.3/src/library/tools/man/makevars.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/makevars.Rd	2016-04-24 22:15:04.000000000 +0000
@@ -0,0 +1,41 @@
+% File src/library/tools/man/makevars.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 2016 R Core Team
+% Distributed under GPL 2 or later
+
+\name{makevars}
+\alias{makevars_user}
+\alias{makevars_site}
+\title{User and Site Compilation Variables}
+\usage{
+makevars_user()
+makevars_site()
+}
+\description{
+  Determine the location of the user and site specific \file{Makevars}
+  files for customizing package compilation.
+}
+\value{
+  A character string with the path to the user or site specific
+  \file{Makevars} file, or an empty character vector if there is no such
+  file.
+}
+\details{
+  Package maintainers can use these functions to employ user and site
+  specific compilation settings also for compilations not using \R's
+  mechanisms (in particular, custom compilations in subdirectories of
+  \file{src}), e.g., by adding configure code calling \R with
+  \code{cat(tools::makevars_user())} or
+  \code{cat(tools::makevars_site())}, and if non-empty passing this with
+  \option{-f} to custom Make invocations.
+}
+\seealso{
+  Section \dQuote{Customizing package compilation} in the 
+  \dQuote{R Installation and Administration} manual.
+}
+%% \donttest as output is user/site-dependent
+\examples{\donttest{
+makevars_user()
+makevars_site()
+}}
+\keyword{utilities}
diff -Nru r-base-3.2.3/src/library/tools/man/package_dependencies.Rd r-base-3.3.1/src/library/tools/man/package_dependencies.Rd
--- r-base-3.2.3/src/library/tools/man/package_dependencies.Rd	2015-08-25 22:16:59.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/package_dependencies.Rd	2016-03-16 23:03:32.000000000 +0000
@@ -10,13 +10,14 @@
    Find (recursively) dependencies or reverse dependencies of packages.
 }
 \usage{
-package_dependencies(packages = NULL, db,
+package_dependencies(packages = NULL, db = NULL,
         which = c("Depends", "Imports", "LinkingTo"),
 	recursive = FALSE, reverse = FALSE, verbose = getOption("verbose"))
 }
 \arguments{
   \item{packages}{a character vector of package names.}
-  \item{db}{character matrix as from \code{\link{available.packages}()},
+  \item{db}{character matrix as from \code{\link{available.packages}()}
+    (with the default \code{NULL} the results of this call)
     or data frame variants thereof.  Alternatively, a package database
     like the one available from
     \url{https://cran.r-project.org/web/packages/packages.rds}.
diff -Nru r-base-3.2.3/src/library/tools/man/package.dependencies.Rd r-base-3.3.1/src/library/tools/man/package.dependencies.Rd
--- r-base-3.2.3/src/library/tools/man/package.dependencies.Rd	2015-08-25 22:16:59.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/package.dependencies.Rd	2016-03-16 23:03:32.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/tools/man/package.dependencies.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{package.dependencies}
diff -Nru r-base-3.2.3/src/library/tools/man/parse_Rd.Rd r-base-3.3.1/src/library/tools/man/parse_Rd.Rd
--- r-base-3.2.3/src/library/tools/man/parse_Rd.Rd	2015-08-25 22:16:59.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/parse_Rd.Rd	2016-03-02 23:02:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/tools/man/parse_Rd.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2008-2014 R Core Team
+% Copyright 2008-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{parse_Rd}
@@ -42,7 +42,7 @@
 }
 \details{
   This function parses \file{Rd} files according to the specification given
-  in \url{http://developer.r-project.org/parseRd.pdf}.
+  in \url{https://developer.r-project.org/parseRd.pdf}.
 
   It generates a warning for each parse error and attempts to continue
   parsing.  In order to continue, it is generally necessary to drop some
@@ -83,7 +83,7 @@
   guaranteed to work if saved to a file and reloaded in a different 
   session.
 }
-\references{ \url{http://developer.r-project.org/parseRd.pdf} }
+\references{ \url{https://developer.r-project.org/parseRd.pdf} }
 \author{ Duncan Murdoch }
 \seealso{
   \code{\link{Rd2HTML}} for the converters that use the output of
diff -Nru r-base-3.2.3/src/library/tools/man/QC.Rd r-base-3.3.1/src/library/tools/man/QC.Rd
--- r-base-3.2.3/src/library/tools/man/QC.Rd	2015-08-25 22:16:58.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/QC.Rd	2016-03-16 23:03:31.000000000 +0000
@@ -1,27 +1,33 @@
 % File src/library/tools/man/QC.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{QC}
+\title{QC Checks for R Code and/or Documentation}
 \alias{QC}
 \alias{checkDocFiles}
 \alias{checkDocStyle}
 \alias{checkReplaceFuns}
 \alias{checkS3methods}
+\alias{nonS3methods}
+\alias{langElts}
 \alias{print.checkDocFiles}
 \alias{print.checkDocStyle}
 \alias{print.checkReplaceFuns}
 \alias{print.checkS3methods}
-\title{QC Checks for R Code and/or Documentation}
 \description{
-  Functions for performing various quality checks.
+  Functions for performing various quality control (QC) checks on R code
+  and documentation, notably on R packages.
 }
 \usage{
 checkDocFiles(package, dir, lib.loc = NULL)
 checkDocStyle(package, dir, lib.loc = NULL)
 checkReplaceFuns(package, dir, lib.loc = NULL)
 checkS3methods(package, dir, lib.loc = NULL)
+
+langElts
+nonS3methods(package)
 }
 \arguments{
   \item{package}{a character string naming an installed package.}
@@ -75,7 +81,17 @@
   installed package is tested, also in the loaded namespaces/packages
   listed in the package's \file{DESCRIPTION} Depends field.
 
-  If using an installed package, the checks needing access to all R
+  \code{nonS3methods(package)} returns a \code{\link{character}} vector with
+  the names of the functions in \code{package} which \sQuote{look} like
+  S3 methods, but are not.  Using \code{package = NULL} returns all
+  known examples.
+
+  \code{langElts} is a character vector of names of \dQuote{language
+    elements} of \R.  These are implemented as \dQuote{very primitive}
+  functions (no argument list; \code{\link{print}()}ing as
+  \code{.Primitive("<name>")}).
+
+  If using an installed package, the checks needing access to all \R
   objects of the package will load the package (unless it is the
   \pkg{base} package), after possibly detaching an already loaded
   version of the package.
diff -Nru r-base-3.2.3/src/library/tools/man/Rcmd.Rd r-base-3.3.1/src/library/tools/man/Rcmd.Rd
--- r-base-3.2.3/src/library/tools/man/Rcmd.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/Rcmd.Rd	2016-04-24 22:15:04.000000000 +0000
@@ -0,0 +1,27 @@
+% File src/library/tools/man/Rcmd.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 2016 R Core Team
+% Distributed under GPL 2 or later
+
+\name{Rcmd}
+\alias{Rcmd}
+\title{R CMD Interface}
+\description{
+  Invoke \command{R CMD} tools from within \R.
+}
+\usage{
+Rcmd(args, ...)
+}
+\arguments{
+  \item{args}{a character vector of arguments to \command{R CMD}.}
+  \item{\dots}{arguments to be passed to \code{\link{system2}}.}
+}
+\value{
+  See section \dQuote{Value} in \code{\link{system2}}.
+}
+\details{
+  Provides a portable convenience interface to the \command{R CMD}
+  mechanism by invoking the corresponding system commands (using the
+  version of \R currently used) via \code{\link{system2}}.
+}
+\keyword{utilities}
diff -Nru r-base-3.2.3/src/library/tools/man/Rd2HTML.Rd r-base-3.3.1/src/library/tools/man/Rd2HTML.Rd
--- r-base-3.2.3/src/library/tools/man/Rd2HTML.Rd	2015-09-10 22:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/Rd2HTML.Rd	2016-03-02 23:02:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/tools/man/Rd2HTML.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 2008-2014 R Core Team
+% Copyright 2008-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{Rd2HTML}
@@ -155,7 +155,7 @@
 \author{
   Duncan Murdoch, Brian Ripley
 }
-\references{ \url{http://developer.r-project.org/parseRd.pdf} }
+\references{ \url{https://developer.r-project.org/parseRd.pdf} }
 \seealso{
   \code{\link{parse_Rd}}, \code{\link{checkRd}},
   \code{\link{findHTMLlinks}}, \code{\link{Rd2txt_options}}.
diff -Nru r-base-3.2.3/src/library/tools/man/startDynamicHelp.Rd r-base-3.3.1/src/library/tools/man/startDynamicHelp.Rd
--- r-base-3.2.3/src/library/tools/man/startDynamicHelp.Rd	2015-08-25 22:16:58.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/startDynamicHelp.Rd	2016-03-16 23:03:31.000000000 +0000
@@ -23,10 +23,11 @@
 \details{
   This function starts the internal HTTP server, which runs on the
   loopback interface (\code{127.0.0.1}).  If \code{options("help.ports")}
-  is set to a vector of integer values, \code{startDynamicHelp} will try
+  is set to a vector of non-zero integer values, \code{startDynamicHelp} will try
   those ports in order; otherwise, it tries up to 10 random ports to
   find one not in use.  It can be disabled by setting the environment
-  variable \env{R_DISABLE_HTTPD} to a non-empty value.
+  variable \env{R_DISABLE_HTTPD} to a non-empty value or \code{options("help.ports")}
+  to \code{0}.
 
   \code{startDynamicHelp} is called by functions that need to use the
   server, so would rarely be called directly by a user.
diff -Nru r-base-3.2.3/src/library/tools/man/texi2dvi.Rd r-base-3.3.1/src/library/tools/man/texi2dvi.Rd
--- r-base-3.2.3/src/library/tools/man/texi2dvi.Rd	2015-10-19 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/texi2dvi.Rd	2016-02-27 23:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/tools/man/texi2dvi.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{texi2dvi}
@@ -8,8 +8,8 @@
 \alias{texi2pdf}
 \title{Compile LaTeX Files}
 \description{
-  Run \code{latex} and \code{bibtex} until all cross-references are
-  resolved and create either a dvi or a PDF file.
+  Run \code{latex}/\code{pdflatex}, \code{makeindex} and \code{bibtex}
+  until all cross-references are resolved to create a dvi or a PDF file.
 }
 \usage{
 texi2dvi(file, pdf = FALSE, clean = FALSE, quiet = TRUE,
@@ -21,18 +21,19 @@
          texinputs = NULL, index = TRUE)
 }
 \arguments{
-  \item{file}{character string.  Name of LaTeX source file.}
+  \item{file}{character string.  Name of the LaTeX source file.}
   \item{pdf}{logical.  If \code{TRUE}, a PDF file is produced instead of
     the default dvi file (\code{texi2dvi} command line option \option{--pdf}).}
   \item{clean}{logical.  If \code{TRUE}, all auxiliary files created
     during the conversion are removed.}
   \item{quiet}{logical.  No output unless an error occurs.}
-  \item{texi2dvi}{character string (or \code{NULL}).  Script or program used to
-    compile a TeX file to dvi or PDF.
-    The default (selected by \code{""} or \code{NULL}) is to look for a
-    program or script named \file{texi2dvi} on the path and otherwise
-    emulate the script with \code{system2} calls (which can be selected
-    by the value \code{"emulation"}).} 
+  \item{texi2dvi}{character string (or \code{NULL}).  Script or program
+    used to compile a TeX file to dvi or PDF. The default (selected
+    by \code{""} or \code{"texi2dvi"} or \code{NULL}) is to look
+    for a program or script named \file{texi2dvi} on the path and
+    otherwise emulate the script with \code{system2} calls (which
+    can be selected by the value \code{"emulation"}).  See also
+    \sQuote{Details}.} 
   \item{texinputs}{\code{NULL} or a character vector of paths to add to
     the LaTeX and bibtex input search paths.}
   \item{index}{logical: should indices be prepared?}
@@ -42,29 +43,35 @@
   \code{texi2dvi(pdf = TRUE)}.
 
   Despite the name, this is used in \R to compile LaTeX files,
-  specifically those generated from vignettes.  It
+  specifically those generated from vignettes and by the
+  \code{\link{Rd2pdf}} script (used for package reference manuals).  It
   ensures that the \file{\var{\link{R_HOME}}/share/texmf} directory is
   in the \env{TEXINPUTS} path, so \R style files such as \file{Sweave}
   and \file{Rd} will be found.  The TeX search path used is first the
   existing \env{TEXINPUTS} setting (or the current directory if unset),
-  then elements of \code{texinputs}, then
-  \file{\var{R_HOME}/share/texmf} and finally the default
-  path.  Analogous changes are made to \env{BIBINPUTS} and
-  \env{BSTINPUTS} settings.
+  then elements of argument \code{texinputs}, then
+  \file{\var{R_HOME}/share/texmf} and finally the default path.
+  Analogous changes are made to \env{BIBINPUTS} and \env{BSTINPUTS}
+  settings.
 
 #ifdef unix
   The default option for \code{texi2dvi} is set from environment variable
   \env{R_TEXI2DVICMD}, and the default for that is set from environment
   variable \env{TEXI2DVI} or if that is unset, from a value chosen when
-  \R is configured.  A shell script \command{texi2dvi} is part of GNU's
-  \pkg{texinfo}.
+  \R is configured.
+  
+  %% issues included not re-running latex in texinfo 6.1 and bashisms in
+  %% the /bin/sh script in <= 6.0.
+  A shell script \command{texi2dvi} is part of GNU's \pkg{texinfo}.
+  Several issues have been seen with released versions, so if yours does
+  not work correctly try \env{R_TEXI2DVICMD=emulation}.
 #endif
 
 #ifdef windows
   On Windows the option \code{"texi2dvi"} is normally unset.  The MiKTeX
   command \command{texify.exe} is a suitable choice for \code{texi2dvi},
   and is tried as from \R 3.2.3 if the argument is blank or \code{NULL}
-  and \code{texi2dvi} is not found.
+  and a program or script \code{texi2dvi} is not found.
 
   MiKTeX had a \code{texi2dvi} executable until Sept 2015, but no other
   Windows TeX installation that we know of does, so emulation is used on
@@ -78,6 +85,11 @@
 }
 
 \note{
+  %% configure just looks for a texi2dvi command and does not check its
+  %% version.  Howvever, it is normally distributed with texinfo, and
+  %% that is checked to be >= 5.1.
+  %% The OS X distribution by default installs /usr/local/bin/texi2dvi,
+  %% but that is optional and OS X has /usr/bin/texi2dvi stuck at 4.8.
   There are various versions of the \command{texi2dvi} script on
   Unix-alikes and quite a number of bugs have been seen, some of which
   this \R wrapper works around.
@@ -92,11 +104,18 @@
   exist but the other two approaches do not (and may get confused by
   such files).
   
-  Where supported (\command{texi2dvi} 5.0 and later, and
-  \command{texi2dvi.exe} and \command{texify.exe} from MiKTeX), option
-  \option{--max-iterations=20} is used to avoid infinite retries.
+  Where supported (\command{texi2dvi} 5.0 and later;
+  \command{texify.exe} from MiKTeX), option \option{--max-iterations=20}
+  is used to avoid infinite retries.
   
   The emulation mode supports \code{quiet = TRUE} from \R 3.2.3 only.
+  Currently \code{clean = TRUE} only cleans up in this mode if the
+  conversion was successful---this gives users a chance to examine log
+  files in the event of error.
+  
+  All the approaches should respect the values of environment variables
+  \env{LATEX}, \env{PDFLATEX}, \env{MAKEINDEX} and \env{BIBTEX} for the
+  full paths to the corresponding commands.
 }
 \value{
   Invisible \code{NULL}.  Used for the side effect of creating a dvi or
diff -Nru r-base-3.2.3/src/library/tools/man/tools-deprecated.Rd r-base-3.3.1/src/library/tools/man/tools-deprecated.Rd
--- r-base-3.2.3/src/library/tools/man/tools-deprecated.Rd	2015-08-25 22:16:58.000000000 +0000
+++ r-base-3.3.1/src/library/tools/man/tools-deprecated.Rd	2016-03-16 23:03:31.000000000 +0000
@@ -1,18 +1,24 @@
 % File src/library/tools/man/tools-deprecated.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{tools-deprecated}
-\alias{tools-deprecated}
 \title{Deprecated Objects in Package \pkg{tools}}
+%------ NOTE:  ../R/tools-deprecated.R   must be synchronized with this!
+\alias{tools-deprecated}
+%------ PLEASE: one \alias{.} for EACH ! (+ one \usage{} & \arguments{} for all)
+%% \alias{package.dependencies}
 \description{
   The functions or variables listed here are provided for compatibility
   with older versions of \R only, and may be defunct as soon as of the
   next release.
 }
-% \usage{
-% }
+%% \usage{%% maybe use  funnname(\dots)   and have only \arguments{ \item{\dots}{} }
+%% package.dependencies(x, check = FALSE,
+%%                      depLevel =
+%%                      c("Depends", "Imports", "Suggests"))
+%% }
 \seealso{
   \code{\link{Deprecated}},
   \code{\link{Defunct}}
diff -Nru r-base-3.2.3/src/library/tools/NAMESPACE r-base-3.3.1/src/library/tools/NAMESPACE
--- r-base-3.2.3/src/library/tools/NAMESPACE	2015-03-18 23:03:16.000000000 +0000
+++ r-base-3.3.1/src/library/tools/NAMESPACE	2016-04-24 22:15:04.000000000 +0000
@@ -1,8 +1,10 @@
 useDynLib(tools, .registration = TRUE)
 
-export("Adobe_glyphs", "HTMLheader", "Rd2HTML", "Rd2ex", "Rd2latex",
-       "Rd2txt", "Rd2txt_options", "RdTextFilter", "Rd_db", "Rdiff",
-       "Rdindex", "SweaveTeXFilter", "add_datalist",
+## Bootstrapping R ==> do _not_ import, rather use  ' :: '
+
+export("Adobe_glyphs", "HTMLheader", "Rcmd", "Rd2HTML", "Rd2ex",
+       "Rd2latex", "Rd2txt", "Rd2txt_options", "RdTextFilter", "Rd_db",
+       "Rdiff", "Rdindex", "SweaveTeXFilter", "add_datalist",
        "assertCondition", "assertError", "assertWarning", "bibstyle",
        "buildVignette", "buildVignettes", "charset_to_Unicode",
        "checkDocFiles", "checkDocStyle", "checkFF", "checkMD5sums",
@@ -12,11 +14,16 @@
        "codocData", "compactPDF", "delimMatch", "deparseLatex",
        "dependsOnPkgs", "encoded_text_to_latex", "file_ext",
        "file_path_as_absolute", "file_path_sans_ext", "findHTMLlinks",
-       "find_gs_cmd", "getBibstyle", "getDepList", "getVignetteInfo",
-       "installFoundDepends", "latexToUtf8", "list_files_with_exts",
+       "find_gs_cmd", "getBibstyle", "getVignetteInfo",
+       langElts, "latexToUtf8", "list_files_with_exts",
        "list_files_with_type", "loadRdMacros", "loadPkgRdMacros",
-       "make_translations_pkg", "md5sum", "package.dependencies",
-       "package_dependencies", "parseLatex", "parse_Rd", "pkgDepends",
+       "makevars_site", "makevars_user",
+       nonS3methods,
+       "make_translations_pkg", "md5sum",
+       package.dependencies,# R/package.dependencies.R man/package.dependencies.Rd
+       getDepList, pkgDepends, installFoundDepends,# R/pkgDepends.R man/getDepList.Rd man/installFoundDepends.Rd
+       ## but vignetteDepends() calls  getDepList()
+       "package_dependencies", "parseLatex", "parse_Rd",
        "pkgVignettes", "pskill", "psnice", "read.00Index", "readNEWS",
        "resaveRdaFiles", "showNonASCII", "showNonASCIIfile",
        "startDynamicHelp", "testInstalledBasic",
@@ -48,6 +55,8 @@
 S3method("format", "check_code_usage_in_package")
 S3method("format", "check_compiled_code")
 S3method("format", "check_depdef")
+S3method("format", "check_details")
+S3method("format", "check_doi_db")
 S3method("format", "check_dotInternal")
 S3method("format", "check_make_vars")
 S3method("format", "check_package_CRAN_incoming")
@@ -74,9 +83,11 @@
 S3method("format", "codocData")
 S3method("format", "compactPDF")
 S3method("format", "subdir_tests")
-S3method("format", "summarize_CRAN_check_status")
 S3method("format", "undoc")
 
+S3method("format", "CRAN_package_reverse_dependencies_and_views")
+S3method("format", "summarize_CRAN_check_status")
+
 S3method("format", "pdf_fonts")
 S3method("format", "pdf_info")
 S3method("format", "PDF_Array")
@@ -128,9 +139,11 @@
 S3method("print", "check_compiled_code", .print.via.format)
 S3method("print", "check_demo_index")
 S3method("print", "check_depdef", .print.via.format)
+S3method("print", "check_details")
+S3method("print", "check_doi_db")
 S3method("print", "check_dotInternal", .print.via.format)
 S3method("print", "check_make_vars", .print.via.format)
-S3method("print", "check_package_CRAN_incoming", .print.via.format)
+S3method("print", "check_package_CRAN_incoming")
 S3method("print", "check_package_code_assign_to_globalenv", .print.via.format)
 S3method("print", "check_package_code_attach", .print.via.format)
 S3method("print", "check_package_code_data_into_globalenv", .print.via.format)
@@ -151,6 +164,8 @@
 S3method("print", "check_nonAPI_calls", .print.via.format)
 S3method("print", "check_url_db")
 S3method("print", "check_vignette_index")
+
+S3method("print", "CRAN_package_reverse_dependencies_and_views")
 S3method("print", "summarize_CRAN_check_status")
 
 S3method("summary", "PDF_Dictionary")
diff -Nru r-base-3.2.3/src/library/tools/po/da.po r-base-3.3.1/src/library/tools/po/da.po
--- r-base-3.2.3/src/library/tools/po/da.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/da.po	2016-04-27 22:15:26.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-11-28 22:24+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "argumentet 'files' skal være tegn"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "md5 fejlede på fil '%s'"
@@ -136,27 +136,27 @@
 msgid "invalid bind address specification"
 msgstr ""
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, fuzzy, c-format
 msgid "invalid '%s' argument"
 msgstr "ugyldig argumenttype"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr ""
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr "pskill() er ikke understøttet på denne platform"
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr "psnice() er ikke understøttet på denne platform"
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "ugyldig argumenttype"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "ikke nok hukommelse"
diff -Nru r-base-3.2.3/src/library/tools/po/de.po r-base-3.3.1/src/library/tools/po/de.po
--- r-base-3.2.3/src/library/tools/po/de.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/de.po	2016-04-27 22:15:26.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R-3.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-11 11:27+0100\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R Core <r-core@r-project.org>\n"
@@ -17,11 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "Argument 'files' muss Zeichenkette sein"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "md5 für Datei '%s' fehlgeschlagen"
@@ -136,27 +136,27 @@
 msgid "invalid bind address specification"
 msgstr "unzulässige Bindungsadressenspezifikation"
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "unzulässiges '%s' Argument"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr "Schreibfehler während Anhängen an Datei"
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr "pskill() auf dieser Plattform nicht unterstützt"
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr "psnice() auf dieser Plattform nicht unterstützt"
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "unzulässiger Argumenttyp"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "zu wenig Hauptspeicher"
diff -Nru r-base-3.2.3/src/library/tools/po/fr.po r-base-3.3.1/src/library/tools/po/fr.po
--- r-base-3.2.3/src/library/tools/po/fr.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/fr.po	2016-04-27 22:15:26.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2013-03-19 20:34+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -18,11 +18,11 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "l'argument 'files' doit être une chaîne de caractères"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "md5 a échoué sur le fichier '%s'"
@@ -147,27 +147,27 @@
 msgid "invalid bind address specification"
 msgstr "spécification d'adresse de lien incorrecte"
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "argument '%s' incorrect"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr "erreur en écriture lors du rajout dans un fichier"
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr "pskill() n'est pas supporté sur cette plateforme"
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr "psnice() n'est pas supporté sur cette plateforme"
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "type d'argument incorrect"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "plus de mémoire disponible"
diff -Nru r-base-3.2.3/src/library/tools/po/it.po r-base-3.3.1/src/library/tools/po/it.po
--- r-base-3.2.3/src/library/tools/po/it.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/it.po	2016-04-27 22:15:26.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-04-17 16:57+0200\n"
 "Last-Translator: stefano iacus <>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,11 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "argomento 'files' deve essere di tipo chararcter"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "md5 fallito sul file '%s'"
@@ -136,27 +136,27 @@
 msgid "invalid bind address specification"
 msgstr ""
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, fuzzy, c-format
 msgid "invalid '%s' argument"
 msgstr "tipo argomento non valido"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr ""
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr ""
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr ""
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "tipo argomento non valido"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/tools/po/ja.po r-base-3.3.1/src/library/tools/po/ja.po
--- r-base-3.2.3/src/library/tools/po/ja.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/ja.po	2016-04-27 22:15:26.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.1.0 \n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2014-03-26 13:56+0200 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -18,11 +18,11 @@
 "Plural-Forms: nplurals=1; plural=0; \n"
 "X-Generator: Pootle 2.0.5 \n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr " 引数 'files' �文字型���れ��り��ん "
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr " md5 �ファイル '%s' �失敗���� "
@@ -137,27 +137,27 @@
 msgid "invalid bind address specification"
 msgstr " �正�空白アドレス指定 "
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr " �正�引数 '%s' �� "
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr " ファイル�付加中�書�込�エラー "
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr " pskill() ���プラットホーム��サ�ート�れ����ん "
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr " psnice() ���プラットホーム��サ�ート�れ����ん "
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr " �正�引数�型�� "
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr " メモリ�足り��ん "
diff -Nru r-base-3.2.3/src/library/tools/po/ko.po r-base-3.3.1/src/library/tools/po/ko.po
--- r-base-3.2.3/src/library/tools/po/ko.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/ko.po	2016-04-27 22:15:26.000000000 +0000
@@ -1,34 +1,37 @@
 # Korean translation for R tools package
-# src/library/tools/po/ko.po
+# ./tools/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R tools package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 31-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "�� 'files'는 반드시 문��어야 합니다"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "파� '%s'�서 md5가 작�하지 않습니다"
@@ -143,27 +146,27 @@
 msgid "invalid bind address specification"
 msgstr "유효하지 않� 바�드 주소지정� 있습니다"
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "유효하지 않� '%s' ��입니다"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr "파�병합� 하는 �안 쓰기 �러가 발�했습니다"
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr "� 플랫��서 pskill()� 지��지 않습니다"
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr "� 플랫��서 psnice()� 지��지 않습니다"
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "유효하지 않� �� 타입입니다"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "메모리가 부족합니다"
diff -Nru r-base-3.2.3/src/library/tools/po/pl.po r-base-3.3.1/src/library/tools/po/pl.po
--- r-base-3.2.3/src/library/tools/po/pl.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/pl.po	2016-04-27 22:15:26.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,14 +13,14 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "argument 'files' musi być tekstem"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "md5 nie powiodło się na pliku '%s'"
@@ -142,27 +142,27 @@
 msgid "invalid bind address specification"
 msgstr "niepoprawne określenie adresu wiążącego"
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "niepoprawny argument '%s'"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr "błąd zapisu podczas dołączania pliku"
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr "'pskill()' nie jest wspierany na tej platformie"
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr "'psnice()' nie jest wspierany na tej platformie"
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "niepoprawny typ argumentu"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "brakło pamięci"
diff -Nru r-base-3.2.3/src/library/tools/po/pt_BR.po r-base-3.3.1/src/library/tools/po/pt_BR.po
--- r-base-3.2.3/src/library/tools/po/pt_BR.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/pt_BR.po	2016-04-27 22:15:26.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2011-03-26 08:58-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -17,11 +17,11 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "argumento 'files' deve ser do tipo caractere"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "md5 falhou no arquivo '%s'"
@@ -136,27 +136,27 @@
 msgid "invalid bind address specification"
 msgstr ""
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, fuzzy, c-format
 msgid "invalid '%s' argument"
 msgstr "tipo de argumento inválido"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr ""
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr ""
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr ""
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "tipo de argumento inválido"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "falta de memória"
diff -Nru r-base-3.2.3/src/library/tools/po/R-da.po r-base-3.3.1/src/library/tools/po/R-da.po
--- r-base-3.2.3/src/library/tools/po/R-da.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-da.po	2016-04-27 22:15:26.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-07 22:11+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,10 +13,10 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-msgid "Reading %s failed with message: %s"
+msgid "Checking %s"
 msgstr ""
 
-msgid "Checking %s"
+msgid "Processing %s ..."
 msgstr ""
 
 msgid "argument 'package' must be of length 1"
@@ -872,6 +872,9 @@
 msgid "empty 'data' directory"
 msgstr ""
 
+msgid "cannot create unique directory for build"
+msgstr ""
+
 msgid "cannot create temporary directory"
 msgstr ""
 
@@ -934,6 +937,12 @@
 "%s"
 msgstr ""
 
+msgid "DESCRIPTION file not found"
+msgstr ""
+
+msgid "NEWS file not found"
+msgstr ""
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 
@@ -969,6 +978,11 @@
 msgid "Processing packages:"
 msgstr ""
 
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr ""
 
@@ -1053,6 +1067,9 @@
 msgid "package '%s' was not found"
 msgstr ""
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-de.po r-base-3.3.1/src/library/tools/po/R-de.po
--- r-base-3.2.3/src/library/tools/po/R-de.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-de.po	2016-04-27 22:15:26.000000000 +0000
@@ -4,10 +4,10 @@
 # Detlef Steuer <steuer@hsu-hh.de>, 2008-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: R-3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-20 23:10+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-08 12:38+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R Core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -17,9 +17,6 @@
 "\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-msgid "Reading %s failed with message: %s"
-msgstr "Einlesen von %s fehlgeschlagen mit Nachricht: %s"
-
 msgid "Checking %s"
 msgstr "Überprüfe %s"
 
@@ -62,17 +59,18 @@
 msgid ""
 "Functions or methods with usage in documentation object '%s' but not in code:"
 msgstr ""
-"Funktionen bzw. Methoden mit Anleitung im Dokuobjekt '%s' jedoch nicht im "
-"Code"
+"Funktionen bzw. Methoden mit Anleitung im Dokumentations-Objekt '%s' jedoch "
+"nicht im Code"
 
 msgid "Data with usage in documentation object '%s' but not in code:"
-msgstr "Datensätze mit Anleitung im Dokuobjekt '%s', jedoch nicht im Code"
+msgstr ""
+"Datensätze mit Anleitung im Dokumentations-Objekt '%s', jedoch nicht im Code"
 
 msgid "Argument names in code not in docs:"
-msgstr "Argumentnamen im Code (ohne Doku):"
+msgstr "Argumentnamen im Code (nicht in der Dokumentation):"
 
 msgid "Argument names in docs not in code:"
-msgstr "Argumentnamen in Doku (ohne Code):"
+msgstr "Argumentnamen in Dokumentation (nicht im  Code):"
 
 msgid "Mismatches in argument names (first 3):"
 msgstr "Nichtpassende Argumentnamen (die ersten 3):"
@@ -81,53 +79,54 @@
 msgstr "Nichtpassende Argumentnamen:"
 
 msgid "Mismatches in argument default values (first 3):"
-msgstr "Unpassende Standardargumente (<die ersten 3):"
+msgstr "Unpassende Standardargumente (die ersten 3):"
 
 msgid "Mismatches in argument default values:"
 msgstr "Unpassende Standardargumente"
 
 msgid "Codoc mismatches from documentation object '%s':"
-msgstr "Unpassende Kodierung aus dem Dokuobjekt '%s'"
+msgstr "Unpassende Kodierung aus dem Dokumentations-Objekt '%s'"
 
 msgid "Code: %s"
 msgstr "Code: %s"
 
 msgid "Docs: %s"
-msgstr "Doku: %s"
+msgstr "Dokumentation: %s"
 
 msgid "S4 class codoc mismatches from documentation object '%s':"
-msgstr "S4 Klassendoku passt nicht zum Dokuobjekt '%s':"
+msgstr "S4 Klassendokumentation passt nicht zum Dokumentations-Objekt '%s':"
 
 msgid "Slots for class '%s'"
 msgstr "Slots für Klasse '%s'"
 
 msgid "Data codoc mismatches from documentation object '%s':"
-msgstr "Datendoku passt nicht zum Dokuobjekt '%s':"
+msgstr "Datendokumentation passt nicht zum Dokumentations-Objekt '%s':"
 
 msgid "Variables in data frame '%s'"
 msgstr "Variablen im Dataframe '%s'"
 
 msgid "Undocumented arguments in documentation object '%s'"
-msgstr "Undokumentierte Argumente im Dokuobjekt '%s'"
+msgstr "Undokumentierte Argumente im Dokumentations-Objekt '%s'"
 
 msgid "Duplicated \\argument entries in documentation object '%s':"
-msgstr "Doppelte Einträge zu \\argument im Dokuobjekt '%s'"
+msgstr "Doppelte Einträge zu \\argument im Dokumentations-Objekt '%s'"
 
 msgid "Documented arguments not in \\usage in documentation object '%s':"
 msgstr "Dokumentierte Objekte kommen in \\usage des Dokuobjekts '%s' nicht vor"
 
 msgid "Objects in \\usage without \\alias in documentation object '%s':"
 msgstr ""
-"Objekte kommen bei \\usage, aber nicht unter \\alias im Dokuobjekt '%s' vor"
+"Objekte kommen bei \\usage, aber nicht unter \\alias im Dokumentations-"
+"Objekt '%s' vor"
 
 msgid "Assignments in \\usage in documentation object '%s':"
-msgstr "Zuweisungen in \\\\usage im Dokumentationsobjekt '%s':"
+msgstr "Zuweisungen in \\usage im Dokumentations-Objekt '%s':"
 
 msgid "Bad \\usage lines found in documentation object '%s':"
-msgstr "Ungültige \\usage Zeile im Dokuobjekt '%s' gefunden:"
+msgstr "Ungültige \\usage Zeile im Dokumentations-Objekt '%s' gefunden:"
 
 msgid "S3 methods shown with full name in documentation object '%s':"
-msgstr "S3 Methoden mit vollem Namen im Dokuobjekt '%s' gezeigt: "
+msgstr "S3 Methoden mit vollem Namen im Dokumentations-Objekt '%s' gezeigt: "
 
 msgid "you must specify 'package', 'dir' or 'file'"
 msgstr "sie müssen 'package', 'dir' oder 'file' angeben"
@@ -190,7 +189,7 @@
 msgstr "Diese Felder müssen ASCII Werte haben."
 
 msgid "Malformed package version."
-msgstr "Falsch formatierte 'paket version'."
+msgstr "Falsch formatierte 'package version'."
 
 msgid "Malformed maintainer field."
 msgstr "Falsch formatiertes 'maintainer' Feld"
@@ -211,7 +210,7 @@
 "Leerraum, sowie einer gültigen Versionsnummer in Klammern "
 
 msgid "Entries with infeasible comparison operator:"
-msgstr "Einträgen mit falschen Vergleichsoperator:"
+msgstr "Einträge mit falschem Vergleichsoperator:"
 
 msgid "Only operators '<=' and '>=' are possible."
 msgstr "Nur die Operatoren '<=' und '>=' sind zulässig."
@@ -326,7 +325,7 @@
 "Querverweise nicht überprüft werden können"
 
 msgid "Missing link or links in documentation object '%s':"
-msgstr "Fehlende(r) Link(s) im Dokuobjekt '%s':"
+msgstr "Fehlende(r) Link(s) im Dokumentations-Objekt '%s':"
 
 msgid "See section 'Cross-references' in the 'Writing R Extensions' manual."
 msgstr ""
@@ -365,11 +364,11 @@
 msgid ""
 "Package detach functions should have one argument with name starting with %s."
 msgstr ""
-"Detachfuktion für Pakete sollte ein Argument haben, dessen Name\n"
-"mit %s beginnt."
+"Detach-Funktion für Pakete sollte ein Argument haben, dessen Name mit %s "
+"beginnt."
 
 msgid "Package detach functions should not call %s."
-msgstr "Detachfunktion für Pakete sollten nicht %s aufrufen."
+msgstr "Detach-Funktion für Pakete sollten nicht %s aufrufen."
 
 msgid "unable to create"
 msgstr "kann nicht erzeugen"
@@ -465,7 +464,7 @@
 msgstr "Aufruf von 'data(package=' nicht angemeldet von: %s"
 
 msgid "Package has no 'Version' field"
-msgstr "Paket  hat kein 'Version' Feld"
+msgstr "Paket hat kein Feld 'Version'"
 
 msgid "NB: need Internet access to use CRAN incoming checks"
 msgstr "NB: benötige Internetzugang, um CRAN-Incoming zu checken"
@@ -532,7 +531,7 @@
 
 msgid "'macros' must be TRUE or must specify existing macros"
 msgstr ""
-"'macros' muss entwerder TRUE sein oder ein exisitierendes Makro spezifizieren"
+"'macros' muss entweder TRUE sein oder ein existierendes Makro spezifizieren"
 
 msgid "Macro file %s should only contain Rd macro definitions and comments"
 msgstr "Makrodatei %s sollte nur Rd Makrodefinitionen und Kommentare enthalten"
@@ -583,20 +582,20 @@
 msgstr "DESCRIPTION Datei ist für Paket '%s', nicht für '%s'"
 
 msgid "Vignette product %s does not have a known filename extension (%s)"
-msgstr "Vignettenprodukt %s hat keine bekannte Dateinamenserweiterung (%s)"
+msgstr "Vignetten-Ergebnis %s hat keine bekannte Dateinamenserweiterung (%s)"
 
 msgid ""
 "Failed to locate the %s output file (by engine %s) for vignette with name "
 "%s. The following files exist in directory %s: %s"
 msgstr ""
-"Konnte %s Ausgabedadatei (von Treiber %s) für Vignette namens%s nicht "
-"finden. Folgende Dateien exisitieren im Verzeichnis %s: %s"
+"Konnte %s Ausgabedadatei (von Treiber %s) für Vignette namens %s nicht "
+"finden. Folgende Dateien existieren im Verzeichnis %s: %s"
 
 msgid ""
 "Located more than one %s output file (by engine %s) for vignette with name "
 "%s: %s"
 msgstr ""
-"Mehr als eine %s Ausgabedatei (von Treiber %s) für Vignette namens%s "
+"Mehr als eine %s Ausgabedatei (von Treiber %s) für Vignette namens %s "
 "gefunden: %s"
 
 msgid "unable to create temp directory %s"
@@ -615,8 +614,8 @@
 "Detected vignette source files (%s) with shared names (%s) and therefore "
 "risking overwriting each others output files"
 msgstr ""
-"Vignettenquelldateien (%s) mit gemeinsamen Namen (%s) entdeckt, weshalb "
-"dieGefahr gegenseitigen Ãœberschreibens besteht"
+"Vignetten-Quelldateien (%s) mit gemeinsamen Namen (%s) entdeckt, weshalb die "
+"Gefahr gegenseitigen Ãœberschreibens besteht"
 
 msgid ""
 "processing vignette '%s' failed with diagnostics:\n"
@@ -639,29 +638,29 @@
 msgstr "Datei '%s' nicht gefunden"
 
 msgid "vignette filename '%s' does not match any of the '%s' filename patterns"
-msgstr "Vignettendateiname '%s' passt zu keinem der %s' Dateinamenmuster"
+msgstr "Vignetten-Dateiname '%s' passt zu keinem der %s' Dateinamenmuster"
 
 msgid "In '%s' vignettes '%s' and '%s' have the same vignette name"
-msgstr "In '%s' Vignetten '%s' und '%s' haben denselben Vignettennamen"
+msgstr "In '%s' Vignetten '%s' und '%s' haben denselben Vignetten-Namen"
 
 msgid "argument 'vignette' must be of length 1"
 msgstr "Argument 'vignette' muss Länge 1 haben"
 
 msgid "Vignette engine package not specified"
-msgstr "Vignettentreiberpaket nicht angegeben"
+msgstr "Vignetten-Treiberpaket nicht angegeben"
 
 msgid "Unsupported engine name"
 msgstr "nicht unterstützter Engine Name"
 
 msgid "None of packages %s have registered vignette engines"
-msgstr "Keines der Pakete %s hat Vignettentreiber registriert"
+msgstr "Keines der Pakete %s hat Vignetten-Treiber registriert"
 
 msgid "Vignette engine %s is not registered"
-msgstr "Vignettentreiber %s ist nicht registiert"
+msgstr "Vignetten-Treiber %s ist nicht registiert"
 
 msgid "Vignette engine %s is not registered by any of the packages %s"
 msgstr ""
-"Vignettentreiber %s ist nicht von irgendeinem der Pakete %s registriert"
+"Vignetten-Treiber %s ist nicht von irgendeinem der Pakete %s registriert"
 
 msgid "Engine name %s and package %s do not match"
 msgstr "Treibername %s und Paket %s passen nicht "
@@ -699,7 +698,7 @@
 msgstr "doppelte Dateien in Feld '%s':"
 
 msgid "files in '%s' field missing from '%s':"
-msgstr "fehlende  Dateien im '%s' Feld von '%s':"
+msgstr "fehlende Dateien im '%s' Feld von '%s':"
 
 msgid "files in '%s' missing from '%s' field:"
 msgstr "fehlende Dateien in '%s' im Feld '%s':"
@@ -798,7 +797,7 @@
 msgstr "Fehler: keine Pakete angegeben"
 
 msgid "ERROR: cannot create check dir %s"
-msgstr "Fehler: kann  Verzeichnis %s für Check nicht erzeugen"
+msgstr "Fehler: kann Verzeichnis %s für Check nicht erzeugen"
 
 msgid "package directory %s does not exist"
 msgstr "Paketverzeichnis '%s' existiert nicht"
@@ -892,7 +891,7 @@
 msgstr "Fehler beim Lesen der Datei '%s'"
 
 msgid "this seems to be a bundle -- and they are defunct"
-msgstr "sieht aus wie ein Bundle --  und diese sind veraltet"
+msgstr "sieht aus wie ein Bundle -- und diese funktionieren nicht mehr"
 
 msgid ""
 "'cleanup' exists but is not executable -- see the 'R Installation and "
@@ -927,7 +926,7 @@
 msgstr "leeres 'data' Verzeichnis"
 
 msgid "cannot create temporary directory"
-msgstr "kann  temporäres Verzeichnis nicht erzeugen"
+msgstr "kann temporäres Verzeichnis nicht erzeugen"
 
 msgid "ERROR: '--merge-multiarch' applies only to a single tarball"
 msgstr "Fehler: '--merge-multiarch' bezieht sich nur auf einzelnes Tar-Archiv"
@@ -939,7 +938,7 @@
 msgstr "Fehler: keine Pakete angegeben"
 
 msgid "ERROR: cannot cd to directory %s"
-msgstr "Fehler: kann  nicht in Verzeichnis %s wechseln"
+msgstr "Fehler: kann nicht in Verzeichnis %s wechseln"
 
 msgid "ERROR: no permission to install to directory"
 msgstr "Fehler: keine ausreichenden Rechte zur Installation in das Verzeichnis"
@@ -952,6 +951,8 @@
 "  %s\n"
 "for details."
 msgstr ""
+"Für Details siehe\n"
+"  %s ."
 
 msgid "there is no package called '%s'"
 msgstr "es gibt kein Paket names '%s'"
@@ -1048,7 +1049,7 @@
 msgstr "PDF Header nicht gefunden"
 
 msgid "EOF marker not found"
-msgstr "EOF Markierunge nicht gefunden"
+msgstr "EOF Markierung nicht gefunden"
 
 msgid "cannot find 'startxref' keyword"
 msgstr "kann das Schlüsselwort 'startxref' nicht finden"
@@ -1075,19 +1076,19 @@
 msgstr "kann literales Zeichenkettenobjekt nicht lesen"
 
 msgid "cannot read hexadecimal string object"
-msgstr "kann hexasezimales Zeichenkettenobjekt nicht lesen"
+msgstr "kann hexadezimales Zeichenkettenobjekt nicht lesen"
 
 msgid "cannot read name object"
 msgstr "kann Namensobjekt nicht lesen"
 
 msgid "cannot read array object"
-msgstr "kann Arrayobjekt nicht lesen"
+msgstr "kann Array-Objekt nicht lesen"
 
 msgid "cannot read dictionary object"
 msgstr "kann Dictionary-Objekt nicht lesen"
 
 msgid "cannot read stream object"
-msgstr "kann Streamobjekt nicht lesen"
+msgstr "kann Stream-Objekt nicht lesen"
 
 msgid "cannot read indirect reference object"
 msgstr "kann indirektes Referenzobjekt nicht lesen"
@@ -1171,7 +1172,7 @@
 msgstr "Vergleiche %s mit %s ..."
 
 msgid "no parsed files found"
-msgstr "keine gparsten Dateien gefunden"
+msgstr "keine geparsten Dateien gefunden"
 
 msgid "FAILED"
 msgstr "fehlgeschlagen"
@@ -1193,10 +1194,10 @@
 msgstr "Test '%s' nicht verfügbar"
 
 msgid "argument 'x' must be a character vector"
-msgstr "Argument 'x' muss ein Charaktervektor sein"
+msgstr "Argument 'x' muss ein Zeichenkettenvektor sein"
 
 msgid "argument 'delim' must specify two characters"
-msgstr "Argument 'delim' muss zwei Charakter spezifizieren"
+msgstr "Argument 'delim' muss zwei Zeichen spezifizieren"
 
 msgid "only Rd syntax is currently supported"
 msgstr "momentan nur Rd Syntax unterstützt"
@@ -1308,7 +1309,8 @@
 msgid_plural ""
 "Found .Internal calls in methods for the following reference classes:"
 msgstr[0] ".Internal Aufruf in Methoden für folgende Referenzklasse gefunden:"
-msgstr[1] ".Internal Aufrufe in Methoden folgende Referenzklassen gefunden:"
+msgstr[1] ""
+".Internal Aufrufe in Methoden für folgende Referenzklassen gefunden:"
 
 msgid "Found an obsolete/platform-specific call in the following function:"
 msgid_plural ""
@@ -1356,8 +1358,8 @@
 
 msgid "Found the platform-specific device:"
 msgid_plural "Found the platform-specific devices:"
-msgstr[0] "Plattform-spezifisches gefunden:"
-msgstr[1] "Plattform-spezifische Devices gefunden"
+msgstr[0] "Plattformspezifisches Device gefunden:"
+msgstr[1] "Plattformspezifische Devices gefunden"
 
 msgid "Generic without any methods in %s: %s"
 msgid_plural "Generics without any methods in %s: %s"
@@ -1402,6 +1404,9 @@
 msgstr[0] "%d der Pakettests fehlgeschlagen"
 msgstr[1] "%d der Pakettests fehlgeschlagen"
 
+#~ msgid "Reading %s failed with message: %s"
+#~ msgstr "Einlesen von %s fehlgeschlagen mit Nachricht: %s"
+
 #~ msgid "assertCondition: caught %s"
 #~ msgstr "assertCondition: %s abgefangen"
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-fr.po r-base-3.3.1/src/library/tools/po/R-fr.po
--- r-base-3.2.3/src/library/tools/po/R-fr.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-fr.po	2016-04-27 22:15:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 11:53+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -19,15 +19,13 @@
 "X-Generator: Poedit 1.6.4\n"
 
 #, fuzzy
-msgid "Reading %s failed with message: %s"
-msgstr ""
-"la compilation du fichier TeX %s a échoué avec le diagnostic :\n"
-"%s"
-
-#, fuzzy
 msgid "Checking %s"
 msgstr "vérification de %s ..."
 
+#, fuzzy
+msgid "Processing %s ..."
+msgstr "analyse de %s"
+
 msgid "argument 'package' must be of length 1"
 msgstr "l'argument 'package' doit être de longueur 1"
 
@@ -967,6 +965,10 @@
 msgid "empty 'data' directory"
 msgstr "répertoire 'data' vide"
 
+#, fuzzy
+msgid "cannot create unique directory for build"
+msgstr "impossible de créer le répertoire '%s'"
+
 msgid "cannot create temporary directory"
 msgstr "impossible de créer un répertoire temporaire"
 
@@ -1033,6 +1035,14 @@
 "Impossible de traiter la section ou les lignes : \n"
 "%s"
 
+#, fuzzy
+msgid "DESCRIPTION file not found"
+msgstr "Fichier DESCRIPTION incorrect"
+
+#, fuzzy
+msgid "NEWS file not found"
+msgstr "le fichier '%s' est introuvable"
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 "Pas de nouvelles trouvées dans le fichier en usant de l'ancien format de "
@@ -1084,6 +1094,14 @@
 msgid "Processing packages:"
 msgstr "Traitement des packages :"
 
+#, fuzzy
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+"la compilation du fichier TeX %s a échoué avec le diagnostic :\n"
+"%s"
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr "%s doit être une chaîne de caractères ou une connexion fichier/raw"
 
@@ -1168,6 +1186,9 @@
 msgid "package '%s' was not found"
 msgstr "le package '%s' est introuvable"
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr "un opérateur erroné"
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-it.po r-base-3.3.1/src/library/tools/po/R-it.po
--- r-base-3.2.3/src/library/tools/po/R-it.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-it.po	2016-04-27 22:15:26.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-04-17 16:57+0200\n"
 "Last-Translator: stefano iacus <>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -12,13 +12,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Reading %s failed with message: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Checking %s"
 msgstr "analizzo '%s'"
 
+#, fuzzy
+msgid "Processing %s ..."
+msgstr "analizzo '%s'"
+
 msgid "argument 'package' must be of length 1"
 msgstr "argomento 'package' deve avere lunghezza 1"
 
@@ -906,6 +907,10 @@
 msgstr ""
 
 #, fuzzy
+msgid "cannot create unique directory for build"
+msgstr "impossibile creare directory '%s'"
+
+#, fuzzy
 msgid "cannot create temporary directory"
 msgstr "impossibile creare directory '%s'"
 
@@ -970,6 +975,14 @@
 "%s"
 msgstr ""
 
+#, fuzzy
+msgid "DESCRIPTION file not found"
+msgstr "file DESCRIPTION non valido"
+
+#, fuzzy
+msgid "NEWS file not found"
+msgstr "file '%s' non trovato"
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 
@@ -1005,6 +1018,11 @@
 msgid "Processing packages:"
 msgstr "Elaboro i pacchetti:"
 
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+
 #, fuzzy
 msgid "%s must be a character string or a file/raw connection"
 msgstr ""
@@ -1100,6 +1118,9 @@
 msgid "package '%s' was not found"
 msgstr "pacchetto '%s' non trovato"
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr "operatore sbagliato"
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-ja.po r-base-3.3.1/src/library/tools/po/R-ja.po
--- r-base-3.2.3/src/library/tools/po/R-ja.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-ja.po	2016-04-27 22:15:26.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.1.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 15:16+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -14,12 +14,13 @@
 "X-Generator: Pootle 2.5.1.1 \n"
 "X-POOTLE-MTIME: 1427436981.000000 \n"
 
-msgid "Reading %s failed with message: %s"
-msgstr " %s �読�込��失敗����．メッセージ�以下�通り��: %s "
-
 msgid "Checking %s"
 msgstr " %s を�ェック����� "
 
+#, fuzzy
+msgid "Processing %s ..."
+msgstr " %s を処�中 "
+
 msgid "argument 'package' must be of length 1"
 msgstr " 引数 'package' � 長� 1 ���れ��り��ん "
 
@@ -961,6 +962,10 @@
 msgid "empty 'data' directory"
 msgstr " 'data' ディレクトリ�空�� "
 
+#, fuzzy
+msgid "cannot create unique directory for build"
+msgstr " ディレクトリ '%s' を生��る���出���ん "
+
 msgid "cannot create temporary directory"
 msgstr " 一時ディレクトリを生��る���出���ん "
 
@@ -1028,6 +1033,14 @@
 " �ャンク/行を処�����ん: \n"
 " %s "
 
+#, fuzzy
+msgid "DESCRIPTION file not found"
+msgstr " �正� DESCRIPTION ファイル�� "
+
+#, fuzzy
+msgid "NEWS file not found"
+msgstr " ファイル '%s' �見��り��ん "
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 " 旧�� R 風�書�を使��ニュース�与�られ�ファイル中���り��ん。 "
@@ -1077,6 +1090,12 @@
 msgid "Processing packages:"
 msgstr " パッケージを処�中: "
 
+#, fuzzy
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr " %s �読�込��失敗����．メッセージ�以下�通り��: %s "
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr " %s �文字列�ファイル,Rawコ�クション���れ��り��ん "
 
@@ -1161,6 +1180,9 @@
 msgid "package '%s' was not found"
 msgstr " パッケージ '%s' �見��り��ん��� "
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr " 誤��オペランド "
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-ko.po r-base-3.3.1/src/library/tools/po/R-ko.po
--- r-base-3.2.3/src/library/tools/po/R-ko.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-ko.po	2016-04-27 22:15:26.000000000 +0000
@@ -1,35 +1,38 @@
 # Korean translation for R tools package
-# src/library/tools/po/R-ko.po
+# ./tools/po/R-ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R tools package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 31-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "Reading %s failed with message: %s"
-msgstr "다�과 같� �유로 %s를 �는� 실패했습니다: %s"
-
 msgid "Checking %s"
 msgstr "%s를 확�합니다."
 
+msgid "Processing %s ..."
+msgstr "%s를 프로세싱 중입니다..."
+
 msgid "argument 'package' must be of length 1"
 msgstr "�� 'package'는 반드시 길�가 1 �어야 합니다"
 
@@ -261,11 +264,13 @@
 "들� 반드시 R� ��할 수 있�� 해야합니다."
 
 msgid "Malformed Title field: should not end in a period."
-msgstr ""
+msgstr "Title 항목� 올바르지 않습니다: 마침표로 �나면 안�니다."
 
 msgid ""
 "Malformed Description field: should contain one or more complete sentences."
 msgstr ""
+"Description 항목� 올바르지 않습니다: 하나 ��� 완전한 문장� �함하고 있어"
+"야 합니다. "
 
 msgid ""
 "See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual."
@@ -285,13 +290,15 @@
 "니다."
 
 msgid "Authors@R field gives persons with no valid roles:"
-msgstr ""
+msgstr "Authors@R 항목으로부터 다�� 저�들� 대한 역할� 찾� 수 없습니다:"
 
 msgid "Cannot extract Maintainer field from Authors@R field:"
 msgstr "Maintainer� 항목� Authors@R 항목으로부터 추출할 수 없습니다:"
 
 msgid "Authors@R field gives more than one person with maintainer role:"
 msgstr ""
+"Authors@R 항목�서 메�테�너� 역할� 담당하는 저�� 수가 한명��임� 확�"
+"하게 �었습니다:"
 
 msgid ""
 "Authors@R field gives no person with maintainer role, valid email address "
@@ -519,7 +526,7 @@
 msgstr ""
 
 msgid "Rd object required"
-msgstr ""
+msgstr "Rd �체가 필요합니다."
 
 msgid "missing/empty %s field in '%s'"
 msgstr "'%2$s'내� %1$s 항목� 없습니다"
@@ -550,10 +557,11 @@
 msgstr "RdDB %2$s 로부터 %1$s와 관계� �움�� 찾� 수 없습니다"
 
 msgid "'macros' must be TRUE or must specify existing macros"
-msgstr ""
+msgstr "'macros'가 반드시 TRUE �거나 �미 존재하는 매�로를 사용해야 합니다."
 
 msgid "Macro file %s should only contain Rd macro definitions and comments"
 msgstr ""
+"매�로 파� %s는 오로지 Rd 매�로 정�와 주�만� �함하고 있어야 합니다."
 
 msgid "No Rd macros in package '%s'."
 msgstr "패키지 %s로부터 Rd macro를 찾� 수 없습니다."
@@ -601,6 +609,7 @@
 
 msgid "DESCRIPTION file is for package '%s', not '%s'"
 msgstr ""
+"DESCRIPTION 파�� 패키지 '%1$s'� 관한 것�지 '%2$s'� 관한 것� 아닙니다."
 
 msgid "Vignette product %s does not have a known filename extension (%s)"
 msgstr "비니�트 프로�트 %s는 알려진 파�확장� (%s)를 가지고 있지 않습니다"
@@ -624,6 +633,8 @@
 
 msgid "Vignette '%s' is non-ASCII but has no declared encoding"
 msgstr ""
+"비그네트 '%s'는 ASCII 형�� 아니며 �� 대하여 선언� �코딩� 찾� 수 없습"
+"니다."
 
 msgid "Running"
 msgstr "실행중입니다"
@@ -804,7 +815,7 @@
 msgstr "%s로부터 연결할 수 없습니다"
 
 msgid "-l option without value"
-msgstr ""
+msgstr "-l 옵션� 대한 값� 주어지지 않았습니다."
 
 msgid "configuration files are not supported as from R 2.12.0"
 msgstr "R 2.12.0 부터는 환경설정 파�들� 지��지 않습니다"
@@ -819,7 +830,7 @@
 msgstr "�러: 지정� 패키지들� 없습니다"
 
 msgid "ERROR: cannot create check dir %s"
-msgstr ""
+msgstr "�러: check dir %s를 �성할 수 없습니다."
 
 msgid "package directory %s does not exist"
 msgstr "패키지 디렉토리 %s가 존재하지 않습니다"
@@ -945,6 +956,9 @@
 msgid "empty 'data' directory"
 msgstr "비어있는 'data' 디렉토리입니다"
 
+msgid "cannot create unique directory for build"
+msgstr "build를 위한 고유� 디렉토리를 �성할 수 없습니다."
+
 msgid "cannot create temporary directory"
 msgstr "임시 디렉토리를 �성할 수 없습니다"
 
@@ -1009,6 +1023,12 @@
 "%s"
 msgstr ""
 
+msgid "DESCRIPTION file not found"
+msgstr "DESCRIPTION 파�� 찾� 수 없습니다."
+
+msgid "NEWS file not found"
+msgstr "NEWS 파�� 찾� 수 없습니다."
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 
@@ -1044,9 +1064,14 @@
 msgid "Processing packages:"
 msgstr "다�� 패키지들� 프로세싱하고 있습니다:"
 
-msgid "%s must be a character string or a file/raw connection"
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
 msgstr ""
 
+msgid "%s must be a character string or a file/raw connection"
+msgstr "%s는 문�열 �는 파�/raw 커넥션�어야 합니다."
+
 msgid "PDF header not found"
 msgstr "PDF 헤�를 찾� 수 없습니다"
 
@@ -1128,6 +1153,9 @@
 msgid "package '%s' was not found"
 msgstr "패키지 '%s'를 찾� 수 없습니다"
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr "잘못� 연산�입니다"
 
@@ -1371,6 +1399,9 @@
 msgid_plural "%d of the package tests failed"
 msgstr[0] ""
 
+#~ msgid "Reading %s failed with message: %s"
+#~ msgstr "다�과 같� �유로 %s를 �는� 실패했습니다: %s"
+
 #~ msgid ","
 #~ msgstr ","
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-pl.po r-base-3.3.1/src/library/tools/po/R-pl.po
--- r-base-3.2.3/src/library/tools/po/R-pl.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-pl.po	2016-04-27 22:15:26.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-04 08:15\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,1329 +13,2215 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Poedit-Bookmarks: -1,232,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-msgid "Reading %s failed with message: %s"
-msgstr "Odczytywanie %s nie powiodło się zwracając komunikat: %s"
+#. R/QC.R: gettextf("  %s calls:", f)
+#. R/QC.R: gettextf("  %s calls:", f)
+#: R/QC.R:0
+msgid "%s calls:"
+msgstr "wywołania %s:"
 
-msgid "Checking %s"
-msgstr "sprawdzanie %s"
+#. R/QC.R: gettextf("  %s has wrong argument list %s", f, sQuote(paste(bad,     collapse = ", ")))
+#. R/QC.R: gettextf("  %s has wrong argument list %s", f, sQuote(paste(bad,     collapse = ", ")))
+#: R/QC.R:0
+msgid "%s has wrong argument list %s"
+msgstr "%s ma błędną listę argumentów %s"
 
-msgid "argument 'package' must be of length 1"
-msgstr "argument 'package' musi być długości 1"
+#. R/pdftools.R: gettextf("%s must be a character string or a file/raw connection",     sQuote("file"))
+#: R/pdftools.R:0
+msgid "%s must be a character string or a file/raw connection"
+msgstr ""
+"argument %s musi być łańcuchem tekstowym lub połączeniem plikowym/prostym"
 
-msgid "you must specify 'package' or 'dir'"
-msgstr "musisz określić argument 'package' lub 'dir'"
+#. R/check.R: message("'--as-cran' turns off '--extra-arch'")
+#: R/check.R:0
+msgid "'--as-cran' turns off '--extra-arch'"
+msgstr "opcja '--as-cran' wyłącza opcję '--extra-arch'"
 
-msgid "directory '%s' does not exist"
-msgstr "katalog '%s' nie istnieje"
+#. R/check.R: warning("'--multiarch' specified with only one usable sub-architecture",     call. = FALSE, immediate. = TRUE)
+#: R/check.R:0
+msgid "'--multiarch' specified with only one usable sub-architecture"
+msgstr "'--multiarch' zdefiniowany tylko z jedną użyteczną pod-architekturą"
 
-msgid "neither code nor data objects found"
-msgstr "nie znaleziono kodu ani obiektów danych"
+#. R/QC.R: gettextf("'::' or ':::' import not declared from: %s", sQuote(xx))
+#: R/QC.R:0
+msgid "'::' or ':::' import not declared from: %s"
+msgstr "import '::' lub ':::' nie jest zadeklarowany z: %s"
 
-msgid "Undocumented code objects:"
-msgstr "Nieudokumentowane obiekty kodu:"
+#. R/QC.R: gettext("'::' or ':::' imports not declared from:")
+#: R/QC.R:0
+msgid "'::' or ':::' imports not declared from:"
+msgstr "importy '::' lub ':::' nie sÄ… zadeklarowane z:"
 
-msgid "Undocumented data sets:"
-msgstr "Nieudokumentowane zbiory danych:"
+#. R/QC.R: gettextf("':::' call which should be '::': %s", sQuote(xx))
+#: R/QC.R:0
+msgid "':::' call which should be '::': %s"
+msgstr "wywołanie ':::' które powinno być '::': %s"
 
-msgid "Undocumented S4 classes:"
-msgstr "Nieudokumentowane klasy S4:"
+#. R/QC.R: gettext("':::' calls which should be '::':")
+#: R/QC.R:0
+msgid "':::' calls which should be '::':"
+msgstr "wywołania ':::' które powinny być '::':"
 
-msgid "Undocumented S4 methods:"
-msgstr "Nieudokumentowane metody S4:"
+#. R/install.R: warning("'cleanup' exists but is not executable -- see the 'R Installation and Administration Manual'",     call. = FALSE)
+#: R/install.R:0
+msgid ""
+"'cleanup' exists but is not executable -- see the 'R Installation and "
+"Administration Manual'"
+msgstr ""
+"plik 'cleanup' istnieje, ale nie jest wykonywalny -- zobacz 'R Installation "
+"and Adminstration Manual'"
 
-msgid "Prototyped non-primitives:"
-msgstr "Prototypowane funkcje nieelementarne:"
+#. R/QC.R: gettextf("'data(package=)' call not declared from: %s", sQuote(xx))
+#: R/QC.R:0
+msgid "'data(package=)' call not declared from: %s"
+msgstr "wywołanie 'data(package=)' nie zostało zadeklarowane z: %s"
 
-msgid "Undocumented %s:"
-msgstr "Nieudokumentowane %s:"
+#. R/QC.R: gettext("'data(package=)' calls not declared from:")
+#: R/QC.R:0
+msgid "'data(package=)' calls not declared from:"
+msgstr "wywołania 'data(package=)' nie zostały zadeklarowane z:"
 
-msgid "directory '%s' does not contain R code"
-msgstr "katalog '%s' nie zawiera kodu R"
+#. R/QC.R: gettextf("'library' or 'require' call not declared from: %s",     sQuote(xx))
+#: R/QC.R:0
+msgid "'library' or 'require' call not declared from: %s"
+msgstr "wywołanie 'library' lub 'require' nie jest zadeklarowane z: %s"
 
-msgid "directory '%s' does not contain Rd objects"
-msgstr "katalog '%s' nie zawiera obiektów Rd"
+#. R/QC.R: gettextf("'library' or 'require' call to %s in package code.",     sQuote(xx))
+#: R/QC.R:0
+msgid "'library' or 'require' call to %s in package code."
+msgstr "wywołania 'library' lub 'require' do %s w kodzie pakietu"
 
+#. R/QC.R: gettextf("'library' or 'require' call to %s which was already attached by Depends.",     sQuote(xx))
+#: R/QC.R:0
 msgid ""
-"Functions or methods with usage in documentation object '%s' but not in code:"
+"'library' or 'require' call to %s which was already attached by Depends."
 msgstr ""
-"Funkcje lub metody z użyciem w obiekcie dokumentacji '%s' ale nie w kodzie:"
+"wywołanie 'library' lub 'require' do pakietu %s, który był już dołączony "
+"przez 'Depends'."
 
-msgid "Data with usage in documentation object '%s' but not in code:"
-msgstr "Dane z użyciem w obiekcie dokumentacji '%s', ale nie w kodzie:"
+#. R/QC.R: gettext("'library' or 'require' calls in package code:")
+#: R/QC.R:0
+msgid "'library' or 'require' calls in package code:"
+msgstr "wywołania 'library' lub 'require' w kodzie pakietu:"
 
-msgid "Argument names in code not in docs:"
-msgstr "Nazwy argumentów w kodzie, ale nie w dokumentacji:"
+#. R/QC.R: gettext("'library' or 'require' calls not declared from:")
+#: R/QC.R:0
+msgid "'library' or 'require' calls not declared from:"
+msgstr "wywołania 'library' lub 'require' nie są zadeklarowane z:"
 
-msgid "Argument names in docs not in code:"
-msgstr "Nazwy argumentów w dokumentacji, ale nie w kodzie:"
+#. R/QC.R: gettext("'library' or 'require' calls to packages already attached by Depends:")
+#: R/QC.R:0
+msgid "'library' or 'require' calls to packages already attached by Depends:"
+msgstr ""
+"wywołania 'library' lub 'require' do pakietów, które były już dołączone "
+"przez 'Depends':"
 
-msgid "Mismatches in argument names (first 3):"
-msgstr "Niezgodność w nazwach argumentów (pierwsze 3):"
+#. R/QC.R: gettextf("'loadNamespace' or 'requireNamespace' call not declared from: %s",     sQuote(xx))
+#: R/QC.R:0
+msgid "'loadNamespace' or 'requireNamespace' call not declared from: %s"
+msgstr ""
+"wywołanie 'loadNamespace()' lub 'requireNamespace()' nie jest zadeklarowane "
+"z: %s"
 
-msgid "Mismatches in argument names:"
-msgstr "Niezgodność w nazwach argumentów:"
+#. R/QC.R: gettext("'loadNamespace' or 'requireNamespace' calls not declared from:")
+#: R/QC.R:0
+msgid "'loadNamespace' or 'requireNamespace' calls not declared from:"
+msgstr ""
+"wywołania 'loadNamespace()' lub 'requireNamespace()' nie są zadeklarowane z:"
 
-msgid "Mismatches in argument default values (first 3):"
-msgstr "Niezgodność w domyslnych wartościach argumentów (pierwsze 3): "
+#. R/Rd.R: stop("'macros' must be TRUE or must specify existing macros")
+#: R/Rd.R:0
+msgid "'macros' must be TRUE or must specify existing macros"
+msgstr ""
+"argument 'macros' musi mieć wartość TRUE lub musi określać istniejące makra"
 
-msgid "Mismatches in argument default values:"
-msgstr "Niezgodność w domyślnych wartościach argumentów:"
+#. R/utils.R: stop("'text' must be a character vector")
+#: R/utils.R:0
+msgid "'text' must be a character vector"
+msgstr "argument 'text' musi być wektorem tekstowym"
 
-msgid "Codoc mismatches from documentation object '%s':"
-msgstr "Niezgodność struktury w obiekcie dokumentacji '%s':"
+#. R/Rd2pdf.R: stop("'type' must be one of 'txt', 'html', 'latex' or 'example'",     call. = FALSE)
+#: R/Rd2pdf.R:0
+msgid "'type' must be one of 'txt', 'html', 'latex' or 'example'"
+msgstr "'type' musi być jednym z 'txt', 'html', 'latex' lub 'example'"
 
-msgid "Code: %s"
-msgstr "Kod: %s"
+#. R/utils.R: stop("'x' must be a single character string")
+#: R/utils.R:0
+msgid "'x' must be a single character string"
+msgstr "argument 'x' musi być pojedynczym łańcuchem tekstowym"
 
-msgid "Docs: %s"
-msgstr "Dokumenty: %s"
+#. R/admin.R: gettextf("*** someone has corrupted the Built field in package '%s' ***",     db["Package"])
+#. R/admin.R: gettextf("*** someone has corrupted the Built field in package '%s' ***",     db["Package"])
+#: R/admin.R:0
+msgid "*** someone has corrupted the Built field in package '%s' ***"
+msgstr "*** ktoś uszkodził pole 'Built' w pakiecie %s ***"
 
-msgid "S4 class codoc mismatches from documentation object '%s':"
-msgstr "Niezgodność struktury klasy S4 w obiekcie dokumentacji '%s':"
+#. R/check.R: stop("-l option without value", call. = FALSE)
+#. R/install.R: stop("-l option without value", call. = FALSE)
+#: R/check.R:0 R/install.R:0
+msgid "-l option without value"
+msgstr "opcja '-l' bez wartości"
 
-msgid "Slots for class '%s'"
-msgstr "Gniazda dla klasy \"%s\""
+#. R/Rd2pdf.R: stop("-o option without value", call. = FALSE)
+#. R/Rd2pdf.R: stop("-o option without value", call. = FALSE)
+#. R/check.R: stop("-o option without value", call. = FALSE)
+#. R/install.R: stop("-o option without value", call. = FALSE)
+#: R/Rd2pdf.R:0 R/check.R:0 R/install.R:0
+msgid "-o option without value"
+msgstr "opcja '-o' bez wartości"
 
-msgid "Data codoc mismatches from documentation object '%s':"
-msgstr "Niezgodność struktury danych w obiekcie dokumentacji '%s':"
+#. R/Rd2pdf.R: stop("-t option without value", call. = FALSE)
+#: R/Rd2pdf.R:0
+msgid "-t option without value"
+msgstr "opcja '-t' bez wartości"
 
-msgid "Variables in data frame '%s'"
-msgstr "Zmienne w ramce danych '%s'"
+#. R/QC.R: gettext("All field tags must be ASCII.")
+#. R/QC.R: gettext("All field tags must be ASCII.")
+#: R/QC.R:0
+msgid "All field tags must be ASCII."
+msgstr "Wszystkie znaczniki pola muszą być w standardzie ASCII."
 
-msgid "Undocumented arguments in documentation object '%s'"
-msgstr "Nieudokumentowane argumenty w obiekcie dokumentacji '%s'"
+#. R/Vignettes.R: gettextf("Argument %s must be a character vector or NULL and not %s",     sQuote("pattern"), sQuote(class(pattern)[1L]))
+#: R/Vignettes.R:0
+msgid "Argument %s must be a character vector or NULL and not %s"
+msgstr "Argument %s musi być łańcuchem tekstowym lub wartością NULL, a nie %s"
 
-msgid "Duplicated \\argument entries in documentation object '%s':"
-msgstr "Powtórzone wpisy '\\argument' w obiekcie dokumentacji '%s':"
+#. R/Vignettes.R: gettextf("Argument %s must be a function and not %s", sQuote("weave"),     sQuote(class(weave)[1L]))
+#. R/Vignettes.R: gettextf("Argument %s must be a function and not %s", sQuote("tangle"),     sQuote(class(tangle)[1L]))
+#: R/Vignettes.R:0
+msgid "Argument %s must be a function and not %s"
+msgstr "Argument %s musi być funkcją a nie %s"
 
-msgid "Documented arguments not in \\usage in documentation object '%s':"
-msgstr ""
-"Udokumentowane argumenty nie sÄ… w '\\usage' w obiekcie dokumentacji '%s':"
+#. R/QC.R: gettextf("Argument items with no description in Rd object '%s':",     nm)
+#: R/QC.R:0
+msgid "Argument items with no description in Rd object '%s':"
+msgstr "Pozycje argumentu bez opisu w obiekcie Rd '%s':"
 
-msgid "Objects in \\usage without \\alias in documentation object '%s':"
-msgstr "Obiekty w '\\usage' bez '\\alias' w obiekcie dokumentacji '%s':"
+#. R/QC.R: gettext("  Argument names in code not in docs:")
+#: R/QC.R:0
+msgid "Argument names in code not in docs:"
+msgstr "Nazwy argumentów w kodzie, ale nie w dokumentacji:"
 
-msgid "Assignments in \\usage in documentation object '%s':"
-msgstr "Przypisania w '\\usage' w obiekcie dokumentacji '%s':"
+#. R/QC.R: gettext("  Argument names in docs not in code:")
+#: R/QC.R:0
+msgid "Argument names in docs not in code:"
+msgstr "Nazwy argumentów w dokumentacji, ale nie w kodzie:"
 
-msgid "Bad \\usage lines found in documentation object '%s':"
-msgstr "Znaleziono niepoprawne linie '\\usage' w obiekcie dokumentacji '%s':"
+#. R/assertCondition.R: sprintf("Asserted error: %s", error[[1]]$message)
+#: R/assertCondition.R:0
+msgid "Asserted error: %s"
+msgstr "Założony błąd: %s"
 
-msgid "S3 methods shown with full name in documentation object '%s':"
-msgstr "Metody S3 pokazane z pełną nazwą w obiekcie dokumentacji '%s':"
+#. R/assertCondition.R: sprintf("Asserted warning: %s", warning[[1]]$message)
+#: R/assertCondition.R:0
+msgid "Asserted warning: %s"
+msgstr "Założone ostrzeżenie: %s"
 
-msgid "you must specify 'package', 'dir' or 'file'"
-msgstr "musisz określić 'package', 'dir' lub 'file'"
+#. R/QC.R: gettextf("Assignments in \\usage in documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "Assignments in \\usage in documentation object '%s':"
+msgstr "Przypisania w '\\usage' w obiekcie dokumentacji '%s':"
 
-msgid "file '%s' does not exist"
-msgstr "plik '%s' nie istnieje"
+#. R/QC.R: gettext("Authors@R field gives more than one person with maintainer role:")
+#: R/QC.R:0
+msgid "Authors@R field gives more than one person with maintainer role:"
+msgstr "Pole 'Authors@R' zawiera więcej niż jedną osobę z rolą opiekuna:"
+
+#. R/QC.R: gettext("Authors@R field gives no person with author role.")
+#: R/QC.R:0
+msgid "Authors@R field gives no person with author role."
+msgstr "Pole 'Authors@R' nie zawiera danych osoby z rolÄ… autora."
 
+#. R/QC.R: gettext("Authors@R field gives no person with maintainer role, valid email address and non-empty name.")
+#: R/QC.R:0
 msgid ""
-"parse error in file '%s':\n"
-"%s"
+"Authors@R field gives no person with maintainer role, valid email address "
+"and non-empty name."
 msgstr ""
-"błąd przetwarzania w pliku '%s':\n"
-"%s"
+"Pole 'Authors@R' nie zawiera danych osoby z rolÄ… opiekuna, poprawnym adresem "
+"e-mail oraz niepustÄ… nazwÄ…."
 
-msgid "declared S3 method '%s' not found"
-msgstr "zadeklarowana metoda S3 '%s' nie została znaleziona"
+#. R/QC.R: gettext("Authors@R field gives persons with no valid roles:")
+#: R/QC.R:0
+msgid "Authors@R field gives persons with no valid roles:"
+msgstr "Pole 'Authors@R' wskazuje na osoby z niepoprawnymi rolami:"
 
-msgid "cannot check R code installed as image"
-msgstr "nie można sprawdzić kodu R zainstalowanego jako obraz"
+#. R/QC.R: gettextf("Auto-generated content requiring editing in Rd object '%s':",     nm)
+#: R/QC.R:0
+msgid "Auto-generated content requiring editing in Rd object '%s':"
+msgstr ""
+"Automatycznie wygenerowana treść wymagająca wykonania edycji w obiekcie Rd "
+"'%s':"
 
-msgid "parse error in file '%s':"
-msgstr "błąd przetwarzania w pliku '%s':"
+#. R/QC.R: gettextf("Bad \\usage lines found in documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "Bad \\usage lines found in documentation object '%s':"
+msgstr "Znaleziono niepoprawne linie '\\usage' w obiekcie dokumentacji '%s':"
 
-msgid "parse error in examples from file '%s':"
-msgstr "błąd przetwarzania w przykładach z pliku '%s':"
+#. R/utils.R: stop(conditionMessage(e), "\nCall sequence:\n", paste(.eval_with_capture(traceback(tb))$output,     collapse = "\n"), call. = FALSE)
+#: R/utils.R:0
+msgid "Call sequence:"
+msgstr "Sekwencja wywołania:"
 
-msgid "File '%s':"
-msgstr "Plik '%s':"
+#. R/Vignettes.R: gettextf("Cannot change the %s engine or use an engine of that name",     sQuote("Sweave"))
+#: R/Vignettes.R:0
+msgid "Cannot change the %s engine or use an engine of that name"
+msgstr "Nie można zmienić silnika %s lub użyć silnika o tej nazwie"
 
-msgid "found T/F in %s"
-msgstr "znaleziono wartości T/F w %s"
+#. R/QC.R: gettext("Cannot extract Author field from Authors@R field:")
+#: R/QC.R:0
+msgid "Cannot extract Author field from Authors@R field:"
+msgstr "Nie można wydobyć pola 'Author' z pola 'Authors@R':"
 
-msgid "package name '%s' seems invalid; using directory name '%s' instead"
+#. R/QC.R: gettext("Cannot extract Maintainer field from Authors@R field:")
+#: R/QC.R:0
+msgid "Cannot extract Maintainer field from Authors@R field:"
+msgstr "Nie można wyodrębnić pola 'Maintainer' z pola 'Authors@R':"
+
+#. R/news.R: warning("Cannot extract version info from the following section titles:\n",     paste(unique(nms[!ind]), collapse = "  "))
+#: R/news.R:0
+msgid "Cannot extract version info from the following section titles:"
 msgstr ""
-"nazwa pakietu '%s' wygląda na niepoprawną; zamiast niej używanie nazwy "
-"katalogu '%s'"
+"Nie można wyodrębnić informacji o wersji z następujących tytułów sekcji:"
 
+#. R/news.R: gettextf("Cannot process chunk/lines:\n%s", .collapse(x))
+#: R/news.R:0
 msgid ""
-"Vignette dependencies (%s entries) must be contained in the DESCRIPTION "
-"Depends/Suggests/Imports entries."
+"Cannot process chunk/lines:\n"
+"%s"
 msgstr ""
-"Zależności ilustracji (wpisy %s) muszą być zawarte we wpisach 'Depends/"
-"Suggests/Imports'."
+"Nie można przetwarzać fragmentu/linii:\n"
+"%s"
 
-msgid "Malformed package name"
-msgstr "Niepoprawnie wypełnione pole nazwy pakietu"
+#. R/bibstyle.R: stop("Changes require specified 'style'")
+#: R/bibstyle.R:0
+msgid "Changes require specified 'style'"
+msgstr "Zmiany wymagają określonego 'style'"
 
-msgid "Unknown encoding"
-msgstr "Nieznane kodowanie"
+#. R/CRANtools.R: sprintf("Checking %s", m)
+#: R/CRANtools.R:0
+msgid "Checking %s"
+msgstr "sprawdzanie %s"
 
-msgid "Fields with non-ASCII tags:"
-msgstr "Pola ze znacznikami innymi niż ASCII:"
+#. R/news.R: sprintf("\nChunk %s:\n%s", format(seq_along(bad)), bad)
+#: R/news.R:0
+msgid ""
+"Chunk %s:\n"
+"%s"
+msgstr ""
+"Fragment %s:\n"
+"%s"
 
-msgid "All field tags must be ASCII."
-msgstr "Wszystkie znaczniki pola muszą być w standardzie ASCII."
+#. R/dynamicHelp.R: gettext("Code demonstrations:")
+#: R/dynamicHelp.R:0
+msgid "Code demonstrations:"
+msgstr "Przykładowe użycia kodu:"
 
-msgid "Fields with non-ASCII values:"
-msgstr "Pola z wartościami innymi niż ASCII:"
+#. R/QC.R: gettextf("Code: %s", format_args(ffc))
+#. R/QC.R: gettextf("Code: %s", format_args(docObj[["code"]]))
+#: R/QC.R:0
+msgid "Code: %s"
+msgstr "Kod: %s"
 
-msgid "These fields must have ASCII values."
-msgstr "Te pola muszą mieć wartości ASCII."
+#. R/QC.R: gettextf("Codoc mismatches from documentation object '%s':",     fname)
+#: R/QC.R:0
+msgid "Codoc mismatches from documentation object '%s':"
+msgstr "Niezgodność struktury w obiekcie dokumentacji '%s':"
 
-msgid "Malformed package version."
-msgstr "Niepoprawnie wypełnione pole wersji pakietu."
+#. R/testing.R: gettextf("  Comparing %s to %s ...", sQuote(outfile), sQuote(savefile))
+#: R/testing.R:0
+msgid "Comparing %s to %s ..."
+msgstr "Porównywanie %s z %s ..."
 
-msgid "Malformed maintainer field."
-msgstr "Niepoprawnie wypełnione pole opiekuna (maintainer)."
+#. R/Rd2pdf.R: message("Converting Rd files to LaTeX ...")
+#: R/Rd2pdf.R:0
+msgid "Converting Rd files to LaTeX ..."
+msgstr "Konwertowanie plików Rd do LaTeX'a ..."
 
-msgid "Malformed Depends or Suggests or Imports or Enhances field."
+#. R/news.R: stop("Could not extract news from the following text chunks:\n",     paste(sprintf("\nChunk %s:\n%s", format(seq_along(bad)),         bad), collapse = "\n"))
+#: R/news.R:0
+msgid "Could not extract news from the following text chunks:"
 msgstr ""
-"Błędnie sformatowane pole 'Depends' lub 'Suggests' lub 'Imports' lub "
-"'Enhances'."
-
-msgid "Offending entries:"
-msgstr "PrzeszkadzajÄ…ce wpisy:"
-
-msgid ""
-"Entries must be names of packages optionally followed by '<=' or '>=', white "
-"space, and a valid version number in parentheses."
-msgstr ""
-"Wpisy muszą być nazwami pakietów po których opcjonalnie może wystąpić '<=' "
-"lub '>=', biała spacja oraz poprawny numer wersji w nawiasach."
+"Nie można było wyodrębnić wiadomości z następujących fragmentów tekstu:"
 
-msgid "Entries with infeasible comparison operator:"
-msgstr "Wpisy z mało prawdopodobnym operatorem porównania:"
+#. R/RdHelpers.R: gettextf("DESCRIPTION file is for package '%s', not '%s'", desc["Package"],     pkg)
+#. R/RdHelpers.R: gettextf("DESCRIPTION file is for package '%s', not '%s'", desc["Package"],     pkg)
+#. R/RdHelpers.R: gettextf("DESCRIPTION file is for package '%s', not '%s'", desc["Package"],     pkg)
+#. R/RdHelpers.R: gettextf("DESCRIPTION file is for package '%s', not '%s'", desc["Package"],     pkg)
+#. R/RdHelpers.R: gettextf("DESCRIPTION file is for package '%s', not '%s'", desc["Package"],     pkg)
+#: R/RdHelpers.R:0
+msgid "DESCRIPTION file is for package '%s', not '%s'"
+msgstr "plik 'DESCRIPTION' jest dla pakietu '%s', a nie dla '%s'"
 
-msgid "Only operators '<=' and '>=' are possible."
-msgstr "Jedynie operatory '<=' oraz '>=' są możliwe."
+#. R/news.R: stop("DESCRIPTION file not found")
+#. R/news.R: stop("DESCRIPTION file not found")
+#: R/news.R:0
+msgid "DESCRIPTION file not found"
+msgstr "plik 'DESCRIPTION' nie został znaleziony"
+
+#. R/testing.R: message("DIFFERED")
+#. R/testing.R: message("DIFFERED")
+#: R/testing.R:0
+msgid "DIFFERED"
+msgstr "RÓŻNICE"
 
-msgid "Entries with infeasible version number:"
-msgstr "Wpisy z mało prawdopodobnym numerem wersji:"
+#. R/QC.R: gettextf("Data codoc mismatches from documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "Data codoc mismatches from documentation object '%s':"
+msgstr "Niezgodność struktury danych w obiekcie dokumentacji '%s':"
 
-msgid ""
-"Version numbers must be sequences of at least two non-negative integers, "
-"separated by single '.' or '-'."
-msgstr ""
-"Numery wersji muszą być ciągiem co najmniej dwóch nieujemnych liczb "
-"całkowitych, oddzielonych pojedynczym znakiem '.' lub '-'."
+#. R/QC.R: gettextf("Data with usage in documentation object '%s' but not in code:",     fname)
+#: R/QC.R:0
+msgid "Data with usage in documentation object '%s' but not in code:"
+msgstr "Dane z użyciem w obiekcie dokumentacji '%s', ale nie w kodzie:"
 
-msgid "Invalid VignetteBuilder field."
-msgstr "Niepoprawne pole 'VignetteBuilder'."
+#. R/QC.R: gettextf("Deprecated license: %s", paste(y, collapse = " "))
+#: R/QC.R:0
+msgid "Deprecated license: %s"
+msgstr "Przestarzała licencja: %s"
 
+#. R/Vignettes.R: gettextf("Detected vignette source files (%s) with shared names (%s) and therefore risking overwriting each others output files",     paste(sQuote(docs), collapse = ", "), paste(sQuote(names),         collapse = ", "))
+#: R/Vignettes.R:0
 msgid ""
-"This field must contain one or more packages (and no version requirement)."
+"Detected vignette source files (%s) with shared names (%s) and therefore "
+"risking overwriting each others output files"
 msgstr ""
-"To pole musi zawierać jeden lub więcej pakietów (nie jest wymagana wersja)."
+"Wykryto pliki źródłowe ilustracji (%s) ze współdzielonymi nazwami (%s) w "
+"efekcie czego istnieje ryzyko nadpisania każdego z ich plików wyjściowych"
 
-msgid "Invalid Priority field."
-msgstr "Niepoprawne pole priorytetu."
+#. R/QC.R: gettextf("Docs: %s", format_args(ffd))
+#. R/QC.R: gettextf("Docs: %s", format_args(docObj[["docs"]]))
+#: R/QC.R:0
+msgid "Docs: %s"
+msgstr "Dokumenty: %s"
 
-msgid ""
-"Packages with priorities 'base' or 'recommended' or 'defunct-base' must "
-"already be known to R."
+#. R/QC.R: gettextf("Documented arguments not in \\usage in documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "Documented arguments not in \\usage in documentation object '%s':"
 msgstr ""
-"Pakiety z priorytetami 'base' lub 'recommended' lub 'defunct-base' muszą być "
-"już być znane R."
+"Udokumentowane argumenty nie sÄ… w '\\usage' w obiekcie dokumentacji '%s':"
 
-msgid "Malformed Title field: should not end in a period."
-msgstr "Niepoprawnie wypełnione pole 'Title': nie powinno kończyć się kropką"
+#. R/QC.R: gettextf("Duplicated \\argument entries in documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "Duplicated \\argument entries in documentation object '%s':"
+msgstr "Powtórzone wpisy '\\argument' w obiekcie dokumentacji '%s':"
 
-msgid ""
-"Malformed Description field: should contain one or more complete sentences."
-msgstr ""
-"Niepoprawnie wypełnione pole 'Description': powinno zawierać jedno lub "
-"więcej kompletnych zdań."
+#. R/pdftools.R: stop("EOF marker not found")
+#: R/pdftools.R:0
+msgid "EOF marker not found"
+msgstr "nie znaleziono znacznika EOF"
 
-msgid ""
-"See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual."
+#. R/install.R: stop("ERROR: '--merge-multiarch' applies only to a single tarball",     call. = FALSE)
+#: R/install.R:0
+msgid "ERROR: '--merge-multiarch' applies only to a single tarball"
 msgstr ""
-"Zobacz informację w sekcji 'The DESCRIPTION file' podręcznika 'Writing R "
-"Extensions'."
-
-msgid "Malformed Authors@R field:"
-msgstr "Źle sformułowane pole Authors@R:"
+"B�ĄD: '--merge-multiarch' stosuje się tylko do pojedynczego pliku tarball"
 
-msgid "Cannot extract Author field from Authors@R field:"
-msgstr "Nie można wydobyć pola 'Author' z pola 'Authors@R':"
+#. R/install.R: gettextf("ERROR: cannot cd to directory %s", sQuote(lib))
+#: R/install.R:0
+msgid "ERROR: cannot cd to directory %s"
+msgstr "B�ĄD: nie można wejść do katalogu %s"
 
-msgid "Authors@R field gives no person with author role."
-msgstr "Pole 'Authors@R' nie zawiera danych osoby z rolÄ… autora."
+#. R/check.R: sprintf("ERROR: cannot create check dir %s", sQuote(pkgoutdir))
+#: R/check.R:0
+msgid "ERROR: cannot create check dir %s"
+msgstr "B�ĄD: nie można utworzyć katalogu sprawdzenia %s"
 
-msgid "Authors@R field gives persons with no valid roles:"
-msgstr "Pole 'Authors@R' wskazuje na osoby z niepoprawnymi rolami:"
+#. R/install.R: stop("ERROR: no packages specified", call. = FALSE)
+#: R/install.R:0
+msgid "ERROR: no packages specified"
+msgstr "B�ĄD: nie określono pakietów"
 
-msgid "Cannot extract Maintainer field from Authors@R field:"
-msgstr "Nie można wyodrębnić pola 'Maintainer' z pola 'Authors@R':"
+#. R/install.R: stop("ERROR: no permission to install to directory ", sQuote(lib),     call. = FALSE)
+#: R/install.R:0
+msgid "ERROR: no permission to install to directory"
+msgstr "B�ĄD: brak uprawnień aby zainstalować w katalogu"
 
-msgid "Authors@R field gives more than one person with maintainer role:"
-msgstr "Pole 'Authors@R' zawiera więcej niż jedną osobę z rolą opiekuna:"
+#. R/admin.R: gettextf("ERROR: this R is version %s, package '%s' requires R %s %s",     current, package, depends$op, depends$version)
+#: R/admin.R:0
+msgid "ERROR: this R is version %s, package '%s' requires R %s %s"
+msgstr "B�ĄD: Ta wersja R to %s, pakiet %s wymaga wersji R %s %s"
 
-msgid ""
-"Authors@R field gives no person with maintainer role, valid email address "
-"and non-empty name."
-msgstr ""
-"Pole 'Authors@R' nie zawiera danych osoby z rolÄ… opiekuna, poprawnym adresem "
-"e-mail oraz niepustÄ… nazwÄ…."
+#. R/admin.R: gettextf("ERROR: this R is version %s, required is R %s %s",     current, depends$op, depends$version)
+#: R/admin.R:0
+msgid "ERROR: this R is version %s, required is R %s %s"
+msgstr "B�ĄD: wersja tego programu to R %s, wymagana jest R %s %s"
 
+#. R/QC.R: gettextf("Encoding '%s' is not portable", x$non_portable_encoding)
+#: R/QC.R:0
 msgid "Encoding '%s' is not portable"
 msgstr "Strona kodowa '%s' nie jest przenośna"
 
-msgid "Unknown encoding with non-ASCII data"
-msgstr "Nieznane kodowanie z danymi nie-ASCII"
+#. R/Vignettes.R: gettextf("Engine name %s and package %s do not match", sQuote(name),     sQuote(package))
+#: R/Vignettes.R:0
+msgid "Engine name %s and package %s do not match"
+msgstr "Nazwa silnika ilustracji %s oraz pakietu %s nie zgadzajÄ… siÄ™"
 
-msgid "Non-standard license specification:"
-msgstr "Niestandardowa specyfikacja licencji:"
+#. R/QC.R: gettextf("Entries must be names of packages optionally followed by '<=' or '>=', white space, and a valid version number in parentheses.")
+#: R/QC.R:0
+msgid ""
+"Entries must be names of packages optionally followed by '<=' or '>=', white "
+"space, and a valid version number in parentheses."
+msgstr ""
+"Wpisy muszą być nazwami pakietów po których opcjonalnie może wystąpić '<=' "
+"lub '>=', biała spacja oraz poprawny numer wersji w nawiasach."
 
-msgid "Standardizable: %s"
-msgstr "Standaryzowalne: %s"
+#. R/QC.R: gettext("Entries with infeasible comparison operator:")
+#: R/QC.R:0
+msgid "Entries with infeasible comparison operator:"
+msgstr "Wpisy z mało prawdopodobnym operatorem porównania:"
 
-msgid "Standardized license specification:"
-msgstr "Ustandaryzowana specyfikacja licencji:"
+#. R/QC.R: gettext("Entries with infeasible version number:")
+#: R/QC.R:0
+msgid "Entries with infeasible version number:"
+msgstr "Wpisy z mało prawdopodobnym numerem wersji:"
 
-msgid "Deprecated license: %s"
-msgstr "Przestarzała licencja: %s"
+#. R/Rd2pdf.R: message("Error in running tools::texi2pdf()")
+#: R/Rd2pdf.R:0
+msgid "Error in running tools::texi2pdf()"
+msgstr "BÅ‚Ä…d w uruchomieniu 'tools::texi2pdf()'"
 
-msgid "Invalid license file pointers: %s"
-msgstr "Niepoprawne wskaźniki pliku licencji: %s"
+#. R/build.R: gettextf("Error: cannot rename directory to %s", sQuote(intname))
+#: R/build.R:0
+msgid "Error: cannot rename directory to %s"
+msgstr "Błąd: nie można zmienić katalogu na %s"
 
-msgid "License components with restrictions not permitted:"
-msgstr "Komponenty licencji z ograniczeniami nie sÄ… dozwolone:"
+#. R/check.R: message("Error: no packages were specified")
+#: R/check.R:0
+msgid "Error: no packages were specified"
+msgstr "Błąd: nie określono pakietów"
 
-msgid "License components which are templates and need '+ file LICENSE':"
-msgstr ""
-"Komponenty licencji, które są szablonami oraz potrzebują dodatkowo pliku "
-"'LICENSE':"
+#. R/testing.R: message("FAILED")
+#: R/testing.R:0
+msgid "FAILED"
+msgstr "NIE POWIOD�O SIĘ"
 
-msgid "Non-portable flags in variable '%s':"
-msgstr "Nieprzenośne flagi w zmiennej '%s':"
+#. R/assertCondition.R: gettextf("Failed to get %s in evaluating %s", .Wanted, .exprString)
+#: R/assertCondition.R:0
+msgid "Failed to get %s in evaluating %s"
+msgstr "Nie udało się uzyskać %s podczas wyznaczania %s"
 
-msgid "Variables overriding user/site settings:"
-msgstr "Zmienne omijające ustawienia użytkownika/strony:"
+#. R/assertCondition.R: gettextf("Failed to get error in evaluating %s", d.expr)
+#: R/assertCondition.R:0
+msgid "Failed to get error in evaluating %s"
+msgstr "Nie udało się uzyskać błędu podczas wyznaczania %s"
 
+#. R/Vignettes.R: gettextf("Failed to locate the %s output file (by engine %s) for vignette with name %s. The following files exist in directory %s: %s",     sQuote(by), sQuote(sprintf("%s::%s", engine$package, engine$name)),     sQuote(name), sQuote(dir), paste(sQuote(output0), collapse = ", "))
+#. R/Vignettes.R: gettextf("Failed to locate the %s output file (by engine %s) for vignette with name %s. The following files exist in directory %s: %s",     sQuote(by), sQuote(sprintf("%s::%s", engine$package, engine$name)),     sQuote(name), sQuote(dir), paste(sQuote(output0), collapse = ", "))
+#: R/Vignettes.R:0
 msgid ""
-"package %s exists but was not installed under R >= 2.10.0 so xrefs cannot be "
-"checked"
+"Failed to locate the %s output file (by engine %s) for vignette with name "
+"%s. The following files exist in directory %s: %s"
 msgstr ""
-"pakiet %s istnieje, ale nie został zainstalowany pod R >= 2.10.0, tak więc "
-"'xrefs' nie może zostać sprawdzony"
+"Nie udało się zlokalizować pliku wynikowego %s (przez silnik %s) dla "
+"ilustracji o nazwie %s. Następujące pliki istnieją w katalogu %s: %s"
 
-msgid "Missing link or links in documentation object '%s':"
-msgstr "BrakujÄ…cy link lub linki w obiekcie dokumentacji '%s':"
+#. R/QC.R: gettext("Fields with non-ASCII tags:")
+#. R/QC.R: gettext("Fields with non-ASCII tags:")
+#: R/QC.R:0
+msgid "Fields with non-ASCII tags:"
+msgstr "Pola ze znacznikami innymi niż ASCII:"
 
-msgid "See section 'Cross-references' in the 'Writing R Extensions' manual."
-msgstr ""
-"Zobacz informację w sekcji 'Cross-references' podręcznika 'Writing R "
-"Extensions'."
+#. R/QC.R: gettext("Fields with non-ASCII values:")
+#. R/QC.R: gettext("Fields with non-ASCII values:")
+#: R/QC.R:0
+msgid "Fields with non-ASCII values:"
+msgstr "Pola z wartościami innymi niż ASCII:"
 
+#. R/QC.R: gettextf("File %s:", sQuote(f))
+#. R/QC.R: gettextf("File %s:", sQuote(f))
+#. R/QC.R: gettextf("File %s:", sQuote(f))
+#. R/sotools.R: gettextf("File %s:", sQuote(attr(x, "file")))
+#. R/sotools.R: gettextf("File %s:", sQuote(attr(x, "file")))
+#: R/QC.R:0 R/sotools.R:0
 msgid "File %s:"
 msgstr "Plik %s:"
 
-msgid "%s has wrong argument list %s"
-msgstr "%s ma błędną listę argumentów %s"
-
-msgid "%s calls:"
-msgstr "wywołania %s:"
-
-msgid ""
-"Package startup functions should have two arguments with names starting with "
-"%s and %s, respectively."
-msgstr ""
-"Funkcje startowe pakietu powinny posiadać dwa argumenty z nazwami "
-"rozpoczynajÄ…cymi siÄ™ odpowiednio od %s oraz %s."
+#. R/QC.R: gettextf("File '%s':", fname)
+#: R/QC.R:0
+msgid "File '%s':"
+msgstr "Plik '%s':"
 
-msgid "Package startup functions should not change the search path."
-msgstr "Funkcje startowe pakietu nie powinny zmieniać ścieżki wyszukiwania."
+#. R/utils.R: stop("File 'DESCRIPTION' is missing.")
+#: R/utils.R:0
+msgid "File 'DESCRIPTION' is missing."
+msgstr "Brakuje pliku 'DESCRIPTION'."
 
-msgid "Package startup functions should use %s to generate messages."
-msgstr "Funkcje startowe pakietu powinny używać %s do generowania wiadomości."
+#. R/utils.R: stop("Files 'DESCRIPTION' and 'DESCRIPTION.in' are missing.")
+#: R/utils.R:0
+msgid "Files 'DESCRIPTION' and 'DESCRIPTION.in' are missing."
+msgstr "Brakuje plików 'DESCRIPTION' oraz 'DESCRIPTION.in'."
 
-msgid "Package startup functions should not call %s."
-msgstr "Funkcje startowe pakietu nie powinny wywoływać %s."
+#. R/sotools.R: gettextf("Found %s, possibly from %s", sQuote(v), paste(sprintf("%s (%s)",     sQuote(u[, "ssname"]), u[, "language"]), collapse = ", "))
+#: R/sotools.R:0
+msgid "Found %s, possibly from %s"
+msgstr "Znaleziono %s, prawdopodobnie z %s"
 
-msgid "See section %s in '%s'."
-msgstr "Zobacz sekcjÄ™ %s w '%s'."
+#. R/QC.R: gettextf("Functions or methods with usage in documentation object '%s' but not in code:",     fname)
+#: R/QC.R:0
+msgid ""
+"Functions or methods with usage in documentation object '%s' but not in code:"
+msgstr ""
+"Funkcje lub metody z użyciem w obiekcie dokumentacji '%s' ale nie w kodzie:"
 
+#. R/QC.R: gettextf("Generics 'g' in 'env' %s where '%s' errors: %s\nMay need something like\n\n%s\nin NAMESPACE.",     format(env), "hasMethods(g, env)", paste(sQuote(rErr), collapse = ", "),     paste0("  importFrom(", paste(dq(pkgs), dq(rErr), sep = ", "),         ")\n"))
+#: R/QC.R:0
 msgid ""
-"Package detach functions should have one argument with name starting with %s."
+"Generics 'g' in 'env' %s where '%s' errors: %s\n"
+"May need something like\n"
+"\n"
+"%s\n"
+"in NAMESPACE."
 msgstr ""
-"Funkcje odłączające pakiet powinny mieć jeden argument z nazwą "
-"rozpoczynajÄ…cÄ… siÄ™ od %s."
+"Ogólna funkcja 'g' w 'env' %s gdzie błędy '%s': %s\n"
+"Może wymagać czegoś podobnego do\n"
+"\n"
+"%s\n"
+"w pliku 'NAMESPACE'."
 
-msgid "Package detach functions should not call %s."
-msgstr "Funkcje odłączające pakiet nie powinny wywoływać %s."
+#. R/assertCondition.R: gettextf("Got %s in evaluating %s; wanted %s", .got, .exprString,     .Wanted)
+#: R/assertCondition.R:0
+msgid "Got %s in evaluating %s; wanted %s"
+msgstr "Otrzymano %s podczas wyznaczania %s; oczekiwano %s"
 
-msgid "unable to create"
-msgstr "nie można utworzyć"
+#. R/assertCondition.R: gettextf("Got warning in evaluating %s, but also an error", d.expr)
+#: R/assertCondition.R:0
+msgid "Got warning in evaluating %s, but also an error"
+msgstr "Otrzymano ostrzeżenie podczas wyznaczania %s, ale również błąd"
 
-msgid "unable to write code files"
-msgstr "nie można zapisać plików kodu"
+#. R/dynamicHelp.R: gettext("Help pages:")
+#: R/dynamicHelp.R:0
+msgid "Help pages:"
+msgstr "Strony pomocy:"
 
-msgid "package 'methods' is used but not declared"
-msgstr "pakiet 'methods' został użyty, ale nie jest zadeklarowany"
+#. R/Vignettes.R: gettextf("In '%s' vignettes '%s' and '%s' have the same vignette name",     basename(dirname(dir)), orig, dup)
+#: R/Vignettes.R:0
+msgid "In '%s' vignettes '%s' and '%s' have the same vignette name"
+msgstr "W ilustracjach '%s', '%s' oraz '%s' majÄ… te same nazwy ilustracji"
 
-msgid "'::' or ':::' imports not declared from:"
-msgstr "importy '::' lub ':::' nie sÄ… zadeklarowane z:"
+#. R/admin.R: gettext("Invalid DESCRIPTION file")
+#: R/admin.R:0
+msgid "Invalid DESCRIPTION file"
+msgstr "niepoprawny plik 'DESCRIPTION'"
 
-msgid "'::' or ':::' import not declared from: %s"
-msgstr "import '::' lub ':::' nie jest zadeklarowany z: %s"
+#. R/QC.R: gettext("Invalid Priority field.")
+#: R/QC.R:0
+msgid "Invalid Priority field."
+msgstr "Niepoprawne pole priorytetu."
 
-msgid "'library' or 'require' calls not declared from:"
-msgstr "wywołania 'library' lub 'require' nie są zadeklarowane z:"
+#. R/QC.R: gettext("Invalid VignetteBuilder field.")
+#: R/QC.R:0
+msgid "Invalid VignetteBuilder field."
+msgstr "Niepoprawne pole 'VignetteBuilder'."
 
-msgid "'library' or 'require' call not declared from: %s"
-msgstr "wywołanie 'library' lub 'require' nie jest zadeklarowane z: %s"
+#. R/QC.R: gettextf("Invalid license file pointers: %s", paste(y, collapse = " "))
+#: R/QC.R:0
+msgid "Invalid license file pointers: %s"
+msgstr "Niepoprawne wskaźniki pliku licencji: %s"
 
-msgid "'loadNamespace' or 'requireNamespace' calls not declared from:"
+#. R/QC.R: gettext("License components which are templates and need '+ file LICENSE':")
+#: R/QC.R:0
+msgid "License components which are templates and need '+ file LICENSE':"
 msgstr ""
-"wywołania 'loadNamespace()' lub 'requireNamespace()' nie są zadeklarowane z:"
+"Komponenty licencji, które są szablonami oraz potrzebują dodatkowo pliku "
+"'LICENSE':"
 
-msgid "'loadNamespace' or 'requireNamespace' call not declared from: %s"
-msgstr ""
-"wywołanie 'loadNamespace()' lub 'requireNamespace()' nie jest zadeklarowane "
-"z: %s"
+#. R/QC.R: gettext("License components with restrictions not permitted:")
+#: R/QC.R:0
+msgid "License components with restrictions not permitted:"
+msgstr "Komponenty licencji z ograniczeniami nie sÄ… dozwolone:"
 
-msgid "'library' or 'require' calls to packages already attached by Depends:"
-msgstr ""
-"wywołania 'library' lub 'require' do pakietów, które były już dołączone "
-"przez 'Depends':"
+#. R/dynamicHelp.R: gettextf("Link %s in package %s could not be located", mono(helpdoc),     mono(pkg))
+#: R/dynamicHelp.R:0
+msgid "Link %s in package %s could not be located"
+msgstr "Linki %s w pakiecie '%s' nie mogły zostać zlokalizowane"
 
+#. R/Vignettes.R: gettextf("Located more than one %s output file (by engine %s) for vignette with name %s: %s",     sQuote(by), sQuote(sprintf("%s::%s", engine$package, engine$name)),     sQuote(name), paste(sQuote(output), collapse = ", "))
+#. R/Vignettes.R: gettextf("Located more than one %s output file (by engine %s) for vignette with name %s: %s",     sQuote(by), sQuote(sprintf("%s::%s", engine$package, engine$name)),     sQuote(name), paste(sQuote(output), collapse = ", "))
+#: R/Vignettes.R:0
 msgid ""
-"'library' or 'require' call to %s which was already attached by Depends."
+"Located more than one %s output file (by engine %s) for vignette with name "
+"%s: %s"
 msgstr ""
-"wywołanie 'library' lub 'require' do pakietu %s, który był już dołączony "
-"przez 'Depends'."
+"Zlokalizowano więcej niż jeden plik wynikowy %s (przez silnik %s) dla "
+"ilustracji o nazwie %s: %s"
 
-msgid "'library' or 'require' calls in package code:"
-msgstr "wywołania 'library' lub 'require' w kodzie pakietu:"
+#. R/Rd.R: gettextf("Macro file %s should only contain Rd macro definitions and comments",     file)
+#: R/Rd.R:0
+msgid "Macro file %s should only contain Rd macro definitions and comments"
+msgstr "Plik makr %s powinien zawierać tylko definicję makr Rd oraz komentarze"
 
-msgid "'library' or 'require' call to %s in package code."
-msgstr "wywołania 'library' lub 'require' do %s w kodzie pakietu"
+#. R/QC.R: gettext("Malformed Authors@R field:")
+#: R/QC.R:0
+msgid "Malformed Authors@R field:"
+msgstr "Źle sformułowane pole Authors@R:"
 
-msgid "Namespaces in Imports field not imported from:"
+#. R/QC.R: gettext("Malformed Depends or Suggests or Imports or Enhances field.")
+#: R/QC.R:0
+msgid "Malformed Depends or Suggests or Imports or Enhances field."
 msgstr ""
-"Przestrzenie nazw w polu 'Imports' nie zostały zaimportowane z pakietu:"
+"Błędnie sformatowane pole 'Depends' lub 'Suggests' lub 'Imports' lub "
+"'Enhances'."
 
-msgid "Namespace in Imports field not imported from: %s"
+#. R/QC.R: gettext("Malformed Description field: should contain one or more complete sentences.")
+#: R/QC.R:0
+msgid ""
+"Malformed Description field: should contain one or more complete sentences."
 msgstr ""
-"Przestrzeń nazw w polu 'Imports' nie została zaimportowana z pakietu: %s"
+"Niepoprawnie wypełnione pole 'Description': powinno zawierać jedno lub "
+"więcej kompletnych zdań."
 
-msgid "Packages in Depends field not imported from:"
-msgstr "Pakiety z pola 'Depends' nie zostały zaimportowany z pakietu:"
+#. R/news.R: gettextf("Malformed NEWS.Rd file:\nChunk starting\n  %s\ncontains more than one \\itemize.\nUsing the first one.",     substring(sub("^[[:space:]]*", "", .Rd_deparse(x)), 1L, 60L))
+#: R/news.R:0
+msgid ""
+"Malformed NEWS.Rd file:\n"
+"Chunk starting\n"
+"  %s\n"
+"contains more than one \\itemize.\n"
+"Using the first one."
+msgstr ""
+"Uszkodzony plik NEWS.Rd:\n"
+"Fragment rozpoczynajÄ…cy\n"
+"  %s\n"
+"zawiera więcej niż jeden \\itemize.\n"
+"Używanie pierwszego."
 
-msgid "Package in Depends field not imported from: %s"
-msgstr "Pakiet z pola 'Depends' nie został zaimportowany z pakietu: %s"
+#. R/news.R: gettextf("Malformed NEWS.Rd file:\nChunk starting\n  %s\ncontains no \\itemize.",     substring(sub("^[[:space:]]*", "", .Rd_deparse(x)), 1L, 60L))
+#: R/news.R:0
+msgid ""
+"Malformed NEWS.Rd file:\n"
+"Chunk starting\n"
+"  %s\n"
+"contains no \\itemize."
+msgstr ""
+"Uszkodzony plik NEWS.Rd:\n"
+"Fragment rozpoczynajÄ…cy\n"
+"  %s\n"
+"nie zawiera \\itemize."
 
-msgid "Missing or unexported objects:"
-msgstr "BrakujÄ…ce lub niewyeksportowane obiekty:"
+#. R/QC.R: gettext("Malformed Title field: should not end in a period.")
+#: R/QC.R:0
+msgid "Malformed Title field: should not end in a period."
+msgstr "Niepoprawnie wypełnione pole 'Title': nie powinno kończyć się kropką"
 
-msgid "Missing or unexported object: %s"
-msgstr "BrakujÄ…cy lub niewyeksportowany obiekt: %s"
+#. R/QC.R: gettext("Malformed maintainer field.")
+#: R/QC.R:0
+msgid "Malformed maintainer field."
+msgstr "Niepoprawnie wypełnione pole opiekuna (maintainer)."
 
-msgid "':::' calls which should be '::':"
-msgstr "wywołania ':::' które powinny być '::':"
+#. R/QC.R: gettext("Malformed package name")
+#: R/QC.R:0
+msgid "Malformed package name"
+msgstr "Niepoprawnie wypełnione pole nazwy pakietu"
 
-msgid "':::' call which should be '::': %s"
-msgstr "wywołanie ':::' które powinno być '::': %s"
+#. R/QC.R: gettext("Malformed package version.")
+#: R/QC.R:0
+msgid "Malformed package version."
+msgstr "Niepoprawnie wypełnione pole wersji pakietu."
 
-msgid "Missing objects imported by ':::' calls:"
-msgstr "Brakujące obiekty zaimportowane przez wywołania ':::':"
+#. R/QC.R: gettext("  Mismatches in argument default values (first 3):")
+#: R/QC.R:0
+msgid "Mismatches in argument default values (first 3):"
+msgstr "Niezgodność w domyslnych wartościach argumentów (pierwsze 3): "
 
-msgid "Missing object imported by a ':::' call: %s"
-msgstr "Brakujący obiekt zaimportowany przez wywołanie ':::': %s"
+#. R/QC.R: gettext("  Mismatches in argument default values:")
+#: R/QC.R:0
+msgid "Mismatches in argument default values:"
+msgstr "Niezgodność w domyślnych wartościach argumentów:"
 
-msgid "Unexported objects imported by ':::' calls:"
-msgstr "Brakujące obiekty zaimportowane przez wywołania ':::':"
+#. R/QC.R: gettext("  Mismatches in argument names (first 3):")
+#: R/QC.R:0
+msgid "Mismatches in argument names (first 3):"
+msgstr "Niezgodność w nazwach argumentów (pierwsze 3):"
 
-msgid "Unexported object imported by a ':::' call: %s"
-msgstr "Brakujący obiekt zaimportowany przez wywołanie ':::': %s"
+#. R/QC.R: gettext("  Mismatches in argument names:")
+#: R/QC.R:0
+msgid "Mismatches in argument names:"
+msgstr "Niezgodność w nazwach argumentów:"
 
-msgid "Unavailable namespaces imported from by ':::' calls:"
-msgstr "Niedostępne przestrzenie nazw zaimportowane przez wywołania ':::':"
+#. R/QC.R: gettextf("Missing link or links in documentation object '%s':",     names(xx)[i])
+#: R/QC.R:0
+msgid "Missing link or links in documentation object '%s':"
+msgstr "BrakujÄ…cy link lub linki w obiekcie dokumentacji '%s':"
 
-msgid "Unavailable namespace imported from by a ':::' call: %s"
-msgstr "Niedostępna przestrzeń nazw zaimportowana przez wywołanie ':::': %s"
+#. R/QC.R: gettextf("Missing object imported by a ':::' call: %s", sQuote(xx))
+#: R/QC.R:0
+msgid "Missing object imported by a ':::' call: %s"
+msgstr "Brakujący obiekt zaimportowany przez wywołanie ':::': %s"
 
-msgid "'data(package=)' calls not declared from:"
-msgstr "wywołania 'data(package=)' nie zostały zadeklarowane z:"
+#. R/QC.R: gettext("Missing objects imported by ':::' calls:")
+#: R/QC.R:0
+msgid "Missing objects imported by ':::' calls:"
+msgstr "Brakujące obiekty zaimportowane przez wywołania ':::':"
 
-msgid "'data(package=)' call not declared from: %s"
-msgstr "wywołanie 'data(package=)' nie zostało zadeklarowane z: %s"
+#. R/QC.R: gettextf("Missing or unexported object: %s", sQuote(xx))
+#: R/QC.R:0
+msgid "Missing or unexported object: %s"
+msgstr "BrakujÄ…cy lub niewyeksportowany obiekt: %s"
 
-msgid "Package has no 'Version' field"
-msgstr "Pakiet nie posiada pola 'Version'"
+#. R/QC.R: gettext("Missing or unexported objects:")
+#: R/QC.R:0
+msgid "Missing or unexported objects:"
+msgstr "BrakujÄ…ce lub niewyeksportowane obiekty:"
 
+#. R/QC.R: message("NB: need Internet access to use CRAN incoming checks")
+#: R/QC.R:0
 msgid "NB: need Internet access to use CRAN incoming checks"
 msgstr ""
 "NB: potrzeba dostępu do Internetu aby korzystać z przychodzących kontroli "
 "CRAN"
 
-msgid "Rd files with duplicated name '%s':"
-msgstr "Pliki Rd z powtórzoną nazwą '%s':"
-
-msgid "Rd files with duplicated alias '%s':"
-msgstr "Pliki Rd z powtórzonym aliasem '%s':"
-
-msgid "Argument items with no description in Rd object '%s':"
-msgstr "Pozycje argumentu bez opisu w obiekcie Rd '%s':"
-
-msgid "Auto-generated content requiring editing in Rd object '%s':"
-msgstr ""
-"Automatycznie wygenerowana treść wymagająca wykonania edycji w obiekcie Rd "
-"'%s':"
-
-msgid "no Rd sections specified"
-msgstr "nie określono sekcji Rd"
+#. R/news.R: stop("NEWS file not found")
+#: R/news.R:0
+msgid "NEWS file not found"
+msgstr "plik 'NEWS' nie został znaleziony"
 
-msgid ""
-"Generics 'g' in 'env' %s where '%s' errors: %s\n"
-"May need something like\n"
-"\n"
-"%s\n"
-"in NAMESPACE."
+#. R/QC.R: gettextf("Namespace in Imports field not imported from: %s",     sQuote(xx))
+#: R/QC.R:0
+msgid "Namespace in Imports field not imported from: %s"
 msgstr ""
-"Ogólna funkcja 'g' w 'env' %s gdzie błędy '%s': %s\n"
-"Może wymagać czegoś podobnego do\n"
-"\n"
-"%s\n"
-"w pliku 'NAMESPACE'."
-
-msgid "Rd object required"
-msgstr "Wymagany jest obiekt Rd"
-
-msgid "missing/empty %s field in '%s'"
-msgstr "brakujÄ…ce/puste pole %s w '%s'"
-
-msgid "Rd files must have a non-empty %s."
-msgstr "Pliki Rd muszą mieć niepustą %s."
+"Przestrzeń nazw w polu 'Imports' nie została zaimportowana z pakietu: %s"
 
-msgid "See chapter 'Writing R documentation' in manual 'Writing R Extensions'."
+#. R/QC.R: gettext("Namespaces in Imports field not imported from:")
+#: R/QC.R:0
+msgid "Namespaces in Imports field not imported from:"
 msgstr ""
-"Zobacz rozdział 'Writing R documentation' w podręczniku 'Writing R "
-"Extensions'."
+"Przestrzenie nazw w polu 'Imports' nie zostały zaimportowane z pakietu:"
 
-msgid "missing/empty \\title field in '%s'"
-msgstr "brakujÄ…ce/puste pole '\\title' w '%s'"
+#. R/Rd.R: gettextf("No Rd macros in package '%s'.", p)
+#: R/Rd.R:0
+msgid "No Rd macros in package '%s'."
+msgstr "Nie znaleziono makr Rd w pakiecie '%s'."
 
-msgid "Rd files must have a non-empty \\title."
-msgstr "Pliki Rd muszą mieć niepustą sekcję '\\title'."
+#. R/dynamicHelp.R: gettextf("No docs found for package %s", mono(pkg))
+#: R/dynamicHelp.R:0
+msgid "No docs found for package %s"
+msgstr "Nie znaleziono dokumentów dla pakietu '%s'"
 
-msgid "argument 'outFile' must be a character string or connection"
-msgstr "argument 'outfile' musi być łańcuchem tekstowym lub połączeniem"
+#. R/dynamicHelp.R: gettext("No files in this directory")
+#: R/dynamicHelp.R:0
+msgid "No files in this directory"
+msgstr "Brak plików w tym katalogu"
 
-msgid "you must specify 'dir' or 'files'"
-msgstr "musisz określić argument 'dir' lub 'files'"
+#. R/dynamicHelp.R: gettextf("No help found for package %s", mono(pkg))
+#: R/dynamicHelp.R:0
+msgid "No help found for package %s"
+msgstr "Nie znaleziono pomocy na temat pakietu '%s'"
 
-msgid "cannot deal with Rd objects with missing/empty names"
-msgstr "nie można poradzić sobie z obiektami Rd z brakującymi/pustymi nazwami"
+#. R/dynamicHelp.R: gettextf("No help found for topic %s in any package.", mono(topic))
+#: R/dynamicHelp.R:0
+msgid "No help found for topic %s in any package."
+msgstr "Nie znaleziono pomocy na temat '%s' w żadnym z pakiecie."
 
+#. R/Rd.R: gettextf("No help on %s found in RdDB %s", sQuote(key), sQuote(filebase))
+#: R/Rd.R:0
 msgid "No help on %s found in RdDB %s"
 msgstr "Nie znaleziono pomocy na temat %s w zbiorach RdDB %s"
 
-msgid "'macros' must be TRUE or must specify existing macros"
+#. R/news.R: stop("No news found in given file using old-style R-like format.")
+#: R/news.R:0
+msgid "No news found in given file using old-style R-like format."
 msgstr ""
-"argument 'macros' musi mieć wartość TRUE lub musi określać istniejące makra"
-
-msgid "Macro file %s should only contain Rd macro definitions and comments"
-msgstr "Plik makr %s powinien zawierać tylko definicję makr Rd oraz komentarze"
-
-msgid "No Rd macros in package '%s'."
-msgstr "Nie znaleziono makr Rd w pakiecie '%s'."
-
-msgid "more than one \\examples section, using the first"
-msgstr "więcej niż jedna sekcja \\examples, używanie pierwszej"
+"Nie znaleziono wiadomości w podanym pliku używając starego stylu formatu "
+"podobnego do R."
 
-msgid "Converting Rd files to LaTeX ..."
-msgstr "Konwertowanie plików Rd do LaTeX'a ..."
+#. R/news.R: stop("No news found in given file using package default format.")
+#: R/news.R:0
+msgid "No news found in given file using package default format."
+msgstr ""
+"Nie znaleziono wiadomości w podanym pliku używając domyślnego formatu "
+"pakietu."
 
-msgid "-t option without value"
-msgstr "opcja '-t' bez wartości"
+#. R/dynamicHelp.R: gettextf("No package index found for package %s", mono(pkg))
+#: R/dynamicHelp.R:0
+msgid "No package index found for package %s"
+msgstr "Nie znaleziono indeksu pakietu dla pakietu %s"
 
-msgid "-o option without value"
-msgstr "opcja '-o' bez wartości"
+#. R/dynamicHelp.R: gettextf("No package named %s could be found", mono(pkg))
+#. R/dynamicHelp.R: gettextf("No package named %s could be found", mono(pkg))
+#: R/dynamicHelp.R:0
+msgid "No package named %s could be found"
+msgstr "Nie znaleziono pakietu o nazwie '%s'"
 
-msgid "Warning: unknown option"
-msgstr "Ostrzeżenie: nieznana opcja"
+#. R/dynamicHelp.R: gettext("No results found")
+#: R/dynamicHelp.R:0
+msgid "No results found"
+msgstr "Brak wyników"
 
-msgid "exactly one Rd file must be specified"
-msgstr "dokładnie jeden plik Rd musi zostać określony"
+#. R/QC.R: gettextf("Non-portable flags in variable '%s':", names(x))
+#: R/QC.R:0
+msgid "Non-portable flags in variable '%s':"
+msgstr "Nieprzenośne flagi w zmiennej '%s':"
 
-msgid "no 'type' specified"
-msgstr "nie określono 'type'"
+#. R/QC.R: gettext("Non-standard license specification:")
+#: R/QC.R:0
+msgid "Non-standard license specification:"
+msgstr "Niestandardowa specyfikacja licencji:"
 
-msgid "'type' must be one of 'txt', 'html', 'latex' or 'example'"
-msgstr "'type' musi być jednym z 'txt', 'html', 'latex' lub 'example'"
+#. R/Vignettes.R: gettextf("None of packages %s have registered vignette engines",     paste(sQuote(package), collapse = ", "))
+#: R/Vignettes.R:0
+msgid "None of packages %s have registered vignette engines"
+msgstr "Żadne z pakietów %s nie mają zarejestrowanych silników ilustracji"
 
-msgid "current working directory cannot be ascertained"
-msgstr "bieżący katalog roboczy nie może być ustalony"
+#. R/testing.R: message(" OK")
+#. R/testing.R: message(" OK")
+#. R/testing.R: message(" OK")
+#. R/testing.R: message(" OK")
+#. R/testing.R: message(" OK")
+#. R/testing.R: message("OK")
+#. R/testing.R: message("OK")
+#: R/testing.R:0
+msgid "OK"
+msgstr "OK"
 
-msgid "no inputs"
-msgstr "brak wejść"
+#. R/QC.R: gettextf("Objects in \\usage without \\alias in documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "Objects in \\usage without \\alias in documentation object '%s':"
+msgstr "Obiekty w '\\usage' bez '\\alias' w obiekcie dokumentacji '%s':"
 
-msgid "Error in running tools::texi2pdf()"
-msgstr "BÅ‚Ä…d w uruchomieniu 'tools::texi2pdf()'"
+#. R/QC.R: gettext("Offending entries:")
+#: R/QC.R:0
+msgid "Offending entries:"
+msgstr "PrzeszkadzajÄ…ce wpisy:"
 
-msgid "invalid value for '%s' : %s"
-msgstr "niepoprawna wartość dla '%s' : %s"
+#. R/dynamicHelp.R: gettextf("Only help files, %s, %s and files under %s and %s in a package can be viewed",     mono("NEWS"), mono("DESCRIPTION"), mono("doc/"), mono("demo/"))
+#: R/dynamicHelp.R:0
+msgid ""
+"Only help files, %s, %s and files under %s and %s in a package can be viewed"
+msgstr ""
+"Tylko pliki pomocy, %s, %s oraz pliki w %s oraz %s w pakiecie mogą być "
+"przegladane"
 
+#. R/RdConv2.R: gettextf("Only one Rd section per %s is supported.", "\\Sexpr")
+#: R/RdConv2.R:0
 msgid "Only one Rd section per %s is supported."
 msgstr "Tylko jedna sekcja Rd na %s jest wspierana."
 
-msgid "DESCRIPTION file is for package '%s', not '%s'"
-msgstr "plik 'DESCRIPTION' jest dla pakietu '%s', a nie dla '%s'"
+#. R/QC.R: gettextf("Only operators '<=' and '>=' are possible.")
+#: R/QC.R:0
+msgid "Only operators '<=' and '>=' are possible."
+msgstr "Jedynie operatory '<=' oraz '>=' są możliwe."
 
-msgid "Vignette product %s does not have a known filename extension (%s)"
-msgstr "Produkt ilustracji %s nie posiada znanego rozszerzenia (%s)"
+#. R/pdftools.R: stop("PDF header not found")
+#: R/pdftools.R:0
+msgid "PDF header not found"
+msgstr "nie znaleziono nagłówka PDF"
 
-msgid ""
-"Failed to locate the %s output file (by engine %s) for vignette with name "
-"%s. The following files exist in directory %s: %s"
-msgstr ""
-"Nie udało się zlokalizować pliku wynikowego %s (przez silnik %s) dla "
-"ilustracji o nazwie %s. Następujące pliki istnieją w katalogu %s: %s"
+#. R/pkgDepends.R: gettextf("Package '%s' had its dependencies reduced to a minimal set.",     pkgMtrx[1, ])
+#: R/pkgDepends.R:0
+msgid "Package '%s' had its dependencies reduced to a minimal set."
+msgstr "Pakiet '%s' swoje zależności zredukował do najmniejszego zbioru."
 
+#. R/QC.R: gettextf("Package detach functions should have one argument with name starting with %s.",     sQuote("lib"))
+#: R/QC.R:0
 msgid ""
-"Located more than one %s output file (by engine %s) for vignette with name "
-"%s: %s"
+"Package detach functions should have one argument with name starting with %s."
 msgstr ""
-"Zlokalizowano więcej niż jeden plik wynikowy %s (przez silnik %s) dla "
-"ilustracji o nazwie %s: %s"
+"Funkcje odłączające pakiet powinny mieć jeden argument z nazwą "
+"rozpoczynajÄ…cÄ… siÄ™ od %s."
 
-msgid "unable to create temp directory %s"
-msgstr "nie można utworzyć katalogu tymczasowego %s"
-
-msgid "Vignette '%s' is non-ASCII but has no declared encoding"
-msgstr "Ilustracja '%s' nie jest ASCII, ale nie zawiera deklaracji kodowania"
+#. R/QC.R: gettextf("Package detach functions should not call %s.", sQuote("library.dynam.unload"))
+#: R/QC.R:0
+msgid "Package detach functions should not call %s."
+msgstr "Funkcje odłączające pakiet nie powinny wywoływać %s."
 
-msgid "Running"
-msgstr "Uruchamianie"
+#. R/QC.R: stop("Package has no 'Version' field", call. = FALSE)
+#: R/QC.R:0
+msgid "Package has no 'Version' field"
+msgstr "Pakiet nie posiada pola 'Version'"
 
-msgid "Vignette %s overwrites the following %s output by vignette %s: %s"
-msgstr "Ilustracja %s nadpisuje następujące wyjścia %s przez ilustrację %s: %s"
+#. R/QC.R: gettextf("Package in Depends field not imported from: %s", sQuote(xx))
+#: R/QC.R:0
+msgid "Package in Depends field not imported from: %s"
+msgstr "Pakiet z pola 'Depends' nie został zaimportowany z pakietu: %s"
 
+#. R/QC.R: gettextf("Package startup functions should have two arguments with names starting with %s and %s, respectively.",     sQuote("lib"), sQuote("pkg"))
+#: R/QC.R:0
 msgid ""
-"Detected vignette source files (%s) with shared names (%s) and therefore "
-"risking overwriting each others output files"
+"Package startup functions should have two arguments with names starting with "
+"%s and %s, respectively."
 msgstr ""
-"Wykryto pliki źródłowe ilustracji (%s) ze współdzielonymi nazwami (%s) w "
-"efekcie czego istnieje ryzyko nadpisania każdego z ich plików wyjściowych"
+"Funkcje startowe pakietu powinny posiadać dwa argumenty z nazwami "
+"rozpoczynajÄ…cymi siÄ™ odpowiednio od %s oraz %s."
 
-msgid ""
-"processing vignette '%s' failed with diagnostics:\n"
-"%s"
-msgstr ""
-"przetwarzanie ilustracji '%s' nie powiodło dając komunikat:\n"
-"%s"
+#. R/QC.R: gettextf("Package startup functions should not call %s.", sQuote("installed.packages"))
+#: R/QC.R:0
+msgid "Package startup functions should not call %s."
+msgstr "Funkcje startowe pakietu nie powinny wywoływać %s."
 
-msgid ""
-"tangling vignette '%s' failed with diagnostics:\n"
-"%s"
-msgstr ""
-"wiązanie ilustracji '%s' nie powiodło dając komunikat:\n"
-"%s"
+#. R/QC.R: gettextf("Package startup functions should not change the search path.")
+#: R/QC.R:0
+msgid "Package startup functions should not change the search path."
+msgstr "Funkcje startowe pakietu nie powinny zmieniać ścieżki wyszukiwania."
 
-msgid "running 'make' failed"
-msgstr "uruchomienie 'make' nie powiodło się"
+#. R/QC.R: gettextf("Package startup functions should use %s to generate messages.",     sQuote("packageStartupMessage"))
+#: R/QC.R:0
+msgid "Package startup functions should use %s to generate messages."
+msgstr "Funkcje startowe pakietu powinny używać %s do generowania wiadomości."
 
-msgid "file '%s' not found"
-msgstr "plik '%s' nie został znaleziony"
+#. R/QC.R: gettext("Packages in Depends field not imported from:")
+#: R/QC.R:0
+msgid "Packages in Depends field not imported from:"
+msgstr "Pakiety z pola 'Depends' nie zostały zaimportowany z pakietu:"
 
-msgid "vignette filename '%s' does not match any of the '%s' filename patterns"
+#. R/QC.R: gettextf("Packages with priorities 'base' or 'recommended' or 'defunct-base' must already be known to R.")
+#: R/QC.R:0
+msgid ""
+"Packages with priorities 'base' or 'recommended' or 'defunct-base' must "
+"already be known to R."
 msgstr ""
-"nazwa pliku ilustracji '%s' nie zgadza się z żadną ze ścieżek nazwy pliku "
-"'%s'"
+"Pakiety z priorytetami 'base' lub 'recommended' lub 'defunct-base' muszą być "
+"już być znane R."
 
-msgid "In '%s' vignettes '%s' and '%s' have the same vignette name"
-msgstr "W ilustracjach '%s', '%s' oraz '%s' majÄ… te same nazwy ilustracji"
+#. R/CRANtools.R: sprintf("Processing %s ...", m)
+#: R/CRANtools.R:0
+msgid "Processing %s ..."
+msgstr "Przetwarzanie %s ..."
+
+#. R/packages.R: message("Processing packages:")
+#. R/packages.R: message("Processing packages:")
+#: R/packages.R:0
+msgid "Processing packages:"
+msgstr "Przetwarzanie pakietów:"
 
-msgid "argument 'vignette' must be of length 1"
-msgstr "argument 'vignette' musi być długości 1"
+#. R/QC.R: gettext("Prototyped non-primitives:")
+#: R/QC.R:0
+msgid "Prototyped non-primitives:"
+msgstr "Prototypowane funkcje nieelementarne:"
 
-msgid "Vignette engine package not specified"
-msgstr "Nie określono pakietu silnika ilustracji"
+#. R/translations.R: stop("R CMD build failed")
+#: R/translations.R:0
+msgid "R CMD build failed"
+msgstr "'R CMD build' nie powiodło się"
 
-msgid "Unsupported engine name"
-msgstr "Niewspierana nazwa silnika"
+#. R/install.R: warning("R include directory is empty -- perhaps need to install R-devel.rpm or similar",     call. = FALSE)
+#: R/install.R:0
+msgid ""
+"R include directory is empty -- perhaps need to install R-devel.rpm or "
+"similar"
+msgstr ""
+"Katalog 'include' w R jest pusty -- być może trzeba zainstalować R-devel.rpm "
+"lub coÅ› podobnego"
 
-msgid "None of packages %s have registered vignette engines"
-msgstr "Żadne z pakietów %s nie mają zarejestrowanych silników ilustracji"
+#. R/Rd.R: gettextf("Rd files must have a non-empty %s.", "\\name")
+#: R/Rd.R:0
+msgid "Rd files must have a non-empty %s."
+msgstr "Pliki Rd muszą mieć niepustą %s."
 
-msgid "Vignette engine %s is not registered"
-msgstr "Silnik ilustracji %s nie jest zarejestrowany"
+#. R/Rd.R: gettext("Rd files must have a non-empty \\title.")
+#: R/Rd.R:0
+msgid "Rd files must have a non-empty \\title."
+msgstr "Pliki Rd muszą mieć niepustą sekcję '\\title'."
 
-msgid "Vignette engine %s is not registered by any of the packages %s"
-msgstr ""
-"Silnik ilustracji %s nie jest zarejestrowany przez jakekolwiek pakiety %s"
+#. R/QC.R: gettextf("Rd files with duplicated alias '%s':", nm)
+#: R/QC.R:0
+msgid "Rd files with duplicated alias '%s':"
+msgstr "Pliki Rd z powtórzonym aliasem '%s':"
 
-msgid "Engine name %s and package %s do not match"
-msgstr "Nazwa silnika ilustracji %s oraz pakietu %s nie zgadzajÄ… siÄ™"
+#. R/QC.R: gettextf("Rd files with duplicated name '%s':", nm)
+#: R/QC.R:0
+msgid "Rd files with duplicated name '%s':"
+msgstr "Pliki Rd z powtórzoną nazwą '%s':"
 
-msgid "Argument %s must be a function and not %s"
-msgstr "Argument %s musi być funkcją a nie %s"
+#. R/Rd.R: stop("Rd object required")
+#: R/Rd.R:0
+msgid "Rd object required"
+msgstr "Wymagany jest obiekt Rd"
 
-msgid "Argument %s must be a character vector or NULL and not %s"
-msgstr "Argument %s musi być łańcuchem tekstowym lub wartością NULL, a nie %s"
+#. R/Vignettes.R: message("  Running ", sQuote(file))
+#: R/Vignettes.R:0
+msgid "Running"
+msgstr "Uruchamianie"
 
-msgid "Cannot change the %s engine or use an engine of that name"
-msgstr "Nie można zmienić silnika %s lub użyć silnika o tej nazwie"
+#. R/testing.R: gettextf("  Running %s", sQuote(f))
+#. R/testing.R: gettextf("  Running %s", sQuote(f))
+#: R/testing.R:0
+msgid "Running %s"
+msgstr "Uruchamianie %s"
 
-msgid "vignette builder '%s' not found"
-msgstr "konstruktor ilustracji '%s' nie został znaleziony"
+#. R/utils.R: gettextf("Running 'texi2dvi' on '%s' failed.", file)
+#: R/utils.R:0
+msgid "Running 'texi2dvi' on '%s' failed."
+msgstr "Uruchomienie 'texi2dvi' na pliku '%s' nie powiodło się."
 
-msgid "Invalid DESCRIPTION file"
-msgstr "niepoprawny plik 'DESCRIPTION'"
+#. R/testing.R: gettextf("Running specific tests for package %s", sQuote(pkg))
+#: R/testing.R:0
+msgid "Running specific tests for package %s"
+msgstr "Uruchamianie specyficznych testów dla pakietu %s"
 
-msgid "*** someone has corrupted the Built field in package '%s' ***"
-msgstr "*** ktoś uszkodził pole 'Built' w pakiecie %s ***"
+#. R/testing.R: gettextf("Running vignettes for package %s", sQuote(pkg))
+#: R/testing.R:0
+msgid "Running vignettes for package %s"
+msgstr "Uruchamianie ilustracji dla pakietu %s"
 
-msgid "cannot open directory '%s'"
-msgstr "nie można utworzyć katalogu '%s'"
+#. R/QC.R: gettextf("S3 methods shown with full name in documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "S3 methods shown with full name in documentation object '%s':"
+msgstr "Metody S3 pokazane z pełną nazwą w obiekcie dokumentacji '%s':"
+
+#. R/QC.R: gettextf("S4 class codoc mismatches from documentation object '%s':",     nm)
+#: R/QC.R:0
+msgid "S4 class codoc mismatches from documentation object '%s':"
+msgstr "Niezgodność struktury klasy S4 w obiekcie dokumentacji '%s':"
 
+#. R/logging.R: sprintf("See\n  %s\nfor details.\n", sQuote(Log$filename))
+#: R/logging.R:0
 msgid ""
-"WARNING: omitting pointless dependence on 'R' without a version requirement"
+"See\n"
+"  %s\n"
+"for details."
 msgstr ""
-"Ostrzeżenie: pomijanie bezsensownej zależności od 'R' bez wymogu wersji"
+"Zobacz\n"
+"  %s\n"
+"aby poznać szczegóły."
 
-msgid "cannot turn off locale-specific sorting via LC_COLLATE"
+#. R/Rd.R: gettext("See chapter 'Writing R documentation' in manual 'Writing R Extensions'.")
+#. R/Rd.R: gettext("See chapter 'Writing R documentation' in manual 'Writing R Extensions'.")
+#: R/Rd.R:0
+msgid "See chapter 'Writing R documentation' in manual 'Writing R Extensions'."
 msgstr ""
-"nie można wyłączyć sortowania zależnego od specyficznej lokalizacji poprzez "
-"LC_COLLATE"
+"Zobacz rozdział 'Writing R documentation' w podręczniku 'Writing R "
+"Extensions'."
 
-msgid "duplicated files in '%s' field:"
-msgstr "powtórzone pliki w polu '%s':"
+#. R/QC.R: gettextf("See section %s in '%s'.", sQuote("Good practice"),     "?.onAttach")
+#. R/QC.R: gettextf("See section %s in '%s'.", sQuote("Good practice"),     "?.Last.lib")
+#. R/check.R: gettextf("See section %s in '%s'.", sQuote("Good practice"),     "?attach")
+#. R/check.R: gettextf("See section %s in '%s'.", sQuote("Good practice"),     "?data")
+#: R/QC.R:0 R/check.R:0
+msgid "See section %s in '%s'."
+msgstr "Zobacz sekcjÄ™ %s w '%s'."
 
-msgid "files in '%s' field missing from '%s':"
-msgstr "pliki w polu '%s' których brakuje w '%s':"
+#. R/QC.R: gettextf("See section 'Cross-references' in the 'Writing R Extensions' manual.")
+#: R/QC.R:0
+msgid "See section 'Cross-references' in the 'Writing R Extensions' manual."
+msgstr ""
+"Zobacz informację w sekcji 'Cross-references' podręcznika 'Writing R "
+"Extensions'."
 
-msgid "files in '%s' missing from '%s' field:"
-msgstr "pliki w '%s' których brakuje w polu '%s':"
+#. R/QC.R: gettextf("See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual.")
+#. R/QC.R: gettextf("See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual.")
+#: R/QC.R:0
+msgid ""
+"See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual."
+msgstr ""
+"Zobacz informację w sekcji 'The DESCRIPTION file' podręcznika 'Writing R "
+"Extensions'."
 
-msgid "unable to create '%s'"
-msgstr "nie można utworzyć '%s'"
+#. R/QC.R: gettextf("Slots for class '%s'", docObj[["name"]])
+#: R/QC.R:0
+msgid "Slots for class '%s'"
+msgstr "Gniazda dla klasy \"%s\""
 
-msgid "unable to copy INDEX to '%s'"
-msgstr "nie można skopiować pliku INDEX do '%s'"
+#. R/QC.R: gettextf("Standardizable: %s", x$is_standardizable)
+#: R/QC.R:0
+msgid "Standardizable: %s"
+msgstr "Standaryzowalne: %s"
 
-msgid "cannot create directory '%s'"
-msgstr "nie można utworzyć katalogu '%s'"
+#. R/QC.R: gettext("Standardized license specification:")
+#: R/QC.R:0
+msgid "Standardized license specification:"
+msgstr "Ustandaryzowana specyfikacja licencji:"
 
-msgid "processing %s"
-msgstr "przetwarzanie %s"
+#. R/testing.R: gettextf("Testing examples for package %s", sQuote(pkg))
+#: R/testing.R:0
+msgid "Testing examples for package %s"
+msgstr "Testowanie przykładów dla pakietu %s"
 
-msgid ""
-"running %s on vignette '%s' failed with message:\n"
-"%s"
-msgstr ""
-"wykonywanie %s na ilustracji '%s' nie powiodło się z wynikiem:\n"
-"%s"
+#. R/bibstyle.R: stop("The default JSS style may not be modified.")
+#: R/bibstyle.R:0
+msgid "The default JSS style may not be modified."
+msgstr "Domyślny styl JSS nie może być zmieniony."
+
+#. R/QC.R: gettext("These fields must have ASCII values.")
+#: R/QC.R:0
+msgid "These fields must have ASCII values."
+msgstr "Te pola muszą mieć wartości ASCII."
 
+#. R/QC.R: gettextf("This field must contain one or more packages (and no version requirement).")
+#: R/QC.R:0
 msgid ""
-"compiling TeX file %s failed with message:\n"
-"%s"
+"This field must contain one or more packages (and no version requirement)."
 msgstr ""
-"kompilowanie pliku TeX %s nie powiodło się zwracając komunikat:\n"
-"%s"
-
-msgid "cannot copy '%s' to '%s'"
-msgstr "nie można skopiować pliku '%s' do katalogu '%s'"
+"To pole musi zawierać jeden lub więcej pakietów (nie jest wymagana wersja)."
 
-msgid "WARNING: malformed 'Depends' field in 'DESCRIPTION'"
-msgstr "OSTRZEŻENIE: nieprawidłowe pole 'Depends' w 'DESCRIPTION'"
+#. R/dynamicHelp.R: gettextf("URL %s was not found", mono(path))
+#. R/dynamicHelp.R: gettextf("URL %s was not found", mono(path))
+#: R/dynamicHelp.R:0
+msgid "URL %s was not found"
+msgstr "adres URL %s nie został znaleziony"
 
-msgid "ERROR: this R is version %s, package '%s' requires R %s %s"
-msgstr "B�ĄD: Ta wersja R to %s, pakiet %s wymaga wersji R %s %s"
+#. R/QC.R: gettextf("Unavailable namespace imported from by a ':::' call: %s",     sQuote(xx))
+#: R/QC.R:0
+msgid "Unavailable namespace imported from by a ':::' call: %s"
+msgstr "Niedostępna przestrzeń nazw zaimportowana przez wywołanie ':::': %s"
 
-msgid "ERROR: this R is version %s, required is R %s %s"
-msgstr "B�ĄD: wersja tego programu to R %s, wymagana jest R %s %s"
+#. R/QC.R: gettext("Unavailable namespaces imported from by ':::' calls:")
+#: R/QC.R:0
+msgid "Unavailable namespaces imported from by ':::' calls:"
+msgstr "Niedostępne przestrzenie nazw zaimportowane przez wywołania ':::':"
 
-msgid "loading failed"
-msgstr "ładowanie nie powiodło się"
+#. R/QC.R: gettextf("Undocumented %s:", tag)
+#: R/QC.R:0
+msgid "Undocumented %s:"
+msgstr "Nieudokumentowane %s:"
 
-msgid "assertConditon: Successfully caught a condition"
-msgstr "assertConditon: Pomyślnie przechwycono warunek"
+#. R/QC.R: gettext("Undocumented S4 classes:")
+#: R/QC.R:0
+msgid "Undocumented S4 classes:"
+msgstr "Nieudokumentowane klasy S4:"
 
-msgid "Got %s in evaluating %s; wanted %s"
-msgstr "Otrzymano %s podczas wyznaczania %s; oczekiwano %s"
+#. R/QC.R: gettext("Undocumented S4 methods:")
+#: R/QC.R:0
+msgid "Undocumented S4 methods:"
+msgstr "Nieudokumentowane metody S4:"
 
-msgid "Failed to get %s in evaluating %s"
-msgstr "Nie udało się uzyskać %s podczas wyznaczania %s"
+#. R/QC.R: gettextf("Undocumented arguments in documentation object '%s'",     nm)
+#: R/QC.R:0
+msgid "Undocumented arguments in documentation object '%s'"
+msgstr "Nieudokumentowane argumenty w obiekcie dokumentacji '%s'"
 
-msgid "Failed to get error in evaluating %s"
-msgstr "Nie udało się uzyskać błędu podczas wyznaczania %s"
+#. R/QC.R: gettext("Undocumented code objects:")
+#: R/QC.R:0
+msgid "Undocumented code objects:"
+msgstr "Nieudokumentowane obiekty kodu:"
 
-msgid "Asserted error: %s"
-msgstr "Założony błąd: %s"
+#. R/QC.R: gettext("Undocumented data sets:")
+#: R/QC.R:0
+msgid "Undocumented data sets:"
+msgstr "Nieudokumentowane zbiory danych:"
 
-msgid "Got warning in evaluating %s, but also an error"
-msgstr "Otrzymano ostrzeżenie podczas wyznaczania %s, ale również błąd"
+#. R/QC.R: gettextf("Unexported object imported by a ':::' call: %s", sQuote(xxx))
+#: R/QC.R:0
+msgid "Unexported object imported by a ':::' call: %s"
+msgstr "Brakujący obiekt zaimportowany przez wywołanie ':::': %s"
 
-msgid "Asserted warning: %s"
-msgstr "Założone ostrzeżenie: %s"
+#. R/QC.R: gettext("Unexported objects imported by ':::' calls:")
+#: R/QC.R:0
+msgid "Unexported objects imported by ':::' calls:"
+msgstr "Brakujące obiekty zaimportowane przez wywołania ':::':"
 
-msgid "Changes require specified 'style'"
-msgstr "Zmiany wymagają określonego 'style'"
+#. R/QC.R: gettext("Unknown encoding")
+#: R/QC.R:0
+msgid "Unknown encoding"
+msgstr "Nieznane kodowanie"
 
-msgid "The default JSS style may not be modified."
-msgstr "Domyślny styl JSS nie może być zmieniony."
+#. R/QC.R: gettext("Unknown encoding with non-ASCII data")
+#: R/QC.R:0
+msgid "Unknown encoding with non-ASCII data"
+msgstr "Nieznane kodowanie z danymi nie-ASCII"
 
-msgid "invalid value for '--compact-vignettes', assuming %s"
-msgstr "Niepoprawna wartość '--compact-vignettes', zakładanie %s"
+#. R/utils.R: gettext("Unknown encoding with non-ASCII data: converting to ASCII")
+#: R/utils.R:0
+msgid "Unknown encoding with non-ASCII data: converting to ASCII"
+msgstr "Nieznane kodowanie z danymi nie-ASCII: konwertowanie do ASCII"
 
-msgid "Error: cannot rename directory to %s"
-msgstr "Błąd: nie można zmienić katalogu na %s"
+#. R/Vignettes.R: stop("Unsupported engine name ", sQuote(name))
+#: R/Vignettes.R:0
+msgid "Unsupported engine name"
+msgstr "Niewspierana nazwa silnika"
 
-msgid "cannot link from %s"
-msgstr "nie można połączyć z %s"
+#. R/QC.R: gettextf("Variables in data frame '%s'", docObj[["name"]])
+#: R/QC.R:0
+msgid "Variables in data frame '%s'"
+msgstr "Zmienne w ramce danych '%s'"
 
-msgid "-l option without value"
-msgstr "opcja '-l' bez wartości"
+#. R/QC.R: gettextf("Variables overriding user/site settings:")
+#: R/QC.R:0
+msgid "Variables overriding user/site settings:"
+msgstr "Zmienne omijające ustawienia użytkownika/strony:"
 
-msgid "configuration files are not supported as from R 2.12.0"
-msgstr "pliki konfiguracyjne nie sÄ… wspierane od wersji R 2.12.0"
+#. R/QC.R: gettextf("Version numbers must be sequences of at least two non-negative integers, separated by single '.' or '-'.")
+#: R/QC.R:0
+msgid ""
+"Version numbers must be sequences of at least two non-negative integers, "
+"separated by single '.' or '-'."
+msgstr ""
+"Numery wersji muszą być ciągiem co najmniej dwóch nieujemnych liczb "
+"całkowitych, oddzielonych pojedynczym znakiem '.' lub '-'."
 
-msgid "'--multiarch' specified with only one usable sub-architecture"
-msgstr "'--multiarch' zdefiniowany tylko z jedną użyteczną pod-architekturą"
+#. R/Vignettes.R: gettextf("Vignette %s overwrites the following %s output by vignette %s: %s",     sQuote(basename(names(resultsT)[j])), sQuote(name), sQuote(basename(names(resultsT)[i])),     paste(basename(bad), collapse = ", "))
+#: R/Vignettes.R:0
+msgid "Vignette %s overwrites the following %s output by vignette %s: %s"
+msgstr "Ilustracja %s nadpisuje następujące wyjścia %s przez ilustrację %s: %s"
 
-msgid "'--as-cran' turns off '--extra-arch'"
-msgstr "opcja '--as-cran' wyłącza opcję '--extra-arch'"
+#. R/Vignettes.R: gettextf("Vignette '%s' is non-ASCII but has no declared encoding",     name)
+#. R/Vignettes.R: gettextf("Vignette '%s' is non-ASCII but has no declared encoding",     file)
+#. R/Vignettes.R: gettextf("Vignette '%s' is non-ASCII but has no declared encoding",     name)
+#: R/Vignettes.R:0
+msgid "Vignette '%s' is non-ASCII but has no declared encoding"
+msgstr "Ilustracja '%s' nie jest ASCII, ale nie zawiera deklaracji kodowania"
 
-msgid "Error: no packages were specified"
-msgstr "Błąd: nie określono pakietów"
+#. R/QC.R: gettextf("Vignette dependencies (%s entries) must be contained in the DESCRIPTION Depends/Suggests/Imports entries.",     "\\VignetteDepends{}")
+#: R/QC.R:0
+msgid ""
+"Vignette dependencies (%s entries) must be contained in the DESCRIPTION "
+"Depends/Suggests/Imports entries."
+msgstr ""
+"Zależności ilustracji (wpisy %s) muszą być zawarte we wpisach 'Depends/"
+"Suggests/Imports'."
 
-msgid "ERROR: cannot create check dir %s"
-msgstr "B�ĄD: nie można utworzyć katalogu sprawdzenia %s"
+#. R/Vignettes.R: gettextf("Vignette engine %s is not registered", sQuote(name))
+#: R/Vignettes.R:0
+msgid "Vignette engine %s is not registered"
+msgstr "Silnik ilustracji %s nie jest zarejestrowany"
 
-msgid "package directory %s does not exist"
-msgstr "katalog pakietu %s nie istnieje"
+#. R/Vignettes.R: gettextf("Vignette engine %s is not registered by any of the packages %s",     sQuote(name), paste(sQuote(package), collapse = ", "))
+#. R/Vignettes.R: gettextf("Vignette engine %s is not registered by any of the packages %s",     sQuote(name), paste(sQuote(package), collapse = ", "))
+#: R/Vignettes.R:0
+msgid "Vignette engine %s is not registered by any of the packages %s"
+msgstr ""
+"Silnik ilustracji %s nie jest zarejestrowany przez jakekolwiek pakiety %s"
 
-msgid "no packages to check"
-msgstr "brak pakietów do sprawdzenia"
+#. R/Vignettes.R: stop("Vignette engine package not specified", call. = FALSE)
+#: R/Vignettes.R:0
+msgid "Vignette engine package not specified"
+msgstr "Nie określono pakietu silnika ilustracji"
 
-msgid "downloading reverse dependencies ..."
-msgstr "pobieranie wstecznych zależności ..."
+#. R/Vignettes.R: gettextf("Vignette product %s does not have a known filename extension (%s)",     sQuote(file), paste(sQuote(names(type)), collapse = ", "))
+#: R/Vignettes.R:0
+msgid "Vignette product %s does not have a known filename extension (%s)"
+msgstr "Produkt ilustracji %s nie posiada znanego rozszerzenia (%s)"
 
-msgid "downloading %s ..."
-msgstr "pobieranie pliku %s ..."
+#. R/dynamicHelp.R: gettext("Vignettes:")
+#: R/dynamicHelp.R:0
+msgid "Vignettes:"
+msgstr "Ilustracje:"
 
-msgid "checking %s ..."
-msgstr "sprawdzanie %s ..."
+#. R/admin.R: message("WARNING: malformed 'Depends' field in 'DESCRIPTION'")
+#: R/admin.R:0
+msgid "WARNING: malformed 'Depends' field in 'DESCRIPTION'"
+msgstr "OSTRZEŻENIE: nieprawidłowe pole 'Depends' w 'DESCRIPTION'"
 
-msgid "non-ASCII input in a CITATION file without a declared encoding"
-msgstr "wejście nie-ASCII w pliku 'CITATION' bez zadeklarowanego kodowania"
+#. R/admin.R: message("WARNING: omitting pointless dependence on 'R' without a version requirement")
+#: R/admin.R:0
+msgid ""
+"WARNING: omitting pointless dependence on 'R' without a version requirement"
+msgstr ""
+"Ostrzeżenie: pomijanie bezsensownej zależności od 'R' bez wymogu wersji"
 
-msgid "No files in this directory"
-msgstr "Brak plików w tym katalogu"
+#. R/Rd2pdf.R: message("Warning: unknown option ", sQuote(a))
+#. R/Rd2pdf.R: message("Warning: unknown option ", sQuote(a))
+#. R/build.R: message("Warning: unknown option ", sQuote(a))
+#. R/check.R: message("Warning: unknown option ", sQuote(a))
+#: R/Rd2pdf.R:0 R/build.R:0 R/check.R:0
+msgid "Warning: unknown option"
+msgstr "Ostrzeżenie: nieznana opcja"
 
-msgid "No results found"
-msgstr "Brak wyników"
+#. R/makeLazyLoad.R: stop("all packages should have a NAMESPACE")
+#: R/makeLazyLoad.R:0
+msgid "all packages should have a NAMESPACE"
+msgstr "wszystkie pakiety powinny mieć plik 'NAMESPACE'"
 
-msgid "Vignettes:"
-msgstr "Ilustracje:"
+#. R/read.00Index.R: gettextf("argument '%s' must be a character string or connection",     file)
+#: R/read.00Index.R:0
+msgid "argument '%s' must be a character string or connection"
+msgstr "argument '%s' musi być łańcuchem tekstowym lub połączeniem"
 
-msgid "Code demonstrations:"
-msgstr "Przykładowe użycia kodu:"
+#. R/utils.R: stop("argument 'delim' must specify two characters")
+#: R/utils.R:0
+msgid "argument 'delim' must specify two characters"
+msgstr "argument 'delim' musi określać dwa znaki"
 
-msgid "Help pages:"
-msgstr "Strony pomocy:"
+#. R/Rd.R: stop("argument 'outFile' must be a character string or connection")
+#: R/Rd.R:0
+msgid "argument 'outFile' must be a character string or connection"
+msgstr "argument 'outfile' musi być łańcuchem tekstowym lub połączeniem"
 
-msgid "No help found for topic %s in any package."
-msgstr "Nie znaleziono pomocy na temat '%s' w żadnym z pakiecie."
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/QC.R: stop("argument 'package' must be of length 1")
+#. R/Rd.R: stop("argument 'package' must be of length 1")
+#. R/Vignettes.R: stop("argument 'package' must be of length 1")
+#: R/QC.R:0 R/Rd.R:0 R/Vignettes.R:0
+msgid "argument 'package' must be of length 1"
+msgstr "argument 'package' musi być długości 1"
 
-msgid "No package index found for package %s"
-msgstr "Nie znaleziono indeksu pakietu dla pakietu %s"
+#. R/pkgDepends.R: stop("argument 'pkg' must be of length 1")
+#: R/pkgDepends.R:0
+msgid "argument 'pkg' must be of length 1"
+msgstr "argument 'pkg' musi być długości 1"
 
-msgid "No package named %s could be found"
-msgstr "Nie znaleziono pakietu o nazwie '%s'"
+#. R/Vignettes.R: stop("argument 'vignette' must be of length 1")
+#: R/Vignettes.R:0
+msgid "argument 'vignette' must be of length 1"
+msgstr "argument 'vignette' musi być długości 1"
 
-msgid "No help found for package %s"
-msgstr "Nie znaleziono pomocy na temat pakietu '%s'"
+#. R/utils.R: stop("argument 'x' must be a character vector")
+#: R/utils.R:0
+msgid "argument 'x' must be a character vector"
+msgstr "argument 'x' musi być wektorem tekstowym"
 
-msgid "Link %s in package %s could not be located"
-msgstr "Linki %s w pakiecie '%s' nie mogły zostać zlokalizowane"
+#. R/assertCondition.R: message("assertConditon: Successfully caught a condition\n")
+#: R/assertCondition.R:0
+msgid "assertConditon: Successfully caught a condition"
+msgstr "assertConditon: Pomyślnie przechwycono warunek"
 
-msgid "No docs found for package %s"
-msgstr "Nie znaleziono dokumentów dla pakietu '%s'"
+#. R/pdftools.R: stop("attempting to select less than one element")
+#: R/pdftools.R:0
+msgid "attempting to select less than one element"
+msgstr "próba wybrania mniej niż jednego elementu"
 
-msgid "URL %s was not found"
-msgstr "adres URL %s nie został znaleziony"
+#. R/pdftools.R: stop("attempting to select more than one element")
+#: R/pdftools.R:0
+msgid "attempting to select more than one element"
+msgstr "próba wybrania więcej niż jednego elementu"
 
-msgid ""
-"Only help files, %s, %s and files under %s and %s in a package can be viewed"
-msgstr ""
-"Tylko pliki pomocy, %s, %s oraz pliki w %s oraz %s w pakiecie mogą być "
-"przegladane"
+#. R/pkgDepends.R: stop("bad operand")
+#: R/pkgDepends.R:0
+msgid "bad operand"
+msgstr "zły operand"
 
-msgid "unsupported URL %s"
-msgstr "niewspierany adres URL %s"
+#. R/install.R: stop("building a fake installation is disallowed")
+#: R/install.R:0
+msgid "building a fake installation is disallowed"
+msgstr "budowałe fałszywej instalacji jest zabronione"
 
-msgid "httpd server disabled by R_DISABLE_HTTPD"
-msgstr "serwer httpd wyłączony przez R_DISABLE_HTTPD"
+#. R/QC.R: warning("cannot check R code installed as image")
+#: R/QC.R:0
+msgid "cannot check R code installed as image"
+msgstr "nie można sprawdzić kodu R zainstalowanego jako obraz"
 
-msgid "server already running"
-msgstr "serwer jest już uruchomiony"
+#. R/utils.R: gettextf("cannot coerce %s to logical", sQuote(val))
+#: R/utils.R:0
+msgid "cannot coerce %s to logical"
+msgstr "nie można przekształcić %s na wartość logiczną"
 
-msgid "server could not be started on an earlier attempt"
-msgstr "serwer nie mógł zostać uruchomiony przy wcześniejszej próbie"
+#. R/admin.R: gettextf("cannot copy '%s' to '%s'", output, outVignetteDir)
+#: R/admin.R:0
+msgid "cannot copy '%s' to '%s'"
+msgstr "nie można skopiować pliku '%s' do katalogu '%s'"
 
-msgid "no running server to stop"
-msgstr "brak serwera, którego można by zatrzymać"
+#. R/admin.R: gettextf("cannot create directory '%s'", buildDir)
+#: R/admin.R:0
+msgid "cannot create directory '%s'"
+msgstr "nie można utworzyć katalogu '%s'"
 
-msgid "starting httpd help server ..."
-msgstr "uruchamianie serwera httpd dla pomocy ..."
+#. R/install.R: stop("cannot create temporary directory")
+#: R/install.R:0
+msgid "cannot create temporary directory"
+msgstr "nie można utworzyć katalogu tymczasowego"
 
-msgid "done"
-msgstr "wykonano"
+#. R/install.R: stop("cannot create unique directory for build")
+#: R/install.R:0
+msgid "cannot create unique directory for build"
+msgstr "nie można utworzyć unikalnego katalogu dla kompilacji"
 
-msgid "failed to start the httpd server"
-msgstr "nie udało się uruchomić serwera httpd"
+#. R/Rd.R: stop("cannot deal with Rd objects with missing/empty names")
+#: R/Rd.R:0
+msgid "cannot deal with Rd objects with missing/empty names"
+msgstr "nie można poradzić sobie z obiektami Rd z brakującymi/pustymi nazwami"
 
-msgid "cannot read index information in file '%s'"
-msgstr "nie można odczytać indeksu informacji w pliku '%s'"
+#. R/pdftools.R: stop("cannot find 'startxref' keyword")
+#: R/pdftools.R:0
+msgid "cannot find 'startxref' keyword"
+msgstr "nie można znaleźć 'startxref'"
 
-msgid "error reading file '%s'"
-msgstr "błąd podczas czytania pliku '%s'"
+#. R/pdftools.R: gettextf("cannot find object header at xrefed position %d", pos)
+#: R/pdftools.R:0
+msgid "cannot find object header at xrefed position %d"
+msgstr "nie można znaleźć nagłówka obiektu w pozycji %d 'xrefed'"
 
-msgid "this seems to be a bundle -- and they are defunct"
-msgstr "plik 'DESCRIPTION' wygląda to na paczkę -- a one zostały zlikwidowane"
+#. R/pdftools.R: stop("cannot find xref table")
+#: R/pdftools.R:0
+msgid "cannot find xref table"
+msgstr "nie można znaleźć tabeli 'xref'"
 
-msgid ""
-"'cleanup' exists but is not executable -- see the 'R Installation and "
-"Administration Manual'"
-msgstr ""
-"plik 'cleanup' istnieje, ale nie jest wykonywalny -- zobacz 'R Installation "
-"and Adminstration Manual'"
+#. R/check.R: gettextf("cannot link from %s", from)
+#: R/check.R:0
+msgid "cannot link from %s"
+msgstr "nie można połączyć z %s"
 
-msgid "generating debug symbols (%s)"
-msgstr "tworzenie symboli debugowania (%s)"
+#. R/admin.R: gettextf("cannot open directory '%s'", outMetaDir)
+#. R/admin.R: gettextf("cannot open directory '%s'", meta_dir)
+#. R/admin.R: gettextf("cannot open directory '%s'", outDir)
+#. R/admin.R: gettextf("cannot open directory '%s'", outCodeDir)
+#. R/admin.R: gettextf("cannot open directory '%s'", outMetaDir)
+#. R/admin.R: gettextf("cannot open directory '%s'", outVignetteDir)
+#. R/admin.R: gettextf("cannot open directory '%s'", outMetaDir)
+#: R/admin.R:0
+msgid "cannot open directory '%s'"
+msgstr "nie można utworzyć katalogu '%s'"
 
-msgid "no DLL was created"
-msgstr "nie utworzono pliku DLL"
+#. R/pdftools.R: stop("cannot read array object")
+#: R/pdftools.R:0
+msgid "cannot read array object"
+msgstr "nie można odczytać obiektu tablicy"
 
-msgid "package %s successfully unpacked and MD5 sums checked"
-msgstr ""
-"pakiet %s został pomyślnie rozpakowany oraz sumy MD5 zostały sprawdzone"
+#. R/pdftools.R: stop("cannot read dictionary object")
+#: R/pdftools.R:0
+msgid "cannot read dictionary object"
+msgstr "nie można odczytać obiektu słownika"
 
-msgid ""
-"R include directory is empty -- perhaps need to install R-devel.rpm or "
-"similar"
-msgstr ""
-"Katalog 'include' w R jest pusty -- być może trzeba zainstalować R-devel.rpm "
-"lub coÅ› podobnego"
+#. R/pdftools.R: stop("cannot read hexadecimal string object")
+#: R/pdftools.R:0
+msgid "cannot read hexadecimal string object"
+msgstr "nie można odczytać obiektu o szestnastkowym łańcuchu"
 
-msgid "package %s %s was found, but %s %s is required by %s"
-msgstr ""
-"pakiet %s %s został znaleziony, ale pakiet %s %s jest wymagany przez %s"
+#. R/index.R: gettextf("cannot read index information in file '%s'", INDEX)
+#. R/index.R: gettextf("cannot read index information in file '%s'", file.path(demoDir,     "00Index"))
+#: R/index.R:0
+msgid "cannot read index information in file '%s'"
+msgstr "nie można odczytać indeksu informacji w pliku '%s'"
 
-msgid "no source files found"
-msgstr "nie znaleziono plików źródłowych"
+#. R/pdftools.R: stop("cannot read indirect reference object")
+#: R/pdftools.R:0
+msgid "cannot read indirect reference object"
+msgstr "nie można odczytać obiektu o niebezpośredniej referencji"
 
-msgid "empty 'data' directory"
-msgstr "pusty katalog 'data'"
+#. R/pdftools.R: stop("cannot read literal string object")
+#: R/pdftools.R:0
+msgid "cannot read literal string object"
+msgstr "nie można odczytać dosłownych obiektów łańcucha"
 
-msgid "cannot create temporary directory"
-msgstr "nie można utworzyć katalogu tymczasowego"
+#. R/pdftools.R: stop("cannot read name object")
+#: R/pdftools.R:0
+msgid "cannot read name object"
+msgstr "nie można odczytać obiektu nazwy"
 
-msgid "ERROR: '--merge-multiarch' applies only to a single tarball"
-msgstr ""
-"B�ĄD: '--merge-multiarch' stosuje się tylko do pojedynczego pliku tarball"
+#. R/pdftools.R: stop("cannot read stream data")
+#. R/pdftools.R: stop("cannot read stream data")
+#: R/pdftools.R:0
+msgid "cannot read stream data"
+msgstr "nie można odczytać danych strumieniowych"
 
-msgid "invalid package"
-msgstr "niepoprawny pakiet"
+#. R/pdftools.R: stop("cannot read stream object")
+#. R/pdftools.R: stop("cannot read stream object")
+#. R/pdftools.R: stop("cannot read stream object")
+#: R/pdftools.R:0
+msgid "cannot read stream object"
+msgstr "nie można odczytać strumienia obiektu"
 
-msgid "ERROR: no packages specified"
-msgstr "B�ĄD: nie określono pakietów"
+#. R/pdftools.R: stop("cannot read xref table")
+#: R/pdftools.R:0
+msgid "cannot read xref table"
+msgstr "nie można odczytać tabeli 'xref'"
 
-msgid "ERROR: cannot cd to directory %s"
-msgstr "B�ĄD: nie można wejść do katalogu %s"
+#. R/utils.R: stop("cannot source package code\n", conditionMessage(e), call. = FALSE)
+#: R/utils.R:0
+msgid "cannot source package code"
+msgstr "nie można wykonać kodu pakietu"
 
-msgid "ERROR: no permission to install to directory"
-msgstr "B�ĄD: brak uprawnień aby zainstalować w katalogu"
+#. R/admin.R: warning("cannot turn off locale-specific sorting via LC_COLLATE")
+#: R/admin.R:0
+msgid "cannot turn off locale-specific sorting via LC_COLLATE"
+msgstr ""
+"nie można wyłączyć sortowania zależnego od specyficznej lokalizacji poprzez "
+"LC_COLLATE"
 
-msgid "building a fake installation is disallowed"
-msgstr "budowałe fałszywej instalacji jest zabronione"
+#. R/checktools.R: sprintf("checking %s ...", pfile)
+#: R/checktools.R:0
+msgid "checking %s ..."
+msgstr "sprawdzanie %s ..."
+
+#. R/testing.R: gettextf("  comparing %s to %s ...", sQuote(outfile), sQuote(basename(savefile)))
+#. R/testing.R: gettextf("  comparing %s to %s ...", sQuote(outfile), sQuote(basename(prevfile)))
+#. R/testing.R: gettextf("  comparing %s to %s ...", sQuote(outfile), sQuote(savefile))
+#. R/testing.R: gettextf("  comparing %s to %s ...", sQuote(outfile), sQuote(savefile))
+#: R/testing.R:0
+msgid "comparing %s to %s ..."
+msgstr "porównywanie %s z %s ..."
 
+#. R/admin.R: gettextf("compiling TeX file %s failed with message:\n%s", sQuote(output),     conditionMessage(e))
+#: R/admin.R:0
 msgid ""
-"See\n"
-"  %s\n"
-"for details."
+"compiling TeX file %s failed with message:\n"
+"%s"
 msgstr ""
+"kompilowanie pliku TeX %s nie powiodło się zwracając komunikat:\n"
+"%s"
 
-msgid "there is no package called '%s'"
-msgstr "nie ma pakietu o nazwie '%s'"
+#. R/check.R: warning("configuration files are not supported as from R 2.12.0")
+#: R/check.R:0
+msgid "configuration files are not supported as from R 2.12.0"
+msgstr "pliki konfiguracyjne nie sÄ… wspierane od wersji R 2.12.0"
 
-msgid "namespace must not be already loaded"
-msgstr "przestrzeń nazw nie może być już załadowana"
+#. R/utils.R: stop("contains a blank line", call. = FALSE)
+#: R/utils.R:0
+msgid "contains a blank line"
+msgstr "zawiera pustÄ… liniÄ™"
 
-msgid "all packages should have a NAMESPACE"
-msgstr "wszystkie pakiety powinny mieć plik 'NAMESPACE'"
+#. R/Rd2pdf.R: stop("current working directory cannot be ascertained")
+#. R/Vignettes.R: stop("current working directory cannot be ascertained")
+#. R/Vignettes.R: stop("current working directory cannot be ascertained")
+#. R/Vignettes.R: stop("current working directory cannot be ascertained")
+#. R/admin.R: stop("current working directory cannot be ascertained")
+#. R/admin.R: stop("current working directory cannot be ascertained")
+#. R/build.R: stop("current working directory cannot be ascertained")
+#. R/check.R: stop("current working directory cannot be ascertained")
+#. R/install.R: stop("current working directory cannot be ascertained")
+#. R/md5.R: stop("current working directory cannot be ascertained")
+#. R/md5.R: stop("current working directory cannot be ascertained")
+#. R/packages.R: stop("current working directory cannot be ascertained")
+#: R/Rd2pdf.R:0 R/Vignettes.R:0 R/admin.R:0 R/build.R:0 R/check.R:0
+#: R/install.R:0 R/md5.R:0 R/packages.R:0
+msgid "current working directory cannot be ascertained"
+msgstr "bieżący katalog roboczy nie może być ustalony"
 
-msgid "package seems to be using lazy loading for data already"
-msgstr "wygląda na to, że pakiet już wykorzystuje leniwe ładowanie dla danych"
+#. R/QC.R: gettextf("declared S3 method '%s' not found", m)
+#: R/QC.R:0
+msgid "declared S3 method '%s' not found"
+msgstr "zadeklarowana metoda S3 '%s' nie została znaleziona"
 
-msgid "source list must have names for all elements"
-msgstr "lista źródłowa musi mieć nazwy dla wszystkich elementów"
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain R code", dir)
+#: R/QC.R:0
+msgid "directory '%s' does not contain R code"
+msgstr "katalog '%s' nie zawiera kodu R"
 
-msgid "source must be an environment or a list"
-msgstr "źródło musi być środowiskiem lub listą"
+#. R/QC.R: gettextf("directory '%s' does not contain Rd objects", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain Rd objects", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain Rd objects", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain Rd objects", dir)
+#. R/QC.R: gettextf("directory '%s' does not contain Rd objects", dir)
+#: R/QC.R:0
+msgid "directory '%s' does not contain Rd objects"
+msgstr "katalog '%s' nie zawiera obiektów Rd"
 
-msgid "invalid value for 'compress': should be FALSE, TRUE, 2 or 3"
-msgstr "niepoprawna wartość dla 'compress': powinno być FALSE, TRUE, 2 lub 3"
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/QC.R: gettextf("directory '%s' does not exist", dir)
+#. R/Rd.R: gettextf("directory '%s' does not exist", dir)
+#. R/Vignettes.R: gettextf("directory '%s' does not exist", dir)
+#. R/Vignettes.R: gettextf("directory '%s' does not exist", dir)
+#. R/Vignettes.R: gettextf("directory '%s' does not exist", dir)
+#. R/Vignettes.R: gettextf("directory '%s' does not exist", dir)
+#. R/admin.R: gettextf("directory '%s' does not exist", dir)
+#. R/admin.R: gettextf("directory '%s' does not exist", dir)
+#. R/admin.R: gettextf("directory '%s' does not exist", outDir)
+#. R/index.R: gettextf("directory '%s' does not exist", dataDir)
+#. R/index.R: gettextf("directory '%s' does not exist", demoDir)
+#. R/index.R: gettextf("directory '%s' does not exist", demoDir)
+#: R/QC.R:0 R/Rd.R:0 R/Vignettes.R:0 R/admin.R:0 R/index.R:0
+msgid "directory '%s' does not exist"
+msgstr "katalog '%s' nie istnieje"
 
-msgid "this cannot be used for package 'base'"
-msgstr "to nie może zostać użyte dla pakietu 'base'"
+#. R/dynamicHelp.R: message(" done")
+#. R/install.R: message(" done")
+#. R/packages.R: message("done")
+#. R/packages.R: message("done")
+#: R/dynamicHelp.R:0 R/install.R:0 R/packages.R:0
+msgid "done"
+msgstr "wykonano"
 
-msgid "package contains no R code"
-msgstr "pakiet nie zawiera kodu R"
+#. R/checktools.R: sprintf("downloading %s ... ", rfiles[i])
+#: R/checktools.R:0
+msgid "downloading %s ..."
+msgstr "pobieranie pliku %s ..."
 
-msgid "package seems to be using lazy loading already"
-msgstr "wygląda na to, że pakiet już wykorzystuje leniwe ładowanie"
+#. R/checktools.R: message("downloading reverse dependencies ...")
+#: R/checktools.R:0
+msgid "downloading reverse dependencies ..."
+msgstr "pobieranie wstecznych zależności ..."
 
-msgid ""
-"Cannot process chunk/lines:\n"
-"%s"
-msgstr ""
-"Nie można przetwarzać fragmentu/linii:\n"
-"%s"
+#. R/admin.R: gettextf("\nduplicated files in '%s' field:", collationField)
+#: R/admin.R:0
+msgid "duplicated files in '%s' field:"
+msgstr "powtórzone pliki w polu '%s':"
 
-msgid "No news found in given file using old-style R-like format."
-msgstr ""
-"Nie znaleziono wiadomości w podanym pliku używając starego stylu formatu "
-"podobnego do R."
+#. R/install.R: warning("empty 'data' directory", call. = FALSE)
+#: R/install.R:0
+msgid "empty 'data' directory"
+msgstr "pusty katalog 'data'"
 
-msgid "No news found in given file using package default format."
-msgstr ""
-"Nie znaleziono wiadomości w podanym pliku używając domyślnego formatu "
-"pakietu."
+#. R/install.R: gettextf("error reading file '%s'", fd)
+#: R/install.R:0
+msgid "error reading file '%s'"
+msgstr "błąd podczas czytania pliku '%s'"
 
-msgid "Could not extract news from the following text chunks:"
-msgstr ""
-"Nie można było wyodrębnić wiadomości z następujących fragmentów tekstu:"
+#. R/Rd2pdf.R: stop("exactly one Rd file must be specified", call. = FALSE)
+#: R/Rd2pdf.R:0
+msgid "exactly one Rd file must be specified"
+msgstr "dokładnie jeden plik Rd musi zostać określony"
 
-msgid ""
-"Chunk %s:\n"
-"%s"
-msgstr ""
-"Fragment %s:\n"
-"%s"
+#. R/pdftools.R: sprintf("expanding %s", format(kid))
+#: R/pdftools.R:0
+msgid "expanding %s"
+msgstr "rozszerzanie %s"
 
-msgid "Cannot extract version info from the following section titles:"
-msgstr ""
-"Nie można wyodrębnić informacji o wersji z następujących tytułów sekcji:"
+#. R/dynamicHelp.R: warning("failed to start the httpd server", immediate. = TRUE)
+#: R/dynamicHelp.R:0
+msgid "failed to start the httpd server"
+msgstr "nie udało się uruchomić serwera httpd"
 
-msgid ""
-"Malformed NEWS.Rd file:\n"
-"Chunk starting\n"
-"  %s\n"
-"contains no \\itemize."
-msgstr ""
-"Uszkodzony plik NEWS.Rd:\n"
-"Fragment rozpoczynajÄ…cy\n"
-"  %s\n"
-"nie zawiera \\itemize."
+#. R/QC.R: gettextf("file '%s' does not exist", file)
+#. R/QC.R: gettextf("file '%s' does not exist", file)
+#. R/utils.R: gettextf("file '%s' does not exist", x)
+#. R/utils.R: gettextf("file '%s' does not exist", dfile)
+#: R/QC.R:0 R/utils.R:0
+msgid "file '%s' does not exist"
+msgstr "plik '%s' nie istnieje"
 
-msgid ""
-"Malformed NEWS.Rd file:\n"
-"Chunk starting\n"
-"  %s\n"
-"contains more than one \\itemize.\n"
-"Using the first one."
-msgstr ""
-"Uszkodzony plik NEWS.Rd:\n"
-"Fragment rozpoczynajÄ…cy\n"
-"  %s\n"
-"zawiera więcej niż jeden \\itemize.\n"
-"Używanie pierwszego."
+#. R/utils.R: gettextf("file '%s' is not in valid DCF format", dfile)
+#: R/utils.R:0
+msgid "file '%s' is not in valid DCF format"
+msgstr "plik '%s' nie jest poprawnym formatem DCF"
 
-msgid "Processing packages:"
-msgstr "Przetwarzanie pakietów:"
+#. R/Vignettes.R: gettextf("file '%s' not found", file)
+#. R/Vignettes.R: gettextf("file '%s' not found", vignette)
+#: R/Vignettes.R:0
+msgid "file '%s' not found"
+msgstr "plik '%s' nie został znaleziony"
 
-msgid "%s must be a character string or a file/raw connection"
-msgstr ""
-"argument %s musi być łańcuchem tekstowym lub połączeniem plikowym/prostym"
+#. R/admin.R: gettextf("\nfiles in '%s' field missing from '%s':", collationField,     codeDir)
+#: R/admin.R:0
+msgid "files in '%s' field missing from '%s':"
+msgstr "pliki w polu '%s' których brakuje w '%s':"
 
-msgid "PDF header not found"
-msgstr "nie znaleziono nagłówka PDF"
+#. R/admin.R: gettextf("\nfiles in '%s' missing from '%s' field:", codeDir,     collationField)
+#: R/admin.R:0
+msgid "files in '%s' missing from '%s' field:"
+msgstr "pliki w '%s' których brakuje w polu '%s':"
 
-msgid "EOF marker not found"
-msgstr "nie znaleziono znacznika EOF"
+#. R/QC.R: gettextf("found T/F in %s", paste(deparse(xfname[[i]]), collapse = ""))
+#: R/QC.R:0
+msgid "found T/F in %s"
+msgstr "znaleziono wartości T/F w %s"
 
-msgid "cannot find 'startxref' keyword"
-msgstr "nie można znaleźć 'startxref'"
+#. R/install.R: gettextf("generating debug symbols (%s)", "dSYM")
+#: R/install.R:0
+msgid "generating debug symbols (%s)"
+msgstr "tworzenie symboli debugowania (%s)"
 
-msgid "cannot find xref table"
-msgstr "nie można znaleźć tabeli 'xref'"
+#. R/dynamicHelp.R: warning("httpd server disabled by R_DISABLE_HTTPD", immediate. = TRUE)
+#: R/dynamicHelp.R:0
+msgid "httpd server disabled by R_DISABLE_HTTPD"
+msgstr "serwer httpd wyłączony przez R_DISABLE_HTTPD"
 
-msgid "cannot read xref table"
-msgstr "nie można odczytać tabeli 'xref'"
+#. R/pdftools.R: stop("invalid index in object stream lookup")
+#: R/pdftools.R:0
+msgid "invalid index in object stream lookup"
+msgstr "niepoprawny indeks w wyszukiwaniu strumienia obiektu"
 
-msgid "wrong class"
-msgstr "błędna klasa"
+#. R/install.R: warning("invalid package ", sQuote(pkg), call. = FALSE)
+#: R/install.R:0
+msgid "invalid package"
+msgstr "niepoprawny pakiet"
+
+#. R/utils.R: stop("invalid package layout")
+#: R/utils.R:0
+msgid "invalid package layout"
+msgstr "niepoprawna struktura pakietu"
+
+#. R/RdConv2.R: gettextf("invalid value for '%s' : %s", opt, oldval)
+#: R/RdConv2.R:0
+msgid "invalid value for '%s' : %s"
+msgstr "niepoprawna wartość dla '%s' : %s"
+
+#. R/build.R: gettextf("invalid value for '--compact-vignettes', assuming %s",     "\"qpdf\"")
+#: R/build.R:0
+msgid "invalid value for '--compact-vignettes', assuming %s"
+msgstr "Niepoprawna wartość '--compact-vignettes', zakładanie %s"
 
-msgid "attempting to select less than one element"
-msgstr "próba wybrania mniej niż jednego elementu"
+#. R/makeLazyLoad.R: stop("invalid value for 'compress': should be FALSE, TRUE, 2 or 3")
+#: R/makeLazyLoad.R:0
+msgid "invalid value for 'compress': should be FALSE, TRUE, 2 or 3"
+msgstr "niepoprawna wartość dla 'compress': powinno być FALSE, TRUE, 2 lub 3"
 
-msgid "attempting to select more than one element"
-msgstr "próba wybrania więcej niż jednego elementu"
+#. R/admin.R: stop("loading failed", call. = FALSE)
+#: R/admin.R:0
+msgid "loading failed"
+msgstr "ładowanie nie powiodło się"
 
+#. R/pdftools.R: sprintf("looking at %s", deparse(intToUtf8(bytes)))
+#: R/pdftools.R:0
 msgid "looking at %s"
 msgstr "patrzenie na %s"
 
-msgid "cannot read literal string object"
-msgstr "nie można odczytać dosłownych obiektów łańcucha"
+#. R/pdftools.R: gettextf("mismatch in generation numbers (given: %d, found: %d)",     gen, hdr["gen"])
+#: R/pdftools.R:0
+msgid "mismatch in generation numbers (given: %d, found: %d)"
+msgstr "niezgodność w numerach generacji (otrzymano: %d, znaleziono: %d)"
 
-msgid "cannot read hexadecimal string object"
-msgstr "nie można odczytać obiektu o szestnastkowym łańcuchu"
+#. R/pdftools.R: gettextf("mismatch in object numbers (given: %d, found: %d)",     num, hdr["num"])
+#: R/pdftools.R:0
+msgid "mismatch in object numbers (given: %d, found: %d)"
+msgstr "niezgodność w numerach obiektów (otrzymano: %d, znaleziono: %d)"
 
-msgid "cannot read name object"
-msgstr "nie można odczytać obiektu nazwy"
+#. R/Rd.R: gettextf("missing/empty %s field in '%s'", "\\name", description)
+#: R/Rd.R:0
+msgid "missing/empty %s field in '%s'"
+msgstr "brakujÄ…ce/puste pole %s w '%s'"
 
-msgid "cannot read array object"
-msgstr "nie można odczytać obiektu tablicy"
+#. R/Rd.R: gettextf("missing/empty \\title field in '%s'", description)
+#: R/Rd.R:0
+msgid "missing/empty \\title field in '%s'"
+msgstr "brakujÄ…ce/puste pole '\\title' w '%s'"
 
-msgid "cannot read dictionary object"
-msgstr "nie można odczytać obiektu słownika"
+#. R/Rd2ex.R: warning("more than one \\examples section, using the first")
+#: R/Rd2ex.R:0
+msgid "more than one \\examples section, using the first"
+msgstr "więcej niż jedna sekcja \\examples, używanie pierwszej"
 
-msgid "cannot read stream object"
-msgstr "nie można odczytać strumienia obiektu"
+#. R/makeLazyLoad.R: stop("namespace must not be already loaded")
+#: R/makeLazyLoad.R:0
+msgid "namespace must not be already loaded"
+msgstr "przestrzeń nazw nie może być już załadowana"
 
-msgid "cannot read indirect reference object"
-msgstr "nie można odczytać obiektu o niebezpośredniej referencji"
+#. R/QC.R: message("neither code nor data objects found")
+#: R/QC.R:0
+msgid "neither code nor data objects found"
+msgstr "nie znaleziono kodu ani obiektów danych"
 
-msgid "cannot find object header at xrefed position %d"
-msgstr "nie można znaleźć nagłówka obiektu w pozycji %d 'xrefed'"
+#. R/Rd2pdf.R: stop("no 'type' specified", call. = FALSE)
+#: R/Rd2pdf.R:0
+msgid "no 'type' specified"
+msgstr "nie określono 'type'"
 
-msgid "mismatch in object numbers (given: %d, found: %d)"
-msgstr "niezgodność w numerach obiektów (otrzymano: %d, znaleziono: %d)"
+#. R/install.R: message("no DLL was created")
+#: R/install.R:0
+msgid "no DLL was created"
+msgstr "nie utworzono pliku DLL"
 
-msgid "mismatch in generation numbers (given: %d, found: %d)"
-msgstr "niezgodność w numerach generacji (otrzymano: %d, znaleziono: %d)"
+#. R/QC.R: stop("no Rd sections specified")
+#: R/QC.R:0
+msgid "no Rd sections specified"
+msgstr "nie określono sekcji Rd"
 
-msgid "cannot read stream data"
-msgstr "nie można odczytać danych strumieniowych"
+#. R/testing.R: gettextf("no examples found for package %s", sQuote(pkg))
+#: R/testing.R:0
+msgid "no examples found for package %s"
+msgstr "nie znaleziono przykładów dla pakietu %s"
 
-msgid "invalid index in object stream lookup"
-msgstr "niepoprawny indeks w wyszukiwaniu strumienia obiektu"
+#. R/Rd2pdf.R: message("no inputs")
+#: R/Rd2pdf.R:0
+msgid "no inputs"
+msgstr "brak wejść"
 
-msgid "expanding %s"
-msgstr "rozszerzanie %s"
+#. R/checktools.R: message("no packages to check")
+#: R/checktools.R:0
+msgid "no packages to check"
+msgstr "brak pakietów do sprawdzenia"
 
-msgid "unsupported filter %s"
-msgstr "niewspierany filtr %s"
+#. R/testing.R: message("no parsed files found")
+#: R/testing.R:0
+msgid "no parsed files found"
+msgstr "nie znaleziono plików przeanalizowanych składniowo"
 
-msgid "unsupported %s predictor %d"
-msgstr "niewspierany predyktor %s %d"
+#. R/dynamicHelp.R: stop("no running server to stop")
+#: R/dynamicHelp.R:0
+msgid "no running server to stop"
+msgstr "brak serwera, którego można by zatrzymać"
 
-msgid "unsupported PNG filter %d"
-msgstr "niewspierany filtr PNG %d"
+#. R/install.R: warning("no source files found", call. = FALSE)
+#: R/install.R:0
+msgid "no source files found"
+msgstr "nie znaleziono plików źródłowych"
 
-msgid "argument 'pkg' must be of length 1"
-msgstr "argument 'pkg' musi być długości 1"
+#. R/citation.R: stop("non-ASCII input in a CITATION file without a declared encoding")
+#: R/citation.R:0
+msgid "non-ASCII input in a CITATION file without a declared encoding"
+msgstr "wejście nie-ASCII w pliku 'CITATION' bez zadeklarowanego kodowania"
+
+#. R/utils.R: stop("only Rd syntax is currently supported")
+#: R/utils.R:0
+msgid "only Rd syntax is currently supported"
+msgstr "aktualnie tylko składnia Rd jest wspierana"
 
+#. R/install.R: gettextf("package %s %s was found, but %s %s is required by %s",     sQuote(p), current, z$op, target, sQuote(pkgname))
+#: R/install.R:0
+msgid "package %s %s was found, but %s %s is required by %s"
+msgstr ""
+"pakiet %s %s został znaleziony, ale pakiet %s %s jest wymagany przez %s"
+
+#. R/QC.R: gettextf("package %s exists but was not installed under R >= 2.10.0 so xrefs cannot be checked",     sQuote(pkg))
+#: R/QC.R:0
+msgid ""
+"package %s exists but was not installed under R >= 2.10.0 so xrefs cannot be "
+"checked"
+msgstr ""
+"pakiet %s istnieje, ale nie został zainstalowany pod R >= 2.10.0, tak więc "
+"'xrefs' nie może zostać sprawdzony"
+
+#. R/install.R: gettextf("package %s successfully unpacked and MD5 sums checked",     sQuote(pkg_name))
+#: R/install.R:0
+msgid "package %s successfully unpacked and MD5 sums checked"
+msgstr ""
+"pakiet %s został pomyślnie rozpakowany oraz sumy MD5 zostały sprawdzone"
+
+#. R/pkgDepends.R: gettextf("package '%s' was not found", pkg)
+#: R/pkgDepends.R:0
 msgid "package '%s' was not found"
 msgstr "pakiet '%s' nie został znaleziony"
 
-msgid "bad operand"
-msgstr "zły operand"
-
-msgid "Package '%s' had its dependencies reduced to a minimal set."
-msgstr "Pakiet '%s' swoje zależności zredukował do najmniejszego zbioru."
+#. R/QC.R: gettext("package 'methods' is used but not declared")
+#: R/QC.R:0
+msgid "package 'methods' is used but not declared"
+msgstr "pakiet 'methods' został użyty, ale nie jest zadeklarowany"
 
-msgid "argument '%s' must be a character string or connection"
-msgstr "argument '%s' musi być łańcuchem tekstowym lub połączeniem"
+#. R/makeLazyLoad.R: warning("package contains no R code")
+#: R/makeLazyLoad.R:0
+msgid "package contains no R code"
+msgstr "pakiet nie zawiera kodu R"
 
-msgid "unimplemented encoding"
-msgstr "niezaimplementowana strona kodowa"
+#. R/check.R: gettextf("package directory %s does not exist", sQuote(pkg))
+#: R/check.R:0
+msgid "package directory %s does not exist"
+msgstr "katalog pakietu %s nie istnieje"
 
-msgid "Found %s, possibly from %s"
-msgstr "Znaleziono %s, prawdopodobnie z %s"
+#. R/QC.R: sprintf("package name '%s' seems invalid; using directory name '%s' instead",     package_name, dir_name)
+#: R/QC.R:0
+msgid "package name '%s' seems invalid; using directory name '%s' instead"
+msgstr ""
+"nazwa pakietu '%s' wygląda na niepoprawną; zamiast niej używanie nazwy "
+"katalogu '%s'"
 
-msgid "testing '%s' failed"
-msgstr "testowanie '%s' nie powiodło się"
+#. R/makeLazyLoad.R: warning("package seems to be using lazy loading already")
+#: R/makeLazyLoad.R:0
+msgid "package seems to be using lazy loading already"
+msgstr "wygląda na to, że pakiet już wykorzystuje leniwe ładowanie"
 
-msgid "Testing examples for package %s"
-msgstr "Testowanie przykładów dla pakietu %s"
+#. R/makeLazyLoad.R: warning("package seems to be using lazy loading for data already")
+#: R/makeLazyLoad.R:0
+msgid "package seems to be using lazy loading for data already"
+msgstr "wygląda na to, że pakiet już wykorzystuje leniwe ładowanie dla danych"
 
-msgid "comparing %s to %s ..."
-msgstr "porównywanie %s z %s ..."
+#. R/QC.R: gettextf("parse error in examples from file '%s':\n", file, conditionMessage(e))
+#: R/QC.R:0
+msgid "parse error in examples from file '%s':"
+msgstr "błąd przetwarzania w przykładach z pliku '%s':"
 
-msgid "OK"
-msgstr "OK"
+#. R/QC.R: gettextf("parse error in file '%s':\n", file, .massage_file_parse_error_message(conditionMessage(e)))
+#: R/QC.R:0
+msgid "parse error in file '%s':"
+msgstr "błąd przetwarzania w pliku '%s':"
 
-msgid "results differ from reference results"
-msgstr "wyniki różnią się od wyników referencyjnych"
+#. R/QC.R: gettextf("parse error in file '%s':\n%s", file, .massage_file_parse_error_message(conditionMessage(e)))
+#. R/QC.R: gettextf("parse error in file '%s':\n%s", file, .massage_file_parse_error_message(conditionMessage(e)))
+#. R/QC.R: gettextf("parse error in file '%s':\n%s", f, .massage_file_parse_error_message(conditionMessage(e)))
+#. R/QC.R: gettextf("parse error in file '%s':\n%s", summary(files)$description,     .massage_file_parse_error_message(conditionMessage(e)))
+#: R/QC.R:0
+msgid ""
+"parse error in file '%s':\n"
+"%s"
+msgstr ""
+"błąd przetwarzania w pliku '%s':\n"
+"%s"
 
-msgid "no examples found for package %s"
-msgstr "nie znaleziono przykładów dla pakietu %s"
+#. R/xgettext.R: gettextf("parsing '%s'", f)
+#. R/xgettext.R: gettextf("parsing '%s'", f)
+#: R/xgettext.R:0
+msgid "parsing '%s'"
+msgstr "przetwarzanie pliku %s"
 
-msgid "Running specific tests for package %s"
-msgstr "Uruchamianie specyficznych testów dla pakietu %s"
+#. R/admin.R: gettextf("processing %s", sQuote(basename(file)))
+#. R/doitools.R: sprintf("processing %s", p)
+#. R/doitools.R: sprintf("processing %s", d)
+#. R/pdftools.R: sprintf("processing %s", paste(names(entry), entry, collapse = " "))
+#. R/urltools.R: sprintf("processing %s", p)
+#. R/urltools.R: sprintf("processing %s", u)
+#. R/utils.R: sprintf("processing %s", basename(dir))
+#: R/admin.R:0 R/doitools.R:0 R/pdftools.R:0 R/urltools.R:0 R/utils.R:0
+msgid "processing %s"
+msgstr "przetwarzanie %s"
 
-msgid "Running %s"
-msgstr "Uruchamianie %s"
+#. R/Vignettes.R: gettextf("processing vignette '%s' failed with diagnostics:\n%s",     file, conditionMessage(e))
+#: R/Vignettes.R:0
+msgid ""
+"processing vignette '%s' failed with diagnostics:\n"
+"%s"
+msgstr ""
+"przetwarzanie ilustracji '%s' nie powiodło dając komunikat:\n"
+"%s"
 
-msgid "Running vignettes for package %s"
-msgstr "Uruchamianie ilustracji dla pakietu %s"
+#. R/packages.R: gettextf("reading DESCRIPTION for package %s failed with message:\n  %s",     sQuote(basename(dirname(p))), conditionMessage(temp))
+#. R/packages.R: gettextf("reading DESCRIPTION for package %s failed with message:\n  %s",     sQuote(basename(paths[i])), conditionMessage(temp))
+#: R/packages.R:0
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+"Odczytywanie pliku 'DESCRIPTION' dla pakietu %s nie powiodło się zwracając "
+"komunikat:\n"
+"  %s"
 
-msgid "Comparing %s to %s ..."
-msgstr "Porównywanie %s z %s ..."
+#. R/testing.R: stop("  ", "results differ from reference results")
+#: R/testing.R:0
+msgid "results differ from reference results"
+msgstr "wyniki różnią się od wyników referencyjnych"
 
-msgid "no parsed files found"
-msgstr "nie znaleziono plików przeanalizowanych składniowo"
+#. R/admin.R: gettextf("running %s on vignette '%s' failed with message:\n%s",     engine[["name"]], file, conditionMessage(e))
+#: R/admin.R:0
+msgid ""
+"running %s on vignette '%s' failed with message:\n"
+"%s"
+msgstr ""
+"wykonywanie %s na ilustracji '%s' nie powiodło się z wynikiem:\n"
+"%s"
 
-msgid "FAILED"
-msgstr "NIE POWIOD�O SIĘ"
+#. R/Vignettes.R: stop("running 'make' failed")
+#: R/Vignettes.R:0
+msgid "running 'make' failed"
+msgstr "uruchomienie 'make' nie powiodło się"
 
-msgid "DIFFERED"
-msgstr "RÓŻNICE"
+#. R/utils.R: gettextf("running 'texi2dvi' on '%s' failed", file)
+#: R/utils.R:0
+msgid "running 'texi2dvi' on '%s' failed"
+msgstr "działanie 'texi2dvi' na pliku '%s' nie powiodło się"
 
+#. R/testing.R: message("running tests of random deviate generation -- fails occasionally")
+#: R/testing.R:0
 msgid "running tests of random deviate generation -- fails occasionally"
 msgstr ""
 "wykonywanie testów generowania losowych odchyleń -- okazjonalnie zawodzi"
 
-msgid "R CMD build failed"
-msgstr "'R CMD build' nie powiodło się"
+#. R/dynamicHelp.R: stop("server already running")
+#: R/dynamicHelp.R:0
+msgid "server already running"
+msgstr "serwer jest już uruchomiony"
 
-msgid "'x' must be a single character string"
-msgstr "argument 'x' musi być pojedynczym łańcuchem tekstowym"
+#. R/dynamicHelp.R: stop("server could not be started on an earlier attempt")
+#: R/dynamicHelp.R:0
+msgid "server could not be started on an earlier attempt"
+msgstr "serwer nie mógł zostać uruchomiony przy wcześniejszej próbie"
 
-msgid "test '%s' is not available"
-msgstr "test '%s' nie jest dostępny"
+#. R/makeLazyLoad.R: stop("source list must have names for all elements")
+#: R/makeLazyLoad.R:0
+msgid "source list must have names for all elements"
+msgstr "lista źródłowa musi mieć nazwy dla wszystkich elementów"
 
-msgid "argument 'x' must be a character vector"
-msgstr "argument 'x' musi być wektorem tekstowym"
+#. R/makeLazyLoad.R: stop("source must be an environment or a list")
+#: R/makeLazyLoad.R:0
+msgid "source must be an environment or a list"
+msgstr "źródło musi być środowiskiem lub listą"
 
-msgid "argument 'delim' must specify two characters"
-msgstr "argument 'delim' musi określać dwa znaki"
+#. R/dynamicHelp.R: message("starting httpd help server ...", appendLF = FALSE)
+#: R/dynamicHelp.R:0
+msgid "starting httpd help server ..."
+msgstr "uruchamianie serwera httpd dla pomocy ..."
 
-msgid "only Rd syntax is currently supported"
-msgstr "aktualnie tylko składnia Rd jest wspierana"
+#. R/Vignettes.R: gettextf("tangling vignette '%s' failed with diagnostics:\n%s",     file, conditionMessage(e))
+#: R/Vignettes.R:0
+msgid ""
+"tangling vignette '%s' failed with diagnostics:\n"
+"%s"
+msgstr ""
+"wiązanie ilustracji '%s' nie powiodło dając komunikat:\n"
+"%s"
 
-msgid "Running 'texi2dvi' on '%s' failed."
-msgstr "Uruchomienie 'texi2dvi' na pliku '%s' nie powiodło się."
+#. R/utils.R: gettextf("test '%s' is not available", op)
+#: R/utils.R:0
+msgid "test '%s' is not available"
+msgstr "test '%s' nie jest dostępny"
 
-msgid "running 'texi2dvi' on '%s' failed"
-msgstr "działanie 'texi2dvi' na pliku '%s' nie powiodło się"
+#. R/testing.R: gettextf("testing '%s' failed", pkgs[i])
+#. R/testing.R: gettextf("testing '%s' failed", pkg)
+#: R/testing.R:0
+msgid "testing '%s' failed"
+msgstr "testowanie '%s' nie powiodło się"
 
-msgid "unable to run '%s' on '%s'"
-msgstr "nie można uruchomić polecenia '%s' na pliku '%s'"
+#. R/pkgDepends.R: warning("the 'lib.loc' argument has always been unused and is deprecated now")
+#: R/pkgDepends.R:0
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr "argument 'lib.loc' nigdy nie był używany i teraz jest przestarzały"
+
+#. R/makeLazyLoad.R: gettextf("there is no package called '%s'", package)
+#. R/makeLazyLoad.R: gettextf("there is no package called '%s'", package)
+#. R/makeLazyLoad.R: gettextf("there is no package called '%s'", package)
+#. R/makeLazyLoad.R: gettextf("there is no package called '%s'", package)
+#: R/makeLazyLoad.R:0
+msgid "there is no package called '%s'"
+msgstr "nie ma pakietu o nazwie '%s'"
 
-msgid "unable to run %s on '%s'"
-msgstr "nie można uruchomić polecenia '%s' na pliku '%s'"
+#. R/makeLazyLoad.R: stop("this cannot be used for package 'base'")
+#: R/makeLazyLoad.R:0
+msgid "this cannot be used for package 'base'"
+msgstr "to nie może zostać użyte dla pakietu 'base'"
 
-msgid "cannot coerce %s to logical"
-msgstr "nie można przekształcić %s na wartość logiczną"
+#. R/install.R: stop("this seems to be a bundle -- and they are defunct")
+#: R/install.R:0
+msgid "this seems to be a bundle -- and they are defunct"
+msgstr "plik 'DESCRIPTION' wygląda to na paczkę -- a one zostały zlikwidowane"
 
-msgid "File 'DESCRIPTION' is missing."
-msgstr "Brakuje pliku 'DESCRIPTION'."
+#. R/admin.R: gettextf("unable to copy INDEX to '%s'", file.path(outDir, "INDEX"))
+#: R/admin.R:0
+msgid "unable to copy INDEX to '%s'"
+msgstr "nie można skopiować pliku INDEX do '%s'"
 
-msgid "Files 'DESCRIPTION' and 'DESCRIPTION.in' are missing."
-msgstr "Brakuje plików 'DESCRIPTION' oraz 'DESCRIPTION.in'."
+#. R/QC.R: stop("unable to create ", file)
+#. R/packages.R: stop("unable to create ", td)
+#. R/utils.R: stop("unable to create ", con)
+#: R/QC.R:0 R/packages.R:0 R/utils.R:0
+msgid "unable to create"
+msgstr "nie można utworzyć"
 
-msgid "invalid package layout"
-msgstr "niepoprawna struktura pakietu"
+#. R/admin.R: gettextf("unable to create '%s'", outFile)
+#: R/admin.R:0
+msgid "unable to create '%s'"
+msgstr "nie można utworzyć '%s'"
 
-msgid "file '%s' is not in valid DCF format"
-msgstr "plik '%s' nie jest poprawnym formatem DCF"
+#. R/Vignettes.R: gettextf("unable to create temp directory %s ", sQuote(tmpd))
+#: R/Vignettes.R:0
+msgid "unable to create temp directory %s"
+msgstr "nie można utworzyć katalogu tymczasowego %s"
 
-msgid "contains a blank line"
-msgstr "zawiera pustÄ… liniÄ™"
+#. R/utils.R: gettextf("unable to run %s on '%s'", latex, file)
+#: R/utils.R:0
+msgid "unable to run %s on '%s'"
+msgstr "nie można uruchomić polecenia '%s' na pliku '%s'"
 
-msgid "Unknown encoding with non-ASCII data: converting to ASCII"
-msgstr "Nieznane kodowanie z danymi nie-ASCII: konwertowanie do ASCII"
+#. R/utils.R: gettextf("unable to run '%s' on '%s'", latex, file)
+#. R/utils.R: gettextf("unable to run '%s' on '%s'", makeindex, idxfile)
+#: R/utils.R:0
+msgid "unable to run '%s' on '%s'"
+msgstr "nie można uruchomić polecenia '%s' na pliku '%s'"
 
-msgid "cannot source package code"
-msgstr "nie można wykonać kodu pakietu"
+#. R/QC.R: stop("unable to write code files")
+#. R/admin.R: stop("unable to write code files")
+#. R/utils.R: stop("unable to write code files")
+#: R/QC.R:0 R/admin.R:0 R/utils.R:0
+msgid "unable to write code files"
+msgstr "nie można zapisać plików kodu"
+
+#. R/recode.R: stop("unimplemented encoding")
+#: R/recode.R:0
+msgid "unimplemented encoding"
+msgstr "niezaimplementowana strona kodowa"
 
-msgid "Call sequence:"
-msgstr "Sekwencja wywołania:"
+#. R/pdftools.R: gettextf("unsupported %s predictor %d", "flatedecode", predictor)
+#: R/pdftools.R:0
+msgid "unsupported %s predictor %d"
+msgstr "niewspierany predyktor %s %d"
 
-msgid "'text' must be a character vector"
-msgstr "argument 'text' musi być wektorem tekstowym"
+#. R/pdftools.R: gettextf("unsupported PNG filter %d", fb)
+#: R/pdftools.R:0
+msgid "unsupported PNG filter %d"
+msgstr "niewspierany filtr PNG %d"
 
-msgid "parsing '%s'"
-msgstr "przetwarzanie pliku %s"
+#. R/dynamicHelp.R: gettextf("unsupported URL %s", mono(path))
+#: R/dynamicHelp.R:0
+msgid "unsupported URL %s"
+msgstr "niewspierany adres URL %s"
 
-msgid "Obsolete package %s in Rd xrefs"
-msgid_plural "Obsolete packages %s in Rd xrefs"
-msgstr[0] "Przestarzały pakiet %s w krzyżowych referencjach Rd"
-msgstr[1] "Przestarzałe pakiety %s w krzyżowych referencjach Rd"
-msgstr[2] "Przestarzałe pakiety %s w krzyżowych referencjach Rd"
+#. R/pdftools.R: gettextf("unsupported filter %s", sQuote(filter))
+#: R/pdftools.R:0
+msgid "unsupported filter %s"
+msgstr "niewspierany filtr %s"
 
-msgid "Package unavailable to check Rd xrefs: %s"
-msgid_plural "Packages unavailable to check Rd xrefs: %s"
-msgstr[0] ""
-"Pakiet jest niedostępny dla sprawdzenia krzyżowych referencji Rd: %s"
-msgstr[1] "Pakiety niedostępne dla sprawdzenia krzyżowych referencji Rd: %s"
-msgstr[2] "Pakiety niedostępne dla sprawdzenia krzyżowych referencji Rd: %s"
+#. R/Vignettes.R: gettextf("vignette builder '%s' not found", pkg)
+#: R/Vignettes.R:0
+msgid "vignette builder '%s' not found"
+msgstr "konstruktor ilustracji '%s' nie został znaleziony"
 
-msgid "Unknown package %s in Rd xrefs"
-msgid_plural "Unknown packages %s in Rd xrefs"
-msgstr[0] "Nieznany pakiet %s w krzyżowych referencjach Rd"
-msgstr[1] "Nieznane pakiety %s w krzyżowych referencjach Rd"
-msgstr[2] "Nieznane pakiety %s w krzyżowych referencjach Rd"
+#. R/Vignettes.R: gettextf("vignette filename '%s' does not match any of the '%s' filename patterns",     file, paste(engine$package, engine$name, sep = "::"))
+#: R/Vignettes.R:0
+msgid "vignette filename '%s' does not match any of the '%s' filename patterns"
+msgstr ""
+"nazwa pliku ilustracji '%s' nie zgadza się z żadną ze ścieżek nazwy pliku "
+"'%s'"
 
-msgid "Note: found %d marked Latin-1 string"
-msgid_plural "Note: found %d marked Latin-1 strings"
-msgstr[0] "Uwaga: znaleziono %d ciÄ…g oznaczony jako Latin-1"
-msgstr[1] "Uwaga: znaleziono %d ciÄ…gi oznaczone jako Latin-1"
-msgstr[2] "Uwaga: znaleziono %d ciągów oznaczonych jako Latin-1"
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#. R/pdftools.R: stop("wrong class")
+#: R/pdftools.R:0
+msgid "wrong class"
+msgstr "błędna klasa"
 
-msgid "Note: found %d marked UTF-8 string"
-msgid_plural "Note: found %d marked UTF-8 strings"
-msgstr[0] "Uwaga: znaleziono %d ciÄ…g oznaczony jako ciÄ…g UTF-8"
-msgstr[1] "Uwaga: znaleziono %d ciÄ…gi oznaczone jako ciÄ…gi UTF-8"
-msgstr[2] "Uwaga: znaleziono %d ciągów oznaczonych jako ciągi UTF-8"
+#. R/Rd.R: stop("you must specify 'dir' or 'files'")
+#: R/Rd.R:0
+msgid "you must specify 'dir' or 'files'"
+msgstr "musisz określić argument 'dir' lub 'files'"
 
-msgid "Note: found %d string marked as \"bytes\""
-msgid_plural "Note: found %d strings marked as \"bytes\""
-msgstr[0] "Uwaga: znaleziono %d ciÄ…g oznaczony jako \"bytes\""
-msgstr[1] "Uwaga: znaleziono %d ciÄ…gi oznaczone jako \"bytes\""
-msgstr[2] "Uwaga: znaleziono %d ciągów oznaczonych jako \"bytes\""
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/QC.R: stop("you must specify 'package' or 'dir'")
+#. R/Rd.R: stop("you must specify 'package' or 'dir'")
+#. R/Vignettes.R: stop("you must specify 'package' or 'dir'")
+#: R/QC.R:0 R/Rd.R:0 R/Vignettes.R:0
+msgid "you must specify 'package' or 'dir'"
+msgstr "musisz określić argument 'package' lub 'dir'"
 
-msgid "Warning in file %s:"
-msgid_plural "Warnings in file %s:"
-msgstr[0] "Ostrzeżenie w pliku %s:"
-msgstr[1] "Ostrzeżenia w pliku %s:"
-msgstr[2] "Ostrzeżenia w pliku %s:"
+#. R/QC.R: stop("you must specify 'package', 'dir' or 'file'")
+#. R/QC.R: stop("you must specify 'package', 'dir' or 'file'")
+#: R/QC.R:0
+msgid "you must specify 'package', 'dir' or 'file'"
+msgstr "musisz określić 'package', 'dir' lub 'file'"
 
-msgid "Found possibly global 'T' or 'F' in the following function:"
-msgid_plural "Found possibly global 'T' or 'F' in the following functions:"
-msgstr[0] ""
-"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w następującej "
-"funkcji:"
-msgstr[1] ""
-"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w następujących "
-"funkcjach:"
-msgstr[2] ""
-"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w następujących "
-"funkcjach:"
+#. R/testing.R: ngettext(sum(res), "%d of the package tests failed", "%d of the package tests failed",     domain = "R-tools")
+#: R/testing.R:0
+msgid "%d of the package tests failed"
+msgid_plural "%d of the package tests failed"
+msgstr[0] "%d z testów pakietu nie powiodło się"
+msgstr[1] "%d z testów pakietu nie powiodło się"
+msgstr[2] "%d z testów pakietu nie powiodło się"
 
-msgid ""
-"Found possibly global 'T' or 'F' in the examples of the following Rd file:"
+#. R/QC.R: ngettext(length(x$bad_refs), "Found a .Internal call in methods for the following reference class:",     "Found .Internal calls in methods for the following reference classes:")
+#: R/QC.R:0
+msgid "Found a .Internal call in methods for the following reference class:"
 msgid_plural ""
-"Found possibly global 'T' or 'F' in the examples of the following Rd files:"
+"Found .Internal calls in methods for the following reference classes:"
 msgstr[0] ""
-"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w przykładach "
-"następującego pliku Rd:"
+"Znaleziono wywołanie '.Internal' w metodach w następującej klasie "
+"referencyjnej:"
 msgstr[1] ""
-"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w przykładach "
-"następujących plików Rd:"
+"Znaleziono wywołania '.Internal' w metodach w następujących klasach "
+"referencyjnych:"
 msgstr[2] ""
-"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w przykładach "
-"następujących plików Rd:"
+"Znaleziono wywołania '.Internal' w metodach w następujących klasach "
+"referencyjnych:"
 
+#. R/QC.R: ngettext(length(x$bad_closures), "Found a .Internal call in the following function:",     "Found .Internal calls in the following functions:")
+#: R/QC.R:0
 msgid "Found a .Internal call in the following function:"
 msgid_plural "Found .Internal calls in the following functions:"
 msgstr[0] "Znaleziono wywołanie '.Internal' w następującej funkcji:"
 msgstr[1] "Znaleziono wywołania '.Internal' w następujących funkcjach:"
 msgstr[2] "Znaleziono wywołania '.Internal' w następujących funkcjach:"
 
+#. R/QC.R: ngettext(length(x$bad_S4methods), "Found a.Internal call in methods for the following S4 generic:",     "Found .Internal calls in methods for the following S4 generics:")
+#: R/QC.R:0
 msgid "Found a.Internal call in methods for the following S4 generic:"
 msgid_plural "Found .Internal calls in methods for the following S4 generics:"
 msgstr[0] ""
@@ -1348,32 +2234,8 @@
 "Znaleziono wywołania '.Internal' w metodach w następujących funkcjach "
 "ogólnych S4:"
 
-msgid "Found a .Internal call in methods for the following reference class:"
-msgid_plural ""
-"Found .Internal calls in methods for the following reference classes:"
-msgstr[0] ""
-"Znaleziono wywołanie '.Internal' w metodach w następującej klasie "
-"referencyjnej:"
-msgstr[1] ""
-"Znaleziono wywołania '.Internal' w metodach w następujących klasach "
-"referencyjnych:"
-msgstr[2] ""
-"Znaleziono wywołania '.Internal' w metodach w następujących klasach "
-"referencyjnych:"
-
-msgid "Found an obsolete/platform-specific call in the following function:"
-msgid_plural ""
-"Found an obsolete/platform-specific call in the following functions:"
-msgstr[0] ""
-"Znaleziono przestarzałe/specyficzne dla platformy wywołanie w następującej "
-"funkcji:"
-msgstr[1] ""
-"Znaleziono przestarzałe/specyficzne dla platformy wywołanie w następujących "
-"funkcjach:"
-msgstr[2] ""
-"Znaleziono przestarzałe/specyficzne dla platformy wywołanie w następujących "
-"funkcjach:"
-
+#. R/QC.R: ngettext(length(x$bad_S4methods), "Found an obsolete/platform-specific call in methods for the following S4 generic:",     "Found an obsolete/platform-specific call in methods for the following S4 generics:")
+#: R/QC.R:0
 msgid ""
 "Found an obsolete/platform-specific call in methods for the following S4 "
 "generic:"
@@ -1390,6 +2252,8 @@
 "Znaleziono przestarzałe/specyficzne dla platformy wywołanie w metodach w "
 "następujących funkcji ogólnych S4:"
 
+#. R/QC.R: ngettext(length(x$bad_refs), "Found an obsolete/platform-specific call in methods for the following reference class:",     "Found an obsolete/platform-specific call in methods for the following reference classes:")
+#: R/QC.R:0
 msgid ""
 "Found an obsolete/platform-specific call in methods for the following "
 "reference class:"
@@ -1406,30 +2270,158 @@
 "Znaleziono przestarzałe/specyficzne dla platformy wywołanie w metodach w "
 "następujących klasach referencyjnych:"
 
-msgid "Found the deprecated function:"
-msgid_plural "Found the deprecated functions:"
-msgstr[0] "Znaleziono przestarzałą funkcję:"
-msgstr[1] "Znaleziono przestarzałe funkcje:"
-msgstr[2] "Znaleziono przestarzałe funkcje:"
+#. R/QC.R: ngettext(length(x$bad_closures), "Found an obsolete/platform-specific call in the following function:",     "Found an obsolete/platform-specific call in the following functions:")
+#: R/QC.R:0
+msgid "Found an obsolete/platform-specific call in the following function:"
+msgid_plural ""
+"Found an obsolete/platform-specific call in the following functions:"
+msgstr[0] ""
+"Znaleziono przestarzałe/specyficzne dla platformy wywołanie w następującej "
+"funkcji:"
+msgstr[1] ""
+"Znaleziono przestarzałe/specyficzne dla platformy wywołanie w następujących "
+"funkcjach:"
+msgstr[2] ""
+"Znaleziono przestarzałe/specyficzne dla platformy wywołanie w następujących "
+"funkcjach:"
+
+#. R/QC.R: ngettext(length(x$bad_examples), "Found possibly global 'T' or 'F' in the examples of the following Rd file:",     "Found possibly global 'T' or 'F' in the examples of the following Rd files:")
+#: R/QC.R:0
+msgid ""
+"Found possibly global 'T' or 'F' in the examples of the following Rd file:"
+msgid_plural ""
+"Found possibly global 'T' or 'F' in the examples of the following Rd files:"
+msgstr[0] ""
+"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w przykładach "
+"następującego pliku Rd:"
+msgstr[1] ""
+"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w przykładach "
+"następujących plików Rd:"
+msgstr[2] ""
+"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w przykładach "
+"następujących plików Rd:"
+
+#. R/QC.R: ngettext(length(x$bad_closures), "Found possibly global 'T' or 'F' in the following function:",     "Found possibly global 'T' or 'F' in the following functions:")
+#: R/QC.R:0
+msgid "Found possibly global 'T' or 'F' in the following function:"
+msgid_plural "Found possibly global 'T' or 'F' in the following functions:"
+msgstr[0] ""
+"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w następującej "
+"funkcji:"
+msgstr[1] ""
+"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w następujących "
+"funkcjach:"
+msgstr[2] ""
+"Znaleziono prawdopodobnie globalną wartość 'T' lub 'F' w następujących "
+"funkcjach:"
 
+#. R/QC.R: ngettext(length(x$defunct), "Found the defunct/removed function:",     "Found the defunct/removed functions:")
+#: R/QC.R:0
 msgid "Found the defunct/removed function:"
 msgid_plural "Found the defunct/removed functions:"
 msgstr[0] "Znaleziono zlikwidowanÄ…/usunietÄ… funkcjÄ™:"
 msgstr[1] "Znaleziono zlikwidowane/usuniete funkcje:"
 msgstr[2] "Znaleziono zlikwidowane/usuniete funkcje:"
 
+#. R/QC.R: ngettext(length(x$deprecated), "Found the deprecated function:",     "Found the deprecated functions:")
+#: R/QC.R:0
+msgid "Found the deprecated function:"
+msgid_plural "Found the deprecated functions:"
+msgstr[0] "Znaleziono przestarzałą funkcję:"
+msgstr[1] "Znaleziono przestarzałe funkcje:"
+msgstr[2] "Znaleziono przestarzałe funkcje:"
+
+#. R/QC.R: ngettext(length(x$devices), "Found the platform-specific device:",     "Found the platform-specific devices:")
+#: R/QC.R:0
 msgid "Found the platform-specific device:"
 msgid_plural "Found the platform-specific devices:"
 msgstr[0] "Znaleziono urzÄ…dzenie specyficzne dla platformy:"
 msgstr[1] "Znaleziono urzÄ…dzenia specyficzne dla platformy:"
 msgstr[2] "Znaleziono urzÄ…dzenia specyficzne dla platformy:"
 
+#. R/QC.R: ngettext(sum(!ok), "Generic without any methods in %s: %s", "Generics without any methods in %s: %s")
+#: R/QC.R:0
 msgid "Generic without any methods in %s: %s"
 msgid_plural "Generics without any methods in %s: %s"
 msgstr[0] "Funkcja ogólna bez metod w %s: %s"
 msgstr[1] "Funkcje ogólne bez metod w %s: %s"
 msgstr[2] "Funkcje ogólne bez metod w %s: %s"
 
+#. R/dynamicHelp.R: ngettext(length(paths), "Help on topic '%s' was found in the following package:",     "Help on topic '%s' was found in the following packages:")
+#: R/dynamicHelp.R:0
+msgid "Help on topic '%s' was found in the following package:"
+msgid_plural "Help on topic '%s' was found in the following packages:"
+msgstr[0] "Pomoc na temat '%s' została znaleziona w następującym pakiecie:"
+msgstr[1] "Pomoc na temat '%s' została znaleziona w następujących pakietach:"
+msgstr[2] "Pomoc na temat '%s' została znaleziona w następujących pakietach:"
+
+#. R/QC.R: ngettext(n, "Note: found %d marked Latin-1 string", "Note: found %d marked Latin-1 strings")
+#: R/QC.R:0
+msgid "Note: found %d marked Latin-1 string"
+msgid_plural "Note: found %d marked Latin-1 strings"
+msgstr[0] "Uwaga: znaleziono %d ciÄ…g oznaczony jako Latin-1"
+msgstr[1] "Uwaga: znaleziono %d ciÄ…gi oznaczone jako Latin-1"
+msgstr[2] "Uwaga: znaleziono %d ciągów oznaczonych jako Latin-1"
+
+#. R/QC.R: ngettext(n, "Note: found %d marked UTF-8 string", "Note: found %d marked UTF-8 strings")
+#: R/QC.R:0
+msgid "Note: found %d marked UTF-8 string"
+msgid_plural "Note: found %d marked UTF-8 strings"
+msgstr[0] "Uwaga: znaleziono %d ciÄ…g oznaczony jako ciÄ…g UTF-8"
+msgstr[1] "Uwaga: znaleziono %d ciÄ…gi oznaczone jako ciÄ…gi UTF-8"
+msgstr[2] "Uwaga: znaleziono %d ciągów oznaczonych jako ciągi UTF-8"
+
+#. R/QC.R: ngettext(n, "Note: found %d string marked as \"bytes\"", "Note: found %d strings marked as \"bytes\"")
+#: R/QC.R:0
+msgid "Note: found %d string marked as \"bytes\""
+msgid_plural "Note: found %d strings marked as \"bytes\""
+msgstr[0] "Uwaga: znaleziono %d ciÄ…g oznaczony jako \"bytes\""
+msgstr[1] "Uwaga: znaleziono %d ciÄ…gi oznaczone jako \"bytes\""
+msgstr[2] "Uwaga: znaleziono %d ciągów oznaczonych jako \"bytes\""
+
+#. R/QC.R: ngettext(sum(obsolete), "Obsolete package %s in Rd xrefs", "Obsolete packages %s in Rd xrefs")
+#: R/QC.R:0
+msgid "Obsolete package %s in Rd xrefs"
+msgid_plural "Obsolete packages %s in Rd xrefs"
+msgstr[0] "Przestarzały pakiet %s w krzyżowych referencjach Rd"
+msgstr[1] "Przestarzałe pakiety %s w krzyżowych referencjach Rd"
+msgstr[2] "Przestarzałe pakiety %s w krzyżowych referencjach Rd"
+
+#. R/QC.R: ngettext(sum(miss), "Package unavailable to check Rd xrefs: %s",     "Packages unavailable to check Rd xrefs: %s")
+#: R/QC.R:0
+msgid "Package unavailable to check Rd xrefs: %s"
+msgid_plural "Packages unavailable to check Rd xrefs: %s"
+msgstr[0] ""
+"Pakiet jest niedostępny dla sprawdzenia krzyżowych referencji Rd: %s"
+msgstr[1] "Pakiety niedostępne dla sprawdzenia krzyżowych referencji Rd: %s"
+msgstr[2] "Pakiety niedostępne dla sprawdzenia krzyżowych referencji Rd: %s"
+
+#. R/check.R: ngettext(length(fail), "Required field missing or empty:", "Required fields missing or empty:")
+#: R/check.R:0
+msgid "Required field missing or empty:"
+msgid_plural "Required fields missing or empty:"
+msgstr[0] "Brakuje wymaganego pola lub jest puste:"
+msgstr[1] "Brakuje wymaganych pól lub są puste:"
+msgstr[2] "Brakuje wymaganych pól lub są puste:"
+
+#. R/QC.R: ngettext(sum(!miss), "Unknown package %s in Rd xrefs", "Unknown packages %s in Rd xrefs")
+#: R/QC.R:0
+msgid "Unknown package %s in Rd xrefs"
+msgid_plural "Unknown packages %s in Rd xrefs"
+msgstr[0] "Nieznany pakiet %s w krzyżowych referencjach Rd"
+msgstr[1] "Nieznane pakiety %s w krzyżowych referencjach Rd"
+msgstr[2] "Nieznane pakiety %s w krzyżowych referencjach Rd"
+
+#. R/QC.R: ngettext(len, "Warning in file %s:", "Warnings in file %s:")
+#: R/QC.R:0
+msgid "Warning in file %s:"
+msgid_plural "Warnings in file %s:"
+msgstr[0] "Ostrzeżenie w pliku %s:"
+msgstr[1] "Ostrzeżenia w pliku %s:"
+msgstr[2] "Ostrzeżenia w pliku %s:"
+
+#. R/Rd.R: ngettext(sum(idx), "missing/empty \\name field in Rd file\n%s",     "missing/empty \\name field in Rd files\n%s")
+#: R/Rd.R:0
 msgid ""
 "missing/empty \\name field in Rd file\n"
 "%s"
@@ -1446,35 +2438,21 @@
 "brakujÄ…ce/puste pole \\name w plikach\n"
 "%s"
 
-msgid "unable to re-encode %s line %s"
-msgid_plural "unable to re-encode %s lines %s"
-msgstr[0] "nie można przekodować %s linia %s"
-msgstr[1] "nie można przekodować %s linie %s"
-msgstr[2] "nie można przekodować %s linie %s"
-
-msgid "Required field missing or empty:"
-msgid_plural "Required fields missing or empty:"
-msgstr[0] "Brakuje wymaganego pola lub jest puste:"
-msgstr[1] "Brakuje wymaganych pól lub są puste:"
-msgstr[2] "Brakuje wymaganych pól lub są puste:"
-
-msgid "Help on topic '%s' was found in the following package:"
-msgid_plural "Help on topic '%s' was found in the following packages:"
-msgstr[0] "Pomoc na temat '%s' została znaleziona w następującym pakiecie:"
-msgstr[1] "Pomoc na temat '%s' została znaleziona w następujących pakietach:"
-msgstr[2] "Pomoc na temat '%s' została znaleziona w następujących pakietach:"
-
+#. R/makeLazyLoad.R: ngettext(sum(dup), "object %s is created by more than one data call",     "objects %s are created by more than one data call")
+#: R/makeLazyLoad.R:0
 msgid "object %s is created by more than one data call"
 msgid_plural "objects %s are created by more than one data call"
 msgstr[0] "obiekt %s jest utworzony przez więcej niż jedno wywołanie danych"
 msgstr[1] "obiekty %s są utworzone przez więcej niż jedno wywołanie danych"
 msgstr[2] "obiekty %s są utworzone przez więcej niż jedno wywołanie danych"
 
-msgid "%d of the package tests failed"
-msgid_plural "%d of the package tests failed"
-msgstr[0] "%d z testów pakietu nie powiodło się"
-msgstr[1] "%d z testów pakietu nie powiodło się"
-msgstr[2] "%d z testów pakietu nie powiodło się"
+#. R/admin.R: ngettext(length(bad), "unable to re-encode %s line %s", "unable to re-encode %s lines %s")
+#: R/admin.R:0
+msgid "unable to re-encode %s line %s"
+msgid_plural "unable to re-encode %s lines %s"
+msgstr[0] "nie można przekodować %s linia %s"
+msgstr[1] "nie można przekodować %s linie %s"
+msgstr[2] "nie można przekodować %s linie %s"
 
 #~ msgid "assertCondition: caught %s"
 #~ msgstr "assertCondition: przechwycono %s"
diff -Nru r-base-3.2.3/src/library/tools/po/R-pt_BR.po r-base-3.3.1/src/library/tools/po/R-pt_BR.po
--- r-base-3.2.3/src/library/tools/po/R-pt_BR.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-pt_BR.po	2016-04-27 22:15:26.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:57-0300\n"
 "Last-Translator: Colin Robert <beasley@ufpa.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -13,10 +13,10 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-msgid "Reading %s failed with message: %s"
+msgid "Checking %s"
 msgstr ""
 
-msgid "Checking %s"
+msgid "Processing %s ..."
 msgstr ""
 
 msgid "argument 'package' must be of length 1"
@@ -864,6 +864,9 @@
 msgid "empty 'data' directory"
 msgstr ""
 
+msgid "cannot create unique directory for build"
+msgstr ""
+
 msgid "cannot create temporary directory"
 msgstr ""
 
@@ -926,6 +929,12 @@
 "%s"
 msgstr ""
 
+msgid "DESCRIPTION file not found"
+msgstr ""
+
+msgid "NEWS file not found"
+msgstr ""
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 
@@ -961,6 +970,11 @@
 msgid "Processing packages:"
 msgstr ""
 
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr ""
 
@@ -1046,6 +1060,9 @@
 msgid "package '%s' was not found"
 msgstr ""
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-ru.po r-base-3.3.1/src/library/tools/po/R-ru.po
--- r-base-3.2.3/src/library/tools/po/R-ru.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-ru.po	2016-04-27 22:15:26.000000000 +0000
@@ -9,19 +9,15 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
-"PO-Revision-Date: 2015-03-27 21:50-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:06-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-msgid "Reading %s failed with message: %s"
-msgstr "þÔÅÎÉÅ %s ÎÅ ÕÄÁÌÏÓØ Ó ÓÏÏÂÝÅÎÉÅÍ: %s"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgid "Checking %s"
 msgstr "ðÒÏ×ÅÒÑÀ %s"
@@ -62,10 +58,8 @@
 msgid "directory '%s' does not contain Rd objects"
 msgstr "ÐÁÐËÁ '%s' ÎÅ ÓÏÄÅÒÖÉÔ Rd-ÏÂßÅËÔÏ×"
 
-msgid ""
-"Functions or methods with usage in documentation object '%s' but not in code:"
-msgstr ""
-"æÕÎËÃÉÉ ÉÌÉ ÍÅÔÏÄÙ ÉÓÐÏÌØÚÏ×ÁÎÙ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s', ÎÏ ÎÅ × ËÏÄÅ:"
+msgid "Functions or methods with usage in documentation object '%s' but not in code:"
+msgstr "æÕÎËÃÉÉ ÉÌÉ ÍÅÔÏÄÙ ÉÓÐÏÌØÚÏ×ÁÎÙ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s', ÎÏ ÎÅ × ËÏÄÅ:"
 
 msgid "Data with usage in documentation object '%s' but not in code:"
 msgstr "äÁÎÎÙÅ ÉÓÐÏÌØÚÏ×ÁÎÙ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s', ÎÏ ÎÅ × ËÏÄÅ:"
@@ -116,8 +110,7 @@
 msgstr "ä×ÏÊÎÙÅ ÚÁÐÉÓÉ \\ÁÒÇÕÍÅÎÔÏ× × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
 
 msgid "Documented arguments not in \\usage in documentation object '%s':"
-msgstr ""
-"äÏËÕÍÅÎÔÉÒÏ×ÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÎÅ \\ÉÓÐÏÌØÚÕÀÔÓÑ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
+msgstr "äÏËÕÍÅÎÔÉÒÏ×ÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÎÅ \\ÉÓÐÏÌØÚÕÀÔÓÑ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
 
 msgid "Objects in \\usage without \\alias in documentation object '%s':"
 msgstr "ïÂßÅËÔÙ \\ÉÓÐÏÌØÚÕÀÔÓÑ ÂÅÚ \\ÐÓÅ×ÄÏÎÉÍÁ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
@@ -126,8 +119,7 @@
 msgstr "îÁÚÎÁÞÅÎÉÅ × \\usage × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
 
 msgid "Bad \\usage lines found in documentation object '%s':"
-msgstr ""
-"îÁÊÄÅÎÏ ÎÅÐÒÁ×ÉÌØÎÏÅ \\ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÓÔÒÏË × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
+msgstr "îÁÊÄÅÎÏ ÎÅÐÒÁ×ÉÌØÎÏÅ \\ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÓÔÒÏË × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
 
 msgid "S3 methods shown with full name in documentation object '%s':"
 msgstr "íÅÔÏÄÙ S3 ÐÏËÁÚÁÎÙ Ó ÐÏÌÎÙÍ ÉÍÅÎÅÍ × ÏÂßÅËÔÁÈ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
@@ -164,16 +156,10 @@
 msgstr "ÎÁÊÄÅÎ T/F × %s"
 
 msgid "package name '%s' seems invalid; using directory name '%s' instead"
-msgstr ""
-"ÐÏÈÏÖÅ, ÞÔÏ ÉÍÑ ÐÁËÅÔÁ '%s' ÎÅÐÒÁ×ÉÌØÎÏÅ; ×ÍÅÓÔÏ ÎÅÇÏ ÉÓÐÏÌØÚÕÀ ÉÍÑ ÐÁÐËÉ "
-"'%s'"
+msgstr "ÐÏÈÏÖÅ, ÞÔÏ ÉÍÑ ÐÁËÅÔÁ '%s' ÎÅÐÒÁ×ÉÌØÎÏÅ; ×ÍÅÓÔÏ ÎÅÇÏ ÉÓÐÏÌØÚÕÀ ÉÍÑ ÐÁÐËÉ '%s'"
 
-msgid ""
-"Vignette dependencies (%s entries) must be contained in the DESCRIPTION "
-"Depends/Suggests/Imports entries."
-msgstr ""
-"úÁ×ÉÓÉÍÏÓÔÉ ÏÞÅÒËÁ (%s ÜÌÅÍÅÎÔÙ) ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØÓÑ × ÐÕÎËÔÁÈ 'Depends/"
-"Suggests/Imports' ÆÁÊÌÁ DESCRIPTION."
+msgid "Vignette dependencies (%s entries) must be contained in the DESCRIPTION Depends/Suggests/Imports entries."
+msgstr "úÁ×ÉÓÉÍÏÓÔÉ ÏÞÅÒËÁ (%s ÜÌÅÍÅÎÔÙ) ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØÓÑ × ÐÕÎËÔÁÈ 'Depends/Suggests/Imports' ÆÁÊÌÁ DESCRIPTION."
 
 msgid "Malformed package name"
 msgstr "ðÌÏÈÏÅ ÉÍÑ ÐÁËÅÔÁ"
@@ -200,18 +186,13 @@
 msgstr "ðÌÏÈÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÏÅ ÐÏÌÅ ÒÁÚÒÁÂÏÔÞÉËÁ."
 
 msgid "Malformed Depends or Suggests or Imports or Enhances field."
-msgstr ""
-"ðÌÏÈÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÏÅ ÐÏÌÅ Depends, ÉÌÉ Suggests, ÉÌÉ Imports, ÉÌÉ Enhances."
+msgstr "ðÌÏÈÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÏÅ ÐÏÌÅ Depends, ÉÌÉ Suggests, ÉÌÉ Imports, ÉÌÉ Enhances."
 
 msgid "Offending entries:"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÅ ÐÕÎËÔÙ:"
 
-msgid ""
-"Entries must be names of packages optionally followed by '<=' or '>=', white "
-"space, and a valid version number in parentheses."
-msgstr ""
-"ðÕÎËÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÉÍÅÎÁÍÉ ÐÁËÅÔÏ×, ×ÏÚÍÏÖÎÏ, Ó ÐÏÓÌÅÄÕÀÝÉÍÉ '<=' ÉÌÉ '>=', "
-"ÐÒÏÂÅÌÏÍ, É ÐÒÁ×ÉÌØÎÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ × ÓËÏÂËÁÈ."
+msgid "Entries must be names of packages optionally followed by '<=' or '>=', white space, and a valid version number in parentheses."
+msgstr "ðÕÎËÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÉÍÅÎÁÍÉ ÐÁËÅÔÏ×, ×ÏÚÍÏÖÎÏ, Ó ÐÏÓÌÅÄÕÀÝÉÍÉ '<=' ÉÌÉ '>=', ÐÒÏÂÅÌÏÍ, É ÐÒÁ×ÉÌØÎÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ × ÓËÏÂËÁÈ."
 
 msgid "Entries with infeasible comparison operator:"
 msgstr "ðÕÎËÔÙ Ó ÎÅÐÒÁ×ÄÏÐÏÄÏÂÎÙÍ ÏÐÅÒÁÔÏÒÏÍ ÓÒÁ×ÎÅÎÉÑ:"
@@ -222,43 +203,28 @@
 msgid "Entries with infeasible version number:"
 msgstr "ðÕÎËÔÙ Ó ÎÅÐÒÁ×ÄÏÐÏÄÏÂÎÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ:"
 
-msgid ""
-"Version numbers must be sequences of at least two non-negative integers, "
-"separated by single '.' or '-'."
-msgstr ""
-"îÏÍÅÒÁ ×ÅÒÓÉÉ ÄÏÌÖÎÙ ÂÙÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÑÍÉ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ Ä×ÕÈ "
-"ÎÅÏÔÒÉÃÁÔÅÌØÎÙÈ ÃÅÌÙÈ, ÒÁÚÄÅÌÅÎÎÙÈ ÏÄÎÏÊ ÔÏÞËÏÊ ÉÌÉ ÄÅÆÉÓÏÍ."
+msgid "Version numbers must be sequences of at least two non-negative integers, separated by single '.' or '-'."
+msgstr "îÏÍÅÒÁ ×ÅÒÓÉÉ ÄÏÌÖÎÙ ÂÙÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÑÍÉ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ Ä×ÕÈ ÎÅÏÔÒÉÃÁÔÅÌØÎÙÈ ÃÅÌÙÈ, ÒÁÚÄÅÌÅÎÎÙÈ ÏÄÎÏÊ ÔÏÞËÏÊ ÉÌÉ ÄÅÆÉÓÏÍ."
 
 msgid "Invalid VignetteBuilder field."
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ VignetteBuilder."
 
-msgid ""
-"This field must contain one or more packages (and no version requirement)."
-msgstr ""
-"üÔÏ ÐÏÌÅ ÄÏÌÖÎÏ ×ËÌÀÞÁÔØ ÏÄÉÎ ÉÌÉ ÂÏÌØÛÅ ÐÁËÅÔ (É ÎÅ ×ËÌÀÞÁÔØ ÔÒÅÂÏ×ÁÎÉÑ "
-"×ÅÒÓÉÉ)."
+msgid "This field must contain one or more packages (and no version requirement)."
+msgstr "üÔÏ ÐÏÌÅ ÄÏÌÖÎÏ ×ËÌÀÞÁÔØ ÏÄÉÎ ÉÌÉ ÂÏÌØÛÅ ÐÁËÅÔ (É ÎÅ ×ËÌÀÞÁÔØ ÔÒÅÂÏ×ÁÎÉÑ ×ÅÒÓÉÉ)."
 
 msgid "Invalid Priority field."
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ ÐÒÉ×ÉÌÅÇÉÊ."
 
-msgid ""
-"Packages with priorities 'base' or 'recommended' or 'defunct-base' must "
-"already be known to R."
-msgstr ""
-"ðÁËÅÔÙ Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ 'base' ÉÌÉ 'recommended' ÉÌÉ 'defunct-base' ÄÏÌÖÎÙ "
-"ÂÙÔØ ÕÖÅ ÉÚ×ÅÓÔÎÙ R."
+msgid "Packages with priorities 'base' or 'recommended' or 'defunct-base' must already be known to R."
+msgstr "ðÁËÅÔÙ Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ 'base' ÉÌÉ 'recommended' ÉÌÉ 'defunct-base' ÄÏÌÖÎÙ ÂÙÔØ ÕÖÅ ÉÚ×ÅÓÔÎÙ R."
 
 msgid "Malformed Title field: should not end in a period."
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ Title: ÎÅ ÄÏÌÖÎÏ ËÏÎÞÁÔØÓÑ ÔÏÞËÏÊ."
 
-msgid ""
-"Malformed Description field: should contain one or more complete sentences."
-msgstr ""
-"îÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ Description: ÄÏÌÖÎÏ ×ËÌÀÞÁÔØ ÏÄÎÏ ÉÌÉ ÂÏÌØÛÅ ÐÏÌÎÙÈ "
-"ÐÒÅÄÌÏÖÅÎÉÊ."
+msgid "Malformed Description field: should contain one or more complete sentences."
+msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÐÏÌÅ Description: ÄÏÌÖÎÏ ×ËÌÀÞÁÔØ ÏÄÎÏ ÉÌÉ ÂÏÌØÛÅ ÐÏÌÎÙÈ ÐÒÅÄÌÏÖÅÎÉÊ."
 
-msgid ""
-"See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual."
+msgid "See section 'The DESCRIPTION file' in the 'Writing R Extensions' manual."
 msgstr "óÍ. ÒÁÚÄÅÌ 'The DESCRIPTION file' ÒÕËÏ×ÏÄÓÔ×Á 'Writing R Extensions'."
 
 msgid "Malformed Authors@R field:"
@@ -279,12 +245,8 @@
 msgid "Authors@R field gives more than one person with maintainer role:"
 msgstr "÷ ÐÏÌÅ Authors@R -- ÂÏÌØÛÅ ÏÄÎÏÇÏ ÞÅÌÏ×ÅËÁ Ó ÒÏÌØÀ ÓÏÐÒÏ×ÏÖÄÁÀÝÅÇÏ:"
 
-msgid ""
-"Authors@R field gives no person with maintainer role, valid email address "
-"and non-empty name."
-msgstr ""
-"÷ ÐÏÌÅ Authors@R ÎÅÔ ÎÉËÏÇÏ × ÒÏÌÉ ÓÏÐÒÏ×ÏÖÄÁÀÝÅÇÏ, Ó ÁÄÒÅÓÏÍ ÜÌÅËÔÒÏÎÎÏÊ "
-"ÐÏÞÔÙ É ÎÅÐÕÓÔÙÍ ÉÍÅÎÅÍ."
+msgid "Authors@R field gives no person with maintainer role, valid email address and non-empty name."
+msgstr "÷ ÐÏÌÅ Authors@R ÎÅÔ ÎÉËÏÇÏ × ÒÏÌÉ ÓÏÐÒÏ×ÏÖÄÁÀÝÅÇÏ, Ó ÁÄÒÅÓÏÍ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ É ÎÅÐÕÓÔÙÍ ÉÍÅÎÅÍ."
 
 msgid "Encoding '%s' is not portable"
 msgstr "ëÏÄÉÒÏ×ËÁ '%s' ÎÅ ÐÅÒÅÎÏÓÉÍÁ"
@@ -319,12 +281,8 @@
 msgid "Variables overriding user/site settings:"
 msgstr "ðÅÒÅÍÅÎÎÙÅ ÐÅÒÅÐÉÓÙ×ÁÀÔ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÅ ÕÓÔÁÎÏ×ËÉ:"
 
-msgid ""
-"package %s exists but was not installed under R >= 2.10.0 so xrefs cannot be "
-"checked"
-msgstr ""
-"ÐÁËÅÔ %s × ÎÁÌÉÞÉÉ, ÎÏ ÎÅ ÂÙÌ ÕÓÔÁÎÏ×ÌÅÎ ÐÏÄ R >= 2.10.0, ÐÏÜÔÏÍÕ xrefs ÎÅ "
-"ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ"
+msgid "package %s exists but was not installed under R >= 2.10.0 so xrefs cannot be checked"
+msgstr "ÐÁËÅÔ %s × ÎÁÌÉÞÉÉ, ÎÏ ÎÅ ÂÙÌ ÕÓÔÁÎÏ×ÌÅÎ ÐÏÄ R >= 2.10.0, ÐÏÜÔÏÍÕ xrefs ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ"
 
 msgid "Missing link or links in documentation object '%s':"
 msgstr "ðÒÏÐÕÝÅÎÎÁÑ Ó×ÑÚØ ÉÌÉ Ó×ÑÚÉ Ó ÏÂßÅËÔÏÍ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
@@ -341,19 +299,14 @@
 msgid "%s calls:"
 msgstr "%s ×ÙÚÙ×ÁÅÔ:"
 
-msgid ""
-"Package startup functions should have two arguments with names starting with "
-"%s and %s, respectively."
-msgstr ""
-"óÔÁÒÔÏ×ÙÅ ÆÕÎËÃÉÉ ÐÁËÅÔÁ ÄÏÌÖÎÙ ÉÍÅÔØ Ä×Á ÁÒÇÕÍÅÎÔÁ Ó ÉÍÅÎÁÍÉ, ÎÁÞÉÎÁÀÝÉÍÉÓÑ "
-"Ó %s É %s, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ."
+msgid "Package startup functions should have two arguments with names starting with %s and %s, respectively."
+msgstr "óÔÁÒÔÏ×ÙÅ ÆÕÎËÃÉÉ ÐÁËÅÔÁ ÄÏÌÖÎÙ ÉÍÅÔØ Ä×Á ÁÒÇÕÍÅÎÔÁ Ó ÉÍÅÎÁÍÉ, ÎÁÞÉÎÁÀÝÉÍÉÓÑ Ó %s É %s, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ."
 
 msgid "Package startup functions should not change the search path."
 msgstr "óÔÁÒÔÏ×ÙÅ ÆÕÎËÃÉÉ ÐÁËÅÔÁ ÎÅ ÄÏÌÖÎÙ ÍÅÎÑÔØ ÐÕÔØ ÐÏÉÓËÁ."
 
 msgid "Package startup functions should use %s to generate messages."
-msgstr ""
-"óÔÁÒÔÏ×ÙÅ ÆÕÎËÃÉÉ ÐÁËÅÔÁ ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ %s ÄÌÑ ÓÏÚÄÁÎÉÑ ÓÏÏÂÝÅÎÉÊ."
+msgstr "óÔÁÒÔÏ×ÙÅ ÆÕÎËÃÉÉ ÐÁËÅÔÁ ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ %s ÄÌÑ ÓÏÚÄÁÎÉÑ ÓÏÏÂÝÅÎÉÊ."
 
 msgid "Package startup functions should not call %s."
 msgstr "óÔÁÒÔÏ×ÙÅ ÆÕÎËÃÉÉ ÐÁËÅÔÁ ÎÅ ÄÏÌÖÎÙ ×ÙÚÙ×ÁÔØ %s."
@@ -361,11 +314,8 @@
 msgid "See section %s in '%s'."
 msgstr "óÍ. ÒÁÚÄÅÌ %s × '%s'."
 
-msgid ""
-"Package detach functions should have one argument with name starting with %s."
-msgstr ""
-"æÕÎËÃÉÉ ÏÔÓÏÅÄÉÎÅÎÉÑ ÐÁËÅÔÁ ÄÏÌÖÎÙ ÉÍÅÔØ ÏÄÉÎ ÁÒÇÕÍÅÎÔ Ó ÉÍÅÎÅÍ, "
-"ÎÁÞÉÎÁÀÝÉÍÓÑ Ó %s."
+msgid "Package detach functions should have one argument with name starting with %s."
+msgstr "æÕÎËÃÉÉ ÏÔÓÏÅÄÉÎÅÎÉÑ ÐÁËÅÔÁ ÄÏÌÖÎÙ ÉÍÅÔØ ÏÄÉÎ ÁÒÇÕÍÅÎÔ Ó ÉÍÅÎÅÍ, ÎÁÞÉÎÁÀÝÉÍÓÑ Ó %s."
 
 msgid "Package detach functions should not call %s."
 msgstr "æÕÎËÃÉÉ ÏÔÓÏÅÄÉÎÅÎÉÑ ÐÁËÅÔÁ ÎÅ ÄÏÌÖÎÙ ×ÙÚÙ×ÁÔØ %s."
@@ -398,11 +348,9 @@
 msgstr "×ÙÚÏ× 'loadNamespace' ÉÌÉ 'requireNamespace' ÎÅ ÏÐÒÅÄÅÌÅÎÙ ÉÚ: %s"
 
 msgid "'library' or 'require' calls to packages already attached by Depends:"
-msgstr ""
-"'library' ÉÌÉ 'require' ×ÙÚÙ×ÁÅÔ ÐÁËÅÔÙ, ÕÖÅ ÐÒÉÓÏÅÄÉÎÅÎÎÙÅ ÉÚ Depends:"
+msgstr "'library' ÉÌÉ 'require' ×ÙÚÙ×ÁÅÔ ÐÁËÅÔÙ, ÕÖÅ ÐÒÉÓÏÅÄÉÎÅÎÎÙÅ ÉÚ Depends:"
 
-msgid ""
-"'library' or 'require' call to %s which was already attached by Depends."
+msgid "'library' or 'require' call to %s which was already attached by Depends."
 msgstr "'library' ÉÌÉ 'require' ×ÙÚÙ×ÁÅÔ %s, ÕÖÅ ÐÒÉÓÏÅÄÉÎÅÎÎÙÊ ÉÚ Depends:"
 
 msgid "'library' or 'require' calls in package code:"
@@ -475,9 +423,7 @@
 msgstr "þÁÓÔÉ ÁÒÇÕÍÅÎÔÁ ÂÅÚ ÏÐÒÅÄÅÌÅÎÉÑ × Rd ÏÂßÅËÔÅ '%s':"
 
 msgid "Auto-generated content requiring editing in Rd object '%s':"
-msgstr ""
-"á×ÔÏÍÁÔÉÞÅÓËÉÅ ÓÇÅÎÅÒÉÒÏ×ÁÎÎÏÅ ÓÏÄÅÒÖÁÎÉÅ ÔÒÅÂÕÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ × ÏÂÂßÅËÔÅ "
-"Rd '%s':"
+msgstr "á×ÔÏÍÁÔÉÞÅÓËÉÅ ÓÇÅÎÅÒÉÒÏ×ÁÎÎÏÅ ÓÏÄÅÒÖÁÎÉÅ ÔÒÅÂÕÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ × ÏÂÂßÅËÔÅ Rd '%s':"
 
 msgid "no Rd sections specified"
 msgstr "ÎÅ ÕËÁÚÁÎÙ ÒÁÚÄÅÌÙ Rd"
@@ -505,8 +451,7 @@
 msgstr "Rd-ÆÁÊÌÙ ÄÏÌÖÎÙ ÉÍÅÔØ ÎÅÐÕÓÔÏÅ %s."
 
 msgid "See chapter 'Writing R documentation' in manual 'Writing R Extensions'."
-msgstr ""
-"óÍ. ÇÌÁ×Õ 'Writing R documentation' × ÒÕËÏ×ÏÄÓÔ×Å 'Writing R Extensions'."
+msgstr "óÍ. ÇÌÁ×Õ 'Writing R documentation' × ÒÕËÏ×ÏÄÓÔ×Å 'Writing R Extensions'."
 
 msgid "missing/empty \\title field in '%s'"
 msgstr "ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ ÐÏÌÅ \\ÚÁÇÏÌÏ×ÏË × '%s'"
@@ -580,19 +525,11 @@
 msgid "Vignette product %s does not have a known filename extension (%s)"
 msgstr "ðÒÏÄÕËÔ ÏÞÅÒËÁ %s ÎÅ ÉÍÅÅÔ ÉÚ×ÅÓÔÎÏÇÏ ÒÁÓÛÉÒÅÎÉÑ ÆÁÊÌÁ (%s)"
 
-msgid ""
-"Failed to locate the %s output file (by engine %s) for vignette with name "
-"%s. The following files exist in directory %s: %s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ %s ×ÙÈÏÄÎÏÊ ÆÁÊÌ (ÐÏÓÒÅÄÓÔ×ÏÍ %s) ÄÌÑ ÏÞÅÒËÁ Ó ÉÍÅÎÅÍ %s. "
-"÷ÏÔ ËÁËÉÅ ÆÁÊÌÙ ÅÓÔØ × ÐÁÐËÅ %s: %s"
+msgid "Failed to locate the %s output file (by engine %s) for vignette with name %s. The following files exist in directory %s: %s"
+msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ %s ×ÙÈÏÄÎÏÊ ÆÁÊÌ (ÐÏÓÒÅÄÓÔ×ÏÍ %s) ÄÌÑ ÏÞÅÒËÁ Ó ÉÍÅÎÅÍ %s. ÷ÏÔ ËÁËÉÅ ÆÁÊÌÙ ÅÓÔØ × ÐÁÐËÅ %s: %s"
 
-msgid ""
-"Located more than one %s output file (by engine %s) for vignette with name "
-"%s: %s"
-msgstr ""
-"îÁÊÄÅÎ ÂÏÌÅÅ ÞÅÍ ÏÄÉÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ %s (ÐÏÓÒÅÄÓÔ×ÏÍ %s) ÄÌÑ ÏÞÅÒËÁ Ó ÉÍÅÎÅÍ "
-"%s: %s"
+msgid "Located more than one %s output file (by engine %s) for vignette with name %s: %s"
+msgstr "îÁÊÄÅÎ ÂÏÌÅÅ ÞÅÍ ÏÄÉÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ %s (ÐÏÓÒÅÄÓÔ×ÏÍ %s) ÄÌÑ ÏÞÅÒËÁ Ó ÉÍÅÎÅÍ %s: %s"
 
 msgid "unable to create temp directory %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÕÀ ÐÁÐËÕ %s"
@@ -606,12 +543,8 @@
 msgid "Vignette %s overwrites the following %s output by vignette %s: %s"
 msgstr "ïÞÅÒË %s ÐÅÒÅÐÉÓÙ×ÁÅÔ ×Ù×ÏÄ %s ÏÔ ÏÞÅÒËÁ %s: %s"
 
-msgid ""
-"Detected vignette source files (%s) with shared names (%s) and therefore "
-"risking overwriting each others output files"
-msgstr ""
-"ïÂÎÁÒÕÖÅÎÙ ÉÓÈÏÄÎÙÅ ÆÁÊÌÙ ÏÞÅÒËÁ (%s) Ó ÏÂÝÉÍÉ ÉÍÅÎÁÍÉ (%s) É ÐÏÜÔÏÍÕ ÅÓÔØ "
-"ÒÉÓË ÐÅÒÅÐÉÓÙ×ÁÎÉÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ× ÄÒÕÇ ÄÒÕÇÁ"
+msgid "Detected vignette source files (%s) with shared names (%s) and therefore risking overwriting each others output files"
+msgstr "ïÂÎÁÒÕÖÅÎÙ ÉÓÈÏÄÎÙÅ ÆÁÊÌÙ ÏÞÅÒËÁ (%s) Ó ÏÂÝÉÍÉ ÉÍÅÎÁÍÉ (%s) É ÐÏÜÔÏÍÕ ÅÓÔØ ÒÉÓË ÐÅÒÅÐÉÓÙ×ÁÎÉÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ× ÄÒÕÇ ÄÒÕÇÁ"
 
 msgid ""
 "processing vignette '%s' failed with diagnostics:\n"
@@ -634,8 +567,7 @@
 msgstr "ÆÁÊÌ '%s' ÎÅ ÎÁÊÄÅÎ"
 
 msgid "vignette filename '%s' does not match any of the '%s' filename patterns"
-msgstr ""
-"ÉÍÑ ÆÁÊÌÁ ÏÞÅÒËÁ '%s' ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÉËÁËÏÍÕ ÉÚ '%s' ÐÁÔÔÅÒÎÏ× ÉÍÅÎ ÆÁÊÌÁ"
+msgstr "ÉÍÑ ÆÁÊÌÁ ÏÞÅÒËÁ '%s' ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÉËÁËÏÍÕ ÉÚ '%s' ÐÁÔÔÅÒÎÏ× ÉÍÅÎ ÆÁÊÌÁ"
 
 msgid "In '%s' vignettes '%s' and '%s' have the same vignette name"
 msgstr "óÒÅÄÉ ÍÉÎÉÁÔÀÒ '%s' '%s' É '%s' ÉÍÅÀÔ ÏÄÉÎÁËÏ×ÙÅ ÉÍÅÎÁ"
@@ -682,11 +614,8 @@
 msgid "cannot open directory '%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÐÁÐËÕ '%s'"
 
-msgid ""
-"WARNING: omitting pointless dependence on 'R' without a version requirement"
-msgstr ""
-"ðòåäõðòåöäåîéå: ÐÒÏÂÕÓËÁÀ ÂÅÓÓÍÙÓÌÅÎÎÕÀ ÚÁ×ÉÓÉÍÏÓÔØ ÏÔ 'R' ÂÅÚ ÕËÁÚÁÎÉÑ "
-"ÔÒÅÂÕÅÍÏÊ ×ÅÒÓÉÉ"
+msgid "WARNING: omitting pointless dependence on 'R' without a version requirement"
+msgstr "ðòåäõðòåöäåîéå: ÐÒÏÂÕÓËÁÀ ÂÅÓÓÍÙÓÌÅÎÎÕÀ ÚÁ×ÉÓÉÍÏÓÔØ ÏÔ 'R' ÂÅÚ ÕËÁÚÁÎÉÑ ÔÒÅÂÕÅÍÏÊ ×ÅÒÓÉÉ"
 
 msgid "cannot turn off locale-specific sorting via LC_COLLATE"
 msgstr "ÎÅ ÍÏÇÕ ×ËÌÀÞÉÔØ ÌÏËÁÌØ-ÓÐÅÃÉÆÉÞÎÕÀ ÓÏÒÔÉÒÏ×ËÕ ÞÅÒÅÚ LC_COLLATE"
@@ -849,11 +778,8 @@
 msgid "URL %s was not found"
 msgstr "URL %s ÎÅ ÎÁÊÄÅÎ"
 
-msgid ""
-"Only help files, %s, %s and files under %s and %s in a package can be viewed"
-msgstr ""
-"ôÏÌØËÏ ÆÁÊÌÙ ÐÏÍÏÝÉ, %s, %s É ÆÁÊÌÙ ×ÎÕÔÒÉ %s É %s × ÐÁËÅÔÅ ÍÏÇÕÔ ÂÙÔØ "
-"ÐÒÏÓÍÏÔÒÅÎÙ"
+msgid "Only help files, %s, %s and files under %s and %s in a package can be viewed"
+msgstr "ôÏÌØËÏ ÆÁÊÌÙ ÐÏÍÏÝÉ, %s, %s É ÆÁÊÌÙ ×ÎÕÔÒÉ %s É %s × ÐÁËÅÔÅ ÍÏÇÕÔ ÂÙÔØ ÐÒÏÓÍÏÔÒÅÎÙ"
 
 msgid "unsupported URL %s"
 msgstr "ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ URL %s"
@@ -888,12 +814,8 @@
 msgid "this seems to be a bundle -- and they are defunct"
 msgstr "ÐÏÈÏÖÅ, ÞÔÏ ÜÔÏ ÓÂÏÒÎÉË -- ÏÎÉ ÏÔËÌÀÞÅÎÙ"
 
-msgid ""
-"'cleanup' exists but is not executable -- see the 'R Installation and "
-"Administration Manual'"
-msgstr ""
-"'cleanup' ÅÓÔØ, ÎÏ ÅÇÏ ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ  -- ÓÍÏÔÒÉÔÅ 'R Installation and "
-"Adminstration Manual'"
+msgid "'cleanup' exists but is not executable -- see the 'R Installation and Administration Manual'"
+msgstr "'cleanup' ÅÓÔØ, ÎÏ ÅÇÏ ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ  -- ÓÍÏÔÒÉÔÅ 'R Installation and Adminstration Manual'"
 
 msgid "generating debug symbols (%s)"
 msgstr "ÓÏÚÄÁÀ ÓÉÍ×ÏÌÙ ÏÔÌÁÄËÉ (%s)"
@@ -904,11 +826,8 @@
 msgid "package %s successfully unpacked and MD5 sums checked"
 msgstr "ÐÁËÅÔ %s ÕÄÁÞÎÏ ÒÁÓÐÁËÏ×ÁÎ, MD5 sums ÐÒÏ×ÅÒÅÎÙ"
 
-msgid ""
-"R include directory is empty -- perhaps need to install R-devel.rpm or "
-"similar"
-msgstr ""
-"÷ËÌÀÞÁÅÍÁÑ ÐÁÐËÁ R ÐÕÓÔÁ -- ×ÏÚÍÏÖÎÏ, ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ R-devel.rpm ÉÌÉ ÐÏÈÏÖÅÅ"
+msgid "R include directory is empty -- perhaps need to install R-devel.rpm or similar"
+msgstr "÷ËÌÀÞÁÅÍÁÑ ÐÁÐËÁ R ÐÕÓÔÁ -- ×ÏÚÍÏÖÎÏ, ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ R-devel.rpm ÉÌÉ ÐÏÈÏÖÅÅ"
 
 msgid "package %s %s was found, but %s %s is required by %s"
 msgstr "ÐÁËÅÔ %s %s ÎÅ ÎÁÊÄÅÎ ÎÏ %s %s ÎÕÖÅÎ ÄÌÑ %s"
@@ -945,6 +864,9 @@
 "  %s\n"
 "for details."
 msgstr ""
+"ðÏÄÒÏÂÎÏÓÔÉ ÓÍ. ×\n"
+"  %s\n"
+"."
 
 msgid "there is no package called '%s'"
 msgstr "ÎÅÔ ÐÁËÅÔÁ ÐÏ ÉÍÅÎÉ '%s'"
@@ -965,8 +887,7 @@
 msgstr "ÉÓÈÏÄÎÉË ÄÏÌÖÅÎ ÂÙÔØ ÏËÒÕÖÅÎÉÅÍ ÉÌÉ ÓÐÉÓËÏÍ"
 
 msgid "invalid value for 'compress': should be FALSE, TRUE, 2 or 3"
-msgstr ""
-"ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ 'compress': ÍÏÖÅÔ ÂÙÔØ ÏÄÎÏ ÉÚ FALSE, TRUE, 2 ÉÌÉ 3"
+msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ 'compress': ÍÏÖÅÔ ÂÙÔØ ÏÄÎÏ ÉÚ FALSE, TRUE, 2 ÉÌÉ 3"
 
 msgid "this cannot be used for package 'base'"
 msgstr "ÜÔÏ ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÁËÅÔÁ 'base'"
@@ -988,8 +909,7 @@
 msgstr "÷ ÉÓÐÏÌØÚÕÅÍÏÍ ÆÏÒÍÁÔÅ, ÐÏÈÏÖÅÍ ÎÁ ÓÔÁÒÙÊ R, ÎÅÔ ÎÏ×ÏÓÔÅÊ."
 
 msgid "No news found in given file using package default format."
-msgstr ""
-"÷ ÐÏÌÕÞÅÎÎÏÍ ÆÁÊÌÅ ÎÅÔ ÎÏ×ÏÓÔÅÊ, ÅÓÌÉ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÏÒÍÁÔ ÐÏ ÕÍÏÌÞÁÎÉÀ."
+msgstr "÷ ÐÏÌÕÞÅÎÎÏÍ ÆÁÊÌÅ ÎÅÔ ÎÏ×ÏÓÔÅÊ, ÅÓÌÉ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÏÒÍÁÔ ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
 msgid "Could not extract news from the following text chunks:"
 msgstr "îÅ ÍÏÇÕ ÏÔÄÅÌÉÔØ ÎÏ×ÏÓÔÉ ÏÔ ÓÌÅÄÕÀÝÉÈ ÔÅËÓÔÏ×ÙÈ ÅÄÉÎÉÃ:"
@@ -1283,16 +1203,11 @@
 msgstr[1] "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ T ÉÌÉ F × ÓÌÅÄÕÀÝÉÈ ÆÕÎËÃÉÑÈ:"
 msgstr[2] "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ T ÉÌÉ F × ÓÌÅÄÕÀÝÉÈ ÆÕÎËÃÉÑÈ:"
 
-msgid ""
-"Found possibly global 'T' or 'F' in the examples of the following Rd file:"
-msgid_plural ""
-"Found possibly global 'T' or 'F' in the examples of the following Rd files:"
-msgstr[0] ""
-"îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ 'T' ÉÌÉ 'F' × ÓÌÅÄÕÀÝÅÍ Rd-ÆÁÊÌÅ ÐÒÉÍÅÒÏ×:"
-msgstr[1] ""
-"îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ 'T' ÉÌÉ 'F' × ÓÌÅÄÕÀÝÉÈ Rd-ÆÁÊÌÁÈ ÐÒÉÍÅÒÏ×:"
-msgstr[2] ""
-"îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ 'T' ÉÌÉ 'F' × ÓÌÅÄÕÀÝÉÈ Rd-ÆÁÊÌÁÈ ÐÒÉÍÅÒÏ×:"
+msgid "Found possibly global 'T' or 'F' in the examples of the following Rd file:"
+msgid_plural "Found possibly global 'T' or 'F' in the examples of the following Rd files:"
+msgstr[0] "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ 'T' ÉÌÉ 'F' × ÓÌÅÄÕÀÝÅÍ Rd-ÆÁÊÌÅ ÐÒÉÍÅÒÏ×:"
+msgstr[1] "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ 'T' ÉÌÉ 'F' × ÓÌÅÄÕÀÝÉÈ Rd-ÆÁÊÌÁÈ ÐÒÉÍÅÒÏ×:"
+msgstr[2] "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ 'T' ÉÌÉ 'F' × ÓÌÅÄÕÀÝÉÈ Rd-ÆÁÊÌÁÈ ÐÒÉÍÅÒÏ×:"
 
 msgid "Found a .Internal call in the following function:"
 msgid_plural "Found .Internal calls in the following functions:"
@@ -1307,53 +1222,28 @@
 msgstr[2] "îÁÊÄÅÎÙ ×ÙÚÏ×Ù .Internal × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ S4-ÏÂÝÉÈ ÆÕÎËÃÉÊ:"
 
 msgid "Found a .Internal call in methods for the following reference class:"
-msgid_plural ""
-"Found .Internal calls in methods for the following reference classes:"
+msgid_plural "Found .Internal calls in methods for the following reference classes:"
 msgstr[0] "îÁÊÄÅÎ ×ÙÚÏ× .Internal × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÅÇÏ ËÌÁÓÓÁ ÓÓÙÌÏË:"
 msgstr[1] "îÁÊÄÅÎÙ ×ÙÚÏ×Ù .Internal × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ ËÌÁÓÓÏ× ÓÓÙÌÏË:"
 msgstr[2] "îÁÊÄÅÎÙ ×ÙÚÏ×Ù .Internal × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ ËÌÁÓÓÏ× ÓÓÙÌÏË:"
 
 msgid "Found an obsolete/platform-specific call in the following function:"
-msgid_plural ""
-"Found an obsolete/platform-specific call in the following functions:"
-msgstr[0] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÓÌÅÄÕÀÝÅÊ ÆÕÎËÃÉÉ:"
-msgstr[1] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÓÌÅÄÕÀÝÉÈ ÆÕÎËÃÉÑÈ:"
-msgstr[2] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÓÌÅÄÕÀÝÉÈ ÆÕÎËÃÉÑÈ:"
-
-msgid ""
-"Found an obsolete/platform-specific call in methods for the following S4 "
-"generic:"
-msgid_plural ""
-"Found an obsolete/platform-specific call in methods for the following S4 "
-"generics:"
-msgstr[0] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÅÊ S4-"
-"ÏÂÝÅÊ ÆÕÎËÃÉÉ:"
-msgstr[1] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ S4-"
-"ÏÂÝÉÈ ÆÕÎËÃÉÊ:"
-msgstr[2] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ S4-"
-"ÏÂÝÉÈ ÆÕÎËÃÉÊ:"
-
-msgid ""
-"Found an obsolete/platform-specific call in methods for the following "
-"reference class:"
-msgid_plural ""
-"Found an obsolete/platform-specific call in methods for the following "
-"reference classes:"
-msgstr[0] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÅÇÏ "
-"ËÌÁÓÓÁ ÓÓÙÌÏË:"
-msgstr[1] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ "
-"ËÌÁÓÓÏ× ÓÓÙÌÏË:"
-msgstr[2] ""
-"îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ "
-"ËÌÁÓÓÏ× ÓÓÙÌÏË:"
+msgid_plural "Found an obsolete/platform-specific call in the following functions:"
+msgstr[0] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÓÌÅÄÕÀÝÅÊ ÆÕÎËÃÉÉ:"
+msgstr[1] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÓÌÅÄÕÀÝÉÈ ÆÕÎËÃÉÑÈ:"
+msgstr[2] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÓÌÅÄÕÀÝÉÈ ÆÕÎËÃÉÑÈ:"
+
+msgid "Found an obsolete/platform-specific call in methods for the following S4 generic:"
+msgid_plural "Found an obsolete/platform-specific call in methods for the following S4 generics:"
+msgstr[0] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÅÊ S4-ÏÂÝÅÊ ÆÕÎËÃÉÉ:"
+msgstr[1] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ S4-ÏÂÝÉÈ ÆÕÎËÃÉÊ:"
+msgstr[2] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ S4-ÏÂÝÉÈ ÆÕÎËÃÉÊ:"
+
+msgid "Found an obsolete/platform-specific call in methods for the following reference class:"
+msgid_plural "Found an obsolete/platform-specific call in methods for the following reference classes:"
+msgstr[0] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÅÇÏ ËÌÁÓÓÁ ÓÓÙÌÏË:"
+msgstr[1] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ ËÌÁÓÓÏ× ÓÓÙÌÏË:"
+msgstr[2] "îÁÊÄÅÎ ÕÓÔÁÒÅ×ÛÉÊ/ÓÐÅÃÉÆÉÞÅÓËÉÊ ÄÌÑ ÐÌÁÔÆÏÒÍÙ ×ÙÚÏ× × ÍÅÔÏÄÁÈ ÓÌÅÄÕÀÝÉÈ ËÌÁÓÓÏ× ÓÓÙÌÏË:"
 
 msgid "Found the deprecated function:"
 msgid_plural "Found the deprecated functions:"
@@ -1380,19 +1270,24 @@
 msgstr[2] "ïÂÝÉÅ ÆÕÎËÃÉÉ ÂÅÚ ËÁËÉÈ-ÌÉÂÏ ÍÅÔÏÄÏ× × %s: %s"
 
 msgid ""
-"missing/empty \\name field in Rd file\n"
+"missing/empty \\n"
+"ame field in Rd file\n"
 "%s"
 msgid_plural ""
-"missing/empty \\name field in Rd files\n"
+"missing/empty \\n"
+"ame field in Rd files\n"
 "%s"
 msgstr[0] ""
-"ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ \\nÐÏÌÅ ÉÍÅÎÉ × Rd-ÆÁÊÌÅ\n"
+"ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ \\n"
+"ÐÏÌÅ ÉÍÅÎÉ × Rd-ÆÁÊÌÅ\n"
 "%s"
 msgstr[1] ""
-"ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ \\nÐÏÌÅ ÉÍÅÎÉ × Rd-ÆÁÊÌÁÈ\n"
+"ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ \\n"
+"ÐÏÌÅ ÉÍÅÎÉ × Rd-ÆÁÊÌÁÈ\n"
 "%s"
 msgstr[2] ""
-"ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ \\nÐÏÌÅ ÉÍÅÎÉ × Rd-ÆÁÊÌÁÈ\n"
+"ÐÒÏÐÕÝÅÎÎÏÅ/ÐÕÓÔÏÅ \\n"
+"ÐÏÌÅ ÉÍÅÎÉ × Rd-ÆÁÊÌÁÈ\n"
 "%s"
 
 msgid "unable to re-encode %s line %s"
@@ -1425,27 +1320,22 @@
 msgstr[1] "%d ÉÚ ÔÅÓÔÁ ÐÁËÅÔÁ ÎÅ ÕÄÁÌÉÓØ"
 msgstr[2] "%d ÉÚ ÔÅÓÔÁ ÐÁËÅÔÁ ÎÅ ÕÄÁÌÉÓØ"
 
+#~ msgid "Reading %s failed with message: %s"
+#~ msgstr "þÔÅÎÉÅ %s ÎÅ ÕÄÁÌÏÓØ Ó ÓÏÏÂÝÅÎÉÅÍ: %s"
 #~ msgid "assertCondition: caught %s"
 #~ msgstr "assertCondition: ÚÁÈ×ÁÞÅÎÏ %s"
-
 #~ msgid ","
 #~ msgstr ","
-
 #~ msgid "installing dependencies %s"
 #~ msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÚÁ×ÉÓÉÍÏÓÔÉ %s"
-
 #~ msgid "%s"
 #~ msgstr "%s"
-
 #~ msgid ":"
 #~ msgstr ":"
-
 #~ msgid "latin1"
 #~ msgstr "latin1"
-
 #~ msgid "ASCII"
 #~ msgstr "ASCII"
-
 #~ msgid "byte"
 #~ msgstr "ÂÁÊÔ"
 
@@ -1459,95 +1349,66 @@
 #, fuzzy
 #~ msgid "Inconsistent encoding specifications: %s with %%\\SweaveUTF8"
 #~ msgstr "îÅÓÔÁÎÄÁÒÔÎÁÑ ÌÉÃÅÎÚÉÑ:"
-
 #~ msgid "argument 'file' must be a character string or connection"
 #~ msgstr "ÁÒÇÕÍÅÎÔ 'file' ÄÏÌÖÅÎ ÂÙÔØ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ  ÉÌÉ ÓÏÅÄÉÎÅÎÉÅÍ"
-
 #~ msgid "to logical"
 #~ msgstr "× ÌÏÇÉÞÅÓËÉÊ"
-
 #~ msgid "Vignette product"
 #~ msgstr "ðÒÏÄÕËÔ ÍÉÎÉÁÔÀÒÙ"
-
 #~ msgid ")"
 #~ msgstr ")"
-
 #~ msgid "Failed to locate the"
 #~ msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ"
-
 #~ msgid "output file (by engine"
 #~ msgstr "ÆÁÊÌ ×Ù×ÏÄÁ (× ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÕÓÔÒÏÊÓÔ×ÏÍ"
-
 #~ msgid "%s::%s"
 #~ msgstr "%s::%s"
-
 #~ msgid ") for vignette with name"
 #~ msgstr ") ÄÌÑ ÏÞÅÒËÁ Ó ÉÍÅÎÅÍ"
-
 #~ msgid ". The following files exists in directory"
 #~ msgstr ". óÌÅÄÕÀÝÉÅ ÆÁÊÌÙ ÅÓÔØ × ÐÁÐËÅ"
-
 #~ msgid "Located more than one"
 #~ msgstr "îÁÛÅÌ ÂÏÌØÛÅ ÏÄÎÏÇÏ"
-
 #~ msgid "Vignette"
 #~ msgstr "íÉÎÉÁÔÀÒÁ"
-
 #~ msgid "overwrites the following"
 #~ msgstr "ÐÅÒÅÐÉÓÙ×ÁÅÔ ÓÌÅÄÕÀÝÅÅ"
-
 #~ msgid "output by vignette"
 #~ msgstr "×Ù×ÏÄ ÏÞÅÒËÁ"
-
 #~ msgid "Detected vignette source files ("
 #~ msgstr "ïÂÎÁÒÕÖÅÎÙ ÉÓÈÏÄÎÉËÉ ÏÞÅÒËÁ ("
-
 #~ msgid ") with shared names ("
 #~ msgstr ") Ó ÏÂÝÉÍÉ ÉÍÅÎÁÍÉ ("
-
 #~ msgid "None of packages"
 #~ msgstr "îÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ×"
-
 #~ msgid "Vignette engine"
 #~ msgstr "õÓÔÒÏÊÓÔ×Ï ÏÞÅÒËÁ"
-
 #~ msgid "is not registered"
 #~ msgstr "ÎÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÏ"
-
 #~ msgid "Engine name"
 #~ msgstr "éÍÑ ÕÓÔÒÏÊÓÔ×Á"
-
 #~ msgid "and package"
 #~ msgstr "É ÐÁËÅÔ"
-
 #~ msgid "do not match"
 #~ msgstr "ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ"
-
 #~ msgid "Argument"
 #~ msgstr "áÒÇÕÍÅÎÔ"
-
 #~ msgid "weave"
 #~ msgstr "weave"
-
 #~ msgid "tangle"
 #~ msgstr "tangle"
-
 #~ msgid "pattern"
 #~ msgstr "ÐÁÔÔÅÒÎ"
-
 #~ msgid "Cannot change the"
 #~ msgstr "îÅ ÍÏÇÕ ÉÚÍÅÎÉÔØ ÆÁÊÌ"
-
 #~ msgid "Sweave"
 #~ msgstr "Sweave"
-
 #~ msgid "'file' must be a character string or connection"
 #~ msgstr "'file' ÄÏÌÖÅÎ ÂÙÔØ ÔÅËÓÔÏ×ÏÊ ÓÔÒÏËÏÊ ÉÌÉ ÓÏÅÄÉÎÅÎÉÅÍ"
 
 #, fuzzy
 #~ msgid "not found"
 #~ msgstr "ÎÅ ÎÁÊÄÅÎ"
-
 #~ msgid "found %s"
 #~ msgstr "ÎÁÊÄÅÎ %s"
 
@@ -1598,231 +1459,164 @@
 #~ "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ T ÉÌÉ F × ÓÌÅÄÕÀÝÉÈ Rd-ÆÁÊÌÁÈ ÐÒÉÍÅÒÏ×:"
 #~ msgstr[2] ""
 #~ "îÁÊÄÅÎÙ ×ÏÚÍÏÖÎÙÅ ÇÌÏÂÁÌØÎÙÅ T ÉÌÉ F × ÓÌÅÄÕÀÝÉÈ Rd-ÆÁÊÌÁÈ ÐÒÉÍÅÒÏ×:"
-
 #~ msgid "name"
 #~ msgstr "ÉÍÑ"
-
 #~ msgid "code"
 #~ msgstr "ËÏÄ"
-
 #~ msgid "docs"
 #~ msgstr "ÄÏËÕÍÅÎÔÙ"
 
 #, fuzzy
 #~ msgid "\\VignetteDepends{}"
 #~ msgstr "íÉÎÉÁÔÀÒÙ:"
-
 #~ msgid "Invalid package name."
 #~ msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÐÁËÅÔÁ."
-
 #~ msgid "This is the name of a base package."
 #~ msgstr "üÔÏ ÉÍÑ ÂÁÚÏ×ÏÇÏ ÐÁËÅÔÁ."
-
 #~ msgid "This name was used for a base package and is remapped by library()."
 #~ msgstr ""
 #~ "üÔÏ ÉÍÑ ÉÓÐÏÌØÚÏ×ÁÎÏ ÂÁÚÏ×ÙÍ ÐÁËÅÔÏÍ É Ó×ÑÚÁÎÏ ÚÁÎÏ×Ï ÐÏÓÒÅÄÓÔ×ÏÍ "
 #~ "library()."
-
 #~ msgid "package must be loaded"
 #~ msgstr "ÄÏÌÖÅÎ ÂÙÔØ ÚÁÇÒÕÖÅÎ ÐÁËÅÔ"
-
 #~ msgid "lib"
 #~ msgstr "lib"
-
 #~ msgid "pkg"
 #~ msgstr "pkg"
-
 #~ msgid "packageStartupMessage"
 #~ msgstr "packageStartupMessage"
-
 #~ msgid "installed.packages"
 #~ msgstr "installed.packages"
-
 #~ msgid "Good practice"
 #~ msgstr "èÏÒÏÛÏ ÓÄÅÌÁÎÏ"
 
 #, fuzzy
 #~ msgid "\\name"
 #~ msgstr "ÉÍÑ"
-
 #~ msgid "NEWS"
 #~ msgstr "îï÷ïóôé"
-
 #~ msgid "DESCRIPTION"
 #~ msgstr "ïðéóáîéå"
-
 #~ msgid "doc/"
 #~ msgstr "doc/"
-
 #~ msgid "demo/"
 #~ msgstr "demo/"
-
 #~ msgid "file"
 #~ msgstr "ÆÁÊÌ"
-
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
-
 #~ msgid "ssname"
 #~ msgstr "ssname"
-
 #~ msgid "language"
 #~ msgstr "ÑÚÙË"
-
 #~ msgid "processing"
 #~ msgstr "ÏÂÒÁÂÙÔÙ×ÁÀ"
 
 #, fuzzy
 #~ msgid "package directory"
 #~ msgstr "ÄÉÒÅËÔÏÒÉÑ ÐÁËÅÔÏ×"
-
 #~ msgid "Unrecognized search field:"
 #~ msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ÐÏÉÓËÁ:"
-
 #~ msgid "ERROR:"
 #~ msgstr "ïûéâëá:"
-
 #~ msgid "running 'zip' failed"
 #~ msgstr "ÎÅ ÕÄÁÌÓÑ ÚÁÐÕÓË 'zip'"
-
 #~ msgid "packaged installation of"
 #~ msgstr "ÐÁËÅÔÎÁÑ ÕÓÔÁÎÏ×ËÁ"
-
 #~ msgid "as"
 #~ msgstr "ËÁË"
-
 #~ msgid "installing via 'install.libs.R' to"
 #~ msgstr "ÉÎÓÔÁÌÌÉÒÕÀ ÞÅÔÅÚ 'install.libs.R' ×"
-
 #~ msgid "installing to"
 #~ msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ×"
 
 #, fuzzy
 #~ msgid "running 'src/Makefile.win' ..."
 #~ msgstr "ÚÁÐÕÓËÁÀ src/Makefile.win ..."
-
 #~ msgid "only one architecture so ignoring '--merge-multiarch'"
 #~ msgstr "ÔÏÌØËÏ ÏÄÎÁ ÁÒÈÉÔÅËÔÕÒÁ, ÔÁË ÞÔÏ ÐÒÏÐÕÓËÁÀ '--merge-multiarch'"
-
 #~ msgid "ERROR: failed to lock directory"
 #~ msgstr "ïûéâëá: ÎÅ ÕÄÁÌÏÓØ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÐÁÐËÕ"
-
 #~ msgid ""
 #~ "for modifying\n"
 #~ "Try removing"
 #~ msgstr ""
 #~ "ÄÌÑ ÍÏÄÉÆÉËÁÃÉÉ\n"
 #~ "ðÙÔÁÀÓØ ÐÅÒÅÍÅÓÔÉÔØ"
-
 #~ msgid "ERROR: failed to create lock directory"
 #~ msgstr "ïûéâëá: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÂÌÏËÉÒÏ×ÁÎÎÕÀ ÐÁÐËÕ"
-
 #~ msgid "finding HTML links ..."
 #~ msgstr "ÎÁÈÏÖÕ ÓÓÙÌËÉ HTML..."
-
 #~ msgid "finding level-2 HTML links ..."
 #~ msgstr "ÎÁÈÏÖÕ ÓÓÙÌËÉ HTML ×ÔÏÒÏÇÏ ÕÒÏ×ÎÑ..."
-
 #~ msgid "Internal error, no tag"
 #~ msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ, ÔÅÇÁ ÎÅÔ"
-
 #~ msgid "Internal error:  NULL tag"
 #~ msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ:  ÔÅÇ NULL"
-
 #~ msgid "internal error"
 #~ msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ"
-
 #~ msgid "Inconsistent arg count for"
 #~ msgstr "îÅÓÏÏÔ×ÅÔÓÔ×ÅÎÎÙÊ ÁÒÇÕÍÅÎÔ ÎÁÊÄÅÎ Õ"
-
 #~ msgid "Entry for"
 #~ msgstr "÷ÈÏÄ ÄÌÑ"
-
 #~ msgid "="
 #~ msgstr "="
-
 #~ msgid "already defined to be"
 #~ msgstr "ÕÖÅ ÏÐÒÅÄÅÌÅÎ ÂÙÔØ"
-
 #~ msgid "found encoding"
 #~ msgstr "ÎÁÊÄÅÎÁ ËÏÄÉÒÏ×ËÁ"
-
 #~ msgid "cannot be opened"
 #~ msgstr "ÎÅÌØÚÑ ÏÔËÒÙÔØ"
-
 #~ msgid "comparing"
 #~ msgstr "ÓÒÁ×ÎÉ×ÁÀ"
-
 #~ msgid "to"
 #~ msgstr "×"
-
 #~ msgid "..."
 #~ msgstr "..."
-
 #~ msgid "Comparing"
 #~ msgstr "óÒÁ×ÎÉ×ÁÀ"
-
 #~ msgid "creation of"
 #~ msgstr "ÓÏÚÄÁÎÉÅ"
-
 #~ msgid "failed"
 #~ msgstr "ÎÅ ÕÄÁÌÏÓØ"
-
 #~ msgid "creating"
 #~ msgstr "ÓÏÚÄÁÀ"
-
 #~ msgid "running code in"
 #~ msgstr "ÚÁÐÕÓËÁÀ ËÏÄ × "
-
 #~ msgid "running strict specific tests"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÕÚËÏÓÐÅÃÉÆÉÞÅÓËÉÅ ÔÅÓÔÙ"
-
 #~ msgid "running sloppy specific tests"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÛÉÒÏËÉÅ ÔÅÓÔÙ"
-
 #~ msgid "running regression tests"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÒÅÇÒÅÓÓÉÏÎÎÙÅ ÔÅÓÔÙ"
-
 #~ msgid "comparing 'reg-plot.ps' to 'reg-plot.ps.save' ..."
 #~ msgstr "ÓÒÁ×ÎÉ×ÁÀ 'reg-plot.ps' Ó 'reg-plot.ps.save' ..."
-
 #~ msgid "running tests of plotting Latin-1"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÔÅÓÔÙ ÎÁ ÒÉÓÏ×ÁÎÉÅ Ó Latin-1"
-
 #~ msgid "expect failure or some differences if not in a Latin or UTF-8 locale"
 #~ msgstr "ÏÖÉÄÁÊÔÅ ÎÅÕÄÁÞÕ ÉÌÉ ÏÔÌÉÞÉÑ ÅÓÌÉ ÎÅ ÎÁ ÌÏËÁÌÉ Latin ÉÌÉ UTF-8"
-
 #~ msgid "comparing 'reg-plot-latin1.ps' to 'reg-plot-latin1.ps.save' ..."
 #~ msgstr "ÓÒÁ×ÎÉ×ÁÀ 'reg-plot-latin1.ps' Ó 'reg-plot-latin1.ps.save' ..."
-
 #~ msgid "running tests of consistency of as/is.*"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÔÅÓÔÙ ÎÁ ÓÏÏÔ×ÅÔÓÔ×ÉÅ as/is.*"
-
 #~ msgid "running tests of primitives"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÔÅÓÔÙ ÎÁ ÐÒÉÍÉÔÉ×Ù"
-
 #~ msgid "running regexp regression tests"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÒÅÇÒÅÓÓÉÏÎÎÙÅ ÔÅÓÔÙ ÎÁ ÒÅÇÕÌÑÒÎÙÅ ×ÙÒÁÖÅÎÉÑ"
-
 #~ msgid "running tests to possibly trigger segfaults"
 #~ msgstr "ÚÁÐÕÓËÁÀ ÔÅÓÔÙ ÎÁ ×ÏÚÍÏÖÎÏÅ ÐÅÒÅËÌÀÞÅÎÉÅ ÏÛÉÂÏË ÓÅÇÍÅÎÔÁÃÉÉ"
 
 #, fuzzy
 #~ msgid "not installing"
 #~ msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ×"
-
 #~ msgid "Generics g in env ="
 #~ msgstr "ïÂÝÉÅ 'g' × env ="
-
 #~ msgid "where hasMethods(g, env) errors:"
 #~ msgstr "ÇÄÅ ÏÛÉÂËÉ hasMethods(g, env):"
-
 #~ msgid "May need something like"
 #~ msgstr "÷ÏÚÍÏÖÎÏ, ÎÁÄÏ ÞÔÏ-ÔÏ ×ÒÏÄÅ"
-
 #~ msgid "importFrom("
 #~ msgstr "importFrom("
-
 #~ msgid "in NAMESPACE."
 #~ msgstr "× NAMESPACE."
 
@@ -1845,59 +1639,43 @@
 #, fuzzy
 #~ msgid "running xgettext failed"
 #~ msgstr "ÎÅ ÕÄÁÌÓÑ ÚÁÐÕÓË 'make'"
-
 #~ msgid "ERROR: --merge-multiarch can only be used on i386/x64 installations"
 #~ msgstr ""
 #~ "ERROR: --merge-multiarch ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÎÁ i386/x64-"
 #~ "ÉÎÓÔÁÌÌÑÃÉÑÈ"
-
 #~ msgid "--merge-multiarch is Windows-only"
 #~ msgstr "--merge-multiarch -- ÜÔÏ ÔÏÌØËÏ ÄÌÑ Windows"
-
 #~ msgid ""
 #~ "running Stangle on vignette '%s' failed with message:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "×ÙÐÏÌÎÅÎÉÅ Stangle × ÏÞÅÒËÅ '%s' ÎÅ ÕÄÁÌÏÓØ Ó ÄÉÁÇÎÏÓÔÉËÏÊ:\n"
 #~ "%s"
-
 #~ msgid "Packages required but not available:"
 #~ msgstr "ðÁËÅÔ ÔÒÅÂÕÅÔÓÑ, ÎÏ ÎÅÄÏÓÔÕÐÅÎ:"
-
 #~ msgid "Package required but not available: %s"
 #~ msgstr "ðÁËÅÔ ÔÒÅÂÕÅÔÓÑ, ÎÏ ÎÅÄÏÓÔÕÐÅÎ: %s"
-
 #~ msgid "Packages required and available but unsuitable versions:"
 #~ msgstr "ðÁËÅÔ ÔÒÅÂÕÅÔÓÑ É ÄÏÓÔÕÐÅÎ, ÎÏ ÎÅÐÏÄÈÏÄÑÝÉÈ ×ÅÒÓÉÊ:"
-
 #~ msgid "Package required and available but unsuitable version: %s"
 #~ msgstr "ðÁËÅÔ ÔÒÅÂÕÅÔÓÑ É ÄÏÓÔÕÐÅÎ, ÎÏ ÎÅÐÏÄÈÏÄÑÝÅÊ ×ÅÒÓÉÉ:"
-
 #~ msgid "Former standard packages required but now defunct:"
 #~ msgstr ""
 #~ "âÙ×ÛÉÊ ÓÔÁÎÄÁÒÔÎÙÊ ÐÁËÅÔ ÔÒÅÂÕÅÔÓÑ, ËÏÔÏÒÙÊ ÓÅÊÞÁÓ ×ÙÛÅÌ ÉÚ ÕÐÏÔÒÅÂÌÅÎÉÑ:"
-
 #~ msgid "Packages suggested but not available for checking:"
 #~ msgstr "ðÁËÅÔ ÔÒÅÂÕÅÔÓÑ, ÎÏ ÎÅÄÏÓÔÕÐÅÎ ÄÌÑ ×ÙÄÁÞÉ:"
-
 #~ msgid "Package suggested but not available for checking: %s"
 #~ msgstr "ðÁËÅÔ ÔÒÅÂÕÅÔÓÑ, ÎÏ ÎÅÄÏÓÔÕÐÅÎ  ÄÌÑ ×ÙÄÁÞÉ:"
-
 #~ msgid "Packages which this enhances but not available for checking:"
 #~ msgstr "ðÁËÅÔ, ËÏÔÏÒÙÊ ÜÔÏ ÕÓÉÌÉ×ÁÅÔ, ÎÅÄÏÓÔÕÐÅÎ ÄÌÑ ×ÙÄÁÞÉ:"
-
 #~ msgid "Package which this enhances but not available for checking: %s"
 #~ msgstr "ðÁËÅÔ, ËÏÔÏÒÙÊ ÜÔÏ ÕÓÉÌÉ×ÁÅÔ, ÎÅÄÏÓÔÕÐÅÎ ÄÌÑ ×ÙÄÁÞÉ: %s"
-
 #~ msgid "Vignette dependencies not required: %s"
 #~ msgstr "úÁ×ÉÓÉÍÏÓÔÉ ÏÞÅÒËÁ ÎÅ ÔÒÅÂÕÀÔÓÑ: %s"
-
 #~ msgid "Namespace dependencies not required:"
 #~ msgstr "ïÐÒÅÄÅÌÅÎÉÑ ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ ÎÅ ÔÒÅÂÕÀÔÓÑ:"
-
 #~ msgid "Package name and namespace differ."
 #~ msgstr "éÍÅÎÁ ÐÁËÅÔÁ É ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍÅÎ ÒÁÚÌÉÞÁÀÔÓÑ."
-
 #~ msgid "DVI output from Rd2dvi is deprecated"
 #~ msgstr "÷Ù×ÏÄ DVI ÉÚ Rd2dvi ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ"
 
@@ -1908,81 +1686,57 @@
 #~ msgstr ""
 #~ "óÍ. ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÁÈ DESCRIPTION × ÓÅËÃÉÉ  'Creating R ÐÁËÅÔs' "
 #~ "ÒÕËÏ×ÏÄÓÔ×Á 'Writing R Extensions'."
-
 #~ msgid "Malformed NEWS.Rd file."
 #~ msgstr "ðÌÏÈÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÙÊ ÆÁÊÌ NEWS.Rd."
 
 #, fuzzy
 #~ msgid "cannot read boolean object"
 #~ msgstr "ÎÅÌØÚÑ ÏÔËÒÙÔØ"
-
 #~ msgid "no examples found"
 #~ msgstr "ÎÅ ÎÁÊÄÅÎÏ ÐÒÉÍÅÒÏ×"
-
 #~ msgid "WARNING: 'Depends' entry has multiple dependencies on R:"
 #~ msgstr "ðòåäõðòåöäåîéå: õ 'Depends' ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ × R:"
-
 #~ msgid "only the first will be used in R < 2.7.0"
 #~ msgstr "ÔÏÌØËÏ ÐÅÒ×ÙÊ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ R < 2.7.0"
-
 #~ msgid "'"
 #~ msgstr "'"
-
 #~ msgid "--binary is deprecated"
 #~ msgstr "--binary ÕÓÔÁÒÅÌÏ"
-
 #~ msgid "use of '--auto-zip' is defunct"
 #~ msgstr "'--auto-zip' ÎÅ ÒÁÂÏÔÁÅÔ"
-
 #~ msgid "use of '--use-zip-data' is defunct"
 #~ msgstr "'--use-zip-data' ÎÅ ÒÁÂÏÔÁÅÔ"
-
 #~ msgid "use of '--no-docs' is deprecated: use '--install-args' instead"
 #~ msgstr ""
 #~ "ÉÓÐÏÌØÚÏ×ÁÎÉÅ '--no-docs' ÕÓÔÁÒÅÌÏ: ÉÓÐÏÌØÚÕÊÔÅ '--install-args' ×ÍÅÓÔÏ"
-
 #~ msgid "** Options"
 #~ msgstr "** ïÐÃÉÉ"
-
 #~ msgid "are only for '--binary'  and will be ignored"
 #~ msgstr "ÔÏÌØËÏ ÄÌÑ '--binary' É ÂÕÄÅÔ ÐÒÏÐÕÝÅÎÏ"
-
 #~ msgid "--pkglock applies only to a single package"
 #~ msgstr "--pkglock ÐÒÉÍÅÎÉÍ ÔÏÌØËÏ Ë ÏÄÉÎÏÞÎÏÍÕ ÐÁËÅÔÕ"
-
 #~ msgid "--no-help overrides"
 #~ msgstr "--no-help ÐÅÒÅÐÉÓÁÎ"
-
 #~ msgid "--"
 #~ msgstr "--"
-
 #~ msgid "'--auto-zip' is for Windows only"
 #~ msgstr "'--auto-zip' -- ÜÔÏ ÔÏÌØËÏ ÄÌÑ Windows"
-
 #~ msgid "cannot update HTML package index"
 #~ msgstr "ÎÅ ÍÏÇÕ ÏÂÎÏ×ÉÔØ HTML-ÉÎÄÅËÓ ÐÁËÅÔÏ×"
-
 #~ msgid "'DESCRIPTION' has 'Encoding' field and re-encoding is not possible"
 #~ msgstr "Õ 'DESCRIPTION' ÅÓÔØ ÐÏÌÅ 'Encoding', ÐÅÒÅËÏÄÉÒÏ×ËÁ ÎÅ×ÏÚÍÏÖÎÁ"
-
 #~ msgid "cannot create HTML package index"
 #~ msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ HTML-ÉÎÄÅËÓ ÐÁËÅÔÁ"
-
 #~ msgid "Running examples in package"
 #~ msgstr "úÁÐÕÓËÁÀ ÐÒÉÍÅÒÙ Ë ÐÁËÅÔÕ"
-
 #~ msgid "... done"
 #~ msgstr "... ÇÏÔÏ×Ï"
-
 #~ msgid "Unable to locate help document %s in package %s"
 #~ msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÄÏËÕÍÅÎÔ ÐÏÍÏÝÉ %s × ÐÁËÅÔÅ %s"
-
 #~ msgid "ERROR: this R is version %s, bundle '%s' requires R %s %s"
 #~ msgstr "ïûéâëá: ÜÔÏ R ×ÅÒÓÉÉ %s, Á ÎÁÂÏÒ '%s' ÔÒÅÂÕÅÔ R %s %s"
-
 #~ msgid "Bundle package:"
 #~ msgstr "ó×ÑÚËÁ ÐÁËÅÔÏ×:"
-
 #~ msgid "Bundle 'DESCRIPTION' is missing."
 #~ msgstr "õ Ó×ÑÚËÉ ÐÁËÅÔÏ× ÏÔÓÕÔÓÔ×ÕÅÔ 'DESCRIPTION'."
 
@@ -1993,129 +1747,92 @@
 #, fuzzy
 #~ msgid "No package of named %s could be found"
 #~ msgstr "ÄÏÌÖÅÎ ÂÙÔØ ÚÁÇÒÕÖÅÎ ÐÁËÅÔ"
-
 #~ msgid "*** 'hhc.exe' not found: not building CHM help"
 #~ msgstr "*** 'hhc.exe' ÎÅ ÎÁÊÄÅÎ: ÎÅ ÓÏÂÉÒÁÀ CHM ÐÏÍÏÝØ"
-
 #~ msgid "Rd files with syntax errors:"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÓÉÎÔÁËÓÉÞÅÓËÉÍÉ ÏÛÉÂËÁÍÉ:"
-
 #~ msgid "Rd files with likely Rd problems:"
 #~ msgstr "Rd-ÆÁÊÌÙ, ÐÏ-×ÉÄÉÍÏÍÕ, Ó ÐÒÏÂÌÅÍÁÍÉ Rd:"
-
 #~ msgid "Unaccounted top-level text in file '%s':"
 #~ msgstr "îÅÏÐÒÅÄÅÌÅÎÎÙÊ ÔÅËÓÔ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ × ÆÁÊÌÅ '%s':"
-
 #~ msgid "Following section '%s'"
 #~ msgstr "óÌÅÄÕÀÝÉÊ ÒÁÚÄÅÌ '%s'"
-
 #~ msgid "Rd files with unknown encoding:"
 #~ msgstr "Rd-ÆÁÊÌÙ ÎÅÉÚ×ÅÓÔÎÏÊ ËÏÄÉÒÏ×ËÉ:"
-
 #~ msgid "Rd files with invalid non-ASCII metadata:"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÎÅÐÒÁ×ÉÌØÎÙÍÉ ÎÅ-ASCII ÍÅÔÁÄÁÎÎÙÍÉ:"
-
 #~ msgid "Rd files with non-ASCII section titles:"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÎÅ-ASCII ÚÁÇÏÌÏ×ËÁÍÉ ÒÁÚÄÅÌÏ×:"
-
 #~ msgid "Rd files with missing or empty '\\name':"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÐÒÏÐÕÝÅÎÎÙÍÉ ÉÌÉ ÐÕÓÔÙÍÉ ÉÍÅÎÁÍÉ '\\ÉÍÑ':"
-
 #~ msgid "Rd files with missing or empty '\\title':"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÐÒÏÐÕÝÅÎÎÙÍÉ ÉÌÉ ÐÕÓÔÙÍÉ \\title':"
-
 #~ msgid "Rd files without '%s':"
 #~ msgstr "Rd-ÆÁÊÌÙ ÂÅÚ '%s':"
-
 #~ msgid "These entries are required in an Rd file."
 #~ msgstr "üÔÉ ÐÕÎËÔÙ ÔÒÅÂÕÀÔÓÑ ÄÌÑ Rd-ÆÁÊÌÁ."
-
 #~ msgid "These entries must be unique in an Rd file."
 #~ msgstr "üÔÉ ÐÕÎËÔÙ × Rd-ÆÁÊÌÅ ÄÏÌÖÎÙ ÂÙÔØ ÕÎÉËÁÌØÎÙÍÉ."
-
 #~ msgid "Rd files with unknown sections:"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÎÅÉÚ×ÅÓÔÎÙÍÉ ÒÁÚÄÅÌÁÍÉ:"
-
 #~ msgid "Rd files with non-standard keywords:"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÎÅÓÔÁÎÄÁÒÔÎÙÍÉ ËÌÀÞÅ×ÙÍÉ ÓÌÏ×ÁÍÉ:"
-
 #~ msgid ""
 #~ "Each '\\keyword' entry should specify one of the standard keywords (as "
 #~ "listed in file 'KEYWORDS' in the R documentation directory)."
 #~ msgstr ""
 #~ "ëÁÖÄÙÊ ×ÈÏÄ '\\keyword' ÄÏÌÖÅÎ ÏÐÒÅÄÅÌÑÔØ ÏÄÎÏ ÉÚ ÓÔÁÎÄÁÒÔÎÙÈ ËÌÀÞÅ×ÙÈ "
 #~ "ÓÌÏ× (ËÁË ÐÅÒÅÞÉÓÌÅÎÏ × ÆÁÊÌÅ 'KEYWORDS' × ÐÁÐËÅ ÄÏËÕÍÅÎÔÁÃÉÉ R)."
-
 #~ msgid "Rd files with empty sections:"
 #~ msgstr "Rd-ÆÁÊÌÙ Ó ÐÕÓÔÙÍÉ ÒÁÚÄÅÌÁÍÉ:"
 
 #, fuzzy
 #~ msgid "checkRd is designed for Rd version 2 or higher"
 #~ msgstr "Rd2HTML ÒÁÚÒÁÂÏÔÁÎ ÄÌÑ Rd ×ÅÒÓÉÉ 2 ÉÌÉ ×ÙÛÅ."
-
 #~ msgid "there are no help pages in this package"
 #~ msgstr "× ÐÁËÅÔÅ ÎÅÔ ÆÁÊÌÏ× ÐÏÍÏÝÉ"
-
 #~ msgid "skipping repeated alias(es)"
 #~ msgstr "ÐÒÏÐÕÓËÁÀ ÐÏ×ÔÏÒÑÀÝÉÅÓÑ ÉÍÅÎÁ-ÓÓÙÌË(É)"
-
 #~ msgid "in file"
 #~ msgstr "× ÆÁÊÌÅ"
-
 #~ msgid "directory '%s' does not contain Rd sources"
 #~ msgstr "ÐÁÐËÁ '%s' ÎÅ ÓÏÄÅÒÖÉÔ Rd-ÉÓÈÏÄÎÉËÏ×"
-
 #~ msgid "Package Rd sources were installed without preserving Rd file names."
 #~ msgstr "Rd-ÉÓÈÏÄÎÉËÉ ÐÁËÅÔÁ ÂÙÌÉ ÕÓÔÁÎÏ×ÌÅÎÙ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÍÅÎ Rd-ÆÁÊÌÏ×."
-
 #~ msgid "Please reinstall using a current version of R."
 #~ msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ, ÉÓÐÏÌØÚÕÑ ÔÅËÕÝÕÀ ×ÅÒÓÉÀ R."
-
 #~ msgid "*** error on file"
 #~ msgstr "*** ÏÛÉÂËÁ × ÆÁÊÌÅ"
-
 #~ msgid "argument 'lines' must be a character vector"
 #~ msgstr "ÁÒÇÕÍÅÎÔ 'lines' ÄÏÌÖÅÎ ÂÙÔØ ÔÅËÓÔÏ×ÙÍ ×ÅËÔÏÒÏÍ"
-
 #~ msgid "encoding '%s' is not portable"
 #~ msgstr "ËÏÄÉÒÏ×ËÁ '%s' ÎÅ ÐÅÒÅÎÏÓÉÍÁ"
-
 #~ msgid "unterminated section '%s'"
 #~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÒÁÚÄÅÌ '%s'"
-
 #~ msgid "incomplete section 'section{%s}'"
 #~ msgstr "ÎÅÐÏÌÎÙÊ ÒÁÚÄÅÌ 'section{%s}'"
-
 #~ msgid "unterminated section 'section{%s}'"
 #~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÒÁÚÄÅÌ 'section{%s}'"
-
 #~ msgid "unmatched \\item name in '\\item{%s'"
 #~ msgstr "ÎÅÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ \\item ÉÍÑ × '\\item{%s'"
-
 #~ msgid "no \\item description for item '%s'"
 #~ msgstr "ÎÅÔ \\item ÏÐÉÓÁÎÉÑ ÄÌÑ ÆÁÊÌÁ '%s'"
-
 #~ msgid "unmatched \\item description for item '%s'"
 #~ msgstr "ÎÅÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÏÐÒÅÄÅÌÅÎÉÅ \\item ÄÌÑ ÐÕÎËÔÁ '%s'"
-
 #~ msgid "unclosed \\link"
 #~ msgstr "ÎÅÚÁËÒÙÔÁÑ \\link"
-
 #~ msgid "unclosed \\%s"
 #~ msgstr "ÎÅÚÁËÒÙÔÏÅ \\%s"
-
 #~ msgid "Rd syntax errors found"
 #~ msgstr "÷ Rd ÎÁÊÄÅÎÁ ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ"
-
 #~ msgid "Syntax error in documentation object '%s':"
 #~ msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ÏÂßÅËÔÅ ÄÏËÕÍÅÎÔÁÃÉÉ '%s':"
-
 #~ msgid "should not get here"
 #~ msgstr "ÓÀÄÁ ÎÅ ÄÏÌÖÎÏ ÄÏÊÔÉ"
 
 #, fuzzy
 #~ msgid "there is a 'man' dir but no help pages in this package"
 #~ msgstr "× ÐÁËÅÔÅ ÎÅÔ ÆÁÊÌÏ× ÐÏÍÏÝÉ"
-
 #~ msgid "multiple \\encoding lines in file"
 #~ msgstr "ÎÅÓËÏÌØËÏ \\ÓÔÒÏË ËÏÄÉÒÏ×ÏË × ÆÁÊÌÅ"
+
diff -Nru r-base-3.2.3/src/library/tools/po/R-tools.pot r-base-3.3.1/src/library/tools/po/R-tools.pot
--- r-base-3.2.3/src/library/tools/po/R-tools.pot	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-tools.pot	2016-04-27 22:15:26.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: tools 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,10 +10,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 
-msgid "Reading %s failed with message: %s"
+msgid "Checking %s"
 msgstr ""
 
-msgid "Checking %s"
+msgid "Processing %s ..."
 msgstr ""
 
 msgid "argument 'package' must be of length 1"
@@ -803,6 +802,9 @@
 msgid "empty 'data' directory"
 msgstr ""
 
+msgid "cannot create unique directory for build"
+msgstr ""
+
 msgid "cannot create temporary directory"
 msgstr ""
 
@@ -860,6 +862,12 @@
 msgid "Cannot process chunk/lines:\n%s"
 msgstr ""
 
+msgid "DESCRIPTION file not found"
+msgstr ""
+
+msgid "NEWS file not found"
+msgstr ""
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 
@@ -884,6 +892,9 @@
 msgid "Processing packages:"
 msgstr ""
 
+msgid "reading DESCRIPTION for package %s failed with message:\n  %s"
+msgstr ""
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr ""
 
@@ -968,6 +979,9 @@
 msgid "package '%s' was not found"
 msgstr ""
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/tools/po/R-tr.po r-base-3.3.1/src/library/tools/po/R-tr.po
--- r-base-3.2.3/src/library/tools/po/R-tr.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-tr.po	2016-04-27 22:15:26.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-04-02 \n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -18,10 +18,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "Reading %s failed with message: %s"
+msgid "Checking %s"
 msgstr ""
 
-msgid "Checking %s"
+msgid "Processing %s ..."
 msgstr ""
 
 msgid "argument 'package' must be of length 1"
@@ -857,6 +857,9 @@
 msgid "empty 'data' directory"
 msgstr ""
 
+msgid "cannot create unique directory for build"
+msgstr ""
+
 msgid "cannot create temporary directory"
 msgstr ""
 
@@ -919,6 +922,12 @@
 "%s"
 msgstr ""
 
+msgid "DESCRIPTION file not found"
+msgstr ""
+
+msgid "NEWS file not found"
+msgstr ""
+
 msgid "No news found in given file using old-style R-like format."
 msgstr ""
 
@@ -954,6 +963,11 @@
 msgid "Processing packages:"
 msgstr ""
 
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr ""
 
@@ -1038,6 +1052,9 @@
 msgid "package '%s' was not found"
 msgstr ""
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr ""
 
diff -Nru r-base-3.2.3/src/library/tools/po/ru.po r-base-3.3.1/src/library/tools/po/ru.po
--- r-base-3.2.3/src/library/tools/po/ru.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/ru.po	2016-04-27 22:15:26.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2013-03-19 22:36-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51+0100\n"
+"PO-Revision-Date: 2016-04-05 18:06-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -18,8 +18,7 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "First-Translator: Dmitri I GOULIAEV <dmitri.gouliaev@telkel.net\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: Rmd5.c:37
 msgid "argument 'files' must be character"
@@ -55,21 +54,23 @@
 
 #: getfmts.c:136
 msgid "at most one asterisk '*' is supported in each conversion specification"
-msgstr ""
-"ÓÁÍÏÅ ÂÏÌØÛÅÅ ÏÄÎÁ Ú×ÅÚÄÏÞËÁ '*' ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ × ËÁÖÄÏÍ ÏÐÉÓÁÎÉÉ "
-"ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ"
+msgstr "ÓÁÍÏÅ ÂÏÌØÛÅÅ ÏÄÎÁ Ú×ÅÚÄÏÞËÁ '*' ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ × ËÁÖÄÏÍ ÏÐÉÓÁÎÉÉ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ"
 
-#: gramLatex.c:2499 gramRd.c:3933
+#: gramLatex.c:2499
+#: gramRd.c:3933
 #, c-format
 msgid "unable to allocate buffer for long string at line %d"
 msgstr "ÎÅ ÍÏÇÕ ÒÁÚÍÅÓÔÉÔØ ÂÕÆÅÒ ÄÌÑ ÄÌÉÎÎÏÊ ÐÏÄÓÔÒÏËÉ ÎÁ ÓÔÒÏËÅ %d"
 
-#: gramLatex.c:2736 gramRd.c:4422 gramRd.c:4428
+#: gramLatex.c:2736
+#: gramRd.c:4422
+#: gramRd.c:4428
 #, c-format
 msgid "invalid '%s' value"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ '%s'"
 
-#: gramRd.c:2591 gramRd.c:2594
+#: gramRd.c:2591
+#: gramRd.c:2594
 #, c-format
 msgid "bad markup (extra space?) at %s:%d:%d"
 msgstr "ÐÌÏÈÁÑ ÒÁÚÍÅÔËÁ (ÌÉÛÎÉÊ ÐÒÏÂÅÌ?) ÎÁ %s:%d:%d"
@@ -89,7 +90,8 @@
 msgid "No macro definition for '%s'."
 msgstr "îÅÔ ÏÐÒÅÄÅÌÅÎÉÑ ÍÁËÒÏÓÁ ÄÌÑ '%s'."
 
-#: gramRd.c:3348 gramRd.c:3352
+#: gramRd.c:3348
+#: gramRd.c:3352
 #, c-format
 msgid "newline within quoted string at %s:%d"
 msgstr "ÎÏ×ÁÑ ÓÔÒÏËÁ ×ÎÕÔÒÉ ÚÁËÁ×ÙÞÅÎÎÏÊ ÐÏÄÓÔÒÏËÉ ÎÁ %s:%d"
@@ -142,7 +144,9 @@
 msgid "invalid bind address specification"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÏÐÉÓÁÎÉÅ ÁÄÒÅÓÁ ÐÒÉ×ÑÚËÉ"
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112
+#: install.c:133
+#: install.c:135
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ '%s'"
@@ -163,6 +167,8 @@
 msgid "invalid argument type"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ ÁÒÇÕÍÅÎÔÁ"
 
-#: text.c:223 text.c:245
+#: text.c:223
+#: text.c:245
 msgid "out of memory"
 msgstr "ÎÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ"
+
diff -Nru r-base-3.2.3/src/library/tools/po/R-zh_CN.po r-base-3.3.1/src/library/tools/po/R-zh_CN.po
--- r-base-3.2.3/src/library/tools/po/R-zh_CN.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/R-zh_CN.po	2016-04-27 22:15:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -18,15 +18,13 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, fuzzy
-msgid "Reading %s failed with message: %s"
-msgstr ""
-"编译TeX文件%s失败，消�为:\n"
-"%s"
-
-#, fuzzy
 msgid "Checking %s"
 msgstr "%s…"
 
+#, fuzzy
+msgid "Processing %s ..."
+msgstr "处�%s "
+
 msgid "argument 'package' must be of length 1"
 msgstr "�数'package'的长度必需为一"
 
@@ -910,6 +908,10 @@
 msgid "empty 'data' directory"
 msgstr "空的'data'目录"
 
+#, fuzzy
+msgid "cannot create unique directory for build"
+msgstr "无法建立目录'%s'"
+
 msgid "cannot create temporary directory"
 msgstr "无法建立临时性目录"
 
@@ -974,6 +976,14 @@
 "无法处�段/列：\n"
 "%s"
 
+#, fuzzy
+msgid "DESCRIPTION file not found"
+msgstr "DESCRIPTION文件�对"
+
+#, fuzzy
+msgid "NEWS file not found"
+msgstr "找�到'%s'这个文件"
+
 msgid "No news found in given file using old-style R-like format."
 msgstr "在所�供的文件中用��R类的格�找�到任何新信�。"
 
@@ -1019,6 +1029,14 @@
 msgid "Processing packages:"
 msgstr "正在处�程辑包:"
 
+#, fuzzy
+msgid ""
+"reading DESCRIPTION for package %s failed with message:\n"
+"  %s"
+msgstr ""
+"编译TeX文件%s失败，消�为:\n"
+"%s"
+
 msgid "%s must be a character string or a file/raw connection"
 msgstr "%s必需是字符串或原�结"
 
@@ -1103,6 +1121,9 @@
 msgid "package '%s' was not found"
 msgstr "找�到程辑包'%s'"
 
+msgid "the 'lib.loc' argument has always been unused and is deprecated now"
+msgstr ""
+
 msgid "bad operand"
 msgstr "�作数�对"
 
diff -Nru r-base-3.2.3/src/library/tools/po/tools.pot r-base-3.3.1/src/library/tools/po/tools.pot
--- r-base-3.2.3/src/library/tools/po/tools.pot	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/tools.pot	2016-04-27 22:15:26.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: tools 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr ""
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr ""
@@ -136,27 +136,27 @@
 msgid "invalid bind address specification"
 msgstr ""
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr ""
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr ""
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr ""
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr ""
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/tools/po/zh_CN.po r-base-3.3.1/src/library/tools/po/zh_CN.po
--- r-base-3.2.3/src/library/tools/po/zh_CN.po	2015-06-06 22:15:31.000000000 +0000
+++ r-base-3.3.1/src/library/tools/po/zh_CN.po	2016-04-27 22:15:26.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: R 2.4.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: 2005-02-04 08:37+0000\n"
 "Last-Translator: 陈� <feic@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -17,11 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Rmd5.c:37
+#: Rmd5.c:36
 msgid "argument 'files' must be character"
 msgstr "�数'files'必需是字符"
 
-#: Rmd5.c:51
+#: Rmd5.c:50
 #, c-format
 msgid "md5 failed on file '%s'"
 msgstr "用于'%s'文件的md5�行失败"
@@ -136,27 +136,27 @@
 msgid "invalid bind address specification"
 msgstr "绑定地�规范�对"
 
-#: install.c:112 install.c:133 install.c:135
+#: install.c:112 install.c:131 install.c:133
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "'%s'�数�对"
 
-#: install.c:163
+#: install.c:162
 msgid "write error during file append"
 msgstr "文件追加写入时出了错"
 
-#: signals.c:43
+#: signals.c:42
 msgid "pskill() is not supported on this platform"
 msgstr "这个平��支�pskill()"
 
-#: signals.c:140
+#: signals.c:139
 msgid "psnice() is not supported on this platform"
 msgstr "这个平��支�psnice()"
 
-#: text.c:66
+#: text.c:67
 msgid "invalid argument type"
 msgstr "�数�类�对"
 
-#: text.c:223 text.c:245
+#: text.c:225 text.c:247
 msgid "out of memory"
 msgstr "内存�足"
diff -Nru r-base-3.2.3/src/library/tools/R/bibstyle.R r-base-3.3.1/src/library/tools/R/bibstyle.R
--- r-base-3.2.3/src/library/tools/R/bibstyle.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/bibstyle.R	2016-03-16 23:03:29.000000000 +0000
@@ -82,7 +82,7 @@
 	fmtBook <- emphclean
 	fmtBtitle <- emphclean
 	fmtChapter <- labelclean(prefix="chapter ")
-	fmtDOI <- label(prefix="\\url{http://doi.org/", suffix="}")
+	fmtDOI <- label(prefix="\\doi{", suffix="}")
 	fmtEdition <- labelclean(suffix=" edition")
 	fmtEprint <- plain
 	fmtHowpublished <- plainclean
diff -Nru r-base-3.2.3/src/library/tools/R/build.R r-base-3.3.1/src/library/tools/R/build.R
--- r-base-3.2.3/src/library/tools/R/build.R	2015-11-13 23:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/build.R	2016-05-17 22:15:08.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/build.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@
 
 ### based on Perl build script
 
-.build_packages <- function(args = NULL)
+.build_packages <- function(args = NULL, no.q = interactive())
 {
     ## this requires on Windows sh make
 
@@ -101,7 +101,11 @@
     Ssystem <- function(command, args = character(), ...)
         system2(command, args, stdout = NULL, stderr = NULL, ...)
 
-    do_exit <- function(status = 1L) q("no", status = status, runLast = FALSE)
+    do_exit <-
+	if(no.q)
+	    function(status = 1L) stop(".build_package() exit status ", status)
+	else
+	    function(status = 1L) q("no", status = status, runLast = FALSE)
 
     env_path <- function(...) file.path(..., fsep = .Platform$path.sep)
 
@@ -237,9 +241,15 @@
         }
         if (vignettes &&
             parse_description_field(desc, "BuildVignettes", TRUE)) {
+
+            vignette_index_path <- file.path("build", "vignette.rds")
+            if(file.exists(vignette_index_path))
+                unlink(vignette_index_path)
+
 ## this is not a logical field
 ##	    if (nchar(parse_description_field(desc, "VignetteBuilder", "")))
 ##		ensure_installed()
+
             ## PR#15775: check VignetteBuilder packages are installed
             ## This is a bit wasteful: we do not need them in this process
             loadVignetteBuilder(pkgdir, TRUE)
@@ -325,7 +335,7 @@
 		## Save the list
 		dir.create("build", showWarnings = FALSE)
 		saveRDS(vignetteIndex,
-			file = file.path("build", "vignette.rds"))
+			file = vignette_index_path)
             }
         } else {
             fv <- file.path("build", "vignette.rds")
@@ -490,7 +500,19 @@
     }
 
     build_Rd_db <- function(pkgdir, libdir, desc) {
-    	db <- .build_Rd_db(pkgdir, stages = NULL,
+
+        build_partial_Rd_db_path <-
+            file.path("build", "partial.rdb")
+        if(file.exists(build_partial_Rd_db_path))
+            unlink(build_partial_Rd_db_path)
+
+        ## Use a full path as this could be passed to ..Rd2pdf().
+        build_refman_path <-
+            file.path(pkgdir, "build", paste0(basename(pkgdir), ".pdf"))
+        if(file.exists(build_refman_path))
+            unlink(build_refman_path)
+
+        db <- .build_Rd_db(pkgdir, stages = NULL,
                            os = c("unix", "windows"), step = 1)
     	if (!length(db)) return(FALSE)
 
@@ -521,7 +543,7 @@
 	    messageLog(Log, "saving partial Rd database")
 	    partial <- db[containsBuildSexprs]
 	    dir.create("build", showWarnings = FALSE)
-	    saveRDS(partial, file.path("build", "partial.rdb"))
+	    saveRDS(partial, build_partial_Rd_db_path)
 	}
 	needRefman <- manual &&
             parse_description_field(desc, "BuildManual", TRUE) &&
@@ -529,10 +551,8 @@
 	if (needRefman) {
 	    messageLog(Log, "building the PDF package manual")
 	    dir.create("build", showWarnings = FALSE)
-	    refman <- file.path(pkgdir, "build",
-                                paste0(basename(pkgdir), ".pdf"))
 	    ..Rd2pdf(c("--force", "--no-preview",
-	               paste0("--output=", refman),
+	               paste0("--output=", build_refman_path),
 	               pkgdir), quit = FALSE)
         }
 	return(TRUE)
@@ -664,16 +684,20 @@
     resave_data_others <- function(pkgname, resave_data)
     {
         if (resave_data == "no") return()
-        ddir <- file.path(pkgname, "data")
+        if(!dir.exists(ddir <- file.path(pkgname, "data")))
+            return()
+        ddir <- normalizePath(ddir)
         dataFiles <- grep("\\.(rda|RData)$",
                           list_files_with_type(ddir, "data"),
                           invert = TRUE, value = TRUE)
         if (!length(dataFiles)) return()
+        resaved <- character()
+        on.exit(unlink(resaved))
         Rs <- grep("\\.[Rr]$", dataFiles, value = TRUE)
         if (length(Rs)) { # these might use .txt etc
             messageLog(Log, "re-saving .R files as .rda")
             ## ensure utils is visible
-            library("utils")
+            ##   library("utils")
             lapply(Rs, function(x){
                 envir <- new.env(hash = TRUE)
                 sys.source(x, chdir = TRUE, envir = envir)
@@ -681,7 +705,7 @@
                      file = sub("\\.[Rr]$", ".rda", x),
                      compress = TRUE, compression_level = 9,
                      envir = envir)
-                unlink(x)
+                resaved <<- c(resaved, x)
             })
             printLog(Log,
                      "  NB: *.R converted to .rda: other files may need to be removed\n")
@@ -696,7 +720,7 @@
                     con <- gzfile(paste(nm, "gz", sep = "."), "wb")
                     writeLines(x, con)
                     close(con)
-                    unlink(nm)
+                    resaved <<- c(resaved, nm)
                 })
             } else {
                 OK <- TRUE
@@ -709,7 +733,7 @@
                     sizes <- file.size(nm3) * c(0.9, 1, 1)
                     ind <- which.min(sizes)
                     if(ind > 1) OK <<- FALSE
-                    unlink(c(nm, nm3[-ind]))
+                    resaved <<- c(resaved, nm, nm3[-ind])
                 })
                 if (!OK) fixup_R_dep(pkgname, "2.10")
             }
@@ -725,7 +749,7 @@
     options(showErrorCalls = FALSE, warn = 1)
 
     ## Read in build environment file.
-    Renv <- Sys.getenv("R_BUILD_ENVIRON", unset = NA)
+    Renv <- Sys.getenv("R_BUILD_ENVIRON", unset = NA_character_)
     if(!is.na(Renv)) {
         ## Do not read any build environment file if R_BUILD_ENVIRON is
         ## set to empty of something non-existent.
@@ -916,15 +940,17 @@
         ## FIXME: GNU make uses GNUmakefile (note capitalization)
         exclude <- exclude | bases %in% c("Read-and-delete-me", "GNUMakefile")
         ## Mac resource forks
-        exclude <- exclude | grepl("^\\._", bases)
+        exclude <- exclude | startsWith(bases, "._")
         exclude <- exclude | (isdir & grepl("^src.*/[.]deps$", allfiles))
 	## Windows DLL resource file
         exclude <- exclude | (allfiles == paste0("src/", pkgname, "_res.rc"))
         ## inst/doc/.Rinstignore is a mistake
-        exclude <- exclude | grepl("inst/doc/[.](Rinstignore|build[.]timestamp)$", allfiles)
-        exclude <- exclude | grepl("vignettes/[.]Rinstignore$", allfiles)
+        exclude <- exclude | endsWith(allfiles, "inst/doc/.Rinstignore") |
+            endsWith(allfiles, "inst/doc/.build.timestamp") |
+            endsWith(allfiles, "vignettes/.Rinstignore")
         ## leftovers
         exclude <- exclude | grepl("^.Rbuildindex[.]", allfiles)
+        ## or simply?  exclude <- exclude | startsWith(allfiles, ".Rbuildindex.")
         exclude <- exclude | (bases %in% .hidden_file_exclusions)
         unlink(allfiles[exclude], recursive = TRUE, force = TRUE)
         setwd(owd)
@@ -1001,7 +1027,7 @@
         ## Finalize
         filename <- paste0(pkgname, "_", desc["Version"], ".tar.gz")
         filepath <- file.path(startdir, filename)
-        ## NB: tests/reg-packages.R relies on this exact format!
+        ## NB: ../../../../tests/reg-packages.R relies on this exact format!
         messageLog(Log, "building ", sQuote(filename))
         res <- utils::tar(filepath, pkgname, compression = "gzip",
                           compression_level = 9L,
diff -Nru r-base-3.2.3/src/library/tools/R/check.R r-base-3.3.1/src/library/tools/R/check.R
--- r-base-3.2.3/src/library/tools/R/check.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/check.R	2016-04-18 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/check.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -215,9 +215,10 @@
                      env = "R_DEFAULT_PACKAGES='utils,grDevices,graphics,stats'")
             {
                 out <- R_runR(cmd, R_opts2, env)
+                ## htmltools produced non-UTF-8 output in Dec 2015
                 if (R_check_suppress_RandR_message)
                     grep('^Xlib: *extension "RANDR" missing on display', out,
-                         invert = TRUE, value = TRUE)
+                         invert = TRUE, value = TRUE, useBytes = TRUE)
                 else out
             }
 
@@ -325,35 +326,37 @@
                 warningLog(Log, "'qpdf' is needed for checks on size reduction of PDFs")
         }
         if (dir.exists("inst/doc") && do_install) check_doc_contents()
-        if (dir.exists("vignettes")) check_vign_contents()
-        if (dir.exists("inst/doc") && !dir.exists("vignettes")) {
-            pattern <- vignetteEngine("Sweave")$pattern
-            sources <- setdiff(list.files(file.path("inst", "doc"),
-                                          pattern = pattern),
-                               list.files("vignettes", pattern = pattern))
-            buildPkgs <- .get_package_metadata(".")["VignetteBuilder"]
-            if (!is.na(buildPkgs)) {
-                buildPkgs <- unlist(strsplit(buildPkgs, ","))
-                buildPkgs <- unique(gsub('[[:space:]]', '', buildPkgs))
-                engineList <- vignetteEngine(package = buildPkgs)
-                for(nm in names(engineList)) {
-                    pattern <- engineList[[nm]]$pattern
-                    sources <- c(sources,
-                                 setdiff(list.files(file.path("inst", "doc"),
-                                                    pattern = pattern),
-                                         list.files("vignettes", pattern = pattern)))
-                }
-            }
-            sources <- unique(sources)
-            if(length(sources)) {
-                checkingLog(Log, "for old-style vignette sources")
-                msg <- c("Vignette sources only in 'inst/doc':",
-                         strwrap(paste(sQuote(sources), collapse = ", "),
-                                 indent = 2L, exdent = 2L),
-                         "A 'vignettes' directory is required as from R 3.1.0",
-                         "and these will not be indexed nor checked")
-                ## warning or error eventually
-                noteLog(Log, paste(msg, collapse = "\n"))
+        if (dir.exists("vignettes")) check_vign_contents(ignore_vignettes)
+        if (!ignore_vignettes) {
+            if (dir.exists("inst/doc") && !dir.exists("vignettes")) {
+                pattern <- vignetteEngine("Sweave")$pattern
+                sources <- setdiff(list.files(file.path("inst", "doc"),
+                                              pattern = pattern),
+                                   list.files("vignettes", pattern = pattern))
+                buildPkgs <- .get_package_metadata(".")["VignetteBuilder"]
+                if (!is.na(buildPkgs)) {
+                    buildPkgs <- unlist(strsplit(buildPkgs, ","))
+                    buildPkgs <- unique(gsub('[[:space:]]', '', buildPkgs))
+                    engineList <- vignetteEngine(package = buildPkgs)
+                    for(nm in names(engineList)) {
+                        pattern <- engineList[[nm]]$pattern
+                        sources <- c(sources,
+                                     setdiff(list.files(file.path("inst", "doc"),
+                                                        pattern = pattern),
+                                             list.files("vignettes", pattern = pattern)))
+                    }
+                }
+                sources <- unique(sources)
+                if(length(sources)) {
+                    checkingLog(Log, "for old-style vignette sources")
+                    msg <- c("Vignette sources only in 'inst/doc':",
+                             strwrap(paste(sQuote(sources), collapse = ", "),
+                                     indent = 2L, exdent = 2L),
+                             "A 'vignettes' directory is required as from R 3.1.0",
+                             "and these will not be indexed nor checked")
+                    ## warning or error eventually
+                    noteLog(Log, paste(msg, collapse = "\n"))
+                }
             }
         }
 
@@ -379,7 +382,7 @@
 
         ## Check package vignettes.
         setwd(pkgoutdir)
-        run_vignettes(desc)
+        if (!ignore_vignettes) run_vignettes(desc)
 
     } ## end{ check_pkg }
 
@@ -622,9 +625,14 @@
                 summaryLog(Log)
                 do_exit(1L)
             } else {
+                ## <FIXME>
+                ## This is not quite right: if we issue a NOTE here, we
+                ## can no longer issue a WARNING in the description
+                ## encoding check below ....
                 noteLog(Log)
                 any <- TRUE
                 printLog0(Log, paste(out, collapse = "\n"), "\n")
+                ## </FIXME>
             }
         }
         ## Check the encoding.
@@ -642,7 +650,7 @@
         ## entries because these really are a part of R: hence, skip the
         ## check.
         check_license <- if (!is_base_pkg) {
-            Check_license <- Sys.getenv("_R_CHECK_LICENSE_", NA)
+            Check_license <- Sys.getenv("_R_CHECK_LICENSE_", NA_character_)
             if(is.na(Check_license)) {
                 ## The check code conditionalizes *output* on _R_CHECK_LICENSE_.
                 Sys.setenv('_R_CHECK_LICENSE_' = "TRUE")
@@ -657,8 +665,8 @@
             if (length(out)) {
                 if (check_license == "maybe") {
                     if (!any) warningLog(Log)
-                } else if (any(grepl("^(Standardizable: FALSE|Invalid license file pointers:)",
-                                     out))) {
+                } else if(any(startsWith(out, "Standardizable: FALSE"),
+                              startsWith(out, "Invalid license file pointers:"))) {
                     if (!any) warningLog(Log)
                 } else {
                     if (!any) noteLog(Log)
@@ -719,6 +727,14 @@
             }
         }
 
+        if(!is_base_pkg && is.na(db["Packaged"])) {
+            if(!any) (noteLog(Log))
+            any <- TRUE
+            printLog(Log,
+                     "Checking should be performed on sources prepared by 'R CMD build'.",
+                     "\n")
+        }
+
         if(!is.na(ncomp <- db["NeedsCompilation"])) {
             if (!ncomp %in% c("yes", "no")) {
                 if(!any) noteLog(Log)
@@ -728,7 +744,7 @@
         }
 
 
-        out <- format(tools:::.check_package_description2(dfile))
+        out <- format(.check_package_description2(dfile))
         if (length(out)) {
             if(!any) noteLog(Log)
             any <- TRUE
@@ -741,6 +757,7 @@
     check_build <- function()
     {
         ## currently only checks vignettes
+        if (ignore_vignettes) return()
         fv <- file.path("build", "vignette.rds")
         if(!file.exists(fv)) return()
         checkingLog(Log, "'build' directory")
@@ -779,24 +796,41 @@
             wrapLog("These files are defunct.",
                     "See manual 'Writing R Extensions'.\n")
         }
-        ## if README.md is present, it must be able to be processed
-        ## by CRAN to README.html, which is done by pandoc.
-        if (file.exists("README.md") && check_incoming) {
-            if (nzchar(Sys.which("pandoc"))) {
-                rfile <- file.path(tempdir(), "README.html")
-                out <- .pandoc_README_md_for_CRAN("README.md", rfile)
-                if(out$status) {
-                    if(!any) warningLog(Log)
+        if(check_incoming) {
+            ## CRAN must be able to convert
+            ##   inst/README.md or README.md
+            ##   inst/NEWS.md or NEWS.md
+            ## to HTML using pandoc: check that this works fine.
+            md_files <-
+                c(Filter(file.exists,
+                         c(file.path("inst", "README.md"),
+                           "README.md"))[1L],
+                  Filter(file.exists,
+                         c(file.path("inst", "NEWS.md"),
+                           "NEWS.md"))[1L])
+            md_files <- md_files[!is.na(md_files)]
+            if(length(md_files)) {
+                if(nzchar(Sys.which("pandoc"))) {
+                    for(ifile in md_files) {
+                        ofile <- tempfile("pandoc", fileext = ".html")
+                        out <- .pandoc_md_for_CRAN(ifile, ofile)
+                        if(out$status) {
+                            if(!any) warningLog(Log)
+                            any <- TRUE
+                            printLog(Log,
+                                     sprintf("Conversion of '%s' failed:\n",
+                                             ifile),
+                                     paste(out$stderr, collapse = "\n"),
+                                     "\n")
+                        }
+                        unlink(ofile)
+                    }
+                } else {
+                    if(!any) noteLog(Log)
                     any <- TRUE
-                    printLog(Log, "Conversion of README.md failed:\n",
-                             paste(out$stderr, collapse = "\n"), "\n")
+                    printLog(Log,
+                             "Files 'README.md' or 'NEWS.md' cannot be checked without 'pandoc' being installed.\n")
                 }
-            } else {
-                if(!any) noteLog(Log)
-                any <- TRUE
-                printLog(Log,
-                         "File README.md cannot be checked without ",
-                         "'pandoc' being installed.\n")
             }
         }
         topfiles <- Sys.glob(c("LICENCE", "LICENSE"))
@@ -1287,7 +1321,7 @@
         checkingLog(Log, "R files for syntax errors")
         Rcmd  <- "options(warn=1);tools:::.check_package_code_syntax(\"R\")"
         out <- R_runR(Rcmd, R_opts2, "R_DEFAULT_PACKAGES=NULL")
-        if (any(grepl("^Error", out))) {
+        if (any(startsWith(out, "Error"))) {
             errorLog(Log)
             printLog0(Log, paste(c(out, ""), collapse = "\n"))
 	    maybe_exit(1L)
@@ -1299,7 +1333,7 @@
 
     check_R_code <- function()
     {
-        if (!is_base_pkg) {
+        ## if (!is_base_pkg) {
             checkingLog(Log, "dependencies in R code")
             if (do_install) {
                 Rcmd <- paste("options(warn=1, showErrorCalls=FALSE)\n",
@@ -1326,7 +1360,7 @@
                     ## wrapLog(msg_DESCRIPTION)
                 } else resultLog(Log, "OK")
             }
-        }
+        ## }
 
         ## Check whether methods have all arguments of the corresponding
         ## generic.
@@ -1475,7 +1509,30 @@
             Rcmd <-
                 paste("options(warn=1)\n",
                       sprintf("tools:::.check_code_usage_in_package(package = \"%s\")\n", pkgname))
-            out3 <- R_runR2(Rcmd, "R_DEFAULT_PACKAGES=")
+            if(config_val_to_logical(Sys.getenv("_R_CHECK_CODE_USAGE_WITH_ONLY_BASE_ATTACHED_",
+                                                "true"))) {
+                out3 <-  R_runR2(Rcmd, "R_DEFAULT_PACKAGES=NULL")
+                if(length(pos <-
+                          grep("^Undefined global functions or variables:",
+                               out3))) {
+                    Rcmd <-
+                        sprintf("writeLines(strwrap(tools:::imports_for_undefined_globals(\"%s\"), exdent = 11))\n",
+                                paste(utils::tail(out3, -pos),
+                                      collapse = " "))
+                    miss <- R_runR2(Rcmd, "R_DEFAULT_PACKAGES=")
+                    if(length(miss)) {
+                        msg3 <- if(length(grep("^importFrom\\(\"methods\"",
+                                               miss))) {
+                            strwrap("to your NAMESPACE file (and ensure that your DESCRIPTION Imports field contains 'methods').")
+                        } else "to your NAMESPACE file."
+                        out3 <- c(out3,
+                                  c("Consider adding",
+                                    paste0("  ", miss),
+                                    msg3))
+                    }
+                }
+            } else
+                out3 <-  R_runR2(Rcmd, "R_DEFAULT_PACKAGES=")
         }
 
         if(!is_base_pkg && R_check_use_codetools && R_check_dot_internal) {
@@ -1703,7 +1760,7 @@
                 printLog0(Log, paste(c(out, ""), collapse = "\n"))
                 wrapLog("All user-level objects",
                         "in a package",
-                        if (any(grepl("^Undocumented S4", out)))
+                        if (any(startsWith(out, "Undocumented S4")))
                         "(including S4 classes and methods)",
                         "should have documentation entries.\n")
                 wrapLog(msg_writing_Rd)
@@ -1998,9 +2055,13 @@
         if (!any) resultLog(Log, "OK")
     }
 
-    check_vign_contents <- function()
+    check_vign_contents <- function(ignore_vignettes = FALSE)
     {
         checkingLog(Log, "files in 'vignettes'")
+        if (ignore_vignettes) {
+            resultLog(Log, "SKIPPED")
+            return()
+        }
         ## special case common problems.
         any <- FALSE
         pattern <- vignetteEngine("Sweave")$pattern
@@ -2282,7 +2343,7 @@
                       sprintf("tools:::check_compiled_code(\"%s\")",
                               file.path(libdir, pkgname)))
         out <- R_runR(Rcmd, R_opts2, "R_DEFAULT_PACKAGES=NULL")
-        if(length(out) == 1L && grepl("^Note:", out)) {
+        if(length(out) == 1L && startsWith(out, "Note:")) {
             ## This will be a note about symbols.rds not being available
             if(!is_base_pkg) {
                 noteLog(Log)
@@ -2342,7 +2403,7 @@
             summaryLog(Log)
             do_exit()
         }
-        if (any(grepl("^Error", out))) {
+        if (any(startsWith(out, "Error"))) {
             errorLog(Log)
             printLog0(Log, paste(c(out, ""), collapse = "\n"))
             wrapLog("\nIt looks like this package",
@@ -2353,8 +2414,7 @@
 
         checkingLog(Log, "whether the package can be loaded with stated dependencies")
         out <- R_runR(Rcmd, opts, c(env, env1), arch = arch)
-        if (any(grepl("^Error", out)) || length(attr(out, "status"))) {
-            warningLog(Log)
+        if (any(startsWith(out, "Error")) || length(attr(out, "status"))) {
             printLog0(Log, paste(c(out, ""), collapse = "\n"))
             wrapLog("\nIt looks like this package",
                     "(or one of its dependent packages)",
@@ -2382,10 +2442,32 @@
         ## the namespace
         if (file.exists(file.path(pkgdir, "NAMESPACE"))) {
             checkingLog(Log, "whether the namespace can be loaded with stated dependencies")
-            Rcmd <- sprintf("loadNamespace(\"%s\")", pkgname)
+            Rcmd <-
+                sprintf("options(warn=1)\ntools:::.load_namespace_rather_quietly(\"%s\")",
+                        pkgname)
             out <- R_runR(Rcmd, opts, c(env, env1), arch = arch)
-            if (any(grepl("^Error", out)) || length(attr(out, "status"))) {
+            any <- FALSE
+            if (any(startsWith(out, "Error")) || length(attr(out, "status"))) {
                 warningLog(Log)
+                any <- TRUE
+            } else {
+		## Drop tcltk warning if no DISPLAY variable
+		if(pkgname == "tcltk")
+		    out <- grep("Warning: no DISPLAY variable so Tk is not available",
+				out, fixed = TRUE, invert = TRUE, value = TRUE)
+                ## Drop warnings about replacing previous imports unless
+                ## these were disabled for the installation check.
+                check_imports_flag <-
+                    Sys.getenv("_R_CHECK_REPLACING_IMPORTS_", "TRUE")
+                if(config_val_to_logical(check_imports_flag))
+                    out <- grep("Warning: replacing previous import", out,
+                                fixed = TRUE, invert = TRUE, value = TRUE)
+                if(any(startsWith(out, "Warning"))) {
+                    noteLog(Log)
+                    any <- TRUE
+                }
+            }
+            if(any) {
                 printLog0(Log, paste(c(out, ""), collapse = "\n"))
                 wrapLog("\nA namespace must be able to be loaded",
                         "with just the base namespace loaded:",
@@ -2424,7 +2506,7 @@
                             self2 = FALSE, quote = TRUE)
             if(nzchar(arch)) env <- c(env, "R_DEFAULT_PACKAGES=NULL")
             out <- R_runR(Rcmd, opts, env, arch = arch)
-            if (any(grepl("^Error", out))) {
+            if (any(startsWith(out, "Error"))) {
                 warningLog(Log)
                 printLog0(Log, paste(c(out, ""), collapse = "\n"))
                 wrapLog("\nIt looks like this package",
@@ -2553,14 +2635,15 @@
 
             if (do_timings) {
                 tfile <- paste0(pkgname, "-Ex.timings")
-		times <- read.table(tfile, header = TRUE, row.names = 1L,
-				    colClasses = c("character", rep("numeric", 3)))
+		times <-
+                    utils::read.table(tfile, header = TRUE, row.names = 1L,
+                                      colClasses = c("character", rep("numeric", 3)))
                 o <- order(times[[1]]+times[[2]], decreasing = TRUE)
                 times <- times[o, ]
                 keep <- (times[[1]] + times[[2]] > 5) | (times[[3]] > 5)
                 if(any(keep)) {
                     printLog(Log, "Examples with CPU or elapsed time > 5s\n")
-                    times <- capture.output(format(times[keep, ]))
+                    times <- utils::capture.output(format(times[keep, ]))
                     printLog0(Log, paste(times, collapse = "\n"), "\n")
                 }
             }
@@ -2727,7 +2810,8 @@
                     lines <- lines[max(1, ll-12):ll]
                     if (R_check_suppress_RandR_message)
                         lines <- grep('^Xlib: *extension "RANDR" missing on display',
-                                      lines, invert = TRUE, value = TRUE)
+                                      lines, invert = TRUE, value = TRUE,
+                                      useBytes = TRUE)
                     printLog(Log, sprintf("Running the tests in %s failed.\n", sQuote(file)))
                     printLog(Log, "Last 13 lines of output:\n")
                     printLog0(Log, .format_lines_with_indent(lines), "\n")
@@ -2765,7 +2849,10 @@
 
     run_vignettes <- function(desc)
     {
+        libpaths <- .libPaths()
+        .libPaths(c(libdir, libpaths))
         vigns <- pkgVignettes(dir = pkgdir)
+        .libPaths(libpaths)
         if (is.null(vigns) || !length(vigns$docs)) return()
 
         if(do_install && !spec_install && !is_base_pkg && !extra_arch) {
@@ -2916,98 +3003,127 @@
             ## packages, or just base?
             ## FIXME: should we do this for multiple sub-archs?
 
-            checkingLog(Log, "running R code from vignettes")
+            ## Re-building the vignette outputs also runs the code, so
+            ## doing so as well creates no additional value unless the
+            ## results are compared against saved results (which could
+            ## perhaps also be integrated into buildVignettes().
+            ## Hence, when re-building, skip running the code when there
+            ## are no saved results.
+            ## Could make this controllable via some env var ...
+
+            build_vignettes <-
+                parse_description_field(desc, "BuildVignettes", TRUE)
+            if (!build_vignettes && as_cran) {
+                ## FOSS packages must be able to rebuild their vignettes
+                info <- analyze_license(desc["License"])
+                build_vignettes <- info$is_verified
+            }
+            do_build_vignettes <- do_build_vignettes && build_vignettes
+            skip_run_maybe <-
+                R_check_vignettes_skip_run_maybe && do_build_vignettes
+
             vigns <- pkgVignettes(dir = pkgdir)
-            res <- character()
-            cat("\n")
-            def_enc <- desc["Encoding"]
-            if( (is.na(def_enc))) def_enc <- ""
-            t1 <- proc.time()
-            for (i in seq_along(vigns$docs)) {
-                file <- vigns$docs[i]
-                name <- vigns$names[i]
-                enc <- vigns$encodings[i]
-                cat("  ", sQuote(basename(file)),
-                    if(nzchar(enc)) paste("using", sQuote(enc)),
-                    "...")
-                Rcmd <- paste0("options(warn=1)\ntools:::.run_one_vignette('",
-                               basename(file), "', '", vigns$dir, "'",
-                               if (nzchar(enc))
-                                   paste0(", encoding = '", enc, "'"),
-                               ", pkgdir='", vigns$pkgdir, "')")
-                outfile <- paste0(basename(file), ".log")
-                t1b <- proc.time()
-                status <- R_runR(Rcmd,
-                                 if (use_valgrind) paste(R_opts2, "-d valgrind") else R_opts2,
-                                 ## add timing as footer, as BATCH does
-                                 env = c(jitstr, "R_BATCH=1234", elibs,
-                                 "_R_CHECK_INTERNALS2_=1"),
-                                 stdout = outfile, stderr = outfile)
-                t2b <- proc.time()
-                out <- readLines(outfile, warn = FALSE)
-                savefile <- file.path(dirname(file), paste0(name, ".Rout.save"))
-                if(length(grep("^  When (running|tangling|sourcing)", out,
-                               useBytes = TRUE))) {
-                    cat(" failed\n")
-                    res <- c(res,
-                             paste("when running code in", sQuote(basename(file))),
-                             "  ...",
-                             utils::tail(out, as.numeric(Sys.getenv("_R_CHECK_VIGNETTES_NLINES_", 10))))
-                } else if(status || ! " *** Run successfully completed ***" %in% out) {
-                    ## (Need not be the final line if running under valgrind)
-                    cat(" failed to complete the test\n")
-                    out <- c(out, "", "... incomplete output.  Crash?")
-                    res <- c(res,
-                             paste("when running code in", sQuote(basename(file))),
-                             "  ...",
-                             utils::tail(out, as.numeric(Sys.getenv("_R_CHECK_VIGNETTES_NLINES_", 10))))
-                } else if (file.exists(savefile)) {
-                    cmd <- paste0("invisible(tools::Rdiff('",
-                                 outfile, "', '", savefile, "',TRUE,TRUE))")
-                    out2 <- R_runR(cmd, R_opts2)
-                    if(length(out2)) {
-                        print_time(t1b, t2b, NULL)
-                        cat("\ndifferences from ", sQuote(basename(savefile)),
-                            "\n", sep = "")
-                        writeLines(c(out2, ""))
+            savefiles <-
+                file.path(dirname(vigns$docs),
+                          paste0(vigns$names, ".Rout.save"))
+            ran <- FALSE
+
+            if(!skip_run_maybe || any(file.exists(savefiles))) {
+                checkingLog(Log, "running R code from vignettes")
+                res <- character()
+                cat("\n")
+                def_enc <- desc["Encoding"]
+                if( (is.na(def_enc))) def_enc <- ""
+                t1 <- proc.time()
+                iseq <- seq_along(savefiles)
+                if(skip_run_maybe)
+                    iseq <- iseq[file.exists(savefiles)]
+                for (i in iseq) {
+                    file <- vigns$docs[i]
+                    name <- vigns$names[i]
+                    enc <- vigns$encodings[i]
+                    cat("  ", sQuote(basename(file)),
+                        if(nzchar(enc)) paste("using", sQuote(enc)),
+                        "...")
+                    Rcmd <- paste0("options(warn=1)\ntools:::.run_one_vignette('",
+                                   basename(file), "', '", vigns$dir, "'",
+                                   if (nzchar(enc))
+                                       paste0(", encoding = '", enc, "'"),
+                                   ", pkgdir='", vigns$pkgdir, "')")
+                    outfile <- paste0(basename(file), ".log")
+                    t1b <- proc.time()
+                    status <- R_runR(Rcmd,
+                                     if (use_valgrind) paste(R_opts2, "-d valgrind") else R_opts2,
+                                     ## add timing as footer, as BATCH does
+                                     env = c(jitstr, "R_BATCH=1234", elibs,
+                                     "_R_CHECK_INTERNALS2_=1"),
+                                     stdout = outfile, stderr = outfile)
+                    t2b <- proc.time()
+                    out <- readLines(outfile, warn = FALSE)
+                    pos <- which(out == " *** Run successfully completed ***")
+                    if(!length(pos) || any(nzchar(out[seq_len(pos[1L] - 1L)])))
+                        ran <- TRUE
+                    savefile <- savefiles[i]
+                    if(length(grep("^  When (running|tangling|sourcing)", out,
+                                   useBytes = TRUE))) {
+                        cat(" failed\n")
+                        res <- c(res,
+                                 paste("when running code in", sQuote(basename(file))),
+                                 "  ...",
+                                 utils::tail(out, as.numeric(Sys.getenv("_R_CHECK_VIGNETTES_NLINES_", "10"))))
+                    } else if(status || ! " *** Run successfully completed ***" %in% out) {
+                        ## (Need not be the final line if running under valgrind)
+                        cat(" failed to complete the test\n")
+                        out <- c(out, "", "... incomplete output.  Crash?")
+                        res <- c(res,
+                                 paste("when running code in", sQuote(basename(file))),
+                                 "  ...",
+                                 utils::tail(out, as.numeric(Sys.getenv("_R_CHECK_VIGNETTES_NLINES_", "10"))))
+                    } else if (file.exists(savefile)) {
+                        cmd <- paste0("invisible(tools::Rdiff('",
+                                      outfile, "', '", savefile, "',TRUE,TRUE))")
+                        out2 <- R_runR(cmd, R_opts2)
+                        if(length(out2)) {
+                            print_time(t1b, t2b, NULL)
+                            cat("\ndifferences from ", sQuote(basename(savefile)),
+                                "\n", sep = "")
+                            writeLines(c(out2, ""))
+                        } else {
+                            print_time(t1b, t2b, NULL)
+                            cat(" OK\n")
+                            if (!config_val_to_logical(Sys.getenv("_R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_", use_valgrind)))
+                                unlink(outfile)
+                        }
                     } else {
                         print_time(t1b, t2b, NULL)
                         cat(" OK\n")
                         if (!config_val_to_logical(Sys.getenv("_R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_", use_valgrind)))
                             unlink(outfile)
                     }
-                } else {
-                    print_time(t1b, t2b, NULL)
-                    cat(" OK\n")
-                    if (!config_val_to_logical(Sys.getenv("_R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_", use_valgrind)))
-                        unlink(outfile)
                 }
-            }
-            t2 <- proc.time()
-            print_time(t1, t2, Log)
-            if (R_check_suppress_RandR_message)
-                res <- grep('^Xlib: *extension "RANDR" missing on display', res,
-                            invert = TRUE, value = TRUE, useBytes = TRUE)
-            if(length(res)) {
-                if(length(grep("there is no package called", res,
-                               useBytes = TRUE))) {
-                    warningLog(Log, "Errors in running code in vignettes:")
-                    printLog0(Log, paste(c(res, "", ""), collapse = "\n"))
+                t2 <- proc.time()
+                if(!ran) {
+                    resultLog(Log, "NONE")
                 } else {
-                    errorLog(Log, "Errors in running code in vignettes:")
-                    printLog0(Log, paste(c(res, "", ""), collapse = "\n"))
-		    maybe_exit(1L)
+                    print_time(t1, t2, Log)
+                    if(R_check_suppress_RandR_message)
+                        res <- grep('^Xlib: *extension "RANDR" missing on display', res,
+                                    invert = TRUE, value = TRUE, useBytes = TRUE)
+                    if(length(res)) {
+                        if(length(grep("there is no package called", res,
+                                       useBytes = TRUE))) {
+                            warningLog(Log, "Errors in running code in vignettes:")
+                            printLog0(Log, paste(c(res, "", ""), collapse = "\n"))
+                        } else {
+                            errorLog(Log, "Errors in running code in vignettes:")
+                            printLog0(Log, paste(c(res, "", ""), collapse = "\n"))
+                            maybe_exit(1L)
+                        }
+                    } else resultLog(Log, "OK")
                 }
-            } else resultLog(Log, "OK")
-
-            build_vignettes <-
-                parse_description_field(desc, "BuildVignettes", TRUE)
-            if (!build_vignettes && as_cran) {
-                ## FOSS packages must be able to rebuild their vignettes
-                info <- analyze_license(desc["License"])
-                build_vignettes <- info$is_verified
             }
-            if (do_build_vignettes && build_vignettes) {
+
+            if (do_build_vignettes) {
                 checkingLog(Log, "re-building of vignette outputs")
                 ## copy the whole pkg directory to check directory
                 ## so we can work in place, and allow ../../foo references.
@@ -3034,7 +3150,7 @@
                                file.path(pkgoutdir, "vign_test", pkgname0),
                                "')")
                 t1 <- proc.time()
-                outfile <- tempfile()
+                outfile <- file.path(pkgoutdir, "build_vignettes.log")
                 status <- R_runR(Rcmd, R_opts2, jitstr,
                                  stdout = outfile, stderr = outfile)
                 t2 <- proc.time()
@@ -3046,13 +3162,13 @@
                 warns <- grep("^Warning: file .* is not portable",
                               out, value = TRUE, useBytes = TRUE)
                 if (status) {
-                    noteLog(Log)
-                    out <- utils::tail(out, as.numeric(Sys.getenv("_R_CHECK_VIGNETTES_NLINES_", 25)))
+                    if(skip_run_maybe || !ran) warningLog(Log) else noteLog(Log)
+                    out <- utils::tail(out, as.numeric(Sys.getenv("_R_CHECK_VIGNETTES_NLINES_", "25")))
                     printLog0(Log,
                               paste(c("Error in re-building vignettes:",
                                       "  ...", out, "", ""), collapse = "\n"))
                 } else if(nw <- length(warns)) {
-                    noteLog(Log)
+                    if(skip_run_maybe || !ran) warningLog(Log) else noteLog(Log)
                     msg <- ngettext(nw,
                                     "Warning in re-building vignettes:\n",
                                     "Warnings in re-building vignettes:\n",
@@ -3063,6 +3179,8 @@
                     ## clean up
                     if (config_val_to_logical(Sys.getenv("_R_CHECK_CLEAN_VIGN_TEST_", "true")))
                         unlink(vd2, recursive = TRUE)
+                    if (!config_val_to_logical(Sys.getenv("_R_CHECK_ALWAYS_LOG_VIGNETTE_OUTPUT_", "false")))
+                            unlink(outfile)
                     print_time(t1, t2, Log)
                     resultLog(Log, "OK")
                 }
@@ -3270,7 +3388,7 @@
         alldirs <- sub("^./","", alldirs)
         alldirs <- alldirs[alldirs != "."]
         bases <- basename(alldirs)
-        dots <- c(dots, setdiff(alldirs[grepl("^[.]", bases)], ".aspell"))
+        dots <- c(dots, setdiff(alldirs[startsWith(bases, ".")], ".aspell"))
         if (length(dots)) {
             noteLog(Log, "Found the following hidden files and directories:")
             printLog0(Log, .format_lines_with_indent(dots), "\n")
@@ -3280,9 +3398,11 @@
             if(cran) {
                 known <- basename(dots) %in% .hidden_file_exclusions
                 known <- known | grepl("^.Rbuildindex[.]", dots) |
-                  grepl("inst/doc/[.](Rinstignore|build[.]timestamp)$", dots) |
-                  grepl("vignettes/[.]Rinstignore$", dots) |
-                  grepl("^src.*/[.]deps$", dots)
+                    ## or?      startsWith(dots,".Rbuildindex.") |
+                    endsWith(dots, "inst/doc/.Rinstignore") |
+                    endsWith(dots, "inst/doc/.build.timestamp") |
+                    endsWith(dots, "vignettes/.Rinstignore") |
+                    grepl("^src.*/[.]deps$", dots)
 		if (all(known))
                     printLog(Log, "\nCRAN-pack knows about all of these\n")
                 else if (any(!known)) {
@@ -3312,7 +3432,7 @@
             messageLog(Log, "skipping installation test")
         else {
             use_install_log <-
-                (grepl("^check", install) || R_check_use_install_log
+                (startsWith(install, "check") || R_check_use_install_log
                  || !isatty(stdout()))
             INSTALL_opts <- install_args
             ## don't use HTML, checkRd goes over the same ground.
@@ -3323,7 +3443,7 @@
                 INSTALL_opts <- c(INSTALL_opts,  "--no-multiarch")
             INSTALL_opts <- paste(INSTALL_opts, collapse = " ")
             args <- c("INSTALL", "-l", shQuote(libdir), INSTALL_opts,
-                      shQuote(if (WINDOWS) shortPathName(pkgdir) else pkgdir))
+                      shQuote(if (WINDOWS) utils::shortPathName(pkgdir) else pkgdir))
             if (!use_install_log) {
                 ## Case A: No redirection of stdout/stderr from installation.
                 ## This is very rare: needs _R_CHECK_USE_INSTALL_LOG_ set
@@ -3340,11 +3460,10 @@
                 ## Case B. All output from installation redirected,
                 ## or already available in the log file.
                 checkingLog(Log,
-                            "whether package ",
-                            sQuote(desc["Package"]),
+			    "whether package ", sQuote(desc["Package"]),
                             " can be installed")
                 outfile <- file.path(pkgoutdir, "00install.out")
-                if (grepl("^check", install)) {
+                if (startsWith(install, "check")) {
                     if (!nzchar(arg_libdir))
                         printLog(Log, "\nWarning: --install=check... specified without --library\n")
                     thislog <- substr(install, 7L, 1000L)
@@ -3591,6 +3710,14 @@
 
                 lines <- unique(lines)
 
+                ## Can get reports like
+                ## Warning: No generic function ‘as.vector’ found corresponding to requested imported methods from package ‘Matrix’ when loading ‘MatrixModels’ (malformed exports?)
+                ## Exclude these unless they are about the current package.
+                load_re <- "Warning: No generic function.*corresponding to requested imported methods"
+                ex <- grepl(load_re, lines, useBytes = TRUE) &
+                    !grepl(pkgname, lines, fixed = TRUE, useBytes = TRUE)
+                lines <- lines[!ex]
+
                 note_re <-
                     "warning: control may reach end of non-void function"
 
@@ -3624,8 +3751,8 @@
     ## It also depends on the total being last.
     check_install_sizes <- function()
     {
-        ## if we used a log, the installation need not still exist.
         pd <- file.path(libdir, pkgname)
+        ## if we used a log, the installation would not need to remain.
         if (!dir.exists(pd)) return()
         checkingLog(Log, "installed package size")
         owd <- setwd(pd)
@@ -3640,7 +3767,7 @@
             printLog(Log, sprintf("  installed size is %4.1fMb\n", total/1024))
             rest <- res2[-nrow(res2), ]
             rest[, 2L] <- sub("./", "", rest[, 2L])
-            # keep only top-level directories
+            ## keep only top-level directories
             rest <- rest[!grepl("/", rest[, 2L]), ]
             rest <- rest[rest[, 1L] > 1024, ] # > 1Mb
             if(nrow(rest)) {
@@ -3648,12 +3775,8 @@
                 printLog(Log, "  sub-directories of 1Mb or more:\n")
                 size <- sprintf('%4.1fMb', rest[, 1L]/1024)
                 printLog0(Log,
-                          paste("    ",
-                                format(rest[o, 2L], justify = "left"),
-                                "  ",
-                                format(size[o], justify = "right"),
-                                "\n",
-                                sep=""))
+			  paste0("    ", format(rest[o, 2L], justify = "left"),
+				 "  ", format(size[o], justify = "right"), "\n"))
             }
         } else resultLog(Log, "OK")
         setwd(owd)
@@ -3735,10 +3858,10 @@
     {
         checkingLog(Log, "CRAN incoming feasibility")
         res <- .check_package_CRAN_incoming(pkgdir)
+        bad <- FALSE
         if(length(res)) {
             out <- format(res)
-            if((length(out) == 1L) &&
-               grepl("^Maintainer: ", out)) {
+            if(length(out) == 1L && startsWith(out, "Maintainer: ")) {
                 ## Special-case when there is only the maintainer
                 ## address to note (if at all).
                 maintainer <- res$Maintainer
@@ -3751,8 +3874,7 @@
                 else resultLog(Log, "Note_to_CRAN_maintainers")
             } else if(length(res$bad_package)) {
                 errorLog(Log)
-                printLog0(Log, paste(c(out, ""), collapse = "\n"))
-		maybe_exit(1L)
+                bad <- TRUE
             } else if(length(res$bad_version) ||
                       identical(res$foss_with_BuildVignettes, TRUE) ||
                       res$empty_Maintainer_name ||
@@ -3760,7 +3882,8 @@
                 warningLog(Log)
             else if(length(res) > 1L) noteLog(Log)
             else resultLog(Log, "OK")
-            printLog0(Log, paste(out, "\n", sep = ""))
+            printLog0(Log, c(paste(out, collapse = "\n\n"), "\n"))
+            if(bad) maybe_exit(1L)
         } else resultLog(Log, "OK")
     }
 
@@ -3863,7 +3986,7 @@
         ## not required in the package DESCRIPTION file.
         ## Namespace imports must really be in Depends.
         res <- .check_package_depends(pkgdir, R_check_force_suggests,
-                                      check_incoming)
+                                      check_incoming, ignore_vignettes)
         if(any(lengths(res) > 0L)) {
             out <- format(res)
             allowed <- c("suggests_but_not_installed",
@@ -3904,7 +4027,7 @@
             printLog(Log, "Only *source* packages can be checked.\n")
             summaryLog(Log)
             do_exit(1L)
-        } else if (!grepl("^check", install)) {
+        } else if (!startsWith(install, "check")) {
             ini <- character()
             ## Check for package 'src' subdirectories with object
             ## files (but not if installation was already performed).
@@ -4056,6 +4179,7 @@
             "      --no-manual       do not produce the PDF manual",
             "      --no-vignettes    do not run R code in vignettes nor build outputs",
             "      --no-build-vignettes    do not build vignette outputs",
+            "      --ignore-vignettes    skip all tests on vignettes",
             "      --run-dontrun     do run \\dontrun sections in the Rd files",
             "      --run-donttest    do run \\donttest sections in the Rd files",
             "      --use-gct         use 'gctorture(TRUE)' when running examples/tests",
@@ -4087,7 +4211,7 @@
     options(showErrorCalls=FALSE, warn = 1)
 
     ## Read in check environment file.
-    Renv <- Sys.getenv("R_CHECK_ENVIRON", unset = NA)
+    Renv <- Sys.getenv("R_CHECK_ENVIRON", unset = NA_character_)
     if(!is.na(Renv)) {
         ## Do not read any check environment file if R_CHECK_ENVIRON is
         ## set to empty of something non-existent.
@@ -4127,6 +4251,7 @@
     do_tests <- TRUE
     do_vignettes <- TRUE
     do_build_vignettes <- TRUE
+    ignore_vignettes <- FALSE
     do_manual <- TRUE
     use_gct <- FALSE
     use_valgrind <- FALSE
@@ -4190,7 +4315,11 @@
                  call. = FALSE, domain = NA)
         } else if (a == "--no-vignettes") {
             do_vignettes  <- FALSE
-        } else if (a == "--no-manual") {
+        } else if (a == "--ignore-vignettes") {
+            ignore_vignettes  <- TRUE
+            do_vignettes  <- FALSE
+            do_build_vignettes  <- FALSE
+       } else if (a == "--no-manual") {
             do_manual  <- FALSE
         } else if (a == "--no-latex") {
             stop("'--no-latex' is defunct: use '--no-manual' instead",
@@ -4257,7 +4386,7 @@
             f <- dir(file.path(R.home(), "bin"))
             archs <- f[f %in% c("i386", "x64")]
             ## if we have x64, can only run it on a 64-bit OS
-            if (length(archs) > 1L && !grepl("x64", utils:::win.version()))
+            if (length(archs) > 1L && !grepl("x64", utils::win.version()))
                 archs <- "i386"
         } else {
             wd2 <- setwd(file.path(R.home("bin"), "exec"))
@@ -4366,6 +4495,9 @@
         config_val_to_logical(Sys.getenv("_R_CHECK_TOPLEVEL_FILES_", "FALSE"))
     R_check_exit_on_first_error <-
 	config_val_to_logical(Sys.getenv("_R_CHECK_EXIT_ON_FIRST_ERROR_", "FALSE"))
+    R_check_vignettes_skip_run_maybe <-
+        config_val_to_logical(Sys.getenv("_R_CHECK_VIGNETTES_SKIP_RUN_MAYBE_",
+                                         "FALSE"))
 
     if (!nzchar(check_subdirs)) check_subdirs <- R_check_subdirs_strict
 
@@ -4380,12 +4512,15 @@
         Sys.setenv("_R_SHLIB_BUILD_OBJECTS_SYMBOL_TABLES_" = "TRUE")
         Sys.setenv("_R_CHECK_DOT_FIRSTLIB_" = "TRUE")
         Sys.setenv("_R_CHECK_PACKAGES_USED_CRAN_INCOMING_NOTES_" = "TRUE")
-        prev <- Sys.getenv("_R_CHECK_LIMIT_CORES_", NA)
+        prev <- Sys.getenv("_R_CHECK_LIMIT_CORES_", NA_character_)
         if(is.na(prev)) Sys.setenv("_R_CHECK_LIMIT_CORES_" = "TRUE")
-        prev <- Sys.getenv("_R_CHECK_SCREEN_DEVICE_", NA)
+        prev <- Sys.getenv("_R_CHECK_SCREEN_DEVICE_", NA_character_)
         if(is.na(prev)) Sys.setenv("_R_CHECK_SCREEN_DEVICE_" = "stop")
         Sys.setenv("_R_CHECK_CODE_USAGE_VIA_NAMESPACES_" = "TRUE")
+        Sys.setenv("_R_CHECK_CODE_USAGE_WITH_ONLY_BASE_ATTACHED_" = "TRUE")
         Sys.setenv("_R_CHECK_S3_METHODS_NOT_REGISTERED_" = "TRUE")
+        Sys.setenv("_R_CHECK_PACKAGE_DATASETS_SUPPRESS_NOTES_" = "TRUE")
+        Sys.setenv("_R_CHECK_PACKAGES_USED_IGNORE_UNUSED_IMPORTS_" = "TRUE")
         R_check_vc_dirs <- TRUE
         R_check_executables_exclusions <- FALSE
         R_check_doc_sizes2 <- TRUE
@@ -4398,10 +4533,12 @@
         R_check_FF <- "registration"
         do_timings <- TRUE
         R_check_toplevel_files <- TRUE
+        R_check_vignettes_skip_run_maybe <- TRUE
     } else {
         ## do it this way so that INSTALL produces symbols.rds
         ## when called from check but not in general.
-        if(is.na(Sys.getenv("_R_SHLIB_BUILD_OBJECTS_SYMBOL_TABLES_", NA)))
+        if(is.na(Sys.getenv("_R_SHLIB_BUILD_OBJECTS_SYMBOL_TABLES_",
+                            NA_character_)))
             Sys.setenv("_R_SHLIB_BUILD_OBJECTS_SYMBOL_TABLES_" = "TRUE")
     }
 
@@ -4509,12 +4646,14 @@
             }
             ## force the use of internal untar unless over-ridden
             ## so e.g. .tar.xz works everywhere
-            if (untar(pkg, exdir = dir,
-                      tar =  Sys.getenv("R_INSTALL_TAR", "internal"))) {
+            if (utils::untar(pkg, exdir = dir,
+                             tar = Sys.getenv("R_INSTALL_TAR", "internal"))) {
                 errorLog(Log, sprintf("cannot unpack %s", sQuote(pkg)))
                 summaryLog(Log)
                 do_exit(1L)
             }
+            size <- file.info(pkg)$size
+            Sys.setenv("_R_CHECK_SIZE_OF_TARBALL_" = size)
             ## this assumes foo_x.y.tar.gz unpacks to foo, but we are about
             ## to test that.
             pkg <- file.path(dir, pkgname0)
@@ -4554,9 +4693,13 @@
         if (!do_examples && !spec_install) opts <- c(opts, "--no-examples")
         if (!do_tests && !spec_install) opts <- c(opts, "--no-tests")
         if (!do_manual && !spec_install) opts <- c(opts, "--no-manual")
-        if (!do_vignettes && !spec_install) opts <- c(opts, "--no-vignettes")
-        if (!do_build_vignettes && !spec_install)
-            opts <- c(opts, "--no-build-vignettes")
+        if (ignore_vignettes) opts <- c(opts, "--ignore-vignettes")
+        else {
+            if (!do_vignettes && !spec_install)
+                opts <- c(opts, "--no-vignettes")
+            if (!do_build_vignettes && !spec_install)
+                opts <- c(opts, "--no-build-vignettes")
+        }
         if (use_gct) opts <- c(opts, "--use-gct")
         if (use_valgrind) opts <- c(opts, "--use-valgrind")
         if (as_cran) opts <- c(opts, "--as-cran")
@@ -4570,7 +4713,7 @@
             Sys.setenv(R_LIBS = env_path(libdir, R_LIBS))
         }
         if (WINDOWS && grepl(" ", libdir)) # need to avoid spaces in libdir
-            libdir <- gsub("\\", "/", shortPathName(libdir), fixed = TRUE)
+            libdir <- gsub("\\", "/", utils::shortPathName(libdir), fixed = TRUE)
 
         ## Package sources from the R distribution are special.  They
         ## have a 'DESCRIPTION.in' file (instead of 'DESCRIPTION'),
@@ -4710,7 +4853,7 @@
                 if (this_multiarch && length(R_check_skip_arch))
                     inst_archs <- inst_archs[!(inst_archs %in% R_check_skip_arch)]
             }
-        }   ## end of if (!is_base_pkg)
+        } else check_incoming <- FALSE  ## end of if (!is_base_pkg)
 
         elibs <- if(is_base_pkg) character()
         else if(R_check_depends_only)
@@ -4750,8 +4893,6 @@
             }
         }
         summaryLog(Log)
-        if (Log$errors > 0L)
-            do_exit(1L)
 
         if(config_val_to_logical(Sys.getenv("_R_CHECK_CRAN_STATUS_SUMMARY_",
                                             "FALSE"))) {
@@ -4761,6 +4902,9 @@
             }
         }
 
+        if(Log$errors > 0L)
+            do_exit(1L)
+
         closeLog(Log)
         message("")
 
diff -Nru r-base-3.2.3/src/library/tools/R/checktools.R r-base-3.3.1/src/library/tools/R/checktools.R
--- r-base-3.2.3/src/library/tools/R/checktools.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/checktools.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/checktools.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 2013-2014 The R Core Team
+#  Copyright (C) 2013-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -110,19 +110,21 @@
     ## Build a package db from the source packages in the working
     ## directory.
     write_PACKAGES(dir, type = "source")
-
+    if(dir.exists(depdir <- file.path(dir, "Depends"))) {
+        write_PACKAGES(depdir, type = "source")
+        curl <- c(curl, paste0(curl, "/Depends"))
+    }
     ## Determine packages available locally (for checking) and in the
     ## repositories, and merge the information giving preference to the
     ## former.
-    curls <- utils::contrib.url(getOption("repos"), type = "source")
     localones <- utils::available.packages(contriburl = curl,
                                            type = "source")
+    curls <- utils::contrib.url(getOption("repos"), type = "source")
     available <- utils::available.packages(contriburl = curls,
                                            type = "source")
-    pos <- match(localones[, "Package"], available[, "Package"])
-    if(length(pos <- pos[!is.na(pos)]))
-        available <- available[-pos, , drop = FALSE]
     available <- rbind(localones, available)
+    available <-
+        available[!duplicated(available[, "Package"]), , drop = FALSE]
     curls <- c(curl, curls)
 
     ## As of c52164, packages with OS_type different from the current
@@ -199,7 +201,8 @@
             for(i in seq_along(rfiles)) {
                 message(sprintf("downloading %s ... ", rfiles[i]),
                         appendLF = FALSE)
-                status <- if(!utils::download.file(rfurls[i], rfiles[i]))
+                status <- if(!utils::download.file(rfurls[i], rfiles[i],
+                                                   quiet = TRUE))
                     "ok" else "failed"
                 message(status)
             }
@@ -222,8 +225,7 @@
     depends <-
         package_dependencies(pnames, available, which = "most")
     depends <- setdiff(unique(unlist(depends, use.names = FALSE)),
-                       unlist(.get_standard_package_names(),
-                              use.names = FALSE))
+                       .get_standard_package_names()$base)
 
     ## Need to install depends which are not installed or installed but
     ## old.
@@ -236,7 +238,7 @@
                                         available = available)[, "Package"]))
     if(length(depends)) {
         message(paste(strwrap(sprintf("installing dependencies %s",
-                                      paste(sQuote(depends),
+                                      paste(sQuote(sort(depends)),
                                             collapse = ", ")),
                               exdent = 2L),
                       collapse = "\n"), domain = NA)
@@ -341,7 +343,7 @@
 
     timings <- do.call(rbind, lapply(timings, summary))
     rownames(timings) <- pnames
-    write.table(timings, "timings.tab")
+    utils::write.table(timings, "timings.tab")
 
     file.rename(sprintf("%s.Rcheck", rnames),
                 sprintf("rdepends_%s.Rcheck", rnames))
@@ -415,7 +417,7 @@
         options <- c(num, options)
     }
 
-    dis <- Sys.getenv("DISPLAY", unset = NA)
+    dis <- Sys.getenv("DISPLAY", unset = NA_character_)
 
     ## We need to start Xvfb with the given options and obtain its pid
     ## so that we can terminate it when done checking.
@@ -467,7 +469,7 @@
 {
     dir <- normalizePath(dir)
     outdirs <- dir(dir, pattern = "\\.Rcheck")
-    ind <- grepl("^rdepends_", basename(outdirs))
+    ind <- startsWith(basename(outdirs), "rdepends_")
     ## Re-arrange to have reverse dependencies last if at all.
     outdirs <- if(invert)
         c(if(all) outdirs[!ind], outdirs[ind])
@@ -540,17 +542,7 @@
             "OK")) {
         writeLines(c("", "Check results details:"))
         details <- check_packages_in_dir_details(logs = logs)
-        flags <- details$Flags
-        out <- cbind(sprintf("Package: %s %s",
-                             details$Package, details$Version),
-                     ifelse(nzchar(flags),
-                            sprintf("Flags: %s\n", flags),
-                            ""),
-                     sprintf("Check: %s, Result: %s",
-                             details$Check, details$Status),
-                     c(gsub("\n", "\n  ", details$Output,
-                            perl = TRUE, useBytes = TRUE)))
-        cat(t(out), sep = c("\n", "", "\n  ", "\n\n"))
+        writeLines(paste(format(details), collapse = "\n\n"))
         invisible(TRUE)
     } else {
         invisible(FALSE)
@@ -582,7 +574,7 @@
         tfiles <- Sys.glob(file.path(R_check_outdirs(dir, all = all),
                                      "*-Ex.timings"))
         if(length(tfiles)) message("")
-        timings <- lapply(tfiles, read.table, header = TRUE)
+        timings <- lapply(tfiles, utils::read.table, header = TRUE)
         ## Order by CPU time.
         timings <- lapply(timings,
                           function(x)
@@ -647,7 +639,7 @@
 {
     if(!length(results)) return()
     status <- vapply(results, `[[`, "", "status")
-    ind <- grepl("^rdepends_", names(results))
+    ind <- startsWith(names(results), "rdepends_")
     tab <- table(ifelse(ind, "Reverse depends", "Source packages"),
                  status, deparse.level = 0L)
     tab <- tab[match(c("Source packages", "Reverse depends"),
@@ -708,6 +700,8 @@
         lines <- iconv(lines, enc, "UTF-8", sub = "byte")
         ## If the check log uses ASCII, there should be no non-ASCII
         ## characters in the message lines: could check for this.
+        if(any(bad <- !validEnc(lines)))
+            lines[bad] <- iconv(lines[bad], to = "ASCII", sub = "byte")
     } else return()
 
     ## Get header.
@@ -740,6 +734,7 @@
         len <- len - 1L
     }
     ## Summary footers.
+    ## Better (but 'perl=TRUE' ??) if(startsWith(lines[len], "Status: "))
     if(grepl("^Status: ", lines[len],
              perl = TRUE, useBytes = TRUE)) {
         ## New-style status summary.
@@ -856,7 +851,7 @@
     ## Group when used ...
 
     mysub <- function(p, r, x) sub(p, r, x, perl = TRUE, useBytes = TRUE)
-    
+
     checks <- db[, "Check"]
     checks <- mysub(sprintf("checking whether package (%s).*(%s) can be installed",
                             lqa, rqa),
@@ -873,16 +868,45 @@
     db[, "Check"] <- checks
     ## In fact, for tabulation purposes it would even be more convenient
     ## to shorten the check names ...
-    
+
     db[, "Output"] <- mysub("[[:space:]]+$", "", db[, "Output"])
-    
+
     db <- as.data.frame(db, stringsAsFactors = FALSE)
     db$Check <- as.factor(db$Check)
     db$Status <- as.factor(db$Status)
 
+    class(db) <- c("check_details", "data.frame")
     db
 }
 
+format.check_details <-
+function(x, ...)
+{
+    flags <- x$Flags
+    flavor <- x$Flavor
+    paste(sprintf("Package: %s %s\n",
+                  x$Package, x$Version),
+          ifelse(nzchar(flavor),
+                 sprintf("Flavor: %s\n", flavor),
+                 ""),
+          ifelse(nzchar(flags),
+                 sprintf("Flags: %s\n", flags),
+                 ""),
+          sprintf("Check: %s, Result: %s\n",
+                  x$Check, x$Status),
+          sprintf("  %s",
+                  gsub("\n", "\n  ", x$Output,
+                       perl = TRUE, useBytes = TRUE)),
+          sep = "")
+}
+
+print.check_details <-
+function(x, ...)
+{
+    writeLines(paste(format(x, ...), collapse = "\n\n"))
+    invisible(x)
+}
+
 ### ** check_packages_in_dir_changes
 
 check_packages_in_dir_changes <-
@@ -941,12 +965,12 @@
                    e
                })
     db <- do.call(rbind, chunks)
-    
+
     ## Drop checks that are OK in both versions
     x.issue <- !is.na(match(db$Status.x, c("NOTE","ERROR","WARNING")))
     y.issue <- !is.na(match(db$Status.y, c("NOTE","ERROR","WARNING")))
     db <- db[x.issue | y.issue,]
-    
+
     ## Even with the above simplification, missing entries do not
     ## necessarily indicate "OK" (checks could have been skipped).
     ## Hence leave as missing and show as empty in the diff.
diff -Nru r-base-3.2.3/src/library/tools/R/CRANtools.R r-base-3.3.1/src/library/tools/R/CRANtools.R
--- r-base-3.2.3/src/library/tools/R/CRANtools.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/CRANtools.R	2016-03-16 23:03:29.000000000 +0000
@@ -175,47 +175,28 @@
     invisible(x)
 }
 
+## Summarize complete CRAN check status according to maintainer.
 
-## CRAN_check_results <-
-## function()
-## {
-##     ## This allows for partial local mirrors, or to
-##     ## look at a more-freqently-updated mirror
-##     CRAN_repos <- Sys.getenv("R_CRAN_WEB", getOption("repos")["CRAN"])
-##     rds <- gzcon(url(sprintf("%s/%s", CRAN_repos,
-##                              "web/checks/check_results.rds"),
-##                      open = "rb"))
-##     results <- readRDS(rds)
-##     close(rds)
-##
-##     results
-## }
-
-## CRAN_check_details <-
-## function()
-## {
-##     CRAN_repos <- Sys.getenv("R_CRAN_WEB", getOption("repos")["CRAN"])
-##     rds <- gzcon(url(sprintf("%s/%s", CRAN_repos,
-##                              "web/checks/check_details.rds"),
-##                      open = "rb"))
-##     details <- readRDS(rds)
-##     close(rds)
-##
-##     details
-## }
-
-## CRAN_memtest_notes <-
-## function()
-## {
-##     CRAN_repos <- Sys.getenv("R_CRAN_WEB", getOption("repos")["CRAN"])
-##     rds <- gzcon(url(sprintf("%s/%s", CRAN_repos,
-##                              "web/checks/memtest_notes.rds"),
-##                      open = "rb"))
-##     mtnotes <- readRDS(rds)
-##     close(rds)
-##
-##     mtnotes
-## }
+summarize_CRAN_check_status_according_to_maintainer <-
+function()
+{
+    pdb <- CRAN_package_db()
+    ind <- !duplicated(pdb[, "Package"])
+
+    maintainer <- pdb[, "Maintainer"]
+    maintainer <- tolower(sub(".*<(.*)>.*", "\\1", maintainer))
+
+    results <- CRAN_check_results()
+    details <- CRAN_check_details()
+    mtnotes <- CRAN_memtest_notes()
+
+    split(format(summarize_CRAN_check_status(pdb[ind, "Package"],
+                                             results,
+                                             details,
+                                             mtnotes),
+                 header = TRUE),
+          maintainer[ind])
+}
 
 CRAN_baseurl_for_src_area <-
 function()
@@ -267,8 +248,9 @@
 
 CRAN_package_db <-
 function()
-    read_CRAN_object(CRAN_baseurl_for_web_area(),
-                     "web/packages/packages.rds")
+    as.data.frame(read_CRAN_object(CRAN_baseurl_for_web_area(),
+                                   "web/packages/packages.rds"),
+                  stringsAsFactors = FALSE)
 
 CRAN_aliases_db <-
 function()
@@ -293,30 +275,45 @@
 check_CRAN_mirrors <-
 function(mirrors = NULL, verbose = FALSE)
 {
+    retry_upon_error <- function(expr, n = 3L) {
+        i <- 1L
+        repeat {
+            y <- tryCatch(expr, error = identity)
+            if(!inherits(y, "error") || (i >= n))
+                break
+            i <- i + 1L
+        }
+        y
+    }
+
     read_package_db <- function(baseurl) {
         path <- sprintf("%ssrc/contrib/PACKAGES.gz", baseurl)
-        db <- tryCatch({
+        db <- retry_upon_error({
             con <- gzcon(url(path, "rb"))
             on.exit(close(con))
             readLines(con)
-        },
-                       error = identity)
-        if(inherits(db, "error"))
-            stop(sprintf("Reading %s failed with message: %s",
-                         path, conditionMessage(db)))
+        })
+        if(inherits(db, "error")) {
+            msg <- sprintf("Reading %s failed with message: %s",
+                           path, conditionMessage(db))
+            return(simpleError(msg))
+        }
         db
     }
 
     read_timestamp <- function(baseurl, path) {
         path <- sprintf("%s%s", baseurl, path)
-        ts <- tryCatch(readLines(path),
-                       error = identity)
-        if(inherits(ts, "error"))
-            stop(sprintf("Reading %s failed with message: %s",
-                         path, conditionMessage(ts)))
-        ts
+        ts <- retry_upon_error(readLines(path))
+        if(inherits(ts, "error")) {
+            msg <- sprintf("Reading %s failed with message: %s",
+                           path, conditionMessage(ts))
+            return(simpleError(msg))
+        }
+        as.POSIXct(as.numeric(ts), origin = "1970-01-01")
     }
 
+    if_ok <- function(u, v) if(inherits(u, "error")) u else v
+
     check_mirror <- function(mirror) {
         mirror_packages <- read_package_db(mirror)
         mirror_ts1 <- read_timestamp(mirror, path_ts1)
@@ -324,31 +321,23 @@
         mirror_ts3 <- read_timestamp(mirror, path_ts3)
 
         list("PACKAGES" =
-             c("Delta_master_mirror" =
-               sprintf("%d/%d",
-                       length(setdiff(master_packages,
-                                      mirror_packages)),
-                       length(master_packages)),
-               "Delta_mirror_master" =
-               sprintf("%d/%d",
-                       length(setdiff(mirror_packages,
-                                      master_packages)),
-                       length(mirror_packages))),
+             if_ok(mirror_packages,
+                   c("Delta_master_mirror" =
+                         sprintf("%d/%d",
+                                 length(setdiff(master_packages,
+                                                mirror_packages)),
+                                 length(master_packages)),
+                     "Delta_mirror_master" =
+                         sprintf("%d/%d",
+                                 length(setdiff(mirror_packages,
+                                                master_packages)),
+                                 length(mirror_packages)))),
              "TIME" =
-             difftime(as.POSIXct(as.numeric(master_ts1),
-                                 origin = "1970-01-01"),
-                      as.POSIXct(as.numeric(mirror_ts1),
-                                 origin = "1970-01-01")),
+             if_ok(mirror_ts1, difftime(master_ts1, mirror_ts1)),
              "TIME_r-release" =
-             difftime(as.POSIXct(as.numeric(master_ts2),
-                                 origin = "1970-01-01"),
-                      as.POSIXct(as.numeric(mirror_ts2),
-                                 origin = "1970-01-01")),
+             if_ok(mirror_ts2, difftime(master_ts2, mirror_ts2)),
              "TIME_r-old-release" =
-             difftime(as.POSIXct(as.numeric(master_ts3),
-                                 origin = "1970-01-01"),
-                      as.POSIXct(as.numeric(mirror_ts3),
-                                 origin = "1970-01-01"))
+             if_ok(mirror_ts3, difftime(master_ts3, mirror_ts3))
              )
     }
 
@@ -363,7 +352,7 @@
     master_ts3 <- read_timestamp(master, path_ts3)
 
     if(is.null(mirrors)) {
-        mirrors <- as.character(getCRANmirrors(all = TRUE)$URL)
+        mirrors <- as.character(utils::getCRANmirrors(all = TRUE)$URL)
     }
 
     results <- lapply(mirrors,
@@ -378,6 +367,91 @@
     results
 }
 
+CRAN_mirror_maintainers_info <-
+function(mirrors, db = NULL)
+{
+    if(is.null(db))
+        db <- utils::getCRANmirrors(all = TRUE)
+    mirrors <- sort(unique(mirrors))
+    ind <- match(mirrors, as.character(db$URL))
+    addresses <- db[ind, "Maintainer"]
+    addresses <- gsub("[[:space:]]*#[[:space:]]*", "@", addresses)
+    to <- paste(unique(unlist(strsplit(addresses,
+                                       "[[:space:]]*,[[:space:]]*"))),
+                collapse = ",\n    ")
+    head <- c(paste("To:", to),
+              "CC: CRAN@R-project.org",
+              "Subject: CRAN mirrors maintained by you",
+              "Reply-To: CRAN@R-project.org")
+    len <- length(addresses)
+    body <- c(if(len > 1L) {
+                  "Dear maintainers,"
+              } else {
+                  "Dear maintainer,"
+              },
+              "",
+              strwrap(paste(if(length(mirrors) > 1L) {
+                                "This concerns the following CRAN mirrors"
+                            } else {
+                                "This concerns the following CRAN mirror"
+                            },
+                            "maintained by",
+                            if(len > 1L) "one of",
+                            "you:")),
+              "",
+              paste0("  ", formatDL(mirrors, addresses, style = "list"))
+              )
+    list(head = head, body = body)
+}
+
+CRAN_mirror_mirmon_status <-
+function()
+{
+    ## See
+    ## <http://www.projects.science.uu.nl/csg/mirmon/mirmon.html#state_file_format>.
+
+    fields <-
+        c("url",
+          "age",
+          "status_last_probe",
+          "time_last_successful_probe",
+          "probe_history",
+          "state_history",
+          "last_probe")
+    ts_to_POSIXct <- function(ts) {
+        suppressWarnings(as.POSIXct(as.numeric(as.character(ts)),
+                                    origin = "1970-01-01"))
+    }
+    read_mirmon_state_file <- function(con) {
+        db <- utils::read.table(con, header = FALSE, col.names = fields)
+        db$url <- as.character(db$url)
+        db$age <- ts_to_POSIXct(db$age)
+        db$time_last_successful_probe <-
+            ts_to_POSIXct(db$time_last_successful_probe)
+        db$last_probe <- ts_to_POSIXct(db$last_probe)
+        db$delta <- difftime(Sys.time(), db$age, units = "days")
+        db
+    }
+    state_files <-
+        c("TIME" = "mirror.state",
+          "TIME_r-release" = "mirror_release.state",
+          "TIME_r-old-release" = "mirror_old_release.state")
+
+    ## Need to always use master for now (the mirrors do not have the
+    ## state files).
+    do.call(rbind,
+            c(Map(function(u, v) {
+                      u <- paste0("https://cran.r-project.org/mirmon/state/", u)
+                      cbind(read_mirmon_state_file(u),
+                            timestamp = v,
+                            stringsAsFactors = FALSE)
+                  },
+                  state_files,
+                  names(state_files)),
+              list(make.row.names = FALSE)))
+}
+
+
 CRAN_Rd_xref_db_with_expansions <-
 function()
 {
@@ -397,7 +471,7 @@
                   unlist(targets, use.names = FALSE))
 }
 
-CRAN_Rd_xref_reverse_depends <-
+CRAN_Rd_xref_reverse_dependencies <-
 function(packages, db = NULL, details = FALSE)
 {
     if(is.null(db))
@@ -433,7 +507,7 @@
     ## catches availability in standard repositories, but not in
     ## additional repositories.
     archived <- setdiff(names(CRAN_archive_db()),
-                        c(rownames(available.packages(filters = list())),
+                        c(rownames(utils::available.packages(filters = list())),
                           unlist(.get_standard_package_names(),
                                  use.names = FALSE)))
     y$xrefs_likely_to_archived_CRAN_packages <-
@@ -459,3 +533,188 @@
     ## Name OR Alias: nora.
     sprintf("%s::%s", package, nora)
 }
+
+CRAN_package_maintainers_db <-
+function()
+{
+    db <- CRAN_package_db()
+    maintainer <- db[, "Maintainer"]
+    address <- tolower(sub(".*<(.*)>.*", "\\1", maintainer))
+    maintainer <- gsub("\n", " ", maintainer)
+    data.frame(Package = db[, "Package"],
+               Address = address,
+               Maintainer = maintainer,
+               stringsAsFactors = FALSE)
+}
+
+CRAN_package_maintainers_info <-
+function(packages, db = NULL)
+{
+    if(is.null(db))
+        db <- CRAN_package_maintainers_db()
+    ind <- match(packages, db[, "Package"])
+    addresses <- db[ind, "Address"]
+    to <- paste(sort(unique(addresses)), collapse = ",\n    ")
+    head <- c(paste("To:", to),
+              "CC: CRAN@R-project.org",
+              "Subject: CRAN packages maintained by you",
+              "Reply-To: CRAN@R-project.org")
+    lst <- split(db[ind, "Package"], db[ind, "Maintainer"])
+    len <- length(addresses)
+    body <- c(if(len > 1L) {
+                  "Dear maintainers,"
+              } else {
+                  "Dear maintainer,"
+              },
+              "",
+              if(length(packages) > 1L) {
+                  "This concerns the CRAN packages"
+              } else {
+                  "This concerns the CRAN package"
+              },
+              "",
+              paste(strwrap(paste(sort(packages), collapse = " "),
+                            indent = 2L, exdent = 2L),
+                    collapse = "\n"),
+              "",
+              paste("maintained by",
+                    if(len > 1L) "one of",
+                    "you:"),
+              "",
+              paste0("  ",
+                     formatDL(vapply(lst, paste, "", collapse = " "),
+                              style = "list"))
+              )
+    list(head = head, body = body)
+}
+
+CRAN_package_reverse_dependencies_and_views <-
+function(packages)
+{
+    a <- utils::available.packages(filters = list())
+
+    v <- read_CRAN_object(CRAN_baseurl_for_src_area(),
+                          "src/contrib/Views.rds")
+    v <- do.call("rbind",
+                 mapply(cbind,
+                        Package =
+                        lapply(v, function(e) e$packagelist$name),
+                        View = sapply(v, "[[", "name")))
+    v <- split(v[, 2L], v[, 1L])
+
+    r <- package_dependencies(packages, a, reverse = TRUE)
+    rr <- package_dependencies(packages, a,
+                               reverse = TRUE, recursive = TRUE)
+    rrs <- package_dependencies(packages, a, "Suggests",
+                                reverse = TRUE, recursive = TRUE)
+
+    rxrefs <- CRAN_Rd_xref_reverse_dependencies(packages)
+
+    y <- lapply(packages,
+                function(p) {
+                    c(Package = p,
+                      if(length(z <- r[[p]])) {
+                          c("Reverse depends" =
+                            paste(sort(z), collapse = " "),
+                            if(length(zz <- setdiff(rr[[p]], z))) {
+                                c("Additional recursive reverse depends" =
+                                  paste(sort(zz), collapse = " "))
+                            })
+                      },
+                      if(length(z <- rrs[[p]])) {
+                          c("Reverse recursive suggests" =
+                            paste(sort(z), collapse = " "))
+                      },
+                      if(length(z <- rxrefs[[p]])) {
+                          c("Reverse Rd xref depends" =
+                            paste(sort(z), collapse = " "))
+                      },
+                      if(length(z <- v[[p]])) {
+                          c("Views" = paste(sort(z), collapse = " "))
+                      })
+                })
+    class(y) <- "CRAN_package_reverse_dependencies_and_views"
+    y
+}
+
+format.CRAN_package_reverse_dependencies_and_views <-
+function(x, ...)
+{
+    vapply(x,
+           function(e) {
+               paste(formatDL(e, style = "list", indent = 2L),
+                     collapse = "\n")
+           },
+           "")
+}
+
+print.CRAN_package_reverse_dependencies_and_views <-
+function(x, ...)
+{
+    writeLines(paste(format(x, ...), collapse = "\n\n"))
+    invisible(x)
+}
+
+CRAN_package_reverse_dependencies_with_maintainers <-
+function(packages, which = c("Depends", "Imports", "LinkingTo"),
+         recursive = FALSE)
+{
+    db <- CRAN_package_db()
+        
+    rdepends <- package_dependencies(packages, db, which,
+                                     recursive = recursive,
+                                     reverse = TRUE)
+    rdepends <- sort(unique(unlist(rdepends)))
+    pos <- match(rdepends, db[, "Package"], nomatch = 0L)
+
+    db[pos, c("Package", "Version", "Maintainer")]
+}
+
+CRAN_package_dependencies_with_dates <-
+function(packages)
+{
+    a <- utils::available.packages(filters = list(),
+                                   repos = .get_standard_repository_URLs()["CRAN"])
+    p <- CRAN_package_db()
+    d <- package_dependencies(packages, a, which = "most")
+    ## Note that we currently keep the base packages dependencies, which
+    ## have no date.  We could (perhaps at least optionally) do
+    ##   base_packages <- .get_standard_package_names()["base"]
+    ## and then use
+    ##   e <- setdiff(as.character(e), base_packages)
+    ## in the code below.
+    lapply(d,
+           function(e) {
+               e <- as.character(e)
+               d <- as.Date(p[match(e, p[, "Package"]), "Published"])
+               o <- order(d, decreasing = TRUE)
+               data.frame(Package = e[o], Date = d[o],
+                          stringsAsFactors = FALSE)
+           })
+}
+
+CRAN_packages_with_maintainer_matching <-
+function(pattern, ...)
+{
+    pdb <- CRAN_package_db()
+    ind <- grep(pattern, pdb[, "Maintainer"], ...)
+    pdb[ind, "Package"]
+}
+
+write_texts_to_dir <-
+function(lst, dir, verbose = FALSE)
+{
+    dir.create(dir, showWarnings = FALSE, recursive = FALSE)
+
+    Map(function(m, s) {
+        if(verbose)
+            message(sprintf("Processing %s ...", m))
+        writeLines(paste(s, collapse = "\n\n"),
+                   file.path(dir, sprintf("%s.txt", m)))
+    },
+        names(lst),
+        lst)
+
+    invisible()
+}
+
diff -Nru r-base-3.2.3/src/library/tools/R/doitools.R r-base-3.3.1/src/library/tools/R/doitools.R
--- r-base-3.2.3/src/library/tools/R/doitools.R	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/doitools.R	2016-03-16 23:03:29.000000000 +0000
@@ -0,0 +1,234 @@
+##  File src/library/tools/R/doitools.R
+##  Part of the R package, https://www.R-project.org
+##
+##  Copyright (C) 2015-2016 The R Core Team
+##
+##  This program is free software; you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation; either version 2 of the License, or
+##  (at your option) any later version.
+##
+##  This program is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  A copy of the GNU General Public License is available at
+##  https://www.R-project.org/Licenses/
+
+doi_db <-
+function(dois, parents)
+{
+    db <- data.frame(DOI = trimws(as.character(dois)),
+                     Parent = as.character(parents),
+                     stringsAsFactors = FALSE)
+    class(db) <- c("doi_db", "data.frame")
+    db
+}
+
+doi_db_from_package_metadata <- 
+function(meta)
+{
+    dois <- character()
+    pattern <- "<(DOI|doi):([^>]*)>"
+    if(!is.na(v <- meta["Description"])) {
+        m <- gregexpr(pattern, v)
+        dois <- c(dois, .gregexec_at_pos(pattern, v, m, 3L))
+    }
+    doi_db(dois, rep.int("DESCRIPTION", length(dois)))
+}
+
+doi_db_from_package_citation <-
+function(dir, meta, installed = FALSE)
+{
+    dois <- character()
+    path <- if(installed) "CITATION" else file.path("inst", "CITATION")
+    cfile <- file.path(dir, path)
+    if(file.exists(cfile)) {
+        cinfo <- .read_citation_quietly(cfile, meta)
+        if(!inherits(cinfo, "error"))
+            dois <- trimws(unique(unlist(cinfo$doi, use.names = FALSE)))
+    }
+    doi_db(dois, rep.int(path, length(dois)))
+}
+
+## \doi a user-defined macro (from system.Rd) which gets expanded by 
+## parse_Rd().  To extract programmatically, we try to find the user
+## macros with the (current) expansion.
+## Alternative, we could call .build_Rd_db() on the package Rd sources
+## with e.g. macros = c("\\newcommand{\\doi}{<DOI:#1>}" and look for
+## TEXT nodes matching the expansion.  However, we cannot necessarily
+## safely process build-time Sexprs ...
+
+doi_db_from_package_Rd_db <-
+function(db)
+{
+    dois <- Filter(length, lapply(db, .get_dois_from_Rd))
+    doi_db(unlist(.canonicalize_doi(dois), use.names = FALSE),
+           rep.int(file.path("man", names(dois)),
+                   lengths(dois)))
+}
+
+.get_dois_from_Rd <-
+function(x)
+{
+    dois <- character()
+    recurse <- function(e) {
+        if(identical(attr(e, "Rd_tag"), "USERMACRO") &&
+           grepl("\\\\Sexpr.*tools:::Rd_expr_doi", e[1L]))
+            dois <<- c(dois, e[2L])
+        else if(is.list(e))
+            lapply(e, recurse)
+    }
+    if(getDynamicFlags(x)["\\Sexpr"])
+        lapply(x, recurse)
+    dois
+}
+
+doi_db_from_package_sources <-
+function(dir, add = FALSE, Rd = FALSE)
+{
+    meta <- .read_description(file.path(dir, "DESCRIPTION"))
+    db <- rbind(doi_db_from_package_metadata(meta),
+                doi_db_from_package_citation(dir, meta),
+                if(Rd) {
+                    rddb <- Rd_db(dir = dir)
+                    doi_db_from_package_Rd_db(rddb)
+                })
+    if(add)
+        db$Parent <- file.path(basename(dir), db$Parent)
+    db
+}
+
+doi_db_from_installed_packages <-
+function(packages, lib.loc = NULL, verbose = FALSE, Rd = FALSE)
+{
+    if(!length(packages)) return()
+    one <- function(p) {
+        if(verbose)
+            message(sprintf("processing %s", p))
+        dir <- system.file(package = p, lib.loc = lib.loc)
+        if(dir == "") return()
+        meta <- .read_description(file.path(dir, "DESCRIPTION"))
+        db <- rbind(doi_db_from_package_metadata(meta),
+                    doi_db_from_package_citation(dir, meta,
+                                                 installed = TRUE),
+                    if(Rd) {
+                        rddb <- Rd_db(p, lib.loc = dirname(dir))
+                        doi_db_from_package_Rd_db(rddb)
+                    })
+        db$Parent <- file.path(p, db$Parent)
+        db
+    }
+    do.call(rbind,
+            c(lapply(packages, one),
+              list(make.row.names = FALSE)))
+}
+
+check_doi_db <-
+function(db, verbose = FALSE)
+{
+    .gather <- function(d = character(),
+                        p = list(),
+                        s = rep.int("", length(d)),
+                        m = rep.int("", length(d))) {
+        y <- data.frame(DOI = d, From = I(p), Status = s, Message = m,
+                        stringsAsFactors = FALSE)
+        y$From <- p
+        class(y) <- c("check_doi_db", "data.frame")
+        y
+    }
+
+    .fetch <- function(d) {
+        if(verbose) message(sprintf("processing %s", d))
+        u <- paste0("http://doi.org/", d)
+        ## Do we need to percent encode parts of the DOI name?
+        tryCatch(curlGetHeaders(u), error = identity)
+    }
+
+    .check <- function(d) {
+        h <- .fetch(d)
+        if(inherits(h, "error")) {
+            s <- "-1"
+            msg <- sub("[[:space:]]*$", "", conditionMessage(h))
+        } else {
+            s <- as.character(attr(h, "status"))
+            msg <- table_of_HTTP_status_codes[s]
+        }
+        ## Similar to URLs, see e.g.
+        ##   curl -I -L http://doi.org/10.1016/j.csda.2009.12.005
+        if(any(grepl("301 Moved Permanently", h, useBytes = TRUE))) {
+            ind <- grep("^[Ll]ocation: ", h, useBytes = TRUE)
+            new <- sub("^[Ll]ocation: ([^\r]*)\r\n", "\\1", h[max(ind)])
+            if((s == "503") && grepl("www.sciencedirect.com", new))
+                s <- "405"
+        }
+        c(s, msg)
+    }
+
+    bad <- .gather()
+
+    if(!NROW(db)) return(bad)
+
+    parents <- split(db$Parent, db$DOI)
+    dois <- names(parents)
+
+    ## See <https://www.doi.org/doi_handbook/2_Numbering.html#2.2>:
+    ##   The DOI prefix shall be composed of a directory indicator
+    ##   followed by a registrant code. These two components shall be
+    ##   separated by a full stop (period).
+    ##   The directory indicator shall be "10".
+    ind <- !startsWith(dois, "10")
+    if(any(ind)) {
+        len <- sum(ind)
+        bad <- rbind(bad,
+                     .gather(dois[ind],
+                             parents[ind],
+                             m = rep.int("Invalid DOI", len)))
+    }
+
+    pos <- which(!ind)
+    if(length(pos)) {
+        results <- do.call(rbind, lapply(dois[pos], .check))
+        status <- as.numeric(results[, 1L])
+        ind <- !(status %in% c(200L, 405L))
+        if(any(ind)) {
+            pos <- pos[ind]
+            s <- as.character(status[ind])
+            s[s == "-1"] <- "Error"
+            m <- results[ind, 2L]
+            m[is.na(m)] <- ""
+            bad <- rbind(bad,
+                         .gather(dois[pos],
+                                 parents[pos],
+                                 m,
+                                 s))
+        }
+    }
+
+    bad
+}
+
+format.check_doi_db <-
+function(x, ...)
+{
+    if(!NROW(x)) return(character())
+
+    paste0(sprintf("DOI: %s", x$DOI),
+           sprintf("\nFrom: %s",
+                   sapply(x$From, paste, collapse = "\n      ")),
+           ifelse((s <- x$Status) == "",
+                  "",
+                  sprintf("\nStatus: %s", s)),
+           ifelse((m <- x$Message) == "",
+                  "",
+                  sprintf("\nMessage: %s", m)))
+}
+
+print.check_doi_db <-
+function(x, ...)
+{
+    if(NROW(x))
+        writeLines(paste(format(x), collapse = "\n\n"))
+    invisible(x)
+}
diff -Nru r-base-3.2.3/src/library/tools/R/dynamicHelp.R r-base-3.3.1/src/library/tools/R/dynamicHelp.R
--- r-base-3.2.3/src/library/tools/R/dynamicHelp.R	2015-08-26 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/dynamicHelp.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/dynamicHelp.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@
     {
     	bool <- function(x) as.logical(as.numeric(x))
         res <- if(identical(names(query), "category")) {
-            help.search(keyword = query, verbose = 1L, use_UTF8 = TRUE)
+            utils::help.search(keyword = query, verbose = 1L, use_UTF8 = TRUE)
         } else if(identical(names(query), "results")) {
             utils:::.hsearch_results()
         } else {
@@ -107,7 +107,7 @@
             args$fields <- fields
             args$use_UTF8 <- TRUE
             args$types <- types
-            do.call(help.search, args)
+            do.call(utils::help.search, args)
         }
         types <- res$types
         res <- res$matches
@@ -166,13 +166,13 @@
         concepts <- utils::hsearch_db_concepts()
         s <- concepts$Concept
         out <-
-            c(tools:::HTMLheader("Help search concepts"),
+            c(HTMLheader("Help search concepts"),
               c("",
                 "<table>",
                 "<tr><th style=\"text-align: left\">Concept</th><th>Frequency</th><th>Packages</th><tr>",
                 paste0("<tr><td>",
                        "<a href=\"/doc/html/Search?pattern=",
-                       vapply(reQuote(s), URLencode, "", reserved = TRUE),
+                       vapply(reQuote(s), utils::URLencode, "", reserved = TRUE),
                        "&fields.concept=1&agrep=0\">",
                        shtmlify(substring(s, 1, 80)),
                        "</a>",
@@ -190,7 +190,7 @@
     .HTML_hsearch_db_keywords <- function() {
         keywords <- utils::hsearch_db_keywords()
         out <-
-            c(tools:::HTMLheader("Help search keywords"),
+            c(HTMLheader("Help search keywords"),
               c("",
                 "<table>",
                 "<tr><th style=\"text-align: left\">Keyword</th><th style=\"text-align: left\">Concept</th><th>Frequency</th><th>Packages</th><tr>",
@@ -309,9 +309,9 @@
     	topic <- sub(topicRegexp, "\\2", path)
         ## if a package is specified, look there first, then everywhere
     	if (!is.null(pkg)) # () avoids deparse here
-    	    file <- help(topic, package = (pkg), help_type = "text")
+    	    file <- utils::help(topic, package = (pkg), help_type = "text")
     	if (!length(file))
-            file <- help(topic, help_type = "text", try.all.packages = TRUE)
+            file <- utils::help(topic, help_type = "text", try.all.packages = TRUE)
 	if (!length(file)) {
             msg <- gettextf("No help found for topic %s in any package.",
                             mono(topic))
@@ -402,8 +402,8 @@
             if(is.na(tmp)) {
                 msg <- gettextf("Link %s in package %s could not be located",
                                 mono(helpdoc), mono(pkg))
-                files <- help(helpdoc, help_type = "text",
-                              try.all.packages = TRUE)
+                files <- utils::help(helpdoc, help_type = "text",
+                                     try.all.packages = TRUE)
                 if (length(files)) {
                     path <- dirname(dirname(files))
                     files <- paste0('/library/', basename(path), '/html/',
@@ -488,7 +488,16 @@
 				")' in the console.")) )
     } else if (grepl(newsRegexp, path)) {
     	pkg <- sub(newsRegexp, "\\1", path)
-    	formatted <- toHTML(news(package = pkg),
+    	if (!is.null(query) && !is.na(subset <- query["subset"])) {
+    	    # See utils:::print.news_db for the encoding of the subset
+    	    rle <- strsplit(subset, "_")[[1]]
+    	    rle <- structure(list(lengths = as.numeric(rle),
+    	    	                  values = rep(c(TRUE, FALSE), length.out = length(rle))),
+    	    	             class = "rle")
+    	    news <- news(inverse.rle(rle)[-1], package = pkg)
+	} else
+    	    news <- news(package = pkg)
+    	formatted <- toHTML(news,
     		            title=paste("NEWS in package", sQuote(pkg)),
     			    up="html/00Index.html")
         if (length(formatted))
@@ -509,7 +518,7 @@
     	pkg <- sub(cssRegexp, "\\1", path)
         return( list(file = system.file("html", "R.css", package = pkg),
                      "content-type" = "text/css") )
-    } else if (grepl("^/library/", path)) {
+    } else if (startsWith(path, "/library/")) {
         descRegexp <- "^/library/+([^/]+)/+DESCRIPTION$"
         if(grepl(descRegexp, path)) {
             pkg <- sub(descRegexp, "\\1", path)
@@ -566,7 +575,7 @@
 	    		"status code" = 302L)) # temporary redirect
         }
     } else {
-        if(grepl("^/doc/", path)) {
+        if(startsWith(path, "/doc/")) {
             ## /doc/AUTHORS and so on.
             file <- file.path(R.home("doc"), sub("^/doc", "", path))
         } else return(error_page(gettextf("unsupported URL %s", mono(path))))
@@ -609,7 +618,6 @@
     if(!start && (port <= 0L))
         stop("no running server to stop")
     if (start) {
-        message("starting httpd help server ...", appendLF = FALSE)
         utils::flush.console()
         OK <- FALSE
         ports <- getOption("help.ports")
@@ -622,6 +630,9 @@
             ports <- 10000 + 22000*((stats::runif(10) + unclass(Sys.time())/300) %% 1)
         }
         ports <- as.integer(ports)
+	if (all(ports == 0))
+	    return(invisible(0))
+        message("starting httpd help server ...", appendLF = FALSE)
         for(i in seq_along(ports)) {
             ## the next can throw an R-level error,
             ## so do not assign port unless it succeeds.
diff -Nru r-base-3.2.3/src/library/tools/R/index.R r-base-3.3.1/src/library/tools/R/index.R
--- r-base-3.2.3/src/library/tools/R/index.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/index.R	2016-05-17 22:15:08.000000000 +0000
@@ -57,7 +57,8 @@
     if(!length(datasets)) return(matrix("", 0L, 2L))
     names(datasets) <- sub("/[^/]*$", "", names(datasets))
     datasets <- sort(datasets)
-    dataIndex <- cbind(datasets, "")
+    dataIndex <- cbind(datasets, "", deparse.level = 0L)
+    dimnames(dataIndex) <- NULL
     ## Note that NROW(contents) might be 0.
     if(length(datasets) && NROW(contents)) {
         aliasIndices <-
@@ -70,7 +71,6 @@
         dataIndex[, 1L] <-
             as.vector(ifelse(datasets == names(datasets), datasets,
                              paste0(datasets, " (", names(datasets), ")")))
-    dimnames(dataIndex) <- NULL
     dataIndex
 }
 
@@ -144,13 +144,13 @@
 print.check_demo_index <-
 function(x, ...)
 {
-    if(length(x$missing_from_index)) {
-        writeLines("Demos with missing or empty index information:")
-        print(x$missing_from_index, ...)
+    if(length(bad <- x$missing_from_index)) {
+        writeLines(c("Demos with missing or empty index information:",
+                     paste(" ", bad)))
     }
-    if(length(x$missing_from_demos)) {
-        writeLines("Demo index entries without corresponding demo:")
-        print(x$missing_from_demos, ...)
+    if(length(bad <- x$missing_from_demos)) {
+        writeLines(c("Demo index entries without corresponding demo:",
+                     paste(" ", bad)))
     }
     invisible(x)
 }
diff -Nru r-base-3.2.3/src/library/tools/R/install.R r-base-3.3.1/src/library/tools/R/install.R
--- r-base-3.2.3/src/library/tools/R/install.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/install.R	2016-05-05 22:15:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/install.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 # NB: also copyright dates in Usages.
 #
@@ -41,6 +41,8 @@
     lockdir <- ""
     is_first_package <- TRUE
     stars <- "*"
+    user.tmpdir <- Sys.getenv("PKG_BUILD_DIR")
+    keep.tmpdir <- nzchar(user.tmpdir)
 
     ## Need these here in case of an early error, e.g. missing etc/Makeconf
     tmpdir <- ""
@@ -79,7 +81,7 @@
 
     do_cleanup <- function()
     {
-        if(nzchar(tmpdir)) do_cleanup_tmpdir()
+        if(!keep.tmpdir && nzchar(tmpdir)) do_cleanup_tmpdir()
         if (!is_first_package) {
             ## Only need to do this in case we successfully installed
             ## at least one package
@@ -93,7 +95,7 @@
     {
         ## Solaris will not remove any directory in the current path
         setwd(startdir)
-        if (dir.exists(tmpdir)) unlink(tmpdir, recursive=TRUE)
+        if (!keep.tmpdir && dir.exists(tmpdir)) unlink(tmpdir, recursive=TRUE)
     }
 
     on.exit(do_exit_on_error())
@@ -473,7 +475,7 @@
 		## important since we will blow away .o files so there
 		## is no way to create it later.
 
-		if (dsym && grepl("^darwin", R.version$os) ) {
+		if (dsym && startsWith(R.version$os, "darwin")) {
 		    message(gettextf("generating debug symbols (%s)", "dSYM"),
                             domain = NA)
 		    dylib <- Sys.glob(paste0(dest, "/*", SHLIB_EXT))
@@ -704,7 +706,8 @@
             if (WINDOWS) {
                 owd <- setwd("src")
                 makefiles <- character()
-                if (!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA))) {
+                if (!is.na(f <- Sys.getenv("R_MAKEVARS_USER",
+                                           NA_character_))) {
                     if (file.exists(f))  makefiles <- f
                 } else if (file.exists(f <- path.expand("~/.R/Makevars.win")))
                     makefiles <- f
@@ -720,7 +723,7 @@
                 } else { ## no src/Makefile.win
                     srcs <- dir(pattern = "\\.([cfmM]|cc|cpp|f90|f95|mm)$",
                                 all.files = TRUE)
-                    archs <- if (!force_both && !grepl(" x64 ", win.version()))
+                    archs <- if (!force_both && !grepl(" x64 ", utils::win.version()))
                         "i386"
                     else {
                         ## see what is installed
@@ -785,18 +788,10 @@
                     owd <- setwd("src")
                     system_makefile <-
                         file.path(R.home(), paste0("etc", rarch), "Makeconf")
-                    site <- Sys.getenv("R_MAKEVARS_SITE", NA)
-                    if (is.na(site)) site <- file.path(paste0(R.home("etc"), rarch), "Makevars.site")
                     makefiles <- c(system_makefile,
-                                   if(file.exists(site)) site,
-                                   "Makefile")
-                    if (!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA))) {
-                        if (file.exists(f))  makefiles <- c(makefiles, f)
-                    } else if (file.exists(f <- path.expand(paste("~/.R/Makevars",
-                                                                  Sys.getenv("R_PLATFORM"), sep = "-"))))
-                        makefiles <- c(makefiles, f)
-                    else if (file.exists(f <- path.expand("~/.R/Makevars")))
-                        makefiles <- c(makefiles, f)
+                                   makevars_site(),
+                                   "Makefile",
+                                   makevars_user())
                     res <- system(paste(MAKE,
                                         paste("-f", shQuote(makefiles), collapse = " ")))
                     if (res == 0) shlib_install(instdir, rarch)
@@ -880,7 +875,7 @@
         if (WINDOWS && "x64" %in% test_archs) {
             ## we cannot actually test x64 unless this is 64-bit
             ## Windows, even if it is installed.
-            if (!grepl(" x64 ", win.version())) test_archs <- "i386"
+            if (!grepl(" x64 ", utils::win.version())) test_archs <- "i386"
         }
 
 
@@ -1092,7 +1087,12 @@
             BC <- if (!is.na(byte_compile)) byte_compile
             else
                 parse_description_field(desc, "ByteCompile", default = FALSE)
-            rcp <- as.numeric(Sys.getenv("R_COMPILE_PKGS"))
+            rcps <- Sys.getenv("R_COMPILE_PKGS")
+            rcp <- switch(rcps,
+                "TRUE"=, "true"=, "True"=, "yes"=, "Yes"= 1,
+                "FALSE"=,"false"=,"False"=, "no"=, "No" = 0,
+                as.numeric(rcps)
+            )
             BC <- BC || (!is.na(rcp) && rcp > 0)
             if (BC) {
                 starsmsg(stars,
@@ -1413,9 +1413,23 @@
         args <- args[-1L]
     }
 
-    tmpdir <- tempfile("R.INSTALL")
-    if (!dir.create(tmpdir))
-        stop("cannot create temporary directory")
+    if (keep.tmpdir) {
+      make_tmpdir <- function(prefix, nchars = 8, ntries = 100) {
+        for(i in 1:ntries) {
+          name = paste(sample(c(0:9, letters, LETTERS), nchars, replace=TRUE), collapse="")
+          path = paste(prefix, name, sep = "/")
+          if (dir.create(path, showWarnings = FALSE, recursive = T)) {
+            return(path)
+          }
+        }
+        stop("cannot create unique directory for build")
+      }
+      tmpdir <- make_tmpdir(user.tmpdir)
+    } else {
+      tmpdir <- tempfile("R.INSTALL")
+      if (!dir.create(tmpdir))
+          stop("cannot create temporary directory")
+    }
 
     if (merge) {
         if (length(pkgs) != 1L || !file_test("-f", pkgs))
@@ -1509,18 +1523,7 @@
                 errmsg("extracted multiple files from ", sQuote(pkg))
             if (dir.exists(new)) pkgname <- basename(new)
             else errmsg("cannot extract package from ", sQuote(pkg))
-
-            ## If we have a binary bundle distribution, there should
-            ## be a DESCRIPTION file at top level. These are defunct
-            if (file.exists(ff <- file.path(tmpdir, "DESCRIPTION"))) {
-                con <- read.dcf(ff, "Contains")
-                if (!is.na(con))
-                    message("looks like a binary bundle", domain = NA)
-                else
-                    message("unknown package layout", domain = NA)
-                do_cleanup_tmpdir()
-                q("no", status = 1, runLast = FALSE)
-            } else if (file.exists(file.path(tmpdir, pkgname, "DESCRIPTION"))) {
+            if (file.exists(file.path(tmpdir, pkgname, "DESCRIPTION"))) {
                 allpkgs <- c(allpkgs, file.path(tmpdir, pkgname))
             } else errmsg("cannot extract package from ", sQuote(pkg))
         } else if (file.exists(file.path(pkg, "DESCRIPTION"))) {
@@ -1709,7 +1712,7 @@
         SHLIB_LIBADD <- ""
         MAKE <- "make"
         ## Formerly for winshlib.mk to pick up Makeconf
-        rarch <- Sys.getenv("R_ARCH", NA)
+        rarch <- Sys.getenv("R_ARCH", NA_character_)
         if(is.na(rarch)) {
             if (nzchar(.Platform$r_arch)) {
                 rarch <- paste0("/", .Platform$r_arch)
@@ -1722,7 +1725,7 @@
 
     objs <- character()
     shlib <- ""
-    site <- Sys.getenv("R_MAKEVARS_SITE", NA)
+    site <- Sys.getenv("R_MAKEVARS_SITE", NA_character_)
     if (is.na(site))
         site <- file.path(paste0(R.home("etc"), rarch), "Makevars.site")
     makefiles <-
@@ -1811,7 +1814,7 @@
     if (length(objs)) objs <- paste0(objs, OBJ_EXT, collapse = " ")
 
     if (WINDOWS) {
-        if (!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA))) {
+        if (!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA_character_))) {
             if (file.exists(f))  makefiles <- c(makefiles, f)
         } else if (rarch == "/x64" &&
                    file.exists(f <- path.expand("~/.R/Makevars.win64")))
@@ -1821,14 +1824,7 @@
         else if (file.exists(f <- path.expand("~/.R/Makevars")))
             makefiles <- c(makefiles, f)
     } else {
-        if (!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA))) {
-            if (file.exists(f))  makefiles <- c(makefiles, f)
-        } else if (file.exists(f <- path.expand(paste("~/.R/Makevars",
-                                               Sys.getenv("R_PLATFORM"),
-                                               sep = "-"))))
-            makefiles <- c(makefiles, f)
-        else if (file.exists(f <- path.expand("~/.R/Makevars")))
-            makefiles <- c(makefiles, f)
+        makefiles <- c(makefiles, makevars_user())
     }
 
     makeobjs <- paste0("OBJECTS=", shQuote(objs))
@@ -1860,7 +1856,7 @@
         }
     }
     if (!use_cxx1x) {
-        val <- Sys.getenv("USE_CXX1X", NA)
+        val <- Sys.getenv("USE_CXX1X", NA_character_)
         if(!is.na(val)) {
             use_cxx1x <- TRUE
         }
@@ -1915,7 +1911,7 @@
     } else {
         if (preclean) system(paste(cmd, "shlib-clean"))
         res <- system(cmd)
-        if(build_objects_symbol_tables) {
+        if((res == 0L) && build_objects_symbol_tables) {
             ## Should only do this if the previous one went ok.
             system(paste(cmd, "symbols.rds"))
         }
@@ -2007,8 +2003,9 @@
     outman <- file.path(outDir, "help")
     dir.create(outman, showWarnings = FALSE)
     MM <- M[re(M[, 1L]), 1:2]
-    write.table(MM, file.path(outman, "AnIndex"),
-                quote = FALSE, row.names = FALSE, col.names = FALSE, sep = "\t")
+    utils::write.table(MM, file.path(outman, "AnIndex"),
+                       quote = FALSE, row.names = FALSE, col.names = FALSE,
+                       sep = "\t")
     a <- structure(MM[, 2L], names=MM[, 1L])
     saveRDS(a, file.path(outman, "aliases.rds"))
 
@@ -2293,6 +2290,52 @@
                  'END'))
 }
 
+### * makevars_user
+
+makevars_user <-
+function()
+{
+    m <- character()
+    if(.Platform$OS.type == "windows") {
+        if(!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA_character_))) {
+            if(file.exists(f)) m <- f
+        }
+        else if((Sys.getenv("R_ARCH") == "/x64") &&
+                file.exists(f <- path.expand("~/.R/Makevars.win64")))
+            m <- f
+        else if(file.exists(f <- path.expand("~/.R/Makevars.win")))
+            m <- f
+        else if(file.exists(f <- path.expand("~/.R/Makevars")))
+            m <- f
+    }
+    else {
+        if(!is.na(f <- Sys.getenv("R_MAKEVARS_USER", NA_character_))) {
+            if(file.exists(f)) m <- f
+        }
+        else if(file.exists(f <- path.expand(paste("~/.R/Makevars",
+                                                   Sys.getenv("R_PLATFORM"),
+                                                   sep = "-"))))
+            m <- f
+        else if(file.exists(f <- path.expand("~/.R/Makevars")))
+            m <- f
+    }
+    m
+}
+
+### * makevars_site
+
+makevars_site <-
+function()
+{
+    m <- character()
+    if(is.na(f <- Sys.getenv("R_MAKEVARS_SITE", NA_character_)))
+        f <- file.path(paste0(R.home("etc"), Sys.getenv("R_ARCH")),
+                       "Makevars.site")
+    if(file.exists(f))
+        m <- f
+    m
+}
+
 
 ### Local variables: ***
 ### mode: outline-minor ***
diff -Nru r-base-3.2.3/src/library/tools/R/license.R r-base-3.3.1/src/library/tools/R/license.R
--- r-base-3.2.3/src/library/tools/R/license.R	2015-08-25 22:16:53.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/license.R	2015-12-10 23:15:16.000000000 +0000
@@ -19,7 +19,7 @@
 ## <NOTE>
 ## We want *standardized* license specs so that we can compute on them.
 ## In particular, we want to know whether licenses are recognizable as
-## FOSS (http://en.wikipedia.org/wiki/Free_and_open-source_software)
+## FOSS (https://en.wikipedia.org/wiki/Free_and_open-source_software)
 ## licenses.
 ##
 ## A license spec is standardized ("canonical") if it is an alternative
@@ -47,12 +47,12 @@
 ## by the FSF (and not rejected by the OSI).
 ##
 ## See
-##   http://www.gnu.org/licenses/license-list.html
-##   http://opensource.org/licenses/alphabetical
+##   https://www.gnu.org/licenses/license-list.html
+##   https://opensource.org/licenses/alphabetical
 ## fot the FSF and OSI license lists, and also
-##   http://www.fsf.org/licensing/licenses
-##   http://en.wikipedia.org/wiki/List_of_FSF_approved_software_licences
-##   http://en.wikipedia.org/wiki/List_of_OSI_approved_software_licences
+##   https://www.fsf.org/licensing/licenses
+##   https://en.wikipedia.org/wiki/List_of_FSF_approved_software_licences
+##   https://en.wikipedia.org/wiki/List_of_OSI_approved_software_licences
 ## for more information.
 ## </NOTE>
 
@@ -82,7 +82,7 @@
                                  .Platform$path.sep, fixed = TRUE))
     paths <- c(paths,
                file.path(R.home("share"), "licenses", "license.db"))
-    ldb <- Reduce(function(u, v) merge(u, v, all = TRUE), 
+    ldb <- Reduce(function(u, v) merge(u, v, all = TRUE),
                   lapply(unique(normalizePath(paths)), read.dcf))
     ## Merging matrices gives a data frame.
     ldb <- as.matrix(ldb)
@@ -269,11 +269,11 @@
 ## Nasty issues.
 ## * There really is no GPL version 2.0.
 ##   Unfortunately, the FSF uses 2.0 in URLs or links
-##   (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+##   (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 ##   The text clearly says "Version 2, June 1991".
 ## * There really is no LGPL version 2.0.
 ##   Unfortunately, the FSF uses 2.0 in URLs or links
-##   (http://www.gnu.org/licenses/old-licenses/).
+##   (https://www.gnu.org/licenses/old-licenses/).
 ##   The text clearly says "Version 2, June 1991".
 ## * CeCILL is a bit of a mess: the current version is referred to as
 ##   "version 2" (http://www.cecill.info/licences.en.html) but
@@ -284,7 +284,7 @@
 list("Artistic-2.0" =
      c("The Artistic License, Version 2.0",
        "Artistic 2.0",
-       "Artistic-2.0, see http://www.opensource.org/licenses/artistic-license-2.0.php"
+       "Artistic-2.0, see https://opensource.org/licenses/artistic-license-2.0.php"
        ),
 
      "BSL" =
@@ -301,7 +301,7 @@
      c("GNU Public License",
        "Gnu GPL",
        "GNU GPL",
-       "GPL (http://www.gnu.org/copyleft/gpl.html)"
+       "GPL (https://www.gnu.org/copyleft/gpl.html)"
        ),
 
      "GPL-2" =
@@ -368,10 +368,10 @@
        "GPL version 2 (or newer)",
        "GPL version 2 or later.",
        "GPL version 2 or newer",
-       "GPL version 2 or newer (http://www.gnu.org/copyleft/gpl.html)",
+       "GPL version 2 or newer (https://www.gnu.org/copyleft/gpl.html)",
        "GPL version 2 or newer (see README).",
        "GPL version 2 or newer.",
-       "GPL version 2 or newer. http://www.gnu.org/copyleft/gpl.html",
+       "GPL version 2 or newer. https://www.gnu.org/copyleft/gpl.html",
        "GPL version 2, or, at your option, any newer version.",
        "GPL Version 2 (or later)",
        "GPL version 2 (or later)",
@@ -399,7 +399,7 @@
        ),
 
      "LGPL" =
-     c("LGPL (see <http://www.opensource.org/licenses/lgpl-license.php>).",
+     c("LGPL (see <https://opensource.org/licenses/lgpl-license.php>).",
        "GNU LGPL (same as wxWidgets)."
        ),
 
@@ -541,7 +541,7 @@
             !is.null(x) && all(!is.na(x) & (x == v))
         ## (More generally we could test for positive length of x: but
         ## a length test is needed because all(NULL) |=> TRUE.)
-        
+
         expansions <- lapply(components,
                              expand_license_spec_component_from_db)
 
@@ -626,7 +626,7 @@
                   standardization = standardization,
                   is_verified = is_verified,
                   components = components,
-                  expansions = expansions,    
+                  expansions = expansions,
                   extensions = extensions,
                   pointers = pointers,
                   is_FOSS = is_FOSS,
@@ -767,7 +767,7 @@
         }
         TRUE
     }
-    
+
     if(x == "Unlimited" ||
        grepl(x, ldb_vars$re_license_file))
         return(NULL)
diff -Nru r-base-3.2.3/src/library/tools/R/makeLazyLoad.R r-base-3.3.1/src/library/tools/R/makeLazyLoad.R
--- r-base-3.2.3/src/library/tools/R/makeLazyLoad.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/makeLazyLoad.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/makeLazyLoad.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -52,10 +52,17 @@
                  domain = NA)
         dataDir <- file.path(pkgpath, "data")
     } else {
-        pkgpath <- sub("/data$", "", dataDir)
-        package <- basename(pkgpath)
-	# avoid builddir != srcdir problems -- assume package has been installed
-        lib.loc <- c(dirname(pkgpath), .libPaths())
+	if(has.pkg <- !missing(package)) ## try with default lib.loc
+	    pkgpath <- find.package(package, lib.loc, quiet = TRUE)
+	if(!has.pkg || !length(pkgpath)) {
+	   ## <FIXME> making assumptions about dataDir (e.g., pkgpath *NOT* from R-forge symlink)
+	    pkgpath <- sub("/data$", "", dataDir)
+	    ## avoid builddir != srcdir problems -- assume package has been installed
+	    ## making use of the fact that utils::data() works with *source* package:
+	    lib.loc <- c(dirname(pkgpath), .libPaths())
+	    if(!has.pkg)
+		package <- basename(pkgpath)
+	}
     }
     if(dir.exists(dataDir)) {
         if(file.exists(sv <- file.path(dataDir, "Rdata.rds"))) {
diff -Nru r-base-3.2.3/src/library/tools/R/news.R r-base-3.3.1/src/library/tools/R/news.R
--- r-base-3.2.3/src/library/tools/R/news.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/news.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/news.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -286,9 +286,7 @@
     exdent <- exdent[exdent > 1L]
     if(length(exdent)) {
         out[, 4L] <-
-            gsub(sprintf("\n%s",
-                         paste(rep.int(" ", min(exdent) - 1L),
-                               collapse = "")),
+            gsub(sprintf("\n%s", strrep(" ", min(exdent) - 1L)),
                  "\n", entries)
     }
 
@@ -372,7 +370,9 @@
     close(out)
     od <- setwd(dirname(f3))
     on.exit(setwd(od))
-    texi2pdf("NEWS.tex", quiet = TRUE)
+    ## avoid broken texi2pdf scripts: this is simple LaTeX
+    ## and emulation suffices
+    texi2pdf("NEWS.tex", quiet = TRUE, texi2dvi = "emulation")
     setwd(od); on.exit()
     invisible(file.copy(file.path(dirname(f3), "NEWS.pdf"),
                         pdf_file, overwrite = TRUE))
@@ -388,17 +388,37 @@
     ## can use the DESCRIPTION metadata to obtain the package name and
     ## encoding.
 
-    file <- file_path_as_absolute(file)
-    dir <- dirname(file)
     format <- "default"
-    if(file_test("-f", dfile <- file.path(dir, "DESCRIPTION")))
-        meta <- .read_description(dfile)
-    else if(basename(dir) == "inst" &&
-            file_test("-f", dfile <- file.path(dirname(dir),
-                                               "DESCRIPTION")))
-        meta <- .read_description(dfile)
-    else
-        format <- "R"
+
+    file <- file_path_as_absolute(file)
+
+    if(file_test("-d", file)) {
+        dir <- file
+        dfile <- file.path(dir, "DESCRIPTION")
+        if(!file_test("-f", dfile))
+            stop("DESCRIPTION file not found")
+        file <- file.path(dir, "inst", "NEWS")
+        if(!file_test("-f", file)) {
+            file <- file.path(dir, "NEWS")
+            if(!file_test("-f", file))
+                stop("NEWS file not found")
+        }
+    } else {
+        dir <- dirname(file)
+        dfile <- file.path(dir, "DESCRIPTION")
+        if(!file_test("-f", dfile)) {
+            if((basename(dir) != "inst") ||
+               !file_test("-f",
+                          dfile <- file.path(dirname(dir),
+                                             "DESCRIPTION")))
+                stop("DESCRIPTION file not found")
+        }
+    }
+
+    ## No longer support taking NEWS files without correponding
+    ## DESCRIPTION file as being from R itself (PR #16556).
+
+    meta <- .read_description(dfile)
 
     wto <- function(x) writeLines(x, con = out, useBytes = TRUE)
     cre <- "(\\W|^)(\"[[:alnum:]_.]*\"|[[:alnum:]_.:]+\\(\\))(\\W|$)"
@@ -522,7 +542,7 @@
     else {
         ## Expand \Sexpr et al now because this does not happen when using
         ## fragments.
-        macros <- loadRdMacros(file.path(R.home("share"), "Rd", "macros", "system.Rd"))
+        macros <- initialRdMacros()
         prepare_Rd(parse_Rd(file, macros = macros), stages = "install")
     }
 
@@ -541,7 +561,7 @@
 .build_news_db_from_package_NEWS_Rd <-
 function(file)
 {
-    macros <- loadRdMacros(file.path(R.home("share"), "Rd", "macros", "system.Rd"))
+    macros <- initialRdMacros()
     x <- prepare_Rd(parse_Rd(file, macros = macros), stages = "install")
 
     db <- .extract_news_from_Rd(x)
@@ -576,9 +596,6 @@
 .extract_news_from_Rd <-
 function(x)
 {
-    spaces <- function(n)
-        paste(rep.int(" ", n), collapse = "")
-
     get_section_names <- function(x)
         sapply(x, function(e) .Rd_get_text(e[[1L]]))
 
@@ -617,10 +634,10 @@
         pos <- grep(pat, out)
         if(!length(pos)) return(character())
         off <- min(nchar(sub(pat, "\\1", out[pos])))
-        pat <- sprintf("^%s\036 *", spaces(off))
+        pat <- sprintf("^%s\036 *", strrep(" ", off))
         s <- sub(pat, "\036", out)
         ## Try to remove some indent for nested material.
-        pat <- sprintf("^%s", spaces(off + 2L))
+        pat <- sprintf("^%s", strrep(" ", off + 2L))
         s <- sub(pat, "", s)
 
         s <- paste(s, collapse = "\n")
diff -Nru r-base-3.2.3/src/library/tools/R/package.dependencies.R r-base-3.3.1/src/library/tools/R/package.dependencies.R
--- r-base-3.2.3/src/library/tools/R/package.dependencies.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/package.dependencies.R	2016-03-16 23:03:29.000000000 +0000
@@ -22,6 +22,8 @@
     function(x, check = FALSE, depLevel = c("Depends", "Imports", "Suggests"))
 {
     depLevel <- match.arg(depLevel)
+    ## only one 'depLevel' at a time .. Rather use
+    .Deprecated("package_dependencies")
 
     if(!is.matrix(x))
         x <- matrix(x, nrow = 1L, dimnames = list(NULL, names(x)))
diff -Nru r-base-3.2.3/src/library/tools/R/packages.R r-base-3.3.1/src/library/tools/R/packages.R
--- r-base-3.2.3/src/library/tools/R/packages.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/packages.R	2016-03-16 23:03:29.000000000 +0000
@@ -26,7 +26,7 @@
         type <- "win.binary"
     type <- match.arg(type)
     nfields <- 0
-    out <- file(file.path(dir, "PACKAGES"), "wt")
+    out   <-   file(file.path(dir, "PACKAGES"   ), "wt")
     outgz <- gzfile(file.path(dir, "PACKAGES.gz"), "wt")
 
     paths <- ""
@@ -41,6 +41,7 @@
         this <- if(nzchar(path)) file.path(dir, path) else dir
         desc <- .build_repository_package_db(this, fields, type, verbose,
                                              unpacked)
+        desc <- Filter(length, desc)
 
         if(length(desc)) {
             Files <- names(desc)
@@ -156,6 +157,11 @@
                     }
                     temp["MD5sum"] <- md5sum(files[i])
                     db[[i]] <- temp
+                } else {
+                    message(gettextf("reading DESCRIPTION for package %s failed with message:\n  %s",
+                                     sQuote(basename(dirname(p))),
+                                     conditionMessage(temp)),
+                            domain = NA)
                 }
             }
             unlink(packages[i], recursive = TRUE)
@@ -190,6 +196,11 @@
             ## Cannot compute MD5 sum of the source tar.gz when working
             ## on the unpacked sources ...
             db[[i]] <- temp
+        } else {
+            warning(gettextf("reading DESCRIPTION for package %s failed with message:\n  %s",
+                             sQuote(basename(paths[i])),
+                             conditionMessage(temp)),
+                    domain = NA)
         }
     }
     if(verbose) message("done")
@@ -253,7 +264,7 @@
 }
 
 package_dependencies <-
-function(packages = NULL, db,
+function(packages = NULL, db = NULL,
          which = c("Depends", "Imports", "LinkingTo"),
          recursive = FALSE, reverse = FALSE, verbose = getOption("verbose"))
 {
@@ -261,6 +272,8 @@
     ## What about duplicated entries?
     ## </FIXME>
 
+    if(is.null(db)) db <- utils::available.packages()
+
     ## For given packages which are not found in the db, return "list
     ## NAs" (i.e., NULL entries), as opposed to character() entries
     ## which indicate no dependencies.
@@ -365,9 +378,9 @@
     }
     p_R <- tab[p_L]
     pos <- cbind(rep.int(p_L, lengths(p_R)), unlist(p_R))
-    ctr <- 1L
+    ctr <- 0L
     repeat {
-        if(verbose) cat("Cycle:", ctr)
+        if(verbose) cat("Cycle:", (ctr <- ctr + 1L))
         p_L <- split(pos[, 1L], pos[, 2L])
         new <- do.call(rbind,
                        Map(function(i, k)
@@ -379,7 +392,6 @@
         if(verbose) cat(" NNew:", nnew, "\n")
         if(!nnew) break
         pos <- npos
-        ctr <- ctr + 1L
     }
     depends <-
         split(all_packages[pos[, 2L]],
diff -Nru r-base-3.2.3/src/library/tools/R/parseRd.R r-base-3.3.1/src/library/tools/R/parseRd.R
--- r-base-3.2.3/src/library/tools/R/parseRd.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/parseRd.R	2016-03-16 23:03:29.000000000 +0000
@@ -35,7 +35,7 @@
     } else file0 <- "<connection>"
     lines <- readLines(file, warn = FALSE)
     if(is.character(macros)) 
-    	macros <- loadRdMacros(macros)
+    	macros <- initialRdMacros(macros = macros)
     ## remove old-style marking for data, keep line nos
     lines[lines == "\\non_function{}"] <- ""
     ## Extract the encoding if marked in the file:
diff -Nru r-base-3.2.3/src/library/tools/R/pkgDepends.R r-base-3.3.1/src/library/tools/R/pkgDepends.R
--- r-base-3.2.3/src/library/tools/R/pkgDepends.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/pkgDepends.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/pkgDepends.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
     if (length(pkg) != 1L)
         stop("argument 'pkg' must be of length 1")
 
+    .Deprecated("package_dependencies()")# or also dependsOnPkgs() ?
+
     instPkgs <- utils::installed.packages(lib.loc=lib.loc)
 
     depMtrx <- getDepMtrx(pkg, instPkgs, local)
@@ -28,26 +30,30 @@
         stop(gettextf("package '%s' was not found", pkg),
              domain = NA)
 
-    getDepList(depMtrx, instPkgs, recursive, local, reduce, lib.loc)
+    getDepList(depMtrx, instPkgs, recursive, local, reduce)
 }
 
 getDepList <- function(depMtrx, instPkgs, recursive=TRUE,
-                       local=TRUE, reduce=TRUE, lib.loc=NULL) {
-    out <- list(Depends=character(), Installed=character(),
-                Found=list(), NotFound=character(),
-                R=character())
-    class(out) <- c("DependsList", class(out))
+                       local=TRUE, reduce=TRUE, lib.loc=NULL)
+{
+    .Deprecated("dependsOnPkgs() or package_dependencies()")
+    if(!missing(lib.loc))
+        warning("the 'lib.loc' argument has always been unused and is deprecated now")
+
+    out <- structure(list(Depends=character(), Installed=character(),
+                          Found=list(), NotFound=character(),
+                          R=character()),
+                     class = "DependsList")
 
-    if ((!is.matrix(depMtrx))&&(is.na(depMtrx))) # no dependencies
+    if (!is.matrix(depMtrx) && is.na(depMtrx)) # no dependencies
         return(out)
 
-    mtrxList <- buildDepList(depMtrx, instPkgs, recursive, lib.loc)
+    mtrxList <- buildDepList(depMtrx, instPkgs, recursive)
 
-    if (local == FALSE) {
-        toFind <- mtrxList$Depends[!apply(mtrxList$Depends, 1,
+    if (!local) {
+        toFind <- mtrxList$Depends[!apply(mtrxList$Depends, 1L,
                                           isSatisfied,
                                           mtrxList$Installed),,drop=FALSE]
-
         if (reduce)
             toFind <- reduceDepends(toFind)
 
@@ -58,87 +64,73 @@
         }
     }
 
-    if (reduce == TRUE) {       # Found and NotFound are already reduced
-        mtrxList$R <- reduceDepends(mtrxList$R)
-        mtrxList$Depends <- reduceDepends(mtrxList$Depends)
-        mtrxList$Installed <- reduceDepends(mtrxList$Installed)
+    if (reduce) {       # Found and NotFound are already reduced
+	mtrxList$R         <- reduceDepends(mtrxList$R)
+	mtrxList$Depends   <- reduceDepends(mtrxList$Depends)
+	mtrxList$Installed <- reduceDepends(mtrxList$Installed)
     }
 
-
     ## Massage the matrices back into dependency strings.  out$Found
     ## is already assigned.
-    out$R <- depMtrxToStrings(mtrxList$R)
-    out$Depends <- depMtrxToStrings(mtrxList$Depends)
+    out$R         <- depMtrxToStrings(mtrxList$R)
+    out$Depends   <- depMtrxToStrings(mtrxList$Depends)
     out$Installed <- depMtrxToStrings(mtrxList$Installed)
-    out$NotFound <- depMtrxToStrings(mtrxList$NotFound)
+    out$NotFound  <- depMtrxToStrings(mtrxList$NotFound)
 
     out
 }
 
 isSatisfied <- function(dep, instMtrx) {
     triplets <- apply(instMtrx, 1L, paste, collapse=":")
-    match(paste(dep,collapse=":"), triplets, nomatch=0L) > 0L
+    paste(dep,collapse=":") %in% triplets
 }
 
-buildDepList <- function(depMtrx, instPkgs, recursive=TRUE,
-                         lib.loc=NULL) {
-    mtrxList <- list(Depends=matrix(nrow=0L,ncol=3L),
-                     Installed=matrix(nrow=0L,ncol=3L), R=matrix(nrow=0L,ncol=3L))
-
+buildDepList <- function(depMtrx, instPkgs, recursive=TRUE)
+{
+    mtrxList <- list(Depends  = matrix(nrow=0L, ncol=3L),
+		     Installed= matrix(nrow=0L, ncol=3L),
+		     R        = matrix(nrow=0L, ncol=3L))
 
     ## First check to see if there is a dependency on R
     ## If there is, then check it
-    whichR <- which(depMtrx[,1] == "R")
-    if (length(whichR)) {
-        mtrxList$R <- depMtrx[whichR,,drop=FALSE]
-        depMtrx <- depMtrx[-whichR,,drop=FALSE]
+    if (any(isR <- depMtrx[,1] == "R")) {
+        mtrxList$R <- depMtrx[ isR,, drop=FALSE]
+        depMtrx <-    depMtrx[!isR,, drop=FALSE]
     }
 
     ## Get which of the direct depends are installed
     instDeps <- depMtrx[installedDepends(depMtrx, instPkgs),,drop=FALSE]
 
-    if (recursive == TRUE) {
-        mtrxList$Depends <- depMtrx
-        mtrxList$Installed <- instDeps
-
+    mtrxList$Depends <- depMtrx
+    mtrxList$Installed <- instDeps
+    if (recursive) {
         for (curPkg in depMtrx[,1]) {
             depMtrx <- getDepMtrx(curPkg, instPkgs)
             ## Make sure this package was found & has deps
-            if ((is.null(depMtrx))||(is.na(depMtrx)))
+            if (is.null(depMtrx) || is.na(depMtrx))
                 next
 
-            curMtrxList <- buildDepList(depMtrx, instPkgs,
-                                             recursive=recursive,
-                                             lib.loc=lib.loc)
+            curMtrxList <- buildDepList(depMtrx, instPkgs, recursive=TRUE)
             mtrxList$R <- rbind(mtrxList$R, curMtrxList$R)
             mtrxList$Depends <- rbind(mtrxList$Depends,
                                       curMtrxList$Depends)
-            mtrxList$Installed <- rbind(mtrxList$Installed,
-                                        curMtrxList$Installed)
+            mtrxList$Installed <- rbind(mtrxList$Installed, curMtrxList$Installed)
         }
     }
-    else {                              # recurse is FALSE
-        mtrxList$Depends <- depMtrx
-        mtrxList$Installed <- instDeps
-    }
 
     mtrxList
 }
 
 getDepMtrx <- function(pkg, instPkgs, local=TRUE) {
-
     ## Need to see if pkg is installed - if not, get online
-    row <- match(pkg,instPkgs[,"Package"])
-    if (!is.na(row))                    # package is installed
-        pkgDeps <- package.dependencies(instPkgs[row,])[[1L]]
-    else {
-        if (local)
-            pkgDeps <- NULL
-        else
-            pkgDeps <- getRemotePkgDepends(pkg)
-    }
+    row <- match(pkg, instPkgs[,"Package"])
+    if (!is.na(row)) # package is installed
+        package.dependencies(instPkgs[row,])[[1L]]
+    else if (!local)
+        getRemotePkgDepends(pkg)
+    ## else NULL
 
-    pkgDeps        # Either a matrix, NA if no deps or NULL if not found
+    ## Either a matrix, NA if no deps or NULL if not found
 }
 
 getRemotePkgDepends <- function(pkg, contriburl=getOption("repos")) {
@@ -151,12 +143,9 @@
         contriburl <- utils::contrib.url(getOption("repos"))
 
     cran <- utils::available.packages(contriburl=contriburl)
-    whichRow <- which(pkg == cran[,"Package"])
-    if (length(whichRow)) {
-        return(package.dependencies(cran[whichRow,])[[1L]])
-    }
-    else
-        NULL
+    if (any(iPkg <- pkg == cran[,"Package"]))
+        package.dependencies(cran[iPkg,])[[1L]]
+    ## else NULL
 }
 
 installedDepends <- function(depMtrx, instPkgs) {
@@ -165,28 +154,19 @@
     ## the dependency is met by installed packages
 
     pkgs <- depMtrx[,1]
-    passPkgs <- character()
-    if (length(pkgs)) {
-        installed <- (match(pkgs, instPkgs[,"Package"], nomatch=0L) > 0L)
-
-        curPkgs <- depMtrx[installed,,drop=FALSE]
-        if (nrow(curPkgs)) {
-            passVersReq <- apply(curPkgs, 1L, function(x) {
-                pkgVers <- instPkgs[instPkgs[,1]==x[1L],"Version"]
-                if (is.na(x[2L])||
-                    (compareDependsPkgVersion(pkgVers,
-                                              x[2L], x[3L]) >= 0))
-                    TRUE
-                else
-                    FALSE
-            })
-            passPkgs <- c(passPkgs,curPkgs[passVersReq,1])
+    if (length(pkgs) &&
+	nrow(curPkgs <- depMtrx[pkgs %in% instPkgs[,"Package"],,drop=FALSE])) {
+	passVersReq <- apply(curPkgs, 1L, function(x) {
+	    (is.na(x[2L]) ||
+	     compareDependsPkgVersion(instPkgs[instPkgs[,1]==x[1L], "Version"],
+				      x[2L], x[3L]) >= 0)
+	})
+	passPkgs <- curPkgs[passVersReq,1]
 
-            return(which(match(depMtrx[,1],passPkgs,nomatch=0L) > 0L))
-        }
+	which(depMtrx[,1] %in% passPkgs)
     }
-
-    return(numeric())
+    else
+	numeric()
 }
 
 foundDepends <- function(depMtrx, contriburl=getOption("repos")) {
@@ -198,12 +178,11 @@
             utils::contrib.url(c(CRAN = getOption("repos")["CRAN"],
                                  BIOC = getOption("BIOC")))
 
+    if (nrow(depMtrx) > 0)
+        for (c.url in contriburl) {
+            cur <- character()
+            cran <- utils::available.packages(contriburl=c.url)
 
-    for (j in seq_along(contriburl)) {
-        cur <- character()
-        cran <- utils::available.packages(contriburl=contriburl[j])
-
-        if (nrow(depMtrx) > 0) {
             for (i in 1L:nrow(depMtrx)) {
                 found <- FALSE
                 cranRow <- which(depMtrx[i,1] == cran[,1])
@@ -221,11 +200,10 @@
                     cur <- c(cur,depMtrx[i,1])
                 }
             }
+            if (length(cur))
+                out$Found[c.url] <- cur
         }
 
-        if (length(cur))
-            out$Found[contriburl[j]] <- cur
-    }
 
     if (length(foundRows) != nrow(depMtrx))
         out$NotFound <- depMtrx[-foundRows,,drop=FALSE]
@@ -288,7 +266,7 @@
                 else
                     outRow <- minRow
             }
-            if(quietly == FALSE)
+            if(!quietly)
                 warning(gettextf("Package '%s' had its dependencies reduced to a minimal set.",
                                  pkgMtrx[1,]),
                         domain = NA)
@@ -313,6 +291,10 @@
 }
 
 installFoundDepends <- function(depPkgList, ...) {
+
+    .Deprecated(msg = "'installFoundDepends()' is deprecated: It is misleading nowadays
+ since it has never taken 'Imports' into consideration")
+
     urls <- names(depPkgList)
     for (i in seq_along(depPkgList)) {
         if (length(depPkgList[[i]]))
diff -Nru r-base-3.2.3/src/library/tools/R/QC.R r-base-3.3.1/src/library/tools/R/QC.R
--- r-base-3.2.3/src/library/tools/R/QC.R	2015-11-13 23:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/QC.R	2016-04-18 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/QC.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -60,6 +60,13 @@
 
 ## NB: 'tools' cannot use NAMESPACE imports from utils, as it exists first
 
+## "The language elements" : all are .Primitive *and* print as .Primitive("...")
+langElts <- c("(", "{", ":", "~",
+	      "<-", "<<-", "=",
+	      "[", "[[", "[[<-", "[<-", "@", "@<-", "$", "$<-",
+	      "&&", "||",
+	      "break", "for", "function", "if", "next", "repeat", "return", "while")
+
 ##' a "default" print method used "below" (in several *.R):
 .print.via.format <- function(x, ...) {
     writeLines(format(x, ...))
@@ -88,11 +95,11 @@
     if(!missing(package)) {
         if(length(package) != 1L)
             stop("argument 'package' must be of length 1")
-        dir <- find.package(package, lib.loc)
+        dirdir <- dirname(dir <- find.package(package, lib.loc))
         ## Using package installed in @code{dir} ...
         is_base <- package == "base"
 
-        all_doc_topics <- Rd_aliases(package, lib.loc = dirname(dir))
+        all_doc_topics <- Rd_aliases(package, lib.loc = dirdir)
 
         ## Load package into code_env.
         if(!is_base)
@@ -105,13 +112,14 @@
     else {
         if(missing(dir))
             stop("you must specify 'package' or 'dir'")
+        pkgname <- basename(dir)
+        dirdir  <- dirname(dir)
         ## Using sources from directory @code{dir} ...
         if(!dir.exists(dir))
             stop(gettextf("directory '%s' does not exist", dir),
                  domain = NA)
         else
             dir <- file_path_as_absolute(dir)
-        pkgname <- basename(dir)
         is_base <- pkgname == "base"
 
         all_doc_topics <- Rd_aliases(dir = dir)
@@ -136,7 +144,7 @@
         ## working on the sources we (currently?) cannot deal with the
         ## (experimental) alternative way of specifying the namespace.
         if(file.exists(file.path(dir, "NAMESPACE"))) {
-            nsInfo <- parseNamespaceFile(basename(dir), dirname(dir))
+            nsInfo <- parseNamespaceFile(pkgname, dirdir)
             ## Look only at exported objects (and not declared S3
             ## methods).
             OK <- intersect(code_objs, nsInfo$exports)
@@ -149,16 +157,14 @@
     ## Find the data sets to work on.
     data_dir <- file.path(dir, "data")
     data_objs <- if(dir.exists(data_dir))
-	unlist(.try_quietly(list_data_in_pkg(dataDir = data_dir)),
+	unlist(.try_quietly(list_data_in_pkg(pkgname, dataDir = data_dir)),
 	       use.names = FALSE)
     else
         character()
 
     ## There was a time when packages contained code or data (or both).
     ## But not anymore ...
-    if(!missing(package)
-       && (!length(code_objs))
-       && (!length(data_objs))
+    if(!missing(package) && !length(code_objs) && !length(data_objs)
        && getOption("verbose"))
         message("neither code nor data objects found")
 
@@ -242,9 +248,8 @@
 
         ## The bad ones:
         S4_methods <-
-            S4_methods[!sapply(S4_methods,
-                               function(u)
-                               utils:::topicName("method", u))
+	    S4_methods[!vapply(S4_methods, utils:::topicName, " ",
+			       type="method", USE.NAMES=FALSE)
                        %in% all_doc_topics]
         undoc_things <-
             c(undoc_things,
@@ -257,18 +262,12 @@
         ## We use .ArgsEnv and .GenericArgsEnv in checkS3methods() and
         ## codoc(), so we check here that the set of primitives has not
         ## been changed.
-        base_funs <- ls("package:base", all.names=TRUE)
-        prim <- sapply(base_funs,
-                       function(x) is.primitive(get(x, "package:base")))
-        prims <- base_funs[prim]
-        prototypes <- sort(c(ls(envir=.ArgsEnv, all.names=TRUE),
-                             ls(envir=.GenericArgsEnv, all.names=TRUE)))
+	ff <- as.list(baseenv(), all.names=TRUE)
+	prims <- names(ff)[vapply(ff, is.primitive, logical(1L))]
+        prototypes <- sort(c(names(.ArgsEnv), names(.GenericArgsEnv)))
         extras <- setdiff(prototypes, prims)
         if(length(extras))
             undoc_things <- c(undoc_things, list(prim_extra=extras))
-        langElts <- c("$","$<-","&&","(",":","@","@<-","[","[[",
-                      "[[<-","[<-","{","||","~","<-","<<-","=","break","for",
-                      "function","if","next","repeat","return", "while")
         miss <- setdiff(prims, c(langElts, prototypes))
         if(length(miss))
             undoc_things <- c(undoc_things, list(primitives=miss))
@@ -324,8 +323,7 @@
         ## Using package installed in @code{dir} ...
         code_dir <- file.path(dir, "R")
         if(!dir.exists(code_dir))
-            stop(gettextf("directory '%s' does not contain R code",
-                          dir),
+            stop(gettextf("directory '%s' does not contain R code", dir),
                  domain = NA)
         if(!.haveRds(dir))
             stop(gettextf("directory '%s' does not contain Rd objects", dir),
@@ -339,8 +337,9 @@
 
         objects_in_code <- sort(names(code_env))
 
+        dirdir <- dirname(dir)
         ## Does the package have a namespace?
-        if(packageHasNamespace(package, dirname(dir))) {
+        if(packageHasNamespace(package, dirdir)) {
             has_namespace <- TRUE
             ns_env <- asNamespace(package)
             S3Table <- get(".__S3MethodsTable__.", envir = ns_env)
@@ -348,8 +347,17 @@
             objects_in_ns <-
                 setdiff(sort(names(ns_env)),
                         c(".__NAMESPACE__.", ".__S3MethodsTable__."))
+            ns_S3_methods_db <- ns_env$".__NAMESPACE__."$S3methods
+            ## Alternatively, use
+            ##   ns_S3_methods_db <- getNamespaceInfo(package, "S3methods")
+            ns_S3_methods <- if(is.null(ns_S3_methods_db))
+                                 character()
+                             else
+                                 paste(ns_S3_methods_db[, 1L],
+                                       ns_S3_methods_db[, 2L],
+                                       sep = ".")
             objects_in_code_or_namespace <-
-                unique(c(objects_in_code, objects_in_ns))
+                unique(c(objects_in_code, objects_in_ns, ns_S3_methods))
             objects_in_ns <- setdiff(objects_in_ns, objects_in_code)
         }
         else
@@ -361,27 +369,23 @@
             stop("you must specify 'package' or 'dir'")
         ## Using sources from directory @code{dir} ...
         if(!dir.exists(dir))
-            stop(gettextf("directory '%s' does not exist", dir),
-                 domain = NA)
-        else
-            dir <- file_path_as_absolute(dir)
+            stop(gettextf("directory '%s' does not exist", dir), domain = NA)
+        ## else
+        package_name <- basename(dir) # early, before resolving sym.links etc in next line:
+        dirdir <- dirname(dir)        # early, ...
+        dir <- file_path_as_absolute(dir)
         code_dir <- file.path(dir, "R")
         if(!dir.exists(code_dir))
-            stop(gettextf("directory '%s' does not contain R code",
-                          dir),
+            stop(gettextf("directory '%s' does not contain R code", dir),
                  domain = NA)
         if(!.haveRds(dir))
             stop(gettextf("directory '%s' does not contain Rd objects", dir),
                  domain = NA)
-        package_name <- basename(dir)
         is_base <- package_name == "base"
 
         code_env <- new.env(hash = TRUE)
         dfile <- file.path(dir, "DESCRIPTION")
-        meta <- if(file_test("-f", dfile))
-            .read_description(dfile)
-        else
-            character()
+        meta <- if(file_test("-f", dfile)) .read_description(dfile) else character()
         .source_assignments_in_code_dir(code_dir, code_env, meta)
         sys_data_file <- file.path(code_dir, "sysdata.rda")
         if(file_test("-f", sys_data_file)) load(sys_data_file, code_env)
@@ -398,7 +402,7 @@
             objects_in_ns <- objects_in_code
             functions_in_S3Table <- character()
             ns_env <- code_env
-            nsInfo <- parseNamespaceFile(basename(dir), dirname(dir))
+            nsInfo <- parseNamespaceFile(package_name, dirdir)
             ## Look only at exported objects.
             OK <- intersect(objects_in_code, nsInfo$exports)
             for(p in nsInfo$exportPatterns)
@@ -410,7 +414,7 @@
     ## Find the data sets to work on.
     data_dir <- file.path(dir, "data")
     data_sets_in_code <- if(dir.exists(data_dir))
-        names(.try_quietly(list_data_in_pkg(dataDir = data_dir)))
+        names(.try_quietly(list_data_in_pkg(package_name, dataDir = data_dir)))
     else
         character()
 
@@ -550,7 +554,7 @@
     }
 
     db <- if(!missing(package))
-        Rd_db(package, lib.loc = dirname(dir))
+        Rd_db(package, lib.loc = dirdir)
     else
         Rd_db(dir = dir)
 
@@ -962,7 +966,7 @@
     stats <- c(n.S4classes = length(S4_classes), n.db = length(db))
 
     aliases <- lapply(db, .Rd_get_metadata, "alias")
-    named_class <- lapply(aliases, grepl, pattern="-class$")
+    named_class <- lapply(aliases, endsWith, suffix="-class")
     nClass <- sApply(named_class, sum)
     oneAlias <- lengths(aliases, use.names=FALSE) == 1L
     idx <- oneAlias | nClass == 1L
@@ -1216,13 +1220,12 @@
         var_names_in_docs <- sort(Rd_var_names[[i]])
         ## Try finding the variable or data set given by the alias.
         al <- aliases[i]
-        if(exists(al, envir = code_env, mode = "list",
-                  inherits = FALSE)) {
-            al <- get(al, envir = code_env, mode = "list")
-        } else if(has_namespace && exists(al, envir = ns_env, mode = "list",
-                  inherits = FALSE)) {
-            al <- get(al, envir = ns_env, mode = "list")
-        } else if(has_data) {
+	if(!is.null(A <- get0(al, envir = code_env, mode = "list", inherits = FALSE)))
+	    al <- A
+	else if(has_namespace &&
+		!is.null(A <- get0(al, envir = ns_env, mode = "list", inherits = FALSE)))
+	    al <- A
+	else if(has_data) {
             ## Should be a data set.
             if(!length(dir(data_dir)
                        %in% paste(al, data_exts, sep = "."))) {
@@ -1230,10 +1233,9 @@
             }
             ## Try loading the data set into data_env.
             utils::data(list = al, envir = data_env)
-            if(exists(al, envir = data_env, mode = "list",
-                      inherits = FALSE)) {
-                al <- get(al, envir = data_env, mode = "list")
-            }
+            if(!is.null(A <- get0(al, envir = data_env, mode = "list", inherits = FALSE)))
+		al <- A
+
             ## And clean up data_env.
             rm(list = ls(envir = data_env, all.names = TRUE),
                envir = data_env)
@@ -1302,7 +1304,7 @@
     else
         Rd_db(dir = dir)
 
-    db_aliases <- lapply(db, .Rd_get_metadata, "alias")
+    db_aliases  <- lapply(db, .Rd_get_metadata, "alias")
     db_keywords <- lapply(db, .Rd_get_metadata, "keyword")
 
     db_names <- .Rd_get_names_from_Rd_db(db)
@@ -1376,9 +1378,9 @@
         ## Replacement functions.
         if(length(replace_exprs)) {
             replace_funs <-
-                paste0(sapply(replace_exprs,
-                             function(e) as.character(e[[2L]][[1L]])),
-                      "<-")
+                paste0(vapply(replace_exprs,
+			      function(e) as.character(e[[2L]][[1L]]), ""),
+		       "<-")
             functions <- c(functions, replace_funs)
             arg_names_in_usage <-
                 c(arg_names_in_usage,
@@ -1464,9 +1466,8 @@
 
     }
 
-    class(bad_doc_objects) <- "checkDocFiles"
-    attr(bad_doc_objects, "bad_lines") <- bad_lines
-    bad_doc_objects
+    structure(bad_doc_objects, class = "checkDocFiles",
+	      "bad_lines" = bad_lines)
 }
 
 format.checkDocFiles <-
@@ -1573,6 +1574,7 @@
     else {
         if(missing(dir))
             stop("you must specify 'package' or 'dir'")
+        package_name <- basename(dir) # early, before resolving sym.links
         ## Using sources from directory @code{dir} ...
         if(!dir.exists(dir))
             stop(gettextf("directory '%s' does not exist", dir),
@@ -1587,7 +1589,6 @@
         if(!.haveRds(dir))
             stop(gettextf("directory '%s' does not contain Rd objects", dir),
                  domain = NA)
-        package_name <- basename(dir)
         is_base <- package_name == "base"
 
         code_env <- new.env(hash = TRUE)
@@ -1605,7 +1606,7 @@
         ## Do the package sources have a NAMESPACE file?
         if(file.exists(file.path(dir, "NAMESPACE"))) {
             has_namespace <- TRUE
-            nsInfo <- parseNamespaceFile(basename(dir), dirname(dir))
+            nsInfo <- parseNamespaceFile(package_name, dirname(dir))
             ## Determine exported objects.
             OK <- intersect(objects_in_code, nsInfo$exports)
             for(p in nsInfo$exportPatterns)
@@ -1643,7 +1644,7 @@
     ## generic functions.
     ## Change in 3.0.0: we only look for methods named generic.class,
     ## not those registered by a 3-arg S3method().
-    methods_stop_list <- .make_S3_methods_stop_list(basename(dir))
+    methods_stop_list <- nonS3methods(package_name)
     methods_in_package <- sapply(all_S3_generics, function(g) {
         ## This isn't really right: it assumes the generics are visible.
         if(!exists(g, envir = code_env)) return(character())
@@ -1819,8 +1820,7 @@
         if(basename(dir) != "base") {
             .load_package_quietly(package, lib.loc)
             code_env <- asNamespace(package)
-            if(exists("DLLs", envir = code_env$.__NAMESPACE__.)) {
-                DLLs <- get("DLLs", envir = code_env$.__NAMESPACE__.)
+            if(!is.null(DLLs <- get0("DLLs", envir = code_env$.__NAMESPACE__.))) {
                 ## fake installs have this, of class DLLInfoList
                 if(length(DLLs)) has_namespace <- TRUE
                 if(length(DLLs) && inherits(DLLs[[1L]], "DLLInfo")) {
@@ -2354,7 +2354,7 @@
 
     ## Find the function objects in the given package.
     functions_in_code <-
-        Filter(function(f) is.function(get(f, envir = code_env)), # get is expensive
+        Filter(function(f) is.function(code_env[[f]]),
                objects_in_code)
 
     ## This is the virtual group generics, not the members
@@ -2368,9 +2368,10 @@
         ## arguments the generic has, with positional arguments of g in
         ## the same positions for m.
         ## Exception: '...' in the method swallows anything.
+	if(identical(g, "round") && m == "round.POSIXt") return() # exception
         genfun <- get(g, envir = code_env)
         gArgs <- names(formals(genfun))
-        if(g == "plot") gArgs <- gArgs[-2L]
+        if(identical(g, "plot")) gArgs <- gArgs[-2L] # drop "y"
         ogArgs <- gArgs
         gm <- if(m %in% S3_reg) {
             ## See registerS3method() in ../../base/R/namespace.R.
@@ -2384,23 +2385,19 @@
                     if (typeof(genfun) == "closure") environment(genfun)
                     else .BaseNamespaceEnv
                 }
-            if(!exists(".__S3MethodsTable__.", envir = defenv,
-                       inherits = FALSE)) {
+            if(is.null(S3Table <- get0(".__S3MethodsTable__.", envir = defenv,
+                                       inherits = FALSE))) {
                 ## Happens e.g. if for some reason, we get "plot" as
                 ## standardGeneric for "plot" defined from package
                 ## "graphics" with its own environment which does not
                 ## contain an S3 methods table ...
                 return(NULL)
             }
-            S3Table <- get(".__S3MethodsTable__.", envir = defenv,
-                           inherits = FALSE)
-            if(!exists(m, envir = S3Table)) {
-                warning(gettextf("declared S3 method '%s' not found",
-                                 m),
-                        domain = NA,
-                        call. = FALSE)
+            if(is.null(mm <- get0(m, envir = S3Table))) {
+                warning(gettextf("declared S3 method '%s' not found", m),
+                        domain = NA, call. = FALSE)
                 return(NULL)
-            } else get(m, envir = S3Table)
+            } else mm
         } else get(m, envir = code_env)
         mArgs <- omArgs <- names(formals(gm))
         ## If m is a formula method, its first argument *may* be called
@@ -2452,7 +2449,7 @@
     ## Now determine the 'bad' methods in the function objects of the
     ## package.
     bad_methods <- list()
-    methods_stop_list <- .make_S3_methods_stop_list(basename(dir))
+    methods_stop_list <- nonS3methods(basename(dir))
     ## some packages export S4 generics derived from other packages ....
     methods_stop_list <-
         c(methods_stop_list,
@@ -2813,13 +2810,13 @@
     as.character(unlist(lapply(names(x), .fmt)))
 }
 
-### * .check__depends
+### * .check_package_depends
 
 ## changed in 2.3.0 to refer to a source dir.
 
-
 .check_package_depends <-
-function(dir, force_suggests = TRUE, check_incoming = FALSE)
+function(dir, force_suggests = TRUE, check_incoming = FALSE,
+         ignore_vignettes = FALSE)
 {
     .check_dependency_cycles <-
         function(db, available = utils::available.packages(),
@@ -2867,8 +2864,13 @@
     bad_depends <- list()
     ## and we cannot have cycles
     ## this check needs a package db from repository(s), so
-    if(!any(grepl("@CRAN@", getOption("repos")))) {
-        ad <- .check_dependency_cycles(db)
+    repos <- getOption("repos")
+    if(any(grepl("@CRAN@", repos)))
+        repos <- .get_standard_repository_URLs()
+    if(!any(grepl("@CRAN@", repos))) {
+        ## Not getting here should no longer be possble ...
+        available <- utils::available.packages(repos = repos)
+        ad <- .check_dependency_cycles(db, available)
         pkgname <- db[["Package"]]
         if(pkgname %in% ad)
             bad_depends$all_depends <- setdiff(ad, pkgname)
@@ -2954,7 +2956,7 @@
             if(length(m))
                 bad_depends$suggests_but_not_installed <- m
         }
-        if (length(VB)) {
+        if (!ignore_vignettes && length(VB)) {
             ## These need both to be declared and installed
             ## If people explicitly state 'utils' they ought really to
             ## declare it, but skip for now.
@@ -3016,7 +3018,8 @@
     ## check header-only packages
     if (check_incoming) {
         hdOnly <- c("BH", "RcppArmadillo", "RcppEigen")
-        hd <- intersect(hdOnly, c(depends, imports))
+        hd <- setdiff(intersect(hdOnly, c(depends, imports)),
+                      .get_namespace_package_depends(dir, TRUE))
         if(length(hd)) bad_depends$hdOnly <- hd
     }
 
@@ -3272,7 +3275,8 @@
 
     ## Minimal check (so far) of Title and Description.
     if(strict && !is.na(val <- db["Title"])
-       && grepl("[.]$", val) && !grepl(" [.][.][.]|et al[.]", trimws(val)))
+       && grepl("[.]$", val)
+       && !grepl("[[:space:]][.][.][.]|et[[:space:]]al[.]", trimws(val)))
         out$bad_Title <- TRUE
     ## some people put punctuation inside quotes, some outside.
     if(strict && !is.na(val <- db["Description"])
@@ -3756,7 +3760,7 @@
     if(!length(lines) || inherits(lines, "error"))
         return(bad_flags)
 
-    prefixes <- c("CPP", "C", "CXX", "F", "FC", "OBJC", "OBJCXX")
+    prefixes <- c("CPP", "C", "CXX", "CXX1X", "F", "FC", "OBJC", "OBJCXX")
 
     uflags_re <- sprintf("^(%s)FLAGS: *(.*)$",
                          paste(prefixes, collapse = "|"))
@@ -3987,7 +3991,7 @@
     checkMethodUsageEnv <- function(env, ...) {
 	for(g in .get_S4_generics(env))
 	    for(m in .get_S4_methods_list(g, env)) {
-		fun <- methods::getDataPart(m)
+		fun <- methods::unRematchDefinition(methods::getDataPart(m))
 		signature <- paste(m@generic,
 				   paste(m@target, collapse = "-"),
 				   sep = ",")
@@ -4021,10 +4025,13 @@
     ## look for globalVariables declaration in package
     ## (This loads the namespace if not already loaded.)
     .glbs <- suppressMessages(utils::globalVariables(, package))
-    if(length(.glbs))
-        ## codetools doesn't allow adding to its default
-        args$suppressUndefined <-
-            c(codetools:::dfltSuppressUndefined, .glbs)
+    if(length(.glbs)) {
+        ## Cannot use globalVariables() for base
+        ## (and potentially tools and utils)
+        dflt <- c(if(package == "base") "last.dump",
+                  ".Generic", ".Method", ".Class")
+        args$suppressUndefined <- c(dflt, .glbs)
+    }
 
     if(check_without_loading) {
         args <- c(list(env, report = foo), args)
@@ -4050,7 +4057,21 @@
         ind <- grepl(": partial argument match of", x, fixed = TRUE)
         if(any(ind)) x <- c(x[ind], x[!ind])
     }
-    strwrap(x, indent = 0L, exdent = 2L)
+    if(length(x)) {
+        ## Provide a summary listing of the undefined globals:
+        y <- .canonicalize_quotes(x)
+        m <- regexec("no visible global function definition for '(.*)'", y)
+        funs <- vapply(Filter(length, regmatches(y, m)), `[`, "", 2L)
+        m <- regexec("no visible binding for global variable '(.*)'", y)
+        vars <- vapply(Filter(length, regmatches(y, m)), `[`, "", 2L)
+        y <- sort(unique(c(funs, vars)))
+        c(strwrap(x, indent = 0L, exdent = 2L),
+          if(length(y)) {
+              c("Undefined global functions or variables:",
+                strwrap(paste(y, collapse = " "),
+                        indent = 2L, exdent = 2L))
+          })
+    } else character()
 }
 
 ### * .check_Rd_xrefs
@@ -4111,7 +4132,7 @@
 
     ## fixup \link[=dest] form
     anchor <- db[, 2L]
-    have_equals <- grepl("^=", anchor)
+    have_equals <- startsWith(anchor, "=")
     if(any(have_equals))
         db[have_equals, 1:2] <- cbind(sub("^=", "", anchor[have_equals]), "")
 
@@ -4197,8 +4218,7 @@
         ## Also allow for additionally specified repositories.
         aurls <- pkgInfo[["DESCRIPTION"]]["Additional_repositories"]
         if(!is.na(aurls)) {
-            repos <- c(repos,
-                       unique(unlist(strsplit(aurls, ",[[:space:]]*"))))
+            repos <- c(repos, .read_additional_repositories_field(aurls))
         }
         known <-
             try(suppressWarnings(utils::available.packages(utils::contrib.url(repos, "source"),
@@ -4311,20 +4331,24 @@
     ## not sQuote as we have mucked about with locales.
     iconv0 <- function(x, ...) paste0("'", iconv(x, ...), "'")
 
+    suppress_notes <-
+        config_val_to_logical(Sys.getenv("_R_CHECK_PACKAGE_DATASETS_SUPPRESS_NOTES_",
+                                         "FALSE"))
+
     c(character(),
-      if(n <- x$latin1) {
+      if((n <- x$latin1) && !suppress_notes) {
           sprintf(
                   ngettext(n,
                    "Note: found %d marked Latin-1 string",
                    "Note: found %d marked Latin-1 strings"), n)
       },
-      if(n <- x$utf8) {
+      if((n <- x$utf8) && !suppress_notes) {
           sprintf(
                   ngettext(n,
                            "Note: found %d marked UTF-8 string",
                            "Note: found %d marked UTF-8 strings"), n)
       },
-      if(n <- x$bytes) {
+      if((n <- x$bytes) && !suppress_notes) {
           sprintf(
                   ngettext(n,
                            "Note: found %d string marked as \"bytes\"",
@@ -5552,6 +5576,10 @@
         identical(Sys.getenv("_R_CHECK_PACKAGES_USED_CRAN_INCOMING_NOTES_",
                              "FALSE"),
                   "TRUE")
+    ignore_unused_imports <-
+        config_val_to_logical(Sys.getenv("_R_CHECK_PACKAGES_USED_IGNORE_UNUSED_IMPORTS_",
+                                         "FALSE"))
+
     c(character(),
       if(length(xx <- x$imports)) {
           if(length(xx) > 1L) {
@@ -5601,7 +5629,7 @@
           }
       },
 
-      if(length(xx <- x$unused_imports)) {
+      if(length(xx <- x$unused_imports) && !ignore_unused_imports) {
           msg <- "  All declared Imports should be used."
           if(length(xx) > 1L) {
               c(gettext("Namespaces in Imports field not imported from:"),
@@ -6257,19 +6285,22 @@
         if(is.na(enc)) enc <- "ASCII"
         else def_enc <- TRUE
     } else enc <- "ASCII"
+    macros <- loadPkgRdMacros(dir)
     owd <- setwd(file.path(dir, "man"))
     on.exit(setwd(owd))
     pg <- c(Sys.glob("*.Rd"), Sys.glob("*.rd"),
             Sys.glob(file.path("*", "*.Rd")),
             Sys.glob(file.path("*", "*.rd")))
+    pg <- pg[basename(dirname(pg)) != "macros"]
     ## (Note that using character classes as in '*.[Rr]d' is not
     ## guaranteed to be portable.)
     bad <- character()
     for (f in pg) {
         ## Kludge for now
-        if(basename(f) %in%  c("iconv.Rd", "showNonASCII.Rd")) def_enc <- TRUE
+        if(basename(f) %in% c("iconv.Rd", "showNonASCII.Rd")) def_enc <- TRUE
 	tmp <- tryCatch(suppressMessages(checkRd(f, encoding = enc,
-						 def_enc = def_enc)),
+						 def_enc = def_enc,
+                                                 macros = macros)),
 			error = function(e)e)
 	if(inherits(tmp, "error")) {
 	    bad <- c(bad, f)
@@ -6513,13 +6544,17 @@
         stop("Package has no 'Version' field", call. = FALSE)
     if(grepl("(^|[.-])0[0-9]+", ver))
         out$version_with_leading_zeroes <- ver
+    if(any(unlist(package_version(ver)) >= 1234))
+        out$version_with_large_components <- ver
 
     language <- meta["Language"]
     if((is.na(language) || language == "en") &&
        config_val_to_logical(Sys.getenv("_R_CHECK_CRAN_INCOMING_USE_ASPELL_",
-                                        FALSE))) {
-        ignore <- c("[ \t]'[^']*'[ \t[:punct:]]",
-                    "[ \t][[:alnum:]_.]*\\(\\)[ \t[:punct:]]")
+                                        "FALSE"))) {
+        ignore <-
+            list(c("(?<=[ \t[:punct:]])'[^']*'(?=[ \t[:punct:]])",
+                   "(?<=[ \t[:punct:]])([[:alnum:]]+::)?[[:alnum:]_.]*\\(\\)(?=[ \t[:punct:]])"),
+                 perl = TRUE)
         a <- utils:::aspell_package_description(dir,
                                                 ignore = ignore,
                                                 control =
@@ -6720,7 +6755,7 @@
             suggests_or_enhances
     }
     if(!is.na(aurls <- meta["Additional_repositories"])) {
-        aurls <- unique(unlist(strsplit(aurls, ",[[:space:]]*")))
+        aurls <- .read_additional_repositories_field(aurls)
         ## Get available packages separately for each given URL, so that
         ## we can spot the ones which do not provide any packages.
         adb <-
@@ -6974,6 +7009,10 @@
         language <- meta["Language"]
         if(is.na(language) || (language == "en")) {
             title2 <- toTitleCase(title)
+            ## Keep single quoted elements unchanged.
+            p <- "(^|(?<=[ \t[:punct:]]))'[^']*'($|(?=[ \t[:punct:]]))"
+            m <- gregexpr(p, title, perl = TRUE)
+            regmatches(title2, m) <- regmatches(title, m)
             if(title != title2)
                 out$title_case <- c(title, title2)
         }
@@ -6995,7 +7034,10 @@
     if(!is.na(date)) {
         dd <- strptime(date, "%Y-%m-%d", tz = "GMT")
         if (is.na(dd)) out$bad_date <- TRUE
-        else if (as.Date(dd) < Sys.Date() - 31) out$old_date <- TRUE
+        else if((as.Date(dd) < Sys.Date() - 31) &&
+                !config_val_to_logical(Sys.getenv("_R_CHECK_CRAN_INCOMING_SKIP_DATES_",
+                                                  "FALSE")))
+            out$old_date <- TRUE
     }
 
     ## Check URLs.
@@ -7007,6 +7049,14 @@
             out$bad_urls <- bad
     } else out$no_url_checks <- TRUE
 
+    ## Check DOIs.
+    if(capabilities("libcurl")) {
+        bad <- tryCatch(check_doi_db(doi_db_from_package_sources(dir)),
+                        error = identity)
+        if(inherits(bad, "error") || NROW(bad))
+            out$bad_dois <- bad
+    }
+
     ## Are there non-ASCII characters in the R source code without a
     ## package encoding in DESCRIPTION?
     ## Note that checking always runs .check_package_ASCII_code() which
@@ -7039,6 +7089,11 @@
             out$R_files_non_ASCII <- lines
     }
 
+    size <- Sys.getenv("_R_CHECK_SIZE_OF_TARBALL_",
+                       unset = NA_character_)
+    if(!is.na(size) && (as.integer(size) > 5000000))
+        out$size_of_tarball <- size
+
     ## Is this an update for a package already on CRAN?
     db <- db[(packages == package) &
              (db[, "Repository"] == CRAN) &
@@ -7124,220 +7179,294 @@
 format.check_package_CRAN_incoming <-
 function(x, ...)
 {
+    fmt <- function(x) {
+        if(length(x)) paste(x, collapse = "\n") else character()
+    }
+
     c(character(),
       if(length(x$Maintainer))
-          sprintf("Maintainer: %s", sQuote(paste(x$Maintainer, collapse = " ")))
-      else "No maintainer field in DESCRIPTION file",
-      if(x$empty_Maintainer_name)
-          '\nThe maintainer field lacks a name',
-      if(x$Maintainer_needs_quotes)
-          '\nThe display-name part of the maintainer field should be enclosed in ""',
+          sprintf("Maintainer: %s",
+                  sQuote(trimws(gsub("\n", " ",
+                                     paste(x$Maintainer,
+                                           collapse = " ")))))
+      else
+          "No maintainer field in DESCRIPTION file",
+      fmt(c(if(x$empty_Maintainer_name)
+                'The maintainer field lacks a name',
+            if(x$Maintainer_needs_quotes)
+                'The display-name part of the maintainer field should be enclosed in ""')
+          ),
       if(length(x$new_submission))
           "New submission",
       if(length(y <- x$bad_package))
-          sprintf("\nConflicting package names (submitted: %s, existing: %s)",
+          sprintf("Conflicting package names (submitted: %s, existing: %s)",
                   y[[1L]], y[[2L]]),
       if(length(y <- x$repositories))
-          sprintf("\nPackage duplicated from %s", y),
+          sprintf("Package duplicated from %s", y),
       if(length(y <- x$CRAN_archive))
-          "\nPackage was archived on CRAN",
-      if(length(y <- x$bad_version))
-          sprintf("\nInsufficient package version (submitted: %s, existing: %s)",
-                  y[[1L]], y[[2L]]),
-      if(length(y <- x$version_with_leading_zeroes))
-          sprintf("\nVersion contains leading zeroes (%s)", y),
-      if(length(y <- x$version_with_jump_in_minor))
-          sprintf("'\nVersion jumps in minor (submitted: %s, existing: %s)",
-                  y[[1L]], y[[2L]]),
-      if(length(y <- x$recency))
-          sprintf("\nDays since last update: %d", y),
-      if(length(y <- x$frequency))
-          sprintf("\nNumber of updates in past 6 months: %d", y),
+          "Package was archived on CRAN",
+      fmt(c(if(length(y <- x$bad_version))
+                sprintf("Insufficient package version (submitted: %s, existing: %s)",
+                        y[[1L]], y[[2L]]),
+            if(length(y <- x$version_with_leading_zeroes))
+                sprintf("Version contains leading zeroes (%s)", y),
+            if(length(y <- x$version_with_large_components))
+                sprintf("Version contains large components (%s)", y),
+            if(length(y <- x$version_with_jump_in_minor))
+                sprintf("Version jumps in minor (submitted: %s, existing: %s)",
+                        y[[1L]], y[[2L]]))),
+      fmt(c(if(length(y <- x$recency))
+                sprintf("Days since last update: %d", y),
+            if(length(y <- x$frequency))
+                sprintf("Number of updates in past 6 months: %d", y))),
       if(length(y <- x$new_maintainer))
-          c("\nNew maintainer:",
-            strwrap(y[[1L]], indent = 2L, exdent = 4L),
-            "Old maintainer(s):",
-            strwrap(y[[2L]], indent = 2L, exdent = 4L)),
-      if(length(y <- x$bad_license))
-          sprintf("\nNon-FOSS package license (%s)", y),
-      if(length(y <- x$new_license))
-          c("\nChange to non-FOSS package license.",
-            "New license:",
-            strwrap(y[[1L]], indent = 2L, exdent = 4L),
-            "Old license:",
-            strwrap(y[[2L]], indent = 2L, exdent = 4L)),
-      if(length(y <- x$extensions)) {
-          c("\nLicense components with restrictions and base license permitting such:",
-            paste(" ", y),
-            unlist(lapply(x$pointers,
-                          function(e) {
-                              c(sprintf("File '%s':", e[1L]),
-                                paste(" ", e[-1L]))
-                          })))
-      },
+          paste(c("New maintainer:",
+                  strwrap(y[[1L]], indent = 2L, exdent = 4L),
+                  "Old maintainer(s):",
+                  strwrap(y[[2L]], indent = 2L, exdent = 4L)),
+                collapse = "\n"),
+      fmt(c(if(length(y <- x$bad_license))
+                sprintf("Non-FOSS package license (%s)", y),
+            if(length(y <- x$new_license))
+                paste(c("Change to non-FOSS package license.",
+                        "New license:",
+                        strwrap(y[[1L]], indent = 2L, exdent = 4L),
+                        "Old license:",
+                        strwrap(y[[2L]], indent = 2L, exdent = 4L)),
+                      collapse = "\n"),
+            if(length(y <- x$extensions)) {
+                paste(c("License components with restrictions and base license permitting such:",
+                        paste(" ", y),
+                        unlist(lapply(x$pointers,
+                                      function(e) {
+                                          c(sprintf("File '%s':", e[1L]),
+                                            paste(" ", e[-1L]))
+                                      }))),
+                      collapse = "\n")
+            })),
       if(NROW(y <- x$spelling)) {
           s <- split(sprintf("%d:%d", y$Line, y$Column), y$Original)
-          c("\nPossibly mis-spelled words in DESCRIPTION:",
-            sprintf("  %s (%s)",
-                    names(s),
-                    lapply(s, paste, collapse = ", ")))
+          paste(c("Possibly mis-spelled words in DESCRIPTION:",
+                  sprintf("  %s (%s)",
+                          names(s),
+                          lapply(s, paste, collapse = ", "))),
+                collapse = "\n")
       },
       if(identical(x$foss_with_BuildVignettes, TRUE)) {
-          "\nFOSS licence with BuildVignettes: false"
+          "FOSS licence with BuildVignettes: false"
       },
       if(length(y <- x$fields)) {
-          c("\nUnknown, possibly mis-spelled, fields in DESCRIPTION:",
-            sprintf("  %s", paste(sQuote(y), collapse = " ")))
-      },
-      if(length(y <- x$overrides)) {
-          c("\nCRAN repository db overrides:", y)
-      },
-      if(length(y <- x$conflicts)) {
-          sprintf("\nCRAN repository db conflicts: %s", sQuote(y))
-      },
-      if(length(y <- x$conflict_in_license_is_FOSS)) {
-          sprintf("\nPackage license conflicts with %s override",
-                  sQuote(paste("License_is_FOSS:", y)))
-      },
-      if(length(y <- x$conflict_in_license_restricts_use)) {
-          sprintf("\nPackage license conflicts with %s override",
-                  sQuote(paste("License_restricts_use:", y)))
-      },
-      if(length(y <- x$depends_with_restricts_use_TRUE)) {
-          c("\nPackage has a FOSS license but eventually depends on the following",
-	    if(length(y) > 1L)
-	    "packages which restrict use:" else
-	    "package which restricts use:",
-            strwrap(paste(y, collapse = ", "), indent = 2L, exdent = 4L))
-      },
-      if(length(y <- x$depends_with_restricts_use_NA)) {
-          c("\nPackage has a FOSS license but eventually depends on the following",
-	    if(length(y) > 1L)
-            "packages which may restrict use:" else
-	    "package which may restrict use:",
-            strwrap(paste(y, collapse = ", "), indent = 2L, exdent = 4L))
-      },
-      if(length(y <- x$strong_dependencies_not_in_mainstream_repositories)) {
-          c("\nStrong dependencies not in mainstream repositories:",
-            strwrap(paste(y, collapse = ", "),
-                    indent = 2L, exdent = 4L))
-      },
-      if(length(y <- x$suggests_or_enhances_not_in_mainstream_repositories)) {
-          c("\nSuggests or Enhances not in mainstream repositories:",
-            strwrap(paste(y, collapse = ", "),
-                    indent = 2L, exdent = 4L))
-      },
-      if(length(y <- x$additional_repositories_analysis_failed_with)) {
-          c("\nUsing Additional_repositories specification failed with:",
-            paste(" ", y))
-      },
-      if(length(y <- x$additional_repositories_analysis_results)) {
-          c("\nAvailability using Additional_repositories specification:",
-            sprintf("  %s   %s   %s",
-                    format(y[, 1L], justify = "left"),
-                    format(y[, 2L], justify = "right"),
-                    format(y[, 3L], justify = "left")))
-      },
-      if(length(y <- x$additional_repositories_with_no_packages)) {
-          c("\nAdditional repositories with no packages:",
-            paste(" ", y))
-      },
-      if (length(y <- x$uses)) {
+          paste(c("Unknown, possibly mis-spelled, fields in DESCRIPTION:",
+                  sprintf("  %s", paste(sQuote(y), collapse = " "))),
+                collapse = "\n")
+      },
+      fmt(c(if(length(y <- x$overrides)) {
+                paste(c("CRAN repository db overrides:", y),
+                      collapse = "\n")
+            },
+            if(length(y <- x$conflicts)) {
+                paste(sprintf("CRAN repository db conflicts: %s",
+                              sQuote(y)),
+                      collapse = "\n")
+            },
+            if(length(y <- x$conflict_in_license_is_FOSS)) {
+                sprintf("Package license conflicts with %s override",
+                        sQuote(paste("License_is_FOSS:", y)))
+            },
+            if(length(y <- x$conflict_in_license_restricts_use)) {
+                sprintf("Package license conflicts with %s override",
+                        sQuote(paste("License_restricts_use:", y)))
+            })),
+      fmt(c(if(length(y <- x$depends_with_restricts_use_TRUE)) {
+                paste(c("Package has a FOSS license but eventually depends on the following",
+                        if(length(y) > 1L)
+                            "packages which restrict use:"
+                        else
+                            "package which restricts use:",
+                        strwrap(paste(y, collapse = ", "),
+                                indent = 2L, exdent = 4L)),
+                      collapse = "\n")
+            },
+            if(length(y <- x$depends_with_restricts_use_NA)) {
+                paste(c("Package has a FOSS license but eventually depends on the following",
+                        if(length(y) > 1L)
+                            "packages which may restrict use:"
+                        else
+                            "package which may restrict use:",
+                        strwrap(paste(y, collapse = ", "),
+                                indent = 2L, exdent = 4L)),
+                      collapse = "\n")
+            })),
+      fmt(c(if(length(y <- x$strong_dependencies_not_in_mainstream_repositories)) {
+                  paste(c("Strong dependencies not in mainstream repositories:",
+                          strwrap(paste(y, collapse = ", "),
+                                  indent = 2L, exdent = 4L)),
+                        collapse = "\n")
+              },
+              if(length(y <- x$suggests_or_enhances_not_in_mainstream_repositories)) {
+                  paste(c("Suggests or Enhances not in mainstream repositories:",
+                          strwrap(paste(y, collapse = ", "),
+                                  indent = 2L, exdent = 4L)),
+                        collapse = "\n")
+              },
+              if(length(y <- x$additional_repositories_analysis_failed_with)) {
+                  paste(c("Using Additional_repositories specification failed with:",
+                          paste(" ", y)),
+                        collapse = "\n")
+              },
+              if(length(y <- x$additional_repositories_analysis_results)) {
+                  paste(c("Availability using Additional_repositories specification:",
+                          sprintf("  %s   %s   %s",
+                                  format(y[, 1L], justify = "left"),
+                                  format(y[, 2L], justify = "right"),
+                                  format(y[, 3L], justify = "left"))),
+                        collapse = "\n")
+              },
+              if(length(y <- x$additional_repositories_with_no_packages)) {
+                  paste(c("Additional repositories with no packages:",
+                          paste(" ", y)),
+                        collapse = "\n")
+              })),
+      if(length(y <- x$uses)) {
           paste(if(length(y) > 1L)
-		"\nUses the superseded packages:" else
-		"\nUses the superseded package:",
+		"Uses the superseded packages:" else
+		"Uses the superseded package:",
                 paste(sQuote(y), collapse = ", "))
       },
-      if (length(y <- x$BUGS)) {
+      if(length(y <- x$BUGS)) {
           paste(if(length(y) > 1L)
-		"\nUses the non-portable packages:" else
-		"\nUses the non-portable package:",
+		"Uses the non-portable packages:" else
+		"Uses the non-portable package:",
                 paste(sQuote(y), collapse = ", "))
       },
       if(length(y <- x$authors_at_R_calls)) {
-          "\nAuthors@R field should be a call to person(), or combine such calls."
+          "Authors@R field should be a call to person(), or combine such calls."
       },
       if(length(y <- x$vignette_sources_only_in_inst_doc)) {
           if(identical(x$have_vignettes_dir, FALSE))
-              c("\nVignette sources in 'inst/doc' with no 'vignettes' directory:",
-                strwrap(paste(sQuote(y), collapse = ", "),
-                        indent = 2L, exdent = 2L),
-                "A 'vignettes' directory is required as from R 3.1.0")
+              paste(c("Vignette sources in 'inst/doc' with no 'vignettes' directory:",
+                      strwrap(paste(sQuote(y), collapse = ", "),
+                              indent = 2L, exdent = 2L),
+                      "A 'vignettes' directory is required as from R 3.1.0"),
+                    collapse = "\n")
           else
-              c("\nVignette sources in 'inst/doc' missing from the 'vignettes' directory:",
-                strwrap(paste(sQuote(y), collapse = ", "),
-                        indent = 2L, exdent = 2L))
+              paste(c("Vignette sources in 'inst/doc' missing from the 'vignettes' directory:",
+                      strwrap(paste(sQuote(y), collapse = ", "),
+                              indent = 2L, exdent = 2L)),
+                    collapse = "\n")
       },
       if(length(y <- x$missing_vignette_index)) {
-          "\nPackage has a VignetteBuilder field but no prebuilt vignette index."
-      },
-      if(length(y <- x$missing_manual_rdb)) {
-          "\nPackage has help file(s) containing build-stage \\Sexpr{} expressions but no 'build/partial.rdb' file."
-      },
-      if(length(y <- x$missing_manual_pdf)) {
-          "\nPackage has help file(s) containing install/render-stage \\Sexpr{} expressions but no prebuilt PDF manual."
-      },
-      if(length(y <- x$dotjava)) {
-          "\nPackage installs .java files."
-      },
-      if(length(y <- x$javafiles)) {
-          "\nPackage has FOSS license, installs .class/.jar but has no 'java' directory."
-      },
-      if(length(y <- x$citation_calls)) {
-          c("\nPackage CITATION file contains call(s) to:",
-            strwrap(paste(y, collapse = ", "), indent = 2L, exdent = 4L))
-      },
-      if(length(y <- x$citation_error)) {
-          c("\nReading CITATION file fails with",
-            paste(" ", y),
-            "when package is not installed.")
-      },
-      if(length(y <- x$bad_urls)) {
-          if(inherits(y, "error"))
-              c("\nChecking URLs failed with message:",
-                conditionMessage(y))
-          else
-              c(if (length(y) > 1L) "Found the following (possibly) invalid URLs:" else "Found the following (possibly) invalid URL:",
-                paste(" ", gsub("\n", "\n    ", format(y))))
-      },
-      if(length(y) && any(nzchar(y$CRAN))) {
-          c("\n  The canonical URL of the CRAN page for a package is ",
-            "  http://cran.r-project.org/package=pkgname")
-      },
-      if(length(y) && any(nzchar(y$Spaces))) {
-          "\n  Spaces in an http[s] URL should probably be replaced by %20"
-      },
-      if(length(y <- x$no_url_checks) && y) {
-          c("\nChecking URLs requires 'libcurl' support in the R build")
+          "Package has a VignetteBuilder field but no prebuilt vignette index."
       },
+      fmt(c(if(length(y <- x$missing_manual_rdb)) {
+                "Package has help file(s) containing build-stage \\Sexpr{} expressions but no 'build/partial.rdb' file."
+            },
+            if(length(y <- x$missing_manual_pdf)) {
+                "Package has help file(s) containing install/render-stage \\Sexpr{} expressions but no prebuilt PDF manual."
+            })),
+      fmt(c(if(length(y <- x$dotjava)) {
+                "Package installs .java files."
+            },
+            if(length(y <- x$javafiles)) {
+                "Package has FOSS license, installs .class/.jar but has no 'java' directory."
+            })),
+      fmt(c(if(length(y <- x$citation_calls)) {
+                paste(c("Package CITATION file contains call(s) to:",
+                        strwrap(paste(y, collapse = ", "),
+                                indent = 2L, exdent = 4L)),
+                      collapse = "\n")
+            },
+            if(length(y <- x$citation_error)) {
+                paste(c("Reading CITATION file fails with",
+                        paste(" ", y),
+                        "when package is not installed."),
+                      collapse = "\n")
+            })),
+      fmt(c(if(length(y <- x$bad_urls)) {
+                if(inherits(y, "error"))
+                    paste(c("Checking URLs failed with message:",
+                            conditionMessage(y)),
+                          collapse = "\n")
+                else
+                    paste(c(if(length(y) > 1L)
+                                "Found the following (possibly) invalid URLs:"
+                            else
+                                "Found the following (possibly) invalid URL:",
+                            paste(" ", gsub("\n", "\n    ", format(y)))),
+                          collapse = "\n")
+            },
+            if(length(y) && any(nzchar(z <- y$CRAN))) {
+                ind <-
+                    grepl("https?://cran.r-project.org/web/packages/[.[:alnum:]]+(|/|/index.html)$",
+                          z, ignore.case = TRUE)
+                paste(c(if(any(ind)) {
+                            c("  The canonical URL of the CRAN page for a package is ",
+                              "  https://cran.r-project.org/package=pkgname")
+                        },
+                        if(any(nzchar(z) & !ind)) {
+                            "  A canonical CRAN URL starts with https://cran.r-project.org/"
+                        }),
+                      collapse = "\n")
+            },
+            if(length(y) && any(nzchar(y$Spaces))) {
+                "  Spaces in an http[s] URL should probably be replaced by %20"
+            },
+            if(length(y <- x$no_url_checks) && y) {
+                "Checking URLs requires 'libcurl' support in the R build"
+            })),
+      fmt(if(length(y <- x$bad_dois)) {
+              if(inherits(y, "error"))
+                  paste(c("Checking DOIs failed with message:",
+                          conditionMessage(y)),
+                        collapse = "\n")
+              else
+                  paste(c(if(length(y) > 1L)
+                              "Found the following (possibly) invalid DOIs:"
+                          else
+                              "Found the following (possibly) invalid DOI:",
+                          paste(" ", gsub("\n", "\n    ", format(y)))),
+                        collapse = "\n")
+          }),
       if(length(y <- x$R_files_non_ASCII)) {
-          c("\nNo package encoding and non-ASCII characters in the following R files:",
-            paste0("  ", names(y), "\n    ",
-                   sapply(y, paste, collapse = "\n    "),
-                   collapse = "\n"))
-      },
-      if(length(x$title_is_name)) {
-          "\nThe Title field is just the package name: provide a real title."
-      },
-      if(length(x$title_includes_name)) {
-          "\nThe Title field starts with the package name."
-      },
-      if(length(y <- x$title_case)) {
-          c("\nThe Title field should be in title case, current version then in title case:", sQuote(y))
-      },
-      if(length(x$descr_bad_initial)) {
-          "\nThe Description field should start with a capital letter."
+          paste(c("No package encoding and non-ASCII characters in the following R files:",
+                  paste0("  ", names(y), "\n    ",
+                         sapply(y, paste, collapse = "\n    "),
+                         collapse = "\n")),
+                collapse = "\n")
       },
-      if(length(x$descr_bad_start)) {
-          "\nThe Description field should not start with the package name,\n  'This package' or similar."
-      },
-      if(length(x$bad_date)) {
-          "\nThe Date field is not in ISO 8601 yyyy-mm-dd format."
-      },
-      if(length(x$old_date)) {
-          "\nThe Date field is over a month old."
-      }
-     )
+      fmt(c(if(length(x$title_is_name)) {
+                "The Title field is just the package name: provide a real title."
+            },
+            if(length(x$title_includes_name)) {
+                "The Title field starts with the package name."
+            },
+            if(length(y <- x$title_case)) {
+                paste(c("The Title field should be in title case, current version then in title case:",
+                        sQuote(y)),
+                      collapse = "\n")
+            })),
+      fmt(c(if(length(x$descr_bad_initial)) {
+                "The Description field should start with a capital letter."
+            },
+            if(length(x$descr_bad_start)) {
+                "The Description field should not start with the package name,\n  'This package' or similar."
+            })),
+      fmt(c(if(length(x$bad_date)) {
+                "The Date field is not in ISO 8601 yyyy-mm-dd format."
+            },
+            if(length(x$old_date)) {
+                "The Date field is over a month old."
+            })),
+      if(length(y <- x$size_of_tarball))
+          paste("Size of tarball:", y, "bytes")
+      )
+}
+
+print.check_package_CRAN_incoming <-
+function(x, ...)
+{
+    writeLines(paste(format(x, ...), collapse = "\n\n"))
+    invisible(x)
 }
 
 ### * .check_Rd_metadata
@@ -8127,7 +8256,7 @@
     ## ASCII letters, digits and hyphen.
     ## We could also check that the local and domain parts are no longer
     ## than 64 and 255 characters, respectively.
-    ## See http://en.wikipedia.org/wiki/Email_address.
+    ## See https://en.wikipedia.org/wiki/Email_address.
     ASCII_letters_and_digits <-
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
     l <- sprintf("[%s%s]", ASCII_letters_and_digits, "!#$%*/?|^{}`~&'+=_-")
diff -Nru r-base-3.2.3/src/library/tools/R/Rd2HTML.R r-base-3.3.1/src/library/tools/R/Rd2HTML.R
--- r-base-3.2.3/src/library/tools/R/Rd2HTML.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/Rd2HTML.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,6 +1,6 @@
 #  File src/library/tools/R/Rd2HTML.R
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #  Part of the R package, https://www.R-project.org
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -526,7 +526,7 @@
                    of1('" ')
                	   if (length(block) > 1L
                	       && length(imgoptions <- .Rd_get_latex(block[[2]]))
-		       && grepl("^options: ", imgoptions)) {
+		       && startsWith(imgoptions, "options: ")) {
 		       # There may be escaped percent signs within
 		       imgoptions <- gsub("\\%", "%", imgoptions, fixed=TRUE)
                        of1(sub("^options: ", "", imgoptions))
@@ -621,7 +621,7 @@
             tag <- tags[i]
             block <- blocks[[i]]
             if (length(pendingOpen)) { # Handle $, [ or [[ methods
-            	if (tag == "RCODE" && grepl("^\\(", block)) {
+            	if (tag == "RCODE" && startsWith(block, "(")) {
             	    block <- sub("^\\(", "", block)
             	    arg1 <- sub("[,)[:space:]].*", "", block)
 		    block <- sub(paste0(arg1, "[[:space:]]*,[[:space:]]*"),
diff -Nru r-base-3.2.3/src/library/tools/R/Rd2latex.R r-base-3.3.1/src/library/tools/R/Rd2latex.R
--- r-base-3.2.3/src/library/tools/R/Rd2latex.R	2015-08-25 22:16:53.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/Rd2latex.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/Rd2latex.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -316,9 +316,9 @@
     writeAlias <- function(block, tag) {
         alias <- as.character(block)
         aa <- "\\aliasA{"
-        ## some versions of hyperref (from 6.79d) have trouble indexing these
+        ## Some versions of hyperref (from 6.79d) have trouble indexing these
         ## |, || in base, |.bit, %||% in ggplot2 ...
-        ## And texindy used by texi2dvi > 1.135 chokes on {/(
+        ## And texindy used by some versions of texi2dvi chokes on {/(
         if(grepl("[|{(]", alias)) aa <- "\\aliasB{"
         if(is.na(currentAlias)) currentAlias <<- name
         if (pmatch(paste0(currentAlias, "."), alias, 0L)) {
@@ -438,7 +438,7 @@
                	   if (length(block) > 1L) {
 		       includeoptions <- .Rd_get_latex(block[[2]])
 		       if (length(includeoptions)
-			   && grepl("^options: ", includeoptions))
+			   && startsWith(includeoptions, "options: "))
 			   of0(sub("^options: ", "", includeoptions))
                    }
                	   of0('}')
diff -Nru r-base-3.2.3/src/library/tools/R/Rd2pdf.R r-base-3.3.1/src/library/tools/R/Rd2pdf.R
--- r-base-3.2.3/src/library/tools/R/Rd2pdf.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/Rd2pdf.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/Rd2pdf.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -84,12 +84,13 @@
 .Rdfiles2tex <-
     function(files, outfile, encoding = "unknown", outputEncoding = "UTF-8",
              append = FALSE, extraDirs = NULL, internals = FALSE,
-             silent = FALSE)
+             silent = FALSE, pkglist = NULL)
 {
     if (dir.exists(files))
         .pkg2tex(files, outfile, encoding = encoding, append = append,
                  asChapter = FALSE, extraDirs = extraDirs,
-                 internals = internals, silent = silent)
+                 internals = internals, silent = silent,
+                 pkglist = pkglist)
     else {
         files <- strsplit(files, "[[:space:]]+")[[1L]]
         latexdir <- tempfile("ltx")
@@ -101,6 +102,7 @@
         }
         latexEncodings <- character()
         hasFigures <- FALSE
+        macros <- initialRdMacros(pkglist = pkglist)
         for(f in files) {
             if (!silent) cat("  ", basename(f), "\n", sep="")
             if (!internals) {
@@ -112,7 +114,8 @@
             ## people have file names with quotes in them.
             res <- Rd2latex(f, out, encoding = encoding,
                             outputEncoding = outputEncoding,
-                            stages = c("build", "install", "render"))
+                            stages = c("build", "install", "render"),
+                            macros = macros)
             latexEncodings <- c(latexEncodings,
                                 attr(res,"latexEncoding"))
             lines <- readLines(out)
@@ -135,7 +138,8 @@
 .pkg2tex <-
     function(pkgdir, outfile, internals = FALSE, asChapter = TRUE,
              encoding = "unknown", outputEncoding = "UTF-8",
-             extraDirs = NULL, append = FALSE, silent = FALSE)
+             extraDirs = NULL, append = FALSE, silent = FALSE,
+             pkglist = NULL)
 {
     ## sort order for topics, a little tricky
     re <- function(x) x[order(toupper(x), x)]
@@ -168,6 +172,7 @@
                 return(invisible(character()))
             }
             cnt <- 0L
+            macros <- initialRdMacros(pkglist)
             for(f in names(Rd)) {
 ##                bf <- basename(f)
                 cnt <- cnt + 1L
@@ -180,7 +185,8 @@
 				  encoding = encoding,
 				  outputEncoding = outputEncoding,
 				  defines = NULL,
-				  writeEncoding = !asChapter)
+				  writeEncoding = !asChapter,
+				  macros = macros)
                 latexEncodings <- c(latexEncodings,
                                     attr(res, "latexEncoding"))
                 if (attr(res, "hasFigures")) {
@@ -232,6 +238,8 @@
             if (!silent) message("Converting Rd files to LaTeX ",
                                  appendLF = FALSE, domain = NA)
             cnt <- 0L
+            macros <- loadPkgRdMacros(pkgdir)
+            macros <- initialRdMacros(pkglist, macros)
             for(i in seq_along(paths)) {
                 cnt <- cnt + 1L
                 if(!silent && cnt %% 10L == 0L)
@@ -241,7 +249,8 @@
                 res <- Rd2latex(files[[i]], outfilename,
                                 stages = c("build", "install", "render"),
                                 encoding = encoding,
-                                outputEncoding = outputEncoding)
+                                outputEncoding = outputEncoding,
+                                macros = macros)
                 latexEncodings <-
                     c(latexEncodings, attr(res, "latexEncoding"))
                 if (attr(res, "hasFigures")) {
@@ -339,6 +348,8 @@
             "  -o, --output=OUT	use 'OUT' as the output file",
             "      --os=NAME		assume OS 'NAME' (unix or windows)",
             "      --OS=NAME		the same as '--os'",
+            "  --RdMacros=pkglist",
+            "             		packages from which to get Rd macros",
             "",
             "Possible format specifications are 'txt' (plain text), 'html', 'latex',",
             "and 'example' (extract R code in the examples).",
@@ -357,6 +368,7 @@
     pkg <- ""
     out <- NULL
     os <- ""
+    pkglist <- NULL
 
     if (is.null(args)) {
         args <- commandArgs(TRUE)
@@ -397,6 +409,8 @@
             out <- substr(a, 10, 1000)
         } else if (substr(a, 1, 5) %in% c("--os=", "--OS=")) {
             os <- substr(a, 6, 1000)
+        } else if (substr(a, 1, 11) == "--RdMacros=") {
+            pkglist <- substr(a, 12, 1000)
         } else if (substr(a, 1, 1) == "-") {
             message("Warning: unknown option ", sQuote(a))
         } else files <- c(files, a)
@@ -411,28 +425,33 @@
         out <- paste0(bf,  exts[type])
     } else if (is.null(out)) out <- ""
     if (!nzchar(os)) os <- .Platform$OS.type
+    macros <- initialRdMacros(pkglist = pkglist)
     switch(type,
            "txt" = {
                Rd2txt(files, out, package=pkg, defines=os,
                       outputEncoding = enc,
-                      stages = c("build", "install", "render"))
+                      stages = c("build", "install", "render"),
+                      macros = macros)
            },
            "html" = {
                if (!nzchar(enc)) enc <- "UTF-8"
                Rd2HTML(files, out, package = pkg, defines = os,
                        outputEncoding = enc, no_links = TRUE,
-                       stages = c("build", "install", "render"))
+                       stages = c("build", "install", "render"), 
+                       macros = macros)
            },
            "latex" = {
                if (!nzchar(enc)) enc <- "UTF-8"
                Rd2latex(files, out, defines = os,
                         outputEncoding = enc,
-                        stages = c("build", "install", "render"))
+                        stages = c("build", "install", "render"),
+                        macros = macros)
            },
            "example" = {
                if (!nzchar(enc)) enc <- "UTF-8"
                Rd2ex(files, out, defines = os, outputEncoding = enc,
-                     stages = c("build", "install", "render"))
+                     stages = c("build", "install", "render"),
+                     macros = macros)
            },
            "unknown" = stop("no 'type' specified", call. = FALSE),
            stop("'type' must be one of 'txt', 'html', 'latex' or 'example'",
@@ -447,7 +466,7 @@
 function(pkgdir, outfile, title, batch = FALSE,
          description = TRUE, only_meta = FALSE,
          enc = "unknown", outputEncoding = "UTF-8", files_or_dir, OSdir,
-         internals = FALSE, index = TRUE)
+         internals = FALSE, index = TRUE, pkglist = NULL)
 {
     ## Write directly to the final location.  Encodings and figures
     ## may mean we need to make edits, but for most files one pass
@@ -541,7 +560,7 @@
         if (nzchar(toc)) writeLines(toc, out)
         res <- .Rdfiles2tex(files_or_dir, out, encoding = enc, append = TRUE,
                          extraDirs = OSdir, internals = internals,
-                         silent = batch)
+                         silent = batch, pkglist = pkglist)
         if(length(res)) {
             latexEncodings <- res$latexEncodings
             hasFigures <- res$hasFigures
@@ -682,6 +701,8 @@
             "      --no-description	do not typeset the description of a package",
             "      --internals	typeset 'internal' documentation (usually skipped)",
             "      --build_dir=DIR	use DIR as the working directory",
+            "      --RdMacros=pkglist",
+            "             		packages from which to get Rd macros",
             "",
             "The output papersize is set by the environment variable R_PAPERSIZE.",
             "The PDF previewer is set by the environment variable R_PDFVIEWER.",
@@ -716,6 +737,7 @@
     files <- character()
     dir <- ""
     force <- FALSE
+    pkglist <- NULL
 
     WINDOWS <- .Platform$OS.type == "windows"
 
@@ -770,6 +792,8 @@
             description <- FALSE
         } else if (a == "--internals") {
             internals <- TRUE
+        } else if (substr(a, 1, 11) == "--RdMacros=") {
+            pkglist <- substr(a, 12, 1000)
         } else if (substr(a, 1, 1) == "-") {
             message("Warning: unknown option ", sQuote(a))
         } else files <- c(files, a)
@@ -822,7 +846,8 @@
     res <-
         try(.Rd2pdf(files[1L], file.path(build_dir, "Rd2.tex"),
                     title, batch, description, only_meta,
-                    enc, outenc, dir, OSdir, internals, index))
+                    enc, outenc, dir, OSdir, internals, index,
+                    pkglist))
     if (inherits(res, "try-error"))
         q("no", status = 11L, runLast = FALSE)
 
diff -Nru r-base-3.2.3/src/library/tools/R/Rd2txt.R r-base-3.3.1/src/library/tools/R/Rd2txt.R
--- r-base-3.2.3/src/library/tools/R/Rd2txt.R	2015-08-25 22:16:53.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/Rd2txt.R	2016-03-16 23:03:29.000000000 +0000
@@ -396,9 +396,6 @@
         linestart <<- trail
     }
 
-    blanks <- function(n)
-	if (n) paste(rep_len(" ", n), collapse="") else ""
-
     flushBuffer <- function() {
     	if (!length(buffer)) return()
 
@@ -434,10 +431,10 @@
 	} else {  # Not wrapping
 	    if (keepFirstIndent) {
 		if (length(buffer) > 1L)
-		    buffer[-1L] <<- paste0(blanks(indent), buffer[-1L])
+		    buffer[-1L] <<- paste0(strrep(" ", indent), buffer[-1L])
 		keepFirstIndent <- FALSE
 	    } else
-		buffer <<- paste0(blanks(indent), buffer)
+		buffer <<- paste0(strrep(" ", indent), buffer)
 	}
 
     	if (length(buffer)) WriteLines(buffer, con, outputEncoding)
@@ -774,7 +771,7 @@
         }
         result <- matrix("", sum(lines), cols)
         for (i in seq_len(cols))
-            result[, i] <- blanks(widths[i])
+            result[, i] <- strrep(" ", widths[i])
         firstline <- c(1L, 1L+cumsum(lines))
         for (i in seq_along(entries)) {
             e <- entries[[i]]
@@ -859,7 +856,7 @@
                                   indent <<- max(opts$minIndent,
                                                  indent + opts$extraIndent)
                                   keepFirstIndent <<- TRUE
-                                  putw(paste(rep_len(" ", indent0), collapse=""),
+                                  putw(strrep(" ", indent0),
                                        frmt(paste0(DLlab),
                                             justify="left", width=indent),
                                        " ")
@@ -918,7 +915,7 @@
             return()
     	save <- c(indent, sectionLevel, keepFirstIndent, dropBlank, wrapping)
     	blankLine(min(sectionLevel, 1L))
-    	titlePrefix <- paste(rep("  ", sectionLevel), collapse="")
+    	titlePrefix <- strrep("  ", sectionLevel)
     	opts <- Rd2txt_options()
         indent <<- opts$sectionIndent + opts$sectionExtra*sectionLevel
         sectionLevel <<- sectionLevel + 1
@@ -991,8 +988,8 @@
 		right <- paste0(right, "(", encoding, ")")
 	    pad <- max(HDR_WIDTH - nchar(left, "w") - nchar(mid, "w") - nchar(right, "w"), 0)
 	    pad0 <- pad %/% 2L
-	    pad1 <- paste(rep.int(" ", pad0), collapse = "")
-	    pad2 <- paste(rep.int(" ", pad - pad0), collapse = "")
+	    pad1 <- strrep(" ", pad0)
+	    pad2 <- strrep(" ", pad - pad0)
 	    putf(paste0(left, pad1, mid, pad2, right, "\n\n"))
 	}
 
diff -Nru r-base-3.2.3/src/library/tools/R/RdConv2.R r-base-3.3.1/src/library/tools/R/RdConv2.R
--- r-base-3.2.3/src/library/tools/R/RdConv2.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/RdConv2.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/RdConv2.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -977,7 +977,7 @@
 
 print.checkRd <- function(x, minlevel = -Inf, ...)
 {
-    fromParse <- grepl("^prepare_Rd", x)
+    fromParse <- startsWith(x, "prepare_Rd")
     x1 <- x[fromParse]
     x2 <- x[!fromParse]
     levs <- as.numeric(sub("^checkRd: \\(([-0123456789]+)(.*)", "\\1", x2))
diff -Nru r-base-3.2.3/src/library/tools/R/RdHelpers.R r-base-3.3.1/src/library/tools/R/RdHelpers.R
--- r-base-3.2.3/src/library/tools/R/RdHelpers.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/RdHelpers.R	2016-03-16 23:03:29.000000000 +0000
@@ -98,3 +98,13 @@
     }
     result
 }
+
+Rd_expr_doi <- function(x)
+{
+    ## Be nice ...
+    x <- .canonicalize_doi(x)
+
+    sprintf("\\ifelse{text}{%s}{%s}",
+            sprintf("doi: %s (URL: http://doi.org/%s)", x, x),
+            sprintf("\\href{http://doi.org/%s}{doi:\\sspace{}%s}", x, x))
+}
diff -Nru r-base-3.2.3/src/library/tools/R/Rd.R r-base-3.3.1/src/library/tools/R/Rd.R
--- r-base-3.2.3/src/library/tools/R/Rd.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/Rd.R	2016-03-16 23:03:29.000000000 +0000
@@ -352,13 +352,14 @@
 }
 
 .build_Rd_db <-
-function(dir = NULL, files = NULL, encoding = "unknown", db_file = NULL,
-         stages = c("build", "install"), os = .OStype(), step = 3L, built_file = NULL)
+function(dir = NULL, files = NULL,
+         encoding = "unknown", db_file = NULL,
+         stages = c("build", "install"), os = .OStype(), step = 3L,
+         built_file = NULL, macros = character())
 {
-    macros <- file.path(R.home("share"), "Rd", "macros", "system.Rd")
     if(!is.null(dir)) {
         dir <- file_path_as_absolute(dir)
-        macros <- loadPkgRdMacros(dir, macros)
+        macros0 <- loadPkgRdMacros(dir)
         man_dir <- file.path(dir, "man")
         if(!dir.exists(man_dir))
             return(structure(list(), names = character()))
@@ -366,9 +367,19 @@
             files <- list_files_with_type(man_dir, "docs", OS_subdirs=os)
         encoding <- .get_package_metadata(dir, FALSE)["Encoding"]
         if(is.na(encoding)) encoding <- "unknown"
-    } else if(is.null(files))
+    } else if(!is.null(files))
+        macros0 <- initialRdMacros()
+    else
         stop("you must specify 'dir' or 'files'")
 
+    if(length(macros)) {
+        con <- textConnection(macros)
+        macros <- loadRdMacros(con, macros0)
+        close(con)
+    } else {
+        macros <- macros0
+    }
+
     .fetch_Rd_object <- function(f) {
         ## This calls parse_Rd if f is a filename
         Rd <- prepare_Rd(f, encoding = encoding,
@@ -867,14 +878,11 @@
     attr(Rd, "macros")
 }
 
-
-loadPkgRdMacros <- function(pkgdir, macros) {
-    others <- try(.read_description(file.path(pkgdir, "DESCRIPTION"))["RdMacros"], silent=TRUE)
-    if (inherits(others, "try-error"))
-    	others <- .read_description(file.path(pkgdir, "DESCRIPTION.in"))["RdMacros"]
-
-    if (!is.na(others)) {
-    	others <- trimws(unlist(strsplit(others, ",")))
+initialRdMacros <- function(pkglist = NULL,
+                            macros = file.path(R.home("share"), "Rd", "macros", "system.Rd")
+                            ) {
+    if (length(pkglist)) {
+    	others <- trimws(unlist(strsplit(pkglist, ",")))
 
     	for (p in others) {
     	    if (dir.exists(system.file("help/macros", package = p)))
@@ -882,7 +890,32 @@
     	    else
     	    	warning(gettextf("No Rd macros in package '%s'.", p), call. = FALSE)
         }
-    }
+    } else if (is.character(macros))
+    	macros <- loadRdMacros(file = macros)
+    macros
+}
+
+loadPkgRdMacros <- function(pkgdir, macros = NULL) {
+    ## this does get called on any directory,
+    ## e.g. a man directory in package 'diveMove'.
+    pkglist <- try(.read_description(file.path(pkgdir, "DESCRIPTION")),
+                   silent = TRUE)
+    if (inherits(pkglist, "try-error"))
+    	pkglist <-  try(.read_description(file.path(pkgdir, "DESCRIPTION.in")),
+                        silent = TRUE)
+    ## may check for 'macros' subdirectory?
+    if (inherits(pkglist, "try-error")) return(macros)
+
+    pkglist <- pkglist["RdMacros"]
+
+    if (is.na(pkglist))
+        pkglist <- NULL
+
+    if (is.null(macros))
+        macros <- initialRdMacros(pkglist)
+    else
+        macros <- initialRdMacros(pkglist, macros)
+
     files <- c(list.files(file.path(pkgdir, "man", "macros"), pattern = "\\.Rd$", full.names = TRUE),
                list.files(file.path(pkgdir, "help", "macros"), pattern = "\\.Rd$", full.names = TRUE))
 
diff -Nru r-base-3.2.3/src/library/tools/R/sysdata.R r-base-3.3.1/src/library/tools/R/sysdata.R
--- r-base-3.2.3/src/library/tools/R/sysdata.R	2015-03-18 23:03:12.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/sysdata.R	2015-12-10 23:15:16.000000000 +0000
@@ -1,11 +1,11 @@
 make_sysdata_rda <-
-function()    
+function()
 {
     IANA_URI_scheme_db <- get_IANA_URI_scheme_db()
 
     IANA_HTTP_status_code_db <- get_IANA_HTTP_status_code_db()
 
-    ## See <http://en.wikipedia.org/wiki/List_of_HTTP_status_codes>.
+    ## See <https://en.wikipedia.org/wiki/List_of_HTTP_status_codes>.
     table_of_HTTP_status_codes <- IANA_HTTP_status_code_db$Description
     names(table_of_HTTP_status_codes) <- IANA_HTTP_status_code_db$Value
 
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/tools/R/sysdata.rda and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/tools/R/sysdata.rda differ
diff -Nru r-base-3.2.3/src/library/tools/R/testing.R r-base-3.3.1/src/library/tools/R/testing.R
--- r-base-3.2.3/src/library/tools/R/testing.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/testing.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/testing.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 # NB: also copyright date in Usage.
 #
@@ -158,7 +158,7 @@
         if(length(ll)) txt <- txt[seq_len(max(ll) - 1L)]
         ## remove BATCH footer
         nl <- length(txt)
-        if(nl > 3L && grepl("^> proc.time\\(\\)", txt[nl-2L])) txt <- txt[1:(nl-3L)]
+        if(nl > 3L && startsWith(txt[nl-2L], "> proc.time()")) txt <- txt[1:(nl-3L)]
         if (nullPointers)
         ## remove pointer addresses from listings
             txt <- gsub("<(environment|bytecode|pointer|promise): [x[:xdigit:]]+>", "<\\1: 0>", txt)
@@ -230,6 +230,7 @@
     }
 } ## {Rdiff}
 
+
 testInstalledPackages <-
     function(outDir = ".", errorsAreFatal = TRUE,
              scope = c("both", "base", "recommended"),
@@ -675,7 +676,7 @@
 
     ## The items need not all be packages
     ## and non-packages can be on the list multiple times.
-    isPkg <- grepl("^package:", pkgs)
+    isPkg <- startsWith(pkgs,"package:")
     for(item in pkgs[!isPkg]) {
         pos <- match(item, search())
         if(!is.na(pos)) .detach(pos)
@@ -696,7 +697,7 @@
         unl <- unlist(deps)
         for(i in seq_along(deps)) {
             this <- names(deps)[i]
-            if(sub("^package:", "", this) %in% unl) next else break
+	    if(.rmpkg(this) %in% unl) next else break
         }
         ## hopefully force = TRUE is never needed, but it does ensure
         ## that progress gets made
diff -Nru r-base-3.2.3/src/library/tools/R/toHTML.R r-base-3.3.1/src/library/tools/R/toHTML.R
--- r-base-3.2.3/src/library/tools/R/toHTML.R	2015-03-18 23:03:12.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/toHTML.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 toHTML <- function(x, ...) UseMethod("toHTML")
 
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 
 HTMLheader <-
 function(title="R", logo=TRUE,
@@ -23,7 +23,7 @@
     if (logo)
     	result <- c(result,
                     paste0('<img class="toplogo" src="',
-                           file.path(Rhome, 'doc/html/logo.jpg'),
+                           file.path(Rhome, 'doc/html/Rlogo.svg'),
                            '" alt="[R logo]" />'))
     result <- c(result, '</h1>', '<hr/>')
     if (!is.null(up) || !is.null(top)) {
@@ -71,7 +71,7 @@
 			   ' <td style="text-align: left; vertical-align: top; width: 10%;">\n',
 			   htmlify(out[[pkg]][, "Item"]),
 			   '\n </td>\n',
-                           ' <td style="text-align: left" vertical-align: top; width: 90%;">\n',
+                           ' <td style="text-align: left; vertical-align: top; width: 90%;">\n',
 			   htmlify(out[[pkg]][, "Title"]),
 			   '\n </td>\n</tr>\n'),
 		    '</table>')
@@ -226,8 +226,7 @@
              '<col style="width:  2%;" />',
              '<col style="width: 74%;" />')
     pkg <- help[, "Package"]
-    root <- paste0(paste(rep.int("../", depth), collapse = ""),
-                   "library/", pkg, "/html/")
+    root <- paste0(strrep("../", depth), "library/", pkg, "/html/")
     topic <- help[, "Topic"]
     Title <- help[, "Title"]
     links <- paste0('<a href="', root, topic, '.html">',
diff -Nru r-base-3.2.3/src/library/tools/R/translations.R r-base-3.3.1/src/library/tools/R/translations.R
--- r-base-3.2.3/src/library/tools/R/translations.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/translations.R	2016-03-16 23:03:29.000000000 +0000
@@ -45,8 +45,8 @@
         nc <- nchar(this); n <- length(nc)
         this <- paste0(this, collapse="")
         ## This is the fixup: need to avoid apostrophes, which follow alnum
-        this <- gsub("^'([^`']*)'",'‘\\1’', this)
-        this <- gsub("([^[:alpha:]]|\\\\n)'([^`']*)'",'\\1‘\\2’', this)
+        this <- gsub("^'([^`']*)'",'\u2018\\1\u2019', this)
+        this <- gsub("([^[:alpha:]]|\\\\n)'([^`']*)'",'\\1\u2018\\2\u2019', this)
         out <- if (n > 1L) {
             ## now split where it was before
             this1 <- character()
diff -Nru r-base-3.2.3/src/library/tools/R/urltools.R r-base-3.3.1/src/library/tools/R/urltools.R
--- r-base-3.2.3/src/library/tools/R/urltools.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/urltools.R	2016-03-16 23:03:29.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/urltools.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 2015 The R Core Team
+#  Copyright (C) 2015-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,25 +19,16 @@
 get_IANA_URI_scheme_db <-
 function()
 {
-    ## See <http://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml>.
+    ## See
+    ## <http://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml>.
     baseurl <- "http://www.iana.org/assignments/uri-schemes/"
-    permanent <- utils::read.csv(url(paste0(baseurl, "uri-schemes-1.csv")),
-                                 stringsAsFactors = FALSE)
-    provisional <- utils::read.csv(url(paste0(baseurl, "uri-schemes-2.csv")),
-                                   stringsAsFactors = FALSE)
-    historical <- utils::read.csv(url(paste0(baseurl, "uri-schemes-3.csv")),
-                                  stringsAsFactors = FALSE)
-    db <- rbind(permanent, provisional, historical)
-    db$Category <-
-        rep.int(c("permanent", "provisional", "historical"),
-                c(nrow(permanent),
-                  nrow(provisional),
-                  nrow(historical)))
+    db <- utils::read.csv(url(paste0(baseurl, "uri-schemes-1.csv")),
+                          stringsAsFactors = FALSE)
     names(db) <- chartr(".", "_", names(db))
     db
 }
 
-parse_URL_reference <-
+parse_URI_reference <-
 function(x)
 {
     ## See RFC_3986 <http://www.ietf.org/rfc/rfc3986.txt>.
@@ -78,23 +69,9 @@
 .get_urls_from_HTML_file <-
 function(f)
 {
-    hrefs <- character()
-    XML::htmlParse(f,
-                   handlers =
-                       list(a = function(node) {
-                           href <- XML::xmlAttrs(node)["href"]
-                           ## <FIXME>
-                           ## ? XML::xmlAttrs says the value is always a
-                           ## named character vector, but
-                           ##   XML::xmlAttrs(XML::xmlNode("a", "foobar"))
-                           ## gives NULL ...
-                           ## Hence, use an extra is.null() test.
-                           if(!is.null(href) && !is.na(href))
-                               hrefs <<- c(hrefs, href)
-                           ## </FIXME>
-                       })
-                   )
-    unique(unname(hrefs[!grepl("^#", hrefs)]))
+    nodes <- xml2::xml_find_all(xml2::read_html(f), "//a")
+    hrefs <- xml2::xml_attr(nodes, "href")
+    unique(hrefs[!is.na(hrefs) & !startsWith(hrefs, "#")])
 }
 
 url_db <-
@@ -120,16 +97,6 @@
 url_db_from_package_metadata <-
 function(meta)
 {
-    gregexec_at_pos <- function(pattern, v, m, pos) {
-        unlist(lapply(regmatches(v, m),
-                      function(e)
-                          do.call(rbind,
-                                  regmatches(e,
-                                             regexec(pattern, e)))[, 3L]
-                      ),
-               use.names = FALSE)
-    }
-
     urls <- character()
     fields <- c("URL", "BugReports")
     for(v in meta[fields]) {
@@ -137,11 +104,11 @@
         pattern <-
             "<(URL: *)?((https?|ftp)://[^[:space:],]*)[[:space:]]>"
         m <- gregexpr(pattern, v)
-        urls <- c(urls, gregexec_at_pos(pattern, v, m, 3L))
+        urls <- c(urls, .gregexec_at_pos(pattern, v, m, 3L))
         regmatches(v, m) <- ""
         pattern <- "(^|[^>\"])((https?|ftp)://[^[:space:],]*)"
         m <- gregexpr(pattern, v)
-        urls <- c(urls, gregexec_at_pos(pattern, v, m, 3L))
+        urls <- c(urls, .gregexec_at_pos(pattern, v, m, 3L))
     }
 
     url_db(urls, rep.int("DESCRIPTION", length(urls)))
@@ -168,8 +135,7 @@
     path <- if(installed) "NEWS.Rd" else file.path("inst", "NEWS.Rd")
     nfile <- file.path(dir, path)
     if(file.exists(nfile)) {
-        macros <- loadRdMacros(file.path(R.home("share"),
-                                         "Rd", "macros", "system.Rd"))
+        macros <- initialRdMacros()
         urls <- .get_urls_from_Rd(prepare_Rd(tools::parse_Rd(nfile,
                                                              macros = macros),
                                              stages = "install"))
@@ -200,20 +166,43 @@
 }
 
 url_db_from_package_README_md <-
-function(dir)
+function(dir, installed = FALSE)
 {
-    urls <- character()
-    if(file.exists(rfile <- file.path(dir, "README.md")) &&
-       nzchar(Sys.which("pandoc"))) {
-        tfile <- tempfile("README", fileext=".html")
+    urls <- path <- character()
+    rfile <- Filter(file.exists,
+                    c(if(!installed)
+                          file.path(dir, "inst", "README.md"),
+                      file.path(dir, "README.md")))[1L]
+    if(!is.na(rfile) && nzchar(Sys.which("pandoc"))) {
+        path <- .file_path_relative_to_dir(rfile, dir)
+        tfile <- tempfile("README", fileext = ".html")
         on.exit(unlink(tfile))
-        out <- .pandoc_README_md_for_CRAN(rfile, tfile)
+        out <- .pandoc_md_for_CRAN(rfile, tfile)
         if(!out$status) {
             urls <- .get_urls_from_HTML_file(tfile)
         }
     }
-    url_db(urls, rep.int("README.md", length(urls)))
+    url_db(urls, rep.int(path, length(urls)))
+}
 
+url_db_from_package_NEWS_md <-
+function(dir, installed = FALSE)
+{
+    urls <- path <- character()
+    nfile <- Filter(file.exists,
+                    c(if(!installed)
+                          file.path(dir, "inst", "NEWS.md"),
+                      file.path(dir, "NEWS.md")))[1L]
+    if(!is.na(nfile) && nzchar(Sys.which("pandoc"))) {
+        path <- .file_path_relative_to_dir(nfile, dir)
+        tfile <- tempfile("NEWS", fileext = ".html")
+        on.exit(unlink(tfile))
+        out <- .pandoc_md_for_CRAN(nfile, tfile)
+        if(!out$status) {
+            urls <- .get_urls_from_HTML_file(tfile)
+        }
+    }
+    url_db(urls, rep.int(path, length(urls)))
 }
 
 url_db_from_package_sources <-
@@ -223,10 +212,12 @@
                 url_db_from_package_Rd_db(Rd_db(dir = dir)),
                 url_db_from_package_citation(dir, meta),
                 url_db_from_package_news(dir))
-    if(requireNamespace("XML", quietly = TRUE)) {
+    if(requireNamespace("xml2", quietly = TRUE)) {
         db <- rbind(db,
                     url_db_from_package_HTML_files(dir),
-                    url_db_from_package_README_md(dir))
+                    url_db_from_package_README_md(dir),
+                    url_db_from_package_NEWS_md(dir)
+                    )
     }
     if(add)
         db$Parent <- file.path(basename(dir), db$Parent)
@@ -249,10 +240,15 @@
                     url_db_from_package_citation(dir, meta,
                                                  installed = TRUE),
                     url_db_from_package_news(dir, installed = TRUE))
-        if(requireNamespace("XML", quietly = TRUE)) {
+        if(requireNamespace("xml2", quietly = TRUE)) {
             db <- rbind(db,
                         url_db_from_package_HTML_files(dir,
-                                                       installed = TRUE))
+                                                       installed = TRUE),
+                        url_db_from_package_README_md(dir,
+                                                      installed = TRUE),
+                        url_db_from_package_NEWS_md(dir,
+                                                    installed = TRUE)
+                        )
         }
         db$Parent <- file.path(p, db$Parent)
         db
@@ -274,7 +270,7 @@
     db[db$Description != "Unassigned", ]
 }
 
-## See <http://en.wikipedia.org/wiki/List_of_FTP_server_return_codes>
+## See <https://en.wikipedia.org/wiki/List_of_FTP_server_return_codes>
 ## and <http://tools.ietf.org/html/rfc959>,
 ## Section 4.2.2 "Numeric Order List of Reply Codes",
 ## and <https://tools.ietf.org/html/rfc2228>,
@@ -378,8 +374,9 @@
         ## A mis-configured site
         if (s == "503" && any(grepl("www.sciencedirect.com", c(u, newLoc))))
             s <- "405"
-        cran <- grepl("https?://cran.r-project.org/web/packages/[.[:alnum:]]+(|/|/index.html)$",
-                      u, ignore.case = TRUE)
+        cran <- (grepl("https?://cran.r-project.org/web/packages/[.[:alnum:]]+(|/|/index.html)$",
+                       u, ignore.case = TRUE) ||
+                 any(substring(tolower(u), 1L, nchar(mirrors)) == mirrors))
         spaces <- grepl(" ", u)
         c(s, msg, newLoc, if(cran) u else "", if(spaces) u else "")
     }
@@ -388,9 +385,17 @@
 
     if(!NROW(db)) return(bad)
 
+    ## Could also use utils::getCRANmirrors(local.only = TRUE).
+    mirrors <- c(utils::read.csv(file.path(R.home("doc"),
+                                           "CRAN_mirrors.csv"),
+                                 as.is = TRUE, encoding = "UTF-8")$URL,
+                 "http://cran.rstudio.com/",
+                 "https://cran.rstudio.com/")
+    mirrors <- tolower(sub("/$", "", mirrors))
+
     parents <- split(db$Parent, db$URL)
     urls <- names(parents)
-    parts <- parse_URL_reference(urls)
+    parts <- parse_URI_reference(urls)
 
     ## Empty URLs.
     ind <- apply(parts == "", 1L, all)
@@ -404,13 +409,21 @@
 
     ## Invalid URI schemes.
     schemes <- parts[, 1L]
-    ind <- is.na(match(schemes, c("", IANA_URI_scheme_db$URI_Scheme)))
+    ind <- is.na(match(schemes,
+                       c("",
+                         IANA_URI_scheme_db$URI_Scheme,
+                         ## Also allow 'javascript' scheme, see
+                         ## <https://tools.ietf.org/html/draft-hoehrmann-javascript-scheme-03>
+                         ## (but apparently never registered with IANA).
+                         "javascript")))
     if(any(ind)) {
         len <- sum(ind)
+        msg <- rep.int("Invalid URI scheme", len)
+        doi <- schemes[ind] == "doi"
+        if(any(doi))
+            msg[doi] <- paste(msg[doi], "(use \\doi for DOIs)")
         bad <- rbind(bad,
-                     .gather(urls[ind],
-                             parents[ind],
-                             m = rep.int("Invalid URI scheme", len)))
+                     .gather(urls[ind], parents[ind], m = msg))
     }
 
     ## ftp.
diff -Nru r-base-3.2.3/src/library/tools/R/utils.R r-base-3.3.1/src/library/tools/R/utils.R
--- r-base-3.2.3/src/library/tools/R/utils.R	2015-12-04 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/utils.R	2016-04-24 22:15:04.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/utils.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -314,6 +314,24 @@
                                       shQuote(file)),
                                     env = env0)
 
+        log <- paste(file_path_sans_ext(file), "log", sep = ".")
+
+        ## With Texinfo 6.1 (precisely, c6637), texi2dvi may not rerun
+        ## often enough and give a non-zero status value when it should
+        ## have continued iterating.
+        ## Try to catch and correct cases seen on CRAN ...
+        ## (Note that texi2dvi may have been run quietly, in which case
+        ## diagnostics will only be in the log file.)
+        if(out$status &&
+           file_test("-f", log) &&
+           any(grepl("(Rerun to get|biblatex.*\\(re\\)run)",
+                     readLines(log, warn = FALSE)))) {
+            out <- .system_with_capture(texi2dvi,
+                                        c(opt_pdf, opt_quiet, opt_extra,
+                                          shQuote(file)),
+                                        env = env0)
+        }
+
         ## We cannot necessarily rely on out$status, hence let us
         ## analyze the log files in any case.
         errors <- character()
@@ -452,13 +470,20 @@
                                   makeindex, idxfile),
                          domain = NA)
             }
-            if(sys2(latex, ltxargs))
-                stop(gettextf("unable to run %s on '%s'", latex, file),
+            if(sys2(latex, ltxargs)) {
+                lines <- .get_LaTeX_errors_from_log_file(paste0(base, ".log"))
+                errors <- if(length(lines))
+                    paste("LaTeX errors:",
+                          paste(lines, collapse = "\n"), sep = "\n")
+                else character()
+                stop(paste(gettextf("unable to run %s on '%s'", latex, file),
+                           errors, sep = "\n"),
                      domain = NA)
+            }
             Log <- readLines(paste0(base, ".log"))
             nmiss <- length(grep("Warning:.*Citation.*undefined", Log))
             if(nmiss == nmiss_prev &&
-               !length(grep("Rerun to get", Log)) ) break
+               !any(grepl("(Rerun to get|biblatex.*\\(re\\)run)", Log)) ) break
         }
         do_cleanup(clean)
     }
@@ -470,7 +495,7 @@
 ### ** .BioC_version_associated_with_R_version
 
 .BioC_version_associated_with_R_version <-
-    function() numeric_version(Sys.getenv("R_BIOC_VERSION", "3.2"))
+    function() numeric_version(Sys.getenv("R_BIOC_VERSION", "3.3"))
 ## Things are more complicated from R-2.15.x with still two BioC
 ## releases a year, so we do need to set this manually.
 ## Wierdly, 3.0 is the second version (after 2.14) for the 3.1.x series.
@@ -559,6 +584,15 @@
     }
 }
 
+### ** .canonicalize_doi
+
+.canonicalize_doi <-
+function(x)    
+{
+    x <- sub("^((doi|DOI):)?[[:space:]]*http://(dx[.])?doi[.]org/", "",
+             x)
+    sub("^(doi|DOI):", "", x)
+}
 
 ### ** .canonicalize_quotes
 
@@ -621,7 +655,7 @@
     db <- db[, c("Target", "Anchor"), drop = FALSE]
     ## See .check_Rd_xrefs().
     anchor <- db[, 2L]
-    have_equals <- grepl("^=", anchor)
+    have_equals <- startsWith(anchor, "=")
     if(any(have_equals))
         db[have_equals, ] <-
             cbind(sub("^=", "", anchor[have_equals]), "")
@@ -804,13 +838,20 @@
 ### ** .get_namespace_package_depends
 
 .get_namespace_package_depends <-
-function(dir)
+function(dir, selective_only = FALSE)
 {
     nsInfo <- .check_namespace(dir)
-    depends <- c(sapply(nsInfo$imports, "[[", 1L),
-                 sapply(nsInfo$importClasses, "[[", 1L),
-                 sapply(nsInfo$importMethods, "[[", 1L))
-    unique(sort(as.character(depends)))
+    getter <- if(selective_only) {
+        function(e) {
+            if(is.list(e) && length(e[[2L]])) e[[1L]] else character()
+        }
+    } else {
+        function(e) e[[1L]]
+    }
+    depends <- c(lapply(nsInfo$imports, getter),
+                 lapply(nsInfo$importClasses, getter),
+                 lapply(nsInfo$importMethods, getter))
+    unique(sort(as.character(unlist(depends, use.names = FALSE))))
 }
 
 ### ** .get_namespace_S3_methods_db
@@ -1136,6 +1177,20 @@
     sort(unique(sub(re, "", lines[grepl(re, lines)])))
 }
 
+### ** .gregexec_at_pos
+
+.gregexec_at_pos <-
+function(pattern, x, m, pos)
+{
+    unlist(lapply(regmatches(x, m),
+                  function(e)
+                      do.call(rbind,
+                              regmatches(e,
+                                         regexec(pattern, e)))[, pos]
+                  ),
+           use.names = FALSE)
+}
+
 ### ** .gsub_with_transformed_matches
 
 .gsub_with_transformed_matches <-
@@ -1176,6 +1231,28 @@
     x
 }
 
+### imports_for_undefined_globals
+
+imports_for_undefined_globals <-
+function(txt, lst, selective = TRUE)
+{
+    if(!missing(txt))
+        lst <- scan(what = character(), text = txt, quiet = TRUE)
+    lst <- sort(unique(lst))
+    nms <- lapply(lst, utils::find)
+    ind <- sapply(nms, length) > 0L
+    imp <- split(lst[ind], substring(unlist(nms[ind]), 9L))
+    if(selective) {
+        sprintf("importFrom(%s)",
+                vapply(Map(c, names(imp), imp),
+                       function(e)
+                           paste0("\"", e, "\"", collapse = ", "),
+                       ""))
+    } else {
+        sprintf("import(\"%s\")", names(imp))
+    }
+}
+
 ### ** .is_ASCII
 
 .is_ASCII <-
@@ -1269,6 +1346,25 @@
     if(mustMatch) res == fname else nzchar(res)
 }
 
+### ** .load_namespace_rather_quietly
+
+.load_namespace_rather_quietly <-
+function(package)
+{
+    ## Suppress messages and warnings from loading namespace
+    ## dependencies.
+    .whandler <- function(e) {
+        calls <- sys.calls()
+        if(sum(.call_names(calls) == "loadNamespace") == 1L)
+            signalCondition(e)
+        else
+            invokeRestart("muffleWarning")
+    }
+    expr <- substitute(loadNamespace(package), list(package = package))
+    invisible(withCallingHandlers(suppressMessages(eval(expr)),
+                                  warning = .whandler))
+}
+
 ### ** .load_package_quietly
 
 .load_package_quietly <-
@@ -1366,6 +1462,7 @@
 
 ### ** .make_S3_primitive_nongeneric_env
 
+## why not just use  base::.ArgsEnv -- is the parent really important if(is_base)?
 .make_S3_primitive_nongeneric_env <-
 function(parent = parent.frame())
 {
@@ -1375,10 +1472,9 @@
              hash=TRUE, parent=parent)
 }
 
-### ** .make_S3_methods_stop_list
+### ** nonS3methods [was .make_S3_methods_stop_list ]
 
-.make_S3_methods_stop_list <-
-function(package)
+nonS3methods <- function(package)
 {
     ## Return a character vector with the names of the functions in
     ## @code{package} which 'look' like S3 methods, but are not.
@@ -1392,10 +1488,7 @@
              "print.atomic", "print.coefmat",
              "qr.Q", "qr.R", "qr.X", "qr.coef", "qr.fitted", "qr.qty",
              "qr.qy", "qr.resid", "qr.solve",
-             ## round.POSIXt is a method for S3 and S4 group generics with
-             ## deliberately different arg names.
-             "rep.int", "round.POSIXt",
-             "seq.int", "sort.int", "sort.list"),
+             "rep.int", "seq.int", "sort.int", "sort.list"),
              AMORE = "sim.MLPnet",
              BSDA = "sign.test",
              ChemometricsWithR = "lda.loofun",
@@ -1493,13 +1586,13 @@
     out
 }
 
-### ** .pandoc_README_md_for_CRAN
+### ** .pandoc_md_for_CRAN
 
-.pandoc_README_md_for_CRAN <-
+.pandoc_md_for_CRAN <-
 function(ifile, ofile)
 {
     .system_with_capture("pandoc",
-                         paste(shQuote(ifile), "-s",
+                         paste(shQuote(normalizePath(ifile)), "-s",
                                "--email-obfuscation=references",
                                "--css=../../CRAN_web.css",
                                "-o", shQuote(ofile)))
@@ -1544,6 +1637,12 @@
     .try_quietly(readLines(con, warn=FALSE))
 }
 
+### ** .read_additional_repositories_field
+
+.read_additional_repositories_field <-
+function(txt)
+    unique(unlist(strsplit(txt, ",[[:space:]]*")))
+
 ### ** .read_citation_quietly
 
 .read_citation_quietly <-
@@ -1649,12 +1748,13 @@
     db
 }
 
+### default changed to https: for R 3.3.0
 .expand_BioC_repository_URLs <-
 function(x)
 {
     x <- sub("%bm",
              as.character(getOption("BioC_mirror",
-                                    "http://bioconductor.org")),
+                                    "https://bioconductor.org")),
              x, fixed = TRUE)
     sub("%v",
         as.character(.BioC_version_associated_with_R_version()),
@@ -1788,7 +1888,7 @@
     if(x2 != x1) {
         pat <- "[[:space:]]*([[<>=!]+)[[:space:]]+(.*)"
         version <- sub(pat, "\\2", x2)
-        if (!grepl("^r", version)) version <- package_version(version)
+        if (!startsWith(version, "r")) version <- package_version(version)
         list(name = x1, op = sub(pat, "\\1", x2), version = version)
     } else list(name = x1)
 }
@@ -1916,6 +2016,17 @@
               msg)
 }
 
+### * Miscellania
+
+### ** Rcmd
+
+Rcmd <- function(args, ...)
+{
+    if(.Platform$OS.type == "windows")
+        system2(file.path(R.home("bin"), "Rcmd.exe"), args, ...)
+    else
+        system2(file.path(R.home("bin"), "R"), c("CMD", args), ...)
+}
 
 ### ** pskill
 
@@ -1960,7 +2071,7 @@
                        tolower(substring(x, 3L)))
             else paste0(toupper(x1), tolower(substring(x, 2L)))
         }
-        xx <- .Call(splitString, x, ' -/"()')
+        xx <- .Call(splitString, x, ' -/"()\n')
         ## for 'alone' we could insist on that exact capitalization
         alone <- xx %in% c(alone, either)
         alone <- alone | grepl("^'.*'$", xx)
diff -Nru r-base-3.2.3/src/library/tools/R/Vignettes.R r-base-3.3.1/src/library/tools/R/Vignettes.R
--- r-base-3.2.3/src/library/tools/R/Vignettes.R	2015-09-04 22:15:09.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/Vignettes.R	2016-06-14 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/Vignettes.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -250,15 +250,15 @@
     if(weave && latex) {
         if(!("Makefile" %in% list.files(vigns$dir))) {
             ## <NOTE>
-            ## This used to run texi2dvi on *all* vignettes, including
+            ## This used to run texi2pdf on *all* vignettes, including
             ## the ones already known from the above to give trouble.
-            ## In addition, texi2dvi errors were not caught, so that in
+            ## In addition, texi2pdf errors were not caught, so that in
             ## particular the results of the previous QC analysis were
             ## *not* returned in case of such errors ...
             ## Hence, let us
-            ## * Only run texi2dvi() on previously unproblematic vignettes
-            ## * Catch texi2dvi() errors similar to the above.
-            ## * Do *not* immediately show texi2dvi() output as part of
+            ## * Only run texi2pdf() on previously unproblematic vignettes
+            ## * Catch texi2pdf() errors similar to the above.
+            ## * Do *not* immediately show texi2pdf() output as part of
             ##   running checkVignettes().
             ## (For the future, maybe keep this output and provide it as
             ## additional diagnostics ...)
@@ -416,10 +416,10 @@
     stopifnot(length(names)    == length(docs),
 	      length(engines)  == length(docs),
 	      length(patterns) == length(docs), !anyDuplicated(docs))
-	      
-    defaultEncoding <- .get_package_metadata(dir)["Encoding"]	      
+
+    defaultEncoding <- .get_package_metadata(dir)["Encoding"]
     encodings <- vapply(docs, getVignetteEncoding, "", default = defaultEncoding)
-    
+
     z <- list(docs=docs, names=names, engines=engines, patterns=patterns, encodings = encodings,
 	      dir = docdir, pkgdir = dir, msg = msg)
 
@@ -506,12 +506,12 @@
     for(i in seq_along(vigns$docs)) {
         file <- basename(vigns$docs[i])
         name <- vigns$names[i]
-    	engine <- vignetteEngine(vigns$engine[i])
+    	engine <- vignetteEngine(vigns$engines[i])
         enc <- vigns$encodings[i]
-        if (enc == "non-ASCII") 
-            stop(gettextf("Vignette '%s' is non-ASCII but has no declared encoding", 
+        if (enc == "non-ASCII")
+            stop(gettextf("Vignette '%s' is non-ASCII but has no declared encoding",
                  file), domain = NA, call. = FALSE)
-        
+
         output <- tryCatch({
             ## FIXME: run this in a separate process
             engine$weave(file, quiet = quiet, encoding = enc)
@@ -556,7 +556,7 @@
         if(yy > 0) stop("running 'make' failed")
         ## See if Makefile has a clean: target, and if so run it.
         if(clean &&
-           any(grepl("^clean:", readLines("Makefile", warn = FALSE))))
+	   any(startsWith(readLines("Makefile", warn = FALSE), "clean:")))
             system(paste(make, "clean"))
     } else {
         ## Badly-written vignettes open a pdf() device on Rplots.pdf and
@@ -596,7 +596,7 @@
 buildVignette <-
     function(file, dir = ".", weave = TRUE, latex = TRUE, tangle = TRUE,
              quiet = TRUE, clean = TRUE, keep = character(),
-             engine = NULL, buildPkg = NULL, 
+             engine = NULL, buildPkg = NULL,
 	     encoding = getVignetteEncoding(file), ...)
 {
     if (!file_test("-f", file))
@@ -626,7 +626,7 @@
 		file, paste(engine$package, engine$name, sep="::")),
 		domain = NA)
 
-    if (encoding == "non-ASCII") 
+    if (encoding == "non-ASCII")
     	stop(gettextf("Vignette '%s' is non-ASCII but has no declared encoding", name))
 
     # Set output directory temporarily
@@ -703,7 +703,7 @@
 
     if(is.na(res)) {
         poss <- grep("^[[:space:]]*%+[[:space:]]*\\\\SweaveUTF8[[:space:]]*$", lines, useBytes = TRUE)
-        if (length(poss)) 
+        if (length(poss))
             res <- "UTF-8"
         else {
             ## Look for input enc lines using inputenc or inputenx
@@ -714,7 +714,7 @@
             ## Check it is in the preamble
             start <- grep("^[[:space:]]*\\\\begin\\{document\\}",
                           lines, useBytes = TRUE)
-            if(length(start)) 
+            if(length(start))
                 poss <- poss[poss < start[1L]]
             if(length(poss)) {
         	poss <- lines[poss[1L]]
@@ -745,7 +745,7 @@
             } else { # Nothing else has indicated an encoding, maybe it's just ASCII
                 asc <- iconv(lines, "latin1", "ASCII")
                 ind <- is.na(asc) | asc != lines
-                if(any(ind)) 
+                if(any(ind))
                     res <- "non-ASCII"
                 else
                     res <- "" # or "ASCII"
@@ -762,7 +762,7 @@
 {
     ## <FIXME>
     ## Why don't we anchor this to the beginning of a line?
-    meta_RE <- paste0("[[:space:]]*%+[[:space:]]*\\\\Vignette", 
+    meta_RE <- paste0("[[:space:]]*%+[[:space:]]*\\\\Vignette",
                       tag, "\\{([^}]*(\\{[^}]*\\})*[^}]*)\\}.*")
     ## </FIXME>
     meta <- grep(meta_RE, lines, value = TRUE, useBytes = TRUE)
@@ -802,9 +802,8 @@
          keywords = keywords, engine = engine)
 }
 
-## The below builds vignette indices via 'pkgVignettes' objects.
-.build_vignette_index <-
-function(vigns)
+## builds vignette indices from 'vigns', a pkgVignettes() result
+.build_vignette_index <- function(vigns)
 {
     stopifnot(inherits(vigns, "pkgVignettes"))
 
@@ -849,11 +848,7 @@
     ## by 'R CMD build' (via 'R CMD INSTALL -l <lib>)
     ## which in case vignettes have not been built.
     outputs <- vigns$outputs
-    if (!is.null(outputs)) {
-        outputs <- basename(outputs)
-    } else {
-        outputs <- character(nvigns)
-    }
+    outputs <- if(!is.null(outputs)) basename(outputs) else character(nvigns)
 
     out <- data.frame(File = unlist(contents[, "File"]),
                       Title = unlist(contents[, "Title"]),
@@ -946,8 +941,8 @@
 }
 
 vignetteDepends <-
-function(vignette, recursive = TRUE, reduce = TRUE,
-         local = TRUE, lib.loc = NULL)
+    function(vignette, recursive = TRUE, reduce = TRUE,
+             local = TRUE, lib.loc = NULL)
 {
     if (length(vignette) != 1L)
         stop("argument 'vignette' must be of length 1")
@@ -959,8 +954,7 @@
 
     depMtrx <- getVigDepMtrx(vigDeps)
     instPkgs <- utils::installed.packages(lib.loc=lib.loc)
-    getDepList(depMtrx, instPkgs, recursive, local, reduce,
-               lib.loc)
+    getDepList(depMtrx, instPkgs, recursive, local, reduce)
 }
 
 getVigDepMtrx <-
@@ -1019,7 +1013,7 @@
     file <- vigns$docs[i]
     file <- basename(file)
     name <- vigns$names[i]
-    engine <- vignetteEngine(vigns$engine[i])
+    engine <- vignetteEngine(vigns$engines[i])
 
     output <- tryCatch({
         engine$tangle(file, quiet = TRUE, encoding = encoding)
diff -Nru r-base-3.2.3/src/library/tools/R/xgettext.R r-base-3.3.1/src/library/tools/R/xgettext.R
--- r-base-3.2.3/src/library/tools/R/xgettext.R	2015-08-25 22:16:54.000000000 +0000
+++ r-base-3.3.1/src/library/tools/R/xgettext.R	2016-04-14 22:15:37.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/tools/R/xgettext.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -212,17 +212,17 @@
     while (i < length(lines)) {
 	i <- i + 1L
 
-	if (grepl("^#,", lines[i], useBytes = TRUE)) {
+	if (startsWith(lines[i], "#,")) { # useBytes=TRUE (speedup ?)
 	    noCformat <- noCformat || grepl("no-c-format", lines[i], useBytes = TRUE)
 	    fuzzy <- fuzzy || grepl("fuzzy", lines[i], useBytes = TRUE)
-	} else if (grepl("^#:", lines[i], useBytes = TRUE)) {
+	} else if (startsWith(lines[i], "#:")) {
 	    if (!is.na(ref))
 		ref <- paste(ref, "etc.")
 	    else
 		ref <- sub("^#:[[:blank:]]*", "", lines[i])
-	} else if (grepl("^msgid ", lines[i], useBytes = TRUE)) {
+	} else if (startsWith(lines[i], "msgid ")) {
 	    s1 <- sub('^msgid[[:blank:]]+["](.*)["][[:blank:]]*$', "\\1", lines[i])
-	    while (grepl('^["]', lines[i+1L], useBytes = TRUE)) {
+	    while (startsWith(lines[i+1L], '"')) {
 		i <- i + 1L
 		s1 <- paste0(s1, sub('^["](.*)["][[:blank:]]*$', "\\1", lines[i]))
 	    }
@@ -246,7 +246,7 @@
 
 		s2 <- sub( paste0("^", statement, "[[:blank:]]+[\"](.*)[\"][[:blank:]]*$"),
 		                 "\\1", lines[j])
-		while (grepl('^["]', lines[j+1L], useBytes = TRUE)) {
+		while (!is.na(lines[j+1L]) && startsWith(lines[j+1L], '"')) {
 		    j <- j+1L
 		    s2 <- paste0(s2, sub('^["](.*)["][[:blank:]]*$', "\\1", lines[j]))
 		}
@@ -320,7 +320,7 @@
                         full.names = TRUE, recursive = TRUE)
     result <- matrix(character(), ncol = 5L, nrow = 0L)
     for (f in files) {
-	errs <- checkPoFile(f, strictPlural = grepl("^R-", basename(f)))
+	errs <- checkPoFile(f, strictPlural = startsWith(basename(f), "R-"))
 	if (nrow(errs)) result <- rbind(result, errs)
     }
     structure(result, class = "check_po_files")
diff -Nru r-base-3.2.3/src/library/tools/src/gramLatex.c r-base-3.3.1/src/library/tools/src/gramLatex.c
--- r-base-3.2.3/src/library/tools/src/gramLatex.c	2015-12-09 23:20:01.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/gramLatex.c	2016-06-20 22:19:26.000000000 +0000
@@ -67,7 +67,7 @@
 /*
  *  R : A Computer Langage for Statistical Data Analysis
  *  Copyright (C) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2013  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *  Copyright (C) 2010 Duncan Murdoch
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -2478,7 +2478,7 @@
     	snprintf(ParseErrorMsg, PARSE_ERROR_SIZE,"%s", s);
     }
     filename = findVar(install("filename"), parseState.SrcFile);
-    if (isString(filename) && length(filename))
+    if (isString(filename) && LENGTH(filename))
     	strncpy(ParseErrorFilename, CHAR(STRING_ELT(filename, 0)), PARSE_ERROR_SIZE - 1);
     else
         ParseErrorFilename[0] = '\0';
diff -Nru r-base-3.2.3/src/library/tools/src/gramLatex.y r-base-3.3.1/src/library/tools/src/gramLatex.y
--- r-base-3.2.3/src/library/tools/src/gramLatex.y	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/gramLatex.y	2016-03-16 23:03:30.000000000 +0000
@@ -3,7 +3,7 @@
 /*
  *  R : A Computer Langage for Statistical Data Analysis
  *  Copyright (C) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2013  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *  Copyright (C) 2010 Duncan Murdoch
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -669,7 +669,7 @@
     	snprintf(ParseErrorMsg, PARSE_ERROR_SIZE,"%s", s);
     }
     filename = findVar(install("filename"), parseState.SrcFile);
-    if (isString(filename) && length(filename))
+    if (isString(filename) && LENGTH(filename))
     	strncpy(ParseErrorFilename, CHAR(STRING_ELT(filename, 0)), PARSE_ERROR_SIZE - 1);
     else
         ParseErrorFilename[0] = '\0';
diff -Nru r-base-3.2.3/src/library/tools/src/gramRd.c r-base-3.3.1/src/library/tools/src/gramRd.c
--- r-base-3.2.3/src/library/tools/src/gramRd.c	2015-12-09 23:20:01.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/gramRd.c	2016-06-20 22:19:26.000000000 +0000
@@ -3199,7 +3199,7 @@
 	SET_STRING_ELT(ans, i+1, STRING_ELT(CADR(CADR(nextarg)), 0));
     }	
     UNPROTECT_PTR(args);
-    UNPROTECT_PTR(macro);    
+
     /* Now push the expanded macro onto the input stream, in reverse order */
     xxungetc(END_MACRO);
     start = CHAR(STRING_ELT(ans, 0));
@@ -3218,6 +3218,8 @@
     SEXP s_Rd_tag = install("Rd_tag");
     setAttrib(ans, s_Rd_tag, mkString("USERMACRO"));
     setAttrib(ans, R_SrcrefSymbol, makeSrcref(lloc, SrcFile));
+    setAttrib(ans, install("macro"), macro);
+    UNPROTECT_PTR(macro);
 #if DEBUGVALS
     Rprintf(" result: %p\n", ans);
 #endif
@@ -3903,7 +3905,7 @@
     	snprintf(ParseErrorMsg, PARSE_ERROR_SIZE, "%s", s);
     }
     filename = findVar(install("filename"), SrcFile);
-    if (isString(filename) && length(filename))
+    if (isString(filename) && LENGTH(filename))
     	strncpy(ParseErrorFilename, CHAR(STRING_ELT(filename, 0)), PARSE_ERROR_SIZE - 1);
     else
         ParseErrorFilename[0] = '\0';
@@ -4465,11 +4467,11 @@
     char *outbuf, *out, lookahead;
     Rboolean escape;
 
-    if(!isString(e) || length(e) != 1) 
+    if(!isString(e) || LENGTH(e) != 1) 
     	error(_("'deparseRd' only supports deparsing character elements"));
     e = STRING_ELT(e, 0);
     
-    if(!isInteger(state) || length(state) != 5) error(_("bad state"));
+    if(!isInteger(state) || LENGTH(state) != 5) error(_("bad state"));
     
     PushState();
     
diff -Nru r-base-3.2.3/src/library/tools/src/gramRd.y r-base-3.3.1/src/library/tools/src/gramRd.y
--- r-base-3.2.3/src/library/tools/src/gramRd.y	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/gramRd.y	2016-04-18 22:15:07.000000000 +0000
@@ -594,7 +594,7 @@
 	SET_STRING_ELT(ans, i+1, STRING_ELT(CADR(CADR(nextarg)), 0));
     }	
     UNPROTECT_PTR(args);
-    UNPROTECT_PTR(macro);    
+
     /* Now push the expanded macro onto the input stream, in reverse order */
     xxungetc(END_MACRO);
     start = CHAR(STRING_ELT(ans, 0));
@@ -613,6 +613,8 @@
     SEXP s_Rd_tag = install("Rd_tag");
     setAttrib(ans, s_Rd_tag, mkString("USERMACRO"));
     setAttrib(ans, R_SrcrefSymbol, makeSrcref(lloc, SrcFile));
+    setAttrib(ans, install("macro"), macro);
+    UNPROTECT_PTR(macro);
 #if DEBUGVALS
     Rprintf(" result: %p\n", ans);
 #endif
@@ -1298,7 +1300,7 @@
     	snprintf(ParseErrorMsg, PARSE_ERROR_SIZE, "%s", s);
     }
     filename = findVar(install("filename"), SrcFile);
-    if (isString(filename) && length(filename))
+    if (isString(filename) && LENGTH(filename))
     	strncpy(ParseErrorFilename, CHAR(STRING_ELT(filename, 0)), PARSE_ERROR_SIZE - 1);
     else
         ParseErrorFilename[0] = '\0';
@@ -1860,11 +1862,11 @@
     char *outbuf, *out, lookahead;
     Rboolean escape;
 
-    if(!isString(e) || length(e) != 1) 
+    if(!isString(e) || LENGTH(e) != 1) 
     	error(_("'deparseRd' only supports deparsing character elements"));
     e = STRING_ELT(e, 0);
     
-    if(!isInteger(state) || length(state) != 5) error(_("bad state"));
+    if(!isInteger(state) || LENGTH(state) != 5) error(_("bad state"));
     
     PushState();
     
diff -Nru r-base-3.2.3/src/library/tools/src/init.c r-base-3.3.1/src/library/tools/src/init.c
--- r-base-3.2.3/src/library/tools/src/init.c	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/init.c	2016-03-16 23:03:30.000000000 +0000
@@ -17,7 +17,6 @@
  *  https://www.R-project.org/Licenses/
  */
 
-#include <R.h>
 #include "tools.h"
 #include <R_ext/Rdynload.h>
 
diff -Nru r-base-3.2.3/src/library/tools/src/install.c r-base-3.3.1/src/library/tools/src/install.c
--- r-base-3.2.3/src/library/tools/src/install.c	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/install.c	2016-03-16 23:03:30.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998--2013 The R Core Team
+ *  Copyright (C) 1998--2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@
 /* This is a .Call so manages R_alloc stack */
 SEXP dirchmod(SEXP dr, SEXP gwsxp)
 {
-    if(!isString(dr) || length(dr) != 1)
+    if(!isString(dr) || LENGTH(dr) != 1)
 	error(_("invalid '%s' argument"), "dir");
     chmod_one(translateChar(STRING_ELT(dr, 0)), asLogical(gwsxp));
 
@@ -127,12 +127,11 @@
 SEXP codeFilesAppend(SEXP f1, SEXP f2)
 {
     int n, n1, n2;
-    n1 = length(f1);
-    n2 = length(f2);
-    if (!isString(f1) || n1 != 1)
+    if (!isString(f1) || (n1 = LENGTH(f1)) != 1)
 	error(_("invalid '%s' argument"), "file1");
     if (!isString(f2))
 	error(_("invalid '%s' argument"), "file2");
+    n2 = LENGTH(f2);
     if (n2 < 1) return allocVector(LGLSXP, 0);
     n = (n1 > n2) ? n1 : n2; // will be n2.
     SEXP ans = PROTECT(allocVector(LGLSXP, n));
diff -Nru r-base-3.2.3/src/library/tools/src/Rmd5.c r-base-3.3.1/src/library/tools/src/Rmd5.c
--- r-base-3.2.3/src/library/tools/src/Rmd5.c	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/Rmd5.c	2016-03-16 23:03:30.000000000 +0000
@@ -19,7 +19,6 @@
 
 /* <UTF8> OK since this is intended to treat chars as byte streams */
 
-#include <R.h>
 #include "tools.h"
 #define ROL_UNUSED
 #include "md5.h"
diff -Nru r-base-3.2.3/src/library/tools/src/signals.c r-base-3.3.1/src/library/tools/src/signals.c
--- r-base-3.2.3/src/library/tools/src/signals.c	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/signals.c	2016-03-16 23:03:30.000000000 +0000
@@ -21,7 +21,6 @@
 #include <config.h>
 #endif
 
-#include <R.h>
 #include "tools.h"
 #include <signal.h> // C99
 
diff -Nru r-base-3.2.3/src/library/tools/src/text.c r-base-3.3.1/src/library/tools/src/text.c
--- r-base-3.2.3/src/library/tools/src/text.c	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/text.c	2016-03-16 23:03:30.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2003-2015   The R Core Team.
+ *  Copyright (C) 2003-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
    match length is in now in chars.
 */
 
+#include <string.h>
 #include <R.h>
 #include "tools.h"
 
@@ -120,7 +121,8 @@
 		if(used == 0) break;
 		s += used;
 	    } else
-		s++; pos++;
+		s++; 
+	    pos++;
 	}
 	if(end > -1) {
 	    INTEGER(ans)[i] = start + 1; /* index from one */
diff -Nru r-base-3.2.3/src/library/tools/src/tools.h r-base-3.3.1/src/library/tools/src/tools.h
--- r-base-3.2.3/src/library/tools/src/tools.h	2015-08-25 22:16:55.000000000 +0000
+++ r-base-3.3.1/src/library/tools/src/tools.h	2016-03-16 23:03:30.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2003-2015   The R Core Team.
+ *  Copyright (C) 2003-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #ifndef R_TOOLS_H
 #define R_TOOLS_H
 
+#include <R.h>
 #include <Rinternals.h>
 #ifdef ENABLE_NLS
 #include <libintl.h>
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/da/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/da/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-stats4.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-stats4.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/de/LC_MESSAGES/utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/de/LC_MESSAGES/utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en_GB/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en_GB/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en_GB/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en_GB/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-stats4.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-stats4.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/en@quot/LC_MESSAGES/utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/en@quot/LC_MESSAGES/utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/es/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/es/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/es/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/es/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/es/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/es/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fa/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fa/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fa/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fa/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fa/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fa/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fa/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fa/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/fr/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/fr/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/it/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/it/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-stats4.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-stats4.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ja/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ja/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ko/LC_MESSAGES/utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ko/LC_MESSAGES/utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/nn/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/nn/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/nn/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/nn/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/nn/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/nn/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/nn/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/nn/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pl/LC_MESSAGES/utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pl/LC_MESSAGES/utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/pt_BR/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/pt_BR/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/ru/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/ru/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/tr/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/tr/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/grDevices.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/grDevices.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/grid.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/grid.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/parallel.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/parallel.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-base.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-base.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-compiler.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-compiler.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-methods.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-methods.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/R-utils.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/R-utils.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/splines.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/splines.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/stats.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/stats.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/tcltk.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/tcltk.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_CN/LC_MESSAGES/tools.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_CN/LC_MESSAGES/tools.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_TW/LC_MESSAGES/graphics.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_TW/LC_MESSAGES/graphics.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_TW/LC_MESSAGES/RGui.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_TW/LC_MESSAGES/RGui.mo differ
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/translations/inst/zh_TW/LC_MESSAGES/R.mo and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/translations/inst/zh_TW/LC_MESSAGES/R.mo differ
diff -Nru r-base-3.2.3/src/library/utils/DESCRIPTION.in r-base-3.3.1/src/library/utils/DESCRIPTION.in
--- r-base-3.2.3/src/library/utils/DESCRIPTION.in	2015-08-31 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/utils/DESCRIPTION.in	2016-03-16 23:03:22.000000000 +0000
@@ -6,4 +6,4 @@
 Maintainer: R Core Team <R-core@r-project.org>
 Description: R utility functions.
 License: Part of R @VERSION@
-Suggests: methods
+Suggests: methods, XML
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/utils/inst/doc/Sweave.pdf and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/utils/inst/doc/Sweave.pdf differ
diff -Nru r-base-3.2.3/src/library/utils/Makefile.in r-base-3.3.1/src/library/utils/Makefile.in
--- r-base-3.2.3/src/library/utils/Makefile.in	2013-03-05 23:02:27.000000000 +0000
+++ r-base-3.3.1/src/library/utils/Makefile.in	2016-03-16 23:03:21.000000000 +0000
@@ -29,6 +29,7 @@
 	@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
 	@$(MAKE) mkR1 mkdesc instdirs iconvlist
 	@$(MAKE) mksrc
+	@$(MAKE) sysdata
 @BYTE_COMPILE_PACKAGES_FALSE@	@$(MAKE) mklazy
 @BYTE_COMPILE_PACKAGES_TRUE@	@$(MAKE) mklazycomp
 
diff -Nru r-base-3.2.3/src/library/utils/Makefile.win r-base-3.3.1/src/library/utils/Makefile.win
--- r-base-3.2.3/src/library/utils/Makefile.win	2013-03-05 23:02:27.000000000 +0000
+++ r-base-3.3.1/src/library/utils/Makefile.win	2016-03-16 23:03:22.000000000 +0000
@@ -22,6 +22,7 @@
 	@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
 	@$(MAKE) -f Makefile.win mkR1 mkdesc instdirs
 	@$(MAKE) -f Makefile.win mksrc-win2
+	@$(MAKE) -f Makefile.win sysdata
 	@$(MAKE) -f Makefile.win mklazycomp
 
 include $(top_srcdir)/share/make/basepkg.mk
diff -Nru r-base-3.2.3/src/library/utils/man/aspell.Rd r-base-3.3.1/src/library/utils/man/aspell.Rd
--- r-base-3.2.3/src/library/utils/man/aspell.Rd	2015-08-25 22:16:48.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/aspell.Rd	2016-03-16 23:03:24.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/aspell.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{aspell}
@@ -97,12 +97,12 @@
   \link{aspell-utils} for utilities for spell checking packages.
 
   Package \pkg{Aspell} on Omegahat
-  (\url{http://www.omegahat.org/Aspell}) for a fine-grained R interface
+  (\url{http://www.omegahat.net/Aspell}) for a fine-grained R interface
   to the Aspell library.
 }
 \examples{
 \dontrun{
-## To check all Rd files in a directory, (additonally) skipping the
+## To check all Rd files in a directory, (additionally) skipping the
 ## \references sections.
 files <- Sys.glob("*.Rd")
 aspell(files, filter = list("Rd", drop = "\\\\references"))
diff -Nru r-base-3.2.3/src/library/utils/man/available.packages.Rd r-base-3.3.1/src/library/utils/man/available.packages.Rd
--- r-base-3.2.3/src/library/utils/man/available.packages.Rd	2015-08-25 22:16:50.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/available.packages.Rd	2016-03-16 23:03:25.000000000 +0000
@@ -13,11 +13,9 @@
   from a local mirror).
 }
 \usage{
-available.packages(contriburl =
-                   contrib.url(getOption("repos"), type),
-                   method, fields = NULL,
-                   type = getOption("pkgType"),
-                   filters = NULL)
+available.packages(contriburl = contrib.url(repos, type), method,
+                   fields = NULL, type = getOption("pkgType"),
+                   filters = NULL, repos = getOption("repos"))
 }
 \arguments{
   \item{contriburl}{
@@ -43,6 +41,9 @@
   \item{filters}{
     a character vector or list or \code{NULL} (default). See \sQuote{Details}.
   }
+  \item{repos}{
+    character vector, the base URL(s) of the repositories to use.
+  }
 }
 \details{
   The list of packages is either copied from a local mirror (specified by a
diff -Nru r-base-3.2.3/src/library/utils/man/chooseBioCmirror.Rd r-base-3.3.1/src/library/utils/man/chooseBioCmirror.Rd
--- r-base-3.2.3/src/library/utils/man/chooseBioCmirror.Rd	2015-09-04 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/chooseBioCmirror.Rd	2016-03-16 23:03:25.000000000 +0000
@@ -22,6 +22,7 @@
     text \code{\link{menu}}.}
   
   \item{ind}{Optional numeric value giving which entry to select.}
+
   \item{useHTTPS}{Whether to prefer HTTPS mirrors (see
     \code{\link{chooseCRANmirror}}).}
   
@@ -32,7 +33,7 @@
   This sets the \link{option} \code{"BioC_mirror"}: it is used
   before a call to \code{\link{setRepositories}}.  The out-of-the-box
   default for that option is \code{NULL}, which currently corresponds to
-  the mirror \url{http://bioconductor.org}.
+  the mirror \url{https://bioconductor.org}.
 
   The \sQuote{Bioconductor (World-wide)} \sQuote{mirror} is a network of
   mirrors providing reliable world-wide access; other mirrors may
@@ -42,12 +43,6 @@
   \file{\var{\link{R_HOME}}/doc/BioC_mirrors.csv},
   by number.
 }
-\note{
-  The online list of mirrors is always accessed using HTTPS.  If your 
-  build of R does not support HTTPS, R uses the local copy
-  in \file{\var{\link{R_HOME}}/doc/BioC_mirrors.csv}.  It can be 
-  updated from \url{https://bioconductor.org/BioC_mirrors.csv}.
-}
 \value{
   None: this function is invoked for its
   side effect of updating \code{options("BioC_mirror")}.
diff -Nru r-base-3.2.3/src/library/utils/man/chooseCRANmirror.Rd r-base-3.3.1/src/library/utils/man/chooseCRANmirror.Rd
--- r-base-3.2.3/src/library/utils/man/chooseCRANmirror.Rd	2015-08-26 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/chooseCRANmirror.Rd	2016-03-16 23:03:24.000000000 +0000
@@ -51,12 +51,6 @@
   is best used with \code{local.only = TRUE} and row numbers in
    \file{\var{\link{R_HOME}}/doc/CRAN_mirrors.csv}.
 }
-\note{
-  The online list of mirrors is always accessed using HTTPS.  If your 
-  build of R does not support HTTPS, R uses the local copy
-  in \file{\var{\link{R_HOME}}/doc/CRAN_mirrors.csv}.  It can be
-  updated from \url{https://cran.r-project.org/CRAN_mirrors.csv}.
-}
 \value{
   None for \code{chooseCRANmirror()}, this function is invoked for its
   side effect of updating \code{options("repos")}.
diff -Nru r-base-3.2.3/src/library/utils/man/close.socket.Rd r-base-3.3.1/src/library/utils/man/close.socket.Rd
--- r-base-3.2.3/src/library/utils/man/close.socket.Rd	2015-08-25 22:16:42.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/close.socket.Rd	2016-03-16 23:03:22.000000000 +0000
@@ -22,9 +22,9 @@
 }
 \author{Thomas Lumley}
 \seealso{
-  \code{\link{make.socket}}, \code{\link{read.socket}}.
+  \code{\link{make.socket}}, \code{\link{read.socket}}
 
-  Compiling in support for sockets is optional: see
+  Compiling in support for sockets was optional prior to \R 3.3.0: see
   \code{\link{capabilities}("sockets")} to see if it is available.
 }
 
diff -Nru r-base-3.2.3/src/library/utils/man/data.Rd r-base-3.3.1/src/library/utils/man/data.Rd
--- r-base-3.2.3/src/library/utils/man/data.Rd	2015-08-25 22:16:43.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/data.Rd	2016-03-16 23:03:22.000000000 +0000
@@ -46,11 +46,12 @@
     \code{\link{load}()}ed.
 
     \item files ending \file{.tab}, \file{.txt} or \file{.TXT} are read
-    using \code{\link{read.table}(\dots, header = TRUE)}, and hence
+    using \code{\link{read.table}(\dots, header = TRUE, as.is=FALSE)},
+    and hence
     result in a data frame.
 
     \item files ending \file{.csv} or \file{.CSV} are read using
-    \code{\link{read.table}(\dots, header = TRUE, sep = ";")},
+    \code{\link{read.table}(\dots, header = TRUE, sep = ";", as.is=FALSE)},
     and also result in a data frame.
   }
   If more than one matching file name is found, the first on this list
diff -Nru r-base-3.2.3/src/library/utils/man/download.file.Rd r-base-3.3.1/src/library/utils/man/download.file.Rd
--- r-base-3.2.3/src/library/utils/man/download.file.Rd	2015-08-28 22:15:13.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/download.file.Rd	2016-05-17 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/download.file.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{download.file}
@@ -56,31 +56,37 @@
   \samp{http://}, \samp{https://}, \samp{ftp://} or \samp{file://}.
 
 #ifdef unix
-  If \code{method = "auto"} is chosen (the default), method
-  \code{"libcurl"} is chosen for \samp{https://} and \samp{ftps://} URLs
-  provided \code{\link{capabilities}("libcurl")} is true, and the
-  internal method is chosen for \samp{file://} URLs and for the others
-  provided \code{\link{capabilities}("http/ftp")} is true (which it
-  almost always is).
+  If \code{method = "auto"} is chosen (the default), on a Unix-alike
+  method \code{"libcurl"} is chosen for \samp{https://} and
+  \samp{ftps://} URLs and the \code{"internal"} method is chosen for
+  other schemes.
 #endif
 #ifdef windows
-  If \code{method = "auto"} is chosen (the default), the
-  \code{"wininet"} method is used on Windows (unless
-  \code{setInternet2(FALSE)} was used).
+  If \code{method = "auto"} is chosen (the default), on Windows the
+  \code{"wininet"} method is used apart from for \samp{ftps://} URLs
+  where \code{"libcurl"} is tried.  The \code{"wininet"} method uses the
+  WinINet functions (part of the OS).
 #endif
 % https://msdn.microsoft.com/en-us/library/windows/desktop/aa383630%28v=vs.85%29.aspx
   
-  Support for method \code{"libcurl"} is optional: use
+#ifdef unix
+  Method \code{"libcurl"} uses the library of that name
+  (\url{http://curl.haxx.se/libcurl/}).
+  It provides
+#endif
+#ifdef windows
+  Support for method \code{"libcurl"} is optional on Windows: use
   \code{\link{capabilities}("libcurl")} to see if it is supported on
-  your build.  (It uses an external library of that name
-  (\url{http://curl.haxx.se/libcurl/}) against which \R can be compiled.)
-  It will usually provide (non-blocking) access to
-  \samp{https://} and \samp{ftps://} URLs.  There is support for
-  simultaneous downloads, so \code{url} and \code{destfile} can be
-  character vectors of the same length greater than one.  For a single
-  URL and \code{quiet = FALSE} a progress bar is shown in interactive
-  use.
-  
+  your build.  It uses an external library of that name
+  (\url{http://curl.haxx.se/libcurl/}) against which \R can be compiled.
+  If supported it will provide
+#endif
+  (non-blocking) access to \samp{https://} and (usually) \samp{ftps://}
+  URLs.  There is support for simultaneous downloads, so \code{url} and
+  \code{destfile} can be character vectors of the same length greater
+  than one.  For a single URL and \code{quiet = FALSE} a progress
+  bar is shown in interactive use.
+
   For methods \code{"wget"} and \code{"curl"} a system call is made to
   the tool given by \code{method}, and the respective program must be
   installed on your system and be in the search path for executables.
@@ -93,20 +99,14 @@
   \code{\link{available.packages}}.
 
   The \code{"libcurl"} and \code{"wget"} methods follow \samp{http://}
-  and \samp{https://} redirections: the \code{"internal"} does not.
+  and \samp{https://} redirections: the \code{"internal"} method does not.
   (For method \code{"curl"} use argument \code{extra = "-L"}. To disable
   redirection in \command{wget}, use \code{extra = "--max-redirect=0"}.)
-
-  Note that \samp{https://} URLs are
-#ifdef unix
-  not supported by the internal method.
-#endif
-#ifdef windows
-  supported by default.  (Prior to \R 3.2.2, this required that
-  option \option{--internet2} or environment variable
-  \env{R_WIN_INTERNET2} was set or \code{\link{setInternet2}(TRUE)} was
-  used.  That option and environment variable are now ignored.)  
-#endif
+  (The \code{"wininet"} method supports some redirections but not all.)
+  
+  Note that \samp{https://} URLs are not supported by the
+  \code{"internal"} method but are supported by the \code{"libcurl"}
+  method and the \code{"wininet"} method on Windows.
 
   See \code{\link{url}} for how \samp{file://} URLs are interpreted,
   especially on Windows.  The \code{"internal"} and \code{"wininet"}
@@ -120,7 +120,7 @@
 
   The remaining details apply to the \code{"internal"}, \code{"wininet"}
   and \code{"libcurl"} methods only.
-  
+
   The timeout for many parts of the transfer can be set by the option
   \code{timeout} which defaults to 60 seconds.
 
@@ -137,10 +137,10 @@
   A progress bar tracks the transfer.  If the file length is known, the
   full width of the bar is the known length.  Otherwise the initial
   width represents 100 Kbytes and is doubled whenever the current width
-  is exceeded.  (In non-interactive use this uses a text version. If the
+  is exceeded.  (In non-interactive use this uses a text version.  If the
   file length is known, an equals sign represents 2\% of the transfer
   completed: otherwise a dot represents 10Kb.)
-  
+
 
   If \code{mode} is not supplied and \code{url} ends in one of
   \code{.gz}, \code{.bz2}, \code{.xz}, \code{.tgz}, \code{.zip},
@@ -148,12 +148,6 @@
   (unlike Unix-alikes) does distinguish between text and binary files,
   care is needed that other binary file types are transferred with
   \code{mode = "wb"}.
-
-  There is a Windows-only method \code{"wininet"}.  (This selected for
-  \code{method = "internal"} unless \code{\link{setInternet2}(FALSE)} is
-  called.)  Then the \sQuote{Internet Options} of the system are used to
-  choose proxies and so on; these are set in the Control Panel and are
-  those used for Internet Explorer.
 #endif
 #ifdef unix
   A progress bar tracks the transfer.  If the file length is known, an
@@ -167,11 +161,10 @@
 \note{
    Files of more than 2GB are supported on 64-bit builds of \R; they
   may be truncated on some 32-bit builds.
-  
-  Method \code{"wget"} is mainly for historical compatibility, but it
-  and \code{"curl"} can be used for URLs (e.g., \samp{https://} URLs or
-  those that use cookies or redirection) which the internal method does
-  not support and where the \code{"libcurl"} method is not available.
+
+  Methods \code{"wget"} and \code{"curl"} are mainly for historical
+  compatibility but provide may provide capabilities not supported by
+  the \code{"libcurl"} or \code{"wininet"} methods.
 
   Method \code{"wget"} can be used with proxy firewalls which require
   user/password authentication if proper values are stored in the
@@ -190,7 +183,7 @@
   Options} of the system are used to choose proxies and so on; these are
   set in the Control Panel and are those used for Internet Explorer.
 #endif
-  
+
   The next two paragraphs apply to the internal code only.
 
   Proxies can be specified via environment variables.
@@ -202,7 +195,7 @@
   and \env{ftp_proxy_password}.  The form of \env{http_proxy}
   should be \code{http://proxy.dom.com/} or
   \code{http://proxy.dom.com:8080/} where the port defaults to
-  \code{80} and the trailing slash may be omitted. For
+  \code{80} and the trailing slash may be omitted.  For
   \env{ftp_proxy} use the form \code{ftp://proxy.dom.com:3128/}
   where the default port is \code{21}.  These environment variables
   must be set before the download code is first used: they cannot be
diff -Nru r-base-3.2.3/src/library/utils/man/getS3method.Rd r-base-3.3.1/src/library/utils/man/getS3method.Rd
--- r-base-3.2.3/src/library/utils/man/getS3method.Rd	2015-08-25 22:16:49.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/getS3method.Rd	2016-03-16 23:03:25.000000000 +0000
@@ -1,23 +1,25 @@
 % File src/library/utils/man/getS3method.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2012 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{getS3method}
 \alias{getS3method}
-\title{Get An S3 Method}
+\title{Get an S3 Method}
 \description{
   Get a method for an S3 generic, possibly from a namespace or the
   generic's registry.
 }
 \usage{
-getS3method(f, class, optional = FALSE)
+getS3method(f, class, optional = FALSE, envir = parent.frame())
 }
 \arguments{
   \item{f}{character: name of the generic.}
   \item{class}{character: name of the class.}
   \item{optional}{logical: should failure to find the generic or a
     method be allowed?}
+  \item{envir}{the \code{\link{environment}} in which the method and its
+    generic are searched first.}
 }
 \details{
   S3 methods may be hidden in namespaces, and will not
@@ -45,4 +47,4 @@
 getS3method("predict", "ppr")
 }
 \keyword{data}
-
+\keyword{methods}
diff -Nru r-base-3.2.3/src/library/utils/man/isS3method.Rd r-base-3.3.1/src/library/utils/man/isS3method.Rd
--- r-base-3.2.3/src/library/utils/man/isS3method.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/isS3method.Rd	2016-03-16 23:03:24.000000000 +0000
@@ -0,0 +1,52 @@
+% File src/library/utils/man/isS3method.Rd
+% Part of the R package, https://www.R-project.org
+% Copyright 1995-2015 R Core Team
+% Distributed under GPL 2 or later
+
+\name{isS3method}
+\alias{isS3method}
+\title{Is 'method' the Name of an S3 Method?}
+\description{
+  Checks if \code{method} is the name of a valid / registered S3
+  method.  Alternatively, when \code{f} and \code{class} are specified,
+  it is checked if \code{f} is the name of an S3 generic function and
+  \code{paste(f, class, sep=".")} is a valid S3 method.
+}
+\usage{
+isS3method(method, f, class, envir = parent.frame())
+}
+\arguments{
+  \item{method}{a character string, typically of the form
+    \code{"<fn>.<class>"}.  If omitted, \code{f} and \code{class} have
+    to be specified instead.}
+  \item{f}{optional character string, typically specifying an S3 generic
+    function.  Used, when \code{method} is not specified.}
+  \item{class}{optional character string, typically specifying an S3
+    class name.  Used, when \code{method} is not specified.}
+  \item{envir}{the \code{\link{environment}} in which the method and its
+    generic are searched first, as in \code{\link{getS3method}()}.}
+}
+%% \details{
+%% }
+\value{
+  \code{\link{logical}} \code{TRUE} or \code{FALSE}
+}
+\seealso{
+  \code{\link{methods}}, \code{\link{getS3method}}.
+}
+\examples{
+isS3method("t")           # FALSE - it is an S3 generic
+isS3method("t.default")   # TRUE
+isS3method("t.ts")        # TRUE
+isS3method("t.test")      # FALSE
+isS3method("t.data.frame")# TRUE
+isS3method("t.lm")        # FALSE - not existing
+isS3method("t.foo.bar")   # FALSE - not existing
+\dontshow{
+stopifnot(
+  !isS3method("t"), !isS3method("t.test"), !isS3method("qr.coef"), !isS3method("sort.list"),
+  isS3method("t.default"), isS3method("t.ts"), isS3method("t.data.frame"),
+  !isS3method("t.lm"), !isS3method("t.foo.bar"))
+}
+}
+\keyword{methods}
diff -Nru r-base-3.2.3/src/library/utils/man/make.socket.Rd r-base-3.3.1/src/library/utils/man/make.socket.Rd
--- r-base-3.2.3/src/library/utils/man/make.socket.Rd	2015-08-25 22:16:50.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/make.socket.Rd	2016-03-16 23:03:25.000000000 +0000
@@ -43,7 +43,7 @@
 \seealso{
   \code{\link{close.socket}}, \code{\link{read.socket}}.
 
-  Compiling in support for sockets is optional: see
+  Compiling in support for sockets was optional prior to \R 3.3.0: see
   \code{\link{capabilities}("sockets")} to see if it is available.
 }
 
diff -Nru r-base-3.2.3/src/library/utils/man/methods.Rd r-base-3.3.1/src/library/utils/man/methods.Rd
--- r-base-3.2.3/src/library/utils/man/methods.Rd	2015-08-25 22:16:43.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/methods.Rd	2016-03-16 23:03:22.000000000 +0000
@@ -15,6 +15,8 @@
 \usage{
 methods(generic.function, class)
 .S3methods(generic.function, class, envir=parent.frame())
+
+\S3method{print}{MethodsFunction}(x, byclass = attr(x, "byclass"), \dots)
 }
 \arguments{
   \item{generic.function}{a generic function, or a character string naming a
@@ -24,19 +26,26 @@
   \item{envir}{the environment in which to look for the definition of
     the generic function, when the generic function is passed as a
     character string.}
+  \item{x}{typically the result of \code{methods(..)}, an \R object of % S3
+    class \code{"MethodsFunction"}, see \sQuote{Value} below.}
+  \item{byclass}{an optional \code{\link{logical}} allowing to override
+    the \code{"byclass"} attribute determining how the result is
+    printed, see \sQuote{Details}.}
+  \item{\dots}{potentially further arguments passed to and from methods;
+    unused currently.}
 }
 
 \details{
-
   \code{methods()} finds S3 and S4 methods associated with either the
   \code{generic.function} or \code{class} argument.  Methods are found in
   all packages on the current \code{search()} path.  \code{.S3methods()}
   finds only S3 methods, \code{.S4methods()} finds only only S4 methods.
 
   When invoked with the \code{generic.function} argument, the
-  \code{print} method displays the signatures (full names) of S3 and S4
-  methods.  S3 methods are printed by pasting the generic function and
-  class together, separated by a \sQuote{.}, as
+  \code{"byclass"} attribute (see Details) is \code{FALSE}, and the
+  \code{print} method by default displays the signatures (full names) of
+  S3 and S4 methods.  S3 methods are printed by pasting the generic
+  function and class together, separated by a \sQuote{.}, as
   \code{generic.class}.  The S3 method name is followed by an asterisk
   \code{*} if the method definition is not exported from the package
   namespace in which the method is defined.  S4 method signatures are
@@ -44,9 +53,9 @@
   dispatch, so there may be several classes in the signature
   \code{generic,A,B-method}.
 
-  When invoked with the \code{class} argument, the \code{print} method
-  displays the names of the generic functions associated with the class,
-  \code{generic}.
+  When invoked with the \code{class} argument, \code{"byclass"} is
+  \code{TRUE}, and the \code{print} method by default displays the names
+  of the generic functions associated with the class, \code{generic}.
 
   The source code for all functions is available.  For S3 functions
   exported from the namespace, enter the method at the command line as
@@ -62,24 +71,21 @@
   The S3 functions listed are those which \emph{are named like methods}
   and may not actually be methods (known exceptions are discarded in the
   code).
-
 }
 
 \value{
-
   An object of class \code{"MethodsFunction"}, a character vector of
   method names with \code{"byclass"} and \code{"info"} attributes.  The
-  \code{"byclass"} attribute is a logical(1) vector with value
-  \code{TRUE} when the results were obtained with argument \code{class}
-  defined.  The \code{"info"} attribute is a data frame with
-  columns:
+  \code{"byclass"} attribute is a \code{\link{logical}} indicating if
+  the results were obtained with argument \code{class}
+  defined.  The \code{"info"} attribute is a data frame with columns:
   \describe{
-    \item{generic}{character(), the name of the generic.}
-    \item{visible}{logical(), is the column exported from the namespace
+    \item{generic}{\code{\link{character}} vector of the names of the generic.}
+    \item{visible}{logical(), is the method exported from the namespace
       of the package in which it is defined?}
     \item{isS4}{logical(), true when the method is an S4 method.}
-    \item{from}{factor(), the location or package name where the method
-      was found.}
+    \item{from}{a \code{\link{factor}}, the location or package name
+      where the method was found.}
   }
 }
 
@@ -105,6 +111,8 @@
 
 methods(summary)
 methods(class = "aov")    # S3 class
+## The same, with more details and more difficult to read:
+print(methods(class = "aov"), byclass=FALSE)
 methods("[[")             # uses C-internal dispatching
 methods("$")
 methods("$<-")            # replacement function
diff -Nru r-base-3.2.3/src/library/utils/man/news.Rd r-base-3.3.1/src/library/utils/man/news.Rd
--- r-base-3.2.3/src/library/utils/man/news.Rd	2015-10-01 22:15:14.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/news.Rd	2016-03-16 23:03:24.000000000 +0000
@@ -1,17 +1,21 @@
 % File src/library/utils/man/news.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2015 R Core Team
 % Distributed under GPL 2 or later
 
 \name{news}
-\alias{news}
 \title{Build and Query R or Package News Information}
+\alias{news}
+\alias{print.news_db}
 \description{
-  Build and query the news for R or add-on packages.
+  Build and query the news data base for \R or add-on packages.
 }
 \usage{
 news(query, package = "R", lib.loc = NULL, format = NULL,
      reader = NULL, db = NULL)
+
+\S3method{print}{news_db}(x, doBrowse = interactive(),
+      browser = getOption("browser"), \dots)
 }
 \arguments{
   \item{query}{an expression for selecting news entries}
@@ -22,10 +26,18 @@
     libraries currently known.}
   \item{format}{Not yet used.}
   \item{reader}{Not yet used.}
-  \item{db}{a news db obtained from \code{news()}.}
+  \item{db, x}{a news db obtained from \code{news()}.}
+
+  \item{doBrowse}{logical specifying that the news should be opened in
+    the browser (by \code{\link{browseURL}}, accessible as via
+    \code{\link{help.start}}) instead of printed to the console.}
+  \item{browser}{the browser to be used, see \code{\link{browseURL}}.}
+  \item{\dots}{potentially further arguments passed to \code{print()}.}
 }
 \value{
-  An data frame inheriting from class \code{"news_db"}.
+  A data frame inheriting from class \code{"news_db"}, with
+  \code{\link{attributes}} \code{"package"} (and \code{"subset"} if the
+    \code{query} lead to proper subsetting).
 }
 \details{
   If \code{package} is \code{"R"} (default), a news db is built with the
@@ -101,7 +113,8 @@
 ## Build a db of all R news entries.
 db <- news()
 \dontshow{
-  vv <- capture.output(db)  # without an error
+  vv <- capture.output(print(db, doBrowse=FALSE))  # without an error
+  stopifnot(is.character(vv), length(vv) >= 3) # was wrong (for weeks during devel.)
 }
 ## Bug fixes with PR number in 3.0.1.
 db3 <- news(Version == "3.0.1" & grepl("^BUG", Category) & grepl("PR#", Text),
@@ -111,6 +124,7 @@
 ## News from a date range ('Matrix' is there in a regular R installation):
 if(length(iM <- find.package("Matrix", quiet=TRUE)) && nzchar(iM)) {
    dM <- news(package="Matrix")
+   stopifnot(identical(dM, news(db=dM)))
    dM2014 <- news("2014-01-01" <= Date & Date <= "2014-12-31", db = dM)
    stopifnot(paste0("1.1-", 2:4) \%in\% dM2014[,"Version"])
 }
diff -Nru r-base-3.2.3/src/library/utils/man/object.size.Rd r-base-3.3.1/src/library/utils/man/object.size.Rd
--- r-base-3.2.3/src/library/utils/man/object.size.Rd	2015-08-25 22:16:49.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/object.size.Rd	2016-03-16 23:03:25.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/object.size.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2014 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{object.size}
@@ -18,14 +18,17 @@
 \method{print}{object_size}(x, quote = FALSE, units = "b", \dots)
 }
 \arguments{
-  \item{x}{An \R object.}
+  \item{x}{an \R object.}
   \item{quote}{logical, indicating whether or not the result should be
     printed with surrounding quotes.}
-  \item{units}{The units to be used in printing the size.  Allowed
-    values are \code{"b"}, \code{"Kb"}, \code{"Mb"}, \code{"Gb"},
-    \code{"B"}, \code{"KB"}, \code{"MB"}, \code{"GB"}, and \code{"auto"}
-    (see \sQuote{Details}).  Can be abbreviated.} 
-  \item{\dots}{Arguments to be passed to or from other methods.}
+  \item{units}{the units to be used in printing the size.  Allowed
+    values are
+    \code{"b"}, \code{"Kb"}, \code{"Mb"}, \code{"Gb"}, \code{"Tb"}, \code{"Pb"},
+    \code{"B"}, \code{"KB"}, \code{"MB"}, \code{"GB"}, \code{"TB"}, \code{"PB"},
+    \code{"KiB"}, \code{"MiB"}, \code{"GiB"}, \code{"TiB"},
+    \code{"PiB"}, \code{"EiB"}, \code{"ZiB"}, \code{"YiB"},
+    and \code{"auto"} (see \sQuote{Details}).  Can be abbreviated.}
+  \item{\dots}{arguments to be passed to or from other methods.}
 }
 \details{
   Exactly which parts of the memory allocation should be attributed to
@@ -50,6 +53,12 @@
   chooses the largest units in which the result is one or more (before
   rounding).  Values in kilobytes, megabytes or gigabytes are rounded to
   the nearest \code{0.1}.
+
+  The IEC standard for \emph{binary} byte size units uses notation \code{KiB},
+  etc.  Note that our uses of \code{Kb}, \code{Mb}, etc, also mean
+  multiples of \code{1024} (and not of \code{1000}) and hence the numbers
+  for \code{Kb}, \code{KB}, and \code{KiB} are all the same - contrary
+  to SI standard but according to widespread tradition.
 }
 \value{
   An object of class \code{"object_size"} with a length-one double value,
@@ -63,6 +72,14 @@
 object.size(letters)
 object.size(ls)
 format(object.size(library), units = "auto")
+
+sl <- object.size(rep(letters, 1000))
+(fsl <- sapply(c("Kb", "KB", "KiB"),
+               function(u) format(sl, units = u)))
+stopifnot(identical( ## assert that all three are the same :
+             unique(substr(as.vector(fsl), 1,5)),
+             format(round(as.vector(sl)/1024, 1))))
+
 ## find the 10 largest objects in the base package
 z <- sapply(ls("package:base"), function(x)
             object.size(get(x, envir = baseenv())))
diff -Nru r-base-3.2.3/src/library/utils/man/read.table.Rd r-base-3.3.1/src/library/utils/man/read.table.Rd
--- r-base-3.2.3/src/library/utils/man/read.table.Rd	2015-10-19 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/read.table.Rd	2016-03-16 23:03:24.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/read.table.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2015 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{read.table}
@@ -120,12 +120,13 @@
   \item{na.strings}{a character vector of strings which are to be
     interpreted as \code{\link{NA}} values.  Blank fields are also
     considered to be missing values in logical, integer, numeric and
-    complex fields.}
+    complex fields.  Note that the test happens \emph{after} 
+    white space is stripped from the input, so \code{na.strings} 
+    values may need their own white space stripped in advance.}
 
   \item{colClasses}{character.  A vector of classes to be assumed for
-    the columns.  Recycled as necessary.  If named and shorter than
-    required, names are matched to the column names with unspecified
-    values are taken to be \code{NA}.
+    the columns.  If unnamed, recycled as necessary.  If named, names
+    are matched with unspecified values being taken to be \code{NA}.
 
     Possible values are \code{NA} (the default, when
     \code{\link{type.convert}} is used), \code{"NULL"} (when the column
diff -Nru r-base-3.2.3/src/library/utils/man/roman.Rd r-base-3.3.1/src/library/utils/man/roman.Rd
--- r-base-3.2.3/src/library/utils/man/roman.Rd	2015-08-25 22:16:49.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/roman.Rd	2016-04-18 22:15:05.000000000 +0000
@@ -1,28 +1,32 @@
 % File src/library/utils/man/roman.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{roman}
-\alias{as.roman}
 \title{Roman Numerals}
+\alias{as.roman}
+\alias{.romans}
 \description{
-  Manipulate integers as roman numerals.
+  Simple manipulation of (a small set of) integer numbers as roman numerals.
 }
 \usage{
 as.roman(x)
+.romans
 }
 \arguments{
-  \item{x}{a numeric vector, or a character vector of arabic or roman
-    numerals.}
+  \item{x}{a numeric or character vector of arabic or roman numerals.}
 }
 \details{
   \code{as.roman} creates objects of class \code{"roman"} which are
   internally represented as integers, and have suitable methods for
-  printing, formatting, subsetting, and coercion to \code{character}.
+  printing, formatting, subsetting, coercion, etc, see
+  \code{\link{methods}(class = "roman")}.
 
   Only numbers between 1 and 3899 have a unique representation as roman
   numbers.
+
+  \code{.romans} is the basic dictionary, a named \code{\link{character}} vector.
 }
 \references{
   Wikipedia contributors (2006). Roman numerals.
@@ -37,7 +41,21 @@
 y[3]
 ## Current year as a roman number.
 (y <- as.roman(format(Sys.Date(), "\%Y")))
-## 10 years ago ...
-y - 10
+## Today, and  10, 20, 30, and 100 years ago ...
+y - 10*c(0:3,10)
+\dontshow{stopifnot(identical(as.character(as.roman("2016") - 10*c(0:3,10)),
+             c("MMXVI", "MMVI", "MCMXCVI", "MCMLXXXVI", "MCMXVI"))) }
+## mixture of arabic and roman numbers :
+as.roman(c(NA, 1:3, "", strrep("I", 1:6))) # + NA with a warning for "IIIIII"
+cc <- c(NA, 1:3, strrep("I", 0:5))
+(rc <- as.roman(cc)) # two NAs: 0 is not "roman"
+(ic <- as.integer(rc)) # works automitcally [without an explicit method]
+## simple consistency checks -- arithmetic when result is in  {1,2,..,3899} :
+stopifnot(identical(rc, as.roman(rc)), # as.roman(.) is "idempotent"
+          identical(rc + rc + (3*rc), rc*5),
+          identical(ic, c(NA, 1:3, NA, 1:5)),
+          identical(as.integer(5*rc), 5L*ic),
+          identical(as.numeric(rc), as.numeric(ic)),
+          identical(as.list(rc), as.list(ic)))
 }
 \keyword{arith}
diff -Nru r-base-3.2.3/src/library/utils/man/setRepositories.Rd r-base-3.3.1/src/library/utils/man/setRepositories.Rd
--- r-base-3.2.3/src/library/utils/man/setRepositories.Rd	2015-08-25 22:16:50.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/setRepositories.Rd	2016-03-16 23:03:25.000000000 +0000
@@ -35,7 +35,7 @@
   A Bioconductor mirror can be selected by setting
   \code{\link{options}("BioC_mirror")}, e.g.\sspace{}via
   \code{\link{chooseBioCmirror}} --- the default value is
-  \samp{"http://bioconductor.org"}.
+  \samp{"https://bioconductor.org"}.
 
   The items that are preselected are those that are currently in
   \code{options("repos")} plus those marked as default in the
@@ -54,11 +54,6 @@
 
   This function requires the \R session to be interactive unless
   \code{ind} is supplied.
-
-  Some of the entries have \code{https} versions which use
-  \samp{https://} for access, so if selected need an \R build which
-  supports this.  (Choosing the \code{https} version provides some
-  guarantees on the identity of the site.)
 }
 \note{
   This does \strong{not} set the list of repositories at startup: to do
diff -Nru r-base-3.2.3/src/library/utils/man/summaryRprof.Rd r-base-3.3.1/src/library/utils/man/summaryRprof.Rd
--- r-base-3.2.3/src/library/utils/man/summaryRprof.Rd	2015-08-25 22:16:49.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/summaryRprof.Rd	2016-03-02 23:02:04.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/summaryRprof.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{summaryRprof}
@@ -128,7 +128,7 @@
 
   \code{\link{Rprofmem}} is a non-sampling memory-use profiler.
 
-  \url{http://developer.r-project.org/memory-profiling.html}
+  \url{https://developer.r-project.org/memory-profiling.html}
 }
 \examples{
 \dontrun{
diff -Nru r-base-3.2.3/src/library/utils/man/SweaveUtils.Rd r-base-3.3.1/src/library/utils/man/SweaveUtils.Rd
--- r-base-3.2.3/src/library/utils/man/SweaveUtils.Rd	2015-08-25 22:16:48.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/SweaveUtils.Rd	2016-05-17 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 % File src/library/utils/man/SweaveUtils.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2007 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{SweaveUtils}
@@ -16,8 +16,9 @@
 \alias{makeRweaveLatexCodeRunner}
 \title{Sweave Driver Utilities}
 \description{
-  These functions are handy for writing Sweave drivers and currently not
-  documented. Look at the source code of the Sweave Latex driver (in this
+  These functions are handy for writing Sweave drivers and are
+  considered internal and hence not documented.  Look at the source code
+  of the Sweave Latex driver (in this
   package) or the HTML driver (in the R2HTML package from CRAN) to see
   how they can be used.
 }
diff -Nru r-base-3.2.3/src/library/utils/man/url.show.Rd r-base-3.3.1/src/library/utils/man/url.show.Rd
--- r-base-3.2.3/src/library/utils/man/url.show.Rd	2015-08-25 22:16:40.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/url.show.Rd	2016-05-09 22:15:08.000000000 +0000
@@ -30,7 +30,7 @@
   \code{\link{url}}, \code{\link{file.show}}, \code{\link{download.file}}
 }
 \examples{
-\dontrun{url.show("http://lib.stat.cmu.edu/datasets/csb/ch3a.txt")}
+\dontrun{url.show("http://www.stats.ox.ac.uk/pub/datasets/csb/ch3a.txt")}
 }
 \keyword{file}
 \keyword{misc}
diff -Nru r-base-3.2.3/src/library/utils/man/vignette.Rd r-base-3.3.1/src/library/utils/man/vignette.Rd
--- r-base-3.2.3/src/library/utils/man/vignette.Rd	2015-11-03 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/vignette.Rd	2016-03-16 23:03:22.000000000 +0000
@@ -1,22 +1,26 @@
 % File src/library/utils/man/vignette.Rd
 % Part of the R package, https://www.R-project.org
-% Copyright 1995-2013 R Core Team
+% Copyright 1995-2016 R Core Team
 % Distributed under GPL 2 or later
 
 \name{vignette}
+\title{View, List or Get R Source of Package Vignettes}
 \alias{vignette}
 \alias{edit.vignette}
 \alias{print.vignette}
 \alias{vignettes} % to link to from e.g. grid-package.Rd
-\title{View or List Package Vignettes}
+%% \alias{getRcode}
+%% \alias{getRcode.vignette}%hidden
 \description{
-  View a specified package vignette, or list the available ones.
+  View a specified package vignette, or list the available ones;
+  display it rendered in a viewer, and get or edit its \R source file.
 }
 \usage{
 vignette(topic, package = NULL, lib.loc = NULL, all = TRUE)
 
 \S3method{print}{vignette}(x, \dots)
 \S3method{edit}{vignette}(name, \dots)
+%% \S3method{getRcode}{vignette}(x, strict=TRUE, \dots)
 }
 \arguments{
   \item{topic}{a character string giving the (base) name of the vignette
@@ -31,8 +35,8 @@
   \item{all}{logical; if \code{TRUE} search all available packages in
     the library trees specified by \code{lib.loc}, and if \code{FALSE},
     search only attached packages.}
-  \item{x, name}{Object of class \code{vignette}.}
-  \item{\ldots}{Ignored by the \code{print} method, passed on to
+  \item{x, name}{object of class \code{vignette}.}
+  \item{\dots}{ignored by the \code{print} method, passed on to
     \code{\link{file.edit}} by the \code{edit} method.}
 }
 \details{
@@ -49,11 +53,12 @@
   corresponding information is returned in an object of class
   \code{"packageIQR"}.
 
-  The \code{edit} method copies the \R code extracted from the vignette
-  to a temporary file and opens the file in an editor (see
-  \code{\link{edit}}). This makes it very easy to execute the commands
-  line by line, modify them in any way you want to help you test
-  variants, etc.  
+  %% \code{getRcode(x)} gets the (full path) file name of the \R code
+  %% extracted from the vignette, and the \code{edit} method that  \R code
+  %% to a temporary file and opens the file in an editor (see
+  %% \code{\link{edit}}). This makes it very easy to execute the commands
+  %% line by line, modify them in any way you want to help you test
+  %% variants, etc.
 }
 \seealso{
   \code{\link{browseVignettes}} for an HTML-based vignette browser;
@@ -67,26 +72,26 @@
 ## List vignettes from all *installed* packages (can take a long time!):
 vignette(all = TRUE)
 
-\dontrun{
-## Open the grid intro vignette
-vignette("grid")
-
-## The same
-v1 <- vignette("grid")
-print(v1)
-
-## Now let us have a closer look at the code
-edit(v1)
-
-## An alternative way of extracting the code,
-## R file is written to current working directory
-Stangle(v1$file)
-
+## The grid intro vignette -- open it
+\dontrun{vignette("grid") # calling print()}
+## The same (conditional on existence of the vignettte).
+## Note that 'package = *' is much faster in the case of many installed packages:
+if(!is.null(v1 <- vignette("grid", package="grid"))) {
+\dontrun{v1 # calling print(.)}
+  str(v1)
+  ## Now let us have a closer look at the code
+  %% print(utils:::getRcode(v1)) # the R file name
+  %% if(interactive()) # "display" it
+  %%   file.show(utils:::getRcode(v1))
+  %% ## or even more interactively:
+\dontrun{edit(v1) # e.g., to send lines ...}
+}# if( has vignette "installed")
 ## A package can have more than one vignette (package grid has several):
 vignette(package = "grid")
-vignette("rotated")
-## The same, but without searching for it:
-vignette("rotated", package = "grid")
+if(interactive()) {
+   ## vignette("rotated")
+   ## The same, but without searching for it:
+   vignette("rotated", package = "grid")
 }
 }
 \keyword{documentation}
diff -Nru r-base-3.2.3/src/library/utils/man/windows/setInternet2.Rd r-base-3.3.1/src/library/utils/man/windows/setInternet2.Rd
--- r-base-3.2.3/src/library/utils/man/windows/setInternet2.Rd	2015-08-25 22:16:40.000000000 +0000
+++ r-base-3.3.1/src/library/utils/man/windows/setInternet2.Rd	2016-03-16 23:03:22.000000000 +0000
@@ -4,21 +4,17 @@
 % Distributed under GPL 2 or later
 
 \name{setInternet2}
-\Rdversion{1.1}
 \alias{setInternet2}
-\alias{R_WIN_INTERNET2}
 
 \title{
 Set or disable the use of Windows internal functions for Internet access.
 }
 \description{
-  By default R will make use
-  of the Windows functions underlying Internet Explorer (the \code{"wininet"}
-  functions).  This allows
-  specification of proxies, etc., in the \dQuote{Internet Options}
-  applet in \dQuote{Control Panel}.  This will allow the use of
-  \samp{https://} URLs and follow HTTP redirections.  This function
-  allows substitution of lower level access methods via \code{setInternet2(FALSE)}.
+  This used to control whether \code{method = "internal"} mapped to
+  \code{method = "wininet"} in functions \code{\link{download.file}} and
+  \code{\link{url}}.
+
+  As from \R 3.3.0 it changes nothing, and only \code{use = NA} is accepted.
 }
 
 \usage{
@@ -29,30 +25,10 @@
     \code{NA}, just return the current setting.}
 }
 \value{
-  The previous setting is returned, invisibly if \code{use} is not \code{NA}.
-}
-\note{
-  This is only available on Windows.
-
-  Prior to \R 3.2.0 \code{setInternet2(TRUE)} loaded a new DLL:
-  nowadays both versions of the functions are contained in 
-  \file{internet.dll}.
-  
-  Prior to \R 3.2.2, the default was \code{setInternet2(FALSE)},
-  unless command line option \option{--internet2} was used or
-  environment variable \env{R_WIN_INTERNET2} was set. (The option and
-  environment variable are now ignored.)  With this setting the 
-  \code{"internal"} method of \code{\link{download.file}} and 
-  \code{\link{url}} uses internal functions for \samp{http://} access, and 
-  \samp{https://} URLs are not supported.  The current default
-  is equivalent to setting the method to \code{"wininet"}.
+  For backwards compatibility, \code{TRUE}.
 }
 \author{
-Duncan Murdoch
-}
-\seealso{
-  \code{\link{download.file}}, \code{\link{url}}: the method can be
-  selected for each \code{url} connection via its \code{method} argument.
+  Duncan Murdoch
 }
 \examples{
 setInternet2(NA)
diff -Nru r-base-3.2.3/src/library/utils/NAMESPACE r-base-3.3.1/src/library/utils/NAMESPACE
--- r-base-3.2.3/src/library/utils/NAMESPACE	2015-03-18 23:03:09.000000000 +0000
+++ r-base-3.3.1/src/library/utils/NAMESPACE	2016-03-24 23:15:12.000000000 +0000
@@ -1,7 +1,8 @@
 # Refer to all C routines by their name prefixed by C_
 useDynLib(utils, .registration = TRUE, .fixes = "C_")
 
-export("?", .DollarNames, .S3methods, CRAN.packages, Rprof, Rprofmem, RShowDoc,
+export("?", .DollarNames, .S3methods, .romans,
+       CRAN.packages, Rprof, Rprofmem, RShowDoc,
        RSiteSearch, URLdecode, URLencode, View, adist, alarm, apropos,
        aregexec, argsAnywhere, assignInMyNamespace, assignInNamespace,
        as.roman, as.person, as.personList, as.relistable, aspell,
@@ -18,10 +19,10 @@
        file_test, file.edit, fileSnapshot, find, fix, fixInNamespace, findLineNum,
        flush.console, formatOL, formatUL, getAnywhere, getCRANmirrors,
        getFromNamespace, getParseData, getParseText, getS3method,
-       getSrcDirectory, getSrcFilename, getSrcLocation, getSrcref,
+       getSrcDirectory, getSrcFilename, getSrcLocation, getSrcref, # getRcode,
        glob2rx, globalVariables, head, head.matrix, help,
        help.request, help.search, help.start, history,
-       install.packages, installed.packages, is.relistable,
+       install.packages, installed.packages, is.relistable, isS3method,
        limitedLabels, loadhistory, localeToCharset, ls.str, lsf.str,
        maintainer, make.packages.html, make.socket, memory.limit,
        memory.size, menu, methods, mirror2html, modifyList,
@@ -47,6 +48,7 @@
 
 S3method("[", getAnywhere)
 S3method("[", roman)
+S3method(Ops, roman)
 S3method(as.character, person)
 S3method(as.character, roman)
 S3method(as.person, default)
@@ -61,6 +63,7 @@
 S3method(format, "news_db")
 S3method(format, "object_size")
 S3method(format, "roman")
+S3method(getRcode, vignette)
 S3method(head, data.frame)
 S3method(head, default)
 S3method(head, "function")
@@ -97,6 +100,7 @@
 S3method(relist, factor)
 S3method(relist, list)
 S3method(relist, matrix)
+S3method(rep, roman)
 S3method(stack, data.frame)
 S3method(stack, default)
 S3method(str, POSIXt)
@@ -118,7 +122,7 @@
 S3method(unstack, default)
 S3method(upgrade, packageStatus)
 ## can't register update.packageStatus as update is in stats
-## and would create a cycle.
+## and would create a cycle, i.e., can NOT use anything from stats
 
 export("bibentry")
 S3method("$", "bibentry")
diff -Nru r-base-3.2.3/src/library/utils/po/de.po r-base-3.3.1/src/library/utils/po/de.po
--- r-base-3.2.3/src/library/utils/po/de.po	2015-06-06 22:15:30.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/de.po	2016-04-27 22:15:24.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-20 23:11+0100\n"
+"POT-Creation-Date: 2015-06-06 13:52+0100\n"
+"PO-Revision-Date: 2016-04-21 09:14+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R Core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -30,7 +30,7 @@
 
 #: io.c:347 io.c:831
 msgid "invalid quote symbol set"
-msgstr "ungültiges Symbol für Quotatinen gesetzt"
+msgstr "ungültiges quote Symbol gesetzt"
 
 #: io.c:359 io.c:854 io.c:1056
 msgid "cannot open the connection"
@@ -43,16 +43,16 @@
 #: io.c:413 io.c:431
 #, c-format
 msgid "quoted string on line %d terminated by EOF"
-msgstr "quotierte Zeichenkette in Zeile %d mit EOF beendet"
+msgstr "Zeichenkette in Anführungszeichen in Zeile %d mit EOF beendet"
 
 #: io.c:565
 msgid "the first argument must be of mode character"
-msgstr "das erste Argument muss vom Mode character sein"
+msgstr "das erste Argument muss vom Modus character sein"
 
 #: io.c:595
 #, c-format
 msgid "invalid 'numerals' string: \"%s\""
-msgstr "unzulässiger 'numerals' Zeichenkette \"%s\""
+msgstr "unzulässige 'numerals' Zeichenkette \"%s\""
 
 #: io.c:771
 #, c-format
@@ -70,7 +70,7 @@
 #: io.c:937 io.c:940
 #, c-format
 msgid "incomplete final line found by readTableHeader on '%s'"
-msgstr "unvollstädige letzte Zeile von readTableHeader in '%s' gefunden"
+msgstr "unvollständige letzte Zeile von readTableHeader in '%s' gefunden"
 
 #: io.c:997
 msgid "index out of range"
@@ -91,7 +91,7 @@
 #: io.c:1108
 #, c-format
 msgid "corrupt data frame -- length of column %d does not not match nrows"
-msgstr "korrupter Datafram -- Länge der Spalte %d entspricht nicht nrows"
+msgstr "beschädigterter Dataframe -- Länge der Spalte %d entspricht nicht nrows"
 
 #: io.c:1139
 #, c-format
@@ -100,7 +100,7 @@
 
 #: io.c:1157
 msgid "corrupt matrix -- dims not not match length"
-msgstr "korrupte Matrix -- Dimensionen entsprechen nicht der Länge"
+msgstr "beschädigte Matrix -- Dimensionen entsprechen nicht der Länge"
 
 #: stubs.c:56
 msgid "'savehistory' can only be used in Rgui and Rterm"
@@ -129,7 +129,7 @@
 
 #: utils.c:83
 msgid "'hostname' must be a character vector of length 1"
-msgstr "'hostname' muss ein Zeihenkettenetor der Länge 1 sein"
+msgstr "'hostname' muss ein Zeichenkettenvektor der Länge 1 sein"
 
 #: utils.c:89
 #, c-format
@@ -170,7 +170,7 @@
 
 #: windows/dialogs.c:318
 msgid "menu does not exist"
-msgstr "Menü exisitiert nicht"
+msgstr "Menü existiert nicht"
 
 #: windows/dialogs.c:325
 #, c-format
@@ -222,10 +222,11 @@
 msgid "'%s' must be a list"
 msgstr "'%s' muss eine Liste sein"
 
+# +
 #: windows/util.c:561
 #, c-format
 msgid "'%s' element %d is not a window handle"
-msgstr "'%s' Element %d ist keine Fensterhandle"
+msgstr "'%s' Element %d ist keine Fenster-Handle"
 
 #: windows/widgets.c:108
 msgid "Select one or more"
@@ -237,7 +238,7 @@
 
 #: windows/widgets.c:182 windows/widgets.c:247
 msgid "'default' must be a character string"
-msgstr "'default' muss Zeichenkette sein"
+msgstr "'default' muss eine Zeichenkette sein"
 
 #: windows/widgets.c:184 windows/widgets.c:249
 msgid "'default' is overlong"
@@ -245,7 +246,7 @@
 
 #: windows/widgets.c:188 windows/widgets.c:253
 msgid "'caption' must be a character string"
-msgstr "'caption' muss Zeichenkette sein"
+msgstr "'caption' muss eine Zeichenkette sein"
 
 #: windows/widgets.c:190
 msgid "'multi' must be a logical value"
diff -Nru r-base-3.2.3/src/library/utils/po/ko.po r-base-3.3.1/src/library/utils/po/ko.po
--- r-base-3.2.3/src/library/utils/po/ko.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/ko.po	2016-04-27 22:15:24.000000000 +0000
@@ -1,114 +1,114 @@
 # Korean translation for R utils package
-# src/library/utils/po/ko.po
+# ./utils/po/ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R utils package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
-# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS 
+# Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: io.c:324 io.c:328 io.c:338 io.c:569 io.c:769 io.c:822 io.c:834 io.c:838
-#: io.c:844 io.c:845 io.c:1068 io.c:1069 io.c:1071 io.c:1072 io.c:1073
-#: io.c:1074 io.c:1075 io.c:1076 stubs.c:47 stubs.c:67 windows/dialogs.c:169
+#: io.c:329 io.c:333 io.c:343 io.c:574 io.c:774 io.c:827 io.c:839 io.c:843
+#: io.c:849 io.c:850 io.c:1073 io.c:1074 io.c:1076 io.c:1077 io.c:1078
+#: io.c:1079 io.c:1080 io.c:1081 stubs.c:47 stubs.c:67 windows/dialogs.c:169
 #: windows/dialogs.c:194 windows/dialogs.c:197 windows/dialogs.c:241
 #: windows/dialogs.c:278 windows/dialogs.c:289 windows/dialogs.c:313
-#: windows/dialogs.c:321 windows/util.c:111 windows/widgets.c:78
+#: windows/dialogs.c:321 windows/util.c:117 windows/widgets.c:78
 #: windows/widgets.c:81 windows/widgets.c:86
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "�� '%s'� 값� 올바르지 않습니다."
 
-#: io.c:347 io.c:831
+#: io.c:352 io.c:836
 msgid "invalid quote symbol set"
 msgstr "올바르지 않� �용부호셋(quote symbol set)입니다."
 
-#: io.c:359 io.c:854 io.c:1056
+#: io.c:364 io.c:859 io.c:1061
 msgid "cannot open the connection"
 msgstr "커넥션(connection)� 열 수 없습니다"
 
-#: io.c:362 io.c:366
+#: io.c:367 io.c:371
 msgid "cannot read from this connection"
 msgstr "� 커넥션(connection)으로부터 �� 수 없습니다"
 
-#: io.c:413 io.c:431
+#: io.c:418 io.c:436
 #, c-format
 msgid "quoted string on line %d terminated by EOF"
 msgstr ""
 
-#: io.c:565
+#: io.c:570
 msgid "the first argument must be of mode character"
 msgstr "첫번째 ��는 반드시 문�형�어야 합니다."
 
-#: io.c:595
+#: io.c:600
 #, c-format
 msgid "invalid 'numerals' string: \"%s\""
 msgstr ""
 
-#: io.c:771
+#: io.c:776
 #, c-format
 msgid "Selection: "
 msgstr "선�: "
 
-#: io.c:863 io.c:877
+#: io.c:868 io.c:882
 msgid "cannot allocate buffer in 'readTableHead'"
 msgstr "'readTableHead' 내�서 버�를 할당할 수 없습니다"
 
-#: io.c:888
+#: io.c:893
 msgid "\\ followed by EOF"
 msgstr "\\ 가 EOF 뒤� 놓였습니다"
 
-#: io.c:937 io.c:940
+#: io.c:942 io.c:945
 #, c-format
 msgid "incomplete final line found by readTableHeader on '%s'"
-msgstr ""
-"'%s'�서 readTableHeader� �하여 발견� 완성�지 않� 마지막 ��입니다"
+msgstr "'%s'�서 readTableHeader� �하여 발견� 완성�지 않� 마지막 ��입니다"
 
-#: io.c:997
+#: io.c:1002
 msgid "index out of range"
 msgstr "범위밖� ��스입니다"
 
-#: io.c:1049
+#: io.c:1054
 msgid "'file' is not a connection"
 msgstr "'file'� 커넥션(connection)� 아닙니다."
 
-#: io.c:1052
+#: io.c:1057
 msgid "cannot write to this connection"
 msgstr "� 커넥션(connection)� 쓰기를 할 수 없습니다."
 
-#: io.c:1082
+#: io.c:1087
 msgid "'dec' must be a single character"
 msgstr "'dec'는 반드시 한개� 문��어야 합니다"
 
-#: io.c:1108
+#: io.c:1113
 #, c-format
 msgid "corrupt data frame -- length of column %d does not not match nrows"
-msgstr ""
-"��터 프레임� ���었습니다 -- 열� 길� %d가 행� 개수와 �치하지 않습니"
-"다"
+msgstr "��터 프레임� ���었습니다 -- 열� 길� %d가 행� 개수와 �치하지 않습니다"
 
-#: io.c:1139
+#: io.c:1144
 #, c-format
 msgid "column %s claims to be a factor but does not have numeric codes"
 msgstr ""
 
-#: io.c:1157
+#: io.c:1162
 msgid "corrupt matrix -- dims not not match length"
 msgstr "올바른 행렬� 아닙니다 -- dims 가 길�가 �치하지 않습니다"
 
@@ -137,20 +137,20 @@
 msgid "invalid '%s' specification"
 msgstr "유효하지 않� '%s' 지정입니다"
 
-#: utils.c:83
+#: utils.c:85
 msgid "'hostname' must be a character vector of length 1"
 msgstr "'hostname'� 반드시 길�가 1� 문�형 벡터�어야 합니다"
 
-#: utils.c:89
+#: utils.c:91
 #, c-format
 msgid "nsl() was unable to resolve host '%s'"
 msgstr ""
 
-#: utils.c:96
+#: utils.c:98
 msgid "unknown format returned by 'gethostbyname'"
 msgstr "알수없는 형�� 'gethostbyname'� �해서 반환�었습니다"
 
-#: utils.c:105
+#: utils.c:107
 msgid "nsl() is not supported on this platform"
 msgstr "� 플랫��서는 nsl()를 사용할 수 없습니다."
 
@@ -198,41 +198,41 @@
 msgid "Registry key '%ls' not found"
 msgstr "레지스트리 키 '%ls'를 찾� 수 없습니다"
 
-#: windows/util.c:41
+#: windows/util.c:42
 msgid "unsupported version of Windows"
 msgstr "지��지 않는 버전� 윈�우즈입니다"
 
-#: windows/util.c:275
+#: windows/util.c:281
 msgid "argument must be a character vector or a raw vector"
 msgstr "��는 반드시 문�형 벡터 �는  raw 벡터�어야 합니다"
 
-#: windows/util.c:312
+#: windows/util.c:318
 msgid "unable to open the clipboard"
 msgstr "�립보드를 열 수 없습니다."
 
-#: windows/util.c:317
+#: windows/util.c:323
 msgid "unable to write to the clipboard"
 msgstr "�립보드� 쓸 수 없습니다."
 
-#: windows/util.c:396
+#: windows/util.c:402
 msgid "'title' must be a character string"
 msgstr "'title'� 반드시 문�열�어야 합니다"
 
-#: windows/util.c:405
+#: windows/util.c:411
 msgid "'text' must be a character string"
 msgstr "'text'는 반드시 문�열�어야 합니다"
 
-#: windows/util.c:444
+#: windows/util.c:450
 #, c-format
 msgid "'%s' must be length 1"
 msgstr "'%s'는 반드시 길�가 1�어야 합니다"
 
-#: windows/util.c:557
+#: windows/util.c:563
 #, c-format
 msgid "'%s' must be a list"
 msgstr "'%s'� 반드시 리스트(list)�어야 합니다"
 
-#: windows/util.c:561
+#: windows/util.c:567
 #, c-format
 msgid "'%s' element %d is not a window handle"
 msgstr "'%s'� 구성요소 %d는 윈�우 핸들� 아닙니다"
diff -Nru r-base-3.2.3/src/library/utils/po/pl.po r-base-3.3.1/src/library/utils/po/pl.po
--- r-base-3.2.3/src/library/utils/po/pl.po	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/pl.po	2016-04-27 22:15:24.000000000 +0000
@@ -1,106 +1,106 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
-"PO-Revision-Date: 2015-03-26 21:50+0100\n"
+"Project-Id-Version: R 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
+"PO-Revision-Date: 2016-04-04 09:57+0200\n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.5\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Generator: Poedit 1.8.7\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: io.c:324 io.c:328 io.c:338 io.c:569 io.c:769 io.c:822 io.c:834 io.c:838
-#: io.c:844 io.c:845 io.c:1068 io.c:1069 io.c:1071 io.c:1072 io.c:1073
-#: io.c:1074 io.c:1075 io.c:1076 stubs.c:47 stubs.c:67 windows/dialogs.c:169
+#: io.c:329 io.c:333 io.c:343 io.c:574 io.c:774 io.c:827 io.c:839 io.c:843
+#: io.c:849 io.c:850 io.c:1073 io.c:1074 io.c:1076 io.c:1077 io.c:1078
+#: io.c:1079 io.c:1080 io.c:1081 stubs.c:47 stubs.c:67 windows/dialogs.c:169
 #: windows/dialogs.c:194 windows/dialogs.c:197 windows/dialogs.c:241
 #: windows/dialogs.c:278 windows/dialogs.c:289 windows/dialogs.c:313
-#: windows/dialogs.c:321 windows/util.c:111 windows/widgets.c:78
+#: windows/dialogs.c:321 windows/util.c:117 windows/widgets.c:78
 #: windows/widgets.c:81 windows/widgets.c:86
 #, c-format
 msgid "invalid '%s' argument"
 msgstr "niepoprawny argument '%s'"
 
-#: io.c:347 io.c:831
+#: io.c:352 io.c:836
 msgid "invalid quote symbol set"
 msgstr "niepoprawne ustawiony symbol cudzysłowiu"
 
-#: io.c:359 io.c:854 io.c:1056
+#: io.c:364 io.c:859 io.c:1061
 msgid "cannot open the connection"
 msgstr "nie można otworzyć połączenia"
 
-#: io.c:362 io.c:366
+#: io.c:367 io.c:371
 msgid "cannot read from this connection"
 msgstr "nie można czytać z tego połączenia"
 
-#: io.c:413 io.c:431
+#: io.c:418 io.c:436
 #, c-format
 msgid "quoted string on line %d terminated by EOF"
 msgstr ""
 "cytowany łańcuch tekstowy w linii %d przerwany przez znak końca pliku (EOF)"
 
-#: io.c:565
+#: io.c:570
 msgid "the first argument must be of mode character"
 msgstr "pierwszy argument musi być trybu tekstowego"
 
-#: io.c:595
+#: io.c:600
 #, c-format
 msgid "invalid 'numerals' string: \"%s\""
 msgstr "niepoprawny łańcuch tekstowy 'numerals': \"%s\""
 
-#: io.c:771
+#: io.c:776
 #, c-format
 msgid "Selection: "
 msgstr "Wybór: "
 
-#: io.c:863 io.c:877
+#: io.c:868 io.c:882
 msgid "cannot allocate buffer in 'readTableHead'"
 msgstr "nie można przydzielić bufora w 'readTableHead'"
 
-#: io.c:888
+#: io.c:893
 msgid "\\ followed by EOF"
 msgstr "\\ a następnie EOF"
 
-#: io.c:937 io.c:940
+#: io.c:942 io.c:945
 #, c-format
 msgid "incomplete final line found by readTableHeader on '%s'"
 msgstr "niekompletna końcowa linia znaleziona przez 'readTableHeader' w '%s'"
 
-#: io.c:997
+#: io.c:1002
 msgid "index out of range"
 msgstr "indeks poza zakresem"
 
-#: io.c:1049
+#: io.c:1054
 msgid "'file' is not a connection"
 msgstr "argument 'file' nie jest połączeniem"
 
-#: io.c:1052
+#: io.c:1057
 msgid "cannot write to this connection"
 msgstr "nie można zapisać w tym połączeniu"
 
-#: io.c:1082
+#: io.c:1087
 msgid "'dec' must be a single character"
 msgstr "argument 'dec' musi być pojedynczym znakiem"
 
-#: io.c:1108
+#: io.c:1113
 #, c-format
 msgid "corrupt data frame -- length of column %d does not not match nrows"
 msgstr ""
 "uszkodzona ramka danych -- długość kolumny %d nie zgadza się z liczbą wierszy"
 
-#: io.c:1139
+#: io.c:1144
 #, c-format
 msgid "column %s claims to be a factor but does not have numeric codes"
 msgstr ""
 "kolumna %s twierdzi, że jest czynnikiem, ale nie posiada kodów liczbowych"
 
-#: io.c:1157
+#: io.c:1162
 msgid "corrupt matrix -- dims not not match length"
 msgstr "macierz jest uszkodzona -- wymiary nie zgadzają się z długością"
 
@@ -129,20 +129,20 @@
 msgid "invalid '%s' specification"
 msgstr "niepoprawne określenie '%s'"
 
-#: utils.c:83
+#: utils.c:85
 msgid "'hostname' must be a character vector of length 1"
 msgstr "argument 'hostname' musi być wektorem tekstowym o długości 1"
 
-#: utils.c:89
+#: utils.c:91
 #, c-format
 msgid "nsl() was unable to resolve host '%s'"
 msgstr "'nsl()' nie był w stanie nawiązać połączenia z hostem '%s'"
 
-#: utils.c:96
+#: utils.c:98
 msgid "unknown format returned by 'gethostbyname'"
 msgstr "nieznany format zwrócony przez 'gethostbyname()'"
 
-#: utils.c:105
+#: utils.c:107
 msgid "nsl() is not supported on this platform"
 msgstr "'nsl()' nie jest obsługiwany na tej platformie"
 
@@ -190,41 +190,41 @@
 msgid "Registry key '%ls' not found"
 msgstr "Nie znaleziono klucza rejestru '%ls'"
 
-#: windows/util.c:41
+#: windows/util.c:42
 msgid "unsupported version of Windows"
 msgstr "niewspierana wersja systemu Windows"
 
-#: windows/util.c:275
+#: windows/util.c:281
 msgid "argument must be a character vector or a raw vector"
 msgstr "argument 'text' musi być wektorem tekstowym lub pustym wektorem"
 
-#: windows/util.c:312
+#: windows/util.c:318
 msgid "unable to open the clipboard"
 msgstr "nie można otworzyć schowka"
 
-#: windows/util.c:317
+#: windows/util.c:323
 msgid "unable to write to the clipboard"
 msgstr "nie można zapisać do schowka"
 
-#: windows/util.c:396
+#: windows/util.c:402
 msgid "'title' must be a character string"
 msgstr "argument 'title' musi być łańcuchem tekstowym"
 
-#: windows/util.c:405
+#: windows/util.c:411
 msgid "'text' must be a character string"
 msgstr "argument 'text' musi być łańcuchem tekstowym"
 
-#: windows/util.c:444
+#: windows/util.c:450
 #, c-format
 msgid "'%s' must be length 1"
 msgstr "argument '%s' musi mieć długość równą 1"
 
-#: windows/util.c:557
+#: windows/util.c:563
 #, c-format
 msgid "'%s' must be a list"
 msgstr "argument '%s' musi być listą"
 
-#: windows/util.c:561
+#: windows/util.c:567
 #, c-format
 msgid "'%s' element %d is not a window handle"
 msgstr "element %2$d '%1$s' nie jest uchwytem okna"
diff -Nru r-base-3.2.3/src/library/utils/po/R-da.po r-base-3.3.1/src/library/utils/po/R-da.po
--- r-base-3.2.3/src/library/utils/po/R-da.po	2015-03-24 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-da.po	2016-04-27 22:15:24.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 3.0.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-01-09 20:51+0200\n"
 "Last-Translator: Joe <joedalton2@yahoo.dk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -270,6 +270,14 @@
 msgid "did not assign() anything"
 msgstr ""
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr ""
+
 msgid "Browsing in the environment with call:"
 msgstr ""
 
@@ -427,13 +435,13 @@
 msgid "argument 'help.db' is deprecated"
 msgstr ""
 
-msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
+msgid "incorrect type specification"
 msgstr ""
 
-msgid "incorrect 'agrep' specification"
+msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 
-msgid "incorrect type specification"
+msgid "incorrect 'agrep' specification"
 msgstr ""
 
 msgid "could not find package %s"
@@ -614,10 +622,16 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr ""
 
-msgid "cannot choose a CRAN mirror non-interactively"
+msgid "'download.file()' error code '%d'"
+msgstr ""
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
 msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
+msgid "cannot choose a"
+msgstr ""
+
+msgid "mirror non-interactively"
 msgstr ""
 
 msgid "cannot set repositories non-interactively"
@@ -753,9 +767,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr ""
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr ""
-
 msgid "no method defined for function %s and signature %s"
 msgstr ""
 
@@ -897,6 +908,9 @@
 msgid "'digits' and 'digits.d' are both specified and the latter is not used"
 msgstr ""
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr ""
 
@@ -1025,9 +1039,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr ""
 
-msgid "no download method found"
-msgstr ""
-
 #, fuzzy
 msgid "'url' must be a length-one character vector"
 msgstr "»package« skal være en tegnstreng eller NULL"
@@ -1089,6 +1100,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr ""
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr ""
 
@@ -1148,6 +1162,11 @@
 msgstr[0] "Filter »%s« er ikke tilgængelig."
 msgstr[1] "Filter »%s« er ikke tilgængelig."
 
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] ""
diff -Nru r-base-3.2.3/src/library/utils/po/R-de.po r-base-3.3.1/src/library/utils/po/R-de.po
--- r-base-3.2.3/src/library/utils/po/R-de.po	2015-03-26 23:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-de.po	2016-04-27 22:15:24.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
-"PO-Revision-Date: 2015-03-26 15:07+0100\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-21 09:13+0200\n"
 "Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
 "Language-Team: R Core <r-core@r-project.org>\n"
 "Language: de\n"
@@ -21,11 +21,11 @@
 "RShowDoc() should be used with a character string argument specifying\n"
 "   a documentation file"
 msgstr ""
-"RShowDoc() sollte mit einen Zeichenkettenargument genutzt werden,\n"
-"das eine Dokudatei spezifiziert"
+"RShowDoc() sollte mit einem Zeichenkettenargument genutzt werden,\n"
+"das eine Dokumentationsdatei spezifiziert"
 
 msgid "no documentation for %s found in package %s"
-msgstr "keine Doku für %s in Paket %s gefunden"
+msgstr "keine Dokumentation für %s in Paket %s gefunden"
 
 msgid "document not found"
 msgstr "Dokument nicht gefunden"
@@ -34,7 +34,7 @@
 msgstr "Eine Suchanfrage wurde gesendet an %s"
 
 msgid "The results page should open in your browser shortly"
-msgstr "Die Ergebnissseite sollte sich in Kürze in Ihrem Browser öffnen"
+msgstr "Die Ergebnisseite sollte sich in Kürze in Ihrem Browser öffnen"
 
 msgid "reference to unknown chunk %s"
 msgstr "Referenz auf unbekannten Abschnitt %s"
@@ -74,10 +74,10 @@
 msgstr "Ausgabedateien:"
 
 msgid "Compacting PDF document"
-msgstr "Komprimieren PDF Dokument"
+msgstr "Komprimiere PDF Dokument"
 
 msgid "path to %s contains spaces,"
-msgstr "Pfad für %s enthält Leerstellen."
+msgstr "Pfad für %s enthält Leerzeichen,"
 
 msgid "this may cause problems when running LaTeX"
 msgstr "Das kann Schwierigkeiten mit LaTeX machen"
@@ -89,7 +89,7 @@
 msgstr "unzulässiger Wert für %s : %s"
 
 msgid "value of 'results' option should be lowercase"
-msgstr "Wert der 'results' option sollte in Kleinbuchstaben sein"
+msgstr "Wert der 'results' Option sollte in Kleinbuchstaben sein"
 
 msgid "value of 'strip.white' option should be lowercase"
 msgstr "Wert der 'strip.white' Option sollte in Kleinbuchstaben sein"
@@ -149,7 +149,7 @@
 msgstr "'full.names' muss TRUE sein bei mehrfachen Pfaden."
 
 msgid "Timestamp file no longer exists."
-msgstr "Zeitstempel exisitiert nicht länger."
+msgstr "Zeitstempel existiert nicht mehr."
 
 msgid ""
 "Not all arguments are of the same length, the following need to be recycled: "
@@ -165,7 +165,7 @@
 msgstr "Es ist empfohlen %s anstelle von %s zu nutzen."
 
 msgid "Use either %s or %s but not both."
-msgstr "Nutze entweder %s oder %s aber nicht beide."
+msgstr "Nutze entweder %s oder %s, aber nicht beide."
 
 msgid "It is recommended to use %s/%s instead of %s/%s/%s."
 msgstr "Es ist empfohlen %s/%s anstelle von %s/%s/%s zu nutzen."
@@ -189,7 +189,7 @@
 msgstr "%s sollte einer von %s sein"
 
 msgid "A BibTeX entry for LaTeX users is"
-msgstr "Ein BibTeX-eintrag für LaTeX Benutzer ist"
+msgstr "Ein BibTeX-Eintrag für LaTeX-Benutzer ist"
 
 msgid ""
 "Dropping invalid entry %d:\n"
@@ -208,29 +208,29 @@
 msgstr "konnte das Jahr für %s aus der DESCRIPTION des Paketes nicht bestimmen"
 
 msgid "To cite package %s in publications use:"
-msgstr "Um Paket %s in Publikationen zu zitieren nutzen Sie bitte:"
+msgstr "Um Paket %s in Publikationen zu zitieren, nutzen Sie bitte:"
 
 msgid ""
 "ATTENTION: This citation information has been auto-generated from the "
 "package DESCRIPTION file and may need manual editing, see %s."
 msgstr ""
-"ACHTUNG: Diese Zitatinformation wurde aus der DESCRIPTION-Datei\n"
-"automatischn generiert. Evtl. manuelle Nacharbeit nötig, siehe %s."
+"ACHTUNG: Diese Zitationsinformation wurde aus der DESCRIPTION-Datei\n"
+"automatisch generiert. Evtl. ist manuelle Nachbearbeitung nötig, siehe %s."
 
 msgid "'FUN' must be a function or NULL"
 msgstr "'FUN' muss eine Funktion oder NULL sein"
 
 msgid "cannot handle S4 methods yet"
-msgstr "kann noch nicht mit S4 Methoden umgehen"
+msgstr "kann noch nicht mit S4-Methoden umgehen"
 
 msgid "'package' must be a character string or NULL"
 msgstr "'package' muss eine Zeichenkette oder NULL sein"
 
 msgid "datasets have been moved from package 'base' to package 'datasets'"
-msgstr "Datensätze wurden von Paket 'base' ins Paket 'datasets' verschoben"
+msgstr "Datensätze wurden vom Paket 'base' in das Paket 'datasets' verschoben"
 
 msgid "datasets have been moved from package 'stats' to package 'datasets'"
-msgstr "Datensätze wurden von Paket 'stats' ins Paket 'datasets' verschoben"
+msgstr "Datensätze wurden vom Paket 'stats' in das Paket 'datasets' verschoben"
 
 msgid "data index for package %s is invalid and will be ignored"
 msgstr "Datenindex für Paket %s ist ungültig und wird ignoriert"
@@ -242,7 +242,7 @@
 msgstr "Datensatz %s nicht gefunden"
 
 msgid "only 'html = TRUE' is supported on this platform"
-msgstr "nur 'html = TRUE' ist auf dieser Plattform unterstützt"
+msgstr "nur 'html = TRUE' wird auf dieser Plattform unterstützt"
 
 msgid "kind '%s' not yet implemented"
 msgstr "Art '%s' noch nicht implementiert"
@@ -257,13 +257,13 @@
 msgstr "konnte Typinformation nicht wieder herstellen"
 
 msgid "'modes' argument ignored"
-msgstr "'modes' Argument ignoriert"
+msgstr "'modes'-Argument ignoriert"
 
 msgid "'names' argument ignored"
-msgstr "'names' Argument ignoriert"
+msgstr "'names'-Argument ignoriert"
 
 msgid "could not restore variables properly"
-msgstr "konnte Variablen nicht angemessen wieder herstellen"
+msgstr "konnte Variablen nicht angemessen wiederherstellen"
 
 msgid "did not assign() anything"
 msgstr "habe nichts assign()-ed"
@@ -281,10 +281,10 @@
 msgstr "'dump' ist leer"
 
 msgid "Available environments had calls:"
-msgstr "Verfügbare Umgebungen hatte Aufrufe:"
+msgstr "Verfügbare Umgebungen hatten diese Aufrufe:"
 
 msgid "Enter an environment number, or 0 to exit"
-msgstr "Gebe Umgebungsnummer oder 0 für Abbruch an"
+msgstr "Geben Sie Umgebungsnummer oder 0 für Abbruch an"
 
 msgid "recover called non-interactively; frames dumped, use debugger() to view"
 msgstr ""
@@ -335,7 +335,7 @@
 msgstr "kann NULL Zeilennamen nicht editieren"
 
 msgid "no help found for %s"
-msgstr "kein Hilfe für %s gefunden"
+msgstr "keine Hilfe für %s gefunden"
 
 msgid "%s has a help file but no examples"
 msgstr "%s hat eine Hilfe, aber keine Beispiele"
@@ -344,22 +344,22 @@
 msgstr "Zeilennummer fehlt"
 
 msgid "'fix' requires a name"
-msgstr "'fix' beötigt einen Namen"
+msgstr "'fix' benötigt einen Namen"
 
 msgid "too many list items (at most up to %d)"
-msgstr "zu viele Listenpunke (höchstens %d)"
+msgstr "zu viele Listenpunkte (höchstens %d)"
 
 msgid "no vector columns were selected"
 msgstr "keine Vektorspalten ausgewählt"
 
 msgid "non-vector columns will be ignored"
-msgstr "nicht-vector Spalten werden ignoriert"
+msgstr "Nicht-Vektor-Spalten werden ignoriert"
 
 msgid "at least one vector element is required"
 msgstr "mindestens ein Vektorelement ist nötig"
 
 msgid "non-vector elements will be ignored"
-msgstr "nicht-vektor Elemente werden ignoriert"
+msgstr "Nicht-Vektor-Elemente werden ignoriert"
 
 msgid "'form' must be a two-sided formula"
 msgstr "'form' muss eine zweiseitige Formel sein"
@@ -402,7 +402,7 @@
 msgstr "Nutze ersten passenden ..."
 
 msgid "HTML help is unavailable"
-msgstr "HTML Hilfe ist nicht verfügbar"
+msgstr "HTML-Hilfe ist nicht verfügbar"
 
 msgid "R Help on %s"
 msgstr "R Hilfe zu %s"
@@ -414,7 +414,7 @@
 "package %s exists but was not installed under R >= 2.10.0 so help cannot be "
 "accessed"
 msgstr ""
-"Paket %s exisitiert, wurde aber nicht unter R >= 2.10.0 installiert, weshalb "
+"Paket %s existiert, wurde aber nicht unter R >= 2.10.0 installiert, weshalb "
 "die Hilfe nicht genutzt werden kann"
 
 msgid "creation of %s failed"
@@ -452,13 +452,13 @@
 msgstr "Paket %s hat leere hsearch Daten - seltsam"
 
 msgid "removing all entries with invalid multi-byte character data"
-msgstr "entferne alle Ein<räge mit unzulässigen multi-byte Charakterdaten"
+msgstr "entferne alle Einträge mit unzulässigen multi-byte Zeichenkettendaten"
 
 msgid "invalid browser name, check options(\"browser\")."
 msgstr "ungültiger Browsername, überprüfen Sie options(\"browser\")."
 
 msgid "help.start() requires the HTTP server to be running"
-msgstr "help.start() benötigt den laufenden HTTP Server"
+msgstr "help.start() benötigt den laufenden HTTP-Server"
 
 msgid ""
 "If nothing happens, you should open\n"
@@ -485,10 +485,10 @@
 msgstr "kein Paket '%s' gefunden"
 
 msgid "metadata of package '%s' is corrupt"
-msgstr "Metadaten für Paket '%s' sind korrumpiert"
+msgstr "Metadaten für Paket '%s' sind beschädigt"
 
 msgid "DESCRIPTION file of package '%s' is corrupt"
-msgstr "DESCRIPTION von Paket '%s' ist korrumpiert"
+msgstr "DESCRIPTION von Paket '%s' ist beschädigt"
 
 msgid ""
 "'DESCRIPTION' file has an 'Encoding' field and re-encoding is not possible"
@@ -496,10 +496,10 @@
 "Die 'DESCRIPTION' Datei hat Feld 'Encoding' und rekodieren ist nicht möglich"
 
 msgid "DESCRIPTION file of package '%s' is missing or broken"
-msgstr "DESCRIPTIN von Paket '%s' fehlt oder zerstört"
+msgstr "DESCRIPTION von Paket '%s' fehlt oder zerstört"
 
 msgid "cannot update HTML package index"
-msgstr "kann HTML Paketindex nicht aktualisieren"
+msgstr "kann HTML-Paketindex nicht aktualisieren"
 
 msgid "done"
 msgstr "fertig"
@@ -511,7 +511,7 @@
 msgstr "Geben Sie Menüpunkt ein oder 0 zum Abbruch"
 
 msgid "invalid query"
-msgstr "unzulässiges Anfrage"
+msgstr "unzulässige Anfrage"
 
 msgid "'%s' is a formal generic function; S3 methods will not likely be found"
 msgstr ""
@@ -523,7 +523,7 @@
 
 msgid "generic function '%s' dispatches methods for generic '%s'"
 msgstr ""
-"generische Funktion '%s' leistet Methodendispatch für  die generische '%s'"
+"generische Funktion '%s' leistet Methodendispatch für die generische '%s'"
 
 msgid ""
 "function '%s' appears not to be S3 generic; found functions that look like "
@@ -539,16 +539,16 @@
 msgstr "keine Funktion '%s' konnte gefunden werden"
 
 msgid "S3 method '%s' not found"
-msgstr "S3 Methode '%s' nicht gefunden"
+msgstr "S3-Methode '%s' nicht gefunden"
 
 msgid "environment specified is not a package"
-msgstr "angegebenen Umgebung ist kein Paket"
+msgstr "angegebene Umgebung ist kein Paket"
 
 msgid "changing locked binding for %s in %s whilst loading %s"
-msgstr "ändere geschlossene Bindung für %s in %s während des Ladens von %s"
+msgstr "ändere gesperrte Bindung für %s in %s während des Ladens von %s"
 
 msgid "changing locked binding for %s in %s"
-msgstr "ändere geschlossene Bindung für %s in %s"
+msgstr "ändere gesperrte Bindung für %s in %s"
 
 msgid "'fixInNamespace' requires a name"
 msgstr "'fixInNamespace' benötigt einen Namen"
@@ -560,22 +560,22 @@
 msgstr "kann Verzeichnis '%s' nicht erzeugen"
 
 msgid "'code_files' must be a character vector"
-msgstr "'code_files' muss ein Charaktervektor sein"
+msgstr "'code_files' muss ein Zeichenkettenvektor sein"
 
 msgid "'list' must be a character vector naming R objects"
-msgstr "'list' muss ein Charaktervektor sein, mit Namen von R Objekten"
+msgstr "'list' muss ein Zeichenkettenvektor mit Namen von R-Objekten sein"
 
 msgid "no R objects specified or available"
-msgstr "keine R Objekte spezifiziert oder verfügbar"
+msgstr "keine R-Objekte spezifiziert oder verfügbar"
 
 msgid "directory '%s' already exists"
-msgstr "Verzeichnis '%s' exisitiert bereits"
+msgstr "Verzeichnis '%s' existiert bereits"
 
 msgid ""
 "generic functions and other S4 objects (e.g., '%s') cannot be dumped; use "
 "the 'code_files' argument"
 msgstr ""
-"generische Funktionen und andere S4 Objekte (z.B. '%s') können nicht "
+"generische Funktionen und andere S4-Objekte (z.B. '%s') können nicht "
 "gedumped werden: nutze 'code_files' Argument"
 
 msgid "unable to access index for repository %s"
@@ -597,11 +597,11 @@
 msgid ""
 "invalid 'oldPkgs'; must be a character vector or a result from old.packages()"
 msgstr ""
-"unzulässige 'oldPkgs'; muss eine Zeichenkette oder ein Ergebniss von old."
+"unzulässige 'oldPkgs'; muss eine Zeichenkette oder ein Ergebnis von old."
 "packages() sein"
 
 msgid "ill-formed 'instPkgs' matrix"
-msgstr "missgestaltete 'instPkgs' Matrix"
+msgstr "unzulässig gestaltete 'instPkgs' Matrix"
 
 msgid "no installed packages for (invalid?) 'lib.loc=%s'"
 msgstr "keine installierten Pakete für (falsche?) 'lib.loc=%s'"
@@ -610,37 +610,37 @@
 msgstr "keine neuen Pakete verfügbar"
 
 msgid "metadata of %s is corrupt"
-msgstr "Metadaten für %s sind korrumpiert"
+msgstr "Metadaten für %s sind beschädigt"
 
 msgid "'priority' must be character or NULL"
-msgstr "'priority' muss ein Zeichen oder NULL sein"
+msgstr "'priority' muss eine Zeichenkette oder NULL sein"
 
 msgid "Updating HTML index of packages in '.Library'"
-msgstr "Aktualisiere HTML Index der Pakete in '.Library'"
+msgstr "Aktualisiere HTML-Index der Pakete in '.Library'"
 
 msgid "'destdir' is not a directory"
 msgstr "'destdir' ist kein Verzeichnis"
 
 msgid "no package %s at the repositories"
-msgstr "kein Paket %s in den Repostories"
+msgstr "kein Paket %s in den Repositories"
 
 msgid "package %s does not exist on the local repository"
-msgstr "Paket %s exisitiert nicht in lokalem Repository"
+msgstr "Paket %s existiert nicht in lokalem Repository"
 
 msgid "download of package %s failed"
 msgstr "Download von Paket %s fehlgeschlagen"
 
 msgid "--- Please select a CRAN mirror for use in this session ---"
-msgstr "--- Bitte einen CRAN Spiegel für diese Sitzung auswählen ---"
+msgstr "--- Bitte einen CRAN-Spiegelserver für diese Sitzung auswählen ---"
 
 msgid "trying to use CRAN without setting a mirror"
 msgstr "versuche CRAN ohne einen Spiegelserver zu nutzen"
 
 msgid "cannot choose a CRAN mirror non-interactively"
-msgstr "kann keinen CRAN-Spiegel nicht-interaktiv nutzen"
+msgstr "kann keinen CRAN-Spiegelserver nicht-interaktiv nutzen"
 
 msgid "cannot choose a BioC mirror non-interactively"
-msgstr "kann keinen BioC-Spiegel nicht-interaktiv wählen"
+msgstr "kann keinen BioC-Spiegelserver nicht-interaktiv wählen"
 
 msgid "cannot set repositories non-interactively"
 msgstr "kann keine Repositories nicht-interaktiv setzen"
@@ -701,20 +701,20 @@
 msgstr "Quelltextrepository nicht verfügbar um Versionen zu überprüfen"
 
 msgid "cannot install MacOS X binary packages on Windows"
-msgstr "kann keine MacOS X Binaries auf Windows installieren"
+msgstr "kann keine MacOS-X-Binaries auf Windows installieren"
 
 msgid "cannot install MacOS X binary packages on this platform"
-msgstr "kann keine MacOS X Binaries auf dieser Plattform installieren"
+msgstr "kann keine MacOS-X-Binaries auf dieser Plattform installieren"
 
 msgid "cannot install Windows binary packages on this platform"
-msgstr "kann keine Windows Binaries auf dieser Plattform installieren"
+msgstr "kann keine Windows-Binaries auf dieser Plattform installieren"
 
 msgid ""
 "This version of R is not set up to install source packages\n"
 "If it was installed from an RPM, you may need the R-devel RPM"
 msgstr ""
 "Diese Version von R ist nicht vorbereitet, um Source-Pakete zu installieren\n"
-"Wenn es  aus einem RPM installiert wurde, benötigen Sie evtl. das R-devel RPM"
+"Wenn es aus einem RPM installiert wurde, benötigen Sie evtl. das R-devel RPM"
 
 msgid "system (cmd0): %s"
 msgstr "System (cmd0): %s"
@@ -746,14 +746,14 @@
 "The namespace for package \"%s\" is locked; no changes in the global "
 "variables list may be made."
 msgstr ""
-"Der Namensraum für Paket \"%s\" ist geschlossen; Es können keine\n"
+"Der Namensraum für Paket \"%s\" ist gesperrt; Es sind keine\n"
 "Änderungen in der globalen Variablenliste möglich."
 
 msgid "'env' must be an environment"
 msgstr "'env' muss eine Umgebung sein"
 
 msgid "no object named '%s' to show"
-msgstr "kein Objket namens '%s' anzuzeigen"
+msgstr "kein Objekt namens '%s' anzuzeigen"
 
 msgid "'file' must be \"\" or an open connection object"
 msgstr "'file' muss \"\" oder eine bereits geöffnetes Verbindungsobjekt sein"
@@ -778,30 +778,32 @@
 
 msgid "no documentation of type %s and topic %s (or error in processing help)"
 msgstr ""
-"keine Doku des Typs %s zum Thema %s (oder Fehler in der Hilfeverarbeitung)"
+"keine Dokumentation des Typs %s zum Thema %s (oder Fehler in der "
+"Hilfeverarbeitung)"
 
 msgid ""
 "the object of class %s in the function call %s could not be used as a "
 "documentation topic"
 msgstr ""
-"das Objekt der Klasse %s im Funktionsaufruf %s konnte nicht als Doku-Thema "
-"benutzt werden"
+"das Objekt der Klasse %s im Funktionsaufruf %s konnte nicht als "
+"Dokumentations-Thema benutzt werden"
 
 msgid "no methods for %s and no documentation for it as a function"
 msgstr ""
-"keine Methoden für %s und keine Doku darüber, es als Funktion zu nutzen"
+"keine Methoden für %s und keine Dokumentation darüber, es als Funktion zu "
+"nutzen"
 
 msgid "error in trying to evaluate the expression for argument %s (%s)"
 msgstr "Fehler beim Versuch den Ausdruck für Argument %s (%s) auszuwerten"
 
 msgid "no method defined for function %s and signature %s"
-msgstr "keine Methode für Funktion %s und  Signatur %s definiert"
+msgstr "keine Methode für Funktion %s und Signatur %s definiert"
 
 msgid "no documentation for function %s and signature %s"
-msgstr "keine Doku für Funktion %s und Signatur %s"
+msgstr "keine Dokumentation für Funktion %s und Signatur %s"
 
 msgid "No DIF data on clipboard"
-msgstr "Keine DIF Daten im Clipboard"
+msgstr "Keine DIF-Daten im Clipboard"
 
 msgid "file had no lines"
 msgstr "Datei hat keine Zeilen"
@@ -810,13 +812,15 @@
 msgstr "Zeilen und Spaltenzahlen nicht gefunden"
 
 msgid "More rows than specified in header; maybe use 'transpose=TRUE'"
-msgstr "mehr Zeilen als im Kopf spezifiziert; evtl 'transpose=TRUE'?"
+msgstr ""
+"mehr Zeilen als im Kopf der Datei spezifiziert; evtl. 'transpose=TRUE'?"
 
 msgid "Unrecognized special data value"
 msgstr "Unerkannte spezielle Datenwerte"
 
 msgid "More columns than specified in header; maybe use 'transpose=TRUE'"
-msgstr "mehr Spalten als im Kopf spezifiziert; evtl. 'transpose=TRUE'?"
+msgstr ""
+"mehr Spalten als im Kopf der Datei spezifiziert; evtl. 'transpose=TRUE'?"
 
 msgid "Unrecognized value indicator"
 msgstr "Unbekannter Wertindikator"
@@ -837,13 +841,13 @@
 msgstr "Zeilen sind leer: gebe auf"
 
 msgid "not all columns named in 'colClasses' exist"
-msgstr "nicht alle Spalten in 'colClasses' exisitieren"
+msgstr "nicht alle Spalten in 'colClasses' existieren"
 
 msgid "invalid numeric 'as.is' expression"
 msgstr "ungültige numerische 'as.is' Expression"
 
 msgid "not all columns named in 'as.is' exist"
-msgstr "nicht alle in 'as.is' benannten Spalten exisitieren"
+msgstr "nicht alle in 'as.is' benannten Spalten existieren"
 
 msgid "'as.is' has the wrong length %d  != cols = %d"
 msgstr "'as.is' hat die falsche Länge %d != cols = %d"
@@ -852,7 +856,7 @@
 msgstr "ungültige 'row.names' Spezifikation"
 
 msgid "invalid 'row.names' length"
-msgstr "ungültige 'roe.names' Länge"
+msgstr "ungültige 'row.names' Länge"
 
 msgid "duplicate 'row.names' are not allowed"
 msgstr "doppelte 'row.names' sind nicht zulässig"
@@ -891,10 +895,11 @@
 "Either ensure you unlist a relistable object, or specify the skeleton "
 "separately."
 msgstr ""
-"Entweder ein wiedr listbares Objekt entlisten oder ein Gerüst separat angeben"
+"Entweder ein wieder-listbares Objekt entlisten oder ein Gerüst separat "
+"angeben"
 
 msgid "cannot coerce 'x' to roman"
-msgstr "kann 'x' nicht nach Roman unwandeln"
+msgstr "kann 'x' nicht nach in römische Zahl unwandeln"
 
 msgid "Could not create file %s, aborting"
 msgstr "Konnte Datei %s nicht erzeugen, abgebrochen"
@@ -909,17 +914,18 @@
 msgstr "'port' muss ganze Zahl der Länge 1 sein"
 
 msgid "'host' must be character of length 1"
-msgstr "'host' muss Charakter der Länge 1 sein"
+msgstr "'host' muss Zeichenkette der Länge 1 sein"
 
 msgid "can only receive calls on local machine"
-msgstr "kann Aufrufe nur auf der lokalen Maschiene entgegennehmen"
+msgstr "kann Aufrufe nur auf der lokalen Maschine entgegennehmen"
 
 msgid "socket not established"
 msgstr "socket nicht etabliert"
 
 msgid "str.data.frame() called with non-data.frame -- coercing to one."
 msgstr ""
-"str.data.frame() mit nicht-Data-Frame aufgerufen --- umwandeln in einen."
+"str.data.frame() nicht mit einem data.frame aufgerufen -- umgewandelt in einen "
+"solchen."
 
 msgid "invalid options(\"str\") -- using defaults instead"
 msgstr "ungültige options(\"str\") -- nutze stattdessen Standard"
@@ -938,10 +944,10 @@
 "'digits' und 'digits.d' sind beide angegeben und das letztere wird ignoriert"
 
 msgid "no lines found in %s"
-msgstr "kein Zeilen in  '%s'"
+msgstr "keine Zeilen in '%s'"
 
 msgid "profile does not contain memory information"
-msgstr "Profil einthält keine Speicherinformation"
+msgstr "Profil enthält keine Speicherinformation"
 
 msgid "profile does not contain line information"
 msgstr "Profil enthält keine Zeileninformation"
@@ -953,7 +959,7 @@
 msgstr "unzulässiges 'tarfile' Argument"
 
 msgid "'compressed' must be logical or character"
-msgstr "'commpressed' muss Boole'sch oder ein Charakter sein"
+msgstr "'compressed' muss boolesch oder eine Zeichenkette sein"
 
 msgid "failed to create directory %s"
 msgstr "kann Verzeichnis '%s' nicht erzeugen"
@@ -968,7 +974,7 @@
 msgstr "unvollständiger Block in Datei"
 
 msgid "invalid name field in tarball"
-msgstr "ungültiger Name im Tar-Paket"
+msgstr "ungültiger Name in tar-Datei"
 
 msgid "checksum error for entry '%s'"
 msgstr "Checksummenfehler für Eintrag '%s'"
@@ -989,10 +995,10 @@
 msgstr "Dateigröße limitiert auf 8GB"
 
 msgid "invalid uid value replaced by that for user 'nobody'"
-msgstr "ungültiger uid Wert durch den für 'nobody' ersetzt "
+msgstr "ungültiger Wert für uid durch den für 'nobody' ersetzt "
 
 msgid "invalid gid value replaced by that for user 'nobody'"
-msgstr "ungültiger gid Wert durch den für 'nobody' ersetzt "
+msgstr "ungültiger Wert für gid durch den für den Nutzer 'nobody' ersetzt "
 
 msgid ""
 "vignette %s found more than once,\n"
@@ -1014,7 +1020,7 @@
 msgstr "select.list() kann nicht nicht-interaktiv benutzt werden"
 
 msgid "'title' must be NULL or a length-1 character vector"
-msgstr "'title' muss NULL oder ein Charaktervektor mit Länge 1 sein"
+msgstr "'title' muss NULL oder ein Zeichenkettenvektor mit Länge 1 sein"
 
 msgid ""
 "Enter one or more numbers separated by spaces, or an empty line to cancel"
@@ -1047,17 +1053,17 @@
 msgstr "Versuch ignoriert '%s' zu setzen"
 
 msgid "'unzip' must be a single character string"
-msgstr "'unzip' muss ein einzelne Zeichenkette sein"
+msgstr "'unzip' muss eine einzelne Zeichenkette sein"
 
 msgid "'files' must a character vector specifying one or more filepaths"
 msgstr ""
-"'files' muss ein Charaktervektor sein, der einen oder mehrere Pfade "
+"'files' muss ein Zeichenkettenvektor sein, der einen oder mehrere Pfade "
 "spezifiziert"
 
 msgid ""
 "cannot find program to open 'mailto:' URIs: reverting to 'method=\"none\"'"
 msgstr ""
-"kein programm um 'mailto' URIs zu öffnen: rückfall auf 'method=\"none\"'"
+"kein Programm um 'mailto' URIs zu öffnen: Rückfall auf 'method=\"none\"'"
 
 msgid "Using the browser to open a mailto: URI"
 msgstr "Nutze Browser, um mailto: URI zu öffnen"
@@ -1069,16 +1075,16 @@
 msgstr "'subject' fehlt"
 
 msgid "'ccaddress' must be of length 1"
-msgstr "'ccaddress' muss von der Länge 1 sein"
+msgstr "'ccaddress' muss die Länge 1 haben"
 
 msgid "no download method found"
 msgstr "keine Downloadmethode gefunden"
 
 msgid "'url' must be a length-one character vector"
-msgstr "'url' muss ein Charaktervektor mit Länge 1 sein"
+msgstr "'url' muss ein Zeichenkettenvektor mit Länge 1 sein"
 
 msgid "'destfile' must be a length-one character vector"
-msgstr "'destfile' muss ein Charaktervektor mit Länge 1 sein"
+msgstr "'destfile' muss ein Zeichenkettenvektor mit Länge 1 sein"
 
 msgid "download had nonzero exit status"
 msgstr "Download hatte Exit-Status ungleich 0"
@@ -1087,7 +1093,7 @@
 msgstr "'tar' hatte Exit-Status %d"
 
 msgid "file %s is not an OS X binary package"
-msgstr "Datei %s ist kein OS X Binärpaket"
+msgstr "Datei %s ist kein OS-X-Binärpaket"
 
 msgid "package %s successfully unpacked and MD5 sums checked"
 msgstr "Paket %s erfolgreich ausgepackt und MD5 Summen abgeglichen"
@@ -1096,7 +1102,7 @@
 "ERROR: failed to lock directory %s for modifying\n"
 "Try removing %s"
 msgstr ""
-"ERROR: Verzeichnis-Lock für %s für Änderung fehlgeschlagen<\n"
+"ERROR: Verzeichnis-Lock für %s für Änderung fehlgeschlagen\n"
 "Versuche %s zu entfernen"
 
 msgid "ERROR: failed to create lock directory %s"
@@ -1128,7 +1134,7 @@
 msgstr "Methode 'mailx' nur unter UNIX"
 
 msgid "zip file %s not found"
-msgstr "Zipfile %s nicht gefunden"
+msgstr "Zip-Datei %s nicht gefunden"
 
 msgid "failed to create %s"
 msgstr "Erzeugen von %s fehlgeschlagen"
@@ -1136,6 +1142,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr "kein 'libs' Verzeichnis im Paket %s"
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr "Nur '*.zip' und '*.tar.gz' Dateien können installiert werden."
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr "winDialog() kann nicht nicht-interaktiv genutzt werden"
 
@@ -1144,8 +1153,8 @@
 
 msgid "%d Sweave file for basename %s found"
 msgid_plural "%d Sweave files for basename %s found"
-msgstr[0] "%d Sweave Datei für Basisnamen %s gefunden"
-msgstr[1] "%d Sweave Dateien für Basisnamen %s gefunden"
+msgstr[0] "%d Sweave-Datei für Basisnamen %s gefunden"
+msgstr[1] "%d Sweave-Dateien für Basisnamen %s gefunden"
 
 msgid "%d occurrence in %s"
 msgid_plural "%d occurrences in %s"
@@ -1220,7 +1229,7 @@
 
 msgid "'lib' element %s is not a writable directory"
 msgid_plural "'lib' elements %s are not writable directories"
-msgstr[0] "'lib' Element %s ist keine schreibbares Verzeichnis"
+msgstr[0] "'lib' Element %s ist kein schreibbares Verzeichnis"
 msgstr[1] "'lib' Elemente %s sind keine schreibbaren Verzeichnisse"
 
 msgid "There is a binary version available but the source version is later"
@@ -1233,12 +1242,11 @@
 "Do you want to install from sources the package which needs compilation?"
 msgid_plural ""
 "Do you want to install from sources the packages which need compilation?"
-msgstr[0] ""
-"Möchten Sie versuchen, das Paket aus den Quelltexten\n"
-"zu installieren, was eine Kompilierung erfordert?"
+msgstr[0] "Möchten Sie versuchen, das Paket, welches eine Kompilierung erfordert,"
+" aus den Quelltexten zu installieren?"
 msgstr[1] ""
-"Möchten Sie versuchen, die Paktete aus den Quelltexten\n"
-"zu installieren, was eine Kompilierung erfordert?"
+"Möchten Sie versuchen, die Pakete, welche eine Kompilierung erfordern,"
+" aus den Quelltexten zu installieren?"
 
 msgid ""
 "Package which is only available in source form, and may need compilation of "
@@ -1246,9 +1254,7 @@
 msgid_plural ""
 "Packages which are only available in source form, and may need compilation "
 "of C/C++/Fortran"
-msgstr[0] ""
-"Paket, das nur als Quelltext vorliegt und eventuell Ãœbersetzung von C/C++/"
-"Fortran benötigt."
+msgstr[0] "Paket, das nur als Quelltext vorliegt und eventuell Übersetzung von C/C++/Fortran benötigt."
 msgstr[1] ""
 "Pakete, die nur als Quelltext vorliegen und eventuell Ãœbersetzung von C/C++/"
 "Fortran benötigen."
@@ -1290,7 +1296,7 @@
 msgid "package %s is in use and will not be installed"
 msgid_plural "packages %s are in use and will not be installed"
 msgstr[0] "Paket %s wird gerade benutzt und deshab nicht installiert"
-msgstr[1] "Pakete %s werden gerade bennutzt und deshalb nicht installiert"
+msgstr[1] "Pakete %s werden gerade benutzt und deshalb nicht installiert"
 
 #~ msgid ","
 #~ msgstr ","
diff -Nru r-base-3.2.3/src/library/utils/po/R-fa.po r-base-3.3.1/src/library/utils/po/R-fa.po
--- r-base-3.2.3/src/library/utils/po/R-fa.po	2015-03-24 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-fa.po	2016-04-27 22:15:24.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.15.1\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2012-12-30 23:32+0330\n"
 "Last-Translator: Seyed Mahmood Taghavi Shahri <taghavi_m@razi.tums.ac.ir>\n"
 "Language-Team: Persian\n"
@@ -252,6 +252,14 @@
 msgid "did not assign() anything"
 msgstr ""
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr ""
+
 msgid "Browsing in the environment with call:"
 msgstr ""
 
@@ -408,13 +416,13 @@
 msgid "argument 'help.db' is deprecated"
 msgstr ""
 
-msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
+msgid "incorrect type specification"
 msgstr ""
 
-msgid "incorrect 'agrep' specification"
+msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 
-msgid "incorrect type specification"
+msgid "incorrect 'agrep' specification"
 msgstr ""
 
 msgid "could not find package %s"
@@ -594,10 +602,16 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr "بدون انتخاب کردن نمایندگی CRAN تلاش برای است�اده از"
 
-msgid "cannot choose a CRAN mirror non-interactively"
+msgid "'download.file()' error code '%d'"
+msgstr ""
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
 msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
+msgid "cannot choose a"
+msgstr ""
+
+msgid "mirror non-interactively"
 msgstr ""
 
 msgid "cannot set repositories non-interactively"
@@ -733,9 +747,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr ""
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr ""
-
 msgid "no method defined for function %s and signature %s"
 msgstr ""
 
@@ -876,6 +887,9 @@
 msgid "'digits' and 'digits.d' are both specified and the latter is not used"
 msgstr ""
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr ""
 
@@ -1003,9 +1017,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr ""
 
-msgid "no download method found"
-msgstr ""
-
 msgid "'url' must be a length-one character vector"
 msgstr ""
 
@@ -1064,6 +1075,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr ""
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr ""
 
@@ -1120,6 +1134,11 @@
 msgstr[0] "که پیش‌نیاز است در دسترس نمی‌باشد %s بسته"
 msgstr[1] "که پیش‌نیاز هستند در دسترس نمی‌باشند %s بسته‌های"
 
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] "که پیش‌نیاز است در دسترس نمی‌باشد %s بسته"
diff -Nru r-base-3.2.3/src/library/utils/po/R-fr.po r-base-3.3.1/src/library/utils/po/R-fr.po
--- r-base-3.2.3/src/library/utils/po/R-fr.po	2015-03-24 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-fr.po	2016-04-27 22:15:24.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.12.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2014-03-17 11:04+0100\n"
 "Last-Translator: Philippe Grosjean <phgrosjean@sciviews.org>\n"
 "Language-Team: French <R-core@r-project.org>\n"
@@ -279,6 +279,15 @@
 msgid "did not assign() anything"
 msgstr "rien n'a été assign()é"
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr ""
+"erreur lors de la tentative d'évaluation d'expression pour l'argument %s (%s)"
+
 msgid "Browsing in the environment with call:"
 msgstr "Navigation dans l'environnement avec l'appel :"
 
@@ -449,6 +458,9 @@
 msgid "argument 'help.db' is deprecated"
 msgstr "l'argument 'help.db' est obsolète"
 
+msgid "incorrect type specification"
+msgstr "spécification de type incorrecte"
+
 msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 "pas d'information dans la base de données pour le package %s : faut-il "
@@ -457,9 +469,6 @@
 msgid "incorrect 'agrep' specification"
 msgstr "spécification 'agrep' incorrecte"
 
-msgid "incorrect type specification"
-msgstr "spécification de type incorrecte"
-
 msgid "could not find package %s"
 msgstr "impossible de trouver le packages %s"
 
@@ -651,11 +660,19 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr "essai d'utilisation de CRAN sans fixer un miroir"
 
-msgid "cannot choose a CRAN mirror non-interactively"
-msgstr "impossible de choisir un miroir CRAN en mode non interactif"
+#, fuzzy
+msgid "'download.file()' error code '%d'"
+msgstr "erreur de read.dcf() dans le fichier %s"
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
+msgstr ""
+
+msgid "cannot choose a"
+msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
-msgstr "impossible de choisir un miroir BioC en mode non interactif"
+#, fuzzy
+msgid "mirror non-interactively"
+msgstr "impossible de choisir un miroir CRAN en mode non interactif"
 
 msgid "cannot set repositories non-interactively"
 msgstr "impossible de fixer les entrepôts en mode non interactif"
@@ -813,10 +830,6 @@
 "aucune méthode pour %s et aucune documentation à son sujet en tant que "
 "fonction"
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr ""
-"erreur lors de la tentative d'évaluation d'expression pour l'argument %s (%s)"
-
 msgid "no method defined for function %s and signature %s"
 msgstr "aucune méthode définie pour la fonction %s et pour la signature %s"
 
@@ -965,6 +978,9 @@
 msgstr ""
 "'digits' et 'digits.d' sont tous deux spécifiés et le second est ignoré"
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr "aucune ligne trouvée dans %s"
 
@@ -1101,9 +1117,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr "'ccaddress' doit être de longueur 1"
 
-msgid "no download method found"
-msgstr "impossible de trouver une méthode de téléchargement"
-
 #, fuzzy
 msgid "'url' must be a length-one character vector"
 msgstr "'title' doit être NULL ou un vecteur de type caractère de longueur 1"
@@ -1170,6 +1183,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr "aucun répertoire 'libs' n'est trouvé dans le package %s"
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr "winDialog() ne peut être utilisé en mode non interactif"
 
@@ -1231,6 +1247,13 @@
 msgstr[0] "le package %s n'est pas disponible (pour %s)"
 msgstr[1] "les packages '%s' ne sont pas disponibles (pour %s)"
 
+#, fuzzy
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] "le package %s est en cours d'utilisation et ne sera pas installé"
+msgstr[1] ""
+"les packages %s sont en cours d'utilisation et ne seront pas installés"
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] "la dépendance '%s' n'est pas disponible"
@@ -1335,6 +1358,12 @@
 msgstr[1] ""
 "les packages %s sont en cours d'utilisation et ne seront pas installés"
 
+#~ msgid "cannot choose a BioC mirror non-interactively"
+#~ msgstr "impossible de choisir un miroir BioC en mode non interactif"
+
+#~ msgid "no download method found"
+#~ msgstr "impossible de trouver une méthode de téléchargement"
+
 #~ msgid ","
 #~ msgstr ","
 
@@ -1561,9 +1590,6 @@
 #~ msgid "updating HTML package descriptions"
 #~ msgstr "mise à jour des descriptions HTML des packages"
 
-#~ msgid "read.dcf() error on file '%s'"
-#~ msgstr "erreur de read.dcf() dans le fichier %s"
-
 #~ msgid "Could not find aspell or ispell executable."
 #~ msgstr "Executable aspell ou ispell introuvable."
 
diff -Nru r-base-3.2.3/src/library/utils/po/R-ja.po r-base-3.3.1/src/library/utils/po/R-ja.po
--- r-base-3.2.3/src/library/utils/po/R-ja.po	2015-06-06 22:15:30.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-ja.po	2016-04-27 22:15:24.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: R 2.1.0 \n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2015-03-27 15:15+0900 \n"
 "Last-Translator: Masafumi  \n"
 "Language-Team: RjpWiki Message Translation Team <mokada@md.tsukuba.ac.jp> \n"
@@ -266,6 +266,14 @@
 msgid "did not assign() anything"
 msgstr " 何も assign() ���ん��� "
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr " 引数 %s (%s) �対�る表��を評価中�エラー "
+
 msgid "Browsing in the environment with call:"
 msgstr " 以下�呼�出��伴�環境�ブラウジング: "
 
@@ -431,6 +439,9 @@
 msgid "argument 'help.db' is deprecated"
 msgstr " 引数 'help.db' �廃止�れ��� "
 
+msgid "incorrect type specification"
+msgstr " �正確�タイプ指定�� "
+
 msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 " パッケージ %s �情報�データベース中��り��ん: 'rebuild = TRUE' �必��"
@@ -439,9 +450,6 @@
 msgid "incorrect 'agrep' specification"
 msgstr " �正確� 'agrep' 指定 "
 
-msgid "incorrect type specification"
-msgstr " �正確�タイプ指定�� "
-
 msgid "could not find package %s"
 msgstr " パッケージ %s を見付�る���出���ん��� "
 
@@ -637,11 +645,19 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr " ミラーを設定�る���� CRAN を使�������� "
 
-msgid "cannot choose a CRAN mirror non-interactively"
-msgstr " CRAN ミラー��択�対話的�������ん "
+#, fuzzy
+msgid "'download.file()' error code '%d'"
+msgstr " ファイル '%s' �対�る read.dcf() エラー "
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
+msgstr ""
+
+msgid "cannot choose a"
+msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
-msgstr " BioC ミラー��択�対話的�������ん "
+#, fuzzy
+msgid "mirror non-interactively"
+msgstr " CRAN ミラー��択�対話的�������ん "
 
 msgid "cannot set repositories non-interactively"
 msgstr " リ�ジトリー�設定�対話的�������ん "
@@ -801,9 +817,6 @@
 msgstr ""
 " %s �対�るメソッド��り��ん����関数����ドキュメントも�り��ん "
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr " 引数 %s (%s) �対�る表��を評価中�エラー "
-
 msgid "no method defined for function %s and signature %s"
 msgstr ""
 " 関数 %s �シグ��ャ� %s ��るも��対��定義�れ�メソッド��り��ん "
@@ -954,6 +967,9 @@
 msgstr ""
 " 'digits' � 'digits.d' �両方�指定�れ����。'digits.d' �使�れ��ん "
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr " %s ��一行も存在���ん "
 
@@ -1088,9 +1104,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr " 'ccaddress' �長� 1 �整数���れ��り��ん "
 
-msgid "no download method found"
-msgstr " ダウンロード�方法�見付�り��ん "
-
 msgid "'url' must be a length-one character vector"
 msgstr " 'url' �長�1�文字ベクトル���れ��り��ん "
 
@@ -1153,6 +1166,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr " パッケージ %s �� 'libs' ディレクトリ��り��ん "
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr " winDialog() �対話的���使用����ん "
 
@@ -1202,6 +1218,11 @@
 msgid_plural "packages %s are not available (%s)"
 msgstr[0] " パッケージ %s �利用����ん (%s) "
 
+#, fuzzy
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] " パッケージ %s �使用中����インストール�れ��ん "
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] " �存対象 (dependency) %s �利用����ん "
@@ -1275,6 +1296,12 @@
 msgid_plural "packages %s are in use and will not be installed"
 msgstr[0] " パッケージ %s �使用中����インストール�れ��ん "
 
+#~ msgid "cannot choose a BioC mirror non-interactively"
+#~ msgstr " BioC ミラー��択�対話的�������ん "
+
+#~ msgid "no download method found"
+#~ msgstr " ダウンロード�方法�見付�り��ん "
+
 #~ msgid ","
 #~ msgstr " , "
 
@@ -1500,9 +1527,6 @@
 #~ msgid "updating HTML package descriptions"
 #~ msgstr " HTML パッケージ記述を更新 "
 
-#~ msgid "read.dcf() error on file '%s'"
-#~ msgstr " ファイル '%s' �対�る read.dcf() エラー "
-
 #~ msgid "Could not find aspell or ispell executable."
 #~ msgstr " 実行�能�aspell���ispell�見��り��ん "
 
diff -Nru r-base-3.2.3/src/library/utils/po/R-ko.po r-base-3.3.1/src/library/utils/po/R-ko.po
--- r-base-3.2.3/src/library/utils/po/R-ko.po	2015-03-31 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-ko.po	2016-04-27 22:15:24.000000000 +0000
@@ -1,23 +1,26 @@
 # Korean translation for R utils package
-# src/library/utils/po/R-ko.po
+# ./utils/po/R-ko.po
 #
-# Copyright (C) 1995-2015 The R Core Team
+# Copyright (C) 1995-2016 The R Core Team
 #
 # This file is distributed under the same license as the R utils package.
-# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2015.
+# Maintained by Chel Hee Lee <chl948@mail.usask.ca>, 2008-2016.
+# Contact: Chel Hee Lee <gnustats@gmail.com>
 #
 # Notes:
+# Under development (unstable) starting from 11-APR-2016 for R-3.3.1 - QC: in progress
+# Freezed on 10-APR-2016 for R-3.3.0 - QC: PASS
 # Freezed on 30-MAR-2015 for R-3.2.0 - QC: PASS
 # Freezed on 06-FEB-2015 for R-3.1.3 - QC: PASS
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R-3.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 20:06\n"
-"PO-Revision-Date: 2015-03-30 14:01-0600\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
+"PO-Revision-Date: 2016-04-11 13:08-0600\n"
 "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
-"Language-Team: Chel Hee Lee  <chl948@mail.usask.ca>\n"
+"Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -281,6 +284,14 @@
 msgid "did not assign() anything"
 msgstr "어떠한 것� assign()하지 않습니다"
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr "�� %s (%s)� 대한 표현�� �가하려는� �러가 발�했습니다"
+
 msgid "Browsing in the environment with call:"
 msgstr ""
 
@@ -446,6 +457,9 @@
 msgid "argument 'help.db' is deprecated"
 msgstr "�수 'help.db'가 누��었습니다"
 
+msgid "incorrect type specification"
+msgstr "유형지정� 잘못�었습니다"
+
 msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 "패키지 %s� 대한 정보가 ��터베�스� 없습니다: 'rebuild = TRUE'가 필요한가"
@@ -454,9 +468,6 @@
 msgid "incorrect 'agrep' specification"
 msgstr "'agrep' 지정� 잘못�었습니다"
 
-msgid "incorrect type specification"
-msgstr "유형지정� 잘못�었습니다"
-
 msgid "could not find package %s"
 msgstr "패키지 %s를 찾� 수 없었습니다"
 
@@ -645,11 +656,17 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr "미러 설정� 하지 않고서는 CRAN� 사용할 수 없습니다"
 
-msgid "cannot choose a CRAN mirror non-interactively"
-msgstr "비대화�으로 CRAN 미러를 선�할 수 없습니다"
+msgid "'download.file()' error code '%d'"
+msgstr ""
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
+msgstr ""
+
+msgid "cannot choose a"
+msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
-msgstr "비대화�으로 BioC 미러를 선�할 수 없습니다"
+msgid "mirror non-interactively"
+msgstr ""
 
 msgid "cannot set repositories non-interactively"
 msgstr "비대화�으로 저장소드� 설정할 수 없습니다"
@@ -798,9 +815,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr "%s� 대한 메소드들� 없으며 함수로서 �와 관련� 문서들� 없습니다"
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr "�� %s (%s)� 대한 표현�� �가하려는� �러가 발�했습니다"
-
 msgid "no method defined for function %s and signature %s"
 msgstr "함수 %s와 signature %s� 정�� 메소드가 없습니다"
 
@@ -948,6 +962,9 @@
 msgstr ""
 "'digits'와 'digits.d' 모� 지정�지 않았기 때문� 후�는 사용�지 않습니다"
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr "%s�서 발견� ��들� 없습니다"
 
@@ -1082,9 +1099,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr "'ccaddress'� 길�는 반드시 1�어야 합니다."
 
-msgid "no download method found"
-msgstr "다운로드 메소드(download method)를 찾� 수 없습니다"
-
 msgid "'url' must be a length-one character vector"
 msgstr "'url'� 반드시 길�가 1� 문�형 벡터�어야 합니다."
 
@@ -1145,6 +1159,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr "패키지 %s내� 'libs'��는 디렉토리가 없습니다"
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr "winDialog()는 �터랙티브하게 사용�어져야 합니다"
 
@@ -1165,8 +1182,7 @@
 
 msgid "A bibentry of bibtype %s has to specify the field: %s"
 msgid_plural "A bibentry of bibtype %s has to specify the fields: %s"
-msgstr[0] ""
-"%1$s��는 종류� 출�물� 다� 항목� 반드시 지정해야 합니다: %2$s"
+msgstr[0] "%1$s��는 종류� 출�물� 다� 항목� 반드시 지정해야 합니다: %2$s"
 
 msgid "class discarded from column %s"
 msgid_plural "classes discarded from columns %s"
@@ -1194,6 +1210,10 @@
 msgid_plural "packages %s are not available (%s)"
 msgstr[0] "패키지 %s(들)� 사용가능하지 않습니다 (그 �유는 %s 입니다)"
 
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] ""
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] "%s(들)� 사용가능하지 않습니다."
@@ -1225,7 +1245,9 @@
 "Do you want to install from sources the package which needs compilation?"
 msgid_plural ""
 "Do you want to install from sources the packages which need compilation?"
-msgstr[0] "컴파�(compilation)� 요구�는 패키지를 소스(source)로부터 바로 설치하기를 �하나요?"
+msgstr[0] ""
+"컴파�(compilation)� 요구�는 패키지를 소스(source)로부터 바로 설치하기를 �"
+"하나요?"
 
 msgid ""
 "Package which is only available in source form, and may need compilation of "
@@ -1234,7 +1256,8 @@
 "Packages which are only available in source form, and may need compilation "
 "of C/C++/Fortran"
 msgstr[0] ""
-"오로지 소스형태로만 제공�는 패키지�므로 C/C++/Fortran으로 작성� 코드들� 대한 컴파�� 필요할 수� 있습니다."
+"오로지 소스형태로만 제공�는 패키지�므로 C/C++/Fortran으로 작성� 코드들� "
+"대한 컴파�� 필요할 수� 있습니다."
 
 msgid "installing the source package %s"
 msgid_plural "installing the source packages %s"
@@ -1242,7 +1265,9 @@
 
 msgid "package %s is available as a source package but not as a binary"
 msgid_plural "packages %s are available as source packages but not as binaries"
-msgstr[0] "패키지 %s(들)� 바�너리(binary)가 아닌 소스(source)� 형태로서 �용할 수 있습니다."
+msgstr[0] ""
+"패키지 %s(들)� 바�너리(binary)가 아닌 소스(source)� 형태로서 �용할 수 있"
+"습니다."
 
 msgid ""
 "There is a binary version available (and will be installed) but the source "
@@ -1266,6 +1291,15 @@
 msgid_plural "packages %s are in use and will not be installed"
 msgstr[0] "패키지 %s가 사용중�므로 설치�지 않� 것입니다"
 
+#~ msgid "cannot choose a CRAN mirror non-interactively"
+#~ msgstr "비대화�으로 CRAN 미러를 선�할 수 없습니다"
+
+#~ msgid "cannot choose a BioC mirror non-interactively"
+#~ msgstr "비대화�으로 BioC 미러를 선�할 수 없습니다"
+
+#~ msgid "no download method found"
+#~ msgstr "다운로드 메소드(download method)를 찾� 수 없습니다"
+
 #~ msgid "function '%s' appears not to be generic"
 #~ msgstr "함수 '%s'는 제네릭처럼 나타나지 않� 것입니다"
 
diff -Nru r-base-3.2.3/src/library/utils/po/R-pl.po r-base-3.3.1/src/library/utils/po/R-pl.po
--- r-base-3.2.3/src/library/utils/po/R-pl.po	2015-03-27 23:15:14.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-pl.po	2016-04-27 22:15:24.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
+"Project-Id-Version: R 3.4.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-04 19:01\n"
 "PO-Revision-Date: \n"
 "Last-Translator: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
 "Language-Team: �ukasz Daniel <lukasz.daniel@gmail.com>\n"
@@ -13,203 +13,327 @@
 "na-Revision-Date: 2012-05-29 07:55+0100\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.7.1\n"
 "X-Poedit-Bookmarks: -1,203,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-msgid ""
-"RShowDoc() should be used with a character string argument specifying\n"
-"   a documentation file"
-msgstr ""
-"'RShowDoc()' powinien być użyty z argumentem tekstowym określającym plik "
-"dokumentacji"
+#. R/example.R: gettextf("%s has a help file but no examples", sQuote(topic))
+#: R/example.R:0
+msgid "%s has a help file but no examples"
+msgstr "%s posiada plik pomocy, ale nie ma przykładów"
 
-msgid "no documentation for %s found in package %s"
-msgstr "nie znaleziono dokumentacji dla %s w pakiecie %s"
+#. R/citation.R: gettextf("%s has to be one of %s", sQuote("bibtype"), paste(BibTeX_names,     collapse = ", "))
+#. R/citation.R: gettextf("%s has to be one of %s", sQuote("bibtype"), paste(BibTeX_names,     collapse = ", "))
+#: R/citation.R:0
+msgid "%s has to be one of %s"
+msgstr "%s musi być jednym z %s"
 
-msgid "document not found"
-msgstr "dokument nie został znaleziony"
+#. R/packages.R: gettextf("%s must be supplied", sQuote("available"))
+#: R/packages.R:0
+msgid "%s must be supplied"
+msgstr "%s musi być dostarczone"
 
-msgid "A search query has been submitted to %s"
-msgstr "Zapytanie zostało przekazane do %s"
+#. R/readhttp.R: gettextf("%s option must be a length one character vector or NULL",     sQuote("HTTPUserAgent"))
+#: R/readhttp.R:0
+msgid "%s option must be a length one character vector or NULL"
+msgstr ""
+"opcja %s musi być wektorem tekstowym o długości jeden lub wartością NULL"
 
-msgid "The results page should open in your browser shortly"
-msgstr "Za moment strona z wynikami powinna otworzyć sie w twojej przeglądarce"
+#. R/citation.R: gettextf("%s should be one of %s", sQuote("style"), paste(dQuote(bibentry_format_styles),     collapse = ", "))
+#: R/citation.R:0
+msgid "%s should be one of %s"
+msgstr "%s powinno być jednym z %s"
 
-msgid "reference to unknown chunk %s"
-msgstr "referencja do nieznanego fragmentu %s"
+#. R/objects.R: gettextf("'%s' is a formal generic function; S3 methods will not likely be found",     fname)
+#: R/objects.R:0
+msgid "'%s' is a formal generic function; S3 methods will not likely be found"
+msgstr ""
+"'%s' jest formalną ogólną funkcją; metody S3 prawdopodobnie nie zostaną "
+"znalezione"
 
-msgid "no Sweave file with name %s found"
-msgstr "nie znaleziono pliku 'Sweave' o nazwie %s"
+#. R/indices.R: warning("'DESCRIPTION' file has an 'Encoding' field and re-encoding is not possible",     call. = FALSE)
+#: R/indices.R:0
+msgid ""
+"'DESCRIPTION' file has an 'Encoding' field and re-encoding is not possible"
+msgstr ""
+"plilk 'DESCRIPTION' posiada pole 'Encoding' i ponowne kodowanie nie jest "
+"możliwe"
 
-msgid "more than one syntax specification found, using the first one"
-msgstr "znaleziono więcej niż jedno określenie składni, używanie pierwszego"
+#. R/combn.R: stop("'FUN' must be a function or NULL")
+#: R/combn.R:0
+msgid "'FUN' must be a function or NULL"
+msgstr "argument 'FUN' musi być funkcją lub wartością NULL"
 
-msgid "object %s does not have class \"SweaveSyntax\""
-msgstr "obiekt %s nie posiada klasy 'SweaveSyntax'"
+#. R/read.DIF.R: gettextf("'as.is' has the wrong length %d  != cols = %d", length(as.is),     cols)
+#. R/readtable.R: gettextf("'as.is' has the wrong length %d  != cols = %d", length(as.is),     cols)
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "'as.is' has the wrong length %d  != cols = %d"
+msgstr "'as.is' posiada niepoprawną długość %d != kolumny = %d"
 
-msgid "recursive Sweave input %s in stack"
-msgstr "rekursywne wejście 'Sweave' %s na stosie"
+#. R/help.start.R: stop("'browser' must be a non-empty character string")
+#: R/help.start.R:0
+msgid "'browser' must be a non-empty character string"
+msgstr "argument 'browser' musi być niepustym łańcuchem tekstowym"
 
-msgid "target syntax not of class %s"
-msgstr "docelowa składnia nie jest klasy %s"
+#. R/unix/create.post.R: stop("'ccaddress' must be of length 1")
+#. R/unix/create.post.R: stop("'ccaddress' must be of length 1")
+#. R/windows/create.post.R: stop("'ccaddress' must be of length 1")
+#: R/unix/create.post.R:0 R/windows/create.post.R:0
+msgid "'ccaddress' must be of length 1"
+msgstr "argument 'ccaddress' musi być długości 1"
 
-msgid "target syntax contains no translation table"
-msgstr "docelowa składnia nie zawiera tablicy tłumaczenia"
+#. R/package.skeleton.R: stop("'code_files' must be a character vector")
+#: R/package.skeleton.R:0
+msgid "'code_files' must be a character vector"
+msgstr "argument 'code_files' musi być wektorem tekstowym"
 
-msgid ""
-"parse error or empty option in\n"
-"%s"
-msgstr "błąd parsowania lub pusta opcja w %s"
+#. R/write.table.R: stop("'col.names = NA' makes no sense when 'row.names = FALSE'")
+#: R/write.table.R:0
+msgid "'col.names = NA' makes no sense when 'row.names = FALSE'"
+msgstr "'col.names = NA' nie ma sensu kiedy 'row.names = FALSE'"
 
-msgid "Warning: unknown option '--clean='%s"
-msgstr "Ostrzeżenie: nieznana opcja '--clean='%s"
+#. R/tar.R: stop("'compressed' must be logical or character")
+#: R/tar.R:0
+msgid "'compressed' must be logical or character"
+msgstr "argument 'compressed' musi być wartością logiczną lub znakiem"
 
-msgid "Warning: unknown option %s"
-msgstr "Ostrzeżenie: nieznana opcja %s"
+#. R/packages.R: stop("'destdir' is not a directory")
+#: R/packages.R:0
+msgid "'destdir' is not a directory"
+msgstr "wartość 'destdir' nie jest katalogiem"
 
-msgid "Output file:"
-msgstr "Plik wyjściowy:"
+#. R/unix/download.file.R: stop("'destfile' must be a length-one character vector")
+#. R/unix/download.file.R: stop("'destfile' must be a length-one character vector")
+#. R/windows/download.file.R: stop("'destfile' must be a length-one character vector")
+#. R/windows/download.file.R: stop("'destfile' must be a length-one character vector")
+#: R/unix/download.file.R:0 R/windows/download.file.R:0
+msgid "'destfile' must be a length-one character vector"
+msgstr "argument 'destfile' musi wektorem tekstowym o długości 1"
 
-msgid "Compacting PDF document"
-msgstr "Kompaktowanie dokumentu PDF"
+#. R/str.R: warning("'digits' and 'digits.d' are both specified and the latter is not used")
+#: R/str.R:0
+msgid "'digits' and 'digits.d' are both specified and the latter is not used"
+msgstr ""
+"obydwa 'digits' oraz 'digits.d' są zdefiniowane i ostatni nie jest używany"
 
-msgid "path to %s contains spaces,"
-msgstr "ścieżka do %s zawiera spacje,"
+#. R/packages.R: gettextf("'download.file()' error code '%d'", m)
+#: R/packages.R:0
+msgid "'download.file()' error code '%d'"
+msgstr "kod błędu '%d' w funkcji 'download.file()'"
 
-msgid "this may cause problems when running LaTeX"
-msgstr "to może spowodować problemy podczas uruchamiania LaTeX'a"
+#. R/debugger.R: gettextf("'dump' is empty\n")
+#: R/debugger.R:0
+msgid "'dump' is empty"
+msgstr "'dump' jest puste"
 
-msgid "the output file '%s' has disappeared"
-msgstr "plik wyjściowy '%s' zniknął"
+#. R/debugger.R: gettextf("'dump' is not an object of class %s\n", dQuote("dump.frames"))
+#: R/debugger.R:0
+msgid "'dump' is not an object of class %s"
+msgstr "argument 'dump' nie jest obiektem klasy %s"
 
-msgid "invalid value for %s : %s"
-msgstr "niepoprawna wartość dla %s: %s"
+#. R/packages2.R: stop("'env' must be an environment")
+#: R/packages2.R:0
+msgid "'env' must be an environment"
+msgstr "argument 'env' musi być środowiskiem"
 
-msgid "value of 'results' option should be lowercase"
-msgstr "wartość opcji 'results' powinna być pisana małymi literami"
+#. R/progressBar.R: stop("'file' must be \"\" or an open connection object")
+#: R/progressBar.R:0
+msgid "'file' must be \"\" or an open connection object"
+msgstr "argument 'file' musi być \"\" lub obiektem otwartego połączenia"
 
-msgid "value of 'strip.white' option should be lowercase"
-msgstr "wartość opcji 'strip.white' powinna być pisana małymi literami"
+#. R/capture.output.R: stop("'file' must be NULL, a character string or a connection")
+#: R/capture.output.R:0
+msgid "'file' must be NULL, a character string or a connection"
+msgstr ""
+"argument 'file' musi być wartością NULL, łańcuchem tekstowym lub połączeniem"
 
-msgid "elements of 'what' after the first will be ignored"
-msgstr "elementy 'what' po pierwszym będą zignorowane"
+#. R/readtable.R: stop("'file' must be a character string or connection")
+#. R/readtable.R: stop("'file' must be a character string or connection")
+#. R/write.table.R: stop("'file' must be a character string or connection")
+#: R/readtable.R:0 R/write.table.R:0
+msgid "'file' must be a character string or connection"
+msgstr ""
+"argument 'file' musi być wartością NULL, łańcuchem tekstowym lub połączeniem"
 
-msgid "No suitable spell-checker program found"
-msgstr "Nie znaleziono odpowiedniego programu do sprawdzania pisowni"
+#. R/zip.R: stop("'files' must a character vector specifying one or more filepaths")
+#: R/zip.R:0
+msgid "'files' must a character vector specifying one or more filepaths"
+msgstr ""
+"argument 'files' musi być wektorem tekstowym określającym jedną lub więcej "
+"ścieżek do plików"
 
-msgid "Filter '%s' is not available."
-msgstr "Filtr '%s' nie jest dostępny."
+#. R/fix.R: stop("'fix' requires a name")
+#: R/fix.R:0
+msgid "'fix' requires a name"
+msgstr "funkcja 'fix()' wymaga nazwy"
 
-msgid "Invalid 'filter' argument."
-msgstr "niepoprawny argument 'filter'"
+#. R/objects.R: stop("'fixInNamespace' requires a name")
+#: R/objects.R:0
+msgid "'fixInNamespace' requires a name"
+msgstr "funkcja 'fixInNamespace' wymaga nazwy"
 
-msgid ""
-"The following dictionaries were not found:\n"
-"%s"
-msgstr ""
-"Następujące słowniki nie zostały znalezione:\n"
-"%s"
+#. R/frametools.R: stop("'form' must be a two-sided formula")
+#: R/frametools.R:0
+msgid "'form' must be a two-sided formula"
+msgstr "'form' musi być dwustronną formułą"
 
-msgid "Processing file %s"
-msgstr "Przetwarzanie pliku %s"
+#. R/frametools.R: stop("'form' must be a two-sided formula with one term on each side")
+#: R/frametools.R:0
+msgid "'form' must be a two-sided formula with one term on each side"
+msgstr "'form' musi być dwustronną formułą z jednym członej po każdej stronie"
 
-msgid ""
-"Running aspell failed with diagnostics:\n"
-"%s"
-msgstr ""
-"Uruchomienie 'aspell' nie powiodło się z przyczyn:\n"
-"%s"
+#. R/changedFiles.R: stop("'full.names' must be TRUE for multiple paths.")
+#: R/changedFiles.R:0
+msgid "'full.names' must be TRUE for multiple paths."
+msgstr "argument 'full.names' musi mieć wartość TRUE dla wielu ścieżek."
 
-msgid "No suitable spell check program found."
-msgstr "Nie znaleziono odpowiedniego programu do sprawdzania pisowni."
+#. R/sock.R: stop("'host' must be character of length 1")
+#: R/sock.R:0
+msgid "'host' must be character of length 1"
+msgstr "argument 'host' musi być tekstem o długości 1"
 
-msgid ""
-"Use <code> %s </code> \n"
-" to list the vignettes in all <strong>available</strong> packages."
-msgstr ""
-"Użycie <code> %s </code> \n"
-" aby wylistować ilustracje we wszystkich <strong>dostępnych</strong> "
-"pakietach."
+#. R/packages2.R: gettextf("'lib = \"%s\"' is not writable", lib)
+#: R/packages2.R:0
+msgid "'lib = \"%s\"' is not writable"
+msgstr "'lib = \"%s\"' nie jest zapisywalna"
 
-msgid "No vignettes found by %s"
-msgstr "Nie znaleziono ilustracji poprzez %s"
+#. R/package.skeleton.R: stop("'list' must be a character vector naming R objects")
+#: R/package.skeleton.R:0
+msgid "'list' must be a character vector naming R objects"
+msgstr "argument 'list' musi być wektorem tekstowym nazywającym obiekty R"
 
-msgid "Package %s: DESCRIPTION file not found"
-msgstr "Pakiet %s: nie znaleziono pliku DESCRIPTION"
+#. R/unix/sysutils.R: warning("'memory.limit()' is Windows-specific", call. = FALSE)
+#: R/unix/sysutils.R:0
+msgid "'memory.limit()' is Windows-specific"
+msgstr "funkcja 'memory.limit()' jest specyficzna dla systemów Windows"
 
-msgid "'file' must be NULL, a character string or a connection"
-msgstr ""
-"argument 'file' musi być wartością NULL, łańcuchem tekstowym lub połączeniem"
+#. R/unix/sysutils.R: warning("'memory.size()' is Windows-specific", call. = FALSE)
+#: R/unix/sysutils.R:0
+msgid "'memory.size()' is Windows-specific"
+msgstr "funkcja 'memory.size()' jest specyficzna dla systemów Windows"
 
-msgid "bad argument"
-msgstr "niepoprawny argument"
+#. R/de.R: warning("'modes' argument ignored")
+#. R/de.R: warning("'modes' argument ignored")
+#: R/de.R:0
+msgid "'modes' argument ignored"
+msgstr "argument 'modes' został zignorowany"
 
-msgid "'full.names' must be TRUE for multiple paths."
-msgstr "argument 'full.names' musi mieć wartość TRUE dla wielu ścieżek."
+#. R/de.R: warning("'names' argument ignored")
+#: R/de.R:0
+msgid "'names' argument ignored"
+msgstr "argument 'names' został zignorowany"
 
-msgid "Timestamp file no longer exists."
-msgstr "Plik sygnatury czasu już nie istnieje."
+#. R/str.R: warning("'object' does not have valid levels()")
+#: R/str.R:0
+msgid "'object' does not have valid levels()"
+msgstr "'object' nie posiada poprawnych wartości 'levels()'"
 
-msgid ""
-"Not all arguments are of the same length, the following need to be recycled: "
-"%s"
-msgstr ""
-"Nie wszystkie argumenty są tej samej długości, te argumenty muszą zostać "
-"powtórzone cyklicznie: %s"
+#. R/data.R: stop("'package' must be a character string or NULL")
+#: R/data.R:0
+msgid "'package' must be a character string or NULL"
+msgstr "argument 'package' musi być łańcuchem tekstowym lub wartością NULL"
 
-msgid "Use either %s or %s/%s but not both."
-msgstr "Użyj albo %s albo %s/%s ale nie obu"
+#. R/progressBar.R: gettextf("'pb' is not from class %s", dQuote("txtProgressBar"))
+#. R/progressBar.R: gettextf("'pb' is not from class %s", dQuote("txtProgressBar"))
+#. R/windows/winDialog.R: gettextf("'pb' is not from class %s", dQuote("winProgressBar"))
+#. R/windows/winDialog.R: gettextf("'pb' is not from class %s", dQuote("winProgressBar"))
+#: R/progressBar.R:0 R/windows/winDialog.R:0
+msgid "'pb' is not from class %s"
+msgstr "'pb' nie pochodzi z klasy %s"
 
-msgid "It is recommended to use %s instead of %s."
-msgstr "Zalecane jest użycie %s zamiast %s"
+#. R/sock.R: stop("'port' must be integer of length 1")
+#: R/sock.R:0
+msgid "'port' must be integer of length 1"
+msgstr "argument 'port' musi być liczbą całkowitą o długości 1"
 
-msgid "Use either %s or %s but not both."
-msgstr "Użyj albo %s albo %s ale nie obu"
+#. R/packages.R: stop("'priority' must be character or NULL")
+#: R/packages.R:0
+msgid "'priority' must be character or NULL"
+msgstr "argument 'priority' musi być tekstem lub wartością NULL"
 
-msgid "It is recommended to use %s/%s instead of %s/%s/%s."
-msgstr "Zalecane jest użycie %s/%s zamiast %s/%s/%s"
+#. R/write.table.R: stop("'quote' must be 'TRUE', 'FALSE' or numeric")
+#: R/write.table.R:0
+msgid "'quote' must be 'TRUE', 'FALSE' or numeric"
+msgstr "argument 'quote' musi mieć wartość TRUE, FALSE lub musi być liczbą"
 
-msgid "method is only applicable to %s objects"
-msgstr "metoda jest stosowalna jedynie do obiektów %s"
+#. R/str.R: warning("'str.default': 'le' is NA, so taken as 0", immediate. = TRUE)
+#: R/str.R:0
+msgid "'str.default': 'le' is NA, so taken as 0"
+msgstr ""
+"'str.default': argument 'le' ma wartość NA, w związku z tym została przyjęta "
+"wartość 0"
 
-msgid "all arguments must be of class %s"
-msgstr "wszystkie argumenty muszą być klasy %s"
+#. R/unix/create.post.R: stop("'subject' is missing")
+#: R/unix/create.post.R:0
+msgid "'subject' is missing"
+msgstr "brakuje 'subject'"
 
-msgid "all fields have to be named"
-msgstr "wszystkie pola muszą być nazwane"
+#. R/unix/mac.install.R: gettextf("'tar' returned non-zero exit code %d", xcode)
+#: R/unix/mac.install.R:0
+msgid "'tar' returned non-zero exit code %d"
+msgstr "funkcja 'tar' zwróciła niezerowy kod %d wyjścia"
 
-msgid "%s has to be one of %s"
-msgstr "%s musi być jednym z %s"
+#. R/tar.R: stop("'tarfile' must be a character string or a connection")
+#. R/tar.R: stop("'tarfile' must be a character string or a connection")
+#: R/tar.R:0
+msgid "'tarfile' must be a character string or a connection"
+msgstr "argument 'tarfile' musi być łańcuchem tekstowym lub połączeniem"
 
-msgid "subscript out of bounds"
-msgstr "indeks poza granicami"
+#. R/widgets.R: stop("'title' must be NULL or a length-1 character vector")
+#: R/widgets.R:0
+msgid "'title' must be NULL or a length-1 character vector"
+msgstr ""
+"argument 'title' musi być wartością NULL lub wektorem tekstowym o długości 1"
 
-msgid "%s should be one of %s"
-msgstr "%s powinno być jednym z %s"
+#. R/help.R: stop("'topic' should be a name, length-one character vector or reserved word")
+#: R/help.R:0
+msgid "'topic' should be a name, length-one character vector or reserved word"
+msgstr ""
+"'topic' powinien być nazwą, wektorem tekstowym o długości jeden albo "
+"zarezerwowanym słowem"
 
-msgid "A BibTeX entry for LaTeX users is"
-msgstr "Wpis BibTex dla użytkowników LaTeX to"
+#. R/zip.R: stop("'unzip' must be a single character string")
+#: R/zip.R:0
+msgid "'unzip' must be a single character string"
+msgstr "argument 'unzip' musi być pojedynczym łańcuchem tekstowym"
 
-msgid ""
-"Dropping invalid entry %d:\n"
-"%s"
-msgstr ""
-"Usuwanie niepoprawnego wpisu %d:\n"
-"%s"
+#. R/unix/download.file.R: stop("'url' must be a length-one character vector")
+#. R/unix/download.file.R: stop("'url' must be a length-one character vector")
+#. R/unix/download.file.R: stop("'url' must be a length-one character vector")
+#. R/windows/download.file.R: stop("'url' must be a length-one character vector")
+#. R/windows/download.file.R: stop("'url' must be a length-one character vector")
+#. R/windows/download.file.R: stop("'url' must be a length-one character vector")
+#: R/unix/download.file.R:0 R/windows/download.file.R:0
+msgid "'url' must be a length-one character vector"
+msgstr "argument 'url' musi być wektorem tekstowym o długości 1"
 
-msgid "package %s not found"
-msgstr "pakiet %s nie został znaleziony"
+#. R/help.start.R: stop("'url' must be a non-empty character string")
+#: R/help.start.R:0
+msgid "'url' must be a non-empty character string"
+msgstr "argument 'url' musi być niepustym łańcuchem tekstowym"
 
-msgid "no date field in DESCRIPTION file of package %s"
-msgstr "brak pola daty w pliku DESCRIPTION pakietu %s"
+#. R/packages.R: gettext("--- Please select a CRAN mirror for use in this session ---")
+#: R/packages.R:0
+msgid "--- Please select a CRAN mirror for use in this session ---"
+msgstr "--- Proszę wybrać serwer lustrzany CRAN do użycia w tej sesji ---"
 
-msgid "could not determine year for %s from package DESCRIPTION file"
-msgstr "nie można było określić roku dla %s z pliku DESCRIPTION pakietu"
+#. R/packages.R: gettext("--- Please select repositories for use in this session ---\n")
+#: R/packages.R:0
+msgid "--- Please select repositories for use in this session ---"
+msgstr "--- Proszę wybrać repozytoria do użycia w tej sesji ---"
 
-msgid "To cite package %s in publications use:"
-msgstr "Aby zacytować pakiet %s w publikacjach użyj:"
+#. R/citation.R: gettext("\nA BibTeX entry for LaTeX users is\n")
+#: R/citation.R:0
+msgid "A BibTeX entry for LaTeX users is"
+msgstr "Wpis BibTex dla użytkowników LaTeX to"
+
+#. R/RSiteSearch.R: gettextf("A search query has been submitted to %s", "http://search.r-project.org")
+#: R/RSiteSearch.R:0
+msgid "A search query has been submitted to %s"
+msgstr "Zapytanie zostało przekazane do %s"
 
+#. R/citation.R: gettextf("ATTENTION: This citation information has been auto-generated from the package DESCRIPTION file and may need manual editing, see %s.",     sQuote("help(\"citation\")"))
+#: R/citation.R:0
 msgid ""
 "ATTENTION: This citation information has been auto-generated from the "
 "package DESCRIPTION file and may need manual editing, see %s."
@@ -217,524 +341,890 @@
 "UWAGA: Informacja o cytowaniu została automatycznie wygenerowana z pliku "
 "DESCRIPTION pakietu i może wymagać ręcznej edycji, sobacz %s."
 
-msgid "'FUN' must be a function or NULL"
-msgstr "argument 'FUN' musi być funkcją lub wartością NULL"
-
-msgid "cannot handle S4 methods yet"
-msgstr "jeszcze nie można obsłużyć metod S4"
-
-msgid "'package' must be a character string or NULL"
-msgstr "argument 'package' musi być łańcuchem tekstowym lub wartością NULL"
+#. R/debugger.R: gettext("Available environments had calls:\n")
+#: R/debugger.R:0
+msgid "Available environments had calls:"
+msgstr "Dostępne środowiska miały wywołania:"
 
-msgid "datasets have been moved from package 'base' to package 'datasets'"
-msgstr ""
-"zbiory danych zostały przeniesione z pakietu 'base' do pakietu 'datasets'"
+#. R/debugger.R: gettext("Browsing in the environment with call:\n   ")
+#: R/debugger.R:0
+msgid "Browsing in the environment with call:"
+msgstr "Przeglądanie w środowisku z wywołaniem:"
 
-msgid "datasets have been moved from package 'stats' to package 'datasets'"
+#. R/debugcall.R: stop("Cannot debug primitive functions unless they are implicit generics (requires loading the methods package)")
+#: R/debugcall.R:0
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
 msgstr ""
-"zbiory danych zostały przeniesione z pakietu 'stats' do pakietu 'datasets'"
-
-msgid "data index for package %s is invalid and will be ignored"
-msgstr "indeks danych dla pakietu %s jest niepoprawny i zostanie zignorowany"
-
-msgid "file 'filelist' is missing for directory %s"
-msgstr "brakuje pliku 'filelist' w katalogu %s"
-
-msgid "data set %s not found"
-msgstr "zbiór danych %s nie został znaleziony"
+"Nie można debugować funkcji prymitywnych o ile nie są one jawnymi funkcjami "
+"ogólnymi (wymaga załadowania pakietu 'methods')"
 
-msgid "only 'html = TRUE' is supported on this platform"
-msgstr "jedynie 'html = TRUE' jest wspierane na tej platformie"
+#. R/help.R: gettext("Choose one")
+#: R/help.R:0
+msgid "Choose one"
+msgstr "Wybierz jeden"
 
-msgid "kind '%s' not yet implemented"
-msgstr "rodzaj '%s' nie został jeszcze zaimplementowany"
+#. R/Sweave.R: message("Compacting PDF document")
+#: R/Sweave.R:0
+msgid "Compacting PDF document"
+msgstr "Kompaktowanie dokumentu PDF"
 
-msgid "wrong number of table row entries"
-msgstr "błędna liczba wpisów w wierszach tabeli"
+#. R/rtags.R: gettextf("Could not create file %s, aborting", ofile)
+#: R/rtags.R:0
+msgid "Could not create file %s, aborting"
+msgstr "Nie można było utworzyć pliku %s, przerywanie"
 
-msgid "wrong argument to 'dataentry'"
-msgstr "niepoprawny argument przekazany do 'dataentry'"
+#. R/prompt.R: gettextf("Created file named %s.", sQuote(filename))
+#. R/prompt.R: gettextf("Created file named %s.", sQuote(filename))
+#. R/prompt.R: gettextf("Created file named %s.", sQuote(filename))
+#. R/prompt.R: gettextf("Created file named %s.", sQuote(filename))
+#: R/prompt.R:0
+msgid "Created file named %s."
+msgstr "Utworzono plik o nazwie %s."
 
-msgid "could not restore type information"
-msgstr "nie można przywrócić informacji o typie"
+#. R/indices.R: gettextf("DESCRIPTION file of package '%s' is corrupt", pkg)
+#: R/indices.R:0
+msgid "DESCRIPTION file of package '%s' is corrupt"
+msgstr "plik DESCRIPTION pakietu '%s' jest uszkodzony"
 
-msgid "'modes' argument ignored"
-msgstr "argument 'modes' został zignorowany"
+#. R/indices.R: gettextf("DESCRIPTION file of package '%s' is missing or broken",     pkg)
+#: R/indices.R:0
+msgid "DESCRIPTION file of package '%s' is missing or broken"
+msgstr "brakuje pliku DESCRIPTION pakietu '%s' lub jest on uszkodzony"
 
-msgid "'names' argument ignored"
-msgstr "argument 'names' został zignorowany"
+#. R/demo.R: gettextf("Demo for topic %s' found more than once,\nusing the one found in %s",     sQuote(topic), sQuote(dirname(available[1L])))
+#: R/demo.R:0
+msgid ""
+"Demo for topic %s' found more than once,\n"
+"using the one found in %s"
+msgstr ""
+"Demo dla tematu %s' zostało znalezione więcej niż raz,\n"
+"używanie tego znalezionego w %s"
 
-msgid "could not restore variables properly"
-msgstr "nie można było poprawnie przywrócić zmiennych"
+#. R/packages2.R: warning("Do not know which element of 'lib' to install dependencies into\nskipping dependencies")
+#: R/packages2.R:0
+msgid ""
+"Do not know which element of 'lib' to install dependencies into\n"
+"skipping dependencies"
+msgstr ""
+"Nie wiadomo, do którego elementu 'lib' zainstalować zależności\n"
+"pomijanie zależności"
 
-msgid "did not assign() anything"
-msgstr "nic nie przypisano"
+#. R/packages2.R: message("Do you want to attempt to install these from sources?")
+#: R/packages2.R:0
+msgid "Do you want to attempt to install these from sources?"
+msgstr "Czy chcesz spróbować zainstalować je ze źródeł?"
 
-msgid "Browsing in the environment with call:"
-msgstr "Przeglądanie w środowisku z wywołaniem:"
+#. R/citation.R: gettextf("Dropping invalid entry %d:\n%s", pc[b], conditionMessage(status[[b]]))
+#: R/citation.R:0
+msgid ""
+"Dropping invalid entry %d:\n"
+"%s"
+msgstr ""
+"Usuwanie niepoprawnego wpisu %d:\n"
+"%s"
 
-msgid "'dump' is not an object of class %s"
-msgstr "argument 'dump' nie jest obiektem klasy %s"
+#. R/unix/mac.install.R: gettextf("ERROR: failed to create lock directory %s", sQuote(lockdir))
+#. R/windows/install.packages.R: gettextf("ERROR: failed to create lock directory %s", sQuote(lockdir))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid "ERROR: failed to create lock directory %s"
+msgstr "B�ĄD: nie udało się utworzyć blokady katalogu %s"
 
-msgid "Message:"
-msgstr "Wiadomość:"
+#. R/unix/mac.install.R: gettextf("ERROR: failed to lock directory %s for modifying\nTry removing %s",     sQuote(lib), sQuote(lockdir))
+#. R/windows/install.packages.R: gettextf("ERROR: failed to lock directory %s for modifying\nTry removing %s",     sQuote(lib), sQuote(lockdir))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid ""
+"ERROR: failed to lock directory %s for modifying\n"
+"Try removing %s"
+msgstr ""
+"B�ĄD: nie udało się zablokować katalogu %s do modyfikacji\n"
+"Spróbuj usunąć %s"
 
-msgid "'dump' is empty"
-msgstr "'dump' jest puste"
+#. R/prompt.R: gettext("Edit the file and move it to the appropriate directory.")
+#. R/prompt.R: gettext("Edit the file and move it to the appropriate directory.")
+#. R/prompt.R: gettext("Edit the file and move it to the appropriate directory.")
+#. R/prompt.R: gettext("Edit the file and move it to the appropriate directory.")
+#: R/prompt.R:0
+msgid "Edit the file and move it to the appropriate directory."
+msgstr "Edytuj ten plik i przenieÅ› go do odpowiedniego katalogu."
 
-msgid "Available environments had calls:"
-msgstr "Dostępne środowiska miały wywołania:"
+#. R/relist.R: stop("The 'flesh' argument does not contain a skeleton attribute.\n",     "Either ensure you unlist a relistable object, or specify the skeleton separately.")
+#: R/relist.R:0
+msgid ""
+"Either ensure you unlist a relistable object, or specify the skeleton "
+"separately."
+msgstr ""
+"Albo upewnij się, że odłączyłeś od listy wylistowany obiekt, albo określ "
+"strukturÄ™ oddzielnie."
 
+#. R/debugger.R: gettext("\nEnter an environment number, or 0 to exit  ")
+#: R/debugger.R:0
 msgid "Enter an environment number, or 0 to exit"
 msgstr "Wpisz numer środowiska, lub 0 aby wyjść"
 
-msgid "recover called non-interactively; frames dumped, use debugger() to view"
-msgstr ""
-"przywrócenie wywołano nieinteraktywnie; ramki odrzucono, użyj 'debugger()' "
-"aby przeglądać"
-
-msgid "No suitable frames for recover()"
-msgstr "Brak odpowiednik ramek dla 'recover()'"
-
-msgid "No demo found for topic %s"
-msgstr "Nie znaleziono dema dla tematu %s"
+#. R/menu.R: gettext("Enter an item from the menu, or 0 to exit\n")
+#: R/menu.R:0
+msgid "Enter an item from the menu, or 0 to exit"
+msgstr "Wprowadź pozycję z menu lub 0 aby wyjść"
 
+#. R/widgets.R: gettext("Enter one or more numbers separated by spaces, or an empty line to cancel\n")
+#: R/widgets.R:0
 msgid ""
-"Demo for topic %s' found more than once,\n"
-"using the one found in %s"
+"Enter one or more numbers separated by spaces, or an empty line to cancel"
 msgstr ""
-"Demo dla tematu %s' zostało znalezione więcej niż raz,\n"
-"używanie tego znalezionego w %s"
-
-msgid "invalid 'data' argument"
-msgstr "niepoprawny argument 'data'"
-
-msgid "invalid 'modes' argument"
-msgstr "niepoprawny argument 'modes'"
+"Wprowadź jedną lub więcej liczb oddzielonych spacją, lub pustą linię aby "
+"anulować"
 
-msgid "invalid 'x' argument"
-msgstr "niepoprawny argument 'x'"
+#. R/aspell.R: gettextf("Filter '%s' is not available.", filter_name)
+#. R/aspell.R: gettextf("Filter '%s' is not available.", filter_name)
+#: R/aspell.R:0
+msgid "Filter '%s' is not available."
+msgstr "Filtr '%s' nie jest dostępny."
 
-msgid "can only handle vector and factor elements"
-msgstr "można obsłużyć jedynie elementy wektora oraz czynnika"
+#. R/help.R: warning("HTML help is unavailable", call. = FALSE)
+#: R/help.R:0
+msgid "HTML help is unavailable"
+msgstr "Pomoc HTML jest niedostępna"
 
-msgid "invalid factor levels in '%s'"
-msgstr "niepoprawne poziomy czynnika w '%s'"
+#. R/help.R: gettextf("Help for topic %s is not in any loaded package but can be found in the following packages:",     sQuote(topic))
+#: R/help.R:0
+msgid ""
+"Help for topic %s is not in any loaded package but can be found in the "
+"following packages:"
+msgstr ""
+"Pomocy dla tematu %s nie ma w żadnym załadowanym pakiecie ale może zostać "
+"znaleziona w następujących pakietach:"
 
-msgid "added factor levels in '%s'"
-msgstr "dodane poziomy czynnika w '%s'"
+#. R/help.R: gettextf("Help on topic %s was found in the following packages:",     sQuote(topic))
+#: R/help.R:0
+msgid "Help on topic %s was found in the following packages:"
+msgstr "Pomoc na temat %s została znaleziona w następujących pakietach:"
 
-msgid "edited row names contain duplicates and will be ignored"
+#. R/help.start.R: gettextf("If nothing happens, you should open\n%s yourself\n",     sQuote(url))
+#: R/help.start.R:0
+msgid ""
+"If nothing happens, you should open\n"
+"%s yourself"
 msgstr ""
-"przeedytowane nazwy wierszy zawierają powtórzenia i zostaną zignorowane"
+"Jeśli nic się nie stanie, powinieneś otworzyć\n"
+"%s samemu"
 
-msgid "invalid input matrix"
-msgstr "niepoprawna macierz wejściowa"
+#. R/help.start.R: gettextf("If the browser launched by '%s' is already running, it is *not* restarted, and you must switch to its window.",     browser)
+#: R/help.start.R:0
+msgid ""
+"If the browser launched by '%s' is already running, it is *not* restarted, "
+"and you must switch to its window."
+msgstr ""
+"Jeśli przeglądarka uruchomiona przez '%s' już działa, *nie* zostanie "
+"zrestartowana, a ty musisz przejść na jej okno."
 
-msgid "class of 'name' will be discarded"
-msgstr "klasa 'name' zostanie odrzucone"
+#. R/aspell.R: stop("Invalid 'filter' argument.")
+#: R/aspell.R:0
+msgid "Invalid 'filter' argument."
+msgstr "niepoprawny argument 'filter'"
 
-msgid "cannot edit NULL row names"
-msgstr "nie można edytować nazw wierszy o wartości NULL"
+#. R/widgets.R: gettext("Invalid input, please try again\n")
+#: R/widgets.R:0
+msgid "Invalid input, please try again"
+msgstr "Niepoprawne wejście, proszę spróbować ponownie"
 
-msgid "no help found for %s"
-msgstr "nie znaleziono pomocy dla %s"
+#. R/citation.R: gettextf("It is recommended to use %s instead of %s.", sQuote("given"),     sQuote("first"))
+#. R/citation.R: gettextf("It is recommended to use %s instead of %s.", sQuote("given"),     sQuote("middle"))
+#. R/citation.R: gettextf("It is recommended to use %s instead of %s.", sQuote("family"),     sQuote("last"))
+#: R/citation.R:0
+msgid "It is recommended to use %s instead of %s."
+msgstr "Zalecane jest użycie %s zamiast %s"
 
-msgid "%s has a help file but no examples"
-msgstr "%s posiada plik pomocy, ale nie ma przykładów"
+#. R/citation.R: gettextf("It is recommended to use %s/%s instead of %s/%s/%s.",     sQuote("given"), sQuote("family"), sQuote("first"), sQuote("middle"),     sQuote("last"))
+#: R/citation.R:0
+msgid "It is recommended to use %s/%s instead of %s/%s/%s."
+msgstr "Zalecane jest użycie %s/%s zamiast %s/%s/%s"
 
+#. R/help.R: gettext("Library")
+#: R/help.R:0
+msgid "Library"
+msgstr "Biblioteka"
+
+#. R/findLineNum.R: stop("Line number missing")
+#: R/findLineNum.R:0
 msgid "Line number missing"
 msgstr "Brakuje numeru linii"
 
-msgid "'fix' requires a name"
-msgstr "funkcja 'fix()' wymaga nazwy"
-
-msgid "too many list items (at most up to %d)"
-msgstr "zbyt dużo pozycji listy (co najwyżej do %d)"
+#. R/debugger.R: gettext("Message: ")
+#: R/debugger.R:0
+msgid "Message:"
+msgstr "Wiadomość:"
 
-msgid "no vector columns were selected"
-msgstr "nie wybrano żadnej kolumny wektora"
+#. R/read.DIF.R: stop("More columns than specified in header; maybe use 'transpose=TRUE'")
+#: R/read.DIF.R:0
+msgid "More columns than specified in header; maybe use 'transpose=TRUE'"
+msgstr "Więcej kolumn niż określono w nagłówku; może użyj 'transpose=TRUE'"
 
-msgid "non-vector columns will be ignored"
-msgstr "niewektorowe kolumny będą zignorowane"
+#. R/read.DIF.R: stop("More rows than specified in header; maybe use 'transpose=TRUE'")
+#: R/read.DIF.R:0
+msgid "More rows than specified in header; maybe use 'transpose=TRUE'"
+msgstr "Więcej wierszy niż określono w nagłówku; może użyj 'transpose=TRUE'"
 
-msgid "at least one vector element is required"
-msgstr "przynajmnej jeden element wektora jest wymagany"
+#. R/read.DIF.R: stop("No DIF data on clipboard")
+#: R/read.DIF.R:0
+msgid "No DIF data on clipboard"
+msgstr "Brak danych DIF w schowku"
 
-msgid "non-vector elements will be ignored"
-msgstr "elementy nie-wektora zostanÄ… zignorowane"
+#. R/demo.R: gettextf("No demo found for topic %s", sQuote(topic))
+#: R/demo.R:0
+msgid "No demo found for topic %s"
+msgstr "Nie znaleziono dema dla tematu %s"
 
-msgid "'form' must be a two-sided formula"
-msgstr "'form' musi być dwustronną formułą"
+#. R/help.R: gettextf("No documentation for %s in specified packages and libraries:",     sQuote(topic))
+#: R/help.R:0
+msgid "No documentation for %s in specified packages and libraries:"
+msgstr "Brak dokumentacji dla %s we wskazanych pakietach oraz bibliotekach:"
 
-msgid "'form' must be a two-sided formula with one term on each side"
-msgstr "'form' musi być dwustronną formułą z jednym członej po każdej stronie"
+#. R/debugger.R: gettext("No suitable frames for recover()\n")
+#: R/debugger.R:0
+msgid "No suitable frames for recover()"
+msgstr "Brak odpowiednik ramek dla 'recover()'"
 
-msgid "'topic' should be a name, length-one character vector or reserved word"
-msgstr ""
-"'topic' powinien być nazwą, wektorem tekstowym o długości jeden albo "
-"zarezerwowanym słowem"
+#. R/aspell.R: stop("No suitable spell check program found.")
+#: R/aspell.R:0
+msgid "No suitable spell check program found."
+msgstr "Nie znaleziono odpowiedniego programu do sprawdzania pisowni."
 
-msgid "No documentation for %s in specified packages and libraries:"
-msgstr "Brak dokumentacji dla %s we wskazanych pakietach oraz bibliotekach:"
+#. R/aspell.R: stop("No suitable spell-checker program found")
+#: R/aspell.R:0
+msgid "No suitable spell-checker program found"
+msgstr "Nie znaleziono odpowiedniego programu do sprawdzania pisowni"
 
-msgid "you could try %s"
-msgstr "mógłbyś spróbować %s"
+#. R/browseVignettes.R: gettextf("No vignettes found by %s", paste(deparse(attr(x, "call")),     collapse = " "))
+#: R/browseVignettes.R:0
+msgid "No vignettes found by %s"
+msgstr "Nie znaleziono ilustracji poprzez %s"
 
+#. R/citation.R: gettextf("Not all arguments are of the same length, the following need to be recycled: %s",     paste(names(args)[!args_length_ok], collapse = ", "))
+#. R/citation.R: gettextf("Not all arguments are of the same length, the following need to be recycled: %s",     paste(names(args)[!args_length_ok], collapse = ", "))
+#. R/citation.R: gettextf("Not all arguments are of the same length, the following need to be recycled: %s",     paste(names(other)[!other_length_ok], collapse = ", "))
+#: R/citation.R:0
 msgid ""
-"Help for topic %s is not in any loaded package but can be found in the "
-"following packages:"
+"Not all arguments are of the same length, the following need to be recycled: "
+"%s"
 msgstr ""
-"Pomocy dla tematu %s nie ma w żadnym załadowanym pakiecie ale może zostać "
-"znaleziona w następujących pakietach:"
+"Nie wszystkie argumenty są tej samej długości, te argumenty muszą zostać "
+"powtórzone cyklicznie: %s"
 
-msgid "Package"
-msgstr "Pakiet"
+#. R/windows/install.packages.R: stop("Only '*.zip' and '*.tar.gz' files can be installed.")
+#: R/windows/install.packages.R:0
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr "Tylko pliki '*.zip' oraz '*.tar.gz' mogą być zainstalowane."
 
-msgid "Library"
-msgstr "Biblioteka"
+#. R/help.start.R: gettext("Otherwise, be patient ...")
+#: R/help.start.R:0
+msgid "Otherwise, be patient ..."
+msgstr "W przeciwnym razie, bądź cierpliwy ..."
 
-msgid "Help on topic %s was found in the following packages:"
-msgstr "Pomoc na temat %s została znaleziona w następujących pakietach:"
+#. R/Sweave.R: message("Output file:  ", output)
+#. R/Sweave.R: message("Output file:  ", output)
+#: R/Sweave.R:0
+msgid "Output file:"
+msgstr "Plik wyjściowy:"
 
-msgid "Choose one"
-msgstr "Wybierz jeden"
+#. R/help.R: gettext("Package")
+#: R/help.R:0
+msgid "Package"
+msgstr "Pakiet"
 
-msgid "Using the first match ..."
-msgstr "Używanie pierwszego dopasowania ..."
+#. R/bug.report.R: gettextf("Package %s: DESCRIPTION file not found", sQuote(package))
+#: R/bug.report.R:0
+msgid "Package %s: DESCRIPTION file not found"
+msgstr "Pakiet %s: nie znaleziono pliku DESCRIPTION"
 
-msgid "HTML help is unavailable"
-msgstr "Pomoc HTML jest niedostępna"
+#. R/aspell.R: gettextf("Processing file %s", fname)
+#. R/rtags.R: gettextf("Processing file %s", s)
+#: R/aspell.R:0 R/rtags.R:0
+msgid "Processing file %s"
+msgstr "Przetwarzanie pliku %s"
 
+#. R/help.R: gettextf("R Help on %s", sQuote(topic))
+#: R/help.R:0
 msgid "R Help on %s"
 msgstr "Pomoc R na temat %s"
 
-msgid "invalid %s argument"
-msgstr "niepoprawny argument '%s'"
+#. R/RShowDoc.R: message("   RShowDoc() should be used with a character string argument specifying\n   a documentation file")
+#: R/RShowDoc.R:0
+msgid ""
+"RShowDoc() should be used with a character string argument specifying\n"
+"   a documentation file"
+msgstr ""
+"'RShowDoc()' powinien być użyty z argumentem tekstowym określającym plik "
+"dokumentacji"
 
+#. R/aspell.R: gettextf("Running aspell failed with diagnostics:\n%s", paste(out$stderr,     collapse = "\n"))
+#: R/aspell.R:0
 msgid ""
-"package %s exists but was not installed under R >= 2.10.0 so help cannot be "
-"accessed"
+"Running aspell failed with diagnostics:\n"
+"%s"
 msgstr ""
-"pakiet %s istnienie ale nie został zainstalowany pod R >= 2.10.0 tak więc "
-"pomoc jest niedostępna"
+"Uruchomienie 'aspell' nie powiodło się z przyczyn:\n"
+"%s"
 
-msgid "creation of %s failed"
-msgstr "tworzenie %s nie powiodło się"
+#. R/objects.R: gettextf("S3 method '%s' not found", method)
+#: R/objects.R:0
+msgid "S3 method '%s' not found"
+msgstr "Nie znaleziono metody S3 '%s'"
 
+#. R/help.R: gettextf("Saving help page to %s", sQuote(basename(ofile2)))
+#. R/help.R: gettextf("Saving help page to %s", sQuote(ofile))
+#: R/help.R:0
 msgid "Saving help page to %s"
 msgstr "Zapisywanie strony pomocy w %s"
 
-msgid "argument %s must be a single character string"
-msgstr "argument %s musi być pojedynczym łańcuchem tekstowym"
+#. R/relist.R: stop("The 'flesh' argument does not contain a skeleton attribute.\n",     "Either ensure you unlist a relistable object, or specify the skeleton separately.")
+#: R/relist.R:0
+msgid "The 'flesh' argument does not contain a skeleton attribute."
+msgstr "Argument 'flesh' nie zawiera atrybutu 'skeleton'."
 
-msgid "incorrect field specification"
-msgstr "niepoprawne określenie pola"
+#. R/unix/mac.install.R: gettextf("The downloaded binary packages are in\n\t%s", tmpd)
+#. R/windows/install.packages.R: gettextf("The downloaded binary packages are in\n\t%s", normalizePath(tmpd,     mustWork = FALSE))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid ""
+"The downloaded binary packages are in\n"
+"\t%s"
+msgstr ""
+"Pobrane pakiety binarne sÄ… w\n"
+"\t%s"
 
-msgid "do not know what to search"
-msgstr "nie wiadomo czego szukać"
+#. R/packages2.R: gettextf("The downloaded source packages are in\n\t%s", sQuote(normalizePath(tmpd,     mustWork = FALSE)))
+#: R/packages2.R:0
+msgid ""
+"The downloaded source packages are in\n"
+"\t%s"
+msgstr ""
+"Pobrane pakiety źródłowe są w\n"
+"\t%s"
 
-msgid "argument 'help.db' is deprecated"
-msgstr "argument 'help.db' jest przestarzały"
+#. R/aspell.R: gettextf("The following dictionaries were not found:\n%s", paste(sprintf("  %s",     dictionaries[ind]), collapse = "\n"))
+#: R/aspell.R:0
+msgid ""
+"The following dictionaries were not found:\n"
+"%s"
+msgstr ""
+"Następujące słowniki nie zostały znalezione:\n"
+"%s"
 
-msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
+#. R/packages2.R: gettextf("The namespace for package \"%s\" is locked; no changes in the global variables list may be made.",     package)
+#: R/packages2.R:0
+msgid ""
+"The namespace for package \"%s\" is locked; no changes in the global "
+"variables list may be made."
 msgstr ""
-"brak informacji w bazie danych dla pakietu %s: potrzeba 'rebuild = TRUE'?"
+"Przestrzeń nazw dla pakietu '%s' jest zablokowana; nie można dokonać żadnych "
+"zmian w globalnej liście zmiennych."
 
-msgid "incorrect 'agrep' specification"
-msgstr "niepoprawne określenie 'agrep'"
+#. R/RSiteSearch.R: gettext("The results page should open in your browser shortly\n")
+#: R/RSiteSearch.R:0
+msgid "The results page should open in your browser shortly"
+msgstr "Za moment strona z wynikami powinna otworzyć sie w twojej przeglądarce"
 
-msgid "incorrect type specification"
-msgstr "niepoprawne określenie typu"
+#. R/packages2.R: stop("This version of R is not set up to install source packages\nIf it was installed from an RPM, you may need the R-devel RPM")
+#: R/packages2.R:0
+msgid ""
+"This version of R is not set up to install source packages\n"
+"If it was installed from an RPM, you may need the R-devel RPM"
+msgstr ""
+"Ta wersja R nie jest ustawiona na instalowanie pakietów źródłowych\n"
+"Jeśli była instalowana z RPM, możesz potrzebować R-devel RPM"
 
-msgid "could not find package %s"
-msgstr "nie można było znaleźć pakietu %s"
+#. R/changedFiles.R: warning("Timestamp file no longer exists.")
+#: R/changedFiles.R:0
+msgid "Timestamp file no longer exists."
+msgstr "Plik sygnatury czasu już nie istnieje."
 
-msgid "package %s has empty hsearch data - strangely"
-msgstr "pakiet %s ma puste dane 'hsearch' - dziwne"
+#. R/citation.R: gettextf("To cite package %s in publications use:", sQuote(package))
+#: R/citation.R:0
+msgid "To cite package %s in publications use:"
+msgstr "Aby zacytować pakiet %s w publikacjach użyj:"
 
-msgid "removing all entries with invalid multi-byte character data"
-msgstr ""
-"usuwanie wszystkich wpisów z niepoprawnymi danymi o wielobajtowych znakach"
+#. R/read.DIF.R: stop("Unrecognized special data value")
+#: R/read.DIF.R:0
+msgid "Unrecognized special data value"
+msgstr "Nierozpoznana specjalna wartość danej"
 
-msgid "invalid browser name, check options(\"browser\")."
-msgstr "niepoprawna nazwa przeglądarki, sprawdź 'options(\"browser\")'."
+#. R/read.DIF.R: stop("Unrecognized value indicator")
+#: R/read.DIF.R:0
+msgid "Unrecognized value indicator"
+msgstr "Nierozpoznany wskaźnik wartości"
 
-msgid "help.start() requires the HTTP server to be running"
-msgstr "'help.start()' wymaga aby serwer HTTP był uruchomiony"
+#. R/packages.R: message("Updating HTML index of packages in '.Library'")
+#. R/packages2.R: message("Updating HTML index of packages in '.Library'")
+#: R/packages.R:0 R/packages2.R:0
+msgid "Updating HTML index of packages in '.Library'"
+msgstr "Aktualizowanie indeksu HTML pakietów w '.Library'"
 
+#. R/browseVignettes.R: gettext("Use <code> %s </code> \n to list the vignettes in all <strong>available</strong> packages.")
+#: R/browseVignettes.R:0
 msgid ""
-"If nothing happens, you should open\n"
-"%s yourself"
+"Use <code> %s </code> \n"
+" to list the vignettes in all <strong>available</strong> packages."
 msgstr ""
-"Jeśli nic się nie stanie, powinieneś otworzyć\n"
-"%s samemu"
+"Użycie <code> %s </code> \n"
+" aby wylistować ilustracje we wszystkich <strong>dostępnych</strong> "
+"pakietach."
 
-msgid ""
-"If the browser launched by '%s' is already running, it is *not* restarted, "
-"and you must switch to its window."
-msgstr ""
-"Jeśli przeglądarka uruchomiona przez '%s' już działa, *nie* zostanie "
-"zrestartowana, a ty musisz przejść na jej okno."
+#. R/citation.R: gettextf("Use either %s or %s but not both.", sQuote("family"),     sQuote("last"))
+#: R/citation.R:0
+msgid "Use either %s or %s but not both."
+msgstr "Użyj albo %s albo %s ale nie obu"
 
-msgid "Otherwise, be patient ..."
-msgstr "W przeciwnym razie, bądź cierpliwy ..."
+#. R/citation.R: gettextf("Use either %s or %s/%s but not both.", sQuote("given"),     sQuote("first"), sQuote("middle"))
+#: R/citation.R:0
+msgid "Use either %s or %s/%s but not both."
+msgstr "Użyj albo %s albo %s/%s ale nie obu"
 
-msgid "'url' must be a non-empty character string"
-msgstr "argument 'url' musi być niepustym łańcuchem tekstowym"
+#. R/unix/create.post.R: message("Using the browser to open a mailto: URI")
+#: R/unix/create.post.R:0
+msgid "Using the browser to open a mailto: URI"
+msgstr "Używanie przeglądarki do otwarcia 'mailto': URI"
 
-msgid "'browser' must be a non-empty character string"
-msgstr "argument 'browser' musi być niepustym łańcuchem tekstowym"
+#. R/help.R: gettext("\nUsing the first match ...")
+#: R/help.R:0
+msgid "Using the first match ..."
+msgstr "Używanie pierwszego dopasowania ..."
 
-msgid "no package '%s' was found"
-msgstr "nie znaleziono pakietu '%s'"
+#. R/Sweave.R: gettextf("Warning: unknown option %s", sQuote(a))
+#. R/Sweave.R: gettextf("Warning: unknown option %s", sQuote(a))
+#: R/Sweave.R:0
+msgid "Warning: unknown option %s"
+msgstr "Ostrzeżenie: nieznana opcja %s"
 
-msgid "metadata of package '%s' is corrupt"
-msgstr "plik metadanych dla pakietu '%s' jest uszkodzony"
+#. R/Sweave.R: gettextf("Warning: unknown option '--clean='%s", clean.)
+#: R/Sweave.R:0
+msgid "Warning: unknown option '--clean='%s"
+msgstr "Ostrzeżenie: nieznana opcja '--clean='%s"
 
-msgid "DESCRIPTION file of package '%s' is corrupt"
-msgstr "plik DESCRIPTION pakietu '%s' jest uszkodzony"
+#. R/edit.R: gettextf("added factor levels in '%s'", names(out)[i])
+#: R/edit.R:0
+msgid "added factor levels in '%s'"
+msgstr "dodane poziomy czynnika w '%s'"
 
-msgid ""
-"'DESCRIPTION' file has an 'Encoding' field and re-encoding is not possible"
-msgstr ""
-"plilk 'DESCRIPTION' posiada pole 'Encoding' i ponowne kodowanie nie jest "
-"możliwe"
+#. R/citation.R: gettextf("all arguments must be of class %s", dQuote("person"))
+#: R/citation.R:0
+msgid "all arguments must be of class %s"
+msgstr "wszystkie argumenty muszą być klasy %s"
 
-msgid "DESCRIPTION file of package '%s' is missing or broken"
-msgstr "brakuje pliku DESCRIPTION pakietu '%s' lub jest on uszkodzony"
+#. R/citation.R: stop("all fields have to be named")
+#: R/citation.R:0
+msgid "all fields have to be named"
+msgstr "wszystkie pola muszą być nazwane"
 
-msgid "cannot update HTML package index"
-msgstr "nie można zaktualizować indeksu HTML pakietu"
+#. R/write.table.R: warning("appending column names to file")
+#: R/write.table.R:0
+msgid "appending column names to file"
+msgstr "dołączanie nazw kolumn do pliku"
 
-msgid "done"
-msgstr "wykonano"
+#. R/help.search.R: gettextf("argument %s must be a single character string", sQuote(args))
+#: R/help.search.R:0
+msgid "argument %s must be a single character string"
+msgstr "argument %s musi być pojedynczym łańcuchem tekstowym"
 
-msgid "menu() cannot be used non-interactively"
-msgstr "funkcja 'menu()' nie może być użyta nieinteraktywnie"
+#. R/help.search.R: warning("argument 'help.db' is deprecated")
+#: R/help.search.R:0
+msgid "argument 'help.db' is deprecated"
+msgstr "argument 'help.db' jest przestarzały"
 
-msgid "Enter an item from the menu, or 0 to exit"
-msgstr "Wprowadź pozycję z menu lub 0 aby wyjść"
+#. R/frametools.R: stop("at least one vector element is required")
+#: R/frametools.R:0
+msgid "at least one vector element is required"
+msgstr "przynajmnej jeden element wektora jest wymagany"
 
-msgid "invalid query"
-msgstr "niepoprawne zapytanie"
+#. R/write.table.R: gettextf("attempt to set '%s' ignored", argname)
+#. R/write.table.R: gettextf("attempt to set '%s' ignored", argname)
+#: R/write.table.R:0
+msgid "attempt to set '%s' ignored"
+msgstr "próba ustawienia '%s' została zignorowana"
 
-msgid "'%s' is a formal generic function; S3 methods will not likely be found"
-msgstr ""
-"'%s' jest formalną ogólną funkcją; metody S3 prawdopodobnie nie zostaną "
-"znalezione"
+#. R/capture.output.R: stop("bad argument")
+#: R/capture.output.R:0
+msgid "bad argument"
+msgstr "niepoprawny argument"
+
+#. R/edit.R: stop("can only handle vector and factor elements")
+#: R/edit.R:0
+msgid "can only handle vector and factor elements"
+msgstr "można obsłużyć jedynie elementy wektora oraz czynnika"
+
+#. R/sock.R: stop("can only receive calls on local machine")
+#: R/sock.R:0
+msgid "can only receive calls on local machine"
+msgstr "można odbierać wywołania jedynie na lokalnej maszynie"
+
+#. R/packages.R: gettextf("cannot choose a %s mirror non-interactively", label,     domain = "R-utils")
+#: R/packages.R:0
+msgid "cannot choose a %s mirror non-interactively"
+msgstr "nie można wybrać serweru lustrzanego %s nieinteraktywnie"
+
+#. R/roman.R: stop("cannot coerce 'x' to roman")
+#: R/roman.R:0
+msgid "cannot coerce 'x' to roman"
+msgstr "nie można przekształcić 'x' na liczby rzymskie"
+
+#. R/package.skeleton.R: gettextf("cannot create directory '%s'", path)
+#: R/package.skeleton.R:0
+msgid "cannot create directory '%s'"
+msgstr "nie można utworzyć katalogu '%s'"
 
-msgid "no function '%s' is visible"
-msgstr "nie ma widocznej funkcji '%s'"
+#. R/prompt.R: stop("cannot determine a usable name")
+#. R/prompt.R: stop("cannot determine a usable name")
+#. R/prompt.R: stop("cannot determine a usable name")
+#. R/prompt.R: stop("cannot determine a usable name")
+#: R/prompt.R:0
+msgid "cannot determine a usable name"
+msgstr "nie można wyznaczyć użytecznej nazwy"
 
-msgid "generic function '%s' dispatches methods for generic '%s'"
-msgstr "ogólna funkcja '%s' rozdziela metody dla ogólnej '%s'"
+#. R/prompt.R: stop("cannot determine import name")
+#: R/prompt.R:0
+msgid "cannot determine import name"
+msgstr "nie można wyznaczyć importowanej nazwy"
+
+#. R/edit.R: stop("cannot edit NULL row names")
+#: R/edit.R:0
+msgid "cannot edit NULL row names"
+msgstr "nie można edytować nazw wierszy o wartości NULL"
 
+#. R/unix/create.post.R: warning("cannot find program to open 'mailto:' URIs: reverting to 'method=\"none\"'")
+#: R/unix/create.post.R:0
 msgid ""
-"function '%s' appears not to be S3 generic; found functions that look like "
-"S3 methods"
+"cannot find program to open 'mailto:' URIs: reverting to 'method=\"none\"'"
 msgstr ""
-"wygląda na to, że funkcja '%s' nie jest funkcją ogólną S3; znaleziono "
-"funkcje, które wyglądają jak metody S3"
+"nie można znaleźć programu do otwarcia 'mailto:' URI: przywracanie 'method="
+"\"none\"'"
 
-msgid "must supply 'generic.function' or 'class'"
-msgstr "potrzeba dostarczyć argument 'generic.function' lub 'class'"
+#. R/completion.R: warning("cannot handle S4 methods yet")
+#: R/completion.R:0
+msgid "cannot handle S4 methods yet"
+msgstr "jeszcze nie można obsłużyć metod S4"
 
-msgid "no function '%s' could be found"
-msgstr "nie znaleziono fukcjii '%s'"
+#. R/packages2.R: stop("cannot install MacOS X binary packages on Windows")
+#: R/packages2.R:0
+msgid "cannot install MacOS X binary packages on Windows"
+msgstr "nie można zainstalować pakietów binarnych dla MacOS w systemie Windows"
 
-msgid "S3 method '%s' not found"
-msgstr "Nie znaleziono metody S3 '%s'"
+#. R/packages2.R: stop("cannot install MacOS X binary packages on this platform")
+#: R/packages2.R:0
+msgid "cannot install MacOS X binary packages on this platform"
+msgstr "nie można zainstalować pakietów binarnych dla MacOS na tej platformie"
 
-msgid "environment specified is not a package"
-msgstr "określone środowisko nie jest pakietem"
+#. R/packages2.R: stop("cannot install Windows binary packages on this platform")
+#: R/packages2.R:0
+msgid "cannot install Windows binary packages on this platform"
+msgstr ""
+"nie można zainstalować pakietów binarnych dla systemu Windows na tej "
+"platformie"
 
-msgid "changing locked binding for %s in %s whilst loading %s"
-msgstr "zmienianie zablokowanego powiÄ…zania dla %s w %s podczas Å‚adowania %s"
+#. R/unix/mac.install.R: gettextf("cannot remove prior installation of package %s", sQuote(pkgname))
+#. R/windows/install.packages.R: gettextf("cannot remove prior installation of package %s", sQuote(pkgname))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid "cannot remove prior installation of package %s"
+msgstr "nie można usunąć poprzedniej instalacji pakietu %s"
+
+#. R/packages.R: stop("cannot set repositories non-interactively")
+#: R/packages.R:0
+msgid "cannot set repositories non-interactively"
+msgstr "nie można wybrać repozytoriów nieinteraktywnie"
 
+#. R/linkhtml.R: warning("cannot update HTML package index")
+#: R/linkhtml.R:0
+msgid "cannot update HTML package index"
+msgstr "nie można zaktualizować indeksu HTML pakietu"
+
+#. R/objects.R: gettextf("changing locked binding for %s in %s", sQuote(x), sQuote(ns_name))
+#: R/objects.R:0
 msgid "changing locked binding for %s in %s"
 msgstr "zmienianie zablokowanego powiÄ…zania dla %s w %s"
 
-msgid "'fixInNamespace' requires a name"
-msgstr "funkcja 'fixInNamespace' wymaga nazwy"
+#. R/objects.R: gettextf("changing locked binding for %s in %s whilst loading %s",     sQuote(x), sQuote(ns_name), sQuote(in_load))
+#: R/objects.R:0
+msgid "changing locked binding for %s in %s whilst loading %s"
+msgstr "zmienianie zablokowanego powiÄ…zania dla %s w %s podczas Å‚adowania %s"
 
-msgid "only numeric indices can be used"
-msgstr "tylko indeksy liczbowe mogą być użyte"
+#. R/tar.R: gettextf("checksum error for entry '%s'", name)
+#: R/tar.R:0
+msgid "checksum error for entry '%s'"
+msgstr "błąd sumy kontrolnej dla wpisu '%s'"
 
-msgid "cannot create directory '%s'"
-msgstr "nie można utworzyć katalogu '%s'"
+#. R/edit.R: warning("class of 'name' will be discarded", call. = FALSE, immediate. = TRUE)
+#: R/edit.R:0
+msgid "class of 'name' will be discarded"
+msgstr "klasa 'name' zostanie odrzucone"
 
-msgid "'code_files' must be a character vector"
-msgstr "argument 'code_files' musi być wektorem tekstowym"
+#. R/citation.R: gettextf("could not determine year for %s from package DESCRIPTION file",     sQuote(package))
+#: R/citation.R:0
+msgid "could not determine year for %s from package DESCRIPTION file"
+msgstr "nie można było określić roku dla %s z pliku DESCRIPTION pakietu"
 
-msgid "'list' must be a character vector naming R objects"
-msgstr "argument 'list' musi być wektorem tekstowym nazywającym obiekty R"
+#. R/help.search.R: gettextf("could not find package %s", sQuote(p))
+#: R/help.search.R:0
+msgid "could not find package %s"
+msgstr "nie można było znaleźć pakietu %s"
 
-msgid "no R objects specified or available"
-msgstr "nie określono obiektów R lub są one niedostępne"
+#. R/de.R: warning("could not restore type information")
+#: R/de.R:0
+msgid "could not restore type information"
+msgstr "nie można przywrócić informacji o typie"
 
-msgid "directory '%s' already exists"
-msgstr "katalog '%s' już istnieje"
+#. R/de.R: warning("could not restore variables properly")
+#: R/de.R:0
+msgid "could not restore variables properly"
+msgstr "nie można było poprawnie przywrócić zmiennych"
 
-msgid ""
-"generic functions and other S4 objects (e.g., '%s') cannot be dumped; use "
-"the 'code_files' argument"
-msgstr ""
-"ogólne funkcje oraz inne obiekty S4 (na przykład, '%s') nie mogą zostać "
-"zrzucone; użyj argumentu 'code_files'"
+#. R/help.R: gettextf("creation of %s failed", sQuote(ofile2))
+#: R/help.R:0
+msgid "creation of %s failed"
+msgstr "tworzenie %s nie powiodło się"
 
-msgid "unable to access index for repository %s"
-msgstr "nie można dostać się do indeksu dla repozytorium %s"
+#. R/data.R: gettextf("data index for package %s is invalid and will be ignored",     sQuote(packageName))
+#: R/data.R:0
+msgid "data index for package %s is invalid and will be ignored"
+msgstr "indeks danych dla pakietu %s jest niepoprawny i zostanie zignorowany"
 
-msgid "invalid 'filters' argument."
-msgstr "niepoprawny argument 'filters'"
+#. R/data.R: gettextf("data set %s not found", sQuote(name))
+#: R/data.R:0
+msgid "data set %s not found"
+msgstr "zbiór danych %s nie został znaleziony"
 
-msgid ""
-"specifying 'contriburl' or 'available' requires a single type, not type = "
-"\"both\""
+#. R/data.R: warning("datasets have been moved from package 'base' to package 'datasets'")
+#: R/data.R:0
+msgid "datasets have been moved from package 'base' to package 'datasets'"
 msgstr ""
-"określanie 'contriburl' lub 'available' wymaga pojedynczego typu, a nie typu "
-"= \"both\""
-
-msgid "package '%s' in library '%s' will not be updated"
-msgstr "pakiet '%s' w bibliotece '%s' nie zostanie zaktualizowany"
+"zbiory danych zostały przeniesione z pakietu 'base' do pakietu 'datasets'"
 
-msgid ""
-"invalid 'oldPkgs'; must be a character vector or a result from old.packages()"
+#. R/data.R: warning("datasets have been moved from package 'stats' to package 'datasets'")
+#: R/data.R:0
+msgid "datasets have been moved from package 'stats' to package 'datasets'"
 msgstr ""
-"niepoprawny 'oldPkgs'; musi być wektorem tekstowym lub wynikiem pochodzącym "
-"z 'old.packages()'"
-
-msgid "ill-formed 'instPkgs' matrix"
-msgstr "Błędnie utworzona macierz 'instPkgs'"
-
-msgid "no installed packages for (invalid?) 'lib.loc=%s'"
-msgstr "brak zainstalowanych pakietów dla (niepoprawnego?) 'lib.loc=%s'"
-
-msgid "no new packages are available"
-msgstr "nie ma dostępnych nowych pakietów"
+"zbiory danych zostały przeniesione z pakietu 'stats' do pakietu 'datasets'"
 
-msgid "metadata of %s is corrupt"
-msgstr "metadane dla %s sÄ… uszkodzone"
+#. R/de.R: warning("did not assign() anything")
+#: R/de.R:0
+msgid "did not assign() anything"
+msgstr "nic nie przypisano"
 
-msgid "'priority' must be character or NULL"
-msgstr "argument 'priority' musi być tekstem lub wartością NULL"
+#. R/package.skeleton.R: gettextf("directory '%s' already exists", dir)
+#: R/package.skeleton.R:0
+msgid "directory '%s' already exists"
+msgstr "katalog '%s' już istnieje"
 
-msgid "Updating HTML index of packages in '.Library'"
-msgstr "Aktualizowanie indeksu HTML pakietów w '.Library'"
+#. R/help.search.R: stop("do not know what to search")
+#: R/help.search.R:0
+msgid "do not know what to search"
+msgstr "nie wiadomo czego szukać"
 
-msgid "'destdir' is not a directory"
-msgstr "wartość 'destdir' nie jest katalogiem"
+#. R/RShowDoc.R: stop("document not found")
+#: R/RShowDoc.R:0
+msgid "document not found"
+msgstr "dokument nie został znaleziony"
 
-msgid "no package %s at the repositories"
-msgstr "brak pakietu %s w repozytoriach"
+#. R/linkhtml.R: message(" ", "done")
+#: R/linkhtml.R:0
+msgid "done"
+msgstr "wykonano"
 
-msgid "package %s does not exist on the local repository"
-msgstr "pakiet %s nie istnieje w lokalnym repozytorium"
+#. R/unix/download.file.R: warning("download had nonzero exit status")
+#. R/windows/download.file.R: warning("download had nonzero exit status")
+#: R/unix/download.file.R:0 R/windows/download.file.R:0
+msgid "download had nonzero exit status"
+msgstr "pobieranie miało niezerowy status wyjściowy"
 
+#. R/packages.R: gettextf("download of package %s failed", sQuote(p))
+#: R/packages.R:0
 msgid "download of package %s failed"
 msgstr "pobieranie pakietu %s nie powiodło się"
 
-msgid "--- Please select a CRAN mirror for use in this session ---"
-msgstr "--- Proszę wybrać serwer lustrzany CRAN do użycia w tej sesji ---"
-
-msgid "trying to use CRAN without setting a mirror"
-msgstr "próba użycia CRAN bez ustawienia serwera lustrzanego"
+#. R/read.DIF.R: stop("duplicate 'row.names' are not allowed")
+#. R/readtable.R: stop("duplicate 'row.names' are not allowed")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "duplicate 'row.names' are not allowed"
+msgstr "powtórzone 'row.names' nie są dozwolone"
 
-msgid "cannot choose a CRAN mirror non-interactively"
-msgstr "nie można wybrać serweru lustrzanego CRAN nieinteraktywnie"
+#. R/edit.R: warning("edited row names contain duplicates and will be ignored")
+#: R/edit.R:0
+msgid "edited row names contain duplicates and will be ignored"
+msgstr ""
+"przeedytowane nazwy wierszy zawierają powtórzenia i zostaną zignorowane"
 
-msgid "cannot choose a BioC mirror non-interactively"
-msgstr "nie można wybrać serweru lustrzanego BioC nieinteraktywnie"
+#. R/apropos.R: warning("elements of 'what' after the first will be ignored")
+#: R/apropos.R:0
+msgid "elements of 'what' after the first will be ignored"
+msgstr "elementy 'what' po pierwszym będą zignorowane"
 
-msgid "cannot set repositories non-interactively"
-msgstr "nie można wybrać repozytoriów nieinteraktywnie"
+#. R/readtable.R: stop("empty beginning of file")
+#: R/readtable.R:0
+msgid "empty beginning of file"
+msgstr "puste rozpoczęcie pliku"
 
-msgid "--- Please select repositories for use in this session ---"
-msgstr "--- Proszę wybrać repozytoria do użycia w tej sesji ---"
+#. R/objects.R: stop("environment specified is not a package")
+#. R/objects.R: stop("environment specified is not a package")
+#. R/objects.R: stop("environment specified is not a package")
+#: R/objects.R:0
+msgid "environment specified is not a package"
+msgstr "określone środowisko nie jest pakietem"
 
-msgid "%s must be supplied"
-msgstr "%s musi być dostarczone"
+#. R/debugcall.R: gettextf("error in trying to evaluate the expression for argument %s (%s)",     sQuote(arg), deparse(argExpr))
+#: R/debugcall.R:0
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr "błąd podczas próby obliczenia wyrażenia dla argumentu %s (%s)"
 
+#. R/packages.R: warning("every package depends on at least one other")
+#: R/packages.R:0
 msgid "every package depends on at least one other"
 msgstr "każdy pakiet zależy co najmniej od innego"
 
-msgid "packages %s are mutually dependent"
-msgstr "pakiety %s są wzajemnie zależne"
+#. R/tar.R: gettextf("failed to copy %s to %s", sQuote(name2), sQuote(name))
+#. R/tar.R: gettextf("failed to copy %s to %s", sQuote(from), sQuote(name))
+#. R/tar.R: gettextf("failed to copy %s to %s", sQuote(from), sQuote(name))
+#: R/tar.R:0
+msgid "failed to copy %s to %s"
+msgstr "kopiowanie %s do %s nie powiodło się"
 
-msgid ""
-"Do not know which element of 'lib' to install dependencies into\n"
-"skipping dependencies"
-msgstr ""
-"Nie wiadomo, do którego elementu 'lib' zainstalować zależności\n"
-"pomijanie zależności"
+#. R/windows/install.packages.R: gettextf("failed to create %s", sQuote(path))
+#. R/windows/install.packages.R: gettextf("failed to create %s", paste(sQuote(mos[!res]), collapse = ","))
+#. R/windows/install.packages.R: gettextf("failed to create %s", sQuote(path))
+#. R/windows/install.packages.R: gettextf("failed to create %s", paste(sQuote(mos[!res]), collapse = ","))
+#: R/windows/install.packages.R:0
+msgid "failed to create %s"
+msgstr "nie udało się utworzyć %s"
 
-msgid "type 'binary' is not supported on this platform"
-msgstr "typ 'binary' nie jest wspierany na tej platformie"
+#. R/tar.R: gettextf("failed to create directory %s", sQuote(exdir))
+#. R/tar.R: gettextf("failed to create directory %s", sQuote(path))
+#: R/tar.R:0
+msgid "failed to create directory %s"
+msgstr "nie udało się utworzyć katalogu %s"
 
-msgid "no packages were specified"
-msgstr "nie określono pakietów"
+#. R/packages.R: gettextf("failed to download mirrors file (%s); using local file '%s'",     conditionMessage(err), local.file)
+#: R/packages.R:0
+msgid "failed to download mirrors file (%s); using local file '%s'"
+msgstr ""
+"nie udało się pobrać pliku (%s) serwerów lustrzanych; używanie lokalnego "
+"pliku '%s'"
+
+#. R/unix/mac.install.R: gettextf("file %s is not an OS X binary package", sQuote(pkg))
+#. R/unix/mac.install.R: gettextf("file %s is not an OS X binary package", sQuote(pkg))
+#. R/unix/mac.install.R: gettextf("file %s is not an OS X binary package", sQuote(pkg))
+#: R/unix/mac.install.R:0
+msgid "file %s is not an OS X binary package"
+msgstr "plik %s nie jest pakietem binarnym OS X"
 
-msgid "'lib = \"%s\"' is not writable"
-msgstr "'lib = \"%s\"' nie jest zapisywalna"
+#. R/tar.R: gettextf("file '%s' did not have execute permissions: corrected",     f)
+#: R/tar.R:0
+msgid "file '%s' did not have execute permissions: corrected"
+msgstr "plik '%s' nie miał uprawnień wykonywalnych: poprawiono"
 
-msgid "unable to install packages"
-msgstr "nie można zainstalować pakietów"
+#. R/tar.R: gettextf("file '%s' not found", f)
+#: R/tar.R:0
+msgid "file '%s' not found"
+msgstr "plik '%s' nie został znaleziony"
 
-msgid "unable to create %s"
-msgstr "nie udało się utworzyć %s"
+#. R/data.R: gettextf("file 'filelist' is missing for directory %s", sQuote(p))
+#: R/data.R:0
+msgid "file 'filelist' is missing for directory %s"
+msgstr "brakuje pliku 'filelist' w katalogu %s"
 
-msgid "inferring 'repos = NULL' from 'pkgs'"
-msgstr "wnioskowanie 'repos = NULL' z 'pkgs'"
+#. R/read.DIF.R: stop("file had no lines")
+#: R/read.DIF.R:0
+msgid "file had no lines"
+msgstr "plik nie miał żadnych linii"
 
-msgid "unable to create temporary directory %s"
-msgstr "nie udało się utworzyć katalogu %s"
+#. R/tar.R: stop("file size is limited to 8GB")
+#: R/tar.R:0
+msgid "file size is limited to 8GB"
+msgstr "rozmiar pliku jest ograniczony do 8 GB"
+
+#. R/packages2.R: gettextf("files: %s", paste(files, collapse = ", \n\t"))
+#: R/packages2.R:0
+msgid "files: %s"
+msgstr "pliki: %s"
+
+#. R/readtable.R: stop("first five rows are empty: giving up")
+#: R/readtable.R:0
+msgid "first five rows are empty: giving up"
+msgstr "pierwsze pięć pierwszych rzędów jest puste: poddawanie się"
+
+#. R/packages2.R: gettextf("foundpkgs: %s", paste(foundpkgs, collapse = ", "))
+#: R/packages2.R:0
+msgid "foundpkgs: %s"
+msgstr "znalezione pakiety: %s"
 
+#. R/objects.R: gettextf("function '%s' appears not to be S3 generic; found functions that look like S3 methods",     generic.function)
+#: R/objects.R:0
 msgid ""
-"type == \"both\" can only be used on Windows or a CRAN build for Mac OS X"
+"function '%s' appears not to be S3 generic; found functions that look like "
+"S3 methods"
 msgstr ""
-"'type == \"both\"' może być użyte jedynie w systemie Windows lub kompilacji "
-"CRAN dla systemów Mac OS X"
-
-msgid "type == \"both\" cannot be used with 'repos = NULL'"
-msgstr "'type == \"both\"' nie może być użyte z 'repos = NULL'"
+"wygląda na to, że funkcja '%s' nie jest funkcją ogólną S3; znaleziono "
+"funkcje, które wyglądają jak metody S3"
 
-msgid "Do you want to attempt to install these from sources?"
-msgstr "Czy chcesz spróbować zainstalować je ze źródeł?"
+#. R/objects.R: gettextf("generic function '%s' dispatches methods for generic '%s'",     generic.function, truegf)
+#: R/objects.R:0
+msgid "generic function '%s' dispatches methods for generic '%s'"
+msgstr "ogólna funkcja '%s' rozdziela metody dla ogólnej '%s'"
 
-msgid "source repository is unavailable to check versions"
-msgstr "repozytorium źródeł nie jest w stanie sprawdzić wersji"
+#. R/package.skeleton.R: gettextf("generic functions and other S4 objects (e.g., '%s') cannot be dumped; use the 'code_files' argument",     item)
+#: R/package.skeleton.R:0
+msgid ""
+"generic functions and other S4 objects (e.g., '%s') cannot be dumped; use "
+"the 'code_files' argument"
+msgstr ""
+"ogólne funkcje oraz inne obiekty S4 (na przykład, '%s') nie mogą zostać "
+"zrzucone; użyj argumentu 'code_files'"
 
-msgid "cannot install MacOS X binary packages on Windows"
-msgstr "nie można zainstalować pakietów binarnych dla MacOS w systemie Windows"
+#. R/read.DIF.R: warning("header and 'col.names' are of different lengths")
+#. R/readtable.R: warning("header and 'col.names' are of different lengths")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "header and 'col.names' are of different lengths"
+msgstr "nagłówek oraz argument 'col.names' mają różne długości"
 
-msgid "cannot install MacOS X binary packages on this platform"
-msgstr "nie można zainstalować pakietów binarnych dla MacOS na tej platformie"
+#. R/help.start.R: stop("help.start() requires the HTTP server to be running", call. = FALSE)
+#: R/help.start.R:0
+msgid "help.start() requires the HTTP server to be running"
+msgstr "'help.start()' wymaga aby serwer HTTP był uruchomiony"
 
-msgid "cannot install Windows binary packages on this platform"
-msgstr ""
-"nie można zainstalować pakietów binarnych dla systemu Windows na tej "
-"platformie"
+#. R/packages.R: stop("ill-formed 'instPkgs' matrix")
+#: R/packages.R:0
+msgid "ill-formed 'instPkgs' matrix"
+msgstr "Błędnie utworzona macierz 'instPkgs'"
 
-msgid ""
-"This version of R is not set up to install source packages\n"
-"If it was installed from an RPM, you may need the R-devel RPM"
-msgstr ""
-"Ta wersja R nie jest ustawiona na instalowanie pakietów źródłowych\n"
-"Jeśli była instalowana z RPM, możesz potrzebować R-devel RPM"
+#. R/tar.R: stop("incomplete block on file")
+#. R/tar.R: stop("incomplete block on file")
+#. R/tar.R: stop("incomplete block on file")
+#: R/tar.R:0
+msgid "incomplete block on file"
+msgstr "niekompletny blok w pliku"
 
-msgid "system (cmd0): %s"
-msgstr "system (cmd0): %s"
+#. R/help.search.R: stop("incorrect 'agrep' specification")
+#: R/help.search.R:0
+msgid "incorrect 'agrep' specification"
+msgstr "niepoprawne określenie 'agrep'"
 
-msgid "installation of package %s had non-zero exit status"
-msgstr "instalacja pakietu %s miała niezerowy status wyjścia"
+#. R/help.search.R: stop("incorrect field specification")
+#: R/help.search.R:0
+msgid "incorrect field specification"
+msgstr "niepoprawne określenie pola"
 
-msgid "foundpkgs: %s"
-msgstr "znalezione pakiety: %s"
+#. R/help.search.R: stop("incorrect type specification")
+#. R/help.search.R: stop("incorrect type specification")
+#: R/help.search.R:0
+msgid "incorrect type specification"
+msgstr "niepoprawne określenie typu"
 
-msgid "files: %s"
-msgstr "pliki: %s"
+#. R/packages2.R: message("inferring 'repos = NULL' from 'pkgs'")
+#. R/packages2.R: message("inferring 'repos = NULL' from 'pkgs'")
+#. R/packages2.R: message("inferring 'repos = NULL' from 'pkgs'")
+#. R/packages2.R: message("inferring 'repos = NULL' from 'pkgs'")
+#: R/packages2.R:0
+msgid "inferring 'repos = NULL' from 'pkgs'"
+msgstr "wnioskowanie 'repos = NULL' z 'pkgs'"
 
+#. R/packages2.R: gettextf("installation of one or more packages failed,\n  probably %s",     paste(sQuote(failed), collapse = ", "))
+#: R/packages2.R:0
 msgid ""
 "installation of one or more packages failed,\n"
 "  probably %s"
@@ -742,500 +1232,765 @@
 "instalacja jednego lub więcej pakietów nie powiodła się,\n"
 "  prawdopodobnie %s"
 
-msgid ""
-"The downloaded source packages are in\n"
-"\t%s"
-msgstr ""
-"Pobrane pakiety źródłowe są w\n"
-"\t%s"
-
-msgid ""
-"The namespace for package \"%s\" is locked; no changes in the global "
-"variables list may be made."
-msgstr ""
-"Przestrzeń nazw dla pakietu '%s' jest zablokowana; nie można dokonać żadnych "
-"zmian w globalnej liście zmiennych."
-
-msgid "'env' must be an environment"
-msgstr "argument 'env' musi być środowiskiem"
-
-msgid "no object named '%s' to show"
-msgstr "brak obiektu '%s' do pokazania"
-
-msgid "'file' must be \"\" or an open connection object"
-msgstr "argument 'file' musi być \"\" lub obiektem otwartego połączenia"
-
-msgid "must have 'max' > 'min'"
-msgstr "potrzeba mieć 'max' > 'min'"
-
-msgid "'pb' is not from class %s"
-msgstr "'pb' nie pochodzi z klasy %s"
+#. R/packages2.R: gettextf("installation of package %s had non-zero exit status",     sQuote(update[i, 1L]))
+#. R/packages2.R: gettextf("installation of package %s had non-zero exit status",     sQuote(update[i, 1L]))
+#: R/packages2.R:0
+msgid "installation of package %s had non-zero exit status"
+msgstr "instalacja pakietu %s miała niezerowy status wyjścia"
 
-msgid "cannot determine a usable name"
-msgstr "nie można wyznaczyć użytecznej nazwy"
+#. R/help.R: gettextf("invalid %s argument", sQuote("file"))
+#. R/packages2.R: gettextf("invalid %s argument", sQuote("keep_outputs"))
+#: R/help.R:0 R/packages2.R:0
+msgid "invalid %s argument"
+msgstr "niepoprawny argument '%s'"
 
-msgid "Created file named %s."
-msgstr "Utworzono plik o nazwie %s."
+#. R/write.table.R: stop("invalid 'col.names' specification")
+#: R/write.table.R:0
+msgid "invalid 'col.names' specification"
+msgstr "niepoprawne określenie 'col.names'"
 
-msgid "Edit the file and move it to the appropriate directory."
-msgstr "Edytuj ten plik i przenieÅ› go do odpowiedniego katalogu."
+#. R/edit.R: stop("invalid 'data' argument")
+#: R/edit.R:0
+msgid "invalid 'data' argument"
+msgstr "niepoprawny argument 'data'"
 
-msgid "cannot determine import name"
-msgstr "nie można wyznaczyć importowanej nazwy"
+#. R/packages.R: stop("invalid 'filters' argument.")
+#: R/packages.R:0
+msgid "invalid 'filters' argument."
+msgstr "niepoprawny argument 'filters'"
 
-msgid "no documentation of type %s and topic %s (or error in processing help)"
-msgstr ""
-"brak dokumentacji o typie %s oraz temacie %s (lub błąd w przetwarzaniu "
-"pomocy)"
+#. R/edit.R: stop("invalid 'modes' argument")
+#: R/edit.R:0
+msgid "invalid 'modes' argument"
+msgstr "niepoprawny argument 'modes'"
 
+#. R/packages.R: stop("invalid 'oldPkgs'; must be a character vector or a result from old.packages()")
+#: R/packages.R:0
 msgid ""
-"the object of class %s in the function call %s could not be used as a "
-"documentation topic"
+"invalid 'oldPkgs'; must be a character vector or a result from old.packages()"
 msgstr ""
-"obiekt klasy %s w wywołaniu funkcji %s nie mógł być użyty jako temat "
-"dokumentacji"
-
-msgid "no methods for %s and no documentation for it as a function"
-msgstr "brak metod dla %s oraz brak dla niego dokumentacji jako funkcji"
-
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr "błąd podczas próby obliczenia wyrażenia dla argumentu %s (%s)"
-
-msgid "no method defined for function %s and signature %s"
-msgstr "brak zdefiniowanej metody dla funkcji %s oraz sygnatury %s"
+"niepoprawny 'oldPkgs'; musi być wektorem tekstowym lub wynikiem pochodzącym "
+"z 'old.packages()'"
 
-msgid "no documentation for function %s and signature %s"
-msgstr "brak dokumentacji dla funkcji %s oraz sygnatury %s"
+#. R/write.table.R: stop("invalid 'quote' specification")
+#: R/write.table.R:0
+msgid "invalid 'quote' specification"
+msgstr "niepoprawne określenie 'quote'"
 
-msgid "No DIF data on clipboard"
-msgstr "Brak danych DIF w schowku"
+#. R/read.DIF.R: stop("invalid 'row.names' length")
+#. R/readtable.R: stop("invalid 'row.names' length")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "invalid 'row.names' length"
+msgstr "niepoprawna długość 'row.names'"
 
-msgid "file had no lines"
-msgstr "plik nie miał żadnych linii"
+#. R/read.DIF.R: stop("invalid 'row.names' specification")
+#. R/readtable.R: stop("invalid 'row.names' specification")
+#. R/write.table.R: stop("invalid 'row.names' specification")
+#: R/read.DIF.R:0 R/readtable.R:0 R/write.table.R:0
+msgid "invalid 'row.names' specification"
+msgstr "niepoprawne określenie 'row.names'"
 
-msgid "row and column counts not found"
-msgstr "liczniki wierszy i kolumn nie zostały znalezione"
+#. R/sock.R: stop("invalid 'socket' argument")
+#: R/sock.R:0
+msgid "invalid 'socket' argument"
+msgstr "niepoprawny argument 'socket'"
 
-msgid "More rows than specified in header; maybe use 'transpose=TRUE'"
-msgstr "Więcej wierszy niż określono w nagłówku; może użyj 'transpose=TRUE'"
+#. R/tar.R: stop("invalid 'tarfile' argument")
+#: R/tar.R:0
+msgid "invalid 'tarfile' argument"
+msgstr "niepoprawny argument 'tarfile'"
 
-msgid "Unrecognized special data value"
-msgstr "Nierozpoznana specjalna wartość danej"
+#. R/edit.R: stop("invalid 'x' argument")
+#: R/edit.R:0
+msgid "invalid 'x' argument"
+msgstr "niepoprawny argument 'x'"
 
-msgid "More columns than specified in header; maybe use 'transpose=TRUE'"
-msgstr "Więcej kolumn niż określono w nagłówku; może użyj 'transpose=TRUE'"
+#. R/help.start.R: stop("invalid browser name, check options(\"browser\").")
+#: R/help.start.R:0
+msgid "invalid browser name, check options(\"browser\")."
+msgstr "niepoprawna nazwa przeglądarki, sprawdź 'options(\"browser\")'."
 
-msgid "Unrecognized value indicator"
-msgstr "Nierozpoznany wskaźnik wartości"
+#. R/str.R: gettextf("invalid components in options(\"str\"): %s", paste(setdiff(names(strO),     oDefs), collapse = ", "))
+#: R/str.R:0
+msgid "invalid components in options(\"str\"): %s"
+msgstr "niepoprawne komponenty w 'options(\"str\")': %s"
 
-msgid "no lines available in input"
-msgstr "nie ma dostępnych linii na wejściu"
+#. R/edit.R: gettextf("invalid factor levels in '%s'", names(out)[i])
+#: R/edit.R:0
+msgid "invalid factor levels in '%s'"
+msgstr "niepoprawne poziomy czynnika w '%s'"
 
-msgid "header and 'col.names' are of different lengths"
-msgstr "nagłówek oraz argument 'col.names' mają różne długości"
+#. R/read.fortran.R: stop("invalid format")
+#: R/read.fortran.R:0
+msgid "invalid format"
+msgstr "niepoprawny format"
 
-msgid "more columns than column names"
-msgstr "więcej kolumn niż nazw kolumn"
+#. R/tar.R: gettextf("invalid gid value replaced by that for user 'nobody'",     uid)
+#: R/tar.R:0
+msgid "invalid gid value replaced by that for user 'nobody'"
+msgstr ""
+"niepoprawna wartość 'gid' zastąpiona przez wartość dla użytkownika 'nobody'"
 
-msgid "more column names than columns"
-msgstr "więcej nazw kolumn niż kolumn"
+#. R/edit.R: stop("invalid input matrix")
+#: R/edit.R:0
+msgid "invalid input matrix"
+msgstr "niepoprawna macierz wejściowa"
 
-msgid "rows are empty: giving up"
-msgstr "wiersze sÄ… puste: poddawanie siÄ™"
+#. R/tar.R: stop("invalid name field in tarball")
+#: R/tar.R:0
+msgid "invalid name field in tarball"
+msgstr "niepoprawne pole nazwy w pliku tarball"
 
-msgid "not all columns named in 'colClasses' exist"
-msgstr "nie wszystkie kolumny nazwane w 'colClasses' istniejÄ…"
+#. R/write.table.R: stop("invalid numbers in 'quote'")
+#: R/write.table.R:0
+msgid "invalid numbers in 'quote'"
+msgstr "niepoprawne liczby w 'quote'"
 
+#. R/read.DIF.R: stop("invalid numeric 'as.is' expression")
+#. R/readtable.R: stop("invalid numeric 'as.is' expression")
+#: R/read.DIF.R:0 R/readtable.R:0
 msgid "invalid numeric 'as.is' expression"
 msgstr "niepoprawne wyrażenie liczbowe w 'as.is'"
 
-msgid "not all columns named in 'as.is' exist"
-msgstr "nie wszystkie kolumny nazwane w 'as.is' istniejÄ…"
+#. R/tar.R: stop("invalid octal digit")
+#: R/tar.R:0
+msgid "invalid octal digit"
+msgstr "niepoprawna cyfra ósemkowa"
 
-msgid "'as.is' has the wrong length %d  != cols = %d"
-msgstr "'as.is' posiada niepoprawną długość %d != kolumny = %d"
+#. R/str.R: warning("invalid options(\"str\") -- using defaults instead")
+#: R/str.R:0
+msgid "invalid options(\"str\") -- using defaults instead"
+msgstr ""
+"niepoprawne 'options(\"str\")' -- używanie w zamian wartości domyślnych"
 
-msgid "invalid 'row.names' specification"
-msgstr "niepoprawne określenie 'row.names'"
+#. R/news.R: stop("invalid query")
+#: R/news.R:0
+msgid "invalid query"
+msgstr "niepoprawne zapytanie"
 
-msgid "invalid 'row.names' length"
-msgstr "niepoprawna długość 'row.names'"
+#. R/tar.R: gettextf("invalid uid value replaced by that for user 'nobody'",     uid)
+#: R/tar.R:0
+msgid "invalid uid value replaced by that for user 'nobody'"
+msgstr ""
+"niepoprawna wartość 'uid' zastąpiona przez wartość dla użytkownika 'nobody'"
 
-msgid "duplicate 'row.names' are not allowed"
-msgstr "powtórzone 'row.names' nie są dozwolone"
+#. R/SweaveDrivers.R: gettextf("invalid value for %s : %s", sQuote(opt), oldval)
+#: R/SweaveDrivers.R:0
+msgid "invalid value for %s : %s"
+msgstr "niepoprawna wartość dla %s: %s"
 
-msgid "missing values in 'row.names' are not allowed"
-msgstr "brakujące wartości w 'row.names' nie są dozwolone"
+#. R/databrowser.R: gettextf("kind '%s' not yet implemented", kind)
+#: R/databrowser.R:0
+msgid "kind '%s' not yet implemented"
+msgstr "rodzaj '%s' nie został jeszcze zaimplementowany"
 
-msgid "missing lengths for some fields"
-msgstr "brakuje długości dla niektórych pól"
+#. R/menu.R: stop("menu() cannot be used non-interactively")
+#: R/menu.R:0
+msgid "menu() cannot be used non-interactively"
+msgstr "funkcja 'menu()' nie może być użyta nieinteraktywnie"
 
-msgid "invalid format"
-msgstr "niepoprawny format"
+#. R/packages.R: gettextf("metadata of %s is corrupt", sQuote(pkgpath))
+#. R/packages.R: gettextf("metadata of %s is corrupt", sQuote(pkgpath))
+#: R/packages.R:0
+msgid "metadata of %s is corrupt"
+msgstr "metadane dla %s sÄ… uszkodzone"
 
-msgid "transfer failure"
-msgstr "niepowodzenie przesyłu"
+#. R/indices.R: gettextf("metadata of package '%s' is corrupt", pkg)
+#: R/indices.R:0
+msgid "metadata of package '%s' is corrupt"
+msgstr "plik metadanych dla pakietu '%s' jest uszkodzony"
 
-msgid "%s option must be a length one character vector or NULL"
-msgstr ""
-"opcja %s musi być wektorem tekstowym o długości jeden lub wartością NULL"
+#. R/windows/create.post.R: stop("method 'mailx' is Unix-only")
+#: R/windows/create.post.R:0
+msgid "method 'mailx' is Unix-only"
+msgstr "metoda 'mailx' jest tylko dla systemów Unix"
 
-msgid "'file' must be a character string or connection"
-msgstr ""
-"argument 'file' musi być wartością NULL, łańcuchem tekstowym lub połączeniem"
+#. R/citation.R: gettextf("method is only applicable to %s objects", sQuote("person"))
+#. R/citation.R: gettextf("method is only applicable to %s objects", sQuote("bibentry"))
+#: R/citation.R:0
+msgid "method is only applicable to %s objects"
+msgstr "metoda jest stosowalna jedynie do obiektów %s"
 
-msgid "empty beginning of file"
-msgstr "puste rozpoczęcie pliku"
+#. R/read.fortran.R: stop("missing lengths for some fields")
+#: R/read.fortran.R:0
+msgid "missing lengths for some fields"
+msgstr "brakuje długości dla niektórych pól"
 
-msgid "first five rows are empty: giving up"
-msgstr "pierwsze pięć pierwszych rzędów jest puste: poddawanie się"
+#. R/read.DIF.R: stop("missing values in 'row.names' are not allowed")
+#. R/readtable.R: stop("missing values in 'row.names' are not allowed")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "missing values in 'row.names' are not allowed"
+msgstr "brakujące wartości w 'row.names' nie są dozwolone"
 
-msgid "relist() requires recursively unlisted objects."
-msgstr "'relist()' wymaga obiektów rekurencyjnie odłączonych od listy."
+#. R/read.DIF.R: stop("more column names than columns")
+#. R/readtable.R: stop("more column names than columns")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "more column names than columns"
+msgstr "więcej nazw kolumn niż kolumn"
 
-msgid "The 'flesh' argument does not contain a skeleton attribute."
-msgstr "Argument 'flesh' nie zawiera atrybutu 'skeleton'."
+#. R/read.DIF.R: stop("more columns than column names")
+#. R/readtable.R: stop("more columns than column names")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "more columns than column names"
+msgstr "więcej kolumn niż nazw kolumn"
 
-msgid ""
-"Either ensure you unlist a relistable object, or specify the skeleton "
-"separately."
-msgstr ""
-"Albo upewnij się, że odłączyłeś od listy wylistowany obiekt, albo określ "
-"strukturÄ™ oddzielnie."
+#. R/Sweave.R: gettextf("more than one syntax specification found, using the first one")
+#: R/Sweave.R:0
+msgid "more than one syntax specification found, using the first one"
+msgstr "znaleziono więcej niż jedno określenie składni, używanie pierwszego"
 
-msgid "cannot coerce 'x' to roman"
-msgstr "nie można przekształcić 'x' na liczby rzymskie"
+#. R/progressBar.R: stop("must have 'max' > 'min'")
+#: R/progressBar.R:0
+msgid "must have 'max' > 'min'"
+msgstr "potrzeba mieć 'max' > 'min'"
 
-msgid "Could not create file %s, aborting"
-msgstr "Nie można było utworzyć pliku %s, przerywanie"
+#. R/unix/create.post.R: stop("must specify 'address'")
+#. R/unix/create.post.R: stop("must specify 'address'")
+#. R/windows/create.post.R: stop("must specify 'address'")
+#: R/unix/create.post.R:0 R/windows/create.post.R:0
+msgid "must specify 'address'"
+msgstr "argument 'address' musi być określony"
 
-msgid "no valid packages were specified"
-msgstr "nie określono poprawnych pakietów"
+#. R/objects.R: stop("must supply 'generic.function' or 'class'")
+#: R/objects.R:0
+msgid "must supply 'generic.function' or 'class'"
+msgstr "potrzeba dostarczyć argument 'generic.function' lub 'class'"
 
-msgid "invalid 'socket' argument"
-msgstr "niepoprawny argument 'socket'"
+#. R/package.skeleton.R: stop("no R objects specified or available")
+#: R/package.skeleton.R:0
+msgid "no R objects specified or available"
+msgstr "nie określono obiektów R lub są one niedostępne"
 
-msgid "'port' must be integer of length 1"
-msgstr "argument 'port' musi być liczbą całkowitą o długości 1"
+#. R/Sweave.R: gettextf("no Sweave file with name %s found", sQuote(file[1L]))
+#: R/Sweave.R:0
+msgid "no Sweave file with name %s found"
+msgstr "nie znaleziono pliku 'Sweave' o nazwie %s"
 
-msgid "'host' must be character of length 1"
-msgstr "argument 'host' musi być tekstem o długości 1"
+#. R/citation.R: gettextf("no date field in DESCRIPTION file of package %s", sQuote(package))
+#: R/citation.R:0
+msgid "no date field in DESCRIPTION file of package %s"
+msgstr "brak pola daty w pliku DESCRIPTION pakietu %s"
 
-msgid "can only receive calls on local machine"
-msgstr "można odbierać wywołania jedynie na lokalnej maszynie"
+#. R/RShowDoc.R: gettextf("no documentation for %s found in package %s", sQuote(what),     sQuote(package))
+#: R/RShowDoc.R:0
+msgid "no documentation for %s found in package %s"
+msgstr "nie znaleziono dokumentacji dla %s w pakiecie %s"
 
-msgid "socket not established"
-msgstr "gniazdo nie zostało ustanowione"
+#. R/question.R: gettextf("no documentation for function %s and signature %s",     sQuote(f), sQuote(sigFormat(sigNames, sigClasses)))
+#: R/question.R:0
+msgid "no documentation for function %s and signature %s"
+msgstr "brak dokumentacji dla funkcji %s oraz sygnatury %s"
 
-msgid "str.data.frame() called with non-data.frame -- coercing to one."
+#. R/question.R: gettextf("no documentation of type %s and topic %s (or error in processing help)",     sQuote(type), sQuote(topicExpr))
+#: R/question.R:0
+msgid "no documentation of type %s and topic %s (or error in processing help)"
 msgstr ""
-"'str.data.frame()' wywołane z nie-ramką danych -- przekształcanie w ramkę."
+"brak dokumentacji o typie %s oraz temacie %s (lub błąd w przetwarzaniu "
+"pomocy)"
+
+#. R/summRprof.R: stop("no events were recorded")
+#: R/summRprof.R:0
+msgid "no events were recorded"
+msgstr "nie zarejestrowano żadnych zdarzeń"
+
+#. R/objects.R: gettextf("no function '%s' could be found", f)
+#: R/objects.R:0
+msgid "no function '%s' could be found"
+msgstr "nie znaleziono fukcjii '%s'"
 
-msgid "invalid options(\"str\") -- using defaults instead"
-msgstr ""
-"niepoprawne 'options(\"str\")' -- używanie w zamian wartości domyślnych"
+#. R/objects.R: gettextf("no function '%s' is visible", generic.function)
+#: R/objects.R:0
+msgid "no function '%s' is visible"
+msgstr "nie ma widocznej funkcji '%s'"
 
-msgid "invalid components in options(\"str\"): %s"
-msgstr "niepoprawne komponenty w 'options(\"str\")': %s"
+#. R/example.R: gettextf("no help found for %s", sQuote(topic))
+#: R/example.R:0
+msgid "no help found for %s"
+msgstr "nie znaleziono pomocy dla %s"
 
-msgid "'str.default': 'le' is NA, so taken as 0"
+#. R/help.search.R: gettextf("no information in the database for package %s: need 'rebuild = TRUE'?",     sQuote(package[pos_in_hsearch_db == 0][1L]))
+#: R/help.search.R:0
+msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
-"'str.default': argument 'le' ma wartość NA, w związku z tym została przyjęta "
-"wartość 0"
+"brak informacji w bazie danych dla pakietu %s: potrzeba 'rebuild = TRUE'?"
 
-msgid "'object' does not have valid levels()"
-msgstr "'object' nie posiada poprawnych wartości 'levels()'"
+#. R/packages.R: gettextf("no installed packages for (invalid?) 'lib.loc=%s'",     lib.loc)
+#: R/packages.R:0
+msgid "no installed packages for (invalid?) 'lib.loc=%s'"
+msgstr "brak zainstalowanych pakietów dla (niepoprawnego?) 'lib.loc=%s'"
 
-msgid "'digits' and 'digits.d' are both specified and the latter is not used"
-msgstr ""
-"obydwa 'digits' oraz 'digits.d' są zdefiniowane i ostatni nie jest używany"
+#. R/read.DIF.R: stop("no lines available in input")
+#. R/readtable.R: stop("no lines available in input")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "no lines available in input"
+msgstr "nie ma dostępnych linii na wejściu"
 
+#. R/summRprof.R: gettextf("no lines found in %s", sQuote(filename))
+#: R/summRprof.R:0
 msgid "no lines found in %s"
 msgstr "nie znaleziono linii w %s"
 
-msgid "profile does not contain memory information"
-msgstr "profil nie zawiera informacji o pamięci"
+#. R/question.R: gettextf("no method defined for function %s and signature %s",     sQuote(f), sQuote(sigFormat(sigNames, sigClasses)))
+#: R/question.R:0
+msgid "no method defined for function %s and signature %s"
+msgstr "brak zdefiniowanej metody dla funkcji %s oraz sygnatury %s"
 
-msgid "profile does not contain line information"
-msgstr "profil nie zawiera informacji o linii"
+#. R/question.R: gettextf("no methods for %s and no documentation for it as a function",     sQuote(f))
+#: R/question.R:0
+msgid "no methods for %s and no documentation for it as a function"
+msgstr "brak metod dla %s oraz brak dla niego dokumentacji jako funkcji"
 
-msgid "no events were recorded"
-msgstr "nie zarejestrowano żadnych zdarzeń"
+#. R/packages.R: message("no new packages are available")
+#: R/packages.R:0
+msgid "no new packages are available"
+msgstr "nie ma dostępnych nowych pakietów"
 
-msgid "invalid 'tarfile' argument"
-msgstr "niepoprawny argument 'tarfile'"
+#. R/page.R: gettextf("no object named '%s' to show", x)
+#: R/page.R:0
+msgid "no object named '%s' to show"
+msgstr "brak obiektu '%s' do pokazania"
 
-msgid "'compressed' must be logical or character"
-msgstr "argument 'compressed' musi być wartością logiczną lub znakiem"
+#. R/packages.R: gettextf("no package %s at the repositories", sQuote(p))
+#: R/packages.R:0
+msgid "no package %s at the repositories"
+msgstr "brak pakietu %s w repozytoriach"
 
-msgid "failed to create directory %s"
-msgstr "nie udało się utworzyć katalogu %s"
+#. R/indices.R: gettextf("no package '%s' was found", pkg)
+#: R/indices.R:0
+msgid "no package '%s' was found"
+msgstr "nie znaleziono pakietu '%s'"
 
-msgid "invalid octal digit"
-msgstr "niepoprawna cyfra ósemkowa"
+#. R/packages2.R: stop("no packages were specified")
+#. R/packages2.R: stop("no packages were specified")
+#. R/packages2.R: stop("no packages were specified")
+#: R/packages2.R:0
+msgid "no packages were specified"
+msgstr "nie określono pakietów"
 
-msgid "'tarfile' must be a character string or a connection"
-msgstr "argument 'tarfile' musi być łańcuchem tekstowym lub połączeniem"
+#. R/sessionInfo.R: stop("no valid packages were specified")
+#: R/sessionInfo.R:0
+msgid "no valid packages were specified"
+msgstr "nie określono poprawnych pakietów"
 
-msgid "incomplete block on file"
-msgstr "niekompletny blok w pliku"
+#. R/frametools.R: stop("no vector columns were selected")
+#: R/frametools.R:0
+msgid "no vector columns were selected"
+msgstr "nie wybrano żadnej kolumny wektora"
 
-msgid "invalid name field in tarball"
-msgstr "niepoprawne pole nazwy w pliku tarball"
+#. R/frametools.R: warning("non-vector columns will be ignored")
+#: R/frametools.R:0
+msgid "non-vector columns will be ignored"
+msgstr "niewektorowe kolumny będą zignorowane"
 
-msgid "checksum error for entry '%s'"
-msgstr "błąd sumy kontrolnej dla wpisu '%s'"
+#. R/frametools.R: warning("non-vector elements will be ignored")
+#: R/frametools.R:0
+msgid "non-vector elements will be ignored"
+msgstr "elementy nie-wektora zostanÄ… zignorowane"
 
-msgid "failed to copy %s to %s"
-msgstr "kopiowanie %s do %s nie powiodło się"
+#. R/read.DIF.R: warning("not all columns named in 'as.is' exist")
+#. R/readtable.R: warning("not all columns named in 'as.is' exist")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "not all columns named in 'as.is' exist"
+msgstr "nie wszystkie kolumny nazwane w 'as.is' istniejÄ…"
 
-msgid "unsupported entry type"
-msgstr "niewspierany typ wpisu"
+#. R/read.DIF.R: warning("not all columns named in 'colClasses' exist")
+#. R/readtable.R: warning("not all columns named in 'colClasses' exist")
+#: R/read.DIF.R:0 R/readtable.R:0
+msgid "not all columns named in 'colClasses' exist"
+msgstr "nie wszystkie kolumny nazwane w 'colClasses' istniejÄ…"
 
-msgid "file '%s' not found"
-msgstr "plik '%s' nie został znaleziony"
+#. R/strcapture.R: stop("number of matches does not always match ncol(proto)")
+#: R/strcapture.R:0
+msgid "number of matches does not always match ncol(proto)"
+msgstr "liczba dopasowań nie zawsze pasuje do 'ncol(proto)'"
 
-msgid "file '%s' did not have execute permissions: corrected"
-msgstr "plik '%s' nie miał uprawnień wykonywalnych: poprawiono"
+#. R/Sweave.R: gettextf("object %s does not have class \"SweaveSyntax\"", sQuote(sname))
+#: R/Sweave.R:0
+msgid "object %s does not have class \"SweaveSyntax\""
+msgstr "obiekt %s nie posiada klasy 'SweaveSyntax'"
 
-msgid "file size is limited to 8GB"
-msgstr "rozmiar pliku jest ograniczony do 8 GB"
+#. R/databrowser.R: stop("only 'html = TRUE' is supported on this platform")
+#: R/databrowser.R:0
+msgid "only 'html = TRUE' is supported on this platform"
+msgstr "jedynie 'html = TRUE' jest wspierane na tej platformie"
 
-msgid "invalid uid value replaced by that for user 'nobody'"
-msgstr ""
-"niepoprawna wartość 'uid' zastąpiona przez wartość dla użytkownika 'nobody'"
+#. R/objects.R: stop("only numeric indices can be used")
+#: R/objects.R:0
+msgid "only numeric indices can be used"
+msgstr "tylko indeksy liczbowe mogą być użyte"
 
-msgid "invalid gid value replaced by that for user 'nobody'"
-msgstr ""
-"niepoprawna wartość 'gid' zastąpiona przez wartość dla użytkownika 'nobody'"
+#. R/packages.R: gettextf("package %s does not exist on the local repository",     sQuote(p))
+#: R/packages.R:0
+msgid "package %s does not exist on the local repository"
+msgstr "pakiet %s nie istnieje w lokalnym repozytorium"
 
+#. R/help.R: gettextf("package %s exists but was not installed under R >= 2.10.0 so help cannot be accessed",     sQuote(pkgname))
+#: R/help.R:0
 msgid ""
-"vignette %s found more than once,\n"
-"using the one found in %s"
+"package %s exists but was not installed under R >= 2.10.0 so help cannot be "
+"accessed"
 msgstr ""
-"ilustracja %s została znaleziona więcej niż raz,\n"
-"używanie tej znalezionej w %s"
+"pakiet %s istnienie ale nie został zainstalowany pod R >= 2.10.0 tak więc "
+"pomoc jest niedostępna"
 
-msgid "vignette %s not found"
-msgstr "ilustracja %s nie została znaleziona"
+#. R/help.search.R: gettextf("package %s has empty hsearch data - strangely", sQuote(p))
+#: R/help.search.R:0
+msgid "package %s has empty hsearch data - strangely"
+msgstr "pakiet %s ma puste dane 'hsearch' - dziwne"
 
-msgid "vignette %s has no PDF/HTML"
-msgstr "ilustracja %s nie posiada PDF/HTML"
+#. R/citation.R: gettextf("package %s not found", sQuote(package))
+#. R/indices.R: gettextf("package %s not found", sQuote(pkg))
+#: R/citation.R:0 R/indices.R:0
+msgid "package %s not found"
+msgstr "pakiet %s nie został znaleziony"
 
-msgid "vignette %s has no R code"
-msgstr "ilustracja %s nie zawiera kodu"
+#. R/unix/mac.install.R: gettextf("package %s successfully unpacked and MD5 sums checked\n",     sQuote(pkgname))
+#. R/windows/install.packages.R: gettextf("package %s successfully unpacked and MD5 sums checked\n",     sQuote(pkgname))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid "package %s successfully unpacked and MD5 sums checked"
+msgstr ""
+"pakiet %s został pomyślnie rozpakowany oraz sumy MD5 zostały sprawdzone"
 
-msgid "select.list() cannot be used non-interactively"
-msgstr "funkcja 'select.list()' nie może być użyta nieinteraktywnie"
+#. R/packages.R: sprintf("package '%s' in library '%s' will not be updated", oldPkgs[pkg],     oldPkgs[pkg, 2])
+#: R/packages.R:0
+msgid "package '%s' in library '%s' will not be updated"
+msgstr "pakiet '%s' w bibliotece '%s' nie zostanie zaktualizowany"
 
-msgid "'title' must be NULL or a length-1 character vector"
-msgstr ""
-"argument 'title' musi być wartością NULL lub wektorem tekstowym o długości 1"
+#. R/packages.R: gettextf("packages %s are mutually dependent", paste(sQuote(names(DL)),     collapse = ", "))
+#: R/packages.R:0
+msgid "packages %s are mutually dependent"
+msgstr "pakiety %s są wzajemnie zależne"
 
+#. R/Sweave.R: gettextf("parse error or empty option in\n%s", text)
+#: R/Sweave.R:0
 msgid ""
-"Enter one or more numbers separated by spaces, or an empty line to cancel"
+"parse error or empty option in\n"
+"%s"
+msgstr "błąd parsowania lub pusta opcja w %s"
+
+#. R/SweaveDrivers.R: gettextf("path to %s contains spaces,\n", sQuote(styfile))
+#: R/SweaveDrivers.R:0
+msgid "path to %s contains spaces,"
+msgstr "ścieżka do %s zawiera spacje,"
+
+#. R/summRprof.R: stop("profile does not contain line information")
+#: R/summRprof.R:0
+msgid "profile does not contain line information"
+msgstr "profil nie zawiera informacji o linii"
+
+#. R/summRprof.R: stop("profile does not contain memory information")
+#: R/summRprof.R:0
+msgid "profile does not contain memory information"
+msgstr "profil nie zawiera informacji o pamięci"
+
+#. R/debugger.R: gettext("recover called non-interactively; frames dumped, use debugger() to view\n")
+#: R/debugger.R:0
+msgid "recover called non-interactively; frames dumped, use debugger() to view"
 msgstr ""
-"Wprowadź jedną lub więcej liczb oddzielonych spacją, lub pustą linię aby "
-"anulować"
+"przywrócenie wywołano nieinteraktywnie; ramki odrzucono, użyj 'debugger()' "
+"aby przeglądać"
 
-msgid "Invalid input, please try again"
-msgstr "Niepoprawne wejście, proszę spróbować ponownie"
+#. R/Sweave.R: gettextf("recursive Sweave input %s in stack", sQuote(ifile))
+#: R/Sweave.R:0
+msgid "recursive Sweave input %s in stack"
+msgstr "rekursywne wejście 'Sweave' %s na stosie"
 
-msgid "'quote' must be 'TRUE', 'FALSE' or numeric"
-msgstr "argument 'quote' musi mieć wartość TRUE, FALSE lub musi być liczbą"
+#. R/Sweave.R: gettextf("reference to unknown chunk %s", sQuote(chunkref))
+#: R/Sweave.R:0
+msgid "reference to unknown chunk %s"
+msgstr "referencja do nieznanego fragmentu %s"
 
-msgid "invalid numbers in 'quote'"
-msgstr "niepoprawne liczby w 'quote'"
+#. R/relist.R: warning("relist() requires recursively unlisted objects.")
+#: R/relist.R:0
+msgid "relist() requires recursively unlisted objects."
+msgstr "'relist()' wymaga obiektów rekurencyjnie odłączonych od listy."
 
-msgid "invalid 'quote' specification"
-msgstr "niepoprawne określenie 'quote'"
+#. R/help.search.R: warning("removing all entries with invalid multi-byte character data")
+#: R/help.search.R:0
+msgid "removing all entries with invalid multi-byte character data"
+msgstr ""
+"usuwanie wszystkich wpisów z niepoprawnymi danymi o wielobajtowych znakach"
 
-msgid "'col.names = NA' makes no sense when 'row.names = FALSE'"
-msgstr "'col.names = NA' nie ma sensu kiedy 'row.names = FALSE'"
+#. R/unix/mac.install.R: gettextf("restored %s", sQuote(pkgname))
+#. R/windows/install.packages.R: gettextf("restored %s", sQuote(pkgname))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid "restored %s"
+msgstr "przywrócono %s"
 
-msgid "invalid 'col.names' specification"
-msgstr "niepoprawne określenie 'col.names'"
+#. R/read.DIF.R: stop("row and column counts not found")
+#: R/read.DIF.R:0
+msgid "row and column counts not found"
+msgstr "liczniki wierszy i kolumn nie zostały znalezione"
 
-msgid "appending column names to file"
-msgstr "dołączanie nazw kolumn do pliku"
+#. R/read.DIF.R: stop("rows are empty: giving up")
+#: R/read.DIF.R:0
+msgid "rows are empty: giving up"
+msgstr "wiersze sÄ… puste: poddawanie siÄ™"
 
-msgid "attempt to set '%s' ignored"
-msgstr "próba ustawienia '%s' została zignorowana"
+#. R/widgets.R: stop("select.list() cannot be used non-interactively")
+#: R/widgets.R:0
+msgid "select.list() cannot be used non-interactively"
+msgstr "funkcja 'select.list()' nie może być użyta nieinteraktywnie"
 
-msgid "'unzip' must be a single character string"
-msgstr "argument 'unzip' musi być pojedynczym łańcuchem tekstowym"
+#. R/sock.R: stop("socket not established")
+#. R/sock.R: warning("socket not established")
+#: R/sock.R:0
+msgid "socket not established"
+msgstr "gniazdo nie zostało ustanowione"
 
-msgid "'files' must a character vector specifying one or more filepaths"
-msgstr ""
-"argument 'files' musi być wektorem tekstowym określającym jedną lub więcej "
-"ścieżek do plików"
+#. R/packages2.R: message("source repository is unavailable to check versions")
+#: R/packages2.R:0
+msgid "source repository is unavailable to check versions"
+msgstr "repozytorium źródeł nie jest w stanie sprawdzić wersji"
 
+#. R/packages.R: stop("specifying 'contriburl' or 'available' requires a single type, not type = \"both\"")
+#. R/packages.R: stop("specifying 'contriburl' or 'available' requires a single type, not type = \"both\"")
+#. R/packages2.R: stop("specifying 'contriburl' or 'available' requires a single type, not type = \"both\"")
+#: R/packages.R:0 R/packages2.R:0
 msgid ""
-"cannot find program to open 'mailto:' URIs: reverting to 'method=\"none\"'"
+"specifying 'contriburl' or 'available' requires a single type, not type = "
+"\"both\""
 msgstr ""
-"nie można znaleźć programu do otwarcia 'mailto:' URI: przywracanie 'method="
-"\"none\"'"
+"określanie 'contriburl' lub 'available' wymaga pojedynczego typu, a nie typu "
+"= \"both\""
 
-msgid "Using the browser to open a mailto: URI"
-msgstr "Używanie przeglądarki do otwarcia 'mailto': URI"
+#. R/str.R: warning("str.data.frame() called with non-data.frame -- coercing to one.")
+#: R/str.R:0
+msgid "str.data.frame() called with non-data.frame -- coercing to one."
+msgstr ""
+"'str.data.frame()' wywołane z nie-ramką danych -- przekształcanie w ramkę."
 
-msgid "must specify 'address'"
-msgstr "argument 'address' musi być określony"
+#. R/citation.R: warning("subscript out of bounds")
+#: R/citation.R:0
+msgid "subscript out of bounds"
+msgstr "indeks poza granicami"
 
-msgid "'subject' is missing"
-msgstr "brakuje 'subject'"
+#. R/packages2.R: gettextf("system (cmd0): %s", paste(c(cmd0, args0), collapse = " "))
+#: R/packages2.R:0
+msgid "system (cmd0): %s"
+msgstr "system (cmd0): %s"
 
-msgid "'ccaddress' must be of length 1"
-msgstr "argument 'ccaddress' musi być długości 1"
+#. R/Sweave.R: stop("target syntax contains no translation table")
+#: R/Sweave.R:0
+msgid "target syntax contains no translation table"
+msgstr "docelowa składnia nie zawiera tablicy tłumaczenia"
 
-msgid "no download method found"
-msgstr "nie znaleziono metody pobierania"
+#. R/Sweave.R: gettextf("target syntax not of class %s", dQuote("SweaveSyntax"))
+#: R/Sweave.R:0
+msgid "target syntax not of class %s"
+msgstr "docelowa składnia nie jest klasy %s"
 
-msgid "'url' must be a length-one character vector"
-msgstr "argument 'url' musi być wektorem tekstowym o długości 1"
+#. R/question.R: gettextf("the object of class %s in the function call %s could not be used as a documentation topic",     dQuote(class(f)), sQuote(deparse(expr)))
+#: R/question.R:0
+msgid ""
+"the object of class %s in the function call %s could not be used as a "
+"documentation topic"
+msgstr ""
+"obiekt klasy %s w wywołaniu funkcji %s nie mógł być użyty jako temat "
+"dokumentacji"
 
-msgid "'destfile' must be a length-one character vector"
-msgstr "argument 'destfile' musi wektorem tekstowym o długości 1"
+#. R/SweaveDrivers.R: gettextf("the output file '%s' has disappeared", outputname)
+#: R/SweaveDrivers.R:0
+msgid "the output file '%s' has disappeared"
+msgstr "plik wyjściowy '%s' zniknął"
 
-msgid "download had nonzero exit status"
-msgstr "pobieranie miało niezerowy status wyjściowy"
+#. R/windows/install.packages.R: gettextf("there is no 'libs' directory in package %s", sQuote(pkgname))
+#: R/windows/install.packages.R:0
+msgid "there is no 'libs' directory in package %s"
+msgstr "nie ma katalogu 'libs' w pakiecie %s"
 
-msgid "'tar' returned non-zero exit code %d"
-msgstr "funkcja 'tar' zwróciła niezerowy kod %d wyjścia"
+#. R/SweaveDrivers.R: gettext("this may cause problems when running LaTeX")
+#: R/SweaveDrivers.R:0
+msgid "this may cause problems when running LaTeX"
+msgstr "to może spowodować problemy podczas uruchamiania LaTeX'a"
 
-msgid "file %s is not an OS X binary package"
-msgstr "plik %s nie jest pakietem binarnym OS X"
+#. R/format.R: gettextf("too many list items (at most up to %d)", 26L)
+#. R/format.R: gettextf("too many list items (at most up to %d)", 3899L)
+#: R/format.R:0
+msgid "too many list items (at most up to %d)"
+msgstr "zbyt dużo pozycji listy (co najwyżej do %d)"
+
+#. R/readhttp.R: stop("transfer failure")
+#: R/readhttp.R:0
+msgid "transfer failure"
+msgstr "niepowodzenie przesyłu"
+
+#. R/packages.R: stop("trying to use CRAN without setting a mirror")
+#: R/packages.R:0
+msgid "trying to use CRAN without setting a mirror"
+msgstr "próba użycia CRAN bez ustawienia serwera lustrzanego"
+
+#. R/packages2.R: stop("type 'binary' is not supported on this platform")
+#: R/packages2.R:0
+msgid "type 'binary' is not supported on this platform"
+msgstr "typ 'binary' nie jest wspierany na tej platformie"
+
+#. R/packages2.R: stop("type == \"both\" can only be used on Windows or a CRAN build for Mac OS X")
+#: R/packages2.R:0
+msgid ""
+"type == \"both\" can only be used on Windows or a CRAN build for Mac OS X"
+msgstr ""
+"'type == \"both\"' może być użyte jedynie w systemie Windows lub kompilacji "
+"CRAN dla systemów Mac OS X"
+
+#. R/packages2.R: stop("type == \"both\" cannot be used with 'repos = NULL'")
+#: R/packages2.R:0
+msgid "type == \"both\" cannot be used with 'repos = NULL'"
+msgstr "'type == \"both\"' nie może być użyte z 'repos = NULL'"
 
-msgid "package %s successfully unpacked and MD5 sums checked"
-msgstr ""
-"pakiet %s został pomyślnie rozpakowany oraz sumy MD5 zostały sprawdzone"
+#. R/packages.R: gettextf("unable to access index for repository %s", repos)
+#: R/packages.R:0
+msgid "unable to access index for repository %s"
+msgstr "nie można dostać się do indeksu dla repozytorium %s"
 
-msgid ""
-"ERROR: failed to lock directory %s for modifying\n"
-"Try removing %s"
-msgstr ""
-"B�ĄD: nie udało się zablokować katalogu %s do modyfikacji\n"
-"Spróbuj usunąć %s"
+#. R/packages2.R: gettextf("unable to create %s", sQuote(userdir))
+#. R/packages2.R: gettextf("unable to create %s", sQuote(keep_outputs))
+#: R/packages2.R:0
+msgid "unable to create %s"
+msgstr "nie udało się utworzyć %s"
 
-msgid "ERROR: failed to create lock directory %s"
-msgstr "B�ĄD: nie udało się utworzyć blokady katalogu %s"
+#. R/packages2.R: gettextf("unable to create temporary directory %s", sQuote(tmpd))
+#. R/packages2.R: gettextf("unable to create temporary directory %s", sQuote(tmpd))
+#. R/packages2.R: gettextf("unable to create temporary directory %s", sQuote(tmpd))
+#. R/unix/mac.install.R: gettextf("unable to create temporary directory %s", sQuote(tmpDir))
+#. R/unix/mac.install.R: gettextf("unable to create temporary directory %s", sQuote(tmpd))
+#. R/windows/install.packages.R: gettextf("unable to create temporary directory %s", sQuote(normalizePath(tmpDir,     mustWork = FALSE)))
+#. R/windows/install.packages.R: gettextf("unable to create temporary directory %s", sQuote(normalizePath(tmpd,     mustWork = FALSE)))
+#: R/packages2.R:0 R/unix/mac.install.R:0 R/windows/install.packages.R:0
+msgid "unable to create temporary directory %s"
+msgstr "nie udało się utworzyć katalogu %s"
 
-msgid "restored %s"
-msgstr "przywrócono %s"
+#. R/packages2.R: stop("unable to install packages")
+#. R/packages2.R: stop("unable to install packages")
+#. R/packages2.R: stop("unable to install packages")
+#: R/packages2.R:0
+msgid "unable to install packages"
+msgstr "nie można zainstalować pakietów"
 
+#. R/unix/mac.install.R: gettextf("unable to move temporary installation %s to %s", sQuote(file.path(tmpDir,     pkgname)), sQuote(instPath))
+#. R/windows/install.packages.R: gettextf("unable to move temporary installation %s to %s", sQuote(normalizePath(file.path(tmpDir,     pkgname, "libs", sub), mustWork = FALSE)), sQuote(normalizePath(file.path(instPath,     "libs"), mustWork = FALSE)))
+#. R/windows/install.packages.R: gettextf("unable to move temporary installation %s to %s", sQuote(normalizePath(file.path(tmpDir,     pkgname), mustWork = FALSE)), sQuote(normalizePath(instPath,     mustWork = FALSE)))
+#: R/unix/mac.install.R:0 R/windows/install.packages.R:0
 msgid "unable to move temporary installation %s to %s"
 msgstr "nie można usunąć tymczasowej instalacji %s w %s"
 
-msgid "cannot remove prior installation of package %s"
-msgstr "nie można usunąć poprzedniej instalacji pakietu %s"
-
-msgid ""
-"The downloaded binary packages are in\n"
-"\t%s"
-msgstr ""
-"Pobrane pakiety binarne sÄ… w\n"
-"\t%s"
+#. R/tar.R: stop("unsupported entry type ", sQuote(ctype))
+#: R/tar.R:0
+msgid "unsupported entry type"
+msgstr "niewspierany typ wpisu"
 
-msgid "'memory.size()' is Windows-specific"
-msgstr "funkcja 'memory.size()' jest specyficzna dla systemów Windows"
+#. R/SweaveDrivers.R: warning("value of 'results' option should be lowercase", call. = FALSE)
+#: R/SweaveDrivers.R:0
+msgid "value of 'results' option should be lowercase"
+msgstr "wartość opcji 'results' powinna być pisana małymi literami"
 
-msgid "'memory.limit()' is Windows-specific"
-msgstr "funkcja 'memory.limit()' jest specyficzna dla systemów Windows"
+#. R/SweaveDrivers.R: warning("value of 'strip.white' option should be lowercase",     call. = FALSE)
+#: R/SweaveDrivers.R:0
+msgid "value of 'strip.white' option should be lowercase"
+msgstr "wartość opcji 'strip.white' powinna być pisana małymi literami"
 
-msgid "method 'mailx' is Unix-only"
-msgstr "metoda 'mailx' jest tylko dla systemów Unix"
+#. R/vignette.R: gettextf("vignette %s found more than once,\nusing the one found in %s",     sQuote(topic), sQuote(file.path(vinfo[pos, "Dir"], "doc")))
+#: R/vignette.R:0
+msgid ""
+"vignette %s found more than once,\n"
+"using the one found in %s"
+msgstr ""
+"ilustracja %s została znaleziona więcej niż raz,\n"
+"używanie tej znalezionej w %s"
 
-msgid "zip file %s not found"
-msgstr "plik zip %s nie został znaleziony"
+#. R/vignette.R: gettextf("vignette %s has no PDF/HTML", sQuote(x$Topic))
+#: R/vignette.R:0
+msgid "vignette %s has no PDF/HTML"
+msgstr "ilustracja %s nie posiada PDF/HTML"
 
-msgid "failed to create %s"
-msgstr "nie udało się utworzyć %s"
+#. R/vignette.R: gettextf("vignette %s has no R code", sQuote(x$Topic))
+#: R/vignette.R:0
+msgid "vignette %s has no R code"
+msgstr "ilustracja %s nie zawiera kodu"
 
-msgid "there is no 'libs' directory in package %s"
-msgstr "nie ma katalogu 'libs' w pakiecie %s"
+#. R/vignette.R: gettextf("vignette %s not found", sQuote(topic))
+#: R/vignette.R:0
+msgid "vignette %s not found"
+msgstr "ilustracja %s nie została znaleziona"
 
+#. R/windows/winDialog.R: stop("winDialog() cannot be used non-interactively")
+#: R/windows/winDialog.R:0
 msgid "winDialog() cannot be used non-interactively"
 msgstr "'winDialog()' nie może być użyty nieinteraktywnie"
 
+#. R/windows/winDialog.R: stop("winDialogString() cannot be used non-interactively")
+#: R/windows/winDialog.R:0
 msgid "winDialogString() cannot be used non-interactively"
 msgstr "'winDialogString()' nie może być użyty nieinteraktywnie"
 
+#. R/de.R: stop("wrong argument to 'dataentry'")
+#. R/de.R: stop("wrong argument to 'dataentry'")
+#. R/de.R: stop("wrong argument to 'dataentry'")
+#: R/de.R:0
+msgid "wrong argument to 'dataentry'"
+msgstr "niepoprawny argument przekazany do 'dataentry'"
+
+#. R/databrowser.R: stop("wrong number of table row entries")
+#: R/databrowser.R:0
+msgid "wrong number of table row entries"
+msgstr "błędna liczba wpisów w wierszach tabeli"
+
+#. R/help.R: gettextf("you could try %s", sQuote(paste0("??", topic)))
+#: R/help.R:0
+msgid "you could try %s"
+msgstr "mógłbyś spróbować %s"
+
+#. R/windows/install.packages.R: gettextf("zip file %s not found", sQuote(zipname))
+#: R/windows/install.packages.R:0
+msgid "zip file %s not found"
+msgstr "plik zip %s nie został znaleziony"
+
+#. R/Sweave.R: ngettext(length(f), "%d Sweave file for basename %s found", "%d Sweave files for basename %s found",     domain = "R-utils")
+#: R/Sweave.R:0
 msgid "%d Sweave file for basename %s found"
 msgid_plural "%d Sweave files for basename %s found"
 msgstr[0] "znaleziono %d plik 'Sweave' dla nazwy bazowej %s"
 msgstr[1] "znaleziono %d pliki 'Sweave' dla nazwy bazowej %s"
 msgstr[2] "znaleziono %d plików 'Sweave' dla nazwy bazowej %s"
 
+#. R/apropos.R: ngettext(ll, "%d occurrence in %s", "%d occurrences in %s")
+#: R/apropos.R:0
 msgid "%d occurrence in %s"
 msgid_plural "%d occurrences in %s"
 msgstr[0] "%d wystÄ…pienie w %s"
 msgstr[1] "%d wystÄ…pienia w %s"
 msgstr[2] "%d wystąpień w %s"
 
-msgid "Invalid role specification: %s."
-msgid_plural "Invalid role specifications: %s."
-msgstr[0] "Niepoprawna specyfikacja roli: %s"
-msgstr[1] "Niepoprawne specyfikacje ról: %s"
-msgstr[2] "Niepoprawne specyfikacje ról: %s"
+#. R/packages2.R: ngettext(sum(!ok), "'lib' element %s is not a writable directory",     "'lib' elements %s are not writable directories")
+#: R/packages2.R:0
+msgid "'lib' element %s is not a writable directory"
+msgid_plural "'lib' elements %s are not writable directories"
+msgstr[0] "element 'lib' %s nie jest zapisywalnym katalogiem"
+msgstr[1] "elementy 'lib' %s nie sÄ… zapisywalnymi katalogiami"
+msgstr[2] "elementy 'lib' %s nie sÄ… zapisywalnymi katalogiami"
 
+#. R/citation.R: ngettext(sum(!ok), "A bibentry of bibtype %s has to specify the field: %s",     "A bibentry of bibtype %s has to specify the fields: %s")
+#: R/citation.R:0
 msgid "A bibentry of bibtype %s has to specify the field: %s"
 msgid_plural "A bibentry of bibtype %s has to specify the fields: %s"
 msgstr[0] "Bibliograficzny wpis typu %s musi określać pole: %s"
 msgstr[1] "Bibliograficzny wpis typu %s musi określać pola: %s"
 msgstr[2] "Bibliograficzny wpis typu %s musi określać pola: %s"
 
-msgid "class discarded from column %s"
-msgid_plural "classes discarded from columns %s"
-msgstr[0] "klasa usunięta z kolumny %s"
-msgstr[1] "klasy usunięte z kolumn %s"
-msgstr[2] "klasy usunięte z kolumn %s"
-
-msgid "matched %d object."
-msgid_plural "matched %d objects."
-msgstr[0] "dopasowano %d obiekt."
-msgstr[1] "dopasowano %d obiekty."
-msgstr[2] "dopasowano %d obiektów."
-
-msgid "object '%s' not found"
-msgid_plural "objects '%s' not found"
-msgstr[0] "obiekt '%s' nie został znaleziony"
-msgstr[1] "obiekty '%s' nie zostały znalezione"
-msgstr[2] "obiekty '%s' nie zostały znalezione"
-
+#. R/packages2.R: ngettext(sum(later & hasSrc), "Do you want to install from sources the package which needs compilation?",     "Do you want to install from sources the packages which need compilation?")
+#: R/packages2.R:0
 msgid ""
-"Removing package from %s\n"
-"(as %s is unspecified)"
+"Do you want to install from sources the package which needs compilation?"
 msgid_plural ""
-"Removing packages from %s\n"
-"(as %s is unspecified)"
-msgstr[0] ""
-"Usuwanie pakietu z %s\n"
-"(ponieważ %s jest nieokreślone)"
+"Do you want to install from sources the packages which need compilation?"
+msgstr[0] "Czy chcesz zainstalować ze źródeł pakiet, który wymaga kompilacji?"
 msgstr[1] ""
-"Usuwanie pakietów z %s\n"
-"(ponieważ %s jest nieokreślone)"
+"Czy chcesz zainstalować ze źródeł pakiety, które wymagają kompilacji?"
 msgstr[2] ""
-"Usuwanie pakietów z %s\n"
-"(ponieważ %s jest nieokreślone)"
-
-msgid "package %s is not available (%s)"
-msgid_plural "packages %s are not available (%s)"
-msgstr[0] "pakiet %s nie jest dostępny (%s)"
-msgstr[1] "pakiety %s nie są dostępne (%s)"
-msgstr[2] "pakiety %s nie są dostępne (%s)"
-
-msgid "dependency %s is not available"
-msgid_plural "dependencies %s are not available"
-msgstr[0] "zależność %s nie jest dostępna"
-msgstr[1] "zależności %s nie są dostępne"
-msgstr[2] "zależności %s nie są dostępne"
-
-msgid "also installing the dependency %s"
-msgid_plural "also installing the dependencies %s"
-msgstr[0] "instalowanie dodatkowych zależności %s"
-msgstr[1] "instalowanie dodatkowych zależności %s"
-msgstr[2] "instalowanie dodatkowych zależności %s"
+"Czy chcesz zainstalować ze źródeł pakiety, które wymagają kompilacji?"
 
+#. R/packages2.R: ngettext(length(pkgs), "Installing package into %s\n(as %s is unspecified)",     "Installing packages into %s\n(as %s is unspecified)")
+#: R/packages2.R:0
 msgid ""
 "Installing package into %s\n"
 "(as %s is unspecified)"
@@ -1252,29 +2007,17 @@
 "Instalowanie pakietów w %s\n"
 "(ponieważ %s nie jest określony)"
 
-msgid "'lib' element %s is not a writable directory"
-msgid_plural "'lib' elements %s are not writable directories"
-msgstr[0] "element 'lib' %s nie jest zapisywalnym katalogiem"
-msgstr[1] "elementy 'lib' %s nie sÄ… zapisywalnymi katalogiami"
-msgstr[2] "elementy 'lib' %s nie sÄ… zapisywalnymi katalogiami"
-
-msgid "There is a binary version available but the source version is later"
-msgid_plural ""
-"There are binary versions available but the source versions are later"
-msgstr[0] "Jest dostępna wersja binarna ale wersja ze źródłami jest późniejsza"
-msgstr[1] "Są dostępne wersje binarne, ale wersje ze źródłami są późniejsze"
-msgstr[2] "Są dostępne wersje binarne, ale wersje ze źródłami są późniejsze"
-
-msgid ""
-"Do you want to install from sources the package which needs compilation?"
-msgid_plural ""
-"Do you want to install from sources the packages which need compilation?"
-msgstr[0] "Czy chcesz zainstalować ze źródeł pakiet, który wymaga kompilacji?"
-msgstr[1] ""
-"Czy chcesz zainstalować ze źródeł pakiety, które wymagają kompilacji?"
-msgstr[2] ""
-"Czy chcesz zainstalować ze źródeł pakiety, które wymagają kompilacji?"
+#. R/citation.R: ngettext(length(role), "Invalid role specification: %s.", "Invalid role specifications: %s.")
+#. R/citation.R: ngettext(length(pos[ind]), "Invalid role specification: %s.",     "Invalid role specifications: %s.")
+#: R/citation.R:0
+msgid "Invalid role specification: %s."
+msgid_plural "Invalid role specifications: %s."
+msgstr[0] "Niepoprawna specyfikacja roli: %s"
+msgstr[1] "Niepoprawne specyfikacje ról: %s"
+msgstr[2] "Niepoprawne specyfikacje ról: %s"
 
+#. R/packages2.R: ngettext(length(s2), "Package which is only available in source form, and may need compilation of C/C++/Fortran",     "Packages which are only available in source form, and may need compilation of C/C++/Fortran")
+#: R/packages2.R:0
 msgid ""
 "Package which is only available in source form, and may need compilation of "
 "C/C++/Fortran"
@@ -1291,21 +2034,26 @@
 "Pakiety, które są dostępne jedynie w formie źródłowej i mogą wymagać "
 "kompilacji C/C++/Fortran"
 
-msgid "installing the source package %s"
-msgid_plural "installing the source packages %s"
-msgstr[0] "instalowanie pakietu źródłowego %s"
-msgstr[1] "instalowanie pakietów źródłowych %s"
-msgstr[2] "instalowanie pakietów źródłowych %s"
-
-msgid "package %s is available as a source package but not as a binary"
-msgid_plural "packages %s are available as source packages but not as binaries"
+#. R/packages.R: ngettext(length(pkgs), "Removing package from %s\n(as %s is unspecified)",     "Removing packages from %s\n(as %s is unspecified)")
+#: R/packages.R:0
+msgid ""
+"Removing package from %s\n"
+"(as %s is unspecified)"
+msgid_plural ""
+"Removing packages from %s\n"
+"(as %s is unspecified)"
 msgstr[0] ""
-"pakiet %s jest dostępny jako pakiet z kodem źródłowym ale nie jako binaria"
+"Usuwanie pakietu z %s\n"
+"(ponieważ %s jest nieokreślone)"
 msgstr[1] ""
-"pakiety %s są dostępne jako pakiety z kodem źródłowym ale nie jako binaria"
+"Usuwanie pakietów z %s\n"
+"(ponieważ %s jest nieokreślone)"
 msgstr[2] ""
-"pakiety %s są dostępne jako pakiety z kodem źródłowym ale nie jako binaria"
+"Usuwanie pakietów z %s\n"
+"(ponieważ %s jest nieokreślone)"
 
+#. R/packages2.R: ngettext(sum(later), "There is a binary version available (and will be installed) but the source version is later",     "There are binary versions available (and will be installed) but the source versions are later")
+#: R/packages2.R:0
 msgid ""
 "There is a binary version available (and will be installed) but the source "
 "version is later"
@@ -1322,24 +2070,123 @@
 "Dostępne są wersje binarne (i one zostaną zainstalowane) ale wersje z kodem "
 "źródłowym są późniejsze"
 
-msgid "last record incomplete, %d line discarded"
-msgid_plural "last record incomplete, %d lines discarded"
-msgstr[0] "ostatni wiersz jest niekompletny, %d liniÄ™ odrzucono"
-msgstr[1] "ostatni wiersz jest niekompletny, %d linie odrzucono"
-msgstr[2] "ostatni wiersz jest niekompletny, %d linii odrzucono"
+#. R/packages2.R: ngettext(sum(later), "There is a binary version available but the source version is later",     "There are binary versions available but the source versions are later")
+#: R/packages2.R:0
+msgid "There is a binary version available but the source version is later"
+msgid_plural ""
+"There are binary versions available but the source versions are later"
+msgstr[0] "Jest dostępna wersja binarna ale wersja ze źródłami jest późniejsza"
+msgstr[1] "Są dostępne wersje binarne, ale wersje ze źródłami są późniejsze"
+msgstr[2] "Są dostępne wersje binarne, ale wersje ze źródłami są późniejsze"
+
+#. R/packages2.R: ngettext(length(added), "also installing the dependency %s",     "also installing the dependencies %s")
+#: R/packages2.R:0
+msgid "also installing the dependency %s"
+msgid_plural "also installing the dependencies %s"
+msgstr[0] "instalowanie dodatkowych zależności %s"
+msgstr[1] "instalowanie dodatkowych zależności %s"
+msgstr[2] "instalowanie dodatkowych zależności %s"
+
+#. R/edit.R: ngettext(sum(has_class), "class discarded from column %s", "classes discarded from columns %s")
+#: R/edit.R:0
+msgid "class discarded from column %s"
+msgid_plural "classes discarded from columns %s"
+msgstr[0] "klasa usunięta z kolumny %s"
+msgstr[1] "klasy usunięte z kolumn %s"
+msgstr[2] "klasy usunięte z kolumn %s"
+
+#. R/packages2.R: ngettext(length(not_avail), "dependency %s is not available",     "dependencies %s are not available")
+#: R/packages2.R:0
+msgid "dependency %s is not available"
+msgid_plural "dependencies %s are not available"
+msgstr[0] "zależność %s nie jest dostępna"
+msgstr[1] "zależności %s nie są dostępne"
+msgstr[2] "zależności %s nie są dostępne"
+
+#. R/packages2.R: ngettext(length(pkgs), "installing the source package %s", "installing the source packages %s")
+#: R/packages2.R:0
+msgid "installing the source package %s"
+msgid_plural "installing the source packages %s"
+msgstr[0] "instalowanie pakietu źródłowego %s"
+msgstr[1] "instalowanie pakietów źródłowych %s"
+msgstr[2] "instalowanie pakietów źródłowych %s"
 
+#. R/roman.R: ngettext(sum(!ok), "invalid roman numeral: %s", "invalid roman numerals: %s")
+#: R/roman.R:0
 msgid "invalid roman numeral: %s"
 msgid_plural "invalid roman numerals: %s"
 msgstr[0] "niepoprawna rzymska numeracja: %s"
 msgstr[1] "niepoprawne rzymskie numeracje: %s"
 msgstr[2] "niepoprawne rzymskie numeracje: %s"
 
+#. R/read.fwf.R: ngettext(nread%%recordlength, "last record incomplete, %d line discarded",     "last record incomplete, %d lines discarded")
+#: R/read.fwf.R:0
+msgid "last record incomplete, %d line discarded"
+msgid_plural "last record incomplete, %d lines discarded"
+msgstr[0] "ostatni wiersz jest niekompletny, %d liniÄ™ odrzucono"
+msgstr[1] "ostatni wiersz jest niekompletny, %d linie odrzucono"
+msgstr[2] "ostatni wiersz jest niekompletny, %d linii odrzucono"
+
+#. R/help.search.R: ngettext(n_of_objects_matched, "matched %d object.", "matched %d objects.")
+#: R/help.search.R:0
+msgid "matched %d object."
+msgid_plural "matched %d objects."
+msgstr[0] "dopasowano %d obiekt."
+msgstr[1] "dopasowano %d obiekty."
+msgstr[2] "dopasowano %d obiektów."
+
+#. R/package.skeleton.R: ngettext(sum(!have), "object '%s' not found", "objects '%s' not found")
+#: R/package.skeleton.R:0
+msgid "object '%s' not found"
+msgid_plural "objects '%s' not found"
+msgstr[0] "obiekt '%s' nie został znaleziony"
+msgstr[1] "obiekty '%s' nie zostały znalezione"
+msgstr[2] "obiekty '%s' nie zostały znalezione"
+
+#. R/packages2.R: ngettext(sum(base), "package %s is a base package, and should not be updated",     "packages %s are base packages, and should not be updated")
+#: R/packages2.R:0
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] "pakiet %s jest pakietem bazowym i nie powinien być aktualizowany"
+msgstr[1] "pakiety %s są pakietami bazowymi i nie powinny być aktualizowane"
+msgstr[2] "pakiety %s są pakietami bazowymi i nie powinny być aktualizowane"
+
+#. R/packages2.R: ngettext(length(na), "package %s is available as a source package but not as a binary",     "packages %s are available as source packages but not as binaries")
+#: R/packages2.R:0
+msgid "package %s is available as a source package but not as a binary"
+msgid_plural "packages %s are available as source packages but not as binaries"
+msgstr[0] ""
+"pakiet %s jest dostępny jako pakiet z kodem źródłowym ale nie jako binaria"
+msgstr[1] ""
+"pakiety %s są dostępne jako pakiety z kodem źródłowym ale nie jako binaria"
+msgstr[2] ""
+"pakiety %s są dostępne jako pakiety z kodem źródłowym ale nie jako binaria"
+
+#. R/windows/install.packages.R: ngettext(sum(inuse), "package %s is in use and will not be installed",     "packages %s are in use and will not be installed")
+#: R/windows/install.packages.R:0
 msgid "package %s is in use and will not be installed"
 msgid_plural "packages %s are in use and will not be installed"
 msgstr[0] "pakiet %s jest w użyciu i nie zostanie zainstalowany"
 msgstr[1] "pakiety %s są w użyciu i nie zostaną zainstalowane"
 msgstr[2] "pakiety %s są w użyciu i nie zostaną zainstalowane"
 
+#. R/packages2.R: ngettext(sum(miss), "package %s is not available (%s)", "packages %s are not available (%s)")
+#: R/packages2.R:0
+msgid "package %s is not available (%s)"
+msgid_plural "packages %s are not available (%s)"
+msgstr[0] "pakiet %s nie jest dostępny (%s)"
+msgstr[1] "pakiety %s nie są dostępne (%s)"
+msgstr[2] "pakiety %s nie są dostępne (%s)"
+
+#~ msgid "cannot choose a"
+#~ msgstr "nie można wybrać serwera lustrzanego"
+
+#~ msgid "mirror non-interactively"
+#~ msgstr "nieinteraktywnie"
+
+#~ msgid "no download method found"
+#~ msgstr "nie znaleziono metody pobierania"
+
 #~ msgid "function '%s' appears not to be an S3 generic"
 #~ msgstr "wygląda na to, że funkcja '%s' nie jest ogólną funkcją S3"
 
diff -Nru r-base-3.2.3/src/library/utils/po/R-pt_BR.po r-base-3.3.1/src/library/utils/po/R-pt_BR.po
--- r-base-3.2.3/src/library/utils/po/R-pt_BR.po	2015-03-24 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-pt_BR.po	2016-04-27 22:15:24.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-03-26 08:57-0300\n"
 "Last-Translator: Fernando Henrique <pessoal@fernandohrosa.com.br>\n"
 "Language-Team: http://www.feferraz.net/br/P/Projeto_Traducao_R_Portugues\n"
@@ -262,6 +262,14 @@
 msgid "did not assign() anything"
 msgstr ""
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr ""
+
 msgid "Browsing in the environment with call:"
 msgstr ""
 
@@ -419,13 +427,13 @@
 msgid "argument 'help.db' is deprecated"
 msgstr ""
 
-msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
+msgid "incorrect type specification"
 msgstr ""
 
-msgid "incorrect 'agrep' specification"
+msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 
-msgid "incorrect type specification"
+msgid "incorrect 'agrep' specification"
 msgstr ""
 
 msgid "could not find package %s"
@@ -605,10 +613,16 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr ""
 
-msgid "cannot choose a CRAN mirror non-interactively"
+msgid "'download.file()' error code '%d'"
+msgstr ""
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
 msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
+msgid "cannot choose a"
+msgstr ""
+
+msgid "mirror non-interactively"
 msgstr ""
 
 msgid "cannot set repositories non-interactively"
@@ -744,9 +758,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr ""
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr ""
-
 msgid "no method defined for function %s and signature %s"
 msgstr ""
 
@@ -888,6 +899,9 @@
 msgid "'digits' and 'digits.d' are both specified and the latter is not used"
 msgstr ""
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr ""
 
@@ -1018,9 +1032,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr ""
 
-msgid "no download method found"
-msgstr ""
-
 msgid "'url' must be a length-one character vector"
 msgstr ""
 
@@ -1080,6 +1091,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr ""
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr ""
 
@@ -1136,6 +1150,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] ""
diff -Nru r-base-3.2.3/src/library/utils/po/R-ru.po r-base-3.3.1/src/library/utils/po/R-ru.po
--- r-base-3.2.3/src/library/utils/po/R-ru.po	2015-03-28 23:15:06.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-ru.po	2016-04-27 22:15:24.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: R 2.11.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
-"PO-Revision-Date: 2015-03-27 19:05-0600\n"
+"POT-Creation-Date: 2015-06-06 13:51\n"
+"PO-Revision-Date: 2016-04-05 18:05-0600\n"
 "Last-Translator: Alexey Shipunov <dactylorhiza@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -1071,6 +1071,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr "ÎÅÔ ÄÉÒÅËÔÏÒÉÉ 'libs' × ÐÁËÅÔÅ %s"
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr "íÏÖÎÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÔÏÌØËÏ ÆÁÊÌÙ '*.zip' É '*.tar.gz'."
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr "winDialog() ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅÉÎÔÅÒÁËÔÉ×ÎÏ"
 
diff -Nru r-base-3.2.3/src/library/utils/po/R-tr.po r-base-3.3.1/src/library/utils/po/R-tr.po
--- r-base-3.2.3/src/library/utils/po/R-tr.po	2015-03-24 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-tr.po	2016-04-27 22:15:24.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: R 2.13.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-04-02 \n"
 "Last-Translator: Murat Alkan <muratalk@gmail.com>\n"
 "Language-Team: Turkish <muratalk@gmail.com>\n"
@@ -253,6 +253,14 @@
 msgid "did not assign() anything"
 msgstr ""
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr ""
+
 msgid "Browsing in the environment with call:"
 msgstr ""
 
@@ -409,13 +417,13 @@
 msgid "argument 'help.db' is deprecated"
 msgstr ""
 
-msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
+msgid "incorrect type specification"
 msgstr ""
 
-msgid "incorrect 'agrep' specification"
+msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 
-msgid "incorrect type specification"
+msgid "incorrect 'agrep' specification"
 msgstr ""
 
 #, fuzzy
@@ -596,10 +604,16 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr ""
 
-msgid "cannot choose a CRAN mirror non-interactively"
+msgid "'download.file()' error code '%d'"
+msgstr ""
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
 msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
+msgid "cannot choose a"
+msgstr ""
+
+msgid "mirror non-interactively"
 msgstr ""
 
 msgid "cannot set repositories non-interactively"
@@ -736,9 +750,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr ""
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr ""
-
 msgid "no method defined for function %s and signature %s"
 msgstr ""
 
@@ -879,6 +890,9 @@
 msgid "'digits' and 'digits.d' are both specified and the latter is not used"
 msgstr ""
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr ""
 
@@ -1006,9 +1020,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr ""
 
-msgid "no download method found"
-msgstr ""
-
 msgid "'url' must be a length-one character vector"
 msgstr ""
 
@@ -1069,6 +1080,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr ""
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr ""
 
@@ -1124,6 +1138,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] ""
diff -Nru r-base-3.2.3/src/library/utils/po/R-utils.pot r-base-3.3.1/src/library/utils/po/R-utils.pot
--- r-base-3.2.3/src/library/utils/po/R-utils.pot	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-utils.pot	2016-04-27 22:15:24.000000000 +0000
@@ -1,8 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58\n"
+"Project-Id-Version: utils 3.4.0\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -230,6 +229,12 @@
 msgid "did not assign() anything"
 msgstr ""
 
+msgid "Cannot debug primitive functions unless they are implicit generics (requires loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr ""
+
 msgid "Browsing in the environment with call:"
 msgstr ""
 
@@ -380,13 +385,13 @@
 msgid "argument 'help.db' is deprecated"
 msgstr ""
 
-msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
+msgid "incorrect type specification"
 msgstr ""
 
-msgid "incorrect 'agrep' specification"
+msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr ""
 
-msgid "incorrect type specification"
+msgid "incorrect 'agrep' specification"
 msgstr ""
 
 msgid "could not find package %s"
@@ -554,10 +559,16 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr ""
 
-msgid "cannot choose a CRAN mirror non-interactively"
+msgid "'download.file()' error code '%d'"
 msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
+msgid "failed to download mirrors file (%s); using local file '%s'"
+msgstr ""
+
+msgid "cannot choose a"
+msgstr ""
+
+msgid "mirror non-interactively"
 msgstr ""
 
 msgid "cannot set repositories non-interactively"
@@ -680,9 +691,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr ""
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr ""
-
 msgid "no method defined for function %s and signature %s"
 msgstr ""
 
@@ -821,6 +829,9 @@
 msgid "'digits' and 'digits.d' are both specified and the latter is not used"
 msgstr ""
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr ""
 
@@ -944,9 +955,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr ""
 
-msgid "no download method found"
-msgstr ""
-
 msgid "'url' must be a length-one character vector"
 msgstr ""
 
@@ -1001,6 +1009,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr ""
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr ""
 
@@ -1052,6 +1063,11 @@
 msgstr[0]    ""
 msgstr[1]    ""
 
+msgid        "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0]    ""
+msgstr[1]    ""
+
 msgid        "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0]    ""
diff -Nru r-base-3.2.3/src/library/utils/po/R-zh_CN.po r-base-3.3.1/src/library/utils/po/R-zh_CN.po
--- r-base-3.2.3/src/library/utils/po/R-zh_CN.po	2015-03-24 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/R-zh_CN.po	2016-04-27 22:15:24.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: R 2.3.0\n"
 "Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-03-24 11:52\n"
+"POT-Creation-Date: 2016-04-01 09:50\n"
 "PO-Revision-Date: 2011-01-18 13:56+0000\n"
 "Last-Translator: 陈� <FeiC@normipaiva.com>\n"
 "Language-Team: Chinese\n"
@@ -264,6 +264,14 @@
 msgid "did not assign() anything"
 msgstr "assign()没有用到"
 
+msgid ""
+"Cannot debug primitive functions unless they are implicit generics (requires "
+"loading the methods package)"
+msgstr ""
+
+msgid "error in trying to evaluate the expression for argument %s (%s)"
+msgstr "为�数%s評估表示�时�生了错误(%s)"
+
 msgid "Browsing in the environment with call:"
 msgstr "在調用环境里�览:"
 
@@ -422,15 +430,15 @@
 msgid "argument 'help.db' is deprecated"
 msgstr "�数'help.db'已���用了"
 
+msgid "incorrect type specification"
+msgstr "域设定得�对"
+
 msgid "no information in the database for package %s: need 'rebuild = TRUE'?"
 msgstr "数�库里没有关于程�包%s的信�：是�是需�设定'rebuild = TRUE'？"
 
 msgid "incorrect 'agrep' specification"
 msgstr "'agrep'设定得�对"
 
-msgid "incorrect type specification"
-msgstr "域设定得�对"
-
 msgid "could not find package %s"
 msgstr "找�到程�包%s"
 
@@ -611,11 +619,19 @@
 msgid "trying to use CRAN without setting a mirror"
 msgstr "试试在�设定镜�的情况下用CRAN"
 
-msgid "cannot choose a CRAN mirror non-interactively"
-msgstr "无法在�互交的情况下选用CRAN镜�"
+#, fuzzy
+msgid "'download.file()' error code '%d'"
+msgstr "read.dcf()在'%s'文件上出了错"
+
+msgid "failed to download mirrors file (%s); using local file '%s'"
+msgstr ""
+
+msgid "cannot choose a"
+msgstr ""
 
-msgid "cannot choose a BioC mirror non-interactively"
-msgstr "无法在�互交的情况下选用BioC镜�"
+#, fuzzy
+msgid "mirror non-interactively"
+msgstr "无法在�互交的情况下选用CRAN镜�"
 
 msgid "cannot set repositories non-interactively"
 msgstr "无法在�互交情况下设定貯�處"
@@ -762,9 +778,6 @@
 msgid "no methods for %s and no documentation for it as a function"
 msgstr "%s没有方法，也没有将之用作函数的帮助文件"
 
-msgid "error in trying to evaluate the expression for argument %s (%s)"
-msgstr "为�数%s評估表示�时�生了错误(%s)"
-
 msgid "no method defined for function %s and signature %s"
 msgstr "函数%s和标签%s没有设定方法"
 
@@ -907,6 +920,9 @@
 msgid "'digits' and 'digits.d' are both specified and the latter is not used"
 msgstr "'digits'和'digits.d'两个都设定了，但�者没有用"
 
+msgid "number of matches does not always match ncol(proto)"
+msgstr ""
+
 msgid "no lines found in %s"
 msgstr "%s里找�到信�"
 
@@ -1038,9 +1054,6 @@
 msgid "'ccaddress' must be of length 1"
 msgstr "'ccaddress'的长度必需为一"
 
-msgid "no download method found"
-msgstr "没有下载方法"
-
 #, fuzzy
 msgid "'url' must be a length-one character vector"
 msgstr "'title'值�么是NULL，�么是长度为一的字符��"
@@ -1105,6 +1118,9 @@
 msgid "there is no 'libs' directory in package %s"
 msgstr "在程�包%s里找�到'libs'这个目录"
 
+msgid "Only '*.zip' and '*.tar.gz' files can be installed."
+msgstr ""
+
 msgid "winDialog() cannot be used non-interactively"
 msgstr "winDialog()�能在�互交形�下使用"
 
@@ -1155,6 +1171,11 @@
 msgid_plural "packages %s are not available (%s)"
 msgstr[0] "没有%s这个程�包(给%s用)"
 
+#, fuzzy
+msgid "package %s is a base package, and should not be updated"
+msgid_plural "packages %s are base packages, and should not be updated"
+msgstr[0] "正在使用%s这个程�包，因此�会被安装"
+
 msgid "dependency %s is not available"
 msgid_plural "dependencies %s are not available"
 msgstr[0] "没有'%s'这�相�关系"
@@ -1226,6 +1247,12 @@
 msgid_plural "packages %s are in use and will not be installed"
 msgstr[0] "正在使用%s这个程�包，因此�会被安装"
 
+#~ msgid "cannot choose a BioC mirror non-interactively"
+#~ msgstr "无法在�互交的情况下选用BioC镜�"
+
+#~ msgid "no download method found"
+#~ msgstr "没有下载方法"
+
 #~ msgid ","
 #~ msgstr ","
 
@@ -1438,9 +1465,6 @@
 #~ msgid "updating HTML package descriptions"
 #~ msgstr "更新HTML程�包的�述内容"
 
-#~ msgid "read.dcf() error on file '%s'"
-#~ msgstr "read.dcf()在'%s'文件上出了错"
-
 #~ msgid "Could not find aspell or ispell executable."
 #~ msgstr "找�到aspell或ispell执行文件"
 
diff -Nru r-base-3.2.3/src/library/utils/po/utils.pot r-base-3.3.1/src/library/utils/po/utils.pot
--- r-base-3.2.3/src/library/utils/po/utils.pot	2015-06-06 22:15:29.000000000 +0000
+++ r-base-3.3.1/src/library/utils/po/utils.pot	2016-04-27 22:15:24.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The R Core Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: R 3.2.0\n"
-"Report-Msgid-Bugs-To: bugs.r-project.org\n"
-"POT-Creation-Date: 2015-06-06 13:58+0100\n"
+"Project-Id-Version: utils 3.4.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-01 10:28-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,88 +17,88 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: io.c:324 io.c:328 io.c:338 io.c:569 io.c:769 io.c:822 io.c:834 io.c:838
-#: io.c:844 io.c:845 io.c:1068 io.c:1069 io.c:1071 io.c:1072 io.c:1073
-#: io.c:1074 io.c:1075 io.c:1076 stubs.c:47 stubs.c:67 windows/dialogs.c:169
+#: io.c:329 io.c:333 io.c:343 io.c:574 io.c:774 io.c:827 io.c:839 io.c:843
+#: io.c:849 io.c:850 io.c:1073 io.c:1074 io.c:1076 io.c:1077 io.c:1078
+#: io.c:1079 io.c:1080 io.c:1081 stubs.c:47 stubs.c:67 windows/dialogs.c:169
 #: windows/dialogs.c:194 windows/dialogs.c:197 windows/dialogs.c:241
 #: windows/dialogs.c:278 windows/dialogs.c:289 windows/dialogs.c:313
-#: windows/dialogs.c:321 windows/util.c:111 windows/widgets.c:78
+#: windows/dialogs.c:321 windows/util.c:117 windows/widgets.c:78
 #: windows/widgets.c:81 windows/widgets.c:86
 #, c-format
 msgid "invalid '%s' argument"
 msgstr ""
 
-#: io.c:347 io.c:831
+#: io.c:352 io.c:836
 msgid "invalid quote symbol set"
 msgstr ""
 
-#: io.c:359 io.c:854 io.c:1056
+#: io.c:364 io.c:859 io.c:1061
 msgid "cannot open the connection"
 msgstr ""
 
-#: io.c:362 io.c:366
+#: io.c:367 io.c:371
 msgid "cannot read from this connection"
 msgstr ""
 
-#: io.c:413 io.c:431
+#: io.c:418 io.c:436
 #, c-format
 msgid "quoted string on line %d terminated by EOF"
 msgstr ""
 
-#: io.c:565
+#: io.c:570
 msgid "the first argument must be of mode character"
 msgstr ""
 
-#: io.c:595
+#: io.c:600
 #, c-format
 msgid "invalid 'numerals' string: \"%s\""
 msgstr ""
 
-#: io.c:771
+#: io.c:776
 #, c-format
 msgid "Selection: "
 msgstr ""
 
-#: io.c:863 io.c:877
+#: io.c:868 io.c:882
 msgid "cannot allocate buffer in 'readTableHead'"
 msgstr ""
 
-#: io.c:888
+#: io.c:893
 msgid "\\ followed by EOF"
 msgstr ""
 
-#: io.c:937 io.c:940
+#: io.c:942 io.c:945
 #, c-format
 msgid "incomplete final line found by readTableHeader on '%s'"
 msgstr ""
 
-#: io.c:997
+#: io.c:1002
 msgid "index out of range"
 msgstr ""
 
-#: io.c:1049
+#: io.c:1054
 msgid "'file' is not a connection"
 msgstr ""
 
-#: io.c:1052
+#: io.c:1057
 msgid "cannot write to this connection"
 msgstr ""
 
-#: io.c:1082
+#: io.c:1087
 msgid "'dec' must be a single character"
 msgstr ""
 
-#: io.c:1108
+#: io.c:1113
 #, c-format
 msgid "corrupt data frame -- length of column %d does not not match nrows"
 msgstr ""
 
-#: io.c:1139
+#: io.c:1144
 #, c-format
 msgid "column %s claims to be a factor but does not have numeric codes"
 msgstr ""
 
-#: io.c:1157
+#: io.c:1162
 msgid "corrupt matrix -- dims not not match length"
 msgstr ""
 
@@ -127,20 +127,20 @@
 msgid "invalid '%s' specification"
 msgstr ""
 
-#: utils.c:83
+#: utils.c:85
 msgid "'hostname' must be a character vector of length 1"
 msgstr ""
 
-#: utils.c:89
+#: utils.c:91
 #, c-format
 msgid "nsl() was unable to resolve host '%s'"
 msgstr ""
 
-#: utils.c:96
+#: utils.c:98
 msgid "unknown format returned by 'gethostbyname'"
 msgstr ""
 
-#: utils.c:105
+#: utils.c:107
 msgid "nsl() is not supported on this platform"
 msgstr ""
 
@@ -188,41 +188,41 @@
 msgid "Registry key '%ls' not found"
 msgstr ""
 
-#: windows/util.c:41
+#: windows/util.c:42
 msgid "unsupported version of Windows"
 msgstr ""
 
-#: windows/util.c:275
+#: windows/util.c:281
 msgid "argument must be a character vector or a raw vector"
 msgstr ""
 
-#: windows/util.c:312
+#: windows/util.c:318
 msgid "unable to open the clipboard"
 msgstr ""
 
-#: windows/util.c:317
+#: windows/util.c:323
 msgid "unable to write to the clipboard"
 msgstr ""
 
-#: windows/util.c:396
+#: windows/util.c:402
 msgid "'title' must be a character string"
 msgstr ""
 
-#: windows/util.c:405
+#: windows/util.c:411
 msgid "'text' must be a character string"
 msgstr ""
 
-#: windows/util.c:444
+#: windows/util.c:450
 #, c-format
 msgid "'%s' must be length 1"
 msgstr ""
 
-#: windows/util.c:557
+#: windows/util.c:563
 #, c-format
 msgid "'%s' must be a list"
 msgstr ""
 
-#: windows/util.c:561
+#: windows/util.c:567
 #, c-format
 msgid "'%s' element %d is not a window handle"
 msgstr ""
diff -Nru r-base-3.2.3/src/library/utils/R/aspell.R r-base-3.3.1/src/library/utils/R/aspell.R
--- r-base-3.2.3/src/library/utils/R/aspell.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/aspell.R	2016-03-16 23:03:21.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/aspell.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -207,8 +207,7 @@
 
 	## Look at words not in dictionary with suggestions.
 
-	ind <- grepl("^&", lines)
-	if(any(ind)) {
+	if(any(ind <- startsWith(lines, "&"))) {
 	    info <- strsplit(lines[ind], ": ", fixed = TRUE)
 	    one <- strsplit(sapply(info, `[`, 1L), " ",  fixed = TRUE)
 	    two <- strsplit(sapply(info, `[`, 2L), ", ", fixed = TRUE)
@@ -223,8 +222,7 @@
 	    db <- rbind(db, db1)
 	}
 	## Looks at words not in dictionary with no suggestions.
-	ind <- grepl("^#", lines)
-	if(any(ind)) {
+	if(any(ind <- startsWith(lines, "#"))) {
 	    one <- strsplit(lines[ind], " ", fixed = TRUE)
 	    db1 <- data.frame(Original =
 			      as.character(sapply(one, `[`, 2L)),
@@ -268,8 +266,7 @@
                    from,
                    split(x$Suggestions, x$Original)))
     } else {
-        sep <- sprintf("\n%s",
-                       paste(rep.int(" ", indent), collapse = ""))
+        sep <- sprintf("\n%s", strrep(" ", indent))
         paste(names(from),
               sapply(from, paste, collapse = sep),
               sep = sep)
@@ -335,8 +332,7 @@
     dirnames <- c(file.path(R.home("share"), "dictionaries"), dirnames)
 
     ## For now, all dictionary files should be .rds files.
-    ind <- !grepl("\\.rds$", dictionaries)
-    if(any(ind))
+    if(any(ind <- !endsWith(dictionaries, ".rds")))
         dictionaries[ind] <- sprintf("%s.rds", dictionaries[ind])
 
     out <- character(n)
@@ -353,7 +349,6 @@
         out[pos] <- find_files_in_directories(dictionaries[pos],
                                               dirnames)
     }
-
     out
 }
 
@@ -736,10 +731,7 @@
         }
     }
 
-    for(re in ignore[nzchar(ignore)])
-        lines <- blank_out_regexp_matches(lines, re)
-
-    lines
+    blank_out_ignores_in_lines(lines, ignore)
 }
 
 get_parse_data_for_message_strings <-
@@ -917,11 +909,11 @@
         out <- character(length(s))
         i <- 1L
         out[i] <- blank_out_regexp_matches(s[i], "^msgid[ \t]+\"")
-        while(grepl("^\"", s[i <- i + 1L]))
+        while(startsWith(s[i <- i + 1L], '"'))
             out[i] <- sub("^\"", " ", s[i])
         if(grepl("^msgid_plural[ \t]", s[i])) {
             out[i] <- blank_out_regexp_matches(s[i], "^msgid_plural[ \t]+\"")
-            while(grepl("^\"", s[i <- i + 1L]))
+            while(startsWith(s[i <- i + 1L], '"'))
                 out[i] <- sub("^\"", " ", s[i])
         }
         out
@@ -938,10 +930,7 @@
     ## blanks, similar to what the R text filter does.
     ## </FIXME>
 
-    for(re in ignore[nzchar(ignore)])
-        lines <- blank_out_regexp_matches(lines, re)
-
-    lines
+    blank_out_ignores_in_lines(lines, ignore)
 }
 
 ## For spell-checking all pot files in a package.
@@ -1056,9 +1045,7 @@
     ind <- !ind
     lines[ind] <- lapply(lines[ind], paste0, " ")
     lines <- unlist(lines, use.names = FALSE)
-    for(re in ignore[nzchar(ignore)])
-        lines <- blank_out_regexp_matches(lines, re)
-    lines
+    blank_out_ignores_in_lines(lines, ignore)
 }
 
 ## For spell-checking package DESCRIPTION files.
@@ -1164,17 +1151,27 @@
 ## Utilities.
 
 blank_out_regexp_matches <-
-function(s, re)
+function(s, re, ...)
 {
-    m <- gregexpr(re, s)
-    regmatches(s, m) <- Map(blanks, lapply(regmatches(s, m), nchar))
+    m <- gregexpr(re, s, ...)
+    regmatches(s, m) <-
+        Map(function(n) strrep(" ", n),
+            lapply(regmatches(s, m), nchar))
     s
 }
 
-blanks <-
-function(n) {
-    vapply(Map(rep.int, rep.int(" ", length(n)), n, USE.NAMES = FALSE),
-           paste, "", collapse = "")
+blank_out_ignores_in_lines <-
+function(lines, ignore)
+{
+    args <- list()
+    if(is.list(ignore)) {
+        args <- ignore[-1L]
+        ignore <- ignore[[1L]]
+    }
+    for(re in ignore[nzchar(ignore)])
+        lines <- do.call(blank_out_regexp_matches,
+                         c(list(lines, re), args))
+    lines
 }
 
 find_files_in_directories <-
diff -Nru r-base-3.2.3/src/library/utils/R/citation.R r-base-3.3.1/src/library/utils/R/citation.R
--- r-base-3.2.3/src/library/utils/R/citation.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/citation.R	2016-03-16 23:03:21.000000000 +0000
@@ -314,6 +314,14 @@
                  regmatches(x, gregexpr(pattern, y), invert = TRUE))
     x <- x[!sapply(x, .is_not_nonempty_text)]
 
+    ## don't expect Jr. to be a person
+    jr <- which(!is.na(match(x, c("Jr", "Jr.", "jr", "jr."))))
+    if(length(jr)) {
+        jr <- jr[jr > 1L]
+        x[jr - 1L] <- paste(x[jr - 1L], x[jr], sep = ", ")
+        x <- x[-jr]
+    }
+
     if(!length(x)) return(person())
 
     ## Step C.
@@ -333,7 +341,29 @@
         else NULL
         x <- sub("[[:space:]]*\\[[^)]*\\]", "", x)
         x <- unlist(strsplit(x, "[[:space:]]+"))
-        z <- person(given = x[-length(x)], family = x[length(x)],
+
+	## try to correctly guess von/van/de, Jr., etc.
+	jr <- c("Jr", "Jr.")
+	von <- c("De", "Den", "Der", "La", "Le", "Ten", "Van", "Von")
+	family <- x[length(x)]
+	given <- x[-length(x)]
+	if(!is.null(family) &&
+           !is.na(match(family, c(jr, tolower(jr))))) {
+            family <- paste(given[length(given)], family)
+            given <- given[-length(given)]
+	}
+	if((ng <- length(given)) &&
+           !is.na(match(gng <- given[ng], c(von, tolower(von))))) {
+            family <- paste(gng, family)
+            given <- given[-ng]
+	}
+	if((ng <- length(given)) &&
+           !is.na(match(gng <- given[ng], c(von, tolower(von))))) {
+            family <- paste(gng, family)
+            given <- given[-ng]
+	}
+	
+        z <- person(given = given, family = family,
                     email = email, role = role, comment = comment)
         return(z)
     }
@@ -428,8 +458,14 @@
 
 toBibtex.person <-
 function(object, ...)
-    paste(format(object, include = c("given", "family")),
-          collapse = " and ")
+{
+    object <- sapply(object, function(p) {
+         br <- if(is.null(p$family)) c("{", "}") else c("", "")
+         format(p, include = c("family", "given"),
+                braces = list(given = br, family = c("", ",")))
+    })
+    paste(object, collapse = " and ")
+}
 
 ######################################################################
 
@@ -628,15 +664,21 @@
         on.exit({tools::Rd2txt_options(saveopt); close(out)})
         sapply(.bibentry_expand_crossrefs(x),
                function(y) {
-                   rd <- tools::toRd(y, style = .bibstyle)
+                   txt <- tools::toRd(y, style = .bibstyle)
                    ## <FIXME>
                    ## Ensure a closing </p> via a final empty line for
                    ## now (PR #15692).
-                   if(style == "html") rd <- paste(rd, "\n")
+                   if(style == "html") txt <- paste(txt, "\n")
                    ## </FIXME>
-                   con <- textConnection(rd)
+                   con <- textConnection(txt)
                    on.exit(close(con))
-                   f(con, fragment = TRUE, out = out, permissive = TRUE, ...)
+                   rd <- tools::parse_Rd(con,
+                                         fragment = TRUE,
+                                         permissive = TRUE)
+                   rd <- tools:::processRdSexprs(rd,
+                                                 "build",
+                                                 macros = attr(rd, "macros"))
+                   f(rd, fragment = TRUE, out = out, ...)
                    paste(readLines(out), collapse = "\n")
                })
     }
@@ -769,11 +811,6 @@
     invisible(x)
 }
 
-## Not vectorized for now: see ?regmatches for a vectorized version.
-.blanks <-
-function(n)
-    paste(rep.int(" ", n), collapse = "")
-
 .format_call_RR <-
 function(cname, cargs)
 {
@@ -783,7 +820,7 @@
     lens <- lengths(cargs)
     sums <- cumsum(lens)
     starters <- c(sprintf("%s(", cname),
-                  rep.int(.blanks(nchar(cname) + 1L), sums[n] - 1L))
+                  rep.int(strrep(" ", nchar(cname) + 1L), sums[n] - 1L))
     trailers <- c(rep.int("", sums[n] - 1L), ")")
     trailers[sums[-n]] <- ","
     sprintf("%s%s%s", starters, unlist(cargs), trailers)
@@ -822,7 +859,7 @@
         n <- length(v)
         if(n > 1L)
             prefix <- c(prefix,
-                        rep.int(.blanks(nchar(prefix)), n - 1L))
+                        rep.int(strrep(" ", nchar(prefix)), n - 1L))
         sprintf("%s%s", prefix, v)
     }
 
@@ -853,10 +890,10 @@
 
     if(!is.null(mheader <- attr(x, "mheader")))
         s[[1L]] <- c(s[[1L]],
-                     paste("mheader = ", deparse(mheader)))
+                     paste("mheader =", deparse(mheader)))
     if(!is.null(mfooter <- attr(x, "mfooter")))
         s[[1L]] <- c(s[[1L]],
-                     paste("mfooter = ", deparse(mfooter)))
+                     paste("mfooter =", deparse(mfooter)))
 
     s <- Map(.format_call_RR, "bibentry", s)
     if(collapse && (length(s) > 1L))
@@ -1127,18 +1164,27 @@
 
     year <- sub("-.*", "", meta$`Date/Publication`)
     if(!length(year)) {
-        year <- sub(".*((19|20)[[:digit:]]{2}).*", "\\1", meta$Date,
-                    perl = TRUE) # may not be needed, but safer
-        if(is.null(meta$Date)){
+        if(is.null(meta$Date)) {
             warning(gettextf("no date field in DESCRIPTION file of package %s",
                              sQuote(package)),
                     domain = NA)
+        } else {
+            date <- trimws(as.vector(meta$Date))[1L]
+            date <- strptime(date, "%Y-%m-%d", tz = "GMT")
+            if(!is.na(date)) year <- format(date, "%Y")
         }
-        else if(!length(year)) {
-            warning(gettextf("could not determine year for %s from package DESCRIPTION file",
-                             sQuote(package)),
-                    domain = NA)
-        }
+    }
+    ## If neither Date/Publication nor Date work, try Packaged (build
+    ## time stamp): if this fails too, use NA (PR #16550).
+    if(!length(year)) {
+        date <- as.POSIXlt(sub(";.*", "", trimws(meta$Packaged)[1L]))
+        if(!is.na(date)) year <- format(date, "%Y")
+    }
+    if(!length(year)) {
+        warning(gettextf("could not determine year for %s from package DESCRIPTION file",
+                         sQuote(package)),
+                domain = NA)
+        year <- NA_character_
     }
 
     author <- meta$`Authors@R`
@@ -1165,10 +1211,9 @@
               note = paste("R package version", meta$Version)
               )
 
-    z$url <- if(identical(meta$Repository, "CRAN"))
-        sprintf("https://CRAN.R-project.org/package=%s", package)
-    else
-        meta$URL
+    if(identical(meta$Repository, "CRAN"))
+        z$url <- 
+            sprintf("https://CRAN.R-project.org/package=%s", package)
 
     if(identical(meta$Repository, "R-Forge")) {
         z$url <- if(!is.null(rfp <- meta$"Repository/R-Forge/Project"))
@@ -1179,6 +1224,15 @@
             z$note <- paste(z$note, rfr, sep = "/r")
     }
 
+    if(!length(z$url) && !is.null(url <- meta$URL)) {
+        ## Cannot have several URLs in BibTeX and bibentry object URL
+        ## fields (PR #16240).
+        if(grepl("[, ]", url))
+            z$note <- url
+        else
+            z$url <- url
+    }
+
     header <- if(!auto_was_meta) {
         gettextf("To cite package %s in publications use:",
                  sQuote(package))
@@ -1331,7 +1385,15 @@
     ## </FIXME>
     ## If this leaves nothing or more than one ...
     if(length(x) != 1L) return("")
-    format(x, include = c("given", "family", "email"))
+    display <- format(x, include = c("given", "family"))
+    address <- format(x, include = c("email"))
+    ## Need to quote display names at least when they contain commas
+    ## (RFC 5322 <https://tools.ietf.org/html/rfc5322>).
+    if(any(ind <- grepl(",", display))) {
+        display[ind] <- sprintf("\"%s\"",
+                                gsub("\"", "\\\\\"", display[ind]))
+    }
+    paste(display, address)
 }
 
 ## Cite using the default style (which is usually citeNatbib)
diff -Nru r-base-3.2.3/src/library/utils/R/format.R r-base-3.3.1/src/library/utils/R/format.R
--- r-base-3.2.3/src/library/utils/R/format.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/format.R	2016-03-16 23:03:21.000000000 +0000
@@ -67,18 +67,14 @@
     ## left-justified text.  Somewhat tricky because strwrap() eats up
     ## leading whitespace ...
 
-    .make_empty_string <- function(n) {
-        paste(rep.int(" ", n), collapse = "")
-    }
-
     labels <- format(labels, justify = "right")
     len <- length(x)
     delta <- nchar(labels[1L], "width") + offset
     x <- strwrap(x, width = width - delta - nchar(sep, "width"),
                  simplify = FALSE)
     nlines <- cumsum(lengths(x))
-    prefix <- rep.int(.make_empty_string(delta), nlines[len])
+    prefix <- rep.int(strrep(" ", delta), nlines[len])
     prefix[1L + c(0L, nlines[-len])] <-
-        paste0(.make_empty_string(offset), labels)
+        paste0(strrep(" ", offset), labels)
     paste(prefix, unlist(x), sep = sep)
 }
diff -Nru r-base-3.2.3/src/library/utils/R/head.R r-base-3.3.1/src/library/utils/R/head.R
--- r-base-3.2.3/src/library/utils/R/head.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/head.R	2016-03-16 23:03:20.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/head.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -78,10 +78,13 @@
     stopifnot(length(n) == 1L)
     nrx <- nrow(x)
     n <- if (n < 0L) max(nrx + n, 0L) else min(n, nrx)
-    sel <- seq.int(to = nrx, length.out = n)
+    sel <- as.integer(seq.int(to = nrx, length.out = n))
+    ## TODO: Once we allow "LONG_DIM" for matrices, need
+    ## sel <- seq.int(to = nrx, length.out = n)
+    ## if(nrx <= .Machine$integer.max) sel <- as.integer(sel)
     ans <- x[sel, , drop = FALSE]
     if (addrownums && is.null(rownames(x)))
-    	rownames(ans) <- paste0("[", sel, ",]")
+	rownames(ans) <- format(sprintf("[%d,]", sel), justify="right")
     ans
 }
 tail.table  <- function(x, n = 6L, addrownums = TRUE, ...) {
diff -Nru r-base-3.2.3/src/library/utils/R/help.R r-base-3.3.1/src/library/utils/R/help.R
--- r-base-3.2.3/src/library/utils/R/help.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/help.R	2016-03-16 23:03:21.000000000 +0000
@@ -254,7 +254,7 @@
     cat("\\end{document}\n", file = texfile, append = TRUE)
     helper <- if (exists("offline_help_helper", envir = .GlobalEnv))
         get("offline_help_helper", envir = .GlobalEnv)
-    else utils:::offline_help_helper
+    else offline_help_helper
     if (has_figure) helper(texfile, type, texinputs)
     else helper(texfile, type)
     invisible()
diff -Nru r-base-3.2.3/src/library/utils/R/help.search.R r-base-3.3.1/src/library/utils/R/help.search.R
--- r-base-3.2.3/src/library/utils/R/help.search.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/help.search.R	2016-03-16 23:03:19.000000000 +0000
@@ -374,6 +374,10 @@
             flush.console()
         }
 
+        want_type_help <- any(types == "help")
+        want_type_demo <- any(types == "demo")
+        want_type_vignette <- any(types == "vignette")
+
 	if(!is.null(package)) {
 	    packages_in_hsearch_db <- package
             package_paths <- NULL
@@ -431,6 +435,9 @@
 	dbMat <- vector("list", length(packages_in_hsearch_db) * 4L)
 	dim(dbMat) <- c(length(packages_in_hsearch_db), 4L)
 
+        ## Empty hsearch index:
+        hDB0 <- tools:::.build_hsearch_index(NULL)
+
 	for(p in packages_in_hsearch_db) {
             if(incr && np %% incr == 0L) {
                 message(".", appendLF = FALSE, domain = NA)
@@ -455,40 +462,46 @@
 	    ## We always load hsearch.rds to establish the format,
 	    ## sometimes vignette.rds.
 
-	    if(file.exists(hs_file <- file.path(path, "Meta", "hsearch.rds"))) {
-		hDB <- readRDS(hs_file)
-		if(!is.null(hDB)) {
-		    ## Fill up possibly missing information.
-		    if(is.na(match("Encoding", colnames(hDB[[1L]]))))
-			hDB[[1L]] <- cbind(hDB[[1L]], Encoding = "")
-                    ## <FIXME>
-                    ## Transition fro old-style to new-style colnames.
-                    ## Remove eventually.
-                    for(i in seq_along(hDB)) {
-                        colnames(hDB[[i]]) <-
-                            tools:::hsearch_index_colnames[[i]]
+            hDB <- NULL
+            if(want_type_help) {
+                if(file.exists(hs_file <-
+                    file.path(path, "Meta", "hsearch.rds"))) {
+                    hDB <- readRDS(hs_file)
+                    if(!is.null(hDB)) {
+                        ## Fill up possibly missing information.
+                        if(is.na(match("Encoding", colnames(hDB[[1L]]))))
+                            hDB[[1L]] <- cbind(hDB[[1L]], Encoding = "")
+                        ## <FIXME>
+                        ## Transition fro old-style to new-style colnames.
+                        ## Remove eventually.
+                        for(i in seq_along(hDB)) {
+                            colnames(hDB[[i]]) <-
+                                tools:::hsearch_index_colnames[[i]]
+                        }
+                        ## </FIXME>
+                    } else if(verbose >= 2L) {
+                        message(gettextf("package %s has empty hsearch data - strangely",
+                                         sQuote(p)),
+                                domain = NA)
+                        flush.console()
                     }
-                    ## </FIXME>
-		    nh <- NROW(hDB[[1L]])
-		    hDB[[1L]] <- cbind(hDB[[1L]],
-		                       Type = rep("help", nh))
-		    if (nh)
-		    	hDB[[1L]][, "LibPath"] <- path
-		    if ("vignette" %in% types)
-		    	hDB <- merge_vignette_index(hDB, path, p)
-		    if ("demo" %in% types)
-		    	hDB <- merge_demo_index(hDB, path, p)
-		    ## Put the hsearch index for the np-th package into the
-		    ## np-th row of the matrix used for aggregating.
-		    dbMat[np, seq_along(hDB)] <- hDB
-		} else if(verbose >= 2L) {
-		    message(gettextf("package %s has empty hsearch data - strangely",
-                                     sQuote(p)), domain = NA)
-                    flush.console()
-                }
-	    }
-	    else if(!is.null(package))
-                warning("no hsearch.rds meta data for package ", p, domain = NA)
+                } else if(!is.null(package))
+                      warning("no hsearch.rds meta data for package ", p,
+                              domain = NA)
+            }
+            if(is.null(hDB))
+                hDB <- hDB0
+            nh <- NROW(hDB[[1L]])
+            hDB[[1L]] <- cbind(hDB[[1L]], Type = rep("help", nh))
+            if(nh)
+                hDB[[1L]][, "LibPath"] <- path
+            if(want_type_vignette)
+                hDB <- merge_vignette_index(hDB, path, p)
+            if(want_type_demo)
+                hDB <- merge_demo_index(hDB, path, p)
+            ## Put the hsearch index for the np-th package into the
+            ## np-th row of the matrix used for aggregating.
+            dbMat[np, seq_along(hDB)] <- hDB
 	}
 
 	if(verbose >= 2L)  {
@@ -559,9 +572,12 @@
 	bad_IDs <-
 	    unlist(sapply(db,
 			  function(u)
-			  u[rowSums(is.na(nchar(u, "c", TRUE))) > 0, "ID"]))
+                              u[rowSums(is.na(nchar(u, "chars",
+                                                    allowNA = TRUE,
+                                                    keepNA = FALSE))) > 0,
+                                "ID"]))
         ## FIXME: drop this fallback
-	if(length(bad_IDs)) { ## try latin1
+	if(length(bad_IDs)) {           # try latin1
             for(i in seq_along(db)) {
                 ind <- db[[i]][, "ID"] %in% bad_IDs
                 db[[i]][ind, ] <- iconv(db[[i]][ind, ], "latin1", "")
@@ -569,7 +585,10 @@
             bad_IDs <-
                 unlist(sapply(db,
                               function(u)
-                              u[rowSums(is.na(nchar(u, "c", TRUE))) > 0, "ID"]))
+                                  u[rowSums(is.na(nchar(u, "chars",
+                                                        allowNA = TRUE,
+                                                        keepNA = FALSE))) > 0,
+                                    "ID"]))
         }
 	## If there are any invalid multi-byte character data
 	## left, we simple remove all Rd objects with at least one
@@ -579,6 +598,16 @@
 	    for(i in seq_along(db)) {
 		ind <- db[[i]][, "ID"] %in% bad_IDs
 		db[[i]] <- db[[i]][!ind, ]
+	    }
+	}
+
+        ## Drop entries without topic as these cannot be accessed.
+        ## (These come from help pages without \alias.)
+        bad_IDs <- db$Base[is.na(db$Base[, "Topic"]), "ID"]
+        if(length(bad_IDs)) {
+	    for(i in seq_along(db)) {
+		ind <- db[[i]][, "ID"] %in% bad_IDs
+		db[[i]] <- db[[i]][!ind, ]
 	    }
 	}
 
diff -Nru r-base-3.2.3/src/library/utils/R/MARC.R r-base-3.3.1/src/library/utils/R/MARC.R
--- r-base-3.2.3/src/library/utils/R/MARC.R	2015-08-25 22:16:31.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/MARC.R	1970-01-01 00:00:00.000000000 +0000
@@ -1,394 +0,0 @@
-#  File src/library/utils/R/MARC.R
-#  Part of the R package, https://www.R-project.org
-#
-#  Copyright (C) 1995-2014 The R Core Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  A copy of the GNU General Public License is available at
-#  https://www.R-project.org/Licenses/
-
-MARC_relator_db <-
-structure(list(term = c("Abridger", "Actor", "Adapter", "Addressee", 
-"Analyst", "Animator", "Annotator", "Appellant", "Appellee", 
-"Applicant", "Architect", "Arranger", "Art copyist", "Art director", 
-"Artist", "Artistic director", "Assignee", "Associated name", 
-"Attributed name", "Auctioneer", "Author", "Author in quotations or text abstracts", 
-"Author of afterword, colophon, etc.", "Author of dialog", "Author of introduction, etc.", 
-"Autographer", "Bibliographic antecedent", "Binder", "Binding designer", 
-"Blurb writer", "Book designer", "Book producer", "Bookjacket designer", 
-"Bookplate designer", "Bookseller", "Braille embosser", "Broadcaster", 
-"Calligrapher", "Cartographer", "Caster", "Censor", "Choreographer", 
-"Cinematographer", "Client", "Collection registrar", "Collector", 
-"Collotyper", "Colorist", "Commentator", "Commentator for written text", 
-"Compiler", "Complainant", "Complainant-appellant", "Complainant-appellee", 
-"Composer", "Compositor", "Conceptor", "Conductor", "Conservator", 
-"Consultant", "Consultant to a project", "Contestant", "Contestant-appellant", 
-"Contestant-appellee", "Contestee", "Contestee-appellant", "Contestee-appellee", 
-"Contractor", "Contributor", "Copyright claimant", "Copyright holder", 
-"Corrector", "Correspondent", "Costume designer", "Court governed", 
-"Court reporter", "Cover designer", "Creator", "Curator", "Dancer", 
-"Data contributor", "Data manager", "Dedicatee", "Dedicator", 
-"Defendant", "Defendant-appellant", "Defendant-appellee", "Degree granting institution", 
-"Degree supervisor", "Delineator", "Depicted", "Depositor", "Designer", 
-"Director", "Dissertant", "Distribution place", "Distributor", 
-"Donor", "Draftsman", "Dubious author", "Editor", "Editor of compilation", 
-"Editor of moving image work", "Electrician", "Electrotyper", 
-"Enacting jurisdiction", "Engineer", "Engraver", "Etcher", "Event place", 
-"Expert", "Facsimilist", "Field director", "Film director", "Film distributor", 
-"Film editor", "Film producer", "Filmmaker", "First party", "Forger", 
-"Former owner", "Funder", "Geographic information specialist", 
-"Honoree", "Host", "Host institution", "Illuminator", "Illustrator", 
-"Inscriber", "Instrumentalist", "Interviewee", "Interviewer", 
-"Inventor", "Issuing body", "Judge", "Jurisdiction governed", 
-"Laboratory", "Laboratory director", "Landscape architect", "Lead", 
-"Lender", "Libelant", "Libelant-appellant", "Libelant-appellee", 
-"Libelee", "Libelee-appellant", "Libelee-appellee", "Librettist", 
-"Licensee", "Licensor", "Lighting designer", "Lithographer", 
-"Lyricist", "Manufacture place", "Manufacturer", "Marbler", "Markup editor", 
-"Medium", "Metadata contact", "Metal-engraver", "Minute taker", 
-"Moderator", "Monitor", "Music copyist", "Musical director", 
-"Musician", "Narrator", "Onscreen presenter", "Opponent", "Organizer", 
-"Originator", "Other", "Owner", "Panelist", "Papermaker", "Patent applicant", 
-"Patent holder", "Patron", "Performer", "Permitting agency", 
-"Photographer", "Plaintiff", "Plaintiff-appellant", "Plaintiff-appellee", 
-"Platemaker", "Praeses", "Presenter", "Printer", "Printer of plates", 
-"Printmaker", "Process contact", "Producer", "Production company", 
-"Production designer", "Production manager", "Production personnel", 
-"Production place", "Programmer", "Project director", "Proofreader", 
-"Provider", "Publication place", "Publisher", "Publishing director", 
-"Puppeteer", "Radio director", "Radio producer", "Recording engineer", 
-"Recordist", "Redaktor", "Renderer", "Reporter", "Repository", 
-"Research team head", "Research team member", "Researcher", "Respondent", 
-"Respondent-appellant", "Respondent-appellee", "Responsible party", 
-"Restager", "Restorationist", "Reviewer", "Rubricator", "Scenarist", 
-"Scientific advisor", "Screenwriter", "Scribe", "Sculptor", "Second party", 
-"Secretary", "Seller", "Set designer", "Setting", "Signer", "Singer", 
-"Sound designer", "Speaker", "Sponsor", "Stage director", "Stage manager", 
-"Standards body", "Stereotyper", "Storyteller", "Supporting host", 
-"Surveyor", "Teacher", "Technical director", "Television director", 
-"Television producer", "Thesis advisor", "Transcriber", "Translator", 
-"Type designer", "Typographer", "University place", "Videographer", 
-"Voice actor", "Witness", "Wood engraver", "Woodcutter", "Writer of accompanying material", 
-"Writer of added commentary", "Writer of added lyrics", "Writer of added text", 
-"Writer of introduction", "Writer of preface", "Writer of supplementary textual content"
-), code = c("abr", "act", "adp", "rcp", "anl", "anm", "ann", 
-"apl", "ape", "app", "arc", "arr", "acp", "adi", "art", "ard", 
-"asg", "asn", "att", "auc", "aut", "aqt", "aft", "aud", "aui", 
-"ato", "ant", "bnd", "bdd", "blw", "bkd", "bkp", "bjd", "bpd", 
-"bsl", "brl", "brd", "cll", "ctg", "cas", "cns", "chr", "cng", 
-"cli", "cor", "col", "clt", "clr", "cmm", "cwt", "com", "cpl", 
-"cpt", "cpe", "cmp", "cmt", "ccp", "cnd", "con", "csl", "csp", 
-"cos", "cot", "coe", "cts", "ctt", "cte", "ctr", "ctb", "cpc", 
-"cph", "crr", "crp", "cst", "cou", "crt", "cov", "cre", "cur", 
-"dnc", "dtc", "dtm", "dte", "dto", "dfd", "dft", "dfe", "dgg", 
-"dgs", "dln", "dpc", "dpt", "dsr", "drt", "dis", "dbp", "dst", 
-"dnr", "drm", "dub", "edt", "edc", "edm", "elg", "elt", "enj", 
-"eng", "egr", "etr", "evp", "exp", "fac", "fld", "fmd", "fds", 
-"flm", "fmp", "fmk", "fpy", "frg", "fmo", "fnd", "gis", "hnr", 
-"hst", "his", "ilu", "ill", "ins", "itr", "ive", "ivr", "inv", 
-"isb", "jud", "jug", "lbr", "ldr", "lsa", "led", "len", "lil", 
-"lit", "lie", "lel", "let", "lee", "lbt", "lse", "lso", "lgd", 
-"ltg", "lyr", "mfp", "mfr", "mrb", "mrk", "med", "mdc", "mte", 
-"mtk", "mod", "mon", "mcp", "msd", "mus", "nrt", "osp", "opn", 
-"orm", "org", "oth", "own", "pan", "ppm", "pta", "pth", "pat", 
-"prf", "pma", "pht", "ptf", "ptt", "pte", "plt", "pra", "pre", 
-"prt", "pop", "prm", "prc", "pro", "prn", "prs", "pmn", "prd", 
-"prp", "prg", "pdr", "pfr", "prv", "pup", "pbl", "pbd", "ppt", 
-"rdd", "rpc", "rce", "rcd", "red", "ren", "rpt", "rps", "rth", 
-"rtm", "res", "rsp", "rst", "rse", "rpy", "rsg", "rsr", "rev", 
-"rbr", "sce", "sad", "aus", "scr", "scl", "spy", "sec", "sll", 
-"std", "stg", "sgn", "sng", "sds", "spk", "spn", "sgd", "stm", 
-"stn", "str", "stl", "sht", "srv", "tch", "tcd", "tld", "tlp", 
-"ths", "trc", "trl", "tyd", "tyg", "uvp", "vdg", "vac", "wit", 
-"wde", "wdc", "wam", "wac", "wal", "wat", "win", "wpr", "wst"
-), description = c("A person, family, or organization contributing to a resource by shortening or condensing the original work but leaving the nature and content of the original work substantially unchanged. For substantial modifications that result in the creation of a new work, see author", 
-"A performer contributing to an expression of a work by acting as a cast member or player in a musical or dramatic presentation, etc.", 
-"A person or organization who 1) reworks a musical composition, usually for a different medium, or 2) rewrites novels or stories for motion pictures or other audiovisual medium.", 
-"A person, family, or organization to whom the correspondence in a work is addressed", 
-"A person or organization that reviews, examines and interprets data or information in a specific area", 
-"A person contributing to a moving image work or computer program by giving apparent movement to inanimate objects or drawings. For the creator of the drawings that are animated, see artist", 
-"A person who makes manuscript annotations on an item", "A person or organization who appeals a lower court's decision", 
-"A person or organization against whom an appeal is taken", "A  person or organization responsible for the submission of an application or who is named as eligible for the results of the processing of the application (e.g., bestowing of rights, reward, title, position)", 
-"A person, family, or organization responsible for creating an architectural design, including a pictorial representation intended to show how a building, etc., will look when completed. It also oversees the construction of structures", 
-"A person, family, or organization contributing to a musical work by rewriting the composition for a medium of performance different from that for which the work was originally intended, or modifying the work for the same medium of performance, etc., such that the musical substance of the original composition remains essentially unchanged. For extensive modification that effectively results in the creation of a new musical work, see composer", 
-"A person (e.g., a painter or sculptor) who makes copies of works of visual art", 
-"A person contributing to a motion picture or television production by overseeing the artists and craftspeople who build the sets", 
-"A person, family, or organization responsible for creating a work by conceiving, and implementing, an original graphic design, drawing, painting, etc. For book illustrators, prefer Illustrator [ill]", 
-"A person responsible for controlling the development of the artistic style of an entire production, including the choice of works to be presented and selection of senior production staff", 
-"A person or organization to whom a license for printing or publishing has been transferred", 
-"A person or organization associated with or found in an item or collection, which cannot be determined to be that of a Former owner [fmo] or other designated relationship indicative of provenance", 
-"An author, artist, etc., relating him/her to a resource for which there is or once was substantial authority for designating that person as author, creator, etc. of the work indicative of provenance", 
-"A person or organization in charge of the estimation and public auctioning of goods, particularly books, artistic works, etc.", 
-"A person, family, or organization responsible for creating a work that is primarily textual in content, regardless of media type (e.g., printed text, spoken word, electronic text, tactile text) or genre (e.g., poems, novels, screenplays, blogs). Use also for persons, etc., creating a new work by paraphrasing, rewriting, or adapting works by another creator such that the modification has substantially changed the nature and content of the original or changed the medium of expression", 
-"A person or organization whose work is largely quoted or extracted in works to which he or she did not contribute directly. Such quotations are found particularly in exhibition catalogs, collections of photographs, etc.", 
-"A person or organization responsible for an afterword, postface, colophon, etc. but who is not the chief author of a work", 
-"A person or organization responsible for the dialog or spoken commentary for a screenplay or sound recording", 
-"A person or organization responsible for an introduction, preface, foreword, or other critical introductory matter, but who is not the chief author", 
-"A person whose manuscript signature appears on an item", "A person or organization responsible for a resource upon which the resource represented by the bibliographic description is based. This may be appropriate for adaptations, sequels, continuations, indexes, etc.", 
-"A person who binds an item", "A person or organization responsible for the binding design of a book, including the type of binding, the type of materials used, and any decorative aspects of the binding", 
-"A person or organization responsible for writing a commendation or testimonial for a work, which appears on or within the publication itself, frequently on the back or dust jacket of print publications or on advertising material for all media", 
-"A person or organization involved in manufacturing a manifestation by being responsible for the entire graphic design of a book, including arrangement of type and illustration, choice of materials, and process used", 
-"A person or organization responsible for the production of books and other print media", 
-"A person or organization responsible for the design of flexible covers designed for or published with a book, including the type of materials used, and any decorative aspects of the bookjacket", 
-"A person or organization responsible for the design of a book owner's identification label that is most commonly pasted to the inside front cover of a book", 
-"A person or organization who makes books and other bibliographic materials available for purchase. Interest in the materials is primarily lucrative", 
-"A person, family, or organization involved in manufacturing a resource by embossing Braille cells using a stylus, special embossing printer, or other device", 
-"A person, family, or organization involved in broadcasting a resource to an audience via radio, television, webcast, etc.", 
-"A person or organization who writes in an artistic hand, usually as a copyist and or engrosser", 
-"A person, family, or organization responsible for creating a map, atlas, globe, or other cartographic work", 
-"A person, family, or organization involved in manufacturing a resource by pouring a liquid or molten substance into a mold and leaving it to solidify to take the shape of the mold", 
-"A person or organization who examines bibliographic resources for the purpose of suppressing parts deemed objectionable on moral, political, military, or other grounds", 
-"A person responsible for creating or contributing to a work of movement", 
-"A person in charge of photographing a motion picture, who plans the technical aspets of lighting and photographing of scenes, and often assists the director in the choice of angles, camera setups, and lighting moods. He or she may also supervise the further processing of filmed material up to the completion of the work print. Cinematographer is also referred to as director of photography. Do not confuse with videographer", 
-"A person or organization for whom another person or organization is acting", 
-"A curator who lists or inventories the items in an aggregate work such as a collection of items or works", 
-"A curator who brings together items from various sources that are then arranged, described, and cataloged as a collection. A collector is neither the creator of the material nor a person to whom manuscripts in the collection may have been addressed", 
-"A person, family, or organization involved in manufacturing a manifestation of photographic prints from film or other colloid that has ink-receptive and ink-repellent surfaces", 
-"A person or organization responsible for applying color to drawings, prints, photographs, maps, moving images, etc", 
-"A performer contributing to a work by providing interpretation, analysis, or a discussion of the subject matter on a recording, film, or other audiovisual medium", 
-"A person or organization responsible for the commentary or explanatory notes about a text. For the writer of manuscript annotations in a printed book, use Annotator", 
-"A person, family, or organization responsible for creating a new work (e.g., a bibliography, a directory) through the act of compilation, e.g., selecting, arranging, aggregating, and editing data, information, etc", 
-"A person or organization who applies to the courts for redress, usually in an equity proceeding", 
-"A complainant who takes an appeal from one court or jurisdiction to another to reverse the judgment, usually in an equity proceeding", 
-"A complainant against whom an appeal is taken from one court or jurisdiction to another to reverse the judgment, usually in an equity proceeding", 
-"A person, family, or organization responsible for creating or contributing to a musical resource by adding music to a work that originally lacked it or supplements it", 
-"A person or organization responsible for the creation of metal slug, or molds made of other materials, used to produce the text and images in printed matter", 
-"A person or organization responsible for the original idea on which a work is based, this includes the scientific author of an audio-visual item and the conceptor of an advertisement", 
-"A performer contributing to a musical resource by leading a performing group (orchestra, chorus, opera, etc.) in a musical or dramatic presentation, etc.", 
-"A person or organization responsible for documenting, preserving, or treating printed or manuscript material, works of art, artifacts, or other media", 
-"A person or organization relevant to a resource, who is called upon for professional advice or services in a specialized field of knowledge or training", 
-"A person or organization relevant to a resource, who is engaged specifically to provide an intellectual overview of a strategic or operational task and by analysis, specification, or instruction, to create or propose a cost-effective course of action or solution", 
-"A person(s) or organization who opposes, resists, or disputes, in a court of law, a claim, decision, result, etc.", 
-"A contestant who takes an appeal from one court of law or jurisdiction to another to reverse the judgment", 
-"A contestant against whom an appeal is taken from one court of law or jurisdiction to another to reverse the judgment", 
-"A person(s) or organization defending a claim, decision, result, etc. being opposed, resisted, or disputed in a court of law", 
-"A contestee who takes an appeal from one court or jurisdiction to another to reverse the judgment", 
-"A contestee against whom an appeal is taken from one court or jurisdiction to another to reverse the judgment", 
-"A person or organization relevant to a resource, who enters into a contract with another person or organization to perform a specific", 
-"A person, family or organization responsible for making contributions to the resource. This includes those whose work has been contributed to a larger work, such as an anthology, serial publication, or other compilation of individual works. If a more specific role is available, prefer that, e.g. editor, compiler, illustrator", 
-"A person or organization listed as a copyright owner at the time of registration. Copyright can be granted or later transferred to another person or organization, at which time the claimant becomes the copyright holder", 
-"A person or organization to whom copy and legal rights have been granted or transferred for the intellectual content of a work. The copyright holder, although not necessarily the creator of the work, usually has the exclusive right to benefit financially from the sale and use of the work to which the associated copyright protection applies", 
-"A person or organization who is a corrector of manuscripts, such as the scriptorium official who corrected the work of a scribe. For printed matter, use Proofreader", 
-"A person or organization who was either the writer or recipient of a letter or other communication", 
-"A person, family, or organization that designs the costumes for a moving image production or for a musical or dramatic presentation or entertainment", 
-"A court governed by court rules, regardless of their official nature (e.g., laws, administrative regulations)", 
-"A person, family, or organization contributing to a resource by preparing a court's opinions for publication", 
-"A person or organization responsible for the graphic design of a book cover, album cover, slipcase, box, container, etc. For a person or organization responsible for the graphic design of an entire book, use Book designer; for book jackets, use Bookjacket designer", 
-"A person or organization responsible for the intellectual or artistic content of a resource", 
-"A person, family, or organization conceiving, aggregating, and/or organizing an exhibition, collection, or other item", 
-"A performer who dances in a musical, dramatic, etc., presentation", 
-"A person or organization that submits data for inclusion in a database or other collection of data", 
-"A person or organization responsible for managing databases or other data sources", 
-"A person, family, or organization to whom a resource is dedicated", 
-"A person who writes a dedication, which may be a formal statement or in epistolary or verse form", 
-"A person or organization who is accused in a criminal proceeding or sued in a civil proceeding", 
-"A defendant who takes an appeal from one court or jurisdiction to another to reverse the judgment, usually in a legal action", 
-"A defendant against whom an appeal is taken from one court or jurisdiction to another to reverse the judgment, usually in a legal action", 
-"A organization granting an academic degree", "A person overseeing a higher level academic degree", 
-"A person or organization executing technical drawings from others' designs", 
-"An entity depicted or portrayed in a work, particularly in a work of art", 
-"A current owner of an item who deposited the item into the custody of another person, family, or organization, while still retaining ownership", 
-"A person, family, or organization responsible for creating a design for an object", 
-"A person responsible for the general management and supervision of a filmed performance, a radio or television program, etc.", 
-"A person who presents a thesis for a university or higher-level educational degree", 
-"A place from which a resource, e.g., a serial, is distributed", 
-"A person or organization that has exclusive or shared marketing rights for a resource", 
-"A former owner of an item who donated that item to another owner", 
-"A person, family, or organization contributing to a resource by an architect, inventor, etc., by making detailed plans or drawings for buildings, ships, aircraft, machines, objects, etc", 
-"A person or organization to which authorship has been dubiously or incorrectly ascribed", 
-"A person, family, or organization contributing to a resource by revising or elucidating the content, e.g., adding an introduction, notes, or other critical matter. An editor may also prepare a resource for production, publication, or distribution. For major revisions, adaptations, etc., that substantially change the nature and content of the original work, resulting in a new work, see author", 
-"A person, family, or organization contributing to a collective or aggregate work by selecting and putting together works, or parts of works, by one or more creators. For compilations of data, information, etc., that result in new works, see compiler", 
-"A person, family, or organization responsible for assembling, arranging, and trimming film, video, or other moving image formats, including both visual and audio aspects", 
-"A person responsible for setting up a lighting rig and focusing the lights for a production, and running the lighting at a performance", 
-"A person or organization who creates a duplicate printing surface by pressure molding and electrodepositing of metal that is then backed up with lead for printing", 
-"A jurisdiction enacting a law, regulation, constitution, court rule, etc.", 
-"A person or organization that is responsible for technical planning and design, particularly with construction", 
-"A person or organization who cuts letters, figures, etc. on a surface, such as a wooden or metal plate used for printing", 
-"A person or organization who produces text or images for printing by subjecting metal, glass, or some other surface to acid or the corrosive action of some other substance", 
-"A place where an event such as a conference or a concert took place", 
-"A person or organization in charge of the description and appraisal of the value of goods, particularly rare items, works of art, etc.", 
-"A person or organization that executed the facsimile", "A person or organization that manages or supervises the work done to collect raw data or do research in an actual setting or environment (typically applies to the natural and social sciences)", 
-"A director responsible for the general management and supervision of a filmed performance", 
-"A person, family, or organization involved in distributing a moving image resource to theatres or other distribution channels", 
-"A person who, following the script and in creative cooperation with the Director, selects, arranges, and assembles the filmed material, controls the synchronization of picture and sound, and participates in other post-production tasks such as sound mixing and visual effects processing.  Today, picture editing is often performed digitally.", 
-"A producer responsible for most of the business aspects of a film", 
-"A person, family or organization responsible for creating an independent or personal film. A filmmaker is individually responsible for the conception and execution of all aspects of the film", 
-"A person or organization who is identified as the only party or the party of the first party. In the case of transfer of rights, this is the assignor, transferor, licensor, grantor, etc. Multiple parties can be named jointly as the first party", 
-"A person or organization who makes or imitates something of value or importance, especially with the intent to defraud", 
-"A person, family, or organization formerly having legal possession of an item", 
-"A person or organization that furnished financial support for the production of the work", 
-"A person responsible for geographic information system (GIS) development and integration with global positioning system data", 
-"A person, family, or organization honored by a work or item (e.g., the honoree of a festschrift, a person to whom a copy is presented)", 
-"A performer contributing to a resource by leading a program (often broadcast) that includes other guests, performers, etc. (e.g., talk show host)", 
-"An organization hosting the event, exhibit, conference, etc., which gave rise to a resource, but having little or no responsibility for the content of the resource", 
-"A person providing decoration to a specific item using precious metals or color, often with elaborate designs and motifs", 
-"A person, family, or organization contributing to a resource by supplementing the primary content with drawings, diagrams, photographs, etc. If the work is primarily the artistic content created by this entity, use artist or photographer", 
-"A person who has written a statement of dedication or gift", 
-"A performer contributing to a resource by playing a musical instrument", 
-"A person, family or organization responsible for creating or contributing to a resource by responding to an interviewer, usually a reporter, pollster, or some other information gathering agent", 
-"A person, family, or organization responsible for creating or contributing to a resource by acting as an interviewer, reporter, pollster, or some other information gathering agent", 
-"A person, family, or organization responsible for creating a new device or process", 
-"A person, family or organization issuing a work, such as an official organ of the body", 
-"A person who hears and decides on legal matters in court.", 
-"A jurisdiction governed by a law, regulation, etc., that was enacted by another jurisdiction", 
-"An organization that provides scientific analyses of material samples", 
-"A person or organization that manages or supervises work done in a controlled setting or environment", 
-"An architect responsible for creating landscape works. This work involves coordinating the arrangement of existing and proposed land features and structures", 
-"A person or organization that takes primary responsibility for a particular activity or endeavor. May be combined with another relator term or code to show the greater importance this person or organization has regarding that particular role. If more than one relator is assigned to a heading, use the Lead relator only if it applies to all the relators", 
-"A person or organization permitting the temporary use of a book, manuscript, etc., such as for photocopying or microfilming", 
-"A person or organization who files a libel in an ecclesiastical or admiralty case", 
-"A libelant who takes an appeal from one ecclesiastical court or admiralty to another to reverse the judgment", 
-"A libelant against whom an appeal is taken from one ecclesiastical court or admiralty to another to reverse the judgment", 
-"A person or organization against whom a libel has been filed in an ecclesiastical court or admiralty", 
-"A libelee who takes an appeal from one ecclesiastical court or admiralty to another to reverse the judgment", 
-"A libelee against whom an appeal is taken from one ecclesiastical court or admiralty to another to reverse the judgment", 
-"An author of a libretto of an opera or other stage work, or an oratorio", 
-"A person or organization who is an original recipient of the right to print or publish", 
-"A person or organization who is a signer of the license, imprimatur, etc", 
-"A person or organization who designs the lighting scheme for a theatrical presentation, entertainment, motion picture, etc.", 
-"A person or organization who prepares the stone or plate for lithographic printing, including a graphic artist creating a design directly on the surface from which printing will be done.", 
-"An author of the words of a non-dramatic musical work (e.g. the text of a song), except for oratorios", 
-"The place of manufacture (e.g., printing, duplicating, casting, etc.) of a resource in a published form", 
-"A person or organization responsible for printing, duplicating, casting, etc. a resource", 
-"The entity responsible for marbling paper, cloth, leather, etc. used in construction of a resource", 
-"A person or organization performing the coding of SGML, HTML, or XML markup of metadata, text, etc.", 
-"A person held to be a channel of communication between the earthly world and a world", 
-"A person or organization primarily responsible for compiling and maintaining the original description of a metadata set (e.g., geospatial metadata set)", 
-"An engraver responsible for decorations, illustrations, letters, etc. cut on a metal surface for printing or decoration", 
-"A person, family, or organization responsible for recording the minutes of a meeting", 
-"A performer contributing to a resource by leading a program (often broadcast) where topics are discussed, usually with participation of experts in fields related to the discussion", 
-"A person or organization that supervises compliance with the contract and is responsible for the report and controls its distribution. Sometimes referred to as the grantee, or controlling agency", 
-"A person who transcribes or copies musical notation", "A person who coordinates the activities of the composer, the sound editor, and sound mixers for a moving image production or for a musical or dramatic presentation or entertainment", 
-"A person or organization who performs music or contributes to the musical content of a work when it is not possible or desirable to identify the function more precisely", 
-"A performer contributing to a resource by reading or speaking in order to give an account of an act, occurrence, course of events, etc", 
-"A performer contributing to an expression of a work by appearing on screen in nonfiction moving image materials or introductions to fiction moving image materials to provide contextual or background information. Use when another term (e.g., narrator, host) is either not applicable or not desired", 
-"A person or organization responsible for opposing a thesis or dissertation", 
-"A person, family, or organization organizing the exhibit, event, conference, etc., which gave rise to a resource", 
-"A person or organization performing the work, i.e., the name of a person or organization associated with the intellectual content of the work. This category does not include the publisher or personal affiliation, or sponsor except where it is also the corporate author", 
-"A role that has no equivalent in the MARC list.", "A person, family, or organization that currently owns an item or collection, i.e.has legal possession of a resource", 
-"A performer contributing to a resource by participating in a program (often broadcast) where topics are discussed, usually with participation of experts in fields related to the discussion", 
-"A person or organization responsible for the production of paper, usually from wood, cloth, or other fibrous material", 
-"A person or organization that applied for a patent", "A person or organization that was granted the patent referred to by the item", 
-"A person or organization responsible for commissioning a work. Usually a patron uses his or her means or influence to support the work of artists, writers, etc. This includes those who commission and pay for individual works", 
-"A person contributing to a resource by performing music, acting, dancing, speaking, etc., often in a musical or dramatic presentation, etc. If specific codes are used, [prf] is used for a person whose principal skill is not known or specified", 
-"An organization (usually a government agency) that issues permits under which work is accomplished", 
-"A person, family, or organization responsible for creating a photographic work", 
-"A person or organization who brings a suit in a civil proceeding", 
-"A plaintiff who takes an appeal from one court or jurisdiction to another to reverse the judgment, usually in a legal proceeding", 
-"A plaintiff against whom an appeal is taken from one court or jurisdiction to another to reverse the judgment, usually in a legal proceeding", 
-"A person, family, or organization involved in manufacturing a manifestation by preparing plates used in the production of printed images and/or text", 
-"A person who is the faculty moderator of an academic disputation, normally proposing a thesis and participating in the ensuing disputation", 
-"A person or organization mentioned in an “X presents� credit for moving image materials and who is associated with production, finance, or distribution in some way.  A vanity credit;  in early years, normally the head of a studio", 
-"A person, family, or organization involved in manufacturing a manifestation of printed text, notated music, etc., from type or plates, such as a book, newspaper, magazine, broadside, score, etc", 
-"A person or organization who prints illustrations from plates.", 
-"A person or organization who makes a relief, intaglio, or planographic printing surface", 
-"A person or organization primarily responsible for performing or initiating a process, such as is done with the collection of metadata sets", 
-"A person, family, or organization responsible for most of the business aspects of a production for screen, audio recording, television, webcast, etc. The producer is generally responsible for fund raising, managing the production, hiring key personnel, arranging for distributors, etc.", 
-"An organization that is responsible for financial, technical, and organizational management of a production for stage, screen, audio recording, television, webcast, etc.", 
-"A person or organization responsible for designing the overall visual appearance of a moving image production", 
-"A person responsible for all technical and business matters in a production", 
-"A person or organization associated with the production (props, lighting, special effects, etc.) of a musical or dramatic presentation or entertainment", 
-"The place of production (e.g., inscription, fabrication, construction, etc.) of a resource in an unpublished form", 
-"A person, family, or organization responsible for creating a computer program", 
-"A person or organization with primary responsibility for all essential aspects of a project, has overall responsibility for managing projects, or provides overall direction to a project manager", 
-"A person who corrects printed matter. For manuscripts, use Corrector [crr]", 
-"A person or organization who produces, publishes, manufactures, or distributes a resource if specific codes are not desired (e.g. [mfr], [pbl])", 
-"The place where a resource is published", "A person or organization responsible for publishing, releasing, or issuing a resource", 
-"A person or organization who presides over the elaboration of a collective work to ensure its coherence or continuity. This includes editors-in-chief, literary editors, editors of series, etc.", 
-"A performer contributing to a resource by manipulating, controlling, or directing puppets or marionettes in a moving image production or a musical or dramatic presentation or entertainment", 
-"A director responsible for the general management and supervision of a radio program", 
-"A producer responsible for most of the business aspects of a radio program", 
-"A person contributing to a resource by supervising the technical aspects of a sound or video recording session", 
-"A person or organization who uses a recording device to capture sounds and/or video during a recording session, including field recordings of natural sounds, folkloric events, music, etc.", 
-"A person or organization who writes or develops the framework for an item without being intellectually responsible for its content", 
-"A person or organization who prepares drawings of architectural designs (i.e., renderings) in accurate, representational perspective to show what the project will look like when completed", 
-"A person or organization who writes or presents reports of news or current events on air or in print", 
-"An organization that hosts data or material culture objects and provides services to promote long term, consistent and shared use of those data or objects", 
-"A person who directed or managed a research project", "A person who participated in a research project but whose role did not involve direction or management of it", 
-"A person or organization responsible for performing research", 
-"A person or organization who makes an answer to the courts pursuant to an application for redress (usually in an equity proceeding) or a candidate for a degree who defends or opposes a thesis provided by the praeses in an academic disputation", 
-"A respondent who takes an appeal from one court or jurisdiction to another to reverse the judgment, usually in an equity proceeding", 
-"A respondent against whom an appeal is taken from one court or jurisdiction to another to reverse the judgment, usually in an equity proceeding", 
-"A person or organization legally responsible for the content of the published material", 
-"A person or organization, other than the original choreographer or director, responsible for restaging a choreographic or dramatic work and who contributes minimal new content", 
-"A person, family, or organization responsible for the set of technical, editorial, and intellectual procedures aimed at compensating for the degradation of an item by bringing it back to a state as close as possible to its original condition", 
-"A person or organization responsible for the review of a book, motion picture, performance, etc.", 
-"A person or organization responsible for parts of a work, often headings or opening parts of a manuscript, that appear in a distinctive color, usually red", 
-"A person or organization who is the author of a motion picture screenplay, generally the person who wrote the scenarios for a motion picture during the silent era", 
-"A person or organization who brings scientific, pedagogical, or historical competence to the conception and realization on a work, particularly in the case of audio-visual items", 
-"An author of a screenplay, script, or scene", "A person who is an amanuensis and for a writer of manuscripts proper. For a person who makes pen-facsimiles, use Facsimilist [fac]", 
-"An artist responsible for creating a three-dimensional work by modeling, carving, or similar technique", 
-"A person or organization who is identified as the party of the second part. In the case of transfer of right, this is the assignee, transferee, licensee, grantee, etc. Multiple parties can be named jointly as the second party", 
-"A person or organization who is a recorder, redactor, or other person responsible for expressing the views of a organization", 
-"A former owner of an item who sold that item to another owner", 
-"A person who translates the rough sketches of the art director into actual architectural structures for a theatrical presentation, entertainment, motion picture, etc. Set designers draw the detailed guides and specifications for building the set", 
-"An entity in which the activity or plot of a work takes place, e.g. a geographic place, a time period, a building, an event", 
-"A person whose signature appears without a presentation or other statement indicative of provenance. When there is a presentation statement, use Inscriber [ins].", 
-"A performer contributing to a resource by using his/her/their voice, with or without instrumental accompaniment, to produce music. A singer's performance may or may not include actual words", 
-"A person who produces and reproduces the sound score (both live and recorded), the installation of microphones, the setting of sound levels, and the coordination of sources of sound for a production", 
-"A performer contributing to a resource by speaking words, such as a lecture, speech, etc. ", 
-"A person, family, or organization sponsoring some aspect of a resource, e.g., funding research, sponsoring an event", 
-"A person or organization contributing to a stage resource through the overall management and supervision of a performance", 
-"A person who is in charge of everything that occurs on a performance stage, and who acts as chief of all crews and assistant to a director during rehearsals", 
-"An organization responsible for the development or enforcement of a standard", 
-"A person or organization who creates a new plate for printing by molding or copying another printing surface", 
-"A performer contributing to a resource by relaying a creator's original story with dramatic or theatrical interpretation", 
-"A person or organization that supports (by allocating facilities, staff, or other resources) a project, program, meeting, event, data objects, material culture objects, or other entities capable of support", 
-"A person, family, or organization contributing to a cartographic resource by providing measurements or dimensional relationships for the geographic area represented", 
-"A performer contributing to a resource by giving instruction or providing a demonstration", 
-"A person who is ultimately in charge of scenery, props, lights and sound for a production", 
-"A director responsible for the general management and supervision of a television program", 
-"A producer responsible for most of the business aspects of a television program", 
-"A person under whose supervision a degree candidate develops and presents a thesis, mémoire, or text of a dissertation", 
-"A person, family, or organization contributing to a resource by changing it from one system of notation to another. For a work transcribed for a different instrument or performing group, see Arranger [arr]. For makers of pen-facsimiles, use Facsimilist [fac]", 
-"A person or organization who renders a text from one language into another, or from an older form of a language into the modern form", 
-"A person or organization who designs the type face used in a particular item", 
-"A person or organization primarily responsible for choice and arrangement of type used in an item. If the typographer is also responsible for other aspects of the graphic design of a book (e.g., Book designer [bkd]), codes for both functions may be needed", 
-"A place where a university that is associated with a resource is located, for example, a university where an academic dissertation or thesis was presented", 
-"A person in charge of a video production, e.g. the video recording of a stage production as opposed to a commercial motion picture. The videographer may be the camera operator or may supervise one or more camera operators. Do not confuse with cinematographer", 
-"An actor contributing to a resource by providing the voice for characters in radio and audio productions and for animated characters in moving image works, as well as by providing voice overs in radio and television commercials, dubbed resources, etc.", 
-"voice for characters in radio and audio productions and for animated characters in moving image works, as well as by providing voice overs in radio and television commercials, dubbed resources, etc.", 
-"A person or organization who makes prints by cutting the image in relief on the end-grain of a wood block", 
-"A person or organization who makes prints by cutting the image in relief on the plank side of a wood block", 
-"A person or organization who writes significant material which accompanies a sound recording or other audiovisual material", 
-"A person, family, or organization contributing to an expression of a work by providing an interpretation or critical explanation of the original work", 
-"A writer of words added to an expression of a musical work. For lyric writing in collaboration with a composer to form an original work, see lyricist", 
-"A person, family, or organization contributing to a non-textual resource by providing text for the non-textual work (e.g., writing captions for photographs, descriptions of maps).", 
-"A person, family, or organization contributing to a resource by providing an introduction to the original work", 
-"A person, family, or organization contributing to a resource by providing a preface to the original work", 
-"A person, family, or organization contributing to a resource by providing supplementary textual content (e.g., an introduction, a preface) to the original work"
-), usage = c("", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "Use for full authors who have made substantial contributions to the package and should show up in the package citation.", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "Use for package maintainers that collected code (potentially in other languages) but did not make further substantial contributions to the package.", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"Use for authors who have been contracted to write (parts of) the package and hence do not own intellectual property.", 
-"Use for authors who have made smaller contributions (such as code patches etc.) but should not show up in the package citation.", 
-"", "Use for all copyright holders.", "", "", "", "", "", "", 
-"Use for the package maintainer.", "", "", "Use for persons who contributed data sets for the package.", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-"", "", "", "", "", "", "", "", "", "If the package is part of a thesis, use for the thesis advisor.", 
-"", "If the R code is merely a translation from another language (typically S), use for the translator to R.", 
-"", "", "", "", "", "", "", "", "", "", "", "", "", "", "")), .Names = c("term", 
-"code", "description", "usage"), row.names = c(NA, -268L), class = "data.frame")
-MARC_relator_db_codes_used_with_R <-
-c("aut", "com", "ctr", "ctb", "cph", "cre", "dtc", "ths", "trl"
-)
diff -Nru r-base-3.2.3/src/library/utils/R/news.R r-base-3.3.1/src/library/utils/R/news.R
--- r-base-3.2.3/src/library/utils/R/news.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/news.R	2016-03-16 23:03:19.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/news.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -21,16 +21,17 @@
 function(query, package = "R", lib.loc = NULL,
          format = NULL, reader = NULL, db = NULL)
 {
-    if(is.null(db)) {
+    if(new.db <- is.null(db)) {
         db <- if(package == "R")
             tools:::.build_news_db_from_R_NEWS_Rd()
         else
             tools:::.build_news_db(package, lib.loc, format, reader)
     }
     if(is.null(db))
-        return(invisible())
+        return(NULL)
 
-    attr(db, "package") <- package
+    if(new.db)
+	attr(db, "package") <- package
 
     ## Is there a way to directly call/use subset.data.frame?
     ## E.g.,
@@ -64,24 +65,24 @@
 
     r <- eval(substitute(query), db1, parent.frame())
     ## Do something if this is not logical ...
-    if(is.null(r))
-        return(db)
-    else if(!is.logical(r) || length(r) != length(version))
-        stop("invalid query")
-    r <- r & !is.na(r)
-    if(has_bad_attr)
-        structure(db[r, ], bad = bad[r])
-    else
-        db[r, ]
+    if(!is.null(r)) {
+	if(!is.logical(r) || length(r) != length(version))
+	    stop("invalid query")
+	r <- r & !is.na(r)
+	db <- db[r, ]
+	if (!all(r))
+	    db <- structure(db, subset = r)
+	if(has_bad_attr)
+	    db <- structure(db, bad = bad[r])
+    }
+    db
 }
 
 format.news_db <-
 function(x, ...)
 {
     if(inherits(x, "news_db_from_Rd") ||
-       (!(is.null(bad <- attr(x, "bad")))
-        && (length(bad) == NROW(x))
-        && all(!bad))) {
+       (!is.null(bad <- attr(x, "bad")) && length(bad) == NROW(x) && !any(bad))) {
 
         ## Format news in the preferred input format:
         ##   Changes in $VERSION [($DATE)]:
@@ -144,9 +145,24 @@
     }
 }
 
-print.news_db <-
-function(x, ...)
+print.news_db <- function(x, doBrowse = interactive(), browser = getOption("browser"), ...)
 {
-    writeLines(paste(unlist(format(x, ...)), collapse = "\n\n"))
+    port <- if (doBrowse && !identical("false", browser) &&
+                is.character(pkg <- attr(x, "package")))
+        tools::startDynamicHelp(NA) else 0L
+    if (port > 0L) {
+        url <- if (pkg == "R")
+    	    sprintf("http://127.0.0.1:%d/doc/html/NEWS.html", port)
+    	else
+    	    sprintf("http://127.0.0.1:%d/library/%s/NEWS", port, pkg)
+    	if (!is.null(subset <- attr(x, "subset"))) {
+	    # Subsets are typically ranges of dates or version numbers, so we run-length encode
+	    # the subset vector.  We put TRUE in front so the values alternate TRUE, FALSE, ... .
+    	    rle <- paste(rle(c(TRUE, subset))$lengths, collapse="_")
+    	    url <- paste0(url, "?subset=", rle)
+    	}
+    	browseURL(url)
+    } else ## simply show in console:
+	writeLines(paste(unlist(format(x, ...)), collapse = "\n\n"))
     invisible(x)
 }
diff -Nru r-base-3.2.3/src/library/utils/R/object.size.R r-base-3.3.1/src/library/utils/R/object.size.R
--- r-base-3.2.3/src/library/utils/R/object.size.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/object.size.R	2016-03-16 23:03:21.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/object.size.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2013 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,23 +19,34 @@
 object.size <- function(x)
     structure(.Call(C_objectSize, x), class = "object_size")
 
-format.object_size <-
-    function(x, units = "b", ...)
+format.object_size <- function(x, units = "b", ...)
 {
-    units <- match.arg(units, c("b", "auto", "Kb", "Mb", "Gb",
-                                "B", "KB", "MB", "GB"))
-    if (units == "auto") {
-        if (x >= 1024^3) units <- "Gb"
-        else if (x >= 1024^2) units <- "Mb"
-        else if (x >= 1024) units <- "Kb"
-        else units <- "b"
-    }
-     switch(units,
-            "b" =, "B" = paste(x, "bytes"),
-            "Kb" =, "KB" = paste(round(x/1024, 1L), "Kb"),
-            "Mb" =, "MB" = paste(round(x/1024^2, 1L), "Mb"),
-            "Gb" =, "GB" = paste(round(x/1024^3, 1L), "Gb")
-            )
+    units <- match.arg(units, c("b", "auto", "Kb", "Mb", "Gb", "Tb", "Pb",
+				"B", "KB", "MB", "GB", "TB", "PB",
+				"KiB", "MiB", "GiB", "TiB",
+				"PiB", "EiB", "ZiB", "YiB"))
+    if (units == "auto")
+	units <-
+	    if      (x >= 1024^4) "Tb"
+            else if (x >= 1024^3) "Gb"
+	    else if (x >= 1024^2) "Mb"
+	    else if (x >= 1024  ) "Kb" else "b"
+    switch(units,
+	   "b" =, "B" = paste(x, "bytes"),
+	   "Kb" =, "KB" = paste(round(x/1024  , 1L), "Kb"),
+	   "Mb" =, "MB" = paste(round(x/1024^2, 1L), "Mb"),
+	   "Gb" =, "GB" = paste(round(x/1024^3, 1L), "Gb"),
+	   "Tb" =, "TB" = paste(round(x/1024^4, 1L), "Tb"),
+	   "Pb" =, "PB" = paste(round(x/1024^5, 1L), "Pb"),
+	   "KiB" = paste(round(x/1024  , 1L), "KiB"),
+	   "MiB" = paste(round(x/1024^2, 1L), "MiB"),
+	   "GiB" = paste(round(x/1024^3, 1L), "GiB"),
+	   "TiB" = paste(round(x/1024^4, 1L), "TiB"),
+	   "PiB" = paste(round(x/1024^5, 1L), "PiB"),
+	   "EiB" = paste(round(x/1024^6, 1L), "EiB"),
+	   "ZiB" = paste(round(x/1024^7, 1L), "ZiB"),
+	   "YiB" = paste(round(x/1024^8, 1L), "YiB")
+	   )
 }
 
 print.object_size <-
diff -Nru r-base-3.2.3/src/library/utils/R/objects.R r-base-3.3.1/src/library/utils/R/objects.R
--- r-base-3.2.3/src/library/utils/R/objects.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/objects.R	2016-03-16 23:03:21.000000000 +0000
@@ -32,7 +32,7 @@
 	fMethsEnv <- methods::getMethodsForDispatch(f)
         meths <- as.list(fMethsEnv, all.names=TRUE)
         r <- meths[grep("^ANY\\b", names(meths))]
-	if(any(ddm <- vapply(r, is, logical(1L), "derivedDefaultMethod")))
+	if(any(ddm <- vapply(r, methods::is, logical(1L), "derivedDefaultMethod")))
 	    f <- r[ddm][[1]]@.Data
 	else if(warnS4only)
 	    warning(gettextf(
@@ -86,7 +86,7 @@
               dnew[keep[(n+1L):(n+n2)] , ])
     }
 
-    S3MethodsStopList <- tools:::.make_S3_methods_stop_list(NULL)
+    S3MethodsStopList <- tools::nonS3methods(NULL)
     knownGenerics <- getKnownS3generics()
     sp <- search()
     methods.called <- identical(sys.call(-1)[[1]], as.symbol("methods"))
@@ -96,7 +96,7 @@
     an <- an[!duplicated(an)] # removed masked objects, *keep* names
     names(an) <- sub("[0-9]*$", "", names(an))
     info <- data.frame(visible = rep.int(TRUE, length(an)),
-                       from = sub("package:", "", names(an)),
+		       from = .rmpkg(names(an)),
                        row.names = an)
     if (!missing(generic.function)) {
 	if (!is.character(generic.function))
@@ -234,16 +234,14 @@
               class="MethodsFunction")
 }
 
-print.MethodsFunction <-
-function(x, ...)
+print.MethodsFunction <- function(x, byclass = attr(x, "byclass"), ...)
 {
     info <- attr(x, "info")
-    if (attr(x, "byclass")) {
-        values <- unique(info$generic)
-    } else {
-        visible <- ifelse(info$visible, "", "*")
-        values <- paste0(rownames(info), visible)
-    }
+    values <-
+	if (byclass)
+	    unique(info$generic)
+	else
+	    paste0(rownames(info), visible = ifelse(info$visible, "", "*"))
 
     if (length(values)) {
         print(noquote(values))
@@ -254,11 +252,10 @@
     invisible(x)
 }
 
-getS3method <-
-function(f, class, optional = FALSE)
+getS3method <- function(f, class, optional = FALSE, envir = parent.frame())
 {
     if(!any(f == getKnownS3generics())) {
-        truegf <- findGeneric(f, parent.frame())
+        truegf <- findGeneric(f, envir)
         if(nzchar(truegf)) f <- truegf
         else {
             if(optional) return(NULL)
@@ -266,13 +263,59 @@
         }
     }
     method <- paste(f, class, sep=".")
-    if(exists(method, mode = "function", envir = parent.frame()))
-        return(get(method, mode = "function", envir = parent.frame()))
+    if(!is.null(m <- get0(method, envir = envir, mode = "function")))
+        return(m)
+    ## also look for registered method in namespaces
+    defenv <- if(!is.na(w <- .knownS3Generics[f])) asNamespace(w)
+    else if(f %in% tools:::.get_internal_S3_generics()) .BaseNamespaceEnv
+    else {
+        genfun <- get(f, mode="function", envir = envir)
+        if(.isMethodsDispatchOn() && methods::is(genfun, "genericFunction"))
+            ## assumes the default method is the S3 generic function
+            genfun <- methods::selectMethod(genfun, "ANY")
+        if (typeof(genfun) == "closure") environment(genfun)
+        else .BaseNamespaceEnv
+    }
+    S3Table <- get(".__S3MethodsTable__.", envir = defenv)
+    if(!is.null(m <- get0(method, envir = S3Table, inherits = FALSE)))
+	m
+    else if(optional)
+	NULL
+    else stop(gettextf("S3 method '%s' not found", method), domain = NA)
+}
+
+##' Much in parallel to getS3method(), isS3method() gives TRUE/FALSE, but not an error
+isS3method <- function(method, f, class, envir = parent.frame())
+{
+    if(missing(method)) {
+        method <- paste(f, class, sep=".")
+    } else { # !missing(method) : use (f, class)
+	f.c <- strsplit(method, ".", fixed=TRUE)[[1]]
+	if(length(f.c) < 2 || !is.character(f.c))
+	    return(FALSE) ## stop("Invalid 'method' specification; must be  \"<fun>.<class>\"")
+	f <- f.c[1]
+	class <- if(length(f.c) > 2) ## e.g., t.data.frame
+		     paste(f.c[-1], collapse=".")
+		 else
+		     f.c[2]
+    }
+    if(!any(f == getKnownS3generics())) { ## either a known generic or found in 'envir'
+        truegf <- findGeneric(f, envir)
+        if(nzchar(truegf)) f <- truegf
+        else
+            return(FALSE)
+    }
+    if(!is.null(m <- get0(method, envir = envir, mode = "function"))) {
+	## know: f is a knownS3generic, and method m is a visible function
+	pkg <- if(isNamespace(em <- environment(m))) environmentName(em)
+	       else if(is.primitive(m)) "base" else NULL
+	return(is.na(match(method, tools::nonS3methods(pkg)))) ## TRUE unless an exception
+    }
     ## also look for registered method in namespaces
     defenv <- if(!is.na(w <- .knownS3Generics[f])) asNamespace(w)
     else if(f %in% tools:::.get_internal_S3_generics()) .BaseNamespaceEnv
     else {
-        genfun <- get(f, mode="function", envir = parent.frame())
+        genfun <- get(f, mode="function", envir = envir)
         if(.isMethodsDispatchOn() && methods::is(genfun, "genericFunction"))
             ## assumes the default method is the S3 generic function
             genfun <- methods::selectMethod(genfun, "ANY")
@@ -280,10 +323,8 @@
         else .BaseNamespaceEnv
     }
     S3Table <- get(".__S3MethodsTable__.", envir = defenv)
-    if(exists(method, envir = S3Table, inherits = FALSE))
-        return(get(method, envir = S3Table))
-    if(optional) NULL else stop(gettextf("S3 method '%s' not found", method),
-                                domain = NA)
+    ## return
+    exists(method, envir = S3Table, inherits = FALSE)
 }
 
 getFromNamespace <-
@@ -291,7 +332,7 @@
 {
     if(missing(ns)) {
         nm <- attr(envir, "name", exact = TRUE)
-        if(is.null(nm) || substring(nm, 1L, 8L) != "package:")
+        if(is.null(nm) || substr(nm, 1L, 8L) != "package:")
             stop("environment specified is not a package")
         ns <- asNamespace(substring(nm, 9L))
     } else ns <- asNamespace(ns)
@@ -343,7 +384,7 @@
     nf <- sys.nframe()
     if(missing(ns)) {
         nm <- attr(envir, "name", exact = TRUE)
-        if(is.null(nm) || substring(nm, 1L, 8L) != "package:")
+        if(is.null(nm) || substr(nm, 1L, 8L) != "package:")
             stop("environment specified is not a package")
         ns <- asNamespace(substring(nm, 9L))
     } else ns <- asNamespace(ns)
@@ -408,7 +449,7 @@
         stop("'fixInNamespace' requires a name")
     if(missing(ns)) {
         nm <- attr(envir, "name", exact = TRUE)
-        if(is.null(nm) || substring(nm, 1L, 8L) != "package:")
+        if(is.null(nm) || substr(nm, 1L, 8L) != "package:")
             stop("environment specified is not a package")
         ns <- asNamespace(substring(nm, 9L))
     } else ns <- asNamespace(ns)
diff -Nru r-base-3.2.3/src/library/utils/R/packages2.R r-base-3.3.1/src/library/utils/R/packages2.R
--- r-base-3.2.3/src/library/utils/R/packages2.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/packages2.R	2016-04-06 22:15:21.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/packages2.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,6 +19,12 @@
 if (.Platform$OS.type == "windows")
     .install.macbinary <- function(...) NULL	# globalVariables isn't available, so use this to suppress the warning
 
+isBasePkg <- function(pkg) {
+  priority <- tryCatch(packageDescription(pkg, fields = "Priority"),
+                       error = function(e) e, warning = function(e) e)
+  identical(priority, "base")
+}
+
 getDependencies <-
     function(pkgs, dependencies = NA, available = NULL, lib = .libPaths()[1L],
              binary = FALSE)
@@ -53,6 +59,13 @@
 				 "packages %s are not available (%s)"),
 			paste(sQuote(p0[miss]), collapse = ", "), msg),
                 domain = NA, call. = FALSE)
+        base <- vapply(p0[miss], isBasePkg, FALSE)
+        if (sum(base))
+          warning(sprintf(ngettext(sum(base),
+                                   "package %s is a base package, and should not be updated",
+                                   "packages %s are base packages, and should not be updated"),
+                          paste(sQuote(p0[miss][base]), collapse = ", ")),
+                  domain = NA, call. = FALSE)
         if (sum(miss) == 1L &&
             !is.na(w <- match(tolower(p0[miss]),
                               tolower(row.names(available))))) {
@@ -130,7 +143,7 @@
         if (type2 == "source")
             stop("type 'binary' is not supported on this platform")
         else type <- type2
-        if(!missing(contriburl) || !is.null(available))
+        if(type == "both" && (!missing(contriburl) || !is.null(available)))
            stop("specifying 'contriburl' or 'available' requires a single type, not type = \"both\"")
     }
     if (is.logical(clean) && clean)
@@ -206,7 +219,7 @@
         ## if no packages were specified, use a menu
 	if(.Platform$OS.type == "windows" || .Platform$GUI == "AQUA"
            || (capabilities("tcltk")
-               && capabilities("X11") && suppressWarnings(tcltk:::.TkUp)) ) {
+               && capabilities("X11") && suppressWarnings(tcltk::.TkUp)) ) {
             ## this is the condition for a graphical select.list()
 	} else
 	    stop("no packages were specified")
@@ -217,7 +230,7 @@
 	    av <- available.packages(contriburl = contriburl, method = method)
 	    if (missing(repos)) ## Evaluating contriburl may have changed repos, which may be used below
 	      repos <- getOption("repos")
-            if(type != "both") available <- av 
+            if(type != "both") available <- av
         } else av <- available
 	if(NROW(av)) {
             ## avoid duplicate entries in menus, since the latest available
@@ -318,7 +331,7 @@
            }
         }
     }
-    
+
     ## check if we should infer the type
     if (length(pkgs) == 1L && is.null(repos) && type == "both") {
     	if (  (type2 %in% "win.binary" && grepl("[.]zip$", pkgs))
@@ -735,7 +748,7 @@
                 ##   cmd <- paste(c(shQuote(command), env, args),
                 ##                collapse = " ")
                 ## on Windows?
-                cmd <- paste(c(shQuote(cmd0), args), collapse = " ")
+                cmd <- paste(c("MAKEFLAGS=", shQuote(cmd0), args), collapse = " ")
                 ## </NOTE>
                 deps <- aDL[[pkg]]
                 deps <- deps[deps %in% upkgs]
@@ -799,10 +812,11 @@
                 file.remove(outfiles)
             }
         }
+        ## Using stderr is the wish of PR#16420
         if(!quiet && nonlocalrepos && !is.null(tmpd) && is.null(destdir))
             cat("\n", gettextf("The downloaded source packages are in\n\t%s",
                                sQuote(normalizePath(tmpd, mustWork = FALSE))),
-                "\n", sep = "")
+                "\n", sep = "", file = stderr())
         ## update packages.html on Unix only if .Library was installed into
         libs_used <- unique(update[, 2L])
         if(.Platform$OS.type == "unix" && .Library %in% libs_used) {
@@ -859,10 +873,9 @@
 packageName <- function(env = parent.frame()) {
     if (!is.environment(env)) stop("'env' must be an environment")
     env <- topenv(env)
-    if (exists(".packageName", envir = env, inherits = FALSE))
-	get(".packageName", envir = env, inherits = FALSE)
+    if (!is.null(pn <- get0(".packageName", envir = env, inherits = FALSE)))
+	pn
     else if (identical(env, .BaseNamespaceEnv))
 	"base"
-    else
-	NULL
+    ## else NULL
 }
diff -Nru r-base-3.2.3/src/library/utils/R/package.skeleton.R r-base-3.3.1/src/library/utils/R/package.skeleton.R
--- r-base-3.2.3/src/library/utils/R/package.skeleton.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/package.skeleton.R	2016-03-16 23:03:21.000000000 +0000
@@ -35,7 +35,7 @@
 
     if(missing(list)) {
         if(use_code_files) {
-            environment <- new.env(hash = TRUE)
+            environment <- new.env(hash = TRUE, parent = globalenv())
             methods::setPackageName(name, environment)
             for(cf in code_files)
                 sys.source(cf, envir = environment)
@@ -46,10 +46,10 @@
     if(!is.character(list))
 	stop("'list' must be a character vector naming R objects")
     if(use_code_files || !envIsMissing) {
-        classesList <- getClasses(environment)
+        classesList <- methods::getClasses(environment)
         classes0 <- .fixPackageFileNames(classesList)
         names(classes0) <- classesList
-        methodsList <- getGenerics(environment)
+        methodsList <- methods::getGenerics(environment)
         methods0 <- .fixPackageFileNames(methodsList)
         names(methods0) <- methodsList
     }
@@ -215,14 +215,14 @@
 					  filename =
 					  file.path(docs_dir,
 						    sprintf("%s-methods.Rd", methods0[item])),
-					  findMethods(item, where = environment))
+					  methods::findMethods(item, where = environment))
 	       })
     }))
     ## don't document generic functions from other packages
     for(item in methodsList) {
         if(exists(item, envir = environment, inherits = FALSE)) {
             ff <- get(item, envir = environment)
-            if(is(ff, "genericFunction") && !identical(ff@package, name)) # don't document
+            if(methods::is(ff, "genericFunction") && !identical(ff@package, name)) # don't document
                 file.remove(file.path(docs_dir, sprintf("%s.Rd", list0[item])))
         }
     }
diff -Nru r-base-3.2.3/src/library/utils/R/packages.R r-base-3.3.1/src/library/utils/R/packages.R
--- r-base-3.2.3/src/library/utils/R/packages.R	2015-08-26 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/packages.R	2016-03-16 23:03:19.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/packages.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,9 @@
 #  https://www.R-project.org/Licenses/
 
 available.packages <-
-function(contriburl = contrib.url(getOption("repos"), type), method,
-         fields = NULL, type = getOption("pkgType"), filters = NULL)
+function(contriburl = contrib.url(repos, type), method,
+         fields = NULL, type = getOption("pkgType"),
+         filters = NULL, repos = getOption("repos"))
 {
     requiredFields <-
         c(tools:::.get_standard_repository_db_fields(), "File")
@@ -81,6 +82,9 @@
 
                 if (!inherits(z, "error"))
                     z <- res0 <- tryCatch(read.dcf(file = tmpf), error=identity)
+                    
+                unlink(tmpf)
+                on.exit()                    
 
                 if (inherits(z, "error")) {
                     warning(gettextf("unable to access index for repository %s",
@@ -93,8 +97,6 @@
                 ## Do we want to cache an empty result?
                 if(length(res0)) rownames(res0) <- res0[, "Package"]
                 saveRDS(res0, dest, compress = TRUE)
-                unlink(tmpf)
-                on.exit()
             } # end of download vs cached
         } # end of localcran vs online
         if (length(res0)) {
@@ -246,9 +248,9 @@
     ## Now find the recursive reverse dependencies of these and the
     ## non-standard packages missing from the db.
     rdepends <-
-        tools:::package_dependencies(db1$Package[ind], db = db1,
-                                     reverse = TRUE,
-                                     recursive = recursive)
+        tools::package_dependencies(db1$Package[ind], db = db1,
+                                    reverse = TRUE,
+                                    recursive = recursive)
     rdepends <- unique(unlist(rdepends))
     ind[match(rdepends, db1$Package, nomatch = 0L)] <- TRUE
 
@@ -792,13 +794,20 @@
     if(!local.only) {
         ## Try to handle explicitly failure to connect to CRAN.
         f <- tempfile()
-        m <- try(download.file(url, destfile = f, quiet = TRUE))
-        if(!inherits(m, "try-error") && m == 0L)
-            m <- try(read.csv(f, as.is = TRUE, encoding = "UTF-8"))
-        else m <- NULL
-        unlink(f)
+        on.exit(unlink(f))
+        m <- tryCatch({
+            m <- download.file(url, destfile = f, quiet = TRUE)
+            if(m != 0L)
+                stop(gettextf("'download.file()' error code '%d'", m))
+            read.csv(f, as.is = TRUE, encoding = "UTF-8")
+        }, error=function(err) {
+            warning(gettextf("failed to download mirrors file (%s); using local file '%s'",
+                             conditionMessage(err), local.file),
+                    call.=FALSE, immediate.=TRUE)
+            NULL
+        })
     }
-    if(is.null(m) || inherits(m, "try-error"))
+    if(is.null(m))
         m <- read.csv(local.file, as.is = TRUE, encoding = "UTF-8")
     if(!all) m <- m[as.logical(m$OK), ]
     m
@@ -818,7 +827,7 @@
     if (length(ind))
         res <- as.integer(ind)[1L]
     else {
-    	isHTTPS <- grepl("^https", m[, "URL"])
+    	isHTTPS <- startsWith(m[, "URL"], "https")
     	mHTTPS <- m[isHTTPS,]
     	mHTTP <- m[!isHTTPS,]
     	if (useHTTPS) {
@@ -842,7 +851,8 @@
     	}
     }
     if (res > 0L) {
-        URL <- setNames(m[res, "URL"], m[res, "Name"])
+        URL <- m[res, "URL"]
+        names(URL) <- m[res, "Name"]
         sub("/$", "", URL[1L])
     } else character()
 }
diff -Nru r-base-3.2.3/src/library/utils/R/progressBar.R r-base-3.3.1/src/library/utils/R/progressBar.R
--- r-base-3.2.3/src/library/utils/R/progressBar.R	2015-08-25 22:16:32.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/progressBar.R	2016-03-16 23:03:18.000000000 +0000
@@ -41,11 +41,11 @@
         .val <<- value
         nb <- round(width*(value - min)/(max - min))
         if(.nb < nb) {
-            cat(paste(rep.int(char, nb-.nb), collapse=""), file = file)
+            cat(strrep(char, nb-.nb), file = file)
             flush.console()
         } else if (.nb > nb) {
-            cat("\r", paste(rep.int(" ", .nb*nw), collapse=""),
-                "\r", paste(rep.int(char, nb), collapse=""),
+            cat("\r", strrep(" ", .nb * nw),
+                "\r", strrep(char, nb),
                 sep = "", file = file)
             flush.console()
         }
@@ -57,12 +57,12 @@
         .val <<- value
         nb <- round(width*(value - min)/(max - min))
         if(.nb <= nb) {
-            cat("\r", paste(rep.int(char, nb), collapse=""),
+            cat("\r", strrep(char, nb),
                 sep = "", file = file)
             flush.console()
         } else {
-            cat("\r", paste(rep.int(" ", .nb*nw), collapse=""),
-                "\r", paste(rep.int(char, nb), collapse=""),
+            cat("\r", strrep(" ", .nb * nw),
+                "\r", strrep(char, nb),
                 sep = "", file = file)
             flush.console()
         }
@@ -75,7 +75,7 @@
         nb <- round(width*(value - min)/(max - min))
         pc <- round(100*(value - min)/(max - min))
         if(nb == .nb && pc == .pc) return()
-        cat(paste(c("\r  |", rep.int(" ", nw*width+6)), collapse=""),
+        cat(paste0("\r  |", strrep(" ", nw*width+6)),
             file = file)
         cat(paste(c("\r  |",
                     rep.int(char, nb),
diff -Nru r-base-3.2.3/src/library/utils/R/prompt.R r-base-3.3.1/src/library/utils/R/prompt.R
--- r-base-3.2.3/src/library/utils/R/prompt.R	2015-08-25 22:16:35.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/prompt.R	2016-03-16 23:03:20.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/prompt.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -148,7 +148,7 @@
              keywords = c(paste("% Add one or more standard keywords,",
              "see file 'KEYWORDS' in the"),
              "% R documentation directory.",
-             "\\keyword{ ~kwd1 }",
+             "\\keyword{ ~kwd1 }% use one of  RShowDoc(\"KEYWORDS\")",
              "\\keyword{ ~kwd2 }% __ONLY ONE__ keyword per line"))
 
     Rdtxt$arguments <- if(n)
@@ -234,7 +234,7 @@
                 paste0("\\samp{", gsub("([%{}])", "\\\\\\1", s), "}")
             }
         }
-        
+
         fmt <- c("\\format{",
                  paste("  A data frame with",
                        nrow(x),
@@ -323,7 +323,7 @@
 function(package, lib.loc = NULL, filename = NULL, name = NULL, final = FALSE)
 {
     ## Most of this should not be translated -- PR#11191
-    
+
     ## lib.loc is not used any more
     ## if (is.null(lib.loc)) lib.loc <- .libPaths()
 
@@ -342,7 +342,8 @@
     Rdtxt <-
     	    list(name = paste0("\\name{", name, "}"),
 #                version = "\\Rdversion{1.1}",
-    	         aliases = c(paste0("\\alias{", name, "}"), c(paste0("\\alias{", package, "}"))),
+    	         aliases = c(paste0("\\alias{", name, "}"),
+                             c(paste0("\\alias{", package, "}"))),
     	         docType = "\\docType{package}",
     	         title = c("\\title{", "}"),
     	         description = c("\\description{","}"),
@@ -362,8 +363,8 @@
     insert1("details", paste0("\\packageIndices{", package, "}"))
 
     if (!final) {
-        insert2("details",
-                strwrap("An overview of how to use the package, including the most important functions"))
+        insert2("details", strwrap(
+	 "An overview of how to use the package, including the most important functions"))
         Rdtxt$references <-
             c("\\references{",
               paste("~~",
@@ -393,7 +394,7 @@
     invisible(filename)
 }
 
-promptImport <- function(object, filename = NULL, name = NULL, importedFrom = NULL, 
+promptImport <- function(object, filename = NULL, name = NULL, importedFrom = NULL,
                          importPage = name, ...)
 {
     if(missing(name))
@@ -404,38 +405,41 @@
                 name <- substitute(object)
                 if(is.name(name))
                     as.character(name)
-                else if (is.language(name) && length(name) == 3 && identical(name[[1]], as.name("::")))
+                else if (is.language(name) && length(name) == 3 &&
+                         identical(name[[1]], as.name("::")))
                     as.character(name[[3]])
                 else
                     stop("cannot determine a usable name")
             }
     if(is.null(filename))
         filename <- paste0(name, ".Rd")
-       
+
     x <- if(!missing(object))
         object
     else {
         ## Better than get(); works when called in fun :
         x <- get(name, envir = parent.frame())
     }
-    
+
     if(is.null(importedFrom)) {
 	if (is.function(x))
 	    importedFrom <- getNamespaceName(environment(x))
 	else
 	    stop("cannot determine import name")
     }
-    
+
     Rdtxt <-
         list(name = paste0("\\name{", name, "}"),
              aliases = paste0("\\alias{", name, "}"),
              docType = "\\docType{import}",
              title = paste0("\\title{Import from package \\pkg{", importedFrom, "}}"),
-             description = c("\\description{",
-               paste0("The \\code{", name, "} object is imported from package \\pkg{", importedFrom, "}."),
-               paste0("Help is available here:  \\code{\\link[", importedFrom, ":", importPage, "]{", 
-                      importedFrom, "::", importPage, "}}."),
-               "}"))
+             description =
+                 c("\\description{",
+                   paste0("The \\code{", name, "} object is imported from package \\pkg{",
+                          importedFrom, "}."),
+                   paste0("Help is available here:  \\code{\\link[", importedFrom, ":",
+                          importPage, "]{", importedFrom, "::", importPage, "}}."),
+                   "}"))
 
     if(is.na(filename)) return(Rdtxt)
 
@@ -444,6 +448,6 @@
     message(gettextf("Created file named %s.", sQuote(filename)),
             "\n",
             gettext("Edit the file and move it to the appropriate directory."),
-            domain = NA)    
+            domain = NA)
 }
 
diff -Nru r-base-3.2.3/src/library/utils/R/readtable.R r-base-3.3.1/src/library/utils/R/readtable.R
--- r-base-3.2.3/src/library/utils/R/readtable.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/readtable.R	2016-03-16 23:03:21.000000000 +0000
@@ -139,18 +139,17 @@
     if (rlabp) col.names <- c("row.names", col.names)
 
     nmColClasses <- names(colClasses)
-    if(length(colClasses) < cols)
-        if(is.null(nmColClasses)) {
-            colClasses <- rep_len(colClasses, cols)
-        } else {
-            tmp <- rep_len(NA_character_, cols)
-            names(tmp) <- col.names
-            i <- match(nmColClasses, col.names, 0L)
-            if(any(i <= 0L))
-                warning("not all columns named in 'colClasses' exist")
-            tmp[ i[i > 0L] ] <- colClasses
-            colClasses <- tmp
-        }
+    if(is.null(nmColClasses)) {
+        if(length(colClasses) < cols) colClasses <- rep_len(colClasses, cols)
+    } else {
+        tmp <- rep_len(NA_character_, cols)
+        names(tmp) <- col.names
+        i <- match(nmColClasses, col.names, 0L)
+        if(any(i <= 0L))
+            warning("not all columns named in 'colClasses' exist")
+        tmp[ i[i > 0L] ] <- colClasses[i > 0L]
+        colClasses <- tmp
+    }
 
 
     ##	set up for the scan of the file.
diff -Nru r-base-3.2.3/src/library/utils/R/roman.R r-base-3.3.1/src/library/utils/R/roman.R
--- r-base-3.2.3/src/library/utils/R/roman.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/roman.R	2016-03-24 23:15:12.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/roman.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,38 +16,36 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
-as.roman <-
-function(x)
+.as.roman <- function(x, check.range=TRUE)
 {
     if(is.numeric(x))
         x <- as.integer(x)
     else if(is.character(x)) {
-        ## Let's be nice: either strings that are *all* arabics, or
-        ## (hopefully, for the time being) all romans.
-        x <- if(all(grepl("^[[:digit:]]+$", x)))
-            as.integer(x)
-        else
-            .roman2numeric(x)
+	x <- if(all(dig.x <- !nzchar(x) | is.na(x) | grepl("^[[:digit:]]+$", x)))
+		 as.integer(x)
+	     else if(any(dig.x)) {
+		 r <- suppressWarnings(as.integer(x))# NAs for all non-dig
+		 r[!dig.x] <- .roman2numeric(x[!dig.x])
+		 r
+	     }
+	     else ## no digits -- assume all roman characters
+		 .roman2numeric(x)
     }
     else
         stop("cannot coerce 'x' to roman")
-    x[(x <= 0L | x >= 3900L)] <- NA
+    if(check.range) x[x <= 0L | x >= 3900L] <- NA
     class(x) <- "roman"
     x
 }
+as.roman <- function(x) .as.roman(x, check.range=TRUE)
 
-as.character.roman <-
-function(x, ...)
-    .numeric2roman(x)
-
-format.roman <-
-function(x, ...)
-    format(as.character(x))
+as.character.roman <- function(x, ...) .numeric2roman(x)
 
-print.roman <-
-function(x, ...)
+format.roman <- function(x, ...) format(as.character.roman(x), ...)
+
+print.roman <- function(x, ...)
 {
-    print(noquote(as.character(x)), ...)
+    print(noquote(as.character.roman(x)), ...)
     invisible(x)
 }
 
@@ -60,19 +58,40 @@
     y
 }
 
+Ops.roman <- function(e1, e2)
+{
+    e1 <- .as.roman(e1, check.range=FALSE)
+    e2 <- .as.roman(e2, check.range=FALSE)
+    as.roman(NextMethod(.Generic))
+}
+
+## for recycling etc
+rep.roman <- function(x, ...) structure(rep(unclass(x), ...), class = class(x))
+
+## romans: used in both utility functions, and not unuseful in general:
+.romans <-
+    c(1000L, 900L, 500L, 400L, 100L, 90L, 50L, 40L, 10L, 9L, 5L,  4L, 1L)
+names(.romans) <-
+    c("M", "CM",  "D",  "CD", "C",  "XC", "L", "XL","X","IX","V","IV","I")
+## Can *not* use stats {dependency cycle at build time} -- hence need our own:
+## .setNames <- function (object = nm, nm) {
+##     names(object) <- nm
+##     object
+## }
+## .romans <- .setNames(
+##     c(1000L, 900L, 500L, 400L, 100L, 90L, 50L, 40L, 10L, 9L, 5L,  4L, 1L),
+##     c("M", "CM",  "D",  "CD", "C",  "XC", "L", "XL","X","IX","V","IV","I"))
+
 .numeric2roman <-
 function(x) {
-    romans <- c("M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX",
-                "V", "IV", "I")
-    numbers <- c(1000L, 900L, 500L, 400L, 100L, 90L, 50L, 40L, 10L, 9L,
-                 5L, 4L, 1L)
+    romaNs <- names(.romans)
     n2r <- function(z) {
         y <- character()
-        for(i in seq_along(romans)) {
-            d <- numbers[i]
+	for(i in seq_along(.romans)) {
+	    d <- .romans[[i]]
             while(z >= d) {
                 z <- z - d
-                y <- c(y, romans[i])
+                y <- c(y, romaNs[i])
             }
         }
         paste(y, collapse = "")
@@ -82,27 +101,16 @@
     x <- as.integer(x)
     ind <- is.na(x) | (x <= 0L) | (x >= 3900L)
     out[ind] <- NA
-    if(any(!ind))
-        out[!ind] <- sapply(x[!ind], n2r)
+    out[!ind] <- vapply(x[!ind], n2r, "")
     out
 }
 
-.roman2numeric <-
-function(x)
+.roman2numeric <- function(x)
 {
-    ## <FIXME>
-    ## What if this fails?
-    ## Should say something like "Not a valid roman number ..."
-    ## </FIXME>
-    romans <- c("M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX",
-                "V", "IV", "I")
-    numbers <- c(1000L, 900L, 500L, 400L, 100L, 90L, 50L, 40L, 10L, 9L,
-                 5L, 4L, 1L)
     out <- integer(length(x))
-    ind <- is.na(x)
-    out[ind] <- NA
-    if(any(!ind)) {
-        y <- toupper(x[!ind])
+    out[ina <- is.na(x) | !nzchar(x)] <- NA
+    if(any(ind <- !ina)) {
+        y <- toupper(x[ind])
         y <- gsub("CM", "DCCCC", y)
         y <- gsub("CD", "CCCC", y)
         y <- gsub("XC", "LXXXX", y)
@@ -114,15 +122,15 @@
             warning(sprintf(ngettext(sum(!ok),
                                      "invalid roman numeral: %s",
                                      "invalid roman numerals: %s"),
-                            paste(x[!ind][!ok], collapse = " ")),
+                            paste(x[ind][!ok], collapse = " ")),
                     domain = NA)
-            out[!ind][!ok] <- NA
+            out[ind][!ok] <- NA
         }
-        if(any(ok))
-            out[!ind][ok] <-
-                sapply(strsplit(y[ok], ""),
-                       function(z)
-                       as.integer(sum(numbers[match(z, romans)])))
+	out[ind][ok] <-
+	    vapply(strsplit(y[ok], ""),
+		   function(z)
+		       as.integer(sum(.romans[match(z, names(.romans))])),
+		   integer(1L))
     }
     out
 }
diff -Nru r-base-3.2.3/src/library/utils/R/rtags.R r-base-3.3.1/src/library/utils/R/rtags.R
--- r-base-3.2.3/src/library/utils/R/rtags.R	2015-08-25 22:16:35.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/rtags.R	2015-12-10 23:15:15.000000000 +0000
@@ -23,7 +23,7 @@
 ### parser.  Support for vi-style tags could be useful, but it needs
 ### the tags file needs to be sorted, making file-by-file processing
 ### difficult. It may be easier to write a script to convert an etags
-### format file (see http://http://en.wikipedia.org/wiki/Ctags).
+### format file (see http://https://en.wikipedia.org/wiki/Ctags).
 
 
 
diff -Nru r-base-3.2.3/src/library/utils/R/sessionInfo.R r-base-3.3.1/src/library/utils/R/sessionInfo.R
--- r-base-3.2.3/src/library/utils/R/sessionInfo.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/sessionInfo.R	2016-06-14 22:15:05.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/sessionInfo.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -36,10 +36,10 @@
                    "Linux" = if(file.exists("/etc/os-release")) {
     ## http://www.freedesktop.org/software/systemd/man/os-release.html
                        tmp <- readLines("/etc/os-release")
-                       t2 <- if (any(grepl("^PRETTY_NAME=", tmp)))
+                       t2 <- if (any(startsWith(tmp, "PRETTY_NAME=")))
                            sub("^PRETTY_NAME=", "",
                                grep("^PRETTY_NAME=", tmp, value = TRUE)[1L])
-                       else if (any(grepl("^NAME", tmp)))
+                       else if (any(startsWith(tmp, "NAME")))
                            ## could check for VERSION or VERSION_ID
                            sub("^NAME=", "",
                                grep("^NAME=", tmp, value = TRUE)[1L])
@@ -66,7 +66,8 @@
                                       "9" = "Mavericks",
                                       "10" = "Yosemite",
                                       "11" = "El Capitan",
-                                      "unknown"))
+                                      "12" = "Sierra",
+                                     "unknown"))
                    },
                    "SunOS" = {
                        ver <- system('uname -r', intern = TRUE)
@@ -79,8 +80,9 @@
     if(is.null(package)){
         package <- grep("^package:", search(), value=TRUE)
         # weed out environments which are not really packages
-        keep <- sapply(package, function(x) x == "package:base" || !is.null(attr(as.environment(x), "path")))
-        package <- sub("^package:", "", package[keep])
+        keep <- vapply(package, function(x) x == "package:base"
+                       || !is.null(attr(as.environment(x), "path")), NA)
+        package <- .rmpkg(package[keep])
     }
 
     ## no need to re-encode given what we extract.
diff -Nru r-base-3.2.3/src/library/utils/R/sourceutils.R r-base-3.3.1/src/library/utils/R/sourceutils.R
--- r-base-3.2.3/src/library/utils/R/sourceutils.R	2015-08-25 22:16:31.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/sourceutils.R	2016-03-16 23:03:18.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/sourceutils.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -158,7 +158,7 @@
     	text <- character(nrow(d))
     	blank <- seq_along(text)
     } else
-    	blank <- which(!nzchar(text) | (d$token == "STR_CONST" & grepl("^[[]", text)))
+    	blank <- which(!nzchar(text) | (d$token == "STR_CONST" & startsWith(text, "[")))
     for (i in blank) {
 	lines <- getSrcLines(srcfile, d$line1[i], d$line2[i])
         n <- length(lines)
diff -Nru r-base-3.2.3/src/library/utils/R/str.R r-base-3.3.1/src/library/utils/R/str.R
--- r-base-3.2.3/src/library/utils/R/str.R	2015-08-25 22:16:34.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/str.R	2016-03-16 23:03:19.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/str.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -54,13 +54,13 @@
     ## use 'give.length' when specified, else default = give.head
     if(length(larg <- list(...))) {
 	nl <- names(larg)
-	iGiveHead <- which(nl == "give.head")
+	which.head <- which(nl == "give.head")
 	if (any(Bgl <- nl == "give.length"))
 	    give.length <- larg[[which(Bgl)]]
-	else if(length(iGiveHead))
-	    give.length <- larg[[iGiveHead]]
-	if(length(iGiveHead)) # eliminate it from arg.list
-	    larg <- larg[ - iGiveHead ]
+	else if(length(which.head))
+	    give.length <- larg[[which.head]]
+	if(length(which.head)) # eliminate it from arg.list
+	    larg <- larg[ - which.head ]
 	if(is.numeric(larg[["nest.lev"]]) &&
 	   is.numeric(larg[["vec.len"]])) # typical call from data.frame
 	    ## reduce length for typical call:
@@ -203,13 +203,19 @@
     has.class <- S4 || !is.null(cl) # S3 or S4
     mod <- ""; char.like <- FALSE
     if(give.attr) a <- attributes(object)#-- save for later...
-    deParse <- function(.) deparse(., width.cutoff = min(500,max(20, width-10)))
+    deParse <- function(.) deparse(., width.cutoff = min(500, max(20, width-10)))
     n.of. <- function(n, singl, plural) paste(n, ngettext(n, singl, plural))
     n.of <- function(n, noun) n.of.(n, noun, paste0(noun,"s"))
+    if(is.ts <- stats::is.ts(object))
+        str1.ts <- function(o, lestr) {
+            tsp.a <- stats::tsp(o)
+            paste0(" Time-Series ", lestr, " from ", format(tsp.a[1L]),
+                   " to ", format(tsp.a[2L]), ":")
+        }
     if (is.null(object))
 	cat(" NULL\n")
     else if(S4) {
-	if(is(object,"envRefClass")) {
+	if(methods::is(object,"envRefClass")) {
 	    cld <- tryCatch(object$getClass(), error=function(e)e)
 	    if(inherits(cld, "error")) {
 		cat("Prototypical reference class", " '", paste(cl, collapse = "', '"),
@@ -311,10 +317,10 @@
     } else { #- not function, not list
 	if(is.vector(object)
 	   || (is.array(object) && is.atomic(object))
-           ## FIXME: is.vector is not documented to allow those modes.
-           ## Should this not be is.language?
-	   || is.vector(object, mode= "language")
-	   || is.vector(object, mode= "symbol")## R bug(<=0.50-a4) should be part
+	   ##f fails for formula:
+	   ##f typeof(object) in {"symbol", "language"} =: is.symbolic(.):
+	   ##f || (is.language(object) && !is.expression(object))
+	   || (is.language(object) && !is.expression(object) && !any(cl == "formula"))
 	   ) { ##-- Splus: FALSE for 'named vectors'
 	    if(is.atomic(object)) {
 		##-- atomic:   numeric	complex	 character  logical
@@ -331,7 +337,7 @@
 		    pDi <- function(...) paste(c("[", ..., "]"), collapse = "")
 		    le.str <- (if(rnk == 1) pDi(di[1L], "(1d)") else
 			       pDi(paste0(di[-rnk], ", "), di[rnk]))
-		    std.attr <- "dim" #- "names"
+                    std.attr <- c("dim", if(is.ts) c("tsp", "class"))
 		} else if(!is.null(names(object))) {
 		    mod <- paste("Named", mod)
 		    std.attr <- std.attr[std.attr != "names"]
@@ -343,7 +349,8 @@
 		    std.attr <- c(std.attr, "class")
 		}
 		str1 <-
-		    if(le == 1 && !is.array(object)) paste(NULL, mod)
+		    if(is.ts) str1.ts(object, le.str)
+		    else if(le == 1 && !is.array(object)) paste(NULL, mod)
 		    else paste0(" ", mod, if(le>0)" ", le.str)
 	    } else { ##-- not atomic, but vector: #
 		mod <- typeof(object)#-- typeof(.) is more precise than mode!
@@ -377,10 +384,8 @@
 #	    v.len <- switch(t.cl,rts=.8, cts=.6, its=.9) * v.len
 #	    class(object) <- if(any(!b.ts)) cl[!b.ts]
 #	    std.attr <- c(std.attr, "tspar")
-	} else if(stats::is.ts(object)) {
-	    tsp.a <- stats::tsp(object)
-	    str1 <- paste0(" Time-Series ", le.str, " from ", format(tsp.a[1L]),
-			   " to ", format(tsp.a[2L]), ":")
+	} else if(is.ts) {
+	    str1 <- str1.ts(object, le.str)
 	    std.attr <- c("tsp","class") #- "names"
 	} else if (is.factor(object)) {
 	    nl <- length(lev.att <- levels(object))
@@ -548,7 +553,7 @@
 					#O: encodeString(object, quote= '"', na.encode= FALSE)
 	    formObj <- function(x) paste(as.character(x), collapse=" ")
 	}
-	else {
+	else { # not char.like
 	    if(!exists("format.fun", inherits=TRUE)) #-- define one --
 		format.fun <-
 		    if(mod == "num" || mod == "cplx") format else as.character
diff -Nru r-base-3.2.3/src/library/utils/R/summRprof.R r-base-3.3.1/src/library/utils/R/summRprof.R
--- r-base-3.2.3/src/library/utils/R/summRprof.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/summRprof.R	2016-03-16 23:03:21.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/summRprof.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -112,7 +112,7 @@
        chunk <- strsplit(chunk, " ")
        if (line.profiling)
            chunk <- lapply(chunk, function(x) {
-           	locations <- !grepl("^\"", x)
+           	locations <- !startsWith(x, '"')
            	if (lines != "hide") {
            	    fnum <- sub("#.*", "", x[locations])
            	    lnum <- sub(".*#", "", x[locations])
diff -Nru r-base-3.2.3/src/library/utils/R/SweaveDrivers.R r-base-3.3.1/src/library/utils/R/SweaveDrivers.R
--- r-base-3.2.3/src/library/utils/R/SweaveDrivers.R	2015-09-04 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/SweaveDrivers.R	2016-03-16 23:03:21.000000000 +0000
@@ -1,7 +1,7 @@
 #   File src/library/utils/R/SweaveDrivers.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -232,7 +232,7 @@
         echoComments <- function(showto) {
             if (options$echo && !is.na(lastshown) && lastshown < showto) {
                 dce <- trySrcLines(srcfile, lastshown + 1L, showto, NULL)
-                linedirs <- grepl("^#line ", dce)
+                linedirs <- startsWith(dce, "#line ")
 		dce <- dce[!linedirs]
 		if (length(dce))
                     putSinput(dce, length(dce)) # These are all trailing comments
@@ -281,7 +281,7 @@
                 lastshown <- showto
                 srcline <- srcref[3L]
 
-                linedirs <- grepl("^#line ", dce)
+                linedirs <- startsWith(dce, "#line ")
                 dce <- dce[!linedirs]
                 # Need to reduce leading lines if some were just removed
                 leading <- leading - sum(linedirs[seq_len(leading)])
diff -Nru r-base-3.2.3/src/library/utils/R/sysdata.R r-base-3.3.1/src/library/utils/R/sysdata.R
--- r-base-3.2.3/src/library/utils/R/sysdata.R	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/sysdata.R	2016-03-16 23:03:19.000000000 +0000
@@ -0,0 +1,62 @@
+make_sysdata_rda <-
+function()    
+{
+    ## Get the codes and descriptions from the
+    ##   <http://www.loc.gov/marc/relators/relaterm.html>
+    ## web page, and merge with the information on usage for R.
+
+    ## <http://www.loc.gov/marc/relators/relacode.html>
+    doc <- XML::htmlParse("http://www.loc.gov/marc/relators/relacode.html")
+    codes <- XML::readHTMLTable(doc)[[2]]
+
+    ## <http://www.loc.gov/marc/relators/relaterm.html>
+    doc <- XML::htmlParse("http://www.loc.gov/marc/relators/relaterm.html")
+    ns <- XML::getNodeSet(doc, "//dl")[[4]]
+    dt <- trimws(XML::xpathApply(ns, "./dt", XML::xmlValue))
+    dd <- trimws(XML::xpathApply(ns, "./dd", XML::xmlValue))
+
+    ## Drop obsolete stuff and pointers to it.
+    re <- "(.*) \\[(.*)\\]"
+    ind <- grepl(re, dt)
+    MARC_relator_db <-
+        as.data.frame(cbind(term = sub(re, "\\1", dt[ind]),
+                            code = sub(re, "\\2", dt[ind]),
+                            description = sub("\n\t UF.*", "", dd[ind]),
+                            usage = ""),
+                      stringsAsFactors = FALSE)
+
+    MARC_R_usage <-
+        c("aut" = "Use for full authors who have made substantial contributions to\nthe package and should show up in the package citation.",
+          "com" = "Use for package maintainers that collected code (potentially in\nother languages) but did not make further substantial\ncontributions to the package.",
+          "ctb" = "Use for authors who have made smaller contributions (such as\ncode patches etc.) but should not show up in the package\ncitation.", 
+          "cph" = "Use for all copyright holders.",
+          "cre" = "Use for the package maintainer.",
+          "ctr" = "Use for authors who have been contracted to write (parts of) the\npackage and hence do not own intellectual property.", 
+          "dtc" = "Use for persons who contributed data sets for the package.",
+          "ths" = "If the package is part of a thesis, use for the thesis advisor.", 
+          "trl" = "If the R code is merely a translation from another language\n(typically S), use for the translator to R.")
+
+    MARC_R_usage <- data.frame(code = names(MARC_R_usage),
+                               usage = c(MARC_R_usage),
+                               stringsAsFactors = FALSE,
+                               row.names = NULL)
+
+    pos <- match(MARC_relator_db$code, MARC_R_usage$code, nomatch = 0L)
+    MARC_relator_db$usage[pos > 0L] <-
+        gsub("\n", " ", MARC_R_usage$usage[pos])
+
+    MARC_relator_db_codes_used_with_R <-
+        MARC_relator_db[nchar(MARC_relator_db$usage) > 0L, "code"]
+
+    ## Using dump() to provide a plain text representation results in
+    ## non-ASCII string constants without appropriate encoding info.
+    ## c69417 manually changed to Unicode escapes, which however is not
+    ## straightforward to achieve programmatically.  Hence, instead of
+    ## using dump() to a text 'MARC.R' file use save() to a binary
+    ## 'sysdata.rda' file.
+
+    save(MARC_relator_db,
+         MARC_relator_db_codes_used_with_R,
+         file = "sysdata.rda",
+         compress = TRUE)
+}
Binary files /tmp/tmpr1xlqo/rKiOMPh78h/r-base-3.2.3/src/library/utils/R/sysdata.rda and /tmp/tmpr1xlqo/EboCyhHyzT/r-base-3.3.1/src/library/utils/R/sysdata.rda differ
diff -Nru r-base-3.2.3/src/library/utils/R/tar.R r-base-3.3.1/src/library/utils/R/tar.R
--- r-base-3.2.3/src/library/utils/R/tar.R	2015-08-25 22:16:37.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/tar.R	2016-04-05 22:15:11.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/tar.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2014 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -140,7 +140,7 @@
 
     ## A tar file is a set of 512 byte records,
     ## a header record followed by file contents (zero-padded).
-    ## See http://en.wikipedia.org/wiki/Tar_%28file_format%29
+    ## See https://en.wikipedia.org/wiki/Tar_%28file_format%29
     if(is.character(tarfile) && length(tarfile) == 1L) {
         con <- gzfile(path.expand(tarfile), "rb") # reads compressed formats
         on.exit(close(con))
@@ -245,7 +245,7 @@
                             warn1 <- c(warn1, "restoring symbolic link as a file copy")
                    } else {
                        mydir.create(dirname(name))
-                       od <- setwd(dirname(name))
+                       od0 <- setwd(dirname(name))
                        nm <- basename(name)
                        unlink(nm)
                        if(!file.symlink(name2, nm)) { # will give a warning
@@ -255,7 +255,7 @@
                            else
                                warning(gettextf("failed to copy %s to %s", sQuote(from), sQuote(name)), domain = NA)
                        }
-                       setwd(od)
+                       setwd(od0)
                    }
                 }
             }
@@ -329,6 +329,14 @@
                 compression_level = 6, tar = Sys.getenv("tar"),
                 extra_flags = "")
 {
+    files <- ## list the files before 'tarfile' is created!
+	if(is.null(files)) ## is fine
+	    list.files(recursive = TRUE, all.files = TRUE,
+		       full.names = TRUE, include.dirs = TRUE)
+	else ## is *not* ok when 'files' are simple files !
+	    ## list.files(path, ....) : first argument are *directories*
+	    list.files(files, recursive = TRUE, all.files = TRUE,
+		       full.names = TRUE, include.dirs = TRUE)
     if(is.character(tarfile)) {
         if(nzchar(tar) && tar != "internal") {
             ## FIXME: could pipe through gzip etc: might be safer for xz
@@ -383,9 +391,6 @@
     }
     warn1 <- character()
 
-    files <- list.files(files, recursive = TRUE, all.files = TRUE,
-                        full.names = TRUE, include.dirs = TRUE)
-
     invalid_uid <- invalid_gid <- FALSE
     for (f in unique(files)) {
         info <- file.info(f)
diff -Nru r-base-3.2.3/src/library/utils/R/unix/download.file.R r-base-3.3.1/src/library/utils/R/unix/download.file.R
--- r-base-3.2.3/src/library/utils/R/unix/download.file.R	2015-08-25 22:16:35.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/unix/download.file.R	2016-03-16 23:03:20.000000000 +0000
@@ -27,21 +27,12 @@
         match.arg(method, c("auto", "internal", "libcurl", "wget", "curl", "lynx"))
 
     if(method == "auto") {
+        if(length(url) != 1L || typeof(url) != "character")
+            stop("'url' must be a length-one character vector");
 	method <-
 	    if(capabilities("libcurl") && grepl("^(ht|f)tps:", url))
 		"libcurl"
-	    else if(capabilities("http/ftp"))
-		"internal"
-        ## little used from here down as previous test is almost always true.
-	    else if(grepl("^file:", url)) {
-		url <- URLdecode(url)
-		"internal"
-	    } else if(system("wget --help > /dev/null") == 0L)
-		"wget"
-	    else if(system("curl --help > /dev/null") == 0L)
-		"curl"
-	    else
-		stop("no download method found")
+            else "internal"
     }
 
     switch(method,
@@ -79,7 +70,7 @@
 				      " -o", shQuote(path.expand(destfile))))
 	   },
 	   "lynx" =
-	       stop("method 'lynx' is defunct as from R 3.1.0", domain = NA))
+	       stop("method 'lynx' is defunct", domain = NA))
 
     if(status) warning("download had nonzero exit status")
 
diff -Nru r-base-3.2.3/src/library/utils/R/vignette.R r-base-3.3.1/src/library/utils/R/vignette.R
--- r-base-3.2.3/src/library/utils/R/vignette.R	2015-09-04 22:15:08.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/vignette.R	2016-03-16 23:03:21.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/vignette.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2016 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
     function(topic, package = NULL, lib.loc = NULL, all = TRUE)
 {
     vinfo <- tools::getVignetteInfo(package, lib.loc, all)
-    
+
     if(!missing(topic)) {
         topic <- topic[1L]               # Just making sure ...
         vinfo <- vinfo[vinfo[, "Topic"] == topic, , drop = FALSE]
@@ -53,17 +53,13 @@
         else
             warning(gettextf("vignette %s not found", sQuote(topic)),
                     call. = FALSE, domain = NA)
-    }
-
-    if(missing(topic)) {
-        ## List all possible vignettes.
 
+    } else { ## missing(topic)) -- List all possible vignettes.
         title <- if(nrow(vinfo)) {
             paste(vinfo[, "Title"],
                   paste0(rep.int("(source", nrow(vinfo)),
                         ifelse(nzchar(vinfo[, "PDF"]),
-                               paste0(", ",
-                                      tools::file_ext(vinfo[, "PDF"])),
+                               paste0(", ", tools::file_ext(vinfo[, "PDF"])),
                                ""),
                          ")"))
         }
@@ -75,15 +71,12 @@
                     Item = vinfo[, "Topic"],
                     Title = title)
 	footer <- if (all) NULL else
-		  paste0("Use ",
-                         sQuote("vignette(all = TRUE)"),
-                         "\n",
+		  paste0("Use ", sQuote("vignette(all = TRUE)"), "\n",
                          "to list the vignettes in all *available* packages.")
-
-        y <- list(type = "vignette", title = "Vignettes", header = NULL,
-                  results = db, footer = footer)
-        class(y) <- "packageIQR"
-        return(y)
+        ## return
+        structure(class = "packageIQR",
+                  list(type = "vignette", title = "Vignettes", header = NULL,
+                       results = db, footer = footer))
     }
 }
 
@@ -92,15 +85,12 @@
 {
     if(nzchar(out <- x$PDF)) {
         ext <- tools::file_ext(out)
-	if (tolower(ext) == "html") 
-	    port <- tools::startDynamicHelp(NA)
-	else
-	    port <- 0L
-	if (port > 0L)
-	    out <- sprintf("http://127.0.0.1:%d/library/%s/doc/%s", 
-	                   port, basename(x$Dir), out)
-	else
-	    out <- file.path(x$Dir, "doc", out)
+	port <- if (tolower(ext) == "html") tools::startDynamicHelp(NA) else 0L
+	out <- if(port > 0L)
+	    sprintf("http://127.0.0.1:%d/library/%s/doc/%s",
+                    port, basename(x$Dir), out)
+               else
+                   file.path(x$Dir, "doc", out)
         if(tolower(ext) == "pdf") {
             pdfviewer <- getOption("pdfviewer")
             if(identical(pdfviewer, "false")) {
@@ -110,31 +100,38 @@
                               file.path(R.home("bin"), "open.exe")))
             	shell.exec(out)
             else system2(pdfviewer, shQuote(out), wait = FALSE)
-        } else 
+        } else
             browseURL(out)
     } else {
         warning(gettextf("vignette %s has no PDF/HTML",
                          sQuote(x$Topic)),
                 call. = FALSE, domain = NA)
     }
-    
     invisible(x)
 }
 
-edit.vignette <-
-function(name, ...)
-{
-    if(nzchar(p <- name$R)) {
-        f <- tempfile(name$Topic, fileext = ".R")
-        file.copy(file.path(name$Dir, "doc", p), f)
-        file.edit(file = f, ...)
+## Not exported yet
+getRcode <- function(x, ...) UseMethod("getRcode")
+
+getRcode.vignette <- function(x, strict=TRUE, ...) {
+    if(nzchar(p <- x$R)) {
+        file.path(x$Dir, "doc", p)
     } else {
         ## Could try to extract the R code from the source via tangle,
         ## using
         ##   tools::buildVignette(tangle = TRUE, weave = FALSE)
         ## but why should this not have been done at install time?
-        warning(gettextf("vignette %s has no R code",
-                         sQuote(name$Topic)),
-                call. = FALSE, domain = NA)
+        (if(strict) stop else warning)(
+            gettextf("vignette %s has no R code", sQuote(x$Topic)),
+            call. = FALSE, domain = NA)
     }
 }
+
+edit.vignette <- function(name, ...)
+{
+    if(is.character(src <- getRcode(name, strict=FALSE))) {
+        f <- tempfile(name$Topic, fileext = ".R")
+        file.copy(src, f)
+        file.edit(file = f, ...)
+    } # getRcode() did warn already
+}
diff -Nru r-base-3.2.3/src/library/utils/R/windows/choose.files.R r-base-3.3.1/src/library/utils/R/windows/choose.files.R
--- r-base-3.2.3/src/library/utils/R/windows/choose.files.R	2015-08-25 22:16:32.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/windows/choose.files.R	2016-03-16 23:03:18.000000000 +0000
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/windows/choose.files.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2012 The R Core Team
+#  Copyright (C) 1995-2015 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -27,13 +27,14 @@
             "Text files (*.txt)",
             "R images (*.RData,*.rda)",
             "Zip files (*.zip)",
+            "Package tarballs (*.tar.gz)",
             "All files (*.*)",
 
             "*.R;*.q;*.ssc;*.S", "*.emf", "*.ps", "*.pdf", "*.png", "*.bmp",
-            "*.jpeg;*.jpg", "*.txt", "*.RData;*.rda", "*.zip", "*.*"),
-       .Dim = c(11L, 2L),
+            "*.jpeg;*.jpg", "*.txt", "*.RData;*.rda", "*.zip", "*.tar.gz", "*.*"),
+       .Dim = c(12L, 2L),
        .Dimnames = list(c("R", "emf", "ps","pdf", "png",
-                          "bmp", "jpeg", "txt", "RData", "zip", "All"),
+                          "bmp", "jpeg", "txt", "RData", "zip", "tarball", "All"),
                         NULL))
 
 choose.files <- function(default = '', caption = 'Select files', multi = TRUE,
diff -Nru r-base-3.2.3/src/library/utils/R/windows/download.file.R r-base-3.3.1/src/library/utils/R/windows/download.file.R
--- r-base-3.2.3/src/library/utils/R/windows/download.file.R	2015-08-25 22:16:32.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/windows/download.file.R	2016-03-16 23:03:18.000000000 +0000
@@ -27,21 +27,14 @@
         match.arg(method, c("auto", "internal", "wininet", "libcurl",
                             "wget", "curl", "lynx"))
 
-    if(missing(mode) && length(grep("\\.(gz|bz2|xz|tgz|zip|rda|RData)$", url))) mode <- "wb"
+    if(missing(mode) && length(grep("\\.(gz|bz2|xz|tgz|zip|rda|RData)$", url)))
+        mode <- "wb"
     if(method == "auto") {
+        if(length(url) != 1L || typeof(url) != "character")
+            stop("'url' must be a length-one character vector");
 	method <-
-	    if(capabilities("http/ftp"))
-		"internal"
-        ## unused from here down as test is always true.
-	    else if(grepl("^file:", url)) {
-		url <- URLdecode(url)
-		"internal"
-	    } else if(system("wget --help", invisible=TRUE) == 0L)
-		"wget"
-	    else if(system("curl --help", invisible=TRUE) == 0L)
-		"curl"
-	    else
-		stop("no download method found")
+            if(grepl("^ftps:", url) && capabilities("libcurl")) "libcurl"
+            else "wininet"
     }
 
     switch(method,
@@ -77,7 +70,7 @@
 				      " -o", shQuote(path.expand(destfile))))
 	   },
 	   "lynx" =
-	       stop("method 'lynx' is defunct as from R 3.1.0", domain = NA))
+	       stop("method 'lynx' is defunct", domain = NA))
 
     if(status > 0L)
         warning("download had nonzero exit status")
diff -Nru r-base-3.2.3/src/library/utils/R/windows/install.packages.R r-base-3.3.1/src/library/utils/R/windows/install.packages.R
--- r-base-3.2.3/src/library/utils/R/windows/install.packages.R	2015-08-25 22:16:32.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/windows/install.packages.R	2016-03-16 23:03:18.000000000 +0000
@@ -281,8 +281,16 @@
 
 menuInstallLocal <- function()
 {
-    install.packages(choose.files('',filters=Filters[c('zip','All'),]),
-                     .libPaths()[1L], repos = NULL, type = 'binary')
+    files <- choose.files('',filters=Filters[c('zip','tarball', 'All'),])
+    zips <- grepl("[.]zip$", files)
+    tarballs <- grepl("[.]tar[.]gz$", files)
+    bad <- !(zips | tarballs)
+    if (any(bad)) 
+        stop("Only '*.zip' and '*.tar.gz' files can be installed.")
+    if (any(zips)) install.packages(files[zips],
+        .libPaths()[1L], repos = NULL, type = "binary")
+    if (any(tarballs)) install.packages(files[tarballs],
+        .libPaths()[1L], repos = NULL, type = "source")
 }
 
 ### Deprecated in 2.13.0, defunct in 2.14.0
diff -Nru r-base-3.2.3/src/library/utils/R/windows/sysutils.R r-base-3.3.1/src/library/utils/R/windows/sysutils.R
--- r-base-3.2.3/src/library/utils/R/windows/sysutils.R	2015-08-26 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/library/utils/R/windows/sysutils.R	2016-03-16 23:03:18.000000000 +0000
@@ -115,7 +115,10 @@
     .External2(C_readRegistry, key, match.arg(hive), maxdepth, view)
 }
 
-setInternet2 <- function(use = TRUE) .Internal(useInternet2(use))
+setInternet2 <- function(use = TRUE) {
+    if(!is.na(use)) stop("use != NA is defunct")
+    NA
+}
 
 
 win.version <- function() .Call(C_winver)
diff -Nru r-base-3.2.3/src/library/utils/src/io.c r-base-3.3.1/src/library/utils/src/io.c
--- r-base-3.2.3/src/library/utils/src/io.c	2015-08-25 22:16:38.000000000 +0000
+++ r-base-3.3.1/src/library/utils/src/io.c	2016-03-16 23:03:22.000000000 +0000
@@ -185,8 +185,13 @@
     if (isBlankString(endp)) {
 	z.r = x; z.i = 0;
     } else if (*endp == 'i')  {
-	z.r = 0; z.i = x;
-	endp++;
+	if (endp == nptr) {
+	    z.r = NA_REAL; z.i = NA_REAL;
+	}
+	else {
+	    z.r = 0; z.i = x;
+	    endp++;
+	}
     } else {
 	s = endp;
 	y = Strtod(s, &endp, NA, d, i_exact);
@@ -194,7 +199,7 @@
 	    z.r = x; z.i = y;
 	    endp++;
 	} else {
-	    z.r = 0; z.i = 0;
+	    z.r = NA_REAL; z.i = NA_REAL;
 	    endp = (char *) nptr; /* -Wall */
 	}
     }
diff -Nru r-base-3.2.3/src/library/utils/src/Makefile.in r-base-3.3.1/src/library/utils/src/Makefile.in
--- r-base-3.2.3/src/library/utils/src/Makefile.in	2013-09-26 22:05:05.000000000 +0000
+++ r-base-3.3.1/src/library/utils/src/Makefile.in	2016-03-16 23:03:22.000000000 +0000
@@ -22,10 +22,9 @@
 
 SHLIB = $(pkg)@SHLIB_EXT@
 
-XZ_CPPFLAGS = @BUILD_XZ_TRUE@  -I$(top_srcdir)/src/extra/xz/api
 # need Defn.h etc, and config.h
 PKG_CPPFLAGS =-I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H \
-  -I$(top_srcdir)/src/main $(XZ_CPPFLAGS)
+  -I$(top_srcdir)/src/main
 
 
 all: Makedeps
diff -Nru r-base-3.2.3/src/library/utils/src/utils.c r-base-3.3.1/src/library/utils/src/utils.c
--- r-base-3.2.3/src/library/utils/src/utils.c	2015-08-25 22:16:38.000000000 +0000
+++ r-base-3.3.1/src/library/utils/src/utils.c	2016-03-16 23:03:22.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2012   The R Core Team.
+ *  Copyright (C) 2012-2015   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 # include <config.h>
 #endif
 
+#include <string.h>
 #include <R.h>
 #include <Rinternals.h>
 
@@ -67,7 +68,8 @@
     return mkString(ans);
 }
 
-#if defined(HAVE_BSD_NETWORKING) && defined(HAVE_ARPA_INET_H)
+// As from 3.3.0 this means on Unix.
+#if defined(HAVE_ARPA_INET_H)
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff -Nru r-base-3.2.3/src/main/agrep.c r-base-3.3.1/src/main/agrep.c
--- r-base-3.2.3/src/main/agrep.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/agrep.c	2016-03-16 23:04:17.000000000 +0000
@@ -127,9 +127,9 @@
 
     if(opt_fixed) cflags |= REG_LITERAL;
 
-    if(!isString(pat) || length(pat) < 1)
+    if(!isString(pat) || LENGTH(pat) < 1)
 	error(_("invalid '%s' argument"), "pattern");
-    if(length(pat) > 1)
+    if(LENGTH(pat) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "pattern");
 
     if(!isString(vec)) error(_("invalid '%s' argument"), "x");
@@ -783,28 +783,28 @@
     n = XLENGTH(vec);
 
     if(!useBytes) {
-        haveBytes = IS_BYTES(STRING_ELT(pat, 0));
+	haveBytes = IS_BYTES(STRING_ELT(pat, 0));
 	if(!haveBytes)
-            for(i = 0; i < n; i++) {
-                if(IS_BYTES(STRING_ELT(vec, i))) {
-                    haveBytes = TRUE;
-                    break;
-                }
+	    for(i = 0; i < n; i++) {
+		if(IS_BYTES(STRING_ELT(vec, i))) {
+		    haveBytes = TRUE;
+		    break;
+		}
 	    }
 	if(haveBytes) useBytes = TRUE;
     }
 
     if(!useBytes) {
-        useWC = !IS_ASCII(STRING_ELT(pat, 0));
-        if(!useWC) {
-            for(i = 0 ; i < n ; i++) {
-                if(STRING_ELT(vec, i) == NA_STRING) continue;
-                if(!IS_ASCII(STRING_ELT(vec, i))) {
-                    useWC = TRUE;
-                    break;
-                }
-            }
-        }
+	useWC = !IS_ASCII(STRING_ELT(pat, 0));
+	if(!useWC) {
+	    for(i = 0 ; i < n ; i++) {
+		if(STRING_ELT(vec, i) == NA_STRING) continue;
+		if(!IS_ASCII(STRING_ELT(vec, i))) {
+		    useWC = TRUE;
+		    break;
+		}
+	    }
+	}
     }
 
     SEXP s_nchar = install("nchar");
@@ -824,15 +824,15 @@
     else if(useWC)
 	rc = tre_regwcomp(&reg, wtransChar(STRING_ELT(pat, 0)), cflags);
     else {
-        s = translateChar(STRING_ELT(pat, 0));
-        if(mbcslocale && !mbcsValid(s))
-            error(_("regular expression is invalid in this locale"));
-        rc = tre_regcomp(&reg, s, cflags);
+	s = translateChar(STRING_ELT(pat, 0));
+	if(mbcslocale && !mbcsValid(s))
+	    error(_("regular expression is invalid in this locale"));
+	rc = tre_regcomp(&reg, s, cflags);
     }
     if(rc) {
-        char errbuf[1001];
-        tre_regerror(rc, &reg, errbuf, 1001);
-        error(_("regcomp error: '%s'"), errbuf);
+	char errbuf[1001];
+	tre_regerror(rc, &reg, errbuf, 1001);
+	error(_("regcomp error: '%s'"), errbuf);
     }
 
     nmatch = reg.re_nsub + 1;
diff -Nru r-base-3.2.3/src/main/apply.c r-base-3.3.1/src/main/apply.c
--- r-base-3.2.3/src/main/apply.c	2015-08-25 22:18:45.000000000 +0000
+++ r-base-3.3.1/src/main/apply.c	2016-03-16 23:04:17.000000000 +0000
@@ -161,20 +161,20 @@
 	    PROTECT_WITH_INDEX(val, &indx);
 	    if (length(val) != commonLen)
 		error(_("values must be length %d,\n but FUN(X[[%d]]) result is length %d"),
-	               commonLen, i+1, length(val));
+		       commonLen, i+1, length(val));
 	    valType = TYPEOF(val);
 	    if (valType != commonType) {
 		Rboolean okay = FALSE;
 		switch (commonType) {
 		case CPLXSXP: okay = (valType == REALSXP) || (valType == INTSXP)
-		                    || (valType == LGLSXP); break;
+				    || (valType == LGLSXP); break;
 		case REALSXP: okay = (valType == INTSXP) || (valType == LGLSXP); break;
 		case INTSXP:  okay = (valType == LGLSXP); break;
-	        }
-	        if (!okay)
-	            error(_("values must be type '%s',\n but FUN(X[[%d]]) result is type '%s'"),
-		  type2char(commonType), i+1, type2char(valType));
-	        REPROTECT(val = coerceVector(val, commonType), indx);
+		}
+		if (!okay)
+		    error(_("values must be type '%s',\n but FUN(X[[%d]]) result is type '%s'"),
+			  type2char(commonType), i+1, type2char(valType));
+		REPROTECT(val = coerceVector(val, commonType), indx);
 	    }
 	    /* Take row names from the first result only */
 	    if (i == 0 && useNames && isNull(rowNames))
@@ -276,10 +276,13 @@
     /* if X is a list, recurse.  Otherwise if it matches classes call f */
     if(isNewList(X)) {
 	n = length(X);
-	PROTECT(ans = allocVector(VECSXP, n));
-	names = getAttrib(X, R_NamesSymbol);
-	/* or copy attributes if replace = TRUE? */
-	if(!isNull(names)) setAttrib(ans, R_NamesSymbol, names);
+  if (replace) {
+    PROTECT(ans = shallow_duplicate(X));
+  } else {
+    PROTECT(ans = allocVector(VECSXP, n));
+    names = getAttrib(X, R_NamesSymbol);
+    if(!isNull(names)) setAttrib(ans, R_NamesSymbol, names);
+  }
 	for(i = 0; i < n; i++)
 	    SET_VECTOR_ELT(ans, i, do_one(VECTOR_ELT(X, i), FUN, classes,
 					  deflt, replace, rho));
@@ -332,10 +335,13 @@
     if(!isString(how)) error(_("invalid '%s' argument"), "how");
     replace = strcmp(CHAR(STRING_ELT(how, 0)), "replace") == 0; /* ASCII */
     n = length(X);
-    PROTECT(ans = allocVector(VECSXP, n));
-    names = getAttrib(X, R_NamesSymbol);
-    /* or copy attributes if replace = TRUE? */
-    if(!isNull(names)) setAttrib(ans, R_NamesSymbol, names);
+    if (replace) {
+      PROTECT(ans = shallow_duplicate(X));
+    } else {
+      PROTECT(ans = allocVector(VECSXP, n));
+      names = getAttrib(X, R_NamesSymbol);
+      if(!isNull(names)) setAttrib(ans, R_NamesSymbol, names);
+    }
     for(i = 0; i < n; i++)
 	SET_VECTOR_ELT(ans, i, do_one(VECTOR_ELT(X, i), FUN, classes, deflt,
 				      replace, rho));
diff -Nru r-base-3.2.3/src/main/arithmetic.c r-base-3.3.1/src/main/arithmetic.c
--- r-base-3.2.3/src/main/arithmetic.c	2015-08-25 22:18:45.000000000 +0000
+++ r-base-3.3.1/src/main/arithmetic.c	2016-03-16 23:04:17.000000000 +0000
@@ -214,7 +214,11 @@
 	/* There was a special case for y == 0.5 here, but
 	   gcc 4.3.0 -g -O2 mis-compiled it.  Showed up with
 	   100^0.5 as 3.162278, example(pbirthday) failed. */
-	return pow(x, y);
+#ifdef USE_POWL_IN_R_POW
+    return powl(x, y);
+#else
+    return pow(x, y);
+#endif
     }
     if (ISNAN(x) || ISNAN(y))
 	return(x + y);
@@ -253,7 +257,7 @@
 	    if(n & 01) xn *= x;
 	    if(n >>= 1) x *= x; else break;
 	}
-        if(is_neg) xn = 1. / xn;
+	if(is_neg) xn = 1. / xn;
     }
     return xn;
 }
@@ -339,7 +343,7 @@
     if (x == NA_INTEGER || y == NA_INTEGER)
 	return NA_INTEGER;
     else {
-	int z = x * y;
+	int z = x * y;  // UBSAN will warn if this overflows (happens in bda)
 	if (GOODIPROD(x, y, z) && z != NA_INTEGER)
 	    return z;
 	else {
@@ -686,7 +690,7 @@
     }
 
     if(xS4 || yS4) {   /* Only set the bit:  no method defined! */
-        val = asS4(val, TRUE, TRUE);
+	val = asS4(val, TRUE, TRUE);
     }
     UNPROTECT(nprotect);
     return val;
@@ -783,16 +787,6 @@
     return s1;			/* never used; to keep -Wall happy */
 }
 
-/* i1 = i % n1; i2 = i % n2;
- * this macro is quite a bit faster than having real modulo calls
- * in the loop (tested on Intel and Sparc)
- */
-#define mod_iterate(n1,n2,i1,i2) for (i=i1=i2=0; i<n; \
-	i1 = (++i1 == n1) ? 0 : i1,\
-	i2 = (++i2 == n2) ? 0 : i2,\
-	++i)
-
-
 static SEXP integer_binary(ARITHOP_TYPE code, SEXP s1, SEXP s2, SEXP lcall)
 {
     R_xlen_t i, i1, i2, n, n1, n2;
@@ -814,7 +808,7 @@
 
     switch (code) {
     case PLUSOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		x1 = INTEGER(s1)[i1];
 		x2 = INTEGER(s2)[i2];
 		INTEGER(ans)[i] = R_integer_plus(x1, x2, &naflag);
@@ -823,7 +817,7 @@
 	    warningcall(lcall, INTEGER_OVERFLOW_WARNING);
 	break;
     case MINUSOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		x1 = INTEGER(s1)[i1];
 		x2 = INTEGER(s2)[i2];
 		INTEGER(ans)[i] = R_integer_minus(x1, x2, &naflag);
@@ -832,7 +826,7 @@
 	    warningcall(lcall, INTEGER_OVERFLOW_WARNING);
 	break;
     case TIMESOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		x1 = INTEGER(s1)[i1];
 		x2 = INTEGER(s2)[i2];
 		INTEGER(ans)[i] = R_integer_times(x1, x2, &naflag);
@@ -841,14 +835,14 @@
 	    warningcall(lcall, INTEGER_OVERFLOW_WARNING);
 	break;
     case DIVOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		x1 = INTEGER(s1)[i1];
 		x2 = INTEGER(s2)[i2];
 		REAL(ans)[i] = R_integer_divide(x1, x2);
 	    });
 	break;
     case POWOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		if((x1 = INTEGER(s1)[i1]) == 1 || (x2 = INTEGER(s2)[i2]) == 0)
 		    REAL(ans)[i] = 1.;
 		else if (x1 == NA_INTEGER || x2 == NA_INTEGER)
@@ -858,7 +852,7 @@
 	    });
 	break;
     case MODOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		x1 = INTEGER(s1)[i1];
 		x2 = INTEGER(s2)[i2];
 		if (x1 == NA_INTEGER || x2 == NA_INTEGER || x2 == 0)
@@ -871,7 +865,7 @@
 	    });
 	break;
     case IDIVOP:
-	MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 		x1 = INTEGER(s1)[i1];
 		x2 = INTEGER(s2)[i2];
 		/* This had x %/% 0 == 0 prior to 2.14.1, but
@@ -922,25 +916,25 @@
 	    double *da = REAL(ans);
 	    double *dx = REAL(s1);
 	    double *dy = REAL(s2);
-            if (n2 == 1) {
+	    if (n2 == 1) {
 		double tmp = dy[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] + tmp;);
 	    }
-            else if (n1 == 1) {
+	    else if (n1 == 1) {
 		double tmp = dx[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = tmp + dy[i];);
 	    }
-            else if (n1 == n2)
+	    else if (n1 == n2)
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] + dy[i];);
-            else
-		MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    else
+		MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 				  da[i] = dx[i1] + dy[i2];);
 	}
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = R_INTEGER(s1, i1) + REAL(s2)[i2];);
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = REAL(s1)[i1] + R_INTEGER(s2, i2););
 	break;
     case MINUSOP:
@@ -948,25 +942,25 @@
 	    double *da = REAL(ans);
 	    double *dx = REAL(s1);
 	    double *dy = REAL(s2);
-            if (n2 == 1) {
-                double tmp = dy[0];
+	    if (n2 == 1) {
+		double tmp = dy[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] - tmp;);
-            }
-            else if (n1 == 1) {
-                double tmp = dx[0];
+	    }
+	    else if (n1 == 1) {
+		double tmp = dx[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = tmp - dy[i];);
-            }
-            else if (n1 == n2)
+	    }
+	    else if (n1 == n2)
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] - dy[i];);
-            else
-		MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    else
+		MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 				  da[i] = dx[i1] - dy[i2];);
 	}
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = R_INTEGER(s1, i1) - REAL(s2)[i2];);
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = REAL(s1)[i1] - R_INTEGER(s2, i2););
 	break;
     case TIMESOP:
@@ -974,25 +968,25 @@
 	    double *da = REAL(ans);
 	    double *dx = REAL(s1);
 	    double *dy = REAL(s2);
-            if (n2 == 1) {
-                double tmp = dy[0];
+	    if (n2 == 1) {
+		double tmp = dy[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] * tmp;);
-            }
-            else if (n1 == 1) {
-                double tmp = REAL(s1)[0];
+	    }
+	    else if (n1 == 1) {
+		double tmp = REAL(s1)[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = tmp * dy[i];);
-            }
-            else if (n1 == n2)
+	    }
+	    else if (n1 == n2)
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] * dy[i];);
-            else
-		MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    else
+		MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 				  da[i] = dx[i1] * dy[i2];);
 	}
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = R_INTEGER(s1, i1) * REAL(s2)[i2];);
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = REAL(s1)[i1] * R_INTEGER(s2, i2););
 	break;
     case DIVOP:
@@ -1000,25 +994,25 @@
 	    double *da = REAL(ans);
 	    double *dx = REAL(s1);
 	    double *dy = REAL(s2);
-            if (n2 == 1) {
-                double tmp = dy[0];
+	    if (n2 == 1) {
+		double tmp = dy[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] / tmp;);
-            }
-            else if (n1 == 1) {
-                double tmp = dx[0];
+	    }
+	    else if (n1 == 1) {
+		double tmp = dx[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = tmp / dy[i];);
-            }
-            else if (n1 == n2)
+	    }
+	    else if (n1 == n2)
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = dx[i] / dy[i];);
-            else
-		MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    else
+		MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 				  da[i] = dx[i1] / dy[i2];);
 	}
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = R_INTEGER(s1, i1) / REAL(s2)[i2];);
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = REAL(s1)[i1] / R_INTEGER(s2, i2););
 	break;
     case POWOP:
@@ -1026,54 +1020,54 @@
 	    double *da = REAL(ans);
 	    double *dx = REAL(s1);
 	    double *dy = REAL(s2);
-            if (n2 == 1) {
-                double tmp = dy[0];
+	    if (n2 == 1) {
+		double tmp = dy[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = R_POW(dx[i], tmp););
-            }
-            else if (n1 == 1) {
-                double tmp = dx[0];
+	    }
+	    else if (n1 == 1) {
+		double tmp = dx[0];
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = R_POW(tmp, dy[i]););
-            }
-            else if (n1 == n2)
+	    }
+	    else if (n1 == n2)
 		R_ITERATE_CHECK(NINTERRUPT, n, i, da[i] = R_POW(dx[i], dy[i]););
-            else
-		MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    else
+		MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 				  da[i] = R_POW(dx[i1], dy[i2]););
 	}
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = R_POW( R_INTEGER(s1, i1),
 						    REAL(s2)[i2]););
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = R_POW(REAL(s1)[i1],
 						   R_INTEGER(s2, i2)););
 	break;
     case MODOP:
 	if(TYPEOF(s1) == REALSXP && TYPEOF(s2) == REALSXP)
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = myfmod(REAL(s1)[i1],
 						    REAL(s2)[i2]););
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = myfmod( R_INTEGER(s1, i1),
 						     REAL(s2)[i2]););
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = myfmod(REAL(s1)[i1],
 						    R_INTEGER(s2, i2)););
 	break;
     case IDIVOP:
 	if(TYPEOF(s1) == REALSXP && TYPEOF(s2) == REALSXP)
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = myfloor(REAL(s1)[i1],
 						     REAL(s2)[i2]););
 	else if(TYPEOF(s1) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = myfloor(R_INTEGER(s1, i1),
 						     REAL(s2)[i2]););
 	else if(TYPEOF(s2) == INTSXP )
-	    MOD_ITERATE_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
+	    MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2,
 			      REAL(ans)[i] = myfloor(REAL(s1)[i1],
 						     R_INTEGER(s2,i2)););
 	break;
@@ -1115,18 +1109,22 @@
     y = REAL(sy);
     naflag = 0;
     for (i = 0; i < n; i++) {
-	if (ISNAN(a[i]))
-	    y[i] = a[i];
-	else {
-	    y[i] = f(a[i]);
-	    if (ISNAN(y[i])) naflag = 1;
+	double x = a[i]; /* in case y == a */
+	/* This code assumes that ISNAN(x) implies ISNAN(f(x)), so we
+	   only need to check ISNAN(x) if ISNAN(f(x)) is true. */
+	y[i] = f(x);
+	if (ISNAN(y[i])) {
+	    if (ISNAN(x))
+		y[i] = x; /* make sure the incoming NaN is preserved */
+	    else
+		naflag = 1;
 	}
     }
     /* These are primitives, so need to use the call */
     if(naflag) warningcall(lcall, R_MSG_NA);
 
     if (sa != sy && ATTRIB(sa) != R_NilValue)
-	DUPLICATE_ATTRIB(sy, sa);
+	SHALLOW_DUPLICATE_ATTRIB(sy, sa);
     UNPROTECT(2);
     return sy;
 }
@@ -1183,10 +1181,10 @@
 	*/
     case 47: return MATH1(cospi);
     case 48: return MATH1(sinpi);
-#ifndef HAVE_TANPI
-    case 49: return MATH1(tanpi);
-#else
+#if defined(HAVE_TANPI) || defined(HAVE___TANPI)
     case 49: return MATH1(Rtanpi);
+#else
+    case 49: return MATH1(tanpi);
 #endif
 
     default:
@@ -1233,22 +1231,22 @@
 	PROTECT(s);
 	/* Note: relying on INTEGER(.) === LOGICAL(.) : */
 	for(i = 0 ; i < n ; i++) {
-            int xi = INTEGER(x)[i];
+	    int xi = INTEGER(x)[i];
 	    INTEGER(s)[i] = (xi == NA_INTEGER) ? xi : abs(xi);
-        }
+	}
     } else if (TYPEOF(x) == REALSXP) {
 	R_xlen_t i, n = XLENGTH(x);
 	PROTECT(s = NO_REFERENCES(x) ? x : allocVector(REALSXP, n));
 	for(i = 0 ; i < n ; i++)
 	    REAL(s)[i] = fabs(REAL(x)[i]);
     } else if (isComplex(x)) {
-        SET_TAG(args, R_NilValue); /* cmathfuns want "z"; we might have "x" PR#16047 */
+	SET_TAG(args, R_NilValue); /* cmathfuns want "z"; we might have "x" PR#16047 */
 	return do_cmathfuns(call, op, args, env);
     } else
 	errorcall(call, R_MSG_NONNUM_MATH);
 
     if (x != s && ATTRIB(x) != R_NilValue)
-	DUPLICATE_ATTRIB(s, x);
+	SHALLOW_DUPLICATE_ATTRIB(s, x);
     UNPROTECT(1);
     return s;
 }
@@ -1276,27 +1274,27 @@
 
     /* for 0-length a we want the attributes of a, not those of b
        as no recycling will occur */
-#define SETUP_Math2				\
-    na = XLENGTH(sa);				\
-    nb = XLENGTH(sb);				\
-    if ((na == 0) || (nb == 0))	{		\
-	PROTECT(sy = allocVector(REALSXP, 0));	\
-	if (na == 0) DUPLICATE_ATTRIB(sy, sa);	\
-	UNPROTECT(1);				\
-	return(sy);				\
-    }						\
-    n = (na < nb) ? nb : na;			\
-    PROTECT(sa = coerceVector(sa, REALSXP));	\
-    PROTECT(sb = coerceVector(sb, REALSXP));	\
-    PROTECT(sy = allocVector(REALSXP, n));	\
-    a = REAL(sa);				\
-    b = REAL(sb);				\
-    y = REAL(sy);				\
+#define SETUP_Math2					\
+    na = XLENGTH(sa);					\
+    nb = XLENGTH(sb);					\
+    if ((na == 0) || (nb == 0))	{			\
+	PROTECT(sy = allocVector(REALSXP, 0));		\
+	if (na == 0) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+	UNPROTECT(1);					\
+	return(sy);					\
+    }							\
+    n = (na < nb) ? nb : na;				\
+    PROTECT(sa = coerceVector(sa, REALSXP));		\
+    PROTECT(sb = coerceVector(sb, REALSXP));		\
+    PROTECT(sy = allocVector(REALSXP, n));		\
+    a = REAL(sa);					\
+    b = REAL(sb);					\
+    y = REAL(sy);					\
     naflag = 0
 
     SETUP_Math2;
 
-    mod_iterate(na, nb, ia, ib) {
+    MOD_ITERATE2(n, na, nb, i, ia, ib, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1305,12 +1303,12 @@
 	    y[i] = f(ai, bi);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
-#define FINISH_Math2				\
-    if(naflag) warning(R_MSG_NA);		\
-    if (n == na)  DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
+#define FINISH_Math2					\
+    if(naflag) warning(R_MSG_NA);			\
+    if (n == na)  SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
     UNPROTECT(3)
 
     FINISH_Math2;
@@ -1333,7 +1331,7 @@
     SETUP_Math2;
     m_opt = asInteger(sI);
 
-    mod_iterate(na, nb, ia, ib) {
+    MOD_ITERATE2(n, na, nb, i, ia, ib, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1342,7 +1340,7 @@
 	    y[i] = f(ai, bi, m_opt);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
     FINISH_Math2;
     return sy;
 } /* math2_1() */
@@ -1362,7 +1360,7 @@
     i_1 = asInteger(sI1);
     i_2 = asInteger(sI2);
 
-    mod_iterate(na, nb, ia, ib) {
+    MOD_ITERATE2(n, na, nb, i, ia, ib, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1371,7 +1369,7 @@
 	    y[i] = f(ai, bi, i_1, i_2);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
     FINISH_Math2;
     return sy;
 } /* math2_2() */
@@ -1411,7 +1409,7 @@
     nw = 1 + (size_t)floor(amax);
     work = (double *) R_alloc(nw, sizeof(double));
 
-    mod_iterate(na, nb, ia, ib) {
+    MOD_ITERATE2(n, na, nb, i, ia, ib, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1420,7 +1418,7 @@
 	    y[i] = f(ai, bi, work);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
     vmaxset(vmax);
     FINISH_Math2;
@@ -1510,9 +1508,9 @@
 
     n = length(args);
     if (n != 1 && n != 2)
-        error(ngettext("%d argument passed to '%s' which requires 1 or 2 arguments",
-                       "%d arguments passed to '%s'which requires 1 or 2 arguments", n),
-              n, PRIMNAME(op));
+	error(ngettext("%d argument passed to '%s' which requires 1 or 2 arguments",
+		       "%d arguments passed to '%s'which requires 1 or 2 arguments", n),
+	      n, PRIMNAME(op));
 
     if (! DispatchGroup("Math", call2, op, args, env, &res)) {
 	if(n == 1) {
@@ -1522,8 +1520,8 @@
 	} else {
 	    /* If named, do argument matching by name */
 	    if (TAG(args) != R_NilValue || TAG(CDR(args)) != R_NilValue) {
-	        if (do_Math2_formals == NULL)
-                    do_Math2_formals = allocFormalsList2(install("x"),
+		if (do_Math2_formals == NULL)
+		    do_Math2_formals = allocFormalsList2(install("x"),
 							 install("digits"));
 		PROTECT(args = matchArgs(do_Math2_formals, args, call));
 		nprotect++;
@@ -1671,12 +1669,6 @@
 	if      (ISNA (a) || ISNA (b)|| ISNA (c)) y = NA_REAL;	\
 	else if (ISNAN(a) || ISNAN(b)|| ISNAN(c)) y = R_NaN;
 
-#define mod_iterate3(n1,n2,n3,i1,i2,i3) for (i=i1=i2=i3=0; i<n; \
-	i1 = (++i1==n1) ? 0 : i1,				\
-	i2 = (++i2==n2) ? 0 : i2,				\
-	i3 = (++i3==n3) ? 0 : i3,				\
-	++i)
-
 #define SETUP_Math3						\
     if (!isNumeric(sa) || !isNumeric(sb) || !isNumeric(sc))	\
 	errorcall(lcall, R_MSG_NONNUM_MATH);			\
@@ -1699,12 +1691,12 @@
     y = REAL(sy);						\
     naflag = 0
 
-#define FINISH_Math3				\
-    if(naflag) warning(R_MSG_NA);		\
-						\
-    if (n == na) DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
-    else if (n == nc) DUPLICATE_ATTRIB(sy, sc);	\
+#define FINISH_Math3					\
+    if(naflag) warning(R_MSG_NA);			\
+							\
+    if (n == na) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
+    else if (n == nc) SHALLOW_DUPLICATE_ATTRIB(sy, sc);	\
     UNPROTECT(4)
 
 static SEXP math3_1(SEXP sa, SEXP sb, SEXP sc, SEXP sI,
@@ -1719,7 +1711,7 @@
     SETUP_Math3;
     i_1 = asInteger(sI);
 
-    mod_iterate3 (na, nb, nc, ia, ib, ic) {
+    MOD_ITERATE3(n, na, nb, nc, i, ia, ib, ic, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1729,7 +1721,7 @@
 	    y[i] = f(ai, bi, ci, i_1);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
     FINISH_Math3;
     return sy;
@@ -1748,7 +1740,7 @@
     i_1 = asInteger(sI);
     i_2 = asInteger(sJ);
 
-    mod_iterate3 (na, nb, nc, ia, ib, ic) {
+    MOD_ITERATE3 (n, na, nb, nc, i, ia, ib, ic, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1758,7 +1750,7 @@
 	    y[i] = f(ai, bi, ci, i_1, i_2);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
     FINISH_Math3;
     return sy;
@@ -1789,7 +1781,7 @@
     nw = 1 + (size_t)floor(amax);
     work = (double *) R_alloc(nw, sizeof(double));
 
-    mod_iterate3 (na, nb, nc, ia, ib, ic) {
+    MOD_ITERATE3 (n, na, nb, nc, i, ia, ib, ic, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1799,7 +1791,7 @@
 	    y[i] = f(ai, bi, ci, work);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
     FINISH_Math3;
     vmaxset(vmax);
@@ -1896,13 +1888,6 @@
 	if      (ISNA (a)|| ISNA (b)|| ISNA (c)|| ISNA (d)) y = NA_REAL;\
 	else if (ISNAN(a)|| ISNAN(b)|| ISNAN(c)|| ISNAN(d)) y = R_NaN;
 
-#define mod_iterate4(n1,n2,n3,n4,i1,i2,i3,i4) for (i=i1=i2=i3=i4=0; i<n; \
-	i1 = (++i1==n1) ? 0 : i1,					\
-	i2 = (++i2==n2) ? 0 : i2,					\
-	i3 = (++i3==n3) ? 0 : i3,					\
-	i4 = (++i4==n4) ? 0 : i4,					\
-	++i)
-
 static SEXP math4(SEXP sa, SEXP sb, SEXP sc, SEXP sd,
 		  double (*f)(double, double, double, double), SEXP lcall)
 {
@@ -1939,7 +1924,7 @@
 
     SETUP_Math4;
 
-    mod_iterate4 (na, nb, nc, nd, ia, ib, ic, id) {
+    MOD_ITERATE4 (n, na, nb, nc, nd, i, ia, ib, ic, id, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1950,15 +1935,15 @@
 	    y[i] = f(ai, bi, ci, di);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
-#define FINISH_Math4				\
-    if(naflag) warning(R_MSG_NA);		\
-						\
-    if (n == na) DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
-    else if (n == nc) DUPLICATE_ATTRIB(sy, sc);	\
-    else if (n == nd) DUPLICATE_ATTRIB(sy, sd);	\
+#define FINISH_Math4					\
+    if(naflag) warning(R_MSG_NA);			\
+							\
+    if (n == na) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
+    else if (n == nc) SHALLOW_DUPLICATE_ATTRIB(sy, sc);	\
+    else if (n == nd) SHALLOW_DUPLICATE_ATTRIB(sy, sd);	\
     UNPROTECT(5)
 
     FINISH_Math4;
@@ -1977,7 +1962,7 @@
     SETUP_Math4;
     i_1 = asInteger(sI);
 
-    mod_iterate4 (na, nb, nc, nd, ia, ib, ic, id) {
+    MOD_ITERATE4 (n, na, nb, nc, nd, i, ia, ib, ic, id, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -1988,7 +1973,7 @@
 	    y[i] = f(ai, bi, ci, di, i_1);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
     FINISH_Math4;
     return sy;
 } /* math4_1() */
@@ -2006,7 +1991,7 @@
     i_1 = asInteger(sI);
     i_2 = asInteger(sJ);
 
-    mod_iterate4 (na, nb, nc, nd, ia, ib, ic, id) {
+    MOD_ITERATE4 (n, na, nb, nc, nd, i, ia, ib, ic, id, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -2017,7 +2002,7 @@
 	    y[i] = f(ai, bi, ci, di, i_1, i_2);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
     FINISH_Math4;
     return sy;
 } /* math4_2() */
@@ -2077,15 +2062,6 @@
 	else if(ISNAN(a)|| ISNAN(b)|| ISNAN(c)|| ISNAN(d)|| ISNAN(e))	\
 		y = R_NaN;
 
-#define mod_iterate5(n1,n2,n3,n4,n5, i1,i2,i3,i4,i5)	\
- for (i=i1=i2=i3=i4=i5=0; i<n;				\
-	i1 = (++i1==n1) ? 0 : i1,			\
-	i2 = (++i2==n2) ? 0 : i2,			\
-	i3 = (++i3==n3) ? 0 : i3,			\
-	i4 = (++i4==n4) ? 0 : i4,			\
-	i5 = (++i5==n5) ? 0 : i5,			\
-	++i)
-
 static SEXP math5(SEXP sa, SEXP sb, SEXP sc, SEXP sd, SEXP se, double (*f)())
 {
     SEXP sy;
@@ -2125,8 +2101,8 @@
 
     SETUP_Math5;
 
-    mod_iterate5 (na, nb, nc, nd, ne,
-		  ia, ib, ic, id, ie) {
+    MOD_ITERATE5 (n, na, nb, nc, nd, ne,
+		  i, ia, ib, ic, id, ie, {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	ai = a[ia];
 	bi = b[ib];
@@ -2138,16 +2114,16 @@
 	    y[i] = f(ai, bi, ci, di, ei);
 	    if (ISNAN(y[i])) naflag = 1;
 	}
-    }
+    });
 
-#define FINISH_Math5				\
-    if(naflag) warning(R_MSG_NA);		\
-						\
-    if (n == na) DUPLICATE_ATTRIB(sy, sa);	\
-    else if (n == nb) DUPLICATE_ATTRIB(sy, sb);	\
-    else if (n == nc) DUPLICATE_ATTRIB(sy, sc);	\
-    else if (n == nd) DUPLICATE_ATTRIB(sy, sd);	\
-    else if (n == ne) DUPLICATE_ATTRIB(sy, se);	\
+#define FINISH_Math5					\
+    if(naflag) warning(R_MSG_NA);			\
+							\
+    if (n == na) SHALLOW_DUPLICATE_ATTRIB(sy, sa);	\
+    else if (n == nb) SHALLOW_DUPLICATE_ATTRIB(sy, sb);	\
+    else if (n == nc) SHALLOW_DUPLICATE_ATTRIB(sy, sc);	\
+    else if (n == nd) SHALLOW_DUPLICATE_ATTRIB(sy, sd);	\
+    else if (n == ne) SHALLOW_DUPLICATE_ATTRIB(sy, se);	\
     UNPROTECT(6)
 
     FINISH_Math5;
diff -Nru r-base-3.2.3/src/main/arithmetic.h r-base-3.3.1/src/main/arithmetic.h
--- r-base-3.2.3/src/main/arithmetic.h	2015-08-25 22:18:39.000000000 +0000
+++ r-base-3.3.1/src/main/arithmetic.h	2016-03-16 23:04:14.000000000 +0000
@@ -39,7 +39,7 @@
 
 /* some systems get this wrong, possibly depend on what libs are loaded */
 static R_INLINE double R_log(double x) {
-    return x > 0 ? log(x) : x < 0 ? R_NaN : R_NegInf;
+    return x > 0 ? log(x) : x == 0 ? R_NegInf : R_NaN;
 }
 
 /* Note that the behaviour of log(0) required is not necessarily that
@@ -50,10 +50,10 @@
 static R_INLINE double logbase(double x, double base)
 {
 #ifdef HAVE_LOG10
-    if(base == 10) return x > 0 ? log10(x) : x < 0 ? R_NaN : R_NegInf;
+    if(base == 10) return x > 0 ? log10(x) : x == 0 ? R_NegInf : R_NaN;
 #endif
 #ifdef HAVE_LOG2
-    if(base == 2) return x > 0 ? log2(x) : x < 0 ? R_NaN : R_NegInf;
+    if(base == 2) return x > 0 ? log2(x) : x == 0 ? R_NegInf : R_NaN;
 #endif
     return R_log(x) / R_log(base);
 }
@@ -95,8 +95,8 @@
     return allocVector(type, n);
 }
 
-#ifdef HAVE_TANPI
-// we document that tanpi(0.5) is NaN, but the draft C11 extension
-// does not require this and the Solaris version gives Inf.
+#if defined(HAVE_TANPI) || defined(HAVE___TANPI)
+// we document that tanpi(0.5) is NaN, but TS 18661-4:2015
+// does not require this and the Solaris and OS X versions give Inf.
 double Rtanpi(double);
 #endif
diff -Nru r-base-3.2.3/src/main/array.c r-base-3.3.1/src/main/array.c
--- r-base-3.2.3/src/main/array.c	2015-11-17 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/main/array.c	2016-04-25 22:02:04.000000000 +0000
@@ -28,6 +28,9 @@
 #include <Rmath.h>
 #include <R_ext/RS.h>     /* for Calloc/Free */
 #include <R_ext/Applic.h> /* for dgemm */
+#include <R_ext/Itermacros.h>
+
+#include "duplicate.h"
 
 /* "GetRowNames" and "GetColNames" are utility routines which
  * locate and return the row names and column names from the
@@ -189,7 +192,7 @@
 	    ;
 	}
     }
-    if(!isNull(dimnames)&& length(dimnames) > 0)
+    if(!isNull(dimnames) && length(dimnames) > 0)
 	ans = dimnamesgets(ans, dimnames);
     UNPROTECT(1);
     return ans;
@@ -295,11 +298,12 @@
 	return x;
     }
     ndims = LENGTH(dims);
+    int *dim = INTEGER(dims); // used several times
 
     /* (2) Check whether there are redundant extents */
     n = 0;
     for (i = 0; i < ndims; i++)
-	if (INTEGER(dims)[i] != 1) n++;
+	if (dim[i] != 1) n++;
     if (n == ndims) {
 	UNPROTECT(1); /* x */
 	return x;
@@ -314,7 +318,7 @@
 	if (dimnames != R_NilValue) {
 	    if(XLENGTH(x) != 1) {
 		for (i = 0; i < LENGTH(dims); i++) {
-		    if (INTEGER(dims)[i] != 1) {
+		    if (dim[i] != 1) {
 			newnames = VECTOR_ELT(dimnames, i);
 			break;
 		    }
@@ -345,24 +349,33 @@
 /*	} */
 	UNPROTECT(1); /* newnames */
     } else {
-	/* We have a lower dimensional array. */
+	// We have a lower dimensional array, and  n == length(newdims)
 	SEXP newdims, dnn, newnamesnames = R_NilValue;
 	PROTECT(dnn = getAttrib(dimnames, R_NamesSymbol));
 	PROTECT(newdims = allocVector(INTSXP, n));
 	for (i = 0, n = 0; i < ndims; i++)
-	    if (INTEGER(dims)[i] != 1)
-		INTEGER(newdims)[n++] = INTEGER(dims)[i];
+	    if (dim[i] != 1)
+		INTEGER(newdims)[n++] = dim[i];
+	if(!isNull(getAttrib(dims, R_NamesSymbol))) {
+	    SEXP nms_d = getAttrib(dims, R_NamesSymbol),
+		new_nms = PROTECT(allocVector(STRSXP, n));
+	    for (i = 0, n = 0; i < ndims; i++)
+		if (dim[i] != 1)
+		    SET_STRING_ELT(new_nms, n++, STRING_ELT(nms_d, i));
+	    setAttrib(newdims, R_NamesSymbol, new_nms);
+	    UNPROTECT(1);
+	}
+	Rboolean havenames = FALSE;
 	if (!isNull(dimnames)) {
-	    int havenames = 0;
 	    for (i = 0; i < ndims; i++)
-		if (INTEGER(dims)[i] != 1 &&
+		if (dim[i] != 1 &&
 		    VECTOR_ELT(dimnames, i) != R_NilValue)
-		    havenames = 1;
+		    havenames = TRUE;
 	    if (havenames) {
 		PROTECT(newnames = allocVector(VECSXP, n));
 		PROTECT(newnamesnames = allocVector(STRSXP, n));
 		for (i = 0, n = 0; i < ndims; i++) {
-		    if (INTEGER(dims)[i] != 1) {
+		    if (dim[i] != 1) {
 			if(!isNull(dnn))
 			    SET_STRING_ELT(newnamesnames, n,
 					   STRING_ELT(dnn, i));
@@ -374,7 +387,7 @@
 	}
 	setAttrib(x, R_DimNamesSymbol, R_NilValue);
 	setAttrib(x, R_DimSymbol, newdims);
-	if (dimnames != R_NilValue)
+	if (havenames)
 	{
 	    if(!isNull(dnn))
 		setAttrib(newnames, R_NamesSymbol, newnamesnames);
@@ -435,23 +448,35 @@
     return ScalarInteger(length(x));
 }
 
-// auxiliary for do_lengths_*(), i.e., R's lengths()
-static R_xlen_t getElementLength(SEXP x, R_xlen_t i, SEXP call, SEXP rho) {
+R_len_t attribute_hidden dispatch_length(SEXP x, SEXP call, SEXP rho) {
+    R_xlen_t len = dispatch_xlength(x, call, rho);
+#ifdef LONG_VECTOR_SUPPORT
+    if (len > INT_MAX) return R_BadLongVector(x, __FILE__, __LINE__);
+#endif
+    return (R_len_t) len;
+}
+
+R_xlen_t attribute_hidden dispatch_xlength(SEXP x, SEXP call, SEXP rho) {
     static SEXP length_op = NULL;
-    SEXP x_elt = VECTOR_ELT(x, i);
-    if (isObject(x_elt)) {
-        SEXP args, len;
-        PROTECT(args = list1(x_elt));
+    if (isObject(x)) {
+        SEXP len, args;
         if (length_op == NULL)
             length_op = R_Primitive("length");
+        PROTECT(args = list1(x));
         if (DispatchOrEval(call, length_op, "length", args, rho, &len, 0, 1)) {
-	    UNPROTECT(1);
-	    return (R_xlen_t)
-		(TYPEOF(len) == REALSXP ? REAL(len)[0] : asInteger(len));
-	}
+            UNPROTECT(1);
+            return (R_xlen_t)
+                (TYPEOF(len) == REALSXP ? REAL(len)[0] : asInteger(len));
+        }
         UNPROTECT(1);
     }
-    return(xlength(x_elt));
+    return(xlength(x));
+}
+
+// auxiliary for do_lengths_*(), i.e., R's lengths()
+static R_xlen_t getElementLength(SEXP x, R_xlen_t i, SEXP call, SEXP rho) {
+    SEXP x_elt = dispatch_subset2(x, i, call, rho);
+    return(dispatch_xlength(x_elt, call, rho));
 }
 
 #ifdef LONG_VECTOR_SUPPORT
@@ -461,7 +486,7 @@
     R_xlen_t x_len, i;
     double *ans_elt;
 
-    x_len = xlength(x);
+    x_len = dispatch_xlength(x, call, rho);
     PROTECT(ans = allocVector(REALSXP, x_len));
     for (i = 0, ans_elt = REAL(ans); i < x_len; i++, ans_elt++)
         *ans_elt = getElementLength(x, i, call, rho);
@@ -472,13 +497,18 @@
 
 SEXP attribute_hidden do_lengths(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
     SEXP x = CAR(args), ans;
     R_xlen_t x_len, i;
     int *ans_elt;
     int useNames = asLogical(CADR(args));
     if (useNames == NA_LOGICAL)
-	error(_("invalid '%s' value"), "USE.NAMES");
-    Rboolean isList = isVectorList(x);
+	error(_("invalid '%s' value"), "use.names");
+
+    if (DispatchOrEval(call, op, "lengths", args, rho, &ans, 0, 1))
+      return(ans);
+
+    Rboolean isList = isVectorList(x) || isS4(x);
     if(!isList) switch(TYPEOF(x)) {
 	case NILSXP:
 	case CHARSXP:
@@ -492,7 +522,7 @@
 	default:
 	    error(_("'%s' must be a list or atomic vector"), "x");
     }
-    x_len = xlength(x);
+    x_len = dispatch_xlength(x, call, rho);
     PROTECT(ans = allocVector(INTSXP, x_len));
     if(isList) {
 	for (i = 0, ans_elt = INTEGER(ans); i < x_len; i++, ans_elt++) {
@@ -739,6 +769,7 @@
 	if (value) return value;
     }
 
+    checkArity(op, args);
     sym = isNull(y);
     if (sym && (PRIMVAL(op) > 0)) y = x;
     if ( !(isNumeric(x) || isComplex(x)) || !(isNumeric(y) || isComplex(y)) )
@@ -1093,44 +1124,44 @@
     case LGLSXP:
     case INTSXP:
 	// filling in columnwise, "accessing row-wise":
-        for (i = 0, j = 0; i < len; i++, j += nrow) {
-            if (j > l_1) j -= l_1;
-            INTEGER(r)[i] = INTEGER(a)[j];
-        }
-        break;
+	for (i = 0, j = 0; i < len; i++, j += nrow) {
+	    if (j > l_1) j -= l_1;
+	    INTEGER(r)[i] = INTEGER(a)[j];
+	}
+	break;
     case REALSXP:
-        for (i = 0, j = 0; i < len; i++, j += nrow) {
-            if (j > l_1) j -= l_1;
-            REAL(r)[i] = REAL(a)[j];
-        }
-        break;
+	for (i = 0, j = 0; i < len; i++, j += nrow) {
+	    if (j > l_1) j -= l_1;
+	    REAL(r)[i] = REAL(a)[j];
+	}
+	break;
     case CPLXSXP:
-        for (i = 0, j = 0; i < len; i++, j += nrow) {
-            if (j > l_1) j -= l_1;
-            COMPLEX(r)[i] = COMPLEX(a)[j];
-        }
-        break;
+	for (i = 0, j = 0; i < len; i++, j += nrow) {
+	    if (j > l_1) j -= l_1;
+	    COMPLEX(r)[i] = COMPLEX(a)[j];
+	}
+	break;
     case STRSXP:
-        for (i = 0, j = 0; i < len; i++, j += nrow) {
-            if (j > l_1) j -= l_1;
-            SET_STRING_ELT(r, i, STRING_ELT(a,j));
-        }
-        break;
+	for (i = 0, j = 0; i < len; i++, j += nrow) {
+	    if (j > l_1) j -= l_1;
+	    SET_STRING_ELT(r, i, STRING_ELT(a,j));
+	}
+	break;
     case VECSXP:
-        for (i = 0, j = 0; i < len; i++, j += nrow) {
-            if (j > l_1) j -= l_1;
-            SET_VECTOR_ELT(r, i, VECTOR_ELT(a,j));
-        }
-        break;
+	for (i = 0, j = 0; i < len; i++, j += nrow) {
+	    if (j > l_1) j -= l_1;
+	    SET_VECTOR_ELT(r, i, VECTOR_ELT(a,j));
+	}
+	break;
     case RAWSXP:
-        for (i = 0, j = 0; i < len; i++, j += nrow) {
-            if (j > l_1) j -= l_1;
-            RAW(r)[i] = RAW(a)[j];
-        }
-        break;
+	for (i = 0, j = 0; i < len; i++, j += nrow) {
+	    if (j > l_1) j -= l_1;
+	    RAW(r)[i] = RAW(a)[j];
+	}
+	break;
     default:
-        UNPROTECT(2); /* r, dimnamesnames */
-        goto not_matrix;
+	UNPROTECT(2); /* r, dimnamesnames */
+	goto not_matrix;
     }
     PROTECT(dims = allocVector(INTSXP, 2));
     INTEGER(dims)[0] = ncol;
@@ -1390,8 +1421,8 @@
     default:
 	error(_("'x' must be numeric"));
     }
-    if (n * (double)p > XLENGTH(x)) // can only happen for "dotted" versions: .colSums() ...
-	error(_("'X' is too short")); /* PR#16367 */
+    if (n * (double)p > XLENGTH(x))
+	error(_("'x' is too short")); /* PR#16367 */
 
     int OP = PRIMVAL(op);
     if (OP == 0 || OP == 1) { /* columns */
@@ -1525,14 +1556,14 @@
     dim <- as.integer(dim)
     vl <- prod(dim)
     if (length(data) != vl) {
-        if (vl > .Machine$integer.max)
-            stop("'dim' specifies too large an array")
-        data <- rep(data, length.out = vl)
+	if (vl > .Machine$integer.max)
+	    stop("'dim' specifies too large an array")
+	data <- rep(data, length.out = vl)
     }
     if (length(dim))
-        dim(data) <- dim
+	dim(data) <- dim
     if (is.list(dimnames) && length(dimnames))
-        dimnames(data) <- dimnames
+	dimnames(data) <- dimnames
     data
 }
 */
@@ -1577,28 +1608,28 @@
     switch(TYPEOF(vals)) {
     case LGLSXP:
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++)
-		LOGICAL(ans)[i] = LOGICAL(vals)[i % lendat];
+	    xcopyLogicalWithRecycle(LOGICAL(ans), LOGICAL(vals), 0, nans,
+				    lendat);
 	else
 	    for (i = 0; i < nans; i++) LOGICAL(ans)[i] = NA_LOGICAL;
 	break;
     case INTSXP:
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++)
-		INTEGER(ans)[i] = INTEGER(vals)[i % lendat];
+	    xcopyIntegerWithRecycle(INTEGER(ans), INTEGER(vals), 0, nans,
+				    lendat);
 	else
 	    for (i = 0; i < nans; i++) INTEGER(ans)[i] = NA_INTEGER;
 	break;
     case REALSXP:
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++) REAL(ans)[i] = REAL(vals)[i % lendat];
+	    xcopyRealWithRecycle(REAL(ans), REAL(vals), 0, nans, lendat);
 	else
 	    for (i = 0; i < nans; i++) REAL(ans)[i] = NA_REAL;
 	break;
     case CPLXSXP:
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++)
-		COMPLEX(ans)[i] = COMPLEX(vals)[i % lendat];
+	    xcopyComplexWithRecycle(COMPLEX(ans), COMPLEX(vals), 0, nans,
+				    lendat);
 	else {
 	    Rcomplex na_cmplx;
 	    na_cmplx.r = NA_REAL;
@@ -1608,22 +1639,20 @@
 	break;
     case RAWSXP:
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++) RAW(ans)[i] = RAW(vals)[i % lendat];
+	    xcopyRawWithRecycle(RAW(ans), RAW(vals), 0, nans, lendat);
 	else
 	    for (i = 0; i < nans; i++) RAW(ans)[i] = 0;
 	break;
     /* Rest are already initialized */
     case STRSXP:
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++)
-		SET_STRING_ELT(ans, i, STRING_ELT(vals, i % lendat));
+	    xcopyStringWithRecycle(ans, vals, 0, nans, lendat);
 	break;
     case VECSXP:
     case EXPRSXP:
 #ifdef SWITCH_TO_REFCNT
 	if (nans && lendat)
-	    for (i = 0; i < nans; i++)
-		SET_VECTOR_ELT(ans, i, VECTOR_ELT(vals, i % lendat));
+	    xcopyVectorWithRecycle(ans, vals, 0, nans, lendat);
 #else
 	if (nans && lendat) {
 	    /* Need to guard against possible sharing of values under
@@ -1645,11 +1674,8 @@
     }
 
     ans = dimgets(ans, dims);
-    if (TYPEOF(dimnames) == VECSXP && LENGTH(dimnames)) {
-	PROTECT(ans);
+    if(!isNull(dimnames) && length(dimnames) > 0)
 	ans = dimnamesgets(ans, dimnames);
-	UNPROTECT(1);
-    }
 
     UNPROTECT(2);
     return ans;
@@ -1675,7 +1701,7 @@
     if (nc < 0)
 	error(_("invalid 'ncol' value (< 0)"));
     int mn = (nr < nc) ? nr : nc;
-    if (mn > 0 && LENGTH(x) == 0)
+    if (mn > 0 && length(x) == 0)
 	error(_("'x' must have positive length"));
 
 #ifndef LONG_VECTOR_SUPPORT
@@ -1690,7 +1716,10 @@
        Rcomplex *rx = COMPLEX(x), *ra = COMPLEX(ans), zero;
        zero.r = zero.i = 0.0;
        for (R_xlen_t i = 0; i < NR*nc; i++) ra[i] = zero;
-       for (int j = 0; j < mn; j++) ra[j * (NR+1)] = rx[j % nx];
+       R_xlen_t i, i1;
+       MOD_ITERATE1(mn, nx, i, i1, {
+	   ra[i * (NR+1)] = rx[i1];
+       });
   } else {
        if(TYPEOF(x) != REALSXP) {
 	   PROTECT(x = coerceVector(x, REALSXP));
@@ -1701,7 +1730,10 @@
        R_xlen_t NR = nr;
        double *rx = REAL(x), *ra = REAL(ans);
        for (R_xlen_t i = 0; i < NR*nc; i++) ra[i] = 0.0;
-       for (int j = 0; j < mn; j++) ra[j * (NR+1)] = rx[j % nx];
+       R_xlen_t i, i1;
+       MOD_ITERATE1(mn, nx, i, i1, {
+	   ra[i * (NR+1)] = rx[i1];
+       });
    }
    UNPROTECT(nprotect);
    return ans;
diff -Nru r-base-3.2.3/src/main/attrib.c r-base-3.3.1/src/main/attrib.c
--- r-base-3.2.3/src/main/attrib.c	2015-10-08 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/main/attrib.c	2016-03-16 23:04:15.000000000 +0000
@@ -39,7 +39,7 @@
     if (vec == R_NilValue)
 	error(_("attempt to set an attribute on NULL"));
 
-    if(isReal(val) && length(val) == 2 && ISNAN(REAL(val)[0]) ) {
+    if(isReal(val) && LENGTH(val) == 2 && ISNAN(REAL(val)[0]) ) {
 	/* This should not happen, but if a careless user dput()s a
 	   data frame and sources the result, it will */
 	PROTECT(vec);
@@ -106,7 +106,7 @@
     if (name == R_NamesSymbol) {
 	if(isVector(vec) || isList(vec) || isLanguage(vec)) {
 	    s = getAttrib(vec, R_DimSymbol);
-	    if(TYPEOF(s) == INTSXP && length(s) == 1) {
+	    if(TYPEOF(s) == INTSXP && LENGTH(s) == 1) {
 		s = getAttrib(vec, R_DimNamesSymbol);
 		if(!isNull(s)) {
 		    SET_NAMED(VECTOR_ELT(s, 0), 2);
@@ -403,13 +403,13 @@
 	error(_("attempt to set an attribute on NULL"));
 
     if(IS_S4_OBJECT(vec)) { /* leave validity checking to validObject */
-        if (!isNumeric(val)) /* but should have been checked */
+	if (!isNumeric(val)) /* but should have been checked */
 	    error(_("'tsp' attribute must be numeric"));
 	installAttrib(vec, R_TspSymbol, val);
 	return vec;
     }
 
-    if (!isNumeric(val) || length(val) != 3)
+    if (!isNumeric(val) || LENGTH(val) != 3)
 	error(_("'tsp' attribute must be numeric of length three"));
 
     if (isReal(val)) {
@@ -485,7 +485,7 @@
 	if (ncl <= 0) {
 	    SET_ATTRIB(vec, stripAttrib(R_ClassSymbol, ATTRIB(vec)));
 	    SET_OBJECT(vec, 0);
-            // problems when package building:  UNSET_S4_OBJECT(vec);
+	    // problems when package building:  UNSET_S4_OBJECT(vec);
 	}
 	else {
 	    /* When data frames were a special data type */
@@ -665,11 +665,11 @@
     return klass;
 }
 
-static SEXP S4_extends(SEXP klass)
-{
+static SEXP S4_extends(SEXP klass, Rboolean use_tab) {
     static SEXP s_extends = 0, s_extendsForS3;
     SEXP e, val; const char *class;
-    const void *vmax = vmaxget();
+    const void *vmax;
+    if(use_tab) vmax = vmaxget();
     if(!s_extends) {
 	s_extends = install("extends");
 	s_extendsForS3 = install(".extendsForS3");
@@ -678,12 +678,15 @@
     }
     /* sanity check for methods package available */
     if(findVar(s_extends, R_GlobalEnv) == R_UnboundValue)
-        return klass;
+	return klass;
     class = translateChar(STRING_ELT(klass, 0)); /* TODO: include package attr. */
-    val = findVarInFrame(R_S4_extends_table, install(class));
-    vmaxset(vmax);
-    if(val != R_UnboundValue)
-       return val;
+    if(use_tab) {
+	val = findVarInFrame(R_S4_extends_table, install(class));
+	vmaxset(vmax);
+	if(val != R_UnboundValue)
+	    return val;
+    }
+    // else:  val <- .extendsForS3(klass) -- and cache it
     PROTECT(e = allocVector(LANGSXP, 2));
     SETCAR(e, s_extendsForS3);
     val = CDR(e);
@@ -694,6 +697,12 @@
     return(val);
 }
 
+SEXP R_S4_extends(SEXP klass, SEXP useTable)
+{
+    return S4_extends(klass, asLogical(useTable));
+}
+
+
 /* pre-allocated default class attributes */
 static struct {
     SEXP vector;
@@ -727,34 +736,34 @@
 void InitS3DefaultTypes()
 {
     for(int type = 0; type < MAX_NUM_SEXPTYPE; type++) {
-        SEXP part2 = R_NilValue;
-        SEXP part3 = R_NilValue;
-        int nprotected = 0;
-
-        switch(type) {
-            case CLOSXP:
-            case SPECIALSXP:
-            case BUILTINSXP:
-	        part2 = PROTECT(mkChar("function"));
-	        nprotected++;
-	        break;
-            case INTSXP:
+	SEXP part2 = R_NilValue;
+	SEXP part3 = R_NilValue;
+	int nprotected = 0;
+
+	switch(type) {
+	    case CLOSXP:
+	    case SPECIALSXP:
+	    case BUILTINSXP:
+		part2 = PROTECT(mkChar("function"));
+		nprotected++;
+		break;
+	    case INTSXP:
 	    case REALSXP:
-	        part2 = PROTECT(type2str_nowarn(type));
-	        part3 = PROTECT(mkChar("numeric"));
-	        nprotected += 2;
-	        break;
+		part2 = PROTECT(type2str_nowarn(type));
+		part3 = PROTECT(mkChar("numeric"));
+		nprotected += 2;
+		break;
 	    case LANGSXP:
-	        /* part2 remains R_NilValue: default type cannot be
+		/* part2 remains R_NilValue: default type cannot be
 		   pre-allocated, as it depends on the object value */
-	        break;
-            case SYMSXP:
-                part2 = PROTECT(mkChar("name"));
-                nprotected++;
-                break;
+		break;
+	    case SYMSXP:
+		part2 = PROTECT(mkChar("name"));
+		nprotected++;
+		break;
 	    default:
-	        part2 = PROTECT(type2str_nowarn(type));
-	        nprotected++;
+		part2 = PROTECT(type2str_nowarn(type));
+		nprotected++;
 	}
 
 	Type2DefaultClass[type].vector =
@@ -779,60 +788,59 @@
 SEXP attribute_hidden R_data_class2 (SEXP obj)
 {
     SEXP klass = getAttrib(obj, R_ClassSymbol);
-      if(length(klass) > 0) {
+    if(length(klass) > 0) {
 	if(IS_S4_OBJECT(obj))
-	    return S4_extends(klass);
+	    return S4_extends(klass, TRUE);
 	else
 	    return klass;
-      }
-      else { /* length(klass) == 0 */
+    }
+    else { /* length(klass) == 0 */
 
-        SEXP dim = getAttrib(obj, R_DimSymbol);
-        int n = length(dim);
-        SEXPTYPE t = TYPEOF(obj);
-        SEXP defaultClass;
-        switch(n) {
-            case 0: defaultClass = Type2DefaultClass[t].vector; break;
-            case 2: defaultClass = Type2DefaultClass[t].matrix; break;
-            default: defaultClass = Type2DefaultClass[t].array; break;
-        }
-
-        if (defaultClass != R_NilValue) {
-            return defaultClass;
-        }
+	SEXP dim = getAttrib(obj, R_DimSymbol);
+	int n = length(dim);
+	SEXPTYPE t = TYPEOF(obj);
+	SEXP defaultClass;
+	switch(n) {
+	case 0:  defaultClass = Type2DefaultClass[t].vector; break;
+	case 2:  defaultClass = Type2DefaultClass[t].matrix; break;
+	default: defaultClass = Type2DefaultClass[t].array;  break;
+	}
+
+	if (defaultClass != R_NilValue) {
+	    return defaultClass;
+	}
 
-        /* now t == LANGSXP, but check to make sure */
+	/* now t == LANGSXP, but check to make sure */
 	if (t != LANGSXP)
 	    error("type must be LANGSXP at this point");
-        if (n == 0) {
-            return ScalarString(lang2str(obj, t));
-        }
-        SEXP part1;
-        if (n == 2) {
-            part1 = mkChar("matrix");
-        } else {
-            part1 = mkChar("array");
-        }
-        PROTECT(part1);
-        defaultClass = PROTECT(allocVector(STRSXP, 2));
-        SET_STRING_ELT(defaultClass, 0, part1);
-        SET_STRING_ELT(defaultClass, 1, lang2str(obj, t));
-        UNPROTECT(2); /* part1, defaultClass */
-        return defaultClass;
+	if (n == 0) {
+	    return ScalarString(lang2str(obj, t));
+	}
+	SEXP part1;
+	if (n == 2) {
+	    part1 = mkChar("matrix");
+	} else {
+	    part1 = mkChar("array");
+	}
+	PROTECT(part1);
+	defaultClass = PROTECT(allocVector(STRSXP, 2));
+	SET_STRING_ELT(defaultClass, 0, part1);
+	SET_STRING_ELT(defaultClass, 1, lang2str(obj, t));
+	UNPROTECT(2); /* part1, defaultClass */
+	return defaultClass;
     }
 }
 
-// class() & .cache_class() :
+// class(x)  &  .cache_class(classname, extendsForS3(.)) {called from methods} :
 SEXP attribute_hidden R_do_data_class(SEXP call, SEXP op, SEXP args, SEXP env)
 {
   checkArity(op, args);
-  if(PRIMVAL(op) == 1) { // .cache_class() :
-      const char *class; SEXP klass;
+  if(PRIMVAL(op) == 1) { // .cache_class() - typically re-defining existing cache
       check1arg(args, call, "class");
-      klass = CAR(args);
+      SEXP klass = CAR(args);
       if(TYPEOF(klass) != STRSXP || LENGTH(klass) < 1)
 	  error("invalid class argument to internal .class_cache");
-      class = translateChar(STRING_ELT(klass, 0));
+      const char *class = translateChar(STRING_ELT(klass, 0));
       return cache_class(class, CADR(args));
   }
   // class():
@@ -1002,7 +1010,7 @@
        have the context at this point to do so */
 
     if (inherits(val1, "factor"))  /* mimic as.character.factor */
-        return asCharacterFactor(val1);
+	return asCharacterFactor(val1);
 
     if (!isString(val1)) { /* mimic as.character.default */
 	PROTECT(this2 = coerceVector(val1, STRSXP));
@@ -1029,7 +1037,7 @@
     /* there may be old pair-lists out there */
     /* There are, when this gets used as names<- for 1-d arrays */
     if (!isPairList(val) && !isNewList(val))
-	error(_("'dimnames' must be a list"));
+	error(_("'%s' must be a list"), "dimnames");
     dims = getAttrib(vec, R_DimSymbol);
     if ((k = LENGTH(dims)) < length(val))
 	error(_("length of 'dimnames' [%d] must match that of 'dims' [%d]"),
@@ -1369,7 +1377,7 @@
     static SEXP do_attr_formals = NULL;
 
     if (do_attr_formals == NULL)
-        do_attr_formals = allocFormalsList3(install("x"), install("which"),
+	do_attr_formals = allocFormalsList3(install("x"), install("which"),
 					    R_ExactSymbol);
 
     argList = matchArgs(do_attr_formals, args, call);
@@ -1501,9 +1509,7 @@
 */
 SEXP attribute_hidden do_attrgets(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    SEXP obj, name, argList;
-    static SEXP do_attrgets_formals = NULL;
-
+    SEXP obj, name;
     checkArity(op, args);
 
     if(PRIMVAL(op)) { /* @<- */
@@ -1535,32 +1541,35 @@
 	UNPROTECT(2);
 	return value;
     }
+    else { // attr(obj, "name") <- value :
+	SEXP argList;
+	static SEXP do_attrgets_formals = NULL;
+
+	obj = CAR(args);
+	if (MAYBE_SHARED(obj))
+	    PROTECT(obj = shallow_duplicate(obj));
+	else
+	    PROTECT(obj);
 
-
-    obj = CAR(args);
-    if (MAYBE_SHARED(obj))
-	PROTECT(obj = shallow_duplicate(obj));
-    else
-	PROTECT(obj);
-
-    /* argument matching */
-    if (do_attrgets_formals == NULL)
-        do_attrgets_formals = allocFormalsList3(install("x"), install("which"),
-						install("value"));
-    argList = matchArgs(do_attrgets_formals, args, call);
-    PROTECT(argList);
-
-    name = CADR(argList);
-    if (!isValidString(name) || STRING_ELT(name, 0) == NA_STRING)
-	error(_("'name' must be non-null character string"));
-    /* TODO?  if (isFactor(obj) && !strcmp(asChar(name), "levels"))
-     * ---         if(any_duplicated(CADDR(args)))
-     *                  error(.....)
-     */
-    setAttrib(obj, name, CADDR(args));
-    UNPROTECT(2);
-    SET_NAMED(obj, 0);
-    return obj;
+	/* argument matching */
+	if (do_attrgets_formals == NULL)
+	    do_attrgets_formals = allocFormalsList3(install("x"), install("which"),
+						    install("value"));
+	argList = matchArgs(do_attrgets_formals, args, call);
+	PROTECT(argList);
+
+	name = CADR(argList);
+	if (!isValidString(name) || STRING_ELT(name, 0) == NA_STRING)
+	    error(_("'name' must be non-null character string"));
+	/* TODO?  if (isFactor(obj) && !strcmp(asChar(name), "levels"))
+	 * ---         if(any_duplicated(CADDR(args)))
+	 *                  error(.....)
+	 */
+	setAttrib(obj, name, CADDR(args));
+	UNPROTECT(2);
+	SET_NAMED(obj, 0);
+	return obj;
+    }
 }
 
 
@@ -1701,10 +1710,10 @@
 	if(value == R_NilValue) {
 	    SEXP input = name, classString;
 	    if(name == s_dot_S3Class) /* defaults to class(obj) */
-	        return R_data_class(obj, FALSE);
+		return R_data_class(obj, FALSE);
 	    else if(name == R_NamesSymbol &&
 		    TYPEOF(obj) == VECSXP) /* needed for namedList class */
-	        return value;
+		return value;
 	    if(isSymbol(name) ) {
 		input = PROTECT(ScalarString(PRINTNAME(name)));
 		classString = getAttrib(obj, R_ClassSymbol);
@@ -1778,6 +1787,7 @@
 {
     SEXP  nlist, object, ans, klass;
 
+    checkArity(op, args);
     if(!isMethodsDispatchOn())
 	error(_("formal classes cannot be used without the 'methods' package"));
     nlist = CADR(args);
diff -Nru r-base-3.2.3/src/main/bind.c r-base-3.3.1/src/main/bind.c
--- r-base-3.2.3/src/main/bind.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/bind.c	2016-03-16 23:04:17.000000000 +0000
@@ -28,11 +28,14 @@
 #include <Defn.h>
 #include <Internal.h>
 #include <R_ext/PrtUtil.h> // for IndexWidth
+#include <R_ext/Itermacros.h>
 #define imax2(x, y) ((x < y) ? y : x)
 
 #include "RBufferUtils.h"
 static R_StringBuffer cbuff = {NULL, 0, MAXELTSIZE};
 
+#include "duplicate.h"
+
 #define LIST_ASSIGN(x) {SET_VECTOR_ELT(data->ans_ptr, data->ans_length, x); data->ans_length++;}
 
 static SEXP cbind(SEXP, SEXP, SEXPTYPE, SEXP, int);
@@ -108,7 +111,7 @@
     case VECSXP:
     case EXPRSXP:
 	if (recurse) {
-	    R_xlen_t i, n = xlength(x);
+	    R_xlen_t i, n = XLENGTH(x);
 	    if (usenames && !data->ans_nnames &&
 		!isNull(getAttrib(x, R_NamesSymbol)))
 		data->ans_nnames = 1;
@@ -123,7 +126,7 @@
 		data->ans_flags |= 512;
 	    else
 		data->ans_flags |= 256;
-	    data->ans_length += xlength(x);
+	    data->ans_length += XLENGTH(x);
 	}
 	break;
     case LISTSXP:
@@ -1032,7 +1035,7 @@
     method = R_NilValue;
     for (a = CDR(args); a != R_NilValue; a = CDR(a)) {
 	PROTECT(obj = eval(CAR(a), env));
-        if (tryS4 && !anyS4 && isS4(obj)) anyS4 = TRUE;
+	if (tryS4 && !anyS4 && isS4(obj)) anyS4 = TRUE;
 	if (compatible && isObject(obj)) {
 	    SEXP classlist = PROTECT(R_data_class2(obj));
 	    for (int i = 0; i < length(classlist); i++) {
@@ -1041,7 +1044,7 @@
 		    error(_("class name too long in '%s'"), generic);
 		sprintf(buf, "%s.%s", generic, s);
 		SEXP classmethod = R_LookupMethod(install(buf), env, env,
-                                                  R_BaseNamespace);
+						  R_BaseNamespace);
 		if (classmethod != R_UnboundValue) {
 		    if (klass[0] == '\0') {
 			/* There is no previous class */
@@ -1062,7 +1065,7 @@
 		    break; /* go to next parameter */
 		}
 	    }
-            UNPROTECT(1);
+	    UNPROTECT(1);
 	}
 	UNPROTECT(1);
     }
@@ -1072,7 +1075,7 @@
 	// keep 'deparse.level' as first arg and *name* it:
 	SET_TAG(args, install("deparse.level"));
 	// and use methods:::cbind / rbind
-        method = findFun(install(generic), R_MethodsNamespace);
+	method = findFun(install(generic), R_MethodsNamespace);
     } else
 	args = CDR(args); // keeping deparse.level for S4 dispatch
     if (method != R_NilValue) { // found an S3 or S4 method
@@ -1245,8 +1248,8 @@
 		u = coerceVector(u, STRSXP);
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = (!isMatrix(u)) ? rows : k;
-		for (R_xlen_t i = 0; i < idx; i++)
-		    SET_STRING_ELT(result, n++, STRING_ELT(u, i % k));
+		xcopyStringWithRecycle(result, u, n, idx, k);
+		n += idx;
 	    }
 	}
     }
@@ -1271,9 +1274,11 @@
 		    R_xlen_t k = XLENGTH(u);
 		    if (k > 0) {
 			R_xlen_t idx = (!umatrix) ? rows : k;
-			for (R_xlen_t i = 0; i < idx; i++)
+			R_xlen_t i, i1;
+			MOD_ITERATE1(idx, k, i, i1, {
 			    SET_VECTOR_ELT(result, n++,
-					   lazy_duplicate(VECTOR_ELT(u, i % k)));
+				lazy_duplicate(VECTOR_ELT(u, i1)));
+			});
 		    }
 		    UNPROTECT(1);
 		    break;
@@ -1291,8 +1296,8 @@
 		u = coerceVector(u, CPLXSXP);
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = (!isMatrix(u)) ? rows : k;
-		for (R_xlen_t i = 0; i < idx; i++)
-		    COMPLEX(result)[n++] = COMPLEX(u)[i % k];
+		xcopyComplexWithRecycle(COMPLEX(result), COMPLEX(u), n, idx, k);
+		n += idx;
 	    }
 	}
     }
@@ -1303,8 +1308,8 @@
 		u = coerceVector(u, RAWSXP);
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = (!isMatrix(u)) ? rows : k;
-		for (R_xlen_t i = 0; i < idx; i++)
-		    RAW(result)[n++] = RAW(u)[i % k];
+		xcopyRawWithRecycle(RAW(result), RAW(u), n, idx, k);
+		n += idx;
 	    }
 	}
     }
@@ -1316,29 +1321,38 @@
 		R_xlen_t idx = (!isMatrix(u)) ? rows : k;
 		if (TYPEOF(u) <= INTSXP) { /* INT or LGL */
 		    if (mode <= INTSXP) {
-			for (R_xlen_t i = 0; i < idx; i++)
-			    INTEGER(result)[n++] = INTEGER(u)[i % k];
+			xcopyIntegerWithRecycle(INTEGER(result), INTEGER(u),
+						n, idx, k);
+			n += idx;
 		    }
 		    else {
-			for (R_xlen_t i = 0; i < idx; i++)
-			    REAL(result)[n++] = (INTEGER(u)[i % k]) == NA_INTEGER ? NA_REAL : INTEGER(u)[i % k];
+			R_xlen_t i, i1;
+			MOD_ITERATE1(idx, k, i, i1, {
+			    REAL(result)[n++] =
+				(INTEGER(u)[i1]) == NA_INTEGER ? NA_REAL : INTEGER(u)[i1];
+			});
 		    }
 		}
 		else if (TYPEOF(u) == REALSXP) {
-		    for (R_xlen_t i = 0; i < idx; i++)
-			REAL(result)[n++] = REAL(u)[i % k];
+		    xcopyRealWithRecycle(REAL(result), REAL(u), n, idx, k);
+		    n += idx;
 		}
 		else { /* RAWSXP */
 		    /* FIXME: I'm not sure what the author intended when the sequence was
 		       defined as raw < logical -- it is possible to represent logical as
 		       raw losslessly but not vice versa. So due to the way this was
 		       defined the raw -> logical conversion is bound to be lossy .. */
-		    if (mode == LGLSXP)
-			for (R_xlen_t i = 0; i < idx; i++)
-			    LOGICAL(result)[n++] = RAW(u)[i % k] ? TRUE : FALSE;
-		    else
-			for (R_xlen_t i = 0; i < idx; i++)
-			    INTEGER(result)[n++] = (unsigned char) RAW(u)[i % k];
+		    if (mode == LGLSXP) {
+			R_xlen_t i, i1;
+			MOD_ITERATE1(idx, k, i, i1, {
+			    LOGICAL(result)[n++] = RAW(u)[i1] ? TRUE : FALSE;
+			});
+		    } else {
+			R_xlen_t i, i1;
+			MOD_ITERATE1(idx, k, i, i1, {
+			    INTEGER(result)[n++] = (unsigned char) RAW(u)[i1];
+			});
+		    }
 		}
 	    }
 	}
@@ -1388,7 +1402,7 @@
 		    if (deparse_level == 1 && isSymbol(expr))
 			SET_STRING_ELT(nam, j++, PRINTNAME(expr));
 		    else if (deparse_level == 2) {
-		        PROTECT(expr);
+			PROTECT(expr);
 			SET_STRING_ELT(nam, j++,
 				       STRING_ELT(deparse1line(expr, TRUE), 0));
 			UNPROTECT(1); /* expr */
@@ -1404,7 +1418,6 @@
     return result;
 } /* cbind */
 
-
 static SEXP rbind(SEXP call, SEXP args, SEXPTYPE mode, SEXP rho,
 		  int deparse_level)
 {
@@ -1495,10 +1508,7 @@
 		u = coerceVector(u, STRSXP);
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = (isMatrix(u)) ? nrows(u) : (k > 0);
-		for (R_xlen_t i = 0; i < idx; i++)
-		    for (int j = 0; j < cols; j++)
-		      SET_STRING_ELT(result, i + n + (j * rows),
-				     STRING_ELT(u, (i + j * idx) % k));
+		xfillStringMatrixWithRecycle(result, u, n, rows, idx, cols, k);
 		n += idx;
 	    }
 	}
@@ -1511,10 +1521,9 @@
 		PROTECT(u = coerceVector(u, mode));
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = umatrix ? urows : (k > 0);
-		for (R_xlen_t i = 0; i < idx; i++)
-		    for (int j = 0; j < cols; j++)
-		      SET_VECTOR_ELT(result, i + n + (j * rows),
-				     lazy_duplicate(VECTOR_ELT(u, (i + j * idx) % k)));
+		FILL_MATRIX_ITERATE(n, rows, idx, cols, k)
+		    SET_VECTOR_ELT(result, didx,
+			lazy_duplicate(VECTOR_ELT(u, sidx)));
 		n += idx;
 		UNPROTECT(1);
 	    }
@@ -1527,10 +1536,8 @@
 		u = coerceVector(u, RAWSXP);
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = (isMatrix(u)) ? nrows(u) : (k > 0);
-		for (R_xlen_t i = 0; i < idx; i++)
-		    for (int j = 0; j < cols; j++)
-			RAW(result)[i + n + (j * rows)]
-			    = RAW(u)[(i + j * idx) % k];
+		xfillRawMatrixWithRecycle(RAW(result), RAW(u), n, rows, idx,
+					  cols, k);
 		n += idx;
 	    }
 	}
@@ -1542,10 +1549,8 @@
 		u = coerceVector(u, CPLXSXP);
 		R_xlen_t k = XLENGTH(u);
 		R_xlen_t idx = (isMatrix(u)) ? nrows(u) : (k > 0);
-		for (R_xlen_t i = 0; i < idx; i++)
-		    for (int j = 0; j < cols; j++)
-			COMPLEX(result)[i + n + (j * rows)]
-			    = COMPLEX(u)[(i + j * idx) % k];
+		xfillComplexMatrixWithRecycle(COMPLEX(result), COMPLEX(u), n,
+					      rows, idx, cols, k);
 		n += idx;
 	    }
 	}
@@ -1558,39 +1563,31 @@
 		R_xlen_t idx = (isMatrix(u)) ? nrows(u) : (k > 0);
 		if (TYPEOF(u) <= INTSXP) {
 		    if (mode <= INTSXP) {
-			for (R_xlen_t i = 0; i < idx; i++)
-			    for (int j = 0; j < cols; j++)
-				INTEGER(result)[i + n + (j * rows)]
-				    = INTEGER(u)[(i + j * idx) % k];
+			xfillIntegerMatrixWithRecycle(INTEGER(result),
+						      INTEGER(u), n, rows,
+						      idx, cols, k);
 			n += idx;
 		    }
 		    else {
-			for (R_xlen_t i = 0; i < idx; i++)
-			    for (int j = 0; j < cols; j++)
-				REAL(result)[i + n + (j * rows)]
-				    = (INTEGER(u)[(i + j * idx) % k]) == NA_INTEGER ? NA_REAL : INTEGER(u)[(i + j * idx) % k];
+			FILL_MATRIX_ITERATE(n, rows, idx, cols, k)
+			    REAL(result)[didx]
+				= (INTEGER(u)[sidx]) == NA_INTEGER ? NA_REAL : INTEGER(u)[sidx];
 			n += idx;
 		    }
 		}
 		else if (TYPEOF(u) == REALSXP) {
-		    for (R_xlen_t i = 0; i < idx; i++)
-			for (int j = 0; j < cols; j++)
-			    REAL(result)[i + n + (j * rows)]
-				= REAL(u)[(i + j * idx) % k];
+		    xfillRealMatrixWithRecycle(REAL(result), REAL(u), n,
+					       rows, idx, cols, k);
 		    n += idx;
 		}
 		else { /* RAWSXP */
 		    if (mode == LGLSXP) {
-			for (R_xlen_t i = 0; i < idx; i++)
-			    for (int j = 0; j < cols; j++)
-				LOGICAL(result)[i + n + (j * rows)]
-				    = RAW(u)[(i + j * idx) % k] ? TRUE : FALSE;
+			FILL_MATRIX_ITERATE(n, rows, idx, cols, k)
+			    LOGICAL(result)[didx] = RAW(u)[sidx] ? TRUE : FALSE;
 		    }
 		    else
-			for (R_xlen_t i = 0; i < idx; i++)
-			    for (int j = 0; j < cols; j++)
-				INTEGER(result)[i + n + (j * rows)]
-				    = (unsigned char) RAW(u)[(i + j * idx) % k];
+			FILL_MATRIX_ITERATE(n, rows, idx, cols, k)
+			    INTEGER(result)[didx] = (unsigned char) RAW(u)[sidx];
 		}
 	    }
 	}
@@ -1643,7 +1640,7 @@
 		    if (deparse_level == 1 && isSymbol(expr))
 			SET_STRING_ELT(nam, j++, PRINTNAME(expr));
 		    else if (deparse_level == 2) {
-		        PROTECT(expr);
+			PROTECT(expr);
 			SET_STRING_ELT(nam, j++,
 				       STRING_ELT(deparse1line(expr, TRUE), 0));
 			UNPROTECT(1); /* expr */
diff -Nru r-base-3.2.3/src/main/builtin.c r-base-3.3.1/src/main/builtin.c
--- r-base-3.2.3/src/main/builtin.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/builtin.c	2016-03-16 23:04:16.000000000 +0000
@@ -71,7 +71,7 @@
     SEXP name = R_NilValue /* -Wall */, expr, eenv, aenv;
     checkArity(op, args);
 
-    if (!isString(CAR(args)) || length(CAR(args)) == 0)
+    if (!isString(CAR(args)) || LENGTH(CAR(args)) == 0)
 	error(_("invalid first argument"));
     else
 	name = installTrChar(STRING_ELT(CAR(args), 0));
@@ -136,8 +136,9 @@
     int addit = 0;
     static SEXP do_onexit_formals = NULL;
 
+    checkArity(op, args);
     if (do_onexit_formals == NULL)
-        do_onexit_formals = allocFormalsList2(install("expr"), install("add"));
+	do_onexit_formals = allocFormalsList2(install("expr"), install("add"));
 
     PROTECT(argList =  matchArgs(do_onexit_formals, args, call));
     if (CAR(argList) == R_MissingArg) code = R_NilValue;
@@ -189,7 +190,7 @@
     SEXP s;
 
     checkArity(op,args);
-    if (TYPEOF(CAR(args)) == STRSXP && length(CAR(args))==1) {
+    if (TYPEOF(CAR(args)) == STRSXP && LENGTH(CAR(args)) == 1) {
 	PROTECT(s = installTrChar(STRING_ELT(CAR(args), 0)));
 	SETCAR(args, findFun(s, rho));
 	UNPROTECT(1);
@@ -359,19 +360,19 @@
 static Rboolean R_IsImportsEnv(SEXP env)
 {
     if (isNull(env) || !isEnvironment(env))
-        return FALSE;
+	return FALSE;
     if (ENCLOS(env) != R_BaseNamespace)
-        return FALSE;
+	return FALSE;
     SEXP name = getAttrib(env, R_NameSymbol);
-    if (!isString(name) || length(name) != 1)
-        return FALSE;
+    if (!isString(name) || LENGTH(name) != 1)
+	return FALSE;
 
     const char *imports_prefix = "imports:";
     const char *name_string = CHAR(STRING_ELT(name, 0));
     if (!strncmp(name_string, imports_prefix, strlen(imports_prefix)))
-        return TRUE;
+	return TRUE;
     else
-        return FALSE;
+	return FALSE;
 }
 
 SEXP attribute_hidden do_parentenvgets(SEXP call, SEXP op, SEXP args, SEXP rho)
@@ -555,7 +556,7 @@
     args = CDR(args);
 
     fill = CAR(args);
-    if ((!isNumeric(fill) && !isLogical(fill)) || (length(fill) != 1))
+    if ((!isNumeric(fill) && !isLogical(fill)) || (LENGTH(fill) != 1))
 	error(_("invalid '%s' argument"), "fill");
     if (isLogical(fill)) {
 	if (asLogical(fill) == 1)
@@ -938,7 +939,7 @@
 #ifdef LONG_VECTOR_SUPPORT
 	return xlengthgets(x, len);
 #else
-        error(_("vector size specified is too large"));
+	error(_("vector size specified is too large"));
 	return x; /* -Wall */
 #endif
     }
@@ -1022,7 +1023,7 @@
     if (nargs < 1) errorcall(call, _("'EXPR' is missing"));
     check1arg(args, call, "EXPR");
     PROTECT(x = eval(CAR(args), rho));
-    if (!isVector(x) || length(x) != 1)
+    if (!isVector(x) || LENGTH(x) != 1)
 	errorcall(call, _("EXPR must be a length 1 vector"));
     if (isFactor(x))
 	warningcall(call,
@@ -1082,7 +1083,8 @@
 	    /* fall through to error */
 	}
 	UNPROTECT(1); /* w */
-    }
+    } else
+	warningcall(call, _("'switch' with no alternatives"));
     /* an error */
     UNPROTECT(1); /* x */
     R_Visible = FALSE;
diff -Nru r-base-3.2.3/src/main/character.c r-base-3.3.1/src/main/character.c
--- r-base-3.2.3/src/main/character.c	2015-09-13 22:15:07.000000000 +0000
+++ r-base-3.3.1/src/main/character.c	2016-06-01 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Pulic License as published by
@@ -72,10 +72,8 @@
 #include <Defn.h>
 #include <Internal.h>
 #include <errno.h>
-
 #include <R_ext/RS.h>  /* for Calloc/Free */
-#include <Rinternals.h> // R_nchar()
-
+#include <R_ext/Itermacros.h>
 #include <rlocale.h>
 
 /* We use a shared buffer here to avoid reallocing small buffers, and
@@ -133,6 +131,7 @@
     return ans;
 }
 
+/* R strings are limited to 2^31 - 1 bytes on all platforms */
 int R_nchar(SEXP string, nchar_type type_,
 	    Rboolean allowNA, Rboolean keepNA, const char* msg_name)
 {
@@ -251,7 +250,7 @@
 	keepNA = asLogical(CADDDR(args));
 	if (keepNA == NA_LOGICAL) // default
 	    keepNA = (type_ == Width) ? FALSE : TRUE;
-    } else  keepNA = FALSE; // default
+    } else  keepNA = (type_ == Width) ? FALSE : TRUE;
     PROTECT(s = allocVector(INTSXP, len));
     int *s_ = INTEGER(s);
     for (R_xlen_t i = 0; i < len; i++) {
@@ -300,43 +299,37 @@
     *buf = '\0';
 }
 
-SEXP attribute_hidden do_substr(SEXP call, SEXP op, SEXP args, SEXP env)
+SEXP attribute_hidden
+do_substr(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    SEXP s, x, sa, so, el;
-    R_xlen_t i, len;
-    int start, stop, k, l;
-    size_t slen;
-    cetype_t ienc;
-    const char *ss;
-    char *buf;
-
+    SEXP s, x;
     checkArity(op, args);
     x = CAR(args);
-    sa = CADR(args);
-    so = CADDR(args);
-    k = LENGTH(sa);
-    l = LENGTH(so);
-
     if (!isString(x))
 	error(_("extracting substrings from a non-character object"));
-    len = XLENGTH(x);
+    R_xlen_t len = XLENGTH(x);
     PROTECT(s = allocVector(STRSXP, len));
     if (len > 0) {
+	SEXP sa = CADR(args),
+	    so = CADDR(args);
+	int
+	    k = LENGTH(sa),
+	    l = LENGTH(so);
 	if (!isInteger(sa) || !isInteger(so) || k == 0 || l == 0)
 	    error(_("invalid substring arguments"));
 
-	for (i = 0; i < len; i++) {
-	    start = INTEGER(sa)[i % k];
-	    stop = INTEGER(so)[i % l];
-	    el = STRING_ELT(x,i);
+	for (R_xlen_t i = 0; i < len; i++) {
+	    int start = INTEGER(sa)[i % k],
+		stop  = INTEGER(so)[i % l];
+	    SEXP el = STRING_ELT(x,i);
 	    if (el == NA_STRING || start == NA_INTEGER || stop == NA_INTEGER) {
 		SET_STRING_ELT(s, i, NA_STRING);
 		continue;
 	    }
-	    ienc = getCharCE(el);
-	    ss = CHAR(el);
-	    slen = strlen(ss); /* FIXME -- should handle embedded nuls */
-	    buf = R_AllocStringBuffer(slen+1, &cbuff);
+	    cetype_t ienc = getCharCE(el);
+	    const char *ss = CHAR(el);
+	    size_t slen = strlen(ss); /* FIXME -- should handle embedded nuls */
+	    char *buf = R_AllocStringBuffer(slen+1, &cbuff);
 	    if (start < 1) start = 1;
 	    if (start > stop || start > slen) {
 		buf[0] = '\0';
@@ -348,12 +341,118 @@
 	}
 	R_FreeStringBufferL(&cbuff);
     }
-    DUPLICATE_ATTRIB(s, x);
+    SHALLOW_DUPLICATE_ATTRIB(s, x);
     /* This copied the class, if any */
     UNPROTECT(1);
     return s;
 }
 
+// .Internal( startsWith(x, prefix) )  and
+// .Internal( endsWith  (x, suffix) )
+SEXP attribute_hidden
+do_startsWith(SEXP call, SEXP op, SEXP args, SEXP env)
+{
+    checkArity(op, args);
+
+    SEXP x = CAR(args), Xfix = CADR(args); // 'prefix' or 'suffix'
+    if (!isString(x) || !isString(Xfix))
+	error(_("non-character object(s)"));
+    R_xlen_t
+	n1 = XLENGTH(x),
+	n2 = XLENGTH(Xfix),
+	n = (n1 > 0 && n2 > 0) ? ((n1 >= n2) ? n1 : n2) : 0;
+    if (n == 0) return allocVector(LGLSXP, 0);
+    SEXP ans = PROTECT(allocVector(LGLSXP, n));
+
+    typedef const char * cp;
+    if (n2 == 1) { // optimize the most common case
+	SEXP el = STRING_ELT(Xfix, 0);
+	if (el == NA_STRING) {
+	    for (R_xlen_t i = 0; i < n1; i++)
+		LOGICAL(ans)[i] = NA_LOGICAL;
+	} else {
+	    // ASCII matching will do for ASCII Xfix except in non-UTF-8 MBCS
+	    Rboolean need_translate = TRUE;
+	    if (strIsASCII(CHAR(el)) && (utf8locale || !mbcslocale)) 
+		need_translate = FALSE;
+	    cp y0 = need_translate ? translateCharUTF8(el) : CHAR(el);
+	    int ylen = (int) strlen(y0);
+	    for (R_xlen_t i = 0; i < n1; i++) {
+		SEXP el = STRING_ELT(x, i);
+		if (el == NA_STRING) {
+		    LOGICAL(ans)[i] = NA_LOGICAL;
+		} else {
+		    cp x0 = need_translate ? translateCharUTF8(el) : CHAR(el);
+		    if(PRIMVAL(op) == 0) { // startsWith
+			LOGICAL(ans)[i] = strncmp(x0, y0, ylen) == 0;
+		    } else { // endsWith
+			int off = (int)strlen(x0) - ylen;
+			if (off < 0)
+			    LOGICAL(ans)[i] = 0;
+			else {
+			    LOGICAL(ans)[i] = memcmp(x0 + off, y0, ylen) == 0;
+			}
+		    }
+		}
+	    }
+	}
+    } else { // n2 > 1
+	// convert both inputs to UTF-8
+	cp *x0 = (cp *) R_alloc(n1, sizeof(char *));
+	cp *y0 = (cp *) R_alloc(n2, sizeof(char *));
+	// and record lengths, -1 for NA
+	int *x1 = (int *) R_alloc(n1, sizeof(int *));
+	int *y1 = (int *) R_alloc(n2, sizeof(int *));
+	for (R_xlen_t i = 0; i < n1; i++) {
+	    SEXP el = STRING_ELT(x, i);
+	    if (el == NA_STRING)
+		x1[i] = -1;
+	    else {
+		x0[i] = translateCharUTF8(el);
+		x1[i] = (int) strlen(x0[i]);
+	    }
+	}
+	for (R_xlen_t i = 0; i < n2; i++) {
+	    SEXP el = STRING_ELT(Xfix, i);
+	    if (el == NA_STRING)
+		y1[i] = -1;
+	    else {
+		y0[i] = translateCharUTF8(el);
+		y1[i] = (int) strlen(y0[i]);
+	    }
+	}
+	R_xlen_t i, i1, i2;
+	if(PRIMVAL(op) == 0) { // 0 = startsWith, 1 = endsWith
+	    MOD_ITERATE2(n, n1, n2, i, i1, i2, {
+		    if (x1[i1] < 0 || y1[i2] < 0)
+			LOGICAL(ans)[i] = NA_LOGICAL;
+		    else if (x1[i1] < y1[i2])
+			LOGICAL(ans)[i] = 0;
+		    else // memcmp should be faster than strncmp
+			LOGICAL(ans)[i] = 
+			    memcmp(x0[i1], y0[i2], y1[i2]) == 0;
+		});
+	} else { // endsWith
+	    MOD_ITERATE2(n, n1, n2, i, i1, i2, {
+		    if (x1[i1] < 0 || y1[i2] < 0)
+			LOGICAL(ans)[i] = NA_LOGICAL;
+		    else {
+			int off = x1[i1] - y1[i2];
+			if (off < 0)
+			    LOGICAL(ans)[i] = 0;
+			else {
+			    LOGICAL(ans)[i] = 
+				memcmp(x0[i1] + off, y0[i2], y1[i2]) == 0;
+			}
+		    }
+		});
+	}
+    }
+    UNPROTECT(1);
+    return ans;
+}
+
+
 static void
 substrset(char *buf, const char *const str, cetype_t ienc, int sa, int so)
 {
@@ -486,11 +585,11 @@
 */
 
 
-#define FIRSTCHAR(i) (isspace((int)buff1[i-1]))
-#define LASTCHAR(i) (!isspace((int)buff1[i-1]) && (!buff1[i+1] || isspace((int)buff1[i+1])))
-#define LOWVOW(i) (buff1[i] == 'a' || buff1[i] == 'e' || buff1[i] == 'i' || \
-		   buff1[i] == 'o' || buff1[i] == 'u')
-
+#define FIRSTCHAR(i) (isspace((int)s[i-1]))
+#define LASTCHAR(i) (!isspace((int)s[i-1]) && (!s[i+1] || isspace((int)s[i+1])))
+#define LC_VOWEL(i) (s[i] == 'a' || s[i] == 'e' || s[i] == 'i' || \
+		   s[i] == 'o' || s[i] == 'u')
+#define UPPER (int)(strlen(s) - 1)
 
 /* memmove does allow overlapping src and dest */
 static void mystrcpy(char *dest, const char *src)
@@ -498,132 +597,228 @@
     memmove(dest, src, strlen(src)+1);
 }
 
-static SEXP stripchars(const char * const inchar, int minlen)
+static SEXP stripchars(const char * const inchar, int minlen, int usecl)
 {
-/* This routine used to use strcpy with overlapping dest and src.
-   That is not allowed by ISO C.
- */
-    int i, j, nspace = 0, upper;
-    char *buff1 = cbuff.data;
-
-    mystrcpy(buff1, inchar);
-    upper = (int)(strlen(buff1) - 1);
+    int i, j, nspace = 0;
+    char *s = cbuff.data;
 
-    /* remove leading blanks */
-    j = 0;
-    for (i = 0 ; i < upper ; i++)
-	if (isspace((int)buff1[i]))
-	    j++;
-	else
-	    break;
-
-    mystrcpy(buff1, &buff1[j]);
-    upper = (int)(strlen(buff1) - 1);
-
-    if (strlen(buff1) < minlen)
-	goto donesc;
-
-    for (i = upper, j = 1; i > 0; i--) {
-	if (isspace((int)buff1[i])) {
-	    if (j)
-		buff1[i] = '\0' ;
-	    else
-		nspace++;
-	}
-	else
-	    j = 0;
-	/*strcpy(buff1[i],buff1[i+1]);*/
-	if (strlen(buff1) - nspace <= minlen)
+    /* The R wrapper removed leading and trailing spces */
+    mystrcpy(s, inchar);
+    if (strlen(s) < minlen) goto donesc;
+
+    /* The for() loops never touch the first character */
+
+    /*  record spaces for removal later (as they act as word boundaries) */
+    for (i = UPPER, j = 1; i > 0; i--) {
+	if (isspace((int)s[i])) {
+	    if (j) s[i] = '\0'; // trailing space
+	    else nspace++;
+	} else j = 0;
+	if (strlen(s) - nspace <= minlen)
 	    goto donesc;
     }
 
-    upper = (int)(strlen(buff1) - 1);
-    for (i = upper; i > 0; i--) {
-	if (LOWVOW(i) && LASTCHAR(i))
-	    mystrcpy(&buff1[i], &buff1[i + 1]);
-	if (strlen(buff1) - nspace <= minlen)
-	    goto donesc;
+    if(usecl) {
+	/* remove l/case vowels,
+	   which are not at the beginning of a word but are at the end */
+	for (i = UPPER; i > 0; i--) {
+	    if (LC_VOWEL(i) && LASTCHAR(i))
+		mystrcpy(s + i, s + i + 1);
+	    if (strlen(s) - nspace <= minlen)
+		goto donesc;
+	}
+
+	/* remove those not at the beginning of a word */
+	for (i = UPPER; i > 0; i--) {
+	    if (LC_VOWEL(i) && !FIRSTCHAR(i))
+		mystrcpy(s + i, s + i + 1);
+	    if (strlen(s) - nspace <= minlen)
+		goto donesc;
+	}
+
+	/* Now do the same for remaining l/case chars */
+	for (i = UPPER; i > 0; i--) {
+	    if (islower((int)s[i]) && LASTCHAR(i))
+		mystrcpy(s + i, s + i + 1);
+	    if (strlen(s) - nspace <= minlen)
+		goto donesc;
+	}
+
+	for (i = UPPER; i > 0; i--) {
+	    if (islower((int)s[i]) && !FIRSTCHAR(i))
+		mystrcpy(s + i, s + i + 1);
+	    if (strlen(s) - nspace <= minlen)
+		goto donesc;
+	}
     }
 
-    upper = (int)(strlen(buff1) - 1);
-    for (i = upper; i > 0; i--) {
-	if (LOWVOW(i) && !FIRSTCHAR(i))
-	    mystrcpy(&buff1[i], &buff1[i + 1]);
-	if (strlen(buff1) - nspace <= minlen)
-	    goto donesc;
-    }
+    /* all else has failed so we use brute force */
 
-    upper = (int)(strlen(buff1) - 1);
-    for (i = upper; i > 0; i--) {
-	if (islower((int)buff1[i]) && LASTCHAR(i))
-	    mystrcpy(&buff1[i], &buff1[i + 1]);
-	if (strlen(buff1) - nspace <= minlen)
+    for (i = UPPER; i > 0; i--) {
+	if (!FIRSTCHAR(i) && !isspace((int)s[i]))
+	    mystrcpy(s + i, s + i + 1);
+	if (strlen(s) - nspace <= minlen)
 	    goto donesc;
     }
 
-    upper = (int)(strlen(buff1) - 1);
-    for (i = upper; i > 0; i--) {
-	if (islower((int)buff1[i]) && !FIRSTCHAR(i))
-	    mystrcpy(&buff1[i], &buff1[i + 1]);
-	if (strlen(buff1) - nspace <= minlen)
-	    goto donesc;
+donesc:
+    {  // remove internal spaces as required
+	int upper = (int) strlen(s);
+	if (upper > minlen)
+	    for (i = upper - 1; i > 0; i--)
+		if (isspace((int)s[i]))
+		    mystrcpy(s + i, s + i + 1);
+    }
+
+    return mkChar(s);
+}
+
+#define FIRSTCHARW(i) (iswspace((int)wc[i-1]))
+#define LASTCHARW(i) (!iswspace((int)wc[i-1]) && (!wc[i+1] || iswspace((int)wc[i+1])))
+#define WUP (int)(wcslen(wc) - 1)
+
+// lower-case vowels in English plus accented versions
+static int vowels[] = {
+    0x61, 0x65, 0x69, 0x6f, 0x75,
+    0xe0, 0xe1, 0x2e, 0xe3, 0xe4, 0xe5,
+    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+    0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
+    0x101, 0x103, 0x105, 0x113, 0x115, 0x117, 0x118, 0x11b,
+    0x129, 0x12b, 0x12d, 0x12f, 0x131, 0x14d, 0x14f, 0x151,
+    0x169, 0x16b, 0x16d, 0x16f, 0x171, 0x173
+};
+
+static Rboolean iswvowel(wchar_t w)
+{
+    int v = (int) w, n = sizeof(vowels)/sizeof(int);
+    Rboolean found = FALSE;
+    for(int i = 0; i < n; i++)
+	if(v == vowels[i]) {found = TRUE; break;}
+
+    return found;
+}
+
+static void mywcscpy(wchar_t *dest, const wchar_t *src)
+{
+    memmove(dest, src, sizeof(wchar_t) * (wcslen(src)+1));
+}
+
+static SEXP wstripchars(const wchar_t * const inchar, int minlen, int usecl)
+{
+    int i, j, nspace = 0;
+    wchar_t *wc = (wchar_t *)cbuff.data;
+
+    mywcscpy(wc, inchar);
+    if (wcslen(wc) < minlen) goto donewsc;
+
+    for (i = WUP, j = 1; i > 0; i--) {
+	if (iswspace((int)wc[i])) {
+	    if (j) wc[i] = '\0' ; else nspace++;
+	} else j = 0;
+	if (wcslen(wc) - nspace <= minlen)
+	    goto donewsc;
     }
 
-    /* all else has failed so we use brute force */
+    if(usecl) {
+	for (i = WUP; i > 0; i--) {
+	    if (iswvowel(wc[i]) && LASTCHARW(i))
+		mywcscpy(wc + i, wc + i + 1);
+	    if (wcslen(wc) - nspace <= minlen)
+		goto donewsc;
+	}
 
-    upper = (int)(strlen(buff1) - 1);
-    for (i = upper; i > 0; i--) {
-	if (!FIRSTCHAR(i) && !isspace((int)buff1[i]))
-	    mystrcpy(&buff1[i], &buff1[i + 1]);
-	if (strlen(buff1) - nspace <= minlen)
-	    goto donesc;
+	for (i = WUP; i > 0; i--) {
+	    if (iswvowel(wc[i]) && !FIRSTCHARW(i))
+		mywcscpy(wc + i, wc + i + 1);
+	    if (wcslen(wc) - nspace <= minlen)
+		goto donewsc;
+	}
+
+	for (i = WUP; i > 0; i--) {
+	    if (islower((int)wc[i]) && LASTCHARW(i))
+		mywcscpy(wc + i, wc + i + 1);
+	    if (wcslen(wc) - nspace <= minlen)
+		goto donewsc;
+	}
+
+	for (i = WUP; i > 0; i--) {
+	    if (islower((int)wc[i]) && !FIRSTCHARW(i))
+		mywcscpy(wc + i, wc + i + 1);
+	    if (wcslen(wc) - nspace <= minlen)
+		goto donewsc;
+	}
     }
 
-donesc:
+    for (i = WUP; i > 0; i--) {
+	if (!FIRSTCHARW(i) && !iswspace((int)wc[i]))
+	    mywcscpy(wc + i, wc + i + 1);
+	if (wcslen(wc) - nspace <= minlen)
+	    goto donewsc;
+    }
 
-    upper = (int) strlen(buff1);
-    if (upper > minlen)
-	for (i = upper - 1; i > 0; i--)
-	    if (isspace((int)buff1[i]))
-		mystrcpy(&buff1[i], &buff1[i + 1]);
+donewsc:
 
-    return(mkChar(buff1));
+    {
+	int upper = (int) wcslen(wc);
+	if (upper > minlen)
+	    for (i = upper - 1; i > 0; i--)
+		if (iswspace((int)wc[i])) mywcscpy(wc + i, wc + i + 1);
+    }
+
+    int nb = (int) wcstoutf8(NULL, wc, 0);
+    char *cbuf = CallocCharBuf(nb+1);
+    wcstoutf8(cbuf, wc, nb + 1);
+    SEXP ans = mkCharCE(cbuf, CE_UTF8);
+    Free(cbuf);
+    return ans;
 }
 
 
 SEXP attribute_hidden do_abbrev(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    SEXP x, ans;
-    R_xlen_t i, len;
-    Rboolean warn = FALSE;
-    const char *s;
-
     checkArity(op,args);
-    x = CAR(args);
+    SEXP x = CAR(args);
+
     if (!isString(x))
 	error(_("the first argument must be a character vector"));
     int minlen = asInteger(CADR(args));
     if (minlen == NA_INTEGER)
 	error(_("invalid '%s' argument"), "minlength");
+    int usecl = asLogical(CADDR(args));
+    if (usecl == NA_INTEGER)
+	error(_("invalid '%s' argument"), "use.classes");
 
-    len = XLENGTH(x);
-    PROTECT(ans = allocVector(STRSXP, len));
-    const char *vmax = vmaxget();
-    for (i = 0 ; i < len ; i++) {
-	if (STRING_ELT(x, i) == NA_STRING)
+    R_xlen_t len = XLENGTH(x);
+    SEXP ans = PROTECT(allocVector(STRSXP, len));
+    const void *vmax = vmaxget();
+    Rboolean warn = FALSE;
+    for (R_xlen_t i = 0 ; i < len ; i++) {
+	SEXP el = STRING_ELT(x, i);
+	if (el  == NA_STRING)
 	    SET_STRING_ELT(ans, i, NA_STRING);
 	else {
-	    s = translateChar(STRING_ELT(x, i));
-	    if(strlen(s) > minlen) {
-		warn = warn | !strIsASCII(s);
-		R_AllocStringBuffer(strlen(s), &cbuff);
-		SET_STRING_ELT(ans, i, stripchars(s, minlen));
-	    } else SET_STRING_ELT(ans, i, mkChar(s));
+	    const char *s = CHAR(el);
+	    if (strIsASCII(s)) {
+		if(strlen(s) > minlen) {
+		    R_AllocStringBuffer(strlen(s)+1, &cbuff);
+		    SET_STRING_ELT(ans, i, stripchars(s, minlen, usecl));
+		} else SET_STRING_ELT(ans, i, el);
+	    } else {
+		s = translateCharUTF8(el);
+		int nc = (int) utf8towcs(NULL, s, 0);
+		if (nc > minlen) {
+		    warn = TRUE;
+		    const wchar_t *wc = wtransChar(el);
+		    nc = (int) wcslen(wc);
+		    R_AllocStringBuffer(sizeof(wchar_t)*(nc+1), &cbuff);
+		    SET_STRING_ELT(ans, i, wstripchars(wc, minlen, usecl));
+		} else SET_STRING_ELT(ans, i, el);
+	    }
 	}
-	vmaxset(vmax);
+	vmaxset(vmax); // this throws away the result of wtransChar
     }
-    if (warn) warning(_("abbreviate used with non-ASCII chars"));
-    DUPLICATE_ATTRIB(ans, x);
+    if (usecl && warn) warning(_("abbreviate used with non-ASCII chars"));
+    SHALLOW_DUPLICATE_ATTRIB(ans, x);
     /* This copied the class, if any */
     R_FreeStringBufferL(&cbuff);
     UNPROTECT(1);
@@ -825,7 +1020,7 @@
 	    vmaxset(vmax);
 	}
     }
-    DUPLICATE_ATTRIB(y, x);
+    SHALLOW_DUPLICATE_ATTRIB(y, x);
     /* This copied the class, if any */
     UNPROTECT(1);
     return(y);
@@ -1088,13 +1283,13 @@
     _new = CAR(args); args = CDR(args);
     x = CAR(args);
     n = XLENGTH(x);
-    if (!isString(old) || length(old) < 1 || STRING_ELT(old, 0) == NA_STRING)
+    if (!isString(old) || LENGTH(old) < 1 || STRING_ELT(old, 0) == NA_STRING)
 	error(_("invalid '%s' argument"), "old");
-    if (length(old) > 1)
+    if (LENGTH(old) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "old");
-    if (!isString(_new) || length(_new) < 1 || STRING_ELT(_new, 0) == NA_STRING)
+    if (!isString(_new) || LENGTH(_new) < 1 || STRING_ELT(_new, 0) == NA_STRING)
 	error(_("invalid '%s' argument"), "new");
-    if (length(_new) > 1)
+    if (LENGTH(_new) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "new");
     if (!isString(x)) error("invalid '%s' argument", "x");
 
@@ -1301,7 +1496,7 @@
 	vmaxset(vmax);
     }
 
-    DUPLICATE_ATTRIB(y, x);
+    SHALLOW_DUPLICATE_ATTRIB(y, x);
     /* This copied the class, if any */
     UNPROTECT(1);
     return(y);
@@ -1325,44 +1520,47 @@
     if (!isString(x = CAR(args)))
 	error(_("strtrim() requires a character vector"));
     len = XLENGTH(x);
-    PROTECT(width = coerceVector(CADR(args), INTSXP));
-    nw = LENGTH(width);
-    if (!nw || (nw < len && len % nw))
-	error(_("invalid '%s' argument"), "width");
-    for (i = 0; i < nw; i++)
-	if (INTEGER(width)[i] == NA_INTEGER ||
-	   INTEGER(width)[i] < 0)
-	    error(_("invalid '%s' argument"), "width");
     PROTECT(s = allocVector(STRSXP, len));
-    vmax = vmaxget();
-    for (i = 0; i < len; i++) {
-	if (STRING_ELT(x, i) == NA_STRING) {
-	    SET_STRING_ELT(s, i, STRING_ELT(x, i));
-	    continue;
-	}
-	w = INTEGER(width)[i % nw];
-	This = translateChar(STRING_ELT(x, i));
-	nc = (int) strlen(This);
-	buf = R_AllocStringBuffer(nc, &cbuff);
-	wsum = 0;
-	mbs_init(&mb_st);
-	for (p = This, w0 = 0, q = buf; *p ;) {
-	    nb =  (int) Mbrtowc(&wc, p, MB_CUR_MAX, &mb_st);
-	    w0 = Ri18n_wcwidth(wc);
-	    if (w0 < 0) { p += nb; continue; } /* skip non-printable chars */
-	    wsum += w0;
-	    if (wsum <= w) {
-		for (k = 0; k < nb; k++) *q++ = *p++;
-	    } else break;
+    if(len > 0) {
+	PROTECT(width = coerceVector(CADR(args), INTSXP));
+	nw = LENGTH(width);
+	if (!nw || (nw < len && len % nw))
+	    error(_("invalid '%s' argument"), "width");
+	for (i = 0; i < nw; i++)
+	    if (INTEGER(width)[i] == NA_INTEGER ||
+		INTEGER(width)[i] < 0)
+		error(_("invalid '%s' argument"), "width");
+	vmax = vmaxget();
+	for (i = 0; i < len; i++) {
+	    if (STRING_ELT(x, i) == NA_STRING) {
+		SET_STRING_ELT(s, i, STRING_ELT(x, i));
+		continue;
+	    }
+	    w = INTEGER(width)[i % nw];
+	    This = translateChar(STRING_ELT(x, i));
+	    nc = (int) strlen(This);
+	    buf = R_AllocStringBuffer(nc, &cbuff);
+	    wsum = 0;
+	    mbs_init(&mb_st);
+	    for (p = This, w0 = 0, q = buf; *p ;) {
+		nb =  (int) Mbrtowc(&wc, p, MB_CUR_MAX, &mb_st);
+		w0 = Ri18n_wcwidth(wc);
+		if (w0 < 0) { p += nb; continue; } /* skip non-printable chars */
+		wsum += w0;
+		if (wsum <= w) {
+		    for (k = 0; k < nb; k++) *q++ = *p++;
+		} else break;
+	    }
+	    *q = '\0';
+	    SET_STRING_ELT(s, i, markKnown(buf, STRING_ELT(x, i)));
+	    vmaxset(vmax);
 	}
-	*q = '\0';
-	SET_STRING_ELT(s, i, markKnown(buf, STRING_ELT(x, i)));
-	vmaxset(vmax);
+	R_FreeStringBufferL(&cbuff);
+	UNPROTECT(1);
     }
-    if (len > 0) R_FreeStringBufferL(&cbuff);
-    DUPLICATE_ATTRIB(s, x);
+    SHALLOW_DUPLICATE_ATTRIB(s, x);
     /* This copied the class, if any */
-    UNPROTECT(2);
+    UNPROTECT(1);
     return s;
 }
 
@@ -1392,7 +1590,7 @@
     x = CAR(args); args = CDR(args);
     b = CAR(args);
 
-    if(!isInteger(b) || (length(b) < 1))
+    if(!isInteger(b) || (LENGTH(b) < 1))
 	error(_("invalid '%s' argument"), "base");
     base = INTEGER(b)[0];
     if((base != 0) && ((base < 2) || (base > 36)))
@@ -1423,3 +1621,64 @@
     UNPROTECT(1); /* res */
     return res;
 }
+
+SEXP attribute_hidden do_strrep(SEXP call, SEXP op, SEXP args, SEXP env)
+{
+    SEXP d, s, x, n;
+    R_xlen_t is, ix, in, ns, nx, nn;
+    const char *xi;
+    int j, ni, nc;
+    const char *cbuf;
+    char *buf;
+    const void *vmax;
+
+    checkArity(op, args);
+
+    x = CAR(args); args = CDR(args);
+    n = CAR(args);
+
+    nx = XLENGTH(x);
+    nn = XLENGTH(n);
+    if((nx == 0) || (nn == 0))
+	return allocVector(STRSXP, 0);
+
+    ns = (nx > nn) ? nx : nn;
+
+    PROTECT(s = allocVector(STRSXP, ns));
+    vmax = vmaxget();
+    is = ix = in = 0;
+    for(; is < ns; is++) {
+	ni = INTEGER(n)[in];
+	if((STRING_ELT(x, ix) == NA_STRING) || (ni == NA_INTEGER)) {
+	    SET_STRING_ELT(s, is, NA_STRING);
+	} else {
+	    if(ni < 0)
+		error(_("invalid '%s' value"), "times");
+	    xi = CHAR(STRING_ELT(x, ix));
+	    nc = (int) strlen(xi);
+
+	    /* check for feasible result length; use double to protect
+	       against integer overflow */
+	    double len = ((double) nc) * ni;
+	    if (len > INT_MAX)
+		error("R character strings are limited to 2^31-1 bytes");
+
+	    cbuf = buf = CallocCharBuf(nc * ni);
+	    for(j = 0; j < ni; j++) {
+		strcpy(buf, xi);
+		buf += nc;
+	    }
+	    SET_STRING_ELT(s, is, markKnown(cbuf, STRING_ELT(x, ix)));
+	    Free(cbuf);
+	    vmaxset(vmax);
+	}
+	ix = (++ix == nx) ? 0 : ix;
+	in = (++in == nn) ? 0 : in;
+    }
+    /* Copy names if not recycled. */
+    if((ns == nx) &&
+       (d = getAttrib(x, R_NamesSymbol)) != R_NilValue)
+	setAttrib(s, R_NamesSymbol, d);
+    UNPROTECT(1);
+    return s;
+}
diff -Nru r-base-3.2.3/src/main/coerce.c r-base-3.3.1/src/main/coerce.c
--- r-base-3.2.3/src/main/coerce.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/coerce.c	2016-05-20 22:15:07.000000000 +0000
@@ -50,11 +50,11 @@
    assignment functions when possible, since the write barrier (and
    possibly cache behavior on some architectures) makes assigning more
    costly than dereferencing. */
-#define DUPLICATE_ATTRIB(to, from) do {\
+#define SHALLOW_DUPLICATE_ATTRIB(to, from) do {\
   SEXP __from__ = (from); \
   if (ATTRIB(__from__) != R_NilValue) { \
     SEXP __to__ = (to); \
-    (DUPLICATE_ATTRIB)(__to__, __from__);	\
+    (SHALLOW_DUPLICATE_ATTRIB)(__to__, __from__);	\
   } \
 } while (0)
 
@@ -201,6 +201,8 @@
 {
     if (ISNAN(x.r) || ISNAN(x.i))
 	return NA_REAL;
+    if (ISNAN(x.r)) return x.r;
+    if (ISNAN(x.i)) return NA_REAL;
     if (x.i != 0)
 	*warn |= WARN_IMAG;
     return x.r;
@@ -255,14 +257,18 @@
 ComplexFromReal(double x, int *warn)
 {
     Rcomplex z;
+#ifdef PRE_R_3_3_0
     if (ISNAN(x)) {
 	z.r = NA_REAL;
 	z.i = NA_REAL;
     }
     else {
+#endif
 	z.r = x;
 	z.i = 0;
+#ifdef PRE_R_3_3_0
     }
+#endif
     return z;
 }
 
@@ -316,7 +322,8 @@
 {
     int wr, dr, er, wi, di, ei;
     formatComplex(&x, 1, &wr, &dr, &er, &wi, &di, &ei, 0);
-    if (ISNA(x.r) || ISNA(x.i)) return NA_STRING;
+    if (ISNA(x.r) || ISNA(x.i)) // "NA" if Re or Im is (but not if they're just NaN)
+	return NA_STRING;
     else /* EncodeComplex has its own anti-trailing-0 care :*/
 	return mkChar(EncodeComplex(x, wr, dr, er, wi, di, ei, OutDec));
 }
@@ -433,7 +440,7 @@
        SET_RTRACE(ans,1);
     }
 #endif
-    DUPLICATE_ATTRIB(ans, v);
+    SHALLOW_DUPLICATE_ATTRIB(ans, v);
     switch (TYPEOF(v)) {
     case INTSXP:
 	for (i = 0; i < n; i++) {
@@ -485,7 +492,7 @@
        SET_RTRACE(ans,1);
     }
 #endif
-    DUPLICATE_ATTRIB(ans, v);
+    SHALLOW_DUPLICATE_ATTRIB(ans, v);
     switch (TYPEOF(v)) {
     case LGLSXP:
 	for (i = 0; i < n; i++) {
@@ -537,7 +544,7 @@
        SET_RTRACE(ans,1);
     }
 #endif
-    DUPLICATE_ATTRIB(ans, v);
+    SHALLOW_DUPLICATE_ATTRIB(ans, v);
     switch (TYPEOF(v)) {
     case LGLSXP:
 	for (i = 0; i < n; i++) {
@@ -589,7 +596,7 @@
        SET_RTRACE(ans,1);
     }
 #endif
-    DUPLICATE_ATTRIB(ans, v);
+    SHALLOW_DUPLICATE_ATTRIB(ans, v);
     switch (TYPEOF(v)) {
     case LGLSXP:
 	for (i = 0; i < n; i++) {
@@ -642,7 +649,7 @@
        SET_RTRACE(ans,1);
     }
 #endif
-    DUPLICATE_ATTRIB(ans, v);
+    SHALLOW_DUPLICATE_ATTRIB(ans, v);
     switch (TYPEOF(v)) {
     case LGLSXP:
 	for (i = 0; i < n; i++) {
@@ -720,7 +727,7 @@
        SET_RTRACE(ans,1);
     }
 #endif
-    DUPLICATE_ATTRIB(ans, v);
+    SHALLOW_DUPLICATE_ATTRIB(ans, v);
     switch (TYPEOF(v)) {
     case LGLSXP:
 	for (i = 0; i < n; i++) {
@@ -1183,7 +1190,7 @@
 	    /* Can this actually happen? */
 	    UNPROTECT(1);
 	    break;
-        }
+	}
 	i = 0;
 	op = CAR(v);
 	/* The case of practical relevance is "lhs ~ rhs", which
@@ -1320,14 +1327,8 @@
     else if (isVector(u) || isList(u) || isLanguage(u)
 	     || (isSymbol(u) && type == EXPRSXP)) {
 	v = u;
-	/* this duplication may appear not to be needed in all cases,
-	   but beware that other code relies on it.
-	   (E.g  we clear attributes in do_asvector and do_asatomic.)
-
-	   Generally coerceVector will copy over attributes.
-	*/
 	if (type != ANYSXP && TYPEOF(u) != type) v = coerceVector(u, type);
-	else if (MAYBE_REFERENCED(u)) v = duplicate(u);
+	else v = u;
 
 	/* drop attributes() and class() in some cases for as.pairlist:
 	   But why?  (And who actually coerces to pairlists?)
@@ -1335,6 +1336,7 @@
 	if ((type == LISTSXP) &&
 	    !(TYPEOF(u) == LANGSXP || TYPEOF(u) == LISTSXP ||
 	      TYPEOF(u) == EXPRSXP || TYPEOF(u) == VECSXP)) {
+      if (MAYBE_REFERENCED(v)) v = shallow_duplicate(v);
 	    CLEAR_ATTRIB(v);
 	}
 	return v;
@@ -1353,6 +1355,16 @@
     return u;/* -Wall */
 }
 
+SEXP attribute_hidden do_asCharacterFactor(SEXP call, SEXP op, SEXP args,
+                                           SEXP rho)
+{
+    SEXP x;
+    checkArity(op, args);
+    check1arg(args, call, "x");
+    x = CAR(args);
+    return asCharacterFactor(x);
+}
+
 /* used in attrib.c, eval.c and unique.c */
 SEXP asCharacterFactor(SEXP x)
 {
@@ -1914,6 +1926,7 @@
  * It seems to make more sense to check for a dim attribute.
  */
 
+// is.vector(x, mode) :
 SEXP attribute_hidden do_isvector(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     SEXP ans, a, x;
@@ -2028,8 +2041,8 @@
 		    LOGICAL(ans)[i] = (STRING_ELT(s, 0) == NA_STRING);	\
 		    break;						\
 		case CPLXSXP:						\
-		    LOGICAL(ans)[i] = (ISNAN(COMPLEX(s)[0].r)		\
-				       || ISNAN(COMPLEX(s)[0].i));	\
+		    LOGICAL(ans)[i] = (ISNAN(COMPLEX(s)[0].r) || 	\
+				       ISNAN(COMPLEX(s)[0].i));		\
 		    break;						\
 		default:						\
 		    LOGICAL(ans)[i] = 0;				\
@@ -2138,8 +2151,8 @@
     case LISTSXP:
     {
 	SEXP call2, args2, ans;
-	args2 = PROTECT(duplicate(args));
-	call2 = PROTECT(duplicate(call));
+	args2 = PROTECT(shallow_duplicate(args));
+	call2 = PROTECT(shallow_duplicate(call));
 	for (i = 0; i < n; i++, x = CDR(x)) {
 	    SETCAR(args2, CAR(x)); SETCADR(call2, CAR(x));
 	    if ((DispatchOrEval(call2, op, "anyNA", args2, env, &ans, 0, 1)
@@ -2154,8 +2167,8 @@
     case VECSXP:
     {
 	SEXP call2, args2, ans;
-	args2 = PROTECT(duplicate(args));
-	call2 = PROTECT(duplicate(call));
+	args2 = PROTECT(shallow_duplicate(args));
+	call2 = PROTECT(shallow_duplicate(call));
 	for (i = 0; i < n; i++) {
 	    SETCAR(args2, VECTOR_ELT(x, i)); SETCADR(call2, VECTOR_ELT(x, i));
 	    if ((DispatchOrEval(call2, op, "anyNA", args2, env, &ans, 0, 1)
@@ -2251,7 +2264,8 @@
 			       R_IsNaN(COMPLEX(x)[i].i));
 	break;
     default:
-	errorcall(call, _("default method not implemented for type '%s'"), type2char(TYPEOF(x)));
+	errorcall(call, _("default method not implemented for type '%s'"),
+		  type2char(TYPEOF(x)));
     }
     if (dims != R_NilValue)
 	setAttrib(ans, R_DimSymbol, dims);
@@ -2314,7 +2328,8 @@
 	    LOGICAL(ans)[i] = (R_FINITE(COMPLEX(x)[i].r) && R_FINITE(COMPLEX(x)[i].i));
 	break;
     default:
-	errorcall(call, _("default method not implemented for type '%s'"), type2char(TYPEOF(x)));
+	errorcall(call, _("default method not implemented for type '%s'"),
+		  type2char(TYPEOF(x)));
     }
     if (dims != R_NilValue)
 	setAttrib(ans, R_DimSymbol, dims);
@@ -2385,7 +2400,8 @@
 	}
 	break;
     default:
-	errorcall(call, _("default method not implemented for type '%s'"), type2char(TYPEOF(x)));
+	errorcall(call, _("default method not implemented for type '%s'"),
+		  type2char(TYPEOF(x)));
     }
     if (!isNull(dims))
 	setAttrib(ans, R_DimSymbol, dims);
@@ -2417,12 +2433,11 @@
     const char *str = translateChar(STRING_ELT(rfun, 0));
     if (streql(str, ".Internal")) error("illegal usage");
     PROTECT(rfun = install(str));
-    PROTECT(evargs = duplicate(CDR(args)));
+    PROTECT(evargs = shallow_duplicate(CDR(args)));
     for (rest = evargs; rest != R_NilValue; rest = CDR(rest)) {
-	PROTECT(tmp = eval(CAR(rest), rho));
-	if (MAYBE_REFERENCED(tmp)) tmp = duplicate(tmp);
+	tmp = eval(CAR(rest), rho);
+	if (NAMED(tmp)) MARK_NOT_MUTABLE(tmp);
 	SETCAR(rest, tmp);
-	UNPROTECT(1);
     }
     rfun = LCONS(rfun, evargs);
     UNPROTECT(3);
@@ -2445,15 +2460,15 @@
        zero-length string check used to be here but install gives
        better error message.
      */
-    if( !(isString(fun) && length(fun) == 1) && !isFunction(fun) )
-	error(_("'what' must be a character string or a function"));
+    if(!(isFunction(fun) || (isString(fun) && length(fun) == 1)))
+	error(_("'what' must be a function or character string"));
 
 #ifdef __maybe_in_the_future__
     if (!isNull(args) && !isVectorList(args))
 	error(_("'args' must be a list or expression"));
 #else
     if (!isNull(args) && !isNewList(args))
-        error(_("'%s' must be a list"), "args");
+	error(_("'%s' must be a list"), "args");
 #endif
 
     if (!isEnvironment(envir))
@@ -2598,7 +2613,7 @@
     static SEXP do_substitute_formals = NULL;
 
     if (do_substitute_formals == NULL)
-        do_substitute_formals = allocFormalsList2(install("expr"),
+	do_substitute_formals = allocFormalsList2(install("expr"),
 						  install("env"));
 
     /* argument matching */
@@ -2785,10 +2800,14 @@
 
 SEXP attribute_hidden R_do_set_class(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    SEXP ans;
     checkArity(op, args);
     check1arg(args, call, "x");
 
-    return R_set_class(CAR(args), CADR(args), call);
+    if (MAYBE_SHARED(CAR(args))) SETCAR(args, shallow_duplicate(CAR(args)));
+    ans = R_set_class(CAR(args), CADR(args), call);
+    SET_NAMED(CAR(args), 0);
+    return ans;
 }
 
 /* primitive */
@@ -2820,7 +2839,7 @@
     if(isFactor(obj))
 	error(_("invalid to change the storage mode of a factor"));
     PROTECT(ans = coerceVector(obj, type));
-    DUPLICATE_ATTRIB(ans, obj);
+    SHALLOW_DUPLICATE_ATTRIB(ans, obj);
     UNPROTECT(1);
     return ans;
 }
diff -Nru r-base-3.2.3/src/main/CommandLineArgs.c r-base-3.3.1/src/main/CommandLineArgs.c
--- r-base-3.2.3/src/main/CommandLineArgs.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/CommandLineArgs.c	2016-05-17 22:15:10.000000000 +0000
@@ -73,6 +73,7 @@
     int i;
     SEXP vals;
 
+    checkArity(op, args);
     /* need protection as mkChar allocates */
     vals = PROTECT(allocVector(STRSXP, NumCommandLineArgs));
     for(i = 0; i < NumCommandLineArgs; i++)
@@ -239,7 +240,6 @@
 		    R_ShowMessage(_("WARNING: '--max-ppsize' value is negative: ignored"));
 		else if (lval < 10000)
 		    R_ShowMessage(_("WARNING: '--max-ppsize' value is too small: ignored"));
-
 		else if (lval > 500000)
 		    R_ShowMessage(_("WARNING: '--max-ppsize' value is too large: ignored"));
 		else Rp->ppsize = (size_t) lval;
diff -Nru r-base-3.2.3/src/main/complex.c r-base-3.3.1/src/main/complex.c
--- r-base-3.2.3/src/main/complex.c	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/complex.c	2016-03-16 23:04:15.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 2000-2014	    The R Core Team
+ *  Copyright (C) 2000-2016	    The R Core Team
  *  Copyright (C) 2005		    The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -47,11 +47,6 @@
 #undef HAVE_CTANH
 #endif
 
-#ifdef __CYGWIN__
-/* as of 1.7.8 it had cacos, but it does not work */
-#undef HAVE_CACOS
-#endif
-
 #ifdef __SUNPRO_C
 /* segfaults in Solaris Studio 12.3 */
 #undef HAVE_CPOW
@@ -63,6 +58,8 @@
 
 #include "arithmetic.h"		/* complex_*  */
 #include <complex.h>
+#include <R_ext/Itermacros.h>
+
 
 /* interval at which to check interrupts, a guess */
 #define NINTERRUPT 10000000
@@ -198,15 +195,11 @@
     return Z;
 }
 
-/* See arithmetic.c */
-#define mod_iterate(n1,n2,i1,i2) for (i=i1=i2=0; i<n; \
-	i1 = (++i1 == n1) ? 0 : i1,\
-	i2 = (++i2 == n2) ? 0 : i2,\
-	++i)
+
 
 SEXP attribute_hidden complex_binary(ARITHOP_TYPE code, SEXP s1, SEXP s2)
 {
-    R_xlen_t i,i1, i2, n, n1, n2;
+    R_xlen_t i, i1, i2, n, n1, n2;
     SEXP ans;
 
     /* Note: "s1" and "s2" are protected in the calling code. */
@@ -221,41 +214,38 @@
 
     switch (code) {
     case PLUSOP:
-	mod_iterate(n1, n2, i1, i2) {
-	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    Rcomplex x1 = COMPLEX(s1)[i1], x2 = COMPLEX(s2)[i2];
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	    Rcomplex x1 = COMPLEX(s1)[i1];
+	    Rcomplex x2 = COMPLEX(s2)[i2];
 	    COMPLEX(ans)[i].r = x1.r + x2.r;
 	    COMPLEX(ans)[i].i = x1.i + x2.i;
-	}
+	});
 	break;
     case MINUSOP:
-	mod_iterate(n1, n2, i1, i2) {
-	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    Rcomplex x1 = COMPLEX(s1)[i1], x2 = COMPLEX(s2)[i2];
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
+	    Rcomplex x1 = COMPLEX(s1)[i1];
+	    Rcomplex x2 = COMPLEX(s2)[i2];
 	    COMPLEX(ans)[i].r = x1.r - x2.r;
 	    COMPLEX(ans)[i].i = x1.i - x2.i;
-	}
+	});
 	break;
     case TIMESOP:
-	mod_iterate(n1, n2, i1, i2) {
-	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 	    SET_C99_COMPLEX(COMPLEX(ans), i,
 			    C99_COMPLEX2(s1, i1) * C99_COMPLEX2(s2, i2));
-	}
+	});
 	break;
     case DIVOP:
-	mod_iterate(n1, n2, i1, i2) {
-	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 	    SET_C99_COMPLEX(COMPLEX(ans), i,
 			    C99_COMPLEX2(s1, i1) / C99_COMPLEX2(s2, i2));
-	}
+	});
 	break;
     case POWOP:
-	mod_iterate(n1, n2, i1, i2) {
-	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
+	MOD_ITERATE2_CHECK(NINTERRUPT, n, n1, n2, i, i1, i2, {
 	    SET_C99_COMPLEX(COMPLEX(ans), i,
 			    mycpow(C99_COMPLEX2(s1, i1), C99_COMPLEX2(s2, i2)));
-	}
+	});
 	break;
     default:
 	error(_("unimplemented complex operation"));
@@ -269,9 +259,9 @@
     /* Copy attributes from longer argument. */
 
     if (ans != s2 && n == n2 && ATTRIB(s2) != R_NilValue)
-        copyMostAttrib(s2, ans);
+	copyMostAttrib(s2, ans);
     if (ans != s1 && n == n1 && ATTRIB(s1) != R_NilValue)
-        copyMostAttrib(s1, ans); /* Done 2nd so s1's attrs overwrite s2's */
+	copyMostAttrib(s1, ans); /* Done 2nd so s1's attrs overwrite s2's */
 
     return ans;
 }
@@ -331,7 +321,7 @@
 	n = XLENGTH(x);
 	if(isReal(x)) PROTECT(x);
 	else PROTECT(x = coerceVector(x, REALSXP));
-        y = NO_REFERENCES(x) ? x : allocVector(REALSXP, n);
+	y = NO_REFERENCES(x) ? x : allocVector(REALSXP, n);
 
 	switch(PRIMVAL(op)) {
 	case 1:	/* Re */
@@ -363,10 +353,10 @@
     else errorcall(call, _("non-numeric argument to function"));
 
     if (x != y && ATTRIB(x) != R_NilValue) {
-        PROTECT(x);
-        PROTECT(y);
-        DUPLICATE_ATTRIB(y, x);
-        UNPROTECT(2);
+	PROTECT(x);
+	PROTECT(y);
+	SHALLOW_DUPLICATE_ATTRIB(y, x);
+	UNPROTECT(2);
     }
     return y;
 }
@@ -484,7 +474,7 @@
     ri = log(alpha + sqrt(alpha*alpha - 1));
     /* This comes from
        'z_asin() is continuous from below if x >= 1
-        and continuous from above if x <= -1.'
+	and continuous from above if x <= -1.'
     */
     if(y < 0 || (y == 0 && x > 1)) ri *= -1;
     return asin(t1  - t2) + ri*I;
@@ -623,7 +613,7 @@
     Rboolean naflag = FALSE;
 
     PROTECT(x = CAR(args));
-    n = xlength(x);
+    n = XLENGTH(x);
     PROTECT(y = allocVector(CPLXSXP, n));
 
     switch (PRIMVAL(op)) {
@@ -649,7 +639,7 @@
     }
     if (naflag)
 	warningcall(call, "NaNs produced in function \"%s\"", PRIMNAME(op));
-    DUPLICATE_ATTRIB(y, x);
+    SHALLOW_DUPLICATE_ATTRIB(y, x);
     UNPROTECT(2);
     return y;
 }
@@ -697,7 +687,7 @@
 typedef void (*cm2_fun)(Rcomplex *, Rcomplex *, Rcomplex *);
 SEXP attribute_hidden complex_math2(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    R_xlen_t i, n, na, nb;
+    R_xlen_t i, n, na, nb, ia, ib;
     Rcomplex ai, bi, *a, *b, *y;
     SEXP sa, sb, sy;
     Rboolean naflag = FALSE;
@@ -722,14 +712,14 @@
     PROTECT(sb = coerceVector(CADR(args), CPLXSXP));
     na = XLENGTH(sa); nb = XLENGTH(sb);
     if ((na == 0) || (nb == 0)) {
-        UNPROTECT(2);
-        return(allocVector(CPLXSXP, 0));
+	UNPROTECT(2);
+	return(allocVector(CPLXSXP, 0));
     }
     n = (na < nb) ? nb : na;
     PROTECT(sy = allocVector(CPLXSXP, n));
     a = COMPLEX(sa); b = COMPLEX(sb); y = COMPLEX(sy);
-    for (i = 0; i < n; i++) {
-	ai = a[i % na]; bi = b[i % nb];
+    MOD_ITERATE2(n, na, nb, i, ia, ib, {
+	ai = a[ia]; bi = b[ib];
 	if(ISNA(ai.r) && ISNA(ai.i) &&
 	   ISNA(bi.r) && ISNA(bi.i)) {
 	    y[i].r = NA_REAL; y[i].i = NA_REAL;
@@ -739,13 +729,13 @@
 		 !(ISNAN(ai.r) || ISNAN(ai.i) || ISNAN(bi.r) || ISNAN(bi.i)) )
 		naflag = TRUE;
 	}
-    }
+    });
     if (naflag)
 	warningcall(call, "NaNs produced in function \"%s\"", PRIMNAME(op));
     if(n == na) {
-	DUPLICATE_ATTRIB(sy, sa);
+	SHALLOW_DUPLICATE_ATTRIB(sy, sa);
     } else if(n == nb) {
-	DUPLICATE_ATTRIB(sy, sb);
+	SHALLOW_DUPLICATE_ATTRIB(sy, sb);
     }
     UNPROTECT(3);
     return sy;
@@ -756,6 +746,8 @@
     /* complex(length, real, imaginary) */
     SEXP ans, re, im;
     R_xlen_t i, na, nr, ni;
+
+    checkArity(op, args);
     na = asInteger(CAR(args));
     if(na == NA_INTEGER || na < 0)
 	error(_("invalid length"));
diff -Nru r-base-3.2.3/src/main/connections.c r-base-3.3.1/src/main/connections.c
--- r-base-3.2.3/src/main/connections.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/connections.c	2016-03-30 22:02:04.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2015   The R Core Team.
+ *  Copyright (C) 2000-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -369,7 +369,7 @@
 		/* is this safe? */
 		warning(_("invalid char string in output conversion"));
 	    *ob = '\0';
-	    con->write(outbuf, 1, strlen(outbuf), con);
+	    con->write(outbuf, 1, ob - outbuf, con);
 	} while(again && inb > 0);  /* it seems some iconv signal -1 on
 				       zero-length input */
     } else
@@ -1204,19 +1204,19 @@
 
     checkArity(op, args);
     sfile = CAR(args);
-    if(!isString(sfile) || length(sfile) != 1)
+    if(!isString(sfile) || LENGTH(sfile) != 1)
 	error(_("invalid '%s' argument"), "description");
     if(length(sfile) > 1)
 	warning(_("only first element of 'description' argument used"));
     file = translateChar(STRING_ELT(sfile, 0)); /* for now, like fopen */
     sopen = CADR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     block = asLogical(CADDR(args));
     if(block == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "block");
     enc = CADDDR(args);
-    if(!isString(enc) || length(enc) != 1 ||
+    if(!isString(enc) || LENGTH(enc) != 1 ||
        strlen(CHAR(STRING_ELT(enc, 0))) > 100) /* ASCII */
 	error(_("invalid '%s' argument"), "encoding");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
@@ -1363,9 +1363,9 @@
 
     checkArity(op, args);
     scmd = CAR(args);
-    if(!isString(scmd) || length(scmd) != 1)
+    if(!isString(scmd) || LENGTH(scmd) != 1)
 	error(_("invalid '%s' argument"), "description");
-    if(length(scmd) > 1)
+    if(LENGTH(scmd) > 1)
 	warning(_("only first element of 'description' argument used"));
 #ifdef Win32
     if( !IS_ASCII(STRING_ELT(scmd, 0)) ) {
@@ -1379,11 +1379,11 @@
     file = translateChar(STRING_ELT(scmd, 0));
 #endif
     sopen = CADR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
     enc = CADDR(args);
-    if(!isString(enc) || length(enc) != 1 ||
+    if(!isString(enc) || LENGTH(enc) != 1 ||
        strlen(CHAR(STRING_ELT(enc, 0))) > 100) /* ASCII */
 	error(_("invalid '%s' argument"), "encoding");
 
@@ -1985,16 +1985,16 @@
 
     checkArity(op, args);
     sfile = CAR(args);
-    if(!isString(sfile) || length(sfile) != 1)
+    if(!isString(sfile) || LENGTH(sfile) != 1)
 	error(_("invalid '%s' argument"), "description");
-    if(length(sfile) > 1)
+    if(LENGTH(sfile) > 1)
 	warning(_("only first element of 'description' argument used"));
     file = translateChar(STRING_ELT(sfile, 0));
     sopen = CADR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     enc = CADDR(args);
-    if(!isString(enc) || length(enc) != 1 ||
+    if(!isString(enc) || LENGTH(enc) != 1 ||
        strlen(CHAR(STRING_ELT(enc, 0))) > 100) /* ASCII */
 	error(_("invalid '%s' argument"), "encoding");
     if(type < 2) {
@@ -2655,12 +2655,12 @@
 
     checkArity(op, args);
     sfile = CAR(args);
-    if(!isString(sfile) || length(sfile) != 1)
+    if(!isString(sfile) || LENGTH(sfile) != 1)
 	error(_("invalid '%s' argument"), "description");
     desc = translateChar(STRING_ELT(sfile, 0));
     sraw = CADR(args);
     sopen = CADDR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
     if(strchr(open, 't'))
@@ -3049,12 +3049,12 @@
 
     checkArity(op, args);
     sfile = CAR(args);
-    if(!isString(sfile) || length(sfile) != 1)
+    if(!isString(sfile) || LENGTH(sfile) != 1)
 	error(_("invalid '%s' argument"), "description");
     desc = translateChar(STRING_ELT(sfile, 0));
     stext = CADR(args);
     sopen = CADDR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
     venv = CADDDR(args);
@@ -3078,7 +3078,7 @@
 	SET_VECTOR_ELT(OutTextData, ncon, venv);
 	if(stext == R_NilValue)
 	    con = Connections[ncon] = newouttext("NULL", stext, open, ncon);
-	else if(isString(stext) && length(stext) == 1)
+	else if(isString(stext) && LENGTH(stext) == 1)
 	    con = Connections[ncon] =
 		newouttext(translateChar(STRING_ELT(stext, 0)), stext,
 			   open, ncon);
@@ -3130,9 +3130,8 @@
     Rconnection con = NULL;
 
     checkArity(op, args);
-#ifdef HAVE_SOCKETS
     scmd = CAR(args);
-    if(!isString(scmd) || length(scmd) != 1)
+    if(!isString(scmd) || LENGTH(scmd) != 1)
 	error(_("invalid '%s' argument"), "host");
     host = translateChar(STRING_ELT(scmd, 0));
     args = CDR(args);
@@ -3149,12 +3148,12 @@
 	error(_("invalid '%s' argument"), "blocking");
     args = CDR(args);
     sopen = CAR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
     args = CDR(args);
     enc = CAR(args);
-    if(!isString(enc) || length(enc) != 1 ||
+    if(!isString(enc) || LENGTH(enc) != 1 ||
        strlen(CHAR(STRING_ELT(enc, 0))) > 100) /* ASCII */
 	error(_("invalid '%s' argument"), "encoding");
     args = CDR(args);
@@ -3185,9 +3184,6 @@
     setAttrib(ans, R_ConnIdSymbol, con->ex_ptr);
     R_RegisterCFinalizerEx(con->ex_ptr, conFinalizer, FALSE);
     UNPROTECT(3);
-#else
-    error(_("sockets are not available on this system"));
-#endif
     return ans;
 }
 
@@ -3203,16 +3199,16 @@
 
     checkArity(op, args);
     sfile = CAR(args);
-    if(!isString(sfile) || length(sfile) != 1)
+    if(!isString(sfile) || LENGTH(sfile) != 1)
 	error(_("invalid '%s' argument"), "description");
     if(length(sfile) > 1)
 	warning(_("only first element of 'description' argument used"));
     file = translateChar(STRING_ELT(sfile, 0));
     sopen = CADR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     enc = CADDR(args);
-    if(!isString(enc) || length(enc) != 1 ||
+    if(!isString(enc) || LENGTH(enc) != 1 ||
        strlen(CHAR(STRING_ELT(enc, 0))) > 100) /* ASCII */
 	error(_("invalid '%s' argument"), "encoding");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
@@ -3264,7 +3260,7 @@
 	return R_NilValue;
     }
     sopen = CADR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     block = asLogical(CADDR(args));
     if(block == NA_LOGICAL)
@@ -3703,7 +3699,7 @@
 	Rconnection con0;
 	do {
 	    con0 = getConnection(con_num);
-	    for(R_xlen_t i = 0; i < xlength(text); i++)
+	    for(R_xlen_t i = 0; i < XLENGTH(text); i++)
 		Rconn_printf(con0, "%s%s",
 			     useBytes ? CHAR(STRING_ELT(text, i)) :
 			     translateChar0(STRING_ELT(text, i)), ssep);
@@ -3711,7 +3707,7 @@
 	    con_num = getActiveSink(j++);
 	} while (con_num > 0);
     } else {
-	for(R_xlen_t i = 0; i < xlength(text); i++)
+	for(R_xlen_t i = 0; i < XLENGTH(text); i++)
 	    Rconn_printf(con, "%s%s",
 			 useBytes ? CHAR(STRING_ELT(text, i)) :
 			 translateChar0(STRING_ELT(text, i)), ssep);
@@ -3823,7 +3819,7 @@
 
     args = CDR(args);
     swhat = CAR(args); args = CDR(args);
-    if(!isString(swhat) || length(swhat) != 1)
+    if(!isString(swhat) || LENGTH(swhat) != 1)
 	error(_("invalid '%s' argument"), "what");
     what = CHAR(STRING_ELT(swhat, 0)); /* ASCII */
     n = asVecSize(CAR(args)); args = CDR(args);
@@ -4508,7 +4504,7 @@
 	slen = 0;
     } else {
 	usesep = TRUE;
-	if (!isString(sep) || length(sep) != 1)
+	if (!isString(sep) || LENGTH(sep) != 1)
 	    error(_("invalid '%s' argument"), "sep");
 	if(useBytes)
 	    ssep = CHAR(STRING_ELT(sep, 0));
@@ -4692,7 +4688,7 @@
     if(!con->text)
 	error(_("can only push back on text-mode connections"));
     nexists = con->nPushBack;
-    if((n = length(stext)) > 0) {
+    if((n = LENGTH(stext)) > 0) {
 	if(nexists > 0)
 	    q = (char **) realloc(con->PushBack, (n+nexists)*sizeof(char *));
 	else
@@ -4720,6 +4716,7 @@
 {
     Rconnection con = NULL;
 
+    checkArity(op, args);
     con = getConnection(asInteger(CAR(args)));
     return ScalarInteger(con->nPushBack);
 }
@@ -4729,6 +4726,7 @@
     int j;
     Rconnection con = NULL;
 
+    checkArity(op, args);
     con = getConnection(asInteger(CAR(args)));
 
     if(con->nPushBack > 0) {
@@ -4969,26 +4967,22 @@
     SEXP scmd, sopen, ans, class, enc;
     char *class2 = "url";
     const char *url, *open;
-    int ncon, block, raw = 0, meth = 0, defmeth = 1;
-#ifdef Win32
-    int urlmeth = UseInternet2;
-#endif
+    int ncon, block, raw = 0, defmeth,
+	meth = 0, // 0: "default" | "internal" | "wininet", 1: "libcurl"
+	winmeth;  // 0: "internal", 1: "wininet" (Windows only)
     cetype_t ienc = CE_NATIVE;
     Rconnection con = NULL;
-#ifdef HAVE_INTERNET
-    UrlScheme type = HTTPsh;	/* -Wall */
-#endif
 
     checkArity(op, args);
     // --------- description
     scmd = CAR(args);
-    if(!isString(scmd) || length(scmd) != 1)
+    if(!isString(scmd) || LENGTH(scmd) != 1)
 	error(_("invalid '%s' argument"), "description");
-    if(length(scmd) > 1)
+    if(LENGTH(scmd) > 1)
 	warning(_("only first element of 'description' argument used"));
-    url = CHAR(STRING_ELT(scmd, 0)); /* ASCII */
 #ifdef Win32
-    if(PRIMVAL(op) == 1 && !IS_ASCII(STRING_ELT(scmd, 0)) ) {
+    winmeth = 1;
+    if(PRIMVAL(op) == 1 && !IS_ASCII(STRING_ELT(scmd, 0)) ) { // file(<non-ASCII>, *)
 	ienc = CE_UTF8;
 	url = translateCharUTF8(STRING_ELT(scmd, 0));
     } else {
@@ -4999,102 +4993,83 @@
 	    url = translateChar(STRING_ELT(scmd, 0));
     }
 #else
+    winmeth = 0;
     url = translateChar(STRING_ELT(scmd, 0));
 #endif
 
-#ifdef HAVE_INTERNET
-    if (strncmp(url, "http://", 7) == 0) type = HTTPsh;
-    else if (strncmp(url, "ftp://", 6) == 0) type = FTPsh;
-    else if (strncmp(url, "https://", 8) == 0) type = HTTPSsh;
-    // ftps:// is available via most libcurl.
-    else if (strncmp(url, "ftps://", 7) == 0) type = FTPSsh;
-#endif
+    UrlScheme type = HTTPsh;	/* -Wall */
+    Rboolean inet = TRUE;
+    if (strncmp(url, "http://", 7) == 0)
+	type = HTTPsh;
+    else if (strncmp(url, "ftp://", 6) == 0)
+	type = FTPsh;
+    else if (strncmp(url, "https://", 8) == 0)
+	type = HTTPSsh;
+    // ftps:// is available via most libcurl, only
+    // The internal and wininet methods will create a connection
+    // but refuse to open it so as from R 3.2.0 we switch to libcurl
+    else if (strncmp(url, "ftps://", 7) == 0)
+	type = FTPSsh;
+    else
+	inet = FALSE; // file:// URL or a file path
 
     // --------- open
     sopen = CADR(args);
-    if(!isString(sopen) || length(sopen) != 1)
+    if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
     // --------- blocking
     block = asLogical(CADDR(args));
     if(block == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "blocking");
+    // --------- encoding
     enc = CADDDR(args);
-    if(!isString(enc) || length(enc) != 1 ||
+    if(!isString(enc) || LENGTH(enc) != 1 ||
        strlen(CHAR(STRING_ELT(enc, 0))) > 100) /* ASCII */
 	error(_("invalid '%s' argument"), "encoding");
-    if(PRIMVAL(op) == 1) {
-	// --------- raw, for file() only
-	raw = asLogical(CAD4R(args));
-	if(raw == NA_LOGICAL)
-	    error(_("invalid '%s' argument"), "raw");
-    }
 
-    if(PRIMVAL(op) == 0) { // url()
-	// --------- method
-	const char *cmeth = CHAR(asChar(CAD4R(args)));
-	meth = streql(cmeth, "libcurl");
-	defmeth = streql(cmeth, "default");
-	if (streql(cmeth, "wininet")) {
+    // --------- method
+    const char *cmeth = CHAR(asChar(CAD4R(args)));
+    meth = streql(cmeth, "libcurl"); // 1 if "libcurl", else 0
+    defmeth = streql(cmeth, "default");
+    if (streql(cmeth, "wininet")) {
 #ifdef Win32
-	    urlmeth = 1;
+	winmeth = 1;  // it already was as this is the default
 #else
-	    error(_("method = \"wininet\" is only supported on Windows"));
-#endif
-	}
-#ifdef Win32
-	else if (streql(cmeth, "internal")) urlmeth = 0;
+	error(_("method = \"wininet\" is only supported on Windows"));
 #endif
-    } else { // file(), look at option.
-	SEXP opt = GetOption1(install("url.method"));
-	if (isString(opt) && LENGTH(opt) >= 1) {
-	    const char *val = CHAR(STRING_ELT(opt, 0));
-	    defmeth = streql(val, "default");
-	    if (streql(val, "libcurl")) meth = 1;
+    }
 #ifdef Win32
-	    if (streql(val, "wininet")) urlmeth = 1;
+    else if (streql(cmeth, "internal")) winmeth = 0;
 #endif
-	}
+
+    // --------- raw, for file() only
+    if(PRIMVAL(op) == 1) {
+	raw = asLogical(CAD4R(CDR(args)));
+	if(raw == NA_LOGICAL)
+	    error(_("invalid '%s' argument"), "raw");
     }
 
     if(!meth) {
-	if (strncmp(url, "ftps://", 7) == 0)
-#ifdef HAVE_CURL_CURL_H
-	{
-	    if(!defmeth) {
-		// We did not check ftps protocol support
-		REprintf("ftps:// URLs are not supported by method \"internal\": trying \"libcurl\"\n");
-		R_FlushConsole();
-	    }
-	    meth = 1;
-	}
-#else
-	error("ftps:// URLs are not supported");
+	if (strncmp(url, "ftps://", 7) == 0) {
+#ifdef HAVE_LIBCURL
+	    if (defmeth) meth = 1; else
 #endif
+		error("ftps:// URLs are not supported by this method");
+	}
 #ifdef Win32
-	if (!urlmeth && strncmp(url, "https://", 8) == 0) {
-	    if(!defmeth) {
-		REprintf("https:// URLs are not supported by method \"internal\": using \"wininet\"\n");
-		R_FlushConsole();
-	    }
-	    urlmeth = 1;
+	if (!winmeth && strncmp(url, "https://", 8) == 0) {
+# ifdef HAVE_LIBCURL
+	    if (defmeth) meth = 1; else
+# endif
+		error("https:// URLs are not supported by this method");
 	}
-	//   error("for https:// URLs use setInternet2(TRUE)");
-#else
-	if (strncmp(url, "https://", 8) == 0)
-# ifdef HAVE_CURL_CURL_H
-	{
-	    // this is slightly optimistic:
-	    // we did not check the libcurl build supports https
-	    if(!defmeth) {
-		REprintf("https:// URLs are not supported by method \"internal\": trying \"libcurl\"\n");
-		R_FlushConsole();
-	    }
-	    meth = 1;
+#else // Unix
+	if (strncmp(url, "https://", 8) == 0) {
+	    // We check the libcurl build does support https as from R 3.3.0
+	    if (defmeth) meth = 1; else
+		error("https:// URLs are not supported by the \"internal\" method");
 	}
-# else
-	error("https:// URLs are not supported");
-# endif
 #endif
     }
 
@@ -5108,27 +5083,17 @@
 #endif
 	con = newfile(url + nh, ienc, strlen(open) ? open : "r", raw);
 	class2 = "file";
-#ifdef HAVE_INTERNET
-	// we could pass others to libcurl.
-    } else if (strncmp(url, "http://", 7) == 0 ||
-	       strncmp(url, "https://", 8) == 0 ||
-	       strncmp(url, "ftp://", 6) == 0 ||
-	       strncmp(url, "ftps://", 7) == 0) {
+    } else if (inet) {
 	if(meth) {
-#ifdef HAVE_CURL_CURL_H
+# ifdef HAVE_LIBCURL
 	    con = R_newCurlUrl(url, strlen(open) ? open : "r", 0);
-#else
+# else
 	    error("url(method = \"libcurl\") is not supported on this platform");
-#endif
+# endif
 	} else {
-#ifdef Win32
-	    con = R_newurl(url, strlen(open) ? open : "r", urlmeth);
-#else
-	    con = R_newurl(url, strlen(open) ? open : "r", 0);
-#endif
+	    con = R_newurl(url, strlen(open) ? open : "r", winmeth);
 	    ((Rurlconn)con->private)->type = type;
 	}
-#endif
     } else {
 	if(PRIMVAL(op) == 1) { /* call to file() */
 	    if(strlen(url) == 0) {
@@ -5188,7 +5153,7 @@
 		    con = newfile(url, ienc, strlen(open) ? open : "r", raw);
 	    }
 	    class2 = "file";
-	} else {
+	} else { // url()
 	    error(_("URL scheme unsupported by this method"));
 	}
     }
@@ -5244,6 +5209,11 @@
     return con->read(buf, 1, n, con);
 }
 
+Rconnection R_GetConnection(SEXP sConn) {
+    if (!inherits(sConn, "connection")) error(_("invalid connection"));
+    return getConnection(asInteger(sConn));
+}
+
 /* ------------------- (de)compression functions  --------------------- */
 
 /* Code for gzcon connections is modelled on gzio.c from zlib 1.2.3 */
@@ -5512,6 +5482,7 @@
     int icon, level, allow;
     Rconnection incon = NULL, new = NULL;
     char *m, *mode = NULL /* -Wall */,  description[1000];
+    Rboolean text;
 
     checkArity(op, args);
     if(!inherits(CAR(args), "connection"))
@@ -5523,7 +5494,10 @@
     allow = asLogical(CADDR(args));
     if(allow == NA_INTEGER)
 	error(_("'allowNonCompression' must be TRUE or FALSE"));
-
+    text = asLogical(CADDDR(args));
+    if(text == NA_INTEGER)
+        error(_("'text' must be TRUE or FALSE"));
+    
     if(incon->isGzcon) {
 	warning(_("this is already a 'gzcon' connection"));
 	return CAR(args);
@@ -5554,7 +5528,7 @@
 	error(_("allocation of 'gzcon' connection failed"));
     }
     init_con(new, description, CE_NATIVE, mode);
-    new->text = FALSE;
+    new->text = text;
     new->isGzcon = TRUE;
     new->open = &gzcon_open;
     new->close = &gzcon_close;
diff -Nru r-base-3.2.3/src/main/context.c r-base-3.3.1/src/main/context.c
--- r-base-3.2.3/src/main/context.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/context.c	2016-03-16 23:04:17.000000000 +0000
@@ -122,7 +122,7 @@
     RCNTXT *c;
 
     for (c = R_GlobalContext; c != cptr; c = c->nextcontext) {
-        // a user embedding R incorrectly triggered this (PR#15420)
+	// a user embedding R incorrectly triggered this (PR#15420)
 	if (c == NULL)
 	    error("bad target context--should NEVER happen if R was called correctly");
 	if (c->cend != NULL) {
@@ -160,14 +160,12 @@
 
 /* R_restore_globals - restore global variables from a target context
    before a LONGJMP.  The target context itself is not restored here
-   since this is done slightly differently in jumpfun below, in
-   errors.c:jump_now, and in main.c:ParseBrowser.  Eventually these
-   three should be unified so there is only one place where a LONGJMP
-   occurs. */
+   since this is done in R_jumpctxt below. */
 
-void attribute_hidden R_restore_globals(RCNTXT *cptr)
+static void R_restore_globals(RCNTXT *cptr)
 {
     R_PPStackTop = cptr->cstacktop;
+    R_GCEnabled = cptr->gcenabled;
     R_EvalDepth = cptr->evaldepth;
     vmaxset(cptr->vmax);
     R_interrupts_suspended = cptr->intsusp;
@@ -190,32 +188,49 @@
     R_Srcref = cptr->srcref;
 }
 
+static RCNTXT *first_jump_target(RCNTXT *cptr, int mask)
+{
+    RCNTXT *c;
+
+    for (c = R_GlobalContext; c && c != cptr; c = c->nextcontext) {
+	if (c->cloenv != R_NilValue && c->conexit != R_NilValue) {
+	    c->jumptarget = cptr;
+	    c->jumpmask = mask;
+	    return c;
+	}
+    }
+    return cptr;
+}
 
-/* jumpfun - jump to the named context */
+/* R_jumpctxt - jump to the named context */
 
-static void NORET jumpfun(RCNTXT * cptr, int mask, SEXP val)
+void attribute_hidden NORET R_jumpctxt(RCNTXT * targetcptr, int mask, SEXP val)
 {
     Rboolean savevis = R_Visible;
+    RCNTXT *cptr;
 
-    /* run onexit/cend code for all contexts down to but not including
-       the jump target */
-    PROTECT(val);
+    /* find the target for the first jump -- either an intermediate
+       context with an on.exit action to run or the final target if
+       there are no intermediate on.exit actions */
+    cptr = first_jump_target(targetcptr, mask);
+
+    /* run cend code for all contexts down to but not including
+       the first jump target */
     cptr->returnValue = val;/* in case the on.exit code wants to see it */
     R_run_onexits(cptr);
-    UNPROTECT(1);
     R_Visible = savevis;
 
     R_ReturnedValue = val;
-    R_GlobalContext = cptr; /* this used to be set to
-			       cptr->nextcontext for non-toplevel
-			       jumps (with the context set back at the
-			       SETJMP for restarts).  Changing this to
-			       always using cptr as the new global
-			       context should simplify some code and
-			       perhaps allow loops to be handled with
-			       fewer SETJMP's.  LT */
+    R_GlobalContext = cptr;
     R_restore_globals(R_GlobalContext);
 
+    /* if we are in the process of handling a C stack overflow we need
+       to restore the C stack limit before the jump */
+    if (R_OldCStackLimit != 0) {
+	R_CStackLimit = R_OldCStackLimit;
+	R_OldCStackLimit = 0;
+    }
+
     LONGJMP(cptr->cjmpbuf, mask);
 }
 
@@ -228,6 +243,7 @@
 		  SEXP promargs, SEXP callfun)
 {
     cptr->cstacktop = R_PPStackTop;
+    cptr->gcenabled = R_GCEnabled;
     cptr->evaldepth = R_EvalDepth;
     cptr->callflag = flags;
     cptr->call = syscall;
@@ -250,6 +266,8 @@
     cptr->browserfinish = R_GlobalContext->browserfinish;
     cptr->nextcontext = R_GlobalContext;
     cptr->returnValue = NULL;
+    cptr->jumptarget = NULL;
+    cptr->jumpmask = 0;
 
     R_GlobalContext = cptr;
 }
@@ -275,6 +293,10 @@
     }
     if (R_ExitContext == cptr)
 	R_ExitContext = NULL;
+    /* continue jumping if this was reached as an intermetiate jump */
+    if (cptr->jumptarget)
+	R_jumpctxt(cptr->jumptarget, cptr->jumpmask, cptr->returnValue);
+
     R_GlobalContext = cptr->nextcontext;
 }
 
@@ -290,7 +312,7 @@
 	     cptr != NULL && cptr->callflag != CTXT_TOPLEVEL;
 	     cptr = cptr->nextcontext)
 	    if (cptr->callflag & CTXT_LOOP && cptr->cloenv == env )
-		jumpfun(cptr, mask, val);
+		R_jumpctxt(cptr, mask, val);
 	error(_("no loop for break/next, jumping to top level"));
     }
     else {				/* return; or browser */
@@ -298,7 +320,7 @@
 	     cptr != NULL && cptr->callflag != CTXT_TOPLEVEL;
 	     cptr = cptr->nextcontext)
 	    if ((cptr->callflag & mask) && cptr->cloenv == env)
-		jumpfun(cptr, mask, val);
+		R_jumpctxt(cptr, mask, val);
 	error(_("no function to return from, jumping to top level"));
     }
 }
@@ -310,8 +332,8 @@
 	 cptr != NULL && cptr->callflag != CTXT_TOPLEVEL;
 	 cptr = cptr->nextcontext) {
 	if (cptr == target)
-	    jumpfun(cptr, mask, val);
-        if (cptr == R_ExitContext)
+	    R_jumpctxt(cptr, mask, val);
+	if (cptr == R_ExitContext)
 	    R_ExitContext = NULL;
     }
     error(_("target context is not on the stack"));
@@ -468,32 +490,6 @@
     return R_NilValue;	/* just for -Wall */
 }
 
-/* some real insanity to keep Duncan sane */
-
-/* This should find the caller's environment (it's a .Internal) and
-   then get the context of the call that owns the environment.  As it
-   is, it will restart the wrong function if used in a promise.
-   L.T. */
-SEXP attribute_hidden do_restart(SEXP call, SEXP op, SEXP args, SEXP rho)
-{
-    RCNTXT *cptr;
-
-    checkArity(op, args);
-
-    if( !isLogical(CAR(args)) || LENGTH(CAR(args))!= 1 )
-	return(R_NilValue);
-    for(cptr = R_GlobalContext->nextcontext; cptr!= R_ToplevelContext;
-	    cptr = cptr->nextcontext) {
-	if (cptr->callflag & CTXT_FUNCTION) {
-	    SET_RESTART_BIT_ON(cptr->callflag);
-	    break;
-	}
-    }
-    if( cptr == R_ToplevelContext )
-	error(_("no function to restart"));
-    return(R_NilValue);
-}
-
 /* count how many contexts of the specified type are present on the stack */
 /* browser contexts are a bit special because they are transient and for  */
 /* any closure context with the debug bit set one will be created; so we  */
@@ -504,13 +500,13 @@
 
     cptr = R_GlobalContext;
     while( cptr != R_ToplevelContext) {
-        if( cptr->callflag == ctxttype )
-            n++;
-        else if( browser ) {
-           if(cptr->callflag & CTXT_FUNCTION && RDEBUG(cptr->cloenv) )
-              n++;
-        }
-        cptr = cptr->nextcontext;
+	if( cptr->callflag == ctxttype )
+	    n++;
+	else if( browser ) {
+	   if(cptr->callflag & CTXT_FUNCTION && RDEBUG(cptr->cloenv) )
+	      n++;
+	}
+	cptr = cptr->nextcontext;
     }
     return n;
 }
@@ -532,50 +528,50 @@
     /* first find the closest  browser context */
     cptr = R_GlobalContext;
     while (cptr != R_ToplevelContext) {
-        if (cptr->callflag == CTXT_BROWSER) {
-                break;
-        }
-        cptr = cptr->nextcontext;
+	if (cptr->callflag == CTXT_BROWSER) {
+		break;
+	}
+	cptr = cptr->nextcontext;
     }
     /* error if not a browser context */
 
     if( !(cptr->callflag == CTXT_BROWSER) )
-        error(_("no browser context to query"));
+	error(_("no browser context to query"));
 
     switch (PRIMVAL(op)) {
     case 1: /* text */
     case 2: /* condition */
-        /* first rewind to the right place if needed */
-        /* note we want n>1, as we have already      */
-        /* rewound to the first context              */
-        if( n > 1 ) {
-           while (cptr != R_ToplevelContext && n > 0 ) {
-               if (cptr->callflag == CTXT_BROWSER) {
-                   n--;
-                   break;
-               }
-               cptr = cptr->nextcontext;
-           }
-        }
-        if( !(cptr->callflag == CTXT_BROWSER) )
-           error(_("not that many calls to browser are active"));
-
-        if( PRIMVAL(op) == 1 )
-            rval = CAR(cptr->promargs);
-        else
-            rval = CADR(cptr->promargs);
-        break;
+	/* first rewind to the right place if needed */
+	/* note we want n>1, as we have already      */
+	/* rewound to the first context              */
+	if( n > 1 ) {
+	   while (cptr != R_ToplevelContext && n > 0 ) {
+	       if (cptr->callflag == CTXT_BROWSER) {
+		   n--;
+		   break;
+	       }
+	       cptr = cptr->nextcontext;
+	   }
+	}
+	if( !(cptr->callflag == CTXT_BROWSER) )
+	   error(_("not that many calls to browser are active"));
+
+	if( PRIMVAL(op) == 1 )
+	    rval = CAR(cptr->promargs);
+	else
+	    rval = CADR(cptr->promargs);
+	break;
     case 3: /* turn on debugging n levels up */
-        while ( (cptr != R_ToplevelContext) && n > 0 ) {
-            if (cptr->callflag & CTXT_FUNCTION)
-                  n--;
-            cptr = cptr->nextcontext;
-        }
-        if( !(cptr->callflag & CTXT_FUNCTION) )
-           error(_("not that many functions on the call stack"));
-        else
-           SET_RDEBUG(cptr->cloenv, 1);
-        break;
+	while ( (cptr != R_ToplevelContext) && n > 0 ) {
+	    if (cptr->callflag & CTXT_FUNCTION)
+		  n--;
+	    cptr = cptr->nextcontext;
+	}
+	if( !(cptr->callflag & CTXT_FUNCTION) )
+	   error(_("not that many functions on the call stack"));
+	else
+	   SET_RDEBUG(cptr->cloenv, 1);
+	break;
     }
     return(rval);
 }
diff -Nru r-base-3.2.3/src/main/cum.c r-base-3.3.1/src/main/cum.c
--- r-base-3.2.3/src/main/cum.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/cum.c	2016-03-16 23:04:16.000000000 +0000
@@ -29,7 +29,7 @@
 {
     LDOUBLE sum = 0.;
     double *rx = REAL(x), *rs = REAL(s);
-    for (R_xlen_t i = 0 ; i < xlength(x) ; i++) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++) {
 	if (ISNAN(rx[i])) break;
 	sum += rx[i];
 	rs[i] = (double) sum;
@@ -42,7 +42,7 @@
 {
     int *ix = INTEGER(x), *is = INTEGER(s);
     double sum = 0.0;
-    for (R_xlen_t i = 0 ; i < xlength(x) ; i++) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++) {
 	if (ix[i] == NA_INTEGER) break;
 	sum += ix[i];
 	if(sum > INT_MAX || sum < 1 + INT_MIN) { /* INT_MIN is NA_INTEGER */
@@ -59,7 +59,7 @@
     Rcomplex sum;
     sum.r = 0;
     sum.i = 0;
-    for (R_xlen_t i = 0 ; i < xlength(x) ; i++) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++) {
 	sum.r += COMPLEX(x)[i].r;
 	sum.i += COMPLEX(x)[i].i;
 	COMPLEX(s)[i].r = sum.r;
@@ -70,11 +70,10 @@
 
 static SEXP cumprod(SEXP x, SEXP s)
 {
-    int i;
     LDOUBLE prod;
     double *rx = REAL(x), *rs = REAL(s);
     prod = 1.0;
-    for (i = 0 ; i < length(x) ; i++) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++) {
 	prod *= rx[i];
 	rs[i] = (double) prod;
     }
@@ -86,7 +85,7 @@
     Rcomplex prod, tmp;
     prod.r = 1;
     prod.i = 0;
-    for (R_xlen_t i = 0 ; i < xlength(x) ; i++) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++) {
 	tmp.r = prod.r;
 	tmp.i = prod.i;
 	prod.r = COMPLEX(x)[i].r * tmp.r - COMPLEX(x)[i].i * tmp.i;
@@ -101,7 +100,7 @@
 {
     double max, *rx = REAL(x), *rs = REAL(s);
     max = R_NegInf;
-    for (R_xlen_t i = 0 ; i < xlength(x) ; i++) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++) {
 	if(ISNAN(rx[i]) || ISNAN(max))
 	    max = max + rx[i];  /* propagate NA and NaN */
 	else
@@ -115,7 +114,7 @@
 {
     double min, *rx = REAL(x), *rs = REAL(s);
     min = R_PosInf; /* always positive, not NA */
-    for (R_xlen_t i = 0 ; i < xlength(x) ; i++ ) {
+    for (R_xlen_t i = 0 ; i < XLENGTH(x) ; i++ ) {
 	if (ISNAN(rx[i]) || ISNAN(min))
 	    min = min + rx[i];  /* propagate NA and NaN */
 	else
@@ -132,7 +131,7 @@
 	return s; // all NA
     int *is = INTEGER(s), max = ix[0];
     is[0] = max;
-    for (R_xlen_t i = 1 ; i < xlength(x) ; i++) {
+    for (R_xlen_t i = 1 ; i < XLENGTH(x) ; i++) {
 	if(ix[i] == NA_INTEGER) break;
 	is[i] = max = (max > ix[i]) ? max : ix[i];
     }
@@ -144,7 +143,7 @@
     int *ix = INTEGER(x), *is = INTEGER(s);
     int min = ix[0];
     is[0] = min;
-    for (R_xlen_t i = 1 ; i < xlength(x) ; i++ ) {
+    for (R_xlen_t i = 1 ; i < XLENGTH(x) ; i++ ) {
 	if(ix[i] == NA_INTEGER) break;
 	is[i] = min = (min < ix[i]) ? min : ix[i];
     }
diff -Nru r-base-3.2.3/src/main/datetime.c r-base-3.3.1/src/main/datetime.c
--- r-base-3.2.3/src/main/datetime.c	2015-08-25 22:18:46.000000000 +0000
+++ r-base-3.3.1/src/main/datetime.c	2016-03-16 23:04:18.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2015  The R Core Team.
+ *  Copyright (C) 2000-2016  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -99,11 +99,7 @@
 
 typedef struct tm stm;
 #define R_tzname tzname
-# if defined(__CYGWIN__)
-extern __declspec(dllimport) char *tzname[2];
-# else
 extern char *tzname[2];
-# endif
 
 #endif
 
@@ -668,7 +664,7 @@
 }
 
 
-             /* --------- R interfaces --------- */
+	     /* --------- R interfaces --------- */
 
 // We assume time zone names/abbreviations are ASCII, as all known ones are.
 
@@ -862,24 +858,23 @@
 
 SEXP attribute_hidden do_formatPOSIXlt(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    SEXP x, sformat, ans, tz;
-    R_xlen_t n = 0, m, N, nlen[9];
-    int UseTZ, settz = 0;
+    int settz = 0;
     char buff[300];
     char oldtz[1001] = "";
     stm tm;
 
     checkArity(op, args);
-    PROTECT(x = duplicate(CAR(args))); /* coerced below */
+    SEXP x = PROTECT(duplicate(CAR(args))); /* coerced below */
     if(!isVectorList(x) || LENGTH(x) < 9)
 	error(_("invalid '%s' argument"), "x");
+    SEXP sformat;
     if(!isString((sformat = CADR(args))) || XLENGTH(sformat) == 0)
 	error(_("invalid '%s' argument"), "format");
-    m = XLENGTH(sformat);
-    UseTZ = asLogical(CADDR(args));
+    R_xlen_t m = XLENGTH(sformat);
+    int UseTZ = asLogical(CADDR(args));
     if(UseTZ == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "usetz");
-    tz = getAttrib(x, install("tzone"));
+    SEXP tz = getAttrib(x, install("tzone"));
 
     const char *tz1;
     if (!isNull(tz) && strlen(tz1 = CHAR(STRING_ELT(tz, 0)))) {
@@ -898,10 +893,12 @@
      */
     memset(&tm, 0, sizeof(tm));
 
-    /* coerce fields to integer or real, find length of longest one */
+    /* coerce fields, find length of longest one */
+    R_xlen_t n = 0, nlen[9];
     for(int i = 0; i < 9; i++) {
 	nlen[i] = XLENGTH(VECTOR_ELT(x, i));
 	if(nlen[i] > n) n = nlen[i];
+	// real for 'sec', the first; integer for the rest:
 	SET_VECTOR_ELT(x, i, coerceVector(VECTOR_ELT(x, i),
 					  i > 0 ? INTSXP : REALSXP));
     }
@@ -910,10 +907,15 @@
 	    if(nlen[i] == 0)
 		error(_("zero-length component in non-empty \"POSIXlt\" structure"));
     }
-    if(n > 0) N = (m > n) ? m:n; else N = 0;
-    PROTECT(ans = allocVector(STRSXP, N));
+    R_xlen_t N = (n > 0) ? ((m > n) ? m : n) : 0;
+    SEXP ans = PROTECT(allocVector(STRSXP, N));
     char tm_zone[20];
-    Rboolean have_zone = LENGTH(x) >= 10 && LENGTH(VECTOR_ELT(x, 9)) == n;
+#ifdef HAVE_TM_GMTOFF
+    Rboolean have_zone = LENGTH(x) >= 11 && XLENGTH(VECTOR_ELT(x, 9)) == n &&
+	XLENGTH(VECTOR_ELT(x, 10)) == n;
+#else
+    Rboolean have_zone = LENGTH(x) >= 10 && XLENGTH(VECTOR_ELT(x, 9)) == n;
+#endif
     for(R_xlen_t i = 0; i < N; i++) {
 	double secs = REAL(VECTOR_ELT(x, 0))[i%nlen[0]], fsecs = floor(secs);
 	// avoid (int) NAN
@@ -927,8 +929,8 @@
 	tm.tm_yday  = INTEGER(VECTOR_ELT(x, 7))[i%nlen[7]];
 	tm.tm_isdst = INTEGER(VECTOR_ELT(x, 8))[i%nlen[8]];
 	if(have_zone) {
-	    strncpy(tm_zone, CHAR(STRING_ELT(VECTOR_ELT(x, 9), i)), 20);
-            tm_zone[20 - 1] = '\0';
+	    strncpy(tm_zone, CHAR(STRING_ELT(VECTOR_ELT(x, 9), i%n)), 20);
+	    tm_zone[20 - 1] = '\0';
 #ifdef HAVE_TM_ZONE
 	    tm.tm_zone = tm_zone;
 #elif defined USE_INTERNAL_MKTIME
@@ -946,79 +948,78 @@
 	   tm.tm_hour == NA_INTEGER || tm.tm_mday == NA_INTEGER ||
 	   tm.tm_mon == NA_INTEGER || tm.tm_year == NA_INTEGER) {
 	    SET_STRING_ELT(ans, i, NA_STRING);
+	} else if(validate_tm(&tm) < 0) {
+	    SET_STRING_ELT(ans, i, NA_STRING);
 	} else {
-	    if(validate_tm(&tm) < 0) SET_STRING_ELT(ans, i, NA_STRING);
-	    else {
-		const char *q = translateChar(STRING_ELT(sformat, i%m));
-		int n = (int) strlen(q) + 50;
-		char buf2[n];
-		const char *p;
+	    const char *q = translateChar(STRING_ELT(sformat, i%m));
+	    int nn = (int) strlen(q) + 50;
+	    char buf2[nn];
+	    const char *p;
 #ifdef OLD_Win32
-		/* We want to override Windows' TZ names */
-		p = strstr(q, "%Z");
-		if (p) {
-		    memset(buf2, 0, n);
-		    strncpy(buf2, q, p - q);
-		    if(have_zone)
-			strcat(buf2, tm_zone);
-		    else
-			strcat(buf2, tm.tm_isdst > 0 ? R_tzname[1] : R_tzname[0]);
-		    strcat(buf2, p+2);
-		} else
-#endif
-		    strcpy(buf2, q);
-
-		p = strstr(q, "%OS");
-		if(p) {
-		    /* FIXME some of this should be outside the loop */
-		    int ns, nused = 4;
-		    char *p2 = strstr(buf2, "%OS");
-		    *p2 = '\0';
-		    ns = *(p+3) - '0';
-		    if(ns < 0 || ns > 9) { /* not a digit */
-			ns = asInteger(GetOption1(install("digits.secs")));
-			if(ns == NA_INTEGER) ns = 0;
-			nused = 3;
-		    }
-		    if(ns > 6) ns = 6;
-		    if(ns > 0) {
-			/* truncate to avoid nuisances such as PR#14579 */
-			double s = secs, t = Rexp10((double) ns);
-			s = ((int) (s*t))/t;
-			sprintf(p2, "%0*.*f", ns+3, ns, s);
-			strcat(buf2, p+nused);
-		    } else {
-			strcat(p2, "%S");
-			strcat(buf2, p+nused);
-		    }
+	    /* We want to override Windows' TZ names */
+	    p = strstr(q, "%Z");
+	    if (p) {
+		memset(buf2, 0, nn);
+		strncpy(buf2, q, p - q);
+		if(have_zone)
+		    strcat(buf2, tm_zone);
+		else
+		    strcat(buf2, tm.tm_isdst > 0 ? R_tzname[1] : R_tzname[0]);
+		strcat(buf2, p+2);
+	    } else
+#endif
+		strcpy(buf2, q);
+
+	    p = strstr(q, "%OS");
+	    if(p) {
+		/* FIXME some of this should be outside the loop */
+		int ns, nused = 4;
+		char *p2 = strstr(buf2, "%OS");
+		*p2 = '\0';
+		ns = *(p+3) - '0';
+		if(ns < 0 || ns > 9) { /* not a digit */
+		    ns = asInteger(GetOption1(install("digits.secs")));
+		    if(ns == NA_INTEGER) ns = 0;
+		    nused = 3;
+		}
+		if(ns > 6) ns = 6;
+		if(ns > 0) {
+		    /* truncate to avoid nuisances such as PR#14579 */
+		    double s = secs, t = Rexp10((double) ns);
+		    s = ((int) (s*t))/t;
+		    sprintf(p2, "%0*.*f", ns+3, ns, s);
+		    strcat(buf2, p+nused);
+		} else {
+		    strcat(p2, "%S");
+		    strcat(buf2, p+nused);
 		}
-		// The overflow behaviour is not determined by C99.
-		// We assume truncation, and ensure termination.
+	    }
+	    // The overflow behaviour is not determined by C99.
+	    // We assume truncation, and ensure termination.
 #ifdef USE_INTERNAL_MKTIME
-		R_strftime(buff, 256, buf2, &tm);
+	    R_strftime(buff, 256, buf2, &tm);
 #else
-		strftime(buff, 256, buf2, &tm);
+	    strftime(buff, 256, buf2, &tm);
 #endif
-		buff[256] = '\0';
-		// Now assume tzone abbreviated name is < 40 bytes,
-		// but they are currently 3 or 4 bytes.
-		if(UseTZ) {
-		    if(LENGTH(x) >= 10) {
-			const char *p = CHAR(STRING_ELT(VECTOR_ELT(x, 9), i));
-			if(strlen(p)) {strcat(buff, " "); strcat(buff, p);}
-		    } else if(!isNull(tz)) {
-			int ii = 0;
-			if(LENGTH(tz) == 3) {
-			    if(tm.tm_isdst > 0) ii = 2;
-			    else if(tm.tm_isdst == 0) ii = 1;
-			    else ii = 0; /* Use base timezone name */
-			}
-			const char *p = CHAR(STRING_ELT(tz, ii));
-			if(strlen(p)) {strcat(buff, " "); strcat(buff, p);}
+	    buff[256] = '\0';
+	    // Now assume tzone abbreviated name is < 40 bytes,
+	    // but they are currently 3 or 4 bytes.
+	    if(UseTZ) {
+		if(have_zone) {
+		    const char *p = CHAR(STRING_ELT(VECTOR_ELT(x, 9), i%n));
+		    if(strlen(p)) {strcat(buff, " "); strcat(buff, p);}
+		} else if(!isNull(tz)) {
+		    int ii = 0;
+		    if(LENGTH(tz) == 3) {
+			if(tm.tm_isdst > 0) ii = 2;
+			else if(tm.tm_isdst == 0) ii = 1;
+			else ii = 0; /* Use base timezone name */
 		    }
+		    const char *p = CHAR(STRING_ELT(tz, ii));
+		    if(strlen(p)) {strcat(buff, " "); strcat(buff, p);}
 		}
-		SET_STRING_ELT(ans, i, mkChar(buff));
 	    }
+	    SET_STRING_ELT(ans, i, mkChar(buff));
 	}
     }
     if(settz) reset_tz(oldtz);
diff -Nru r-base-3.2.3/src/main/debug.c r-base-3.3.1/src/main/debug.c
--- r-base-3.2.3/src/main/debug.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/debug.c	2016-03-16 23:04:15.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Langage for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998-2014   The R Core Team.
+ *  Copyright (C) 1998-2015   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,9 +40,10 @@
     }
     find_char_fun
 
-    if (TYPEOF(CAR(args)) != CLOSXP && TYPEOF(CAR(args)) != SPECIALSXP
-         &&  TYPEOF(CAR(args)) != BUILTINSXP )
-	errorcall(call, _("argument must be a closure"));
+    if (TYPEOF(CAR(args)) != CLOSXP &&
+	TYPEOF(CAR(args)) != SPECIALSXP &&
+	TYPEOF(CAR(args)) != BUILTINSXP)
+	errorcall(call, _("argument must be a function"));
     switch(PRIMVAL(op)) {
     case 0: // debug()
 	SET_RDEBUG(CAR(args), 1);
@@ -53,26 +54,25 @@
 	SET_RDEBUG(CAR(args), 0);
 	break;
     case 2: // isdebugged()
-        ans = ScalarLogical(RDEBUG(CAR(args)));
-        break;
+	ans = ScalarLogical(RDEBUG(CAR(args)));
+	break;
     case 3: // debugonce()
-        SET_RSTEP(CAR(args), 1);
-        break;
+	SET_RSTEP(CAR(args), 1);
+	break;
     }
     return ans;
 }
 
-/* primitives .primTrace and .primUntrace */
+/* primitives .primTrace() and .primUntrace() */
 SEXP attribute_hidden do_trace(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
-    check1arg(args, call, "x");
 
     find_char_fun
 
     if (TYPEOF(CAR(args)) != CLOSXP &&
-	TYPEOF(CAR(args)) != BUILTINSXP &&
-	TYPEOF(CAR(args)) != SPECIALSXP)
+	TYPEOF(CAR(args)) != SPECIALSXP &&
+	TYPEOF(CAR(args)) != BUILTINSXP)
 	    errorcall(call, _("argument must be a function"));
 
     switch(PRIMVAL(op)) {
@@ -175,11 +175,15 @@
 
 SEXP attribute_hidden NORET do_tracemem(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
+    check1arg(args, call, "x");
     errorcall(call, _("R was not compiled with support for memory profiling"));
 }
 
 SEXP attribute_hidden NORET do_untracemem(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
+    check1arg(args, call, "x");
     errorcall(call, _("R was not compiled with support for memory profiling"));
 }
 
@@ -223,7 +227,7 @@
     static SEXP do_retracemem_formals = NULL;
 
     if (do_retracemem_formals == NULL)
-        do_retracemem_formals = allocFormalsList2(install("x"),
+	do_retracemem_formals = allocFormalsList2(install("x"),
 						  R_PreviousSymbol);
 
     PROTECT(argList =  matchArgs(do_retracemem_formals, args, call));
diff -Nru r-base-3.2.3/src/main/deparse.c r-base-3.3.1/src/main/deparse.c
--- r-base-3.2.3/src/main/deparse.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/deparse.c	2016-03-16 23:04:15.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -129,6 +129,7 @@
     int maxlines;
     Rboolean active;
     int isS4;
+    Rboolean fnarg; /* fn argument, so parenthesize = as assignment */
 } LocalParseData;
 
 static SEXP deparse1WithCutoff(SEXP call, Rboolean abbrev, int cutoff,
@@ -544,13 +545,18 @@
 			if (arginfo.precedence == PREC_SUM)   /* binary +/- precedence upgraded as unary */
 			    arginfo.precedence = PREC_SIGN;
 		    case 2:
+			if (mainop.precedence == PREC_COMPARE && arginfo.precedence == PREC_COMPARE)
+		          return TRUE;     /*   a < b < c   is not legal syntax */
 			break;
 		    default:
 			return FALSE;
 		    }
+		case PP_SUBSET:
+		    if (mainop.kind == PP_DOLLAR)
+		    	return FALSE;
+		    /* fall through, don't break... */
 		case PP_ASSIGN:
 		case PP_ASSIGN2:
-		case PP_SUBSET:
 		case PP_UNARY:
 		case PP_DOLLAR:
 		    if (mainop.precedence > arginfo.precedence
@@ -568,10 +574,10 @@
 		    return FALSE;
 		}
 	    } else if (isUserBinop(CAR(arg))) {
-	        if (mainop.precedence > PREC_PERCENT
-	            || (mainop.precedence == PREC_PERCENT && left == mainop.rightassoc)) {
-	            return TRUE;
-	        }
+		if (mainop.precedence > PREC_PERCENT
+		    || (mainop.precedence == PREC_PERCENT && left == mainop.rightassoc)) {
+		    return TRUE;
+		}
 	    }
 	}
     }
@@ -641,6 +647,7 @@
 		    d->opts = localOpts;
 		}
 		print2buff(" = ", d);
+		d->fnarg = TRUE;
 		deparse2buff(CAR(a), d);
 	    }
 	    a = CDR(a);
@@ -708,18 +715,18 @@
 	    if (isUserBinop(op)) return TRUE;   /* %foo% */
 	    sym = SYMVALUE(op);
 	    if (TYPEOF(sym) == BUILTINSXP
-	        || TYPEOF(sym) == SPECIALSXP) {
-	        if (PPINFO(sym).precedence >= PREC_DOLLAR
-	            || PPINFO(sym).kind == PP_FUNCALL
-	            || PPINFO(sym).kind == PP_PAREN
-	            || PPINFO(sym).kind == PP_CURLY) return FALSE; /* x$f(z) or x[n](z) or f(z) or (f) or {f} */
-	        else return TRUE;		/* (f+g)(z) etc. */
+		|| TYPEOF(sym) == SPECIALSXP) {
+		if (PPINFO(sym).precedence >= PREC_SUBSET
+		    || PPINFO(sym).kind == PP_FUNCALL
+		    || PPINFO(sym).kind == PP_PAREN
+		    || PPINFO(sym).kind == PP_CURLY) return FALSE; /* x$f(z) or x[n](z) or f(z) or (f) or {f} */
+		else return TRUE;		/* (f+g)(z) etc. */
 	    }
 	    return FALSE;			/* regular function call */
 	 } else
 	    return TRUE;			/* something strange, like (1)(x) */
     } else
-        return TYPEOF(s) == CLOSXP;
+	return TYPEOF(s) == CLOSXP;
 }
 
 /* This is the recursive part of deparsing. */
@@ -731,9 +738,12 @@
 static void deparse2buff(SEXP s, LocalParseData *d)
 {
     PPinfo fop;
-    Rboolean lookahead = FALSE, lbreak = FALSE, parens;
+    Rboolean lookahead = FALSE, lbreak = FALSE, parens, fnarg = d->fnarg, 
+             outerparens, doquote;
     SEXP op, t;
     int localOpts = d->opts, i, n;
+    
+    d->fnarg = FALSE;
 
     if (!d->active) return;
 
@@ -744,7 +754,8 @@
 	print2buff("NULL", d);
 	break;
     case SYMSXP:
-	if (localOpts & QUOTEEXPRESSIONS) {
+	doquote = (localOpts & QUOTEEXPRESSIONS) && strlen(CHAR(PRINTNAME(s)));
+	if (doquote) {
 	    attr1(s, d);
 	    print2buff("quote(", d);
 	}
@@ -754,7 +765,7 @@
 	    print2buff(quotify(PRINTNAME(s), '`'), d);
 	else
 	    print2buff(CHAR(PRINTNAME(s)), d);
-	if (localOpts & QUOTEEXPRESSIONS) {
+	if (doquote) {
 	    print2buff(")", d);
 	    attr2(s, d);
 	}
@@ -971,7 +982,11 @@
 		    print2buff(")", d);
 		    break;
 		case PP_SUBSET:
+		    if ((parens = needsparens(fop, CAR(s), 1)))
+			print2buff("(", d);		
 		    deparse2buff(CAR(s), d);
+		    if (parens)
+			print2buff(")", d);		    
 		    if (PRIMVAL(SYMVALUE(op)) == 1)
 			print2buff("[", d);
 		    else
@@ -985,7 +1000,7 @@
 		case PP_FUNCALL:
 		case PP_RETURN:
 		    if (d->backtick)
-		        print2buff(quotify(PRINTNAME(op), '`'), d);
+			print2buff(quotify(PRINTNAME(op), '`'), d);
 		    else
 			print2buff(quotify(PRINTNAME(op), '"'), d);
 		    print2buff("(", d);
@@ -1023,6 +1038,8 @@
 		    break;
 		case PP_ASSIGN:
 		case PP_ASSIGN2:
+		    if ((outerparens = (fnarg && !strcmp(CHAR(PRINTNAME(op)), "="))))
+		    	print2buff("(", d);
 		    if ((parens = needsparens(fop, CAR(s), 1)))
 			print2buff("(", d);
 		    deparse2buff(CAR(s), d);
@@ -1036,6 +1053,8 @@
 		    deparse2buff(CADR(s), d);
 		    if (parens)
 			print2buff(")", d);
+		    if (outerparens)
+		    	print2buff(")", d);
 		    break;
 		case PP_DOLLAR:
 		    if ((parens = needsparens(fop, CAR(s), 1)))
@@ -1579,22 +1598,27 @@
 	    else if(d->backtick)
 		print2buff(quotify(PRINTNAME(s), '`'), d);
 	    else
-	        print2buff(quotify(PRINTNAME(s), '"'), d);
+		print2buff(quotify(PRINTNAME(s), '"'), d);
 
 	    if(formals) {
 		if (CAR(arglist) != R_MissingArg) {
 		    print2buff(" = ", d);
+		    d->fnarg = TRUE;
 		    deparse2buff(CAR(arglist), d);
 		}
 	    }
 	    else {
 		print2buff(" = ", d);
 		if (CAR(arglist) != R_MissingArg) {
+		    d->fnarg = TRUE;
 		    deparse2buff(CAR(arglist), d);
 		}
 	    }
 	}
-	else deparse2buff(CAR(arglist), d);
+	else {
+	  d->fnarg = TRUE;
+	  deparse2buff(CAR(arglist), d);
+	}
 	arglist = CDR(arglist);
 	if (arglist != R_NilValue) {
 	    print2buff(", ", d);
diff -Nru r-base-3.2.3/src/main/devices.c r-base-3.3.1/src/main/devices.c
--- r-base-3.2.3/src/main/devices.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/devices.c	2016-03-16 23:04:17.000000000 +0000
@@ -213,8 +213,9 @@
     else {
 	int i = from;
 	int prevDev = 0;
-	while ((i > 1) && (prevDev == 0))
-	    if (active[--i]) prevDev = i;
+	if (i < R_MaxDevices)
+	    while ((i > 1) && (prevDev == 0))
+		if (active[--i]) prevDev = i;
 	if (prevDev == 0) {
 	    /* start again from R_MaxDevices */
 	    i = R_MaxDevices;
diff -Nru r-base-3.2.3/src/main/dotcode.c r-base-3.3.1/src/main/dotcode.c
--- r-base-3.2.3/src/main/dotcode.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/dotcode.c	2016-03-16 23:04:17.000000000 +0000
@@ -2472,7 +2472,7 @@
 	    }
 	    if (s != arg) {
 		PROTECT(s);
-		DUPLICATE_ATTRIB(s, arg);
+		SHALLOW_DUPLICATE_ATTRIB(s, arg);
 		SET_VECTOR_ELT(ans, na, s);
 		UNPROTECT(1);
 	    }
diff -Nru r-base-3.2.3/src/main/dstruct.c r-base-3.3.1/src/main/dstruct.c
--- r-base-3.2.3/src/main/dstruct.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/dstruct.c	2016-03-16 23:04:17.000000000 +0000
@@ -40,7 +40,7 @@
     SEXPTYPE type = eval ? BUILTINSXP : SPECIALSXP;
     static SEXP PrimCache = NULL;
     static int FunTabSize = 0;
-
+    
     if (PrimCache == NULL) {
 	/* compute the number of entires in R_FunTab */
 	while (R_FunTab[FunTabSize].name)
diff -Nru r-base-3.2.3/src/main/duplicate.c r-base-3.3.1/src/main/duplicate.c
--- r-base-3.2.3/src/main/duplicate.c	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/duplicate.c	2016-03-16 23:04:15.000000000 +0000
@@ -27,6 +27,8 @@
 
 #include <R_ext/RS.h> /* S4 bit */
 
+#include "duplicate.h"
+
 /*  duplicate  -  object duplication  */
 
 /*  Because we try to maintain the illusion of call by
@@ -370,33 +372,26 @@
     R_xlen_t ns = XLENGTH(s), nt = XLENGTH(t);
     switch (sT) {
     case STRSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    SET_STRING_ELT(s, i, STRING_ELT(t, i % nt));
+	xcopyStringWithRecycle(s, t, 0, ns, nt);
 	break;
     case LGLSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    LOGICAL(s)[i] = LOGICAL(t)[i % nt];
+	xcopyLogicalWithRecycle(LOGICAL(s), LOGICAL(t), 0, ns, nt);
 	break;
     case INTSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    INTEGER(s)[i] = INTEGER(t)[i % nt];
+	xcopyIntegerWithRecycle(INTEGER(s), INTEGER(t), 0, ns, nt);
 	break;
     case REALSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    REAL(s)[i] = REAL(t)[i % nt];
+	xcopyRealWithRecycle(REAL(s), REAL(t), 0, ns, nt);
 	break;
     case CPLXSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    COMPLEX(s)[i] = COMPLEX(t)[i % nt];
+	xcopyComplexWithRecycle(COMPLEX(s), COMPLEX(t), 0, ns, nt);
 	break;
     case EXPRSXP:
     case VECSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    SET_VECTOR_ELT(s, i, VECTOR_ELT(t, i % nt));
+	xcopyVectorWithRecycle(s, t, 0, ns, nt);
 	break;
     case RAWSXP:
-	for (R_xlen_t i = 0; i < ns; i++)
-	    RAW(s)[i] = RAW(t)[i % nt];
+	xcopyRawWithRecycle(RAW(s), RAW(t), 0, ns, nt);
 	break;
     default:
 	UNIMPLEMENTED_TYPE("copyVector", s);
@@ -436,46 +431,38 @@
 void copyMatrix(SEXP s, SEXP t, Rboolean byrow)
 {
     int nr = nrows(s), nc = ncols(s);
-    R_xlen_t k = 0, nt = XLENGTH(t);
+    R_xlen_t nt = XLENGTH(t);
 
     if (byrow) {
-	R_xlen_t NR = nr;
 	switch (TYPEOF(s)) {
 	case STRSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    SET_STRING_ELT(s, i + j * NR, STRING_ELT(t, k++ % nt));
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		SET_STRING_ELT(s, didx, STRING_ELT(t, sidx));
 	    break;
 	case LGLSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    LOGICAL(s)[i + j * NR] = LOGICAL(t)[k++ % nt];
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		LOGICAL(s)[didx] = LOGICAL(t)[sidx];
 	    break;
 	case INTSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    INTEGER(s)[i + j * NR] = INTEGER(t)[k++ % nt];
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		INTEGER(s)[didx] = INTEGER(t)[sidx];
 	    break;
 	case REALSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    REAL(s)[i + j * NR] = REAL(t)[k++ % nt];
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		REAL(s)[didx] = REAL(t)[sidx];
 	    break;
 	case CPLXSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    COMPLEX(s)[i + j * NR] = COMPLEX(t)[k++ % nt];
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		COMPLEX(s)[didx] = COMPLEX(t)[sidx];
 	    break;
 	case EXPRSXP:
 	case VECSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    SET_VECTOR_ELT(s, i + j * NR, VECTOR_ELT(t, k++ % nt));
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		SET_VECTOR_ELT(s, didx, VECTOR_ELT(t, sidx));
 	    break;
 	case RAWSXP:
-	    for (int i = 0; i < nr; i++)
-		for (int j = 0; j < nc; j++)
-		    RAW(s)[i + j * NR] = RAW(t)[k++ % nt];
+	    FILL_MATRIX_BYROW_ITERATE(0, nr, nc, nt)
+		RAW(s)[didx] = RAW(t)[sidx];
 	    break;
 	default:
 	    UNIMPLEMENTED_TYPE("copyMatrix", s);
@@ -484,3 +471,87 @@
     else
 	copyVector(s, t);
 }
+
+#define COPY_WITH_RECYCLE(VALTYPE, TNAME) \
+void attribute_hidden \
+xcopy##TNAME##WithRecycle(VALTYPE *dst, VALTYPE *src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc) { \
+							\
+    if (nsrc >= n) { /* no recycle needed */		\
+	for(R_xlen_t i = 0; i < n; i++)		\
+	    dst[dstart + i] = src[i];			\
+	return;					\
+    }							\
+    if (nsrc == 1) {					\
+	VALTYPE val = src[0];				\
+	for(R_xlen_t i = 0; i < n; i++)			\
+	    dst[dstart + i] = val;			\
+	return;						\
+    }							\
+							\
+    /* recycle needed */					\
+    R_xlen_t sidx = 0;					\
+    for(R_xlen_t i = 0; i < n; i++, sidx++) {		\
+	if (sidx == nsrc) sidx = 0;			\
+	dst[dstart + i] = src[sidx];			\
+    }							\
+}
+
+COPY_WITH_RECYCLE(Rcomplex, Complex)	/* xcopyComplexWithRecycle */
+COPY_WITH_RECYCLE(int, Integer)		/* xcopyIntegerWithRecycle */
+COPY_WITH_RECYCLE(int, Logical)		/* xcopyLogicalWithRecycle */
+COPY_WITH_RECYCLE(Rbyte, Raw)		/* xcopyRawWithRecycle */
+COPY_WITH_RECYCLE(double, Real)		/* xcopyRealWithRecycle */
+
+#define COPY_ELT_WITH_RECYCLE(TNAME, GETELT, SETELT) \
+void attribute_hidden \
+xcopy##TNAME##WithRecycle(SEXP dst, SEXP src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc) { \
+							\
+    if (nsrc >= n) { /* no recycle needed */		\
+	for(R_xlen_t i = 0; i < n; i++)		\
+	    SETELT(dst, dstart + i, GETELT(src, i));	\
+	return;					\
+    }							\
+    if (nsrc == 1) {					\
+	SEXP val = GETELT(src, 0);			\
+	for(R_xlen_t i = 0; i < n; i++)			\
+	    SETELT(dst, dstart + i, val);		\
+	return;						\
+    }							\
+							\
+    /* recycle needed */					\
+    R_xlen_t sidx = 0;					\
+    for(R_xlen_t i = 0; i < n; i++, sidx++) {		\
+	if (sidx == nsrc) sidx = 0;			\
+	SETELT(dst, dstart + i, GETELT(src, sidx));	\
+    }							\
+}
+
+COPY_ELT_WITH_RECYCLE(String, STRING_ELT, SET_STRING_ELT) /* xcopyStringWithRecycle */
+COPY_ELT_WITH_RECYCLE(Vector, VECTOR_ELT, SET_VECTOR_ELT) /* xcopyVectorWithRecycle */
+
+#define FILL_WITH_RECYCLE(VALTYPE, TNAME) \
+void attribute_hidden xfill##TNAME##MatrixWithRecycle(VALTYPE *dst, VALTYPE *src,	\
+    R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows,		\
+    R_xlen_t cols, R_xlen_t nsrc) {				\
+								\
+    FILL_MATRIX_ITERATE(dstart, drows, srows, cols, nsrc)	\
+	dst[didx] = src[sidx];					\
+}
+
+FILL_WITH_RECYCLE(Rcomplex, Complex)	/* xfillComplexMatrixWithRecycle */
+FILL_WITH_RECYCLE(int, Integer)		/* xfillIntegerMatrixWithRecycle */
+FILL_WITH_RECYCLE(int, Logical)		/* xfillLogicalMatrixWithRecycle */
+FILL_WITH_RECYCLE(Rbyte, Raw)		/* xfillRawMatrixWithRecycle */
+FILL_WITH_RECYCLE(double, Real)		/* xfillRealMatrixWithRecycle */
+
+#define FILL_ELT_WITH_RECYCLE(TNAME, GETELT, SETELT) \
+void attribute_hidden xfill##TNAME##MatrixWithRecycle(SEXP dst, SEXP src,	\
+    R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows,		\
+    R_xlen_t cols, R_xlen_t nsrc) {				\
+								\
+    FILL_MATRIX_ITERATE(dstart, drows, srows, cols, nsrc)	\
+	SETELT(dst, didx, GETELT(src, sidx));			\
+}
+
+FILL_ELT_WITH_RECYCLE(String, STRING_ELT, SET_STRING_ELT) /* xfillStringMatrixWithRecycle */
+FILL_ELT_WITH_RECYCLE(Vector, VECTOR_ELT, SET_VECTOR_ELT) /* xfillVectorMatrixWithRecycle */
diff -Nru r-base-3.2.3/src/main/duplicate.h r-base-3.3.1/src/main/duplicate.h
--- r-base-3.2.3/src/main/duplicate.h	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/main/duplicate.h	2016-03-16 23:04:15.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ *  R : A Computer Language for Statistical Data Analysis
+ *  Copyright (C) 1998--2014	    The R Core Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, a copy is available at
+ *  https://www.R-project.org/Licenses/
+ */
+
+#ifndef R_DUPLICATE_H
+#define R_DUPLICATE_H
+
+/*    
+FILL_MATRIX_ITERATE
+Iterator macro to fill a matrix from a vector with re-use of vector
+
+    for(R_xlen_t i = 0; i < srows; i++) {
+        R_xlen_t sidx = i;
+        for(R_xlen_t j = 0; j < cols; j++, sidx += srows) {
+            if (sidx >= nsrc) sidx -= nsrc;
+            didx = dstart + i + (j * drows);
+            ... "dst[didx] = src[sidx]"
+        }
+    }
+*/
+
+#define FILL_MATRIX_ITERATE(dstart, drows, srows, cols, nsrc) 		\
+    for(R_xlen_t i = 0, sidx = 0; i < srows; i++, sidx = i)		\
+        for(R_xlen_t j = 0, didx = dstart + i; j < cols;		\
+            j++, 							\
+            sidx += srows,						\
+            (sidx >= nsrc) ? sidx -= nsrc : 0,				\
+            didx += drows)
+
+void xcopyComplexWithRecycle(Rcomplex *dst, Rcomplex *src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+void xcopyIntegerWithRecycle(int *dst, int *src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+void xcopyLogicalWithRecycle(int *dst, int *src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+void xcopyRawWithRecycle(Rbyte *dst, Rbyte *src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+void xcopyRealWithRecycle(double *dst, double *src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+void xcopyStringWithRecycle(SEXP dst, SEXP src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+void xcopyVectorWithRecycle(SEXP dst, SEXP src, R_xlen_t dstart, R_xlen_t n, R_xlen_t nsrc);
+
+void xfillComplexMatrixWithRecycle(Rcomplex *dst, Rcomplex *src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+void xfillIntegerMatrixWithRecycle(int *dst, int *src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+void xfillLogicalMatrixWithRecycle(int *dst, int *src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+void xfillRawMatrixWithRecycle(Rbyte *dst, Rbyte *src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+void xfillRealMatrixWithRecycle(double *dst, double *src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+void xfillStringMatrixWithRecycle(SEXP dst, SEXP src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+void xfillVectorMatrixWithRecycle(SEXP dst, SEXP src, R_xlen_t dstart, R_xlen_t drows, R_xlen_t srows, R_xlen_t cols, R_xlen_t nsrc);
+
+#define FILL_MATRIX_BYROW_ITERATE(dstart, drows, dcols, nsrc) 		\
+    for(R_xlen_t i = 0, sidx = 0; i < drows; i++)			\
+        for(R_xlen_t j = 0, didx = dstart + i; j < dcols;		\
+            j++, 							\
+            sidx++,							\
+            (sidx >= nsrc) ? sidx -= nsrc : 0,				\
+            didx += drows)
+
+
+#endif /* R_DUPLICATE_H */
diff -Nru r-base-3.2.3/src/main/engine.c r-base-3.3.1/src/main/engine.c
--- r-base-3.2.3/src/main/engine.c	2015-11-25 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/main/engine.c	2016-03-16 23:04:15.000000000 +0000
@@ -113,11 +113,11 @@
 	error(_("unable to allocate memory (in GEregister)"));
     result = cb(GE_InitState, dd, R_NilValue);
     if (isNull(result)) {
-	/* tidy up */
-	free(dd->gesd[systemNumber]);
+        /* tidy up */
+        free(dd->gesd[systemNumber]);
 	error(_("unable to allocate memory (in GEregister)"));
     } else {
-	dd->gesd[systemNumber]->callback = cb;
+        dd->gesd[systemNumber]->callback = cb;
     }
 }
 
@@ -156,11 +156,11 @@
      * information in those devices
      * If a graphics system has been unregistered, there might
      * be "holes" in the list of graphics systems, so start
-     * from zero and look for the first NULL
+     * from zero and look for the first NULL 
      */
     *systemRegisterIndex = 0;
     while (registeredSystems[*systemRegisterIndex] != NULL) {
-	(*systemRegisterIndex)++;
+        (*systemRegisterIndex)++;
     }
     /* Run through the existing devices and add the new information
      * to any GEDevDesc's
@@ -1376,35 +1376,35 @@
  ****************************************************************
  */
 
-void GEPath(double *x, double *y,
-	    int npoly, int *nper,
-	    Rboolean winding,
-	    const pGEcontext gc, pGEDevDesc dd)
+void GEPath(double *x, double *y, 
+            int npoly, int *nper,
+            Rboolean winding,
+            const pGEcontext gc, pGEDevDesc dd)
 {
     /* safety check: this will be NULL if the device did not set it. */
     if (!dd->dev->path) {
 	warning(_("path rendering is not implemented for this device"));
 	return;
     }
-    /* FIXME: what about clipping? (if the device can't)
+    /* FIXME: what about clipping? (if the device can't) 
     */
     if (gc->lwd == R_PosInf || gc->lwd < 0.0)
 	error(_("'lwd' must be non-negative and finite"));
     if (ISNAN(gc->lwd) || gc->lty == LTY_BLANK)
 	gc->col = R_TRANWHITE;
     if (npoly > 0) {
-	int i;
-	int draw = 1;
-	for (i=0; i < npoly; i++) {
-	    if (nper[i] < 2) {
-		draw = 0;
-	    }
-	}
-	if (draw) {
-	    dd->dev->path(x, y, npoly, nper, winding, gc, dd->dev);
-	} else {
+        int i;
+        int draw = 1;
+        for (i=0; i < npoly; i++) {
+            if (nper[i] < 2) {
+                draw = 0;
+            }
+        }
+        if (draw) {
+            dd->dev->path(x, y, npoly, nper, winding, gc, dd->dev);
+        } else {
 	    error(_("Invalid graphics path"));
-	}
+        }
     }
 }
 
@@ -1414,11 +1414,11 @@
  */
 
 void GERaster(unsigned int *raster, int w, int h,
-	      double x, double y,
-	      double width, double height,
-	      double angle,
-	      Rboolean interpolate,
-	      const pGEcontext gc, pGEDevDesc dd)
+              double x, double y, 
+              double width, double height,
+              double angle, 
+              Rboolean interpolate,
+              const pGEcontext gc, pGEDevDesc dd)
 {
     /* safety check: this will be NULL if the device did not set it. */
     if (!dd->dev->raster) {
@@ -1426,14 +1426,14 @@
 	return;
     }
 
-    /* FIXME: what about clipping? (if the device can't)
+    /* FIXME: what about clipping? (if the device can't) 
      * Maybe not too bad because it is just a matter of shaving off
      * some rows and columns from the image? (because R only does
      * rectangular clipping regions) */
-
+    
     if (width != 0 && height != 0) {
-	dd->dev->raster(raster, w, h, x, y, width, height,
-			angle, interpolate, gc, dd->dev);
+        dd->dev->raster(raster, w, h, x, y, width, height,
+                        angle, interpolate, gc, dd->dev);
     }
 }
 
@@ -1505,10 +1505,10 @@
     bottom = fmin2(fmin2(y0, y1), fmin2(y2, y3));
     top = fmax2(fmax2(y0, y1), fmax2(y2, y3));
     return clipRectCode(toDeviceX(left, GE_INCHES, dd),
-			toDeviceY(bottom, GE_INCHES, dd),
-			toDeviceX(right, GE_INCHES, dd),
-			toDeviceY(top, GE_INCHES, dd),
-			toDevice, dd);
+                        toDeviceY(bottom, GE_INCHES, dd),
+                        toDeviceX(right, GE_INCHES, dd),
+                        toDeviceY(top, GE_INCHES, dd), 
+                        toDevice, dd);
 }
 
 static void clipText(double x, double y, const char *str, cetype_t enc,
@@ -1595,18 +1595,19 @@
     { NULL,		          0, 0 },
 };
 
-/* A Hershey family (all of which have names starting with Her) may
-   have had the fourth byte changed to the family code (1...8), so
+/* A Hershey family (all of which have names starting with Hershey) may
+   have had the eighth byte changed to the family code (1...8), so
    saving further table lookups.
-   (Done by GEText and GEStrWidth/Height.)
+
+   (Done by GEText and GEStrWidth/Height, and also set that way in the
+   graphics package's plot.c for C_text, C_strWidth and C_strheight,
+   and in plot3d.c for C_contour.)
 */
 static int VFontFamilyCode(char *fontfamily)
 {
-    // done this way as compiler was free to access 4th byte in previous version
-    if (strlen(fontfamily) > 3)  {
-	/* Inline vfont is passed down as familycode in fourth byte */
-	unsigned int j = fontfamily[3]; // protect against signed chars
-	if (!strncmp(fontfamily, "Her", 3) && j < 9) return 100 + j;
+    if (strlen(fontfamily) > 7)  {
+	unsigned int j = fontfamily[7]; // protect against signed chars
+	if (!strncmp(fontfamily, "Hershey", 7) && j < 9) return 100 + j;
 	for (int i = 0; VFontTable[i].minface; i++)
 	    if (!strcmp(fontfamily, VFontTable[i].name)) return i + 1;
     }
@@ -1682,7 +1683,7 @@
     if (vfontcode >= 100) {
 	R_GE_VText(x, y, str, enc, xc, yc, rot, gc, dd);
     } else if (vfontcode >= 0) {
-	gc->fontfamily[3] = (char) vfontcode;
+	gc->fontfamily[7] = (char) vfontcode;
 	gc->fontface = VFontFaceCode(vfontcode, gc->fontface);
 	R_GE_VText(x, y, str, enc, xc, yc, rot, gc, dd);
     } else {
@@ -2013,7 +2014,7 @@
 	char str[16]; // probably 7 would do
 	if(gc->fontface == 5)
 	    error("use of negative pch with symbol font is invalid");
-	res = ucstoutf8(str, -pch); // throws error if unsuccessful
+	res = ucstoutf8(str, -pch); // throws error if unsuccessful 
 	str[res] = '\0';
 	GEText(x, y, str, CE_UTF8, NA_REAL, NA_REAL, 0., gc, dd);
     } else if(' ' <= pch && pch <= maxchar) {
@@ -2411,21 +2412,21 @@
 	   cache that value.  Depends on the context through cex, ps,
 	   fontface, family, and also on the device.
 
-	   PAUL 2008-11-27
-	   The point of checking dd == last_dd is to check for
-	   a different TYPE of device (e.g., PDF vs. PNG).
-	   Checking just the pGEDevDesc pointer is not a good enough
-	   test;  it is possible for that to be the same when one
-	   device is closed and a new one is opened (I have seen
-	   it happen!).
-	   So, ALSO compare dd->dev->close function pointer
-	   which really should be different for different devices.
+           PAUL 2008-11-27
+           The point of checking dd == last_dd is to check for
+           a different TYPE of device (e.g., PDF vs. PNG).
+           Checking just the pGEDevDesc pointer is not a good enough 
+           test;  it is possible for that to be the same when one
+           device is closed and a new one is opened (I have seen 
+           it happen!). 
+           So, ALSO compare dd->dev->close function pointer
+           which really should be different for different devices.
 	*/
 	static pGEDevDesc last_dd= NULL;
 #if R_USE_PROTOTYPES
-	static void (*last_close)(pDevDesc dd);
+        static void (*last_close)(pDevDesc dd);
 #else
-	static void (*last_close)();
+        static void (*last_close)();
 #endif
 	static int last_face = 1;
 	static double last_cex = 0.0, last_ps = 0.0,
@@ -2440,7 +2441,7 @@
 	dd->dev->metricInfo(c, gc, ascent, descent, width, dd->dev);
 	if(abs(c) == 77) {
 	    last_dd = dd;  last_close = dd->dev->close;
-	    last_cex = gc->cex; last_ps = gc->ps;
+            last_cex = gc->cex; last_ps = gc->ps;
 	    last_face = gc->fontface;
 	    strcpy(last_family, gc->fontfamily);
 	    a = *ascent; d = *descent; w = *width;
@@ -2461,7 +2462,7 @@
     if (vfontcode >= 100)
 	return R_GE_VStrWidth(str, enc, gc, dd);
     else if (vfontcode >= 0) {
-	gc->fontfamily[3] = (char) vfontcode;
+	gc->fontfamily[7] = (char) vfontcode;
 	gc->fontface = VFontFaceCode(vfontcode, gc->fontface);
 	return R_GE_VStrWidth(str, enc, gc, dd);
     } else {
@@ -2521,7 +2522,7 @@
     if (vfontcode >= 100)
 	return R_GE_VStrHeight(str, enc, gc, dd);
     else if (vfontcode >= 0) {
-	gc->fontfamily[3] = (char) vfontcode;
+	gc->fontfamily[7] = (char) vfontcode;
 	gc->fontface = VFontFaceCode(vfontcode, gc->fontface);
 	return R_GE_VStrHeight(str, enc, gc, dd);
     } else {
@@ -2561,9 +2562,9 @@
  * the string only through the number of lines of text (via embedded
  * \n) and we assume they are never part of an mbc.
  */
-void GEStrMetric(const char *str, cetype_t enc, const pGEcontext gc,
-		 double *ascent, double *descent, double *width,
-		 pGEDevDesc dd)
+void GEStrMetric(const char *str, cetype_t enc, const pGEcontext gc, 
+                 double *ascent, double *descent, double *width,
+                 pGEDevDesc dd)
 {
     /*
      * If the fontfamily is a Hershey font family, call R_GE_VStrHeight
@@ -2588,35 +2589,35 @@
 	 * performed using a device call that responds with
 	 * the current font pointsize in device coordinates.
 	 */
-	double lineheight = gc->lineheight * gc->cex * dd->dev->cra[1] *
-			    gc->ps/dd->dev->startps;
+        double lineheight = gc->lineheight * gc->cex * dd->dev->cra[1] *
+                            gc->ps/dd->dev->startps;
 	int n;
 	/* Count the lines of text minus one */
 	n = 0;
 	for(s = str; *s ; s++)
 	    if (*s == '\n')
 		n++;
-	/* Where is the start of the last line? */
-	if (n > 0) {
-	    while (*s != '\n')
-		s--;
-	    s++;
-	} else {
-	    s = str;
-	}
+        /* Where is the start of the last line? */
+        if (n > 0) {
+            while (*s != '\n') 
+                s--;
+            s++;
+        } else {
+            s = str;
+        }
 	h = n * lineheight;
-	/* Find the largest ascent and descent for the last line of text
-	 */
-	while (*s) {
-	    GEMetricInfo(*s, gc, &asc, &dsc, &wid, dd);
-	    if (asc > *ascent)
-		*ascent = asc;
-	    if (dsc > *descent)
-		*descent = dsc;
-	    s++;
-	}
-	*ascent = *ascent + h;
-	*width = GEStrWidth(str, enc, gc ,dd);
+        /* Find the largest ascent and descent for the last line of text
+         */
+        while (*s) {
+            GEMetricInfo(*s, gc, &asc, &dsc, &wid, dd);
+            if (asc > *ascent)
+                *ascent = asc;
+            if (dsc > *descent)
+                *descent = dsc;
+            s++;
+        }
+        *ascent = *ascent + h;
+        *width = GEStrWidth(str, enc, gc ,dd);
     }
 }
 
@@ -2655,6 +2656,11 @@
     dd->dirty = TRUE;
 }
 
+void GEcleanDevice(pGEDevDesc dd)
+{
+    dd->dirty = FALSE;
+}
+
 /****************************************************************
  * GEcheckState
  ****************************************************************
@@ -2757,7 +2763,7 @@
      */
     for (i = 0; i < MAX_GRAPHICS_SYSTEMS; i++)
 	if (dd->gesd[i] != NULL)
-	    (dd->gesd[i]->callback)(GE_RestoreState, dd, R_NilValue);
+	    (dd->gesd[i]->callback)(GE_RestoreState, dd, theList);
     /* Play the display list
      */
     PROTECT(theList);
@@ -2771,7 +2777,7 @@
 	    SEXP op = CAR(theOperation);
 	    SEXP args = CADR(theOperation);
 	    if (TYPEOF(op) == BUILTINSXP || TYPEOF(op) == SPECIALSXP) {
-		PRIMFUN(op) (R_NilValue, op, args, R_NilValue);
+	    	PRIMFUN(op) (R_NilValue, op, args, R_NilValue);
 		/* Check with each graphics system that the plotting went ok
 		 */
 		if (!GEcheckState(dd)) {
@@ -2779,8 +2785,8 @@
 		    plotok = 0;
 		}
 	    } else {
-		warning(_("invalid display list"));
-		plotok = 0;
+	    	warning(_("invalid display list"));
+	    	plotok = 0;
 	    }
 	    theList = CDR(theList);
 	}
@@ -2837,6 +2843,7 @@
     int i;
     SEXP snapshot, tmp;
     SEXP state;
+    SEXP engineVersion;
     /* Create a list with one spot for the display list
      * and one spot each for the registered graphics systems
      * to put their graphics state
@@ -2859,7 +2866,10 @@
 	    SET_VECTOR_ELT(snapshot, i + 1, state);
 	    UNPROTECT(1);
 	}
-    UNPROTECT(1);
+    PROTECT(engineVersion = allocVector(INTSXP, 1));
+    INTEGER(engineVersion)[0] = R_GE_getVersion();
+    setAttrib(snapshot, install("engineVersion"), engineVersion);
+    UNPROTECT(2);
     return snapshot;
 }
 
@@ -2870,25 +2880,6 @@
 
 /* Recreate a saved display using the information in a structure
  * created by GEcreateSnapshot.
- *
- * The graphics engine assumes that it is getting a snapshot
- * that was created in THE CURRENT R SESSION
- * (Thus, it can assume that registered graphics systems are
- *  in the same order as they were when the snapshot was
- *  created -- in patricular, state information will be sent
- *  to the appropriate graphics system.)
- * [With only two systems and base registered on each device at
- * creation, that has to be true: and grid does not save any state.]
- *
- *  It also assumes that the system that created the snapshot is
- *  still loaded (e.g. the grid namespace has not been unloaded).
- *
- * It is possible to save a snapshot to an R variable
- * (and therefore save and reload it between sessions and
- *  even possibly into a different R version),
- * BUT this is strongly discouraged
- * (in the documentation for recordPlot() and replayPlot()
- *  and in the documentation for the Rgui interface on Windows)
  */
 
 void GEplaySnapshot(SEXP snapshot, pGEDevDesc dd)
@@ -2896,20 +2887,42 @@
     /* Only have to set up information for as many graphics systems
      * as were registered when the snapshot was taken.
      */
-    int i, numSystems = LENGTH(snapshot) - 1;
+    int i;
+    /* Check graphics engine version matches.
+     * If it does not, things still might work, so just a warning.
+     * NOTE though, that if it does not work, the results could be fatal.
+     */
+    SEXP snapshotEngineVersion;
+    int engineVersion = R_GE_getVersion();
+    PROTECT(snapshotEngineVersion = getAttrib(snapshot, 
+                                              install("engineVersion")));
+    if (isNull(snapshotEngineVersion)) {
+        warning(_("snapshot recorded with different graphics engine version (pre 11 - this is version %d)"),
+                engineVersion);
+    } else if (INTEGER(snapshotEngineVersion)[0] != engineVersion) {
+        int snapshotVersion = INTEGER(snapshotEngineVersion)[0];
+        warning(_("snapshot recorded with different graphics engine version (%d - this is version %d)"), 
+                snapshotVersion, engineVersion);
+    }
+    /* "clean" the device
+     */
+    GEcleanDevice(dd);
     /* Reset the snapshot state information in each registered
-     * graphics system
+     * graphics system.
+     * This may try to restore state for a system that was NOT 
+     * registered when the snapshot was taken, but the systems
+     * should protect themselves from that situation.
      */
-    for (i = 0; i < numSystems; i++)
+    for (i = 0; i < MAX_GRAPHICS_SYSTEMS; i++)
 	if (dd->gesd[i] != NULL)
-	    (dd->gesd[i]->callback)(GE_RestoreSnapshotState, dd,
-				    VECTOR_ELT(snapshot, i + 1));
+	    (dd->gesd[i]->callback)(GE_RestoreSnapshotState, dd, snapshot);
     /* Replay the display list
      */
     dd->displayList = duplicate(VECTOR_ELT(snapshot, 0));
     dd->DLlastElt = lastElt(dd->displayList);
     GEplayDisplayList(dd);
     if (!dd->displayListOn) GEinitDisplayList(dd);
+    UNPROTECT(1);
 }
 
 /* recordPlot() */
@@ -2961,6 +2974,8 @@
     /*
      * First arg is an expression, second arg is a list, third arg is an env
      */
+
+    checkArity(op, args);
     SEXP code = CAR(args);
     SEXP list = CADR(args);
     SEXP parentenv = CADDR(args);
@@ -3183,14 +3198,14 @@
 }
 
 /****************************************************************
- *
+ * 
  * Some functions for operations on raster images
  * (for those devices that cannot do these themselves)
  ****************************************************************
  */
 
 /* Some of this code is based on code from the leptonica library
- * hence the following notice
+ * hence the following notice 
  */
 
 /*====================================================================*
@@ -3208,40 +3223,40 @@
 -  or altered from any source or modified source distribution.
 *====================================================================*/
 
-/*
- * Scale a raster image to a desired size using
+/* 
+ * Scale a raster image to a desired size using 
  * nearest-neighbour interpolation
 
  * draster must be pre-allocated.
  */
 void R_GE_rasterScale(unsigned int *sraster, int sw, int sh,
-		      unsigned int *draster, int dw, int dh) {
+                      unsigned int *draster, int dw, int dh) {
     int i, j;
     int sx, sy;
     unsigned int pixel;
 
     /* Iterate over the destination pixels */
     for (i = 0; i < dh; i++) {
-	for (j = 0; j < dw; j++) {
-	    sy = i * sh / dh;
-	    sx = j * sw / dw;
-	    if ((sx >= 0) && (sx < sw) && (sy >= 0) && sy < sh) {
-		pixel = sraster[sy * sw + sx];
-	    } else {
-		pixel = 0;
-	    }
-	    draster[i * dw + j] = pixel;
-	}
+        for (j = 0; j < dw; j++) {
+            sy = i * sh / dh;
+            sx = j * sw / dw;
+            if ((sx >= 0) && (sx < sw) && (sy >= 0) && sy < sh) {
+                pixel = sraster[sy * sw + sx];
+            } else {
+                pixel = 0;
+            }
+            draster[i * dw + j] = pixel;
+        }
     }
 }
 
-/*
- * Scale a raster image to a desired size using
+/* 
+ * Scale a raster image to a desired size using 
  * bilinear interpolation
  * Code based on scaleColorLILow() from leptonica library
 
  *  Divide each destination pixel into 16 x 16 sub-pixels.
- *  Linear interpolation is equivalent to finding the
+ *  Linear interpolation is equivalent to finding the 
  *  fractional area (i.e., number of sub-pixels divided
  *  by 256) associated with each of the four nearest src pixels,
  *  and weighting each pixel value by this fractional area.
@@ -3249,7 +3264,7 @@
  * draster must be pre-allocated.
  */
 void R_GE_rasterInterpolate(unsigned int *sraster, int sw, int sh,
-			    unsigned int *draster, int dw, int dh) {
+                            unsigned int *draster, int dw, int dh) {
     int i, j;
     double scx, scy;
     int wm2, hm2;
@@ -3273,65 +3288,65 @@
 
     /* Iterate over the destination pixels */
     for (i = 0; i < dh; i++) {
-	ypm = (int) fmax2(scy * i - 8, 0);
-	yp = ypm >> 4;
-	yf = ypm & 0x0f;
-	dline = draster + i * dw;
-	sline = sraster + yp * sw;
-	for (j = 0; j < dw; j++) {
-	    xpm = (int) fmax2(scx * j - 8, 0);
-	    xp = xpm >> 4;
-	    xf = xpm & 0x0f;
-
-	    pixels1 = *(sline + xp);
-
-	    if (xp > wm2 || yp > hm2) {
-		if (yp > hm2 && xp <= wm2) {  /* pixels near bottom */
-		    pixels2 = *(sline + xp + 1);
-		    pixels3 = pixels1;
-		    pixels4 = pixels2;
-		}
-		else if (xp > wm2 && yp <= hm2) {  /* pixels near right side */
-		    pixels2 = pixels1;
-		    pixels3 = *(sline + sw + xp);
-		    pixels4 = pixels3;
-		}
-		else {  /* pixels at LR corner */
-		    pixels4 = pixels3 = pixels2 = pixels1;
-		}
-	    }
-	    else {
-		pixels2 = *(sline + xp + 1);
-		pixels3 = *(sline + sw + xp);
-		pixels4 = *(sline + sw + xp + 1);
-	    }
-
-	    area00 = (16 - xf) * (16 - yf);
-	    area10 = xf * (16 - yf);
-	    area01 = (16 - xf) * yf;
-	    area11 = xf * yf;
-	    v00r = area00 * R_RED(pixels1);
-	    v00g = area00 * R_GREEN(pixels1);
-	    v00b = area00 * R_BLUE(pixels1);
-	    v00a = area00 * R_ALPHA(pixels1);
-	    v10r = area10 * R_RED(pixels2);
-	    v10g = area10 * R_GREEN(pixels2);
-	    v10b = area10 * R_BLUE(pixels2);
-	    v10a = area10 * R_ALPHA(pixels2);
-	    v01r = area01 * R_RED(pixels3);
-	    v01g = area01 * R_GREEN(pixels3);
-	    v01b = area01 * R_BLUE(pixels3);
-	    v01a = area01 * R_ALPHA(pixels3);
-	    v11r = area11 * R_RED(pixels4);
-	    v11g = area11 * R_GREEN(pixels4);
-	    v11b = area11 * R_BLUE(pixels4);
-	    v11a = area11 * R_ALPHA(pixels4);
-	    pixel = (((v00r + v10r + v01r + v11r + 128) >>  8) & 0x000000ff) |
-		    (((v00g + v10g + v01g + v11g + 128)      ) & 0x0000ff00) |
-		    (((v00b + v10b + v01b + v11b + 128) <<  8) & 0x00ff0000) |
-		    (((v00a + v10a + v01a + v11a + 128) << 16) & 0xff000000);
-	    *(dline + j) = pixel;
-	}
+        ypm = (int) fmax2(scy * i - 8, 0);
+        yp = ypm >> 4;
+        yf = ypm & 0x0f;
+        dline = draster + i * dw;
+        sline = sraster + yp * sw;
+        for (j = 0; j < dw; j++) {
+            xpm = (int) fmax2(scx * j - 8, 0);
+            xp = xpm >> 4;
+            xf = xpm & 0x0f;
+
+            pixels1 = *(sline + xp);
+
+            if (xp > wm2 || yp > hm2) {
+                if (yp > hm2 && xp <= wm2) {  /* pixels near bottom */
+                    pixels2 = *(sline + xp + 1);
+                    pixels3 = pixels1;
+                    pixels4 = pixels2;
+                }
+                else if (xp > wm2 && yp <= hm2) {  /* pixels near right side */
+                    pixels2 = pixels1;
+                    pixels3 = *(sline + sw + xp);
+                    pixels4 = pixels3;
+                }
+                else {  /* pixels at LR corner */
+                    pixels4 = pixels3 = pixels2 = pixels1;
+                }
+            }
+            else {
+                pixels2 = *(sline + xp + 1);
+                pixels3 = *(sline + sw + xp);
+                pixels4 = *(sline + sw + xp + 1);
+            }
+
+            area00 = (16 - xf) * (16 - yf);
+            area10 = xf * (16 - yf);
+            area01 = (16 - xf) * yf;
+            area11 = xf * yf;
+            v00r = area00 * R_RED(pixels1);
+            v00g = area00 * R_GREEN(pixels1);
+            v00b = area00 * R_BLUE(pixels1);
+            v00a = area00 * R_ALPHA(pixels1);
+            v10r = area10 * R_RED(pixels2);
+            v10g = area10 * R_GREEN(pixels2);
+            v10b = area10 * R_BLUE(pixels2);
+            v10a = area10 * R_ALPHA(pixels2);
+            v01r = area01 * R_RED(pixels3);
+            v01g = area01 * R_GREEN(pixels3);
+            v01b = area01 * R_BLUE(pixels3);
+            v01a = area01 * R_ALPHA(pixels3);
+            v11r = area11 * R_RED(pixels4);
+            v11g = area11 * R_GREEN(pixels4);
+            v11b = area11 * R_BLUE(pixels4);
+            v11a = area11 * R_ALPHA(pixels4);
+            pixel = (((v00r + v10r + v01r + v11r + 128) >>  8) & 0x000000ff) |
+                    (((v00g + v10g + v01g + v11g + 128)      ) & 0x0000ff00) |
+                    (((v00b + v10b + v01b + v11b + 128) <<  8) & 0x00ff0000) |
+                    (((v00a + v10a + v01a + v11a + 128) << 16) & 0xff000000);
+            *(dline + j) = pixel;
+        }
     }
 }
 
@@ -3342,7 +3357,7 @@
  * New width/height based on max of rotated corners
  */
 void R_GE_rasterRotatedSize(int w, int h, double angle,
-			    int *wnew, int *hnew) {
+                            int *wnew, int *hnew) {
     double diag = sqrt(w*w + h*h);
     double theta = atan2((double) h, (double) w);
     double trx1 = diag*cos(theta + angle);
@@ -3351,7 +3366,7 @@
     double try2 = diag*sin(angle - theta);
     *wnew = (int) (fmax2(fabs(trx1), fabs(trx2)) + 0.5);
     *hnew = (int) (fmax2(fabs(try1), fabs(try2)) + 0.5);
-    /*
+    /* 
      * Rotated image may be shorter or thinner than original
      */
     *wnew = imax2(w, *wnew);
@@ -3359,78 +3374,78 @@
 }
 
 /*
- * Calculate offset for (left, bottom) or
- * (left, top) of image
+ * Calculate offset for (left, bottom) or 
+ * (left, top) of image 
  * to account for image rotation
  */
 void R_GE_rasterRotatedOffset(int w, int h, double angle,
-			      int botleft,
-			      double *xoff, double *yoff) {
+                              int botleft,
+                              double *xoff, double *yoff) {
     double hypot = .5*sqrt(w*w + h*h);
     double theta, dw, dh;
     if (botleft) {
-	theta = M_PI + atan2(h, w);
-	dw = hypot*cos(theta + angle);
-	dh = hypot*sin(theta + angle);
-	*xoff = dw + w/2;
-	*yoff = dh + h/2;
+        theta = M_PI + atan2(h, w);
+        dw = hypot*cos(theta + angle);
+        dh = hypot*sin(theta + angle);
+        *xoff = dw + w/2;
+        *yoff = dh + h/2;
     } else {
-	theta = -M_PI - atan2(h, w);
-	dw = hypot*cos(theta + angle);
-	dh = hypot*sin(theta + angle);
-	*xoff = dw + w/2;
-	*yoff = dh - h/2;
+        theta = -M_PI - atan2(h, w);
+        dw = hypot*cos(theta + angle);
+        dh = hypot*sin(theta + angle);
+        *xoff = dw + w/2;
+        *yoff = dh - h/2;
     }
 }
 
-/*
- * Copy a raster image into the middle of a larger
+/* 
+ * Copy a raster image into the middle of a larger 
  * raster image (ready for rotation)
 
  * newRaster must be pre-allocated.
  */
-void R_GE_rasterResizeForRotation(unsigned int *sraster,
-				  int w, int h,
-				  unsigned int *newRaster,
-				  int wnew, int hnew,
-				  const pGEcontext gc)
+void R_GE_rasterResizeForRotation(unsigned int *sraster, 
+                                  int w, int h, 
+                                  unsigned int *newRaster,
+                                  int wnew, int hnew,
+                                  const pGEcontext gc)
 {
     int i, j, inew, jnew;
     int xoff = (wnew - w)/2;
     int yoff = (hnew - h)/2;
 
     for (i=0; i<hnew; i++) {
-	for (j=0; j<wnew; j++) {
-	    newRaster[i*wnew + j] = gc->fill;
-	}
+        for (j=0; j<wnew; j++) {
+            newRaster[i*wnew + j] = gc->fill;
+        }
     }
     for (i=0; i<h; i++) {
-	for (j=0; j<w; j++) {
-	    inew = i+yoff;
-	    jnew = j+xoff;
-	    newRaster[inew*wnew + jnew] = sraster[i*w + j];
-	}
+        for (j=0; j<w; j++) {
+            inew = i+yoff;
+            jnew = j+xoff;
+            newRaster[inew*wnew + jnew] = sraster[i*w + j];
+        }
 
     }
 }
 
-/*
- * Rotate a raster image
+/* 
+ * Rotate a raster image 
  * Code based on rotateAMColorLow() from leptonica library
 
  * draster must be pre-allocated.
-
- * smoothAlpha allows alpha channel to vary smoothly based on
- * interpolation.  If this is FALSE, then alpha values are
+ 
+ * smoothAlpha allows alpha channel to vary smoothly based on 
+ * interpolation.  If this is FALSE, then alpha values are 
  * taken from MAX(alpha) of relevant pixels.  This means that
- * areas of full transparency remain fully transparent,
+ * areas of full transparency remain fully transparent, 
  * areas of opacity remain opaque, edges between anything less than opacity
  * and opacity are opaque, and edges between full transparency
  * and semitransparency become semitransparent.
  */
 void R_GE_rasterRotate(unsigned int *sraster, int w, int h, double angle,
-		       unsigned int *draster, const pGEcontext gc,
-		       Rboolean smoothAlpha) {
+                       unsigned int *draster, const pGEcontext gc,
+                       Rboolean smoothAlpha) {
     int i, j;
     int xcen, ycen, wm2, hm2;
     int xdif, ydif, xpm, ypm, xp, yp, xf, yf;
@@ -3450,51 +3465,51 @@
     cosa = 16. * cos(angle);
 
     for (i = 0; i < h; i++) {
-	ydif = ycen - i;
-	dline = draster + i * w;
-	for (j = 0; j < w; j++) {
-	    xdif = xcen - j;
-	    xpm = (int) (-xdif * cosa - ydif * sina);
-	    ypm = (int) (-ydif * cosa + xdif * sina);
-	    xp = xcen + (xpm >> 4);
-	    yp = ycen + (ypm >> 4);
-	    xf = xpm & 0x0f;
-	    yf = ypm & 0x0f;
-
-		/* if off the edge, use transparent */
-	    if (xp < 0 || yp < 0 || xp > wm2 || yp > hm2) {
-		*(dline + j) = gc->fill;
-		continue;
-	    }
-
-	    sline = sraster + yp * w;
-
-	    word00 = *(sline + xp);
-	    word10 = *(sline + xp + 1);
-	    word01 = *(sline + w + xp);
-	    word11 = *(sline + w + xp + 1);
-	    rval = ((16 - xf) * (16 - yf) * R_RED(word00) +
-		    xf * (16 - yf) * R_RED(word10) +
-		    (16 - xf) * yf * R_RED(word01) +
-		    xf * yf * R_RED(word11) + 128) / 256;
-	    gval = ((16 - xf) * (16 - yf) * R_GREEN(word00) +
-		    xf * (16 - yf) * R_GREEN(word10) +
-		    (16 - xf) * yf * R_GREEN(word01) +
-		    xf * yf * R_GREEN(word11) + 128) / 256;
-	    bval = ((16 - xf) * (16 - yf) * R_BLUE(word00) +
-		    xf * (16 - yf) * R_BLUE(word10) +
-		    (16 - xf) * yf * R_BLUE(word01) +
-		    xf * yf * R_BLUE(word11) + 128) / 256;
-	    if (smoothAlpha) {
-		aval = ((16 - xf) * (16 - yf) * R_ALPHA(word00) +
-			xf * (16 - yf) * R_ALPHA(word10) +
-			(16 - xf) * yf * R_ALPHA(word01) +
-			xf * yf * R_ALPHA(word11) + 128) / 256;
-	    } else {
-		aval = (int)fmax2(fmax2(R_ALPHA(word00), R_ALPHA(word10)),
+        ydif = ycen - i;
+        dline = draster + i * w;
+        for (j = 0; j < w; j++) {
+            xdif = xcen - j;
+            xpm = (int) (-xdif * cosa - ydif * sina);
+            ypm = (int) (-ydif * cosa + xdif * sina);
+            xp = xcen + (xpm >> 4);
+            yp = ycen + (ypm >> 4);
+            xf = xpm & 0x0f;
+            yf = ypm & 0x0f;
+
+                /* if off the edge, use transparent */
+            if (xp < 0 || yp < 0 || xp > wm2 || yp > hm2) {
+                *(dline + j) = gc->fill;
+                continue;
+            }
+
+            sline = sraster + yp * w;
+
+            word00 = *(sline + xp);
+            word10 = *(sline + xp + 1);
+            word01 = *(sline + w + xp);
+            word11 = *(sline + w + xp + 1);
+            rval = ((16 - xf) * (16 - yf) * R_RED(word00) +
+                    xf * (16 - yf) * R_RED(word10) +
+                    (16 - xf) * yf * R_RED(word01) +
+                    xf * yf * R_RED(word11) + 128) / 256;
+            gval = ((16 - xf) * (16 - yf) * R_GREEN(word00) +
+                    xf * (16 - yf) * R_GREEN(word10) +
+                    (16 - xf) * yf * R_GREEN(word01) +
+                    xf * yf * R_GREEN(word11) + 128) / 256;
+            bval = ((16 - xf) * (16 - yf) * R_BLUE(word00) +
+                    xf * (16 - yf) * R_BLUE(word10) +
+                    (16 - xf) * yf * R_BLUE(word01) +
+                    xf * yf * R_BLUE(word11) + 128) / 256;
+            if (smoothAlpha) {
+                aval = ((16 - xf) * (16 - yf) * R_ALPHA(word00) +
+                        xf * (16 - yf) * R_ALPHA(word10) +
+                        (16 - xf) * yf * R_ALPHA(word01) +
+                        xf * yf * R_ALPHA(word11) + 128) / 256;
+            } else {
+                aval = (int)fmax2(fmax2(R_ALPHA(word00), R_ALPHA(word10)),
 				  fmax2(R_ALPHA(word01), R_ALPHA(word11)));
-	    }
-	    *(dline + j) = R_RGBA(rval, gval, bval, aval);
-	}
+            }
+            *(dline + j) = R_RGBA(rval, gval, bval, aval);
+        }
     }
 }
diff -Nru r-base-3.2.3/src/main/envir.c r-base-3.3.1/src/main/envir.c
--- r-base-3.2.3/src/main/envir.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/envir.c	2016-05-20 22:15:07.000000000 +0000
@@ -49,9 +49,10 @@
  */
 
 /* R 1.8.0: namespaces are no longer experimental, so the following
- *  are no longer 'experimental options':
+ *  are no longer 'experimental options', but rather three sections
+ *  describing the API:
  *
- * EXPERIMENTAL_NAMESPACES: When this is defined the variable
+ * NAMESPACES:
  *     R_BaseNamespace holds an environment that has R_GlobalEnv as
  *     its parent.  This environment does not actually contain any
  *     bindings of its own.  Instead, it redirects all fetches and
@@ -62,7 +63,7 @@
  * ENVIRONMENT_LOCKING: Locking an environment prevents new bindings
  *     from being created and existing bindings from being removed.
  *
- * FANCY_BINDINGS: This enables binding locking and "active bindings".
+ * FANCY_BINDINGS: We have binding locking and "active bindings".
  *     When a binding is locked, its value cannot be changed.  It may
  *     still be removed from the environment if the environment is not
  *     locked.
@@ -96,7 +97,7 @@
 #include <R_ext/Callbacks.h>
 
 #define FAST_BASE_CACHE_LOOKUP  /* Define to enable fast lookups of symbols */
-                                /*    in global cache from base environment */
+				/*    in global cache from base environment */
 
 #define IS_USER_DATABASE(rho)  (OBJECT((rho)) && inherits((rho), "UserDefinedDatabase"))
 
@@ -167,8 +168,8 @@
 	return FALSE;
 
     for (frame = FRAME(env); frame != R_NilValue; frame = CDR(frame))
-        if (IS_SPECIAL_SYMBOL(TAG(frame)))
-            return FALSE;
+	if (IS_SPECIAL_SYMBOL(TAG(frame)))
+	    return FALSE;
 
     return TRUE;
 }
@@ -702,7 +703,7 @@
     if (entry != R_NilValue) {
 	SETCAR(entry, R_UnboundValue);
 #ifdef FAST_BASE_CACHE_LOOKUP
-        UNSET_BASE_SYM_CACHED(sym);
+	UNSET_BASE_SYM_CACHED(sym);
 #endif
     }
 }
@@ -759,7 +760,7 @@
 
 #ifdef FAST_BASE_CACHE_LOOKUP
     if (BASE_SYM_CACHED(symbol))
-        return SYMBOL_BINDING_VALUE(symbol);
+	return SYMBOL_BINDING_VALUE(symbol);
 #endif
 
     vl = R_HashGet(hashIndex(symbol, R_GlobalCache), symbol,
@@ -947,31 +948,33 @@
 R_varloc_t R_findVarLocInFrame(SEXP rho, SEXP symbol)
 {
     SEXP binding = findVarLocInFrame(rho, symbol, NULL);
-    return binding == R_NilValue ? NULL : (R_varloc_t) binding;
+    R_varloc_t val;
+    val.cell = binding == R_NilValue ? NULL : binding;
+    return val;
 }
 
 attribute_hidden
 SEXP R_GetVarLocValue(R_varloc_t vl)
 {
-    return BINDING_VALUE((SEXP) vl);
+    return BINDING_VALUE(vl.cell);
 }
 
 attribute_hidden
 SEXP R_GetVarLocSymbol(R_varloc_t vl)
 {
-    return TAG((SEXP) vl);
+    return TAG(vl.cell);
 }
 
 /* used in methods */
 Rboolean R_GetVarLocMISSING(R_varloc_t vl)
 {
-    return MISSING((SEXP) vl);
+    return MISSING(vl.cell);
 }
 
 attribute_hidden
 void R_SetVarLocValue(R_varloc_t vl, SEXP value)
 {
-    SET_BINDING_VALUE((SEXP) vl, value);
+    SET_BINDING_VALUE(vl.cell, value);
 }
 
 
@@ -1112,8 +1115,8 @@
     SEXP *dotGenericCallEnv, SEXP *dotGenericDefEnv) {
 
     if (TYPEOF(rho) == NILSXP ||
-        rho == R_BaseNamespace || rho == R_BaseEnv || rho == R_EmptyEnv ||
-        IS_USER_DATABASE(rho) || HASHTAB(rho) != R_NilValue) goto slowpath;
+	rho == R_BaseNamespace || rho == R_BaseEnv || rho == R_EmptyEnv ||
+	IS_USER_DATABASE(rho) || HASHTAB(rho) != R_NilValue) goto slowpath;
 
     SEXP frame = FRAME(rho);
 
@@ -1125,7 +1128,7 @@
     */
 
     for(;TAG(frame) != R_dot_Generic; frame = CDR(frame))
-        if (frame == R_NilValue) goto slowpath;
+	if (frame == R_NilValue) goto slowpath;
     *dotGeneric = BINDING_VALUE(frame);
     frame = CDR(frame);
 
@@ -1428,8 +1431,8 @@
     /* If the symbol is marked as special, skip to the first
        environment that might contain such a symbol. */
     if (IS_SPECIAL_SYMBOL(symbol)) {
-        while (rho != R_EmptyEnv && NO_SPECIAL_SYMBOLS(rho))
-            rho = ENCLOS(rho);
+	while (rho != R_EmptyEnv && NO_SPECIAL_SYMBOLS(rho))
+	    rho = ENCLOS(rho);
     }
 
     while (rho != R_EmptyEnv) {
@@ -1437,10 +1440,10 @@
 #ifdef USE_GLOBAL_CACHE
 	if (rho == R_GlobalEnv)
 #ifdef FAST_BASE_CACHE_LOOKUP
-            if (BASE_SYM_CACHED(symbol))
-                vl = SYMBOL_BINDING_VALUE(symbol);
-            else
-                vl = findGlobalVar(symbol);
+	    if (BASE_SYM_CACHED(symbol))
+		vl = SYMBOL_BINDING_VALUE(symbol);
+	    else
+		vl = findGlobalVar(symbol);
 #else
 	    vl = findGlobalVar(symbol);
 #endif
@@ -1510,8 +1513,8 @@
 	if (IS_GLOBAL_FRAME(rho)) R_FlushGlobalCache(symbol);
 #endif
 
-        if (IS_SPECIAL_SYMBOL(symbol))
-            UNSET_NO_SPECIAL_SYMBOLS(rho);
+	if (IS_SPECIAL_SYMBOL(symbol))
+	    UNSET_NO_SPECIAL_SYMBOLS(rho);
 
 	if (HASHTAB(rho) == R_NilValue) {
 	    /* First check for an existing binding */
@@ -1572,8 +1575,8 @@
     SEXP aprev = addVars;
     SEXP a = CDR(addVars);
     while (a != R_NilValue) {
-        aprev = a;
-        a = CDR(a);
+	aprev = a;
+	a = CDR(a);
     }
     SETCDR(aprev, FRAME(env));
     SET_FRAME(env, addVars);
@@ -1582,20 +1585,20 @@
        variable listed sooner */
     SEXP end;
     for(end = CDR(addVars); end != R_NilValue; end = CDR(end)) {
-        SEXP endTag = TAG(end);
-        SEXP sprev = R_NilValue;
-        SEXP s;
-        for(s = addVars; s != end; s = CDR(s)) {
-            if (TAG(s) == endTag) {
-                /* remove variable s from the list, because it is overriden by "end" */
-                if (sprev == R_NilValue) {
-                    addVars = CDR(s);
-                    SET_FRAME(env, addVars);
-                } else
-                    SETCDR(sprev, CDR(s));
-            } else
-                sprev = s;
-        }
+	SEXP endTag = TAG(end);
+	SEXP sprev = R_NilValue;
+	SEXP s;
+	for(s = addVars; s != end; s = CDR(s)) {
+	    if (TAG(s) == endTag) {
+		/* remove variable s from the list, because it is overriden by "end" */
+		if (sprev == R_NilValue) {
+		    addVars = CDR(s);
+		    SET_FRAME(env, addVars);
+		} else
+		    SETCDR(sprev, CDR(s));
+	    } else
+		sprev = s;
+	}
     }
 }
 
@@ -1640,7 +1643,6 @@
 	frame = FRAME(rho);
 	while (frame != R_NilValue) {
 	    if (TAG(frame) == symbol) {
-		if (rho == R_GlobalEnv) R_DirtyImage = 1;
 		SET_BINDING_VALUE(frame, value);
 		SET_MISSING(frame, 0);	/* same as defineVar */
 		return symbol;
@@ -1657,7 +1659,6 @@
 	hashcode = HASHVALUE(c) % HASHSIZE(HASHTAB(rho));
 	frame = R_HashGetLoc(hashcode, symbol, HASHTAB(rho));
 	if (frame != R_NilValue) {
-	    if (rho == R_GlobalEnv) R_DirtyImage = 1;
 	    SET_BINDING_VALUE(frame, value);
 	    SET_MISSING(frame, 0);	/* same as defineVar */
 	    return symbol;
@@ -2102,9 +2103,9 @@
 	    if(gmode == (SEXPTYPE) (-1))
 		error(_("invalid '%s' argument"), "mode");
 	}
-        SEXP ans_i = gfind(translateChar(STRING_ELT(x, i % nvals)), env,
-                           gmode, VECTOR_ELT(ifnotfound, i % nifnfnd),
-                           ginherits, rho);
+	SEXP ans_i = gfind(translateChar(STRING_ELT(x, i % nvals)), env,
+			   gmode, VECTOR_ELT(ifnotfound, i % nifnfnd),
+			   ginherits, rho);
 	SET_VECTOR_ELT(ans, i, lazy_duplicate(ans_i));
     }
 
@@ -2131,9 +2132,9 @@
 
 static SEXP findRootPromise(SEXP p) {
     if (TYPEOF(p) == PROMSXP) {
-        while(TYPEOF(PREXPR(p)) == PROMSXP) {
-            p = PREXPR(p);
-        }
+	while(TYPEOF(PREXPR(p)) == PROMSXP) {
+	    p = PREXPR(p);
+	}
     }
     return p;
 }
@@ -2173,7 +2174,7 @@
 	    return 1;
 	if (IS_ACTIVE_BINDING(vl))
 	    return 0;
-        SETCAR(vl, findRootPromise(CAR(vl)));
+	SETCAR(vl, findRootPromise(CAR(vl)));
 	if (TYPEOF(CAR(vl)) == PROMSXP &&
 	    PRVALUE(CAR(vl)) == R_UnboundValue &&
 	    TYPEOF(PREXPR(CAR(vl))) == SYMSXP) {
@@ -2362,7 +2363,7 @@
 		/* FIXME: duplicate the hash table and assign here */
 	    } else {
 		for(p = FRAME(loadenv); p != R_NilValue; p = CDR(p))
-                    defineVar(TAG(p), lazy_duplicate(CAR(p)), s);
+		    defineVar(TAG(p), lazy_duplicate(CAR(p)), s);
 	    }
 	} else {
 	    error(_("'attach' only works for lists, data frames and environments"));
@@ -2704,6 +2705,7 @@
     }
 }
 
+// .Internal(ls(envir, all.names, sorted)) :
 SEXP attribute_hidden do_ls(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
@@ -2727,7 +2729,7 @@
     return R_lsInternal3(env, all, sort_nms);
 }
 
-/* takes a *list* of environments, a boolean indicating whether to get all
+/* takes an environment, a boolean indicating whether to get all
    names and a boolean if sorted is desired */
 SEXP R_lsInternal3(SEXP env, Rboolean all, Rboolean sorted)
 {
@@ -2787,7 +2789,7 @@
     if (ISNULL(env))
 	error(_("use of NULL environment is defunct"));
     if( !isEnvironment(env) ) {
-        SEXP xdata;
+	SEXP xdata;
 	if( IS_S4_OBJECT(env) && TYPEOF(env) == S4SXP &&
 	    (xdata = R_getS4DataSlot(env, ENVSXP)) != R_NilValue)
 	    env = xdata;
@@ -2801,6 +2803,7 @@
     int sort_nms = asLogical(CADDR(args)); /* sorted = TRUE/FALSE */
     if (sort_nms == NA_LOGICAL) sort_nms = 0;
 
+    // k := length(env) = envxlength(env) :
     if (env == R_BaseEnv || env == R_BaseNamespace)
 	k = BuiltinSize(all, 0);
     else if (HASHTAB(env) != R_NilValue)
@@ -2945,18 +2948,25 @@
     return(ans);
 }
 
-int envlength(SEXP rho)
-{
-    if(IS_USER_DATABASE(rho)) {
-        R_ObjectTable *tb = (R_ObjectTable*)
-	    R_ExternalPtrAddr(HASHTAB(rho));
-        return (int) xlength(tb->objects(tb));
-    } else if( HASHTAB(rho) != R_NilValue)
-        return HashTableSize(HASHTAB(rho), 1);
-    else
-	return FrameSize(FRAME(rho), 1);
+/* Leaks out via inlining in ../library/tools/src/ */
+#define R_ENVLENGTH(NAME_, LENGTH_FN_, TYPE_)				\
+TYPE_ NAME_(SEXP rho)							\
+{									\
+    if(IS_USER_DATABASE(rho)) {						\
+	R_ObjectTable *tb = (R_ObjectTable*) R_ExternalPtrAddr(HASHTAB(rho)); \
+	return LENGTH_FN_(tb->objects(tb));				\
+    } else if( HASHTAB(rho) != R_NilValue)				\
+	return HashTableSize(HASHTAB(rho), 1);				\
+    else if (rho == R_BaseEnv || rho == R_BaseNamespace) 		\
+	return BuiltinSize(1, 0);					\
+    else								\
+	return FrameSize(FRAME(rho), 1);				\
 }
 
+R_ENVLENGTH(Rf_envlength,   length, int)
+
+R_ENVLENGTH(Rf_envxlength, xlength, R_xlen_t)
+
 /*----------------------------------------------------------------------
 
   do_builtins
@@ -3674,6 +3684,7 @@
        returns R_NilValue.  This seems appropriate since there is no
        way to test whether an environment is hashed at the R level.
     */
+    checkArity(op, args);
     SEXP env, ans = R_NilValue /* -Wall */;
     env = CAR(args);
     if (isEnvironment(env)) {
@@ -3995,3 +4006,14 @@
     if (target != R_NilValue && TYPEOF(target) != ENVSXP)  target = R_NilValue;
     return topenv(target, envir);
 }
+
+Rboolean attribute_hidden isUnmodifiedSpecSym(SEXP sym, SEXP env) {
+    if (!IS_SPECIAL_SYMBOL(sym))
+	return FALSE;
+    for(;env != R_EmptyEnv; env = ENCLOS(env))
+	if (!NO_SPECIAL_SYMBOLS(env) && env != R_BaseEnv
+		&& env != R_BaseNamespace && existsVarInFrame(env, sym))
+	    return FALSE;
+    return TRUE;
+}
+
diff -Nru r-base-3.2.3/src/main/errors.c r-base-3.3.1/src/main/errors.c
--- r-base-3.2.3/src/main/errors.c	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/errors.c	2016-03-16 23:04:15.000000000 +0000
@@ -71,12 +71,6 @@
   WarningMessage()-> warningcall (but with message from WarningDB[]).
 */
 
-static void reset_stack_limit(void *data)
-{
-    uintptr_t *limit = (uintptr_t *) data;
-    R_CStackLimit = *limit;
-}
-
 void NORET R_SignalCStackOverflow(intptr_t usage)
 {
     /* We do need some stack space to process error recovery, so
@@ -84,15 +78,13 @@
        reduced R_CStackLimit to 95% of the initial value in
        setup_Rmainloop.
     */
-    RCNTXT cntxt;
-    uintptr_t stacklimit = R_CStackLimit;
-    R_CStackLimit += 0.05*R_CStackLimit;
-    begincontext(&cntxt, CTXT_CCODE, R_NilValue, R_BaseEnv, R_BaseEnv,
-		 R_NilValue, R_NilValue);
-    cntxt.cend = &reset_stack_limit;
-    cntxt.cenddata = &stacklimit;
+    if (R_OldCStackLimit == 0) {
+	R_OldCStackLimit = R_CStackLimit;
+	R_CStackLimit = (uintptr_t) (R_CStackLimit / 0.95);
+    }
 
-    errorcall(R_NilValue, "C stack usage  %ld is too close to the limit", usage);
+    errorcall(R_NilValue, "C stack usage  %ld is too close to the limit",
+	      usage);
     /* Do not translate this, to save stack space */
 }
 
@@ -813,7 +805,8 @@
 
     haveHandler = FALSE;
 
-    if (tryUserHandler && inError < 3) {
+    /* don't use options("error") when handling a C stack overflow */
+    if (R_OldCStackLimit == 0 && tryUserHandler && inError < 3) {
 	if (! inError)
 	    inError = 1;
 
@@ -860,10 +853,9 @@
 
     /* WARNING: If oldInError > 0 ABSOLUTELY NO ALLOCATION can be
        triggered after this point except whatever happens in writing
-       the traceback and R_run_onexits.  The error could be an out of
-       memory error and any allocation could result in an
-       infinite-loop condition. All you can do is reset things and
-       exit.  */
+       the traceback.  The error could be an out of memory error and
+       any allocation could result in an infinite-loop condition. All
+       you can do is reset things and exit.  */
 
     /* jump to a browser/try if one is on the stack */
     if (! ignoreRestartContexts)
@@ -888,33 +880,7 @@
 	}
     }
 
-    /* Run onexit/cend code for all contexts down to but not including
-       the jump target.  This may cause recursive calls to
-       jump_to_top_ex, but the possible number of such recursive
-       calls is limited since each exit function is removed before it
-       is executed.  In addition, all but the first should have
-       inError > 0.  This is not a great design because we could run
-       out of other resources that are on the stack (like C stack for
-       example).  The right thing to do is arrange to execute exit
-       code *after* the LONGJMP, but that requires a more extensive
-       redesign of the non-local transfer of control mechanism.
-       LT. */
-    R_run_onexits(R_ToplevelContext);
-
-    if ( !R_Interactive && !haveHandler
-	 /* only bail out if at session top level, not in R_tryEval calls */
-	 && R_ToplevelContext == R_SessionContext ) {
-	REprintf(_("Execution halted\n"));
-	R_CleanUp(SA_NOSAVE, 1, 0); /* quit, no save, no .Last, status=1 */
-    }
-
-    R_GlobalContext = R_ToplevelContext;
-    R_restore_globals(R_GlobalContext);
-    LONGJMP(R_ToplevelContext->cjmpbuf, 0);
-    /* not reached
-    endcontext(&cntxt);
-    inError = oldInError;
-    */
+    R_jumpctxt(R_ToplevelContext, 0, NULL);
 }
 
 void NORET jump_to_toplevel()
@@ -931,6 +897,7 @@
 /* gettext(domain, string) */
 SEXP attribute_hidden do_gettext(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
 #ifdef ENABLE_NLS
     const char *domain = "", *cfn;
     char *buf;
@@ -1033,7 +1000,7 @@
 SEXP attribute_hidden do_ngettext(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
 #ifdef ENABLE_NLS
-    const char *domain = "";
+    const char *domain = "", *cfn;;
     char *buf;
     SEXP ans, sdom = CADDDR(args);
 #endif
@@ -1055,8 +1022,11 @@
 	     cptr != NULL && cptr->callflag != CTXT_TOPLEVEL;
 	     cptr = cptr->nextcontext)
 	    if (cptr->callflag & CTXT_FUNCTION) {
+		/* stop() etc have internal call to .makeMessage */
+		cfn = CHAR(STRING_ELT(deparse1s(CAR(cptr->call)), 0));
+		if(streql(cfn, "stop") || streql(cfn, "warning")
+		   || streql(cfn, "message")) continue;
 		rho = cptr->cloenv;
-		break;
 	    }
 	while(rho != R_EmptyEnv) {
 	    if (rho == R_GlobalEnv) break;
@@ -1131,6 +1101,7 @@
 {
 /* error(.) : really doesn't return anything; but all do_foo() must be SEXP */
     SEXP c_call;
+    checkArity(op, args);
 
     if(asLogical(CAR(args))) /* find context -> "Error in ..:" */
 	c_call = findCall();
@@ -1153,6 +1124,7 @@
 SEXP attribute_hidden do_warning(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     SEXP c_call;
+    checkArity(op, args);
 
     if(asLogical(CAR(args))) /* find context -> "... in: ..:" */
 	c_call = findCall();
@@ -1312,12 +1284,7 @@
     if (c != R_ToplevelContext)
 	warning(_("top level inconsistency?"));
 
-    /* Run onexit/cend code for everything above the target. */
-    R_run_onexits(c);
-
-    R_ToplevelContext = R_GlobalContext = c;
-    R_restore_globals(R_GlobalContext);
-    LONGJMP(c->cjmpbuf, CTXT_TOPLEVEL);
+    R_jumpctxt(R_ToplevelContext, CTXT_TOPLEVEL, NULL);
 }
 #endif
 
@@ -1578,6 +1545,10 @@
 	    if (ENTRY_HANDLER(entry) == R_RestartToken)
 		return; /* go to default error handling; do not reset stack */
 	    else {
+		/* if we are in the process of handling a C stack
+		   overflow, treat all calling handlers ar failed */
+		if (R_OldCStackLimit)
+		    break;
 		SEXP hooksym, hcall, qcall;
 		/* protect oldstack here, not outside loop, so handler
 		   stack gets unwound in case error is protect stack
diff -Nru r-base-3.2.3/src/main/eval.c r-base-3.3.1/src/main/eval.c
--- r-base-3.2.3/src/main/eval.c	2015-10-27 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/main/eval.c	2016-05-20 22:15:07.000000000 +0000
@@ -234,8 +234,66 @@
 	    SEXP fun = CAR(cptr->call);
 	    if(strlen(buf) < PROFLINEMAX) {
 		strcat(buf, "\"");
-		strcat(buf, TYPEOF(fun) == SYMSXP ? CHAR(PRINTNAME(fun)) :
-		       "<Anonymous>");
+
+		char itembuf[PROFITEMMAX];
+
+		if (TYPEOF(fun) == SYMSXP) {
+		    snprintf(itembuf, PROFITEMMAX-1, "%s", CHAR(PRINTNAME(fun)));
+
+		} else if ((CAR(fun) == R_DoubleColonSymbol ||
+			    CAR(fun) == R_TripleColonSymbol ||
+			    CAR(fun) == R_DollarSymbol) &&
+			   TYPEOF(CADR(fun)) == SYMSXP &&
+			   TYPEOF(CADDR(fun)) == SYMSXP) {
+		    /* Function accessed via ::, :::, or $. Both args must be
+		       symbols. It is possible to use strings with these
+		       functions, as in "base"::"list", but that's a very rare
+		       case so we won't bother handling it. */
+		    snprintf(itembuf, PROFITEMMAX-1, "%s%s%s",
+			     CHAR(PRINTNAME(CADR(fun))),
+			     CHAR(PRINTNAME(CAR(fun))),
+			     CHAR(PRINTNAME(CADDR(fun))));
+
+		} else if (CAR(fun) == R_Bracket2Symbol &&
+			   TYPEOF(CADR(fun)) == SYMSXP &&
+			   ((TYPEOF(CADDR(fun)) == SYMSXP ||
+			     TYPEOF(CADDR(fun)) == STRSXP ||
+			     TYPEOF(CADDR(fun)) == INTSXP ||
+			     TYPEOF(CADDR(fun)) == REALSXP) &&
+			    length(CADDR(fun)) > 0)) {
+		    /* Function accessed via [[. The first arg must be a symbol
+		       and the second can be a symbol, string, integer, or
+		       real. */
+		    SEXP arg1 = CADR(fun);
+		    SEXP arg2 = CADDR(fun);
+		    char arg2buf[PROFITEMMAX];
+
+		    if (TYPEOF(arg2) == SYMSXP) {
+			snprintf(arg2buf, PROFITEMMAX-1, "%s", CHAR(PRINTNAME(arg2)));
+
+		    } else if (TYPEOF(arg2) == STRSXP) {
+			snprintf(arg2buf, PROFITEMMAX-1, "\"%s\"", CHAR(STRING_ELT(arg2, 0)));
+
+		    } else if (TYPEOF(arg2) == INTSXP) {
+			snprintf(arg2buf, PROFITEMMAX-1, "%d", INTEGER(arg2)[0]);
+
+		    } else if (TYPEOF(arg2) == REALSXP) {
+			snprintf(arg2buf, PROFITEMMAX-1, "%.0f", REAL(arg2)[0]);
+
+		    } else {
+			/* Shouldn't get here, but just in case. */
+			arg2buf[0] = '\0';
+		    }
+
+		    snprintf(itembuf, PROFITEMMAX-1, "%s[[%s]]",
+			     CHAR(PRINTNAME(arg1)),
+			     arg2buf);
+
+		} else {
+		    sprintf(itembuf, "<Anonymous>");
+		}
+
+		strcat(buf, itembuf);
 		strcat(buf, "\" ");
 		if (R_Line_Profiling)
 		    lineprof(buf, cptr->srcref);
@@ -463,7 +521,7 @@
 	R_PendingPromises = prstack.next;
 	SET_PRSEEN(e, 0);
 	SET_PRVALUE(e, val);
-        SET_NAMED (val, 2);
+	SET_NAMED (val, 2);
 	SET_PRENV(e, R_NilValue);
     }
     return PRVALUE(e);
@@ -722,6 +780,22 @@
     UNPROTECT(3);
 }
 
+static void checkCompilerOptions(int jitEnabled)
+{
+    int old_visible = R_Visible;
+    SEXP packsym, funsym, call, fcall, arg;
+
+    packsym = install("compiler");
+    funsym = install("checkCompilerOptions");
+
+    PROTECT(arg = ScalarInteger(jitEnabled));
+    PROTECT(fcall = lang3(R_TripleColonSymbol, packsym, funsym));
+    PROTECT(call = lang2(fcall, arg));
+    eval(call, R_GlobalEnv);
+    UNPROTECT(3);
+    R_Visible = old_visible;
+}
+
 static int R_disable_bytecode = 0;
 
 void attribute_hidden R_init_jit_enabled(void)
@@ -737,6 +811,7 @@
 	    int val = atoi(enable);
 	    if (val > 0)
 		loadCompilerNamespace();
+	    checkCompilerOptions(val);
 	    R_jit_enabled = val;
 	}
     }
@@ -766,6 +841,7 @@
 
 SEXP attribute_hidden R_cmpfun(SEXP fun)
 {
+    int old_visible = R_Visible;
     SEXP packsym, funsym, call, fcall, val;
 
     packsym = install("compiler");
@@ -775,30 +851,34 @@
     PROTECT(call = lang2(fcall, fun));
     val = eval(call, R_GlobalEnv);
     UNPROTECT(2);
+    R_Visible = old_visible;
     return val;
 }
 
 static SEXP R_compileExpr(SEXP expr, SEXP rho)
 {
+    int old_visible = R_Visible;
     SEXP packsym, funsym, quotesym;
     SEXP qexpr, call, fcall, val;
 
     packsym = install("compiler");
-    funsym = install("compile");
+    funsym = install("tryCompile");
     quotesym = install("quote");
 
-    PROTECT(fcall = lang3(R_DoubleColonSymbol, packsym, funsym));
+    PROTECT(fcall = lang3(R_TripleColonSymbol, packsym, funsym));
     PROTECT(qexpr = lang2(quotesym, expr));
     PROTECT(call = lang3(fcall, qexpr, rho));
     val = eval(call, R_GlobalEnv);
     UNPROTECT(3);
+    R_Visible = old_visible;
     return val;
 }
 
-static SEXP R_compileAndExecute(SEXP call, SEXP rho)
+static Rboolean R_compileAndExecute(SEXP call, SEXP rho)
 {
     int old_enabled = R_jit_enabled;
-    SEXP code, val;
+    SEXP code;
+    Rboolean ans = FALSE;
 
     R_jit_enabled = 0;
     PROTECT(call);
@@ -806,9 +886,13 @@
     PROTECT(code = R_compileExpr(call, rho));
     R_jit_enabled = old_enabled;
 
-    val = bcEval(code, rho, TRUE);
+    if (TYPEOF(code) == BCODESXP) {
+	bcEval(code, rho, TRUE);
+	ans = TRUE;
+    }
+
     UNPROTECT(3);
-    return val;
+    return ans;
 }
 
 SEXP attribute_hidden do_enablejit(SEXP call, SEXP op, SEXP args, SEXP rho)
@@ -816,9 +900,13 @@
     int old = R_jit_enabled, new;
     checkArity(op, args);
     new = asInteger(CAR(args));
-    if (new > 0)
-	loadCompilerNamespace();
-    R_jit_enabled = new;
+    if (new >= 0) {
+	if (new > 0)
+	    loadCompilerNamespace();
+	checkCompilerOptions(new);
+	R_jit_enabled = new;
+    }
+    /* negative 'new' just returns 'old' */
     return ScalarInteger(old);
 }
 
@@ -877,7 +965,7 @@
 {
     SEXP formals, actuals, savedrho;
     volatile SEXP body, newrho;
-    SEXP f, a, tmp;
+    SEXP f, a, tmp, savesrc;
     RCNTXT cntxt;
 
     /* formals = list of formal parameters */
@@ -950,13 +1038,13 @@
     /*  Fix up any extras that were supplied by usemethod. */
 
     if (suppliedvars != R_NilValue)
-        addMissingVarsToNewEnv(newrho, suppliedvars);
+	addMissingVarsToNewEnv(newrho, suppliedvars);
 
     if (R_envHasNoSpecialSymbols(newrho))
 	SET_NO_SPECIAL_SYMBOLS(newrho);
 
     /*  Terminate the previous context and start a new one with the
-        correct environment. */
+	correct environment. */
 
     endcontext(&cntxt);
 
@@ -964,6 +1052,7 @@
 	the generic as the sysparent of the method because the method
 	is a straight substitution of the generic.  */
 
+    PROTECT(savesrc = R_Srcref);
     if( R_GlobalContext->callflag == CTXT_GENERIC )
 	begincontext(&cntxt, CTXT_RETURN, call,
 		     newrho, R_GlobalContext->sysparent, arglist, op);
@@ -1045,13 +1134,14 @@
 	PROTECT(tmp = eval(body, newrho));
     }
     cntxt.returnValue = tmp; /* make it available to on.exit */
+    R_Srcref = savesrc;
     endcontext(&cntxt);
 
     if (RDEBUG(op) && R_current_debug_state()) {
 	Rprintf("exiting from: ");
 	PrintCall(call, rho);
     }
-    UNPROTECT(3);
+    UNPROTECT(4);
     return (tmp);
 }
 
@@ -1256,7 +1346,7 @@
 	R_varloc_t loc;
 	int missing;
 	loc = R_findVarLocInFrame(rho,symbol);
-	if(loc == NULL)
+	if(R_VARLOC_IS_NULL(loc))
 	    error(_("could not find symbol \"%s\" in environment of the generic function"),
 		  CHAR(PRINTNAME(symbol)));
 	missing = R_GetVarLocMISSING(loc);
@@ -1464,8 +1554,8 @@
     if (rho == R_BaseEnv || rho == R_BaseNamespace)
 	return R_NilValue;
     else {
-	SEXP loc = (SEXP) R_findVarLocInFrame(rho, symbol);
-	return (loc != NULL) ? loc : R_NilValue;
+	R_varloc_t loc = R_findVarLocInFrame(rho, symbol);
+	return (! R_VARLOC_IS_NULL(loc)) ? loc.cell : R_NilValue;
     }
 }
 
@@ -1498,22 +1588,21 @@
     RCNTXT cntxt;
     PROTECT_INDEX vpi;
 
+    checkArity(op, args);
     sym = CAR(args);
     val = CADR(args);
     body = CADDR(args);
 
     if ( !isSymbol(sym) ) errorcall(call, _("non-symbol loop variable"));
 
-    if (R_jit_enabled > 2) {
-	R_compileAndExecute(call, rho);
+    dbg = RDEBUG(rho);
+    if (R_jit_enabled > 2 && !dbg && isUnmodifiedSpecSym(CAR(call), rho)
+	    && R_compileAndExecute(call, rho))
 	return R_NilValue;
-    }
 
     PROTECT(args);
     PROTECT(rho);
     PROTECT(val = eval(val, rho));
-    defineVar(sym, R_NilValue, rho);
-    PROTECT(cell = GET_BINDING_CELL(sym, rho));
 
     /* deal with the case where we are iterating over a factor
        we need to coerce to character - then iterate */
@@ -1531,7 +1620,8 @@
 
     val_type = TYPEOF(val);
 
-    dbg = RDEBUG(rho);
+    defineVar(sym, R_NilValue, rho);
+    PROTECT(cell = GET_BINDING_CELL(sym, rho));
     bgn = BodyHasBraces(body);
 
     /* bump up NAMED count of sequence to avoid modification by loop code */
@@ -1627,19 +1717,18 @@
 
     checkArity(op, args);
 
-    if (R_jit_enabled > 2) {
-	R_compileAndExecute(call, rho);
+    dbg = RDEBUG(rho);
+    if (R_jit_enabled > 2 && !dbg && isUnmodifiedSpecSym(CAR(call), rho)
+	    && R_compileAndExecute(call, rho))
 	return R_NilValue;
-    }
 
-    dbg = RDEBUG(rho);
     body = CADR(args);
     bgn = BodyHasBraces(body);
 
     begincontext(&cntxt, CTXT_LOOP, R_NilValue, rho, R_BaseEnv, R_NilValue,
 		 R_NilValue);
     if (SETJMP(cntxt.cjmpbuf) != CTXT_BREAK) {
-        while (asLogicalNoNA(eval(CAR(args), rho), call)) {
+	while (asLogicalNoNA(eval(CAR(args), rho), call)) {
 	    if (RDEBUG(rho) && !bgn && !R_GlobalContext->browserfinish) {
 		SrcrefPrompt("debug", R_Srcref);
 		PrintValue(body);
@@ -1668,12 +1757,11 @@
 
     checkArity(op, args);
 
-    if (R_jit_enabled > 2) {
-	R_compileAndExecute(call, rho);
+    dbg = RDEBUG(rho);
+    if (R_jit_enabled > 2 && !dbg && isUnmodifiedSpecSym(CAR(call), rho)
+	    && R_compileAndExecute(call, rho))
 	return R_NilValue;
-    }
 
-    dbg = RDEBUG(rho);
     body = CAR(args);
 
     begincontext(&cntxt, CTXT_LOOP, R_NilValue, rho, R_BaseEnv, R_NilValue,
@@ -1691,6 +1779,7 @@
 
 SEXP attribute_hidden NORET do_break(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
     findcontext(PRIMVAL(op), rho, R_NilValue);
 }
 
@@ -1992,9 +2081,10 @@
     if (rho == R_BaseEnv)
 	errorcall(call, _("cannot do complex assignments in base environment"));
     defineVar(R_TmpvalSymbol, R_NilValue, rho);
-    PROTECT((SEXP) (tmploc = R_findVarLocInFrame(rho, R_TmpvalSymbol)));
-    DISABLE_REFCNT((SEXP) tmploc);
-    DECREMENT_REFCNT(CDR((SEXP) tmploc));
+    tmploc = R_findVarLocInFrame(rho, R_TmpvalSymbol);
+    PROTECT(tmploc.cell);
+    DISABLE_REFCNT(tmploc.cell);
+    DECREMENT_REFCNT(CDR(tmploc.cell));
 
     /* Now set up a context to remove it when we are done, even in the
      * case of an error.  This all helps error() provide a better call.
@@ -2807,7 +2897,7 @@
 static SEXP classForGroupDispatch(SEXP obj) {
 
     return IS_S4_OBJECT(obj) ? R_data_class2(obj)
-            : getAttrib(obj, R_ClassSymbol);
+	    : getAttrib(obj, R_ClassSymbol);
 }
 
 attribute_hidden
@@ -2932,19 +3022,19 @@
 	t = classForGroupDispatch(CAR(s));
 	if (isString(t) && (stringPositionTr(t, dispatchClassName) >= 0))
 	    SET_STRING_ELT(m, i, PRINTNAME(lmeth));
-        else
+	else
 	    SET_STRING_ELT(m, i, R_BlankString);
 	s = CDR(s);
     }
     vmaxset(vmax);
 
     newvars = PROTECT(createS3Vars(
-        PROTECT(mkString(generic)),
-        lgr,
-        PROTECT(stringSuffix(lclass, lwhich)),
-        m,
-        rho,
-        R_BaseEnv
+	PROTECT(mkString(generic)),
+	lgr,
+	PROTECT(stringSuffix(lclass, lwhich)),
+	m,
+	rho,
+	R_BaseEnv
     ));
 
     PROTECT(t = LCONS(lmeth, CDR(call)));
@@ -3179,16 +3269,31 @@
 # ifdef COMPACT_INTSEQ
 #  define INTSEQSXP 9999
 # endif
+#define CACHE_SCALARS
 static R_INLINE SEXP GETSTACK_PTR_TAG(R_bcstack_t *s)
 {
     /* no error checking since only called with tag != 0 */
     SEXP value;
     switch (s->tag) {
     case REALSXP:
+#ifdef CACHE_SCALARS
+	if (R_CachedScalarReal != NULL) {
+	    value = R_CachedScalarReal;
+	    R_CachedScalarReal = NULL;
+	}
+	else
+#endif
 	value = allocVector(REALSXP, 1);
 	REAL(value)[0] = s->u.dval;
 	break;
     case INTSXP:
+#ifdef CACHE_SCALARS
+	if (R_CachedScalarInteger != NULL) {
+	    value = R_CachedScalarInteger;
+	    R_CachedScalarInteger = NULL;
+	}
+	else
+#endif
 	value = allocVector(INTSXP, 1);
 	INTEGER(value)[0] = s->u.ival;
 	break;
@@ -3284,8 +3389,24 @@
 
 #define SETSTACK_LOGICAL(i, v) SETSTACK_LOGICAL_PTR(R_BCNodeStackTop + (i), v)
 
-/* The next two macros will reuse a provided scalar box, if
-   provided. The box is assumed to be of the correct typa and size. */
+/* The next two macros will allow reuse a scalar box, if provided. The
+   box is assumed to be of the correct type and size and to have no
+   attributes. */
+#ifdef CACHE_SCALARS
+#define SETSTACK_REAL_EX(idx, dval, ans) do {		\
+	SEXP __ans__ = (ans);				\
+	if (__ans__ && R_CachedScalarReal == NULL)	\
+	    R_CachedScalarReal = __ans__;		\
+	SETSTACK_REAL(idx, dval);			\
+    } while (0)
+
+#define SETSTACK_INTEGER_EX(idx, ival, ans) do {	\
+	SEXP __ans__ = (ans);				\
+	if (__ans__ && R_CachedScalarInteger == NULL)	\
+	    R_CachedScalarInteger = __ans__;		\
+	SETSTACK_INTEGER(idx, ival);			\
+    } while (0)
+#else
 #define SETSTACK_REAL_EX(idx, dval, ans) do { \
 	if (ans) {			      \
 	    REAL(ans)[0] = dval;	      \
@@ -3301,6 +3422,7 @@
 	}					 \
 	else SETSTACK_INTEGER(idx, ival);	 \
     } while (0)
+#endif
 
 typedef union { double dval; int ival; } scalar_value_t;
 
@@ -3508,13 +3630,23 @@
 #define Arith2(opval,opsym) NewBuiltin2(cmp_arith2,opval,opsym,rho)
 #define Relop2(opval,opsym) NewBuiltin2(cmp_relop,opval,opsym,rho)
 
+#define R_MSG_NA	_("NaNs produced")
+#define CMP_ISNAN ISNAN
+//On Linux this is quite a bit faster; not on Mac OS X El Capitan:
+//#define CMP_ISNAN(x) ((x) != (x))
 #define FastMath1(fun, sym) do {					\
 	scalar_value_t vx;						\
 	SEXP sa = NULL;							\
 	int typex = bcStackScalarEx(R_BCNodeStackTop - 1, &vx, &sa);	\
 	if (typex == REALSXP) {						\
-	    SKIP_OP();							\
-	    SETSTACK_REAL_EX(-1, fun(vx.dval), sa);			\
+	    double dval = fun(vx.dval);					\
+	    if (CMP_ISNAN(dval)) {					\
+		SEXP call = VECTOR_ELT(constants, GETOP());		\
+		if (ISNAN(vx.dval)) dval = vx.dval;			\
+		else warningcall(call, R_MSG_NA);			\
+	    }								\
+	    else SKIP_OP();						\
+	    SETSTACK_REAL_EX(-1, dval, sa);				\
 	    NEXT();							\
 	}								\
 	else if (typex == INTSXP && vx.ival != NA_INTEGER) {		\
@@ -3633,8 +3765,14 @@
 	SEXP sa = NULL;							\
 	int typex = bcStackScalarRealEx(R_BCNodeStackTop - 1, &vx, &sa); \
 	if (typex == REALSXP) {						\
-	    SKIP_OP();							\
-	    SETSTACK_REAL_EX(-1, R_log(vx.dval), sa);			\
+	    double dval = R_log(vx.dval);				\
+	    if (CMP_ISNAN(dval)) {					\
+		SEXP call = VECTOR_ELT(constants, GETOP());		\
+		if (ISNAN(vx.dval)) dval = vx.dval;			\
+		else warningcall(call, R_MSG_NA);			\
+	    }								\
+	    else SKIP_OP();						\
+	    SETSTACK_REAL_EX(-1, dval, sa);				\
 	    NEXT();							\
 	}								\
 	SEXP call = VECTOR_ELT(constants, GETOP());			\
@@ -3652,9 +3790,16 @@
 	int typex = bcStackScalarRealEx(R_BCNodeStackTop - 2, &vx, &sa); \
 	int typey = bcStackScalarRealEx(R_BCNodeStackTop - 1, &vy, &sb); \
 	if (typex == REALSXP && typey == REALSXP) {			\
-	    SKIP_OP();							\
+	    double dval = logbase(vx.dval, vy.dval);			\
+	    if (ISNAN(dval)) {						\
+		SEXP call = VECTOR_ELT(constants, GETOP());		\
+		if (ISNAN(vx.dval)) dval = vx.dval;			\
+		else if (ISNAN(vy.dval)) dval = vy.dval;		\
+		else warningcall(call, R_MSG_NA);			\
+	    }								\
+	    else SKIP_OP();						\
 	    R_BCNodeStackTop--;						\
-	    SETSTACK_REAL_EX(-1, logbase(vx.dval, vy.dval), sa);	\
+	    SETSTACK_REAL_EX(-1, dval, sa);				\
 	    NEXT();							\
 	}								\
 	SEXP call = VECTOR_ELT(constants, GETOP());			\
@@ -3721,7 +3866,12 @@
 	SEXP sa = NULL;							\
 	int typex = bcStackScalarRealEx(R_BCNodeStackTop - 1, &vx, &sa); \
 	if (typex == REALSXP) {						\
-	    SETSTACK_REAL_EX(-1, fun(vx.dval), sa);			\
+	    double dval = fun(vx.dval);					\
+            if (ISNAN(dval)) {						\
+		if (ISNAN(vx.dval)) dval = vx.dval;			\
+		else warningcall(call, R_MSG_NA);			\
+	    }								\
+	    SETSTACK_REAL_EX(-1, dval, sa);				\
 	    NEXT();							\
 	}								\
 	SEXP args = CONS_NR(GETSTACK(-1), R_NilValue);			\
@@ -5164,6 +5314,7 @@
 	case STRSXP:
 	case RAWSXP:
 	    value = allocVector(TYPEOF(seq), 1);
+	    SET_NAMED(value, 1);
 	    BCNPUSH(value);
 	    break;
 	default: BCNPUSH(R_NilValue);
@@ -5252,8 +5403,6 @@
     OP(SETLOOPVAL, 0):
       BCNPOP_IGNORE_VALUE(); SETSTACK(-1, R_NilValue); NEXT();
     OP(INVISIBLE,0): R_Visible = FALSE; NEXT();
-    /**** for now LDCONST, LDTRUE, and LDFALSE duplicate/allocate to
-	  be defensive against bad package C code */
     OP(LDCONST, 1):
       R_Visible = TRUE;
       value = VECTOR_ELT(constants, GETOP());
@@ -5351,6 +5500,12 @@
 	/* get the function */
 	SEXP symbol = VECTOR_ELT(constants, GETOP());
 	value = getPrimitive(symbol, BUILTINSXP);
+//#define REPORT_OVERRIDEN_BUILTINS
+#ifdef REPORT_OVERRIDEN_BUILTINS
+	if (value != findFun(symbol, rho)) {
+	    Rprintf("Possibly overriden builtin: %s\n", PRIMNAME(value));
+	}
+#endif
 	if (RTRACE(value)) {
 	  Rprintf("trace: ");
 	  PrintValue(symbol);
@@ -5415,6 +5570,7 @@
 	if (ftype != SPECIALSXP) {
 	  SEXP h = findVar(R_DotsSymbol, rho);
 	  if (TYPEOF(h) == DOTSXP || h == R_NilValue) {
+	    PROTECT(h);
 	    for (; h != R_NilValue; h = CDR(h)) {
 	      SEXP val;
 	      if (ftype == BUILTINSXP) val = eval(CAR(h), rho);
@@ -5422,6 +5578,7 @@
 	      PUSHCALLARG(val);
 	      SETCALLARG_TAG(TAG(h));
 	    }
+	    UNPROTECT(1); /* h */
 	  }
 	  else if (h != R_MissingArg)
 	    error(_("'...' used in an incorrect context"));
@@ -5782,7 +5939,7 @@
 	  /* duplicate arguments and protect */
 	  PROTECT(args = duplicate(CDR(call)));
 	  /* insert evaluated promise for LHS as first argument */
-	  /* promise won't be captured so don't track refrences */
+	  /* promise won't be captured so don't track references */
 	  prom = R_mkEVPROMISE_NR(R_TmpvalSymbol, lhs);
 	  SETCAR(args, prom);
 	  /* insert evaluated promise for RHS as last argument */
@@ -5904,21 +6061,31 @@
 		       "switch(as.character( * ), ...)");
        if (TYPEOF(value) == STRSXP) {
 	   int i, n, which;
-	   if (names == R_NilValue)
-	       errorcall(call, _("numeric EXPR required for 'switch' without named alternatives"));
-	   if (TYPEOF(coffsets) != INTSXP)
-	       errorcall(call, "bad character 'switch' offsets");
-	   if (TYPEOF(names) != STRSXP || LENGTH(names) != LENGTH(coffsets))
-	       errorcall(call, "bad 'switch' names");
-	   n = LENGTH(names);
-	   which = n - 1;
-	   for (i = 0; i < n - 1; i++)
-	       if (pmatch(STRING_ELT(value, 0),
-			  STRING_ELT(names, i), 1 /* exact */)) {
-		   which = i;
-		   break;
+	   if (names == R_NilValue) {
+	       if (TYPEOF(ioffsets) != INTSXP)
+		   errorcall(call, _("bad numeric 'switch' offsets"));
+	       if (LENGTH(ioffsets) == 1) {
+		   pc = codebase + INTEGER(ioffsets)[0]; /* returns NULL */
+		   warningcall(call, _("'switch' with no alternatives"));
 	       }
-	   pc = codebase + INTEGER(coffsets)[which];
+	       else
+		   errorcall(call, _("numeric EXPR required for 'switch' "
+				     "without named alternatives"));
+	   } else {
+	       if (TYPEOF(coffsets) != INTSXP)
+		   errorcall(call, _("bad character 'switch' offsets"));
+	       if (TYPEOF(names) != STRSXP || LENGTH(names) != LENGTH(coffsets))
+		   errorcall(call, "bad 'switch' names");
+	       n = LENGTH(names);
+	       which = n - 1;
+	       for (i = 0; i < n - 1; i++)
+		   if (pmatch(STRING_ELT(value, 0),
+			      STRING_ELT(names, i), 1 /* exact */)) {
+		       which = i;
+		       break;
+		   }
+	       pc = codebase + INTEGER(coffsets)[which];
+	   }
        }
        else {
 	   if (TYPEOF(ioffsets) != INTSXP)
@@ -5927,6 +6094,8 @@
 	   if (which != NA_INTEGER) which--;
 	   if (which < 0 || which >= LENGTH(ioffsets))
 	       which = LENGTH(ioffsets) - 1;
+	   if (LENGTH(ioffsets) == 1)
+	       warningcall(call, _("'switch' with no alternatives"));
 	   pc = codebase + INTEGER(ioffsets)[which];
        }
        NEXT();
@@ -6146,6 +6315,7 @@
 
 SEXP attribute_hidden do_bcversion(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+  checkArity(op, args);
   SEXP ans = allocVector(INTSXP, 1);
   INTEGER(ans)[0] = R_bcVersion;
   return ans;
@@ -6319,6 +6489,7 @@
     SEXP val;
     int i;
 
+    checkArity(op, args);
     val = allocVector(INTSXP, OPCOUNT);
     for (i = 0; i < OPCOUNT; i++)
 	INTEGER(val)[i] = opcode_counts[i];
@@ -6339,6 +6510,7 @@
     double dinterval = 0.02;
     int i;
 
+    checkArity(op, args);
     if (R_Profiling)
 	error(_("profile timer in use"));
     if (bc_profiling)
@@ -6376,6 +6548,7 @@
 {
     struct itimerval itv;
 
+    checkArity(op, args);
     if (! bc_profiling)
 	error(_("not byte code profiling"));
 
@@ -6392,12 +6565,15 @@
 }
 #else
 SEXP NORET do_bcprofcounts(SEXP call, SEXP op, SEXP args, SEXP env) {
+    checkArity(op, args);
     error(_("byte code profiling is not supported in this build"));
 }
 SEXP NORET do_bcprofstart(SEXP call, SEXP op, SEXP args, SEXP env) {
+    checkArity(op, args);
     error(_("byte code profiling is not supported in this build"));
 }
 SEXP NORET do_bcprofstop(SEXP call, SEXP op, SEXP args, SEXP env) {
+    checkArity(op, args);
     error(_("byte code profiling is not supported in this build"));
 }
 #endif
@@ -6432,8 +6608,8 @@
     SEXP val;
     checkArity(op, args);
     if (R_ExitContext && (val = R_ExitContext->returnValue)){
-        MARK_NOT_MUTABLE(val);
-        return val;
+	MARK_NOT_MUTABLE(val);
+	return val;
     }
     return CAR(args); /* default */
 }
diff -Nru r-base-3.2.3/src/main/g_alab_her.c r-base-3.3.1/src/main/g_alab_her.c
--- r-base-3.2.3/src/main/g_alab_her.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/g_alab_her.c	2016-03-16 23:04:17.000000000 +0000
@@ -151,11 +151,11 @@
 /* this is the version of the flabelwidth() method that is specific to the
    case when the current Plotter font is a Hershey font; called in
    g_flabelwidth () .
-
+   
    Argument 'enc' is ignored: these are in their own encoding.
 */
 attribute_hidden
-double R_GE_VStrWidth (const char *s, cetype_t enc,
+double R_GE_VStrWidth (const char *s, cetype_t enc, 
 		       const pGEcontext gc, pGEDevDesc dd)
 {
   double label_width;
@@ -170,7 +170,7 @@
 
   /* convert string to a codestring, including annotations */
   codestring = _controlify (dd, (const unsigned char *) s,
-			    gc->fontfamily[3] - 1, gc->fontface);
+			    gc->fontfamily[7] - 1, gc->fontface);
 
   label_width = _label_width_hershey (gc, dd, codestring);
 
@@ -192,7 +192,7 @@
 }
 
 attribute_hidden
-double R_GE_VStrHeight (const char *s, cetype_t enc,
+double R_GE_VStrHeight (const char *s, cetype_t enc, 
 			const pGEcontext gc, pGEDevDesc dd)
 {
   double label_height;
@@ -202,7 +202,7 @@
 
   /* convert string to a codestring, including annotations */
   codestring = _controlify (dd, (const unsigned char *) s,
-			    gc->fontfamily[3] - 1, gc->fontface);
+			    gc->fontfamily[7] - 1, gc->fontface);
 
   label_height = _label_height_hershey (gc, dd, codestring);
 
@@ -258,7 +258,7 @@
 
   /* convert string to a codestring, including annotations */
   codestring = _controlify (dd, (const unsigned char *)s,
-			    gc->fontfamily[3] - 1, gc->fontface);
+			    gc->fontfamily[7] - 1, gc->fontface);
 
 
   /* PAUL MURRELL
@@ -977,3 +977,4 @@
 
   return found;
 }
+
diff -Nru r-base-3.2.3/src/main/gevents.c r-base-3.3.1/src/main/gevents.c
--- r-base-3.2.3/src/main/gevents.c	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/gevents.c	2016-03-16 23:04:15.000000000 +0000
@@ -64,7 +64,7 @@
 
     eventEnv = CAR(args);
     if (TYPEOF(eventEnv) != ENVSXP)
-        error(_("internal error"));
+	error(_("internal error"));
 
     if (!dd->canGenMouseDown &&
 	!dd->canGenMouseUp &&
@@ -111,7 +111,7 @@
 	for(int i = 1; i < NumDevices(); i++)
 	{
 	    if ((gd = GEgetDevice(i)) && (dd = gd->dev)
-	         && dd->gettingEvent){
+		 && dd->gettingEvent){
 		ret = TRUE;
 		break;
 	    }
@@ -137,8 +137,8 @@
     /* NB:  cleanup of event handlers must be done by driver in onExit handler */
 
     if (!NoDevices()) {
-        /* Initialize all devices */
-        i = 1;
+	/* Initialize all devices */
+	i = 1;
 	devNum = curDevice();
 	while (i++ < NumDevices()) {
 	    if ((gd = GEgetDevice(devNum)) && (dd = gd->dev)) {
@@ -185,7 +185,7 @@
 	    }
 	}
 	/* clean up */
-        i = 1;
+	i = 1;
 	devNum = curDevice();
 	while (i++ < NumDevices()) {
 	    if ((gd = GEgetDevice(devNum)) && (dd = gd->dev)) {
@@ -217,8 +217,8 @@
 	PROTECT(handler);
     }
     if (TYPEOF(handler) == CLOSXP) {
-        SEXP s_which = install("which");
-        defineVar(s_which, ScalarInteger(ndevNumber(dd)+1), dd->eventEnv);
+	SEXP s_which = install("which");
+	defineVar(s_which, ScalarInteger(ndevNumber(dd)+1), dd->eventEnv);
 	// Be portable: see PR#15793
 	int len = ((buttons & leftButton) != 0)
 	  + ((buttons & middleButton) != 0)
@@ -264,12 +264,12 @@
     }
 
     if (TYPEOF(handler) == CLOSXP) {
-        SEXP s_which = install("which");
-        defineVar(s_which, ScalarInteger(ndevNumber(dd)+1), dd->eventEnv);
+	SEXP s_which = install("which");
+	defineVar(s_which, ScalarInteger(ndevNumber(dd)+1), dd->eventEnv);
 	PROTECT(skey = mkString(keyname ? keyname : keynames[rkey]));
 	PROTECT(temp = lang2(handler, skey));
 	PROTECT(result = eval(temp, dd->eventEnv));
-        defineVar(install("result"), result, dd->eventEnv);
+	defineVar(install("result"), result, dd->eventEnv);
 	UNPROTECT(3);
 	R_FlushConsole();
     }
diff -Nru r-base-3.2.3/src/main/grep.c r-base-3.3.1/src/main/grep.c
--- r-base-3.2.3/src/main/grep.c	2015-11-25 23:15:13.000000000 +0000
+++ r-base-3.3.1/src/main/grep.c	2016-03-16 23:04:16.000000000 +0000
@@ -750,7 +750,7 @@
     pcre *re_pcre = NULL /* -Wall */;
     pcre_extra *re_pe = NULL;
     const unsigned char *tables = NULL /* -Wall */;
-    Rboolean use_UTF8 = FALSE, use_WC =  FALSE;
+    Rboolean use_UTF8 = FALSE, use_WC = FALSE;
     const void *vmax;
     int nwarn = 0;
 
@@ -776,9 +776,9 @@
 	perl_opt = 0;
     }
 
-    if (!isString(pat) || length(pat) < 1)
+    if (!isString(pat) || LENGTH(pat) < 1)
 	error(_("invalid '%s' argument"), "pattern");
-    if (length(pat) > 1)
+    if (LENGTH(pat) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "pattern");
 
     if (!isString(text))
@@ -1524,13 +1524,13 @@
 	perl_opt = 0;
     }
 
-    if (!isString(pat) || length(pat) < 1)
+    if (!isString(pat) || LENGTH(pat) < 1)
 	error(_("invalid '%s' argument"), "pattern");
-    if (length(pat) > 1)
+    if (LENGTH(pat) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "pattern");
-    if (!isString(rep) || length(rep) < 1)
+    if (!isString(rep) || LENGTH(rep) < 1)
 	error(_("invalid '%s' argument"), "replacement");
-    if (length(rep) > 1)
+    if (LENGTH(rep) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "replacement");
 
     if (!isString(text))
@@ -1914,7 +1914,7 @@
 	pcre_free(re_pcre);
 	pcre_free((void *)tables);
     } else tre_regfree(&reg);
-    DUPLICATE_ATTRIB(ans, text);
+    SHALLOW_DUPLICATE_ATTRIB(ans, text);
     /* This copied the class, if any */
     UNPROTECT(1);
     return ans;
@@ -2341,9 +2341,9 @@
     }
 
     /* Note that excluding NAs differs from grep/sub */
-    if (!isString(pat) || length(pat) < 1 || STRING_ELT(pat, 0) == NA_STRING)
+    if (!isString(pat) || LENGTH(pat) < 1 || STRING_ELT(pat, 0) == NA_STRING)
 	error(_("invalid '%s' argument"), "pattern");
-    if (length(pat) > 1)
+    if (LENGTH(pat) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "pattern");
 
     if (!isString(text))
@@ -2613,10 +2613,10 @@
 
 SEXP attribute_hidden do_regexec(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    SEXP pat, vec, ans, matchpos, matchlen;
+    SEXP pat, text, ans, matchpos, matchlen;
     int opt_icase, opt_fixed, useBytes;
 
-    Rboolean haveBytes, useWC = FALSE;
+    Rboolean use_WC = FALSE;
     const char *s, *t;
     const void *vmax = NULL;
 
@@ -2630,7 +2630,7 @@
     checkArity(op, args);
 
     pat = CAR(args); args = CDR(args);
-    vec = CAR(args); args = CDR(args);
+    text = CAR(args); args = CDR(args);
     opt_icase = asLogical(CAR(args)); args = CDR(args);
     opt_fixed = asLogical(CAR(args)); args = CDR(args);
     useBytes = asLogical(CAR(args));
@@ -2647,36 +2647,50 @@
     if(opt_icase) cflags |= REG_ICASE;
 
     if(!isString(pat) ||
-       (length(pat) < 1) ||
+       (LENGTH(pat) < 1) ||
        (STRING_ELT(pat, 0) == NA_STRING))
 	error(_("invalid '%s' argument"), "pattern");
-    if(length(pat) > 1)
+    if(LENGTH(pat) > 1)
 	warning(_("argument '%s' has length > 1 and only the first element will be used"), "pattern");
 
-    if(!isString(vec))
+    if(!isString(text))
 	error(_("invalid '%s' argument"), "text");
 
-    n = XLENGTH(vec);
+    n = XLENGTH(text);
 
+    if (!useBytes) {
+	Rboolean onlyASCII = IS_ASCII(STRING_ELT(pat, 0));
+	if(onlyASCII)
+	    for(i = 0; i < n; i++) {
+		if(STRING_ELT(text, i) == NA_STRING) continue;
+		if (!IS_ASCII(STRING_ELT(text, i))) {
+		    onlyASCII = FALSE;
+		    break;
+		}
+	    }
+	useBytes = onlyASCII;
+    }
     if(!useBytes) {
-	haveBytes = IS_BYTES(STRING_ELT(pat, 0));
+	Rboolean haveBytes = IS_BYTES(STRING_ELT(pat, 0));
 	if(!haveBytes)
 	    for(i = 0; i < n; i++) {
-		if(IS_BYTES(STRING_ELT(vec, i))) {
+		if(IS_BYTES(STRING_ELT(text, i))) {
 		    haveBytes = TRUE;
 		    break;
 		}
 	    }
-	if (haveBytes) useBytes = TRUE;
+	if(haveBytes) {
+	    useBytes = TRUE;
+	}
     }
 
     if(!useBytes) {
-	useWC = !IS_ASCII(STRING_ELT(pat, 0));
-	if(!useWC) {
+	use_WC = !IS_ASCII(STRING_ELT(pat, 0));
+	if(!use_WC) {
 	    for(i = 0 ; i < n ; i++) {
-		if(STRING_ELT(vec, i) == NA_STRING) continue;
-		if(!IS_ASCII(STRING_ELT(vec, i))) {
-		    useWC = TRUE;
+		if(STRING_ELT(text, i) == NA_STRING) continue;
+		if(!IS_ASCII(STRING_ELT(text, i))) {
+		    use_WC = TRUE;
 		    break;
 		}
 	    }
@@ -2685,7 +2699,7 @@
 
     if(useBytes)
 	rc = tre_regcompb(&reg, CHAR(STRING_ELT(pat, 0)), cflags);
-    else if (useWC)
+    else if (use_WC)
 	rc = tre_regwcomp(&reg, wtransChar(STRING_ELT(pat, 0)), cflags);
     else {
 	s = translateChar(STRING_ELT(pat, 0));
@@ -2707,7 +2721,7 @@
 
     for(i = 0; i < n; i++) {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	if(STRING_ELT(vec, i) == NA_STRING) {
+	if(STRING_ELT(text, i) == NA_STRING) {
 	    PROTECT(matchpos = ScalarInteger(NA_INTEGER));
 	    SEXP s_match_length = install("match.length");
 	    setAttrib(matchpos, s_match_length ,
@@ -2717,15 +2731,15 @@
 	} else {
 	    vmax = vmaxget();
 	    if(useBytes)
-		rc = tre_regexecb(&reg, CHAR(STRING_ELT(vec, i)),
+		rc = tre_regexecb(&reg, CHAR(STRING_ELT(text, i)),
 				  nmatch, pmatch, 0);
-	    else if(useWC) {
-		rc = tre_regwexec(&reg, wtransChar(STRING_ELT(vec, i)),
+	    else if(use_WC) {
+		rc = tre_regwexec(&reg, wtransChar(STRING_ELT(text, i)),
 				  nmatch, pmatch, 0);
 		vmaxset(vmax);
 	    }
 	    else {
-		t = translateChar(STRING_ELT(vec, i));
+		t = translateChar(STRING_ELT(text, i));
 		if (mbcslocale && !mbcsValid(t))
 		    error(_("input string %d is invalid in this locale"),
 			  i + 1);
@@ -2754,6 +2768,9 @@
 		PROTECT(matchpos = ScalarInteger(-1));
 		PROTECT(matchlen = ScalarInteger(-1));
 		setAttrib(matchpos, install("match.length"), matchlen);
+		if(useBytes)
+		    setAttrib(matchpos, install("useBytes"),
+			      R_TrueValue);
 		SET_VECTOR_ELT(ans, i, matchpos);
 		UNPROTECT(2);
 	    }
diff -Nru r-base-3.2.3/src/main/gzio.h r-base-3.3.1/src/main/gzio.h
--- r-base-3.2.3/src/main/gzio.h	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/gzio.h	2016-03-16 23:04:15.000000000 +0000
@@ -1,4 +1,4 @@
-/*
+/* 
    Based on gzio.c from zlib 1.2.3, but considerably modified!
 
    Copyright (C) 1995-2005 Jean-loup Gailly.
@@ -40,7 +40,7 @@
 #ifdef Win32
 # define OS_CODE  0x06
 #else
-# define OS_CODE  0x03
+# define OS_CODE  0x03 
 #endif
 
 /* R ADDITION */
@@ -245,7 +245,7 @@
     if (s->mode == 'w') {
         /* Write a very simple .gz header */
         fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-		Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/,
+		Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, 
 		OS_CODE);
         s->start = 10L;
     } else {
@@ -539,7 +539,7 @@
     gz_stream *s = (gz_stream*) file;
     if (s == NULL) return Z_STREAM_ERROR;
     if (s->mode == 'w') {
-        if (gz_flush (file, Z_FINISH) != Z_OK)
+        if (gz_flush (file, Z_FINISH) != Z_OK) 
 	    return destroy((gz_stream*) file);
         z_putLong (s->file, s->crc);
         z_putLong (s->file, (uLong) (s->in & 0xffffffff));
diff -Nru r-base-3.2.3/src/main/identical.c r-base-3.3.1/src/main/identical.c
--- r-base-3.2.3/src/main/identical.c	2015-08-25 22:18:46.000000000 +0000
+++ r-base-3.3.1/src/main/identical.c	2016-03-16 23:04:17.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2014  The R Core Team
+ *  Copyright (C) 2001-2015  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -150,19 +150,19 @@
     case NILSXP:
 	return TRUE;
     case LGLSXP:
-	if (xlength(x) != xlength(y)) return FALSE;
+	if (XLENGTH(x) != XLENGTH(y)) return FALSE;
 	/* Use memcmp (which is ISO C90) to speed up the comparison */
 	return memcmp((void *)LOGICAL(x), (void *)LOGICAL(y),
 		      xlength(x) * sizeof(int)) == 0 ? TRUE : FALSE;
     case INTSXP:
-	if (xlength(x) != xlength(y)) return FALSE;
+	if (XLENGTH(x) != XLENGTH(y)) return FALSE;
 	/* Use memcmp (which is ISO C90) to speed up the comparison */
 	return memcmp((void *)INTEGER(x), (void *)INTEGER(y),
 		      xlength(x) * sizeof(int)) == 0 ? TRUE : FALSE;
     case REALSXP:
     {
-	R_xlen_t n = xlength(x);
-	if(n != xlength(y)) return FALSE;
+	R_xlen_t n = XLENGTH(x);
+	if(n != XLENGTH(y)) return FALSE;
 	else {
 	    double *xp = REAL(x), *yp = REAL(y);
 	    int ne_strict = NUM_EQ | (SINGLE_NA << 1);
@@ -173,8 +173,8 @@
     }
     case CPLXSXP:
     {
-	R_xlen_t n = xlength(x);
-	if(n != xlength(y)) return FALSE;
+	R_xlen_t n = XLENGTH(x);
+	if(n != XLENGTH(y)) return FALSE;
 	else {
 	    Rcomplex *xp = COMPLEX(x), *yp = COMPLEX(y);
 	    int ne_strict = NUM_EQ | (SINGLE_NA << 1);
@@ -187,8 +187,8 @@
     }
     case STRSXP:
     {
-	R_xlen_t i, n = xlength(x);
-	if(n != xlength(y)) return FALSE;
+	R_xlen_t i, n = XLENGTH(x);
+	if(n != XLENGTH(y)) return FALSE;
 	for(i = 0; i < n; i++) {
 	    /* This special-casing for NAs is not needed */
 	    Rboolean na1 = (STRING_ELT(x, i) == NA_STRING),
@@ -207,8 +207,8 @@
     case VECSXP:
     case EXPRSXP:
     {
-	R_xlen_t i, n = xlength(x);
-	if(n != xlength(y)) return FALSE;
+	R_xlen_t i, n = XLENGTH(x);
+	if(n != XLENGTH(y)) return FALSE;
 	for(i = 0; i < n; i++)
 	    if(!R_compute_identical(VECTOR_ELT(x, i),VECTOR_ELT(y, i), flags))
 		return FALSE;
@@ -246,10 +246,10 @@
     case EXTPTRSXP:
 	return (EXTPTR_PTR(x) == EXTPTR_PTR(y) ? TRUE : FALSE);
     case RAWSXP:
-	if (xlength(x) != xlength(y)) return FALSE;
+	if (XLENGTH(x) != XLENGTH(y)) return FALSE;
 	/* Use memcmp (which is ISO C90) to speed up the comparison */
 	return memcmp((void *)RAW(x), (void *)RAW(y),
-		      xlength(x) * sizeof(Rbyte)) == 0 ? TRUE : FALSE;
+		      XLENGTH(x) * sizeof(Rbyte)) == 0 ? TRUE : FALSE;
 
 /*  case PROMSXP: args are evaluated, so will not be seen */
 	/* test for equality of the substituted expression -- or should
@@ -257,7 +257,7 @@
 	/*#define PREXPR(x)	((x)->u.promsxp.expr)
 	  #define PRENV(x)	((x)->u.promsxp.env)
 	  return(R_compute_identical(subsititute(PREXPR(x), PRENV(x),
-	                             flags),
+				     flags),
 	  subsititute(PREXPR(y), PRENV(y))));*/
     case S4SXP:
 	/* attributes already tested, so all slots identical */
diff -Nru r-base-3.2.3/src/main/inspect.c r-base-3.3.1/src/main/inspect.c
--- r-base-3.2.3/src/main/inspect.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/inspect.c	2016-03-16 23:04:17.000000000 +0000
@@ -105,7 +105,7 @@
 	if (BINDING_IS_LOCKED(v)) { if (a) Rprintf(","); Rprintf("LCK"); a = 1; }
     }
     if (TYPEOF(v) == ENVSXP) {
-        if (FRAME_IS_LOCKED(v)) { if (a) Rprintf(","); Rprintf("LCK"); a = 1; }
+	if (FRAME_IS_LOCKED(v)) { if (a) Rprintf(","); Rprintf("LCK"); a = 1; }
 	if (IS_GLOBAL_FRAME(v)) { if (a) Rprintf(","); Rprintf("GL"); a = 1; }
     }
     if (LEVELS(v)) { if (a) Rprintf(","); Rprintf("gp=0x%x", LEVELS(v)); a = 1; }
@@ -119,7 +119,7 @@
     if (TYPEOF(v) == ENVSXP) /* NOTE: this is not a trivial OP since it involves looking up things
 				in the environment, so for a low-level debugging we may want to
 				avoid it .. */
-        PrintEnvironment(v);
+	PrintEnvironment(v);
     if (TYPEOF(v) == CHARSXP) {
 	if (IS_BYTES(v)) Rprintf("[bytes] ");
 	if (IS_LATIN1(v)) Rprintf("[latin1] ");
@@ -240,6 +240,7 @@
    two optional arguments (deep and pvec - see above), positional argument
    matching only */
 SEXP attribute_hidden do_inspect(SEXP call, SEXP op, SEXP args, SEXP env) {
+    checkArity(op, args);
     SEXP obj = CAR(args);
     int deep = -1;
     int pvec = 5;
diff -Nru r-base-3.2.3/src/main/internet.c r-base-3.3.1/src/main/internet.c
--- r-base-3.2.3/src/main/internet.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/internet.c	2016-03-16 23:04:16.000000000 +0000
@@ -96,29 +96,7 @@
     }
 }
 
-#ifdef Win32
-SEXP attribute_hidden do_setInternet2(SEXP call, SEXP op, SEXP args, SEXP env)
-{
-    int newUseInternet2;
-    SEXP newval, retval;
-
-    PROTECT(retval = ScalarLogical(UseInternet2));
-
-    checkArity(op, args);
-    newval = CAR(args);
-    if (length(newval) != 1) error(_("bad value"));
-    newUseInternet2 = asLogical(newval);
-
-    if (newUseInternet2 != NA_LOGICAL) {
-	R_Visible = FALSE;
-	UseInternet2 = newUseInternet2;
-    }
-    UNPROTECT(1);
-    return retval;
-}
-#endif
-
-Rconnection attribute_hidden
+Rconnection attribute_hidden 
 R_newurl(const char *description, const char * const mode, int type)
 {
     if(!initialized) internet_Init();
@@ -254,13 +232,14 @@
     SET_STRING_ELT(ans, 0, mkCharLen(buf, maxlen));
     UNPROTECT(1);
     return ans;
-
+		       
 }
 
 SEXP Rsockclose(SEXP ssock)
 {
     if (length(ssock) != 1) error("invalid 'socket' argument");
     int sock = asInteger(ssock);
+    if (sock <= 0) error(_("attempt to close invalid socket"));
     if(!initialized) internet_Init();
     if(initialized > 0)
 	(*ptr->sockclose)(&sock);
@@ -331,6 +310,7 @@
 
 SEXP attribute_hidden do_curlVersion(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
     if(!initialized) internet_Init();
     if(initialized > 0)
 	return (*ptr->curlVersion)(call, op, args, rho);
@@ -342,6 +322,7 @@
 
 SEXP attribute_hidden do_curlGetHeaders(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
     if(!initialized) internet_Init();
     if(initialized > 0)
 	return (*ptr->curlGetHeaders)(call, op, args, rho);
@@ -353,6 +334,7 @@
 
 SEXP attribute_hidden do_curlDownload(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
     if(!initialized) internet_Init();
     if(initialized > 0)
 	return (*ptr->curlDownload)(call, op, args, rho);
@@ -374,3 +356,4 @@
     }
     return (Rconnection)0; /* -Wall */
 }
+
diff -Nru r-base-3.2.3/src/main/iosupport.c r-base-3.3.1/src/main/iosupport.c
--- r-base-3.2.3/src/main/iosupport.c	2015-08-25 22:18:39.000000000 +0000
+++ r-base-3.3.1/src/main/iosupport.c	2016-03-16 23:04:15.000000000 +0000
@@ -169,12 +169,12 @@
     int result = iob->read_offset;
     BufferListItem* buf = iob->start_buf;
     while(buf && buf != iob->read_buf) {
-	result += IOBSIZE;
-	buf = buf->next;
+    	result += IOBSIZE;
+    	buf = buf->next;
     }
     return result;
 }
-
+    
 /* Initialization code for text buffers */
 
 static void transferChars(unsigned char *p, const char *q)
diff -Nru r-base-3.2.3/src/main/localecharset.c r-base-3.3.1/src/main/localecharset.c
--- r-base-3.2.3/src/main/localecharset.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/localecharset.c	2016-03-16 23:04:17.000000000 +0000
@@ -617,7 +617,7 @@
 	p = strrchr(la_loc, '.');
 	if(p) *p = '\0';
     }
-
+    
 #ifdef Win32
     /*
       ## PUTTY suggests mapping Windows code pages as
diff -Nru r-base-3.2.3/src/main/logic.c r-base-3.3.1/src/main/logic.c
--- r-base-3.2.3/src/main/logic.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/logic.c	2016-03-16 23:04:17.000000000 +0000
@@ -24,6 +24,7 @@
 
 #include <Defn.h>
 #include <Internal.h>
+#include <R_ext/Itermacros.h>
 
 /* interval at which to check interrupts, a guess */
 // #define NINTERRUPT 10000000
@@ -180,7 +181,8 @@
 	errorcall(call, _("invalid argument type"));
     }
     if (isLogical(arg) || isRaw(arg))
-	x = PROTECT(duplicate(arg));  // copy all attributes in this case
+	// copy all attributes in this case
+	x = PROTECT(shallow_duplicate(arg));
     else {
 	x = PROTECT(allocVector(isRaw(arg) ? RAWSXP : LGLSXP, len));
 	PROTECT(names = getAttrib(arg, R_NamesSymbol));
@@ -288,7 +290,7 @@
 
 static SEXP binaryLogic(int code, SEXP s1, SEXP s2)
 {
-    R_xlen_t i, n, n1, n2;
+    R_xlen_t i, n, n1, n2, i1, i2;
     int x1, x2;
     SEXP ans;
 
@@ -303,30 +305,30 @@
 
     switch (code) {
     case 1:		/* & : AND */
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    x1 = LOGICAL(s1)[i % n1];
-	    x2 = LOGICAL(s2)[i % n2];
+	    x1 = LOGICAL(s1)[i1];
+	    x2 = LOGICAL(s2)[i2];
 	    if (x1 == 0 || x2 == 0)
 		LOGICAL(ans)[i] = 0;
 	    else if (x1 == NA_LOGICAL || x2 == NA_LOGICAL)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = 1;
-	}
+	});
 	break;
     case 2:		/* | : OR */
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    x1 = LOGICAL(s1)[i % n1];
-	    x2 = LOGICAL(s2)[i % n2];
+	    x1 = LOGICAL(s1)[i1];
+	    x2 = LOGICAL(s2)[i2];
 	    if ((x1 != NA_LOGICAL && x1) || (x2 != NA_LOGICAL && x2))
 		LOGICAL(ans)[i] = 1;
 	    else if (x1 == 0 && x2 == 0)
 		LOGICAL(ans)[i] = 0;
 	    else
 		LOGICAL(ans)[i] = NA_LOGICAL;
-	}
+	});
 	break;
     case 3:
 	error(_("Unary operator `!' called with two arguments"));
@@ -337,7 +339,7 @@
 
 static SEXP binaryLogic2(int code, SEXP s1, SEXP s2)
 {
-    R_xlen_t i, n, n1, n2;
+    R_xlen_t i, n, n1, n2, i1, i2;
     Rbyte x1, x2;
     SEXP ans;
 
@@ -352,20 +354,20 @@
 
     switch (code) {
     case 1:		/* & : AND */
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    x1 = RAW(s1)[i % n1];
-	    x2 = RAW(s2)[i % n2];
+	    x1 = RAW(s1)[i1];
+	    x2 = RAW(s2)[i2];
 	    RAW(ans)[i] = x1 & x2;
-	}
+	});
 	break;
     case 2:		/* | : OR */
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    x1 = RAW(s1)[i % n1];
-	    x2 = RAW(s2)[i % n2];
+	    x1 = RAW(s1)[i1];
+	    x2 = RAW(s2)[i2];
 	    RAW(ans)[i] = x1 | x2;
-	}
+	});
 	break;
     }
     return ans;
@@ -380,19 +382,19 @@
     int has_na = 0;
     for (i = 0; i < n; i++) {
 //	if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-        if (!na_rm && x[i] == NA_LOGICAL) has_na = 1;
-        else {
-            if (x[i] == TRUE && op == _OP_ANY) return TRUE;
-            if (x[i] == FALSE && op == _OP_ALL) return FALSE;
-        }
+	if (!na_rm && x[i] == NA_LOGICAL) has_na = 1;
+	else {
+	    if (x[i] == TRUE && op == _OP_ANY) return TRUE;
+	    if (x[i] == FALSE && op == _OP_ALL) return FALSE;
+	}
     }
     switch (op) {
     case _OP_ANY:
-        return has_na ? NA_LOGICAL : FALSE;
+	return has_na ? NA_LOGICAL : FALSE;
     case _OP_ALL:
-        return has_na ? NA_LOGICAL : TRUE;
+	return has_na ? NA_LOGICAL : TRUE;
     default:
-        error("bad op value for do_logic3");
+	error("bad op value for do_logic3");
     }
     return NA_LOGICAL; /* -Wall */
 }
@@ -439,13 +441,13 @@
 	    t = coerceVector(t, LGLSXP);
 	}
 	val = checkValues(PRIMVAL(op), narm, LOGICAL(t), XLENGTH(t));
-        if (val != NA_LOGICAL) {
-            if ((PRIMVAL(op) == _OP_ANY && val)
-                || (PRIMVAL(op) == _OP_ALL && !val)) {
-                has_na = 0;
-                break;
-            }
-        } else has_na = 1;
+	if (val != NA_LOGICAL) {
+	    if ((PRIMVAL(op) == _OP_ANY && val)
+		|| (PRIMVAL(op) == _OP_ALL && !val)) {
+		has_na = 0;
+		break;
+	    }
+	} else has_na = 1;
     }
     UNPROTECT(2);
     return has_na ? ScalarLogical(NA_LOGICAL) : ScalarLogical(val);
diff -Nru r-base-3.2.3/src/main/main.c r-base-3.3.1/src/main/main.c
--- r-base-3.2.3/src/main/main.c	2015-10-27 23:15:05.000000000 +0000
+++ r-base-3.3.1/src/main/main.c	2016-03-16 23:04:17.000000000 +0000
@@ -317,9 +317,33 @@
 
 static unsigned char DLLbuf[CONSOLE_BUFFER_SIZE+1], *DLLbufp;
 
+static void check_session_exit()
+{
+    if (! R_Interactive) {
+	/* This funtion will be called again after a LONGJMP if an
+	   error is signaled from one of the functions called. The
+	   'exiting' variable identifies this and results in
+	   R_Suicide. */
+	static Rboolean exiting = FALSE;
+	if (exiting)
+	    R_Suicide(_("error during cleanup\n"));
+	else {
+	    exiting = TRUE;
+	    if (GetOption1(install("error")) != R_NilValue) {
+		exiting = FALSE;
+		return;
+	    }
+	    REprintf(_("Execution halted\n"));
+	    R_CleanUp(SA_NOSAVE, 1, 0); /* quit, no save, no .Last, status=1 */
+	}
+	
+    }
+}
+
 void R_ReplDLLinit(void)
 {
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     R_IoBufferWriteReset(&R_ConsoleIob);
     prompt_type = 1;
@@ -593,8 +617,10 @@
 		if(ConsoleBuf[0] == '4') R_CleanUp(SA_SAVE, 71, 0);
 	    }
 	}
+	REprintf("R is aborting now ...\n");
     }
-    REprintf("aborting ...\n");
+    else // non-interactively :
+	REprintf("An irrecoverable exception occurred. R is aborting now ...\n");
     R_CleanTempDir();
     /* now do normal behaviour, e.g. core dump */
     signal(signum, SIG_DFL);
@@ -661,7 +687,9 @@
 {
     FILE * volatile fp = fparg; /* is this needed? */
     if (fp != NULL) {
-	if (! SETJMP(R_Toplevel.cjmpbuf)) {
+	if (SETJMP(R_Toplevel.cjmpbuf))
+	    check_session_exit();
+	else {
 	    R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
 	    R_ReplFile(fp, env);
 	}
@@ -718,7 +746,7 @@
 	char *p, Rlocale[1000]; /* Windows' locales can be very long */
 	p = getenv("LC_ALL");
 	strncpy(Rlocale, p ? p : "", 1000);
-        Rlocale[1000 - 1] = '\0';
+	Rlocale[1000 - 1] = '\0';
 	if(!(p = getenv("LC_CTYPE"))) p = Rlocale;
 	/* We'd like to use warning, but need to defer.
 	   Also cannot translate. */
@@ -811,6 +839,7 @@
     R_Toplevel.nextcontext = NULL;
     R_Toplevel.callflag = CTXT_TOPLEVEL;
     R_Toplevel.cstacktop = 0;
+    R_Toplevel.gcenabled = R_GCEnabled;
     R_Toplevel.promargs = R_NilValue;
     R_Toplevel.callfun = R_NilValue;
     R_Toplevel.call = R_NilValue;
@@ -823,10 +852,15 @@
     R_Toplevel.intstack = R_BCIntStackTop;
 #endif
     R_Toplevel.cend = NULL;
+    R_Toplevel.cenddata = NULL;
     R_Toplevel.intsusp = FALSE;
     R_Toplevel.handlerstack = R_HandlerStack;
     R_Toplevel.restartstack = R_RestartStack;
     R_Toplevel.srcref = R_NilValue;
+    R_Toplevel.prstack = NULL;
+    R_Toplevel.returnValue = NULL;
+    R_Toplevel.evaldepth = 0;
+    R_Toplevel.browserfinish = 0;
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     R_ExitContext = NULL;
 
@@ -854,7 +888,8 @@
 	R_Suicide(_("unable to open the base package\n"));
 
     doneit = 0;
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     if (R_SignalHandlers) init_signal_handlers();
     if (!doneit) {
@@ -883,7 +918,8 @@
 
     /* require(methods) if it is in the default packages */
     doneit = 0;
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     if (!doneit) {
 	doneit = 1;
@@ -921,15 +957,18 @@
        or dropped on the application.
     */
     doneit = 0;
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     if (!doneit) {
 	doneit = 1;
 	R_InitialData();
     }
     else {
-	if (! SETJMP(R_Toplevel.cjmpbuf)) {
-	    warning(_("unable to restore saved data in %s\n"), get_workspace_name());
+	if (SETJMP(R_Toplevel.cjmpbuf))
+	    check_session_exit();
+	else {
+    	    warning(_("unable to restore saved data in %s\n"), get_workspace_name());
 	}
     }
 
@@ -938,7 +977,8 @@
        If there is an error we continue. */
 
     doneit = 0;
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     if (!doneit) {
 	doneit = 1;
@@ -956,7 +996,8 @@
        If there is an error we continue. */
 
     doneit = 0;
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     if (!doneit) {
 	doneit = 1;
@@ -979,9 +1020,20 @@
 	REprintf(_("During startup - "));
 	PrintWarnings();
     }
+    if(R_Verbose)
+	REprintf(" ending setup_Rmainloop(): R_Interactive = %d {main.c}\n",
+		 R_Interactive);
 
     /* trying to do this earlier seems to run into bootstrapping issues. */
-    R_init_jit_enabled();
+    doneit = 0;
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
+    R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
+    if (!doneit) {
+	doneit = 1;
+	R_init_jit_enabled();
+    } else
+	R_Suicide(_("unable to initialize the JIT\n"));
     R_Is_Running = 2;
 }
 
@@ -1001,7 +1053,8 @@
 {
     /* Here is the real R read-eval-loop. */
     /* We handle the console until end-of-file. */
-    SETJMP(R_Toplevel.cjmpbuf);
+    if (SETJMP(R_Toplevel.cjmpbuf))
+	check_session_exit();
     R_GlobalContext = R_ToplevelContext = R_SessionContext = &R_Toplevel;
     R_ReplConsole(R_GlobalEnv, 0, 0);
     end_Rmainloop(); /* must go here */
@@ -1071,14 +1124,6 @@
 	    R_BrowserLastCommand = 'n';
 	} else if (!strcmp(expr, "Q")) {
 
-	    /* Run onexit/cend code for everything above the target.
-	       The browser context is still on the stack, so any error
-	       will drop us back to the current browser.  Not clear
-	       this is a good thing.  Also not clear this should still
-	       be here now that jump_to_toplevel is used for the
-	       jump. */
-	    R_run_onexits(R_ToplevelContext);
-
 	    /* this is really dynamic state that should be managed as such */
 	    SET_RDEBUG(rho, 0); /*PR#1721*/
 
@@ -1100,7 +1145,7 @@
 static void PrintCall(SEXP call, SEXP rho)
 {
     int old_bl = R_BrowseLines,
-        blines = asInteger(GetOption1(install("deparse.max.lines")));
+	blines = asInteger(GetOption1(install("deparse.max.lines")));
     if(blines != NA_INTEGER && blines > 0)
 	R_BrowseLines = blines;
     PrintValueRec(call, rho);
@@ -1117,6 +1162,9 @@
     int savestack, browselevel;
     SEXP ap, topExp, argList;
 
+    /* Cannot call checkArity(op, args), because "op" may be a closure  */
+    /* or a primitive other than "browser".  */
+
     /* argument matching */
     PROTECT(ap = list4(R_NilValue, R_NilValue, R_NilValue, R_NilValue));
     SET_TAG(ap,  install("text"));
@@ -1138,8 +1186,8 @@
 
     /* return if 'expr' is not TRUE */
     if( !asLogical(CADDR(argList)) ) {
-        UNPROTECT(1);
-        return R_NilValue;
+	UNPROTECT(1);
+	return R_NilValue;
     }
 
     /* Save the evaluator state information */
@@ -1152,17 +1200,17 @@
     saveGlobalContext = R_GlobalContext;
 
     if (!RDEBUG(rho)) {
-        int skipCalls = asInteger(CADDDR(argList));
+	int skipCalls = asInteger(CADDDR(argList));
 	cptr = R_GlobalContext;
 	while ( ( !(cptr->callflag & CTXT_FUNCTION) || skipCalls--)
 		&& cptr->callflag )
 	    cptr = cptr->nextcontext;
 	Rprintf("Called from: ");
-        if( cptr != R_ToplevelContext ) {
+	if( cptr != R_ToplevelContext ) {
 	    PrintCall(cptr->call, rho);
 	    SET_RDEBUG(cptr->cloenv, 1);
-        } else
-            Rprintf("top level \n");
+	} else
+	    Rprintf("top level \n");
 
 	R_BrowseLines = 0;
     }
@@ -1236,6 +1284,7 @@
     SA_TYPE ask=SA_DEFAULT;
     int status, runLast;
 
+    checkArity(op, args);
     /* if there are any browser contexts active don't quit */
     if(countContexts(CTXT_BROWSER, 1)) {
 	warning(_("cannot quit from browser"));
@@ -1534,6 +1583,7 @@
     }
 
     val = R_tryEval(e, NULL, &errorOccurred);
+    UNPROTECT(1); /* e */
     if(!errorOccurred) {
 	PROTECT(val);
 	if(TYPEOF(val) != LGLSXP) {
diff -Nru r-base-3.2.3/src/main/Makefile.in r-base-3.3.1/src/main/Makefile.in
--- r-base-3.2.3/src/main/Makefile.in	2015-08-25 22:18:39.000000000 +0000
+++ r-base-3.3.1/src/main/Makefile.in	2016-03-16 23:04:14.000000000 +0000
@@ -30,7 +30,7 @@
 	objects.c options.c \
 	paste.c platform.c plot.c plot3d.c plotmath.c \
 	print.c printarray.c printvector.c printutils.c qsort.c \
-	random.c raw.c registration.c relop.c rlocale.c \
+	radixsort.c random.c raw.c registration.c relop.c rlocale.c \
 	saveload.c scan.c seq.c serialize.c sort.c source.c split.c \
 	sprintf.c startup.c subassign.c subscript.c subset.c summary.c sysutils.c \
 	times.c \
@@ -54,6 +54,7 @@
 	basedecl.h \
 	contour-common.h \
 	datetime.h \
+	duplicate.h \
 	gzio.h \
 	qsort-body.c \
 	rlocale_data.h \
@@ -71,36 +72,26 @@
 	$(SOURCES_F) \
 	gram.y
 
-ZLIB_CPPFLAGS = @BUILD_ZLIB_TRUE@ -I$(top_srcdir)/src/extra/zlib
-BZLIB_CPPFLAGS = @BUILD_BZLIB_TRUE@ -I$(top_srcdir)/src/extra/bzip2
-PCRE_CPPFLAGS = @BUILD_PCRE_TRUE@ -I$(top_srcdir)/src/extra/pcre
 TRE_CPPFLAGS = @BUILD_TRE_TRUE@ -I$(top_srcdir)/src/extra
 XDR_CPPFLAGS = @BUILD_XDR_TRUE@ -I$(top_srcdir)/src/extra/xdr
 @BUILD_XDR_FALSE@XDR_CPPFLAGS = @TIRPC_CPPFLAGS@
-XZ_CPPFLAGS = @BUILD_XZ_TRUE@  -I$(top_srcdir)/src/extra/xz/api
 
 ## platform.c needs $(CURL_CPPFLAGS).
-ALL_CPPFLAGS = $(ZLIB_CPPFLAGS) $(BZLIB_CPPFLAGS) $(PCRE_CPPFLAGS) \
-  $(TRE_CPPFLAGS) $(XDR_CPPFLAGS) $(XZ_CPPFLAGS) $(R_XTRA_CPPFLAGS) \
+ALL_CPPFLAGS = $(TRE_CPPFLAGS) $(XDR_CPPFLAGS) $(R_XTRA_CPPFLAGS) \
   $(CURL_CPPFLAGS) $(CPPFLAGS) -I$(top_srcdir)/src/nmath $(DEFS)
 @WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO)
 @WANT_R_SHLIB_TRUE@ALL_FFLAGS = $(ALL_FFLAGS_LO)
 
 
-## use an explicit library: there might be an unsatisfactory -lz around
-R_ZLIBS = @BUILD_ZLIB_TRUE@ ../extra/zlib/libz.a
-R_BZLIBS = @BUILD_BZLIB_TRUE@ ../extra/bzip2/libbz2.a
-R_PCRE = @BUILD_PCRE_TRUE@ ../extra/pcre/libpcre.a
+## use an explicit library: there might be an unsatisfactory -lintl around
 R_TRE = @BUILD_TRE_TRUE@ ../extra/tre/libtre.a
 R_XDR = @BUILD_XDR_TRUE@ ../extra/xdr/libxdr.a
-R_XZ = @BUILD_XZ_TRUE@  ../extra/xz/liblzma.a
 R_LIBINTL = @BUILD_LIBINTL_TRUE@ ../extra/intl/libintl.a
 R_TZONE = @BUILD_TZONE_TRUE@ ../extra/tzone/libtz.a
 
 MAIN_LIBS = ../unix/libunix.a ../appl/libappl.a ../nmath/libnmath.a
 MAIN_OBJS = `ls ../unix/*.o ../appl/*.o ../nmath/*.o`
-EXTRA_STATIC_LIBS = \
-  $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) $(R_TZONE)
+EXTRA_STATIC_LIBS = $(R_TRE) $(R_XDR) $(R_LIBINTL) $(R_TZONE)
 STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
 
 EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)
@@ -154,9 +145,9 @@
 
 libR.a: $(OBJECTS) $(STATIC_LIBS)
 	-@mkdir libs
-	@(cd libs; for l in $(STATIC_LIBS); do $(AR) x ../$$l; done)
+	@(cd libs; for l in $(STATIC_LIBS); do $(AR) -x ../$$l; done)
 	@rm -rf $@
-	$(AR) cr $@ $(OBJECTS) libs/*o
+	$(AR) -cr $@ $(OBJECTS) libs/*o
 	$(RANLIB) $@
 	@rm -rf libs
 
diff -Nru r-base-3.2.3/src/main/Makefile.win r-base-3.3.1/src/main/Makefile.win
--- r-base-3.2.3/src/main/Makefile.win	2015-03-18 23:03:56.000000000 +0000
+++ r-base-3.3.1/src/main/Makefile.win	2016-03-16 23:04:16.000000000 +0000
@@ -26,7 +26,7 @@
 	objects.c options.c \
 	paste.c platform.c plot.c plot3d.c plotmath.c \
 	print.c printarray.c printvector.c printutils.c qsort.c \
-	random.c raw.c registration.c relop.c rlocale.c \
+	radixsort.c random.c raw.c registration.c relop.c rlocale.c \
 	saveload.c scan.c seq.c serialize.c sort.c source.c split.c \
 	sprintf.c startup.c subassign.c subscript.c subset.c summary.c sysutils.c \
 	times.c \
@@ -74,8 +74,8 @@
 endif
 
 ifdef USE_LIBCURL
-connections-CPPFLAGS += -DHAVE_CURL_CURL_H
-platform-CPPFLAGS += -DHAVE_CURL_CURL_H
+connections-CPPFLAGS += -DHAVE_CURL_CURL_H -DHAVE_LIBCURL
+platform-CPPFLAGS += -DHAVE_CURL_CURL_H -DHAVE_LIBCURL
 endif
 
 
diff -Nru r-base-3.2.3/src/main/memory.c r-base-3.3.1/src/main/memory.c
--- r-base-3.2.3/src/main/memory.c	2015-09-04 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/main/memory.c	2016-03-16 23:04:16.000000000 +0000
@@ -48,9 +48,9 @@
 
    level 0 is no additional instrumentation
    level 1 marks uninitialized numeric, logical, integer, raw,
-           complex vectors and R_alloc memory
+	   complex vectors and R_alloc memory
    level 2 marks the data section of vector nodes as inaccessible
-           when they are freed.
+	   when they are freed.
 
    level 3 was withdrawn in R 3.2.0.
 
@@ -78,12 +78,6 @@
 // internal version of headers
 #  include "vg/memcheck.h"
 # endif
-# ifndef VALGRIND_MAKE_MEM_NOACCESS
-// old headers (<= 3.3.0?)
-#  define VALGRIND_MAKE_MEM_NOACCESS VALGRIND_MAKE_NOACCESS
-#  define VALGRIND_MAKE_MEM_DEFINED VALGRIND_MAKE_READABLE
-#  define VALGRIND_MAKE_MEM_UNDEFINED VALGRIND_MAKE_WRITABLE
-# endif
 #endif
 
 
@@ -94,6 +88,7 @@
 #include <R_ext/Rdynload.h>
 #include <R_ext/Rallocators.h> /* for R_allocator_t structure */
 #include <Rmath.h> // R_pow_di
+#include <Print.h> // R_print
 
 #if defined(Win32)
 extern void *Rm_malloc(size_t n);
@@ -226,6 +221,7 @@
 
 #define GC_TORTURE
 
+static int gc_pending = 0;
 #ifdef GC_TORTURE
 /* **** if the user specified a wait before starting to force
    **** collections it might make sense to also wait before starting
@@ -233,9 +229,9 @@
 static int gc_force_wait = 0;
 static int gc_force_gap = 0;
 static Rboolean gc_inhibit_release = FALSE;
-#define FORCE_GC (gc_force_wait > 0 ? (--gc_force_wait > 0 ? 0 : (gc_force_wait = gc_force_gap, 1)) : 0)
+#define FORCE_GC (gc_pending || (gc_force_wait > 0 ? (--gc_force_wait > 0 ? 0 : (gc_force_wait = gc_force_gap, 1)) : 0))
 #else
-# define FORCE_GC 0
+# define FORCE_GC gc_pending
 #endif
 
 #ifdef R_MEMORY_PROFILING
@@ -1590,6 +1586,7 @@
     FORWARD_NODE(R_BaseEnv);
     FORWARD_NODE(R_EmptyEnv);
     FORWARD_NODE(R_Warnings);	           /* Warnings, if any */
+    FORWARD_NODE(R_ReturnedValue);
 
     FORWARD_NODE(R_HandlerStack);          /* Condition handler stack */
     FORWARD_NODE(R_RestartStack);          /* Available restarts stack */
@@ -1600,6 +1597,9 @@
     FORWARD_NODE(R_FalseValue);
     FORWARD_NODE(R_LogicalNAValue);
 
+    FORWARD_NODE(R_print.na_string);
+    FORWARD_NODE(R_print.na_string_noquote);
+
     if (R_SymbolTable != NULL)             /* in case of GC during startup */
 	for (i = 0; i < HSIZE; i++)        /* Symbol table */
 	    FORWARD_NODE(R_SymbolTable[i]);
@@ -1627,6 +1627,7 @@
 	FORWARD_NODE(ctxt->handlerstack);  /* the condition handler stack */
 	FORWARD_NODE(ctxt->restartstack);  /* the available restarts stack */
 	FORWARD_NODE(ctxt->srcref);	   /* the current source reference */
+	FORWARD_NODE(ctxt->returnValue);   /* For on.exit calls */
     }
 
     FORWARD_NODE(R_PreciousList);
@@ -1644,6 +1645,9 @@
 	FORWARD_NODE(*sp);
 #endif
 
+    FORWARD_NODE(R_CachedScalarReal);
+    FORWARD_NODE(R_CachedScalarInteger);
+
     /* main processing loop */
     PROCESS_NODES();
 
@@ -2736,7 +2740,8 @@
    return s;
 }
 
-SEXP allocFormalsList(int nargs, ...) {
+static SEXP allocFormalsList(int nargs, ...)
+{
     SEXP res = R_NilValue;
     SEXP n;
     int i;
@@ -2744,15 +2749,15 @@
     va_start(syms, nargs);
 
     for(i = 0; i < nargs; i++) {
-        res = CONS(R_NilValue, res);
+	res = CONS(R_NilValue, res);
     }
     R_PreserveObject(res);
 
     n = res;
     for(i = 0; i < nargs; i++) {
-        SET_TAG(n, (SEXP) va_arg(syms, SEXP));
-        MARK_NOT_MUTABLE(n);
-        n = CDR(n);
+	SET_TAG(n, (SEXP) va_arg(syms, SEXP));
+	MARK_NOT_MUTABLE(n);
+	n = CDR(n);
     }
     va_end(syms);
 
@@ -2760,23 +2765,29 @@
 }
 
 
-SEXP allocFormalsList2(SEXP sym1, SEXP sym2) {
+SEXP allocFormalsList2(SEXP sym1, SEXP sym2)
+{
     return allocFormalsList(2, sym1, sym2);
 }
 
-SEXP allocFormalsList3(SEXP sym1, SEXP sym2, SEXP sym3) {
+SEXP allocFormalsList3(SEXP sym1, SEXP sym2, SEXP sym3)
+{
     return allocFormalsList(3, sym1, sym2, sym3);
 }
 
-SEXP allocFormalsList4(SEXP sym1, SEXP sym2, SEXP sym3, SEXP sym4) {
+SEXP allocFormalsList4(SEXP sym1, SEXP sym2, SEXP sym3, SEXP sym4)
+{
     return allocFormalsList(4, sym1, sym2, sym3, sym4);
 }
 
-SEXP allocFormalsList5(SEXP sym1, SEXP sym2, SEXP sym3, SEXP sym4, SEXP sym5) {
+SEXP allocFormalsList5(SEXP sym1, SEXP sym2, SEXP sym3, SEXP sym4, SEXP sym5)
+{
     return allocFormalsList(5, sym1, sym2, sym3, sym4, sym5);
 }
 
-SEXP allocFormalsList6(SEXP sym1, SEXP sym2, SEXP sym3, SEXP sym4, SEXP sym5, SEXP sym6) {
+SEXP allocFormalsList6(SEXP sym1, SEXP sym2, SEXP sym3, SEXP sym4, 
+		       SEXP sym5, SEXP sym6)
+{
     return allocFormalsList(6, sym1, sym2, sym3, sym4, sym5, sym6);
 }
 
@@ -2848,6 +2859,16 @@
 
 static void R_gc_internal(R_size_t size_needed)
 {
+    if (!R_GCEnabled) {
+      if (NO_FREE_NODES())
+	R_NSize = R_NodesInUse + 1;
+      if (size_needed > VHEAP_FREE())
+	R_VSize += size_needed - VHEAP_FREE();
+      gc_pending = TRUE;
+      return;
+    }
+    gc_pending = FALSE;
+
     R_size_t onsize = R_NSize /* can change during collection */;
     double ncells, vcells, vfrac, nfrac;
     SEXPTYPE first_bad_sexp_type = 0;
@@ -2985,6 +3006,7 @@
     SEXP ans, nms;
     int i, tmp;
 
+    checkArity(op, args);
     PROTECT(ans = allocVector(INTSXP, 24));
     PROTECT(nms = allocVector(STRSXP, 24));
     for (i = 0; i < 24; i++) {
@@ -3129,7 +3151,7 @@
     error(ngettext("R_Reprotect: only %d protected item, can't reprotect index %d",
 		   "R_Reprotect: only %d protected items, can't reprotect index %d",
 		   R_PPStackTop),
-          R_PPStackTop, i);
+	  R_PPStackTop, i);
 }
 
 #ifndef INLINE_PROTECT
@@ -3336,6 +3358,11 @@
     SET_OBJECT(CHK(to), OBJECT(from));
     IS_S4_OBJECT(from) ?  SET_S4_OBJECT(to) : UNSET_S4_OBJECT(to);
 }
+void SHALLOW_DUPLICATE_ATTRIB(SEXP to, SEXP from) {
+    SET_ATTRIB(CHK(to), shallow_duplicate(CHK(ATTRIB(CHK(from)))));
+    SET_OBJECT(CHK(to), OBJECT(from));
+    IS_S4_OBJECT(from) ?  SET_S4_OBJECT(to) : UNSET_S4_OBJECT(to);
+}
 
 /* S4 object testing */
 int (IS_S4_OBJECT)(SEXP x){ return IS_S4_OBJECT(CHK(x)); }
diff -Nru r-base-3.2.3/src/main/mkdtemp.c r-base-3.3.1/src/main/mkdtemp.c
--- r-base-3.2.3/src/main/mkdtemp.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/mkdtemp.c	2016-03-16 23:04:16.000000000 +0000
@@ -17,7 +17,7 @@
    Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c,
-   with R modifications for randomness and Win32.
+   with R modifications for randomness and Win32.  
 
    mkdtemp was required by POSIX 2008: we use this substitute on
    Windows and Solaris 10.
diff -Nru r-base-3.2.3/src/main/names.c r-base-3.3.1/src/main/names.c
--- r-base-3.2.3/src/main/names.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/names.c	2016-03-30 22:02:05.000000000 +0000
@@ -1,8 +1,8 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
- *  Copyright (C) 2003--2015  The R Foundation
+ *  Copyright (C) 1997--2016  The R Core Team
+ *  Copyright (C) 2003--2016  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -90,11 +90,11 @@
 
 /* Primitives */
 {"if",		do_if,		0,	200,	-1,	{PP_IF,	     PREC_FN,	  1}},
-{"while",	do_while,	0,	100,	-1,	{PP_WHILE,   PREC_FN,	  0}},
-{"for",		do_for,		0,	100,	-1,	{PP_FOR,     PREC_FN,	  0}},
-{"repeat",	do_repeat,	0,	100,	-1,	{PP_REPEAT,  PREC_FN,	  0}},
-{"break",	do_break, CTXT_BREAK,	0,	-1,	{PP_BREAK,   PREC_FN,	  0}},
-{"next",	do_break, CTXT_NEXT,	0,	-1,	{PP_NEXT,    PREC_FN,	  0}},
+{"while",	do_while,	0,	100,	2,	{PP_WHILE,   PREC_FN,	  0}},
+{"for",		do_for,		0,	100,	3,	{PP_FOR,     PREC_FN,	  0}},
+{"repeat",	do_repeat,	0,	100,	1,	{PP_REPEAT,  PREC_FN,	  0}},
+{"break",	do_break, CTXT_BREAK,	0,	0,	{PP_BREAK,   PREC_FN,	  0}},
+{"next",	do_break, CTXT_NEXT,	0,	0,	{PP_NEXT,    PREC_FN,	  0}},
 {"return",	do_return,	0,	0,	-1,	{PP_RETURN,  PREC_FN,	  0}},
 {"function",	do_function,	0,	0,	-1,	{PP_FUNCTION,PREC_FN,	  0}},
 {"<-",		do_set,		1,	100,	-1,	{PP_ASSIGN,  PREC_LEFT,	  1}},
@@ -112,7 +112,7 @@
 {"[[<-",	do_subassign2,	1,	0,	3,	{PP_SUBASS,  PREC_LEFT,	  1}},
 {"$<-",		do_subassign3,	1,	0,	3,	{PP_SUBASS,  PREC_LEFT,	  1}},
 {"switch",	do_switch,	0,	200,	-1,	{PP_FUNCALL, PREC_FN,	  0}},
-{"browser",	do_browser,	0,	101,	4,	{PP_FUNCALL, PREC_FN,	  0}},
+{"browser",	do_browser,	0,	101,	-1,	{PP_FUNCALL, PREC_FN,	  0}},
 {".primTrace",	do_trace,	0,	101,	1,	{PP_FUNCALL, PREC_FN,	  0}},
 {".primUntrace",do_trace,	1,	101,	1,	{PP_FUNCALL, PREC_FN,	  0}},
 {".Internal",	do_internal,	0,	200,	1,	{PP_FUNCALL, PREC_FN,	  0}},
@@ -122,7 +122,7 @@
 {"substitute",	do_substitute,	0,	0,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"missing",	do_missing,	1,	0,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"nargs",	do_nargs,	1,	1,	0,	{PP_FUNCALL, PREC_FN,	0}},
-{"on.exit",	do_onexit,	0,	100,	1,	{PP_FUNCALL, PREC_FN,	  0}},
+{"on.exit",	do_onexit,	0,	100,	-1,	{PP_FUNCALL, PREC_FN,	  0}},
 {"forceAndCall",do_forceAndCall,	0,	0,	-1,	{PP_FUNCALL, PREC_FN,	  0}},
 
 /* .Internals */
@@ -145,7 +145,6 @@
 {"seterrmessage",do_seterrmessage, 0,	111,	1,	{PP_FUNCALL, PREC_FN,	  0}},
 {"printDeferredWarnings",do_printDeferredWarnings, 0,	111,	0,	{PP_FUNCALL, PREC_FN,	  0}},
 {"interruptsSuspended",do_interruptsSuspended, 0,	11,	-1,	{PP_FUNCALL, PREC_FN,	  0}},
-{"restart",	do_restart,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	  0}},
 {"as.function.default",do_asfunction,0,	11,	2,	{PP_FUNCTION,PREC_FN,	  0}},
 {"debug",	do_debug,	0,	111,	3,	{PP_FUNCALL, PREC_FN,	  0}},
 {"undebug",	do_debug,	1,	111,	1,	{PP_FUNCALL, PREC_FN,	  0}},
@@ -159,8 +158,8 @@
 
 /* Binary Operators, all primitives */
 /* these are group generic and so need to eval args */
-{"+",		do_arith,	PLUSOP,	1,	2,	{PP_BINARY,  PREC_SUM,	  0}},
-{"-",		do_arith,	MINUSOP,1,	2,	{PP_BINARY,  PREC_SUM,	  0}},
+{"+",		do_arith,	PLUSOP,	1,	-1,	{PP_BINARY,  PREC_SUM,	  0}},
+{"-",		do_arith,	MINUSOP,1,	-1,	{PP_BINARY,  PREC_SUM,	  0}},
 {"*",		do_arith,	TIMESOP,1,	2,	{PP_BINARY,  PREC_PROD,	  0}},
 {"/",		do_arith,	DIVOP,	1,	2,	{PP_BINARY2, PREC_PROD,	  0}},
 {"^",		do_arith,	POWOP,	1,	2,	{PP_BINARY2, PREC_POWER,  1}},
@@ -183,7 +182,7 @@
 {"||",		do_logic2,	2,	0,	2,	{PP_BINARY,  PREC_OR,	  0}},
 {":",		do_colon,	0,	1,	2,	{PP_BINARY2, PREC_COLON,  0}},
 /* does not evaluate */
-{"~",		do_tilde,	0,	0,	2,	{PP_BINARY,  PREC_TILDE,  0}},
+{"~",		do_tilde,	0,	0,	-1,	{PP_BINARY,  PREC_TILDE,  0}},
 
 
 /* Logic Related Functions */
@@ -246,7 +245,7 @@
 {"duplicated",	do_duplicated,	0,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
 {"unique",	do_duplicated,	1,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
 {"anyDuplicated",do_duplicated,	2,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
-{"anyNA",	do_anyNA,	0,	1,	2,	{PP_FUNCALL, PREC_FN,	0}},
+{"anyNA",	do_anyNA,	0,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"which",	do_which,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"which.min",	do_first_min,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"pmin",	do_pmin,	0,	11,	-1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -258,7 +257,7 @@
 {"match.call",	do_matchcall,	0,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
 {"crossprod",	do_matprod,	1,	11,	2,	{PP_FUNCALL, PREC_FN,   0}},
 {"tcrossprod",	do_matprod,	2,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
-{"lengths",	do_lengths,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
+{"lengths",	do_lengths,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 
 {"attach",	do_attach,	0,	111,	3,	{PP_FUNCALL, PREC_FN,	0}},
 {"detach",	do_detach,	0,	111,	1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -354,8 +353,8 @@
 {"psigamma",	do_math2,	26,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 
 
-/* Mathematical Functions of a Complex Argument */
-/* these are group generic and so need to eval args */
+/* Mathematical Functions of a Complex Argument:
+ * These are group generic and so need to eval args --> ./complex.c */
 
 {"Re",		do_cmathfuns,	1,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"Im",		do_cmathfuns,	2,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -502,12 +501,14 @@
 {"as.character",do_asatomic,	0,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.integer",	do_asatomic,	1,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.double",	do_asatomic,	2,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
+{"as.numeric",	do_asatomic,	2,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.complex",	do_asatomic,	3,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.logical",	do_asatomic,	4,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.raw",	do_asatomic,	5,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.call",	do_ascall,	0,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"as.environment",do_as_environment,0,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"storage.mode<-",do_storage_mode,0,	1,	2,	{PP_FUNCALL, PREC_FN,	0}},
+{"asCharacterFactor",	do_asCharacterFactor,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 
 {"as.vector",	do_asvector,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"paste",	do_paste,	0,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
@@ -521,8 +522,10 @@
 /* String Manipulation */
 
 {"nchar",	do_nchar,	1,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
-{"nzchar",	do_nzchar,	1,	1,	2,	{PP_FUNCALL, PREC_FN,	0}},
+{"nzchar",	do_nzchar,	1,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"substr",	do_substr,	1,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
+{"startsWith",	do_startsWith,  0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
+{"endsWith",	do_startsWith,  1,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"substr<-",	do_substrgets,	1,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
 {"strsplit",	do_strsplit,	1,	11,	5,	{PP_FUNCALL, PREC_FN,	0}},
 {"abbreviate",	do_abbrev,	1,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
@@ -553,10 +556,13 @@
 {"packBits",	do_packBits,	1,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"utf8ToInt",	do_utf8ToInt,	1,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"intToUtf8",	do_intToUtf8,	1,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
+{"validUTF8",	do_validUTF8,	1,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
+{"validEnc",	do_validEnc,	1,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"encodeString",do_encodeString,1,	11,	5,	{PP_FUNCALL, PREC_FN,	0}},
 {"iconv",	do_iconv,	0,	11,	6,	{PP_FUNCALL, PREC_FN,	0}},
 {"strtrim",	do_strtrim,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"strtoi",	do_strtoi,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
+{"strrep",	do_strrep,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 
 /* Type Checking (typically implemented in ./coerce.c ) */
 
@@ -567,6 +573,7 @@
 {"is.complex",	do_is,		CPLXSXP,1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"is.character",do_is,		STRSXP,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"is.symbol",	do_is,		SYMSXP,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
+{"is.name",	do_is,		SYMSXP,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"is.environment",do_is,	ENVSXP,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"is.list",	do_is,		VECSXP,	1,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"is.pairlist",	do_is,		LISTSXP,1,	1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -601,9 +608,6 @@
 /* Primitive */
 {"proc.time",	do_proctime,	0,	1,	0,	{PP_FUNCALL, PREC_FN,	0}},
 {"gc.time",	do_gctime,	0,	1,	-1,	{PP_FUNCALL, PREC_FN,	0}},
-#if 0
-{"visibleflag", do_visibleflag,	0,	1,	0,	{PP_FUNCALL, PREC_FN,	0}},
-#endif
 {"withVisible", do_withVisible,	1,	10,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"expression",	do_expression,	1,	0,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"interactive",	do_interactive,	0,	1,	0,	{PP_FUNCALL, PREC_FN,	0}},
@@ -652,7 +656,6 @@
 #ifdef Win32
 {"shell.exec",	do_shellexec,	0,	111,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"Sys.which",	do_syswhich,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
-{"useInternet2",do_setInternet2,0,	211,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"mkjunction", do_mkjunction,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"tzone_name", do_tzone_name,	0,	11,	0,	{PP_FUNCALL, PREC_FN,	0}},
 #endif
@@ -673,7 +676,7 @@
 {"quit",	do_quit,	0,	111,	3,	{PP_FUNCALL, PREC_FN,	0}},
 {"readline",	do_readln,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"print.default",do_printdefault,0,	111,	9,	{PP_FUNCALL, PREC_FN,	0}},
-{"print.function",do_printfunction,0,	111,	3,	{PP_FUNCALL, PREC_FN,	0}},
+{"print.function",do_printfunction,0,	111,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"prmatrix",	do_prmatrix,	0,	111,	6,	{PP_FUNCALL, PREC_FN,	0}},
 {"gc",		do_gc,		0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"gcinfo",	do_gcinfo,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -702,12 +705,12 @@
 {"browserText", do_sysbrowser,	1,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"browserCondition", do_sysbrowser,	2,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"browserSetDebug", do_sysbrowser,	3,	111,	1,	{PP_FUNCALL, PREC_FN,	0}},
-{"parent.frame",do_parentframe,	0,	11,	-1,	{PP_FUNCALL, PREC_FN,	0}},
+{"parent.frame",do_parentframe,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"sort",	do_sort,	1,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"is.unsorted",	do_isunsorted,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"psort",	do_psort,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
 {"qsort",	do_qsort,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
-{"radixsort",	do_radixsort,	0,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
+{"radixsort",	do_radixsort,	0,	11,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"order",	do_order,	0,	11,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"rank",	do_rank,	0,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
 {"scan",	do_scan,	0,	11,	19,	{PP_FUNCALL, PREC_FN,	0}},
@@ -722,7 +725,7 @@
 {"environmentName",do_envirName,0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"env2list",	do_env2list,	0,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
 {"reg.finalizer",do_regFinaliz,	0,	11,	3,	{PP_FUNCALL, PREC_FN,	0}},
-{"options",	do_options,	0,	211,	1,	{PP_FUNCALL, PREC_FN,	0}},
+{"options",	do_options,	0,	211,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"getOption",	do_getOption,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
 {"sink",	do_sink,	0,	111,	4,	{PP_FUNCALL, PREC_FN,	0}},
 {"sink.number",	do_sinknumber,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -735,7 +738,7 @@
 {"tracemem",    do_tracemem,    0,      1,	1,      {PP_FUNCALL, PREC_FN,	0}},
 {"retracemem",  do_retracemem,  0,      201,     -1,      {PP_FUNCALL, PREC_FN,	0}},
 {"untracemem",  do_untracemem,  0,      101,	1,      {PP_FUNCALL, PREC_FN,	0}},
-{"inspect",	do_inspect,	0,	111,	1,	{PP_FUNCALL, PREC_FN,	0}},
+{"inspect",	do_inspect,	0,	111,	-1,	{PP_FUNCALL, PREC_FN,	0}},
 {"address",     do_address,     0,       11,     1,     {PP_FUNCALL, PREC_FN, 0}},
 {"refcnt",      do_refcnt,      0,       11,     1,     {PP_FUNCALL, PREC_FN, 0}},
 {"mem.limits",	do_memlimits,	0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
@@ -844,7 +847,7 @@
 {"isSeekable",	do_isseekable,	0,      11,     1,      {PP_FUNCALL, PREC_FN,	0}},
 {"close",	do_close,	0,      111,     2,      {PP_FUNCALL, PREC_FN,	0}},
 {"flush",	do_flush,	0,      111,     1,      {PP_FUNCALL, PREC_FN,	0}},
-{"file",	do_url,		1,      11,     5,      {PP_FUNCALL, PREC_FN,	0}},
+{"file",	do_url,		1,      11,     6,      {PP_FUNCALL, PREC_FN,	0}},
 {"url",		do_url,		0,      11,     5,      {PP_FUNCALL, PREC_FN,	0}},
 {"pipe",	do_pipe,	0,      11,     3,      {PP_FUNCALL, PREC_FN,	0}},
 {"fifo",	do_fifo,	0,      11,     4,      {PP_FUNCALL, PREC_FN,	0}},
@@ -866,7 +869,7 @@
 {"getConnection",do_getconnection,0,	11,	1,      {PP_FUNCALL, PREC_FN,	0}},
 {"getAllConnections",do_getallconnections,0,11, 0,      {PP_FUNCALL, PREC_FN,	0}},
 {"summary.connection",do_sumconnection,0,11,    1,      {PP_FUNCALL, PREC_FN,	0}},
-{"gzcon",	do_gzcon,	0,      11,     3,      {PP_FUNCALL, PREC_FN,	0}},
+{"gzcon",	do_gzcon,	0,      11,     4,      {PP_FUNCALL, PREC_FN,	0}},
 {"memCompress",do_memCompress,	0,	11,     2,      {PP_FUNCALL, PREC_FN,	0}},
 {"memDecompress",do_memDecompress,0,	11,     2,      {PP_FUNCALL, PREC_FN,	0}},
 
@@ -911,7 +914,7 @@
 {"lazyLoadDBinsertValue",do_lazyLoadDBinsertValue, 0,	11,	5,	{PP_FUNCALL, PREC_FN,	0}},
 {"bincode",	do_bincode,	 0,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
 {"tabulate",	do_tabulate,	 0,	11,	2,	{PP_FUNCALL, PREC_FN,	0}},
-{"findInterval",do_findinterval, 0,	11,	4,	{PP_FUNCALL, PREC_FN,	0}},
+{"findInterval",do_findinterval, 0,	11,	5,	{PP_FUNCALL, PREC_FN,	0}},
 {"pretty",	do_pretty,	0,	11,	7,	{PP_FUNCALL, PREC_FN,	0}},
 {"formatC",	do_formatC,	0,	11,	7,	{PP_FUNCALL, PREC_FN,	0}},
 {"crc64",	do_crc64,	0,	11,	1,	{PP_FUNCALL, PREC_FN,	0}},
@@ -1013,7 +1016,7 @@
     SEXP name, prim;
     checkArity(op, args);
     name = CAR(args);
-    if (!isString(name) || length(name) != 1 ||
+    if (!isString(name) || LENGTH(name) != 1 ||
 	STRING_ELT(name, 0) == R_NilValue)
 	errorcall(call, _("string argument required"));
     prim = R_Primitive(CHAR(STRING_ELT(name, 0)));
@@ -1123,13 +1126,13 @@
 
 static void initializeDDVALSymbols() {
     for(int i = 0; i < N_DDVAL_SYMBOLS; i++) {
-        DDVALSymbols[i] = createDDVALSymbol(i);
+	DDVALSymbols[i] = createDDVALSymbol(i);
     }
 }
 
 SEXP attribute_hidden installDDVAL(int n) {
     if (n < N_DDVAL_SYMBOLS)
-        return DDVALSymbols[n];
+	return DDVALSymbols[n];
 
     return createDDVALSymbol(n);
 }
@@ -1182,7 +1185,7 @@
 
     /* Special base functions */
     for (int i = 0; Spec_name[i]; i++)
-        SET_SPECIAL_SYMBOL(install(Spec_name[i]));
+	SET_SPECIAL_SYMBOL(install(Spec_name[i]));
 
     R_initAsignSymbols();
     initializeDDVALSymbols();
@@ -1223,34 +1226,34 @@
     int i, hashcode;
 
     if( !HASHASH(charSXP) ) {
-        hashcode = R_Newhashpjw(CHAR(charSXP));
-        SET_HASHVALUE(charSXP, hashcode);
-        SET_HASHASH(charSXP, 1);
+	hashcode = R_Newhashpjw(CHAR(charSXP));
+	SET_HASHVALUE(charSXP, hashcode);
+	SET_HASHASH(charSXP, 1);
     } else {
-        hashcode = HASHVALUE(charSXP);
+	hashcode = HASHVALUE(charSXP);
     }
     i = hashcode % HSIZE;
     /* Check to see if the symbol is already present;  if it is, return it. */
     for (sym = R_SymbolTable[i]; sym != R_NilValue; sym = CDR(sym))
-        if (strcmp(CHAR(charSXP), CHAR(PRINTNAME(CAR(sym)))) == 0) return (CAR(sym));
+	if (strcmp(CHAR(charSXP), CHAR(PRINTNAME(CAR(sym)))) == 0) return (CAR(sym));
     /* Create a new symbol node and link it into the table. */
     int len = LENGTH(charSXP);
     if (len == 0)
-        error(_("attempt to use zero-length variable name"));
+	error(_("attempt to use zero-length variable name"));
     if (len > MAXIDSIZE)
-        error(_("variable names are limited to %d bytes"), MAXIDSIZE);
+	error(_("variable names are limited to %d bytes"), MAXIDSIZE);
     if (IS_ASCII(charSXP) || (IS_UTF8(charSXP) && utf8locale) ||
-                                        (IS_LATIN1(charSXP) && latin1locale) )
-        sym = mkSYMSXP(charSXP, R_UnboundValue);
+					(IS_LATIN1(charSXP) && latin1locale) )
+	sym = mkSYMSXP(charSXP, R_UnboundValue);
     else {
-        /* This branch is to match behaviour of install (which is older):
-           symbol C-string names are always interpreted as if
-           in the native locale, even when they are not in the native locale */
-        PROTECT(charSXP);
-        sym = mkSYMSXP(mkChar(CHAR(charSXP)), R_UnboundValue);
-        SET_HASHVALUE(PRINTNAME(sym), hashcode);
-        SET_HASHASH(PRINTNAME(sym), 1);
-        UNPROTECT(1);
+	/* This branch is to match behaviour of install (which is older):
+	   symbol C-string names are always interpreted as if
+	   in the native locale, even when they are not in the native locale */
+	PROTECT(charSXP);
+	sym = mkSYMSXP(mkChar(CHAR(charSXP)), R_UnboundValue);
+	SET_HASHVALUE(PRINTNAME(sym), hashcode);
+	SET_HASHASH(PRINTNAME(sym), 1);
+	UNPROTECT(1);
     }
 
     R_SymbolTable[i] = CONS(sym, R_SymbolTable[i]);
@@ -1266,23 +1269,23 @@
 
     int i = 0;
     for(src = className; *src; src++) {
-        if (i == maxLength)
-            error(_("class name too long in '%s'"), className);
-        signature[i++] = *src;
+	if (i == maxLength)
+	    error(_("class name too long in '%s'"), className);
+	signature[i++] = *src;
     }
 
     if (i == maxLength)
-        error(_("class name too long in '%s'"), className);
+	error(_("class name too long in '%s'"), className);
     signature[i++] = '.';
 
     for(src = methodName; *src; src++) {
-        if (i == maxLength)
-            error(_("class name too long in '%s'"), className);
-        signature[i++] = *src;
+	if (i == maxLength)
+	    error(_("class name too long in '%s'"), className);
+	signature[i++] = *src;
     }
 
     if (i == maxLength)
-        error(_("class name too long in '%s'"), className);
+	error(_("class name too long in '%s'"), className);
     signature[i] = 0;
 
     return install(signature);
diff -Nru r-base-3.2.3/src/main/objects.c r-base-3.3.1/src/main/objects.c
--- r-base-3.2.3/src/main/objects.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/objects.c	2016-05-17 22:15:10.000000000 +0000
@@ -187,18 +187,18 @@
     static SEXP s_S3MethodsTable = NULL;
 
     if (TYPEOF(callrho) != ENVSXP) {
-        if (TYPEOF(callrho) == NILSXP)
+	if (TYPEOF(callrho) == NILSXP)
 	    error(_("use of NULL environment is defunct"));
-        else
+	else
 	    error(_("bad generic call environment"));
     }
     if (defrho == R_BaseEnv)
 	defrho = R_BaseNamespace;
     else if (TYPEOF(defrho) != ENVSXP) {
-        if (TYPEOF(defrho) == NILSXP)
-            error(_("use of NULL environment is defunct"));
-        else
-            error(_("bad generic definition environment"));
+	if (TYPEOF(defrho) == NILSXP)
+	    error(_("use of NULL environment is defunct"));
+	else
+	    error(_("bad generic definition environment"));
     }
 
     /* This evaluates promises */
@@ -220,9 +220,9 @@
 	if (TYPEOF(table) == ENVSXP) {
 	    val = findVarInFrame3(table, method, TRUE);
 	    if (TYPEOF(val) == PROMSXP) {
-	        PROTECT(val);
-	        val = eval(val, rho);
-	        UNPROTECT(1);
+		PROTECT(val);
+		val = eval(val, rho);
+		UNPROTECT(1);
 	    }
 	    return val;
 	}
@@ -274,7 +274,7 @@
 
 attribute_hidden
 SEXP createS3Vars(SEXP dotGeneric, SEXP dotGroup, SEXP dotClass, SEXP dotMethod,
-                  SEXP dotGenericCallEnv, SEXP dotGenericDefEnv) {
+		  SEXP dotGenericCallEnv, SEXP dotGenericDefEnv) {
 
     SEXP v = R_NilValue;
     v = addS3Var(v, R_dot_GenericDefEnv, dotGenericDefEnv);
@@ -293,12 +293,12 @@
 		    const char *generic, SEXP rho, SEXP callrho, SEXP defrho) {
 
     SEXP newvars = PROTECT(createS3Vars(
-        PROTECT(mkString(generic)),
-        R_BlankScalarString,
-        dotClass,
-        PROTECT(ScalarString(PRINTNAME(method))),
-        callrho,
-        defrho
+	PROTECT(mkString(generic)),
+	R_BlankScalarString,
+	dotClass,
+	PROTECT(ScalarString(PRINTNAME(method))),
+	callrho,
+	defrho
     ));
 
     /* Create a new environment without any */
@@ -312,20 +312,20 @@
 	for (s = FRAME(cptr->cloenv); s != R_NilValue; s = CDR(s)) {
 	    matched = 0;
 	    for (t = formals; t != R_NilValue; t = CDR(t))
-	        if (TAG(t) == TAG(s)) {
+		if (TAG(t) == TAG(s)) {
 		    matched = 1;
 		    break;
 		}
 	    if (!matched) {
-	        UNPROTECT(1); /* newvars */
-	        newvars = PROTECT(CONS(CAR(s), newvars));
-	        SET_TAG(newvars, TAG(s));
-            }
+		UNPROTECT(1); /* newvars */
+		newvars = PROTECT(CONS(CAR(s), newvars));
+		SET_TAG(newvars, TAG(s));
+	    }
 	}
     }
 
     if( (RDEBUG(op) && R_current_debug_state()) || RSTEP(op) ) {
-        SET_RSTEP(sxp, 1);
+	SET_RSTEP(sxp, 1);
     }
 
     SEXP newcall =  PROTECT(duplicate(cptr->call));
@@ -357,7 +357,7 @@
     nclass = length(klass);
     for (i = 0; i < nclass; i++) {
 	const void *vmax = vmaxget();
-        const char *ss = translateChar(STRING_ELT(klass, i));
+	const char *ss = translateChar(STRING_ELT(klass, i));
 	method = installS3Signature(generic, ss);
 	vmaxset(vmax);
 	sxp = R_LookupMethod(method, rho, callrho, defrho);
@@ -365,16 +365,16 @@
 	    if(method == R_SortListSymbol && CLOENV(sxp) == R_BaseNamespace)
 		continue; /* kludge because sort.list is not a method */
 	    PROTECT(sxp);
-            if (i > 0) {
+	    if (i > 0) {
 		SEXP dotClass = PROTECT(stringSuffix(klass, i));
 		setAttrib(dotClass, R_PreviousSymbol, klass);
 		*ans = dispatchMethod(op, sxp, dotClass, cptr, method, generic,
 				      rho, callrho, defrho);
 		UNPROTECT(1); /* dotClass */
 	    } else {
-	        *ans = dispatchMethod(op, sxp, klass, cptr, method, generic,
+		*ans = dispatchMethod(op, sxp, klass, cptr, method, generic,
 				      rho, callrho, defrho);
-            }
+	    }
 	    UNPROTECT(2); /* klass, sxp */
 	    return 1;
 	}
@@ -382,7 +382,7 @@
     method = installS3Signature(generic, "default");
     PROTECT(sxp = R_LookupMethod(method, rho, callrho, defrho));
     if (isFunction(sxp)) {
-        *ans = dispatchMethod(op, sxp, R_NilValue, cptr, method, generic,
+	*ans = dispatchMethod(op, sxp, R_NilValue, cptr, method, generic,
 			      rho, callrho, defrho);
 	UNPROTECT(2); /* klass, sxp */
 	return 1;
@@ -407,7 +407,7 @@
     static SEXP do_usemethod_formals = NULL;
 
     if (do_usemethod_formals == NULL)
-        do_usemethod_formals = allocFormalsList2(install("generic"),
+	do_usemethod_formals = allocFormalsList2(install("generic"),
 						 install("object"));
 
     PROTECT(argList = matchArgs(do_usemethod_formals, args, call));
@@ -415,7 +415,7 @@
 	errorcall(call, _("there must be a 'generic' argument"));
     else
 	PROTECT(generic = eval(CAR(argList), env));
-    if(!isString(generic) || length(generic) != 1)
+    if(!isString(generic) || LENGTH(generic) != 1)
 	errorcall(call, _("'generic' argument must be a character string"));
 
 
@@ -490,9 +490,9 @@
 		found = 0;
 		for(s = call; CDR(s) != R_NilValue; s = CDR(s))
 		    if(TAG(CDR(s)) == TAG(t)) {
-                        found = 1;
-                        break;
-                    }
+			found = 1;
+			break;
+		    }
 		if( !found ) {
 			SETCDR(s, allocList(1));
 			SET_TAG(CDR(s), TAG(t));
@@ -509,24 +509,48 @@
 */
 static
 Rboolean equalS3Signature(const char *signature, const char *left,
-                         const char *right) {
+			 const char *right) {
 
     const char *s = signature;
     const char *a;
 
     for(a = left; *a; s++, a++) {
-        if (*s != *a)
-            return FALSE;
+	if (*s != *a)
+	    return FALSE;
     }
     if (*s++ != '.')
-        return FALSE;
+	return FALSE;
     for(a = right; *a; s++, a++) {
-        if (*s != *a)
-            return FALSE;
+	if (*s != *a)
+	    return FALSE;
     }
     return (*s == 0) ? TRUE : FALSE;
 }
 
+
+static R_INLINE SEXP getPrimitive(SEXP symbol)
+{
+    SEXP value = SYMVALUE(symbol);
+    if (TYPEOF(value) == PROMSXP) {
+	PROTECT(value);
+	value = eval(value, R_GlobalEnv);
+	UNPROTECT(1);
+	SET_NAMED(value, 2);
+    }
+    if (TYPEOF(value) == BUILTINSXP || TYPEOF(value) == SPECIALSXP)
+        return value;
+
+    if (TYPEOF(value) == CLOSXP) {
+	/* probably means a package redefined the base function so
+	   try to get the real thing from the internal table of
+	   primitives */
+	value = R_Primitive(CHAR(PRINTNAME(symbol)));
+    } else
+	value = R_NilValue;
+
+    return value;
+}
+
 /* If NextMethod has any arguments the first must be the generic */
 /* the second the object and any remaining are matched with the */
 /* formals of the chosen method. */
@@ -564,7 +588,7 @@
        error(_("'NextMethod' called from an anonymous function"));
 
     readS3VarsFromFrame(sysp, &generic, &group, &klass, &method,
-                        &callenv, &defenv);
+			&callenv, &defenv);
 
     /* Find dispatching environments. Promises shouldn't occur, but
        check to be on the safe side.  If the variables are not in the
@@ -635,7 +659,7 @@
 	error(_("generic function not specified"));
     PROTECT(generic);
 
-    if (!isString(generic) || length(generic) != 1)
+    if (!isString(generic) || LENGTH(generic) != 1)
 	error(_("invalid generic argument to 'NextMethod'"));
 
     if (CHAR(STRING_ELT(generic, 0))[0] == '\0')
@@ -647,8 +671,8 @@
 	group = R_BlankScalarString;
 	basename = generic;
     } else {
-	if (!isString(group) || length(group) != 1)
-            error(_("invalid 'group' argument found in 'NextMethod'"));
+	if (!isString(group) || LENGTH(group) != 1)
+	    error(_("invalid 'group' argument found in 'NextMethod'"));
 	if (CHAR(STRING_ELT(group, 0))[0] == '\0') basename = generic;
 	else basename = group;
     }
@@ -666,13 +690,13 @@
     if (method != R_UnboundValue) {
 	if (!isString(method))
 	    error(_("wrong value for .Method"));
-	for(i = 0; i < length(method); i++) {
+	for(i = 0; i < LENGTH(method); i++) {
 	    b = translateChar(STRING_ELT(method, i));
 	    if (strlen(b)) break;
 	}
 	/* for binary operators check that the second argument's method
 	   is the same or absent */
-	for(j = i; j < length(method); j++) {
+	for(j = i; j < LENGTH(method); j++) {
 	    const char *bb = translateChar(STRING_ELT(method, j));
 	    if (strlen(bb) && strcmp(b,bb))
 		warning(_("Incompatible methods ignored"));
@@ -684,7 +708,7 @@
 
     sb = translateChar(STRING_ELT(basename, 0));
     Rboolean foundSignature = FALSE;
-    for (j = 0; j < length(klass); j++) {
+    for (j = 0; j < LENGTH(klass); j++) {
 	sk = translateChar(STRING_ELT(klass, j));
 	if (equalS3Signature(b, sb, sk)) { /* b == sb.sk */
 	    foundSignature = TRUE;
@@ -701,9 +725,9 @@
 	   how many classes to drop. */
 
     sg = translateChar(STRING_ELT(generic, 0));
-    for (i = j ; i < length(klass); i++) {
+    for (i = j ; i < LENGTH(klass); i++) {
 	sk = translateChar(STRING_ELT(klass, i));
-        nextfunSignature = installS3Signature(sg, sk);
+	nextfunSignature = installS3Signature(sg, sk);
 	nextfun = R_LookupMethod(nextfunSignature, env, callenv, defenv);
 	if (isFunction(nextfun)) break;
 	if (group != R_UnboundValue) {
@@ -736,8 +760,11 @@
 	    if (TYPEOF(nextfun) == CLOSXP) {
 		if (INTERNAL(t) != R_NilValue)
 		    nextfun = INTERNAL(t);
-		else
-		    error(_("no method to invoke"));
+		else {
+		    nextfun = getPrimitive(t);
+		    if (nextfun == R_NilValue)
+		        error(_("no method to invoke"));
+		}
 	    }
 	}
     }
@@ -749,7 +776,7 @@
     if (method != R_UnboundValue) {
 	/* for Ops we need `method' to be a vector */
 	PROTECT(method = duplicate(method));
-	for(j = 0; j < length(method); j++) {
+	for(j = 0; j < LENGTH(method); j++) {
 	    if (strlen(CHAR(STRING_ELT(method,j))))
 		SET_STRING_ELT(method, j,  PRINTNAME(nextfunSignature));
 	}
@@ -757,12 +784,12 @@
 	PROTECT(method = PRINTNAME(nextfunSignature));
 
     SEXP newvars = PROTECT(createS3Vars(
-        generic,
-        group,
-        s,
-        method,
-        callenv,
-        defenv
+	generic,
+	group,
+	s,
+	method,
+	callenv,
+	defenv
     ));
 
     SETCAR(newcall, nextfunSignature);
@@ -821,15 +848,15 @@
     SEXP klass, rval = R_NilValue /* -Wall */;
 
     if(IS_S4_OBJECT(x))
-	PROTECT(klass = R_data_class2(x));
+	PROTECT(klass = R_data_class2(x)); // -> := S4_extends( "class(x)" )
     else
 	PROTECT(klass = R_data_class(x, FALSE));
 
     if(!isString(what))
 	error(_("'what' must be a character vector"));
-    int j, nwhat = length(what);
+    int j, nwhat = LENGTH(what);
 
-    if( !isLogical(which) || (length(which) != 1) )
+    if( !isLogical(which) || (LENGTH(which) != 1) )
 	error(_("'which' must be a length 1 logical vector"));
     int isvec = asLogical(which);
 
@@ -921,7 +948,7 @@
 	superCl = eval(_call, rho);
 	UNPROTECT(3); /* _call, classExts, classDef */
 	PROTECT(superCl);
-	for(i=0; i < length(superCl); i++) {
+	for(i=0; i < LENGTH(superCl); i++) {
 	    const char *s_class = CHAR(STRING_ELT(superCl, i));
 	    for (ans = 0; ; ans++) {
 		if (!strlen(valid[ans]))
@@ -1160,6 +1187,14 @@
 	}
 	return value;
     }
+    if (!isPrimitive(op)) {
+        SEXP internal = R_do_slot(op, install("internal"));
+        op = INTERNAL(install(CHAR(asChar(internal))));
+        if (op == R_NilValue) {
+          error("'internal' slot does not name an internal function: %s",
+                CHAR(asChar(internal)));
+        }
+    }
     do_set_prim_method(op, code_string, fundef, mlist);
     vmaxset(vmax);
     return fname;
@@ -1424,6 +1459,9 @@
 	if(isPrimitive(value))
 	    return(NULL);
 	if(isFunction(value)) {
+            if (inherits(value, "internalDispatchMethod")) {
+                return(NULL);
+            }
 	    /* found a method, call it with promised args */
 	    if(!promisedArgs) {
 		PROTECT(s = promiseArgs(CDR(call), rho));
@@ -1625,8 +1663,8 @@
 	      error(_("object of class \"%s\" does not correspond to a valid S3 object"),
 		      CHAR(STRING_ELT(R_data_class(s, FALSE), 0)));
 	    else {
-	        UNPROTECT(1);
-	        return s; /*  unchanged */
+		UNPROTECT(1);
+		return s; /*  unchanged */
 	    }
 	}
 	UNSET_S4_OBJECT(s);
diff -Nru r-base-3.2.3/src/main/options.c r-base-3.3.1/src/main/options.c
--- r-base-3.2.3/src/main/options.c	2015-08-25 22:18:46.000000000 +0000
+++ r-base-3.3.1/src/main/options.c	2016-03-16 23:04:17.000000000 +0000
@@ -360,6 +360,7 @@
        would apply to R_SetOption* too.
     */
 
+    checkArity(op, args);
     if (args == R_NilValue) {
 	/* This is the zero argument case.
 	   We alloc up a vector list and write the system values into it.
@@ -473,13 +474,13 @@
 	    }
 	    else if (streql(CHAR(namei), "editor") && isString(argi)) {
 		SEXP s =  asChar(argi);
-		if (s == NA_STRING || length(s) == 0)
+		if (s == NA_STRING || LENGTH(s) == 0)
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		SET_VECTOR_ELT(value, i, SetOption(tag, ScalarString(s)));
 	    }
 	    else if (streql(CHAR(namei), "continue")) {
 		SEXP s =  asChar(argi);
-		if (s == NA_STRING || length(s) == 0)
+		if (s == NA_STRING || LENGTH(s) == 0)
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		/* We want to make sure these are in the native encoding */
 		SET_VECTOR_ELT(value, i,
@@ -487,7 +488,7 @@
 	    }
 	    else if (streql(CHAR(namei), "prompt")) {
 		SEXP s =  asChar(argi);
-		if (s == NA_STRING || length(s) == 0)
+		if (s == NA_STRING || LENGTH(s) == 0)
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		/* We want to make sure these are in the native encoding */
 		SET_VECTOR_ELT(value, i,
@@ -506,7 +507,7 @@
 		SET_VECTOR_ELT(value, i, SetOption(tag, ScalarLogical(k)));
 	    }
 	    else if (streql(CHAR(namei), "warn")) {
-		if (!isNumeric(argi) || length(argi) != 1)
+		if (!isNumeric(argi) || LENGTH(argi) != 1)
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		SET_VECTOR_ELT(value, i, SetOption(tag, argi));
 	    }
@@ -543,7 +544,7 @@
 	    }
 /* handle this here to avoid GetOption during error handling */
 	    else if ( streql(CHAR(namei), "show.error.messages") ) {
-		if( !isLogical(argi) && length(argi) != 1 )
+		if( !isLogical(argi) && LENGTH(argi) != 1 )
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		SET_VECTOR_ELT(value, i, SetOption(tag, argi));
 		R_ShowErrorMessages = LOGICAL(argi)[0];
diff -Nru r-base-3.2.3/src/main/paste.c r-base-3.3.1/src/main/paste.c
--- r-base-3.2.3/src/main/paste.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/paste.c	2016-03-16 23:04:17.000000000 +0000
@@ -117,8 +117,8 @@
 	    if (!isString(VECTOR_ELT(x, j)))
 		error(_("non-string argument to internal 'paste'"));
 	}
-	if(xlength(VECTOR_ELT(x, j)) > maxlen)
-	    maxlen = xlength(VECTOR_ELT(x, j));
+	if(XLENGTH(VECTOR_ELT(x, j)) > maxlen)
+	    maxlen = XLENGTH(VECTOR_ELT(x, j));
     }
     if(maxlen == 0)
 	return (!isNull(collapse)) ? mkString("") : allocVector(STRSXP, 0);
@@ -142,7 +142,7 @@
 
 	pwidth = 0;
 	for (j = 0; j < nx; j++) {
-	    k = xlength(VECTOR_ELT(x, j));
+	    k = XLENGTH(VECTOR_ELT(x, j));
 	    if (k > 0) {
 		SEXP cs = STRING_ELT(VECTOR_ELT(x, j), i % k);
 		if(IS_UTF8(cs)) use_UTF8 = TRUE;
@@ -152,7 +152,7 @@
 	if (use_Bytes) use_UTF8 = FALSE;
 	vmax = vmaxget();
 	for (j = 0; j < nx; j++) {
-	    k = xlength(VECTOR_ELT(x, j));
+	    k = XLENGTH(VECTOR_ELT(x, j));
 	    if (k > 0) {
 		if(use_Bytes)
 		    pwidth += strlen(CHAR(STRING_ELT(VECTOR_ELT(x, j), i % k)));
@@ -175,7 +175,7 @@
 	cbuf = buf = R_AllocStringBuffer(pwidth, &cbuff);
 	vmax = vmaxget();
 	for (j = 0; j < nx; j++) {
-	    k = xlength(VECTOR_ELT(x, j));
+	    k = XLENGTH(VECTOR_ELT(x, j));
 	    if (k > 0) {
 		SEXP cs = STRING_ELT(VECTOR_ELT(x, j), i % k);
 		if (use_UTF8) {
@@ -320,7 +320,7 @@
 	    if (!isString(VECTOR_ELT(x, j)))
 		error(_("non-string argument to Internal paste"));
 	}
-	ln = length(VECTOR_ELT(x, j));
+	ln = LENGTH(VECTOR_ELT(x, j));
 	if(ln > maxlen) maxlen = ln;
 	if(ln == 0) {nzero++; break;}
     }
@@ -331,13 +331,13 @@
     for (i = 0; i < maxlen; i++) {
 	pwidth = 0;
 	for (j = 0; j < nx; j++) {
-	    k = length(VECTOR_ELT(x, j));
+	    k = LENGTH(VECTOR_ELT(x, j));
 	    pwidth += (int) strlen(translateChar(STRING_ELT(VECTOR_ELT(x, j), i % k)));
 	}
 	pwidth += (nx - 1) * sepw;
 	cbuf = buf = R_AllocStringBuffer(pwidth, &cbuff);
 	for (j = 0; j < nx; j++) {
-	    k = length(VECTOR_ELT(x, j));
+	    k = LENGTH(VECTOR_ELT(x, j));
 	    if (k > 0) {
 		s = translateChar(STRING_ELT(VECTOR_ELT(x, j), i % k));
 		strcpy(buf, s);
@@ -612,7 +612,6 @@
     R_xlen_t n = XLENGTH(x);
     PrintDefaults();
 
-    digits = asInteger(CADR(args));
     if (!isNull(CADR(args))) {
 	digits = asInteger(CADR(args));
 	if (digits == NA_INTEGER || digits < R_MIN_DIGITS_OPT
diff -Nru r-base-3.2.3/src/main/platform.c r-base-3.3.1/src/main/platform.c
--- r-base-3.2.3/src/main/platform.c	2015-09-18 22:15:06.000000000 +0000
+++ r-base-3.3.1/src/main/platform.c	2016-03-16 23:04:17.000000000 +0000
@@ -300,9 +300,9 @@
     dl = (Rboolean) asLogical(CAR(args)); args = CDR(args);
     pg = CAR(args);
     n = 0;			/* -Wall */
-    if (!isString(fn) || (n = length(fn)) < 1)
+    if (!isString(fn) || (n = LENGTH(fn)) < 1)
 	error(_("invalid filename specification"));
-    if (!isString(hd) || length(hd) != n)
+    if (!isString(hd) || LENGTH(hd) != n)
 	error(_("invalid '%s' argument"), "headers");
     if (!isString(tl))
 	error(_("invalid '%s' argument"), "title");
@@ -319,11 +319,11 @@
 	    f[i] = acopy_string(translateChar(el));
 #endif
 	else
-            error(_("invalid filename specification"));
+	    error(_("invalid filename specification"));
 	if (STRING_ELT(hd, i) != NA_STRING)
 	    h[i] = acopy_string(translateChar(STRING_ELT(hd, i)));
 	else
-            error(_("invalid '%s' argument"), "headers");
+	    error(_("invalid '%s' argument"), "headers");
     }
     if (isValidStringF(tl))
 	t = acopy_string(translateChar(STRING_ELT(tl, 0)));
@@ -331,10 +331,10 @@
 	t = "";
     if (isValidStringF(pg)) {
 	SEXP pg0 = STRING_ELT(pg, 0);
-        if (pg0 != NA_STRING)
-            pager = acopy_string(CHAR(pg0));
-        else
-            error(_("invalid '%s' argument"), "pager");
+	if (pg0 != NA_STRING)
+	    pager = acopy_string(CHAR(pg0));
+	else
+	    error(_("invalid '%s' argument"), "pager");
     } else
 	pager = "";
     R_ShowFiles(n, f, h, t, dl, pager);
@@ -384,12 +384,13 @@
     int n, n1, n2;
 
     checkArity(op, args);
-    f1 = CAR(args); n1 = length(f1);
-    f2 = CADR(args); n2 = length(f2);
+    f1 = CAR(args);
+    f2 = CADR(args);
     if (!isString(f1))
 	error(_("invalid '%s' argument"), "file1");
     if (!isString(f2))
 	error(_("invalid '%s' argument"), "file2");
+    n1 = LENGTH(f1); n2 = LENGTH(f2);
     if (n1 < 1)
 	error(_("nothing to append to"));
     if (n2 < 1)
@@ -448,7 +449,7 @@
 	error(_("invalid filename argument"));
     show = asLogical(CADR(args));
     if (show == NA_LOGICAL) show = 0;
-    n = length(fn);
+    n = LENGTH(fn);
     PROTECT(ans = allocVector(LGLSXP, n));
     for (i = 0; i < n; i++) {
 	LOGICAL(ans)[i] = 0;
@@ -473,7 +474,7 @@
     f = CAR(args);
     if (!isString(f))
 	error(_("invalid first filename"));
-    n = length(f);
+    n = LENGTH(f);
     PROTECT(ans = allocVector(LGLSXP, n));
     for (i = 0; i < n; i++) {
 	if (STRING_ELT(f, i) != NA_STRING) {
@@ -539,12 +540,13 @@
     int i;
 #endif
     checkArity(op, args);
-    f1 = CAR(args); n1 = length(f1);
-    f2 = CADR(args); n2 = length(f2);
+    f1 = CAR(args);
+    f2 = CADR(args);
     if (!isString(f1))
 	error(_("invalid first filename"));
     if (!isString(f2))
 	error(_("invalid second filename"));
+    n1 = LENGTH(f1); n2 = LENGTH(f2);
     if (n1 < 1)
 	error(_("nothing to link"));
     if (n2 < 1)
@@ -621,12 +623,13 @@
     int i;
 #endif
     checkArity(op, args);
-    f1 = CAR(args); n1 = length(f1);
-    f2 = CADR(args); n2 = length(f2);
+    f1 = CAR(args);
+    f2 = CADR(args);
     if (!isString(f1))
 	error(_("invalid first filename"));
     if (!isString(f2))
 	error(_("invalid second filename"));
+    n1 = LENGTH(f1); n2 = LENGTH(f2);
     if (n1 < 1)
 	error(_("nothing to link"));
     if (n2 < 1)
@@ -699,13 +702,14 @@
 #endif
 
     checkArity(op, args);
-    f1 = CAR(args); n1 = length(f1);
-    f2 = CADR(args); n2 = length(f2);
+    f1 = CAR(args);
+    f2 = CADR(args);
     if (!isString(f1))
 	error(_("invalid '%s' argument"), "from");
     if (!isString(f2))
 	error(_("invalid '%s' argument"), "to");
-    if (n2 != n1)
+    n1 = LENGTH(f1); n2 = LENGTH(f2);
+   if (n2 != n1)
 	error(_("'from' and 'to' are of different lengths"));
     PROTECT(ans = allocVector(LGLSXP, n1));
     for (i = 0; i < n1; i++) {
@@ -794,7 +798,7 @@
     int extras = asInteger(CADR(args));
     if(extras == NA_INTEGER)
 	error(_("invalid '%s' argument"), "extra_cols");
-    int n = length(fn), ncols = 6;
+    int n = LENGTH(fn), ncols = 6;
     if(extras) {
 #ifdef UNIX_EXTRAS
 	ncols = 10;
@@ -842,9 +846,9 @@
 	size_t len = wcslen(wfn);
 	if (len) {
 	    wchar_t *p = wfn + (len - 1);
-            if (len > 1 && (*p == L'/' || *p == L'\\') &&
-	*(p-1) != L':') *p = 0;
-        }
+	    if (len > 1 && (*p == L'/' || *p == L'\\') &&
+		*(p-1) != L':') *p = 0;
+	}
 #else
 	const char *efn = R_ExpandFileName(translateChar(STRING_ELT(fn, i)));
 #endif
@@ -973,7 +977,7 @@
     fn = CAR(args);
     if (!isString(fn))
 	error(_("invalid filename argument"));
-    int n = length(fn);
+    int n = LENGTH(fn);
     PROTECT(ans = allocVector(LGLSXP, n));
     for (int i = 0; i < n; i++) {
 #ifdef Win32
@@ -985,9 +989,9 @@
 	size_t len = wcslen(wfn);
 	if (len) {
 	    wchar_t *p = wfn + (len - 1);
-            if (len > 1 && (*p == L'/' || *p == L'\\') &&
-	*(p-1) != L':') *p = 0;
-        }
+	    if (len > 1 && (*p == L'/' || *p == L'\\') &&
+		*(p-1) != L':') *p = 0;
+	}
 #else
 	const char *efn = R_ExpandFileName(translateChar(STRING_ELT(fn, i)));
 #endif
@@ -1119,7 +1123,7 @@
 		    IF_MATCH_ADD_TO_ANS
 	    }
 
-        } // end while()
+	} // end while()
 	closedir(dir);
     }
 }
@@ -1134,9 +1138,9 @@
     if (!isString(d)) error(_("invalid '%s' argument"), "path");
     SEXP p = CAR(args); args = CDR(args);
     Rboolean pattern = FALSE;
-    if (isString(p) && length(p) >= 1 && STRING_ELT(p, 0) != NA_STRING)
+    if (isString(p) && LENGTH(p) >= 1 && STRING_ELT(p, 0) != NA_STRING)
 	pattern = TRUE;
-    else if (!isNull(p) && !(isString(p) && length(p) < 1))
+    else if (!isNull(p) && !(isString(p) && LENGTH(p) < 1))
 	error(_("invalid '%s' argument"), "pattern");
     int allfiles = asLogical(CAR(args)); args = CDR(args);
     if (allfiles == NA_LOGICAL)
@@ -1297,7 +1301,7 @@
     checkArity(op, args);
     if (!isString(file = CAR(args)))
 	error(_("invalid '%s' argument"), "file");
-    nfile = length(file);
+    nfile = LENGTH(file);
     ans = PROTECT(allocVector(LGLSXP, nfile));
     for (i = 0; i < nfile; i++) {
 	LOGICAL(ans)[i] = 0;
@@ -1355,7 +1359,7 @@
     fn = CAR(args);
     if (!isString(fn))
 	error(_("invalid '%s' argument"), "names");
-    n = length(fn);
+    n = LENGTH(fn);
     mode = asInteger(CADR(args));
     if (mode < 0 || mode > 7) error(_("invalid '%s' argument"), "mode");
     modemask = 0;
@@ -1633,7 +1637,7 @@
 		globfree(&globbuf);
 	    } else failures++;
 #else /* HAVE_GLOB */
-	        failures += R_unlink(names, recursive, force);
+		failures += R_unlink(names, recursive, force);
 	    } else failures++;
 #endif
 	}
@@ -1642,69 +1646,6 @@
 }
 #endif
 
-#if 0
-static void chmod_one(const char *name)
-{
-    DIR *dir;
-    struct dirent *de;
-    char p[PATH_MAX];
-#ifdef Win32
-    struct _stati64 sb;
-#else
-    struct stat sb;
-#endif
-#ifndef Win32
-    mode_t mask = S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR, /* 0644 */
-	dirmask = mask | S_IXUSR | S_IXGRP | S_IXOTH; /* 0755 */
-#endif
-
-    if (streql(name, ".") || streql(name, "..")) return;
-    if (!R_FileExists(name)) return;
-#ifdef Win32
-    _stati64(name, &sb);
-    chmod(name, _S_IWRITE);
-#else
-    stat(name, &sb);
-    chmod(name, (sb.st_mode | mask) & dirmask);
-#endif
-    if ((sb.st_mode & S_IFDIR) > 0) { /* a directory */
-#ifndef Win32
-	chmod(name, dirmask);
-#endif
-	if ((dir = opendir(name)) != NULL) {
-	    while ((de = readdir(dir))) {
-		if (streql(de->d_name, ".") || streql(de->d_name, ".."))
-		    continue;
-		size_t n = strlen(name);
-		if (name[n-1] == R_FileSep[0])
-		    snprintf(p, PATH_MAX, "%s%s", name, de->d_name);
-		else
-		    snprintf(p, PATH_MAX, "%s%s%s", name, R_FileSep, de->d_name);
-		chmod_one(p);
-	    }
-	    closedir(dir);
-	} else {
-	    /* we were unable to read a dir */
-	}
-    }
-}
-
-/* recursively fix up permissions: used for R CMD INSTALL and build.
-   NB: this overrides umask. */
-SEXP attribute_hidden do_dirchmod(SEXP call, SEXP op, SEXP args, SEXP env)
-{
-    SEXP dr;
-    checkArity(op, args);
-    dr = CAR(args);
-    if(!isString(dr) || length(dr) != 1)
-	error(_("invalid '%s' argument"), "dir");
-    chmod_one(translateChar(STRING_ELT(dr, 0)));
-
-    return R_NilValue;
-}
-#endif
-
-
 SEXP attribute_hidden do_getlocale(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     int cat;
@@ -1843,6 +1784,7 @@
     int i = 0;
     char buff[20];
 
+    checkArity(op, args);
     PROTECT(ans = allocVector(STRSXP, 18));
     PROTECT(ansnames = allocVector(STRSXP, 18));
     SET_STRING_ELT(ans, i, mkChar(lc->decimal_point));
@@ -1904,13 +1846,13 @@
     fn = CAR(args);
     if (!isString(fn))
 	error(_("invalid '%s' argument"), "path");
-    n = length(fn);
+    n = LENGTH(fn);
     PROTECT(ans = allocVector(STRSXP, n));
     for (i = 0; i < n; i++) {
-        SEXP tmp = STRING_ELT(fn, i);
-        if (tmp != NA_STRING) {
-            tmp = markKnown(R_ExpandFileName(translateChar(tmp)), tmp);
-        }
+	SEXP tmp = STRING_ELT(fn, i);
+	if (tmp != NA_STRING) {
+	    tmp = markKnown(R_ExpandFileName(translateChar(tmp)), tmp);
+	}
 	SET_STRING_ELT(ans, i, tmp);
     }
     UNPROTECT(1);
@@ -1944,6 +1886,7 @@
 /* only actually used on Unix */
 SEXP attribute_hidden do_capabilitiesX11(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op, args);
 #ifdef Unix
     return ScalarLogical(R_can_use_X11());
 #else
@@ -2027,25 +1970,13 @@
 #endif
 
     SET_STRING_ELT(ansnames, i, mkChar("http/ftp"));
-#if HAVE_INTERNET
     LOGICAL(ans)[i++] = TRUE;
-#else
-    LOGICAL(ans)[i++] = FALSE;
-#endif
 
     SET_STRING_ELT(ansnames, i, mkChar("sockets"));
-#ifdef HAVE_SOCKETS
     LOGICAL(ans)[i++] = TRUE;
-#else
-    LOGICAL(ans)[i++] = FALSE;
-#endif
 
     SET_STRING_ELT(ansnames, i, mkChar("libxml"));
-#ifdef SUPPORT_LIBXML
     LOGICAL(ans)[i++] = TRUE;
-#else
-    LOGICAL(ans)[i++] = FALSE;
-#endif
 
     SET_STRING_ELT(ansnames, i, mkChar("fifo"));
 #if (defined(HAVE_MKFIFO) && defined(HAVE_FCNTL_H)) || defined(_WIN32)
@@ -2119,7 +2050,7 @@
     LOGICAL(ans)[i++] = sizeof(LDOUBLE) > sizeof(double);
 
     SET_STRING_ELT(ansnames, i, mkChar("libcurl"));
-#ifdef HAVE_CURL_CURL_H
+#ifdef HAVE_LIBCURL
     LOGICAL(ans)[i++] = TRUE;
 #else
     LOGICAL(ans)[i++] = FALSE;
@@ -2131,47 +2062,6 @@
     return ans;
 }
 
-#if defined(HAVE_BSD_NETWORKING) && defined(HAVE_ARPA_INET_H)
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-SEXP attribute_hidden do_nsl(SEXP call, SEXP op, SEXP args, SEXP rho)
-{
-    SEXP ans = R_NilValue;
-    const char *name; char ip[] = "xxx.xxx.xxx.xxx";
-    struct hostent *hp;
-
-    checkArity(op, args);
-    if (!isString(CAR(args)) || length(CAR(args)) != 1)
-	error(_("'hostname' must be a character vector of length 1"));
-    name = translateChar(STRING_ELT(CAR(args), 0));
-
-    hp = gethostbyname(name);
-
-    if (hp == NULL) {		/* cannot resolve the address */
-	warning(_("nsl() was unable to resolve host '%s'"), name);
-    } else {
-	if (hp->h_addrtype == AF_INET) {
-	    struct in_addr in;
-	    memcpy(&in.s_addr, *(hp->h_addr_list), sizeof (in.s_addr));
-	    strcpy(ip, inet_ntoa(in));
-	} else {
-	    warning(_("unknown format returned by C function 'gethostbyname'"));
-	}
-	ans = mkString(ip);
-    }
-    return ans;
-}
-#else
-SEXP attribute_hidden do_nsl(SEXP call, SEXP op, SEXP args, SEXP rho)
-{
-    warning(_("nsl() is not supported on this platform"));
-    return R_NilValue;
-}
-#endif
-
 SEXP attribute_hidden do_sysgetpid(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
@@ -2195,7 +2085,7 @@
 
     checkArity(op, args);
     path = CAR(args);
-    if (!isString(path) || length(path) != 1)
+    if (!isString(path) || LENGTH(path) != 1)
 	error(_("invalid '%s' argument"), "path");
     if (STRING_ELT(path, 0) == NA_STRING) return ScalarLogical(FALSE);
     show = asLogical(CADR(args));
@@ -2255,7 +2145,7 @@
 
     checkArity(op, args);
     path = CAR(args);
-    if (!isString(path) || length(path) != 1)
+    if (!isString(path) || LENGTH(path) != 1)
 	error(_("invalid '%s' argument"), "path");
     if (STRING_ELT(path, 0) == NA_STRING) return ScalarLogical(FALSE);
     show = asLogical(CADR(args));
@@ -2411,6 +2301,9 @@
 		nfail++;
 		goto copy_error;
 	    }
+	} else if (!over) {
+	  nfail++;
+	  goto copy_error;
 	}
 	if(fp1) fclose(fp1); fp1 = NULL;
 	if(fp2) fclose(fp2); fp2 = NULL;
@@ -2444,7 +2337,7 @@
 	    error(_("invalid '%s' argument"), "to");
 	over = asLogical(CAR(args)); args = CDR(args);
 	if (over == NA_LOGICAL)
-	    error(_("invalid '%s' argument"), "over");
+	    error(_("invalid '%s' argument"), "overwrite");
 	recursive = asLogical(CAR(args)); args = CDR(args);
 	if (recursive == NA_LOGICAL)
 	    error(_("invalid '%s' argument"), "recursive");
@@ -2457,7 +2350,7 @@
 	wcsncpy(dir,
 		filenameToWchar(STRING_ELT(to, 0), TRUE),
 		PATH_MAX);
-        dir[PATH_MAX - 1] = L'\0';
+	dir[PATH_MAX - 1] = L'\0';
 	if (*(dir + (wcslen(dir) - 1)) !=  L'\\')
 	    wcsncat(dir, L"\\", PATH_MAX);
 	for (i = 0; i < nfiles; i++) {
@@ -2633,10 +2526,11 @@
 		nfail++;
 		goto copy_error;
 	    }
-	    if(fp2) fclose(fp2); fp2 = NULL;
+	    if(fp2) {fclose(fp2); fp2 = NULL;}
 	    if(perms) chmod(dest, sb.st_mode & mask);
 	    if(dates) copyFileTime(this, dest);
-	}
+	} else if (!over)
+	    nfail++;
 copy_error:
 	if(fp2) fclose(fp2);
 	if(fp1) fclose(fp1);
@@ -2664,7 +2558,7 @@
 	    error(_("invalid '%s' argument"), "to");
 	over = asLogical(CAR(args)); args = CDR(args);
 	if (over == NA_LOGICAL)
-	    error(_("invalid '%s' argument"), "over");
+	    error(_("invalid '%s' argument"), "overwrite");
 	recursive = asLogical(CAR(args)); args = CDR(args);
 	if (recursive == NA_LOGICAL)
 	    error(_("invalid '%s' argument"), "recursive");
@@ -2677,7 +2571,7 @@
 	strncpy(dir,
 		R_ExpandFileName(translateChar(STRING_ELT(to, 0))),
 		PATH_MAX);
-        dir[PATH_MAX - 1] = '\0';
+	dir[PATH_MAX - 1] = '\0';
 	if (*(dir + (strlen(dir) - 1)) !=  '/')
 	    strncat(dir, "/", PATH_MAX);
 	for (i = 0; i < nfiles; i++) {
@@ -2685,7 +2579,7 @@
 		strncpy(from,
 			R_ExpandFileName(translateChar(STRING_ELT(fn, i))),
 			PATH_MAX);
-                from[PATH_MAX - 1] = '\0';
+		from[PATH_MAX - 1] = '\0';
 		size_t ll = strlen(from);
 		if (ll) {  // people do pass ""
 		    /* If there is a trailing sep, this is a mistake */
@@ -2694,11 +2588,11 @@
 		    p = strrchr(from, '/') ;
 		    if (p) {
 			strncpy(name, p+1, PATH_MAX);
-                        name[PATH_MAX - 1] = '\0';
+			name[PATH_MAX - 1] = '\0';
 			*(p+1) = '\0';
 		    } else {
 			strncpy(name, from, PATH_MAX);
-                        name[PATH_MAX - 1] = '\0';
+			name[PATH_MAX - 1] = '\0';
 			strncpy(from, "./", PATH_MAX);
 		    }
 		    nfail = do_copy(from, name, dir, over, recursive,
diff -Nru r-base-3.2.3/src/main/plot3d.c r-base-3.3.1/src/main/plot3d.c
--- r-base-3.2.3/src/main/plot3d.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/plot3d.c	2016-03-16 23:04:16.000000000 +0000
@@ -115,7 +115,7 @@
 		    s = s->next;
 		}
 		if(ns == max_contour_segments)
-		    warning(_("contour(): circular/long seglist -- set %s > %d?"),
+		    warning(_("contour(): circular/long seglist -- set %s > %d?"), 
 		            "options(\"max.contour.segments\")", max_contour_segments);
 		/*
 		 * "write" the contour locations into the list of contours
diff -Nru r-base-3.2.3/src/main/plot.c r-base-3.3.1/src/main/plot.c
--- r-base-3.2.3/src/main/plot.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/plot.c	2016-03-16 23:04:16.000000000 +0000
@@ -133,8 +133,10 @@
 	    n = 0;
 	    if (0.5 * dn >= umin) n++;
 	    for (;;) {
-		if (dn > umax) break;		n++;
-		if (5 * dn > umax) break;	n++;
+		if (dn > umax) break;
+		n++;
+		if (5 * dn > umax) break;
+		n++;
 		dn *= 10;
 	    }
 	    if (!n)
@@ -159,9 +161,12 @@
 	    if (0.2 * dn >= umin) n++;
 	    if (0.5 * dn >= umin) n++;
 	    for (;;) {
-		if (dn > umax) break;		n++;
-		if (2 * dn > umax) break;	n++;
-		if (5 * dn > umax) break;	n++;
+		if (dn > umax) break;
+		n++;
+		if (2 * dn > umax) break;
+		n++;
+		if (5 * dn > umax) break;
+		n++;
 		dn *= 10;
 	    }
 	    if (!n)
@@ -196,3 +201,4 @@
     } /* linear / log */
     return at;
 }
+
diff -Nru r-base-3.2.3/src/main/printarray.c r-base-3.3.1/src/main/printarray.c
--- r-base-3.2.3/src/main/printarray.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/printarray.c	2016-03-16 23:04:17.000000000 +0000
@@ -37,8 +37,10 @@
 
 #include <stdlib.h> /* for div() */
 
-/* FIXME: sort out encodings */
-/* We need display width of a string */
+/* We need display width of a string.
+   Used only for row/column names found by GetMatrixDimnames,
+   so in native encoding.  (NULL ones from do_prmatrix are skipped.)
+*/
 int Rstrwid(const char *str, int slen, int enc, int quote);  /* from printutils.c */
 #define strwidth(x) Rstrwid(x, (int) strlen(x), CE_NATIVE, 0)
 
@@ -312,6 +314,7 @@
 		   Rprintf("%*s%s", w[j]-2, "", EncodeRaw(x[i + j * r], "")) );
 }
 
+/* rm and cn are found by GetMatrixDimnames so in native encoding */
 attribute_hidden
 void printMatrix(SEXP x, int offset, SEXP dim, int quote, int right,
 		 SEXP rl, SEXP cl, const char *rn, const char *cn)
@@ -487,3 +490,4 @@
     }
     vmaxset(vmax);
 }
+
diff -Nru r-base-3.2.3/src/main/print.c r-base-3.3.1/src/main/print.c
--- r-base-3.2.3/src/main/print.c	2015-08-25 22:18:46.000000000 +0000
+++ r-base-3.3.1/src/main/print.c	2016-03-16 23:04:18.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995-1998	Robert Gentleman and Ross Ihaka.
- *  Copyright (C) 2000-2015	The R Core Team.
+ *  Copyright (C) 2000-2016	The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -66,8 +66,7 @@
 #include "Print.h"
 #include "Fileio.h"
 #include "Rconnections.h"
-#include <S.h>
-
+#include <R_ext/RS.h>
 
 /* Global print parameter struct: */
 R_print_par_t R_print;
@@ -119,13 +118,6 @@
     }
 }
 
-#if 0
-SEXP attribute_hidden do_visibleflag(SEXP call, SEXP op, SEXP args, SEXP rho)
-{
-    return ScalarLogical(R_Visible);
-}
-#endif
-
 /* This is *only* called via outdated R_level prmatrix() : */
 SEXP attribute_hidden do_prmatrix(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
@@ -167,6 +159,7 @@
 /* .Internal( print.function(f, useSource, ...)) */
 SEXP attribute_hidden do_printfunction(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
+    checkArity(op,args);
     SEXP s = CAR(args);
     switch (TYPEOF(s)) {
     case CLOSXP:
@@ -193,9 +186,9 @@
     if (!isInteger(t) || !useSource)
 	t = deparse1w(s, 0, useSource | DEFAULTDEPARSE);
     else {
-        PROTECT(t = lang2(install("as.character"), t));
-        t = eval(t, R_BaseEnv);
-        UNPROTECT(1);
+	PROTECT(t = lang2(install("as.character"), t));
+	t = eval(t, R_BaseEnv);
+	UNPROTECT(1);
     }
     PROTECT(t);
     for (i = 0; i < LENGTH(t); i++)
@@ -742,8 +735,8 @@
 	Rprintf("<CHARSXP: ");
 	Rprintf("%s", EncodeString(s, 0, '"', Rprt_adj_left));
 	Rprintf(">\n");
-        return; /* skip attribute printing for CHARSXP; they are used */
-                /* in managing the CHARSXP cache. */
+	return; /* skip attribute printing for CHARSXP; they are used */
+		/* in managing the CHARSXP cache. */
     case EXPRSXP:
 	PrintExpression(s);
 	break;
diff -Nru r-base-3.2.3/src/main/printutils.c r-base-3.3.1/src/main/printutils.c
--- r-base-3.2.3/src/main/printutils.c	2015-09-12 22:15:05.000000000 +0000
+++ r-base-3.3.1/src/main/printutils.c	2016-05-17 22:15:10.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1999--2015  The R Core Team
+ *  Copyright (C) 1999--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -82,7 +82,6 @@
 
 #define BUFSIZE 8192  /* used by Rprintf etc */
 
-/* Only if ierr < 0 or not is currently used */
 attribute_hidden
 R_size_t R_Decode2Long(char *p, int *ierr)
 {
@@ -92,6 +91,7 @@
     /* else look for letter-code ending : */
     if(R_Verbose)
 	REprintf("R_Decode2Long(): v=%ld\n", v);
+    // NOTE: currently, positive *ierr are not differentiated in the callers:
     if(p[0] == 'G') {
 	if((Giga * (double)v) > R_SIZE_T_MAX) { *ierr = 4; return(v); }
 	return (R_size_t) Giga * v;
@@ -321,10 +321,6 @@
 	       const char *dec)
 {
     static char buff[NB];
-    char Re[NB];
-    const char *Im, *tmp;
-    int flagNegIm = 0;
-    Rcomplex y;
 
     /* IEEE allows signed zeros; strip these here */
     if (x.r == 0.0) x.r = 0.0;
@@ -335,6 +331,10 @@
 		 "%*s", /* was "%*s%*s", R_print.gap, "", */
 		 min(wr+wi+2, (NB-1)), CHAR(R_print.na_string));
     } else {
+	char Re[NB];
+	const char *Im, *tmp;
+	int flagNegIm = 0;
+	Rcomplex y;
 	/* formatComplex rounded, but this does not, and we need to
 	   keep it that way so we don't get strange trailing zeros.
 	   But we do want to avoid printing small exponentials that
@@ -342,12 +342,10 @@
 	 */
 	z_prec_r(&y, &x, R_print.digits);
 	/* EncodeReal has static buffer, so copy */
-	if(y.r == 0.) tmp = EncodeReal0(y.r, wr, dr, er, dec);
-	else tmp = EncodeReal0(x.r, wr, dr, er, dec);
+	tmp = EncodeReal0(y.r == 0. ? y.r : x.r, wr, dr, er, dec);
 	strcpy(Re, tmp);
 	if ( (flagNegIm = (x.i < 0)) ) x.i = -x.i;
-	if(y.i == 0.) Im = EncodeReal0(y.i, wi, di, ei, dec);
-	else Im = EncodeReal0(x.i, wi, di, ei, dec);
+	Im = EncodeReal0(y.i == 0. ? y.i : x.i, wi, di, ei, dec);
 	snprintf(buff, NB, "%s%s%si", Re, flagNegIm ? "-" : "+", Im);
     }
     buff[NB-1] = '\0';
@@ -384,7 +382,7 @@
     const char *p = str;
     int len = 0, i;
 
-    if(ienc == CE_BYTES) {
+    if(ienc == CE_BYTES) { // not currently used for that encoding
 	for (i = 0; i < slen; i++) {
 	    unsigned char k = str[i];
 	    if (k >= 0x20 && k < 0x80) len += 1;
@@ -392,6 +390,10 @@
 	}
 	return len;
     }
+    /* Future-proof: currently that is all Rstrlen calls it with,
+       and printarray has CE_NATIVE explicitly */
+    if(ienc > 2) // CE_NATIVE, CE_UTF8, CE_BYTES are supported
+	warning("unsupported encoding (%d) in Rstrwid", ienc);
     if(mbcslocale || ienc == CE_UTF8) {
 	int res;
 	mbstate_t mb_st;
@@ -639,13 +641,15 @@
 		if(res == 0) {k = 0; wc = L'\0';}
 		if(0x20 <= k && k < 0x7f && iswprint(wc)) {
 		    switch(wc) {
-		    case L'\\': *q++ = '\\'; *q++ = '\\'; p++;
-			break;
+		    case L'\\': *q++ = '\\'; *q++ = '\\'; p++; break;
 		    case L'\'':
 		    case L'"':
 		    case L'`':
-			if(quote == *p)  *q++ = '\\'; *q++ = *p++;
-			break;
+			{
+			    if(quote == *p)  *q++ = '\\';
+			    *q++ = *p++;
+			    break;
+			}
 		    default:
 			for(j = 0; j < res; j++) *q++ = *p++;
 			break;
@@ -715,7 +719,11 @@
 		    case '\'':
 		    case '"':
 		    case '`':
-			if(quote == *p)  *q++ = '\\'; *q++ = *p; break;
+		    {
+			if(quote == *p)  *q++ = '\\';
+			*q++ = *p;
+			break;
+		    }
 		    default: *q++ = *p; break;
 		    }
 		} else switch(*p) {
diff -Nru r-base-3.2.3/src/main/printvector.c r-base-3.3.1/src/main/printvector.c
--- r-base-3.2.3/src/main/printvector.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/printvector.c	2016-03-16 23:04:17.000000000 +0000
@@ -272,7 +272,7 @@
 
 static void printNamedRealVector(double * x, int n, SEXP * names)
     PRINT_N_VECTOR(INI_F_REAL,
-		   Rprintf("%s%*s",
+		   Rprintf("%s%*s", 
 			   EncodeReal0(x[k],w,d,e, OutDec),R_print.gap,""))
 
 #undef INI_F_CPLX
diff -Nru r-base-3.2.3/src/main/radixsort.c r-base-3.3.1/src/main/radixsort.c
--- r-base-3.2.3/src/main/radixsort.c	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/src/main/radixsort.c	2016-03-30 22:02:05.000000000 +0000
@@ -0,0 +1,1932 @@
+/*
+ *  R : A Computer Language for Statistical Data Analysis
+ *  Copyright (C) 2016   The R Core Team
+ *
+ *  Based on code donated from the data.table package
+ *  (C) 2006-2015 Matt Dowle and Arun Srinivasan.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, a copy is available at
+ *  https://www.R-project.org/Licenses/
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define USE_RINTERNALS // read-only, promise.
+
+#include <Defn.h>
+#include <Internal.h>
+
+// gs = groupsizes e.g.23, 12, 87, 2, 1, 34,...
+static int *gs[2] = { NULL };
+//two vectors flip flopped:flip and 1 - flip
+static int flip = 0;
+//allocated stack size
+static int gsalloc[2] = { 0 };
+static int gsngrp[2] = { 0 };
+//max grpn so far
+static int gsmax[2] = { 0 };
+//max size of stack, set by do_radixsort to nrows
+static int gsmaxalloc = 0;
+//switched off for last arg unless retGrp==TRUE
+static Rboolean stackgrps = TRUE;
+// TRUE for setkey, FALSE for by=
+static Rboolean sortStr = TRUE;
+// used by do_radixsort and [i|d|c]sort to reorder order.
+// not needed if narg==1
+static int *newo = NULL;
+// =1, 0, -1 for TRUE, NA, FALSE respectively.
+// Value rewritten inside do_radixsort().
+static int nalast = -1;
+// =1, -1 for ascending and descending order respectively
+static int order = 1;
+
+//replaced n < 200 with n < N_SMALL.Easier to change later
+#define N_SMALL 200
+// range limit for counting sort. Should be less than INT_MAX
+// (see setRange for details)
+#define N_RANGE 100000
+
+static SEXP *saveds = NULL;
+static R_len_t *savedtl = NULL, nalloc = 0, nsaved = 0;
+
+static void savetl_init()
+{
+    if (nsaved || nalloc || saveds || savedtl)
+	error("Internal error: savetl_init checks failed (%d %d %p %p).",
+	      nsaved, nalloc, saveds, savedtl);
+    nsaved = 0;
+    nalloc = 100;
+    saveds = (SEXP *) malloc(nalloc * sizeof(SEXP));
+    if (saveds == NULL)
+	error("Could not allocate saveds in savetl_init");
+    savedtl = (R_len_t *) malloc(nalloc * sizeof(R_len_t));
+    if (savedtl == NULL) {
+	free(saveds);
+	error("Could not allocate saveds in savetl_init");
+    }
+}
+
+static void savetl_end()
+{
+    // Can get called if nothing has been saved yet (nsaved == 0), or
+    // even if _init() has not been called yet (pointers NULL). Such as
+    // to clear up before error. Also, it might be that nothing needed
+    // to be saved anyway.
+    for (int i = 0; i < nsaved; i++)
+	SET_TRUELENGTH(saveds[i], savedtl[i]);
+    free(saveds);  // does nothing on NULL input
+    free(savedtl);
+    nsaved = nalloc = 0;
+    saveds = NULL;
+    savedtl = NULL;
+}
+
+
+static void savetl(SEXP s)
+{
+    if (nsaved >= nalloc) {
+	nalloc *= 2;
+	char *tmp;
+	tmp = (char *) realloc(saveds, nalloc * sizeof(SEXP));
+	if (tmp == NULL) {
+	    savetl_end();
+	    error("Could not realloc saveds in savetl");
+	}
+	saveds = (SEXP *) tmp;
+	tmp = (char *) realloc(savedtl, nalloc * sizeof(R_len_t));
+	if (tmp == NULL) {
+	    savetl_end();
+	    error("Could not realloc savedtl in savetl");
+	}
+	savedtl = (R_len_t *) tmp;
+    }
+    saveds[nsaved] = s;
+    savedtl[nsaved] = TRUELENGTH(s);
+    nsaved++;
+}
+
+// http://gcc.gnu.org/onlinedocs/cpp/Swallowing-the-Semicolon.html#Swallowing-the-Semicolon
+#define Error(...) do {savetl_end(); error(__VA_ARGS__);} while(0)
+#undef warning
+// since it can be turned to error via warn = 2
+#define warning(...) Do not use warning in this file
+/* use malloc/realloc (not Calloc/Realloc) so we can trap errors
+   and call savetl_end() before the error(). */
+
+static void growstack(int newlen)
+{
+    // no link to icount range restriction,
+    // just 100,000 seems a good minimum at 0.4MB
+    if (newlen == 0) newlen = 100000;
+    if (newlen > gsmaxalloc) newlen = gsmaxalloc;
+    gs[flip] = realloc(gs[flip], newlen * sizeof(int));
+    if (gs[flip] == NULL)
+	Error("Failed to realloc working memory stack to %d*4bytes (flip=%d)",
+	      newlen, flip);
+    gsalloc[flip] = newlen;
+}
+
+static void push(int x)
+{
+    if (!stackgrps || x == 0)
+	return;
+    if (gsalloc[flip] == gsngrp[flip])
+	growstack(gsngrp[flip] * 2);
+    gs[flip][gsngrp[flip]++] = x;
+    if (x > gsmax[flip])
+	gsmax[flip] = x;
+}
+
+static void mpush(int x, int n)
+{
+    if (!stackgrps || x == 0)
+	return;
+    if (gsalloc[flip] < gsngrp[flip] + n)
+	growstack((gsngrp[flip] + n) * 2);
+    for (int i = 0; i < n; i++)
+	gs[flip][gsngrp[flip]++] = x;
+    if (x > gsmax[flip])
+	gsmax[flip] = x;
+}
+
+static void flipflop()
+{
+    flip = 1 - flip;
+    gsngrp[flip] = 0;
+    gsmax[flip] = 0;
+    if (gsalloc[flip] < gsalloc[1 - flip])
+	growstack(gsalloc[1 - flip] * 2);
+}
+
+static void gsfree()
+{
+    free(gs[0]);
+    free(gs[1]);
+    gs[0] = NULL;
+    gs[1] = NULL;
+    flip = 0;
+    gsalloc[0] = gsalloc[1] = 0;
+    gsngrp[0] = gsngrp[1] = 0;
+    gsmax[0] = gsmax[1] = 0;
+    gsmaxalloc = 0;
+}
+
+#ifdef TIMING_ON
+// many calls to clock() can be expensive,
+// hence compiled out rather than switch(verbose)
+#include <time.h>
+#define NBLOCK 20
+static clock_t tblock[NBLOCK], tstart;
+static int nblock[NBLOCK];
+#define TBEG() tstart = clock();
+#define TEND(i) tblock[i] += clock()-tstart; nblock[i]++; tstart = clock();
+#else
+#define TBEG()
+#define TEND(i)
+#endif
+
+static int range, off; // used by both icount and do_radixsort
+static void setRange(int *x, int n)
+{
+    int xmin = NA_INTEGER, xmax = NA_INTEGER;
+    double overflow;
+
+    off = (nalast == 1) ? 0 : 1;   // nalast^decreasing ? 0 : 1;
+    // off = 0 will store values starting from index 0. NAs will go last.
+    // off = 1 will store values starting from index 1. NAs will be at 0th index.
+    int i = 0;
+    while(i < n && x[i] == NA_INTEGER) i++;
+    if (i < n) xmax = xmin = x[i];
+    for (; i < n; i++) {
+	int tmp = x[i];
+	if (tmp == NA_INTEGER)
+	    continue;
+	if (tmp > xmax)
+	    xmax = tmp;
+	else if (tmp < xmin)
+	    xmin = tmp;
+    }
+    // all NAs, nothing to do
+    if (xmin == NA_INTEGER) {
+	range = NA_INTEGER;
+	return;
+    }
+    // ex: x=c(-2147483647L, NA_integer_, 1L) results in overflowing int range.
+    overflow = (double) xmax - (double) xmin + 1;
+    // detect and force iradix here, since icount is out of the picture
+    if (overflow > INT_MAX) {
+	range = INT_MAX;
+	return;
+    }
+
+    range = xmax - xmin + 1;
+    // so that  off+order*x[i]  (below in icount)
+    // => (x[i]-xmin)+0|1  or  (xmax-x[i])+0|1
+    off = order == 1 ? -xmin + off : xmax + off;
+
+    return;
+}
+
+// x*order results in integer overflow when -1*NA,
+// so careful to avoid that here :
+static inline int icheck(int x)
+{
+    // if nalast == 1, NAs must go last.
+    return ((nalast != 1) ? ((x != NA_INTEGER) ? x*order : x) :
+	    ((x != NA_INTEGER) ? (x*order) - 1 : INT_MAX));
+}
+
+
+static void icount(int *x, int *o, int n)
+/* Counting sort:
+   1. Places the ordering into o directly, overwriting whatever was there
+   2. Doesn't change x
+   3. Pushes group sizes onto stack
+*/
+{
+    int napos = (nalast == 1) ? range : 0;  // take care of 'nalast' argument
+    // static is IMPORTANT, counting sort is called repetitively.
+    static unsigned int counts[N_RANGE + 1] = { 0 };
+    /* counts are set back to 0 at the end efficiently. 1e5 = 0.4MB i.e
+       tiny. We'll only use the front part of it, as large as range. So it's
+       just reserving space, not using it. Have defined N_RANGE to be 100000.*/
+    if (range > N_RANGE)
+	Error("Internal error: range = %d; isorted cannot handle range > %d",
+	      range, N_RANGE);
+    for (int i = 0; i < n; i++) {
+	// For nalast=NA case, we won't remove/skip NAs, rather set 'o' indices
+	// to 0. subset will skip them. We can't know how many NAs to skip
+	// beforehand - i.e. while allocating "ans" vector
+	if (x[i] == NA_INTEGER)
+	    counts[napos]++;
+	else
+	    counts[off + order * x[i]]++;
+    }
+    
+    int tmp = 0;
+    for (int i = 0; i <= range; i++) 
+        /* no point in adding tmp < n && i <= range, since range includes max, 
+           need to go to max, unlike 256 loops elsewhere in radixsort.c */
+    {
+	if (counts[i]) {
+	    // cumulate but not through 0's.
+	    // Helps resetting zeros when n < range, below.
+	    push(counts[i]);
+	    counts[i] = (tmp += counts[i]);
+	}
+    }
+    for (int i = n - 1; i >= 0; i--) {
+	// This way na.last=TRUE/FALSE cases will have just a
+	// single if-check overhead.
+	o[--counts[(x[i] == NA_INTEGER) ? napos :
+		   off + order * x[i]]] = (int) (i + 1);
+    }
+    // nalast = 1, -1 are both taken care already.
+    if (nalast == 0)
+	// nalast = 0 is dealt with separately as it just sets o to 0
+	for (int i = 0; i < n; i++)
+	    o[i] = (x[o[i] - 1] == NA_INTEGER) ? 0 : o[i];
+    // at those indices where x is NA. x[o[i]-1] because x is not modifed here.
+
+    /* counts were cumulated above so leaves non zero.
+       Faster to clear up now ready for next time. */
+    if (n < range) {
+	/* Many zeros in counts already. Loop through n instead,
+	   doesn't matter if we set to 0 several times on any repeats */
+	counts[napos] = 0;
+	for (int i = 0; i < n; i++) {
+	    if (x[i] != NA_INTEGER)
+		counts[off + order * x[i]] = 0;
+	}
+    } else
+	memset(counts, 0, (range + 1) * sizeof(int));
+    return;
+}
+
+static void iinsert(int *x, int *o, int n)
+/*  orders both x and o by reference in-place. Fast for small vectors,
+    low overhead.  don't be tempted to binsearch backwards here, have
+    to shift anyway; many memmove would have overhead and do the same
+    thing. */
+/*  when nalast == 0, iinsert will be called only from within iradix,
+    where o[.] = 0 for x[.]=NA is already taken care of */
+{
+    for (int i = 1; i < n; i++) {
+	int xtmp = x[i];
+	if (xtmp < x[i - 1]) {
+	    int j = i - 1;
+	    int otmp = o[i];
+	    while (j >= 0 && xtmp < x[j]) {
+		x[j + 1] = x[j];
+		o[j + 1] = o[j];
+		j--;
+	    }
+	    x[j + 1] = xtmp;
+	    o[j + 1] = otmp;
+	}
+    }
+    int tt = 0;
+    for (int i = 1; i < n; i++)
+	if (x[i] == x[i - 1])
+	    tt++;
+	else {
+	    push(tt + 1);
+	    tt = 0;
+	}
+    push(tt + 1);
+}
+
+/*
+  iradix is a counting sort performed forwards from MSB to LSB, with
+  some tricks and short circuits building on Terdiman and Herf.
+  http://codercorner.com/RadixSortRevisited.htm
+  http://stereopsis.com/radix.html
+
+  ~ Note they are LSD, but we do MSD here which is more complicated,
+    for efficiency.
+  ~ NAs need no special treatment as NA is the most negative integer
+    in R (checked in init.c once,  for efficiency) so NA naturally sort
+    to the front.
+  ~ Using 4-pass 1-byte radix for the following reasons :
+
+  * 11-bit (Herf) reduces to 3-passes (3*11=33) yes, and LSD need
+    random access to o vector in each pass 1:n so reduction in passes is
+    good, but Terdiman's idea to skip a radix if all values are equal
+    occurs less the wider the radix. A narrower radix benefits more from that.
+    * That's detected here using a single 'if', an improvement on
+      Terdiman's exposition of a single loop to find if any count==n
+    * The pass through counts bites when radix is wider,
+      because we repetitively call this iradix from fastorder forwards.
+  *  Herf's parallel histogramming is neat. In 4-pass 1-byte it needs
+     4*256 storage, that's  tiny, and can be static. 4*256 << 3*2048.
+     4-pass 1-byte is simpler and tighter code than 3-pass 11-bit,
+     giving modern optimizers and modern CPUs a better chance.
+     We may get lucky anyway, if one or two of the 4-passes are skipped.
+
+  Recall: there are no comparisons at all in counting and radix,
+  there is wide random access in each LSD radix pass, though.
+*/
+
+// 4 are used for iradix, 8 for dradix and i64radix
+static unsigned int radixcounts[8][257] = { {0} };
+
+static int skip[8];
+/* global because iradix and iradix_r interact and are called repetitively.
+   counts are set back to 0 after each use, to benefit from skipped radix. */
+static void *radix_xsub = NULL;
+static size_t radix_xsuballoc = 0;
+
+static int *otmp = NULL, otmp_alloc = 0;
+static void alloc_otmp(int n)
+{
+    if (otmp_alloc >= n)
+	return;
+    otmp = (int *) realloc(otmp, n * sizeof(int));
+    if (otmp == NULL)
+	Error("Failed to allocate working memory for otmp. Requested %d * %d bytes",
+	      n, sizeof(int));
+    otmp_alloc = n;
+}
+
+// TO DO: save xtmp if possible, see allocs in do_radixsort
+static void *xtmp = NULL;
+static int xtmp_alloc = 0;
+// TO DO: currently always the largest type (double) but
+//        could be int if that's all that's needed
+static void alloc_xtmp(int n)
+{
+    if (xtmp_alloc >= n)
+	return;
+    xtmp = (double *) realloc(xtmp, n * sizeof(double));
+    if (xtmp == NULL)
+	Error("Failed to allocate working memory for xtmp. Requested %d * %d bytes",
+	      n, sizeof(double));
+    xtmp_alloc = n;
+}
+
+static void iradix_r(int *xsub, int *osub, int n, int radix);
+
+static void iradix(int *x, int *o, int n)
+/* As icount :
+   Places the ordering into o directly, overwriting whatever was there
+   Doesn't change x
+   Pushes group sizes onto stack */
+{
+    int nextradix, itmp, thisgrpn, maxgrpn;
+    unsigned int thisx = 0, shift, *thiscounts;
+
+    for (int i = 0; i < n;i++) {
+	/* parallel histogramming pass; i.e. count occurrences of
+	   0:255 in each byte.  Sequential so almost negligible. */
+	// relies on overflow behaviour. And shouldn't -INT_MIN be up in iradix?
+	thisx = (unsigned int) (icheck(x[i])) - INT_MIN;
+	// unrolled since inside n-loop
+	radixcounts[0][thisx & 0xFF]++;
+	radixcounts[1][thisx >> 8 & 0xFF]++;
+	radixcounts[2][thisx >> 16 & 0xFF]++;
+	radixcounts[3][thisx >> 24 & 0xFF]++;
+    }
+    for (int radix = 0; radix < 4; radix++) {
+	/* any(count == n) => all radix must have been that value =>
+	   last x (still thisx) was that value */
+	int i = thisx >> (radix*8) & 0xFF;
+	skip[radix] = radixcounts[radix][i] == n;
+	// clear it now, the other counts must be 0 already
+	if (skip[radix])
+	    radixcounts[radix][i] = 0;
+    }
+
+    int radix = 3;  // MSD
+    while (radix >= 0 && skip[radix]) radix--;
+    if (radix == -1) { // All radix are skipped; one number repeated n times.
+	if (nalast == 0 && x[0] == NA_INTEGER)
+	    // all values are identical. return 0 if nalast=0 & all NA
+	    // because of 'return', have to take care of it here.
+	    for (int i = 0; i < n; i++)
+		o[i] = 0;
+	else
+	    for (int i = 0; i < n; i++)
+		o[i] = (i + 1);
+	push(n);
+	return;
+    }
+    for (int i = radix - 1; i >= 0; i--) {
+	if (!skip[i])
+	    memset(radixcounts[i], 0, 257 * sizeof(unsigned int));
+	/* clear the counts as we only needed the parallel pass for skip[]
+	   and we're going to use radixcounts again below. Can't use parallel
+	   lower counts in MSD radix, unlike LSD. */
+    }
+    thiscounts = radixcounts[radix];
+    shift = radix * 8;
+
+    itmp = thiscounts[0];
+    maxgrpn = itmp;
+    for (int i = 1; itmp < n && i < 256; i++) {
+	thisgrpn = thiscounts[i];
+	if (thisgrpn) {
+	    // don't cummulate through 0s, important below.
+	    if (thisgrpn > maxgrpn)
+		maxgrpn = thisgrpn;
+	    thiscounts[i] = (itmp += thisgrpn);
+	}
+    }
+    for (int i = n - 1; i >= 0; i--) {
+	thisx = ((unsigned int) (icheck(x[i])) - INT_MIN) >> shift & 0xFF;
+	o[--thiscounts[thisx]] = i + 1;
+    }
+
+    if (radix_xsuballoc < maxgrpn) {
+        // The largest group according to the first non-skipped radix,
+        // so could be big (if radix is needed on first arg)
+        // TO DO: could include extra bits to divide the first radix
+        // up more. Often the MSD has groups in just 0-4 out of 256.
+        // free'd at the end of do_radixsort once we're done calling iradix
+        // repetitively
+        radix_xsub = (int *) realloc(radix_xsub, maxgrpn * sizeof(double));
+        if (!radix_xsub)
+            Error("Failed to realloc working memory %d*8bytes (xsub in iradix), radix=%d",
+                  maxgrpn, radix);
+        radix_xsuballoc = maxgrpn;
+    }
+
+    // TO DO: can we leave this to do_radixsort and remove these calls??
+    alloc_otmp(maxgrpn);
+    // TO DO: doesn't need to be sizeof(double) always, see inside
+    alloc_xtmp(maxgrpn);
+
+    nextradix = radix - 1;
+    while (nextradix >= 0 && skip[nextradix]) nextradix--;
+    if (thiscounts[0] != 0)
+	Error("Internal error. thiscounts[0]=%d but should have been decremented to 0. dradix=%d",
+	      thiscounts[0], radix);
+    thiscounts[256] = n;
+    itmp = 0;
+    for (int i = 1; itmp < n && i <= 256; i++) {
+        if (thiscounts[i] == 0) continue;
+        // undo cumulate; i.e. diff
+        thisgrpn = thiscounts[i] - itmp;
+        if (thisgrpn == 1 || nextradix == -1) {
+            push(thisgrpn);
+        } else {
+            for (int j = 0; j < thisgrpn; j++)
+                // this is why this xsub here can't be the same memory as
+                // xsub in do_radixsort.
+                ((int *)radix_xsub)[j] = icheck(x[o[itmp+j]-1]);
+            // changes xsub and o by reference recursively.
+            iradix_r(radix_xsub, o+itmp, thisgrpn, nextradix);
+        }
+        itmp = thiscounts[i];
+        thiscounts[i] = 0;
+    }
+    if (nalast == 0) // nalast = 1, -1 are both taken care already.
+	// nalast = 0 is dealt with separately as it just sets o to 0
+	for (int i = 0; i < n; i++)
+	    o[i] = (x[o[i] - 1] == NA_INTEGER) ? 0 : o[i];
+    // at those indices where x is NA. x[o[i]-1] because x is not
+    // modified by reference unlike iinsert or iradix_r
+}
+
+static void iradix_r(int *xsub, int *osub, int n, int radix)
+// xsub is a recursive offset into xsub working memory above in
+// iradix, reordered by reference.  osub is a an offset into the main
+// answer o, reordered by reference.  radix iterates 3,2,1,0
+{
+    int j, itmp, thisx, thisgrpn, nextradix, shift;
+    unsigned int *thiscounts;
+
+    // N_SMALL=200 is guess based on limited testing. Needs
+    // calibrate().  Was 50 based on sum(1:50)=1275 worst -vs- 256
+    // cummulate + 256 memset + allowance since reverse order is
+    // unlikely.  when nalast==0, iinsert will be called only from
+    // within iradix.
+    if (n < N_SMALL) {
+	iinsert(xsub, osub, n);
+	return;
+    }
+
+    shift = radix * 8;
+    thiscounts = radixcounts[radix];
+
+    for (int i = 0; i < n; i++) {
+	thisx = (unsigned int) xsub[i] - INT_MIN; // sequential in xsub
+	thiscounts[thisx >> shift & 0xFF]++;
+    }
+    itmp = thiscounts[0];
+    for (int i = 1; itmp < n && i < 256; i++)
+	// don't cummulate through 0s, important below
+	if (thiscounts[i])
+	    thiscounts[i] = (itmp += thiscounts[i]);
+    for (int i = n - 1; i >= 0; i--) {
+	thisx = ((unsigned int) xsub[i] - INT_MIN) >> shift & 0xFF;
+	j = --thiscounts[thisx];
+	otmp[j] = osub[i];
+	((int *) xtmp)[j] = xsub[i];
+    }
+    memcpy(osub, otmp, n * sizeof(int));
+    memcpy(xsub, xtmp, n * sizeof(int));
+
+    nextradix = radix - 1;
+    while (nextradix >= 0 && skip[nextradix]) nextradix--;
+    /* TO DO: If nextradix == -1 AND no further args from do_radixsort AND
+       !retGrp, we're done. We have o. Remember to memset thiscounts
+       before returning. */
+
+    if (thiscounts[0] != 0)
+	Error("Logical error. thiscounts[0]=%d but should have been decremented to 0. radix=%d",
+	      thiscounts[0], radix);
+    thiscounts[256] = n;
+    itmp = 0;
+    for (int i = 1; itmp < n && i <= 256; i++) {
+	if (thiscounts[i] == 0)
+	    continue;
+	thisgrpn = thiscounts[i] - itmp;        // undo cummulate; i.e. diff
+	if (thisgrpn == 1 || nextradix == -1) {
+	    push(thisgrpn);
+	} else {
+	    iradix_r(xsub+itmp, osub+itmp, thisgrpn, nextradix);
+	}
+	itmp = thiscounts[i];
+	thiscounts[i] = 0;
+    }
+}
+
+// dradix from Arun's fastradixdouble.c
+// + changed to MSD and hooked into do_radixsort framework here.
+// + replaced tolerance with rounding s.f.
+
+static int dround = 2;
+static unsigned long long dmask1;
+static unsigned long long dmask2;
+
+static void setNumericRounding(int dround)
+{
+    dmask1 = dround ? 1 << (8 * dround - 1) : 0;
+    dmask2 = 0xffffffffffffffff << dround * 8;
+}
+
+SEXP attribute_hidden do_setNumericRounding(SEXP droundArg)
+{
+    if (!isInteger(droundArg) || LENGTH(droundArg) != 1)
+	error("Must an integer or numeric vector length 1");
+    if (INTEGER(droundArg)[0] < 0 || INTEGER(droundArg)[0] > 2)
+	error("Must be 2 (default) or 1 or 0");
+    dround = INTEGER(droundArg)[0];
+    setNumericRounding(dround);
+    return R_NilValue;
+}
+
+SEXP attribute_hidden do_getNumericRounding()
+{
+    return ScalarInteger(dround);
+}
+
+static union {
+    double d;
+    unsigned long long ull;
+} u;
+
+static
+unsigned long long dtwiddle(void *p, int i, int order)
+{
+    u.d = order * ((double *)p)[i]; // take care of 'order' at the beginning
+    if (R_FINITE(u.d)) {
+	u.ull = (u.d != 0.0) ? u.ull + ((u.ull & dmask1) << 1) : 0;
+    } else if (ISNAN(u.d)) {
+	/* 1. NA twiddled to all bits 0, sorts first.  R's value 1954 cleared.
+
+	   2. NaN twiddled to set just bit 13, sorts immediately after
+	   NA. 13th bit to be consistent with "quiet" na bit but any
+	   bit outside last 2 bytes would do.  (ref:
+	   http://r.789695.n4.nabble.com/Question-re-NA-NaNs-in-R-td4685014.html)
+
+	   3. This also normalises a difference between NA on 32bit R
+	   (bit 13 set) and 64bit R (bit 13 not set)
+
+	   4. -Inf twiddled to : 0 sign, exponent all 0, mantissa all
+	   1, sorts after NaN
+
+	   5. +Inf twiddled to : 1 sign, exponent all 1, mantissa all
+	   0, sorts last since finite numbers are defined by not-all-1
+	   in exponent
+	*/
+	u.ull = (ISNA(u.d) ? 0 : (1ULL << 51));
+	return (nalast == 1 ? ~u.ull : u.ull);
+    }
+    unsigned long long mask = (u.ull & 0x8000000000000000) ?
+	// always flip sign bit and if negative (sign bit was set)
+	// flip other bits too
+	0xffffffffffffffff : 0x8000000000000000;
+    return ((u.ull ^ mask) & dmask2);
+}
+
+static Rboolean dnan(void *p, int i)
+{
+    u.d = ((double *) p)[i];
+    return (ISNAN(u.d));
+}
+
+static unsigned long long (*twiddle) (void *, int, int);
+static Rboolean(*is_nan) (void *, int);
+// the size of the arg type (4 or 8). Just 8 currently until iradix is
+// merged in.
+static size_t colSize = 8;
+
+static void dradix_r(unsigned char *xsub, int *osub, int n, int radix);
+
+#ifdef WORDS_BIGENDIAN
+#define RADIX_BYTE colSize - radix - 1
+#else
+#define RADIX_BYTE radix
+#endif
+
+static void dradix(unsigned char *x, int *o, int n)
+{
+    int radix, nextradix, itmp, thisgrpn, maxgrpn;
+    unsigned int *thiscounts;
+    unsigned long long thisx = 0;
+    // see comments in iradix for structure.  This follows the same.
+    // TO DO: merge iradix in here (almost ready)
+    for (int i = 0; i < n; i++) {
+	thisx = twiddle(x, i, order);
+	for (radix = 0; radix < colSize; radix++)
+	    // if dround == 2 then radix 0 and 1 will be all 0 here and skipped.
+	    /* on little endian, 0 is the least significant bits (the right)
+	       and 7 is the most including sign (the left); i.e. reversed. */
+	    radixcounts[radix][((unsigned char *)&thisx)[RADIX_BYTE]]++;
+    }
+    for (radix = 0; radix < colSize; radix++) {
+	// thisx is the last x after loop above
+	int i = ((unsigned char *) &thisx)[RADIX_BYTE];
+	skip[radix] = radixcounts[radix][i] == n;
+	// clear it now, the other counts must be 0 already
+	if (skip[radix])
+	    radixcounts[radix][i] = 0;
+    }
+    radix = (int) colSize - 1;  // MSD
+    while (radix >= 0 && skip[radix]) radix--;
+    if (radix == -1) {
+	// All radix are skipped; i.e. one number repeated n times.
+	if (nalast == 0 && is_nan(x, 0))
+	    // all values are identical. return 0 if nalast=0 & all NA
+	    // because of 'return', have to take care of it here.
+	    for (int i = 0; i < n; i++)
+		o[i] = 0;
+	else
+	    for (int i = 0; i < n; i++)
+		o[i] = (i + 1);
+	push(n);
+	return;
+    }
+    for (int i = radix - 1; i >= 0; i--) {
+	// clear the lower radix counts, we only did them to know
+	// skip. will be reused within each group
+	if (!skip[i])
+	    memset(radixcounts[i], 0, 257 * sizeof(unsigned int));
+    }
+    thiscounts = radixcounts[radix];
+    itmp = thiscounts[0];
+    maxgrpn = itmp;
+    for (int i = 1; itmp < n && i < 256; i++) {
+	thisgrpn = thiscounts[i];
+	if (thisgrpn) {  // don't cummulate through 0s, important below
+	    if (thisgrpn > maxgrpn)
+		maxgrpn = thisgrpn;
+	    thiscounts[i] = (itmp += thisgrpn);
+	}
+    }
+    for (int i = n - 1; i >= 0; i--) {
+	thisx = twiddle(x, i, order);
+	o[ --thiscounts[((unsigned char *)&thisx)[RADIX_BYTE]] ] = i + 1;
+    }
+
+    if (radix_xsuballoc < maxgrpn) {
+        // TO DO: centralize this alloc
+        // The largest group according to the first non-skipped radix,
+        // so could be big (if radix is needed on first arg) TO DO:
+        // could include extra bits to divide the first radix up
+        // more. Often the MSD has groups in just 0-4 out of 256.
+        // free'd at the end of do_radixsort once we're done calling iradix
+        // repetitively
+        radix_xsub = (double *) realloc(radix_xsub, maxgrpn * sizeof(double));
+        if (!radix_xsub)
+            Error("Failed to realloc working memory %d*8bytes (xsub in dradix), radix=%d",
+                  maxgrpn, radix);
+        radix_xsuballoc = maxgrpn;
+    }
+
+    alloc_otmp(maxgrpn);   // TO DO: leave to do_radixsort and remove these?
+    alloc_xtmp(maxgrpn);
+
+    nextradix = radix - 1;
+    while (nextradix >= 0 && skip[nextradix])
+	nextradix--;
+    if (thiscounts[0] != 0)
+	Error("Logical error. thiscounts[0]=%d but should have been decremented to 0. dradix=%d",
+	      thiscounts[0], radix);
+    thiscounts[256] = n;
+    itmp = 0;
+    for (int i = 1; itmp < n && i <= 256; i++) {
+        if (thiscounts[i] == 0)
+            continue;
+        thisgrpn = thiscounts[i] - itmp;  // undo cummulate; i.e. diff
+        if (thisgrpn == 1 || nextradix == -1) {
+            push(thisgrpn);
+        } else {
+            if (colSize == 4) { // ready for merging in iradix ...
+                error("Not yet used, still using iradix instead");
+                for (int j = 0; j < thisgrpn; j++)
+                    ((int *)radix_xsub)[j] = (int)twiddle(x, o[itmp+j]-1, order);
+                // this is why this xsub here can't be the same memory
+                // as xsub in do_radixsort
+            } else 
+		for (int j = 0; j < thisgrpn; j++)
+		    ((unsigned long long *)radix_xsub)[j] =
+			twiddle(x, o[itmp+j]-1, order);
+	    // changes xsub and o by reference recursively.
+	    dradix_r(radix_xsub, o+itmp, thisgrpn, nextradix);
+	}
+	itmp = thiscounts[i];
+	thiscounts[i] = 0;
+    }
+    if (nalast == 0) // nalast = 1, -1 are both taken care already.
+	for (int i = 0; i < n; i++)
+	    o[i] = is_nan(x, o[i] - 1) ? 0 : o[i];
+    // nalast = 0 is dealt with separately as it just sets o to 0
+    // at those indices where x is NA. x[o[i]-1] because x is not
+    // modified by reference unlike iinsert or iradix_r
+
+}
+
+static void dinsert(unsigned long long *x, int *o, int n)
+// orders both x and o by reference in-place. Fast for small vectors,
+// low overhead.  don't be tempted to binsearch backwards here, have
+// to shift anyway; many memmove would have overhead and do the same
+// thing 'dinsert' will not be called when nalast = 0 and o[0] = -1.
+{
+    int otmp, tt;
+    unsigned long long xtmp;
+    for (int i = 1; i < n; i++) {
+	xtmp = x[i];
+	if (xtmp < x[i - 1]) {
+	    int j = i - 1;
+	    otmp = o[i];
+	    while (j >= 0 && xtmp < x[j]) {
+		x[j + 1] = x[j];
+		o[j + 1] = o[j];
+		j--;
+	    }
+	    x[j + 1] = xtmp;
+	    o[j + 1] = otmp;
+	}
+    }
+    tt = 0;
+    for (int i = 1; i < n; i++)
+	if (x[i] == x[i - 1])
+	    tt++;
+	else {
+	    push(tt + 1);
+	    tt = 0;
+	}
+    push(tt + 1);
+}
+
+static void dradix_r(unsigned char *xsub, int *osub, int n, int radix)
+/* xsub is a recursive offset into xsub working memory above in
+   dradix, reordered by reference.  osub is a an offset into the main
+   answer o, reordered by reference.  dradix iterates
+   7,6,5,4,3,2,1,0 */
+{
+    int itmp, thisgrpn, nextradix;
+    unsigned int *thiscounts;
+    unsigned char *p;
+    if (n < 200) {
+	/* 200 is guess based on limited testing. Needs calibrate(). Was 50
+	   based on sum(1:50)=1275 worst -vs- 256 cummulate + 256 memset +
+	   allowance since reverse order is unlikely */
+	// order=1 here because it's already taken care of in iradix
+	dinsert((void *)xsub, osub, n);
+
+	return;
+    }
+    thiscounts = radixcounts[radix];
+    p = xsub + RADIX_BYTE;
+    for (int i = 0; i < n; i++) {
+	thiscounts[*p]++;
+	p += colSize;
+    }
+    itmp = thiscounts[0];
+    for (int i = 1; itmp < n && i < 256; i++)
+	// don't cummulate through 0s, important below
+	if (thiscounts[i])
+	    thiscounts[i] = (itmp += thiscounts[i]);
+    p = xsub + (n - 1) * colSize;
+    if (colSize == 4) {
+	error("Not yet used, still using iradix instead");
+	for (int i = n - 1; i >= 0; i--) {
+	    int j = --thiscounts[*(p + RADIX_BYTE)];
+	    otmp[j] = osub[i];
+	    ((int *) xtmp)[j] = *(int *) p;
+	    p -= colSize;
+	}
+    } else {
+	for (int i = n - 1; i >= 0; i--) {
+	    int j = --thiscounts[*(p + RADIX_BYTE)];
+	    otmp[j] = osub[i];
+	    ((unsigned long long *) xtmp)[j] = *(unsigned long long *) p;
+	    p -= colSize;
+	}
+    }
+    memcpy(osub, otmp, n * sizeof(int));
+    memcpy(xsub, xtmp, n * colSize);
+
+    nextradix = radix - 1;
+    while (nextradix >= 0 && skip[nextradix])
+	nextradix--;
+    // TO DO: If nextradix==-1 and no further args from do_radixsort,
+    // we're done. We have o. Remember to memset thiscounts before
+    // returning.
+
+    if (thiscounts[0] != 0)
+	Error("Logical error. thiscounts[0]=%d but should have been decremented to 0. radix=%d",
+	      thiscounts[0], radix);
+    thiscounts[256] = n;
+    itmp = 0;
+    for (int i = 1; itmp < n && i <= 256; i++) {
+	if (thiscounts[i] == 0)
+	    continue;
+	thisgrpn = thiscounts[i] - itmp;        // undo cummulate; i.e. diff
+	if (thisgrpn == 1 || nextradix == -1)
+	    push(thisgrpn);
+	else
+	    dradix_r(xsub + itmp * colSize, osub + itmp, thisgrpn,
+		     nextradix);
+	itmp = thiscounts[i];
+	thiscounts[i] = 0;
+    }
+}
+
+// TO DO?: dcount. Find step size, then range = (max-min)/step and
+// proceed as icount. Many fixed precision floats (such as prices) may
+// be suitable. Fixed precision such as 1.10, 1.15, 1.20, 1.25, 1.30
+// ... do use all bits so dradix skipping may not help.
+
+static int *cradix_counts = NULL;
+static int cradix_counts_alloc = 0;
+static int maxlen = 1;
+static SEXP *cradix_xtmp = NULL;
+static int cradix_xtmp_alloc = 0;
+
+// same as StrCmp but also takes into account 'decreasing' and 'na.last' args.
+static int StrCmp2(SEXP x, SEXP y)
+{
+    // same cached pointer (including NA_STRING == NA_STRING)
+    if (x == y) return 0;
+    // if x=NA, nalast=1 ? then x > y else x < y (Note: nalast == 0 is
+    // already taken care of in 'csorted', won't be 0 here)
+    if (x == NA_STRING) return nalast;
+    if (y == NA_STRING) return -nalast;     // if y=NA, nalast=1 ? then y > x
+    return order*strcmp(CHAR(x), CHAR(y));  // same as explanation in StrCmp
+}
+
+static int StrCmp(SEXP x, SEXP y)            // also used by bmerge and chmatch
+{
+    // same cached pointer (including NA_STRING == NA_STRING)
+    if (x == y) return 0;
+    if (x == NA_STRING) return -1;    // x < y
+    if (y == NA_STRING) return 1;     // x > y
+    // assumes strings are in same encoding
+    return strcmp(CHAR(x), CHAR(y));
+}
+
+#define CHAR_ENCODING(x) (IS_ASCII(x) ? CE_UTF8 : getCharCE(x))
+
+static void checkEncodings(SEXP x)
+{
+    cetype_t ce;
+
+    int i;
+    for (i = 0; i < length(x) && STRING_ELT(x, i) == NA_STRING; i++);
+
+    if (i < length(x)) {
+        ce = CHAR_ENCODING(STRING_ELT(x, i));
+        if (ce == CE_NATIVE) {
+            error(_("Character encoding must be UTF-8, Latin-1 or bytes"));
+        }
+    }
+
+    /* Disabled for now -- doubles the time (for already sorted vectors): why?
+    for (int i = 1; i < length(x); i++) {
+        if (ce != CHAR_ENCODING(STRING_ELT(x, i))) {
+            error(_("Mixed character encodings are not supported"));
+        }
+    }
+    */
+}
+
+static void cradix_r(SEXP * xsub, int n, int radix)
+// xsub is a unique set of CHARSXP, to be ordered by reference
+
+// First time, radix == 0, and xsub == x. Then recursively moves SEXP together
+// for L1 cache efficiency.
+
+// Quite different to iradix because
+//   1) x is known to be unique so fits in cache
+//      (wide random access not an issue)
+//   2) they're variable length character strings
+//   3) no need to maintain o.  Just simply reorder x. No grps or push.
+
+// Fortunately, UTF sorts in the same order if treated as ASCII, so we
+// can simplify by doing it by bytes.
+
+// TO DO: confirm a forwards (MSD) radix for efficiency, although more
+// complicated.
+
+// This part has nothing to do with truelength. The
+// truelength stuff is to do with finding the unique strings.  We may
+// be able to improve CHARSXP derefencing by submitting patch to R to
+// make R's string cache contiguous but would likely be difficult. If
+// we strxfrm, then it'll then be contiguous and compact then anyway.
+{
+    int itmp, *thiscounts, thisgrpn=0, thisx=0;
+    SEXP stmp;
+
+    // TO DO?: chmatch to existing sorted vector, then grow it.
+    // TO DO?: if (n<N_SMALL = 200) insert sort, then loop through groups via ==
+    if (n <= 1) return;
+    if (n == 2) {
+	if (StrCmp(xsub[1], xsub[0]) < 0) {
+	    stmp = xsub[0];
+	    xsub[0] = xsub[1];
+	    xsub[1] = stmp;
+	}
+	return;
+    }
+    // TO DO: if (n < 50) cinsert (continuing from radix offset into
+    // CHAR) or using StrCmp. But 256 is narrow, so quick and not too
+    // much an issue.
+
+    thiscounts = cradix_counts + radix * 256;
+    for (int i = 0; i < n; i++) {
+	thisx = xsub[i] == NA_STRING ?
+	    0 : (radix < LENGTH(xsub[i]) ?
+		 (unsigned char) (CHAR(xsub[i])[radix]) : 1);
+	thiscounts[ thisx ]++;   // 0 for NA,  1 for ""
+    }
+    // this also catches when subx has shorter strings than the rest,
+    // thiscounts[0] == n and we'll recurse very quickly through to the
+    // overall maxlen with no 256 overhead each time
+    if (thiscounts[thisx] == n && radix < maxlen - 1) {
+	cradix_r(xsub, n, radix + 1);
+	thiscounts[thisx] = 0;  // the rest must be 0 already, save the memset
+	return;
+    }
+    itmp = thiscounts[0];
+    for (int i = 1; i < 256; i++)
+	// don't cummulate through 0s, important below
+	if (thiscounts[i])
+	    thiscounts[i] = (itmp += thiscounts[i]);
+    for (int i = n - 1; i >= 0; i--) {
+	thisx = xsub[i] == NA_STRING ?
+	    0 : (radix < LENGTH(xsub[i]) ?
+		 (unsigned char) (CHAR(xsub[i])[radix]) : 1);
+	int j = --thiscounts[thisx];
+	cradix_xtmp[j] = xsub[i];
+    }
+    memcpy(xsub, cradix_xtmp, n * sizeof(SEXP));
+    if (radix == maxlen - 1) {
+	memset(thiscounts, 0, 256 * sizeof(int));
+	return;
+    }
+    if (thiscounts[0] != 0)
+	Error("Logical error. counts[0]=%d in cradix but should have been decremented to 0. radix=%d",
+	      thiscounts[0], radix);
+    itmp = 0;
+    for (int i = 1; i < 256; i++) {
+	if (thiscounts[i] == 0)
+	    continue;
+	thisgrpn = thiscounts[i] - itmp;        // undo cummulate; i.e. diff
+	cradix_r(xsub + itmp, thisgrpn, radix + 1);
+	itmp = thiscounts[i];
+	// set to 0 now since we're here, saves memset
+	// afterwards. Important to clear! Also more portable for
+	// machines where 0 isn't all bits 0 (?!)
+	thiscounts[i] = 0;
+    }
+    if (itmp < n - 1)
+	cradix_r(xsub + itmp, n - itmp, radix + 1);     // final group
+}
+
+static SEXP *ustr = NULL;
+static int ustr_alloc = 0, ustr_n = 0;
+
+static void cgroup(SEXP * x, int *o, int n)
+// As icount :
+//   Places the ordering into o directly, overwriting whatever was there
+//   Doesn't change x
+//   Pushes group sizes onto stack
+
+// Only run when sortStr == FALSE. Basically a counting sort, in first
+// appearance order, directly.  Since it doesn't sort the strings, the
+// name is cgroup.  there is no _pre for this.  ustr created and
+// cleared each time.
+{
+    // savetl_init() is called once at the start of do_radixsort
+    if (ustr_n != 0)
+	Error
+	    ("Internal error. ustr isn't empty when starting cgroup: ustr_n=%d, ustr_alloc=%d",
+	     ustr_n, ustr_alloc);
+    for (int i = 0; i < n; i++) {
+	SEXP s = x[i];
+	if (TRUELENGTH(s) < 0) {        // this case first as it's the most frequent
+	    SET_TRUELENGTH(s, TRUELENGTH(s) - 1);
+	    // use negative counts so as to detect R's own (positive)
+	    // usage of tl on CHARSXP
+	    continue;
+	}
+	if (TRUELENGTH(s) > 0) {
+	    // Save any of R's own usage of tl (assumed positive, so
+	    // we can both count and save in one scan), to restore
+	    // afterwards. From R 2.14.0, tl is initialized to 0,
+	    // prior to that it was random so this step saved too much.
+	    savetl(s);
+	    SET_TRUELENGTH(s, 0);
+	}
+	if (ustr_alloc <= ustr_n) {
+	    // 10000 = 78k of 8byte pointers. Small initial guess,
+	    // negligible time to alloc.
+	    ustr_alloc = (ustr_alloc == 0) ? 10000 : ustr_alloc*2;
+	    if (ustr_alloc > n)
+		ustr_alloc = n;
+	    ustr = realloc(ustr, ustr_alloc * sizeof(SEXP));
+	    if (ustr == NULL)
+		Error("Unable to realloc %d * %d bytes in cgroup", ustr_alloc,
+		      sizeof(SEXP));
+	}
+	SET_TRUELENGTH(s, -1);
+	ustr[ustr_n++] = s;
+    }
+    // TO DO: the same string in different encodings will be
+    // considered different here. Sweep through ustr and merge counts
+    // where equal (sort needed therefore, unfortunately?, only if
+    // there are any marked encodings present)
+    int cumsum = 0;
+    for (int i = 0; i < ustr_n; i++) {      // 0.000
+	push(-TRUELENGTH(ustr[i]));
+	SET_TRUELENGTH(ustr[i], cumsum += -TRUELENGTH(ustr[i]));
+    }
+    int *target = (o[0] != -1) ? newo : o;
+    for (int i = n - 1; i >= 0; i--) {
+	SEXP s = x[i];           // 0.400 (page fetches on string cache)
+	int k = TRUELENGTH(s) - 1;
+	SET_TRUELENGTH(s, k);
+	target[k] = i + 1;      // 0.800 (random access to o)
+    }
+    // The cummulate meant counts are left non zero, so reset for next
+    // time (0.00s).
+    for (int i = 0; i < ustr_n; i++)
+	SET_TRUELENGTH(ustr[i], 0);
+    ustr_n = 0;
+}
+
+static int *csort_otmp = NULL, csort_otmp_alloc = 0;
+static void alloc_csort_otmp(int n)
+{
+    if (csort_otmp_alloc >= n)
+	return;
+    csort_otmp = (int *) realloc(csort_otmp, n * sizeof(int));
+    if (csort_otmp == NULL)
+	Error
+	    ("Failed to allocate working memory for csort_otmp. Requested %d * %d bytes",
+	     n, sizeof(int));
+    csort_otmp_alloc = n;
+}
+
+static void csort(SEXP * x, int *o, int n)
+/*
+   As icount :
+   Places the ordering into o directly, overwriting whatever was there
+   Doesn't change x
+   Pushes group sizes onto stack
+   Requires csort_pre() to have created and sorted ustr already
+*/
+{
+    /* can't use otmp, since iradix might be called here and that uses
+       otmp (and xtmp).  alloc_csort_otmp(n) is called from do_radixsort for
+       either n=nrow if 1st arg, or n=maxgrpn if onwards args */
+    for (int i = 0; i < n; i++)
+	csort_otmp[i] = (x[i] == NA_STRING) ? NA_INTEGER : -TRUELENGTH(x[i]);
+    if (nalast == 0 && n == 2) {
+        // special case for nalast == 0. n == 1 is handled inside
+        // do_radixsort. at least 1 will be NA here else use o from caller
+        // directly (not 1st arg)
+        if (o[0] == -1)
+            for (int i = 0; i < n; i++)
+                o[i] = i + 1;
+        for (int i = 0;  i < n; i++)
+            if (csort_otmp[i] == NA_INTEGER)
+                o[i] = 0;
+        push(1); push(1);
+        return; 
+    }
+    if (n < N_SMALL && nalast != 0) { // TO DO: calibrate() N_SMALL=200
+        if (o[0] == -1)
+            for (int i = 0; i < n; i++)
+                o[i] = i + 1;
+        // else use o from caller directly (not 1st arg)
+        for (int i = 0; i < n; i++)
+            csort_otmp[i] = icheck(csort_otmp[i]);
+        iinsert(csort_otmp, o, n);
+    } else {
+	setRange(csort_otmp, n);
+	if (range == NA_INTEGER)
+	    Error("Internal error. csort's otmp contains all-NA");
+	int *target = (o[0] != -1) ? newo : o;
+	if (range <= N_RANGE)
+	    // TO DO: calibrate(). radix was faster (9.2s
+	    // "range<=10000" instead of 11.6s "range<=N_RANGE &&
+	    // range<n") for run(7) where range=N_RANGE n=10000000
+	    icount(csort_otmp, target, n);
+	else
+	    iradix(csort_otmp, target, n);
+    }
+    // all i* push onto stack. Using their counts may be faster here
+    // than thrashing SEXP fetches over several passes as cgroup does
+    // (but cgroup needs that to keep orginal order, and cgroup saves
+    // the sort in csort_pre).
+}
+
+static void csort_pre(SEXP * x, int n)
+// Finds ustr and sorts it.  Runs once for each arg (if
+// sortStr == TRUE), then ustr is used by csort within each group ustr
+// is grown on each character arg, to save sorting the same strings
+// again if several args contain the same strings
+{
+    SEXP s;
+    int old_un, new_un;
+    // savetl_init() is called once at the start of do_radixsort
+    old_un = ustr_n;
+    for (int i = 0; i < n; i++) {
+	s = x[i];
+	// this case first as it's the most frequent. Already in ustr,
+	// this negative is its ordering.
+	if (TRUELENGTH(s) < 0)
+	    continue;
+	// Save any of R's own usage of tl (assumed positive, so we
+	// can both count and save in one scan), to restore
+	// afterwards. From R 2.14.0, tl is initialized to 0, prior to
+	// that it was random so this step saved too much.
+	if (TRUELENGTH(s) > 0) {
+	    savetl(s);
+	    SET_TRUELENGTH(s, 0);
+	}
+	if (ustr_alloc <= ustr_n) {
+	    // 10000 = 78k of 8byte pointers. Small initial guess,
+	    // negligible time to alloc.
+	    ustr_alloc = (ustr_alloc == 0) ? 10000 : ustr_alloc*2;
+	    if (ustr_alloc > old_un+n)
+		ustr_alloc = old_un + n;
+	    ustr = realloc(ustr, ustr_alloc * sizeof(SEXP));
+	    if (ustr == NULL)
+		Error("Failed to realloc ustr. Requested %d * %d bytes",
+		      ustr_alloc, sizeof(SEXP));
+	}
+	SET_TRUELENGTH(s, -1);  // this -1 will become its ordering later below
+	ustr[ustr_n++] = s;
+	// length on CHARSXP is the nchar of char * (excluding \0),
+	// and treats marked encodings as if ascii.
+	if (s != NA_STRING && LENGTH(s) > maxlen)
+	    maxlen = LENGTH(s);
+    }
+    new_un = ustr_n;
+    if (new_un == old_un)
+	return;
+    // No new strings observed, seen them all before in previous
+    // arg. ustr already sufficient.  If we ever make ustr
+    // permanently held by data.table, we'll just need to make the
+    // final loop to set -i-1 before returning here.  sort ustr.
+
+    // TODO: just sort new ones and merge them in.  These allocs are
+    // here, to save them being in the recursive cradix_r()
+    if (cradix_counts_alloc < maxlen) {
+	cradix_counts_alloc = maxlen + 10;   // +10 to save too many reallocs
+	cradix_counts = (int *)realloc(cradix_counts,
+				       cradix_counts_alloc * 256 * sizeof(int));
+	if (!cradix_counts)
+	    Error("Failed to alloc cradix_counts");
+	memset(cradix_counts, 0, cradix_counts_alloc * 256 * sizeof(int));
+    }
+    if (cradix_xtmp_alloc < ustr_n) {
+        cradix_xtmp = (SEXP *) realloc(cradix_xtmp,  ustr_n * sizeof(SEXP));
+        // TO DO: Reuse the one we have in do_radixsort.
+        // Does it need to be n length?
+        if (!cradix_xtmp)
+            Error("Failed to alloc cradix_tmp");
+        cradix_xtmp_alloc = ustr_n;
+    }
+    // sorts ustr in-place by reference save ordering in the
+    // CHARSXP. negative so as to distinguish with R's own usage.
+    cradix_r(ustr, ustr_n, 0);
+    for (int i = 0; i < ustr_n; i++)
+	SET_TRUELENGTH(ustr[i], -i - 1);
+}
+
+// functions to test vectors for sortedness: isorted, dsorted and csorted
+
+// base:is.unsorted returns NA in the presence of any NA, but we need
+// to consider na.last, and we also return -1 if x is sorted in
+// _strictly_ reverse order; a common case we optimize.  If a vector
+// is in decreasing order *with ties*, then an in-place reverse (no
+// sort) would result in instability of ties, so we are strict. We
+// also save grouping information during the check; that information
+// is required when sorting by multiple arguments.
+
+// TO DO: test in big steps first to return faster if unsortedness is
+// at the end (a common case of rbind'ing data to end) These are all
+// sequential access to x, so very quick and cache efficient.
+
+// order = 1 is ascending and order=-1 is descending; also takes care
+// of na.last argument with check through 'icheck' Relies on
+// NA_INTEGER == INT_MIN, checked in init.c
+static int isorted(int *x, int n)
+{
+    int i = 1, j = 0;
+    // when nalast = NA,
+    // all NAs ? return special value to replace all o's values with '0'
+    // any NAs ? return 0 = unsorted and leave it
+    //   to sort routines to replace o's with 0's
+    // no NAs ? continue to check rest of isorted - the same routine as usual
+    if (nalast == 0) {
+	for (int k = 0; k < n; k++)
+	    if (x[k] != NA_INTEGER)
+		j++;
+	if (j == 0) {
+	    push(n);
+	    return (-2);
+	}
+	if (j != n)
+	    return (0);
+    }
+    if (n <= 1) {
+	push(n);
+	return (1);
+    }
+    if (icheck(x[1]) < icheck(x[0])) {
+	i = 2;
+	while (i < n && icheck(x[i]) < icheck(x[i - 1]))
+	    i++;
+	// strictly opposite to expected 'order', no ties;
+	if (i == n) {
+	    mpush(1, n);
+	    return (-1);
+	}
+	// e.g. no more than one NA at the beginning/end (for order=-1/1)
+	else return (0);
+    }
+    int old = gsngrp[flip];
+    int tt = 1;
+    for (int i = 1; i < n; i++) {
+	if (icheck(x[i]) < icheck(x[i - 1])) {
+	    gsngrp[flip] = old;
+	    return (0);
+	}
+	if (x[i] == x[i - 1])
+	    tt++;
+	else {
+	    push(tt); tt = 1;
+	}
+    }
+    push(tt);
+    // same as 'order', NAs at the beginning for order=1, at end for
+    // order=-1, possibly with ties
+    return(1);
+}
+
+// order=1 is ascending and -1 is descending
+// also accounts for nalast=0 (=NA), =1 (TRUE), -1 (FALSE) (in twiddle)
+static int dsorted(double *x, int n)
+{
+    int i = 1, j = 0;
+    unsigned long long prev, this;
+    if (nalast == 0) {
+	// when nalast = NA,
+	// all NAs ? return special value to replace all o's values with '0'
+	// any NAs ? return 0 = unsorted and leave it to sort routines to
+	//           replace o's with 0's
+	// no NAs  ? continue to check the rest of isorted -
+	//           the same routine as usual
+	for (int k = 0; k < n; k++)
+	    if (!is_nan(x, k))
+		j++;
+	if (j == 0) {
+	    push(n);
+	    return (-2);
+	}
+	if (j != n)
+	    return (0);
+    }
+    if (n <= 1) {
+	push(n);
+	return (1);
+    }
+    prev = twiddle(x, 0, order);
+    this = twiddle(x, 1, order);
+    if (this < prev) {
+	i = 2;
+	prev = this;
+	while (i < n && (this = twiddle(x, i, order)) < prev) {
+	    i++;
+	    prev = this;
+	}
+	if (i == n) {
+	    mpush(1, n);
+	    return (-1);
+	}
+	// strictly opposite of expected 'order', no ties; e.g. no
+	// more than one NA at the beginning/end (for order=-1/1)
+
+	// TO DO: improve to be stable for ties in reverse
+	else return(0);
+    }
+    int old = gsngrp[flip];
+    int tt = 1;
+    for (int i = 1; i < n; i++) {
+	// TO DO: once we get past -Inf, NA and NaN at the bottom, and
+	//        +Inf at the top, the middle only need be twiddled
+	//        for tolerance (worth it?)
+	this = twiddle(x, i, order);
+	if (this < prev) {
+	    gsngrp[flip] = old;
+	    return (0);
+	}
+	if (this == prev)
+	    tt++;
+	else {
+	    push(tt);
+	    tt = 1;
+	}
+	prev = this;
+    }
+    push(tt);
+    // exactly as expected in 'order' (1=increasing, -1=decreasing),
+    // possibly with ties
+    return (1);
+}
+
+// order=1 is ascending and -1 is descending
+// also accounts for nalast=0 (=NA), =1 (TRUE), -1 (FALSE)
+static int csorted(SEXP *x, int n)
+{
+    int i = 1, j = 0, tmp;
+    if (nalast == 0) {
+	// when nalast = NA,
+	// all NAs ? return special value to replace all o's values with '0'
+	// any NAs ? return 0 = unsorted and leave it to sort routines
+	//           to replace o's with 0's
+	// no NAs  ? continue to check the rest of isorted -
+	//           the same routine as usual
+	for (int k = 0; k < n; k++)
+	    if (x[k] != NA_STRING)
+		j++;
+	if (j == 0) {
+	    push(n);
+	    return (-2);
+	}
+	if (j != n)
+	    return (0);
+    }
+    if (n <= 1) {
+	push(n);
+	return (1);
+    }
+    if (StrCmp2(x[1], x[0]) < 0) {
+	i = 2;
+	while (i < n && StrCmp2(x[i], x[i - 1]) < 0)
+	    i++;
+	if (i == n) {
+	    mpush(1, n);
+	    return (-1);
+	}
+	// strictly opposite of expected 'order', no ties;
+	// e.g. no more than one NA at the beginning/end (for order=-1/1)
+	else
+	    return (0);
+    }
+    int old = gsngrp[flip];
+    int tt = 1;
+    for (int i = 1; i < n; i++) {
+	tmp = StrCmp2(x[i], x[i - 1]);
+	if (tmp < 0) {
+	    gsngrp[flip] = old;
+	    return (0);
+	}
+	if (tmp == 0)
+	    tt++;
+	else {
+	    push(tt);
+	    tt = 1;
+	}
+    }
+    push(tt);
+    // exactly as expected in 'order', possibly with ties
+    return (1);
+}
+
+static void isort(int *x, int *o, int n)
+{
+    if (n <= 2) {
+	// nalast = 0 and n == 2 (check bottom of this file for explanation)
+	if (nalast == 0 && n == 2) {
+	    for (int i = 0; i < n; i++)
+		if (x[i] == NA_INTEGER)
+		    o[i] = 0;
+                else o[i] = i + 1;
+	    push(1); push(1);
+	    return;
+	} else Error("Internal error: isort received n=%d. isorted should have dealt with this (e.g. as a reverse sorted vector) already",n);
+    }
+    if (n < N_SMALL && o[0] != -1 && nalast != 0) {
+        // see comment above in iradix_r on N_SMALL=200.
+        /* if not o[0] then can't just populate with 1:n here, since x
+           is changed by ref too (so would need to be copied). */
+        /* pushes inside too. Changes x and o by reference, so not
+           suitable in first arg when o hasn't been populated yet
+           and x is an actual argument (hence check on o[0]). */
+        if (order != 1 || nalast != -1)
+            // so that default case, i.e., order=1, nalast=FALSE will
+            // not be affected (ex: `setkey`)
+            for (int i = 0; i < n; i++)
+                x[i] = icheck(x[i]);
+        iinsert(x, o, n);
+    } else {
+        /* Tighter range (e.g. copes better with a few abormally large
+           values in some groups), but also, when setRange was once at
+           arg level that caused an extra scan of (long) x
+           first. 10,000 calls to setRange takes just 0.04s
+           i.e. negligible. */
+        setRange(x, n);
+        if (range == NA_INTEGER)
+            Error("Internal error: isort passed all-NA. isorted should have caught this before this point");
+        int *target = (o[0] != -1) ? newo : o;
+        // was range < 10000 for subgroups, but 1e5 for the first
+        // arg, tried to generalise here.  1e4 rather than 1e5 here
+        // because iterated was (thisgrpn < 200 || range > 20000) then
+        // radix a short vector with large range can bite icount when
+        // iterated (BLOCK 4 and 6)
+        if (range <= N_RANGE && range <= n) {
+            icount(x, target, n);
+        } else {
+            iradix(x, target, n);
+        }
+    }
+}
+
+static void dsort(double *x, int *o, int n)
+{
+    if (n <= 2) {
+	if (nalast == 0 && n == 2) {
+	    // don't have to twiddle here.. at least one will be NA
+	    // and 'n' WILL BE 2.
+	    for (int i = 0; i < n; i++)
+		if (is_nan(x, i))
+		    o[i] = 0;
+                else o[i] = i + 1;
+	    push(1); push(1);
+	    return;
+	}
+	Error("Internal error: dsort received n=%d. dsorted should have dealt with this (e.g. as a reverse sorted vector) already",n);
+    }
+    if (n < N_SMALL && o[0] != -1 && nalast != 0) {
+	// see comment above in iradix_r re N_SMALL=200,  and isort for o[0]
+	for (int i = 0; i < n; i++)
+	    ((unsigned long long *)x)[i] = twiddle(x, i, order);
+	// have to twiddle here anyways, can't speed up default case
+	// like in isort
+	dinsert((unsigned long long *)x, o, n);
+    } else {
+	dradix((unsigned char *) x, (o[0] != -1) ? newo : o, n);
+    }
+}
+
+SEXP attribute_hidden do_radixsort(SEXP call, SEXP op, SEXP args, SEXP rho)
+{
+    int n = -1, narg = 0, ngrp, tmp, *osub, thisgrpn;
+    R_xlen_t nl = n;
+    Rboolean isSorted = TRUE, retGrp;
+    void *xd;
+    int *o = NULL;
+
+    /* ML: FIXME: Here are just two of the dangerous assumptions here */
+    if (sizeof(int) != 4) {
+        error("radix sort assumes sizeof(int) == 4");
+    }
+    if (sizeof(double) != 8) {
+        error("radix sort assumes sizeof(double) == 8");
+    }
+
+    /* (ML) Controls the precision of numeric vector sorting; may want
+       to make this a parameter */
+    setNumericRounding(dround);
+
+    nalast = (asLogical(CAR(args)) == NA_LOGICAL) ? 0 :
+	(asLogical(CAR(args)) == TRUE) ? 1 : -1; // 1=TRUE, -1=FALSE, 0=NA
+    args = CDR(args);
+    SEXP decreasing = CAR(args);
+    args = CDR(args);
+
+    /* If TRUE, return starts of runs of identical values + max group size. */
+    retGrp = asLogical(CAR(args));
+    args = CDR(args);
+
+    /* If FALSE, get order of strings in appearance order. Essentially
+       abuses the CHARSXP table to group strings without hashing
+       them. Only makes sense when retGrp=TRUE.
+    */
+    sortStr = asLogical(CAR(args));
+    args = CDR(args);
+
+    if (args == R_NilValue)
+	return R_NilValue;
+    if (isVector(CAR(args)))
+	nl = XLENGTH(CAR(args));
+    for (SEXP ap = args; ap != R_NilValue; ap = CDR(ap), narg++) {
+	if (!isVector(CAR(ap)))
+	    error(_("argument %d is not a vector"), narg + 1);
+        //Rprintf("%d, %d\n", XLENGTH(CAR(ap)), nl);
+	if (XLENGTH(CAR(ap)) != nl)
+	    error(_("argument lengths differ"));
+    }
+
+    if (narg != length(decreasing))
+	error(_("length(decreasing) must match the number of order arguments"));
+    for (int i = 0; i < narg; i++) {
+	if (LOGICAL(decreasing)[i] == NA_LOGICAL)
+	    error(_("'decreasing' elements must be TRUE or FALSE"));
+    }
+    order = asLogical(decreasing) ? -1 : 1;
+
+    SEXP x = CAR(args);
+    args = CDR(args);
+
+    // (ML) FIXME: need to support long vectors
+    if (nl > INT_MAX) {
+	error(_("long vectors not supported"));
+    }
+    n = (int) nl;
+
+    // upper limit for stack size (all size 1 groups). We'll detect
+    // and avoid that limit, but if just one non-1 group (say 2), that
+    // can't be avoided.
+    gsmaxalloc = n;
+
+    // once for the result, needs to be length n.
+
+    // TO DO: save allocation if NULL is returned (isSorted = =TRUE) so
+    // [i|c|d]sort know they can populate o directly with no working
+    // memory needed to reorder existing order had to repace this from
+    // '0' to '-1' because 'nalast = 0' replace 'o[.]' with 0 values.
+
+    SEXP ans = PROTECT(allocVector(INTSXP, n));
+    o = INTEGER(ans);
+    o[0] = -1;
+    xd = DATAPTR(x);
+
+    stackgrps = narg > 1 || retGrp;
+
+    if (TYPEOF(x) == STRSXP) {
+        checkEncodings(x);
+    }
+    
+    savetl_init();   // from now on use Error not error.
+
+    switch (TYPEOF(x)) {
+    case INTSXP:
+    case LGLSXP:
+	tmp = isorted(xd, n);
+	break;
+    case REALSXP :
+	twiddle = &dtwiddle;
+	is_nan  = &dnan;
+	tmp = dsorted(xd, n);
+	break;
+    case STRSXP :
+	tmp = csorted(xd, n);
+	break;
+    default :
+        Error("First arg is type '%s', not yet supported",
+              type2char(TYPEOF(x)));
+    }
+    if (tmp) {
+	// -1 or 1. NEW: or -2 in case of nalast == 0 and all NAs
+	if (tmp == 1) {
+	    // same as expected in 'order' (1 = increasing, -1 = decreasing)
+	    isSorted = TRUE;
+	    for (int i = 0; i < n; i++)
+		o[i] = i + 1;
+	} else if (tmp == -1) {
+	    // -1 (or -n for result of strcmp), strictly opposite to
+	    // -expected 'order'
+	    isSorted = FALSE;
+	    for (int i = 0; i < n; i++)
+		o[i] = n - i;
+	} else if (nalast == 0 && tmp == -2) {
+	    // happens only when nalast=NA/0. Means all NAs, replace
+	    // with 0's therefore!
+	    isSorted = FALSE;
+	    for (int i = 0; i < n; i++)
+		o[i] = 0;
+	}
+    } else {
+	isSorted = FALSE;
+	switch (TYPEOF(x)) {
+	case INTSXP:
+	case LGLSXP:
+	    isort(xd, o, n);
+	    break;
+	case REALSXP :
+	    dsort(xd, o, n);
+	    break;
+	case STRSXP :
+	    if (sortStr) {
+		csort_pre(xd, n);
+		alloc_csort_otmp(n);
+		csort(xd, o, n);
+	    } else
+		cgroup(xd, o, n);
+	    break;
+	default:
+	    Error
+		("Internal error: previous default should have caught unsupported type");
+	}
+    }
+    
+    int maxgrpn = gsmax[flip];   // biggest group in the first arg
+    void *xsub = NULL;           // local
+    int (*f) ();
+    void (*g) ();
+    
+    if (narg > 1 && gsngrp[flip] < n) {
+        // double is the largest type, 8
+        xsub = (void *) malloc(maxgrpn * sizeof(double));
+        if (xsub == NULL)
+            Error("Couldn't allocate xsub in do_radixsort, requested %d * %d bytes.",
+                  maxgrpn, sizeof(double));
+        // global variable, used by isort, dsort, sort and cgroup
+        newo = (int *) malloc(maxgrpn * sizeof(int));
+        if (newo == NULL)
+            Error("Couldn't allocate newo in do_radixsort, requested %d * %d bytes.",
+                  maxgrpn, sizeof(int));
+    }
+
+    for (int col = 2; col <= narg; col++) {
+	x = CAR(args);
+	args = CDR(args);
+	xd = DATAPTR(x);
+	ngrp = gsngrp[flip];
+	if (ngrp == n && nalast != 0)
+	    break;
+	flipflop();
+	stackgrps = col != narg || retGrp;
+	order = LOGICAL(decreasing)[col - 1] ? -1 : 1;
+	switch (TYPEOF(x)) {
+	case INTSXP:
+	case LGLSXP:
+	    f = &isorted;
+	    g = &isort;
+	    break;
+	case REALSXP:
+	    twiddle = &dtwiddle;
+	    is_nan = &dnan;
+	    f = &dsorted;
+	    g = &dsort;
+	    break;
+	case STRSXP:
+	    f = &csorted;
+	    if (sortStr) {
+		csort_pre(xd, n);
+		alloc_csort_otmp(gsmax[1 - flip]);
+		g = &csort;
+	    }
+	    // no increasing/decreasing order required if sortStr = FALSE,
+	    // just a dummy argument
+	    else
+		g = &cgroup;
+	    break;
+	default:
+	    Error("Arg %d is type '%s', not yet supported",
+		  col, type2char(TYPEOF(x)));
+	}
+	int i = 0;
+	for (int grp = 0; grp < ngrp; grp++) {
+	    thisgrpn = gs[1 - flip][grp];
+	    if (thisgrpn == 1) {
+		if (nalast == 0) {
+		    // this edge case had to be taken care of
+		    // here.. (see the bottom of this file for
+		    // more explanation)
+		    switch (TYPEOF(x)) {
+		    case INTSXP:
+			if (INTEGER(x)[o[i] - 1] == NA_INTEGER) {
+			    isSorted = FALSE;
+			    o[i] = 0;
+			}
+			break;
+		    case LGLSXP:
+			if (LOGICAL(x)[o[i] - 1] == NA_LOGICAL) {
+			    isSorted = FALSE;
+			    o[i] = 0;
+			}
+			break;
+		    case REALSXP:
+			if (ISNAN(REAL(x)[o[i] - 1])) {
+			    isSorted = FALSE;
+			    o[i] = 0;
+			}
+			break;
+		    case STRSXP:
+			if (STRING_ELT(x, o[i] - 1) == NA_STRING) {
+			    isSorted = FALSE;
+			    o[i] = 0;
+                        } break;
+                    default :
+                        Error("Internal error: previous default should have caught unsupported type");
+                    }
+                }
+                i++;
+                push(1);
+                continue;
+            }
+            osub = o+i;
+            // ** TO DO **: if isSorted, we can just point xsub
+            //        into x directly. If (*f)() returns 0,
+            //        though, will have to copy x at that point
+            //        When doing this, xsub could be allocated at
+            //        that point for the first time.
+            if (TYPEOF(x) == STRSXP)
+                for (int j = 0; j < thisgrpn; j++)
+                    ((SEXP *) xsub)[j] = ((SEXP *) xd)[o[i++] - 1];
+            else if (TYPEOF(x) == REALSXP)
+                for (int j = 0; j < thisgrpn; j++)
+                    ((double *) xsub)[j] = ((double *) xd)[o[i++] - 1];
+            else
+                for (int j = 0; j < thisgrpn; j++)
+                    ((int *) xsub)[j] = ((int *) xd)[o[i++] - 1];
+                
+            // continue; // BASELINE short circuit timing
+            // point. Up to here is the cost of creating xsub.
+            // [i|d|c]sorted(); very low cost, sequential
+            tmp = (*f)(xsub, thisgrpn);
+            if (tmp) {
+                // *sorted will have already push()'d the groups
+                if (tmp == -1) {
+		    isSorted = FALSE;
+		    for (int k = 0; k < thisgrpn / 2; k++) {
+			// reverse the order in-place using no
+			// function call or working memory
+			// isorted only returns -1 for
+			// _strictly_ decreasing order,
+			// otherwise ties wouldn't be stable
+			tmp = osub[k];
+			osub[k] = osub[thisgrpn - 1 - k];
+			osub[thisgrpn - 1 - k] = tmp;
+		    }
+		} else if (nalast == 0 && tmp == -2) {
+		    // all NAs, replace osub[.] with 0s.
+		    isSorted = FALSE;
+		    for (int k = 0; k < thisgrpn; k++) osub[k] = 0;
+		}
+		continue;
+	    }
+	    isSorted = FALSE;
+	    // nalast=NA will result in newo[0] = 0. So had to change to -1.
+	    newo[0] = -1;
+	    // may update osub directly, or if not will put the
+	    // result in global newo
+	    (*g)(xsub, osub, thisgrpn);
+
+	    if (newo[0] != -1) {
+		if (nalast != 0)
+		    for (int j = 0; j < thisgrpn; j++)
+			// reuse xsub to reorder osub
+			((int *) xsub)[j] = osub[newo[j] - 1];
+		else
+		    for (int j = 0; j < thisgrpn; j++)
+			// final nalast case to handle!
+			((int *) xsub)[j] = (newo[j] == 0) ? 0 :
+			    osub[newo[j] - 1];
+		memcpy(osub, xsub, thisgrpn * sizeof(int));
+	    }
+	}
+    }
+
+    if (!sortStr && ustr_n != 0)
+        Error("Internal error: at the end of do_radixsort sortStr == FALSE but ustr_n !=0 [%d]",
+              ustr_n);
+    for(int i = 0; i < ustr_n; i++)
+        SET_TRUELENGTH(ustr[i], 0);
+    maxlen = 1;  // reset global. Minimum needed to count "" and NA
+    ustr_n = 0;
+    savetl_end();
+    free(ustr);
+    ustr = NULL;
+    ustr_alloc = 0;
+
+    if (retGrp) {
+        int maxgrpn = NA_INTEGER;
+        ngrp = gsngrp[flip];
+        setAttrib(ans, install("ends"), x = allocVector(INTSXP, ngrp));
+        if (ngrp > 0) {
+            INTEGER(x)[0] = gs[flip][0];
+            for (int i = 1; i < ngrp; i++)
+                INTEGER(x)[i] = INTEGER(x)[i - 1] + gs[flip][i];
+            maxgrpn = gsmax[flip];
+        }
+        setAttrib(ans, install("maxgrpn"), ScalarInteger(maxgrpn));
+        setAttrib(ans, R_ClassSymbol, mkString("grouping"));
+    }
+
+    Rboolean dropZeros = !retGrp && !isSorted && nalast == 0;
+    if (dropZeros) {
+        int zeros = 0;
+        for (int i = 0; i < n; i++) {
+            if (o[i] == 0)
+                zeros++;
+        }
+        if (zeros > 0) {
+            PROTECT(ans = allocVector(INTSXP, n - zeros));
+            int *o2 = INTEGER(ans);
+            for (int i = 0, i2 = 0; i < n; i++) {
+                if (o[i] > 0)
+                    o2[i2++] = o[i];
+            }
+            UNPROTECT(1);
+        }
+    }
+    
+    gsfree();
+    free(radix_xsub);          radix_xsub=NULL;    radix_xsuballoc=0;
+    free(xsub); free(newo);    xsub=newo=NULL;
+    free(xtmp);                xtmp=NULL;          xtmp_alloc=0;
+    free(otmp);                otmp=NULL;          otmp_alloc=0;
+    free(csort_otmp);          csort_otmp=NULL;    csort_otmp_alloc=0;
+
+    free(cradix_counts);       cradix_counts=NULL; cradix_counts_alloc=0;
+    free(cradix_xtmp);         cradix_xtmp=NULL;   cradix_xtmp_alloc=0;
+    // TO DO: use xtmp already got
+
+    UNPROTECT(1);
+    return ans;
+}
diff -Nru r-base-3.2.3/src/main/random.c r-base-3.3.1/src/main/random.c
--- r-base-3.2.3/src/main/random.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/random.c	2016-03-16 23:04:17.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2014  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *  Copyright (C) 2003--2008  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,8 @@
 #endif
 
 #include <Defn.h>
+
+#include <R_ext/Itermacros.h>
 #include <R_ext/Random.h>
 #include <R_ext/RS.h>		/* for Calloc() */
 #include <Rmath.h>		/* for rxxx functions */
@@ -42,13 +44,13 @@
 {
     Rboolean naflag = FALSE;
     double ai;
-    R_xlen_t i;
+    R_xlen_t i, ia;
     errno = 0;
-    for (i = 0; i < n; i++) {
-	ai = a[i % na];
+    MOD_ITERATE1(n, na, i, ia, {
+	ai = a[ia];
 	x[i] = f(ai);
 	if (ISNAN(x[i])) naflag = TRUE;
-    }
+    });
     return(naflag);
 }
 
@@ -120,15 +122,16 @@
 			double *a, R_xlen_t na, double *b, R_xlen_t nb,
 			double *x, R_xlen_t n)
 {
-    double ai, bi; R_xlen_t i;
+    double ai, bi;
+    R_xlen_t i, ia, ib;
     Rboolean naflag = FALSE;
     errno = 0;
-    for (i = 0; i < n; i++) {
-	ai = a[i % na];
-	bi = b[i % nb];
+    MOD_ITERATE2(n, na, nb, i, ia, ib, {
+	ai = a[ia];
+	bi = b[ib];
 	x[i] = f(ai, bi);
 	if (ISNAN(x[i])) naflag = TRUE;
-    }
+    });
     return(naflag);
 }
 
@@ -213,16 +216,16 @@
 	double *x, R_xlen_t n)
 {
     double ai, bi, ci;
-    R_xlen_t i;
+    R_xlen_t i, ia, ib, ic;
     Rboolean naflag = FALSE;
     errno = 0;
-    for (i = 0; i < n; i++) {
-	ai = a[i % na];
-	bi = b[i % nb];
-	ci = c[i % nc];
+    MOD_ITERATE3(n, na, nb, nc, i, ia, ib, ic, {
+	ai = a[ia];
+	bi = b[ib];
+	ci = c[ic];
 	x[i] = f(ai, bi, ci);
 	if (ISNAN(x[i])) naflag = TRUE;
-    }
+    });
     return(naflag);
 }
 
diff -Nru r-base-3.2.3/src/main/raw.c r-base-3.3.1/src/main/raw.c
--- r-base-3.2.3/src/main/raw.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/raw.c	2016-03-16 23:04:16.000000000 +0000
@@ -81,10 +81,11 @@
 
 SEXP attribute_hidden do_rawShift(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    checkArity(op, args);
+
     SEXP ans, x = CAR(args);
     int shift = asInteger(CADR(args));
 
-
     if (!isRaw(x))
 	error(_("argument 'x' must be a raw vector"));
     if (shift == NA_INTEGER || shift < -8 || shift > 8)
@@ -102,6 +103,8 @@
 
 SEXP attribute_hidden do_rawToBits(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    checkArity(op, args);
+
     SEXP ans, x = CAR(args);
     R_xlen_t i, j = 0;
     unsigned int tmp;
@@ -124,6 +127,7 @@
     R_xlen_t i, j = 0;
     unsigned int tmp;
 
+    checkArity(op, args);
     PROTECT(x = coerceVector(CAR(args), INTSXP));
     if (!isInteger(x))
 	error(_("argument 'x' must be an integer vector"));
@@ -139,6 +143,7 @@
 
 SEXP attribute_hidden do_packBits(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    checkArity(op, args);
     SEXP ans, x = CAR(args), stype = CADR(args);
     Rboolean useRaw;
     R_xlen_t i, len = XLENGTH(x), slen;
diff -Nru r-base-3.2.3/src/main/Rdynload.c r-base-3.3.1/src/main/Rdynload.c
--- r-base-3.2.3/src/main/Rdynload.c	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/Rdynload.c	2016-03-16 23:04:15.000000000 +0000
@@ -976,10 +976,10 @@
     R_RegisteredNativeSymbol *copy;
     copy = (R_RegisteredNativeSymbol *) malloc(1 * sizeof(R_RegisteredNativeSymbol));
     if(!copy) {
-        error(ngettext("cannot allocate memory for registered native symbol (%d byte)",
+	error(ngettext("cannot allocate memory for registered native symbol (%d byte)",
 		       "cannot allocate memory for registered native symbol (%d bytes)",
-                      (int) sizeof(R_RegisteredNativeSymbol)),
-                      (int) sizeof(R_RegisteredNativeSymbol));
+		      (int) sizeof(R_RegisteredNativeSymbol)),
+		      (int) sizeof(R_RegisteredNativeSymbol));
     }
     *copy = *symbol;
 
@@ -1169,7 +1169,7 @@
 
     PROTECT(klass = allocVector(STRSXP, (symbol->type != R_ANY_SYM ? 2 : 1)));
     numProtects++;
-    SET_STRING_ELT(klass, length(klass)-1, mkChar("NativeSymbolInfo"));
+    SET_STRING_ELT(klass, LENGTH(klass) - 1, mkChar("NativeSymbolInfo"));
 
     if(n > 3) {
 	/* Add the registration information:
diff -Nru r-base-3.2.3/src/main/relop.c r-base-3.3.1/src/main/relop.c
--- r-base-3.2.3/src/main/relop.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/relop.c	2016-03-16 23:04:16.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2014  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include <Internal.h>
 #include <Rmath.h>
 #include <errno.h>
+#include <R_ext/Itermacros.h>
 
 /* interval at which to check interrupts, a guess */
 #define NINTERRUPT 10000000
@@ -66,6 +67,8 @@
     if (ATTRIB(arg1) != R_NilValue || ATTRIB(arg2) != R_NilValue) {
 	if (DispatchGroup("Ops", call, op, args, env, &ans))
 	    return ans;
+	if (argc != 2)
+	    error("operator needs two arguments");
     }
     else if (argc == 2) {
 	if (IS_SCALAR(arg1, INTSXP)) {
@@ -320,15 +323,6 @@
     return x;
 }
 
-/* i1 = i % n1; i2 = i % n2;
- * this macro is quite a bit faster than having real modulo calls
- * in the loop (tested on Intel and Sparc)
- */
-#define mod_iterate(n1,n2,i1,i2) for (i=i1=i2=0; i<n; \
-	i1 = (++i1 == n1) ? 0 : i1,\
-	i2 = (++i2 == n2) ? 0 : i2,\
-	++i)
-
 static SEXP integer_relop(RELOP_TYPE code, SEXP s1, SEXP s2)
 {
     R_xlen_t i, i1, i2, n, n1, n2;
@@ -344,7 +338,7 @@
 
     switch (code) {
     case EQOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = INTEGER(s1)[i1];
 	    x2 = INTEGER(s2)[i2];
@@ -352,10 +346,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 == x2);
-	}
+	});
 	break;
     case NEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = INTEGER(s1)[i1];
 	    x2 = INTEGER(s2)[i2];
@@ -363,10 +357,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 != x2);
-	}
+	});
 	break;
     case LTOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = INTEGER(s1)[i1];
 	    x2 = INTEGER(s2)[i2];
@@ -374,10 +368,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 < x2);
-	}
+	});
 	break;
     case GTOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = INTEGER(s1)[i1];
 	    x2 = INTEGER(s2)[i2];
@@ -385,10 +379,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 > x2);
-	}
+	});
 	break;
     case LEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = INTEGER(s1)[i1];
 	    x2 = INTEGER(s2)[i2];
@@ -396,10 +390,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 <= x2);
-	}
+	});
 	break;
     case GEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = INTEGER(s1)[i1];
 	    x2 = INTEGER(s2)[i2];
@@ -407,7 +401,7 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 >= x2);
-	}
+	});
 	break;
     }
     UNPROTECT(2);
@@ -429,7 +423,7 @@
 
     switch (code) {
     case EQOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = REAL(s1)[i1];
 	    x2 = REAL(s2)[i2];
@@ -437,10 +431,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 == x2);
-	}
+	});
 	break;
     case NEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = REAL(s1)[i1];
 	    x2 = REAL(s2)[i2];
@@ -448,10 +442,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 != x2);
-	}
+	});
 	break;
     case LTOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = REAL(s1)[i1];
 	    x2 = REAL(s2)[i2];
@@ -459,10 +453,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 < x2);
-	}
+	});
 	break;
     case GTOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = REAL(s1)[i1];
 	    x2 = REAL(s2)[i2];
@@ -470,10 +464,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 > x2);
-	}
+	});
 	break;
     case LEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = REAL(s1)[i1];
 	    x2 = REAL(s2)[i2];
@@ -481,10 +475,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 <= x2);
-	}
+	});
 	break;
     case GEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = REAL(s1)[i1];
 	    x2 = REAL(s2)[i2];
@@ -492,7 +486,7 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1 >= x2);
-	}
+	});
 	break;
     }
     UNPROTECT(2);
@@ -518,7 +512,7 @@
 
     switch (code) {
     case EQOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = COMPLEX(s1)[i1];
 	    x2 = COMPLEX(s2)[i2];
@@ -527,10 +521,10 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1.r == x2.r && x1.i == x2.i);
-	}
+	});
 	break;
     case NEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = COMPLEX(s1)[i1];
 	    x2 = COMPLEX(s2)[i2];
@@ -539,7 +533,7 @@
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = (x1.r != x2.r || x1.i != x2.i);
-	}
+	});
 	break;
     default:
 	/* never happens (-Wall) */
@@ -554,7 +548,7 @@
    outside the collation domain. */
 static SEXP string_relop(RELOP_TYPE code, SEXP s1, SEXP s2)
 {
-    R_xlen_t i, n, n1, n2, res;
+    R_xlen_t i, n, n1, n2, res, i1, i2;
     SEXP ans, c1, c2;
     const void *vmax = vmaxget(); // for Scollate
 
@@ -567,32 +561,32 @@
 
     switch (code) {
     case EQOP:
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    c1 = STRING_ELT(s1, i % n1);
-	    c2 = STRING_ELT(s2, i % n2);
+	    c1 = STRING_ELT(s1, i1);
+	    c2 = STRING_ELT(s2, i2);
 	    if (c1 == NA_STRING || c2 == NA_STRING)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = Seql(c1, c2) ? 1 : 0;
-	}
+	});
 	break;
     case NEOP:
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    c1 = STRING_ELT(s1, i % n1);
-	    c2 = STRING_ELT(s2, i % n2);
+	    c1 = STRING_ELT(s1, i1);
+	    c2 = STRING_ELT(s2, i2);
 	    if (c1 == NA_STRING || c2 == NA_STRING)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else
 		LOGICAL(ans)[i] = Seql(c1, c2) ? 0 : 1;
-	}
+	});
 	break;
     case LTOP:
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    c1 = STRING_ELT(s1, i % n1);
-	    c2 = STRING_ELT(s2, i % n2);
+	    c1 = STRING_ELT(s1, i1);
+	    c2 = STRING_ELT(s2, i2);
 	    if (c1 == NA_STRING || c2 == NA_STRING)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else if (c1 == c2)
@@ -605,13 +599,13 @@
 		else
 		    LOGICAL(ans)[i] = (res < 0) ? 1 : 0;
 	    }
-	}
+	});
 	break;
     case GTOP:
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i ,i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    c1 = STRING_ELT(s1, i % n1);
-	    c2 = STRING_ELT(s2, i % n2);
+	    c1 = STRING_ELT(s1, i1);
+	    c2 = STRING_ELT(s2, i2);
 	    if (c1 == NA_STRING || c2 == NA_STRING)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else if (c1 == c2)
@@ -624,13 +618,13 @@
 		else
 		    LOGICAL(ans)[i] = (res > 0) ? 1 : 0;
 	    }
-	}
+	});
 	break;
     case LEOP:
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    c1 = STRING_ELT(s1, i % n1);
-	    c2 = STRING_ELT(s2, i % n2);
+	    c1 = STRING_ELT(s1, i1);
+	    c2 = STRING_ELT(s2, i2);
 	    if (c1 == NA_STRING || c2 == NA_STRING)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else if (c1 == c2)
@@ -643,13 +637,13 @@
 		else
 		    LOGICAL(ans)[i] = (res <= 0) ? 1 : 0;
 	    }
-	}
+	});
 	break;
     case GEOP:
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    c1 = STRING_ELT(s1, i % n1);
-	    c2 = STRING_ELT(s2, i % n2);
+	    c1 = STRING_ELT(s1, i1);
+	    c2 = STRING_ELT(s2, i2);
 	    if (c1 == NA_STRING || c2 == NA_STRING)
 		LOGICAL(ans)[i] = NA_LOGICAL;
 	    else if (c1 == c2)
@@ -662,7 +656,7 @@
 		else
 		    LOGICAL(ans)[i] = (res >= 0) ? 1 : 0;
 	    }
-	}
+	});
 	break;
     }
     UNPROTECT(3);
@@ -685,52 +679,52 @@
 
     switch (code) {
     case EQOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = RAW(s1)[i1];
 	    x2 = RAW(s2)[i2];
 	    LOGICAL(ans)[i] = (x1 == x2);
-	}
+	});
 	break;
     case NEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = RAW(s1)[i1];
 	    x2 = RAW(s2)[i2];
 	    LOGICAL(ans)[i] = (x1 != x2);
-	}
+	});
 	break;
     case LTOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = RAW(s1)[i1];
 	    x2 = RAW(s2)[i2];
 	    LOGICAL(ans)[i] = (x1 < x2);
-	}
+	});
 	break;
     case GTOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = RAW(s1)[i1];
 	    x2 = RAW(s2)[i2];
 	    LOGICAL(ans)[i] = (x1 > x2);
-	}
+	});
 	break;
     case LEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = RAW(s1)[i1];
 	    x2 = RAW(s2)[i2];
 	    LOGICAL(ans)[i] = (x1 <= x2);
-	}
+	});
 	break;
     case GEOP:
-	mod_iterate(n1, n2, i1, i2) {
+	MOD_ITERATE2(n, n1, n2, i, i1, i2, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
 	    x1 = RAW(s1)[i1];
 	    x2 = RAW(s2)[i2];
 	    LOGICAL(ans)[i] = (x1 >= x2);
-	}
+	});
 	break;
     }
     UNPROTECT(2);
@@ -766,13 +760,14 @@
     if(isReal(b)) {b = PROTECT(coerceVector(b, INTSXP)); np++;} \
     if (TYPEOF(a) != TYPEOF(b)) error(_("'a' and 'b' must have the same type"));  \
     R_xlen_t i, m = XLENGTH(a), n = XLENGTH(b), mn = (m && n) ? mymax(m, n) : 0;  \
+    R_xlen_t ia, ib; \
     SEXP ans = allocVector(TYPEOF(a), mn); \
     switch(TYPEOF(a)) { \
     case INTSXP: \
-	for(i = 0; i < mn; i++) { \
-	    int aa = INTEGER(a)[i%m], bb =  INTEGER(b)[i%n]; \
+	MOD_ITERATE2(mn, m, n, i, ia, ib, { \
+	    int aa = INTEGER(a)[ia]; int bb = INTEGER(b)[ib]; \
 	    INTEGER(ans)[i] = (aa == NA_INTEGER || bb == NA_INTEGER) ? NA_INTEGER : aa op bb; \
-	} \
+	}); \
 	break; \
     default: \
 	UNIMPLEMENTED_TYPE(name, a); \
@@ -802,14 +797,15 @@
     if(!isInteger(b)) {b = PROTECT(coerceVector(b, INTSXP)); np++;}
     R_xlen_t i, m = XLENGTH(a), n = XLENGTH(b),
 	mn = (m && n) ? mymax(m, n) : 0;
+    R_xlen_t ia, ib;
     SEXP ans = allocVector(TYPEOF(a), mn);
     switch(TYPEOF(a)) {
     case INTSXP:
-	for(i = 0; i < mn; i++) {
-	    int aa = INTEGER(a)[i%m], bb = INTEGER(b)[i%n];
+	MOD_ITERATE2(mn, m, n, i, ia, ib, {
+	    int aa = INTEGER(a)[ia]; int bb = INTEGER(b)[ib];
 	    INTEGER(ans)[i] =
 		(aa == NA_INTEGER || bb == NA_INTEGER || bb < 0 || bb > 31) ? NA_INTEGER : ((unsigned int)aa << bb);
-	}
+	});
 	break;
     default:
 	UNIMPLEMENTED_TYPE("bitShiftL", a);
@@ -825,14 +821,15 @@
     if(!isInteger(b)) {b = PROTECT(coerceVector(b, INTSXP)); np++;}
     R_xlen_t i, m = XLENGTH(a), n = XLENGTH(b),
 	mn = (m && n) ? mymax(m, n) : 0;
+    R_xlen_t ia, ib;
     SEXP ans = allocVector(TYPEOF(a), mn);
     switch(TYPEOF(a)) {
     case INTSXP:
-	for(i = 0; i < mn; i++) {
-	    int aa = INTEGER(a)[i%m], bb = INTEGER(b)[i%n];
+	MOD_ITERATE2(mn, m, n, i, ia, ib, {
+	    int aa = INTEGER(a)[ia]; int bb = INTEGER(b)[ib];
 	    INTEGER(ans)[i] =
 		(aa == NA_INTEGER || bb == NA_INTEGER || bb < 0 || bb > 31) ? NA_INTEGER : ((unsigned int)aa >> bb);
-	}
+	});
 	break;
     default:
 	UNIMPLEMENTED_TYPE("bitShiftR", a);
diff -Nru r-base-3.2.3/src/main/Renviron.c r-base-3.3.1/src/main/Renviron.c
--- r-base-3.2.3/src/main/Renviron.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/Renviron.c	2016-03-16 23:04:17.000000000 +0000
@@ -307,7 +307,7 @@
 
     checkArity(op, args);
     SEXP x = CAR(args);
-    if (length(x) != 1 || !isString(x))
+    if (!isString(x) || LENGTH(x) != 1)
 	errorcall(call, _("argument '%s' must be a character string"), "x");
     const char *fn = R_ExpandFileName(translateChar(STRING_ELT(x, 0)));
     int res = process_Renviron(fn);
diff -Nru r-base-3.2.3/src/main/rlocale.c r-base-3.3.1/src/main/rlocale.c
--- r-base-3.2.3/src/main/rlocale.c	2015-09-10 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/main/rlocale.c	2016-03-16 23:04:15.000000000 +0000
@@ -18,7 +18,7 @@
  */
 
 /*  The original version of this file was contributed by Ei-ji Nakama.
- *  See also the comments in rlocale.h.
+ *  See also the comments in ../include/rlocale.h.
  *
  *  It provides replacements for the wctype functions on
  *  Windows (where they are not correct in e.g. Japanese)
@@ -142,16 +142,16 @@
     {"ZH_CN.BIG5",                              MB_zh_TW},
     {"ZH_HK",                                   MB_zh_HK},
     {"ZH_SG",                                   MB_zh_SG},
-    {"JA_JP",				MB_ja_JP},
+    {"JA_JP",					MB_ja_JP},
     {"KO_KR",				        MB_ko_KR},
     {"ZH",				        MB_zh_CN},
-    {"JA",				MB_ja_JP},
+    {"JA",					MB_ja_JP},
     {"KO",				        MB_ko_KR},
     // Default, where all EA Ambiguous characters have width one.
     {"",				        MB_Default},
 };
 
-/* used in grDevices */
+// used in character.c, ../gnuwin32/console.c , ../library/grDevices/src/devP*.c :
 int Ri18n_wcwidth(wchar_t c)
 {
     char lc_str[128];
@@ -183,7 +183,7 @@
     return zw ? 0 : 1; // assume unknown chars are width one.
 }
 
-/* Used in charcter.c, gnuwin32/console.c */
+/* Used in character.c, errors.c, ../gnuwin32/console.c */
 attribute_hidden
 int Ri18n_wcswidth (const wchar_t *s, size_t n)
 {
diff -Nru r-base-3.2.3/src/main/rlocale_data.h r-base-3.3.1/src/main/rlocale_data.h
--- r-base-3.2.3/src/main/rlocale_data.h	2015-09-10 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/main/rlocale_data.h	2016-03-16 23:04:17.000000000 +0000
@@ -1299,6 +1299,7 @@
     {0x100000,0x10fffd,{1,1,1,1,2,1,1}}, // EA ambiguous
 };
 
+#if defined(__APPLE__) || defined(Win32) || defined(_AIX)
 /* ------------------- iswalpha -------------------- */
 static const struct interval table_walpha[] = {
     { 0x41, 0x5a },
@@ -1640,8 +1641,9 @@
   { 0x20, 0x20 },
   { 0xa0, 0xa0 }, /* non-breaking space */
   { 0x1680, 0x1680 }, /* ogham space mark */
-  { 0x2000, 0x2006 }, /* why not figure space, 2007? */
+  { 0x2000, 0x2006 }, /* why not figure space, 2007? Not in glibc */
   { 0x2008, 0x200b },
+//  { 0x202f, 0x202f }, /* narrow no-break space, not in glibc */
   { 0x205f, 0x205f }, /* medium mathematical space */
   { 0x3000, 0x3000 }  /* (CJK) ideographic space */
 };
@@ -3521,7 +3523,7 @@
 };
 static const int table_wxdigit_count =
   (sizeof(table_wxdigit)/sizeof(struct interval));
-
+#endif
 
 /* -------------------helper for wcwidth -------------------- */
 
diff -Nru r-base-3.2.3/src/main/Rstrptime.h r-base-3.3.1/src/main/Rstrptime.h
--- r-base-3.2.3/src/main/Rstrptime.h	2015-12-03 23:15:10.000000000 +0000
+++ r-base-3.3.1/src/main/Rstrptime.h	2015-12-10 23:15:17.000000000 +0000
@@ -513,7 +513,7 @@
 		    if (val % 100 >= 60) return NULL;
 		    val = (val / 100) * 100 + ((val % 100) * 50) / 30;
 		}
-		/* http://en.wikipedia.org/wiki/List_of_UTC_time_offsets */
+		/* https://en.wikipedia.org/wiki/List_of_UTC_time_offsets */
 		if (val > 1400) return NULL;
 		off = ((val * 3600) / 100);
 		if (neg) off = -off;
diff -Nru r-base-3.2.3/src/main/saveload.c r-base-3.3.1/src/main/saveload.c
--- r-base-3.2.3/src/main/saveload.c	2015-09-04 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/main/saveload.c	2016-01-04 23:15:08.000000000 +0000
@@ -222,7 +222,7 @@
 	x = R_NegInf;
     else
 	res  = sscanf(d->smbuf, "%lg", &x);
-	if(res != 1) error(_("read error"));
+    if(res != 1) error(_("read error"));
     return x;
 }
 
diff -Nru r-base-3.2.3/src/main/scan.c r-base-3.3.1/src/main/scan.c
--- r-base-3.2.3/src/main/scan.c	2015-09-07 22:15:04.000000000 +0000
+++ r-base-3.3.1/src/main/scan.c	2016-03-16 23:04:16.000000000 +0000
@@ -948,8 +948,8 @@
 
     /* set up a context which will close the connection if there is
        an error or user interrupt */
-    begincontext(&cntxt, CTXT_CCODE, call, R_BaseEnv, R_BaseEnv,
-		 R_NilValue, R_NilValue);
+    begincontext(&cntxt, CTXT_CCODE, R_GlobalContext->call, R_BaseEnv,
+		 R_BaseEnv, R_NilValue, R_NilValue);
     cntxt.cend = &scan_cleanup;
     cntxt.cenddata = &data;
 
@@ -1008,8 +1008,8 @@
 	if(length(prompt) > 0) {
 	    strncpy(ConsolePrompt, translateChar(STRING_ELT(prompt, 0)),
 		    CONSOLE_PROMPT_SIZE - 1);
-            ConsolePrompt[CONSOLE_PROMPT_SIZE - 1] = '\0';
-        }
+	    ConsolePrompt[CONSOLE_PROMPT_SIZE - 1] = '\0';
+	}
     }
 
     if(R_Interactive) {
diff -Nru r-base-3.2.3/src/main/seq.c r-base-3.3.1/src/main/seq.c
--- r-base-3.2.3/src/main/seq.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/seq.c	2016-03-16 23:04:16.000000000 +0000
@@ -30,6 +30,7 @@
 #include <Internal.h>
 #include <float.h>  /* for DBL_EPSILON */
 #include <Rmath.h>
+#include <R_ext/Itermacros.h>
 
 #include "RBufferUtils.h"
 static R_StringBuffer cbuff = {NULL, 0, MAXELTSIZE};
@@ -267,57 +268,49 @@
 
     PROTECT(a = allocVector(TYPEOF(s), na));
 
-    // i % ns is slow, especially with long R_xlen_t
     switch (TYPEOF(s)) {
     case LGLSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    LOGICAL(a)[i++] = LOGICAL(s)[j++];
-	}
+	    LOGICAL(a)[i] = LOGICAL(s)[j];
+	});
 	break;
     case INTSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    INTEGER(a)[i++] = INTEGER(s)[j++];
-	}
+	    INTEGER(a)[i] = INTEGER(s)[j];
+	});
 	break;
     case REALSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j,  {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    REAL(a)[i++] = REAL(s)[j++];
-	}
+	    REAL(a)[i] = REAL(s)[j];
+	});
 	break;
     case CPLXSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    COMPLEX(a)[i++] = COMPLEX(s)[j++];
-	}
+	    COMPLEX(a)[i] = COMPLEX(s)[j];
+	});
 	break;
     case RAWSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    RAW(a)[i++] = RAW(s)[j++];
-	}
+	    RAW(a)[i] = RAW(s)[j];
+	});
 	break;
     case STRSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    SET_STRING_ELT(a, i++, STRING_ELT(s, j++));
-	}
+	    SET_STRING_ELT(a, i, STRING_ELT(s, j));
+	});
 	break;
     case VECSXP:
     case EXPRSXP:
-	for (i = 0, j = 0; i < na;) {
+	MOD_ITERATE1(na, ns, i, j, {
 //	    if ((i+1) % NINTERRUPT == 0) R_CheckUserInterrupt();
-	    if (j >= ns) j = 0;
-	    SET_VECTOR_ELT(a, i++, lazy_duplicate(VECTOR_ELT(s, j++)));
-	}
+	    SET_VECTOR_ELT(a, i, lazy_duplicate(VECTOR_ELT(s, j)));
+	});
 	break;
     default:
 	UNIMPLEMENTED_TYPE("rep3", s);
@@ -604,7 +597,7 @@
        rep(x, times, length.out, each, ...)
     */
     if (do_rep_formals == NULL)
-        do_rep_formals = allocFormalsList5(install("x"), install("times"),
+	do_rep_formals = allocFormalsList5(install("x"), install("times"),
 					   install("length.out"),
 					   install("each"), R_DotsSymbol);
     PROTECT(args = matchArgs(do_rep_formals, args, call));
@@ -676,7 +669,7 @@
 		    errorcall(call, _("invalid '%s' argument"), "times");
 		sum += it;
 	    }
-            len = sum;
+	    len = sum;
 	}
     }
 
@@ -727,7 +720,7 @@
        seq(from, to, by, length.out, along.with, ...)
     */
     if (do_seq_formals == NULL)
-        do_seq_formals = allocFormalsList6(install("from"), install("to"),
+	do_seq_formals = allocFormalsList6(install("from"), install("to"),
 					   install("by"), install("length.out"),
 					   install("along.with"), R_DotsSymbol);
     PROTECT(args = matchArgs(do_seq_formals, args, call));
diff -Nru r-base-3.2.3/src/main/serialize.c r-base-3.3.1/src/main/serialize.c
--- r-base-3.2.3/src/main/serialize.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/serialize.c	2016-03-16 23:04:15.000000000 +0000
@@ -853,7 +853,7 @@
     switch (stream->type) {
     case R_pstream_xdr_format:
     {
-        static char buf[CHUNK_SIZE * sizeof(int)];
+	static char buf[CHUNK_SIZE * sizeof(int)];
 	R_xlen_t done, this;
 	XDR xdrs;
 	for (done = 0; done < length; done += this) {
@@ -890,10 +890,10 @@
     switch (stream->type) {
     case R_pstream_xdr_format:
     {
-        static char buf[CHUNK_SIZE * sizeof(double)];
+	static char buf[CHUNK_SIZE * sizeof(double)];
 	R_xlen_t done, this;
 	XDR xdrs;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    xdrmem_create(&xdrs, buf, (int)(this * sizeof(double)), XDR_ENCODE);
 	    for(int cnt = 0; cnt < this; cnt++)
@@ -907,7 +907,7 @@
     case R_pstream_binary_format:
     {
 	R_xlen_t done, this;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->OutBytes(stream, REAL(s) + done,
 			     (int)(sizeof(double) * this));
@@ -926,11 +926,11 @@
     switch (stream->type) {
     case R_pstream_xdr_format:
     {
-        static char buf[CHUNK_SIZE * sizeof(Rcomplex)];
+	static char buf[CHUNK_SIZE * sizeof(Rcomplex)];
 	R_xlen_t done, this;
 	XDR xdrs;
 	Rcomplex *c = COMPLEX(s);
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    xdrmem_create(&xdrs, buf, (int)(this * sizeof(Rcomplex)), XDR_ENCODE);
 	    for(int cnt = 0; cnt < this; cnt++) {
@@ -946,7 +946,7 @@
     case R_pstream_binary_format:
     {
 	R_xlen_t done, this;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->OutBytes(stream, COMPLEX(s) + done,
 			     (int)(sizeof(Rcomplex) * this));
@@ -1388,10 +1388,10 @@
     switch (stream->type) {
     case R_pstream_xdr_format:
     {
-        static char buf[CHUNK_SIZE * sizeof(int)];
+	static char buf[CHUNK_SIZE * sizeof(int)];
 	R_xlen_t done, this;
 	XDR xdrs;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->InBytes(stream, buf, (int)(sizeof(int) * this));
 	    xdrmem_create(&xdrs, buf, (int)(this * sizeof(int)), XDR_DECODE);
@@ -1405,7 +1405,7 @@
     case R_pstream_binary_format:
     {
 	R_xlen_t done, this;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->InBytes(stream, INTEGER(obj) + done,
 			    (int)(sizeof(int) * this));
@@ -1424,10 +1424,10 @@
     switch (stream->type) {
     case R_pstream_xdr_format:
     {
-        static char buf[CHUNK_SIZE * sizeof(double)];
+	static char buf[CHUNK_SIZE * sizeof(double)];
 	R_xlen_t done, this;
 	XDR xdrs;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->InBytes(stream, buf, (int)(sizeof(double) * this));
 	    xdrmem_create(&xdrs, buf, (int)(this * sizeof(double)), XDR_DECODE);
@@ -1441,7 +1441,7 @@
     case R_pstream_binary_format:
     {
 	R_xlen_t done, this;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->InBytes(stream, REAL(obj) + done,
 			    (int)(sizeof(double) * this));
@@ -1460,7 +1460,7 @@
     switch (stream->type) {
     case R_pstream_xdr_format:
     {
-        static char buf[CHUNK_SIZE * sizeof(Rcomplex)];
+	static char buf[CHUNK_SIZE * sizeof(Rcomplex)];
 	R_xlen_t done, this;
 	XDR xdrs;
 	Rcomplex *output = COMPLEX(obj);
@@ -1480,7 +1480,7 @@
     case R_pstream_binary_format:
     {
 	R_xlen_t done, this;
-        for (done = 0; done < length; done += this) {
+	for (done = 0; done < length; done += this) {
 	    this = min2(CHUNK_SIZE, length - done);
 	    stream->InBytes(stream, COMPLEX(obj) + done,
 			    (int)(sizeof(Rcomplex) * this));
@@ -1561,7 +1561,7 @@
 	AddReadRef(ref_table, s);
 	return s;
     case SYMSXP:
-        R_ReadItemDepth++;
+	R_ReadItemDepth++;
 	PROTECT(s = ReadItem(ref_table, stream)); /* print name */
 	R_ReadItemDepth--;
 	s = installChar(s);
@@ -1815,7 +1815,7 @@
 	    PROTECT(ans = allocSExp(type));
 	    if (pos >= 0)
 		SET_VECTOR_ELT(reps, pos, ans);
-            R_ReadItemDepth++;
+	    R_ReadItemDepth++;
 	    if (hasattr)
 		SET_ATTRIB(ans, ReadItem(ref_table, stream));
 	    SET_TAG(ans, ReadItem(ref_table, stream));
@@ -1830,10 +1830,10 @@
     default:
 	{
 	    R_ReadItemDepth++;
-            SEXP res = ReadItem(ref_table, stream);
-            R_ReadItemDepth--;
-            return res;
-        }
+	    SEXP res = ReadItem(ref_table, stream);
+	    R_ReadItemDepth--;
+	    return res;
+	}
     }
 }
 
diff -Nru r-base-3.2.3/src/main/sort.c r-base-3.3.1/src/main/sort.c
--- r-base-3.2.3/src/main/sort.c	2015-09-04 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/main/sort.c	2016-03-16 23:04:16.000000000 +0000
@@ -179,9 +179,8 @@
 	    ScalarLogical(isUnsorted(x, strictly));
     }
     if(isObject(x)) {
-	// try dispatch -- fails entirely for S4: need "DispatchOrEval()" ?
 	SEXP call;
-	PROTECT(call =	// R>  .gtn(x, strictly) :
+	PROTECT(call = 	// R>  .gtn(x, strictly) :
 		lang3(install(".gtn"), x, CADR(args)));
 	ans = eval(call, rho);
 	UNPROTECT(2);
@@ -864,7 +863,7 @@
 
     if (n < 2) return;
     for (t = 0; incs[t] > n; t++);
-    for (h = incs[t]; t < NI; h = incs[++t])
+    for (h = incs[t]; t < NI; h = incs[++t]) {
 	R_CheckUserInterrupt();
 	for (i = h; i < n; i++) {
 	    itmp = indx[i];
@@ -877,6 +876,7 @@
 	    }
 	    indx[j] = itmp;
 	}
+    }
 }
 #endif
 
@@ -927,6 +927,12 @@
     }
 
 
+/* TODO: once LONG_VECTOR_SUPPORT and  R_xlen_t  belong to the R API,
+ * ----  also add "long" versions, say,
+ *    R_orderVectorl (R_xlen_t *indx, R_xlen_t n, SEXP arglist, ...)
+ *    R_orderVector1l(R_xlen_t *indx, R_xlen_t n, SEXP arg,  ...)
+ * to the API */
+
 // Usage:  R_orderVector(indx, n,  Rf_lang2(x,y),  nalast, decreasing)
 void R_orderVector(int *indx, // must be pre-allocated to length >= n
 		   int n,
@@ -939,6 +945,14 @@
     return;
 }
 
+// Fast version of 1-argument case of R_orderVector()
+void R_orderVector1(int *indx, int n, SEXP x,
+		    Rboolean nalast, Rboolean decreasing)
+{
+    for(int i = 0; i < n; i++) indx[i] = i;
+    orderVector1(indx, n, x, nalast, decreasing, R_NilValue);
+}
+
 
 
 /* Needs indx set to  0:(n-1)  initially.
@@ -1348,11 +1362,14 @@
 		switch(ties_kind) {
 		case AVERAGE:
 		    for (k = i; k <= j; k++)
-			rk[in[k]] = (i + j + 2) / 2.; break;
+			rk[in[k]] = (i + j + 2) / 2.; 
+		    break;
 		case MAX:
-		    for (k = i; k <= j; k++) rk[in[k]] = j+1; break;
+		    for (k = i; k <= j; k++) rk[in[k]] = j+1;
+		    break;
 		case MIN:
-		    for (k = i; k <= j; k++) rk[in[k]] = i+1; break;
+		    for (k = i; k <= j; k++) rk[in[k]] = i+1;
+		    break;
 		}
 	    }
 	} else
@@ -1368,11 +1385,14 @@
 		switch(ties_kind) {
 		case AVERAGE:
 		    for (k = i; k <= j; k++)
-			rk[in[k]] = (i + j + 2) / 2.; break;
+			rk[in[k]] = (i + j + 2) / 2.;
+		    break;
 		case MAX:
-		    for (k = i; k <= j; k++) ik[in[k]] = j+1; break;
+		    for (k = i; k <= j; k++) ik[in[k]] = j+1;
+		    break;
 		case MIN:
-		    for (k = i; k <= j; k++) ik[in[k]] = i+1; break;
+		    for (k = i; k <= j; k++) ik[in[k]] = i+1; 
+		    break;
 		}
 	    }
 	}
@@ -1381,105 +1401,6 @@
     return rank;
 }
 
-#include <R_ext/RS.h>
-
-/* also returns integers/doubles (a method for sort.list) */
-SEXP attribute_hidden do_radixsort(SEXP call, SEXP op, SEXP args, SEXP rho)
-{
-    SEXP x, ans;
-    Rboolean nalast, decreasing;
-    R_xlen_t i, n;
-    int tmp, xmax = NA_INTEGER, xmin = NA_INTEGER, off, napos;
-
-    checkArity(op, args);
-
-    x = CAR(args);
-    nalast = asLogical(CADR(args));
-    if(nalast == NA_LOGICAL)
-	error(_("invalid '%s' value"), "na.last");
-    decreasing = asLogical(CADDR(args));
-    if(decreasing == NA_LOGICAL)
-	error(_("'decreasing' must be TRUE or FALSE"));
-    off = nalast^decreasing ? 0 : 1;
-    n = XLENGTH(x);
-#ifdef LONG_VECTOR_SUPPORT
-    Rboolean isLong = n > INT_MAX;
-    if(isLong)
-	ans = allocVector(REALSXP, n);
-    else
-	ans = allocVector(INTSXP, n);
-#else
-    ans = allocVector(INTSXP, n);
-#endif
-    PROTECT(ans); // not currently needed
-    for(i = 0; i < n; i++) {
-	tmp = INTEGER(x)[i];
-	if(tmp == NA_INTEGER) continue;
-	if(xmax == NA_INTEGER || tmp > xmax) xmax = tmp;
-	if(xmin == NA_INTEGER || tmp < xmin) xmin = tmp;
-    }
-    if(xmin == NA_INTEGER) {  /* all NAs, so nothing to do */
-#ifdef LONG_VECTOR_SUPPORT
-	if (isLong) {
-	    for(i = 0; i < n; i++) REAL(ans)[i] = (double)(i+1);
-	} else
-#endif
-	{
-	    for(i = 0; i < n; i++) INTEGER(ans)[i] = (int)(i+1);
-	}
-	UNPROTECT(1);
-	return ans;
-    }
-
-    xmax -= xmin;
-    if(xmax > 100000) error(_("too large a range of values in 'x'"));
-    napos = off ? 0 : xmax + 1;
-    off -= xmin;
-    /* automatic allocation should be fine here: we know this is small */
-    R_CheckStack2((xmax+2) * sizeof(R_xlen_t));
-    R_xlen_t cnts[xmax+2];
-
-    for(i = 0; i <= xmax+1; i++) cnts[i] = 0;
-    for(i = 0; i < n; i++) {
-	if(INTEGER(x)[i] == NA_INTEGER) cnts[napos]++;
-	else cnts[off+INTEGER(x)[i]]++;
-    }
-
-    for(i = 1; i <= xmax+1; i++) cnts[i] += cnts[i-1];
-#ifdef LONG_VECTOR_SUPPORT
-    if (isLong) {
-	if(decreasing)
-	    for(i = 0; i < n; i++) {
-		tmp = INTEGER(x)[i];
-		REAL(ans)[n-(cnts[(tmp == NA_INTEGER) ? napos : off+tmp]--)] =
-		    (double)(i+1);
-	    }
-	else
-	    for(i = n-1; i >= 0; i--) {
-		tmp = INTEGER(x)[i];
-		REAL(ans)[--cnts[(tmp == NA_INTEGER) ? napos : off+tmp]] =
-		    (double)(i+1);
-	    }
-    } else
-#endif
-    {
-	if(decreasing)
-	    for(i = 0; i < n; i++) {
-		tmp = INTEGER(x)[i];
-		INTEGER(ans)[n-(cnts[(tmp == NA_INTEGER) ? napos : off+tmp]--)] =
-		    (int)(i+1);
-	    }
-	else
-	    for(i = n-1; i >= 0; i--) {
-		tmp = INTEGER(x)[i];
-		INTEGER(ans)[--cnts[(tmp == NA_INTEGER) ? napos : off+tmp]] =
-		    (int)(i+1);
-	    }
-    }
-    UNPROTECT(1);
-    return ans;
-}
-
 SEXP attribute_hidden do_xtfrm(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     SEXP fn, prargs, ans;
diff -Nru r-base-3.2.3/src/main/source.c r-base-3.3.1/src/main/source.c
--- r-base-3.2.3/src/main/source.c	2015-08-25 22:18:43.000000000 +0000
+++ r-base-3.3.1/src/main/source.c	2016-03-16 23:04:16.000000000 +0000
@@ -92,14 +92,14 @@
 	    SEXP filename;
 	    PROTECT(filename = findVar(install("filename"), R_ParseErrorFile));
 	    if (isString(filename) && length(filename)) {
-	        strncpy(buffer, CHAR(STRING_ELT(filename, 0)), buflen - 1);
-                buffer[buflen - 1] = '\0';
-            }
+		strncpy(buffer, CHAR(STRING_ELT(filename, 0)), buflen - 1);
+		buffer[buflen - 1] = '\0';
+	    }
 	    UNPROTECT(1);
-        } else if (isString(R_ParseErrorFile) && length(R_ParseErrorFile)) {
-            strncpy(buffer, CHAR(STRING_ELT(R_ParseErrorFile, 0)), buflen - 1);
-            buffer[buflen - 1] = '\0';
-        }
+	} else if (isString(R_ParseErrorFile) && length(R_ParseErrorFile)) {
+	    strncpy(buffer, CHAR(STRING_ELT(R_ParseErrorFile, 0)), buflen - 1);
+	    buffer[buflen - 1] = '\0';
+	}
     }
 }
 
diff -Nru r-base-3.2.3/src/main/split.c r-base-3.3.1/src/main/split.c
--- r-base-3.2.3/src/main/split.c	2015-09-04 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/main/split.c	2016-03-16 23:04:15.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Langage for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 2006 The R Core Team
+ *  Copyright (C) 2006-2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 #include "Defn.h"
 #include <Internal.h>
+#include <R_ext/Itermacros.h>
 
 SEXP attribute_hidden do_split(SEXP call, SEXP op, SEXP args, SEXP env)
 {
@@ -49,14 +50,15 @@
     have_names = nm != R_NilValue;
     PROTECT(counts = allocVector(INTSXP, nlevs));
     for (int i = 0; i < nlevs; i++) INTEGER(counts)[i] = 0;
-    for (R_xlen_t i = 0; i < nobs; i++) {
-	int j = INTEGER(f)[i % nfac];
+    R_xlen_t i, i1;
+    MOD_ITERATE1(nobs, nfac, i, i1, {
+	int j = INTEGER(f)[i1];
 	if (j != NA_INTEGER) {
 	    /* protect against malformed factors */
 	    if (j > nlevs || j < 1) error(_("factor has bad level"));
 	    INTEGER(counts)[j - 1]++;
 	}
-    }
+    });
     /* Allocate a generic vector to hold the results. */
     /* The i-th element will hold the split-out data */
     /* for the ith group. */
@@ -70,8 +72,8 @@
 		      allocVector(STRSXP, INTEGER(counts)[i]));
     }
     for (int i = 0; i < nlevs; i++) INTEGER(counts)[i] = 0;
-    for (R_xlen_t i = 0;  i < nobs; i++) {
-	int j = INTEGER(f)[i % nfac];
+    MOD_ITERATE1(nobs, nfac, i, i1, {
+	int j = INTEGER(f)[i1];
 	if (j != NA_INTEGER) {
 	    int k = INTEGER(counts)[j - 1];
 	    switch (TYPEOF(x)) {
@@ -103,7 +105,7 @@
 	    }
 	    INTEGER(counts)[j - 1] += 1;
 	}
-    }
+    });
     setAttrib(vec, R_NamesSymbol, getAttrib(f, R_LevelsSymbol));
     UNPROTECT(2);
     return vec;
diff -Nru r-base-3.2.3/src/main/subassign.c r-base-3.3.1/src/main/subassign.c
--- r-base-3.2.3/src/main/subassign.c	2015-08-25 22:18:41.000000000 +0000
+++ r-base-3.3.1/src/main/subassign.c	2016-03-16 23:04:16.000000000 +0000
@@ -87,6 +87,7 @@
 #include <Defn.h>
 #include <Internal.h>
 #include <R_ext/RS.h> /* for test of S4 objects */
+#include <R_ext/Itermacros.h>
 
 /* This version of SET_VECTOR_ELT does not increment the REFCNT for
    the new vector->element link. It assumes that the old vector is
@@ -189,15 +190,28 @@
 /* used instead of coerceVector to embed a non-vector in a list for
    purposes of SubassignTypeFix, for cases in wich coerceVector should
    fail; namely, S4SXP */
-static SEXP embedInVector(SEXP v)
+static SEXP embedInVector(SEXP v, SEXP call)
 {
     SEXP ans;
+    warningcall(call, "implicit list embedding of S4 objects is deprecated");
     PROTECT(ans = allocVector(VECSXP, 1));
     SET_VECTOR_ELT(ans, 0, v);
     UNPROTECT(1);
     return (ans);
 }
 
+static Rboolean dispatch_asvector(SEXP *x, SEXP call, SEXP rho) {
+    static SEXP op = NULL;
+    SEXP args;
+    Rboolean ans;
+    if (op == NULL)
+        op = R_Primitive("as.vector");
+    PROTECT(args = list2(*x, mkString("any")));
+    ans = DispatchOrEval(call, op, "as.vector", args, rho, x, 0, 1);
+    UNPROTECT(1);
+    return ans;
+}
+
 /* Level 1 is used in VectorAssign, MatrixAssign, ArrayAssign.
    That coerces RHS to a list or expression.
 
@@ -206,7 +220,7 @@
 */
 
 static int SubassignTypeFix(SEXP *x, SEXP *y, R_xlen_t stretch, int level,
-			    SEXP call)
+			    SEXP call, SEXP rho)
 {
     /* A rather pointless optimization, but level 2 used to be handled
        differently */
@@ -307,7 +321,7 @@
 
 	if (level == 1) {
 	    /* Embed the RHS into a list */
-	    *y = embedInVector(*y);
+	    *y = embedInVector(*y, call);
 	} else {
 	    /* Nothing to do here: duplicate when used (if needed) */
 	    redo_which = FALSE;
@@ -356,13 +370,23 @@
 
 	if (level == 1) {
 	    /* Embed the RHS into a list */
-	    *y = embedInVector(*y);
+	    *y = embedInVector(*y, call);
 	} else {
 	    /* Nothing to do here: duplicate when used (if needed) */
 	    redo_which = FALSE;
 	}
 	break;
 
+    case 1025: /* logical   <- S4 */
+    case 1325: /* integer   <- S4 */
+    case 1425: /* real      <- S4 */
+    case 1525: /* complex   <- S4 */
+    case 1625: /* character <- S4 */
+    case 2425: /* raw       <- S4 */
+        if (dispatch_asvector(y, call, rho)) {
+            return SubassignTypeFix(x, y, stretch, level, call, rho);
+        }
+        
     default:
 	error(_("incompatible types (from %s to %s) in subassignment type fix"),
 	      type2char(which%100), type2char(which/100));
@@ -461,14 +485,37 @@
     return val;
 }
 
-static SEXP VectorAssign(SEXP call, SEXP x, SEXP s, SEXP y)
+static SEXP VectorAssign(SEXP call, SEXP rho, SEXP x, SEXP s, SEXP y)
 {
     SEXP indx, newnames;
-    R_xlen_t i, ii, n, nx, ny;
+    R_xlen_t i, ii, n, nx, ny, iny;
     int iy, which;
     R_xlen_t stretch;
     double ry;
 
+    /* try for quick return for simple scalar case */
+    if (ATTRIB(s) == R_NilValue) {
+	if (TYPEOF(x) == REALSXP && IS_SCALAR(y, REALSXP)) {
+	    if (IS_SCALAR(s, INTSXP)) {
+		R_xlen_t ival = INTEGER(s)[0];
+		if (1 <= ival && ival <= XLENGTH(x)) {
+		    REAL(x)[ival - 1] = REAL(y)[0];
+		    return x;
+		}
+	    }
+	    else if (IS_SCALAR(s, REALSXP)) {
+		double dval = REAL(s)[0];
+		if (R_FINITE(dval)) {
+		    R_xlen_t ival = (R_xlen_t) dval;
+		    if (1 <= ival && ival <= XLENGTH(x)) {
+			REAL(x)[ival - 1] = REAL(y)[0];
+			return x;
+		    }
+		}
+	    }
+	}
+    }
+		
     if (isNull(x) && isNull(y)) {
 	return R_NilValue;
     }
@@ -505,7 +552,7 @@
     /* Here we make sure that the LHS has */
     /* been coerced into a form which can */
     /* accept elements from the RHS. */
-    which = SubassignTypeFix(&x, &y, stretch, 1, call);
+    which = SubassignTypeFix(&x, &y, stretch, 1, call, rho);
     /* = 100 * TYPEOF(x) + TYPEOF(y);*/
     if (n == 0) {
 	UNPROTECT(2);
@@ -547,49 +594,49 @@
     /* case 1013:  logical   <- integer	  */
     case 1313:	/* integer   <- integer	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    INTEGER(x)[ii] = INTEGER(y)[i % ny];
-	}
+	    INTEGER(x)[ii] = INTEGER(y)[iny];
+	});
 	break;
 
     case 1410:	/* real	     <- logical	  */
     case 1413:	/* real	     <- integer	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    iy = INTEGER(y)[i % ny];
+	    iy = INTEGER(y)[iny];
 	    if (iy == NA_INTEGER)
 		REAL(x)[ii] = NA_REAL;
 	    else
 		REAL(x)[ii] = iy;
-	}
+	});
 	break;
 
     /* case 1014:  logical   <- real	  */
     /* case 1314:  integer   <- real	  */
     case 1414:	/* real	     <- real	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    REAL(x)[ii] = REAL(y)[i % ny];
-	}
+	    REAL(x)[ii] = REAL(y)[iny];
+	});
 	break;
 
     case 1510:	/* complex   <- logical	  */
     case 1513:	/* complex   <- integer	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    iy = INTEGER(y)[i % ny];
+	    iy = INTEGER(y)[iny];
 	    if (iy == NA_INTEGER) {
 		COMPLEX(x)[ii].r = NA_REAL;
 		COMPLEX(x)[ii].i = NA_REAL;
@@ -598,16 +645,16 @@
 		COMPLEX(x)[ii].r = iy;
 		COMPLEX(x)[ii].i = 0.0;
 	    }
-	}
+	});
 	break;
 
     case 1514:	/* complex   <- real	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    ry = REAL(y)[i % ny];
+	    ry = REAL(y)[iny];
 	    if (ISNA(ry)) {
 		COMPLEX(x)[ii].r = NA_REAL;
 		COMPLEX(x)[ii].i = NA_REAL;
@@ -616,7 +663,7 @@
 		COMPLEX(x)[ii].r = ry;
 		COMPLEX(x)[ii].i = 0.0;
 	    }
-	}
+	});
 	break;
 
     /* case 1015:  logical   <- complex	  */
@@ -624,12 +671,12 @@
     /* case 1415:  real	     <- complex	  */
     case 1515:	/* complex   <- complex	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    COMPLEX(x)[ii] = COMPLEX(y)[i % ny];
-	}
+	    COMPLEX(x)[ii] = COMPLEX(y)[iny];
+	});
 	break;
 
     case 1610:	/* character <- logical	  */
@@ -642,12 +689,12 @@
     /* case 1416:  real	     <- character */
     /* case 1516:  complex   <- character */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    SET_STRING_ELT(x, ii, STRING_ELT(y, i % ny));
-	}
+	    SET_STRING_ELT(x, ii, STRING_ELT(y, iny));
+	});
 	break;
 
     /* case 1019:  logial     <- vector   */
@@ -664,18 +711,18 @@
 
     case 1919:  /* vector     <- vector     */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
 
 	    /* set NAMED on RHS value to 2 if used more than once
 	       (PR15098) */
-	    if (i >= ny && NAMED(VECTOR_ELT(y, i % ny)) < 2)
-		SET_NAMED(VECTOR_ELT(y, i % ny), 2);
+	    if (i >= ny && NAMED(VECTOR_ELT(y, iny)) < 2)
+		SET_NAMED(VECTOR_ELT(y, iny), 2);
 
-	    SET_VECTOR_ELT(x, ii, VECTOR_ELT_FIX_NAMED(y, i % ny));
-	}
+	    SET_VECTOR_ELT(x, ii, VECTOR_ELT_FIX_NAMED(y, iny));
+	});
 	break;
 
     /* case 2001: */
@@ -689,12 +736,12 @@
 		   RHS  to a list */
     case 2020:	/* expression <- expression */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    SET_VECTOR_ELT(x, ii, VECTOR_ELT(y, i % ny));
-	}
+	    SET_VECTOR_ELT(x, ii, VECTOR_ELT(y, iny));
+	});
 	break;
 
     case 1900:  /* vector     <- null       */
@@ -707,12 +754,12 @@
 
     case 2424:	/* raw   <- raw	  */
 
-	for (i = 0; i < n; i++) {
+	MOD_ITERATE1(n, ny, i, iny, {
 	    ii = gi(indx, i);
 	    if (ii == NA_INTEGER) continue;
 	    ii = ii - 1;
-	    RAW(x)[ii] = RAW(y)[i % ny];
-	}
+	    RAW(x)[ii] = RAW(y)[iny];
+	});
 	break;
 
     default:
@@ -756,7 +803,7 @@
 
 SEXP int_arraySubscript(int dim, SEXP s, SEXP dims, SEXP x, SEXP call);
 
-static SEXP MatrixAssign(SEXP call, SEXP x, SEXP s, SEXP y)
+static SEXP MatrixAssign(SEXP call, SEXP rho, SEXP x, SEXP s, SEXP y)
 {
     int i, j, ii, jj, iy, which;
     double ry;
@@ -798,7 +845,7 @@
     if (n > 0 && n % ny)
 	error(_("number of items to replace is not a multiple of replacement length"));
 
-    which = SubassignTypeFix(&x, &y, 0, 1, call);
+    which = SubassignTypeFix(&x, &y, 0, 1, call, rho);
     if (n == 0) return x;
 
     PROTECT(x);
@@ -837,7 +884,8 @@
 		ii = ii - 1;
 		ij = ii + jj * NR;
 		INTEGER(x)[ij] = INTEGER(y)[k];
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -859,7 +907,8 @@
 		    REAL(x)[ij] = NA_REAL;
 		else
 		    REAL(x)[ij] = iy;
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -878,7 +927,8 @@
 		ii = ii - 1;
 		ij = ii + jj * NR;
 		REAL(x)[ij] = REAL(y)[k];
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -904,7 +954,8 @@
 		    COMPLEX(x)[ij].r = iy;
 		    COMPLEX(x)[ij].i = 0.0;
 		}
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -929,7 +980,8 @@
 		    COMPLEX(x)[ij].r = ry;
 		    COMPLEX(x)[ij].i = 0.0;
 		}
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -949,7 +1001,8 @@
 		ii = ii - 1;
 		ij = ii + jj * NR;
 		COMPLEX(x)[ij] = COMPLEX(y)[k];
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -974,7 +1027,8 @@
 		ii = ii - 1;
 		ij = ii + jj * NR;
 		SET_STRING_ELT(x, ij, STRING_ELT(y, k));
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -997,7 +1051,8 @@
 		ii = ii - 1;
 		ij = ii + jj * NR;
 		SET_VECTOR_ELT(x, ij, VECTOR_ELT_FIX_NAMED(y, k));
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -1014,7 +1069,8 @@
 		ii = ii - 1;
 		ij = ii + jj * NR;
 		RAW(x)[ij] = RAW(y)[k];
-		k = (k + 1) % ny;
+		k++;
+		if (k == ny) k = 0;
 	    }
 	}
 	break;
@@ -1028,7 +1084,7 @@
 }
 
 
-static SEXP ArrayAssign(SEXP call, SEXP x, SEXP s, SEXP y)
+static SEXP ArrayAssign(SEXP call, SEXP rho, SEXP x, SEXP s, SEXP y)
 {
     int k = 0;
     SEXP dims, tmp;
@@ -1085,7 +1141,7 @@
     /* Here we make sure that the LHS has been coerced into */
     /* a form which can accept elements from the RHS. */
 
-    int which = SubassignTypeFix(&x, &y, 0, 1, call);/* = 100 * TYPEOF(x) + TYPEOF(y);*/
+    int which = SubassignTypeFix(&x, &y, 0, 1, call, rho);/* = 100 * TYPEOF(x) + TYPEOF(y);*/
 
     if (n == 0) {
 	UNPROTECT(1);
@@ -1108,7 +1164,8 @@
     /* existing objects any changes we make now are permanent. */
     /* Beware! */
 
-    for (int i = 0; i < n; i++) {
+    R_xlen_t i, iny;
+    MOD_ITERATE1(n, ny, i, iny, {
 	R_xlen_t ii = 0;
 	for (int j = 0; j < k; j++) {
 	    int jj = subs[j][indx[j]];
@@ -1123,14 +1180,14 @@
 	/* case 1013:	   logical   <- integer	  */
 	case 1313:	/* integer   <- integer	  */
 
-	    INTEGER(x)[ii] = INTEGER(y)[i % ny];
+	    INTEGER(x)[ii] = INTEGER(y)[iny];
 	    break;
 
 	case 1410:	/* real	     <- logical	  */
 	case 1413:	/* real	     <- integer	  */
 
 	{
-	    int iy = INTEGER(y)[i % ny];
+	    int iy = INTEGER(y)[iny];
 	    if (iy == NA_INTEGER)
 		REAL(x)[ii] = NA_REAL;
 	    else
@@ -1142,13 +1199,13 @@
 	/* case 1314:	   integer   <- real	  */
 	case 1414:	/* real	     <- real	  */
 
-	    REAL(x)[ii] = REAL(y)[i % ny];
+	    REAL(x)[ii] = REAL(y)[iny];
 	    break;
 
 	case 1510:	/* complex   <- logical	  */
 	case 1513:	/* complex   <- integer	  */
 	{
-	    int iy = INTEGER(y)[i % ny];
+	    int iy = INTEGER(y)[iny];
 	    if (iy == NA_INTEGER) {
 		COMPLEX(x)[ii].r = NA_REAL;
 		COMPLEX(x)[ii].i = NA_REAL;
@@ -1163,7 +1220,7 @@
 	case 1514:	/* complex   <- real	  */
 
 	{
-	    double ry = REAL(y)[i % ny];
+	    double ry = REAL(y)[iny];
 	    if (ISNA(ry)) {
 		COMPLEX(x)[ii].r = NA_REAL;
 		COMPLEX(x)[ii].i = NA_REAL;
@@ -1180,7 +1237,7 @@
 	/* case 1415:	   real	     <- complex	  */
 	case 1515:	/* complex   <- complex	  */
 
-	    COMPLEX(x)[ii] = COMPLEX(y)[i % ny];
+	    COMPLEX(x)[ii] = COMPLEX(y)[iny];
 	    break;
 
 	case 1610:	/* character <- logical	  */
@@ -1193,22 +1250,22 @@
 	/* case 1416:	   real	     <- character */
 	/* case 1516:	   complex   <- character */
 
-	    SET_STRING_ELT(x, ii, STRING_ELT(y, i % ny));
+	    SET_STRING_ELT(x, ii, STRING_ELT(y, iny));
 	    break;
 
 	case 1919: /* vector <- vector */
 
 	    /* set NAMED on RHS value to 2 if used more than once
 	       (PR15098) */
-	    if (i >= ny && NAMED(VECTOR_ELT(y, i % ny)) < 2)
-		SET_NAMED(VECTOR_ELT(y, i % ny), 2);
+	    if (i >= ny && NAMED(VECTOR_ELT(y, iny)) < 2)
+		SET_NAMED(VECTOR_ELT(y, iny), 2);
 
-	    SET_VECTOR_ELT(x, ii, VECTOR_ELT_FIX_NAMED(y, i % ny));
+	    SET_VECTOR_ELT(x, ii, VECTOR_ELT_FIX_NAMED(y, iny));
 	    break;
 
 	case 2424: /* raw <- raw */
 
-	    RAW(x)[ii] = RAW(y)[i % ny];
+	    RAW(x)[ii] = RAW(y)[iny];
 	    break;
 
 	default:
@@ -1221,10 +1278,11 @@
 	    int j = 0;
 	    while (++indx[j] >= bound[j]) {
 		indx[j] = 0;
-		j = (j + 1) % k;
+		j++;
+		if (j == k) j = 0;
 	    }
 	}
-    }
+    });
     UNPROTECT(3);
     vmaxset(vmax);
     return x;
@@ -1482,16 +1540,16 @@
     case RAWSXP:
 	switch (nsubs) {
 	case 0:
-	    x = VectorAssign(call, x, R_MissingArg, y);
+	    x = VectorAssign(call, rho, x, R_MissingArg, y);
 	    break;
 	case 1:
-	    x = VectorAssign(call, x, CAR(subs), y);
+	    x = VectorAssign(call, rho, x, CAR(subs), y);
 	    break;
 	case 2:
-	    x = MatrixAssign(call, x, subs, y);
+	    x = MatrixAssign(call, rho, x, subs, y);
 	    break;
 	default:
-	    x = ArrayAssign(call, x, subs, y);
+	    x = ArrayAssign(call, rho, x, subs, y);
 	    break;
 	}
 	break;
@@ -1602,7 +1660,7 @@
     /* code to allow classes to extend ENVSXP */
     if(TYPEOF(x) == S4SXP) {
 	xOrig = x; /* will be an S4 object */
-        x = R_getS4DataSlot(x, ANYSXP);
+	x = R_getS4DataSlot(x, ANYSXP);
 	if(TYPEOF(x) != ENVSXP)
 	  errorcall(call, _("[[<- defined for objects of type \"S4\" only for subclasses of environment"));
     }
@@ -1657,9 +1715,9 @@
 		if(recursed) {
 		    if(isVectorList(xup)) SET_VECTOR_ELT(xup, off, x);
 		    else {
-		        PROTECT(x);
-		        xup = SimpleListAssign(call, xup, subs, x, len-2);
-		        UNPROTECT(1); /* x */
+			PROTECT(x);
+			xup = SimpleListAssign(call, xup, subs, x, len-2);
+			UNPROTECT(1); /* x */
 		    }
 		} else xtop = x;
 		UNPROTECT(3); /* xup, x, args */
@@ -1693,7 +1751,7 @@
 	    UNPROTECT(1); /* indx */
 	}
 
-	which = SubassignTypeFix(&x, &y, stretch, 2, call);
+	which = SubassignTypeFix(&x, &y, stretch, 2, call, rho);
 
 	PROTECT(x);
 	PROTECT(y);
@@ -1914,6 +1972,11 @@
     input = allocVector(STRSXP, 1);
 
     nlist = CADR(args);
+    if (TYPEOF(nlist) == PROMSXP) {
+	PROTECT(input);
+	nlist = eval(nlist, env);
+	UNPROTECT(1);
+    }
     iS = isSymbol(nlist);
     if (iS)
 	SET_STRING_ELT(input, 0, PRINTNAME(nlist));
@@ -1927,6 +1990,9 @@
     /* replace the second argument with a string */
     SETCADR(args, input);
 
+    /* if nlist is a string, it may be destroyed below, but it is ok
+       because we later only use its first element which is protected
+       implicitly through args/input */
     if(R_DispatchOrEvalSP(call, op, "$<-", args, env, &ans))
       return(ans);
 
diff -Nru r-base-3.2.3/src/main/subscript.c r-base-3.3.1/src/main/subscript.c
--- r-base-3.2.3/src/main/subscript.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/subscript.c	2016-03-16 23:04:16.000000000 +0000
@@ -42,7 +42,8 @@
 #define NINTERRUPT 10000000
 
 /* We might get a call with R_NilValue from subassignment code */
-#define ECALL(call, yy) if(call == R_NilValue) error(yy); else errorcall(call, yy);
+#define ECALL(call, yy)     if(call == R_NilValue) error(yy);    else errorcall(call, yy);
+#define ECALL3(call, yy, A) if(call == R_NilValue) error(yy, A); else errorcall(call, yy, A);
 
 /* This allows for the unusual case where x is of length 2,
    and x[[-m]] selects one element for m = 1, 2.
@@ -55,11 +56,11 @@
     if (i > 0) /* a regular 1-based index from R */
 	indx = i - 1;
     else if (i == 0 || len < 2) {
-	ECALL(call, _("attempt to select less than one element"));
+	ECALL3(call, _("attempt to select less than one element in %s"), "integerOneIndex");
     } else if (len == 2 && i > -3)
 	indx = 2 + i;
     else {
-	ECALL(call, _("attempt to select more than one element"));
+	ECALL3(call, _("attempt to select more than one element in %s"), "integerOneIndex");
     }
     return indx;
 }
@@ -74,10 +75,10 @@
     const void *vmax;
 
     if (pos < 0 && length(s) > 1) {
-	ECALL(call, _("attempt to select more than one element"));
+	ECALL3(call, _("attempt to select more than one element in %s"), "OneIndex");
     }
     if (pos < 0 && length(s) < 1) {
-	ECALL(call, _("attempt to select less than one element"));
+	ECALL3(call, _("attempt to select less than one element in %s"), "OneIndex");
     }
 
     if(pos < 0) pos = 0;
@@ -147,11 +148,7 @@
 	vmaxset(vmax);
 	break;
     default:
-	if (call == R_NilValue)
-	    error(_("invalid subscript type '%s'"), type2char(TYPEOF(s)));
-	else
-	    errorcall(call, _("invalid subscript type '%s'"),
-		      type2char(TYPEOF(s)));
+	ECALL3(call, _("invalid subscript type '%s'"), type2char(TYPEOF(s)));
     }
     return indx;
 }
@@ -183,9 +180,9 @@
 
     if (pos < 0 && length(s) != 1) {
 	if (length(s) > 1) {
-	    ECALL(call, _("attempt to select more than one element"));
+	    ECALL3(call, _("attempt to select more than one element in %s"), "get1index");
 	} else {
-	    ECALL(call, _("attempt to select less than one element"));
+	    ECALL3(call, _("attempt to select less than one element in %s"), "get1index");
 	}
     } else
 	if(pos >= length(s)) {
@@ -209,11 +206,11 @@
 	    /* see comment above integerOneIndex */
 	    if (dblind > 0) indx = (R_xlen_t)(dblind - 1);
 	    else if (dblind == 0 || len < 2) {
-		ECALL(call, _("attempt to select less than one element"));
+		ECALL3(call, _("attempt to select less than one element in %s"), "get1index <real>");
 	    } else if (len == 2 && dblind > -3)
 		indx = (R_xlen_t)(2 + dblind);
 	    else {
-		ECALL(call, _("attempt to select more than one element"));
+		ECALL3(call, _("attempt to select more than one element in %s"), "get1index <real>");
 	    }
 	}
 	break;
@@ -278,11 +275,7 @@
 		break;
 	    }
     default:
-	if (call == R_NilValue)
-	    error(_("invalid subscript type '%s'"), type2char(TYPEOF(s)));
-	else
-	    errorcall(call, _("invalid subscript type '%s'"),
-		      type2char(TYPEOF(s)));
+	ECALL3(call, _("invalid subscript type '%s'"), type2char(TYPEOF(s)));
     }
     return indx;
 }
@@ -309,12 +302,12 @@
 	    if (i)
 		errorcall(call, _("recursive indexing failed at level %d\n"), i+1);
 	    else
-		errorcall(call, _("attempt to select more than one element"));
+		errorcall(call, _("attempt to select more than one element in %s"), "vectorIndex");
 	}
 	PROTECT(x);
 	SEXP names = PROTECT(getAttrib(x, R_NamesSymbol));
 	offset = get1index(thesub, names,
-		           xlength(x), pok, i, call);
+			   xlength(x), pok, i, call);
 	UNPROTECT(2); /* x, names */
 	if(offset < 0 || offset >= xlength(x))
 	    errorcall(call, _("no such index at level %d\n"), i+1);
@@ -458,20 +451,20 @@
     PROTECT(si = allocVector(INTSXP, xlength(s)));
     dimgets(si, getAttrib(s, R_DimSymbol));
     for (i = 0; i < length(dnamelist); i++) {
-        dnames = VECTOR_ELT(dnamelist, i);
-        for (j = 0; j < nr; j++)
-            SET_STRING_ELT(snames, j, STRING_ELT(s, j + (i * NR)));
-        PROTECT(sicol = match(dnames, snames, 0));
-        for (j = 0; j < nr; j++) {
-            v = INTEGER(sicol)[j];
-            idx = j + (i * NR);
-            s_elt = STRING_ELT(s, idx);
-            if (s_elt == NA_STRING) v = NA_INTEGER;
-            if (!CHAR(s_elt)[0]) v = 0; /* disallow "" match */
-            if (v == 0) errorcall(call, _("subscript out of bounds"));
-            INTEGER(si)[idx] = v;
-        }
-        UNPROTECT(1);
+	dnames = VECTOR_ELT(dnamelist, i);
+	for (j = 0; j < nr; j++)
+	    SET_STRING_ELT(snames, j, STRING_ELT(s, j + (i * NR)));
+	PROTECT(sicol = match(dnames, snames, 0));
+	for (j = 0; j < nr; j++) {
+	    v = INTEGER(sicol)[j];
+	    idx = j + (i * NR);
+	    s_elt = STRING_ELT(s, idx);
+	    if (s_elt == NA_STRING) v = NA_INTEGER;
+	    if (!CHAR(s_elt)[0]) v = 0; /* disallow "" match */
+	    if (v == 0) errorcall(call, _("subscript out of bounds"));
+	    INTEGER(si)[idx] = v;
+	}
+	UNPROTECT(1);
     }
     UNPROTECT(2);
     return si;
@@ -511,12 +504,29 @@
     if (ns == 0) return(allocVector(INTSXP, 0));
 #ifdef LONG_VECTOR_SUPPORT
     if (nmax > R_SHORT_LEN_MAX) {
+	if (ns == nmax) { /* no recycling - use fast single-index code */
+	    const void *vmax = vmaxget();
+	    double *buf = (double *) R_alloc(nmax, sizeof(double));
+	    count = 0;
+	    R_ITERATE_CHECK(NINTERRUPT, nmax, i,                    \
+		if (LOGICAL(s)[i]) {                                \
+		    if (LOGICAL(s)[i] == NA_LOGICAL)		    \
+			buf[count++] = NA_REAL;		    \
+		    else					    \
+			buf[count++] = (double)(i + 1);	    \
+		});
+	    PROTECT(indx = allocVector(REALSXP, count));
+	    memcpy(REAL(indx), buf, sizeof(double) * count);
+	    vmaxset(vmax);
+	    UNPROTECT(1);
+	    return indx;
+	}
 	count = 0;
 	/* we only need to scan s once even if we recycle,
 	   just remember the total count as well as
 	   the count for the last incomplete chunk (if any) */
 	i1 = (ns < nmax) ? (nmax % ns) : 0;
-	if (i1 > 0) { /* last recycling chunk is incomple -
+	if (i1 > 0) { /* last recycling chunk is incomplete -
 			 we have to get the truncated count as well */
 	    R_xlen_t rem = 0;
 	    for (i = 0; i < ns; i++) {
@@ -531,33 +541,43 @@
 	}
 	PROTECT(indx = allocVector(REALSXP, count));
 	count = 0;
-	if (ns == nmax) { /* no recycling - use fast single-index code */
-	    R_ITERATE_CHECK(NINTERRUPT, nmax, i,		\
-		if (LOGICAL(s)[i]) {		                \
-		    if (LOGICAL(s)[i] == NA_LOGICAL)		\
-			REAL(indx)[count++] = NA_REAL;		\
-		    else					\
-			REAL(indx)[count++] = (double)(i + 1);	\
-		});
-	} else /* otherwise iter-macro */
-	    MOD_ITERATE_CHECK(NINTERRUPT, nmax, ns, nmax, i, i1, i2,	\
-		    if (LOGICAL(s)[i1]) {				\
-			if (LOGICAL(s)[i1] == NA_LOGICAL)		\
-			    REAL(indx)[count++] = NA_REAL;		\
-			else						\
-			    REAL(indx)[count++] = (int)(i + 1);		\
-		    });							\
+	MOD_ITERATE_CHECK(NINTERRUPT, nmax, ns, nmax, i, i1, i2, \
+	    if (LOGICAL(s)[i1]) {				 \
+		if (LOGICAL(s)[i1] == NA_LOGICAL)		 \
+		    REAL(indx)[count++] = NA_REAL;		 \
+		else						 \
+		    REAL(indx)[count++] = (double)(i + 1);	 \
+	    });
 
 	UNPROTECT(1);
 	return indx;
     }
 #endif
+// else --- the same code for  non-long vectors --------------------------
+    if (ns == nmax) {  /* no recycling - use fast single-index code */
+	const void *vmax = vmaxget();
+	int *buf = (int *) R_alloc(nmax, sizeof(int));
+	count = 0;
+	R_ITERATE_CHECK(NINTERRUPT, nmax, i,                    \
+	    if (LOGICAL(s)[i]) {                                \
+		if (LOGICAL(s)[i] == NA_LOGICAL)	        \
+		    buf[count++] = NA_INTEGER;		\
+		else                                            \
+		    buf[count++] = (int)(i + 1);		\
+	    });
+	PROTECT(indx = allocVector(INTSXP, count));
+	memcpy(INTEGER(indx), buf, sizeof(int) * count);
+	vmaxset(vmax);
+	UNPROTECT(1);
+	return indx;
+    }
+
     count = 0;
     /* we only need to scan s once even if we recycle,
        just remember the total count as well as
        the count for the last incomplete chunk (if any) */
     i1 = (ns < nmax) ? (nmax % ns) : 0;
-    if (i1 > 0) { /* last recycling chunk is incomple -
+    if (i1 > 0) { /* last recycling chunk is incomplete -
 		     we have to get the truncated count as well */
 	R_xlen_t rem = 0;
 	for (i = 0; i < ns; i++) {
@@ -565,30 +585,20 @@
 	    if (LOGICAL(s)[i]) count++;
 	}
 	count = count * (nmax / ns) + rem;
-    } else {
+    } else { /* nested recycling, total is sufficient */
 	for (i = 0; i < ns; i++)
 	    if (LOGICAL(s)[i]) count++;
 	count *= nmax / ns;
     }
     PROTECT(indx = allocVector(INTSXP, count));
     count = 0;
-    if (ns == nmax) { /* no recycling - use fast single-index code */
-	R_ITERATE_CHECK(NINTERRUPT, nmax, i,                    \
-	    if (LOGICAL(s)[i]) {                                \
-		if (LOGICAL(s)[i] == NA_LOGICAL)	        \
-		    INTEGER(indx)[count++] = NA_INTEGER;        \
-		else                                            \
-		    INTEGER(indx)[count++] = (int)(i + 1);      \
-	    });
-    } else /* otherwise iter-macro */
-	MOD_ITERATE_CHECK(NINTERRUPT, nmax, ns, nmax, i, i1, i2, {	\
-		if (LOGICAL(s)[i1]) {			        \
-		    if (LOGICAL(s)[i1] == NA_LOGICAL)		\
-			INTEGER(indx)[count++] = NA_INTEGER;	\
-		    else					\
-			INTEGER(indx)[count++] = (int)(i + 1);	\
-		}						\
-	    });
+    MOD_ITERATE_CHECK(NINTERRUPT, nmax, ns, nmax, i, i1, i2,	\
+	if (LOGICAL(s)[i1]) {				\
+	    if (LOGICAL(s)[i1] == NA_LOGICAL)			\
+		INTEGER(indx)[count++] = NA_INTEGER;		\
+	    else						\
+		INTEGER(indx)[count++] = (int)(i + 1);		\
+	});
 
     UNPROTECT(1);
     return indx;
@@ -890,11 +900,7 @@
 	if (s == R_MissingArg)
 	    return nullSubscript(nd);
     default:
-	if (call == R_NilValue)
-	    error(_("invalid subscript type '%s'"), type2char(TYPEOF(s)));
-	else
-	    errorcall(call, _("invalid subscript type '%s'"),
-		      type2char(TYPEOF(s)));
+	ECALL3(call, _("invalid subscript type '%s'"), type2char(TYPEOF(s)));
     }
     return R_NilValue;
 }
@@ -950,10 +956,6 @@
 	}
     }
 
-    PROTECT(s = duplicate(s));
-    SET_ATTRIB(s, R_NilValue);
-    SET_OBJECT(s, 0);
-
     SEXP ans = R_NilValue;
     switch (TYPEOF(s)) {
     case NILSXP:
@@ -964,16 +966,24 @@
 	ans = logicalSubscript(s, ns, nx, stretch, call);
 	break;
     case INTSXP:
+	PROTECT(s = duplicate(s));
+	SET_ATTRIB(s, R_NilValue);
+	SET_OBJECT(s, 0);
 	ans = integerSubscript(s, ns, nx, stretch, call);
+	UNPROTECT(1);
 	break;
     case REALSXP:
 	ans = realSubscript(s, ns, nx, stretch, call);
 	break;
     case STRSXP:
     {
+	PROTECT(s = duplicate(s));
+	SET_ATTRIB(s, R_NilValue);
+	SET_OBJECT(s, 0);
 	SEXP names = getAttrib(x, R_NamesSymbol);
 	/* *stretch = 0; */
 	ans = stringSubscript(s, ns, nx, names, stretch, call);
+	UNPROTECT(1);
 	break;
     }
     case SYMSXP:
@@ -983,12 +993,7 @@
 	    break;
 	}
     default:
-	if (call == R_NilValue)
-	    error(_("invalid subscript type '%s'"), type2char(TYPEOF(s)));
-	else
-	    errorcall(call, _("invalid subscript type '%s'"),
-		      type2char(TYPEOF(s)));
+	ECALL3(call, _("invalid subscript type '%s'"), type2char(TYPEOF(s)));
     }
-    UNPROTECT(1);
     return ans;
 }
diff -Nru r-base-3.2.3/src/main/subset.c r-base-3.3.1/src/main/subset.c
--- r-base-3.2.3/src/main/subset.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/subset.c	2016-03-16 23:04:17.000000000 +0000
@@ -158,9 +158,7 @@
    matrix indexing of arrays */
 static SEXP VectorSubset(SEXP x, SEXP s, SEXP call)
 {
-    R_xlen_t n;
-    int mode;
-    R_xlen_t stretch = 1;
+    R_xlen_t n, stretch = 1;
     SEXP indx, result, attrib, nattrib;
 
     if (s == R_MissingArg) return duplicate(x);
@@ -172,16 +170,16 @@
     /* If we do, make a real subscript vector and protect it. */
 
     if (isMatrix(s) && isArray(x) && ncols(s) == length(attrib)) {
-        if (isString(s)) {
-            s = strmat2intmat(s, GetArrayDimnames(x), call);
-            UNPROTECT(1);
-            PROTECT(s);
-        }
-        if (isInteger(s) || isReal(s)) {
-            s = mat2indsub(attrib, s, call);
-            UNPROTECT(1);
-            PROTECT(s);
-        }
+	if (isString(s)) {
+	    s = strmat2intmat(s, GetArrayDimnames(x), call);
+	    UNPROTECT(1);
+	    PROTECT(s);
+	}
+	if (isInteger(s) || isReal(s)) {
+	    s = mat2indsub(attrib, s, call);
+	    UNPROTECT(1);
+	    PROTECT(s);
+	}
     }
 
     /* Convert to a vector of integer subscripts */
@@ -192,7 +190,7 @@
 
     /* Allocate the result. */
 
-    mode = TYPEOF(x);
+    int mode = TYPEOF(x);
     /* No protection needed as ExtractSubset does not allocate */
     result = allocVector(mode, n);
     if (mode == VECSXP || mode == EXPRSXP)
@@ -296,6 +294,7 @@
 		    SET_STRING_ELT(result, ij, NA_STRING);
 		    break;
 		case VECSXP:
+		case EXPRSXP:
 		    SET_VECTOR_ELT(result, ij, R_NilValue);
 		    break;
 		case RAWSXP:
@@ -325,6 +324,7 @@
 		    SET_STRING_ELT(result, ij, STRING_ELT(x, iijj));
 		    break;
 		case VECSXP:
+		case EXPRSXP:
 		    SET_VECTOR_ELT(result, ij, VECTOR_ELT_FIX_NAMED(x, iijj));
 		    break;
 		case RAWSXP:
@@ -341,6 +341,8 @@
 	PROTECT(attr = allocVector(INTSXP, 2));
 	INTEGER(attr)[0] = nrs;
 	INTEGER(attr)[1] = ncs;
+	if(!isNull(getAttrib(dim, R_NamesSymbol)))
+	    setAttrib(attr, R_NamesSymbol, getAttrib(dim, R_NamesSymbol));
 	setAttrib(result, R_DimSymbol, attr);
 	UNPROTECT(1);
     }
@@ -475,6 +477,7 @@
 		SET_STRING_ELT(result, i, NA_STRING);
 	    break;
 	case VECSXP:
+	case EXPRSXP:
 	    if (ii != NA_INTEGER)
 		SET_VECTOR_ELT(result, i, VECTOR_ELT_FIX_NAMED(x, ii));
 	    else
@@ -499,11 +502,13 @@
 	}
     }
 
-    PROTECT(xdims = allocVector(INTSXP, k));
+    SEXP new_dim = PROTECT(allocVector(INTSXP, k));
     for(int i = 0 ; i < k ; i++)
-	INTEGER(xdims)[i] = bound[i];
-    setAttrib(result, R_DimSymbol, xdims);
-    UNPROTECT(1); /* xdims */
+	INTEGER(new_dim)[i] = bound[i];
+    if(!isNull(getAttrib(xdims, R_NamesSymbol)))
+	setAttrib(new_dim, R_NamesSymbol, getAttrib(xdims, R_NamesSymbol));
+    setAttrib(result, R_DimSymbol, new_dim);
+    UNPROTECT(1); // new_dim
 
     /* The array elements have been transferred. */
     /* Now we need to transfer the attributes. */
@@ -661,18 +666,22 @@
 
 static R_INLINE R_xlen_t scalarIndex(SEXP s)
 {
-    if (ATTRIB(s) == R_NilValue)
-	switch (TYPEOF(s)) {
-	case REALSXP: // treat infinite indices as NA, like asInteger
-	    if (XLENGTH(s) == 1 && R_FINITE(REAL(s)[0]))
-		return (R_xlen_t) REAL(s)[0];
+    if (ATTRIB(s) == R_NilValue) {
+	if (IS_SCALAR(s, INTSXP)) {
+	    int ival = INTEGER(s)[0];
+	    if (ival != NA_INTEGER)
+		return ival;
 	    else return -1;
-	case INTSXP:
-	    if (XLENGTH(s) == 1 && INTEGER(s)[0] != NA_INTEGER)
-		return INTEGER(s)[0];
+	}
+	else if (IS_SCALAR(s, REALSXP)) {
+	    double rval = REAL(s)[0];
+	    // treat infinite indices as NA, like asInteger
+	    if (R_FINITE(rval))
+		return (R_xlen_t) rval;
 	    else return -1;
-	default: return -1;
 	}
+	else return -1;
+    }
     else return -1;
 }
 
@@ -821,18 +830,19 @@
 	   length one and drop == TRUE
 	*/
 	if(ndim == 1) {
-	    SEXP attr, attrib, nattrib;
 	    int len = length(ans);
-
 	    if(!drop || len > 1) {
 		// must grab these before the dim is set.
 		SEXP nm = PROTECT(getAttrib(ans, R_NamesSymbol));
-		PROTECT(attr = allocVector(INTSXP, 1));
+		SEXP attr = PROTECT(allocVector(INTSXP, 1));
 		INTEGER(attr)[0] = length(ans);
+		if(!isNull(getAttrib(dim, R_NamesSymbol)))
+		    setAttrib(attr, R_NamesSymbol, getAttrib(dim, R_NamesSymbol));
 		setAttrib(ans, R_DimSymbol, attr);
+		SEXP attrib;
 		if((attrib = getAttrib(x, R_DimNamesSymbol)) != R_NilValue) {
 		    /* reinstate dimnames, include names of dimnames */
-		    PROTECT(nattrib = duplicate(attrib));
+		    SEXP nattrib = PROTECT(duplicate(attrib));
 		    SET_VECTOR_ELT(nattrib, 0, nm);
 		    setAttrib(ans, R_DimNamesSymbol, nattrib);
 		    setAttrib(ans, R_NamesSymbol, R_NilValue);
@@ -948,7 +958,7 @@
 
     /* code to allow classes to extend environment */
     if(TYPEOF(x) == S4SXP) {
-        x = R_getS4DataSlot(x, ANYSXP);
+	x = R_getS4DataSlot(x, ANYSXP);
 	if(x == R_NilValue)
 	  errorcall(call, _("this S4 class is not subsettable"));
     }
@@ -1087,6 +1097,21 @@
     return ans;
 }
 
+SEXP attribute_hidden dispatch_subset2(SEXP x, R_xlen_t i, SEXP call, SEXP rho)
+{
+    static SEXP bracket_op = NULL;
+    SEXP args, x_elt;
+    if (isObject(x)) {
+        if (bracket_op == NULL)
+            bracket_op = R_Primitive("[[");
+        PROTECT(args = list2(x, ScalarReal(i + 1)));
+        x_elt = do_subset2(call, bracket_op, args, rho);
+        UNPROTECT(1);
+    } else {
+        x_elt = VECTOR_ELT(x, i);
+    }
+    return(x_elt);
+}
 
 enum pmatch {
     NO_MATCH,
@@ -1141,6 +1166,8 @@
     input = PROTECT(allocVector(STRSXP, 1));
 
     nlist = CADR(args);
+    if (TYPEOF(nlist) == PROMSXP)
+	nlist = eval(nlist, env);
     if(isSymbol(nlist) )
 	SET_STRING_ELT(input, 0, PRINTNAME(nlist));
     else if(isString(nlist) )
@@ -1164,13 +1191,13 @@
     /* evaluation retains any missing argument indicators. */
 
     if(R_DispatchOrEvalSP(call, op, "$", args, env, &ans)) {
-	UNPROTECT(2);
+	UNPROTECT(2); /* input, args */
 	if (NAMED(ans))
 	    SET_NAMED(ans, 2);
 	return(ans);
     }
 
-    UNPROTECT(2);
+    UNPROTECT(2); /* input, args */
     return R_subset3_dflt(CAR(ans), STRING_ELT(input, 0), call);
 }
 
@@ -1187,7 +1214,7 @@
     slen = strlen(translateChar(input));
      /* The mechanism to allow a class extending "environment" */
     if( IS_S4_OBJECT(x) && TYPEOF(x) == S4SXP ){
-        x = R_getS4DataSlot(x, ANYSXP);
+	x = R_getS4DataSlot(x, ANYSXP);
 	if(x == R_NilValue)
 	    errorcall(call, "$ operator not defined for this S4 class");
     }
@@ -1199,13 +1226,13 @@
     if (isPairList(x)) {
 	SEXP xmatch = R_NilValue;
 	int havematch;
-	UNPROTECT(2); /* input, x */
 	havematch = 0;
 	for (y = x ; y != R_NilValue ; y = CDR(y)) {
 	    switch(pstrmatch(TAG(y), input, slen)) {
 	    case EXACT_MATCH:
 		y = CAR(y);
 		if (NAMED(x) > NAMED(y)) SET_NAMED(y, NAMED(x));
+		UNPROTECT(2); /* input, x */
 		return y;
 	    case PARTIAL_MATCH:
 		havematch++;
@@ -1232,15 +1259,17 @@
 	    }
 	    y = CAR(xmatch);
 	    if (NAMED(x) > NAMED(y)) SET_NAMED(y, NAMED(x));
+	    UNPROTECT(2); /* input, x */
 	    return y;
 	}
+	UNPROTECT(2); /* input, x */
 	return R_NilValue;
     }
     else if (isVectorList(x)) {
 	R_xlen_t i, n, imatch = -1;
 	int havematch;
 	nlist = getAttrib(x, R_NamesSymbol);
-	UNPROTECT(2); /* input, x */
+
 	n = xlength(nlist);
 	havematch = 0;
 	for (i = 0 ; i < n ; i = i + 1) {
@@ -1249,6 +1278,7 @@
 		y = VECTOR_ELT(x, i);
 		if (NAMED(x) > NAMED(y))
 		    SET_NAMED(y, NAMED(x));
+		UNPROTECT(2); /* input, x */
 		return y;
 	    case PARTIAL_MATCH:
 		havematch++;
@@ -1283,8 +1313,10 @@
 	    }
 	    y = VECTOR_ELT(x, imatch);
 	    if (NAMED(x) > NAMED(y)) SET_NAMED(y, NAMED(x));
+	    UNPROTECT(2); /* input, x */
 	    return y;
 	}
+	UNPROTECT(2); /* input, x */
 	return R_NilValue;
     }
     else if( isEnvironment(x) ){
diff -Nru r-base-3.2.3/src/main/summary.c r-base-3.3.1/src/main/summary.c
--- r-base-3.2.3/src/main/summary.c	2015-09-11 22:15:10.000000000 +0000
+++ r-base-3.3.1/src/main/summary.c	2016-03-16 23:04:15.000000000 +0000
@@ -24,9 +24,12 @@
 
 #include <Defn.h>
 #include <Internal.h>
+#include <R_ext/Itermacros.h>
 
 #include <float.h> // for DBL_MAX
 
+#include "duplicate.h"
+
 #define R_MSG_type	_("invalid 'type' (%s) of argument")
 #define imax2(x, y) ((x < y) ? y : x)
 
@@ -404,6 +407,7 @@
 	/* updated := 1 , as soon as (i)tmp (do_summary),
 	   or *value ([ir]min / max) is assigned */
 
+    checkArity(op, args);
     if(PRIMVAL(op) == 1) { /* mean */
 	LDOUBLE s = 0., si = 0., t = 0., ti = 0.;
 	R_xlen_t i, n = XLENGTH(CAR(args));
@@ -906,15 +910,15 @@
     checkArity(op, args);
     v = CAR(args);
     if (!isLogical(v))
-        error(_("argument to 'which' is not logical"));
+	error(_("argument to 'which' is not logical"));
     len = length(v);
     buf = (int *) R_alloc(len, sizeof(int));
 
     for (i = 0; i < len; i++) {
-        if (LOGICAL(v)[i] == TRUE) {
-            buf[j] = i + 1;
-            j++;
-        }
+	if (LOGICAL(v)[i] == TRUE) {
+	    buf[j] = i + 1;
+	    j++;
+	}
     }
 
     len = j;
@@ -922,13 +926,13 @@
     if(len) memcpy(INTEGER(ans), buf, sizeof(int) * len);
 
     if ((v_nms = getAttrib(v, R_NamesSymbol)) != R_NilValue) {
-        PROTECT(ans_nms = allocVector(STRSXP, len));
-        for (i = 0; i < len; i++) {
-            SET_STRING_ELT(ans_nms, i,
-                           STRING_ELT(v_nms, INTEGER(ans)[i] - 1));
-        }
-        setAttrib(ans, R_NamesSymbol, ans_nms);
-        UNPROTECT(1);
+	PROTECT(ans_nms = allocVector(STRSXP, len));
+	for (i = 0; i < len; i++) {
+	    SET_STRING_ELT(ans_nms, i,
+			   STRING_ELT(v_nms, INTEGER(ans)[i] - 1));
+	}
+	setAttrib(ans, R_NamesSymbol, ans_nms);
+	UNPROTECT(1);
     }
     UNPROTECT(1);
     return ans;
@@ -942,7 +946,7 @@
 {
     SEXP a, x, ans;
     int narm;
-    R_xlen_t i, n, len;
+    R_xlen_t i, n, len, i1;
     SEXPTYPE type, anstype;
 
     narm = asLogical(CAR(args));
@@ -1008,15 +1012,15 @@
 	PROTECT(x = coerceVector(CAR(args), anstype));
 	r = INTEGER(x);
 	n = XLENGTH(x);
-	for(i = 0; i < len; i++) ra[i] = r[i % n];
+	xcopyIntegerWithRecycle(ra, r, 0, len, n);
 	UNPROTECT(1);
 	for(a = CDR(args); a != R_NilValue; a = CDR(a)) {
 	    x = CAR(a);
 	    PROTECT(x = coerceVector(CAR(a), anstype));
 	    n = XLENGTH(x);
 	    r = INTEGER(x);
-	    for(i = 0; i < len; i++) {
-		tmp = r[i % n];
+	    MOD_ITERATE1(len, n, i, i1, {
+		tmp = r[i1];
 		if(PRIMVAL(op) == 1) {
 		    if( (narm && ra[i] == NA_INTEGER) ||
 			(ra[i] != NA_INTEGER && tmp != NA_INTEGER
@@ -1030,7 +1034,7 @@
 			(!narm && tmp == NA_INTEGER) )
 			ra[i] = tmp;
 		}
-	    }
+	    });
 	    UNPROTECT(1);
 	}
     }
@@ -1041,14 +1045,14 @@
 	PROTECT(x = coerceVector(CAR(args), anstype));
 	r = REAL(x);
 	n = XLENGTH(x);
-	for(i = 0; i < len; i++) ra[i] = r[i % n];
+	xcopyRealWithRecycle(ra, r, 0, len, n);
 	UNPROTECT(1);
 	for(a = CDR(args); a != R_NilValue; a = CDR(a)) {
 	    PROTECT(x = coerceVector(CAR(a), anstype));
 	    n = XLENGTH(x);
 	    r = REAL(x);
-	    for(i = 0; i < len; i++) {
-		tmp = r[i % n];
+	    MOD_ITERATE1(len, n, i, i1, {
+		tmp = r[i1];
 		if(PRIMVAL(op) == 1) {
 		    if( (narm && ISNAN(ra[i])) ||
 			(!ISNAN(ra[i]) && !ISNAN(tmp) && tmp > ra[i]) ||
@@ -1060,7 +1064,7 @@
 			(!narm && ISNAN(tmp)) )
 			ra[i] = tmp;
 		}
-	    }
+	    });
 	    UNPROTECT(1);
 	}
     }
@@ -1069,14 +1073,14 @@
     {
 	PROTECT(x = coerceVector(CAR(args), anstype));
 	n = XLENGTH(x);
-	for(i = 0; i < len; i++) SET_STRING_ELT(ans, i, STRING_ELT(x, i % n));
+	xcopyStringWithRecycle(ans, x, 0, len, n);
 	UNPROTECT(1);
 	for(a = CDR(args); a != R_NilValue; a = CDR(a)) {
 	    SEXP tmp, t2;
 	    PROTECT(x = coerceVector(CAR(a), anstype));
 	    n = XLENGTH(x);
-	    for(i = 0; i < len; i++) {
-		tmp = STRING_ELT(x, i % n);
+	    MOD_ITERATE1(len, n, i, i1, {
+		tmp = STRING_ELT(x, i1);
 		t2 = STRING_ELT(ans, i);
 		if(PRIMVAL(op) == 1) {
 		    if( (narm && t2 == NA_STRING) ||
@@ -1089,7 +1093,7 @@
 			(!narm && tmp == NA_STRING) )
 			SET_STRING_ELT(ans, i, tmp);
 		}
-	    }
+	    });
 	    UNPROTECT(1);
 	}
     }
diff -Nru r-base-3.2.3/src/main/sysutils.c r-base-3.3.1/src/main/sysutils.c
--- r-base-3.2.3/src/main/sysutils.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/sysutils.c	2016-03-16 23:04:17.000000000 +0000
@@ -255,7 +255,7 @@
     if (n2 < 1)
 	error(_("no 'tempdir'"));
     if (n3 < 1)
-        error(_("no 'fileext'"));
+	error(_("no 'fileext'"));
     slen = (n1 > n2) ? n1 : n2;
     slen = (n3 > slen) ? n3 : slen;
     PROTECT(ans = allocVector(STRSXP, slen));
@@ -275,8 +275,9 @@
 FILE *R_popen(const char *command, const char *type)
 {
     FILE *fp;
-#ifdef __APPLE__
+#ifdef OLD__APPLE__
     /* Luke recommends this to fix PR#1140 */
+    /* As of 2016-01-06 on El Capitan this may no longer be needed -- LT */
     sigset_t ss;
     sigemptyset(&ss);
     sigaddset(&ss, SIGPROF);
@@ -297,16 +298,21 @@
 {
     int res;
 #ifdef __APPLE__
+# ifdef OLD__APPLE__
     /* Luke recommends this to fix PR#1140 */
+    /* As of 2016-01-06 on El Capitan this may no longer be needed -- LT */
     sigset_t ss;
     sigemptyset(&ss);
     sigaddset(&ss, SIGPROF);
     sigprocmask(SIG_BLOCK, &ss,  NULL);
+# endif
 #ifdef HAVE_AQUA
     if(ptr_CocoaSystem) res = ptr_CocoaSystem(command); else
 #endif
     res = system(command);
+# ifdef OLD__APPLE__
     sigprocmask(SIG_UNBLOCK, &ss, NULL);
+# endif
 #else // not APPLE
     res = system(command);
 #endif
@@ -630,14 +636,14 @@
 		PROTECT(ans = duplicate(x));
 	    else {
 		PROTECT(ans = allocVector(STRSXP, LENGTH(x)));
-		DUPLICATE_ATTRIB(ans, x);
+		SHALLOW_DUPLICATE_ATTRIB(ans, x);
 	    }
 	} else {
 	    if(TYPEOF(x) != STRSXP)
 		error(_("'x' must be a character vector"));
 	    if(toRaw) {
 		PROTECT(ans = allocVector(VECSXP, LENGTH(x)));
-		DUPLICATE_ATTRIB(ans, x);
+		SHALLOW_DUPLICATE_ATTRIB(ans, x);
 	    } else
 		PROTECT(ans = duplicate(x));
 	}
@@ -649,7 +655,7 @@
 		    if (!toRaw) SET_STRING_ELT(ans, i, NA_STRING);
 		    continue;
 		} else if (TYPEOF(si) != RAWSXP)
-		    error(_("'x' must be a list of NULL or raw vectors"));
+		    error(_("'x' must be a character vector or a list of NULL or raw vectors"));
 	    } else {
 		si = STRING_ELT(x, i);
 		if (si == NA_STRING) {
@@ -788,15 +794,15 @@
 
     if (IS_ASCII(x)) return NT_NONE;
     if (IS_UTF8(x)) {
-        if (utf8locale || x == NA_STRING) return NT_NONE;
-        return NT_FROM_UTF8;
+	if (utf8locale || x == NA_STRING) return NT_NONE;
+	return NT_FROM_UTF8;
     }
     if (IS_LATIN1(x)) {
-        if (x == NA_STRING || latin1locale) return NT_NONE;
-        return NT_FROM_LATIN1;
+	if (x == NA_STRING || latin1locale) return NT_NONE;
+	return NT_FROM_LATIN1;
     }
     if (IS_BYTES(x))
-        error(_("translating strings with \"bytes\" encoding is not allowed"));
+	error(_("translating strings with \"bytes\" encoding is not allowed"));
     return NT_NONE;
 }
 
@@ -806,10 +812,10 @@
 /* Translates string in "ans" to native encoding returning it as string
    buffer "cbuff" */
 static void translateToNative(const char *ans, R_StringBuffer *cbuff,
-                              nttype_t ttype) {
+			      nttype_t ttype) {
 
     if (ttype == NT_NONE)
-        error(_("internal error: no translation needed"));
+	error(_("internal error: no translation needed"));
 
     void * obj;
     const char *inbuf;
@@ -825,7 +831,7 @@
 		error(_("unsupported conversion from '%s' in codepage %d"),
 		      "latin1", localeCP);
 #else
-	        error(_("unsupported conversion from '%s' to '%s'"),
+		error(_("unsupported conversion from '%s' to '%s'"),
 		      "latin1", "");
 #endif
 	    latin1_obj = obj;
@@ -840,7 +846,7 @@
 		error(_("unsupported conversion from '%s' in codepage %d"),
 		      "latin1", localeCP);
 #else
-	        error(_("unsupported conversion from '%s' to '%s'"),
+		error(_("unsupported conversion from '%s' to '%s'"),
 		      "latin1", "");
 #endif
 	    utf8_obj = obj;
@@ -1378,7 +1384,7 @@
 	    char tocode[128];
 	    /* locale set fuzzy case */
 	    strncpy(tocode, locale2charset(NULL), sizeof(tocode));
-            tocode[sizeof(tocode) - 1] = '\0';
+	    tocode[sizeof(tocode) - 1] = '\0';
 	    if((void *)(-1) == (cd = Riconv_open(tocode, UNICODE)))
 		return (size_t)(-1);
 #else
diff -Nru r-base-3.2.3/src/main/times.c r-base-3.3.1/src/main/times.c
--- r-base-3.2.3/src/main/times.c	2015-08-25 22:18:42.000000000 +0000
+++ r-base-3.3.1/src/main/times.c	2016-03-16 23:04:16.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2014  The R Core Team.
+ *  Copyright (C) 2000-2015  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -126,7 +126,7 @@
     /* No known current OSes */
     /* Disallowed by POSIX (1988-):
        http://www.mail-archive.com/leapsecs@rom.usno.navy.mil/msg00109.html
-       http://en.wikipedia.org/wiki/Unix_time
+       https://en.wikipedia.org/wiki/Unix_time
     */
     if (!ISNAN(ans)) {
 	ans -= n_leapseconds;
@@ -137,6 +137,7 @@
 
 SEXP attribute_hidden do_systime(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    checkArity(op, args);
     return ScalarReal(currentTime());
 }
 
diff -Nru r-base-3.2.3/src/main/unique.c r-base-3.3.1/src/main/unique.c
--- r-base-3.2.3/src/main/unique.c	2015-08-25 22:18:39.000000000 +0000
+++ r-base-3.3.1/src/main/unique.c	2016-05-09 22:15:09.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -122,19 +122,25 @@
 #endif
 }
 
+static Rcomplex unify_complex_na(Rcomplex z) {
+    Rcomplex ans;
+    ans.r = (z.r == 0.0) ? 0.0 : z.r;
+    ans.i = (z.i == 0.0) ? 0.0 : z.i;
+    /* we want all NaNs except NA equal, and all NAs equal */
+    if (R_IsNA(ans.r)) ans.r = NA_REAL;
+    else if (R_IsNaN(ans.r)) ans.r = R_NaN;
+    if (R_IsNA(ans.i)) ans.i = NA_REAL;
+    else if (R_IsNaN(ans.i)) ans.i = R_NaN;
+    return ans;
+}
+
 static hlen chash(SEXP x, R_xlen_t indx, HashData *d)
 {
-    Rcomplex tmp;
-    unsigned int u;
-    tmp.r = (COMPLEX(x)[indx].r == 0.0) ? 0.0 : COMPLEX(x)[indx].r;
-    tmp.i = (COMPLEX(x)[indx].i == 0.0) ? 0.0 : COMPLEX(x)[indx].i;
-    /* we want all NaNs except NA equal, and all NAs equal */
-    if (R_IsNA(tmp.r)) tmp.r = NA_REAL;
-    else if (R_IsNaN(tmp.r)) tmp.r = R_NaN;
-    if (R_IsNA(tmp.i)) tmp.i = NA_REAL;
-    else if (R_IsNaN(tmp.i)) tmp.i = R_NaN;
+    Rcomplex tmp = unify_complex_na(COMPLEX(x)[indx]);
+
 #if 2*SIZEOF_INT == SIZEOF_DOUBLE
     {
+	unsigned int u;
 	union foo tmpu;
 	tmpu.d = tmp.r;
 	u = tmpu.u[0] ^ tmpu.u[1];
@@ -199,23 +205,29 @@
     else return 0;
 }
 
-static int cequal(SEXP x, R_xlen_t i, SEXP y, R_xlen_t j)
-{
-    if (i < 0 || j < 0) return 0;
-    if (!ISNAN(COMPLEX(x)[i].r) && !ISNAN(COMPLEX(x)[i].i)
-       && !ISNAN(COMPLEX(y)[j].r) && !ISNAN(COMPLEX(y)[j].i))
-	return COMPLEX(x)[i].r == COMPLEX(y)[j].r &&
-	    COMPLEX(x)[i].i == COMPLEX(y)[j].i;
-    else if ((R_IsNA(COMPLEX(x)[i].r) || R_IsNA(COMPLEX(x)[i].i))
-	    && (R_IsNA(COMPLEX(y)[j].r) || R_IsNA(COMPLEX(y)[j].i)))
+/* This is differentiating {NA,1}, {NA,0}, {NA, NaN}, {NA, NA},
+ * but R's print() and format()  render all as "NA" */
+static int cplx_eq(Rcomplex x, Rcomplex y)
+{
+    if (!ISNAN(x.r) && !ISNAN(x.i) &&
+	!ISNAN(y.r) && !ISNAN(y.i))
+	return x.r == y.r && x.i == y.i;
+    else if ((R_IsNA(x.r) || R_IsNA(x.i)) &&
+	     (R_IsNA(y.r) || R_IsNA(y.i)))
 	return 1;
-    else if ((R_IsNaN(COMPLEX(x)[i].r) || R_IsNaN(COMPLEX(x)[i].i))
-	    && (R_IsNaN(COMPLEX(y)[j].r) || R_IsNaN(COMPLEX(y)[j].i)))
+    else if ((R_IsNaN(x.r) || R_IsNaN(x.i)) &&
+	     (R_IsNaN(y.r) || R_IsNaN(y.i)))
 	return 1;
     else
 	return 0;
 }
 
+static int cequal(SEXP x, R_xlen_t i, SEXP y, R_xlen_t j)
+{
+    if (i < 0 || j < 0) return 0;
+    return cplx_eq(COMPLEX(x)[i], COMPLEX(y)[j]);
+}
+
 static int sequal(SEXP x, R_xlen_t i, SEXP y, R_xlen_t j)
 {
     if (i < 0 || j < 0) return 0;
@@ -824,7 +836,7 @@
     return duplicate(s);
 }
 
-/* currently used by fastmatch */
+// workhorse of R's match() and hence also  " ix %in% itable "
 SEXP match5(SEXP itable, SEXP ix, int nmatch, SEXP incomp, SEXP env)
 {
     SEXP ans, x, table;
@@ -854,6 +866,64 @@
     else type = TYPEOF(x) < TYPEOF(table) ? TYPEOF(table) : TYPEOF(x);
     PROTECT(x	  = coerceVector(x,	type)); nprot++;
     PROTECT(table = coerceVector(table, type)); nprot++;
+
+    // special case scalar x -- for speed only :
+    if(LENGTH(x) == 1 && !incomp && TYPEOF(table) != CPLXSXP) {
+      PROTECT(ans = ScalarInteger(nmatch)); nprot++;
+      switch (type) {
+      case STRSXP: {
+	  SEXP x_val = STRING_ELT(x,0);
+	  for (int i=0; i < LENGTH(itable); i++) if (Seql(STRING_ELT(table,i), x_val)) {
+		  INTEGER(ans)[0] = i + 1; break;
+	      }
+	  break; }
+      case LGLSXP:
+      case INTSXP: {
+	  int x_val = INTEGER(x)[0],
+	      *table_p = INTEGER(table);
+	  for (int i=0; i < LENGTH(itable); i++) if (table_p[i] == x_val) {
+		  INTEGER(ans)[0] = i + 1; break;
+	      }
+	  break; }
+      case REALSXP: {
+	  double x_val = (REAL(x)[0] == 0.) ? 0. : REAL(x)[0],// pblm with signed 0s under IEC60559
+	      *table_p = REAL(table);
+	  /* we want all NaNs except NA equal, and all NAs equal */
+	  if (R_IsNA(x_val)) {
+	      for (int i=0; i < LENGTH(itable); i++) if (R_IsNA(table_p[i])) {
+		      INTEGER(ans)[0] = i + 1; break;
+		  }
+	  }
+	  else if (R_IsNaN(x_val)) {
+	      for (int i=0; i < LENGTH(itable); i++) if (R_IsNaN(table_p[i])) {
+		      INTEGER(ans)[0] = i + 1; break;
+		  }
+	  }
+	  else {
+	      for (int i=0; i < LENGTH(itable); i++) if (table_p[i] == x_val) {
+		      INTEGER(ans)[0] = i + 1; break;
+	      }
+	  }
+	  break; }
+      case CPLXSXP: {
+	  Rcomplex x_val = COMPLEX(x)[0],
+	      *table_p = COMPLEX(table);
+	  for (int i=0; i < LENGTH(itable); i++)
+	      if (cplx_eq(table_p[i], x_val)) {
+		  INTEGER(ans)[0] = i + 1; break;
+	      }
+	  break; }
+      case RAWSXP: {
+	  Rbyte x_val = RAW(x)[0],
+	      *table_p = RAW(table);
+	  for (int i=0; i < LENGTH(itable); i++) if (table_p[i] == x_val) {
+		  INTEGER(ans)[0] = i + 1; break;
+	      }
+	  break; }
+      }
+    }
+    else { // regular case
+
     if (incomp) { PROTECT(incomp = coerceVector(incomp, type)); nprot++; }
     data.nomatch = nmatch;
     HashTableSetup(table, &data, NA_INTEGER);
@@ -900,6 +970,7 @@
     DoHashing(table, &data);
     if (incomp) UndoHashing(incomp, table, &data);
     ans = HashLookup(table, x, &data);
+  }
     UNPROTECT(nprot);
     return ans;
 }
@@ -916,6 +987,7 @@
 }
 
 
+// .Internal(match(x, table, nomatch, incomparables)) :
 SEXP attribute_hidden do_match(SEXP call, SEXP op, SEXP args, SEXP env)
 {
     checkArity(op, args);
@@ -927,11 +999,11 @@
     int nomatch = asInteger(CADDR(args));
     SEXP incomp = CADDDR(args);
 
-    if(length(incomp) && /* S has FALSE to mean empty */
-       !(isLogical(incomp) && length(incomp) == 1 && LOGICAL(incomp)[0] == 0))
-	return match5(CADR(args), CAR(args), nomatch, incomp, env);
+    if (isNull(incomp) || /* S has FALSE to mean empty */
+	(length(incomp) == 1 && isLogical(incomp) && LOGICAL(incomp)[0] == 0))
+	return match5(CADR(args), CAR(args), nomatch, NULL, env);
     else
-	return matchE(CADR(args), CAR(args), nomatch, env);
+	return match5(CADR(args), CAR(args), nomatch, incomp, env);
 }
 
 /* pmatch and charmatch return integer positions, so cannot be used
@@ -1668,12 +1740,14 @@
 
 #include <R_ext/Random.h>
 
+// more fine-grained  unif_rand() for n > INT_MAX
 static R_INLINE double ru()
 {
     double U = 33554432.0;
     return (floor(U*unif_rand()) + unif_rand())/U;
 }
 
+// sample.int(.) --> .Internal(sample2(n, size)) :
 SEXP attribute_hidden do_sample2(SEXP call, SEXP op, SEXP args, SEXP env)
 {
     checkArity(op, args);
diff -Nru r-base-3.2.3/src/main/util.c r-base-3.3.1/src/main/util.c
--- r-base-3.2.3/src/main/util.c	2015-08-25 22:18:40.000000000 +0000
+++ r-base-3.3.1/src/main/util.c	2016-03-16 23:04:15.000000000 +0000
@@ -138,8 +138,7 @@
 
 SEXP asChar(SEXP x)
 {
-    if (XLENGTH(x) >= 1) {
-	if (isVectorAtomic(x)) {
+	if (isVectorAtomic(x) && XLENGTH(x) >= 1) {
 	    int w, d, e, wi, di, ei;
 	    char buf[MAXELTSIZE];  /* Probably 100 would suffice */
 
@@ -148,9 +147,9 @@
 		if (LOGICAL(x)[0] == NA_LOGICAL)
 		    return NA_STRING;
 		if (LOGICAL(x)[0])
-		    sprintf(buf, "T");
+		    sprintf(buf, "TRUE");
 		else
-		    sprintf(buf, "F");
+		    sprintf(buf, "FALSE");
 		return mkChar(buf);
 	    case INTSXP:
 		if (INTEGER(x)[0] == NA_INTEGER)
@@ -174,7 +173,6 @@
 	    return x;
 	} else if(TYPEOF(x) == SYMSXP)
 	    return PRINTNAME(x);
-    }
     return NA_STRING;
 }
 
@@ -263,35 +261,35 @@
 
     /* Type2Table */
     for (int type = 0; type < MAX_NUM_SEXPTYPE; type++) {
-        int j = findTypeInTypeTable(type);
+	int j = findTypeInTypeTable(type);
 
-        if (j != -1) {
-            const char *cstr = TypeTable[j].str;
-            SEXP rchar = PROTECT(mkChar(cstr));
-            SEXP rstr = ScalarString(rchar);
-            MARK_NOT_MUTABLE(rstr);
-            R_PreserveObject(rstr);
-            UNPROTECT(1); /* rchar */
-            SEXP rsym = install(cstr);
-
-            Type2Table[type].cstrName = cstr;
-            Type2Table[type].rcharName = rchar;
-            Type2Table[type].rstrName = rstr;
-            Type2Table[type].rsymName = rsym;
-        } else {
-            Type2Table[type].cstrName = NULL;
-            Type2Table[type].rcharName = NULL;
-            Type2Table[type].rstrName = NULL;
-            Type2Table[type].rsymName = NULL;
-        }
+	if (j != -1) {
+	    const char *cstr = TypeTable[j].str;
+	    SEXP rchar = PROTECT(mkChar(cstr));
+	    SEXP rstr = ScalarString(rchar);
+	    MARK_NOT_MUTABLE(rstr);
+	    R_PreserveObject(rstr);
+	    UNPROTECT(1); /* rchar */
+	    SEXP rsym = install(cstr);
+
+	    Type2Table[type].cstrName = cstr;
+	    Type2Table[type].rcharName = rchar;
+	    Type2Table[type].rstrName = rstr;
+	    Type2Table[type].rsymName = rsym;
+	} else {
+	    Type2Table[type].cstrName = NULL;
+	    Type2Table[type].rcharName = NULL;
+	    Type2Table[type].rstrName = NULL;
+	    Type2Table[type].rsymName = NULL;
+	}
     }
 }
 
 SEXP type2str_nowarn(SEXPTYPE t) /* returns a CHARSXP */
 {
     if (t < MAX_NUM_SEXPTYPE) { /* FIXME: branch not really needed */
-        SEXP res = Type2Table[t].rcharName;
-        if (res != NULL) return res;
+	SEXP res = Type2Table[t].rcharName;
+	if (res != NULL) return res;
     }
     return R_NilValue;
 }
@@ -300,7 +298,7 @@
 {
     SEXP s = type2str_nowarn(t);
     if (s != R_NilValue) {
-        return s;
+	return s;
     }
     warning(_("type %d is unimplemented in '%s'"), t, "type2str");
     char buf[50];
@@ -311,8 +309,8 @@
 SEXP type2rstr(SEXPTYPE t) /* returns a STRSXP */
 {
     if (t < MAX_NUM_SEXPTYPE) { /* FIXME: branch not really needed */
-        SEXP res = Type2Table[t].rstrName;
-        if (res != NULL) return res;
+	SEXP res = Type2Table[t].rstrName;
+	if (res != NULL) return res;
     }
     error(_("type %d is unimplemented in '%s'"), t,
 	  "type2ImmutableScalarString");
@@ -322,8 +320,8 @@
 const char *type2char(SEXPTYPE t) /* returns a char* */
 {
     if (t < MAX_NUM_SEXPTYPE) { /* FIXME: branch not really needed */
-        const char * res = Type2Table[t].cstrName;
-        if (res != NULL) return res;
+	const char * res = Type2Table[t].cstrName;
+	if (res != NULL) return res;
     }
     warning(_("type %d is unimplemented in '%s'"), t, "type2char");
     static char buf[50];
@@ -335,10 +333,10 @@
 SEXP NORET type2symbol(SEXPTYPE t)
 {
     if (t >= 0 && t < MAX_NUM_SEXPTYPE) { /* FIXME: branch not really needed */
-        SEXP res = Type2Table[t].rsymName;
-        if (res != NULL) {
-            return res;
-        }
+	SEXP res = Type2Table[t].rsymName;
+	if (res != NULL) {
+	    return res;
+	}
     }
     error(_("type %d is unimplemented in '%s'"), t, "type2symbol");
 }
@@ -653,8 +651,12 @@
     isort_with_index(INTEGER(yi), iy, ny);
 
     /* 1. determine result sizes */
-    for (i = 0; i < nx; i++) if (INTEGER(xi)[i] > 0) break; nx_lone = i;
-    for (i = 0; i < ny; i++) if (INTEGER(yi)[i] > 0) break; ny_lone = i;
+    for (i = 0; i < nx; i++) 
+	if (INTEGER(xi)[i] > 0) break; 
+    nx_lone = i;
+    for (i = 0; i < ny; i++) 
+	if (INTEGER(yi)[i] > 0) break;
+    ny_lone = i;
     double dnans = 0;
     for (i = nx_lone, j = ny_lone; i < nx; i = nnx, j = nny) {
 	int tmp = INTEGER(xi)[i];
@@ -1369,6 +1371,39 @@
     return valid_utf8(str, strlen(str)) == 0;
 }
 
+SEXP attribute_hidden do_validUTF8(SEXP call, SEXP op, SEXP args, SEXP rho)
+{
+    checkArity(op, args);
+    SEXP x = CAR(args);
+    if (!isString(x))
+	error(_("invalid '%s' argument"), "x");
+    R_xlen_t n = XLENGTH(x);
+    SEXP ans = allocVector(LGLSXP, n); // no allocation below
+    int *lans = LOGICAL(ans);
+    for (R_xlen_t i = 0; i < n; i++)
+	lans[i] = utf8Valid(CHAR(STRING_ELT(x, i)));
+    return ans;
+}
+
+SEXP attribute_hidden do_validEnc(SEXP call, SEXP op, SEXP args, SEXP rho)
+{
+    checkArity(op, args);
+    SEXP x = CAR(args);
+    if (!isString(x))
+	error(_("invalid '%s' argument"), "x");
+    R_xlen_t n = XLENGTH(x);
+    SEXP ans = allocVector(LGLSXP, n); // no allocation below
+    int *lans = LOGICAL(ans);
+    for (R_xlen_t i = 0; i < n; i++) {
+	SEXP p = STRING_ELT(x, i);
+	if (IS_BYTES(p) || IS_LATIN1(p)) lans[i] = 1;
+	else if (IS_UTF8(p) || utf8locale) lans[i] = utf8Valid(CHAR(p));
+	else if(mbcslocale) lans[i] = mbcsValid(CHAR(p));
+	else lans[i] = 1;
+    }
+    return ans;
+}
+
 
 /* MBCS-aware versions of common comparisons.  Only used for ASCII c */
 char *Rf_strchr(const char *s, int c)
@@ -1992,7 +2027,7 @@
     checkArity(op, args);
 
     if (collationLocaleSet == 2) {
-        ans = "ASCII";
+	ans = "ASCII";
     } else if(collator) {
 	UErrorCode  status = U_ZERO_ERROR;
 	int type = asInteger(CAR(args));
@@ -2019,7 +2054,7 @@
 	if (strcmp("C", getLocale()) ) {
 #else
 	const char *p = getenv("R_ICU_LOCALE");
-        if(p && p[0]) {
+	if(p && p[0]) {
 #endif
 	    UErrorCode status = U_ZERO_ERROR;
 	    uloc_setDefault(getLocale(), &status);
@@ -2188,15 +2223,19 @@
     return ans;
 }
 
-/* x can be a long vector but xt cannot since the result is integer */
+/* .Internal(findInterval(vec, x, rightmost.closed, all.inside,  left.open))
+ *                         xt  x    right             inside       leftOp
+ * x can be a long vector but xt cannot since the result is integer
+*/
 SEXP attribute_hidden do_findinterval(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
-    SEXP xt, x, right, inside;
+    SEXP xt, x, right, inside, leftOp;
     xt = CAR(args); args = CDR(args);
     x = CAR(args); args = CDR(args);
     right = CAR(args); args = CDR(args);
-    inside = CAR(args);
+    inside = CAR(args);args = CDR(args);
+    leftOp = CAR(args);
     if(TYPEOF(xt) != REALSXP || TYPEOF(x) != REALSXP) error("invalid input");
 #ifdef LONG_VECTOR_SUPPORT
     if (IS_LONG_VEC(xt))
@@ -2205,7 +2244,7 @@
     int n = LENGTH(xt);
     if (n == NA_INTEGER) error(_("invalid '%s' argument"), "vec");
     R_xlen_t nx = XLENGTH(x);
-    int sr = asLogical(right), si = asLogical(inside);
+    int sr = asLogical(right), si = asLogical(inside), lO = asLogical(leftOp);
     if (sr == NA_INTEGER)
 	error(_("invalid '%s' argument"), "rightmost.closed");
     if (si == NA_INTEGER)
@@ -2214,10 +2253,11 @@
     double *rxt = REAL(xt), *rx = REAL(x);
     int ii = 1;
     for(int i = 0; i < nx; i++) {
-	if (ISNAN(REAL(x)[i])) ii = NA_INTEGER;
+	if (ISNAN(rx[i]))
+	    ii = NA_INTEGER;
 	else {
-	    int mfl = si;
-	    ii = findInterval(rxt, n, rx[i], sr, si, ii, &mfl);
+	    int mfl;
+	    ii = findInterval2(rxt, n, rx[i], sr, si, lO, ii, &mfl); // -> ../appl/interv.c
 	}
 	INTEGER(ans)[i] = ii;
     }
@@ -2270,7 +2310,7 @@
 
 /*
     r <- .Internal(formatC(x, as.character(mode), width, digits,
-                   as.character(format), as.character(flag), i.strlen))
+		   as.character(format), as.character(flag), i.strlen))
 */
 
 static void
diff -Nru r-base-3.2.3/src/main/valid_utf8.h r-base-3.3.1/src/main/valid_utf8.h
--- r-base-3.2.3/src/main/valid_utf8.h	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/valid_utf8.h	2016-03-16 23:04:17.000000000 +0000
@@ -93,7 +93,7 @@
 	    /* 2-byte character. No further bytes to check for
 	       0x80. Check first byte for for xx00 000x (overlong
 	       sequence). */
-	case 1:
+	case 1: 
 	    if ((c & 0x3e) == 0) return 1;
 	    break;
 
diff -Nru r-base-3.2.3/src/main/xspline.c r-base-3.3.1/src/main/xspline.c
--- r-base-3.2.3/src/main/xspline.c	2015-08-25 22:18:44.000000000 +0000
+++ r-base-3.3.1/src/main/xspline.c	2016-03-16 23:04:17.000000000 +0000
@@ -313,7 +313,7 @@
    * It is possible for origin and extremity to be very remote
    * indeed (if the control points are located WAY off the device).
    * In order to avoid having ridiculously many steps, limit
-   * the start_to_end_dist to being the length of the diagonal of the
+   * the start_to_end_dist to being the length of the diagonal of the 
    * device.
    */
   devWidth = fromDeviceWidth(toDeviceWidth(1, GE_NDC, dd),
diff -Nru r-base-3.2.3/src/modules/internet/internet.c r-base-3.3.1/src/modules/internet/internet.c
--- r-base-3.2.3/src/modules/internet/internet.c	2015-08-26 22:15:11.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/internet.c	2016-04-09 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2015   The R Core Team.
+ *  Copyright (C) 2000-2016   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@
     switch(type) {
 #ifdef Win32
     case HTTPSsh:
-	    warning(_("for https:// URLs use setInternet2(TRUE)"));
+	    warning(_("for https:// URLs use method = \"wininet\""));
 	    return FALSE;
 #endif
     case HTTPsh:
@@ -150,7 +150,7 @@
 	break;
 
     default:
-	warning(_("URL scheme unsupported by this method"));
+	warning(_("scheme not supported in URL '%s'"), url);
 	return FALSE;
     }
 
@@ -271,7 +271,7 @@
 	break;
 
     default:
-	warning(_("URL scheme unsupported by this method"));
+	warning(_("scheme not supported in URL '%s'"), url);
 	return FALSE;
     }
 
@@ -470,12 +470,13 @@
     cacheOK = asLogical(CAR(args));
     if(cacheOK == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "cacheOK");
+    Rboolean file_URL = (strncmp(url, "file://", 7) == 0);
 #ifdef Win32
     int meth = asLogical(CADR(args));
     if(meth == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "method");
-    if(meth == 0) meth = UseInternet2;
-    if (R_Interactive && !quiet && !pbar.wprog) {
+//    if(meth == 0) meth = UseInternet2;
+    if (!file_URL && R_Interactive && !quiet && !pbar.wprog) {
 	pbar.wprog = newwindow(_("Download progress"), rect(0, 0, 540, 100),
 			       Titlebar | Centered);
 	setbackground(pbar.wprog, dialog_bg());
@@ -484,7 +485,7 @@
 	pbar.pc = 0;
     }
 #endif
-    if(strncmp(url, "file://", 7) == 0) {
+    if(file_URL) {
 	FILE *in, *out;
 	static char buf[CPBUFSIZE];
 	size_t n;
@@ -495,7 +496,7 @@
 	if (strlen(url) > 9 && url[7] == '/' && url[9] == ':') nh = 8;
 #endif
 
-	/* Use binary transfers */
+	/* Use binary transfers? */
 	in = R_fopen(R_ExpandFileName(url+nh), (mode[2] == 'b') ? "rb" : "r");
 	if(!in) {
 	    error(_("cannot open URL '%s', reason '%s'"),
@@ -514,7 +515,6 @@
 	}
 	fclose(out); fclose(in);
 
-#ifdef HAVE_INTERNET
     } else if (strncmp(url, "http://", 7) == 0
 #ifdef Win32
 	       || ((strncmp(url, "https://", 8) == 0) && meth)
@@ -754,17 +754,13 @@
 	R_Busy(0);
 	fclose(out);
 	if (status == 1) error(_("cannot open URL '%s'"), url);
-#endif
-
     } else
-	error(_("unsupported URL scheme"));
+	error(_("scheme not supported in URL '%s'"), url);
 
     return ScalarInteger(status);
 }
 
 
-#if defined(SUPPORT_LIBXML)
-
 void *in_R_HTTPOpen(const char *url, const char *headers, const int cacheOK)
 {
     inetconn *con;
@@ -869,7 +865,6 @@
 	free(ctx);
     }
 }
-#endif /* SUPPORT_LIBXML */
 
 
 #ifdef Win32
@@ -888,7 +883,7 @@
 			    const int cacheOK)
 {
     WIctxt  wictxt;
-    DWORD status, d1 = 4, d2 = 0, d3 = 100;
+    DWORD status = 0, len = 0, d1 = 4, d2 = 0, d3 = 100;
     char buf[101], *p;
 
     wictxt = (WIctxt) malloc(sizeof(wIctxt));
@@ -902,7 +897,7 @@
 	return NULL;
     }
 
-    // use keep-alive semantics, do not use local WinInet cache.
+    // use keep-alive semantics, do not use local WinINet cache.
     DWORD flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_NO_CACHE_WRITE;
     if(!cacheOK) flags |= INTERNET_FLAG_PRAGMA_NOCACHE;
     wictxt->session = InternetOpenUrl(wictxt->hand, url, NULL, 0, flags, 0);
@@ -955,20 +950,22 @@
 		  HTTP_QUERY_CONTENT_TYPE, &buf, &d3, &d2);
     d2 = 0;
     // NB: this can only retrieve in a DWORD, so up to 2GB or 4GB?
-    HttpQueryInfo(wictxt->session,
-		  HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER,
-		  &status, &d1, &d2);
-    wictxt->length = status;
+    if (HttpQueryInfo(wictxt->session,
+		      HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER,
+		      &len, &d1, &d2))
+	wictxt->length = len;
     wictxt->type = strdup(buf);
     if(!IDquiet) {
-	if(status > 1024*1024)
-	    REprintf("Content type '%s' length %0.0f bytes (%0.1f MB)\n",
-		     buf, (double) status, status/1024.0/1024.0);
-	else if(status > 10240)
-	    REprintf("Content type '%s' length %d bytes (%d KB)\n",
-		     buf, (int) status, (int) (status/1024));
-	else
-	    REprintf("Content type '%s' length %d bytes\n", buf, (int) status);
+	REprintf("Content type '%s'", buf);
+	if(len > 1024*1024)
+	    REprintf(" length %0.0f bytes (%0.1f MB)\n", (double)len,
+		     len/1024.0/1024.0);
+	else if(len > 10240)
+	    REprintf(" length %d bytes (%d KB)\n", 
+		     (int)len, (int)(len/1024));
+	else if(wictxt->length >= 0) /* signed; len is not */
+	    REprintf(" length %d bytes\n", (int)len);
+	else REprintf(" length unknown\n", len);
 	R_FlushConsole();
     }
 
@@ -1039,37 +1036,6 @@
 }
 #endif // Win32
 
-#ifndef HAVE_INTERNET
-static void *in_R_HTTPOpen(const char *url, const char *headers,
-			   const int cacheOK)
-{
-    return NULL;
-}
-
-static int in_R_HTTPRead(void *ctx, char *dest, int len)
-{
-    return -1;
-}
-
-static void in_R_HTTPClose(void *ctx)
-{
-}
-
-static void *in_R_FTPOpen(const char *url)
-{
-    return NULL;
-}
-
-static int in_R_FTPRead(void *ctx, char *dest, int len)
-{
-    return -1;
-}
-
-static void in_R_FTPClose(void *ctx)
-{
-}
-#endif
-
 
 #define MBUFSIZE 8192
 void RxmlMessage(int level, const char *format, ...)
diff -Nru r-base-3.2.3/src/modules/internet/libcurl.c r-base-3.3.1/src/modules/internet/libcurl.c
--- r-base-3.2.3/src/modules/internet/libcurl.c	2015-09-04 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/libcurl.c	2016-03-16 23:04:24.000000000 +0000
@@ -29,7 +29,7 @@
 #include <Fileio.h>
 #include <errno.h>
 
-#ifdef HAVE_CURL_CURL_H
+#ifdef HAVE_LIBCURL
 # include <curl/curl.h>
 /*
   This need libcurl >= 7.28.0 (Oct 2012) for curl_multi_wait.
@@ -45,7 +45,7 @@
 {
     checkArity(op, args);
     SEXP ans = PROTECT(allocVector(STRSXP, 1));
-#ifdef HAVE_CURL_CURL_H
+#ifdef HAVE_LIBCURL
     curl_version_info_data *d = curl_version_info(CURLVERSION_NOW);
     SET_STRING_ELT(ans, 0, mkChar(d->version));
     SEXP sSSLVersion = install("ssl_version");
@@ -69,8 +69,105 @@
     return ans;
 }
 
+#ifdef HAVE_LIBCURL
+static const char *http_errstr(const long status)
+{
+    const char *str;
+    switch(status) {
+    case 400: str = "Bad Request"; break;
+    case 401: str = "Unauthorized"; break;
+    case 402: str = "Payment Required"; break;
+    case 403: str = "Forbidden"; break;
+    case 404: str = "Not Found"; break;
+    case 405: str = "Method Not Allowed"; break;
+    case 406: str = "Not Acceptable"; break;
+    case 407: str = "Proxy Authentication Required"; break;
+    case 408: str = "Request Timeout"; break;
+    case 409: str = "Conflict"; break;
+    case 410: str = "Gone"; break;
+    case 411: str = "Length Required"; break;
+    case 412: str = "Precondition Failed"; break;
+    case 413: str = "Request Entity Too Large"; break;
+    case 414: str = "Request-URI Too Long"; break;
+    case 415: str = "Unsupported Media Type"; break;
+    case 416: str = "Requested Range Not Satisfiable"; break;
+    case 417: str = "Expectation Failed"; break;
+    case 500: str = "Internal Server Error"; break;
+    case 501: str = "Not Implemented"; break;
+    case 502: str = "Bad Gateway"; break;
+    case 503: str = "Service Unavailable"; break;
+    case 504: str = "Gateway Timeout"; break;
+    default: str = "Unknown Error"; break;
+    }
+    return str;
+}
+
+static const char *ftp_errstr(const long status)
+{
+    const char *str;
+    switch (status) {
+    case 421: str = "Service not available, closing control connection"; break;
+    case 425: str = "Cannot open data connection"; break;
+    case 426: str = "Connection closed; transfer aborted"; break;
+    case 430: str = "Invalid username or password"; break;
+    case 434: str = "Requested host unavailable"; break;
+    case 450: str = "Requested file action not taken"; break;
+    case 451: str = "Requested action aborted; local error in processing"; break;
+    case 452:
+        str = "Requested action not taken; insufficient storage space in system";
+        break;
+    case 501: str = "Syntax error in parameters or arguments"; break;
+    case 502: str = "Command not implemented"; break;
+    case 503: str = "Bad sequence of commands"; break;
+    case 504: str = "Command not implemented for that parameter"; break;
+    case 530: str = "Not logged in"; break;
+    case 532: str = "Need account for storing files"; break;
+    case 550:
+        str = "Requested action not taken; file unavailable";
+        break;
+    case 551: str = "Requested action aborted; page type unknown"; break;
+    case 552:
+        str = "Requested file action aborted; exceeded storage allocation";
+        break;
+    case 553: str = "Requested action not taken; file name not allowed"; break;
+    default: str = "Unknown Error"; break;
+    }
+    return str;
+}
+
+/*
+  Check curl_multi_info_read for errors, reporting as warnings
+
+  Return: number of errors encountered
+ */
+static int curlMultiCheckerrs(CURLM *mhnd)
+{
+    int retval = 0;
+    for(int n = 1; n > 0;) {
+	CURLMsg *msg = curl_multi_info_read(mhnd, &n);
+	if (msg && (msg->data.result != CURLE_OK)) {
+	    const char *url, *strerr;
+	    long status = 0;
+	    curl_easy_getinfo(msg->easy_handle, CURLINFO_EFFECTIVE_URL, &url);
+	    curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE,
+			      &status);
+	    if (status >= 400) {
+		if (url && url[0] == 'h')
+		    strerr = http_errstr(status);
+		else
+		    strerr = ftp_errstr(status);
+		warning(_("URL '%s': status was '%d %s'"), url, status,
+			strerr);
+	    } else {
+		strerr = curl_easy_strerror(msg->data.result);
+		warning(_("URL '%s': status was '%s'"), url, strerr);
+	    }
+	    retval += 1;
+	}
+    }
+    return retval;
+}
 
-#ifdef HAVE_CURL_CURL_H
 static void curlCommon(CURL *hnd, int redirect, int verify)
 {
     const char *capath = getenv("CURL_CA_BUNDLE");
@@ -139,7 +236,7 @@
 in_do_curlGetHeaders(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
-#ifndef HAVE_CURL_CURL_H
+#ifndef HAVE_LIBCURL
     error(_("curlGetHeaders is not supported on this platform"));
     return R_NilValue;
 #else
@@ -184,7 +281,7 @@
 #endif
 }
 
-#ifdef HAVE_CURL_CURL_H
+#ifdef HAVE_LIBCURL
 static double total;
 
 static int ndashes;
@@ -303,7 +400,7 @@
 in_do_curlDownload(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
-#ifndef HAVE_CURL_CURL_H
+#ifndef HAVE_LIBCURL
     error(_("download.file(method = \"libcurl\") is not supported on this platform"));
     return R_NilValue;
 #else
@@ -344,16 +441,50 @@
     }
 
     CURLM *mhnd = curl_multi_init();
-    int still_running, repeats = 0;
+    int still_running, repeats = 0, n_err = 0;
     CURL **hnd[nurls];
     FILE *out[nurls];
 
     for(int i = 0; i < nurls; i++) {
-	hnd[i] = curl_easy_init();
-	curl_multi_add_handle(mhnd, hnd[i]);
-
+	out[i] = NULL;
 	url = CHAR(STRING_ELT(scmd, i));
+	hnd[i] = curl_easy_init();
 	curl_easy_setopt(hnd[i], CURLOPT_URL, url);
+	curl_easy_setopt(hnd[i], CURLOPT_FAILONERROR, 1L);
+	/* Users will normally expect to follow redirections, although
+	   that is not the default in either curl or libcurl. */
+	curlCommon(hnd[i], 1, 1);
+	curl_easy_setopt(hnd[i], CURLOPT_TCP_KEEPALIVE, 1L);
+	if (!cacheOK)
+	    curl_easy_setopt(hnd[i], CURLOPT_HTTPHEADER, slist1);
+
+	/* check that connection can be opened... */
+	curl_easy_setopt(hnd[i], CURLOPT_NOPROGRESS, 1L);
+	curl_easy_setopt(hnd[i], CURLOPT_NOBODY, 1L);
+	curl_easy_setopt(hnd[i], CURLOPT_HEADERFUNCTION, &rcvHeaders);
+	curl_easy_setopt(hnd[i], CURLOPT_WRITEHEADER, &headers);
+	/* libcurl (at least 7.40.0) does not respect CURLOPT_NOBODY
+	   for some ftp header info (Content-Length and Accept-ranges). */
+	curl_easy_setopt(hnd[i], CURLOPT_WRITEFUNCTION, &rcvBody);
+	CURLcode ret = curl_easy_perform(hnd[i]);
+	curl_multi_add_handle(mhnd, hnd[i]);
+	if (ret != CURLE_OK) {
+	    n_err += 1;
+	    /* warning signalled via curlMultiCheckerrs */
+	    continue;
+	}
+	/* ...and that destfile can be written */
+	file = translateChar(STRING_ELT(sfile, i));
+	out[i] = R_fopen(R_ExpandFileName(file), mode);
+	if (!out[i]) {
+	    n_err += 1;
+	    warning(_("URL %s: cannot open destfile '%s', reason '%s'"),
+		    url, file, strerror(errno));
+	    continue;
+	}
+	curl_easy_setopt(hnd[i], CURLOPT_WRITEFUNCTION, NULL); /* necessary? */
+	curl_easy_setopt(hnd[i], CURLOPT_WRITEDATA, out[i]);
+	curl_easy_setopt(hnd[i], CURLOPT_NOBODY, 0L);
 	curl_easy_setopt(hnd[i], CURLOPT_HEADER, 0L);
 
 	total = 0.;
@@ -389,27 +520,13 @@
 	    // For libcurl >= 7.32.0 use CURLOPT_XFERINFOFUNCTION
 	    curl_easy_setopt(hnd[i], CURLOPT_PROGRESSFUNCTION, progress);
 	    curl_easy_setopt(hnd[i], CURLOPT_PROGRESSDATA, hnd[i]);
-	} else curl_easy_setopt(hnd[i], CURLOPT_NOPROGRESS, 1L);
-
-	/* Users will normally expect to follow redirections, although
-	   that is not the default in either curl or libcurl. */
-	curlCommon(hnd[i], 1, 1);
-	curl_easy_setopt(hnd[i], CURLOPT_TCP_KEEPALIVE, 1L);
-	if (!cacheOK) curl_easy_setopt(hnd[i], CURLOPT_HTTPHEADER, slist1);
+	}
 
 	/* This would allow the negotiation of compressed HTTP transfers,
 	   but it is not clear it is always a good idea.
 	   curl_easy_setopt(hnd[i], CURLOPT_ACCEPT_ENCODING, "gzip, deflate");
 	*/
 
-
-	file = translateChar(STRING_ELT(sfile, i));
-	out[i] = R_fopen(R_ExpandFileName(file), mode);
-	if (!out[i])
-	    error(_("cannot open destfile '%s', reason '%s'"),
-		  file, strerror(errno));
-	curl_easy_setopt(hnd[i], CURLOPT_WRITEDATA, out[i]);
-
 	if (!quiet) REprintf(_("trying URL '%s'\n"), url);
     }
 
@@ -461,26 +578,20 @@
 	    warning(_("downloaded length %0.f != reported length %0.f"), dl, cl);
     }
 
-    // report all the pending messages.
-    for(int n = 1; n > 0;) {
-	CURLMsg *msg = curl_multi_info_read(mhnd, &n);
-	if (msg) {
-	    CURLcode ret = msg->data.result;
-	    if (ret != CURLE_OK) {
-		if (!quiet) REprintf("\n"); // clear progress display
-		error("  %s\n", curl_easy_strerror(ret));
-	    }
-	}
-    }
+    n_err += curlMultiCheckerrs(mhnd);
 
     for (int i = 0; i < nurls; i++) {
-	fclose(out[i]);
+	if (out[i])
+            fclose(out[i]);
 	curl_multi_remove_handle(mhnd, hnd[i]);
 	curl_easy_cleanup(hnd[i]);
     }
     curl_multi_cleanup(mhnd);
     if (!cacheOK) curl_slist_free_all(slist1);
 
+    if (n_err != 0)
+	error(_("cannot download all files"));
+
     return ScalarInteger(0);
 #endif
 }
@@ -505,7 +616,7 @@
 
 #define R_MIN(a, b) ((a) < (b) ? (a) : (b))
 
-#ifdef HAVE_CURL_CURL_H
+#ifdef HAVE_LIBCURL
 typedef struct Curlconn {
     char *buf, *current; // base of buffer, last read address
     size_t bufsize, filled;  // buffer size, amount which has been filled
@@ -550,29 +661,53 @@
     return size;
 }
 
-void fetchData(RCurlconn ctxt)
+/*
+  return: number of errors encountered
+ */
+static int fetchData(RCurlconn ctxt)
 {
     int repeats = 0;
+    CURLM *mhnd = ctxt->mh;
+    
     do {
 	int numfds;
-	CURLMcode mc = curl_multi_wait(ctxt->mh, NULL, 0, 100, &numfds);
+	CURLMcode mc = curl_multi_wait(mhnd, NULL, 0, 100, &numfds);
 	if (mc != CURLM_OK)
 	    error("curl_multi_wait() failed, code %d", mc);
 	if (!numfds) {
 	    if (repeats++ > 0) Rsleep(0.1);
 	} else repeats = 0;
-	curl_multi_perform(ctxt->mh, &ctxt->sr);
+	curl_multi_perform(mhnd, &ctxt->sr);
 	if (ctxt->available) break;
 	R_ProcessEvents();
     } while(ctxt->sr);
 
-    for(int msg = 1; msg > 0;) {
-	CURLMsg *out = curl_multi_info_read(ctxt->mh, &msg);
-	if (out) {
-	    CURLcode ret = out->data.result;
-	    if (ret != CURLE_OK) error(curl_easy_strerror(ret));
-	}
-    }
+    return curlMultiCheckerrs(mhnd);
+}
+
+static void Curl_close(Rconnection con)
+{
+    RCurlconn ctxt = (RCurlconn)(con->private);
+
+    curl_multi_remove_handle(ctxt->mh, ctxt->hnd);
+    curl_easy_cleanup(ctxt->hnd);
+    curl_multi_cleanup(ctxt->mh);
+    con->isopen = FALSE;
+}
+
+static void Curl_destroy(Rconnection con)
+{
+    RCurlconn ctxt;
+
+    if (NULL == con)
+        return;
+    ctxt = (RCurlconn)(con->private);
+
+    if (NULL == ctxt)
+        return;
+
+    free(ctxt->buf);
+    free(ctxt);
 }
 
 static size_t Curl_read(void *ptr, size_t size, size_t nitems,
@@ -582,10 +717,15 @@
     size_t nbytes = size*nitems;
     char *p = (char *) ptr;
     size_t total = consumeData(ptr, nbytes, ctxt);
+    int n_err = 0;
     while((total < nbytes) && ctxt->sr) {
-	fetchData(ctxt);
+	n_err += fetchData(ctxt);
 	total += consumeData(p + total, (nbytes - total), ctxt);
     }
+    if (n_err != 0) {
+	Curl_close(con);
+	error(_("cannot read from connection"), n_err);
+    }
     return total/size;
 }
 
@@ -601,6 +741,7 @@
 
     ctxt->hnd = curl_easy_init();
     curl_easy_setopt(ctxt->hnd, CURLOPT_URL, url);
+    curl_easy_setopt(ctxt->hnd, CURLOPT_FAILONERROR, 1L);
     curlCommon(ctxt->hnd, 1, 1);
     curl_easy_setopt(ctxt->hnd, CURLOPT_NOPROGRESS, 1L);
     curl_easy_setopt(ctxt->hnd, CURLOPT_TCP_KEEPALIVE, 1L);
@@ -614,7 +755,13 @@
 
     // Establish the connection: not clear if we should do this now.
     ctxt->sr = 1;
-    while(ctxt->sr && !ctxt->available) fetchData(ctxt);
+    int n_err = 0;
+    while(ctxt->sr && !ctxt->available)
+	n_err += fetchData(ctxt);
+    if (n_err != 0) {
+	Curl_close(con);
+	error(_("cannot open connection"), n_err);
+    }
 
     con->isopen = TRUE;
     con->canwrite = (con->mode[0] == 'w' || con->mode[0] == 'a');
@@ -626,18 +773,6 @@
     return TRUE;
 }
 
-static void Curl_close(Rconnection con)
-{
-    RCurlconn ctxt = (RCurlconn)(con->private);
-
-    curl_multi_remove_handle(ctxt->mh, ctxt->hnd);
-    curl_easy_cleanup(ctxt->hnd);
-    curl_multi_cleanup(ctxt->mh);
-    free(ctxt->buf);
-
-    con->isopen = FALSE;
-}
-
 static int Curl_fgetc_internal(Rconnection con)
 {
     unsigned char c;
@@ -651,7 +786,7 @@
 Rconnection 
 in_newCurlUrl(const char *description, const char * const mode, int type)
 {
-#ifdef HAVE_CURL_CURL_H
+#ifdef HAVE_LIBCURL
     Rconnection new = (Rconnection) malloc(sizeof(struct Rconn));
     if (!new) error(_("allocation of url connection failed"));
     new->class = (char *) malloc(strlen("url-libcurl") + 1);
@@ -669,6 +804,7 @@
     new->canwrite = FALSE;
     new->open = &Curl_open;
     new->close = &Curl_close;
+    new->destroy = &Curl_destroy;
     new->fgetc_internal = &Curl_fgetc_internal;
     new->fgetc = &dummy_fgetc;
     new->read = &Curl_read;
diff -Nru r-base-3.2.3/src/modules/internet/Makefile.win r-base-3.3.1/src/modules/internet/Makefile.win
--- r-base-3.2.3/src/modules/internet/Makefile.win	2015-03-18 23:04:02.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/Makefile.win	2016-03-16 23:04:23.000000000 +0000
@@ -11,7 +11,7 @@
 EXTRA_LIBS = -lwininet -lws2_32
 
 ifdef USE_LIBCURL
-libcurl-CPPFLAGS += -DHAVE_CURL_CURL_H -DCURL_STATICLIB -I"$(CURL_PATH)"/include
+libcurl-CPPFLAGS += -DHAVE_CURL_CURL_H -DHAVE_LIBCURL -DCURL_STATICLIB -I"$(CURL_PATH)"/include
 EXTRA_LIBS += -L"$(CURL_PATH)"/lib$(R_ARCH) $(CURL_LIBS)
 endif
 
diff -Nru r-base-3.2.3/src/modules/internet/nanoftp.c r-base-3.3.1/src/modules/internet/nanoftp.c
--- r-base-3.2.3/src/modules/internet/nanoftp.c	2015-08-25 22:18:56.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/nanoftp.c	2016-03-16 23:04:23.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1998-2001  Daniel Veillard.
- *  Copyright (C) 2001-2014  The R Core Team.
+ *  Copyright (C) 2001-2015  The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -42,7 +42,6 @@
 #endif
 
 extern void R_ProcessEvents(void);
-#if !defined(Unix) || defined(HAVE_BSD_NETWORKING)
 
 #ifdef Win32
 #include <io.h>
@@ -64,13 +63,13 @@
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
-#ifdef HAVE_BSD_NETWORKING
-#  include <netdb.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
+#ifdef Unix
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -1471,5 +1470,3 @@
     if (ctxt == NULL) return(-1);
     return(ctxt->contentLength);
 }
-
-#endif /* !Unix or BSD_NETWORKING */
diff -Nru r-base-3.2.3/src/modules/internet/nanohttp.c r-base-3.3.1/src/modules/internet/nanohttp.c
--- r-base-3.2.3/src/modules/internet/nanohttp.c	2015-08-25 22:18:56.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/nanohttp.c	2016-03-16 23:04:24.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1998-2001  Daniel Veillard.
- *  Copyright (C) 2001-2014   The R Core Team.
+ *  Copyright (C) 2001-2015   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -55,7 +55,6 @@
 #endif
 
 extern void R_ProcessEvents(void);
-#if !defined(Unix) || defined(HAVE_BSD_NETWORKING)
 
 #ifdef Win32
 #include <io.h>
@@ -92,10 +91,10 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_BSD_NETWORKING
-#  include <netdb.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
+#ifdef Unix
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -367,7 +366,10 @@
 	    break;
 	}
 	if(indx >= 40959)
-	    RxmlMessage(2, _("RxmlNanoHTTPScanURL: overlong (invalid?) URL"));	buf[indx++] = *cur++;
+	    RxmlMessage(2, _("RxmlNanoHTTPScanURL: overlong (invalid?) URL"));
+	else {
+	    buf[indx++] = *cur++;
+	}
     }
     if (*cur == 0) return;
 
@@ -395,7 +397,10 @@
 	    break;
 	}
 	if(indx >= 40959)
-	    RxmlMessage(2, _("RxmlNanoHTTPScanURL: overlong (invalid?) URL"));	buf[indx++] = *cur++;
+	    RxmlMessage(2, _("RxmlNanoHTTPScanURL: overlong (invalid?) URL"));
+	else { 
+	    buf[indx++] = *cur++;
+	}
     }
     if (*cur == 0)
         ctxt->path = xmlMemStrdup("/");
@@ -452,7 +457,9 @@
 	}
 	if(indx >= 4095)
 	    RxmlMessage(2, _("RxmlNanoHTTPScanProxy: overlong (invalid?) URL"));
-	buf[indx++] = *cur++;
+	else {
+	    buf[indx++] = *cur++;
+	}
     }
     if (*cur == 0) return;
 
@@ -487,7 +494,10 @@
 	    break;
 	}
 	if(indx >= 4095)
-	    RxmlMessage(2, _("RxmlNanoHTTPScanProxy: overlong (invalid?) URL"));	buf[indx++] = *cur++;
+	    RxmlMessage(2, _("RxmlNanoHTTPScanProxy: overlong (invalid?) URL"));
+	else {
+	    buf[indx++] = *cur++;
+	}
     }
 }
 
@@ -1538,4 +1548,3 @@
     RxmlNanoHTTPCtxtPtr ctxt = (RxmlNanoHTTPCtxtPtr) ctx;
     return(ctxt->contentType);
 }
-#endif /* !Unix or BSD_NETWORKING */
diff -Nru r-base-3.2.3/src/modules/internet/Rhttpd.c r-base-3.3.1/src/modules/internet/Rhttpd.c
--- r-base-3.2.3/src/modules/internet/Rhttpd.c	2015-09-04 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/Rhttpd.c	2016-03-16 23:04:23.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2009-12 The R Core Team.
+ *  Copyright (C) 2009-2015 The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -64,12 +64,10 @@
 # ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 # endif
-# ifdef HAVE_BSD_NETWORKING
-#  include <netdb.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-# endif
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
 # include <errno.h>
 
 # define sockerrno errno
@@ -958,7 +956,11 @@
 			    }
 			    if (!strcmp(bol, "content-type")) {
 				char *l = k;
-				while (*l) { if (*l >= 'A' && *l <= 'Z') *l |= 0x20; l++; }
+				/* convert content-type to lowercase to facilitate comparison
+				   since MIME types are case-insensitive.
+				   However, we have to stop at ; since parameters
+				   may be case-sensitive (see PR 16541) */
+				while (*l && *l != ';') { if (*l >= 'A' && *l <= 'Z') *l |= 0x20; l++; }
 				c->attr |= CONTENT_TYPE;
 				if (c->content_type) free(c->content_type);
 				c->content_type = strdup(k);
diff -Nru r-base-3.2.3/src/modules/internet/Rsock.c r-base-3.3.1/src/modules/internet/Rsock.c
--- r-base-3.2.3/src/modules/internet/Rsock.c	2015-08-25 22:18:56.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/Rsock.c	2016-03-16 23:04:23.000000000 +0000
@@ -2,7 +2,7 @@
  *  R : A Computer Language for Statistical Data Analysis
 
  *  Copyright (C) 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998-2012   The R Core Team
+ *  Copyright (C) 1998-2015   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -150,7 +150,6 @@
 
 /* --------- for use in socket connections ---------- */
 
-#ifdef HAVE_SOCKETS
 #include <R_ext/R-ftp-http.h>
 
 #ifdef Win32
@@ -158,12 +157,10 @@
 #include <io.h>
 #define EWOULDBLOCK             WSAEWOULDBLOCK
 #define EINPROGRESS             WSAEINPROGRESS
-#endif
-
-#ifdef HAVE_BSD_NETWORKING
-#  include <netdb.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
+#else
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -260,7 +257,7 @@
 	howmany = R_SelectEx(maxfd+1, &rfd, &wfd, NULL, &tv, NULL);
 
 	if (howmany < 0) {
-	    return -1;
+	    return -socket_errno();
 	}
 	if (howmany == 0) {
 	    if(used >= timeout) return 1;
@@ -345,7 +342,7 @@
 	howmany = R_SelectEx(maxfd+1, &rfd, &wfd, NULL, &tv, NULL);
 
 	if (howmany < 0) {
-	    return -1;
+	    return -socket_errno();
 	}
 	if (howmany == 0) {
 	    if(mytimeout >= 0 && used >= mytimeout) {
@@ -520,7 +517,8 @@
 {
     ssize_t res;
 
-    if(blocking && R_SocketWait(sockp, 0, timeout) != 0) return 0;
+    if(blocking && (res = R_SocketWait(sockp, 0, timeout)) != 0)
+        return res < 0 ? res : 0; /* socket error or timeout */
     res = recv(sockp, buf, len, 0);
     return (res >= 0) ? res : -socket_errno();
 }
@@ -537,7 +535,12 @@
     /* inserting a wait here will eliminate most blocking, but there
        are scenarios under which the Sock_listen call might block
        after the wait has completed. LT */
-    R_SocketWait(sockp, 0, timeout);
+    int res = 0;
+    do {
+        res = R_SocketWait(sockp, 0, timeout);
+    } while (res < 0 && -res == EINTR);
+    if(res != 0)
+        return -1;              /* socket error or timeout */
     return Sock_listen(sockp, buf, len, NULL);
 }
 
@@ -552,7 +555,8 @@
        interface since there is no way to tell how much, if anything,
        has been written.  LT */
     do {
-	if(R_SocketWait(sockp, 1, timeout) != 0) return out;
+	if((res = R_SocketWait(sockp, 1, timeout)) != 0)
+	    return res < 0 ? res : 0; /* socket error or timeout */
 	res = send(sockp, buf, len, 0);
 	if (res < 0 && socket_errno() != EWOULDBLOCK)
 	    return -socket_errno();
@@ -565,4 +569,3 @@
     return out;
 }
 
-#endif
diff -Nru r-base-3.2.3/src/modules/internet/sock.c r-base-3.3.1/src/modules/internet/sock.c
--- r-base-3.2.3/src/modules/internet/sock.c	2015-08-25 22:18:56.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/sock.c	2016-03-16 23:04:23.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
 
- *  Copyright (C) 1998-2001   The R Core Team
+ *  Copyright (C) 1998-2015   The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,11 +43,9 @@
 #  ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #  endif
-#  ifdef HAVE_BSD_NETWORKING
-#    include <netdb.h>
-#    include <sys/socket.h>
-#    include <netinet/in.h>
-#  endif
+#  include <netdb.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
 #endif
 
 #include <R_ext/Error.h>
@@ -59,10 +57,6 @@
 
 #define MAXBACKLOG 5
 
-#ifndef HAVE_SOCKETS
-static char socket_msg[] = "sockets are not available on this system";
-#endif
-
 static int Sock_error(Sock_error_t perr, int e, int he)
 {
     if (perr != NULL) {
@@ -109,7 +103,6 @@
 /* open a socket for listening */
 int Sock_open(Sock_port_t port, Sock_error_t perr)
 {
-#ifdef HAVE_SOCKETS
     int sock;
     struct sockaddr_in server;
 
@@ -159,16 +152,11 @@
 	(listen(sock, MAXBACKLOG) < 0))
 	return Sock_error(perr, errno, 0);
     return sock;
-#else
-    error(socket_msg);
-    return(-1);
-#endif
 }
 
 /* listen on a socket, return name of connecting host in cname */
 int Sock_listen(int fd, char *cname, int buflen, Sock_error_t perr)
 {
-#ifdef HAVE_SOCKETS
     struct sockaddr_in net_client;
     R_SOCKLEN_T len = sizeof(struct sockaddr);
     int retval;
@@ -194,16 +182,11 @@
 	cname[nlen] = 0;
     }
     return retval;
-#else
-    error(socket_msg);
-    return(-1);
-#endif
 }
 
 /* open and connect to a socket */
 int Sock_connect(Sock_port_t port, char *sname, Sock_error_t perr)
 {
-#ifdef HAVE_SOCKETS
     struct sockaddr_in server;
     struct hostent *hp;
     int sock;
@@ -230,10 +213,6 @@
 	return -1;
     }
     return sock;
-#else
-    error(socket_msg);
-    return(-1);
-#endif
 }
 
 /* close a socket */
@@ -253,7 +232,6 @@
 /* read from a socket */
 ssize_t Sock_read(int fd, void *buf, size_t size, Sock_error_t perr)
 {
-#ifdef HAVE_SOCKETS
     ssize_t retval;
     do
 	retval = recv(fd, buf, size, 0);
@@ -262,16 +240,11 @@
 	return Sock_error(perr, errno, 0);
     else
 	return retval;
-#else
-    error(socket_msg);
-    return(-1);
-#endif
 }
 
 /* write to a socket */
 ssize_t Sock_write(int fd, const void *buf, size_t size, Sock_error_t perr)
 {
-#ifdef HAVE_SOCKETS
     ssize_t retval;
     do
 	retval = send(fd, buf, size, 0);
@@ -280,8 +253,4 @@
 	return Sock_error(perr, errno, 0);
     else
 	return retval;
-#else
-    error(socket_msg);
-    return(-1);
-#endif
 }
diff -Nru r-base-3.2.3/src/modules/internet/sockconn.c r-base-3.3.1/src/modules/internet/sockconn.c
--- r-base-3.2.3/src/modules/internet/sockconn.c	2015-08-25 22:18:56.000000000 +0000
+++ r-base-3.3.1/src/modules/internet/sockconn.c	2016-03-16 23:04:24.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C)  2001-12   The R Core Team.
+ *  Copyright (C)  2001-2015   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,8 +23,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_SOCKETS
-
 
 /* ------------------- socket connections  --------------------- */
 
@@ -104,7 +102,7 @@
     con->isopen = FALSE;
 }
 
-static size_t sock_read_helper(Rconnection con, void *ptr, size_t size)
+static ssize_t sock_read_helper(Rconnection con, void *ptr, size_t size)
 {
     Rsockconn this = (Rsockconn)con->private;
     ssize_t res;
@@ -148,7 +146,7 @@
 static int sock_fgetc_internal(Rconnection con)
 {
     unsigned char c;
-    size_t n;
+    ssize_t n;
 
     n = sock_read_helper(con, (char *)&c, 1);
     return (n == 1) ? c : R_EOF;
@@ -157,15 +155,17 @@
 static size_t sock_read(void *ptr, size_t size, size_t nitems,
 			Rconnection con)
 {
-    return sock_read_helper(con, ptr, size * nitems)/size;
+    ssize_t n = sock_read_helper(con, ptr, size * nitems)/size;
+    return n > 0 ? n : 0;
 }
 
 static size_t sock_write(const void *ptr, size_t size, size_t nitems,
 			 Rconnection con)
 {
     Rsockconn this = (Rsockconn)con->private;
-
-    return R_SockWrite(this->fd, ptr, (int)(size * nitems), this->timeout)/size;
+    ssize_t n = R_SockWrite(this->fd, ptr, (int)(size * nitems),
+			    this->timeout)/size;
+    return n > 0 ? n : 0;
 }
 
 Rconnection in_R_newsock(const char *host, int port, int server,
@@ -204,5 +204,3 @@
     ((Rsockconn)new->private)-> timeout = timeout;
     return new;
 }
-
-#endif /* HAVE_SOCKETS */
diff -Nru r-base-3.2.3/src/modules/lapack/cmplx.f r-base-3.3.1/src/modules/lapack/cmplx.f
--- r-base-3.2.3/src/modules/lapack/cmplx.f	2014-03-12 23:03:24.000000000 +0000
+++ r-base-3.3.1/src/modules/lapack/cmplx.f	2016-03-16 23:04:26.000000000 +0000
@@ -377,7 +377,7 @@
       END IF
       RETURN
       END
-*> \brief \b IZMAX1 finds the index of the vector element whose real part has maximum absolute value.
+*> \brief \b IZMAX1 finds the index of the first vector element of maximum absolute value.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -397,13 +397,13 @@
 *  Definition:
 *  ===========
 *
-*       INTEGER          FUNCTION IZMAX1( N, CX, INCX )
+*       INTEGER          FUNCTION IZMAX1( N, ZX, INCX )
 * 
 *       .. Scalar Arguments ..
 *       INTEGER            INCX, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         CX( * )
+*       COMPLEX*16         ZX( * )
 *       ..
 *  
 *
@@ -412,8 +412,7 @@
 *>
 *> \verbatim
 *>
-*> IZMAX1 finds the index of the element whose real part has maximum
-*> absolute value.
+*> IZMAX1 finds the index of the first vector element of maximum absolute value.
 *>
 *> Based on IZAMAX from Level 1 BLAS.
 *> The change is to use the 'genuine' absolute value.
@@ -425,19 +424,20 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of elements in the vector CX.
+*>          The number of elements in the vector ZX.
 *> \endverbatim
 *>
-*> \param[in] CX
+*> \param[in] ZX
 *> \verbatim
-*>          CX is COMPLEX*16 array, dimension (N)
-*>          The vector whose elements will be summed.
+*>          ZX is COMPLEX*16 array, dimension (N)
+*>          The vector ZX. The IZMAX1 function returns the index of its first
+*>          element of maximum absolute value.
 *> \endverbatim
 *>
 *> \param[in] INCX
 *> \verbatim
 *>          INCX is INTEGER
-*>          The spacing between successive values of CX.  INCX >= 1.
+*>          The spacing between successive values of ZX.  INCX >= 1.
 *> \endverbatim
 *
 *  Authors:
@@ -448,9 +448,9 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date February 2014
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complexOTHERauxiliary
 *
 *> \par Contributors:
 *  ==================
@@ -458,74 +458,61 @@
 *> Nick Higham for use with ZLACON.
 *
 *  =====================================================================
-      INTEGER          FUNCTION IZMAX1( N, CX, INCX )
+      INTEGER FUNCTION IZMAX1( N, ZX, INCX )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     February 2014
 *
 *     .. Scalar Arguments ..
       INTEGER            INCX, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         CX( * )
+      COMPLEX*16         ZX(*)
 *     ..
 *
-* =====================================================================
+*  =====================================================================
 *
 *     .. Local Scalars ..
+      DOUBLE PRECISION   DMAX
       INTEGER            I, IX
-      DOUBLE PRECISION   SMAX
-      COMPLEX*16         ZDUM
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
 *     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
-*     ..
-*     .. Statement Function definitions ..
-*
-*     NEXT LINE IS THE ONLY MODIFICATION.
-      CABS1( ZDUM ) = ABS( ZDUM )
-*     ..
 *     .. Executable Statements ..
 *
       IZMAX1 = 0
-      IF( N.LT.1 )
-     $   RETURN
+      IF (N.LT.1 .OR. INCX.LE.0) RETURN
       IZMAX1 = 1
-      IF( N.EQ.1 )
-     $   RETURN
-      IF( INCX.EQ.1 )
-     $   GO TO 30
+      IF (N.EQ.1) RETURN
+      IF (INCX.EQ.1) THEN
 *
-*     CODE FOR INCREMENT NOT EQUAL TO 1
+*        code for increment equal to 1
 *
-      IX = 1
-      SMAX = CABS1( CX( 1 ) )
-      IX = IX + INCX
-      DO 20 I = 2, N
-         IF( CABS1( CX( IX ) ).LE.SMAX )
-     $      GO TO 10
-         IZMAX1 = I
-         SMAX = CABS1( CX( IX ) )
-   10    CONTINUE
-         IX = IX + INCX
-   20 CONTINUE
-      RETURN
+         DMAX = ABS(ZX(1))
+         DO I = 2,N
+            IF (ABS(ZX(I)).GT.DMAX) THEN
+               IZMAX1 = I
+               DMAX = ABS(ZX(I))
+            END IF
+         END DO
+      ELSE
 *
-*     CODE FOR INCREMENT EQUAL TO 1
+*        code for increment not equal to 1
 *
-   30 CONTINUE
-      SMAX = CABS1( CX( 1 ) )
-      DO 40 I = 2, N
-         IF( CABS1( CX( I ) ).LE.SMAX )
-     $      GO TO 40
-         IZMAX1 = I
-         SMAX = CABS1( CX( I ) )
-   40 CONTINUE
+         IX = 1
+         DMAX = ABS(ZX(1))
+         IX = IX + INCX
+         DO I = 2,N
+            IF (ABS(ZX(IX)).GT.DMAX) THEN
+               IZMAX1 = I
+               DMAX = ABS(ZX(IX))
+            END IF
+            IX = IX + INCX
+         END DO
+      END IF
       RETURN
 *
 *     End of IZMAX1
@@ -699,8 +686,7 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
-*>          if NCVT = NRU = NCC = 0, (max(1, 4*N-4)) otherwise
+*>          RWORK is DOUBLE PRECISION array, dimension (4*N)
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -748,7 +734,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup complex16OTHERcomputational
 *
@@ -756,10 +742,10 @@
       SUBROUTINE ZBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
      $                   LDU, C, LDC, RWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
@@ -1941,7 +1927,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2013
+*> \date November 2015
 *
 *> \ingroup complex16GEcomputational
 *
@@ -1980,10 +1966,10 @@
 *  =====================================================================
       SUBROUTINE ZGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
 *
-*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOB
@@ -2022,14 +2008,6 @@
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
-*     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
-*     ..
-*     .. Executable Statements ..
 *
 *     Test the input parameters
 *
@@ -3178,7 +3156,7 @@
 *     End of ZGECON
 *
       END
-*> \brief <b> ZGEEV computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief \b ZGEEQU
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -3186,29 +3164,346 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGEEV + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeev.f"> 
+*> Download ZGEEQU + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeequ.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeev.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeequ.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeev.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeequ.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
-*                         WORK, LWORK, RWORK, INFO )
+*       SUBROUTINE ZGEEQU( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+*                          INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          JOBVL, JOBVR
-*       INTEGER            INFO, LDA, LDVL, LDVR, LWORK, N
+*       INTEGER            INFO, LDA, M, N
+*       DOUBLE PRECISION   AMAX, COLCND, ROWCND
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   C( * ), R( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGEEQU computes row and column scalings intended to equilibrate an
+*> M-by-N matrix A and reduce its condition number.  R returns the row
+*> scale factors and C the column scale factors, chosen to try to make
+*> the largest element in each row and column of the matrix B with
+*> elements B(i,j)=R(i)*A(i,j)*C(j) have absolute value 1.
+*>
+*> R(i) and C(j) are restricted to be between SMLNUM = smallest safe
+*> number and BIGNUM = largest safe number.  Use of these scaling
+*> factors is not guaranteed to reduce the condition number of A but
+*> works well in practice.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The M-by-N matrix whose equilibration factors are
+*>          to be computed.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] R
+*> \verbatim
+*>          R is DOUBLE PRECISION array, dimension (M)
+*>          If INFO = 0 or INFO > M, R contains the row scale factors
+*>          for A.
+*> \endverbatim
+*>
+*> \param[out] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension (N)
+*>          If INFO = 0,  C contains the column scale factors for A.
+*> \endverbatim
+*>
+*> \param[out] ROWCND
+*> \verbatim
+*>          ROWCND is DOUBLE PRECISION
+*>          If INFO = 0 or INFO > M, ROWCND contains the ratio of the
+*>          smallest R(i) to the largest R(i).  If ROWCND >= 0.1 and
+*>          AMAX is neither too large nor too small, it is not worth
+*>          scaling by R.
+*> \endverbatim
+*>
+*> \param[out] COLCND
+*> \verbatim
+*>          COLCND is DOUBLE PRECISION
+*>          If INFO = 0, COLCND contains the ratio of the smallest
+*>          C(i) to the largest C(i).  If COLCND >= 0.1, it is not
+*>          worth scaling by C.
+*> \endverbatim
+*>
+*> \param[out] AMAX
+*> \verbatim
+*>          AMAX is DOUBLE PRECISION
+*>          Absolute value of largest matrix element.  If AMAX is very
+*>          close to overflow or very close to underflow, the matrix
+*>          should be scaled.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i,  and i is
+*>                <= M:  the i-th row of A is exactly zero
+*>                >  M:  the (i-M)-th column of A is exactly zero
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup complex16GEcomputational
+*
+*  =====================================================================
+      SUBROUTINE ZGEEQU( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                   INFO )
+*
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDA, M, N
+      DOUBLE PRECISION   AMAX, COLCND, ROWCND
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   C( * ), R( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J
+      DOUBLE PRECISION   BIGNUM, RCMAX, RCMIN, SMLNUM
+      COMPLEX*16         ZDUM
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGEEQU', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         ROWCND = ONE
+         COLCND = ONE
+         AMAX = ZERO
+         RETURN
+      END IF
+*
+*     Get machine constants.
+*
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+*
+*     Compute row scale factors.
+*
+      DO 10 I = 1, M
+         R( I ) = ZERO
+   10 CONTINUE
+*
+*     Find the maximum element in each row.
+*
+      DO 30 J = 1, N
+         DO 20 I = 1, M
+            R( I ) = MAX( R( I ), CABS1( A( I, J ) ) )
+   20    CONTINUE
+   30 CONTINUE
+*
+*     Find the maximum and minimum scale factors.
+*
+      RCMIN = BIGNUM
+      RCMAX = ZERO
+      DO 40 I = 1, M
+         RCMAX = MAX( RCMAX, R( I ) )
+         RCMIN = MIN( RCMIN, R( I ) )
+   40 CONTINUE
+      AMAX = RCMAX
+*
+      IF( RCMIN.EQ.ZERO ) THEN
+*
+*        Find the first zero scale factor and return an error code.
+*
+         DO 50 I = 1, M
+            IF( R( I ).EQ.ZERO ) THEN
+               INFO = I
+               RETURN
+            END IF
+   50    CONTINUE
+      ELSE
+*
+*        Invert the scale factors.
+*
+         DO 60 I = 1, M
+            R( I ) = ONE / MIN( MAX( R( I ), SMLNUM ), BIGNUM )
+   60    CONTINUE
+*
+*        Compute ROWCND = min(R(I)) / max(R(I))
+*
+         ROWCND = MAX( RCMIN, SMLNUM ) / MIN( RCMAX, BIGNUM )
+      END IF
+*
+*     Compute column scale factors
+*
+      DO 70 J = 1, N
+         C( J ) = ZERO
+   70 CONTINUE
+*
+*     Find the maximum element in each column,
+*     assuming the row scaling computed above.
+*
+      DO 90 J = 1, N
+         DO 80 I = 1, M
+            C( J ) = MAX( C( J ), CABS1( A( I, J ) )*R( I ) )
+   80    CONTINUE
+   90 CONTINUE
+*
+*     Find the maximum and minimum scale factors.
+*
+      RCMIN = BIGNUM
+      RCMAX = ZERO
+      DO 100 J = 1, N
+         RCMIN = MIN( RCMIN, C( J ) )
+         RCMAX = MAX( RCMAX, C( J ) )
+  100 CONTINUE
+*
+      IF( RCMIN.EQ.ZERO ) THEN
+*
+*        Find the first zero scale factor and return an error code.
+*
+         DO 110 J = 1, N
+            IF( C( J ).EQ.ZERO ) THEN
+               INFO = M + J
+               RETURN
+            END IF
+  110    CONTINUE
+      ELSE
+*
+*        Invert the scale factors.
+*
+         DO 120 J = 1, N
+            C( J ) = ONE / MIN( MAX( C( J ), SMLNUM ), BIGNUM )
+  120    CONTINUE
+*
+*        Compute COLCND = min(C(J)) / max(C(J))
+*
+         COLCND = MAX( RCMIN, SMLNUM ) / MIN( RCMAX, BIGNUM )
+      END IF
+*
+      RETURN
+*
+*     End of ZGEEQU
+*
+      END
+*> \brief <b> ZGEES computes the eigenvalues, the Schur form, and, optionally, the matrix of Schur vectors for GE matrices</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZGEES + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgees.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgees.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgees.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
+*                         LDVS, WORK, LWORK, RWORK, BWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBVS, SORT
+*       INTEGER            INFO, LDA, LDVS, LWORK, N, SDIM
 *       ..
 *       .. Array Arguments ..
+*       LOGICAL            BWORK( * )
 *       DOUBLE PRECISION   RWORK( * )
-*       COMPLEX*16         A( LDA, * ), VL( LDVL, * ), VR( LDVR, * ),
-*      $                   W( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), VS( LDVS, * ), W( * ), WORK( * )
+*       ..
+*       .. Function Arguments ..
+*       LOGICAL            SELECT
+*       EXTERNAL           SELECT
 *       ..
 *  
 *
@@ -3217,35 +3512,45 @@
 *>
 *> \verbatim
 *>
-*> ZGEEV computes for an N-by-N complex nonsymmetric matrix A, the
-*> eigenvalues and, optionally, the left and/or right eigenvectors.
+*> ZGEES computes for an N-by-N complex nonsymmetric matrix A, the
+*> eigenvalues, the Schur form T, and, optionally, the matrix of Schur
+*> vectors Z.  This gives the Schur factorization A = Z*T*(Z**H).
 *>
-*> The right eigenvector v(j) of A satisfies
-*>                  A * v(j) = lambda(j) * v(j)
-*> where lambda(j) is its eigenvalue.
-*> The left eigenvector u(j) of A satisfies
-*>               u(j)**H * A = lambda(j) * u(j)**H
-*> where u(j)**H denotes the conjugate transpose of u(j).
+*> Optionally, it also orders the eigenvalues on the diagonal of the
+*> Schur form so that selected eigenvalues are at the top left.
+*> The leading columns of Z then form an orthonormal basis for the
+*> invariant subspace corresponding to the selected eigenvalues.
 *>
-*> The computed eigenvectors are normalized to have Euclidean norm
-*> equal to 1 and largest component real.
+*> A complex matrix is in Schur form if it is upper triangular.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] JOBVL
+*> \param[in] JOBVS
 *> \verbatim
-*>          JOBVL is CHARACTER*1
-*>          = 'N': left eigenvectors of A are not computed;
-*>          = 'V': left eigenvectors of are computed.
+*>          JOBVS is CHARACTER*1
+*>          = 'N': Schur vectors are not computed;
+*>          = 'V': Schur vectors are computed.
 *> \endverbatim
 *>
-*> \param[in] JOBVR
+*> \param[in] SORT
 *> \verbatim
-*>          JOBVR is CHARACTER*1
-*>          = 'N': right eigenvectors of A are not computed;
-*>          = 'V': right eigenvectors of A are computed.
+*>          SORT is CHARACTER*1
+*>          Specifies whether or not to order the eigenvalues on the
+*>          diagonal of the Schur form.
+*>          = 'N': Eigenvalues are not ordered:
+*>          = 'S': Eigenvalues are ordered (see SELECT).
+*> \endverbatim
+*>
+*> \param[in] SELECT
+*> \verbatim
+*>          SELECT is a LOGICAL FUNCTION of one COMPLEX*16 argument
+*>          SELECT must be declared EXTERNAL in the calling subroutine.
+*>          If SORT = 'S', SELECT is used to select eigenvalues to order
+*>          to the top left of the Schur form.
+*>          IF SORT = 'N', SELECT is not referenced.
+*>          The eigenvalue W(j) is selected if SELECT(W(j)) is true.
 *> \endverbatim
 *>
 *> \param[in] N
@@ -3258,7 +3563,7 @@
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
 *>          On entry, the N-by-N matrix A.
-*>          On exit, A has been overwritten.
+*>          On exit, A has been overwritten by its Schur form T.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -3267,44 +3572,34 @@
 *>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] W
-*> \verbatim
-*>          W is COMPLEX*16 array, dimension (N)
-*>          W contains the computed eigenvalues.
-*> \endverbatim
-*>
-*> \param[out] VL
+*> \param[out] SDIM
 *> \verbatim
-*>          VL is COMPLEX*16 array, dimension (LDVL,N)
-*>          If JOBVL = 'V', the left eigenvectors u(j) are stored one
-*>          after another in the columns of VL, in the same order
-*>          as their eigenvalues.
-*>          If JOBVL = 'N', VL is not referenced.
-*>          u(j) = VL(:,j), the j-th column of VL.
+*>          SDIM is INTEGER
+*>          If SORT = 'N', SDIM = 0.
+*>          If SORT = 'S', SDIM = number of eigenvalues for which
+*>                         SELECT is true.
 *> \endverbatim
 *>
-*> \param[in] LDVL
+*> \param[out] W
 *> \verbatim
-*>          LDVL is INTEGER
-*>          The leading dimension of the array VL.  LDVL >= 1; if
-*>          JOBVL = 'V', LDVL >= N.
+*>          W is COMPLEX*16 array, dimension (N)
+*>          W contains the computed eigenvalues, in the same order that
+*>          they appear on the diagonal of the output Schur form T.
 *> \endverbatim
 *>
-*> \param[out] VR
+*> \param[out] VS
 *> \verbatim
-*>          VR is COMPLEX*16 array, dimension (LDVR,N)
-*>          If JOBVR = 'V', the right eigenvectors v(j) are stored one
-*>          after another in the columns of VR, in the same order
-*>          as their eigenvalues.
-*>          If JOBVR = 'N', VR is not referenced.
-*>          v(j) = VR(:,j), the j-th column of VR.
+*>          VS is COMPLEX*16 array, dimension (LDVS,N)
+*>          If JOBVS = 'V', VS contains the unitary matrix Z of Schur
+*>          vectors.
+*>          If JOBVS = 'N', VS is not referenced.
 *> \endverbatim
 *>
-*> \param[in] LDVR
+*> \param[in] LDVS
 *> \verbatim
-*>          LDVR is INTEGER
-*>          The leading dimension of the array VR.  LDVR >= 1; if
-*>          JOBVR = 'V', LDVR >= N.
+*>          LDVS is INTEGER
+*>          The leading dimension of the array VS.  LDVS >= 1; if
+*>          JOBVS = 'V', LDVS >= N.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -3327,18 +3622,34 @@
 *>
 *> \param[out] RWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
+*>          RWORK is DOUBLE PRECISION array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] BWORK
+*> \verbatim
+*>          BWORK is LOGICAL array, dimension (N)
+*>          Not referenced if SORT = 'N'.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>          > 0:  if INFO = i, the QR algorithm failed to compute all the
-*>                eigenvalues, and no eigenvectors have been computed;
-*>                elements and i+1:N of W contain eigenvalues which have
-*>                converged.
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value.
+*>          > 0: if INFO = i, and i is
+*>               <= N:  the QR algorithm failed to compute all the
+*>                      eigenvalues; elements 1:ILO-1 and i+1:N of W
+*>                      contain those eigenvalues which have converged;
+*>                      if JOBVS = 'V', VS contains the matrix which
+*>                      reduces A to its partially converged Schur form.
+*>               = N+1: the eigenvalues could not be reordered because
+*>                      some eigenvalues were too close to separate (the
+*>                      problem is very ill-conditioned);
+*>               = N+2: after reordering, roundoff changed values of
+*>                      some complex eigenvalues so that leading
+*>                      eigenvalues in the Schur form no longer satisfy
+*>                      SELECT = .TRUE..  This could also be caused by
+*>                      underflow due to scaling.
 *> \endverbatim
 *
 *  Authors:
@@ -3354,8 +3665,8 @@
 *> \ingroup complex16GEeigen
 *
 *  =====================================================================
-      SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
-     $                  WORK, LWORK, RWORK, INFO )
+      SUBROUTINE ZGEES( JOBVS, SORT, SELECT, N, A, LDA, SDIM, W, VS,
+     $                  LDVS, WORK, LWORK, RWORK, BWORK, INFO )
 *
 *  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -3363,13 +3674,17 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          JOBVL, JOBVR
-      INTEGER            INFO, LDA, LDVL, LDVR, LWORK, N
+      CHARACTER          JOBVS, SORT
+      INTEGER            INFO, LDA, LDVS, LWORK, N, SDIM
 *     ..
 *     .. Array Arguments ..
+      LOGICAL            BWORK( * )
       DOUBLE PRECISION   RWORK( * )
-      COMPLEX*16         A( LDA, * ), VL( LDVL, * ), VR( LDVR, * ),
-     $                   W( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), VS( LDVS, * ), W( * ), WORK( * )
+*     ..
+*     .. Function Arguments ..
+      LOGICAL            SELECT
+      EXTERNAL           SELECT
 *     ..
 *
 *  =====================================================================
@@ -3379,29 +3694,26 @@
       PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY, SCALEA, WANTVL, WANTVR
-      CHARACTER          SIDE
-      INTEGER            HSWORK, I, IBAL, IERR, IHI, ILO, IRWORK, ITAU,
-     $                   IWRK, K, MAXWRK, MINWRK, NOUT
-      DOUBLE PRECISION   ANRM, BIGNUM, CSCALE, EPS, SCL, SMLNUM
-      COMPLEX*16         TMP
+      LOGICAL            LQUERY, SCALEA, WANTST, WANTVS
+      INTEGER            HSWORK, I, IBAL, ICOND, IERR, IEVAL, IHI, ILO,
+     $                   ITAU, IWRK, MAXWRK, MINWRK
+      DOUBLE PRECISION   ANRM, BIGNUM, CSCALE, EPS, S, SEP, SMLNUM
 *     ..
 *     .. Local Arrays ..
-      LOGICAL            SELECT( 1 )
       DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, XERBLA, ZDSCAL, ZGEBAK, ZGEBAL, ZGEHRD,
-     $                   ZHSEQR, ZLACPY, ZLASCL, ZSCAL, ZTREVC, ZUNGHR
+      EXTERNAL           DLABAD, XERBLA, ZCOPY, ZGEBAK, ZGEBAL, ZGEHRD,
+     $                   ZHSEQR, ZLACPY, ZLASCL, ZTRSEN, ZUNGHR
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            IDAMAX, ILAENV
-      DOUBLE PRECISION   DLAMCH, DZNRM2, ZLANGE
-      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DZNRM2, ZLANGE
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, DCONJG, DIMAG, MAX, SQRT
+      INTRINSIC          MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
@@ -3409,19 +3721,17 @@
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      WANTVL = LSAME( JOBVL, 'V' )
-      WANTVR = LSAME( JOBVR, 'V' )
-      IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
+      WANTVS = LSAME( JOBVS, 'V' )
+      WANTST = LSAME( SORT, 'S' )
+      IF( ( .NOT.WANTVS ) .AND. ( .NOT.LSAME( JOBVS, 'N' ) ) ) THEN
          INFO = -1
-      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
          INFO = -2
       ELSE IF( N.LT.0 ) THEN
-         INFO = -3
+         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -5
-      ELSE IF( LDVL.LT.1 .OR. ( WANTVL .AND. LDVL.LT.N ) ) THEN
-         INFO = -8
-      ELSE IF( LDVR.LT.1 .OR. ( WANTVR .AND. LDVR.LT.N ) ) THEN
+         INFO = -6
+      ELSE IF( LDVS.LT.1 .OR. ( WANTVS .AND. LDVS.LT.N ) ) THEN
          INFO = -10
       END IF
 *
@@ -3443,22 +3753,18 @@
          ELSE
             MAXWRK = N + N*ILAENV( 1, 'ZGEHRD', ' ', N, 1, N, 0 )
             MINWRK = 2*N
-            IF( WANTVL ) THEN
-               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
-     $                       ' ', N, 1, N, -1 ) )
-               CALL ZHSEQR( 'S', 'V', N, 1, N, A, LDA, W, VL, LDVL,
-     $                WORK, -1, INFO )
-            ELSE IF( WANTVR ) THEN
+*
+            CALL ZHSEQR( 'S', JOBVS, N, 1, N, A, LDA, W, VS, LDVS,
+     $             WORK, -1, IEVAL )
+            HSWORK = WORK( 1 )
+*
+            IF( .NOT.WANTVS ) THEN
+               MAXWRK = MAX( MAXWRK, HSWORK )
+            ELSE
                MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
      $                       ' ', N, 1, N, -1 ) )
-               CALL ZHSEQR( 'S', 'V', N, 1, N, A, LDA, W, VR, LDVR,
-     $                WORK, -1, INFO )
-            ELSE
-               CALL ZHSEQR( 'E', 'N', N, 1, N, A, LDA, W, VR, LDVR,
-     $                WORK, -1, INFO )
+               MAXWRK = MAX( MAXWRK, HSWORK )
             END IF
-            HSWORK = WORK( 1 )
-            MAXWRK = MAX( MAXWRK, HSWORK, MINWRK )
          END IF
          WORK( 1 ) = MAXWRK
 *
@@ -3468,7 +3774,7 @@
       END IF
 *
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGEEV ', -INFO )
+         CALL XERBLA( 'ZGEES ', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
@@ -3476,8 +3782,10 @@
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 )
-     $   RETURN
+      IF( N.EQ.0 ) THEN
+         SDIM = 0
+         RETURN
+      END IF
 *
 *     Get machine constants
 *
@@ -3502,143 +3810,550 @@
       IF( SCALEA )
      $   CALL ZLASCL( 'G', 0, 0, ANRM, CSCALE, N, N, A, LDA, IERR )
 *
-*     Balance the matrix
+*     Permute the matrix to make it more nearly triangular
 *     (CWorkspace: none)
 *     (RWorkspace: need N)
 *
       IBAL = 1
-      CALL ZGEBAL( 'B', N, A, LDA, ILO, IHI, RWORK( IBAL ), IERR )
+      CALL ZGEBAL( 'P', N, A, LDA, ILO, IHI, RWORK( IBAL ), IERR )
 *
 *     Reduce to upper Hessenberg form
 *     (CWorkspace: need 2*N, prefer N+N*NB)
 *     (RWorkspace: none)
 *
       ITAU = 1
-      IWRK = ITAU + N
+      IWRK = N + ITAU
       CALL ZGEHRD( N, ILO, IHI, A, LDA, WORK( ITAU ), WORK( IWRK ),
      $             LWORK-IWRK+1, IERR )
 *
-      IF( WANTVL ) THEN
-*
-*        Want left eigenvectors
-*        Copy Householder vectors to VL
-*
-         SIDE = 'L'
-         CALL ZLACPY( 'L', N, N, A, LDA, VL, LDVL )
-*
-*        Generate unitary matrix in VL
-*        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
-*        (RWorkspace: none)
-*
-         CALL ZUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
-     $                LWORK-IWRK+1, IERR )
-*
-*        Perform QR iteration, accumulating Schur vectors in VL
-*        (CWorkspace: need 1, prefer HSWORK (see comments) )
-*        (RWorkspace: none)
-*
-         IWRK = ITAU
-         CALL ZHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, W, VL, LDVL,
-     $                WORK( IWRK ), LWORK-IWRK+1, INFO )
-*
-         IF( WANTVR ) THEN
-*
-*           Want left and right eigenvectors
-*           Copy Schur vectors to VR
-*
-            SIDE = 'B'
-            CALL ZLACPY( 'F', N, N, VL, LDVL, VR, LDVR )
-         END IF
-*
-      ELSE IF( WANTVR ) THEN
+      IF( WANTVS ) THEN
 *
-*        Want right eigenvectors
-*        Copy Householder vectors to VR
+*        Copy Householder vectors to VS
 *
-         SIDE = 'R'
-         CALL ZLACPY( 'L', N, N, A, LDA, VR, LDVR )
+         CALL ZLACPY( 'L', N, N, A, LDA, VS, LDVS )
 *
-*        Generate unitary matrix in VR
+*        Generate unitary matrix in VS
 *        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
 *        (RWorkspace: none)
 *
-         CALL ZUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+         CALL ZUNGHR( N, ILO, IHI, VS, LDVS, WORK( ITAU ), WORK( IWRK ),
      $                LWORK-IWRK+1, IERR )
-*
-*        Perform QR iteration, accumulating Schur vectors in VR
-*        (CWorkspace: need 1, prefer HSWORK (see comments) )
-*        (RWorkspace: none)
-*
-         IWRK = ITAU
-         CALL ZHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, W, VR, LDVR,
-     $                WORK( IWRK ), LWORK-IWRK+1, INFO )
-*
-      ELSE
-*
-*        Compute eigenvalues only
-*        (CWorkspace: need 1, prefer HSWORK (see comments) )
-*        (RWorkspace: none)
-*
-         IWRK = ITAU
-         CALL ZHSEQR( 'E', 'N', N, ILO, IHI, A, LDA, W, VR, LDVR,
-     $                WORK( IWRK ), LWORK-IWRK+1, INFO )
       END IF
 *
-*     If INFO > 0 from ZHSEQR, then quit
+      SDIM = 0
 *
-      IF( INFO.GT.0 )
-     $   GO TO 50
+*     Perform QR iteration, accumulating Schur vectors in VS if desired
+*     (CWorkspace: need 1, prefer HSWORK (see comments) )
+*     (RWorkspace: none)
 *
-      IF( WANTVL .OR. WANTVR ) THEN
+      IWRK = ITAU
+      CALL ZHSEQR( 'S', JOBVS, N, ILO, IHI, A, LDA, W, VS, LDVS,
+     $             WORK( IWRK ), LWORK-IWRK+1, IEVAL )
+      IF( IEVAL.GT.0 )
+     $   INFO = IEVAL
+*
+*     Sort eigenvalues if desired
+*
+      IF( WANTST .AND. INFO.EQ.0 ) THEN
+         IF( SCALEA )
+     $      CALL ZLASCL( 'G', 0, 0, CSCALE, ANRM, N, 1, W, N, IERR )
+         DO 10 I = 1, N
+            BWORK( I ) = SELECT( W( I ) )
+   10    CONTINUE
 *
-*        Compute left and/or right eigenvectors
-*        (CWorkspace: need 2*N)
-*        (RWorkspace: need 2*N)
+*        Reorder eigenvalues and transform Schur vectors
+*        (CWorkspace: none)
+*        (RWorkspace: none)
 *
-         IRWORK = IBAL + N
-         CALL ZTREVC( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
-     $                N, NOUT, WORK( IWRK ), RWORK( IRWORK ), IERR )
+         CALL ZTRSEN( 'N', JOBVS, BWORK, N, A, LDA, VS, LDVS, W, SDIM,
+     $                S, SEP, WORK( IWRK ), LWORK-IWRK+1, ICOND )
       END IF
 *
-      IF( WANTVL ) THEN
+      IF( WANTVS ) THEN
 *
-*        Undo balancing of left eigenvectors
+*        Undo balancing
 *        (CWorkspace: none)
 *        (RWorkspace: need N)
 *
-         CALL ZGEBAK( 'B', 'L', N, ILO, IHI, RWORK( IBAL ), N, VL, LDVL,
+         CALL ZGEBAK( 'P', 'R', N, ILO, IHI, RWORK( IBAL ), N, VS, LDVS,
      $                IERR )
+      END IF
 *
-*        Normalize left eigenvectors and make largest component real
+      IF( SCALEA ) THEN
 *
-         DO 20 I = 1, N
-            SCL = ONE / DZNRM2( N, VL( 1, I ), 1 )
-            CALL ZDSCAL( N, SCL, VL( 1, I ), 1 )
-            DO 10 K = 1, N
-               RWORK( IRWORK+K-1 ) = DBLE( VL( K, I ) )**2 +
-     $                               DIMAG( VL( K, I ) )**2
-   10       CONTINUE
-            K = IDAMAX( N, RWORK( IRWORK ), 1 )
-            TMP = DCONJG( VL( K, I ) ) / SQRT( RWORK( IRWORK+K-1 ) )
-            CALL ZSCAL( N, TMP, VL( 1, I ), 1 )
-            VL( K, I ) = DCMPLX( DBLE( VL( K, I ) ), ZERO )
-   20    CONTINUE
+*        Undo scaling for the Schur form of A
+*
+         CALL ZLASCL( 'U', 0, 0, CSCALE, ANRM, N, N, A, LDA, IERR )
+         CALL ZCOPY( N, A, LDA+1, W, 1 )
       END IF
 *
-      IF( WANTVR ) THEN
+      WORK( 1 ) = MAXWRK
+      RETURN
 *
-*        Undo balancing of right eigenvectors
-*        (CWorkspace: none)
-*        (RWorkspace: need N)
+*     End of ZGEES
 *
-         CALL ZGEBAK( 'B', 'R', N, ILO, IHI, RWORK( IBAL ), N, VR, LDVR,
-     $                IERR )
+      END
+*> \brief <b> ZGEEV computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
 *
-*        Normalize right eigenvectors and make largest component real
+*  =========== DOCUMENTATION ===========
 *
-         DO 40 I = 1, N
-            SCL = ONE / DZNRM2( N, VR( 1, I ), 1 )
-            CALL ZDSCAL( N, SCL, VR( 1, I ), 1 )
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZGEEV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeev.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeev.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeev.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
+*                         WORK, LWORK, RWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBVL, JOBVR
+*       INTEGER            INFO, LDA, LDVL, LDVR, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         A( LDA, * ), VL( LDVL, * ), VR( LDVR, * ),
+*      $                   W( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGEEV computes for an N-by-N complex nonsymmetric matrix A, the
+*> eigenvalues and, optionally, the left and/or right eigenvectors.
+*>
+*> The right eigenvector v(j) of A satisfies
+*>                  A * v(j) = lambda(j) * v(j)
+*> where lambda(j) is its eigenvalue.
+*> The left eigenvector u(j) of A satisfies
+*>               u(j)**H * A = lambda(j) * u(j)**H
+*> where u(j)**H denotes the conjugate transpose of u(j).
+*>
+*> The computed eigenvectors are normalized to have Euclidean norm
+*> equal to 1 and largest component real.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] JOBVL
+*> \verbatim
+*>          JOBVL is CHARACTER*1
+*>          = 'N': left eigenvectors of A are not computed;
+*>          = 'V': left eigenvectors of are computed.
+*> \endverbatim
+*>
+*> \param[in] JOBVR
+*> \verbatim
+*>          JOBVR is CHARACTER*1
+*>          = 'N': right eigenvectors of A are not computed;
+*>          = 'V': right eigenvectors of A are computed.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the N-by-N matrix A.
+*>          On exit, A has been overwritten.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is COMPLEX*16 array, dimension (N)
+*>          W contains the computed eigenvalues.
+*> \endverbatim
+*>
+*> \param[out] VL
+*> \verbatim
+*>          VL is COMPLEX*16 array, dimension (LDVL,N)
+*>          If JOBVL = 'V', the left eigenvectors u(j) are stored one
+*>          after another in the columns of VL, in the same order
+*>          as their eigenvalues.
+*>          If JOBVL = 'N', VL is not referenced.
+*>          u(j) = VL(:,j), the j-th column of VL.
+*> \endverbatim
+*>
+*> \param[in] LDVL
+*> \verbatim
+*>          LDVL is INTEGER
+*>          The leading dimension of the array VL.  LDVL >= 1; if
+*>          JOBVL = 'V', LDVL >= N.
+*> \endverbatim
+*>
+*> \param[out] VR
+*> \verbatim
+*>          VR is COMPLEX*16 array, dimension (LDVR,N)
+*>          If JOBVR = 'V', the right eigenvectors v(j) are stored one
+*>          after another in the columns of VR, in the same order
+*>          as their eigenvalues.
+*>          If JOBVR = 'N', VR is not referenced.
+*>          v(j) = VR(:,j), the j-th column of VR.
+*> \endverbatim
+*>
+*> \param[in] LDVR
+*> \verbatim
+*>          LDVR is INTEGER
+*>          The leading dimension of the array VR.  LDVR >= 1; if
+*>          JOBVR = 'V', LDVR >= N.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,2*N).
+*>          For good performance, LWORK must generally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  if INFO = i, the QR algorithm failed to compute all the
+*>                eigenvalues, and no eigenvectors have been computed;
+*>                elements and i+1:N of W contain eigenvalues which have
+*>                converged.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup complex16GEeigen
+*
+*  =====================================================================
+      SUBROUTINE ZGEEV( JOBVL, JOBVR, N, A, LDA, W, VL, LDVL, VR, LDVR,
+     $                  WORK, LWORK, RWORK, INFO )
+*
+*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      CHARACTER          JOBVL, JOBVR
+      INTEGER            INFO, LDA, LDVL, LDVR, LWORK, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         A( LDA, * ), VL( LDVL, * ), VR( LDVR, * ),
+     $                   W( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, SCALEA, WANTVL, WANTVR
+      CHARACTER          SIDE
+      INTEGER            HSWORK, I, IBAL, IERR, IHI, ILO, IRWORK, ITAU,
+     $                   IWRK, K, MAXWRK, MINWRK, NOUT
+      DOUBLE PRECISION   ANRM, BIGNUM, CSCALE, EPS, SCL, SMLNUM
+      COMPLEX*16         TMP
+*     ..
+*     .. Local Arrays ..
+      LOGICAL            SELECT( 1 )
+      DOUBLE PRECISION   DUM( 1 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, XERBLA, ZDSCAL, ZGEBAK, ZGEBAL, ZGEHRD,
+     $                   ZHSEQR, ZLACPY, ZLASCL, ZSCAL, ZTREVC, ZUNGHR
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            IDAMAX, ILAENV
+      DOUBLE PRECISION   DLAMCH, DZNRM2, ZLANGE
+      EXTERNAL           LSAME, IDAMAX, ILAENV, DLAMCH, DZNRM2, ZLANGE
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, DCONJG, DIMAG, MAX, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments
+*
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      WANTVL = LSAME( JOBVL, 'V' )
+      WANTVR = LSAME( JOBVR, 'V' )
+      IF( ( .NOT.WANTVL ) .AND. ( .NOT.LSAME( JOBVL, 'N' ) ) ) THEN
+         INFO = -1
+      ELSE IF( ( .NOT.WANTVR ) .AND. ( .NOT.LSAME( JOBVR, 'N' ) ) ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDVL.LT.1 .OR. ( WANTVL .AND. LDVL.LT.N ) ) THEN
+         INFO = -8
+      ELSE IF( LDVR.LT.1 .OR. ( WANTVR .AND. LDVR.LT.N ) ) THEN
+         INFO = -10
+      END IF
+*
+*     Compute workspace
+*      (Note: Comments in the code beginning "Workspace:" describe the
+*       minimal amount of workspace needed at that point in the code,
+*       as well as the preferred amount for good performance.
+*       CWorkspace refers to complex workspace, and RWorkspace to real
+*       workspace. NB refers to the optimal block size for the
+*       immediately following subroutine, as returned by ILAENV.
+*       HSWORK refers to the workspace preferred by ZHSEQR, as
+*       calculated below. HSWORK is computed assuming ILO=1 and IHI=N,
+*       the worst case.)
+*
+      IF( INFO.EQ.0 ) THEN
+         IF( N.EQ.0 ) THEN
+            MINWRK = 1
+            MAXWRK = 1
+         ELSE
+            MAXWRK = N + N*ILAENV( 1, 'ZGEHRD', ' ', N, 1, N, 0 )
+            MINWRK = 2*N
+            IF( WANTVL ) THEN
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+     $                       ' ', N, 1, N, -1 ) )
+               CALL ZHSEQR( 'S', 'V', N, 1, N, A, LDA, W, VL, LDVL,
+     $                WORK, -1, INFO )
+            ELSE IF( WANTVR ) THEN
+               MAXWRK = MAX( MAXWRK, N + ( N - 1 )*ILAENV( 1, 'ZUNGHR',
+     $                       ' ', N, 1, N, -1 ) )
+               CALL ZHSEQR( 'S', 'V', N, 1, N, A, LDA, W, VR, LDVR,
+     $                WORK, -1, INFO )
+            ELSE
+               CALL ZHSEQR( 'E', 'N', N, 1, N, A, LDA, W, VR, LDVR,
+     $                WORK, -1, INFO )
+            END IF
+            HSWORK = WORK( 1 )
+            MAXWRK = MAX( MAXWRK, HSWORK, MINWRK )
+         END IF
+         WORK( 1 ) = MAXWRK
+*
+         IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
+            INFO = -12
+         END IF
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGEEV ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     Get machine constants
+*
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+      SMLNUM = SQRT( SMLNUM ) / EPS
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = ZLANGE( 'M', N, N, A, LDA, DUM )
+      SCALEA = .FALSE.
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+         SCALEA = .TRUE.
+         CSCALE = SMLNUM
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+         SCALEA = .TRUE.
+         CSCALE = BIGNUM
+      END IF
+      IF( SCALEA )
+     $   CALL ZLASCL( 'G', 0, 0, ANRM, CSCALE, N, N, A, LDA, IERR )
+*
+*     Balance the matrix
+*     (CWorkspace: none)
+*     (RWorkspace: need N)
+*
+      IBAL = 1
+      CALL ZGEBAL( 'B', N, A, LDA, ILO, IHI, RWORK( IBAL ), IERR )
+*
+*     Reduce to upper Hessenberg form
+*     (CWorkspace: need 2*N, prefer N+N*NB)
+*     (RWorkspace: none)
+*
+      ITAU = 1
+      IWRK = ITAU + N
+      CALL ZGEHRD( N, ILO, IHI, A, LDA, WORK( ITAU ), WORK( IWRK ),
+     $             LWORK-IWRK+1, IERR )
+*
+      IF( WANTVL ) THEN
+*
+*        Want left eigenvectors
+*        Copy Householder vectors to VL
+*
+         SIDE = 'L'
+         CALL ZLACPY( 'L', N, N, A, LDA, VL, LDVL )
+*
+*        Generate unitary matrix in VL
+*        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
+*        (RWorkspace: none)
+*
+         CALL ZUNGHR( N, ILO, IHI, VL, LDVL, WORK( ITAU ), WORK( IWRK ),
+     $                LWORK-IWRK+1, IERR )
+*
+*        Perform QR iteration, accumulating Schur vectors in VL
+*        (CWorkspace: need 1, prefer HSWORK (see comments) )
+*        (RWorkspace: none)
+*
+         IWRK = ITAU
+         CALL ZHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, W, VL, LDVL,
+     $                WORK( IWRK ), LWORK-IWRK+1, INFO )
+*
+         IF( WANTVR ) THEN
+*
+*           Want left and right eigenvectors
+*           Copy Schur vectors to VR
+*
+            SIDE = 'B'
+            CALL ZLACPY( 'F', N, N, VL, LDVL, VR, LDVR )
+         END IF
+*
+      ELSE IF( WANTVR ) THEN
+*
+*        Want right eigenvectors
+*        Copy Householder vectors to VR
+*
+         SIDE = 'R'
+         CALL ZLACPY( 'L', N, N, A, LDA, VR, LDVR )
+*
+*        Generate unitary matrix in VR
+*        (CWorkspace: need 2*N-1, prefer N+(N-1)*NB)
+*        (RWorkspace: none)
+*
+         CALL ZUNGHR( N, ILO, IHI, VR, LDVR, WORK( ITAU ), WORK( IWRK ),
+     $                LWORK-IWRK+1, IERR )
+*
+*        Perform QR iteration, accumulating Schur vectors in VR
+*        (CWorkspace: need 1, prefer HSWORK (see comments) )
+*        (RWorkspace: none)
+*
+         IWRK = ITAU
+         CALL ZHSEQR( 'S', 'V', N, ILO, IHI, A, LDA, W, VR, LDVR,
+     $                WORK( IWRK ), LWORK-IWRK+1, INFO )
+*
+      ELSE
+*
+*        Compute eigenvalues only
+*        (CWorkspace: need 1, prefer HSWORK (see comments) )
+*        (RWorkspace: none)
+*
+         IWRK = ITAU
+         CALL ZHSEQR( 'E', 'N', N, ILO, IHI, A, LDA, W, VR, LDVR,
+     $                WORK( IWRK ), LWORK-IWRK+1, INFO )
+      END IF
+*
+*     If INFO > 0 from ZHSEQR, then quit
+*
+      IF( INFO.GT.0 )
+     $   GO TO 50
+*
+      IF( WANTVL .OR. WANTVR ) THEN
+*
+*        Compute left and/or right eigenvectors
+*        (CWorkspace: need 2*N)
+*        (RWorkspace: need 2*N)
+*
+         IRWORK = IBAL + N
+         CALL ZTREVC( SIDE, 'B', SELECT, N, A, LDA, VL, LDVL, VR, LDVR,
+     $                N, NOUT, WORK( IWRK ), RWORK( IRWORK ), IERR )
+      END IF
+*
+      IF( WANTVL ) THEN
+*
+*        Undo balancing of left eigenvectors
+*        (CWorkspace: none)
+*        (RWorkspace: need N)
+*
+         CALL ZGEBAK( 'B', 'L', N, ILO, IHI, RWORK( IBAL ), N, VL, LDVL,
+     $                IERR )
+*
+*        Normalize left eigenvectors and make largest component real
+*
+         DO 20 I = 1, N
+            SCL = ONE / DZNRM2( N, VL( 1, I ), 1 )
+            CALL ZDSCAL( N, SCL, VL( 1, I ), 1 )
+            DO 10 K = 1, N
+               RWORK( IRWORK+K-1 ) = DBLE( VL( K, I ) )**2 +
+     $                               DIMAG( VL( K, I ) )**2
+   10       CONTINUE
+            K = IDAMAX( N, RWORK( IRWORK ), 1 )
+            TMP = DCONJG( VL( K, I ) ) / SQRT( RWORK( IRWORK+K-1 ) )
+            CALL ZSCAL( N, TMP, VL( 1, I ), 1 )
+            VL( K, I ) = DCMPLX( DBLE( VL( K, I ) ), ZERO )
+   20    CONTINUE
+      END IF
+*
+      IF( WANTVR ) THEN
+*
+*        Undo balancing of right eigenvectors
+*        (CWorkspace: none)
+*        (RWorkspace: need N)
+*
+         CALL ZGEBAK( 'B', 'R', N, ILO, IHI, RWORK( IBAL ), N, VR, LDVR,
+     $                IERR )
+*
+*        Normalize right eigenvectors and make largest component real
+*
+         DO 40 I = 1, N
+            SCL = ONE / DZNRM2( N, VR( 1, I ), 1 )
+            CALL ZDSCAL( N, SCL, VR( 1, I ), 1 )
             DO 30 K = 1, N
                RWORK( IRWORK+K-1 ) = DBLE( VR( K, I ) )**2 +
      $                               DIMAG( VR( K, I ) )**2
@@ -3990,8 +4705,7 @@
 *> \verbatim
 *>          LWORK is INTEGER
 *>          The length of the array WORK.  LWORK >= max(1,N).
-*>          For optimum performance LWORK >= N*NB, where NB is the
-*>          optimal blocksize.
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -4014,7 +4728,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup complex16GEcomputational
 *
@@ -4061,10 +4775,10 @@
 *  =====================================================================
       SUBROUTINE ZGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
@@ -4076,21 +4790,19 @@
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
       COMPLEX*16        ZERO, ONE
       PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ), 
      $                     ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, J, LDWORK, LWKOPT, NB,
+      INTEGER            I, IB, IINFO, IWT, J, LDWORK, LWKOPT, NB,
      $                   NBMIN, NH, NX
       COMPLEX*16        EI
 *     ..
-*     .. Local Arrays ..
-      COMPLEX*16        T( LDT, NBMAX )
-*     ..
 *     .. External Subroutines ..
       EXTERNAL           ZAXPY, ZGEHD2, ZGEMM, ZLAHR2, ZLARFB, ZTRMM,
      $                   XERBLA
@@ -4107,9 +4819,6 @@
 *     Test the input parameters
 *
       INFO = 0
-      NB = MIN( NBMAX, ILAENV( 1, 'ZGEHRD', ' ', N, ILO, IHI, -1 ) )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( N.LT.0 ) THEN
          INFO = -1
@@ -4122,6 +4831,16 @@
       ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
          INFO = -8
       END IF
+*
+      IF( INFO.EQ.0 ) THEN
+*
+*        Compute the workspace requirements
+*
+         NB = MIN( NBMAX, ILAENV( 1, 'ZGEHRD', ' ', N, ILO, IHI, -1 ) )
+         LWKOPT = N*NB + TSIZE
+         WORK( 1 ) = LWKOPT
+      ENDIF
+*
       IF( INFO.NE.0 ) THEN
          CALL XERBLA( 'ZGEHRD', -INFO )
          RETURN
@@ -4150,7 +4869,6 @@
 *
       NB = MIN( NBMAX, ILAENV( 1, 'ZGEHRD', ' ', N, ILO, IHI, -1 ) )
       NBMIN = 2
-      IWS = 1
       IF( NB.GT.1 .AND. NB.LT.NH ) THEN
 *
 *        Determine when to cross over from blocked to unblocked code
@@ -4161,8 +4879,7 @@
 *
 *           Determine if workspace is large enough for blocked code
 *
-            IWS = N*NB
-            IF( LWORK.LT.IWS ) THEN
+            IF( LWORK.LT.N*NB+TSIZE ) THEN
 *
 *              Not enough workspace to use optimal NB:  determine the
 *              minimum value of NB, and reduce NB or force use of
@@ -4170,8 +4887,8 @@
 *
                NBMIN = MAX( 2, ILAENV( 2, 'ZGEHRD', ' ', N, ILO, IHI,
      $                 -1 ) )
-               IF( LWORK.GE.N*NBMIN ) THEN
-                  NB = LWORK / N
+               IF( LWORK.GE.(N*NBMIN + TSIZE) ) THEN
+                  NB = (LWORK-TSIZE) / N
                ELSE
                   NB = 1
                END IF
@@ -4190,6 +4907,7 @@
 *
 *        Use blocked code
 *
+         IWT = 1 + N*NB
          DO 40 I = ILO, IHI - 1 - NX, NB
             IB = MIN( NB, IHI-I )
 *
@@ -4197,8 +4915,8 @@
 *           matrices V and T of the block reflector H = I - V*T*V**H
 *           which performs the reduction, and also the matrix Y = A*V*T
 *
-            CALL ZLAHR2( IHI, I, IB, A( 1, I ), LDA, TAU( I ), T, LDT,
-     $                   WORK, LDWORK )
+            CALL ZLAHR2( IHI, I, IB, A( 1, I ), LDA, TAU( I ),
+     $                   WORK( IWT ), LDT, WORK, LDWORK )
 *
 *           Apply the block reflector H to A(1:ihi,i+ib:ihi) from the
 *           right, computing  A := A - Y * V**H. V(i+ib,ib-1) must be set
@@ -4228,15 +4946,16 @@
 *
             CALL ZLARFB( 'Left', 'Conjugate transpose', 'Forward',
      $                   'Columnwise',
-     $                   IHI-I, N-I-IB+1, IB, A( I+1, I ), LDA, T, LDT,
-     $                   A( I+1, I+IB ), LDA, WORK, LDWORK )
+     $                   IHI-I, N-I-IB+1, IB, A( I+1, I ), LDA,
+     $                   WORK( IWT ), LDT, A( I+1, I+IB ), LDA,
+     $                   WORK, LDWORK )
    40    CONTINUE
       END IF
 *
 *     Use unblocked code to reduce the rest of the matrix
 *
       CALL ZGEHD2( N, I, IHI, A, LDA, TAU, WORK, IINFO )
-      WORK( 1 ) = IWS
+      WORK( 1 ) = LWKOPT
 *
       RETURN
 *
@@ -4706,7 +5425,7 @@
 *     End of ZGELQF
 *
       END
-*> \brief \b ZGEQP3
+*> \brief <b> ZGELS solves overdetermined or underdetermined systems for GE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -4714,28 +5433,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGEQP3 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqp3.f"> 
+*> Download ZGELS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgels.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqp3.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgels.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqp3.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgels.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
-*                          INFO )
+*       SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+*                         INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, LWORK, M, N
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            JPVT( * )
-*       DOUBLE PRECISION   RWORK( * )
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
 *       ..
 *  
 *
@@ -4744,70 +5462,119 @@
 *>
 *> \verbatim
 *>
-*> ZGEQP3 computes a QR factorization with column pivoting of a
-*> matrix A:  A*P = Q*R  using Level 3 BLAS.
+*> ZGELS solves overdetermined or underdetermined complex linear systems
+*> involving an M-by-N matrix A, or its conjugate-transpose, using a QR
+*> or LQ factorization of A.  It is assumed that A has full rank.
+*>
+*> The following options are provided:
+*>
+*> 1. If TRANS = 'N' and m >= n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A*X ||.
+*>
+*> 2. If TRANS = 'N' and m < n:  find the minimum norm solution of
+*>    an underdetermined system A * X = B.
+*>
+*> 3. If TRANS = 'C' and m >= n:  find the minimum norm solution of
+*>    an undetermined system A**H * X = B.
+*>
+*> 4. If TRANS = 'C' and m < n:  find the least squares solution of
+*>    an overdetermined system, i.e., solve the least squares problem
+*>                 minimize || B - A**H * X ||.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] TRANS
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A. M >= 0.
+*>          TRANS is CHARACTER*1
+*>          = 'N': the linear system involves A;
+*>          = 'C': the linear system involves A**H.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
 *> \verbatim
 *>          N is INTEGER
 *>          The number of columns of the matrix A.  N >= 0.
 *> \endverbatim
 *>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of the matrices B and X. NRHS >= 0.
+*> \endverbatim
+*>
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
 *>          On entry, the M-by-N matrix A.
-*>          On exit, the upper triangle of the array contains the
-*>          min(M,N)-by-N upper trapezoidal matrix R; the elements below
-*>          the diagonal, together with the array TAU, represent the
-*>          unitary matrix Q as a product of min(M,N) elementary
-*>          reflectors.
+*>            if M >= N, A is overwritten by details of its QR
+*>                       factorization as returned by ZGEQRF;
+*>            if M <  N, A is overwritten by details of its LQ
+*>                       factorization as returned by ZGELQF.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          The leading dimension of the array A.  LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in,out] JPVT
+*> \param[in,out] B
 *> \verbatim
-*>          JPVT is INTEGER array, dimension (N)
-*>          On entry, if JPVT(J).ne.0, the J-th column of A is permuted
-*>          to the front of A*P (a leading column); if JPVT(J)=0,
-*>          the J-th column of A is a free column.
-*>          On exit, if JPVT(J)=K, then the J-th column of A*P was the
-*>          the K-th column of A.
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the matrix B of right hand side vectors, stored
+*>          columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS
+*>          if TRANS = 'C'.
+*>          On exit, if INFO = 0, B is overwritten by the solution
+*>          vectors, stored columnwise:
+*>          if TRANS = 'N' and m >= n, rows 1 to n of B contain the least
+*>          squares solution vectors; the residual sum of squares for the
+*>          solution in each column is given by the sum of squares of the
+*>          modulus of elements N+1 to M in that column;
+*>          if TRANS = 'N' and m < n, rows 1 to N of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'C' and m >= n, rows 1 to M of B contain the
+*>          minimum norm solution vectors;
+*>          if TRANS = 'C' and m < n, rows 1 to M of B contain the
+*>          least squares solution vectors; the residual sum of squares
+*>          for the solution in each column is given by the sum of
+*>          squares of the modulus of elements M+1 to N in that column.
 *> \endverbatim
 *>
-*> \param[out] TAU
+*> \param[in] LDB
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (min(M,N))
-*>          The scalar factors of the elementary reflectors.
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= MAX(1,M,N).
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
 *>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO=0, WORK(1) returns the optimal LWORK.
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= N+1.
-*>          For optimal performance LWORK >= ( N+1 )*NB, where NB
-*>          is the optimal blocksize.
+*>          The dimension of the array WORK.
+*>          LWORK >= max( 1, MN + max( MN, NRHS ) ).
+*>          For optimal performance,
+*>          LWORK >= max( 1, MN + max( MN, NRHS )*NB ).
+*>          where MN = min(M,N) and NB is the optimum block size.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -4815,16 +5582,15 @@
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[out] RWORK
-*> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
-*> \endverbatim
-*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit.
-*>          < 0: if INFO = -i, the i-th argument had an illegal value.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO =  i, the i-th diagonal element of the
+*>                triangular factor of A is zero, so that A does not have
+*>                full rank; the least squares solution could not be
+*>                computed.
 *> \endverbatim
 *
 *  Authors:
@@ -4835,256 +5601,336 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
-*
-*> \ingroup complex16GEcomputational
+*> \date November 2011
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of elementary reflectors
-*>
-*>     Q = H(1) H(2) . . . H(k), where k = min(m,n).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a real/complex vector
-*>  with v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in
-*>  A(i+1:m,i), and tau in TAU(i).
-*> \endverbatim
+*> \ingroup complex16GEsolve
 *
-*> \par Contributors:
-*  ==================
-*>
-*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain
-*>    X. Sun, Computer Science Dept., Duke University, USA
-*>
 *  =====================================================================
-      SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
-     $                   INFO )
+      SUBROUTINE ZGELS( TRANS, M, N, NRHS, A, LDA, B, LDB, WORK, LWORK,
+     $                  INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, LWORK, M, N
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS
 *     ..
 *     .. Array Arguments ..
-      INTEGER            JPVT( * )
-      DOUBLE PRECISION   RWORK( * )
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            INB, INBMIN, IXOVER
-      PARAMETER          ( INB = 1, INBMIN = 2, IXOVER = 3 )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            FJB, IWS, J, JB, LWKOPT, MINMN, MINWS, NA, NB,
-     $                   NBMIN, NFXD, NX, SM, SMINMN, SN, TOPBMN
+      LOGICAL            LQUERY, TPSD
+      INTEGER            BROW, I, IASCL, IBSCL, J, MN, NB, SCLLEN, WSIZE
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, SMLNUM
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEQRF, ZLAQP2, ZLAQPS, ZSWAP, ZUNMQR
+*     .. Local Arrays ..
+      DOUBLE PRECISION   RWORK( 1 )
 *     ..
 *     .. External Functions ..
+      LOGICAL            LSAME
       INTEGER            ILAENV
-      DOUBLE PRECISION   DZNRM2
-      EXTERNAL           ILAENV, DZNRM2
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, XERBLA, ZGELQF, ZGEQRF, ZLASCL, ZLASET,
+     $                   ZTRTRS, ZUNMLQ, ZUNMQR
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          INT, MAX, MIN
+      INTRINSIC          DBLE, MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test input arguments
-*  ====================
+*     Test the input arguments.
 *
       INFO = 0
+      MN = MIN( M, N )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
+      IF( .NOT.( LSAME( TRANS, 'N' ) .OR. LSAME( TRANS, 'C' ) ) ) THEN
          INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( M.LT.0 ) THEN
          INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.0 ) THEN
          INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -6
+      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
+         INFO = -8
+      ELSE IF( LWORK.LT.MAX( 1, MN+MAX( MN, NRHS ) ) .AND. .NOT.LQUERY )
+     $          THEN
+         INFO = -10
       END IF
 *
-      IF( INFO.EQ.0 ) THEN
-         MINMN = MIN( M, N )
-         IF( MINMN.EQ.0 ) THEN
-            IWS = 1
-            LWKOPT = 1
+*     Figure out optimal block size
+*
+      IF( INFO.EQ.0 .OR. INFO.EQ.-10 ) THEN
+*
+         TPSD = .TRUE.
+         IF( LSAME( TRANS, 'N' ) )
+     $      TPSD = .FALSE.
+*
+         IF( M.GE.N ) THEN
+            NB = ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
+            IF( TPSD ) THEN
+               NB = MAX( NB, ILAENV( 1, 'ZUNMQR', 'LN', M, NRHS, N,
+     $              -1 ) )
+            ELSE
+               NB = MAX( NB, ILAENV( 1, 'ZUNMQR', 'LC', M, NRHS, N,
+     $              -1 ) )
+            END IF
          ELSE
-            IWS = N + 1
-            NB = ILAENV( INB, 'ZGEQRF', ' ', M, N, -1, -1 )
-            LWKOPT = ( N + 1 )*NB
+            NB = ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
+            IF( TPSD ) THEN
+               NB = MAX( NB, ILAENV( 1, 'ZUNMLQ', 'LC', N, NRHS, M,
+     $              -1 ) )
+            ELSE
+               NB = MAX( NB, ILAENV( 1, 'ZUNMLQ', 'LN', N, NRHS, M,
+     $              -1 ) )
+            END IF
          END IF
-         WORK( 1 ) = LWKOPT
 *
-         IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
-            INFO = -8
-         END IF
+         WSIZE = MAX( 1, MN+MAX( MN, NRHS )*NB )
+         WORK( 1 ) = DBLE( WSIZE )
+*
       END IF
 *
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGEQP3', -INFO )
+         CALL XERBLA( 'ZGELS ', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
-*     Quick return if possible.
+*     Quick return if possible
 *
-      IF( MINMN.EQ.0 ) THEN
+      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         CALL ZLASET( 'Full', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
          RETURN
       END IF
 *
-*     Move initial columns up front.
+*     Get machine parameters
 *
-      NFXD = 1
-      DO 10 J = 1, N
-         IF( JPVT( J ).NE.0 ) THEN
-            IF( J.NE.NFXD ) THEN
-               CALL ZSWAP( M, A( 1, J ), 1, A( 1, NFXD ), 1 )
-               JPVT( J ) = JPVT( NFXD )
-               JPVT( NFXD ) = J
-            ELSE
-               JPVT( J ) = J
-            END IF
-            NFXD = NFXD + 1
-         ELSE
-            JPVT( J ) = J
-         END IF
-   10 CONTINUE
-      NFXD = NFXD - 1
+      SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
 *
-*     Factorize fixed columns
-*  =======================
+*     Scale A, B if max element outside range [SMLNUM,BIGNUM]
 *
-*     Compute the QR factorization of fixed columns and update
-*     remaining columns.
+      ANRM = ZLANGE( 'M', M, N, A, LDA, RWORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
 *
-      IF( NFXD.GT.0 ) THEN
-         NA = MIN( M, NFXD )
-*CC      CALL ZGEQR2( M, NA, A, LDA, TAU, WORK, INFO )
-         CALL ZGEQRF( M, NA, A, LDA, TAU, WORK, LWORK, INFO )
-         IWS = MAX( IWS, INT( WORK( 1 ) ) )
-         IF( NA.LT.N ) THEN
-*CC         CALL ZUNM2R( 'Left', 'Conjugate Transpose', M, N-NA,
-*CC  $                   NA, A, LDA, TAU, A( 1, NA+1 ), LDA, WORK,
-*CC  $                   INFO )
-            CALL ZUNMQR( 'Left', 'Conjugate Transpose', M, N-NA, NA, A,
-     $                   LDA, TAU, A( 1, NA+1 ), LDA, WORK, LWORK,
-     $                   INFO )
-            IWS = MAX( IWS, INT( WORK( 1 ) ) )
-         END IF
+*        Scale matrix norm up to SMLNUM
+*
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL ZLASET( 'F', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
+         GO TO 50
       END IF
 *
-*     Factorize free columns
-*  ======================
+      BROW = M
+      IF( TPSD )
+     $   BROW = N
+      BNRM = ZLANGE( 'M', BROW, NRHS, B, LDB, RWORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
 *
-      IF( NFXD.LT.MINMN ) THEN
+*        Scale matrix norm up to SMLNUM
 *
-         SM = M - NFXD
-         SN = N - NFXD
-         SMINMN = MINMN - NFXD
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
 *
-*        Determine the block size.
+*        Scale matrix norm down to BIGNUM
 *
-         NB = ILAENV( INB, 'ZGEQRF', ' ', SM, SN, -1, -1 )
-         NBMIN = 2
-         NX = 0
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, BROW, NRHS, B, LDB,
+     $                INFO )
+         IBSCL = 2
+      END IF
 *
-         IF( ( NB.GT.1 ) .AND. ( NB.LT.SMINMN ) ) THEN
+      IF( M.GE.N ) THEN
 *
-*           Determine when to cross over from blocked to unblocked code.
+*        compute QR factorization of A
 *
-            NX = MAX( 0, ILAENV( IXOVER, 'ZGEQRF', ' ', SM, SN, -1,
-     $           -1 ) )
+         CALL ZGEQRF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+     $                INFO )
 *
+*        workspace at least N, optimally N*NB
 *
-            IF( NX.LT.SMINMN ) THEN
+         IF( .NOT.TPSD ) THEN
 *
-*              Determine if workspace is large enough for blocked code.
+*           Least-Squares Problem min || A * X - B ||
 *
-               MINWS = ( SN+1 )*NB
-               IWS = MAX( IWS, MINWS )
-               IF( LWORK.LT.MINWS ) THEN
+*           B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
 *
-*                 Not enough workspace to use optimal NB: Reduce NB and
-*                 determine the minimum value of NB.
+            CALL ZUNMQR( 'Left', 'Conjugate transpose', M, NRHS, N, A,
+     $                   LDA, WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
+     $                   INFO )
 *
-                  NB = LWORK / ( SN+1 )
-                  NBMIN = MAX( 2, ILAENV( INBMIN, 'ZGEQRF', ' ', SM, SN,
-     $                    -1, -1 ) )
+*           workspace at least NRHS, optimally NRHS*NB
 *
+*           B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS)
 *
-               END IF
+            CALL ZTRTRS( 'Upper', 'No transpose', 'Non-unit', N, NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
             END IF
-         END IF
 *
-*        Initialize partial column norms. The first N elements of work
-*        store the exact column norms.
+            SCLLEN = N
 *
-         DO 20 J = NFXD + 1, N
-            RWORK( J ) = DZNRM2( SM, A( NFXD+1, J ), 1 )
-            RWORK( N+J ) = RWORK( J )
-   20    CONTINUE
+         ELSE
 *
-         IF( ( NB.GE.NBMIN ) .AND. ( NB.LT.SMINMN ) .AND.
-     $       ( NX.LT.SMINMN ) ) THEN
+*           Overdetermined system of equations A**H * X = B
 *
-*           Use blocked code initially.
+*           B(1:N,1:NRHS) := inv(R**H) * B(1:N,1:NRHS)
 *
-            J = NFXD + 1
+            CALL ZTRTRS( 'Upper', 'Conjugate transpose','Non-unit',
+     $                   N, NRHS, A, LDA, B, LDB, INFO )
 *
-*           Compute factorization: while loop.
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
 *
+*           B(N+1:M,1:NRHS) = ZERO
 *
-            TOPBMN = MINMN - NX
-   30       CONTINUE
-            IF( J.LE.TOPBMN ) THEN
-               JB = MIN( NB, TOPBMN-J+1 )
+            DO 20 J = 1, NRHS
+               DO 10 I = N + 1, M
+                  B( I, J ) = CZERO
+   10          CONTINUE
+   20       CONTINUE
 *
-*              Factorize JB columns among columns J:N.
+*           B(1:M,1:NRHS) := Q(1:N,:) * B(1:N,1:NRHS)
 *
-               CALL ZLAQPS( M, N-J+1, J-1, JB, FJB, A( 1, J ), LDA,
-     $                      JPVT( J ), TAU( J ), RWORK( J ),
-     $                      RWORK( N+J ), WORK( 1 ), WORK( JB+1 ),
-     $                      N-J+1 )
+            CALL ZUNMQR( 'Left', 'No transpose', M, NRHS, N, A, LDA,
+     $                   WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
+     $                   INFO )
 *
-               J = J + FJB
-               GO TO 30
+*           workspace at least NRHS, optimally NRHS*NB
+*
+            SCLLEN = M
+*
+         END IF
+*
+      ELSE
+*
+*        Compute LQ factorization of A
+*
+         CALL ZGELQF( M, N, A, LDA, WORK( 1 ), WORK( MN+1 ), LWORK-MN,
+     $                INFO )
+*
+*        workspace at least M, optimally M*NB.
+*
+         IF( .NOT.TPSD ) THEN
+*
+*           underdetermined system of equations A * X = B
+*
+*           B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS)
+*
+            CALL ZTRTRS( 'Lower', 'No transpose', 'Non-unit', M, NRHS,
+     $                   A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
             END IF
+*
+*           B(M+1:N,1:NRHS) = 0
+*
+            DO 40 J = 1, NRHS
+               DO 30 I = M + 1, N
+                  B( I, J ) = CZERO
+   30          CONTINUE
+   40       CONTINUE
+*
+*           B(1:N,1:NRHS) := Q(1:N,:)**H * B(1:M,1:NRHS)
+*
+            CALL ZUNMLQ( 'Left', 'Conjugate transpose', N, NRHS, M, A,
+     $                   LDA, WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
+     $                   INFO )
+*
+*           workspace at least NRHS, optimally NRHS*NB
+*
+            SCLLEN = N
+*
          ELSE
-            J = NFXD + 1
-         END IF
 *
-*        Use unblocked code to factor the last or only block.
+*           overdetermined system min || A**H * X - B ||
 *
+*           B(1:N,1:NRHS) := Q * B(1:N,1:NRHS)
 *
-         IF( J.LE.MINMN )
-     $      CALL ZLAQP2( M, N-J+1, J-1, A( 1, J ), LDA, JPVT( J ),
-     $                   TAU( J ), RWORK( J ), RWORK( N+J ), WORK( 1 ) )
+            CALL ZUNMLQ( 'Left', 'No transpose', N, NRHS, M, A, LDA,
+     $                   WORK( 1 ), B, LDB, WORK( MN+1 ), LWORK-MN,
+     $                   INFO )
+*
+*           workspace at least NRHS, optimally NRHS*NB
+*
+*           B(1:M,1:NRHS) := inv(L**H) * B(1:M,1:NRHS)
+*
+            CALL ZTRTRS( 'Lower', 'Conjugate transpose', 'Non-unit',
+     $                   M, NRHS, A, LDA, B, LDB, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+               RETURN
+            END IF
+*
+            SCLLEN = M
+*
+         END IF
 *
       END IF
 *
-      WORK( 1 ) = IWS
+*     Undo scaling
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, SCLLEN, NRHS, B, LDB,
+     $                INFO )
+      END IF
+*
+   50 CONTINUE
+      WORK( 1 ) = DBLE( WSIZE )
+*
       RETURN
 *
-*     End of ZGEQP3
+*     End of ZGELS
 *
       END
-*> \brief \b ZGEQR2 computes the QR factorization of a general rectangular matrix using an unblocked algorithm.
+*> \brief <b> ZGELSD computes the minimum-norm solution to a linear least squares problem for GE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -5092,25 +5938,29 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGEQR2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqr2.f"> 
+*> Download ZGELSD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelsd.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqr2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgelsd.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqr2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelsd.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
+*       SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
+*                          WORK, LWORK, RWORK, IWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, M, N
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
+*       DOUBLE PRECISION   RCOND
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   RWORK( * ), S( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
 *       ..
 *  
 *
@@ -5119,8 +5969,35 @@
 *>
 *> \verbatim
 *>
-*> ZGEQR2 computes a QR factorization of a complex m by n matrix A:
-*> A = Q * R.
+*> ZGELSD computes the minimum-norm solution to a real linear least
+*> squares problem:
+*>     minimize 2-norm(| b - A*x |)
+*> using the singular value decomposition (SVD) of A. A is an M-by-N
+*> matrix which may be rank-deficient.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
+*>
+*> The problem is solved in three steps:
+*> (1) Reduce the coefficient matrix A to bidiagonal form with
+*>     Householder tranformations, reducing the original problem
+*>     into a "bidiagonal least squares problem" (BLS)
+*> (2) Solve the BLS using a divide and conquer approach.
+*> (3) Apply back all the Householder tranformations to solve
+*>     the original least squares problem.
+*>
+*> The effective rank of A is determined by treating as zero those
+*> singular values which are less than RCOND times the largest singular
+*> value.
+*>
+*> The divide and conquer algorithm makes very mild assumptions about
+*> floating point arithmetic. It will work on machines with a guard
+*> digit in add/subtract, or on those binary machines without guard
+*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
+*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
+*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
@@ -5129,49 +6006,132 @@
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
+*>          The number of rows of the matrix A. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
+*>          The number of columns of the matrix A. N >= 0.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of columns
+*>          of the matrices B and X. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the m by n matrix A.
-*>          On exit, the elements on and above the diagonal of the array
-*>          contain the min(m,n) by n upper trapezoidal matrix R (R is
-*>          upper triangular if m >= n); the elements below the diagonal,
-*>          with the array TAU, represent the unitary matrix Q as a
-*>          product of elementary reflectors (see Further Details).
+*>          On entry, the M-by-N matrix A.
+*>          On exit, A has been destroyed.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
+*>          The leading dimension of the array A. LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[out] TAU
+*> \param[in,out] B
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (min(M,N))
-*>          The scalar factors of the elementary reflectors (see Further
-*>          Details).
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the M-by-NRHS right hand side matrix B.
+*>          On exit, B is overwritten by the N-by-NRHS solution matrix X.
+*>          If m >= n and RANK = n, the residual sum-of-squares for
+*>          the solution in the i-th column is given by the sum of
+*>          squares of the modulus of elements n+1:m in that column.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,M,N).
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension (min(M,N))
+*>          The singular values of A in decreasing order.
+*>          The condition number of A in the 2-norm = S(1)/S(min(m,n)).
+*> \endverbatim
+*>
+*> \param[in] RCOND
+*> \verbatim
+*>          RCOND is DOUBLE PRECISION
+*>          RCOND is used to determine the effective rank of A.
+*>          Singular values S(i) <= RCOND*S(1) are treated as zero.
+*>          If RCOND < 0, machine precision is used instead.
+*> \endverbatim
+*>
+*> \param[out] RANK
+*> \verbatim
+*>          RANK is INTEGER
+*>          The effective rank of A, i.e., the number of singular values
+*>          which are greater than RCOND*S(1).
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (N)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK must be at least 1.
+*>          The exact minimum amount of workspace needed depends on M,
+*>          N and NRHS. As long as LWORK is at least
+*>              2*N + N*NRHS
+*>          if M is greater than or equal to N or
+*>              2*M + M*NRHS
+*>          if M is less than N, the code will execute correctly.
+*>          For good performance, LWORK should generally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the array WORK and the
+*>          minimum sizes of the arrays RWORK and IWORK, and returns
+*>          these values as the first entries of the WORK, RWORK and
+*>          IWORK arrays, and no error message related to LWORK is issued
+*>          by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,LRWORK))
+*>          LRWORK >=
+*>             10*N + 2*N*SMLSIZ + 8*N*NLVL + 3*SMLSIZ*NRHS +
+*>             MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
+*>          if M is greater than or equal to N or
+*>             10*M + 2*M*SMLSIZ + 8*M*NLVL + 3*SMLSIZ*NRHS +
+*>             MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
+*>          if M is less than N, the code will execute correctly.
+*>          SMLSIZ is returned by ILAENV and is equal to the maximum
+*>          size of the subproblems at the bottom of the computation
+*>          tree (usually about 25), and
+*>             NLVL = MAX( 0, INT( LOG_2( MIN( M,N )/(SMLSIZ+1) ) ) + 1 )
+*>          On exit, if INFO = 0, RWORK(1) returns the minimum LRWORK.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
+*>          LIWORK >= max(1, 3*MINMN*NLVL + 11*MINMN),
+*>          where MINMN = MIN( M,N ).
+*>          On exit, if INFO = 0, IWORK(1) returns the minimum LIWORK.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0: successful exit
-*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          < 0: if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  the algorithm for computing the SVD failed to converge;
+*>                if INFO = i, i off-diagonal elements of an intermediate
+*>                bidiagonal form did not converge to zero.
 *> \endverbatim
 *
 *  Authors:
@@ -5182,101 +6142,460 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16GEcomputational
+*> \ingroup complex16GEsolve
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of elementary reflectors
-*>
-*>     Q = H(1) H(2) . . . H(k), where k = min(m,n).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
-*>  and tau in TAU(i).
-*> \endverbatim
+*> \par Contributors:
+*  ==================
 *>
+*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
+*>       California at Berkeley, USA \n
+*>     Osni Marques, LBNL/NERSC, USA \n
+*
 *  =====================================================================
-      SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
+      SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
+     $                   WORK, LWORK, RWORK, IWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, M, N
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
+      DOUBLE PRECISION   RCOND
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   RWORK( * ), S( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0, TWO = 2.0D+0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, K
-      COMPLEX*16         ALPHA
+      LOGICAL            LQUERY
+      INTEGER            IASCL, IBSCL, IE, IL, ITAU, ITAUP, ITAUQ,
+     $                   LDWORK, LIWORK, LRWORK, MAXMN, MAXWRK, MINMN,
+     $                   MINWRK, MM, MNTHR, NLVL, NRWORK, NWORK, SMLSIZ
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, EPS, SFMIN, SMLNUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZLARFG
+      EXTERNAL           DLABAD, DLASCL, DLASET, XERBLA, ZGEBRD, ZGELQF,
+     $                   ZGEQRF, ZLACPY, ZLALSD, ZLASCL, ZLASET, ZUNMBR,
+     $                   ZUNMLQ, ZUNMQR
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           ILAENV, DLAMCH, ZLANGE
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG, MAX, MIN
+      INTRINSIC          INT, LOG, MAX, MIN, DBLE
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Test the input arguments.
 *
       INFO = 0
+      MINMN = MIN( M, N )
+      MAXMN = MAX( M, N )
+      LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -4
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, MAXMN ) ) THEN
+         INFO = -7
+      END IF
+*
+*     Compute workspace.
+*     (Note: Comments in the code beginning "Workspace:" describe the
+*     minimal amount of workspace needed at that point in the code,
+*     as well as the preferred amount for good performance.
+*     NB refers to the optimal block size for the immediately
+*     following subroutine, as returned by ILAENV.)
+*
+      IF( INFO.EQ.0 ) THEN
+         MINWRK = 1
+         MAXWRK = 1
+         LIWORK = 1
+         LRWORK = 1
+         IF( MINMN.GT.0 ) THEN
+            SMLSIZ = ILAENV( 9, 'ZGELSD', ' ', 0, 0, 0, 0 )
+            MNTHR = ILAENV( 6, 'ZGELSD', ' ', M, N, NRHS, -1 )
+            NLVL = MAX( INT( LOG( DBLE( MINMN ) / DBLE( SMLSIZ + 1 ) ) /
+     $                  LOG( TWO ) ) + 1, 0 )
+            LIWORK = 3*MINMN*NLVL + 11*MINMN
+            MM = M
+            IF( M.GE.N .AND. M.GE.MNTHR ) THEN
+*
+*              Path 1a - overdetermined, with many more rows than
+*                        columns.
+*
+               MM = N
+               MAXWRK = MAX( MAXWRK, N*ILAENV( 1, 'ZGEQRF', ' ', M, N,
+     $                       -1, -1 ) )
+               MAXWRK = MAX( MAXWRK, NRHS*ILAENV( 1, 'ZUNMQR', 'LC', M,
+     $                       NRHS, N, -1 ) )
+            END IF
+            IF( M.GE.N ) THEN
+*
+*              Path 1 - overdetermined or exactly determined.
+*
+               LRWORK = 10*N + 2*N*SMLSIZ + 8*N*NLVL + 3*SMLSIZ*NRHS +
+     $                  MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
+               MAXWRK = MAX( MAXWRK, 2*N + ( MM + N )*ILAENV( 1,
+     $                       'ZGEBRD', ' ', MM, N, -1, -1 ) )
+               MAXWRK = MAX( MAXWRK, 2*N + NRHS*ILAENV( 1, 'ZUNMBR',
+     $                       'QLC', MM, NRHS, N, -1 ) )
+               MAXWRK = MAX( MAXWRK, 2*N + ( N - 1 )*ILAENV( 1,
+     $                       'ZUNMBR', 'PLN', N, NRHS, N, -1 ) )
+               MAXWRK = MAX( MAXWRK, 2*N + N*NRHS )
+               MINWRK = MAX( 2*N + MM, 2*N + N*NRHS )
+            END IF
+            IF( N.GT.M ) THEN
+               LRWORK = 10*M + 2*M*SMLSIZ + 8*M*NLVL + 3*SMLSIZ*NRHS +
+     $                  MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
+               IF( N.GE.MNTHR ) THEN
+*
+*                 Path 2a - underdetermined, with many more columns
+*                           than rows.
+*
+                  MAXWRK = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1,
+     $                     -1 )
+                  MAXWRK = MAX( MAXWRK, M*M + 4*M + 2*M*ILAENV( 1,
+     $                          'ZGEBRD', ' ', M, M, -1, -1 ) )
+                  MAXWRK = MAX( MAXWRK, M*M + 4*M + NRHS*ILAENV( 1,
+     $                          'ZUNMBR', 'QLC', M, NRHS, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, M*M + 4*M + ( M - 1 )*ILAENV( 1,
+     $                          'ZUNMLQ', 'LC', N, NRHS, M, -1 ) )
+                  IF( NRHS.GT.1 ) THEN
+                     MAXWRK = MAX( MAXWRK, M*M + M + M*NRHS )
+                  ELSE
+                     MAXWRK = MAX( MAXWRK, M*M + 2*M )
+                  END IF
+                  MAXWRK = MAX( MAXWRK, M*M + 4*M + M*NRHS )
+!     XXX: Ensure the Path 2a case below is triggered.  The workspace
+!     calculation should use queries for all routines eventually.
+                  MAXWRK = MAX( MAXWRK,
+     $                 4*M+M*M+MAX( M, 2*M-4, NRHS, N-3*M ) )
+               ELSE
+*
+*                 Path 2 - underdetermined.
+*
+                  MAXWRK = 2*M + ( N + M )*ILAENV( 1, 'ZGEBRD', ' ', M,
+     $                     N, -1, -1 )
+                  MAXWRK = MAX( MAXWRK, 2*M + NRHS*ILAENV( 1, 'ZUNMBR',
+     $                          'QLC', M, NRHS, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M + M*ILAENV( 1, 'ZUNMBR',
+     $                          'PLN', N, NRHS, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M + M*NRHS )
+               END IF
+               MINWRK = MAX( 2*M + N, 2*M + M*NRHS )
+            END IF
+         END IF
+         MINWRK = MIN( MINWRK, MAXWRK )
+         WORK( 1 ) = MAXWRK
+         IWORK( 1 ) = LIWORK
+         RWORK( 1 ) = LRWORK
+*
+         IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
+            INFO = -12
+         END IF
       END IF
+*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGEQR2', -INFO )
+         CALL XERBLA( 'ZGELSD', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
-      K = MIN( M, N )
+*     Quick return if possible.
 *
-      DO 10 I = 1, K
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         RANK = 0
+         RETURN
+      END IF
 *
-*        Generate elementary reflector H(i) to annihilate A(i+1:m,i)
+*     Get machine parameters.
 *
-         CALL ZLARFG( M-I+1, A( I, I ), A( MIN( I+1, M ), I ), 1,
-     $                TAU( I ) )
-         IF( I.LT.N ) THEN
+      EPS = DLAMCH( 'P' )
+      SFMIN = DLAMCH( 'S' )
+      SMLNUM = SFMIN / EPS
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
 *
-*           Apply H(i)**H to A(i:m,i+1:n) from the left
+*     Scale A if max entry outside range [SMLNUM,BIGNUM].
 *
-            ALPHA = A( I, I )
-            A( I, I ) = ONE
-            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
-     $                  DCONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
-            A( I, I ) = ALPHA
+      ANRM = ZLANGE( 'M', M, N, A, LDA, RWORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM.
+*
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL ZLASET( 'F', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
+         CALL DLASET( 'F', MINMN, 1, ZERO, ZERO, S, 1 )
+         RANK = 0
+         GO TO 10
+      END IF
+*
+*     Scale B if max entry outside range [SMLNUM,BIGNUM].
+*
+      BNRM = ZLANGE( 'M', M, NRHS, B, LDB, RWORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM.
+*
+         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM.
+*
+         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         IBSCL = 2
+      END IF
+*
+*     If M < N make sure B(M+1:N,:) = 0
+*
+      IF( M.LT.N )
+     $   CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+*
+*     Overdetermined case.
+*
+      IF( M.GE.N ) THEN
+*
+*        Path 1 - overdetermined or exactly determined.
+*
+         MM = M
+         IF( M.GE.MNTHR ) THEN
+*
+*           Path 1a - overdetermined, with many more rows than columns
+*
+            MM = N
+            ITAU = 1
+            NWORK = ITAU + N
+*
+*           Compute A=Q*R.
+*           (RWorkspace: need N)
+*           (CWorkspace: need N, prefer N*NB)
+*
+            CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                   LWORK-NWORK+1, INFO )
+*
+*           Multiply B by transpose(Q).
+*           (RWorkspace: need N)
+*           (CWorkspace: need NRHS, prefer NRHS*NB)
+*
+            CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ), B,
+     $                   LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*
+*           Zero out below R.
+*
+            IF( N.GT.1 ) THEN
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
+     $                      LDA )
+            END IF
+         END IF
+*
+         ITAUQ = 1
+         ITAUP = ITAUQ + N
+         NWORK = ITAUP + N
+         IE = 1
+         NRWORK = IE + N
+*
+*        Bidiagonalize R in A.
+*        (RWorkspace: need N)
+*        (CWorkspace: need 2*N+MM, prefer 2*N+(MM+N)*NB)
+*
+         CALL ZGEBRD( MM, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                INFO )
+*
+*        Multiply B by transpose of left bidiagonalizing vectors of R.
+*        (CWorkspace: need 2*N+NRHS, prefer 2*N+NRHS*NB)
+*
+         CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
+     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*
+*        Solve the bidiagonal least squares problem.
+*
+         CALL ZLALSD( 'U', SMLSIZ, N, NRHS, S, RWORK( IE ), B, LDB,
+     $                RCOND, RANK, WORK( NWORK ), RWORK( NRWORK ),
+     $                IWORK, INFO )
+         IF( INFO.NE.0 ) THEN
+            GO TO 10
+         END IF
+*
+*        Multiply B by right bidiagonalizing vectors of R.
+*
+         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA, WORK( ITAUP ),
+     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*
+      ELSE IF( N.GE.MNTHR .AND. LWORK.GE.4*M+M*M+
+     $         MAX( M, 2*M-4, NRHS, N-3*M ) ) THEN
+*
+*        Path 2a - underdetermined, with many more columns than rows
+*        and sufficient workspace for an efficient algorithm.
+*
+         LDWORK = M
+         IF( LWORK.GE.MAX( 4*M+M*LDA+MAX( M, 2*M-4, NRHS, N-3*M ),
+     $       M*LDA+M+M*NRHS ) )LDWORK = LDA
+         ITAU = 1
+         NWORK = M + 1
+*
+*        Compute A=L*Q.
+*        (CWorkspace: need 2*M, prefer M+M*NB)
+*
+         CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                LWORK-NWORK+1, INFO )
+         IL = NWORK
+*
+*        Copy L to WORK(IL), zeroing out above its diagonal.
+*
+         CALL ZLACPY( 'L', M, M, A, LDA, WORK( IL ), LDWORK )
+         CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, WORK( IL+LDWORK ),
+     $                LDWORK )
+         ITAUQ = IL + LDWORK*M
+         ITAUP = ITAUQ + M
+         NWORK = ITAUP + M
+         IE = 1
+         NRWORK = IE + M
+*
+*        Bidiagonalize L in WORK(IL).
+*        (RWorkspace: need M)
+*        (CWorkspace: need M*M+4*M, prefer M*M+4*M+2*M*NB)
+*
+         CALL ZGEBRD( M, M, WORK( IL ), LDWORK, S, RWORK( IE ),
+     $                WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
+     $                LWORK-NWORK+1, INFO )
+*
+*        Multiply B by transpose of left bidiagonalizing vectors of L.
+*        (CWorkspace: need M*M+4*M+NRHS, prefer M*M+4*M+NRHS*NB)
+*
+         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, M, WORK( IL ), LDWORK,
+     $                WORK( ITAUQ ), B, LDB, WORK( NWORK ),
+     $                LWORK-NWORK+1, INFO )
+*
+*        Solve the bidiagonal least squares problem.
+*
+         CALL ZLALSD( 'U', SMLSIZ, M, NRHS, S, RWORK( IE ), B, LDB,
+     $                RCOND, RANK, WORK( NWORK ), RWORK( NRWORK ),
+     $                IWORK, INFO )
+         IF( INFO.NE.0 ) THEN
+            GO TO 10
+         END IF
+*
+*        Multiply B by right bidiagonalizing vectors of L.
+*
+         CALL ZUNMBR( 'P', 'L', 'N', M, NRHS, M, WORK( IL ), LDWORK,
+     $                WORK( ITAUP ), B, LDB, WORK( NWORK ),
+     $                LWORK-NWORK+1, INFO )
+*
+*        Zero out below first M rows of B.
+*
+         CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
+         NWORK = ITAU + M
+*
+*        Multiply transpose(Q) by B.
+*        (CWorkspace: need NRHS, prefer NRHS*NB)
+*
+         CALL ZUNMLQ( 'L', 'C', N, NRHS, M, A, LDA, WORK( ITAU ), B,
+     $                LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*
+      ELSE
+*
+*        Path 2 - remaining underdetermined cases.
+*
+         ITAUQ = 1
+         ITAUP = ITAUQ + M
+         NWORK = ITAUP + M
+         IE = 1
+         NRWORK = IE + M
+*
+*        Bidiagonalize A.
+*        (RWorkspace: need M)
+*        (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
+*
+         CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                INFO )
+*
+*        Multiply B by transpose of left bidiagonalizing vectors.
+*        (CWorkspace: need 2*M+NRHS, prefer 2*M+NRHS*NB)
+*
+         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAUQ ),
+     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*
+*        Solve the bidiagonal least squares problem.
+*
+         CALL ZLALSD( 'L', SMLSIZ, M, NRHS, S, RWORK( IE ), B, LDB,
+     $                RCOND, RANK, WORK( NWORK ), RWORK( NRWORK ),
+     $                IWORK, INFO )
+         IF( INFO.NE.0 ) THEN
+            GO TO 10
          END IF
+*
+*        Multiply B by right bidiagonalizing vectors of A.
+*
+         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA, WORK( ITAUP ),
+     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*
+      END IF
+*
+*     Undo scaling.
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+      END IF
+*
    10 CONTINUE
+      WORK( 1 ) = MAXWRK
+      IWORK( 1 ) = LIWORK
+      RWORK( 1 ) = LRWORK
       RETURN
 *
-*     End of ZGEQR2
+*     End of ZGELSD
 *
       END
-*> \brief \b ZGEQRF
+*> \brief \b ZGEQP3
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -5284,24 +6603,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGEQRF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrf.f"> 
+*> Download ZGEQP3 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqp3.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqrf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqp3.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqp3.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
+*                          INFO )
 * 
 *       .. Scalar Arguments ..
 *       INTEGER            INFO, LDA, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
+*       INTEGER            JPVT( * )
+*       DOUBLE PRECISION   RWORK( * )
 *       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
@@ -5311,8 +6633,8 @@
 *>
 *> \verbatim
 *>
-*> ZGEQRF computes a QR factorization of a complex M-by-N matrix A:
-*> A = Q * R.
+*> ZGEQP3 computes a QR factorization with column pivoting of a
+*> matrix A:  A*P = Q*R  using Level 3 BLAS.
 *> \endverbatim
 *
 *  Arguments:
@@ -5321,7 +6643,7 @@
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
+*>          The number of rows of the matrix A. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
@@ -5334,39 +6656,47 @@
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
 *>          On entry, the M-by-N matrix A.
-*>          On exit, the elements on and above the diagonal of the array
-*>          contain the min(M,N)-by-N upper trapezoidal matrix R (R is
-*>          upper triangular if m >= n); the elements below the diagonal,
-*>          with the array TAU, represent the unitary matrix Q as a
-*>          product of min(m,n) elementary reflectors (see Further
-*>          Details).
+*>          On exit, the upper triangle of the array contains the
+*>          min(M,N)-by-N upper trapezoidal matrix R; the elements below
+*>          the diagonal, together with the array TAU, represent the
+*>          unitary matrix Q as a product of min(M,N) elementary
+*>          reflectors.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] JPVT
+*> \verbatim
+*>          JPVT is INTEGER array, dimension (N)
+*>          On entry, if JPVT(J).ne.0, the J-th column of A is permuted
+*>          to the front of A*P (a leading column); if JPVT(J)=0,
+*>          the J-th column of A is a free column.
+*>          On exit, if JPVT(J)=K, then the J-th column of A*P was the
+*>          the K-th column of A.
 *> \endverbatim
 *>
 *> \param[out] TAU
 *> \verbatim
 *>          TAU is COMPLEX*16 array, dimension (min(M,N))
-*>          The scalar factors of the elementary reflectors (see Further
-*>          Details).
+*>          The scalar factors of the elementary reflectors.
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
 *>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*>          On exit, if INFO=0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,N).
-*>          For optimum performance LWORK >= N*NB, where NB is
-*>          the optimal blocksize.
+*>          The dimension of the array WORK. LWORK >= N+1.
+*>          For optimal performance LWORK >= ( N+1 )*NB, where NB
+*>          is the optimal blocksize.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -5374,11 +6704,16 @@
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
+*> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit.
+*>          < 0: if INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
 *
 *  Authors:
@@ -5389,7 +6724,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup complex16GEcomputational
 *
@@ -5406,51 +6741,63 @@
 *>
 *>     H(i) = I - tau * v * v**H
 *>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
-*>  and tau in TAU(i).
+*>  where tau is a complex scalar, and v is a real/complex vector
+*>  with v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in
+*>  A(i+1:m,i), and tau in TAU(i).
 *> \endverbatim
+*
+*> \par Contributors:
+*  ==================
+*>
+*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain
+*>    X. Sun, Computer Science Dept., Duke University, USA
 *>
 *  =====================================================================
-      SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, RWORK,
+     $                   INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
+      INTEGER            JPVT( * )
+      DOUBLE PRECISION   RWORK( * )
       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      INTEGER            INB, INBMIN, IXOVER
+      PARAMETER          ( INB = 1, INBMIN = 2, IXOVER = 3 )
+*     ..
 *     .. Local Scalars ..
       LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NX
+      INTEGER            FJB, IWS, J, JB, LWKOPT, MINMN, MINWS, NA, NB,
+     $                   NBMIN, NFXD, NX, SM, SMINMN, SN, TOPBMN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEQR2, ZLARFB, ZLARFT
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      EXTERNAL           XERBLA, ZGEQRF, ZLAQP2, ZLAQPS, ZSWAP, ZUNMQR
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      DOUBLE PRECISION   DZNRM2
+      EXTERNAL           ILAENV, DZNRM2
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          INT, MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Test input arguments
+*  ====================
 *
       INFO = 0
-      NB = ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
@@ -5458,95 +6805,169 @@
          INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
       END IF
+*
+      IF( INFO.EQ.0 ) THEN
+         MINMN = MIN( M, N )
+         IF( MINMN.EQ.0 ) THEN
+            IWS = 1
+            LWKOPT = 1
+         ELSE
+            IWS = N + 1
+            NB = ILAENV( INB, 'ZGEQRF', ' ', M, N, -1, -1 )
+            LWKOPT = ( N + 1 )*NB
+         END IF
+         WORK( 1 ) = DCMPLX( LWKOPT )
+*
+         IF( ( LWORK.LT.IWS ) .AND. .NOT.LQUERY ) THEN
+            INFO = -8
+         END IF
+      END IF
+*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGEQRF', -INFO )
+         CALL XERBLA( 'ZGEQP3', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
-*     Quick return if possible
+*     Move initial columns up front.
 *
-      K = MIN( M, N )
-      IF( K.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
+      NFXD = 1
+      DO 10 J = 1, N
+         IF( JPVT( J ).NE.0 ) THEN
+            IF( J.NE.NFXD ) THEN
+               CALL ZSWAP( M, A( 1, J ), 1, A( 1, NFXD ), 1 )
+               JPVT( J ) = JPVT( NFXD )
+               JPVT( NFXD ) = J
+            ELSE
+               JPVT( J ) = J
+            END IF
+            NFXD = NFXD + 1
+         ELSE
+            JPVT( J ) = J
+         END IF
+   10 CONTINUE
+      NFXD = NFXD - 1
+*
+*     Factorize fixed columns
+*  =======================
+*
+*     Compute the QR factorization of fixed columns and update
+*     remaining columns.
+*
+      IF( NFXD.GT.0 ) THEN
+         NA = MIN( M, NFXD )
+*CC      CALL ZGEQR2( M, NA, A, LDA, TAU, WORK, INFO )
+         CALL ZGEQRF( M, NA, A, LDA, TAU, WORK, LWORK, INFO )
+         IWS = MAX( IWS, INT( WORK( 1 ) ) )
+         IF( NA.LT.N ) THEN
+*CC         CALL ZUNM2R( 'Left', 'Conjugate Transpose', M, N-NA,
+*CC  $                   NA, A, LDA, TAU, A( 1, NA+1 ), LDA, WORK,
+*CC  $                   INFO )
+            CALL ZUNMQR( 'Left', 'Conjugate Transpose', M, N-NA, NA, A,
+     $                   LDA, TAU, A( 1, NA+1 ), LDA, WORK, LWORK,
+     $                   INFO )
+            IWS = MAX( IWS, INT( WORK( 1 ) ) )
+         END IF
       END IF
 *
-      NBMIN = 2
-      NX = 0
-      IWS = N
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
+*     Factorize free columns
+*  ======================
 *
-*        Determine when to cross over from blocked to unblocked code.
+      IF( NFXD.LT.MINMN ) THEN
 *
-         NX = MAX( 0, ILAENV( 3, 'ZGEQRF', ' ', M, N, -1, -1 ) )
-         IF( NX.LT.K ) THEN
+         SM = M - NFXD
+         SN = N - NFXD
+         SMINMN = MINMN - NFXD
 *
-*           Determine if workspace is large enough for blocked code.
+*        Determine the block size.
 *
-            LDWORK = N
-            IWS = LDWORK*NB
-            IF( LWORK.LT.IWS ) THEN
+         NB = ILAENV( INB, 'ZGEQRF', ' ', SM, SN, -1, -1 )
+         NBMIN = 2
+         NX = 0
 *
-*              Not enough workspace to use optimal NB:  reduce NB and
-*              determine the minimum value of NB.
+         IF( ( NB.GT.1 ) .AND. ( NB.LT.SMINMN ) ) THEN
 *
-               NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZGEQRF', ' ', M, N, -1,
-     $                 -1 ) )
+*           Determine when to cross over from blocked to unblocked code.
+*
+            NX = MAX( 0, ILAENV( IXOVER, 'ZGEQRF', ' ', SM, SN, -1,
+     $           -1 ) )
+*
+*
+            IF( NX.LT.SMINMN ) THEN
+*
+*              Determine if workspace is large enough for blocked code.
+*
+               MINWS = ( SN+1 )*NB
+               IWS = MAX( IWS, MINWS )
+               IF( LWORK.LT.MINWS ) THEN
+*
+*                 Not enough workspace to use optimal NB: Reduce NB and
+*                 determine the minimum value of NB.
+*
+                  NB = LWORK / ( SN+1 )
+                  NBMIN = MAX( 2, ILAENV( INBMIN, 'ZGEQRF', ' ', SM, SN,
+     $                    -1, -1 ) )
+*
+*
+               END IF
             END IF
          END IF
-      END IF
 *
-      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
+*        Initialize partial column norms. The first N elements of work
+*        store the exact column norms.
 *
-*        Use blocked code initially
+         DO 20 J = NFXD + 1, N
+            RWORK( J ) = DZNRM2( SM, A( NFXD+1, J ), 1 )
+            RWORK( N+J ) = RWORK( J )
+   20    CONTINUE
 *
-         DO 10 I = 1, K - NX, NB
-            IB = MIN( K-I+1, NB )
+         IF( ( NB.GE.NBMIN ) .AND. ( NB.LT.SMINMN ) .AND.
+     $       ( NX.LT.SMINMN ) ) THEN
 *
-*           Compute the QR factorization of the current block
-*           A(i:m,i:i+ib-1)
+*           Use blocked code initially.
 *
-            CALL ZGEQR2( M-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
-     $                   IINFO )
-            IF( I+IB.LE.N ) THEN
+            J = NFXD + 1
 *
-*              Form the triangular factor of the block reflector
-*              H = H(i) H(i+1) . . . H(i+ib-1)
+*           Compute factorization: while loop.
 *
-               CALL ZLARFT( 'Forward', 'Columnwise', M-I+1, IB,
-     $                      A( I, I ), LDA, TAU( I ), WORK, LDWORK )
 *
-*              Apply H**H to A(i:m,i+ib:n) from the left
+            TOPBMN = MINMN - NX
+   30       CONTINUE
+            IF( J.LE.TOPBMN ) THEN
+               JB = MIN( NB, TOPBMN-J+1 )
 *
-               CALL ZLARFB( 'Left', 'Conjugate transpose', 'Forward',
-     $                      'Columnwise', M-I+1, N-I-IB+1, IB,
-     $                      A( I, I ), LDA, WORK, LDWORK, A( I, I+IB ),
-     $                      LDA, WORK( IB+1 ), LDWORK )
+*              Factorize JB columns among columns J:N.
+*
+               CALL ZLAQPS( M, N-J+1, J-1, JB, FJB, A( 1, J ), LDA,
+     $                      JPVT( J ), TAU( J ), RWORK( J ),
+     $                      RWORK( N+J ), WORK( 1 ), WORK( JB+1 ),
+     $                      N-J+1 )
+*
+               J = J + FJB
+               GO TO 30
             END IF
-   10    CONTINUE
-      ELSE
-         I = 1
-      END IF
+         ELSE
+            J = NFXD + 1
+         END IF
 *
-*     Use unblocked code to factor the last or only block.
+*        Use unblocked code to factor the last or only block.
 *
-      IF( I.LE.K )
-     $   CALL ZGEQR2( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
-     $                IINFO )
 *
-      WORK( 1 ) = IWS
+         IF( J.LE.MINMN )
+     $      CALL ZLAQP2( M, N-J+1, J-1, A( 1, J ), LDA, JPVT( J ),
+     $                   TAU( J ), RWORK( J ), RWORK( N+J ), WORK( 1 ) )
+*
+      END IF
+*
+      WORK( 1 ) = DCMPLX( LWKOPT )
       RETURN
 *
-*     End of ZGEQRF
+*     End of ZGEQP3
 *
       END
-*> \brief <b> ZGESV computes the solution to system of linear equations A * X = B for GE matrices</b> (simple driver)
+*> \brief \b ZGEQR2 computes the QR factorization of a general rectangular matrix using an unblocked algorithm.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -5554,26 +6975,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGESV + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesv.f"> 
+*> Download ZGEQR2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqr2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesv.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqr2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesv.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqr2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+*       SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, LDB, N, NRHS
+*       INTEGER            INFO, LDA, M, N
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            IPIV( * )
-*       COMPLEX*16         A( LDA, * ), B( LDB, * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -5582,77 +7002,59 @@
 *>
 *> \verbatim
 *>
-*> ZGESV computes the solution to a complex system of linear equations
-*>    A * X = B,
-*> where A is an N-by-N matrix and X and B are N-by-NRHS matrices.
-*>
-*> The LU decomposition with partial pivoting and row interchanges is
-*> used to factor A as
-*>    A = P * L * U,
-*> where P is a permutation matrix, L is unit lower triangular, and U is
-*> upper triangular.  The factored form of A is then used to solve the
-*> system of equations A * X = B.
+*> ZGEQR2 computes a QR factorization of a complex m by n matrix A:
+*> A = Q * R.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] N
+*> \param[in] M
 *> \verbatim
-*>          N is INTEGER
-*>          The number of linear equations, i.e., the order of the
-*>          matrix A.  N >= 0.
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
 *> \endverbatim
 *>
-*> \param[in] NRHS
+*> \param[in] N
 *> \verbatim
-*>          NRHS is INTEGER
-*>          The number of right hand sides, i.e., the number of columns
-*>          of the matrix B.  NRHS >= 0.
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the N-by-N coefficient matrix A.
-*>          On exit, the factors L and U from the factorization
-*>          A = P*L*U; the unit diagonal elements of L are not stored.
+*>          On entry, the m by n matrix A.
+*>          On exit, the elements on and above the diagonal of the array
+*>          contain the min(m,n) by n upper trapezoidal matrix R (R is
+*>          upper triangular if m >= n); the elements below the diagonal,
+*>          with the array TAU, represent the unitary matrix Q as a
+*>          product of elementary reflectors (see Further Details).
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] IPIV
-*> \verbatim
-*>          IPIV is INTEGER array, dimension (N)
-*>          The pivot indices that define the permutation matrix P;
-*>          row i of the matrix was interchanged with row IPIV(i).
+*>          The leading dimension of the array A.  LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in,out] B
+*> \param[out] TAU
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
-*>          On entry, the N-by-NRHS matrix of right hand side matrix B.
-*>          On exit, if INFO = 0, the N-by-NRHS solution matrix X.
+*>          TAU is COMPLEX*16 array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors (see Further
+*>          Details).
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[out] WORK
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B.  LDB >= max(1,N).
+*>          WORK is COMPLEX*16 array, dimension (N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, U(i,i) is exactly zero.  The factorization
-*>                has been completed, but the factor U is exactly
-*>                singular, so the solution could not be computed.
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -5663,69 +7065,101 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date September 2012
 *
-*> \ingroup complex16GEsolve
+*> \ingroup complex16GEcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of elementary reflectors
+*>
+*>     Q = H(1) H(2) . . . H(k), where k = min(m,n).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**H
+*>
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
+*>  and tau in TAU(i).
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ZGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+      SUBROUTINE ZGEQR2( M, N, A, LDA, TAU, WORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, LDB, N, NRHS
+      INTEGER            INFO, LDA, M, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            IPIV( * )
-      COMPLEX*16         A( LDA, * ), B( LDB, * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, K
+      COMPLEX*16         ALPHA
+*     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGETRF, ZGETRS
+      EXTERNAL           XERBLA, ZLARF, ZLARFG
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          DCONJG, MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input parameters.
+*     Test the input arguments
 *
       INFO = 0
-      IF( N.LT.0 ) THEN
+      IF( M.LT.0 ) THEN
          INFO = -1
-      ELSE IF( NRHS.LT.0 ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -4
-      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
-         INFO = -7
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGESV ', -INFO )
+         CALL XERBLA( 'ZGEQR2', -INFO )
          RETURN
       END IF
 *
-*     Compute the LU factorization of A.
+      K = MIN( M, N )
 *
-      CALL ZGETRF( N, N, A, LDA, IPIV, INFO )
-      IF( INFO.EQ.0 ) THEN
+      DO 10 I = 1, K
 *
-*        Solve the system A*X = B, overwriting B with X.
+*        Generate elementary reflector H(i) to annihilate A(i+1:m,i)
 *
-         CALL ZGETRS( 'No transpose', N, NRHS, A, LDA, IPIV, B, LDB,
-     $                INFO )
-      END IF
+         CALL ZLARFG( M-I+1, A( I, I ), A( MIN( I+1, M ), I ), 1,
+     $                TAU( I ) )
+         IF( I.LT.N ) THEN
+*
+*           Apply H(i)**H to A(i:m,i+1:n) from the left
+*
+            ALPHA = A( I, I )
+            A( I, I ) = ONE
+            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1,
+     $                  DCONJG( TAU( I ) ), A( I, I+1 ), LDA, WORK )
+            A( I, I ) = ALPHA
+         END IF
+   10 CONTINUE
       RETURN
 *
-*     End of ZGESV
+*     End of ZGEQR2
 *
       END
-*> \brief <b> ZGESVD computes the singular value decomposition (SVD) for GE matrices</b>
+*> \brief \b ZGEQRF
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -5733,29 +7167,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGESVD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvd.f"> 
+*> Download ZGEQRF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgeqrf.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesvd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgeqrf.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgeqrf.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
-*                          WORK, LWORK, RWORK, INFO )
+*       SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          JOBU, JOBVT
-*       INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+*       INTEGER            INFO, LDA, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   RWORK( * ), S( * )
-*       COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
-*      $                   WORK( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -5764,79 +7194,35 @@
 *>
 *> \verbatim
 *>
-*> ZGESVD computes the singular value decomposition (SVD) of a complex
-*> M-by-N matrix A, optionally computing the left and/or right singular
-*> vectors. The SVD is written
-*>
-*>      A = U * SIGMA * conjugate-transpose(V)
-*>
-*> where SIGMA is an M-by-N matrix which is zero except for its
-*> min(m,n) diagonal elements, U is an M-by-M unitary matrix, and
-*> V is an N-by-N unitary matrix.  The diagonal elements of SIGMA
-*> are the singular values of A; they are real and non-negative, and
-*> are returned in descending order.  The first min(m,n) columns of
-*> U and V are the left and right singular vectors of A.
-*>
-*> Note that the routine returns V**H, not V.
+*> ZGEQRF computes a QR factorization of a complex M-by-N matrix A:
+*> A = Q * R.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] JOBU
-*> \verbatim
-*>          JOBU is CHARACTER*1
-*>          Specifies options for computing all or part of the matrix U:
-*>          = 'A':  all M columns of U are returned in array U:
-*>          = 'S':  the first min(m,n) columns of U (the left singular
-*>                  vectors) are returned in the array U;
-*>          = 'O':  the first min(m,n) columns of U (the left singular
-*>                  vectors) are overwritten on the array A;
-*>          = 'N':  no columns of U (no left singular vectors) are
-*>                  computed.
-*> \endverbatim
-*>
-*> \param[in] JOBVT
-*> \verbatim
-*>          JOBVT is CHARACTER*1
-*>          Specifies options for computing all or part of the matrix
-*>          V**H:
-*>          = 'A':  all N rows of V**H are returned in the array VT;
-*>          = 'S':  the first min(m,n) rows of V**H (the right singular
-*>                  vectors) are returned in the array VT;
-*>          = 'O':  the first min(m,n) rows of V**H (the right singular
-*>                  vectors) are overwritten on the array A;
-*>          = 'N':  no rows of V**H (no right singular vectors) are
-*>                  computed.
-*>
-*>          JOBVT and JOBU cannot both be 'O'.
-*> \endverbatim
-*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the input matrix A.  M >= 0.
+*>          The number of rows of the matrix A.  M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the input matrix A.  N >= 0.
+*>          The number of columns of the matrix A.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
 *>          On entry, the M-by-N matrix A.
-*>          On exit,
-*>          if JOBU = 'O',  A is overwritten with the first min(m,n)
-*>                          columns of U (the left singular vectors,
-*>                          stored columnwise);
-*>          if JOBVT = 'O', A is overwritten with the first min(m,n)
-*>                          rows of V**H (the right singular vectors,
-*>                          stored rowwise);
-*>          if JOBU .ne. 'O' and JOBVT .ne. 'O', the contents of A
-*>                          are destroyed.
+*>          On exit, the elements on and above the diagonal of the array
+*>          contain the min(M,N)-by-N upper trapezoidal matrix R (R is
+*>          upper triangular if m >= n); the elements below the diagonal,
+*>          with the array TAU, represent the unitary matrix Q as a
+*>          product of min(m,n) elementary reflectors (see Further
+*>          Details).
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -5845,44 +7231,11 @@
 *>          The leading dimension of the array A.  LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[out] S
-*> \verbatim
-*>          S is DOUBLE PRECISION array, dimension (min(M,N))
-*>          The singular values of A, sorted so that S(i) >= S(i+1).
-*> \endverbatim
-*>
-*> \param[out] U
-*> \verbatim
-*>          U is COMPLEX*16 array, dimension (LDU,UCOL)
-*>          (LDU,M) if JOBU = 'A' or (LDU,min(M,N)) if JOBU = 'S'.
-*>          If JOBU = 'A', U contains the M-by-M unitary matrix U;
-*>          if JOBU = 'S', U contains the first min(m,n) columns of U
-*>          (the left singular vectors, stored columnwise);
-*>          if JOBU = 'N' or 'O', U is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDU
-*> \verbatim
-*>          LDU is INTEGER
-*>          The leading dimension of the array U.  LDU >= 1; if
-*>          JOBU = 'S' or 'A', LDU >= M.
-*> \endverbatim
-*>
-*> \param[out] VT
-*> \verbatim
-*>          VT is COMPLEX*16 array, dimension (LDVT,N)
-*>          If JOBVT = 'A', VT contains the N-by-N unitary matrix
-*>          V**H;
-*>          if JOBVT = 'S', VT contains the first min(m,n) rows of
-*>          V**H (the right singular vectors, stored rowwise);
-*>          if JOBVT = 'N' or 'O', VT is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDVT
+*> \param[out] TAU
 *> \verbatim
-*>          LDVT is INTEGER
-*>          The leading dimension of the array VT.  LDVT >= 1; if
-*>          JOBVT = 'A', LDVT >= N; if JOBVT = 'S', LDVT >= min(M,N).
+*>          TAU is COMPLEX*16 array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors (see Further
+*>          Details).
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -5894,35 +7247,21 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.
-*>          LWORK >=  MAX(1,2*MIN(M,N)+MAX(M,N)).
-*>          For good performance, LWORK should generally be larger.
-*>
+*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          For optimum performance LWORK >= N*NB, where NB is
+*>          the optimal blocksize.
+*>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
 *>          this value as the first entry of the WORK array, and no error
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[out] RWORK
-*> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (5*min(M,N))
-*>          On exit, if INFO > 0, RWORK(1:MIN(M,N)-1) contains the
-*>          unconverged superdiagonal elements of an upper bidiagonal
-*>          matrix B whose diagonal is in S (not necessarily sorted).
-*>          B satisfies A = U * B * VT, so it has the same singular
-*>          values as A, and singular vectors related by U and VT.
-*> \endverbatim
-*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit.
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>          > 0:  if ZBDSQR did not converge, INFO specifies how many
-*>                superdiagonals of an intermediate bidiagonal form B
-*>                did not converge to zero. See the description of RWORK
-*>                above for details.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -5933,3110 +7272,4343 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date April 2012
+*> \date November 2011
 *
-*> \ingroup complex16GEsing
+*> \ingroup complex16GEcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of elementary reflectors
+*>
+*>     Q = H(1) H(2) . . . H(k), where k = min(m,n).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**H
+*>
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
+*>  and tau in TAU(i).
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, 
-     $                   VT, LDVT, WORK, LWORK, RWORK, INFO )
+      SUBROUTINE ZGEQRF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.1) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     April 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          JOBU, JOBVT
-      INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+      INTEGER            INFO, LDA, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   RWORK( * ), S( * )
-      COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
-     $                   WORK( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX*16         CZERO, CONE
-      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ),
-     $                   CONE = ( 1.0D0, 0.0D0 ) )
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
-*     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY, WNTUA, WNTUAS, WNTUN, WNTUO, WNTUS,
-     $                   WNTVA, WNTVAS, WNTVN, WNTVO, WNTVS
-      INTEGER            BLK, CHUNK, I, IE, IERR, IR, IRWORK, ISCL,
-     $                   ITAU, ITAUP, ITAUQ, IU, IWORK, LDWRKR, LDWRKU,
-     $                   MAXWRK, MINMN, MINWRK, MNTHR, NCU, NCVT, NRU,
-     $                   NRVT, WRKBL
-      INTEGER            LWORK_ZGEQRF, LWORK_ZUNGQR_N, LWORK_ZUNGQR_M,
-     $                   LWORK_ZGEBRD, LWORK_ZUNGBR_P, LWORK_ZUNGBR_Q,
-     $                   LWORK_ZGELQF, LWORK_ZUNGLQ_N, LWORK_ZUNGLQ_M
-      DOUBLE PRECISION   ANRM, BIGNUM, EPS, SMLNUM
-*     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION   DUM( 1 )
-      COMPLEX*16         CDUM( 1 )
+      LOGICAL            LQUERY
+      INTEGER            I, IB, IINFO, IWS, K, LDWORK, LWKOPT, NB,
+     $                   NBMIN, NX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASCL, XERBLA, ZBDSQR, ZGEBRD, ZGELQF, ZGEMM,
-     $                   ZGEQRF, ZLACPY, ZLASCL, ZLASET, ZUNGBR, ZUNGLQ,
-     $                   ZUNGQR, ZUNMBR
+      EXTERNAL           XERBLA, ZGEQR2, ZLARFB, ZLARFT
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
       INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, ZLANGE
-      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN, SQRT
+      EXTERNAL           ILAENV
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
       INFO = 0
-      MINMN = MIN( M, N )
-      WNTUA = LSAME( JOBU, 'A' )
-      WNTUS = LSAME( JOBU, 'S' )
-      WNTUAS = WNTUA .OR. WNTUS
-      WNTUO = LSAME( JOBU, 'O' )
-      WNTUN = LSAME( JOBU, 'N' )
-      WNTVA = LSAME( JOBVT, 'A' )
-      WNTVS = LSAME( JOBVT, 'S' )
-      WNTVAS = WNTVA .OR. WNTVS
-      WNTVO = LSAME( JOBVT, 'O' )
-      WNTVN = LSAME( JOBVT, 'N' )
+      NB = ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
+      LWKOPT = N*NB
+      WORK( 1 ) = LWKOPT
       LQUERY = ( LWORK.EQ.-1 )
-*
-      IF( .NOT.( WNTUA .OR. WNTUS .OR. WNTUO .OR. WNTUN ) ) THEN
+      IF( M.LT.0 ) THEN
          INFO = -1
-      ELSE IF( .NOT.( WNTVA .OR. WNTVS .OR. WNTVO .OR. WNTVN ) .OR.
-     $         ( WNTVO .AND. WNTUO ) ) THEN
-         INFO = -2
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -3
       ELSE IF( N.LT.0 ) THEN
-         INFO = -4
+         INFO = -2
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -6
-      ELSE IF( LDU.LT.1 .OR. ( WNTUAS .AND. LDU.LT.M ) ) THEN
-         INFO = -9
-      ELSE IF( LDVT.LT.1 .OR. ( WNTVA .AND. LDVT.LT.N ) .OR.
-     $         ( WNTVS .AND. LDVT.LT.MINMN ) ) THEN
-         INFO = -11
+         INFO = -4
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+         INFO = -7
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGEQRF', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
       END IF
 *
-*     Compute workspace
-*      (Note: Comments in the code beginning "Workspace:" describe the
-*       minimal amount of workspace needed at that point in the code,
-*       as well as the preferred amount for good performance.
-*       CWorkspace refers to complex workspace, and RWorkspace to
-*       real workspace. NB refers to the optimal block size for the
-*       immediately following subroutine, as returned by ILAENV.)
+*     Quick return if possible
 *
-      IF( INFO.EQ.0 ) THEN
-         MINWRK = 1
-         MAXWRK = 1
-         IF( M.GE.N .AND. MINMN.GT.0 ) THEN
+      K = MIN( M, N )
+      IF( K.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-*           Space needed for ZBDSQR is BDSPAC = 5*N
+      NBMIN = 2
+      NX = 0
+      IWS = N
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
-            MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
-*           Compute space needed for ZGEQRF
-            CALL ZGEQRF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZGEQRF=CDUM(1)
-*           Compute space needed for ZUNGQR
-            CALL ZUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZUNGQR_N=CDUM(1)
-            CALL ZUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZUNGQR_M=CDUM(1)
-*           Compute space needed for ZGEBRD
-            CALL ZGEBRD( N, N, A, LDA, S, DUM(1), CDUM(1),
-     $                   CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZGEBRD=CDUM(1)
-*           Compute space needed for ZUNGBR
-            CALL ZUNGBR( 'P', N, N, N, A, LDA, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-            LWORK_ZUNGBR_P=CDUM(1)
-            CALL ZUNGBR( 'Q', N, N, N, A, LDA, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-            LWORK_ZUNGBR_Q=CDUM(1)
+*        Determine when to cross over from blocked to unblocked code.
 *
-            IF( M.GE.MNTHR ) THEN
-               IF( WNTUN ) THEN
+         NX = MAX( 0, ILAENV( 3, 'ZGEQRF', ' ', M, N, -1, -1 ) )
+         IF( NX.LT.K ) THEN
 *
-*                 Path 1 (M much larger than N, JOBU='N')
+*           Determine if workspace is large enough for blocked code.
 *
-                  MAXWRK = N + LWORK_ZGEQRF
-                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZGEBRD )
-                  IF( WNTVO .OR. WNTVAS )
-     $               MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_P )
-                  MINWRK = 3*N
-               ELSE IF( WNTUO .AND. WNTVN ) THEN
+            LDWORK = N
+            IWS = LDWORK*NB
+            IF( LWORK.LT.IWS ) THEN
 *
-*                 Path 2 (M much larger than N, JOBU='O', JOBVT='N')
+*              Not enough workspace to use optimal NB:  reduce NB and
+*              determine the minimum value of NB.
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  MAXWRK = MAX( N*N+WRKBL, N*N+M*N )
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUO .AND. WNTVAS ) THEN
+               NB = LWORK / LDWORK
+               NBMIN = MAX( 2, ILAENV( 2, 'ZGEQRF', ' ', M, N, -1,
+     $                 -1 ) )
+            END IF
+         END IF
+      END IF
 *
-*                 Path 3 (M much larger than N, JOBU='O', JOBVT='S' or
-*                 'A')
+      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
-                  MAXWRK = MAX( N*N+WRKBL, N*N+M*N )
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUS .AND. WNTVN ) THEN
+*        Use blocked code initially
 *
-*                 Path 4 (M much larger than N, JOBU='S', JOBVT='N')
+         DO 10 I = 1, K - NX, NB
+            IB = MIN( K-I+1, NB )
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  MAXWRK = N*N + WRKBL
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUS .AND. WNTVO ) THEN
+*           Compute the QR factorization of the current block
+*           A(i:m,i:i+ib-1)
 *
-*                 Path 5 (M much larger than N, JOBU='S', JOBVT='O')
+            CALL ZGEQR2( M-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
+     $                   IINFO )
+            IF( I+IB.LE.N ) THEN
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
-                  MAXWRK = 2*N*N + WRKBL
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUS .AND. WNTVAS ) THEN
+*              Form the triangular factor of the block reflector
+*              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S' or
-*                 'A')
+               CALL ZLARFT( 'Forward', 'Columnwise', M-I+1, IB,
+     $                      A( I, I ), LDA, TAU( I ), WORK, LDWORK )
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
-                  MAXWRK = N*N + WRKBL
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUA .AND. WNTVN ) THEN
+*              Apply H**H to A(i:m,i+ib:n) from the left
 *
-*                 Path 7 (M much larger than N, JOBU='A', JOBVT='N')
+               CALL ZLARFB( 'Left', 'Conjugate transpose', 'Forward',
+     $                      'Columnwise', M-I+1, N-I-IB+1, IB,
+     $                      A( I, I ), LDA, WORK, LDWORK, A( I, I+IB ),
+     $                      LDA, WORK( IB+1 ), LDWORK )
+            END IF
+   10    CONTINUE
+      ELSE
+         I = 1
+      END IF
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_M )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  MAXWRK = N*N + WRKBL
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUA .AND. WNTVO ) THEN
+*     Use unblocked code to factor the last or only block.
 *
-*                 Path 8 (M much larger than N, JOBU='A', JOBVT='O')
+      IF( I.LE.K )
+     $   CALL ZGEQR2( M-I+1, N-I+1, A( I, I ), LDA, TAU( I ), WORK,
+     $                IINFO )
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_M )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
-                  MAXWRK = 2*N*N + WRKBL
-                  MINWRK = 2*N + M
-               ELSE IF( WNTUA .AND. WNTVAS ) THEN
+      WORK( 1 ) = IWS
+      RETURN
 *
-*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S' or
-*                 'A')
+*     End of ZGEQRF
 *
-                  WRKBL = N + LWORK_ZGEQRF
-                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_M )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
-                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
-                  MAXWRK = N*N + WRKBL
-                  MINWRK = 2*N + M
-               END IF
-            ELSE
+      END
+*> \brief \b ZGERFS
 *
-*              Path 10 (M at least N, but not much larger)
+*  =========== DOCUMENTATION ===========
 *
-               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
-     $                   CDUM(1), CDUM(1), -1, IERR )
-               LWORK_ZGEBRD=CDUM(1)
-               MAXWRK = 2*N + LWORK_ZGEBRD
-               IF( WNTUS .OR. WNTUO ) THEN
-                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-                  LWORK_ZUNGBR_Q=CDUM(1)
-                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
-               END IF
-               IF( WNTUA ) THEN
-                  CALL ZUNGBR( 'Q', M, M, N, A, LDA, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-                  LWORK_ZUNGBR_Q=CDUM(1)
-                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
-               END IF
-               IF( .NOT.WNTVN ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_P )
-               MINWRK = 2*N + M
-               END IF
-            END IF
-         ELSE IF( MINMN.GT.0 ) THEN
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-*           Space needed for ZBDSQR is BDSPAC = 5*M
+*> \htmlonly
+*> Download ZGERFS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgerfs.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgerfs.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgerfs.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-            MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
-*           Compute space needed for ZGELQF
-            CALL ZGELQF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZGELQF=CDUM(1)
-*           Compute space needed for ZUNGLQ
-            CALL ZUNGLQ( N, N, M, CDUM(1), N, CDUM(1), CDUM(1), -1,
-     $                  IERR )
-            LWORK_ZUNGLQ_N=CDUM(1)
-            CALL ZUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZUNGLQ_M=CDUM(1)
-*           Compute space needed for ZGEBRD
-            CALL ZGEBRD( M, M, A, LDA, S, DUM(1), CDUM(1),
-     $                   CDUM(1), CDUM(1), -1, IERR )
-            LWORK_ZGEBRD=CDUM(1)
-*            Compute space needed for ZUNGBR P
-            CALL ZUNGBR( 'P', M, M, M, A, N, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-            LWORK_ZUNGBR_P=CDUM(1)
-*           Compute space needed for ZUNGBR Q
-            CALL ZUNGBR( 'Q', M, M, M, A, N, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-            LWORK_ZUNGBR_Q=CDUM(1)
-            IF( N.GE.MNTHR ) THEN
-               IF( WNTVN ) THEN
+*  Definition:
+*  ===========
 *
-*                 Path 1t(N much larger than M, JOBVT='N')
+*       SUBROUTINE ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+*                          X, LDX, FERR, BERR, WORK, RWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDAF, LDB, LDX, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IPIV( * )
+*       DOUBLE PRECISION   BERR( * ), FERR( * ), RWORK( * )
+*       COMPLEX*16         A( LDA, * ), AF( LDAF, * ), B( LDB, * ),
+*      $                   WORK( * ), X( LDX, * )
+*       ..
+*  
 *
-                  MAXWRK = M + LWORK_ZGELQF
-                  MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZGEBRD )
-                  IF( WNTUO .OR. WNTUAS )
-     $               MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_Q )
-                  MINWRK = 3*M
-               ELSE IF( WNTVO .AND. WNTUN ) THEN
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGERFS improves the computed solution to a system of linear
+*> equations and provides error bounds and backward error estimates for
+*> the solution.
+*> \endverbatim
 *
-*                 Path 2t(N much larger than M, JOBU='N', JOBVT='O')
+*  Arguments:
+*  ==========
 *
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  MAXWRK = MAX( M*M+WRKBL, M*M+M*N )
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVO .AND. WNTUAS ) THEN
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          Specifies the form of the system of equations:
+*>          = 'N':  A * X = B     (No transpose)
+*>          = 'T':  A**T * X = B  (Transpose)
+*>          = 'C':  A**H * X = B  (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of columns
+*>          of the matrices B and X.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The original N-by-N matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in] AF
+*> \verbatim
+*>          AF is COMPLEX*16 array, dimension (LDAF,N)
+*>          The factors L and U from the factorization A = P*L*U
+*>          as computed by ZGETRF.
+*> \endverbatim
+*>
+*> \param[in] LDAF
+*> \verbatim
+*>          LDAF is INTEGER
+*>          The leading dimension of the array AF.  LDAF >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N)
+*>          The pivot indices from ZGETRF; for 1<=i<=N, row i of the
+*>          matrix was interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          The right hand side matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension (LDX,NRHS)
+*>          On entry, the solution matrix X, as computed by ZGETRS.
+*>          On exit, the improved solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X.  LDX >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] FERR
+*> \verbatim
+*>          FERR is DOUBLE PRECISION array, dimension (NRHS)
+*>          The estimated forward error bound for each solution vector
+*>          X(j) (the j-th column of the solution matrix X).
+*>          If XTRUE is the true solution corresponding to X(j), FERR(j)
+*>          is an estimated upper bound for the magnitude of the largest
+*>          element in (X(j) - XTRUE) divided by the magnitude of the
+*>          largest element in X(j).  The estimate is as reliable as
+*>          the estimate for RCOND, and is almost always a slight
+*>          overestimate of the true error.
+*> \endverbatim
+*>
+*> \param[out] BERR
+*> \verbatim
+*>          BERR is DOUBLE PRECISION array, dimension (NRHS)
+*>          The componentwise relative backward error of each solution
+*>          vector X(j) (i.e., the smallest relative change in
+*>          any element of A or B that makes X(j) an exact solution).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
 *
-*                 Path 3t(N much larger than M, JOBU='S' or 'A',
-*                 JOBVT='O')
+*> \par Internal Parameters:
+*  =========================
+*>
+*> \verbatim
+*>  ITMAX is the maximum number of steps of iterative refinement.
+*> \endverbatim
 *
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
-                  MAXWRK = MAX( M*M+WRKBL, M*M+M*N )
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVS .AND. WNTUN ) THEN
+*  Authors:
+*  ========
 *
-*                 Path 4t(N much larger than M, JOBU='N', JOBVT='S')
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  MAXWRK = M*M + WRKBL
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVS .AND. WNTUO ) THEN
+*> \date November 2011
 *
-*                 Path 5t(N much larger than M, JOBU='O', JOBVT='S')
-*
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
-                  MAXWRK = 2*M*M + WRKBL
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVS .AND. WNTUAS ) THEN
-*
-*                 Path 6t(N much larger than M, JOBU='S' or 'A',
-*                 JOBVT='S')
-*
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
-                  MAXWRK = M*M + WRKBL
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVA .AND. WNTUN ) THEN
-*
-*                 Path 7t(N much larger than M, JOBU='N', JOBVT='A')
-*
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_N )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  MAXWRK = M*M + WRKBL
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVA .AND. WNTUO ) THEN
+*> \ingroup complex16GEcomputational
 *
-*                 Path 8t(N much larger than M, JOBU='O', JOBVT='A')
+*  =====================================================================
+      SUBROUTINE ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB,
+     $                   X, LDX, FERR, BERR, WORK, RWORK, INFO )
 *
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_N )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
-                  MAXWRK = 2*M*M + WRKBL
-                  MINWRK = 2*M + N
-               ELSE IF( WNTVA .AND. WNTUAS ) THEN
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-*                 Path 9t(N much larger than M, JOBU='S' or 'A',
-*                 JOBVT='A')
+*     .. Scalar Arguments ..
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDAF, LDB, LDX, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IPIV( * )
+      DOUBLE PRECISION   BERR( * ), FERR( * ), RWORK( * )
+      COMPLEX*16         A( LDA, * ), AF( LDAF, * ), B( LDB, * ),
+     $                   WORK( * ), X( LDX, * )
+*     ..
 *
-                  WRKBL = M + LWORK_ZGELQF
-                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_N )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
-                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
-                  MAXWRK = M*M + WRKBL
-                  MINWRK = 2*M + N
-               END IF
-            ELSE
+*  =====================================================================
 *
-*              Path 10t(N greater than M, but not much larger)
+*     .. Parameters ..
+      INTEGER            ITMAX
+      PARAMETER          ( ITMAX = 5 )
+      DOUBLE PRECISION   ZERO
+      PARAMETER          ( ZERO = 0.0D+0 )
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   TWO
+      PARAMETER          ( TWO = 2.0D+0 )
+      DOUBLE PRECISION   THREE
+      PARAMETER          ( THREE = 3.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            NOTRAN
+      CHARACTER          TRANSN, TRANST
+      INTEGER            COUNT, I, J, K, KASE, NZ
+      DOUBLE PRECISION   EPS, LSTRES, S, SAFE1, SAFE2, SAFMIN, XK
+      COMPLEX*16         ZDUM
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISAVE( 3 )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           LSAME, DLAMCH
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZAXPY, ZCOPY, ZGEMV, ZGETRS, ZLACN2
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DIMAG, MAX
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
+*     ..
+*     .. Executable Statements ..
 *
-               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
-     $                   CDUM(1), CDUM(1), -1, IERR )
-               LWORK_ZGEBRD=CDUM(1)
-               MAXWRK = 2*M + LWORK_ZGEBRD
-               IF( WNTVS .OR. WNTVO ) THEN
-*                Compute space needed for ZUNGBR P
-                 CALL ZUNGBR( 'P', M, N, M, A, N, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-                 LWORK_ZUNGBR_P=CDUM(1)
-                 MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
-               END IF
-               IF( WNTVA ) THEN
-                 CALL ZUNGBR( 'P', N,  N, M, A, N, CDUM(1),
-     $                   CDUM(1), -1, IERR )
-                 LWORK_ZUNGBR_P=CDUM(1)
-                 MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
-               END IF
-               IF( .NOT.WNTUN ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_Q )
-               MINWRK = 2*M + N
-               END IF
-            END IF
-         END IF
-         MAXWRK = MAX( MAXWRK, MINWRK )
-         WORK( 1 ) = MAXWRK
+*     Test the input parameters.
 *
-         IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
-            INFO = -13
-         END IF
+      INFO = 0
+      NOTRAN = LSAME( TRANS, 'N' )
+      IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $    LSAME( TRANS, 'C' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDAF.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -10
+      ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
+         INFO = -12
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGESVD', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZGERFS', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+      IF( N.EQ.0 .OR. NRHS.EQ.0 ) THEN
+         DO 10 J = 1, NRHS
+            FERR( J ) = ZERO
+            BERR( J ) = ZERO
+   10    CONTINUE
          RETURN
       END IF
 *
-*     Get machine constants
-*
-      EPS = DLAMCH( 'P' )
-      SMLNUM = SQRT( DLAMCH( 'S' ) ) / EPS
-      BIGNUM = ONE / SMLNUM
-*
-*     Scale A if max element outside range [SMLNUM,BIGNUM]
-*
-      ANRM = ZLANGE( 'M', M, N, A, LDA, DUM )
-      ISCL = 0
-      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
-         ISCL = 1
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, IERR )
-      ELSE IF( ANRM.GT.BIGNUM ) THEN
-         ISCL = 1
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, IERR )
+      IF( NOTRAN ) THEN
+         TRANSN = 'N'
+         TRANST = 'C'
+      ELSE
+         TRANSN = 'C'
+         TRANST = 'N'
       END IF
 *
-      IF( M.GE.N ) THEN
-*
-*        A has at least as many rows as columns. If A has sufficiently
-*        more rows than columns, first reduce using the QR
-*        decomposition (if sufficient workspace available)
+*     NZ = maximum number of nonzero elements in each row of A, plus 1
 *
-         IF( M.GE.MNTHR ) THEN
+      NZ = N + 1
+      EPS = DLAMCH( 'Epsilon' )
+      SAFMIN = DLAMCH( 'Safe minimum' )
+      SAFE1 = NZ*SAFMIN
+      SAFE2 = SAFE1 / EPS
 *
-            IF( WNTUN ) THEN
+*     Do for each right hand side
 *
-*              Path 1 (M much larger than N, JOBU='N')
-*              No left singular vectors to be computed
+      DO 140 J = 1, NRHS
 *
-               ITAU = 1
-               IWORK = ITAU + N
+         COUNT = 1
+         LSTRES = THREE
+   20    CONTINUE
 *
-*              Compute A=Q*R
-*              (CWorkspace: need 2*N, prefer N+N*NB)
-*              (RWorkspace: need 0)
+*        Loop until stopping criterion is satisfied.
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
-     $                      LWORK-IWORK+1, IERR )
+*        Compute residual R = B - op(A) * X,
+*        where op(A) = A, A**T, or A**H, depending on TRANS.
 *
-*              Zero out below R
+         CALL ZCOPY( N, B( 1, J ), 1, WORK, 1 )
+         CALL ZGEMV( TRANS, N, N, -ONE, A, LDA, X( 1, J ), 1, ONE, WORK,
+     $               1 )
 *
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
-     $                      LDA )
-               IE = 1
-               ITAUQ = 1
-               ITAUP = ITAUQ + N
-               IWORK = ITAUP + N
+*        Compute componentwise relative backward error from formula
 *
-*              Bidiagonalize R in A
-*              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*              (RWorkspace: need N)
+*        max(i) ( abs(R(i)) / ( abs(op(A))*abs(X) + abs(B) )(i) )
 *
-               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
-     $                      IERR )
-               NCVT = 0
-               IF( WNTVO .OR. WNTVAS ) THEN
+*        where abs(Z) is the componentwise absolute value of the matrix
+*        or vector Z.  If the i-th component of the denominator is less
+*        than SAFE2, then SAFE1 is added to the i-th components of the
+*        numerator and denominator before dividing.
 *
-*                 If right singular vectors desired, generate P'.
-*                 (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*                 (RWorkspace: 0)
+         DO 30 I = 1, N
+            RWORK( I ) = CABS1( B( I, J ) )
+   30    CONTINUE
 *
-                  CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  NCVT = N
-               END IF
-               IRWORK = IE + N
+*        Compute abs(op(A))*abs(X) + abs(B).
 *
-*              Perform bidiagonal QR iteration, computing right
-*              singular vectors of A in A if desired
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+         IF( NOTRAN ) THEN
+            DO 50 K = 1, N
+               XK = CABS1( X( K, J ) )
+               DO 40 I = 1, N
+                  RWORK( I ) = RWORK( I ) + CABS1( A( I, K ) )*XK
+   40          CONTINUE
+   50       CONTINUE
+         ELSE
+            DO 70 K = 1, N
+               S = ZERO
+               DO 60 I = 1, N
+                  S = S + CABS1( A( I, K ) )*CABS1( X( I, J ) )
+   60          CONTINUE
+               RWORK( K ) = RWORK( K ) + S
+   70       CONTINUE
+         END IF
+         S = ZERO
+         DO 80 I = 1, N
+            IF( RWORK( I ).GT.SAFE2 ) THEN
+               S = MAX( S, CABS1( WORK( I ) ) / RWORK( I ) )
+            ELSE
+               S = MAX( S, ( CABS1( WORK( I ) )+SAFE1 ) /
+     $             ( RWORK( I )+SAFE1 ) )
+            END IF
+   80    CONTINUE
+         BERR( J ) = S
 *
-               CALL ZBDSQR( 'U', N, NCVT, 0, 0, S, RWORK( IE ), A, LDA,
-     $                      CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
+*        Test stopping criterion. Continue iterating if
+*           1) The residual BERR(J) is larger than machine epsilon, and
+*           2) BERR(J) decreased by at least a factor of 2 during the
+*              last iteration, and
+*           3) At most ITMAX iterations tried.
+*
+         IF( BERR( J ).GT.EPS .AND. TWO*BERR( J ).LE.LSTRES .AND.
+     $       COUNT.LE.ITMAX ) THEN
+*
+*           Update solution and try again.
+*
+            CALL ZGETRS( TRANS, N, 1, AF, LDAF, IPIV, WORK, N, INFO )
+            CALL ZAXPY( N, ONE, WORK, 1, X( 1, J ), 1 )
+            LSTRES = BERR( J )
+            COUNT = COUNT + 1
+            GO TO 20
+         END IF
+*
+*        Bound error from formula
+*
+*        norm(X - XTRUE) / norm(X) .le. FERR =
+*        norm( abs(inv(op(A)))*
+*           ( abs(R) + NZ*EPS*( abs(op(A))*abs(X)+abs(B) ))) / norm(X)
+*
+*        where
+*          norm(Z) is the magnitude of the largest component of Z
+*          inv(op(A)) is the inverse of op(A)
+*          abs(Z) is the componentwise absolute value of the matrix or
+*             vector Z
+*          NZ is the maximum number of nonzeros in any row of A, plus 1
+*          EPS is machine epsilon
+*
+*        The i-th component of abs(R)+NZ*EPS*(abs(op(A))*abs(X)+abs(B))
+*        is incremented by SAFE1 if the i-th component of
+*        abs(op(A))*abs(X) + abs(B) is less than SAFE2.
+*
+*        Use ZLACN2 to estimate the infinity-norm of the matrix
+*           inv(op(A)) * diag(W),
+*        where W = abs(R) + NZ*EPS*( abs(op(A))*abs(X)+abs(B) )))
+*
+         DO 90 I = 1, N
+            IF( RWORK( I ).GT.SAFE2 ) THEN
+               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
+            ELSE
+               RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
+     $                      SAFE1
+            END IF
+   90    CONTINUE
 *
-*              If right singular vectors desired in VT, copy them there
+         KASE = 0
+  100    CONTINUE
+         CALL ZLACN2( N, WORK( N+1 ), WORK, FERR( J ), KASE, ISAVE )
+         IF( KASE.NE.0 ) THEN
+            IF( KASE.EQ.1 ) THEN
 *
-               IF( WNTVAS )
-     $            CALL ZLACPY( 'F', N, N, A, LDA, VT, LDVT )
+*              Multiply by diag(W)*inv(op(A)**H).
 *
-            ELSE IF( WNTUO .AND. WNTVN ) THEN
+               CALL ZGETRS( TRANST, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
+               DO 110 I = 1, N
+                  WORK( I ) = RWORK( I )*WORK( I )
+  110          CONTINUE
+            ELSE
 *
-*              Path 2 (M much larger than N, JOBU='O', JOBVT='N')
-*              N left singular vectors to be overwritten on A and
-*              no right singular vectors to be computed
+*              Multiply by inv(op(A))*diag(W).
 *
-               IF( LWORK.GE.N*N+3*N ) THEN
+               DO 120 I = 1, N
+                  WORK( I ) = RWORK( I )*WORK( I )
+  120          CONTINUE
+               CALL ZGETRS( TRANSN, N, 1, AF, LDAF, IPIV, WORK, N,
+     $                      INFO )
+            END IF
+            GO TO 100
+         END IF
 *
-*                 Sufficient workspace for a fast algorithm
+*        Normalize error.
 *
-                  IR = 1
-                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*N ) THEN
+         LSTRES = ZERO
+         DO 130 I = 1, N
+            LSTRES = MAX( LSTRES, CABS1( X( I, J ) ) )
+  130    CONTINUE
+         IF( LSTRES.NE.ZERO )
+     $      FERR( J ) = FERR( J ) / LSTRES
 *
-*                    WORK(IU) is LDA by N, WORK(IR) is LDA by N
+  140 CONTINUE
 *
-                     LDWRKU = LDA
-                     LDWRKR = LDA
-                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+N*N ) THEN
+      RETURN
 *
-*                    WORK(IU) is LDA by N, WORK(IR) is N by N
+*     End of ZGERFS
 *
-                     LDWRKU = LDA
-                     LDWRKR = N
-                  ELSE
+      END
+*> \brief \b ZGESC2 solves a system of linear equations using the LU factorization with complete pivoting computed by sgetc2.
 *
-*                    WORK(IU) is LDWRKU by N, WORK(IR) is N by N
+*  =========== DOCUMENTATION ===========
 *
-                     LDWRKU = ( LWORK-N*N ) / N
-                     LDWRKR = N
-                  END IF
-                  ITAU = IR + LDWRKR*N
-                  IWORK = ITAU + N
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-*                 Compute A=Q*R
-*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                 (RWorkspace: 0)
+*> \htmlonly
+*> Download ZGESC2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesc2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesc2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesc2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-                  CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*  Definition:
+*  ===========
 *
-*                 Copy R to WORK(IR) and zero out below it
+*       SUBROUTINE ZGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            LDA, N
+*       DOUBLE PRECISION   SCALE
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IPIV( * ), JPIV( * )
+*       COMPLEX*16         A( LDA, * ), RHS( * )
+*       ..
+*  
 *
-                  CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                         WORK( IR+1 ), LDWRKR )
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGESC2 solves a system of linear equations
+*>
+*>           A * X = scale* RHS
+*>
+*> with a general N-by-N matrix A using the LU factorization with
+*> complete pivoting computed by ZGETC2.
+*>
+*> \endverbatim
 *
-*                 Generate Q in A
-*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                 (RWorkspace: 0)
+*  Arguments:
+*  ==========
 *
-                  CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IE = 1
-                  ITAUQ = ITAU
-                  ITAUP = ITAUQ + N
-                  IWORK = ITAUP + N
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the  LU part of the factorization of the n-by-n
+*>          matrix A computed by ZGETC2:  A = P * L * U * Q
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1, N).
+*> \endverbatim
+*>
+*> \param[in,out] RHS
+*> \verbatim
+*>          RHS is COMPLEX*16 array, dimension N.
+*>          On entry, the right hand side vector b.
+*>          On exit, the solution vector X.
+*> \endverbatim
+*>
+*> \param[in] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N).
+*>          The pivot indices; for 1 <= i <= N, row i of the
+*>          matrix has been interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[in] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N).
+*>          The pivot indices; for 1 <= j <= N, column j of the
+*>          matrix has been interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>           On exit, SCALE contains the scale factor. SCALE is chosen
+*>           0 <= SCALE <= 1 to prevent owerflow in the solution.
+*> \endverbatim
 *
-*                 Bidiagonalize R in WORK(IR)
-*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*                 (RWorkspace: need N)
+*  Authors:
+*  ========
 *
-                  CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*                 Generate left vectors bidiagonalizing R
-*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*                 (RWorkspace: need 0)
+*> \date September 2012
 *
-                  CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
-     $                         WORK( ITAUQ ), WORK( IWORK ),
-     $                         LWORK-IWORK+1, IERR )
-                  IRWORK = IE + N
+*> \ingroup complex16GEauxiliary
 *
-*                 Perform bidiagonal QR iteration, computing left
-*                 singular vectors of R in WORK(IR)
-*                 (CWorkspace: need N*N)
-*                 (RWorkspace: need BDSPAC)
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
 *
-                  CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM, 1,
-     $                         WORK( IR ), LDWRKR, CDUM, 1,
-     $                         RWORK( IRWORK ), INFO )
-                  IU = ITAUQ
+*  =====================================================================
+      SUBROUTINE ZGESC2( N, A, LDA, RHS, IPIV, JPIV, SCALE )
 *
-*                 Multiply Q in A by left singular vectors of R in
-*                 WORK(IR), storing result in WORK(IU) and copying to A
-*                 (CWorkspace: need N*N+N, prefer N*N+M*N)
-*                 (RWorkspace: 0)
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-                  DO 10 I = 1, M, LDWRKU
-                     CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
-     $                           LDA, WORK( IR ), LDWRKR, CZERO,
-     $                           WORK( IU ), LDWRKU )
-                     CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
-     $                            A( I, 1 ), LDA )
-   10             CONTINUE
+*     .. Scalar Arguments ..
+      INTEGER            LDA, N
+      DOUBLE PRECISION   SCALE
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IPIV( * ), JPIV( * )
+      COMPLEX*16         A( LDA, * ), RHS( * )
+*     ..
 *
-               ELSE
+*  =====================================================================
 *
-*                 Insufficient workspace for a fast algorithm
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0, TWO = 2.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J
+      DOUBLE PRECISION   BIGNUM, EPS, SMLNUM
+      COMPLEX*16         TEMP
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLASWP, ZSCAL
+*     ..
+*     .. External Functions ..
+      INTEGER            IZAMAX
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           IZAMAX, DLAMCH
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX
+*     ..
+*     .. Executable Statements ..
 *
-                  IE = 1
-                  ITAUQ = 1
-                  ITAUP = ITAUQ + N
-                  IWORK = ITAUP + N
+*     Set constant to control overflow
 *
-*                 Bidiagonalize A
-*                 (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
-*                 (RWorkspace: N)
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' ) / EPS
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
 *
-                  CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*     Apply permutations IPIV to RHS
 *
-*                 Generate left vectors bidiagonalizing A
-*                 (CWorkspace: need 3*N, prefer 2*N+N*NB)
-*                 (RWorkspace: 0)
+      CALL ZLASWP( 1, RHS, LDA, 1, N-1, IPIV, 1 )
 *
-                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IRWORK = IE + N
+*     Solve for L part
 *
-*                 Perform bidiagonal QR iteration, computing left
-*                 singular vectors of A in A
-*                 (CWorkspace: need 0)
-*                 (RWorkspace: need BDSPAC)
+      DO 20 I = 1, N - 1
+         DO 10 J = I + 1, N
+            RHS( J ) = RHS( J ) - A( J, I )*RHS( I )
+   10    CONTINUE
+   20 CONTINUE
 *
-                  CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM, 1,
-     $                         A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
+*     Solve for U part
 *
-               END IF
+      SCALE = ONE
 *
-            ELSE IF( WNTUO .AND. WNTVAS ) THEN
+*     Check for scaling
 *
-*              Path 3 (M much larger than N, JOBU='O', JOBVT='S' or 'A')
-*              N left singular vectors to be overwritten on A and
-*              N right singular vectors to be computed in VT
+      I = IZAMAX( N, RHS, 1 )
+      IF( TWO*SMLNUM*ABS( RHS( I ) ).GT.ABS( A( N, N ) ) ) THEN
+         TEMP = DCMPLX( ONE / TWO, ZERO ) / ABS( RHS( I ) )
+         CALL ZSCAL( N, TEMP, RHS( 1 ), 1 )
+         SCALE = SCALE*DBLE( TEMP )
+      END IF
+      DO 40 I = N, 1, -1
+         TEMP = DCMPLX( ONE, ZERO ) / A( I, I )
+         RHS( I ) = RHS( I )*TEMP
+         DO 30 J = I + 1, N
+            RHS( I ) = RHS( I ) - RHS( J )*( A( I, J )*TEMP )
+   30    CONTINUE
+   40 CONTINUE
 *
-               IF( LWORK.GE.N*N+3*N ) THEN
+*     Apply permutations JPIV to the solution (RHS)
 *
-*                 Sufficient workspace for a fast algorithm
+      CALL ZLASWP( 1, RHS, LDA, 1, N-1, JPIV, -1 )
+      RETURN
 *
-                  IR = 1
-                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*N ) THEN
+*     End of ZGESC2
 *
-*                    WORK(IU) is LDA by N and WORK(IR) is LDA by N
+      END
+*> \brief \b ZGESDD
 *
-                     LDWRKU = LDA
-                     LDWRKR = LDA
-                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+N*N ) THEN
+*  =========== DOCUMENTATION ===========
 *
-*                    WORK(IU) is LDA by N and WORK(IR) is N by N
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-                     LDWRKU = LDA
-                     LDWRKR = N
-                  ELSE
+*> \htmlonly
+*> Download ZGESDD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesdd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesdd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesdd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*                    WORK(IU) is LDWRKU by N and WORK(IR) is N by N
+*  Definition:
+*  ===========
 *
-                     LDWRKU = ( LWORK-N*N ) / N
-                     LDWRKR = N
-                  END IF
-                  ITAU = IR + LDWRKR*N
-                  IWORK = ITAU + N
+*       SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT, WORK,
+*                          LWORK, RWORK, IWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBZ
+*       INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   RWORK( * ), S( * )
+*       COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
+*      $                   WORK( * )
+*       ..
+*  
 *
-*                 Compute A=Q*R
-*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                 (RWorkspace: 0)
-*
-                  CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGESDD computes the singular value decomposition (SVD) of a complex
+*> M-by-N matrix A, optionally computing the left and/or right singular
+*> vectors, by using divide-and-conquer method. The SVD is written
+*>
+*>      A = U * SIGMA * conjugate-transpose(V)
+*>
+*> where SIGMA is an M-by-N matrix which is zero except for its
+*> min(m,n) diagonal elements, U is an M-by-M unitary matrix, and
+*> V is an N-by-N unitary matrix.  The diagonal elements of SIGMA
+*> are the singular values of A; they are real and non-negative, and
+*> are returned in descending order.  The first min(m,n) columns of
+*> U and V are the left and right singular vectors of A.
+*>
+*> Note that the routine returns VT = V**H, not V.
+*>
+*> The divide and conquer algorithm makes very mild assumptions about
+*> floating point arithmetic. It will work on machines with a guard
+*> digit in add/subtract, or on those binary machines without guard
+*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
+*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
+*> without guard digits, but we know of none.
+*> \endverbatim
 *
-*                 Copy R to VT, zeroing out below it
+*  Arguments:
+*  ==========
 *
-                  CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-                  IF( N.GT.1 )
-     $               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            VT( 2, 1 ), LDVT )
+*> \param[in] JOBZ
+*> \verbatim
+*>          JOBZ is CHARACTER*1
+*>          Specifies options for computing all or part of the matrix U:
+*>          = 'A':  all M columns of U and all N rows of V**H are
+*>                  returned in the arrays U and VT;
+*>          = 'S':  the first min(M,N) columns of U and the first
+*>                  min(M,N) rows of V**H are returned in the arrays U
+*>                  and VT;
+*>          = 'O':  If M >= N, the first N columns of U are overwritten
+*>                  in the array A and all rows of V**H are returned in
+*>                  the array VT;
+*>                  otherwise, all columns of U are returned in the
+*>                  array U and the first M rows of V**H are overwritten
+*>                  in the array A;
+*>          = 'N':  no columns of U or rows of V**H are computed.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the input matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the input matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit,
+*>          if JOBZ = 'O',  A is overwritten with the first N columns
+*>                          of U (the left singular vectors, stored
+*>                          columnwise) if M >= N;
+*>                          A is overwritten with the first M rows
+*>                          of V**H (the right singular vectors, stored
+*>                          rowwise) otherwise.
+*>          if JOBZ .ne. 'O', the contents of A are destroyed.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension (min(M,N))
+*>          The singular values of A, sorted so that S(i) >= S(i+1).
+*> \endverbatim
+*>
+*> \param[out] U
+*> \verbatim
+*>          U is COMPLEX*16 array, dimension (LDU,UCOL)
+*>          UCOL = M if JOBZ = 'A' or JOBZ = 'O' and M < N;
+*>          UCOL = min(M,N) if JOBZ = 'S'.
+*>          If JOBZ = 'A' or JOBZ = 'O' and M < N, U contains the M-by-M
+*>          unitary matrix U;
+*>          if JOBZ = 'S', U contains the first min(M,N) columns of U
+*>          (the left singular vectors, stored columnwise);
+*>          if JOBZ = 'O' and M >= N, or JOBZ = 'N', U is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDU
+*> \verbatim
+*>          LDU is INTEGER
+*>          The leading dimension of the array U.  LDU >= 1; if
+*>          JOBZ = 'S' or 'A' or JOBZ = 'O' and M < N, LDU >= M.
+*> \endverbatim
+*>
+*> \param[out] VT
+*> \verbatim
+*>          VT is COMPLEX*16 array, dimension (LDVT,N)
+*>          If JOBZ = 'A' or JOBZ = 'O' and M >= N, VT contains the
+*>          N-by-N unitary matrix V**H;
+*>          if JOBZ = 'S', VT contains the first min(M,N) rows of
+*>          V**H (the right singular vectors, stored rowwise);
+*>          if JOBZ = 'O' and M < N, or JOBZ = 'N', VT is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDVT
+*> \verbatim
+*>          LDVT is INTEGER
+*>          The leading dimension of the array VT.  LDVT >= 1; if
+*>          JOBZ = 'A' or JOBZ = 'O' and M >= N, LDVT >= N;
+*>          if JOBZ = 'S', LDVT >= min(M,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= 1.
+*>          if JOBZ = 'N', LWORK >= 2*min(M,N)+max(M,N).
+*>          if JOBZ = 'O',
+*>                LWORK >= 2*min(M,N)*min(M,N)+2*min(M,N)+max(M,N).
+*>          if JOBZ = 'S' or 'A',
+*>                LWORK >= min(M,N)*min(M,N)+2*min(M,N)+max(M,N).
+*>          For good performance, LWORK should generally be larger.
+*>
+*>          If LWORK = -1, a workspace query is assumed.  The optimal
+*>          size for the WORK array is calculated and stored in WORK(1),
+*>          and no other work except argument checking is performed.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,LRWORK))
+*>          If JOBZ = 'N', LRWORK >= 7*min(M,N).
+*>          Otherwise,
+*>          LRWORK >= min(M,N)*max(5*min(M,N)+7,2*max(M,N)+2*min(M,N)+1)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (8*min(M,N))
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  The updating process of DBDSDC did not converge.
+*> \endverbatim
 *
-*                 Generate Q in A
-*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                 (RWorkspace: 0)
+*  Authors:
+*  ========
 *
-                  CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IE = 1
-                  ITAUQ = ITAU
-                  ITAUP = ITAUQ + N
-                  IWORK = ITAUP + N
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*                 Bidiagonalize R in VT, copying result to WORK(IR)
-*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*                 (RWorkspace: need N)
+*> \date November 2015
 *
-                  CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL ZLACPY( 'L', N, N, VT, LDVT, WORK( IR ), LDWRKR )
+*> \ingroup complex16GEsing
 *
-*                 Generate left vectors bidiagonalizing R in WORK(IR)
-*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*                 (RWorkspace: 0)
+*> \par Contributors:
+*  ==================
+*>
+*>     Ming Gu and Huan Ren, Computer Science Division, University of
+*>     California at Berkeley, USA
+*>
+*  =====================================================================
+      SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT, WORK,
+     $                   LWORK, RWORK, IWORK, INFO )
 *
-                  CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
-     $                         WORK( ITAUQ ), WORK( IWORK ),
-     $                         LWORK-IWORK+1, IERR )
+*  -- LAPACK driver routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
 *
-*                 Generate right vectors bidiagonalizing R in VT
-*                 (CWorkspace: need N*N+3*N-1, prefer N*N+2*N+(N-1)*NB)
-*                 (RWorkspace: 0)
+*     .. Scalar Arguments ..
+      CHARACTER          JOBZ
+      INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   RWORK( * ), S( * )
+      COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
+     $                   WORK( * )
+*     ..
 *
-                  CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IRWORK = IE + N
+*  =====================================================================
 *
-*                 Perform bidiagonal QR iteration, computing left
-*                 singular vectors of R in WORK(IR) and computing right
-*                 singular vectors of R in VT
-*                 (CWorkspace: need N*N)
-*                 (RWorkspace: need BDSPAC)
+*     .. Parameters ..
+      INTEGER            LQUERV
+      PARAMETER          ( LQUERV = -1 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            WNTQA, WNTQAS, WNTQN, WNTQO, WNTQS
+      INTEGER            BLK, CHUNK, I, IE, IERR, IL, IR, IRU, IRVT,
+     $                   ISCL, ITAU, ITAUP, ITAUQ, IU, IVT, LDWKVT,
+     $                   LDWRKL, LDWRKR, LDWRKU, MAXWRK, MINMN, MINWRK,
+     $                   MNTHR1, MNTHR2, NRWORK, NWORK, WRKBL
+      DOUBLE PRECISION   ANRM, BIGNUM, EPS, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      INTEGER            IDUM( 1 )
+      DOUBLE PRECISION   DUM( 1 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DBDSDC, DLASCL, XERBLA, ZGEBRD, ZGELQF, ZGEMM,
+     $                   ZGEQRF, ZLACP2, ZLACPY, ZLACRM, ZLARCM, ZLASCL,
+     $                   ZLASET, ZUNGBR, ZUNGLQ, ZUNGQR, ZUNMBR
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          INT, MAX, MIN, SQRT
+*     ..
+*     .. Executable Statements ..
 *
-                  CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
-     $                         LDVT, WORK( IR ), LDWRKR, CDUM, 1,
-     $                         RWORK( IRWORK ), INFO )
-                  IU = ITAUQ
+*     Test the input arguments
 *
-*                 Multiply Q in A by left singular vectors of R in
-*                 WORK(IR), storing result in WORK(IU) and copying to A
-*                 (CWorkspace: need N*N+N, prefer N*N+M*N)
-*                 (RWorkspace: 0)
+      INFO = 0
+      MINMN = MIN( M, N )
+      MNTHR1 = INT( MINMN*17.0D0 / 9.0D0 )
+      MNTHR2 = INT( MINMN*5.0D0 / 3.0D0 )
+      WNTQA = LSAME( JOBZ, 'A' )
+      WNTQS = LSAME( JOBZ, 'S' )
+      WNTQAS = WNTQA .OR. WNTQS
+      WNTQO = LSAME( JOBZ, 'O' )
+      WNTQN = LSAME( JOBZ, 'N' )
+      MINWRK = 1
+      MAXWRK = 1
 *
-                  DO 20 I = 1, M, LDWRKU
-                     CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
-     $                           LDA, WORK( IR ), LDWRKR, CZERO,
-     $                           WORK( IU ), LDWRKU )
-                     CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
-     $                            A( I, 1 ), LDA )
-   20             CONTINUE
+      IF( .NOT.( WNTQA .OR. WNTQS .OR. WNTQO .OR. WNTQN ) ) THEN
+         INFO = -1
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      ELSE IF( LDU.LT.1 .OR. ( WNTQAS .AND. LDU.LT.M ) .OR.
+     $         ( WNTQO .AND. M.LT.N .AND. LDU.LT.M ) ) THEN
+         INFO = -8
+      ELSE IF( LDVT.LT.1 .OR. ( WNTQA .AND. LDVT.LT.N ) .OR.
+     $         ( WNTQS .AND. LDVT.LT.MINMN ) .OR.
+     $         ( WNTQO .AND. M.GE.N .AND. LDVT.LT.N ) ) THEN
+         INFO = -10
+      END IF
 *
-               ELSE
+*     Compute workspace
+*      (Note: Comments in the code beginning "Workspace:" describe the
+*       minimal amount of workspace needed at that point in the code,
+*       as well as the preferred amount for good performance.
+*       CWorkspace refers to complex workspace, and RWorkspace to
+*       real workspace. NB refers to the optimal block size for the
+*       immediately following subroutine, as returned by ILAENV.)
 *
-*                 Insufficient workspace for a fast algorithm
+      IF( INFO.EQ.0 .AND. M.GT.0 .AND. N.GT.0 ) THEN
+         IF( M.GE.N ) THEN
 *
-                  ITAU = 1
-                  IWORK = ITAU + N
+*           There is no complex work space needed for bidiagonal SVD
+*           The real work space needed for bidiagonal SVD is BDSPAC
+*           for computing singular values and singular vectors; BDSPAN
+*           for computing singular values only.
+*           BDSPAC = 5*N*N + 7*N
+*           BDSPAN = MAX(7*N+4, 3*N+2+SMLSIZ*(SMLSIZ+8))
 *
-*                 Compute A=Q*R
-*                 (CWorkspace: need 2*N, prefer N+N*NB)
-*                 (RWorkspace: 0)
+            IF( M.GE.MNTHR1 ) THEN
+               IF( WNTQN ) THEN
 *
-                  CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*                 Path 1 (M much larger than N, JOBZ='N')
 *
-*                 Copy R to VT, zeroing out below it
+                  MAXWRK = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1,
+     $                     -1 )
+                  MAXWRK = MAX( MAXWRK, 2*N+2*N*
+     $                     ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
+                  MINWRK = 3*N
+               ELSE IF( WNTQO ) THEN
 *
-                  CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-                  IF( N.GT.1 )
-     $               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            VT( 2, 1 ), LDVT )
+*                 Path 2 (M much larger than N, JOBZ='O')
 *
-*                 Generate Q in A
-*                 (CWorkspace: need 2*N, prefer N+N*NB)
-*                 (RWorkspace: 0)
+                  WRKBL = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
+                  WRKBL = MAX( WRKBL, N+N*ILAENV( 1, 'ZUNGQR', ' ', M,
+     $                    N, N, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+2*N*
+     $                    ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+N*
+     $                    ILAENV( 1, 'ZUNMBR', 'QLN', N, N, N, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+N*
+     $                    ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
+                  MAXWRK = M*N + N*N + WRKBL
+                  MINWRK = 2*N*N + 3*N
+               ELSE IF( WNTQS ) THEN
 *
-                  CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IE = 1
-                  ITAUQ = ITAU
-                  ITAUP = ITAUQ + N
-                  IWORK = ITAUP + N
+*                 Path 3 (M much larger than N, JOBZ='S')
 *
-*                 Bidiagonalize R in VT
-*                 (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                 (RWorkspace: N)
+                  WRKBL = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
+                  WRKBL = MAX( WRKBL, N+N*ILAENV( 1, 'ZUNGQR', ' ', M,
+     $                    N, N, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+2*N*
+     $                    ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+N*
+     $                    ILAENV( 1, 'ZUNMBR', 'QLN', N, N, N, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+N*
+     $                    ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
+                  MAXWRK = N*N + WRKBL
+                  MINWRK = N*N + 3*N
+               ELSE IF( WNTQA ) THEN
 *
-                  CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*                 Path 4 (M much larger than N, JOBZ='A')
 *
-*                 Multiply Q in A by left vectors bidiagonalizing R
-*                 (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                 (RWorkspace: 0)
+                  WRKBL = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
+                  WRKBL = MAX( WRKBL, N+M*ILAENV( 1, 'ZUNGQR', ' ', M,
+     $                    M, N, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+2*N*
+     $                    ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+N*
+     $                    ILAENV( 1, 'ZUNMBR', 'QLN', N, N, N, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*N+N*
+     $                    ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
+                  MAXWRK = N*N + WRKBL
+                  MINWRK = N*N + 2*N + M
+               END IF
+            ELSE IF( M.GE.MNTHR2 ) THEN
 *
-                  CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, VT, LDVT,
-     $                         WORK( ITAUQ ), A, LDA, WORK( IWORK ),
-     $                         LWORK-IWORK+1, IERR )
+*              Path 5 (M much larger than N, but not as much as MNTHR1)
 *
-*                 Generate right vectors bidiagonalizing R in VT
-*                 (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*                 (RWorkspace: 0)
+               MAXWRK = 2*N + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
+     $                  -1, -1 )
+               MINWRK = 2*N + M
+               IF( WNTQO ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, N, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, N, N, -1 ) )
+                  MAXWRK = MAXWRK + M*N
+                  MINWRK = MINWRK + N*N
+               ELSE IF( WNTQS ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, N, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, N, N, -1 ) )
+               ELSE IF( WNTQA ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, N, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*N+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
+               END IF
+            ELSE
 *
-                  CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IRWORK = IE + N
+*              Path 6 (M at least N, but not much larger)
 *
-*                 Perform bidiagonal QR iteration, computing left
-*                 singular vectors of A in A and computing right
-*                 singular vectors of A in VT
-*                 (CWorkspace: 0)
-*                 (RWorkspace: need BDSPAC)
+               MAXWRK = 2*N + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
+     $                  -1, -1 )
+               MINWRK = 2*N + M
+               IF( WNTQO ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNMBR', 'QLN', M, N, N, -1 ) )
+                  MAXWRK = MAXWRK + M*N
+                  MINWRK = MINWRK + N*N
+               ELSE IF( WNTQS ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNMBR', 'QLN', M, N, N, -1 ) )
+               ELSE IF( WNTQA ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'PRC', N, N, N, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*N+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'QLN', M, M, N, -1 ) )
+               END IF
+            END IF
+         ELSE
 *
-                  CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
-     $                         LDVT, A, LDA, CDUM, 1, RWORK( IRWORK ),
-     $                         INFO )
+*           There is no complex work space needed for bidiagonal SVD
+*           The real work space needed for bidiagonal SVD is BDSPAC
+*           for computing singular values and singular vectors; BDSPAN
+*           for computing singular values only.
+*           BDSPAC = 5*M*M + 7*M
+*           BDSPAN = MAX(7*M+4, 3*M+2+SMLSIZ*(SMLSIZ+8))
 *
-               END IF
+            IF( N.GE.MNTHR1 ) THEN
+               IF( WNTQN ) THEN
 *
-            ELSE IF( WNTUS ) THEN
+*                 Path 1t (N much larger than M, JOBZ='N')
 *
-               IF( WNTVN ) THEN
+                  MAXWRK = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1,
+     $                     -1 )
+                  MAXWRK = MAX( MAXWRK, 2*M+2*M*
+     $                     ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
+                  MINWRK = 3*M
+               ELSE IF( WNTQO ) THEN
 *
-*                 Path 4 (M much larger than N, JOBU='S', JOBVT='N')
-*                 N left singular vectors to be computed in U and
-*                 no right singular vectors to be computed
+*                 Path 2t (N much larger than M, JOBZ='O')
 *
-                  IF( LWORK.GE.N*N+3*N ) THEN
+                  WRKBL = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
+                  WRKBL = MAX( WRKBL, M+M*ILAENV( 1, 'ZUNGLQ', ' ', M,
+     $                    N, M, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+2*M*
+     $                    ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+M*
+     $                    ILAENV( 1, 'ZUNMBR', 'PRC', M, M, M, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+M*
+     $                    ILAENV( 1, 'ZUNMBR', 'QLN', M, M, M, -1 ) )
+                  MAXWRK = M*N + M*M + WRKBL
+                  MINWRK = 2*M*M + 3*M
+               ELSE IF( WNTQS ) THEN
 *
-*                    Sufficient workspace for a fast algorithm
+*                 Path 3t (N much larger than M, JOBZ='S')
 *
-                     IR = 1
-                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
-*
-*                       WORK(IR) is LDA by N
+                  WRKBL = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
+                  WRKBL = MAX( WRKBL, M+M*ILAENV( 1, 'ZUNGLQ', ' ', M,
+     $                    N, M, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+2*M*
+     $                    ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+M*
+     $                    ILAENV( 1, 'ZUNMBR', 'PRC', M, M, M, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+M*
+     $                    ILAENV( 1, 'ZUNMBR', 'QLN', M, M, M, -1 ) )
+                  MAXWRK = M*M + WRKBL
+                  MINWRK = M*M + 3*M
+               ELSE IF( WNTQA ) THEN
 *
-                        LDWRKR = LDA
-                     ELSE
+*                 Path 4t (N much larger than M, JOBZ='A')
 *
-*                       WORK(IR) is N by N
+                  WRKBL = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
+                  WRKBL = MAX( WRKBL, M+N*ILAENV( 1, 'ZUNGLQ', ' ', N,
+     $                    N, M, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+2*M*
+     $                    ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+M*
+     $                    ILAENV( 1, 'ZUNMBR', 'PRC', M, M, M, -1 ) )
+                  WRKBL = MAX( WRKBL, 2*M+M*
+     $                    ILAENV( 1, 'ZUNMBR', 'QLN', M, M, M, -1 ) )
+                  MAXWRK = M*M + WRKBL
+                  MINWRK = M*M + 2*M + N
+               END IF
+            ELSE IF( N.GE.MNTHR2 ) THEN
 *
-                        LDWRKR = N
-                     END IF
-                     ITAU = IR + LDWRKR*N
-                     IWORK = ITAU + N
+*              Path 5t (N much larger than M, but not as much as MNTHR1)
 *
-*                    Compute A=Q*R
-*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                    (RWorkspace: 0)
+               MAXWRK = 2*M + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
+     $                  -1, -1 )
+               MINWRK = 2*M + N
+               IF( WNTQO ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'P', M, N, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
+                  MAXWRK = MAXWRK + M*N
+                  MINWRK = MINWRK + M*M
+               ELSE IF( WNTQS ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'P', M, N, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
+               ELSE IF( WNTQA ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
+               END IF
+            ELSE
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*              Path 6t (N greater than M, but not much larger)
 *
-*                    Copy R to WORK(IR), zeroing out below it
+               MAXWRK = 2*M + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
+     $                  -1, -1 )
+               MINWRK = 2*M + N
+               IF( WNTQO ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNMBR', 'PRC', M, N, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNMBR', 'QLN', M, M, N, -1 ) )
+                  MAXWRK = MAXWRK + M*N
+                  MINWRK = MINWRK + M*M
+               ELSE IF( WNTQS ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'PRC', M, N, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'QLN', M, M, N, -1 ) )
+               ELSE IF( WNTQA ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+N*
+     $                     ILAENV( 1, 'ZUNGBR', 'PRC', N, N, M, -1 ) )
+                  MAXWRK = MAX( MAXWRK, 2*M+M*
+     $                     ILAENV( 1, 'ZUNGBR', 'QLN', M, M, N, -1 ) )
+               END IF
+            END IF
+         END IF
+         MAXWRK = MAX( MAXWRK, MINWRK )
+      END IF
+      IF( INFO.EQ.0 ) THEN
+         WORK( 1 ) = MAXWRK
+         IF( LWORK.LT.MINWRK .AND. LWORK.NE.LQUERV )
+     $      INFO = -13
+      END IF
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ),
-     $                            LDWRKR )
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            WORK( IR+1 ), LDWRKR )
+*     Quick returns
 *
-*                    Generate Q in A
-*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                    (RWorkspace: 0)
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGESDD', -INFO )
+         RETURN
+      END IF
+      IF( LWORK.EQ.LQUERV )
+     $   RETURN
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         RETURN
+      END IF
 *
-                     CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+*     Get machine constants
 *
-*                    Bidiagonalize R in WORK(IR)
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*                    (RWorkspace: need N)
+      EPS = DLAMCH( 'P' )
+      SMLNUM = SQRT( DLAMCH( 'S' ) ) / EPS
+      BIGNUM = ONE / SMLNUM
 *
-                     CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+*     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
-*                    Generate left vectors bidiagonalizing R in WORK(IR)
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*                    (RWorkspace: 0)
+      ANRM = ZLANGE( 'M', M, N, A, LDA, DUM )
+      ISCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+         ISCL = 1
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, IERR )
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+         ISCL = 1
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, IERR )
+      END IF
 *
-                     CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+      IF( M.GE.N ) THEN
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of R in WORK(IR)
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: need BDSPAC)
+*        A has at least as many rows as columns. If A has sufficiently
+*        more rows than columns, first reduce using the QR
+*        decomposition (if sufficient workspace available)
 *
-                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
-     $                            1, WORK( IR ), LDWRKR, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+         IF( M.GE.MNTHR1 ) THEN
 *
-*                    Multiply Q in A by left singular vectors of R in
-*                    WORK(IR), storing result in U
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+            IF( WNTQN ) THEN
 *
-                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
-     $                           WORK( IR ), LDWRKR, CZERO, U, LDU )
+*              Path 1 (M much larger than N, JOBZ='N')
+*              No singular vectors to be computed
 *
-                  ELSE
+               ITAU = 1
+               NWORK = ITAU + N
 *
-*                    Insufficient workspace for a fast algorithm
+*              Compute A=Q*R
+*              (CWorkspace: need 2*N, prefer N+N*NB)
+*              (RWorkspace: need 0)
 *
-                     ITAU = 1
-                     IWORK = ITAU + N
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+*              Zero out below R
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
+     $                      LDA )
+               IE = 1
+               ITAUQ = 1
+               ITAUP = ITAUQ + N
+               NWORK = ITAUP + N
 *
-*                    Generate Q in U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+*              Bidiagonalize R in A
+*              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*              (RWorkspace: need N)
 *
-                     CALL ZUNGQR( M, N, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                      IERR )
+               NRWORK = IE + N
 *
-*                    Zero out below R in A
+*              Perform bidiagonal SVD, compute singular values only
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAN)
 *
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            A( 2, 1 ), LDA )
+               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1, DUM, 1,
+     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
 *
-*                    Bidiagonalize R in A
-*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                    (RWorkspace: need N)
+            ELSE IF( WNTQO ) THEN
 *
-                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*              Path 2 (M much larger than N, JOBZ='O')
+*              N left singular vectors to be overwritten on A and
+*              N right singular vectors to be computed in VT
 *
-*                    Multiply Q in U by left vectors bidiagonalizing R
-*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                    (RWorkspace: 0)
+               IU = 1
 *
-                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
-     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+*              WORK(IU) is N by N
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+               LDWRKU = N
+               IR = IU + LDWRKU*N
+               IF( LWORK.GE.M*N+N*N+3*N ) THEN
 *
-                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
-     $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+*                 WORK(IR) is M by N
 *
-                  END IF
+                  LDWRKR = M
+               ELSE
+                  LDWRKR = ( LWORK-N*N-3*N ) / N
+               END IF
+               ITAU = IR + LDWRKR*N
+               NWORK = ITAU + N
 *
-               ELSE IF( WNTVO ) THEN
+*              Compute A=Q*R
+*              (CWorkspace: need N*N+2*N, prefer M*N+N+N*NB)
+*              (RWorkspace: 0)
 *
-*                 Path 5 (M much larger than N, JOBU='S', JOBVT='O')
-*                 N left singular vectors to be computed in U and
-*                 N right singular vectors to be overwritten on A
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                  IF( LWORK.GE.2*N*N+3*N ) THEN
+*              Copy R to WORK( IR ), zeroing out below it
 *
-*                    Sufficient workspace for a fast algorithm
+               CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
+     $                      LDWRKR )
 *
-                     IU = 1
-                     IF( LWORK.GE.WRKBL+2*LDA*N ) THEN
+*              Generate Q in A
+*              (CWorkspace: need 2*N, prefer N+N*NB)
+*              (RWorkspace: 0)
 *
-*                       WORK(IU) is LDA by N and WORK(IR) is LDA by N
+               CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+               IE = 1
+               ITAUQ = ITAU
+               ITAUP = ITAUQ + N
+               NWORK = ITAUP + N
 *
-                        LDWRKU = LDA
-                        IR = IU + LDWRKU*N
-                        LDWRKR = LDA
-                     ELSE IF( LWORK.GE.WRKBL+( LDA+N )*N ) THEN
+*              Bidiagonalize R in WORK(IR)
+*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+2*N*NB)
+*              (RWorkspace: need N)
 *
-*                       WORK(IU) is LDA by N and WORK(IR) is N by N
+               CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
+     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                        LDWRKU = LDA
-                        IR = IU + LDWRKU*N
-                        LDWRKR = N
-                     ELSE
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of R in WORK(IRU) and computing right singular vectors
+*              of R in WORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-*                       WORK(IU) is N by N and WORK(IR) is N by N
+               IRU = IE + N
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                        LDWRKU = N
-                        IR = IU + LDWRKU*N
-                        LDWRKR = N
-                     END IF
-                     ITAU = IR + LDWRKR*N
-                     IWORK = ITAU + N
+*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
+*              Overwrite WORK(IU) by the left singular vectors of R
+*              (CWorkspace: need 2*N*N+3*N, prefer M*N+N*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Compute A=Q*R
-*                    (CWorkspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB)
-*                    (RWorkspace: 0)
+               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
+     $                      LDWRKU )
+               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+     $                      WORK( ITAUQ ), WORK( IU ), LDWRKU,
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by the right singular vectors of R
+*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Copy R to WORK(IU), zeroing out below it
+               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            WORK( IU+1 ), LDWRKU )
+*              Multiply Q in A by left singular vectors of R in
+*              WORK(IU), storing result in WORK(IR) and copying to A
+*              (CWorkspace: need 2*N*N, prefer N*N+M*N)
+*              (RWorkspace: 0)
 *
-*                    Generate Q in A
-*                    (CWorkspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB)
-*                    (RWorkspace: 0)
+               DO 10 I = 1, M, LDWRKR
+                  CHUNK = MIN( M-I+1, LDWRKR )
+                  CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+     $                        LDA, WORK( IU ), LDWRKU, CZERO,
+     $                        WORK( IR ), LDWRKR )
+                  CALL ZLACPY( 'F', CHUNK, N, WORK( IR ), LDWRKR,
+     $                         A( I, 1 ), LDA )
+   10          CONTINUE
 *
-                     CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+            ELSE IF( WNTQS ) THEN
 *
-*                    Bidiagonalize R in WORK(IU), copying result to
-*                    WORK(IR)
-*                    (CWorkspace: need   2*N*N+3*N,
-*                                 prefer 2*N*N+2*N+2*N*NB)
-*                    (RWorkspace: need   N)
+*              Path 3 (M much larger than N, JOBZ='S')
+*              N left singular vectors to be computed in U and
+*              N right singular vectors to be computed in VT
 *
-                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU,
-     $                            WORK( IR ), LDWRKR )
+               IR = 1
 *
-*                    Generate left bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need 2*N*N+3*N, prefer 2*N*N+2*N+N*NB)
-*                    (RWorkspace: 0)
+*              WORK(IR) is N by N
 *
-                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+               LDWRKR = N
+               ITAU = IR + LDWRKR*N
+               NWORK = ITAU + N
 *
-*                    Generate right bidiagonalizing vectors in WORK(IR)
-*                    (CWorkspace: need   2*N*N+3*N-1,
-*                                 prefer 2*N*N+2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+*              Compute A=Q*R
+*              (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of R in WORK(IU) and computing
-*                    right singular vectors of R in WORK(IR)
-*                    (CWorkspace: need 2*N*N)
-*                    (RWorkspace: need BDSPAC)
+*              Copy R to WORK(IR), zeroing out below it
 *
-                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
-     $                            WORK( IR ), LDWRKR, WORK( IU ),
-     $                            LDWRKU, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+               CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
+     $                      LDWRKR )
 *
-*                    Multiply Q in A by left singular vectors of R in
-*                    WORK(IU), storing result in U
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+*              Generate Q in A
+*              (CWorkspace: need 2*N, prefer N+N*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
-     $                           WORK( IU ), LDWRKU, CZERO, U, LDU )
+               CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+               IE = 1
+               ITAUQ = ITAU
+               ITAUP = ITAUQ + N
+               NWORK = ITAUP + N
 *
-*                    Copy right singular vectors of R to A
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+*              Bidiagonalize R in WORK(IR)
+*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*              (RWorkspace: need N)
 *
-                     CALL ZLACPY( 'F', N, N, WORK( IR ), LDWRKR, A,
-     $                            LDA )
+               CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
+     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                  ELSE
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-*                    Insufficient workspace for a fast algorithm
+               IRU = IE + N
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                     ITAU = 1
-                     IWORK = ITAU + N
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of R
+*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of R
+*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Generate Q in U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZUNGQR( M, N, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+*              Multiply Q in A by left singular vectors of R in
+*              WORK(IR), storing result in U
+*              (CWorkspace: need N*N)
+*              (RWorkspace: 0)
 *
-*                    Zero out below R in A
+               CALL ZLACPY( 'F', N, N, U, LDU, WORK( IR ), LDWRKR )
+               CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA, WORK( IR ),
+     $                     LDWRKR, CZERO, U, LDU )
 *
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            A( 2, 1 ), LDA )
+            ELSE IF( WNTQA ) THEN
 *
-*                    Bidiagonalize R in A
-*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                    (RWorkspace: need N)
+*              Path 4 (M much larger than N, JOBZ='A')
+*              M left singular vectors to be computed in U and
+*              N right singular vectors to be computed in VT
 *
-                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+               IU = 1
 *
-*                    Multiply Q in U by left vectors bidiagonalizing R
-*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                    (RWorkspace: 0)
+*              WORK(IU) is N by N
 *
-                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
-     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-*
-*                    Generate right vectors bidiagonalizing R in A
-*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+               LDWRKU = N
+               ITAU = IU + LDWRKU*N
+               NWORK = ITAU + N
 *
-                     CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+*              Compute A=Q*R, copying result to U
+*              (CWorkspace: need 2*N, prefer N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U and computing right
-*                    singular vectors of A in A
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
+               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), A,
-     $                            LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+*              Generate Q in U
+*              (CWorkspace: need N+M, prefer N+M*NB)
+*              (RWorkspace: 0)
 *
-                  END IF
+               CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               ELSE IF( WNTVAS ) THEN
+*              Produce R in A, zeroing out below it
 *
-*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S'
-*                         or 'A')
-*                 N left singular vectors to be computed in U and
-*                 N right singular vectors to be computed in VT
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
+     $                      LDA )
+               IE = 1
+               ITAUQ = ITAU
+               ITAUP = ITAUQ + N
+               NWORK = ITAUP + N
 *
-                  IF( LWORK.GE.N*N+3*N ) THEN
+*              Bidiagonalize R in A
+*              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*              (RWorkspace: need N)
 *
-*                    Sufficient workspace for a fast algorithm
+               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                      IERR )
+               IRU = IE + N
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
 *
-                     IU = 1
-                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-*                       WORK(IU) is LDA by N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                        LDWRKU = LDA
-                     ELSE
+*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
+*              Overwrite WORK(IU) by left singular vectors of R
+*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                       WORK(IU) is N by N
+               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
+     $                      LDWRKU )
+               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, A, LDA,
+     $                      WORK( ITAUQ ), WORK( IU ), LDWRKU,
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                        LDWRKU = N
-                     END IF
-                     ITAU = IU + LDWRKU*N
-                     IWORK = ITAU + N
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of R
+*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Compute A=Q*R
-*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                    (RWorkspace: 0)
+               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*              Multiply Q in U by left singular vectors of R in
+*              WORK(IU), storing result in A
+*              (CWorkspace: need N*N)
+*              (RWorkspace: 0)
 *
-*                    Copy R to WORK(IU), zeroing out below it
+               CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU, WORK( IU ),
+     $                     LDWRKU, CZERO, A, LDA )
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            WORK( IU+1 ), LDWRKU )
+*              Copy left singular vectors of A from A to U
 *
-*                    Generate Q in A
-*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                    (RWorkspace: 0)
+               CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
 *
-                     CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+            END IF
 *
-*                    Bidiagonalize R in WORK(IU), copying result to VT
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*                    (RWorkspace: need N)
+         ELSE IF( M.GE.MNTHR2 ) THEN
 *
-                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU, VT,
-     $                            LDVT )
+*           MNTHR2 <= M < MNTHR1
 *
-*                    Generate left bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*                    (RWorkspace: 0)
+*           Path 5 (M much larger than N, but not as much as MNTHR1)
+*           Reduce to bidiagonal form without QR decomposition, use
+*           ZUNGBR and matrix multiplication to compute singular vectors
 *
-                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+            IE = 1
+            NRWORK = IE + N
+            ITAUQ = 1
+            ITAUP = ITAUQ + N
+            NWORK = ITAUP + N
 *
-*                    Generate right bidiagonalizing vectors in VT
-*                    (CWorkspace: need   N*N+3*N-1,
-*                                 prefer N*N+2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+*           Bidiagonalize A
+*           (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
+*           (RWorkspace: need N)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                   IERR )
+            IF( WNTQN ) THEN
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of R in WORK(IU) and computing
-*                    right singular vectors of R in VT
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: need BDSPAC)
+*              Compute singular values only
+*              (Cworkspace: 0)
+*              (Rworkspace: need BDSPAN)
 *
-                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
-     $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1, DUM, 1,
+     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
+            ELSE IF( WNTQO ) THEN
+               IU = NWORK
+               IRU = NRWORK
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
 *
-*                    Multiply Q in A by left singular vectors of R in
-*                    WORK(IU), storing result in U
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+*              Copy A to VT, generate P**H
+*              (Cworkspace: need 2*N, prefer N+N*NB)
+*              (Rworkspace: 0)
 *
-                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
-     $                           WORK( IU ), LDWRKU, CZERO, U, LDU )
+               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                  ELSE
+*              Generate Q in A
+*              (CWorkspace: need 2*N, prefer N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Insufficient workspace for a fast algorithm
+               CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                     ITAU = 1
-                     IWORK = ITAU + N
+               IF( LWORK.GE.M*N+3*N ) THEN
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+*                 WORK( IU ) is M by N
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+                  LDWRKU = M
+               ELSE
 *
-*                    Generate Q in U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+*                 WORK(IU) is LDWRKU by N
 *
-                     CALL ZUNGQR( M, N, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  LDWRKU = ( LWORK-3*N ) / N
+               END IF
+               NWORK = IU + LDWRKU*N
 *
-*                    Copy R to VT, zeroing out below it
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-                     IF( N.GT.1 )
-     $                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                               VT( 2, 1 ), LDVT )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                    Bidiagonalize R in VT
-*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                    (RWorkspace: need N)
+*              Multiply real matrix RWORK(IRVT) by P**H in VT,
+*              storing the result in WORK(IU), copying to VT
+*              (Cworkspace: need 0)
+*              (Rworkspace: need 3*N*N)
 *
-                     CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+               CALL ZLARCM( N, N, RWORK( IRVT ), N, VT, LDVT,
+     $                      WORK( IU ), LDWRKU, RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', N, N, WORK( IU ), LDWRKU, VT, LDVT )
 *
-*                    Multiply Q in U by left bidiagonalizing vectors
-*                    in VT
-*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                    (RWorkspace: 0)
+*              Multiply Q in A by real matrix RWORK(IRU), storing the
+*              result in WORK(IU), copying to A
+*              (CWorkspace: need N*N, prefer M*N)
+*              (Rworkspace: need 3*N*N, prefer N*N+2*M*N)
 *
-                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, VT, LDVT,
-     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+               NRWORK = IRVT
+               DO 20 I = 1, M, LDWRKU
+                  CHUNK = MIN( M-I+1, LDWRKU )
+                  CALL ZLACRM( CHUNK, N, A( I, 1 ), LDA, RWORK( IRU ),
+     $                         N, WORK( IU ), LDWRKU, RWORK( NRWORK ) )
+                  CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
+     $                         A( I, 1 ), LDA )
+   20          CONTINUE
 *
-*                    Generate right bidiagonalizing vectors in VT
-*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+            ELSE IF( WNTQS ) THEN
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+*              Copy A to VT, generate P**H
+*              (Cworkspace: need 2*N, prefer N+N*NB)
+*              (Rworkspace: 0)
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U and computing right
-*                    singular vectors of A in VT
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
-     $                            LDVT, U, LDU, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+*              Copy A to U, generate Q
+*              (Cworkspace: need 2*N, prefer N+N*NB)
+*              (Rworkspace: 0)
 *
-                  END IF
+               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               CALL ZUNGBR( 'Q', M, N, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               END IF
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-            ELSE IF( WNTUA ) THEN
+               IRU = NRWORK
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-               IF( WNTVN ) THEN
+*              Multiply real matrix RWORK(IRVT) by P**H in VT,
+*              storing the result in A, copying to VT
+*              (Cworkspace: need 0)
+*              (Rworkspace: need 3*N*N)
 *
-*                 Path 7 (M much larger than N, JOBU='A', JOBVT='N')
-*                 M left singular vectors to be computed in U and
-*                 no right singular vectors to be computed
+               CALL ZLARCM( N, N, RWORK( IRVT ), N, VT, LDVT, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', N, N, A, LDA, VT, LDVT )
 *
-                  IF( LWORK.GE.N*N+MAX( N+M, 3*N ) ) THEN
+*              Multiply Q in U by real matrix RWORK(IRU), storing the
+*              result in A, copying to U
+*              (CWorkspace: need 0)
+*              (Rworkspace: need N*N+2*M*N)
 *
-*                    Sufficient workspace for a fast algorithm
+               NRWORK = IRVT
+               CALL ZLACRM( M, N, U, LDU, RWORK( IRU ), N, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
+            ELSE
 *
-                     IR = 1
-                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
+*              Copy A to VT, generate P**H
+*              (Cworkspace: need 2*N, prefer N+N*NB)
+*              (Rworkspace: 0)
 *
-*                       WORK(IR) is LDA by N
+               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                        LDWRKR = LDA
-                     ELSE
+*              Copy A to U, generate Q
+*              (Cworkspace: need 2*N, prefer N+N*NB)
+*              (Rworkspace: 0)
 *
-*                       WORK(IR) is N by N
+               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                        LDWRKR = N
-                     END IF
-                     ITAU = IR + LDWRKR*N
-                     IWORK = ITAU + N
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                    (RWorkspace: 0)
+               IRU = NRWORK
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+*              Multiply real matrix RWORK(IRVT) by P**H in VT,
+*              storing the result in A, copying to VT
+*              (Cworkspace: need 0)
+*              (Rworkspace: need 3*N*N)
 *
-*                    Copy R to WORK(IR), zeroing out below it
+               CALL ZLARCM( N, N, RWORK( IRVT ), N, VT, LDVT, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', N, N, A, LDA, VT, LDVT )
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ),
-     $                            LDWRKR )
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            WORK( IR+1 ), LDWRKR )
+*              Multiply Q in U by real matrix RWORK(IRU), storing the
+*              result in A, copying to U
+*              (CWorkspace: 0)
+*              (Rworkspace: need 3*N*N)
 *
-*                    Generate Q in U
-*                    (CWorkspace: need N*N+N+M, prefer N*N+N+M*NB)
-*                    (RWorkspace: 0)
+               NRWORK = IRVT
+               CALL ZLACRM( M, N, U, LDU, RWORK( IRU ), N, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
+            END IF
 *
-                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+         ELSE
 *
-*                    Bidiagonalize R in WORK(IR)
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*                    (RWorkspace: need N)
+*           M .LT. MNTHR2
 *
-                     CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+*           Path 6 (M at least N, but not much larger)
+*           Reduce to bidiagonal form without QR decomposition
+*           Use ZUNMBR to compute singular vectors
 *
-*                    Generate left bidiagonalizing vectors in WORK(IR)
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*                    (RWorkspace: 0)
+            IE = 1
+            NRWORK = IE + N
+            ITAUQ = 1
+            ITAUP = ITAUQ + N
+            NWORK = ITAUP + N
 *
-                     CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+*           Bidiagonalize A
+*           (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
+*           (RWorkspace: need N)
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of R in WORK(IR)
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: need BDSPAC)
+            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                   IERR )
+            IF( WNTQN ) THEN
 *
-                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
-     $                            1, WORK( IR ), LDWRKR, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+*              Compute singular values only
+*              (Cworkspace: 0)
+*              (Rworkspace: need BDSPAN)
 *
-*                    Multiply Q in U by left singular vectors of R in
-*                    WORK(IR), storing result in A
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1, DUM, 1,
+     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
+            ELSE IF( WNTQO ) THEN
+               IU = NWORK
+               IRU = NRWORK
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               IF( LWORK.GE.M*N+3*N ) THEN
 *
-                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
-     $                           WORK( IR ), LDWRKR, CZERO, A, LDA )
+*                 WORK( IU ) is M by N
 *
-*                    Copy left singular vectors of A from A to U
+                  LDWRKU = M
+               ELSE
 *
-                     CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
+*                 WORK( IU ) is LDWRKU by N
 *
-                  ELSE
+                  LDWRKU = ( LWORK-3*N ) / N
+               END IF
+               NWORK = IU + LDWRKU*N
 *
-*                    Insufficient workspace for a fast algorithm
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     ITAU = 1
-                     IWORK = ITAU + N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of A
+*              (Cworkspace: need 2*N, prefer N+N*NB)
+*              (Rworkspace: need 0)
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Generate Q in U
-*                    (CWorkspace: need N+M, prefer N+M*NB)
-*                    (RWorkspace: 0)
+               IF( LWORK.GE.M*N+3*N ) THEN
 *
-                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
+*              Overwrite WORK(IU) by left singular vectors of A, copying
+*              to A
+*              (Cworkspace: need M*N+2*N, prefer M*N+N+N*NB)
+*              (Rworkspace: need 0)
 *
-*                    Zero out below R in A
+                  CALL ZLASET( 'F', M, N, CZERO, CZERO, WORK( IU ),
+     $                         LDWRKU )
+                  CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
+     $                         LDWRKU )
+                  CALL ZUNMBR( 'Q', 'L', 'N', M, N, N, A, LDA,
+     $                         WORK( ITAUQ ), WORK( IU ), LDWRKU,
+     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
+                  CALL ZLACPY( 'F', M, N, WORK( IU ), LDWRKU, A, LDA )
+               ELSE
 *
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            A( 2, 1 ), LDA )
+*                 Generate Q in A
+*                 (Cworkspace: need 2*N, prefer N+N*NB)
+*                 (Rworkspace: need 0)
 *
-*                    Bidiagonalize R in A
-*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                    (RWorkspace: need N)
+                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
+     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*                 Multiply Q in A by real matrix RWORK(IRU), storing the
+*                 result in WORK(IU), copying to A
+*                 (CWorkspace: need N*N, prefer M*N)
+*                 (Rworkspace: need 3*N*N, prefer N*N+2*M*N)
 *
-*                    Multiply Q in U by left bidiagonalizing vectors
-*                    in A
-*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                    (RWorkspace: 0)
+                  NRWORK = IRVT
+                  DO 30 I = 1, M, LDWRKU
+                     CHUNK = MIN( M-I+1, LDWRKU )
+                     CALL ZLACRM( CHUNK, N, A( I, 1 ), LDA,
+     $                            RWORK( IRU ), N, WORK( IU ), LDWRKU,
+     $                            RWORK( NRWORK ) )
+                     CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
+     $                            A( I, 1 ), LDA )
+   30             CONTINUE
+               END IF
 *
-                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
-     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+            ELSE IF( WNTQS ) THEN
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
-     $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+               IRU = NRWORK
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                  END IF
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of A
+*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
+*              (RWorkspace: 0)
 *
-               ELSE IF( WNTVO ) THEN
+               CALL ZLASET( 'F', M, N, CZERO, CZERO, U, LDU )
+               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, N, N, A, LDA,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                 Path 8 (M much larger than N, JOBU='A', JOBVT='O')
-*                 M left singular vectors to be computed in U and
-*                 N right singular vectors to be overwritten on A
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of A
+*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
+*              (RWorkspace: 0)
 *
-                  IF( LWORK.GE.2*N*N+MAX( N+M, 3*N ) ) THEN
+               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
+            ELSE
 *
-*                    Sufficient workspace for a fast algorithm
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     IU = 1
-                     IF( LWORK.GE.WRKBL+2*LDA*N ) THEN
+               IRU = NRWORK
+               IRVT = IRU + N*N
+               NRWORK = IRVT + N*N
+               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
+     $                      N, RWORK( IRVT ), N, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                       WORK(IU) is LDA by N and WORK(IR) is LDA by N
+*              Set the right corner of U to identity matrix
 *
-                        LDWRKU = LDA
-                        IR = IU + LDWRKU*N
-                        LDWRKR = LDA
-                     ELSE IF( LWORK.GE.WRKBL+( LDA+N )*N ) THEN
+               CALL ZLASET( 'F', M, M, CZERO, CZERO, U, LDU )
+               IF( M.GT.N ) THEN
+                  CALL ZLASET( 'F', M-N, M-N, CZERO, CONE,
+     $                         U( N+1, N+1 ), LDU )
+               END IF
 *
-*                       WORK(IU) is LDA by N and WORK(IR) is N by N
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of A
+*              (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
+*              (RWorkspace: 0)
 *
-                        LDWRKU = LDA
-                        IR = IU + LDWRKU*N
-                        LDWRKR = N
-                     ELSE
+               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                       WORK(IU) is N by N and WORK(IR) is N by N
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of A
+*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
+*              (RWorkspace: 0)
 *
-                        LDWRKU = N
-                        IR = IU + LDWRKU*N
-                        LDWRKR = N
-                     END IF
-                     ITAU = IR + LDWRKR*N
-                     IWORK = ITAU + N
+               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
+            END IF
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB)
-*                    (RWorkspace: 0)
+         END IF
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+      ELSE
 *
-*                    Generate Q in U
-*                    (CWorkspace: need 2*N*N+N+M, prefer 2*N*N+N+M*NB)
-*                    (RWorkspace: 0)
+*        A has more columns than rows. If A has sufficiently more
+*        columns than rows, first reduce using the LQ decomposition (if
+*        sufficient workspace available)
 *
-                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+         IF( N.GE.MNTHR1 ) THEN
 *
-*                    Copy R to WORK(IU), zeroing out below it
+            IF( WNTQN ) THEN
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            WORK( IU+1 ), LDWRKU )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+*              Path 1t (N much larger than M, JOBZ='N')
+*              No singular vectors to be computed
 *
-*                    Bidiagonalize R in WORK(IU), copying result to
-*                    WORK(IR)
-*                    (CWorkspace: need   2*N*N+3*N,
-*                                 prefer 2*N*N+2*N+2*N*NB)
-*                    (RWorkspace: need   N)
+               ITAU = 1
+               NWORK = ITAU + M
 *
-                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU,
-     $                            WORK( IR ), LDWRKR )
+*              Compute A=L*Q
+*              (CWorkspace: need 2*M, prefer M+M*NB)
+*              (RWorkspace: 0)
 *
-*                    Generate left bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need 2*N*N+3*N, prefer 2*N*N+2*N+N*NB)
-*                    (RWorkspace: 0)
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+*              Zero out above L
 *
-*                    Generate right bidiagonalizing vectors in WORK(IR)
-*                    (CWorkspace: need   2*N*N+3*N-1,
-*                                 prefer 2*N*N+2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, A( 1, 2 ),
+     $                      LDA )
+               IE = 1
+               ITAUQ = 1
+               ITAUP = ITAUQ + M
+               NWORK = ITAUP + M
 *
-                     CALL ZUNGBR( 'P', N, N, N, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+*              Bidiagonalize L in A
+*              (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*              (RWorkspace: need M)
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of R in WORK(IU) and computing
-*                    right singular vectors of R in WORK(IR)
-*                    (CWorkspace: need 2*N*N)
-*                    (RWorkspace: need BDSPAC)
+               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                      IERR )
+               NRWORK = IE + M
 *
-                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
-     $                            WORK( IR ), LDWRKR, WORK( IU ),
-     $                            LDWRKU, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+*              Perform bidiagonal SVD, compute singular values only
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAN)
 *
-*                    Multiply Q in U by left singular vectors of R in
-*                    WORK(IU), storing result in A
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+               CALL DBDSDC( 'U', 'N', M, S, RWORK( IE ), DUM, 1, DUM, 1,
+     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
 *
-                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
-     $                           WORK( IU ), LDWRKU, CZERO, A, LDA )
+            ELSE IF( WNTQO ) THEN
 *
-*                    Copy left singular vectors of A from A to U
+*              Path 2t (N much larger than M, JOBZ='O')
+*              M right singular vectors to be overwritten on A and
+*              M left singular vectors to be computed in U
 *
-                     CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
+               IVT = 1
+               LDWKVT = M
 *
-*                    Copy right singular vectors of R from WORK(IR) to A
+*              WORK(IVT) is M by M
 *
-                     CALL ZLACPY( 'F', N, N, WORK( IR ), LDWRKR, A,
-     $                            LDA )
+               IL = IVT + LDWKVT*M
+               IF( LWORK.GE.M*N+M*M+3*M ) THEN
 *
-                  ELSE
+*                 WORK(IL) M by N
 *
-*                    Insufficient workspace for a fast algorithm
+                  LDWRKL = M
+                  CHUNK = N
+               ELSE
 *
-                     ITAU = 1
-                     IWORK = ITAU + N
+*                 WORK(IL) is M by CHUNK
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+                  LDWRKL = M
+                  CHUNK = ( LWORK-M*M-3*M ) / M
+               END IF
+               ITAU = IL + LDWRKL*CHUNK
+               NWORK = ITAU + M
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+*              Compute A=L*Q
+*              (CWorkspace: need 2*M, prefer M+M*NB)
+*              (RWorkspace: 0)
 *
-*                    Generate Q in U
-*                    (CWorkspace: need N+M, prefer N+M*NB)
-*                    (RWorkspace: 0)
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+*              Copy L to WORK(IL), zeroing about above it
 *
-*                    Zero out below R in A
+               CALL ZLACPY( 'L', M, M, A, LDA, WORK( IL ), LDWRKL )
+               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                      WORK( IL+LDWRKL ), LDWRKL )
 *
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            A( 2, 1 ), LDA )
+*              Generate Q in A
+*              (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*              (RWorkspace: 0)
 *
-*                    Bidiagonalize R in A
-*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                    (RWorkspace: need N)
+               CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+               IE = 1
+               ITAUQ = ITAU
+               ITAUP = ITAUQ + M
+               NWORK = ITAUP + M
 *
-                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*              Bidiagonalize L in WORK(IL)
+*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*              (RWorkspace: need M)
 *
-*                    Multiply Q in U by left bidiagonalizing vectors
-*                    in A
-*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                    (RWorkspace: 0)
+               CALL ZGEBRD( M, M, WORK( IL ), LDWRKL, S, RWORK( IE ),
+     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
-     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-*                    Generate right bidiagonalizing vectors in A
-*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+               IRU = IE + M
+               IRVT = IRU + M*M
+               NRWORK = IRVT + M*M
+               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                     CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
+*              Overwrite WORK(IU) by the left singular vectors of L
+*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U and computing right
-*                    singular vectors of A in A
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), A,
-     $                            LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+*              Copy real matrix RWORK(IRVT) to complex matrix WORK(IVT)
+*              Overwrite WORK(IVT) by the right singular vectors of L
+*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+N*NB)
+*              (RWorkspace: 0)
 *
-                  END IF
+               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
+     $                      LDWKVT )
+               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
+     $                      WORK( ITAUP ), WORK( IVT ), LDWKVT,
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               ELSE IF( WNTVAS ) THEN
+*              Multiply right singular vectors of L in WORK(IL) by Q
+*              in A, storing result in WORK(IL) and copying to A
+*              (CWorkspace: need 2*M*M, prefer M*M+M*N))
+*              (RWorkspace: 0)
 *
-*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S'
-*                         or 'A')
-*                 M left singular vectors to be computed in U and
-*                 N right singular vectors to be computed in VT
+               DO 40 I = 1, N, CHUNK
+                  BLK = MIN( N-I+1, CHUNK )
+                  CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IVT ), M,
+     $                        A( 1, I ), LDA, CZERO, WORK( IL ),
+     $                        LDWRKL )
+                  CALL ZLACPY( 'F', M, BLK, WORK( IL ), LDWRKL,
+     $                         A( 1, I ), LDA )
+   40          CONTINUE
 *
-                  IF( LWORK.GE.N*N+MAX( N+M, 3*N ) ) THEN
+            ELSE IF( WNTQS ) THEN
 *
-*                    Sufficient workspace for a fast algorithm
+*             Path 3t (N much larger than M, JOBZ='S')
+*             M right singular vectors to be computed in VT and
+*             M left singular vectors to be computed in U
 *
-                     IU = 1
-                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
+               IL = 1
 *
-*                       WORK(IU) is LDA by N
+*              WORK(IL) is M by M
 *
-                        LDWRKU = LDA
-                     ELSE
+               LDWRKL = M
+               ITAU = IL + LDWRKL*M
+               NWORK = ITAU + M
 *
-*                       WORK(IU) is N by N
+*              Compute A=L*Q
+*              (CWorkspace: need 2*M, prefer M+M*NB)
+*              (RWorkspace: 0)
 *
-                        LDWRKU = N
-                     END IF
-                     ITAU = IU + LDWRKU*N
-                     IWORK = ITAU + N
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*                    (RWorkspace: 0)
+*              Copy L to WORK(IL), zeroing out above it
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               CALL ZLACPY( 'L', M, M, A, LDA, WORK( IL ), LDWRKL )
+               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                      WORK( IL+LDWRKL ), LDWRKL )
 *
-*                    Generate Q in U
-*                    (CWorkspace: need N*N+N+M, prefer N*N+N+M*NB)
-*                    (RWorkspace: 0)
+*              Generate Q in A
+*              (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+               CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+               IE = 1
+               ITAUQ = ITAU
+               ITAUP = ITAUQ + M
+               NWORK = ITAUP + M
 *
-*                    Copy R to WORK(IU), zeroing out below it
+*              Bidiagonalize L in WORK(IL)
+*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*              (RWorkspace: need M)
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                            WORK( IU+1 ), LDWRKU )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+               CALL ZGEBRD( M, M, WORK( IL ), LDWRKL, S, RWORK( IE ),
+     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Bidiagonalize R in WORK(IU), copying result to VT
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*                    (RWorkspace: need N)
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU, VT,
-     $                            LDVT )
+               IRU = IE + M
+               IRVT = IRU + M*M
+               NRWORK = IRVT + M*M
+               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                    Generate left bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*                    (RWorkspace: 0)
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of L
+*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Generate right bidiagonalizing vectors in VT
-*                    (CWorkspace: need   N*N+3*N-1,
-*                                 prefer N*N+2*N+(N-1)*NB)
-*                    (RWorkspace: need   0)
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by left singular vectors of L
+*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of R in WORK(IU) and computing
-*                    right singular vectors of R in VT
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: need BDSPAC)
+*              Copy VT to WORK(IL), multiply right singular vectors of L
+*              in WORK(IL) by Q in A, storing result in VT
+*              (CWorkspace: need M*M)
+*              (RWorkspace: 0)
 *
-                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
-     $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+               CALL ZLACPY( 'F', M, M, VT, LDVT, WORK( IL ), LDWRKL )
+               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IL ), LDWRKL,
+     $                     A, LDA, CZERO, VT, LDVT )
 *
-*                    Multiply Q in U by left singular vectors of R in
-*                    WORK(IU), storing result in A
-*                    (CWorkspace: need N*N)
-*                    (RWorkspace: 0)
+            ELSE IF( WNTQA ) THEN
 *
-                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
-     $                           WORK( IU ), LDWRKU, CZERO, A, LDA )
+*              Path 9t (N much larger than M, JOBZ='A')
+*              N right singular vectors to be computed in VT and
+*              M left singular vectors to be computed in U
 *
-*                    Copy left singular vectors of A from A to U
+               IVT = 1
 *
-                     CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
+*              WORK(IVT) is M by M
 *
-                  ELSE
+               LDWKVT = M
+               ITAU = IVT + LDWKVT*M
+               NWORK = ITAU + M
 *
-*                    Insufficient workspace for a fast algorithm
+*              Compute A=L*Q, copying result to VT
+*              (CWorkspace: need 2*M, prefer M+M*NB)
+*              (RWorkspace: 0)
 *
-                     ITAU = 1
-                     IWORK = ITAU + N
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
+               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*                    Compute A=Q*R, copying result to U
-*                    (CWorkspace: need 2*N, prefer N+N*NB)
-*                    (RWorkspace: 0)
+*              Generate Q in VT
+*              (CWorkspace: need M+N, prefer M+N*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-*                    Generate Q in U
-*                    (CWorkspace: need N+M, prefer N+M*NB)
-*                    (RWorkspace: 0)
+*              Produce L in A, zeroing out above it
 *
-                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, A( 1, 2 ),
+     $                      LDA )
+               IE = 1
+               ITAUQ = ITAU
+               ITAUP = ITAUQ + M
+               NWORK = ITAUP + M
 *
-*                    Copy R from A to VT, zeroing out below it
+*              Bidiagonalize L in A
+*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*              (RWorkspace: need M)
 *
-                     CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-                     IF( N.GT.1 )
-     $                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
-     $                               VT( 2, 1 ), LDVT )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + N
-                     IWORK = ITAUP + N
+               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                      IERR )
 *
-*                    Bidiagonalize R in VT
-*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*                    (RWorkspace: need N)
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+               IRU = IE + M
+               IRVT = IRU + M*M
+               NRWORK = IRVT + M*M
+               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                    Multiply Q in U by left bidiagonalizing vectors
-*                    in VT
-*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*                    (RWorkspace: 0)
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of L
+*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, VT, LDVT,
-     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, A, LDA,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    Generate right bidiagonalizing vectors in VT
-*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*                    (RWorkspace: 0)
+*              Copy real matrix RWORK(IRVT) to complex matrix WORK(IVT)
+*              Overwrite WORK(IVT) by right singular vectors of L
+*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*              (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + N
+               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
+     $                      LDWKVT )
+               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, A, LDA,
+     $                      WORK( ITAUP ), WORK( IVT ), LDWKVT,
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U and computing right
-*                    singular vectors of A in VT
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+*              Multiply right singular vectors of L in WORK(IVT) by
+*              Q in VT, storing result in A
+*              (CWorkspace: need M*M)
+*              (RWorkspace: 0)
 *
-                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
-     $                            LDVT, U, LDU, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IVT ), LDWKVT,
+     $                     VT, LDVT, CZERO, A, LDA )
 *
-                  END IF
+*              Copy right singular vectors of A from A to VT
 *
-               END IF
+               CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
 *
             END IF
 *
-         ELSE
+         ELSE IF( N.GE.MNTHR2 ) THEN
 *
-*           M .LT. MNTHR
+*           MNTHR2 <= N < MNTHR1
+*
+*           Path 5t (N much larger than M, but not as much as MNTHR1)
+*           Reduce to bidiagonal form without QR decomposition, use
+*           ZUNGBR and matrix multiplication to compute singular vectors
 *
-*           Path 10 (M at least N, but not much larger)
-*           Reduce to bidiagonal form without QR decomposition
 *
             IE = 1
+            NRWORK = IE + M
             ITAUQ = 1
-            ITAUP = ITAUQ + N
-            IWORK = ITAUP + N
+            ITAUP = ITAUQ + M
+            NWORK = ITAUP + M
 *
 *           Bidiagonalize A
-*           (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
-*           (RWorkspace: need N)
+*           (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
+*           (RWorkspace: M)
 *
             CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                   WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
+     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
      $                   IERR )
-            IF( WNTUAS ) THEN
 *
-*              If left singular vectors desired in U, copy result to U
-*              and generate left bidiagonalizing vectors in U
-*              (CWorkspace: need 2*N+NCU, prefer 2*N+NCU*NB)
-*              (RWorkspace: 0)
+            IF( WNTQN ) THEN
 *
-               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
-               IF( WNTUS )
-     $            NCU = N
-               IF( WNTUA )
-     $            NCU = M
-               CALL ZUNGBR( 'Q', M, NCU, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IF( WNTVAS ) THEN
+*              Compute singular values only
+*              (Cworkspace: 0)
+*              (Rworkspace: need BDSPAN)
 *
-*              If right singular vectors desired in VT, copy result to
-*              VT and generate right bidiagonalizing vectors in VT
-*              (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*              (RWorkspace: 0)
+               CALL DBDSDC( 'L', 'N', M, S, RWORK( IE ), DUM, 1, DUM, 1,
+     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
+            ELSE IF( WNTQO ) THEN
+               IRVT = NRWORK
+               IRU = IRVT + M*M
+               NRWORK = IRU + M*M
+               IVT = NWORK
 *
-               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IF( WNTUO ) THEN
+*              Copy A to U, generate Q
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: 0)
 *
-*              If left singular vectors desired in A, generate left
-*              bidiagonalizing vectors in A
-*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
-*              (RWorkspace: 0)
+               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IF( WNTVO ) THEN
+*              Generate P**H in A
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: 0)
 *
-*              If right singular vectors desired in A, generate right
-*              bidiagonalizing vectors in A
-*              (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
-*              (RWorkspace: 0)
+               CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IRWORK = IE + N
-            IF( WNTUAS .OR. WNTUO )
-     $         NRU = M
-            IF( WNTUN )
-     $         NRU = 0
-            IF( WNTVAS .OR. WNTVO )
-     $         NCVT = N
-            IF( WNTVN )
-     $         NCVT = 0
-            IF( ( .NOT.WNTUO ) .AND. ( .NOT.WNTVO ) ) THEN
+               LDWKVT = M
+               IF( LWORK.GE.M*N+3*M ) THEN
 *
-*              Perform bidiagonal QR iteration, if desired, computing
-*              left singular vectors in U and computing right singular
-*              vectors in VT
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+*                 WORK( IVT ) is M by N
 *
-               CALL ZBDSQR( 'U', N, NCVT, NRU, 0, S, RWORK( IE ), VT,
-     $                      LDVT, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                      INFO )
-            ELSE IF( ( .NOT.WNTUO ) .AND. WNTVO ) THEN
+                  NWORK = IVT + LDWKVT*N
+                  CHUNK = N
+               ELSE
 *
-*              Perform bidiagonal QR iteration, if desired, computing
-*              left singular vectors in U and computing right singular
-*              vectors in A
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+*                 WORK( IVT ) is M by CHUNK
 *
-               CALL ZBDSQR( 'U', N, NCVT, NRU, 0, S, RWORK( IE ), A,
-     $                      LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                      INFO )
-            ELSE
+                  CHUNK = ( LWORK-3*M ) / M
+                  NWORK = IVT + LDWKVT*CHUNK
+               END IF
 *
-*              Perform bidiagonal QR iteration, if desired, computing
-*              left singular vectors in A and computing right singular
-*              vectors in VT
-*              (CWorkspace: 0)
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
 *              (RWorkspace: need BDSPAC)
 *
-               CALL ZBDSQR( 'U', N, NCVT, NRU, 0, S, RWORK( IE ), VT,
-     $                      LDVT, A, LDA, CDUM, 1, RWORK( IRWORK ),
-     $                      INFO )
-            END IF
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-         END IF
+*              Multiply Q in U by real matrix RWORK(IRVT)
+*              storing the result in WORK(IVT), copying to U
+*              (Cworkspace: need 0)
+*              (Rworkspace: need 2*M*M)
 *
-      ELSE
+               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, WORK( IVT ),
+     $                      LDWKVT, RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, M, WORK( IVT ), LDWKVT, U, LDU )
 *
-*        A has more columns than rows. If A has sufficiently more
-*        columns than rows, first reduce using the LQ decomposition (if
-*        sufficient workspace available)
+*              Multiply RWORK(IRVT) by P**H in A, storing the
+*              result in WORK(IVT), copying to A
+*              (CWorkspace: need M*M, prefer M*N)
+*              (Rworkspace: need 2*M*M, prefer 2*M*N)
 *
-         IF( N.GE.MNTHR ) THEN
+               NRWORK = IRU
+               DO 50 I = 1, N, CHUNK
+                  BLK = MIN( N-I+1, CHUNK )
+                  CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ), LDA,
+     $                         WORK( IVT ), LDWKVT, RWORK( NRWORK ) )
+                  CALL ZLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
+     $                         A( 1, I ), LDA )
+   50          CONTINUE
+            ELSE IF( WNTQS ) THEN
 *
-            IF( WNTVN ) THEN
+*              Copy A to U, generate Q
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: 0)
 *
-*              Path 1t(N much larger than M, JOBVT='N')
-*              No right singular vectors to be computed
+               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               ITAU = 1
-               IWORK = ITAU + M
+*              Copy A to VT, generate P**H
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: 0)
 *
-*              Compute A=L*Q
-*              (CWorkspace: need 2*M, prefer M+M*NB)
-*              (RWorkspace: 0)
+               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+               CALL ZUNGBR( 'P', M, N, M, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
-     $                      LWORK-IWORK+1, IERR )
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-*              Zero out above L
+               IRVT = NRWORK
+               IRU = IRVT + M*M
+               NRWORK = IRU + M*M
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, A( 1, 2 ),
-     $                      LDA )
-               IE = 1
-               ITAUQ = 1
-               ITAUP = ITAUQ + M
-               IWORK = ITAUP + M
+*              Multiply Q in U by real matrix RWORK(IRU), storing the
+*              result in A, copying to U
+*              (CWorkspace: need 0)
+*              (Rworkspace: need 3*M*M)
 *
-*              Bidiagonalize L in A
-*              (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*              (RWorkspace: need M)
+               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, M, A, LDA, U, LDU )
 *
-               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
-     $                      IERR )
-               IF( WNTUO .OR. WNTUAS ) THEN
+*              Multiply real matrix RWORK(IRVT) by P**H in VT,
+*              storing the result in A, copying to VT
+*              (Cworkspace: need 0)
+*              (Rworkspace: need M*M+2*M*N)
 *
-*                 If left singular vectors desired, generate Q
-*                 (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*                 (RWorkspace: 0)
+               NRWORK = IRU
+               CALL ZLARCM( M, N, RWORK( IRVT ), M, VT, LDVT, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+            ELSE
 *
-                  CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-               END IF
-               IRWORK = IE + M
-               NRU = 0
-               IF( WNTUO .OR. WNTUAS )
-     $            NRU = M
+*              Copy A to U, generate Q
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: 0)
 *
-*              Perform bidiagonal QR iteration, computing left singular
-*              vectors of A in A if desired
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               CALL ZBDSQR( 'U', M, 0, NRU, 0, S, RWORK( IE ), CDUM, 1,
-     $                      A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
+*              Copy A to VT, generate P**H
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: 0)
 *
-*              If left singular vectors desired in U, copy them there
+               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+               CALL ZUNGBR( 'P', N, N, M, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-               IF( WNTUAS )
-     $            CALL ZLACPY( 'F', M, M, A, LDA, U, LDU )
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-            ELSE IF( WNTVO .AND. WNTUN ) THEN
+               IRVT = NRWORK
+               IRU = IRVT + M*M
+               NRWORK = IRU + M*M
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*              Path 2t(N much larger than M, JOBU='N', JOBVT='O')
-*              M right singular vectors to be overwritten on A and
-*              no left singular vectors to be computed
+*              Multiply Q in U by real matrix RWORK(IRU), storing the
+*              result in A, copying to U
+*              (CWorkspace: need 0)
+*              (Rworkspace: need 3*M*M)
 *
-               IF( LWORK.GE.M*M+3*M ) THEN
+               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, M, A, LDA, U, LDU )
 *
-*                 Sufficient workspace for a fast algorithm
+*              Multiply real matrix RWORK(IRVT) by P**H in VT,
+*              storing the result in A, copying to VT
+*              (Cworkspace: need 0)
+*              (Rworkspace: need M*M+2*M*N)
 *
-                  IR = 1
-                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*M ) THEN
+               CALL ZLARCM( M, N, RWORK( IRVT ), M, VT, LDVT, A, LDA,
+     $                      RWORK( NRWORK ) )
+               CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+            END IF
 *
-*                    WORK(IU) is LDA by N and WORK(IR) is LDA by M
+         ELSE
 *
-                     LDWRKU = LDA
-                     CHUNK = N
-                     LDWRKR = LDA
-                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+M*M ) THEN
+*           N .LT. MNTHR2
 *
-*                    WORK(IU) is LDA by N and WORK(IR) is M by M
+*           Path 6t (N greater than M, but not much larger)
+*           Reduce to bidiagonal form without LQ decomposition
+*           Use ZUNMBR to compute singular vectors
 *
-                     LDWRKU = LDA
-                     CHUNK = N
-                     LDWRKR = M
-                  ELSE
+            IE = 1
+            NRWORK = IE + M
+            ITAUQ = 1
+            ITAUP = ITAUQ + M
+            NWORK = ITAUP + M
 *
-*                    WORK(IU) is M by CHUNK and WORK(IR) is M by M
+*           Bidiagonalize A
+*           (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
+*           (RWorkspace: M)
 *
-                     LDWRKU = M
-                     CHUNK = ( LWORK-M*M ) / M
-                     LDWRKR = M
-                  END IF
-                  ITAU = IR + LDWRKR*M
-                  IWORK = ITAU + M
+            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
+     $                   IERR )
+            IF( WNTQN ) THEN
 *
-*                 Compute A=L*Q
-*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                 (RWorkspace: 0)
+*              Compute singular values only
+*              (Cworkspace: 0)
+*              (Rworkspace: need BDSPAN)
 *
-                  CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+               CALL DBDSDC( 'L', 'N', M, S, RWORK( IE ), DUM, 1, DUM, 1,
+     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
+            ELSE IF( WNTQO ) THEN
+               LDWKVT = M
+               IVT = NWORK
+               IF( LWORK.GE.M*N+3*M ) THEN
 *
-*                 Copy L to WORK(IR) and zero out above it
+*                 WORK( IVT ) is M by N
 *
-                  CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ), LDWRKR )
-                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                         WORK( IR+LDWRKR ), LDWRKR )
+                  CALL ZLASET( 'F', M, N, CZERO, CZERO, WORK( IVT ),
+     $                         LDWKVT )
+                  NWORK = IVT + LDWKVT*N
+               ELSE
 *
-*                 Generate Q in A
-*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                 (RWorkspace: 0)
+*                 WORK( IVT ) is M by CHUNK
 *
-                  CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IE = 1
-                  ITAUQ = ITAU
-                  ITAUP = ITAUQ + M
-                  IWORK = ITAUP + M
+                  CHUNK = ( LWORK-3*M ) / M
+                  NWORK = IVT + LDWKVT*CHUNK
+               END IF
 *
-*                 Bidiagonalize L in WORK(IR)
-*                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*                 (RWorkspace: need M)
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                  CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+               IRVT = NRWORK
+               IRU = IRVT + M*M
+               NRWORK = IRU + M*M
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                 Generate right vectors bidiagonalizing L
-*                 (CWorkspace: need M*M+3*M-1, prefer M*M+2*M+(M-1)*NB)
-*                 (RWorkspace: 0)
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of A
+*              (Cworkspace: need 2*M, prefer M+M*NB)
+*              (Rworkspace: need 0)
 *
-                  CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
-     $                         WORK( ITAUP ), WORK( IWORK ),
-     $                         LWORK-IWORK+1, IERR )
-                  IRWORK = IE + M
+               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                 Perform bidiagonal QR iteration, computing right
-*                 singular vectors of L in WORK(IR)
-*                 (CWorkspace: need M*M)
-*                 (RWorkspace: need BDSPAC)
+               IF( LWORK.GE.M*N+3*M ) THEN
 *
-                  CALL ZBDSQR( 'U', M, M, 0, 0, S, RWORK( IE ),
-     $                         WORK( IR ), LDWRKR, CDUM, 1, CDUM, 1,
-     $                         RWORK( IRWORK ), INFO )
-                  IU = ITAUQ
-*
-*                 Multiply right singular vectors of L in WORK(IR) by Q
-*                 in A, storing result in WORK(IU) and copying to A
-*                 (CWorkspace: need M*M+M, prefer M*M+M*N)
-*                 (RWorkspace: 0)
-*
-                  DO 30 I = 1, N, CHUNK
-                     BLK = MIN( N-I+1, CHUNK )
-                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
-     $                           LDWRKR, A( 1, I ), LDA, CZERO,
-     $                           WORK( IU ), LDWRKU )
-                     CALL ZLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
-     $                            A( 1, I ), LDA )
-   30             CONTINUE
+*              Copy real matrix RWORK(IRVT) to complex matrix WORK(IVT)
+*              Overwrite WORK(IVT) by right singular vectors of A,
+*              copying to A
+*              (Cworkspace: need M*N+2*M, prefer M*N+M+M*NB)
+*              (Rworkspace: need 0)
 *
+                  CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
+     $                         LDWKVT )
+                  CALL ZUNMBR( 'P', 'R', 'C', M, N, M, A, LDA,
+     $                         WORK( ITAUP ), WORK( IVT ), LDWKVT,
+     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
+                  CALL ZLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A, LDA )
                ELSE
 *
-*                 Insufficient workspace for a fast algorithm
-*
-                  IE = 1
-                  ITAUQ = 1
-                  ITAUP = ITAUQ + M
-                  IWORK = ITAUP + M
-*
-*                 Bidiagonalize A
-*                 (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
-*                 (RWorkspace: need M)
-*
-                  CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-*
-*                 Generate right vectors bidiagonalizing A
-*                 (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*                 (RWorkspace: 0)
+*                 Generate P**H in A
+*                 (Cworkspace: need 2*M, prefer M+M*NB)
+*                 (Rworkspace: need 0)
 *
                   CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IRWORK = IE + M
-*
-*                 Perform bidiagonal QR iteration, computing right
-*                 singular vectors of A in A
-*                 (CWorkspace: 0)
-*                 (RWorkspace: need BDSPAC)
+     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
 *
-                  CALL ZBDSQR( 'L', M, N, 0, 0, S, RWORK( IE ), A, LDA,
-     $                         CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
+*                 Multiply Q in A by real matrix RWORK(IRU), storing the
+*                 result in WORK(IU), copying to A
+*                 (CWorkspace: need M*M, prefer M*N)
+*                 (Rworkspace: need 3*M*M, prefer M*M+2*M*N)
 *
+                  NRWORK = IRU
+                  DO 60 I = 1, N, CHUNK
+                     BLK = MIN( N-I+1, CHUNK )
+                     CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ),
+     $                            LDA, WORK( IVT ), LDWKVT,
+     $                            RWORK( NRWORK ) )
+                     CALL ZLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
+     $                            A( 1, I ), LDA )
+   60             CONTINUE
                END IF
+            ELSE IF( WNTQS ) THEN
 *
-            ELSE IF( WNTVO .AND. WNTUAS ) THEN
-*
-*              Path 3t(N much larger than M, JOBU='S' or 'A', JOBVT='O')
-*              M right singular vectors to be overwritten on A and
-*              M left singular vectors to be computed in U
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-               IF( LWORK.GE.M*M+3*M ) THEN
+               IRVT = NRWORK
+               IRU = IRVT + M*M
+               NRWORK = IRU + M*M
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-*                 Sufficient workspace for a fast algorithm
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of A
+*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*              (RWorkspace: M*M)
 *
-                  IR = 1
-                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*M ) THEN
+               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-*                    WORK(IU) is LDA by N and WORK(IR) is LDA by M
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of A
+*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*              (RWorkspace: M*M)
 *
-                     LDWRKU = LDA
-                     CHUNK = N
-                     LDWRKR = LDA
-                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+M*M ) THEN
+               CALL ZLASET( 'F', M, N, CZERO, CZERO, VT, LDVT )
+               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', M, N, M, A, LDA,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
+            ELSE
 *
-*                    WORK(IU) is LDA by N and WORK(IR) is M by M
+*              Perform bidiagonal SVD, computing left singular vectors
+*              of bidiagonal matrix in RWORK(IRU) and computing right
+*              singular vectors of bidiagonal matrix in RWORK(IRVT)
+*              (CWorkspace: need 0)
+*              (RWorkspace: need BDSPAC)
 *
-                     LDWRKU = LDA
-                     CHUNK = N
-                     LDWRKR = M
-                  ELSE
+               IRVT = NRWORK
+               IRU = IRVT + M*M
+               NRWORK = IRU + M*M
 *
-*                    WORK(IU) is M by CHUNK and WORK(IR) is M by M
+               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
+     $                      M, RWORK( IRVT ), M, DUM, IDUM,
+     $                      RWORK( NRWORK ), IWORK, INFO )
 *
-                     LDWRKU = M
-                     CHUNK = ( LWORK-M*M ) / M
-                     LDWRKR = M
-                  END IF
-                  ITAU = IR + LDWRKR*M
-                  IWORK = ITAU + M
+*              Copy real matrix RWORK(IRU) to complex matrix U
+*              Overwrite U by left singular vectors of A
+*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*              (RWorkspace: M*M)
 *
-*                 Compute A=L*Q
-*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                 (RWorkspace: 0)
+               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
+               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
+     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
 *
-                  CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*              Set all of VT to identity matrix
 *
-*                 Copy L to U, zeroing about above it
+               CALL ZLASET( 'F', N, N, CZERO, CONE, VT, LDVT )
 *
-                  CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
-     $                         LDU )
+*              Copy real matrix RWORK(IRVT) to complex matrix VT
+*              Overwrite VT by right singular vectors of A
+*              (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*              (RWorkspace: M*M)
 *
-*                 Generate Q in A
-*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                 (RWorkspace: 0)
+               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
+               CALL ZUNMBR( 'P', 'R', 'C', N, N, M, A, LDA,
+     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
+     $                      LWORK-NWORK+1, IERR )
+            END IF
 *
-                  CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IE = 1
-                  ITAUQ = ITAU
-                  ITAUP = ITAUQ + M
-                  IWORK = ITAUP + M
+         END IF
 *
-*                 Bidiagonalize L in U, copying result to WORK(IR)
-*                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*                 (RWorkspace: need M)
+      END IF
 *
-                  CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  CALL ZLACPY( 'U', M, M, U, LDU, WORK( IR ), LDWRKR )
+*     Undo scaling if necessary
 *
-*                 Generate right vectors bidiagonalizing L in WORK(IR)
-*                 (CWorkspace: need M*M+3*M-1, prefer M*M+2*M+(M-1)*NB)
-*                 (RWorkspace: 0)
+      IF( ISCL.EQ.1 ) THEN
+         IF( ANRM.GT.BIGNUM )
+     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
+     $                   IERR )
+         IF( INFO.NE.0 .AND. ANRM.GT.BIGNUM )
+     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1,
+     $                   RWORK( IE ), MINMN, IERR )
+         IF( ANRM.LT.SMLNUM )
+     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
+     $                   IERR )
+         IF( INFO.NE.0 .AND. ANRM.LT.SMLNUM )
+     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1,
+     $                   RWORK( IE ), MINMN, IERR )
+      END IF
 *
-                  CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
-     $                         WORK( ITAUP ), WORK( IWORK ),
-     $                         LWORK-IWORK+1, IERR )
+*     Return optimal workspace in WORK(1)
 *
-*                 Generate left vectors bidiagonalizing L in U
-*                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
-*                 (RWorkspace: 0)
+      WORK( 1 ) = MAXWRK
 *
-                  CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IRWORK = IE + M
+      RETURN
 *
-*                 Perform bidiagonal QR iteration, computing left
-*                 singular vectors of L in U, and computing right
-*                 singular vectors of L in WORK(IR)
-*                 (CWorkspace: need M*M)
-*                 (RWorkspace: need BDSPAC)
+*     End of ZGESDD
 *
-                  CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
-     $                         WORK( IR ), LDWRKR, U, LDU, CDUM, 1,
-     $                         RWORK( IRWORK ), INFO )
-                  IU = ITAUQ
+      END
+*> \brief <b> ZGESV computes the solution to system of linear equations A * X = B for GE matrices</b> (simple driver)
 *
-*                 Multiply right singular vectors of L in WORK(IR) by Q
-*                 in A, storing result in WORK(IU) and copying to A
-*                 (CWorkspace: need M*M+M, prefer M*M+M*N))
-*                 (RWorkspace: 0)
+*  =========== DOCUMENTATION ===========
 *
-                  DO 40 I = 1, N, CHUNK
-                     BLK = MIN( N-I+1, CHUNK )
-                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
-     $                           LDWRKR, A( 1, I ), LDA, CZERO,
-     $                           WORK( IU ), LDWRKU )
-                     CALL ZLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
-     $                            A( 1, I ), LDA )
-   40             CONTINUE
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               ELSE
+*> \htmlonly
+*> Download ZGESV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesv.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesv.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesv.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*                 Insufficient workspace for a fast algorithm
+*  Definition:
+*  ===========
 *
-                  ITAU = 1
-                  IWORK = ITAU + M
+*       SUBROUTINE ZGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, LDA, LDB, N, NRHS
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * )
+*       ..
+*  
 *
-*                 Compute A=L*Q
-*                 (CWorkspace: need 2*M, prefer M+M*NB)
-*                 (RWorkspace: 0)
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGESV computes the solution to a complex system of linear equations
+*>    A * X = B,
+*> where A is an N-by-N matrix and X and B are N-by-NRHS matrices.
+*>
+*> The LU decomposition with partial pivoting and row interchanges is
+*> used to factor A as
+*>    A = P * L * U,
+*> where P is a permutation matrix, L is unit lower triangular, and U is
+*> upper triangular.  The factored form of A is then used to solve the
+*> system of equations A * X = B.
+*> \endverbatim
 *
-                  CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*  Arguments:
+*  ==========
 *
-*                 Copy L to U, zeroing out above it
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of linear equations, i.e., the order of the
+*>          matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of columns
+*>          of the matrix B.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the N-by-N coefficient matrix A.
+*>          On exit, the factors L and U from the factorization
+*>          A = P*L*U; the unit diagonal elements of L are not stored.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N)
+*>          The pivot indices that define the permutation matrix P;
+*>          row i of the matrix was interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the N-by-NRHS matrix of right hand side matrix B.
+*>          On exit, if INFO = 0, the N-by-NRHS solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, U(i,i) is exactly zero.  The factorization
+*>                has been completed, but the factor U is exactly
+*>                singular, so the solution could not be computed.
+*> \endverbatim
 *
-                  CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
-     $                         LDU )
+*  Authors:
+*  ========
 *
-*                 Generate Q in A
-*                 (CWorkspace: need 2*M, prefer M+M*NB)
-*                 (RWorkspace: 0)
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-                  CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IE = 1
-                  ITAUQ = ITAU
-                  ITAUP = ITAUQ + M
-                  IWORK = ITAUP + M
+*> \date November 2011
 *
-*                 Bidiagonalize L in U
-*                 (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                 (RWorkspace: need M)
+*> \ingroup complex16GEsolve
 *
-                  CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
-     $                         WORK( ITAUQ ), WORK( ITAUP ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*  =====================================================================
+      SUBROUTINE ZGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
-*                 Multiply right vectors bidiagonalizing L by Q in A
-*                 (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
-*                 (RWorkspace: 0)
+*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-                  CALL ZUNMBR( 'P', 'L', 'C', M, N, M, U, LDU,
-     $                         WORK( ITAUP ), A, LDA, WORK( IWORK ),
-     $                         LWORK-IWORK+1, IERR )
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDA, LDB, N, NRHS
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * )
+*     ..
 *
-*                 Generate left vectors bidiagonalizing L in U
-*                 (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*                 (RWorkspace: 0)
+*  =====================================================================
 *
-                  CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
-     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
-                  IRWORK = IE + M
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZGETRF, ZGETRS
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     ..
+*     .. Executable Statements ..
 *
-*                 Perform bidiagonal QR iteration, computing left
-*                 singular vectors of A in U and computing right
-*                 singular vectors of A in A
-*                 (CWorkspace: 0)
-*                 (RWorkspace: need BDSPAC)
+*     Test the input parameters.
 *
-                  CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), A, LDA,
-     $                         U, LDU, CDUM, 1, RWORK( IRWORK ), INFO )
+      INFO = 0
+      IF( N.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGESV ', -INFO )
+         RETURN
+      END IF
 *
-               END IF
+*     Compute the LU factorization of A.
 *
-            ELSE IF( WNTVS ) THEN
+      CALL ZGETRF( N, N, A, LDA, IPIV, INFO )
+      IF( INFO.EQ.0 ) THEN
 *
-               IF( WNTUN ) THEN
+*        Solve the system A*X = B, overwriting B with X.
 *
-*                 Path 4t(N much larger than M, JOBU='N', JOBVT='S')
-*                 M right singular vectors to be computed in VT and
-*                 no left singular vectors to be computed
+         CALL ZGETRS( 'No transpose', N, NRHS, A, LDA, IPIV, B, LDB,
+     $                INFO )
+      END IF
+      RETURN
 *
-                  IF( LWORK.GE.M*M+3*M ) THEN
+*     End of ZGESV
 *
-*                    Sufficient workspace for a fast algorithm
+      END
+*> \brief <b> ZGESVD computes the singular value decomposition (SVD) for GE matrices</b>
 *
-                     IR = 1
-                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
+*  =========== DOCUMENTATION ===========
 *
-*                       WORK(IR) is LDA by M
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-                        LDWRKR = LDA
-                     ELSE
+*> \htmlonly
+*> Download ZGESVD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesvd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*                       WORK(IR) is M by M
+*  Definition:
+*  ===========
 *
-                        LDWRKR = M
-                     END IF
-                     ITAU = IR + LDWRKR*M
-                     IWORK = ITAU + M
+*       SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, VT, LDVT,
+*                          WORK, LWORK, RWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBU, JOBVT
+*       INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   RWORK( * ), S( * )
+*       COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
+*      $                   WORK( * )
+*       ..
+*  
 *
-*                    Compute A=L*Q
-*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                    (RWorkspace: 0)
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZGESVD computes the singular value decomposition (SVD) of a complex
+*> M-by-N matrix A, optionally computing the left and/or right singular
+*> vectors. The SVD is written
+*>
+*>      A = U * SIGMA * conjugate-transpose(V)
+*>
+*> where SIGMA is an M-by-N matrix which is zero except for its
+*> min(m,n) diagonal elements, U is an M-by-M unitary matrix, and
+*> V is an N-by-N unitary matrix.  The diagonal elements of SIGMA
+*> are the singular values of A; they are real and non-negative, and
+*> are returned in descending order.  The first min(m,n) columns of
+*> U and V are the left and right singular vectors of A.
+*>
+*> Note that the routine returns V**H, not V.
+*> \endverbatim
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*  Arguments:
+*  ==========
 *
-*                    Copy L to WORK(IR), zeroing out above it
-*
-                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ),
-     $                            LDWRKR )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            WORK( IR+LDWRKR ), LDWRKR )
+*> \param[in] JOBU
+*> \verbatim
+*>          JOBU is CHARACTER*1
+*>          Specifies options for computing all or part of the matrix U:
+*>          = 'A':  all M columns of U are returned in array U:
+*>          = 'S':  the first min(m,n) columns of U (the left singular
+*>                  vectors) are returned in the array U;
+*>          = 'O':  the first min(m,n) columns of U (the left singular
+*>                  vectors) are overwritten on the array A;
+*>          = 'N':  no columns of U (no left singular vectors) are
+*>                  computed.
+*> \endverbatim
+*>
+*> \param[in] JOBVT
+*> \verbatim
+*>          JOBVT is CHARACTER*1
+*>          Specifies options for computing all or part of the matrix
+*>          V**H:
+*>          = 'A':  all N rows of V**H are returned in the array VT;
+*>          = 'S':  the first min(m,n) rows of V**H (the right singular
+*>                  vectors) are returned in the array VT;
+*>          = 'O':  the first min(m,n) rows of V**H (the right singular
+*>                  vectors) are overwritten on the array A;
+*>          = 'N':  no rows of V**H (no right singular vectors) are
+*>                  computed.
+*>
+*>          JOBVT and JOBU cannot both be 'O'.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the input matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the input matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit,
+*>          if JOBU = 'O',  A is overwritten with the first min(m,n)
+*>                          columns of U (the left singular vectors,
+*>                          stored columnwise);
+*>          if JOBVT = 'O', A is overwritten with the first min(m,n)
+*>                          rows of V**H (the right singular vectors,
+*>                          stored rowwise);
+*>          if JOBU .ne. 'O' and JOBVT .ne. 'O', the contents of A
+*>                          are destroyed.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension (min(M,N))
+*>          The singular values of A, sorted so that S(i) >= S(i+1).
+*> \endverbatim
+*>
+*> \param[out] U
+*> \verbatim
+*>          U is COMPLEX*16 array, dimension (LDU,UCOL)
+*>          (LDU,M) if JOBU = 'A' or (LDU,min(M,N)) if JOBU = 'S'.
+*>          If JOBU = 'A', U contains the M-by-M unitary matrix U;
+*>          if JOBU = 'S', U contains the first min(m,n) columns of U
+*>          (the left singular vectors, stored columnwise);
+*>          if JOBU = 'N' or 'O', U is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDU
+*> \verbatim
+*>          LDU is INTEGER
+*>          The leading dimension of the array U.  LDU >= 1; if
+*>          JOBU = 'S' or 'A', LDU >= M.
+*> \endverbatim
+*>
+*> \param[out] VT
+*> \verbatim
+*>          VT is COMPLEX*16 array, dimension (LDVT,N)
+*>          If JOBVT = 'A', VT contains the N-by-N unitary matrix
+*>          V**H;
+*>          if JOBVT = 'S', VT contains the first min(m,n) rows of
+*>          V**H (the right singular vectors, stored rowwise);
+*>          if JOBVT = 'N' or 'O', VT is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDVT
+*> \verbatim
+*>          LDVT is INTEGER
+*>          The leading dimension of the array VT.  LDVT >= 1; if
+*>          JOBVT = 'A', LDVT >= N; if JOBVT = 'S', LDVT >= min(M,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          LWORK >=  MAX(1,2*MIN(M,N)+MAX(M,N)).
+*>          For good performance, LWORK should generally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (5*min(M,N))
+*>          On exit, if INFO > 0, RWORK(1:MIN(M,N)-1) contains the
+*>          unconverged superdiagonal elements of an upper bidiagonal
+*>          matrix B whose diagonal is in S (not necessarily sorted).
+*>          B satisfies A = U * B * VT, so it has the same singular
+*>          values as A, and singular vectors related by U and VT.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  if ZBDSQR did not converge, INFO specifies how many
+*>                superdiagonals of an intermediate bidiagonal form B
+*>                did not converge to zero. See the description of RWORK
+*>                above for details.
+*> \endverbatim
 *
-*                    Generate Q in A
-*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                    (RWorkspace: 0)
+*  Authors:
+*  ========
 *
-                     CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*                    Bidiagonalize L in WORK(IR)
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*> \date April 2012
 *
-                     CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+*> \ingroup complex16GEsing
 *
-*                    Generate right vectors bidiagonalizing L in
-*                    WORK(IR)
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+(M-1)*NB)
-*                    (RWorkspace: 0)
+*  =====================================================================
+      SUBROUTINE ZGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU, 
+     $                   VT, LDVT, WORK, LWORK, RWORK, INFO )
 *
-                     CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+*  -- LAPACK driver routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     April 2012
 *
-*                    Perform bidiagonal QR iteration, computing right
-*                    singular vectors of L in WORK(IR)
-*                    (CWorkspace: need M*M)
-*                    (RWorkspace: need BDSPAC)
+*     .. Scalar Arguments ..
+      CHARACTER          JOBU, JOBVT
+      INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   RWORK( * ), S( * )
+      COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
+     $                   WORK( * )
+*     ..
 *
-                     CALL ZBDSQR( 'U', M, M, 0, 0, S, RWORK( IE ),
-     $                            WORK( IR ), LDWRKR, CDUM, 1, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+*  =====================================================================
 *
-*                    Multiply right singular vectors of L in WORK(IR) by
-*                    Q in A, storing result in VT
-*                    (CWorkspace: need M*M)
-*                    (RWorkspace: 0)
+*     .. Parameters ..
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ),
+     $                   CONE = ( 1.0D0, 0.0D0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, WNTUA, WNTUAS, WNTUN, WNTUO, WNTUS,
+     $                   WNTVA, WNTVAS, WNTVN, WNTVO, WNTVS
+      INTEGER            BLK, CHUNK, I, IE, IERR, IR, IRWORK, ISCL,
+     $                   ITAU, ITAUP, ITAUQ, IU, IWORK, LDWRKR, LDWRKU,
+     $                   MAXWRK, MINMN, MINWRK, MNTHR, NCU, NCVT, NRU,
+     $                   NRVT, WRKBL
+      INTEGER            LWORK_ZGEQRF, LWORK_ZUNGQR_N, LWORK_ZUNGQR_M,
+     $                   LWORK_ZGEBRD, LWORK_ZUNGBR_P, LWORK_ZUNGBR_Q,
+     $                   LWORK_ZGELQF, LWORK_ZUNGLQ_N, LWORK_ZUNGLQ_M
+      DOUBLE PRECISION   ANRM, BIGNUM, EPS, SMLNUM
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   DUM( 1 )
+      COMPLEX*16         CDUM( 1 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLASCL, XERBLA, ZBDSQR, ZGEBRD, ZGELQF, ZGEMM,
+     $                   ZGEQRF, ZLACPY, ZLASCL, ZLASET, ZUNGBR, ZUNGLQ,
+     $                   ZUNGQR, ZUNMBR
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN, SQRT
+*     ..
+*     .. Executable Statements ..
 *
-                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IR ),
-     $                           LDWRKR, A, LDA, CZERO, VT, LDVT )
+*     Test the input arguments
 *
-                  ELSE
+      INFO = 0
+      MINMN = MIN( M, N )
+      WNTUA = LSAME( JOBU, 'A' )
+      WNTUS = LSAME( JOBU, 'S' )
+      WNTUAS = WNTUA .OR. WNTUS
+      WNTUO = LSAME( JOBU, 'O' )
+      WNTUN = LSAME( JOBU, 'N' )
+      WNTVA = LSAME( JOBVT, 'A' )
+      WNTVS = LSAME( JOBVT, 'S' )
+      WNTVAS = WNTVA .OR. WNTVS
+      WNTVO = LSAME( JOBVT, 'O' )
+      WNTVN = LSAME( JOBVT, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
 *
-*                    Insufficient workspace for a fast algorithm
+      IF( .NOT.( WNTUA .OR. WNTUS .OR. WNTUO .OR. WNTUN ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.( WNTVA .OR. WNTVS .OR. WNTVO .OR. WNTVN ) .OR.
+     $         ( WNTVO .AND. WNTUO ) ) THEN
+         INFO = -2
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -6
+      ELSE IF( LDU.LT.1 .OR. ( WNTUAS .AND. LDU.LT.M ) ) THEN
+         INFO = -9
+      ELSE IF( LDVT.LT.1 .OR. ( WNTVA .AND. LDVT.LT.N ) .OR.
+     $         ( WNTVS .AND. LDVT.LT.MINMN ) ) THEN
+         INFO = -11
+      END IF
 *
-                     ITAU = 1
-                     IWORK = ITAU + M
+*     Compute workspace
+*      (Note: Comments in the code beginning "Workspace:" describe the
+*       minimal amount of workspace needed at that point in the code,
+*       as well as the preferred amount for good performance.
+*       CWorkspace refers to complex workspace, and RWorkspace to
+*       real workspace. NB refers to the optimal block size for the
+*       immediately following subroutine, as returned by ILAENV.)
 *
-*                    Compute A=L*Q
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
-*                    (RWorkspace: 0)
+      IF( INFO.EQ.0 ) THEN
+         MINWRK = 1
+         MAXWRK = 1
+         IF( M.GE.N .AND. MINMN.GT.0 ) THEN
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*           Space needed for ZBDSQR is BDSPAC = 5*N
 *
-*                    Copy result to VT
+            MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
+*           Compute space needed for ZGEQRF
+            CALL ZGEQRF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZGEQRF=CDUM(1)
+*           Compute space needed for ZUNGQR
+            CALL ZUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZUNGQR_N=CDUM(1)
+            CALL ZUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZUNGQR_M=CDUM(1)
+*           Compute space needed for ZGEBRD
+            CALL ZGEBRD( N, N, A, LDA, S, DUM(1), CDUM(1),
+     $                   CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZGEBRD=CDUM(1)
+*           Compute space needed for ZUNGBR
+            CALL ZUNGBR( 'P', N, N, N, A, LDA, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+            LWORK_ZUNGBR_P=CDUM(1)
+            CALL ZUNGBR( 'Q', N, N, N, A, LDA, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+            LWORK_ZUNGBR_Q=CDUM(1)
 *
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+            IF( M.GE.MNTHR ) THEN
+               IF( WNTUN ) THEN
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
-*                    (RWorkspace: 0)
+*                 Path 1 (M much larger than N, JOBU='N')
 *
-                     CALL ZUNGLQ( M, N, M, VT, LDVT, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                  MAXWRK = N + LWORK_ZGEQRF
+                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZGEBRD )
+                  IF( WNTVO .OR. WNTVAS )
+     $               MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_P )
+                  MINWRK = 3*N
+               ELSE IF( WNTUO .AND. WNTVN ) THEN
 *
-*                    Zero out above L in A
+*                 Path 2 (M much larger than N, JOBU='O', JOBVT='N')
 *
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            A( 1, 2 ), LDA )
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  MAXWRK = MAX( N*N+WRKBL, N*N+M*N )
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUO .AND. WNTVAS ) THEN
 *
-*                    Bidiagonalize L in A
-*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                 Path 3 (M much larger than N, JOBU='O', JOBVT='S' or
+*                 'A')
 *
-                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
+                  MAXWRK = MAX( N*N+WRKBL, N*N+M*N )
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUS .AND. WNTVN ) THEN
 *
-*                    Multiply right vectors bidiagonalizing L by Q in VT
-*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
-*                    (RWorkspace: 0)
+*                 Path 4 (M much larger than N, JOBU='S', JOBVT='N')
 *
-                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
-     $                            WORK( ITAUP ), VT, LDVT,
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  MAXWRK = N*N + WRKBL
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUS .AND. WNTVO ) THEN
 *
-*                    Perform bidiagonal QR iteration, computing right
-*                    singular vectors of A in VT
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+*                 Path 5 (M much larger than N, JOBU='S', JOBVT='O')
 *
-                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
-     $                            LDVT, CDUM, 1, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
+                  MAXWRK = 2*N*N + WRKBL
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUS .AND. WNTVAS ) THEN
 *
-                  END IF
+*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S' or
+*                 'A')
 *
-               ELSE IF( WNTUO ) THEN
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_N )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
+                  MAXWRK = N*N + WRKBL
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUA .AND. WNTVN ) THEN
 *
-*                 Path 5t(N much larger than M, JOBU='O', JOBVT='S')
-*                 M right singular vectors to be computed in VT and
-*                 M left singular vectors to be overwritten on A
+*                 Path 7 (M much larger than N, JOBU='A', JOBVT='N')
 *
-                  IF( LWORK.GE.2*M*M+3*M ) THEN
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_M )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  MAXWRK = N*N + WRKBL
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUA .AND. WNTVO ) THEN
 *
-*                    Sufficient workspace for a fast algorithm
+*                 Path 8 (M much larger than N, JOBU='A', JOBVT='O')
 *
-                     IU = 1
-                     IF( LWORK.GE.WRKBL+2*LDA*M ) THEN
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_M )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
+                  MAXWRK = 2*N*N + WRKBL
+                  MINWRK = 2*N + M
+               ELSE IF( WNTUA .AND. WNTVAS ) THEN
 *
-*                       WORK(IU) is LDA by M and WORK(IR) is LDA by M
+*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S' or
+*                 'A')
 *
-                        LDWRKU = LDA
-                        IR = IU + LDWRKU*M
-                        LDWRKR = LDA
-                     ELSE IF( LWORK.GE.WRKBL+( LDA+M )*M ) THEN
+                  WRKBL = N + LWORK_ZGEQRF
+                  WRKBL = MAX( WRKBL, N+LWORK_ZUNGQR_M )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_Q )
+                  WRKBL = MAX( WRKBL, 2*N+LWORK_ZUNGBR_P )
+                  MAXWRK = N*N + WRKBL
+                  MINWRK = 2*N + M
+               END IF
+            ELSE
 *
-*                       WORK(IU) is LDA by M and WORK(IR) is M by M
+*              Path 10 (M at least N, but not much larger)
 *
-                        LDWRKU = LDA
-                        IR = IU + LDWRKU*M
-                        LDWRKR = M
-                     ELSE
+               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
+     $                   CDUM(1), CDUM(1), -1, IERR )
+               LWORK_ZGEBRD=CDUM(1)
+               MAXWRK = 2*N + LWORK_ZGEBRD
+               IF( WNTUS .OR. WNTUO ) THEN
+                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+                  LWORK_ZUNGBR_Q=CDUM(1)
+                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
+               END IF
+               IF( WNTUA ) THEN
+                  CALL ZUNGBR( 'Q', M, M, N, A, LDA, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+                  LWORK_ZUNGBR_Q=CDUM(1)
+                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
+               END IF
+               IF( .NOT.WNTVN ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_P )
+               MINWRK = 2*N + M
+               END IF
+            END IF
+         ELSE IF( MINMN.GT.0 ) THEN
 *
-*                       WORK(IU) is M by M and WORK(IR) is M by M
+*           Space needed for ZBDSQR is BDSPAC = 5*M
 *
-                        LDWRKU = M
-                        IR = IU + LDWRKU*M
-                        LDWRKR = M
-                     END IF
-                     ITAU = IR + LDWRKR*M
-                     IWORK = ITAU + M
+            MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
+*           Compute space needed for ZGELQF
+            CALL ZGELQF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZGELQF=CDUM(1)
+*           Compute space needed for ZUNGLQ
+            CALL ZUNGLQ( N, N, M, CDUM(1), N, CDUM(1), CDUM(1), -1,
+     $                   IERR )
+            LWORK_ZUNGLQ_N=CDUM(1)
+            CALL ZUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZUNGLQ_M=CDUM(1)
+*           Compute space needed for ZGEBRD
+            CALL ZGEBRD( M, M, A, LDA, S, DUM(1), CDUM(1),
+     $                   CDUM(1), CDUM(1), -1, IERR )
+            LWORK_ZGEBRD=CDUM(1)
+*            Compute space needed for ZUNGBR P
+            CALL ZUNGBR( 'P', M, M, M, A, N, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+            LWORK_ZUNGBR_P=CDUM(1)
+*           Compute space needed for ZUNGBR Q
+            CALL ZUNGBR( 'Q', M, M, M, A, N, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+            LWORK_ZUNGBR_Q=CDUM(1)
+            IF( N.GE.MNTHR ) THEN
+               IF( WNTVN ) THEN
 *
-*                    Compute A=L*Q
-*                    (CWorkspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB)
-*                    (RWorkspace: 0)
+*                 Path 1t(N much larger than M, JOBVT='N')
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  MAXWRK = M + LWORK_ZGELQF
+                  MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZGEBRD )
+                  IF( WNTUO .OR. WNTUAS )
+     $               MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_Q )
+                  MINWRK = 3*M
+               ELSE IF( WNTVO .AND. WNTUN ) THEN
 *
-*                    Copy L to WORK(IU), zeroing out below it
+*                 Path 2t(N much larger than M, JOBU='N', JOBVT='O')
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            WORK( IU+LDWRKU ), LDWRKU )
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  MAXWRK = MAX( M*M+WRKBL, M*M+M*N )
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVO .AND. WNTUAS ) THEN
 *
-*                    Generate Q in A
-*                    (CWorkspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB)
-*                    (RWorkspace: 0)
+*                 Path 3t(N much larger than M, JOBU='S' or 'A',
+*                 JOBVT='O')
 *
-                     CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
+                  MAXWRK = MAX( M*M+WRKBL, M*M+M*N )
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVS .AND. WNTUN ) THEN
 *
-*                    Bidiagonalize L in WORK(IU), copying result to
-*                    WORK(IR)
-*                    (CWorkspace: need   2*M*M+3*M,
-*                                 prefer 2*M*M+2*M+2*M*NB)
-*                    (RWorkspace: need   M)
+*                 Path 4t(N much larger than M, JOBU='N', JOBVT='S')
 *
-                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU,
-     $                            WORK( IR ), LDWRKR )
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  MAXWRK = M*M + WRKBL
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVS .AND. WNTUO ) THEN
 *
-*                    Generate right bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need   2*M*M+3*M-1,
-*                                 prefer 2*M*M+2*M+(M-1)*NB)
-*                    (RWorkspace: 0)
+*                 Path 5t(N much larger than M, JOBU='O', JOBVT='S')
 *
-                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
+                  MAXWRK = 2*M*M + WRKBL
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVS .AND. WNTUAS ) THEN
 *
-*                    Generate left bidiagonalizing vectors in WORK(IR)
-*                    (CWorkspace: need 2*M*M+3*M, prefer 2*M*M+2*M+M*NB)
-*                    (RWorkspace: 0)
+*                 Path 6t(N much larger than M, JOBU='S' or 'A',
+*                 JOBVT='S')
 *
-                     CALL ZUNGBR( 'Q', M, M, M, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_M )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
+                  MAXWRK = M*M + WRKBL
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVA .AND. WNTUN ) THEN
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of L in WORK(IR) and computing
-*                    right singular vectors of L in WORK(IU)
-*                    (CWorkspace: need 2*M*M)
-*                    (RWorkspace: need BDSPAC)
+*                 Path 7t(N much larger than M, JOBU='N', JOBVT='A')
 *
-                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
-     $                            WORK( IU ), LDWRKU, WORK( IR ),
-     $                            LDWRKR, CDUM, 1, RWORK( IRWORK ),
-     $                            INFO )
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_N )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  MAXWRK = M*M + WRKBL
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVA .AND. WNTUO ) THEN
 *
-*                    Multiply right singular vectors of L in WORK(IU) by
-*                    Q in A, storing result in VT
-*                    (CWorkspace: need M*M)
-*                    (RWorkspace: 0)
+*                 Path 8t(N much larger than M, JOBU='O', JOBVT='A')
 *
-                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
-     $                           LDWRKU, A, LDA, CZERO, VT, LDVT )
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_N )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
+                  MAXWRK = 2*M*M + WRKBL
+                  MINWRK = 2*M + N
+               ELSE IF( WNTVA .AND. WNTUAS ) THEN
 *
-*                    Copy left singular vectors of L to A
-*                    (CWorkspace: need M*M)
-*                    (RWorkspace: 0)
+*                 Path 9t(N much larger than M, JOBU='S' or 'A',
+*                 JOBVT='A')
 *
-                     CALL ZLACPY( 'F', M, M, WORK( IR ), LDWRKR, A,
-     $                            LDA )
+                  WRKBL = M + LWORK_ZGELQF
+                  WRKBL = MAX( WRKBL, M+LWORK_ZUNGLQ_N )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZGEBRD )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_P )
+                  WRKBL = MAX( WRKBL, 2*M+LWORK_ZUNGBR_Q )
+                  MAXWRK = M*M + WRKBL
+                  MINWRK = 2*M + N
+               END IF
+            ELSE
 *
-                  ELSE
+*              Path 10t(N greater than M, but not much larger)
 *
-*                    Insufficient workspace for a fast algorithm
+               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
+     $                   CDUM(1), CDUM(1), -1, IERR )
+               LWORK_ZGEBRD=CDUM(1)
+               MAXWRK = 2*M + LWORK_ZGEBRD
+               IF( WNTVS .OR. WNTVO ) THEN
+*                Compute space needed for ZUNGBR P
+                 CALL ZUNGBR( 'P', M, N, M, A, N, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+                 LWORK_ZUNGBR_P=CDUM(1)
+                 MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
+               END IF
+               IF( WNTVA ) THEN
+                 CALL ZUNGBR( 'P', N,  N, M, A, N, CDUM(1),
+     $                   CDUM(1), -1, IERR )
+                 LWORK_ZUNGBR_P=CDUM(1)
+                 MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
+               END IF
+               IF( .NOT.WNTUN ) THEN
+                  MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_Q )
+               MINWRK = 2*M + N
+               END IF
+            END IF
+         END IF
+         MAXWRK = MAX( MAXWRK, MINWRK )
+         WORK( 1 ) = MAXWRK
 *
-                     ITAU = 1
-                     IWORK = ITAU + M
+         IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
+            INFO = -13
+         END IF
+      END IF
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
-*                    (RWorkspace: 0)
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGESVD', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+*     Quick return if possible
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
-*                    (RWorkspace: 0)
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         RETURN
+      END IF
 *
-                     CALL ZUNGLQ( M, N, M, VT, LDVT, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+*     Get machine constants
 *
-*                    Zero out above L in A
+      EPS = DLAMCH( 'P' )
+      SMLNUM = SQRT( DLAMCH( 'S' ) ) / EPS
+      BIGNUM = ONE / SMLNUM
 *
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            A( 1, 2 ), LDA )
+*     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
-*                    Bidiagonalize L in A
-*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                    (RWorkspace: need M)
+      ANRM = ZLANGE( 'M', M, N, A, LDA, DUM )
+      ISCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+         ISCL = 1
+         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, IERR )
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+         ISCL = 1
+         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, IERR )
+      END IF
 *
-                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+      IF( M.GE.N ) THEN
 *
-*                    Multiply right vectors bidiagonalizing L by Q in VT
-*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
-*                    (RWorkspace: 0)
+*        A has at least as many rows as columns. If A has sufficiently
+*        more rows than columns, first reduce using the QR
+*        decomposition (if sufficient workspace available)
 *
-                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
-     $                            WORK( ITAUP ), VT, LDVT,
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+         IF( M.GE.MNTHR ) THEN
 *
-*                    Generate left bidiagonalizing vectors of L in A
-*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*                    (RWorkspace: 0)
+            IF( WNTUN ) THEN
 *
-                     CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+*              Path 1 (M much larger than N, JOBU='N')
+*              No left singular vectors to be computed
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in A and computing right
-*                    singular vectors of A in VT
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+               ITAU = 1
+               IWORK = ITAU + N
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
-     $                            LDVT, A, LDA, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+*              Compute A=Q*R
+*              (CWorkspace: need 2*N, prefer N+N*NB)
+*              (RWorkspace: need 0)
 *
-                  END IF
+               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+     $                      LWORK-IWORK+1, IERR )
 *
-               ELSE IF( WNTUAS ) THEN
+*              Zero out below R
 *
-*                 Path 6t(N much larger than M, JOBU='S' or 'A',
-*                         JOBVT='S')
-*                 M right singular vectors to be computed in VT and
-*                 M left singular vectors to be computed in U
+               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
+     $                      LDA )
+               IE = 1
+               ITAUQ = 1
+               ITAUP = ITAUQ + N
+               IWORK = ITAUP + N
 *
-                  IF( LWORK.GE.M*M+3*M ) THEN
+*              Bidiagonalize R in A
+*              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*              (RWorkspace: need N)
 *
-*                    Sufficient workspace for a fast algorithm
+               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
+     $                      IERR )
+               NCVT = 0
+               IF( WNTVO .OR. WNTVAS ) THEN
 *
-                     IU = 1
-                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
+*                 If right singular vectors desired, generate P'.
+*                 (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
+*                 (RWorkspace: 0)
 *
-*                       WORK(IU) is LDA by N
+                  CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  NCVT = N
+               END IF
+               IRWORK = IE + N
 *
-                        LDWRKU = LDA
-                     ELSE
+*              Perform bidiagonal QR iteration, computing right
+*              singular vectors of A in A if desired
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
 *
-*                       WORK(IU) is LDA by M
+               CALL ZBDSQR( 'U', N, NCVT, 0, 0, S, RWORK( IE ), A, LDA,
+     $                      CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
 *
-                        LDWRKU = M
-                     END IF
-                     ITAU = IU + LDWRKU*M
-                     IWORK = ITAU + M
+*              If right singular vectors desired in VT, copy them there
 *
-*                    Compute A=L*Q
-*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                    (RWorkspace: 0)
+               IF( WNTVAS )
+     $            CALL ZLACPY( 'F', N, N, A, LDA, VT, LDVT )
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+            ELSE IF( WNTUO .AND. WNTVN ) THEN
 *
-*                    Copy L to WORK(IU), zeroing out above it
+*              Path 2 (M much larger than N, JOBU='O', JOBVT='N')
+*              N left singular vectors to be overwritten on A and
+*              no right singular vectors to be computed
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            WORK( IU+LDWRKU ), LDWRKU )
+               IF( LWORK.GE.N*N+3*N ) THEN
 *
-*                    Generate Q in A
-*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*                    (RWorkspace: 0)
+*                 Sufficient workspace for a fast algorithm
 *
-                     CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                  IR = 1
+                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*N ) THEN
 *
-*                    Bidiagonalize L in WORK(IU), copying result to U
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                    WORK(IU) is LDA by N, WORK(IR) is LDA by N
 *
-                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
-     $                            RWORK( IE ), WORK( ITAUQ ),
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU, U,
-     $                            LDU )
+                     LDWRKU = LDA
+                     LDWRKR = LDA
+                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+N*N ) THEN
 *
-*                    Generate right bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need   M*M+3*M-1,
-*                                 prefer M*M+2*M+(M-1)*NB)
-*                    (RWorkspace: 0)
+*                    WORK(IU) is LDA by N, WORK(IR) is N by N
 *
-                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUP ), WORK( IWORK ),
-     $                            LWORK-IWORK+1, IERR )
+                     LDWRKU = LDA
+                     LDWRKR = N
+                  ELSE
 *
-*                    Generate left bidiagonalizing vectors in U
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
-*                    (RWorkspace: 0)
+*                    WORK(IU) is LDWRKU by N, WORK(IR) is N by N
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     LDWRKU = ( LWORK-N*N ) / N
+                     LDWRKR = N
+                  END IF
+                  ITAU = IR + LDWRKR*N
+                  IWORK = ITAU + N
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of L in U and computing right
-*                    singular vectors of L in WORK(IU)
-*                    (CWorkspace: need M*M)
-*                    (RWorkspace: need BDSPAC)
+*                 Compute A=Q*R
+*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                 (RWorkspace: 0)
 *
-                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
-     $                            WORK( IU ), LDWRKU, U, LDU, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+                  CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*                    Multiply right singular vectors of L in WORK(IU) by
-*                    Q in A, storing result in VT
-*                    (CWorkspace: need M*M)
-*                    (RWorkspace: 0)
+*                 Copy R to WORK(IR) and zero out below it
 *
-                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
-     $                           LDWRKU, A, LDA, CZERO, VT, LDVT )
+                  CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
+                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                         WORK( IR+1 ), LDWRKR )
 *
-                  ELSE
+*                 Generate Q in A
+*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                 (RWorkspace: 0)
 *
-*                    Insufficient workspace for a fast algorithm
+                  CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = ITAU
+                  ITAUP = ITAUQ + N
+                  IWORK = ITAUP + N
 *
-                     ITAU = 1
-                     IWORK = ITAU + M
+*                 Bidiagonalize R in WORK(IR)
+*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*                 (RWorkspace: need N)
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
-*                    (RWorkspace: 0)
+                  CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+*                 Generate left vectors bidiagonalizing R
+*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*                 (RWorkspace: need 0)
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
-*                    (RWorkspace: 0)
+                  CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
+     $                         WORK( ITAUQ ), WORK( IWORK ),
+     $                         LWORK-IWORK+1, IERR )
+                  IRWORK = IE + N
 *
-                     CALL ZUNGLQ( M, N, M, VT, LDVT, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*                 Perform bidiagonal QR iteration, computing left
+*                 singular vectors of R in WORK(IR)
+*                 (CWorkspace: need N*N)
+*                 (RWorkspace: need BDSPAC)
 *
-*                    Copy L to U, zeroing out above it
+                  CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM, 1,
+     $                         WORK( IR ), LDWRKR, CDUM, 1,
+     $                         RWORK( IRWORK ), INFO )
+                  IU = ITAUQ
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            U( 1, 2 ), LDU )
-                     IE = 1
-                     ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+*                 Multiply Q in A by left singular vectors of R in
+*                 WORK(IR), storing result in WORK(IU) and copying to A
+*                 (CWorkspace: need N*N+N, prefer N*N+M*N)
+*                 (RWorkspace: 0)
 *
-*                    Bidiagonalize L in U
-*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                    (RWorkspace: need M)
+                  DO 10 I = 1, M, LDWRKU
+                     CHUNK = MIN( M-I+1, LDWRKU )
+                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+     $                           LDA, WORK( IR ), LDWRKR, CZERO,
+     $                           WORK( IU ), LDWRKU )
+                     CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
+     $                            A( I, 1 ), LDA )
+   10             CONTINUE
 *
-                     CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
-     $                            WORK( ITAUQ ), WORK( ITAUP ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+               ELSE
 *
-*                    Multiply right bidiagonalizing vectors in U by Q
-*                    in VT
-*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
-*                    (RWorkspace: 0)
+*                 Insufficient workspace for a fast algorithm
 *
-                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, U, LDU,
-     $                            WORK( ITAUP ), VT, LDVT,
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = 1
+                  ITAUP = ITAUQ + N
+                  IWORK = ITAUP + N
 *
-*                    Generate left bidiagonalizing vectors in U
-*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*                    (RWorkspace: 0)
+*                 Bidiagonalize A
+*                 (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
+*                 (RWorkspace: N)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                  CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in U and computing right
-*                    singular vectors of A in VT
-*                    (CWorkspace: 0)
-*                    (RWorkspace: need BDSPAC)
+*                 Generate left vectors bidiagonalizing A
+*                 (CWorkspace: need 3*N, prefer 2*N+N*NB)
+*                 (RWorkspace: 0)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
-     $                            LDVT, U, LDU, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IRWORK = IE + N
 *
-                  END IF
+*                 Perform bidiagonal QR iteration, computing left
+*                 singular vectors of A in A
+*                 (CWorkspace: need 0)
+*                 (RWorkspace: need BDSPAC)
+*
+                  CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM, 1,
+     $                         A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
 *
                END IF
 *
-            ELSE IF( WNTVA ) THEN
+            ELSE IF( WNTUO .AND. WNTVAS ) THEN
 *
-               IF( WNTUN ) THEN
+*              Path 3 (M much larger than N, JOBU='O', JOBVT='S' or 'A')
+*              N left singular vectors to be overwritten on A and
+*              N right singular vectors to be computed in VT
 *
-*                 Path 7t(N much larger than M, JOBU='N', JOBVT='A')
-*                 N right singular vectors to be computed in VT and
-*                 no left singular vectors to be computed
+               IF( LWORK.GE.N*N+3*N ) THEN
 *
-                  IF( LWORK.GE.M*M+MAX( N+M, 3*M ) ) THEN
+*                 Sufficient workspace for a fast algorithm
+*
+                  IR = 1
+                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*N ) THEN
+*
+*                    WORK(IU) is LDA by N and WORK(IR) is LDA by N
+*
+                     LDWRKU = LDA
+                     LDWRKR = LDA
+                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+N*N ) THEN
+*
+*                    WORK(IU) is LDA by N and WORK(IR) is N by N
+*
+                     LDWRKU = LDA
+                     LDWRKR = N
+                  ELSE
+*
+*                    WORK(IU) is LDWRKU by N and WORK(IR) is N by N
+*
+                     LDWRKU = ( LWORK-N*N ) / N
+                     LDWRKR = N
+                  END IF
+                  ITAU = IR + LDWRKR*N
+                  IWORK = ITAU + N
+*
+*                 Compute A=Q*R
+*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                 Copy R to VT, zeroing out below it
+*
+                  CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+                  IF( N.GT.1 )
+     $               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            VT( 2, 1 ), LDVT )
+*
+*                 Generate Q in A
+*                 (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = ITAU
+                  ITAUP = ITAUQ + N
+                  IWORK = ITAUP + N
+*
+*                 Bidiagonalize R in VT, copying result to WORK(IR)
+*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*                 (RWorkspace: need N)
+*
+                  CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  CALL ZLACPY( 'L', N, N, VT, LDVT, WORK( IR ), LDWRKR )
+*
+*                 Generate left vectors bidiagonalizing R in WORK(IR)
+*                 (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
+     $                         WORK( ITAUQ ), WORK( IWORK ),
+     $                         LWORK-IWORK+1, IERR )
+*
+*                 Generate right vectors bidiagonalizing R in VT
+*                 (CWorkspace: need N*N+3*N-1, prefer N*N+2*N+(N-1)*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IRWORK = IE + N
+*
+*                 Perform bidiagonal QR iteration, computing left
+*                 singular vectors of R in WORK(IR) and computing right
+*                 singular vectors of R in VT
+*                 (CWorkspace: need N*N)
+*                 (RWorkspace: need BDSPAC)
+*
+                  CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+     $                         LDVT, WORK( IR ), LDWRKR, CDUM, 1,
+     $                         RWORK( IRWORK ), INFO )
+                  IU = ITAUQ
+*
+*                 Multiply Q in A by left singular vectors of R in
+*                 WORK(IR), storing result in WORK(IU) and copying to A
+*                 (CWorkspace: need N*N+N, prefer N*N+M*N)
+*                 (RWorkspace: 0)
+*
+                  DO 20 I = 1, M, LDWRKU
+                     CHUNK = MIN( M-I+1, LDWRKU )
+                     CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
+     $                           LDA, WORK( IR ), LDWRKR, CZERO,
+     $                           WORK( IU ), LDWRKU )
+                     CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
+     $                            A( I, 1 ), LDA )
+   20             CONTINUE
+*
+               ELSE
+*
+*                 Insufficient workspace for a fast algorithm
+*
+                  ITAU = 1
+                  IWORK = ITAU + N
+*
+*                 Compute A=Q*R
+*                 (CWorkspace: need 2*N, prefer N+N*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                 Copy R to VT, zeroing out below it
+*
+                  CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+                  IF( N.GT.1 )
+     $               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            VT( 2, 1 ), LDVT )
+*
+*                 Generate Q in A
+*                 (CWorkspace: need 2*N, prefer N+N*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = ITAU
+                  ITAUP = ITAUQ + N
+                  IWORK = ITAUP + N
+*
+*                 Bidiagonalize R in VT
+*                 (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                 (RWorkspace: N)
+*
+                  CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                 Multiply Q in A by left vectors bidiagonalizing R
+*                 (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, VT, LDVT,
+     $                         WORK( ITAUQ ), A, LDA, WORK( IWORK ),
+     $                         LWORK-IWORK+1, IERR )
+*
+*                 Generate right vectors bidiagonalizing R in VT
+*                 (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
+*                 (RWorkspace: 0)
+*
+                  CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IRWORK = IE + N
+*
+*                 Perform bidiagonal QR iteration, computing left
+*                 singular vectors of A in A and computing right
+*                 singular vectors of A in VT
+*                 (CWorkspace: 0)
+*                 (RWorkspace: need BDSPAC)
+*
+                  CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
+     $                         LDVT, A, LDA, CDUM, 1, RWORK( IRWORK ),
+     $                         INFO )
+*
+               END IF
+*
+            ELSE IF( WNTUS ) THEN
+*
+               IF( WNTVN ) THEN
+*
+*                 Path 4 (M much larger than N, JOBU='S', JOBVT='N')
+*                 N left singular vectors to be computed in U and
+*                 no right singular vectors to be computed
+*
+                  IF( LWORK.GE.N*N+3*N ) THEN
 *
 *                    Sufficient workspace for a fast algorithm
 *
                      IR = 1
-                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
+                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
 *
-*                       WORK(IR) is LDA by M
+*                       WORK(IR) is LDA by N
 *
                         LDWRKR = LDA
                      ELSE
 *
-*                       WORK(IR) is M by M
+*                       WORK(IR) is N by N
 *
-                        LDWRKR = M
+                        LDWRKR = N
                      END IF
-                     ITAU = IR + LDWRKR*M
-                     IWORK = ITAU + M
+                     ITAU = IR + LDWRKR*N
+                     IWORK = ITAU + N
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    Compute A=Q*R
+*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*                    Copy L to WORK(IR), zeroing out above it
+*                    Copy R to WORK(IR), zeroing out below it
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ),
+                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ),
      $                            LDWRKR )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            WORK( IR+LDWRKR ), LDWRKR )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            WORK( IR+1 ), LDWRKR )
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need M*M+M+N, prefer M*M+M+N*NB)
+*                    Generate Q in A
+*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+                     CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IE = 1
                      ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*                    Bidiagonalize L in WORK(IR)
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                    Bidiagonalize R in WORK(IR)
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-                     CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S,
+                     CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S,
      $                            RWORK( IE ), WORK( ITAUQ ),
      $                            WORK( ITAUP ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
 *
-*                    Generate right bidiagonalizing vectors in WORK(IR)
-*                    (CWorkspace: need   M*M+3*M-1,
-*                                 prefer M*M+2*M+(M-1)*NB)
+*                    Generate left vectors bidiagonalizing R in WORK(IR)
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUP ), WORK( IWORK ),
+                     CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     IRWORK = IE + N
 *
-*                    Perform bidiagonal QR iteration, computing right
-*                    singular vectors of L in WORK(IR)
-*                    (CWorkspace: need M*M)
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of R in WORK(IR)
+*                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, M, 0, 0, S, RWORK( IE ),
-     $                            WORK( IR ), LDWRKR, CDUM, 1, CDUM, 1,
+                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+     $                            1, WORK( IR ), LDWRKR, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
-*                    Multiply right singular vectors of L in WORK(IR) by
-*                    Q in VT, storing result in A
-*                    (CWorkspace: need M*M)
+*                    Multiply Q in A by left singular vectors of R in
+*                    WORK(IR), storing result in U
+*                    (CWorkspace: need N*N)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IR ),
-     $                           LDWRKR, VT, LDVT, CZERO, A, LDA )
-*
-*                    Copy right singular vectors of A from A to VT
-*
-                     CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
+     $                           WORK( IR ), LDWRKR, CZERO, U, LDU )
 *
                   ELSE
 *
 *                    Insufficient workspace for a fast algorithm
 *
                      ITAU = 1
-                     IWORK = ITAU + M
+                     IWORK = ITAU + N
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need M+N, prefer M+N*NB)
+*                    Generate Q in U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+                     CALL ZUNGQR( M, N, N, U, LDU, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IE = 1
                      ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*                    Zero out above L in A
+*                    Zero out below R in A
 *
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            A( 1, 2 ), LDA )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            A( 2, 1 ), LDA )
 *
-*                    Bidiagonalize L in A
-*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                    Bidiagonalize R in A
+*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
      $                            WORK( ITAUQ ), WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*                    Multiply right bidiagonalizing vectors in A by Q
-*                    in VT
-*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    Multiply Q in U by left vectors bidiagonalizing R
+*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
-     $                            WORK( ITAUP ), VT, LDVT,
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
+     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-*                    Perform bidiagonal QR iteration, computing right
-*                    singular vectors of A in VT
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in U
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
-     $                            LDVT, CDUM, 1, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+     $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
                   END IF
 *
-               ELSE IF( WNTUO ) THEN
+               ELSE IF( WNTVO ) THEN
 *
-*                 Path 8t(N much larger than M, JOBU='O', JOBVT='A')
-*                 N right singular vectors to be computed in VT and
-*                 M left singular vectors to be overwritten on A
+*                 Path 5 (M much larger than N, JOBU='S', JOBVT='O')
+*                 N left singular vectors to be computed in U and
+*                 N right singular vectors to be overwritten on A
 *
-                  IF( LWORK.GE.2*M*M+MAX( N+M, 3*M ) ) THEN
+                  IF( LWORK.GE.2*N*N+3*N ) THEN
 *
 *                    Sufficient workspace for a fast algorithm
 *
                      IU = 1
-                     IF( LWORK.GE.WRKBL+2*LDA*M ) THEN
+                     IF( LWORK.GE.WRKBL+2*LDA*N ) THEN
 *
-*                       WORK(IU) is LDA by M and WORK(IR) is LDA by M
+*                       WORK(IU) is LDA by N and WORK(IR) is LDA by N
 *
                         LDWRKU = LDA
-                        IR = IU + LDWRKU*M
+                        IR = IU + LDWRKU*N
                         LDWRKR = LDA
-                     ELSE IF( LWORK.GE.WRKBL+( LDA+M )*M ) THEN
+                     ELSE IF( LWORK.GE.WRKBL+( LDA+N )*N ) THEN
 *
-*                       WORK(IU) is LDA by M and WORK(IR) is M by M
+*                       WORK(IU) is LDA by N and WORK(IR) is N by N
 *
                         LDWRKU = LDA
-                        IR = IU + LDWRKU*M
-                        LDWRKR = M
+                        IR = IU + LDWRKU*N
+                        LDWRKR = N
                      ELSE
 *
-*                       WORK(IU) is M by M and WORK(IR) is M by M
+*                       WORK(IU) is N by N and WORK(IR) is N by N
 *
-                        LDWRKU = M
-                        IR = IU + LDWRKU*M
-                        LDWRKR = M
+                        LDWRKU = N
+                        IR = IU + LDWRKU*N
+                        LDWRKR = N
                      END IF
-                     ITAU = IR + LDWRKR*M
-                     IWORK = ITAU + M
+                     ITAU = IR + LDWRKR*N
+                     IWORK = ITAU + N
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB)
+*                    Compute A=Q*R
+*                    (CWorkspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need 2*M*M+M+N, prefer 2*M*M+M+N*NB)
-*                    (RWorkspace: 0)
+*                    Copy R to WORK(IU), zeroing out below it
 *
-                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            WORK( IU+1 ), LDWRKU )
 *
-*                    Copy L to WORK(IU), zeroing out above it
+*                    Generate Q in A
+*                    (CWorkspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB)
+*                    (RWorkspace: 0)
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            WORK( IU+LDWRKU ), LDWRKU )
+                     CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IE = 1
                      ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*                    Bidiagonalize L in WORK(IU), copying result to
+*                    Bidiagonalize R in WORK(IU), copying result to
 *                    WORK(IR)
-*                    (CWorkspace: need   2*M*M+3*M,
-*                                 prefer 2*M*M+2*M+2*M*NB)
-*                    (RWorkspace: need   M)
+*                    (CWorkspace: need   2*N*N+3*N,
+*                                 prefer 2*N*N+2*N+2*N*NB)
+*                    (RWorkspace: need   N)
 *
-                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
+                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
      $                            RWORK( IE ), WORK( ITAUQ ),
      $                            WORK( ITAUP ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU,
+                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU,
      $                            WORK( IR ), LDWRKR )
 *
-*                    Generate right bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need   2*M*M+3*M-1,
-*                                 prefer 2*M*M+2*M+(M-1)*NB)
+*                    Generate left bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need 2*N*N+3*N, prefer 2*N*N+2*N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUP ), WORK( IWORK ),
+                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
 *
-*                    Generate left bidiagonalizing vectors in WORK(IR)
-*                    (CWorkspace: need 2*M*M+3*M, prefer 2*M*M+2*M+M*NB)
+*                    Generate right bidiagonalizing vectors in WORK(IR)
+*                    (CWorkspace: need   2*N*N+3*N-1,
+*                                 prefer 2*N*N+2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, WORK( IR ), LDWRKR,
-     $                            WORK( ITAUQ ), WORK( IWORK ),
+                     CALL ZUNGBR( 'P', N, N, N, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUP ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     IRWORK = IE + N
 *
 *                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of L in WORK(IR) and computing
-*                    right singular vectors of L in WORK(IU)
-*                    (CWorkspace: need 2*M*M)
+*                    singular vectors of R in WORK(IU) and computing
+*                    right singular vectors of R in WORK(IR)
+*                    (CWorkspace: need 2*N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
-     $                            WORK( IU ), LDWRKU, WORK( IR ),
-     $                            LDWRKR, CDUM, 1, RWORK( IRWORK ),
+                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
+     $                            WORK( IR ), LDWRKR, WORK( IU ),
+     $                            LDWRKU, CDUM, 1, RWORK( IRWORK ),
      $                            INFO )
 *
-*                    Multiply right singular vectors of L in WORK(IU) by
-*                    Q in VT, storing result in A
-*                    (CWorkspace: need M*M)
+*                    Multiply Q in A by left singular vectors of R in
+*                    WORK(IU), storing result in U
+*                    (CWorkspace: need N*N)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
-     $                           LDWRKU, VT, LDVT, CZERO, A, LDA )
-*
-*                    Copy right singular vectors of A from A to VT
-*
-                     CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
+     $                           WORK( IU ), LDWRKU, CZERO, U, LDU )
 *
-*                    Copy left singular vectors of A from WORK(IR) to A
+*                    Copy right singular vectors of R to A
+*                    (CWorkspace: need N*N)
+*                    (RWorkspace: 0)
 *
-                     CALL ZLACPY( 'F', M, M, WORK( IR ), LDWRKR, A,
+                     CALL ZLACPY( 'F', N, N, WORK( IR ), LDWRKR, A,
      $                            LDA )
 *
                   ELSE
@@ -9044,226 +11616,222 @@
 *                    Insufficient workspace for a fast algorithm
 *
                      ITAU = 1
-                     IWORK = ITAU + M
+                     IWORK = ITAU + N
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need M+N, prefer M+N*NB)
+*                    Generate Q in U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+                     CALL ZUNGQR( M, N, N, U, LDU, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IE = 1
                      ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*                    Zero out above L in A
+*                    Zero out below R in A
 *
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            A( 1, 2 ), LDA )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            A( 2, 1 ), LDA )
 *
-*                    Bidiagonalize L in A
-*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                    Bidiagonalize R in A
+*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
      $                            WORK( ITAUQ ), WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*                    Multiply right bidiagonalizing vectors in A by Q
-*                    in VT
-*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    Multiply Q in U by left vectors bidiagonalizing R
+*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
-     $                            WORK( ITAUP ), VT, LDVT,
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
+     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*                    Generate left bidiagonalizing vectors in A
-*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                    Generate right vectors bidiagonalizing R in A
+*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     IRWORK = IE + N
 *
 *                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of A in A and computing right
-*                    singular vectors of A in VT
+*                    singular vectors of A in U and computing right
+*                    singular vectors of A in A
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
-     $                            LDVT, A, LDA, CDUM, 1,
-     $                            RWORK( IRWORK ), INFO )
+                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), A,
+     $                            LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
                   END IF
 *
-               ELSE IF( WNTUAS ) THEN
+               ELSE IF( WNTVAS ) THEN
 *
-*                 Path 9t(N much larger than M, JOBU='S' or 'A',
-*                         JOBVT='A')
-*                 N right singular vectors to be computed in VT and
-*                 M left singular vectors to be computed in U
+*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S'
+*                         or 'A')
+*                 N left singular vectors to be computed in U and
+*                 N right singular vectors to be computed in VT
 *
-                  IF( LWORK.GE.M*M+MAX( N+M, 3*M ) ) THEN
+                  IF( LWORK.GE.N*N+3*N ) THEN
 *
 *                    Sufficient workspace for a fast algorithm
 *
                      IU = 1
-                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
+                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
 *
-*                       WORK(IU) is LDA by M
+*                       WORK(IU) is LDA by N
 *
                         LDWRKU = LDA
                      ELSE
 *
-*                       WORK(IU) is M by M
+*                       WORK(IU) is N by N
 *
-                        LDWRKU = M
+                        LDWRKU = N
                      END IF
-                     ITAU = IU + LDWRKU*M
-                     IWORK = ITAU + M
+                     ITAU = IU + LDWRKU*N
+                     IWORK = ITAU + N
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    Compute A=Q*R
+*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need M*M+M+N, prefer M*M+M+N*NB)
-*                    (RWorkspace: 0)
+*                    Copy R to WORK(IU), zeroing out below it
 *
-                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            WORK( IU+1 ), LDWRKU )
 *
-*                    Copy L to WORK(IU), zeroing out above it
+*                    Generate Q in A
+*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                    (RWorkspace: 0)
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
-     $                            LDWRKU )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            WORK( IU+LDWRKU ), LDWRKU )
+                     CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
                      IE = 1
                      ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*                    Bidiagonalize L in WORK(IU), copying result to U
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                    Bidiagonalize R in WORK(IU), copying result to VT
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
+                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
      $                            RWORK( IE ), WORK( ITAUQ ),
      $                            WORK( ITAUP ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU, U,
-     $                            LDU )
+                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU, VT,
+     $                            LDVT )
 *
-*                    Generate right bidiagonalizing vectors in WORK(IU)
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+(M-1)*NB)
+*                    Generate left bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
-     $                            WORK( ITAUP ), WORK( IWORK ),
+                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
      $                            LWORK-IWORK+1, IERR )
 *
-*                    Generate left bidiagonalizing vectors in U
-*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*                    Generate right bidiagonalizing vectors in VT
+*                    (CWorkspace: need   N*N+3*N-1,
+*                                 prefer N*N+2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     IRWORK = IE + N
 *
 *                    Perform bidiagonal QR iteration, computing left
-*                    singular vectors of L in U and computing right
-*                    singular vectors of L in WORK(IU)
-*                    (CWorkspace: need M*M)
+*                    singular vectors of R in WORK(IU) and computing
+*                    right singular vectors of R in VT
+*                    (CWorkspace: need N*N)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
-     $                            WORK( IU ), LDWRKU, U, LDU, CDUM, 1,
+                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+     $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
-*                    Multiply right singular vectors of L in WORK(IU) by
-*                    Q in VT, storing result in A
-*                    (CWorkspace: need M*M)
+*                    Multiply Q in A by left singular vectors of R in
+*                    WORK(IU), storing result in U
+*                    (CWorkspace: need N*N)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
-     $                           LDWRKU, VT, LDVT, CZERO, A, LDA )
-*
-*                    Copy right singular vectors of A from A to VT
-*
-                     CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA,
+     $                           WORK( IU ), LDWRKU, CZERO, U, LDU )
 *
                   ELSE
 *
 *                    Insufficient workspace for a fast algorithm
 *
                      ITAU = 1
-                     IWORK = ITAU + M
+                     IWORK = ITAU + N
 *
-*                    Compute A=L*Q, copying result to VT
-*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-*                    Generate Q in VT
-*                    (CWorkspace: need M+N, prefer M+N*NB)
+*                    Generate Q in U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+                     CALL ZUNGQR( M, N, N, U, LDU, WORK( ITAU ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*                    Copy L to U, zeroing out above it
+*                    Copy R to VT, zeroing out below it
 *
-                     CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                            U( 1, 2 ), LDU )
+                     CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+                     IF( N.GT.1 )
+     $                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                               VT( 2, 1 ), LDVT )
                      IE = 1
                      ITAUQ = ITAU
-                     ITAUP = ITAUQ + M
-                     IWORK = ITAUP + M
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*                    Bidiagonalize L in U
-*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*                    (RWorkspace: need M)
+*                    Bidiagonalize R in VT
+*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-                     CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
+                     CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
      $                            WORK( ITAUQ ), WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*                    Multiply right bidiagonalizing vectors in U by Q
+*                    Multiply Q in U by left bidiagonalizing vectors
 *                    in VT
-*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, U, LDU,
-     $                            WORK( ITAUP ), VT, LDVT,
-     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, VT, LDVT,
+     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*                    Generate left bidiagonalizing vectors in U
-*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                    Generate right bidiagonalizing vectors in VT
+*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
 *                    (RWorkspace: 0)
 *
-                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
      $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
-                     IRWORK = IE + M
+                     IRWORK = IE + N
 *
 *                    Perform bidiagonal QR iteration, computing left
 *                    singular vectors of A in U and computing right
@@ -9271,7 +11839,7 @@
 *                    (CWorkspace: 0)
 *                    (RWorkspace: need BDSPAC)
 *
-                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
      $                            LDVT, U, LDU, CDUM, 1,
      $                            RWORK( IRWORK ), INFO )
 *
@@ -9279,3154 +11847,2171 @@
 *
                END IF
 *
-            END IF
+            ELSE IF( WNTUA ) THEN
 *
-         ELSE
+               IF( WNTVN ) THEN
 *
-*           N .LT. MNTHR
+*                 Path 7 (M much larger than N, JOBU='A', JOBVT='N')
+*                 M left singular vectors to be computed in U and
+*                 no right singular vectors to be computed
 *
-*           Path 10t(N greater than M, but not much larger)
-*           Reduce to bidiagonal form without LQ decomposition
+                  IF( LWORK.GE.N*N+MAX( N+M, 3*N ) ) THEN
 *
-            IE = 1
-            ITAUQ = 1
-            ITAUP = ITAUQ + M
-            IWORK = ITAUP + M
+*                    Sufficient workspace for a fast algorithm
 *
-*           Bidiagonalize A
-*           (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
-*           (RWorkspace: M)
+                     IR = 1
+                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
 *
-            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                   WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
-     $                   IERR )
-            IF( WNTUAS ) THEN
+*                       WORK(IR) is LDA by N
 *
-*              If left singular vectors desired in U, copy result to U
-*              and generate left bidiagonalizing vectors in U
-*              (CWorkspace: need 3*M-1, prefer 2*M+(M-1)*NB)
-*              (RWorkspace: 0)
+                        LDWRKR = LDA
+                     ELSE
 *
-               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IF( WNTVAS ) THEN
+*                       WORK(IR) is N by N
 *
-*              If right singular vectors desired in VT, copy result to
-*              VT and generate right bidiagonalizing vectors in VT
-*              (CWorkspace: need 2*M+NRVT, prefer 2*M+NRVT*NB)
-*              (RWorkspace: 0)
+                        LDWRKR = N
+                     END IF
+                     ITAU = IR + LDWRKR*N
+                     IWORK = ITAU + N
 *
-               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
-               IF( WNTVA )
-     $            NRVT = N
-               IF( WNTVS )
-     $            NRVT = M
-               CALL ZUNGBR( 'P', NRVT, N, M, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IF( WNTUO ) THEN
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                    (RWorkspace: 0)
 *
-*              If left singular vectors desired in A, generate left
-*              bidiagonalizing vectors in A
-*              (CWorkspace: need 3*M-1, prefer 2*M+(M-1)*NB)
-*              (RWorkspace: 0)
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-               CALL ZUNGBR( 'Q', M, M, N, A, LDA, WORK( ITAUQ ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IF( WNTVO ) THEN
+*                    Copy R to WORK(IR), zeroing out below it
 *
-*              If right singular vectors desired in A, generate right
-*              bidiagonalizing vectors in A
-*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*              (RWorkspace: 0)
+                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ),
+     $                            LDWRKR )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            WORK( IR+1 ), LDWRKR )
 *
-               CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
-     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
-            END IF
-            IRWORK = IE + M
-            IF( WNTUAS .OR. WNTUO )
-     $         NRU = M
-            IF( WNTUN )
-     $         NRU = 0
-            IF( WNTVAS .OR. WNTVO )
-     $         NCVT = N
-            IF( WNTVN )
-     $         NCVT = 0
-            IF( ( .NOT.WNTUO ) .AND. ( .NOT.WNTVO ) ) THEN
+*                    Generate Q in U
+*                    (CWorkspace: need N*N+N+M, prefer N*N+N+M*NB)
+*                    (RWorkspace: 0)
 *
-*              Perform bidiagonal QR iteration, if desired, computing
-*              left singular vectors in U and computing right singular
-*              vectors in VT
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-               CALL ZBDSQR( 'L', M, NCVT, NRU, 0, S, RWORK( IE ), VT,
-     $                      LDVT, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                      INFO )
-            ELSE IF( ( .NOT.WNTUO ) .AND. WNTVO ) THEN
+*                    Bidiagonalize R in WORK(IR)
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-*              Perform bidiagonal QR iteration, if desired, computing
-*              left singular vectors in U and computing right singular
-*              vectors in A
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+                     CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-               CALL ZBDSQR( 'L', M, NCVT, NRU, 0, S, RWORK( IE ), A,
-     $                      LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
-     $                      INFO )
-            ELSE
+*                    Generate left bidiagonalizing vectors in WORK(IR)
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*                    (RWorkspace: 0)
 *
-*              Perform bidiagonal QR iteration, if desired, computing
-*              left singular vectors in A and computing right singular
-*              vectors in VT
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAC)
+                     CALL ZUNGBR( 'Q', N, N, N, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-               CALL ZBDSQR( 'L', M, NCVT, NRU, 0, S, RWORK( IE ), VT,
-     $                      LDVT, A, LDA, CDUM, 1, RWORK( IRWORK ),
-     $                      INFO )
-            END IF
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of R in WORK(IR)
+*                    (CWorkspace: need N*N)
+*                    (RWorkspace: need BDSPAC)
 *
-         END IF
+                     CALL ZBDSQR( 'U', N, 0, N, 0, S, RWORK( IE ), CDUM,
+     $                            1, WORK( IR ), LDWRKR, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-      END IF
+*                    Multiply Q in U by left singular vectors of R in
+*                    WORK(IR), storing result in A
+*                    (CWorkspace: need N*N)
+*                    (RWorkspace: 0)
 *
-*     Undo scaling if necessary
+                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
+     $                           WORK( IR ), LDWRKR, CZERO, A, LDA )
 *
-      IF( ISCL.EQ.1 ) THEN
-         IF( ANRM.GT.BIGNUM )
-     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
-     $                   IERR )
-         IF( INFO.NE.0 .AND. ANRM.GT.BIGNUM )
-     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1,
-     $                   RWORK( IE ), MINMN, IERR )
-         IF( ANRM.LT.SMLNUM )
-     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
-     $                   IERR )
-         IF( INFO.NE.0 .AND. ANRM.LT.SMLNUM )
-     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1,
-     $                   RWORK( IE ), MINMN, IERR )
-      END IF
+*                    Copy left singular vectors of A from A to U
 *
-*     Return optimal workspace in WORK(1)
+                     CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
 *
-      WORK( 1 ) = MAXWRK
+                  ELSE
 *
-      RETURN
+*                    Insufficient workspace for a fast algorithm
 *
-*     End of ZGESVD
+                     ITAU = 1
+                     IWORK = ITAU + N
 *
-      END
-*> \brief \b ZGETF2 computes the LU factorization of a general m-by-n matrix using partial pivoting with row interchanges (unblocked algorithm).
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
+*                    (RWorkspace: 0)
 *
-*  =========== DOCUMENTATION ===========
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                    Generate Q in U
+*                    (CWorkspace: need N+M, prefer N+M*NB)
+*                    (RWorkspace: 0)
 *
-*> \htmlonly
-*> Download ZGETF2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetf2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetf2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetf2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*  Definition:
-*  ===========
+*                    Zero out below R in A
 *
-*       SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, M, N
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            IPIV( * )
-*       COMPLEX*16         A( LDA, * )
-*       ..
-*  
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            A( 2, 1 ), LDA )
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZGETF2 computes an LU factorization of a general m-by-n matrix A
-*> using partial pivoting with row interchanges.
-*>
-*> The factorization has the form
-*>    A = P * L * U
-*> where P is a permutation matrix, L is lower triangular with unit
-*> diagonal elements (lower trapezoidal if m > n), and U is upper
-*> triangular (upper trapezoidal if m < n).
-*>
-*> This is the right-looking Level 2 BLAS version of the algorithm.
-*> \endverbatim
+*                    Bidiagonalize R in A
+*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-*  Arguments:
-*  ==========
+                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the m by n matrix to be factored.
-*>          On exit, the factors L and U from the factorization
-*>          A = P*L*U; the unit diagonal elements of L are not stored.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] IPIV
-*> \verbatim
-*>          IPIV is INTEGER array, dimension (min(M,N))
-*>          The pivot indices; for 1 <= i <= min(M,N), row i of the
-*>          matrix was interchanged with row IPIV(i).
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, U(k,k) is exactly zero. The factorization
-*>               has been completed, but the factor U is exactly
-*>               singular, and division by zero will occur if it is used
-*>               to solve a system of equations.
-*> \endverbatim
+*                    Multiply Q in U by left bidiagonalizing vectors
+*                    in A
+*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
+*                    (RWorkspace: 0)
 *
-*  Authors:
-*  ========
+                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
+     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in U
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-*> \date September 2012
+                     CALL ZBDSQR( 'U', N, 0, M, 0, S, RWORK( IE ), CDUM,
+     $                            1, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
-*> \ingroup complex16GEcomputational
+                  END IF
 *
-*  =====================================================================
-      SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
+               ELSE IF( WNTVO ) THEN
 *
-*  -- LAPACK computational routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*                 Path 8 (M much larger than N, JOBU='A', JOBVT='O')
+*                 M left singular vectors to be computed in U and
+*                 N right singular vectors to be overwritten on A
 *
-*     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, M, N
-*     ..
-*     .. Array Arguments ..
-      INTEGER            IPIV( * )
-      COMPLEX*16         A( LDA, * )
-*     ..
+                  IF( LWORK.GE.2*N*N+MAX( N+M, 3*N ) ) THEN
 *
-*  =====================================================================
+*                    Sufficient workspace for a fast algorithm
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      DOUBLE PRECISION   SFMIN
-      INTEGER            I, J, JP
-*     ..
-*     .. External Functions ..
-      DOUBLE PRECISION   DLAMCH
-      INTEGER            IZAMAX
-      EXTERNAL           DLAMCH, IZAMAX
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGERU, ZSCAL, ZSWAP
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. Executable Statements ..
+                     IU = 1
+                     IF( LWORK.GE.WRKBL+2*LDA*N ) THEN
 *
-*     Test the input parameters.
+*                       WORK(IU) is LDA by N and WORK(IR) is LDA by N
 *
-      INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -4
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGETF2', -INFO )
-         RETURN
-      END IF
+                        LDWRKU = LDA
+                        IR = IU + LDWRKU*N
+                        LDWRKR = LDA
+                     ELSE IF( LWORK.GE.WRKBL+( LDA+N )*N ) THEN
 *
-*     Quick return if possible
+*                       WORK(IU) is LDA by N and WORK(IR) is N by N
 *
-      IF( M.EQ.0 .OR. N.EQ.0 )
-     $   RETURN
+                        LDWRKU = LDA
+                        IR = IU + LDWRKU*N
+                        LDWRKR = N
+                     ELSE
 *
-*     Compute machine safe minimum
+*                       WORK(IU) is N by N and WORK(IR) is N by N
 *
-      SFMIN = DLAMCH('S') 
+                        LDWRKU = N
+                        IR = IU + LDWRKU*N
+                        LDWRKR = N
+                     END IF
+                     ITAU = IR + LDWRKR*N
+                     IWORK = ITAU + N
 *
-      DO 10 J = 1, MIN( M, N )
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB)
+*                    (RWorkspace: 0)
 *
-*        Find pivot and test for singularity.
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-         JP = J - 1 + IZAMAX( M-J+1, A( J, J ), 1 )
-         IPIV( J ) = JP
-         IF( A( JP, J ).NE.ZERO ) THEN
+*                    Generate Q in U
+*                    (CWorkspace: need 2*N*N+N+M, prefer 2*N*N+N+M*NB)
+*                    (RWorkspace: 0)
 *
-*           Apply the interchange to columns 1:N.
+                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-            IF( JP.NE.J )
-     $         CALL ZSWAP( N, A( J, 1 ), LDA, A( JP, 1 ), LDA )
+*                    Copy R to WORK(IU), zeroing out below it
 *
-*           Compute elements J+1:M of J-th column.
+                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            WORK( IU+1 ), LDWRKU )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-            IF( J.LT.M ) THEN
-               IF( ABS(A( J, J )) .GE. SFMIN ) THEN
-                  CALL ZSCAL( M-J, ONE / A( J, J ), A( J+1, J ), 1 )
-               ELSE
-                  DO 20 I = 1, M-J
-                     A( J+I, J ) = A( J+I, J ) / A( J, J )
-   20             CONTINUE
-               END IF
-            END IF
+*                    Bidiagonalize R in WORK(IU), copying result to
+*                    WORK(IR)
+*                    (CWorkspace: need   2*N*N+3*N,
+*                                 prefer 2*N*N+2*N+2*N*NB)
+*                    (RWorkspace: need   N)
 *
-         ELSE IF( INFO.EQ.0 ) THEN
+                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU,
+     $                            WORK( IR ), LDWRKR )
 *
-            INFO = J
-         END IF
+*                    Generate left bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need 2*N*N+3*N, prefer 2*N*N+2*N+N*NB)
+*                    (RWorkspace: 0)
 *
-         IF( J.LT.MIN( M, N ) ) THEN
+                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*           Update trailing submatrix.
+*                    Generate right bidiagonalizing vectors in WORK(IR)
+*                    (CWorkspace: need   2*N*N+3*N-1,
+*                                 prefer 2*N*N+2*N+(N-1)*NB)
+*                    (RWorkspace: 0)
 *
-            CALL ZGERU( M-J, N-J, -ONE, A( J+1, J ), 1, A( J, J+1 ),
-     $                  LDA, A( J+1, J+1 ), LDA )
-         END IF
-   10 CONTINUE
-      RETURN
+                     CALL ZUNGBR( 'P', N, N, N, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-*     End of ZGETF2
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of R in WORK(IU) and computing
+*                    right singular vectors of R in WORK(IR)
+*                    (CWorkspace: need 2*N*N)
+*                    (RWorkspace: need BDSPAC)
 *
-      END
-*> \brief \b ZGETRF
+                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ),
+     $                            WORK( IR ), LDWRKR, WORK( IU ),
+     $                            LDWRKU, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
-*  =========== DOCUMENTATION ===========
+*                    Multiply Q in U by left singular vectors of R in
+*                    WORK(IU), storing result in A
+*                    (CWorkspace: need N*N)
+*                    (RWorkspace: 0)
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
+     $                           WORK( IU ), LDWRKU, CZERO, A, LDA )
 *
-*> \htmlonly
-*> Download ZGETRF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetrf.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetrf.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetrf.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*                    Copy left singular vectors of A from A to U
 *
-*  Definition:
-*  ===========
+                     CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
 *
-*       SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, M, N
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            IPIV( * )
-*       COMPLEX*16         A( LDA, * )
-*       ..
-*  
+*                    Copy right singular vectors of R from WORK(IR) to A
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZGETRF computes an LU factorization of a general M-by-N matrix A
-*> using partial pivoting with row interchanges.
-*>
-*> The factorization has the form
-*>    A = P * L * U
-*> where P is a permutation matrix, L is lower triangular with unit
-*> diagonal elements (lower trapezoidal if m > n), and U is upper
-*> triangular (upper trapezoidal if m < n).
-*>
-*> This is the right-looking Level 3 BLAS version of the algorithm.
-*> \endverbatim
+                     CALL ZLACPY( 'F', N, N, WORK( IR ), LDWRKR, A,
+     $                            LDA )
 *
-*  Arguments:
-*  ==========
+                  ELSE
 *
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix to be factored.
-*>          On exit, the factors L and U from the factorization
-*>          A = P*L*U; the unit diagonal elements of L are not stored.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] IPIV
-*> \verbatim
-*>          IPIV is INTEGER array, dimension (min(M,N))
-*>          The pivot indices; for 1 <= i <= min(M,N), row i of the
-*>          matrix was interchanged with row IPIV(i).
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, U(i,i) is exactly zero. The factorization
-*>                has been completed, but the factor U is exactly
-*>                singular, and division by zero will occur if it is used
-*>                to solve a system of equations.
-*> \endverbatim
+*                    Insufficient workspace for a fast algorithm
 *
-*  Authors:
-*  ========
+                     ITAU = 1
+                     IWORK = ITAU + N
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
+*                    (RWorkspace: 0)
 *
-*> \date November 2011
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-*> \ingroup complex16GEcomputational
+*                    Generate Q in U
+*                    (CWorkspace: need N+M, prefer N+M*NB)
+*                    (RWorkspace: 0)
 *
-*  =====================================================================
-      SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
+                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*                    Zero out below R in A
 *
-*     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, M, N
-*     ..
-*     .. Array Arguments ..
-      INTEGER            IPIV( * )
-      COMPLEX*16         A( LDA, * )
-*     ..
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            A( 2, 1 ), LDA )
 *
-*  =====================================================================
+*                    Bidiagonalize R in A
+*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, IINFO, J, JB, NB
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZGETF2, ZLASWP, ZTRSM
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. Executable Statements ..
+                     CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*     Test the input parameters.
+*                    Multiply Q in U by left bidiagonalizing vectors
+*                    in A
+*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
+*                    (RWorkspace: 0)
 *
-      INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -4
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGETRF', -INFO )
-         RETURN
-      END IF
+                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, A, LDA,
+     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*     Quick return if possible
+*                    Generate right bidiagonalizing vectors in A
+*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
+*                    (RWorkspace: 0)
 *
-      IF( M.EQ.0 .OR. N.EQ.0 )
-     $   RETURN
+                     CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-*     Determine the block size for this environment.
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in U and computing right
+*                    singular vectors of A in A
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-      NB = ILAENV( 1, 'ZGETRF', ' ', M, N, -1, -1 )
-      IF( NB.LE.1 .OR. NB.GE.MIN( M, N ) ) THEN
+                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), A,
+     $                            LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
-*        Use unblocked code.
+                  END IF
 *
-         CALL ZGETF2( M, N, A, LDA, IPIV, INFO )
-      ELSE
+               ELSE IF( WNTVAS ) THEN
 *
-*        Use blocked code.
+*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S'
+*                         or 'A')
+*                 M left singular vectors to be computed in U and
+*                 N right singular vectors to be computed in VT
 *
-         DO 20 J = 1, MIN( M, N ), NB
-            JB = MIN( MIN( M, N )-J+1, NB )
+                  IF( LWORK.GE.N*N+MAX( N+M, 3*N ) ) THEN
 *
-*           Factor diagonal and subdiagonal blocks and test for exact
-*           singularity.
+*                    Sufficient workspace for a fast algorithm
 *
-            CALL ZGETF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
+                     IU = 1
+                     IF( LWORK.GE.WRKBL+LDA*N ) THEN
 *
-*           Adjust INFO and the pivot indices.
+*                       WORK(IU) is LDA by N
 *
-            IF( INFO.EQ.0 .AND. IINFO.GT.0 )
-     $         INFO = IINFO + J - 1
-            DO 10 I = J, MIN( M, J+JB-1 )
-               IPIV( I ) = J - 1 + IPIV( I )
-   10       CONTINUE
+                        LDWRKU = LDA
+                     ELSE
 *
-*           Apply interchanges to columns 1:J-1.
+*                       WORK(IU) is N by N
 *
-            CALL ZLASWP( J-1, A, LDA, J, J+JB-1, IPIV, 1 )
+                        LDWRKU = N
+                     END IF
+                     ITAU = IU + LDWRKU*N
+                     IWORK = ITAU + N
 *
-            IF( J+JB.LE.N ) THEN
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
+*                    (RWorkspace: 0)
 *
-*              Apply interchanges to columns J+JB:N.
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-               CALL ZLASWP( N-J-JB+1, A( 1, J+JB ), LDA, J, J+JB-1,
-     $                      IPIV, 1 )
+*                    Generate Q in U
+*                    (CWorkspace: need N*N+N+M, prefer N*N+N+M*NB)
+*                    (RWorkspace: 0)
 *
-*              Compute block row of U.
+                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-               CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
-     $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
-     $                     LDA )
-               IF( J+JB.LE.M ) THEN
+*                    Copy R to WORK(IU), zeroing out below it
 *
-*                 Update trailing submatrix.
+                     CALL ZLACPY( 'U', N, N, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                            WORK( IU+1 ), LDWRKU )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M-J-JB+1,
-     $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
-     $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
-     $                        LDA )
-               END IF
-            END IF
-   20    CONTINUE
-      END IF
-      RETURN
+*                    Bidiagonalize R in WORK(IU), copying result to VT
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-*     End of ZGETRF
+                     CALL ZGEBRD( N, N, WORK( IU ), LDWRKU, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', N, N, WORK( IU ), LDWRKU, VT,
+     $                            LDVT )
 *
-      END
-*> \brief \b ZGETRS
+*                    Generate left bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
+*                    (RWorkspace: 0)
 *
-*  =========== DOCUMENTATION ===========
+                     CALL ZUNGBR( 'Q', N, N, N, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                    Generate right bidiagonalizing vectors in VT
+*                    (CWorkspace: need   N*N+3*N-1,
+*                                 prefer N*N+2*N+(N-1)*NB)
+*                    (RWorkspace: need   0)
 *
-*> \htmlonly
-*> Download ZGETRS + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetrs.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetrs.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetrs.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-*  Definition:
-*  ===========
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of R in WORK(IU) and computing
+*                    right singular vectors of R in VT
+*                    (CWorkspace: need N*N)
+*                    (RWorkspace: need BDSPAC)
 *
-*       SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          TRANS
-*       INTEGER            INFO, LDA, LDB, N, NRHS
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            IPIV( * )
-*       COMPLEX*16         A( LDA, * ), B( LDB, * )
-*       ..
-*  
+                     CALL ZBDSQR( 'U', N, N, N, 0, S, RWORK( IE ), VT,
+     $                            LDVT, WORK( IU ), LDWRKU, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZGETRS solves a system of linear equations
-*>    A * X = B,  A**T * X = B,  or  A**H * X = B
-*> with a general N-by-N matrix A using the LU factorization computed
-*> by ZGETRF.
-*> \endverbatim
+*                    Multiply Q in U by left singular vectors of R in
+*                    WORK(IU), storing result in A
+*                    (CWorkspace: need N*N)
+*                    (RWorkspace: 0)
 *
-*  Arguments:
-*  ==========
+                     CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU,
+     $                           WORK( IU ), LDWRKU, CZERO, A, LDA )
 *
-*> \param[in] TRANS
-*> \verbatim
-*>          TRANS is CHARACTER*1
-*>          Specifies the form of the system of equations:
-*>          = 'N':  A * X = B     (No transpose)
-*>          = 'T':  A**T * X = B  (Transpose)
-*>          = 'C':  A**H * X = B  (Conjugate transpose)
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in] NRHS
-*> \verbatim
-*>          NRHS is INTEGER
-*>          The number of right hand sides, i.e., the number of columns
-*>          of the matrix B.  NRHS >= 0.
-*> \endverbatim
-*>
-*> \param[in] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The factors L and U from the factorization A = P*L*U
-*>          as computed by ZGETRF.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[in] IPIV
-*> \verbatim
-*>          IPIV is INTEGER array, dimension (N)
-*>          The pivot indices from ZGETRF; for 1<=i<=N, row i of the
-*>          matrix was interchanged with row IPIV(i).
-*> \endverbatim
-*>
-*> \param[in,out] B
-*> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
-*>          On entry, the right hand side matrix B.
-*>          On exit, the solution matrix X.
-*> \endverbatim
-*>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B.  LDB >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*> \endverbatim
+*                    Copy left singular vectors of A from A to U
 *
-*  Authors:
-*  ========
+                     CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+                  ELSE
 *
-*> \date November 2011
+*                    Insufficient workspace for a fast algorithm
 *
-*> \ingroup complex16GEcomputational
+                     ITAU = 1
+                     IWORK = ITAU + N
 *
-*  =====================================================================
-      SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
+*                    Compute A=Q*R, copying result to U
+*                    (CWorkspace: need 2*N, prefer N+N*NB)
+*                    (RWorkspace: 0)
 *
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+                     CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
 *
-*     .. Scalar Arguments ..
-      CHARACTER          TRANS
-      INTEGER            INFO, LDA, LDB, N, NRHS
-*     ..
-*     .. Array Arguments ..
-      INTEGER            IPIV( * )
-      COMPLEX*16         A( LDA, * ), B( LDB, * )
-*     ..
+*                    Generate Q in U
+*                    (CWorkspace: need N+M, prefer N+M*NB)
+*                    (RWorkspace: 0)
 *
-*  =====================================================================
+                     CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            NOTRAN
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLASWP, ZTRSM
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX
-*     ..
-*     .. Executable Statements ..
+*                    Copy R from A to VT, zeroing out below it
 *
-*     Test the input parameters.
+                     CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+                     IF( N.GT.1 )
+     $                  CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO,
+     $                               VT( 2, 1 ), LDVT )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + N
+                     IWORK = ITAUP + N
 *
-      INFO = 0
-      NOTRAN = LSAME( TRANS, 'N' )
-      IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
-     $    LSAME( TRANS, 'C' ) ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( NRHS.LT.0 ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -5
-      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
-         INFO = -8
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGETRS', -INFO )
-         RETURN
-      END IF
+*                    Bidiagonalize R in VT
+*                    (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
+*                    (RWorkspace: need N)
 *
-*     Quick return if possible
+                     CALL ZGEBRD( N, N, VT, LDVT, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-      IF( N.EQ.0 .OR. NRHS.EQ.0 )
-     $   RETURN
+*                    Multiply Q in U by left bidiagonalizing vectors
+*                    in VT
+*                    (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
+*                    (RWorkspace: 0)
 *
-      IF( NOTRAN ) THEN
+                     CALL ZUNMBR( 'Q', 'R', 'N', M, N, N, VT, LDVT,
+     $                            WORK( ITAUQ ), U, LDU, WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*        Solve A * X = B.
+*                    Generate right bidiagonalizing vectors in VT
+*                    (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
+*                    (RWorkspace: 0)
 *
-*        Apply row interchanges to the right hand sides.
+                     CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + N
 *
-         CALL ZLASWP( NRHS, B, LDB, 1, N, IPIV, 1 )
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in U and computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-*        Solve L*X = B, overwriting B with X.
+                     CALL ZBDSQR( 'U', N, N, M, 0, S, RWORK( IE ), VT,
+     $                            LDVT, U, LDU, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-         CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N, NRHS,
-     $               ONE, A, LDA, B, LDB )
+                  END IF
 *
-*        Solve U*X = B, overwriting B with X.
+               END IF
 *
-         CALL ZTRSM( 'Left', 'Upper', 'No transpose', 'Non-unit', N,
-     $               NRHS, ONE, A, LDA, B, LDB )
-      ELSE
+            END IF
 *
-*        Solve A**T * X = B  or A**H * X = B.
+         ELSE
 *
-*        Solve U**T *X = B or U**H *X = B, overwriting B with X.
+*           M .LT. MNTHR
 *
-         CALL ZTRSM( 'Left', 'Upper', TRANS, 'Non-unit', N, NRHS, ONE,
-     $               A, LDA, B, LDB )
+*           Path 10 (M at least N, but not much larger)
+*           Reduce to bidiagonal form without QR decomposition
 *
-*        Solve L**T *X = B, or L**H *X = B overwriting B with X.
+            IE = 1
+            ITAUQ = 1
+            ITAUP = ITAUQ + N
+            IWORK = ITAUP + N
 *
-         CALL ZTRSM( 'Left', 'Lower', TRANS, 'Unit', N, NRHS, ONE, A,
-     $               LDA, B, LDB )
+*           Bidiagonalize A
+*           (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
+*           (RWorkspace: need N)
 *
-*        Apply row interchanges to the solution vectors.
+            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                   WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
+     $                   IERR )
+            IF( WNTUAS ) THEN
 *
-         CALL ZLASWP( NRHS, B, LDB, 1, N, IPIV, -1 )
-      END IF
+*              If left singular vectors desired in U, copy result to U
+*              and generate left bidiagonalizing vectors in U
+*              (CWorkspace: need 2*N+NCU, prefer 2*N+NCU*NB)
+*              (RWorkspace: 0)
 *
-      RETURN
+               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+               IF( WNTUS )
+     $            NCU = N
+               IF( WNTUA )
+     $            NCU = M
+               CALL ZUNGBR( 'Q', M, NCU, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IF( WNTVAS ) THEN
 *
-*     End of ZGETRS
+*              If right singular vectors desired in VT, copy result to
+*              VT and generate right bidiagonalizing vectors in VT
+*              (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
+*              (RWorkspace: 0)
 *
-      END
-*> \brief <b> ZHEEV computes the eigenvalues and, optionally, the left and/or right eigenvectors for HE matrices</b>
+               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
+               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IF( WNTUO ) THEN
 *
-*  =========== DOCUMENTATION ===========
+*              If left singular vectors desired in A, generate left
+*              bidiagonalizing vectors in A
+*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
+*              (RWorkspace: 0)
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+               CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IF( WNTVO ) THEN
 *
-*> \htmlonly
-*> Download ZHEEV + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheev.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zheev.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheev.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*              If right singular vectors desired in A, generate right
+*              bidiagonalizing vectors in A
+*              (CWorkspace: need 3*N-1, prefer 2*N+(N-1)*NB)
+*              (RWorkspace: 0)
 *
-*  Definition:
-*  ===========
+               CALL ZUNGBR( 'P', N, N, N, A, LDA, WORK( ITAUP ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IRWORK = IE + N
+            IF( WNTUAS .OR. WNTUO )
+     $         NRU = M
+            IF( WNTUN )
+     $         NRU = 0
+            IF( WNTVAS .OR. WNTVO )
+     $         NCVT = N
+            IF( WNTVN )
+     $         NCVT = 0
+            IF( ( .NOT.WNTUO ) .AND. ( .NOT.WNTVO ) ) THEN
 *
-*       SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
-*                         INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          JOBZ, UPLO
-*       INTEGER            INFO, LDA, LWORK, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   RWORK( * ), W( * )
-*       COMPLEX*16         A( LDA, * ), WORK( * )
-*       ..
-*  
+*              Perform bidiagonal QR iteration, if desired, computing
+*              left singular vectors in U and computing right singular
+*              vectors in VT
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZHEEV computes all eigenvalues and, optionally, eigenvectors of a
-*> complex Hermitian matrix A.
-*> \endverbatim
+               CALL ZBDSQR( 'U', N, NCVT, NRU, 0, S, RWORK( IE ), VT,
+     $                      LDVT, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                      INFO )
+            ELSE IF( ( .NOT.WNTUO ) .AND. WNTVO ) THEN
 *
-*  Arguments:
-*  ==========
+*              Perform bidiagonal QR iteration, if desired, computing
+*              left singular vectors in U and computing right singular
+*              vectors in A
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
 *
-*> \param[in] JOBZ
-*> \verbatim
-*>          JOBZ is CHARACTER*1
-*>          = 'N':  Compute eigenvalues only;
-*>          = 'V':  Compute eigenvalues and eigenvectors.
-*> \endverbatim
-*>
-*> \param[in] UPLO
-*> \verbatim
-*>          UPLO is CHARACTER*1
-*>          = 'U':  Upper triangle of A is stored;
-*>          = 'L':  Lower triangle of A is stored.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA, N)
-*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the
-*>          leading N-by-N upper triangular part of A contains the
-*>          upper triangular part of the matrix A.  If UPLO = 'L',
-*>          the leading N-by-N lower triangular part of A contains
-*>          the lower triangular part of the matrix A.
-*>          On exit, if JOBZ = 'V', then if INFO = 0, A contains the
-*>          orthonormal eigenvectors of the matrix A.
-*>          If JOBZ = 'N', then on exit the lower triangle (if UPLO='L')
-*>          or the upper triangle (if UPLO='U') of A, including the
-*>          diagonal, is destroyed.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] W
-*> \verbatim
-*>          W is DOUBLE PRECISION array, dimension (N)
-*>          If INFO = 0, the eigenvalues in ascending order.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,2*N-1).
-*>          For optimal efficiency, LWORK >= (NB+1)*N,
-*>          where NB is the blocksize for ZHETRD returned by ILAENV.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
-*> \endverbatim
-*>
-*> \param[out] RWORK
-*> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (max(1, 3*N-2))
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the algorithm failed to converge; i
-*>                off-diagonal elements of an intermediate tridiagonal
-*>                form did not converge to zero.
-*> \endverbatim
+               CALL ZBDSQR( 'U', N, NCVT, NRU, 0, S, RWORK( IE ), A,
+     $                      LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                      INFO )
+            ELSE
 *
-*  Authors:
-*  ========
+*              Perform bidiagonal QR iteration, if desired, computing
+*              left singular vectors in A and computing right singular
+*              vectors in VT
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+               CALL ZBDSQR( 'U', N, NCVT, NRU, 0, S, RWORK( IE ), VT,
+     $                      LDVT, A, LDA, CDUM, 1, RWORK( IRWORK ),
+     $                      INFO )
+            END IF
 *
-*> \date November 2011
+         END IF
 *
-*> \ingroup complex16HEeigen
+      ELSE
 *
-*  =====================================================================
-      SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
-     $                  INFO )
+*        A has more columns than rows. If A has sufficiently more
+*        columns than rows, first reduce using the LQ decomposition (if
+*        sufficient workspace available)
 *
-*  -- LAPACK driver routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+         IF( N.GE.MNTHR ) THEN
 *
-*     .. Scalar Arguments ..
-      CHARACTER          JOBZ, UPLO
-      INTEGER            INFO, LDA, LWORK, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   RWORK( * ), W( * )
-      COMPLEX*16         A( LDA, * ), WORK( * )
-*     ..
+            IF( WNTVN ) THEN
 *
-*  =====================================================================
+*              Path 1t(N much larger than M, JOBVT='N')
+*              No right singular vectors to be computed
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
-      COMPLEX*16         CONE
-      PARAMETER          ( CONE = ( 1.0D0, 0.0D0 ) )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            LOWER, LQUERY, WANTZ
-      INTEGER            IINFO, IMAX, INDE, INDTAU, INDWRK, ISCALE,
-     $                   LLWORK, LWKOPT, NB
-      DOUBLE PRECISION   ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN, SIGMA,
-     $                   SMLNUM
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, ZLANHE
-      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLASCL, ZSTEQR,
-     $                   ZUNGTR
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, SQRT
-*     ..
-*     .. Executable Statements ..
+               ITAU = 1
+               IWORK = ITAU + M
 *
-*     Test the input parameters.
+*              Compute A=L*Q
+*              (CWorkspace: need 2*M, prefer M+M*NB)
+*              (RWorkspace: 0)
 *
-      WANTZ = LSAME( JOBZ, 'V' )
-      LOWER = LSAME( UPLO, 'L' )
-      LQUERY = ( LWORK.EQ.-1 )
+               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( IWORK ),
+     $                      LWORK-IWORK+1, IERR )
 *
-      INFO = 0
-      IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
-         INFO = -1
-      ELSE IF( .NOT.( LOWER .OR. LSAME( UPLO, 'U' ) ) ) THEN
-         INFO = -2
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -5
-      END IF
+*              Zero out above L
 *
-      IF( INFO.EQ.0 ) THEN
-         NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
-         LWKOPT = MAX( 1, ( NB+1 )*N )
-         WORK( 1 ) = LWKOPT
+               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, A( 1, 2 ),
+     $                      LDA )
+               IE = 1
+               ITAUQ = 1
+               ITAUP = ITAUQ + M
+               IWORK = ITAUP + M
 *
-         IF( LWORK.LT.MAX( 1, 2*N-1 ) .AND. .NOT.LQUERY )
-     $      INFO = -8
-      END IF
+*              Bidiagonalize L in A
+*              (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*              (RWorkspace: need M)
 *
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZHEEV ', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         RETURN
-      END IF
+               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                      WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
+     $                      IERR )
+               IF( WNTUO .OR. WNTUAS ) THEN
 *
-*     Quick return if possible
+*                 If left singular vectors desired, generate Q
+*                 (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                 (RWorkspace: 0)
 *
-      IF( N.EQ.0 ) THEN
-         RETURN
-      END IF
+                  CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+               END IF
+               IRWORK = IE + M
+               NRU = 0
+               IF( WNTUO .OR. WNTUAS )
+     $            NRU = M
 *
-      IF( N.EQ.1 ) THEN
-         W( 1 ) = A( 1, 1 )
-         WORK( 1 ) = 1
-         IF( WANTZ )
-     $      A( 1, 1 ) = CONE
-         RETURN
-      END IF
+*              Perform bidiagonal QR iteration, computing left singular
+*              vectors of A in A if desired
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
 *
-*     Get machine constants.
+               CALL ZBDSQR( 'U', M, 0, NRU, 0, S, RWORK( IE ), CDUM, 1,
+     $                      A, LDA, CDUM, 1, RWORK( IRWORK ), INFO )
 *
-      SAFMIN = DLAMCH( 'Safe minimum' )
-      EPS = DLAMCH( 'Precision' )
-      SMLNUM = SAFMIN / EPS
-      BIGNUM = ONE / SMLNUM
-      RMIN = SQRT( SMLNUM )
-      RMAX = SQRT( BIGNUM )
+*              If left singular vectors desired in U, copy them there
 *
-*     Scale matrix to allowable range, if necessary.
+               IF( WNTUAS )
+     $            CALL ZLACPY( 'F', M, M, A, LDA, U, LDU )
 *
-      ANRM = ZLANHE( 'M', UPLO, N, A, LDA, RWORK )
-      ISCALE = 0
-      IF( ANRM.GT.ZERO .AND. ANRM.LT.RMIN ) THEN
-         ISCALE = 1
-         SIGMA = RMIN / ANRM
-      ELSE IF( ANRM.GT.RMAX ) THEN
-         ISCALE = 1
-         SIGMA = RMAX / ANRM
-      END IF
-      IF( ISCALE.EQ.1 )
-     $   CALL ZLASCL( UPLO, 0, 0, ONE, SIGMA, N, N, A, LDA, INFO )
+            ELSE IF( WNTVO .AND. WNTUN ) THEN
 *
-*     Call ZHETRD to reduce Hermitian matrix to tridiagonal form.
+*              Path 2t(N much larger than M, JOBU='N', JOBVT='O')
+*              M right singular vectors to be overwritten on A and
+*              no left singular vectors to be computed
 *
-      INDE = 1
-      INDTAU = 1
-      INDWRK = INDTAU + N
-      LLWORK = LWORK - INDWRK + 1
-      CALL ZHETRD( UPLO, N, A, LDA, W, RWORK( INDE ), WORK( INDTAU ),
-     $             WORK( INDWRK ), LLWORK, IINFO )
+               IF( LWORK.GE.M*M+3*M ) THEN
 *
-*     For eigenvalues only, call DSTERF.  For eigenvectors, first call
-*     ZUNGTR to generate the unitary matrix, then call ZSTEQR.
+*                 Sufficient workspace for a fast algorithm
 *
-      IF( .NOT.WANTZ ) THEN
-         CALL DSTERF( N, W, RWORK( INDE ), INFO )
-      ELSE
-         CALL ZUNGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
-     $                LLWORK, IINFO )
-         INDWRK = INDE + N
-         CALL ZSTEQR( JOBZ, N, W, RWORK( INDE ), A, LDA,
-     $                RWORK( INDWRK ), INFO )
-      END IF
+                  IR = 1
+                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*M ) THEN
 *
-*     If matrix was scaled, then rescale eigenvalues appropriately.
+*                    WORK(IU) is LDA by N and WORK(IR) is LDA by M
 *
-      IF( ISCALE.EQ.1 ) THEN
-         IF( INFO.EQ.0 ) THEN
-            IMAX = N
-         ELSE
-            IMAX = INFO - 1
-         END IF
-         CALL DSCAL( IMAX, ONE / SIGMA, W, 1 )
-      END IF
+                     LDWRKU = LDA
+                     CHUNK = N
+                     LDWRKR = LDA
+                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+M*M ) THEN
 *
-*     Set WORK(1) to optimal complex workspace size.
+*                    WORK(IU) is LDA by N and WORK(IR) is M by M
 *
-      WORK( 1 ) = LWKOPT
+                     LDWRKU = LDA
+                     CHUNK = N
+                     LDWRKR = M
+                  ELSE
 *
-      RETURN
+*                    WORK(IU) is M by CHUNK and WORK(IR) is M by M
 *
-*     End of ZHEEV
+                     LDWRKU = M
+                     CHUNK = ( LWORK-M*M ) / M
+                     LDWRKR = M
+                  END IF
+                  ITAU = IR + LDWRKR*M
+                  IWORK = ITAU + M
 *
-      END
-*> \brief \b ZHETD2 reduces a Hermitian matrix to real symmetric tridiagonal form by an unitary similarity transformation (unblocked algorithm).
+*                 Compute A=L*Q
+*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                 (RWorkspace: 0)
 *
-*  =========== DOCUMENTATION ===========
+                  CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                 Copy L to WORK(IR) and zero out above it
 *
-*> \htmlonly
-*> Download ZHETD2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetd2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhetd2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetd2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                  CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ), LDWRKR )
+                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                         WORK( IR+LDWRKR ), LDWRKR )
 *
-*  Definition:
-*  ===========
+*                 Generate Q in A
+*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                 (RWorkspace: 0)
 *
-*       SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            INFO, LDA, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   D( * ), E( * )
-*       COMPLEX*16         A( LDA, * ), TAU( * )
-*       ..
-*  
+                  CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = ITAU
+                  ITAUP = ITAUQ + M
+                  IWORK = ITAUP + M
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZHETD2 reduces a complex Hermitian matrix A to real symmetric
-*> tridiagonal form T by a unitary similarity transformation:
-*> Q**H * A * Q = T.
-*> \endverbatim
+*                 Bidiagonalize L in WORK(IR)
+*                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*                 (RWorkspace: need M)
 *
-*  Arguments:
-*  ==========
+                  CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*> \param[in] UPLO
-*> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies whether the upper or lower triangular part of the
-*>          Hermitian matrix A is stored:
-*>          = 'U':  Upper triangular
-*>          = 'L':  Lower triangular
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
-*>          n-by-n upper triangular part of A contains the upper
-*>          triangular part of the matrix A, and the strictly lower
-*>          triangular part of A is not referenced.  If UPLO = 'L', the
-*>          leading n-by-n lower triangular part of A contains the lower
-*>          triangular part of the matrix A, and the strictly upper
-*>          triangular part of A is not referenced.
-*>          On exit, if UPLO = 'U', the diagonal and first superdiagonal
-*>          of A are overwritten by the corresponding elements of the
-*>          tridiagonal matrix T, and the elements above the first
-*>          superdiagonal, with the array TAU, represent the unitary
-*>          matrix Q as a product of elementary reflectors; if UPLO
-*>          = 'L', the diagonal and first subdiagonal of A are over-
-*>          written by the corresponding elements of the tridiagonal
-*>          matrix T, and the elements below the first subdiagonal, with
-*>          the array TAU, represent the unitary matrix Q as a product
-*>          of elementary reflectors. See Further Details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] D
-*> \verbatim
-*>          D is DOUBLE PRECISION array, dimension (N)
-*>          The diagonal elements of the tridiagonal matrix T:
-*>          D(i) = A(i,i).
-*> \endverbatim
-*>
-*> \param[out] E
-*> \verbatim
-*>          E is DOUBLE PRECISION array, dimension (N-1)
-*>          The off-diagonal elements of the tridiagonal matrix T:
-*>          E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (N-1)
-*>          The scalar factors of the elementary reflectors (see Further
-*>          Details).
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*> \endverbatim
+*                 Generate right vectors bidiagonalizing L
+*                 (CWorkspace: need M*M+3*M-1, prefer M*M+2*M+(M-1)*NB)
+*                 (RWorkspace: 0)
 *
-*  Authors:
-*  ========
+                  CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
+     $                         WORK( ITAUP ), WORK( IWORK ),
+     $                         LWORK-IWORK+1, IERR )
+                  IRWORK = IE + M
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                 Perform bidiagonal QR iteration, computing right
+*                 singular vectors of L in WORK(IR)
+*                 (CWorkspace: need M*M)
+*                 (RWorkspace: need BDSPAC)
 *
-*> \date September 2012
+                  CALL ZBDSQR( 'U', M, M, 0, 0, S, RWORK( IE ),
+     $                         WORK( IR ), LDWRKR, CDUM, 1, CDUM, 1,
+     $                         RWORK( IRWORK ), INFO )
+                  IU = ITAUQ
 *
-*> \ingroup complex16HEcomputational
+*                 Multiply right singular vectors of L in WORK(IR) by Q
+*                 in A, storing result in WORK(IU) and copying to A
+*                 (CWorkspace: need M*M+M, prefer M*M+M*N)
+*                 (RWorkspace: 0)
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  If UPLO = 'U', the matrix Q is represented as a product of elementary
-*>  reflectors
-*>
-*>     Q = H(n-1) . . . H(2) H(1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in
-*>  A(1:i-1,i+1), and tau in TAU(i).
-*>
-*>  If UPLO = 'L', the matrix Q is represented as a product of elementary
-*>  reflectors
-*>
-*>     Q = H(1) H(2) . . . H(n-1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),
-*>  and tau in TAU(i).
-*>
-*>  The contents of A on exit are illustrated by the following examples
-*>  with n = 5:
-*>
-*>  if UPLO = 'U':                       if UPLO = 'L':
-*>
-*>    (  d   e   v2  v3  v4 )              (  d                  )
-*>    (      d   e   v3  v4 )              (  e   d              )
-*>    (          d   e   v4 )              (  v1  e   d          )
-*>    (              d   e  )              (  v1  v2  e   d      )
-*>    (                  d  )              (  v1  v2  v3  e   d  )
-*>
-*>  where d and e denote diagonal and off-diagonal elements of T, and vi
-*>  denotes an element of the vector defining H(i).
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
+                  DO 30 I = 1, N, CHUNK
+                     BLK = MIN( N-I+1, CHUNK )
+                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
+     $                           LDWRKR, A( 1, I ), LDA, CZERO,
+     $                           WORK( IU ), LDWRKU )
+                     CALL ZLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
+     $                            A( 1, I ), LDA )
+   30             CONTINUE
 *
-*  -- LAPACK computational routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+               ELSE
 *
-*     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            INFO, LDA, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   D( * ), E( * )
-      COMPLEX*16         A( LDA, * ), TAU( * )
-*     ..
+*                 Insufficient workspace for a fast algorithm
 *
-*  =====================================================================
+                  IE = 1
+                  ITAUQ = 1
+                  ITAUP = ITAUQ + M
+                  IWORK = ITAUP + M
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE, ZERO, HALF
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   HALF = ( 0.5D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            UPPER
-      INTEGER            I
-      COMPLEX*16         ALPHA, TAUI
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZAXPY, ZHEMV, ZHER2, ZLARFG
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      COMPLEX*16         ZDOTC
-      EXTERNAL           LSAME, ZDOTC
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, MAX, MIN
-*     ..
-*     .. Executable Statements ..
+*                 Bidiagonalize A
+*                 (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
+*                 (RWorkspace: need M)
 *
-*     Test the input parameters
+                  CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-      INFO = 0
-      UPPER = LSAME( UPLO, 'U')
-      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -4
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZHETD2', -INFO )
-         RETURN
-      END IF
+*                 Generate right vectors bidiagonalizing A
+*                 (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                 (RWorkspace: 0)
 *
-*     Quick return if possible
+                  CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IRWORK = IE + M
 *
-      IF( N.LE.0 )
-     $   RETURN
+*                 Perform bidiagonal QR iteration, computing right
+*                 singular vectors of A in A
+*                 (CWorkspace: 0)
+*                 (RWorkspace: need BDSPAC)
 *
-      IF( UPPER ) THEN
+                  CALL ZBDSQR( 'L', M, N, 0, 0, S, RWORK( IE ), A, LDA,
+     $                         CDUM, 1, CDUM, 1, RWORK( IRWORK ), INFO )
 *
-*        Reduce the upper triangle of A
+               END IF
 *
-         A( N, N ) = DBLE( A( N, N ) )
-         DO 10 I = N - 1, 1, -1
+            ELSE IF( WNTVO .AND. WNTUAS ) THEN
 *
-*           Generate elementary reflector H(i) = I - tau * v * v**H
-*           to annihilate A(1:i-1,i+1)
+*              Path 3t(N much larger than M, JOBU='S' or 'A', JOBVT='O')
+*              M right singular vectors to be overwritten on A and
+*              M left singular vectors to be computed in U
 *
-            ALPHA = A( I, I+1 )
-            CALL ZLARFG( I, ALPHA, A( 1, I+1 ), 1, TAUI )
-            E( I ) = ALPHA
+               IF( LWORK.GE.M*M+3*M ) THEN
 *
-            IF( TAUI.NE.ZERO ) THEN
+*                 Sufficient workspace for a fast algorithm
 *
-*              Apply H(i) from both sides to A(1:i,1:i)
+                  IR = 1
+                  IF( LWORK.GE.MAX( WRKBL, LDA*N )+LDA*M ) THEN
 *
-               A( I, I+1 ) = ONE
+*                    WORK(IU) is LDA by N and WORK(IR) is LDA by M
 *
-*              Compute  x := tau * A * v  storing x in TAU(1:i)
+                     LDWRKU = LDA
+                     CHUNK = N
+                     LDWRKR = LDA
+                  ELSE IF( LWORK.GE.MAX( WRKBL, LDA*N )+M*M ) THEN
 *
-               CALL ZHEMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1, ZERO,
-     $                     TAU, 1 )
+*                    WORK(IU) is LDA by N and WORK(IR) is M by M
 *
-*              Compute  w := x - 1/2 * tau * (x**H * v) * v
+                     LDWRKU = LDA
+                     CHUNK = N
+                     LDWRKR = M
+                  ELSE
 *
-               ALPHA = -HALF*TAUI*ZDOTC( I, TAU, 1, A( 1, I+1 ), 1 )
-               CALL ZAXPY( I, ALPHA, A( 1, I+1 ), 1, TAU, 1 )
+*                    WORK(IU) is M by CHUNK and WORK(IR) is M by M
 *
-*              Apply the transformation as a rank-2 update:
-*                 A := A - v * w**H - w * v**H
+                     LDWRKU = M
+                     CHUNK = ( LWORK-M*M ) / M
+                     LDWRKR = M
+                  END IF
+                  ITAU = IR + LDWRKR*M
+                  IWORK = ITAU + M
 *
-               CALL ZHER2( UPLO, I, -ONE, A( 1, I+1 ), 1, TAU, 1, A,
-     $                     LDA )
+*                 Compute A=L*Q
+*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                 (RWorkspace: 0)
 *
-            ELSE
-               A( I, I ) = DBLE( A( I, I ) )
-            END IF
-            A( I, I+1 ) = E( I )
-            D( I+1 ) = A( I+1, I+1 )
-            TAU( I ) = TAUI
-   10    CONTINUE
-         D( 1 ) = A( 1, 1 )
-      ELSE
+                  CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*        Reduce the lower triangle of A
+*                 Copy L to U, zeroing about above it
 *
-         A( 1, 1 ) = DBLE( A( 1, 1 ) )
-         DO 20 I = 1, N - 1
+                  CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
+     $                         LDU )
 *
-*           Generate elementary reflector H(i) = I - tau * v * v**H
-*           to annihilate A(i+2:n,i)
+*                 Generate Q in A
+*                 (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                 (RWorkspace: 0)
 *
-            ALPHA = A( I+1, I )
-            CALL ZLARFG( N-I, ALPHA, A( MIN( I+2, N ), I ), 1, TAUI )
-            E( I ) = ALPHA
+                  CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = ITAU
+                  ITAUP = ITAUQ + M
+                  IWORK = ITAUP + M
 *
-            IF( TAUI.NE.ZERO ) THEN
+*                 Bidiagonalize L in U, copying result to WORK(IR)
+*                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*                 (RWorkspace: need M)
 *
-*              Apply H(i) from both sides to A(i+1:n,i+1:n)
+                  CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  CALL ZLACPY( 'U', M, M, U, LDU, WORK( IR ), LDWRKR )
 *
-               A( I+1, I ) = ONE
+*                 Generate right vectors bidiagonalizing L in WORK(IR)
+*                 (CWorkspace: need M*M+3*M-1, prefer M*M+2*M+(M-1)*NB)
+*                 (RWorkspace: 0)
 *
-*              Compute  x := tau * A * v  storing y in TAU(i:n-1)
+                  CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
+     $                         WORK( ITAUP ), WORK( IWORK ),
+     $                         LWORK-IWORK+1, IERR )
 *
-               CALL ZHEMV( UPLO, N-I, TAUI, A( I+1, I+1 ), LDA,
-     $                     A( I+1, I ), 1, ZERO, TAU( I ), 1 )
+*                 Generate left vectors bidiagonalizing L in U
+*                 (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*                 (RWorkspace: 0)
 *
-*              Compute  w := x - 1/2 * tau * (x**H * v) * v
+                  CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IRWORK = IE + M
 *
-               ALPHA = -HALF*TAUI*ZDOTC( N-I, TAU( I ), 1, A( I+1, I ),
-     $                 1 )
-               CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, TAU( I ), 1 )
+*                 Perform bidiagonal QR iteration, computing left
+*                 singular vectors of L in U, and computing right
+*                 singular vectors of L in WORK(IR)
+*                 (CWorkspace: need M*M)
+*                 (RWorkspace: need BDSPAC)
 *
-*              Apply the transformation as a rank-2 update:
-*                 A := A - v * w**H - w * v**H
+                  CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
+     $                         WORK( IR ), LDWRKR, U, LDU, CDUM, 1,
+     $                         RWORK( IRWORK ), INFO )
+                  IU = ITAUQ
 *
-               CALL ZHER2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ), 1,
-     $                     A( I+1, I+1 ), LDA )
+*                 Multiply right singular vectors of L in WORK(IR) by Q
+*                 in A, storing result in WORK(IU) and copying to A
+*                 (CWorkspace: need M*M+M, prefer M*M+M*N))
+*                 (RWorkspace: 0)
 *
-            ELSE
-               A( I+1, I+1 ) = DBLE( A( I+1, I+1 ) )
-            END IF
-            A( I+1, I ) = E( I )
-            D( I ) = A( I, I )
-            TAU( I ) = TAUI
-   20    CONTINUE
-         D( N ) = A( N, N )
-      END IF
+                  DO 40 I = 1, N, CHUNK
+                     BLK = MIN( N-I+1, CHUNK )
+                     CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IR ),
+     $                           LDWRKR, A( 1, I ), LDA, CZERO,
+     $                           WORK( IU ), LDWRKU )
+                     CALL ZLACPY( 'F', M, BLK, WORK( IU ), LDWRKU,
+     $                            A( 1, I ), LDA )
+   40             CONTINUE
 *
-      RETURN
+               ELSE
 *
-*     End of ZHETD2
+*                 Insufficient workspace for a fast algorithm
 *
-      END
-*> \brief \b ZHETRD
+                  ITAU = 1
+                  IWORK = ITAU + M
 *
-*  =========== DOCUMENTATION ===========
+*                 Compute A=L*Q
+*                 (CWorkspace: need 2*M, prefer M+M*NB)
+*                 (RWorkspace: 0)
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+                  CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*> \htmlonly
-*> Download ZHETRD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhetrd.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*                 Copy L to U, zeroing out above it
 *
-*  Definition:
-*  ===========
+                  CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+                  CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, U( 1, 2 ),
+     $                         LDU )
 *
-*       SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            INFO, LDA, LWORK, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   D( * ), E( * )
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
+*                 Generate Q in A
+*                 (CWorkspace: need 2*M, prefer M+M*NB)
+*                 (RWorkspace: 0)
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZHETRD reduces a complex Hermitian matrix A to real symmetric
-*> tridiagonal form T by a unitary similarity transformation:
-*> Q**H * A * Q = T.
-*> \endverbatim
+                  CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IE = 1
+                  ITAUQ = ITAU
+                  ITAUP = ITAUQ + M
+                  IWORK = ITAUP + M
 *
-*  Arguments:
-*  ==========
+*                 Bidiagonalize L in U
+*                 (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                 (RWorkspace: need M)
 *
-*> \param[in] UPLO
-*> \verbatim
-*>          UPLO is CHARACTER*1
-*>          = 'U':  Upper triangle of A is stored;
-*>          = 'L':  Lower triangle of A is stored.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
-*>          N-by-N upper triangular part of A contains the upper
-*>          triangular part of the matrix A, and the strictly lower
-*>          triangular part of A is not referenced.  If UPLO = 'L', the
-*>          leading N-by-N lower triangular part of A contains the lower
-*>          triangular part of the matrix A, and the strictly upper
-*>          triangular part of A is not referenced.
-*>          On exit, if UPLO = 'U', the diagonal and first superdiagonal
-*>          of A are overwritten by the corresponding elements of the
-*>          tridiagonal matrix T, and the elements above the first
-*>          superdiagonal, with the array TAU, represent the unitary
-*>          matrix Q as a product of elementary reflectors; if UPLO
-*>          = 'L', the diagonal and first subdiagonal of A are over-
-*>          written by the corresponding elements of the tridiagonal
-*>          matrix T, and the elements below the first subdiagonal, with
-*>          the array TAU, represent the unitary matrix Q as a product
-*>          of elementary reflectors. See Further Details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] D
-*> \verbatim
-*>          D is DOUBLE PRECISION array, dimension (N)
-*>          The diagonal elements of the tridiagonal matrix T:
-*>          D(i) = A(i,i).
-*> \endverbatim
-*>
-*> \param[out] E
-*> \verbatim
-*>          E is DOUBLE PRECISION array, dimension (N-1)
-*>          The off-diagonal elements of the tridiagonal matrix T:
-*>          E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (N-1)
-*>          The scalar factors of the elementary reflectors (see Further
-*>          Details).
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= 1.
-*>          For optimum performance LWORK >= N*NB, where NB is the
-*>          optimal blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*> \endverbatim
+                  CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
+     $                         WORK( ITAUQ ), WORK( ITAUP ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*  Authors:
-*  ========
+*                 Multiply right vectors bidiagonalizing L by Q in A
+*                 (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                 (RWorkspace: 0)
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+                  CALL ZUNMBR( 'P', 'L', 'C', M, N, M, U, LDU,
+     $                         WORK( ITAUP ), A, LDA, WORK( IWORK ),
+     $                         LWORK-IWORK+1, IERR )
 *
-*> \date November 2011
+*                 Generate left vectors bidiagonalizing L in U
+*                 (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                 (RWorkspace: 0)
 *
-*> \ingroup complex16HEcomputational
+                  CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+     $                         WORK( IWORK ), LWORK-IWORK+1, IERR )
+                  IRWORK = IE + M
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  If UPLO = 'U', the matrix Q is represented as a product of elementary
-*>  reflectors
-*>
-*>     Q = H(n-1) . . . H(2) H(1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in
-*>  A(1:i-1,i+1), and tau in TAU(i).
-*>
-*>  If UPLO = 'L', the matrix Q is represented as a product of elementary
-*>  reflectors
-*>
-*>     Q = H(1) H(2) . . . H(n-1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),
-*>  and tau in TAU(i).
-*>
-*>  The contents of A on exit are illustrated by the following examples
-*>  with n = 5:
-*>
-*>  if UPLO = 'U':                       if UPLO = 'L':
-*>
-*>    (  d   e   v2  v3  v4 )              (  d                  )
-*>    (      d   e   v3  v4 )              (  e   d              )
-*>    (          d   e   v4 )              (  v1  e   d          )
-*>    (              d   e  )              (  v1  v2  e   d      )
-*>    (                  d  )              (  v1  v2  v3  e   d  )
-*>
-*>  where d and e denote diagonal and off-diagonal elements of T, and vi
-*>  denotes an element of the vector defining H(i).
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
+*                 Perform bidiagonal QR iteration, computing left
+*                 singular vectors of A in U and computing right
+*                 singular vectors of A in A
+*                 (CWorkspace: 0)
+*                 (RWorkspace: need BDSPAC)
 *
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+                  CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), A, LDA,
+     $                         U, LDU, CDUM, 1, RWORK( IRWORK ), INFO )
 *
-*     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            INFO, LDA, LWORK, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   D( * ), E( * )
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
-*     ..
+               END IF
 *
-*  =====================================================================
+            ELSE IF( WNTVS ) THEN
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE
-      PARAMETER          ( ONE = 1.0D+0 )
-      COMPLEX*16         CONE
-      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            LQUERY, UPPER
-      INTEGER            I, IINFO, IWS, J, KK, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NX
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZHER2K, ZHETD2, ZLATRD
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
-*     ..
-*     .. Executable Statements ..
+               IF( WNTUN ) THEN
 *
-*     Test the input parameters
+*                 Path 4t(N much larger than M, JOBU='N', JOBVT='S')
+*                 M right singular vectors to be computed in VT and
+*                 no left singular vectors to be computed
 *
-      INFO = 0
-      UPPER = LSAME( UPLO, 'U' )
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -4
-      ELSE IF( LWORK.LT.1 .AND. .NOT.LQUERY ) THEN
-         INFO = -9
-      END IF
+                  IF( LWORK.GE.M*M+3*M ) THEN
 *
-      IF( INFO.EQ.0 ) THEN
+*                    Sufficient workspace for a fast algorithm
 *
-*        Determine the block size.
+                     IR = 1
+                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
 *
-         NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
-         LWKOPT = N*NB
-         WORK( 1 ) = LWKOPT
-      END IF
+*                       WORK(IR) is LDA by M
 *
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZHETRD', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         RETURN
-      END IF
+                        LDWRKR = LDA
+                     ELSE
 *
-*     Quick return if possible
+*                       WORK(IR) is M by M
 *
-      IF( N.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
-      END IF
+                        LDWRKR = M
+                     END IF
+                     ITAU = IR + LDWRKR*M
+                     IWORK = ITAU + M
 *
-      NX = N
-      IWS = 1
-      IF( NB.GT.1 .AND. NB.LT.N ) THEN
+*                    Compute A=L*Q
+*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-*        Determine when to cross over from blocked to unblocked code
-*        (last block is always handled by unblocked code).
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-         NX = MAX( NB, ILAENV( 3, 'ZHETRD', UPLO, N, -1, -1, -1 ) )
-         IF( NX.LT.N ) THEN
+*                    Copy L to WORK(IR), zeroing out above it
 *
-*           Determine if workspace is large enough for blocked code.
+                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ),
+     $                            LDWRKR )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            WORK( IR+LDWRKR ), LDWRKR )
 *
-            LDWORK = N
-            IWS = LDWORK*NB
-            IF( LWORK.LT.IWS ) THEN
+*                    Generate Q in A
+*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-*              Not enough workspace to use optimal NB:  determine the
-*              minimum value of NB, and reduce NB or force use of
-*              unblocked code by setting NX = N.
+                     CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-               NB = MAX( LWORK / LDWORK, 1 )
-               NBMIN = ILAENV( 2, 'ZHETRD', UPLO, N, -1, -1, -1 )
-               IF( NB.LT.NBMIN )
-     $            NX = N
-            END IF
-         ELSE
-            NX = N
-         END IF
-      ELSE
-         NB = 1
-      END IF
+*                    Bidiagonalize L in WORK(IR)
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-      IF( UPPER ) THEN
+                     CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*        Reduce the upper triangle of A.
-*        Columns 1:kk are handled by the unblocked method.
+*                    Generate right vectors bidiagonalizing L in
+*                    WORK(IR)
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+(M-1)*NB)
+*                    (RWorkspace: 0)
 *
-         KK = N - ( ( N-NX+NB-1 ) / NB )*NB
-         DO 20 I = N - NB + 1, KK + 1, -NB
+                     CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-*           Reduce columns i:i+nb-1 to tridiagonal form and form the
-*           matrix W which is needed to update the unreduced part of
-*           the matrix
+*                    Perform bidiagonal QR iteration, computing right
+*                    singular vectors of L in WORK(IR)
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: need BDSPAC)
 *
-            CALL ZLATRD( UPLO, I+NB-1, NB, A, LDA, E, TAU, WORK,
-     $                   LDWORK )
+                     CALL ZBDSQR( 'U', M, M, 0, 0, S, RWORK( IE ),
+     $                            WORK( IR ), LDWRKR, CDUM, 1, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*           Update the unreduced submatrix A(1:i-1,1:i-1), using an
-*           update of the form:  A := A - V*W**H - W*V**H
+*                    Multiply right singular vectors of L in WORK(IR) by
+*                    Q in A, storing result in VT
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
 *
-            CALL ZHER2K( UPLO, 'No transpose', I-1, NB, -CONE,
-     $                   A( 1, I ), LDA, WORK, LDWORK, ONE, A, LDA )
+                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IR ),
+     $                           LDWRKR, A, LDA, CZERO, VT, LDVT )
 *
-*           Copy superdiagonal elements back into A, and diagonal
-*           elements into D
+                  ELSE
 *
-            DO 10 J = I, I + NB - 1
-               A( J-1, J ) = E( J-1 )
-               D( J ) = A( J, J )
-   10       CONTINUE
-   20    CONTINUE
+*                    Insufficient workspace for a fast algorithm
 *
-*        Use unblocked code to reduce the last or only block
+                     ITAU = 1
+                     IWORK = ITAU + M
 *
-         CALL ZHETD2( UPLO, KK, A, LDA, D, E, TAU, IINFO )
-      ELSE
+*                    Compute A=L*Q
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-*        Reduce the lower triangle of A
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-         DO 40 I = 1, N - NX, NB
+*                    Copy result to VT
 *
-*           Reduce columns i:i+nb-1 to tridiagonal form and form the
-*           matrix W which is needed to update the unreduced part of
-*           the matrix
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-            CALL ZLATRD( UPLO, N-I+1, NB, A( I, I ), LDA, E( I ),
-     $                   TAU( I ), WORK, LDWORK )
+*                    Generate Q in VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-*           Update the unreduced submatrix A(i+nb:n,i+nb:n), using
-*           an update of the form:  A := A - V*W**H - W*V**H
+                     CALL ZUNGLQ( M, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-            CALL ZHER2K( UPLO, 'No transpose', N-I-NB+1, NB, -CONE,
-     $                   A( I+NB, I ), LDA, WORK( NB+1 ), LDWORK, ONE,
-     $                   A( I+NB, I+NB ), LDA )
+*                    Zero out above L in A
 *
-*           Copy subdiagonal elements back into A, and diagonal
-*           elements into D
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            A( 1, 2 ), LDA )
 *
-            DO 30 J = I, I + NB - 1
-               A( J+1, J ) = E( J )
-               D( J ) = A( J, J )
-   30       CONTINUE
-   40    CONTINUE
+*                    Bidiagonalize L in A
+*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-*        Use unblocked code to reduce the last or only block
+                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-         CALL ZHETD2( UPLO, N-I+1, A( I, I ), LDA, D( I ), E( I ),
-     $                TAU( I ), IINFO )
-      END IF
+*                    Multiply right vectors bidiagonalizing L by Q in VT
+*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (RWorkspace: 0)
 *
-      WORK( 1 ) = LWKOPT
-      RETURN
+                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
+     $                            WORK( ITAUP ), VT, LDVT,
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-*     End of ZHETRD
+*                    Perform bidiagonal QR iteration, computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-      END
-*> \brief \b ZHSEQR
+                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
+     $                            LDVT, CDUM, 1, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*  =========== DOCUMENTATION ===========
+                  END IF
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+               ELSE IF( WNTUO ) THEN
 *
-*> \htmlonly
-*> Download ZHSEQR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhseqr.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhseqr.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhseqr.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*                 Path 5t(N much larger than M, JOBU='O', JOBVT='S')
+*                 M right singular vectors to be computed in VT and
+*                 M left singular vectors to be overwritten on A
 *
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
-*                          WORK, LWORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            IHI, ILO, INFO, LDH, LDZ, LWORK, N
-*       CHARACTER          COMPZ, JOB
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
-*       ..
-*  
+                  IF( LWORK.GE.2*M*M+3*M ) THEN
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*>    ZHSEQR computes the eigenvalues of a Hessenberg matrix H
-*>    and, optionally, the matrices T and Z from the Schur decomposition
-*>    H = Z T Z**H, where T is an upper triangular matrix (the
-*>    Schur form), and Z is the unitary matrix of Schur vectors.
-*>
-*>    Optionally Z may be postmultiplied into an input unitary
-*>    matrix Q so that this routine can give the Schur factorization
-*>    of a matrix A which has been reduced to the Hessenberg form H
-*>    by the unitary matrix Q:  A = Q*H*Q**H = (QZ)*T*(QZ)**H.
-*> \endverbatim
+*                    Sufficient workspace for a fast algorithm
 *
-*  Arguments:
-*  ==========
+                     IU = 1
+                     IF( LWORK.GE.WRKBL+2*LDA*M ) THEN
 *
-*> \param[in] JOB
-*> \verbatim
-*>          JOB is CHARACTER*1
-*>           = 'E':  compute eigenvalues only;
-*>           = 'S':  compute eigenvalues and the Schur form T.
-*> \endverbatim
-*>
-*> \param[in] COMPZ
-*> \verbatim
-*>          COMPZ is CHARACTER*1
-*>           = 'N':  no Schur vectors are computed;
-*>           = 'I':  Z is initialized to the unit matrix and the matrix Z
-*>                   of Schur vectors of H is returned;
-*>           = 'V':  Z must contain an unitary matrix Q on entry, and
-*>                   the product Q*Z is returned.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>           The order of the matrix H.  N .GE. 0.
-*> \endverbatim
-*>
-*> \param[in] ILO
-*> \verbatim
-*>          ILO is INTEGER
-*> \endverbatim
-*>
-*> \param[in] IHI
-*> \verbatim
-*>          IHI is INTEGER
-*>
-*>           It is assumed that H is already upper triangular in rows
-*>           and columns 1:ILO-1 and IHI+1:N. ILO and IHI are normally
-*>           set by a previous call to ZGEBAL, and then passed to ZGEHRD
-*>           when the matrix output by ZGEBAL is reduced to Hessenberg
-*>           form. Otherwise ILO and IHI should be set to 1 and N
-*>           respectively.  If N.GT.0, then 1.LE.ILO.LE.IHI.LE.N.
-*>           If N = 0, then ILO = 1 and IHI = 0.
-*> \endverbatim
-*>
-*> \param[in,out] H
-*> \verbatim
-*>          H is COMPLEX*16 array, dimension (LDH,N)
-*>           On entry, the upper Hessenberg matrix H.
-*>           On exit, if INFO = 0 and JOB = 'S', H contains the upper
-*>           triangular matrix T from the Schur decomposition (the
-*>           Schur form). If INFO = 0 and JOB = 'E', the contents of
-*>           H are unspecified on exit.  (The output value of H when
-*>           INFO.GT.0 is given under the description of INFO below.)
-*>
-*>           Unlike earlier versions of ZHSEQR, this subroutine may
-*>           explicitly H(i,j) = 0 for i.GT.j and j = 1, 2, ... ILO-1
-*>           or j = IHI+1, IHI+2, ... N.
-*> \endverbatim
-*>
-*> \param[in] LDH
-*> \verbatim
-*>          LDH is INTEGER
-*>           The leading dimension of the array H. LDH .GE. max(1,N).
-*> \endverbatim
-*>
-*> \param[out] W
-*> \verbatim
-*>          W is COMPLEX*16 array, dimension (N)
-*>           The computed eigenvalues. If JOB = 'S', the eigenvalues are
-*>           stored in the same order as on the diagonal of the Schur
-*>           form returned in H, with W(i) = H(i,i).
-*> \endverbatim
-*>
-*> \param[in,out] Z
-*> \verbatim
-*>          Z is COMPLEX*16 array, dimension (LDZ,N)
-*>           If COMPZ = 'N', Z is not referenced.
-*>           If COMPZ = 'I', on entry Z need not be set and on exit,
-*>           if INFO = 0, Z contains the unitary matrix Z of the Schur
-*>           vectors of H.  If COMPZ = 'V', on entry Z must contain an
-*>           N-by-N matrix Q, which is assumed to be equal to the unit
-*>           matrix except for the submatrix Z(ILO:IHI,ILO:IHI). On exit,
-*>           if INFO = 0, Z contains Q*Z.
-*>           Normally Q is the unitary matrix generated by ZUNGHR
-*>           after the call to ZGEHRD which formed the Hessenberg matrix
-*>           H. (The output value of Z when INFO.GT.0 is given under
-*>           the description of INFO below.)
-*> \endverbatim
-*>
-*> \param[in] LDZ
-*> \verbatim
-*>          LDZ is INTEGER
-*>           The leading dimension of the array Z.  if COMPZ = 'I' or
-*>           COMPZ = 'V', then LDZ.GE.MAX(1,N).  Otherwize, LDZ.GE.1.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (LWORK)
-*>           On exit, if INFO = 0, WORK(1) returns an estimate of
-*>           the optimal value for LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>           The dimension of the array WORK.  LWORK .GE. max(1,N)
-*>           is sufficient and delivers very good and sometimes
-*>           optimal performance.  However, LWORK as large as 11*N
-*>           may be required for optimal performance.  A workspace
-*>           query is recommended to determine the optimal workspace
-*>           size.
-*>
-*>           If LWORK = -1, then ZHSEQR does a workspace query.
-*>           In this case, ZHSEQR checks the input parameters and
-*>           estimates the optimal workspace size for the given
-*>           values of N, ILO and IHI.  The estimate is returned
-*>           in WORK(1).  No error message related to LWORK is
-*>           issued by XERBLA.  Neither H nor Z are accessed.
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>             =  0:  successful exit
-*>           .LT. 0:  if INFO = -i, the i-th argument had an illegal
-*>                    value
-*>           .GT. 0:  if INFO = i, ZHSEQR failed to compute all of
-*>                the eigenvalues.  Elements 1:ilo-1 and i+1:n of WR
-*>                and WI contain those eigenvalues which have been
-*>                successfully computed.  (Failures are rare.)
-*>
-*>                If INFO .GT. 0 and JOB = 'E', then on exit, the
-*>                remaining unconverged eigenvalues are the eigen-
-*>                values of the upper Hessenberg matrix rows and
-*>                columns ILO through INFO of the final, output
-*>                value of H.
-*>
-*>                If INFO .GT. 0 and JOB   = 'S', then on exit
-*>
-*>           (*)  (initial value of H)*U  = U*(final value of H)
-*>
-*>                where U is a unitary matrix.  The final
-*>                value of  H is upper Hessenberg and triangular in
-*>                rows and columns INFO+1 through IHI.
-*>
-*>                If INFO .GT. 0 and COMPZ = 'V', then on exit
-*>
-*>                  (final value of Z)  =  (initial value of Z)*U
-*>
-*>                where U is the unitary matrix in (*) (regard-
-*>                less of the value of JOB.)
-*>
-*>                If INFO .GT. 0 and COMPZ = 'I', then on exit
-*>                      (final value of Z)  = U
-*>                where U is the unitary matrix in (*) (regard-
-*>                less of the value of JOB.)
-*>
-*>                If INFO .GT. 0 and COMPZ = 'N', then Z is not
-*>                accessed.
-*> \endverbatim
+*                       WORK(IU) is LDA by M and WORK(IR) is LDA by M
 *
-*  Authors:
-*  ========
+                        LDWRKU = LDA
+                        IR = IU + LDWRKU*M
+                        LDWRKR = LDA
+                     ELSE IF( LWORK.GE.WRKBL+( LDA+M )*M ) THEN
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                       WORK(IU) is LDA by M and WORK(IR) is M by M
 *
-*> \date November 2013
+                        LDWRKU = LDA
+                        IR = IU + LDWRKU*M
+                        LDWRKR = M
+                     ELSE
 *
-*> \ingroup complex16OTHERcomputational
+*                       WORK(IU) is M by M and WORK(IR) is M by M
 *
-*> \par Contributors:
-*  ==================
-*>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
+                        LDWRKU = M
+                        IR = IU + LDWRKU*M
+                        LDWRKR = M
+                     END IF
+                     ITAU = IR + LDWRKR*M
+                     IWORK = ITAU + M
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>             Default values supplied by
-*>             ILAENV(ISPEC,'ZHSEQR',JOB(:1)//COMPZ(:1),N,ILO,IHI,LWORK).
-*>             It is suggested that these defaults be adjusted in order
-*>             to attain best performance in each particular
-*>             computational environment.
-*>
-*>            ISPEC=12: The ZLAHQR vs ZLAQR0 crossover point.
-*>                      Default: 75. (Must be at least 11.)
-*>
-*>            ISPEC=13: Recommended deflation window size.
-*>                      This depends on ILO, IHI and NS.  NS is the
-*>                      number of simultaneous shifts returned
-*>                      by ILAENV(ISPEC=15).  (See ISPEC=15 below.)
-*>                      The default for (IHI-ILO+1).LE.500 is NS.
-*>                      The default for (IHI-ILO+1).GT.500 is 3*NS/2.
-*>
-*>            ISPEC=14: Nibble crossover point. (See IPARMQ for
-*>                      details.)  Default: 14% of deflation window
-*>                      size.
-*>
-*>            ISPEC=15: Number of simultaneous shifts in a multishift
-*>                      QR iteration.
-*>
-*>                      If IHI-ILO+1 is ...
-*>
-*>                      greater than      ...but less    ... the
-*>                      or equal to ...      than        default is
-*>
-*>                           1               30          NS =   2(+)
-*>                          30               60          NS =   4(+)
-*>                          60              150          NS =  10(+)
-*>                         150              590          NS =  **
-*>                         590             3000          NS =  64
-*>                        3000             6000          NS = 128
-*>                        6000             infinity      NS = 256
-*>
-*>                  (+)  By default some or all matrices of this order
-*>                       are passed to the implicit double shift routine
-*>                       ZLAHQR and this parameter is ignored.  See
-*>                       ISPEC=12 above and comments in IPARMQ for
-*>                       details.
-*>
-*>                 (**)  The asterisks (**) indicate an ad-hoc
-*>                       function of N increasing from 10 to 64.
-*>
-*>            ISPEC=16: Select structured matrix multiply.
-*>                      If the number of simultaneous shifts (specified
-*>                      by ISPEC=15) is less than 14, then the default
-*>                      for ISPEC=16 is 0.  Otherwise the default for
-*>                      ISPEC=16 is 2.
-*> \endverbatim
+*                    Compute A=L*Q
+*                    (CWorkspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-*> \par References:
-*  ================
-*>
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
-*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
-*>       929--947, 2002.
-*> \n
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part II: Aggressive Early Deflation, SIAM Journal
-*>       of Matrix Analysis, volume 23, pages 948--973, 2002.
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*  =====================================================================
-      SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
-     $                   WORK, LWORK, INFO )
+*                    Copy L to WORK(IU), zeroing out below it
 *
-*  -- LAPACK computational routine (version 3.5.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            WORK( IU+LDWRKU ), LDWRKU )
 *
-*     .. Scalar Arguments ..
-      INTEGER            IHI, ILO, INFO, LDH, LDZ, LWORK, N
-      CHARACTER          COMPZ, JOB
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
-*     ..
+*                    Generate Q in A
+*                    (CWorkspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-*  =====================================================================
+                     CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-*     .. Parameters ..
+*                    Bidiagonalize L in WORK(IU), copying result to
+*                    WORK(IR)
+*                    (CWorkspace: need   2*M*M+3*M,
+*                                 prefer 2*M*M+2*M+2*M*NB)
+*                    (RWorkspace: need   M)
 *
-*     ==== Matrices of order NTINY or smaller must be processed by
-*     .    ZLAHQR because of insufficient subdiagonal scratch space.
-*     .    (This is a hard limit.) ====
-      INTEGER            NTINY
-      PARAMETER          ( NTINY = 11 )
+                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU,
+     $                            WORK( IR ), LDWRKR )
 *
-*     ==== NL allocates some local workspace to help small matrices
-*     .    through a rare ZLAHQR failure.  NL .GT. NTINY = 11 is
-*     .    required and NL .LE. NMIN = ILAENV(ISPEC=12,...) is recom-
-*     .    mended.  (The default value of NMIN is 75.)  Using NL = 49
-*     .    allows up to six simultaneous shifts and a 16-by-16
-*     .    deflation window.  ====
-      INTEGER            NL
-      PARAMETER          ( NL = 49 )
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   RZERO
-      PARAMETER          ( RZERO = 0.0d0 )
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         HL( NL, NL ), WORKL( NL )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            KBOT, NMIN
-      LOGICAL            INITZ, LQUERY, WANTT, WANTZ
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      LOGICAL            LSAME
-      EXTERNAL           ILAENV, LSAME
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAHQR, ZLAQR0, ZLASET
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, MAX, MIN
-*     ..
-*     .. Executable Statements ..
+*                    Generate right bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need   2*M*M+3*M-1,
+*                                 prefer 2*M*M+2*M+(M-1)*NB)
+*                    (RWorkspace: 0)
 *
-*     ==== Decode and check the input parameters. ====
+                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-      WANTT = LSAME( JOB, 'S' )
-      INITZ = LSAME( COMPZ, 'I' )
-      WANTZ = INITZ .OR. LSAME( COMPZ, 'V' )
-      WORK( 1 ) = DCMPLX( DBLE( MAX( 1, N ) ), RZERO )
-      LQUERY = LWORK.EQ.-1
+*                    Generate left bidiagonalizing vectors in WORK(IR)
+*                    (CWorkspace: need 2*M*M+3*M, prefer 2*M*M+2*M+M*NB)
+*                    (RWorkspace: 0)
 *
-      INFO = 0
-      IF( .NOT.LSAME( JOB, 'E' ) .AND. .NOT.WANTT ) THEN
-         INFO = -1
-      ELSE IF( .NOT.LSAME( COMPZ, 'N' ) .AND. .NOT.WANTZ ) THEN
-         INFO = -2
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -3
-      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
-         INFO = -4
-      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
-         INFO = -5
-      ELSE IF( LDH.LT.MAX( 1, N ) ) THEN
-         INFO = -7
-      ELSE IF( LDZ.LT.1 .OR. ( WANTZ .AND. LDZ.LT.MAX( 1, N ) ) ) THEN
-         INFO = -10
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -12
-      END IF
+                     CALL ZUNGBR( 'Q', M, M, M, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-      IF( INFO.NE.0 ) THEN
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of L in WORK(IR) and computing
+*                    right singular vectors of L in WORK(IU)
+*                    (CWorkspace: need 2*M*M)
+*                    (RWorkspace: need BDSPAC)
 *
-*        ==== Quick return in case of invalid argument. ====
+                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
+     $                            WORK( IU ), LDWRKU, WORK( IR ),
+     $                            LDWRKR, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
-         CALL XERBLA( 'ZHSEQR', -INFO )
-         RETURN
+*                    Multiply right singular vectors of L in WORK(IU) by
+*                    Q in A, storing result in VT
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
 *
-      ELSE IF( N.EQ.0 ) THEN
+                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
+     $                           LDWRKU, A, LDA, CZERO, VT, LDVT )
 *
-*        ==== Quick return in case N = 0; nothing to do. ====
+*                    Copy left singular vectors of L to A
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
 *
-         RETURN
+                     CALL ZLACPY( 'F', M, M, WORK( IR ), LDWRKR, A,
+     $                            LDA )
 *
-      ELSE IF( LQUERY ) THEN
+                  ELSE
 *
-*        ==== Quick return in case of a workspace query ====
+*                    Insufficient workspace for a fast algorithm
 *
-         CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI, Z,
-     $                LDZ, WORK, LWORK, INFO )
-*        ==== Ensure reported workspace size is backward-compatible with
-*        .    previous LAPACK versions. ====
-         WORK( 1 ) = DCMPLX( MAX( DBLE( WORK( 1 ) ), DBLE( MAX( 1,
-     $               N ) ) ), RZERO )
-         RETURN
+                     ITAU = 1
+                     IWORK = ITAU + M
 *
-      ELSE
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-*        ==== copy eigenvalues isolated by ZGEBAL ====
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-         IF( ILO.GT.1 )
-     $      CALL ZCOPY( ILO-1, H, LDH+1, W, 1 )
-         IF( IHI.LT.N )
-     $      CALL ZCOPY( N-IHI, H( IHI+1, IHI+1 ), LDH+1, W( IHI+1 ), 1 )
+*                    Generate Q in VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-*        ==== Initialize Z, if requested ====
+                     CALL ZUNGLQ( M, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-         IF( INITZ )
-     $      CALL ZLASET( 'A', N, N, ZERO, ONE, Z, LDZ )
+*                    Zero out above L in A
 *
-*        ==== Quick return if possible ====
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            A( 1, 2 ), LDA )
 *
-         IF( ILO.EQ.IHI ) THEN
-            W( ILO ) = H( ILO, ILO )
-            RETURN
-         END IF
+*                    Bidiagonalize L in A
+*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-*        ==== ZLAHQR/ZLAQR0 crossover point ====
+                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-         NMIN = ILAENV( 12, 'ZHSEQR', JOB( : 1 ) // COMPZ( : 1 ), N,
-     $          ILO, IHI, LWORK )
-         NMIN = MAX( NTINY, NMIN )
+*                    Multiply right vectors bidiagonalizing L by Q in VT
+*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (RWorkspace: 0)
 *
-*        ==== ZLAQR0 for big matrices; ZLAHQR for small ones ====
+                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
+     $                            WORK( ITAUP ), VT, LDVT,
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-         IF( N.GT.NMIN ) THEN
-            CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
-     $                   Z, LDZ, WORK, LWORK, INFO )
-         ELSE
+*                    Generate left bidiagonalizing vectors of L in A
+*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                    (RWorkspace: 0)
 *
-*           ==== Small matrix ====
+                     CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-            CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
-     $                   Z, LDZ, INFO )
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in A and computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-            IF( INFO.GT.0 ) THEN
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+     $                            LDVT, A, LDA, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*              ==== A rare ZLAHQR failure!  ZLAQR0 sometimes succeeds
-*              .    when ZLAHQR fails. ====
+                  END IF
 *
-               KBOT = INFO
+               ELSE IF( WNTUAS ) THEN
 *
-               IF( N.GE.NL ) THEN
+*                 Path 6t(N much larger than M, JOBU='S' or 'A',
+*                         JOBVT='S')
+*                 M right singular vectors to be computed in VT and
+*                 M left singular vectors to be computed in U
 *
-*                 ==== Larger matrices have enough subdiagonal scratch
-*                 .    space to call ZLAQR0 directly. ====
+                  IF( LWORK.GE.M*M+3*M ) THEN
 *
-                  CALL ZLAQR0( WANTT, WANTZ, N, ILO, KBOT, H, LDH, W,
-     $                         ILO, IHI, Z, LDZ, WORK, LWORK, INFO )
+*                    Sufficient workspace for a fast algorithm
 *
-               ELSE
+                     IU = 1
+                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
 *
-*                 ==== Tiny matrices don't have enough subdiagonal
-*                 .    scratch space to benefit from ZLAQR0.  Hence,
-*                 .    tiny matrices must be copied into a larger
-*                 .    array before calling ZLAQR0. ====
+*                       WORK(IU) is LDA by N
 *
-                  CALL ZLACPY( 'A', N, N, H, LDH, HL, NL )
-                  HL( N+1, N ) = ZERO
-                  CALL ZLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1, N+1 ),
-     $                         NL )
-                  CALL ZLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL, W,
-     $                         ILO, IHI, Z, LDZ, WORKL, NL, INFO )
-                  IF( WANTT .OR. INFO.NE.0 )
-     $               CALL ZLACPY( 'A', N, N, HL, NL, H, LDH )
-               END IF
-            END IF
-         END IF
+                        LDWRKU = LDA
+                     ELSE
 *
-*        ==== Clear out the trash, if necessary. ====
+*                       WORK(IU) is LDA by M
 *
-         IF( ( WANTT .OR. INFO.NE.0 ) .AND. N.GT.2 )
-     $      CALL ZLASET( 'L', N-2, N-2, ZERO, ZERO, H( 3, 1 ), LDH )
+                        LDWRKU = M
+                     END IF
+                     ITAU = IU + LDWRKU*M
+                     IWORK = ITAU + M
 *
-*        ==== Ensure reported workspace size is backward-compatible with
-*        .    previous LAPACK versions. ====
+*                    Compute A=L*Q
+*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-         WORK( 1 ) = DCMPLX( MAX( DBLE( MAX( 1, N ) ),
-     $               DBLE( WORK( 1 ) ) ), RZERO )
-      END IF
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*     ==== End of ZHSEQR ====
+*                    Copy L to WORK(IU), zeroing out above it
 *
-      END
-*> \brief \b ZLABRD reduces the first nb rows and columns of a general matrix to a bidiagonal form.
+                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            WORK( IU+LDWRKU ), LDWRKU )
 *
-*  =========== DOCUMENTATION ===========
+*                    Generate Q in A
+*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+                     CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-*> \htmlonly
-*> Download ZLABRD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlabrd.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlabrd.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlabrd.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*                    Bidiagonalize L in WORK(IU), copying result to U
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-*  Definition:
-*  ===========
+                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU, U,
+     $                            LDU )
 *
-*       SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
-*                          LDY )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            LDA, LDX, LDY, M, N, NB
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   D( * ), E( * )
-*       COMPLEX*16         A( LDA, * ), TAUP( * ), TAUQ( * ), X( LDX, * ),
-*      $                   Y( LDY, * )
-*       ..
-*  
+*                    Generate right bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need   M*M+3*M-1,
+*                                 prefer M*M+2*M+(M-1)*NB)
+*                    (RWorkspace: 0)
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLABRD reduces the first NB rows and columns of a complex general
-*> m by n matrix A to upper or lower real bidiagonal form by a unitary
-*> transformation Q**H * A * P, and returns the matrices X and Y which
-*> are needed to apply the transformation to the unreduced part of A.
-*>
-*> If m >= n, A is reduced to upper bidiagonal form; if m < n, to lower
-*> bidiagonal form.
-*>
-*> This is an auxiliary routine called by ZGEBRD
-*> \endverbatim
+                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*  Arguments:
-*  ==========
+*                    Generate left bidiagonalizing vectors in U
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*                    (RWorkspace: 0)
 *
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows in the matrix A.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns in the matrix A.
-*> \endverbatim
-*>
-*> \param[in] NB
-*> \verbatim
-*>          NB is INTEGER
-*>          The number of leading rows and columns of A to be reduced.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the m by n general matrix to be reduced.
-*>          On exit, the first NB rows and columns of the matrix are
-*>          overwritten; the rest of the array is unchanged.
-*>          If m >= n, elements on and below the diagonal in the first NB
-*>            columns, with the array TAUQ, represent the unitary
-*>            matrix Q as a product of elementary reflectors; and
-*>            elements above the diagonal in the first NB rows, with the
-*>            array TAUP, represent the unitary matrix P as a product
-*>            of elementary reflectors.
-*>          If m < n, elements below the diagonal in the first NB
-*>            columns, with the array TAUQ, represent the unitary
-*>            matrix Q as a product of elementary reflectors, and
-*>            elements on and above the diagonal in the first NB rows,
-*>            with the array TAUP, represent the unitary matrix P as
-*>            a product of elementary reflectors.
-*>          See Further Details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] D
-*> \verbatim
-*>          D is DOUBLE PRECISION array, dimension (NB)
-*>          The diagonal elements of the first NB rows and columns of
-*>          the reduced matrix.  D(i) = A(i,i).
-*> \endverbatim
-*>
-*> \param[out] E
-*> \verbatim
-*>          E is DOUBLE PRECISION array, dimension (NB)
-*>          The off-diagonal elements of the first NB rows and columns of
-*>          the reduced matrix.
-*> \endverbatim
-*>
-*> \param[out] TAUQ
-*> \verbatim
-*>          TAUQ is COMPLEX*16 array dimension (NB)
-*>          The scalar factors of the elementary reflectors which
-*>          represent the unitary matrix Q. See Further Details.
-*> \endverbatim
-*>
-*> \param[out] TAUP
-*> \verbatim
-*>          TAUP is COMPLEX*16 array, dimension (NB)
-*>          The scalar factors of the elementary reflectors which
-*>          represent the unitary matrix P. See Further Details.
-*> \endverbatim
-*>
-*> \param[out] X
-*> \verbatim
-*>          X is COMPLEX*16 array, dimension (LDX,NB)
-*>          The m-by-nb matrix X required to update the unreduced part
-*>          of A.
-*> \endverbatim
-*>
-*> \param[in] LDX
-*> \verbatim
-*>          LDX is INTEGER
-*>          The leading dimension of the array X. LDX >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] Y
-*> \verbatim
-*>          Y is COMPLEX*16 array, dimension (LDY,NB)
-*>          The n-by-nb matrix Y required to update the unreduced part
-*>          of A.
-*> \endverbatim
-*>
-*> \param[in] LDY
-*> \verbatim
-*>          LDY is INTEGER
-*>          The leading dimension of the array Y. LDY >= max(1,N).
-*> \endverbatim
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-*  Authors:
-*  ========
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of L in U and computing right
+*                    singular vectors of L in WORK(IU)
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: need BDSPAC)
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
+     $                            WORK( IU ), LDWRKU, U, LDU, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*> \date September 2012
+*                    Multiply right singular vectors of L in WORK(IU) by
+*                    Q in A, storing result in VT
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
 *
-*> \ingroup complex16OTHERauxiliary
+                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
+     $                           LDWRKU, A, LDA, CZERO, VT, LDVT )
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrices Q and P are represented as products of elementary
-*>  reflectors:
-*>
-*>     Q = H(1) H(2) . . . H(nb)  and  P = G(1) G(2) . . . G(nb)
-*>
-*>  Each H(i) and G(i) has the form:
-*>
-*>     H(i) = I - tauq * v * v**H  and G(i) = I - taup * u * u**H
-*>
-*>  where tauq and taup are complex scalars, and v and u are complex
-*>  vectors.
-*>
-*>  If m >= n, v(1:i-1) = 0, v(i) = 1, and v(i:m) is stored on exit in
-*>  A(i:m,i); u(1:i) = 0, u(i+1) = 1, and u(i+1:n) is stored on exit in
-*>  A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).
-*>
-*>  If m < n, v(1:i) = 0, v(i+1) = 1, and v(i+1:m) is stored on exit in
-*>  A(i+2:m,i); u(1:i-1) = 0, u(i) = 1, and u(i:n) is stored on exit in
-*>  A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).
-*>
-*>  The elements of the vectors v and u together form the m-by-nb matrix
-*>  V and the nb-by-n matrix U**H which are needed, with X and Y, to apply
-*>  the transformation to the unreduced part of the matrix, using a block
-*>  update of the form:  A := A - V*Y**H - X*U**H.
-*>
-*>  The contents of A on exit are illustrated by the following examples
-*>  with nb = 2:
-*>
-*>  m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):
-*>
-*>    (  1   1   u1  u1  u1 )           (  1   u1  u1  u1  u1  u1 )
-*>    (  v1  1   1   u2  u2 )           (  1   1   u2  u2  u2  u2 )
-*>    (  v1  v2  a   a   a  )           (  v1  1   a   a   a   a  )
-*>    (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )
-*>    (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )
-*>    (  v1  v2  a   a   a  )
-*>
-*>  where a denotes an element of the original matrix which is unchanged,
-*>  vi denotes an element of the vector defining H(i), and ui an element
-*>  of the vector defining G(i).
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
-     $                   LDY )
+                  ELSE
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*                    Insufficient workspace for a fast algorithm
 *
-*     .. Scalar Arguments ..
-      INTEGER            LDA, LDX, LDY, M, N, NB
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   D( * ), E( * )
-      COMPLEX*16         A( LDA, * ), TAUP( * ), TAUQ( * ), X( LDX, * ),
-     $                   Y( LDY, * )
-*     ..
+                     ITAU = 1
+                     IWORK = ITAU + M
 *
-*  =====================================================================
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-*     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I
-      COMPLEX*16         ALPHA
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZGEMV, ZLACGV, ZLARFG, ZSCAL
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MIN
-*     ..
-*     .. Executable Statements ..
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*     Quick return if possible
+*                    Generate Q in VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-      IF( M.LE.0 .OR. N.LE.0 )
-     $   RETURN
+                     CALL ZUNGLQ( M, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-      IF( M.GE.N ) THEN
+*                    Copy L to U, zeroing out above it
 *
-*        Reduce to upper bidiagonal form
+                     CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            U( 1, 2 ), LDU )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-         DO 10 I = 1, NB
+*                    Bidiagonalize L in U
+*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-*           Update A(i:m,i)
+                     CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-            CALL ZLACGV( I-1, Y( I, 1 ), LDY )
-            CALL ZGEMV( 'No transpose', M-I+1, I-1, -ONE, A( I, 1 ),
-     $                  LDA, Y( I, 1 ), LDY, ONE, A( I, I ), 1 )
-            CALL ZLACGV( I-1, Y( I, 1 ), LDY )
-            CALL ZGEMV( 'No transpose', M-I+1, I-1, -ONE, X( I, 1 ),
-     $                  LDX, A( 1, I ), 1, ONE, A( I, I ), 1 )
+*                    Multiply right bidiagonalizing vectors in U by Q
+*                    in VT
+*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (RWorkspace: 0)
 *
-*           Generate reflection Q(i) to annihilate A(i+1:m,i)
+                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, U, LDU,
+     $                            WORK( ITAUP ), VT, LDVT,
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-            ALPHA = A( I, I )
-            CALL ZLARFG( M-I+1, ALPHA, A( MIN( I+1, M ), I ), 1,
-     $                   TAUQ( I ) )
-            D( I ) = ALPHA
-            IF( I.LT.N ) THEN
-               A( I, I ) = ONE
+*                    Generate left bidiagonalizing vectors in U
+*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                    (RWorkspace: 0)
 *
-*              Compute Y(i+1:n,i)
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-               CALL ZGEMV( 'Conjugate transpose', M-I+1, N-I, ONE,
-     $                     A( I, I+1 ), LDA, A( I, I ), 1, ZERO,
-     $                     Y( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
-     $                     A( I, 1 ), LDA, A( I, I ), 1, ZERO,
-     $                     Y( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
-     $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
-     $                     X( I, 1 ), LDX, A( I, I ), 1, ZERO,
-     $                     Y( 1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', I-1, N-I, -ONE,
-     $                     A( 1, I+1 ), LDA, Y( 1, I ), 1, ONE,
-     $                     Y( I+1, I ), 1 )
-               CALL ZSCAL( N-I, TAUQ( I ), Y( I+1, I ), 1 )
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in U and computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-*              Update A(i,i+1:n)
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+     $                            LDVT, U, LDU, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-               CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-               CALL ZLACGV( I, A( I, 1 ), LDA )
-               CALL ZGEMV( 'No transpose', N-I, I, -ONE, Y( I+1, 1 ),
-     $                     LDY, A( I, 1 ), LDA, ONE, A( I, I+1 ), LDA )
-               CALL ZLACGV( I, A( I, 1 ), LDA )
-               CALL ZLACGV( I-1, X( I, 1 ), LDX )
-               CALL ZGEMV( 'Conjugate transpose', I-1, N-I, -ONE,
-     $                     A( 1, I+1 ), LDA, X( I, 1 ), LDX, ONE,
-     $                     A( I, I+1 ), LDA )
-               CALL ZLACGV( I-1, X( I, 1 ), LDX )
+                  END IF
 *
-*              Generate reflection P(i) to annihilate A(i,i+2:n)
+               END IF
 *
-               ALPHA = A( I, I+1 )
-               CALL ZLARFG( N-I, ALPHA, A( I, MIN( I+2, N ) ), LDA,
-     $                      TAUP( I ) )
-               E( I ) = ALPHA
-               A( I, I+1 ) = ONE
+            ELSE IF( WNTVA ) THEN
 *
-*              Compute X(i+1:m,i)
+               IF( WNTUN ) THEN
 *
-               CALL ZGEMV( 'No transpose', M-I, N-I, ONE, A( I+1, I+1 ),
-     $                     LDA, A( I, I+1 ), LDA, ZERO, X( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', N-I, I, ONE,
-     $                     Y( I+1, 1 ), LDY, A( I, I+1 ), LDA, ZERO,
-     $                     X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I, -ONE, A( I+1, 1 ),
-     $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
-     $                     LDA, A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
-     $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL ZSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
-               CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-            END IF
-   10    CONTINUE
-      ELSE
+*                 Path 7t(N much larger than M, JOBU='N', JOBVT='A')
+*                 N right singular vectors to be computed in VT and
+*                 no left singular vectors to be computed
 *
-*        Reduce to lower bidiagonal form
+                  IF( LWORK.GE.M*M+MAX( N+M, 3*M ) ) THEN
 *
-         DO 20 I = 1, NB
+*                    Sufficient workspace for a fast algorithm
 *
-*           Update A(i,i:n)
+                     IR = 1
+                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
 *
-            CALL ZLACGV( N-I+1, A( I, I ), LDA )
-            CALL ZLACGV( I-1, A( I, 1 ), LDA )
-            CALL ZGEMV( 'No transpose', N-I+1, I-1, -ONE, Y( I, 1 ),
-     $                  LDY, A( I, 1 ), LDA, ONE, A( I, I ), LDA )
-            CALL ZLACGV( I-1, A( I, 1 ), LDA )
-            CALL ZLACGV( I-1, X( I, 1 ), LDX )
-            CALL ZGEMV( 'Conjugate transpose', I-1, N-I+1, -ONE,
-     $                  A( 1, I ), LDA, X( I, 1 ), LDX, ONE, A( I, I ),
-     $                  LDA )
-            CALL ZLACGV( I-1, X( I, 1 ), LDX )
+*                       WORK(IR) is LDA by M
 *
-*           Generate reflection P(i) to annihilate A(i,i+1:n)
+                        LDWRKR = LDA
+                     ELSE
 *
-            ALPHA = A( I, I )
-            CALL ZLARFG( N-I+1, ALPHA, A( I, MIN( I+1, N ) ), LDA,
-     $                   TAUP( I ) )
-            D( I ) = ALPHA
-            IF( I.LT.M ) THEN
-               A( I, I ) = ONE
+*                       WORK(IR) is M by M
 *
-*              Compute X(i+1:m,i)
+                        LDWRKR = M
+                     END IF
+                     ITAU = IR + LDWRKR*M
+                     IWORK = ITAU + M
 *
-               CALL ZGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1, I ),
-     $                     LDA, A( I, I ), LDA, ZERO, X( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', N-I+1, I-1, ONE,
-     $                     Y( I, 1 ), LDY, A( I, I ), LDA, ZERO,
-     $                     X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
-     $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL ZGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1, I ),
-     $                     LDA, A( I, I ), LDA, ZERO, X( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
-     $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
-               CALL ZSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
-               CALL ZLACGV( N-I+1, A( I, I ), LDA )
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-*              Update A(i+1:m,i)
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-               CALL ZLACGV( I-1, Y( I, 1 ), LDY )
-               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
-     $                     LDA, Y( I, 1 ), LDY, ONE, A( I+1, I ), 1 )
-               CALL ZLACGV( I-1, Y( I, 1 ), LDY )
-               CALL ZGEMV( 'No transpose', M-I, I, -ONE, X( I+1, 1 ),
-     $                     LDX, A( 1, I ), 1, ONE, A( I+1, I ), 1 )
+*                    Copy L to WORK(IR), zeroing out above it
 *
-*              Generate reflection Q(i) to annihilate A(i+2:m,i)
+                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IR ),
+     $                            LDWRKR )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            WORK( IR+LDWRKR ), LDWRKR )
 *
-               ALPHA = A( I+1, I )
-               CALL ZLARFG( M-I, ALPHA, A( MIN( I+2, M ), I ), 1,
-     $                      TAUQ( I ) )
-               E( I ) = ALPHA
-               A( I+1, I ) = ONE
+*                    Generate Q in VT
+*                    (CWorkspace: need M*M+M+N, prefer M*M+M+N*NB)
+*                    (RWorkspace: 0)
 *
-*              Compute Y(i+1:n,i)
+                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-               CALL ZGEMV( 'Conjugate transpose', M-I, N-I, ONE,
-     $                     A( I+1, I+1 ), LDA, A( I+1, I ), 1, ZERO,
-     $                     Y( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', M-I, I-1, ONE,
-     $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
-     $                     Y( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
-     $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', M-I, I, ONE,
-     $                     X( I+1, 1 ), LDX, A( I+1, I ), 1, ZERO,
-     $                     Y( 1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', I, N-I, -ONE,
-     $                     A( 1, I+1 ), LDA, Y( 1, I ), 1, ONE,
-     $                     Y( I+1, I ), 1 )
-               CALL ZSCAL( N-I, TAUQ( I ), Y( I+1, I ), 1 )
-            ELSE
-               CALL ZLACGV( N-I+1, A( I, I ), LDA )
-            END IF
-   20    CONTINUE
-      END IF
-      RETURN
+*                    Bidiagonalize L in WORK(IR)
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-*     End of ZLABRD
+                     CALL ZGEBRD( M, M, WORK( IR ), LDWRKR, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-      END
-*> \brief \b ZLACGV conjugates a complex vector.
+*                    Generate right bidiagonalizing vectors in WORK(IR)
+*                    (CWorkspace: need   M*M+3*M-1,
+*                                 prefer M*M+2*M+(M-1)*NB)
+*                    (RWorkspace: 0)
 *
-*  =========== DOCUMENTATION ===========
+                     CALL ZUNGBR( 'P', M, M, M, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                    Perform bidiagonal QR iteration, computing right
+*                    singular vectors of L in WORK(IR)
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: need BDSPAC)
 *
-*> \htmlonly
-*> Download ZLACGV + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacgv.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacgv.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacgv.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                     CALL ZBDSQR( 'U', M, M, 0, 0, S, RWORK( IE ),
+     $                            WORK( IR ), LDWRKR, CDUM, 1, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*  Definition:
-*  ===========
+*                    Multiply right singular vectors of L in WORK(IR) by
+*                    Q in VT, storing result in A
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
 *
-*       SUBROUTINE ZLACGV( N, X, INCX )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INCX, N
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         X( * )
-*       ..
-*  
+                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IR ),
+     $                           LDWRKR, VT, LDVT, CZERO, A, LDA )
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLACGV conjugates a complex vector of length N.
-*> \endverbatim
+*                    Copy right singular vectors of A from A to VT
 *
-*  Arguments:
-*  ==========
+                     CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The length of the vector X.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] X
-*> \verbatim
-*>          X is COMPLEX*16 array, dimension
-*>                         (1+(N-1)*abs(INCX))
-*>          On entry, the vector of length N to be conjugated.
-*>          On exit, X is overwritten with conjg(X).
-*> \endverbatim
-*>
-*> \param[in] INCX
-*> \verbatim
-*>          INCX is INTEGER
-*>          The spacing between successive elements of X.
-*> \endverbatim
+                  ELSE
 *
-*  Authors:
-*  ========
+*                    Insufficient workspace for a fast algorithm
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+                     ITAU = 1
+                     IWORK = ITAU + M
 *
-*> \date September 2012
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
 *
-*> \ingroup complex16OTHERauxiliary
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*  =====================================================================
-      SUBROUTINE ZLACGV( N, X, INCX )
+*                    Generate Q in VT
+*                    (CWorkspace: need M+N, prefer M+N*NB)
+*                    (RWorkspace: 0)
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-*     .. Scalar Arguments ..
-      INTEGER            INCX, N
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         X( * )
-*     ..
+*                    Zero out above L in A
 *
-* =====================================================================
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            A( 1, 2 ), LDA )
 *
-*     .. Local Scalars ..
-      INTEGER            I, IOFF
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG
-*     ..
-*     .. Executable Statements ..
+*                    Bidiagonalize L in A
+*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                    (RWorkspace: need M)
 *
-      IF( INCX.EQ.1 ) THEN
-         DO 10 I = 1, N
-            X( I ) = DCONJG( X( I ) )
-   10    CONTINUE
-      ELSE
-         IOFF = 1
-         IF( INCX.LT.0 )
-     $      IOFF = 1 - ( N-1 )*INCX
-         DO 20 I = 1, N
-            X( IOFF ) = DCONJG( X( IOFF ) )
-            IOFF = IOFF + INCX
-   20    CONTINUE
-      END IF
-      RETURN
+                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*     End of ZLACGV
+*                    Multiply right bidiagonalizing vectors in A by Q
+*                    in VT
+*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (RWorkspace: 0)
 *
-      END
-*> \brief \b ZLACN2 estimates the 1-norm of a square matrix, using reverse communication for evaluating matrix-vector products.
+                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
+     $                            WORK( ITAUP ), VT, LDVT,
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-*  =========== DOCUMENTATION ===========
+*                    Perform bidiagonal QR iteration, computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+                     CALL ZBDSQR( 'U', M, N, 0, 0, S, RWORK( IE ), VT,
+     $                            LDVT, CDUM, 1, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
 *
-*> \htmlonly
-*> Download ZLACN2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacn2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacn2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacn2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                  END IF
 *
-*  Definition:
-*  ===========
+               ELSE IF( WNTUO ) THEN
 *
-*       SUBROUTINE ZLACN2( N, V, X, EST, KASE, ISAVE )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            KASE, N
-*       DOUBLE PRECISION   EST
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            ISAVE( 3 )
-*       COMPLEX*16         V( * ), X( * )
-*       ..
-*  
+*                 Path 8t(N much larger than M, JOBU='O', JOBVT='A')
+*                 N right singular vectors to be computed in VT and
+*                 M left singular vectors to be overwritten on A
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLACN2 estimates the 1-norm of a square, complex matrix A.
-*> Reverse communication is used for evaluating matrix-vector products.
-*> \endverbatim
+                  IF( LWORK.GE.2*M*M+MAX( N+M, 3*M ) ) THEN
 *
-*  Arguments:
-*  ==========
+*                    Sufficient workspace for a fast algorithm
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>         The order of the matrix.  N >= 1.
-*> \endverbatim
-*>
-*> \param[out] V
-*> \verbatim
-*>          V is COMPLEX*16 array, dimension (N)
-*>         On the final return, V = A*W,  where  EST = norm(V)/norm(W)
-*>         (W is not returned).
-*> \endverbatim
-*>
-*> \param[in,out] X
-*> \verbatim
-*>          X is COMPLEX*16 array, dimension (N)
-*>         On an intermediate return, X should be overwritten by
-*>               A * X,   if KASE=1,
-*>               A**H * X,  if KASE=2,
-*>         where A**H is the conjugate transpose of A, and ZLACN2 must be
-*>         re-called with all the other parameters unchanged.
-*> \endverbatim
-*>
-*> \param[in,out] EST
-*> \verbatim
-*>          EST is DOUBLE PRECISION
-*>         On entry with KASE = 1 or 2 and ISAVE(1) = 3, EST should be
-*>         unchanged from the previous call to ZLACN2.
-*>         On exit, EST is an estimate (a lower bound) for norm(A). 
-*> \endverbatim
-*>
-*> \param[in,out] KASE
-*> \verbatim
-*>          KASE is INTEGER
-*>         On the initial call to ZLACN2, KASE should be 0.
-*>         On an intermediate return, KASE will be 1 or 2, indicating
-*>         whether X should be overwritten by A * X  or A**H * X.
-*>         On the final return from ZLACN2, KASE will again be 0.
-*> \endverbatim
-*>
-*> \param[in,out] ISAVE
-*> \verbatim
-*>          ISAVE is INTEGER array, dimension (3)
-*>         ISAVE is used to save variables between calls to ZLACN2
-*> \endverbatim
+                     IU = 1
+                     IF( LWORK.GE.WRKBL+2*LDA*M ) THEN
 *
-*  Authors:
-*  ========
+*                       WORK(IU) is LDA by M and WORK(IR) is LDA by M
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+                        LDWRKU = LDA
+                        IR = IU + LDWRKU*M
+                        LDWRKR = LDA
+                     ELSE IF( LWORK.GE.WRKBL+( LDA+M )*M ) THEN
 *
-*> \date September 2012
+*                       WORK(IU) is LDA by M and WORK(IR) is M by M
 *
-*> \ingroup complex16OTHERauxiliary
+                        LDWRKU = LDA
+                        IR = IU + LDWRKU*M
+                        LDWRKR = M
+                     ELSE
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  Originally named CONEST, dated March 16, 1988.
-*>
-*>  Last modified:  April, 1999
-*>
-*>  This is a thread safe version of ZLACON, which uses the array ISAVE
-*>  in place of a SAVE statement, as follows:
-*>
-*>     ZLACON     ZLACN2
-*>      JUMP     ISAVE(1)
-*>      J        ISAVE(2)
-*>      ITER     ISAVE(3)
-*> \endverbatim
+*                       WORK(IU) is M by M and WORK(IR) is M by M
 *
-*> \par Contributors:
-*  ==================
-*>
-*>     Nick Higham, University of Manchester
+                        LDWRKU = M
+                        IR = IU + LDWRKU*M
+                        LDWRKR = M
+                     END IF
+                     ITAU = IR + LDWRKR*M
+                     IWORK = ITAU + M
 *
-*> \par References:
-*  ================
-*>
-*>  N.J. Higham, "FORTRAN codes for estimating the one-norm of
-*>  a real or complex matrix, with applications to condition estimation",
-*>  ACM Trans. Math. Soft., vol. 14, no. 4, pp. 381-396, December 1988.
-*>
-*  =====================================================================
-      SUBROUTINE ZLACN2( N, V, X, EST, KASE, ISAVE )
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB)
+*                    (RWorkspace: 0)
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
 *
-*     .. Scalar Arguments ..
-      INTEGER            KASE, N
-      DOUBLE PRECISION   EST
-*     ..
-*     .. Array Arguments ..
-      INTEGER            ISAVE( 3 )
-      COMPLEX*16         V( * ), X( * )
-*     ..
+*                    Generate Q in VT
+*                    (CWorkspace: need 2*M*M+M+N, prefer 2*M*M+M+N*NB)
+*                    (RWorkspace: 0)
 *
-*  =====================================================================
+                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
 *
-*     .. Parameters ..
-      INTEGER              ITMAX
-      PARAMETER          ( ITMAX = 5 )
-      DOUBLE PRECISION     ONE,         TWO
-      PARAMETER          ( ONE = 1.0D0, TWO = 2.0D0 )
-      COMPLEX*16           CZERO, CONE
-      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ),
-     $                            CONE = ( 1.0D0, 0.0D0 ) )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, JLAST
-      DOUBLE PRECISION   ABSXI, ALTSGN, ESTOLD, SAFMIN, TEMP
-*     ..
-*     .. External Functions ..
-      INTEGER            IZMAX1
-      DOUBLE PRECISION   DLAMCH, DZSUM1
-      EXTERNAL           IZMAX1, DLAMCH, DZSUM1
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZCOPY
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG
-*     ..
-*     .. Executable Statements ..
+*                    Copy L to WORK(IU), zeroing out above it
 *
-      SAFMIN = DLAMCH( 'Safe minimum' )
-      IF( KASE.EQ.0 ) THEN
-         DO 10 I = 1, N
-            X( I ) = DCMPLX( ONE / DBLE( N ) )
-   10    CONTINUE
-         KASE = 1
-         ISAVE( 1 ) = 1
-         RETURN
-      END IF
+                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            WORK( IU+LDWRKU ), LDWRKU )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
 *
-      GO TO ( 20, 40, 70, 90, 120 )ISAVE( 1 )
+*                    Bidiagonalize L in WORK(IU), copying result to
+*                    WORK(IR)
+*                    (CWorkspace: need   2*M*M+3*M,
+*                                 prefer 2*M*M+2*M+2*M*NB)
+*                    (RWorkspace: need   M)
 *
-*     ................ ENTRY   (ISAVE( 1 ) = 1)
-*     FIRST ITERATION.  X HAS BEEN OVERWRITTEN BY A*X.
+                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU,
+     $                            WORK( IR ), LDWRKR )
 *
-   20 CONTINUE
-      IF( N.EQ.1 ) THEN
-         V( 1 ) = X( 1 )
-         EST = ABS( V( 1 ) )
-*        ... QUIT
-         GO TO 130
-      END IF
-      EST = DZSUM1( N, X, 1 )
+*                    Generate right bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need   2*M*M+3*M-1,
+*                                 prefer 2*M*M+2*M+(M-1)*NB)
+*                    (RWorkspace: 0)
 *
-      DO 30 I = 1, N
-         ABSXI = ABS( X( I ) )
-         IF( ABSXI.GT.SAFMIN ) THEN
-            X( I ) = DCMPLX( DBLE( X( I ) ) / ABSXI,
-     $               DIMAG( X( I ) ) / ABSXI )
-         ELSE
-            X( I ) = CONE
-         END IF
-   30 CONTINUE
-      KASE = 2
-      ISAVE( 1 ) = 2
-      RETURN
+                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
 *
-*     ................ ENTRY   (ISAVE( 1 ) = 2)
-*     FIRST ITERATION.  X HAS BEEN OVERWRITTEN BY CTRANS(A)*X.
+*                    Generate left bidiagonalizing vectors in WORK(IR)
+*                    (CWorkspace: need 2*M*M+3*M, prefer 2*M*M+2*M+M*NB)
+*                    (RWorkspace: 0)
 *
-   40 CONTINUE
-      ISAVE( 2 ) = IZMAX1( N, X, 1 )
-      ISAVE( 3 ) = 2
+                     CALL ZUNGBR( 'Q', M, M, M, WORK( IR ), LDWRKR,
+     $                            WORK( ITAUQ ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
 *
-*     MAIN LOOP - ITERATIONS 2,3,...,ITMAX.
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of L in WORK(IR) and computing
+*                    right singular vectors of L in WORK(IU)
+*                    (CWorkspace: need 2*M*M)
+*                    (RWorkspace: need BDSPAC)
 *
-   50 CONTINUE
-      DO 60 I = 1, N
-         X( I ) = CZERO
-   60 CONTINUE
-      X( ISAVE( 2 ) ) = CONE
-      KASE = 1
-      ISAVE( 1 ) = 3
-      RETURN
+                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
+     $                            WORK( IU ), LDWRKU, WORK( IR ),
+     $                            LDWRKR, CDUM, 1, RWORK( IRWORK ),
+     $                            INFO )
 *
-*     ................ ENTRY   (ISAVE( 1 ) = 3)
-*     X HAS BEEN OVERWRITTEN BY A*X.
+*                    Multiply right singular vectors of L in WORK(IU) by
+*                    Q in VT, storing result in A
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
 *
-   70 CONTINUE
-      CALL ZCOPY( N, X, 1, V, 1 )
-      ESTOLD = EST
-      EST = DZSUM1( N, V, 1 )
+                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
+     $                           LDWRKU, VT, LDVT, CZERO, A, LDA )
 *
-*     TEST FOR CYCLING.
-      IF( EST.LE.ESTOLD )
-     $   GO TO 100
+*                    Copy right singular vectors of A from A to VT
+*
+                     CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+*
+*                    Copy left singular vectors of A from WORK(IR) to A
+*
+                     CALL ZLACPY( 'F', M, M, WORK( IR ), LDWRKR, A,
+     $                            LDA )
+*
+                  ELSE
+*
+*                    Insufficient workspace for a fast algorithm
+*
+                     ITAU = 1
+                     IWORK = ITAU + M
+*
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+*
+*                    Generate Q in VT
+*                    (CWorkspace: need M+N, prefer M+N*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
+*
+*                    Zero out above L in A
+*
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            A( 1, 2 ), LDA )
+*
+*                    Bidiagonalize L in A
+*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                    (RWorkspace: need M)
+*
+                     CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                    Multiply right bidiagonalizing vectors in A by Q
+*                    in VT
+*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, A, LDA,
+     $                            WORK( ITAUP ), VT, LDVT,
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                    Generate left bidiagonalizing vectors in A
+*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGBR( 'Q', M, M, M, A, LDA, WORK( ITAUQ ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
+*
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in A and computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
+*
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+     $                            LDVT, A, LDA, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
+*
+                  END IF
+*
+               ELSE IF( WNTUAS ) THEN
+*
+*                 Path 9t(N much larger than M, JOBU='S' or 'A',
+*                         JOBVT='A')
+*                 N right singular vectors to be computed in VT and
+*                 M left singular vectors to be computed in U
+*
+                  IF( LWORK.GE.M*M+MAX( N+M, 3*M ) ) THEN
+*
+*                    Sufficient workspace for a fast algorithm
+*
+                     IU = 1
+                     IF( LWORK.GE.WRKBL+LDA*M ) THEN
+*
+*                       WORK(IU) is LDA by M
+*
+                        LDWRKU = LDA
+                     ELSE
+*
+*                       WORK(IU) is M by M
+*
+                        LDWRKU = M
+                     END IF
+                     ITAU = IU + LDWRKU*M
+                     IWORK = ITAU + M
+*
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+*
+*                    Generate Q in VT
+*                    (CWorkspace: need M*M+M+N, prefer M*M+M+N*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                    Copy L to WORK(IU), zeroing out above it
+*
+                     CALL ZLACPY( 'L', M, M, A, LDA, WORK( IU ),
+     $                            LDWRKU )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            WORK( IU+LDWRKU ), LDWRKU )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
+*
+*                    Bidiagonalize L in WORK(IU), copying result to U
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
+*                    (RWorkspace: need M)
+*
+                     CALL ZGEBRD( M, M, WORK( IU ), LDWRKU, S,
+     $                            RWORK( IE ), WORK( ITAUQ ),
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'L', M, M, WORK( IU ), LDWRKU, U,
+     $                            LDU )
+*
+*                    Generate right bidiagonalizing vectors in WORK(IU)
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+(M-1)*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGBR( 'P', M, M, M, WORK( IU ), LDWRKU,
+     $                            WORK( ITAUP ), WORK( IWORK ),
+     $                            LWORK-IWORK+1, IERR )
+*
+*                    Generate left bidiagonalizing vectors in U
+*                    (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
+*
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of L in U and computing right
+*                    singular vectors of L in WORK(IU)
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: need BDSPAC)
+*
+                     CALL ZBDSQR( 'U', M, M, M, 0, S, RWORK( IE ),
+     $                            WORK( IU ), LDWRKU, U, LDU, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
+*
+*                    Multiply right singular vectors of L in WORK(IU) by
+*                    Q in VT, storing result in A
+*                    (CWorkspace: need M*M)
+*                    (RWorkspace: 0)
+*
+                     CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IU ),
+     $                           LDWRKU, VT, LDVT, CZERO, A, LDA )
+*
+*                    Copy right singular vectors of A from A to VT
+*
+                     CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+*
+                  ELSE
+*
+*                    Insufficient workspace for a fast algorithm
+*
+                     ITAU = 1
+                     IWORK = ITAU + M
+*
+*                    Compute A=L*Q, copying result to VT
+*                    (CWorkspace: need 2*M, prefer M+M*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZGELQF( M, N, A, LDA, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+*
+*                    Generate Q in VT
+*                    (CWorkspace: need M+N, prefer M+N*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                    Copy L to U, zeroing out above it
+*
+                     CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+                     CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
+     $                            U( 1, 2 ), LDU )
+                     IE = 1
+                     ITAUQ = ITAU
+                     ITAUP = ITAUQ + M
+                     IWORK = ITAUP + M
+*
+*                    Bidiagonalize L in U
+*                    (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
+*                    (RWorkspace: need M)
+*
+                     CALL ZGEBRD( M, M, U, LDU, S, RWORK( IE ),
+     $                            WORK( ITAUQ ), WORK( ITAUP ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                    Multiply right bidiagonalizing vectors in U by Q
+*                    in VT
+*                    (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNMBR( 'P', 'L', 'C', M, N, M, U, LDU,
+     $                            WORK( ITAUP ), VT, LDVT,
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+*
+*                    Generate left bidiagonalizing vectors in U
+*                    (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*                    (RWorkspace: 0)
+*
+                     CALL ZUNGBR( 'Q', M, M, M, U, LDU, WORK( ITAUQ ),
+     $                            WORK( IWORK ), LWORK-IWORK+1, IERR )
+                     IRWORK = IE + M
+*
+*                    Perform bidiagonal QR iteration, computing left
+*                    singular vectors of A in U and computing right
+*                    singular vectors of A in VT
+*                    (CWorkspace: 0)
+*                    (RWorkspace: need BDSPAC)
+*
+                     CALL ZBDSQR( 'U', M, N, M, 0, S, RWORK( IE ), VT,
+     $                            LDVT, U, LDU, CDUM, 1,
+     $                            RWORK( IRWORK ), INFO )
+*
+                  END IF
+*
+               END IF
+*
+            END IF
 *
-      DO 80 I = 1, N
-         ABSXI = ABS( X( I ) )
-         IF( ABSXI.GT.SAFMIN ) THEN
-            X( I ) = DCMPLX( DBLE( X( I ) ) / ABSXI,
-     $               DIMAG( X( I ) ) / ABSXI )
          ELSE
-            X( I ) = CONE
-         END IF
-   80 CONTINUE
-      KASE = 2
-      ISAVE( 1 ) = 4
-      RETURN
 *
-*     ................ ENTRY   (ISAVE( 1 ) = 4)
-*     X HAS BEEN OVERWRITTEN BY CTRANS(A)*X.
+*           N .LT. MNTHR
 *
-   90 CONTINUE
-      JLAST = ISAVE( 2 )
-      ISAVE( 2 ) = IZMAX1( N, X, 1 )
-      IF( ( ABS( X( JLAST ) ).NE.ABS( X( ISAVE( 2 ) ) ) ) .AND.
-     $    ( ISAVE( 3 ).LT.ITMAX ) ) THEN
-         ISAVE( 3 ) = ISAVE( 3 ) + 1
-         GO TO 50
-      END IF
+*           Path 10t(N greater than M, but not much larger)
+*           Reduce to bidiagonal form without LQ decomposition
 *
-*     ITERATION COMPLETE.  FINAL STAGE.
+            IE = 1
+            ITAUQ = 1
+            ITAUP = ITAUQ + M
+            IWORK = ITAUP + M
 *
-  100 CONTINUE
-      ALTSGN = ONE
-      DO 110 I = 1, N
-         X( I ) = DCMPLX( ALTSGN*( ONE+DBLE( I-1 ) / DBLE( N-1 ) ) )
-         ALTSGN = -ALTSGN
-  110 CONTINUE
-      KASE = 1
-      ISAVE( 1 ) = 5
-      RETURN
+*           Bidiagonalize A
+*           (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
+*           (RWorkspace: M)
 *
-*     ................ ENTRY   (ISAVE( 1 ) = 5)
-*     X HAS BEEN OVERWRITTEN BY A*X.
+            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
+     $                   WORK( ITAUP ), WORK( IWORK ), LWORK-IWORK+1,
+     $                   IERR )
+            IF( WNTUAS ) THEN
+*
+*              If left singular vectors desired in U, copy result to U
+*              and generate left bidiagonalizing vectors in U
+*              (CWorkspace: need 3*M-1, prefer 2*M+(M-1)*NB)
+*              (RWorkspace: 0)
+*
+               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
+               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IF( WNTVAS ) THEN
+*
+*              If right singular vectors desired in VT, copy result to
+*              VT and generate right bidiagonalizing vectors in VT
+*              (CWorkspace: need 2*M+NRVT, prefer 2*M+NRVT*NB)
+*              (RWorkspace: 0)
+*
+               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+               IF( WNTVA )
+     $            NRVT = N
+               IF( WNTVS )
+     $            NRVT = M
+               CALL ZUNGBR( 'P', NRVT, N, M, VT, LDVT, WORK( ITAUP ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IF( WNTUO ) THEN
+*
+*              If left singular vectors desired in A, generate left
+*              bidiagonalizing vectors in A
+*              (CWorkspace: need 3*M-1, prefer 2*M+(M-1)*NB)
+*              (RWorkspace: 0)
+*
+               CALL ZUNGBR( 'Q', M, M, N, A, LDA, WORK( ITAUQ ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IF( WNTVO ) THEN
+*
+*              If right singular vectors desired in A, generate right
+*              bidiagonalizing vectors in A
+*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
+*              (RWorkspace: 0)
+*
+               CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
+     $                      WORK( IWORK ), LWORK-IWORK+1, IERR )
+            END IF
+            IRWORK = IE + M
+            IF( WNTUAS .OR. WNTUO )
+     $         NRU = M
+            IF( WNTUN )
+     $         NRU = 0
+            IF( WNTVAS .OR. WNTVO )
+     $         NCVT = N
+            IF( WNTVN )
+     $         NCVT = 0
+            IF( ( .NOT.WNTUO ) .AND. ( .NOT.WNTVO ) ) THEN
+*
+*              Perform bidiagonal QR iteration, if desired, computing
+*              left singular vectors in U and computing right singular
+*              vectors in VT
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
+*
+               CALL ZBDSQR( 'L', M, NCVT, NRU, 0, S, RWORK( IE ), VT,
+     $                      LDVT, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                      INFO )
+            ELSE IF( ( .NOT.WNTUO ) .AND. WNTVO ) THEN
+*
+*              Perform bidiagonal QR iteration, if desired, computing
+*              left singular vectors in U and computing right singular
+*              vectors in A
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
+*
+               CALL ZBDSQR( 'L', M, NCVT, NRU, 0, S, RWORK( IE ), A,
+     $                      LDA, U, LDU, CDUM, 1, RWORK( IRWORK ),
+     $                      INFO )
+            ELSE
+*
+*              Perform bidiagonal QR iteration, if desired, computing
+*              left singular vectors in A and computing right singular
+*              vectors in VT
+*              (CWorkspace: 0)
+*              (RWorkspace: need BDSPAC)
+*
+               CALL ZBDSQR( 'L', M, NCVT, NRU, 0, S, RWORK( IE ), VT,
+     $                      LDVT, A, LDA, CDUM, 1, RWORK( IRWORK ),
+     $                      INFO )
+            END IF
+*
+         END IF
 *
-  120 CONTINUE
-      TEMP = TWO*( DZSUM1( N, X, 1 ) / DBLE( 3*N ) )
-      IF( TEMP.GT.EST ) THEN
-         CALL ZCOPY( N, X, 1, V, 1 )
-         EST = TEMP
       END IF
 *
-  130 CONTINUE
-      KASE = 0
+*     Undo scaling if necessary
+*
+      IF( ISCL.EQ.1 ) THEN
+         IF( ANRM.GT.BIGNUM )
+     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
+     $                   IERR )
+         IF( INFO.NE.0 .AND. ANRM.GT.BIGNUM )
+     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1,
+     $                   RWORK( IE ), MINMN, IERR )
+         IF( ANRM.LT.SMLNUM )
+     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
+     $                   IERR )
+         IF( INFO.NE.0 .AND. ANRM.LT.SMLNUM )
+     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1,
+     $                   RWORK( IE ), MINMN, IERR )
+      END IF
+*
+*     Return optimal workspace in WORK(1)
+*
+      WORK( 1 ) = MAXWRK
+*
       RETURN
 *
-*     End of ZLACN2
+*     End of ZGESVD
 *
       END
-*> \brief \b ZLACPY copies all or part of one two-dimensional array to another.
+*> \brief <b> ZGESVX computes the solution to system of linear equations A * X = B for GE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -12434,26 +14019,33 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLACPY + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacpy.f"> 
+*> Download ZGESVX + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesvx.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacpy.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesvx.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacpy.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesvx.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLACPY( UPLO, M, N, A, LDA, B, LDB )
+*       SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+*                          EQUED, R, C, B, LDB, X, LDX, RCOND, FERR, BERR,
+*                          WORK, RWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            LDA, LDB, M, N
+*       CHARACTER          EQUED, FACT, TRANS
+*       INTEGER            INFO, LDA, LDAF, LDB, LDX, N, NRHS
+*       DOUBLE PRECISION   RCOND
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), B( LDB, * )
+*       INTEGER            IPIV( * )
+*       DOUBLE PRECISION   BERR( * ), C( * ), FERR( * ), R( * ),
+*      $                   RWORK( * )
+*       COMPLEX*16         A( LDA, * ), AF( LDAF, * ), B( LDB, * ),
+*      $                   WORK( * ), X( LDX, * )
 *       ..
 *  
 *
@@ -12462,130 +14054,569 @@
 *>
 *> \verbatim
 *>
-*> ZLACPY copies all or part of a two-dimensional matrix A to another
-*> matrix B.
+*> ZGESVX uses the LU factorization to compute the solution to a complex
+*> system of linear equations
+*>    A * X = B,
+*> where A is an N-by-N matrix and X and B are N-by-NRHS matrices.
+*>
+*> Error bounds on the solution and a condition estimate are also
+*> provided.
+*> \endverbatim
+*
+*> \par Description:
+*  =================
+*>
+*> \verbatim
+*>
+*> The following steps are performed:
+*>
+*> 1. If FACT = 'E', real scaling factors are computed to equilibrate
+*>    the system:
+*>       TRANS = 'N':  diag(R)*A*diag(C)     *inv(diag(C))*X = diag(R)*B
+*>       TRANS = 'T': (diag(R)*A*diag(C))**T *inv(diag(R))*X = diag(C)*B
+*>       TRANS = 'C': (diag(R)*A*diag(C))**H *inv(diag(R))*X = diag(C)*B
+*>    Whether or not the system will be equilibrated depends on the
+*>    scaling of the matrix A, but if equilibration is used, A is
+*>    overwritten by diag(R)*A*diag(C) and B by diag(R)*B (if TRANS='N')
+*>    or diag(C)*B (if TRANS = 'T' or 'C').
+*>
+*> 2. If FACT = 'N' or 'E', the LU decomposition is used to factor the
+*>    matrix A (after equilibration if FACT = 'E') as
+*>       A = P * L * U,
+*>    where P is a permutation matrix, L is a unit lower triangular
+*>    matrix, and U is upper triangular.
+*>
+*> 3. If some U(i,i)=0, so that U is exactly singular, then the routine
+*>    returns with INFO = i. Otherwise, the factored form of A is used
+*>    to estimate the condition number of the matrix A.  If the
+*>    reciprocal of the condition number is less than machine precision,
+*>    INFO = N+1 is returned as a warning, but the routine still goes on
+*>    to solve for X and compute error bounds as described below.
+*>
+*> 4. The system of equations is solved for X using the factored form
+*>    of A.
+*>
+*> 5. Iterative refinement is applied to improve the computed solution
+*>    matrix and calculate error bounds and backward error estimates
+*>    for it.
+*>
+*> 6. If equilibration was used, the matrix X is premultiplied by
+*>    diag(C) (if TRANS = 'N') or diag(R) (if TRANS = 'T' or 'C') so
+*>    that it solves the original system before equilibration.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] UPLO
+*> \param[in] FACT
 *> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies the part of the matrix A to be copied to B.
-*>          = 'U':      Upper triangular part
-*>          = 'L':      Lower triangular part
-*>          Otherwise:  All of the matrix A
+*>          FACT is CHARACTER*1
+*>          Specifies whether or not the factored form of the matrix A is
+*>          supplied on entry, and if not, whether the matrix A should be
+*>          equilibrated before it is factored.
+*>          = 'F':  On entry, AF and IPIV contain the factored form of A.
+*>                  If EQUED is not 'N', the matrix A has been
+*>                  equilibrated with scaling factors given by R and C.
+*>                  A, AF, and IPIV are not modified.
+*>          = 'N':  The matrix A will be copied to AF and factored.
+*>          = 'E':  The matrix A will be equilibrated if necessary, then
+*>                  copied to AF and factored.
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in] TRANS
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
+*>          TRANS is CHARACTER*1
+*>          Specifies the form of the system of equations:
+*>          = 'N':  A * X = B     (No transpose)
+*>          = 'T':  A**T * X = B  (Transpose)
+*>          = 'C':  A**H * X = B  (Conjugate transpose)
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
+*>          The number of linear equations, i.e., the order of the
+*>          matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of columns
+*>          of the matrices B and X.  NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The m by n matrix A.  If UPLO = 'U', only the upper trapezium
-*>          is accessed; if UPLO = 'L', only the lower trapezium is
-*>          accessed.
+*>          On entry, the N-by-N matrix A.  If FACT = 'F' and EQUED is
+*>          not 'N', then A must have been equilibrated by the scaling
+*>          factors in R and/or C.  A is not modified if FACT = 'F' or
+*>          'N', or if FACT = 'E' and EQUED = 'N' on exit.
+*>
+*>          On exit, if EQUED .ne. 'N', A is scaled as follows:
+*>          EQUED = 'R':  A := diag(R) * A
+*>          EQUED = 'C':  A := A * diag(C)
+*>          EQUED = 'B':  A := diag(R) * A * diag(C).
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] B
+*> \param[in,out] AF
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,N)
-*>          On exit, B = A in the locations specified by UPLO.
+*>          AF is COMPLEX*16 array, dimension (LDAF,N)
+*>          If FACT = 'F', then AF is an input argument and on entry
+*>          contains the factors L and U from the factorization
+*>          A = P*L*U as computed by ZGETRF.  If EQUED .ne. 'N', then
+*>          AF is the factored form of the equilibrated matrix A.
+*>
+*>          If FACT = 'N', then AF is an output argument and on exit
+*>          returns the factors L and U from the factorization A = P*L*U
+*>          of the original matrix A.
+*>
+*>          If FACT = 'E', then AF is an output argument and on exit
+*>          returns the factors L and U from the factorization A = P*L*U
+*>          of the equilibrated matrix A (see the description of A for
+*>          the form of the equilibrated matrix).
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in] LDAF
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B.  LDB >= max(1,M).
+*>          LDAF is INTEGER
+*>          The leading dimension of the array AF.  LDAF >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N)
+*>          If FACT = 'F', then IPIV is an input argument and on entry
+*>          contains the pivot indices from the factorization A = P*L*U
+*>          as computed by ZGETRF; row i of the matrix was interchanged
+*>          with row IPIV(i).
+*>
+*>          If FACT = 'N', then IPIV is an output argument and on exit
+*>          contains the pivot indices from the factorization A = P*L*U
+*>          of the original matrix A.
+*>
+*>          If FACT = 'E', then IPIV is an output argument and on exit
+*>          contains the pivot indices from the factorization A = P*L*U
+*>          of the equilibrated matrix A.
+*> \endverbatim
+*>
+*> \param[in,out] EQUED
+*> \verbatim
+*>          EQUED is CHARACTER*1
+*>          Specifies the form of equilibration that was done.
+*>          = 'N':  No equilibration (always true if FACT = 'N').
+*>          = 'R':  Row equilibration, i.e., A has been premultiplied by
+*>                  diag(R).
+*>          = 'C':  Column equilibration, i.e., A has been postmultiplied
+*>                  by diag(C).
+*>          = 'B':  Both row and column equilibration, i.e., A has been
+*>                  replaced by diag(R) * A * diag(C).
+*>          EQUED is an input argument if FACT = 'F'; otherwise, it is an
+*>          output argument.
+*> \endverbatim
+*>
+*> \param[in,out] R
+*> \verbatim
+*>          R is DOUBLE PRECISION array, dimension (N)
+*>          The row scale factors for A.  If EQUED = 'R' or 'B', A is
+*>          multiplied on the left by diag(R); if EQUED = 'N' or 'C', R
+*>          is not accessed.  R is an input argument if FACT = 'F';
+*>          otherwise, R is an output argument.  If FACT = 'F' and
+*>          EQUED = 'R' or 'B', each element of R must be positive.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension (N)
+*>          The column scale factors for A.  If EQUED = 'C' or 'B', A is
+*>          multiplied on the right by diag(C); if EQUED = 'N' or 'R', C
+*>          is not accessed.  C is an input argument if FACT = 'F';
+*>          otherwise, C is an output argument.  If FACT = 'F' and
+*>          EQUED = 'C' or 'B', each element of C must be positive.
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the N-by-NRHS right hand side matrix B.
+*>          On exit,
+*>          if EQUED = 'N', B is not modified;
+*>          if TRANS = 'N' and EQUED = 'R' or 'B', B is overwritten by
+*>          diag(R)*B;
+*>          if TRANS = 'T' or 'C' and EQUED = 'C' or 'B', B is
+*>          overwritten by diag(C)*B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension (LDX,NRHS)
+*>          If INFO = 0 or INFO = N+1, the N-by-NRHS solution matrix X
+*>          to the original system of equations.  Note that A and B are
+*>          modified on exit if EQUED .ne. 'N', and the solution to the
+*>          equilibrated system is inv(diag(C))*X if TRANS = 'N' and
+*>          EQUED = 'C' or 'B', or inv(diag(R))*X if TRANS = 'T' or 'C'
+*>          and EQUED = 'R' or 'B'.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X.  LDX >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] RCOND
+*> \verbatim
+*>          RCOND is DOUBLE PRECISION
+*>          The estimate of the reciprocal condition number of the matrix
+*>          A after equilibration (if done).  If RCOND is less than the
+*>          machine precision (in particular, if RCOND = 0), the matrix
+*>          is singular to working precision.  This condition is
+*>          indicated by a return code of INFO > 0.
+*> \endverbatim
+*>
+*> \param[out] FERR
+*> \verbatim
+*>          FERR is DOUBLE PRECISION array, dimension (NRHS)
+*>          The estimated forward error bound for each solution vector
+*>          X(j) (the j-th column of the solution matrix X).
+*>          If XTRUE is the true solution corresponding to X(j), FERR(j)
+*>          is an estimated upper bound for the magnitude of the largest
+*>          element in (X(j) - XTRUE) divided by the magnitude of the
+*>          largest element in X(j).  The estimate is as reliable as
+*>          the estimate for RCOND, and is almost always a slight
+*>          overestimate of the true error.
+*> \endverbatim
+*>
+*> \param[out] BERR
+*> \verbatim
+*>          BERR is DOUBLE PRECISION array, dimension (NRHS)
+*>          The componentwise relative backward error of each solution
+*>          vector X(j) (i.e., the smallest relative change in
+*>          any element of A or B that makes X(j) an exact solution).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
+*>          On exit, RWORK(1) contains the reciprocal pivot growth
+*>          factor norm(A)/norm(U). The "max absolute element" norm is
+*>          used. If RWORK(1) is much less than 1, then the stability
+*>          of the LU factorization of the (equilibrated) matrix A
+*>          could be poor. This also means that the solution X, condition
+*>          estimator RCOND, and forward error bound FERR could be
+*>          unreliable. If factorization fails with 0<INFO<=N, then
+*>          RWORK(1) contains the reciprocal pivot growth factor for the
+*>          leading INFO columns of A.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, and i is
+*>                <= N:  U(i,i) is exactly zero.  The factorization has
+*>                       been completed, but the factor U is exactly
+*>                       singular, so the solution and error bounds
+*>                       could not be computed. RCOND = 0 is returned.
+*>                = N+1: U is nonsingular, but RCOND is less than machine
+*>                       precision, meaning that the matrix is singular
+*>                       to working precision.  Nevertheless, the
+*>                       solution and error bounds are computed because
+*>                       there are a number of situations where the
+*>                       computed solution can be more accurate than the
+*>                       value of RCOND would suggest.
 *> \endverbatim
 *
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date April 2012
+*
+*> \ingroup complex16GEsolve
 *
 *  =====================================================================
-      SUBROUTINE ZLACPY( UPLO, M, N, A, LDA, B, LDB )
+      SUBROUTINE ZGESVX( FACT, TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV,
+     $                   EQUED, R, C, B, LDB, X, LDX, RCOND, FERR, BERR,
+     $                   WORK, RWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.4.1) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     April 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            LDA, LDB, M, N
+      CHARACTER          EQUED, FACT, TRANS
+      INTEGER            INFO, LDA, LDAF, LDB, LDX, N, NRHS
+      DOUBLE PRECISION   RCOND
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), B( LDB, * )
+      INTEGER            IPIV( * )
+      DOUBLE PRECISION   BERR( * ), C( * ), FERR( * ), R( * ),
+     $                   RWORK( * )
+      COMPLEX*16         A( LDA, * ), AF( LDAF, * ), B( LDB, * ),
+     $                   WORK( * ), X( LDX, * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
 *     .. Local Scalars ..
-      INTEGER            I, J
+      LOGICAL            COLEQU, EQUIL, NOFACT, NOTRAN, ROWEQU
+      CHARACTER          NORM
+      INTEGER            I, INFEQU, J
+      DOUBLE PRECISION   AMAX, ANORM, BIGNUM, COLCND, RCMAX, RCMIN,
+     $                   ROWCND, RPVGRW, SMLNUM
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      DOUBLE PRECISION   DLAMCH, ZLANGE, ZLANTR
+      EXTERNAL           LSAME, DLAMCH, ZLANGE, ZLANTR
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZGECON, ZGEEQU, ZGERFS, ZGETRF, ZGETRS,
+     $                   ZLACPY, ZLAQGE
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MIN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-      IF( LSAME( UPLO, 'U' ) ) THEN
-         DO 20 J = 1, N
-            DO 10 I = 1, MIN( J, M )
-               B( I, J ) = A( I, J )
-   10       CONTINUE
-   20    CONTINUE
+      INFO = 0
+      NOFACT = LSAME( FACT, 'N' )
+      EQUIL = LSAME( FACT, 'E' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      IF( NOFACT .OR. EQUIL ) THEN
+         EQUED = 'N'
+         ROWEQU = .FALSE.
+         COLEQU = .FALSE.
+      ELSE
+         ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
+         COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
+         SMLNUM = DLAMCH( 'Safe minimum' )
+         BIGNUM = ONE / SMLNUM
+      END IF
 *
-      ELSE IF( LSAME( UPLO, 'L' ) ) THEN
-         DO 40 J = 1, N
-            DO 30 I = J, M
-               B( I, J ) = A( I, J )
-   30       CONTINUE
-   40    CONTINUE
+*     Test the input parameters.
 *
+      IF( .NOT.NOFACT .AND. .NOT.EQUIL .AND. .NOT.LSAME( FACT, 'F' ) )
+     $     THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $         LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -6
+      ELSE IF( LDAF.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      ELSE IF( LSAME( FACT, 'F' ) .AND. .NOT.
+     $         ( ROWEQU .OR. COLEQU .OR. LSAME( EQUED, 'N' ) ) ) THEN
+         INFO = -10
       ELSE
-         DO 60 J = 1, N
-            DO 50 I = 1, M
-               B( I, J ) = A( I, J )
+         IF( ROWEQU ) THEN
+            RCMIN = BIGNUM
+            RCMAX = ZERO
+            DO 10 J = 1, N
+               RCMIN = MIN( RCMIN, R( J ) )
+               RCMAX = MAX( RCMAX, R( J ) )
+   10       CONTINUE
+            IF( RCMIN.LE.ZERO ) THEN
+               INFO = -11
+            ELSE IF( N.GT.0 ) THEN
+               ROWCND = MAX( RCMIN, SMLNUM ) / MIN( RCMAX, BIGNUM )
+            ELSE
+               ROWCND = ONE
+            END IF
+         END IF
+         IF( COLEQU .AND. INFO.EQ.0 ) THEN
+            RCMIN = BIGNUM
+            RCMAX = ZERO
+            DO 20 J = 1, N
+               RCMIN = MIN( RCMIN, C( J ) )
+               RCMAX = MAX( RCMAX, C( J ) )
+   20       CONTINUE
+            IF( RCMIN.LE.ZERO ) THEN
+               INFO = -12
+            ELSE IF( N.GT.0 ) THEN
+               COLCND = MAX( RCMIN, SMLNUM ) / MIN( RCMAX, BIGNUM )
+            ELSE
+               COLCND = ONE
+            END IF
+         END IF
+         IF( INFO.EQ.0 ) THEN
+            IF( LDB.LT.MAX( 1, N ) ) THEN
+               INFO = -14
+            ELSE IF( LDX.LT.MAX( 1, N ) ) THEN
+               INFO = -16
+            END IF
+         END IF
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGESVX', -INFO )
+         RETURN
+      END IF
+*
+      IF( EQUIL ) THEN
+*
+*        Compute row and column scalings to equilibrate the matrix A.
+*
+         CALL ZGEEQU( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX, INFEQU )
+         IF( INFEQU.EQ.0 ) THEN
+*
+*           Equilibrate the matrix.
+*
+            CALL ZLAQGE( N, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                   EQUED )
+            ROWEQU = LSAME( EQUED, 'R' ) .OR. LSAME( EQUED, 'B' )
+            COLEQU = LSAME( EQUED, 'C' ) .OR. LSAME( EQUED, 'B' )
+         END IF
+      END IF
+*
+*     Scale the right hand side.
+*
+      IF( NOTRAN ) THEN
+         IF( ROWEQU ) THEN
+            DO 40 J = 1, NRHS
+               DO 30 I = 1, N
+                  B( I, J ) = R( I )*B( I, J )
+   30          CONTINUE
+   40       CONTINUE
+         END IF
+      ELSE IF( COLEQU ) THEN
+         DO 60 J = 1, NRHS
+            DO 50 I = 1, N
+               B( I, J ) = C( I )*B( I, J )
    50       CONTINUE
    60    CONTINUE
       END IF
 *
+      IF( NOFACT .OR. EQUIL ) THEN
+*
+*        Compute the LU factorization of A.
+*
+         CALL ZLACPY( 'Full', N, N, A, LDA, AF, LDAF )
+         CALL ZGETRF( N, N, AF, LDAF, IPIV, INFO )
+*
+*        Return if INFO is non-zero.
+*
+         IF( INFO.GT.0 ) THEN
+*
+*           Compute the reciprocal pivot growth factor of the
+*           leading rank-deficient INFO columns of A.
+*
+            RPVGRW = ZLANTR( 'M', 'U', 'N', INFO, INFO, AF, LDAF,
+     $               RWORK )
+            IF( RPVGRW.EQ.ZERO ) THEN
+               RPVGRW = ONE
+            ELSE
+               RPVGRW = ZLANGE( 'M', N, INFO, A, LDA, RWORK ) /
+     $                  RPVGRW
+            END IF
+            RWORK( 1 ) = RPVGRW
+            RCOND = ZERO
+            RETURN
+         END IF
+      END IF
+*
+*     Compute the norm of the matrix A and the
+*     reciprocal pivot growth factor RPVGRW.
+*
+      IF( NOTRAN ) THEN
+         NORM = '1'
+      ELSE
+         NORM = 'I'
+      END IF
+      ANORM = ZLANGE( NORM, N, N, A, LDA, RWORK )
+      RPVGRW = ZLANTR( 'M', 'U', 'N', N, N, AF, LDAF, RWORK )
+      IF( RPVGRW.EQ.ZERO ) THEN
+         RPVGRW = ONE
+      ELSE
+         RPVGRW = ZLANGE( 'M', N, N, A, LDA, RWORK ) / RPVGRW
+      END IF
+*
+*     Compute the reciprocal of the condition number of A.
+*
+      CALL ZGECON( NORM, N, AF, LDAF, ANORM, RCOND, WORK, RWORK, INFO )
+*
+*     Compute the solution matrix X.
+*
+      CALL ZLACPY( 'Full', N, NRHS, B, LDB, X, LDX )
+      CALL ZGETRS( TRANS, N, NRHS, AF, LDAF, IPIV, X, LDX, INFO )
+*
+*     Use iterative refinement to improve the computed solution and
+*     compute error bounds and backward error estimates for it.
+*
+      CALL ZGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B, LDB, X,
+     $             LDX, FERR, BERR, WORK, RWORK, INFO )
+*
+*     Transform the solution matrix X to a solution of the original
+*     system.
+*
+      IF( NOTRAN ) THEN
+         IF( COLEQU ) THEN
+            DO 80 J = 1, NRHS
+               DO 70 I = 1, N
+                  X( I, J ) = C( I )*X( I, J )
+   70          CONTINUE
+   80       CONTINUE
+            DO 90 J = 1, NRHS
+               FERR( J ) = FERR( J ) / COLCND
+   90       CONTINUE
+         END IF
+      ELSE IF( ROWEQU ) THEN
+         DO 110 J = 1, NRHS
+            DO 100 I = 1, N
+               X( I, J ) = R( I )*X( I, J )
+  100       CONTINUE
+  110    CONTINUE
+         DO 120 J = 1, NRHS
+            FERR( J ) = FERR( J ) / ROWCND
+  120    CONTINUE
+      END IF
+*
+*     Set INFO = N+1 if the matrix is singular to working precision.
+*
+      IF( RCOND.LT.DLAMCH( 'Epsilon' ) )
+     $   INFO = N + 1
+*
+      RWORK( 1 ) = RPVGRW
       RETURN
 *
-*     End of ZLACPY
+*     End of ZGESVX
 *
       END
-*> \brief \b ZLADIV performs complex division in real arithmetic, avoiding unnecessary overflow.
+*> \brief \b ZGETC2 computes the LU factorization with complete pivoting of the general n-by-n matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -12593,22 +14624,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLADIV + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zladiv.f"> 
+*> Download ZGETC2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetc2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zladiv.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetc2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zladiv.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetc2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       COMPLEX*16     FUNCTION ZLADIV( X, Y )
+*       SUBROUTINE ZGETC2( N, A, LDA, IPIV, JPIV, INFO )
 * 
 *       .. Scalar Arguments ..
-*       COMPLEX*16         X, Y
+*       INTEGER            INFO, LDA, N
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IPIV( * ), JPIV( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -12617,23 +14652,60 @@
 *>
 *> \verbatim
 *>
-*> ZLADIV := X / Y, where X and Y are complex.  The computation of X / Y
-*> will not overflow on an intermediary step unless the results
-*> overflows.
+*> ZGETC2 computes an LU factorization, using complete pivoting, of the
+*> n-by-n matrix A. The factorization has the form A = P * L * U * Q,
+*> where P and Q are permutation matrices, L is lower triangular with
+*> unit diagonal elements and U is upper triangular.
+*>
+*> This is a level 1 BLAS version of the algorithm.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] X
+*> \param[in] N
 *> \verbatim
-*>          X is COMPLEX*16
+*>          N is INTEGER
+*>          The order of the matrix A. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] Y
+*> \param[in,out] A
 *> \verbatim
-*>          Y is COMPLEX*16
-*>          The complex scalars X and Y.
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the n-by-n matrix to be factored.
+*>          On exit, the factors L and U from the factorization
+*>          A = P*L*U*Q; the unit diagonal elements of L are not stored.
+*>          If U(k, k) appears to be less than SMIN, U(k, k) is given the
+*>          value of SMIN, giving a nonsingular perturbed system.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1, N).
+*> \endverbatim
+*>
+*> \param[out] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N).
+*>          The pivot indices; for 1 <= i <= N, row i of the
+*>          matrix has been interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[out] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N).
+*>          The pivot indices; for 1 <= j <= N, column j of the
+*>          matrix has been interchanged with column JPIV(j).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>           = 0: successful exit
+*>           > 0: if INFO = k, U(k, k) is likely to produce overflow if
+*>                one tries to solve for x in Ax = b. So U is perturbed
+*>                to avoid the overflow.
 *> \endverbatim
 *
 *  Authors:
@@ -12644,45 +14716,123 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2013
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16GEauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
 *
 *  =====================================================================
-      COMPLEX*16     FUNCTION ZLADIV( X, Y )
+      SUBROUTINE ZGETC2( N, A, LDA, IPIV, JPIV, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.5.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2013
 *
 *     .. Scalar Arguments ..
-      COMPLEX*16         X, Y
+      INTEGER            INFO, LDA, N
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IPIV( * ), JPIV( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
 *     .. Local Scalars ..
-      DOUBLE PRECISION   ZI, ZR
+      INTEGER            I, IP, IPV, J, JP, JPV
+      DOUBLE PRECISION   BIGNUM, EPS, SMIN, SMLNUM, XMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLADIV
+      EXTERNAL           ZGERU, ZSWAP
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, DIMAG
+      INTRINSIC          ABS, DCMPLX, MAX
 *     ..
 *     .. Executable Statements ..
 *
-      CALL DLADIV( DBLE( X ), DIMAG( X ), DBLE( Y ), DIMAG( Y ), ZR,
-     $             ZI )
-      ZLADIV = DCMPLX( ZR, ZI )
+*     Set constants to control overflow
+*
+      INFO = 0
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' ) / EPS
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+*
+*     Factorize A using complete pivoting.
+*     Set pivots less than SMIN to SMIN
+*
+      DO 40 I = 1, N - 1
+*
+*        Find max element in matrix A
+*
+         XMAX = ZERO
+         DO 20 IP = I, N
+            DO 10 JP = I, N
+               IF( ABS( A( IP, JP ) ).GE.XMAX ) THEN
+                  XMAX = ABS( A( IP, JP ) )
+                  IPV = IP
+                  JPV = JP
+               END IF
+   10       CONTINUE
+   20    CONTINUE
+         IF( I.EQ.1 )
+     $      SMIN = MAX( EPS*XMAX, SMLNUM )
+*
+*        Swap rows
+*
+         IF( IPV.NE.I )
+     $      CALL ZSWAP( N, A( IPV, 1 ), LDA, A( I, 1 ), LDA )
+         IPIV( I ) = IPV
+*
+*        Swap columns
+*
+         IF( JPV.NE.I )
+     $      CALL ZSWAP( N, A( 1, JPV ), 1, A( 1, I ), 1 )
+         JPIV( I ) = JPV
+*
+*        Check for singularity
+*
+         IF( ABS( A( I, I ) ).LT.SMIN ) THEN
+            INFO = I
+            A( I, I ) = DCMPLX( SMIN, ZERO )
+         END IF
+         DO 30 J = I + 1, N
+            A( J, I ) = A( J, I ) / A( I, I )
+   30    CONTINUE
+         CALL ZGERU( N-I, N-I, -DCMPLX( ONE ), A( I+1, I ), 1,
+     $               A( I, I+1 ), LDA, A( I+1, I+1 ), LDA )
+   40 CONTINUE
+*
+      IF( ABS( A( N, N ) ).LT.SMIN ) THEN
+         INFO = N
+         A( N, N ) = DCMPLX( SMIN, ZERO )
+      END IF
+*
+*     Set last pivots to N
+*
+      IPIV( N ) = N
+      JPIV( N ) = N
 *
       RETURN
 *
-*     End of ZLADIV
+*     End of ZGETC2
 *
       END
-*> \brief \b ZLAHQR computes the eigenvalues and Schur factorization of an upper Hessenberg matrix, using the double-shift/single-shift QR algorithm.
+*> \brief \b ZGETF2 computes the LU factorization of a general m-by-n matrix using partial pivoting with row interchanges (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -12690,27 +14840,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAHQR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahqr.f"> 
+*> Download ZGETF2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetf2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlahqr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetf2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahqr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetf2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-*                          IHIZ, Z, LDZ, INFO )
+*       SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, N
-*       LOGICAL            WANTT, WANTZ
+*       INTEGER            INFO, LDA, M, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), W( * ), Z( LDZ, * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -12719,132 +14868,63 @@
 *>
 *> \verbatim
 *>
-*>    ZLAHQR is an auxiliary routine called by CHSEQR to update the
-*>    eigenvalues and Schur decomposition already computed by CHSEQR, by
-*>    dealing with the Hessenberg submatrix in rows and columns ILO to
-*>    IHI.
+*> ZGETF2 computes an LU factorization of a general m-by-n matrix A
+*> using partial pivoting with row interchanges.
+*>
+*> The factorization has the form
+*>    A = P * L * U
+*> where P is a permutation matrix, L is lower triangular with unit
+*> diagonal elements (lower trapezoidal if m > n), and U is upper
+*> triangular (upper trapezoidal if m < n).
+*>
+*> This is the right-looking Level 2 BLAS version of the algorithm.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] WANTT
-*> \verbatim
-*>          WANTT is LOGICAL
-*>          = .TRUE. : the full Schur form T is required;
-*>          = .FALSE.: only eigenvalues are required.
-*> \endverbatim
-*>
-*> \param[in] WANTZ
+*> \param[in] M
 *> \verbatim
-*>          WANTZ is LOGICAL
-*>          = .TRUE. : the matrix of Schur vectors Z is required;
-*>          = .FALSE.: Schur vectors are not required.
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix H.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in] ILO
-*> \verbatim
-*>          ILO is INTEGER
-*> \endverbatim
-*>
-*> \param[in] IHI
-*> \verbatim
-*>          IHI is INTEGER
-*>          It is assumed that H is already upper triangular in rows and
-*>          columns IHI+1:N, and that H(ILO,ILO-1) = 0 (unless ILO = 1).
-*>          ZLAHQR works primarily with the Hessenberg submatrix in rows
-*>          and columns ILO to IHI, but applies transformations to all of
-*>          H if WANTT is .TRUE..
-*>          1 <= ILO <= max(1,IHI); IHI <= N.
-*> \endverbatim
-*>
-*> \param[in,out] H
-*> \verbatim
-*>          H is COMPLEX*16 array, dimension (LDH,N)
-*>          On entry, the upper Hessenberg matrix H.
-*>          On exit, if INFO is zero and if WANTT is .TRUE., then H
-*>          is upper triangular in rows and columns ILO:IHI.  If INFO
-*>          is zero and if WANTT is .FALSE., then the contents of H
-*>          are unspecified on exit.  The output state of H in case
-*>          INF is positive is below under the description of INFO.
-*> \endverbatim
-*>
-*> \param[in] LDH
-*> \verbatim
-*>          LDH is INTEGER
-*>          The leading dimension of the array H. LDH >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] W
-*> \verbatim
-*>          W is COMPLEX*16 array, dimension (N)
-*>          The computed eigenvalues ILO to IHI are stored in the
-*>          corresponding elements of W. If WANTT is .TRUE., the
-*>          eigenvalues are stored in the same order as on the diagonal
-*>          of the Schur form returned in H, with W(i) = H(i,i).
-*> \endverbatim
-*>
-*> \param[in] ILOZ
-*> \verbatim
-*>          ILOZ is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] IHIZ
+*> \param[in,out] A
 *> \verbatim
-*>          IHIZ is INTEGER
-*>          Specify the rows of Z to which transformations must be
-*>          applied if WANTZ is .TRUE..
-*>          1 <= ILOZ <= ILO; IHI <= IHIZ <= N.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the m by n matrix to be factored.
+*>          On exit, the factors L and U from the factorization
+*>          A = P*L*U; the unit diagonal elements of L are not stored.
 *> \endverbatim
 *>
-*> \param[in,out] Z
+*> \param[in] LDA
 *> \verbatim
-*>          Z is COMPLEX*16 array, dimension (LDZ,N)
-*>          If WANTZ is .TRUE., on entry Z must contain the current
-*>          matrix Z of transformations accumulated by CHSEQR, and on
-*>          exit Z has been updated; transformations are applied only to
-*>          the submatrix Z(ILOZ:IHIZ,ILO:IHI).
-*>          If WANTZ is .FALSE., Z is not referenced.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in] LDZ
+*> \param[out] IPIV
 *> \verbatim
-*>          LDZ is INTEGER
-*>          The leading dimension of the array Z. LDZ >= max(1,N).
+*>          IPIV is INTEGER array, dimension (min(M,N))
+*>          The pivot indices; for 1 <= i <= min(M,N), row i of the
+*>          matrix was interchanged with row IPIV(i).
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>           =   0: successful exit
-*>          .GT. 0: if INFO = i, ZLAHQR failed to compute all the
-*>                  eigenvalues ILO to IHI in a total of 30 iterations
-*>                  per eigenvalue; elements i+1:ihi of W contain
-*>                  those eigenvalues which have been successfully
-*>                  computed.
-*>
-*>                  If INFO .GT. 0 and WANTT is .FALSE., then on exit,
-*>                  the remaining unconverged eigenvalues are the
-*>                  eigenvalues of the upper Hessenberg matrix
-*>                  rows and columns ILO thorugh INFO of the final,
-*>                  output value of H.
-*>
-*>                  If INFO .GT. 0 and WANTT is .TRUE., then on exit
-*>          (*)       (initial value of H)*U  = U*(final value of H)
-*>                  where U is an orthognal matrix.    The final
-*>                  value of H is upper Hessenberg and triangular in
-*>                  rows and columns INFO+1 through IHI.
-*>
-*>                  If INFO .GT. 0 and WANTZ is .TRUE., then on exit
-*>                      (final value of Z)  = (initial value of Z)*U
-*>                  where U is the orthogonal matrix in (*)
-*>                  (regardless of the value of WANTT.)
+*>          = 0: successful exit
+*>          < 0: if INFO = -k, the k-th argument had an illegal value
+*>          > 0: if INFO = k, U(k,k) is exactly zero. The factorization
+*>               has been completed, but the factor U is exactly
+*>               singular, and division by zero will occur if it is used
+*>               to solve a system of equations.
 *> \endverbatim
 *
 *  Authors:
@@ -12857,400 +14937,116 @@
 *
 *> \date September 2012
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16GEcomputational
 *
-*> \par Contributors:
-*  ==================
-*>
-*> \verbatim
-*>
-*>     02-96 Based on modifications by
-*>     David Day, Sandia National Laboratory, USA
-*>
-*>     12-04 Further modifications by
-*>     Ralph Byers, University of Kansas, USA
-*>     This is a modified version of ZLAHQR from LAPACK version 3.0.
-*>     It is (1) more robust against overflow and underflow and
-*>     (2) adopts the more conservative Ahues & Tisseur stopping
-*>     criterion (LAWN 122, 1997).
-*> \endverbatim
-*>
 *  =====================================================================
-      SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-     $                   IHIZ, Z, LDZ, INFO )
+      SUBROUTINE ZGETF2( M, N, A, LDA, IPIV, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     September 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, N
-      LOGICAL            WANTT, WANTZ
+      INTEGER            INFO, LDA, M, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), W( * ), Z( LDZ, * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
-*  =========================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            ITMAX
-      PARAMETER          ( ITMAX = 30 )
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   RZERO, RONE, HALF
-      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0, HALF = 0.5d0 )
-      DOUBLE PRECISION   DAT1
-      PARAMETER          ( DAT1 = 3.0d0 / 4.0d0 )
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         CDUM, H11, H11S, H22, SC, SUM, T, T1, TEMP, U,
-     $                   V2, X, Y
-      DOUBLE PRECISION   AA, AB, BA, BB, H10, H21, RTEMP, S, SAFMAX,
-     $                   SAFMIN, SMLNUM, SX, T2, TST, ULP
-      INTEGER            I, I1, I2, ITS, J, JHI, JLO, K, L, M, NH, NZ
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         V( 2 )
+      DOUBLE PRECISION   SFMIN
+      INTEGER            I, J, JP
 *     ..
 *     .. External Functions ..
-      COMPLEX*16         ZLADIV
       DOUBLE PRECISION   DLAMCH
-      EXTERNAL           ZLADIV, DLAMCH
+      INTEGER            IZAMAX
+      EXTERNAL           DLAMCH, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZCOPY, ZLARFG, ZSCAL
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
+      EXTERNAL           XERBLA, ZGERU, ZSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
-*     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-      INFO = 0
-*
-*     Quick return if possible
+*     Test the input parameters.
 *
-      IF( N.EQ.0 )
-     $   RETURN
-      IF( ILO.EQ.IHI ) THEN
-         W( ILO ) = H( ILO, ILO )
-         RETURN
-      END IF
-*
-*     ==== clear out the trash ====
-      DO 10 J = ILO, IHI - 3
-         H( J+2, J ) = ZERO
-         H( J+3, J ) = ZERO
-   10 CONTINUE
-      IF( ILO.LE.IHI-2 )
-     $   H( IHI, IHI-2 ) = ZERO
-*     ==== ensure that subdiagonal entries are real ====
-      IF( WANTT ) THEN
-         JLO = 1
-         JHI = N
-      ELSE
-         JLO = ILO
-         JHI = IHI
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
       END IF
-      DO 20 I = ILO + 1, IHI
-         IF( DIMAG( H( I, I-1 ) ).NE.RZERO ) THEN
-*           ==== The following redundant normalization
-*           .    avoids problems with both gradual and
-*           .    sudden underflow in ABS(H(I,I-1)) ====
-            SC = H( I, I-1 ) / CABS1( H( I, I-1 ) )
-            SC = DCONJG( SC ) / ABS( SC )
-            H( I, I-1 ) = ABS( H( I, I-1 ) )
-            CALL ZSCAL( JHI-I+1, SC, H( I, I ), LDH )
-            CALL ZSCAL( MIN( JHI, I+1 )-JLO+1, DCONJG( SC ),
-     $                  H( JLO, I ), 1 )
-            IF( WANTZ )
-     $         CALL ZSCAL( IHIZ-ILOZ+1, DCONJG( SC ), Z( ILOZ, I ), 1 )
-         END IF
-   20 CONTINUE
-*
-      NH = IHI - ILO + 1
-      NZ = IHIZ - ILOZ + 1
-*
-*     Set machine-dependent constants for the stopping criterion.
-*
-      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
-      SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
-      ULP = DLAMCH( 'PRECISION' )
-      SMLNUM = SAFMIN*( DBLE( NH ) / ULP )
-*
-*     I1 and I2 are the indices of the first row and last column of H
-*     to which transformations must be applied. If eigenvalues only are
-*     being computed, I1 and I2 are set inside the main loop.
-*
-      IF( WANTT ) THEN
-         I1 = 1
-         I2 = N
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGETF2', -INFO )
+         RETURN
       END IF
 *
-*     The main loop begins here. I is the loop index and decreases from
-*     IHI to ILO in steps of 1. Each iteration of the loop works
-*     with the active submatrix in rows and columns L to I.
-*     Eigenvalues I+1 to IHI have already converged. Either L = ILO, or
-*     H(L,L-1) is negligible so that the matrix splits.
-*
-      I = IHI
-   30 CONTINUE
-      IF( I.LT.ILO )
-     $   GO TO 150
-*
-*     Perform QR iterations on rows and columns ILO to I until a
-*     submatrix of order 1 splits off at the bottom because a
-*     subdiagonal element has become negligible.
-*
-      L = ILO
-      DO 130 ITS = 0, ITMAX
-*
-*        Look for a single small subdiagonal element.
-*
-         DO 40 K = I, L + 1, -1
-            IF( CABS1( H( K, K-1 ) ).LE.SMLNUM )
-     $         GO TO 50
-            TST = CABS1( H( K-1, K-1 ) ) + CABS1( H( K, K ) )
-            IF( TST.EQ.ZERO ) THEN
-               IF( K-2.GE.ILO )
-     $            TST = TST + ABS( DBLE( H( K-1, K-2 ) ) )
-               IF( K+1.LE.IHI )
-     $            TST = TST + ABS( DBLE( H( K+1, K ) ) )
-            END IF
-*           ==== The following is a conservative small subdiagonal
-*           .    deflation criterion due to Ahues & Tisseur (LAWN 122,
-*           .    1997). It has better mathematical foundation and
-*           .    improves accuracy in some examples.  ====
-            IF( ABS( DBLE( H( K, K-1 ) ) ).LE.ULP*TST ) THEN
-               AB = MAX( CABS1( H( K, K-1 ) ), CABS1( H( K-1, K ) ) )
-               BA = MIN( CABS1( H( K, K-1 ) ), CABS1( H( K-1, K ) ) )
-               AA = MAX( CABS1( H( K, K ) ),
-     $              CABS1( H( K-1, K-1 )-H( K, K ) ) )
-               BB = MIN( CABS1( H( K, K ) ),
-     $              CABS1( H( K-1, K-1 )-H( K, K ) ) )
-               S = AA + AB
-               IF( BA*( AB / S ).LE.MAX( SMLNUM,
-     $             ULP*( BB*( AA / S ) ) ) )GO TO 50
-            END IF
-   40    CONTINUE
-   50    CONTINUE
-         L = K
-         IF( L.GT.ILO ) THEN
-*
-*           H(L,L-1) is negligible
-*
-            H( L, L-1 ) = ZERO
-         END IF
-*
-*        Exit from loop if a submatrix of order 1 has split off.
+*     Quick return if possible
 *
-         IF( L.GE.I )
-     $      GO TO 140
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
 *
-*        Now the active submatrix is in rows and columns L to I. If
-*        eigenvalues only are being computed, only the active submatrix
-*        need be transformed.
+*     Compute machine safe minimum
 *
-         IF( .NOT.WANTT ) THEN
-            I1 = L
-            I2 = I
-         END IF
+      SFMIN = DLAMCH('S') 
 *
-         IF( ITS.EQ.10 ) THEN
+      DO 10 J = 1, MIN( M, N )
 *
-*           Exceptional shift.
+*        Find pivot and test for singularity.
 *
-            S = DAT1*ABS( DBLE( H( L+1, L ) ) )
-            T = S + H( L, L )
-         ELSE IF( ITS.EQ.20 ) THEN
+         JP = J - 1 + IZAMAX( M-J+1, A( J, J ), 1 )
+         IPIV( J ) = JP
+         IF( A( JP, J ).NE.ZERO ) THEN
 *
-*           Exceptional shift.
+*           Apply the interchange to columns 1:N.
 *
-            S = DAT1*ABS( DBLE( H( I, I-1 ) ) )
-            T = S + H( I, I )
-         ELSE
+            IF( JP.NE.J )
+     $         CALL ZSWAP( N, A( J, 1 ), LDA, A( JP, 1 ), LDA )
 *
-*           Wilkinson's shift.
+*           Compute elements J+1:M of J-th column.
 *
-            T = H( I, I )
-            U = SQRT( H( I-1, I ) )*SQRT( H( I, I-1 ) )
-            S = CABS1( U )
-            IF( S.NE.RZERO ) THEN
-               X = HALF*( H( I-1, I-1 )-T )
-               SX = CABS1( X )
-               S = MAX( S, CABS1( X ) )
-               Y = S*SQRT( ( X / S )**2+( U / S )**2 )
-               IF( SX.GT.RZERO ) THEN
-                  IF( DBLE( X / SX )*DBLE( Y )+DIMAG( X / SX )*
-     $                DIMAG( Y ).LT.RZERO )Y = -Y
+            IF( J.LT.M ) THEN
+               IF( ABS(A( J, J )) .GE. SFMIN ) THEN
+                  CALL ZSCAL( M-J, ONE / A( J, J ), A( J+1, J ), 1 )
+               ELSE
+                  DO 20 I = 1, M-J
+                     A( J+I, J ) = A( J+I, J ) / A( J, J )
+   20             CONTINUE
                END IF
-               T = T - U*ZLADIV( U, ( X+Y ) )
-            END IF
-         END IF
-*
-*        Look for two consecutive small subdiagonal elements.
-*
-         DO 60 M = I - 1, L + 1, -1
-*
-*           Determine the effect of starting the single-shift QR
-*           iteration at row M, and see if this would make H(M,M-1)
-*           negligible.
-*
-            H11 = H( M, M )
-            H22 = H( M+1, M+1 )
-            H11S = H11 - T
-            H21 = DBLE( H( M+1, M ) )
-            S = CABS1( H11S ) + ABS( H21 )
-            H11S = H11S / S
-            H21 = H21 / S
-            V( 1 ) = H11S
-            V( 2 ) = H21
-            H10 = DBLE( H( M, M-1 ) )
-            IF( ABS( H10 )*ABS( H21 ).LE.ULP*
-     $          ( CABS1( H11S )*( CABS1( H11 )+CABS1( H22 ) ) ) )
-     $          GO TO 70
-   60    CONTINUE
-         H11 = H( L, L )
-         H22 = H( L+1, L+1 )
-         H11S = H11 - T
-         H21 = DBLE( H( L+1, L ) )
-         S = CABS1( H11S ) + ABS( H21 )
-         H11S = H11S / S
-         H21 = H21 / S
-         V( 1 ) = H11S
-         V( 2 ) = H21
-   70    CONTINUE
-*
-*        Single-shift QR step
-*
-         DO 120 K = M, I - 1
-*
-*           The first iteration of this loop determines a reflection G
-*           from the vector V and applies it from left and right to H,
-*           thus creating a nonzero bulge below the subdiagonal.
-*
-*           Each subsequent iteration determines a reflection G to
-*           restore the Hessenberg form in the (K-1)th column, and thus
-*           chases the bulge one step toward the bottom of the active
-*           submatrix.
-*
-*           V(2) is always real before the call to ZLARFG, and hence
-*           after the call T2 ( = T1*V(2) ) is also real.
-*
-            IF( K.GT.M )
-     $         CALL ZCOPY( 2, H( K, K-1 ), 1, V, 1 )
-            CALL ZLARFG( 2, V( 1 ), V( 2 ), 1, T1 )
-            IF( K.GT.M ) THEN
-               H( K, K-1 ) = V( 1 )
-               H( K+1, K-1 ) = ZERO
-            END IF
-            V2 = V( 2 )
-            T2 = DBLE( T1*V2 )
-*
-*           Apply G from the left to transform the rows of the matrix
-*           in columns K to I2.
-*
-            DO 80 J = K, I2
-               SUM = DCONJG( T1 )*H( K, J ) + T2*H( K+1, J )
-               H( K, J ) = H( K, J ) - SUM
-               H( K+1, J ) = H( K+1, J ) - SUM*V2
-   80       CONTINUE
-*
-*           Apply G from the right to transform the columns of the
-*           matrix in rows I1 to min(K+2,I).
-*
-            DO 90 J = I1, MIN( K+2, I )
-               SUM = T1*H( J, K ) + T2*H( J, K+1 )
-               H( J, K ) = H( J, K ) - SUM
-               H( J, K+1 ) = H( J, K+1 ) - SUM*DCONJG( V2 )
-   90       CONTINUE
-*
-            IF( WANTZ ) THEN
-*
-*              Accumulate transformations in the matrix Z
-*
-               DO 100 J = ILOZ, IHIZ
-                  SUM = T1*Z( J, K ) + T2*Z( J, K+1 )
-                  Z( J, K ) = Z( J, K ) - SUM
-                  Z( J, K+1 ) = Z( J, K+1 ) - SUM*DCONJG( V2 )
-  100          CONTINUE
-            END IF
-*
-            IF( K.EQ.M .AND. M.GT.L ) THEN
-*
-*              If the QR step was started at row M > L because two
-*              consecutive small subdiagonals were found, then extra
-*              scaling must be performed to ensure that H(M,M-1) remains
-*              real.
-*
-               TEMP = ONE - T1
-               TEMP = TEMP / ABS( TEMP )
-               H( M+1, M ) = H( M+1, M )*DCONJG( TEMP )
-               IF( M+2.LE.I )
-     $            H( M+2, M+1 ) = H( M+2, M+1 )*TEMP
-               DO 110 J = M, I
-                  IF( J.NE.M+1 ) THEN
-                     IF( I2.GT.J )
-     $                  CALL ZSCAL( I2-J, TEMP, H( J, J+1 ), LDH )
-                     CALL ZSCAL( J-I1, DCONJG( TEMP ), H( I1, J ), 1 )
-                     IF( WANTZ ) THEN
-                        CALL ZSCAL( NZ, DCONJG( TEMP ), Z( ILOZ, J ),
-     $                              1 )
-                     END IF
-                  END IF
-  110          CONTINUE
             END IF
-  120    CONTINUE
 *
-*        Ensure that H(I,I-1) is real.
+         ELSE IF( INFO.EQ.0 ) THEN
 *
-         TEMP = H( I, I-1 )
-         IF( DIMAG( TEMP ).NE.RZERO ) THEN
-            RTEMP = ABS( TEMP )
-            H( I, I-1 ) = RTEMP
-            TEMP = TEMP / RTEMP
-            IF( I2.GT.I )
-     $         CALL ZSCAL( I2-I, DCONJG( TEMP ), H( I, I+1 ), LDH )
-            CALL ZSCAL( I-I1, TEMP, H( I1, I ), 1 )
-            IF( WANTZ ) THEN
-               CALL ZSCAL( NZ, TEMP, Z( ILOZ, I ), 1 )
-            END IF
+            INFO = J
          END IF
 *
-  130 CONTINUE
-*
-*     Failure to converge in remaining number of iterations
-*
-      INFO = I
-      RETURN
-*
-  140 CONTINUE
-*
-*     H(I,I-1) is negligible: one eigenvalue has converged.
-*
-      W( I ) = H( I, I )
-*
-*     return to start of the main loop with new value of I.
+         IF( J.LT.MIN( M, N ) ) THEN
 *
-      I = L - 1
-      GO TO 30
+*           Update trailing submatrix.
 *
-  150 CONTINUE
+            CALL ZGERU( M-J, N-J, -ONE, A( J+1, J ), 1, A( J, J+1 ),
+     $                  LDA, A( J+1, J+1 ), LDA )
+         END IF
+   10 CONTINUE
       RETURN
 *
-*     End of ZLAHQR
+*     End of ZGETF2
 *
       END
-*> \brief \b ZLAHR2 reduces the specified number of first columns of a general rectangular matrix A so that elements below the specified subdiagonal are zero, and returns auxiliary matrices which are needed to apply the transformation to the unreduced part of A.
+*> \brief \b ZGETRF
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -13258,26 +15054,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAHR2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahr2.f"> 
+*> Download ZGETRF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetrf.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlahr2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetrf.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahr2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetrf.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+*       SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            K, LDA, LDT, LDY, N, NB
+*       INTEGER            INFO, LDA, M, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16        A( LDA, * ), T( LDT, NB ), TAU( NB ),
-*      $                   Y( LDY, NB )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -13286,85 +15082,63 @@
 *>
 *> \verbatim
 *>
-*> ZLAHR2 reduces the first NB columns of A complex general n-BY-(n-k+1)
-*> matrix A so that elements below the k-th subdiagonal are zero. The
-*> reduction is performed by an unitary similarity transformation
-*> Q**H * A * Q. The routine returns the matrices V and T which determine
-*> Q as a block reflector I - V*T*V**H, and also the matrix Y = A * V * T.
+*> ZGETRF computes an LU factorization of a general M-by-N matrix A
+*> using partial pivoting with row interchanges.
 *>
-*> This is an auxiliary routine called by ZGEHRD.
+*> The factorization has the form
+*>    A = P * L * U
+*> where P is a permutation matrix, L is lower triangular with unit
+*> diagonal elements (lower trapezoidal if m > n), and U is upper
+*> triangular (upper trapezoidal if m < n).
+*>
+*> This is the right-looking Level 3 BLAS version of the algorithm.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.
-*> \endverbatim
-*>
-*> \param[in] K
+*> \param[in] M
 *> \verbatim
-*>          K is INTEGER
-*>          The offset for the reduction. Elements below the k-th
-*>          subdiagonal in the first NB columns are reduced to zero.
-*>          K < N.
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
 *> \endverbatim
 *>
-*> \param[in] NB
+*> \param[in] N
 *> \verbatim
-*>          NB is INTEGER
-*>          The number of columns to be reduced.
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N-K+1)
-*>          On entry, the n-by-(n-k+1) general matrix A.
-*>          On exit, the elements on and above the k-th subdiagonal in
-*>          the first NB columns are overwritten with the corresponding
-*>          elements of the reduced matrix; the elements below the k-th
-*>          subdiagonal, with the array TAU, represent the matrix Q as a
-*>          product of elementary reflectors. The other columns of A are
-*>          unchanged. See Further Details.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix to be factored.
+*>          On exit, the factors L and U from the factorization
+*>          A = P*L*U; the unit diagonal elements of L are not stored.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (NB)
-*>          The scalar factors of the elementary reflectors. See Further
-*>          Details.
-*> \endverbatim
-*>
-*> \param[out] T
-*> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,NB)
-*>          The upper triangular matrix T.
-*> \endverbatim
-*>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T.  LDT >= NB.
+*>          The leading dimension of the array A.  LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[out] Y
+*> \param[out] IPIV
 *> \verbatim
-*>          Y is COMPLEX*16 array, dimension (LDY,NB)
-*>          The n-by-nb matrix Y.
+*>          IPIV is INTEGER array, dimension (min(M,N))
+*>          The pivot indices; for 1 <= i <= min(M,N), row i of the
+*>          matrix was interchanged with row IPIV(i).
 *> \endverbatim
 *>
-*> \param[in] LDY
+*> \param[out] INFO
 *> \verbatim
-*>          LDY is INTEGER
-*>          The leading dimension of the array Y. LDY >= N.
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, U(i,i) is exactly zero. The factorization
+*>                has been completed, but the factor U is exactly
+*>                singular, and division by zero will occur if it is used
+*>                to solve a system of equations.
 *> \endverbatim
 *
 *  Authors:
@@ -13375,237 +15149,146 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
+*> \date November 2015
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of nb elementary reflectors
-*>
-*>     Q = H(1) H(2) . . . H(nb).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i+k-1) = 0, v(i+k) = 1; v(i+k+1:n) is stored on exit in
-*>  A(i+k+1:n,i), and tau in TAU(i).
-*>
-*>  The elements of the vectors v together form the (n-k+1)-by-nb matrix
-*>  V which is needed, with T and Y, to apply the transformation to the
-*>  unreduced part of the matrix, using an update of the form:
-*>  A := (I - V*T*V**H) * (A - Y*V**H).
-*>
-*>  The contents of A on exit are illustrated by the following example
-*>  with n = 7, k = 3 and nb = 2:
-*>
-*>     ( a   a   a   a   a )
-*>     ( a   a   a   a   a )
-*>     ( a   a   a   a   a )
-*>     ( h   h   a   a   a )
-*>     ( v1  h   a   a   a )
-*>     ( v1  v2  a   a   a )
-*>     ( v1  v2  a   a   a )
-*>
-*>  where a denotes an element of the original matrix A, h denotes a
-*>  modified element of the upper Hessenberg matrix H, and vi denotes an
-*>  element of the vector defining H(i).
-*>
-*>  This subroutine is a slight modification of LAPACK-3.0's DLAHRD
-*>  incorporating improvements proposed by Quintana-Orti and Van de
-*>  Gejin. Note that the entries of A(1:K,2:NB) differ from those
-*>  returned by the original LAPACK-3.0's DLAHRD routine. (This
-*>  subroutine is not backward compatible with LAPACK-3.0's DLAHRD.)
-*> \endverbatim
+*> \ingroup complex16GEcomputational
 *
-*> \par References:
-*  ================
-*>
-*>  Gregorio Quintana-Orti and Robert van de Geijn, "Improving the
-*>  performance of reduction to Hessenberg form," ACM Transactions on
-*>  Mathematical Software, 32(2):180-194, June 2006.
-*>
 *  =====================================================================
-      SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+      SUBROUTINE ZGETRF( M, N, A, LDA, IPIV, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      INTEGER            K, LDA, LDT, LDY, N, NB
+      INTEGER            INFO, LDA, M, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16        A( LDA, * ), T( LDT, NB ), TAU( NB ),
-     $                   Y( LDY, NB )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16        ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ), 
-     $                     ONE = ( 1.0D+0, 0.0D+0 ) )
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I
-      COMPLEX*16        EI
+      INTEGER            I, IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZGEMM, ZGEMV, ZLACPY,
-     $                   ZLARFG, ZSCAL, ZTRMM, ZTRMV, ZLACGV
+      EXTERNAL           XERBLA, ZGEMM, ZGETRF2, ZLASWP, ZTRSM
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MIN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Quick return if possible
+*     Test the input parameters.
 *
-      IF( N.LE.1 )
-     $   RETURN
-*
-      DO 10 I = 1, NB
-         IF( I.GT.1 ) THEN
-*
-*           Update A(K+1:N,I)
-*
-*           Update I-th column of A - Y * V**H
-*
-            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA ) 
-            CALL ZGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1), LDY,
-     $                  A( K+I-1, 1 ), LDA, ONE, A( K+1, I ), 1 )
-            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA ) 
-*
-*           Apply I - V * T**H * V**H to this column (call it b) from the
-*           left, using the last column of T as workspace
-*
-*           Let  V = ( V1 )   and   b = ( b1 )   (first I-1 rows)
-*                    ( V2 )             ( b2 )
-*
-*           where V1 is unit lower triangular
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGETRF', -INFO )
+         RETURN
+      END IF
 *
-*           w := V1**H * b1
+*     Quick return if possible
 *
-            CALL ZCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
-            CALL ZTRMV( 'Lower', 'Conjugate transpose', 'UNIT', 
-     $                  I-1, A( K+1, 1 ),
-     $                  LDA, T( 1, NB ), 1 )
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
 *
-*           w := w + V2**H * b2
+*     Determine the block size for this environment.
 *
-            CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, 
-     $                  ONE, A( K+I, 1 ),
-     $                  LDA, A( K+I, I ), 1, ONE, T( 1, NB ), 1 )
+      NB = ILAENV( 1, 'ZGETRF', ' ', M, N, -1, -1 )
+      IF( NB.LE.1 .OR. NB.GE.MIN( M, N ) ) THEN
 *
-*           w := T**H * w
+*        Use unblocked code.
 *
-            CALL ZTRMV( 'Upper', 'Conjugate transpose', 'NON-UNIT', 
-     $                  I-1, T, LDT,
-     $                  T( 1, NB ), 1 )
+         CALL ZGETRF2( M, N, A, LDA, IPIV, INFO )
+      ELSE
 *
-*           b2 := b2 - V2*w
+*        Use blocked code.
 *
-            CALL ZGEMV( 'NO TRANSPOSE', N-K-I+1, I-1, -ONE, 
-     $                  A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+         DO 20 J = 1, MIN( M, N ), NB
+            JB = MIN( MIN( M, N )-J+1, NB )
 *
-*           b1 := b1 - V1*w
+*           Factor diagonal and subdiagonal blocks and test for exact
+*           singularity.
 *
-            CALL ZTRMV( 'Lower', 'NO TRANSPOSE', 
-     $                  'UNIT', I-1,
-     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
-            CALL ZAXPY( I-1, -ONE, T( 1, NB ), 1, A( K+1, I ), 1 )
+            CALL ZGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
 *
-            A( K+I-1, I-1 ) = EI
-         END IF
+*           Adjust INFO and the pivot indices.
 *
-*        Generate the elementary reflector H(I) to annihilate
-*        A(K+I+1:N,I)
+            IF( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $         INFO = IINFO + J - 1
+            DO 10 I = J, MIN( M, J+JB-1 )
+               IPIV( I ) = J - 1 + IPIV( I )
+   10       CONTINUE
 *
-         CALL ZLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
-     $                TAU( I ) )
-         EI = A( K+I, I )
-         A( K+I, I ) = ONE
+*           Apply interchanges to columns 1:J-1.
 *
-*        Compute  Y(K+1:N,I)
+            CALL ZLASWP( J-1, A, LDA, J, J+JB-1, IPIV, 1 )
 *
-         CALL ZGEMV( 'NO TRANSPOSE', N-K, N-K-I+1, 
-     $               ONE, A( K+1, I+1 ),
-     $               LDA, A( K+I, I ), 1, ZERO, Y( K+1, I ), 1 )
-         CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, 
-     $               ONE, A( K+I, 1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
-         CALL ZGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, 
-     $               Y( K+1, 1 ), LDY,
-     $               T( 1, I ), 1, ONE, Y( K+1, I ), 1 )
-         CALL ZSCAL( N-K, TAU( I ), Y( K+1, I ), 1 )
+            IF( J+JB.LE.N ) THEN
 *
-*        Compute T(1:I,I)
+*              Apply interchanges to columns J+JB:N.
 *
-         CALL ZSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL ZTRMV( 'Upper', 'No Transpose', 'NON-UNIT', 
-     $               I-1, T, LDT,
-     $               T( 1, I ), 1 )
-         T( I, I ) = TAU( I )
+               CALL ZLASWP( N-J-JB+1, A( 1, J+JB ), LDA, J, J+JB-1,
+     $                      IPIV, 1 )
 *
-   10 CONTINUE
-      A( K+NB, NB ) = EI
+*              Compute block row of U.
 *
-*     Compute Y(1:K,1:NB)
+               CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', JB,
+     $                     N-J-JB+1, ONE, A( J, J ), LDA, A( J, J+JB ),
+     $                     LDA )
+               IF( J+JB.LE.M ) THEN
 *
-      CALL ZLACPY( 'ALL', K, NB, A( 1, 2 ), LDA, Y, LDY )
-      CALL ZTRMM( 'RIGHT', 'Lower', 'NO TRANSPOSE', 
-     $            'UNIT', K, NB,
-     $            ONE, A( K+1, 1 ), LDA, Y, LDY )
-      IF( N.GT.K+NB )
-     $   CALL ZGEMM( 'NO TRANSPOSE', 'NO TRANSPOSE', K, 
-     $               NB, N-K-NB, ONE,
-     $               A( 1, 2+NB ), LDA, A( K+1+NB, 1 ), LDA, ONE, Y,
-     $               LDY )
-      CALL ZTRMM( 'RIGHT', 'Upper', 'NO TRANSPOSE', 
-     $            'NON-UNIT', K, NB,
-     $            ONE, T, LDT, Y, LDY )
+*                 Update trailing submatrix.
 *
+                  CALL ZGEMM( 'No transpose', 'No transpose', M-J-JB+1,
+     $                        N-J-JB+1, JB, -ONE, A( J+JB, J ), LDA,
+     $                        A( J, J+JB ), LDA, ONE, A( J+JB, J+JB ),
+     $                        LDA )
+               END IF
+            END IF
+   20    CONTINUE
+      END IF
       RETURN
 *
-*     End of ZLAHR2
+*     End of ZGETRF
 *
       END
-*> \brief \b ZLAHRD reduces the first nb columns of a general rectangular matrix A so that elements below the k-th subdiagonal are zero, and returns auxiliary matrices which are needed to apply the transformation to the unreduced part of A.
+*> \brief \b ZGETRF2
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
-*> \htmlonly
-*> Download ZLAHRD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahrd.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlahrd.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahrd.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+*       RECURSIVE SUBROUTINE ZGETRF2( M, N, A, LDA, IPIV, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            K, LDA, LDT, LDY, N, NB
+*       INTEGER            INFO, LDA, M, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), T( LDT, NB ), TAU( NB ),
-*      $                   Y( LDY, NB )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -13614,86 +15297,78 @@
 *>
 *> \verbatim
 *>
-*> ZLAHRD reduces the first NB columns of a complex general n-by-(n-k+1)
-*> matrix A so that elements below the k-th subdiagonal are zero. The
-*> reduction is performed by a unitary similarity transformation
-*> Q**H * A * Q. The routine returns the matrices V and T which determine
-*> Q as a block reflector I - V*T*V**H, and also the matrix Y = A * V * T.
+*> ZGETRF2 computes an LU factorization of a general M-by-N matrix A
+*> using partial pivoting with row interchanges.
+*>
+*> The factorization has the form
+*>    A = P * L * U
+*> where P is a permutation matrix, L is lower triangular with unit
+*> diagonal elements (lower trapezoidal if m > n), and U is upper
+*> triangular (upper trapezoidal if m < n).
+*>
+*> This is the recursive version of the algorithm. It divides
+*> the matrix into four submatrices:
+*>            
+*>        [  A11 | A12  ]  where A11 is n1 by n1 and A22 is n2 by n2
+*>    A = [ -----|----- ]  with n1 = min(m,n)
+*>        [  A21 | A22  ]       n2 = n-n1
+*>            
+*>                                       [ A11 ]
+*> The subroutine calls itself to factor [ --- ],
+*>                                       [ A12 ]
+*>                 [ A12 ]
+*> do the swaps on [ --- ], solve A12, update A22,
+*>                 [ A22 ]
+*>
+*> then calls itself to factor A22 and do the swaps on A21.
 *>
-*> This is an OBSOLETE auxiliary routine. 
-*> This routine will be 'deprecated' in a  future release.
-*> Please use the new routine ZLAHR2 instead.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.
-*> \endverbatim
-*>
-*> \param[in] K
+*> \param[in] M
 *> \verbatim
-*>          K is INTEGER
-*>          The offset for the reduction. Elements below the k-th
-*>          subdiagonal in the first NB columns are reduced to zero.
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
 *> \endverbatim
 *>
-*> \param[in] NB
+*> \param[in] N
 *> \verbatim
-*>          NB is INTEGER
-*>          The number of columns to be reduced.
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N-K+1)
-*>          On entry, the n-by-(n-k+1) general matrix A.
-*>          On exit, the elements on and above the k-th subdiagonal in
-*>          the first NB columns are overwritten with the corresponding
-*>          elements of the reduced matrix; the elements below the k-th
-*>          subdiagonal, with the array TAU, represent the matrix Q as a
-*>          product of elementary reflectors. The other columns of A are
-*>          unchanged. See Further Details.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix to be factored.
+*>          On exit, the factors L and U from the factorization
+*>          A = P*L*U; the unit diagonal elements of L are not stored.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (NB)
-*>          The scalar factors of the elementary reflectors. See Further
-*>          Details.
-*> \endverbatim
-*>
-*> \param[out] T
-*> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,NB)
-*>          The upper triangular matrix T.
-*> \endverbatim
-*>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T.  LDT >= NB.
+*>          The leading dimension of the array A.  LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[out] Y
+*> \param[out] IPIV
 *> \verbatim
-*>          Y is COMPLEX*16 array, dimension (LDY,NB)
-*>          The n-by-nb matrix Y.
+*>          IPIV is INTEGER array, dimension (min(M,N))
+*>          The pivot indices; for 1 <= i <= min(M,N), row i of the
+*>          matrix was interchanged with row IPIV(i).
 *> \endverbatim
 *>
-*> \param[in] LDY
+*> \param[out] INFO
 *> \verbatim
-*>          LDY is INTEGER
-*>          The leading dimension of the array Y. LDY >= max(1,N).
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, U(i,i) is exactly zero. The factorization
+*>                has been completed, but the factor U is exactly
+*>                singular, and division by zero will occur if it is used
+*>                to solve a system of equations.
 *> \endverbatim
 *
 *  Authors:
@@ -13704,175 +15379,173 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16GEcomputational
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of nb elementary reflectors
-*>
-*>     Q = H(1) H(2) . . . H(nb).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i+k-1) = 0, v(i+k) = 1; v(i+k+1:n) is stored on exit in
-*>  A(i+k+1:n,i), and tau in TAU(i).
-*>
-*>  The elements of the vectors v together form the (n-k+1)-by-nb matrix
-*>  V which is needed, with T and Y, to apply the transformation to the
-*>  unreduced part of the matrix, using an update of the form:
-*>  A := (I - V*T*V**H) * (A - Y*V**H).
-*>
-*>  The contents of A on exit are illustrated by the following example
-*>  with n = 7, k = 3 and nb = 2:
-*>
-*>     ( a   h   a   a   a )
-*>     ( a   h   a   a   a )
-*>     ( a   h   a   a   a )
-*>     ( h   h   a   a   a )
-*>     ( v1  h   a   a   a )
-*>     ( v1  v2  a   a   a )
-*>     ( v1  v2  a   a   a )
-*>
-*>  where a denotes an element of the original matrix A, h denotes a
-*>  modified element of the upper Hessenberg matrix H, and vi denotes an
-*>  element of the vector defining H(i).
-*> \endverbatim
-*>
 *  =====================================================================
-      SUBROUTINE ZLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+      RECURSIVE SUBROUTINE ZGETRF2( M, N, A, LDA, IPIV, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      INTEGER            K, LDA, LDT, LDY, N, NB
+      INTEGER            INFO, LDA, M, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), T( LDT, NB ), TAU( NB ),
-     $                   Y( LDY, NB )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                     ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I
-      COMPLEX*16         EI
+      DOUBLE PRECISION   SFMIN
+      COMPLEX*16         TEMP
+      INTEGER            I, IINFO, N1, N2
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      INTEGER            IZAMAX
+      EXTERNAL           DLAMCH, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZCOPY, ZGEMV, ZLACGV, ZLARFG, ZSCAL,
-     $                   ZTRMV
+      EXTERNAL           ZGEMM, ZSCAL, ZLASWP, ZTRSM, ZERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MIN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
+*     Test the input parameters
+*
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGETRF2', -INFO )
+         RETURN
+      END IF
+*
 *     Quick return if possible
 *
-      IF( N.LE.1 )
+      IF( M.EQ.0 .OR. N.EQ.0 )
      $   RETURN
+
+      IF ( M.EQ.1 ) THEN
 *
-      DO 10 I = 1, NB
-         IF( I.GT.1 ) THEN
+*        Use unblocked code for one row case
+*        Just need to handle IPIV and INFO
 *
-*           Update A(1:n,i)
+         IPIV( 1 ) = 1
+         IF ( A(1,1).EQ.ZERO )
+     $      INFO = 1
 *
-*           Compute i-th column of A - Y * V**H
+      ELSE IF( N.EQ.1 ) THEN
 *
-            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA )
-            CALL ZGEMV( 'No transpose', N, I-1, -ONE, Y, LDY,
-     $                  A( K+I-1, 1 ), LDA, ONE, A( 1, I ), 1 )
-            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA )
+*        Use unblocked code for one column case
 *
-*           Apply I - V * T**H * V**H to this column (call it b) from the
-*           left, using the last column of T as workspace
 *
-*           Let  V = ( V1 )   and   b = ( b1 )   (first I-1 rows)
-*                    ( V2 )             ( b2 )
+*        Compute machine safe minimum
 *
-*           where V1 is unit lower triangular
+         SFMIN = DLAMCH('S')
 *
-*           w := V1**H * b1
+*        Find pivot and test for singularity
 *
-            CALL ZCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
-            CALL ZTRMV( 'Lower', 'Conjugate transpose', 'Unit', I-1,
-     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
+         I = IZAMAX( M, A( 1, 1 ), 1 )
+         IPIV( 1 ) = I
+         IF( A( I, 1 ).NE.ZERO ) THEN
 *
-*           w := w + V2**H *b2
+*           Apply the interchange
 *
-            CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
-     $                  A( K+I, 1 ), LDA, A( K+I, I ), 1, ONE,
-     $                  T( 1, NB ), 1 )
+            IF( I.NE.1 ) THEN
+               TEMP = A( 1, 1 )
+               A( 1, 1 ) = A( I, 1 )
+               A( I, 1 ) = TEMP
+            END IF
 *
-*           w := T**H *w
+*           Compute elements 2:M of the column
 *
-            CALL ZTRMV( 'Upper', 'Conjugate transpose', 'Non-unit', I-1,
-     $                  T, LDT, T( 1, NB ), 1 )
+            IF( ABS(A( 1, 1 )) .GE. SFMIN ) THEN
+               CALL ZSCAL( M-1, ONE / A( 1, 1 ), A( 2, 1 ), 1 )
+            ELSE
+               DO 10 I = 1, M-1
+                  A( 1+I, 1 ) = A( 1+I, 1 ) / A( 1, 1 )
+   10          CONTINUE
+            END IF
 *
-*           b2 := b2 - V2*w
+         ELSE
+            INFO = 1
+         END IF
+
+      ELSE
 *
-            CALL ZGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+*        Use recursive code
 *
-*           b1 := b1 - V1*w
+         N1 = MIN( M, N ) / 2
+         N2 = N-N1
 *
-            CALL ZTRMV( 'Lower', 'No transpose', 'Unit', I-1,
-     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
-            CALL ZAXPY( I-1, -ONE, T( 1, NB ), 1, A( K+1, I ), 1 )
+*               [ A11 ]
+*        Factor [ --- ]
+*               [ A21 ]
 *
-            A( K+I-1, I-1 ) = EI
-         END IF
+         CALL ZGETRF2( M, N1, A, LDA, IPIV, IINFO )
+
+         IF ( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $      INFO = IINFO
 *
-*        Generate the elementary reflector H(i) to annihilate
-*        A(k+i+1:n,i)
+*                              [ A12 ]
+*        Apply interchanges to [ --- ]
+*                              [ A22 ]
 *
-         EI = A( K+I, I )
-         CALL ZLARFG( N-K-I+1, EI, A( MIN( K+I+1, N ), I ), 1,
-     $                TAU( I ) )
-         A( K+I, I ) = ONE
+         CALL ZLASWP( N2, A( 1, N1+1 ), LDA, 1, N1, IPIV, 1 )
 *
-*        Compute  Y(1:n,i)
+*        Solve A12
 *
-         CALL ZGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
-         CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
-     $               A( K+I, 1 ), LDA, A( K+I, I ), 1, ZERO, T( 1, I ),
-     $               1 )
-         CALL ZGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
-     $               ONE, Y( 1, I ), 1 )
-         CALL ZSCAL( N, TAU( I ), Y( 1, I ), 1 )
+         CALL ZTRSM( 'L', 'L', 'N', 'U', N1, N2, ONE, A, LDA, 
+     $               A( 1, N1+1 ), LDA )
 *
-*        Compute T(1:i,i)
+*        Update A22
 *
-         CALL ZSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
-     $               T( 1, I ), 1 )
-         T( I, I ) = TAU( I )
+         CALL ZGEMM( 'N', 'N', M-N1, N2, N1, -ONE, A( N1+1, 1 ), LDA, 
+     $               A( 1, N1+1 ), LDA, ONE, A( N1+1, N1+1 ), LDA )
 *
-   10 CONTINUE
-      A( K+NB, NB ) = EI
+*        Factor A22
+*
+         CALL ZGETRF2( M-N1, N2, A( N1+1, N1+1 ), LDA, IPIV( N1+1 ),
+     $                 IINFO )
+*
+*        Adjust INFO and the pivot indices
+*
+         IF ( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $      INFO = IINFO + N1
+         DO 20 I = N1+1, MIN( M, N )
+            IPIV( I ) = IPIV( I ) + N1
+   20    CONTINUE
+*
+*        Apply interchanges to A21
 *
+         CALL ZLASWP( N1, A( 1, 1 ), LDA, N1+1, MIN( M, N), IPIV, 1 )
+*
+      END IF
       RETURN
 *
-*     End of ZLAHRD
+*     End of ZGETRF2
 *
       END
-*> \brief \b ZLANGE returns the value of the 1-norm, Frobenius norm, infinity-norm, or the largest absolute value of any element of a general rectangular matrix.
+*> \brief \b ZGETRI
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -13880,27 +15553,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLANGE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlange.f"> 
+*> Download ZGETRI + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetri.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlange.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetri.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlange.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetri.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       DOUBLE PRECISION FUNCTION ZLANGE( NORM, M, N, A, LDA, WORK )
+*       SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          NORM
-*       INTEGER            LDA, M, N
+*       INTEGER            INFO, LDA, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   WORK( * )
-*       COMPLEX*16         A( LDA, * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * ), WORK( * )
 *       ..
 *  
 *
@@ -13909,69 +15581,69 @@
 *>
 *> \verbatim
 *>
-*> ZLANGE  returns the value of the one norm,  or the Frobenius norm, or
-*> the  infinity norm,  or the  element of  largest absolute value  of a
-*> complex matrix A.
-*> \endverbatim
-*>
-*> \return ZLANGE
-*> \verbatim
-*>
-*>    ZLANGE = ( max(abs(A(i,j))), NORM = 'M' or 'm'
-*>             (
-*>             ( norm1(A),         NORM = '1', 'O' or 'o'
-*>             (
-*>             ( normI(A),         NORM = 'I' or 'i'
-*>             (
-*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
+*> ZGETRI computes the inverse of a matrix using the LU factorization
+*> computed by ZGETRF.
 *>
-*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
-*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
-*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
-*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> This method inverts U and then computes inv(A) by solving the system
+*> inv(A)*L = inv(U) for inv(A).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] NORM
-*> \verbatim
-*>          NORM is CHARACTER*1
-*>          Specifies the value to be returned in ZLANGE as described
-*>          above.
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.  When M = 0,
-*>          ZLANGE is set to zero.
-*> \endverbatim
-*>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.  When N = 0,
-*>          ZLANGE is set to zero.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The m by n matrix A.
+*>          On entry, the factors L and U from the factorization
+*>          A = P*L*U as computed by ZGETRF.
+*>          On exit, if INFO = 0, the inverse of the original matrix A.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(M,1).
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N)
+*>          The pivot indices from ZGETRF; for 1<=i<=N, row i of the
+*>          matrix was interchanged with row IPIV(i).
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
-*>          where LWORK >= M when NORM = 'I'; otherwise, WORK is not
-*>          referenced.
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO=0, then WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,N).
+*>          For optimal performance LWORK >= N*NB, where NB is
+*>          the optimal blocksize returned by ILAENV.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, U(i,i) is exactly zero; the matrix is
+*>                singular and its inverse could not be computed.
 *> \endverbatim
 *
 *  Authors:
@@ -13982,110 +15654,160 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16GEauxiliary
+*> \ingroup complex16GEcomputational
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANGE( NORM, M, N, A, LDA, WORK )
+      SUBROUTINE ZGETRI( N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          NORM
-      INTEGER            LDA, M, N
+      INTEGER            INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   WORK( * )
-      COMPLEX*16         A( LDA, * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * ), WORK( * )
 *     ..
 *
-* =====================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, J
-      DOUBLE PRECISION   SCALE, SUM, VALUE, TEMP
+      LOGICAL            LQUERY
+      INTEGER            I, IWS, J, JB, JJ, JP, LDWORK, LWKOPT, NB,
+     $                   NBMIN, NN
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME, DISNAN
-      EXTERNAL           LSAME, DISNAN
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLASSQ
+      EXTERNAL           XERBLA, ZGEMM, ZGEMV, ZSWAP, ZTRSM, ZTRTRI
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MIN, SQRT
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-      IF( MIN( M, N ).EQ.0 ) THEN
-         VALUE = ZERO
-      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*     Test the input parameters.
 *
-*        Find max(abs(A(i,j))).
+      INFO = 0
+      NB = ILAENV( 1, 'ZGETRI', ' ', N, -1, -1, -1 )
+      LWKOPT = N*NB
+      WORK( 1 ) = LWKOPT
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -3
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+         INFO = -6
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGETRI', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-         VALUE = ZERO
-         DO 20 J = 1, N
-            DO 10 I = 1, M
-               TEMP = ABS( A( I, J ) )
-               IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     Form inv(U).  If INFO > 0 from ZTRTRI, then U is singular,
+*     and the inverse is not computed.
+*
+      CALL ZTRTRI( 'Upper', 'Non-unit', N, A, LDA, INFO )
+      IF( INFO.GT.0 )
+     $   RETURN
+*
+      NBMIN = 2
+      LDWORK = N
+      IF( NB.GT.1 .AND. NB.LT.N ) THEN
+         IWS = MAX( LDWORK*NB, 1 )
+         IF( LWORK.LT.IWS ) THEN
+            NB = LWORK / LDWORK
+            NBMIN = MAX( 2, ILAENV( 2, 'ZGETRI', ' ', N, -1, -1, -1 ) )
+         END IF
+      ELSE
+         IWS = N
+      END IF
+*
+*     Solve the equation inv(A)*L = inv(U) for inv(A).
+*
+      IF( NB.LT.NBMIN .OR. NB.GE.N ) THEN
+*
+*        Use unblocked code.
+*
+         DO 20 J = N, 1, -1
+*
+*           Copy current column of L to WORK and replace with zeros.
+*
+            DO 10 I = J + 1, N
+               WORK( I ) = A( I, J )
+               A( I, J ) = ZERO
    10       CONTINUE
+*
+*           Compute current column of inv(A).
+*
+            IF( J.LT.N )
+     $         CALL ZGEMV( 'No transpose', N, N-J, -ONE, A( 1, J+1 ),
+     $                     LDA, WORK( J+1 ), 1, ONE, A( 1, J ), 1 )
    20    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'O' ) ) .OR. ( NORM.EQ.'1' ) ) THEN
+      ELSE
 *
-*        Find norm1(A).
+*        Use blocked code.
 *
-         VALUE = ZERO
-         DO 40 J = 1, N
-            SUM = ZERO
-            DO 30 I = 1, M
-               SUM = SUM + ABS( A( I, J ) )
-   30       CONTINUE
-            IF( VALUE.LT.SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   40    CONTINUE
-      ELSE IF( LSAME( NORM, 'I' ) ) THEN
+         NN = ( ( N-1 ) / NB )*NB + 1
+         DO 50 J = NN, 1, -NB
+            JB = MIN( NB, N-J+1 )
+*
+*           Copy current block column of L to WORK and replace with
+*           zeros.
+*
+            DO 40 JJ = J, J + JB - 1
+               DO 30 I = JJ + 1, N
+                  WORK( I+( JJ-J )*LDWORK ) = A( I, JJ )
+                  A( I, JJ ) = ZERO
+   30          CONTINUE
+   40       CONTINUE
 *
-*        Find normI(A).
+*           Compute current block column of inv(A).
 *
-         DO 50 I = 1, M
-            WORK( I ) = ZERO
+            IF( J+JB.LE.N )
+     $         CALL ZGEMM( 'No transpose', 'No transpose', N, JB,
+     $                     N-J-JB+1, -ONE, A( 1, J+JB ), LDA,
+     $                     WORK( J+JB ), LDWORK, ONE, A( 1, J ), LDA )
+            CALL ZTRSM( 'Right', 'Lower', 'No transpose', 'Unit', N, JB,
+     $                  ONE, WORK( J ), LDWORK, A( 1, J ), LDA )
    50    CONTINUE
-         DO 70 J = 1, N
-            DO 60 I = 1, M
-               WORK( I ) = WORK( I ) + ABS( A( I, J ) )
-   60       CONTINUE
-   70    CONTINUE
-         VALUE = ZERO
-         DO 80 I = 1, M
-            TEMP = WORK( I )
-            IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
-   80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      END IF
 *
-*        Find normF(A).
+*     Apply column interchanges.
 *
-         SCALE = ZERO
-         SUM = ONE
-         DO 90 J = 1, N
-            CALL ZLASSQ( M, A( 1, J ), 1, SCALE, SUM )
-   90    CONTINUE
-         VALUE = SCALE*SQRT( SUM )
-      END IF
+      DO 60 J = N - 1, 1, -1
+         JP = IPIV( J )
+         IF( JP.NE.J )
+     $      CALL ZSWAP( N, A( 1, J ), 1, A( 1, JP ), 1 )
+   60 CONTINUE
 *
-      ZLANGE = VALUE
+      WORK( 1 ) = IWS
       RETURN
 *
-*     End of ZLANGE
+*     End of ZGETRI
 *
       END
-*> \brief \b ZLANHE returns the value of the 1-norm, or the Frobenius norm, or the infinity norm, or the element of largest absolute value of a complex Hermitian matrix.
+*> \brief \b ZGETRS
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -14093,27 +15815,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLANHE + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhe.f"> 
+*> Download ZGETRS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgetrs.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlanhe.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgetrs.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhe.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgetrs.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
+*       SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          NORM, UPLO
-*       INTEGER            LDA, N
+*       CHARACTER          TRANS
+*       INTEGER            INFO, LDA, LDB, N, NRHS
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   WORK( * )
-*       COMPLEX*16         A( LDA, * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * )
 *       ..
 *  
 *
@@ -14122,78 +15844,75 @@
 *>
 *> \verbatim
 *>
-*> ZLANHE  returns the value of the one norm,  or the Frobenius norm, or
-*> the  infinity norm,  or the  element of  largest absolute value  of a
-*> complex hermitian matrix A.
-*> \endverbatim
-*>
-*> \return ZLANHE
-*> \verbatim
-*>
-*>    ZLANHE = ( max(abs(A(i,j))), NORM = 'M' or 'm'
-*>             (
-*>             ( norm1(A),         NORM = '1', 'O' or 'o'
-*>             (
-*>             ( normI(A),         NORM = 'I' or 'i'
-*>             (
-*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
-*>
-*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
-*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
-*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
-*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> ZGETRS solves a system of linear equations
+*>    A * X = B,  A**T * X = B,  or  A**H * X = B
+*> with a general N-by-N matrix A using the LU factorization computed
+*> by ZGETRF.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] NORM
+*> \param[in] TRANS
 *> \verbatim
-*>          NORM is CHARACTER*1
-*>          Specifies the value to be returned in ZLANHE as described
-*>          above.
+*>          TRANS is CHARACTER*1
+*>          Specifies the form of the system of equations:
+*>          = 'N':  A * X = B     (No transpose)
+*>          = 'T':  A**T * X = B  (Transpose)
+*>          = 'C':  A**H * X = B  (Conjugate transpose)
 *> \endverbatim
 *>
-*> \param[in] UPLO
+*> \param[in] N
 *> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies whether the upper or lower triangular part of the
-*>          hermitian matrix A is to be referenced.
-*>          = 'U':  Upper triangular part of A is referenced
-*>          = 'L':  Lower triangular part of A is referenced
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] NRHS
 *> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.  When N = 0, ZLANHE is
-*>          set to zero.
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of columns
+*>          of the matrix B.  NRHS >= 0.
 *> \endverbatim
 *>
 *> \param[in] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The hermitian matrix A.  If UPLO = 'U', the leading n by n
-*>          upper triangular part of A contains the upper triangular part
-*>          of the matrix A, and the strictly lower triangular part of A
-*>          is not referenced.  If UPLO = 'L', the leading n by n lower
-*>          triangular part of A contains the lower triangular part of
-*>          the matrix A, and the strictly upper triangular part of A is
-*>          not referenced. Note that the imaginary parts of the diagonal
-*>          elements need not be set and are assumed to be zero.
+*>          The factors L and U from the factorization A = P*L*U
+*>          as computed by ZGETRF.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(N,1).
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] IPIV
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
-*>          where LWORK >= N when NORM = 'I' or '1' or 'O'; otherwise,
-*>          WORK is not referenced.
+*>          IPIV is INTEGER array, dimension (N)
+*>          The pivot indices from ZGETRF; for 1<=i<=N, row i of the
+*>          matrix was interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the right hand side matrix B.
+*>          On exit, the solution matrix X.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -14204,146 +15923,116 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16HEauxiliary
+*> \ingroup complex16GEcomputational
 *
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
+      SUBROUTINE ZGETRS( TRANS, N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          NORM, UPLO
-      INTEGER            LDA, N
+      CHARACTER          TRANS
+      INTEGER            INFO, LDA, LDB, N, NRHS
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   WORK( * )
-      COMPLEX*16         A( LDA, * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * )
 *     ..
 *
-* =====================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, J
-      DOUBLE PRECISION   ABSA, SCALE, SUM, VALUE
+      LOGICAL            NOTRAN
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME, DISNAN
-      EXTERNAL           LSAME, DISNAN
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLASSQ
+      EXTERNAL           XERBLA, ZLASWP, ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, SQRT
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
-      IF( N.EQ.0 ) THEN
-         VALUE = ZERO
-      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*     Test the input parameters.
 *
-*        Find max(abs(A(i,j))).
+      INFO = 0
+      NOTRAN = LSAME( TRANS, 'N' )
+      IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $    LSAME( TRANS, 'C' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGETRS', -INFO )
+         RETURN
+      END IF
 *
-         VALUE = ZERO
-         IF( LSAME( UPLO, 'U' ) ) THEN
-            DO 20 J = 1, N
-               DO 10 I = 1, J - 1
-                  SUM = ABS( A( I, J ) )
-                  IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   10          CONTINUE
-               SUM = ABS( DBLE( A( J, J ) ) )
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   20       CONTINUE
-         ELSE
-            DO 40 J = 1, N
-               SUM = ABS( DBLE( A( J, J ) ) )
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-               DO 30 I = J + 1, N
-                  SUM = ABS( A( I, J ) )
-                  IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   30          CONTINUE
-   40       CONTINUE
-         END IF
-      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
-     $         ( NORM.EQ.'1' ) ) THEN
+*     Quick return if possible
 *
-*        Find normI(A) ( = norm1(A), since A is hermitian).
+      IF( N.EQ.0 .OR. NRHS.EQ.0 )
+     $   RETURN
 *
-         VALUE = ZERO
-         IF( LSAME( UPLO, 'U' ) ) THEN
-            DO 60 J = 1, N
-               SUM = ZERO
-               DO 50 I = 1, J - 1
-                  ABSA = ABS( A( I, J ) )
-                  SUM = SUM + ABSA
-                  WORK( I ) = WORK( I ) + ABSA
-   50          CONTINUE
-               WORK( J ) = SUM + ABS( DBLE( A( J, J ) ) )
-   60       CONTINUE
-            DO 70 I = 1, N
-               SUM = WORK( I )
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   70       CONTINUE
-         ELSE
-            DO 80 I = 1, N
-               WORK( I ) = ZERO
-   80       CONTINUE
-            DO 100 J = 1, N
-               SUM = WORK( J ) + ABS( DBLE( A( J, J ) ) )
-               DO 90 I = J + 1, N
-                  ABSA = ABS( A( I, J ) )
-                  SUM = SUM + ABSA
-                  WORK( I ) = WORK( I ) + ABSA
-   90          CONTINUE
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-  100       CONTINUE
-         END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      IF( NOTRAN ) THEN
 *
-*        Find normF(A).
+*        Solve A * X = B.
 *
-         SCALE = ZERO
-         SUM = ONE
-         IF( LSAME( UPLO, 'U' ) ) THEN
-            DO 110 J = 2, N
-               CALL ZLASSQ( J-1, A( 1, J ), 1, SCALE, SUM )
-  110       CONTINUE
-         ELSE
-            DO 120 J = 1, N - 1
-               CALL ZLASSQ( N-J, A( J+1, J ), 1, SCALE, SUM )
-  120       CONTINUE
-         END IF
-         SUM = 2*SUM
-         DO 130 I = 1, N
-            IF( DBLE( A( I, I ) ).NE.ZERO ) THEN
-               ABSA = ABS( DBLE( A( I, I ) ) )
-               IF( SCALE.LT.ABSA ) THEN
-                  SUM = ONE + SUM*( SCALE / ABSA )**2
-                  SCALE = ABSA
-               ELSE
-                  SUM = SUM + ( ABSA / SCALE )**2
-               END IF
-            END IF
-  130    CONTINUE
-         VALUE = SCALE*SQRT( SUM )
+*        Apply row interchanges to the right hand sides.
+*
+         CALL ZLASWP( NRHS, B, LDB, 1, N, IPIV, 1 )
+*
+*        Solve L*X = B, overwriting B with X.
+*
+         CALL ZTRSM( 'Left', 'Lower', 'No transpose', 'Unit', N, NRHS,
+     $               ONE, A, LDA, B, LDB )
+*
+*        Solve U*X = B, overwriting B with X.
+*
+         CALL ZTRSM( 'Left', 'Upper', 'No transpose', 'Non-unit', N,
+     $               NRHS, ONE, A, LDA, B, LDB )
+      ELSE
+*
+*        Solve A**T * X = B  or A**H * X = B.
+*
+*        Solve U**T *X = B or U**H *X = B, overwriting B with X.
+*
+         CALL ZTRSM( 'Left', 'Upper', TRANS, 'Non-unit', N, NRHS, ONE,
+     $               A, LDA, B, LDB )
+*
+*        Solve L**T *X = B, or L**H *X = B overwriting B with X.
+*
+         CALL ZTRSM( 'Left', 'Lower', TRANS, 'Unit', N, NRHS, ONE, A,
+     $               LDA, B, LDB )
+*
+*        Apply row interchanges to the solution vectors.
+*
+         CALL ZLASWP( NRHS, B, LDB, 1, N, IPIV, -1 )
       END IF
 *
-      ZLANHE = VALUE
       RETURN
 *
-*     End of ZLANHE
+*     End of ZGETRS
 *
       END
-*> \brief \b ZLANHS returns the value of the 1-norm, Frobenius norm, infinity-norm, or the largest absolute value of any element of an upper Hessenberg matrix.
+*> \brief \b ZGGBAK
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -14351,27 +16040,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLANHS + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhs.f"> 
+*> Download ZGGBAK + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggbak.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlanhs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zggbak.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggbak.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       DOUBLE PRECISION FUNCTION ZLANHS( NORM, N, A, LDA, WORK )
+*       SUBROUTINE ZGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
+*                          LDV, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          NORM
-*       INTEGER            LDA, N
+*       CHARACTER          JOB, SIDE
+*       INTEGER            IHI, ILO, INFO, LDV, M, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   WORK( * )
-*       COMPLEX*16         A( LDA, * )
+*       DOUBLE PRECISION   LSCALE( * ), RSCALE( * )
+*       COMPLEX*16         V( LDV, * )
 *       ..
 *  
 *
@@ -14380,63 +16070,91 @@
 *>
 *> \verbatim
 *>
-*> ZLANHS  returns the value of the one norm,  or the Frobenius norm, or
-*> the  infinity norm,  or the  element of  largest absolute value  of a
-*> Hessenberg matrix A.
-*> \endverbatim
-*>
-*> \return ZLANHS
-*> \verbatim
-*>
-*>    ZLANHS = ( max(abs(A(i,j))), NORM = 'M' or 'm'
-*>             (
-*>             ( norm1(A),         NORM = '1', 'O' or 'o'
-*>             (
-*>             ( normI(A),         NORM = 'I' or 'i'
-*>             (
-*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
-*>
-*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
-*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
-*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
-*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> ZGGBAK forms the right or left eigenvectors of a complex generalized
+*> eigenvalue problem A*x = lambda*B*x, by backward transformation on
+*> the computed eigenvectors of the balanced pair of matrices output by
+*> ZGGBAL.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] NORM
+*> \param[in] JOB
 *> \verbatim
-*>          NORM is CHARACTER*1
-*>          Specifies the value to be returned in ZLANHS as described
-*>          above.
+*>          JOB is CHARACTER*1
+*>          Specifies the type of backward transformation required:
+*>          = 'N':  do nothing, return immediately;
+*>          = 'P':  do backward transformation for permutation only;
+*>          = 'S':  do backward transformation for scaling only;
+*>          = 'B':  do backward transformations for both permutation and
+*>                  scaling.
+*>          JOB must be the same as the argument JOB supplied to ZGGBAL.
+*> \endverbatim
+*>
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'R':  V contains right eigenvectors;
+*>          = 'L':  V contains left eigenvectors.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.  When N = 0, ZLANHS is
-*>          set to zero.
+*>          The number of rows of the matrix V.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in] ILO
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The n by n upper Hessenberg matrix A; the part of A below the
-*>          first sub-diagonal is not referenced.
+*>          ILO is INTEGER
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in] IHI
 *> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(N,1).
+*>          IHI is INTEGER
+*>          The integers ILO and IHI determined by ZGGBAL.
+*>          1 <= ILO <= IHI <= N, if N > 0; ILO=1 and IHI=0, if N=0.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LSCALE
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
-*>          where LWORK >= N when NORM = 'I'; otherwise, WORK is not
-*>          referenced.
+*>          LSCALE is DOUBLE PRECISION array, dimension (N)
+*>          Details of the permutations and/or scaling factors applied
+*>          to the left side of A and B, as returned by ZGGBAL.
+*> \endverbatim
+*>
+*> \param[in] RSCALE
+*> \verbatim
+*>          RSCALE is DOUBLE PRECISION array, dimension (N)
+*>          Details of the permutations and/or scaling factors applied
+*>          to the right side of A and B, as returned by ZGGBAL.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of columns of the matrix V.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension (LDV,M)
+*>          On entry, the matrix of right or left eigenvectors to be
+*>          transformed, as returned by ZTGEVC.
+*>          On exit, V is overwritten by the transformed eigenvectors.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the matrix V. LDV >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
 *
 *  Authors:
@@ -14447,110 +16165,181 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16GBcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  See R.C. Ward, Balancing the generalized eigenvalue problem,
+*>                 SIAM J. Sci. Stat. Comp. 2 (1981), 141-152.
+*> \endverbatim
+*>
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANHS( NORM, N, A, LDA, WORK )
+      SUBROUTINE ZGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
+     $                   LDV, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      CHARACTER          NORM
-      INTEGER            LDA, N
+      CHARACTER          JOB, SIDE
+      INTEGER            IHI, ILO, INFO, LDV, M, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   WORK( * )
-      COMPLEX*16         A( LDA, * )
+      DOUBLE PRECISION   LSCALE( * ), RSCALE( * )
+      COMPLEX*16         V( LDV, * )
 *     ..
 *
-* =====================================================================
+*  =====================================================================
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
-*     ..
 *     .. Local Scalars ..
-      INTEGER            I, J
-      DOUBLE PRECISION   SCALE, SUM, VALUE
+      LOGICAL            LEFTV, RIGHTV
+      INTEGER            I, K
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME, DISNAN
-      EXTERNAL           LSAME, DISNAN
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLASSQ
+      EXTERNAL           XERBLA, ZDSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MIN, SQRT
+      INTRINSIC          MAX, INT
 *     ..
 *     .. Executable Statements ..
 *
-      IF( N.EQ.0 ) THEN
-         VALUE = ZERO
-      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*     Test the input parameters
 *
-*        Find max(abs(A(i,j))).
+      RIGHTV = LSAME( SIDE, 'R' )
+      LEFTV = LSAME( SIDE, 'L' )
 *
-         VALUE = ZERO
-         DO 20 J = 1, N
-            DO 10 I = 1, MIN( N, J+1 )
-               SUM = ABS( A( I, J ) )
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+      INFO = 0
+      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( ILO.LT.1 ) THEN
+         INFO = -4
+      ELSE IF( N.EQ.0 .AND. IHI.EQ.0 .AND. ILO.NE.1 ) THEN
+         INFO = -4
+      ELSE IF( N.GT.0 .AND. ( IHI.LT.ILO .OR. IHI.GT.MAX( 1, N ) ) )
+     $   THEN
+         INFO = -5
+      ELSE IF( N.EQ.0 .AND. ILO.EQ.1 .AND. IHI.NE.0 ) THEN
+         INFO = -5
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -8
+      ELSE IF( LDV.LT.MAX( 1, N ) ) THEN
+         INFO = -10
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGGBAK', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+      IF( M.EQ.0 )
+     $   RETURN
+      IF( LSAME( JOB, 'N' ) )
+     $   RETURN
+*
+      IF( ILO.EQ.IHI )
+     $   GO TO 30
+*
+*     Backward balance
+*
+      IF( LSAME( JOB, 'S' ) .OR. LSAME( JOB, 'B' ) ) THEN
+*
+*        Backward transformation on right eigenvectors
+*
+         IF( RIGHTV ) THEN
+            DO 10 I = ILO, IHI
+               CALL ZDSCAL( M, RSCALE( I ), V( I, 1 ), LDV )
    10       CONTINUE
-   20    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'O' ) ) .OR. ( NORM.EQ.'1' ) ) THEN
+         END IF
 *
-*        Find norm1(A).
+*        Backward transformation on left eigenvectors
 *
-         VALUE = ZERO
-         DO 40 J = 1, N
-            SUM = ZERO
-            DO 30 I = 1, MIN( N, J+1 )
-               SUM = SUM + ABS( A( I, J ) )
-   30       CONTINUE
-            IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   40    CONTINUE
-      ELSE IF( LSAME( NORM, 'I' ) ) THEN
+         IF( LEFTV ) THEN
+            DO 20 I = ILO, IHI
+               CALL ZDSCAL( M, LSCALE( I ), V( I, 1 ), LDV )
+   20       CONTINUE
+         END IF
+      END IF
 *
-*        Find normI(A).
+*     Backward permutation
 *
-         DO 50 I = 1, N
-            WORK( I ) = ZERO
-   50    CONTINUE
-         DO 70 J = 1, N
-            DO 60 I = 1, MIN( N, J+1 )
-               WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+   30 CONTINUE
+      IF( LSAME( JOB, 'P' ) .OR. LSAME( JOB, 'B' ) ) THEN
+*
+*        Backward permutation on right eigenvectors
+*
+         IF( RIGHTV ) THEN
+            IF( ILO.EQ.1 )
+     $         GO TO 50
+            DO 40 I = ILO - 1, 1, -1
+               K = INT(RSCALE( I ))
+               IF( K.EQ.I )
+     $            GO TO 40
+               CALL ZSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
+   40       CONTINUE
+*
+   50       CONTINUE
+            IF( IHI.EQ.N )
+     $         GO TO 70
+            DO 60 I = IHI + 1, N
+               K = INT(RSCALE( I ))
+               IF( K.EQ.I )
+     $            GO TO 60
+               CALL ZSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
    60       CONTINUE
-   70    CONTINUE
-         VALUE = ZERO
-         DO 80 I = 1, N
-            SUM = WORK( I )
-            IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   80    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+         END IF
 *
-*        Find normF(A).
+*        Backward permutation on left eigenvectors
 *
-         SCALE = ZERO
-         SUM = ONE
-         DO 90 J = 1, N
-            CALL ZLASSQ( MIN( N, J+1 ), A( 1, J ), 1, SCALE, SUM )
-   90    CONTINUE
-         VALUE = SCALE*SQRT( SUM )
+   70    CONTINUE
+         IF( LEFTV ) THEN
+            IF( ILO.EQ.1 )
+     $         GO TO 90
+            DO 80 I = ILO - 1, 1, -1
+               K = INT(LSCALE( I ))
+               IF( K.EQ.I )
+     $            GO TO 80
+               CALL ZSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
+   80       CONTINUE
+*
+   90       CONTINUE
+            IF( IHI.EQ.N )
+     $         GO TO 110
+            DO 100 I = IHI + 1, N
+               K = INT(LSCALE( I ))
+               IF( K.EQ.I )
+     $            GO TO 100
+               CALL ZSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
+  100       CONTINUE
+         END IF
       END IF
 *
-      ZLANHS = VALUE
+  110 CONTINUE
+*
       RETURN
 *
-*     End of ZLANHS
+*     End of ZGGBAK
 *
       END
-*> \brief \b ZLANTR returns the value of the 1-norm, or the Frobenius norm, or the infinity norm, or the element of largest absolute value of a trapezoidal or triangular matrix.
+*> \brief \b ZGGBAL
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -14558,28 +16347,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLANTR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlantr.f"> 
+*> Download ZGGBAL + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggbal.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlantr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zggbal.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlantr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggbal.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
-*                        WORK )
+*       SUBROUTINE ZGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
+*                          RSCALE, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          DIAG, NORM, UPLO
-*       INTEGER            LDA, M, N
+*       CHARACTER          JOB
+*       INTEGER            IHI, ILO, INFO, LDA, LDB, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   WORK( * )
-*       COMPLEX*16         A( LDA, * )
+*       DOUBLE PRECISION   LSCALE( * ), RSCALE( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * )
 *       ..
 *  
 *
@@ -14588,94 +16377,120 @@
 *>
 *> \verbatim
 *>
-*> ZLANTR  returns the value of the one norm,  or the Frobenius norm, or
-*> the  infinity norm,  or the  element of  largest absolute value  of a
-*> trapezoidal or triangular matrix A.
-*> \endverbatim
-*>
-*> \return ZLANTR
-*> \verbatim
-*>
-*>    ZLANTR = ( max(abs(A(i,j))), NORM = 'M' or 'm'
-*>             (
-*>             ( norm1(A),         NORM = '1', 'O' or 'o'
-*>             (
-*>             ( normI(A),         NORM = 'I' or 'i'
-*>             (
-*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
-*>
-*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
-*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
-*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
-*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> ZGGBAL balances a pair of general complex matrices (A,B).  This
+*> involves, first, permuting A and B by similarity transformations to
+*> isolate eigenvalues in the first 1 to ILO$-$1 and last IHI+1 to N
+*> elements on the diagonal; and second, applying a diagonal similarity
+*> transformation to rows and columns ILO to IHI to make the rows
+*> and columns as close in norm as possible. Both steps are optional.
+*>
+*> Balancing may reduce the 1-norm of the matrices, and improve the
+*> accuracy of the computed eigenvalues and/or eigenvectors in the
+*> generalized eigenvalue problem A*x = lambda*B*x.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] NORM
+*> \param[in] JOB
 *> \verbatim
-*>          NORM is CHARACTER*1
-*>          Specifies the value to be returned in ZLANTR as described
-*>          above.
+*>          JOB is CHARACTER*1
+*>          Specifies the operations to be performed on A and B:
+*>          = 'N':  none:  simply set ILO = 1, IHI = N, LSCALE(I) = 1.0
+*>                  and RSCALE(I) = 1.0 for i=1,...,N;
+*>          = 'P':  permute only;
+*>          = 'S':  scale only;
+*>          = 'B':  both permute and scale.
 *> \endverbatim
 *>
-*> \param[in] UPLO
+*> \param[in] N
 *> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies whether the matrix A is upper or lower trapezoidal.
-*>          = 'U':  Upper trapezoidal
-*>          = 'L':  Lower trapezoidal
-*>          Note that A is triangular instead of trapezoidal if M = N.
+*>          N is INTEGER
+*>          The order of the matrices A and B.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] DIAG
+*> \param[in,out] A
 *> \verbatim
-*>          DIAG is CHARACTER*1
-*>          Specifies whether or not the matrix A has unit diagonal.
-*>          = 'N':  Non-unit diagonal
-*>          = 'U':  Unit diagonal
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the input matrix A.
+*>          On exit, A is overwritten by the balanced matrix.
+*>          If JOB = 'N', A is not referenced.
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in] LDA
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0, and if
-*>          UPLO = 'U', M <= N.  When M = 0, ZLANTR is set to zero.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in,out] B
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0, and if
-*>          UPLO = 'L', N <= M.  When N = 0, ZLANTR is set to zero.
+*>          B is COMPLEX*16 array, dimension (LDB,N)
+*>          On entry, the input matrix B.
+*>          On exit, B is overwritten by the balanced matrix.
+*>          If JOB = 'N', B is not referenced.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in] LDB
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The trapezoidal matrix A (A is triangular if M = N).
-*>          If UPLO = 'U', the leading m by n upper trapezoidal part of
-*>          the array A contains the upper trapezoidal matrix, and the
-*>          strictly lower triangular part of A is not referenced.
-*>          If UPLO = 'L', the leading m by n lower trapezoidal part of
-*>          the array A contains the lower trapezoidal matrix, and the
-*>          strictly upper triangular part of A is not referenced.  Note
-*>          that when DIAG = 'U', the diagonal elements of A are not
-*>          referenced and are assumed to be one.
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[out] ILO
 *> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(M,1).
+*>          ILO is INTEGER
+*> \endverbatim
+*>
+*> \param[out] IHI
+*> \verbatim
+*>          IHI is INTEGER
+*>          ILO and IHI are set to integers such that on exit
+*>          A(i,j) = 0 and B(i,j) = 0 if i > j and
+*>          j = 1,...,ILO-1 or i = IHI+1,...,N.
+*>          If JOB = 'N' or 'S', ILO = 1 and IHI = N.
+*> \endverbatim
+*>
+*> \param[out] LSCALE
+*> \verbatim
+*>          LSCALE is DOUBLE PRECISION array, dimension (N)
+*>          Details of the permutations and scaling factors applied
+*>          to the left side of A and B.  If P(j) is the index of the
+*>          row interchanged with row j, and D(j) is the scaling factor
+*>          applied to row j, then
+*>            LSCALE(j) = P(j)    for J = 1,...,ILO-1
+*>                      = D(j)    for J = ILO,...,IHI
+*>                      = P(j)    for J = IHI+1,...,N.
+*>          The order in which the interchanges are made is N to IHI+1,
+*>          then 1 to ILO-1.
+*> \endverbatim
+*>
+*> \param[out] RSCALE
+*> \verbatim
+*>          RSCALE is DOUBLE PRECISION array, dimension (N)
+*>          Details of the permutations and scaling factors applied
+*>          to the right side of A and B.  If P(j) is the index of the
+*>          column interchanged with column j, and D(j) is the scaling
+*>          factor applied to column j, then
+*>            RSCALE(j) = P(j)    for J = 1,...,ILO-1
+*>                      = D(j)    for J = ILO,...,IHI
+*>                      = P(j)    for J = IHI+1,...,N.
+*>          The order in which the interchanges are made is N to IHI+1,
+*>          then 1 to ILO-1.
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
-*>          where LWORK >= M when NORM = 'I'; otherwise, WORK is not
-*>          referenced.
+*>          WORK is REAL array, dimension (lwork)
+*>          lwork must be at least max(1,6*N) when JOB = 'S' or 'B', and
+*>          at least 1 when JOB = 'N' or 'P'.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
 *
 *  Authors:
@@ -14686,339 +16501,669 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16GBcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  See R.C. WARD, Balancing the generalized eigenvalue problem,
+*>                 SIAM J. Sci. Stat. Comp. 2 (1981), 141-152.
+*> \endverbatim
+*>
 *  =====================================================================
-      DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
-     $                 WORK )
+      SUBROUTINE ZGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
+     $                   RSCALE, WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      CHARACTER          DIAG, NORM, UPLO
-      INTEGER            LDA, M, N
+      CHARACTER          JOB
+      INTEGER            IHI, ILO, INFO, LDA, LDB, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   WORK( * )
-      COMPLEX*16         A( LDA, * )
+      DOUBLE PRECISION   LSCALE( * ), RSCALE( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * )
 *     ..
 *
-* =====================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+      DOUBLE PRECISION   ZERO, HALF, ONE
+      PARAMETER          ( ZERO = 0.0D+0, HALF = 0.5D+0, ONE = 1.0D+0 )
+      DOUBLE PRECISION   THREE, SCLFAC
+      PARAMETER          ( THREE = 3.0D+0, SCLFAC = 1.0D+1 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            UDIAG
-      INTEGER            I, J
-      DOUBLE PRECISION   SCALE, SUM, VALUE
+      INTEGER            I, ICAB, IFLOW, IP1, IR, IRAB, IT, J, JC, JP1,
+     $                   K, KOUNT, L, LCAB, LM1, LRAB, LSFMAX, LSFMIN,
+     $                   M, NR, NRP2
+      DOUBLE PRECISION   ALPHA, BASL, BETA, CAB, CMAX, COEF, COEF2,
+     $                   COEF5, COR, EW, EWC, GAMMA, PGAMMA, RAB, SFMAX,
+     $                   SFMIN, SUM, T, TA, TB, TC
+      COMPLEX*16         CDUM
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME, DISNAN
-      EXTERNAL           LSAME, DISNAN
+      LOGICAL            LSAME
+      INTEGER            IZAMAX
+      DOUBLE PRECISION   DDOT, DLAMCH
+      EXTERNAL           LSAME, IZAMAX, DDOT, DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLASSQ
+      EXTERNAL           DAXPY, DSCAL, XERBLA, ZDSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MIN, SQRT
+      INTRINSIC          ABS, DBLE, DIMAG, INT, LOG10, MAX, MIN, SIGN
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
 *     ..
 *     .. Executable Statements ..
 *
-      IF( MIN( M, N ).EQ.0 ) THEN
-         VALUE = ZERO
-      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*     Test the input parameters
 *
-*        Find max(abs(A(i,j))).
+      INFO = 0
+      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.LSAME( JOB, 'P' ) .AND.
+     $    .NOT.LSAME( JOB, 'S' ) .AND. .NOT.LSAME( JOB, 'B' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -6
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGGBAL', -INFO )
+         RETURN
+      END IF
 *
-         IF( LSAME( DIAG, 'U' ) ) THEN
-            VALUE = ONE
-            IF( LSAME( UPLO, 'U' ) ) THEN
-               DO 20 J = 1, N
-                  DO 10 I = 1, MIN( M, J-1 )
-                     SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   10             CONTINUE
-   20          CONTINUE
-            ELSE
-               DO 40 J = 1, N
-                  DO 30 I = J + 1, M
-                     SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   30             CONTINUE
-   40          CONTINUE
-            END IF
-         ELSE
-            VALUE = ZERO
-            IF( LSAME( UPLO, 'U' ) ) THEN
-               DO 60 J = 1, N
-                  DO 50 I = 1, MIN( M, J )
-                     SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   50             CONTINUE
-   60          CONTINUE
-            ELSE
-               DO 80 J = 1, N
-                  DO 70 I = J, M
-                     SUM = ABS( A( I, J ) )
-                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-   70             CONTINUE
-   80          CONTINUE
-            END IF
-         END IF
-      ELSE IF( ( LSAME( NORM, 'O' ) ) .OR. ( NORM.EQ.'1' ) ) THEN
+*     Quick return if possible
 *
-*        Find norm1(A).
+      IF( N.EQ.0 ) THEN
+         ILO = 1
+         IHI = N
+         RETURN
+      END IF
 *
-         VALUE = ZERO
-         UDIAG = LSAME( DIAG, 'U' )
-         IF( LSAME( UPLO, 'U' ) ) THEN
-            DO 110 J = 1, N
-               IF( ( UDIAG ) .AND. ( J.LE.M ) ) THEN
-                  SUM = ONE
-                  DO 90 I = 1, J - 1
-                     SUM = SUM + ABS( A( I, J ) )
-   90             CONTINUE
-               ELSE
-                  SUM = ZERO
-                  DO 100 I = 1, MIN( M, J )
-                     SUM = SUM + ABS( A( I, J ) )
-  100             CONTINUE
-               END IF
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-  110       CONTINUE
-         ELSE
-            DO 140 J = 1, N
-               IF( UDIAG ) THEN
-                  SUM = ONE
-                  DO 120 I = J + 1, M
-                     SUM = SUM + ABS( A( I, J ) )
-  120             CONTINUE
-               ELSE
-                  SUM = ZERO
-                  DO 130 I = J, M
-                     SUM = SUM + ABS( A( I, J ) )
-  130             CONTINUE
-               END IF
-               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-  140       CONTINUE
-         END IF
-      ELSE IF( LSAME( NORM, 'I' ) ) THEN
+      IF( N.EQ.1 ) THEN
+         ILO = 1
+         IHI = N
+         LSCALE( 1 ) = ONE
+         RSCALE( 1 ) = ONE
+         RETURN
+      END IF
 *
-*        Find normI(A).
+      IF( LSAME( JOB, 'N' ) ) THEN
+         ILO = 1
+         IHI = N
+         DO 10 I = 1, N
+            LSCALE( I ) = ONE
+            RSCALE( I ) = ONE
+   10    CONTINUE
+         RETURN
+      END IF
 *
-         IF( LSAME( UPLO, 'U' ) ) THEN
-            IF( LSAME( DIAG, 'U' ) ) THEN
-               DO 150 I = 1, M
-                  WORK( I ) = ONE
-  150          CONTINUE
-               DO 170 J = 1, N
-                  DO 160 I = 1, MIN( M, J-1 )
-                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
-  160             CONTINUE
-  170          CONTINUE
-            ELSE
-               DO 180 I = 1, M
-                  WORK( I ) = ZERO
-  180          CONTINUE
-               DO 200 J = 1, N
-                  DO 190 I = 1, MIN( M, J )
-                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
-  190             CONTINUE
-  200          CONTINUE
-            END IF
-         ELSE
-            IF( LSAME( DIAG, 'U' ) ) THEN
-               DO 210 I = 1, N
-                  WORK( I ) = ONE
-  210          CONTINUE
-               DO 220 I = N + 1, M
-                  WORK( I ) = ZERO
-  220          CONTINUE
-               DO 240 J = 1, N
-                  DO 230 I = J + 1, M
-                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
-  230             CONTINUE
-  240          CONTINUE
-            ELSE
-               DO 250 I = 1, M
-                  WORK( I ) = ZERO
-  250          CONTINUE
-               DO 270 J = 1, N
-                  DO 260 I = J, M
-                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
-  260             CONTINUE
-  270          CONTINUE
-            END IF
-         END IF
-         VALUE = ZERO
-         DO 280 I = 1, M
-            SUM = WORK( I )
-            IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
-  280    CONTINUE
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      K = 1
+      L = N
+      IF( LSAME( JOB, 'S' ) )
+     $   GO TO 190
 *
-*        Find normF(A).
+      GO TO 30
 *
-         IF( LSAME( UPLO, 'U' ) ) THEN
-            IF( LSAME( DIAG, 'U' ) ) THEN
-               SCALE = ONE
-               SUM = MIN( M, N )
-               DO 290 J = 2, N
-                  CALL ZLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM )
-  290          CONTINUE
-            ELSE
-               SCALE = ZERO
-               SUM = ONE
-               DO 300 J = 1, N
-                  CALL ZLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM )
-  300          CONTINUE
-            END IF
-         ELSE
-            IF( LSAME( DIAG, 'U' ) ) THEN
-               SCALE = ONE
-               SUM = MIN( M, N )
-               DO 310 J = 1, N
-                  CALL ZLASSQ( M-J, A( MIN( M, J+1 ), J ), 1, SCALE,
-     $                         SUM )
-  310          CONTINUE
-            ELSE
-               SCALE = ZERO
-               SUM = ONE
-               DO 320 J = 1, N
-                  CALL ZLASSQ( M-J+1, A( J, J ), 1, SCALE, SUM )
-  320          CONTINUE
-            END IF
-         END IF
-         VALUE = SCALE*SQRT( SUM )
-      END IF
+*     Permute the matrices A and B to isolate the eigenvalues.
 *
-      ZLANTR = VALUE
-      RETURN
+*     Find row with one nonzero in columns 1 through L
 *
-*     End of ZLANTR
+   20 CONTINUE
+      L = LM1
+      IF( L.NE.1 )
+     $   GO TO 30
 *
-      END
-*> \brief \b ZLAQP2 computes a QR factorization with column pivoting of the matrix block.
+      RSCALE( 1 ) = 1
+      LSCALE( 1 ) = 1
+      GO TO 190
 *
-*  =========== DOCUMENTATION ===========
+   30 CONTINUE
+      LM1 = L - 1
+      DO 80 I = L, 1, -1
+         DO 40 J = 1, LM1
+            JP1 = J + 1
+            IF( A( I, J ).NE.CZERO .OR. B( I, J ).NE.CZERO )
+     $         GO TO 50
+   40    CONTINUE
+         J = L
+         GO TO 70
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+   50    CONTINUE
+         DO 60 J = JP1, L
+            IF( A( I, J ).NE.CZERO .OR. B( I, J ).NE.CZERO )
+     $         GO TO 80
+   60    CONTINUE
+         J = JP1 - 1
 *
-*> \htmlonly
-*> Download ZLAQP2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqp2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqp2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqp2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+   70    CONTINUE
+         M = L
+         IFLOW = 1
+         GO TO 160
+   80 CONTINUE
+      GO TO 100
 *
-*  Definition:
-*  ===========
+*     Find column with one nonzero in rows K through N
 *
-*       SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
-*                          WORK )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            LDA, M, N, OFFSET
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            JPVT( * )
-*       DOUBLE PRECISION   VN1( * ), VN2( * )
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
+   90 CONTINUE
+      K = K + 1
+*
+  100 CONTINUE
+      DO 150 J = K, L
+         DO 110 I = K, LM1
+            IP1 = I + 1
+            IF( A( I, J ).NE.CZERO .OR. B( I, J ).NE.CZERO )
+     $         GO TO 120
+  110    CONTINUE
+         I = L
+         GO TO 140
+  120    CONTINUE
+         DO 130 I = IP1, L
+            IF( A( I, J ).NE.CZERO .OR. B( I, J ).NE.CZERO )
+     $         GO TO 150
+  130    CONTINUE
+         I = IP1 - 1
+  140    CONTINUE
+         M = K
+         IFLOW = 2
+         GO TO 160
+  150 CONTINUE
+      GO TO 190
+*
+*     Permute rows M and I
+*
+  160 CONTINUE
+      LSCALE( M ) = I
+      IF( I.EQ.M )
+     $   GO TO 170
+      CALL ZSWAP( N-K+1, A( I, K ), LDA, A( M, K ), LDA )
+      CALL ZSWAP( N-K+1, B( I, K ), LDB, B( M, K ), LDB )
+*
+*     Permute columns M and J
+*
+  170 CONTINUE
+      RSCALE( M ) = J
+      IF( J.EQ.M )
+     $   GO TO 180
+      CALL ZSWAP( L, A( 1, J ), 1, A( 1, M ), 1 )
+      CALL ZSWAP( L, B( 1, J ), 1, B( 1, M ), 1 )
+*
+  180 CONTINUE
+      GO TO ( 20, 90 )IFLOW
+*
+  190 CONTINUE
+      ILO = K
+      IHI = L
+*
+      IF( LSAME( JOB, 'P' ) ) THEN
+         DO 195 I = ILO, IHI
+            LSCALE( I ) = ONE
+            RSCALE( I ) = ONE
+  195    CONTINUE
+         RETURN
+      END IF
+*
+      IF( ILO.EQ.IHI )
+     $   RETURN
+*
+*     Balance the submatrix in rows ILO to IHI.
+*
+      NR = IHI - ILO + 1
+      DO 200 I = ILO, IHI
+         RSCALE( I ) = ZERO
+         LSCALE( I ) = ZERO
+*
+         WORK( I ) = ZERO
+         WORK( I+N ) = ZERO
+         WORK( I+2*N ) = ZERO
+         WORK( I+3*N ) = ZERO
+         WORK( I+4*N ) = ZERO
+         WORK( I+5*N ) = ZERO
+  200 CONTINUE
+*
+*     Compute right side vector in resulting linear equations
+*
+      BASL = LOG10( SCLFAC )
+      DO 240 I = ILO, IHI
+         DO 230 J = ILO, IHI
+            IF( A( I, J ).EQ.CZERO ) THEN
+               TA = ZERO
+               GO TO 210
+            END IF
+            TA = LOG10( CABS1( A( I, J ) ) ) / BASL
+*
+  210       CONTINUE
+            IF( B( I, J ).EQ.CZERO ) THEN
+               TB = ZERO
+               GO TO 220
+            END IF
+            TB = LOG10( CABS1( B( I, J ) ) ) / BASL
+*
+  220       CONTINUE
+            WORK( I+4*N ) = WORK( I+4*N ) - TA - TB
+            WORK( J+5*N ) = WORK( J+5*N ) - TA - TB
+  230    CONTINUE
+  240 CONTINUE
+*
+      COEF = ONE / DBLE( 2*NR )
+      COEF2 = COEF*COEF
+      COEF5 = HALF*COEF2
+      NRP2 = NR + 2
+      BETA = ZERO
+      IT = 1
+*
+*     Start generalized conjugate gradient iteration
+*
+  250 CONTINUE
+*
+      GAMMA = DDOT( NR, WORK( ILO+4*N ), 1, WORK( ILO+4*N ), 1 ) +
+     $        DDOT( NR, WORK( ILO+5*N ), 1, WORK( ILO+5*N ), 1 )
+*
+      EW = ZERO
+      EWC = ZERO
+      DO 260 I = ILO, IHI
+         EW = EW + WORK( I+4*N )
+         EWC = EWC + WORK( I+5*N )
+  260 CONTINUE
+*
+      GAMMA = COEF*GAMMA - COEF2*( EW**2+EWC**2 ) - COEF5*( EW-EWC )**2
+      IF( GAMMA.EQ.ZERO )
+     $   GO TO 350
+      IF( IT.NE.1 )
+     $   BETA = GAMMA / PGAMMA
+      T = COEF5*( EWC-THREE*EW )
+      TC = COEF5*( EW-THREE*EWC )
+*
+      CALL DSCAL( NR, BETA, WORK( ILO ), 1 )
+      CALL DSCAL( NR, BETA, WORK( ILO+N ), 1 )
+*
+      CALL DAXPY( NR, COEF, WORK( ILO+4*N ), 1, WORK( ILO+N ), 1 )
+      CALL DAXPY( NR, COEF, WORK( ILO+5*N ), 1, WORK( ILO ), 1 )
+*
+      DO 270 I = ILO, IHI
+         WORK( I ) = WORK( I ) + TC
+         WORK( I+N ) = WORK( I+N ) + T
+  270 CONTINUE
+*
+*     Apply matrix to vector
+*
+      DO 300 I = ILO, IHI
+         KOUNT = 0
+         SUM = ZERO
+         DO 290 J = ILO, IHI
+            IF( A( I, J ).EQ.CZERO )
+     $         GO TO 280
+            KOUNT = KOUNT + 1
+            SUM = SUM + WORK( J )
+  280       CONTINUE
+            IF( B( I, J ).EQ.CZERO )
+     $         GO TO 290
+            KOUNT = KOUNT + 1
+            SUM = SUM + WORK( J )
+  290    CONTINUE
+         WORK( I+2*N ) = DBLE( KOUNT )*WORK( I+N ) + SUM
+  300 CONTINUE
+*
+      DO 330 J = ILO, IHI
+         KOUNT = 0
+         SUM = ZERO
+         DO 320 I = ILO, IHI
+            IF( A( I, J ).EQ.CZERO )
+     $         GO TO 310
+            KOUNT = KOUNT + 1
+            SUM = SUM + WORK( I+N )
+  310       CONTINUE
+            IF( B( I, J ).EQ.CZERO )
+     $         GO TO 320
+            KOUNT = KOUNT + 1
+            SUM = SUM + WORK( I+N )
+  320    CONTINUE
+         WORK( J+3*N ) = DBLE( KOUNT )*WORK( J ) + SUM
+  330 CONTINUE
+*
+      SUM = DDOT( NR, WORK( ILO+N ), 1, WORK( ILO+2*N ), 1 ) +
+     $      DDOT( NR, WORK( ILO ), 1, WORK( ILO+3*N ), 1 )
+      ALPHA = GAMMA / SUM
+*
+*     Determine correction to current iteration
+*
+      CMAX = ZERO
+      DO 340 I = ILO, IHI
+         COR = ALPHA*WORK( I+N )
+         IF( ABS( COR ).GT.CMAX )
+     $      CMAX = ABS( COR )
+         LSCALE( I ) = LSCALE( I ) + COR
+         COR = ALPHA*WORK( I )
+         IF( ABS( COR ).GT.CMAX )
+     $      CMAX = ABS( COR )
+         RSCALE( I ) = RSCALE( I ) + COR
+  340 CONTINUE
+      IF( CMAX.LT.HALF )
+     $   GO TO 350
+*
+      CALL DAXPY( NR, -ALPHA, WORK( ILO+2*N ), 1, WORK( ILO+4*N ), 1 )
+      CALL DAXPY( NR, -ALPHA, WORK( ILO+3*N ), 1, WORK( ILO+5*N ), 1 )
+*
+      PGAMMA = GAMMA
+      IT = IT + 1
+      IF( IT.LE.NRP2 )
+     $   GO TO 250
+*
+*     End generalized conjugate gradient iteration
+*
+  350 CONTINUE
+      SFMIN = DLAMCH( 'S' )
+      SFMAX = ONE / SFMIN
+      LSFMIN = INT( LOG10( SFMIN ) / BASL+ONE )
+      LSFMAX = INT( LOG10( SFMAX ) / BASL )
+      DO 360 I = ILO, IHI
+         IRAB = IZAMAX( N-ILO+1, A( I, ILO ), LDA )
+         RAB = ABS( A( I, IRAB+ILO-1 ) )
+         IRAB = IZAMAX( N-ILO+1, B( I, ILO ), LDB )
+         RAB = MAX( RAB, ABS( B( I, IRAB+ILO-1 ) ) )
+         LRAB = INT( LOG10( RAB+SFMIN ) / BASL+ONE )
+         IR = INT(LSCALE( I ) + SIGN( HALF, LSCALE( I ) ))
+         IR = MIN( MAX( IR, LSFMIN ), LSFMAX, LSFMAX-LRAB )
+         LSCALE( I ) = SCLFAC**IR
+         ICAB = IZAMAX( IHI, A( 1, I ), 1 )
+         CAB = ABS( A( ICAB, I ) )
+         ICAB = IZAMAX( IHI, B( 1, I ), 1 )
+         CAB = MAX( CAB, ABS( B( ICAB, I ) ) )
+         LCAB = INT( LOG10( CAB+SFMIN ) / BASL+ONE )
+         JC = INT(RSCALE( I ) + SIGN( HALF, RSCALE( I ) ))
+         JC = MIN( MAX( JC, LSFMIN ), LSFMAX, LSFMAX-LCAB )
+         RSCALE( I ) = SCLFAC**JC
+  360 CONTINUE
+*
+*     Row scaling of matrices A and B
+*
+      DO 370 I = ILO, IHI
+         CALL ZDSCAL( N-ILO+1, LSCALE( I ), A( I, ILO ), LDA )
+         CALL ZDSCAL( N-ILO+1, LSCALE( I ), B( I, ILO ), LDB )
+  370 CONTINUE
+*
+*     Column scaling of matrices A and B
+*
+      DO 380 J = ILO, IHI
+         CALL ZDSCAL( IHI, RSCALE( J ), A( 1, J ), 1 )
+         CALL ZDSCAL( IHI, RSCALE( J ), B( 1, J ), 1 )
+  380 CONTINUE
+*
+      RETURN
+*
+*     End of ZGGBAL
+*
+      END
+*> \brief <b> ZGGES computes the eigenvalues, the Schur form, and, optionally, the matrix of Schur vectors for GE matrices</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZGGES + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgges.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgges.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgges.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
+*                         SDIM, ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
+*                         LWORK, RWORK, BWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBVSL, JOBVSR, SORT
+*       INTEGER            INFO, LDA, LDB, LDVSL, LDVSR, LWORK, N, SDIM
+*       ..
+*       .. Array Arguments ..
+*       LOGICAL            BWORK( * )
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         A( LDA, * ), ALPHA( * ), B( LDB, * ),
+*      $                   BETA( * ), VSL( LDVSL, * ), VSR( LDVSR, * ),
+*      $                   WORK( * )
+*       ..
+*       .. Function Arguments ..
+*       LOGICAL            SELCTG
+*       EXTERNAL           SELCTG
+*       ..
+*  
 *
 *> \par Purpose:
 *  =============
 *>
 *> \verbatim
 *>
-*> ZLAQP2 computes a QR factorization with column pivoting of
-*> the block A(OFFSET+1:M,1:N).
-*> The block A(1:OFFSET,1:N) is accordingly pivoted, but not factorized.
+*> ZGGES computes for a pair of N-by-N complex nonsymmetric matrices
+*> (A,B), the generalized eigenvalues, the generalized complex Schur
+*> form (S, T), and optionally left and/or right Schur vectors (VSL
+*> and VSR). This gives the generalized Schur factorization
+*>
+*>         (A,B) = ( (VSL)*S*(VSR)**H, (VSL)*T*(VSR)**H )
+*>
+*> where (VSR)**H is the conjugate-transpose of VSR.
+*>
+*> Optionally, it also orders the eigenvalues so that a selected cluster
+*> of eigenvalues appears in the leading diagonal blocks of the upper
+*> triangular matrix S and the upper triangular matrix T. The leading
+*> columns of VSL and VSR then form an unitary basis for the
+*> corresponding left and right eigenspaces (deflating subspaces).
+*>
+*> (If only the generalized eigenvalues are needed, use the driver
+*> ZGGEV instead, which is faster.)
+*>
+*> A generalized eigenvalue for a pair of matrices (A,B) is a scalar w
+*> or a ratio alpha/beta = w, such that  A - w*B is singular.  It is
+*> usually represented as the pair (alpha,beta), as there is a
+*> reasonable interpretation for beta=0, and even for both being zero.
+*>
+*> A pair of matrices (S,T) is in generalized complex Schur form if S
+*> and T are upper triangular and, in addition, the diagonal elements
+*> of T are non-negative real numbers.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] JOBVSL
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A. M >= 0.
+*>          JOBVSL is CHARACTER*1
+*>          = 'N':  do not compute the left Schur vectors;
+*>          = 'V':  compute the left Schur vectors.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] JOBVSR
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A. N >= 0.
+*>          JOBVSR is CHARACTER*1
+*>          = 'N':  do not compute the right Schur vectors;
+*>          = 'V':  compute the right Schur vectors.
 *> \endverbatim
 *>
-*> \param[in] OFFSET
+*> \param[in] SORT
 *> \verbatim
-*>          OFFSET is INTEGER
-*>          The number of rows of the matrix A that must be pivoted
-*>          but no factorized. OFFSET >= 0.
+*>          SORT is CHARACTER*1
+*>          Specifies whether or not to order the eigenvalues on the
+*>          diagonal of the generalized Schur form.
+*>          = 'N':  Eigenvalues are not ordered;
+*>          = 'S':  Eigenvalues are ordered (see SELCTG).
+*> \endverbatim
+*>
+*> \param[in] SELCTG
+*> \verbatim
+*>          SELCTG is a LOGICAL FUNCTION of two COMPLEX*16 arguments
+*>          SELCTG must be declared EXTERNAL in the calling subroutine.
+*>          If SORT = 'N', SELCTG is not referenced.
+*>          If SORT = 'S', SELCTG is used to select eigenvalues to sort
+*>          to the top left of the Schur form.
+*>          An eigenvalue ALPHA(j)/BETA(j) is selected if
+*>          SELCTG(ALPHA(j),BETA(j)) is true.
+*>
+*>          Note that a selected complex eigenvalue may no longer satisfy
+*>          SELCTG(ALPHA(j),BETA(j)) = .TRUE. after ordering, since
+*>          ordering may change the value of complex eigenvalues
+*>          (especially if the eigenvalue is ill-conditioned), in this
+*>          case INFO is set to N+2 (See INFO below).
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrices A, B, VSL, and VSR.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, the upper triangle of block A(OFFSET+1:M,1:N) is
-*>          the triangular factor obtained; the elements in block
-*>          A(OFFSET+1:M,1:N) below the diagonal, together with the
-*>          array TAU, represent the orthogonal matrix Q as a product of
-*>          elementary reflectors. Block A(1:OFFSET,1:N) has been
-*>          accordingly pivoted, but no factorized.
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the first of the pair of matrices.
+*>          On exit, A has been overwritten by its generalized Schur
+*>          form S.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          The leading dimension of A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in,out] JPVT
+*> \param[in,out] B
 *> \verbatim
-*>          JPVT is INTEGER array, dimension (N)
-*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is permuted
-*>          to the front of A*P (a leading column); if JPVT(i) = 0,
-*>          the i-th column of A is a free column.
-*>          On exit, if JPVT(i) = k, then the i-th column of A*P
-*>          was the k-th column of A.
+*>          B is COMPLEX*16 array, dimension (LDB, N)
+*>          On entry, the second of the pair of matrices.
+*>          On exit, B has been overwritten by its generalized Schur
+*>          form T.
 *> \endverbatim
 *>
-*> \param[out] TAU
+*> \param[in] LDB
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (min(M,N))
-*>          The scalar factors of the elementary reflectors.
+*>          LDB is INTEGER
+*>          The leading dimension of B.  LDB >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in,out] VN1
+*> \param[out] SDIM
 *> \verbatim
-*>          VN1 is DOUBLE PRECISION array, dimension (N)
-*>          The vector with the partial column norms.
+*>          SDIM is INTEGER
+*>          If SORT = 'N', SDIM = 0.
+*>          If SORT = 'S', SDIM = number of eigenvalues (after sorting)
+*>          for which SELCTG is true.
 *> \endverbatim
 *>
-*> \param[in,out] VN2
+*> \param[out] ALPHA
 *> \verbatim
-*>          VN2 is DOUBLE PRECISION array, dimension (N)
-*>          The vector with the exact column norms.
+*>          ALPHA is COMPLEX*16 array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] BETA
+*> \verbatim
+*>          BETA is COMPLEX*16 array, dimension (N)
+*>          On exit,  ALPHA(j)/BETA(j), j=1,...,N, will be the
+*>          generalized eigenvalues.  ALPHA(j), j=1,...,N  and  BETA(j),
+*>          j=1,...,N  are the diagonals of the complex Schur form (A,B)
+*>          output by ZGGES. The  BETA(j) will be non-negative real.
+*>
+*>          Note: the quotients ALPHA(j)/BETA(j) may easily over- or
+*>          underflow, and BETA(j) may even be zero.  Thus, the user
+*>          should avoid naively computing the ratio alpha/beta.
+*>          However, ALPHA will be always less than and usually
+*>          comparable with norm(A) in magnitude, and BETA always less
+*>          than and usually comparable with norm(B).
+*> \endverbatim
+*>
+*> \param[out] VSL
+*> \verbatim
+*>          VSL is COMPLEX*16 array, dimension (LDVSL,N)
+*>          If JOBVSL = 'V', VSL will contain the left Schur vectors.
+*>          Not referenced if JOBVSL = 'N'.
+*> \endverbatim
+*>
+*> \param[in] LDVSL
+*> \verbatim
+*>          LDVSL is INTEGER
+*>          The leading dimension of the matrix VSL. LDVSL >= 1, and
+*>          if JOBVSL = 'V', LDVSL >= N.
+*> \endverbatim
+*>
+*> \param[out] VSR
+*> \verbatim
+*>          VSR is COMPLEX*16 array, dimension (LDVSR,N)
+*>          If JOBVSR = 'V', VSR will contain the right Schur vectors.
+*>          Not referenced if JOBVSR = 'N'.
+*> \endverbatim
+*>
+*> \param[in] LDVSR
+*> \verbatim
+*>          LDVSR is INTEGER
+*>          The leading dimension of the matrix VSR. LDVSR >= 1, and
+*>          if JOBVSR = 'V', LDVSR >= N.
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (N)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,2*N).
+*>          For good performance, LWORK must generally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (8*N)
+*> \endverbatim
+*>
+*> \param[out] BWORK
+*> \verbatim
+*>          BWORK is LOGICAL array, dimension (N)
+*>          Not referenced if SORT = 'N'.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          =1,...,N:
+*>                The QZ iteration failed.  (A,B) are not in Schur
+*>                form, but ALPHA(j) and BETA(j) should be correct for
+*>                j=INFO+1,...,N.
+*>          > N:  =N+1: other than QZ iteration failed in ZHGEQZ
+*>                =N+2: after reordering, roundoff changed values of
+*>                      some complex eigenvalues so that leading
+*>                      eigenvalues in the Generalized Schur form no
+*>                      longer satisfy SELCTG=.TRUE.  This could also
+*>                      be caused due to scaling.
+*>                =N+3: reordering failed in ZTGSEN.
 *> \endverbatim
 *
 *  Authors:
@@ -15029,149 +17174,343 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
-*
-*> \par Contributors:
-*  ==================
-*>
-*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain
-*>    X. Sun, Computer Science Dept., Duke University, USA
-*> \n
-*>  Partial column norm updating strategy modified on April 2011
-*>    Z. Drmac and Z. Bujanovic, Dept. of Mathematics,
-*>    University of Zagreb, Croatia.
-*
-*> \par References:
-*  ================
-*>
-*> LAPACK Working Note 176
+*> \date November 2015
 *
-*> \htmlonly
-*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a> 
-*> \endhtmlonly 
+*> \ingroup complex16GEeigen
 *
 *  =====================================================================
-      SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
-     $                   WORK )
+      SUBROUTINE ZGGES( JOBVSL, JOBVSR, SORT, SELCTG, N, A, LDA, B, LDB,
+     $                  SDIM, ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
+     $                  LWORK, RWORK, BWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      INTEGER            LDA, M, N, OFFSET
+      CHARACTER          JOBVSL, JOBVSR, SORT
+      INTEGER            INFO, LDA, LDB, LDVSL, LDVSR, LWORK, N, SDIM
 *     ..
 *     .. Array Arguments ..
-      INTEGER            JPVT( * )
-      DOUBLE PRECISION   VN1( * ), VN2( * )
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      LOGICAL            BWORK( * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         A( LDA, * ), ALPHA( * ), B( LDB, * ),
+     $                   BETA( * ), VSL( LDVSL, * ), VSR( LDVSR, * ),
+     $                   WORK( * )
+*     ..
+*     .. Function Arguments ..
+      LOGICAL            SELCTG
+      EXTERNAL           SELCTG
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
       DOUBLE PRECISION   ZERO, ONE
-      COMPLEX*16         CONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0,
-     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ),
+     $                   CONE = ( 1.0D0, 0.0D0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, ITEMP, J, MN, OFFPI, PVT
-      DOUBLE PRECISION   TEMP, TEMP2, TOL3Z
-      COMPLEX*16         AII
+      LOGICAL            CURSL, ILASCL, ILBSCL, ILVSL, ILVSR, LASTSL,
+     $                   LQUERY, WANTST
+      INTEGER            I, ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT,
+     $                   ILO, IRIGHT, IROWS, IRWRK, ITAU, IWRK, LWKMIN,
+     $                   LWKOPT
+      DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS, PVSL,
+     $                   PVSR, SMLNUM
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZLARF, ZLARFG, ZSWAP
+*     .. Local Arrays ..
+      INTEGER            IDUM( 1 )
+      DOUBLE PRECISION   DIF( 2 )
 *     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DCONJG, MAX, MIN, SQRT
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
+     $                   ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGSEN, ZUNGQR,
+     $                   ZUNMQR
 *     ..
 *     .. External Functions ..
-      INTEGER            IDAMAX
-      DOUBLE PRECISION   DLAMCH, DZNRM2
-      EXTERNAL           IDAMAX, DLAMCH, DZNRM2
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
-      MN = MIN( M-OFFSET, N )
-      TOL3Z = SQRT(DLAMCH('Epsilon'))
+*     Decode the input arguments
 *
-*     Compute factorization.
+      IF( LSAME( JOBVSL, 'N' ) ) THEN
+         IJOBVL = 1
+         ILVSL = .FALSE.
+      ELSE IF( LSAME( JOBVSL, 'V' ) ) THEN
+         IJOBVL = 2
+         ILVSL = .TRUE.
+      ELSE
+         IJOBVL = -1
+         ILVSL = .FALSE.
+      END IF
 *
-      DO 20 I = 1, MN
+      IF( LSAME( JOBVSR, 'N' ) ) THEN
+         IJOBVR = 1
+         ILVSR = .FALSE.
+      ELSE IF( LSAME( JOBVSR, 'V' ) ) THEN
+         IJOBVR = 2
+         ILVSR = .TRUE.
+      ELSE
+         IJOBVR = -1
+         ILVSR = .FALSE.
+      END IF
 *
-         OFFPI = OFFSET + I
+      WANTST = LSAME( SORT, 'S' )
 *
-*        Determine ith pivot column and swap if necessary.
+*     Test the input arguments
 *
-         PVT = ( I-1 ) + IDAMAX( N-I+1, VN1( I ), 1 )
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( IJOBVL.LE.0 ) THEN
+         INFO = -1
+      ELSE IF( IJOBVR.LE.0 ) THEN
+         INFO = -2
+      ELSE IF( ( .NOT.WANTST ) .AND. ( .NOT.LSAME( SORT, 'N' ) ) ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( LDVSL.LT.1 .OR. ( ILVSL .AND. LDVSL.LT.N ) ) THEN
+         INFO = -14
+      ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
+         INFO = -16
+      END IF
 *
-         IF( PVT.NE.I ) THEN
-            CALL ZSWAP( M, A( 1, PVT ), 1, A( 1, I ), 1 )
-            ITEMP = JPVT( PVT )
-            JPVT( PVT ) = JPVT( I )
-            JPVT( I ) = ITEMP
-            VN1( PVT ) = VN1( I )
-            VN2( PVT ) = VN2( I )
+*     Compute workspace
+*      (Note: Comments in the code beginning "Workspace:" describe the
+*       minimal amount of workspace needed at that point in the code,
+*       as well as the preferred amount for good performance.
+*       NB refers to the optimal block size for the immediately
+*       following subroutine, as returned by ILAENV.)
+*
+      IF( INFO.EQ.0 ) THEN
+         LWKMIN = MAX( 1, 2*N )
+         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N, 0 ) )
+         LWKOPT = MAX( LWKOPT, N +
+     $                 N*ILAENV( 1, 'ZUNMQR', ' ', N, 1, N, -1 ) )
+         IF( ILVSL ) THEN
+            LWKOPT = MAX( LWKOPT, N +
+     $                    N*ILAENV( 1, 'ZUNGQR', ' ', N, 1, N, -1 ) )
          END IF
+         WORK( 1 ) = LWKOPT
 *
-*        Generate elementary reflector H(i).
+         IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
+     $      INFO = -18
+      END IF
 *
-         IF( OFFPI.LT.M ) THEN
-            CALL ZLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ), 1,
-     $                   TAU( I ) )
-         ELSE
-            CALL ZLARFG( 1, A( M, I ), A( M, I ), 1, TAU( I ) )
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGGES ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 ) THEN
+         SDIM = 0
+         RETURN
+      END IF
+*
+*     Get machine constants
+*
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+      SMLNUM = SQRT( SMLNUM ) / EPS
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = ZLANGE( 'M', N, N, A, LDA, RWORK )
+      ILASCL = .FALSE.
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+         ANRMTO = SMLNUM
+         ILASCL = .TRUE.
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+         ANRMTO = BIGNUM
+         ILASCL = .TRUE.
+      END IF
+*
+      IF( ILASCL )
+     $   CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, N, A, LDA, IERR )
+*
+*     Scale B if max element outside range [SMLNUM,BIGNUM]
+*
+      BNRM = ZLANGE( 'M', N, N, B, LDB, RWORK )
+      ILBSCL = .FALSE.
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+         BNRMTO = SMLNUM
+         ILBSCL = .TRUE.
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+         BNRMTO = BIGNUM
+         ILBSCL = .TRUE.
+      END IF
+*
+      IF( ILBSCL )
+     $   CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, N, B, LDB, IERR )
+*
+*     Permute the matrix to make it more nearly triangular
+*     (Real Workspace: need 6*N)
+*
+      ILEFT = 1
+      IRIGHT = N + 1
+      IRWRK = IRIGHT + N
+      CALL ZGGBAL( 'P', N, A, LDA, B, LDB, ILO, IHI, RWORK( ILEFT ),
+     $             RWORK( IRIGHT ), RWORK( IRWRK ), IERR )
+*
+*     Reduce B to triangular form (QR decomposition of B)
+*     (Complex Workspace: need N, prefer N*NB)
+*
+      IROWS = IHI + 1 - ILO
+      ICOLS = N + 1 - ILO
+      ITAU = 1
+      IWRK = ITAU + IROWS
+      CALL ZGEQRF( IROWS, ICOLS, B( ILO, ILO ), LDB, WORK( ITAU ),
+     $             WORK( IWRK ), LWORK+1-IWRK, IERR )
+*
+*     Apply the orthogonal transformation to matrix A
+*     (Complex Workspace: need N, prefer N*NB)
+*
+      CALL ZUNMQR( 'L', 'C', IROWS, ICOLS, IROWS, B( ILO, ILO ), LDB,
+     $             WORK( ITAU ), A( ILO, ILO ), LDA, WORK( IWRK ),
+     $             LWORK+1-IWRK, IERR )
+*
+*     Initialize VSL
+*     (Complex Workspace: need N, prefer N*NB)
+*
+      IF( ILVSL ) THEN
+         CALL ZLASET( 'Full', N, N, CZERO, CONE, VSL, LDVSL )
+         IF( IROWS.GT.1 ) THEN
+            CALL ZLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
+     $                   VSL( ILO+1, ILO ), LDVSL )
          END IF
+         CALL ZUNGQR( IROWS, IROWS, IROWS, VSL( ILO, ILO ), LDVSL,
+     $                WORK( ITAU ), WORK( IWRK ), LWORK+1-IWRK, IERR )
+      END IF
 *
-         IF( I.LT.N ) THEN
+*     Initialize VSR
 *
-*           Apply H(i)**H to A(offset+i:m,i+1:n) from the left.
+      IF( ILVSR )
+     $   CALL ZLASET( 'Full', N, N, CZERO, CONE, VSR, LDVSR )
 *
-            AII = A( OFFPI, I )
-            A( OFFPI, I ) = CONE
-            CALL ZLARF( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
-     $                  DCONJG( TAU( I ) ), A( OFFPI, I+1 ), LDA,
-     $                  WORK( 1 ) )
-            A( OFFPI, I ) = AII
+*     Reduce to generalized Hessenberg form
+*     (Workspace: none needed)
+*
+      CALL ZGGHRD( JOBVSL, JOBVSR, N, ILO, IHI, A, LDA, B, LDB, VSL,
+     $             LDVSL, VSR, LDVSR, IERR )
+*
+      SDIM = 0
+*
+*     Perform QZ algorithm, computing Schur vectors if desired
+*     (Complex Workspace: need N)
+*     (Real Workspace: need N)
+*
+      IWRK = ITAU
+      CALL ZHGEQZ( 'S', JOBVSL, JOBVSR, N, ILO, IHI, A, LDA, B, LDB,
+     $             ALPHA, BETA, VSL, LDVSL, VSR, LDVSR, WORK( IWRK ),
+     $             LWORK+1-IWRK, RWORK( IRWRK ), IERR )
+      IF( IERR.NE.0 ) THEN
+         IF( IERR.GT.0 .AND. IERR.LE.N ) THEN
+            INFO = IERR
+         ELSE IF( IERR.GT.N .AND. IERR.LE.2*N ) THEN
+            INFO = IERR - N
+         ELSE
+            INFO = N + 1
          END IF
+         GO TO 30
+      END IF
 *
-*        Update partial column norms.
+*     Sort eigenvalues ALPHA/BETA if desired
+*     (Workspace: none needed)
 *
-         DO 10 J = I + 1, N
-            IF( VN1( J ).NE.ZERO ) THEN
+      IF( WANTST ) THEN
 *
-*              NOTE: The following 4 lines follow from the analysis in
-*              Lapack Working Note 176.
+*        Undo scaling on eigenvalues before selecting
 *
-               TEMP = ONE - ( ABS( A( OFFPI, J ) ) / VN1( J ) )**2
-               TEMP = MAX( TEMP, ZERO )
-               TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
-               IF( TEMP2 .LE. TOL3Z ) THEN
-                  IF( OFFPI.LT.M ) THEN
-                     VN1( J ) = DZNRM2( M-OFFPI, A( OFFPI+1, J ), 1 )
-                     VN2( J ) = VN1( J )
-                  ELSE
-                     VN1( J ) = ZERO
-                     VN2( J ) = ZERO
-                  END IF
-               ELSE
-                  VN1( J ) = VN1( J )*SQRT( TEMP )
-               END IF
-            END IF
+         IF( ILASCL )
+     $      CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, 1, ALPHA, N, IERR )
+         IF( ILBSCL )
+     $      CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, 1, BETA, N, IERR )
+*
+*        Select eigenvalues
+*
+         DO 10 I = 1, N
+            BWORK( I ) = SELCTG( ALPHA( I ), BETA( I ) )
    10    CONTINUE
 *
-   20 CONTINUE
+         CALL ZTGSEN( 0, ILVSL, ILVSR, BWORK, N, A, LDA, B, LDB, ALPHA,
+     $                BETA, VSL, LDVSL, VSR, LDVSR, SDIM, PVSL, PVSR,
+     $                DIF, WORK( IWRK ), LWORK-IWRK+1, IDUM, 1, IERR )
+         IF( IERR.EQ.1 )
+     $      INFO = N + 3
+*
+      END IF
+*
+*     Apply back-permutation to VSL and VSR
+*     (Workspace: none needed)
+*
+      IF( ILVSL )
+     $   CALL ZGGBAK( 'P', 'L', N, ILO, IHI, RWORK( ILEFT ),
+     $                RWORK( IRIGHT ), N, VSL, LDVSL, IERR )
+      IF( ILVSR )
+     $   CALL ZGGBAK( 'P', 'R', N, ILO, IHI, RWORK( ILEFT ),
+     $                RWORK( IRIGHT ), N, VSR, LDVSR, IERR )
+*
+*     Undo scaling
+*
+      IF( ILASCL ) THEN
+         CALL ZLASCL( 'U', 0, 0, ANRMTO, ANRM, N, N, A, LDA, IERR )
+         CALL ZLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHA, N, IERR )
+      END IF
+*
+      IF( ILBSCL ) THEN
+         CALL ZLASCL( 'U', 0, 0, BNRMTO, BNRM, N, N, B, LDB, IERR )
+         CALL ZLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
+      END IF
+*
+      IF( WANTST ) THEN
+*
+*        Check if reordering is correct
+*
+         LASTSL = .TRUE.
+         SDIM = 0
+         DO 20 I = 1, N
+            CURSL = SELCTG( ALPHA( I ), BETA( I ) )
+            IF( CURSL )
+     $         SDIM = SDIM + 1
+            IF( CURSL .AND. .NOT.LASTSL )
+     $         INFO = N + 2
+            LASTSL = CURSL
+   20    CONTINUE
+*
+      END IF
+*
+   30 CONTINUE
+*
+      WORK( 1 ) = LWKOPT
 *
       RETURN
 *
-*     End of ZLAQP2
+*     End of ZGGES
 *
       END
-*> \brief \b ZLAQPS computes a step of QR factorization with column pivoting of a real m-by-n matrix A by using BLAS level 3.
+*> \brief <b> ZGGEV computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -15179,28 +17518,30 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAQPS + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqps.f"> 
+*> Download ZGGEV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zggev.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqps.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zggev.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqps.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zggev.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
-*                          VN2, AUXV, F, LDF )
+*       SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
+*                         VL, LDVL, VR, LDVR, WORK, LWORK, RWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            KB, LDA, LDF, M, N, NB, OFFSET
+*       CHARACTER          JOBVL, JOBVR
+*       INTEGER            INFO, LDA, LDB, LDVL, LDVR, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            JPVT( * )
-*       DOUBLE PRECISION   VN1( * ), VN2( * )
-*       COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         A( LDA, * ), ALPHA( * ), B( LDB, * ),
+*      $                   BETA( * ), VL( LDVL, * ), VR( LDVR, * ),
+*      $                   WORK( * )
 *       ..
 *  
 *
@@ -15209,339 +17550,525 @@
 *>
 *> \verbatim
 *>
-*> ZLAQPS computes a step of QR factorization with column pivoting
-*> of a complex M-by-N matrix A by using Blas-3.  It tries to factorize
-*> NB columns from A starting from the row OFFSET+1, and updates all
-*> of the matrix with Blas-3 xGEMM.
+*> ZGGEV computes for a pair of N-by-N complex nonsymmetric matrices
+*> (A,B), the generalized eigenvalues, and optionally, the left and/or
+*> right generalized eigenvectors.
 *>
-*> In some cases, due to catastrophic cancellations, it cannot
-*> factorize NB columns.  Hence, the actual number of factorized
-*> columns is returned in KB.
+*> A generalized eigenvalue for a pair of matrices (A,B) is a scalar
+*> lambda or a ratio alpha/beta = lambda, such that A - lambda*B is
+*> singular. It is usually represented as the pair (alpha,beta), as
+*> there is a reasonable interpretation for beta=0, and even for both
+*> being zero.
 *>
-*> Block A(1:OFFSET,1:N) is accordingly pivoted, but not factorized.
+*> The right generalized eigenvector v(j) corresponding to the
+*> generalized eigenvalue lambda(j) of (A,B) satisfies
+*>
+*>              A * v(j) = lambda(j) * B * v(j).
+*>
+*> The left generalized eigenvector u(j) corresponding to the
+*> generalized eigenvalues lambda(j) of (A,B) satisfies
+*>
+*>              u(j)**H * A = lambda(j) * u(j)**H * B
+*>
+*> where u(j)**H is the conjugate-transpose of u(j).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] JOBVL
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A. M >= 0.
+*>          JOBVL is CHARACTER*1
+*>          = 'N':  do not compute the left generalized eigenvectors;
+*>          = 'V':  compute the left generalized eigenvectors.
+*> \endverbatim
+*>
+*> \param[in] JOBVR
+*> \verbatim
+*>          JOBVR is CHARACTER*1
+*>          = 'N':  do not compute the right generalized eigenvectors;
+*>          = 'V':  compute the right generalized eigenvectors.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix A. N >= 0
+*>          The order of the matrices A, B, VL, and VR.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] OFFSET
+*> \param[in,out] A
 *> \verbatim
-*>          OFFSET is INTEGER
-*>          The number of rows of A that have been factorized in
-*>          previous steps.
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the matrix A in the pair (A,B).
+*>          On exit, A has been overwritten.
 *> \endverbatim
 *>
-*> \param[in] NB
+*> \param[in] LDA
 *> \verbatim
-*>          NB is INTEGER
-*>          The number of columns to factorize.
+*>          LDA is INTEGER
+*>          The leading dimension of A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] KB
+*> \param[in,out] B
 *> \verbatim
-*>          KB is INTEGER
-*>          The number of columns actually factorized.
+*>          B is COMPLEX*16 array, dimension (LDB, N)
+*>          On entry, the matrix B in the pair (A,B).
+*>          On exit, B has been overwritten.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] LDB
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, block A(OFFSET+1:M,1:KB) is the triangular
-*>          factor obtained and block A(1:OFFSET,1:N) has been
-*>          accordingly pivoted, but no factorized.
-*>          The rest of the matrix, block A(OFFSET+1:M,KB+1:N) has
-*>          been updated.
+*>          LDB is INTEGER
+*>          The leading dimension of B.  LDB >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[out] ALPHA
 *> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          ALPHA is COMPLEX*16 array, dimension (N)
 *> \endverbatim
 *>
-*> \param[in,out] JPVT
+*> \param[out] BETA
 *> \verbatim
-*>          JPVT is INTEGER array, dimension (N)
-*>          JPVT(I) = K <==> Column K of the full matrix A has been
-*>          permuted into position I in AP.
+*>          BETA is COMPLEX*16 array, dimension (N)
+*>          On exit, ALPHA(j)/BETA(j), j=1,...,N, will be the
+*>          generalized eigenvalues.
+*>
+*>          Note: the quotients ALPHA(j)/BETA(j) may easily over- or
+*>          underflow, and BETA(j) may even be zero.  Thus, the user
+*>          should avoid naively computing the ratio alpha/beta.
+*>          However, ALPHA will be always less than and usually
+*>          comparable with norm(A) in magnitude, and BETA always less
+*>          than and usually comparable with norm(B).
 *> \endverbatim
 *>
-*> \param[out] TAU
+*> \param[out] VL
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (KB)
-*>          The scalar factors of the elementary reflectors.
+*>          VL is COMPLEX*16 array, dimension (LDVL,N)
+*>          If JOBVL = 'V', the left generalized eigenvectors u(j) are
+*>          stored one after another in the columns of VL, in the same
+*>          order as their eigenvalues.
+*>          Each eigenvector is scaled so the largest component has
+*>          abs(real part) + abs(imag. part) = 1.
+*>          Not referenced if JOBVL = 'N'.
 *> \endverbatim
 *>
-*> \param[in,out] VN1
+*> \param[in] LDVL
 *> \verbatim
-*>          VN1 is DOUBLE PRECISION array, dimension (N)
-*>          The vector with the partial column norms.
+*>          LDVL is INTEGER
+*>          The leading dimension of the matrix VL. LDVL >= 1, and
+*>          if JOBVL = 'V', LDVL >= N.
 *> \endverbatim
 *>
-*> \param[in,out] VN2
+*> \param[out] VR
 *> \verbatim
-*>          VN2 is DOUBLE PRECISION array, dimension (N)
-*>          The vector with the exact column norms.
+*>          VR is COMPLEX*16 array, dimension (LDVR,N)
+*>          If JOBVR = 'V', the right generalized eigenvectors v(j) are
+*>          stored one after another in the columns of VR, in the same
+*>          order as their eigenvalues.
+*>          Each eigenvector is scaled so the largest component has
+*>          abs(real part) + abs(imag. part) = 1.
+*>          Not referenced if JOBVR = 'N'.
 *> \endverbatim
 *>
-*> \param[in,out] AUXV
+*> \param[in] LDVR
 *> \verbatim
-*>          AUXV is COMPLEX*16 array, dimension (NB)
-*>          Auxiliar vector.
+*>          LDVR is INTEGER
+*>          The leading dimension of the matrix VR. LDVR >= 1, and
+*>          if JOBVR = 'V', LDVR >= N.
 *> \endverbatim
 *>
-*> \param[in,out] F
+*> \param[out] WORK
 *> \verbatim
-*>          F is COMPLEX*16 array, dimension (LDF,NB)
-*>          Matrix F**H = L * Y**H * A.
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] LDF
+*> \param[in] LWORK
 *> \verbatim
-*>          LDF is INTEGER
-*>          The leading dimension of the array F. LDF >= max(1,N).
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,2*N).
+*>          For good performance, LWORK must generally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
-*
-*  Authors:
-*  ========
-*
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (8*N)
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          =1,...,N:
+*>                The QZ iteration failed.  No eigenvectors have been
+*>                calculated, but ALPHA(j) and BETA(j) should be
+*>                correct for j=INFO+1,...,N.
+*>          > N:  =N+1: other then QZ iteration failed in DHGEQZ,
+*>                =N+2: error return from DTGEVC.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
 *> \author Univ. of Tennessee 
 *> \author Univ. of California Berkeley 
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
-*
-*> \par Contributors:
-*  ==================
-*>
-*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain
-*>    X. Sun, Computer Science Dept., Duke University, USA
-*> \n
-*>  Partial column norm updating strategy modified on April 2011
-*>    Z. Drmac and Z. Bujanovic, Dept. of Mathematics,
-*>    University of Zagreb, Croatia.
-*
-*> \par References:
-*  ================
-*>
-*> LAPACK Working Note 176
+*> \date April 2012
 *
-*> \htmlonly
-*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a> 
-*> \endhtmlonly 
+*> \ingroup complex16GEeigen
 *
 *  =====================================================================
-      SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
-     $                   VN2, AUXV, F, LDF )
+      SUBROUTINE ZGGEV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHA, BETA,
+     $                  VL, LDVL, VR, LDVR, WORK, LWORK, RWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.4.1) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     April 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            KB, LDA, LDF, M, N, NB, OFFSET
+      CHARACTER          JOBVL, JOBVR
+      INTEGER            INFO, LDA, LDB, LDVL, LDVR, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            JPVT( * )
-      DOUBLE PRECISION   VN1( * ), VN2( * )
-      COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         A( LDA, * ), ALPHA( * ), B( LDB, * ),
+     $                   BETA( * ), VL( LDVL, * ), VR( LDVR, * ),
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
       DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
       COMPLEX*16         CZERO, CONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0,
-     $                   CZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ),
+     $                   CONE = ( 1.0D0, 0.0D0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            ITEMP, J, K, LASTRK, LSTICC, PVT, RK
-      DOUBLE PRECISION   TEMP, TEMP2, TOL3Z
-      COMPLEX*16         AKK
+      LOGICAL            ILASCL, ILBSCL, ILV, ILVL, ILVR, LQUERY
+      CHARACTER          CHTEMP
+      INTEGER            ICOLS, IERR, IHI, IJOBVL, IJOBVR, ILEFT, ILO,
+     $                   IN, IRIGHT, IROWS, IRWRK, ITAU, IWRK, JC, JR,
+     $                   LWKMIN, LWKOPT
+      DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
+     $                   SMLNUM, TEMP
+      COMPLEX*16         X
+*     ..
+*     .. Local Arrays ..
+      LOGICAL            LDUMMA( 1 )
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZGEMM, ZGEMV, ZLARFG, ZSWAP
+      EXTERNAL           DLABAD, XERBLA, ZGEQRF, ZGGBAK, ZGGBAL, ZGGHRD,
+     $                   ZHGEQZ, ZLACPY, ZLASCL, ZLASET, ZTGEVC, ZUNGQR,
+     $                   ZUNMQR
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCONJG, MAX, MIN, NINT, SQRT
+      INTRINSIC          ABS, DBLE, DIMAG, MAX, SQRT
 *     ..
-*     .. External Functions ..
-      INTEGER            IDAMAX
-      DOUBLE PRECISION   DLAMCH, DZNRM2
-      EXTERNAL           IDAMAX, DLAMCH, DZNRM2
+*     .. Statement Functions ..
+      DOUBLE PRECISION   ABS1
+*     ..
+*     .. Statement Function definitions ..
+      ABS1( X ) = ABS( DBLE( X ) ) + ABS( DIMAG( X ) )
 *     ..
 *     .. Executable Statements ..
 *
-      LASTRK = MIN( M, N+OFFSET )
-      LSTICC = 0
-      K = 0
-      TOL3Z = SQRT(DLAMCH('Epsilon'))
+*     Decode the input arguments
 *
-*     Beginning of while loop.
+      IF( LSAME( JOBVL, 'N' ) ) THEN
+         IJOBVL = 1
+         ILVL = .FALSE.
+      ELSE IF( LSAME( JOBVL, 'V' ) ) THEN
+         IJOBVL = 2
+         ILVL = .TRUE.
+      ELSE
+         IJOBVL = -1
+         ILVL = .FALSE.
+      END IF
 *
-   10 CONTINUE
-      IF( ( K.LT.NB ) .AND. ( LSTICC.EQ.0 ) ) THEN
-         K = K + 1
-         RK = OFFSET + K
+      IF( LSAME( JOBVR, 'N' ) ) THEN
+         IJOBVR = 1
+         ILVR = .FALSE.
+      ELSE IF( LSAME( JOBVR, 'V' ) ) THEN
+         IJOBVR = 2
+         ILVR = .TRUE.
+      ELSE
+         IJOBVR = -1
+         ILVR = .FALSE.
+      END IF
+      ILV = ILVL .OR. ILVR
 *
-*        Determine ith pivot column and swap if necessary
+*     Test the input arguments
 *
-         PVT = ( K-1 ) + IDAMAX( N-K+1, VN1( K ), 1 )
-         IF( PVT.NE.K ) THEN
-            CALL ZSWAP( M, A( 1, PVT ), 1, A( 1, K ), 1 )
-            CALL ZSWAP( K-1, F( PVT, 1 ), LDF, F( K, 1 ), LDF )
-            ITEMP = JPVT( PVT )
-            JPVT( PVT ) = JPVT( K )
-            JPVT( K ) = ITEMP
-            VN1( PVT ) = VN1( K )
-            VN2( PVT ) = VN2( K )
-         END IF
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( IJOBVL.LE.0 ) THEN
+         INFO = -1
+      ELSE IF( IJOBVR.LE.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDVL.LT.1 .OR. ( ILVL .AND. LDVL.LT.N ) ) THEN
+         INFO = -11
+      ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
+         INFO = -13
+      END IF
 *
-*        Apply previous Householder reflectors to column K:
-*        A(RK:M,K) := A(RK:M,K) - A(RK:M,1:K-1)*F(K,1:K-1)**H.
+*     Compute workspace
+*      (Note: Comments in the code beginning "Workspace:" describe the
+*       minimal amount of workspace needed at that point in the code,
+*       as well as the preferred amount for good performance.
+*       NB refers to the optimal block size for the immediately
+*       following subroutine, as returned by ILAENV. The workspace is
+*       computed assuming ILO = 1 and IHI = N, the worst case.)
 *
-         IF( K.GT.1 ) THEN
-            DO 20 J = 1, K - 1
-               F( K, J ) = DCONJG( F( K, J ) )
-   20       CONTINUE
-            CALL ZGEMV( 'No transpose', M-RK+1, K-1, -CONE, A( RK, 1 ),
-     $                  LDA, F( K, 1 ), LDF, CONE, A( RK, K ), 1 )
-            DO 30 J = 1, K - 1
-               F( K, J ) = DCONJG( F( K, J ) )
-   30       CONTINUE
+      IF( INFO.EQ.0 ) THEN
+         LWKMIN = MAX( 1, 2*N )
+         LWKOPT = MAX( 1, N + N*ILAENV( 1, 'ZGEQRF', ' ', N, 1, N, 0 ) )
+         LWKOPT = MAX( LWKOPT, N +
+     $                 N*ILAENV( 1, 'ZUNMQR', ' ', N, 1, N, 0 ) )
+         IF( ILVL ) THEN
+            LWKOPT = MAX( LWKOPT, N +
+     $                    N*ILAENV( 1, 'ZUNGQR', ' ', N, 1, N, -1 ) )
          END IF
+         WORK( 1 ) = LWKOPT
 *
-*        Generate elementary reflector H(k).
+         IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY )
+     $      INFO = -15
+      END IF
 *
-         IF( RK.LT.M ) THEN
-            CALL ZLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1, TAU( K ) )
-         ELSE
-            CALL ZLARFG( 1, A( RK, K ), A( RK, K ), 1, TAU( K ) )
-         END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGGEV ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-         AKK = A( RK, K )
-         A( RK, K ) = CONE
+*     Quick return if possible
 *
-*        Compute Kth column of F:
+      IF( N.EQ.0 )
+     $   RETURN
 *
-*        Compute  F(K+1:N,K) := tau(K)*A(RK:M,K+1:N)**H*A(RK:M,K).
+*     Get machine constants
 *
-         IF( K.LT.N ) THEN
-            CALL ZGEMV( 'Conjugate transpose', M-RK+1, N-K, TAU( K ),
-     $                  A( RK, K+1 ), LDA, A( RK, K ), 1, CZERO,
-     $                  F( K+1, K ), 1 )
-         END IF
+      EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+      SMLNUM = SQRT( SMLNUM ) / EPS
+      BIGNUM = ONE / SMLNUM
 *
-*        Padding F(1:K,K) with zeros.
+*     Scale A if max element outside range [SMLNUM,BIGNUM]
 *
-         DO 40 J = 1, K
-            F( J, K ) = CZERO
-   40    CONTINUE
+      ANRM = ZLANGE( 'M', N, N, A, LDA, RWORK )
+      ILASCL = .FALSE.
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+         ANRMTO = SMLNUM
+         ILASCL = .TRUE.
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+         ANRMTO = BIGNUM
+         ILASCL = .TRUE.
+      END IF
+      IF( ILASCL )
+     $   CALL ZLASCL( 'G', 0, 0, ANRM, ANRMTO, N, N, A, LDA, IERR )
 *
-*        Incremental updating of F:
-*        F(1:N,K) := F(1:N,K) - tau(K)*F(1:N,1:K-1)*A(RK:M,1:K-1)**H
-*                    *A(RK:M,K).
+*     Scale B if max element outside range [SMLNUM,BIGNUM]
 *
-         IF( K.GT.1 ) THEN
-            CALL ZGEMV( 'Conjugate transpose', M-RK+1, K-1, -TAU( K ),
-     $                  A( RK, 1 ), LDA, A( RK, K ), 1, CZERO,
-     $                  AUXV( 1 ), 1 )
+      BNRM = ZLANGE( 'M', N, N, B, LDB, RWORK )
+      ILBSCL = .FALSE.
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+         BNRMTO = SMLNUM
+         ILBSCL = .TRUE.
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+         BNRMTO = BIGNUM
+         ILBSCL = .TRUE.
+      END IF
+      IF( ILBSCL )
+     $   CALL ZLASCL( 'G', 0, 0, BNRM, BNRMTO, N, N, B, LDB, IERR )
 *
-            CALL ZGEMV( 'No transpose', N, K-1, CONE, F( 1, 1 ), LDF,
-     $                  AUXV( 1 ), 1, CONE, F( 1, K ), 1 )
-         END IF
+*     Permute the matrices A, B to isolate eigenvalues if possible
+*     (Real Workspace: need 6*N)
 *
-*        Update the current row of A:
-*        A(RK,K+1:N) := A(RK,K+1:N) - A(RK,1:K)*F(K+1:N,1:K)**H.
+      ILEFT = 1
+      IRIGHT = N + 1
+      IRWRK = IRIGHT + N
+      CALL ZGGBAL( 'P', N, A, LDA, B, LDB, ILO, IHI, RWORK( ILEFT ),
+     $             RWORK( IRIGHT ), RWORK( IRWRK ), IERR )
+*
+*     Reduce B to triangular form (QR decomposition of B)
+*     (Complex Workspace: need N, prefer N*NB)
+*
+      IROWS = IHI + 1 - ILO
+      IF( ILV ) THEN
+         ICOLS = N + 1 - ILO
+      ELSE
+         ICOLS = IROWS
+      END IF
+      ITAU = 1
+      IWRK = ITAU + IROWS
+      CALL ZGEQRF( IROWS, ICOLS, B( ILO, ILO ), LDB, WORK( ITAU ),
+     $             WORK( IWRK ), LWORK+1-IWRK, IERR )
 *
-         IF( K.LT.N ) THEN
-            CALL ZGEMM( 'No transpose', 'Conjugate transpose', 1, N-K,
-     $                  K, -CONE, A( RK, 1 ), LDA, F( K+1, 1 ), LDF,
-     $                  CONE, A( RK, K+1 ), LDA )
+*     Apply the orthogonal transformation to matrix A
+*     (Complex Workspace: need N, prefer N*NB)
+*
+      CALL ZUNMQR( 'L', 'C', IROWS, ICOLS, IROWS, B( ILO, ILO ), LDB,
+     $             WORK( ITAU ), A( ILO, ILO ), LDA, WORK( IWRK ),
+     $             LWORK+1-IWRK, IERR )
+*
+*     Initialize VL
+*     (Complex Workspace: need N, prefer N*NB)
+*
+      IF( ILVL ) THEN
+         CALL ZLASET( 'Full', N, N, CZERO, CONE, VL, LDVL )
+         IF( IROWS.GT.1 ) THEN
+            CALL ZLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
+     $                   VL( ILO+1, ILO ), LDVL )
          END IF
+         CALL ZUNGQR( IROWS, IROWS, IROWS, VL( ILO, ILO ), LDVL,
+     $                WORK( ITAU ), WORK( IWRK ), LWORK+1-IWRK, IERR )
+      END IF
 *
-*        Update partial column norms.
+*     Initialize VR
 *
-         IF( RK.LT.LASTRK ) THEN
-            DO 50 J = K + 1, N
-               IF( VN1( J ).NE.ZERO ) THEN
+      IF( ILVR )
+     $   CALL ZLASET( 'Full', N, N, CZERO, CONE, VR, LDVR )
 *
-*                 NOTE: The following 4 lines follow from the analysis in
-*                 Lapack Working Note 176.
+*     Reduce to generalized Hessenberg form
 *
-                  TEMP = ABS( A( RK, J ) ) / VN1( J )
-                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
-                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
-                  IF( TEMP2 .LE. TOL3Z ) THEN
-                     VN2( J ) = DBLE( LSTICC )
-                     LSTICC = J
-                  ELSE
-                     VN1( J ) = VN1( J )*SQRT( TEMP )
-                  END IF
-               END IF
-   50       CONTINUE
-         END IF
+      IF( ILV ) THEN
 *
-         A( RK, K ) = AKK
+*        Eigenvectors requested -- work on whole matrix.
 *
-*        End of while loop.
+         CALL ZGGHRD( JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB, VL,
+     $                LDVL, VR, LDVR, IERR )
+      ELSE
+         CALL ZGGHRD( 'N', 'N', IROWS, 1, IROWS, A( ILO, ILO ), LDA,
+     $                B( ILO, ILO ), LDB, VL, LDVL, VR, LDVR, IERR )
+      END IF
 *
-         GO TO 10
+*     Perform QZ algorithm (Compute eigenvalues, and optionally, the
+*     Schur form and Schur vectors)
+*     (Complex Workspace: need N)
+*     (Real Workspace: need N)
+*
+      IWRK = ITAU
+      IF( ILV ) THEN
+         CHTEMP = 'S'
+      ELSE
+         CHTEMP = 'E'
       END IF
-      KB = K
-      RK = OFFSET + KB
+      CALL ZHGEQZ( CHTEMP, JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB,
+     $             ALPHA, BETA, VL, LDVL, VR, LDVR, WORK( IWRK ),
+     $             LWORK+1-IWRK, RWORK( IRWRK ), IERR )
+      IF( IERR.NE.0 ) THEN
+         IF( IERR.GT.0 .AND. IERR.LE.N ) THEN
+            INFO = IERR
+         ELSE IF( IERR.GT.N .AND. IERR.LE.2*N ) THEN
+            INFO = IERR - N
+         ELSE
+            INFO = N + 1
+         END IF
+         GO TO 70
+      END IF
+*
+*     Compute Eigenvectors
+*     (Real Workspace: need 2*N)
+*     (Complex Workspace: need 2*N)
+*
+      IF( ILV ) THEN
+         IF( ILVL ) THEN
+            IF( ILVR ) THEN
+               CHTEMP = 'B'
+            ELSE
+               CHTEMP = 'L'
+            END IF
+         ELSE
+            CHTEMP = 'R'
+         END IF
 *
-*     Apply the block reflector to the rest of the matrix:
-*     A(OFFSET+KB+1:M,KB+1:N) := A(OFFSET+KB+1:M,KB+1:N) -
-*                         A(OFFSET+KB+1:M,1:KB)*F(KB+1:N,1:KB)**H.
+         CALL ZTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+     $                VR, LDVR, N, IN, WORK( IWRK ), RWORK( IRWRK ),
+     $                IERR )
+         IF( IERR.NE.0 ) THEN
+            INFO = N + 2
+            GO TO 70
+         END IF
 *
-      IF( KB.LT.MIN( N, M-OFFSET ) ) THEN
-         CALL ZGEMM( 'No transpose', 'Conjugate transpose', M-RK, N-KB,
-     $               KB, -CONE, A( RK+1, 1 ), LDA, F( KB+1, 1 ), LDF,
-     $               CONE, A( RK+1, KB+1 ), LDA )
+*        Undo balancing on VL and VR and normalization
+*        (Workspace: none needed)
+*
+         IF( ILVL ) THEN
+            CALL ZGGBAK( 'P', 'L', N, ILO, IHI, RWORK( ILEFT ),
+     $                   RWORK( IRIGHT ), N, VL, LDVL, IERR )
+            DO 30 JC = 1, N
+               TEMP = ZERO
+               DO 10 JR = 1, N
+                  TEMP = MAX( TEMP, ABS1( VL( JR, JC ) ) )
+   10          CONTINUE
+               IF( TEMP.LT.SMLNUM )
+     $            GO TO 30
+               TEMP = ONE / TEMP
+               DO 20 JR = 1, N
+                  VL( JR, JC ) = VL( JR, JC )*TEMP
+   20          CONTINUE
+   30       CONTINUE
+         END IF
+         IF( ILVR ) THEN
+            CALL ZGGBAK( 'P', 'R', N, ILO, IHI, RWORK( ILEFT ),
+     $                   RWORK( IRIGHT ), N, VR, LDVR, IERR )
+            DO 60 JC = 1, N
+               TEMP = ZERO
+               DO 40 JR = 1, N
+                  TEMP = MAX( TEMP, ABS1( VR( JR, JC ) ) )
+   40          CONTINUE
+               IF( TEMP.LT.SMLNUM )
+     $            GO TO 60
+               TEMP = ONE / TEMP
+               DO 50 JR = 1, N
+                  VR( JR, JC ) = VR( JR, JC )*TEMP
+   50          CONTINUE
+   60       CONTINUE
+         END IF
       END IF
 *
-*     Recomputation of difficult columns.
+*     Undo scaling if necessary
 *
-   60 CONTINUE
-      IF( LSTICC.GT.0 ) THEN
-         ITEMP = NINT( VN2( LSTICC ) )
-         VN1( LSTICC ) = DZNRM2( M-RK, A( RK+1, LSTICC ), 1 )
+   70 CONTINUE
 *
-*        NOTE: The computation of VN1( LSTICC ) relies on the fact that 
-*        SNRM2 does not fail on vectors with norm below the value of
-*        SQRT(DLAMCH('S')) 
+      IF( ILASCL )
+     $   CALL ZLASCL( 'G', 0, 0, ANRMTO, ANRM, N, 1, ALPHA, N, IERR )
 *
-         VN2( LSTICC ) = VN1( LSTICC )
-         LSTICC = ITEMP
-         GO TO 60
-      END IF
+      IF( ILBSCL )
+     $   CALL ZLASCL( 'G', 0, 0, BNRMTO, BNRM, N, 1, BETA, N, IERR )
 *
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZLAQPS
+*     End of ZGGEV
 *
       END
-*> \brief \b ZLAQR0 computes the eigenvalues of a Hessenberg matrix, and optionally the matrices from the Schur decomposition.
+*> \brief \b ZGGHRD
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -15549,27 +18076,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAQR0 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr0.f"> 
+*> Download ZGGHRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgghrd.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr0.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgghrd.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr0.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgghrd.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-*                          IHIZ, Z, LDZ, WORK, LWORK, INFO )
+*       SUBROUTINE ZGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+*                          LDQ, Z, LDZ, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
-*       LOGICAL            WANTT, WANTZ
+*       CHARACTER          COMPQ, COMPZ
+*       INTEGER            IHI, ILO, INFO, LDA, LDB, LDQ, LDZ, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+*      $                   Z( LDZ, * )
 *       ..
 *  
 *
@@ -15578,38 +18106,60 @@
 *>
 *> \verbatim
 *>
-*>    ZLAQR0 computes the eigenvalues of a Hessenberg matrix H
-*>    and, optionally, the matrices T and Z from the Schur decomposition
-*>    H = Z T Z**H, where T is an upper triangular matrix (the
-*>    Schur form), and Z is the unitary matrix of Schur vectors.
+*> ZGGHRD reduces a pair of complex matrices (A,B) to generalized upper
+*> Hessenberg form using unitary transformations, where A is a
+*> general matrix and B is upper triangular.  The form of the
+*> generalized eigenvalue problem is
+*>    A*x = lambda*B*x,
+*> and B is typically made upper triangular by computing its QR
+*> factorization and moving the unitary matrix Q to the left side
+*> of the equation.
 *>
-*>    Optionally Z may be postmultiplied into an input unitary
-*>    matrix Q so that this routine can give the Schur factorization
-*>    of a matrix A which has been reduced to the Hessenberg form H
-*>    by the unitary matrix Q:  A = Q*H*Q**H = (QZ)*H*(QZ)**H.
+*> This subroutine simultaneously reduces A to a Hessenberg matrix H:
+*>    Q**H*A*Z = H
+*> and transforms B to another upper triangular matrix T:
+*>    Q**H*B*Z = T
+*> in order to reduce the problem to its standard form
+*>    H*y = lambda*T*y
+*> where y = Z**H*x.
+*>
+*> The unitary matrices Q and Z are determined as products of Givens
+*> rotations.  They may either be formed explicitly, or they may be
+*> postmultiplied into input matrices Q1 and Z1, so that
+*>      Q1 * A * Z1**H = (Q1*Q) * H * (Z1*Z)**H
+*>      Q1 * B * Z1**H = (Q1*Q) * T * (Z1*Z)**H
+*> If Q1 is the unitary matrix from the QR factorization of B in the
+*> original equation A*x = lambda*B*x, then ZGGHRD reduces the original
+*> problem to generalized Hessenberg form.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] WANTT
+*> \param[in] COMPQ
 *> \verbatim
-*>          WANTT is LOGICAL
-*>          = .TRUE. : the full Schur form T is required;
-*>          = .FALSE.: only eigenvalues are required.
+*>          COMPQ is CHARACTER*1
+*>          = 'N': do not compute Q;
+*>          = 'I': Q is initialized to the unit matrix, and the
+*>                 unitary matrix Q is returned;
+*>          = 'V': Q must contain a unitary matrix Q1 on entry,
+*>                 and the product Q1*Q is returned.
 *> \endverbatim
 *>
-*> \param[in] WANTZ
+*> \param[in] COMPZ
 *> \verbatim
-*>          WANTZ is LOGICAL
-*>          = .TRUE. : the matrix of Schur vectors Z is required;
-*>          = .FALSE.: Schur vectors are not required.
+*>          COMPZ is CHARACTER*1
+*>          = 'N': do not compute Z;
+*>          = 'I': Z is initialized to the unit matrix, and the
+*>                 unitary matrix Z is returned;
+*>          = 'V': Z must contain a unitary matrix Z1 on entry,
+*>                 and the product Z1*Z is returned.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>           The order of the matrix H.  N .GE. 0.
+*>          The order of the matrices A and B.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in] ILO
@@ -15621,133 +18171,81 @@
 *> \verbatim
 *>          IHI is INTEGER
 *>
-*>           It is assumed that H is already upper triangular in rows
-*>           and columns 1:ILO-1 and IHI+1:N and, if ILO.GT.1,
-*>           H(ILO,ILO-1) is zero. ILO and IHI are normally set by a
-*>           previous call to ZGEBAL, and then passed to ZGEHRD when the
-*>           matrix output by ZGEBAL is reduced to Hessenberg form.
-*>           Otherwise, ILO and IHI should be set to 1 and N,
-*>           respectively.  If N.GT.0, then 1.LE.ILO.LE.IHI.LE.N.
-*>           If N = 0, then ILO = 1 and IHI = 0.
+*>          ILO and IHI mark the rows and columns of A which are to be
+*>          reduced.  It is assumed that A is already upper triangular
+*>          in rows and columns 1:ILO-1 and IHI+1:N.  ILO and IHI are
+*>          normally set by a previous call to ZGGBAL; otherwise they
+*>          should be set to 1 and N respectively.
+*>          1 <= ILO <= IHI <= N, if N > 0; ILO=1 and IHI=0, if N=0.
 *> \endverbatim
 *>
-*> \param[in,out] H
+*> \param[in,out] A
 *> \verbatim
-*>          H is COMPLEX*16 array, dimension (LDH,N)
-*>           On entry, the upper Hessenberg matrix H.
-*>           On exit, if INFO = 0 and WANTT is .TRUE., then H
-*>           contains the upper triangular matrix T from the Schur
-*>           decomposition (the Schur form). If INFO = 0 and WANT is
-*>           .FALSE., then the contents of H are unspecified on exit.
-*>           (The output value of H when INFO.GT.0 is given under the
-*>           description of INFO below.)
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the N-by-N general matrix to be reduced.
+*>          On exit, the upper triangle and the first subdiagonal of A
+*>          are overwritten with the upper Hessenberg matrix H, and the
+*>          rest is set to zero.
+*> \endverbatim
 *>
-*>           This subroutine may explicitly set H(i,j) = 0 for i.GT.j and
-*>           j = 1, 2, ... ILO-1 or j = IHI+1, IHI+2, ... N.
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDH
+*> \param[in,out] B
 *> \verbatim
-*>          LDH is INTEGER
-*>           The leading dimension of the array H. LDH .GE. max(1,N).
+*>          B is COMPLEX*16 array, dimension (LDB, N)
+*>          On entry, the N-by-N upper triangular matrix B.
+*>          On exit, the upper triangular matrix T = Q**H B Z.  The
+*>          elements below the diagonal are set to zero.
 *> \endverbatim
 *>
-*> \param[out] W
+*> \param[in] LDB
 *> \verbatim
-*>          W is COMPLEX*16 array, dimension (N)
-*>           The computed eigenvalues of H(ILO:IHI,ILO:IHI) are stored
-*>           in W(ILO:IHI). If WANTT is .TRUE., then the eigenvalues are
-*>           stored in the same order as on the diagonal of the Schur
-*>           form returned in H, with W(i) = H(i,i).
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] ILOZ
+*> \param[in,out] Q
 *> \verbatim
-*>          ILOZ is INTEGER
+*>          Q is COMPLEX*16 array, dimension (LDQ, N)
+*>          On entry, if COMPQ = 'V', the unitary matrix Q1, typically
+*>          from the QR factorization of B.
+*>          On exit, if COMPQ='I', the unitary matrix Q, and if
+*>          COMPQ = 'V', the product Q1*Q.
+*>          Not referenced if COMPQ='N'.
 *> \endverbatim
 *>
-*> \param[in] IHIZ
+*> \param[in] LDQ
 *> \verbatim
-*>          IHIZ is INTEGER
-*>           Specify the rows of Z to which transformations must be
-*>           applied if WANTZ is .TRUE..
-*>           1 .LE. ILOZ .LE. ILO; IHI .LE. IHIZ .LE. N.
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q.
+*>          LDQ >= N if COMPQ='V' or 'I'; LDQ >= 1 otherwise.
 *> \endverbatim
 *>
 *> \param[in,out] Z
 *> \verbatim
-*>          Z is COMPLEX*16 array, dimension (LDZ,IHI)
-*>           If WANTZ is .FALSE., then Z is not referenced.
-*>           If WANTZ is .TRUE., then Z(ILO:IHI,ILOZ:IHIZ) is
-*>           replaced by Z(ILO:IHI,ILOZ:IHIZ)*U where U is the
-*>           orthogonal Schur factor of H(ILO:IHI,ILO:IHI).
-*>           (The output value of Z when INFO.GT.0 is given under
-*>           the description of INFO below.)
+*>          Z is COMPLEX*16 array, dimension (LDZ, N)
+*>          On entry, if COMPZ = 'V', the unitary matrix Z1.
+*>          On exit, if COMPZ='I', the unitary matrix Z, and if
+*>          COMPZ = 'V', the product Z1*Z.
+*>          Not referenced if COMPZ='N'.
 *> \endverbatim
 *>
 *> \param[in] LDZ
 *> \verbatim
 *>          LDZ is INTEGER
-*>           The leading dimension of the array Z.  if WANTZ is .TRUE.
-*>           then LDZ.GE.MAX(1,IHIZ).  Otherwize, LDZ.GE.1.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension LWORK
-*>           On exit, if LWORK = -1, WORK(1) returns an estimate of
-*>           the optimal value for LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>           The dimension of the array WORK.  LWORK .GE. max(1,N)
-*>           is sufficient, but LWORK typically as large as 6*N may
-*>           be required for optimal performance.  A workspace query
-*>           to determine the optimal workspace size is recommended.
-*>
-*>           If LWORK = -1, then ZLAQR0 does a workspace query.
-*>           In this case, ZLAQR0 checks the input parameters and
-*>           estimates the optimal workspace size for the given
-*>           values of N, ILO and IHI.  The estimate is returned
-*>           in WORK(1).  No error message related to LWORK is
-*>           issued by XERBLA.  Neither H nor Z are accessed.
+*>          The leading dimension of the array Z.
+*>          LDZ >= N if COMPZ='V' or 'I'; LDZ >= 1 otherwise.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>             =  0:  successful exit
-*>           .GT. 0:  if INFO = i, ZLAQR0 failed to compute all of
-*>                the eigenvalues.  Elements 1:ilo-1 and i+1:n of WR
-*>                and WI contain those eigenvalues which have been
-*>                successfully computed.  (Failures are rare.)
-*>
-*>                If INFO .GT. 0 and WANT is .FALSE., then on exit,
-*>                the remaining unconverged eigenvalues are the eigen-
-*>                values of the upper Hessenberg matrix rows and
-*>                columns ILO through INFO of the final, output
-*>                value of H.
-*>
-*>                If INFO .GT. 0 and WANTT is .TRUE., then on exit
-*>
-*>           (*)  (initial value of H)*U  = U*(final value of H)
-*>
-*>                where U is a unitary matrix.  The final
-*>                value of  H is upper Hessenberg and triangular in
-*>                rows and columns INFO+1 through IHI.
-*>
-*>                If INFO .GT. 0 and WANTZ is .TRUE., then on exit
-*>
-*>                  (final value of Z(ILO:IHI,ILOZ:IHIZ)
-*>                   =  (initial value of Z(ILO:IHI,ILOZ:IHIZ)*U
-*>
-*>                where U is the unitary matrix in (*) (regard-
-*>                less of the value of WANTT.)
-*>
-*>                If INFO .GT. 0 and WANTZ is .FALSE., then Z is not
-*>                accessed.
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
 *
 *  Authors:
@@ -15758,493 +18256,180 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16OTHERcomputational
 *
-*> \par Contributors:
-*  ==================
+*> \par Further Details:
+*  =====================
 *>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
-*
-*> \par References:
-*  ================
+*> \verbatim
 *>
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
-*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
-*>       929--947, 2002.
-*> \n
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part II: Aggressive Early Deflation, SIAM Journal
-*>       of Matrix Analysis, volume 23, pages 948--973, 2002.
+*>  This routine reduces A to Hessenberg and B to triangular form by
+*>  an unblocked reduction, as described in _Matrix_Computations_,
+*>  by Golub and van Loan (Johns Hopkins Press).
+*> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-     $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      SUBROUTINE ZGGHRD( COMPQ, COMPZ, N, ILO, IHI, A, LDA, B, LDB, Q,
+     $                   LDQ, Z, LDZ, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
-      LOGICAL            WANTT, WANTZ
+      CHARACTER          COMPQ, COMPZ
+      INTEGER            IHI, ILO, INFO, LDA, LDB, LDQ, LDZ, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+     $                   Z( LDZ, * )
 *     ..
 *
-*  ================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-*
-*     ==== Matrices of order NTINY or smaller must be processed by
-*     .    ZLAHQR because of insufficient subdiagonal scratch space.
-*     .    (This is a hard limit.) ====
-      INTEGER            NTINY
-      PARAMETER          ( NTINY = 11 )
-*
-*     ==== Exceptional deflation windows:  try to cure rare
-*     .    slow convergence by varying the size of the
-*     .    deflation window after KEXNW iterations. ====
-      INTEGER            KEXNW
-      PARAMETER          ( KEXNW = 5 )
-*
-*     ==== Exceptional shifts: try to cure rare slow convergence
-*     .    with ad-hoc exceptional shifts every KEXSH iterations.
-*     .    ====
-      INTEGER            KEXSH
-      PARAMETER          ( KEXSH = 6 )
-*
-*     ==== The constant WILK1 is used to form the exceptional
-*     .    shifts. ====
-      DOUBLE PRECISION   WILK1
-      PARAMETER          ( WILK1 = 0.75d0 )
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   TWO
-      PARAMETER          ( TWO = 2.0d0 )
+      COMPLEX*16         CONE, CZERO
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ),
+     $                   CZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         AA, BB, CC, CDUM, DD, DET, RTDISC, SWAP, TR2
-      DOUBLE PRECISION   S
-      INTEGER            I, INF, IT, ITMAX, K, KACC22, KBOT, KDU, KS,
-     $                   KT, KTOP, KU, KV, KWH, KWTOP, KWV, LD, LS,
-     $                   LWKOPT, NDEC, NDFL, NH, NHO, NIBBLE, NMIN, NS,
-     $                   NSMAX, NSR, NVE, NW, NWMAX, NWR, NWUPBD
-      LOGICAL            SORTED
-      CHARACTER          JBCMPZ*2
+      LOGICAL            ILQ, ILZ
+      INTEGER            ICOMPQ, ICOMPZ, JCOL, JROW
+      DOUBLE PRECISION   C
+      COMPLEX*16         CTEMP, S
 *     ..
 *     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         ZDUM( 1, 1 )
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLACPY, ZLAHQR, ZLAQR3, ZLAQR4, ZLAQR5
+      EXTERNAL           XERBLA, ZLARTG, ZLASET, ZROT
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, MAX, MIN, MOD,
-     $                   SQRT
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
-*     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+      INTRINSIC          DCONJG, MAX
 *     ..
 *     .. Executable Statements ..
-      INFO = 0
 *
-*     ==== Quick return for N = 0: nothing to do. ====
+*     Decode COMPQ
 *
-      IF( N.EQ.0 ) THEN
-         WORK( 1 ) = ONE
-         RETURN
+      IF( LSAME( COMPQ, 'N' ) ) THEN
+         ILQ = .FALSE.
+         ICOMPQ = 1
+      ELSE IF( LSAME( COMPQ, 'V' ) ) THEN
+         ILQ = .TRUE.
+         ICOMPQ = 2
+      ELSE IF( LSAME( COMPQ, 'I' ) ) THEN
+         ILQ = .TRUE.
+         ICOMPQ = 3
+      ELSE
+         ICOMPQ = 0
       END IF
 *
-      IF( N.LE.NTINY ) THEN
+*     Decode COMPZ
 *
-*        ==== Tiny matrices must use ZLAHQR. ====
+      IF( LSAME( COMPZ, 'N' ) ) THEN
+         ILZ = .FALSE.
+         ICOMPZ = 1
+      ELSE IF( LSAME( COMPZ, 'V' ) ) THEN
+         ILZ = .TRUE.
+         ICOMPZ = 2
+      ELSE IF( LSAME( COMPZ, 'I' ) ) THEN
+         ILZ = .TRUE.
+         ICOMPZ = 3
+      ELSE
+         ICOMPZ = 0
+      END IF
 *
-         LWKOPT = 1
-         IF( LWORK.NE.-1 )
-     $      CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-     $                   IHIZ, Z, LDZ, INFO )
-      ELSE
-*
-*        ==== Use small bulge multi-shift QR with aggressive early
-*        .    deflation on larger-than-tiny matrices. ====
-*
-*        ==== Hope for the best. ====
-*
-         INFO = 0
-*
-*        ==== Set up job flags for ILAENV. ====
-*
-         IF( WANTT ) THEN
-            JBCMPZ( 1: 1 ) = 'S'
-         ELSE
-            JBCMPZ( 1: 1 ) = 'E'
-         END IF
-         IF( WANTZ ) THEN
-            JBCMPZ( 2: 2 ) = 'V'
-         ELSE
-            JBCMPZ( 2: 2 ) = 'N'
-         END IF
-*
-*        ==== NWR = recommended deflation window size.  At this
-*        .    point,  N .GT. NTINY = 11, so there is enough
-*        .    subdiagonal workspace for NWR.GE.2 as required.
-*        .    (In fact, there is enough subdiagonal space for
-*        .    NWR.GE.3.) ====
-*
-         NWR = ILAENV( 13, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
-         NWR = MAX( 2, NWR )
-         NWR = MIN( IHI-ILO+1, ( N-1 ) / 3, NWR )
-*
-*        ==== NSR = recommended number of simultaneous shifts.
-*        .    At this point N .GT. NTINY = 11, so there is at
-*        .    enough subdiagonal workspace for NSR to be even
-*        .    and greater than or equal to two as required. ====
-*
-         NSR = ILAENV( 15, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
-         NSR = MIN( NSR, ( N+6 ) / 9, IHI-ILO )
-         NSR = MAX( 2, NSR-MOD( NSR, 2 ) )
-*
-*        ==== Estimate optimal workspace ====
-*
-*        ==== Workspace query call to ZLAQR3 ====
-*
-         CALL ZLAQR3( WANTT, WANTZ, N, ILO, IHI, NWR+1, H, LDH, ILOZ,
-     $                IHIZ, Z, LDZ, LS, LD, W, H, LDH, N, H, LDH, N, H,
-     $                LDH, WORK, -1 )
-*
-*        ==== Optimal workspace = MAX(ZLAQR5, ZLAQR3) ====
-*
-         LWKOPT = MAX( 3*NSR / 2, INT( WORK( 1 ) ) )
-*
-*        ==== Quick return in case of workspace query. ====
-*
-         IF( LWORK.EQ.-1 ) THEN
-            WORK( 1 ) = DCMPLX( LWKOPT, 0 )
-            RETURN
-         END IF
-*
-*        ==== ZLAHQR/ZLAQR0 crossover point ====
-*
-         NMIN = ILAENV( 12, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
-         NMIN = MAX( NTINY, NMIN )
-*
-*        ==== Nibble crossover point ====
-*
-         NIBBLE = ILAENV( 14, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
-         NIBBLE = MAX( 0, NIBBLE )
-*
-*        ==== Accumulate reflections during ttswp?  Use block
-*        .    2-by-2 structure during matrix-matrix multiply? ====
-*
-         KACC22 = ILAENV( 16, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
-         KACC22 = MAX( 0, KACC22 )
-         KACC22 = MIN( 2, KACC22 )
-*
-*        ==== NWMAX = the largest possible deflation window for
-*        .    which there is sufficient workspace. ====
-*
-         NWMAX = MIN( ( N-1 ) / 3, LWORK / 2 )
-         NW = NWMAX
-*
-*        ==== NSMAX = the Largest number of simultaneous shifts
-*        .    for which there is sufficient workspace. ====
-*
-         NSMAX = MIN( ( N+6 ) / 9, 2*LWORK / 3 )
-         NSMAX = NSMAX - MOD( NSMAX, 2 )
-*
-*        ==== NDFL: an iteration count restarted at deflation. ====
-*
-         NDFL = 1
-*
-*        ==== ITMAX = iteration limit ====
-*
-         ITMAX = MAX( 30, 2*KEXSH )*MAX( 10, ( IHI-ILO+1 ) )
-*
-*        ==== Last row and column in the active block ====
-*
-         KBOT = IHI
-*
-*        ==== Main Loop ====
-*
-         DO 70 IT = 1, ITMAX
-*
-*           ==== Done when KBOT falls below ILO ====
-*
-            IF( KBOT.LT.ILO )
-     $         GO TO 80
-*
-*           ==== Locate active block ====
-*
-            DO 10 K = KBOT, ILO + 1, -1
-               IF( H( K, K-1 ).EQ.ZERO )
-     $            GO TO 20
-   10       CONTINUE
-            K = ILO
-   20       CONTINUE
-            KTOP = K
-*
-*           ==== Select deflation window size:
-*           .    Typical Case:
-*           .      If possible and advisable, nibble the entire
-*           .      active block.  If not, use size MIN(NWR,NWMAX)
-*           .      or MIN(NWR+1,NWMAX) depending upon which has
-*           .      the smaller corresponding subdiagonal entry
-*           .      (a heuristic).
-*           .
-*           .    Exceptional Case:
-*           .      If there have been no deflations in KEXNW or
-*           .      more iterations, then vary the deflation window
-*           .      size.   At first, because, larger windows are,
-*           .      in general, more powerful than smaller ones,
-*           .      rapidly increase the window to the maximum possible.
-*           .      Then, gradually reduce the window size. ====
-*
-            NH = KBOT - KTOP + 1
-            NWUPBD = MIN( NH, NWMAX )
-            IF( NDFL.LT.KEXNW ) THEN
-               NW = MIN( NWUPBD, NWR )
-            ELSE
-               NW = MIN( NWUPBD, 2*NW )
-            END IF
-            IF( NW.LT.NWMAX ) THEN
-               IF( NW.GE.NH-1 ) THEN
-                  NW = NH
-               ELSE
-                  KWTOP = KBOT - NW + 1
-                  IF( CABS1( H( KWTOP, KWTOP-1 ) ).GT.
-     $                CABS1( H( KWTOP-1, KWTOP-2 ) ) )NW = NW + 1
-               END IF
-            END IF
-            IF( NDFL.LT.KEXNW ) THEN
-               NDEC = -1
-            ELSE IF( NDEC.GE.0 .OR. NW.GE.NWUPBD ) THEN
-               NDEC = NDEC + 1
-               IF( NW-NDEC.LT.2 )
-     $            NDEC = 0
-               NW = NW - NDEC
-            END IF
-*
-*           ==== Aggressive early deflation:
-*           .    split workspace under the subdiagonal into
-*           .      - an nw-by-nw work array V in the lower
-*           .        left-hand-corner,
-*           .      - an NW-by-at-least-NW-but-more-is-better
-*           .        (NW-by-NHO) horizontal work array along
-*           .        the bottom edge,
-*           .      - an at-least-NW-but-more-is-better (NHV-by-NW)
-*           .        vertical work array along the left-hand-edge.
-*           .        ====
-*
-            KV = N - NW + 1
-            KT = NW + 1
-            NHO = ( N-NW-1 ) - KT + 1
-            KWV = NW + 2
-            NVE = ( N-NW ) - KWV + 1
-*
-*           ==== Aggressive early deflation ====
-*
-            CALL ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
-     $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
-     $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
-     $                   LWORK )
-*
-*           ==== Adjust KBOT accounting for new deflations. ====
-*
-            KBOT = KBOT - LD
-*
-*           ==== KS points to the shifts. ====
-*
-            KS = KBOT - LS + 1
-*
-*           ==== Skip an expensive QR sweep if there is a (partly
-*           .    heuristic) reason to expect that many eigenvalues
-*           .    will deflate without it.  Here, the QR sweep is
-*           .    skipped if many eigenvalues have just been deflated
-*           .    or if the remaining active block is small.
-*
-            IF( ( LD.EQ.0 ) .OR. ( ( 100*LD.LE.NW*NIBBLE ) .AND. ( KBOT-
-     $          KTOP+1.GT.MIN( NMIN, NWMAX ) ) ) ) THEN
-*
-*              ==== NS = nominal number of simultaneous shifts.
-*              .    This may be lowered (slightly) if ZLAQR3
-*              .    did not provide that many shifts. ====
-*
-               NS = MIN( NSMAX, NSR, MAX( 2, KBOT-KTOP ) )
-               NS = NS - MOD( NS, 2 )
-*
-*              ==== If there have been no deflations
-*              .    in a multiple of KEXSH iterations,
-*              .    then try exceptional shifts.
-*              .    Otherwise use shifts provided by
-*              .    ZLAQR3 above or from the eigenvalues
-*              .    of a trailing principal submatrix. ====
-*
-               IF( MOD( NDFL, KEXSH ).EQ.0 ) THEN
-                  KS = KBOT - NS + 1
-                  DO 30 I = KBOT, KS + 1, -2
-                     W( I ) = H( I, I ) + WILK1*CABS1( H( I, I-1 ) )
-                     W( I-1 ) = W( I )
-   30             CONTINUE
-               ELSE
-*
-*                 ==== Got NS/2 or fewer shifts? Use ZLAQR4 or
-*                 .    ZLAHQR on a trailing principal submatrix to
-*                 .    get more. (Since NS.LE.NSMAX.LE.(N+6)/9,
-*                 .    there is enough space below the subdiagonal
-*                 .    to fit an NS-by-NS scratch array.) ====
-*
-                  IF( KBOT-KS+1.LE.NS / 2 ) THEN
-                     KS = KBOT - NS + 1
-                     KT = N - NS + 1
-                     CALL ZLACPY( 'A', NS, NS, H( KS, KS ), LDH,
-     $                            H( KT, 1 ), LDH )
-                     IF( NS.GT.NMIN ) THEN
-                        CALL ZLAQR4( .false., .false., NS, 1, NS,
-     $                               H( KT, 1 ), LDH, W( KS ), 1, 1,
-     $                               ZDUM, 1, WORK, LWORK, INF )
-                     ELSE
-                        CALL ZLAHQR( .false., .false., NS, 1, NS,
-     $                               H( KT, 1 ), LDH, W( KS ), 1, 1,
-     $                               ZDUM, 1, INF )
-                     END IF
-                     KS = KS + INF
-*
-*                    ==== In case of a rare QR failure use
-*                    .    eigenvalues of the trailing 2-by-2
-*                    .    principal submatrix.  Scale to avoid
-*                    .    overflows, underflows and subnormals.
-*                    .    (The scale factor S can not be zero,
-*                    .    because H(KBOT,KBOT-1) is nonzero.) ====
-*
-                     IF( KS.GE.KBOT ) THEN
-                        S = CABS1( H( KBOT-1, KBOT-1 ) ) +
-     $                      CABS1( H( KBOT, KBOT-1 ) ) +
-     $                      CABS1( H( KBOT-1, KBOT ) ) +
-     $                      CABS1( H( KBOT, KBOT ) )
-                        AA = H( KBOT-1, KBOT-1 ) / S
-                        CC = H( KBOT, KBOT-1 ) / S
-                        BB = H( KBOT-1, KBOT ) / S
-                        DD = H( KBOT, KBOT ) / S
-                        TR2 = ( AA+DD ) / TWO
-                        DET = ( AA-TR2 )*( DD-TR2 ) - BB*CC
-                        RTDISC = SQRT( -DET )
-                        W( KBOT-1 ) = ( TR2+RTDISC )*S
-                        W( KBOT ) = ( TR2-RTDISC )*S
-*
-                        KS = KBOT - 1
-                     END IF
-                  END IF
-*
-                  IF( KBOT-KS+1.GT.NS ) THEN
-*
-*                    ==== Sort the shifts (Helps a little) ====
-*
-                     SORTED = .false.
-                     DO 50 K = KBOT, KS + 1, -1
-                        IF( SORTED )
-     $                     GO TO 60
-                        SORTED = .true.
-                        DO 40 I = KS, K - 1
-                           IF( CABS1( W( I ) ).LT.CABS1( W( I+1 ) ) )
-     $                          THEN
-                              SORTED = .false.
-                              SWAP = W( I )
-                              W( I ) = W( I+1 )
-                              W( I+1 ) = SWAP
-                           END IF
-   40                   CONTINUE
-   50                CONTINUE
-   60                CONTINUE
-                  END IF
-               END IF
-*
-*              ==== If there are only two shifts, then use
-*              .    only one.  ====
-*
-               IF( KBOT-KS+1.EQ.2 ) THEN
-                  IF( CABS1( W( KBOT )-H( KBOT, KBOT ) ).LT.
-     $                CABS1( W( KBOT-1 )-H( KBOT, KBOT ) ) ) THEN
-                     W( KBOT-1 ) = W( KBOT )
-                  ELSE
-                     W( KBOT ) = W( KBOT-1 )
-                  END IF
-               END IF
+*     Test the input parameters.
 *
-*              ==== Use up to NS of the the smallest magnatiude
-*              .    shifts.  If there aren't NS shifts available,
-*              .    then use them all, possibly dropping one to
-*              .    make the number of shifts even. ====
+      INFO = 0
+      IF( ICOMPQ.LE.0 ) THEN
+         INFO = -1
+      ELSE IF( ICOMPZ.LE.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( ILO.LT.1 ) THEN
+         INFO = -4
+      ELSE IF( IHI.GT.N .OR. IHI.LT.ILO-1 ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( ( ILQ .AND. LDQ.LT.N ) .OR. LDQ.LT.1 ) THEN
+         INFO = -11
+      ELSE IF( ( ILZ .AND. LDZ.LT.N ) .OR. LDZ.LT.1 ) THEN
+         INFO = -13
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZGGHRD', -INFO )
+         RETURN
+      END IF
 *
-               NS = MIN( NS, KBOT-KS+1 )
-               NS = NS - MOD( NS, 2 )
-               KS = KBOT - NS + 1
+*     Initialize Q and Z if desired.
 *
-*              ==== Small-bulge multi-shift QR sweep:
-*              .    split workspace under the subdiagonal into
-*              .    - a KDU-by-KDU work array U in the lower
-*              .      left-hand-corner,
-*              .    - a KDU-by-at-least-KDU-but-more-is-better
-*              .      (KDU-by-NHo) horizontal work array WH along
-*              .      the bottom edge,
-*              .    - and an at-least-KDU-but-more-is-better-by-KDU
-*              .      (NVE-by-KDU) vertical work WV arrow along
-*              .      the left-hand-edge. ====
+      IF( ICOMPQ.EQ.3 )
+     $   CALL ZLASET( 'Full', N, N, CZERO, CONE, Q, LDQ )
+      IF( ICOMPZ.EQ.3 )
+     $   CALL ZLASET( 'Full', N, N, CZERO, CONE, Z, LDZ )
 *
-               KDU = 3*NS - 3
-               KU = N - KDU + 1
-               KWH = KDU + 1
-               NHO = ( N-KDU+1-4 ) - ( KDU+1 ) + 1
-               KWV = KDU + 4
-               NVE = N - KDU - KWV + 1
+*     Quick return if possible
 *
-*              ==== Small-bulge multi-shift QR sweep ====
+      IF( N.LE.1 )
+     $   RETURN
 *
-               CALL ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NS,
-     $                      W( KS ), H, LDH, ILOZ, IHIZ, Z, LDZ, WORK,
-     $                      3, H( KU, 1 ), LDH, NVE, H( KWV, 1 ), LDH,
-     $                      NHO, H( KU, KWH ), LDH )
-            END IF
+*     Zero out lower triangle of B
 *
-*           ==== Note progress (or the lack of it). ====
+      DO 20 JCOL = 1, N - 1
+         DO 10 JROW = JCOL + 1, N
+            B( JROW, JCOL ) = CZERO
+   10    CONTINUE
+   20 CONTINUE
 *
-            IF( LD.GT.0 ) THEN
-               NDFL = 1
-            ELSE
-               NDFL = NDFL + 1
-            END IF
+*     Reduce A and B
 *
-*           ==== End of main loop ====
-   70    CONTINUE
+      DO 40 JCOL = ILO, IHI - 2
 *
-*        ==== Iteration limit exceeded.  Set INFO to show where
-*        .    the problem occurred and exit. ====
+         DO 30 JROW = IHI, JCOL + 2, -1
 *
-         INFO = KBOT
-   80    CONTINUE
-      END IF
+*           Step 1: rotate rows JROW-1, JROW to kill A(JROW,JCOL)
 *
-*     ==== Return the optimal value of LWORK. ====
+            CTEMP = A( JROW-1, JCOL )
+            CALL ZLARTG( CTEMP, A( JROW, JCOL ), C, S,
+     $                   A( JROW-1, JCOL ) )
+            A( JROW, JCOL ) = CZERO
+            CALL ZROT( N-JCOL, A( JROW-1, JCOL+1 ), LDA,
+     $                 A( JROW, JCOL+1 ), LDA, C, S )
+            CALL ZROT( N+2-JROW, B( JROW-1, JROW-1 ), LDB,
+     $                 B( JROW, JROW-1 ), LDB, C, S )
+            IF( ILQ )
+     $         CALL ZROT( N, Q( 1, JROW-1 ), 1, Q( 1, JROW ), 1, C,
+     $                    DCONJG( S ) )
+*
+*           Step 2: rotate columns JROW, JROW-1 to kill B(JROW,JROW-1)
+*
+            CTEMP = B( JROW, JROW )
+            CALL ZLARTG( CTEMP, B( JROW, JROW-1 ), C, S,
+     $                   B( JROW, JROW ) )
+            B( JROW, JROW-1 ) = CZERO
+            CALL ZROT( IHI, A( 1, JROW ), 1, A( 1, JROW-1 ), 1, C, S )
+            CALL ZROT( JROW-1, B( 1, JROW ), 1, B( 1, JROW-1 ), 1, C,
+     $                 S )
+            IF( ILZ )
+     $         CALL ZROT( N, Z( 1, JROW ), 1, Z( 1, JROW-1 ), 1, C, S )
+   30    CONTINUE
+   40 CONTINUE
 *
-      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+      RETURN
 *
-*     ==== End of ZLAQR0 ====
+*     End of ZGGHRD
 *
       END
-*> \brief \b ZLAQR1 sets a scalar multiple of the first column of the product of 2-by-2 or 3-by-3 matrix H and specified shifts.
+*> \brief <b> ZHEEV computes the eigenvalues and, optionally, the left and/or right eigenvectors for HE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -16252,26 +18437,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAQR1 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr1.f"> 
+*> Download ZHEEV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheev.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr1.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zheev.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr1.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheev.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAQR1( N, H, LDH, S1, S2, V )
+*       SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+*                         INFO )
 * 
 *       .. Scalar Arguments ..
-*       COMPLEX*16         S1, S2
-*       INTEGER            LDH, N
+*       CHARACTER          JOBZ, UPLO
+*       INTEGER            INFO, LDA, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), V( * )
+*       DOUBLE PRECISION   RWORK( * ), W( * )
+*       COMPLEX*16         A( LDA, * ), WORK( * )
 *       ..
 *  
 *
@@ -16280,56 +18467,92 @@
 *>
 *> \verbatim
 *>
-*>      Given a 2-by-2 or 3-by-3 matrix H, ZLAQR1 sets v to a
-*>      scalar multiple of the first column of the product
-*>
-*>      (*)  K = (H - s1*I)*(H - s2*I)
-*>
-*>      scaling to avoid overflows and most underflows.
-*>
-*>      This is useful for starting double implicit shift bulges
-*>      in the QR algorithm.
+*> ZHEEV computes all eigenvalues and, optionally, eigenvectors of a
+*> complex Hermitian matrix A.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
+*> \param[in] JOBZ
+*> \verbatim
+*>          JOBZ is CHARACTER*1
+*>          = 'N':  Compute eigenvalues only;
+*>          = 'V':  Compute eigenvalues and eigenvectors.
+*> \endverbatim
+*>
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
+*> \endverbatim
+*>
 *> \param[in] N
 *> \verbatim
-*>          N is integer
-*>              Order of the matrix H. N must be either 2 or 3.
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] H
+*> \param[in,out] A
 *> \verbatim
-*>          H is COMPLEX*16 array of dimension (LDH,N)
-*>              The 2-by-2 or 3-by-3 matrix H in (*).
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the
+*>          leading N-by-N upper triangular part of A contains the
+*>          upper triangular part of the matrix A.  If UPLO = 'L',
+*>          the leading N-by-N lower triangular part of A contains
+*>          the lower triangular part of the matrix A.
+*>          On exit, if JOBZ = 'V', then if INFO = 0, A contains the
+*>          orthonormal eigenvectors of the matrix A.
+*>          If JOBZ = 'N', then on exit the lower triangle (if UPLO='L')
+*>          or the upper triangle (if UPLO='U') of A, including the
+*>          diagonal, is destroyed.
 *> \endverbatim
 *>
-*> \param[in] LDH
+*> \param[in] LDA
 *> \verbatim
-*>          LDH is integer
-*>              The leading dimension of H as declared in
-*>              the calling procedure.  LDH.GE.N
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] S1
+*> \param[out] W
 *> \verbatim
-*>          S1 is COMPLEX*16
+*>          W is DOUBLE PRECISION array, dimension (N)
+*>          If INFO = 0, the eigenvalues in ascending order.
 *> \endverbatim
 *>
-*> \param[in] S2
+*> \param[out] WORK
 *> \verbatim
-*>          S2 is COMPLEX*16
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
 *>
-*>          S1 and S2 are the shifts defining K in (*) above.
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The length of the array WORK.  LWORK >= max(1,2*N-1).
+*>          For optimal efficiency, LWORK >= (NB+1)*N,
+*>          where NB is the blocksize for ZHETRD returned by ILAENV.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[out] V
+*> \param[out] RWORK
 *> \verbatim
-*>          V is COMPLEX*16 array of dimension N
-*>              A scalar multiple of the first column of the
-*>              matrix K in (*).
+*>          RWORK is DOUBLE PRECISION array, dimension (max(1, 3*N-2))
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, the algorithm failed to converge; i
+*>                off-diagonal elements of an intermediate tridiagonal
+*>                form did not converge to zero.
 *> \endverbatim
 *
 *  Authors:
@@ -16340,83 +18563,171 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16HEeigen
 *
-*> \par Contributors:
-*  ==================
-*>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
-*>
 *  =====================================================================
-      SUBROUTINE ZLAQR1( N, H, LDH, S1, S2, V )
+      SUBROUTINE ZHEEV( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+     $                  INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      COMPLEX*16         S1, S2
-      INTEGER            LDH, N
-*     ..
+      CHARACTER          JOBZ, UPLO
+      INTEGER            INFO, LDA, LWORK, N
+*     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), V( * )
+      DOUBLE PRECISION   RWORK( * ), W( * )
+      COMPLEX*16         A( LDA, * ), WORK( * )
 *     ..
 *
-*  ================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   RZERO
-      PARAMETER          ( RZERO = 0.0d0 )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D0, 0.0D0 ) )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         CDUM, H21S, H31S
-      DOUBLE PRECISION   S
+      LOGICAL            LOWER, LQUERY, WANTZ
+      INTEGER            IINFO, IMAX, INDE, INDTAU, INDWRK, ISCALE,
+     $                   LLWORK, LWKOPT, NB
+      DOUBLE PRECISION   ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN, SIGMA,
+     $                   SMLNUM
 *     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DIMAG
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANHE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
 *     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
+*     .. External Subroutines ..
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLASCL, ZSTEQR,
+     $                   ZUNGTR
 *     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, SQRT
 *     ..
 *     .. Executable Statements ..
-      IF( N.EQ.2 ) THEN
-         S = CABS1( H( 1, 1 )-S2 ) + CABS1( H( 2, 1 ) )
-         IF( S.EQ.RZERO ) THEN
-            V( 1 ) = ZERO
-            V( 2 ) = ZERO
-         ELSE
-            H21S = H( 2, 1 ) / S
-            V( 1 ) = H21S*H( 1, 2 ) + ( H( 1, 1 )-S1 )*
-     $               ( ( H( 1, 1 )-S2 ) / S )
-            V( 2 ) = H21S*( H( 1, 1 )+H( 2, 2 )-S1-S2 )
-         END IF
+*
+*     Test the input parameters.
+*
+      WANTZ = LSAME( JOBZ, 'V' )
+      LOWER = LSAME( UPLO, 'L' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+      INFO = 0
+      IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.( LOWER .OR. LSAME( UPLO, 'U' ) ) ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+         NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
+         LWKOPT = MAX( 1, ( NB+1 )*N )
+         WORK( 1 ) = LWKOPT
+*
+         IF( LWORK.LT.MAX( 1, 2*N-1 ) .AND. .NOT.LQUERY )
+     $      INFO = -8
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZHEEV ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 ) THEN
+         RETURN
+      END IF
+*
+      IF( N.EQ.1 ) THEN
+         W( 1 ) = A( 1, 1 )
+         WORK( 1 ) = 1
+         IF( WANTZ )
+     $      A( 1, 1 ) = CONE
+         RETURN
+      END IF
+*
+*     Get machine constants.
+*
+      SAFMIN = DLAMCH( 'Safe minimum' )
+      EPS = DLAMCH( 'Precision' )
+      SMLNUM = SAFMIN / EPS
+      BIGNUM = ONE / SMLNUM
+      RMIN = SQRT( SMLNUM )
+      RMAX = SQRT( BIGNUM )
+*
+*     Scale matrix to allowable range, if necessary.
+*
+      ANRM = ZLANHE( 'M', UPLO, N, A, LDA, RWORK )
+      ISCALE = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.RMIN ) THEN
+         ISCALE = 1
+         SIGMA = RMIN / ANRM
+      ELSE IF( ANRM.GT.RMAX ) THEN
+         ISCALE = 1
+         SIGMA = RMAX / ANRM
+      END IF
+      IF( ISCALE.EQ.1 )
+     $   CALL ZLASCL( UPLO, 0, 0, ONE, SIGMA, N, N, A, LDA, INFO )
+*
+*     Call ZHETRD to reduce Hermitian matrix to tridiagonal form.
+*
+      INDE = 1
+      INDTAU = 1
+      INDWRK = INDTAU + N
+      LLWORK = LWORK - INDWRK + 1
+      CALL ZHETRD( UPLO, N, A, LDA, W, RWORK( INDE ), WORK( INDTAU ),
+     $             WORK( INDWRK ), LLWORK, IINFO )
+*
+*     For eigenvalues only, call DSTERF.  For eigenvectors, first call
+*     ZUNGTR to generate the unitary matrix, then call ZSTEQR.
+*
+      IF( .NOT.WANTZ ) THEN
+         CALL DSTERF( N, W, RWORK( INDE ), INFO )
       ELSE
-         S = CABS1( H( 1, 1 )-S2 ) + CABS1( H( 2, 1 ) ) +
-     $       CABS1( H( 3, 1 ) )
-         IF( S.EQ.ZERO ) THEN
-            V( 1 ) = ZERO
-            V( 2 ) = ZERO
-            V( 3 ) = ZERO
+         CALL ZUNGTR( UPLO, N, A, LDA, WORK( INDTAU ), WORK( INDWRK ),
+     $                LLWORK, IINFO )
+         INDWRK = INDE + N
+         CALL ZSTEQR( JOBZ, N, W, RWORK( INDE ), A, LDA,
+     $                RWORK( INDWRK ), INFO )
+      END IF
+*
+*     If matrix was scaled, then rescale eigenvalues appropriately.
+*
+      IF( ISCALE.EQ.1 ) THEN
+         IF( INFO.EQ.0 ) THEN
+            IMAX = N
          ELSE
-            H21S = H( 2, 1 ) / S
-            H31S = H( 3, 1 ) / S
-            V( 1 ) = ( H( 1, 1 )-S1 )*( ( H( 1, 1 )-S2 ) / S ) +
-     $               H( 1, 2 )*H21S + H( 1, 3 )*H31S
-            V( 2 ) = H21S*( H( 1, 1 )+H( 2, 2 )-S1-S2 ) + H( 2, 3 )*H31S
-            V( 3 ) = H31S*( H( 1, 1 )+H( 3, 3 )-S1-S2 ) + H21S*H( 3, 2 )
+            IMAX = INFO - 1
          END IF
+         CALL DSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
+*
+*     Set WORK(1) to optimal complex workspace size.
+*
+      WORK( 1 ) = LWKOPT
+*
+      RETURN
+*
+*     End of ZHEEV
+*
       END
-*> \brief \b ZLAQR2 performs the unitary similarity transformation of a Hessenberg matrix to detect and deflate fully converged eigenvalues from a trailing principal submatrix (aggressive early deflation).
+*> \brief <b> ZHEEVD computes the eigenvalues and, optionally, the left and/or right eigenvectors for HE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -16424,30 +18735,29 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAQR2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr2.f"> 
+*> Download ZHEEVD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zheevd.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zheevd.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zheevd.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
-*                          IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
-*                          NV, WV, LDWV, WORK, LWORK )
+*       SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+*                          LRWORK, IWORK, LIWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
-*      $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
-*       LOGICAL            WANTT, WANTZ
+*       CHARACTER          JOBZ, UPLO
+*       INTEGER            INFO, LDA, LIWORK, LRWORK, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
-*      $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   RWORK( * ), W( * )
+*       COMPLEX*16         A( LDA, * ), WORK( * )
 *       ..
 *  
 *
@@ -16456,213 +18766,145 @@
 *>
 *> \verbatim
 *>
-*>    ZLAQR2 is identical to ZLAQR3 except that it avoids
-*>    recursion by calling ZLAHQR instead of ZLAQR4.
-*>
-*>    Aggressive early deflation:
-*>
-*>    ZLAQR2 accepts as input an upper Hessenberg matrix
-*>    H and performs an unitary similarity transformation
-*>    designed to detect and deflate fully converged eigenvalues from
-*>    a trailing principal submatrix.  On output H has been over-
-*>    written by a new Hessenberg matrix that is a perturbation of
-*>    an unitary similarity transformation of H.  It is to be
-*>    hoped that the final version of H has many zero subdiagonal
-*>    entries.
+*> ZHEEVD computes all eigenvalues and, optionally, eigenvectors of a
+*> complex Hermitian matrix A.  If eigenvectors are desired, it uses a
+*> divide and conquer algorithm.
 *>
+*> The divide and conquer algorithm makes very mild assumptions about
+*> floating point arithmetic. It will work on machines with a guard
+*> digit in add/subtract, or on those binary machines without guard
+*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
+*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
+*> without guard digits, but we know of none.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] WANTT
+*> \param[in] JOBZ
 *> \verbatim
-*>          WANTT is LOGICAL
-*>          If .TRUE., then the Hessenberg matrix H is fully updated
-*>          so that the triangular Schur factor may be
-*>          computed (in cooperation with the calling subroutine).
-*>          If .FALSE., then only enough of H is updated to preserve
-*>          the eigenvalues.
+*>          JOBZ is CHARACTER*1
+*>          = 'N':  Compute eigenvalues only;
+*>          = 'V':  Compute eigenvalues and eigenvectors.
 *> \endverbatim
 *>
-*> \param[in] WANTZ
+*> \param[in] UPLO
 *> \verbatim
-*>          WANTZ is LOGICAL
-*>          If .TRUE., then the unitary matrix Z is updated so
-*>          so that the unitary Schur factor may be computed
-*>          (in cooperation with the calling subroutine).
-*>          If .FALSE., then Z is not referenced.
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix H and (if WANTZ is .TRUE.) the
-*>          order of the unitary matrix Z.
-*> \endverbatim
-*>
-*> \param[in] KTOP
-*> \verbatim
-*>          KTOP is INTEGER
-*>          It is assumed that either KTOP = 1 or H(KTOP,KTOP-1)=0.
-*>          KBOT and KTOP together determine an isolated block
-*>          along the diagonal of the Hessenberg matrix.
-*> \endverbatim
-*>
-*> \param[in] KBOT
-*> \verbatim
-*>          KBOT is INTEGER
-*>          It is assumed without a check that either
-*>          KBOT = N or H(KBOT+1,KBOT)=0.  KBOT and KTOP together
-*>          determine an isolated block along the diagonal of the
-*>          Hessenberg matrix.
-*> \endverbatim
-*>
-*> \param[in] NW
-*> \verbatim
-*>          NW is INTEGER
-*>          Deflation window size.  1 .LE. NW .LE. (KBOT-KTOP+1).
-*> \endverbatim
-*>
-*> \param[in,out] H
-*> \verbatim
-*>          H is COMPLEX*16 array, dimension (LDH,N)
-*>          On input the initial N-by-N section of H stores the
-*>          Hessenberg matrix undergoing aggressive early deflation.
-*>          On output H has been transformed by a unitary
-*>          similarity transformation, perturbed, and the returned
-*>          to Hessenberg form that (it is to be hoped) has some
-*>          zero subdiagonal entries.
-*> \endverbatim
-*>
-*> \param[in] LDH
-*> \verbatim
-*>          LDH is integer
-*>          Leading dimension of H just as declared in the calling
-*>          subroutine.  N .LE. LDH
-*> \endverbatim
-*>
-*> \param[in] ILOZ
-*> \verbatim
-*>          ILOZ is INTEGER
-*> \endverbatim
-*>
-*> \param[in] IHIZ
-*> \verbatim
-*>          IHIZ is INTEGER
-*>          Specify the rows of Z to which transformations must be
-*>          applied if WANTZ is .TRUE.. 1 .LE. ILOZ .LE. IHIZ .LE. N.
-*> \endverbatim
-*>
-*> \param[in,out] Z
-*> \verbatim
-*>          Z is COMPLEX*16 array, dimension (LDZ,N)
-*>          IF WANTZ is .TRUE., then on output, the unitary
-*>          similarity transformation mentioned above has been
-*>          accumulated into Z(ILOZ:IHIZ,ILO:IHI) from the right.
-*>          If WANTZ is .FALSE., then Z is unreferenced.
-*> \endverbatim
-*>
-*> \param[in] LDZ
-*> \verbatim
-*>          LDZ is integer
-*>          The leading dimension of Z just as declared in the
-*>          calling subroutine.  1 .LE. LDZ.
-*> \endverbatim
-*>
-*> \param[out] NS
-*> \verbatim
-*>          NS is integer
-*>          The number of unconverged (ie approximate) eigenvalues
-*>          returned in SR and SI that may be used as shifts by the
-*>          calling subroutine.
-*> \endverbatim
-*>
-*> \param[out] ND
-*> \verbatim
-*>          ND is integer
-*>          The number of converged eigenvalues uncovered by this
-*>          subroutine.
-*> \endverbatim
-*>
-*> \param[out] SH
-*> \verbatim
-*>          SH is COMPLEX*16 array, dimension KBOT
-*>          On output, approximate eigenvalues that may
-*>          be used for shifts are stored in SH(KBOT-ND-NS+1)
-*>          through SR(KBOT-ND).  Converged eigenvalues are
-*>          stored in SH(KBOT-ND+1) through SH(KBOT).
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[out] V
+*> \param[in,out] A
 *> \verbatim
-*>          V is COMPLEX*16 array, dimension (LDV,NW)
-*>          An NW-by-NW work array.
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the
+*>          leading N-by-N upper triangular part of A contains the
+*>          upper triangular part of the matrix A.  If UPLO = 'L',
+*>          the leading N-by-N lower triangular part of A contains
+*>          the lower triangular part of the matrix A.
+*>          On exit, if JOBZ = 'V', then if INFO = 0, A contains the
+*>          orthonormal eigenvectors of the matrix A.
+*>          If JOBZ = 'N', then on exit the lower triangle (if UPLO='L')
+*>          or the upper triangle (if UPLO='U') of A, including the
+*>          diagonal, is destroyed.
 *> \endverbatim
 *>
-*> \param[in] LDV
+*> \param[in] LDA
 *> \verbatim
-*>          LDV is integer scalar
-*>          The leading dimension of V just as declared in the
-*>          calling subroutine.  NW .LE. LDV
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] NH
+*> \param[out] W
 *> \verbatim
-*>          NH is integer scalar
-*>          The number of columns of T.  NH.GE.NW.
+*>          W is DOUBLE PRECISION array, dimension (N)
+*>          If INFO = 0, the eigenvalues in ascending order.
 *> \endverbatim
 *>
-*> \param[out] T
+*> \param[out] WORK
 *> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,NW)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] LDT
+*> \param[in] LWORK
 *> \verbatim
-*>          LDT is integer
-*>          The leading dimension of T just as declared in the
-*>          calling subroutine.  NW .LE. LDT
-*> \endverbatim
+*>          LWORK is INTEGER
+*>          The length of the array WORK.
+*>          If N <= 1,                LWORK must be at least 1.
+*>          If JOBZ  = 'N' and N > 1, LWORK must be at least N + 1.
+*>          If JOBZ  = 'V' and N > 1, LWORK must be at least 2*N + N**2.
 *>
-*> \param[in] NV
-*> \verbatim
-*>          NV is integer
-*>          The number of rows of work array WV available for
-*>          workspace.  NV.GE.NW.
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal sizes of the WORK, RWORK and
+*>          IWORK arrays, returns these values as the first entries of
+*>          the WORK, RWORK and IWORK arrays, and no error message
+*>          related to LWORK or LRWORK or LIWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[out] WV
+*> \param[out] RWORK
 *> \verbatim
-*>          WV is COMPLEX*16 array, dimension (LDWV,NW)
+*>          RWORK is DOUBLE PRECISION array,
+*>                                         dimension (LRWORK)
+*>          On exit, if INFO = 0, RWORK(1) returns the optimal LRWORK.
+*> \endverbatim
+*>
+*> \param[in] LRWORK
+*> \verbatim
+*>          LRWORK is INTEGER
+*>          The dimension of the array RWORK.
+*>          If N <= 1,                LRWORK must be at least 1.
+*>          If JOBZ  = 'N' and N > 1, LRWORK must be at least N.
+*>          If JOBZ  = 'V' and N > 1, LRWORK must be at least
+*>                         1 + 5*N + 2*N**2.
+*>
+*>          If LRWORK = -1, then a workspace query is assumed; the
+*>          routine only calculates the optimal sizes of the WORK, RWORK
+*>          and IWORK arrays, returns these values as the first entries
+*>          of the WORK, RWORK and IWORK arrays, and no error message
+*>          related to LWORK or LRWORK or LIWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[in] LDWV
+*> \param[out] IWORK
 *> \verbatim
-*>          LDWV is integer
-*>          The leading dimension of W just as declared in the
-*>          calling subroutine.  NW .LE. LDV
+*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LIWORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension LWORK.
-*>          On exit, WORK(1) is set to an estimate of the optimal value
-*>          of LWORK for the given values of N, NW, KTOP and KBOT.
+*>          LIWORK is INTEGER
+*>          The dimension of the array IWORK.
+*>          If N <= 1,                LIWORK must be at least 1.
+*>          If JOBZ  = 'N' and N > 1, LIWORK must be at least 1.
+*>          If JOBZ  = 'V' and N > 1, LIWORK must be at least 3 + 5*N.
+*>
+*>          If LIWORK = -1, then a workspace query is assumed; the
+*>          routine only calculates the optimal sizes of the WORK, RWORK
+*>          and IWORK arrays, returns these values as the first entries
+*>          of the WORK, RWORK and IWORK arrays, and no error message
+*>          related to LWORK or LRWORK or LIWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[in] LWORK
+*> \param[out] INFO
 *> \verbatim
-*>          LWORK is integer
-*>          The dimension of the work array WORK.  LWORK = 2*NW
-*>          suffices, but greater efficiency may result from larger
-*>          values of LWORK.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; ZLAQR2
-*>          only estimates the optimal workspace size for the given
-*>          values of N, NW, KTOP and KBOT.  The estimate is returned
-*>          in WORK(1).  No error message related to LWORK is issued
-*>          by XERBLA.  Neither H nor Z are accessed.
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i and JOBZ = 'N', then the algorithm failed
+*>                to converge; i off-diagonal elements of an intermediate
+*>                tridiagonal form did not converge to zero;
+*>                if INFO = i and JOBZ = 'V', then the algorithm failed
+*>                to compute an eigenvalue while working on the submatrix
+*>                lying in rows and columns INFO/(N+1) through
+*>                mod(INFO,N+1).
 *> \endverbatim
 *
 *  Authors:
@@ -16673,317 +18915,217 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16HEeigen
+*
+*> \par Further Details:
+*  =====================
+*>
+*>  Modified description of INFO. Sven, 16 Feb 05.
 *
 *> \par Contributors:
 *  ==================
 *>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
+*> Jeff Rutter, Computer Science Division, University of California
+*> at Berkeley, USA
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
-     $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
-     $                   NV, WV, LDWV, WORK, LWORK )
+      SUBROUTINE ZHEEVD( JOBZ, UPLO, N, A, LDA, W, WORK, LWORK, RWORK,
+     $                   LRWORK, IWORK, LIWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
-     $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
-      LOGICAL            WANTT, WANTZ
+      CHARACTER          JOBZ, UPLO
+      INTEGER            INFO, LDA, LIWORK, LRWORK, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
-     $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   RWORK( * ), W( * )
+      COMPLEX*16         A( LDA, * ), WORK( * )
 *     ..
 *
-*  ================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   RZERO, RONE
-      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D0, 0.0D0 ) )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         BETA, CDUM, S, TAU
-      DOUBLE PRECISION   FOO, SAFMAX, SAFMIN, SMLNUM, ULP
-      INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
-     $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWKOPT
+      LOGICAL            LOWER, LQUERY, WANTZ
+      INTEGER            IINFO, IMAX, INDE, INDRWK, INDTAU, INDWK2,
+     $                   INDWRK, ISCALE, LIOPT, LIWMIN, LLRWK, LLWORK,
+     $                   LLWRK2, LOPT, LROPT, LRWMIN, LWMIN
+      DOUBLE PRECISION   ANRM, BIGNUM, EPS, RMAX, RMIN, SAFMIN, SIGMA,
+     $                   SMLNUM
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMCH
-      EXTERNAL           DLAMCH
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, ZLANHE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANHE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
-     $                   ZLARF, ZLARFG, ZLASET, ZTREXC, ZUNMHR
+      EXTERNAL           DSCAL, DSTERF, XERBLA, ZHETRD, ZLACPY, ZLASCL,
+     $                   ZSTEDC, ZUNMTR
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, MAX, MIN
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
-*     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+      INTRINSIC          MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
-*     ==== Estimate optimal workspace. ====
-*
-      JW = MIN( NW, KBOT-KTOP+1 )
-      IF( JW.LE.2 ) THEN
-         LWKOPT = 1
-      ELSE
-*
-*        ==== Workspace query call to ZGEHRD ====
+*     Test the input parameters.
 *
-         CALL ZGEHRD( JW, 1, JW-1, T, LDT, WORK, WORK, -1, INFO )
-         LWK1 = INT( WORK( 1 ) )
+      WANTZ = LSAME( JOBZ, 'V' )
+      LOWER = LSAME( UPLO, 'L' )
+      LQUERY = ( LWORK.EQ.-1 .OR. LRWORK.EQ.-1 .OR. LIWORK.EQ.-1 )
 *
-*        ==== Workspace query call to ZUNMHR ====
+      INFO = 0
+      IF( .NOT.( WANTZ .OR. LSAME( JOBZ, 'N' ) ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.( LOWER .OR. LSAME( UPLO, 'U' ) ) ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      END IF
 *
-         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
-     $                WORK, -1, INFO )
-         LWK2 = INT( WORK( 1 ) )
+      IF( INFO.EQ.0 ) THEN
+         IF( N.LE.1 ) THEN
+            LWMIN = 1
+            LRWMIN = 1
+            LIWMIN = 1
+            LOPT = LWMIN
+            LROPT = LRWMIN
+            LIOPT = LIWMIN
+         ELSE
+            IF( WANTZ ) THEN
+               LWMIN = 2*N + N*N
+               LRWMIN = 1 + 5*N + 2*N**2
+               LIWMIN = 3 + 5*N
+            ELSE
+               LWMIN = N + 1
+               LRWMIN = N
+               LIWMIN = 1
+            END IF
+            LOPT = MAX( LWMIN, N +
+     $                  ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 ) )
+            LROPT = LRWMIN
+            LIOPT = LIWMIN
+         END IF
+         WORK( 1 ) = LOPT
+         RWORK( 1 ) = LROPT
+         IWORK( 1 ) = LIOPT
 *
-*        ==== Optimal workspace ====
+         IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -8
+         ELSE IF( LRWORK.LT.LRWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -10
+         ELSE IF( LIWORK.LT.LIWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -12
+         END IF
+      END IF
 *
-         LWKOPT = JW + MAX( LWK1, LWK2 )
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZHEEVD', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
       END IF
 *
-*     ==== Quick return in case of workspace query. ====
+*     Quick return if possible
 *
-      IF( LWORK.EQ.-1 ) THEN
-         WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( N.EQ.1 ) THEN
+         W( 1 ) = A( 1, 1 )
+         IF( WANTZ )
+     $      A( 1, 1 ) = CONE
          RETURN
       END IF
 *
-*     ==== Nothing to do ...
-*     ... for an empty active block ... ====
-      NS = 0
-      ND = 0
-      WORK( 1 ) = ONE
-      IF( KTOP.GT.KBOT )
-     $   RETURN
-*     ... nor for an empty deflation window. ====
-      IF( NW.LT.1 )
-     $   RETURN
-*
-*     ==== Machine constants ====
-*
-      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
-      SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
-      ULP = DLAMCH( 'PRECISION' )
-      SMLNUM = SAFMIN*( DBLE( N ) / ULP )
-*
-*     ==== Setup deflation window ====
-*
-      JW = MIN( NW, KBOT-KTOP+1 )
-      KWTOP = KBOT - JW + 1
-      IF( KWTOP.EQ.KTOP ) THEN
-         S = ZERO
-      ELSE
-         S = H( KWTOP, KWTOP-1 )
-      END IF
+*     Get machine constants.
 *
-      IF( KBOT.EQ.KWTOP ) THEN
+      SAFMIN = DLAMCH( 'Safe minimum' )
+      EPS = DLAMCH( 'Precision' )
+      SMLNUM = SAFMIN / EPS
+      BIGNUM = ONE / SMLNUM
+      RMIN = SQRT( SMLNUM )
+      RMAX = SQRT( BIGNUM )
 *
-*        ==== 1-by-1 deflation window: not much to do ====
+*     Scale matrix to allowable range, if necessary.
 *
-         SH( KWTOP ) = H( KWTOP, KWTOP )
-         NS = 1
-         ND = 0
-         IF( CABS1( S ).LE.MAX( SMLNUM, ULP*CABS1( H( KWTOP,
-     $       KWTOP ) ) ) ) THEN
-            NS = 0
-            ND = 1
-            IF( KWTOP.GT.KTOP )
-     $         H( KWTOP, KWTOP-1 ) = ZERO
-         END IF
-         WORK( 1 ) = ONE
-         RETURN
+      ANRM = ZLANHE( 'M', UPLO, N, A, LDA, RWORK )
+      ISCALE = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.RMIN ) THEN
+         ISCALE = 1
+         SIGMA = RMIN / ANRM
+      ELSE IF( ANRM.GT.RMAX ) THEN
+         ISCALE = 1
+         SIGMA = RMAX / ANRM
       END IF
+      IF( ISCALE.EQ.1 )
+     $   CALL ZLASCL( UPLO, 0, 0, ONE, SIGMA, N, N, A, LDA, INFO )
 *
-*     ==== Convert to spike-triangular form.  (In case of a
-*     .    rare QR failure, this routine continues to do
-*     .    aggressive early deflation using that part of
-*     .    the deflation window that converged using INFQR
-*     .    here and there to keep track.) ====
-*
-      CALL ZLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
-*
-      CALL ZLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
-      CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
-     $             JW, V, LDV, INFQR )
-*
-*     ==== Deflation detection loop ====
-*
-      NS = JW
-      ILST = INFQR + 1
-      DO 10 KNT = INFQR + 1, JW
-*
-*        ==== Small spike tip deflation test ====
-*
-         FOO = CABS1( T( NS, NS ) )
-         IF( FOO.EQ.RZERO )
-     $      FOO = CABS1( S )
-         IF( CABS1( S )*CABS1( V( 1, NS ) ).LE.MAX( SMLNUM, ULP*FOO ) )
-     $        THEN
-*
-*           ==== One more converged eigenvalue ====
-*
-            NS = NS - 1
-         ELSE
-*
-*           ==== One undeflatable eigenvalue.  Move it up out of the
-*           .    way.   (ZTREXC can not fail in this case.) ====
-*
-            IFST = NS
-            CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
-            ILST = ILST + 1
-         END IF
-   10 CONTINUE
-*
-*        ==== Return to Hessenberg form ====
-*
-      IF( NS.EQ.0 )
-     $   S = ZERO
+*     Call ZHETRD to reduce Hermitian matrix to tridiagonal form.
 *
-      IF( NS.LT.JW ) THEN
+      INDE = 1
+      INDTAU = 1
+      INDWRK = INDTAU + N
+      INDRWK = INDE + N
+      INDWK2 = INDWRK + N*N
+      LLWORK = LWORK - INDWRK + 1
+      LLWRK2 = LWORK - INDWK2 + 1
+      LLRWK = LRWORK - INDRWK + 1
+      CALL ZHETRD( UPLO, N, A, LDA, W, RWORK( INDE ), WORK( INDTAU ),
+     $             WORK( INDWRK ), LLWORK, IINFO )
 *
-*        ==== sorting the diagonal of T improves accuracy for
-*        .    graded matrices.  ====
+*     For eigenvalues only, call DSTERF.  For eigenvectors, first call
+*     ZSTEDC to generate the eigenvector matrix, WORK(INDWRK), of the
+*     tridiagonal matrix, then call ZUNMTR to multiply it to the
+*     Householder transformations represented as Householder vectors in
+*     A.
 *
-         DO 30 I = INFQR + 1, NS
-            IFST = I
-            DO 20 J = I + 1, NS
-               IF( CABS1( T( J, J ) ).GT.CABS1( T( IFST, IFST ) ) )
-     $            IFST = J
-   20       CONTINUE
-            ILST = I
-            IF( IFST.NE.ILST )
-     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
-   30    CONTINUE
+      IF( .NOT.WANTZ ) THEN
+         CALL DSTERF( N, W, RWORK( INDE ), INFO )
+      ELSE
+         CALL ZSTEDC( 'I', N, W, RWORK( INDE ), WORK( INDWRK ), N,
+     $                WORK( INDWK2 ), LLWRK2, RWORK( INDRWK ), LLRWK,
+     $                IWORK, LIWORK, INFO )
+         CALL ZUNMTR( 'L', UPLO, 'N', N, N, A, LDA, WORK( INDTAU ),
+     $                WORK( INDWRK ), N, WORK( INDWK2 ), LLWRK2, IINFO )
+         CALL ZLACPY( 'A', N, N, WORK( INDWRK ), N, A, LDA )
       END IF
 *
-*     ==== Restore shift/eigenvalue array from T ====
-*
-      DO 40 I = INFQR + 1, JW
-         SH( KWTOP+I-1 ) = T( I, I )
-   40 CONTINUE
-*
-*
-      IF( NS.LT.JW .OR. S.EQ.ZERO ) THEN
-         IF( NS.GT.1 .AND. S.NE.ZERO ) THEN
-*
-*           ==== Reflect spike back into lower triangle ====
-*
-            CALL ZCOPY( NS, V, LDV, WORK, 1 )
-            DO 50 I = 1, NS
-               WORK( I ) = DCONJG( WORK( I ) )
-   50       CONTINUE
-            BETA = WORK( 1 )
-            CALL ZLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
-*
-            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
-*
-            CALL ZLARF( 'L', NS, JW, WORK, 1, DCONJG( TAU ), T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
-*
-            CALL ZGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
-     $                   LWORK-JW, INFO )
-         END IF
-*
-*        ==== Copy updated reduced window into place ====
-*
-         IF( KWTOP.GT.1 )
-     $      H( KWTOP, KWTOP-1 ) = S*DCONJG( V( 1, 1 ) )
-         CALL ZLACPY( 'U', JW, JW, T, LDT, H( KWTOP, KWTOP ), LDH )
-         CALL ZCOPY( JW-1, T( 2, 1 ), LDT+1, H( KWTOP+1, KWTOP ),
-     $               LDH+1 )
-*
-*        ==== Accumulate orthogonal matrix in order update
-*        .    H and Z, if requested.  ====
-*
-         IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
-     $                   WORK( JW+1 ), LWORK-JW, INFO )
-*
-*        ==== Update vertical slab in H ====
+*     If matrix was scaled, then rescale eigenvalues appropriately.
 *
-         IF( WANTT ) THEN
-            LTOP = 1
+      IF( ISCALE.EQ.1 ) THEN
+         IF( INFO.EQ.0 ) THEN
+            IMAX = N
          ELSE
-            LTOP = KTOP
-         END IF
-         DO 60 KROW = LTOP, KWTOP - 1, NV
-            KLN = MIN( NV, KWTOP-KROW )
-            CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
-     $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
-   60    CONTINUE
-*
-*        ==== Update horizontal slab in H ====
-*
-         IF( WANTT ) THEN
-            DO 70 KCOL = KBOT + 1, N, NH
-               KLN = MIN( NH, N-KCOL+1 )
-               CALL ZGEMM( 'C', 'N', JW, KLN, JW, ONE, V, LDV,
-     $                     H( KWTOP, KCOL ), LDH, ZERO, T, LDT )
-               CALL ZLACPY( 'A', JW, KLN, T, LDT, H( KWTOP, KCOL ),
-     $                      LDH )
-   70       CONTINUE
-         END IF
-*
-*        ==== Update vertical slab in Z ====
-*
-         IF( WANTZ ) THEN
-            DO 80 KROW = ILOZ, IHIZ, NV
-               KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
-     $                     LDZ, V, LDV, ZERO, WV, LDWV )
-               CALL ZLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
-     $                      LDZ )
-   80       CONTINUE
+            IMAX = INFO - 1
          END IF
+         CALL DSCAL( IMAX, ONE / SIGMA, W, 1 )
       END IF
 *
-*     ==== Return the number of deflations ... ====
-*
-      ND = JW - NS
-*
-*     ==== ... and the number of shifts. (Subtracting
-*     .    INFQR from the spike length takes care
-*     .    of the case of a rare QR failure while
-*     .    calculating eigenvalues of the deflation
-*     .    window.)  ====
-*
-      NS = NS - INFQR
-*
-*      ==== Return optimal workspace. ====
+      WORK( 1 ) = LOPT
+      RWORK( 1 ) = LROPT
+      IWORK( 1 ) = LIOPT
 *
-      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+      RETURN
 *
-*     ==== End of ZLAQR2 ====
+*     End of ZHEEVD
 *
       END
-*> \brief \b ZLAQR3 performs the unitary similarity transformation of a Hessenberg matrix to detect and deflate fully converged eigenvalues from a trailing principal submatrix (aggressive early deflation).
+*> \brief \b ZHETD2 reduces a Hermitian matrix to real symmetric tridiagonal form by an unitary similarity transformation (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -16991,30 +19133,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAQR3 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr3.f"> 
+*> Download ZHETD2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetd2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr3.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhetd2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr3.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetd2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
-*                          IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
-*                          NV, WV, LDWV, WORK, LWORK )
+*       SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
-*      $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
-*       LOGICAL            WANTT, WANTZ
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
-*      $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+*       DOUBLE PRECISION   D( * ), E( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * )
 *       ..
 *  
 *
@@ -17023,545 +19162,304 @@
 *>
 *> \verbatim
 *>
-*>    Aggressive early deflation:
-*>
-*>    ZLAQR3 accepts as input an upper Hessenberg matrix
-*>    H and performs an unitary similarity transformation
-*>    designed to detect and deflate fully converged eigenvalues from
-*>    a trailing principal submatrix.  On output H has been over-
-*>    written by a new Hessenberg matrix that is a perturbation of
-*>    an unitary similarity transformation of H.  It is to be
-*>    hoped that the final version of H has many zero subdiagonal
-*>    entries.
-*>
+*> ZHETD2 reduces a complex Hermitian matrix A to real symmetric
+*> tridiagonal form T by a unitary similarity transformation:
+*> Q**H * A * Q = T.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] WANTT
-*> \verbatim
-*>          WANTT is LOGICAL
-*>          If .TRUE., then the Hessenberg matrix H is fully updated
-*>          so that the triangular Schur factor may be
-*>          computed (in cooperation with the calling subroutine).
-*>          If .FALSE., then only enough of H is updated to preserve
-*>          the eigenvalues.
-*> \endverbatim
-*>
-*> \param[in] WANTZ
+*> \param[in] UPLO
 *> \verbatim
-*>          WANTZ is LOGICAL
-*>          If .TRUE., then the unitary matrix Z is updated so
-*>          so that the unitary Schur factor may be computed
-*>          (in cooperation with the calling subroutine).
-*>          If .FALSE., then Z is not referenced.
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the upper or lower triangular part of the
+*>          Hermitian matrix A is stored:
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix H and (if WANTZ is .TRUE.) the
-*>          order of the unitary matrix Z.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] KTOP
+*> \param[in,out] A
 *> \verbatim
-*>          KTOP is INTEGER
-*>          It is assumed that either KTOP = 1 or H(KTOP,KTOP-1)=0.
-*>          KBOT and KTOP together determine an isolated block
-*>          along the diagonal of the Hessenberg matrix.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
+*>          n-by-n upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading n-by-n lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>          On exit, if UPLO = 'U', the diagonal and first superdiagonal
+*>          of A are overwritten by the corresponding elements of the
+*>          tridiagonal matrix T, and the elements above the first
+*>          superdiagonal, with the array TAU, represent the unitary
+*>          matrix Q as a product of elementary reflectors; if UPLO
+*>          = 'L', the diagonal and first subdiagonal of A are over-
+*>          written by the corresponding elements of the tridiagonal
+*>          matrix T, and the elements below the first subdiagonal, with
+*>          the array TAU, represent the unitary matrix Q as a product
+*>          of elementary reflectors. See Further Details.
 *> \endverbatim
 *>
-*> \param[in] KBOT
+*> \param[in] LDA
 *> \verbatim
-*>          KBOT is INTEGER
-*>          It is assumed without a check that either
-*>          KBOT = N or H(KBOT+1,KBOT)=0.  KBOT and KTOP together
-*>          determine an isolated block along the diagonal of the
-*>          Hessenberg matrix.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] NW
+*> \param[out] D
 *> \verbatim
-*>          NW is INTEGER
-*>          Deflation window size.  1 .LE. NW .LE. (KBOT-KTOP+1).
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>          The diagonal elements of the tridiagonal matrix T:
+*>          D(i) = A(i,i).
 *> \endverbatim
 *>
-*> \param[in,out] H
+*> \param[out] E
 *> \verbatim
-*>          H is COMPLEX*16 array, dimension (LDH,N)
-*>          On input the initial N-by-N section of H stores the
-*>          Hessenberg matrix undergoing aggressive early deflation.
-*>          On output H has been transformed by a unitary
-*>          similarity transformation, perturbed, and the returned
-*>          to Hessenberg form that (it is to be hoped) has some
-*>          zero subdiagonal entries.
+*>          E is DOUBLE PRECISION array, dimension (N-1)
+*>          The off-diagonal elements of the tridiagonal matrix T:
+*>          E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.
 *> \endverbatim
 *>
-*> \param[in] LDH
+*> \param[out] TAU
 *> \verbatim
-*>          LDH is integer
-*>          Leading dimension of H just as declared in the calling
-*>          subroutine.  N .LE. LDH
+*>          TAU is COMPLEX*16 array, dimension (N-1)
+*>          The scalar factors of the elementary reflectors (see Further
+*>          Details).
 *> \endverbatim
 *>
-*> \param[in] ILOZ
+*> \param[out] INFO
 *> \verbatim
-*>          ILOZ is INTEGER
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16HEcomputational
+*
+*> \par Further Details:
+*  =====================
 *>
-*> \param[in] IHIZ
 *> \verbatim
-*>          IHIZ is INTEGER
-*>          Specify the rows of Z to which transformations must be
-*>          applied if WANTZ is .TRUE.. 1 .LE. ILOZ .LE. IHIZ .LE. N.
-*> \endverbatim
 *>
-*> \param[in,out] Z
-*> \verbatim
-*>          Z is COMPLEX*16 array, dimension (LDZ,N)
-*>          IF WANTZ is .TRUE., then on output, the unitary
-*>          similarity transformation mentioned above has been
-*>          accumulated into Z(ILOZ:IHIZ,ILO:IHI) from the right.
-*>          If WANTZ is .FALSE., then Z is unreferenced.
-*> \endverbatim
+*>  If UPLO = 'U', the matrix Q is represented as a product of elementary
+*>  reflectors
 *>
-*> \param[in] LDZ
-*> \verbatim
-*>          LDZ is integer
-*>          The leading dimension of Z just as declared in the
-*>          calling subroutine.  1 .LE. LDZ.
-*> \endverbatim
+*>     Q = H(n-1) . . . H(2) H(1).
 *>
-*> \param[out] NS
-*> \verbatim
-*>          NS is integer
-*>          The number of unconverged (ie approximate) eigenvalues
-*>          returned in SR and SI that may be used as shifts by the
-*>          calling subroutine.
-*> \endverbatim
+*>  Each H(i) has the form
 *>
-*> \param[out] ND
-*> \verbatim
-*>          ND is integer
-*>          The number of converged eigenvalues uncovered by this
-*>          subroutine.
-*> \endverbatim
+*>     H(i) = I - tau * v * v**H
 *>
-*> \param[out] SH
-*> \verbatim
-*>          SH is COMPLEX*16 array, dimension KBOT
-*>          On output, approximate eigenvalues that may
-*>          be used for shifts are stored in SH(KBOT-ND-NS+1)
-*>          through SR(KBOT-ND).  Converged eigenvalues are
-*>          stored in SH(KBOT-ND+1) through SH(KBOT).
-*> \endverbatim
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in
+*>  A(1:i-1,i+1), and tau in TAU(i).
 *>
-*> \param[out] V
-*> \verbatim
-*>          V is COMPLEX*16 array, dimension (LDV,NW)
-*>          An NW-by-NW work array.
-*> \endverbatim
+*>  If UPLO = 'L', the matrix Q is represented as a product of elementary
+*>  reflectors
 *>
-*> \param[in] LDV
-*> \verbatim
-*>          LDV is integer scalar
-*>          The leading dimension of V just as declared in the
-*>          calling subroutine.  NW .LE. LDV
-*> \endverbatim
+*>     Q = H(1) H(2) . . . H(n-1).
 *>
-*> \param[in] NH
-*> \verbatim
-*>          NH is integer scalar
-*>          The number of columns of T.  NH.GE.NW.
-*> \endverbatim
+*>  Each H(i) has the form
 *>
-*> \param[out] T
-*> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,NW)
-*> \endverbatim
+*>     H(i) = I - tau * v * v**H
 *>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is integer
-*>          The leading dimension of T just as declared in the
-*>          calling subroutine.  NW .LE. LDT
-*> \endverbatim
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),
+*>  and tau in TAU(i).
 *>
-*> \param[in] NV
-*> \verbatim
-*>          NV is integer
-*>          The number of rows of work array WV available for
-*>          workspace.  NV.GE.NW.
-*> \endverbatim
+*>  The contents of A on exit are illustrated by the following examples
+*>  with n = 5:
 *>
-*> \param[out] WV
-*> \verbatim
-*>          WV is COMPLEX*16 array, dimension (LDWV,NW)
-*> \endverbatim
+*>  if UPLO = 'U':                       if UPLO = 'L':
 *>
-*> \param[in] LDWV
-*> \verbatim
-*>          LDWV is integer
-*>          The leading dimension of W just as declared in the
-*>          calling subroutine.  NW .LE. LDV
-*> \endverbatim
+*>    (  d   e   v2  v3  v4 )              (  d                  )
+*>    (      d   e   v3  v4 )              (  e   d              )
+*>    (          d   e   v4 )              (  v1  e   d          )
+*>    (              d   e  )              (  v1  v2  e   d      )
+*>    (                  d  )              (  v1  v2  v3  e   d  )
 *>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension LWORK.
-*>          On exit, WORK(1) is set to an estimate of the optimal value
-*>          of LWORK for the given values of N, NW, KTOP and KBOT.
+*>  where d and e denote diagonal and off-diagonal elements of T, and vi
+*>  denotes an element of the vector defining H(i).
 *> \endverbatim
 *>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is integer
-*>          The dimension of the work array WORK.  LWORK = 2*NW
-*>          suffices, but greater efficiency may result from larger
-*>          values of LWORK.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; ZLAQR3
-*>          only estimates the optimal workspace size for the given
-*>          values of N, NW, KTOP and KBOT.  The estimate is returned
-*>          in WORK(1).  No error message related to LWORK is issued
-*>          by XERBLA.  Neither H nor Z are accessed.
-*> \endverbatim
-*
-*  Authors:
-*  ========
+*  =====================================================================
+      SUBROUTINE ZHETD2( UPLO, N, A, LDA, D, E, TAU, INFO )
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
-*
-*> \par Contributors:
-*  ==================
-*>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
-*>
-*  =====================================================================
-      SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
-     $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
-     $                   NV, WV, LDWV, WORK, LWORK )
-*
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
-     $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
-      LOGICAL            WANTT, WANTZ
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
-     $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+      DOUBLE PRECISION   D( * ), E( * )
+      COMPLEX*16         A( LDA, * ), TAU( * )
 *     ..
 *
-*  ================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   RZERO, RONE
-      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
+      COMPLEX*16         ONE, ZERO, HALF
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   HALF = ( 0.5D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         BETA, CDUM, S, TAU
-      DOUBLE PRECISION   FOO, SAFMAX, SAFMIN, SMLNUM, ULP
-      INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
-     $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWK3,
-     $                   LWKOPT, NMIN
-*     ..
-*     .. External Functions ..
-      DOUBLE PRECISION   DLAMCH
-      INTEGER            ILAENV
-      EXTERNAL           DLAMCH, ILAENV
+      LOGICAL            UPPER
+      INTEGER            I
+      COMPLEX*16         ALPHA, TAUI
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
-     $                   ZLAQR4, ZLARF, ZLARFG, ZLASET, ZTREXC, ZUNMHR
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, MAX, MIN
+      EXTERNAL           XERBLA, ZAXPY, ZHEMV, ZHER2, ZLARFG
 *     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
+*     .. External Functions ..
+      LOGICAL            LSAME
+      COMPLEX*16         ZDOTC
+      EXTERNAL           LSAME, ZDOTC
 *     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     ==== Estimate optimal workspace. ====
-*
-      JW = MIN( NW, KBOT-KTOP+1 )
-      IF( JW.LE.2 ) THEN
-         LWKOPT = 1
-      ELSE
-*
-*        ==== Workspace query call to ZGEHRD ====
-*
-         CALL ZGEHRD( JW, 1, JW-1, T, LDT, WORK, WORK, -1, INFO )
-         LWK1 = INT( WORK( 1 ) )
-*
-*        ==== Workspace query call to ZUNMHR ====
-*
-         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
-     $                WORK, -1, INFO )
-         LWK2 = INT( WORK( 1 ) )
-*
-*        ==== Workspace query call to ZLAQR4 ====
-*
-         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH, 1, JW, V,
-     $                LDV, WORK, -1, INFQR )
-         LWK3 = INT( WORK( 1 ) )
-*
-*        ==== Optimal workspace ====
-*
-         LWKOPT = MAX( JW+MAX( LWK1, LWK2 ), LWK3 )
-      END IF
-*
-*     ==== Quick return in case of workspace query. ====
-*
-      IF( LWORK.EQ.-1 ) THEN
-         WORK( 1 ) = DCMPLX( LWKOPT, 0 )
-         RETURN
-      END IF
-*
-*     ==== Nothing to do ...
-*     ... for an empty active block ... ====
-      NS = 0
-      ND = 0
-      WORK( 1 ) = ONE
-      IF( KTOP.GT.KBOT )
-     $   RETURN
-*     ... nor for an empty deflation window. ====
-      IF( NW.LT.1 )
-     $   RETURN
-*
-*     ==== Machine constants ====
-*
-      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
-      SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
-      ULP = DLAMCH( 'PRECISION' )
-      SMLNUM = SAFMIN*( DBLE( N ) / ULP )
-*
-*     ==== Setup deflation window ====
+*     Test the input parameters
 *
-      JW = MIN( NW, KBOT-KTOP+1 )
-      KWTOP = KBOT - JW + 1
-      IF( KWTOP.EQ.KTOP ) THEN
-         S = ZERO
-      ELSE
-         S = H( KWTOP, KWTOP-1 )
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U')
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
       END IF
-*
-      IF( KBOT.EQ.KWTOP ) THEN
-*
-*        ==== 1-by-1 deflation window: not much to do ====
-*
-         SH( KWTOP ) = H( KWTOP, KWTOP )
-         NS = 1
-         ND = 0
-         IF( CABS1( S ).LE.MAX( SMLNUM, ULP*CABS1( H( KWTOP,
-     $       KWTOP ) ) ) ) THEN
-            NS = 0
-            ND = 1
-            IF( KWTOP.GT.KTOP )
-     $         H( KWTOP, KWTOP-1 ) = ZERO
-         END IF
-         WORK( 1 ) = ONE
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZHETD2', -INFO )
          RETURN
       END IF
 *
-*     ==== Convert to spike-triangular form.  (In case of a
-*     .    rare QR failure, this routine continues to do
-*     .    aggressive early deflation using that part of
-*     .    the deflation window that converged using INFQR
-*     .    here and there to keep track.) ====
-*
-      CALL ZLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
-      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
-*
-      CALL ZLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
-      NMIN = ILAENV( 12, 'ZLAQR3', 'SV', JW, 1, JW, LWORK )
-      IF( JW.GT.NMIN ) THEN
-         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
-     $                JW, V, LDV, WORK, LWORK, INFQR )
-      ELSE
-         CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
-     $                JW, V, LDV, INFQR )
-      END IF
-*
-*     ==== Deflation detection loop ====
-*
-      NS = JW
-      ILST = INFQR + 1
-      DO 10 KNT = INFQR + 1, JW
+*     Quick return if possible
 *
-*        ==== Small spike tip deflation test ====
+      IF( N.LE.0 )
+     $   RETURN
 *
-         FOO = CABS1( T( NS, NS ) )
-         IF( FOO.EQ.RZERO )
-     $      FOO = CABS1( S )
-         IF( CABS1( S )*CABS1( V( 1, NS ) ).LE.MAX( SMLNUM, ULP*FOO ) )
-     $        THEN
+      IF( UPPER ) THEN
 *
-*           ==== One more converged eigenvalue ====
+*        Reduce the upper triangle of A
 *
-            NS = NS - 1
-         ELSE
+         A( N, N ) = DBLE( A( N, N ) )
+         DO 10 I = N - 1, 1, -1
 *
-*           ==== One undeflatable eigenvalue.  Move it up out of the
-*           .    way.   (ZTREXC can not fail in this case.) ====
+*           Generate elementary reflector H(i) = I - tau * v * v**H
+*           to annihilate A(1:i-1,i+1)
 *
-            IFST = NS
-            CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
-            ILST = ILST + 1
-         END IF
-   10 CONTINUE
+            ALPHA = A( I, I+1 )
+            CALL ZLARFG( I, ALPHA, A( 1, I+1 ), 1, TAUI )
+            E( I ) = ALPHA
 *
-*        ==== Return to Hessenberg form ====
+            IF( TAUI.NE.ZERO ) THEN
 *
-      IF( NS.EQ.0 )
-     $   S = ZERO
+*              Apply H(i) from both sides to A(1:i,1:i)
 *
-      IF( NS.LT.JW ) THEN
+               A( I, I+1 ) = ONE
 *
-*        ==== sorting the diagonal of T improves accuracy for
-*        .    graded matrices.  ====
+*              Compute  x := tau * A * v  storing x in TAU(1:i)
 *
-         DO 30 I = INFQR + 1, NS
-            IFST = I
-            DO 20 J = I + 1, NS
-               IF( CABS1( T( J, J ) ).GT.CABS1( T( IFST, IFST ) ) )
-     $            IFST = J
-   20       CONTINUE
-            ILST = I
-            IF( IFST.NE.ILST )
-     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
-   30    CONTINUE
-      END IF
+               CALL ZHEMV( UPLO, I, TAUI, A, LDA, A( 1, I+1 ), 1, ZERO,
+     $                     TAU, 1 )
 *
-*     ==== Restore shift/eigenvalue array from T ====
+*              Compute  w := x - 1/2 * tau * (x**H * v) * v
 *
-      DO 40 I = INFQR + 1, JW
-         SH( KWTOP+I-1 ) = T( I, I )
-   40 CONTINUE
+               ALPHA = -HALF*TAUI*ZDOTC( I, TAU, 1, A( 1, I+1 ), 1 )
+               CALL ZAXPY( I, ALPHA, A( 1, I+1 ), 1, TAU, 1 )
 *
+*              Apply the transformation as a rank-2 update:
+*                 A := A - v * w**H - w * v**H
 *
-      IF( NS.LT.JW .OR. S.EQ.ZERO ) THEN
-         IF( NS.GT.1 .AND. S.NE.ZERO ) THEN
+               CALL ZHER2( UPLO, I, -ONE, A( 1, I+1 ), 1, TAU, 1, A,
+     $                     LDA )
 *
-*           ==== Reflect spike back into lower triangle ====
+            ELSE
+               A( I, I ) = DBLE( A( I, I ) )
+            END IF
+            A( I, I+1 ) = E( I )
+            D( I+1 ) = A( I+1, I+1 )
+            TAU( I ) = TAUI
+   10    CONTINUE
+         D( 1 ) = A( 1, 1 )
+      ELSE
 *
-            CALL ZCOPY( NS, V, LDV, WORK, 1 )
-            DO 50 I = 1, NS
-               WORK( I ) = DCONJG( WORK( I ) )
-   50       CONTINUE
-            BETA = WORK( 1 )
-            CALL ZLARFG( NS, BETA, WORK( 2 ), 1, TAU )
-            WORK( 1 ) = ONE
+*        Reduce the lower triangle of A
 *
-            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+         A( 1, 1 ) = DBLE( A( 1, 1 ) )
+         DO 20 I = 1, N - 1
 *
-            CALL ZLARF( 'L', NS, JW, WORK, 1, DCONJG( TAU ), T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
-     $                  WORK( JW+1 ) )
-            CALL ZLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
-     $                  WORK( JW+1 ) )
+*           Generate elementary reflector H(i) = I - tau * v * v**H
+*           to annihilate A(i+2:n,i)
 *
-            CALL ZGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
-     $                   LWORK-JW, INFO )
-         END IF
+            ALPHA = A( I+1, I )
+            CALL ZLARFG( N-I, ALPHA, A( MIN( I+2, N ), I ), 1, TAUI )
+            E( I ) = ALPHA
 *
-*        ==== Copy updated reduced window into place ====
+            IF( TAUI.NE.ZERO ) THEN
 *
-         IF( KWTOP.GT.1 )
-     $      H( KWTOP, KWTOP-1 ) = S*DCONJG( V( 1, 1 ) )
-         CALL ZLACPY( 'U', JW, JW, T, LDT, H( KWTOP, KWTOP ), LDH )
-         CALL ZCOPY( JW-1, T( 2, 1 ), LDT+1, H( KWTOP+1, KWTOP ),
-     $               LDH+1 )
+*              Apply H(i) from both sides to A(i+1:n,i+1:n)
 *
-*        ==== Accumulate orthogonal matrix in order update
-*        .    H and Z, if requested.  ====
+               A( I+1, I ) = ONE
 *
-         IF( NS.GT.1 .AND. S.NE.ZERO )
-     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
-     $                   WORK( JW+1 ), LWORK-JW, INFO )
+*              Compute  x := tau * A * v  storing y in TAU(i:n-1)
 *
-*        ==== Update vertical slab in H ====
+               CALL ZHEMV( UPLO, N-I, TAUI, A( I+1, I+1 ), LDA,
+     $                     A( I+1, I ), 1, ZERO, TAU( I ), 1 )
 *
-         IF( WANTT ) THEN
-            LTOP = 1
-         ELSE
-            LTOP = KTOP
-         END IF
-         DO 60 KROW = LTOP, KWTOP - 1, NV
-            KLN = MIN( NV, KWTOP-KROW )
-            CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
-     $                  LDH, V, LDV, ZERO, WV, LDWV )
-            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
-   60    CONTINUE
+*              Compute  w := x - 1/2 * tau * (x**H * v) * v
 *
-*        ==== Update horizontal slab in H ====
+               ALPHA = -HALF*TAUI*ZDOTC( N-I, TAU( I ), 1, A( I+1, I ),
+     $                 1 )
+               CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, TAU( I ), 1 )
 *
-         IF( WANTT ) THEN
-            DO 70 KCOL = KBOT + 1, N, NH
-               KLN = MIN( NH, N-KCOL+1 )
-               CALL ZGEMM( 'C', 'N', JW, KLN, JW, ONE, V, LDV,
-     $                     H( KWTOP, KCOL ), LDH, ZERO, T, LDT )
-               CALL ZLACPY( 'A', JW, KLN, T, LDT, H( KWTOP, KCOL ),
-     $                      LDH )
-   70       CONTINUE
-         END IF
+*              Apply the transformation as a rank-2 update:
+*                 A := A - v * w**H - w * v**H
 *
-*        ==== Update vertical slab in Z ====
+               CALL ZHER2( UPLO, N-I, -ONE, A( I+1, I ), 1, TAU( I ), 1,
+     $                     A( I+1, I+1 ), LDA )
 *
-         IF( WANTZ ) THEN
-            DO 80 KROW = ILOZ, IHIZ, NV
-               KLN = MIN( NV, IHIZ-KROW+1 )
-               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
-     $                     LDZ, V, LDV, ZERO, WV, LDWV )
-               CALL ZLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
-     $                      LDZ )
-   80       CONTINUE
-         END IF
+            ELSE
+               A( I+1, I+1 ) = DBLE( A( I+1, I+1 ) )
+            END IF
+            A( I+1, I ) = E( I )
+            D( I ) = A( I, I )
+            TAU( I ) = TAUI
+   20    CONTINUE
+         D( N ) = A( N, N )
       END IF
 *
-*     ==== Return the number of deflations ... ====
-*
-      ND = JW - NS
-*
-*     ==== ... and the number of shifts. (Subtracting
-*     .    INFQR from the spike length takes care
-*     .    of the case of a rare QR failure while
-*     .    calculating eigenvalues of the deflation
-*     .    window.)  ====
-*
-      NS = NS - INFQR
-*
-*      ==== Return optimal workspace. ====
-*
-      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+      RETURN
 *
-*     ==== End of ZLAQR3 ====
+*     End of ZHETD2
 *
       END
-*> \brief \b ZLAQR4 computes the eigenvalues of a Hessenberg matrix, and optionally the matrices from the Schur decomposition.
+*> \brief \b ZHETRD
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -17569,27 +19467,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLAQR4 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr4.f"> 
+*> Download ZHETRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhetrd.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr4.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhetrd.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr4.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhetrd.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-*                          IHIZ, Z, LDZ, WORK, LWORK, INFO )
+*       SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
-*       LOGICAL            WANTT, WANTZ
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*       DOUBLE PRECISION   D( * ), E( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -17598,892 +19496,605 @@
 *>
 *> \verbatim
 *>
-*>    ZLAQR4 implements one level of recursion for ZLAQR0.
-*>    It is a complete implementation of the small bulge multi-shift
-*>    QR algorithm.  It may be called by ZLAQR0 and, for large enough
-*>    deflation window size, it may be called by ZLAQR3.  This
-*>    subroutine is identical to ZLAQR0 except that it calls ZLAQR2
-*>    instead of ZLAQR3.
-*>
-*>    ZLAQR4 computes the eigenvalues of a Hessenberg matrix H
-*>    and, optionally, the matrices T and Z from the Schur decomposition
-*>    H = Z T Z**H, where T is an upper triangular matrix (the
-*>    Schur form), and Z is the unitary matrix of Schur vectors.
-*>
-*>    Optionally Z may be postmultiplied into an input unitary
-*>    matrix Q so that this routine can give the Schur factorization
-*>    of a matrix A which has been reduced to the Hessenberg form H
-*>    by the unitary matrix Q:  A = Q*H*Q**H = (QZ)*H*(QZ)**H.
+*> ZHETRD reduces a complex Hermitian matrix A to real symmetric
+*> tridiagonal form T by a unitary similarity transformation:
+*> Q**H * A * Q = T.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] WANTT
-*> \verbatim
-*>          WANTT is LOGICAL
-*>          = .TRUE. : the full Schur form T is required;
-*>          = .FALSE.: only eigenvalues are required.
-*> \endverbatim
-*>
-*> \param[in] WANTZ
+*> \param[in] UPLO
 *> \verbatim
-*>          WANTZ is LOGICAL
-*>          = .TRUE. : the matrix of Schur vectors Z is required;
-*>          = .FALSE.: Schur vectors are not required.
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>           The order of the matrix H.  N .GE. 0.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] ILO
+*> \param[in,out] A
 *> \verbatim
-*>          ILO is INTEGER
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
+*>          N-by-N upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading N-by-N lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>          On exit, if UPLO = 'U', the diagonal and first superdiagonal
+*>          of A are overwritten by the corresponding elements of the
+*>          tridiagonal matrix T, and the elements above the first
+*>          superdiagonal, with the array TAU, represent the unitary
+*>          matrix Q as a product of elementary reflectors; if UPLO
+*>          = 'L', the diagonal and first subdiagonal of A are over-
+*>          written by the corresponding elements of the tridiagonal
+*>          matrix T, and the elements below the first subdiagonal, with
+*>          the array TAU, represent the unitary matrix Q as a product
+*>          of elementary reflectors. See Further Details.
 *> \endverbatim
 *>
-*> \param[in] IHI
+*> \param[in] LDA
 *> \verbatim
-*>          IHI is INTEGER
-*>           It is assumed that H is already upper triangular in rows
-*>           and columns 1:ILO-1 and IHI+1:N and, if ILO.GT.1,
-*>           H(ILO,ILO-1) is zero. ILO and IHI are normally set by a
-*>           previous call to ZGEBAL, and then passed to ZGEHRD when the
-*>           matrix output by ZGEBAL is reduced to Hessenberg form.
-*>           Otherwise, ILO and IHI should be set to 1 and N,
-*>           respectively.  If N.GT.0, then 1.LE.ILO.LE.IHI.LE.N.
-*>           If N = 0, then ILO = 1 and IHI = 0.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in,out] H
+*> \param[out] D
 *> \verbatim
-*>          H is COMPLEX*16 array, dimension (LDH,N)
-*>           On entry, the upper Hessenberg matrix H.
-*>           On exit, if INFO = 0 and WANTT is .TRUE., then H
-*>           contains the upper triangular matrix T from the Schur
-*>           decomposition (the Schur form). If INFO = 0 and WANT is
-*>           .FALSE., then the contents of H are unspecified on exit.
-*>           (The output value of H when INFO.GT.0 is given under the
-*>           description of INFO below.)
-*>
-*>           This subroutine may explicitly set H(i,j) = 0 for i.GT.j and
-*>           j = 1, 2, ... ILO-1 or j = IHI+1, IHI+2, ... N.
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>          The diagonal elements of the tridiagonal matrix T:
+*>          D(i) = A(i,i).
 *> \endverbatim
 *>
-*> \param[in] LDH
+*> \param[out] E
 *> \verbatim
-*>          LDH is INTEGER
-*>           The leading dimension of the array H. LDH .GE. max(1,N).
+*>          E is DOUBLE PRECISION array, dimension (N-1)
+*>          The off-diagonal elements of the tridiagonal matrix T:
+*>          E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.
 *> \endverbatim
 *>
-*> \param[out] W
+*> \param[out] TAU
 *> \verbatim
-*>          W is COMPLEX*16 array, dimension (N)
-*>           The computed eigenvalues of H(ILO:IHI,ILO:IHI) are stored
-*>           in W(ILO:IHI). If WANTT is .TRUE., then the eigenvalues are
-*>           stored in the same order as on the diagonal of the Schur
-*>           form returned in H, with W(i) = H(i,i).
+*>          TAU is COMPLEX*16 array, dimension (N-1)
+*>          The scalar factors of the elementary reflectors (see Further
+*>          Details).
 *> \endverbatim
 *>
-*> \param[in] ILOZ
+*> \param[out] WORK
 *> \verbatim
-*>          ILOZ is INTEGER
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] IHIZ
+*> \param[in] LWORK
 *> \verbatim
-*>          IHIZ is INTEGER
-*>           Specify the rows of Z to which transformations must be
-*>           applied if WANTZ is .TRUE..
-*>           1 .LE. ILOZ .LE. ILO; IHI .LE. IHIZ .LE. N.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= 1.
+*>          For optimum performance LWORK >= N*NB, where NB is the
+*>          optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[in,out] Z
+*> \param[out] INFO
 *> \verbatim
-*>          Z is COMPLEX*16 array, dimension (LDZ,IHI)
-*>           If WANTZ is .FALSE., then Z is not referenced.
-*>           If WANTZ is .TRUE., then Z(ILO:IHI,ILOZ:IHIZ) is
-*>           replaced by Z(ILO:IHI,ILOZ:IHIZ)*U where U is the
-*>           orthogonal Schur factor of H(ILO:IHI,ILO:IHI).
-*>           (The output value of Z when INFO.GT.0 is given under
-*>           the description of INFO below.)
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup complex16HEcomputational
+*
+*> \par Further Details:
+*  =====================
 *>
-*> \param[in] LDZ
 *> \verbatim
-*>          LDZ is INTEGER
-*>           The leading dimension of the array Z.  if WANTZ is .TRUE.
-*>           then LDZ.GE.MAX(1,IHIZ).  Otherwize, LDZ.GE.1.
-*> \endverbatim
 *>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension LWORK
-*>           On exit, if LWORK = -1, WORK(1) returns an estimate of
-*>           the optimal value for LWORK.
-*> \endverbatim
+*>  If UPLO = 'U', the matrix Q is represented as a product of elementary
+*>  reflectors
 *>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>           The dimension of the array WORK.  LWORK .GE. max(1,N)
-*>           is sufficient, but LWORK typically as large as 6*N may
-*>           be required for optimal performance.  A workspace query
-*>           to determine the optimal workspace size is recommended.
+*>     Q = H(n-1) . . . H(2) H(1).
 *>
-*>           If LWORK = -1, then ZLAQR4 does a workspace query.
-*>           In this case, ZLAQR4 checks the input parameters and
-*>           estimates the optimal workspace size for the given
-*>           values of N, ILO and IHI.  The estimate is returned
-*>           in WORK(1).  No error message related to LWORK is
-*>           issued by XERBLA.  Neither H nor Z are accessed.
-*> \endverbatim
+*>  Each H(i) has the form
 *>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>             =  0:  successful exit
-*>           .GT. 0:  if INFO = i, ZLAQR4 failed to compute all of
-*>                the eigenvalues.  Elements 1:ilo-1 and i+1:n of WR
-*>                and WI contain those eigenvalues which have been
-*>                successfully computed.  (Failures are rare.)
+*>     H(i) = I - tau * v * v**H
 *>
-*>                If INFO .GT. 0 and WANT is .FALSE., then on exit,
-*>                the remaining unconverged eigenvalues are the eigen-
-*>                values of the upper Hessenberg matrix rows and
-*>                columns ILO through INFO of the final, output
-*>                value of H.
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in
+*>  A(1:i-1,i+1), and tau in TAU(i).
 *>
-*>                If INFO .GT. 0 and WANTT is .TRUE., then on exit
+*>  If UPLO = 'L', the matrix Q is represented as a product of elementary
+*>  reflectors
 *>
-*>           (*)  (initial value of H)*U  = U*(final value of H)
+*>     Q = H(1) H(2) . . . H(n-1).
 *>
-*>                where U is a unitary matrix.  The final
-*>                value of  H is upper Hessenberg and triangular in
-*>                rows and columns INFO+1 through IHI.
+*>  Each H(i) has the form
 *>
-*>                If INFO .GT. 0 and WANTZ is .TRUE., then on exit
+*>     H(i) = I - tau * v * v**H
 *>
-*>                  (final value of Z(ILO:IHI,ILOZ:IHIZ)
-*>                   =  (initial value of Z(ILO:IHI,ILOZ:IHIZ)*U
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),
+*>  and tau in TAU(i).
 *>
-*>                where U is the unitary matrix in (*) (regard-
-*>                less of the value of WANTT.)
+*>  The contents of A on exit are illustrated by the following examples
+*>  with n = 5:
 *>
-*>                If INFO .GT. 0 and WANTZ is .FALSE., then Z is not
-*>                accessed.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
-*
-*> \par Contributors:
-*  ==================
+*>  if UPLO = 'U':                       if UPLO = 'L':
 *>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
-*
-*> \par References:
-*  ================
+*>    (  d   e   v2  v3  v4 )              (  d                  )
+*>    (      d   e   v3  v4 )              (  e   d              )
+*>    (          d   e   v4 )              (  v1  e   d          )
+*>    (              d   e  )              (  v1  v2  e   d      )
+*>    (                  d  )              (  v1  v2  v3  e   d  )
 *>
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
-*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
-*>       929--947, 2002.
-*> \n
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part II: Aggressive Early Deflation, SIAM Journal
-*>       of Matrix Analysis, volume 23, pages 948--973, 2002.
+*>  where d and e denote diagonal and off-diagonal elements of T, and vi
+*>  denotes an element of the vector defining H(i).
+*> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-     $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+      SUBROUTINE ZHETRD( UPLO, N, A, LDA, D, E, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
-      LOGICAL            WANTT, WANTZ
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+      DOUBLE PRECISION   D( * ), E( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
-*  ================================================================
+*  =====================================================================
 *
 *     .. Parameters ..
-*
-*     ==== Matrices of order NTINY or smaller must be processed by
-*     .    ZLAHQR because of insufficient subdiagonal scratch space.
-*     .    (This is a hard limit.) ====
-      INTEGER            NTINY
-      PARAMETER          ( NTINY = 11 )
-*
-*     ==== Exceptional deflation windows:  try to cure rare
-*     .    slow convergence by varying the size of the
-*     .    deflation window after KEXNW iterations. ====
-      INTEGER            KEXNW
-      PARAMETER          ( KEXNW = 5 )
-*
-*     ==== Exceptional shifts: try to cure rare slow convergence
-*     .    with ad-hoc exceptional shifts every KEXSH iterations.
-*     .    ====
-      INTEGER            KEXSH
-      PARAMETER          ( KEXSH = 6 )
-*
-*     ==== The constant WILK1 is used to form the exceptional
-*     .    shifts. ====
-      DOUBLE PRECISION   WILK1
-      PARAMETER          ( WILK1 = 0.75d0 )
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   TWO
-      PARAMETER          ( TWO = 2.0d0 )
+      DOUBLE PRECISION   ONE
+      PARAMETER          ( ONE = 1.0D+0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         AA, BB, CC, CDUM, DD, DET, RTDISC, SWAP, TR2
-      DOUBLE PRECISION   S
-      INTEGER            I, INF, IT, ITMAX, K, KACC22, KBOT, KDU, KS,
-     $                   KT, KTOP, KU, KV, KWH, KWTOP, KWV, LD, LS,
-     $                   LWKOPT, NDEC, NDFL, NH, NHO, NIBBLE, NMIN, NS,
-     $                   NSMAX, NSR, NVE, NW, NWMAX, NWR, NWUPBD
-      LOGICAL            SORTED
-      CHARACTER          JBCMPZ*2
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         ZDUM( 1, 1 )
+      LOGICAL            LQUERY, UPPER
+      INTEGER            I, IINFO, IWS, J, KK, LDWORK, LWKOPT, NB,
+     $                   NBMIN, NX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZLACPY, ZLAHQR, ZLAQR2, ZLAQR5
+      EXTERNAL           XERBLA, ZHER2K, ZHETD2, ZLATRD
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, MAX, MIN, MOD,
-     $                   SQRT
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
+      INTRINSIC          MAX
 *     ..
-*     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. Executable Statements ..
-      INFO = 0
 *
-*     ==== Quick return for N = 0: nothing to do. ====
+*     Test the input parameters
 *
-      IF( N.EQ.0 ) THEN
-         WORK( 1 ) = ONE
-         RETURN
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      ELSE IF( LWORK.LT.1 .AND. .NOT.LQUERY ) THEN
+         INFO = -9
       END IF
 *
-      IF( N.LE.NTINY ) THEN
-*
-*        ==== Tiny matrices must use ZLAHQR. ====
-*
-         LWKOPT = 1
-         IF( LWORK.NE.-1 )
-     $      CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
-     $                   IHIZ, Z, LDZ, INFO )
-      ELSE
-*
-*        ==== Use small bulge multi-shift QR with aggressive early
-*        .    deflation on larger-than-tiny matrices. ====
-*
-*        ==== Hope for the best. ====
-*
-         INFO = 0
-*
-*        ==== Set up job flags for ILAENV. ====
+      IF( INFO.EQ.0 ) THEN
 *
-         IF( WANTT ) THEN
-            JBCMPZ( 1: 1 ) = 'S'
-         ELSE
-            JBCMPZ( 1: 1 ) = 'E'
-         END IF
-         IF( WANTZ ) THEN
-            JBCMPZ( 2: 2 ) = 'V'
-         ELSE
-            JBCMPZ( 2: 2 ) = 'N'
-         END IF
+*        Determine the block size.
 *
-*        ==== NWR = recommended deflation window size.  At this
-*        .    point,  N .GT. NTINY = 11, so there is enough
-*        .    subdiagonal workspace for NWR.GE.2 as required.
-*        .    (In fact, there is enough subdiagonal space for
-*        .    NWR.GE.3.) ====
+         NB = ILAENV( 1, 'ZHETRD', UPLO, N, -1, -1, -1 )
+         LWKOPT = N*NB
+         WORK( 1 ) = LWKOPT
+      END IF
 *
-         NWR = ILAENV( 13, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
-         NWR = MAX( 2, NWR )
-         NWR = MIN( IHI-ILO+1, ( N-1 ) / 3, NWR )
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZHETRD', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-*        ==== NSR = recommended number of simultaneous shifts.
-*        .    At this point N .GT. NTINY = 11, so there is at
-*        .    enough subdiagonal workspace for NSR to be even
-*        .    and greater than or equal to two as required. ====
+*     Quick return if possible
 *
-         NSR = ILAENV( 15, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
-         NSR = MIN( NSR, ( N+6 ) / 9, IHI-ILO )
-         NSR = MAX( 2, NSR-MOD( NSR, 2 ) )
+      IF( N.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-*        ==== Estimate optimal workspace ====
+      NX = N
+      IWS = 1
+      IF( NB.GT.1 .AND. NB.LT.N ) THEN
 *
-*        ==== Workspace query call to ZLAQR2 ====
+*        Determine when to cross over from blocked to unblocked code
+*        (last block is always handled by unblocked code).
 *
-         CALL ZLAQR2( WANTT, WANTZ, N, ILO, IHI, NWR+1, H, LDH, ILOZ,
-     $                IHIZ, Z, LDZ, LS, LD, W, H, LDH, N, H, LDH, N, H,
-     $                LDH, WORK, -1 )
+         NX = MAX( NB, ILAENV( 3, 'ZHETRD', UPLO, N, -1, -1, -1 ) )
+         IF( NX.LT.N ) THEN
 *
-*        ==== Optimal workspace = MAX(ZLAQR5, ZLAQR2) ====
+*           Determine if workspace is large enough for blocked code.
 *
-         LWKOPT = MAX( 3*NSR / 2, INT( WORK( 1 ) ) )
+            LDWORK = N
+            IWS = LDWORK*NB
+            IF( LWORK.LT.IWS ) THEN
 *
-*        ==== Quick return in case of workspace query. ====
+*              Not enough workspace to use optimal NB:  determine the
+*              minimum value of NB, and reduce NB or force use of
+*              unblocked code by setting NX = N.
 *
-         IF( LWORK.EQ.-1 ) THEN
-            WORK( 1 ) = DCMPLX( LWKOPT, 0 )
-            RETURN
+               NB = MAX( LWORK / LDWORK, 1 )
+               NBMIN = ILAENV( 2, 'ZHETRD', UPLO, N, -1, -1, -1 )
+               IF( NB.LT.NBMIN )
+     $            NX = N
+            END IF
+         ELSE
+            NX = N
          END IF
+      ELSE
+         NB = 1
+      END IF
 *
-*        ==== ZLAHQR/ZLAQR0 crossover point ====
-*
-         NMIN = ILAENV( 12, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
-         NMIN = MAX( NTINY, NMIN )
+      IF( UPPER ) THEN
 *
-*        ==== Nibble crossover point ====
+*        Reduce the upper triangle of A.
+*        Columns 1:kk are handled by the unblocked method.
 *
-         NIBBLE = ILAENV( 14, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
-         NIBBLE = MAX( 0, NIBBLE )
+         KK = N - ( ( N-NX+NB-1 ) / NB )*NB
+         DO 20 I = N - NB + 1, KK + 1, -NB
 *
-*        ==== Accumulate reflections during ttswp?  Use block
-*        .    2-by-2 structure during matrix-matrix multiply? ====
+*           Reduce columns i:i+nb-1 to tridiagonal form and form the
+*           matrix W which is needed to update the unreduced part of
+*           the matrix
 *
-         KACC22 = ILAENV( 16, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
-         KACC22 = MAX( 0, KACC22 )
-         KACC22 = MIN( 2, KACC22 )
+            CALL ZLATRD( UPLO, I+NB-1, NB, A, LDA, E, TAU, WORK,
+     $                   LDWORK )
 *
-*        ==== NWMAX = the largest possible deflation window for
-*        .    which there is sufficient workspace. ====
+*           Update the unreduced submatrix A(1:i-1,1:i-1), using an
+*           update of the form:  A := A - V*W**H - W*V**H
 *
-         NWMAX = MIN( ( N-1 ) / 3, LWORK / 2 )
-         NW = NWMAX
+            CALL ZHER2K( UPLO, 'No transpose', I-1, NB, -CONE,
+     $                   A( 1, I ), LDA, WORK, LDWORK, ONE, A, LDA )
 *
-*        ==== NSMAX = the Largest number of simultaneous shifts
-*        .    for which there is sufficient workspace. ====
+*           Copy superdiagonal elements back into A, and diagonal
+*           elements into D
 *
-         NSMAX = MIN( ( N+6 ) / 9, 2*LWORK / 3 )
-         NSMAX = NSMAX - MOD( NSMAX, 2 )
+            DO 10 J = I, I + NB - 1
+               A( J-1, J ) = E( J-1 )
+               D( J ) = A( J, J )
+   10       CONTINUE
+   20    CONTINUE
 *
-*        ==== NDFL: an iteration count restarted at deflation. ====
+*        Use unblocked code to reduce the last or only block
 *
-         NDFL = 1
+         CALL ZHETD2( UPLO, KK, A, LDA, D, E, TAU, IINFO )
+      ELSE
 *
-*        ==== ITMAX = iteration limit ====
+*        Reduce the lower triangle of A
 *
-         ITMAX = MAX( 30, 2*KEXSH )*MAX( 10, ( IHI-ILO+1 ) )
+         DO 40 I = 1, N - NX, NB
 *
-*        ==== Last row and column in the active block ====
+*           Reduce columns i:i+nb-1 to tridiagonal form and form the
+*           matrix W which is needed to update the unreduced part of
+*           the matrix
 *
-         KBOT = IHI
+            CALL ZLATRD( UPLO, N-I+1, NB, A( I, I ), LDA, E( I ),
+     $                   TAU( I ), WORK, LDWORK )
 *
-*        ==== Main Loop ====
+*           Update the unreduced submatrix A(i+nb:n,i+nb:n), using
+*           an update of the form:  A := A - V*W**H - W*V**H
 *
-         DO 70 IT = 1, ITMAX
+            CALL ZHER2K( UPLO, 'No transpose', N-I-NB+1, NB, -CONE,
+     $                   A( I+NB, I ), LDA, WORK( NB+1 ), LDWORK, ONE,
+     $                   A( I+NB, I+NB ), LDA )
 *
-*           ==== Done when KBOT falls below ILO ====
+*           Copy subdiagonal elements back into A, and diagonal
+*           elements into D
 *
-            IF( KBOT.LT.ILO )
-     $         GO TO 80
+            DO 30 J = I, I + NB - 1
+               A( J+1, J ) = E( J )
+               D( J ) = A( J, J )
+   30       CONTINUE
+   40    CONTINUE
 *
-*           ==== Locate active block ====
+*        Use unblocked code to reduce the last or only block
 *
-            DO 10 K = KBOT, ILO + 1, -1
-               IF( H( K, K-1 ).EQ.ZERO )
-     $            GO TO 20
-   10       CONTINUE
-            K = ILO
-   20       CONTINUE
-            KTOP = K
+         CALL ZHETD2( UPLO, N-I+1, A( I, I ), LDA, D( I ), E( I ),
+     $                TAU( I ), IINFO )
+      END IF
 *
-*           ==== Select deflation window size:
-*           .    Typical Case:
-*           .      If possible and advisable, nibble the entire
-*           .      active block.  If not, use size MIN(NWR,NWMAX)
-*           .      or MIN(NWR+1,NWMAX) depending upon which has
-*           .      the smaller corresponding subdiagonal entry
-*           .      (a heuristic).
-*           .
-*           .    Exceptional Case:
-*           .      If there have been no deflations in KEXNW or
-*           .      more iterations, then vary the deflation window
-*           .      size.   At first, because, larger windows are,
-*           .      in general, more powerful than smaller ones,
-*           .      rapidly increase the window to the maximum possible.
-*           .      Then, gradually reduce the window size. ====
+      WORK( 1 ) = LWKOPT
+      RETURN
 *
-            NH = KBOT - KTOP + 1
-            NWUPBD = MIN( NH, NWMAX )
-            IF( NDFL.LT.KEXNW ) THEN
-               NW = MIN( NWUPBD, NWR )
-            ELSE
-               NW = MIN( NWUPBD, 2*NW )
-            END IF
-            IF( NW.LT.NWMAX ) THEN
-               IF( NW.GE.NH-1 ) THEN
-                  NW = NH
-               ELSE
-                  KWTOP = KBOT - NW + 1
-                  IF( CABS1( H( KWTOP, KWTOP-1 ) ).GT.
-     $                CABS1( H( KWTOP-1, KWTOP-2 ) ) )NW = NW + 1
-               END IF
-            END IF
-            IF( NDFL.LT.KEXNW ) THEN
-               NDEC = -1
-            ELSE IF( NDEC.GE.0 .OR. NW.GE.NWUPBD ) THEN
-               NDEC = NDEC + 1
-               IF( NW-NDEC.LT.2 )
-     $            NDEC = 0
-               NW = NW - NDEC
-            END IF
+*     End of ZHETRD
 *
-*           ==== Aggressive early deflation:
-*           .    split workspace under the subdiagonal into
-*           .      - an nw-by-nw work array V in the lower
-*           .        left-hand-corner,
-*           .      - an NW-by-at-least-NW-but-more-is-better
-*           .        (NW-by-NHO) horizontal work array along
-*           .        the bottom edge,
-*           .      - an at-least-NW-but-more-is-better (NHV-by-NW)
-*           .        vertical work array along the left-hand-edge.
-*           .        ====
+      END
+*> \brief \b ZHGEQZ
 *
-            KV = N - NW + 1
-            KT = NW + 1
-            NHO = ( N-NW-1 ) - KT + 1
-            KWV = NW + 2
-            NVE = ( N-NW ) - KWV + 1
+*  =========== DOCUMENTATION ===========
 *
-*           ==== Aggressive early deflation ====
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-            CALL ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
-     $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
-     $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
-     $                   LWORK )
+*> \htmlonly
+*> Download ZHGEQZ + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhgeqz.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhgeqz.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhgeqz.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*           ==== Adjust KBOT accounting for new deflations. ====
+*  Definition:
+*  ===========
 *
-            KBOT = KBOT - LD
+*       SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
+*                          ALPHA, BETA, Q, LDQ, Z, LDZ, WORK, LWORK,
+*                          RWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          COMPQ, COMPZ, JOB
+*       INTEGER            IHI, ILO, INFO, LDH, LDQ, LDT, LDZ, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         ALPHA( * ), BETA( * ), H( LDH, * ),
+*      $                   Q( LDQ, * ), T( LDT, * ), WORK( * ),
+*      $                   Z( LDZ, * )
+*       ..
+*  
 *
-*           ==== KS points to the shifts. ====
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZHGEQZ computes the eigenvalues of a complex matrix pair (H,T),
+*> where H is an upper Hessenberg matrix and T is upper triangular,
+*> using the single-shift QZ method.
+*> Matrix pairs of this type are produced by the reduction to
+*> generalized upper Hessenberg form of a complex matrix pair (A,B):
+*> 
+*>    A = Q1*H*Z1**H,  B = Q1*T*Z1**H,
+*> 
+*> as computed by ZGGHRD.
+*> 
+*> If JOB='S', then the Hessenberg-triangular pair (H,T) is
+*> also reduced to generalized Schur form,
+*> 
+*>    H = Q*S*Z**H,  T = Q*P*Z**H,
+*> 
+*> where Q and Z are unitary matrices and S and P are upper triangular.
+*> 
+*> Optionally, the unitary matrix Q from the generalized Schur
+*> factorization may be postmultiplied into an input matrix Q1, and the
+*> unitary matrix Z may be postmultiplied into an input matrix Z1.
+*> If Q1 and Z1 are the unitary matrices from ZGGHRD that reduced
+*> the matrix pair (A,B) to generalized Hessenberg form, then the output
+*> matrices Q1*Q and Z1*Z are the unitary factors from the generalized
+*> Schur factorization of (A,B):
+*> 
+*>    A = (Q1*Q)*S*(Z1*Z)**H,  B = (Q1*Q)*P*(Z1*Z)**H.
+*> 
+*> To avoid overflow, eigenvalues of the matrix pair (H,T)
+*> (equivalently, of (A,B)) are computed as a pair of complex values
+*> (alpha,beta).  If beta is nonzero, lambda = alpha / beta is an
+*> eigenvalue of the generalized nonsymmetric eigenvalue problem (GNEP)
+*>    A*x = lambda*B*x
+*> and if alpha is nonzero, mu = beta / alpha is an eigenvalue of the
+*> alternate form of the GNEP
+*>    mu*A*y = B*y.
+*> The values of alpha and beta for the i-th eigenvalue can be read
+*> directly from the generalized Schur form:  alpha = S(i,i),
+*> beta = P(i,i).
+*>
+*> Ref: C.B. Moler & G.W. Stewart, "An Algorithm for Generalized Matrix
+*>      Eigenvalue Problems", SIAM J. Numer. Anal., 10(1973),
+*>      pp. 241--256.
+*> \endverbatim
 *
-            KS = KBOT - LS + 1
+*  Arguments:
+*  ==========
 *
-*           ==== Skip an expensive QR sweep if there is a (partly
-*           .    heuristic) reason to expect that many eigenvalues
-*           .    will deflate without it.  Here, the QR sweep is
-*           .    skipped if many eigenvalues have just been deflated
-*           .    or if the remaining active block is small.
-*
-            IF( ( LD.EQ.0 ) .OR. ( ( 100*LD.LE.NW*NIBBLE ) .AND. ( KBOT-
-     $          KTOP+1.GT.MIN( NMIN, NWMAX ) ) ) ) THEN
-*
-*              ==== NS = nominal number of simultaneous shifts.
-*              .    This may be lowered (slightly) if ZLAQR2
-*              .    did not provide that many shifts. ====
-*
-               NS = MIN( NSMAX, NSR, MAX( 2, KBOT-KTOP ) )
-               NS = NS - MOD( NS, 2 )
-*
-*              ==== If there have been no deflations
-*              .    in a multiple of KEXSH iterations,
-*              .    then try exceptional shifts.
-*              .    Otherwise use shifts provided by
-*              .    ZLAQR2 above or from the eigenvalues
-*              .    of a trailing principal submatrix. ====
-*
-               IF( MOD( NDFL, KEXSH ).EQ.0 ) THEN
-                  KS = KBOT - NS + 1
-                  DO 30 I = KBOT, KS + 1, -2
-                     W( I ) = H( I, I ) + WILK1*CABS1( H( I, I-1 ) )
-                     W( I-1 ) = W( I )
-   30             CONTINUE
-               ELSE
-*
-*                 ==== Got NS/2 or fewer shifts? Use ZLAHQR
-*                 .    on a trailing principal submatrix to
-*                 .    get more. (Since NS.LE.NSMAX.LE.(N+6)/9,
-*                 .    there is enough space below the subdiagonal
-*                 .    to fit an NS-by-NS scratch array.) ====
-*
-                  IF( KBOT-KS+1.LE.NS / 2 ) THEN
-                     KS = KBOT - NS + 1
-                     KT = N - NS + 1
-                     CALL ZLACPY( 'A', NS, NS, H( KS, KS ), LDH,
-     $                            H( KT, 1 ), LDH )
-                     CALL ZLAHQR( .false., .false., NS, 1, NS,
-     $                            H( KT, 1 ), LDH, W( KS ), 1, 1, ZDUM,
-     $                            1, INF )
-                     KS = KS + INF
-*
-*                    ==== In case of a rare QR failure use
-*                    .    eigenvalues of the trailing 2-by-2
-*                    .    principal submatrix.  Scale to avoid
-*                    .    overflows, underflows and subnormals.
-*                    .    (The scale factor S can not be zero,
-*                    .    because H(KBOT,KBOT-1) is nonzero.) ====
-*
-                     IF( KS.GE.KBOT ) THEN
-                        S = CABS1( H( KBOT-1, KBOT-1 ) ) +
-     $                      CABS1( H( KBOT, KBOT-1 ) ) +
-     $                      CABS1( H( KBOT-1, KBOT ) ) +
-     $                      CABS1( H( KBOT, KBOT ) )
-                        AA = H( KBOT-1, KBOT-1 ) / S
-                        CC = H( KBOT, KBOT-1 ) / S
-                        BB = H( KBOT-1, KBOT ) / S
-                        DD = H( KBOT, KBOT ) / S
-                        TR2 = ( AA+DD ) / TWO
-                        DET = ( AA-TR2 )*( DD-TR2 ) - BB*CC
-                        RTDISC = SQRT( -DET )
-                        W( KBOT-1 ) = ( TR2+RTDISC )*S
-                        W( KBOT ) = ( TR2-RTDISC )*S
-*
-                        KS = KBOT - 1
-                     END IF
-                  END IF
-*
-                  IF( KBOT-KS+1.GT.NS ) THEN
-*
-*                    ==== Sort the shifts (Helps a little) ====
-*
-                     SORTED = .false.
-                     DO 50 K = KBOT, KS + 1, -1
-                        IF( SORTED )
-     $                     GO TO 60
-                        SORTED = .true.
-                        DO 40 I = KS, K - 1
-                           IF( CABS1( W( I ) ).LT.CABS1( W( I+1 ) ) )
-     $                          THEN
-                              SORTED = .false.
-                              SWAP = W( I )
-                              W( I ) = W( I+1 )
-                              W( I+1 ) = SWAP
-                           END IF
-   40                   CONTINUE
-   50                CONTINUE
-   60                CONTINUE
-                  END IF
-               END IF
-*
-*              ==== If there are only two shifts, then use
-*              .    only one.  ====
-*
-               IF( KBOT-KS+1.EQ.2 ) THEN
-                  IF( CABS1( W( KBOT )-H( KBOT, KBOT ) ).LT.
-     $                CABS1( W( KBOT-1 )-H( KBOT, KBOT ) ) ) THEN
-                     W( KBOT-1 ) = W( KBOT )
-                  ELSE
-                     W( KBOT ) = W( KBOT-1 )
-                  END IF
-               END IF
-*
-*              ==== Use up to NS of the the smallest magnatiude
-*              .    shifts.  If there aren't NS shifts available,
-*              .    then use them all, possibly dropping one to
-*              .    make the number of shifts even. ====
-*
-               NS = MIN( NS, KBOT-KS+1 )
-               NS = NS - MOD( NS, 2 )
-               KS = KBOT - NS + 1
-*
-*              ==== Small-bulge multi-shift QR sweep:
-*              .    split workspace under the subdiagonal into
-*              .    - a KDU-by-KDU work array U in the lower
-*              .      left-hand-corner,
-*              .    - a KDU-by-at-least-KDU-but-more-is-better
-*              .      (KDU-by-NHo) horizontal work array WH along
-*              .      the bottom edge,
-*              .    - and an at-least-KDU-but-more-is-better-by-KDU
-*              .      (NVE-by-KDU) vertical work WV arrow along
-*              .      the left-hand-edge. ====
-*
-               KDU = 3*NS - 3
-               KU = N - KDU + 1
-               KWH = KDU + 1
-               NHO = ( N-KDU+1-4 ) - ( KDU+1 ) + 1
-               KWV = KDU + 4
-               NVE = N - KDU - KWV + 1
-*
-*              ==== Small-bulge multi-shift QR sweep ====
-*
-               CALL ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NS,
-     $                      W( KS ), H, LDH, ILOZ, IHIZ, Z, LDZ, WORK,
-     $                      3, H( KU, 1 ), LDH, NVE, H( KWV, 1 ), LDH,
-     $                      NHO, H( KU, KWH ), LDH )
-            END IF
-*
-*           ==== Note progress (or the lack of it). ====
-*
-            IF( LD.GT.0 ) THEN
-               NDFL = 1
-            ELSE
-               NDFL = NDFL + 1
-            END IF
-*
-*           ==== End of main loop ====
-   70    CONTINUE
-*
-*        ==== Iteration limit exceeded.  Set INFO to show where
-*        .    the problem occurred and exit. ====
-*
-         INFO = KBOT
-   80    CONTINUE
-      END IF
-*
-*     ==== Return the optimal value of LWORK. ====
-*
-      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
-*
-*     ==== End of ZLAQR4 ====
-*
-      END
-*> \brief \b ZLAQR5 performs a single small-bulge multi-shift QR sweep.
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download ZLAQR5 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr5.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr5.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr5.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
-*                          H, LDH, ILOZ, IHIZ, Z, LDZ, V, LDV, U, LDU, NV,
-*                          WV, LDWV, NH, WH, LDWH )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            IHIZ, ILOZ, KACC22, KBOT, KTOP, LDH, LDU, LDV,
-*      $                   LDWH, LDWV, LDZ, N, NH, NSHFTS, NV
-*       LOGICAL            WANTT, WANTZ
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         H( LDH, * ), S( * ), U( LDU, * ), V( LDV, * ),
-*      $                   WH( LDWH, * ), WV( LDWV, * ), Z( LDZ, * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*>    ZLAQR5, called by ZLAQR0, performs a
-*>    single small-bulge multi-shift QR sweep.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] WANTT
+*> \param[in] JOB
 *> \verbatim
-*>          WANTT is logical scalar
-*>             WANTT = .true. if the triangular Schur factor
-*>             is being computed.  WANTT is set to .false. otherwise.
+*>          JOB is CHARACTER*1
+*>          = 'E': Compute eigenvalues only;
+*>          = 'S': Computer eigenvalues and the Schur form.
 *> \endverbatim
 *>
-*> \param[in] WANTZ
+*> \param[in] COMPQ
 *> \verbatim
-*>          WANTZ is logical scalar
-*>             WANTZ = .true. if the unitary Schur factor is being
-*>             computed.  WANTZ is set to .false. otherwise.
+*>          COMPQ is CHARACTER*1
+*>          = 'N': Left Schur vectors (Q) are not computed;
+*>          = 'I': Q is initialized to the unit matrix and the matrix Q
+*>                 of left Schur vectors of (H,T) is returned;
+*>          = 'V': Q must contain a unitary matrix Q1 on entry and
+*>                 the product Q1*Q is returned.
 *> \endverbatim
 *>
-*> \param[in] KACC22
+*> \param[in] COMPZ
 *> \verbatim
-*>          KACC22 is integer with value 0, 1, or 2.
-*>             Specifies the computation mode of far-from-diagonal
-*>             orthogonal updates.
-*>        = 0: ZLAQR5 does not accumulate reflections and does not
-*>             use matrix-matrix multiply to update far-from-diagonal
-*>             matrix entries.
-*>        = 1: ZLAQR5 accumulates reflections and uses matrix-matrix
-*>             multiply to update the far-from-diagonal matrix entries.
-*>        = 2: ZLAQR5 accumulates reflections, uses matrix-matrix
-*>             multiply to update the far-from-diagonal matrix entries,
-*>             and takes advantage of 2-by-2 block structure during
-*>             matrix multiplies.
+*>          COMPZ is CHARACTER*1
+*>          = 'N': Right Schur vectors (Z) are not computed;
+*>          = 'I': Q is initialized to the unit matrix and the matrix Z
+*>                 of right Schur vectors of (H,T) is returned;
+*>          = 'V': Z must contain a unitary matrix Z1 on entry and
+*>                 the product Z1*Z is returned.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
-*>          N is integer scalar
-*>             N is the order of the Hessenberg matrix H upon which this
-*>             subroutine operates.
-*> \endverbatim
-*>
-*> \param[in] KTOP
-*> \verbatim
-*>          KTOP is integer scalar
-*> \endverbatim
-*>
-*> \param[in] KBOT
-*> \verbatim
-*>          KBOT is integer scalar
-*>             These are the first and last rows and columns of an
-*>             isolated diagonal block upon which the QR sweep is to be
-*>             applied. It is assumed without a check that
-*>                       either KTOP = 1  or   H(KTOP,KTOP-1) = 0
-*>             and
-*>                       either KBOT = N  or   H(KBOT+1,KBOT) = 0.
+*>          N is INTEGER
+*>          The order of the matrices H, T, Q, and Z.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] NSHFTS
+*> \param[in] ILO
 *> \verbatim
-*>          NSHFTS is integer scalar
-*>             NSHFTS gives the number of simultaneous shifts.  NSHFTS
-*>             must be positive and even.
+*>          ILO is INTEGER
 *> \endverbatim
 *>
-*> \param[in,out] S
+*> \param[in] IHI
 *> \verbatim
-*>          S is COMPLEX*16 array of size (NSHFTS)
-*>             S contains the shifts of origin that define the multi-
-*>             shift QR sweep.  On output S may be reordered.
+*>          IHI is INTEGER
+*>          ILO and IHI mark the rows and columns of H which are in
+*>          Hessenberg form.  It is assumed that A is already upper
+*>          triangular in rows and columns 1:ILO-1 and IHI+1:N.
+*>          If N > 0, 1 <= ILO <= IHI <= N; if N = 0, ILO=1 and IHI=0.
 *> \endverbatim
 *>
 *> \param[in,out] H
 *> \verbatim
-*>          H is COMPLEX*16 array of size (LDH,N)
-*>             On input H contains a Hessenberg matrix.  On output a
-*>             multi-shift QR sweep with shifts SR(J)+i*SI(J) is applied
-*>             to the isolated diagonal block in rows and columns KTOP
-*>             through KBOT.
+*>          H is COMPLEX*16 array, dimension (LDH, N)
+*>          On entry, the N-by-N upper Hessenberg matrix H.
+*>          On exit, if JOB = 'S', H contains the upper triangular
+*>          matrix S from the generalized Schur factorization.
+*>          If JOB = 'E', the diagonal of H matches that of S, but
+*>          the rest of H is unspecified.
 *> \endverbatim
 *>
 *> \param[in] LDH
 *> \verbatim
-*>          LDH is integer scalar
-*>             LDH is the leading dimension of H just as declared in the
-*>             calling procedure.  LDH.GE.MAX(1,N).
+*>          LDH is INTEGER
+*>          The leading dimension of the array H.  LDH >= max( 1, N ).
 *> \endverbatim
 *>
-*> \param[in] ILOZ
+*> \param[in,out] T
 *> \verbatim
-*>          ILOZ is INTEGER
+*>          T is COMPLEX*16 array, dimension (LDT, N)
+*>          On entry, the N-by-N upper triangular matrix T.
+*>          On exit, if JOB = 'S', T contains the upper triangular
+*>          matrix P from the generalized Schur factorization.
+*>          If JOB = 'E', the diagonal of T matches that of P, but
+*>          the rest of T is unspecified.
 *> \endverbatim
 *>
-*> \param[in] IHIZ
+*> \param[in] LDT
 *> \verbatim
-*>          IHIZ is INTEGER
-*>             Specify the rows of Z to which transformations must be
-*>             applied if WANTZ is .TRUE.. 1 .LE. ILOZ .LE. IHIZ .LE. N
+*>          LDT is INTEGER
+*>          The leading dimension of the array T.  LDT >= max( 1, N ).
 *> \endverbatim
 *>
-*> \param[in,out] Z
+*> \param[out] ALPHA
 *> \verbatim
-*>          Z is COMPLEX*16 array of size (LDZ,IHI)
-*>             If WANTZ = .TRUE., then the QR Sweep unitary
-*>             similarity transformation is accumulated into
-*>             Z(ILOZ:IHIZ,ILO:IHI) from the right.
-*>             If WANTZ = .FALSE., then Z is unreferenced.
+*>          ALPHA is COMPLEX*16 array, dimension (N)
+*>          The complex scalars alpha that define the eigenvalues of
+*>          GNEP.  ALPHA(i) = S(i,i) in the generalized Schur
+*>          factorization.
 *> \endverbatim
 *>
-*> \param[in] LDZ
+*> \param[out] BETA
 *> \verbatim
-*>          LDZ is integer scalar
-*>             LDA is the leading dimension of Z just as declared in
-*>             the calling procedure. LDZ.GE.N.
-*> \endverbatim
+*>          BETA is COMPLEX*16 array, dimension (N)
+*>          The real non-negative scalars beta that define the
+*>          eigenvalues of GNEP.  BETA(i) = P(i,i) in the generalized
+*>          Schur factorization.
 *>
-*> \param[out] V
-*> \verbatim
-*>          V is COMPLEX*16 array of size (LDV,NSHFTS/2)
+*>          Together, the quantities alpha = ALPHA(j) and beta = BETA(j)
+*>          represent the j-th eigenvalue of the matrix pair (A,B), in
+*>          one of the forms lambda = alpha/beta or mu = beta/alpha.
+*>          Since either lambda or mu may overflow, they should not,
+*>          in general, be computed.
 *> \endverbatim
 *>
-*> \param[in] LDV
+*> \param[in,out] Q
 *> \verbatim
-*>          LDV is integer scalar
-*>             LDV is the leading dimension of V as declared in the
-*>             calling procedure.  LDV.GE.3.
+*>          Q is COMPLEX*16 array, dimension (LDQ, N)
+*>          On entry, if COMPZ = 'V', the unitary matrix Q1 used in the
+*>          reduction of (A,B) to generalized Hessenberg form.
+*>          On exit, if COMPZ = 'I', the unitary matrix of left Schur
+*>          vectors of (H,T), and if COMPZ = 'V', the unitary matrix of
+*>          left Schur vectors of (A,B).
+*>          Not referenced if COMPZ = 'N'.
 *> \endverbatim
 *>
-*> \param[out] U
+*> \param[in] LDQ
 *> \verbatim
-*>          U is COMPLEX*16 array of size
-*>             (LDU,3*NSHFTS-3)
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q.  LDQ >= 1.
+*>          If COMPQ='V' or 'I', then LDQ >= N.
 *> \endverbatim
 *>
-*> \param[in] LDU
+*> \param[in,out] Z
 *> \verbatim
-*>          LDU is integer scalar
-*>             LDU is the leading dimension of U just as declared in the
-*>             in the calling subroutine.  LDU.GE.3*NSHFTS-3.
+*>          Z is COMPLEX*16 array, dimension (LDZ, N)
+*>          On entry, if COMPZ = 'V', the unitary matrix Z1 used in the
+*>          reduction of (A,B) to generalized Hessenberg form.
+*>          On exit, if COMPZ = 'I', the unitary matrix of right Schur
+*>          vectors of (H,T), and if COMPZ = 'V', the unitary matrix of
+*>          right Schur vectors of (A,B).
+*>          Not referenced if COMPZ = 'N'.
 *> \endverbatim
 *>
-*> \param[in] NH
+*> \param[in] LDZ
 *> \verbatim
-*>          NH is integer scalar
-*>             NH is the number of columns in array WH available for
-*>             workspace. NH.GE.1.
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z.  LDZ >= 1.
+*>          If COMPZ='V' or 'I', then LDZ >= N.
 *> \endverbatim
 *>
-*> \param[out] WH
+*> \param[out] WORK
 *> \verbatim
-*>          WH is COMPLEX*16 array of size (LDWH,NH)
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO >= 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] LDWH
+*> \param[in] LWORK
 *> \verbatim
-*>          LDWH is integer scalar
-*>             Leading dimension of WH just as declared in the
-*>             calling procedure.  LDWH.GE.3*NSHFTS-3.
-*> \endverbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,N).
 *>
-*> \param[in] NV
-*> \verbatim
-*>          NV is integer scalar
-*>             NV is the number of rows in WV agailable for workspace.
-*>             NV.GE.1.
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[out] WV
+*> \param[out] RWORK
 *> \verbatim
-*>          WV is COMPLEX*16 array of size
-*>             (LDWV,3*NSHFTS-3)
+*>          RWORK is DOUBLE PRECISION array, dimension (N)
 *> \endverbatim
 *>
-*> \param[in] LDWV
+*> \param[out] INFO
 *> \verbatim
-*>          LDWV is integer scalar
-*>             LDWV is the leading dimension of WV as declared in the
-*>             in the calling subroutine.  LDWV.GE.NV.
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          = 1,...,N: the QZ iteration did not converge.  (H,T) is not
+*>                     in Schur form, but ALPHA(i) and BETA(i),
+*>                     i=INFO+1,...,N should be correct.
+*>          = N+1,...,2*N: the shift calculation failed.  (H,T) is not
+*>                     in Schur form, but ALPHA(i) and BETA(i),
+*>                     i=INFO-N+1,...,N should be correct.
 *> \endverbatim
 *
 *  Authors:
@@ -18494,687 +20105,16191 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date April 2012
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16GEcomputational
 *
-*> \par Contributors:
-*  ==================
+*> \par Further Details:
+*  =====================
 *>
-*>       Karen Braman and Ralph Byers, Department of Mathematics,
-*>       University of Kansas, USA
-*
-*> \par References:
-*  ================
+*> \verbatim
 *>
-*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
-*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
-*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
-*>       929--947, 2002.
+*>  We assume that complex ABS works as long as its value is less than
+*>  overflow.
+*> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
-     $                   H, LDH, ILOZ, IHIZ, Z, LDZ, V, LDV, U, LDU, NV,
-     $                   WV, LDWV, NH, WH, LDWH )
+      SUBROUTINE ZHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
+     $                   ALPHA, BETA, Q, LDQ, Z, LDZ, WORK, LWORK,
+     $                   RWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     April 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHIZ, ILOZ, KACC22, KBOT, KTOP, LDH, LDU, LDV,
-     $                   LDWH, LDWV, LDZ, N, NH, NSHFTS, NV
-      LOGICAL            WANTT, WANTZ
+      CHARACTER          COMPQ, COMPZ, JOB
+      INTEGER            IHI, ILO, INFO, LDH, LDQ, LDT, LDZ, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         H( LDH, * ), S( * ), U( LDU, * ), V( LDV, * ),
-     $                   WH( LDWH, * ), WV( LDWV, * ), Z( LDZ, * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         ALPHA( * ), BETA( * ), H( LDH, * ),
+     $                   Q( LDQ, * ), T( LDT, * ), WORK( * ),
+     $                   Z( LDZ, * )
 *     ..
 *
-*  ================================================================
+*  =====================================================================
+*
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
-     $                   ONE = ( 1.0d0, 0.0d0 ) )
-      DOUBLE PRECISION   RZERO, RONE
-      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      DOUBLE PRECISION   HALF
+      PARAMETER          ( HALF = 0.5D+0 )
 *     ..
 *     .. Local Scalars ..
-      COMPLEX*16         ALPHA, BETA, CDUM, REFSUM
-      DOUBLE PRECISION   H11, H12, H21, H22, SAFMAX, SAFMIN, SCL,
-     $                   SMLNUM, TST1, TST2, ULP
-      INTEGER            I2, I4, INCOL, J, J2, J4, JBOT, JCOL, JLEN,
-     $                   JROW, JTOP, K, K1, KDU, KMS, KNZ, KRCOL, KZS,
-     $                   M, M22, MBOT, MEND, MSTART, MTOP, NBMPS, NDCOL,
-     $                   NS, NU
-      LOGICAL            ACCUM, BLK22, BMP22
+      LOGICAL            ILAZR2, ILAZRO, ILQ, ILSCHR, ILZ, LQUERY
+      INTEGER            ICOMPQ, ICOMPZ, IFIRST, IFRSTM, IITER, ILAST,
+     $                   ILASTM, IN, ISCHUR, ISTART, J, JC, JCH, JITER,
+     $                   JR, MAXIT
+      DOUBLE PRECISION   ABSB, ANORM, ASCALE, ATOL, BNORM, BSCALE, BTOL,
+     $                   C, SAFMIN, TEMP, TEMP2, TEMPR, ULP
+      COMPLEX*16         ABI22, AD11, AD12, AD21, AD22, CTEMP, CTEMP2,
+     $                   CTEMP3, ESHIFT, RTDISC, S, SHIFT, SIGNBC, T1,
+     $                   U12, X
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMCH
-      EXTERNAL           DLAMCH
-*     ..
-*     .. Intrinsic Functions ..
-*
-      INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, MOD
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         VT( 3 )
+      LOGICAL            LSAME
+      DOUBLE PRECISION   DLAMCH, ZLANHS
+      EXTERNAL           LSAME, DLAMCH, ZLANHS
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLABAD, ZGEMM, ZLACPY, ZLAQR1, ZLARFG, ZLASET,
-     $                   ZTRMM
+      EXTERNAL           XERBLA, ZLARTG, ZLASET, ZROT, ZSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN,
+     $                   SQRT
 *     ..
 *     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
+      DOUBLE PRECISION   ABS1
 *     ..
 *     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+      ABS1( X ) = ABS( DBLE( X ) ) + ABS( DIMAG( X ) )
 *     ..
 *     .. Executable Statements ..
 *
-*     ==== If there are no shifts, then there is nothing to do. ====
+*     Decode JOB, COMPQ, COMPZ
 *
-      IF( NSHFTS.LT.2 )
-     $   RETURN
+      IF( LSAME( JOB, 'E' ) ) THEN
+         ILSCHR = .FALSE.
+         ISCHUR = 1
+      ELSE IF( LSAME( JOB, 'S' ) ) THEN
+         ILSCHR = .TRUE.
+         ISCHUR = 2
+      ELSE
+         ISCHUR = 0
+      END IF
 *
-*     ==== If the active block is empty or 1-by-1, then there
-*     .    is nothing to do. ====
+      IF( LSAME( COMPQ, 'N' ) ) THEN
+         ILQ = .FALSE.
+         ICOMPQ = 1
+      ELSE IF( LSAME( COMPQ, 'V' ) ) THEN
+         ILQ = .TRUE.
+         ICOMPQ = 2
+      ELSE IF( LSAME( COMPQ, 'I' ) ) THEN
+         ILQ = .TRUE.
+         ICOMPQ = 3
+      ELSE
+         ICOMPQ = 0
+      END IF
 *
-      IF( KTOP.GE.KBOT )
-     $   RETURN
+      IF( LSAME( COMPZ, 'N' ) ) THEN
+         ILZ = .FALSE.
+         ICOMPZ = 1
+      ELSE IF( LSAME( COMPZ, 'V' ) ) THEN
+         ILZ = .TRUE.
+         ICOMPZ = 2
+      ELSE IF( LSAME( COMPZ, 'I' ) ) THEN
+         ILZ = .TRUE.
+         ICOMPZ = 3
+      ELSE
+         ICOMPZ = 0
+      END IF
 *
-*     ==== NSHFTS is supposed to be even, but if it is odd,
-*     .    then simply reduce it by one.  ====
+*     Check Argument Values
 *
-      NS = NSHFTS - MOD( NSHFTS, 2 )
+      INFO = 0
+      WORK( 1 ) = MAX( 1, N )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( ISCHUR.EQ.0 ) THEN
+         INFO = -1
+      ELSE IF( ICOMPQ.EQ.0 ) THEN
+         INFO = -2
+      ELSE IF( ICOMPZ.EQ.0 ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( ILO.LT.1 ) THEN
+         INFO = -5
+      ELSE IF( IHI.GT.N .OR. IHI.LT.ILO-1 ) THEN
+         INFO = -6
+      ELSE IF( LDH.LT.N ) THEN
+         INFO = -8
+      ELSE IF( LDT.LT.N ) THEN
+         INFO = -10
+      ELSE IF( LDQ.LT.1 .OR. ( ILQ .AND. LDQ.LT.N ) ) THEN
+         INFO = -14
+      ELSE IF( LDZ.LT.1 .OR. ( ILZ .AND. LDZ.LT.N ) ) THEN
+         INFO = -16
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+         INFO = -18
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZHGEQZ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-*     ==== Machine constants for deflation ====
+*     Quick return if possible
 *
-      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
-      SAFMAX = RONE / SAFMIN
-      CALL DLABAD( SAFMIN, SAFMAX )
-      ULP = DLAMCH( 'PRECISION' )
-      SMLNUM = SAFMIN*( DBLE( N ) / ULP )
+*     WORK( 1 ) = CMPLX( 1 )
+      IF( N.LE.0 ) THEN
+         WORK( 1 ) = DCMPLX( 1 )
+         RETURN
+      END IF
 *
-*     ==== Use accumulated reflections to update far-from-diagonal
-*     .    entries ? ====
+*     Initialize Q and Z
 *
-      ACCUM = ( KACC22.EQ.1 ) .OR. ( KACC22.EQ.2 )
+      IF( ICOMPQ.EQ.3 )
+     $   CALL ZLASET( 'Full', N, N, CZERO, CONE, Q, LDQ )
+      IF( ICOMPZ.EQ.3 )
+     $   CALL ZLASET( 'Full', N, N, CZERO, CONE, Z, LDZ )
 *
-*     ==== If so, exploit the 2-by-2 block structure? ====
+*     Machine Constants
 *
-      BLK22 = ( NS.GT.2 ) .AND. ( KACC22.EQ.2 )
+      IN = IHI + 1 - ILO
+      SAFMIN = DLAMCH( 'S' )
+      ULP = DLAMCH( 'E' )*DLAMCH( 'B' )
+      ANORM = ZLANHS( 'F', IN, H( ILO, ILO ), LDH, RWORK )
+      BNORM = ZLANHS( 'F', IN, T( ILO, ILO ), LDT, RWORK )
+      ATOL = MAX( SAFMIN, ULP*ANORM )
+      BTOL = MAX( SAFMIN, ULP*BNORM )
+      ASCALE = ONE / MAX( SAFMIN, ANORM )
+      BSCALE = ONE / MAX( SAFMIN, BNORM )
+*
+*
+*     Set Eigenvalues IHI+1:N
+*
+      DO 10 J = IHI + 1, N
+         ABSB = ABS( T( J, J ) )
+         IF( ABSB.GT.SAFMIN ) THEN
+            SIGNBC = DCONJG( T( J, J ) / ABSB )
+            T( J, J ) = ABSB
+            IF( ILSCHR ) THEN
+               CALL ZSCAL( J-1, SIGNBC, T( 1, J ), 1 )
+               CALL ZSCAL( J, SIGNBC, H( 1, J ), 1 )
+            ELSE
+               CALL ZSCAL( 1, SIGNBC, H( J, J ), 1 )
+            END IF
+            IF( ILZ )
+     $         CALL ZSCAL( N, SIGNBC, Z( 1, J ), 1 )
+         ELSE
+            T( J, J ) = CZERO
+         END IF
+         ALPHA( J ) = H( J, J )
+         BETA( J ) = T( J, J )
+   10 CONTINUE
 *
-*     ==== clear trash ====
+*     If IHI < ILO, skip QZ steps
 *
-      IF( KTOP+2.LE.KBOT )
-     $   H( KTOP+2, KTOP ) = ZERO
+      IF( IHI.LT.ILO )
+     $   GO TO 190
 *
-*     ==== NBMPS = number of 2-shift bulges in the chain ====
+*     MAIN QZ ITERATION LOOP
 *
-      NBMPS = NS / 2
+*     Initialize dynamic indices
 *
-*     ==== KDU = width of slab ====
+*     Eigenvalues ILAST+1:N have been found.
+*        Column operations modify rows IFRSTM:whatever
+*        Row operations modify columns whatever:ILASTM
+*
+*     If only eigenvalues are being computed, then
+*        IFRSTM is the row of the last splitting row above row ILAST;
+*        this is always at least ILO.
+*     IITER counts iterations since the last eigenvalue was found,
+*        to tell when to use an extraordinary shift.
+*     MAXIT is the maximum number of QZ sweeps allowed.
+*
+      ILAST = IHI
+      IF( ILSCHR ) THEN
+         IFRSTM = 1
+         ILASTM = N
+      ELSE
+         IFRSTM = ILO
+         ILASTM = IHI
+      END IF
+      IITER = 0
+      ESHIFT = CZERO
+      MAXIT = 30*( IHI-ILO+1 )
 *
-      KDU = 6*NBMPS - 3
+      DO 170 JITER = 1, MAXIT
 *
-*     ==== Create and chase chains of NBMPS bulges ====
+*        Check for too many iterations.
 *
-      DO 210 INCOL = 3*( 1-NBMPS ) + KTOP - 1, KBOT - 2, 3*NBMPS - 2
-         NDCOL = INCOL + KDU
-         IF( ACCUM )
-     $      CALL ZLASET( 'ALL', KDU, KDU, ZERO, ONE, U, LDU )
+         IF( JITER.GT.MAXIT )
+     $      GO TO 180
 *
-*        ==== Near-the-diagonal bulge chase.  The following loop
-*        .    performs the near-the-diagonal part of a small bulge
-*        .    multi-shift QR sweep.  Each 6*NBMPS-2 column diagonal
-*        .    chunk extends from column INCOL to column NDCOL
-*        .    (including both column INCOL and column NDCOL). The
-*        .    following loop chases a 3*NBMPS column long chain of
-*        .    NBMPS bulges 3*NBMPS-2 columns to the right.  (INCOL
-*        .    may be less than KTOP and and NDCOL may be greater than
-*        .    KBOT indicating phantom columns from which to chase
-*        .    bulges before they are actually introduced or to which
-*        .    to chase bulges beyond column KBOT.)  ====
+*        Split the matrix if possible.
 *
-         DO 140 KRCOL = INCOL, MIN( INCOL+3*NBMPS-3, KBOT-2 )
+*        Two tests:
+*           1: H(j,j-1)=0  or  j=ILO
+*           2: T(j,j)=0
 *
-*           ==== Bulges number MTOP to MBOT are active double implicit
-*           .    shift bulges.  There may or may not also be small
-*           .    2-by-2 bulge, if there is room.  The inactive bulges
-*           .    (if any) must wait until the active bulges have moved
-*           .    down the diagonal to make room.  The phantom matrix
-*           .    paradigm described above helps keep track.  ====
+*        Special case: j=ILAST
 *
-            MTOP = MAX( 1, ( ( KTOP-1 )-KRCOL+2 ) / 3+1 )
-            MBOT = MIN( NBMPS, ( KBOT-KRCOL ) / 3 )
-            M22 = MBOT + 1
-            BMP22 = ( MBOT.LT.NBMPS ) .AND. ( KRCOL+3*( M22-1 ) ).EQ.
-     $              ( KBOT-2 )
+         IF( ILAST.EQ.ILO ) THEN
+            GO TO 60
+         ELSE
+            IF( ABS1( H( ILAST, ILAST-1 ) ).LE.ATOL ) THEN
+               H( ILAST, ILAST-1 ) = CZERO
+               GO TO 60
+            END IF
+         END IF
 *
-*           ==== Generate reflections to chase the chain right
-*           .    one column.  (The minimum value of K is KTOP-1.) ====
+         IF( ABS( T( ILAST, ILAST ) ).LE.BTOL ) THEN
+            T( ILAST, ILAST ) = CZERO
+            GO TO 50
+         END IF
 *
-            DO 10 M = MTOP, MBOT
-               K = KRCOL + 3*( M-1 )
-               IF( K.EQ.KTOP-1 ) THEN
-                  CALL ZLAQR1( 3, H( KTOP, KTOP ), LDH, S( 2*M-1 ),
-     $                         S( 2*M ), V( 1, M ) )
-                  ALPHA = V( 1, M )
-                  CALL ZLARFG( 3, ALPHA, V( 2, M ), 1, V( 1, M ) )
-               ELSE
-                  BETA = H( K+1, K )
-                  V( 2, M ) = H( K+2, K )
-                  V( 3, M ) = H( K+3, K )
-                  CALL ZLARFG( 3, BETA, V( 2, M ), 1, V( 1, M ) )
+*        General case: j<ILAST
 *
-*                 ==== A Bulge may collapse because of vigilant
-*                 .    deflation or destructive underflow.  In the
-*                 .    underflow case, try the two-small-subdiagonals
-*                 .    trick to try to reinflate the bulge.  ====
+         DO 40 J = ILAST - 1, ILO, -1
 *
-                  IF( H( K+3, K ).NE.ZERO .OR. H( K+3, K+1 ).NE.
-     $                ZERO .OR. H( K+3, K+2 ).EQ.ZERO ) THEN
+*           Test 1: for H(j,j-1)=0 or j=ILO
 *
-*                    ==== Typical case: not collapsed (yet). ====
+            IF( J.EQ.ILO ) THEN
+               ILAZRO = .TRUE.
+            ELSE
+               IF( ABS1( H( J, J-1 ) ).LE.ATOL ) THEN
+                  H( J, J-1 ) = CZERO
+                  ILAZRO = .TRUE.
+               ELSE
+                  ILAZRO = .FALSE.
+               END IF
+            END IF
 *
-                     H( K+1, K ) = BETA
-                     H( K+2, K ) = ZERO
-                     H( K+3, K ) = ZERO
-                  ELSE
+*           Test 2: for T(j,j)=0
 *
-*                    ==== Atypical case: collapsed.  Attempt to
-*                    .    reintroduce ignoring H(K+1,K) and H(K+2,K).
-*                    .    If the fill resulting from the new
-*                    .    reflector is too large, then abandon it.
-*                    .    Otherwise, use the new one. ====
+            IF( ABS( T( J, J ) ).LT.BTOL ) THEN
+               T( J, J ) = CZERO
 *
-                     CALL ZLAQR1( 3, H( K+1, K+1 ), LDH, S( 2*M-1 ),
-     $                            S( 2*M ), VT )
-                     ALPHA = VT( 1 )
-                     CALL ZLARFG( 3, ALPHA, VT( 2 ), 1, VT( 1 ) )
-                     REFSUM = DCONJG( VT( 1 ) )*
-     $                        ( H( K+1, K )+DCONJG( VT( 2 ) )*
-     $                        H( K+2, K ) )
+*              Test 1a: Check for 2 consecutive small subdiagonals in A
+*
+               ILAZR2 = .FALSE.
+               IF( .NOT.ILAZRO ) THEN
+                  IF( ABS1( H( J, J-1 ) )*( ASCALE*ABS1( H( J+1,
+     $                J ) ) ).LE.ABS1( H( J, J ) )*( ASCALE*ATOL ) )
+     $                ILAZR2 = .TRUE.
+               END IF
+*
+*              If both tests pass (1 & 2), i.e., the leading diagonal
+*              element of B in the block is zero, split a 1x1 block off
+*              at the top. (I.e., at the J-th row/column) The leading
+*              diagonal element of the remainder can also be zero, so
+*              this may have to be done repeatedly.
+*
+               IF( ILAZRO .OR. ILAZR2 ) THEN
+                  DO 20 JCH = J, ILAST - 1
+                     CTEMP = H( JCH, JCH )
+                     CALL ZLARTG( CTEMP, H( JCH+1, JCH ), C, S,
+     $                            H( JCH, JCH ) )
+                     H( JCH+1, JCH ) = CZERO
+                     CALL ZROT( ILASTM-JCH, H( JCH, JCH+1 ), LDH,
+     $                          H( JCH+1, JCH+1 ), LDH, C, S )
+                     CALL ZROT( ILASTM-JCH, T( JCH, JCH+1 ), LDT,
+     $                          T( JCH+1, JCH+1 ), LDT, C, S )
+                     IF( ILQ )
+     $                  CALL ZROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                             C, DCONJG( S ) )
+                     IF( ILAZR2 )
+     $                  H( JCH, JCH-1 ) = H( JCH, JCH-1 )*C
+                     ILAZR2 = .FALSE.
+                     IF( ABS1( T( JCH+1, JCH+1 ) ).GE.BTOL ) THEN
+                        IF( JCH+1.GE.ILAST ) THEN
+                           GO TO 60
+                        ELSE
+                           IFIRST = JCH + 1
+                           GO TO 70
+                        END IF
+                     END IF
+                     T( JCH+1, JCH+1 ) = CZERO
+   20             CONTINUE
+                  GO TO 50
+               ELSE
 *
-                     IF( CABS1( H( K+2, K )-REFSUM*VT( 2 ) )+
-     $                   CABS1( REFSUM*VT( 3 ) ).GT.ULP*
-     $                   ( CABS1( H( K, K ) )+CABS1( H( K+1,
-     $                   K+1 ) )+CABS1( H( K+2, K+2 ) ) ) ) THEN
+*                 Only test 2 passed -- chase the zero to T(ILAST,ILAST)
+*                 Then process as in the case T(ILAST,ILAST)=0
 *
-*                       ==== Starting a new bulge here would
-*                       .    create non-negligible fill.  Use
-*                       .    the old one with trepidation. ====
+                  DO 30 JCH = J, ILAST - 1
+                     CTEMP = T( JCH, JCH+1 )
+                     CALL ZLARTG( CTEMP, T( JCH+1, JCH+1 ), C, S,
+     $                            T( JCH, JCH+1 ) )
+                     T( JCH+1, JCH+1 ) = CZERO
+                     IF( JCH.LT.ILASTM-1 )
+     $                  CALL ZROT( ILASTM-JCH-1, T( JCH, JCH+2 ), LDT,
+     $                             T( JCH+1, JCH+2 ), LDT, C, S )
+                     CALL ZROT( ILASTM-JCH+2, H( JCH, JCH-1 ), LDH,
+     $                          H( JCH+1, JCH-1 ), LDH, C, S )
+                     IF( ILQ )
+     $                  CALL ZROT( N, Q( 1, JCH ), 1, Q( 1, JCH+1 ), 1,
+     $                             C, DCONJG( S ) )
+                     CTEMP = H( JCH+1, JCH )
+                     CALL ZLARTG( CTEMP, H( JCH+1, JCH-1 ), C, S,
+     $                            H( JCH+1, JCH ) )
+                     H( JCH+1, JCH-1 ) = CZERO
+                     CALL ZROT( JCH+1-IFRSTM, H( IFRSTM, JCH ), 1,
+     $                          H( IFRSTM, JCH-1 ), 1, C, S )
+                     CALL ZROT( JCH-IFRSTM, T( IFRSTM, JCH ), 1,
+     $                          T( IFRSTM, JCH-1 ), 1, C, S )
+                     IF( ILZ )
+     $                  CALL ZROT( N, Z( 1, JCH ), 1, Z( 1, JCH-1 ), 1,
+     $                             C, S )
+   30             CONTINUE
+                  GO TO 50
+               END IF
+            ELSE IF( ILAZRO ) THEN
 *
-                        H( K+1, K ) = BETA
-                        H( K+2, K ) = ZERO
-                        H( K+3, K ) = ZERO
-                     ELSE
+*              Only test 1 passed -- work on J:ILAST
 *
-*                       ==== Stating a new bulge here would
-*                       .    create only negligible fill.
-*                       .    Replace the old reflector with
-*                       .    the new one. ====
+               IFIRST = J
+               GO TO 70
+            END IF
 *
-                        H( K+1, K ) = H( K+1, K ) - REFSUM
-                        H( K+2, K ) = ZERO
-                        H( K+3, K ) = ZERO
-                        V( 1, M ) = VT( 1 )
-                        V( 2, M ) = VT( 2 )
-                        V( 3, M ) = VT( 3 )
-                     END IF
-                  END IF
-               END IF
-   10       CONTINUE
+*           Neither test passed -- try next J
 *
-*           ==== Generate a 2-by-2 reflection, if needed. ====
+   40    CONTINUE
 *
-            K = KRCOL + 3*( M22-1 )
-            IF( BMP22 ) THEN
-               IF( K.EQ.KTOP-1 ) THEN
-                  CALL ZLAQR1( 2, H( K+1, K+1 ), LDH, S( 2*M22-1 ),
-     $                         S( 2*M22 ), V( 1, M22 ) )
-                  BETA = V( 1, M22 )
-                  CALL ZLARFG( 2, BETA, V( 2, M22 ), 1, V( 1, M22 ) )
-               ELSE
-                  BETA = H( K+1, K )
-                  V( 2, M22 ) = H( K+2, K )
-                  CALL ZLARFG( 2, BETA, V( 2, M22 ), 1, V( 1, M22 ) )
-                  H( K+1, K ) = BETA
-                  H( K+2, K ) = ZERO
-               END IF
-            END IF
+*        (Drop-through is "impossible")
 *
-*           ==== Multiply H by reflections from the left ====
+         INFO = 2*N + 1
+         GO TO 210
 *
-            IF( ACCUM ) THEN
-               JBOT = MIN( NDCOL, KBOT )
-            ELSE IF( WANTT ) THEN
-               JBOT = N
-            ELSE
-               JBOT = KBOT
-            END IF
-            DO 30 J = MAX( KTOP, KRCOL ), JBOT
-               MEND = MIN( MBOT, ( J-KRCOL+2 ) / 3 )
-               DO 20 M = MTOP, MEND
-                  K = KRCOL + 3*( M-1 )
-                  REFSUM = DCONJG( V( 1, M ) )*
-     $                     ( H( K+1, J )+DCONJG( V( 2, M ) )*
-     $                     H( K+2, J )+DCONJG( V( 3, M ) )*H( K+3, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M )
-                  H( K+3, J ) = H( K+3, J ) - REFSUM*V( 3, M )
-   20          CONTINUE
-   30       CONTINUE
-            IF( BMP22 ) THEN
-               K = KRCOL + 3*( M22-1 )
-               DO 40 J = MAX( K+1, KTOP ), JBOT
-                  REFSUM = DCONJG( V( 1, M22 ) )*
-     $                     ( H( K+1, J )+DCONJG( V( 2, M22 ) )*
-     $                     H( K+2, J ) )
-                  H( K+1, J ) = H( K+1, J ) - REFSUM
-                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M22 )
-   40          CONTINUE
-            END IF
+*        T(ILAST,ILAST)=0 -- clear H(ILAST,ILAST-1) to split off a
+*        1x1 block.
 *
-*           ==== Multiply H by reflections from the right.
-*           .    Delay filling in the last row until the
-*           .    vigilant deflation check is complete. ====
+   50    CONTINUE
+         CTEMP = H( ILAST, ILAST )
+         CALL ZLARTG( CTEMP, H( ILAST, ILAST-1 ), C, S,
+     $                H( ILAST, ILAST ) )
+         H( ILAST, ILAST-1 ) = CZERO
+         CALL ZROT( ILAST-IFRSTM, H( IFRSTM, ILAST ), 1,
+     $              H( IFRSTM, ILAST-1 ), 1, C, S )
+         CALL ZROT( ILAST-IFRSTM, T( IFRSTM, ILAST ), 1,
+     $              T( IFRSTM, ILAST-1 ), 1, C, S )
+         IF( ILZ )
+     $      CALL ZROT( N, Z( 1, ILAST ), 1, Z( 1, ILAST-1 ), 1, C, S )
 *
-            IF( ACCUM ) THEN
-               JTOP = MAX( KTOP, INCOL )
-            ELSE IF( WANTT ) THEN
-               JTOP = 1
+*        H(ILAST,ILAST-1)=0 -- Standardize B, set ALPHA and BETA
+*
+   60    CONTINUE
+         ABSB = ABS( T( ILAST, ILAST ) )
+         IF( ABSB.GT.SAFMIN ) THEN
+            SIGNBC = DCONJG( T( ILAST, ILAST ) / ABSB )
+            T( ILAST, ILAST ) = ABSB
+            IF( ILSCHR ) THEN
+               CALL ZSCAL( ILAST-IFRSTM, SIGNBC, T( IFRSTM, ILAST ), 1 )
+               CALL ZSCAL( ILAST+1-IFRSTM, SIGNBC, H( IFRSTM, ILAST ),
+     $                     1 )
             ELSE
-               JTOP = KTOP
+               CALL ZSCAL( 1, SIGNBC, H( ILAST, ILAST ), 1 )
             END IF
-            DO 80 M = MTOP, MBOT
-               IF( V( 1, M ).NE.ZERO ) THEN
-                  K = KRCOL + 3*( M-1 )
-                  DO 50 J = JTOP, MIN( KBOT, K+3 )
-                     REFSUM = V( 1, M )*( H( J, K+1 )+V( 2, M )*
-     $                        H( J, K+2 )+V( 3, M )*H( J, K+3 ) )
-                     H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                     H( J, K+2 ) = H( J, K+2 ) -
-     $                             REFSUM*DCONJG( V( 2, M ) )
-                     H( J, K+3 ) = H( J, K+3 ) -
-     $                             REFSUM*DCONJG( V( 3, M ) )
-   50             CONTINUE
-*
-                  IF( ACCUM ) THEN
+            IF( ILZ )
+     $         CALL ZSCAL( N, SIGNBC, Z( 1, ILAST ), 1 )
+         ELSE
+            T( ILAST, ILAST ) = CZERO
+         END IF
+         ALPHA( ILAST ) = H( ILAST, ILAST )
+         BETA( ILAST ) = T( ILAST, ILAST )
 *
-*                    ==== Accumulate U. (If necessary, update Z later
-*                    .    with with an efficient matrix-matrix
-*                    .    multiply.) ====
+*        Go to next block -- exit if finished.
 *
-                     KMS = K - INCOL
-                     DO 60 J = MAX( 1, KTOP-INCOL ), KDU
-                        REFSUM = V( 1, M )*( U( J, KMS+1 )+V( 2, M )*
-     $                           U( J, KMS+2 )+V( 3, M )*U( J, KMS+3 ) )
-                        U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                        U( J, KMS+2 ) = U( J, KMS+2 ) -
-     $                                  REFSUM*DCONJG( V( 2, M ) )
-                        U( J, KMS+3 ) = U( J, KMS+3 ) -
-     $                                  REFSUM*DCONJG( V( 3, M ) )
-   60                CONTINUE
-                  ELSE IF( WANTZ ) THEN
+         ILAST = ILAST - 1
+         IF( ILAST.LT.ILO )
+     $      GO TO 190
 *
-*                    ==== U is not accumulated, so update Z
-*                    .    now by multiplying by reflections
-*                    .    from the right. ====
+*        Reset counters
 *
-                     DO 70 J = ILOZ, IHIZ
-                        REFSUM = V( 1, M )*( Z( J, K+1 )+V( 2, M )*
-     $                           Z( J, K+2 )+V( 3, M )*Z( J, K+3 ) )
-                        Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                        Z( J, K+2 ) = Z( J, K+2 ) -
-     $                                REFSUM*DCONJG( V( 2, M ) )
-                        Z( J, K+3 ) = Z( J, K+3 ) -
-     $                                REFSUM*DCONJG( V( 3, M ) )
-   70                CONTINUE
-                  END IF
-               END IF
-   80       CONTINUE
+         IITER = 0
+         ESHIFT = CZERO
+         IF( .NOT.ILSCHR ) THEN
+            ILASTM = ILAST
+            IF( IFRSTM.GT.ILAST )
+     $         IFRSTM = ILO
+         END IF
+         GO TO 160
 *
-*           ==== Special case: 2-by-2 reflection (if needed) ====
+*        QZ step
 *
-            K = KRCOL + 3*( M22-1 )
-            IF( BMP22 ) THEN
-               IF ( V( 1, M22 ).NE.ZERO ) THEN
-                  DO 90 J = JTOP, MIN( KBOT, K+3 )
-                     REFSUM = V( 1, M22 )*( H( J, K+1 )+V( 2, M22 )*
-     $                        H( J, K+2 ) )
-                     H( J, K+1 ) = H( J, K+1 ) - REFSUM
-                     H( J, K+2 ) = H( J, K+2 ) -
-     $                             REFSUM*DCONJG( V( 2, M22 ) )
-   90             CONTINUE
+*        This iteration only involves rows/columns IFIRST:ILAST.  We
+*        assume IFIRST < ILAST, and that the diagonal of B is non-zero.
 *
-                  IF( ACCUM ) THEN
-                     KMS = K - INCOL
-                     DO 100 J = MAX( 1, KTOP-INCOL ), KDU
-                        REFSUM = V( 1, M22 )*( U( J, KMS+1 )+
-     $                           V( 2, M22 )*U( J, KMS+2 ) )
-                        U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
-                        U( J, KMS+2 ) = U( J, KMS+2 ) -
-     $                                  REFSUM*DCONJG( V( 2, M22 ) )
-  100                CONTINUE
-                  ELSE IF( WANTZ ) THEN
-                     DO 110 J = ILOZ, IHIZ
-                        REFSUM = V( 1, M22 )*( Z( J, K+1 )+V( 2, M22 )*
-     $                           Z( J, K+2 ) )
-                        Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
-                        Z( J, K+2 ) = Z( J, K+2 ) -
-     $                                REFSUM*DCONJG( V( 2, M22 ) )
-  110                CONTINUE
-                  END IF
-               END IF
+   70    CONTINUE
+         IITER = IITER + 1
+         IF( .NOT.ILSCHR ) THEN
+            IFRSTM = IFIRST
+         END IF
+*
+*        Compute the Shift.
+*
+*        At this point, IFIRST < ILAST, and the diagonal elements of
+*        T(IFIRST:ILAST,IFIRST,ILAST) are larger than BTOL (in
+*        magnitude)
+*
+         IF( ( IITER / 10 )*10.NE.IITER ) THEN
+*
+*           The Wilkinson shift (AEP p.512), i.e., the eigenvalue of
+*           the bottom-right 2x2 block of A inv(B) which is nearest to
+*           the bottom-right element.
+*
+*           We factor B as U*D, where U has unit diagonals, and
+*           compute (A*inv(D))*inv(U).
+*
+            U12 = ( BSCALE*T( ILAST-1, ILAST ) ) /
+     $            ( BSCALE*T( ILAST, ILAST ) )
+            AD11 = ( ASCALE*H( ILAST-1, ILAST-1 ) ) /
+     $             ( BSCALE*T( ILAST-1, ILAST-1 ) )
+            AD21 = ( ASCALE*H( ILAST, ILAST-1 ) ) /
+     $             ( BSCALE*T( ILAST-1, ILAST-1 ) )
+            AD12 = ( ASCALE*H( ILAST-1, ILAST ) ) /
+     $             ( BSCALE*T( ILAST, ILAST ) )
+            AD22 = ( ASCALE*H( ILAST, ILAST ) ) /
+     $             ( BSCALE*T( ILAST, ILAST ) )
+            ABI22 = AD22 - U12*AD21
+*
+            T1 = HALF*( AD11+ABI22 )
+            RTDISC = SQRT( T1**2+AD12*AD21-AD11*AD22 )
+            TEMP = DBLE( T1-ABI22 )*DBLE( RTDISC ) +
+     $             DIMAG( T1-ABI22 )*DIMAG( RTDISC )
+            IF( TEMP.LE.ZERO ) THEN
+               SHIFT = T1 + RTDISC
+            ELSE
+               SHIFT = T1 - RTDISC
             END IF
+         ELSE
 *
-*           ==== Vigilant deflation check ====
-*
-            MSTART = MTOP
-            IF( KRCOL+3*( MSTART-1 ).LT.KTOP )
-     $         MSTART = MSTART + 1
-            MEND = MBOT
-            IF( BMP22 )
-     $         MEND = MEND + 1
-            IF( KRCOL.EQ.KBOT-2 )
-     $         MEND = MEND + 1
-            DO 120 M = MSTART, MEND
-               K = MIN( KBOT-1, KRCOL+3*( M-1 ) )
+*           Exceptional shift.  Chosen for no particularly good reason.
 *
-*              ==== The following convergence test requires that
-*              .    the tradition small-compared-to-nearby-diagonals
-*              .    criterion and the Ahues & Tisseur (LAWN 122, 1997)
-*              .    criteria both be satisfied.  The latter improves
-*              .    accuracy in some examples. Falling back on an
-*              .    alternate convergence criterion when TST1 or TST2
-*              .    is zero (as done here) is traditional but probably
-*              .    unnecessary. ====
+            ESHIFT = ESHIFT + (ASCALE*H(ILAST,ILAST-1))/
+     $                        (BSCALE*T(ILAST-1,ILAST-1))
+            SHIFT = ESHIFT
+         END IF
 *
-               IF( H( K+1, K ).NE.ZERO ) THEN
-                  TST1 = CABS1( H( K, K ) ) + CABS1( H( K+1, K+1 ) )
-                  IF( TST1.EQ.RZERO ) THEN
-                     IF( K.GE.KTOP+1 )
-     $                  TST1 = TST1 + CABS1( H( K, K-1 ) )
-                     IF( K.GE.KTOP+2 )
-     $                  TST1 = TST1 + CABS1( H( K, K-2 ) )
-                     IF( K.GE.KTOP+3 )
-     $                  TST1 = TST1 + CABS1( H( K, K-3 ) )
-                     IF( K.LE.KBOT-2 )
-     $                  TST1 = TST1 + CABS1( H( K+2, K+1 ) )
-                     IF( K.LE.KBOT-3 )
-     $                  TST1 = TST1 + CABS1( H( K+3, K+1 ) )
-                     IF( K.LE.KBOT-4 )
-     $                  TST1 = TST1 + CABS1( H( K+4, K+1 ) )
-                  END IF
-                  IF( CABS1( H( K+1, K ) ).LE.MAX( SMLNUM, ULP*TST1 ) )
-     $                 THEN
-                     H12 = MAX( CABS1( H( K+1, K ) ),
-     $                     CABS1( H( K, K+1 ) ) )
-                     H21 = MIN( CABS1( H( K+1, K ) ),
-     $                     CABS1( H( K, K+1 ) ) )
-                     H11 = MAX( CABS1( H( K+1, K+1 ) ),
-     $                     CABS1( H( K, K )-H( K+1, K+1 ) ) )
-                     H22 = MIN( CABS1( H( K+1, K+1 ) ),
-     $                     CABS1( H( K, K )-H( K+1, K+1 ) ) )
-                     SCL = H11 + H12
-                     TST2 = H22*( H11 / SCL )
+*        Now check for two consecutive small subdiagonals.
 *
-                     IF( TST2.EQ.RZERO .OR. H21*( H12 / SCL ).LE.
-     $                   MAX( SMLNUM, ULP*TST2 ) )H( K+1, K ) = ZERO
-                  END IF
-               END IF
-  120       CONTINUE
+         DO 80 J = ILAST - 1, IFIRST + 1, -1
+            ISTART = J
+            CTEMP = ASCALE*H( J, J ) - SHIFT*( BSCALE*T( J, J ) )
+            TEMP = ABS1( CTEMP )
+            TEMP2 = ASCALE*ABS1( H( J+1, J ) )
+            TEMPR = MAX( TEMP, TEMP2 )
+            IF( TEMPR.LT.ONE .AND. TEMPR.NE.ZERO ) THEN
+               TEMP = TEMP / TEMPR
+               TEMP2 = TEMP2 / TEMPR
+            END IF
+            IF( ABS1( H( J, J-1 ) )*TEMP2.LE.TEMP*ATOL )
+     $         GO TO 90
+   80    CONTINUE
 *
-*           ==== Fill in the last row of each bulge. ====
+         ISTART = IFIRST
+         CTEMP = ASCALE*H( IFIRST, IFIRST ) -
+     $           SHIFT*( BSCALE*T( IFIRST, IFIRST ) )
+   90    CONTINUE
 *
-            MEND = MIN( NBMPS, ( KBOT-KRCOL-1 ) / 3 )
-            DO 130 M = MTOP, MEND
-               K = KRCOL + 3*( M-1 )
-               REFSUM = V( 1, M )*V( 3, M )*H( K+4, K+3 )
-               H( K+4, K+1 ) = -REFSUM
-               H( K+4, K+2 ) = -REFSUM*DCONJG( V( 2, M ) )
-               H( K+4, K+3 ) = H( K+4, K+3 ) -
-     $                         REFSUM*DCONJG( V( 3, M ) )
-  130       CONTINUE
+*        Do an implicit-shift QZ sweep.
 *
-*           ==== End of near-the-diagonal bulge chase. ====
+*        Initial Q
 *
-  140    CONTINUE
+         CTEMP2 = ASCALE*H( ISTART+1, ISTART )
+         CALL ZLARTG( CTEMP, CTEMP2, C, S, CTEMP3 )
 *
-*        ==== Use U (if accumulated) to update far-from-diagonal
-*        .    entries in H.  If required, use U to update Z as
-*        .    well. ====
+*        Sweep
 *
-         IF( ACCUM ) THEN
-            IF( WANTT ) THEN
-               JTOP = 1
-               JBOT = N
-            ELSE
-               JTOP = KTOP
-               JBOT = KBOT
+         DO 150 J = ISTART, ILAST - 1
+            IF( J.GT.ISTART ) THEN
+               CTEMP = H( J, J-1 )
+               CALL ZLARTG( CTEMP, H( J+1, J-1 ), C, S, H( J, J-1 ) )
+               H( J+1, J-1 ) = CZERO
             END IF
-            IF( ( .NOT.BLK22 ) .OR. ( INCOL.LT.KTOP ) .OR.
-     $          ( NDCOL.GT.KBOT ) .OR. ( NS.LE.2 ) ) THEN
-*
-*              ==== Updates not exploiting the 2-by-2 block
-*              .    structure of U.  K1 and NU keep track of
-*              .    the location and size of U in the special
-*              .    cases of introducing bulges and chasing
-*              .    bulges off the bottom.  In these special
-*              .    cases and in case the number of shifts
-*              .    is NS = 2, there is no 2-by-2 block
-*              .    structure to exploit.  ====
-*
-               K1 = MAX( 1, KTOP-INCOL )
-               NU = ( KDU-MAX( 0, NDCOL-KBOT ) ) - K1 + 1
 *
-*              ==== Horizontal Multiply ====
+            DO 100 JC = J, ILASTM
+               CTEMP = C*H( J, JC ) + S*H( J+1, JC )
+               H( J+1, JC ) = -DCONJG( S )*H( J, JC ) + C*H( J+1, JC )
+               H( J, JC ) = CTEMP
+               CTEMP2 = C*T( J, JC ) + S*T( J+1, JC )
+               T( J+1, JC ) = -DCONJG( S )*T( J, JC ) + C*T( J+1, JC )
+               T( J, JC ) = CTEMP2
+  100       CONTINUE
+            IF( ILQ ) THEN
+               DO 110 JR = 1, N
+                  CTEMP = C*Q( JR, J ) + DCONJG( S )*Q( JR, J+1 )
+                  Q( JR, J+1 ) = -S*Q( JR, J ) + C*Q( JR, J+1 )
+                  Q( JR, J ) = CTEMP
+  110          CONTINUE
+            END IF
 *
-               DO 150 JCOL = MIN( NDCOL, KBOT ) + 1, JBOT, NH
-                  JLEN = MIN( NH, JBOT-JCOL+1 )
-                  CALL ZGEMM( 'C', 'N', NU, JLEN, NU, ONE, U( K1, K1 ),
-     $                        LDU, H( INCOL+K1, JCOL ), LDH, ZERO, WH,
-     $                        LDWH )
-                  CALL ZLACPY( 'ALL', NU, JLEN, WH, LDWH,
-     $                         H( INCOL+K1, JCOL ), LDH )
-  150          CONTINUE
+            CTEMP = T( J+1, J+1 )
+            CALL ZLARTG( CTEMP, T( J+1, J ), C, S, T( J+1, J+1 ) )
+            T( J+1, J ) = CZERO
+*
+            DO 120 JR = IFRSTM, MIN( J+2, ILAST )
+               CTEMP = C*H( JR, J+1 ) + S*H( JR, J )
+               H( JR, J ) = -DCONJG( S )*H( JR, J+1 ) + C*H( JR, J )
+               H( JR, J+1 ) = CTEMP
+  120       CONTINUE
+            DO 130 JR = IFRSTM, J
+               CTEMP = C*T( JR, J+1 ) + S*T( JR, J )
+               T( JR, J ) = -DCONJG( S )*T( JR, J+1 ) + C*T( JR, J )
+               T( JR, J+1 ) = CTEMP
+  130       CONTINUE
+            IF( ILZ ) THEN
+               DO 140 JR = 1, N
+                  CTEMP = C*Z( JR, J+1 ) + S*Z( JR, J )
+                  Z( JR, J ) = -DCONJG( S )*Z( JR, J+1 ) + C*Z( JR, J )
+                  Z( JR, J+1 ) = CTEMP
+  140          CONTINUE
+            END IF
+  150    CONTINUE
 *
-*              ==== Vertical multiply ====
+  160    CONTINUE
 *
-               DO 160 JROW = JTOP, MAX( KTOP, INCOL ) - 1, NV
-                  JLEN = MIN( NV, MAX( KTOP, INCOL )-JROW )
-                  CALL ZGEMM( 'N', 'N', JLEN, NU, NU, ONE,
-     $                        H( JROW, INCOL+K1 ), LDH, U( K1, K1 ),
-     $                        LDU, ZERO, WV, LDWV )
-                  CALL ZLACPY( 'ALL', JLEN, NU, WV, LDWV,
-     $                         H( JROW, INCOL+K1 ), LDH )
-  160          CONTINUE
+  170 CONTINUE
 *
-*              ==== Z multiply (also vertical) ====
+*     Drop-through = non-convergence
 *
-               IF( WANTZ ) THEN
-                  DO 170 JROW = ILOZ, IHIZ, NV
-                     JLEN = MIN( NV, IHIZ-JROW+1 )
-                     CALL ZGEMM( 'N', 'N', JLEN, NU, NU, ONE,
-     $                           Z( JROW, INCOL+K1 ), LDZ, U( K1, K1 ),
-     $                           LDU, ZERO, WV, LDWV )
-                     CALL ZLACPY( 'ALL', JLEN, NU, WV, LDWV,
-     $                            Z( JROW, INCOL+K1 ), LDZ )
-  170             CONTINUE
-               END IF
-            ELSE
+  180 CONTINUE
+      INFO = ILAST
+      GO TO 210
 *
-*              ==== Updates exploiting U's 2-by-2 block structure.
-*              .    (I2, I4, J2, J4 are the last rows and columns
-*              .    of the blocks.) ====
+*     Successful completion of all QZ steps
 *
-               I2 = ( KDU+1 ) / 2
-               I4 = KDU
-               J2 = I4 - I2
-               J4 = KDU
+  190 CONTINUE
 *
-*              ==== KZS and KNZ deal with the band of zeros
-*              .    along the diagonal of one of the triangular
-*              .    blocks. ====
+*     Set Eigenvalues 1:ILO-1
 *
-               KZS = ( J4-J2 ) - ( NS+1 )
-               KNZ = NS + 1
+      DO 200 J = 1, ILO - 1
+         ABSB = ABS( T( J, J ) )
+         IF( ABSB.GT.SAFMIN ) THEN
+            SIGNBC = DCONJG( T( J, J ) / ABSB )
+            T( J, J ) = ABSB
+            IF( ILSCHR ) THEN
+               CALL ZSCAL( J-1, SIGNBC, T( 1, J ), 1 )
+               CALL ZSCAL( J, SIGNBC, H( 1, J ), 1 )
+            ELSE
+               CALL ZSCAL( 1, SIGNBC, H( J, J ), 1 )
+            END IF
+            IF( ILZ )
+     $         CALL ZSCAL( N, SIGNBC, Z( 1, J ), 1 )
+         ELSE
+            T( J, J ) = CZERO
+         END IF
+         ALPHA( J ) = H( J, J )
+         BETA( J ) = T( J, J )
+  200 CONTINUE
 *
-*              ==== Horizontal multiply ====
+*     Normal Termination
 *
-               DO 180 JCOL = MIN( NDCOL, KBOT ) + 1, JBOT, NH
-                  JLEN = MIN( NH, JBOT-JCOL+1 )
+      INFO = 0
 *
-*                 ==== Copy bottom of H to top+KZS of scratch ====
-*                  (The first KZS rows get multiplied by zero.) ====
+*     Exit (other than argument error) -- return optimal workspace size
 *
-                  CALL ZLACPY( 'ALL', KNZ, JLEN, H( INCOL+1+J2, JCOL ),
-     $                         LDH, WH( KZS+1, 1 ), LDWH )
+  210 CONTINUE
+      WORK( 1 ) = DCMPLX( N )
+      RETURN
 *
-*                 ==== Multiply by U21**H ====
+*     End of ZHGEQZ
 *
-                  CALL ZLASET( 'ALL', KZS, JLEN, ZERO, ZERO, WH, LDWH )
-                  CALL ZTRMM( 'L', 'U', 'C', 'N', KNZ, JLEN, ONE,
-     $                        U( J2+1, 1+KZS ), LDU, WH( KZS+1, 1 ),
-     $                        LDWH )
+      END
+*> \brief \b ZHSEQR
 *
-*                 ==== Multiply top of H by U11**H ====
+*  =========== DOCUMENTATION ===========
 *
-                  CALL ZGEMM( 'C', 'N', I2, JLEN, J2, ONE, U, LDU,
-     $                        H( INCOL+1, JCOL ), LDH, ONE, WH, LDWH )
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-*                 ==== Copy top of H to bottom of WH ====
+*> \htmlonly
+*> Download ZHSEQR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zhseqr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zhseqr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zhseqr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-                  CALL ZLACPY( 'ALL', J2, JLEN, H( INCOL+1, JCOL ), LDH,
-     $                         WH( I2+1, 1 ), LDWH )
+*  Definition:
+*  ===========
 *
-*                 ==== Multiply by U21**H ====
+*       SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
+*                          WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHI, ILO, INFO, LDH, LDZ, LWORK, N
+*       CHARACTER          COMPZ, JOB
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*       ..
+*  
 *
-                  CALL ZTRMM( 'L', 'L', 'C', 'N', J2, JLEN, ONE,
-     $                        U( 1, I2+1 ), LDU, WH( I2+1, 1 ), LDWH )
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZHSEQR computes the eigenvalues of a Hessenberg matrix H
+*>    and, optionally, the matrices T and Z from the Schur decomposition
+*>    H = Z T Z**H, where T is an upper triangular matrix (the
+*>    Schur form), and Z is the unitary matrix of Schur vectors.
+*>
+*>    Optionally Z may be postmultiplied into an input unitary
+*>    matrix Q so that this routine can give the Schur factorization
+*>    of a matrix A which has been reduced to the Hessenberg form H
+*>    by the unitary matrix Q:  A = Q*H*Q**H = (QZ)*T*(QZ)**H.
+*> \endverbatim
 *
-*                 ==== Multiply by U22 ====
+*  Arguments:
+*  ==========
 *
-                  CALL ZGEMM( 'C', 'N', I4-I2, JLEN, J4-J2, ONE,
-     $                        U( J2+1, I2+1 ), LDU,
-     $                        H( INCOL+1+J2, JCOL ), LDH, ONE,
-     $                        WH( I2+1, 1 ), LDWH )
+*> \param[in] JOB
+*> \verbatim
+*>          JOB is CHARACTER*1
+*>           = 'E':  compute eigenvalues only;
+*>           = 'S':  compute eigenvalues and the Schur form T.
+*> \endverbatim
+*>
+*> \param[in] COMPZ
+*> \verbatim
+*>          COMPZ is CHARACTER*1
+*>           = 'N':  no Schur vectors are computed;
+*>           = 'I':  Z is initialized to the unit matrix and the matrix Z
+*>                   of Schur vectors of H is returned;
+*>           = 'V':  Z must contain an unitary matrix Q on entry, and
+*>                   the product Q*Z is returned.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           The order of the matrix H.  N .GE. 0.
+*> \endverbatim
+*>
+*> \param[in] ILO
+*> \verbatim
+*>          ILO is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHI
+*> \verbatim
+*>          IHI is INTEGER
+*>
+*>           It is assumed that H is already upper triangular in rows
+*>           and columns 1:ILO-1 and IHI+1:N. ILO and IHI are normally
+*>           set by a previous call to ZGEBAL, and then passed to ZGEHRD
+*>           when the matrix output by ZGEBAL is reduced to Hessenberg
+*>           form. Otherwise ILO and IHI should be set to 1 and N
+*>           respectively.  If N.GT.0, then 1.LE.ILO.LE.IHI.LE.N.
+*>           If N = 0, then ILO = 1 and IHI = 0.
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array, dimension (LDH,N)
+*>           On entry, the upper Hessenberg matrix H.
+*>           On exit, if INFO = 0 and JOB = 'S', H contains the upper
+*>           triangular matrix T from the Schur decomposition (the
+*>           Schur form). If INFO = 0 and JOB = 'E', the contents of
+*>           H are unspecified on exit.  (The output value of H when
+*>           INFO.GT.0 is given under the description of INFO below.)
+*>
+*>           Unlike earlier versions of ZHSEQR, this subroutine may
+*>           explicitly H(i,j) = 0 for i.GT.j and j = 1, 2, ... ILO-1
+*>           or j = IHI+1, IHI+2, ... N.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is INTEGER
+*>           The leading dimension of the array H. LDH .GE. max(1,N).
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is COMPLEX*16 array, dimension (N)
+*>           The computed eigenvalues. If JOB = 'S', the eigenvalues are
+*>           stored in the same order as on the diagonal of the Schur
+*>           form returned in H, with W(i) = H(i,i).
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>           If COMPZ = 'N', Z is not referenced.
+*>           If COMPZ = 'I', on entry Z need not be set and on exit,
+*>           if INFO = 0, Z contains the unitary matrix Z of the Schur
+*>           vectors of H.  If COMPZ = 'V', on entry Z must contain an
+*>           N-by-N matrix Q, which is assumed to be equal to the unit
+*>           matrix except for the submatrix Z(ILO:IHI,ILO:IHI). On exit,
+*>           if INFO = 0, Z contains Q*Z.
+*>           Normally Q is the unitary matrix generated by ZUNGHR
+*>           after the call to ZGEHRD which formed the Hessenberg matrix
+*>           H. (The output value of Z when INFO.GT.0 is given under
+*>           the description of INFO below.)
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>           The leading dimension of the array Z.  if COMPZ = 'I' or
+*>           COMPZ = 'V', then LDZ.GE.MAX(1,N).  Otherwize, LDZ.GE.1.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (LWORK)
+*>           On exit, if INFO = 0, WORK(1) returns an estimate of
+*>           the optimal value for LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>           The dimension of the array WORK.  LWORK .GE. max(1,N)
+*>           is sufficient and delivers very good and sometimes
+*>           optimal performance.  However, LWORK as large as 11*N
+*>           may be required for optimal performance.  A workspace
+*>           query is recommended to determine the optimal workspace
+*>           size.
+*>
+*>           If LWORK = -1, then ZHSEQR does a workspace query.
+*>           In this case, ZHSEQR checks the input parameters and
+*>           estimates the optimal workspace size for the given
+*>           values of N, ILO and IHI.  The estimate is returned
+*>           in WORK(1).  No error message related to LWORK is
+*>           issued by XERBLA.  Neither H nor Z are accessed.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>             =  0:  successful exit
+*>           .LT. 0:  if INFO = -i, the i-th argument had an illegal
+*>                    value
+*>           .GT. 0:  if INFO = i, ZHSEQR failed to compute all of
+*>                the eigenvalues.  Elements 1:ilo-1 and i+1:n of WR
+*>                and WI contain those eigenvalues which have been
+*>                successfully computed.  (Failures are rare.)
+*>
+*>                If INFO .GT. 0 and JOB = 'E', then on exit, the
+*>                remaining unconverged eigenvalues are the eigen-
+*>                values of the upper Hessenberg matrix rows and
+*>                columns ILO through INFO of the final, output
+*>                value of H.
+*>
+*>                If INFO .GT. 0 and JOB   = 'S', then on exit
+*>
+*>           (*)  (initial value of H)*U  = U*(final value of H)
+*>
+*>                where U is a unitary matrix.  The final
+*>                value of  H is upper Hessenberg and triangular in
+*>                rows and columns INFO+1 through IHI.
+*>
+*>                If INFO .GT. 0 and COMPZ = 'V', then on exit
+*>
+*>                  (final value of Z)  =  (initial value of Z)*U
+*>
+*>                where U is the unitary matrix in (*) (regard-
+*>                less of the value of JOB.)
+*>
+*>                If INFO .GT. 0 and COMPZ = 'I', then on exit
+*>                      (final value of Z)  = U
+*>                where U is the unitary matrix in (*) (regard-
+*>                less of the value of JOB.)
+*>
+*>                If INFO .GT. 0 and COMPZ = 'N', then Z is not
+*>                accessed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2013
+*
+*> \ingroup complex16OTHERcomputational
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>             Default values supplied by
+*>             ILAENV(ISPEC,'ZHSEQR',JOB(:1)//COMPZ(:1),N,ILO,IHI,LWORK).
+*>             It is suggested that these defaults be adjusted in order
+*>             to attain best performance in each particular
+*>             computational environment.
+*>
+*>            ISPEC=12: The ZLAHQR vs ZLAQR0 crossover point.
+*>                      Default: 75. (Must be at least 11.)
+*>
+*>            ISPEC=13: Recommended deflation window size.
+*>                      This depends on ILO, IHI and NS.  NS is the
+*>                      number of simultaneous shifts returned
+*>                      by ILAENV(ISPEC=15).  (See ISPEC=15 below.)
+*>                      The default for (IHI-ILO+1).LE.500 is NS.
+*>                      The default for (IHI-ILO+1).GT.500 is 3*NS/2.
+*>
+*>            ISPEC=14: Nibble crossover point. (See IPARMQ for
+*>                      details.)  Default: 14% of deflation window
+*>                      size.
+*>
+*>            ISPEC=15: Number of simultaneous shifts in a multishift
+*>                      QR iteration.
+*>
+*>                      If IHI-ILO+1 is ...
+*>
+*>                      greater than      ...but less    ... the
+*>                      or equal to ...      than        default is
+*>
+*>                           1               30          NS =   2(+)
+*>                          30               60          NS =   4(+)
+*>                          60              150          NS =  10(+)
+*>                         150              590          NS =  **
+*>                         590             3000          NS =  64
+*>                        3000             6000          NS = 128
+*>                        6000             infinity      NS = 256
+*>
+*>                  (+)  By default some or all matrices of this order
+*>                       are passed to the implicit double shift routine
+*>                       ZLAHQR and this parameter is ignored.  See
+*>                       ISPEC=12 above and comments in IPARMQ for
+*>                       details.
+*>
+*>                 (**)  The asterisks (**) indicate an ad-hoc
+*>                       function of N increasing from 10 to 64.
+*>
+*>            ISPEC=16: Select structured matrix multiply.
+*>                      If the number of simultaneous shifts (specified
+*>                      by ISPEC=15) is less than 14, then the default
+*>                      for ISPEC=16 is 0.  Otherwise the default for
+*>                      ISPEC=16 is 2.
+*> \endverbatim
+*
+*> \par References:
+*  ================
+*>
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
+*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
+*>       929--947, 2002.
+*> \n
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part II: Aggressive Early Deflation, SIAM Journal
+*>       of Matrix Analysis, volume 23, pages 948--973, 2002.
+*
+*  =====================================================================
+      SUBROUTINE ZHSEQR( JOB, COMPZ, N, ILO, IHI, H, LDH, W, Z, LDZ,
+     $                   WORK, LWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2013
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHI, ILO, INFO, LDH, LDZ, LWORK, N
+      CHARACTER          COMPZ, JOB
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+*
+*     ==== Matrices of order NTINY or smaller must be processed by
+*     .    ZLAHQR because of insufficient subdiagonal scratch space.
+*     .    (This is a hard limit.) ====
+      INTEGER            NTINY
+      PARAMETER          ( NTINY = 11 )
+*
+*     ==== NL allocates some local workspace to help small matrices
+*     .    through a rare ZLAHQR failure.  NL .GT. NTINY = 11 is
+*     .    required and NL .LE. NMIN = ILAENV(ISPEC=12,...) is recom-
+*     .    mended.  (The default value of NMIN is 75.)  Using NL = 49
+*     .    allows up to six simultaneous shifts and a 16-by-16
+*     .    deflation window.  ====
+      INTEGER            NL
+      PARAMETER          ( NL = 49 )
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   RZERO
+      PARAMETER          ( RZERO = 0.0d0 )
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         HL( NL, NL ), WORKL( NL )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            KBOT, NMIN
+      LOGICAL            INITZ, LQUERY, WANTT, WANTZ
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      LOGICAL            LSAME
+      EXTERNAL           ILAENV, LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZCOPY, ZLACPY, ZLAHQR, ZLAQR0, ZLASET
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     ==== Decode and check the input parameters. ====
+*
+      WANTT = LSAME( JOB, 'S' )
+      INITZ = LSAME( COMPZ, 'I' )
+      WANTZ = INITZ .OR. LSAME( COMPZ, 'V' )
+      WORK( 1 ) = DCMPLX( DBLE( MAX( 1, N ) ), RZERO )
+      LQUERY = LWORK.EQ.-1
+*
+      INFO = 0
+      IF( .NOT.LSAME( JOB, 'E' ) .AND. .NOT.WANTT ) THEN
+         INFO = -1
+      ELSE IF( .NOT.LSAME( COMPZ, 'N' ) .AND. .NOT.WANTZ ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
+         INFO = -4
+      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
+         INFO = -5
+      ELSE IF( LDH.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDZ.LT.1 .OR. ( WANTZ .AND. LDZ.LT.MAX( 1, N ) ) ) THEN
+         INFO = -10
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+         INFO = -12
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+*
+*        ==== Quick return in case of invalid argument. ====
+*
+         CALL XERBLA( 'ZHSEQR', -INFO )
+         RETURN
+*
+      ELSE IF( N.EQ.0 ) THEN
+*
+*        ==== Quick return in case N = 0; nothing to do. ====
+*
+         RETURN
+*
+      ELSE IF( LQUERY ) THEN
+*
+*        ==== Quick return in case of a workspace query ====
+*
+         CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI, Z,
+     $                LDZ, WORK, LWORK, INFO )
+*        ==== Ensure reported workspace size is backward-compatible with
+*        .    previous LAPACK versions. ====
+         WORK( 1 ) = DCMPLX( MAX( DBLE( WORK( 1 ) ), DBLE( MAX( 1,
+     $               N ) ) ), RZERO )
+         RETURN
+*
+      ELSE
+*
+*        ==== copy eigenvalues isolated by ZGEBAL ====
+*
+         IF( ILO.GT.1 )
+     $      CALL ZCOPY( ILO-1, H, LDH+1, W, 1 )
+         IF( IHI.LT.N )
+     $      CALL ZCOPY( N-IHI, H( IHI+1, IHI+1 ), LDH+1, W( IHI+1 ), 1 )
+*
+*        ==== Initialize Z, if requested ====
+*
+         IF( INITZ )
+     $      CALL ZLASET( 'A', N, N, ZERO, ONE, Z, LDZ )
+*
+*        ==== Quick return if possible ====
+*
+         IF( ILO.EQ.IHI ) THEN
+            W( ILO ) = H( ILO, ILO )
+            RETURN
+         END IF
+*
+*        ==== ZLAHQR/ZLAQR0 crossover point ====
+*
+         NMIN = ILAENV( 12, 'ZHSEQR', JOB( : 1 ) // COMPZ( : 1 ), N,
+     $          ILO, IHI, LWORK )
+         NMIN = MAX( NTINY, NMIN )
+*
+*        ==== ZLAQR0 for big matrices; ZLAHQR for small ones ====
+*
+         IF( N.GT.NMIN ) THEN
+            CALL ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+     $                   Z, LDZ, WORK, LWORK, INFO )
+         ELSE
+*
+*           ==== Small matrix ====
+*
+            CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILO, IHI,
+     $                   Z, LDZ, INFO )
+*
+            IF( INFO.GT.0 ) THEN
+*
+*              ==== A rare ZLAHQR failure!  ZLAQR0 sometimes succeeds
+*              .    when ZLAHQR fails. ====
+*
+               KBOT = INFO
+*
+               IF( N.GE.NL ) THEN
+*
+*                 ==== Larger matrices have enough subdiagonal scratch
+*                 .    space to call ZLAQR0 directly. ====
+*
+                  CALL ZLAQR0( WANTT, WANTZ, N, ILO, KBOT, H, LDH, W,
+     $                         ILO, IHI, Z, LDZ, WORK, LWORK, INFO )
+*
+               ELSE
+*
+*                 ==== Tiny matrices don't have enough subdiagonal
+*                 .    scratch space to benefit from ZLAQR0.  Hence,
+*                 .    tiny matrices must be copied into a larger
+*                 .    array before calling ZLAQR0. ====
+*
+                  CALL ZLACPY( 'A', N, N, H, LDH, HL, NL )
+                  HL( N+1, N ) = ZERO
+                  CALL ZLASET( 'A', NL, NL-N, ZERO, ZERO, HL( 1, N+1 ),
+     $                         NL )
+                  CALL ZLAQR0( WANTT, WANTZ, NL, ILO, KBOT, HL, NL, W,
+     $                         ILO, IHI, Z, LDZ, WORKL, NL, INFO )
+                  IF( WANTT .OR. INFO.NE.0 )
+     $               CALL ZLACPY( 'A', N, N, HL, NL, H, LDH )
+               END IF
+            END IF
+         END IF
+*
+*        ==== Clear out the trash, if necessary. ====
+*
+         IF( ( WANTT .OR. INFO.NE.0 ) .AND. N.GT.2 )
+     $      CALL ZLASET( 'L', N-2, N-2, ZERO, ZERO, H( 3, 1 ), LDH )
+*
+*        ==== Ensure reported workspace size is backward-compatible with
+*        .    previous LAPACK versions. ====
+*
+         WORK( 1 ) = DCMPLX( MAX( DBLE( MAX( 1, N ) ),
+     $               DBLE( WORK( 1 ) ) ), RZERO )
+      END IF
+*
+*     ==== End of ZHSEQR ====
+*
+      END
+*> \brief \b ZLABRD reduces the first nb rows and columns of a general matrix to a bidiagonal form.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLABRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlabrd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlabrd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlabrd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
+*                          LDY )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            LDA, LDX, LDY, M, N, NB
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   D( * ), E( * )
+*       COMPLEX*16         A( LDA, * ), TAUP( * ), TAUQ( * ), X( LDX, * ),
+*      $                   Y( LDY, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLABRD reduces the first NB rows and columns of a complex general
+*> m by n matrix A to upper or lower real bidiagonal form by a unitary
+*> transformation Q**H * A * P, and returns the matrices X and Y which
+*> are needed to apply the transformation to the unreduced part of A.
+*>
+*> If m >= n, A is reduced to upper bidiagonal form; if m < n, to lower
+*> bidiagonal form.
+*>
+*> This is an auxiliary routine called by ZGEBRD
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows in the matrix A.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns in the matrix A.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          The number of leading rows and columns of A to be reduced.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the m by n general matrix to be reduced.
+*>          On exit, the first NB rows and columns of the matrix are
+*>          overwritten; the rest of the array is unchanged.
+*>          If m >= n, elements on and below the diagonal in the first NB
+*>            columns, with the array TAUQ, represent the unitary
+*>            matrix Q as a product of elementary reflectors; and
+*>            elements above the diagonal in the first NB rows, with the
+*>            array TAUP, represent the unitary matrix P as a product
+*>            of elementary reflectors.
+*>          If m < n, elements below the diagonal in the first NB
+*>            columns, with the array TAUQ, represent the unitary
+*>            matrix Q as a product of elementary reflectors, and
+*>            elements on and above the diagonal in the first NB rows,
+*>            with the array TAUP, represent the unitary matrix P as
+*>            a product of elementary reflectors.
+*>          See Further Details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] D
+*> \verbatim
+*>          D is DOUBLE PRECISION array, dimension (NB)
+*>          The diagonal elements of the first NB rows and columns of
+*>          the reduced matrix.  D(i) = A(i,i).
+*> \endverbatim
+*>
+*> \param[out] E
+*> \verbatim
+*>          E is DOUBLE PRECISION array, dimension (NB)
+*>          The off-diagonal elements of the first NB rows and columns of
+*>          the reduced matrix.
+*> \endverbatim
+*>
+*> \param[out] TAUQ
+*> \verbatim
+*>          TAUQ is COMPLEX*16 array dimension (NB)
+*>          The scalar factors of the elementary reflectors which
+*>          represent the unitary matrix Q. See Further Details.
+*> \endverbatim
+*>
+*> \param[out] TAUP
+*> \verbatim
+*>          TAUP is COMPLEX*16 array, dimension (NB)
+*>          The scalar factors of the elementary reflectors which
+*>          represent the unitary matrix P. See Further Details.
+*> \endverbatim
+*>
+*> \param[out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension (LDX,NB)
+*>          The m-by-nb matrix X required to update the unreduced part
+*>          of A.
+*> \endverbatim
+*>
+*> \param[in] LDX
+*> \verbatim
+*>          LDX is INTEGER
+*>          The leading dimension of the array X. LDX >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] Y
+*> \verbatim
+*>          Y is COMPLEX*16 array, dimension (LDY,NB)
+*>          The n-by-nb matrix Y required to update the unreduced part
+*>          of A.
+*> \endverbatim
+*>
+*> \param[in] LDY
+*> \verbatim
+*>          LDY is INTEGER
+*>          The leading dimension of the array Y. LDY >= max(1,N).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrices Q and P are represented as products of elementary
+*>  reflectors:
+*>
+*>     Q = H(1) H(2) . . . H(nb)  and  P = G(1) G(2) . . . G(nb)
+*>
+*>  Each H(i) and G(i) has the form:
+*>
+*>     H(i) = I - tauq * v * v**H  and G(i) = I - taup * u * u**H
+*>
+*>  where tauq and taup are complex scalars, and v and u are complex
+*>  vectors.
+*>
+*>  If m >= n, v(1:i-1) = 0, v(i) = 1, and v(i:m) is stored on exit in
+*>  A(i:m,i); u(1:i) = 0, u(i+1) = 1, and u(i+1:n) is stored on exit in
+*>  A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).
+*>
+*>  If m < n, v(1:i) = 0, v(i+1) = 1, and v(i+1:m) is stored on exit in
+*>  A(i+2:m,i); u(1:i-1) = 0, u(i) = 1, and u(i:n) is stored on exit in
+*>  A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).
+*>
+*>  The elements of the vectors v and u together form the m-by-nb matrix
+*>  V and the nb-by-n matrix U**H which are needed, with X and Y, to apply
+*>  the transformation to the unreduced part of the matrix, using a block
+*>  update of the form:  A := A - V*Y**H - X*U**H.
+*>
+*>  The contents of A on exit are illustrated by the following examples
+*>  with nb = 2:
+*>
+*>  m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):
+*>
+*>    (  1   1   u1  u1  u1 )           (  1   u1  u1  u1  u1  u1 )
+*>    (  v1  1   1   u2  u2 )           (  1   1   u2  u2  u2  u2 )
+*>    (  v1  v2  a   a   a  )           (  v1  1   a   a   a   a  )
+*>    (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )
+*>    (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )
+*>    (  v1  v2  a   a   a  )
+*>
+*>  where a denotes an element of the original matrix which is unchanged,
+*>  vi denotes an element of the vector defining H(i), and ui an element
+*>  of the vector defining G(i).
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLABRD( M, N, NB, A, LDA, D, E, TAUQ, TAUP, X, LDX, Y,
+     $                   LDY )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            LDA, LDX, LDY, M, N, NB
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   D( * ), E( * )
+      COMPLEX*16         A( LDA, * ), TAUP( * ), TAUQ( * ), X( LDX, * ),
+     $                   Y( LDY, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I
+      COMPLEX*16         ALPHA
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMV, ZLACGV, ZLARFG, ZSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( M.LE.0 .OR. N.LE.0 )
+     $   RETURN
+*
+      IF( M.GE.N ) THEN
+*
+*        Reduce to upper bidiagonal form
+*
+         DO 10 I = 1, NB
+*
+*           Update A(i:m,i)
+*
+            CALL ZLACGV( I-1, Y( I, 1 ), LDY )
+            CALL ZGEMV( 'No transpose', M-I+1, I-1, -ONE, A( I, 1 ),
+     $                  LDA, Y( I, 1 ), LDY, ONE, A( I, I ), 1 )
+            CALL ZLACGV( I-1, Y( I, 1 ), LDY )
+            CALL ZGEMV( 'No transpose', M-I+1, I-1, -ONE, X( I, 1 ),
+     $                  LDX, A( 1, I ), 1, ONE, A( I, I ), 1 )
+*
+*           Generate reflection Q(i) to annihilate A(i+1:m,i)
+*
+            ALPHA = A( I, I )
+            CALL ZLARFG( M-I+1, ALPHA, A( MIN( I+1, M ), I ), 1,
+     $                   TAUQ( I ) )
+            D( I ) = ALPHA
+            IF( I.LT.N ) THEN
+               A( I, I ) = ONE
+*
+*              Compute Y(i+1:n,i)
+*
+               CALL ZGEMV( 'Conjugate transpose', M-I+1, N-I, ONE,
+     $                     A( I, I+1 ), LDA, A( I, I ), 1, ZERO,
+     $                     Y( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
+     $                     A( I, 1 ), LDA, A( I, I ), 1, ZERO,
+     $                     Y( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+     $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', M-I+1, I-1, ONE,
+     $                     X( I, 1 ), LDX, A( I, I ), 1, ZERO,
+     $                     Y( 1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', I-1, N-I, -ONE,
+     $                     A( 1, I+1 ), LDA, Y( 1, I ), 1, ONE,
+     $                     Y( I+1, I ), 1 )
+               CALL ZSCAL( N-I, TAUQ( I ), Y( I+1, I ), 1 )
+*
+*              Update A(i,i+1:n)
+*
+               CALL ZLACGV( N-I, A( I, I+1 ), LDA )
+               CALL ZLACGV( I, A( I, 1 ), LDA )
+               CALL ZGEMV( 'No transpose', N-I, I, -ONE, Y( I+1, 1 ),
+     $                     LDY, A( I, 1 ), LDA, ONE, A( I, I+1 ), LDA )
+               CALL ZLACGV( I, A( I, 1 ), LDA )
+               CALL ZLACGV( I-1, X( I, 1 ), LDX )
+               CALL ZGEMV( 'Conjugate transpose', I-1, N-I, -ONE,
+     $                     A( 1, I+1 ), LDA, X( I, 1 ), LDX, ONE,
+     $                     A( I, I+1 ), LDA )
+               CALL ZLACGV( I-1, X( I, 1 ), LDX )
+*
+*              Generate reflection P(i) to annihilate A(i,i+2:n)
+*
+               ALPHA = A( I, I+1 )
+               CALL ZLARFG( N-I, ALPHA, A( I, MIN( I+2, N ) ), LDA,
+     $                      TAUP( I ) )
+               E( I ) = ALPHA
+               A( I, I+1 ) = ONE
+*
+*              Compute X(i+1:m,i)
+*
+               CALL ZGEMV( 'No transpose', M-I, N-I, ONE, A( I+1, I+1 ),
+     $                     LDA, A( I, I+1 ), LDA, ZERO, X( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', N-I, I, ONE,
+     $                     Y( I+1, 1 ), LDY, A( I, I+1 ), LDA, ZERO,
+     $                     X( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', M-I, I, -ONE, A( I+1, 1 ),
+     $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
+               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+     $                     LDA, A( I, I+1 ), LDA, ZERO, X( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+     $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
+               CALL ZSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
+               CALL ZLACGV( N-I, A( I, I+1 ), LDA )
+            END IF
+   10    CONTINUE
+      ELSE
+*
+*        Reduce to lower bidiagonal form
+*
+         DO 20 I = 1, NB
+*
+*           Update A(i,i:n)
+*
+            CALL ZLACGV( N-I+1, A( I, I ), LDA )
+            CALL ZLACGV( I-1, A( I, 1 ), LDA )
+            CALL ZGEMV( 'No transpose', N-I+1, I-1, -ONE, Y( I, 1 ),
+     $                  LDY, A( I, 1 ), LDA, ONE, A( I, I ), LDA )
+            CALL ZLACGV( I-1, A( I, 1 ), LDA )
+            CALL ZLACGV( I-1, X( I, 1 ), LDX )
+            CALL ZGEMV( 'Conjugate transpose', I-1, N-I+1, -ONE,
+     $                  A( 1, I ), LDA, X( I, 1 ), LDX, ONE, A( I, I ),
+     $                  LDA )
+            CALL ZLACGV( I-1, X( I, 1 ), LDX )
+*
+*           Generate reflection P(i) to annihilate A(i,i+1:n)
+*
+            ALPHA = A( I, I )
+            CALL ZLARFG( N-I+1, ALPHA, A( I, MIN( I+1, N ) ), LDA,
+     $                   TAUP( I ) )
+            D( I ) = ALPHA
+            IF( I.LT.M ) THEN
+               A( I, I ) = ONE
+*
+*              Compute X(i+1:m,i)
+*
+               CALL ZGEMV( 'No transpose', M-I, N-I+1, ONE, A( I+1, I ),
+     $                     LDA, A( I, I ), LDA, ZERO, X( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', N-I+1, I-1, ONE,
+     $                     Y( I, 1 ), LDY, A( I, I ), LDA, ZERO,
+     $                     X( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+     $                     LDA, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
+               CALL ZGEMV( 'No transpose', I-1, N-I+1, ONE, A( 1, I ),
+     $                     LDA, A( I, I ), LDA, ZERO, X( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, X( I+1, 1 ),
+     $                     LDX, X( 1, I ), 1, ONE, X( I+1, I ), 1 )
+               CALL ZSCAL( M-I, TAUP( I ), X( I+1, I ), 1 )
+               CALL ZLACGV( N-I+1, A( I, I ), LDA )
+*
+*              Update A(i+1:m,i)
+*
+               CALL ZLACGV( I-1, Y( I, 1 ), LDY )
+               CALL ZGEMV( 'No transpose', M-I, I-1, -ONE, A( I+1, 1 ),
+     $                     LDA, Y( I, 1 ), LDY, ONE, A( I+1, I ), 1 )
+               CALL ZLACGV( I-1, Y( I, 1 ), LDY )
+               CALL ZGEMV( 'No transpose', M-I, I, -ONE, X( I+1, 1 ),
+     $                     LDX, A( 1, I ), 1, ONE, A( I+1, I ), 1 )
+*
+*              Generate reflection Q(i) to annihilate A(i+2:m,i)
+*
+               ALPHA = A( I+1, I )
+               CALL ZLARFG( M-I, ALPHA, A( MIN( I+2, M ), I ), 1,
+     $                      TAUQ( I ) )
+               E( I ) = ALPHA
+               A( I+1, I ) = ONE
+*
+*              Compute Y(i+1:n,i)
+*
+               CALL ZGEMV( 'Conjugate transpose', M-I, N-I, ONE,
+     $                     A( I+1, I+1 ), LDA, A( I+1, I ), 1, ZERO,
+     $                     Y( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', M-I, I-1, ONE,
+     $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
+     $                     Y( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, Y( I+1, 1 ),
+     $                     LDY, Y( 1, I ), 1, ONE, Y( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', M-I, I, ONE,
+     $                     X( I+1, 1 ), LDX, A( I+1, I ), 1, ZERO,
+     $                     Y( 1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', I, N-I, -ONE,
+     $                     A( 1, I+1 ), LDA, Y( 1, I ), 1, ONE,
+     $                     Y( I+1, I ), 1 )
+               CALL ZSCAL( N-I, TAUQ( I ), Y( I+1, I ), 1 )
+            ELSE
+               CALL ZLACGV( N-I+1, A( I, I ), LDA )
+            END IF
+   20    CONTINUE
+      END IF
+      RETURN
+*
+*     End of ZLABRD
+*
+      END
+*> \brief \b ZLACGV conjugates a complex vector.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLACGV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacgv.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacgv.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacgv.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLACGV( N, X, INCX )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INCX, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         X( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLACGV conjugates a complex vector of length N.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The length of the vector X.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension
+*>                         (1+(N-1)*abs(INCX))
+*>          On entry, the vector of length N to be conjugated.
+*>          On exit, X is overwritten with conjg(X).
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          The spacing between successive elements of X.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLACGV( N, X, INCX )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            INCX, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         X( * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER            I, IOFF
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG
+*     ..
+*     .. Executable Statements ..
+*
+      IF( INCX.EQ.1 ) THEN
+         DO 10 I = 1, N
+            X( I ) = DCONJG( X( I ) )
+   10    CONTINUE
+      ELSE
+         IOFF = 1
+         IF( INCX.LT.0 )
+     $      IOFF = 1 - ( N-1 )*INCX
+         DO 20 I = 1, N
+            X( IOFF ) = DCONJG( X( IOFF ) )
+            IOFF = IOFF + INCX
+   20    CONTINUE
+      END IF
+      RETURN
+*
+*     End of ZLACGV
+*
+      END
+*> \brief \b ZLACN2 estimates the 1-norm of a square matrix, using reverse communication for evaluating matrix-vector products.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLACN2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacn2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacn2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacn2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLACN2( N, V, X, EST, KASE, ISAVE )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            KASE, N
+*       DOUBLE PRECISION   EST
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            ISAVE( 3 )
+*       COMPLEX*16         V( * ), X( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLACN2 estimates the 1-norm of a square, complex matrix A.
+*> Reverse communication is used for evaluating matrix-vector products.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>         The order of the matrix.  N >= 1.
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension (N)
+*>         On the final return, V = A*W,  where  EST = norm(V)/norm(W)
+*>         (W is not returned).
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension (N)
+*>         On an intermediate return, X should be overwritten by
+*>               A * X,   if KASE=1,
+*>               A**H * X,  if KASE=2,
+*>         where A**H is the conjugate transpose of A, and ZLACN2 must be
+*>         re-called with all the other parameters unchanged.
+*> \endverbatim
+*>
+*> \param[in,out] EST
+*> \verbatim
+*>          EST is DOUBLE PRECISION
+*>         On entry with KASE = 1 or 2 and ISAVE(1) = 3, EST should be
+*>         unchanged from the previous call to ZLACN2.
+*>         On exit, EST is an estimate (a lower bound) for norm(A). 
+*> \endverbatim
+*>
+*> \param[in,out] KASE
+*> \verbatim
+*>          KASE is INTEGER
+*>         On the initial call to ZLACN2, KASE should be 0.
+*>         On an intermediate return, KASE will be 1 or 2, indicating
+*>         whether X should be overwritten by A * X  or A**H * X.
+*>         On the final return from ZLACN2, KASE will again be 0.
+*> \endverbatim
+*>
+*> \param[in,out] ISAVE
+*> \verbatim
+*>          ISAVE is INTEGER array, dimension (3)
+*>         ISAVE is used to save variables between calls to ZLACN2
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Originally named CONEST, dated March 16, 1988.
+*>
+*>  Last modified:  April, 1999
+*>
+*>  This is a thread safe version of ZLACON, which uses the array ISAVE
+*>  in place of a SAVE statement, as follows:
+*>
+*>     ZLACON     ZLACN2
+*>      JUMP     ISAVE(1)
+*>      J        ISAVE(2)
+*>      ITER     ISAVE(3)
+*> \endverbatim
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Nick Higham, University of Manchester
+*
+*> \par References:
+*  ================
+*>
+*>  N.J. Higham, "FORTRAN codes for estimating the one-norm of
+*>  a real or complex matrix, with applications to condition estimation",
+*>  ACM Trans. Math. Soft., vol. 14, no. 4, pp. 381-396, December 1988.
+*>
+*  =====================================================================
+      SUBROUTINE ZLACN2( N, V, X, EST, KASE, ISAVE )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            KASE, N
+      DOUBLE PRECISION   EST
+*     ..
+*     .. Array Arguments ..
+      INTEGER            ISAVE( 3 )
+      COMPLEX*16         V( * ), X( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER              ITMAX
+      PARAMETER          ( ITMAX = 5 )
+      DOUBLE PRECISION     ONE,         TWO
+      PARAMETER          ( ONE = 1.0D0, TWO = 2.0D0 )
+      COMPLEX*16           CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ),
+     $                            CONE = ( 1.0D0, 0.0D0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, JLAST
+      DOUBLE PRECISION   ABSXI, ALTSGN, ESTOLD, SAFMIN, TEMP
+*     ..
+*     .. External Functions ..
+      INTEGER            IZMAX1
+      DOUBLE PRECISION   DLAMCH, DZSUM1
+      EXTERNAL           IZMAX1, DLAMCH, DZSUM1
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZCOPY
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG
+*     ..
+*     .. Executable Statements ..
+*
+      SAFMIN = DLAMCH( 'Safe minimum' )
+      IF( KASE.EQ.0 ) THEN
+         DO 10 I = 1, N
+            X( I ) = DCMPLX( ONE / DBLE( N ) )
+   10    CONTINUE
+         KASE = 1
+         ISAVE( 1 ) = 1
+         RETURN
+      END IF
+*
+      GO TO ( 20, 40, 70, 90, 120 )ISAVE( 1 )
+*
+*     ................ ENTRY   (ISAVE( 1 ) = 1)
+*     FIRST ITERATION.  X HAS BEEN OVERWRITTEN BY A*X.
+*
+   20 CONTINUE
+      IF( N.EQ.1 ) THEN
+         V( 1 ) = X( 1 )
+         EST = ABS( V( 1 ) )
+*        ... QUIT
+         GO TO 130
+      END IF
+      EST = DZSUM1( N, X, 1 )
+*
+      DO 30 I = 1, N
+         ABSXI = ABS( X( I ) )
+         IF( ABSXI.GT.SAFMIN ) THEN
+            X( I ) = DCMPLX( DBLE( X( I ) ) / ABSXI,
+     $               DIMAG( X( I ) ) / ABSXI )
+         ELSE
+            X( I ) = CONE
+         END IF
+   30 CONTINUE
+      KASE = 2
+      ISAVE( 1 ) = 2
+      RETURN
+*
+*     ................ ENTRY   (ISAVE( 1 ) = 2)
+*     FIRST ITERATION.  X HAS BEEN OVERWRITTEN BY CTRANS(A)*X.
+*
+   40 CONTINUE
+      ISAVE( 2 ) = IZMAX1( N, X, 1 )
+      ISAVE( 3 ) = 2
+*
+*     MAIN LOOP - ITERATIONS 2,3,...,ITMAX.
+*
+   50 CONTINUE
+      DO 60 I = 1, N
+         X( I ) = CZERO
+   60 CONTINUE
+      X( ISAVE( 2 ) ) = CONE
+      KASE = 1
+      ISAVE( 1 ) = 3
+      RETURN
+*
+*     ................ ENTRY   (ISAVE( 1 ) = 3)
+*     X HAS BEEN OVERWRITTEN BY A*X.
+*
+   70 CONTINUE
+      CALL ZCOPY( N, X, 1, V, 1 )
+      ESTOLD = EST
+      EST = DZSUM1( N, V, 1 )
+*
+*     TEST FOR CYCLING.
+      IF( EST.LE.ESTOLD )
+     $   GO TO 100
+*
+      DO 80 I = 1, N
+         ABSXI = ABS( X( I ) )
+         IF( ABSXI.GT.SAFMIN ) THEN
+            X( I ) = DCMPLX( DBLE( X( I ) ) / ABSXI,
+     $               DIMAG( X( I ) ) / ABSXI )
+         ELSE
+            X( I ) = CONE
+         END IF
+   80 CONTINUE
+      KASE = 2
+      ISAVE( 1 ) = 4
+      RETURN
+*
+*     ................ ENTRY   (ISAVE( 1 ) = 4)
+*     X HAS BEEN OVERWRITTEN BY CTRANS(A)*X.
+*
+   90 CONTINUE
+      JLAST = ISAVE( 2 )
+      ISAVE( 2 ) = IZMAX1( N, X, 1 )
+      IF( ( ABS( X( JLAST ) ).NE.ABS( X( ISAVE( 2 ) ) ) ) .AND.
+     $    ( ISAVE( 3 ).LT.ITMAX ) ) THEN
+         ISAVE( 3 ) = ISAVE( 3 ) + 1
+         GO TO 50
+      END IF
+*
+*     ITERATION COMPLETE.  FINAL STAGE.
+*
+  100 CONTINUE
+      ALTSGN = ONE
+      DO 110 I = 1, N
+         X( I ) = DCMPLX( ALTSGN*( ONE+DBLE( I-1 ) / DBLE( N-1 ) ) )
+         ALTSGN = -ALTSGN
+  110 CONTINUE
+      KASE = 1
+      ISAVE( 1 ) = 5
+      RETURN
+*
+*     ................ ENTRY   (ISAVE( 1 ) = 5)
+*     X HAS BEEN OVERWRITTEN BY A*X.
+*
+  120 CONTINUE
+      TEMP = TWO*( DZSUM1( N, X, 1 ) / DBLE( 3*N ) )
+      IF( TEMP.GT.EST ) THEN
+         CALL ZCOPY( N, X, 1, V, 1 )
+         EST = TEMP
+      END IF
+*
+  130 CONTINUE
+      KASE = 0
+      RETURN
+*
+*     End of ZLACN2
+*
+      END
+*> \brief \b ZLACP2 copies all or part of a real two-dimensional array to a complex array.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLACP2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacp2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacp2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacp2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLACP2( UPLO, M, N, A, LDA, B, LDB )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            LDA, LDB, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * )
+*       COMPLEX*16         B( LDB, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLACP2 copies all or part of a real two-dimensional matrix A to a
+*> complex matrix B.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies the part of the matrix A to be copied to B.
+*>          = 'U':      Upper triangular part
+*>          = 'L':      Lower triangular part
+*>          Otherwise:  All of the matrix A
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          The m by n matrix A.  If UPLO = 'U', only the upper trapezium
+*>          is accessed; if UPLO = 'L', only the lower trapezium is
+*>          accessed.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,N)
+*>          On exit, B = A in the locations specified by UPLO.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,M).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLACP2( UPLO, M, N, A, LDA, B, LDB )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            LDA, LDB, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * )
+      COMPLEX*16         B( LDB, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER            I, J
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+      IF( LSAME( UPLO, 'U' ) ) THEN
+         DO 20 J = 1, N
+            DO 10 I = 1, MIN( J, M )
+               B( I, J ) = A( I, J )
+   10       CONTINUE
+   20    CONTINUE
+*
+      ELSE IF( LSAME( UPLO, 'L' ) ) THEN
+         DO 40 J = 1, N
+            DO 30 I = J, M
+               B( I, J ) = A( I, J )
+   30       CONTINUE
+   40    CONTINUE
+*
+      ELSE
+         DO 60 J = 1, N
+            DO 50 I = 1, M
+               B( I, J ) = A( I, J )
+   50       CONTINUE
+   60    CONTINUE
+      END IF
+*
+      RETURN
+*
+*     End of ZLACP2
+*
+      END
+*> \brief \b ZLACPY copies all or part of one two-dimensional array to another.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLACPY + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacpy.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacpy.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacpy.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLACPY( UPLO, M, N, A, LDA, B, LDB )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            LDA, LDB, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), B( LDB, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLACPY copies all or part of a two-dimensional matrix A to another
+*> matrix B.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies the part of the matrix A to be copied to B.
+*>          = 'U':      Upper triangular part
+*>          = 'L':      Lower triangular part
+*>          Otherwise:  All of the matrix A
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The m by n matrix A.  If UPLO = 'U', only the upper trapezium
+*>          is accessed; if UPLO = 'L', only the lower trapezium is
+*>          accessed.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,N)
+*>          On exit, B = A in the locations specified by UPLO.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,M).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLACPY( UPLO, M, N, A, LDA, B, LDB )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            LDA, LDB, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), B( LDB, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER            I, J
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+      IF( LSAME( UPLO, 'U' ) ) THEN
+         DO 20 J = 1, N
+            DO 10 I = 1, MIN( J, M )
+               B( I, J ) = A( I, J )
+   10       CONTINUE
+   20    CONTINUE
+*
+      ELSE IF( LSAME( UPLO, 'L' ) ) THEN
+         DO 40 J = 1, N
+            DO 30 I = J, M
+               B( I, J ) = A( I, J )
+   30       CONTINUE
+   40    CONTINUE
+*
+      ELSE
+         DO 60 J = 1, N
+            DO 50 I = 1, M
+               B( I, J ) = A( I, J )
+   50       CONTINUE
+   60    CONTINUE
+      END IF
+*
+      RETURN
+*
+*     End of ZLACPY
+*
+      END
+*> \brief \b ZLACRM multiplies a complex matrix by a square real matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLACRM + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacrm.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacrm.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacrm.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLACRM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            LDA, LDB, LDC, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   B( LDB, * ), RWORK( * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLACRM performs a very simple matrix-matrix multiplication:
+*>          C := A * B,
+*> where A is M by N and complex; B is N by N and real;
+*> C is M by N and complex.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A and of the matrix C.
+*>          M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns and rows of the matrix B and
+*>          the number of columns of the matrix C.
+*>          N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA, N)
+*>          A contains the M by N matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >=max(1,M).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB, N)
+*>          B contains the N by N matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >=max(1,N).
+*> \endverbatim
+*>
+*> \param[in] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC, N)
+*>          C contains the M by N matrix C.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >=max(1,N).
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*M*N)
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLACRM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            LDA, LDB, LDC, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   B( LDB, * ), RWORK( * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, L
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, DIMAG
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible.
+*
+      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )
+     $   RETURN
+*
+      DO 20 J = 1, N
+         DO 10 I = 1, M
+            RWORK( ( J-1 )*M+I ) = DBLE( A( I, J ) )
+   10    CONTINUE
+   20 CONTINUE
+*
+      L = M*N + 1
+      CALL DGEMM( 'N', 'N', M, N, N, ONE, RWORK, M, B, LDB, ZERO,
+     $            RWORK( L ), M )
+      DO 40 J = 1, N
+         DO 30 I = 1, M
+            C( I, J ) = RWORK( L+( J-1 )*M+I-1 )
+   30    CONTINUE
+   40 CONTINUE
+*
+      DO 60 J = 1, N
+         DO 50 I = 1, M
+            RWORK( ( J-1 )*M+I ) = DIMAG( A( I, J ) )
+   50    CONTINUE
+   60 CONTINUE
+      CALL DGEMM( 'N', 'N', M, N, N, ONE, RWORK, M, B, LDB, ZERO,
+     $            RWORK( L ), M )
+      DO 80 J = 1, N
+         DO 70 I = 1, M
+            C( I, J ) = DCMPLX( DBLE( C( I, J ) ),
+     $                  RWORK( L+( J-1 )*M+I-1 ) )
+   70    CONTINUE
+   80 CONTINUE
+*
+      RETURN
+*
+*     End of ZLACRM
+*
+      END
+*> \brief \b ZLADIV performs complex division in real arithmetic, avoiding unnecessary overflow.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLADIV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zladiv.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zladiv.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zladiv.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       COMPLEX*16     FUNCTION ZLADIV( X, Y )
+* 
+*       .. Scalar Arguments ..
+*       COMPLEX*16         X, Y
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLADIV := X / Y, where X and Y are complex.  The computation of X / Y
+*> will not overflow on an intermediary step unless the results
+*> overflows.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] X
+*> \verbatim
+*>          X is COMPLEX*16
+*> \endverbatim
+*>
+*> \param[in] Y
+*> \verbatim
+*>          Y is COMPLEX*16
+*>          The complex scalars X and Y.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      COMPLEX*16     FUNCTION ZLADIV( X, Y )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      COMPLEX*16         X, Y
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      DOUBLE PRECISION   ZI, ZR
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLADIV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, DIMAG
+*     ..
+*     .. Executable Statements ..
+*
+      CALL DLADIV( DBLE( X ), DIMAG( X ), DBLE( Y ), DIMAG( Y ), ZR,
+     $             ZI )
+      ZLADIV = DCMPLX( ZR, ZI )
+*
+      RETURN
+*
+*     End of ZLADIV
+*
+      END
+*> \brief \b ZLAED0 used by sstedc. Computes all eigenvalues and corresponding eigenvectors of an unreduced symmetric tridiagonal matrix using the divide and conquer method.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAED0 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaed0.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaed0.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaed0.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAED0( QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS, RWORK,
+*                          IWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, LDQ, LDQS, N, QSIZ
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
+*       COMPLEX*16         Q( LDQ, * ), QSTORE( LDQS, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> Using the divide and conquer method, ZLAED0 computes all eigenvalues
+*> of a symmetric tridiagonal matrix which is one diagonal block of
+*> those from reducing a dense or band Hermitian matrix and
+*> corresponding eigenvectors of the dense or band matrix.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] QSIZ
+*> \verbatim
+*>          QSIZ is INTEGER
+*>         The dimension of the unitary matrix used to reduce
+*>         the full matrix to tridiagonal form.  QSIZ >= N if ICOMPQ = 1.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>         The dimension of the symmetric tridiagonal matrix.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] D
+*> \verbatim
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>         On entry, the diagonal elements of the tridiagonal matrix.
+*>         On exit, the eigenvalues in ascending order.
+*> \endverbatim
+*>
+*> \param[in,out] E
+*> \verbatim
+*>          E is DOUBLE PRECISION array, dimension (N-1)
+*>         On entry, the off-diagonal elements of the tridiagonal matrix.
+*>         On exit, E has been destroyed.
+*> \endverbatim
+*>
+*> \param[in,out] Q
+*> \verbatim
+*>          Q is COMPLEX*16 array, dimension (LDQ,N)
+*>         On entry, Q must contain an QSIZ x N matrix whose columns
+*>         unitarily orthonormal. It is a part of the unitary matrix
+*>         that reduces the full dense Hermitian matrix to a
+*>         (reducible) symmetric tridiagonal matrix.
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>         The leading dimension of the array Q.  LDQ >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array,
+*>         the dimension of IWORK must be at least
+*>                      6 + 6*N + 5*N*lg N
+*>                      ( lg( N ) = smallest integer k
+*>                                  such that 2^k >= N )
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array,
+*>                               dimension (1 + 3*N + 2*N*lg N + 3*N**2)
+*>                        ( lg( N ) = smallest integer k
+*>                                    such that 2^k >= N )
+*> \endverbatim
+*>
+*> \param[out] QSTORE
+*> \verbatim
+*>          QSTORE is COMPLEX*16 array, dimension (LDQS, N)
+*>         Used to store parts of
+*>         the eigenvector matrix when the updating matrix multiplies
+*>         take place.
+*> \endverbatim
+*>
+*> \param[in] LDQS
+*> \verbatim
+*>          LDQS is INTEGER
+*>         The leading dimension of the array QSTORE.
+*>         LDQS >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  The algorithm failed to compute an eigenvalue while
+*>                working on the submatrix lying in rows and columns
+*>                INFO/(N+1) through mod(INFO,N+1).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERcomputational
+*
+*  =====================================================================
+      SUBROUTINE ZLAED0( QSIZ, N, D, E, Q, LDQ, QSTORE, LDQS, RWORK,
+     $                   IWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDQ, LDQS, N, QSIZ
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
+      COMPLEX*16         Q( LDQ, * ), QSTORE( LDQS, * )
+*     ..
+*
+*  =====================================================================
+*
+*  Warning:      N could be as big as QSIZ!
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   TWO
+      PARAMETER          ( TWO = 2.D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            CURLVL, CURPRB, CURR, I, IGIVCL, IGIVNM,
+     $                   IGIVPT, INDXQ, IPERM, IPRMPT, IQ, IQPTR, IWREM,
+     $                   J, K, LGN, LL, MATSIZ, MSD2, SMLSIZ, SMM1,
+     $                   SPM1, SPM2, SUBMAT, SUBPBS, TLVLS
+      DOUBLE PRECISION   TEMP
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DCOPY, DSTEQR, XERBLA, ZCOPY, ZLACRM, ZLAED7
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, INT, LOG, MAX
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+*
+*     IF( ICOMPQ .LT. 0 .OR. ICOMPQ .GT. 2 ) THEN
+*        INFO = -1
+*     ELSE IF( ( ICOMPQ .EQ. 1 ) .AND. ( QSIZ .LT. MAX( 0, N ) ) )
+*    $        THEN
+      IF( QSIZ.LT.MAX( 0, N ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDQ.LT.MAX( 1, N ) ) THEN
+         INFO = -6
+      ELSE IF( LDQS.LT.MAX( 1, N ) ) THEN
+         INFO = -8
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLAED0', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      SMLSIZ = ILAENV( 9, 'ZLAED0', ' ', 0, 0, 0, 0 )
+*
+*     Determine the size and placement of the submatrices, and save in
+*     the leading elements of IWORK.
+*
+      IWORK( 1 ) = N
+      SUBPBS = 1
+      TLVLS = 0
+   10 CONTINUE
+      IF( IWORK( SUBPBS ).GT.SMLSIZ ) THEN
+         DO 20 J = SUBPBS, 1, -1
+            IWORK( 2*J ) = ( IWORK( J )+1 ) / 2
+            IWORK( 2*J-1 ) = IWORK( J ) / 2
+   20    CONTINUE
+         TLVLS = TLVLS + 1
+         SUBPBS = 2*SUBPBS
+         GO TO 10
+      END IF
+      DO 30 J = 2, SUBPBS
+         IWORK( J ) = IWORK( J ) + IWORK( J-1 )
+   30 CONTINUE
+*
+*     Divide the matrix into SUBPBS submatrices of size at most SMLSIZ+1
+*     using rank-1 modifications (cuts).
+*
+      SPM1 = SUBPBS - 1
+      DO 40 I = 1, SPM1
+         SUBMAT = IWORK( I ) + 1
+         SMM1 = SUBMAT - 1
+         D( SMM1 ) = D( SMM1 ) - ABS( E( SMM1 ) )
+         D( SUBMAT ) = D( SUBMAT ) - ABS( E( SMM1 ) )
+   40 CONTINUE
+*
+      INDXQ = 4*N + 3
+*
+*     Set up workspaces for eigenvalues only/accumulate new vectors
+*     routine
+*
+      TEMP = LOG( DBLE( N ) ) / LOG( TWO )
+      LGN = INT( TEMP )
+      IF( 2**LGN.LT.N )
+     $   LGN = LGN + 1
+      IF( 2**LGN.LT.N )
+     $   LGN = LGN + 1
+      IPRMPT = INDXQ + N + 1
+      IPERM = IPRMPT + N*LGN
+      IQPTR = IPERM + N*LGN
+      IGIVPT = IQPTR + N + 2
+      IGIVCL = IGIVPT + N*LGN
+*
+      IGIVNM = 1
+      IQ = IGIVNM + 2*N*LGN
+      IWREM = IQ + N**2 + 1
+*     Initialize pointers
+      DO 50 I = 0, SUBPBS
+         IWORK( IPRMPT+I ) = 1
+         IWORK( IGIVPT+I ) = 1
+   50 CONTINUE
+      IWORK( IQPTR ) = 1
+*
+*     Solve each submatrix eigenproblem at the bottom of the divide and
+*     conquer tree.
+*
+      CURR = 0
+      DO 70 I = 0, SPM1
+         IF( I.EQ.0 ) THEN
+            SUBMAT = 1
+            MATSIZ = IWORK( 1 )
+         ELSE
+            SUBMAT = IWORK( I ) + 1
+            MATSIZ = IWORK( I+1 ) - IWORK( I )
+         END IF
+         LL = IQ - 1 + IWORK( IQPTR+CURR )
+         CALL DSTEQR( 'I', MATSIZ, D( SUBMAT ), E( SUBMAT ),
+     $                RWORK( LL ), MATSIZ, RWORK, INFO )
+         CALL ZLACRM( QSIZ, MATSIZ, Q( 1, SUBMAT ), LDQ, RWORK( LL ),
+     $                MATSIZ, QSTORE( 1, SUBMAT ), LDQS,
+     $                RWORK( IWREM ) )
+         IWORK( IQPTR+CURR+1 ) = IWORK( IQPTR+CURR ) + MATSIZ**2
+         CURR = CURR + 1
+         IF( INFO.GT.0 ) THEN
+            INFO = SUBMAT*( N+1 ) + SUBMAT + MATSIZ - 1
+            RETURN
+         END IF
+         K = 1
+         DO 60 J = SUBMAT, IWORK( I+1 )
+            IWORK( INDXQ+J ) = K
+            K = K + 1
+   60    CONTINUE
+   70 CONTINUE
+*
+*     Successively merge eigensystems of adjacent submatrices
+*     into eigensystem for the corresponding larger matrix.
+*
+*     while ( SUBPBS > 1 )
+*
+      CURLVL = 1
+   80 CONTINUE
+      IF( SUBPBS.GT.1 ) THEN
+         SPM2 = SUBPBS - 2
+         DO 90 I = 0, SPM2, 2
+            IF( I.EQ.0 ) THEN
+               SUBMAT = 1
+               MATSIZ = IWORK( 2 )
+               MSD2 = IWORK( 1 )
+               CURPRB = 0
+            ELSE
+               SUBMAT = IWORK( I ) + 1
+               MATSIZ = IWORK( I+2 ) - IWORK( I )
+               MSD2 = MATSIZ / 2
+               CURPRB = CURPRB + 1
+            END IF
+*
+*     Merge lower order eigensystems (of size MSD2 and MATSIZ - MSD2)
+*     into an eigensystem of size MATSIZ.  ZLAED7 handles the case
+*     when the eigenvectors of a full or band Hermitian matrix (which
+*     was reduced to tridiagonal form) are desired.
+*
+*     I am free to use Q as a valuable working space until Loop 150.
+*
+            CALL ZLAED7( MATSIZ, MSD2, QSIZ, TLVLS, CURLVL, CURPRB,
+     $                   D( SUBMAT ), QSTORE( 1, SUBMAT ), LDQS,
+     $                   E( SUBMAT+MSD2-1 ), IWORK( INDXQ+SUBMAT ),
+     $                   RWORK( IQ ), IWORK( IQPTR ), IWORK( IPRMPT ),
+     $                   IWORK( IPERM ), IWORK( IGIVPT ),
+     $                   IWORK( IGIVCL ), RWORK( IGIVNM ),
+     $                   Q( 1, SUBMAT ), RWORK( IWREM ),
+     $                   IWORK( SUBPBS+1 ), INFO )
+            IF( INFO.GT.0 ) THEN
+               INFO = SUBMAT*( N+1 ) + SUBMAT + MATSIZ - 1
+               RETURN
+            END IF
+            IWORK( I / 2+1 ) = IWORK( I+2 )
+   90    CONTINUE
+         SUBPBS = SUBPBS / 2
+         CURLVL = CURLVL + 1
+         GO TO 80
+      END IF
+*
+*     end while
+*
+*     Re-merge the eigenvalues/vectors which were deflated at the final
+*     merge step.
+*
+      DO 100 I = 1, N
+         J = IWORK( INDXQ+I )
+         RWORK( I ) = D( J )
+         CALL ZCOPY( QSIZ, QSTORE( 1, J ), 1, Q( 1, I ), 1 )
+  100 CONTINUE
+      CALL DCOPY( N, RWORK, 1, D, 1 )
+*
+      RETURN
+*
+*     End of ZLAED0
+*
+      END
+*> \brief \b ZLAED7 used by sstedc. Computes the updated eigensystem of a diagonal matrix after modification by a rank-one symmetric matrix. Used when the original matrix is dense.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAED7 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaed7.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaed7.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaed7.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
+*                          LDQ, RHO, INDXQ, QSTORE, QPTR, PRMPTR, PERM,
+*                          GIVPTR, GIVCOL, GIVNUM, WORK, RWORK, IWORK,
+*                          INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            CURLVL, CURPBM, CUTPNT, INFO, LDQ, N, QSIZ,
+*      $                   TLVLS
+*       DOUBLE PRECISION   RHO
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            GIVCOL( 2, * ), GIVPTR( * ), INDXQ( * ),
+*      $                   IWORK( * ), PERM( * ), PRMPTR( * ), QPTR( * )
+*       DOUBLE PRECISION   D( * ), GIVNUM( 2, * ), QSTORE( * ), RWORK( * )
+*       COMPLEX*16         Q( LDQ, * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAED7 computes the updated eigensystem of a diagonal
+*> matrix after modification by a rank-one symmetric matrix. This
+*> routine is used only for the eigenproblem which requires all
+*> eigenvalues and optionally eigenvectors of a dense or banded
+*> Hermitian matrix that has been reduced to tridiagonal form.
+*>
+*>   T = Q(in) ( D(in) + RHO * Z*Z**H ) Q**H(in) = Q(out) * D(out) * Q**H(out)
+*>
+*>   where Z = Q**Hu, u is a vector of length N with ones in the
+*>   CUTPNT and CUTPNT + 1 th elements and zeros elsewhere.
+*>
+*>    The eigenvectors of the original matrix are stored in Q, and the
+*>    eigenvalues are in D.  The algorithm consists of three stages:
+*>
+*>       The first stage consists of deflating the size of the problem
+*>       when there are multiple eigenvalues or if there is a zero in
+*>       the Z vector.  For each such occurence the dimension of the
+*>       secular equation problem is reduced by one.  This stage is
+*>       performed by the routine DLAED2.
+*>
+*>       The second stage consists of calculating the updated
+*>       eigenvalues. This is done by finding the roots of the secular
+*>       equation via the routine DLAED4 (as called by SLAED3).
+*>       This routine also calculates the eigenvectors of the current
+*>       problem.
+*>
+*>       The final stage consists of computing the updated eigenvectors
+*>       directly using the updated eigenvalues.  The eigenvectors for
+*>       the current problem are multiplied with the eigenvectors from
+*>       the overall problem.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>         The dimension of the symmetric tridiagonal matrix.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] CUTPNT
+*> \verbatim
+*>          CUTPNT is INTEGER
+*>         Contains the location of the last eigenvalue in the leading
+*>         sub-matrix.  min(1,N) <= CUTPNT <= N.
+*> \endverbatim
+*>
+*> \param[in] QSIZ
+*> \verbatim
+*>          QSIZ is INTEGER
+*>         The dimension of the unitary matrix used to reduce
+*>         the full matrix to tridiagonal form.  QSIZ >= N.
+*> \endverbatim
+*>
+*> \param[in] TLVLS
+*> \verbatim
+*>          TLVLS is INTEGER
+*>         The total number of merging levels in the overall divide and
+*>         conquer tree.
+*> \endverbatim
+*>
+*> \param[in] CURLVL
+*> \verbatim
+*>          CURLVL is INTEGER
+*>         The current level in the overall merge routine,
+*>         0 <= curlvl <= tlvls.
+*> \endverbatim
+*>
+*> \param[in] CURPBM
+*> \verbatim
+*>          CURPBM is INTEGER
+*>         The current problem in the current level in the overall
+*>         merge routine (counting from upper left to lower right).
+*> \endverbatim
+*>
+*> \param[in,out] D
+*> \verbatim
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>         On entry, the eigenvalues of the rank-1-perturbed matrix.
+*>         On exit, the eigenvalues of the repaired matrix.
+*> \endverbatim
+*>
+*> \param[in,out] Q
+*> \verbatim
+*>          Q is COMPLEX*16 array, dimension (LDQ,N)
+*>         On entry, the eigenvectors of the rank-1-perturbed matrix.
+*>         On exit, the eigenvectors of the repaired tridiagonal matrix.
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>         The leading dimension of the array Q.  LDQ >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in] RHO
+*> \verbatim
+*>          RHO is DOUBLE PRECISION
+*>         Contains the subdiagonal element used to create the rank-1
+*>         modification.
+*> \endverbatim
+*>
+*> \param[out] INDXQ
+*> \verbatim
+*>          INDXQ is INTEGER array, dimension (N)
+*>         This contains the permutation which will reintegrate the
+*>         subproblem just solved back into sorted order,
+*>         ie. D( INDXQ( I = 1, N ) ) will be in ascending order.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (4*N)
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array,
+*>                                 dimension (3*N+2*QSIZ*N)
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (QSIZ*N)
+*> \endverbatim
+*>
+*> \param[in,out] QSTORE
+*> \verbatim
+*>          QSTORE is DOUBLE PRECISION array, dimension (N**2+1)
+*>         Stores eigenvectors of submatrices encountered during
+*>         divide and conquer, packed together. QPTR points to
+*>         beginning of the submatrices.
+*> \endverbatim
+*>
+*> \param[in,out] QPTR
+*> \verbatim
+*>          QPTR is INTEGER array, dimension (N+2)
+*>         List of indices pointing to beginning of submatrices stored
+*>         in QSTORE. The submatrices are numbered starting at the
+*>         bottom left of the divide and conquer tree, from left to
+*>         right and bottom to top.
+*> \endverbatim
+*>
+*> \param[in] PRMPTR
+*> \verbatim
+*>          PRMPTR is INTEGER array, dimension (N lg N)
+*>         Contains a list of pointers which indicate where in PERM a
+*>         level's permutation is stored.  PRMPTR(i+1) - PRMPTR(i)
+*>         indicates the size of the permutation and also the size of
+*>         the full, non-deflated problem.
+*> \endverbatim
+*>
+*> \param[in] PERM
+*> \verbatim
+*>          PERM is INTEGER array, dimension (N lg N)
+*>         Contains the permutations (from deflation and sorting) to be
+*>         applied to each eigenblock.
+*> \endverbatim
+*>
+*> \param[in] GIVPTR
+*> \verbatim
+*>          GIVPTR is INTEGER array, dimension (N lg N)
+*>         Contains a list of pointers which indicate where in GIVCOL a
+*>         level's Givens rotations are stored.  GIVPTR(i+1) - GIVPTR(i)
+*>         indicates the number of Givens rotations.
+*> \endverbatim
+*>
+*> \param[in] GIVCOL
+*> \verbatim
+*>          GIVCOL is INTEGER array, dimension (2, N lg N)
+*>         Each pair of numbers indicates a pair of columns to take place
+*>         in a Givens rotation.
+*> \endverbatim
+*>
+*> \param[in] GIVNUM
+*> \verbatim
+*>          GIVNUM is DOUBLE PRECISION array, dimension (2, N lg N)
+*>         Each number indicates the S value to be used in the
+*>         corresponding Givens rotation.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  if INFO = 1, an eigenvalue did not converge
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERcomputational
+*
+*  =====================================================================
+      SUBROUTINE ZLAED7( N, CUTPNT, QSIZ, TLVLS, CURLVL, CURPBM, D, Q,
+     $                   LDQ, RHO, INDXQ, QSTORE, QPTR, PRMPTR, PERM,
+     $                   GIVPTR, GIVCOL, GIVNUM, WORK, RWORK, IWORK,
+     $                   INFO )
+*
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            CURLVL, CURPBM, CUTPNT, INFO, LDQ, N, QSIZ,
+     $                   TLVLS
+      DOUBLE PRECISION   RHO
+*     ..
+*     .. Array Arguments ..
+      INTEGER            GIVCOL( 2, * ), GIVPTR( * ), INDXQ( * ),
+     $                   IWORK( * ), PERM( * ), PRMPTR( * ), QPTR( * )
+      DOUBLE PRECISION   D( * ), GIVNUM( 2, * ), QSTORE( * ), RWORK( * )
+      COMPLEX*16         Q( LDQ, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER            COLTYP, CURR, I, IDLMDA, INDX,
+     $                   INDXC, INDXP, IQ, IW, IZ, K, N1, N2, PTR
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLAED9, DLAEDA, DLAMRG, XERBLA, ZLACRM, ZLAED8
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+*
+*     IF( ICOMPQ.LT.0 .OR. ICOMPQ.GT.1 ) THEN
+*        INFO = -1
+*     ELSE IF( N.LT.0 ) THEN
+      IF( N.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( MIN( 1, N ).GT.CUTPNT .OR. N.LT.CUTPNT ) THEN
+         INFO = -2
+      ELSE IF( QSIZ.LT.N ) THEN
+         INFO = -3
+      ELSE IF( LDQ.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLAED7', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     The following values are for bookkeeping purposes only.  They are
+*     integer pointers which indicate the portion of the workspace
+*     used by a particular array in DLAED2 and SLAED3.
+*
+      IZ = 1
+      IDLMDA = IZ + N
+      IW = IDLMDA + N
+      IQ = IW + N
+*
+      INDX = 1
+      INDXC = INDX + N
+      COLTYP = INDXC + N
+      INDXP = COLTYP + N
+*
+*     Form the z-vector which consists of the last row of Q_1 and the
+*     first row of Q_2.
+*
+      PTR = 1 + 2**TLVLS
+      DO 10 I = 1, CURLVL - 1
+         PTR = PTR + 2**( TLVLS-I )
+   10 CONTINUE
+      CURR = PTR + CURPBM
+      CALL DLAEDA( N, TLVLS, CURLVL, CURPBM, PRMPTR, PERM, GIVPTR,
+     $             GIVCOL, GIVNUM, QSTORE, QPTR, RWORK( IZ ),
+     $             RWORK( IZ+N ), INFO )
+*
+*     When solving the final problem, we no longer need the stored data,
+*     so we will overwrite the data from this level onto the previously
+*     used storage space.
+*
+      IF( CURLVL.EQ.TLVLS ) THEN
+         QPTR( CURR ) = 1
+         PRMPTR( CURR ) = 1
+         GIVPTR( CURR ) = 1
+      END IF
+*
+*     Sort and Deflate eigenvalues.
+*
+      CALL ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, RWORK( IZ ),
+     $             RWORK( IDLMDA ), WORK, QSIZ, RWORK( IW ),
+     $             IWORK( INDXP ), IWORK( INDX ), INDXQ,
+     $             PERM( PRMPTR( CURR ) ), GIVPTR( CURR+1 ),
+     $             GIVCOL( 1, GIVPTR( CURR ) ),
+     $             GIVNUM( 1, GIVPTR( CURR ) ), INFO )
+      PRMPTR( CURR+1 ) = PRMPTR( CURR ) + N
+      GIVPTR( CURR+1 ) = GIVPTR( CURR+1 ) + GIVPTR( CURR )
+*
+*     Solve Secular Equation.
+*
+      IF( K.NE.0 ) THEN
+         CALL DLAED9( K, 1, K, N, D, RWORK( IQ ), K, RHO,
+     $                RWORK( IDLMDA ), RWORK( IW ),
+     $                QSTORE( QPTR( CURR ) ), K, INFO )
+         CALL ZLACRM( QSIZ, K, WORK, QSIZ, QSTORE( QPTR( CURR ) ), K, Q,
+     $                LDQ, RWORK( IQ ) )
+         QPTR( CURR+1 ) = QPTR( CURR ) + K**2
+         IF( INFO.NE.0 ) THEN
+            RETURN
+         END IF
+*
+*     Prepare the INDXQ sorting premutation.
+*
+         N1 = K
+         N2 = N - K
+         CALL DLAMRG( N1, N2, D, 1, -1, INDXQ )
+      ELSE
+         QPTR( CURR+1 ) = QPTR( CURR )
+         DO 20 I = 1, N
+            INDXQ( I ) = I
+   20    CONTINUE
+      END IF
+*
+      RETURN
+*
+*     End of ZLAED7
+*
+      END
+*> \brief \b ZLAED8 used by sstedc. Merges eigenvalues and deflates secular equation. Used when the original matrix is dense.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAED8 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaed8.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaed8.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaed8.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
+*                          Q2, LDQ2, W, INDXP, INDX, INDXQ, PERM, GIVPTR,
+*                          GIVCOL, GIVNUM, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            CUTPNT, GIVPTR, INFO, K, LDQ, LDQ2, N, QSIZ
+*       DOUBLE PRECISION   RHO
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
+*      $                   INDXQ( * ), PERM( * )
+*       DOUBLE PRECISION   D( * ), DLAMDA( * ), GIVNUM( 2, * ), W( * ),
+*      $                   Z( * )
+*       COMPLEX*16         Q( LDQ, * ), Q2( LDQ2, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAED8 merges the two sets of eigenvalues together into a single
+*> sorted set.  Then it tries to deflate the size of the problem.
+*> There are two ways in which deflation can occur:  when two or more
+*> eigenvalues are close together or if there is a tiny element in the
+*> Z vector.  For each such occurrence the order of the related secular
+*> equation problem is reduced by one.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*>         Contains the number of non-deflated eigenvalues.
+*>         This is the order of the related secular equation.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>         The dimension of the symmetric tridiagonal matrix.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] QSIZ
+*> \verbatim
+*>          QSIZ is INTEGER
+*>         The dimension of the unitary matrix used to reduce
+*>         the dense or band matrix to tridiagonal form.
+*>         QSIZ >= N if ICOMPQ = 1.
+*> \endverbatim
+*>
+*> \param[in,out] Q
+*> \verbatim
+*>          Q is COMPLEX*16 array, dimension (LDQ,N)
+*>         On entry, Q contains the eigenvectors of the partially solved
+*>         system which has been previously updated in matrix
+*>         multiplies with other partially solved eigensystems.
+*>         On exit, Q contains the trailing (N-K) updated eigenvectors
+*>         (those which were deflated) in its last N-K columns.
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>         The leading dimension of the array Q.  LDQ >= max( 1, N ).
+*> \endverbatim
+*>
+*> \param[in,out] D
+*> \verbatim
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>         On entry, D contains the eigenvalues of the two submatrices to
+*>         be combined.  On exit, D contains the trailing (N-K) updated
+*>         eigenvalues (those which were deflated) sorted into increasing
+*>         order.
+*> \endverbatim
+*>
+*> \param[in,out] RHO
+*> \verbatim
+*>          RHO is DOUBLE PRECISION
+*>         Contains the off diagonal element associated with the rank-1
+*>         cut which originally split the two submatrices which are now
+*>         being recombined. RHO is modified during the computation to
+*>         the value required by DLAED3.
+*> \endverbatim
+*>
+*> \param[in] CUTPNT
+*> \verbatim
+*>          CUTPNT is INTEGER
+*>         Contains the location of the last eigenvalue in the leading
+*>         sub-matrix.  MIN(1,N) <= CUTPNT <= N.
+*> \endverbatim
+*>
+*> \param[in] Z
+*> \verbatim
+*>          Z is DOUBLE PRECISION array, dimension (N)
+*>         On input this vector contains the updating vector (the last
+*>         row of the first sub-eigenvector matrix and the first row of
+*>         the second sub-eigenvector matrix).  The contents of Z are
+*>         destroyed during the updating process.
+*> \endverbatim
+*>
+*> \param[out] DLAMDA
+*> \verbatim
+*>          DLAMDA is DOUBLE PRECISION array, dimension (N)
+*>         Contains a copy of the first K eigenvalues which will be used
+*>         by DLAED3 to form the secular equation.
+*> \endverbatim
+*>
+*> \param[out] Q2
+*> \verbatim
+*>          Q2 is COMPLEX*16 array, dimension (LDQ2,N)
+*>         If ICOMPQ = 0, Q2 is not referenced.  Otherwise,
+*>         Contains a copy of the first K eigenvectors which will be used
+*>         by DLAED7 in a matrix multiply (DGEMM) to update the new
+*>         eigenvectors.
+*> \endverbatim
+*>
+*> \param[in] LDQ2
+*> \verbatim
+*>          LDQ2 is INTEGER
+*>         The leading dimension of the array Q2.  LDQ2 >= max( 1, N ).
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is DOUBLE PRECISION array, dimension (N)
+*>         This will hold the first k values of the final
+*>         deflation-altered z-vector and will be passed to DLAED3.
+*> \endverbatim
+*>
+*> \param[out] INDXP
+*> \verbatim
+*>          INDXP is INTEGER array, dimension (N)
+*>         This will contain the permutation used to place deflated
+*>         values of D at the end of the array. On output INDXP(1:K)
+*>         points to the nondeflated D-values and INDXP(K+1:N)
+*>         points to the deflated eigenvalues.
+*> \endverbatim
+*>
+*> \param[out] INDX
+*> \verbatim
+*>          INDX is INTEGER array, dimension (N)
+*>         This will contain the permutation used to sort the contents of
+*>         D into ascending order.
+*> \endverbatim
+*>
+*> \param[in] INDXQ
+*> \verbatim
+*>          INDXQ is INTEGER array, dimension (N)
+*>         This contains the permutation which separately sorts the two
+*>         sub-problems in D into ascending order.  Note that elements in
+*>         the second half of this permutation must first have CUTPNT
+*>         added to their values in order to be accurate.
+*> \endverbatim
+*>
+*> \param[out] PERM
+*> \verbatim
+*>          PERM is INTEGER array, dimension (N)
+*>         Contains the permutations (from deflation and sorting) to be
+*>         applied to each eigenblock.
+*> \endverbatim
+*>
+*> \param[out] GIVPTR
+*> \verbatim
+*>          GIVPTR is INTEGER
+*>         Contains the number of Givens rotations which took place in
+*>         this subproblem.
+*> \endverbatim
+*>
+*> \param[out] GIVCOL
+*> \verbatim
+*>          GIVCOL is INTEGER array, dimension (2, N)
+*>         Each pair of numbers indicates a pair of columns to take place
+*>         in a Givens rotation.
+*> \endverbatim
+*>
+*> \param[out] GIVNUM
+*> \verbatim
+*>          GIVNUM is DOUBLE PRECISION array, dimension (2, N)
+*>         Each number indicates the S value to be used in the
+*>         corresponding Givens rotation.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERcomputational
+*
+*  =====================================================================
+      SUBROUTINE ZLAED8( K, N, QSIZ, Q, LDQ, D, RHO, CUTPNT, Z, DLAMDA,
+     $                   Q2, LDQ2, W, INDXP, INDX, INDXQ, PERM, GIVPTR,
+     $                   GIVCOL, GIVNUM, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            CUTPNT, GIVPTR, INFO, K, LDQ, LDQ2, N, QSIZ
+      DOUBLE PRECISION   RHO
+*     ..
+*     .. Array Arguments ..
+      INTEGER            GIVCOL( 2, * ), INDX( * ), INDXP( * ),
+     $                   INDXQ( * ), PERM( * )
+      DOUBLE PRECISION   D( * ), DLAMDA( * ), GIVNUM( 2, * ), W( * ),
+     $                   Z( * )
+      COMPLEX*16         Q( LDQ, * ), Q2( LDQ2, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   MONE, ZERO, ONE, TWO, EIGHT
+      PARAMETER          ( MONE = -1.0D0, ZERO = 0.0D0, ONE = 1.0D0,
+     $                   TWO = 2.0D0, EIGHT = 8.0D0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, IMAX, J, JLAM, JMAX, JP, K2, N1, N1P1, N2
+      DOUBLE PRECISION   C, EPS, S, T, TAU, TOL
+*     ..
+*     .. External Functions ..
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DLAPY2
+      EXTERNAL           IDAMAX, DLAMCH, DLAPY2
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DCOPY, DLAMRG, DSCAL, XERBLA, ZCOPY, ZDROT,
+     $                   ZLACPY
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+*
+      IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( QSIZ.LT.N ) THEN
+         INFO = -3
+      ELSE IF( LDQ.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( CUTPNT.LT.MIN( 1, N ) .OR. CUTPNT.GT.N ) THEN
+         INFO = -8
+      ELSE IF( LDQ2.LT.MAX( 1, N ) ) THEN
+         INFO = -12
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLAED8', -INFO )
+         RETURN
+      END IF
+*
+*     Need to initialize GIVPTR to O here in case of quick exit
+*     to prevent an unspecified code behavior (usually sigfault) 
+*     when IWORK array on entry to *stedc is not zeroed 
+*     (or at least some IWORK entries which used in *laed7 for GIVPTR).
+*
+      GIVPTR = 0
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      N1 = CUTPNT
+      N2 = N - N1
+      N1P1 = N1 + 1
+*
+      IF( RHO.LT.ZERO ) THEN
+         CALL DSCAL( N2, MONE, Z( N1P1 ), 1 )
+      END IF
+*
+*     Normalize z so that norm(z) = 1
+*
+      T = ONE / SQRT( TWO )
+      DO 10 J = 1, N
+         INDX( J ) = J
+   10 CONTINUE
+      CALL DSCAL( N, T, Z, 1 )
+      RHO = ABS( TWO*RHO )
+*
+*     Sort the eigenvalues into increasing order
+*
+      DO 20 I = CUTPNT + 1, N
+         INDXQ( I ) = INDXQ( I ) + CUTPNT
+   20 CONTINUE
+      DO 30 I = 1, N
+         DLAMDA( I ) = D( INDXQ( I ) )
+         W( I ) = Z( INDXQ( I ) )
+   30 CONTINUE
+      I = 1
+      J = CUTPNT + 1
+      CALL DLAMRG( N1, N2, DLAMDA, 1, 1, INDX )
+      DO 40 I = 1, N
+         D( I ) = DLAMDA( INDX( I ) )
+         Z( I ) = W( INDX( I ) )
+   40 CONTINUE
+*
+*     Calculate the allowable deflation tolerance
+*
+      IMAX = IDAMAX( N, Z, 1 )
+      JMAX = IDAMAX( N, D, 1 )
+      EPS = DLAMCH( 'Epsilon' )
+      TOL = EIGHT*EPS*ABS( D( JMAX ) )
+*
+*     If the rank-1 modifier is small enough, no more needs to be done
+*     -- except to reorganize Q so that its columns correspond with the
+*     elements in D.
+*
+      IF( RHO*ABS( Z( IMAX ) ).LE.TOL ) THEN
+         K = 0
+         DO 50 J = 1, N
+            PERM( J ) = INDXQ( INDX( J ) )
+            CALL ZCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
+   50    CONTINUE
+         CALL ZLACPY( 'A', QSIZ, N, Q2( 1, 1 ), LDQ2, Q( 1, 1 ), LDQ )
+         RETURN
+      END IF
+*
+*     If there are multiple eigenvalues then the problem deflates.  Here
+*     the number of equal eigenvalues are found.  As each equal
+*     eigenvalue is found, an elementary reflector is computed to rotate
+*     the corresponding eigensubspace so that the corresponding
+*     components of Z are zero in this new basis.
+*
+      K = 0
+      K2 = N + 1
+      DO 60 J = 1, N
+         IF( RHO*ABS( Z( J ) ).LE.TOL ) THEN
+*
+*           Deflate due to small z component.
+*
+            K2 = K2 - 1
+            INDXP( K2 ) = J
+            IF( J.EQ.N )
+     $         GO TO 100
+         ELSE
+            JLAM = J
+            GO TO 70
+         END IF
+   60 CONTINUE
+   70 CONTINUE
+      J = J + 1
+      IF( J.GT.N )
+     $   GO TO 90
+      IF( RHO*ABS( Z( J ) ).LE.TOL ) THEN
+*
+*        Deflate due to small z component.
+*
+         K2 = K2 - 1
+         INDXP( K2 ) = J
+      ELSE
+*
+*        Check if eigenvalues are close enough to allow deflation.
+*
+         S = Z( JLAM )
+         C = Z( J )
+*
+*        Find sqrt(a**2+b**2) without overflow or
+*        destructive underflow.
+*
+         TAU = DLAPY2( C, S )
+         T = D( J ) - D( JLAM )
+         C = C / TAU
+         S = -S / TAU
+         IF( ABS( T*C*S ).LE.TOL ) THEN
+*
+*           Deflation is possible.
+*
+            Z( J ) = TAU
+            Z( JLAM ) = ZERO
+*
+*           Record the appropriate Givens rotation
+*
+            GIVPTR = GIVPTR + 1
+            GIVCOL( 1, GIVPTR ) = INDXQ( INDX( JLAM ) )
+            GIVCOL( 2, GIVPTR ) = INDXQ( INDX( J ) )
+            GIVNUM( 1, GIVPTR ) = C
+            GIVNUM( 2, GIVPTR ) = S
+            CALL ZDROT( QSIZ, Q( 1, INDXQ( INDX( JLAM ) ) ), 1,
+     $                  Q( 1, INDXQ( INDX( J ) ) ), 1, C, S )
+            T = D( JLAM )*C*C + D( J )*S*S
+            D( J ) = D( JLAM )*S*S + D( J )*C*C
+            D( JLAM ) = T
+            K2 = K2 - 1
+            I = 1
+   80       CONTINUE
+            IF( K2+I.LE.N ) THEN
+               IF( D( JLAM ).LT.D( INDXP( K2+I ) ) ) THEN
+                  INDXP( K2+I-1 ) = INDXP( K2+I )
+                  INDXP( K2+I ) = JLAM
+                  I = I + 1
+                  GO TO 80
+               ELSE
+                  INDXP( K2+I-1 ) = JLAM
+               END IF
+            ELSE
+               INDXP( K2+I-1 ) = JLAM
+            END IF
+            JLAM = J
+         ELSE
+            K = K + 1
+            W( K ) = Z( JLAM )
+            DLAMDA( K ) = D( JLAM )
+            INDXP( K ) = JLAM
+            JLAM = J
+         END IF
+      END IF
+      GO TO 70
+   90 CONTINUE
+*
+*     Record the last eigenvalue.
+*
+      K = K + 1
+      W( K ) = Z( JLAM )
+      DLAMDA( K ) = D( JLAM )
+      INDXP( K ) = JLAM
+*
+  100 CONTINUE
+*
+*     Sort the eigenvalues and corresponding eigenvectors into DLAMDA
+*     and Q2 respectively.  The eigenvalues/vectors which were not
+*     deflated go into the first K slots of DLAMDA and Q2 respectively,
+*     while those which were deflated go into the last N - K slots.
+*
+      DO 110 J = 1, N
+         JP = INDXP( J )
+         DLAMDA( J ) = D( JP )
+         PERM( J ) = INDXQ( INDX( JP ) )
+         CALL ZCOPY( QSIZ, Q( 1, PERM( J ) ), 1, Q2( 1, J ), 1 )
+  110 CONTINUE
+*
+*     The deflated eigenvalues and their corresponding vectors go back
+*     into the last N - K slots of D and Q respectively.
+*
+      IF( K.LT.N ) THEN
+         CALL DCOPY( N-K, DLAMDA( K+1 ), 1, D( K+1 ), 1 )
+         CALL ZLACPY( 'A', QSIZ, N-K, Q2( 1, K+1 ), LDQ2, Q( 1, K+1 ),
+     $                LDQ )
+      END IF
+*
+      RETURN
+*
+*     End of ZLAED8
+*
+      END
+*> \brief \b ZLAHQR computes the eigenvalues and Schur factorization of an upper Hessenberg matrix, using the double-shift/single-shift QR algorithm.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAHQR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahqr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlahqr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahqr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+*                          IHIZ, Z, LDZ, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, N
+*       LOGICAL            WANTT, WANTZ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), W( * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZLAHQR is an auxiliary routine called by CHSEQR to update the
+*>    eigenvalues and Schur decomposition already computed by CHSEQR, by
+*>    dealing with the Hessenberg submatrix in rows and columns ILO to
+*>    IHI.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] WANTT
+*> \verbatim
+*>          WANTT is LOGICAL
+*>          = .TRUE. : the full Schur form T is required;
+*>          = .FALSE.: only eigenvalues are required.
+*> \endverbatim
+*>
+*> \param[in] WANTZ
+*> \verbatim
+*>          WANTZ is LOGICAL
+*>          = .TRUE. : the matrix of Schur vectors Z is required;
+*>          = .FALSE.: Schur vectors are not required.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix H.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] ILO
+*> \verbatim
+*>          ILO is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHI
+*> \verbatim
+*>          IHI is INTEGER
+*>          It is assumed that H is already upper triangular in rows and
+*>          columns IHI+1:N, and that H(ILO,ILO-1) = 0 (unless ILO = 1).
+*>          ZLAHQR works primarily with the Hessenberg submatrix in rows
+*>          and columns ILO to IHI, but applies transformations to all of
+*>          H if WANTT is .TRUE..
+*>          1 <= ILO <= max(1,IHI); IHI <= N.
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array, dimension (LDH,N)
+*>          On entry, the upper Hessenberg matrix H.
+*>          On exit, if INFO is zero and if WANTT is .TRUE., then H
+*>          is upper triangular in rows and columns ILO:IHI.  If INFO
+*>          is zero and if WANTT is .FALSE., then the contents of H
+*>          are unspecified on exit.  The output state of H in case
+*>          INF is positive is below under the description of INFO.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is INTEGER
+*>          The leading dimension of the array H. LDH >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is COMPLEX*16 array, dimension (N)
+*>          The computed eigenvalues ILO to IHI are stored in the
+*>          corresponding elements of W. If WANTT is .TRUE., the
+*>          eigenvalues are stored in the same order as on the diagonal
+*>          of the Schur form returned in H, with W(i) = H(i,i).
+*> \endverbatim
+*>
+*> \param[in] ILOZ
+*> \verbatim
+*>          ILOZ is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHIZ
+*> \verbatim
+*>          IHIZ is INTEGER
+*>          Specify the rows of Z to which transformations must be
+*>          applied if WANTZ is .TRUE..
+*>          1 <= ILOZ <= ILO; IHI <= IHIZ <= N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          If WANTZ is .TRUE., on entry Z must contain the current
+*>          matrix Z of transformations accumulated by CHSEQR, and on
+*>          exit Z has been updated; transformations are applied only to
+*>          the submatrix Z(ILOZ:IHIZ,ILO:IHI).
+*>          If WANTZ is .FALSE., Z is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z. LDZ >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>           =   0: successful exit
+*>          .GT. 0: if INFO = i, ZLAHQR failed to compute all the
+*>                  eigenvalues ILO to IHI in a total of 30 iterations
+*>                  per eigenvalue; elements i+1:ihi of W contain
+*>                  those eigenvalues which have been successfully
+*>                  computed.
+*>
+*>                  If INFO .GT. 0 and WANTT is .FALSE., then on exit,
+*>                  the remaining unconverged eigenvalues are the
+*>                  eigenvalues of the upper Hessenberg matrix
+*>                  rows and columns ILO thorugh INFO of the final,
+*>                  output value of H.
+*>
+*>                  If INFO .GT. 0 and WANTT is .TRUE., then on exit
+*>          (*)       (initial value of H)*U  = U*(final value of H)
+*>                  where U is an orthognal matrix.    The final
+*>                  value of H is upper Hessenberg and triangular in
+*>                  rows and columns INFO+1 through IHI.
+*>
+*>                  If INFO .GT. 0 and WANTZ is .TRUE., then on exit
+*>                      (final value of Z)  = (initial value of Z)*U
+*>                  where U is the orthogonal matrix in (*)
+*>                  (regardless of the value of WANTT.)
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
+*>
+*>     02-96 Based on modifications by
+*>     David Day, Sandia National Laboratory, USA
+*>
+*>     12-04 Further modifications by
+*>     Ralph Byers, University of Kansas, USA
+*>     This is a modified version of ZLAHQR from LAPACK version 3.0.
+*>     It is (1) more robust against overflow and underflow and
+*>     (2) adopts the more conservative Ahues & Tisseur stopping
+*>     criterion (LAWN 122, 1997).
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+     $                   IHIZ, Z, LDZ, INFO )
+*
+*  -- LAPACK auxiliary routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, N
+      LOGICAL            WANTT, WANTZ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), W( * ), Z( LDZ, * )
+*     ..
+*
+*  =========================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   RZERO, RONE, HALF
+      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0, HALF = 0.5d0 )
+      DOUBLE PRECISION   DAT1
+      PARAMETER          ( DAT1 = 3.0d0 / 4.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         CDUM, H11, H11S, H22, SC, SUM, T, T1, TEMP, U,
+     $                   V2, X, Y
+      DOUBLE PRECISION   AA, AB, BA, BB, H10, H21, RTEMP, S, SAFMAX,
+     $                   SAFMIN, SMLNUM, SX, T2, TST, ULP
+      INTEGER            I, I1, I2, ITS, ITMAX, J, JHI, JLO, K, L, M,
+     $                   NH, NZ
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         V( 2 )
+*     ..
+*     .. External Functions ..
+      COMPLEX*16         ZLADIV
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           ZLADIV, DLAMCH
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, ZCOPY, ZLARFG, ZSCAL
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, SQRT
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+*
+      INFO = 0
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+      IF( ILO.EQ.IHI ) THEN
+         W( ILO ) = H( ILO, ILO )
+         RETURN
+      END IF
+*
+*     ==== clear out the trash ====
+      DO 10 J = ILO, IHI - 3
+         H( J+2, J ) = ZERO
+         H( J+3, J ) = ZERO
+   10 CONTINUE
+      IF( ILO.LE.IHI-2 )
+     $   H( IHI, IHI-2 ) = ZERO
+*     ==== ensure that subdiagonal entries are real ====
+      IF( WANTT ) THEN
+         JLO = 1
+         JHI = N
+      ELSE
+         JLO = ILO
+         JHI = IHI
+      END IF
+      DO 20 I = ILO + 1, IHI
+         IF( DIMAG( H( I, I-1 ) ).NE.RZERO ) THEN
+*           ==== The following redundant normalization
+*           .    avoids problems with both gradual and
+*           .    sudden underflow in ABS(H(I,I-1)) ====
+            SC = H( I, I-1 ) / CABS1( H( I, I-1 ) )
+            SC = DCONJG( SC ) / ABS( SC )
+            H( I, I-1 ) = ABS( H( I, I-1 ) )
+            CALL ZSCAL( JHI-I+1, SC, H( I, I ), LDH )
+            CALL ZSCAL( MIN( JHI, I+1 )-JLO+1, DCONJG( SC ),
+     $                  H( JLO, I ), 1 )
+            IF( WANTZ )
+     $         CALL ZSCAL( IHIZ-ILOZ+1, DCONJG( SC ), Z( ILOZ, I ), 1 )
+         END IF
+   20 CONTINUE
+*
+      NH = IHI - ILO + 1
+      NZ = IHIZ - ILOZ + 1
+*
+*     Set machine-dependent constants for the stopping criterion.
+*
+      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
+      SAFMAX = RONE / SAFMIN
+      CALL DLABAD( SAFMIN, SAFMAX )
+      ULP = DLAMCH( 'PRECISION' )
+      SMLNUM = SAFMIN*( DBLE( NH ) / ULP )
+*
+*     I1 and I2 are the indices of the first row and last column of H
+*     to which transformations must be applied. If eigenvalues only are
+*     being computed, I1 and I2 are set inside the main loop.
+*
+      IF( WANTT ) THEN
+         I1 = 1
+         I2 = N
+      END IF
+*
+*     ITMAX is the total number of QR iterations allowed.
+*
+      ITMAX = 30 * MAX( 10, NH ) 
+*
+*     The main loop begins here. I is the loop index and decreases from
+*     IHI to ILO in steps of 1. Each iteration of the loop works
+*     with the active submatrix in rows and columns L to I.
+*     Eigenvalues I+1 to IHI have already converged. Either L = ILO, or
+*     H(L,L-1) is negligible so that the matrix splits.
+*
+      I = IHI
+   30 CONTINUE
+      IF( I.LT.ILO )
+     $   GO TO 150
+*
+*     Perform QR iterations on rows and columns ILO to I until a
+*     submatrix of order 1 splits off at the bottom because a
+*     subdiagonal element has become negligible.
+*
+      L = ILO
+      DO 130 ITS = 0, ITMAX
+*
+*        Look for a single small subdiagonal element.
+*
+         DO 40 K = I, L + 1, -1
+            IF( CABS1( H( K, K-1 ) ).LE.SMLNUM )
+     $         GO TO 50
+            TST = CABS1( H( K-1, K-1 ) ) + CABS1( H( K, K ) )
+            IF( TST.EQ.ZERO ) THEN
+               IF( K-2.GE.ILO )
+     $            TST = TST + ABS( DBLE( H( K-1, K-2 ) ) )
+               IF( K+1.LE.IHI )
+     $            TST = TST + ABS( DBLE( H( K+1, K ) ) )
+            END IF
+*           ==== The following is a conservative small subdiagonal
+*           .    deflation criterion due to Ahues & Tisseur (LAWN 122,
+*           .    1997). It has better mathematical foundation and
+*           .    improves accuracy in some examples.  ====
+            IF( ABS( DBLE( H( K, K-1 ) ) ).LE.ULP*TST ) THEN
+               AB = MAX( CABS1( H( K, K-1 ) ), CABS1( H( K-1, K ) ) )
+               BA = MIN( CABS1( H( K, K-1 ) ), CABS1( H( K-1, K ) ) )
+               AA = MAX( CABS1( H( K, K ) ),
+     $              CABS1( H( K-1, K-1 )-H( K, K ) ) )
+               BB = MIN( CABS1( H( K, K ) ),
+     $              CABS1( H( K-1, K-1 )-H( K, K ) ) )
+               S = AA + AB
+               IF( BA*( AB / S ).LE.MAX( SMLNUM,
+     $             ULP*( BB*( AA / S ) ) ) )GO TO 50
+            END IF
+   40    CONTINUE
+   50    CONTINUE
+         L = K
+         IF( L.GT.ILO ) THEN
+*
+*           H(L,L-1) is negligible
+*
+            H( L, L-1 ) = ZERO
+         END IF
+*
+*        Exit from loop if a submatrix of order 1 has split off.
+*
+         IF( L.GE.I )
+     $      GO TO 140
+*
+*        Now the active submatrix is in rows and columns L to I. If
+*        eigenvalues only are being computed, only the active submatrix
+*        need be transformed.
+*
+         IF( .NOT.WANTT ) THEN
+            I1 = L
+            I2 = I
+         END IF
+*
+         IF( ITS.EQ.10 ) THEN
+*
+*           Exceptional shift.
+*
+            S = DAT1*ABS( DBLE( H( L+1, L ) ) )
+            T = S + H( L, L )
+         ELSE IF( ITS.EQ.20 ) THEN
+*
+*           Exceptional shift.
+*
+            S = DAT1*ABS( DBLE( H( I, I-1 ) ) )
+            T = S + H( I, I )
+         ELSE
+*
+*           Wilkinson's shift.
+*
+            T = H( I, I )
+            U = SQRT( H( I-1, I ) )*SQRT( H( I, I-1 ) )
+            S = CABS1( U )
+            IF( S.NE.RZERO ) THEN
+               X = HALF*( H( I-1, I-1 )-T )
+               SX = CABS1( X )
+               S = MAX( S, CABS1( X ) )
+               Y = S*SQRT( ( X / S )**2+( U / S )**2 )
+               IF( SX.GT.RZERO ) THEN
+                  IF( DBLE( X / SX )*DBLE( Y )+DIMAG( X / SX )*
+     $                DIMAG( Y ).LT.RZERO )Y = -Y
+               END IF
+               T = T - U*ZLADIV( U, ( X+Y ) )
+            END IF
+         END IF
+*
+*        Look for two consecutive small subdiagonal elements.
+*
+         DO 60 M = I - 1, L + 1, -1
+*
+*           Determine the effect of starting the single-shift QR
+*           iteration at row M, and see if this would make H(M,M-1)
+*           negligible.
+*
+            H11 = H( M, M )
+            H22 = H( M+1, M+1 )
+            H11S = H11 - T
+            H21 = DBLE( H( M+1, M ) )
+            S = CABS1( H11S ) + ABS( H21 )
+            H11S = H11S / S
+            H21 = H21 / S
+            V( 1 ) = H11S
+            V( 2 ) = H21
+            H10 = DBLE( H( M, M-1 ) )
+            IF( ABS( H10 )*ABS( H21 ).LE.ULP*
+     $          ( CABS1( H11S )*( CABS1( H11 )+CABS1( H22 ) ) ) )
+     $          GO TO 70
+   60    CONTINUE
+         H11 = H( L, L )
+         H22 = H( L+1, L+1 )
+         H11S = H11 - T
+         H21 = DBLE( H( L+1, L ) )
+         S = CABS1( H11S ) + ABS( H21 )
+         H11S = H11S / S
+         H21 = H21 / S
+         V( 1 ) = H11S
+         V( 2 ) = H21
+   70    CONTINUE
+*
+*        Single-shift QR step
+*
+         DO 120 K = M, I - 1
+*
+*           The first iteration of this loop determines a reflection G
+*           from the vector V and applies it from left and right to H,
+*           thus creating a nonzero bulge below the subdiagonal.
+*
+*           Each subsequent iteration determines a reflection G to
+*           restore the Hessenberg form in the (K-1)th column, and thus
+*           chases the bulge one step toward the bottom of the active
+*           submatrix.
+*
+*           V(2) is always real before the call to ZLARFG, and hence
+*           after the call T2 ( = T1*V(2) ) is also real.
+*
+            IF( K.GT.M )
+     $         CALL ZCOPY( 2, H( K, K-1 ), 1, V, 1 )
+            CALL ZLARFG( 2, V( 1 ), V( 2 ), 1, T1 )
+            IF( K.GT.M ) THEN
+               H( K, K-1 ) = V( 1 )
+               H( K+1, K-1 ) = ZERO
+            END IF
+            V2 = V( 2 )
+            T2 = DBLE( T1*V2 )
+*
+*           Apply G from the left to transform the rows of the matrix
+*           in columns K to I2.
+*
+            DO 80 J = K, I2
+               SUM = DCONJG( T1 )*H( K, J ) + T2*H( K+1, J )
+               H( K, J ) = H( K, J ) - SUM
+               H( K+1, J ) = H( K+1, J ) - SUM*V2
+   80       CONTINUE
+*
+*           Apply G from the right to transform the columns of the
+*           matrix in rows I1 to min(K+2,I).
+*
+            DO 90 J = I1, MIN( K+2, I )
+               SUM = T1*H( J, K ) + T2*H( J, K+1 )
+               H( J, K ) = H( J, K ) - SUM
+               H( J, K+1 ) = H( J, K+1 ) - SUM*DCONJG( V2 )
+   90       CONTINUE
+*
+            IF( WANTZ ) THEN
+*
+*              Accumulate transformations in the matrix Z
+*
+               DO 100 J = ILOZ, IHIZ
+                  SUM = T1*Z( J, K ) + T2*Z( J, K+1 )
+                  Z( J, K ) = Z( J, K ) - SUM
+                  Z( J, K+1 ) = Z( J, K+1 ) - SUM*DCONJG( V2 )
+  100          CONTINUE
+            END IF
+*
+            IF( K.EQ.M .AND. M.GT.L ) THEN
+*
+*              If the QR step was started at row M > L because two
+*              consecutive small subdiagonals were found, then extra
+*              scaling must be performed to ensure that H(M,M-1) remains
+*              real.
+*
+               TEMP = ONE - T1
+               TEMP = TEMP / ABS( TEMP )
+               H( M+1, M ) = H( M+1, M )*DCONJG( TEMP )
+               IF( M+2.LE.I )
+     $            H( M+2, M+1 ) = H( M+2, M+1 )*TEMP
+               DO 110 J = M, I
+                  IF( J.NE.M+1 ) THEN
+                     IF( I2.GT.J )
+     $                  CALL ZSCAL( I2-J, TEMP, H( J, J+1 ), LDH )
+                     CALL ZSCAL( J-I1, DCONJG( TEMP ), H( I1, J ), 1 )
+                     IF( WANTZ ) THEN
+                        CALL ZSCAL( NZ, DCONJG( TEMP ), Z( ILOZ, J ),
+     $                              1 )
+                     END IF
+                  END IF
+  110          CONTINUE
+            END IF
+  120    CONTINUE
+*
+*        Ensure that H(I,I-1) is real.
+*
+         TEMP = H( I, I-1 )
+         IF( DIMAG( TEMP ).NE.RZERO ) THEN
+            RTEMP = ABS( TEMP )
+            H( I, I-1 ) = RTEMP
+            TEMP = TEMP / RTEMP
+            IF( I2.GT.I )
+     $         CALL ZSCAL( I2-I, DCONJG( TEMP ), H( I, I+1 ), LDH )
+            CALL ZSCAL( I-I1, TEMP, H( I1, I ), 1 )
+            IF( WANTZ ) THEN
+               CALL ZSCAL( NZ, TEMP, Z( ILOZ, I ), 1 )
+            END IF
+         END IF
+*
+  130 CONTINUE
+*
+*     Failure to converge in remaining number of iterations
+*
+      INFO = I
+      RETURN
+*
+  140 CONTINUE
+*
+*     H(I,I-1) is negligible: one eigenvalue has converged.
+*
+      W( I ) = H( I, I )
+*
+*     return to start of the main loop with new value of I.
+*
+      I = L - 1
+      GO TO 30
+*
+  150 CONTINUE
+      RETURN
+*
+*     End of ZLAHQR
+*
+      END
+*> \brief \b ZLAHR2 reduces the specified number of first columns of a general rectangular matrix A so that elements below the specified subdiagonal are zero, and returns auxiliary matrices which are needed to apply the transformation to the unreduced part of A.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAHR2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahr2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlahr2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahr2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            K, LDA, LDT, LDY, N, NB
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16        A( LDA, * ), T( LDT, NB ), TAU( NB ),
+*      $                   Y( LDY, NB )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAHR2 reduces the first NB columns of A complex general n-BY-(n-k+1)
+*> matrix A so that elements below the k-th subdiagonal are zero. The
+*> reduction is performed by an unitary similarity transformation
+*> Q**H * A * Q. The routine returns the matrices V and T which determine
+*> Q as a block reflector I - V*T*V**H, and also the matrix Y = A * V * T.
+*>
+*> This is an auxiliary routine called by ZGEHRD.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The offset for the reduction. Elements below the k-th
+*>          subdiagonal in the first NB columns are reduced to zero.
+*>          K < N.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          The number of columns to be reduced.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N-K+1)
+*>          On entry, the n-by-(n-k+1) general matrix A.
+*>          On exit, the elements on and above the k-th subdiagonal in
+*>          the first NB columns are overwritten with the corresponding
+*>          elements of the reduced matrix; the elements below the k-th
+*>          subdiagonal, with the array TAU, represent the matrix Q as a
+*>          product of elementary reflectors. The other columns of A are
+*>          unchanged. See Further Details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (NB)
+*>          The scalar factors of the elementary reflectors. See Further
+*>          Details.
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,NB)
+*>          The upper triangular matrix T.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T.  LDT >= NB.
+*> \endverbatim
+*>
+*> \param[out] Y
+*> \verbatim
+*>          Y is COMPLEX*16 array, dimension (LDY,NB)
+*>          The n-by-nb matrix Y.
+*> \endverbatim
+*>
+*> \param[in] LDY
+*> \verbatim
+*>          LDY is INTEGER
+*>          The leading dimension of the array Y. LDY >= N.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of nb elementary reflectors
+*>
+*>     Q = H(1) H(2) . . . H(nb).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**H
+*>
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i+k-1) = 0, v(i+k) = 1; v(i+k+1:n) is stored on exit in
+*>  A(i+k+1:n,i), and tau in TAU(i).
+*>
+*>  The elements of the vectors v together form the (n-k+1)-by-nb matrix
+*>  V which is needed, with T and Y, to apply the transformation to the
+*>  unreduced part of the matrix, using an update of the form:
+*>  A := (I - V*T*V**H) * (A - Y*V**H).
+*>
+*>  The contents of A on exit are illustrated by the following example
+*>  with n = 7, k = 3 and nb = 2:
+*>
+*>     ( a   a   a   a   a )
+*>     ( a   a   a   a   a )
+*>     ( a   a   a   a   a )
+*>     ( h   h   a   a   a )
+*>     ( v1  h   a   a   a )
+*>     ( v1  v2  a   a   a )
+*>     ( v1  v2  a   a   a )
+*>
+*>  where a denotes an element of the original matrix A, h denotes a
+*>  modified element of the upper Hessenberg matrix H, and vi denotes an
+*>  element of the vector defining H(i).
+*>
+*>  This subroutine is a slight modification of LAPACK-3.0's DLAHRD
+*>  incorporating improvements proposed by Quintana-Orti and Van de
+*>  Gejin. Note that the entries of A(1:K,2:NB) differ from those
+*>  returned by the original LAPACK-3.0's DLAHRD routine. (This
+*>  subroutine is not backward compatible with LAPACK-3.0's DLAHRD.)
+*> \endverbatim
+*
+*> \par References:
+*  ================
+*>
+*>  Gregorio Quintana-Orti and Robert van de Geijn, "Improving the
+*>  performance of reduction to Hessenberg form," ACM Transactions on
+*>  Mathematical Software, 32(2):180-194, June 2006.
+*>
+*  =====================================================================
+      SUBROUTINE ZLAHR2( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            K, LDA, LDT, LDY, N, NB
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16        A( LDA, * ), T( LDT, NB ), TAU( NB ),
+     $                   Y( LDY, NB )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16        ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ), 
+     $                     ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I
+      COMPLEX*16        EI
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZAXPY, ZCOPY, ZGEMM, ZGEMV, ZLACPY,
+     $                   ZLARFG, ZSCAL, ZTRMM, ZTRMV, ZLACGV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.LE.1 )
+     $   RETURN
+*
+      DO 10 I = 1, NB
+         IF( I.GT.1 ) THEN
+*
+*           Update A(K+1:N,I)
+*
+*           Update I-th column of A - Y * V**H
+*
+            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA ) 
+            CALL ZGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, Y(K+1,1), LDY,
+     $                  A( K+I-1, 1 ), LDA, ONE, A( K+1, I ), 1 )
+            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA ) 
+*
+*           Apply I - V * T**H * V**H to this column (call it b) from the
+*           left, using the last column of T as workspace
+*
+*           Let  V = ( V1 )   and   b = ( b1 )   (first I-1 rows)
+*                    ( V2 )             ( b2 )
+*
+*           where V1 is unit lower triangular
+*
+*           w := V1**H * b1
+*
+            CALL ZCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
+            CALL ZTRMV( 'Lower', 'Conjugate transpose', 'UNIT', 
+     $                  I-1, A( K+1, 1 ),
+     $                  LDA, T( 1, NB ), 1 )
+*
+*           w := w + V2**H * b2
+*
+            CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, 
+     $                  ONE, A( K+I, 1 ),
+     $                  LDA, A( K+I, I ), 1, ONE, T( 1, NB ), 1 )
+*
+*           w := T**H * w
+*
+            CALL ZTRMV( 'Upper', 'Conjugate transpose', 'NON-UNIT', 
+     $                  I-1, T, LDT,
+     $                  T( 1, NB ), 1 )
+*
+*           b2 := b2 - V2*w
+*
+            CALL ZGEMV( 'NO TRANSPOSE', N-K-I+1, I-1, -ONE, 
+     $                  A( K+I, 1 ),
+     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+*
+*           b1 := b1 - V1*w
+*
+            CALL ZTRMV( 'Lower', 'NO TRANSPOSE', 
+     $                  'UNIT', I-1,
+     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
+            CALL ZAXPY( I-1, -ONE, T( 1, NB ), 1, A( K+1, I ), 1 )
+*
+            A( K+I-1, I-1 ) = EI
+         END IF
+*
+*        Generate the elementary reflector H(I) to annihilate
+*        A(K+I+1:N,I)
+*
+         CALL ZLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
+     $                TAU( I ) )
+         EI = A( K+I, I )
+         A( K+I, I ) = ONE
+*
+*        Compute  Y(K+1:N,I)
+*
+         CALL ZGEMV( 'NO TRANSPOSE', N-K, N-K-I+1, 
+     $               ONE, A( K+1, I+1 ),
+     $               LDA, A( K+I, I ), 1, ZERO, Y( K+1, I ), 1 )
+         CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, 
+     $               ONE, A( K+I, 1 ), LDA,
+     $               A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
+         CALL ZGEMV( 'NO TRANSPOSE', N-K, I-1, -ONE, 
+     $               Y( K+1, 1 ), LDY,
+     $               T( 1, I ), 1, ONE, Y( K+1, I ), 1 )
+         CALL ZSCAL( N-K, TAU( I ), Y( K+1, I ), 1 )
+*
+*        Compute T(1:I,I)
+*
+         CALL ZSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
+         CALL ZTRMV( 'Upper', 'No Transpose', 'NON-UNIT', 
+     $               I-1, T, LDT,
+     $               T( 1, I ), 1 )
+         T( I, I ) = TAU( I )
+*
+   10 CONTINUE
+      A( K+NB, NB ) = EI
+*
+*     Compute Y(1:K,1:NB)
+*
+      CALL ZLACPY( 'ALL', K, NB, A( 1, 2 ), LDA, Y, LDY )
+      CALL ZTRMM( 'RIGHT', 'Lower', 'NO TRANSPOSE', 
+     $            'UNIT', K, NB,
+     $            ONE, A( K+1, 1 ), LDA, Y, LDY )
+      IF( N.GT.K+NB )
+     $   CALL ZGEMM( 'NO TRANSPOSE', 'NO TRANSPOSE', K, 
+     $               NB, N-K-NB, ONE,
+     $               A( 1, 2+NB ), LDA, A( K+1+NB, 1 ), LDA, ONE, Y,
+     $               LDY )
+      CALL ZTRMM( 'RIGHT', 'Upper', 'NO TRANSPOSE', 
+     $            'NON-UNIT', K, NB,
+     $            ONE, T, LDT, Y, LDY )
+*
+      RETURN
+*
+*     End of ZLAHR2
+*
+      END
+*> \brief \b ZLAHRD reduces the first nb columns of a general rectangular matrix A so that elements below the k-th subdiagonal are zero, and returns auxiliary matrices which are needed to apply the transformation to the unreduced part of A.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAHRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlahrd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlahrd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlahrd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            K, LDA, LDT, LDY, N, NB
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), T( LDT, NB ), TAU( NB ),
+*      $                   Y( LDY, NB )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine ZLAHR2.
+*>
+*> ZLAHRD reduces the first NB columns of a complex general n-by-(n-k+1)
+*> matrix A so that elements below the k-th subdiagonal are zero. The
+*> reduction is performed by a unitary similarity transformation
+*> Q**H * A * Q. The routine returns the matrices V and T which determine
+*> Q as a block reflector I - V*T*V**H, and also the matrix Y = A * V * T.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The offset for the reduction. Elements below the k-th
+*>          subdiagonal in the first NB columns are reduced to zero.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          The number of columns to be reduced.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N-K+1)
+*>          On entry, the n-by-(n-k+1) general matrix A.
+*>          On exit, the elements on and above the k-th subdiagonal in
+*>          the first NB columns are overwritten with the corresponding
+*>          elements of the reduced matrix; the elements below the k-th
+*>          subdiagonal, with the array TAU, represent the matrix Q as a
+*>          product of elementary reflectors. The other columns of A are
+*>          unchanged. See Further Details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (NB)
+*>          The scalar factors of the elementary reflectors. See Further
+*>          Details.
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,NB)
+*>          The upper triangular matrix T.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T.  LDT >= NB.
+*> \endverbatim
+*>
+*> \param[out] Y
+*> \verbatim
+*>          Y is COMPLEX*16 array, dimension (LDY,NB)
+*>          The n-by-nb matrix Y.
+*> \endverbatim
+*>
+*> \param[in] LDY
+*> \verbatim
+*>          LDY is INTEGER
+*>          The leading dimension of the array Y. LDY >= max(1,N).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of nb elementary reflectors
+*>
+*>     Q = H(1) H(2) . . . H(nb).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**H
+*>
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i+k-1) = 0, v(i+k) = 1; v(i+k+1:n) is stored on exit in
+*>  A(i+k+1:n,i), and tau in TAU(i).
+*>
+*>  The elements of the vectors v together form the (n-k+1)-by-nb matrix
+*>  V which is needed, with T and Y, to apply the transformation to the
+*>  unreduced part of the matrix, using an update of the form:
+*>  A := (I - V*T*V**H) * (A - Y*V**H).
+*>
+*>  The contents of A on exit are illustrated by the following example
+*>  with n = 7, k = 3 and nb = 2:
+*>
+*>     ( a   h   a   a   a )
+*>     ( a   h   a   a   a )
+*>     ( a   h   a   a   a )
+*>     ( h   h   a   a   a )
+*>     ( v1  h   a   a   a )
+*>     ( v1  v2  a   a   a )
+*>     ( v1  v2  a   a   a )
+*>
+*>  where a denotes an element of the original matrix A, h denotes a
+*>  modified element of the upper Hessenberg matrix H, and vi denotes an
+*>  element of the vector defining H(i).
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+*
+*  -- LAPACK auxiliary routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      INTEGER            K, LDA, LDT, LDY, N, NB
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), T( LDT, NB ), TAU( NB ),
+     $                   Y( LDY, NB )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I
+      COMPLEX*16         EI
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZAXPY, ZCOPY, ZGEMV, ZLACGV, ZLARFG, ZSCAL,
+     $                   ZTRMV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.LE.1 )
+     $   RETURN
+*
+      DO 10 I = 1, NB
+         IF( I.GT.1 ) THEN
+*
+*           Update A(1:n,i)
+*
+*           Compute i-th column of A - Y * V**H
+*
+            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA )
+            CALL ZGEMV( 'No transpose', N, I-1, -ONE, Y, LDY,
+     $                  A( K+I-1, 1 ), LDA, ONE, A( 1, I ), 1 )
+            CALL ZLACGV( I-1, A( K+I-1, 1 ), LDA )
+*
+*           Apply I - V * T**H * V**H to this column (call it b) from the
+*           left, using the last column of T as workspace
+*
+*           Let  V = ( V1 )   and   b = ( b1 )   (first I-1 rows)
+*                    ( V2 )             ( b2 )
+*
+*           where V1 is unit lower triangular
+*
+*           w := V1**H * b1
+*
+            CALL ZCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
+            CALL ZTRMV( 'Lower', 'Conjugate transpose', 'Unit', I-1,
+     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
+*
+*           w := w + V2**H *b2
+*
+            CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
+     $                  A( K+I, 1 ), LDA, A( K+I, I ), 1, ONE,
+     $                  T( 1, NB ), 1 )
+*
+*           w := T**H *w
+*
+            CALL ZTRMV( 'Upper', 'Conjugate transpose', 'Non-unit', I-1,
+     $                  T, LDT, T( 1, NB ), 1 )
+*
+*           b2 := b2 - V2*w
+*
+            CALL ZGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
+     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+*
+*           b1 := b1 - V1*w
+*
+            CALL ZTRMV( 'Lower', 'No transpose', 'Unit', I-1,
+     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
+            CALL ZAXPY( I-1, -ONE, T( 1, NB ), 1, A( K+1, I ), 1 )
+*
+            A( K+I-1, I-1 ) = EI
+         END IF
+*
+*        Generate the elementary reflector H(i) to annihilate
+*        A(k+i+1:n,i)
+*
+         EI = A( K+I, I )
+         CALL ZLARFG( N-K-I+1, EI, A( MIN( K+I+1, N ), I ), 1,
+     $                TAU( I ) )
+         A( K+I, I ) = ONE
+*
+*        Compute  Y(1:n,i)
+*
+         CALL ZGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
+     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
+         CALL ZGEMV( 'Conjugate transpose', N-K-I+1, I-1, ONE,
+     $               A( K+I, 1 ), LDA, A( K+I, I ), 1, ZERO, T( 1, I ),
+     $               1 )
+         CALL ZGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
+     $               ONE, Y( 1, I ), 1 )
+         CALL ZSCAL( N, TAU( I ), Y( 1, I ), 1 )
+*
+*        Compute T(1:i,i)
+*
+         CALL ZSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
+         CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
+     $               T( 1, I ), 1 )
+         T( I, I ) = TAU( I )
+*
+   10 CONTINUE
+      A( K+NB, NB ) = EI
+*
+      RETURN
+*
+*     End of ZLAHRD
+*
+      END
+*> \brief \b ZLALS0 applies back multiplying factors in solving the least squares problem using divide and conquer SVD approach. Used by sgelsd.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLALS0 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlals0.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlals0.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlals0.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
+*                          PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
+*                          POLES, DIFL, DIFR, Z, K, C, S, RWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            GIVPTR, ICOMPQ, INFO, K, LDB, LDBX, LDGCOL,
+*      $                   LDGNUM, NL, NR, NRHS, SQRE
+*       DOUBLE PRECISION   C, S
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            GIVCOL( LDGCOL, * ), PERM( * )
+*       DOUBLE PRECISION   DIFL( * ), DIFR( LDGNUM, * ),
+*      $                   GIVNUM( LDGNUM, * ), POLES( LDGNUM, * ),
+*      $                   RWORK( * ), Z( * )
+*       COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLALS0 applies back the multiplying factors of either the left or the
+*> right singular vector matrix of a diagonal matrix appended by a row
+*> to the right hand side matrix B in solving the least squares problem
+*> using the divide-and-conquer SVD approach.
+*>
+*> For the left singular vector matrix, three types of orthogonal
+*> matrices are involved:
+*>
+*> (1L) Givens rotations: the number of such rotations is GIVPTR; the
+*>      pairs of columns/rows they were applied to are stored in GIVCOL;
+*>      and the C- and S-values of these rotations are stored in GIVNUM.
+*>
+*> (2L) Permutation. The (NL+1)-st row of B is to be moved to the first
+*>      row, and for J=2:N, PERM(J)-th row of B is to be moved to the
+*>      J-th row.
+*>
+*> (3L) The left singular vector matrix of the remaining matrix.
+*>
+*> For the right singular vector matrix, four types of orthogonal
+*> matrices are involved:
+*>
+*> (1R) The right singular vector matrix of the remaining matrix.
+*>
+*> (2R) If SQRE = 1, one extra Givens rotation to generate the right
+*>      null space.
+*>
+*> (3R) The inverse transformation of (2L).
+*>
+*> (4R) The inverse transformation of (1L).
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] ICOMPQ
+*> \verbatim
+*>          ICOMPQ is INTEGER
+*>         Specifies whether singular vectors are to be computed in
+*>         factored form:
+*>         = 0: Left singular vector matrix.
+*>         = 1: Right singular vector matrix.
+*> \endverbatim
+*>
+*> \param[in] NL
+*> \verbatim
+*>          NL is INTEGER
+*>         The row dimension of the upper block. NL >= 1.
+*> \endverbatim
+*>
+*> \param[in] NR
+*> \verbatim
+*>          NR is INTEGER
+*>         The row dimension of the lower block. NR >= 1.
+*> \endverbatim
+*>
+*> \param[in] SQRE
+*> \verbatim
+*>          SQRE is INTEGER
+*>         = 0: the lower block is an NR-by-NR square matrix.
+*>         = 1: the lower block is an NR-by-(NR+1) rectangular matrix.
+*>
+*>         The bidiagonal matrix has row dimension N = NL + NR + 1,
+*>         and column dimension M = N + SQRE.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>         The number of columns of B and BX. NRHS must be at least 1.
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension ( LDB, NRHS )
+*>         On input, B contains the right hand sides of the least
+*>         squares problem in rows 1 through M. On output, B contains
+*>         the solution X in rows 1 through N.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>         The leading dimension of B. LDB must be at least
+*>         max(1,MAX( M, N ) ).
+*> \endverbatim
+*>
+*> \param[out] BX
+*> \verbatim
+*>          BX is COMPLEX*16 array, dimension ( LDBX, NRHS )
+*> \endverbatim
+*>
+*> \param[in] LDBX
+*> \verbatim
+*>          LDBX is INTEGER
+*>         The leading dimension of BX.
+*> \endverbatim
+*>
+*> \param[in] PERM
+*> \verbatim
+*>          PERM is INTEGER array, dimension ( N )
+*>         The permutations (from deflation and sorting) applied
+*>         to the two blocks.
+*> \endverbatim
+*>
+*> \param[in] GIVPTR
+*> \verbatim
+*>          GIVPTR is INTEGER
+*>         The number of Givens rotations which took place in this
+*>         subproblem.
+*> \endverbatim
+*>
+*> \param[in] GIVCOL
+*> \verbatim
+*>          GIVCOL is INTEGER array, dimension ( LDGCOL, 2 )
+*>         Each pair of numbers indicates a pair of rows/columns
+*>         involved in a Givens rotation.
+*> \endverbatim
+*>
+*> \param[in] LDGCOL
+*> \verbatim
+*>          LDGCOL is INTEGER
+*>         The leading dimension of GIVCOL, must be at least N.
+*> \endverbatim
+*>
+*> \param[in] GIVNUM
+*> \verbatim
+*>          GIVNUM is DOUBLE PRECISION array, dimension ( LDGNUM, 2 )
+*>         Each number indicates the C or S value used in the
+*>         corresponding Givens rotation.
+*> \endverbatim
+*>
+*> \param[in] LDGNUM
+*> \verbatim
+*>          LDGNUM is INTEGER
+*>         The leading dimension of arrays DIFR, POLES and
+*>         GIVNUM, must be at least K.
+*> \endverbatim
+*>
+*> \param[in] POLES
+*> \verbatim
+*>          POLES is DOUBLE PRECISION array, dimension ( LDGNUM, 2 )
+*>         On entry, POLES(1:K, 1) contains the new singular
+*>         values obtained from solving the secular equation, and
+*>         POLES(1:K, 2) is an array containing the poles in the secular
+*>         equation.
+*> \endverbatim
+*>
+*> \param[in] DIFL
+*> \verbatim
+*>          DIFL is DOUBLE PRECISION array, dimension ( K ).
+*>         On entry, DIFL(I) is the distance between I-th updated
+*>         (undeflated) singular value and the I-th (undeflated) old
+*>         singular value.
+*> \endverbatim
+*>
+*> \param[in] DIFR
+*> \verbatim
+*>          DIFR is DOUBLE PRECISION array, dimension ( LDGNUM, 2 ).
+*>         On entry, DIFR(I, 1) contains the distances between I-th
+*>         updated (undeflated) singular value and the I+1-th
+*>         (undeflated) old singular value. And DIFR(I, 2) is the
+*>         normalizing factor for the I-th right singular vector.
+*> \endverbatim
+*>
+*> \param[in] Z
+*> \verbatim
+*>          Z is DOUBLE PRECISION array, dimension ( K )
+*>         Contain the components of the deflation-adjusted updating row
+*>         vector.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>         Contains the dimension of the non-deflated matrix,
+*>         This is the order of the related secular equation. 1 <= K <=N.
+*> \endverbatim
+*>
+*> \param[in] C
+*> \verbatim
+*>          C is DOUBLE PRECISION
+*>         C contains garbage if SQRE =0 and the C-value of a Givens
+*>         rotation related to the right null space if SQRE = 1.
+*> \endverbatim
+*>
+*> \param[in] S
+*> \verbatim
+*>          S is DOUBLE PRECISION
+*>         S contains garbage if SQRE =0 and the S-value of a Givens
+*>         rotation related to the right null space if SQRE = 1.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension
+*>         ( K*(1+NRHS) + 2*NRHS )
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERcomputational
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
+*>       California at Berkeley, USA \n
+*>     Osni Marques, LBNL/NERSC, USA \n
+*
+*  =====================================================================
+      SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
+     $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
+     $                   POLES, DIFL, DIFR, Z, K, C, S, RWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      INTEGER            GIVPTR, ICOMPQ, INFO, K, LDB, LDBX, LDGCOL,
+     $                   LDGNUM, NL, NR, NRHS, SQRE
+      DOUBLE PRECISION   C, S
+*     ..
+*     .. Array Arguments ..
+      INTEGER            GIVCOL( LDGCOL, * ), PERM( * )
+      DOUBLE PRECISION   DIFL( * ), DIFR( LDGNUM, * ),
+     $                   GIVNUM( LDGNUM, * ), POLES( LDGNUM, * ),
+     $                   RWORK( * ), Z( * )
+      COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO, NEGONE
+      PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0, NEGONE = -1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, JCOL, JROW, M, N, NLP1
+      DOUBLE PRECISION   DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, TEMP
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMV, XERBLA, ZCOPY, ZDROT, ZDSCAL, ZLACPY,
+     $                   ZLASCL
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMC3, DNRM2
+      EXTERNAL           DLAMC3, DNRM2
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, DIMAG, MAX
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      N = NL + NR + 1
+*
+      IF( ( ICOMPQ.LT.0 ) .OR. ( ICOMPQ.GT.1 ) ) THEN
+         INFO = -1
+      ELSE IF( NL.LT.1 ) THEN
+         INFO = -2
+      ELSE IF( NR.LT.1 ) THEN
+         INFO = -3
+      ELSE IF( ( SQRE.LT.0 ) .OR. ( SQRE.GT.1 ) ) THEN
+         INFO = -4
+      ELSE IF( NRHS.LT.1 ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.N ) THEN
+         INFO = -7
+      ELSE IF( LDBX.LT.N ) THEN
+         INFO = -9
+      ELSE IF( GIVPTR.LT.0 ) THEN
+         INFO = -11
+      ELSE IF( LDGCOL.LT.N ) THEN
+         INFO = -13
+      ELSE IF( LDGNUM.LT.N ) THEN
+         INFO = -15
+      ELSE IF( K.LT.1 ) THEN
+         INFO = -20
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLALS0', -INFO )
+         RETURN
+      END IF
+*
+      M = N + SQRE
+      NLP1 = NL + 1
+*
+      IF( ICOMPQ.EQ.0 ) THEN
+*
+*        Apply back orthogonal transformations from the left.
+*
+*        Step (1L): apply back the Givens rotations performed.
+*
+         DO 10 I = 1, GIVPTR
+            CALL ZDROT( NRHS, B( GIVCOL( I, 2 ), 1 ), LDB,
+     $                  B( GIVCOL( I, 1 ), 1 ), LDB, GIVNUM( I, 2 ),
+     $                  GIVNUM( I, 1 ) )
+   10    CONTINUE
+*
+*        Step (2L): permute rows of B.
+*
+         CALL ZCOPY( NRHS, B( NLP1, 1 ), LDB, BX( 1, 1 ), LDBX )
+         DO 20 I = 2, N
+            CALL ZCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ), LDBX )
+   20    CONTINUE
+*
+*        Step (3L): apply the inverse of the left singular vector
+*        matrix to BX.
+*
+         IF( K.EQ.1 ) THEN
+            CALL ZCOPY( NRHS, BX, LDBX, B, LDB )
+            IF( Z( 1 ).LT.ZERO ) THEN
+               CALL ZDSCAL( NRHS, NEGONE, B, LDB )
+            END IF
+         ELSE
+            DO 100 J = 1, K
+               DIFLJ = DIFL( J )
+               DJ = POLES( J, 1 )
+               DSIGJ = -POLES( J, 2 )
+               IF( J.LT.K ) THEN
+                  DIFRJ = -DIFR( J, 1 )
+                  DSIGJP = -POLES( J+1, 2 )
+               END IF
+               IF( ( Z( J ).EQ.ZERO ) .OR. ( POLES( J, 2 ).EQ.ZERO ) )
+     $              THEN
+                  RWORK( J ) = ZERO
+               ELSE
+                  RWORK( J ) = -POLES( J, 2 )*Z( J ) / DIFLJ /
+     $                         ( POLES( J, 2 )+DJ )
+               END IF
+               DO 30 I = 1, J - 1
+                  IF( ( Z( I ).EQ.ZERO ) .OR.
+     $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
+                     RWORK( I ) = ZERO
+                  ELSE
+                     RWORK( I ) = POLES( I, 2 )*Z( I ) /
+     $                            ( DLAMC3( POLES( I, 2 ), DSIGJ )-
+     $                            DIFLJ ) / ( POLES( I, 2 )+DJ )
+                  END IF
+   30          CONTINUE
+               DO 40 I = J + 1, K
+                  IF( ( Z( I ).EQ.ZERO ) .OR.
+     $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
+                     RWORK( I ) = ZERO
+                  ELSE
+                     RWORK( I ) = POLES( I, 2 )*Z( I ) /
+     $                            ( DLAMC3( POLES( I, 2 ), DSIGJP )+
+     $                            DIFRJ ) / ( POLES( I, 2 )+DJ )
+                  END IF
+   40          CONTINUE
+               RWORK( 1 ) = NEGONE
+               TEMP = DNRM2( K, RWORK, 1 )
+*
+*              Since B and BX are complex, the following call to DGEMV
+*              is performed in two steps (real and imaginary parts).
+*
+*              CALL DGEMV( 'T', K, NRHS, ONE, BX, LDBX, WORK, 1, ZERO,
+*    $                     B( J, 1 ), LDB )
+*
+               I = K + NRHS*2
+               DO 60 JCOL = 1, NRHS
+                  DO 50 JROW = 1, K
+                     I = I + 1
+                     RWORK( I ) = DBLE( BX( JROW, JCOL ) )
+   50             CONTINUE
+   60          CONTINUE
+               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
+     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K ), 1 )
+               I = K + NRHS*2
+               DO 80 JCOL = 1, NRHS
+                  DO 70 JROW = 1, K
+                     I = I + 1
+                     RWORK( I ) = DIMAG( BX( JROW, JCOL ) )
+   70             CONTINUE
+   80          CONTINUE
+               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
+     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K+NRHS ), 1 )
+               DO 90 JCOL = 1, NRHS
+                  B( J, JCOL ) = DCMPLX( RWORK( JCOL+K ),
+     $                           RWORK( JCOL+K+NRHS ) )
+   90          CONTINUE
+               CALL ZLASCL( 'G', 0, 0, TEMP, ONE, 1, NRHS, B( J, 1 ),
+     $                      LDB, INFO )
+  100       CONTINUE
+         END IF
+*
+*        Move the deflated rows of BX to B also.
+*
+         IF( K.LT.MAX( M, N ) )
+     $      CALL ZLACPY( 'A', N-K, NRHS, BX( K+1, 1 ), LDBX,
+     $                   B( K+1, 1 ), LDB )
+      ELSE
+*
+*        Apply back the right orthogonal transformations.
+*
+*        Step (1R): apply back the new right singular vector matrix
+*        to B.
+*
+         IF( K.EQ.1 ) THEN
+            CALL ZCOPY( NRHS, B, LDB, BX, LDBX )
+         ELSE
+            DO 180 J = 1, K
+               DSIGJ = POLES( J, 2 )
+               IF( Z( J ).EQ.ZERO ) THEN
+                  RWORK( J ) = ZERO
+               ELSE
+                  RWORK( J ) = -Z( J ) / DIFL( J ) /
+     $                         ( DSIGJ+POLES( J, 1 ) ) / DIFR( J, 2 )
+               END IF
+               DO 110 I = 1, J - 1
+                  IF( Z( J ).EQ.ZERO ) THEN
+                     RWORK( I ) = ZERO
+                  ELSE
+                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I+1,
+     $                            2 ) )-DIFR( I, 1 ) ) /
+     $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
+                  END IF
+  110          CONTINUE
+               DO 120 I = J + 1, K
+                  IF( Z( J ).EQ.ZERO ) THEN
+                     RWORK( I ) = ZERO
+                  ELSE
+                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I,
+     $                            2 ) )-DIFL( I ) ) /
+     $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
+                  END IF
+  120          CONTINUE
+*
+*              Since B and BX are complex, the following call to DGEMV
+*              is performed in two steps (real and imaginary parts).
+*
+*              CALL DGEMV( 'T', K, NRHS, ONE, B, LDB, WORK, 1, ZERO,
+*    $                     BX( J, 1 ), LDBX )
+*
+               I = K + NRHS*2
+               DO 140 JCOL = 1, NRHS
+                  DO 130 JROW = 1, K
+                     I = I + 1
+                     RWORK( I ) = DBLE( B( JROW, JCOL ) )
+  130             CONTINUE
+  140          CONTINUE
+               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
+     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K ), 1 )
+               I = K + NRHS*2
+               DO 160 JCOL = 1, NRHS
+                  DO 150 JROW = 1, K
+                     I = I + 1
+                     RWORK( I ) = DIMAG( B( JROW, JCOL ) )
+  150             CONTINUE
+  160          CONTINUE
+               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
+     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K+NRHS ), 1 )
+               DO 170 JCOL = 1, NRHS
+                  BX( J, JCOL ) = DCMPLX( RWORK( JCOL+K ),
+     $                            RWORK( JCOL+K+NRHS ) )
+  170          CONTINUE
+  180       CONTINUE
+         END IF
+*
+*        Step (2R): if SQRE = 1, apply back the rotation that is
+*        related to the right null space of the subproblem.
+*
+         IF( SQRE.EQ.1 ) THEN
+            CALL ZCOPY( NRHS, B( M, 1 ), LDB, BX( M, 1 ), LDBX )
+            CALL ZDROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C, S )
+         END IF
+         IF( K.LT.MAX( M, N ) )
+     $      CALL ZLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1, 1 ),
+     $                   LDBX )
+*
+*        Step (3R): permute rows of B.
+*
+         CALL ZCOPY( NRHS, BX( 1, 1 ), LDBX, B( NLP1, 1 ), LDB )
+         IF( SQRE.EQ.1 ) THEN
+            CALL ZCOPY( NRHS, BX( M, 1 ), LDBX, B( M, 1 ), LDB )
+         END IF
+         DO 190 I = 2, N
+            CALL ZCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ), LDB )
+  190    CONTINUE
+*
+*        Step (4R): apply back the Givens rotations performed.
+*
+         DO 200 I = GIVPTR, 1, -1
+            CALL ZDROT( NRHS, B( GIVCOL( I, 2 ), 1 ), LDB,
+     $                  B( GIVCOL( I, 1 ), 1 ), LDB, GIVNUM( I, 2 ),
+     $                  -GIVNUM( I, 1 ) )
+  200    CONTINUE
+      END IF
+*
+      RETURN
+*
+*     End of ZLALS0
+*
+      END
+*> \brief \b ZLALSA computes the SVD of the coefficient matrix in compact form. Used by sgelsd.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLALSA + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlalsa.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlalsa.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlalsa.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
+*                          LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
+*                          GIVCOL, LDGCOL, PERM, GIVNUM, C, S, RWORK,
+*                          IWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            ICOMPQ, INFO, LDB, LDBX, LDGCOL, LDU, N, NRHS,
+*      $                   SMLSIZ
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            GIVCOL( LDGCOL, * ), GIVPTR( * ), IWORK( * ),
+*      $                   K( * ), PERM( LDGCOL, * )
+*       DOUBLE PRECISION   C( * ), DIFL( LDU, * ), DIFR( LDU, * ),
+*      $                   GIVNUM( LDU, * ), POLES( LDU, * ), RWORK( * ),
+*      $                   S( * ), U( LDU, * ), VT( LDU, * ), Z( LDU, * )
+*       COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLALSA is an itermediate step in solving the least squares problem
+*> by computing the SVD of the coefficient matrix in compact form (The
+*> singular vectors are computed as products of simple orthorgonal
+*> matrices.).
+*>
+*> If ICOMPQ = 0, ZLALSA applies the inverse of the left singular vector
+*> matrix of an upper bidiagonal matrix to the right hand side; and if
+*> ICOMPQ = 1, ZLALSA applies the right singular vector matrix to the
+*> right hand side. The singular vector matrices were generated in
+*> compact form by ZLALSA.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] ICOMPQ
+*> \verbatim
+*>          ICOMPQ is INTEGER
+*>         Specifies whether the left or the right singular vector
+*>         matrix is involved.
+*>         = 0: Left singular vector matrix
+*>         = 1: Right singular vector matrix
+*> \endverbatim
+*>
+*> \param[in] SMLSIZ
+*> \verbatim
+*>          SMLSIZ is INTEGER
+*>         The maximum size of the subproblems at the bottom of the
+*>         computation tree.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>         The row and column dimensions of the upper bidiagonal matrix.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>         The number of columns of B and BX. NRHS must be at least 1.
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension ( LDB, NRHS )
+*>         On input, B contains the right hand sides of the least
+*>         squares problem in rows 1 through M.
+*>         On output, B contains the solution X in rows 1 through N.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>         The leading dimension of B in the calling subprogram.
+*>         LDB must be at least max(1,MAX( M, N ) ).
+*> \endverbatim
+*>
+*> \param[out] BX
+*> \verbatim
+*>          BX is COMPLEX*16 array, dimension ( LDBX, NRHS )
+*>         On exit, the result of applying the left or right singular
+*>         vector matrix to B.
+*> \endverbatim
+*>
+*> \param[in] LDBX
+*> \verbatim
+*>          LDBX is INTEGER
+*>         The leading dimension of BX.
+*> \endverbatim
+*>
+*> \param[in] U
+*> \verbatim
+*>          U is DOUBLE PRECISION array, dimension ( LDU, SMLSIZ ).
+*>         On entry, U contains the left singular vector matrices of all
+*>         subproblems at the bottom level.
+*> \endverbatim
+*>
+*> \param[in] LDU
+*> \verbatim
+*>          LDU is INTEGER, LDU = > N.
+*>         The leading dimension of arrays U, VT, DIFL, DIFR,
+*>         POLES, GIVNUM, and Z.
+*> \endverbatim
+*>
+*> \param[in] VT
+*> \verbatim
+*>          VT is DOUBLE PRECISION array, dimension ( LDU, SMLSIZ+1 ).
+*>         On entry, VT**H contains the right singular vector matrices of
+*>         all subproblems at the bottom level.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER array, dimension ( N ).
+*> \endverbatim
+*>
+*> \param[in] DIFL
+*> \verbatim
+*>          DIFL is DOUBLE PRECISION array, dimension ( LDU, NLVL ).
+*>         where NLVL = INT(log_2 (N/(SMLSIZ+1))) + 1.
+*> \endverbatim
+*>
+*> \param[in] DIFR
+*> \verbatim
+*>          DIFR is DOUBLE PRECISION array, dimension ( LDU, 2 * NLVL ).
+*>         On entry, DIFL(*, I) and DIFR(*, 2 * I -1) record
+*>         distances between singular values on the I-th level and
+*>         singular values on the (I -1)-th level, and DIFR(*, 2 * I)
+*>         record the normalizing factors of the right singular vectors
+*>         matrices of subproblems on I-th level.
+*> \endverbatim
+*>
+*> \param[in] Z
+*> \verbatim
+*>          Z is DOUBLE PRECISION array, dimension ( LDU, NLVL ).
+*>         On entry, Z(1, I) contains the components of the deflation-
+*>         adjusted updating row vector for subproblems on the I-th
+*>         level.
+*> \endverbatim
+*>
+*> \param[in] POLES
+*> \verbatim
+*>          POLES is DOUBLE PRECISION array, dimension ( LDU, 2 * NLVL ).
+*>         On entry, POLES(*, 2 * I -1: 2 * I) contains the new and old
+*>         singular values involved in the secular equations on the I-th
+*>         level.
+*> \endverbatim
+*>
+*> \param[in] GIVPTR
+*> \verbatim
+*>          GIVPTR is INTEGER array, dimension ( N ).
+*>         On entry, GIVPTR( I ) records the number of Givens
+*>         rotations performed on the I-th problem on the computation
+*>         tree.
+*> \endverbatim
+*>
+*> \param[in] GIVCOL
+*> \verbatim
+*>          GIVCOL is INTEGER array, dimension ( LDGCOL, 2 * NLVL ).
+*>         On entry, for each I, GIVCOL(*, 2 * I - 1: 2 * I) records the
+*>         locations of Givens rotations performed on the I-th level on
+*>         the computation tree.
+*> \endverbatim
+*>
+*> \param[in] LDGCOL
+*> \verbatim
+*>          LDGCOL is INTEGER, LDGCOL = > N.
+*>         The leading dimension of arrays GIVCOL and PERM.
+*> \endverbatim
+*>
+*> \param[in] PERM
+*> \verbatim
+*>          PERM is INTEGER array, dimension ( LDGCOL, NLVL ).
+*>         On entry, PERM(*, I) records permutations done on the I-th
+*>         level of the computation tree.
+*> \endverbatim
+*>
+*> \param[in] GIVNUM
+*> \verbatim
+*>          GIVNUM is DOUBLE PRECISION array, dimension ( LDU, 2 * NLVL ).
+*>         On entry, GIVNUM(*, 2 *I -1 : 2 * I) records the C- and S-
+*>         values of Givens rotations performed on the I-th level on the
+*>         computation tree.
+*> \endverbatim
+*>
+*> \param[in] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension ( N ).
+*>         On entry, if the I-th subproblem is not square,
+*>         C( I ) contains the C-value of a Givens rotation related to
+*>         the right null space of the I-th subproblem.
+*> \endverbatim
+*>
+*> \param[in] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension ( N ).
+*>         On entry, if the I-th subproblem is not square,
+*>         S( I ) contains the S-value of a Givens rotation related to
+*>         the right null space of the I-th subproblem.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension at least
+*>         MAX( (SMLSZ+1)*NRHS*3, N*(1+NRHS) + 2*NRHS ).
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array.
+*>         The dimension must be at least 3 * N
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERcomputational
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
+*>       California at Berkeley, USA \n
+*>     Osni Marques, LBNL/NERSC, USA \n
+*
+*  =====================================================================
+      SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
+     $                   LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
+     $                   GIVCOL, LDGCOL, PERM, GIVNUM, C, S, RWORK,
+     $                   IWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            ICOMPQ, INFO, LDB, LDBX, LDGCOL, LDU, N, NRHS,
+     $                   SMLSIZ
+*     ..
+*     .. Array Arguments ..
+      INTEGER            GIVCOL( LDGCOL, * ), GIVPTR( * ), IWORK( * ),
+     $                   K( * ), PERM( LDGCOL, * )
+      DOUBLE PRECISION   C( * ), DIFL( LDU, * ), DIFR( LDU, * ),
+     $                   GIVNUM( LDU, * ), POLES( LDU, * ), RWORK( * ),
+     $                   S( * ), U( LDU, * ), VT( LDU, * ), Z( LDU, * )
+      COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, I1, IC, IM1, INODE, J, JCOL, JIMAG, JREAL,
+     $                   JROW, LF, LL, LVL, LVL2, ND, NDB1, NDIML,
+     $                   NDIMR, NL, NLF, NLP1, NLVL, NR, NRF, NRP1, SQRE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM, DLASDT, XERBLA, ZCOPY, ZLALS0
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, DIMAG
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+*
+      IF( ( ICOMPQ.LT.0 ) .OR. ( ICOMPQ.GT.1 ) ) THEN
+         INFO = -1
+      ELSE IF( SMLSIZ.LT.3 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.SMLSIZ ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.1 ) THEN
+         INFO = -4
+      ELSE IF( LDB.LT.N ) THEN
+         INFO = -6
+      ELSE IF( LDBX.LT.N ) THEN
+         INFO = -8
+      ELSE IF( LDU.LT.N ) THEN
+         INFO = -10
+      ELSE IF( LDGCOL.LT.N ) THEN
+         INFO = -19
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLALSA', -INFO )
+         RETURN
+      END IF
+*
+*     Book-keeping and  setting up the computation tree.
+*
+      INODE = 1
+      NDIML = INODE + N
+      NDIMR = NDIML + N
+*
+      CALL DLASDT( N, NLVL, ND, IWORK( INODE ), IWORK( NDIML ),
+     $             IWORK( NDIMR ), SMLSIZ )
+*
+*     The following code applies back the left singular vector factors.
+*     For applying back the right singular vector factors, go to 170.
+*
+      IF( ICOMPQ.EQ.1 ) THEN
+         GO TO 170
+      END IF
+*
+*     The nodes on the bottom level of the tree were solved
+*     by DLASDQ. The corresponding left and right singular vector
+*     matrices are in explicit form. First apply back the left
+*     singular vector matrices.
+*
+      NDB1 = ( ND+1 ) / 2
+      DO 130 I = NDB1, ND
+*
+*        IC : center row of each node
+*        NL : number of rows of left  subproblem
+*        NR : number of rows of right subproblem
+*        NLF: starting row of the left   subproblem
+*        NRF: starting row of the right  subproblem
+*
+         I1 = I - 1
+         IC = IWORK( INODE+I1 )
+         NL = IWORK( NDIML+I1 )
+         NR = IWORK( NDIMR+I1 )
+         NLF = IC - NL
+         NRF = IC + 1
+*
+*        Since B and BX are complex, the following call to DGEMM
+*        is performed in two steps (real and imaginary parts).
+*
+*        CALL DGEMM( 'T', 'N', NL, NRHS, NL, ONE, U( NLF, 1 ), LDU,
+*     $               B( NLF, 1 ), LDB, ZERO, BX( NLF, 1 ), LDBX )
+*
+         J = NL*NRHS*2
+         DO 20 JCOL = 1, NRHS
+            DO 10 JROW = NLF, NLF + NL - 1
+               J = J + 1
+               RWORK( J ) = DBLE( B( JROW, JCOL ) )
+   10       CONTINUE
+   20    CONTINUE
+         CALL DGEMM( 'T', 'N', NL, NRHS, NL, ONE, U( NLF, 1 ), LDU,
+     $               RWORK( 1+NL*NRHS*2 ), NL, ZERO, RWORK( 1 ), NL )
+         J = NL*NRHS*2
+         DO 40 JCOL = 1, NRHS
+            DO 30 JROW = NLF, NLF + NL - 1
+               J = J + 1
+               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+   30       CONTINUE
+   40    CONTINUE
+         CALL DGEMM( 'T', 'N', NL, NRHS, NL, ONE, U( NLF, 1 ), LDU,
+     $               RWORK( 1+NL*NRHS*2 ), NL, ZERO, RWORK( 1+NL*NRHS ),
+     $               NL )
+         JREAL = 0
+         JIMAG = NL*NRHS
+         DO 60 JCOL = 1, NRHS
+            DO 50 JROW = NLF, NLF + NL - 1
+               JREAL = JREAL + 1
+               JIMAG = JIMAG + 1
+               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                            RWORK( JIMAG ) )
+   50       CONTINUE
+   60    CONTINUE
+*
+*        Since B and BX are complex, the following call to DGEMM
+*        is performed in two steps (real and imaginary parts).
+*
+*        CALL DGEMM( 'T', 'N', NR, NRHS, NR, ONE, U( NRF, 1 ), LDU,
+*    $               B( NRF, 1 ), LDB, ZERO, BX( NRF, 1 ), LDBX )
+*
+         J = NR*NRHS*2
+         DO 80 JCOL = 1, NRHS
+            DO 70 JROW = NRF, NRF + NR - 1
+               J = J + 1
+               RWORK( J ) = DBLE( B( JROW, JCOL ) )
+   70       CONTINUE
+   80    CONTINUE
+         CALL DGEMM( 'T', 'N', NR, NRHS, NR, ONE, U( NRF, 1 ), LDU,
+     $               RWORK( 1+NR*NRHS*2 ), NR, ZERO, RWORK( 1 ), NR )
+         J = NR*NRHS*2
+         DO 100 JCOL = 1, NRHS
+            DO 90 JROW = NRF, NRF + NR - 1
+               J = J + 1
+               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+   90       CONTINUE
+  100    CONTINUE
+         CALL DGEMM( 'T', 'N', NR, NRHS, NR, ONE, U( NRF, 1 ), LDU,
+     $               RWORK( 1+NR*NRHS*2 ), NR, ZERO, RWORK( 1+NR*NRHS ),
+     $               NR )
+         JREAL = 0
+         JIMAG = NR*NRHS
+         DO 120 JCOL = 1, NRHS
+            DO 110 JROW = NRF, NRF + NR - 1
+               JREAL = JREAL + 1
+               JIMAG = JIMAG + 1
+               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                            RWORK( JIMAG ) )
+  110       CONTINUE
+  120    CONTINUE
+*
+  130 CONTINUE
+*
+*     Next copy the rows of B that correspond to unchanged rows
+*     in the bidiagonal matrix to BX.
+*
+      DO 140 I = 1, ND
+         IC = IWORK( INODE+I-1 )
+         CALL ZCOPY( NRHS, B( IC, 1 ), LDB, BX( IC, 1 ), LDBX )
+  140 CONTINUE
+*
+*     Finally go through the left singular vector matrices of all
+*     the other subproblems bottom-up on the tree.
+*
+      J = 2**NLVL
+      SQRE = 0
+*
+      DO 160 LVL = NLVL, 1, -1
+         LVL2 = 2*LVL - 1
+*
+*        find the first node LF and last node LL on
+*        the current level LVL
+*
+         IF( LVL.EQ.1 ) THEN
+            LF = 1
+            LL = 1
+         ELSE
+            LF = 2**( LVL-1 )
+            LL = 2*LF - 1
+         END IF
+         DO 150 I = LF, LL
+            IM1 = I - 1
+            IC = IWORK( INODE+IM1 )
+            NL = IWORK( NDIML+IM1 )
+            NR = IWORK( NDIMR+IM1 )
+            NLF = IC - NL
+            NRF = IC + 1
+            J = J - 1
+            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ), LDBX,
+     $                   B( NLF, 1 ), LDB, PERM( NLF, LVL ),
+     $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
+     $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
+     $                   DIFL( NLF, LVL ), DIFR( NLF, LVL2 ),
+     $                   Z( NLF, LVL ), K( J ), C( J ), S( J ), RWORK,
+     $                   INFO )
+  150    CONTINUE
+  160 CONTINUE
+      GO TO 330
+*
+*     ICOMPQ = 1: applying back the right singular vector factors.
+*
+  170 CONTINUE
+*
+*     First now go through the right singular vector matrices of all
+*     the tree nodes top-down.
+*
+      J = 0
+      DO 190 LVL = 1, NLVL
+         LVL2 = 2*LVL - 1
+*
+*        Find the first node LF and last node LL on
+*        the current level LVL.
+*
+         IF( LVL.EQ.1 ) THEN
+            LF = 1
+            LL = 1
+         ELSE
+            LF = 2**( LVL-1 )
+            LL = 2*LF - 1
+         END IF
+         DO 180 I = LL, LF, -1
+            IM1 = I - 1
+            IC = IWORK( INODE+IM1 )
+            NL = IWORK( NDIML+IM1 )
+            NR = IWORK( NDIMR+IM1 )
+            NLF = IC - NL
+            NRF = IC + 1
+            IF( I.EQ.LL ) THEN
+               SQRE = 0
+            ELSE
+               SQRE = 1
+            END IF
+            J = J + 1
+            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ), LDB,
+     $                   BX( NLF, 1 ), LDBX, PERM( NLF, LVL ),
+     $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
+     $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
+     $                   DIFL( NLF, LVL ), DIFR( NLF, LVL2 ),
+     $                   Z( NLF, LVL ), K( J ), C( J ), S( J ), RWORK,
+     $                   INFO )
+  180    CONTINUE
+  190 CONTINUE
+*
+*     The nodes on the bottom level of the tree were solved
+*     by DLASDQ. The corresponding right singular vector
+*     matrices are in explicit form. Apply them back.
+*
+      NDB1 = ( ND+1 ) / 2
+      DO 320 I = NDB1, ND
+         I1 = I - 1
+         IC = IWORK( INODE+I1 )
+         NL = IWORK( NDIML+I1 )
+         NR = IWORK( NDIMR+I1 )
+         NLP1 = NL + 1
+         IF( I.EQ.ND ) THEN
+            NRP1 = NR
+         ELSE
+            NRP1 = NR + 1
+         END IF
+         NLF = IC - NL
+         NRF = IC + 1
+*
+*        Since B and BX are complex, the following call to DGEMM is
+*        performed in two steps (real and imaginary parts).
+*
+*        CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+*    $               B( NLF, 1 ), LDB, ZERO, BX( NLF, 1 ), LDBX )
+*
+         J = NLP1*NRHS*2
+         DO 210 JCOL = 1, NRHS
+            DO 200 JROW = NLF, NLF + NLP1 - 1
+               J = J + 1
+               RWORK( J ) = DBLE( B( JROW, JCOL ) )
+  200       CONTINUE
+  210    CONTINUE
+         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+     $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO, RWORK( 1 ),
+     $               NLP1 )
+         J = NLP1*NRHS*2
+         DO 230 JCOL = 1, NRHS
+            DO 220 JROW = NLF, NLF + NLP1 - 1
+               J = J + 1
+               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+  220       CONTINUE
+  230    CONTINUE
+         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
+     $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO,
+     $               RWORK( 1+NLP1*NRHS ), NLP1 )
+         JREAL = 0
+         JIMAG = NLP1*NRHS
+         DO 250 JCOL = 1, NRHS
+            DO 240 JROW = NLF, NLF + NLP1 - 1
+               JREAL = JREAL + 1
+               JIMAG = JIMAG + 1
+               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                            RWORK( JIMAG ) )
+  240       CONTINUE
+  250    CONTINUE
+*
+*        Since B and BX are complex, the following call to DGEMM is
+*        performed in two steps (real and imaginary parts).
+*
+*        CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+*    $               B( NRF, 1 ), LDB, ZERO, BX( NRF, 1 ), LDBX )
+*
+         J = NRP1*NRHS*2
+         DO 270 JCOL = 1, NRHS
+            DO 260 JROW = NRF, NRF + NRP1 - 1
+               J = J + 1
+               RWORK( J ) = DBLE( B( JROW, JCOL ) )
+  260       CONTINUE
+  270    CONTINUE
+         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+     $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO, RWORK( 1 ),
+     $               NRP1 )
+         J = NRP1*NRHS*2
+         DO 290 JCOL = 1, NRHS
+            DO 280 JROW = NRF, NRF + NRP1 - 1
+               J = J + 1
+               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+  280       CONTINUE
+  290    CONTINUE
+         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
+     $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO,
+     $               RWORK( 1+NRP1*NRHS ), NRP1 )
+         JREAL = 0
+         JIMAG = NRP1*NRHS
+         DO 310 JCOL = 1, NRHS
+            DO 300 JROW = NRF, NRF + NRP1 - 1
+               JREAL = JREAL + 1
+               JIMAG = JIMAG + 1
+               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                            RWORK( JIMAG ) )
+  300       CONTINUE
+  310    CONTINUE
+*
+  320 CONTINUE
+*
+  330 CONTINUE
+*
+      RETURN
+*
+*     End of ZLALSA
+*
+      END
+*> \brief \b ZLALSD uses the singular value decomposition of A to solve the least squares problem.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLALSD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlalsd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlalsd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlalsd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
+*                          RANK, WORK, RWORK, IWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDB, N, NRHS, RANK, SMLSIZ
+*       DOUBLE PRECISION   RCOND
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
+*       COMPLEX*16         B( LDB, * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLALSD uses the singular value decomposition of A to solve the least
+*> squares problem of finding X to minimize the Euclidean norm of each
+*> column of A*X-B, where A is N-by-N upper bidiagonal, and X and B
+*> are N-by-NRHS. The solution X overwrites B.
+*>
+*> The singular values of A smaller than RCOND times the largest
+*> singular value are treated as zero in solving the least squares
+*> problem; in this case a minimum norm solution is returned.
+*> The actual singular values are returned in D in ascending order.
+*>
+*> This code makes very mild assumptions about floating point
+*> arithmetic. It will work on machines with a guard digit in
+*> add/subtract, or on those binary machines without guard digits
+*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
+*> It could conceivably fail on hexadecimal or decimal machines
+*> without guard digits, but we know of none.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>         = 'U': D and E define an upper bidiagonal matrix.
+*>         = 'L': D and E define a  lower bidiagonal matrix.
+*> \endverbatim
+*>
+*> \param[in] SMLSIZ
+*> \verbatim
+*>          SMLSIZ is INTEGER
+*>         The maximum size of the subproblems at the bottom of the
+*>         computation tree.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>         The dimension of the  bidiagonal matrix.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>         The number of columns of B. NRHS must be at least 1.
+*> \endverbatim
+*>
+*> \param[in,out] D
+*> \verbatim
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>         On entry D contains the main diagonal of the bidiagonal
+*>         matrix. On exit, if INFO = 0, D contains its singular values.
+*> \endverbatim
+*>
+*> \param[in,out] E
+*> \verbatim
+*>          E is DOUBLE PRECISION array, dimension (N-1)
+*>         Contains the super-diagonal entries of the bidiagonal matrix.
+*>         On exit, E has been destroyed.
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>         On input, B contains the right hand sides of the least
+*>         squares problem. On output, B contains the solution X.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>         The leading dimension of B in the calling subprogram.
+*>         LDB must be at least max(1,N).
+*> \endverbatim
+*>
+*> \param[in] RCOND
+*> \verbatim
+*>          RCOND is DOUBLE PRECISION
+*>         The singular values of A less than or equal to RCOND times
+*>         the largest singular value are treated as zero in solving
+*>         the least squares problem. If RCOND is negative,
+*>         machine precision is used instead.
+*>         For example, if diag(S)*X=B were the least squares problem,
+*>         where diag(S) is a diagonal matrix of singular values, the
+*>         solution would be X(i) = B(i) / S(i) if S(i) is greater than
+*>         RCOND*max(S), and X(i) = 0 if S(i) is less than or equal to
+*>         RCOND*max(S).
+*> \endverbatim
+*>
+*> \param[out] RANK
+*> \verbatim
+*>          RANK is INTEGER
+*>         The number of singular values of A greater than RCOND times
+*>         the largest singular value.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension at least
+*>         (N * NRHS).
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension at least
+*>         (9*N + 2*N*SMLSIZ + 8*N*NLVL + 3*SMLSIZ*NRHS +
+*>         MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS ),
+*>         where
+*>         NLVL = MAX( 0, INT( LOG_2( MIN( M,N )/(SMLSIZ+1) ) ) + 1 )
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension at least
+*>         (3*N*NLVL + 11*N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>         = 0:  successful exit.
+*>         < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>         > 0:  The algorithm failed to compute a singular value while
+*>               working on the submatrix lying in rows and columns
+*>               INFO/(N+1) through MOD(INFO,N+1).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERcomputational
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
+*>       California at Berkeley, USA \n
+*>     Osni Marques, LBNL/NERSC, USA \n
+*
+*  =====================================================================
+      SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
+     $                   RANK, WORK, RWORK, IWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            INFO, LDB, N, NRHS, RANK, SMLSIZ
+      DOUBLE PRECISION   RCOND
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
+      COMPLEX*16         B( LDB, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0, TWO = 2.0D0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            BX, BXST, C, DIFL, DIFR, GIVCOL, GIVNUM,
+     $                   GIVPTR, I, ICMPQ1, ICMPQ2, IRWB, IRWIB, IRWRB,
+     $                   IRWU, IRWVT, IRWWRK, IWK, J, JCOL, JIMAG,
+     $                   JREAL, JROW, K, NLVL, NM1, NRWORK, NSIZE, NSUB,
+     $                   PERM, POLES, S, SIZEI, SMLSZP, SQRE, ST, ST1,
+     $                   U, VT, Z
+      DOUBLE PRECISION   CS, EPS, ORGNRM, RCND, R, SN, TOL
+*     ..
+*     .. External Functions ..
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DLANST
+      EXTERNAL           IDAMAX, DLAMCH, DLANST
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM, DLARTG, DLASCL, DLASDA, DLASDQ, DLASET,
+     $                   DLASRT, XERBLA, ZCOPY, ZDROT, ZLACPY, ZLALSA,
+     $                   ZLASCL, ZLASET
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, LOG, SIGN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+*
+      IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( NRHS.LT.1 ) THEN
+         INFO = -4
+      ELSE IF( ( LDB.LT.1 ) .OR. ( LDB.LT.N ) ) THEN
+         INFO = -8
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLALSD', -INFO )
+         RETURN
+      END IF
+*
+      EPS = DLAMCH( 'Epsilon' )
+*
+*     Set up the tolerance.
+*
+      IF( ( RCOND.LE.ZERO ) .OR. ( RCOND.GE.ONE ) ) THEN
+         RCND = EPS
+      ELSE
+         RCND = RCOND
+      END IF
+*
+      RANK = 0
+*
+*     Quick return if possible.
+*
+      IF( N.EQ.0 ) THEN
+         RETURN
+      ELSE IF( N.EQ.1 ) THEN
+         IF( D( 1 ).EQ.ZERO ) THEN
+            CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B, LDB )
+         ELSE
+            RANK = 1
+            CALL ZLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB, INFO )
+            D( 1 ) = ABS( D( 1 ) )
+         END IF
+         RETURN
+      END IF
+*
+*     Rotate the matrix if it is lower bidiagonal.
+*
+      IF( UPLO.EQ.'L' ) THEN
+         DO 10 I = 1, N - 1
+            CALL DLARTG( D( I ), E( I ), CS, SN, R )
+            D( I ) = R
+            E( I ) = SN*D( I+1 )
+            D( I+1 ) = CS*D( I+1 )
+            IF( NRHS.EQ.1 ) THEN
+               CALL ZDROT( 1, B( I, 1 ), 1, B( I+1, 1 ), 1, CS, SN )
+            ELSE
+               RWORK( I*2-1 ) = CS
+               RWORK( I*2 ) = SN
+            END IF
+   10    CONTINUE
+         IF( NRHS.GT.1 ) THEN
+            DO 30 I = 1, NRHS
+               DO 20 J = 1, N - 1
+                  CS = RWORK( J*2-1 )
+                  SN = RWORK( J*2 )
+                  CALL ZDROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS, SN )
+   20          CONTINUE
+   30       CONTINUE
+         END IF
+      END IF
+*
+*     Scale.
+*
+      NM1 = N - 1
+      ORGNRM = DLANST( 'M', N, D, E )
+      IF( ORGNRM.EQ.ZERO ) THEN
+         CALL ZLASET( 'A', N, NRHS, CZERO, CZERO, B, LDB )
+         RETURN
+      END IF
+*
+      CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, N, 1, D, N, INFO )
+      CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, NM1, 1, E, NM1, INFO )
+*
+*     If N is smaller than the minimum divide size SMLSIZ, then solve
+*     the problem with another solver.
+*
+      IF( N.LE.SMLSIZ ) THEN
+         IRWU = 1
+         IRWVT = IRWU + N*N
+         IRWWRK = IRWVT + N*N
+         IRWRB = IRWWRK
+         IRWIB = IRWRB + N*NRHS
+         IRWB = IRWIB + N*NRHS
+         CALL DLASET( 'A', N, N, ZERO, ONE, RWORK( IRWU ), N )
+         CALL DLASET( 'A', N, N, ZERO, ONE, RWORK( IRWVT ), N )
+         CALL DLASDQ( 'U', 0, N, N, N, 0, D, E, RWORK( IRWVT ), N,
+     $                RWORK( IRWU ), N, RWORK( IRWWRK ), 1,
+     $                RWORK( IRWWRK ), INFO )
+         IF( INFO.NE.0 ) THEN
+            RETURN
+         END IF
+*
+*        In the real version, B is passed to DLASDQ and multiplied
+*        internally by Q**H. Here B is complex and that product is
+*        computed below in two steps (real and imaginary parts).
+*
+         J = IRWB - 1
+         DO 50 JCOL = 1, NRHS
+            DO 40 JROW = 1, N
+               J = J + 1
+               RWORK( J ) = DBLE( B( JROW, JCOL ) )
+   40       CONTINUE
+   50    CONTINUE
+         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWU ), N,
+     $               RWORK( IRWB ), N, ZERO, RWORK( IRWRB ), N )
+         J = IRWB - 1
+         DO 70 JCOL = 1, NRHS
+            DO 60 JROW = 1, N
+               J = J + 1
+               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+   60       CONTINUE
+   70    CONTINUE
+         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWU ), N,
+     $               RWORK( IRWB ), N, ZERO, RWORK( IRWIB ), N )
+         JREAL = IRWRB - 1
+         JIMAG = IRWIB - 1
+         DO 90 JCOL = 1, NRHS
+            DO 80 JROW = 1, N
+               JREAL = JREAL + 1
+               JIMAG = JIMAG + 1
+               B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                           RWORK( JIMAG ) )
+   80       CONTINUE
+   90    CONTINUE
+*
+         TOL = RCND*ABS( D( IDAMAX( N, D, 1 ) ) )
+         DO 100 I = 1, N
+            IF( D( I ).LE.TOL ) THEN
+               CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
+            ELSE
+               CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I, 1 ),
+     $                      LDB, INFO )
+               RANK = RANK + 1
+            END IF
+  100    CONTINUE
+*
+*        Since B is complex, the following call to DGEMM is performed
+*        in two steps (real and imaginary parts). That is for V * B
+*        (in the real version of the code V**H is stored in WORK).
+*
+*        CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, WORK, N, B, LDB, ZERO,
+*    $               WORK( NWORK ), N )
+*
+         J = IRWB - 1
+         DO 120 JCOL = 1, NRHS
+            DO 110 JROW = 1, N
+               J = J + 1
+               RWORK( J ) = DBLE( B( JROW, JCOL ) )
+  110       CONTINUE
+  120    CONTINUE
+         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWVT ), N,
+     $               RWORK( IRWB ), N, ZERO, RWORK( IRWRB ), N )
+         J = IRWB - 1
+         DO 140 JCOL = 1, NRHS
+            DO 130 JROW = 1, N
+               J = J + 1
+               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+  130       CONTINUE
+  140    CONTINUE
+         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWVT ), N,
+     $               RWORK( IRWB ), N, ZERO, RWORK( IRWIB ), N )
+         JREAL = IRWRB - 1
+         JIMAG = IRWIB - 1
+         DO 160 JCOL = 1, NRHS
+            DO 150 JROW = 1, N
+               JREAL = JREAL + 1
+               JIMAG = JIMAG + 1
+               B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                           RWORK( JIMAG ) )
+  150       CONTINUE
+  160    CONTINUE
+*
+*        Unscale.
+*
+         CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, N, 1, D, N, INFO )
+         CALL DLASRT( 'D', N, D, INFO )
+         CALL ZLASCL( 'G', 0, 0, ORGNRM, ONE, N, NRHS, B, LDB, INFO )
+*
+         RETURN
+      END IF
+*
+*     Book-keeping and setting up some constants.
+*
+      NLVL = INT( LOG( DBLE( N ) / DBLE( SMLSIZ+1 ) ) / LOG( TWO ) ) + 1
+*
+      SMLSZP = SMLSIZ + 1
+*
+      U = 1
+      VT = 1 + SMLSIZ*N
+      DIFL = VT + SMLSZP*N
+      DIFR = DIFL + NLVL*N
+      Z = DIFR + NLVL*N*2
+      C = Z + NLVL*N
+      S = C + N
+      POLES = S + N
+      GIVNUM = POLES + 2*NLVL*N
+      NRWORK = GIVNUM + 2*NLVL*N
+      BX = 1
+*
+      IRWRB = NRWORK
+      IRWIB = IRWRB + SMLSIZ*NRHS
+      IRWB = IRWIB + SMLSIZ*NRHS
+*
+      SIZEI = 1 + N
+      K = SIZEI + N
+      GIVPTR = K + N
+      PERM = GIVPTR + N
+      GIVCOL = PERM + NLVL*N
+      IWK = GIVCOL + NLVL*N*2
+*
+      ST = 1
+      SQRE = 0
+      ICMPQ1 = 1
+      ICMPQ2 = 0
+      NSUB = 0
+*
+      DO 170 I = 1, N
+         IF( ABS( D( I ) ).LT.EPS ) THEN
+            D( I ) = SIGN( EPS, D( I ) )
+         END IF
+  170 CONTINUE
+*
+      DO 240 I = 1, NM1
+         IF( ( ABS( E( I ) ).LT.EPS ) .OR. ( I.EQ.NM1 ) ) THEN
+            NSUB = NSUB + 1
+            IWORK( NSUB ) = ST
+*
+*           Subproblem found. First determine its size and then
+*           apply divide and conquer on it.
+*
+            IF( I.LT.NM1 ) THEN
+*
+*              A subproblem with E(I) small for I < NM1.
+*
+               NSIZE = I - ST + 1
+               IWORK( SIZEI+NSUB-1 ) = NSIZE
+            ELSE IF( ABS( E( I ) ).GE.EPS ) THEN
+*
+*              A subproblem with E(NM1) not too small but I = NM1.
+*
+               NSIZE = N - ST + 1
+               IWORK( SIZEI+NSUB-1 ) = NSIZE
+            ELSE
+*
+*              A subproblem with E(NM1) small. This implies an
+*              1-by-1 subproblem at D(N), which is not solved
+*              explicitly.
+*
+               NSIZE = I - ST + 1
+               IWORK( SIZEI+NSUB-1 ) = NSIZE
+               NSUB = NSUB + 1
+               IWORK( NSUB ) = N
+               IWORK( SIZEI+NSUB-1 ) = 1
+               CALL ZCOPY( NRHS, B( N, 1 ), LDB, WORK( BX+NM1 ), N )
+            END IF
+            ST1 = ST - 1
+            IF( NSIZE.EQ.1 ) THEN
+*
+*              This is a 1-by-1 subproblem and is not solved
+*              explicitly.
+*
+               CALL ZCOPY( NRHS, B( ST, 1 ), LDB, WORK( BX+ST1 ), N )
+            ELSE IF( NSIZE.LE.SMLSIZ ) THEN
+*
+*              This is a small subproblem and is solved by DLASDQ.
+*
+               CALL DLASET( 'A', NSIZE, NSIZE, ZERO, ONE,
+     $                      RWORK( VT+ST1 ), N )
+               CALL DLASET( 'A', NSIZE, NSIZE, ZERO, ONE,
+     $                      RWORK( U+ST1 ), N )
+               CALL DLASDQ( 'U', 0, NSIZE, NSIZE, NSIZE, 0, D( ST ),
+     $                      E( ST ), RWORK( VT+ST1 ), N, RWORK( U+ST1 ),
+     $                      N, RWORK( NRWORK ), 1, RWORK( NRWORK ),
+     $                      INFO )
+               IF( INFO.NE.0 ) THEN
+                  RETURN
+               END IF
+*
+*              In the real version, B is passed to DLASDQ and multiplied
+*              internally by Q**H. Here B is complex and that product is
+*              computed below in two steps (real and imaginary parts).
+*
+               J = IRWB - 1
+               DO 190 JCOL = 1, NRHS
+                  DO 180 JROW = ST, ST + NSIZE - 1
+                     J = J + 1
+                     RWORK( J ) = DBLE( B( JROW, JCOL ) )
+  180             CONTINUE
+  190          CONTINUE
+               CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
+     $                     RWORK( U+ST1 ), N, RWORK( IRWB ), NSIZE,
+     $                     ZERO, RWORK( IRWRB ), NSIZE )
+               J = IRWB - 1
+               DO 210 JCOL = 1, NRHS
+                  DO 200 JROW = ST, ST + NSIZE - 1
+                     J = J + 1
+                     RWORK( J ) = DIMAG( B( JROW, JCOL ) )
+  200             CONTINUE
+  210          CONTINUE
+               CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
+     $                     RWORK( U+ST1 ), N, RWORK( IRWB ), NSIZE,
+     $                     ZERO, RWORK( IRWIB ), NSIZE )
+               JREAL = IRWRB - 1
+               JIMAG = IRWIB - 1
+               DO 230 JCOL = 1, NRHS
+                  DO 220 JROW = ST, ST + NSIZE - 1
+                     JREAL = JREAL + 1
+                     JIMAG = JIMAG + 1
+                     B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                                 RWORK( JIMAG ) )
+  220             CONTINUE
+  230          CONTINUE
+*
+               CALL ZLACPY( 'A', NSIZE, NRHS, B( ST, 1 ), LDB,
+     $                      WORK( BX+ST1 ), N )
+            ELSE
+*
+*              A large problem. Solve it using divide and conquer.
+*
+               CALL DLASDA( ICMPQ1, SMLSIZ, NSIZE, SQRE, D( ST ),
+     $                      E( ST ), RWORK( U+ST1 ), N, RWORK( VT+ST1 ),
+     $                      IWORK( K+ST1 ), RWORK( DIFL+ST1 ),
+     $                      RWORK( DIFR+ST1 ), RWORK( Z+ST1 ),
+     $                      RWORK( POLES+ST1 ), IWORK( GIVPTR+ST1 ),
+     $                      IWORK( GIVCOL+ST1 ), N, IWORK( PERM+ST1 ),
+     $                      RWORK( GIVNUM+ST1 ), RWORK( C+ST1 ),
+     $                      RWORK( S+ST1 ), RWORK( NRWORK ),
+     $                      IWORK( IWK ), INFO )
+               IF( INFO.NE.0 ) THEN
+                  RETURN
+               END IF
+               BXST = BX + ST1
+               CALL ZLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, B( ST, 1 ),
+     $                      LDB, WORK( BXST ), N, RWORK( U+ST1 ), N,
+     $                      RWORK( VT+ST1 ), IWORK( K+ST1 ),
+     $                      RWORK( DIFL+ST1 ), RWORK( DIFR+ST1 ),
+     $                      RWORK( Z+ST1 ), RWORK( POLES+ST1 ),
+     $                      IWORK( GIVPTR+ST1 ), IWORK( GIVCOL+ST1 ), N,
+     $                      IWORK( PERM+ST1 ), RWORK( GIVNUM+ST1 ),
+     $                      RWORK( C+ST1 ), RWORK( S+ST1 ),
+     $                      RWORK( NRWORK ), IWORK( IWK ), INFO )
+               IF( INFO.NE.0 ) THEN
+                  RETURN
+               END IF
+            END IF
+            ST = I + 1
+         END IF
+  240 CONTINUE
+*
+*     Apply the singular values and treat the tiny ones as zero.
+*
+      TOL = RCND*ABS( D( IDAMAX( N, D, 1 ) ) )
+*
+      DO 250 I = 1, N
+*
+*        Some of the elements in D can be negative because 1-by-1
+*        subproblems were not solved explicitly.
+*
+         IF( ABS( D( I ) ).LE.TOL ) THEN
+            CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, WORK( BX+I-1 ), N )
+         ELSE
+            RANK = RANK + 1
+            CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS,
+     $                   WORK( BX+I-1 ), N, INFO )
+         END IF
+         D( I ) = ABS( D( I ) )
+  250 CONTINUE
+*
+*     Now apply back the right singular vectors.
+*
+      ICMPQ2 = 1
+      DO 320 I = 1, NSUB
+         ST = IWORK( I )
+         ST1 = ST - 1
+         NSIZE = IWORK( SIZEI+I-1 )
+         BXST = BX + ST1
+         IF( NSIZE.EQ.1 ) THEN
+            CALL ZCOPY( NRHS, WORK( BXST ), N, B( ST, 1 ), LDB )
+         ELSE IF( NSIZE.LE.SMLSIZ ) THEN
+*
+*           Since B and BX are complex, the following call to DGEMM
+*           is performed in two steps (real and imaginary parts).
+*
+*           CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
+*    $                  RWORK( VT+ST1 ), N, RWORK( BXST ), N, ZERO,
+*    $                  B( ST, 1 ), LDB )
+*
+            J = BXST - N - 1
+            JREAL = IRWB - 1
+            DO 270 JCOL = 1, NRHS
+               J = J + N
+               DO 260 JROW = 1, NSIZE
+                  JREAL = JREAL + 1
+                  RWORK( JREAL ) = DBLE( WORK( J+JROW ) )
+  260          CONTINUE
+  270       CONTINUE
+            CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
+     $                  RWORK( VT+ST1 ), N, RWORK( IRWB ), NSIZE, ZERO,
+     $                  RWORK( IRWRB ), NSIZE )
+            J = BXST - N - 1
+            JIMAG = IRWB - 1
+            DO 290 JCOL = 1, NRHS
+               J = J + N
+               DO 280 JROW = 1, NSIZE
+                  JIMAG = JIMAG + 1
+                  RWORK( JIMAG ) = DIMAG( WORK( J+JROW ) )
+  280          CONTINUE
+  290       CONTINUE
+            CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
+     $                  RWORK( VT+ST1 ), N, RWORK( IRWB ), NSIZE, ZERO,
+     $                  RWORK( IRWIB ), NSIZE )
+            JREAL = IRWRB - 1
+            JIMAG = IRWIB - 1
+            DO 310 JCOL = 1, NRHS
+               DO 300 JROW = ST, ST + NSIZE - 1
+                  JREAL = JREAL + 1
+                  JIMAG = JIMAG + 1
+                  B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
+     $                              RWORK( JIMAG ) )
+  300          CONTINUE
+  310       CONTINUE
+         ELSE
+            CALL ZLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ), N,
+     $                   B( ST, 1 ), LDB, RWORK( U+ST1 ), N,
+     $                   RWORK( VT+ST1 ), IWORK( K+ST1 ),
+     $                   RWORK( DIFL+ST1 ), RWORK( DIFR+ST1 ),
+     $                   RWORK( Z+ST1 ), RWORK( POLES+ST1 ),
+     $                   IWORK( GIVPTR+ST1 ), IWORK( GIVCOL+ST1 ), N,
+     $                   IWORK( PERM+ST1 ), RWORK( GIVNUM+ST1 ),
+     $                   RWORK( C+ST1 ), RWORK( S+ST1 ),
+     $                   RWORK( NRWORK ), IWORK( IWK ), INFO )
+            IF( INFO.NE.0 ) THEN
+               RETURN
+            END IF
+         END IF
+  320 CONTINUE
+*
+*     Unscale and sort the singular values.
+*
+      CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, N, 1, D, N, INFO )
+      CALL DLASRT( 'D', N, D, INFO )
+      CALL ZLASCL( 'G', 0, 0, ORGNRM, ONE, N, NRHS, B, LDB, INFO )
+*
+      RETURN
+*
+*     End of ZLALSD
+*
+      END
+*> \brief \b ZLANGE returns the value of the 1-norm, Frobenius norm, infinity-norm, or the largest absolute value of any element of a general rectangular matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLANGE + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlange.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlange.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlange.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       DOUBLE PRECISION FUNCTION ZLANGE( NORM, M, N, A, LDA, WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          NORM
+*       INTEGER            LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   WORK( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLANGE  returns the value of the one norm,  or the Frobenius norm, or
+*> the  infinity norm,  or the  element of  largest absolute value  of a
+*> complex matrix A.
+*> \endverbatim
+*>
+*> \return ZLANGE
+*> \verbatim
+*>
+*>    ZLANGE = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+*>             (
+*>             ( norm1(A),         NORM = '1', 'O' or 'o'
+*>             (
+*>             ( normI(A),         NORM = 'I' or 'i'
+*>             (
+*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
+*>
+*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
+*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
+*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] NORM
+*> \verbatim
+*>          NORM is CHARACTER*1
+*>          Specifies the value to be returned in ZLANGE as described
+*>          above.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.  When M = 0,
+*>          ZLANGE is set to zero.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.  When N = 0,
+*>          ZLANGE is set to zero.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The m by n matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(M,1).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
+*>          where LWORK >= M when NORM = 'I'; otherwise, WORK is not
+*>          referenced.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16GEauxiliary
+*
+*  =====================================================================
+      DOUBLE PRECISION FUNCTION ZLANGE( NORM, M, N, A, LDA, WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          NORM
+      INTEGER            LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   WORK( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J
+      DOUBLE PRECISION   SCALE, SUM, VALUE, TEMP
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      EXTERNAL           LSAME, DISNAN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLASSQ
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MIN, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+      IF( MIN( M, N ).EQ.0 ) THEN
+         VALUE = ZERO
+      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*
+*        Find max(abs(A(i,j))).
+*
+         VALUE = ZERO
+         DO 20 J = 1, N
+            DO 10 I = 1, M
+               TEMP = ABS( A( I, J ) )
+               IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
+   10       CONTINUE
+   20    CONTINUE
+      ELSE IF( ( LSAME( NORM, 'O' ) ) .OR. ( NORM.EQ.'1' ) ) THEN
+*
+*        Find norm1(A).
+*
+         VALUE = ZERO
+         DO 40 J = 1, N
+            SUM = ZERO
+            DO 30 I = 1, M
+               SUM = SUM + ABS( A( I, J ) )
+   30       CONTINUE
+            IF( VALUE.LT.SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   40    CONTINUE
+      ELSE IF( LSAME( NORM, 'I' ) ) THEN
+*
+*        Find normI(A).
+*
+         DO 50 I = 1, M
+            WORK( I ) = ZERO
+   50    CONTINUE
+         DO 70 J = 1, N
+            DO 60 I = 1, M
+               WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+   60       CONTINUE
+   70    CONTINUE
+         VALUE = ZERO
+         DO 80 I = 1, M
+            TEMP = WORK( I )
+            IF( VALUE.LT.TEMP .OR. DISNAN( TEMP ) ) VALUE = TEMP
+   80    CONTINUE
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+*
+*        Find normF(A).
+*
+         SCALE = ZERO
+         SUM = ONE
+         DO 90 J = 1, N
+            CALL ZLASSQ( M, A( 1, J ), 1, SCALE, SUM )
+   90    CONTINUE
+         VALUE = SCALE*SQRT( SUM )
+      END IF
+*
+      ZLANGE = VALUE
+      RETURN
+*
+*     End of ZLANGE
+*
+      END
+*> \brief \b ZLANHE returns the value of the 1-norm, or the Frobenius norm, or the infinity norm, or the element of largest absolute value of a complex Hermitian matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLANHE + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhe.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlanhe.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhe.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          NORM, UPLO
+*       INTEGER            LDA, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   WORK( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLANHE  returns the value of the one norm,  or the Frobenius norm, or
+*> the  infinity norm,  or the  element of  largest absolute value  of a
+*> complex hermitian matrix A.
+*> \endverbatim
+*>
+*> \return ZLANHE
+*> \verbatim
+*>
+*>    ZLANHE = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+*>             (
+*>             ( norm1(A),         NORM = '1', 'O' or 'o'
+*>             (
+*>             ( normI(A),         NORM = 'I' or 'i'
+*>             (
+*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
+*>
+*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
+*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
+*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] NORM
+*> \verbatim
+*>          NORM is CHARACTER*1
+*>          Specifies the value to be returned in ZLANHE as described
+*>          above.
+*> \endverbatim
+*>
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the upper or lower triangular part of the
+*>          hermitian matrix A is to be referenced.
+*>          = 'U':  Upper triangular part of A is referenced
+*>          = 'L':  Lower triangular part of A is referenced
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.  When N = 0, ZLANHE is
+*>          set to zero.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The hermitian matrix A.  If UPLO = 'U', the leading n by n
+*>          upper triangular part of A contains the upper triangular part
+*>          of the matrix A, and the strictly lower triangular part of A
+*>          is not referenced.  If UPLO = 'L', the leading n by n lower
+*>          triangular part of A contains the lower triangular part of
+*>          the matrix A, and the strictly upper triangular part of A is
+*>          not referenced. Note that the imaginary parts of the diagonal
+*>          elements need not be set and are assumed to be zero.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(N,1).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
+*>          where LWORK >= N when NORM = 'I' or '1' or 'O'; otherwise,
+*>          WORK is not referenced.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16HEauxiliary
+*
+*  =====================================================================
+      DOUBLE PRECISION FUNCTION ZLANHE( NORM, UPLO, N, A, LDA, WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          NORM, UPLO
+      INTEGER            LDA, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   WORK( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J
+      DOUBLE PRECISION   ABSA, SCALE, SUM, VALUE
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      EXTERNAL           LSAME, DISNAN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLASSQ
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+      IF( N.EQ.0 ) THEN
+         VALUE = ZERO
+      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*
+*        Find max(abs(A(i,j))).
+*
+         VALUE = ZERO
+         IF( LSAME( UPLO, 'U' ) ) THEN
+            DO 20 J = 1, N
+               DO 10 I = 1, J - 1
+                  SUM = ABS( A( I, J ) )
+                  IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   10          CONTINUE
+               SUM = ABS( DBLE( A( J, J ) ) )
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   20       CONTINUE
+         ELSE
+            DO 40 J = 1, N
+               SUM = ABS( DBLE( A( J, J ) ) )
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+               DO 30 I = J + 1, N
+                  SUM = ABS( A( I, J ) )
+                  IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   30          CONTINUE
+   40       CONTINUE
+         END IF
+      ELSE IF( ( LSAME( NORM, 'I' ) ) .OR. ( LSAME( NORM, 'O' ) ) .OR.
+     $         ( NORM.EQ.'1' ) ) THEN
+*
+*        Find normI(A) ( = norm1(A), since A is hermitian).
+*
+         VALUE = ZERO
+         IF( LSAME( UPLO, 'U' ) ) THEN
+            DO 60 J = 1, N
+               SUM = ZERO
+               DO 50 I = 1, J - 1
+                  ABSA = ABS( A( I, J ) )
+                  SUM = SUM + ABSA
+                  WORK( I ) = WORK( I ) + ABSA
+   50          CONTINUE
+               WORK( J ) = SUM + ABS( DBLE( A( J, J ) ) )
+   60       CONTINUE
+            DO 70 I = 1, N
+               SUM = WORK( I )
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   70       CONTINUE
+         ELSE
+            DO 80 I = 1, N
+               WORK( I ) = ZERO
+   80       CONTINUE
+            DO 100 J = 1, N
+               SUM = WORK( J ) + ABS( DBLE( A( J, J ) ) )
+               DO 90 I = J + 1, N
+                  ABSA = ABS( A( I, J ) )
+                  SUM = SUM + ABSA
+                  WORK( I ) = WORK( I ) + ABSA
+   90          CONTINUE
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+  100       CONTINUE
+         END IF
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+*
+*        Find normF(A).
+*
+         SCALE = ZERO
+         SUM = ONE
+         IF( LSAME( UPLO, 'U' ) ) THEN
+            DO 110 J = 2, N
+               CALL ZLASSQ( J-1, A( 1, J ), 1, SCALE, SUM )
+  110       CONTINUE
+         ELSE
+            DO 120 J = 1, N - 1
+               CALL ZLASSQ( N-J, A( J+1, J ), 1, SCALE, SUM )
+  120       CONTINUE
+         END IF
+         SUM = 2*SUM
+         DO 130 I = 1, N
+            IF( DBLE( A( I, I ) ).NE.ZERO ) THEN
+               ABSA = ABS( DBLE( A( I, I ) ) )
+               IF( SCALE.LT.ABSA ) THEN
+                  SUM = ONE + SUM*( SCALE / ABSA )**2
+                  SCALE = ABSA
+               ELSE
+                  SUM = SUM + ( ABSA / SCALE )**2
+               END IF
+            END IF
+  130    CONTINUE
+         VALUE = SCALE*SQRT( SUM )
+      END IF
+*
+      ZLANHE = VALUE
+      RETURN
+*
+*     End of ZLANHE
+*
+      END
+*> \brief \b ZLANHS returns the value of the 1-norm, Frobenius norm, infinity-norm, or the largest absolute value of any element of an upper Hessenberg matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLANHS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlanhs.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlanhs.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlanhs.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       DOUBLE PRECISION FUNCTION ZLANHS( NORM, N, A, LDA, WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          NORM
+*       INTEGER            LDA, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   WORK( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLANHS  returns the value of the one norm,  or the Frobenius norm, or
+*> the  infinity norm,  or the  element of  largest absolute value  of a
+*> Hessenberg matrix A.
+*> \endverbatim
+*>
+*> \return ZLANHS
+*> \verbatim
+*>
+*>    ZLANHS = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+*>             (
+*>             ( norm1(A),         NORM = '1', 'O' or 'o'
+*>             (
+*>             ( normI(A),         NORM = 'I' or 'i'
+*>             (
+*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
+*>
+*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
+*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
+*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] NORM
+*> \verbatim
+*>          NORM is CHARACTER*1
+*>          Specifies the value to be returned in ZLANHS as described
+*>          above.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.  When N = 0, ZLANHS is
+*>          set to zero.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The n by n upper Hessenberg matrix A; the part of A below the
+*>          first sub-diagonal is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(N,1).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
+*>          where LWORK >= N when NORM = 'I'; otherwise, WORK is not
+*>          referenced.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      DOUBLE PRECISION FUNCTION ZLANHS( NORM, N, A, LDA, WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          NORM
+      INTEGER            LDA, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   WORK( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J
+      DOUBLE PRECISION   SCALE, SUM, VALUE
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      EXTERNAL           LSAME, DISNAN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLASSQ
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MIN, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+      IF( N.EQ.0 ) THEN
+         VALUE = ZERO
+      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*
+*        Find max(abs(A(i,j))).
+*
+         VALUE = ZERO
+         DO 20 J = 1, N
+            DO 10 I = 1, MIN( N, J+1 )
+               SUM = ABS( A( I, J ) )
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   10       CONTINUE
+   20    CONTINUE
+      ELSE IF( ( LSAME( NORM, 'O' ) ) .OR. ( NORM.EQ.'1' ) ) THEN
+*
+*        Find norm1(A).
+*
+         VALUE = ZERO
+         DO 40 J = 1, N
+            SUM = ZERO
+            DO 30 I = 1, MIN( N, J+1 )
+               SUM = SUM + ABS( A( I, J ) )
+   30       CONTINUE
+            IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   40    CONTINUE
+      ELSE IF( LSAME( NORM, 'I' ) ) THEN
+*
+*        Find normI(A).
+*
+         DO 50 I = 1, N
+            WORK( I ) = ZERO
+   50    CONTINUE
+         DO 70 J = 1, N
+            DO 60 I = 1, MIN( N, J+1 )
+               WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+   60       CONTINUE
+   70    CONTINUE
+         VALUE = ZERO
+         DO 80 I = 1, N
+            SUM = WORK( I )
+            IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   80    CONTINUE
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+*
+*        Find normF(A).
+*
+         SCALE = ZERO
+         SUM = ONE
+         DO 90 J = 1, N
+            CALL ZLASSQ( MIN( N, J+1 ), A( 1, J ), 1, SCALE, SUM )
+   90    CONTINUE
+         VALUE = SCALE*SQRT( SUM )
+      END IF
+*
+      ZLANHS = VALUE
+      RETURN
+*
+*     End of ZLANHS
+*
+      END
+*> \brief \b ZLANTR returns the value of the 1-norm, or the Frobenius norm, or the infinity norm, or the element of largest absolute value of a trapezoidal or triangular matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLANTR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlantr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlantr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlantr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
+*                        WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          DIAG, NORM, UPLO
+*       INTEGER            LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   WORK( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLANTR  returns the value of the one norm,  or the Frobenius norm, or
+*> the  infinity norm,  or the  element of  largest absolute value  of a
+*> trapezoidal or triangular matrix A.
+*> \endverbatim
+*>
+*> \return ZLANTR
+*> \verbatim
+*>
+*>    ZLANTR = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+*>             (
+*>             ( norm1(A),         NORM = '1', 'O' or 'o'
+*>             (
+*>             ( normI(A),         NORM = 'I' or 'i'
+*>             (
+*>             ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
+*>
+*> where  norm1  denotes the  one norm of a matrix (maximum column sum),
+*> normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+*> normF  denotes the  Frobenius norm of a matrix (square root of sum of
+*> squares).  Note that  max(abs(A(i,j)))  is not a consistent matrix norm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] NORM
+*> \verbatim
+*>          NORM is CHARACTER*1
+*>          Specifies the value to be returned in ZLANTR as described
+*>          above.
+*> \endverbatim
+*>
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower trapezoidal.
+*>          = 'U':  Upper trapezoidal
+*>          = 'L':  Lower trapezoidal
+*>          Note that A is triangular instead of trapezoidal if M = N.
+*> \endverbatim
+*>
+*> \param[in] DIAG
+*> \verbatim
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A has unit diagonal.
+*>          = 'N':  Non-unit diagonal
+*>          = 'U':  Unit diagonal
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0, and if
+*>          UPLO = 'U', M <= N.  When M = 0, ZLANTR is set to zero.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0, and if
+*>          UPLO = 'L', N <= M.  When N = 0, ZLANTR is set to zero.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The trapezoidal matrix A (A is triangular if M = N).
+*>          If UPLO = 'U', the leading m by n upper trapezoidal part of
+*>          the array A contains the upper trapezoidal matrix, and the
+*>          strictly lower triangular part of A is not referenced.
+*>          If UPLO = 'L', the leading m by n lower trapezoidal part of
+*>          the array A contains the lower trapezoidal matrix, and the
+*>          strictly upper triangular part of A is not referenced.  Note
+*>          that when DIAG = 'U', the diagonal elements of A are not
+*>          referenced and are assumed to be one.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(M,1).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK)),
+*>          where LWORK >= M when NORM = 'I'; otherwise, WORK is not
+*>          referenced.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      DOUBLE PRECISION FUNCTION ZLANTR( NORM, UPLO, DIAG, M, N, A, LDA,
+     $                 WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIAG, NORM, UPLO
+      INTEGER            LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   WORK( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            UDIAG
+      INTEGER            I, J
+      DOUBLE PRECISION   SCALE, SUM, VALUE
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      EXTERNAL           LSAME, DISNAN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLASSQ
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MIN, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+      IF( MIN( M, N ).EQ.0 ) THEN
+         VALUE = ZERO
+      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+*
+*        Find max(abs(A(i,j))).
+*
+         IF( LSAME( DIAG, 'U' ) ) THEN
+            VALUE = ONE
+            IF( LSAME( UPLO, 'U' ) ) THEN
+               DO 20 J = 1, N
+                  DO 10 I = 1, MIN( M, J-1 )
+                     SUM = ABS( A( I, J ) )
+                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   10             CONTINUE
+   20          CONTINUE
+            ELSE
+               DO 40 J = 1, N
+                  DO 30 I = J + 1, M
+                     SUM = ABS( A( I, J ) )
+                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   30             CONTINUE
+   40          CONTINUE
+            END IF
+         ELSE
+            VALUE = ZERO
+            IF( LSAME( UPLO, 'U' ) ) THEN
+               DO 60 J = 1, N
+                  DO 50 I = 1, MIN( M, J )
+                     SUM = ABS( A( I, J ) )
+                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   50             CONTINUE
+   60          CONTINUE
+            ELSE
+               DO 80 J = 1, N
+                  DO 70 I = J, M
+                     SUM = ABS( A( I, J ) )
+                     IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+   70             CONTINUE
+   80          CONTINUE
+            END IF
+         END IF
+      ELSE IF( ( LSAME( NORM, 'O' ) ) .OR. ( NORM.EQ.'1' ) ) THEN
+*
+*        Find norm1(A).
+*
+         VALUE = ZERO
+         UDIAG = LSAME( DIAG, 'U' )
+         IF( LSAME( UPLO, 'U' ) ) THEN
+            DO 110 J = 1, N
+               IF( ( UDIAG ) .AND. ( J.LE.M ) ) THEN
+                  SUM = ONE
+                  DO 90 I = 1, J - 1
+                     SUM = SUM + ABS( A( I, J ) )
+   90             CONTINUE
+               ELSE
+                  SUM = ZERO
+                  DO 100 I = 1, MIN( M, J )
+                     SUM = SUM + ABS( A( I, J ) )
+  100             CONTINUE
+               END IF
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+  110       CONTINUE
+         ELSE
+            DO 140 J = 1, N
+               IF( UDIAG ) THEN
+                  SUM = ONE
+                  DO 120 I = J + 1, M
+                     SUM = SUM + ABS( A( I, J ) )
+  120             CONTINUE
+               ELSE
+                  SUM = ZERO
+                  DO 130 I = J, M
+                     SUM = SUM + ABS( A( I, J ) )
+  130             CONTINUE
+               END IF
+               IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+  140       CONTINUE
+         END IF
+      ELSE IF( LSAME( NORM, 'I' ) ) THEN
+*
+*        Find normI(A).
+*
+         IF( LSAME( UPLO, 'U' ) ) THEN
+            IF( LSAME( DIAG, 'U' ) ) THEN
+               DO 150 I = 1, M
+                  WORK( I ) = ONE
+  150          CONTINUE
+               DO 170 J = 1, N
+                  DO 160 I = 1, MIN( M, J-1 )
+                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+  160             CONTINUE
+  170          CONTINUE
+            ELSE
+               DO 180 I = 1, M
+                  WORK( I ) = ZERO
+  180          CONTINUE
+               DO 200 J = 1, N
+                  DO 190 I = 1, MIN( M, J )
+                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+  190             CONTINUE
+  200          CONTINUE
+            END IF
+         ELSE
+            IF( LSAME( DIAG, 'U' ) ) THEN
+               DO 210 I = 1, N
+                  WORK( I ) = ONE
+  210          CONTINUE
+               DO 220 I = N + 1, M
+                  WORK( I ) = ZERO
+  220          CONTINUE
+               DO 240 J = 1, N
+                  DO 230 I = J + 1, M
+                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+  230             CONTINUE
+  240          CONTINUE
+            ELSE
+               DO 250 I = 1, M
+                  WORK( I ) = ZERO
+  250          CONTINUE
+               DO 270 J = 1, N
+                  DO 260 I = J, M
+                     WORK( I ) = WORK( I ) + ABS( A( I, J ) )
+  260             CONTINUE
+  270          CONTINUE
+            END IF
+         END IF
+         VALUE = ZERO
+         DO 280 I = 1, M
+            SUM = WORK( I )
+            IF( VALUE .LT. SUM .OR. DISNAN( SUM ) ) VALUE = SUM
+  280    CONTINUE
+      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+*
+*        Find normF(A).
+*
+         IF( LSAME( UPLO, 'U' ) ) THEN
+            IF( LSAME( DIAG, 'U' ) ) THEN
+               SCALE = ONE
+               SUM = MIN( M, N )
+               DO 290 J = 2, N
+                  CALL ZLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM )
+  290          CONTINUE
+            ELSE
+               SCALE = ZERO
+               SUM = ONE
+               DO 300 J = 1, N
+                  CALL ZLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM )
+  300          CONTINUE
+            END IF
+         ELSE
+            IF( LSAME( DIAG, 'U' ) ) THEN
+               SCALE = ONE
+               SUM = MIN( M, N )
+               DO 310 J = 1, N
+                  CALL ZLASSQ( M-J, A( MIN( M, J+1 ), J ), 1, SCALE,
+     $                         SUM )
+  310          CONTINUE
+            ELSE
+               SCALE = ZERO
+               SUM = ONE
+               DO 320 J = 1, N
+                  CALL ZLASSQ( M-J+1, A( J, J ), 1, SCALE, SUM )
+  320          CONTINUE
+            END IF
+         END IF
+         VALUE = SCALE*SQRT( SUM )
+      END IF
+*
+      ZLANTR = VALUE
+      RETURN
+*
+*     End of ZLANTR
+*
+      END
+*> \brief \b ZLAQGE scales a general rectangular matrix, using row and column scaling factors computed by sgeequ.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQGE + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqge.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqge.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqge.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQGE( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+*                          EQUED )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          EQUED
+*       INTEGER            LDA, M, N
+*       DOUBLE PRECISION   AMAX, COLCND, ROWCND
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   C( * ), R( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAQGE equilibrates a general M by N matrix A using the row and
+*> column scaling factors in the vectors R and C.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M by N matrix A.
+*>          On exit, the equilibrated matrix.  See EQUED for the form of
+*>          the equilibrated matrix.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(M,1).
+*> \endverbatim
+*>
+*> \param[in] R
+*> \verbatim
+*>          R is DOUBLE PRECISION array, dimension (M)
+*>          The row scale factors for A.
+*> \endverbatim
+*>
+*> \param[in] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension (N)
+*>          The column scale factors for A.
+*> \endverbatim
+*>
+*> \param[in] ROWCND
+*> \verbatim
+*>          ROWCND is DOUBLE PRECISION
+*>          Ratio of the smallest R(i) to the largest R(i).
+*> \endverbatim
+*>
+*> \param[in] COLCND
+*> \verbatim
+*>          COLCND is DOUBLE PRECISION
+*>          Ratio of the smallest C(i) to the largest C(i).
+*> \endverbatim
+*>
+*> \param[in] AMAX
+*> \verbatim
+*>          AMAX is DOUBLE PRECISION
+*>          Absolute value of largest matrix entry.
+*> \endverbatim
+*>
+*> \param[out] EQUED
+*> \verbatim
+*>          EQUED is CHARACTER*1
+*>          Specifies the form of equilibration that was done.
+*>          = 'N':  No equilibration
+*>          = 'R':  Row equilibration, i.e., A has been premultiplied by
+*>                  diag(R).
+*>          = 'C':  Column equilibration, i.e., A has been postmultiplied
+*>                  by diag(C).
+*>          = 'B':  Both row and column equilibration, i.e., A has been
+*>                  replaced by diag(R) * A * diag(C).
+*> \endverbatim
+*
+*> \par Internal Parameters:
+*  =========================
+*>
+*> \verbatim
+*>  THRESH is a threshold value used to decide if row or column scaling
+*>  should be done based on the ratio of the row or column scaling
+*>  factors.  If ROWCND < THRESH, row scaling is done, and if
+*>  COLCND < THRESH, column scaling is done.
+*>
+*>  LARGE and SMALL are threshold values used to decide if row scaling
+*>  should be done based on the absolute size of the largest matrix
+*>  element.  If AMAX > LARGE or AMAX < SMALL, row scaling is done.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16GEauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLAQGE( M, N, A, LDA, R, C, ROWCND, COLCND, AMAX,
+     $                   EQUED )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          EQUED
+      INTEGER            LDA, M, N
+      DOUBLE PRECISION   AMAX, COLCND, ROWCND
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   C( * ), R( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, THRESH
+      PARAMETER          ( ONE = 1.0D+0, THRESH = 0.1D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J
+      DOUBLE PRECISION   CJ, LARGE, SMALL
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( M.LE.0 .OR. N.LE.0 ) THEN
+         EQUED = 'N'
+         RETURN
+      END IF
+*
+*     Initialize LARGE and SMALL.
+*
+      SMALL = DLAMCH( 'Safe minimum' ) / DLAMCH( 'Precision' )
+      LARGE = ONE / SMALL
+*
+      IF( ROWCND.GE.THRESH .AND. AMAX.GE.SMALL .AND. AMAX.LE.LARGE )
+     $     THEN
+*
+*        No row scaling
+*
+         IF( COLCND.GE.THRESH ) THEN
+*
+*           No column scaling
+*
+            EQUED = 'N'
+         ELSE
+*
+*           Column scaling
+*
+            DO 20 J = 1, N
+               CJ = C( J )
+               DO 10 I = 1, M
+                  A( I, J ) = CJ*A( I, J )
+   10          CONTINUE
+   20       CONTINUE
+            EQUED = 'C'
+         END IF
+      ELSE IF( COLCND.GE.THRESH ) THEN
+*
+*        Row scaling, no column scaling
+*
+         DO 40 J = 1, N
+            DO 30 I = 1, M
+               A( I, J ) = R( I )*A( I, J )
+   30       CONTINUE
+   40    CONTINUE
+         EQUED = 'R'
+      ELSE
+*
+*        Row and column scaling
+*
+         DO 60 J = 1, N
+            CJ = C( J )
+            DO 50 I = 1, M
+               A( I, J ) = CJ*R( I )*A( I, J )
+   50       CONTINUE
+   60    CONTINUE
+         EQUED = 'B'
+      END IF
+*
+      RETURN
+*
+*     End of ZLAQGE
+*
+      END
+*> \brief \b ZLAQP2 computes a QR factorization with column pivoting of the matrix block.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQP2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqp2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqp2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqp2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
+*                          WORK )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            LDA, M, N, OFFSET
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            JPVT( * )
+*       DOUBLE PRECISION   VN1( * ), VN2( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAQP2 computes a QR factorization with column pivoting of
+*> the block A(OFFSET+1:M,1:N).
+*> The block A(1:OFFSET,1:N) is accordingly pivoted, but not factorized.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] OFFSET
+*> \verbatim
+*>          OFFSET is INTEGER
+*>          The number of rows of the matrix A that must be pivoted
+*>          but no factorized. OFFSET >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit, the upper triangle of block A(OFFSET+1:M,1:N) is
+*>          the triangular factor obtained; the elements in block
+*>          A(OFFSET+1:M,1:N) below the diagonal, together with the
+*>          array TAU, represent the orthogonal matrix Q as a product of
+*>          elementary reflectors. Block A(1:OFFSET,1:N) has been
+*>          accordingly pivoted, but no factorized.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] JPVT
+*> \verbatim
+*>          JPVT is INTEGER array, dimension (N)
+*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is permuted
+*>          to the front of A*P (a leading column); if JPVT(i) = 0,
+*>          the i-th column of A is a free column.
+*>          On exit, if JPVT(i) = k, then the i-th column of A*P
+*>          was the k-th column of A.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (N)
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain
+*>    X. Sun, Computer Science Dept., Duke University, USA
+*> \n
+*>  Partial column norm updating strategy modified on April 2011
+*>    Z. Drmac and Z. Bujanovic, Dept. of Mathematics,
+*>    University of Zagreb, Croatia.
+*
+*> \par References:
+*  ================
+*>
+*> LAPACK Working Note 176
+*
+*> \htmlonly
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a> 
+*> \endhtmlonly 
+*
+*  =====================================================================
+      SUBROUTINE ZLAQP2( M, N, OFFSET, A, LDA, JPVT, TAU, VN1, VN2,
+     $                   WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            LDA, M, N, OFFSET
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPVT( * )
+      DOUBLE PRECISION   VN1( * ), VN2( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      COMPLEX*16         CONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0,
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, ITEMP, J, MN, OFFPI, PVT
+      DOUBLE PRECISION   TEMP, TEMP2, TOL3Z
+      COMPLEX*16         AII
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLARF, ZLARFG, ZSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DCONJG, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DZNRM2
+      EXTERNAL           IDAMAX, DLAMCH, DZNRM2
+*     ..
+*     .. Executable Statements ..
+*
+      MN = MIN( M-OFFSET, N )
+      TOL3Z = SQRT(DLAMCH('Epsilon'))
+*
+*     Compute factorization.
+*
+      DO 20 I = 1, MN
+*
+         OFFPI = OFFSET + I
+*
+*        Determine ith pivot column and swap if necessary.
+*
+         PVT = ( I-1 ) + IDAMAX( N-I+1, VN1( I ), 1 )
+*
+         IF( PVT.NE.I ) THEN
+            CALL ZSWAP( M, A( 1, PVT ), 1, A( 1, I ), 1 )
+            ITEMP = JPVT( PVT )
+            JPVT( PVT ) = JPVT( I )
+            JPVT( I ) = ITEMP
+            VN1( PVT ) = VN1( I )
+            VN2( PVT ) = VN2( I )
+         END IF
+*
+*        Generate elementary reflector H(i).
+*
+         IF( OFFPI.LT.M ) THEN
+            CALL ZLARFG( M-OFFPI+1, A( OFFPI, I ), A( OFFPI+1, I ), 1,
+     $                   TAU( I ) )
+         ELSE
+            CALL ZLARFG( 1, A( M, I ), A( M, I ), 1, TAU( I ) )
+         END IF
+*
+         IF( I.LT.N ) THEN
+*
+*           Apply H(i)**H to A(offset+i:m,i+1:n) from the left.
+*
+            AII = A( OFFPI, I )
+            A( OFFPI, I ) = CONE
+            CALL ZLARF( 'Left', M-OFFPI+1, N-I, A( OFFPI, I ), 1,
+     $                  DCONJG( TAU( I ) ), A( OFFPI, I+1 ), LDA,
+     $                  WORK( 1 ) )
+            A( OFFPI, I ) = AII
+         END IF
+*
+*        Update partial column norms.
+*
+         DO 10 J = I + 1, N
+            IF( VN1( J ).NE.ZERO ) THEN
+*
+*              NOTE: The following 4 lines follow from the analysis in
+*              Lapack Working Note 176.
+*
+               TEMP = ONE - ( ABS( A( OFFPI, J ) ) / VN1( J ) )**2
+               TEMP = MAX( TEMP, ZERO )
+               TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+               IF( TEMP2 .LE. TOL3Z ) THEN
+                  IF( OFFPI.LT.M ) THEN
+                     VN1( J ) = DZNRM2( M-OFFPI, A( OFFPI+1, J ), 1 )
+                     VN2( J ) = VN1( J )
+                  ELSE
+                     VN1( J ) = ZERO
+                     VN2( J ) = ZERO
+                  END IF
+               ELSE
+                  VN1( J ) = VN1( J )*SQRT( TEMP )
+               END IF
+            END IF
+   10    CONTINUE
+*
+   20 CONTINUE
+*
+      RETURN
+*
+*     End of ZLAQP2
+*
+      END
+*> \brief \b ZLAQPS computes a step of QR factorization with column pivoting of a real m-by-n matrix A by using BLAS level 3.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQPS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqps.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqps.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqps.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
+*                          VN2, AUXV, F, LDF )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            KB, LDA, LDF, M, N, NB, OFFSET
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            JPVT( * )
+*       DOUBLE PRECISION   VN1( * ), VN2( * )
+*       COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLAQPS computes a step of QR factorization with column pivoting
+*> of a complex M-by-N matrix A by using Blas-3.  It tries to factorize
+*> NB columns from A starting from the row OFFSET+1, and updates all
+*> of the matrix with Blas-3 xGEMM.
+*>
+*> In some cases, due to catastrophic cancellations, it cannot
+*> factorize NB columns.  Hence, the actual number of factorized
+*> columns is returned in KB.
+*>
+*> Block A(1:OFFSET,1:N) is accordingly pivoted, but not factorized.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0
+*> \endverbatim
+*>
+*> \param[in] OFFSET
+*> \verbatim
+*>          OFFSET is INTEGER
+*>          The number of rows of A that have been factorized in
+*>          previous steps.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          The number of columns to factorize.
+*> \endverbatim
+*>
+*> \param[out] KB
+*> \verbatim
+*>          KB is INTEGER
+*>          The number of columns actually factorized.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit, block A(OFFSET+1:M,1:KB) is the triangular
+*>          factor obtained and block A(1:OFFSET,1:N) has been
+*>          accordingly pivoted, but no factorized.
+*>          The rest of the matrix, block A(OFFSET+1:M,KB+1:N) has
+*>          been updated.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] JPVT
+*> \verbatim
+*>          JPVT is INTEGER array, dimension (N)
+*>          JPVT(I) = K <==> Column K of the full matrix A has been
+*>          permuted into position I in AP.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (KB)
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in,out] VN1
+*> \verbatim
+*>          VN1 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the partial column norms.
+*> \endverbatim
+*>
+*> \param[in,out] VN2
+*> \verbatim
+*>          VN2 is DOUBLE PRECISION array, dimension (N)
+*>          The vector with the exact column norms.
+*> \endverbatim
+*>
+*> \param[in,out] AUXV
+*> \verbatim
+*>          AUXV is COMPLEX*16 array, dimension (NB)
+*>          Auxiliar vector.
+*> \endverbatim
+*>
+*> \param[in,out] F
+*> \verbatim
+*>          F is COMPLEX*16 array, dimension (LDF,NB)
+*>          Matrix F**H = L * Y**H * A.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the array F. LDF >= max(1,N).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain
+*>    X. Sun, Computer Science Dept., Duke University, USA
+*> \n
+*>  Partial column norm updating strategy modified on April 2011
+*>    Z. Drmac and Z. Bujanovic, Dept. of Mathematics,
+*>    University of Zagreb, Croatia.
+*
+*> \par References:
+*  ================
+*>
+*> LAPACK Working Note 176
+*
+*> \htmlonly
+*> <a href="http://www.netlib.org/lapack/lawnspdf/lawn176.pdf">[PDF]</a> 
+*> \endhtmlonly 
+*
+*  =====================================================================
+      SUBROUTINE ZLAQPS( M, N, OFFSET, NB, KB, A, LDA, JPVT, TAU, VN1,
+     $                   VN2, AUXV, F, LDF )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            KB, LDA, LDF, M, N, NB, OFFSET
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPVT( * )
+      DOUBLE PRECISION   VN1( * ), VN2( * )
+      COMPLEX*16         A( LDA, * ), AUXV( * ), F( LDF, * ), TAU( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0,
+     $                   CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            ITEMP, J, K, LASTRK, LSTICC, PVT, RK
+      DOUBLE PRECISION   TEMP, TEMP2, TOL3Z
+      COMPLEX*16         AKK
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMM, ZGEMV, ZLARFG, ZSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCONJG, MAX, MIN, NINT, SQRT
+*     ..
+*     .. External Functions ..
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DZNRM2
+      EXTERNAL           IDAMAX, DLAMCH, DZNRM2
+*     ..
+*     .. Executable Statements ..
+*
+      LASTRK = MIN( M, N+OFFSET )
+      LSTICC = 0
+      K = 0
+      TOL3Z = SQRT(DLAMCH('Epsilon'))
+*
+*     Beginning of while loop.
+*
+   10 CONTINUE
+      IF( ( K.LT.NB ) .AND. ( LSTICC.EQ.0 ) ) THEN
+         K = K + 1
+         RK = OFFSET + K
+*
+*        Determine ith pivot column and swap if necessary
+*
+         PVT = ( K-1 ) + IDAMAX( N-K+1, VN1( K ), 1 )
+         IF( PVT.NE.K ) THEN
+            CALL ZSWAP( M, A( 1, PVT ), 1, A( 1, K ), 1 )
+            CALL ZSWAP( K-1, F( PVT, 1 ), LDF, F( K, 1 ), LDF )
+            ITEMP = JPVT( PVT )
+            JPVT( PVT ) = JPVT( K )
+            JPVT( K ) = ITEMP
+            VN1( PVT ) = VN1( K )
+            VN2( PVT ) = VN2( K )
+         END IF
+*
+*        Apply previous Householder reflectors to column K:
+*        A(RK:M,K) := A(RK:M,K) - A(RK:M,1:K-1)*F(K,1:K-1)**H.
+*
+         IF( K.GT.1 ) THEN
+            DO 20 J = 1, K - 1
+               F( K, J ) = DCONJG( F( K, J ) )
+   20       CONTINUE
+            CALL ZGEMV( 'No transpose', M-RK+1, K-1, -CONE, A( RK, 1 ),
+     $                  LDA, F( K, 1 ), LDF, CONE, A( RK, K ), 1 )
+            DO 30 J = 1, K - 1
+               F( K, J ) = DCONJG( F( K, J ) )
+   30       CONTINUE
+         END IF
+*
+*        Generate elementary reflector H(k).
+*
+         IF( RK.LT.M ) THEN
+            CALL ZLARFG( M-RK+1, A( RK, K ), A( RK+1, K ), 1, TAU( K ) )
+         ELSE
+            CALL ZLARFG( 1, A( RK, K ), A( RK, K ), 1, TAU( K ) )
+         END IF
+*
+         AKK = A( RK, K )
+         A( RK, K ) = CONE
+*
+*        Compute Kth column of F:
+*
+*        Compute  F(K+1:N,K) := tau(K)*A(RK:M,K+1:N)**H*A(RK:M,K).
+*
+         IF( K.LT.N ) THEN
+            CALL ZGEMV( 'Conjugate transpose', M-RK+1, N-K, TAU( K ),
+     $                  A( RK, K+1 ), LDA, A( RK, K ), 1, CZERO,
+     $                  F( K+1, K ), 1 )
+         END IF
+*
+*        Padding F(1:K,K) with zeros.
+*
+         DO 40 J = 1, K
+            F( J, K ) = CZERO
+   40    CONTINUE
+*
+*        Incremental updating of F:
+*        F(1:N,K) := F(1:N,K) - tau(K)*F(1:N,1:K-1)*A(RK:M,1:K-1)**H
+*                    *A(RK:M,K).
+*
+         IF( K.GT.1 ) THEN
+            CALL ZGEMV( 'Conjugate transpose', M-RK+1, K-1, -TAU( K ),
+     $                  A( RK, 1 ), LDA, A( RK, K ), 1, CZERO,
+     $                  AUXV( 1 ), 1 )
+*
+            CALL ZGEMV( 'No transpose', N, K-1, CONE, F( 1, 1 ), LDF,
+     $                  AUXV( 1 ), 1, CONE, F( 1, K ), 1 )
+         END IF
+*
+*        Update the current row of A:
+*        A(RK,K+1:N) := A(RK,K+1:N) - A(RK,1:K)*F(K+1:N,1:K)**H.
+*
+         IF( K.LT.N ) THEN
+            CALL ZGEMM( 'No transpose', 'Conjugate transpose', 1, N-K,
+     $                  K, -CONE, A( RK, 1 ), LDA, F( K+1, 1 ), LDF,
+     $                  CONE, A( RK, K+1 ), LDA )
+         END IF
+*
+*        Update partial column norms.
+*
+         IF( RK.LT.LASTRK ) THEN
+            DO 50 J = K + 1, N
+               IF( VN1( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following 4 lines follow from the analysis in
+*                 Lapack Working Note 176.
+*
+                  TEMP = ABS( A( RK, J ) ) / VN1( J )
+                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
+                  TEMP2 = TEMP*( VN1( J ) / VN2( J ) )**2
+                  IF( TEMP2 .LE. TOL3Z ) THEN
+                     VN2( J ) = DBLE( LSTICC )
+                     LSTICC = J
+                  ELSE
+                     VN1( J ) = VN1( J )*SQRT( TEMP )
+                  END IF
+               END IF
+   50       CONTINUE
+         END IF
+*
+         A( RK, K ) = AKK
+*
+*        End of while loop.
+*
+         GO TO 10
+      END IF
+      KB = K
+      RK = OFFSET + KB
+*
+*     Apply the block reflector to the rest of the matrix:
+*     A(OFFSET+KB+1:M,KB+1:N) := A(OFFSET+KB+1:M,KB+1:N) -
+*                         A(OFFSET+KB+1:M,1:KB)*F(KB+1:N,1:KB)**H.
+*
+      IF( KB.LT.MIN( N, M-OFFSET ) ) THEN
+         CALL ZGEMM( 'No transpose', 'Conjugate transpose', M-RK, N-KB,
+     $               KB, -CONE, A( RK+1, 1 ), LDA, F( KB+1, 1 ), LDF,
+     $               CONE, A( RK+1, KB+1 ), LDA )
+      END IF
+*
+*     Recomputation of difficult columns.
+*
+   60 CONTINUE
+      IF( LSTICC.GT.0 ) THEN
+         ITEMP = NINT( VN2( LSTICC ) )
+         VN1( LSTICC ) = DZNRM2( M-RK, A( RK+1, LSTICC ), 1 )
+*
+*        NOTE: The computation of VN1( LSTICC ) relies on the fact that 
+*        SNRM2 does not fail on vectors with norm below the value of
+*        SQRT(DLAMCH('S')) 
+*
+         VN2( LSTICC ) = VN1( LSTICC )
+         LSTICC = ITEMP
+         GO TO 60
+      END IF
+*
+      RETURN
+*
+*     End of ZLAQPS
+*
+      END
+*> \brief \b ZLAQR0 computes the eigenvalues of a Hessenberg matrix, and optionally the matrices from the Schur decomposition.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQR0 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr0.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr0.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr0.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+*                          IHIZ, Z, LDZ, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
+*       LOGICAL            WANTT, WANTZ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZLAQR0 computes the eigenvalues of a Hessenberg matrix H
+*>    and, optionally, the matrices T and Z from the Schur decomposition
+*>    H = Z T Z**H, where T is an upper triangular matrix (the
+*>    Schur form), and Z is the unitary matrix of Schur vectors.
+*>
+*>    Optionally Z may be postmultiplied into an input unitary
+*>    matrix Q so that this routine can give the Schur factorization
+*>    of a matrix A which has been reduced to the Hessenberg form H
+*>    by the unitary matrix Q:  A = Q*H*Q**H = (QZ)*H*(QZ)**H.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] WANTT
+*> \verbatim
+*>          WANTT is LOGICAL
+*>          = .TRUE. : the full Schur form T is required;
+*>          = .FALSE.: only eigenvalues are required.
+*> \endverbatim
+*>
+*> \param[in] WANTZ
+*> \verbatim
+*>          WANTZ is LOGICAL
+*>          = .TRUE. : the matrix of Schur vectors Z is required;
+*>          = .FALSE.: Schur vectors are not required.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           The order of the matrix H.  N .GE. 0.
+*> \endverbatim
+*>
+*> \param[in] ILO
+*> \verbatim
+*>          ILO is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHI
+*> \verbatim
+*>          IHI is INTEGER
+*>
+*>           It is assumed that H is already upper triangular in rows
+*>           and columns 1:ILO-1 and IHI+1:N and, if ILO.GT.1,
+*>           H(ILO,ILO-1) is zero. ILO and IHI are normally set by a
+*>           previous call to ZGEBAL, and then passed to ZGEHRD when the
+*>           matrix output by ZGEBAL is reduced to Hessenberg form.
+*>           Otherwise, ILO and IHI should be set to 1 and N,
+*>           respectively.  If N.GT.0, then 1.LE.ILO.LE.IHI.LE.N.
+*>           If N = 0, then ILO = 1 and IHI = 0.
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array, dimension (LDH,N)
+*>           On entry, the upper Hessenberg matrix H.
+*>           On exit, if INFO = 0 and WANTT is .TRUE., then H
+*>           contains the upper triangular matrix T from the Schur
+*>           decomposition (the Schur form). If INFO = 0 and WANT is
+*>           .FALSE., then the contents of H are unspecified on exit.
+*>           (The output value of H when INFO.GT.0 is given under the
+*>           description of INFO below.)
+*>
+*>           This subroutine may explicitly set H(i,j) = 0 for i.GT.j and
+*>           j = 1, 2, ... ILO-1 or j = IHI+1, IHI+2, ... N.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is INTEGER
+*>           The leading dimension of the array H. LDH .GE. max(1,N).
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is COMPLEX*16 array, dimension (N)
+*>           The computed eigenvalues of H(ILO:IHI,ILO:IHI) are stored
+*>           in W(ILO:IHI). If WANTT is .TRUE., then the eigenvalues are
+*>           stored in the same order as on the diagonal of the Schur
+*>           form returned in H, with W(i) = H(i,i).
+*> \endverbatim
+*>
+*> \param[in] ILOZ
+*> \verbatim
+*>          ILOZ is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHIZ
+*> \verbatim
+*>          IHIZ is INTEGER
+*>           Specify the rows of Z to which transformations must be
+*>           applied if WANTZ is .TRUE..
+*>           1 .LE. ILOZ .LE. ILO; IHI .LE. IHIZ .LE. N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,IHI)
+*>           If WANTZ is .FALSE., then Z is not referenced.
+*>           If WANTZ is .TRUE., then Z(ILO:IHI,ILOZ:IHIZ) is
+*>           replaced by Z(ILO:IHI,ILOZ:IHIZ)*U where U is the
+*>           orthogonal Schur factor of H(ILO:IHI,ILO:IHI).
+*>           (The output value of Z when INFO.GT.0 is given under
+*>           the description of INFO below.)
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>           The leading dimension of the array Z.  if WANTZ is .TRUE.
+*>           then LDZ.GE.MAX(1,IHIZ).  Otherwize, LDZ.GE.1.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension LWORK
+*>           On exit, if LWORK = -1, WORK(1) returns an estimate of
+*>           the optimal value for LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>           The dimension of the array WORK.  LWORK .GE. max(1,N)
+*>           is sufficient, but LWORK typically as large as 6*N may
+*>           be required for optimal performance.  A workspace query
+*>           to determine the optimal workspace size is recommended.
+*>
+*>           If LWORK = -1, then ZLAQR0 does a workspace query.
+*>           In this case, ZLAQR0 checks the input parameters and
+*>           estimates the optimal workspace size for the given
+*>           values of N, ILO and IHI.  The estimate is returned
+*>           in WORK(1).  No error message related to LWORK is
+*>           issued by XERBLA.  Neither H nor Z are accessed.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>             =  0:  successful exit
+*>           .GT. 0:  if INFO = i, ZLAQR0 failed to compute all of
+*>                the eigenvalues.  Elements 1:ilo-1 and i+1:n of WR
+*>                and WI contain those eigenvalues which have been
+*>                successfully computed.  (Failures are rare.)
+*>
+*>                If INFO .GT. 0 and WANT is .FALSE., then on exit,
+*>                the remaining unconverged eigenvalues are the eigen-
+*>                values of the upper Hessenberg matrix rows and
+*>                columns ILO through INFO of the final, output
+*>                value of H.
+*>
+*>                If INFO .GT. 0 and WANTT is .TRUE., then on exit
+*>
+*>           (*)  (initial value of H)*U  = U*(final value of H)
+*>
+*>                where U is a unitary matrix.  The final
+*>                value of  H is upper Hessenberg and triangular in
+*>                rows and columns INFO+1 through IHI.
+*>
+*>                If INFO .GT. 0 and WANTZ is .TRUE., then on exit
+*>
+*>                  (final value of Z(ILO:IHI,ILOZ:IHIZ)
+*>                   =  (initial value of Z(ILO:IHI,ILOZ:IHIZ)*U
+*>
+*>                where U is the unitary matrix in (*) (regard-
+*>                less of the value of WANTT.)
+*>
+*>                If INFO .GT. 0 and WANTZ is .FALSE., then Z is not
+*>                accessed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*
+*> \par References:
+*  ================
+*>
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
+*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
+*>       929--947, 2002.
+*> \n
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part II: Aggressive Early Deflation, SIAM Journal
+*>       of Matrix Analysis, volume 23, pages 948--973, 2002.
+*>
+*  =====================================================================
+      SUBROUTINE ZLAQR0( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+     $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
+      LOGICAL            WANTT, WANTZ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*     ..
+*
+*  ================================================================
+*
+*     .. Parameters ..
+*
+*     ==== Matrices of order NTINY or smaller must be processed by
+*     .    ZLAHQR because of insufficient subdiagonal scratch space.
+*     .    (This is a hard limit.) ====
+      INTEGER            NTINY
+      PARAMETER          ( NTINY = 11 )
+*
+*     ==== Exceptional deflation windows:  try to cure rare
+*     .    slow convergence by varying the size of the
+*     .    deflation window after KEXNW iterations. ====
+      INTEGER            KEXNW
+      PARAMETER          ( KEXNW = 5 )
+*
+*     ==== Exceptional shifts: try to cure rare slow convergence
+*     .    with ad-hoc exceptional shifts every KEXSH iterations.
+*     .    ====
+      INTEGER            KEXSH
+      PARAMETER          ( KEXSH = 6 )
+*
+*     ==== The constant WILK1 is used to form the exceptional
+*     .    shifts. ====
+      DOUBLE PRECISION   WILK1
+      PARAMETER          ( WILK1 = 0.75d0 )
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   TWO
+      PARAMETER          ( TWO = 2.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         AA, BB, CC, CDUM, DD, DET, RTDISC, SWAP, TR2
+      DOUBLE PRECISION   S
+      INTEGER            I, INF, IT, ITMAX, K, KACC22, KBOT, KDU, KS,
+     $                   KT, KTOP, KU, KV, KWH, KWTOP, KWV, LD, LS,
+     $                   LWKOPT, NDEC, NDFL, NH, NHO, NIBBLE, NMIN, NS,
+     $                   NSMAX, NSR, NVE, NW, NWMAX, NWR, NWUPBD
+      LOGICAL            SORTED
+      CHARACTER          JBCMPZ*2
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         ZDUM( 1, 1 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLACPY, ZLAHQR, ZLAQR3, ZLAQR4, ZLAQR5
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, MAX, MIN, MOD,
+     $                   SQRT
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+      INFO = 0
+*
+*     ==== Quick return for N = 0: nothing to do. ====
+*
+      IF( N.EQ.0 ) THEN
+         WORK( 1 ) = ONE
+         RETURN
+      END IF
+*
+      IF( N.LE.NTINY ) THEN
+*
+*        ==== Tiny matrices must use ZLAHQR. ====
+*
+         LWKOPT = 1
+         IF( LWORK.NE.-1 )
+     $      CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+     $                   IHIZ, Z, LDZ, INFO )
+      ELSE
+*
+*        ==== Use small bulge multi-shift QR with aggressive early
+*        .    deflation on larger-than-tiny matrices. ====
+*
+*        ==== Hope for the best. ====
+*
+         INFO = 0
+*
+*        ==== Set up job flags for ILAENV. ====
+*
+         IF( WANTT ) THEN
+            JBCMPZ( 1: 1 ) = 'S'
+         ELSE
+            JBCMPZ( 1: 1 ) = 'E'
+         END IF
+         IF( WANTZ ) THEN
+            JBCMPZ( 2: 2 ) = 'V'
+         ELSE
+            JBCMPZ( 2: 2 ) = 'N'
+         END IF
+*
+*        ==== NWR = recommended deflation window size.  At this
+*        .    point,  N .GT. NTINY = 11, so there is enough
+*        .    subdiagonal workspace for NWR.GE.2 as required.
+*        .    (In fact, there is enough subdiagonal space for
+*        .    NWR.GE.3.) ====
+*
+         NWR = ILAENV( 13, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
+         NWR = MAX( 2, NWR )
+         NWR = MIN( IHI-ILO+1, ( N-1 ) / 3, NWR )
+*
+*        ==== NSR = recommended number of simultaneous shifts.
+*        .    At this point N .GT. NTINY = 11, so there is at
+*        .    enough subdiagonal workspace for NSR to be even
+*        .    and greater than or equal to two as required. ====
+*
+         NSR = ILAENV( 15, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
+         NSR = MIN( NSR, ( N+6 ) / 9, IHI-ILO )
+         NSR = MAX( 2, NSR-MOD( NSR, 2 ) )
+*
+*        ==== Estimate optimal workspace ====
+*
+*        ==== Workspace query call to ZLAQR3 ====
+*
+         CALL ZLAQR3( WANTT, WANTZ, N, ILO, IHI, NWR+1, H, LDH, ILOZ,
+     $                IHIZ, Z, LDZ, LS, LD, W, H, LDH, N, H, LDH, N, H,
+     $                LDH, WORK, -1 )
+*
+*        ==== Optimal workspace = MAX(ZLAQR5, ZLAQR3) ====
+*
+         LWKOPT = MAX( 3*NSR / 2, INT( WORK( 1 ) ) )
+*
+*        ==== Quick return in case of workspace query. ====
+*
+         IF( LWORK.EQ.-1 ) THEN
+            WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+            RETURN
+         END IF
+*
+*        ==== ZLAHQR/ZLAQR0 crossover point ====
+*
+         NMIN = ILAENV( 12, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
+         NMIN = MAX( NTINY, NMIN )
+*
+*        ==== Nibble crossover point ====
+*
+         NIBBLE = ILAENV( 14, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
+         NIBBLE = MAX( 0, NIBBLE )
+*
+*        ==== Accumulate reflections during ttswp?  Use block
+*        .    2-by-2 structure during matrix-matrix multiply? ====
+*
+         KACC22 = ILAENV( 16, 'ZLAQR0', JBCMPZ, N, ILO, IHI, LWORK )
+         KACC22 = MAX( 0, KACC22 )
+         KACC22 = MIN( 2, KACC22 )
+*
+*        ==== NWMAX = the largest possible deflation window for
+*        .    which there is sufficient workspace. ====
+*
+         NWMAX = MIN( ( N-1 ) / 3, LWORK / 2 )
+         NW = NWMAX
+*
+*        ==== NSMAX = the Largest number of simultaneous shifts
+*        .    for which there is sufficient workspace. ====
+*
+         NSMAX = MIN( ( N+6 ) / 9, 2*LWORK / 3 )
+         NSMAX = NSMAX - MOD( NSMAX, 2 )
+*
+*        ==== NDFL: an iteration count restarted at deflation. ====
+*
+         NDFL = 1
+*
+*        ==== ITMAX = iteration limit ====
+*
+         ITMAX = MAX( 30, 2*KEXSH )*MAX( 10, ( IHI-ILO+1 ) )
+*
+*        ==== Last row and column in the active block ====
+*
+         KBOT = IHI
+*
+*        ==== Main Loop ====
+*
+         DO 70 IT = 1, ITMAX
+*
+*           ==== Done when KBOT falls below ILO ====
+*
+            IF( KBOT.LT.ILO )
+     $         GO TO 80
+*
+*           ==== Locate active block ====
+*
+            DO 10 K = KBOT, ILO + 1, -1
+               IF( H( K, K-1 ).EQ.ZERO )
+     $            GO TO 20
+   10       CONTINUE
+            K = ILO
+   20       CONTINUE
+            KTOP = K
+*
+*           ==== Select deflation window size:
+*           .    Typical Case:
+*           .      If possible and advisable, nibble the entire
+*           .      active block.  If not, use size MIN(NWR,NWMAX)
+*           .      or MIN(NWR+1,NWMAX) depending upon which has
+*           .      the smaller corresponding subdiagonal entry
+*           .      (a heuristic).
+*           .
+*           .    Exceptional Case:
+*           .      If there have been no deflations in KEXNW or
+*           .      more iterations, then vary the deflation window
+*           .      size.   At first, because, larger windows are,
+*           .      in general, more powerful than smaller ones,
+*           .      rapidly increase the window to the maximum possible.
+*           .      Then, gradually reduce the window size. ====
+*
+            NH = KBOT - KTOP + 1
+            NWUPBD = MIN( NH, NWMAX )
+            IF( NDFL.LT.KEXNW ) THEN
+               NW = MIN( NWUPBD, NWR )
+            ELSE
+               NW = MIN( NWUPBD, 2*NW )
+            END IF
+            IF( NW.LT.NWMAX ) THEN
+               IF( NW.GE.NH-1 ) THEN
+                  NW = NH
+               ELSE
+                  KWTOP = KBOT - NW + 1
+                  IF( CABS1( H( KWTOP, KWTOP-1 ) ).GT.
+     $                CABS1( H( KWTOP-1, KWTOP-2 ) ) )NW = NW + 1
+               END IF
+            END IF
+            IF( NDFL.LT.KEXNW ) THEN
+               NDEC = -1
+            ELSE IF( NDEC.GE.0 .OR. NW.GE.NWUPBD ) THEN
+               NDEC = NDEC + 1
+               IF( NW-NDEC.LT.2 )
+     $            NDEC = 0
+               NW = NW - NDEC
+            END IF
+*
+*           ==== Aggressive early deflation:
+*           .    split workspace under the subdiagonal into
+*           .      - an nw-by-nw work array V in the lower
+*           .        left-hand-corner,
+*           .      - an NW-by-at-least-NW-but-more-is-better
+*           .        (NW-by-NHO) horizontal work array along
+*           .        the bottom edge,
+*           .      - an at-least-NW-but-more-is-better (NHV-by-NW)
+*           .        vertical work array along the left-hand-edge.
+*           .        ====
+*
+            KV = N - NW + 1
+            KT = NW + 1
+            NHO = ( N-NW-1 ) - KT + 1
+            KWV = NW + 2
+            NVE = ( N-NW ) - KWV + 1
+*
+*           ==== Aggressive early deflation ====
+*
+            CALL ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+     $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
+     $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
+     $                   LWORK )
+*
+*           ==== Adjust KBOT accounting for new deflations. ====
+*
+            KBOT = KBOT - LD
+*
+*           ==== KS points to the shifts. ====
+*
+            KS = KBOT - LS + 1
+*
+*           ==== Skip an expensive QR sweep if there is a (partly
+*           .    heuristic) reason to expect that many eigenvalues
+*           .    will deflate without it.  Here, the QR sweep is
+*           .    skipped if many eigenvalues have just been deflated
+*           .    or if the remaining active block is small.
+*
+            IF( ( LD.EQ.0 ) .OR. ( ( 100*LD.LE.NW*NIBBLE ) .AND. ( KBOT-
+     $          KTOP+1.GT.MIN( NMIN, NWMAX ) ) ) ) THEN
+*
+*              ==== NS = nominal number of simultaneous shifts.
+*              .    This may be lowered (slightly) if ZLAQR3
+*              .    did not provide that many shifts. ====
+*
+               NS = MIN( NSMAX, NSR, MAX( 2, KBOT-KTOP ) )
+               NS = NS - MOD( NS, 2 )
+*
+*              ==== If there have been no deflations
+*              .    in a multiple of KEXSH iterations,
+*              .    then try exceptional shifts.
+*              .    Otherwise use shifts provided by
+*              .    ZLAQR3 above or from the eigenvalues
+*              .    of a trailing principal submatrix. ====
+*
+               IF( MOD( NDFL, KEXSH ).EQ.0 ) THEN
+                  KS = KBOT - NS + 1
+                  DO 30 I = KBOT, KS + 1, -2
+                     W( I ) = H( I, I ) + WILK1*CABS1( H( I, I-1 ) )
+                     W( I-1 ) = W( I )
+   30             CONTINUE
+               ELSE
+*
+*                 ==== Got NS/2 or fewer shifts? Use ZLAQR4 or
+*                 .    ZLAHQR on a trailing principal submatrix to
+*                 .    get more. (Since NS.LE.NSMAX.LE.(N+6)/9,
+*                 .    there is enough space below the subdiagonal
+*                 .    to fit an NS-by-NS scratch array.) ====
+*
+                  IF( KBOT-KS+1.LE.NS / 2 ) THEN
+                     KS = KBOT - NS + 1
+                     KT = N - NS + 1
+                     CALL ZLACPY( 'A', NS, NS, H( KS, KS ), LDH,
+     $                            H( KT, 1 ), LDH )
+                     IF( NS.GT.NMIN ) THEN
+                        CALL ZLAQR4( .false., .false., NS, 1, NS,
+     $                               H( KT, 1 ), LDH, W( KS ), 1, 1,
+     $                               ZDUM, 1, WORK, LWORK, INF )
+                     ELSE
+                        CALL ZLAHQR( .false., .false., NS, 1, NS,
+     $                               H( KT, 1 ), LDH, W( KS ), 1, 1,
+     $                               ZDUM, 1, INF )
+                     END IF
+                     KS = KS + INF
+*
+*                    ==== In case of a rare QR failure use
+*                    .    eigenvalues of the trailing 2-by-2
+*                    .    principal submatrix.  Scale to avoid
+*                    .    overflows, underflows and subnormals.
+*                    .    (The scale factor S can not be zero,
+*                    .    because H(KBOT,KBOT-1) is nonzero.) ====
+*
+                     IF( KS.GE.KBOT ) THEN
+                        S = CABS1( H( KBOT-1, KBOT-1 ) ) +
+     $                      CABS1( H( KBOT, KBOT-1 ) ) +
+     $                      CABS1( H( KBOT-1, KBOT ) ) +
+     $                      CABS1( H( KBOT, KBOT ) )
+                        AA = H( KBOT-1, KBOT-1 ) / S
+                        CC = H( KBOT, KBOT-1 ) / S
+                        BB = H( KBOT-1, KBOT ) / S
+                        DD = H( KBOT, KBOT ) / S
+                        TR2 = ( AA+DD ) / TWO
+                        DET = ( AA-TR2 )*( DD-TR2 ) - BB*CC
+                        RTDISC = SQRT( -DET )
+                        W( KBOT-1 ) = ( TR2+RTDISC )*S
+                        W( KBOT ) = ( TR2-RTDISC )*S
+*
+                        KS = KBOT - 1
+                     END IF
+                  END IF
+*
+                  IF( KBOT-KS+1.GT.NS ) THEN
+*
+*                    ==== Sort the shifts (Helps a little) ====
+*
+                     SORTED = .false.
+                     DO 50 K = KBOT, KS + 1, -1
+                        IF( SORTED )
+     $                     GO TO 60
+                        SORTED = .true.
+                        DO 40 I = KS, K - 1
+                           IF( CABS1( W( I ) ).LT.CABS1( W( I+1 ) ) )
+     $                          THEN
+                              SORTED = .false.
+                              SWAP = W( I )
+                              W( I ) = W( I+1 )
+                              W( I+1 ) = SWAP
+                           END IF
+   40                   CONTINUE
+   50                CONTINUE
+   60                CONTINUE
+                  END IF
+               END IF
+*
+*              ==== If there are only two shifts, then use
+*              .    only one.  ====
+*
+               IF( KBOT-KS+1.EQ.2 ) THEN
+                  IF( CABS1( W( KBOT )-H( KBOT, KBOT ) ).LT.
+     $                CABS1( W( KBOT-1 )-H( KBOT, KBOT ) ) ) THEN
+                     W( KBOT-1 ) = W( KBOT )
+                  ELSE
+                     W( KBOT ) = W( KBOT-1 )
+                  END IF
+               END IF
+*
+*              ==== Use up to NS of the the smallest magnatiude
+*              .    shifts.  If there aren't NS shifts available,
+*              .    then use them all, possibly dropping one to
+*              .    make the number of shifts even. ====
+*
+               NS = MIN( NS, KBOT-KS+1 )
+               NS = NS - MOD( NS, 2 )
+               KS = KBOT - NS + 1
+*
+*              ==== Small-bulge multi-shift QR sweep:
+*              .    split workspace under the subdiagonal into
+*              .    - a KDU-by-KDU work array U in the lower
+*              .      left-hand-corner,
+*              .    - a KDU-by-at-least-KDU-but-more-is-better
+*              .      (KDU-by-NHo) horizontal work array WH along
+*              .      the bottom edge,
+*              .    - and an at-least-KDU-but-more-is-better-by-KDU
+*              .      (NVE-by-KDU) vertical work WV arrow along
+*              .      the left-hand-edge. ====
+*
+               KDU = 3*NS - 3
+               KU = N - KDU + 1
+               KWH = KDU + 1
+               NHO = ( N-KDU+1-4 ) - ( KDU+1 ) + 1
+               KWV = KDU + 4
+               NVE = N - KDU - KWV + 1
+*
+*              ==== Small-bulge multi-shift QR sweep ====
+*
+               CALL ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NS,
+     $                      W( KS ), H, LDH, ILOZ, IHIZ, Z, LDZ, WORK,
+     $                      3, H( KU, 1 ), LDH, NVE, H( KWV, 1 ), LDH,
+     $                      NHO, H( KU, KWH ), LDH )
+            END IF
+*
+*           ==== Note progress (or the lack of it). ====
+*
+            IF( LD.GT.0 ) THEN
+               NDFL = 1
+            ELSE
+               NDFL = NDFL + 1
+            END IF
+*
+*           ==== End of main loop ====
+   70    CONTINUE
+*
+*        ==== Iteration limit exceeded.  Set INFO to show where
+*        .    the problem occurred and exit. ====
+*
+         INFO = KBOT
+   80    CONTINUE
+      END IF
+*
+*     ==== Return the optimal value of LWORK. ====
+*
+      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+*
+*     ==== End of ZLAQR0 ====
+*
+      END
+*> \brief \b ZLAQR1 sets a scalar multiple of the first column of the product of 2-by-2 or 3-by-3 matrix H and specified shifts.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQR1 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr1.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr1.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr1.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQR1( N, H, LDH, S1, S2, V )
+* 
+*       .. Scalar Arguments ..
+*       COMPLEX*16         S1, S2
+*       INTEGER            LDH, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), V( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>      Given a 2-by-2 or 3-by-3 matrix H, ZLAQR1 sets v to a
+*>      scalar multiple of the first column of the product
+*>
+*>      (*)  K = (H - s1*I)*(H - s2*I)
+*>
+*>      scaling to avoid overflows and most underflows.
+*>
+*>      This is useful for starting double implicit shift bulges
+*>      in the QR algorithm.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is integer
+*>              Order of the matrix H. N must be either 2 or 3.
+*> \endverbatim
+*>
+*> \param[in] H
+*> \verbatim
+*>          H is COMPLEX*16 array of dimension (LDH,N)
+*>              The 2-by-2 or 3-by-3 matrix H in (*).
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is integer
+*>              The leading dimension of H as declared in
+*>              the calling procedure.  LDH.GE.N
+*> \endverbatim
+*>
+*> \param[in] S1
+*> \verbatim
+*>          S1 is COMPLEX*16
+*> \endverbatim
+*>
+*> \param[in] S2
+*> \verbatim
+*>          S2 is COMPLEX*16
+*>
+*>          S1 and S2 are the shifts defining K in (*) above.
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is COMPLEX*16 array of dimension N
+*>              A scalar multiple of the first column of the
+*>              matrix K in (*).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*>
+*  =====================================================================
+      SUBROUTINE ZLAQR1( N, H, LDH, S1, S2, V )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      COMPLEX*16         S1, S2
+      INTEGER            LDH, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), V( * )
+*     ..
+*
+*  ================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   RZERO
+      PARAMETER          ( RZERO = 0.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         CDUM, H21S, H31S
+      DOUBLE PRECISION   S
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DIMAG
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+      IF( N.EQ.2 ) THEN
+         S = CABS1( H( 1, 1 )-S2 ) + CABS1( H( 2, 1 ) )
+         IF( S.EQ.RZERO ) THEN
+            V( 1 ) = ZERO
+            V( 2 ) = ZERO
+         ELSE
+            H21S = H( 2, 1 ) / S
+            V( 1 ) = H21S*H( 1, 2 ) + ( H( 1, 1 )-S1 )*
+     $               ( ( H( 1, 1 )-S2 ) / S )
+            V( 2 ) = H21S*( H( 1, 1 )+H( 2, 2 )-S1-S2 )
+         END IF
+      ELSE
+         S = CABS1( H( 1, 1 )-S2 ) + CABS1( H( 2, 1 ) ) +
+     $       CABS1( H( 3, 1 ) )
+         IF( S.EQ.ZERO ) THEN
+            V( 1 ) = ZERO
+            V( 2 ) = ZERO
+            V( 3 ) = ZERO
+         ELSE
+            H21S = H( 2, 1 ) / S
+            H31S = H( 3, 1 ) / S
+            V( 1 ) = ( H( 1, 1 )-S1 )*( ( H( 1, 1 )-S2 ) / S ) +
+     $               H( 1, 2 )*H21S + H( 1, 3 )*H31S
+            V( 2 ) = H21S*( H( 1, 1 )+H( 2, 2 )-S1-S2 ) + H( 2, 3 )*H31S
+            V( 3 ) = H31S*( H( 1, 1 )+H( 3, 3 )-S1-S2 ) + H21S*H( 3, 2 )
+         END IF
+      END IF
+      END
+*> \brief \b ZLAQR2 performs the unitary similarity transformation of a Hessenberg matrix to detect and deflate fully converged eigenvalues from a trailing principal submatrix (aggressive early deflation).
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQR2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+*                          IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
+*                          NV, WV, LDWV, WORK, LWORK )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
+*      $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
+*       LOGICAL            WANTT, WANTZ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
+*      $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZLAQR2 is identical to ZLAQR3 except that it avoids
+*>    recursion by calling ZLAHQR instead of ZLAQR4.
+*>
+*>    Aggressive early deflation:
+*>
+*>    ZLAQR2 accepts as input an upper Hessenberg matrix
+*>    H and performs an unitary similarity transformation
+*>    designed to detect and deflate fully converged eigenvalues from
+*>    a trailing principal submatrix.  On output H has been over-
+*>    written by a new Hessenberg matrix that is a perturbation of
+*>    an unitary similarity transformation of H.  It is to be
+*>    hoped that the final version of H has many zero subdiagonal
+*>    entries.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] WANTT
+*> \verbatim
+*>          WANTT is LOGICAL
+*>          If .TRUE., then the Hessenberg matrix H is fully updated
+*>          so that the triangular Schur factor may be
+*>          computed (in cooperation with the calling subroutine).
+*>          If .FALSE., then only enough of H is updated to preserve
+*>          the eigenvalues.
+*> \endverbatim
+*>
+*> \param[in] WANTZ
+*> \verbatim
+*>          WANTZ is LOGICAL
+*>          If .TRUE., then the unitary matrix Z is updated so
+*>          so that the unitary Schur factor may be computed
+*>          (in cooperation with the calling subroutine).
+*>          If .FALSE., then Z is not referenced.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix H and (if WANTZ is .TRUE.) the
+*>          order of the unitary matrix Z.
+*> \endverbatim
+*>
+*> \param[in] KTOP
+*> \verbatim
+*>          KTOP is INTEGER
+*>          It is assumed that either KTOP = 1 or H(KTOP,KTOP-1)=0.
+*>          KBOT and KTOP together determine an isolated block
+*>          along the diagonal of the Hessenberg matrix.
+*> \endverbatim
+*>
+*> \param[in] KBOT
+*> \verbatim
+*>          KBOT is INTEGER
+*>          It is assumed without a check that either
+*>          KBOT = N or H(KBOT+1,KBOT)=0.  KBOT and KTOP together
+*>          determine an isolated block along the diagonal of the
+*>          Hessenberg matrix.
+*> \endverbatim
+*>
+*> \param[in] NW
+*> \verbatim
+*>          NW is INTEGER
+*>          Deflation window size.  1 .LE. NW .LE. (KBOT-KTOP+1).
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array, dimension (LDH,N)
+*>          On input the initial N-by-N section of H stores the
+*>          Hessenberg matrix undergoing aggressive early deflation.
+*>          On output H has been transformed by a unitary
+*>          similarity transformation, perturbed, and the returned
+*>          to Hessenberg form that (it is to be hoped) has some
+*>          zero subdiagonal entries.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is integer
+*>          Leading dimension of H just as declared in the calling
+*>          subroutine.  N .LE. LDH
+*> \endverbatim
+*>
+*> \param[in] ILOZ
+*> \verbatim
+*>          ILOZ is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHIZ
+*> \verbatim
+*>          IHIZ is INTEGER
+*>          Specify the rows of Z to which transformations must be
+*>          applied if WANTZ is .TRUE.. 1 .LE. ILOZ .LE. IHIZ .LE. N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          IF WANTZ is .TRUE., then on output, the unitary
+*>          similarity transformation mentioned above has been
+*>          accumulated into Z(ILOZ:IHIZ,ILO:IHI) from the right.
+*>          If WANTZ is .FALSE., then Z is unreferenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is integer
+*>          The leading dimension of Z just as declared in the
+*>          calling subroutine.  1 .LE. LDZ.
+*> \endverbatim
+*>
+*> \param[out] NS
+*> \verbatim
+*>          NS is integer
+*>          The number of unconverged (ie approximate) eigenvalues
+*>          returned in SR and SI that may be used as shifts by the
+*>          calling subroutine.
+*> \endverbatim
+*>
+*> \param[out] ND
+*> \verbatim
+*>          ND is integer
+*>          The number of converged eigenvalues uncovered by this
+*>          subroutine.
+*> \endverbatim
+*>
+*> \param[out] SH
+*> \verbatim
+*>          SH is COMPLEX*16 array, dimension KBOT
+*>          On output, approximate eigenvalues that may
+*>          be used for shifts are stored in SH(KBOT-ND-NS+1)
+*>          through SR(KBOT-ND).  Converged eigenvalues are
+*>          stored in SH(KBOT-ND+1) through SH(KBOT).
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension (LDV,NW)
+*>          An NW-by-NW work array.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is integer scalar
+*>          The leading dimension of V just as declared in the
+*>          calling subroutine.  NW .LE. LDV
+*> \endverbatim
+*>
+*> \param[in] NH
+*> \verbatim
+*>          NH is integer scalar
+*>          The number of columns of T.  NH.GE.NW.
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,NW)
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is integer
+*>          The leading dimension of T just as declared in the
+*>          calling subroutine.  NW .LE. LDT
+*> \endverbatim
+*>
+*> \param[in] NV
+*> \verbatim
+*>          NV is integer
+*>          The number of rows of work array WV available for
+*>          workspace.  NV.GE.NW.
+*> \endverbatim
+*>
+*> \param[out] WV
+*> \verbatim
+*>          WV is COMPLEX*16 array, dimension (LDWV,NW)
+*> \endverbatim
+*>
+*> \param[in] LDWV
+*> \verbatim
+*>          LDWV is integer
+*>          The leading dimension of W just as declared in the
+*>          calling subroutine.  NW .LE. LDV
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension LWORK.
+*>          On exit, WORK(1) is set to an estimate of the optimal value
+*>          of LWORK for the given values of N, NW, KTOP and KBOT.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is integer
+*>          The dimension of the work array WORK.  LWORK = 2*NW
+*>          suffices, but greater efficiency may result from larger
+*>          values of LWORK.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; ZLAQR2
+*>          only estimates the optimal workspace size for the given
+*>          values of N, NW, KTOP and KBOT.  The estimate is returned
+*>          in WORK(1).  No error message related to LWORK is issued
+*>          by XERBLA.  Neither H nor Z are accessed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*>
+*  =====================================================================
+      SUBROUTINE ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+     $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
+     $                   NV, WV, LDWV, WORK, LWORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
+     $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
+      LOGICAL            WANTT, WANTZ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
+     $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+*     ..
+*
+*  ================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   RZERO, RONE
+      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         BETA, CDUM, S, TAU
+      DOUBLE PRECISION   FOO, SAFMAX, SAFMIN, SMLNUM, ULP
+      INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
+     $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWKOPT
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
+     $                   ZLARF, ZLARFG, ZLASET, ZTREXC, ZUNMHR
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, MAX, MIN
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+*
+*     ==== Estimate optimal workspace. ====
+*
+      JW = MIN( NW, KBOT-KTOP+1 )
+      IF( JW.LE.2 ) THEN
+         LWKOPT = 1
+      ELSE
+*
+*        ==== Workspace query call to ZGEHRD ====
+*
+         CALL ZGEHRD( JW, 1, JW-1, T, LDT, WORK, WORK, -1, INFO )
+         LWK1 = INT( WORK( 1 ) )
+*
+*        ==== Workspace query call to ZUNMHR ====
+*
+         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+     $                WORK, -1, INFO )
+         LWK2 = INT( WORK( 1 ) )
+*
+*        ==== Optimal workspace ====
+*
+         LWKOPT = JW + MAX( LWK1, LWK2 )
+      END IF
+*
+*     ==== Quick return in case of workspace query. ====
+*
+      IF( LWORK.EQ.-1 ) THEN
+         WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+         RETURN
+      END IF
+*
+*     ==== Nothing to do ...
+*     ... for an empty active block ... ====
+      NS = 0
+      ND = 0
+      WORK( 1 ) = ONE
+      IF( KTOP.GT.KBOT )
+     $   RETURN
+*     ... nor for an empty deflation window. ====
+      IF( NW.LT.1 )
+     $   RETURN
+*
+*     ==== Machine constants ====
+*
+      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
+      SAFMAX = RONE / SAFMIN
+      CALL DLABAD( SAFMIN, SAFMAX )
+      ULP = DLAMCH( 'PRECISION' )
+      SMLNUM = SAFMIN*( DBLE( N ) / ULP )
+*
+*     ==== Setup deflation window ====
+*
+      JW = MIN( NW, KBOT-KTOP+1 )
+      KWTOP = KBOT - JW + 1
+      IF( KWTOP.EQ.KTOP ) THEN
+         S = ZERO
+      ELSE
+         S = H( KWTOP, KWTOP-1 )
+      END IF
+*
+      IF( KBOT.EQ.KWTOP ) THEN
+*
+*        ==== 1-by-1 deflation window: not much to do ====
+*
+         SH( KWTOP ) = H( KWTOP, KWTOP )
+         NS = 1
+         ND = 0
+         IF( CABS1( S ).LE.MAX( SMLNUM, ULP*CABS1( H( KWTOP,
+     $       KWTOP ) ) ) ) THEN
+            NS = 0
+            ND = 1
+            IF( KWTOP.GT.KTOP )
+     $         H( KWTOP, KWTOP-1 ) = ZERO
+         END IF
+         WORK( 1 ) = ONE
+         RETURN
+      END IF
+*
+*     ==== Convert to spike-triangular form.  (In case of a
+*     .    rare QR failure, this routine continues to do
+*     .    aggressive early deflation using that part of
+*     .    the deflation window that converged using INFQR
+*     .    here and there to keep track.) ====
+*
+      CALL ZLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
+      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+*
+      CALL ZLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
+      CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+     $             JW, V, LDV, INFQR )
+*
+*     ==== Deflation detection loop ====
+*
+      NS = JW
+      ILST = INFQR + 1
+      DO 10 KNT = INFQR + 1, JW
+*
+*        ==== Small spike tip deflation test ====
+*
+         FOO = CABS1( T( NS, NS ) )
+         IF( FOO.EQ.RZERO )
+     $      FOO = CABS1( S )
+         IF( CABS1( S )*CABS1( V( 1, NS ) ).LE.MAX( SMLNUM, ULP*FOO ) )
+     $        THEN
+*
+*           ==== One more converged eigenvalue ====
+*
+            NS = NS - 1
+         ELSE
+*
+*           ==== One undeflatable eigenvalue.  Move it up out of the
+*           .    way.   (ZTREXC can not fail in this case.) ====
+*
+            IFST = NS
+            CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+            ILST = ILST + 1
+         END IF
+   10 CONTINUE
+*
+*        ==== Return to Hessenberg form ====
+*
+      IF( NS.EQ.0 )
+     $   S = ZERO
+*
+      IF( NS.LT.JW ) THEN
+*
+*        ==== sorting the diagonal of T improves accuracy for
+*        .    graded matrices.  ====
+*
+         DO 30 I = INFQR + 1, NS
+            IFST = I
+            DO 20 J = I + 1, NS
+               IF( CABS1( T( J, J ) ).GT.CABS1( T( IFST, IFST ) ) )
+     $            IFST = J
+   20       CONTINUE
+            ILST = I
+            IF( IFST.NE.ILST )
+     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+   30    CONTINUE
+      END IF
+*
+*     ==== Restore shift/eigenvalue array from T ====
+*
+      DO 40 I = INFQR + 1, JW
+         SH( KWTOP+I-1 ) = T( I, I )
+   40 CONTINUE
+*
+*
+      IF( NS.LT.JW .OR. S.EQ.ZERO ) THEN
+         IF( NS.GT.1 .AND. S.NE.ZERO ) THEN
+*
+*           ==== Reflect spike back into lower triangle ====
+*
+            CALL ZCOPY( NS, V, LDV, WORK, 1 )
+            DO 50 I = 1, NS
+               WORK( I ) = DCONJG( WORK( I ) )
+   50       CONTINUE
+            BETA = WORK( 1 )
+            CALL ZLARFG( NS, BETA, WORK( 2 ), 1, TAU )
+            WORK( 1 ) = ONE
+*
+            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+*
+            CALL ZLARF( 'L', NS, JW, WORK, 1, DCONJG( TAU ), T, LDT,
+     $                  WORK( JW+1 ) )
+            CALL ZLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                  WORK( JW+1 ) )
+            CALL ZLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                  WORK( JW+1 ) )
+*
+            CALL ZGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
+     $                   LWORK-JW, INFO )
+         END IF
+*
+*        ==== Copy updated reduced window into place ====
+*
+         IF( KWTOP.GT.1 )
+     $      H( KWTOP, KWTOP-1 ) = S*DCONJG( V( 1, 1 ) )
+         CALL ZLACPY( 'U', JW, JW, T, LDT, H( KWTOP, KWTOP ), LDH )
+         CALL ZCOPY( JW-1, T( 2, 1 ), LDT+1, H( KWTOP+1, KWTOP ),
+     $               LDH+1 )
+*
+*        ==== Accumulate orthogonal matrix in order update
+*        .    H and Z, if requested.  ====
+*
+         IF( NS.GT.1 .AND. S.NE.ZERO )
+     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $                   WORK( JW+1 ), LWORK-JW, INFO )
+*
+*        ==== Update vertical slab in H ====
+*
+         IF( WANTT ) THEN
+            LTOP = 1
+         ELSE
+            LTOP = KTOP
+         END IF
+         DO 60 KROW = LTOP, KWTOP - 1, NV
+            KLN = MIN( NV, KWTOP-KROW )
+            CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
+     $                  LDH, V, LDV, ZERO, WV, LDWV )
+            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+   60    CONTINUE
+*
+*        ==== Update horizontal slab in H ====
+*
+         IF( WANTT ) THEN
+            DO 70 KCOL = KBOT + 1, N, NH
+               KLN = MIN( NH, N-KCOL+1 )
+               CALL ZGEMM( 'C', 'N', JW, KLN, JW, ONE, V, LDV,
+     $                     H( KWTOP, KCOL ), LDH, ZERO, T, LDT )
+               CALL ZLACPY( 'A', JW, KLN, T, LDT, H( KWTOP, KCOL ),
+     $                      LDH )
+   70       CONTINUE
+         END IF
+*
+*        ==== Update vertical slab in Z ====
+*
+         IF( WANTZ ) THEN
+            DO 80 KROW = ILOZ, IHIZ, NV
+               KLN = MIN( NV, IHIZ-KROW+1 )
+               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+     $                     LDZ, V, LDV, ZERO, WV, LDWV )
+               CALL ZLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
+     $                      LDZ )
+   80       CONTINUE
+         END IF
+      END IF
+*
+*     ==== Return the number of deflations ... ====
+*
+      ND = JW - NS
+*
+*     ==== ... and the number of shifts. (Subtracting
+*     .    INFQR from the spike length takes care
+*     .    of the case of a rare QR failure while
+*     .    calculating eigenvalues of the deflation
+*     .    window.)  ====
+*
+      NS = NS - INFQR
+*
+*      ==== Return optimal workspace. ====
+*
+      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+*
+*     ==== End of ZLAQR2 ====
+*
+      END
+*> \brief \b ZLAQR3 performs the unitary similarity transformation of a Hessenberg matrix to detect and deflate fully converged eigenvalues from a trailing principal submatrix (aggressive early deflation).
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQR3 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr3.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr3.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr3.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+*                          IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
+*                          NV, WV, LDWV, WORK, LWORK )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
+*      $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
+*       LOGICAL            WANTT, WANTZ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
+*      $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    Aggressive early deflation:
+*>
+*>    ZLAQR3 accepts as input an upper Hessenberg matrix
+*>    H and performs an unitary similarity transformation
+*>    designed to detect and deflate fully converged eigenvalues from
+*>    a trailing principal submatrix.  On output H has been over-
+*>    written by a new Hessenberg matrix that is a perturbation of
+*>    an unitary similarity transformation of H.  It is to be
+*>    hoped that the final version of H has many zero subdiagonal
+*>    entries.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] WANTT
+*> \verbatim
+*>          WANTT is LOGICAL
+*>          If .TRUE., then the Hessenberg matrix H is fully updated
+*>          so that the triangular Schur factor may be
+*>          computed (in cooperation with the calling subroutine).
+*>          If .FALSE., then only enough of H is updated to preserve
+*>          the eigenvalues.
+*> \endverbatim
+*>
+*> \param[in] WANTZ
+*> \verbatim
+*>          WANTZ is LOGICAL
+*>          If .TRUE., then the unitary matrix Z is updated so
+*>          so that the unitary Schur factor may be computed
+*>          (in cooperation with the calling subroutine).
+*>          If .FALSE., then Z is not referenced.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix H and (if WANTZ is .TRUE.) the
+*>          order of the unitary matrix Z.
+*> \endverbatim
+*>
+*> \param[in] KTOP
+*> \verbatim
+*>          KTOP is INTEGER
+*>          It is assumed that either KTOP = 1 or H(KTOP,KTOP-1)=0.
+*>          KBOT and KTOP together determine an isolated block
+*>          along the diagonal of the Hessenberg matrix.
+*> \endverbatim
+*>
+*> \param[in] KBOT
+*> \verbatim
+*>          KBOT is INTEGER
+*>          It is assumed without a check that either
+*>          KBOT = N or H(KBOT+1,KBOT)=0.  KBOT and KTOP together
+*>          determine an isolated block along the diagonal of the
+*>          Hessenberg matrix.
+*> \endverbatim
+*>
+*> \param[in] NW
+*> \verbatim
+*>          NW is INTEGER
+*>          Deflation window size.  1 .LE. NW .LE. (KBOT-KTOP+1).
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array, dimension (LDH,N)
+*>          On input the initial N-by-N section of H stores the
+*>          Hessenberg matrix undergoing aggressive early deflation.
+*>          On output H has been transformed by a unitary
+*>          similarity transformation, perturbed, and the returned
+*>          to Hessenberg form that (it is to be hoped) has some
+*>          zero subdiagonal entries.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is integer
+*>          Leading dimension of H just as declared in the calling
+*>          subroutine.  N .LE. LDH
+*> \endverbatim
+*>
+*> \param[in] ILOZ
+*> \verbatim
+*>          ILOZ is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHIZ
+*> \verbatim
+*>          IHIZ is INTEGER
+*>          Specify the rows of Z to which transformations must be
+*>          applied if WANTZ is .TRUE.. 1 .LE. ILOZ .LE. IHIZ .LE. N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          IF WANTZ is .TRUE., then on output, the unitary
+*>          similarity transformation mentioned above has been
+*>          accumulated into Z(ILOZ:IHIZ,ILO:IHI) from the right.
+*>          If WANTZ is .FALSE., then Z is unreferenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is integer
+*>          The leading dimension of Z just as declared in the
+*>          calling subroutine.  1 .LE. LDZ.
+*> \endverbatim
+*>
+*> \param[out] NS
+*> \verbatim
+*>          NS is integer
+*>          The number of unconverged (ie approximate) eigenvalues
+*>          returned in SR and SI that may be used as shifts by the
+*>          calling subroutine.
+*> \endverbatim
+*>
+*> \param[out] ND
+*> \verbatim
+*>          ND is integer
+*>          The number of converged eigenvalues uncovered by this
+*>          subroutine.
+*> \endverbatim
+*>
+*> \param[out] SH
+*> \verbatim
+*>          SH is COMPLEX*16 array, dimension KBOT
+*>          On output, approximate eigenvalues that may
+*>          be used for shifts are stored in SH(KBOT-ND-NS+1)
+*>          through SR(KBOT-ND).  Converged eigenvalues are
+*>          stored in SH(KBOT-ND+1) through SH(KBOT).
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension (LDV,NW)
+*>          An NW-by-NW work array.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is integer scalar
+*>          The leading dimension of V just as declared in the
+*>          calling subroutine.  NW .LE. LDV
+*> \endverbatim
+*>
+*> \param[in] NH
+*> \verbatim
+*>          NH is integer scalar
+*>          The number of columns of T.  NH.GE.NW.
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,NW)
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is integer
+*>          The leading dimension of T just as declared in the
+*>          calling subroutine.  NW .LE. LDT
+*> \endverbatim
+*>
+*> \param[in] NV
+*> \verbatim
+*>          NV is integer
+*>          The number of rows of work array WV available for
+*>          workspace.  NV.GE.NW.
+*> \endverbatim
+*>
+*> \param[out] WV
+*> \verbatim
+*>          WV is COMPLEX*16 array, dimension (LDWV,NW)
+*> \endverbatim
+*>
+*> \param[in] LDWV
+*> \verbatim
+*>          LDWV is integer
+*>          The leading dimension of W just as declared in the
+*>          calling subroutine.  NW .LE. LDV
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension LWORK.
+*>          On exit, WORK(1) is set to an estimate of the optimal value
+*>          of LWORK for the given values of N, NW, KTOP and KBOT.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is integer
+*>          The dimension of the work array WORK.  LWORK = 2*NW
+*>          suffices, but greater efficiency may result from larger
+*>          values of LWORK.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; ZLAQR3
+*>          only estimates the optimal workspace size for the given
+*>          values of N, NW, KTOP and KBOT.  The estimate is returned
+*>          in WORK(1).  No error message related to LWORK is issued
+*>          by XERBLA.  Neither H nor Z are accessed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*>
+*  =====================================================================
+      SUBROUTINE ZLAQR3( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+     $                   IHIZ, Z, LDZ, NS, ND, SH, V, LDV, NH, T, LDT,
+     $                   NV, WV, LDWV, WORK, LWORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHIZ, ILOZ, KBOT, KTOP, LDH, LDT, LDV, LDWV,
+     $                   LDZ, LWORK, N, ND, NH, NS, NV, NW
+      LOGICAL            WANTT, WANTZ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), SH( * ), T( LDT, * ), V( LDV, * ),
+     $                   WORK( * ), WV( LDWV, * ), Z( LDZ, * )
+*     ..
+*
+*  ================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   RZERO, RONE
+      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         BETA, CDUM, S, TAU
+      DOUBLE PRECISION   FOO, SAFMAX, SAFMIN, SMLNUM, ULP
+      INTEGER            I, IFST, ILST, INFO, INFQR, J, JW, KCOL, KLN,
+     $                   KNT, KROW, KWTOP, LTOP, LWK1, LWK2, LWK3,
+     $                   LWKOPT, NMIN
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      INTEGER            ILAENV
+      EXTERNAL           DLAMCH, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, ZCOPY, ZGEHRD, ZGEMM, ZLACPY, ZLAHQR,
+     $                   ZLAQR4, ZLARF, ZLARFG, ZLASET, ZTREXC, ZUNMHR
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, MAX, MIN
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+*
+*     ==== Estimate optimal workspace. ====
+*
+      JW = MIN( NW, KBOT-KTOP+1 )
+      IF( JW.LE.2 ) THEN
+         LWKOPT = 1
+      ELSE
+*
+*        ==== Workspace query call to ZGEHRD ====
+*
+         CALL ZGEHRD( JW, 1, JW-1, T, LDT, WORK, WORK, -1, INFO )
+         LWK1 = INT( WORK( 1 ) )
+*
+*        ==== Workspace query call to ZUNMHR ====
+*
+         CALL ZUNMHR( 'R', 'N', JW, JW, 1, JW-1, T, LDT, WORK, V, LDV,
+     $                WORK, -1, INFO )
+         LWK2 = INT( WORK( 1 ) )
+*
+*        ==== Workspace query call to ZLAQR4 ====
+*
+         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH, 1, JW, V,
+     $                LDV, WORK, -1, INFQR )
+         LWK3 = INT( WORK( 1 ) )
+*
+*        ==== Optimal workspace ====
+*
+         LWKOPT = MAX( JW+MAX( LWK1, LWK2 ), LWK3 )
+      END IF
+*
+*     ==== Quick return in case of workspace query. ====
+*
+      IF( LWORK.EQ.-1 ) THEN
+         WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+         RETURN
+      END IF
+*
+*     ==== Nothing to do ...
+*     ... for an empty active block ... ====
+      NS = 0
+      ND = 0
+      WORK( 1 ) = ONE
+      IF( KTOP.GT.KBOT )
+     $   RETURN
+*     ... nor for an empty deflation window. ====
+      IF( NW.LT.1 )
+     $   RETURN
+*
+*     ==== Machine constants ====
+*
+      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
+      SAFMAX = RONE / SAFMIN
+      CALL DLABAD( SAFMIN, SAFMAX )
+      ULP = DLAMCH( 'PRECISION' )
+      SMLNUM = SAFMIN*( DBLE( N ) / ULP )
+*
+*     ==== Setup deflation window ====
+*
+      JW = MIN( NW, KBOT-KTOP+1 )
+      KWTOP = KBOT - JW + 1
+      IF( KWTOP.EQ.KTOP ) THEN
+         S = ZERO
+      ELSE
+         S = H( KWTOP, KWTOP-1 )
+      END IF
+*
+      IF( KBOT.EQ.KWTOP ) THEN
+*
+*        ==== 1-by-1 deflation window: not much to do ====
+*
+         SH( KWTOP ) = H( KWTOP, KWTOP )
+         NS = 1
+         ND = 0
+         IF( CABS1( S ).LE.MAX( SMLNUM, ULP*CABS1( H( KWTOP,
+     $       KWTOP ) ) ) ) THEN
+            NS = 0
+            ND = 1
+            IF( KWTOP.GT.KTOP )
+     $         H( KWTOP, KWTOP-1 ) = ZERO
+         END IF
+         WORK( 1 ) = ONE
+         RETURN
+      END IF
+*
+*     ==== Convert to spike-triangular form.  (In case of a
+*     .    rare QR failure, this routine continues to do
+*     .    aggressive early deflation using that part of
+*     .    the deflation window that converged using INFQR
+*     .    here and there to keep track.) ====
+*
+      CALL ZLACPY( 'U', JW, JW, H( KWTOP, KWTOP ), LDH, T, LDT )
+      CALL ZCOPY( JW-1, H( KWTOP+1, KWTOP ), LDH+1, T( 2, 1 ), LDT+1 )
+*
+      CALL ZLASET( 'A', JW, JW, ZERO, ONE, V, LDV )
+      NMIN = ILAENV( 12, 'ZLAQR3', 'SV', JW, 1, JW, LWORK )
+      IF( JW.GT.NMIN ) THEN
+         CALL ZLAQR4( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+     $                JW, V, LDV, WORK, LWORK, INFQR )
+      ELSE
+         CALL ZLAHQR( .true., .true., JW, 1, JW, T, LDT, SH( KWTOP ), 1,
+     $                JW, V, LDV, INFQR )
+      END IF
+*
+*     ==== Deflation detection loop ====
+*
+      NS = JW
+      ILST = INFQR + 1
+      DO 10 KNT = INFQR + 1, JW
+*
+*        ==== Small spike tip deflation test ====
+*
+         FOO = CABS1( T( NS, NS ) )
+         IF( FOO.EQ.RZERO )
+     $      FOO = CABS1( S )
+         IF( CABS1( S )*CABS1( V( 1, NS ) ).LE.MAX( SMLNUM, ULP*FOO ) )
+     $        THEN
+*
+*           ==== One more converged eigenvalue ====
+*
+            NS = NS - 1
+         ELSE
+*
+*           ==== One undeflatable eigenvalue.  Move it up out of the
+*           .    way.   (ZTREXC can not fail in this case.) ====
+*
+            IFST = NS
+            CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+            ILST = ILST + 1
+         END IF
+   10 CONTINUE
+*
+*        ==== Return to Hessenberg form ====
+*
+      IF( NS.EQ.0 )
+     $   S = ZERO
+*
+      IF( NS.LT.JW ) THEN
+*
+*        ==== sorting the diagonal of T improves accuracy for
+*        .    graded matrices.  ====
+*
+         DO 30 I = INFQR + 1, NS
+            IFST = I
+            DO 20 J = I + 1, NS
+               IF( CABS1( T( J, J ) ).GT.CABS1( T( IFST, IFST ) ) )
+     $            IFST = J
+   20       CONTINUE
+            ILST = I
+            IF( IFST.NE.ILST )
+     $         CALL ZTREXC( 'V', JW, T, LDT, V, LDV, IFST, ILST, INFO )
+   30    CONTINUE
+      END IF
+*
+*     ==== Restore shift/eigenvalue array from T ====
+*
+      DO 40 I = INFQR + 1, JW
+         SH( KWTOP+I-1 ) = T( I, I )
+   40 CONTINUE
+*
+*
+      IF( NS.LT.JW .OR. S.EQ.ZERO ) THEN
+         IF( NS.GT.1 .AND. S.NE.ZERO ) THEN
+*
+*           ==== Reflect spike back into lower triangle ====
+*
+            CALL ZCOPY( NS, V, LDV, WORK, 1 )
+            DO 50 I = 1, NS
+               WORK( I ) = DCONJG( WORK( I ) )
+   50       CONTINUE
+            BETA = WORK( 1 )
+            CALL ZLARFG( NS, BETA, WORK( 2 ), 1, TAU )
+            WORK( 1 ) = ONE
+*
+            CALL ZLASET( 'L', JW-2, JW-2, ZERO, ZERO, T( 3, 1 ), LDT )
+*
+            CALL ZLARF( 'L', NS, JW, WORK, 1, DCONJG( TAU ), T, LDT,
+     $                  WORK( JW+1 ) )
+            CALL ZLARF( 'R', NS, NS, WORK, 1, TAU, T, LDT,
+     $                  WORK( JW+1 ) )
+            CALL ZLARF( 'R', JW, NS, WORK, 1, TAU, V, LDV,
+     $                  WORK( JW+1 ) )
+*
+            CALL ZGEHRD( JW, 1, NS, T, LDT, WORK, WORK( JW+1 ),
+     $                   LWORK-JW, INFO )
+         END IF
+*
+*        ==== Copy updated reduced window into place ====
+*
+         IF( KWTOP.GT.1 )
+     $      H( KWTOP, KWTOP-1 ) = S*DCONJG( V( 1, 1 ) )
+         CALL ZLACPY( 'U', JW, JW, T, LDT, H( KWTOP, KWTOP ), LDH )
+         CALL ZCOPY( JW-1, T( 2, 1 ), LDT+1, H( KWTOP+1, KWTOP ),
+     $               LDH+1 )
+*
+*        ==== Accumulate orthogonal matrix in order update
+*        .    H and Z, if requested.  ====
+*
+         IF( NS.GT.1 .AND. S.NE.ZERO )
+     $      CALL ZUNMHR( 'R', 'N', JW, NS, 1, NS, T, LDT, WORK, V, LDV,
+     $                   WORK( JW+1 ), LWORK-JW, INFO )
+*
+*        ==== Update vertical slab in H ====
+*
+         IF( WANTT ) THEN
+            LTOP = 1
+         ELSE
+            LTOP = KTOP
+         END IF
+         DO 60 KROW = LTOP, KWTOP - 1, NV
+            KLN = MIN( NV, KWTOP-KROW )
+            CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, H( KROW, KWTOP ),
+     $                  LDH, V, LDV, ZERO, WV, LDWV )
+            CALL ZLACPY( 'A', KLN, JW, WV, LDWV, H( KROW, KWTOP ), LDH )
+   60    CONTINUE
+*
+*        ==== Update horizontal slab in H ====
+*
+         IF( WANTT ) THEN
+            DO 70 KCOL = KBOT + 1, N, NH
+               KLN = MIN( NH, N-KCOL+1 )
+               CALL ZGEMM( 'C', 'N', JW, KLN, JW, ONE, V, LDV,
+     $                     H( KWTOP, KCOL ), LDH, ZERO, T, LDT )
+               CALL ZLACPY( 'A', JW, KLN, T, LDT, H( KWTOP, KCOL ),
+     $                      LDH )
+   70       CONTINUE
+         END IF
+*
+*        ==== Update vertical slab in Z ====
+*
+         IF( WANTZ ) THEN
+            DO 80 KROW = ILOZ, IHIZ, NV
+               KLN = MIN( NV, IHIZ-KROW+1 )
+               CALL ZGEMM( 'N', 'N', KLN, JW, JW, ONE, Z( KROW, KWTOP ),
+     $                     LDZ, V, LDV, ZERO, WV, LDWV )
+               CALL ZLACPY( 'A', KLN, JW, WV, LDWV, Z( KROW, KWTOP ),
+     $                      LDZ )
+   80       CONTINUE
+         END IF
+      END IF
+*
+*     ==== Return the number of deflations ... ====
+*
+      ND = JW - NS
+*
+*     ==== ... and the number of shifts. (Subtracting
+*     .    INFQR from the spike length takes care
+*     .    of the case of a rare QR failure while
+*     .    calculating eigenvalues of the deflation
+*     .    window.)  ====
+*
+      NS = NS - INFQR
+*
+*      ==== Return optimal workspace. ====
+*
+      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+*
+*     ==== End of ZLAQR3 ====
+*
+      END
+*> \brief \b ZLAQR4 computes the eigenvalues of a Hessenberg matrix, and optionally the matrices from the Schur decomposition.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQR4 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr4.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr4.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr4.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+*                          IHIZ, Z, LDZ, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
+*       LOGICAL            WANTT, WANTZ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZLAQR4 implements one level of recursion for ZLAQR0.
+*>    It is a complete implementation of the small bulge multi-shift
+*>    QR algorithm.  It may be called by ZLAQR0 and, for large enough
+*>    deflation window size, it may be called by ZLAQR3.  This
+*>    subroutine is identical to ZLAQR0 except that it calls ZLAQR2
+*>    instead of ZLAQR3.
+*>
+*>    ZLAQR4 computes the eigenvalues of a Hessenberg matrix H
+*>    and, optionally, the matrices T and Z from the Schur decomposition
+*>    H = Z T Z**H, where T is an upper triangular matrix (the
+*>    Schur form), and Z is the unitary matrix of Schur vectors.
+*>
+*>    Optionally Z may be postmultiplied into an input unitary
+*>    matrix Q so that this routine can give the Schur factorization
+*>    of a matrix A which has been reduced to the Hessenberg form H
+*>    by the unitary matrix Q:  A = Q*H*Q**H = (QZ)*H*(QZ)**H.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] WANTT
+*> \verbatim
+*>          WANTT is LOGICAL
+*>          = .TRUE. : the full Schur form T is required;
+*>          = .FALSE.: only eigenvalues are required.
+*> \endverbatim
+*>
+*> \param[in] WANTZ
+*> \verbatim
+*>          WANTZ is LOGICAL
+*>          = .TRUE. : the matrix of Schur vectors Z is required;
+*>          = .FALSE.: Schur vectors are not required.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>           The order of the matrix H.  N .GE. 0.
+*> \endverbatim
+*>
+*> \param[in] ILO
+*> \verbatim
+*>          ILO is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHI
+*> \verbatim
+*>          IHI is INTEGER
+*>           It is assumed that H is already upper triangular in rows
+*>           and columns 1:ILO-1 and IHI+1:N and, if ILO.GT.1,
+*>           H(ILO,ILO-1) is zero. ILO and IHI are normally set by a
+*>           previous call to ZGEBAL, and then passed to ZGEHRD when the
+*>           matrix output by ZGEBAL is reduced to Hessenberg form.
+*>           Otherwise, ILO and IHI should be set to 1 and N,
+*>           respectively.  If N.GT.0, then 1.LE.ILO.LE.IHI.LE.N.
+*>           If N = 0, then ILO = 1 and IHI = 0.
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array, dimension (LDH,N)
+*>           On entry, the upper Hessenberg matrix H.
+*>           On exit, if INFO = 0 and WANTT is .TRUE., then H
+*>           contains the upper triangular matrix T from the Schur
+*>           decomposition (the Schur form). If INFO = 0 and WANT is
+*>           .FALSE., then the contents of H are unspecified on exit.
+*>           (The output value of H when INFO.GT.0 is given under the
+*>           description of INFO below.)
+*>
+*>           This subroutine may explicitly set H(i,j) = 0 for i.GT.j and
+*>           j = 1, 2, ... ILO-1 or j = IHI+1, IHI+2, ... N.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is INTEGER
+*>           The leading dimension of the array H. LDH .GE. max(1,N).
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is COMPLEX*16 array, dimension (N)
+*>           The computed eigenvalues of H(ILO:IHI,ILO:IHI) are stored
+*>           in W(ILO:IHI). If WANTT is .TRUE., then the eigenvalues are
+*>           stored in the same order as on the diagonal of the Schur
+*>           form returned in H, with W(i) = H(i,i).
+*> \endverbatim
+*>
+*> \param[in] ILOZ
+*> \verbatim
+*>          ILOZ is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHIZ
+*> \verbatim
+*>          IHIZ is INTEGER
+*>           Specify the rows of Z to which transformations must be
+*>           applied if WANTZ is .TRUE..
+*>           1 .LE. ILOZ .LE. ILO; IHI .LE. IHIZ .LE. N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,IHI)
+*>           If WANTZ is .FALSE., then Z is not referenced.
+*>           If WANTZ is .TRUE., then Z(ILO:IHI,ILOZ:IHIZ) is
+*>           replaced by Z(ILO:IHI,ILOZ:IHIZ)*U where U is the
+*>           orthogonal Schur factor of H(ILO:IHI,ILO:IHI).
+*>           (The output value of Z when INFO.GT.0 is given under
+*>           the description of INFO below.)
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>           The leading dimension of the array Z.  if WANTZ is .TRUE.
+*>           then LDZ.GE.MAX(1,IHIZ).  Otherwize, LDZ.GE.1.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension LWORK
+*>           On exit, if LWORK = -1, WORK(1) returns an estimate of
+*>           the optimal value for LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>           The dimension of the array WORK.  LWORK .GE. max(1,N)
+*>           is sufficient, but LWORK typically as large as 6*N may
+*>           be required for optimal performance.  A workspace query
+*>           to determine the optimal workspace size is recommended.
+*>
+*>           If LWORK = -1, then ZLAQR4 does a workspace query.
+*>           In this case, ZLAQR4 checks the input parameters and
+*>           estimates the optimal workspace size for the given
+*>           values of N, ILO and IHI.  The estimate is returned
+*>           in WORK(1).  No error message related to LWORK is
+*>           issued by XERBLA.  Neither H nor Z are accessed.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>             =  0:  successful exit
+*>           .GT. 0:  if INFO = i, ZLAQR4 failed to compute all of
+*>                the eigenvalues.  Elements 1:ilo-1 and i+1:n of WR
+*>                and WI contain those eigenvalues which have been
+*>                successfully computed.  (Failures are rare.)
+*>
+*>                If INFO .GT. 0 and WANT is .FALSE., then on exit,
+*>                the remaining unconverged eigenvalues are the eigen-
+*>                values of the upper Hessenberg matrix rows and
+*>                columns ILO through INFO of the final, output
+*>                value of H.
+*>
+*>                If INFO .GT. 0 and WANTT is .TRUE., then on exit
+*>
+*>           (*)  (initial value of H)*U  = U*(final value of H)
+*>
+*>                where U is a unitary matrix.  The final
+*>                value of  H is upper Hessenberg and triangular in
+*>                rows and columns INFO+1 through IHI.
+*>
+*>                If INFO .GT. 0 and WANTZ is .TRUE., then on exit
+*>
+*>                  (final value of Z(ILO:IHI,ILOZ:IHIZ)
+*>                   =  (initial value of Z(ILO:IHI,ILOZ:IHIZ)*U
+*>
+*>                where U is the unitary matrix in (*) (regard-
+*>                less of the value of WANTT.)
+*>
+*>                If INFO .GT. 0 and WANTZ is .FALSE., then Z is not
+*>                accessed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*
+*> \par References:
+*  ================
+*>
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
+*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
+*>       929--947, 2002.
+*> \n
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part II: Aggressive Early Deflation, SIAM Journal
+*>       of Matrix Analysis, volume 23, pages 948--973, 2002.
+*>
+*  =====================================================================
+      SUBROUTINE ZLAQR4( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+     $                   IHIZ, Z, LDZ, WORK, LWORK, INFO )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, LWORK, N
+      LOGICAL            WANTT, WANTZ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), W( * ), WORK( * ), Z( LDZ, * )
+*     ..
+*
+*  ================================================================
+*
+*     .. Parameters ..
+*
+*     ==== Matrices of order NTINY or smaller must be processed by
+*     .    ZLAHQR because of insufficient subdiagonal scratch space.
+*     .    (This is a hard limit.) ====
+      INTEGER            NTINY
+      PARAMETER          ( NTINY = 11 )
+*
+*     ==== Exceptional deflation windows:  try to cure rare
+*     .    slow convergence by varying the size of the
+*     .    deflation window after KEXNW iterations. ====
+      INTEGER            KEXNW
+      PARAMETER          ( KEXNW = 5 )
+*
+*     ==== Exceptional shifts: try to cure rare slow convergence
+*     .    with ad-hoc exceptional shifts every KEXSH iterations.
+*     .    ====
+      INTEGER            KEXSH
+      PARAMETER          ( KEXSH = 6 )
+*
+*     ==== The constant WILK1 is used to form the exceptional
+*     .    shifts. ====
+      DOUBLE PRECISION   WILK1
+      PARAMETER          ( WILK1 = 0.75d0 )
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   TWO
+      PARAMETER          ( TWO = 2.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         AA, BB, CC, CDUM, DD, DET, RTDISC, SWAP, TR2
+      DOUBLE PRECISION   S
+      INTEGER            I, INF, IT, ITMAX, K, KACC22, KBOT, KDU, KS,
+     $                   KT, KTOP, KU, KV, KWH, KWTOP, KWV, LD, LS,
+     $                   LWKOPT, NDEC, NDFL, NH, NHO, NIBBLE, NMIN, NS,
+     $                   NSMAX, NSR, NVE, NW, NWMAX, NWR, NWUPBD
+      LOGICAL            SORTED
+      CHARACTER          JBCMPZ*2
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         ZDUM( 1, 1 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLACPY, ZLAHQR, ZLAQR2, ZLAQR5
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, MAX, MIN, MOD,
+     $                   SQRT
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+      INFO = 0
+*
+*     ==== Quick return for N = 0: nothing to do. ====
+*
+      IF( N.EQ.0 ) THEN
+         WORK( 1 ) = ONE
+         RETURN
+      END IF
+*
+      IF( N.LE.NTINY ) THEN
+*
+*        ==== Tiny matrices must use ZLAHQR. ====
+*
+         LWKOPT = 1
+         IF( LWORK.NE.-1 )
+     $      CALL ZLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, W, ILOZ,
+     $                   IHIZ, Z, LDZ, INFO )
+      ELSE
+*
+*        ==== Use small bulge multi-shift QR with aggressive early
+*        .    deflation on larger-than-tiny matrices. ====
+*
+*        ==== Hope for the best. ====
+*
+         INFO = 0
+*
+*        ==== Set up job flags for ILAENV. ====
+*
+         IF( WANTT ) THEN
+            JBCMPZ( 1: 1 ) = 'S'
+         ELSE
+            JBCMPZ( 1: 1 ) = 'E'
+         END IF
+         IF( WANTZ ) THEN
+            JBCMPZ( 2: 2 ) = 'V'
+         ELSE
+            JBCMPZ( 2: 2 ) = 'N'
+         END IF
+*
+*        ==== NWR = recommended deflation window size.  At this
+*        .    point,  N .GT. NTINY = 11, so there is enough
+*        .    subdiagonal workspace for NWR.GE.2 as required.
+*        .    (In fact, there is enough subdiagonal space for
+*        .    NWR.GE.3.) ====
+*
+         NWR = ILAENV( 13, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
+         NWR = MAX( 2, NWR )
+         NWR = MIN( IHI-ILO+1, ( N-1 ) / 3, NWR )
+*
+*        ==== NSR = recommended number of simultaneous shifts.
+*        .    At this point N .GT. NTINY = 11, so there is at
+*        .    enough subdiagonal workspace for NSR to be even
+*        .    and greater than or equal to two as required. ====
+*
+         NSR = ILAENV( 15, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
+         NSR = MIN( NSR, ( N+6 ) / 9, IHI-ILO )
+         NSR = MAX( 2, NSR-MOD( NSR, 2 ) )
+*
+*        ==== Estimate optimal workspace ====
+*
+*        ==== Workspace query call to ZLAQR2 ====
+*
+         CALL ZLAQR2( WANTT, WANTZ, N, ILO, IHI, NWR+1, H, LDH, ILOZ,
+     $                IHIZ, Z, LDZ, LS, LD, W, H, LDH, N, H, LDH, N, H,
+     $                LDH, WORK, -1 )
+*
+*        ==== Optimal workspace = MAX(ZLAQR5, ZLAQR2) ====
+*
+         LWKOPT = MAX( 3*NSR / 2, INT( WORK( 1 ) ) )
+*
+*        ==== Quick return in case of workspace query. ====
+*
+         IF( LWORK.EQ.-1 ) THEN
+            WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+            RETURN
+         END IF
+*
+*        ==== ZLAHQR/ZLAQR0 crossover point ====
+*
+         NMIN = ILAENV( 12, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
+         NMIN = MAX( NTINY, NMIN )
+*
+*        ==== Nibble crossover point ====
+*
+         NIBBLE = ILAENV( 14, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
+         NIBBLE = MAX( 0, NIBBLE )
+*
+*        ==== Accumulate reflections during ttswp?  Use block
+*        .    2-by-2 structure during matrix-matrix multiply? ====
+*
+         KACC22 = ILAENV( 16, 'ZLAQR4', JBCMPZ, N, ILO, IHI, LWORK )
+         KACC22 = MAX( 0, KACC22 )
+         KACC22 = MIN( 2, KACC22 )
+*
+*        ==== NWMAX = the largest possible deflation window for
+*        .    which there is sufficient workspace. ====
+*
+         NWMAX = MIN( ( N-1 ) / 3, LWORK / 2 )
+         NW = NWMAX
+*
+*        ==== NSMAX = the Largest number of simultaneous shifts
+*        .    for which there is sufficient workspace. ====
+*
+         NSMAX = MIN( ( N+6 ) / 9, 2*LWORK / 3 )
+         NSMAX = NSMAX - MOD( NSMAX, 2 )
+*
+*        ==== NDFL: an iteration count restarted at deflation. ====
+*
+         NDFL = 1
+*
+*        ==== ITMAX = iteration limit ====
+*
+         ITMAX = MAX( 30, 2*KEXSH )*MAX( 10, ( IHI-ILO+1 ) )
+*
+*        ==== Last row and column in the active block ====
+*
+         KBOT = IHI
+*
+*        ==== Main Loop ====
+*
+         DO 70 IT = 1, ITMAX
+*
+*           ==== Done when KBOT falls below ILO ====
+*
+            IF( KBOT.LT.ILO )
+     $         GO TO 80
+*
+*           ==== Locate active block ====
+*
+            DO 10 K = KBOT, ILO + 1, -1
+               IF( H( K, K-1 ).EQ.ZERO )
+     $            GO TO 20
+   10       CONTINUE
+            K = ILO
+   20       CONTINUE
+            KTOP = K
+*
+*           ==== Select deflation window size:
+*           .    Typical Case:
+*           .      If possible and advisable, nibble the entire
+*           .      active block.  If not, use size MIN(NWR,NWMAX)
+*           .      or MIN(NWR+1,NWMAX) depending upon which has
+*           .      the smaller corresponding subdiagonal entry
+*           .      (a heuristic).
+*           .
+*           .    Exceptional Case:
+*           .      If there have been no deflations in KEXNW or
+*           .      more iterations, then vary the deflation window
+*           .      size.   At first, because, larger windows are,
+*           .      in general, more powerful than smaller ones,
+*           .      rapidly increase the window to the maximum possible.
+*           .      Then, gradually reduce the window size. ====
+*
+            NH = KBOT - KTOP + 1
+            NWUPBD = MIN( NH, NWMAX )
+            IF( NDFL.LT.KEXNW ) THEN
+               NW = MIN( NWUPBD, NWR )
+            ELSE
+               NW = MIN( NWUPBD, 2*NW )
+            END IF
+            IF( NW.LT.NWMAX ) THEN
+               IF( NW.GE.NH-1 ) THEN
+                  NW = NH
+               ELSE
+                  KWTOP = KBOT - NW + 1
+                  IF( CABS1( H( KWTOP, KWTOP-1 ) ).GT.
+     $                CABS1( H( KWTOP-1, KWTOP-2 ) ) )NW = NW + 1
+               END IF
+            END IF
+            IF( NDFL.LT.KEXNW ) THEN
+               NDEC = -1
+            ELSE IF( NDEC.GE.0 .OR. NW.GE.NWUPBD ) THEN
+               NDEC = NDEC + 1
+               IF( NW-NDEC.LT.2 )
+     $            NDEC = 0
+               NW = NW - NDEC
+            END IF
+*
+*           ==== Aggressive early deflation:
+*           .    split workspace under the subdiagonal into
+*           .      - an nw-by-nw work array V in the lower
+*           .        left-hand-corner,
+*           .      - an NW-by-at-least-NW-but-more-is-better
+*           .        (NW-by-NHO) horizontal work array along
+*           .        the bottom edge,
+*           .      - an at-least-NW-but-more-is-better (NHV-by-NW)
+*           .        vertical work array along the left-hand-edge.
+*           .        ====
+*
+            KV = N - NW + 1
+            KT = NW + 1
+            NHO = ( N-NW-1 ) - KT + 1
+            KWV = NW + 2
+            NVE = ( N-NW ) - KWV + 1
+*
+*           ==== Aggressive early deflation ====
+*
+            CALL ZLAQR2( WANTT, WANTZ, N, KTOP, KBOT, NW, H, LDH, ILOZ,
+     $                   IHIZ, Z, LDZ, LS, LD, W, H( KV, 1 ), LDH, NHO,
+     $                   H( KV, KT ), LDH, NVE, H( KWV, 1 ), LDH, WORK,
+     $                   LWORK )
+*
+*           ==== Adjust KBOT accounting for new deflations. ====
+*
+            KBOT = KBOT - LD
+*
+*           ==== KS points to the shifts. ====
+*
+            KS = KBOT - LS + 1
+*
+*           ==== Skip an expensive QR sweep if there is a (partly
+*           .    heuristic) reason to expect that many eigenvalues
+*           .    will deflate without it.  Here, the QR sweep is
+*           .    skipped if many eigenvalues have just been deflated
+*           .    or if the remaining active block is small.
+*
+            IF( ( LD.EQ.0 ) .OR. ( ( 100*LD.LE.NW*NIBBLE ) .AND. ( KBOT-
+     $          KTOP+1.GT.MIN( NMIN, NWMAX ) ) ) ) THEN
+*
+*              ==== NS = nominal number of simultaneous shifts.
+*              .    This may be lowered (slightly) if ZLAQR2
+*              .    did not provide that many shifts. ====
+*
+               NS = MIN( NSMAX, NSR, MAX( 2, KBOT-KTOP ) )
+               NS = NS - MOD( NS, 2 )
+*
+*              ==== If there have been no deflations
+*              .    in a multiple of KEXSH iterations,
+*              .    then try exceptional shifts.
+*              .    Otherwise use shifts provided by
+*              .    ZLAQR2 above or from the eigenvalues
+*              .    of a trailing principal submatrix. ====
+*
+               IF( MOD( NDFL, KEXSH ).EQ.0 ) THEN
+                  KS = KBOT - NS + 1
+                  DO 30 I = KBOT, KS + 1, -2
+                     W( I ) = H( I, I ) + WILK1*CABS1( H( I, I-1 ) )
+                     W( I-1 ) = W( I )
+   30             CONTINUE
+               ELSE
+*
+*                 ==== Got NS/2 or fewer shifts? Use ZLAHQR
+*                 .    on a trailing principal submatrix to
+*                 .    get more. (Since NS.LE.NSMAX.LE.(N+6)/9,
+*                 .    there is enough space below the subdiagonal
+*                 .    to fit an NS-by-NS scratch array.) ====
+*
+                  IF( KBOT-KS+1.LE.NS / 2 ) THEN
+                     KS = KBOT - NS + 1
+                     KT = N - NS + 1
+                     CALL ZLACPY( 'A', NS, NS, H( KS, KS ), LDH,
+     $                            H( KT, 1 ), LDH )
+                     CALL ZLAHQR( .false., .false., NS, 1, NS,
+     $                            H( KT, 1 ), LDH, W( KS ), 1, 1, ZDUM,
+     $                            1, INF )
+                     KS = KS + INF
+*
+*                    ==== In case of a rare QR failure use
+*                    .    eigenvalues of the trailing 2-by-2
+*                    .    principal submatrix.  Scale to avoid
+*                    .    overflows, underflows and subnormals.
+*                    .    (The scale factor S can not be zero,
+*                    .    because H(KBOT,KBOT-1) is nonzero.) ====
+*
+                     IF( KS.GE.KBOT ) THEN
+                        S = CABS1( H( KBOT-1, KBOT-1 ) ) +
+     $                      CABS1( H( KBOT, KBOT-1 ) ) +
+     $                      CABS1( H( KBOT-1, KBOT ) ) +
+     $                      CABS1( H( KBOT, KBOT ) )
+                        AA = H( KBOT-1, KBOT-1 ) / S
+                        CC = H( KBOT, KBOT-1 ) / S
+                        BB = H( KBOT-1, KBOT ) / S
+                        DD = H( KBOT, KBOT ) / S
+                        TR2 = ( AA+DD ) / TWO
+                        DET = ( AA-TR2 )*( DD-TR2 ) - BB*CC
+                        RTDISC = SQRT( -DET )
+                        W( KBOT-1 ) = ( TR2+RTDISC )*S
+                        W( KBOT ) = ( TR2-RTDISC )*S
+*
+                        KS = KBOT - 1
+                     END IF
+                  END IF
+*
+                  IF( KBOT-KS+1.GT.NS ) THEN
+*
+*                    ==== Sort the shifts (Helps a little) ====
+*
+                     SORTED = .false.
+                     DO 50 K = KBOT, KS + 1, -1
+                        IF( SORTED )
+     $                     GO TO 60
+                        SORTED = .true.
+                        DO 40 I = KS, K - 1
+                           IF( CABS1( W( I ) ).LT.CABS1( W( I+1 ) ) )
+     $                          THEN
+                              SORTED = .false.
+                              SWAP = W( I )
+                              W( I ) = W( I+1 )
+                              W( I+1 ) = SWAP
+                           END IF
+   40                   CONTINUE
+   50                CONTINUE
+   60                CONTINUE
+                  END IF
+               END IF
+*
+*              ==== If there are only two shifts, then use
+*              .    only one.  ====
+*
+               IF( KBOT-KS+1.EQ.2 ) THEN
+                  IF( CABS1( W( KBOT )-H( KBOT, KBOT ) ).LT.
+     $                CABS1( W( KBOT-1 )-H( KBOT, KBOT ) ) ) THEN
+                     W( KBOT-1 ) = W( KBOT )
+                  ELSE
+                     W( KBOT ) = W( KBOT-1 )
+                  END IF
+               END IF
+*
+*              ==== Use up to NS of the the smallest magnatiude
+*              .    shifts.  If there aren't NS shifts available,
+*              .    then use them all, possibly dropping one to
+*              .    make the number of shifts even. ====
+*
+               NS = MIN( NS, KBOT-KS+1 )
+               NS = NS - MOD( NS, 2 )
+               KS = KBOT - NS + 1
+*
+*              ==== Small-bulge multi-shift QR sweep:
+*              .    split workspace under the subdiagonal into
+*              .    - a KDU-by-KDU work array U in the lower
+*              .      left-hand-corner,
+*              .    - a KDU-by-at-least-KDU-but-more-is-better
+*              .      (KDU-by-NHo) horizontal work array WH along
+*              .      the bottom edge,
+*              .    - and an at-least-KDU-but-more-is-better-by-KDU
+*              .      (NVE-by-KDU) vertical work WV arrow along
+*              .      the left-hand-edge. ====
+*
+               KDU = 3*NS - 3
+               KU = N - KDU + 1
+               KWH = KDU + 1
+               NHO = ( N-KDU+1-4 ) - ( KDU+1 ) + 1
+               KWV = KDU + 4
+               NVE = N - KDU - KWV + 1
+*
+*              ==== Small-bulge multi-shift QR sweep ====
+*
+               CALL ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NS,
+     $                      W( KS ), H, LDH, ILOZ, IHIZ, Z, LDZ, WORK,
+     $                      3, H( KU, 1 ), LDH, NVE, H( KWV, 1 ), LDH,
+     $                      NHO, H( KU, KWH ), LDH )
+            END IF
+*
+*           ==== Note progress (or the lack of it). ====
+*
+            IF( LD.GT.0 ) THEN
+               NDFL = 1
+            ELSE
+               NDFL = NDFL + 1
+            END IF
+*
+*           ==== End of main loop ====
+   70    CONTINUE
+*
+*        ==== Iteration limit exceeded.  Set INFO to show where
+*        .    the problem occurred and exit. ====
+*
+         INFO = KBOT
+   80    CONTINUE
+      END IF
+*
+*     ==== Return the optimal value of LWORK. ====
+*
+      WORK( 1 ) = DCMPLX( LWKOPT, 0 )
+*
+*     ==== End of ZLAQR4 ====
+*
+      END
+*> \brief \b ZLAQR5 performs a single small-bulge multi-shift QR sweep.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLAQR5 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaqr5.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaqr5.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaqr5.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
+*                          H, LDH, ILOZ, IHIZ, Z, LDZ, V, LDV, U, LDU, NV,
+*                          WV, LDWV, NH, WH, LDWH )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHIZ, ILOZ, KACC22, KBOT, KTOP, LDH, LDU, LDV,
+*      $                   LDWH, LDWV, LDZ, N, NH, NSHFTS, NV
+*       LOGICAL            WANTT, WANTZ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         H( LDH, * ), S( * ), U( LDU, * ), V( LDV, * ),
+*      $                   WH( LDWH, * ), WV( LDWV, * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>    ZLAQR5, called by ZLAQR0, performs a
+*>    single small-bulge multi-shift QR sweep.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] WANTT
+*> \verbatim
+*>          WANTT is logical scalar
+*>             WANTT = .true. if the triangular Schur factor
+*>             is being computed.  WANTT is set to .false. otherwise.
+*> \endverbatim
+*>
+*> \param[in] WANTZ
+*> \verbatim
+*>          WANTZ is logical scalar
+*>             WANTZ = .true. if the unitary Schur factor is being
+*>             computed.  WANTZ is set to .false. otherwise.
+*> \endverbatim
+*>
+*> \param[in] KACC22
+*> \verbatim
+*>          KACC22 is integer with value 0, 1, or 2.
+*>             Specifies the computation mode of far-from-diagonal
+*>             orthogonal updates.
+*>        = 0: ZLAQR5 does not accumulate reflections and does not
+*>             use matrix-matrix multiply to update far-from-diagonal
+*>             matrix entries.
+*>        = 1: ZLAQR5 accumulates reflections and uses matrix-matrix
+*>             multiply to update the far-from-diagonal matrix entries.
+*>        = 2: ZLAQR5 accumulates reflections, uses matrix-matrix
+*>             multiply to update the far-from-diagonal matrix entries,
+*>             and takes advantage of 2-by-2 block structure during
+*>             matrix multiplies.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is integer scalar
+*>             N is the order of the Hessenberg matrix H upon which this
+*>             subroutine operates.
+*> \endverbatim
+*>
+*> \param[in] KTOP
+*> \verbatim
+*>          KTOP is integer scalar
+*> \endverbatim
+*>
+*> \param[in] KBOT
+*> \verbatim
+*>          KBOT is integer scalar
+*>             These are the first and last rows and columns of an
+*>             isolated diagonal block upon which the QR sweep is to be
+*>             applied. It is assumed without a check that
+*>                       either KTOP = 1  or   H(KTOP,KTOP-1) = 0
+*>             and
+*>                       either KBOT = N  or   H(KBOT+1,KBOT) = 0.
+*> \endverbatim
+*>
+*> \param[in] NSHFTS
+*> \verbatim
+*>          NSHFTS is integer scalar
+*>             NSHFTS gives the number of simultaneous shifts.  NSHFTS
+*>             must be positive and even.
+*> \endverbatim
+*>
+*> \param[in,out] S
+*> \verbatim
+*>          S is COMPLEX*16 array of size (NSHFTS)
+*>             S contains the shifts of origin that define the multi-
+*>             shift QR sweep.  On output S may be reordered.
+*> \endverbatim
+*>
+*> \param[in,out] H
+*> \verbatim
+*>          H is COMPLEX*16 array of size (LDH,N)
+*>             On input H contains a Hessenberg matrix.  On output a
+*>             multi-shift QR sweep with shifts SR(J)+i*SI(J) is applied
+*>             to the isolated diagonal block in rows and columns KTOP
+*>             through KBOT.
+*> \endverbatim
+*>
+*> \param[in] LDH
+*> \verbatim
+*>          LDH is integer scalar
+*>             LDH is the leading dimension of H just as declared in the
+*>             calling procedure.  LDH.GE.MAX(1,N).
+*> \endverbatim
+*>
+*> \param[in] ILOZ
+*> \verbatim
+*>          ILOZ is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHIZ
+*> \verbatim
+*>          IHIZ is INTEGER
+*>             Specify the rows of Z to which transformations must be
+*>             applied if WANTZ is .TRUE.. 1 .LE. ILOZ .LE. IHIZ .LE. N
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array of size (LDZ,IHI)
+*>             If WANTZ = .TRUE., then the QR Sweep unitary
+*>             similarity transformation is accumulated into
+*>             Z(ILOZ:IHIZ,ILO:IHI) from the right.
+*>             If WANTZ = .FALSE., then Z is unreferenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is integer scalar
+*>             LDA is the leading dimension of Z just as declared in
+*>             the calling procedure. LDZ.GE.N.
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is COMPLEX*16 array of size (LDV,NSHFTS/2)
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is integer scalar
+*>             LDV is the leading dimension of V as declared in the
+*>             calling procedure.  LDV.GE.3.
+*> \endverbatim
+*>
+*> \param[out] U
+*> \verbatim
+*>          U is COMPLEX*16 array of size
+*>             (LDU,3*NSHFTS-3)
+*> \endverbatim
+*>
+*> \param[in] LDU
+*> \verbatim
+*>          LDU is integer scalar
+*>             LDU is the leading dimension of U just as declared in the
+*>             in the calling subroutine.  LDU.GE.3*NSHFTS-3.
+*> \endverbatim
+*>
+*> \param[in] NH
+*> \verbatim
+*>          NH is integer scalar
+*>             NH is the number of columns in array WH available for
+*>             workspace. NH.GE.1.
+*> \endverbatim
+*>
+*> \param[out] WH
+*> \verbatim
+*>          WH is COMPLEX*16 array of size (LDWH,NH)
+*> \endverbatim
+*>
+*> \param[in] LDWH
+*> \verbatim
+*>          LDWH is integer scalar
+*>             Leading dimension of WH just as declared in the
+*>             calling procedure.  LDWH.GE.3*NSHFTS-3.
+*> \endverbatim
+*>
+*> \param[in] NV
+*> \verbatim
+*>          NV is integer scalar
+*>             NV is the number of rows in WV agailable for workspace.
+*>             NV.GE.1.
+*> \endverbatim
+*>
+*> \param[out] WV
+*> \verbatim
+*>          WV is COMPLEX*16 array of size
+*>             (LDWV,3*NSHFTS-3)
+*> \endverbatim
+*>
+*> \param[in] LDWV
+*> \verbatim
+*>          LDWV is integer scalar
+*>             LDWV is the leading dimension of WV as declared in the
+*>             in the calling subroutine.  LDWV.GE.NV.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>       Karen Braman and Ralph Byers, Department of Mathematics,
+*>       University of Kansas, USA
+*
+*> \par References:
+*  ================
+*>
+*>       K. Braman, R. Byers and R. Mathias, The Multi-Shift QR
+*>       Algorithm Part I: Maintaining Well Focused Shifts, and Level 3
+*>       Performance, SIAM Journal of Matrix Analysis, volume 23, pages
+*>       929--947, 2002.
+*>
+*  =====================================================================
+      SUBROUTINE ZLAQR5( WANTT, WANTZ, KACC22, N, KTOP, KBOT, NSHFTS, S,
+     $                   H, LDH, ILOZ, IHIZ, Z, LDZ, V, LDV, U, LDU, NV,
+     $                   WV, LDWV, NH, WH, LDWH )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            IHIZ, ILOZ, KACC22, KBOT, KTOP, LDH, LDU, LDV,
+     $                   LDWH, LDWV, LDZ, N, NH, NSHFTS, NV
+      LOGICAL            WANTT, WANTZ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         H( LDH, * ), S( * ), U( LDU, * ), V( LDV, * ),
+     $                   WH( LDWH, * ), WV( LDWV, * ), Z( LDZ, * )
+*     ..
+*
+*  ================================================================
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0d0, 0.0d0 ),
+     $                   ONE = ( 1.0d0, 0.0d0 ) )
+      DOUBLE PRECISION   RZERO, RONE
+      PARAMETER          ( RZERO = 0.0d0, RONE = 1.0d0 )
+*     ..
+*     .. Local Scalars ..
+      COMPLEX*16         ALPHA, BETA, CDUM, REFSUM
+      DOUBLE PRECISION   H11, H12, H21, H22, SAFMAX, SAFMIN, SCL,
+     $                   SMLNUM, TST1, TST2, ULP
+      INTEGER            I2, I4, INCOL, J, J2, J4, JBOT, JCOL, JLEN,
+     $                   JROW, JTOP, K, K1, KDU, KMS, KNZ, KRCOL, KZS,
+     $                   M, M22, MBOT, MEND, MSTART, MTOP, NBMPS, NDCOL,
+     $                   NS, NU
+      LOGICAL            ACCUM, BLK22, BMP22
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
+*     ..
+*     .. Intrinsic Functions ..
+*
+      INTRINSIC          ABS, DBLE, DCONJG, DIMAG, MAX, MIN, MOD
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         VT( 3 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLABAD, ZGEMM, ZLACPY, ZLAQR1, ZLARFG, ZLASET,
+     $                   ZTRMM
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+*     ..
+*     .. Executable Statements ..
+*
+*     ==== If there are no shifts, then there is nothing to do. ====
+*
+      IF( NSHFTS.LT.2 )
+     $   RETURN
+*
+*     ==== If the active block is empty or 1-by-1, then there
+*     .    is nothing to do. ====
+*
+      IF( KTOP.GE.KBOT )
+     $   RETURN
+*
+*     ==== NSHFTS is supposed to be even, but if it is odd,
+*     .    then simply reduce it by one.  ====
+*
+      NS = NSHFTS - MOD( NSHFTS, 2 )
+*
+*     ==== Machine constants for deflation ====
+*
+      SAFMIN = DLAMCH( 'SAFE MINIMUM' )
+      SAFMAX = RONE / SAFMIN
+      CALL DLABAD( SAFMIN, SAFMAX )
+      ULP = DLAMCH( 'PRECISION' )
+      SMLNUM = SAFMIN*( DBLE( N ) / ULP )
+*
+*     ==== Use accumulated reflections to update far-from-diagonal
+*     .    entries ? ====
+*
+      ACCUM = ( KACC22.EQ.1 ) .OR. ( KACC22.EQ.2 )
+*
+*     ==== If so, exploit the 2-by-2 block structure? ====
+*
+      BLK22 = ( NS.GT.2 ) .AND. ( KACC22.EQ.2 )
+*
+*     ==== clear trash ====
+*
+      IF( KTOP+2.LE.KBOT )
+     $   H( KTOP+2, KTOP ) = ZERO
+*
+*     ==== NBMPS = number of 2-shift bulges in the chain ====
+*
+      NBMPS = NS / 2
+*
+*     ==== KDU = width of slab ====
+*
+      KDU = 6*NBMPS - 3
+*
+*     ==== Create and chase chains of NBMPS bulges ====
+*
+      DO 210 INCOL = 3*( 1-NBMPS ) + KTOP - 1, KBOT - 2, 3*NBMPS - 2
+         NDCOL = INCOL + KDU
+         IF( ACCUM )
+     $      CALL ZLASET( 'ALL', KDU, KDU, ZERO, ONE, U, LDU )
+*
+*        ==== Near-the-diagonal bulge chase.  The following loop
+*        .    performs the near-the-diagonal part of a small bulge
+*        .    multi-shift QR sweep.  Each 6*NBMPS-2 column diagonal
+*        .    chunk extends from column INCOL to column NDCOL
+*        .    (including both column INCOL and column NDCOL). The
+*        .    following loop chases a 3*NBMPS column long chain of
+*        .    NBMPS bulges 3*NBMPS-2 columns to the right.  (INCOL
+*        .    may be less than KTOP and and NDCOL may be greater than
+*        .    KBOT indicating phantom columns from which to chase
+*        .    bulges before they are actually introduced or to which
+*        .    to chase bulges beyond column KBOT.)  ====
+*
+         DO 140 KRCOL = INCOL, MIN( INCOL+3*NBMPS-3, KBOT-2 )
+*
+*           ==== Bulges number MTOP to MBOT are active double implicit
+*           .    shift bulges.  There may or may not also be small
+*           .    2-by-2 bulge, if there is room.  The inactive bulges
+*           .    (if any) must wait until the active bulges have moved
+*           .    down the diagonal to make room.  The phantom matrix
+*           .    paradigm described above helps keep track.  ====
+*
+            MTOP = MAX( 1, ( ( KTOP-1 )-KRCOL+2 ) / 3+1 )
+            MBOT = MIN( NBMPS, ( KBOT-KRCOL ) / 3 )
+            M22 = MBOT + 1
+            BMP22 = ( MBOT.LT.NBMPS ) .AND. ( KRCOL+3*( M22-1 ) ).EQ.
+     $              ( KBOT-2 )
+*
+*           ==== Generate reflections to chase the chain right
+*           .    one column.  (The minimum value of K is KTOP-1.) ====
+*
+            DO 10 M = MTOP, MBOT
+               K = KRCOL + 3*( M-1 )
+               IF( K.EQ.KTOP-1 ) THEN
+                  CALL ZLAQR1( 3, H( KTOP, KTOP ), LDH, S( 2*M-1 ),
+     $                         S( 2*M ), V( 1, M ) )
+                  ALPHA = V( 1, M )
+                  CALL ZLARFG( 3, ALPHA, V( 2, M ), 1, V( 1, M ) )
+               ELSE
+                  BETA = H( K+1, K )
+                  V( 2, M ) = H( K+2, K )
+                  V( 3, M ) = H( K+3, K )
+                  CALL ZLARFG( 3, BETA, V( 2, M ), 1, V( 1, M ) )
+*
+*                 ==== A Bulge may collapse because of vigilant
+*                 .    deflation or destructive underflow.  In the
+*                 .    underflow case, try the two-small-subdiagonals
+*                 .    trick to try to reinflate the bulge.  ====
+*
+                  IF( H( K+3, K ).NE.ZERO .OR. H( K+3, K+1 ).NE.
+     $                ZERO .OR. H( K+3, K+2 ).EQ.ZERO ) THEN
+*
+*                    ==== Typical case: not collapsed (yet). ====
+*
+                     H( K+1, K ) = BETA
+                     H( K+2, K ) = ZERO
+                     H( K+3, K ) = ZERO
+                  ELSE
+*
+*                    ==== Atypical case: collapsed.  Attempt to
+*                    .    reintroduce ignoring H(K+1,K) and H(K+2,K).
+*                    .    If the fill resulting from the new
+*                    .    reflector is too large, then abandon it.
+*                    .    Otherwise, use the new one. ====
+*
+                     CALL ZLAQR1( 3, H( K+1, K+1 ), LDH, S( 2*M-1 ),
+     $                            S( 2*M ), VT )
+                     ALPHA = VT( 1 )
+                     CALL ZLARFG( 3, ALPHA, VT( 2 ), 1, VT( 1 ) )
+                     REFSUM = DCONJG( VT( 1 ) )*
+     $                        ( H( K+1, K )+DCONJG( VT( 2 ) )*
+     $                        H( K+2, K ) )
+*
+                     IF( CABS1( H( K+2, K )-REFSUM*VT( 2 ) )+
+     $                   CABS1( REFSUM*VT( 3 ) ).GT.ULP*
+     $                   ( CABS1( H( K, K ) )+CABS1( H( K+1,
+     $                   K+1 ) )+CABS1( H( K+2, K+2 ) ) ) ) THEN
+*
+*                       ==== Starting a new bulge here would
+*                       .    create non-negligible fill.  Use
+*                       .    the old one with trepidation. ====
+*
+                        H( K+1, K ) = BETA
+                        H( K+2, K ) = ZERO
+                        H( K+3, K ) = ZERO
+                     ELSE
+*
+*                       ==== Stating a new bulge here would
+*                       .    create only negligible fill.
+*                       .    Replace the old reflector with
+*                       .    the new one. ====
+*
+                        H( K+1, K ) = H( K+1, K ) - REFSUM
+                        H( K+2, K ) = ZERO
+                        H( K+3, K ) = ZERO
+                        V( 1, M ) = VT( 1 )
+                        V( 2, M ) = VT( 2 )
+                        V( 3, M ) = VT( 3 )
+                     END IF
+                  END IF
+               END IF
+   10       CONTINUE
+*
+*           ==== Generate a 2-by-2 reflection, if needed. ====
+*
+            K = KRCOL + 3*( M22-1 )
+            IF( BMP22 ) THEN
+               IF( K.EQ.KTOP-1 ) THEN
+                  CALL ZLAQR1( 2, H( K+1, K+1 ), LDH, S( 2*M22-1 ),
+     $                         S( 2*M22 ), V( 1, M22 ) )
+                  BETA = V( 1, M22 )
+                  CALL ZLARFG( 2, BETA, V( 2, M22 ), 1, V( 1, M22 ) )
+               ELSE
+                  BETA = H( K+1, K )
+                  V( 2, M22 ) = H( K+2, K )
+                  CALL ZLARFG( 2, BETA, V( 2, M22 ), 1, V( 1, M22 ) )
+                  H( K+1, K ) = BETA
+                  H( K+2, K ) = ZERO
+               END IF
+            END IF
+*
+*           ==== Multiply H by reflections from the left ====
+*
+            IF( ACCUM ) THEN
+               JBOT = MIN( NDCOL, KBOT )
+            ELSE IF( WANTT ) THEN
+               JBOT = N
+            ELSE
+               JBOT = KBOT
+            END IF
+            DO 30 J = MAX( KTOP, KRCOL ), JBOT
+               MEND = MIN( MBOT, ( J-KRCOL+2 ) / 3 )
+               DO 20 M = MTOP, MEND
+                  K = KRCOL + 3*( M-1 )
+                  REFSUM = DCONJG( V( 1, M ) )*
+     $                     ( H( K+1, J )+DCONJG( V( 2, M ) )*
+     $                     H( K+2, J )+DCONJG( V( 3, M ) )*H( K+3, J ) )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M )
+                  H( K+3, J ) = H( K+3, J ) - REFSUM*V( 3, M )
+   20          CONTINUE
+   30       CONTINUE
+            IF( BMP22 ) THEN
+               K = KRCOL + 3*( M22-1 )
+               DO 40 J = MAX( K+1, KTOP ), JBOT
+                  REFSUM = DCONJG( V( 1, M22 ) )*
+     $                     ( H( K+1, J )+DCONJG( V( 2, M22 ) )*
+     $                     H( K+2, J ) )
+                  H( K+1, J ) = H( K+1, J ) - REFSUM
+                  H( K+2, J ) = H( K+2, J ) - REFSUM*V( 2, M22 )
+   40          CONTINUE
+            END IF
+*
+*           ==== Multiply H by reflections from the right.
+*           .    Delay filling in the last row until the
+*           .    vigilant deflation check is complete. ====
+*
+            IF( ACCUM ) THEN
+               JTOP = MAX( KTOP, INCOL )
+            ELSE IF( WANTT ) THEN
+               JTOP = 1
+            ELSE
+               JTOP = KTOP
+            END IF
+            DO 80 M = MTOP, MBOT
+               IF( V( 1, M ).NE.ZERO ) THEN
+                  K = KRCOL + 3*( M-1 )
+                  DO 50 J = JTOP, MIN( KBOT, K+3 )
+                     REFSUM = V( 1, M )*( H( J, K+1 )+V( 2, M )*
+     $                        H( J, K+2 )+V( 3, M )*H( J, K+3 ) )
+                     H( J, K+1 ) = H( J, K+1 ) - REFSUM
+                     H( J, K+2 ) = H( J, K+2 ) -
+     $                             REFSUM*DCONJG( V( 2, M ) )
+                     H( J, K+3 ) = H( J, K+3 ) -
+     $                             REFSUM*DCONJG( V( 3, M ) )
+   50             CONTINUE
+*
+                  IF( ACCUM ) THEN
+*
+*                    ==== Accumulate U. (If necessary, update Z later
+*                    .    with with an efficient matrix-matrix
+*                    .    multiply.) ====
+*
+                     KMS = K - INCOL
+                     DO 60 J = MAX( 1, KTOP-INCOL ), KDU
+                        REFSUM = V( 1, M )*( U( J, KMS+1 )+V( 2, M )*
+     $                           U( J, KMS+2 )+V( 3, M )*U( J, KMS+3 ) )
+                        U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
+                        U( J, KMS+2 ) = U( J, KMS+2 ) -
+     $                                  REFSUM*DCONJG( V( 2, M ) )
+                        U( J, KMS+3 ) = U( J, KMS+3 ) -
+     $                                  REFSUM*DCONJG( V( 3, M ) )
+   60                CONTINUE
+                  ELSE IF( WANTZ ) THEN
+*
+*                    ==== U is not accumulated, so update Z
+*                    .    now by multiplying by reflections
+*                    .    from the right. ====
+*
+                     DO 70 J = ILOZ, IHIZ
+                        REFSUM = V( 1, M )*( Z( J, K+1 )+V( 2, M )*
+     $                           Z( J, K+2 )+V( 3, M )*Z( J, K+3 ) )
+                        Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
+                        Z( J, K+2 ) = Z( J, K+2 ) -
+     $                                REFSUM*DCONJG( V( 2, M ) )
+                        Z( J, K+3 ) = Z( J, K+3 ) -
+     $                                REFSUM*DCONJG( V( 3, M ) )
+   70                CONTINUE
+                  END IF
+               END IF
+   80       CONTINUE
+*
+*           ==== Special case: 2-by-2 reflection (if needed) ====
+*
+            K = KRCOL + 3*( M22-1 )
+            IF( BMP22 ) THEN
+               IF ( V( 1, M22 ).NE.ZERO ) THEN
+                  DO 90 J = JTOP, MIN( KBOT, K+3 )
+                     REFSUM = V( 1, M22 )*( H( J, K+1 )+V( 2, M22 )*
+     $                        H( J, K+2 ) )
+                     H( J, K+1 ) = H( J, K+1 ) - REFSUM
+                     H( J, K+2 ) = H( J, K+2 ) -
+     $                             REFSUM*DCONJG( V( 2, M22 ) )
+   90             CONTINUE
+*
+                  IF( ACCUM ) THEN
+                     KMS = K - INCOL
+                     DO 100 J = MAX( 1, KTOP-INCOL ), KDU
+                        REFSUM = V( 1, M22 )*( U( J, KMS+1 )+
+     $                           V( 2, M22 )*U( J, KMS+2 ) )
+                        U( J, KMS+1 ) = U( J, KMS+1 ) - REFSUM
+                        U( J, KMS+2 ) = U( J, KMS+2 ) -
+     $                                  REFSUM*DCONJG( V( 2, M22 ) )
+  100                CONTINUE
+                  ELSE IF( WANTZ ) THEN
+                     DO 110 J = ILOZ, IHIZ
+                        REFSUM = V( 1, M22 )*( Z( J, K+1 )+V( 2, M22 )*
+     $                           Z( J, K+2 ) )
+                        Z( J, K+1 ) = Z( J, K+1 ) - REFSUM
+                        Z( J, K+2 ) = Z( J, K+2 ) -
+     $                                REFSUM*DCONJG( V( 2, M22 ) )
+  110                CONTINUE
+                  END IF
+               END IF
+            END IF
+*
+*           ==== Vigilant deflation check ====
+*
+            MSTART = MTOP
+            IF( KRCOL+3*( MSTART-1 ).LT.KTOP )
+     $         MSTART = MSTART + 1
+            MEND = MBOT
+            IF( BMP22 )
+     $         MEND = MEND + 1
+            IF( KRCOL.EQ.KBOT-2 )
+     $         MEND = MEND + 1
+            DO 120 M = MSTART, MEND
+               K = MIN( KBOT-1, KRCOL+3*( M-1 ) )
+*
+*              ==== The following convergence test requires that
+*              .    the tradition small-compared-to-nearby-diagonals
+*              .    criterion and the Ahues & Tisseur (LAWN 122, 1997)
+*              .    criteria both be satisfied.  The latter improves
+*              .    accuracy in some examples. Falling back on an
+*              .    alternate convergence criterion when TST1 or TST2
+*              .    is zero (as done here) is traditional but probably
+*              .    unnecessary. ====
+*
+               IF( H( K+1, K ).NE.ZERO ) THEN
+                  TST1 = CABS1( H( K, K ) ) + CABS1( H( K+1, K+1 ) )
+                  IF( TST1.EQ.RZERO ) THEN
+                     IF( K.GE.KTOP+1 )
+     $                  TST1 = TST1 + CABS1( H( K, K-1 ) )
+                     IF( K.GE.KTOP+2 )
+     $                  TST1 = TST1 + CABS1( H( K, K-2 ) )
+                     IF( K.GE.KTOP+3 )
+     $                  TST1 = TST1 + CABS1( H( K, K-3 ) )
+                     IF( K.LE.KBOT-2 )
+     $                  TST1 = TST1 + CABS1( H( K+2, K+1 ) )
+                     IF( K.LE.KBOT-3 )
+     $                  TST1 = TST1 + CABS1( H( K+3, K+1 ) )
+                     IF( K.LE.KBOT-4 )
+     $                  TST1 = TST1 + CABS1( H( K+4, K+1 ) )
+                  END IF
+                  IF( CABS1( H( K+1, K ) ).LE.MAX( SMLNUM, ULP*TST1 ) )
+     $                 THEN
+                     H12 = MAX( CABS1( H( K+1, K ) ),
+     $                     CABS1( H( K, K+1 ) ) )
+                     H21 = MIN( CABS1( H( K+1, K ) ),
+     $                     CABS1( H( K, K+1 ) ) )
+                     H11 = MAX( CABS1( H( K+1, K+1 ) ),
+     $                     CABS1( H( K, K )-H( K+1, K+1 ) ) )
+                     H22 = MIN( CABS1( H( K+1, K+1 ) ),
+     $                     CABS1( H( K, K )-H( K+1, K+1 ) ) )
+                     SCL = H11 + H12
+                     TST2 = H22*( H11 / SCL )
+*
+                     IF( TST2.EQ.RZERO .OR. H21*( H12 / SCL ).LE.
+     $                   MAX( SMLNUM, ULP*TST2 ) )H( K+1, K ) = ZERO
+                  END IF
+               END IF
+  120       CONTINUE
+*
+*           ==== Fill in the last row of each bulge. ====
+*
+            MEND = MIN( NBMPS, ( KBOT-KRCOL-1 ) / 3 )
+            DO 130 M = MTOP, MEND
+               K = KRCOL + 3*( M-1 )
+               REFSUM = V( 1, M )*V( 3, M )*H( K+4, K+3 )
+               H( K+4, K+1 ) = -REFSUM
+               H( K+4, K+2 ) = -REFSUM*DCONJG( V( 2, M ) )
+               H( K+4, K+3 ) = H( K+4, K+3 ) -
+     $                         REFSUM*DCONJG( V( 3, M ) )
+  130       CONTINUE
+*
+*           ==== End of near-the-diagonal bulge chase. ====
+*
+  140    CONTINUE
+*
+*        ==== Use U (if accumulated) to update far-from-diagonal
+*        .    entries in H.  If required, use U to update Z as
+*        .    well. ====
+*
+         IF( ACCUM ) THEN
+            IF( WANTT ) THEN
+               JTOP = 1
+               JBOT = N
+            ELSE
+               JTOP = KTOP
+               JBOT = KBOT
+            END IF
+            IF( ( .NOT.BLK22 ) .OR. ( INCOL.LT.KTOP ) .OR.
+     $          ( NDCOL.GT.KBOT ) .OR. ( NS.LE.2 ) ) THEN
+*
+*              ==== Updates not exploiting the 2-by-2 block
+*              .    structure of U.  K1 and NU keep track of
+*              .    the location and size of U in the special
+*              .    cases of introducing bulges and chasing
+*              .    bulges off the bottom.  In these special
+*              .    cases and in case the number of shifts
+*              .    is NS = 2, there is no 2-by-2 block
+*              .    structure to exploit.  ====
+*
+               K1 = MAX( 1, KTOP-INCOL )
+               NU = ( KDU-MAX( 0, NDCOL-KBOT ) ) - K1 + 1
+*
+*              ==== Horizontal Multiply ====
+*
+               DO 150 JCOL = MIN( NDCOL, KBOT ) + 1, JBOT, NH
+                  JLEN = MIN( NH, JBOT-JCOL+1 )
+                  CALL ZGEMM( 'C', 'N', NU, JLEN, NU, ONE, U( K1, K1 ),
+     $                        LDU, H( INCOL+K1, JCOL ), LDH, ZERO, WH,
+     $                        LDWH )
+                  CALL ZLACPY( 'ALL', NU, JLEN, WH, LDWH,
+     $                         H( INCOL+K1, JCOL ), LDH )
+  150          CONTINUE
+*
+*              ==== Vertical multiply ====
+*
+               DO 160 JROW = JTOP, MAX( KTOP, INCOL ) - 1, NV
+                  JLEN = MIN( NV, MAX( KTOP, INCOL )-JROW )
+                  CALL ZGEMM( 'N', 'N', JLEN, NU, NU, ONE,
+     $                        H( JROW, INCOL+K1 ), LDH, U( K1, K1 ),
+     $                        LDU, ZERO, WV, LDWV )
+                  CALL ZLACPY( 'ALL', JLEN, NU, WV, LDWV,
+     $                         H( JROW, INCOL+K1 ), LDH )
+  160          CONTINUE
+*
+*              ==== Z multiply (also vertical) ====
+*
+               IF( WANTZ ) THEN
+                  DO 170 JROW = ILOZ, IHIZ, NV
+                     JLEN = MIN( NV, IHIZ-JROW+1 )
+                     CALL ZGEMM( 'N', 'N', JLEN, NU, NU, ONE,
+     $                           Z( JROW, INCOL+K1 ), LDZ, U( K1, K1 ),
+     $                           LDU, ZERO, WV, LDWV )
+                     CALL ZLACPY( 'ALL', JLEN, NU, WV, LDWV,
+     $                            Z( JROW, INCOL+K1 ), LDZ )
+  170             CONTINUE
+               END IF
+            ELSE
+*
+*              ==== Updates exploiting U's 2-by-2 block structure.
+*              .    (I2, I4, J2, J4 are the last rows and columns
+*              .    of the blocks.) ====
+*
+               I2 = ( KDU+1 ) / 2
+               I4 = KDU
+               J2 = I4 - I2
+               J4 = KDU
+*
+*              ==== KZS and KNZ deal with the band of zeros
+*              .    along the diagonal of one of the triangular
+*              .    blocks. ====
+*
+               KZS = ( J4-J2 ) - ( NS+1 )
+               KNZ = NS + 1
+*
+*              ==== Horizontal multiply ====
+*
+               DO 180 JCOL = MIN( NDCOL, KBOT ) + 1, JBOT, NH
+                  JLEN = MIN( NH, JBOT-JCOL+1 )
+*
+*                 ==== Copy bottom of H to top+KZS of scratch ====
+*                  (The first KZS rows get multiplied by zero.) ====
+*
+                  CALL ZLACPY( 'ALL', KNZ, JLEN, H( INCOL+1+J2, JCOL ),
+     $                         LDH, WH( KZS+1, 1 ), LDWH )
+*
+*                 ==== Multiply by U21**H ====
+*
+                  CALL ZLASET( 'ALL', KZS, JLEN, ZERO, ZERO, WH, LDWH )
+                  CALL ZTRMM( 'L', 'U', 'C', 'N', KNZ, JLEN, ONE,
+     $                        U( J2+1, 1+KZS ), LDU, WH( KZS+1, 1 ),
+     $                        LDWH )
+*
+*                 ==== Multiply top of H by U11**H ====
+*
+                  CALL ZGEMM( 'C', 'N', I2, JLEN, J2, ONE, U, LDU,
+     $                        H( INCOL+1, JCOL ), LDH, ONE, WH, LDWH )
+*
+*                 ==== Copy top of H to bottom of WH ====
+*
+                  CALL ZLACPY( 'ALL', J2, JLEN, H( INCOL+1, JCOL ), LDH,
+     $                         WH( I2+1, 1 ), LDWH )
+*
+*                 ==== Multiply by U21**H ====
+*
+                  CALL ZTRMM( 'L', 'L', 'C', 'N', J2, JLEN, ONE,
+     $                        U( 1, I2+1 ), LDU, WH( I2+1, 1 ), LDWH )
+*
+*                 ==== Multiply by U22 ====
+*
+                  CALL ZGEMM( 'C', 'N', I4-I2, JLEN, J4-J2, ONE,
+     $                        U( J2+1, I2+1 ), LDU,
+     $                        H( INCOL+1+J2, JCOL ), LDH, ONE,
+     $                        WH( I2+1, 1 ), LDWH )
+*
+*                 ==== Copy it back ====
+*
+                  CALL ZLACPY( 'ALL', KDU, JLEN, WH, LDWH,
+     $                         H( INCOL+1, JCOL ), LDH )
+  180          CONTINUE
+*
+*              ==== Vertical multiply ====
+*
+               DO 190 JROW = JTOP, MAX( INCOL, KTOP ) - 1, NV
+                  JLEN = MIN( NV, MAX( INCOL, KTOP )-JROW )
+*
+*                 ==== Copy right of H to scratch (the first KZS
+*                 .    columns get multiplied by zero) ====
+*
+                  CALL ZLACPY( 'ALL', JLEN, KNZ, H( JROW, INCOL+1+J2 ),
+     $                         LDH, WV( 1, 1+KZS ), LDWV )
+*
+*                 ==== Multiply by U21 ====
+*
+                  CALL ZLASET( 'ALL', JLEN, KZS, ZERO, ZERO, WV, LDWV )
+                  CALL ZTRMM( 'R', 'U', 'N', 'N', JLEN, KNZ, ONE,
+     $                        U( J2+1, 1+KZS ), LDU, WV( 1, 1+KZS ),
+     $                        LDWV )
+*
+*                 ==== Multiply by U11 ====
+*
+                  CALL ZGEMM( 'N', 'N', JLEN, I2, J2, ONE,
+     $                        H( JROW, INCOL+1 ), LDH, U, LDU, ONE, WV,
+     $                        LDWV )
+*
+*                 ==== Copy left of H to right of scratch ====
+*
+                  CALL ZLACPY( 'ALL', JLEN, J2, H( JROW, INCOL+1 ), LDH,
+     $                         WV( 1, 1+I2 ), LDWV )
+*
+*                 ==== Multiply by U21 ====
+*
+                  CALL ZTRMM( 'R', 'L', 'N', 'N', JLEN, I4-I2, ONE,
+     $                        U( 1, I2+1 ), LDU, WV( 1, 1+I2 ), LDWV )
+*
+*                 ==== Multiply by U22 ====
+*
+                  CALL ZGEMM( 'N', 'N', JLEN, I4-I2, J4-J2, ONE,
+     $                        H( JROW, INCOL+1+J2 ), LDH,
+     $                        U( J2+1, I2+1 ), LDU, ONE, WV( 1, 1+I2 ),
+     $                        LDWV )
+*
+*                 ==== Copy it back ====
+*
+                  CALL ZLACPY( 'ALL', JLEN, KDU, WV, LDWV,
+     $                         H( JROW, INCOL+1 ), LDH )
+  190          CONTINUE
+*
+*              ==== Multiply Z (also vertical) ====
+*
+               IF( WANTZ ) THEN
+                  DO 200 JROW = ILOZ, IHIZ, NV
+                     JLEN = MIN( NV, IHIZ-JROW+1 )
+*
+*                    ==== Copy right of Z to left of scratch (first
+*                    .     KZS columns get multiplied by zero) ====
+*
+                     CALL ZLACPY( 'ALL', JLEN, KNZ,
+     $                            Z( JROW, INCOL+1+J2 ), LDZ,
+     $                            WV( 1, 1+KZS ), LDWV )
+*
+*                    ==== Multiply by U12 ====
+*
+                     CALL ZLASET( 'ALL', JLEN, KZS, ZERO, ZERO, WV,
+     $                            LDWV )
+                     CALL ZTRMM( 'R', 'U', 'N', 'N', JLEN, KNZ, ONE,
+     $                           U( J2+1, 1+KZS ), LDU, WV( 1, 1+KZS ),
+     $                           LDWV )
+*
+*                    ==== Multiply by U11 ====
+*
+                     CALL ZGEMM( 'N', 'N', JLEN, I2, J2, ONE,
+     $                           Z( JROW, INCOL+1 ), LDZ, U, LDU, ONE,
+     $                           WV, LDWV )
+*
+*                    ==== Copy left of Z to right of scratch ====
+*
+                     CALL ZLACPY( 'ALL', JLEN, J2, Z( JROW, INCOL+1 ),
+     $                            LDZ, WV( 1, 1+I2 ), LDWV )
+*
+*                    ==== Multiply by U21 ====
+*
+                     CALL ZTRMM( 'R', 'L', 'N', 'N', JLEN, I4-I2, ONE,
+     $                           U( 1, I2+1 ), LDU, WV( 1, 1+I2 ),
+     $                           LDWV )
+*
+*                    ==== Multiply by U22 ====
+*
+                     CALL ZGEMM( 'N', 'N', JLEN, I4-I2, J4-J2, ONE,
+     $                           Z( JROW, INCOL+1+J2 ), LDZ,
+     $                           U( J2+1, I2+1 ), LDU, ONE,
+     $                           WV( 1, 1+I2 ), LDWV )
+*
+*                    ==== Copy the result back to Z ====
+*
+                     CALL ZLACPY( 'ALL', JLEN, KDU, WV, LDWV,
+     $                            Z( JROW, INCOL+1 ), LDZ )
+  200             CONTINUE
+               END IF
+            END IF
+         END IF
+  210 CONTINUE
+*
+*     ==== End of ZLAQR5 ====
+*
+      END
+*> \brief \b ZLARCM copies all or part of a real two-dimensional array to a complex array.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARCM + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarcm.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarcm.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarcm.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARCM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            LDA, LDB, LDC, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), RWORK( * )
+*       COMPLEX*16         B( LDB, * ), C( LDC, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARCM performs a very simple matrix-matrix multiplication:
+*>          C := A * B,
+*> where A is M by M and real; B is M by N and complex;
+*> C is M by N and complex.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A and of the matrix C.
+*>          M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns and rows of the matrix B and
+*>          the number of columns of the matrix C.
+*>          N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA, M)
+*>          A contains the M by M matrix A.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >=max(1,M).
+*> \endverbatim
+*>
+*> \param[in] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB, N)
+*>          B contains the M by N matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >=max(1,M).
+*> \endverbatim
+*>
+*> \param[in] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC, N)
+*>          C contains the M by N matrix C.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >=max(1,M).
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*M*N)
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLARCM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            LDA, LDB, LDC, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), RWORK( * )
+      COMPLEX*16         B( LDB, * ), C( LDC, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, L
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, DCMPLX, DIMAG
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible.
+*
+      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )
+     $   RETURN
+*
+      DO 20 J = 1, N
+         DO 10 I = 1, M
+            RWORK( ( J-1 )*M+I ) = DBLE( B( I, J ) )
+   10    CONTINUE
+   20 CONTINUE
+*
+      L = M*N + 1
+      CALL DGEMM( 'N', 'N', M, N, M, ONE, A, LDA, RWORK, M, ZERO,
+     $            RWORK( L ), M )
+      DO 40 J = 1, N
+         DO 30 I = 1, M
+            C( I, J ) = RWORK( L+( J-1 )*M+I-1 )
+   30    CONTINUE
+   40 CONTINUE
+*
+      DO 60 J = 1, N
+         DO 50 I = 1, M
+            RWORK( ( J-1 )*M+I ) = DIMAG( B( I, J ) )
+   50    CONTINUE
+   60 CONTINUE
+      CALL DGEMM( 'N', 'N', M, N, M, ONE, A, LDA, RWORK, M, ZERO,
+     $            RWORK( L ), M )
+      DO 80 J = 1, N
+         DO 70 I = 1, M
+            C( I, J ) = DCMPLX( DBLE( C( I, J ) ),
+     $                  RWORK( L+( J-1 )*M+I-1 ) )
+   70    CONTINUE
+   80 CONTINUE
+*
+      RETURN
+*
+*     End of ZLARCM
+*
+      END
+*> \brief \b ZLARF applies an elementary reflector to a general rectangular matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarf.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarf.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarf.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       COMPLEX*16         TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARF applies a complex elementary reflector H to a complex M-by-N
+*> matrix C, from either the left or the right. H is represented in the
+*> form
+*>
+*>       H = I - tau * v * v**H
+*>
+*> where tau is a complex scalar and v is a complex vector.
+*>
+*> If tau = 0, then H is taken to be the unit matrix.
+*>
+*> To apply H**H, supply conjg(tau) instead
+*> tau.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of H. V is not used if
+*>          TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension
+*>                         (N) if SIDE = 'L'
+*>                      or (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      COMPLEX*16         TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            APPLYLEFT
+      INTEGER            I, LASTV, LASTC
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMV, ZGERC
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAZLR, ILAZLC
+      EXTERNAL           LSAME, ILAZLR, ILAZLC
+*     ..
+*     .. Executable Statements ..
+*
+      APPLYLEFT = LSAME( SIDE, 'L' )
+      LASTV = 0
+      LASTC = 0
+      IF( TAU.NE.ZERO ) THEN
+*     Set up variables for scanning V.  LASTV begins pointing to the end
+*     of V.
+         IF( APPLYLEFT ) THEN
+            LASTV = M
+         ELSE
+            LASTV = N
+         END IF
+         IF( INCV.GT.0 ) THEN
+            I = 1 + (LASTV-1) * INCV
+         ELSE
+            I = 1
+         END IF
+*     Look for the last non-zero row in V.
+         DO WHILE( LASTV.GT.0 .AND. V( I ).EQ.ZERO )
+            LASTV = LASTV - 1
+            I = I - INCV
+         END DO
+         IF( APPLYLEFT ) THEN
+*     Scan for the last non-zero column in C(1:lastv,:).
+            LASTC = ILAZLC(LASTV, N, C, LDC)
+         ELSE
+*     Scan for the last non-zero row in C(:,1:lastv).
+            LASTC = ILAZLR(M, LASTV, C, LDC)
+         END IF
+      END IF
+*     Note that lastc.eq.0 renders the BLAS operations null; no special
+*     case is needed at this level.
+      IF( APPLYLEFT ) THEN
+*
+*        Form  H * C
+*
+         IF( LASTV.GT.0 ) THEN
+*
+*           w(1:lastc,1) := C(1:lastv,1:lastc)**H * v(1:lastv,1)
+*
+            CALL ZGEMV( 'Conjugate transpose', LASTV, LASTC, ONE,
+     $           C, LDC, V, INCV, ZERO, WORK, 1 )
+*
+*           C(1:lastv,1:lastc) := C(...) - v(1:lastv,1) * w(1:lastc,1)**H
+*
+            CALL ZGERC( LASTV, LASTC, -TAU, V, INCV, WORK, 1, C, LDC )
+         END IF
+      ELSE
+*
+*        Form  C * H
+*
+         IF( LASTV.GT.0 ) THEN
+*
+*           w(1:lastc,1) := C(1:lastc,1:lastv) * v(1:lastv,1)
+*
+            CALL ZGEMV( 'No transpose', LASTC, LASTV, ONE, C, LDC,
+     $           V, INCV, ZERO, WORK, 1 )
+*
+*           C(1:lastc,1:lastv) := C(...) - w(1:lastc,1) * v(1:lastv,1)**H
+*
+            CALL ZGERC( LASTC, LASTV, -TAU, WORK, 1, V, INCV, C, LDC )
+         END IF
+      END IF
+      RETURN
+*
+*     End of ZLARF
+*
+      END
+*> \brief \b ZLARFB applies a block reflector or its conjugate-transpose to a general rectangular matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARFB + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfb.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarfb.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfb.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
+*                          T, LDT, C, LDC, WORK, LDWORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, SIDE, STOREV, TRANS
+*       INTEGER            K, LDC, LDT, LDV, LDWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         C( LDC, * ), T( LDT, * ), V( LDV, * ),
+*      $                   WORK( LDWORK, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARFB applies a complex block reflector H or its transpose H**H to a
+*> complex M-by-N matrix C, from either the left or the right.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply H or H**H from the Left
+*>          = 'R': apply H or H**H from the Right
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': apply H (No transpose)
+*>          = 'C': apply H**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Indicates how H is formed from a product of elementary
+*>          reflectors
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Indicates how the vectors which define the elementary
+*>          reflectors are stored:
+*>          = 'C': Columnwise
+*>          = 'R': Rowwise
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the matrix T (= the number of elementary
+*>          reflectors whose product defines the block reflector).
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                                (LDV,K) if STOREV = 'C'
+*>                                (LDV,M) if STOREV = 'R' and SIDE = 'L'
+*>                                (LDV,N) if STOREV = 'R' and SIDE = 'R'
+*>          See Further Details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C' and SIDE = 'L', LDV >= max(1,M);
+*>          if STOREV = 'C' and SIDE = 'R', LDV >= max(1,N);
+*>          if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,K)
+*>          The triangular K-by-K matrix T in the representation of the
+*>          block reflector.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by H*C or H**H*C or C*H or C*H**H.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (LDWORK,K)
+*> \endverbatim
+*>
+*> \param[in] LDWORK
+*> \verbatim
+*>          LDWORK is INTEGER
+*>          The leading dimension of the array WORK.
+*>          If SIDE = 'L', LDWORK >= max(1,N);
+*>          if SIDE = 'R', LDWORK >= max(1,M).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date June 2013
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored; the corresponding
+*>  array elements are modified but restored on exit. The rest of the
+*>  array is not used.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
+     $                   T, LDT, C, LDC, WORK, LDWORK )
+*
+*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     June 2013
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, SIDE, STOREV, TRANS
+      INTEGER            K, LDC, LDT, LDV, LDWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         C( LDC, * ), T( LDT, * ), V( LDV, * ),
+     $                   WORK( LDWORK, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      CHARACTER          TRANST
+      INTEGER            I, J
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZCOPY, ZGEMM, ZLACGV, ZTRMM
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( M.LE.0 .OR. N.LE.0 )
+     $   RETURN
+*
+      IF( LSAME( TRANS, 'N' ) ) THEN
+         TRANST = 'C'
+      ELSE
+         TRANST = 'N'
+      END IF
+*
+      IF( LSAME( STOREV, 'C' ) ) THEN
+*
+         IF( LSAME( DIRECT, 'F' ) ) THEN
+*
+*           Let  V =  ( V1 )    (first K rows)
+*                     ( V2 )
+*           where  V1  is unit lower triangular.
+*
+            IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*              Form  H * C  or  H**H * C  where  C = ( C1 )
+*                                                    ( C2 )
+*
+*              W := C**H * V  =  (C1**H * V1 + C2**H * V2)  (stored in WORK)
+*
+*              W := C1**H
+*
+               DO 10 J = 1, K
+                  CALL ZCOPY( N, C( J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL ZLACGV( N, WORK( 1, J ), 1 )
+   10          CONTINUE
+*
+*              W := W * V1
+*
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+     $                     K, ONE, V, LDV, WORK, LDWORK )
+               IF( M.GT.K ) THEN
+*
+*                 W := W + C2**H * V2
+*
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', N,
+     $                        K, M-K, ONE, C( K+1, 1 ), LDC,
+     $                        V( K+1, 1 ), LDV, ONE, WORK, LDWORK )
+               END IF
+*
+*              W := W * T**H  or  W * T
+*
+               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - V * W**H
+*
+               IF( M.GT.K ) THEN
+*
+*                 C2 := C2 - V2 * W**H
+*
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M-K, N, K, -ONE, V( K+1, 1 ), LDV, WORK,
+     $                        LDWORK, ONE, C( K+1, 1 ), LDC )
+               END IF
+*
+*              W := W * V1**H
+*
+               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
+     $                     'Unit', N, K, ONE, V, LDV, WORK, LDWORK )
+*
+*              C1 := C1 - W**H
+*
+               DO 30 J = 1, K
+                  DO 20 I = 1, N
+                     C( J, I ) = C( J, I ) - DCONJG( WORK( I, J ) )
+   20             CONTINUE
+   30          CONTINUE
+*
+            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+*
+*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
+*
+*              W := C * V  =  (C1*V1 + C2*V2)  (stored in WORK)
+*
+*              W := C1
+*
+               DO 40 J = 1, K
+                  CALL ZCOPY( M, C( 1, J ), 1, WORK( 1, J ), 1 )
+   40          CONTINUE
+*
+*              W := W * V1
+*
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+     $                     K, ONE, V, LDV, WORK, LDWORK )
+               IF( N.GT.K ) THEN
+*
+*                 W := W + C2 * V2
+*
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, K, N-K,
+     $                        ONE, C( 1, K+1 ), LDC, V( K+1, 1 ), LDV,
+     $                        ONE, WORK, LDWORK )
+               END IF
+*
+*              W := W * T  or  W * T**H
+*
+               CALL ZTRMM( 'Right', 'Upper', TRANS, 'Non-unit', M, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - W * V**H
+*
+               IF( N.GT.K ) THEN
+*
+*                 C2 := C2 - W * V2**H
+*
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+     $                        N-K, K, -ONE, WORK, LDWORK, V( K+1, 1 ),
+     $                        LDV, ONE, C( 1, K+1 ), LDC )
+               END IF
+*
+*              W := W * V1**H
+*
+               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
+     $                     'Unit', M, K, ONE, V, LDV, WORK, LDWORK )
+*
+*              C1 := C1 - W
+*
+               DO 60 J = 1, K
+                  DO 50 I = 1, M
+                     C( I, J ) = C( I, J ) - WORK( I, J )
+   50             CONTINUE
+   60          CONTINUE
+            END IF
+*
+         ELSE
+*
+*           Let  V =  ( V1 )
+*                     ( V2 )    (last K rows)
+*           where  V2  is unit upper triangular.
+*
+            IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*              Form  H * C  or  H**H * C  where  C = ( C1 )
+*                                                    ( C2 )
+*
+*              W := C**H * V  =  (C1**H * V1 + C2**H * V2)  (stored in WORK)
+*
+*              W := C2**H
+*
+               DO 70 J = 1, K
+                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL ZLACGV( N, WORK( 1, J ), 1 )
+   70          CONTINUE
+*
+*              W := W * V2
+*
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+     $                     K, ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
+               IF( M.GT.K ) THEN
+*
+*                 W := W + C1**H * V1
+*
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', N,
+     $                        K, M-K, ONE, C, LDC, V, LDV, ONE, WORK,
+     $                        LDWORK )
+               END IF
+*
+*              W := W * T**H  or  W * T
+*
+               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - V * W**H
+*
+               IF( M.GT.K ) THEN
+*
+*                 C1 := C1 - V1 * W**H
+*
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        M-K, N, K, -ONE, V, LDV, WORK, LDWORK,
+     $                        ONE, C, LDC )
+               END IF
+*
+*              W := W * V2**H
+*
+               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
+     $                     'Unit', N, K, ONE, V( M-K+1, 1 ), LDV, WORK,
+     $                     LDWORK )
+*
+*              C2 := C2 - W**H
+*
+               DO 90 J = 1, K
+                  DO 80 I = 1, N
+                     C( M-K+J, I ) = C( M-K+J, I ) -
+     $                               DCONJG( WORK( I, J ) )
+   80             CONTINUE
+   90          CONTINUE
+*
+            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+*
+*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
+*
+*              W := C * V  =  (C1*V1 + C2*V2)  (stored in WORK)
+*
+*              W := C2
+*
+               DO 100 J = 1, K
+                  CALL ZCOPY( M, C( 1, N-K+J ), 1, WORK( 1, J ), 1 )
+  100          CONTINUE
+*
+*              W := W * V2
+*
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+     $                     K, ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
+               IF( N.GT.K ) THEN
+*
+*                 W := W + C1 * V1
+*
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, K, N-K,
+     $                        ONE, C, LDC, V, LDV, ONE, WORK, LDWORK )
+               END IF
+*
+*              W := W * T  or  W * T**H
+*
+               CALL ZTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - W * V**H
+*
+               IF( N.GT.K ) THEN
+*
+*                 C1 := C1 - W * V1**H
+*
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+     $                        N-K, K, -ONE, WORK, LDWORK, V, LDV, ONE,
+     $                        C, LDC )
+               END IF
+*
+*              W := W * V2**H
+*
+               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
+     $                     'Unit', M, K, ONE, V( N-K+1, 1 ), LDV, WORK,
+     $                     LDWORK )
+*
+*              C2 := C2 - W
+*
+               DO 120 J = 1, K
+                  DO 110 I = 1, M
+                     C( I, N-K+J ) = C( I, N-K+J ) - WORK( I, J )
+  110             CONTINUE
+  120          CONTINUE
+            END IF
+         END IF
+*
+      ELSE IF( LSAME( STOREV, 'R' ) ) THEN
+*
+         IF( LSAME( DIRECT, 'F' ) ) THEN
+*
+*           Let  V =  ( V1  V2 )    (V1: first K columns)
+*           where  V1  is unit upper triangular.
+*
+            IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*              Form  H * C  or  H**H * C  where  C = ( C1 )
+*                                                    ( C2 )
+*
+*              W := C**H * V**H  =  (C1**H * V1**H + C2**H * V2**H) (stored in WORK)
+*
+*              W := C1**H
+*
+               DO 130 J = 1, K
+                  CALL ZCOPY( N, C( J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL ZLACGV( N, WORK( 1, J ), 1 )
+  130          CONTINUE
+*
+*              W := W * V1**H
+*
+               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
+     $                     'Unit', N, K, ONE, V, LDV, WORK, LDWORK )
+               IF( M.GT.K ) THEN
+*
+*                 W := W + C2**H * V2**H
+*
+                  CALL ZGEMM( 'Conjugate transpose',
+     $                        'Conjugate transpose', N, K, M-K, ONE,
+     $                        C( K+1, 1 ), LDC, V( 1, K+1 ), LDV, ONE,
+     $                        WORK, LDWORK )
+               END IF
+*
+*              W := W * T**H  or  W * T
+*
+               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - V**H * W**H
+*
+               IF( M.GT.K ) THEN
+*
+*                 C2 := C2 - V2**H * W**H
+*
+                  CALL ZGEMM( 'Conjugate transpose',
+     $                        'Conjugate transpose', M-K, N, K, -ONE,
+     $                        V( 1, K+1 ), LDV, WORK, LDWORK, ONE,
+     $                        C( K+1, 1 ), LDC )
+               END IF
+*
+*              W := W * V1
+*
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
+     $                     K, ONE, V, LDV, WORK, LDWORK )
+*
+*              C1 := C1 - W**H
+*
+               DO 150 J = 1, K
+                  DO 140 I = 1, N
+                     C( J, I ) = C( J, I ) - DCONJG( WORK( I, J ) )
+  140             CONTINUE
+  150          CONTINUE
+*
+            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+*
+*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
+*
+*              W := C * V**H  =  (C1*V1**H + C2*V2**H)  (stored in WORK)
+*
+*              W := C1
+*
+               DO 160 J = 1, K
+                  CALL ZCOPY( M, C( 1, J ), 1, WORK( 1, J ), 1 )
+  160          CONTINUE
+*
+*              W := W * V1**H
+*
+               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
+     $                     'Unit', M, K, ONE, V, LDV, WORK, LDWORK )
+               IF( N.GT.K ) THEN
+*
+*                 W := W + C2 * V2**H
+*
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+     $                        K, N-K, ONE, C( 1, K+1 ), LDC,
+     $                        V( 1, K+1 ), LDV, ONE, WORK, LDWORK )
+               END IF
+*
+*              W := W * T  or  W * T**H
+*
+               CALL ZTRMM( 'Right', 'Upper', TRANS, 'Non-unit', M, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - W * V
+*
+               IF( N.GT.K ) THEN
+*
+*                 C2 := C2 - W * V2
+*
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K, K,
+     $                        -ONE, WORK, LDWORK, V( 1, K+1 ), LDV, ONE,
+     $                        C( 1, K+1 ), LDC )
+               END IF
+*
+*              W := W * V1
+*
+               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
+     $                     K, ONE, V, LDV, WORK, LDWORK )
+*
+*              C1 := C1 - W
+*
+               DO 180 J = 1, K
+                  DO 170 I = 1, M
+                     C( I, J ) = C( I, J ) - WORK( I, J )
+  170             CONTINUE
+  180          CONTINUE
+*
+            END IF
+*
+         ELSE
+*
+*           Let  V =  ( V1  V2 )    (V2: last K columns)
+*           where  V2  is unit lower triangular.
+*
+            IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*              Form  H * C  or  H**H * C  where  C = ( C1 )
+*                                                    ( C2 )
+*
+*              W := C**H * V**H  =  (C1**H * V1**H + C2**H * V2**H) (stored in WORK)
+*
+*              W := C2**H
+*
+               DO 190 J = 1, K
+                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
+                  CALL ZLACGV( N, WORK( 1, J ), 1 )
+  190          CONTINUE
+*
+*              W := W * V2**H
+*
+               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
+     $                     'Unit', N, K, ONE, V( 1, M-K+1 ), LDV, WORK,
+     $                     LDWORK )
+               IF( M.GT.K ) THEN
+*
+*                 W := W + C1**H * V1**H
+*
+                  CALL ZGEMM( 'Conjugate transpose',
+     $                        'Conjugate transpose', N, K, M-K, ONE, C,
+     $                        LDC, V, LDV, ONE, WORK, LDWORK )
+               END IF
+*
+*              W := W * T**H  or  W * T
+*
+               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - V**H * W**H
+*
+               IF( M.GT.K ) THEN
+*
+*                 C1 := C1 - V1**H * W**H
+*
+                  CALL ZGEMM( 'Conjugate transpose',
+     $                        'Conjugate transpose', M-K, N, K, -ONE, V,
+     $                        LDV, WORK, LDWORK, ONE, C, LDC )
+               END IF
+*
+*              W := W * V2
+*
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
+     $                     K, ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
+*
+*              C2 := C2 - W**H
+*
+               DO 210 J = 1, K
+                  DO 200 I = 1, N
+                     C( M-K+J, I ) = C( M-K+J, I ) -
+     $                               DCONJG( WORK( I, J ) )
+  200             CONTINUE
+  210          CONTINUE
+*
+            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+*
+*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
+*
+*              W := C * V**H  =  (C1*V1**H + C2*V2**H)  (stored in WORK)
+*
+*              W := C2
+*
+               DO 220 J = 1, K
+                  CALL ZCOPY( M, C( 1, N-K+J ), 1, WORK( 1, J ), 1 )
+  220          CONTINUE
+*
+*              W := W * V2**H
+*
+               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
+     $                     'Unit', M, K, ONE, V( 1, N-K+1 ), LDV, WORK,
+     $                     LDWORK )
+               IF( N.GT.K ) THEN
+*
+*                 W := W + C1 * V1**H
+*
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
+     $                        K, N-K, ONE, C, LDC, V, LDV, ONE, WORK,
+     $                        LDWORK )
+               END IF
+*
+*              W := W * T  or  W * T**H
+*
+               CALL ZTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K,
+     $                     ONE, T, LDT, WORK, LDWORK )
+*
+*              C := C - W * V
+*
+               IF( N.GT.K ) THEN
+*
+*                 C1 := C1 - W * V1
+*
+                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K, K,
+     $                        -ONE, WORK, LDWORK, V, LDV, ONE, C, LDC )
+               END IF
+*
+*              W := W * V2
+*
+               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
+     $                     K, ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
+*
+*              C1 := C1 - W
+*
+               DO 240 J = 1, K
+                  DO 230 I = 1, M
+                     C( I, N-K+J ) = C( I, N-K+J ) - WORK( I, J )
+  230             CONTINUE
+  240          CONTINUE
+*
+            END IF
+*
+         END IF
+      END IF
+*
+      RETURN
+*
+*     End of ZLARFB
+*
+      END
+*> \brief \b ZLARFG generates an elementary reflector (Householder matrix).
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARFG + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfg.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarfg.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfg.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARFG( N, ALPHA, X, INCX, TAU )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INCX, N
+*       COMPLEX*16         ALPHA, TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         X( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARFG generates a complex elementary reflector H of order n, such
+*> that
+*>
+*>       H**H * ( alpha ) = ( beta ),   H**H * H = I.
+*>              (   x   )   (   0  )
+*>
+*> where alpha and beta are scalars, with beta real, and x is an
+*> (n-1)-element complex vector. H is represented in the form
+*>
+*>       H = I - tau * ( 1 ) * ( 1 v**H ) ,
+*>                     ( v )
+*>
+*> where tau is a complex scalar and v is a complex (n-1)-element
+*> vector. Note that H is not hermitian.
+*>
+*> If the elements of x are all zero and alpha is real, then tau = 0
+*> and H is taken to be the unit matrix.
+*>
+*> Otherwise  1 <= real(tau) <= 2  and  abs(tau-1) <= 1 .
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the elementary reflector.
+*> \endverbatim
+*>
+*> \param[in,out] ALPHA
+*> \verbatim
+*>          ALPHA is COMPLEX*16
+*>          On entry, the value alpha.
+*>          On exit, it is overwritten with the value beta.
+*> \endverbatim
+*>
+*> \param[in,out] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension
+*>                         (1+(N-2)*abs(INCX))
+*>          On entry, the vector x.
+*>          On exit, it is overwritten with the vector v.
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          The increment between elements of X. INCX > 0.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16
+*>          The value tau.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLARFG( N, ALPHA, X, INCX, TAU )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      INTEGER            INCX, N
+      COMPLEX*16         ALPHA, TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         X( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            J, KNT
+      DOUBLE PRECISION   ALPHI, ALPHR, BETA, RSAFMN, SAFMIN, XNORM
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH, DLAPY3, DZNRM2
+      COMPLEX*16         ZLADIV
+      EXTERNAL           DLAMCH, DLAPY3, DZNRM2, ZLADIV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, SIGN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZDSCAL, ZSCAL
+*     ..
+*     .. Executable Statements ..
+*
+      IF( N.LE.0 ) THEN
+         TAU = ZERO
+         RETURN
+      END IF
+*
+      XNORM = DZNRM2( N-1, X, INCX )
+      ALPHR = DBLE( ALPHA )
+      ALPHI = DIMAG( ALPHA )
+*
+      IF( XNORM.EQ.ZERO .AND. ALPHI.EQ.ZERO ) THEN
+*
+*        H  =  I
+*
+         TAU = ZERO
+      ELSE
+*
+*        general case
+*
+         BETA = -SIGN( DLAPY3( ALPHR, ALPHI, XNORM ), ALPHR )
+         SAFMIN = DLAMCH( 'S' ) / DLAMCH( 'E' )
+         RSAFMN = ONE / SAFMIN
+*
+         KNT = 0
+         IF( ABS( BETA ).LT.SAFMIN ) THEN
+*
+*           XNORM, BETA may be inaccurate; scale X and recompute them
+*
+   10       CONTINUE
+            KNT = KNT + 1
+            CALL ZDSCAL( N-1, RSAFMN, X, INCX )
+            BETA = BETA*RSAFMN
+            ALPHI = ALPHI*RSAFMN
+            ALPHR = ALPHR*RSAFMN
+            IF( ABS( BETA ).LT.SAFMIN )
+     $         GO TO 10
+*
+*           New BETA is at most 1, at least SAFMIN
+*
+            XNORM = DZNRM2( N-1, X, INCX )
+            ALPHA = DCMPLX( ALPHR, ALPHI )
+            BETA = -SIGN( DLAPY3( ALPHR, ALPHI, XNORM ), ALPHR )
+         END IF
+         TAU = DCMPLX( ( BETA-ALPHR ) / BETA, -ALPHI / BETA )
+         ALPHA = ZLADIV( DCMPLX( ONE ), ALPHA-BETA )
+         CALL ZSCAL( N-1, ALPHA, X, INCX )
+*
+*        If ALPHA is subnormal, it may lose relative accuracy
+*
+         DO 20 J = 1, KNT
+            BETA = BETA*SAFMIN
+ 20      CONTINUE
+         ALPHA = BETA
+      END IF
+*
+      RETURN
+*
+*     End of ZLARFG
+*
+      END
+*> \brief \b ZLARFT forms the triangular factor T of a block reflector H = I - vtvH
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARFT + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarft.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarft.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarft.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, STOREV
+*       INTEGER            K, LDT, LDV, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARFT forms the triangular factor T of a complex block reflector H
+*> of order n, which is defined as a product of k elementary reflectors.
+*>
+*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
+*>
+*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
+*>
+*> If STOREV = 'C', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th column of the array V, and
+*>
+*>    H  =  I - V * T * V**H
+*>
+*> If STOREV = 'R', the vector which defines the elementary reflector
+*> H(i) is stored in the i-th row of the array V, and
+*>
+*>    H  =  I - V**H * T * V
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies the order in which the elementary reflectors are
+*>          multiplied to form the block reflector:
+*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
+*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*> \endverbatim
+*>
+*> \param[in] STOREV
+*> \verbatim
+*>          STOREV is CHARACTER*1
+*>          Specifies how the vectors which define the elementary
+*>          reflectors are stored (see also Further Details):
+*>          = 'C': columnwise
+*>          = 'R': rowwise
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the block reflector H. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The order of the triangular factor T (= the number of
+*>          elementary reflectors). K >= 1.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension
+*>                               (LDV,K) if STOREV = 'C'
+*>                               (LDV,N) if STOREV = 'R'
+*>          The matrix V. See further details.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V.
+*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i).
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,K)
+*>          The k by k triangular factor T of the block reflector.
+*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
+*>          lower triangular. The rest of the array is not used.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= K.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The shape of the matrix V and the storage of the vectors which define
+*>  the H(i) is best illustrated by the following example with n = 5 and
+*>  k = 3. The elements equal to 1 are not stored.
+*>
+*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
+*>
+*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
+*>                   ( v1  1    )                     (     1 v2 v2 v2 )
+*>                   ( v1 v2  1 )                     (        1 v3 v3 )
+*>                   ( v1 v2 v3 )
+*>                   ( v1 v2 v3 )
+*>
+*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
+*>
+*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
+*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
+*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
+*>                   (     1 v3 )
+*>                   (        1 )
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+*
+*  -- LAPACK auxiliary routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, STOREV
+      INTEGER            K, LDT, LDV, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, PREVLASTV, LASTV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZGEMV, ZLACGV, ZTRMV, ZGEMM
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+      IF( LSAME( DIRECT, 'F' ) ) THEN
+         PREVLASTV = N
+         DO I = 1, K
+            PREVLASTV = MAX( PREVLASTV, I )
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = 1, I
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( LSAME( STOREV, 'C' ) ) THEN
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( LASTV, I ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
+                  END DO                     
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
+*
+                  CALL ZGEMV( 'Conjugate transpose', J-I, I-1,
+     $                        -TAU( I ), V( I+1, 1 ), LDV, 
+     $                        V( I+1, I ), 1, ONE, T( 1, I ), 1 )
+               ELSE
+*                 Skip any trailing zeros.
+                  DO LASTV = N, I+1, -1
+                     IF( V( I, LASTV ).NE.ZERO ) EXIT
+                  END DO
+                  DO J = 1, I-1
+                     T( J, I ) = -TAU( I ) * V( J , I )
+                  END DO                     
+                  J = MIN( LASTV, PREVLASTV )
+*
+*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
+*
+                  CALL ZGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
+     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
+     $                        ONE, T( 1, I ), LDT )                  
+               END IF
+*
+*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+*
+               CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
+     $                     LDT, T( 1, I ), 1 )
+               T( I, I ) = TAU( I )
+               IF( I.GT.1 ) THEN
+                  PREVLASTV = MAX( PREVLASTV, LASTV )
+               ELSE
+                  PREVLASTV = LASTV
+               END IF
+             END IF
+         END DO
+      ELSE
+         PREVLASTV = 1
+         DO I = K, 1, -1
+            IF( TAU( I ).EQ.ZERO ) THEN
+*
+*              H(i)  =  I
+*
+               DO J = I, K
+                  T( J, I ) = ZERO
+               END DO
+            ELSE
+*
+*              general case
+*
+               IF( I.LT.K ) THEN
+                  IF( LSAME( STOREV, 'C' ) ) THEN
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( LASTV, I ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
+                     END DO                        
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
+*
+                     CALL ZGEMV( 'Conjugate transpose', N-K+I-J, K-I,
+     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
+     $                           1, ONE, T( I+1, I ), 1 )
+                  ELSE
+*                    Skip any leading zeros.
+                     DO LASTV = 1, I-1
+                        IF( V( I, LASTV ).NE.ZERO ) EXIT
+                     END DO
+                     DO J = I+1, K
+                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
+                     END DO                                           
+                     J = MAX( LASTV, PREVLASTV )
+*
+*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
+*
+                     CALL ZGEMM( 'N', 'C', K-I, 1, N-K+I-J, -TAU( I ),
+     $                           V( I+1, J ), LDV, V( I, J ), LDV,
+     $                           ONE, T( I+1, I ), LDT )                     
+                  END IF
+*
+*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*
+                  CALL ZTRMV( 'Lower', 'No transpose', 'Non-unit', K-I,
+     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
+                  IF( I.GT.1 ) THEN
+                     PREVLASTV = MIN( PREVLASTV, LASTV )
+                  ELSE
+                     PREVLASTV = LASTV
+                  END IF
+               END IF
+               T( I, I ) = TAU( I )
+            END IF
+         END DO
+      END IF
+      RETURN
+*
+*     End of ZLARFT
+*
+      END
+*> \brief \b ZLARFX applies an elementary reflector to a general rectangular matrix, with loop unrolling when the reflector has order ≤ 10.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARFX + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfx.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarfx.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfx.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            LDC, M, N
+*       COMPLEX*16         TAU
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARFX applies a complex elementary reflector H to a complex m by n
+*> matrix C, from either the left or the right. H is represented in the
+*> form
+*>
+*>       H = I - tau * v * v**H
+*>
+*> where tau is a complex scalar and v is a complex vector.
+*>
+*> If tau = 0, then H is taken to be the unit matrix
+*>
+*> This version uses inline code if H has order < 11.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form  H * C
+*>          = 'R': form  C * H
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is COMPLEX*16 array, dimension (M) if SIDE = 'L'
+*>                                        or (N) if SIDE = 'R'
+*>          The vector v in the representation of H.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16
+*>          The value tau in the representation of H.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the m by n matrix C.
+*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+*>          or C * H if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (N) if SIDE = 'L'
+*>                                            or (M) if SIDE = 'R'
+*>          WORK is not referenced if H has order < 11.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            LDC, M, N
+      COMPLEX*16         TAU
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            J
+      COMPLEX*16         SUM, T1, T10, T2, T3, T4, T5, T6, T7, T8, T9,
+     $                   V1, V10, V2, V3, V4, V5, V6, V7, V8, V9
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZLARF
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG
+*     ..
+*     .. Executable Statements ..
+*
+      IF( TAU.EQ.ZERO )
+     $   RETURN
+      IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*        Form  H * C, where H has order m.
+*
+         GO TO ( 10, 30, 50, 70, 90, 110, 130, 150,
+     $           170, 190 )M
+*
+*        Code for general M
+*
+         CALL ZLARF( SIDE, M, N, V, 1, TAU, C, LDC, WORK )
+         GO TO 410
+   10    CONTINUE
+*
+*        Special code for 1 x 1 Householder
+*
+         T1 = ONE - TAU*V( 1 )*DCONJG( V( 1 ) )
+         DO 20 J = 1, N
+            C( 1, J ) = T1*C( 1, J )
+   20    CONTINUE
+         GO TO 410
+   30    CONTINUE
+*
+*        Special code for 2 x 2 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         DO 40 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+   40    CONTINUE
+         GO TO 410
+   50    CONTINUE
+*
+*        Special code for 3 x 3 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         DO 60 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+   60    CONTINUE
+         GO TO 410
+   70    CONTINUE
+*
+*        Special code for 4 x 4 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         DO 80 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+   80    CONTINUE
+         GO TO 410
+   90    CONTINUE
+*
+*        Special code for 5 x 5 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         V5 = DCONJG( V( 5 ) )
+         T5 = TAU*DCONJG( V5 )
+         DO 100 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J ) + V5*C( 5, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+            C( 5, J ) = C( 5, J ) - SUM*T5
+  100    CONTINUE
+         GO TO 410
+  110    CONTINUE
+*
+*        Special code for 6 x 6 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         V5 = DCONJG( V( 5 ) )
+         T5 = TAU*DCONJG( V5 )
+         V6 = DCONJG( V( 6 ) )
+         T6 = TAU*DCONJG( V6 )
+         DO 120 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+            C( 5, J ) = C( 5, J ) - SUM*T5
+            C( 6, J ) = C( 6, J ) - SUM*T6
+  120    CONTINUE
+         GO TO 410
+  130    CONTINUE
+*
+*        Special code for 7 x 7 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         V5 = DCONJG( V( 5 ) )
+         T5 = TAU*DCONJG( V5 )
+         V6 = DCONJG( V( 6 ) )
+         T6 = TAU*DCONJG( V6 )
+         V7 = DCONJG( V( 7 ) )
+         T7 = TAU*DCONJG( V7 )
+         DO 140 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
+     $            V7*C( 7, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+            C( 5, J ) = C( 5, J ) - SUM*T5
+            C( 6, J ) = C( 6, J ) - SUM*T6
+            C( 7, J ) = C( 7, J ) - SUM*T7
+  140    CONTINUE
+         GO TO 410
+  150    CONTINUE
+*
+*        Special code for 8 x 8 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         V5 = DCONJG( V( 5 ) )
+         T5 = TAU*DCONJG( V5 )
+         V6 = DCONJG( V( 6 ) )
+         T6 = TAU*DCONJG( V6 )
+         V7 = DCONJG( V( 7 ) )
+         T7 = TAU*DCONJG( V7 )
+         V8 = DCONJG( V( 8 ) )
+         T8 = TAU*DCONJG( V8 )
+         DO 160 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
+     $            V7*C( 7, J ) + V8*C( 8, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+            C( 5, J ) = C( 5, J ) - SUM*T5
+            C( 6, J ) = C( 6, J ) - SUM*T6
+            C( 7, J ) = C( 7, J ) - SUM*T7
+            C( 8, J ) = C( 8, J ) - SUM*T8
+  160    CONTINUE
+         GO TO 410
+  170    CONTINUE
+*
+*        Special code for 9 x 9 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         V5 = DCONJG( V( 5 ) )
+         T5 = TAU*DCONJG( V5 )
+         V6 = DCONJG( V( 6 ) )
+         T6 = TAU*DCONJG( V6 )
+         V7 = DCONJG( V( 7 ) )
+         T7 = TAU*DCONJG( V7 )
+         V8 = DCONJG( V( 8 ) )
+         T8 = TAU*DCONJG( V8 )
+         V9 = DCONJG( V( 9 ) )
+         T9 = TAU*DCONJG( V9 )
+         DO 180 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
+     $            V7*C( 7, J ) + V8*C( 8, J ) + V9*C( 9, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+            C( 5, J ) = C( 5, J ) - SUM*T5
+            C( 6, J ) = C( 6, J ) - SUM*T6
+            C( 7, J ) = C( 7, J ) - SUM*T7
+            C( 8, J ) = C( 8, J ) - SUM*T8
+            C( 9, J ) = C( 9, J ) - SUM*T9
+  180    CONTINUE
+         GO TO 410
+  190    CONTINUE
+*
+*        Special code for 10 x 10 Householder
+*
+         V1 = DCONJG( V( 1 ) )
+         T1 = TAU*DCONJG( V1 )
+         V2 = DCONJG( V( 2 ) )
+         T2 = TAU*DCONJG( V2 )
+         V3 = DCONJG( V( 3 ) )
+         T3 = TAU*DCONJG( V3 )
+         V4 = DCONJG( V( 4 ) )
+         T4 = TAU*DCONJG( V4 )
+         V5 = DCONJG( V( 5 ) )
+         T5 = TAU*DCONJG( V5 )
+         V6 = DCONJG( V( 6 ) )
+         T6 = TAU*DCONJG( V6 )
+         V7 = DCONJG( V( 7 ) )
+         T7 = TAU*DCONJG( V7 )
+         V8 = DCONJG( V( 8 ) )
+         T8 = TAU*DCONJG( V8 )
+         V9 = DCONJG( V( 9 ) )
+         T9 = TAU*DCONJG( V9 )
+         V10 = DCONJG( V( 10 ) )
+         T10 = TAU*DCONJG( V10 )
+         DO 200 J = 1, N
+            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
+     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
+     $            V7*C( 7, J ) + V8*C( 8, J ) + V9*C( 9, J ) +
+     $            V10*C( 10, J )
+            C( 1, J ) = C( 1, J ) - SUM*T1
+            C( 2, J ) = C( 2, J ) - SUM*T2
+            C( 3, J ) = C( 3, J ) - SUM*T3
+            C( 4, J ) = C( 4, J ) - SUM*T4
+            C( 5, J ) = C( 5, J ) - SUM*T5
+            C( 6, J ) = C( 6, J ) - SUM*T6
+            C( 7, J ) = C( 7, J ) - SUM*T7
+            C( 8, J ) = C( 8, J ) - SUM*T8
+            C( 9, J ) = C( 9, J ) - SUM*T9
+            C( 10, J ) = C( 10, J ) - SUM*T10
+  200    CONTINUE
+         GO TO 410
+      ELSE
+*
+*        Form  C * H, where H has order n.
+*
+         GO TO ( 210, 230, 250, 270, 290, 310, 330, 350,
+     $           370, 390 )N
+*
+*        Code for general N
+*
+         CALL ZLARF( SIDE, M, N, V, 1, TAU, C, LDC, WORK )
+         GO TO 410
+  210    CONTINUE
+*
+*        Special code for 1 x 1 Householder
+*
+         T1 = ONE - TAU*V( 1 )*DCONJG( V( 1 ) )
+         DO 220 J = 1, M
+            C( J, 1 ) = T1*C( J, 1 )
+  220    CONTINUE
+         GO TO 410
+  230    CONTINUE
+*
+*        Special code for 2 x 2 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         DO 240 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+  240    CONTINUE
+         GO TO 410
+  250    CONTINUE
+*
+*        Special code for 3 x 3 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         DO 260 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+  260    CONTINUE
+         GO TO 410
+  270    CONTINUE
+*
+*        Special code for 4 x 4 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         DO 280 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+  280    CONTINUE
+         GO TO 410
+  290    CONTINUE
+*
+*        Special code for 5 x 5 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         V5 = V( 5 )
+         T5 = TAU*DCONJG( V5 )
+         DO 300 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 ) + V5*C( J, 5 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+            C( J, 5 ) = C( J, 5 ) - SUM*T5
+  300    CONTINUE
+         GO TO 410
+  310    CONTINUE
+*
+*        Special code for 6 x 6 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         V5 = V( 5 )
+         T5 = TAU*DCONJG( V5 )
+         V6 = V( 6 )
+         T6 = TAU*DCONJG( V6 )
+         DO 320 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+            C( J, 5 ) = C( J, 5 ) - SUM*T5
+            C( J, 6 ) = C( J, 6 ) - SUM*T6
+  320    CONTINUE
+         GO TO 410
+  330    CONTINUE
+*
+*        Special code for 7 x 7 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         V5 = V( 5 )
+         T5 = TAU*DCONJG( V5 )
+         V6 = V( 6 )
+         T6 = TAU*DCONJG( V6 )
+         V7 = V( 7 )
+         T7 = TAU*DCONJG( V7 )
+         DO 340 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
+     $            V7*C( J, 7 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+            C( J, 5 ) = C( J, 5 ) - SUM*T5
+            C( J, 6 ) = C( J, 6 ) - SUM*T6
+            C( J, 7 ) = C( J, 7 ) - SUM*T7
+  340    CONTINUE
+         GO TO 410
+  350    CONTINUE
+*
+*        Special code for 8 x 8 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         V5 = V( 5 )
+         T5 = TAU*DCONJG( V5 )
+         V6 = V( 6 )
+         T6 = TAU*DCONJG( V6 )
+         V7 = V( 7 )
+         T7 = TAU*DCONJG( V7 )
+         V8 = V( 8 )
+         T8 = TAU*DCONJG( V8 )
+         DO 360 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
+     $            V7*C( J, 7 ) + V8*C( J, 8 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+            C( J, 5 ) = C( J, 5 ) - SUM*T5
+            C( J, 6 ) = C( J, 6 ) - SUM*T6
+            C( J, 7 ) = C( J, 7 ) - SUM*T7
+            C( J, 8 ) = C( J, 8 ) - SUM*T8
+  360    CONTINUE
+         GO TO 410
+  370    CONTINUE
+*
+*        Special code for 9 x 9 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         V5 = V( 5 )
+         T5 = TAU*DCONJG( V5 )
+         V6 = V( 6 )
+         T6 = TAU*DCONJG( V6 )
+         V7 = V( 7 )
+         T7 = TAU*DCONJG( V7 )
+         V8 = V( 8 )
+         T8 = TAU*DCONJG( V8 )
+         V9 = V( 9 )
+         T9 = TAU*DCONJG( V9 )
+         DO 380 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
+     $            V7*C( J, 7 ) + V8*C( J, 8 ) + V9*C( J, 9 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+            C( J, 5 ) = C( J, 5 ) - SUM*T5
+            C( J, 6 ) = C( J, 6 ) - SUM*T6
+            C( J, 7 ) = C( J, 7 ) - SUM*T7
+            C( J, 8 ) = C( J, 8 ) - SUM*T8
+            C( J, 9 ) = C( J, 9 ) - SUM*T9
+  380    CONTINUE
+         GO TO 410
+  390    CONTINUE
+*
+*        Special code for 10 x 10 Householder
+*
+         V1 = V( 1 )
+         T1 = TAU*DCONJG( V1 )
+         V2 = V( 2 )
+         T2 = TAU*DCONJG( V2 )
+         V3 = V( 3 )
+         T3 = TAU*DCONJG( V3 )
+         V4 = V( 4 )
+         T4 = TAU*DCONJG( V4 )
+         V5 = V( 5 )
+         T5 = TAU*DCONJG( V5 )
+         V6 = V( 6 )
+         T6 = TAU*DCONJG( V6 )
+         V7 = V( 7 )
+         T7 = TAU*DCONJG( V7 )
+         V8 = V( 8 )
+         T8 = TAU*DCONJG( V8 )
+         V9 = V( 9 )
+         T9 = TAU*DCONJG( V9 )
+         V10 = V( 10 )
+         T10 = TAU*DCONJG( V10 )
+         DO 400 J = 1, M
+            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
+     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
+     $            V7*C( J, 7 ) + V8*C( J, 8 ) + V9*C( J, 9 ) +
+     $            V10*C( J, 10 )
+            C( J, 1 ) = C( J, 1 ) - SUM*T1
+            C( J, 2 ) = C( J, 2 ) - SUM*T2
+            C( J, 3 ) = C( J, 3 ) - SUM*T3
+            C( J, 4 ) = C( J, 4 ) - SUM*T4
+            C( J, 5 ) = C( J, 5 ) - SUM*T5
+            C( J, 6 ) = C( J, 6 ) - SUM*T6
+            C( J, 7 ) = C( J, 7 ) - SUM*T7
+            C( J, 8 ) = C( J, 8 ) - SUM*T8
+            C( J, 9 ) = C( J, 9 ) - SUM*T9
+            C( J, 10 ) = C( J, 10 ) - SUM*T10
+  400    CONTINUE
+         GO TO 410
+      END IF
+  410 CONTINUE
+      RETURN
+*
+*     End of ZLARFX
+*
+      END
+*> \brief \b ZLARTG generates a plane rotation with real cosine and complex sine.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLARTG + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlartg.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlartg.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlartg.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLARTG( F, G, CS, SN, R )
+* 
+*       .. Scalar Arguments ..
+*       DOUBLE PRECISION   CS
+*       COMPLEX*16         F, G, R, SN
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLARTG generates a plane rotation so that
+*>
+*>    [  CS  SN  ]     [ F ]     [ R ]
+*>    [  __      ]  .  [   ]  =  [   ]   where CS**2 + |SN|**2 = 1.
+*>    [ -SN  CS  ]     [ G ]     [ 0 ]
+*>
+*> This is a faster version of the BLAS1 routine ZROTG, except for
+*> the following differences:
+*>    F and G are unchanged on return.
+*>    If G=0, then CS=1 and SN=0.
+*>    If F=0, then CS=0 and SN is chosen so that R is real.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] F
+*> \verbatim
+*>          F is COMPLEX*16
+*>          The first component of vector to be rotated.
+*> \endverbatim
+*>
+*> \param[in] G
+*> \verbatim
+*>          G is COMPLEX*16
+*>          The second component of vector to be rotated.
+*> \endverbatim
+*>
+*> \param[out] CS
+*> \verbatim
+*>          CS is DOUBLE PRECISION
+*>          The cosine of the rotation.
+*> \endverbatim
+*>
+*> \param[out] SN
+*> \verbatim
+*>          SN is COMPLEX*16
+*>          The sine of the rotation.
+*> \endverbatim
+*>
+*> \param[out] R
+*> \verbatim
+*>          R is COMPLEX*16
+*>          The nonzero component of the rotated vector.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2013
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  3-5-96 - Modified with a new algorithm by W. Kahan and J. Demmel
+*>
+*>  This version has a few statements commented out for thread safety
+*>  (machine parameters are computed on each entry). 10 feb 03, SJH.
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE ZLARTG( F, G, CS, SN, R )
+*
+*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2013
+*
+*     .. Scalar Arguments ..
+      DOUBLE PRECISION   CS
+      COMPLEX*16         F, G, R, SN
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   TWO, ONE, ZERO
+      PARAMETER          ( TWO = 2.0D+0, ONE = 1.0D+0, ZERO = 0.0D+0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+*     LOGICAL            FIRST
+      INTEGER            COUNT, I
+      DOUBLE PRECISION   D, DI, DR, EPS, F2, F2S, G2, G2S, SAFMIN,
+     $                   SAFMN2, SAFMX2, SCALE
+      COMPLEX*16         FF, FS, GS
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH, DLAPY2
+      LOGICAL            DISNAN
+      EXTERNAL           DLAMCH, DLAPY2, DISNAN
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, LOG,
+     $                   MAX, SQRT
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   ABS1, ABSSQ
+*     ..
+*     .. Statement Function definitions ..
+      ABS1( FF ) = MAX( ABS( DBLE( FF ) ), ABS( DIMAG( FF ) ) )
+      ABSSQ( FF ) = DBLE( FF )**2 + DIMAG( FF )**2
+*     ..
+*     .. Executable Statements ..
+*
+      SAFMIN = DLAMCH( 'S' )
+      EPS = DLAMCH( 'E' )
+      SAFMN2 = DLAMCH( 'B' )**INT( LOG( SAFMIN / EPS ) /
+     $         LOG( DLAMCH( 'B' ) ) / TWO )
+      SAFMX2 = ONE / SAFMN2
+      SCALE = MAX( ABS1( F ), ABS1( G ) )
+      FS = F
+      GS = G
+      COUNT = 0
+      IF( SCALE.GE.SAFMX2 ) THEN
+   10    CONTINUE
+         COUNT = COUNT + 1
+         FS = FS*SAFMN2
+         GS = GS*SAFMN2
+         SCALE = SCALE*SAFMN2
+         IF( SCALE.GE.SAFMX2 )
+     $      GO TO 10
+      ELSE IF( SCALE.LE.SAFMN2 ) THEN
+         IF( G.EQ.CZERO.OR.DISNAN( ABS( G ) ) ) THEN
+            CS = ONE
+            SN = CZERO
+            R = F
+            RETURN
+         END IF
+   20    CONTINUE
+         COUNT = COUNT - 1
+         FS = FS*SAFMX2
+         GS = GS*SAFMX2
+         SCALE = SCALE*SAFMX2
+         IF( SCALE.LE.SAFMN2 )
+     $      GO TO 20
+      END IF
+      F2 = ABSSQ( FS )
+      G2 = ABSSQ( GS )
+      IF( F2.LE.MAX( G2, ONE )*SAFMIN ) THEN
+*
+*        This is a rare case: F is very small.
+*
+         IF( F.EQ.CZERO ) THEN
+            CS = ZERO
+            R = DLAPY2( DBLE( G ), DIMAG( G ) )
+*           Do complex/real division explicitly with two real divisions
+            D = DLAPY2( DBLE( GS ), DIMAG( GS ) )
+            SN = DCMPLX( DBLE( GS ) / D, -DIMAG( GS ) / D )
+            RETURN
+         END IF
+         F2S = DLAPY2( DBLE( FS ), DIMAG( FS ) )
+*        G2 and G2S are accurate
+*        G2 is at least SAFMIN, and G2S is at least SAFMN2
+         G2S = SQRT( G2 )
+*        Error in CS from underflow in F2S is at most
+*        UNFL / SAFMN2 .lt. sqrt(UNFL*EPS) .lt. EPS
+*        If MAX(G2,ONE)=G2, then F2 .lt. G2*SAFMIN,
+*        and so CS .lt. sqrt(SAFMIN)
+*        If MAX(G2,ONE)=ONE, then F2 .lt. SAFMIN
+*        and so CS .lt. sqrt(SAFMIN)/SAFMN2 = sqrt(EPS)
+*        Therefore, CS = F2S/G2S / sqrt( 1 + (F2S/G2S)**2 ) = F2S/G2S
+         CS = F2S / G2S
+*        Make sure abs(FF) = 1
+*        Do complex/real division explicitly with 2 real divisions
+         IF( ABS1( F ).GT.ONE ) THEN
+            D = DLAPY2( DBLE( F ), DIMAG( F ) )
+            FF = DCMPLX( DBLE( F ) / D, DIMAG( F ) / D )
+         ELSE
+            DR = SAFMX2*DBLE( F )
+            DI = SAFMX2*DIMAG( F )
+            D = DLAPY2( DR, DI )
+            FF = DCMPLX( DR / D, DI / D )
+         END IF
+         SN = FF*DCMPLX( DBLE( GS ) / G2S, -DIMAG( GS ) / G2S )
+         R = CS*F + SN*G
+      ELSE
+*
+*        This is the most common case.
+*        Neither F2 nor F2/G2 are less than SAFMIN
+*        F2S cannot overflow, and it is accurate
+*
+         F2S = SQRT( ONE+G2 / F2 )
+*        Do the F2S(real)*FS(complex) multiply with two real multiplies
+         R = DCMPLX( F2S*DBLE( FS ), F2S*DIMAG( FS ) )
+         CS = ONE / F2S
+         D = F2 + G2
+*        Do complex/real division explicitly with two real divisions
+         SN = DCMPLX( DBLE( R ) / D, DIMAG( R ) / D )
+         SN = SN*DCONJG( GS )
+         IF( COUNT.NE.0 ) THEN
+            IF( COUNT.GT.0 ) THEN
+               DO 30 I = 1, COUNT
+                  R = R*SAFMX2
+   30          CONTINUE
+            ELSE
+               DO 40 I = 1, -COUNT
+                  R = R*SAFMN2
+   40          CONTINUE
+            END IF
+         END IF
+      END IF
+      RETURN
+*
+*     End of ZLARTG
+*
+      END
+*> \brief \b ZLASCL multiplies a general rectangular matrix by a real scalar defined as cto/cfrom.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLASCL + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlascl.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlascl.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlascl.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          TYPE
+*       INTEGER            INFO, KL, KU, LDA, M, N
+*       DOUBLE PRECISION   CFROM, CTO
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLASCL multiplies the M by N complex matrix A by the real scalar
+*> CTO/CFROM.  This is done without over/underflow as long as the final
+*> result CTO*A(I,J)/CFROM does not over/underflow. TYPE specifies that
+*> A may be full, upper triangular, lower triangular, upper Hessenberg,
+*> or banded.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] TYPE
+*> \verbatim
+*>          TYPE is CHARACTER*1
+*>          TYPE indices the storage type of the input matrix.
+*>          = 'G':  A is a full matrix.
+*>          = 'L':  A is a lower triangular matrix.
+*>          = 'U':  A is an upper triangular matrix.
+*>          = 'H':  A is an upper Hessenberg matrix.
+*>          = 'B':  A is a symmetric band matrix with lower bandwidth KL
+*>                  and upper bandwidth KU and with the only the lower
+*>                  half stored.
+*>          = 'Q':  A is a symmetric band matrix with lower bandwidth KL
+*>                  and upper bandwidth KU and with the only the upper
+*>                  half stored.
+*>          = 'Z':  A is a band matrix with lower bandwidth KL and upper
+*>                  bandwidth KU. See ZGBTRF for storage details.
+*> \endverbatim
+*>
+*> \param[in] KL
+*> \verbatim
+*>          KL is INTEGER
+*>          The lower bandwidth of A.  Referenced only if TYPE = 'B',
+*>          'Q' or 'Z'.
+*> \endverbatim
+*>
+*> \param[in] KU
+*> \verbatim
+*>          KU is INTEGER
+*>          The upper bandwidth of A.  Referenced only if TYPE = 'B',
+*>          'Q' or 'Z'.
+*> \endverbatim
+*>
+*> \param[in] CFROM
+*> \verbatim
+*>          CFROM is DOUBLE PRECISION
+*> \endverbatim
+*>
+*> \param[in] CTO
+*> \verbatim
+*>          CTO is DOUBLE PRECISION
+*>
+*>          The matrix A is multiplied by CTO/CFROM. A(I,J) is computed
+*>          without over/underflow if the final result CTO*A(I,J)/CFROM
+*>          can be represented without over/underflow.  CFROM must be
+*>          nonzero.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The matrix to be multiplied by CTO/CFROM.  See TYPE for the
+*>          storage type.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          0  - successful exit
+*>          <0 - if INFO = -i, the i-th argument had an illegal value.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          TYPE
+      INTEGER            INFO, KL, KU, LDA, M, N
+      DOUBLE PRECISION   CFROM, CTO
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            DONE
+      INTEGER            I, ITYPE, J, K1, K2, K3, K4
+      DOUBLE PRECISION   BIGNUM, CFROM1, CFROMC, CTO1, CTOC, MUL, SMLNUM
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           LSAME, DLAMCH, DISNAN
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments
+*
+      INFO = 0
+*
+      IF( LSAME( TYPE, 'G' ) ) THEN
+         ITYPE = 0
+      ELSE IF( LSAME( TYPE, 'L' ) ) THEN
+         ITYPE = 1
+      ELSE IF( LSAME( TYPE, 'U' ) ) THEN
+         ITYPE = 2
+      ELSE IF( LSAME( TYPE, 'H' ) ) THEN
+         ITYPE = 3
+      ELSE IF( LSAME( TYPE, 'B' ) ) THEN
+         ITYPE = 4
+      ELSE IF( LSAME( TYPE, 'Q' ) ) THEN
+         ITYPE = 5
+      ELSE IF( LSAME( TYPE, 'Z' ) ) THEN
+         ITYPE = 6
+      ELSE
+         ITYPE = -1
+      END IF
+*
+      IF( ITYPE.EQ.-1 ) THEN
+         INFO = -1
+      ELSE IF( CFROM.EQ.ZERO .OR. DISNAN(CFROM) ) THEN
+         INFO = -4
+      ELSE IF( DISNAN(CTO) ) THEN
+         INFO = -5
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( N.LT.0 .OR. ( ITYPE.EQ.4 .AND. N.NE.M ) .OR.
+     $         ( ITYPE.EQ.5 .AND. N.NE.M ) ) THEN
+         INFO = -7
+      ELSE IF( ITYPE.LE.3 .AND. LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -9
+      ELSE IF( ITYPE.GE.4 ) THEN
+         IF( KL.LT.0 .OR. KL.GT.MAX( M-1, 0 ) ) THEN
+            INFO = -2
+         ELSE IF( KU.LT.0 .OR. KU.GT.MAX( N-1, 0 ) .OR.
+     $            ( ( ITYPE.EQ.4 .OR. ITYPE.EQ.5 ) .AND. KL.NE.KU ) )
+     $             THEN
+            INFO = -3
+         ELSE IF( ( ITYPE.EQ.4 .AND. LDA.LT.KL+1 ) .OR.
+     $            ( ITYPE.EQ.5 .AND. LDA.LT.KU+1 ) .OR.
+     $            ( ITYPE.EQ.6 .AND. LDA.LT.2*KL+KU+1 ) ) THEN
+            INFO = -9
+         END IF
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLASCL', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 .OR. M.EQ.0 )
+     $   RETURN
+*
+*     Get machine parameters
+*
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+*
+      CFROMC = CFROM
+      CTOC = CTO
+*
+   10 CONTINUE
+      CFROM1 = CFROMC*SMLNUM
+      IF( CFROM1.EQ.CFROMC ) THEN
+!        CFROMC is an inf.  Multiply by a correctly signed zero for
+!        finite CTOC, or a NaN if CTOC is infinite.
+         MUL = CTOC / CFROMC
+         DONE = .TRUE.
+         CTO1 = CTOC
+      ELSE
+         CTO1 = CTOC / BIGNUM
+         IF( CTO1.EQ.CTOC ) THEN
+!           CTOC is either 0 or an inf.  In both cases, CTOC itself
+!           serves as the correct multiplication factor.
+            MUL = CTOC
+            DONE = .TRUE.
+            CFROMC = ONE
+         ELSE IF( ABS( CFROM1 ).GT.ABS( CTOC ) .AND. CTOC.NE.ZERO ) THEN
+            MUL = SMLNUM
+            DONE = .FALSE.
+            CFROMC = CFROM1
+         ELSE IF( ABS( CTO1 ).GT.ABS( CFROMC ) ) THEN
+            MUL = BIGNUM
+            DONE = .FALSE.
+            CTOC = CTO1
+         ELSE
+            MUL = CTOC / CFROMC
+            DONE = .TRUE.
+         END IF
+      END IF
+*
+      IF( ITYPE.EQ.0 ) THEN
+*
+*        Full matrix
+*
+         DO 30 J = 1, N
+            DO 20 I = 1, M
+               A( I, J ) = A( I, J )*MUL
+   20       CONTINUE
+   30    CONTINUE
+*
+      ELSE IF( ITYPE.EQ.1 ) THEN
+*
+*        Lower triangular matrix
+*
+         DO 50 J = 1, N
+            DO 40 I = J, M
+               A( I, J ) = A( I, J )*MUL
+   40       CONTINUE
+   50    CONTINUE
+*
+      ELSE IF( ITYPE.EQ.2 ) THEN
+*
+*        Upper triangular matrix
+*
+         DO 70 J = 1, N
+            DO 60 I = 1, MIN( J, M )
+               A( I, J ) = A( I, J )*MUL
+   60       CONTINUE
+   70    CONTINUE
+*
+      ELSE IF( ITYPE.EQ.3 ) THEN
+*
+*        Upper Hessenberg matrix
+*
+         DO 90 J = 1, N
+            DO 80 I = 1, MIN( J+1, M )
+               A( I, J ) = A( I, J )*MUL
+   80       CONTINUE
+   90    CONTINUE
+*
+      ELSE IF( ITYPE.EQ.4 ) THEN
+*
+*        Lower half of a symmetric band matrix
+*
+         K3 = KL + 1
+         K4 = N + 1
+         DO 110 J = 1, N
+            DO 100 I = 1, MIN( K3, K4-J )
+               A( I, J ) = A( I, J )*MUL
+  100       CONTINUE
+  110    CONTINUE
+*
+      ELSE IF( ITYPE.EQ.5 ) THEN
+*
+*        Upper half of a symmetric band matrix
+*
+         K1 = KU + 2
+         K3 = KU + 1
+         DO 130 J = 1, N
+            DO 120 I = MAX( K1-J, 1 ), K3
+               A( I, J ) = A( I, J )*MUL
+  120       CONTINUE
+  130    CONTINUE
+*
+      ELSE IF( ITYPE.EQ.6 ) THEN
+*
+*        Band matrix
+*
+         K1 = KL + KU + 2
+         K2 = KL + 1
+         K3 = 2*KL + KU + 1
+         K4 = KL + KU + 1 + M
+         DO 150 J = 1, N
+            DO 140 I = MAX( K1-J, K2 ), MIN( K3, K4-J )
+               A( I, J ) = A( I, J )*MUL
+  140       CONTINUE
+  150    CONTINUE
+*
+      END IF
+*
+      IF( .NOT.DONE )
+     $   GO TO 10
+*
+      RETURN
+*
+*     End of ZLASCL
+*
+      END
+*> \brief \b ZLASET initializes the off-diagonal elements and the diagonal elements of a matrix to given values.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLASET + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaset.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaset.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaset.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            LDA, M, N
+*       COMPLEX*16         ALPHA, BETA
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLASET initializes a 2-D array A to BETA on the diagonal and
+*> ALPHA on the offdiagonals.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies the part of the matrix A to be set.
+*>          = 'U':      Upper triangular part is set. The lower triangle
+*>                      is unchanged.
+*>          = 'L':      Lower triangular part is set. The upper triangle
+*>                      is unchanged.
+*>          Otherwise:  All of the matrix A is set.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          On entry, M specifies the number of rows of A.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          On entry, N specifies the number of columns of A.
+*> \endverbatim
+*>
+*> \param[in] ALPHA
+*> \verbatim
+*>          ALPHA is COMPLEX*16
+*>          All the offdiagonal array elements are set to ALPHA.
+*> \endverbatim
+*>
+*> \param[in] BETA
+*> \verbatim
+*>          BETA is COMPLEX*16
+*>          All the diagonal array elements are set to BETA.
+*> \endverbatim
+*>
+*> \param[out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the m by n matrix A.
+*>          On exit, A(i,j) = ALPHA, 1 <= i <= m, 1 <= j <= n, i.ne.j;
+*>                   A(i,i) = BETA , 1 <= i <= min(m,n)
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+*
+*  -- LAPACK auxiliary routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            LDA, M, N
+      COMPLEX*16         ALPHA, BETA
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER            I, J
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+      IF( LSAME( UPLO, 'U' ) ) THEN
+*
+*        Set the diagonal to BETA and the strictly upper triangular
+*        part of the array to ALPHA.
+*
+         DO 20 J = 2, N
+            DO 10 I = 1, MIN( J-1, M )
+               A( I, J ) = ALPHA
+   10       CONTINUE
+   20    CONTINUE
+         DO 30 I = 1, MIN( N, M )
+            A( I, I ) = BETA
+   30    CONTINUE
+*
+      ELSE IF( LSAME( UPLO, 'L' ) ) THEN
+*
+*        Set the diagonal to BETA and the strictly lower triangular
+*        part of the array to ALPHA.
+*
+         DO 50 J = 1, MIN( M, N )
+            DO 40 I = J + 1, M
+               A( I, J ) = ALPHA
+   40       CONTINUE
+   50    CONTINUE
+         DO 60 I = 1, MIN( N, M )
+            A( I, I ) = BETA
+   60    CONTINUE
+*
+      ELSE
+*
+*        Set the array to BETA on the diagonal and ALPHA on the
+*        offdiagonal.
+*
+         DO 80 J = 1, N
+            DO 70 I = 1, M
+               A( I, J ) = ALPHA
+   70       CONTINUE
+   80    CONTINUE
+         DO 90 I = 1, MIN( M, N )
+            A( I, I ) = BETA
+   90    CONTINUE
+      END IF
+*
+      RETURN
+*
+*     End of ZLASET
+*
+      END
+*> \brief \b ZLASR applies a sequence of plane rotations to a general rectangular matrix.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZLASR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlasr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          DIRECT, PIVOT, SIDE
+*       INTEGER            LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   C( * ), S( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLASR applies a sequence of real plane rotations to a complex matrix
+*> A, from either the left or the right.
+*>
+*> When SIDE = 'L', the transformation takes the form
+*>
+*>    A := P*A
+*>
+*> and when SIDE = 'R', the transformation takes the form
+*>
+*>    A := A*P**T
+*>
+*> where P is an orthogonal matrix consisting of a sequence of z plane
+*> rotations, with z = M when SIDE = 'L' and z = N when SIDE = 'R',
+*> and P**T is the transpose of P.
+*> 
+*> When DIRECT = 'F' (Forward sequence), then
+*> 
+*>    P = P(z-1) * ... * P(2) * P(1)
+*> 
+*> and when DIRECT = 'B' (Backward sequence), then
+*> 
+*>    P = P(1) * P(2) * ... * P(z-1)
+*> 
+*> where P(k) is a plane rotation matrix defined by the 2-by-2 rotation
+*> 
+*>    R(k) = (  c(k)  s(k) )
+*>         = ( -s(k)  c(k) ).
+*> 
+*> When PIVOT = 'V' (Variable pivot), the rotation is performed
+*> for the plane (k,k+1), i.e., P(k) has the form
+*> 
+*>    P(k) = (  1                                            )
+*>           (       ...                                     )
+*>           (              1                                )
+*>           (                   c(k)  s(k)                  )
+*>           (                  -s(k)  c(k)                  )
+*>           (                                1              )
+*>           (                                     ...       )
+*>           (                                            1  )
+*> 
+*> where R(k) appears as a rank-2 modification to the identity matrix in
+*> rows and columns k and k+1.
+*> 
+*> When PIVOT = 'T' (Top pivot), the rotation is performed for the
+*> plane (1,k+1), so P(k) has the form
+*> 
+*>    P(k) = (  c(k)                    s(k)                 )
+*>           (         1                                     )
+*>           (              ...                              )
+*>           (                     1                         )
+*>           ( -s(k)                    c(k)                 )
+*>           (                                 1             )
+*>           (                                      ...      )
+*>           (                                             1 )
+*> 
+*> where R(k) appears in rows and columns 1 and k+1.
+*> 
+*> Similarly, when PIVOT = 'B' (Bottom pivot), the rotation is
+*> performed for the plane (k,z), giving P(k) the form
+*> 
+*>    P(k) = ( 1                                             )
+*>           (      ...                                      )
+*>           (             1                                 )
+*>           (                  c(k)                    s(k) )
+*>           (                         1                     )
+*>           (                              ...              )
+*>           (                                     1         )
+*>           (                 -s(k)                    c(k) )
+*> 
+*> where R(k) appears in rows and columns k and z.  The rotations are
+*> performed without ever forming P(k) explicitly.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          Specifies whether the plane rotation matrix P is applied to
+*>          A on the left or the right.
+*>          = 'L':  Left, compute A := P*A
+*>          = 'R':  Right, compute A:= A*P**T
+*> \endverbatim
+*>
+*> \param[in] PIVOT
+*> \verbatim
+*>          PIVOT is CHARACTER*1
+*>          Specifies the plane for which P(k) is a plane rotation
+*>          matrix.
+*>          = 'V':  Variable pivot, the plane (k,k+1)
+*>          = 'T':  Top pivot, the plane (1,k+1)
+*>          = 'B':  Bottom pivot, the plane (k,z)
+*> \endverbatim
+*>
+*> \param[in] DIRECT
+*> \verbatim
+*>          DIRECT is CHARACTER*1
+*>          Specifies whether P is a forward or backward sequence of
+*>          plane rotations.
+*>          = 'F':  Forward, P = P(z-1)*...*P(2)*P(1)
+*>          = 'B':  Backward, P = P(1)*P(2)*...*P(z-1)
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  If m <= 1, an immediate
+*>          return is effected.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  If n <= 1, an
+*>          immediate return is effected.
+*> \endverbatim
+*>
+*> \param[in] C
+*> \verbatim
+*>          C is DOUBLE PRECISION array, dimension
+*>                  (M-1) if SIDE = 'L'
+*>                  (N-1) if SIDE = 'R'
+*>          The cosines c(k) of the plane rotations.
+*> \endverbatim
+*>
+*> \param[in] S
+*> \verbatim
+*>          S is DOUBLE PRECISION array, dimension
+*>                  (M-1) if SIDE = 'L'
+*>                  (N-1) if SIDE = 'R'
+*>          The sines s(k) of the plane rotations.  The 2-by-2 plane
+*>          rotation part of the matrix P(k), R(k), has the form
+*>          R(k) = (  c(k)  s(k) )
+*>                 ( -s(k)  c(k) ).
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The M-by-N matrix A.  On exit, A is overwritten by P*A if
+*>          SIDE = 'R' or by A*P**T if SIDE = 'L'.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          DIRECT, PIVOT, SIDE
+      INTEGER            LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   C( * ), S( * )
+      COMPLEX*16         A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, INFO, J
+      DOUBLE PRECISION   CTEMP, STEMP
+      COMPLEX*16         TEMP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters
+*
+      INFO = 0
+      IF( .NOT.( LSAME( SIDE, 'L' ) .OR. LSAME( SIDE, 'R' ) ) ) THEN
+         INFO = 1
+      ELSE IF( .NOT.( LSAME( PIVOT, 'V' ) .OR. LSAME( PIVOT,
+     $         'T' ) .OR. LSAME( PIVOT, 'B' ) ) ) THEN
+         INFO = 2
+      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR. LSAME( DIRECT, 'B' ) ) )
+     $          THEN
+         INFO = 3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = 4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = 5
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = 9
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLASR ', INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )
+     $   RETURN
+      IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*        Form  P * A
+*
+         IF( LSAME( PIVOT, 'V' ) ) THEN
+            IF( LSAME( DIRECT, 'F' ) ) THEN
+               DO 20 J = 1, M - 1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 10 I = 1, N
+                        TEMP = A( J+1, I )
+                        A( J+1, I ) = CTEMP*TEMP - STEMP*A( J, I )
+                        A( J, I ) = STEMP*TEMP + CTEMP*A( J, I )
+   10                CONTINUE
+                  END IF
+   20          CONTINUE
+            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
+               DO 40 J = M - 1, 1, -1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 30 I = 1, N
+                        TEMP = A( J+1, I )
+                        A( J+1, I ) = CTEMP*TEMP - STEMP*A( J, I )
+                        A( J, I ) = STEMP*TEMP + CTEMP*A( J, I )
+   30                CONTINUE
+                  END IF
+   40          CONTINUE
+            END IF
+         ELSE IF( LSAME( PIVOT, 'T' ) ) THEN
+            IF( LSAME( DIRECT, 'F' ) ) THEN
+               DO 60 J = 2, M
+                  CTEMP = C( J-1 )
+                  STEMP = S( J-1 )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 50 I = 1, N
+                        TEMP = A( J, I )
+                        A( J, I ) = CTEMP*TEMP - STEMP*A( 1, I )
+                        A( 1, I ) = STEMP*TEMP + CTEMP*A( 1, I )
+   50                CONTINUE
+                  END IF
+   60          CONTINUE
+            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
+               DO 80 J = M, 2, -1
+                  CTEMP = C( J-1 )
+                  STEMP = S( J-1 )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 70 I = 1, N
+                        TEMP = A( J, I )
+                        A( J, I ) = CTEMP*TEMP - STEMP*A( 1, I )
+                        A( 1, I ) = STEMP*TEMP + CTEMP*A( 1, I )
+   70                CONTINUE
+                  END IF
+   80          CONTINUE
+            END IF
+         ELSE IF( LSAME( PIVOT, 'B' ) ) THEN
+            IF( LSAME( DIRECT, 'F' ) ) THEN
+               DO 100 J = 1, M - 1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 90 I = 1, N
+                        TEMP = A( J, I )
+                        A( J, I ) = STEMP*A( M, I ) + CTEMP*TEMP
+                        A( M, I ) = CTEMP*A( M, I ) - STEMP*TEMP
+   90                CONTINUE
+                  END IF
+  100          CONTINUE
+            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
+               DO 120 J = M - 1, 1, -1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 110 I = 1, N
+                        TEMP = A( J, I )
+                        A( J, I ) = STEMP*A( M, I ) + CTEMP*TEMP
+                        A( M, I ) = CTEMP*A( M, I ) - STEMP*TEMP
+  110                CONTINUE
+                  END IF
+  120          CONTINUE
+            END IF
+         END IF
+      ELSE IF( LSAME( SIDE, 'R' ) ) THEN
 *
-*                 ==== Copy it back ====
+*        Form A * P**T
 *
-                  CALL ZLACPY( 'ALL', KDU, JLEN, WH, LDWH,
-     $                         H( INCOL+1, JCOL ), LDH )
+         IF( LSAME( PIVOT, 'V' ) ) THEN
+            IF( LSAME( DIRECT, 'F' ) ) THEN
+               DO 140 J = 1, N - 1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 130 I = 1, M
+                        TEMP = A( I, J+1 )
+                        A( I, J+1 ) = CTEMP*TEMP - STEMP*A( I, J )
+                        A( I, J ) = STEMP*TEMP + CTEMP*A( I, J )
+  130                CONTINUE
+                  END IF
+  140          CONTINUE
+            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
+               DO 160 J = N - 1, 1, -1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 150 I = 1, M
+                        TEMP = A( I, J+1 )
+                        A( I, J+1 ) = CTEMP*TEMP - STEMP*A( I, J )
+                        A( I, J ) = STEMP*TEMP + CTEMP*A( I, J )
+  150                CONTINUE
+                  END IF
+  160          CONTINUE
+            END IF
+         ELSE IF( LSAME( PIVOT, 'T' ) ) THEN
+            IF( LSAME( DIRECT, 'F' ) ) THEN
+               DO 180 J = 2, N
+                  CTEMP = C( J-1 )
+                  STEMP = S( J-1 )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 170 I = 1, M
+                        TEMP = A( I, J )
+                        A( I, J ) = CTEMP*TEMP - STEMP*A( I, 1 )
+                        A( I, 1 ) = STEMP*TEMP + CTEMP*A( I, 1 )
+  170                CONTINUE
+                  END IF
   180          CONTINUE
+            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
+               DO 200 J = N, 2, -1
+                  CTEMP = C( J-1 )
+                  STEMP = S( J-1 )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 190 I = 1, M
+                        TEMP = A( I, J )
+                        A( I, J ) = CTEMP*TEMP - STEMP*A( I, 1 )
+                        A( I, 1 ) = STEMP*TEMP + CTEMP*A( I, 1 )
+  190                CONTINUE
+                  END IF
+  200          CONTINUE
+            END IF
+         ELSE IF( LSAME( PIVOT, 'B' ) ) THEN
+            IF( LSAME( DIRECT, 'F' ) ) THEN
+               DO 220 J = 1, N - 1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 210 I = 1, M
+                        TEMP = A( I, J )
+                        A( I, J ) = STEMP*A( I, N ) + CTEMP*TEMP
+                        A( I, N ) = CTEMP*A( I, N ) - STEMP*TEMP
+  210                CONTINUE
+                  END IF
+  220          CONTINUE
+            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
+               DO 240 J = N - 1, 1, -1
+                  CTEMP = C( J )
+                  STEMP = S( J )
+                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
+                     DO 230 I = 1, M
+                        TEMP = A( I, J )
+                        A( I, J ) = STEMP*A( I, N ) + CTEMP*TEMP
+                        A( I, N ) = CTEMP*A( I, N ) - STEMP*TEMP
+  230                CONTINUE
+                  END IF
+  240          CONTINUE
+            END IF
+         END IF
+      END IF
 *
-*              ==== Vertical multiply ====
-*
-               DO 190 JROW = JTOP, MAX( INCOL, KTOP ) - 1, NV
-                  JLEN = MIN( NV, MAX( INCOL, KTOP )-JROW )
-*
-*                 ==== Copy right of H to scratch (the first KZS
-*                 .    columns get multiplied by zero) ====
-*
-                  CALL ZLACPY( 'ALL', JLEN, KNZ, H( JROW, INCOL+1+J2 ),
-     $                         LDH, WV( 1, 1+KZS ), LDWV )
-*
-*                 ==== Multiply by U21 ====
-*
-                  CALL ZLASET( 'ALL', JLEN, KZS, ZERO, ZERO, WV, LDWV )
-                  CALL ZTRMM( 'R', 'U', 'N', 'N', JLEN, KNZ, ONE,
-     $                        U( J2+1, 1+KZS ), LDU, WV( 1, 1+KZS ),
-     $                        LDWV )
-*
-*                 ==== Multiply by U11 ====
-*
-                  CALL ZGEMM( 'N', 'N', JLEN, I2, J2, ONE,
-     $                        H( JROW, INCOL+1 ), LDH, U, LDU, ONE, WV,
-     $                        LDWV )
-*
-*                 ==== Copy left of H to right of scratch ====
-*
-                  CALL ZLACPY( 'ALL', JLEN, J2, H( JROW, INCOL+1 ), LDH,
-     $                         WV( 1, 1+I2 ), LDWV )
-*
-*                 ==== Multiply by U21 ====
-*
-                  CALL ZTRMM( 'R', 'L', 'N', 'N', JLEN, I4-I2, ONE,
-     $                        U( 1, I2+1 ), LDU, WV( 1, 1+I2 ), LDWV )
+      RETURN
 *
-*                 ==== Multiply by U22 ====
+*     End of ZLASR
 *
-                  CALL ZGEMM( 'N', 'N', JLEN, I4-I2, J4-J2, ONE,
-     $                        H( JROW, INCOL+1+J2 ), LDH,
-     $                        U( J2+1, I2+1 ), LDU, ONE, WV( 1, 1+I2 ),
-     $                        LDWV )
+      END
+*> \brief \b ZLASSQ updates a sum of squares represented in scaled form.
 *
-*                 ==== Copy it back ====
+*  =========== DOCUMENTATION ===========
 *
-                  CALL ZLACPY( 'ALL', JLEN, KDU, WV, LDWV,
-     $                         H( JROW, INCOL+1 ), LDH )
-  190          CONTINUE
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-*              ==== Multiply Z (also vertical) ====
+*> \htmlonly
+*> Download ZLASSQ + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlassq.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlassq.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlassq.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-               IF( WANTZ ) THEN
-                  DO 200 JROW = ILOZ, IHIZ, NV
-                     JLEN = MIN( NV, IHIZ-JROW+1 )
+*  Definition:
+*  ===========
 *
-*                    ==== Copy right of Z to left of scratch (first
-*                    .     KZS columns get multiplied by zero) ====
+*       SUBROUTINE ZLASSQ( N, X, INCX, SCALE, SUMSQ )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INCX, N
+*       DOUBLE PRECISION   SCALE, SUMSQ
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         X( * )
+*       ..
+*  
 *
-                     CALL ZLACPY( 'ALL', JLEN, KNZ,
-     $                            Z( JROW, INCOL+1+J2 ), LDZ,
-     $                            WV( 1, 1+KZS ), LDWV )
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZLASSQ returns the values scl and ssq such that
+*>
+*>    ( scl**2 )*ssq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
+*>
+*> where x( i ) = abs( X( 1 + ( i - 1 )*INCX ) ). The value of sumsq is
+*> assumed to be at least unity and the value of ssq will then satisfy
+*>
+*>    1.0 .le. ssq .le. ( sumsq + 2*n ).
+*>
+*> scale is assumed to be non-negative and scl returns the value
+*>
+*>    scl = max( scale, abs( real( x( i ) ) ), abs( aimag( x( i ) ) ) ),
+*>           i
+*>
+*> scale and sumsq must be supplied in SCALE and SUMSQ respectively.
+*> SCALE and SUMSQ are overwritten by scl and ssq respectively.
+*>
+*> The routine makes only one pass through the vector X.
+*> \endverbatim
 *
-*                    ==== Multiply by U12 ====
+*  Arguments:
+*  ==========
 *
-                     CALL ZLASET( 'ALL', JLEN, KZS, ZERO, ZERO, WV,
-     $                            LDWV )
-                     CALL ZTRMM( 'R', 'U', 'N', 'N', JLEN, KNZ, ONE,
-     $                           U( J2+1, 1+KZS ), LDU, WV( 1, 1+KZS ),
-     $                           LDWV )
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of elements to be used from the vector X.
+*> \endverbatim
+*>
+*> \param[in] X
+*> \verbatim
+*>          X is COMPLEX*16 array, dimension (N)
+*>          The vector x as described above.
+*>             x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
+*> \endverbatim
+*>
+*> \param[in] INCX
+*> \verbatim
+*>          INCX is INTEGER
+*>          The increment between successive values of the vector X.
+*>          INCX > 0.
+*> \endverbatim
+*>
+*> \param[in,out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>          On entry, the value  scale  in the equation above.
+*>          On exit, SCALE is overwritten with the value  scl .
+*> \endverbatim
+*>
+*> \param[in,out] SUMSQ
+*> \verbatim
+*>          SUMSQ is DOUBLE PRECISION
+*>          On entry, the value  sumsq  in the equation above.
+*>          On exit, SUMSQ is overwritten with the value  ssq .
+*> \endverbatim
 *
-*                    ==== Multiply by U11 ====
+*  Authors:
+*  ========
 *
-                     CALL ZGEMM( 'N', 'N', JLEN, I2, J2, ONE,
-     $                           Z( JROW, INCOL+1 ), LDZ, U, LDU, ONE,
-     $                           WV, LDWV )
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*                    ==== Copy left of Z to right of scratch ====
+*> \date September 2012
 *
-                     CALL ZLACPY( 'ALL', JLEN, J2, Z( JROW, INCOL+1 ),
-     $                            LDZ, WV( 1, 1+I2 ), LDWV )
+*> \ingroup complex16OTHERauxiliary
 *
-*                    ==== Multiply by U21 ====
+*  =====================================================================
+      SUBROUTINE ZLASSQ( N, X, INCX, SCALE, SUMSQ )
 *
-                     CALL ZTRMM( 'R', 'L', 'N', 'N', JLEN, I4-I2, ONE,
-     $                           U( 1, I2+1 ), LDU, WV( 1, 1+I2 ),
-     $                           LDWV )
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-*                    ==== Multiply by U22 ====
+*     .. Scalar Arguments ..
+      INTEGER            INCX, N
+      DOUBLE PRECISION   SCALE, SUMSQ
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         X( * )
+*     ..
 *
-                     CALL ZGEMM( 'N', 'N', JLEN, I4-I2, J4-J2, ONE,
-     $                           Z( JROW, INCOL+1+J2 ), LDZ,
-     $                           U( J2+1, I2+1 ), LDU, ONE,
-     $                           WV( 1, 1+I2 ), LDWV )
+* =====================================================================
 *
-*                    ==== Copy the result back to Z ====
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO
+      PARAMETER          ( ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            IX
+      DOUBLE PRECISION   TEMP1
+*     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      EXTERNAL           DISNAN
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, DIMAG
+*     ..
+*     .. Executable Statements ..
 *
-                     CALL ZLACPY( 'ALL', JLEN, KDU, WV, LDWV,
-     $                            Z( JROW, INCOL+1 ), LDZ )
-  200             CONTINUE
+      IF( N.GT.0 ) THEN
+         DO 10 IX = 1, 1 + ( N-1 )*INCX, INCX
+            TEMP1 = ABS( DBLE( X( IX ) ) )
+            IF( TEMP1.GT.ZERO.OR.DISNAN( TEMP1 ) ) THEN
+               IF( SCALE.LT.TEMP1 ) THEN
+                  SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
+                  SCALE = TEMP1
+               ELSE
+                  SUMSQ = SUMSQ + ( TEMP1 / SCALE )**2
                END IF
             END IF
-         END IF
-  210 CONTINUE
+            TEMP1 = ABS( DIMAG( X( IX ) ) )
+            IF( TEMP1.GT.ZERO.OR.DISNAN( TEMP1 ) ) THEN
+               IF( SCALE.LT.TEMP1 ) THEN
+                  SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
+                  SCALE = TEMP1
+               ELSE
+                  SUMSQ = SUMSQ + ( TEMP1 / SCALE )**2
+               END IF
+            END IF
+   10    CONTINUE
+      END IF
 *
-*     ==== End of ZLAQR5 ====
+      RETURN
+*
+*     End of ZLASSQ
 *
       END
-*> \brief \b ZLARF applies an elementary reflector to a general rectangular matrix.
+*> \brief \b ZLASWP performs a series of row interchanges on a general rectangular matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -19182,27 +36297,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLARF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarf.f"> 
+*> Download ZLASWP + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaswp.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaswp.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaswp.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+*       SUBROUTINE ZLASWP( N, A, LDA, K1, K2, IPIV, INCX )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE
-*       INTEGER            INCV, LDC, M, N
-*       COMPLEX*16         TAU
+*       INTEGER            INCX, K1, K2, LDA, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -19211,82 +36325,60 @@
 *>
 *> \verbatim
 *>
-*> ZLARF applies a complex elementary reflector H to a complex M-by-N
-*> matrix C, from either the left or the right. H is represented in the
-*> form
-*>
-*>       H = I - tau * v * v**H
-*>
-*> where tau is a complex scalar and v is a complex vector.
-*>
-*> If tau = 0, then H is taken to be the unit matrix.
-*>
-*> To apply H**H, supply conjg(tau) instead
-*> tau.
+*> ZLASWP performs a series of row interchanges on the matrix A.
+*> One row interchange is initiated for each of rows K1 through K2 of A.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': form  H * C
-*>          = 'R': form  C * H
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C.
-*> \endverbatim
-*>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C.
+*>          The number of columns of the matrix A.
 *> \endverbatim
 *>
-*> \param[in] V
+*> \param[in,out] A
 *> \verbatim
-*>          V is COMPLEX*16 array, dimension
-*>                     (1 + (M-1)*abs(INCV)) if SIDE = 'L'
-*>                  or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
-*>          The vector v in the representation of H. V is not used if
-*>          TAU = 0.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the matrix of column dimension N to which the row
+*>          interchanges will be applied.
+*>          On exit, the permuted matrix.
 *> \endverbatim
 *>
-*> \param[in] INCV
+*> \param[in] LDA
 *> \verbatim
-*>          INCV is INTEGER
-*>          The increment between elements of v. INCV <> 0.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] K1
 *> \verbatim
-*>          TAU is COMPLEX*16
-*>          The value tau in the representation of H.
+*>          K1 is INTEGER
+*>          The first element of IPIV for which a row interchange will
+*>          be done.
 *> \endverbatim
 *>
-*> \param[in,out] C
+*> \param[in] K2
 *> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the M-by-N matrix C.
-*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
-*>          or C * H if SIDE = 'R'.
+*>          K2 is INTEGER
+*>          The last element of IPIV for which a row interchange will
+*>          be done.
 *> \endverbatim
 *>
-*> \param[in] LDC
+*> \param[in] IPIV
 *> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
+*>          IPIV is INTEGER array, dimension (K2*abs(INCX))
+*>          The vector of pivot indices.  Only the elements in positions
+*>          K1 through K2 of IPIV are accessed.
+*>          IPIV(K) = L implies rows K and L are to be interchanged.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] INCX
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension
-*>                         (N) if SIDE = 'L'
-*>                      or (M) if SIDE = 'R'
+*>          INCX is INTEGER
+*>          The increment between successive values of IPIV.  If IPIV
+*>          is negative, the pivots are applied in reverse order.
 *> \endverbatim
 *
 *  Authors:
@@ -19301,8 +36393,17 @@
 *
 *> \ingroup complex16OTHERauxiliary
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Modified by
+*>   R. C. Whaley, Computer Science Dept., Univ. of Tenn., Knoxville, USA
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ZLARF( SIDE, M, N, V, INCV, TAU, C, LDC, WORK )
+      SUBROUTINE ZLASWP( N, A, LDA, K1, K2, IPIV, INCX )
 *
 *  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -19310,1364 +36411,906 @@
 *     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE
-      INTEGER            INCV, LDC, M, N
-      COMPLEX*16         TAU
+      INTEGER            INCX, K1, K2, LDA, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
-*  =====================================================================
+* =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
 *     .. Local Scalars ..
-      LOGICAL            APPLYLEFT
-      INTEGER            I, LASTV, LASTC
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZGEMV, ZGERC
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAZLR, ILAZLC
-      EXTERNAL           LSAME, ILAZLR, ILAZLC
+      INTEGER            I, I1, I2, INC, IP, IX, IX0, J, K, N32
+      COMPLEX*16         TEMP
 *     ..
 *     .. Executable Statements ..
 *
-      APPLYLEFT = LSAME( SIDE, 'L' )
-      LASTV = 0
-      LASTC = 0
-      IF( TAU.NE.ZERO ) THEN
-*     Set up variables for scanning V.  LASTV begins pointing to the end
-*     of V.
-         IF( APPLYLEFT ) THEN
-            LASTV = M
-         ELSE
-            LASTV = N
-         END IF
-         IF( INCV.GT.0 ) THEN
-            I = 1 + (LASTV-1) * INCV
-         ELSE
-            I = 1
-         END IF
-*     Look for the last non-zero row in V.
-         DO WHILE( LASTV.GT.0 .AND. V( I ).EQ.ZERO )
-            LASTV = LASTV - 1
-            I = I - INCV
-         END DO
-         IF( APPLYLEFT ) THEN
-*     Scan for the last non-zero column in C(1:lastv,:).
-            LASTC = ILAZLC(LASTV, N, C, LDC)
-         ELSE
-*     Scan for the last non-zero row in C(:,1:lastv).
-            LASTC = ILAZLR(M, LASTV, C, LDC)
-         END IF
-      END IF
-*     Note that lastc.eq.0 renders the BLAS operations null; no special
-*     case is needed at this level.
-      IF( APPLYLEFT ) THEN
-*
-*        Form  H * C
-*
-         IF( LASTV.GT.0 ) THEN
-*
-*           w(1:lastc,1) := C(1:lastv,1:lastc)**H * v(1:lastv,1)
-*
-            CALL ZGEMV( 'Conjugate transpose', LASTV, LASTC, ONE,
-     $           C, LDC, V, INCV, ZERO, WORK, 1 )
-*
-*           C(1:lastv,1:lastc) := C(...) - v(1:lastv,1) * w(1:lastc,1)**H
-*
-            CALL ZGERC( LASTV, LASTC, -TAU, V, INCV, WORK, 1, C, LDC )
-         END IF
-      ELSE
-*
-*        Form  C * H
-*
-         IF( LASTV.GT.0 ) THEN
-*
-*           w(1:lastc,1) := C(1:lastc,1:lastv) * v(1:lastv,1)
-*
-            CALL ZGEMV( 'No transpose', LASTC, LASTV, ONE, C, LDC,
-     $           V, INCV, ZERO, WORK, 1 )
+*     Interchange row I with row IPIV(I) for each of rows K1 through K2.
 *
-*           C(1:lastc,1:lastv) := C(...) - w(1:lastc,1) * v(1:lastv,1)**H
+      IF( INCX.GT.0 ) THEN
+         IX0 = K1
+         I1 = K1
+         I2 = K2
+         INC = 1
+      ELSE IF( INCX.LT.0 ) THEN
+         IX0 = 1 + ( 1-K2 )*INCX
+         I1 = K2
+         I2 = K1
+         INC = -1
+      ELSE
+         RETURN
+      END IF
 *
-            CALL ZGERC( LASTC, LASTV, -TAU, WORK, 1, V, INCV, C, LDC )
-         END IF
+      N32 = ( N / 32 )*32
+      IF( N32.NE.0 ) THEN
+         DO 30 J = 1, N32, 32
+            IX = IX0
+            DO 20 I = I1, I2, INC
+               IP = IPIV( IX )
+               IF( IP.NE.I ) THEN
+                  DO 10 K = J, J + 31
+                     TEMP = A( I, K )
+                     A( I, K ) = A( IP, K )
+                     A( IP, K ) = TEMP
+   10             CONTINUE
+               END IF
+               IX = IX + INCX
+   20       CONTINUE
+   30    CONTINUE
+      END IF
+      IF( N32.NE.N ) THEN
+         N32 = N32 + 1
+         IX = IX0
+         DO 50 I = I1, I2, INC
+            IP = IPIV( IX )
+            IF( IP.NE.I ) THEN
+               DO 40 K = N32, N
+                  TEMP = A( I, K )
+                  A( I, K ) = A( IP, K )
+                  A( IP, K ) = TEMP
+   40          CONTINUE
+            END IF
+            IX = IX + INCX
+   50    CONTINUE
       END IF
+*
       RETURN
 *
-*     End of ZLARF
+*     End of ZLASWP
 *
       END
-*> \brief \b ZLARFB applies a block reflector or its conjugate-transpose to a general rectangular matrix.
+*> \brief \b ZLASYF computes a partial factorization of a complex symmetric matrix using the Bunch-Kaufman diagonal pivoting method.
 *
 *  =========== DOCUMENTATION ===========
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+* Online html documentation available at
+*            http://www.netlib.org/lapack/explore-html/
 *
 *> \htmlonly
-*> Download ZLARFB + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfb.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarfb.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfb.f"> 
+*> Download ZLASYF + dependencies
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasyf.f">
+*> [TGZ]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlasyf.f">
+*> [ZIP]</a>
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasyf.f">
 *> [TXT]</a>
-*> \endhtmlonly 
+*> \endhtmlonly
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
-*                          T, LDT, C, LDC, WORK, LDWORK )
-* 
+*       SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
+*
 *       .. Scalar Arguments ..
-*       CHARACTER          DIRECT, SIDE, STOREV, TRANS
-*       INTEGER            K, LDC, LDT, LDV, LDWORK, M, N
+*       CHARACTER          UPLO
+*       INTEGER            INFO, KB, LDA, LDW, N, NB
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         C( LDC, * ), T( LDT, * ), V( LDV, * ),
-*      $                   WORK( LDWORK, * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * ), W( LDW, * )
 *       ..
-*  
+*
 *
 *> \par Purpose:
 *  =============
 *>
 *> \verbatim
 *>
-*> ZLARFB applies a complex block reflector H or its transpose H**H to a
-*> complex M-by-N matrix C, from either the left or the right.
+*> ZLASYF computes a partial factorization of a complex symmetric matrix
+*> A using the Bunch-Kaufman diagonal pivoting method. The partial
+*> factorization has the form:
+*>
+*> A  =  ( I  U12 ) ( A11  0  ) (  I       0    )  if UPLO = 'U', or:
+*>       ( 0  U22 ) (  0   D  ) ( U12**T U22**T )
+*>
+*> A  =  ( L11  0 ) ( D    0  ) ( L11**T L21**T )  if UPLO = 'L'
+*>       ( L21  I ) ( 0   A22 ) (  0       I    )
+*>
+*> where the order of D is at most NB. The actual order is returned in
+*> the argument KB, and is either NB or NB-1, or N if N <= NB.
+*> Note that U**T denotes the transpose of U.
+*>
+*> ZLASYF is an auxiliary routine called by ZSYTRF. It uses blocked code
+*> (calling Level 3 BLAS) to update the submatrix A11 (if UPLO = 'U') or
+*> A22 (if UPLO = 'L').
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
+*> \param[in] UPLO
 *> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply H or H**H from the Left
-*>          = 'R': apply H or H**H from the Right
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the upper or lower triangular part of the
+*>          symmetric matrix A is stored:
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
 *> \endverbatim
 *>
-*> \param[in] TRANS
+*> \param[in] N
 *> \verbatim
-*>          TRANS is CHARACTER*1
-*>          = 'N': apply H (No transpose)
-*>          = 'C': apply H**H (Conjugate transpose)
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] DIRECT
+*> \param[in] NB
 *> \verbatim
-*>          DIRECT is CHARACTER*1
-*>          Indicates how H is formed from a product of elementary
-*>          reflectors
-*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
-*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
+*>          NB is INTEGER
+*>          The maximum number of columns of the matrix A that should be
+*>          factored.  NB should be at least 2 to allow for 2-by-2 pivot
+*>          blocks.
 *> \endverbatim
 *>
-*> \param[in] STOREV
+*> \param[out] KB
 *> \verbatim
-*>          STOREV is CHARACTER*1
-*>          Indicates how the vectors which define the elementary
-*>          reflectors are stored:
-*>          = 'C': Columnwise
-*>          = 'R': Rowwise
+*>          KB is INTEGER
+*>          The number of columns of A that were actually factored.
+*>          KB is either NB-1 or NB, or N if N <= NB.
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in,out] A
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+*>          n-by-n upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading n-by-n lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>          On exit, A contains details of the partial factorization.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] LDA
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix C.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[out] IPIV
 *> \verbatim
-*>          K is INTEGER
-*>          The order of the matrix T (= the number of elementary
-*>          reflectors whose product defines the block reflector).
-*> \endverbatim
+*>          IPIV is INTEGER array, dimension (N)
+*>          Details of the interchanges and the block structure of D.
 *>
-*> \param[in] V
-*> \verbatim
-*>          V is COMPLEX*16 array, dimension
-*>                                (LDV,K) if STOREV = 'C'
-*>                                (LDV,M) if STOREV = 'R' and SIDE = 'L'
-*>                                (LDV,N) if STOREV = 'R' and SIDE = 'R'
-*>          See Further Details.
-*> \endverbatim
+*>          If UPLO = 'U':
+*>             Only the last KB elements of IPIV are set.
 *>
-*> \param[in] LDV
-*> \verbatim
-*>          LDV is INTEGER
-*>          The leading dimension of the array V.
-*>          If STOREV = 'C' and SIDE = 'L', LDV >= max(1,M);
-*>          if STOREV = 'C' and SIDE = 'R', LDV >= max(1,N);
-*>          if STOREV = 'R', LDV >= K.
-*> \endverbatim
+*>             If IPIV(k) > 0, then rows and columns k and IPIV(k) were
+*>             interchanged and D(k,k) is a 1-by-1 diagonal block.
 *>
-*> \param[in] T
-*> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,K)
-*>          The triangular K-by-K matrix T in the representation of the
-*>          block reflector.
-*> \endverbatim
+*>             If IPIV(k) = IPIV(k-1) < 0, then rows and columns
+*>             k-1 and -IPIV(k) were interchanged and D(k-1:k,k-1:k)
+*>             is a 2-by-2 diagonal block.
 *>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T. LDT >= K.
-*> \endverbatim
+*>          If UPLO = 'L':
+*>             Only the first KB elements of IPIV are set.
 *>
-*> \param[in,out] C
-*> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the M-by-N matrix C.
-*>          On exit, C is overwritten by H*C or H**H*C or C*H or C*H**H.
+*>             If IPIV(k) > 0, then rows and columns k and IPIV(k) were
+*>             interchanged and D(k,k) is a 1-by-1 diagonal block.
+*>
+*>             If IPIV(k) = IPIV(k+1) < 0, then rows and columns
+*>             k+1 and -IPIV(k) were interchanged and D(k:k+1,k:k+1)
+*>             is a 2-by-2 diagonal block.
 *> \endverbatim
 *>
-*> \param[in] LDC
+*> \param[out] W
 *> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
+*>          W is COMPLEX*16 array, dimension (LDW,NB)
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LDW
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (LDWORK,K)
+*>          LDW is INTEGER
+*>          The leading dimension of the array W.  LDW >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDWORK
+*> \param[out] INFO
 *> \verbatim
-*>          LDWORK is INTEGER
-*>          The leading dimension of the array WORK.
-*>          If SIDE = 'L', LDWORK >= max(1,N);
-*>          if SIDE = 'R', LDWORK >= max(1,M).
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          > 0: if INFO = k, D(k,k) is exactly zero.  The factorization
+*>               has been completed, but the block diagonal matrix D is
+*>               exactly singular.
 *> \endverbatim
 *
 *  Authors:
 *  ========
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*> \author Univ. of Tennessee
+*> \author Univ. of California Berkeley
+*> \author Univ. of Colorado Denver
+*> \author NAG Ltd.
 *
-*> \date June 2013
+*> \date November 2013
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16SYcomputational
 *
-*> \par Further Details:
-*  =====================
+*> \par Contributors:
+*  ==================
 *>
 *> \verbatim
 *>
-*>  The shape of the matrix V and the storage of the vectors which define
-*>  the H(i) is best illustrated by the following example with n = 5 and
-*>  k = 3. The elements equal to 1 are not stored; the corresponding
-*>  array elements are modified but restored on exit. The rest of the
-*>  array is not used.
-*>
-*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
-*>
-*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
-*>                   ( v1  1    )                     (     1 v2 v2 v2 )
-*>                   ( v1 v2  1 )                     (        1 v3 v3 )
-*>                   ( v1 v2 v3 )
-*>                   ( v1 v2 v3 )
-*>
-*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
-*>
-*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
-*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
-*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
-*>                   (     1 v3 )
-*>                   (        1 )
+*>  November 2013,  Igor Kozachenko,
+*>                  Computer Science Division,
+*>                  University of California, Berkeley
 *> \endverbatim
-*>
+*
 *  =====================================================================
-      SUBROUTINE ZLARFB( SIDE, TRANS, DIRECT, STOREV, M, N, K, V, LDV,
-     $                   T, LDT, C, LDC, WORK, LDWORK )
+      SUBROUTINE ZLASYF( UPLO, N, NB, KB, A, LDA, IPIV, W, LDW, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK computational routine (version 3.5.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     June 2013
+*     November 2013
 *
 *     .. Scalar Arguments ..
-      CHARACTER          DIRECT, SIDE, STOREV, TRANS
-      INTEGER            K, LDC, LDT, LDV, LDWORK, M, N
+      CHARACTER          UPLO
+      INTEGER            INFO, KB, LDA, LDW, N, NB
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         C( LDC, * ), T( LDT, * ), V( LDV, * ),
-     $                   WORK( LDWORK, * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * ), W( LDW, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      DOUBLE PRECISION   EIGHT, SEVTEN
+      PARAMETER          ( EIGHT = 8.0D+0, SEVTEN = 17.0D+0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      CHARACTER          TRANST
-      INTEGER            I, J
+      INTEGER            IMAX, J, JB, JJ, JMAX, JP, K, KK, KKW, KP,
+     $                   KSTEP, KW
+      DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, ROWMAX
+      COMPLEX*16         D11, D21, D22, R1, T, Z
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      INTEGER            IZAMAX
+      EXTERNAL           LSAME, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           ZCOPY, ZGEMM, ZLACGV, ZTRMM
+      EXTERNAL           ZCOPY, ZGEMM, ZGEMV, ZSCAL, ZSWAP
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG
+      INTRINSIC          ABS, DBLE, DIMAG, MAX, MIN, SQRT
 *     ..
-*     .. Executable Statements ..
-*
-*     Quick return if possible
-*
-      IF( M.LE.0 .OR. N.LE.0 )
-     $   RETURN
-*
-      IF( LSAME( TRANS, 'N' ) ) THEN
-         TRANST = 'C'
-      ELSE
-         TRANST = 'N'
-      END IF
-*
-      IF( LSAME( STOREV, 'C' ) ) THEN
-*
-         IF( LSAME( DIRECT, 'F' ) ) THEN
-*
-*           Let  V =  ( V1 )    (first K rows)
-*                     ( V2 )
-*           where  V1  is unit lower triangular.
-*
-            IF( LSAME( SIDE, 'L' ) ) THEN
-*
-*              Form  H * C  or  H**H * C  where  C = ( C1 )
-*                                                    ( C2 )
-*
-*              W := C**H * V  =  (C1**H * V1 + C2**H * V2)  (stored in WORK)
-*
-*              W := C1**H
-*
-               DO 10 J = 1, K
-                  CALL ZCOPY( N, C( J, 1 ), LDC, WORK( 1, J ), 1 )
-                  CALL ZLACGV( N, WORK( 1, J ), 1 )
-   10          CONTINUE
-*
-*              W := W * V1
-*
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
-     $                     K, ONE, V, LDV, WORK, LDWORK )
-               IF( M.GT.K ) THEN
-*
-*                 W := W + C2**H * V2
-*
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', N,
-     $                        K, M-K, ONE, C( K+1, 1 ), LDC,
-     $                        V( K+1, 1 ), LDV, ONE, WORK, LDWORK )
-               END IF
-*
-*              W := W * T**H  or  W * T
-*
-               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
-*
-*              C := C - V * W**H
-*
-               IF( M.GT.K ) THEN
-*
-*                 C2 := C2 - V2 * W**H
-*
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
-     $                        M-K, N, K, -ONE, V( K+1, 1 ), LDV, WORK,
-     $                        LDWORK, ONE, C( K+1, 1 ), LDC )
-               END IF
-*
-*              W := W * V1**H
-*
-               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
-     $                     'Unit', N, K, ONE, V, LDV, WORK, LDWORK )
-*
-*              C1 := C1 - W**H
-*
-               DO 30 J = 1, K
-                  DO 20 I = 1, N
-                     C( J, I ) = C( J, I ) - DCONJG( WORK( I, J ) )
-   20             CONTINUE
-   30          CONTINUE
-*
-            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
-*
-*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
-*
-*              W := C * V  =  (C1*V1 + C2*V2)  (stored in WORK)
-*
-*              W := C1
-*
-               DO 40 J = 1, K
-                  CALL ZCOPY( M, C( 1, J ), 1, WORK( 1, J ), 1 )
-   40          CONTINUE
-*
-*              W := W * V1
-*
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
-     $                     K, ONE, V, LDV, WORK, LDWORK )
-               IF( N.GT.K ) THEN
-*
-*                 W := W + C2 * V2
-*
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, K, N-K,
-     $                        ONE, C( 1, K+1 ), LDC, V( K+1, 1 ), LDV,
-     $                        ONE, WORK, LDWORK )
-               END IF
-*
-*              W := W * T  or  W * T**H
-*
-               CALL ZTRMM( 'Right', 'Upper', TRANS, 'Non-unit', M, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
-*
-*              C := C - W * V**H
-*
-               IF( N.GT.K ) THEN
-*
-*                 C2 := C2 - W * V2**H
-*
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
-     $                        N-K, K, -ONE, WORK, LDWORK, V( K+1, 1 ),
-     $                        LDV, ONE, C( 1, K+1 ), LDC )
-               END IF
-*
-*              W := W * V1**H
-*
-               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
-     $                     'Unit', M, K, ONE, V, LDV, WORK, LDWORK )
-*
-*              C1 := C1 - W
-*
-               DO 60 J = 1, K
-                  DO 50 I = 1, M
-                     C( I, J ) = C( I, J ) - WORK( I, J )
-   50             CONTINUE
-   60          CONTINUE
-            END IF
-*
-         ELSE
-*
-*           Let  V =  ( V1 )
-*                     ( V2 )    (last K rows)
-*           where  V2  is unit upper triangular.
-*
-            IF( LSAME( SIDE, 'L' ) ) THEN
-*
-*              Form  H * C  or  H**H * C  where  C = ( C1 )
-*                                                    ( C2 )
-*
-*              W := C**H * V  =  (C1**H * V1 + C2**H * V2)  (stored in WORK)
-*
-*              W := C2**H
-*
-               DO 70 J = 1, K
-                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
-                  CALL ZLACGV( N, WORK( 1, J ), 1 )
-   70          CONTINUE
-*
-*              W := W * V2
-*
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
-     $                     K, ONE, V( M-K+1, 1 ), LDV, WORK, LDWORK )
-               IF( M.GT.K ) THEN
-*
-*                 W := W + C1**H * V1
-*
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', N,
-     $                        K, M-K, ONE, C, LDC, V, LDV, ONE, WORK,
-     $                        LDWORK )
-               END IF
-*
-*              W := W * T**H  or  W * T
-*
-               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
-*
-*              C := C - V * W**H
-*
-               IF( M.GT.K ) THEN
-*
-*                 C1 := C1 - V1 * W**H
-*
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
-     $                        M-K, N, K, -ONE, V, LDV, WORK, LDWORK,
-     $                        ONE, C, LDC )
-               END IF
-*
-*              W := W * V2**H
-*
-               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
-     $                     'Unit', N, K, ONE, V( M-K+1, 1 ), LDV, WORK,
-     $                     LDWORK )
-*
-*              C2 := C2 - W**H
-*
-               DO 90 J = 1, K
-                  DO 80 I = 1, N
-                     C( M-K+J, I ) = C( M-K+J, I ) -
-     $                               DCONJG( WORK( I, J ) )
-   80             CONTINUE
-   90          CONTINUE
-*
-            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
-*
-*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
-*
-*              W := C * V  =  (C1*V1 + C2*V2)  (stored in WORK)
-*
-*              W := C2
-*
-               DO 100 J = 1, K
-                  CALL ZCOPY( M, C( 1, N-K+J ), 1, WORK( 1, J ), 1 )
-  100          CONTINUE
-*
-*              W := W * V2
-*
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
-     $                     K, ONE, V( N-K+1, 1 ), LDV, WORK, LDWORK )
-               IF( N.GT.K ) THEN
-*
-*                 W := W + C1 * V1
-*
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, K, N-K,
-     $                        ONE, C, LDC, V, LDV, ONE, WORK, LDWORK )
-               END IF
-*
-*              W := W * T  or  W * T**H
-*
-               CALL ZTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
-*
-*              C := C - W * V**H
-*
-               IF( N.GT.K ) THEN
-*
-*                 C1 := C1 - W * V1**H
-*
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
-     $                        N-K, K, -ONE, WORK, LDWORK, V, LDV, ONE,
-     $                        C, LDC )
-               END IF
-*
-*              W := W * V2**H
-*
-               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
-     $                     'Unit', M, K, ONE, V( N-K+1, 1 ), LDV, WORK,
-     $                     LDWORK )
-*
-*              C2 := C2 - W
-*
-               DO 120 J = 1, K
-                  DO 110 I = 1, M
-                     C( I, N-K+J ) = C( I, N-K+J ) - WORK( I, J )
-  110             CONTINUE
-  120          CONTINUE
-            END IF
-         END IF
-*
-      ELSE IF( LSAME( STOREV, 'R' ) ) THEN
-*
-         IF( LSAME( DIRECT, 'F' ) ) THEN
-*
-*           Let  V =  ( V1  V2 )    (V1: first K columns)
-*           where  V1  is unit upper triangular.
-*
-            IF( LSAME( SIDE, 'L' ) ) THEN
-*
-*              Form  H * C  or  H**H * C  where  C = ( C1 )
-*                                                    ( C2 )
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( Z ) = ABS( DBLE( Z ) ) + ABS( DIMAG( Z ) )
+*     ..
+*     .. Executable Statements ..
 *
-*              W := C**H * V**H  =  (C1**H * V1**H + C2**H * V2**H) (stored in WORK)
+      INFO = 0
 *
-*              W := C1**H
+*     Initialize ALPHA for use in choosing pivot block size.
 *
-               DO 130 J = 1, K
-                  CALL ZCOPY( N, C( J, 1 ), LDC, WORK( 1, J ), 1 )
-                  CALL ZLACGV( N, WORK( 1, J ), 1 )
-  130          CONTINUE
+      ALPHA = ( ONE+SQRT( SEVTEN ) ) / EIGHT
 *
-*              W := W * V1**H
+      IF( LSAME( UPLO, 'U' ) ) THEN
 *
-               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
-     $                     'Unit', N, K, ONE, V, LDV, WORK, LDWORK )
-               IF( M.GT.K ) THEN
+*        Factorize the trailing columns of A using the upper triangle
+*        of A and working backwards, and compute the matrix W = U12*D
+*        for use in updating A11
 *
-*                 W := W + C2**H * V2**H
+*        K is the main loop index, decreasing from N in steps of 1 or 2
 *
-                  CALL ZGEMM( 'Conjugate transpose',
-     $                        'Conjugate transpose', N, K, M-K, ONE,
-     $                        C( K+1, 1 ), LDC, V( 1, K+1 ), LDV, ONE,
-     $                        WORK, LDWORK )
-               END IF
+*        KW is the column of W which corresponds to column K of A
 *
-*              W := W * T**H  or  W * T
+         K = N
+   10    CONTINUE
+         KW = NB + K - N
 *
-               CALL ZTRMM( 'Right', 'Upper', TRANST, 'Non-unit', N, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
+*        Exit from loop
 *
-*              C := C - V**H * W**H
+         IF( ( K.LE.N-NB+1 .AND. NB.LT.N ) .OR. K.LT.1 )
+     $      GO TO 30
 *
-               IF( M.GT.K ) THEN
+*        Copy column K of A to column KW of W and update it
 *
-*                 C2 := C2 - V2**H * W**H
+         CALL ZCOPY( K, A( 1, K ), 1, W( 1, KW ), 1 )
+         IF( K.LT.N )
+     $      CALL ZGEMV( 'No transpose', K, N-K, -CONE, A( 1, K+1 ), LDA,
+     $                  W( K, KW+1 ), LDW, CONE, W( 1, KW ), 1 )
 *
-                  CALL ZGEMM( 'Conjugate transpose',
-     $                        'Conjugate transpose', M-K, N, K, -ONE,
-     $                        V( 1, K+1 ), LDV, WORK, LDWORK, ONE,
-     $                        C( K+1, 1 ), LDC )
-               END IF
+         KSTEP = 1
 *
-*              W := W * V1
+*        Determine rows and columns to be interchanged and whether
+*        a 1-by-1 or 2-by-2 pivot block will be used
 *
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', N,
-     $                     K, ONE, V, LDV, WORK, LDWORK )
+         ABSAKK = CABS1( W( K, KW ) )
 *
-*              C1 := C1 - W**H
+*        IMAX is the row-index of the largest off-diagonal element in
+
 *
-               DO 150 J = 1, K
-                  DO 140 I = 1, N
-                     C( J, I ) = C( J, I ) - DCONJG( WORK( I, J ) )
-  140             CONTINUE
-  150          CONTINUE
+         IF( K.GT.1 ) THEN
+            IMAX = IZAMAX( K-1, W( 1, KW ), 1 )
+            COLMAX = CABS1( W( IMAX, KW ) )
+         ELSE
+            COLMAX = ZERO
+         END IF
 *
-            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+         IF( MAX( ABSAKK, COLMAX ).EQ.ZERO ) THEN
 *
-*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
+*           Column K is zero or underflow: set INFO and continue
 *
-*              W := C * V**H  =  (C1*V1**H + C2*V2**H)  (stored in WORK)
+            IF( INFO.EQ.0 )
+     $         INFO = K
+            KP = K
+         ELSE
+            IF( ABSAKK.GE.ALPHA*COLMAX ) THEN
 *
-*              W := C1
+*              no interchange, use 1-by-1 pivot block
 *
-               DO 160 J = 1, K
-                  CALL ZCOPY( M, C( 1, J ), 1, WORK( 1, J ), 1 )
-  160          CONTINUE
+               KP = K
+            ELSE
 *
-*              W := W * V1**H
+*              Copy column IMAX to column KW-1 of W and update it
 *
-               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
-     $                     'Unit', M, K, ONE, V, LDV, WORK, LDWORK )
-               IF( N.GT.K ) THEN
+               CALL ZCOPY( IMAX, A( 1, IMAX ), 1, W( 1, KW-1 ), 1 )
+               CALL ZCOPY( K-IMAX, A( IMAX, IMAX+1 ), LDA,
+     $                     W( IMAX+1, KW-1 ), 1 )
+               IF( K.LT.N )
+     $            CALL ZGEMV( 'No transpose', K, N-K, -CONE,
+     $                        A( 1, K+1 ), LDA, W( IMAX, KW+1 ), LDW,
+     $                        CONE, W( 1, KW-1 ), 1 )
 *
-*                 W := W + C2 * V2**H
+*              JMAX is the column-index of the largest off-diagonal
+*              element in row IMAX, and ROWMAX is its absolute value
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
-     $                        K, N-K, ONE, C( 1, K+1 ), LDC,
-     $                        V( 1, K+1 ), LDV, ONE, WORK, LDWORK )
+               JMAX = IMAX + IZAMAX( K-IMAX, W( IMAX+1, KW-1 ), 1 )
+               ROWMAX = CABS1( W( JMAX, KW-1 ) )
+               IF( IMAX.GT.1 ) THEN
+                  JMAX = IZAMAX( IMAX-1, W( 1, KW-1 ), 1 )
+                  ROWMAX = MAX( ROWMAX, CABS1( W( JMAX, KW-1 ) ) )
                END IF
 *
-*              W := W * T  or  W * T**H
-*
-               CALL ZTRMM( 'Right', 'Upper', TRANS, 'Non-unit', M, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
-*
-*              C := C - W * V
+               IF( ABSAKK.GE.ALPHA*COLMAX*( COLMAX / ROWMAX ) ) THEN
 *
-               IF( N.GT.K ) THEN
+*                 no interchange, use 1-by-1 pivot block
 *
-*                 C2 := C2 - W * V2
+                  KP = K
+               ELSE IF( CABS1( W( IMAX, KW-1 ) ).GE.ALPHA*ROWMAX ) THEN
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K, K,
-     $                        -ONE, WORK, LDWORK, V( 1, K+1 ), LDV, ONE,
-     $                        C( 1, K+1 ), LDC )
-               END IF
+*                 interchange rows and columns K and IMAX, use 1-by-1
+*                 pivot block
 *
-*              W := W * V1
+                  KP = IMAX
 *
-               CALL ZTRMM( 'Right', 'Upper', 'No transpose', 'Unit', M,
-     $                     K, ONE, V, LDV, WORK, LDWORK )
+*                 copy column KW-1 of W to column KW of W
 *
-*              C1 := C1 - W
+                  CALL ZCOPY( K, W( 1, KW-1 ), 1, W( 1, KW ), 1 )
+               ELSE
 *
-               DO 180 J = 1, K
-                  DO 170 I = 1, M
-                     C( I, J ) = C( I, J ) - WORK( I, J )
-  170             CONTINUE
-  180          CONTINUE
+*                 interchange rows and columns K-1 and IMAX, use 2-by-2
+*                 pivot block
 *
+                  KP = IMAX
+                  KSTEP = 2
+               END IF
             END IF
 *
-         ELSE
-*
-*           Let  V =  ( V1  V2 )    (V2: last K columns)
-*           where  V2  is unit lower triangular.
-*
-            IF( LSAME( SIDE, 'L' ) ) THEN
+*           ============================================================
 *
-*              Form  H * C  or  H**H * C  where  C = ( C1 )
-*                                                    ( C2 )
+*           KK is the column of A where pivoting step stopped
 *
-*              W := C**H * V**H  =  (C1**H * V1**H + C2**H * V2**H) (stored in WORK)
+            KK = K - KSTEP + 1
 *
-*              W := C2**H
+*           KKW is the column of W which corresponds to column KK of A
 *
-               DO 190 J = 1, K
-                  CALL ZCOPY( N, C( M-K+J, 1 ), LDC, WORK( 1, J ), 1 )
-                  CALL ZLACGV( N, WORK( 1, J ), 1 )
-  190          CONTINUE
+            KKW = NB + KK - N
 *
-*              W := W * V2**H
+*           Interchange rows and columns KP and KK.
+*           Updated column KP is already stored in column KKW of W.
 *
-               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
-     $                     'Unit', N, K, ONE, V( 1, M-K+1 ), LDV, WORK,
-     $                     LDWORK )
-               IF( M.GT.K ) THEN
+            IF( KP.NE.KK ) THEN
 *
-*                 W := W + C1**H * V1**H
+*              Copy non-updated column KK to column KP of submatrix A
+*              at step K. No need to copy element into column K
+*              (or K and K-1 for 2-by-2 pivot) of A, since these columns
+*              will be later overwritten.
 *
-                  CALL ZGEMM( 'Conjugate transpose',
-     $                        'Conjugate transpose', N, K, M-K, ONE, C,
-     $                        LDC, V, LDV, ONE, WORK, LDWORK )
-               END IF
+               A( KP, KP ) = A( KK, KK )
+               CALL ZCOPY( KK-1-KP, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $                     LDA )
+               IF( KP.GT.1 )
+     $            CALL ZCOPY( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
 *
-*              W := W * T**H  or  W * T
+*              Interchange rows KK and KP in last K+1 to N columns of A
+*              (columns K (or K and K-1 for 2-by-2 pivot) of A will be
+*              later overwritten). Interchange rows KK and KP
+*              in last KKW to NB columns of W.
 *
-               CALL ZTRMM( 'Right', 'Lower', TRANST, 'Non-unit', N, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
+               IF( K.LT.N )
+     $            CALL ZSWAP( N-K, A( KK, K+1 ), LDA, A( KP, K+1 ),
+     $                        LDA )
+               CALL ZSWAP( N-KK+1, W( KK, KKW ), LDW, W( KP, KKW ),
+     $                     LDW )
+            END IF
 *
-*              C := C - V**H * W**H
+            IF( KSTEP.EQ.1 ) THEN
 *
-               IF( M.GT.K ) THEN
+*              1-by-1 pivot block D(k): column kw of W now holds
 *
-*                 C1 := C1 - V1**H * W**H
+*              W(kw) = U(k)*D(k),
 *
-                  CALL ZGEMM( 'Conjugate transpose',
-     $                        'Conjugate transpose', M-K, N, K, -ONE, V,
-     $                        LDV, WORK, LDWORK, ONE, C, LDC )
-               END IF
+*              where U(k) is the k-th column of U
 *
-*              W := W * V2
+*              Store subdiag. elements of column U(k)
+*              and 1-by-1 block D(k) in column k of A.
+*              NOTE: Diagonal element U(k,k) is a UNIT element
+*              and not stored.
+*                 A(k,k) := D(k,k) = W(k,kw)
+*                 A(1:k-1,k) := U(1:k-1,k) = W(1:k-1,kw)/D(k,k)
 *
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', N,
-     $                     K, ONE, V( 1, M-K+1 ), LDV, WORK, LDWORK )
+               CALL ZCOPY( K, W( 1, KW ), 1, A( 1, K ), 1 )
+               R1 = CONE / A( K, K )
+               CALL ZSCAL( K-1, R1, A( 1, K ), 1 )
 *
-*              C2 := C2 - W**H
+            ELSE
 *
-               DO 210 J = 1, K
-                  DO 200 I = 1, N
-                     C( M-K+J, I ) = C( M-K+J, I ) -
-     $                               DCONJG( WORK( I, J ) )
-  200             CONTINUE
-  210          CONTINUE
+*              2-by-2 pivot block D(k): columns kw and kw-1 of W now hold
 *
-            ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+*              ( W(kw-1) W(kw) ) = ( U(k-1) U(k) )*D(k)
 *
-*              Form  C * H  or  C * H**H  where  C = ( C1  C2 )
+*              where U(k) and U(k-1) are the k-th and (k-1)-th columns
+*              of U
 *
-*              W := C * V**H  =  (C1*V1**H + C2*V2**H)  (stored in WORK)
+*              Store U(1:k-2,k-1) and U(1:k-2,k) and 2-by-2
+*              block D(k-1:k,k-1:k) in columns k-1 and k of A.
+*              NOTE: 2-by-2 diagonal block U(k-1:k,k-1:k) is a UNIT
+*              block and not stored.
+*                 A(k-1:k,k-1:k) := D(k-1:k,k-1:k) = W(k-1:k,kw-1:kw)
+*                 A(1:k-2,k-1:k) := U(1:k-2,k:k-1:k) =
+*                 = W(1:k-2,kw-1:kw) * ( D(k-1:k,k-1:k)**(-1) )
 *
-*              W := C2
+               IF( K.GT.2 ) THEN
 *
-               DO 220 J = 1, K
-                  CALL ZCOPY( M, C( 1, N-K+J ), 1, WORK( 1, J ), 1 )
-  220          CONTINUE
+*                 Compose the columns of the inverse of 2-by-2 pivot
+*                 block D in the following way to reduce the number
+*                 of FLOPS when we myltiply panel ( W(kw-1) W(kw) ) by
+*                 this inverse
 *
-*              W := W * V2**H
+*                 D**(-1) = ( d11 d21 )**(-1) =
+*                           ( d21 d22 )
 *
-               CALL ZTRMM( 'Right', 'Lower', 'Conjugate transpose',
-     $                     'Unit', M, K, ONE, V( 1, N-K+1 ), LDV, WORK,
-     $                     LDWORK )
-               IF( N.GT.K ) THEN
+*                 = 1/(d11*d22-d21**2) * ( ( d22 ) (-d21 ) ) =
+*                                        ( (-d21 ) ( d11 ) )
 *
-*                 W := W + C1 * V1**H
+*                 = 1/d21 * 1/((d11/d21)*(d22/d21)-1) *
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose', M,
-     $                        K, N-K, ONE, C, LDC, V, LDV, ONE, WORK,
-     $                        LDWORK )
-               END IF
+*                   * ( ( d22/d21 ) (      -1 ) ) =
+*                     ( (      -1 ) ( d11/d21 ) )
 *
-*              W := W * T  or  W * T**H
+*                 = 1/d21 * 1/(D22*D11-1) * ( ( D11 ) (  -1 ) ) =
+*                                           ( ( -1  ) ( D22 ) )
 *
-               CALL ZTRMM( 'Right', 'Lower', TRANS, 'Non-unit', M, K,
-     $                     ONE, T, LDT, WORK, LDWORK )
+*                 = 1/d21 * T * ( ( D11 ) (  -1 ) )
+*                               ( (  -1 ) ( D22 ) )
 *
-*              C := C - W * V
+*                 = D21 * ( ( D11 ) (  -1 ) )
+*                         ( (  -1 ) ( D22 ) )
 *
-               IF( N.GT.K ) THEN
+                  D21 = W( K-1, KW )
+                  D11 = W( K, KW ) / D21
+                  D22 = W( K-1, KW-1 ) / D21
+                  T = CONE / ( D11*D22-CONE )
+                  D21 = T / D21
 *
-*                 C1 := C1 - W * V1
+*                 Update elements in columns A(k-1) and A(k) as
+*                 dot products of rows of ( W(kw-1) W(kw) ) and columns
+*                 of D**(-1)
 *
-                  CALL ZGEMM( 'No transpose', 'No transpose', M, N-K, K,
-     $                        -ONE, WORK, LDWORK, V, LDV, ONE, C, LDC )
+                  DO 20 J = 1, K - 2
+                     A( J, K-1 ) = D21*( D11*W( J, KW-1 )-W( J, KW ) )
+                     A( J, K ) = D21*( D22*W( J, KW )-W( J, KW-1 ) )
+   20             CONTINUE
                END IF
 *
-*              W := W * V2
-*
-               CALL ZTRMM( 'Right', 'Lower', 'No transpose', 'Unit', M,
-     $                     K, ONE, V( 1, N-K+1 ), LDV, WORK, LDWORK )
-*
-*              C1 := C1 - W
+*              Copy D(k) to A
 *
-               DO 240 J = 1, K
-                  DO 230 I = 1, M
-                     C( I, N-K+J ) = C( I, N-K+J ) - WORK( I, J )
-  230             CONTINUE
-  240          CONTINUE
+               A( K-1, K-1 ) = W( K-1, KW-1 )
+               A( K-1, K ) = W( K-1, KW )
+               A( K, K ) = W( K, KW )
 *
             END IF
 *
          END IF
-      END IF
 *
-      RETURN
+*        Store details of the interchanges in IPIV
 *
-*     End of ZLARFB
+         IF( KSTEP.EQ.1 ) THEN
+            IPIV( K ) = KP
+         ELSE
+            IPIV( K ) = -KP
+            IPIV( K-1 ) = -KP
+         END IF
 *
-      END
-*> \brief \b ZLARFG generates an elementary reflector (Householder matrix).
+*        Decrease K and return to the start of the main loop
 *
-*  =========== DOCUMENTATION ===========
+         K = K - KSTEP
+         GO TO 10
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+   30    CONTINUE
 *
-*> \htmlonly
-*> Download ZLARFG + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfg.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarfg.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfg.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*        Update the upper triangle of A11 (= A(1:k,1:k)) as
 *
-*  Definition:
-*  ===========
+*        A11 := A11 - U12*D*U12**T = A11 - U12*W**T
 *
-*       SUBROUTINE ZLARFG( N, ALPHA, X, INCX, TAU )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INCX, N
-*       COMPLEX*16         ALPHA, TAU
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         X( * )
-*       ..
-*  
+*        computing blocks of NB columns at a time
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLARFG generates a complex elementary reflector H of order n, such
-*> that
-*>
-*>       H**H * ( alpha ) = ( beta ),   H**H * H = I.
-*>              (   x   )   (   0  )
-*>
-*> where alpha and beta are scalars, with beta real, and x is an
-*> (n-1)-element complex vector. H is represented in the form
-*>
-*>       H = I - tau * ( 1 ) * ( 1 v**H ) ,
-*>                     ( v )
-*>
-*> where tau is a complex scalar and v is a complex (n-1)-element
-*> vector. Note that H is not hermitian.
-*>
-*> If the elements of x are all zero and alpha is real, then tau = 0
-*> and H is taken to be the unit matrix.
-*>
-*> Otherwise  1 <= real(tau) <= 2  and  abs(tau-1) <= 1 .
-*> \endverbatim
+         DO 50 J = ( ( K-1 ) / NB )*NB + 1, 1, -NB
+            JB = MIN( NB, K-J+1 )
 *
-*  Arguments:
-*  ==========
+*           Update the upper triangle of the diagonal block
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the elementary reflector.
-*> \endverbatim
-*>
-*> \param[in,out] ALPHA
-*> \verbatim
-*>          ALPHA is COMPLEX*16
-*>          On entry, the value alpha.
-*>          On exit, it is overwritten with the value beta.
-*> \endverbatim
-*>
-*> \param[in,out] X
-*> \verbatim
-*>          X is COMPLEX*16 array, dimension
-*>                         (1+(N-2)*abs(INCX))
-*>          On entry, the vector x.
-*>          On exit, it is overwritten with the vector v.
-*> \endverbatim
-*>
-*> \param[in] INCX
-*> \verbatim
-*>          INCX is INTEGER
-*>          The increment between elements of X. INCX > 0.
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16
-*>          The value tau.
-*> \endverbatim
+            DO 40 JJ = J, J + JB - 1
+               CALL ZGEMV( 'No transpose', JJ-J+1, N-K, -CONE,
+     $                     A( J, K+1 ), LDA, W( JJ, KW+1 ), LDW, CONE,
+     $                     A( J, JJ ), 1 )
+   40       CONTINUE
 *
-*  Authors:
-*  ========
+*           Update the rectangular superdiagonal block
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+            CALL ZGEMM( 'No transpose', 'Transpose', J-1, JB, N-K,
+     $                  -CONE, A( 1, K+1 ), LDA, W( J, KW+1 ), LDW,
+     $                  CONE, A( 1, J ), LDA )
+   50    CONTINUE
 *
-*> \date September 2012
+*        Put U12 in standard form by partially undoing the interchanges
+*        in columns k+1:n looping backwards from k+1 to n
 *
-*> \ingroup complex16OTHERauxiliary
+         J = K + 1
+   60    CONTINUE
 *
-*  =====================================================================
-      SUBROUTINE ZLARFG( N, ALPHA, X, INCX, TAU )
+*           Undo the interchanges (if any) of rows JJ and JP at each
+*           step J
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*           (Here, J is a diagonal index)
+            JJ = J
+            JP = IPIV( J )
+            IF( JP.LT.0 ) THEN
+               JP = -JP
+*              (Here, J is a diagonal index)
+               J = J + 1
+            END IF
+*           (NOTE: Here, J is used to determine row length. Length N-J+1
+*           of the rows to swap back doesn't include diagonal element)
+            J = J + 1
+            IF( JP.NE.JJ .AND. J.LE.N )
+     $         CALL ZSWAP( N-J+1, A( JP, J ), LDA, A( JJ, J ), LDA )
+         IF( J.LT.N )
+     $      GO TO 60
 *
-*     .. Scalar Arguments ..
-      INTEGER            INCX, N
-      COMPLEX*16         ALPHA, TAU
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         X( * )
-*     ..
+*        Set KB to the number of columns factorized
 *
-*  =====================================================================
+         KB = N - K
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            J, KNT
-      DOUBLE PRECISION   ALPHI, ALPHR, BETA, RSAFMN, SAFMIN, XNORM
-*     ..
-*     .. External Functions ..
-      DOUBLE PRECISION   DLAMCH, DLAPY3, DZNRM2
-      COMPLEX*16         ZLADIV
-      EXTERNAL           DLAMCH, DLAPY3, DZNRM2, ZLADIV
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, SIGN
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZDSCAL, ZSCAL
-*     ..
-*     .. Executable Statements ..
+      ELSE
 *
-      IF( N.LE.0 ) THEN
-         TAU = ZERO
-         RETURN
-      END IF
+*        Factorize the leading columns of A using the lower triangle
+*        of A and working forwards, and compute the matrix W = L21*D
+*        for use in updating A22
 *
-      XNORM = DZNRM2( N-1, X, INCX )
-      ALPHR = DBLE( ALPHA )
-      ALPHI = DIMAG( ALPHA )
+*        K is the main loop index, increasing from 1 in steps of 1 or 2
 *
-      IF( XNORM.EQ.ZERO .AND. ALPHI.EQ.ZERO ) THEN
+         K = 1
+   70    CONTINUE
 *
-*        H  =  I
+*        Exit from loop
 *
-         TAU = ZERO
-      ELSE
+         IF( ( K.GE.NB .AND. NB.LT.N ) .OR. K.GT.N )
+     $      GO TO 90
 *
-*        general case
+*        Copy column K of A to column K of W and update it
 *
-         BETA = -SIGN( DLAPY3( ALPHR, ALPHI, XNORM ), ALPHR )
-         SAFMIN = DLAMCH( 'S' ) / DLAMCH( 'E' )
-         RSAFMN = ONE / SAFMIN
+         CALL ZCOPY( N-K+1, A( K, K ), 1, W( K, K ), 1 )
+         CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ), LDA,
+     $               W( K, 1 ), LDW, CONE, W( K, K ), 1 )
 *
-         KNT = 0
-         IF( ABS( BETA ).LT.SAFMIN ) THEN
+         KSTEP = 1
 *
-*           XNORM, BETA may be inaccurate; scale X and recompute them
+*        Determine rows and columns to be interchanged and whether
+*        a 1-by-1 or 2-by-2 pivot block will be used
 *
-   10       CONTINUE
-            KNT = KNT + 1
-            CALL ZDSCAL( N-1, RSAFMN, X, INCX )
-            BETA = BETA*RSAFMN
-            ALPHI = ALPHI*RSAFMN
-            ALPHR = ALPHR*RSAFMN
-            IF( ABS( BETA ).LT.SAFMIN )
-     $         GO TO 10
+         ABSAKK = CABS1( W( K, K ) )
 *
-*           New BETA is at most 1, at least SAFMIN
+*        IMAX is the row-index of the largest off-diagonal element in
+
 *
-            XNORM = DZNRM2( N-1, X, INCX )
-            ALPHA = DCMPLX( ALPHR, ALPHI )
-            BETA = -SIGN( DLAPY3( ALPHR, ALPHI, XNORM ), ALPHR )
+         IF( K.LT.N ) THEN
+            IMAX = K + IZAMAX( N-K, W( K+1, K ), 1 )
+            COLMAX = CABS1( W( IMAX, K ) )
+         ELSE
+            COLMAX = ZERO
          END IF
-         TAU = DCMPLX( ( BETA-ALPHR ) / BETA, -ALPHI / BETA )
-         ALPHA = ZLADIV( DCMPLX( ONE ), ALPHA-BETA )
-         CALL ZSCAL( N-1, ALPHA, X, INCX )
-*
-*        If ALPHA is subnormal, it may lose relative accuracy
 *
-         DO 20 J = 1, KNT
-            BETA = BETA*SAFMIN
- 20      CONTINUE
-         ALPHA = BETA
-      END IF
+         IF( MAX( ABSAKK, COLMAX ).EQ.ZERO ) THEN
 *
-      RETURN
+*           Column K is zero or underflow: set INFO and continue
 *
-*     End of ZLARFG
+            IF( INFO.EQ.0 )
+     $         INFO = K
+            KP = K
+         ELSE
+            IF( ABSAKK.GE.ALPHA*COLMAX ) THEN
 *
-      END
-*> \brief \b ZLARFT forms the triangular factor T of a block reflector H = I - vtvH
+*              no interchange, use 1-by-1 pivot block
 *
-*  =========== DOCUMENTATION ===========
+               KP = K
+            ELSE
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*              Copy column IMAX to column K+1 of W and update it
 *
-*> \htmlonly
-*> Download ZLARFT + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarft.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarft.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarft.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+               CALL ZCOPY( IMAX-K, A( IMAX, K ), LDA, W( K, K+1 ), 1 )
+               CALL ZCOPY( N-IMAX+1, A( IMAX, IMAX ), 1, W( IMAX, K+1 ),
+     $                     1 )
+               CALL ZGEMV( 'No transpose', N-K+1, K-1, -CONE, A( K, 1 ),
+     $                     LDA, W( IMAX, 1 ), LDW, CONE, W( K, K+1 ),
+     $                     1 )
 *
-*  Definition:
-*  ===========
+*              JMAX is the column-index of the largest off-diagonal
+*              element in row IMAX, and ROWMAX is its absolute value
 *
-*       SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          DIRECT, STOREV
-*       INTEGER            K, LDT, LDV, N
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
-*       ..
-*  
+               JMAX = K - 1 + IZAMAX( IMAX-K, W( K, K+1 ), 1 )
+               ROWMAX = CABS1( W( JMAX, K+1 ) )
+               IF( IMAX.LT.N ) THEN
+                  JMAX = IMAX + IZAMAX( N-IMAX, W( IMAX+1, K+1 ), 1 )
+                  ROWMAX = MAX( ROWMAX, CABS1( W( JMAX, K+1 ) ) )
+               END IF
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLARFT forms the triangular factor T of a complex block reflector H
-*> of order n, which is defined as a product of k elementary reflectors.
-*>
-*> If DIRECT = 'F', H = H(1) H(2) . . . H(k) and T is upper triangular;
-*>
-*> If DIRECT = 'B', H = H(k) . . . H(2) H(1) and T is lower triangular.
-*>
-*> If STOREV = 'C', the vector which defines the elementary reflector
-*> H(i) is stored in the i-th column of the array V, and
-*>
-*>    H  =  I - V * T * V**H
-*>
-*> If STOREV = 'R', the vector which defines the elementary reflector
-*> H(i) is stored in the i-th row of the array V, and
-*>
-*>    H  =  I - V**H * T * V
-*> \endverbatim
+               IF( ABSAKK.GE.ALPHA*COLMAX*( COLMAX / ROWMAX ) ) THEN
 *
-*  Arguments:
-*  ==========
+*                 no interchange, use 1-by-1 pivot block
 *
-*> \param[in] DIRECT
-*> \verbatim
-*>          DIRECT is CHARACTER*1
-*>          Specifies the order in which the elementary reflectors are
-*>          multiplied to form the block reflector:
-*>          = 'F': H = H(1) H(2) . . . H(k) (Forward)
-*>          = 'B': H = H(k) . . . H(2) H(1) (Backward)
-*> \endverbatim
-*>
-*> \param[in] STOREV
-*> \verbatim
-*>          STOREV is CHARACTER*1
-*>          Specifies how the vectors which define the elementary
-*>          reflectors are stored (see also Further Details):
-*>          = 'C': columnwise
-*>          = 'R': rowwise
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the block reflector H. N >= 0.
-*> \endverbatim
-*>
-*> \param[in] K
-*> \verbatim
-*>          K is INTEGER
-*>          The order of the triangular factor T (= the number of
-*>          elementary reflectors). K >= 1.
-*> \endverbatim
-*>
-*> \param[in] V
-*> \verbatim
-*>          V is COMPLEX*16 array, dimension
-*>                               (LDV,K) if STOREV = 'C'
-*>                               (LDV,N) if STOREV = 'R'
-*>          The matrix V. See further details.
-*> \endverbatim
-*>
-*> \param[in] LDV
-*> \verbatim
-*>          LDV is INTEGER
-*>          The leading dimension of the array V.
-*>          If STOREV = 'C', LDV >= max(1,N); if STOREV = 'R', LDV >= K.
-*> \endverbatim
-*>
-*> \param[in] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i).
-*> \endverbatim
-*>
-*> \param[out] T
-*> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,K)
-*>          The k by k triangular factor T of the block reflector.
-*>          If DIRECT = 'F', T is upper triangular; if DIRECT = 'B', T is
-*>          lower triangular. The rest of the array is not used.
-*> \endverbatim
-*>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T. LDT >= K.
-*> \endverbatim
+                  KP = K
+               ELSE IF( CABS1( W( IMAX, K+1 ) ).GE.ALPHA*ROWMAX ) THEN
 *
-*  Authors:
-*  ========
+*                 interchange rows and columns K and IMAX, use 1-by-1
+*                 pivot block
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+                  KP = IMAX
 *
-*> \date September 2012
+*                 copy column K+1 of W to column K of W
 *
-*> \ingroup complex16OTHERauxiliary
+                  CALL ZCOPY( N-K+1, W( K, K+1 ), 1, W( K, K ), 1 )
+               ELSE
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The shape of the matrix V and the storage of the vectors which define
-*>  the H(i) is best illustrated by the following example with n = 5 and
-*>  k = 3. The elements equal to 1 are not stored.
-*>
-*>  DIRECT = 'F' and STOREV = 'C':         DIRECT = 'F' and STOREV = 'R':
-*>
-*>               V = (  1       )                 V = (  1 v1 v1 v1 v1 )
-*>                   ( v1  1    )                     (     1 v2 v2 v2 )
-*>                   ( v1 v2  1 )                     (        1 v3 v3 )
-*>                   ( v1 v2 v3 )
-*>                   ( v1 v2 v3 )
-*>
-*>  DIRECT = 'B' and STOREV = 'C':         DIRECT = 'B' and STOREV = 'R':
-*>
-*>               V = ( v1 v2 v3 )                 V = ( v1 v1  1       )
-*>                   ( v1 v2 v3 )                     ( v2 v2 v2  1    )
-*>                   (  1 v2 v3 )                     ( v3 v3 v3 v3  1 )
-*>                   (     1 v3 )
-*>                   (        1 )
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE ZLARFT( DIRECT, STOREV, N, K, V, LDV, TAU, T, LDT )
+*                 interchange rows and columns K+1 and IMAX, use 2-by-2
+*                 pivot block
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+                  KP = IMAX
+                  KSTEP = 2
+               END IF
+            END IF
 *
-*     .. Scalar Arguments ..
-      CHARACTER          DIRECT, STOREV
-      INTEGER            K, LDT, LDV, N
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         T( LDT, * ), TAU( * ), V( LDV, * )
-*     ..
+*           ============================================================
 *
-*  =====================================================================
+*           KK is the column of A where pivoting step stopped
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, J, PREVLASTV, LASTV
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZGEMV, ZLACGV, ZTRMV
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. Executable Statements ..
+            KK = K + KSTEP - 1
 *
-*     Quick return if possible
+*           Interchange rows and columns KP and KK.
+*           Updated column KP is already stored in column KK of W.
 *
-      IF( N.EQ.0 )
-     $   RETURN
+            IF( KP.NE.KK ) THEN
 *
-      IF( LSAME( DIRECT, 'F' ) ) THEN
-         PREVLASTV = N
-         DO I = 1, K
-            PREVLASTV = MAX( PREVLASTV, I )
-            IF( TAU( I ).EQ.ZERO ) THEN
+*              Copy non-updated column KK to column KP of submatrix A
+*              at step K. No need to copy element into column K
+*              (or K and K+1 for 2-by-2 pivot) of A, since these columns
+*              will be later overwritten.
 *
-*              H(i)  =  I
+               A( KP, KP ) = A( KK, KK )
+               CALL ZCOPY( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $                     LDA )
+               IF( KP.LT.N )
+     $            CALL ZCOPY( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
 *
-               DO J = 1, I
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
+*              Interchange rows KK and KP in first K-1 columns of A
+*              (columns K (or K and K+1 for 2-by-2 pivot) of A will be
+*              later overwritten). Interchange rows KK and KP
+*              in first KK columns of W.
 *
-*              general case
+               IF( K.GT.1 )
+     $            CALL ZSWAP( K-1, A( KK, 1 ), LDA, A( KP, 1 ), LDA )
+               CALL ZSWAP( KK, W( KK, 1 ), LDW, W( KP, 1 ), LDW )
+            END IF
 *
-               IF( LSAME( STOREV, 'C' ) ) THEN
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( LASTV, I ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * CONJG( V( I , J ) )
-                  END DO                     
-                  J = MIN( LASTV, PREVLASTV )
+            IF( KSTEP.EQ.1 ) THEN
 *
-*                 T(1:i-1,i) := - tau(i) * V(i:j,1:i-1)**H * V(i:j,i)
+*              1-by-1 pivot block D(k): column k of W now holds
 *
-                  CALL ZGEMV( 'Conjugate transpose', J-I, I-1,
-     $                        -TAU( I ), V( I+1, 1 ), LDV, 
-     $                        V( I+1, I ), 1, ONE, T( 1, I ), 1 )
-               ELSE
-*                 Skip any trailing zeros.
-                  DO LASTV = N, I+1, -1
-                     IF( V( I, LASTV ).NE.ZERO ) EXIT
-                  END DO
-                  DO J = 1, I-1
-                     T( J, I ) = -TAU( I ) * V( J , I )
-                  END DO                     
-                  J = MIN( LASTV, PREVLASTV )
+*              W(k) = L(k)*D(k),
 *
-*                 T(1:i-1,i) := - tau(i) * V(1:i-1,i:j) * V(i,i:j)**H
+*              where L(k) is the k-th column of L
 *
-                  CALL ZGEMM( 'N', 'C', I-1, 1, J-I, -TAU( I ),
-     $                        V( 1, I+1 ), LDV, V( I, I+1 ), LDV,
-     $                        ONE, T( 1, I ), LDT )                  
+*              Store subdiag. elements of column L(k)
+*              and 1-by-1 block D(k) in column k of A.
+*              (NOTE: Diagonal element L(k,k) is a UNIT element
+*              and not stored)
+*                 A(k,k) := D(k,k) = W(k,k)
+*                 A(k+1:N,k) := L(k+1:N,k) = W(k+1:N,k)/D(k,k)
+*
+               CALL ZCOPY( N-K+1, W( K, K ), 1, A( K, K ), 1 )
+               IF( K.LT.N ) THEN
+                  R1 = CONE / A( K, K )
+                  CALL ZSCAL( N-K, R1, A( K+1, K ), 1 )
                END IF
 *
-*              T(1:i-1,i) := T(1:i-1,1:i-1) * T(1:i-1,i)
+            ELSE
 *
-               CALL ZTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T,
-     $                     LDT, T( 1, I ), 1 )
-               T( I, I ) = TAU( I )
-               IF( I.GT.1 ) THEN
-                  PREVLASTV = MAX( PREVLASTV, LASTV )
-               ELSE
-                  PREVLASTV = LASTV
-               END IF
-             END IF
-         END DO
-      ELSE
-         PREVLASTV = 1
-         DO I = K, 1, -1
-            IF( TAU( I ).EQ.ZERO ) THEN
+*              2-by-2 pivot block D(k): columns k and k+1 of W now hold
 *
-*              H(i)  =  I
+*              ( W(k) W(k+1) ) = ( L(k) L(k+1) )*D(k)
 *
-               DO J = I, K
-                  T( J, I ) = ZERO
-               END DO
-            ELSE
+*              where L(k) and L(k+1) are the k-th and (k+1)-th columns
+*              of L
 *
-*              general case
+*              Store L(k+2:N,k) and L(k+2:N,k+1) and 2-by-2
+*              block D(k:k+1,k:k+1) in columns k and k+1 of A.
+*              (NOTE: 2-by-2 diagonal block L(k:k+1,k:k+1) is a UNIT
+*              block and not stored)
+*                 A(k:k+1,k:k+1) := D(k:k+1,k:k+1) = W(k:k+1,k:k+1)
+*                 A(k+2:N,k:k+1) := L(k+2:N,k:k+1) =
+*                 = W(k+2:N,k:k+1) * ( D(k:k+1,k:k+1)**(-1) )
 *
-               IF( I.LT.K ) THEN
-                  IF( LSAME( STOREV, 'C' ) ) THEN
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( LASTV, I ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * CONJG( V( N-K+I , J ) )
-                     END DO                        
-                     J = MAX( LASTV, PREVLASTV )
+               IF( K.LT.N-1 ) THEN
 *
-*                    T(i+1:k,i) = -tau(i) * V(j:n-k+i,i+1:k)**H * V(j:n-k+i,i)
+*                 Compose the columns of the inverse of 2-by-2 pivot
+*                 block D in the following way to reduce the number
+*                 of FLOPS when we myltiply panel ( W(k) W(k+1) ) by
+*                 this inverse
 *
-                     CALL ZGEMV( 'Conjugate transpose', N-K+I-J, K-I,
-     $                           -TAU( I ), V( J, I+1 ), LDV, V( J, I ),
-     $                           1, ONE, T( I+1, I ), 1 )
-                  ELSE
-*                    Skip any leading zeros.
-                     DO LASTV = 1, I-1
-                        IF( V( I, LASTV ).NE.ZERO ) EXIT
-                     END DO
-                     DO J = I+1, K
-                        T( J, I ) = -TAU( I ) * V( J, N-K+I )
-                     END DO                                           
-                     J = MAX( LASTV, PREVLASTV )
+*                 D**(-1) = ( d11 d21 )**(-1) =
+*                           ( d21 d22 )
 *
-*                    T(i+1:k,i) = -tau(i) * V(i+1:k,j:n-k+i) * V(i,j:n-k+i)**H
+*                 = 1/(d11*d22-d21**2) * ( ( d22 ) (-d21 ) ) =
+*                                        ( (-d21 ) ( d11 ) )
 *
-                     CALL ZGEMM( 'N', 'C', K-I, 1, N-K+I-J, -TAU( I ),
-     $                           V( I+1, J ), LDV, V( I, J ), LDV,
-     $                           ONE, T( I+1, I ), LDT )                     
-                  END IF
+*                 = 1/d21 * 1/((d11/d21)*(d22/d21)-1) *
 *
-*                 T(i+1:k,i) := T(i+1:k,i+1:k) * T(i+1:k,i)
+*                   * ( ( d22/d21 ) (      -1 ) ) =
+*                     ( (      -1 ) ( d11/d21 ) )
 *
-                  CALL ZTRMV( 'Lower', 'No transpose', 'Non-unit', K-I,
-     $                        T( I+1, I+1 ), LDT, T( I+1, I ), 1 )
-                  IF( I.GT.1 ) THEN
-                     PREVLASTV = MIN( PREVLASTV, LASTV )
-                  ELSE
-                     PREVLASTV = LASTV
-                  END IF
+*                 = 1/d21 * 1/(D22*D11-1) * ( ( D11 ) (  -1 ) ) =
+*                                           ( ( -1  ) ( D22 ) )
+*
+*                 = 1/d21 * T * ( ( D11 ) (  -1 ) )
+*                               ( (  -1 ) ( D22 ) )
+*
+*                 = D21 * ( ( D11 ) (  -1 ) )
+*                         ( (  -1 ) ( D22 ) )
+*
+                  D21 = W( K+1, K )
+                  D11 = W( K+1, K+1 ) / D21
+                  D22 = W( K, K ) / D21
+                  T = CONE / ( D11*D22-CONE )
+                  D21 = T / D21
+*
+*                 Update elements in columns A(k) and A(k+1) as
+*                 dot products of rows of ( W(k) W(k+1) ) and columns
+*                 of D**(-1)
+*
+                  DO 80 J = K + 2, N
+                     A( J, K ) = D21*( D11*W( J, K )-W( J, K+1 ) )
+                     A( J, K+1 ) = D21*( D22*W( J, K+1 )-W( J, K ) )
+   80             CONTINUE
                END IF
-               T( I, I ) = TAU( I )
+*
+*              Copy D(k) to A
+*
+               A( K, K ) = W( K, K )
+               A( K+1, K ) = W( K+1, K )
+               A( K+1, K+1 ) = W( K+1, K+1 )
+*
             END IF
-         END DO
+*
+         END IF
+*
+*        Store details of the interchanges in IPIV
+*
+         IF( KSTEP.EQ.1 ) THEN
+            IPIV( K ) = KP
+         ELSE
+            IPIV( K ) = -KP
+            IPIV( K+1 ) = -KP
+         END IF
+*
+*        Increase K and return to the start of the main loop
+*
+         K = K + KSTEP
+         GO TO 70
+*
+   90    CONTINUE
+*
+*        Update the lower triangle of A22 (= A(k:n,k:n)) as
+*
+*        A22 := A22 - L21*D*L21**T = A22 - L21*W**T
+*
+*        computing blocks of NB columns at a time
+*
+         DO 110 J = K, N, NB
+            JB = MIN( NB, N-J+1 )
+*
+*           Update the lower triangle of the diagonal block
+*
+            DO 100 JJ = J, J + JB - 1
+               CALL ZGEMV( 'No transpose', J+JB-JJ, K-1, -CONE,
+     $                     A( JJ, 1 ), LDA, W( JJ, 1 ), LDW, CONE,
+     $                     A( JJ, JJ ), 1 )
+  100       CONTINUE
+*
+*           Update the rectangular subdiagonal block
+*
+            IF( J+JB.LE.N )
+     $         CALL ZGEMM( 'No transpose', 'Transpose', N-J-JB+1, JB,
+     $                     K-1, -CONE, A( J+JB, 1 ), LDA, W( J, 1 ),
+     $                     LDW, CONE, A( J+JB, J ), LDA )
+  110    CONTINUE
+*
+*        Put L21 in standard form by partially undoing the interchanges
+*        of rows in columns 1:k-1 looping backwards from k-1 to 1
+*
+         J = K - 1
+  120    CONTINUE
+*
+*           Undo the interchanges (if any) of rows JJ and JP at each
+*           step J
+*
+*           (Here, J is a diagonal index)
+            JJ = J
+            JP = IPIV( J )
+            IF( JP.LT.0 ) THEN
+               JP = -JP
+*              (Here, J is a diagonal index)
+               J = J - 1
+            END IF
+*           (NOTE: Here, J is used to determine row length. Length J
+*           of the rows to swap back doesn't include diagonal element)
+            J = J - 1
+            IF( JP.NE.JJ .AND. J.GE.1 )
+     $         CALL ZSWAP( J, A( JP, 1 ), LDA, A( JJ, 1 ), LDA )
+         IF( J.GT.1 )
+     $      GO TO 120
+*
+*        Set KB to the number of columns factorized
+*
+         KB = K - 1
+*
       END IF
       RETURN
 *
-*     End of ZLARFT
+*     End of ZLASYF
 *
       END
-*> \brief \b ZLARFX applies an elementary reflector to a general rectangular matrix, with loop unrolling when the reflector has order ≤ 10.
+*> \brief \b ZLATDF uses the LU factorization of the n-by-n matrix computed by sgetc2 and computes a contribution to the reciprocal Dif-estimate.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -20675,27 +37318,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLARFX + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarfx.f"> 
+*> Download ZLATDF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatdf.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarfx.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlatdf.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarfx.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatdf.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
+*       SUBROUTINE ZLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
+*                          JPIV )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE
-*       INTEGER            LDC, M, N
-*       COMPLEX*16         TAU
+*       INTEGER            IJOB, LDZ, N
+*       DOUBLE PRECISION   RDSCAL, RDSUM
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
+*       INTEGER            IPIV( * ), JPIV( * )
+*       COMPLEX*16         RHS( * ), Z( LDZ, * )
 *       ..
 *  
 *
@@ -20704,670 +37348,292 @@
 *>
 *> \verbatim
 *>
-*> ZLARFX applies a complex elementary reflector H to a complex m by n
-*> matrix C, from either the left or the right. H is represented in the
-*> form
-*>
-*>       H = I - tau * v * v**H
-*>
-*> where tau is a complex scalar and v is a complex vector.
-*>
-*> If tau = 0, then H is taken to be the unit matrix
+*> ZLATDF computes the contribution to the reciprocal Dif-estimate
+*> by solving for x in Z * x = b, where b is chosen such that the norm
+*> of x is as large as possible. It is assumed that LU decomposition
+*> of Z has been computed by ZGETC2. On entry RHS = f holds the
+*> contribution from earlier solved sub-systems, and on return RHS = x.
 *>
-*> This version uses inline code if H has order < 11.
+*> The factorization of Z returned by ZGETC2 has the form
+*> Z = P * L * U * Q, where P and Q are permutation matrices. L is lower
+*> triangular with unit diagonal elements and U is upper triangular.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': form  H * C
-*>          = 'R': form  C * H
-*> \endverbatim
-*>
-*> \param[in] M
+*> \param[in] IJOB
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C.
+*>          IJOB is INTEGER
+*>          IJOB = 2: First compute an approximative null-vector e
+*>              of Z using ZGECON, e is normalized and solve for
+*>              Zx = +-e - f with the sign giving the greater value of
+*>              2-norm(x).  About 5 times as expensive as Default.
+*>          IJOB .ne. 2: Local look ahead strategy where
+*>              all entries of the r.h.s. b is choosen as either +1 or
+*>              -1.  Default.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C.
-*> \endverbatim
-*>
-*> \param[in] V
-*> \verbatim
-*>          V is COMPLEX*16 array, dimension (M) if SIDE = 'L'
-*>                                        or (N) if SIDE = 'R'
-*>          The vector v in the representation of H.
+*>          The number of columns of the matrix Z.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] Z
 *> \verbatim
-*>          TAU is COMPLEX*16
-*>          The value tau in the representation of H.
+*>          Z is DOUBLE PRECISION array, dimension (LDZ, N)
+*>          On entry, the LU part of the factorization of the n-by-n
+*>          matrix Z computed by ZGETC2:  Z = P * L * U * Q
 *> \endverbatim
 *>
-*> \param[in,out] C
+*> \param[in] LDZ
 *> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the m by n matrix C.
-*>          On exit, C is overwritten by the matrix H * C if SIDE = 'L',
-*>          or C * H if SIDE = 'R'.
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z.  LDA >= max(1, N).
 *> \endverbatim
 *>
-*> \param[in] LDC
+*> \param[in,out] RHS
 *> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDA >= max(1,M).
+*>          RHS is DOUBLE PRECISION array, dimension (N).
+*>          On entry, RHS contains contributions from other subsystems.
+*>          On exit, RHS contains the solution of the subsystem with
+*>          entries according to the value of IJOB (see above).
 *> \endverbatim
 *>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (N) if SIDE = 'L'
-*>                                            or (M) if SIDE = 'R'
-*>          WORK is not referenced if H has order < 11.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
-*
-*  =====================================================================
-      SUBROUTINE ZLARFX( SIDE, M, N, V, TAU, C, LDC, WORK )
-*
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
-*
-*     .. Scalar Arguments ..
-      CHARACTER          SIDE
-      INTEGER            LDC, M, N
-      COMPLEX*16         TAU
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         C( LDC, * ), V( * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            J
-      COMPLEX*16         SUM, T1, T10, T2, T3, T4, T5, T6, T7, T8, T9,
-     $                   V1, V10, V2, V3, V4, V5, V6, V7, V8, V9
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZLARF
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG
-*     ..
-*     .. Executable Statements ..
-*
-      IF( TAU.EQ.ZERO )
-     $   RETURN
-      IF( LSAME( SIDE, 'L' ) ) THEN
-*
-*        Form  H * C, where H has order m.
-*
-         GO TO ( 10, 30, 50, 70, 90, 110, 130, 150,
-     $           170, 190 )M
-*
-*        Code for general M
-*
-         CALL ZLARF( SIDE, M, N, V, 1, TAU, C, LDC, WORK )
-         GO TO 410
-   10    CONTINUE
-*
-*        Special code for 1 x 1 Householder
-*
-         T1 = ONE - TAU*V( 1 )*DCONJG( V( 1 ) )
-         DO 20 J = 1, N
-            C( 1, J ) = T1*C( 1, J )
-   20    CONTINUE
-         GO TO 410
-   30    CONTINUE
-*
-*        Special code for 2 x 2 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         DO 40 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-   40    CONTINUE
-         GO TO 410
-   50    CONTINUE
-*
-*        Special code for 3 x 3 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         DO 60 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-   60    CONTINUE
-         GO TO 410
-   70    CONTINUE
-*
-*        Special code for 4 x 4 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         DO 80 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-   80    CONTINUE
-         GO TO 410
-   90    CONTINUE
-*
-*        Special code for 5 x 5 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         V5 = DCONJG( V( 5 ) )
-         T5 = TAU*DCONJG( V5 )
-         DO 100 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J ) + V5*C( 5, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-            C( 5, J ) = C( 5, J ) - SUM*T5
-  100    CONTINUE
-         GO TO 410
-  110    CONTINUE
-*
-*        Special code for 6 x 6 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         V5 = DCONJG( V( 5 ) )
-         T5 = TAU*DCONJG( V5 )
-         V6 = DCONJG( V( 6 ) )
-         T6 = TAU*DCONJG( V6 )
-         DO 120 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-            C( 5, J ) = C( 5, J ) - SUM*T5
-            C( 6, J ) = C( 6, J ) - SUM*T6
-  120    CONTINUE
-         GO TO 410
-  130    CONTINUE
-*
-*        Special code for 7 x 7 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         V5 = DCONJG( V( 5 ) )
-         T5 = TAU*DCONJG( V5 )
-         V6 = DCONJG( V( 6 ) )
-         T6 = TAU*DCONJG( V6 )
-         V7 = DCONJG( V( 7 ) )
-         T7 = TAU*DCONJG( V7 )
-         DO 140 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
-     $            V7*C( 7, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-            C( 5, J ) = C( 5, J ) - SUM*T5
-            C( 6, J ) = C( 6, J ) - SUM*T6
-            C( 7, J ) = C( 7, J ) - SUM*T7
-  140    CONTINUE
-         GO TO 410
-  150    CONTINUE
-*
-*        Special code for 8 x 8 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         V5 = DCONJG( V( 5 ) )
-         T5 = TAU*DCONJG( V5 )
-         V6 = DCONJG( V( 6 ) )
-         T6 = TAU*DCONJG( V6 )
-         V7 = DCONJG( V( 7 ) )
-         T7 = TAU*DCONJG( V7 )
-         V8 = DCONJG( V( 8 ) )
-         T8 = TAU*DCONJG( V8 )
-         DO 160 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
-     $            V7*C( 7, J ) + V8*C( 8, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-            C( 5, J ) = C( 5, J ) - SUM*T5
-            C( 6, J ) = C( 6, J ) - SUM*T6
-            C( 7, J ) = C( 7, J ) - SUM*T7
-            C( 8, J ) = C( 8, J ) - SUM*T8
-  160    CONTINUE
-         GO TO 410
-  170    CONTINUE
-*
-*        Special code for 9 x 9 Householder
-*
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         V5 = DCONJG( V( 5 ) )
-         T5 = TAU*DCONJG( V5 )
-         V6 = DCONJG( V( 6 ) )
-         T6 = TAU*DCONJG( V6 )
-         V7 = DCONJG( V( 7 ) )
-         T7 = TAU*DCONJG( V7 )
-         V8 = DCONJG( V( 8 ) )
-         T8 = TAU*DCONJG( V8 )
-         V9 = DCONJG( V( 9 ) )
-         T9 = TAU*DCONJG( V9 )
-         DO 180 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
-     $            V7*C( 7, J ) + V8*C( 8, J ) + V9*C( 9, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-            C( 5, J ) = C( 5, J ) - SUM*T5
-            C( 6, J ) = C( 6, J ) - SUM*T6
-            C( 7, J ) = C( 7, J ) - SUM*T7
-            C( 8, J ) = C( 8, J ) - SUM*T8
-            C( 9, J ) = C( 9, J ) - SUM*T9
-  180    CONTINUE
-         GO TO 410
-  190    CONTINUE
+*> \param[in,out] RDSUM
+*> \verbatim
+*>          RDSUM is DOUBLE PRECISION
+*>          On entry, the sum of squares of computed contributions to
+*>          the Dif-estimate under computation by ZTGSYL, where the
+*>          scaling factor RDSCAL (see below) has been factored out.
+*>          On exit, the corresponding sum of squares updated with the
+*>          contributions from the current sub-system.
+*>          If TRANS = 'T' RDSUM is not touched.
+*>          NOTE: RDSUM only makes sense when ZTGSY2 is called by CTGSYL.
+*> \endverbatim
+*>
+*> \param[in,out] RDSCAL
+*> \verbatim
+*>          RDSCAL is DOUBLE PRECISION
+*>          On entry, scaling factor used to prevent overflow in RDSUM.
+*>          On exit, RDSCAL is updated w.r.t. the current contributions
+*>          in RDSUM.
+*>          If TRANS = 'T', RDSCAL is not touched.
+*>          NOTE: RDSCAL only makes sense when ZTGSY2 is called by
+*>          ZTGSYL.
+*> \endverbatim
+*>
+*> \param[in] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (N).
+*>          The pivot indices; for 1 <= i <= N, row i of the
+*>          matrix has been interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[in] JPIV
+*> \verbatim
+*>          JPIV is INTEGER array, dimension (N).
+*>          The pivot indices; for 1 <= j <= N, column j of the
+*>          matrix has been interchanged with column JPIV(j).
+*> \endverbatim
 *
-*        Special code for 10 x 10 Householder
+*  Authors:
+*  ========
 *
-         V1 = DCONJG( V( 1 ) )
-         T1 = TAU*DCONJG( V1 )
-         V2 = DCONJG( V( 2 ) )
-         T2 = TAU*DCONJG( V2 )
-         V3 = DCONJG( V( 3 ) )
-         T3 = TAU*DCONJG( V3 )
-         V4 = DCONJG( V( 4 ) )
-         T4 = TAU*DCONJG( V4 )
-         V5 = DCONJG( V( 5 ) )
-         T5 = TAU*DCONJG( V5 )
-         V6 = DCONJG( V( 6 ) )
-         T6 = TAU*DCONJG( V6 )
-         V7 = DCONJG( V( 7 ) )
-         T7 = TAU*DCONJG( V7 )
-         V8 = DCONJG( V( 8 ) )
-         T8 = TAU*DCONJG( V8 )
-         V9 = DCONJG( V( 9 ) )
-         T9 = TAU*DCONJG( V9 )
-         V10 = DCONJG( V( 10 ) )
-         T10 = TAU*DCONJG( V10 )
-         DO 200 J = 1, N
-            SUM = V1*C( 1, J ) + V2*C( 2, J ) + V3*C( 3, J ) +
-     $            V4*C( 4, J ) + V5*C( 5, J ) + V6*C( 6, J ) +
-     $            V7*C( 7, J ) + V8*C( 8, J ) + V9*C( 9, J ) +
-     $            V10*C( 10, J )
-            C( 1, J ) = C( 1, J ) - SUM*T1
-            C( 2, J ) = C( 2, J ) - SUM*T2
-            C( 3, J ) = C( 3, J ) - SUM*T3
-            C( 4, J ) = C( 4, J ) - SUM*T4
-            C( 5, J ) = C( 5, J ) - SUM*T5
-            C( 6, J ) = C( 6, J ) - SUM*T6
-            C( 7, J ) = C( 7, J ) - SUM*T7
-            C( 8, J ) = C( 8, J ) - SUM*T8
-            C( 9, J ) = C( 9, J ) - SUM*T9
-            C( 10, J ) = C( 10, J ) - SUM*T10
-  200    CONTINUE
-         GO TO 410
-      ELSE
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*        Form  C * H, where H has order n.
+*> \date September 2012
 *
-         GO TO ( 210, 230, 250, 270, 290, 310, 330, 350,
-     $           370, 390 )N
+*> \ingroup complex16OTHERauxiliary
 *
-*        Code for general N
+*> \par Further Details:
+*  =====================
+*>
+*>  This routine is a further developed implementation of algorithm
+*>  BSOLVE in [1] using complete pivoting in the LU factorization.
 *
-         CALL ZLARF( SIDE, M, N, V, 1, TAU, C, LDC, WORK )
-         GO TO 410
-  210    CONTINUE
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
 *
-*        Special code for 1 x 1 Householder
+*> \par References:
+*  ================
+*>
+*>   [1]   Bo Kagstrom and Lars Westin,
+*>         Generalized Schur Methods with Condition Estimators for
+*>         Solving the Generalized Sylvester Equation, IEEE Transactions
+*>         on Automatic Control, Vol. 34, No. 7, July 1989, pp 745-751.
+*>\n
+*>   [2]   Peter Poromaa,
+*>         On Efficient and Robust Estimators for the Separation
+*>         between two Regular Matrix Pairs with Applications in
+*>         Condition Estimation. Report UMINF-95.05, Department of
+*>         Computing Science, Umea University, S-901 87 Umea, Sweden,
+*>         1995.
 *
-         T1 = ONE - TAU*V( 1 )*DCONJG( V( 1 ) )
-         DO 220 J = 1, M
-            C( J, 1 ) = T1*C( J, 1 )
-  220    CONTINUE
-         GO TO 410
-  230    CONTINUE
+*  =====================================================================
+      SUBROUTINE ZLATDF( IJOB, N, Z, LDZ, RHS, RDSUM, RDSCAL, IPIV,
+     $                   JPIV )
 *
-*        Special code for 2 x 2 Householder
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         DO 240 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-  240    CONTINUE
-         GO TO 410
-  250    CONTINUE
+*     .. Scalar Arguments ..
+      INTEGER            IJOB, LDZ, N
+      DOUBLE PRECISION   RDSCAL, RDSUM
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IPIV( * ), JPIV( * )
+      COMPLEX*16         RHS( * ), Z( LDZ, * )
+*     ..
 *
-*        Special code for 3 x 3 Householder
+*  =====================================================================
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         DO 260 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-  260    CONTINUE
-         GO TO 410
-  270    CONTINUE
+*     .. Parameters ..
+      INTEGER            MAXDIM
+      PARAMETER          ( MAXDIM = 2 )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, INFO, J, K
+      DOUBLE PRECISION   RTEMP, SCALE, SMINU, SPLUS
+      COMPLEX*16         BM, BP, PMONE, TEMP
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   RWORK( MAXDIM )
+      COMPLEX*16         WORK( 4*MAXDIM ), XM( MAXDIM ), XP( MAXDIM )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZAXPY, ZCOPY, ZGECON, ZGESC2, ZLASSQ, ZLASWP,
+     $                   ZSCAL
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DZASUM
+      COMPLEX*16         ZDOTC
+      EXTERNAL           DZASUM, ZDOTC
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, SQRT
+*     ..
+*     .. Executable Statements ..
 *
-*        Special code for 4 x 4 Householder
+      IF( IJOB.NE.2 ) THEN
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         DO 280 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-  280    CONTINUE
-         GO TO 410
-  290    CONTINUE
+*        Apply permutations IPIV to RHS
 *
-*        Special code for 5 x 5 Householder
+         CALL ZLASWP( 1, RHS, LDZ, 1, N-1, IPIV, 1 )
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         V5 = V( 5 )
-         T5 = TAU*DCONJG( V5 )
-         DO 300 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 ) + V5*C( J, 5 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-            C( J, 5 ) = C( J, 5 ) - SUM*T5
-  300    CONTINUE
-         GO TO 410
-  310    CONTINUE
+*        Solve for L-part choosing RHS either to +1 or -1.
 *
-*        Special code for 6 x 6 Householder
+         PMONE = -CONE
+         DO 10 J = 1, N - 1
+            BP = RHS( J ) + CONE
+            BM = RHS( J ) - CONE
+            SPLUS = ONE
+*
+*           Lockahead for L- part RHS(1:N-1) = +-1
+*           SPLUS and SMIN computed more efficiently than in BSOLVE[1].
+*
+            SPLUS = SPLUS + DBLE( ZDOTC( N-J, Z( J+1, J ), 1, Z( J+1,
+     $              J ), 1 ) )
+            SMINU = DBLE( ZDOTC( N-J, Z( J+1, J ), 1, RHS( J+1 ), 1 ) )
+            SPLUS = SPLUS*DBLE( RHS( J ) )
+            IF( SPLUS.GT.SMINU ) THEN
+               RHS( J ) = BP
+            ELSE IF( SMINU.GT.SPLUS ) THEN
+               RHS( J ) = BM
+            ELSE
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         V5 = V( 5 )
-         T5 = TAU*DCONJG( V5 )
-         V6 = V( 6 )
-         T6 = TAU*DCONJG( V6 )
-         DO 320 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-            C( J, 5 ) = C( J, 5 ) - SUM*T5
-            C( J, 6 ) = C( J, 6 ) - SUM*T6
-  320    CONTINUE
-         GO TO 410
-  330    CONTINUE
+*              In this case the updating sums are equal and we can
+*              choose RHS(J) +1 or -1. The first time this happens we
+*              choose -1, thereafter +1. This is a simple way to get
+*              good estimates of matrices like Byers well-known example
+*              (see [1]). (Not done in BSOLVE.)
 *
-*        Special code for 7 x 7 Householder
+               RHS( J ) = RHS( J ) + PMONE
+               PMONE = CONE
+            END IF
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         V5 = V( 5 )
-         T5 = TAU*DCONJG( V5 )
-         V6 = V( 6 )
-         T6 = TAU*DCONJG( V6 )
-         V7 = V( 7 )
-         T7 = TAU*DCONJG( V7 )
-         DO 340 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
-     $            V7*C( J, 7 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-            C( J, 5 ) = C( J, 5 ) - SUM*T5
-            C( J, 6 ) = C( J, 6 ) - SUM*T6
-            C( J, 7 ) = C( J, 7 ) - SUM*T7
-  340    CONTINUE
-         GO TO 410
-  350    CONTINUE
+*           Compute the remaining r.h.s.
 *
-*        Special code for 8 x 8 Householder
+            TEMP = -RHS( J )
+            CALL ZAXPY( N-J, TEMP, Z( J+1, J ), 1, RHS( J+1 ), 1 )
+   10    CONTINUE
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         V5 = V( 5 )
-         T5 = TAU*DCONJG( V5 )
-         V6 = V( 6 )
-         T6 = TAU*DCONJG( V6 )
-         V7 = V( 7 )
-         T7 = TAU*DCONJG( V7 )
-         V8 = V( 8 )
-         T8 = TAU*DCONJG( V8 )
-         DO 360 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
-     $            V7*C( J, 7 ) + V8*C( J, 8 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-            C( J, 5 ) = C( J, 5 ) - SUM*T5
-            C( J, 6 ) = C( J, 6 ) - SUM*T6
-            C( J, 7 ) = C( J, 7 ) - SUM*T7
-            C( J, 8 ) = C( J, 8 ) - SUM*T8
-  360    CONTINUE
-         GO TO 410
-  370    CONTINUE
+*        Solve for U- part, lockahead for RHS(N) = +-1. This is not done
+*        In BSOLVE and will hopefully give us a better estimate because
+*        any ill-conditioning of the original matrix is transfered to U
+*        and not to L. U(N, N) is an approximation to sigma_min(LU).
+*
+         CALL ZCOPY( N-1, RHS, 1, WORK, 1 )
+         WORK( N ) = RHS( N ) + CONE
+         RHS( N ) = RHS( N ) - CONE
+         SPLUS = ZERO
+         SMINU = ZERO
+         DO 30 I = N, 1, -1
+            TEMP = CONE / Z( I, I )
+            WORK( I ) = WORK( I )*TEMP
+            RHS( I ) = RHS( I )*TEMP
+            DO 20 K = I + 1, N
+               WORK( I ) = WORK( I ) - WORK( K )*( Z( I, K )*TEMP )
+               RHS( I ) = RHS( I ) - RHS( K )*( Z( I, K )*TEMP )
+   20       CONTINUE
+            SPLUS = SPLUS + ABS( WORK( I ) )
+            SMINU = SMINU + ABS( RHS( I ) )
+   30    CONTINUE
+         IF( SPLUS.GT.SMINU )
+     $      CALL ZCOPY( N, WORK, 1, RHS, 1 )
 *
-*        Special code for 9 x 9 Householder
+*        Apply the permutations JPIV to the computed solution (RHS)
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         V5 = V( 5 )
-         T5 = TAU*DCONJG( V5 )
-         V6 = V( 6 )
-         T6 = TAU*DCONJG( V6 )
-         V7 = V( 7 )
-         T7 = TAU*DCONJG( V7 )
-         V8 = V( 8 )
-         T8 = TAU*DCONJG( V8 )
-         V9 = V( 9 )
-         T9 = TAU*DCONJG( V9 )
-         DO 380 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
-     $            V7*C( J, 7 ) + V8*C( J, 8 ) + V9*C( J, 9 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-            C( J, 5 ) = C( J, 5 ) - SUM*T5
-            C( J, 6 ) = C( J, 6 ) - SUM*T6
-            C( J, 7 ) = C( J, 7 ) - SUM*T7
-            C( J, 8 ) = C( J, 8 ) - SUM*T8
-            C( J, 9 ) = C( J, 9 ) - SUM*T9
-  380    CONTINUE
-         GO TO 410
-  390    CONTINUE
+         CALL ZLASWP( 1, RHS, LDZ, 1, N-1, JPIV, -1 )
 *
-*        Special code for 10 x 10 Householder
+*        Compute the sum of squares
 *
-         V1 = V( 1 )
-         T1 = TAU*DCONJG( V1 )
-         V2 = V( 2 )
-         T2 = TAU*DCONJG( V2 )
-         V3 = V( 3 )
-         T3 = TAU*DCONJG( V3 )
-         V4 = V( 4 )
-         T4 = TAU*DCONJG( V4 )
-         V5 = V( 5 )
-         T5 = TAU*DCONJG( V5 )
-         V6 = V( 6 )
-         T6 = TAU*DCONJG( V6 )
-         V7 = V( 7 )
-         T7 = TAU*DCONJG( V7 )
-         V8 = V( 8 )
-         T8 = TAU*DCONJG( V8 )
-         V9 = V( 9 )
-         T9 = TAU*DCONJG( V9 )
-         V10 = V( 10 )
-         T10 = TAU*DCONJG( V10 )
-         DO 400 J = 1, M
-            SUM = V1*C( J, 1 ) + V2*C( J, 2 ) + V3*C( J, 3 ) +
-     $            V4*C( J, 4 ) + V5*C( J, 5 ) + V6*C( J, 6 ) +
-     $            V7*C( J, 7 ) + V8*C( J, 8 ) + V9*C( J, 9 ) +
-     $            V10*C( J, 10 )
-            C( J, 1 ) = C( J, 1 ) - SUM*T1
-            C( J, 2 ) = C( J, 2 ) - SUM*T2
-            C( J, 3 ) = C( J, 3 ) - SUM*T3
-            C( J, 4 ) = C( J, 4 ) - SUM*T4
-            C( J, 5 ) = C( J, 5 ) - SUM*T5
-            C( J, 6 ) = C( J, 6 ) - SUM*T6
-            C( J, 7 ) = C( J, 7 ) - SUM*T7
-            C( J, 8 ) = C( J, 8 ) - SUM*T8
-            C( J, 9 ) = C( J, 9 ) - SUM*T9
-            C( J, 10 ) = C( J, 10 ) - SUM*T10
-  400    CONTINUE
-         GO TO 410
+         CALL ZLASSQ( N, RHS, 1, RDSCAL, RDSUM )
+         RETURN
       END IF
-  410 CONTINUE
+*
+*     ENTRY IJOB = 2
+*
+*     Compute approximate nullvector XM of Z
+*
+      CALL ZGECON( 'I', N, Z, LDZ, ONE, RTEMP, WORK, RWORK, INFO )
+      CALL ZCOPY( N, WORK( N+1 ), 1, XM, 1 )
+*
+*     Compute RHS
+*
+      CALL ZLASWP( 1, XM, LDZ, 1, N-1, IPIV, -1 )
+      TEMP = CONE / SQRT( ZDOTC( N, XM, 1, XM, 1 ) )
+      CALL ZSCAL( N, TEMP, XM, 1 )
+      CALL ZCOPY( N, XM, 1, XP, 1 )
+      CALL ZAXPY( N, CONE, RHS, 1, XP, 1 )
+      CALL ZAXPY( N, -CONE, XM, 1, RHS, 1 )
+      CALL ZGESC2( N, Z, LDZ, RHS, IPIV, JPIV, SCALE )
+      CALL ZGESC2( N, Z, LDZ, XP, IPIV, JPIV, SCALE )
+      IF( DZASUM( N, XP, 1 ).GT.DZASUM( N, RHS, 1 ) )
+     $   CALL ZCOPY( N, XP, 1, RHS, 1 )
+*
+*     Compute the sum of squares
+*
+      CALL ZLASSQ( N, RHS, 1, RDSCAL, RDSUM )
       RETURN
 *
-*     End of ZLARFX
+*     End of ZLATDF
 *
       END
-*> \brief \b ZLARTG generates a plane rotation with real cosine and complex sine.
+*> \brief \b ZLATRD reduces the first nb rows and columns of a symmetric/Hermitian matrix A to real tridiagonal form by an unitary similarity transformation.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -21375,23 +37641,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLARTG + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlartg.f"> 
+*> Download ZLATRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrd.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlartg.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlatrd.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlartg.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrd.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLARTG( F, G, CS, SN, R )
+*       SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 * 
 *       .. Scalar Arguments ..
-*       DOUBLE PRECISION   CS
-*       COMPLEX*16         F, G, R, SN
+*       CHARACTER          UPLO
+*       INTEGER            LDA, LDW, N, NB
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   E( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), W( LDW, * )
 *       ..
 *  
 *
@@ -21400,224 +37670,328 @@
 *>
 *> \verbatim
 *>
-*> ZLARTG generates a plane rotation so that
+*> ZLATRD reduces NB rows and columns of a complex Hermitian matrix A to
+*> Hermitian tridiagonal form by a unitary similarity
+*> transformation Q**H * A * Q, and returns the matrices V and W which are
+*> needed to apply the transformation to the unreduced part of A.
 *>
-*>    [  CS  SN  ]     [ F ]     [ R ]
-*>    [  __      ]  .  [   ]  =  [   ]   where CS**2 + |SN|**2 = 1.
-*>    [ -SN  CS  ]     [ G ]     [ 0 ]
+*> If UPLO = 'U', ZLATRD reduces the last NB rows and columns of a
+*> matrix, of which the upper triangle is supplied;
+*> if UPLO = 'L', ZLATRD reduces the first NB rows and columns of a
+*> matrix, of which the lower triangle is supplied.
 *>
-*> This is a faster version of the BLAS1 routine ZROTG, except for
-*> the following differences:
-*>    F and G are unchanged on return.
-*>    If G=0, then CS=1 and SN=0.
-*>    If F=0, then CS=0 and SN is chosen so that R is real.
+*> This is an auxiliary routine called by ZHETRD.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] F
+*> \param[in] UPLO
 *> \verbatim
-*>          F is COMPLEX*16
-*>          The first component of vector to be rotated.
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the upper or lower triangular part of the
+*>          Hermitian matrix A is stored:
+*>          = 'U': Upper triangular
+*>          = 'L': Lower triangular
 *> \endverbatim
 *>
-*> \param[in] G
+*> \param[in] N
 *> \verbatim
-*>          G is COMPLEX*16
-*>          The second component of vector to be rotated.
+*>          N is INTEGER
+*>          The order of the matrix A.
 *> \endverbatim
 *>
-*> \param[out] CS
+*> \param[in] NB
 *> \verbatim
-*>          CS is DOUBLE PRECISION
-*>          The cosine of the rotation.
+*>          NB is INTEGER
+*>          The number of rows and columns to be reduced.
 *> \endverbatim
 *>
-*> \param[out] SN
+*> \param[in,out] A
 *> \verbatim
-*>          SN is COMPLEX*16
-*>          The sine of the rotation.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
+*>          n-by-n upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading n-by-n lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>          On exit:
+*>          if UPLO = 'U', the last NB columns have been reduced to
+*>            tridiagonal form, with the diagonal elements overwriting
+*>            the diagonal elements of A; the elements above the diagonal
+*>            with the array TAU, represent the unitary matrix Q as a
+*>            product of elementary reflectors;
+*>          if UPLO = 'L', the first NB columns have been reduced to
+*>            tridiagonal form, with the diagonal elements overwriting
+*>            the diagonal elements of A; the elements below the diagonal
+*>            with the array TAU, represent the  unitary matrix Q as a
+*>            product of elementary reflectors.
+*>          See Further Details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] E
+*> \verbatim
+*>          E is DOUBLE PRECISION array, dimension (N-1)
+*>          If UPLO = 'U', E(n-nb:n-1) contains the superdiagonal
+*>          elements of the last NB columns of the reduced matrix;
+*>          if UPLO = 'L', E(1:nb) contains the subdiagonal elements of
+*>          the first NB columns of the reduced matrix.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (N-1)
+*>          The scalar factors of the elementary reflectors, stored in
+*>          TAU(n-nb:n-1) if UPLO = 'U', and in TAU(1:nb) if UPLO = 'L'.
+*>          See Further Details.
+*> \endverbatim
+*>
+*> \param[out] W
+*> \verbatim
+*>          W is COMPLEX*16 array, dimension (LDW,NB)
+*>          The n-by-nb matrix W required to update the unreduced part
+*>          of A.
+*> \endverbatim
+*>
+*> \param[in] LDW
+*> \verbatim
+*>          LDW is INTEGER
+*>          The leading dimension of the array W. LDW >= max(1,N).
 *> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  If UPLO = 'U', the matrix Q is represented as a product of elementary
+*>  reflectors
+*>
+*>     Q = H(n) H(n-1) . . . H(n-nb+1).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**H
+*>
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(i:n) = 0 and v(i-1) = 1; v(1:i-1) is stored on exit in A(1:i-1,i),
+*>  and tau in TAU(i-1).
+*>
+*>  If UPLO = 'L', the matrix Q is represented as a product of elementary
+*>  reflectors
+*>
+*>     Q = H(1) H(2) . . . H(nb).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**H
+*>
+*>  where tau is a complex scalar, and v is a complex vector with
+*>  v(1:i) = 0 and v(i+1) = 1; v(i+1:n) is stored on exit in A(i+1:n,i),
+*>  and tau in TAU(i).
 *>
-*> \param[out] R
-*> \verbatim
-*>          R is COMPLEX*16
-*>          The nonzero component of the rotated vector.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2013
-*
-*> \ingroup complex16OTHERauxiliary
-*
-*> \par Further Details:
-*  =====================
+*>  The elements of the vectors v together form the n-by-nb matrix V
+*>  which is needed, with W, to apply the transformation to the unreduced
+*>  part of the matrix, using a Hermitian rank-2k update of the form:
+*>  A := A - V*W**H - W*V**H.
 *>
-*> \verbatim
+*>  The contents of A on exit are illustrated by the following examples
+*>  with n = 5 and nb = 2:
 *>
-*>  3-5-96 - Modified with a new algorithm by W. Kahan and J. Demmel
+*>  if UPLO = 'U':                       if UPLO = 'L':
 *>
-*>  This version has a few statements commented out for thread safety
-*>  (machine parameters are computed on each entry). 10 feb 03, SJH.
+*>    (  a   a   a   v4  v5 )              (  d                  )
+*>    (      a   a   v4  v5 )              (  1   d              )
+*>    (          a   1   v5 )              (  v1  1   a          )
+*>    (              d   1  )              (  v1  v2  a   a      )
+*>    (                  d  )              (  v1  v2  a   a   a  )
+*>
+*>  where d denotes a diagonal element of the reduced matrix, a denotes
+*>  an element of the original matrix that is unchanged, and vi denotes
+*>  an element of the vector defining H(i).
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE ZLARTG( F, G, CS, SN, R )
+      SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
 *
-*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      DOUBLE PRECISION   CS
-      COMPLEX*16         F, G, R, SN
+      CHARACTER          UPLO
+      INTEGER            LDA, LDW, N, NB
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   E( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), W( LDW, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   TWO, ONE, ZERO
-      PARAMETER          ( TWO = 2.0D+0, ONE = 1.0D+0, ZERO = 0.0D+0 )
-      COMPLEX*16         CZERO
-      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
+      COMPLEX*16         ZERO, ONE, HALF
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   HALF = ( 0.5D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-*     LOGICAL            FIRST
-      INTEGER            COUNT, I
-      DOUBLE PRECISION   D, DI, DR, EPS, F2, F2S, G2, G2S, SAFMIN,
-     $                   SAFMN2, SAFMX2, SCALE
-      COMPLEX*16         FF, FS, GS
+      INTEGER            I, IW
+      COMPLEX*16         ALPHA
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           ZAXPY, ZGEMV, ZHEMV, ZLACGV, ZLARFG, ZSCAL
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMCH, DLAPY2
-      LOGICAL            DISNAN
-      EXTERNAL           DLAMCH, DLAPY2, DISNAN
+      LOGICAL            LSAME
+      COMPLEX*16         ZDOTC
+      EXTERNAL           LSAME, ZDOTC
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, INT, LOG,
-     $                   MAX, SQRT
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   ABS1, ABSSQ
-*     ..
-*     .. Statement Function definitions ..
-      ABS1( FF ) = MAX( ABS( DBLE( FF ) ), ABS( DIMAG( FF ) ) )
-      ABSSQ( FF ) = DBLE( FF )**2 + DIMAG( FF )**2
+      INTRINSIC          DBLE, MIN
 *     ..
 *     .. Executable Statements ..
 *
-      SAFMIN = DLAMCH( 'S' )
-      EPS = DLAMCH( 'E' )
-      SAFMN2 = DLAMCH( 'B' )**INT( LOG( SAFMIN / EPS ) /
-     $         LOG( DLAMCH( 'B' ) ) / TWO )
-      SAFMX2 = ONE / SAFMN2
-      SCALE = MAX( ABS1( F ), ABS1( G ) )
-      FS = F
-      GS = G
-      COUNT = 0
-      IF( SCALE.GE.SAFMX2 ) THEN
-   10    CONTINUE
-         COUNT = COUNT + 1
-         FS = FS*SAFMN2
-         GS = GS*SAFMN2
-         SCALE = SCALE*SAFMN2
-         IF( SCALE.GE.SAFMX2 )
-     $      GO TO 10
-      ELSE IF( SCALE.LE.SAFMN2 ) THEN
-         IF( G.EQ.CZERO.OR.DISNAN( ABS( G ) ) ) THEN
-            CS = ONE
-            SN = CZERO
-            R = F
-            RETURN
-         END IF
-   20    CONTINUE
-         COUNT = COUNT - 1
-         FS = FS*SAFMX2
-         GS = GS*SAFMX2
-         SCALE = SCALE*SAFMX2
-         IF( SCALE.LE.SAFMN2 )
-     $      GO TO 20
-      END IF
-      F2 = ABSSQ( FS )
-      G2 = ABSSQ( GS )
-      IF( F2.LE.MAX( G2, ONE )*SAFMIN ) THEN
+*     Quick return if possible
 *
-*        This is a rare case: F is very small.
+      IF( N.LE.0 )
+     $   RETURN
 *
-         IF( F.EQ.CZERO ) THEN
-            CS = ZERO
-            R = DLAPY2( DBLE( G ), DIMAG( G ) )
-*           Do complex/real division explicitly with two real divisions
-            D = DLAPY2( DBLE( GS ), DIMAG( GS ) )
-            SN = DCMPLX( DBLE( GS ) / D, -DIMAG( GS ) / D )
-            RETURN
-         END IF
-         F2S = DLAPY2( DBLE( FS ), DIMAG( FS ) )
-*        G2 and G2S are accurate
-*        G2 is at least SAFMIN, and G2S is at least SAFMN2
-         G2S = SQRT( G2 )
-*        Error in CS from underflow in F2S is at most
-*        UNFL / SAFMN2 .lt. sqrt(UNFL*EPS) .lt. EPS
-*        If MAX(G2,ONE)=G2, then F2 .lt. G2*SAFMIN,
-*        and so CS .lt. sqrt(SAFMIN)
-*        If MAX(G2,ONE)=ONE, then F2 .lt. SAFMIN
-*        and so CS .lt. sqrt(SAFMIN)/SAFMN2 = sqrt(EPS)
-*        Therefore, CS = F2S/G2S / sqrt( 1 + (F2S/G2S)**2 ) = F2S/G2S
-         CS = F2S / G2S
-*        Make sure abs(FF) = 1
-*        Do complex/real division explicitly with 2 real divisions
-         IF( ABS1( F ).GT.ONE ) THEN
-            D = DLAPY2( DBLE( F ), DIMAG( F ) )
-            FF = DCMPLX( DBLE( F ) / D, DIMAG( F ) / D )
-         ELSE
-            DR = SAFMX2*DBLE( F )
-            DI = SAFMX2*DIMAG( F )
-            D = DLAPY2( DR, DI )
-            FF = DCMPLX( DR / D, DI / D )
-         END IF
-         SN = FF*DCMPLX( DBLE( GS ) / G2S, -DIMAG( GS ) / G2S )
-         R = CS*F + SN*G
+      IF( LSAME( UPLO, 'U' ) ) THEN
+*
+*        Reduce last NB columns of upper triangle
+*
+         DO 10 I = N, N - NB + 1, -1
+            IW = I - N + NB
+            IF( I.LT.N ) THEN
+*
+*              Update A(1:i,i)
+*
+               A( I, I ) = DBLE( A( I, I ) )
+               CALL ZLACGV( N-I, W( I, IW+1 ), LDW )
+               CALL ZGEMV( 'No transpose', I, N-I, -ONE, A( 1, I+1 ),
+     $                     LDA, W( I, IW+1 ), LDW, ONE, A( 1, I ), 1 )
+               CALL ZLACGV( N-I, W( I, IW+1 ), LDW )
+               CALL ZLACGV( N-I, A( I, I+1 ), LDA )
+               CALL ZGEMV( 'No transpose', I, N-I, -ONE, W( 1, IW+1 ),
+     $                     LDW, A( I, I+1 ), LDA, ONE, A( 1, I ), 1 )
+               CALL ZLACGV( N-I, A( I, I+1 ), LDA )
+               A( I, I ) = DBLE( A( I, I ) )
+            END IF
+            IF( I.GT.1 ) THEN
+*
+*              Generate elementary reflector H(i) to annihilate
+*              A(1:i-2,i)
+*
+               ALPHA = A( I-1, I )
+               CALL ZLARFG( I-1, ALPHA, A( 1, I ), 1, TAU( I-1 ) )
+               E( I-1 ) = ALPHA
+               A( I-1, I ) = ONE
+*
+*              Compute W(1:i-1,i)
+*
+               CALL ZHEMV( 'Upper', I-1, ONE, A, LDA, A( 1, I ), 1,
+     $                     ZERO, W( 1, IW ), 1 )
+               IF( I.LT.N ) THEN
+                  CALL ZGEMV( 'Conjugate transpose', I-1, N-I, ONE,
+     $                        W( 1, IW+1 ), LDW, A( 1, I ), 1, ZERO,
+     $                        W( I+1, IW ), 1 )
+                  CALL ZGEMV( 'No transpose', I-1, N-I, -ONE,
+     $                        A( 1, I+1 ), LDA, W( I+1, IW ), 1, ONE,
+     $                        W( 1, IW ), 1 )
+                  CALL ZGEMV( 'Conjugate transpose', I-1, N-I, ONE,
+     $                        A( 1, I+1 ), LDA, A( 1, I ), 1, ZERO,
+     $                        W( I+1, IW ), 1 )
+                  CALL ZGEMV( 'No transpose', I-1, N-I, -ONE,
+     $                        W( 1, IW+1 ), LDW, W( I+1, IW ), 1, ONE,
+     $                        W( 1, IW ), 1 )
+               END IF
+               CALL ZSCAL( I-1, TAU( I-1 ), W( 1, IW ), 1 )
+               ALPHA = -HALF*TAU( I-1 )*ZDOTC( I-1, W( 1, IW ), 1,
+     $                 A( 1, I ), 1 )
+               CALL ZAXPY( I-1, ALPHA, A( 1, I ), 1, W( 1, IW ), 1 )
+            END IF
+*
+   10    CONTINUE
       ELSE
 *
-*        This is the most common case.
-*        Neither F2 nor F2/G2 are less than SAFMIN
-*        F2S cannot overflow, and it is accurate
+*        Reduce first NB columns of lower triangle
 *
-         F2S = SQRT( ONE+G2 / F2 )
-*        Do the F2S(real)*FS(complex) multiply with two real multiplies
-         R = DCMPLX( F2S*DBLE( FS ), F2S*DIMAG( FS ) )
-         CS = ONE / F2S
-         D = F2 + G2
-*        Do complex/real division explicitly with two real divisions
-         SN = DCMPLX( DBLE( R ) / D, DIMAG( R ) / D )
-         SN = SN*DCONJG( GS )
-         IF( COUNT.NE.0 ) THEN
-            IF( COUNT.GT.0 ) THEN
-               DO 30 I = 1, COUNT
-                  R = R*SAFMX2
-   30          CONTINUE
-            ELSE
-               DO 40 I = 1, -COUNT
-                  R = R*SAFMN2
-   40          CONTINUE
+         DO 20 I = 1, NB
+*
+*           Update A(i:n,i)
+*
+            A( I, I ) = DBLE( A( I, I ) )
+            CALL ZLACGV( I-1, W( I, 1 ), LDW )
+            CALL ZGEMV( 'No transpose', N-I+1, I-1, -ONE, A( I, 1 ),
+     $                  LDA, W( I, 1 ), LDW, ONE, A( I, I ), 1 )
+            CALL ZLACGV( I-1, W( I, 1 ), LDW )
+            CALL ZLACGV( I-1, A( I, 1 ), LDA )
+            CALL ZGEMV( 'No transpose', N-I+1, I-1, -ONE, W( I, 1 ),
+     $                  LDW, A( I, 1 ), LDA, ONE, A( I, I ), 1 )
+            CALL ZLACGV( I-1, A( I, 1 ), LDA )
+            A( I, I ) = DBLE( A( I, I ) )
+            IF( I.LT.N ) THEN
+*
+*              Generate elementary reflector H(i) to annihilate
+*              A(i+2:n,i)
+*
+               ALPHA = A( I+1, I )
+               CALL ZLARFG( N-I, ALPHA, A( MIN( I+2, N ), I ), 1,
+     $                      TAU( I ) )
+               E( I ) = ALPHA
+               A( I+1, I ) = ONE
+*
+*              Compute W(i+1:n,i)
+*
+               CALL ZHEMV( 'Lower', N-I, ONE, A( I+1, I+1 ), LDA,
+     $                     A( I+1, I ), 1, ZERO, W( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
+     $                     W( I+1, 1 ), LDW, A( I+1, I ), 1, ZERO,
+     $                     W( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1, 1 ),
+     $                     LDA, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
+               CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
+     $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
+     $                     W( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1, 1 ),
+     $                     LDW, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
+               CALL ZSCAL( N-I, TAU( I ), W( I+1, I ), 1 )
+               ALPHA = -HALF*TAU( I )*ZDOTC( N-I, W( I+1, I ), 1,
+     $                 A( I+1, I ), 1 )
+               CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ), 1 )
             END IF
-         END IF
+*
+   20    CONTINUE
       END IF
+*
       RETURN
 *
-*     End of ZLARTG
+*     End of ZLATRD
 *
       END
-*> \brief \b ZLASCL multiplies a general rectangular matrix by a real scalar defined as cto/cfrom.
+*> \brief \b ZLATRS solves a triangular system of equations with the scale factor set to prevent overflow.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -21625,27 +37999,29 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLASCL + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlascl.f"> 
+*> Download ZLATRS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrs.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlascl.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlatrs.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlascl.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrs.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+*       SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
+*                          CNORM, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          TYPE
-*       INTEGER            INFO, KL, KU, LDA, M, N
-*       DOUBLE PRECISION   CFROM, CTO
+*       CHARACTER          DIAG, NORMIN, TRANS, UPLO
+*       INTEGER            INFO, LDA, N
+*       DOUBLE PRECISION   SCALE
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * )
+*       DOUBLE PRECISION   CNORM( * )
+*       COMPLEX*16         A( LDA, * ), X( * )
 *       ..
 *  
 *
@@ -21654,109 +38030,207 @@
 *>
 *> \verbatim
 *>
-*> ZLASCL multiplies the M by N complex matrix A by the real scalar
-*> CTO/CFROM.  This is done without over/underflow as long as the final
-*> result CTO*A(I,J)/CFROM does not over/underflow. TYPE specifies that
-*> A may be full, upper triangular, lower triangular, upper Hessenberg,
-*> or banded.
+*> ZLATRS solves one of the triangular systems
+*>
+*>    A * x = s*b,  A**T * x = s*b,  or  A**H * x = s*b,
+*>
+*> with scaling to prevent overflow.  Here A is an upper or lower
+*> triangular matrix, A**T denotes the transpose of A, A**H denotes the
+*> conjugate transpose of A, x and b are n-element vectors, and s is a
+*> scaling factor, usually less than or equal to 1, chosen so that the
+*> components of x will be less than the overflow threshold.  If the
+*> unscaled problem will not cause overflow, the Level 2 BLAS routine
+*> ZTRSV is called. If the matrix A is singular (A(j,j) = 0 for some j),
+*> then s is set to 0 and a non-trivial solution to A*x = 0 is returned.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] TYPE
+*> \param[in] UPLO
 *> \verbatim
-*>          TYPE is CHARACTER*1
-*>          TYPE indices the storage type of the input matrix.
-*>          = 'G':  A is a full matrix.
-*>          = 'L':  A is a lower triangular matrix.
-*>          = 'U':  A is an upper triangular matrix.
-*>          = 'H':  A is an upper Hessenberg matrix.
-*>          = 'B':  A is a symmetric band matrix with lower bandwidth KL
-*>                  and upper bandwidth KU and with the only the lower
-*>                  half stored.
-*>          = 'Q':  A is a symmetric band matrix with lower bandwidth KL
-*>                  and upper bandwidth KU and with the only the upper
-*>                  half stored.
-*>          = 'Z':  A is a band matrix with lower bandwidth KL and upper
-*>                  bandwidth KU. See ZGBTRF for storage details.
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower triangular.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
 *> \endverbatim
 *>
-*> \param[in] KL
+*> \param[in] TRANS
 *> \verbatim
-*>          KL is INTEGER
-*>          The lower bandwidth of A.  Referenced only if TYPE = 'B',
-*>          'Q' or 'Z'.
+*>          TRANS is CHARACTER*1
+*>          Specifies the operation applied to A.
+*>          = 'N':  Solve A * x = s*b     (No transpose)
+*>          = 'T':  Solve A**T * x = s*b  (Transpose)
+*>          = 'C':  Solve A**H * x = s*b  (Conjugate transpose)
 *> \endverbatim
 *>
-*> \param[in] KU
+*> \param[in] DIAG
 *> \verbatim
-*>          KU is INTEGER
-*>          The upper bandwidth of A.  Referenced only if TYPE = 'B',
-*>          'Q' or 'Z'.
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A is unit triangular.
+*>          = 'N':  Non-unit triangular
+*>          = 'U':  Unit triangular
 *> \endverbatim
 *>
-*> \param[in] CFROM
+*> \param[in] NORMIN
 *> \verbatim
-*>          CFROM is DOUBLE PRECISION
+*>          NORMIN is CHARACTER*1
+*>          Specifies whether CNORM has been set or not.
+*>          = 'Y':  CNORM contains the column norms on entry
+*>          = 'N':  CNORM is not set on entry.  On exit, the norms will
+*>                  be computed and stored in CNORM.
 *> \endverbatim
 *>
-*> \param[in] CTO
+*> \param[in] N
 *> \verbatim
-*>          CTO is DOUBLE PRECISION
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
 *>
-*>          The matrix A is multiplied by CTO/CFROM. A(I,J) is computed
-*>          without over/underflow if the final result CTO*A(I,J)/CFROM
-*>          can be represented without over/underflow.  CFROM must be
-*>          nonzero.
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The triangular matrix A.  If UPLO = 'U', the leading n by n
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading n by n lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in] LDA
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max (1,N).
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in,out] X
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
+*>          X is COMPLEX*16 array, dimension (N)
+*>          On entry, the right hand side b of the triangular system.
+*>          On exit, X is overwritten by the solution vector x.
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>          The scaling factor s for the triangular system
+*>             A * x = s*b,  A**T * x = s*b,  or  A**H * x = s*b.
+*>          If SCALE = 0, the matrix A is singular or badly scaled, and
+*>          the vector x is an exact or approximate solution to A*x = 0.
+*> \endverbatim
+*>
+*> \param[in,out] CNORM
+*> \verbatim
+*>          CNORM is DOUBLE PRECISION array, dimension (N)
+*>
+*>          If NORMIN = 'Y', CNORM is an input argument and CNORM(j)
+*>          contains the norm of the off-diagonal part of the j-th column
+*>          of A.  If TRANS = 'N', CNORM(j) must be greater than or equal
+*>          to the infinity-norm, and if TRANS = 'T' or 'C', CNORM(j)
+*>          must be greater than or equal to the 1-norm.
+*>
+*>          If NORMIN = 'N', CNORM is an output argument and CNORM(j)
+*>          returns the 1-norm of the offdiagonal part of the j-th column
+*>          of A.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -k, the k-th argument had an illegal value
 *> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16OTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  A rough bound on x is computed; if that is less than overflow, ZTRSV
+*>  is called, otherwise, specific code is used which checks for possible
+*>  overflow or divide-by-zero at every operation.
+*>
+*>  A columnwise scheme is used for solving A*x = b.  The basic algorithm
+*>  if A is lower triangular is
+*>
+*>       x[1:n] := b[1:n]
+*>       for j = 1, ..., n
+*>            x(j) := x(j) / A(j,j)
+*>            x[j+1:n] := x[j+1:n] - x(j) * A[j+1:n,j]
+*>       end
+*>
+*>  Define bounds on the components of x after j iterations of the loop:
+*>     M(j) = bound on x[1:j]
+*>     G(j) = bound on x[j+1:n]
+*>  Initially, let M(0) = 0 and G(0) = max{x(i), i=1,...,n}.
+*>
+*>  Then for iteration j+1 we have
+*>     M(j+1) <= G(j) / | A(j+1,j+1) |
+*>     G(j+1) <= G(j) + M(j+1) * | A[j+2:n,j+1] |
+*>            <= G(j) ( 1 + CNORM(j+1) / | A(j+1,j+1) | )
+*>
+*>  where CNORM(j+1) is greater than or equal to the infinity-norm of
+*>  column j+1 of A, not counting the diagonal.  Hence
+*>
+*>     G(j) <= G(0) product ( 1 + CNORM(i) / | A(i,i) | )
+*>                  1<=i<=j
+*>  and
+*>
+*>     |x(j)| <= ( G(0) / |A(j,j)| ) product ( 1 + CNORM(i) / |A(i,i)| )
+*>                                   1<=i< j
+*>
+*>  Since |x(j)| <= M(j), we use the Level 2 BLAS routine ZTRSV if the
+*>  reciprocal of the largest M(j), j=1,..,n, is larger than
+*>  max(underflow, 1/overflow).
+*>
+*>  The bound on x(j) is also used to determine when a step in the
+*>  columnwise method can be performed without fear of overflow.  If
+*>  the computed bound is greater than a large constant, x is scaled to
+*>  prevent overflow, but if the bound overflows, x is set to 0, x(j) to
+*>  1, and scale to 0, and a non-trivial solution to A*x = 0 is found.
+*>
+*>  Similarly, a row-wise scheme is used to solve A**T *x = b  or
+*>  A**H *x = b.  The basic algorithm for A upper triangular is
+*>
+*>       for j = 1, ..., n
+*>            x(j) := ( b(j) - A[1:j-1,j]' * x[1:j-1] ) / A(j,j)
+*>       end
+*>
+*>  We simultaneously compute two bounds
+*>       G(j) = bound on ( b(i) - A[1:i-1,i]' * x[1:i-1] ), 1<=i<=j
+*>       M(j) = bound on x(i), 1<=i<=j
+*>
+*>  The initial values are G(0) = 0, M(0) = max{b(i), i=1,..,n}, and we
+*>  add the constraint G(j) >= G(j-1) and M(j) >= M(j-1) for j >= 1.
+*>  Then the bound on x(j) is
 *>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The matrix to be multiplied by CTO/CFROM.  See TYPE for the
-*>          storage type.
-*> \endverbatim
+*>       M(j) <= M(j-1) * ( 1 + CNORM(j) ) / | A(j,j) |
 *>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
+*>            <= M(0) * product ( ( 1 + CNORM(i) ) / |A(i,i)| )
+*>                      1<=i<=j
 *>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          0  - successful exit
-*>          <0 - if INFO = -i, the i-th argument had an illegal value.
+*>  and we can safely call ZTRSV if 1/M(n) and 1/G(n) are both greater
+*>  than max(underflow, 1/overflow).
 *> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup complex16OTHERauxiliary
-*
+*>
 *  =====================================================================
-      SUBROUTINE ZLASCL( TYPE, KL, KU, CFROM, CTO, M, N, A, LDA, INFO )
+      SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
+     $                   CNORM, INFO )
 *
 *  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -21764,1206 +38238,726 @@
 *     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          TYPE
-      INTEGER            INFO, KL, KU, LDA, M, N
-      DOUBLE PRECISION   CFROM, CTO
+      CHARACTER          DIAG, NORMIN, TRANS, UPLO
+      INTEGER            INFO, LDA, N
+      DOUBLE PRECISION   SCALE
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * )
+      DOUBLE PRECISION   CNORM( * )
+      COMPLEX*16         A( LDA, * ), X( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      DOUBLE PRECISION   ZERO, HALF, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D+0, HALF = 0.5D+0, ONE = 1.0D+0,
+     $                   TWO = 2.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            DONE
-      INTEGER            I, ITYPE, J, K1, K2, K3, K4
-      DOUBLE PRECISION   BIGNUM, CFROM1, CFROMC, CTO1, CTOC, MUL, SMLNUM
+      LOGICAL            NOTRAN, NOUNIT, UPPER
+      INTEGER            I, IMAX, J, JFIRST, JINC, JLAST
+      DOUBLE PRECISION   BIGNUM, GROW, REC, SMLNUM, TJJ, TMAX, TSCAL,
+     $                   XBND, XJ, XMAX
+      COMPLEX*16         CSUMJ, TJJS, USCAL, ZDUM
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME, DISNAN
-      DOUBLE PRECISION   DLAMCH
-      EXTERNAL           LSAME, DLAMCH, DISNAN
+      LOGICAL            LSAME
+      INTEGER            IDAMAX, IZAMAX
+      DOUBLE PRECISION   DLAMCH, DZASUM
+      COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
+      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM, ZDOTC,
+     $                   ZDOTU, ZLADIV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTRSV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MAX, MIN
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1, CABS2
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
+      CABS2( ZDUM ) = ABS( DBLE( ZDUM ) / 2.D0 ) +
+     $                ABS( DIMAG( ZDUM ) / 2.D0 )
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
-*
       INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      NOUNIT = LSAME( DIAG, 'N' )
 *
-      IF( LSAME( TYPE, 'G' ) ) THEN
-         ITYPE = 0
-      ELSE IF( LSAME( TYPE, 'L' ) ) THEN
-         ITYPE = 1
-      ELSE IF( LSAME( TYPE, 'U' ) ) THEN
-         ITYPE = 2
-      ELSE IF( LSAME( TYPE, 'H' ) ) THEN
-         ITYPE = 3
-      ELSE IF( LSAME( TYPE, 'B' ) ) THEN
-         ITYPE = 4
-      ELSE IF( LSAME( TYPE, 'Q' ) ) THEN
-         ITYPE = 5
-      ELSE IF( LSAME( TYPE, 'Z' ) ) THEN
-         ITYPE = 6
-      ELSE
-         ITYPE = -1
-      END IF
+*     Test the input parameters.
 *
-      IF( ITYPE.EQ.-1 ) THEN
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( CFROM.EQ.ZERO .OR. DISNAN(CFROM) ) THEN
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
+     $         LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
+         INFO = -3
+      ELSE IF( .NOT.LSAME( NORMIN, 'Y' ) .AND. .NOT.
+     $         LSAME( NORMIN, 'N' ) ) THEN
          INFO = -4
-      ELSE IF( DISNAN(CTO) ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -5
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -6
-      ELSE IF( N.LT.0 .OR. ( ITYPE.EQ.4 .AND. N.NE.M ) .OR.
-     $         ( ITYPE.EQ.5 .AND. N.NE.M ) ) THEN
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -7
-      ELSE IF( ITYPE.LE.3 .AND. LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -9
-      ELSE IF( ITYPE.GE.4 ) THEN
-         IF( KL.LT.0 .OR. KL.GT.MAX( M-1, 0 ) ) THEN
-            INFO = -2
-         ELSE IF( KU.LT.0 .OR. KU.GT.MAX( N-1, 0 ) .OR.
-     $            ( ( ITYPE.EQ.4 .OR. ITYPE.EQ.5 ) .AND. KL.NE.KU ) )
-     $             THEN
-            INFO = -3
-         ELSE IF( ( ITYPE.EQ.4 .AND. LDA.LT.KL+1 ) .OR.
-     $            ( ITYPE.EQ.5 .AND. LDA.LT.KU+1 ) .OR.
-     $            ( ITYPE.EQ.6 .AND. LDA.LT.2*KL+KU+1 ) ) THEN
-            INFO = -9
-         END IF
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZLASCL', -INFO )
+         CALL XERBLA( 'ZLATRS', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 .OR. M.EQ.0 )
+      IF( N.EQ.0 )
      $   RETURN
 *
-*     Get machine parameters
+*     Determine machine dependent parameters to control overflow.
 *
-      SMLNUM = DLAMCH( 'S' )
+      SMLNUM = DLAMCH( 'Safe minimum' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+      SMLNUM = SMLNUM / DLAMCH( 'Precision' )
       BIGNUM = ONE / SMLNUM
+      SCALE = ONE
 *
-      CFROMC = CFROM
-      CTOC = CTO
+      IF( LSAME( NORMIN, 'N' ) ) THEN
 *
-   10 CONTINUE
-      CFROM1 = CFROMC*SMLNUM
-      IF( CFROM1.EQ.CFROMC ) THEN
-!        CFROMC is an inf.  Multiply by a correctly signed zero for
-!        finite CTOC, or a NaN if CTOC is infinite.
-         MUL = CTOC / CFROMC
-         DONE = .TRUE.
-         CTO1 = CTOC
-      ELSE
-         CTO1 = CTOC / BIGNUM
-         IF( CTO1.EQ.CTOC ) THEN
-!           CTOC is either 0 or an inf.  In both cases, CTOC itself
-!           serves as the correct multiplication factor.
-            MUL = CTOC
-            DONE = .TRUE.
-            CFROMC = ONE
-         ELSE IF( ABS( CFROM1 ).GT.ABS( CTOC ) .AND. CTOC.NE.ZERO ) THEN
-            MUL = SMLNUM
-            DONE = .FALSE.
-            CFROMC = CFROM1
-         ELSE IF( ABS( CTO1 ).GT.ABS( CFROMC ) ) THEN
-            MUL = BIGNUM
-            DONE = .FALSE.
-            CTOC = CTO1
+*        Compute the 1-norm of each column, not including the diagonal.
+*
+         IF( UPPER ) THEN
+*
+*           A is upper triangular.
+*
+            DO 10 J = 1, N
+               CNORM( J ) = DZASUM( J-1, A( 1, J ), 1 )
+   10       CONTINUE
          ELSE
-            MUL = CTOC / CFROMC
-            DONE = .TRUE.
+*
+*           A is lower triangular.
+*
+            DO 20 J = 1, N - 1
+               CNORM( J ) = DZASUM( N-J, A( J+1, J ), 1 )
+   20       CONTINUE
+            CNORM( N ) = ZERO
          END IF
       END IF
 *
-      IF( ITYPE.EQ.0 ) THEN
+*     Scale the column norms by TSCAL if the maximum element in CNORM is
+*     greater than BIGNUM/2.
 *
-*        Full matrix
+      IMAX = IDAMAX( N, CNORM, 1 )
+      TMAX = CNORM( IMAX )
+      IF( TMAX.LE.BIGNUM*HALF ) THEN
+         TSCAL = ONE
+      ELSE
+         TSCAL = HALF / ( SMLNUM*TMAX )
+         CALL DSCAL( N, TSCAL, CNORM, 1 )
+      END IF
 *
-         DO 30 J = 1, N
-            DO 20 I = 1, M
-               A( I, J ) = A( I, J )*MUL
-   20       CONTINUE
-   30    CONTINUE
+*     Compute a bound on the computed solution vector to see if the
+*     Level 2 BLAS routine ZTRSV can be used.
 *
-      ELSE IF( ITYPE.EQ.1 ) THEN
+      XMAX = ZERO
+      DO 30 J = 1, N
+         XMAX = MAX( XMAX, CABS2( X( J ) ) )
+   30 CONTINUE
+      XBND = XMAX
 *
-*        Lower triangular matrix
+      IF( NOTRAN ) THEN
 *
-         DO 50 J = 1, N
-            DO 40 I = J, M
-               A( I, J ) = A( I, J )*MUL
+*        Compute the growth in A * x = b.
+*
+         IF( UPPER ) THEN
+            JFIRST = N
+            JLAST = 1
+            JINC = -1
+         ELSE
+            JFIRST = 1
+            JLAST = N
+            JINC = 1
+         END IF
+*
+         IF( TSCAL.NE.ONE ) THEN
+            GROW = ZERO
+            GO TO 60
+         END IF
+*
+         IF( NOUNIT ) THEN
+*
+*           A is non-unit triangular.
+*
+*           Compute GROW = 1/G(j) and XBND = 1/M(j).
+*           Initially, G(0) = max{x(i), i=1,...,n}.
+*
+            GROW = HALF / MAX( XBND, SMLNUM )
+            XBND = GROW
+            DO 40 J = JFIRST, JLAST, JINC
+*
+*              Exit the loop if the growth factor is too small.
+*
+               IF( GROW.LE.SMLNUM )
+     $            GO TO 60
+*
+               TJJS = A( J, J )
+               TJJ = CABS1( TJJS )
+*
+               IF( TJJ.GE.SMLNUM ) THEN
+*
+*                 M(j) = G(j-1) / abs(A(j,j))
+*
+                  XBND = MIN( XBND, MIN( ONE, TJJ )*GROW )
+               ELSE
+*
+*                 M(j) could overflow, set XBND to 0.
+*
+                  XBND = ZERO
+               END IF
+*
+               IF( TJJ+CNORM( J ).GE.SMLNUM ) THEN
+*
+*                 G(j) = G(j-1)*( 1 + CNORM(j) / abs(A(j,j)) )
+*
+                  GROW = GROW*( TJJ / ( TJJ+CNORM( J ) ) )
+               ELSE
+*
+*                 G(j) could overflow, set GROW to 0.
+*
+                  GROW = ZERO
+               END IF
    40       CONTINUE
-   50    CONTINUE
+            GROW = XBND
+         ELSE
 *
-      ELSE IF( ITYPE.EQ.2 ) THEN
+*           A is unit triangular.
 *
-*        Upper triangular matrix
+*           Compute GROW = 1/G(j), where G(0) = max{x(i), i=1,...,n}.
 *
-         DO 70 J = 1, N
-            DO 60 I = 1, MIN( J, M )
-               A( I, J ) = A( I, J )*MUL
-   60       CONTINUE
-   70    CONTINUE
+            GROW = MIN( ONE, HALF / MAX( XBND, SMLNUM ) )
+            DO 50 J = JFIRST, JLAST, JINC
 *
-      ELSE IF( ITYPE.EQ.3 ) THEN
+*              Exit the loop if the growth factor is too small.
 *
-*        Upper Hessenberg matrix
+               IF( GROW.LE.SMLNUM )
+     $            GO TO 60
 *
-         DO 90 J = 1, N
-            DO 80 I = 1, MIN( J+1, M )
-               A( I, J ) = A( I, J )*MUL
-   80       CONTINUE
-   90    CONTINUE
+*              G(j) = G(j-1)*( 1 + CNORM(j) )
 *
-      ELSE IF( ITYPE.EQ.4 ) THEN
+               GROW = GROW*( ONE / ( ONE+CNORM( J ) ) )
+   50       CONTINUE
+         END IF
+   60    CONTINUE
 *
-*        Lower half of a symmetric band matrix
+      ELSE
 *
-         K3 = KL + 1
-         K4 = N + 1
-         DO 110 J = 1, N
-            DO 100 I = 1, MIN( K3, K4-J )
-               A( I, J ) = A( I, J )*MUL
-  100       CONTINUE
-  110    CONTINUE
+*        Compute the growth in A**T * x = b  or  A**H * x = b.
 *
-      ELSE IF( ITYPE.EQ.5 ) THEN
+         IF( UPPER ) THEN
+            JFIRST = 1
+            JLAST = N
+            JINC = 1
+         ELSE
+            JFIRST = N
+            JLAST = 1
+            JINC = -1
+         END IF
 *
-*        Upper half of a symmetric band matrix
+         IF( TSCAL.NE.ONE ) THEN
+            GROW = ZERO
+            GO TO 90
+         END IF
 *
-         K1 = KU + 2
-         K3 = KU + 1
-         DO 130 J = 1, N
-            DO 120 I = MAX( K1-J, 1 ), K3
-               A( I, J ) = A( I, J )*MUL
-  120       CONTINUE
-  130    CONTINUE
+         IF( NOUNIT ) THEN
 *
-      ELSE IF( ITYPE.EQ.6 ) THEN
+*           A is non-unit triangular.
 *
-*        Band matrix
+*           Compute GROW = 1/G(j) and XBND = 1/M(j).
+*           Initially, M(0) = max{x(i), i=1,...,n}.
 *
-         K1 = KL + KU + 2
-         K2 = KL + 1
-         K3 = 2*KL + KU + 1
-         K4 = KL + KU + 1 + M
-         DO 150 J = 1, N
-            DO 140 I = MAX( K1-J, K2 ), MIN( K3, K4-J )
-               A( I, J ) = A( I, J )*MUL
-  140       CONTINUE
-  150    CONTINUE
+            GROW = HALF / MAX( XBND, SMLNUM )
+            XBND = GROW
+            DO 70 J = JFIRST, JLAST, JINC
 *
-      END IF
+*              Exit the loop if the growth factor is too small.
 *
-      IF( .NOT.DONE )
-     $   GO TO 10
+               IF( GROW.LE.SMLNUM )
+     $            GO TO 90
 *
-      RETURN
+*              G(j) = max( G(j-1), M(j-1)*( 1 + CNORM(j) ) )
 *
-*     End of ZLASCL
+               XJ = ONE + CNORM( J )
+               GROW = MIN( GROW, XBND / XJ )
 *
-      END
-*> \brief \b ZLASET initializes the off-diagonal elements and the diagonal elements of a matrix to given values.
+               TJJS = A( J, J )
+               TJJ = CABS1( TJJS )
 *
-*  =========== DOCUMENTATION ===========
+               IF( TJJ.GE.SMLNUM ) THEN
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                 M(j) = M(j-1)*( 1 + CNORM(j) ) / abs(A(j,j))
 *
-*> \htmlonly
-*> Download ZLASET + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaset.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaset.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaset.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                  IF( XJ.GT.TJJ )
+     $               XBND = XBND*( TJJ / XJ )
+               ELSE
 *
-*  Definition:
-*  ===========
+*                 M(j) could overflow, set XBND to 0.
 *
-*       SUBROUTINE ZLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            LDA, M, N
-*       COMPLEX*16         ALPHA, BETA
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * )
-*       ..
-*  
+                  XBND = ZERO
+               END IF
+   70       CONTINUE
+            GROW = MIN( GROW, XBND )
+         ELSE
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLASET initializes a 2-D array A to BETA on the diagonal and
-*> ALPHA on the offdiagonals.
-*> \endverbatim
+*           A is unit triangular.
 *
-*  Arguments:
-*  ==========
+*           Compute GROW = 1/G(j), where G(0) = max{x(i), i=1,...,n}.
 *
-*> \param[in] UPLO
-*> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies the part of the matrix A to be set.
-*>          = 'U':      Upper triangular part is set. The lower triangle
-*>                      is unchanged.
-*>          = 'L':      Lower triangular part is set. The upper triangle
-*>                      is unchanged.
-*>          Otherwise:  All of the matrix A is set.
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          On entry, M specifies the number of rows of A.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          On entry, N specifies the number of columns of A.
-*> \endverbatim
-*>
-*> \param[in] ALPHA
-*> \verbatim
-*>          ALPHA is COMPLEX*16
-*>          All the offdiagonal array elements are set to ALPHA.
-*> \endverbatim
-*>
-*> \param[in] BETA
-*> \verbatim
-*>          BETA is COMPLEX*16
-*>          All the diagonal array elements are set to BETA.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the m by n matrix A.
-*>          On exit, A(i,j) = ALPHA, 1 <= i <= m, 1 <= j <= n, i.ne.j;
-*>                   A(i,i) = BETA , 1 <= i <= min(m,n)
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
+            GROW = MIN( ONE, HALF / MAX( XBND, SMLNUM ) )
+            DO 80 J = JFIRST, JLAST, JINC
 *
-*  Authors:
-*  ========
+*              Exit the loop if the growth factor is too small.
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+               IF( GROW.LE.SMLNUM )
+     $            GO TO 90
 *
-*> \date September 2012
+*              G(j) = ( 1 + CNORM(j) )*G(j-1)
 *
-*> \ingroup complex16OTHERauxiliary
+               XJ = ONE + CNORM( J )
+               GROW = GROW / XJ
+   80       CONTINUE
+         END IF
+   90    CONTINUE
+      END IF
 *
-*  =====================================================================
-      SUBROUTINE ZLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
+      IF( ( GROW*TSCAL ).GT.SMLNUM ) THEN
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*        Use the Level 2 BLAS solve if the reciprocal of the bound on
+*        elements of X is not too small.
+*
+         CALL ZTRSV( UPLO, TRANS, DIAG, N, A, LDA, X, 1 )
+      ELSE
+*
+*        Use a Level 1 BLAS solve, scaling intermediate results.
 *
-*     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            LDA, M, N
-      COMPLEX*16         ALPHA, BETA
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * )
-*     ..
+         IF( XMAX.GT.BIGNUM*HALF ) THEN
 *
-*  =====================================================================
+*           Scale X so that its components are less than or equal to
+*           BIGNUM in absolute value.
 *
-*     .. Local Scalars ..
-      INTEGER            I, J
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MIN
-*     ..
-*     .. Executable Statements ..
+            SCALE = ( BIGNUM*HALF ) / XMAX
+            CALL ZDSCAL( N, SCALE, X, 1 )
+            XMAX = BIGNUM
+         ELSE
+            XMAX = XMAX*TWO
+         END IF
 *
-      IF( LSAME( UPLO, 'U' ) ) THEN
+         IF( NOTRAN ) THEN
 *
-*        Set the diagonal to BETA and the strictly upper triangular
-*        part of the array to ALPHA.
+*           Solve A * x = b
 *
-         DO 20 J = 2, N
-            DO 10 I = 1, MIN( J-1, M )
-               A( I, J ) = ALPHA
-   10       CONTINUE
-   20    CONTINUE
-         DO 30 I = 1, MIN( N, M )
-            A( I, I ) = BETA
-   30    CONTINUE
+            DO 120 J = JFIRST, JLAST, JINC
 *
-      ELSE IF( LSAME( UPLO, 'L' ) ) THEN
+*              Compute x(j) = b(j) / A(j,j), scaling x if necessary.
 *
-*        Set the diagonal to BETA and the strictly lower triangular
-*        part of the array to ALPHA.
+               XJ = CABS1( X( J ) )
+               IF( NOUNIT ) THEN
+                  TJJS = A( J, J )*TSCAL
+               ELSE
+                  TJJS = TSCAL
+                  IF( TSCAL.EQ.ONE )
+     $               GO TO 110
+               END IF
+               TJJ = CABS1( TJJS )
+               IF( TJJ.GT.SMLNUM ) THEN
 *
-         DO 50 J = 1, MIN( M, N )
-            DO 40 I = J + 1, M
-               A( I, J ) = ALPHA
-   40       CONTINUE
-   50    CONTINUE
-         DO 60 I = 1, MIN( N, M )
-            A( I, I ) = BETA
-   60    CONTINUE
+*                    abs(A(j,j)) > SMLNUM:
 *
-      ELSE
+                  IF( TJJ.LT.ONE ) THEN
+                     IF( XJ.GT.TJJ*BIGNUM ) THEN
 *
-*        Set the array to BETA on the diagonal and ALPHA on the
-*        offdiagonal.
+*                          Scale x by 1/b(j).
 *
-         DO 80 J = 1, N
-            DO 70 I = 1, M
-               A( I, J ) = ALPHA
-   70       CONTINUE
-   80    CONTINUE
-         DO 90 I = 1, MIN( M, N )
-            A( I, I ) = BETA
-   90    CONTINUE
-      END IF
+                        REC = ONE / XJ
+                        CALL ZDSCAL( N, REC, X, 1 )
+                        SCALE = SCALE*REC
+                        XMAX = XMAX*REC
+                     END IF
+                  END IF
+                  X( J ) = ZLADIV( X( J ), TJJS )
+                  XJ = CABS1( X( J ) )
+               ELSE IF( TJJ.GT.ZERO ) THEN
 *
-      RETURN
+*                    0 < abs(A(j,j)) <= SMLNUM:
 *
-*     End of ZLASET
+                  IF( XJ.GT.TJJ*BIGNUM ) THEN
 *
-      END
-*> \brief \b ZLASR applies a sequence of plane rotations to a general rectangular matrix.
+*                       Scale x by (1/abs(x(j)))*abs(A(j,j))*BIGNUM
+*                       to avoid overflow when dividing by A(j,j).
 *
-*  =========== DOCUMENTATION ===========
+                     REC = ( TJJ*BIGNUM ) / XJ
+                     IF( CNORM( J ).GT.ONE ) THEN
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                          Scale by 1/CNORM(j) to avoid overflow when
+*                          multiplying x(j) times column j.
 *
-*> \htmlonly
-*> Download ZLASR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlasr.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlasr.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlasr.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                        REC = REC / CNORM( J )
+                     END IF
+                     CALL ZDSCAL( N, REC, X, 1 )
+                     SCALE = SCALE*REC
+                     XMAX = XMAX*REC
+                  END IF
+                  X( J ) = ZLADIV( X( J ), TJJS )
+                  XJ = CABS1( X( J ) )
+               ELSE
 *
-*  Definition:
-*  ===========
+*                    A(j,j) = 0:  Set x(1:n) = 0, x(j) = 1, and
+*                    scale = 0, and compute a solution to A*x = 0.
 *
-*       SUBROUTINE ZLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          DIRECT, PIVOT, SIDE
-*       INTEGER            LDA, M, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   C( * ), S( * )
-*       COMPLEX*16         A( LDA, * )
-*       ..
-*  
+                  DO 100 I = 1, N
+                     X( I ) = ZERO
+  100             CONTINUE
+                  X( J ) = ONE
+                  XJ = ONE
+                  SCALE = ZERO
+                  XMAX = ZERO
+               END IF
+  110          CONTINUE
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLASR applies a sequence of real plane rotations to a complex matrix
-*> A, from either the left or the right.
-*>
-*> When SIDE = 'L', the transformation takes the form
-*>
-*>    A := P*A
-*>
-*> and when SIDE = 'R', the transformation takes the form
-*>
-*>    A := A*P**T
-*>
-*> where P is an orthogonal matrix consisting of a sequence of z plane
-*> rotations, with z = M when SIDE = 'L' and z = N when SIDE = 'R',
-*> and P**T is the transpose of P.
-*> 
-*> When DIRECT = 'F' (Forward sequence), then
-*> 
-*>    P = P(z-1) * ... * P(2) * P(1)
-*> 
-*> and when DIRECT = 'B' (Backward sequence), then
-*> 
-*>    P = P(1) * P(2) * ... * P(z-1)
-*> 
-*> where P(k) is a plane rotation matrix defined by the 2-by-2 rotation
-*> 
-*>    R(k) = (  c(k)  s(k) )
-*>         = ( -s(k)  c(k) ).
-*> 
-*> When PIVOT = 'V' (Variable pivot), the rotation is performed
-*> for the plane (k,k+1), i.e., P(k) has the form
-*> 
-*>    P(k) = (  1                                            )
-*>           (       ...                                     )
-*>           (              1                                )
-*>           (                   c(k)  s(k)                  )
-*>           (                  -s(k)  c(k)                  )
-*>           (                                1              )
-*>           (                                     ...       )
-*>           (                                            1  )
-*> 
-*> where R(k) appears as a rank-2 modification to the identity matrix in
-*> rows and columns k and k+1.
-*> 
-*> When PIVOT = 'T' (Top pivot), the rotation is performed for the
-*> plane (1,k+1), so P(k) has the form
-*> 
-*>    P(k) = (  c(k)                    s(k)                 )
-*>           (         1                                     )
-*>           (              ...                              )
-*>           (                     1                         )
-*>           ( -s(k)                    c(k)                 )
-*>           (                                 1             )
-*>           (                                      ...      )
-*>           (                                             1 )
-*> 
-*> where R(k) appears in rows and columns 1 and k+1.
-*> 
-*> Similarly, when PIVOT = 'B' (Bottom pivot), the rotation is
-*> performed for the plane (k,z), giving P(k) the form
-*> 
-*>    P(k) = ( 1                                             )
-*>           (      ...                                      )
-*>           (             1                                 )
-*>           (                  c(k)                    s(k) )
-*>           (                         1                     )
-*>           (                              ...              )
-*>           (                                     1         )
-*>           (                 -s(k)                    c(k) )
-*> 
-*> where R(k) appears in rows and columns k and z.  The rotations are
-*> performed without ever forming P(k) explicitly.
-*> \endverbatim
+*              Scale x if necessary to avoid overflow when adding a
+*              multiple of column j of A.
 *
-*  Arguments:
-*  ==========
+               IF( XJ.GT.ONE ) THEN
+                  REC = ONE / XJ
+                  IF( CNORM( J ).GT.( BIGNUM-XMAX )*REC ) THEN
 *
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          Specifies whether the plane rotation matrix P is applied to
-*>          A on the left or the right.
-*>          = 'L':  Left, compute A := P*A
-*>          = 'R':  Right, compute A:= A*P**T
-*> \endverbatim
-*>
-*> \param[in] PIVOT
-*> \verbatim
-*>          PIVOT is CHARACTER*1
-*>          Specifies the plane for which P(k) is a plane rotation
-*>          matrix.
-*>          = 'V':  Variable pivot, the plane (k,k+1)
-*>          = 'T':  Top pivot, the plane (1,k+1)
-*>          = 'B':  Bottom pivot, the plane (k,z)
-*> \endverbatim
-*>
-*> \param[in] DIRECT
-*> \verbatim
-*>          DIRECT is CHARACTER*1
-*>          Specifies whether P is a forward or backward sequence of
-*>          plane rotations.
-*>          = 'F':  Forward, P = P(z-1)*...*P(2)*P(1)
-*>          = 'B':  Backward, P = P(1)*P(2)*...*P(z-1)
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  If m <= 1, an immediate
-*>          return is effected.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  If n <= 1, an
-*>          immediate return is effected.
-*> \endverbatim
-*>
-*> \param[in] C
-*> \verbatim
-*>          C is DOUBLE PRECISION array, dimension
-*>                  (M-1) if SIDE = 'L'
-*>                  (N-1) if SIDE = 'R'
-*>          The cosines c(k) of the plane rotations.
-*> \endverbatim
-*>
-*> \param[in] S
-*> \verbatim
-*>          S is DOUBLE PRECISION array, dimension
-*>                  (M-1) if SIDE = 'L'
-*>                  (N-1) if SIDE = 'R'
-*>          The sines s(k) of the plane rotations.  The 2-by-2 plane
-*>          rotation part of the matrix P(k), R(k), has the form
-*>          R(k) = (  c(k)  s(k) )
-*>                 ( -s(k)  c(k) ).
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The M-by-N matrix A.  On exit, A is overwritten by P*A if
-*>          SIDE = 'R' or by A*P**T if SIDE = 'L'.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
+*                    Scale x by 1/(2*abs(x(j))).
 *
-*  Authors:
-*  ========
+                     REC = REC*HALF
+                     CALL ZDSCAL( N, REC, X, 1 )
+                     SCALE = SCALE*REC
+                  END IF
+               ELSE IF( XJ*CNORM( J ).GT.( BIGNUM-XMAX ) ) THEN
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                 Scale x by 1/2.
 *
-*> \date September 2012
+                  CALL ZDSCAL( N, HALF, X, 1 )
+                  SCALE = SCALE*HALF
+               END IF
 *
-*> \ingroup complex16OTHERauxiliary
+               IF( UPPER ) THEN
+                  IF( J.GT.1 ) THEN
 *
-*  =====================================================================
-      SUBROUTINE ZLASR( SIDE, PIVOT, DIRECT, M, N, C, S, A, LDA )
+*                    Compute the update
+*                       x(1:j-1) := x(1:j-1) - x(j) * A(1:j-1,j)
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+                     CALL ZAXPY( J-1, -X( J )*TSCAL, A( 1, J ), 1, X,
+     $                           1 )
+                     I = IZAMAX( J-1, X, 1 )
+                     XMAX = CABS1( X( I ) )
+                  END IF
+               ELSE
+                  IF( J.LT.N ) THEN
 *
-*     .. Scalar Arguments ..
-      CHARACTER          DIRECT, PIVOT, SIDE
-      INTEGER            LDA, M, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   C( * ), S( * )
-      COMPLEX*16         A( LDA, * )
-*     ..
+*                    Compute the update
+*                       x(j+1:n) := x(j+1:n) - x(j) * A(j+1:n,j)
 *
-*  =====================================================================
+                     CALL ZAXPY( N-J, -X( J )*TSCAL, A( J+1, J ), 1,
+     $                           X( J+1 ), 1 )
+                     I = J + IZAMAX( N-J, X( J+1 ), 1 )
+                     XMAX = CABS1( X( I ) )
+                  END IF
+               END IF
+  120       CONTINUE
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, INFO, J
-      DOUBLE PRECISION   CTEMP, STEMP
-      COMPLEX*16         TEMP
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA
-*     ..
-*     .. Executable Statements ..
+         ELSE IF( LSAME( TRANS, 'T' ) ) THEN
 *
-*     Test the input parameters
+*           Solve A**T * x = b
 *
-      INFO = 0
-      IF( .NOT.( LSAME( SIDE, 'L' ) .OR. LSAME( SIDE, 'R' ) ) ) THEN
-         INFO = 1
-      ELSE IF( .NOT.( LSAME( PIVOT, 'V' ) .OR. LSAME( PIVOT,
-     $         'T' ) .OR. LSAME( PIVOT, 'B' ) ) ) THEN
-         INFO = 2
-      ELSE IF( .NOT.( LSAME( DIRECT, 'F' ) .OR. LSAME( DIRECT, 'B' ) ) )
-     $          THEN
-         INFO = 3
-      ELSE IF( M.LT.0 ) THEN
-         INFO = 4
-      ELSE IF( N.LT.0 ) THEN
-         INFO = 5
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = 9
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZLASR ', INFO )
-         RETURN
-      END IF
+            DO 170 J = JFIRST, JLAST, JINC
 *
-*     Quick return if possible
+*              Compute x(j) = b(j) - sum A(k,j)*x(k).
+*                                    k<>j
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )
-     $   RETURN
-      IF( LSAME( SIDE, 'L' ) ) THEN
+               XJ = CABS1( X( J ) )
+               USCAL = TSCAL
+               REC = ONE / MAX( XMAX, ONE )
+               IF( CNORM( J ).GT.( BIGNUM-XJ )*REC ) THEN
 *
-*        Form  P * A
+*                 If x(j) could overflow, scale x by 1/(2*XMAX).
 *
-         IF( LSAME( PIVOT, 'V' ) ) THEN
-            IF( LSAME( DIRECT, 'F' ) ) THEN
-               DO 20 J = 1, M - 1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 10 I = 1, N
-                        TEMP = A( J+1, I )
-                        A( J+1, I ) = CTEMP*TEMP - STEMP*A( J, I )
-                        A( J, I ) = STEMP*TEMP + CTEMP*A( J, I )
-   10                CONTINUE
-                  END IF
-   20          CONTINUE
-            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
-               DO 40 J = M - 1, 1, -1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 30 I = 1, N
-                        TEMP = A( J+1, I )
-                        A( J+1, I ) = CTEMP*TEMP - STEMP*A( J, I )
-                        A( J, I ) = STEMP*TEMP + CTEMP*A( J, I )
-   30                CONTINUE
-                  END IF
-   40          CONTINUE
-            END IF
-         ELSE IF( LSAME( PIVOT, 'T' ) ) THEN
-            IF( LSAME( DIRECT, 'F' ) ) THEN
-               DO 60 J = 2, M
-                  CTEMP = C( J-1 )
-                  STEMP = S( J-1 )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 50 I = 1, N
-                        TEMP = A( J, I )
-                        A( J, I ) = CTEMP*TEMP - STEMP*A( 1, I )
-                        A( 1, I ) = STEMP*TEMP + CTEMP*A( 1, I )
-   50                CONTINUE
+                  REC = REC*HALF
+                  IF( NOUNIT ) THEN
+                     TJJS = A( J, J )*TSCAL
+                  ELSE
+                     TJJS = TSCAL
                   END IF
-   60          CONTINUE
-            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
-               DO 80 J = M, 2, -1
-                  CTEMP = C( J-1 )
-                  STEMP = S( J-1 )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 70 I = 1, N
-                        TEMP = A( J, I )
-                        A( J, I ) = CTEMP*TEMP - STEMP*A( 1, I )
-                        A( 1, I ) = STEMP*TEMP + CTEMP*A( 1, I )
-   70                CONTINUE
+                  TJJ = CABS1( TJJS )
+                  IF( TJJ.GT.ONE ) THEN
+*
+*                       Divide by A(j,j) when scaling x if A(j,j) > 1.
+*
+                     REC = MIN( ONE, REC*TJJ )
+                     USCAL = ZLADIV( USCAL, TJJS )
                   END IF
-   80          CONTINUE
-            END IF
-         ELSE IF( LSAME( PIVOT, 'B' ) ) THEN
-            IF( LSAME( DIRECT, 'F' ) ) THEN
-               DO 100 J = 1, M - 1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 90 I = 1, N
-                        TEMP = A( J, I )
-                        A( J, I ) = STEMP*A( M, I ) + CTEMP*TEMP
-                        A( M, I ) = CTEMP*A( M, I ) - STEMP*TEMP
-   90                CONTINUE
+                  IF( REC.LT.ONE ) THEN
+                     CALL ZDSCAL( N, REC, X, 1 )
+                     SCALE = SCALE*REC
+                     XMAX = XMAX*REC
                   END IF
-  100          CONTINUE
-            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
-               DO 120 J = M - 1, 1, -1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 110 I = 1, N
-                        TEMP = A( J, I )
-                        A( J, I ) = STEMP*A( M, I ) + CTEMP*TEMP
-                        A( M, I ) = CTEMP*A( M, I ) - STEMP*TEMP
-  110                CONTINUE
+               END IF
+*
+               CSUMJ = ZERO
+               IF( USCAL.EQ.DCMPLX( ONE ) ) THEN
+*
+*                 If the scaling needed for A in the dot product is 1,
+*                 call ZDOTU to perform the dot product.
+*
+                  IF( UPPER ) THEN
+                     CSUMJ = ZDOTU( J-1, A( 1, J ), 1, X, 1 )
+                  ELSE IF( J.LT.N ) THEN
+                     CSUMJ = ZDOTU( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
                   END IF
-  120          CONTINUE
-            END IF
-         END IF
-      ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+               ELSE
 *
-*        Form A * P**T
+*                 Otherwise, use in-line code for the dot product.
 *
-         IF( LSAME( PIVOT, 'V' ) ) THEN
-            IF( LSAME( DIRECT, 'F' ) ) THEN
-               DO 140 J = 1, N - 1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 130 I = 1, M
-                        TEMP = A( I, J+1 )
-                        A( I, J+1 ) = CTEMP*TEMP - STEMP*A( I, J )
-                        A( I, J ) = STEMP*TEMP + CTEMP*A( I, J )
+                  IF( UPPER ) THEN
+                     DO 130 I = 1, J - 1
+                        CSUMJ = CSUMJ + ( A( I, J )*USCAL )*X( I )
   130                CONTINUE
+                  ELSE IF( J.LT.N ) THEN
+                     DO 140 I = J + 1, N
+                        CSUMJ = CSUMJ + ( A( I, J )*USCAL )*X( I )
+  140                CONTINUE
                   END IF
-  140          CONTINUE
-            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
-               DO 160 J = N - 1, 1, -1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 150 I = 1, M
-                        TEMP = A( I, J+1 )
-                        A( I, J+1 ) = CTEMP*TEMP - STEMP*A( I, J )
-                        A( I, J ) = STEMP*TEMP + CTEMP*A( I, J )
-  150                CONTINUE
-                  END IF
-  160          CONTINUE
-            END IF
-         ELSE IF( LSAME( PIVOT, 'T' ) ) THEN
-            IF( LSAME( DIRECT, 'F' ) ) THEN
-               DO 180 J = 2, N
-                  CTEMP = C( J-1 )
-                  STEMP = S( J-1 )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 170 I = 1, M
-                        TEMP = A( I, J )
-                        A( I, J ) = CTEMP*TEMP - STEMP*A( I, 1 )
-                        A( I, 1 ) = STEMP*TEMP + CTEMP*A( I, 1 )
-  170                CONTINUE
-                  END IF
-  180          CONTINUE
-            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
-               DO 200 J = N, 2, -1
-                  CTEMP = C( J-1 )
-                  STEMP = S( J-1 )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 190 I = 1, M
-                        TEMP = A( I, J )
-                        A( I, J ) = CTEMP*TEMP - STEMP*A( I, 1 )
-                        A( I, 1 ) = STEMP*TEMP + CTEMP*A( I, 1 )
-  190                CONTINUE
-                  END IF
-  200          CONTINUE
-            END IF
-         ELSE IF( LSAME( PIVOT, 'B' ) ) THEN
-            IF( LSAME( DIRECT, 'F' ) ) THEN
-               DO 220 J = 1, N - 1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 210 I = 1, M
-                        TEMP = A( I, J )
-                        A( I, J ) = STEMP*A( I, N ) + CTEMP*TEMP
-                        A( I, N ) = CTEMP*A( I, N ) - STEMP*TEMP
-  210                CONTINUE
-                  END IF
-  220          CONTINUE
-            ELSE IF( LSAME( DIRECT, 'B' ) ) THEN
-               DO 240 J = N - 1, 1, -1
-                  CTEMP = C( J )
-                  STEMP = S( J )
-                  IF( ( CTEMP.NE.ONE ) .OR. ( STEMP.NE.ZERO ) ) THEN
-                     DO 230 I = 1, M
-                        TEMP = A( I, J )
-                        A( I, J ) = STEMP*A( I, N ) + CTEMP*TEMP
-                        A( I, N ) = CTEMP*A( I, N ) - STEMP*TEMP
-  230                CONTINUE
+               END IF
+*
+               IF( USCAL.EQ.DCMPLX( TSCAL ) ) THEN
+*
+*                 Compute x(j) := ( x(j) - CSUMJ ) / A(j,j) if 1/A(j,j)
+*                 was not used to scale the dotproduct.
+*
+                  X( J ) = X( J ) - CSUMJ
+                  XJ = CABS1( X( J ) )
+                  IF( NOUNIT ) THEN
+                     TJJS = A( J, J )*TSCAL
+                  ELSE
+                     TJJS = TSCAL
+                     IF( TSCAL.EQ.ONE )
+     $                  GO TO 160
                   END IF
-  240          CONTINUE
-            END IF
-         END IF
-      END IF
 *
-      RETURN
+*                    Compute x(j) = x(j) / A(j,j), scaling if necessary.
 *
-*     End of ZLASR
+                  TJJ = CABS1( TJJS )
+                  IF( TJJ.GT.SMLNUM ) THEN
 *
-      END
-*> \brief \b ZLASSQ updates a sum of squares represented in scaled form.
+*                       abs(A(j,j)) > SMLNUM:
 *
-*  =========== DOCUMENTATION ===========
+                     IF( TJJ.LT.ONE ) THEN
+                        IF( XJ.GT.TJJ*BIGNUM ) THEN
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*                             Scale X by 1/abs(x(j)).
 *
-*> \htmlonly
-*> Download ZLASSQ + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlassq.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlassq.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlassq.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+                           REC = ONE / XJ
+                           CALL ZDSCAL( N, REC, X, 1 )
+                           SCALE = SCALE*REC
+                           XMAX = XMAX*REC
+                        END IF
+                     END IF
+                     X( J ) = ZLADIV( X( J ), TJJS )
+                  ELSE IF( TJJ.GT.ZERO ) THEN
 *
-*  Definition:
-*  ===========
+*                       0 < abs(A(j,j)) <= SMLNUM:
 *
-*       SUBROUTINE ZLASSQ( N, X, INCX, SCALE, SUMSQ )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INCX, N
-*       DOUBLE PRECISION   SCALE, SUMSQ
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         X( * )
-*       ..
-*  
+                     IF( XJ.GT.TJJ*BIGNUM ) THEN
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLASSQ returns the values scl and ssq such that
-*>
-*>    ( scl**2 )*ssq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
-*>
-*> where x( i ) = abs( X( 1 + ( i - 1 )*INCX ) ). The value of sumsq is
-*> assumed to be at least unity and the value of ssq will then satisfy
-*>
-*>    1.0 .le. ssq .le. ( sumsq + 2*n ).
-*>
-*> scale is assumed to be non-negative and scl returns the value
-*>
-*>    scl = max( scale, abs( real( x( i ) ) ), abs( aimag( x( i ) ) ) ),
-*>           i
-*>
-*> scale and sumsq must be supplied in SCALE and SUMSQ respectively.
-*> SCALE and SUMSQ are overwritten by scl and ssq respectively.
-*>
-*> The routine makes only one pass through the vector X.
-*> \endverbatim
+*                          Scale x by (1/abs(x(j)))*abs(A(j,j))*BIGNUM.
 *
-*  Arguments:
-*  ==========
+                        REC = ( TJJ*BIGNUM ) / XJ
+                        CALL ZDSCAL( N, REC, X, 1 )
+                        SCALE = SCALE*REC
+                        XMAX = XMAX*REC
+                     END IF
+                     X( J ) = ZLADIV( X( J ), TJJS )
+                  ELSE
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of elements to be used from the vector X.
-*> \endverbatim
-*>
-*> \param[in] X
-*> \verbatim
-*>          X is COMPLEX*16 array, dimension (N)
-*>          The vector x as described above.
-*>             x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
-*> \endverbatim
-*>
-*> \param[in] INCX
-*> \verbatim
-*>          INCX is INTEGER
-*>          The increment between successive values of the vector X.
-*>          INCX > 0.
-*> \endverbatim
-*>
-*> \param[in,out] SCALE
-*> \verbatim
-*>          SCALE is DOUBLE PRECISION
-*>          On entry, the value  scale  in the equation above.
-*>          On exit, SCALE is overwritten with the value  scl .
-*> \endverbatim
-*>
-*> \param[in,out] SUMSQ
-*> \verbatim
-*>          SUMSQ is DOUBLE PRECISION
-*>          On entry, the value  sumsq  in the equation above.
-*>          On exit, SUMSQ is overwritten with the value  ssq .
-*> \endverbatim
+*                       A(j,j) = 0:  Set x(1:n) = 0, x(j) = 1, and
+*                       scale = 0 and compute a solution to A**T *x = 0.
 *
-*  Authors:
-*  ========
+                     DO 150 I = 1, N
+                        X( I ) = ZERO
+  150                CONTINUE
+                     X( J ) = ONE
+                     SCALE = ZERO
+                     XMAX = ZERO
+                  END IF
+  160             CONTINUE
+               ELSE
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                 Compute x(j) := x(j) / A(j,j) - CSUMJ if the dot
+*                 product has already been divided by 1/A(j,j).
 *
-*> \date September 2012
+                  X( J ) = ZLADIV( X( J ), TJJS ) - CSUMJ
+               END IF
+               XMAX = MAX( XMAX, CABS1( X( J ) ) )
+  170       CONTINUE
 *
-*> \ingroup complex16OTHERauxiliary
+         ELSE
 *
-*  =====================================================================
-      SUBROUTINE ZLASSQ( N, X, INCX, SCALE, SUMSQ )
+*           Solve A**H * x = b
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+            DO 220 J = JFIRST, JLAST, JINC
 *
-*     .. Scalar Arguments ..
-      INTEGER            INCX, N
-      DOUBLE PRECISION   SCALE, SUMSQ
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         X( * )
-*     ..
+*              Compute x(j) = b(j) - sum A(k,j)*x(k).
+*                                    k<>j
 *
-* =====================================================================
+               XJ = CABS1( X( J ) )
+               USCAL = TSCAL
+               REC = ONE / MAX( XMAX, ONE )
+               IF( CNORM( J ).GT.( BIGNUM-XJ )*REC ) THEN
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ZERO
-      PARAMETER          ( ZERO = 0.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            IX
-      DOUBLE PRECISION   TEMP1
-*     ..
-*     .. External Functions ..
-      LOGICAL            DISNAN
-      EXTERNAL           DISNAN
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DIMAG
-*     ..
-*     .. Executable Statements ..
+*                 If x(j) could overflow, scale x by 1/(2*XMAX).
 *
-      IF( N.GT.0 ) THEN
-         DO 10 IX = 1, 1 + ( N-1 )*INCX, INCX
-            TEMP1 = ABS( DBLE( X( IX ) ) )
-            IF( TEMP1.GT.ZERO.OR.DISNAN( TEMP1 ) ) THEN
-               IF( SCALE.LT.TEMP1 ) THEN
-                  SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
-                  SCALE = TEMP1
-               ELSE
-                  SUMSQ = SUMSQ + ( TEMP1 / SCALE )**2
-               END IF
-            END IF
-            TEMP1 = ABS( DIMAG( X( IX ) ) )
-            IF( TEMP1.GT.ZERO.OR.DISNAN( TEMP1 ) ) THEN
-               IF( SCALE.LT.TEMP1 ) THEN
-                  SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
-                  SCALE = TEMP1
-               ELSE
-                  SUMSQ = SUMSQ + ( TEMP1 / SCALE )**2
-               END IF
-            END IF
-   10    CONTINUE
-      END IF
+                  REC = REC*HALF
+                  IF( NOUNIT ) THEN
+                     TJJS = DCONJG( A( J, J ) )*TSCAL
+                  ELSE
+                     TJJS = TSCAL
+                  END IF
+                  TJJ = CABS1( TJJS )
+                  IF( TJJ.GT.ONE ) THEN
 *
-      RETURN
+*                       Divide by A(j,j) when scaling x if A(j,j) > 1.
 *
-*     End of ZLASSQ
+                     REC = MIN( ONE, REC*TJJ )
+                     USCAL = ZLADIV( USCAL, TJJS )
+                  END IF
+                  IF( REC.LT.ONE ) THEN
+                     CALL ZDSCAL( N, REC, X, 1 )
+                     SCALE = SCALE*REC
+                     XMAX = XMAX*REC
+                  END IF
+               END IF
 *
-      END
-*> \brief \b ZLASWP performs a series of row interchanges on a general rectangular matrix.
+               CSUMJ = ZERO
+               IF( USCAL.EQ.DCMPLX( ONE ) ) THEN
 *
-*  =========== DOCUMENTATION ===========
+*                 If the scaling needed for A in the dot product is 1,
+*                 call ZDOTC to perform the dot product.
 *
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+                  IF( UPPER ) THEN
+                     CSUMJ = ZDOTC( J-1, A( 1, J ), 1, X, 1 )
+                  ELSE IF( J.LT.N ) THEN
+                     CSUMJ = ZDOTC( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
+                  END IF
+               ELSE
 *
-*> \htmlonly
-*> Download ZLASWP + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlaswp.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlaswp.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlaswp.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+*                 Otherwise, use in-line code for the dot product.
 *
-*  Definition:
-*  ===========
+                  IF( UPPER ) THEN
+                     DO 180 I = 1, J - 1
+                        CSUMJ = CSUMJ + ( DCONJG( A( I, J ) )*USCAL )*
+     $                          X( I )
+  180                CONTINUE
+                  ELSE IF( J.LT.N ) THEN
+                     DO 190 I = J + 1, N
+                        CSUMJ = CSUMJ + ( DCONJG( A( I, J ) )*USCAL )*
+     $                          X( I )
+  190                CONTINUE
+                  END IF
+               END IF
 *
-*       SUBROUTINE ZLASWP( N, A, LDA, K1, K2, IPIV, INCX )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INCX, K1, K2, LDA, N
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            IPIV( * )
-*       COMPLEX*16         A( LDA, * )
-*       ..
-*  
+               IF( USCAL.EQ.DCMPLX( TSCAL ) ) THEN
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLASWP performs a series of row interchanges on the matrix A.
-*> One row interchange is initiated for each of rows K1 through K2 of A.
-*> \endverbatim
+*                 Compute x(j) := ( x(j) - CSUMJ ) / A(j,j) if 1/A(j,j)
+*                 was not used to scale the dotproduct.
 *
-*  Arguments:
-*  ==========
+                  X( J ) = X( J ) - CSUMJ
+                  XJ = CABS1( X( J ) )
+                  IF( NOUNIT ) THEN
+                     TJJS = DCONJG( A( J, J ) )*TSCAL
+                  ELSE
+                     TJJS = TSCAL
+                     IF( TSCAL.EQ.ONE )
+     $                  GO TO 210
+                  END IF
 *
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the matrix of column dimension N to which the row
-*>          interchanges will be applied.
-*>          On exit, the permuted matrix.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*> \endverbatim
-*>
-*> \param[in] K1
-*> \verbatim
-*>          K1 is INTEGER
-*>          The first element of IPIV for which a row interchange will
-*>          be done.
-*> \endverbatim
-*>
-*> \param[in] K2
-*> \verbatim
-*>          K2 is INTEGER
-*>          The last element of IPIV for which a row interchange will
-*>          be done.
-*> \endverbatim
-*>
-*> \param[in] IPIV
-*> \verbatim
-*>          IPIV is INTEGER array, dimension (K2*abs(INCX))
-*>          The vector of pivot indices.  Only the elements in positions
-*>          K1 through K2 of IPIV are accessed.
-*>          IPIV(K) = L implies rows K and L are to be interchanged.
-*> \endverbatim
-*>
-*> \param[in] INCX
-*> \verbatim
-*>          INCX is INTEGER
-*>          The increment between successive values of IPIV.  If IPIV
-*>          is negative, the pivots are applied in reverse order.
-*> \endverbatim
+*                    Compute x(j) = x(j) / A(j,j), scaling if necessary.
 *
-*  Authors:
-*  ========
+                  TJJ = CABS1( TJJS )
+                  IF( TJJ.GT.SMLNUM ) THEN
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*                       abs(A(j,j)) > SMLNUM:
 *
-*> \date September 2012
+                     IF( TJJ.LT.ONE ) THEN
+                        IF( XJ.GT.TJJ*BIGNUM ) THEN
 *
-*> \ingroup complex16OTHERauxiliary
+*                             Scale X by 1/abs(x(j)).
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  Modified by
-*>   R. C. Whaley, Computer Science Dept., Univ. of Tenn., Knoxville, USA
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE ZLASWP( N, A, LDA, K1, K2, IPIV, INCX )
+                           REC = ONE / XJ
+                           CALL ZDSCAL( N, REC, X, 1 )
+                           SCALE = SCALE*REC
+                           XMAX = XMAX*REC
+                        END IF
+                     END IF
+                     X( J ) = ZLADIV( X( J ), TJJS )
+                  ELSE IF( TJJ.GT.ZERO ) THEN
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*                       0 < abs(A(j,j)) <= SMLNUM:
 *
-*     .. Scalar Arguments ..
-      INTEGER            INCX, K1, K2, LDA, N
-*     ..
-*     .. Array Arguments ..
-      INTEGER            IPIV( * )
-      COMPLEX*16         A( LDA, * )
-*     ..
+                     IF( XJ.GT.TJJ*BIGNUM ) THEN
 *
-* =====================================================================
+*                          Scale x by (1/abs(x(j)))*abs(A(j,j))*BIGNUM.
 *
-*     .. Local Scalars ..
-      INTEGER            I, I1, I2, INC, IP, IX, IX0, J, K, N32
-      COMPLEX*16         TEMP
-*     ..
-*     .. Executable Statements ..
+                        REC = ( TJJ*BIGNUM ) / XJ
+                        CALL ZDSCAL( N, REC, X, 1 )
+                        SCALE = SCALE*REC
+                        XMAX = XMAX*REC
+                     END IF
+                     X( J ) = ZLADIV( X( J ), TJJS )
+                  ELSE
 *
-*     Interchange row I with row IPIV(I) for each of rows K1 through K2.
+*                       A(j,j) = 0:  Set x(1:n) = 0, x(j) = 1, and
+*                       scale = 0 and compute a solution to A**H *x = 0.
+*
+                     DO 200 I = 1, N
+                        X( I ) = ZERO
+  200                CONTINUE
+                     X( J ) = ONE
+                     SCALE = ZERO
+                     XMAX = ZERO
+                  END IF
+  210             CONTINUE
+               ELSE
 *
-      IF( INCX.GT.0 ) THEN
-         IX0 = K1
-         I1 = K1
-         I2 = K2
-         INC = 1
-      ELSE IF( INCX.LT.0 ) THEN
-         IX0 = 1 + ( 1-K2 )*INCX
-         I1 = K2
-         I2 = K1
-         INC = -1
-      ELSE
-         RETURN
-      END IF
+*                 Compute x(j) := x(j) / A(j,j) - CSUMJ if the dot
+*                 product has already been divided by 1/A(j,j).
 *
-      N32 = ( N / 32 )*32
-      IF( N32.NE.0 ) THEN
-         DO 30 J = 1, N32, 32
-            IX = IX0
-            DO 20 I = I1, I2, INC
-               IP = IPIV( IX )
-               IF( IP.NE.I ) THEN
-                  DO 10 K = J, J + 31
-                     TEMP = A( I, K )
-                     A( I, K ) = A( IP, K )
-                     A( IP, K ) = TEMP
-   10             CONTINUE
+                  X( J ) = ZLADIV( X( J ), TJJS ) - CSUMJ
                END IF
-               IX = IX + INCX
-   20       CONTINUE
-   30    CONTINUE
+               XMAX = MAX( XMAX, CABS1( X( J ) ) )
+  220       CONTINUE
+         END IF
+         SCALE = SCALE / TSCAL
       END IF
-      IF( N32.NE.N ) THEN
-         N32 = N32 + 1
-         IX = IX0
-         DO 50 I = I1, I2, INC
-            IP = IPIV( IX )
-            IF( IP.NE.I ) THEN
-               DO 40 K = N32, N
-                  TEMP = A( I, K )
-                  A( I, K ) = A( IP, K )
-                  A( IP, K ) = TEMP
-   40          CONTINUE
-            END IF
-            IX = IX + INCX
-   50    CONTINUE
+*
+*     Scale the column norms by 1/TSCAL for return.
+*
+      IF( TSCAL.NE.ONE ) THEN
+         CALL DSCAL( N, ONE / TSCAL, CNORM, 1 )
       END IF
 *
       RETURN
 *
-*     End of ZLASWP
+*     End of ZLATRS
 *
       END
-*> \brief \b ZLATRD reduces the first nb rows and columns of a symmetric/Hermitian matrix A to real tridiagonal form by an unitary similarity transformation.
+*> \brief \b ZLAUU2 computes the product UUH or LHL, where U and L are upper or lower triangular matrices (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -22971,27 +38965,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLATRD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrd.f"> 
+*> Download ZLAUU2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlauu2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlatrd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlauu2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlauu2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
+*       SUBROUTINE ZLAUU2( UPLO, N, A, LDA, INFO )
 * 
 *       .. Scalar Arguments ..
 *       CHARACTER          UPLO
-*       INTEGER            LDA, LDW, N, NB
+*       INTEGER            INFO, LDA, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   E( * )
-*       COMPLEX*16         A( LDA, * ), TAU( * ), W( LDW, * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -23000,17 +38993,16 @@
 *>
 *> \verbatim
 *>
-*> ZLATRD reduces NB rows and columns of a complex Hermitian matrix A to
-*> Hermitian tridiagonal form by a unitary similarity
-*> transformation Q**H * A * Q, and returns the matrices V and W which are
-*> needed to apply the transformation to the unreduced part of A.
-*>
-*> If UPLO = 'U', ZLATRD reduces the last NB rows and columns of a
-*> matrix, of which the upper triangle is supplied;
-*> if UPLO = 'L', ZLATRD reduces the first NB rows and columns of a
-*> matrix, of which the lower triangle is supplied.
+*> ZLAUU2 computes the product U * U**H or L**H * L, where the triangular
+*> factor U or L is stored in the upper or lower triangular part of
+*> the array A.
+*>
+*> If UPLO = 'U' or 'u' then the upper triangle of the result is stored,
+*> overwriting the factor U in A.
+*> If UPLO = 'L' or 'l' then the lower triangle of the result is stored,
+*> overwriting the factor L in A.
 *>
-*> This is an auxiliary routine called by ZHETRD.
+*> This is the unblocked form of the algorithm, calling Level 2 BLAS.
 *> \endverbatim
 *
 *  Arguments:
@@ -23019,46 +39011,26 @@
 *> \param[in] UPLO
 *> \verbatim
 *>          UPLO is CHARACTER*1
-*>          Specifies whether the upper or lower triangular part of the
-*>          Hermitian matrix A is stored:
-*>          = 'U': Upper triangular
-*>          = 'L': Lower triangular
+*>          Specifies whether the triangular factor stored in the array A
+*>          is upper or lower triangular:
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix A.
-*> \endverbatim
-*>
-*> \param[in] NB
-*> \verbatim
-*>          NB is INTEGER
-*>          The number of rows and columns to be reduced.
+*>          The order of the triangular factor U or L.  N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
-*>          n-by-n upper triangular part of A contains the upper
-*>          triangular part of the matrix A, and the strictly lower
-*>          triangular part of A is not referenced.  If UPLO = 'L', the
-*>          leading n-by-n lower triangular part of A contains the lower
-*>          triangular part of the matrix A, and the strictly upper
-*>          triangular part of A is not referenced.
-*>          On exit:
-*>          if UPLO = 'U', the last NB columns have been reduced to
-*>            tridiagonal form, with the diagonal elements overwriting
-*>            the diagonal elements of A; the elements above the diagonal
-*>            with the array TAU, represent the unitary matrix Q as a
-*>            product of elementary reflectors;
-*>          if UPLO = 'L', the first NB columns have been reduced to
-*>            tridiagonal form, with the diagonal elements overwriting
-*>            the diagonal elements of A; the elements below the diagonal
-*>            with the array TAU, represent the  unitary matrix Q as a
-*>            product of elementary reflectors.
-*>          See Further Details.
+*>          On entry, the triangular factor U or L.
+*>          On exit, if UPLO = 'U', the upper triangle of A is
+*>          overwritten with the upper triangle of the product U * U**H;
+*>          if UPLO = 'L', the lower triangle of A is overwritten with
+*>          the lower triangle of the product L**H * L.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -23067,34 +39039,11 @@
 *>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] E
-*> \verbatim
-*>          E is DOUBLE PRECISION array, dimension (N-1)
-*>          If UPLO = 'U', E(n-nb:n-1) contains the superdiagonal
-*>          elements of the last NB columns of the reduced matrix;
-*>          if UPLO = 'L', E(1:nb) contains the subdiagonal elements of
-*>          the first NB columns of the reduced matrix.
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (N-1)
-*>          The scalar factors of the elementary reflectors, stored in
-*>          TAU(n-nb:n-1) if UPLO = 'U', and in TAU(1:nb) if UPLO = 'L'.
-*>          See Further Details.
-*> \endverbatim
-*>
-*> \param[out] W
-*> \verbatim
-*>          W is COMPLEX*16 array, dimension (LDW,NB)
-*>          The n-by-nb matrix W required to update the unreduced part
-*>          of A.
-*> \endverbatim
-*>
-*> \param[in] LDW
+*> \param[out] INFO
 *> \verbatim
-*>          LDW is INTEGER
-*>          The leading dimension of the array W. LDW >= max(1,N).
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -k, the k-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -23109,60 +39058,8 @@
 *
 *> \ingroup complex16OTHERauxiliary
 *
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  If UPLO = 'U', the matrix Q is represented as a product of elementary
-*>  reflectors
-*>
-*>     Q = H(n) H(n-1) . . . H(n-nb+1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(i:n) = 0 and v(i-1) = 1; v(1:i-1) is stored on exit in A(1:i-1,i),
-*>  and tau in TAU(i-1).
-*>
-*>  If UPLO = 'L', the matrix Q is represented as a product of elementary
-*>  reflectors
-*>
-*>     Q = H(1) H(2) . . . H(nb).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**H
-*>
-*>  where tau is a complex scalar, and v is a complex vector with
-*>  v(1:i) = 0 and v(i+1) = 1; v(i+1:n) is stored on exit in A(i+1:n,i),
-*>  and tau in TAU(i).
-*>
-*>  The elements of the vectors v together form the n-by-nb matrix V
-*>  which is needed, with W, to apply the transformation to the unreduced
-*>  part of the matrix, using a Hermitian rank-2k update of the form:
-*>  A := A - V*W**H - W*V**H.
-*>
-*>  The contents of A on exit are illustrated by the following examples
-*>  with n = 5 and nb = 2:
-*>
-*>  if UPLO = 'U':                       if UPLO = 'L':
-*>
-*>    (  a   a   a   v4  v5 )              (  d                  )
-*>    (      a   a   v4  v5 )              (  1   d              )
-*>    (          a   1   v5 )              (  v1  1   a          )
-*>    (              d   1  )              (  v1  v2  a   a      )
-*>    (                  d  )              (  v1  v2  a   a   a  )
-*>
-*>  where d denotes a diagonal element of the reduced matrix, a denotes
-*>  an element of the original matrix that is unchanged, and vi denotes
-*>  an element of the vector defining H(i).
-*> \endverbatim
-*>
 *  =====================================================================
-      SUBROUTINE ZLATRD( UPLO, N, NB, A, LDA, E, TAU, W, LDW )
+      SUBROUTINE ZLAUU2( UPLO, N, A, LDA, INFO )
 *
 *  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -23171,157 +39068,102 @@
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
-      INTEGER            LDA, LDW, N, NB
+      INTEGER            INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   E( * )
-      COMPLEX*16         A( LDA, * ), TAU( * ), W( LDW, * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE, HALF
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   HALF = ( 0.5D+0, 0.0D+0 ) )
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, IW
-      COMPLEX*16         ALPHA
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           ZAXPY, ZGEMV, ZHEMV, ZLACGV, ZLARFG, ZSCAL
+      LOGICAL            UPPER
+      INTEGER            I
+      DOUBLE PRECISION   AII
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       COMPLEX*16         ZDOTC
       EXTERNAL           LSAME, ZDOTC
 *     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZLACGV
+*     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, MIN
+      INTRINSIC          DBLE, DCMPLX, MAX
 *     ..
 *     .. Executable Statements ..
 *
+*     Test the input parameters.
+*
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZLAUU2', -INFO )
+         RETURN
+      END IF
+*
 *     Quick return if possible
 *
-      IF( N.LE.0 )
+      IF( N.EQ.0 )
      $   RETURN
 *
-      IF( LSAME( UPLO, 'U' ) ) THEN
+      IF( UPPER ) THEN
 *
-*        Reduce last NB columns of upper triangle
+*        Compute the product U * U**H.
 *
-         DO 10 I = N, N - NB + 1, -1
-            IW = I - N + NB
+         DO 10 I = 1, N
+            AII = A( I, I )
             IF( I.LT.N ) THEN
-*
-*              Update A(1:i,i)
-*
-               A( I, I ) = DBLE( A( I, I ) )
-               CALL ZLACGV( N-I, W( I, IW+1 ), LDW )
-               CALL ZGEMV( 'No transpose', I, N-I, -ONE, A( 1, I+1 ),
-     $                     LDA, W( I, IW+1 ), LDW, ONE, A( 1, I ), 1 )
-               CALL ZLACGV( N-I, W( I, IW+1 ), LDW )
+               A( I, I ) = AII*AII + DBLE( ZDOTC( N-I, A( I, I+1 ), LDA,
+     $                     A( I, I+1 ), LDA ) )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-               CALL ZGEMV( 'No transpose', I, N-I, -ONE, W( 1, IW+1 ),
-     $                     LDW, A( I, I+1 ), LDA, ONE, A( 1, I ), 1 )
+               CALL ZGEMV( 'No transpose', I-1, N-I, ONE, A( 1, I+1 ),
+     $                     LDA, A( I, I+1 ), LDA, DCMPLX( AII ),
+     $                     A( 1, I ), 1 )
                CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-               A( I, I ) = DBLE( A( I, I ) )
-            END IF
-            IF( I.GT.1 ) THEN
-*
-*              Generate elementary reflector H(i) to annihilate
-*              A(1:i-2,i)
-*
-               ALPHA = A( I-1, I )
-               CALL ZLARFG( I-1, ALPHA, A( 1, I ), 1, TAU( I-1 ) )
-               E( I-1 ) = ALPHA
-               A( I-1, I ) = ONE
-*
-*              Compute W(1:i-1,i)
-*
-               CALL ZHEMV( 'Upper', I-1, ONE, A, LDA, A( 1, I ), 1,
-     $                     ZERO, W( 1, IW ), 1 )
-               IF( I.LT.N ) THEN
-                  CALL ZGEMV( 'Conjugate transpose', I-1, N-I, ONE,
-     $                        W( 1, IW+1 ), LDW, A( 1, I ), 1, ZERO,
-     $                        W( I+1, IW ), 1 )
-                  CALL ZGEMV( 'No transpose', I-1, N-I, -ONE,
-     $                        A( 1, I+1 ), LDA, W( I+1, IW ), 1, ONE,
-     $                        W( 1, IW ), 1 )
-                  CALL ZGEMV( 'Conjugate transpose', I-1, N-I, ONE,
-     $                        A( 1, I+1 ), LDA, A( 1, I ), 1, ZERO,
-     $                        W( I+1, IW ), 1 )
-                  CALL ZGEMV( 'No transpose', I-1, N-I, -ONE,
-     $                        W( 1, IW+1 ), LDW, W( I+1, IW ), 1, ONE,
-     $                        W( 1, IW ), 1 )
-               END IF
-               CALL ZSCAL( I-1, TAU( I-1 ), W( 1, IW ), 1 )
-               ALPHA = -HALF*TAU( I-1 )*ZDOTC( I-1, W( 1, IW ), 1,
-     $                 A( 1, I ), 1 )
-               CALL ZAXPY( I-1, ALPHA, A( 1, I ), 1, W( 1, IW ), 1 )
+            ELSE
+               CALL ZDSCAL( I, AII, A( 1, I ), 1 )
             END IF
-*
    10    CONTINUE
-      ELSE
-*
-*        Reduce first NB columns of lower triangle
 *
-         DO 20 I = 1, NB
+      ELSE
 *
-*           Update A(i:n,i)
+*        Compute the product L**H * L.
 *
-            A( I, I ) = DBLE( A( I, I ) )
-            CALL ZLACGV( I-1, W( I, 1 ), LDW )
-            CALL ZGEMV( 'No transpose', N-I+1, I-1, -ONE, A( I, 1 ),
-     $                  LDA, W( I, 1 ), LDW, ONE, A( I, I ), 1 )
-            CALL ZLACGV( I-1, W( I, 1 ), LDW )
-            CALL ZLACGV( I-1, A( I, 1 ), LDA )
-            CALL ZGEMV( 'No transpose', N-I+1, I-1, -ONE, W( I, 1 ),
-     $                  LDW, A( I, 1 ), LDA, ONE, A( I, I ), 1 )
-            CALL ZLACGV( I-1, A( I, 1 ), LDA )
-            A( I, I ) = DBLE( A( I, I ) )
+         DO 20 I = 1, N
+            AII = A( I, I )
             IF( I.LT.N ) THEN
-*
-*              Generate elementary reflector H(i) to annihilate
-*              A(i+2:n,i)
-*
-               ALPHA = A( I+1, I )
-               CALL ZLARFG( N-I, ALPHA, A( MIN( I+2, N ), I ), 1,
-     $                      TAU( I ) )
-               E( I ) = ALPHA
-               A( I+1, I ) = ONE
-*
-*              Compute W(i+1:n,i)
-*
-               CALL ZHEMV( 'Lower', N-I, ONE, A( I+1, I+1 ), LDA,
-     $                     A( I+1, I ), 1, ZERO, W( I+1, I ), 1 )
-               CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
-     $                     W( I+1, 1 ), LDW, A( I+1, I ), 1, ZERO,
-     $                     W( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, A( I+1, 1 ),
-     $                     LDA, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
+               A( I, I ) = AII*AII + DBLE( ZDOTC( N-I, A( I+1, I ), 1,
+     $                     A( I+1, I ), 1 ) )
+               CALL ZLACGV( I-1, A( I, 1 ), LDA )
                CALL ZGEMV( 'Conjugate transpose', N-I, I-1, ONE,
-     $                     A( I+1, 1 ), LDA, A( I+1, I ), 1, ZERO,
-     $                     W( 1, I ), 1 )
-               CALL ZGEMV( 'No transpose', N-I, I-1, -ONE, W( I+1, 1 ),
-     $                     LDW, W( 1, I ), 1, ONE, W( I+1, I ), 1 )
-               CALL ZSCAL( N-I, TAU( I ), W( I+1, I ), 1 )
-               ALPHA = -HALF*TAU( I )*ZDOTC( N-I, W( I+1, I ), 1,
-     $                 A( I+1, I ), 1 )
-               CALL ZAXPY( N-I, ALPHA, A( I+1, I ), 1, W( I+1, I ), 1 )
+     $                     A( I+1, 1 ), LDA, A( I+1, I ), 1,
+     $                     DCMPLX( AII ), A( I, 1 ), LDA )
+               CALL ZLACGV( I-1, A( I, 1 ), LDA )
+            ELSE
+               CALL ZDSCAL( I, AII, A( I, 1 ), LDA )
             END IF
-*
    20    CONTINUE
       END IF
 *
       RETURN
 *
-*     End of ZLATRD
+*     End of ZLAUU2
 *
       END
-*> \brief \b ZLATRS solves a triangular system of equations with the scale factor set to prevent overflow.
+*> \brief \b ZLAUUM computes the product UUH or LHL, where U and L are upper or lower triangular matrices (blocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -23329,29 +39171,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLATRS + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlatrs.f"> 
+*> Download ZLAUUM + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlauum.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlatrs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlauum.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlatrs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlauum.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
-*                          CNORM, INFO )
+*       SUBROUTINE ZLAUUM( UPLO, N, A, LDA, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          DIAG, NORMIN, TRANS, UPLO
+*       CHARACTER          UPLO
 *       INTEGER            INFO, LDA, N
-*       DOUBLE PRECISION   SCALE
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   CNORM( * )
-*       COMPLEX*16         A( LDA, * ), X( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -23360,18 +39199,16 @@
 *>
 *> \verbatim
 *>
-*> ZLATRS solves one of the triangular systems
-*>
-*>    A * x = s*b,  A**T * x = s*b,  or  A**H * x = s*b,
+*> ZLAUUM computes the product U * U**H or L**H * L, where the triangular
+*> factor U or L is stored in the upper or lower triangular part of
+*> the array A.
+*>
+*> If UPLO = 'U' or 'u' then the upper triangle of the result is stored,
+*> overwriting the factor U in A.
+*> If UPLO = 'L' or 'l' then the lower triangle of the result is stored,
+*> overwriting the factor L in A.
 *>
-*> with scaling to prevent overflow.  Here A is an upper or lower
-*> triangular matrix, A**T denotes the transpose of A, A**H denotes the
-*> conjugate transpose of A, x and b are n-element vectors, and s is a
-*> scaling factor, usually less than or equal to 1, chosen so that the
-*> components of x will be less than the overflow threshold.  If the
-*> unscaled problem will not cause overflow, the Level 2 BLAS routine
-*> ZTRSV is called. If the matrix A is singular (A(j,j) = 0 for some j),
-*> then s is set to 0 and a non-trivial solution to A*x = 0 is returned.
+*> This is the blocked form of the algorithm, calling Level 3 BLAS.
 *> \endverbatim
 *
 *  Arguments:
@@ -23380,98 +39217,39 @@
 *> \param[in] UPLO
 *> \verbatim
 *>          UPLO is CHARACTER*1
-*>          Specifies whether the matrix A is upper or lower triangular.
+*>          Specifies whether the triangular factor stored in the array A
+*>          is upper or lower triangular:
 *>          = 'U':  Upper triangular
 *>          = 'L':  Lower triangular
 *> \endverbatim
 *>
-*> \param[in] TRANS
-*> \verbatim
-*>          TRANS is CHARACTER*1
-*>          Specifies the operation applied to A.
-*>          = 'N':  Solve A * x = s*b     (No transpose)
-*>          = 'T':  Solve A**T * x = s*b  (Transpose)
-*>          = 'C':  Solve A**H * x = s*b  (Conjugate transpose)
-*> \endverbatim
-*>
-*> \param[in] DIAG
-*> \verbatim
-*>          DIAG is CHARACTER*1
-*>          Specifies whether or not the matrix A is unit triangular.
-*>          = 'N':  Non-unit triangular
-*>          = 'U':  Unit triangular
-*> \endverbatim
-*>
-*> \param[in] NORMIN
-*> \verbatim
-*>          NORMIN is CHARACTER*1
-*>          Specifies whether CNORM has been set or not.
-*>          = 'Y':  CNORM contains the column norms on entry
-*>          = 'N':  CNORM is not set on entry.  On exit, the norms will
-*>                  be computed and stored in CNORM.
-*> \endverbatim
-*>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
+*>          The order of the triangular factor U or L.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The triangular matrix A.  If UPLO = 'U', the leading n by n
-*>          upper triangular part of the array A contains the upper
-*>          triangular matrix, and the strictly lower triangular part of
-*>          A is not referenced.  If UPLO = 'L', the leading n by n lower
-*>          triangular part of the array A contains the lower triangular
-*>          matrix, and the strictly upper triangular part of A is not
-*>          referenced.  If DIAG = 'U', the diagonal elements of A are
-*>          also not referenced and are assumed to be 1.
+*>          On entry, the triangular factor U or L.
+*>          On exit, if UPLO = 'U', the upper triangle of A is
+*>          overwritten with the upper triangle of the product U * U**H;
+*>          if UPLO = 'L', the lower triangle of A is overwritten with
+*>          the lower triangle of the product L**H * L.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max (1,N).
-*> \endverbatim
-*>
-*> \param[in,out] X
-*> \verbatim
-*>          X is COMPLEX*16 array, dimension (N)
-*>          On entry, the right hand side b of the triangular system.
-*>          On exit, X is overwritten by the solution vector x.
-*> \endverbatim
-*>
-*> \param[out] SCALE
-*> \verbatim
-*>          SCALE is DOUBLE PRECISION
-*>          The scaling factor s for the triangular system
-*>             A * x = s*b,  A**T * x = s*b,  or  A**H * x = s*b.
-*>          If SCALE = 0, the matrix A is singular or badly scaled, and
-*>          the vector x is an exact or approximate solution to A*x = 0.
-*> \endverbatim
-*>
-*> \param[in,out] CNORM
-*> \verbatim
-*>          CNORM is DOUBLE PRECISION array, dimension (N)
-*>
-*>          If NORMIN = 'Y', CNORM is an input argument and CNORM(j)
-*>          contains the norm of the off-diagonal part of the j-th column
-*>          of A.  If TRANS = 'N', CNORM(j) must be greater than or equal
-*>          to the infinity-norm, and if TRANS = 'T' or 'C', CNORM(j)
-*>          must be greater than or equal to the 1-norm.
-*>
-*>          If NORMIN = 'N', CNORM is an output argument and CNORM(j)
-*>          returns the 1-norm of the offdiagonal part of the j-th column
-*>          of A.
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -k, the k-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: if INFO = -k, the k-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -23484,83 +39262,10 @@
 *
 *> \date September 2012
 *
-*> \ingroup complex16OTHERauxiliary
-*
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  A rough bound on x is computed; if that is less than overflow, ZTRSV
-*>  is called, otherwise, specific code is used which checks for possible
-*>  overflow or divide-by-zero at every operation.
-*>
-*>  A columnwise scheme is used for solving A*x = b.  The basic algorithm
-*>  if A is lower triangular is
-*>
-*>       x[1:n] := b[1:n]
-*>       for j = 1, ..., n
-*>            x(j) := x(j) / A(j,j)
-*>            x[j+1:n] := x[j+1:n] - x(j) * A[j+1:n,j]
-*>       end
-*>
-*>  Define bounds on the components of x after j iterations of the loop:
-*>     M(j) = bound on x[1:j]
-*>     G(j) = bound on x[j+1:n]
-*>  Initially, let M(0) = 0 and G(0) = max{x(i), i=1,...,n}.
-*>
-*>  Then for iteration j+1 we have
-*>     M(j+1) <= G(j) / | A(j+1,j+1) |
-*>     G(j+1) <= G(j) + M(j+1) * | A[j+2:n,j+1] |
-*>            <= G(j) ( 1 + CNORM(j+1) / | A(j+1,j+1) | )
-*>
-*>  where CNORM(j+1) is greater than or equal to the infinity-norm of
-*>  column j+1 of A, not counting the diagonal.  Hence
-*>
-*>     G(j) <= G(0) product ( 1 + CNORM(i) / | A(i,i) | )
-*>                  1<=i<=j
-*>  and
-*>
-*>     |x(j)| <= ( G(0) / |A(j,j)| ) product ( 1 + CNORM(i) / |A(i,i)| )
-*>                                   1<=i< j
-*>
-*>  Since |x(j)| <= M(j), we use the Level 2 BLAS routine ZTRSV if the
-*>  reciprocal of the largest M(j), j=1,..,n, is larger than
-*>  max(underflow, 1/overflow).
-*>
-*>  The bound on x(j) is also used to determine when a step in the
-*>  columnwise method can be performed without fear of overflow.  If
-*>  the computed bound is greater than a large constant, x is scaled to
-*>  prevent overflow, but if the bound overflows, x is set to 0, x(j) to
-*>  1, and scale to 0, and a non-trivial solution to A*x = 0 is found.
-*>
-*>  Similarly, a row-wise scheme is used to solve A**T *x = b  or
-*>  A**H *x = b.  The basic algorithm for A upper triangular is
-*>
-*>       for j = 1, ..., n
-*>            x(j) := ( b(j) - A[1:j-1,j]' * x[1:j-1] ) / A(j,j)
-*>       end
-*>
-*>  We simultaneously compute two bounds
-*>       G(j) = bound on ( b(i) - A[1:i-1,i]' * x[1:i-1] ), 1<=i<=j
-*>       M(j) = bound on x(i), 1<=i<=j
-*>
-*>  The initial values are G(0) = 0, M(0) = max{b(i), i=1,..,n}, and we
-*>  add the constraint G(j) >= G(j-1) and M(j) >= M(j-1) for j >= 1.
-*>  Then the bound on x(j) is
-*>
-*>       M(j) <= M(j-1) * ( 1 + CNORM(j) ) / | A(j,j) |
-*>
-*>            <= M(0) * product ( ( 1 + CNORM(i) ) / |A(i,i)| )
-*>                      1<=i<=j
-*>
-*>  and we can safely call ZTRSV if 1/M(n) and 1/G(n) are both greater
-*>  than max(underflow, 1/overflow).
-*> \endverbatim
-*>
+*> \ingroup complex16OTHERauxiliary
+*
 *  =====================================================================
-      SUBROUTINE ZLATRS( UPLO, TRANS, DIAG, NORMIN, N, A, LDA, X, SCALE,
-     $                   CNORM, INFO )
+      SUBROUTINE ZLAUUM( UPLO, N, A, LDA, INFO )
 *
 *  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -23568,77 +39273,51 @@
 *     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          DIAG, NORMIN, TRANS, UPLO
+      CHARACTER          UPLO
       INTEGER            INFO, LDA, N
-      DOUBLE PRECISION   SCALE
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   CNORM( * )
-      COMPLEX*16         A( LDA, * ), X( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, HALF, ONE, TWO
-      PARAMETER          ( ZERO = 0.0D+0, HALF = 0.5D+0, ONE = 1.0D+0,
-     $                   TWO = 2.0D+0 )
+      DOUBLE PRECISION   ONE
+      PARAMETER          ( ONE = 1.0D+0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOTRAN, NOUNIT, UPPER
-      INTEGER            I, IMAX, J, JFIRST, JINC, JLAST
-      DOUBLE PRECISION   BIGNUM, GROW, REC, SMLNUM, TJJ, TMAX, TSCAL,
-     $                   XBND, XJ, XMAX
-      COMPLEX*16         CSUMJ, TJJS, USCAL, ZDUM
+      LOGICAL            UPPER
+      INTEGER            I, IB, NB
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            IDAMAX, IZAMAX
-      DOUBLE PRECISION   DLAMCH, DZASUM
-      COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
-      EXTERNAL           LSAME, IDAMAX, IZAMAX, DLAMCH, DZASUM, ZDOTC,
-     $                   ZDOTU, ZLADIV
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSCAL, XERBLA, ZAXPY, ZDSCAL, ZTRSV
+      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZLAUU2, ZTRMM
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1, CABS2
-*     ..
-*     .. Statement Function definitions ..
-      CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
-      CABS2( ZDUM ) = ABS( DBLE( ZDUM ) / 2.D0 ) +
-     $                ABS( DIMAG( ZDUM ) / 2.D0 )
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-      INFO = 0
-      UPPER = LSAME( UPLO, 'U' )
-      NOTRAN = LSAME( TRANS, 'N' )
-      NOUNIT = LSAME( DIAG, 'N' )
-*
 *     Test the input parameters.
 *
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
       IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'T' ) .AND. .NOT.
-     $         LSAME( TRANS, 'C' ) ) THEN
-         INFO = -2
-      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
-         INFO = -3
-      ELSE IF( .NOT.LSAME( NORMIN, 'Y' ) .AND. .NOT.
-     $         LSAME( NORMIN, 'N' ) ) THEN
-         INFO = -4
       ELSE IF( N.LT.0 ) THEN
-         INFO = -5
+         INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -7
+         INFO = -4
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZLATRS', -INFO )
+         CALL XERBLA( 'ZLAUUM', -INFO )
          RETURN
       END IF
 *
@@ -23647,667 +39326,563 @@
       IF( N.EQ.0 )
      $   RETURN
 *
-*     Determine machine dependent parameters to control overflow.
-*
-      SMLNUM = DLAMCH( 'Safe minimum' )
-      BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
-      SMLNUM = SMLNUM / DLAMCH( 'Precision' )
-      BIGNUM = ONE / SMLNUM
-      SCALE = ONE
-*
-      IF( LSAME( NORMIN, 'N' ) ) THEN
-*
-*        Compute the 1-norm of each column, not including the diagonal.
-*
-         IF( UPPER ) THEN
-*
-*           A is upper triangular.
-*
-            DO 10 J = 1, N
-               CNORM( J ) = DZASUM( J-1, A( 1, J ), 1 )
-   10       CONTINUE
-         ELSE
+*     Determine the block size for this environment.
 *
-*           A is lower triangular.
+      NB = ILAENV( 1, 'ZLAUUM', UPLO, N, -1, -1, -1 )
 *
-            DO 20 J = 1, N - 1
-               CNORM( J ) = DZASUM( N-J, A( J+1, J ), 1 )
-   20       CONTINUE
-            CNORM( N ) = ZERO
-         END IF
-      END IF
+      IF( NB.LE.1 .OR. NB.GE.N ) THEN
 *
-*     Scale the column norms by TSCAL if the maximum element in CNORM is
-*     greater than BIGNUM/2.
+*        Use unblocked code
 *
-      IMAX = IDAMAX( N, CNORM, 1 )
-      TMAX = CNORM( IMAX )
-      IF( TMAX.LE.BIGNUM*HALF ) THEN
-         TSCAL = ONE
+         CALL ZLAUU2( UPLO, N, A, LDA, INFO )
       ELSE
-         TSCAL = HALF / ( SMLNUM*TMAX )
-         CALL DSCAL( N, TSCAL, CNORM, 1 )
-      END IF
-*
-*     Compute a bound on the computed solution vector to see if the
-*     Level 2 BLAS routine ZTRSV can be used.
-*
-      XMAX = ZERO
-      DO 30 J = 1, N
-         XMAX = MAX( XMAX, CABS2( X( J ) ) )
-   30 CONTINUE
-      XBND = XMAX
-*
-      IF( NOTRAN ) THEN
 *
-*        Compute the growth in A * x = b.
+*        Use blocked code
 *
          IF( UPPER ) THEN
-            JFIRST = N
-            JLAST = 1
-            JINC = -1
-         ELSE
-            JFIRST = 1
-            JLAST = N
-            JINC = 1
-         END IF
-*
-         IF( TSCAL.NE.ONE ) THEN
-            GROW = ZERO
-            GO TO 60
-         END IF
-*
-         IF( NOUNIT ) THEN
-*
-*           A is non-unit triangular.
-*
-*           Compute GROW = 1/G(j) and XBND = 1/M(j).
-*           Initially, G(0) = max{x(i), i=1,...,n}.
-*
-            GROW = HALF / MAX( XBND, SMLNUM )
-            XBND = GROW
-            DO 40 J = JFIRST, JLAST, JINC
-*
-*              Exit the loop if the growth factor is too small.
-*
-               IF( GROW.LE.SMLNUM )
-     $            GO TO 60
-*
-               TJJS = A( J, J )
-               TJJ = CABS1( TJJS )
-*
-               IF( TJJ.GE.SMLNUM ) THEN
-*
-*                 M(j) = G(j-1) / abs(A(j,j))
-*
-                  XBND = MIN( XBND, MIN( ONE, TJJ )*GROW )
-               ELSE
-*
-*                 M(j) could overflow, set XBND to 0.
-*
-                  XBND = ZERO
-               END IF
-*
-               IF( TJJ+CNORM( J ).GE.SMLNUM ) THEN
 *
-*                 G(j) = G(j-1)*( 1 + CNORM(j) / abs(A(j,j)) )
-*
-                  GROW = GROW*( TJJ / ( TJJ+CNORM( J ) ) )
-               ELSE
+*           Compute the product U * U**H.
 *
-*                 G(j) could overflow, set GROW to 0.
-*
-                  GROW = ZERO
+            DO 10 I = 1, N, NB
+               IB = MIN( NB, N-I+1 )
+               CALL ZTRMM( 'Right', 'Upper', 'Conjugate transpose',
+     $                     'Non-unit', I-1, IB, CONE, A( I, I ), LDA,
+     $                     A( 1, I ), LDA )
+               CALL ZLAUU2( 'Upper', IB, A( I, I ), LDA, INFO )
+               IF( I+IB.LE.N ) THEN
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        I-1, IB, N-I-IB+1, CONE, A( 1, I+IB ),
+     $                        LDA, A( I, I+IB ), LDA, CONE, A( 1, I ),
+     $                        LDA )
+                  CALL ZHERK( 'Upper', 'No transpose', IB, N-I-IB+1,
+     $                        ONE, A( I, I+IB ), LDA, ONE, A( I, I ),
+     $                        LDA )
                END IF
-   40       CONTINUE
-            GROW = XBND
-         ELSE
-*
-*           A is unit triangular.
-*
-*           Compute GROW = 1/G(j), where G(0) = max{x(i), i=1,...,n}.
-*
-            GROW = MIN( ONE, HALF / MAX( XBND, SMLNUM ) )
-            DO 50 J = JFIRST, JLAST, JINC
-*
-*              Exit the loop if the growth factor is too small.
-*
-               IF( GROW.LE.SMLNUM )
-     $            GO TO 60
-*
-*              G(j) = G(j-1)*( 1 + CNORM(j) )
-*
-               GROW = GROW*( ONE / ( ONE+CNORM( J ) ) )
-   50       CONTINUE
-         END IF
-   60    CONTINUE
-*
-      ELSE
-*
-*        Compute the growth in A**T * x = b  or  A**H * x = b.
-*
-         IF( UPPER ) THEN
-            JFIRST = 1
-            JLAST = N
-            JINC = 1
+   10       CONTINUE
          ELSE
-            JFIRST = N
-            JLAST = 1
-            JINC = -1
-         END IF
-*
-         IF( TSCAL.NE.ONE ) THEN
-            GROW = ZERO
-            GO TO 90
-         END IF
-*
-         IF( NOUNIT ) THEN
-*
-*           A is non-unit triangular.
-*
-*           Compute GROW = 1/G(j) and XBND = 1/M(j).
-*           Initially, M(0) = max{x(i), i=1,...,n}.
-*
-            GROW = HALF / MAX( XBND, SMLNUM )
-            XBND = GROW
-            DO 70 J = JFIRST, JLAST, JINC
-*
-*              Exit the loop if the growth factor is too small.
-*
-               IF( GROW.LE.SMLNUM )
-     $            GO TO 90
-*
-*              G(j) = max( G(j-1), M(j-1)*( 1 + CNORM(j) ) )
-*
-               XJ = ONE + CNORM( J )
-               GROW = MIN( GROW, XBND / XJ )
-*
-               TJJS = A( J, J )
-               TJJ = CABS1( TJJS )
-*
-               IF( TJJ.GE.SMLNUM ) THEN
-*
-*                 M(j) = M(j-1)*( 1 + CNORM(j) ) / abs(A(j,j))
 *
-                  IF( XJ.GT.TJJ )
-     $               XBND = XBND*( TJJ / XJ )
-               ELSE
-*
-*                 M(j) could overflow, set XBND to 0.
+*           Compute the product L**H * L.
 *
-                  XBND = ZERO
+            DO 20 I = 1, N, NB
+               IB = MIN( NB, N-I+1 )
+               CALL ZTRMM( 'Left', 'Lower', 'Conjugate transpose',
+     $                     'Non-unit', IB, I-1, CONE, A( I, I ), LDA,
+     $                     A( I, 1 ), LDA )
+               CALL ZLAUU2( 'Lower', IB, A( I, I ), LDA, INFO )
+               IF( I+IB.LE.N ) THEN
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', IB,
+     $                        I-1, N-I-IB+1, CONE, A( I+IB, I ), LDA,
+     $                        A( I+IB, 1 ), LDA, CONE, A( I, 1 ), LDA )
+                  CALL ZHERK( 'Lower', 'Conjugate transpose', IB,
+     $                        N-I-IB+1, ONE, A( I+IB, I ), LDA, ONE,
+     $                        A( I, I ), LDA )
                END IF
-   70       CONTINUE
-            GROW = MIN( GROW, XBND )
-         ELSE
-*
-*           A is unit triangular.
-*
-*           Compute GROW = 1/G(j), where G(0) = max{x(i), i=1,...,n}.
-*
-            GROW = MIN( ONE, HALF / MAX( XBND, SMLNUM ) )
-            DO 80 J = JFIRST, JLAST, JINC
-*
-*              Exit the loop if the growth factor is too small.
-*
-               IF( GROW.LE.SMLNUM )
-     $            GO TO 90
-*
-*              G(j) = ( 1 + CNORM(j) )*G(j-1)
-*
-               XJ = ONE + CNORM( J )
-               GROW = GROW / XJ
-   80       CONTINUE
+   20       CONTINUE
          END IF
-   90    CONTINUE
       END IF
 *
-      IF( ( GROW*TSCAL ).GT.SMLNUM ) THEN
-*
-*        Use the Level 2 BLAS solve if the reciprocal of the bound on
-*        elements of X is not too small.
-*
-         CALL ZTRSV( UPLO, TRANS, DIAG, N, A, LDA, X, 1 )
-      ELSE
-*
-*        Use a Level 1 BLAS solve, scaling intermediate results.
-*
-         IF( XMAX.GT.BIGNUM*HALF ) THEN
-*
-*           Scale X so that its components are less than or equal to
-*           BIGNUM in absolute value.
-*
-            SCALE = ( BIGNUM*HALF ) / XMAX
-            CALL ZDSCAL( N, SCALE, X, 1 )
-            XMAX = BIGNUM
-         ELSE
-            XMAX = XMAX*TWO
-         END IF
-*
-         IF( NOTRAN ) THEN
-*
-*           Solve A * x = b
-*
-            DO 120 J = JFIRST, JLAST, JINC
-*
-*              Compute x(j) = b(j) / A(j,j), scaling x if necessary.
-*
-               XJ = CABS1( X( J ) )
-               IF( NOUNIT ) THEN
-                  TJJS = A( J, J )*TSCAL
-               ELSE
-                  TJJS = TSCAL
-                  IF( TSCAL.EQ.ONE )
-     $               GO TO 110
-               END IF
-               TJJ = CABS1( TJJS )
-               IF( TJJ.GT.SMLNUM ) THEN
-*
-*                    abs(A(j,j)) > SMLNUM:
-*
-                  IF( TJJ.LT.ONE ) THEN
-                     IF( XJ.GT.TJJ*BIGNUM ) THEN
-*
-*                          Scale x by 1/b(j).
-*
-                        REC = ONE / XJ
-                        CALL ZDSCAL( N, REC, X, 1 )
-                        SCALE = SCALE*REC
-                        XMAX = XMAX*REC
-                     END IF
-                  END IF
-                  X( J ) = ZLADIV( X( J ), TJJS )
-                  XJ = CABS1( X( J ) )
-               ELSE IF( TJJ.GT.ZERO ) THEN
-*
-*                    0 < abs(A(j,j)) <= SMLNUM:
+      RETURN
 *
-                  IF( XJ.GT.TJJ*BIGNUM ) THEN
+*     End of ZLAUUM
 *
-*                       Scale x by (1/abs(x(j)))*abs(A(j,j))*BIGNUM
-*                       to avoid overflow when dividing by A(j,j).
+      END
+*> \brief \b ZPOTF2 computes the Cholesky factorization of a symmetric/Hermitian positive definite matrix (unblocked algorithm).
 *
-                     REC = ( TJJ*BIGNUM ) / XJ
-                     IF( CNORM( J ).GT.ONE ) THEN
+*  =========== DOCUMENTATION ===========
 *
-*                          Scale by 1/CNORM(j) to avoid overflow when
-*                          multiplying x(j) times column j.
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-                        REC = REC / CNORM( J )
-                     END IF
-                     CALL ZDSCAL( N, REC, X, 1 )
-                     SCALE = SCALE*REC
-                     XMAX = XMAX*REC
-                  END IF
-                  X( J ) = ZLADIV( X( J ), TJJS )
-                  XJ = CABS1( X( J ) )
-               ELSE
+*> \htmlonly
+*> Download ZPOTF2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotf2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zpotf2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotf2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*                    A(j,j) = 0:  Set x(1:n) = 0, x(j) = 1, and
-*                    scale = 0, and compute a solution to A*x = 0.
+*  Definition:
+*  ===========
 *
-                  DO 100 I = 1, N
-                     X( I ) = ZERO
-  100             CONTINUE
-                  X( J ) = ONE
-                  XJ = ONE
-                  SCALE = ZERO
-                  XMAX = ZERO
-               END IF
-  110          CONTINUE
+*       SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
 *
-*              Scale x if necessary to avoid overflow when adding a
-*              multiple of column j of A.
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZPOTF2 computes the Cholesky factorization of a complex Hermitian
+*> positive definite matrix A.
+*>
+*> The factorization has the form
+*>    A = U**H * U ,  if UPLO = 'U', or
+*>    A = L  * L**H,  if UPLO = 'L',
+*> where U is an upper triangular matrix and L is lower triangular.
+*>
+*> This is the unblocked version of the algorithm, calling Level 2 BLAS.
+*> \endverbatim
 *
-               IF( XJ.GT.ONE ) THEN
-                  REC = ONE / XJ
-                  IF( CNORM( J ).GT.( BIGNUM-XMAX )*REC ) THEN
+*  Arguments:
+*  ==========
 *
-*                    Scale x by 1/(2*abs(x(j))).
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the upper or lower triangular part of the
+*>          Hermitian matrix A is stored.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
+*>          n by n upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading n by n lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>
+*>          On exit, if INFO = 0, the factor U or L from the Cholesky
+*>          factorization A = U**H *U  or A = L*L**H.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -k, the k-th argument had an illegal value
+*>          > 0: if INFO = k, the leading minor of order k is not
+*>               positive definite, and the factorization could not be
+*>               completed.
+*> \endverbatim
 *
-                     REC = REC*HALF
-                     CALL ZDSCAL( N, REC, X, 1 )
-                     SCALE = SCALE*REC
-                  END IF
-               ELSE IF( XJ*CNORM( J ).GT.( BIGNUM-XMAX ) ) THEN
+*  Authors:
+*  ========
 *
-*                 Scale x by 1/2.
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-                  CALL ZDSCAL( N, HALF, X, 1 )
-                  SCALE = SCALE*HALF
-               END IF
+*> \date September 2012
 *
-               IF( UPPER ) THEN
-                  IF( J.GT.1 ) THEN
+*> \ingroup complex16POcomputational
 *
-*                    Compute the update
-*                       x(1:j-1) := x(1:j-1) - x(j) * A(1:j-1,j)
+*  =====================================================================
+      SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
 *
-                     CALL ZAXPY( J-1, -X( J )*TSCAL, A( 1, J ), 1, X,
-     $                           1 )
-                     I = IZAMAX( J-1, X, 1 )
-                     XMAX = CABS1( X( I ) )
-                  END IF
-               ELSE
-                  IF( J.LT.N ) THEN
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-*                    Compute the update
-*                       x(j+1:n) := x(j+1:n) - x(j) * A(j+1:n,j)
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * )
+*     ..
 *
-                     CALL ZAXPY( N-J, -X( J )*TSCAL, A( J+1, J ), 1,
-     $                           X( J+1 ), 1 )
-                     I = J + IZAMAX( N-J, X( J+1 ), 1 )
-                     XMAX = CABS1( X( I ) )
-                  END IF
-               END IF
-  120       CONTINUE
+*  =====================================================================
 *
-         ELSE IF( LSAME( TRANS, 'T' ) ) THEN
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            UPPER
+      INTEGER            J
+      DOUBLE PRECISION   AJJ
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      COMPLEX*16         ZDOTC
+      EXTERNAL           LSAME, ZDOTC, DISNAN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZLACGV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DBLE, MAX, SQRT
+*     ..
+*     .. Executable Statements ..
 *
-*           Solve A**T * x = b
+*     Test the input parameters.
 *
-            DO 170 J = JFIRST, JLAST, JINC
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZPOTF2', -INFO )
+         RETURN
+      END IF
 *
-*              Compute x(j) = b(j) - sum A(k,j)*x(k).
-*                                    k<>j
+*     Quick return if possible
 *
-               XJ = CABS1( X( J ) )
-               USCAL = TSCAL
-               REC = ONE / MAX( XMAX, ONE )
-               IF( CNORM( J ).GT.( BIGNUM-XJ )*REC ) THEN
+      IF( N.EQ.0 )
+     $   RETURN
 *
-*                 If x(j) could overflow, scale x by 1/(2*XMAX).
+      IF( UPPER ) THEN
 *
-                  REC = REC*HALF
-                  IF( NOUNIT ) THEN
-                     TJJS = A( J, J )*TSCAL
-                  ELSE
-                     TJJS = TSCAL
-                  END IF
-                  TJJ = CABS1( TJJS )
-                  IF( TJJ.GT.ONE ) THEN
+*        Compute the Cholesky factorization A = U**H *U.
 *
-*                       Divide by A(j,j) when scaling x if A(j,j) > 1.
+         DO 10 J = 1, N
 *
-                     REC = MIN( ONE, REC*TJJ )
-                     USCAL = ZLADIV( USCAL, TJJS )
-                  END IF
-                  IF( REC.LT.ONE ) THEN
-                     CALL ZDSCAL( N, REC, X, 1 )
-                     SCALE = SCALE*REC
-                     XMAX = XMAX*REC
-                  END IF
-               END IF
+*           Compute U(J,J) and test for non-positive-definiteness.
 *
-               CSUMJ = ZERO
-               IF( USCAL.EQ.DCMPLX( ONE ) ) THEN
+            AJJ = DBLE( A( J, J ) ) - ZDOTC( J-1, A( 1, J ), 1,
+     $            A( 1, J ), 1 )
+            IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
+               A( J, J ) = AJJ
+               GO TO 30
+            END IF
+            AJJ = SQRT( AJJ )
+            A( J, J ) = AJJ
 *
-*                 If the scaling needed for A in the dot product is 1,
-*                 call ZDOTU to perform the dot product.
+*           Compute elements J+1:N of row J.
 *
-                  IF( UPPER ) THEN
-                     CSUMJ = ZDOTU( J-1, A( 1, J ), 1, X, 1 )
-                  ELSE IF( J.LT.N ) THEN
-                     CSUMJ = ZDOTU( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
-                  END IF
-               ELSE
+            IF( J.LT.N ) THEN
+               CALL ZLACGV( J-1, A( 1, J ), 1 )
+               CALL ZGEMV( 'Transpose', J-1, N-J, -CONE, A( 1, J+1 ),
+     $                     LDA, A( 1, J ), 1, CONE, A( J, J+1 ), LDA )
+               CALL ZLACGV( J-1, A( 1, J ), 1 )
+               CALL ZDSCAL( N-J, ONE / AJJ, A( J, J+1 ), LDA )
+            END IF
+   10    CONTINUE
+      ELSE
 *
-*                 Otherwise, use in-line code for the dot product.
+*        Compute the Cholesky factorization A = L*L**H.
 *
-                  IF( UPPER ) THEN
-                     DO 130 I = 1, J - 1
-                        CSUMJ = CSUMJ + ( A( I, J )*USCAL )*X( I )
-  130                CONTINUE
-                  ELSE IF( J.LT.N ) THEN
-                     DO 140 I = J + 1, N
-                        CSUMJ = CSUMJ + ( A( I, J )*USCAL )*X( I )
-  140                CONTINUE
-                  END IF
-               END IF
+         DO 20 J = 1, N
 *
-               IF( USCAL.EQ.DCMPLX( TSCAL ) ) THEN
+*           Compute L(J,J) and test for non-positive-definiteness.
 *
-*                 Compute x(j) := ( x(j) - CSUMJ ) / A(j,j) if 1/A(j,j)
-*                 was not used to scale the dotproduct.
+            AJJ = DBLE( A( J, J ) ) - ZDOTC( J-1, A( J, 1 ), LDA,
+     $            A( J, 1 ), LDA )
+            IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
+               A( J, J ) = AJJ
+               GO TO 30
+            END IF
+            AJJ = SQRT( AJJ )
+            A( J, J ) = AJJ
 *
-                  X( J ) = X( J ) - CSUMJ
-                  XJ = CABS1( X( J ) )
-                  IF( NOUNIT ) THEN
-                     TJJS = A( J, J )*TSCAL
-                  ELSE
-                     TJJS = TSCAL
-                     IF( TSCAL.EQ.ONE )
-     $                  GO TO 160
-                  END IF
+*           Compute elements J+1:N of column J.
 *
-*                    Compute x(j) = x(j) / A(j,j), scaling if necessary.
+            IF( J.LT.N ) THEN
+               CALL ZLACGV( J-1, A( J, 1 ), LDA )
+               CALL ZGEMV( 'No transpose', N-J, J-1, -CONE, A( J+1, 1 ),
+     $                     LDA, A( J, 1 ), LDA, CONE, A( J+1, J ), 1 )
+               CALL ZLACGV( J-1, A( J, 1 ), LDA )
+               CALL ZDSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
+            END IF
+   20    CONTINUE
+      END IF
+      GO TO 40
 *
-                  TJJ = CABS1( TJJS )
-                  IF( TJJ.GT.SMLNUM ) THEN
+   30 CONTINUE
+      INFO = J
 *
-*                       abs(A(j,j)) > SMLNUM:
+   40 CONTINUE
+      RETURN
 *
-                     IF( TJJ.LT.ONE ) THEN
-                        IF( XJ.GT.TJJ*BIGNUM ) THEN
+*     End of ZPOTF2
 *
-*                             Scale X by 1/abs(x(j)).
+      END
+*> \brief \b ZPOTRF
 *
-                           REC = ONE / XJ
-                           CALL ZDSCAL( N, REC, X, 1 )
-                           SCALE = SCALE*REC
-                           XMAX = XMAX*REC
-                        END IF
-                     END IF
-                     X( J ) = ZLADIV( X( J ), TJJS )
-                  ELSE IF( TJJ.GT.ZERO ) THEN
+*  =========== DOCUMENTATION ===========
 *
-*                       0 < abs(A(j,j)) <= SMLNUM:
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-                     IF( XJ.GT.TJJ*BIGNUM ) THEN
+*> \htmlonly
+*> Download ZPOTRF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotrf.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zpotrf.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotrf.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*                          Scale x by (1/abs(x(j)))*abs(A(j,j))*BIGNUM.
+*  Definition:
+*  ===========
 *
-                        REC = ( TJJ*BIGNUM ) / XJ
-                        CALL ZDSCAL( N, REC, X, 1 )
-                        SCALE = SCALE*REC
-                        XMAX = XMAX*REC
-                     END IF
-                     X( J ) = ZLADIV( X( J ), TJJS )
-                  ELSE
+*       SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
 *
-*                       A(j,j) = 0:  Set x(1:n) = 0, x(j) = 1, and
-*                       scale = 0 and compute a solution to A**T *x = 0.
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZPOTRF computes the Cholesky factorization of a complex Hermitian
+*> positive definite matrix A.
+*>
+*> The factorization has the form
+*>    A = U**H * U,  if UPLO = 'U', or
+*>    A = L  * L**H,  if UPLO = 'L',
+*> where U is an upper triangular matrix and L is lower triangular.
+*>
+*> This is the block version of the algorithm, calling Level 3 BLAS.
+*> \endverbatim
 *
-                     DO 150 I = 1, N
-                        X( I ) = ZERO
-  150                CONTINUE
-                     X( J ) = ONE
-                     SCALE = ZERO
-                     XMAX = ZERO
-                  END IF
-  160             CONTINUE
-               ELSE
+*  Arguments:
+*  ==========
 *
-*                 Compute x(j) := x(j) / A(j,j) - CSUMJ if the dot
-*                 product has already been divided by 1/A(j,j).
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
+*>          N-by-N upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading N-by-N lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>
+*>          On exit, if INFO = 0, the factor U or L from the Cholesky
+*>          factorization A = U**H *U or A = L*L**H.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, the leading minor of order i is not
+*>                positive definite, and the factorization could not be
+*>                completed.
+*> \endverbatim
 *
-                  X( J ) = ZLADIV( X( J ), TJJS ) - CSUMJ
-               END IF
-               XMAX = MAX( XMAX, CABS1( X( J ) ) )
-  170       CONTINUE
+*  Authors:
+*  ========
 *
-         ELSE
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*           Solve A**H * x = b
+*> \date November 2015
 *
-            DO 220 J = JFIRST, JLAST, JINC
+*> \ingroup complex16POcomputational
 *
-*              Compute x(j) = b(j) - sum A(k,j)*x(k).
-*                                    k<>j
+*  =====================================================================
+      SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
 *
-               XJ = CABS1( X( J ) )
-               USCAL = TSCAL
-               REC = ONE / MAX( XMAX, ONE )
-               IF( CNORM( J ).GT.( BIGNUM-XJ )*REC ) THEN
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
 *
-*                 If x(j) could overflow, scale x by 1/(2*XMAX).
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * )
+*     ..
 *
-                  REC = REC*HALF
-                  IF( NOUNIT ) THEN
-                     TJJS = DCONJG( A( J, J ) )*TSCAL
-                  ELSE
-                     TJJS = TSCAL
-                  END IF
-                  TJJ = CABS1( TJJS )
-                  IF( TJJ.GT.ONE ) THEN
+*  =====================================================================
 *
-*                       Divide by A(j,j) when scaling x if A(j,j) > 1.
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE
+      COMPLEX*16         CONE
+      PARAMETER          ( ONE = 1.0D+0, CONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            UPPER
+      INTEGER            J, JB, NB
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPOTRF2, ZTRSM
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
 *
-                     REC = MIN( ONE, REC*TJJ )
-                     USCAL = ZLADIV( USCAL, TJJS )
-                  END IF
-                  IF( REC.LT.ONE ) THEN
-                     CALL ZDSCAL( N, REC, X, 1 )
-                     SCALE = SCALE*REC
-                     XMAX = XMAX*REC
-                  END IF
-               END IF
+*     Test the input parameters.
 *
-               CSUMJ = ZERO
-               IF( USCAL.EQ.DCMPLX( ONE ) ) THEN
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZPOTRF', -INFO )
+         RETURN
+      END IF
 *
-*                 If the scaling needed for A in the dot product is 1,
-*                 call ZDOTC to perform the dot product.
+*     Quick return if possible
 *
-                  IF( UPPER ) THEN
-                     CSUMJ = ZDOTC( J-1, A( 1, J ), 1, X, 1 )
-                  ELSE IF( J.LT.N ) THEN
-                     CSUMJ = ZDOTC( N-J, A( J+1, J ), 1, X( J+1 ), 1 )
-                  END IF
-               ELSE
+      IF( N.EQ.0 )
+     $   RETURN
 *
-*                 Otherwise, use in-line code for the dot product.
+*     Determine the block size for this environment.
 *
-                  IF( UPPER ) THEN
-                     DO 180 I = 1, J - 1
-                        CSUMJ = CSUMJ + ( DCONJG( A( I, J ) )*USCAL )*
-     $                          X( I )
-  180                CONTINUE
-                  ELSE IF( J.LT.N ) THEN
-                     DO 190 I = J + 1, N
-                        CSUMJ = CSUMJ + ( DCONJG( A( I, J ) )*USCAL )*
-     $                          X( I )
-  190                CONTINUE
-                  END IF
-               END IF
+      NB = ILAENV( 1, 'ZPOTRF', UPLO, N, -1, -1, -1 )
+      IF( NB.LE.1 .OR. NB.GE.N ) THEN
 *
-               IF( USCAL.EQ.DCMPLX( TSCAL ) ) THEN
+*        Use unblocked code.
 *
-*                 Compute x(j) := ( x(j) - CSUMJ ) / A(j,j) if 1/A(j,j)
-*                 was not used to scale the dotproduct.
+         CALL ZPOTRF2( UPLO, N, A, LDA, INFO )
+      ELSE
 *
-                  X( J ) = X( J ) - CSUMJ
-                  XJ = CABS1( X( J ) )
-                  IF( NOUNIT ) THEN
-                     TJJS = DCONJG( A( J, J ) )*TSCAL
-                  ELSE
-                     TJJS = TSCAL
-                     IF( TSCAL.EQ.ONE )
-     $                  GO TO 210
-                  END IF
+*        Use blocked code.
 *
-*                    Compute x(j) = x(j) / A(j,j), scaling if necessary.
+         IF( UPPER ) THEN
 *
-                  TJJ = CABS1( TJJS )
-                  IF( TJJ.GT.SMLNUM ) THEN
+*           Compute the Cholesky factorization A = U**H *U.
 *
-*                       abs(A(j,j)) > SMLNUM:
+            DO 10 J = 1, N, NB
 *
-                     IF( TJJ.LT.ONE ) THEN
-                        IF( XJ.GT.TJJ*BIGNUM ) THEN
+*              Update and factorize the current diagonal block and test
+*              for non-positive-definiteness.
 *
-*                             Scale X by 1/abs(x(j)).
+               JB = MIN( NB, N-J+1 )
+               CALL ZHERK( 'Upper', 'Conjugate transpose', JB, J-1,
+     $                     -ONE, A( 1, J ), LDA, ONE, A( J, J ), LDA )
+               CALL ZPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               IF( INFO.NE.0 )
+     $            GO TO 30
+               IF( J+JB.LE.N ) THEN
 *
-                           REC = ONE / XJ
-                           CALL ZDSCAL( N, REC, X, 1 )
-                           SCALE = SCALE*REC
-                           XMAX = XMAX*REC
-                        END IF
-                     END IF
-                     X( J ) = ZLADIV( X( J ), TJJS )
-                  ELSE IF( TJJ.GT.ZERO ) THEN
+*                 Compute the current block row.
 *
-*                       0 < abs(A(j,j)) <= SMLNUM:
+                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', JB,
+     $                        N-J-JB+1, J-1, -CONE, A( 1, J ), LDA,
+     $                        A( 1, J+JB ), LDA, CONE, A( J, J+JB ),
+     $                        LDA )
+                  CALL ZTRSM( 'Left', 'Upper', 'Conjugate transpose',
+     $                        'Non-unit', JB, N-J-JB+1, CONE, A( J, J ),
+     $                        LDA, A( J, J+JB ), LDA )
+               END IF
+   10       CONTINUE
 *
-                     IF( XJ.GT.TJJ*BIGNUM ) THEN
+         ELSE
 *
-*                          Scale x by (1/abs(x(j)))*abs(A(j,j))*BIGNUM.
+*           Compute the Cholesky factorization A = L*L**H.
 *
-                        REC = ( TJJ*BIGNUM ) / XJ
-                        CALL ZDSCAL( N, REC, X, 1 )
-                        SCALE = SCALE*REC
-                        XMAX = XMAX*REC
-                     END IF
-                     X( J ) = ZLADIV( X( J ), TJJS )
-                  ELSE
+            DO 20 J = 1, N, NB
 *
-*                       A(j,j) = 0:  Set x(1:n) = 0, x(j) = 1, and
-*                       scale = 0 and compute a solution to A**H *x = 0.
+*              Update and factorize the current diagonal block and test
+*              for non-positive-definiteness.
 *
-                     DO 200 I = 1, N
-                        X( I ) = ZERO
-  200                CONTINUE
-                     X( J ) = ONE
-                     SCALE = ZERO
-                     XMAX = ZERO
-                  END IF
-  210             CONTINUE
-               ELSE
+               JB = MIN( NB, N-J+1 )
+               CALL ZHERK( 'Lower', 'No transpose', JB, J-1, -ONE,
+     $                     A( J, 1 ), LDA, ONE, A( J, J ), LDA )
+               CALL ZPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               IF( INFO.NE.0 )
+     $            GO TO 30
+               IF( J+JB.LE.N ) THEN
 *
-*                 Compute x(j) := x(j) / A(j,j) - CSUMJ if the dot
-*                 product has already been divided by 1/A(j,j).
+*                 Compute the current block column.
 *
-                  X( J ) = ZLADIV( X( J ), TJJS ) - CSUMJ
+                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
+     $                        N-J-JB+1, JB, J-1, -CONE, A( J+JB, 1 ),
+     $                        LDA, A( J, 1 ), LDA, CONE, A( J+JB, J ),
+     $                        LDA )
+                  CALL ZTRSM( 'Right', 'Lower', 'Conjugate transpose',
+     $                        'Non-unit', N-J-JB+1, JB, CONE, A( J, J ),
+     $                        LDA, A( J+JB, J ), LDA )
                END IF
-               XMAX = MAX( XMAX, CABS1( X( J ) ) )
-  220       CONTINUE
+   20       CONTINUE
          END IF
-         SCALE = SCALE / TSCAL
       END IF
+      GO TO 40
 *
-*     Scale the column norms by 1/TSCAL for return.
-*
-      IF( TSCAL.NE.ONE ) THEN
-         CALL DSCAL( N, ONE / TSCAL, CNORM, 1 )
-      END IF
+   30 CONTINUE
+      INFO = INFO + J - 1
 *
+   40 CONTINUE
       RETURN
 *
-*     End of ZLATRS
+*     End of ZPOTRF
 *
       END
-*> \brief \b ZPOTF2 computes the Cholesky factorization of a symmetric/Hermitian positive definite matrix (unblocked algorithm).
+*> \brief \b ZPOTRF2
 *
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
-*> \htmlonly
-*> Download ZPOTF2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotf2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zpotf2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotf2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
+*       RECURSIVE SUBROUTINE ZPOTRF2( UPLO, N, A, LDA, INFO )
 * 
 *       .. Scalar Arguments ..
 *       CHARACTER          UPLO
@@ -24323,27 +39898,34 @@
 *>
 *> \verbatim
 *>
-*> ZPOTF2 computes the Cholesky factorization of a complex Hermitian
-*> positive definite matrix A.
+*> ZPOTRF2 computes the Cholesky factorization of a real symmetric
+*> positive definite matrix A using the recursive algorithm.
 *>
 *> The factorization has the form
-*>    A = U**H * U ,  if UPLO = 'U', or
+*>    A = U**H * U,  if UPLO = 'U', or
 *>    A = L  * L**H,  if UPLO = 'L',
 *> where U is an upper triangular matrix and L is lower triangular.
 *>
-*> This is the unblocked version of the algorithm, calling Level 2 BLAS.
+*> This is the recursive version of the algorithm. It divides
+*> the matrix into four submatrices:
+*>
+*>        [  A11 | A12  ]  where A11 is n1 by n1 and A22 is n2 by n2
+*>    A = [ -----|----- ]  with n1 = n/2
+*>        [  A21 | A22  ]       n2 = n-n1
+*>
+*> The subroutine calls itself to factor A11. Update and scale A21
+*> or A12, update A22 then call itself to factor A22.
+*> 
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
 *> \param[in] UPLO
-*> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies whether the upper or lower triangular part of the
-*>          Hermitian matrix A is stored.
-*>          = 'U':  Upper triangular
-*>          = 'L':  Lower triangular
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
 *> \endverbatim
 *>
 *> \param[in] N
@@ -24355,16 +39937,16 @@
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
-*>          n by n upper triangular part of A contains the upper
+*>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+*>          N-by-N upper triangular part of A contains the upper
 *>          triangular part of the matrix A, and the strictly lower
 *>          triangular part of A is not referenced.  If UPLO = 'L', the
-*>          leading n by n lower triangular part of A contains the lower
+*>          leading N-by-N lower triangular part of A contains the lower
 *>          triangular part of the matrix A, and the strictly upper
 *>          triangular part of A is not referenced.
 *>
 *>          On exit, if INFO = 0, the factor U or L from the Cholesky
-*>          factorization A = U**H *U  or A = L*L**H.
+*>          factorization A = U**H*U or A = L*L**H.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -24376,11 +39958,11 @@
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -k, the k-th argument had an illegal value
-*>          > 0: if INFO = k, the leading minor of order k is not
-*>               positive definite, and the factorization could not be
-*>               completed.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, the leading minor of order i is not
+*>                positive definite, and the factorization could not be
+*>                completed.
 *> \endverbatim
 *
 *  Authors:
@@ -24391,17 +39973,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup complex16POcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZPOTF2( UPLO, N, A, LDA, INFO )
+      RECURSIVE SUBROUTINE ZPOTRF2( UPLO, N, A, LDA, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
@@ -24417,27 +39999,26 @@
       DOUBLE PRECISION   ONE, ZERO
       PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
       COMPLEX*16         CONE
-      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
+      PARAMETER          ( CONE = (1.0D+0, 0.0D+0) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            UPPER
-      INTEGER            J
+      LOGICAL            UPPER            
+      INTEGER            N1, N2, IINFO
       DOUBLE PRECISION   AJJ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME, DISNAN
-      COMPLEX*16         ZDOTC
-      EXTERNAL           LSAME, ZDOTC, DISNAN
+      EXTERNAL           LSAME, DISNAN
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZDSCAL, ZGEMV, ZLACGV
+      EXTERNAL           ZHERK, ZTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, MAX, SQRT
+      INTRINSIC          MAX, DBLE, SQRT
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input parameters.
+*     Test the input parameters
 *
       INFO = 0
       UPPER = LSAME( UPLO, 'U' )
@@ -24449,7 +40030,7 @@
          INFO = -4
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZPOTF2', -INFO )
+         CALL XERBLA( 'ZPOTRF2', -INFO )
          RETURN
       END IF
 *
@@ -24458,73 +40039,81 @@
       IF( N.EQ.0 )
      $   RETURN
 *
-      IF( UPPER ) THEN
+*     N=1 case
 *
-*        Compute the Cholesky factorization A = U**H *U.
+      IF( N.EQ.1 ) THEN
 *
-         DO 10 J = 1, N
+*        Test for non-positive-definiteness
 *
-*           Compute U(J,J) and test for non-positive-definiteness.
+         AJJ = DBLE( A( 1, 1 ) )
+         IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
+            INFO = 1
+            RETURN
+         END IF
 *
-            AJJ = DBLE( A( J, J ) ) - ZDOTC( J-1, A( 1, J ), 1,
-     $            A( 1, J ), 1 )
-            IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
-               A( J, J ) = AJJ
-               GO TO 30
-            END IF
-            AJJ = SQRT( AJJ )
-            A( J, J ) = AJJ
+*        Factor
 *
-*           Compute elements J+1:N of row J.
+         A( 1, 1 ) = SQRT( AJJ )
+*
+*     Use recursive code
 *
-            IF( J.LT.N ) THEN
-               CALL ZLACGV( J-1, A( 1, J ), 1 )
-               CALL ZGEMV( 'Transpose', J-1, N-J, -CONE, A( 1, J+1 ),
-     $                     LDA, A( 1, J ), 1, CONE, A( J, J+1 ), LDA )
-               CALL ZLACGV( J-1, A( 1, J ), 1 )
-               CALL ZDSCAL( N-J, ONE / AJJ, A( J, J+1 ), LDA )
-            END IF
-   10    CONTINUE
       ELSE
+         N1 = N/2
+         N2 = N-N1
 *
-*        Compute the Cholesky factorization A = L*L**H.
+*        Factor A11
 *
-         DO 20 J = 1, N
+         CALL ZPOTRF2( UPLO, N1, A( 1, 1 ), LDA, IINFO )
+         IF ( IINFO.NE.0 ) THEN
+            INFO = IINFO
+            RETURN
+         END IF    
 *
-*           Compute L(J,J) and test for non-positive-definiteness.
+*        Compute the Cholesky factorization A = U**H*U
 *
-            AJJ = DBLE( A( J, J ) ) - ZDOTC( J-1, A( J, 1 ), LDA,
-     $            A( J, 1 ), LDA )
-            IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
-               A( J, J ) = AJJ
-               GO TO 30
-            END IF
-            AJJ = SQRT( AJJ )
-            A( J, J ) = AJJ
+         IF( UPPER ) THEN
 *
-*           Compute elements J+1:N of column J.
+*           Update and scale A12
 *
-            IF( J.LT.N ) THEN
-               CALL ZLACGV( J-1, A( J, 1 ), LDA )
-               CALL ZGEMV( 'No transpose', N-J, J-1, -CONE, A( J+1, 1 ),
-     $                     LDA, A( J, 1 ), LDA, CONE, A( J+1, J ), 1 )
-               CALL ZLACGV( J-1, A( J, 1 ), LDA )
-               CALL ZDSCAL( N-J, ONE / AJJ, A( J+1, J ), 1 )
+            CALL ZTRSM( 'L', 'U', 'C', 'N', N1, N2, CONE,
+     $                  A( 1, 1 ), LDA, A( 1, N1+1 ), LDA )
+*
+*           Update and factor A22
+*          
+            CALL ZHERK( UPLO, 'C', N2, N1, -ONE, A( 1, N1+1 ), LDA,
+     $                  ONE, A( N1+1, N1+1 ), LDA )
+            CALL ZPOTRF2( UPLO, N2, A( N1+1, N1+1 ), LDA, IINFO )
+            IF ( IINFO.NE.0 ) THEN
+               INFO = IINFO + N1
+               RETURN
             END IF
-   20    CONTINUE
-      END IF
-      GO TO 40
 *
-   30 CONTINUE
-      INFO = J
+*        Compute the Cholesky factorization A = L*L**H
 *
-   40 CONTINUE
+         ELSE
+*
+*           Update and scale A21
+*
+            CALL ZTRSM( 'R', 'L', 'C', 'N', N2, N1, CONE,
+     $                  A( 1, 1 ), LDA, A( N1+1, 1 ), LDA )
+*
+*           Update and factor A22
+*
+            CALL ZHERK( UPLO, 'N', N2, N1, -ONE, A( N1+1, 1 ), LDA,
+     $                  ONE, A( N1+1, N1+1 ), LDA )
+            CALL ZPOTRF2( UPLO, N2, A( N1+1, N1+1 ), LDA, IINFO )
+            IF ( IINFO.NE.0 ) THEN
+               INFO = IINFO + N1
+               RETURN
+            END IF
+         END IF
+      END IF
       RETURN
 *
-*     End of ZPOTF2
+*     End of ZPOTRF2
 *
       END
-*> \brief \b ZPOTRF
+*> \brief \b ZPOTRI
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -24532,19 +40121,19 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZPOTRF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotrf.f"> 
+*> Download ZPOTRI + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zpotri.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zpotrf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zpotri.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotrf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zpotri.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
+*       SUBROUTINE ZPOTRI( UPLO, N, A, LDA, INFO )
 * 
 *       .. Scalar Arguments ..
 *       CHARACTER          UPLO
@@ -24560,15 +40149,9 @@
 *>
 *> \verbatim
 *>
-*> ZPOTRF computes the Cholesky factorization of a complex Hermitian
-*> positive definite matrix A.
-*>
-*> The factorization has the form
-*>    A = U**H * U,  if UPLO = 'U', or
-*>    A = L  * L**H,  if UPLO = 'L',
-*> where U is an upper triangular matrix and L is lower triangular.
-*>
-*> This is the block version of the algorithm, calling Level 3 BLAS.
+*> ZPOTRI computes the inverse of a complex Hermitian positive definite
+*> matrix A using the Cholesky factorization A = U**H*U or A = L*L**H
+*> computed by ZPOTRF.
 *> \endverbatim
 *
 *  Arguments:
@@ -24590,16 +40173,11 @@
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the Hermitian matrix A.  If UPLO = 'U', the leading
-*>          N-by-N upper triangular part of A contains the upper
-*>          triangular part of the matrix A, and the strictly lower
-*>          triangular part of A is not referenced.  If UPLO = 'L', the
-*>          leading N-by-N lower triangular part of A contains the lower
-*>          triangular part of the matrix A, and the strictly upper
-*>          triangular part of A is not referenced.
-*>
-*>          On exit, if INFO = 0, the factor U or L from the Cholesky
-*>          factorization A = U**H *U or A = L*L**H.
+*>          On entry, the triangular factor U or L from the Cholesky
+*>          factorization A = U**H*U or A = L*L**H, as computed by
+*>          ZPOTRF.
+*>          On exit, the upper or lower triangle of the (Hermitian)
+*>          inverse of A, overwriting the input factor U or L.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -24613,9 +40191,8 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*>          > 0:  if INFO = i, the leading minor of order i is not
-*>                positive definite, and the factorization could not be
-*>                completed.
+*>          > 0:  if INFO = i, the (i,i) element of the factor U or L is
+*>                zero, and the inverse could not be computed.
 *> \endverbatim
 *
 *  Authors:
@@ -24631,7 +40208,7 @@
 *> \ingroup complex16POcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZPOTRF( UPLO, N, A, LDA, INFO )
+      SUBROUTINE ZPOTRI( UPLO, N, A, LDA, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -24648,33 +40225,22 @@
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE
-      COMPLEX*16         CONE
-      PARAMETER          ( ONE = 1.0D+0, CONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            UPPER
-      INTEGER            J, JB, NB
-*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZGEMM, ZHERK, ZPOTF2, ZTRSM
+      EXTERNAL           XERBLA, ZLAUUM, ZTRTRI
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input parameters.
 *
       INFO = 0
-      UPPER = LSAME( UPLO, 'U' )
-      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
@@ -24682,7 +40248,7 @@
          INFO = -4
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZPOTRF', -INFO )
+         CALL XERBLA( 'ZPOTRI', -INFO )
          RETURN
       END IF
 *
@@ -24691,86 +40257,19 @@
       IF( N.EQ.0 )
      $   RETURN
 *
-*     Determine the block size for this environment.
-*
-      NB = ILAENV( 1, 'ZPOTRF', UPLO, N, -1, -1, -1 )
-      IF( NB.LE.1 .OR. NB.GE.N ) THEN
-*
-*        Use unblocked code.
-*
-         CALL ZPOTF2( UPLO, N, A, LDA, INFO )
-      ELSE
-*
-*        Use blocked code.
-*
-         IF( UPPER ) THEN
-*
-*           Compute the Cholesky factorization A = U**H *U.
-*
-            DO 10 J = 1, N, NB
-*
-*              Update and factorize the current diagonal block and test
-*              for non-positive-definiteness.
-*
-               JB = MIN( NB, N-J+1 )
-               CALL ZHERK( 'Upper', 'Conjugate transpose', JB, J-1,
-     $                     -ONE, A( 1, J ), LDA, ONE, A( J, J ), LDA )
-               CALL ZPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
-               IF( INFO.NE.0 )
-     $            GO TO 30
-               IF( J+JB.LE.N ) THEN
-*
-*                 Compute the current block row.
-*
-                  CALL ZGEMM( 'Conjugate transpose', 'No transpose', JB,
-     $                        N-J-JB+1, J-1, -CONE, A( 1, J ), LDA,
-     $                        A( 1, J+JB ), LDA, CONE, A( J, J+JB ),
-     $                        LDA )
-                  CALL ZTRSM( 'Left', 'Upper', 'Conjugate transpose',
-     $                        'Non-unit', JB, N-J-JB+1, CONE, A( J, J ),
-     $                        LDA, A( J, J+JB ), LDA )
-               END IF
-   10       CONTINUE
-*
-         ELSE
-*
-*           Compute the Cholesky factorization A = L*L**H.
-*
-            DO 20 J = 1, N, NB
-*
-*              Update and factorize the current diagonal block and test
-*              for non-positive-definiteness.
-*
-               JB = MIN( NB, N-J+1 )
-               CALL ZHERK( 'Lower', 'No transpose', JB, J-1, -ONE,
-     $                     A( J, 1 ), LDA, ONE, A( J, J ), LDA )
-               CALL ZPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
-               IF( INFO.NE.0 )
-     $            GO TO 30
-               IF( J+JB.LE.N ) THEN
+*     Invert the triangular Cholesky factor U or L.
 *
-*                 Compute the current block column.
+      CALL ZTRTRI( UPLO, 'Non-unit', N, A, LDA, INFO )
+      IF( INFO.GT.0 )
+     $   RETURN
 *
-                  CALL ZGEMM( 'No transpose', 'Conjugate transpose',
-     $                        N-J-JB+1, JB, J-1, -CONE, A( J+JB, 1 ),
-     $                        LDA, A( J, 1 ), LDA, CONE, A( J+JB, J ),
-     $                        LDA )
-                  CALL ZTRSM( 'Right', 'Lower', 'Conjugate transpose',
-     $                        'Non-unit', N-J-JB+1, JB, CONE, A( J, J ),
-     $                        LDA, A( J+JB, J ), LDA )
-               END IF
-   20       CONTINUE
-         END IF
-      END IF
-      GO TO 40
+*     Form inv(U) * inv(U)**H or inv(L)**H * inv(L).
 *
-   30 CONTINUE
-      INFO = INFO + J - 1
+      CALL ZLAUUM( UPLO, N, A, LDA, INFO )
 *
-   40 CONTINUE
       RETURN
 *
-*     End of ZPOTRF
+*     End of ZPOTRI
 *
       END
 *> \brief \b ZROT applies a plane rotation with real cosine and complex sine to a pair of complex vectors.
@@ -24892,48 +40391,535 @@
       COMPLEX*16         CX( * ), CY( * )
 *     ..
 *
-* =====================================================================
+* =====================================================================
+*
+*     .. Local Scalars ..
+      INTEGER            I, IX, IY
+      COMPLEX*16         STEMP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG
+*     ..
+*     .. Executable Statements ..
+*
+      IF( N.LE.0 )
+     $   RETURN
+      IF( INCX.EQ.1 .AND. INCY.EQ.1 )
+     $   GO TO 20
+*
+*     Code for unequal increments or equal increments not equal to 1
+*
+      IX = 1
+      IY = 1
+      IF( INCX.LT.0 )
+     $   IX = ( -N+1 )*INCX + 1
+      IF( INCY.LT.0 )
+     $   IY = ( -N+1 )*INCY + 1
+      DO 10 I = 1, N
+         STEMP = C*CX( IX ) + S*CY( IY )
+         CY( IY ) = C*CY( IY ) - DCONJG( S )*CX( IX )
+         CX( IX ) = STEMP
+         IX = IX + INCX
+         IY = IY + INCY
+   10 CONTINUE
+      RETURN
+*
+*     Code for both increments equal to 1
+*
+   20 CONTINUE
+      DO 30 I = 1, N
+         STEMP = C*CX( I ) + S*CY( I )
+         CY( I ) = C*CY( I ) - DCONJG( S )*CX( I )
+         CX( I ) = STEMP
+   30 CONTINUE
+      RETURN
+      END
+*> \brief \b ZSTEDC
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZSTEDC + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zstedc.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zstedc.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zstedc.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
+*                          LRWORK, IWORK, LIWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          COMPZ
+*       INTEGER            INFO, LDZ, LIWORK, LRWORK, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
+*       COMPLEX*16         WORK( * ), Z( LDZ, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZSTEDC computes all eigenvalues and, optionally, eigenvectors of a
+*> symmetric tridiagonal matrix using the divide and conquer method.
+*> The eigenvectors of a full or band complex Hermitian matrix can also
+*> be found if ZHETRD or ZHPTRD or ZHBTRD has been used to reduce this
+*> matrix to tridiagonal form.
+*>
+*> This code makes very mild assumptions about floating point
+*> arithmetic. It will work on machines with a guard digit in
+*> add/subtract, or on those binary machines without guard digits
+*> which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or Cray-2.
+*> It could conceivably fail on hexadecimal or decimal machines
+*> without guard digits, but we know of none.  See DLAED3 for details.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] COMPZ
+*> \verbatim
+*>          COMPZ is CHARACTER*1
+*>          = 'N':  Compute eigenvalues only.
+*>          = 'I':  Compute eigenvectors of tridiagonal matrix also.
+*>          = 'V':  Compute eigenvectors of original Hermitian matrix
+*>                  also.  On entry, Z contains the unitary matrix used
+*>                  to reduce the original matrix to tridiagonal form.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The dimension of the symmetric tridiagonal matrix.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] D
+*> \verbatim
+*>          D is DOUBLE PRECISION array, dimension (N)
+*>          On entry, the diagonal elements of the tridiagonal matrix.
+*>          On exit, if INFO = 0, the eigenvalues in ascending order.
+*> \endverbatim
+*>
+*> \param[in,out] E
+*> \verbatim
+*>          E is DOUBLE PRECISION array, dimension (N-1)
+*>          On entry, the subdiagonal elements of the tridiagonal matrix.
+*>          On exit, E has been destroyed.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          On entry, if COMPZ = 'V', then Z contains the unitary
+*>          matrix used in the reduction to tridiagonal form.
+*>          On exit, if INFO = 0, then if COMPZ = 'V', Z contains the
+*>          orthonormal eigenvectors of the original Hermitian matrix,
+*>          and if COMPZ = 'I', Z contains the orthonormal eigenvectors
+*>          of the symmetric tridiagonal matrix.
+*>          If  COMPZ = 'N', then Z is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z.  LDZ >= 1.
+*>          If eigenvectors are desired, then LDZ >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          If COMPZ = 'N' or 'I', or N <= 1, LWORK must be at least 1.
+*>          If COMPZ = 'V' and N > 1, LWORK must be at least N*N.
+*>          Note that for COMPZ = 'V', then if N is less than or
+*>          equal to the minimum divide size, usually 25, then LWORK need
+*>          only be 1.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal sizes of the WORK, RWORK and
+*>          IWORK arrays, returns these values as the first entries of
+*>          the WORK, RWORK and IWORK arrays, and no error message
+*>          related to LWORK or LRWORK or LIWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array,
+*>                                         dimension (LRWORK)
+*>          On exit, if INFO = 0, RWORK(1) returns the optimal LRWORK.
+*> \endverbatim
+*>
+*> \param[in] LRWORK
+*> \verbatim
+*>          LRWORK is INTEGER
+*>          The dimension of the array RWORK.
+*>          If COMPZ = 'N' or N <= 1, LRWORK must be at least 1.
+*>          If COMPZ = 'V' and N > 1, LRWORK must be at least
+*>                         1 + 3*N + 2*N*lg N + 4*N**2 ,
+*>                         where lg( N ) = smallest integer k such
+*>                         that 2**k >= N.
+*>          If COMPZ = 'I' and N > 1, LRWORK must be at least
+*>                         1 + 4*N + 2*N**2 .
+*>          Note that for COMPZ = 'I' or 'V', then if N is less than or
+*>          equal to the minimum divide size, usually 25, then LRWORK
+*>          need only be max(1,2*(N-1)).
+*>
+*>          If LRWORK = -1, then a workspace query is assumed; the
+*>          routine only calculates the optimal sizes of the WORK, RWORK
+*>          and IWORK arrays, returns these values as the first entries
+*>          of the WORK, RWORK and IWORK arrays, and no error message
+*>          related to LWORK or LRWORK or LIWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
+*> \endverbatim
+*>
+*> \param[in] LIWORK
+*> \verbatim
+*>          LIWORK is INTEGER
+*>          The dimension of the array IWORK.
+*>          If COMPZ = 'N' or N <= 1, LIWORK must be at least 1.
+*>          If COMPZ = 'V' or N > 1,  LIWORK must be at least
+*>                                    6 + 6*N + 5*N*lg N.
+*>          If COMPZ = 'I' or N > 1,  LIWORK must be at least
+*>                                    3 + 5*N .
+*>          Note that for COMPZ = 'I' or 'V', then if N is less than or
+*>          equal to the minimum divide size, usually 25, then LIWORK
+*>          need only be 1.
+*>
+*>          If LIWORK = -1, then a workspace query is assumed; the
+*>          routine only calculates the optimal sizes of the WORK, RWORK
+*>          and IWORK arrays, returns these values as the first entries
+*>          of the WORK, RWORK and IWORK arrays, and no error message
+*>          related to LWORK or LRWORK or LIWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  The algorithm failed to compute an eigenvalue while
+*>                working on the submatrix lying in rows and columns
+*>                INFO/(N+1) through mod(INFO,N+1).
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERcomputational
+*
+*> \par Contributors:
+*  ==================
+*>
+*> Jeff Rutter, Computer Science Division, University of California
+*> at Berkeley, USA
+*
+*  =====================================================================
+      SUBROUTINE ZSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, RWORK,
+     $                   LRWORK, IWORK, LIWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      CHARACTER          COMPZ
+      INTEGER            INFO, LDZ, LIWORK, LRWORK, LWORK, N
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
+      COMPLEX*16         WORK( * ), Z( LDZ, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE, TWO
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0, TWO = 2.0D0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY
+      INTEGER            FINISH, I, ICOMPZ, II, J, K, LGN, LIWMIN, LL,
+     $                   LRWMIN, LWMIN, M, SMLSIZ, START
+      DOUBLE PRECISION   EPS, ORGNRM, P, TINY
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, DLANST
+      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANST
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DLASCL, DLASET, DSTEDC, DSTEQR, DSTERF, XERBLA,
+     $                   ZLACPY, ZLACRM, ZLAED0, ZSTEQR, ZSWAP
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, DBLE, INT, LOG, MAX, MOD, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 .OR. LRWORK.EQ.-1 .OR. LIWORK.EQ.-1 )
+*
+      IF( LSAME( COMPZ, 'N' ) ) THEN
+         ICOMPZ = 0
+      ELSE IF( LSAME( COMPZ, 'V' ) ) THEN
+         ICOMPZ = 1
+      ELSE IF( LSAME( COMPZ, 'I' ) ) THEN
+         ICOMPZ = 2
+      ELSE
+         ICOMPZ = -1
+      END IF
+      IF( ICOMPZ.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( ( LDZ.LT.1 ) .OR.
+     $         ( ICOMPZ.GT.0 .AND. LDZ.LT.MAX( 1, N ) ) ) THEN
+         INFO = -6
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+*
+*        Compute the workspace requirements
+*
+         SMLSIZ = ILAENV( 9, 'ZSTEDC', ' ', 0, 0, 0, 0 )
+         IF( N.LE.1 .OR. ICOMPZ.EQ.0 ) THEN
+            LWMIN = 1
+            LIWMIN = 1
+            LRWMIN = 1
+         ELSE IF( N.LE.SMLSIZ ) THEN
+            LWMIN = 1
+            LIWMIN = 1
+            LRWMIN = 2*( N - 1 )
+         ELSE IF( ICOMPZ.EQ.1 ) THEN
+            LGN = INT( LOG( DBLE( N ) ) / LOG( TWO ) )
+            IF( 2**LGN.LT.N )
+     $         LGN = LGN + 1
+            IF( 2**LGN.LT.N )
+     $         LGN = LGN + 1
+            LWMIN = N*N
+            LRWMIN = 1 + 3*N + 2*N*LGN + 4*N**2
+            LIWMIN = 6 + 6*N + 5*N*LGN
+         ELSE IF( ICOMPZ.EQ.2 ) THEN
+            LWMIN = 1
+            LRWMIN = 1 + 4*N + 2*N**2
+            LIWMIN = 3 + 5*N
+         END IF
+         WORK( 1 ) = LWMIN
+         RWORK( 1 ) = LRWMIN
+         IWORK( 1 ) = LIWMIN
+*
+         IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -8
+         ELSE IF( LRWORK.LT.LRWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -10
+         ELSE IF( LIWORK.LT.LIWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -12
+         END IF
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZSTEDC', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+      IF( N.EQ.1 ) THEN
+         IF( ICOMPZ.NE.0 )
+     $      Z( 1, 1 ) = ONE
+         RETURN
+      END IF
+*
+*     If the following conditional clause is removed, then the routine
+*     will use the Divide and Conquer routine to compute only the
+*     eigenvalues, which requires (3N + 3N**2) real workspace and
+*     (2 + 5N + 2N lg(N)) integer workspace.
+*     Since on many architectures DSTERF is much faster than any other
+*     algorithm for finding eigenvalues only, it is used here
+*     as the default. If the conditional clause is removed, then
+*     information on the size of workspace needs to be changed.
+*
+*     If COMPZ = 'N', use DSTERF to compute the eigenvalues.
+*
+      IF( ICOMPZ.EQ.0 ) THEN
+         CALL DSTERF( N, D, E, INFO )
+         GO TO 70
+      END IF
+*
+*     If N is smaller than the minimum divide size (SMLSIZ+1), then
+*     solve the problem with another solver.
+*
+      IF( N.LE.SMLSIZ ) THEN
+*
+         CALL ZSTEQR( COMPZ, N, D, E, Z, LDZ, RWORK, INFO )
+*
+      ELSE
+*
+*        If COMPZ = 'I', we simply call DSTEDC instead.
+*
+         IF( ICOMPZ.EQ.2 ) THEN
+            CALL DLASET( 'Full', N, N, ZERO, ONE, RWORK, N )
+            LL = N*N + 1
+            CALL DSTEDC( 'I', N, D, E, RWORK, N,
+     $                   RWORK( LL ), LRWORK-LL+1, IWORK, LIWORK, INFO )
+            DO 20 J = 1, N
+               DO 10 I = 1, N
+                  Z( I, J ) = RWORK( ( J-1 )*N+I )
+   10          CONTINUE
+   20       CONTINUE
+            GO TO 70
+         END IF
+*
+*        From now on, only option left to be handled is COMPZ = 'V',
+*        i.e. ICOMPZ = 1.
+*
+*        Scale.
+*
+         ORGNRM = DLANST( 'M', N, D, E )
+         IF( ORGNRM.EQ.ZERO )
+     $      GO TO 70
+*
+         EPS = DLAMCH( 'Epsilon' )
+*
+         START = 1
+*
+*        while ( START <= N )
+*
+   30    CONTINUE
+         IF( START.LE.N ) THEN
+*
+*           Let FINISH be the position of the next subdiagonal entry
+*           such that E( FINISH ) <= TINY or FINISH = N if no such
+*           subdiagonal exists.  The matrix identified by the elements
+*           between START and FINISH constitutes an independent
+*           sub-problem.
+*
+            FINISH = START
+   40       CONTINUE
+            IF( FINISH.LT.N ) THEN
+               TINY = EPS*SQRT( ABS( D( FINISH ) ) )*
+     $                    SQRT( ABS( D( FINISH+1 ) ) )
+               IF( ABS( E( FINISH ) ).GT.TINY ) THEN
+                  FINISH = FINISH + 1
+                  GO TO 40
+               END IF
+            END IF
+*
+*           (Sub) Problem determined.  Compute its size and solve it.
+*
+            M = FINISH - START + 1
+            IF( M.GT.SMLSIZ ) THEN
+*
+*              Scale.
+*
+               ORGNRM = DLANST( 'M', M, D( START ), E( START ) )
+               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M, 1, D( START ), M,
+     $                      INFO )
+               CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, M-1, 1, E( START ),
+     $                      M-1, INFO )
+*
+               CALL ZLAED0( N, M, D( START ), E( START ), Z( 1, START ),
+     $                      LDZ, WORK, N, RWORK, IWORK, INFO )
+               IF( INFO.GT.0 ) THEN
+                  INFO = ( INFO / ( M+1 )+START-1 )*( N+1 ) +
+     $                   MOD( INFO, ( M+1 ) ) + START - 1
+                  GO TO 70
+               END IF
+*
+*              Scale back.
+*
+               CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, M, 1, D( START ), M,
+     $                      INFO )
+*
+            ELSE
+               CALL DSTEQR( 'I', M, D( START ), E( START ), RWORK, M,
+     $                      RWORK( M*M+1 ), INFO )
+               CALL ZLACRM( N, M, Z( 1, START ), LDZ, RWORK, M, WORK, N,
+     $                      RWORK( M*M+1 ) )
+               CALL ZLACPY( 'A', N, M, WORK, N, Z( 1, START ), LDZ )
+               IF( INFO.GT.0 ) THEN
+                  INFO = START*( N+1 ) + FINISH
+                  GO TO 70
+               END IF
+            END IF
+*
+            START = FINISH + 1
+            GO TO 30
+         END IF
+*
+*        endwhile
 *
-*     .. Local Scalars ..
-      INTEGER            I, IX, IY
-      COMPLEX*16         STEMP
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG
-*     ..
-*     .. Executable Statements ..
 *
-      IF( N.LE.0 )
-     $   RETURN
-      IF( INCX.EQ.1 .AND. INCY.EQ.1 )
-     $   GO TO 20
+*        Use Selection Sort to minimize swaps of eigenvectors
 *
-*     Code for unequal increments or equal increments not equal to 1
+         DO 60 II = 2, N
+           I = II - 1
+           K = I
+           P = D( I )
+           DO 50 J = II, N
+              IF( D( J ).LT.P ) THEN
+                 K = J
+                 P = D( J )
+              END IF
+   50      CONTINUE
+           IF( K.NE.I ) THEN
+              D( K ) = D( I )
+              D( I ) = P
+              CALL ZSWAP( N, Z( 1, I ), 1, Z( 1, K ), 1 )
+           END IF
+   60    CONTINUE
+      END IF
+*
+   70 CONTINUE
+      WORK( 1 ) = LWMIN
+      RWORK( 1 ) = LRWMIN
+      IWORK( 1 ) = LIWMIN
 *
-      IX = 1
-      IY = 1
-      IF( INCX.LT.0 )
-     $   IX = ( -N+1 )*INCX + 1
-      IF( INCY.LT.0 )
-     $   IY = ( -N+1 )*INCY + 1
-      DO 10 I = 1, N
-         STEMP = C*CX( IX ) + S*CY( IY )
-         CY( IY ) = C*CY( IY ) - DCONJG( S )*CX( IX )
-         CX( IX ) = STEMP
-         IX = IX + INCX
-         IY = IY + INCY
-   10 CONTINUE
       RETURN
 *
-*     Code for both increments equal to 1
+*     End of ZSTEDC
 *
-   20 CONTINUE
-      DO 30 I = 1, N
-         STEMP = C*CX( I ) + S*CY( I )
-         CY( I ) = C*CY( I ) - DCONJG( S )*CX( I )
-         CX( I ) = STEMP
-   30 CONTINUE
-      RETURN
       END
 *> \brief \b ZSTEQR
 *
@@ -25511,7 +41497,7 @@
 *     End of ZSTEQR
 *
       END
-*> \brief \b ZTRCON
+*> \brief \b ZSYMV computes a matrix-vector product for a complex symmetric matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -25519,29 +41505,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZTRCON + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrcon.f"> 
+*> Download ZSYMV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsymv.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrcon.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zsymv.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrcon.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsymv.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
-*                          RWORK, INFO )
+*       SUBROUTINE ZSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y, INCY )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          DIAG, NORM, UPLO
-*       INTEGER            INFO, LDA, N
-*       DOUBLE PRECISION   RCOND
+*       CHARACTER          UPLO
+*       INTEGER            INCX, INCY, LDA, N
+*       COMPLEX*16         ALPHA, BETA
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   RWORK( * )
-*       COMPLEX*16         A( LDA, * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), X( * ), Y( * )
 *       ..
 *  
 *
@@ -25550,88 +41534,111 @@
 *>
 *> \verbatim
 *>
-*> ZTRCON estimates the reciprocal of the condition number of a
-*> triangular matrix A, in either the 1-norm or the infinity-norm.
+*> ZSYMV  performs the matrix-vector  operation
 *>
-*> The norm of A is computed and an estimate is obtained for
-*> norm(inv(A)), then the reciprocal of the condition number is
-*> computed as
-*>    RCOND = 1 / ( norm(A) * norm(inv(A)) ).
+*>    y := alpha*A*x + beta*y,
+*>
+*> where alpha and beta are scalars, x and y are n element vectors and
+*> A is an n by n symmetric matrix.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] NORM
-*> \verbatim
-*>          NORM is CHARACTER*1
-*>          Specifies whether the 1-norm condition number or the
-*>          infinity-norm condition number is required:
-*>          = '1' or 'O':  1-norm;
-*>          = 'I':         Infinity-norm.
-*> \endverbatim
-*>
 *> \param[in] UPLO
 *> \verbatim
 *>          UPLO is CHARACTER*1
-*>          = 'U':  A is upper triangular;
-*>          = 'L':  A is lower triangular.
-*> \endverbatim
+*>           On entry, UPLO specifies whether the upper or lower
+*>           triangular part of the array A is to be referenced as
+*>           follows:
 *>
-*> \param[in] DIAG
-*> \verbatim
-*>          DIAG is CHARACTER*1
-*>          = 'N':  A is non-unit triangular;
-*>          = 'U':  A is unit triangular.
+*>              UPLO = 'U' or 'u'   Only the upper triangular part of A
+*>                                  is to be referenced.
+*>
+*>              UPLO = 'L' or 'l'   Only the lower triangular part of A
+*>                                  is to be referenced.
+*>
+*>           Unchanged on exit.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
+*>           On entry, N specifies the order of the matrix A.
+*>           N must be at least zero.
+*>           Unchanged on exit.
+*> \endverbatim
+*>
+*> \param[in] ALPHA
+*> \verbatim
+*>          ALPHA is COMPLEX*16
+*>           On entry, ALPHA specifies the scalar alpha.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
 *> \param[in] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The triangular matrix A.  If UPLO = 'U', the leading N-by-N
-*>          upper triangular part of the array A contains the upper
-*>          triangular matrix, and the strictly lower triangular part of
-*>          A is not referenced.  If UPLO = 'L', the leading N-by-N lower
-*>          triangular part of the array A contains the lower triangular
-*>          matrix, and the strictly upper triangular part of A is not
-*>          referenced.  If DIAG = 'U', the diagonal elements of A are
-*>          also not referenced and are assumed to be 1.
+*>          A is COMPLEX*16 array, dimension ( LDA, N )
+*>           Before entry, with  UPLO = 'U' or 'u', the leading n by n
+*>           upper triangular part of the array A must contain the upper
+*>           triangular part of the symmetric matrix and the strictly
+*>           lower triangular part of A is not referenced.
+*>           Before entry, with UPLO = 'L' or 'l', the leading n by n
+*>           lower triangular part of the array A must contain the lower
+*>           triangular part of the symmetric matrix and the strictly
+*>           upper triangular part of A is not referenced.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
+*>           On entry, LDA specifies the first dimension of A as declared
+*>           in the calling (sub) program. LDA must be at least
+*>           max( 1, N ).
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[out] RCOND
+*> \param[in] X
 *> \verbatim
-*>          RCOND is DOUBLE PRECISION
-*>          The reciprocal of the condition number of the matrix A,
-*>          computed as RCOND = 1/(norm(A) * norm(inv(A))).
+*>          X is COMPLEX*16 array, dimension at least
+*>           ( 1 + ( N - 1 )*abs( INCX ) ).
+*>           Before entry, the incremented array X must contain the N-
+*>           element vector x.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] INCX
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (2*N)
+*>          INCX is INTEGER
+*>           On entry, INCX specifies the increment for the elements of
+*>           X. INCX must not be zero.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[out] RWORK
+*> \param[in] BETA
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (N)
+*>          BETA is COMPLEX*16
+*>           On entry, BETA specifies the scalar beta. When BETA is
+*>           supplied as zero then Y need not be set on input.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[out] INFO
+*> \param[in,out] Y
+*> \verbatim
+*>          Y is COMPLEX*16 array, dimension at least
+*>           ( 1 + ( N - 1 )*abs( INCY ) ).
+*>           Before entry, the incremented array Y must contain the n
+*>           element vector y. On exit, Y is overwritten by the updated
+*>           vector y.
+*> \endverbatim
+*>
+*> \param[in] INCY
 *> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          INCY is INTEGER
+*>           On entry, INCY specifies the increment for the elements of
+*>           Y. INCY must not be zero.
+*>           Unchanged on exit.
 *> \endverbatim
 *
 *  Authors:
@@ -25642,159 +41649,198 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date September 2012
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYauxiliary
 *
 *  =====================================================================
-      SUBROUTINE ZTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
-     $                   RWORK, INFO )
+      SUBROUTINE ZSYMV( UPLO, N, ALPHA, A, LDA, X, INCX, BETA, Y, INCY )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          DIAG, NORM, UPLO
-      INTEGER            INFO, LDA, N
-      DOUBLE PRECISION   RCOND
+      CHARACTER          UPLO
+      INTEGER            INCX, INCY, LDA, N
+      COMPLEX*16         ALPHA, BETA
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   RWORK( * )
-      COMPLEX*16         A( LDA, * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), X( * ), Y( * )
 *     ..
 *
-*  =====================================================================
+* =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOUNIT, ONENRM, UPPER
-      CHARACTER          NORMIN
-      INTEGER            IX, KASE, KASE1
-      DOUBLE PRECISION   AINVNM, ANORM, SCALE, SMLNUM, XNORM
-      COMPLEX*16         ZDUM
-*     ..
-*     .. Local Arrays ..
-      INTEGER            ISAVE( 3 )
+      INTEGER            I, INFO, IX, IY, J, JX, JY, KX, KY
+      COMPLEX*16         TEMP1, TEMP2
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            IZAMAX
-      DOUBLE PRECISION   DLAMCH, ZLANTR
-      EXTERNAL           LSAME, IZAMAX, DLAMCH, ZLANTR
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZDRSCL, ZLACN2, ZLATRS
+      EXTERNAL           XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DIMAG, MAX
-*     ..
-*     .. Statement Functions ..
-      DOUBLE PRECISION   CABS1
-*     ..
-*     .. Statement Function definitions ..
-      CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input parameters.
 *
       INFO = 0
-      UPPER = LSAME( UPLO, 'U' )
-      ONENRM = NORM.EQ.'1' .OR. LSAME( NORM, 'O' )
-      NOUNIT = LSAME( DIAG, 'N' )
-*
-      IF( .NOT.ONENRM .AND. .NOT.LSAME( NORM, 'I' ) ) THEN
-         INFO = -1
-      ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
-         INFO = -2
-      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
-         INFO = -3
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = 1
       ELSE IF( N.LT.0 ) THEN
-         INFO = -4
+         INFO = 2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -6
+         INFO = 5
+      ELSE IF( INCX.EQ.0 ) THEN
+         INFO = 7
+      ELSE IF( INCY.EQ.0 ) THEN
+         INFO = 10
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZTRCON', -INFO )
-         RETURN
-      END IF
-*
-*     Quick return if possible
-*
-      IF( N.EQ.0 ) THEN
-         RCOND = ONE
+         CALL XERBLA( 'ZSYMV ', INFO )
          RETURN
       END IF
 *
-      RCOND = ZERO
-      SMLNUM = DLAMCH( 'Safe minimum' )*DBLE( MAX( 1, N ) )
+*     Quick return if possible.
 *
-*     Compute the norm of the triangular matrix A.
+      IF( ( N.EQ.0 ) .OR. ( ( ALPHA.EQ.ZERO ) .AND. ( BETA.EQ.ONE ) ) )
+     $   RETURN
 *
-      ANORM = ZLANTR( NORM, UPLO, DIAG, N, N, A, LDA, RWORK )
+*     Set up the start points in  X  and  Y.
 *
-*     Continue only if ANORM > 0.
+      IF( INCX.GT.0 ) THEN
+         KX = 1
+      ELSE
+         KX = 1 - ( N-1 )*INCX
+      END IF
+      IF( INCY.GT.0 ) THEN
+         KY = 1
+      ELSE
+         KY = 1 - ( N-1 )*INCY
+      END IF
 *
-      IF( ANORM.GT.ZERO ) THEN
+*     Start the operations. In this version the elements of A are
+*     accessed sequentially with one pass through the triangular part
+*     of A.
 *
-*        Estimate the norm of the inverse of A.
+*     First form  y := beta*y.
 *
-         AINVNM = ZERO
-         NORMIN = 'N'
-         IF( ONENRM ) THEN
-            KASE1 = 1
+      IF( BETA.NE.ONE ) THEN
+         IF( INCY.EQ.1 ) THEN
+            IF( BETA.EQ.ZERO ) THEN
+               DO 10 I = 1, N
+                  Y( I ) = ZERO
+   10          CONTINUE
+            ELSE
+               DO 20 I = 1, N
+                  Y( I ) = BETA*Y( I )
+   20          CONTINUE
+            END IF
          ELSE
-            KASE1 = 2
-         END IF
-         KASE = 0
-   10    CONTINUE
-         CALL ZLACN2( N, WORK( N+1 ), WORK, AINVNM, KASE, ISAVE )
-         IF( KASE.NE.0 ) THEN
-            IF( KASE.EQ.KASE1 ) THEN
-*
-*              Multiply by inv(A).
-*
-               CALL ZLATRS( UPLO, 'No transpose', DIAG, NORMIN, N, A,
-     $                      LDA, WORK, SCALE, RWORK, INFO )
+            IY = KY
+            IF( BETA.EQ.ZERO ) THEN
+               DO 30 I = 1, N
+                  Y( IY ) = ZERO
+                  IY = IY + INCY
+   30          CONTINUE
             ELSE
-*
-*              Multiply by inv(A**H).
-*
-               CALL ZLATRS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
-     $                      N, A, LDA, WORK, SCALE, RWORK, INFO )
+               DO 40 I = 1, N
+                  Y( IY ) = BETA*Y( IY )
+                  IY = IY + INCY
+   40          CONTINUE
             END IF
-            NORMIN = 'Y'
+         END IF
+      END IF
+      IF( ALPHA.EQ.ZERO )
+     $   RETURN
+      IF( LSAME( UPLO, 'U' ) ) THEN
 *
-*           Multiply by 1/SCALE if doing so will not cause overflow.
+*        Form  y  when A is stored in upper triangle.
 *
-            IF( SCALE.NE.ONE ) THEN
-               IX = IZAMAX( N, WORK, 1 )
-               XNORM = CABS1( WORK( IX ) )
-               IF( SCALE.LT.XNORM*SMLNUM .OR. SCALE.EQ.ZERO )
-     $            GO TO 20
-               CALL ZDRSCL( N, SCALE, WORK, 1 )
-            END IF
-            GO TO 10
+         IF( ( INCX.EQ.1 ) .AND. ( INCY.EQ.1 ) ) THEN
+            DO 60 J = 1, N
+               TEMP1 = ALPHA*X( J )
+               TEMP2 = ZERO
+               DO 50 I = 1, J - 1
+                  Y( I ) = Y( I ) + TEMP1*A( I, J )
+                  TEMP2 = TEMP2 + A( I, J )*X( I )
+   50          CONTINUE
+               Y( J ) = Y( J ) + TEMP1*A( J, J ) + ALPHA*TEMP2
+   60       CONTINUE
+         ELSE
+            JX = KX
+            JY = KY
+            DO 80 J = 1, N
+               TEMP1 = ALPHA*X( JX )
+               TEMP2 = ZERO
+               IX = KX
+               IY = KY
+               DO 70 I = 1, J - 1
+                  Y( IY ) = Y( IY ) + TEMP1*A( I, J )
+                  TEMP2 = TEMP2 + A( I, J )*X( IX )
+                  IX = IX + INCX
+                  IY = IY + INCY
+   70          CONTINUE
+               Y( JY ) = Y( JY ) + TEMP1*A( J, J ) + ALPHA*TEMP2
+               JX = JX + INCX
+               JY = JY + INCY
+   80       CONTINUE
          END IF
+      ELSE
 *
-*        Compute the estimate of the reciprocal condition number.
+*        Form  y  when A is stored in lower triangle.
 *
-         IF( AINVNM.NE.ZERO )
-     $      RCOND = ( ONE / ANORM ) / AINVNM
+         IF( ( INCX.EQ.1 ) .AND. ( INCY.EQ.1 ) ) THEN
+            DO 100 J = 1, N
+               TEMP1 = ALPHA*X( J )
+               TEMP2 = ZERO
+               Y( J ) = Y( J ) + TEMP1*A( J, J )
+               DO 90 I = J + 1, N
+                  Y( I ) = Y( I ) + TEMP1*A( I, J )
+                  TEMP2 = TEMP2 + A( I, J )*X( I )
+   90          CONTINUE
+               Y( J ) = Y( J ) + ALPHA*TEMP2
+  100       CONTINUE
+         ELSE
+            JX = KX
+            JY = KY
+            DO 120 J = 1, N
+               TEMP1 = ALPHA*X( JX )
+               TEMP2 = ZERO
+               Y( JY ) = Y( JY ) + TEMP1*A( J, J )
+               IX = JX
+               IY = JY
+               DO 110 I = J + 1, N
+                  IX = IX + INCX
+                  IY = IY + INCY
+                  Y( IY ) = Y( IY ) + TEMP1*A( I, J )
+                  TEMP2 = TEMP2 + A( I, J )*X( IX )
+  110          CONTINUE
+               Y( JY ) = Y( JY ) + ALPHA*TEMP2
+               JX = JX + INCX
+               JY = JY + INCY
+  120       CONTINUE
+         END IF
       END IF
 *
-   20 CONTINUE
       RETURN
 *
-*     End of ZTRCON
+*     End of ZSYMV
 *
       END
-*> \brief \b ZTREVC
+*> \brief \b ZSYR performs the symmetric rank-1 update of a complex symmetric matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -25802,30 +41848,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZTREVC + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrevc.f"> 
+*> Download ZSYR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsyr.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrevc.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zsyr.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrevc.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsyr.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
-*                          LDVR, MM, M, WORK, RWORK, INFO )
+*       SUBROUTINE ZSYR( UPLO, N, ALPHA, X, INCX, A, LDA )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          HOWMNY, SIDE
-*       INTEGER            INFO, LDT, LDVL, LDVR, M, MM, N
+*       CHARACTER          UPLO
+*       INTEGER            INCX, LDA, N
+*       COMPLEX*16         ALPHA
 *       ..
 *       .. Array Arguments ..
-*       LOGICAL            SELECT( * )
-*       DOUBLE PRECISION   RWORK( * )
-*       COMPLEX*16         T( LDT, * ), VL( LDVL, * ), VR( LDVR, * ),
-*      $                   WORK( * )
+*       COMPLEX*16         A( LDA, * ), X( * )
 *       ..
 *  
 *
@@ -25834,154 +41877,356 @@
 *>
 *> \verbatim
 *>
-*> ZTREVC computes some or all of the right and/or left eigenvectors of
-*> a complex upper triangular matrix T.
-*> Matrices of this type are produced by the Schur factorization of
-*> a complex general matrix:  A = Q*T*Q**H, as computed by ZHSEQR.
-*> 
-*> The right eigenvector x and the left eigenvector y of T corresponding
-*> to an eigenvalue w are defined by:
-*> 
-*>              T*x = w*x,     (y**H)*T = w*(y**H)
-*> 
-*> where y**H denotes the conjugate transpose of the vector y.
-*> The eigenvalues are not input to this routine, but are read directly
-*> from the diagonal of T.
-*> 
-*> This routine returns the matrices X and/or Y of right and left
-*> eigenvectors of T, or the products Q*X and/or Q*Y, where Q is an
-*> input matrix.  If Q is the unitary factor that reduces a matrix A to
-*> Schur form T, then Q*X and Q*Y are the matrices of right and left
-*> eigenvectors of A.
+*> ZSYR   performs the symmetric rank 1 operation
+*>
+*>    A := alpha*x*x**H + A,
+*>
+*> where alpha is a complex scalar, x is an n element vector and A is an
+*> n by n symmetric matrix.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
+*> \param[in] UPLO
 *> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'R':  compute right eigenvectors only;
-*>          = 'L':  compute left eigenvectors only;
-*>          = 'B':  compute both right and left eigenvectors.
-*> \endverbatim
+*>          UPLO is CHARACTER*1
+*>           On entry, UPLO specifies whether the upper or lower
+*>           triangular part of the array A is to be referenced as
+*>           follows:
 *>
-*> \param[in] HOWMNY
-*> \verbatim
-*>          HOWMNY is CHARACTER*1
-*>          = 'A':  compute all right and/or left eigenvectors;
-*>          = 'B':  compute all right and/or left eigenvectors,
-*>                  backtransformed using the matrices supplied in
-*>                  VR and/or VL;
-*>          = 'S':  compute selected right and/or left eigenvectors,
-*>                  as indicated by the logical array SELECT.
-*> \endverbatim
+*>              UPLO = 'U' or 'u'   Only the upper triangular part of A
+*>                                  is to be referenced.
 *>
-*> \param[in] SELECT
-*> \verbatim
-*>          SELECT is LOGICAL array, dimension (N)
-*>          If HOWMNY = 'S', SELECT specifies the eigenvectors to be
-*>          computed.
-*>          The eigenvector corresponding to the j-th eigenvalue is
-*>          computed if SELECT(j) = .TRUE..
-*>          Not referenced if HOWMNY = 'A' or 'B'.
+*>              UPLO = 'L' or 'l'   Only the lower triangular part of A
+*>                                  is to be referenced.
+*>
+*>           Unchanged on exit.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix T. N >= 0.
+*>           On entry, N specifies the order of the matrix A.
+*>           N must be at least zero.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[in,out] T
+*> \param[in] ALPHA
 *> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,N)
-*>          The upper triangular matrix T.  T is modified, but restored
-*>          on exit.
+*>          ALPHA is COMPLEX*16
+*>           On entry, ALPHA specifies the scalar alpha.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[in] LDT
+*> \param[in] X
 *> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T. LDT >= max(1,N).
+*>          X is COMPLEX*16 array, dimension at least
+*>           ( 1 + ( N - 1 )*abs( INCX ) ).
+*>           Before entry, the incremented array X must contain the N-
+*>           element vector x.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[in,out] VL
+*> \param[in] INCX
 *> \verbatim
-*>          VL is COMPLEX*16 array, dimension (LDVL,MM)
-*>          On entry, if SIDE = 'L' or 'B' and HOWMNY = 'B', VL must
-*>          contain an N-by-N matrix Q (usually the unitary matrix Q of
-*>          Schur vectors returned by ZHSEQR).
-*>          On exit, if SIDE = 'L' or 'B', VL contains:
-*>          if HOWMNY = 'A', the matrix Y of left eigenvectors of T;
-*>          if HOWMNY = 'B', the matrix Q*Y;
-*>          if HOWMNY = 'S', the left eigenvectors of T specified by
-*>                           SELECT, stored consecutively in the columns
-*>                           of VL, in the same order as their
-*>                           eigenvalues.
-*>          Not referenced if SIDE = 'R'.
+*>          INCX is INTEGER
+*>           On entry, INCX specifies the increment for the elements of
+*>           X. INCX must not be zero.
+*>           Unchanged on exit.
 *> \endverbatim
 *>
-*> \param[in] LDVL
+*> \param[in,out] A
 *> \verbatim
-*>          LDVL is INTEGER
-*>          The leading dimension of the array VL.  LDVL >= 1, and if
-*>          SIDE = 'L' or 'B', LDVL >= N.
+*>          A is COMPLEX*16 array, dimension ( LDA, N )
+*>           Before entry, with  UPLO = 'U' or 'u', the leading n by n
+*>           upper triangular part of the array A must contain the upper
+*>           triangular part of the symmetric matrix and the strictly
+*>           lower triangular part of A is not referenced. On exit, the
+*>           upper triangular part of the array A is overwritten by the
+*>           upper triangular part of the updated matrix.
+*>           Before entry, with UPLO = 'L' or 'l', the leading n by n
+*>           lower triangular part of the array A must contain the lower
+*>           triangular part of the symmetric matrix and the strictly
+*>           upper triangular part of A is not referenced. On exit, the
+*>           lower triangular part of the array A is overwritten by the
+*>           lower triangular part of the updated matrix.
 *> \endverbatim
 *>
-*> \param[in,out] VR
+*> \param[in] LDA
 *> \verbatim
-*>          VR is COMPLEX*16 array, dimension (LDVR,MM)
-*>          On entry, if SIDE = 'R' or 'B' and HOWMNY = 'B', VR must
-*>          contain an N-by-N matrix Q (usually the unitary matrix Q of
-*>          Schur vectors returned by ZHSEQR).
-*>          On exit, if SIDE = 'R' or 'B', VR contains:
-*>          if HOWMNY = 'A', the matrix X of right eigenvectors of T;
-*>          if HOWMNY = 'B', the matrix Q*X;
-*>          if HOWMNY = 'S', the right eigenvectors of T specified by
-*>                           SELECT, stored consecutively in the columns
-*>                           of VR, in the same order as their
-*>                           eigenvalues.
-*>          Not referenced if SIDE = 'L'.
+*>          LDA is INTEGER
+*>           On entry, LDA specifies the first dimension of A as declared
+*>           in the calling (sub) program. LDA must be at least
+*>           max( 1, N ).
+*>           Unchanged on exit.
 *> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date September 2012
+*
+*> \ingroup complex16SYauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ZSYR( UPLO, N, ALPHA, X, INCX, A, LDA )
+*
+*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
+*
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            INCX, LDA, N
+      COMPLEX*16         ALPHA
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), X( * )
+*     ..
+*
+* =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, INFO, IX, J, JX, KX
+      COMPLEX*16         TEMP
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = 1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = 2
+      ELSE IF( INCX.EQ.0 ) THEN
+         INFO = 5
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = 7
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZSYR  ', INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible.
+*
+      IF( ( N.EQ.0 ) .OR. ( ALPHA.EQ.ZERO ) )
+     $   RETURN
+*
+*     Set the start point in X if the increment is not unity.
+*
+      IF( INCX.LE.0 ) THEN
+         KX = 1 - ( N-1 )*INCX
+      ELSE IF( INCX.NE.1 ) THEN
+         KX = 1
+      END IF
+*
+*     Start the operations. In this version the elements of A are
+*     accessed sequentially with one pass through the triangular part
+*     of A.
+*
+      IF( LSAME( UPLO, 'U' ) ) THEN
+*
+*        Form  A  when A is stored in upper triangle.
+*
+         IF( INCX.EQ.1 ) THEN
+            DO 20 J = 1, N
+               IF( X( J ).NE.ZERO ) THEN
+                  TEMP = ALPHA*X( J )
+                  DO 10 I = 1, J
+                     A( I, J ) = A( I, J ) + X( I )*TEMP
+   10             CONTINUE
+               END IF
+   20       CONTINUE
+         ELSE
+            JX = KX
+            DO 40 J = 1, N
+               IF( X( JX ).NE.ZERO ) THEN
+                  TEMP = ALPHA*X( JX )
+                  IX = KX
+                  DO 30 I = 1, J
+                     A( I, J ) = A( I, J ) + X( IX )*TEMP
+                     IX = IX + INCX
+   30             CONTINUE
+               END IF
+               JX = JX + INCX
+   40       CONTINUE
+         END IF
+      ELSE
+*
+*        Form  A  when A is stored in lower triangle.
+*
+         IF( INCX.EQ.1 ) THEN
+            DO 60 J = 1, N
+               IF( X( J ).NE.ZERO ) THEN
+                  TEMP = ALPHA*X( J )
+                  DO 50 I = J, N
+                     A( I, J ) = A( I, J ) + X( I )*TEMP
+   50             CONTINUE
+               END IF
+   60       CONTINUE
+         ELSE
+            JX = KX
+            DO 80 J = 1, N
+               IF( X( JX ).NE.ZERO ) THEN
+                  TEMP = ALPHA*X( JX )
+                  IX = JX
+                  DO 70 I = J, N
+                     A( I, J ) = A( I, J ) + X( IX )*TEMP
+                     IX = IX + INCX
+   70             CONTINUE
+               END IF
+               JX = JX + INCX
+   80       CONTINUE
+         END IF
+      END IF
+*
+      RETURN
+*
+*     End of ZSYR
+*
+      END
+*> \brief \b ZSYTF2 computes the factorization of a real symmetric indefinite matrix, using the diagonal pivoting method (unblocked algorithm).
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZSYTF2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytf2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zsytf2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytf2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZSYTF2( UPLO, N, A, LDA, IPIV, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, N
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
 *>
-*> \param[in] LDVR
 *> \verbatim
-*>          LDVR is INTEGER
-*>          The leading dimension of the array VR.  LDVR >= 1, and if
-*>          SIDE = 'R' or 'B'; LDVR >= N.
+*>
+*> ZSYTF2 computes the factorization of a complex symmetric matrix A
+*> using the Bunch-Kaufman diagonal pivoting method:
+*>
+*>    A = U*D*U**T  or  A = L*D*L**T
+*>
+*> where U (or L) is a product of permutation and unit upper (lower)
+*> triangular matrices, U**T is the transpose of U, and D is symmetric and
+*> block diagonal with 1-by-1 and 2-by-2 diagonal blocks.
+*>
+*> This is the unblocked version of the algorithm, calling Level 2 BLAS.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the upper or lower triangular part of the
+*>          symmetric matrix A is stored:
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
 *> \endverbatim
 *>
-*> \param[in] MM
+*> \param[in] N
 *> \verbatim
-*>          MM is INTEGER
-*>          The number of columns in the arrays VL and/or VR. MM >= M.
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[out] M
+*> \param[in,out] A
 *> \verbatim
-*>          M is INTEGER
-*>          The number of columns in the arrays VL and/or VR actually
-*>          used to store the eigenvectors.  If HOWMNY = 'A' or 'B', M
-*>          is set to N.  Each selected eigenvector occupies one
-*>          column.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+*>          n-by-n upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading n-by-n lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>
+*>          On exit, the block diagonal matrix D and the multipliers used
+*>          to obtain the factor U or L (see below for further details).
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LDA
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (2*N)
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] RWORK
+*> \param[out] IPIV
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (N)
+*>          IPIV is INTEGER array, dimension (N)
+*>          Details of the interchanges and the block structure of D.
+*>
+*>          If UPLO = 'U':
+*>             If IPIV(k) > 0, then rows and columns k and IPIV(k) were
+*>             interchanged and D(k,k) is a 1-by-1 diagonal block.
+*>
+*>             If IPIV(k) = IPIV(k-1) < 0, then rows and columns
+*>             k-1 and -IPIV(k) were interchanged and D(k-1:k,k-1:k)
+*>             is a 2-by-2 diagonal block.
+*>
+*>          If UPLO = 'L':
+*>             If IPIV(k) > 0, then rows and columns k and IPIV(k) were
+*>             interchanged and D(k,k) is a 1-by-1 diagonal block.
+*>
+*>             If IPIV(k) = IPIV(k+1) < 0, then rows and columns
+*>             k+1 and -IPIV(k) were interchanged and D(k:k+1,k:k+1)
+*>             is a 2-by-2 diagonal block.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: if INFO = -k, the k-th argument had an illegal value
+*>          > 0: if INFO = k, D(k,k) is exactly zero.  The factorization
+*>               has been completed, but the block diagonal matrix D is
+*>               exactly singular, and division by zero will occur if it
+*>               is used to solve a system of equations.
 *> \endverbatim
 *
 *  Authors:
@@ -25992,42 +42237,82 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2013
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYcomputational
 *
 *> \par Further Details:
 *  =====================
 *>
 *> \verbatim
 *>
-*>  The algorithm used in this program is basically backward (forward)
-*>  substitution, with scaling to make the the code robust against
-*>  possible overflow.
-*>
-*>  Each eigenvector is normalized so that the element of largest
-*>  magnitude has magnitude 1; here the magnitude of a complex number
-*>  (x,y) is taken to be |x| + |y|.
+*>  If UPLO = 'U', then A = U*D*U**T, where
+*>     U = P(n)*U(n)* ... *P(k)U(k)* ...,
+*>  i.e., U is a product of terms P(k)*U(k), where k decreases from n to
+*>  1 in steps of 1 or 2, and D is a block diagonal matrix with 1-by-1
+*>  and 2-by-2 diagonal blocks D(k).  P(k) is a permutation matrix as
+*>  defined by IPIV(k), and U(k) is a unit upper triangular matrix, such
+*>  that if the diagonal block D(k) is of order s (s = 1 or 2), then
+*>
+*>             (   I    v    0   )   k-s
+*>     U(k) =  (   0    I    0   )   s
+*>             (   0    0    I   )   n-k
+*>                k-s   s   n-k
+*>
+*>  If s = 1, D(k) overwrites A(k,k), and v overwrites A(1:k-1,k).
+*>  If s = 2, the upper triangle of D(k) overwrites A(k-1,k-1), A(k-1,k),
+*>  and A(k,k), and v overwrites A(1:k-2,k-1:k).
+*>
+*>  If UPLO = 'L', then A = L*D*L**T, where
+*>     L = P(1)*L(1)* ... *P(k)*L(k)* ...,
+*>  i.e., L is a product of terms P(k)*L(k), where k increases from 1 to
+*>  n in steps of 1 or 2, and D is a block diagonal matrix with 1-by-1
+*>  and 2-by-2 diagonal blocks D(k).  P(k) is a permutation matrix as
+*>  defined by IPIV(k), and L(k) is a unit lower triangular matrix, such
+*>  that if the diagonal block D(k) is of order s (s = 1 or 2), then
+*>
+*>             (   I    0     0   )  k-1
+*>     L(k) =  (   0    I     0   )  s
+*>             (   0    v     I   )  n-k-s+1
+*>                k-1   s  n-k-s+1
+*>
+*>  If s = 1, D(k) overwrites A(k,k), and v overwrites A(k+1:n,k).
+*>  If s = 2, the lower triangle of D(k) overwrites A(k,k), A(k+1,k),
+*>  and A(k+1,k+1), and v overwrites A(k+2:n,k:k+1).
 *> \endverbatim
+*
+*> \par Contributors:
+*  ==================
+*>
+*> \verbatim
 *>
+*>  09-29-06 - patch from
+*>    Bobby Cheng, MathWorks
+*>
+*>    Replace l.209 and l.377
+*>         IF( MAX( ABSAKK, COLMAX ).EQ.ZERO ) THEN
+*>    by
+*>         IF( (MAX( ABSAKK, COLMAX ).EQ.ZERO) .OR. DISNAN(ABSAKK) ) THEN
+*>
+*>  1-96 - Based on modifications by J. Lewis, Boeing Computer Services
+*>         Company
+*> \endverbatim
+*
 *  =====================================================================
-      SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
-     $                   LDVR, MM, M, WORK, RWORK, INFO )
+      SUBROUTINE ZSYTF2( UPLO, N, A, LDA, IPIV, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.5.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2013
 *
 *     .. Scalar Arguments ..
-      CHARACTER          HOWMNY, SIDE
-      INTEGER            INFO, LDT, LDVL, LDVR, M, MM, N
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      LOGICAL            SELECT( * )
-      DOUBLE PRECISION   RWORK( * )
-      COMPLEX*16         T( LDT, * ), VL( LDVL, * ), VR( LDVR, * ),
-     $                   WORK( * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
@@ -26035,252 +42320,406 @@
 *     .. Parameters ..
       DOUBLE PRECISION   ZERO, ONE
       PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-      COMPLEX*16         CMZERO, CMONE
-      PARAMETER          ( CMZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   CMONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   EIGHT, SEVTEN
+      PARAMETER          ( EIGHT = 8.0D+0, SEVTEN = 17.0D+0 )
+      COMPLEX*16         CONE
+      PARAMETER          ( CONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ALLV, BOTHV, LEFTV, OVER, RIGHTV, SOMEV
-      INTEGER            I, II, IS, J, K, KI
-      DOUBLE PRECISION   OVFL, REMAX, SCALE, SMIN, SMLNUM, ULP, UNFL
-      COMPLEX*16         CDUM
+      LOGICAL            UPPER
+      INTEGER            I, IMAX, J, JMAX, K, KK, KP, KSTEP
+      DOUBLE PRECISION   ABSAKK, ALPHA, COLMAX, ROWMAX
+      COMPLEX*16         D11, D12, D21, D22, R1, T, WK, WKM1, WKP1, Z
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
+      LOGICAL            DISNAN, LSAME
       INTEGER            IZAMAX
-      DOUBLE PRECISION   DLAMCH, DZASUM
-      EXTERNAL           LSAME, IZAMAX, DLAMCH, DZASUM
+      EXTERNAL           DISNAN, LSAME, IZAMAX
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZCOPY, ZDSCAL, ZGEMV, ZLATRS
+      EXTERNAL           XERBLA, ZSCAL, ZSWAP, ZSYR
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX
+      INTRINSIC          ABS, DBLE, DIMAG, MAX, SQRT
 *     ..
 *     .. Statement Functions ..
       DOUBLE PRECISION   CABS1
 *     ..
 *     .. Statement Function definitions ..
-      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
+      CABS1( Z ) = ABS( DBLE( Z ) ) + ABS( DIMAG( Z ) )
 *     ..
 *     .. Executable Statements ..
 *
-*     Decode and test the input parameters
-*
-      BOTHV = LSAME( SIDE, 'B' )
-      RIGHTV = LSAME( SIDE, 'R' ) .OR. BOTHV
-      LEFTV = LSAME( SIDE, 'L' ) .OR. BOTHV
-*
-      ALLV = LSAME( HOWMNY, 'A' )
-      OVER = LSAME( HOWMNY, 'B' )
-      SOMEV = LSAME( HOWMNY, 'S' )
-*
-*     Set M to the number of columns required to store the selected
-*     eigenvectors.
-*
-      IF( SOMEV ) THEN
-         M = 0
-         DO 10 J = 1, N
-            IF( SELECT( J ) )
-     $         M = M + 1
-   10    CONTINUE
-      ELSE
-         M = N
-      END IF
+*     Test the input parameters.
 *
       INFO = 0
-      IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.ALLV .AND. .NOT.OVER .AND. .NOT.SOMEV ) THEN
-         INFO = -2
       ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
-         INFO = -6
-      ELSE IF( LDVL.LT.1 .OR. ( LEFTV .AND. LDVL.LT.N ) ) THEN
-         INFO = -8
-      ELSE IF( LDVR.LT.1 .OR. ( RIGHTV .AND. LDVR.LT.N ) ) THEN
-         INFO = -10
-      ELSE IF( MM.LT.M ) THEN
-         INFO = -11
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZTREVC', -INFO )
+         CALL XERBLA( 'ZSYTF2', -INFO )
          RETURN
       END IF
 *
-*     Quick return if possible.
+*     Initialize ALPHA for use in choosing pivot block size.
 *
-      IF( N.EQ.0 )
-     $   RETURN
+      ALPHA = ( ONE+SQRT( SEVTEN ) ) / EIGHT
 *
-*     Set the constants to control overflow.
+      IF( UPPER ) THEN
 *
-      UNFL = DLAMCH( 'Safe minimum' )
-      OVFL = ONE / UNFL
-      CALL DLABAD( UNFL, OVFL )
-      ULP = DLAMCH( 'Precision' )
-      SMLNUM = UNFL*( N / ULP )
+*        Factorize A as U*D*U**T using the upper triangle of A
 *
-*     Store the diagonal elements of T in working array WORK.
+*        K is the main loop index, decreasing from N to 1 in steps of
+*        1 or 2
 *
-      DO 20 I = 1, N
-         WORK( I+N ) = T( I, I )
-   20 CONTINUE
+         K = N
+   10    CONTINUE
 *
-*     Compute 1-norm of each column of strictly upper triangular
-*     part of T to control overflow in triangular solver.
+*        If K < 1, exit from loop
 *
-      RWORK( 1 ) = ZERO
-      DO 30 J = 2, N
-         RWORK( J ) = DZASUM( J-1, T( 1, J ), 1 )
-   30 CONTINUE
+         IF( K.LT.1 )
+     $      GO TO 70
+         KSTEP = 1
 *
-      IF( RIGHTV ) THEN
+*        Determine rows and columns to be interchanged and whether
+*        a 1-by-1 or 2-by-2 pivot block will be used
 *
-*        Compute right eigenvectors.
+         ABSAKK = CABS1( A( K, K ) )
 *
-         IS = M
-         DO 80 KI = N, 1, -1
+*        IMAX is the row-index of the largest off-diagonal element in
+*        column K, and COLMAX is its absolute value.
+*        Determine both COLMAX and IMAX.
 *
-            IF( SOMEV ) THEN
-               IF( .NOT.SELECT( KI ) )
-     $            GO TO 80
-            END IF
-            SMIN = MAX( ULP*( CABS1( T( KI, KI ) ) ), SMLNUM )
+         IF( K.GT.1 ) THEN
+            IMAX = IZAMAX( K-1, A( 1, K ), 1 )
+            COLMAX = CABS1( A( IMAX, K ) )
+         ELSE
+            COLMAX = ZERO
+         END IF
 *
-            WORK( 1 ) = CMONE
+         IF( MAX( ABSAKK, COLMAX ).EQ.ZERO .OR. DISNAN(ABSAKK) ) THEN
 *
-*           Form right-hand side.
+*           Column K is zero or underflow, or contains a NaN:
+*           set INFO and continue
 *
-            DO 40 K = 1, KI - 1
-               WORK( K ) = -T( K, KI )
-   40       CONTINUE
+            IF( INFO.EQ.0 )
+     $         INFO = K
+            KP = K
+         ELSE
+            IF( ABSAKK.GE.ALPHA*COLMAX ) THEN
 *
-*           Solve the triangular system:
-*              (T(1:KI-1,1:KI-1) - T(KI,KI))*X = SCALE*WORK.
+*              no interchange, use 1-by-1 pivot block
 *
-            DO 50 K = 1, KI - 1
-               T( K, K ) = T( K, K ) - T( KI, KI )
-               IF( CABS1( T( K, K ) ).LT.SMIN )
-     $            T( K, K ) = SMIN
-   50       CONTINUE
+               KP = K
+            ELSE
 *
-            IF( KI.GT.1 ) THEN
-               CALL ZLATRS( 'Upper', 'No transpose', 'Non-unit', 'Y',
-     $                      KI-1, T, LDT, WORK( 1 ), SCALE, RWORK,
-     $                      INFO )
-               WORK( KI ) = SCALE
+*              JMAX is the column-index of the largest off-diagonal
+*              element in row IMAX, and ROWMAX is its absolute value
+*
+               JMAX = IMAX + IZAMAX( K-IMAX, A( IMAX, IMAX+1 ), LDA )
+               ROWMAX = CABS1( A( IMAX, JMAX ) )
+               IF( IMAX.GT.1 ) THEN
+                  JMAX = IZAMAX( IMAX-1, A( 1, IMAX ), 1 )
+                  ROWMAX = MAX( ROWMAX, CABS1( A( JMAX, IMAX ) ) )
+               END IF
+*
+               IF( ABSAKK.GE.ALPHA*COLMAX*( COLMAX / ROWMAX ) ) THEN
+*
+*                 no interchange, use 1-by-1 pivot block
+*
+                  KP = K
+               ELSE IF( CABS1( A( IMAX, IMAX ) ).GE.ALPHA*ROWMAX ) THEN
+*
+*                 interchange rows and columns K and IMAX, use 1-by-1
+*                 pivot block
+*
+                  KP = IMAX
+               ELSE
+*
+*                 interchange rows and columns K-1 and IMAX, use 2-by-2
+*                 pivot block
+*
+                  KP = IMAX
+                  KSTEP = 2
+               END IF
             END IF
 *
-*           Copy the vector x or Q*x to VR and normalize.
+            KK = K - KSTEP + 1
+            IF( KP.NE.KK ) THEN
 *
-            IF( .NOT.OVER ) THEN
-               CALL ZCOPY( KI, WORK( 1 ), 1, VR( 1, IS ), 1 )
+*              Interchange rows and columns KK and KP in the leading
+*              submatrix A(1:k,1:k)
 *
-               II = IZAMAX( KI, VR( 1, IS ), 1 )
-               REMAX = ONE / CABS1( VR( II, IS ) )
-               CALL ZDSCAL( KI, REMAX, VR( 1, IS ), 1 )
+               CALL ZSWAP( KP-1, A( 1, KK ), 1, A( 1, KP ), 1 )
+               CALL ZSWAP( KK-KP-1, A( KP+1, KK ), 1, A( KP, KP+1 ),
+     $                     LDA )
+               T = A( KK, KK )
+               A( KK, KK ) = A( KP, KP )
+               A( KP, KP ) = T
+               IF( KSTEP.EQ.2 ) THEN
+                  T = A( K-1, K )
+                  A( K-1, K ) = A( KP, K )
+                  A( KP, K ) = T
+               END IF
+            END IF
 *
-               DO 60 K = KI + 1, N
-                  VR( K, IS ) = CMZERO
-   60          CONTINUE
+*           Update the leading submatrix
+*
+            IF( KSTEP.EQ.1 ) THEN
+*
+*              1-by-1 pivot block D(k): column k now holds
+*
+*              W(k) = U(k)*D(k)
+*
+*              where U(k) is the k-th column of U
+*
+*              Perform a rank-1 update of A(1:k-1,1:k-1) as
+*
+*              A := A - U(k)*D(k)*U(k)**T = A - W(k)*1/D(k)*W(k)**T
+*
+               R1 = CONE / A( K, K )
+               CALL ZSYR( UPLO, K-1, -R1, A( 1, K ), 1, A, LDA )
+*
+*              Store U(k) in column k
+*
+               CALL ZSCAL( K-1, R1, A( 1, K ), 1 )
             ELSE
-               IF( KI.GT.1 )
-     $            CALL ZGEMV( 'N', N, KI-1, CMONE, VR, LDVR, WORK( 1 ),
-     $                        1, DCMPLX( SCALE ), VR( 1, KI ), 1 )
 *
-               II = IZAMAX( N, VR( 1, KI ), 1 )
-               REMAX = ONE / CABS1( VR( II, KI ) )
-               CALL ZDSCAL( N, REMAX, VR( 1, KI ), 1 )
+*              2-by-2 pivot block D(k): columns k and k-1 now hold
+*
+*              ( W(k-1) W(k) ) = ( U(k-1) U(k) )*D(k)
+*
+*              where U(k) and U(k-1) are the k-th and (k-1)-th columns
+*              of U
+*
+*              Perform a rank-2 update of A(1:k-2,1:k-2) as
+*
+*              A := A - ( U(k-1) U(k) )*D(k)*( U(k-1) U(k) )**T
+*                 = A - ( W(k-1) W(k) )*inv(D(k))*( W(k-1) W(k) )**T
+*
+               IF( K.GT.2 ) THEN
+*
+                  D12 = A( K-1, K )
+                  D22 = A( K-1, K-1 ) / D12
+                  D11 = A( K, K ) / D12
+                  T = CONE / ( D11*D22-CONE )
+                  D12 = T / D12
+*
+                  DO 30 J = K - 2, 1, -1
+                     WKM1 = D12*( D11*A( J, K-1 )-A( J, K ) )
+                     WK = D12*( D22*A( J, K )-A( J, K-1 ) )
+                     DO 20 I = J, 1, -1
+                        A( I, J ) = A( I, J ) - A( I, K )*WK -
+     $                              A( I, K-1 )*WKM1
+   20                CONTINUE
+                     A( J, K ) = WK
+                     A( J, K-1 ) = WKM1
+   30             CONTINUE
+*
+               END IF
+*
             END IF
+         END IF
 *
-*           Set back the original diagonal elements of T.
+*        Store details of the interchanges in IPIV
 *
-            DO 70 K = 1, KI - 1
-               T( K, K ) = WORK( K+N )
-   70       CONTINUE
+         IF( KSTEP.EQ.1 ) THEN
+            IPIV( K ) = KP
+         ELSE
+            IPIV( K ) = -KP
+            IPIV( K-1 ) = -KP
+         END IF
 *
-            IS = IS - 1
-   80    CONTINUE
-      END IF
+*        Decrease K and return to the start of the main loop
 *
-      IF( LEFTV ) THEN
+         K = K - KSTEP
+         GO TO 10
 *
-*        Compute left eigenvectors.
+      ELSE
 *
-         IS = 1
-         DO 130 KI = 1, N
+*        Factorize A as L*D*L**T using the lower triangle of A
 *
-            IF( SOMEV ) THEN
-               IF( .NOT.SELECT( KI ) )
-     $            GO TO 130
-            END IF
-            SMIN = MAX( ULP*( CABS1( T( KI, KI ) ) ), SMLNUM )
+*        K is the main loop index, increasing from 1 to N in steps of
+*        1 or 2
 *
-            WORK( N ) = CMONE
+         K = 1
+   40    CONTINUE
 *
-*           Form right-hand side.
+*        If K > N, exit from loop
 *
-            DO 90 K = KI + 1, N
-               WORK( K ) = -DCONJG( T( KI, K ) )
-   90       CONTINUE
+         IF( K.GT.N )
+     $      GO TO 70
+         KSTEP = 1
 *
-*           Solve the triangular system:
-*              (T(KI+1:N,KI+1:N) - T(KI,KI))**H * X = SCALE*WORK.
+*        Determine rows and columns to be interchanged and whether
+*        a 1-by-1 or 2-by-2 pivot block will be used
 *
-            DO 100 K = KI + 1, N
-               T( K, K ) = T( K, K ) - T( KI, KI )
-               IF( CABS1( T( K, K ) ).LT.SMIN )
-     $            T( K, K ) = SMIN
-  100       CONTINUE
+         ABSAKK = CABS1( A( K, K ) )
 *
-            IF( KI.LT.N ) THEN
-               CALL ZLATRS( 'Upper', 'Conjugate transpose', 'Non-unit',
-     $                      'Y', N-KI, T( KI+1, KI+1 ), LDT,
-     $                      WORK( KI+1 ), SCALE, RWORK, INFO )
-               WORK( KI ) = SCALE
+*        IMAX is the row-index of the largest off-diagonal element in
+*        column K, and COLMAX is its absolute value.
+*        Determine both COLMAX and IMAX.
+*
+         IF( K.LT.N ) THEN
+            IMAX = K + IZAMAX( N-K, A( K+1, K ), 1 )
+            COLMAX = CABS1( A( IMAX, K ) )
+         ELSE
+            COLMAX = ZERO
+         END IF
+*
+         IF( MAX( ABSAKK, COLMAX ).EQ.ZERO .OR. DISNAN(ABSAKK) ) THEN
+*
+*           Column K is zero or underflow, or contains a NaN:
+*           set INFO and continue
+*
+            IF( INFO.EQ.0 )
+     $         INFO = K
+            KP = K
+         ELSE
+            IF( ABSAKK.GE.ALPHA*COLMAX ) THEN
+*
+*              no interchange, use 1-by-1 pivot block
+*
+               KP = K
+            ELSE
+*
+*              JMAX is the column-index of the largest off-diagonal
+*              element in row IMAX, and ROWMAX is its absolute value
+*
+               JMAX = K - 1 + IZAMAX( IMAX-K, A( IMAX, K ), LDA )
+               ROWMAX = CABS1( A( IMAX, JMAX ) )
+               IF( IMAX.LT.N ) THEN
+                  JMAX = IMAX + IZAMAX( N-IMAX, A( IMAX+1, IMAX ), 1 )
+                  ROWMAX = MAX( ROWMAX, CABS1( A( JMAX, IMAX ) ) )
+               END IF
+*
+               IF( ABSAKK.GE.ALPHA*COLMAX*( COLMAX / ROWMAX ) ) THEN
+*
+*                 no interchange, use 1-by-1 pivot block
+*
+                  KP = K
+               ELSE IF( CABS1( A( IMAX, IMAX ) ).GE.ALPHA*ROWMAX ) THEN
+*
+*                 interchange rows and columns K and IMAX, use 1-by-1
+*                 pivot block
+*
+                  KP = IMAX
+               ELSE
+*
+*                 interchange rows and columns K+1 and IMAX, use 2-by-2
+*                 pivot block
+*
+                  KP = IMAX
+                  KSTEP = 2
+               END IF
             END IF
 *
-*           Copy the vector x or Q*x to VL and normalize.
+            KK = K + KSTEP - 1
+            IF( KP.NE.KK ) THEN
 *
-            IF( .NOT.OVER ) THEN
-               CALL ZCOPY( N-KI+1, WORK( KI ), 1, VL( KI, IS ), 1 )
+*              Interchange rows and columns KK and KP in the trailing
+*              submatrix A(k:n,k:n)
 *
-               II = IZAMAX( N-KI+1, VL( KI, IS ), 1 ) + KI - 1
-               REMAX = ONE / CABS1( VL( II, IS ) )
-               CALL ZDSCAL( N-KI+1, REMAX, VL( KI, IS ), 1 )
+               IF( KP.LT.N )
+     $            CALL ZSWAP( N-KP, A( KP+1, KK ), 1, A( KP+1, KP ), 1 )
+               CALL ZSWAP( KP-KK-1, A( KK+1, KK ), 1, A( KP, KK+1 ),
+     $                     LDA )
+               T = A( KK, KK )
+               A( KK, KK ) = A( KP, KP )
+               A( KP, KP ) = T
+               IF( KSTEP.EQ.2 ) THEN
+                  T = A( K+1, K )
+                  A( K+1, K ) = A( KP, K )
+                  A( KP, K ) = T
+               END IF
+            END IF
 *
-               DO 110 K = 1, KI - 1
-                  VL( K, IS ) = CMZERO
-  110          CONTINUE
+*           Update the trailing submatrix
+*
+            IF( KSTEP.EQ.1 ) THEN
+*
+*              1-by-1 pivot block D(k): column k now holds
+*
+*              W(k) = L(k)*D(k)
+*
+*              where L(k) is the k-th column of L
+*
+               IF( K.LT.N ) THEN
+*
+*                 Perform a rank-1 update of A(k+1:n,k+1:n) as
+*
+*                 A := A - L(k)*D(k)*L(k)**T = A - W(k)*(1/D(k))*W(k)**T
+*
+                  R1 = CONE / A( K, K )
+                  CALL ZSYR( UPLO, N-K, -R1, A( K+1, K ), 1,
+     $                       A( K+1, K+1 ), LDA )
+*
+*                 Store L(k) in column K
+*
+                  CALL ZSCAL( N-K, R1, A( K+1, K ), 1 )
+               END IF
             ELSE
-               IF( KI.LT.N )
-     $            CALL ZGEMV( 'N', N, N-KI, CMONE, VL( 1, KI+1 ), LDVL,
-     $                        WORK( KI+1 ), 1, DCMPLX( SCALE ),
-     $                        VL( 1, KI ), 1 )
 *
-               II = IZAMAX( N, VL( 1, KI ), 1 )
-               REMAX = ONE / CABS1( VL( II, KI ) )
-               CALL ZDSCAL( N, REMAX, VL( 1, KI ), 1 )
+*              2-by-2 pivot block D(k)
+*
+               IF( K.LT.N-1 ) THEN
+*
+*                 Perform a rank-2 update of A(k+2:n,k+2:n) as
+*
+*                 A := A - ( L(k) L(k+1) )*D(k)*( L(k) L(k+1) )**T
+*                    = A - ( W(k) W(k+1) )*inv(D(k))*( W(k) W(k+1) )**T
+*
+*                 where L(k) and L(k+1) are the k-th and (k+1)-th
+*                 columns of L
+*
+                  D21 = A( K+1, K )
+                  D11 = A( K+1, K+1 ) / D21
+                  D22 = A( K, K ) / D21
+                  T = CONE / ( D11*D22-CONE )
+                  D21 = T / D21
+*
+                  DO 60 J = K + 2, N
+                     WK = D21*( D11*A( J, K )-A( J, K+1 ) )
+                     WKP1 = D21*( D22*A( J, K+1 )-A( J, K ) )
+                     DO 50 I = J, N
+                        A( I, J ) = A( I, J ) - A( I, K )*WK -
+     $                              A( I, K+1 )*WKP1
+   50                CONTINUE
+                     A( J, K ) = WK
+                     A( J, K+1 ) = WKP1
+   60             CONTINUE
+               END IF
             END IF
+         END IF
 *
-*           Set back the original diagonal elements of T.
+*        Store details of the interchanges in IPIV
 *
-            DO 120 K = KI + 1, N
-               T( K, K ) = WORK( K+N )
-  120       CONTINUE
+         IF( KSTEP.EQ.1 ) THEN
+            IPIV( K ) = KP
+         ELSE
+            IPIV( K ) = -KP
+            IPIV( K+1 ) = -KP
+         END IF
+*
+*        Increase K and return to the start of the main loop
+*
+         K = K + KSTEP
+         GO TO 40
 *
-            IS = IS + 1
-  130    CONTINUE
       END IF
 *
+   70 CONTINUE
       RETURN
 *
-*     End of ZTREVC
+*     End of ZSYTF2
 *
       END
-*> \brief \b ZTREXC
+*> \brief \b ZSYTRF
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -26288,26 +42727,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZTREXC + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrexc.f"> 
+*> Download ZSYTRF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytrf.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrexc.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zsytrf.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrexc.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytrf.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
+*       SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          COMPQ
-*       INTEGER            IFST, ILST, INFO, LDQ, LDT, N
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         Q( LDQ, * ), T( LDT, * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * ), WORK( * )
 *       ..
 *  
 *
@@ -26316,72 +42756,85 @@
 *>
 *> \verbatim
 *>
-*> ZTREXC reorders the Schur factorization of a complex matrix
-*> A = Q*T*Q**H, so that the diagonal element of T with row index IFST
-*> is moved to row ILST.
+*> ZSYTRF computes the factorization of a complex symmetric matrix A
+*> using the Bunch-Kaufman diagonal pivoting method.  The form of the
+*> factorization is
 *>
-*> The Schur form T is reordered by a unitary similarity transformation
-*> Z**H*T*Z, and optionally the matrix Q of Schur vectors is updated by
-*> postmultplying it with Z.
+*>    A = U*D*U**T  or  A = L*D*L**T
+*>
+*> where U (or L) is a product of permutation and unit upper (lower)
+*> triangular matrices, and D is symmetric and block diagonal with
+*> with 1-by-1 and 2-by-2 diagonal blocks.
+*>
+*> This is the blocked version of the algorithm, calling Level 3 BLAS.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] COMPQ
+*> \param[in] UPLO
 *> \verbatim
-*>          COMPQ is CHARACTER*1
-*>          = 'V':  update the matrix Q of Schur vectors;
-*>          = 'N':  do not update Q.
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrix T. N >= 0.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in,out] T
+*> \param[in,out] A
 *> \verbatim
-*>          T is COMPLEX*16 array, dimension (LDT,N)
-*>          On entry, the upper triangular matrix T.
-*>          On exit, the reordered upper triangular matrix.
-*> \endverbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+*>          N-by-N upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading N-by-N lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
 *>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T. LDT >= max(1,N).
+*>          On exit, the block diagonal matrix D and the multipliers used
+*>          to obtain the factor U or L (see below for further details).
 *> \endverbatim
 *>
-*> \param[in,out] Q
+*> \param[in] LDA
 *> \verbatim
-*>          Q is COMPLEX*16 array, dimension (LDQ,N)
-*>          On entry, if COMPQ = 'V', the matrix Q of Schur vectors.
-*>          On exit, if COMPQ = 'V', Q has been postmultiplied by the
-*>          unitary transformation matrix Z which reorders T.
-*>          If COMPQ = 'N', Q is not referenced.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDQ
+*> \param[out] IPIV
 *> \verbatim
-*>          LDQ is INTEGER
-*>          The leading dimension of the array Q.  LDQ >= max(1,N).
+*>          IPIV is INTEGER array, dimension (N)
+*>          Details of the interchanges and the block structure of D.
+*>          If IPIV(k) > 0, then rows and columns k and IPIV(k) were
+*>          interchanged and D(k,k) is a 1-by-1 diagonal block.
+*>          If UPLO = 'U' and IPIV(k) = IPIV(k-1) < 0, then rows and
+*>          columns k-1 and -IPIV(k) were interchanged and D(k-1:k,k-1:k)
+*>          is a 2-by-2 diagonal block.  If UPLO = 'L' and IPIV(k) =
+*>          IPIV(k+1) < 0, then rows and columns k+1 and -IPIV(k) were
+*>          interchanged and D(k:k+1,k:k+1) is a 2-by-2 diagonal block.
 *> \endverbatim
 *>
-*> \param[in] IFST
+*> \param[out] WORK
 *> \verbatim
-*>          IFST is INTEGER
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] ILST
+*> \param[in] LWORK
 *> \verbatim
-*>          ILST is INTEGER
+*>          LWORK is INTEGER
+*>          The length of WORK.  LWORK >=1.  For best performance
+*>          LWORK >= N*NB, where NB is the block size returned by ILAENV.
 *>
-*>          Specify the reordering of the diagonal elements of T:
-*>          The element with row index IFST is moved to row ILST by a
-*>          sequence of transpositions between adjacent elements.
-*>          1 <= IFST <= N; 1 <= ILST <= N.
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -26389,6 +42842,10 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, D(i,i) is exactly zero.  The factorization
+*>                has been completed, but the block diagonal matrix D is
+*>                exactly singular, and division by zero will occur if it
+*>                is used to solve a system of equations.
 *> \endverbatim
 *
 *  Authors:
@@ -26401,10 +42858,50 @@
 *
 *> \date November 2011
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  If UPLO = 'U', then A = U*D*U**T, where
+*>     U = P(n)*U(n)* ... *P(k)U(k)* ...,
+*>  i.e., U is a product of terms P(k)*U(k), where k decreases from n to
+*>  1 in steps of 1 or 2, and D is a block diagonal matrix with 1-by-1
+*>  and 2-by-2 diagonal blocks D(k).  P(k) is a permutation matrix as
+*>  defined by IPIV(k), and U(k) is a unit upper triangular matrix, such
+*>  that if the diagonal block D(k) is of order s (s = 1 or 2), then
+*>
+*>             (   I    v    0   )   k-s
+*>     U(k) =  (   0    I    0   )   s
+*>             (   0    0    I   )   n-k
+*>                k-s   s   n-k
+*>
+*>  If s = 1, D(k) overwrites A(k,k), and v overwrites A(1:k-1,k).
+*>  If s = 2, the upper triangle of D(k) overwrites A(k-1,k-1), A(k-1,k),
+*>  and A(k,k), and v overwrites A(1:k-2,k-1:k).
+*>
+*>  If UPLO = 'L', then A = L*D*L**T, where
+*>     L = P(1)*L(1)* ... *P(k)*L(k)* ...,
+*>  i.e., L is a product of terms P(k)*L(k), where k increases from 1 to
+*>  n in steps of 1 or 2, and D is a block diagonal matrix with 1-by-1
+*>  and 2-by-2 diagonal blocks D(k).  P(k) is a permutation matrix as
+*>  defined by IPIV(k), and L(k) is a unit lower triangular matrix, such
+*>  that if the diagonal block D(k) is of order s (s = 1 or 2), then
+*>
+*>             (   I    0     0   )  k-1
+*>     L(k) =  (   0    I     0   )  s
+*>             (   0    v     I   )  n-k-s+1
+*>                k-1   s  n-k-s+1
+*>
+*>  If s = 1, D(k) overwrites A(k,k), and v overwrites A(k+1:n,k).
+*>  If s = 2, the lower triangle of D(k) overwrites A(k,k), A(k+1,k),
+*>  and A(k+1,k+1), and v overwrites A(k+2:n,k:k+1).
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ZTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
+      SUBROUTINE ZSYTRF( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -26412,114 +42909,179 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          COMPQ
-      INTEGER            IFST, ILST, INFO, LDQ, LDT, N
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         Q( LDQ, * ), T( LDT, * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Local Scalars ..
-      LOGICAL            WANTQ
-      INTEGER            K, M1, M2, M3
-      DOUBLE PRECISION   CS
-      COMPLEX*16         SN, T11, T22, TEMP
+      LOGICAL            LQUERY, UPPER
+      INTEGER            IINFO, IWS, J, K, KB, LDWORK, LWKOPT, NB, NBMIN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARTG, ZROT
+      EXTERNAL           XERBLA, ZLASYF, ZSYTF2
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG, MAX
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Decode and test the input parameters.
+*     Test the input parameters.
 *
       INFO = 0
-      WANTQ = LSAME( COMPQ, 'V' )
-      IF( .NOT.LSAME( COMPQ, 'N' ) .AND. .NOT.WANTQ ) THEN
+      UPPER = LSAME( UPLO, 'U' )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
-      ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -4
-      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.MAX( 1, N ) ) ) THEN
-         INFO = -6
-      ELSE IF( IFST.LT.1 .OR. IFST.GT.N ) THEN
+      ELSE IF( LWORK.LT.1 .AND. .NOT.LQUERY ) THEN
          INFO = -7
-      ELSE IF( ILST.LT.1 .OR. ILST.GT.N ) THEN
-         INFO = -8
       END IF
+*
+      IF( INFO.EQ.0 ) THEN
+*
+*        Determine the block size
+*
+         NB = ILAENV( 1, 'ZSYTRF', UPLO, N, -1, -1, -1 )
+         LWKOPT = N*NB
+         WORK( 1 ) = LWKOPT
+      END IF
+*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZTREXC', -INFO )
+         CALL XERBLA( 'ZSYTRF', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
-*     Quick return if possible
+      NBMIN = 2
+      LDWORK = N
+      IF( NB.GT.1 .AND. NB.LT.N ) THEN
+         IWS = LDWORK*NB
+         IF( LWORK.LT.IWS ) THEN
+            NB = MAX( LWORK / LDWORK, 1 )
+            NBMIN = MAX( 2, ILAENV( 2, 'ZSYTRF', UPLO, N, -1, -1, -1 ) )
+         END IF
+      ELSE
+         IWS = 1
+      END IF
+      IF( NB.LT.NBMIN )
+     $   NB = N
 *
-      IF( N.EQ.1 .OR. IFST.EQ.ILST )
-     $   RETURN
+      IF( UPPER ) THEN
 *
-      IF( IFST.LT.ILST ) THEN
+*        Factorize A as U*D*U**T using the upper triangle of A
 *
-*        Move the IFST-th diagonal element forward down the diagonal.
+*        K is the main loop index, decreasing from N to 1 in steps of
+*        KB, where KB is the number of columns factorized by ZLASYF;
+*        KB is either NB or NB-1, or K for the last block
+*
+         K = N
+   10    CONTINUE
+*
+*        If K < 1, exit from loop
+*
+         IF( K.LT.1 )
+     $      GO TO 40
+*
+         IF( K.GT.NB ) THEN
+*
+*           Factorize columns k-kb+1:k of A and use blocked code to
+*           update columns 1:k-kb
+*
+            CALL ZLASYF( UPLO, K, NB, KB, A, LDA, IPIV, WORK, N, IINFO )
+         ELSE
+*
+*           Use unblocked code to factorize columns 1:k of A
+*
+            CALL ZSYTF2( UPLO, K, A, LDA, IPIV, IINFO )
+            KB = K
+         END IF
+*
+*        Set INFO on the first occurrence of a zero pivot
+*
+         IF( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $      INFO = IINFO
+*
+*        Decrease K and return to the start of the main loop
+*
+         K = K - KB
+         GO TO 10
 *
-         M1 = 0
-         M2 = -1
-         M3 = 1
       ELSE
 *
-*        Move the IFST-th diagonal element backward up the diagonal.
+*        Factorize A as L*D*L**T using the lower triangle of A
 *
-         M1 = -1
-         M2 = 0
-         M3 = -1
-      END IF
+*        K is the main loop index, increasing from 1 to N in steps of
+*        KB, where KB is the number of columns factorized by ZLASYF;
+*        KB is either NB or NB-1, or N-K+1 for the last block
 *
-      DO 10 K = IFST + M1, ILST + M2, M3
+         K = 1
+   20    CONTINUE
 *
-*        Interchange the k-th and (k+1)-th diagonal elements.
+*        If K > N, exit from loop
 *
-         T11 = T( K, K )
-         T22 = T( K+1, K+1 )
+         IF( K.GT.N )
+     $      GO TO 40
 *
-*        Determine the transformation to perform the interchange.
+         IF( K.LE.N-NB ) THEN
 *
-         CALL ZLARTG( T( K, K+1 ), T22-T11, CS, SN, TEMP )
+*           Factorize columns k:k+kb-1 of A and use blocked code to
+*           update columns k+kb:n
 *
-*        Apply transformation to the matrix T.
+            CALL ZLASYF( UPLO, N-K+1, NB, KB, A( K, K ), LDA, IPIV( K ),
+     $                   WORK, N, IINFO )
+         ELSE
 *
-         IF( K+2.LE.N )
-     $      CALL ZROT( N-K-1, T( K, K+2 ), LDT, T( K+1, K+2 ), LDT, CS,
-     $                 SN )
-         CALL ZROT( K-1, T( 1, K ), 1, T( 1, K+1 ), 1, CS,
-     $              DCONJG( SN ) )
+*           Use unblocked code to factorize columns k:n of A
 *
-         T( K, K ) = T22
-         T( K+1, K+1 ) = T11
+            CALL ZSYTF2( UPLO, N-K+1, A( K, K ), LDA, IPIV( K ), IINFO )
+            KB = N - K + 1
+         END IF
 *
-         IF( WANTQ ) THEN
+*        Set INFO on the first occurrence of a zero pivot
 *
-*           Accumulate transformation in the matrix Q.
+         IF( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $      INFO = IINFO + K - 1
 *
-            CALL ZROT( N, Q( 1, K ), 1, Q( 1, K+1 ), 1, CS,
-     $                 DCONJG( SN ) )
-         END IF
+*        Adjust IPIV
 *
-   10 CONTINUE
+         DO 30 J = K, K + KB - 1
+            IF( IPIV( J ).GT.0 ) THEN
+               IPIV( J ) = IPIV( J ) + K - 1
+            ELSE
+               IPIV( J ) = IPIV( J ) - K + 1
+            END IF
+   30    CONTINUE
 *
+*        Increase K and return to the start of the main loop
+*
+         K = K + KB
+         GO TO 20
+*
+      END IF
+*
+   40 CONTINUE
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZTREXC
+*     End of ZSYTRF
 *
       END
-*> \brief \b ZTRTRS
+*> \brief \b ZSYTRI
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -26527,27 +43089,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZTRTRS + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrtrs.f"> 
+*> Download ZSYTRI + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zsytri.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrtrs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zsytri.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrtrs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zsytri.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
-*                          INFO )
+*       SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          DIAG, TRANS, UPLO
-*       INTEGER            INFO, LDA, LDB, N, NRHS
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), B( LDB, * )
+*       INTEGER            IPIV( * )
+*       COMPLEX*16         A( LDA, * ), WORK( * )
 *       ..
 *  
 *
@@ -26556,12 +43118,9 @@
 *>
 *> \verbatim
 *>
-*> ZTRTRS solves a triangular system of the form
-*>
-*>    A * X = B,  A**T * X = B,  or  A**H * X = B,
-*>
-*> where A is a triangular matrix of order N, and B is an N-by-NRHS
-*> matrix.  A check is made to verify that A is nonsingular.
+*> ZSYTRI computes the inverse of a complex symmetric indefinite matrix
+*> A using the factorization A = U*D*U**T or A = L*D*L**T computed by
+*> ZSYTRF.
 *> \endverbatim
 *
 *  Arguments:
@@ -26570,24 +43129,10 @@
 *> \param[in] UPLO
 *> \verbatim
 *>          UPLO is CHARACTER*1
-*>          = 'U':  A is upper triangular;
-*>          = 'L':  A is lower triangular.
-*> \endverbatim
-*>
-*> \param[in] TRANS
-*> \verbatim
-*>          TRANS is CHARACTER*1
-*>          Specifies the form of the system of equations:
-*>          = 'N':  A * X = B     (No transpose)
-*>          = 'T':  A**T * X = B  (Transpose)
-*>          = 'C':  A**H * X = B  (Conjugate transpose)
-*> \endverbatim
-*>
-*> \param[in] DIAG
-*> \verbatim
-*>          DIAG is CHARACTER*1
-*>          = 'N':  A is non-unit triangular;
-*>          = 'U':  A is unit triangular.
+*>          Specifies whether the details of the factorization are stored
+*>          as an upper or lower triangular matrix.
+*>          = 'U':  Upper triangular, form is A = U*D*U**T;
+*>          = 'L':  Lower triangular, form is A = L*D*L**T.
 *> \endverbatim
 *>
 *> \param[in] N
@@ -26596,24 +43141,18 @@
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] NRHS
-*> \verbatim
-*>          NRHS is INTEGER
-*>          The number of right hand sides, i.e., the number of columns
-*>          of the matrix B.  NRHS >= 0.
-*> \endverbatim
-*>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          The triangular matrix A.  If UPLO = 'U', the leading N-by-N
-*>          upper triangular part of the array A contains the upper
-*>          triangular matrix, and the strictly lower triangular part of
-*>          A is not referenced.  If UPLO = 'L', the leading N-by-N lower
-*>          triangular part of the array A contains the lower triangular
-*>          matrix, and the strictly upper triangular part of A is not
-*>          referenced.  If DIAG = 'U', the diagonal elements of A are
-*>          also not referenced and are assumed to be 1.
+*>          On entry, the block diagonal matrix D and the multipliers
+*>          used to obtain the factor U or L as computed by ZSYTRF.
+*>
+*>          On exit, if INFO = 0, the (symmetric) inverse of the original
+*>          matrix.  If UPLO = 'U', the upper triangular part of the
+*>          inverse is formed and the part of A below the diagonal is not
+*>          referenced; if UPLO = 'L' the lower triangular part of the
+*>          inverse is formed and the part of A above the diagonal is
+*>          not referenced.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -26622,27 +43161,25 @@
 *>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in,out] B
+*> \param[in] IPIV
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
-*>          On entry, the right hand side matrix B.
-*>          On exit, if INFO = 0, the solution matrix X.
+*>          IPIV is INTEGER array, dimension (N)
+*>          Details of the interchanges and the block structure of D
+*>          as determined by ZSYTRF.
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[out] WORK
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B.  LDB >= max(1,N).
+*>          WORK is COMPLEX*16 array, dimension (2*N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
+*>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
-*>          > 0: if INFO = i, the i-th diagonal element of A is zero,
-*>               indicating that the matrix is singular and the solutions
-*>               X have not been computed.
+*>          > 0: if INFO = i, D(i,i) = 0; the matrix is singular and its
+*>               inverse could not be computed.
 *> \endverbatim
 *
 *  Authors:
@@ -26655,11 +43192,10 @@
 *
 *> \date November 2011
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
-     $                   INFO )
+      SUBROUTINE ZSYTRI( UPLO, N, A, LDA, IPIV, WORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -26667,57 +43203,52 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          DIAG, TRANS, UPLO
-      INTEGER            INFO, LDA, LDB, N, NRHS
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), B( LDB, * )
+      INTEGER            IPIV( * )
+      COMPLEX*16         A( LDA, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            NOUNIT
+      LOGICAL            UPPER
+      INTEGER            K, KP, KSTEP
+      COMPLEX*16         AK, AKKP1, AKP1, D, T, TEMP
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      COMPLEX*16         ZDOTU
+      EXTERNAL           LSAME, ZDOTU
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZTRSM
+      EXTERNAL           XERBLA, ZCOPY, ZSWAP, ZSYMV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          ABS, MAX
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input parameters.
 *
       INFO = 0
-      NOUNIT = LSAME( DIAG, 'N' )
-      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
-     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
-         INFO = -2
-      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
-         INFO = -3
       ELSE IF( N.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( NRHS.LT.0 ) THEN
-         INFO = -5
+         INFO = -2
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -7
-      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
-         INFO = -9
+         INFO = -4
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZTRTRS', -INFO )
+         CALL XERBLA( 'ZSYTRI', -INFO )
          RETURN
       END IF
 *
@@ -26726,27 +43257,214 @@
       IF( N.EQ.0 )
      $   RETURN
 *
-*     Check for singularity.
+*     Check that the diagonal matrix D is nonsingular.
 *
-      IF( NOUNIT ) THEN
-         DO 10 INFO = 1, N
-            IF( A( INFO, INFO ).EQ.ZERO )
+      IF( UPPER ) THEN
+*
+*        Upper triangular storage: examine D from bottom to top
+*
+         DO 10 INFO = N, 1, -1
+            IF( IPIV( INFO ).GT.0 .AND. A( INFO, INFO ).EQ.ZERO )
      $         RETURN
    10    CONTINUE
+      ELSE
+*
+*        Lower triangular storage: examine D from top to bottom.
+*
+         DO 20 INFO = 1, N
+            IF( IPIV( INFO ).GT.0 .AND. A( INFO, INFO ).EQ.ZERO )
+     $         RETURN
+   20    CONTINUE
       END IF
       INFO = 0
 *
-*     Solve A * x = b,  A**T * x = b,  or  A**H * x = b.
+      IF( UPPER ) THEN
 *
-      CALL ZTRSM( 'Left', UPLO, TRANS, DIAG, N, NRHS, ONE, A, LDA, B,
-     $            LDB )
+*        Compute inv(A) from the factorization A = U*D*U**T.
+*
+*        K is the main loop index, increasing from 1 to N in steps of
+*        1 or 2, depending on the size of the diagonal blocks.
+*
+         K = 1
+   30    CONTINUE
+*
+*        If K > N, exit from loop.
+*
+         IF( K.GT.N )
+     $      GO TO 40
+*
+         IF( IPIV( K ).GT.0 ) THEN
+*
+*           1 x 1 diagonal block
+*
+*           Invert the diagonal block.
+*
+            A( K, K ) = ONE / A( K, K )
+*
+*           Compute column K of the inverse.
+*
+            IF( K.GT.1 ) THEN
+               CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
+               CALL ZSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
+     $                     A( 1, K ), 1 )
+               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1, K ),
+     $                     1 )
+            END IF
+            KSTEP = 1
+         ELSE
+*
+*           2 x 2 diagonal block
+*
+*           Invert the diagonal block.
+*
+            T = A( K, K+1 )
+            AK = A( K, K ) / T
+            AKP1 = A( K+1, K+1 ) / T
+            AKKP1 = A( K, K+1 ) / T
+            D = T*( AK*AKP1-ONE )
+            A( K, K ) = AKP1 / D
+            A( K+1, K+1 ) = AK / D
+            A( K, K+1 ) = -AKKP1 / D
+*
+*           Compute columns K and K+1 of the inverse.
+*
+            IF( K.GT.1 ) THEN
+               CALL ZCOPY( K-1, A( 1, K ), 1, WORK, 1 )
+               CALL ZSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
+     $                     A( 1, K ), 1 )
+               A( K, K ) = A( K, K ) - ZDOTU( K-1, WORK, 1, A( 1, K ),
+     $                     1 )
+               A( K, K+1 ) = A( K, K+1 ) -
+     $                       ZDOTU( K-1, A( 1, K ), 1, A( 1, K+1 ), 1 )
+               CALL ZCOPY( K-1, A( 1, K+1 ), 1, WORK, 1 )
+               CALL ZSYMV( UPLO, K-1, -ONE, A, LDA, WORK, 1, ZERO,
+     $                     A( 1, K+1 ), 1 )
+               A( K+1, K+1 ) = A( K+1, K+1 ) -
+     $                         ZDOTU( K-1, WORK, 1, A( 1, K+1 ), 1 )
+            END IF
+            KSTEP = 2
+         END IF
+*
+         KP = ABS( IPIV( K ) )
+         IF( KP.NE.K ) THEN
+*
+*           Interchange rows and columns K and KP in the leading
+*           submatrix A(1:k+1,1:k+1)
+*
+            CALL ZSWAP( KP-1, A( 1, K ), 1, A( 1, KP ), 1 )
+            CALL ZSWAP( K-KP-1, A( KP+1, K ), 1, A( KP, KP+1 ), LDA )
+            TEMP = A( K, K )
+            A( K, K ) = A( KP, KP )
+            A( KP, KP ) = TEMP
+            IF( KSTEP.EQ.2 ) THEN
+               TEMP = A( K, K+1 )
+               A( K, K+1 ) = A( KP, K+1 )
+               A( KP, K+1 ) = TEMP
+            END IF
+         END IF
+*
+         K = K + KSTEP
+         GO TO 30
+   40    CONTINUE
+*
+      ELSE
+*
+*        Compute inv(A) from the factorization A = L*D*L**T.
+*
+*        K is the main loop index, increasing from 1 to N in steps of
+*        1 or 2, depending on the size of the diagonal blocks.
+*
+         K = N
+   50    CONTINUE
+*
+*        If K < 1, exit from loop.
+*
+         IF( K.LT.1 )
+     $      GO TO 60
+*
+         IF( IPIV( K ).GT.0 ) THEN
+*
+*           1 x 1 diagonal block
+*
+*           Invert the diagonal block.
+*
+            A( K, K ) = ONE / A( K, K )
+*
+*           Compute column K of the inverse.
+*
+            IF( K.LT.N ) THEN
+               CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
+               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+     $                     ZERO, A( K+1, K ), 1 )
+               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1, K ),
+     $                     1 )
+            END IF
+            KSTEP = 1
+         ELSE
+*
+*           2 x 2 diagonal block
+*
+*           Invert the diagonal block.
+*
+            T = A( K, K-1 )
+            AK = A( K-1, K-1 ) / T
+            AKP1 = A( K, K ) / T
+            AKKP1 = A( K, K-1 ) / T
+            D = T*( AK*AKP1-ONE )
+            A( K-1, K-1 ) = AKP1 / D
+            A( K, K ) = AK / D
+            A( K, K-1 ) = -AKKP1 / D
+*
+*           Compute columns K-1 and K of the inverse.
+*
+            IF( K.LT.N ) THEN
+               CALL ZCOPY( N-K, A( K+1, K ), 1, WORK, 1 )
+               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+     $                     ZERO, A( K+1, K ), 1 )
+               A( K, K ) = A( K, K ) - ZDOTU( N-K, WORK, 1, A( K+1, K ),
+     $                     1 )
+               A( K, K-1 ) = A( K, K-1 ) -
+     $                       ZDOTU( N-K, A( K+1, K ), 1, A( K+1, K-1 ),
+     $                       1 )
+               CALL ZCOPY( N-K, A( K+1, K-1 ), 1, WORK, 1 )
+               CALL ZSYMV( UPLO, N-K, -ONE, A( K+1, K+1 ), LDA, WORK, 1,
+     $                     ZERO, A( K+1, K-1 ), 1 )
+               A( K-1, K-1 ) = A( K-1, K-1 ) -
+     $                         ZDOTU( N-K, WORK, 1, A( K+1, K-1 ), 1 )
+            END IF
+            KSTEP = 2
+         END IF
+*
+         KP = ABS( IPIV( K ) )
+         IF( KP.NE.K ) THEN
+*
+*           Interchange rows and columns K and KP in the trailing
+*           submatrix A(k-1:n,k-1:n)
+*
+            IF( KP.LT.N )
+     $         CALL ZSWAP( N-KP, A( KP+1, K ), 1, A( KP+1, KP ), 1 )
+            CALL ZSWAP( KP-K-1, A( K+1, K ), 1, A( KP, K+1 ), LDA )
+            TEMP = A( K, K )
+            A( K, K ) = A( KP, KP )
+            A( KP, KP ) = TEMP
+            IF( KSTEP.EQ.2 ) THEN
+               TEMP = A( K, K-1 )
+               A( K, K-1 ) = A( KP, K-1 )
+               A( KP, K-1 ) = TEMP
+            END IF
+         END IF
+*
+         K = K - KSTEP
+         GO TO 50
+   60    CONTINUE
+      END IF
 *
       RETURN
 *
-*     End of ZTRTRS
+*     End of ZSYTRI
 *
       END
-*> \brief \b ZUNG2L generates all or part of the unitary matrix Q from a QL factorization determined by cgeqlf (unblocked algorithm).
+*> \brief \b ZTGEVC
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -26754,97 +43472,201 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNG2L + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zung2l.f"> 
+*> Download ZTGEVC + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgevc.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zung2l.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztgevc.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zung2l.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgevc.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
+*       SUBROUTINE ZTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
+*                          LDVL, VR, LDVR, MM, M, WORK, RWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, M, N
+*       CHARACTER          HOWMNY, SIDE
+*       INTEGER            INFO, LDP, LDS, LDVL, LDVR, M, MM, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       LOGICAL            SELECT( * )
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         P( LDP, * ), S( LDS, * ), VL( LDVL, * ),
+*      $                   VR( LDVR, * ), WORK( * )
 *       ..
 *  
+*  
 *
 *> \par Purpose:
 *  =============
 *>
 *> \verbatim
 *>
-*> ZUNG2L generates an m by n complex matrix Q with orthonormal columns,
-*> which is defined as the last n columns of a product of k elementary
-*> reflectors of order m
-*>
-*>       Q  =  H(k) . . . H(2) H(1)
-*>
-*> as returned by ZGEQLF.
+*> ZTGEVC computes some or all of the right and/or left eigenvectors of
+*> a pair of complex matrices (S,P), where S and P are upper triangular.
+*> Matrix pairs of this type are produced by the generalized Schur
+*> factorization of a complex matrix pair (A,B):
+*> 
+*>    A = Q*S*Z**H,  B = Q*P*Z**H
+*> 
+*> as computed by ZGGHRD + ZHGEQZ.
+*> 
+*> The right eigenvector x and the left eigenvector y of (S,P)
+*> corresponding to an eigenvalue w are defined by:
+*> 
+*>    S*x = w*P*x,  (y**H)*S = w*(y**H)*P,
+*> 
+*> where y**H denotes the conjugate tranpose of y.
+*> The eigenvalues are not input to this routine, but are computed
+*> directly from the diagonal elements of S and P.
+*> 
+*> This routine returns the matrices X and/or Y of right and left
+*> eigenvectors of (S,P), or the products Z*X and/or Q*Y,
+*> where Z and Q are input matrices.
+*> If Q and Z are the unitary factors from the generalized Schur
+*> factorization of a matrix pair (A,B), then Z*X and Q*Y
+*> are the matrices of right and left eigenvectors of (A,B).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] SIDE
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          SIDE is CHARACTER*1
+*>          = 'R': compute right eigenvectors only;
+*>          = 'L': compute left eigenvectors only;
+*>          = 'B': compute both right and left eigenvectors.
+*> \endverbatim
+*>
+*> \param[in] HOWMNY
+*> \verbatim
+*>          HOWMNY is CHARACTER*1
+*>          = 'A': compute all right and/or left eigenvectors;
+*>          = 'B': compute all right and/or left eigenvectors,
+*>                 backtransformed by the matrices in VR and/or VL;
+*>          = 'S': compute selected right and/or left eigenvectors,
+*>                 specified by the logical array SELECT.
+*> \endverbatim
+*>
+*> \param[in] SELECT
+*> \verbatim
+*>          SELECT is LOGICAL array, dimension (N)
+*>          If HOWMNY='S', SELECT specifies the eigenvectors to be
+*>          computed.  The eigenvector corresponding to the j-th
+*>          eigenvalue is computed if SELECT(j) = .TRUE..
+*>          Not referenced if HOWMNY = 'A' or 'B'.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix Q. M >= N >= 0.
+*>          The order of the matrices S and P.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] S
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. N >= K >= 0.
+*>          S is COMPLEX*16 array, dimension (LDS,N)
+*>          The upper triangular matrix S from a generalized Schur
+*>          factorization, as computed by ZHGEQZ.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] LDS
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the (n-k+i)-th column must contain the vector which
-*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by ZGEQLF in the last k columns of its array
-*>          argument A.
-*>          On exit, the m-by-n matrix Q.
+*>          LDS is INTEGER
+*>          The leading dimension of array S.  LDS >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in] P
 *> \verbatim
-*>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          P is COMPLEX*16 array, dimension (LDP,N)
+*>          The upper triangular matrix P from a generalized Schur
+*>          factorization, as computed by ZHGEQZ.  P must have real
+*>          diagonal elements.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] LDP
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEQLF.
+*>          LDP is INTEGER
+*>          The leading dimension of array P.  LDP >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] VL
+*> \verbatim
+*>          VL is COMPLEX*16 array, dimension (LDVL,MM)
+*>          On entry, if SIDE = 'L' or 'B' and HOWMNY = 'B', VL must
+*>          contain an N-by-N matrix Q (usually the unitary matrix Q
+*>          of left Schur vectors returned by ZHGEQZ).
+*>          On exit, if SIDE = 'L' or 'B', VL contains:
+*>          if HOWMNY = 'A', the matrix Y of left eigenvectors of (S,P);
+*>          if HOWMNY = 'B', the matrix Q*Y;
+*>          if HOWMNY = 'S', the left eigenvectors of (S,P) specified by
+*>                      SELECT, stored consecutively in the columns of
+*>                      VL, in the same order as their eigenvalues.
+*>          Not referenced if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDVL
+*> \verbatim
+*>          LDVL is INTEGER
+*>          The leading dimension of array VL.  LDVL >= 1, and if
+*>          SIDE = 'L' or 'l' or 'B' or 'b', LDVL >= N.
+*> \endverbatim
+*>
+*> \param[in,out] VR
+*> \verbatim
+*>          VR is COMPLEX*16 array, dimension (LDVR,MM)
+*>          On entry, if SIDE = 'R' or 'B' and HOWMNY = 'B', VR must
+*>          contain an N-by-N matrix Q (usually the unitary matrix Z
+*>          of right Schur vectors returned by ZHGEQZ).
+*>          On exit, if SIDE = 'R' or 'B', VR contains:
+*>          if HOWMNY = 'A', the matrix X of right eigenvectors of (S,P);
+*>          if HOWMNY = 'B', the matrix Z*X;
+*>          if HOWMNY = 'S', the right eigenvectors of (S,P) specified by
+*>                      SELECT, stored consecutively in the columns of
+*>                      VR, in the same order as their eigenvalues.
+*>          Not referenced if SIDE = 'L'.
+*> \endverbatim
+*>
+*> \param[in] LDVR
+*> \verbatim
+*>          LDVR is INTEGER
+*>          The leading dimension of the array VR.  LDVR >= 1, and if
+*>          SIDE = 'R' or 'B', LDVR >= N.
+*> \endverbatim
+*>
+*> \param[in] MM
+*> \verbatim
+*>          MM is INTEGER
+*>          The number of columns in the arrays VL and/or VR. MM >= M.
+*> \endverbatim
+*>
+*> \param[out] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of columns in the arrays VL and/or VR actually
+*>          used to store the eigenvectors.  If HOWMNY = 'A' or 'B', M
+*>          is set to N.  Each selected eigenvector occupies one column.
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (N)
+*>          WORK is COMPLEX*16 array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (2*N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -i, the i-th argument has an illegal value
+*>          = 0:  successful exit.
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
 *
 *  Authors:
@@ -26855,97 +43677,531 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16GEcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
+      SUBROUTINE ZTGEVC( SIDE, HOWMNY, SELECT, N, S, LDS, P, LDP, VL,
+     $                   LDVL, VR, LDVR, MM, M, WORK, RWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, M, N
+      CHARACTER          HOWMNY, SIDE
+      INTEGER            INFO, LDP, LDS, LDVL, LDVR, M, MM, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      LOGICAL            SELECT( * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         P( LDP, * ), S( LDS, * ), VL( LDVL, * ),
+     $                   VR( LDVR, * ), WORK( * )
 *     ..
 *
+*
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, II, J, L
+      LOGICAL            COMPL, COMPR, ILALL, ILBACK, ILBBAD, ILCOMP,
+     $                   LSA, LSB
+      INTEGER            I, IBEG, IEIG, IEND, IHWMNY, IM, ISIDE, ISRC,
+     $                   J, JE, JR
+      DOUBLE PRECISION   ACOEFA, ACOEFF, ANORM, ASCALE, BCOEFA, BIG,
+     $                   BIGNUM, BNORM, BSCALE, DMIN, SAFMIN, SBETA,
+     $                   SCALE, SMALL, TEMP, ULP, XMAX
+      COMPLEX*16         BCOEFF, CA, CB, D, SALPHA, SUM, SUMA, SUMB, X
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      DOUBLE PRECISION   DLAMCH
+      COMPLEX*16         ZLADIV
+      EXTERNAL           LSAME, DLAMCH, ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZSCAL
+      EXTERNAL           DLABAD, XERBLA, ZGEMV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
+*     ..
+*     .. Statement Functions ..
+      DOUBLE PRECISION   ABS1
+*     ..
+*     .. Statement Function definitions ..
+      ABS1( X ) = ABS( DBLE( X ) ) + ABS( DIMAG( X ) )
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and Test the input parameters
+*
+      IF( LSAME( HOWMNY, 'A' ) ) THEN
+         IHWMNY = 1
+         ILALL = .TRUE.
+         ILBACK = .FALSE.
+      ELSE IF( LSAME( HOWMNY, 'S' ) ) THEN
+         IHWMNY = 2
+         ILALL = .FALSE.
+         ILBACK = .FALSE.
+      ELSE IF( LSAME( HOWMNY, 'B' ) ) THEN
+         IHWMNY = 3
+         ILALL = .TRUE.
+         ILBACK = .TRUE.
+      ELSE
+         IHWMNY = -1
+      END IF
+*
+      IF( LSAME( SIDE, 'R' ) ) THEN
+         ISIDE = 1
+         COMPL = .FALSE.
+         COMPR = .TRUE.
+      ELSE IF( LSAME( SIDE, 'L' ) ) THEN
+         ISIDE = 2
+         COMPL = .TRUE.
+         COMPR = .FALSE.
+      ELSE IF( LSAME( SIDE, 'B' ) ) THEN
+         ISIDE = 3
+         COMPL = .TRUE.
+         COMPR = .TRUE.
+      ELSE
+         ISIDE = -1
+      END IF
 *
       INFO = 0
-      IF( M.LT.0 ) THEN
+      IF( ISIDE.LT.0 ) THEN
          INFO = -1
-      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
+      ELSE IF( IHWMNY.LT.0 ) THEN
          INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDS.LT.MAX( 1, N ) ) THEN
+         INFO = -6
+      ELSE IF( LDP.LT.MAX( 1, N ) ) THEN
+         INFO = -8
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNG2L', -INFO )
+         CALL XERBLA( 'ZTGEVC', -INFO )
+         RETURN
+      END IF
+*
+*     Count the number of eigenvectors
+*
+      IF( .NOT.ILALL ) THEN
+         IM = 0
+         DO 10 J = 1, N
+            IF( SELECT( J ) )
+     $         IM = IM + 1
+   10    CONTINUE
+      ELSE
+         IM = N
+      END IF
+*
+*     Check diagonal of B
+*
+      ILBBAD = .FALSE.
+      DO 20 J = 1, N
+         IF( DIMAG( P( J, J ) ).NE.ZERO )
+     $      ILBBAD = .TRUE.
+   20 CONTINUE
+*
+      IF( ILBBAD ) THEN
+         INFO = -7
+      ELSE IF( COMPL .AND. LDVL.LT.N .OR. LDVL.LT.1 ) THEN
+         INFO = -10
+      ELSE IF( COMPR .AND. LDVR.LT.N .OR. LDVR.LT.1 ) THEN
+         INFO = -12
+      ELSE IF( MM.LT.IM ) THEN
+         INFO = -13
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZTGEVC', -INFO )
          RETURN
       END IF
 *
-*     Quick return if possible
+*     Quick return if possible
+*
+      M = IM
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     Machine Constants
+*
+      SAFMIN = DLAMCH( 'Safe minimum' )
+      BIG = ONE / SAFMIN
+      CALL DLABAD( SAFMIN, BIG )
+      ULP = DLAMCH( 'Epsilon' )*DLAMCH( 'Base' )
+      SMALL = SAFMIN*N / ULP
+      BIG = ONE / SMALL
+      BIGNUM = ONE / ( SAFMIN*N )
+*
+*     Compute the 1-norm of each column of the strictly upper triangular
+*     part of A and B to check for possible overflow in the triangular
+*     solver.
+*
+      ANORM = ABS1( S( 1, 1 ) )
+      BNORM = ABS1( P( 1, 1 ) )
+      RWORK( 1 ) = ZERO
+      RWORK( N+1 ) = ZERO
+      DO 40 J = 2, N
+         RWORK( J ) = ZERO
+         RWORK( N+J ) = ZERO
+         DO 30 I = 1, J - 1
+            RWORK( J ) = RWORK( J ) + ABS1( S( I, J ) )
+            RWORK( N+J ) = RWORK( N+J ) + ABS1( P( I, J ) )
+   30    CONTINUE
+         ANORM = MAX( ANORM, RWORK( J )+ABS1( S( J, J ) ) )
+         BNORM = MAX( BNORM, RWORK( N+J )+ABS1( P( J, J ) ) )
+   40 CONTINUE
+*
+      ASCALE = ONE / MAX( ANORM, SAFMIN )
+      BSCALE = ONE / MAX( BNORM, SAFMIN )
+*
+*     Left eigenvectors
+*
+      IF( COMPL ) THEN
+         IEIG = 0
+*
+*        Main loop over eigenvalues
+*
+         DO 140 JE = 1, N
+            IF( ILALL ) THEN
+               ILCOMP = .TRUE.
+            ELSE
+               ILCOMP = SELECT( JE )
+            END IF
+            IF( ILCOMP ) THEN
+               IEIG = IEIG + 1
+*
+               IF( ABS1( S( JE, JE ) ).LE.SAFMIN .AND.
+     $             ABS( DBLE( P( JE, JE ) ) ).LE.SAFMIN ) THEN
+*
+*                 Singular matrix pencil -- return unit eigenvector
+*
+                  DO 50 JR = 1, N
+                     VL( JR, IEIG ) = CZERO
+   50             CONTINUE
+                  VL( IEIG, IEIG ) = CONE
+                  GO TO 140
+               END IF
+*
+*              Non-singular eigenvalue:
+*              Compute coefficients  a  and  b  in
+*                   H
+*                 y  ( a A - b B ) = 0
+*
+               TEMP = ONE / MAX( ABS1( S( JE, JE ) )*ASCALE,
+     $                ABS( DBLE( P( JE, JE ) ) )*BSCALE, SAFMIN )
+               SALPHA = ( TEMP*S( JE, JE ) )*ASCALE
+               SBETA = ( TEMP*DBLE( P( JE, JE ) ) )*BSCALE
+               ACOEFF = SBETA*ASCALE
+               BCOEFF = SALPHA*BSCALE
+*
+*              Scale to avoid underflow
+*
+               LSA = ABS( SBETA ).GE.SAFMIN .AND. ABS( ACOEFF ).LT.SMALL
+               LSB = ABS1( SALPHA ).GE.SAFMIN .AND. ABS1( BCOEFF ).LT.
+     $               SMALL
+*
+               SCALE = ONE
+               IF( LSA )
+     $            SCALE = ( SMALL / ABS( SBETA ) )*MIN( ANORM, BIG )
+               IF( LSB )
+     $            SCALE = MAX( SCALE, ( SMALL / ABS1( SALPHA ) )*
+     $                    MIN( BNORM, BIG ) )
+               IF( LSA .OR. LSB ) THEN
+                  SCALE = MIN( SCALE, ONE /
+     $                    ( SAFMIN*MAX( ONE, ABS( ACOEFF ),
+     $                    ABS1( BCOEFF ) ) ) )
+                  IF( LSA ) THEN
+                     ACOEFF = ASCALE*( SCALE*SBETA )
+                  ELSE
+                     ACOEFF = SCALE*ACOEFF
+                  END IF
+                  IF( LSB ) THEN
+                     BCOEFF = BSCALE*( SCALE*SALPHA )
+                  ELSE
+                     BCOEFF = SCALE*BCOEFF
+                  END IF
+               END IF
+*
+               ACOEFA = ABS( ACOEFF )
+               BCOEFA = ABS1( BCOEFF )
+               XMAX = ONE
+               DO 60 JR = 1, N
+                  WORK( JR ) = CZERO
+   60          CONTINUE
+               WORK( JE ) = CONE
+               DMIN = MAX( ULP*ACOEFA*ANORM, ULP*BCOEFA*BNORM, SAFMIN )
+*
+*                                              H
+*              Triangular solve of  (a A - b B)  y = 0
+*
+*                                      H
+*              (rowwise in  (a A - b B) , or columnwise in a A - b B)
+*
+               DO 100 J = JE + 1, N
+*
+*                 Compute
+*                       j-1
+*                 SUM = sum  conjg( a*S(k,j) - b*P(k,j) )*x(k)
+*                       k=je
+*                 (Scale if necessary)
+*
+                  TEMP = ONE / XMAX
+                  IF( ACOEFA*RWORK( J )+BCOEFA*RWORK( N+J ).GT.BIGNUM*
+     $                TEMP ) THEN
+                     DO 70 JR = JE, J - 1
+                        WORK( JR ) = TEMP*WORK( JR )
+   70                CONTINUE
+                     XMAX = ONE
+                  END IF
+                  SUMA = CZERO
+                  SUMB = CZERO
+*
+                  DO 80 JR = JE, J - 1
+                     SUMA = SUMA + DCONJG( S( JR, J ) )*WORK( JR )
+                     SUMB = SUMB + DCONJG( P( JR, J ) )*WORK( JR )
+   80             CONTINUE
+                  SUM = ACOEFF*SUMA - DCONJG( BCOEFF )*SUMB
+*
+*                 Form x(j) = - SUM / conjg( a*S(j,j) - b*P(j,j) )
+*
+*                 with scaling and perturbation of the denominator
+*
+                  D = DCONJG( ACOEFF*S( J, J )-BCOEFF*P( J, J ) )
+                  IF( ABS1( D ).LE.DMIN )
+     $               D = DCMPLX( DMIN )
+*
+                  IF( ABS1( D ).LT.ONE ) THEN
+                     IF( ABS1( SUM ).GE.BIGNUM*ABS1( D ) ) THEN
+                        TEMP = ONE / ABS1( SUM )
+                        DO 90 JR = JE, J - 1
+                           WORK( JR ) = TEMP*WORK( JR )
+   90                   CONTINUE
+                        XMAX = TEMP*XMAX
+                        SUM = TEMP*SUM
+                     END IF
+                  END IF
+                  WORK( J ) = ZLADIV( -SUM, D )
+                  XMAX = MAX( XMAX, ABS1( WORK( J ) ) )
+  100          CONTINUE
+*
+*              Back transform eigenvector if HOWMNY='B'.
+*
+               IF( ILBACK ) THEN
+                  CALL ZGEMV( 'N', N, N+1-JE, CONE, VL( 1, JE ), LDVL,
+     $                        WORK( JE ), 1, CZERO, WORK( N+1 ), 1 )
+                  ISRC = 2
+                  IBEG = 1
+               ELSE
+                  ISRC = 1
+                  IBEG = JE
+               END IF
+*
+*              Copy and scale eigenvector into column of VL
+*
+               XMAX = ZERO
+               DO 110 JR = IBEG, N
+                  XMAX = MAX( XMAX, ABS1( WORK( ( ISRC-1 )*N+JR ) ) )
+  110          CONTINUE
+*
+               IF( XMAX.GT.SAFMIN ) THEN
+                  TEMP = ONE / XMAX
+                  DO 120 JR = IBEG, N
+                     VL( JR, IEIG ) = TEMP*WORK( ( ISRC-1 )*N+JR )
+  120             CONTINUE
+               ELSE
+                  IBEG = N + 1
+               END IF
+*
+               DO 130 JR = 1, IBEG - 1
+                  VL( JR, IEIG ) = CZERO
+  130          CONTINUE
+*
+            END IF
+  140    CONTINUE
+      END IF
+*
+*     Right eigenvectors
+*
+      IF( COMPR ) THEN
+         IEIG = IM + 1
+*
+*        Main loop over eigenvalues
+*
+         DO 250 JE = N, 1, -1
+            IF( ILALL ) THEN
+               ILCOMP = .TRUE.
+            ELSE
+               ILCOMP = SELECT( JE )
+            END IF
+            IF( ILCOMP ) THEN
+               IEIG = IEIG - 1
+*
+               IF( ABS1( S( JE, JE ) ).LE.SAFMIN .AND.
+     $             ABS( DBLE( P( JE, JE ) ) ).LE.SAFMIN ) THEN
+*
+*                 Singular matrix pencil -- return unit eigenvector
+*
+                  DO 150 JR = 1, N
+                     VR( JR, IEIG ) = CZERO
+  150             CONTINUE
+                  VR( IEIG, IEIG ) = CONE
+                  GO TO 250
+               END IF
+*
+*              Non-singular eigenvalue:
+*              Compute coefficients  a  and  b  in
+*
+*              ( a A - b B ) x  = 0
+*
+               TEMP = ONE / MAX( ABS1( S( JE, JE ) )*ASCALE,
+     $                ABS( DBLE( P( JE, JE ) ) )*BSCALE, SAFMIN )
+               SALPHA = ( TEMP*S( JE, JE ) )*ASCALE
+               SBETA = ( TEMP*DBLE( P( JE, JE ) ) )*BSCALE
+               ACOEFF = SBETA*ASCALE
+               BCOEFF = SALPHA*BSCALE
+*
+*              Scale to avoid underflow
+*
+               LSA = ABS( SBETA ).GE.SAFMIN .AND. ABS( ACOEFF ).LT.SMALL
+               LSB = ABS1( SALPHA ).GE.SAFMIN .AND. ABS1( BCOEFF ).LT.
+     $               SMALL
+*
+               SCALE = ONE
+               IF( LSA )
+     $            SCALE = ( SMALL / ABS( SBETA ) )*MIN( ANORM, BIG )
+               IF( LSB )
+     $            SCALE = MAX( SCALE, ( SMALL / ABS1( SALPHA ) )*
+     $                    MIN( BNORM, BIG ) )
+               IF( LSA .OR. LSB ) THEN
+                  SCALE = MIN( SCALE, ONE /
+     $                    ( SAFMIN*MAX( ONE, ABS( ACOEFF ),
+     $                    ABS1( BCOEFF ) ) ) )
+                  IF( LSA ) THEN
+                     ACOEFF = ASCALE*( SCALE*SBETA )
+                  ELSE
+                     ACOEFF = SCALE*ACOEFF
+                  END IF
+                  IF( LSB ) THEN
+                     BCOEFF = BSCALE*( SCALE*SALPHA )
+                  ELSE
+                     BCOEFF = SCALE*BCOEFF
+                  END IF
+               END IF
+*
+               ACOEFA = ABS( ACOEFF )
+               BCOEFA = ABS1( BCOEFF )
+               XMAX = ONE
+               DO 160 JR = 1, N
+                  WORK( JR ) = CZERO
+  160          CONTINUE
+               WORK( JE ) = CONE
+               DMIN = MAX( ULP*ACOEFA*ANORM, ULP*BCOEFA*BNORM, SAFMIN )
+*
+*              Triangular solve of  (a A - b B) x = 0  (columnwise)
+*
+*              WORK(1:j-1) contains sums w,
+*              WORK(j+1:JE) contains x
+*
+               DO 170 JR = 1, JE - 1
+                  WORK( JR ) = ACOEFF*S( JR, JE ) - BCOEFF*P( JR, JE )
+  170          CONTINUE
+               WORK( JE ) = CONE
+*
+               DO 210 J = JE - 1, 1, -1
+*
+*                 Form x(j) := - w(j) / d
+*                 with scaling and perturbation of the denominator
+*
+                  D = ACOEFF*S( J, J ) - BCOEFF*P( J, J )
+                  IF( ABS1( D ).LE.DMIN )
+     $               D = DCMPLX( DMIN )
+*
+                  IF( ABS1( D ).LT.ONE ) THEN
+                     IF( ABS1( WORK( J ) ).GE.BIGNUM*ABS1( D ) ) THEN
+                        TEMP = ONE / ABS1( WORK( J ) )
+                        DO 180 JR = 1, JE
+                           WORK( JR ) = TEMP*WORK( JR )
+  180                   CONTINUE
+                     END IF
+                  END IF
+*
+                  WORK( J ) = ZLADIV( -WORK( J ), D )
 *
-      IF( N.LE.0 )
-     $   RETURN
+                  IF( J.GT.1 ) THEN
 *
-*     Initialise columns 1:n-k to columns of the unit matrix
+*                    w = w + x(j)*(a S(*,j) - b P(*,j) ) with scaling
 *
-      DO 20 J = 1, N - K
-         DO 10 L = 1, M
-            A( L, J ) = ZERO
-   10    CONTINUE
-         A( M-N+J, J ) = ONE
-   20 CONTINUE
+                     IF( ABS1( WORK( J ) ).GT.ONE ) THEN
+                        TEMP = ONE / ABS1( WORK( J ) )
+                        IF( ACOEFA*RWORK( J )+BCOEFA*RWORK( N+J ).GE.
+     $                      BIGNUM*TEMP ) THEN
+                           DO 190 JR = 1, JE
+                              WORK( JR ) = TEMP*WORK( JR )
+  190                      CONTINUE
+                        END IF
+                     END IF
 *
-      DO 40 I = 1, K
-         II = N - K + I
+                     CA = ACOEFF*WORK( J )
+                     CB = BCOEFF*WORK( J )
+                     DO 200 JR = 1, J - 1
+                        WORK( JR ) = WORK( JR ) + CA*S( JR, J ) -
+     $                               CB*P( JR, J )
+  200                CONTINUE
+                  END IF
+  210          CONTINUE
 *
-*        Apply H(i) to A(1:m-k+i,1:n-k+i) from the left
+*              Back transform eigenvector if HOWMNY='B'.
 *
-         A( M-N+II, II ) = ONE
-         CALL ZLARF( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ), A,
-     $               LDA, WORK )
-         CALL ZSCAL( M-N+II-1, -TAU( I ), A( 1, II ), 1 )
-         A( M-N+II, II ) = ONE - TAU( I )
+               IF( ILBACK ) THEN
+                  CALL ZGEMV( 'N', N, JE, CONE, VR, LDVR, WORK, 1,
+     $                        CZERO, WORK( N+1 ), 1 )
+                  ISRC = 2
+                  IEND = N
+               ELSE
+                  ISRC = 1
+                  IEND = JE
+               END IF
 *
-*        Set A(m-k+i+1:m,n-k+i) to zero
+*              Copy and scale eigenvector into column of VR
+*
+               XMAX = ZERO
+               DO 220 JR = 1, IEND
+                  XMAX = MAX( XMAX, ABS1( WORK( ( ISRC-1 )*N+JR ) ) )
+  220          CONTINUE
+*
+               IF( XMAX.GT.SAFMIN ) THEN
+                  TEMP = ONE / XMAX
+                  DO 230 JR = 1, IEND
+                     VR( JR, IEIG ) = TEMP*WORK( ( ISRC-1 )*N+JR )
+  230             CONTINUE
+               ELSE
+                  IEND = 0
+               END IF
+*
+               DO 240 JR = IEND + 1, N
+                  VR( JR, IEIG ) = CZERO
+  240          CONTINUE
+*
+            END IF
+  250    CONTINUE
+      END IF
 *
-         DO 30 L = M - N + II + 1, M
-            A( L, II ) = ZERO
-   30    CONTINUE
-   40 CONTINUE
       RETURN
 *
-*     End of ZUNG2L
+*     End of ZTGEVC
 *
       END
-*> \brief \b ZUNG2R
+*> \brief \b ZTGEX2 swaps adjacent diagonal blocks in an upper (quasi) triangular matrix pair by an unitary equivalence transformation.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -26953,25 +44209,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNG2R + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zung2r.f"> 
+*> Download ZTGEX2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgex2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zung2r.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztgex2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zung2r.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgex2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
+*       SUBROUTINE ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+*                          LDZ, J1, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, M, N
+*       LOGICAL            WANTQ, WANTZ
+*       INTEGER            INFO, J1, LDA, LDB, LDQ, LDZ, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+*      $                   Z( LDZ, * )
 *       ..
 *  
 *
@@ -26980,70 +44239,113 @@
 *>
 *> \verbatim
 *>
-*> ZUNG2R generates an m by n complex matrix Q with orthonormal columns,
-*> which is defined as the first n columns of a product of k elementary
-*> reflectors of order m
+*> ZTGEX2 swaps adjacent diagonal 1 by 1 blocks (A11,B11) and (A22,B22)
+*> in an upper triangular matrix pair (A, B) by an unitary equivalence
+*> transformation.
 *>
-*>       Q  =  H(1) H(2) . . . H(k)
+*> (A, B) must be in generalized Schur canonical form, that is, A and
+*> B are both upper triangular.
+*>
+*> Optionally, the matrices Q and Z of generalized Schur vectors are
+*> updated.
+*>
+*>        Q(in) * A(in) * Z(in)**H = Q(out) * A(out) * Z(out)**H
+*>        Q(in) * B(in) * Z(in)**H = Q(out) * B(out) * Z(out)**H
 *>
-*> as returned by ZGEQRF.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] WANTQ
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          WANTQ is LOGICAL
+*>          .TRUE. : update the left transformation matrix Q;
+*>          .FALSE.: do not update Q.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] WANTZ
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix Q. M >= N >= 0.
+*>          WANTZ is LOGICAL
+*>          .TRUE. : update the right transformation matrix Z;
+*>          .FALSE.: do not update Z.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] N
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. N >= K >= 0.
+*>          N is INTEGER
+*>          The order of the matrices A and B. N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the i-th column must contain the vector which
-*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by ZGEQRF in the first k columns of its array
-*>          argument A.
-*>          On exit, the m by n matrix Q.
+*>          A is COMPLEX*16 arrays, dimensions (LDA,N)
+*>          On entry, the matrix A in the pair (A, B).
+*>          On exit, the updated matrix A.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          The leading dimension of the array A. LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in,out] B
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEQRF.
+*>          B is COMPLEX*16 arrays, dimensions (LDB,N)
+*>          On entry, the matrix B in the pair (A, B).
+*>          On exit, the updated matrix B.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LDB
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (N)
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] Q
+*> \verbatim
+*>          Q is COMPLEX*16 array, dimension (LDZ,N)
+*>          If WANTQ = .TRUE, on entry, the unitary matrix Q. On exit,
+*>          the updated matrix Q.
+*>          Not referenced if WANTQ = .FALSE..
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q. LDQ >= 1;
+*>          If WANTQ = .TRUE., LDQ >= N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          If WANTZ = .TRUE, on entry, the unitary matrix Z. On exit,
+*>          the updated matrix Z.
+*>          Not referenced if WANTZ = .FALSE..
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z. LDZ >= 1;
+*>          If WANTZ = .TRUE., LDZ >= N.
+*> \endverbatim
+*>
+*> \param[in] J1
+*> \verbatim
+*>          J1 is INTEGER
+*>          The index to the first block (A11, B11).
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -i, the i-th argument has an illegal value
+*>           =0:  Successful exit.
+*>           =1:  The transformed matrix pair (A, B) would be too far
+*>                from generalized Schur form; the problem is ill-
+*>                conditioned. 
 *> \endverbatim
 *
 *  Authors:
@@ -27054,99 +44356,219 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date September 2012
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16GEauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*>  In the current code both weak and strong stability tests are
+*>  performed. The user can omit the strong stability test by changing
+*>  the internal logical parameter WANDS to .FALSE.. See ref. [2] for
+*>  details.
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
 *
+*> \par References:
+*  ================
+*>
+*>  [1] B. Kagstrom; A Direct Method for Reordering Eigenvalues in the
+*>      Generalized Real Schur Form of a Regular Matrix Pair (A, B), in
+*>      M.S. Moonen et al (eds), Linear Algebra for Large Scale and
+*>      Real-Time Applications, Kluwer Academic Publ. 1993, pp 195-218.
+*> \n
+*>  [2] B. Kagstrom and P. Poromaa; Computing Eigenspaces with Specified
+*>      Eigenvalues of a Regular Matrix Pair (A, B) and Condition
+*>      Estimation: Theory, Algorithms and Software, Report UMINF-94.04,
+*>      Department of Computing Science, Umea University, S-901 87 Umea,
+*>      Sweden, 1994. Also as LAPACK Working Note 87. To appear in
+*>      Numerical Algorithms, 1996.
+*>
 *  =====================================================================
-      SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
+      SUBROUTINE ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                   LDZ, J1, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK auxiliary routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, M, N
+      LOGICAL            WANTQ, WANTZ
+      INTEGER            INFO, J1, LDA, LDB, LDQ, LDZ, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+     $                   Z( LDZ, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+      COMPLEX*16         CZERO, CONE
+      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   TWENTY
+      PARAMETER          ( TWENTY = 2.0D+1 )
+      INTEGER            LDST
+      PARAMETER          ( LDST = 2 )
+      LOGICAL            WANDS
+      PARAMETER          ( WANDS = .TRUE. )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, J, L
+      LOGICAL            DTRONG, WEAK
+      INTEGER            I, M
+      DOUBLE PRECISION   CQ, CZ, EPS, SA, SB, SCALE, SMLNUM, SS, SUM,
+     $                   THRESH, WS
+      COMPLEX*16         CDUM, F, G, SQ, SZ
+*     ..
+*     .. Local Arrays ..
+      COMPLEX*16         S( LDST, LDST ), T( LDST, LDST ), WORK( 8 )
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF, ZSCAL
+      EXTERNAL           ZLACPY, ZLARTG, ZLASSQ, ZROT
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          ABS, DBLE, DCONJG, MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
-*
       INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
-         INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNG2R', -INFO )
-         RETURN
-      END IF
 *
 *     Quick return if possible
 *
-      IF( N.LE.0 )
+      IF( N.LE.1 )
      $   RETURN
 *
-*     Initialise columns k+1:n to columns of the unit matrix
+      M = LDST
+      WEAK = .FALSE.
+      DTRONG = .FALSE.
 *
-      DO 20 J = K + 1, N
-         DO 10 L = 1, M
-            A( L, J ) = ZERO
+*     Make a local copy of selected block in (A, B)
+*
+      CALL ZLACPY( 'Full', M, M, A( J1, J1 ), LDA, S, LDST )
+      CALL ZLACPY( 'Full', M, M, B( J1, J1 ), LDB, T, LDST )
+*
+*     Compute the threshold for testing the acceptance of swapping.
+*
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' ) / EPS
+      SCALE = DBLE( CZERO )
+      SUM = DBLE( CONE )
+      CALL ZLACPY( 'Full', M, M, S, LDST, WORK, M )
+      CALL ZLACPY( 'Full', M, M, T, LDST, WORK( M*M+1 ), M )
+      CALL ZLASSQ( 2*M*M, WORK, 1, SCALE, SUM )
+      SA = SCALE*SQRT( SUM )
+*
+*     THRES has been changed from 
+*        THRESH = MAX( TEN*EPS*SA, SMLNUM )
+*     to
+*        THRESH = MAX( TWENTY*EPS*SA, SMLNUM )
+*     on 04/01/10.
+*     "Bug" reported by Ondra Kamenik, confirmed by Julie Langou, fixed by
+*     Jim Demmel and Guillaume Revy. See forum post 1783.
+*
+      THRESH = MAX( TWENTY*EPS*SA, SMLNUM )
+*
+*     Compute unitary QL and RQ that swap 1-by-1 and 1-by-1 blocks
+*     using Givens rotations and perform the swap tentatively.
+*
+      F = S( 2, 2 )*T( 1, 1 ) - T( 2, 2 )*S( 1, 1 )
+      G = S( 2, 2 )*T( 1, 2 ) - T( 2, 2 )*S( 1, 2 )
+      SA = ABS( S( 2, 2 ) )
+      SB = ABS( T( 2, 2 ) )
+      CALL ZLARTG( G, F, CZ, SZ, CDUM )
+      SZ = -SZ
+      CALL ZROT( 2, S( 1, 1 ), 1, S( 1, 2 ), 1, CZ, DCONJG( SZ ) )
+      CALL ZROT( 2, T( 1, 1 ), 1, T( 1, 2 ), 1, CZ, DCONJG( SZ ) )
+      IF( SA.GE.SB ) THEN
+         CALL ZLARTG( S( 1, 1 ), S( 2, 1 ), CQ, SQ, CDUM )
+      ELSE
+         CALL ZLARTG( T( 1, 1 ), T( 2, 1 ), CQ, SQ, CDUM )
+      END IF
+      CALL ZROT( 2, S( 1, 1 ), LDST, S( 2, 1 ), LDST, CQ, SQ )
+      CALL ZROT( 2, T( 1, 1 ), LDST, T( 2, 1 ), LDST, CQ, SQ )
+*
+*     Weak stability test: |S21| + |T21| <= O(EPS F-norm((S, T)))
+*
+      WS = ABS( S( 2, 1 ) ) + ABS( T( 2, 1 ) )
+      WEAK = WS.LE.THRESH
+      IF( .NOT.WEAK )
+     $   GO TO 20
+*
+      IF( WANDS ) THEN
+*
+*        Strong stability test:
+*           F-norm((A-QL**H*S*QR, B-QL**H*T*QR)) <= O(EPS*F-norm((A, B)))
+*
+         CALL ZLACPY( 'Full', M, M, S, LDST, WORK, M )
+         CALL ZLACPY( 'Full', M, M, T, LDST, WORK( M*M+1 ), M )
+         CALL ZROT( 2, WORK, 1, WORK( 3 ), 1, CZ, -DCONJG( SZ ) )
+         CALL ZROT( 2, WORK( 5 ), 1, WORK( 7 ), 1, CZ, -DCONJG( SZ ) )
+         CALL ZROT( 2, WORK, 2, WORK( 2 ), 2, CQ, -SQ )
+         CALL ZROT( 2, WORK( 5 ), 2, WORK( 6 ), 2, CQ, -SQ )
+         DO 10 I = 1, 2
+            WORK( I ) = WORK( I ) - A( J1+I-1, J1 )
+            WORK( I+2 ) = WORK( I+2 ) - A( J1+I-1, J1+1 )
+            WORK( I+4 ) = WORK( I+4 ) - B( J1+I-1, J1 )
+            WORK( I+6 ) = WORK( I+6 ) - B( J1+I-1, J1+1 )
    10    CONTINUE
-         A( J, J ) = ONE
-   20 CONTINUE
+         SCALE = DBLE( CZERO )
+         SUM = DBLE( CONE )
+         CALL ZLASSQ( 2*M*M, WORK, 1, SCALE, SUM )
+         SS = SCALE*SQRT( SUM )
+         DTRONG = SS.LE.THRESH
+         IF( .NOT.DTRONG )
+     $      GO TO 20
+      END IF
 *
-      DO 40 I = K, 1, -1
+*     If the swap is accepted ("weakly" and "strongly"), apply the
+*     equivalence transformations to the original matrix pair (A,B)
 *
-*        Apply H(i) to A(i:m,i:n) from the left
+      CALL ZROT( J1+1, A( 1, J1 ), 1, A( 1, J1+1 ), 1, CZ,
+     $           DCONJG( SZ ) )
+      CALL ZROT( J1+1, B( 1, J1 ), 1, B( 1, J1+1 ), 1, CZ,
+     $           DCONJG( SZ ) )
+      CALL ZROT( N-J1+1, A( J1, J1 ), LDA, A( J1+1, J1 ), LDA, CQ, SQ )
+      CALL ZROT( N-J1+1, B( J1, J1 ), LDB, B( J1+1, J1 ), LDB, CQ, SQ )
 *
-         IF( I.LT.N ) THEN
-            A( I, I ) = ONE
-            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                  A( I, I+1 ), LDA, WORK )
-         END IF
-         IF( I.LT.M )
-     $      CALL ZSCAL( M-I, -TAU( I ), A( I+1, I ), 1 )
-         A( I, I ) = ONE - TAU( I )
+*     Set  N1 by N2 (2,1) blocks to 0
 *
-*        Set A(1:i-1,i) to zero
+      A( J1+1, J1 ) = CZERO
+      B( J1+1, J1 ) = CZERO
+*
+*     Accumulate transformations into Q and Z if requested.
+*
+      IF( WANTZ )
+     $   CALL ZROT( N, Z( 1, J1 ), 1, Z( 1, J1+1 ), 1, CZ,
+     $              DCONJG( SZ ) )
+      IF( WANTQ )
+     $   CALL ZROT( N, Q( 1, J1 ), 1, Q( 1, J1+1 ), 1, CQ,
+     $              DCONJG( SQ ) )
+*
+*     Exit with INFO = 0 if swap was successfully performed.
 *
-         DO 30 L = 1, I - 1
-            A( L, I ) = ZERO
-   30    CONTINUE
-   40 CONTINUE
       RETURN
 *
-*     End of ZUNG2R
+*     Exit with INFO = 1 if swap was rejected.
+*
+   20 CONTINUE
+      INFO = 1
+      RETURN
+*
+*     End of ZTGEX2
 *
       END
-*> \brief \b ZUNGBR
+*> \brief \b ZTGEXC
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -27154,26 +44576,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGBR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungbr.f"> 
+*> Download ZTGEXC + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgexc.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungbr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztgexc.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungbr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgexc.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+*                          LDZ, IFST, ILST, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          VECT
-*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       LOGICAL            WANTQ, WANTZ
+*       INTEGER            IFST, ILST, INFO, LDA, LDB, LDQ, LDZ, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+*      $                   Z( LDZ, * )
 *       ..
 *  
 *
@@ -27182,112 +44606,123 @@
 *>
 *> \verbatim
 *>
-*> ZUNGBR generates one of the complex unitary matrices Q or P**H
-*> determined by ZGEBRD when reducing a complex matrix A to bidiagonal
-*> form: A = Q * B * P**H.  Q and P**H are defined as products of
-*> elementary reflectors H(i) or G(i) respectively.
+*> ZTGEXC reorders the generalized Schur decomposition of a complex
+*> matrix pair (A,B), using an unitary equivalence transformation
+*> (A, B) := Q * (A, B) * Z**H, so that the diagonal block of (A, B) with
+*> row index IFST is moved to row ILST.
 *>
-*> If VECT = 'Q', A is assumed to have been an M-by-K matrix, and Q
-*> is of order M:
-*> if m >= k, Q = H(1) H(2) . . . H(k) and ZUNGBR returns the first n
-*> columns of Q, where m >= n >= k;
-*> if m < k, Q = H(1) H(2) . . . H(m-1) and ZUNGBR returns Q as an
-*> M-by-M matrix.
+*> (A, B) must be in generalized Schur canonical form, that is, A and
+*> B are both upper triangular.
 *>
-*> If VECT = 'P', A is assumed to have been a K-by-N matrix, and P**H
-*> is of order N:
-*> if k < n, P**H = G(k) . . . G(2) G(1) and ZUNGBR returns the first m
-*> rows of P**H, where n >= m >= k;
-*> if k >= n, P**H = G(n-1) . . . G(2) G(1) and ZUNGBR returns P**H as
-*> an N-by-N matrix.
+*> Optionally, the matrices Q and Z of generalized Schur vectors are
+*> updated.
+*>
+*>        Q(in) * A(in) * Z(in)**H = Q(out) * A(out) * Z(out)**H
+*>        Q(in) * B(in) * Z(in)**H = Q(out) * B(out) * Z(out)**H
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] VECT
+*> \param[in] WANTQ
 *> \verbatim
-*>          VECT is CHARACTER*1
-*>          Specifies whether the matrix Q or the matrix P**H is
-*>          required, as defined in the transformation applied by ZGEBRD:
-*>          = 'Q':  generate Q;
-*>          = 'P':  generate P**H.
+*>          WANTQ is LOGICAL
+*>          .TRUE. : update the left transformation matrix Q;
+*>          .FALSE.: do not update Q.
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in] WANTZ
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q or P**H to be returned.
-*>          M >= 0.
+*>          WANTZ is LOGICAL
+*>          .TRUE. : update the right transformation matrix Z;
+*>          .FALSE.: do not update Z.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix Q or P**H to be returned.
-*>          N >= 0.
-*>          If VECT = 'Q', M >= N >= min(M,K);
-*>          if VECT = 'P', N >= M >= min(N,K).
-*> \endverbatim
-*>
-*> \param[in] K
-*> \verbatim
-*>          K is INTEGER
-*>          If VECT = 'Q', the number of columns in the original M-by-K
-*>          matrix reduced by ZGEBRD.
-*>          If VECT = 'P', the number of rows in the original K-by-N
-*>          matrix reduced by ZGEBRD.
-*>          K >= 0.
+*>          The order of the matrices A and B. N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the vectors which define the elementary reflectors,
-*>          as returned by ZGEBRD.
-*>          On exit, the M-by-N matrix Q or P**H.
+*>          On entry, the upper triangular matrix A in the pair (A, B).
+*>          On exit, the updated matrix A.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= M.
+*>          The leading dimension of the array A. LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in,out] B
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension
-*>                                (min(M,K)) if VECT = 'Q'
-*>                                (min(N,K)) if VECT = 'P'
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i) or G(i), which determines Q or P**H, as
-*>          returned by ZGEBRD in its array argument TAUQ or TAUP.
+*>          B is COMPLEX*16 array, dimension (LDB,N)
+*>          On entry, the upper triangular matrix B in the pair (A, B).
+*>          On exit, the updated matrix B.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LDB
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LWORK
+*> \param[in,out] Q
 *> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,min(M,N)).
-*>          For optimum performance LWORK >= min(M,N)*NB, where NB
-*>          is the optimal blocksize.
+*>          Q is COMPLEX*16 array, dimension (LDZ,N)
+*>          On entry, if WANTQ = .TRUE., the unitary matrix Q.
+*>          On exit, the updated matrix Q.
+*>          If WANTQ = .FALSE., Q is not referenced.
+*> \endverbatim
 *>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q. LDQ >= 1;
+*>          If WANTQ = .TRUE., LDQ >= N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          On entry, if WANTZ = .TRUE., the unitary matrix Z.
+*>          On exit, the updated matrix Z.
+*>          If WANTZ = .FALSE., Z is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z. LDZ >= 1;
+*>          If WANTZ = .TRUE., LDZ >= N.
+*> \endverbatim
+*>
+*> \param[in] IFST
+*> \verbatim
+*>          IFST is INTEGER
+*> \endverbatim
+*>
+*> \param[in,out] ILST
+*> \verbatim
+*>          ILST is INTEGER
+*>          Specify the reordering of the diagonal blocks of (A, B).
+*>          The block with row index IFST is moved to row ILST, by a
+*>          sequence of swapping between adjacent blocks.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>           =0:  Successful exit.
+*>           <0:  if INFO = -i, the i-th argument had an illegal value.
+*>           =1:  The transformed matrix pair (A, B) would be too far
+*>                from generalized Schur form; the problem is ill-
+*>                conditioned. (A, B) may have been partially reordered,
+*>                and ILST points to the first row of the current
+*>                position of the block being moved.
 *> \endverbatim
 *
 *  Authors:
@@ -27298,194 +44733,142 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date April 2012
+*> \date November 2011
 *
-*> \ingroup complex16GBcomputational
+*> \ingroup complex16GEcomputational
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
 *
+*> \par References:
+*  ================
+*>
+*>  [1] B. Kagstrom; A Direct Method for Reordering Eigenvalues in the
+*>      Generalized Real Schur Form of a Regular Matrix Pair (A, B), in
+*>      M.S. Moonen et al (eds), Linear Algebra for Large Scale and
+*>      Real-Time Applications, Kluwer Academic Publ. 1993, pp 195-218.
+*> \n
+*>  [2] B. Kagstrom and P. Poromaa; Computing Eigenspaces with Specified
+*>      Eigenvalues of a Regular Matrix Pair (A, B) and Condition
+*>      Estimation: Theory, Algorithms and Software, Report
+*>      UMINF - 94.04, Department of Computing Science, Umea University,
+*>      S-901 87 Umea, Sweden, 1994. Also as LAPACK Working Note 87.
+*>      To appear in Numerical Algorithms, 1996.
+*> \n
+*>  [3] B. Kagstrom and P. Poromaa, LAPACK-Style Algorithms and Software
+*>      for Solving the Generalized Sylvester Equation and Estimating the
+*>      Separation between Regular Matrix Pairs, Report UMINF - 93.23,
+*>      Department of Computing Science, Umea University, S-901 87 Umea,
+*>      Sweden, December 1993, Revised April 1994, Also as LAPACK working
+*>      Note 75. To appear in ACM Trans. on Math. Software, Vol 22, No 1,
+*>      1996.
+*>
 *  =====================================================================
-      SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                   LDZ, IFST, ILST, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.1) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     April 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          VECT
-      INTEGER            INFO, K, LDA, LWORK, M, N
+      LOGICAL            WANTQ, WANTZ
+      INTEGER            IFST, ILST, INFO, LDA, LDB, LDQ, LDZ, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+     $                   Z( LDZ, * )
 *     ..
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
-*     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY, WANTQ
-      INTEGER            I, IINFO, J, LWKOPT, MN
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      INTEGER            HERE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZUNGLQ, ZUNGQR
+      EXTERNAL           XERBLA, ZTGEX2
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
-*
+*     Decode and test input arguments.
       INFO = 0
-      WANTQ = LSAME( VECT, 'Q' )
-      MN = MIN( M, N )
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( .NOT.WANTQ .AND. .NOT.LSAME( VECT, 'P' ) ) THEN
-         INFO = -1
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( N.LT.0 .OR. ( WANTQ .AND. ( N.GT.M .OR. N.LT.MIN( M,
-     $         K ) ) ) .OR. ( .NOT.WANTQ .AND. ( M.GT.N .OR. M.LT.
-     $         MIN( N, K ) ) ) ) THEN
+      IF( N.LT.0 ) THEN
          INFO = -3
-      ELSE IF( K.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -6
-      ELSE IF( LWORK.LT.MAX( 1, MN ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDQ.LT.1 .OR. WANTQ .AND. ( LDQ.LT.MAX( 1, N ) ) ) THEN
          INFO = -9
+      ELSE IF( LDZ.LT.1 .OR. WANTZ .AND. ( LDZ.LT.MAX( 1, N ) ) ) THEN
+         INFO = -11
+      ELSE IF( IFST.LT.1 .OR. IFST.GT.N ) THEN
+         INFO = -12
+      ELSE IF( ILST.LT.1 .OR. ILST.GT.N ) THEN
+         INFO = -13
       END IF
-*
-      IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         IF( WANTQ ) THEN
-            IF( M.GE.K ) THEN
-               CALL ZUNGQR( M, N, K, A, LDA, TAU, WORK, -1, IINFO )
-            ELSE
-               IF( M.GT.1 ) THEN
-                  CALL ZUNGQR( M-1, M-1, M-1, A( 2, 2 ), LDA, TAU, WORK,
-     $                         -1, IINFO )
-               END IF
-            END IF
-         ELSE
-            IF( K.LT.N ) THEN
-               CALL ZUNGLQ( M, N, K, A, LDA, TAU, WORK, -1, IINFO )
-            ELSE
-               IF( N.GT.1 ) THEN
-                  CALL ZUNGLQ( N-1, N-1, N-1, A( 2, 2 ), LDA, TAU, WORK,
-     $                         -1, IINFO )
-               END IF
-            END IF
-         END IF
-         LWKOPT = WORK( 1 )
-         LWKOPT = MAX (LWKOPT, MN)
-      END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGBR', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         WORK( 1 ) = LWKOPT
+         CALL XERBLA( 'ZTGEXC', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
-      END IF
-*
-      IF( WANTQ ) THEN
-*
-*        Form Q, determined by a call to ZGEBRD to reduce an m-by-k
-*        matrix
-*
-         IF( M.GE.K ) THEN
-*
-*           If m >= k, assume m >= n >= k
-*
-            CALL ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, IINFO )
-*
-         ELSE
+      IF( N.LE.1 )
+     $   RETURN
+      IF( IFST.EQ.ILST )
+     $   RETURN
 *
-*           If m < k, assume m = n
+      IF( IFST.LT.ILST ) THEN
 *
-*           Shift the vectors which define the elementary reflectors one
-*           column to the right, and set the first row and column of Q
-*           to those of the unit matrix
+         HERE = IFST
 *
-            DO 20 J = M, 2, -1
-               A( 1, J ) = ZERO
-               DO 10 I = J + 1, M
-                  A( I, J ) = A( I, J-1 )
-   10          CONTINUE
-   20       CONTINUE
-            A( 1, 1 ) = ONE
-            DO 30 I = 2, M
-               A( I, 1 ) = ZERO
-   30       CONTINUE
-            IF( M.GT.1 ) THEN
+   10    CONTINUE
 *
-*              Form Q(2:m,2:m)
+*        Swap with next one below
 *
-               CALL ZUNGQR( M-1, M-1, M-1, A( 2, 2 ), LDA, TAU, WORK,
-     $                      LWORK, IINFO )
-            END IF
+         CALL ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z, LDZ,
+     $                HERE, INFO )
+         IF( INFO.NE.0 ) THEN
+            ILST = HERE
+            RETURN
          END IF
+         HERE = HERE + 1
+         IF( HERE.LT.ILST )
+     $      GO TO 10
+         HERE = HERE - 1
       ELSE
+         HERE = IFST - 1
 *
-*        Form P**H, determined by a call to ZGEBRD to reduce a k-by-n
-*        matrix
-*
-         IF( K.LT.N ) THEN
-*
-*           If k < n, assume k <= m <= n
-*
-            CALL ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, IINFO )
-*
-         ELSE
-*
-*           If k >= n, assume m = n
-*
-*           Shift the vectors which define the elementary reflectors one
-*           row downward, and set the first row and column of P**H to
-*           those of the unit matrix
-*
-            A( 1, 1 ) = ONE
-            DO 40 I = 2, N
-               A( I, 1 ) = ZERO
-   40       CONTINUE
-            DO 60 J = 2, N
-               DO 50 I = J - 1, 2, -1
-                  A( I, J ) = A( I-1, J )
-   50          CONTINUE
-               A( 1, J ) = ZERO
-   60       CONTINUE
-            IF( N.GT.1 ) THEN
+   20    CONTINUE
 *
-*              Form P**H(2:n,2:n)
+*        Swap with next one above
 *
-               CALL ZUNGLQ( N-1, N-1, N-1, A( 2, 2 ), LDA, TAU, WORK,
-     $                      LWORK, IINFO )
-            END IF
+         CALL ZTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z, LDZ,
+     $                HERE, INFO )
+         IF( INFO.NE.0 ) THEN
+            ILST = HERE
+            RETURN
          END IF
+         HERE = HERE - 1
+         IF( HERE.GE.ILST )
+     $      GO TO 20
+         HERE = HERE + 1
       END IF
-      WORK( 1 ) = LWKOPT
+      ILST = HERE
       RETURN
 *
-*     End of ZUNGBR
+*     End of ZTGEXC
 *
       END
-*> \brief \b ZUNGHR
+*> \brief \b ZTGSEN
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -27493,25 +44876,34 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGHR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunghr.f"> 
+*> Download ZTGSEN + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsen.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunghr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztgsen.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunghr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsen.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
+*                          ALPHA, BETA, Q, LDQ, Z, LDZ, M, PL, PR, DIF,
+*                          WORK, LWORK, IWORK, LIWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
+*       LOGICAL            WANTQ, WANTZ
+*       INTEGER            IJOB, INFO, LDA, LDB, LDQ, LDZ, LIWORK, LWORK,
+*      $                   M, N
+*       DOUBLE PRECISION   PL, PR
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       LOGICAL            SELECT( * )
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   DIF( * )
+*       COMPLEX*16         A( LDA, * ), ALPHA( * ), B( LDB, * ),
+*      $                   BETA( * ), Q( LDQ, * ), WORK( * ), Z( LDZ, * )
 *       ..
 *  
 *
@@ -27520,43 +44912,87 @@
 *>
 *> \verbatim
 *>
-*> ZUNGHR generates a complex unitary matrix Q which is defined as the
-*> product of IHI-ILO elementary reflectors of order N, as returned by
-*> ZGEHRD:
+*> ZTGSEN reorders the generalized Schur decomposition of a complex
+*> matrix pair (A, B) (in terms of an unitary equivalence trans-
+*> formation Q**H * (A, B) * Z), so that a selected cluster of eigenvalues
+*> appears in the leading diagonal blocks of the pair (A,B). The leading
+*> columns of Q and Z form unitary bases of the corresponding left and
+*> right eigenspaces (deflating subspaces). (A, B) must be in
+*> generalized Schur canonical form, that is, A and B are both upper
+*> triangular.
+*>
+*> ZTGSEN also computes the generalized eigenvalues
+*>
+*>          w(j)= ALPHA(j) / BETA(j)
+*>
+*> of the reordered matrix pair (A, B).
+*>
+*> Optionally, the routine computes estimates of reciprocal condition
+*> numbers for eigenvalues and eigenspaces. These are Difu[(A11,B11),
+*> (A22,B22)] and Difl[(A11,B11), (A22,B22)], i.e. the separation(s)
+*> between the matrix pairs (A11, B11) and (A22,B22) that correspond to
+*> the selected cluster and the eigenvalues outside the cluster, resp.,
+*> and norms of "projections" onto left and right eigenspaces w.r.t.
+*> the selected cluster in the (1,1)-block.
 *>
-*> Q = H(ilo) H(ilo+1) . . . H(ihi-1).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] N
+*> \param[in] IJOB
 *> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix Q. N >= 0.
+*>          IJOB is integer
+*>          Specifies whether condition numbers are required for the
+*>          cluster of eigenvalues (PL and PR) or the deflating subspaces
+*>          (Difu and Difl):
+*>           =0: Only reorder w.r.t. SELECT. No extras.
+*>           =1: Reciprocal of norms of "projections" onto left and right
+*>               eigenspaces w.r.t. the selected cluster (PL and PR).
+*>           =2: Upper bounds on Difu and Difl. F-norm-based estimate
+*>               (DIF(1:2)).
+*>           =3: Estimate of Difu and Difl. 1-norm-based estimate
+*>               (DIF(1:2)).
+*>               About 5 times as expensive as IJOB = 2.
+*>           =4: Compute PL, PR and DIF (i.e. 0, 1 and 2 above): Economic
+*>               version to get it all.
+*>           =5: Compute PL, PR and DIF (i.e. 0, 1 and 3 above)
 *> \endverbatim
 *>
-*> \param[in] ILO
+*> \param[in] WANTQ
 *> \verbatim
-*>          ILO is INTEGER
+*>          WANTQ is LOGICAL
+*>          .TRUE. : update the left transformation matrix Q;
+*>          .FALSE.: do not update Q.
 *> \endverbatim
 *>
-*> \param[in] IHI
+*> \param[in] WANTZ
 *> \verbatim
-*>          IHI is INTEGER
+*>          WANTZ is LOGICAL
+*>          .TRUE. : update the right transformation matrix Z;
+*>          .FALSE.: do not update Z.
+*> \endverbatim
 *>
-*>          ILO and IHI must have the same values as in the previous call
-*>          of ZGEHRD. Q is equal to the unit matrix except in the
-*>          submatrix Q(ilo+1:ihi,ilo+1:ihi).
-*>          1 <= ILO <= IHI <= N, if N > 0; ILO=1 and IHI=0, if N=0.
+*> \param[in] SELECT
+*> \verbatim
+*>          SELECT is LOGICAL array, dimension (N)
+*>          SELECT specifies the eigenvalues in the selected cluster. To
+*>          select an eigenvalue w(j), SELECT(j) must be set to
+*>          .TRUE..
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrices A and B. N >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the vectors which define the elementary reflectors,
-*>          as returned by ZGEHRD.
-*>          On exit, the N-by-N unitary matrix Q.
+*>          A is COMPLEX*16 array, dimension(LDA,N)
+*>          On entry, the upper triangular matrix A, in generalized
+*>          Schur canonical form.
+*>          On exit, A is overwritten by the reordered matrix A.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -27565,11 +45001,105 @@
 *>          The leading dimension of the array A. LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in,out] B
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (N-1)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEHRD.
+*>          B is COMPLEX*16 array, dimension(LDB,N)
+*>          On entry, the upper triangular matrix B, in generalized
+*>          Schur canonical form.
+*>          On exit, B is overwritten by the reordered matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] ALPHA
+*> \verbatim
+*>          ALPHA is COMPLEX*16 array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] BETA
+*> \verbatim
+*>          BETA is COMPLEX*16 array, dimension (N)
+*>
+*>          The diagonal elements of A and B, respectively,
+*>          when the pair (A,B) has been reduced to generalized Schur
+*>          form.  ALPHA(i)/BETA(i) i=1,...,N are the generalized
+*>          eigenvalues.
+*> \endverbatim
+*>
+*> \param[in,out] Q
+*> \verbatim
+*>          Q is COMPLEX*16 array, dimension (LDQ,N)
+*>          On entry, if WANTQ = .TRUE., Q is an N-by-N matrix.
+*>          On exit, Q has been postmultiplied by the left unitary
+*>          transformation matrix which reorder (A, B); The leading M
+*>          columns of Q form orthonormal bases for the specified pair of
+*>          left eigenspaces (deflating subspaces).
+*>          If WANTQ = .FALSE., Q is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q. LDQ >= 1.
+*>          If WANTQ = .TRUE., LDQ >= N.
+*> \endverbatim
+*>
+*> \param[in,out] Z
+*> \verbatim
+*>          Z is COMPLEX*16 array, dimension (LDZ,N)
+*>          On entry, if WANTZ = .TRUE., Z is an N-by-N matrix.
+*>          On exit, Z has been postmultiplied by the left unitary
+*>          transformation matrix which reorder (A, B); The leading M
+*>          columns of Z form orthonormal bases for the specified pair of
+*>          left eigenspaces (deflating subspaces).
+*>          If WANTZ = .FALSE., Z is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDZ
+*> \verbatim
+*>          LDZ is INTEGER
+*>          The leading dimension of the array Z. LDZ >= 1.
+*>          If WANTZ = .TRUE., LDZ >= N.
+*> \endverbatim
+*>
+*> \param[out] M
+*> \verbatim
+*>          M is INTEGER
+*>          The dimension of the specified pair of left and right
+*>          eigenspaces, (deflating subspaces) 0 <= M <= N.
+*> \endverbatim
+*>
+*> \param[out] PL
+*> \verbatim
+*>          PL is DOUBLE PRECISION
+*> \endverbatim
+*>
+*> \param[out] PR
+*> \verbatim
+*>          PR is DOUBLE PRECISION
+*>
+*>          If IJOB = 1, 4 or 5, PL, PR are lower bounds on the
+*>          reciprocal  of the norm of "projections" onto left and right
+*>          eigenspace with respect to the selected cluster.
+*>          0 < PL, PR <= 1.
+*>          If M = 0 or M = N, PL = PR  = 1.
+*>          If IJOB = 0, 2 or 3 PL, PR are not referenced.
+*> \endverbatim
+*>
+*> \param[out] DIF
+*> \verbatim
+*>          DIF is DOUBLE PRECISION array, dimension (2).
+*>          If IJOB >= 2, DIF(1:2) store the estimates of Difu and Difl.
+*>          If IJOB = 2 or 4, DIF(1:2) are F-norm-based upper bounds on
+*>          Difu and Difl. If IJOB = 3 or 5, DIF(1:2) are 1-norm-based
+*>          estimates of Difu and Difl, computed using reversed
+*>          communication with ZLACN2.
+*>          If M = 0 or N, DIF(1:2) = F-norm([A, B]).
+*>          If IJOB = 0 or 1, DIF is not referenced.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -27581,9 +45111,9 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= IHI-ILO.
-*>          For optimum performance LWORK >= (IHI-ILO)*NB, where NB is
-*>          the optimal blocksize.
+*>          The dimension of the array WORK. LWORK >=  1
+*>          If IJOB = 1, 2 or 4, LWORK >=  2*M*(N-M)
+*>          If IJOB = 3 or 5, LWORK >=  4*M*(N-M)
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -27591,11 +45121,35 @@
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
+*>          On exit, if INFO = 0, IWORK(1) returns the optimal LIWORK.
+*> \endverbatim
+*>
+*> \param[in] LIWORK
+*> \verbatim
+*>          LIWORK is INTEGER
+*>          The dimension of the array IWORK. LIWORK >= 1.
+*>          If IJOB = 1, 2 or 4, LIWORK >=  N+2;
+*>          If IJOB = 3 or 5, LIWORK >= MAX(N+2, 2*M*(N-M));
+*>
+*>          If LIWORK = -1, then a workspace query is assumed; the
+*>          routine only calculates the optimal size of the IWORK array,
+*>          returns this value as the first entry of the IWORK array, and
+*>          no error message related to LIWORK is issued by XERBLA.
+*> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>            =0: Successful exit.
+*>            <0: If INFO = -i, the i-th argument had an illegal value.
+*>            =1: Reordering of (A, B) failed because the transformed
+*>                matrix pair (A, B) would be too far from generalized
+*>                Schur form; the problem is very ill-conditioned.
+*>                (A, B) may have been partially reordered.
+*>                If requested, 0 is returned in DIF(*), PL and PR.
 *> \endverbatim
 *
 *  Authors:
@@ -27610,8 +45164,144 @@
 *
 *> \ingroup complex16OTHERcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  ZTGSEN first collects the selected eigenvalues by computing unitary
+*>  U and W that move them to the top left corner of (A, B). In other
+*>  words, the selected eigenvalues are the eigenvalues of (A11, B11) in
+*>
+*>              U**H*(A, B)*W = (A11 A12) (B11 B12) n1
+*>                              ( 0  A22),( 0  B22) n2
+*>                                n1  n2    n1  n2
+*>
+*>  where N = n1+n2 and U**H means the conjugate transpose of U. The first
+*>  n1 columns of U and W span the specified pair of left and right
+*>  eigenspaces (deflating subspaces) of (A, B).
+*>
+*>  If (A, B) has been obtained from the generalized real Schur
+*>  decomposition of a matrix pair (C, D) = Q*(A, B)*Z**H, then the
+*>  reordered generalized Schur form of (C, D) is given by
+*>
+*>           (C, D) = (Q*U)*(U**H *(A, B)*W)*(Z*W)**H,
+*>
+*>  and the first n1 columns of Q*U and Z*W span the corresponding
+*>  deflating subspaces of (C, D) (Q and Z store Q*U and Z*W, resp.).
+*>
+*>  Note that if the selected eigenvalue is sufficiently ill-conditioned,
+*>  then its value may differ significantly from its value before
+*>  reordering.
+*>
+*>  The reciprocal condition numbers of the left and right eigenspaces
+*>  spanned by the first n1 columns of U and W (or Q*U and Z*W) may
+*>  be returned in DIF(1:2), corresponding to Difu and Difl, resp.
+*>
+*>  The Difu and Difl are defined as:
+*>
+*>       Difu[(A11, B11), (A22, B22)] = sigma-min( Zu )
+*>  and
+*>       Difl[(A11, B11), (A22, B22)] = Difu[(A22, B22), (A11, B11)],
+*>
+*>  where sigma-min(Zu) is the smallest singular value of the
+*>  (2*n1*n2)-by-(2*n1*n2) matrix
+*>
+*>       Zu = [ kron(In2, A11)  -kron(A22**H, In1) ]
+*>            [ kron(In2, B11)  -kron(B22**H, In1) ].
+*>
+*>  Here, Inx is the identity matrix of size nx and A22**H is the
+*>  conjugate transpose of A22. kron(X, Y) is the Kronecker product between
+*>  the matrices X and Y.
+*>
+*>  When DIF(2) is small, small changes in (A, B) can cause large changes
+*>  in the deflating subspace. An approximate (asymptotic) bound on the
+*>  maximum angular error in the computed deflating subspaces is
+*>
+*>       EPS * norm((A, B)) / DIF(2),
+*>
+*>  where EPS is the machine precision.
+*>
+*>  The reciprocal norm of the projectors on the left and right
+*>  eigenspaces associated with (A11, B11) may be returned in PL and PR.
+*>  They are computed as follows. First we compute L and R so that
+*>  P*(A, B)*Q is block diagonal, where
+*>
+*>       P = ( I -L ) n1           Q = ( I R ) n1
+*>           ( 0  I ) n2    and        ( 0 I ) n2
+*>             n1 n2                    n1 n2
+*>
+*>  and (L, R) is the solution to the generalized Sylvester equation
+*>
+*>       A11*R - L*A22 = -A12
+*>       B11*R - L*B22 = -B12
+*>
+*>  Then PL = (F-norm(L)**2+1)**(-1/2) and PR = (F-norm(R)**2+1)**(-1/2).
+*>  An approximate (asymptotic) bound on the average absolute error of
+*>  the selected eigenvalues is
+*>
+*>       EPS * norm((A, B)) / PL.
+*>
+*>  There are also global error bounds which valid for perturbations up
+*>  to a certain restriction:  A lower bound (x) on the smallest
+*>  F-norm(E,F) for which an eigenvalue of (A11, B11) may move and
+*>  coalesce with an eigenvalue of (A22, B22) under perturbation (E,F),
+*>  (i.e. (A + E, B + F), is
+*>
+*>   x = min(Difu,Difl)/((1/(PL*PL)+1/(PR*PR))**(1/2)+2*max(1/PL,1/PR)).
+*>
+*>  An approximate bound on x can be computed from DIF(1:2), PL and PR.
+*>
+*>  If y = ( F-norm(E,F) / x) <= 1, the angles between the perturbed
+*>  (L', R') and unperturbed (L, R) left and right deflating subspaces
+*>  associated with the selected cluster in the (1,1)-blocks can be
+*>  bounded as
+*>
+*>   max-angle(L, L') <= arctan( y * PL / (1 - y * (1 - PL * PL)**(1/2))
+*>   max-angle(R, R') <= arctan( y * PR / (1 - y * (1 - PR * PR)**(1/2))
+*>
+*>  See LAPACK User's Guide section 4.11 or the following references
+*>  for more information.
+*>
+*>  Note that if the default method for computing the Frobenius-norm-
+*>  based estimate DIF is not wanted (see ZLATDF), then the parameter
+*>  IDIFJB (see below) should be changed from 3 to 4 (routine ZLATDF
+*>  (IJOB = 2 will be used)). See ZTGSYL for more details.
+*> \endverbatim
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
+*
+*> \par References:
+*  ================
+*>
+*>  [1] B. Kagstrom; A Direct Method for Reordering Eigenvalues in the
+*>      Generalized Real Schur Form of a Regular Matrix Pair (A, B), in
+*>      M.S. Moonen et al (eds), Linear Algebra for Large Scale and
+*>      Real-Time Applications, Kluwer Academic Publ. 1993, pp 195-218.
+*> \n
+*>  [2] B. Kagstrom and P. Poromaa; Computing Eigenspaces with Specified
+*>      Eigenvalues of a Regular Matrix Pair (A, B) and Condition
+*>      Estimation: Theory, Algorithms and Software, Report
+*>      UMINF - 94.04, Department of Computing Science, Umea University,
+*>      S-901 87 Umea, Sweden, 1994. Also as LAPACK Working Note 87.
+*>      To appear in Numerical Algorithms, 1996.
+*> \n
+*>  [3] B. Kagstrom and P. Poromaa, LAPACK-Style Algorithms and Software
+*>      for Solving the Generalized Sylvester Equation and Estimating the
+*>      Separation between Regular Matrix Pairs, Report UMINF - 93.23,
+*>      Department of Computing Science, Umea University, S-901 87 Umea,
+*>      Sweden, December 1993, Revised April 1994, Also as LAPACK working
+*>      Note 75. To appear in ACM Trans. on Math. Software, Vol 22, No 1,
+*>      1996.
+*>
 *  =====================================================================
-      SUBROUTINE ZUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTGSEN( IJOB, WANTQ, WANTZ, SELECT, N, A, LDA, B, LDB,
+     $                   ALPHA, BETA, Q, LDQ, Z, LDZ, M, PL, PR, DIF,
+     $                   WORK, LWORK, IWORK, LIWORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -27619,114 +45309,351 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            IHI, ILO, INFO, LDA, LWORK, N
+      LOGICAL            WANTQ, WANTZ
+      INTEGER            IJOB, INFO, LDA, LDB, LDQ, LDZ, LIWORK, LWORK,
+     $                   M, N
+      DOUBLE PRECISION   PL, PR
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      LOGICAL            SELECT( * )
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   DIF( * )
+      COMPLEX*16         A( LDA, * ), ALPHA( * ), B( LDB, * ),
+     $                   BETA( * ), Q( LDQ, * ), WORK( * ), Z( LDZ, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+      INTEGER            IDIFJB
+      PARAMETER          ( IDIFJB = 3 )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IINFO, J, LWKOPT, NB, NH
+      LOGICAL            LQUERY, SWAP, WANTD, WANTD1, WANTD2, WANTP
+      INTEGER            I, IERR, IJB, K, KASE, KS, LIWMIN, LWMIN, MN2,
+     $                   N1, N2
+      DOUBLE PRECISION   DSCALE, DSUM, RDSCAL, SAFMIN
+      COMPLEX*16         TEMP1, TEMP2
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZUNGQR
+*     .. Local Arrays ..
+      INTEGER            ISAVE( 3 )
 *     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLACN2, ZLACPY, ZLASSQ, ZSCAL, ZTGEXC,
+     $                   ZTGSYL
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          ABS, DCMPLX, DCONJG, MAX, SQRT
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      EXTERNAL           DLAMCH
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and test the input parameters
 *
       INFO = 0
-      NH = IHI - ILO
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( N.LT.0 ) THEN
+      LQUERY = ( LWORK.EQ.-1 .OR. LIWORK.EQ.-1 )
+*
+      IF( IJOB.LT.0 .OR. IJOB.GT.5 ) THEN
          INFO = -1
-      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
-         INFO = -2
-      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -5
-      ELSE IF( LWORK.LT.MAX( 1, NH ) .AND. .NOT.LQUERY ) THEN
-         INFO = -8
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
+      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.N ) ) THEN
+         INFO = -13
+      ELSE IF( LDZ.LT.1 .OR. ( WANTZ .AND. LDZ.LT.N ) ) THEN
+         INFO = -15
       END IF
 *
-      IF( INFO.EQ.0 ) THEN
-         NB = ILAENV( 1, 'ZUNGQR', ' ', NH, NH, NH, -1 )
-         LWKOPT = MAX( 1, NH )*NB
-         WORK( 1 ) = LWKOPT
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZTGSEN', -INFO )
+         RETURN
+      END IF
+*
+      IERR = 0
+*
+      WANTP = IJOB.EQ.1 .OR. IJOB.GE.4
+      WANTD1 = IJOB.EQ.2 .OR. IJOB.EQ.4
+      WANTD2 = IJOB.EQ.3 .OR. IJOB.EQ.5
+      WANTD = WANTD1 .OR. WANTD2
+*
+*     Set M to the dimension of the specified pair of deflating
+*     subspaces.
+*
+      M = 0
+      DO 10 K = 1, N
+         ALPHA( K ) = A( K, K )
+         BETA( K ) = B( K, K )
+         IF( K.LT.N ) THEN
+            IF( SELECT( K ) )
+     $         M = M + 1
+         ELSE
+            IF( SELECT( N ) )
+     $         M = M + 1
+         END IF
+   10 CONTINUE
+*
+      IF( IJOB.EQ.1 .OR. IJOB.EQ.2 .OR. IJOB.EQ.4 ) THEN
+         LWMIN = MAX( 1, 2*M*( N-M ) )
+         LIWMIN = MAX( 1, N+2 )
+      ELSE IF( IJOB.EQ.3 .OR. IJOB.EQ.5 ) THEN
+         LWMIN = MAX( 1, 4*M*( N-M ) )
+         LIWMIN = MAX( 1, 2*M*( N-M ), N+2 )
+      ELSE
+         LWMIN = 1
+         LIWMIN = 1
+      END IF
+*
+      WORK( 1 ) = LWMIN
+      IWORK( 1 ) = LIWMIN
+*
+      IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
+         INFO = -21
+      ELSE IF( LIWORK.LT.LIWMIN .AND. .NOT.LQUERY ) THEN
+         INFO = -23
       END IF
 *
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGHR', -INFO )
+         CALL XERBLA( 'ZTGSEN', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
-*     Quick return if possible
+*     Quick return if possible.
 *
-      IF( N.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
+      IF( M.EQ.N .OR. M.EQ.0 ) THEN
+         IF( WANTP ) THEN
+            PL = ONE
+            PR = ONE
+         END IF
+         IF( WANTD ) THEN
+            DSCALE = ZERO
+            DSUM = ONE
+            DO 20 I = 1, N
+               CALL ZLASSQ( N, A( 1, I ), 1, DSCALE, DSUM )
+               CALL ZLASSQ( N, B( 1, I ), 1, DSCALE, DSUM )
+   20       CONTINUE
+            DIF( 1 ) = DSCALE*SQRT( DSUM )
+            DIF( 2 ) = DIF( 1 )
+         END IF
+         GO TO 70
       END IF
 *
-*     Shift the vectors which define the elementary reflectors one
-*     column to the right, and set the first ilo and the last n-ihi
-*     rows and columns to those of the unit matrix
+*     Get machine constant
 *
-      DO 40 J = IHI, ILO + 1, -1
-         DO 10 I = 1, J - 1
-            A( I, J ) = ZERO
-   10    CONTINUE
-         DO 20 I = J + 1, IHI
-            A( I, J ) = A( I, J-1 )
-   20    CONTINUE
-         DO 30 I = IHI + 1, N
-            A( I, J ) = ZERO
-   30    CONTINUE
-   40 CONTINUE
-      DO 60 J = 1, ILO
-         DO 50 I = 1, N
-            A( I, J ) = ZERO
-   50    CONTINUE
-         A( J, J ) = ONE
-   60 CONTINUE
-      DO 80 J = IHI + 1, N
-         DO 70 I = 1, N
-            A( I, J ) = ZERO
-   70    CONTINUE
-         A( J, J ) = ONE
-   80 CONTINUE
+      SAFMIN = DLAMCH( 'S' )
 *
-      IF( NH.GT.0 ) THEN
+*     Collect the selected blocks at the top-left corner of (A, B).
 *
-*        Generate Q(ilo+1:ihi,ilo+1:ihi)
+      KS = 0
+      DO 30 K = 1, N
+         SWAP = SELECT( K )
+         IF( SWAP ) THEN
+            KS = KS + 1
 *
-         CALL ZUNGQR( NH, NH, NH, A( ILO+1, ILO+1 ), LDA, TAU( ILO ),
-     $                WORK, LWORK, IINFO )
+*           Swap the K-th block to position KS. Compute unitary Q
+*           and Z that will swap adjacent diagonal blocks in (A, B).
+*
+            IF( K.NE.KS )
+     $         CALL ZTGEXC( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
+     $                      LDZ, K, KS, IERR )
+*
+            IF( IERR.GT.0 ) THEN
+*
+*              Swap is rejected: exit.
+*
+               INFO = 1
+               IF( WANTP ) THEN
+                  PL = ZERO
+                  PR = ZERO
+               END IF
+               IF( WANTD ) THEN
+                  DIF( 1 ) = ZERO
+                  DIF( 2 ) = ZERO
+               END IF
+               GO TO 70
+            END IF
+         END IF
+   30 CONTINUE
+      IF( WANTP ) THEN
+*
+*        Solve generalized Sylvester equation for R and L:
+*                   A11 * R - L * A22 = A12
+*                   B11 * R - L * B22 = B12
+*
+         N1 = M
+         N2 = N - M
+         I = N1 + 1
+         CALL ZLACPY( 'Full', N1, N2, A( 1, I ), LDA, WORK, N1 )
+         CALL ZLACPY( 'Full', N1, N2, B( 1, I ), LDB, WORK( N1*N2+1 ),
+     $                N1 )
+         IJB = 0
+         CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
+     $                N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ), N1,
+     $                DSCALE, DIF( 1 ), WORK( N1*N2*2+1 ),
+     $                LWORK-2*N1*N2, IWORK, IERR )
+*
+*        Estimate the reciprocal of norms of "projections" onto
+*        left and right eigenspaces
+*
+         RDSCAL = ZERO
+         DSUM = ONE
+         CALL ZLASSQ( N1*N2, WORK, 1, RDSCAL, DSUM )
+         PL = RDSCAL*SQRT( DSUM )
+         IF( PL.EQ.ZERO ) THEN
+            PL = ONE
+         ELSE
+            PL = DSCALE / ( SQRT( DSCALE*DSCALE / PL+PL )*SQRT( PL ) )
+         END IF
+         RDSCAL = ZERO
+         DSUM = ONE
+         CALL ZLASSQ( N1*N2, WORK( N1*N2+1 ), 1, RDSCAL, DSUM )
+         PR = RDSCAL*SQRT( DSUM )
+         IF( PR.EQ.ZERO ) THEN
+            PR = ONE
+         ELSE
+            PR = DSCALE / ( SQRT( DSCALE*DSCALE / PR+PR )*SQRT( PR ) )
+         END IF
+      END IF
+      IF( WANTD ) THEN
+*
+*        Compute estimates Difu and Difl.
+*
+         IF( WANTD1 ) THEN
+            N1 = M
+            N2 = N - M
+            I = N1 + 1
+            IJB = IDIFJB
+*
+*           Frobenius norm-based Difu estimate.
+*
+            CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA, WORK,
+     $                   N1, B, LDB, B( I, I ), LDB, WORK( N1*N2+1 ),
+     $                   N1, DSCALE, DIF( 1 ), WORK( N1*N2*2+1 ),
+     $                   LWORK-2*N1*N2, IWORK, IERR )
+*
+*           Frobenius norm-based Difl estimate.
+*
+            CALL ZTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA, WORK,
+     $                   N2, B( I, I ), LDB, B, LDB, WORK( N1*N2+1 ),
+     $                   N2, DSCALE, DIF( 2 ), WORK( N1*N2*2+1 ),
+     $                   LWORK-2*N1*N2, IWORK, IERR )
+         ELSE
+*
+*           Compute 1-norm-based estimates of Difu and Difl using
+*           reversed communication with ZLACN2. In each step a
+*           generalized Sylvester equation or a transposed variant
+*           is solved.
+*
+            KASE = 0
+            N1 = M
+            N2 = N - M
+            I = N1 + 1
+            IJB = 0
+            MN2 = 2*N1*N2
+*
+*           1-norm-based estimate of Difu.
+*
+   40       CONTINUE
+            CALL ZLACN2( MN2, WORK( MN2+1 ), WORK, DIF( 1 ), KASE,
+     $                   ISAVE )
+            IF( KASE.NE.0 ) THEN
+               IF( KASE.EQ.1 ) THEN
+*
+*                 Solve generalized Sylvester equation
+*
+                  CALL ZTGSYL( 'N', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+     $                         WORK, N1, B, LDB, B( I, I ), LDB,
+     $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
+     $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
+     $                         IERR )
+               ELSE
+*
+*                 Solve the transposed variant.
+*
+                  CALL ZTGSYL( 'C', IJB, N1, N2, A, LDA, A( I, I ), LDA,
+     $                         WORK, N1, B, LDB, B( I, I ), LDB,
+     $                         WORK( N1*N2+1 ), N1, DSCALE, DIF( 1 ),
+     $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
+     $                         IERR )
+               END IF
+               GO TO 40
+            END IF
+            DIF( 1 ) = DSCALE / DIF( 1 )
+*
+*           1-norm-based estimate of Difl.
+*
+   50       CONTINUE
+            CALL ZLACN2( MN2, WORK( MN2+1 ), WORK, DIF( 2 ), KASE,
+     $                   ISAVE )
+            IF( KASE.NE.0 ) THEN
+               IF( KASE.EQ.1 ) THEN
+*
+*                 Solve generalized Sylvester equation
+*
+                  CALL ZTGSYL( 'N', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+     $                         WORK, N2, B( I, I ), LDB, B, LDB,
+     $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
+     $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
+     $                         IERR )
+               ELSE
+*
+*                 Solve the transposed variant.
+*
+                  CALL ZTGSYL( 'C', IJB, N2, N1, A( I, I ), LDA, A, LDA,
+     $                         WORK, N2, B, LDB, B( I, I ), LDB,
+     $                         WORK( N1*N2+1 ), N2, DSCALE, DIF( 2 ),
+     $                         WORK( N1*N2*2+1 ), LWORK-2*N1*N2, IWORK,
+     $                         IERR )
+               END IF
+               GO TO 50
+            END IF
+            DIF( 2 ) = DSCALE / DIF( 2 )
+         END IF
       END IF
-      WORK( 1 ) = LWKOPT
+*
+*     If B(K,K) is complex, make it real and positive (normalization
+*     of the generalized Schur form) and Store the generalized
+*     eigenvalues of reordered pair (A, B)
+*
+      DO 60 K = 1, N
+         DSCALE = ABS( B( K, K ) )
+         IF( DSCALE.GT.SAFMIN ) THEN
+            TEMP1 = DCONJG( B( K, K ) / DSCALE )
+            TEMP2 = B( K, K ) / DSCALE
+            B( K, K ) = DSCALE
+            CALL ZSCAL( N-K, TEMP1, B( K, K+1 ), LDB )
+            CALL ZSCAL( N-K+1, TEMP1, A( K, K ), LDA )
+            IF( WANTQ )
+     $         CALL ZSCAL( N, TEMP2, Q( 1, K ), 1 )
+         ELSE
+            B( K, K ) = DCMPLX( ZERO, ZERO )
+         END IF
+*
+         ALPHA( K ) = A( K, K )
+         BETA( K ) = B( K, K )
+*
+   60 CONTINUE
+*
+   70 CONTINUE
+*
+      WORK( 1 ) = LWMIN
+      IWORK( 1 ) = LIWMIN
+*
       RETURN
 *
-*     End of ZUNGHR
+*     End of ZTGSEN
 *
       END
-*> \brief \b ZUNGL2 generates all or part of the unitary matrix Q from an LQ factorization determined by cgelqf (unblocked algorithm).
+*> \brief \b ZTGSY2 solves the generalized Sylvester equation (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -27734,25 +45661,30 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGL2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungl2.f"> 
+*> Download ZTGSY2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsy2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungl2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztgsy2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungl2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsy2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+*       SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+*                          LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
+*                          INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, M, N
+*       CHARACTER          TRANS
+*       INTEGER            IJOB, INFO, LDA, LDB, LDC, LDD, LDE, LDF, M, N
+*       DOUBLE PRECISION   RDSCAL, RDSUM, SCALE
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * ),
+*      $                   D( LDD, * ), E( LDE, * ), F( LDF, * )
 *       ..
 *  
 *
@@ -27761,69 +45693,202 @@
 *>
 *> \verbatim
 *>
-*> ZUNGL2 generates an m-by-n complex matrix Q with orthonormal rows,
-*> which is defined as the first m rows of a product of k elementary
-*> reflectors of order n
+*> ZTGSY2 solves the generalized Sylvester equation
 *>
-*>       Q  =  H(k)**H . . . H(2)**H H(1)**H
+*>             A * R - L * B = scale * C               (1)
+*>             D * R - L * E = scale * F
 *>
-*> as returned by ZGELQF.
+*> using Level 1 and 2 BLAS, where R and L are unknown M-by-N matrices,
+*> (A, D), (B, E) and (C, F) are given matrix pairs of size M-by-M,
+*> N-by-N and M-by-N, respectively. A, B, D and E are upper triangular
+*> (i.e., (A,D) and (B,E) in generalized Schur form).
+*>
+*> The solution (R, L) overwrites (C, F). 0 <= SCALE <= 1 is an output
+*> scaling factor chosen to avoid overflow.
+*>
+*> In matrix notation solving equation (1) corresponds to solve
+*> Zx = scale * b, where Z is defined as
+*>
+*>        Z = [ kron(In, A)  -kron(B**H, Im) ]             (2)
+*>            [ kron(In, D)  -kron(E**H, Im) ],
+*>
+*> Ik is the identity matrix of size k and X**H is the conjuguate transpose of X.
+*> kron(X, Y) is the Kronecker product between the matrices X and Y.
+*>
+*> If TRANS = 'C', y in the conjugate transposed system Z**H*y = scale*b
+*> is solved for, which is equivalent to solve for R and L in
+*>
+*>             A**H * R  + D**H * L   = scale * C           (3)
+*>             R  * B**H + L  * E**H  = scale * -F
+*>
+*> This case is used to compute an estimate of Dif[(A, D), (B, E)] =
+*> = sigma_min(Z) using reverse communicaton with ZLACON.
+*>
+*> ZTGSY2 also (IJOB >= 1) contributes to the computation in ZTGSYL
+*> of an upper bound on the separation between to matrix pairs. Then
+*> the input (A, D), (B, E) are sub-pencils of two matrix pairs in
+*> ZTGSYL.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N', solve the generalized Sylvester equation (1).
+*>          = 'T': solve the 'transposed' system (3).
+*> \endverbatim
+*>
+*> \param[in] IJOB
+*> \verbatim
+*>          IJOB is INTEGER
+*>          Specifies what kind of functionality to be performed.
+*>          =0: solve (1) only.
+*>          =1: A contribution from this subsystem to a Frobenius
+*>              norm-based estimate of the separation between two matrix
+*>              pairs is computed. (look ahead strategy is used).
+*>          =2: A contribution from this subsystem to a Frobenius
+*>              norm-based estimate of the separation between two matrix
+*>              pairs is computed. (DGECON on sub-systems is used.)
+*>          Not referenced if TRANS = 'T'.
+*> \endverbatim
+*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          On entry, M specifies the order of A and D, and the row
+*>          dimension of C, F, R and L.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix Q. N >= M.
+*>          On entry, N specifies the order of B and E, and the column
+*>          dimension of C, F, R and L.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] A
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. M >= K >= 0.
+*>          A is COMPLEX*16 array, dimension (LDA, M)
+*>          On entry, A contains an upper triangular matrix.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] LDA
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the i-th row must contain the vector which defines
-*>          the elementary reflector H(i), for i = 1,2,...,k, as returned
-*>          by ZGELQF in the first k rows of its array argument A.
-*>          On exit, the m by n matrix Q.
+*>          LDA is INTEGER
+*>          The leading dimension of the matrix A. LDA >= max(1, M).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in] B
 *> \verbatim
-*>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          B is COMPLEX*16 array, dimension (LDB, N)
+*>          On entry, B contains an upper triangular matrix.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] LDB
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGELQF.
+*>          LDB is INTEGER
+*>          The leading dimension of the matrix B. LDB >= max(1, N).
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in,out] C
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (M)
+*>          C is COMPLEX*16 array, dimension (LDC, N)
+*>          On entry, C contains the right-hand-side of the first matrix
+*>          equation in (1).
+*>          On exit, if IJOB = 0, C has been overwritten by the solution
+*>          R.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the matrix C. LDC >= max(1, M).
+*> \endverbatim
+*>
+*> \param[in] D
+*> \verbatim
+*>          D is COMPLEX*16 array, dimension (LDD, M)
+*>          On entry, D contains an upper triangular matrix.
+*> \endverbatim
+*>
+*> \param[in] LDD
+*> \verbatim
+*>          LDD is INTEGER
+*>          The leading dimension of the matrix D. LDD >= max(1, M).
+*> \endverbatim
+*>
+*> \param[in] E
+*> \verbatim
+*>          E is COMPLEX*16 array, dimension (LDE, N)
+*>          On entry, E contains an upper triangular matrix.
+*> \endverbatim
+*>
+*> \param[in] LDE
+*> \verbatim
+*>          LDE is INTEGER
+*>          The leading dimension of the matrix E. LDE >= max(1, N).
+*> \endverbatim
+*>
+*> \param[in,out] F
+*> \verbatim
+*>          F is COMPLEX*16 array, dimension (LDF, N)
+*>          On entry, F contains the right-hand-side of the second matrix
+*>          equation in (1).
+*>          On exit, if IJOB = 0, F has been overwritten by the solution
+*>          L.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the matrix F. LDF >= max(1, M).
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>          On exit, 0 <= SCALE <= 1. If 0 < SCALE < 1, the solutions
+*>          R and L (C and F on entry) will hold the solutions to a
+*>          slightly perturbed system but the input matrices A, B, D and
+*>          E have not been changed. If SCALE = 0, R and L will hold the
+*>          solutions to the homogeneous system with C = F = 0.
+*>          Normally, SCALE = 1.
+*> \endverbatim
+*>
+*> \param[in,out] RDSUM
+*> \verbatim
+*>          RDSUM is DOUBLE PRECISION
+*>          On entry, the sum of squares of computed contributions to
+*>          the Dif-estimate under computation by ZTGSYL, where the
+*>          scaling factor RDSCAL (see below) has been factored out.
+*>          On exit, the corresponding sum of squares updated with the
+*>          contributions from the current sub-system.
+*>          If TRANS = 'T' RDSUM is not touched.
+*>          NOTE: RDSUM only makes sense when ZTGSY2 is called by
+*>          ZTGSYL.
+*> \endverbatim
+*>
+*> \param[in,out] RDSCAL
+*> \verbatim
+*>          RDSCAL is DOUBLE PRECISION
+*>          On entry, scaling factor used to prevent overflow in RDSUM.
+*>          On exit, RDSCAL is updated w.r.t. the current contributions
+*>          in RDSUM.
+*>          If TRANS = 'T', RDSCAL is not touched.
+*>          NOTE: RDSCAL only makes sense when ZTGSY2 is called by
+*>          ZTGSYL.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -i, the i-th argument has an illegal value
+*>          On exit, if INFO is set to
+*>            =0: Successful exit
+*>            <0: If INFO = -i, input argument number i is illegal.
+*>            >0: The matrix pairs (A, D) and (B, E) have common or very
+*>                close eigenvalues.
 *> \endverbatim
 *
 *  Authors:
@@ -27834,106 +45899,233 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYauxiliary
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
 *
 *  =====================================================================
-      SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+      SUBROUTINE ZTGSY2( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
+     $                   INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, M, N
+      CHARACTER          TRANS
+      INTEGER            IJOB, INFO, LDA, LDB, LDC, LDD, LDE, LDF, M, N
+      DOUBLE PRECISION   RDSCAL, RDSUM, SCALE
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   D( LDD, * ), E( LDE, * ), F( LDF, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      INTEGER            LDZ
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0, LDZ = 2 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, J, L
+      LOGICAL            NOTRAN
+      INTEGER            I, IERR, J, K
+      DOUBLE PRECISION   SCALOC
+      COMPLEX*16         ALPHA
+*     ..
+*     .. Local Arrays ..
+      INTEGER            IPIV( LDZ ), JPIV( LDZ )
+      COMPLEX*16         RHS( LDZ ), Z( LDZ, LDZ )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZSCAL
+      EXTERNAL           XERBLA, ZAXPY, ZGESC2, ZGETC2, ZLATDF, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG, MAX
+      INTRINSIC          DCMPLX, DCONJG, MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and test input parameters
 *
       INFO = 0
-      IF( M.LT.0 ) THEN
+      IERR = 0
+      NOTRAN = LSAME( TRANS, 'N' )
+      IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -1
-      ELSE IF( N.LT.M ) THEN
-         INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
+      ELSE IF( NOTRAN ) THEN
+         IF( ( IJOB.LT.0 ) .OR. ( IJOB.GT.2 ) ) THEN
+            INFO = -2
+         END IF
+      END IF
+      IF( INFO.EQ.0 ) THEN
+         IF( M.LE.0 ) THEN
+            INFO = -3
+         ELSE IF( N.LE.0 ) THEN
+            INFO = -4
+         ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+            INFO = -6
+         ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+            INFO = -8
+         ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+            INFO = -10
+         ELSE IF( LDD.LT.MAX( 1, M ) ) THEN
+            INFO = -12
+         ELSE IF( LDE.LT.MAX( 1, N ) ) THEN
+            INFO = -14
+         ELSE IF( LDF.LT.MAX( 1, M ) ) THEN
+            INFO = -16
+         END IF
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGL2', -INFO )
+         CALL XERBLA( 'ZTGSY2', -INFO )
          RETURN
       END IF
 *
-*     Quick return if possible
+      IF( NOTRAN ) THEN
 *
-      IF( M.LE.0 )
-     $   RETURN
+*        Solve (I, J) - system
+*           A(I, I) * R(I, J) - L(I, J) * B(J, J) = C(I, J)
+*           D(I, I) * R(I, J) - L(I, J) * E(J, J) = F(I, J)
+*        for I = M, M - 1, ..., 1; J = 1, 2, ..., N
 *
-      IF( K.LT.M ) THEN
+         SCALE = ONE
+         SCALOC = ONE
+         DO 30 J = 1, N
+            DO 20 I = M, 1, -1
 *
-*        Initialise rows k+1:m to rows of the unit matrix
+*              Build 2 by 2 system
 *
-         DO 20 J = 1, N
-            DO 10 L = K + 1, M
-               A( L, J ) = ZERO
-   10       CONTINUE
-            IF( J.GT.K .AND. J.LE.M )
-     $         A( J, J ) = ONE
-   20    CONTINUE
-      END IF
+               Z( 1, 1 ) = A( I, I )
+               Z( 2, 1 ) = D( I, I )
+               Z( 1, 2 ) = -B( J, J )
+               Z( 2, 2 ) = -E( J, J )
+*
+*              Set up right hand side(s)
+*
+               RHS( 1 ) = C( I, J )
+               RHS( 2 ) = F( I, J )
+*
+*              Solve Z * x = RHS
+*
+               CALL ZGETC2( LDZ, Z, LDZ, IPIV, JPIV, IERR )
+               IF( IERR.GT.0 )
+     $            INFO = IERR
+               IF( IJOB.EQ.0 ) THEN
+                  CALL ZGESC2( LDZ, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+                  IF( SCALOC.NE.ONE ) THEN
+                     DO 10 K = 1, N
+                        CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ),
+     $                              C( 1, K ), 1 )
+                        CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ),
+     $                              F( 1, K ), 1 )
+   10                CONTINUE
+                     SCALE = SCALE*SCALOC
+                  END IF
+               ELSE
+                  CALL ZLATDF( IJOB, LDZ, Z, LDZ, RHS, RDSUM, RDSCAL,
+     $                         IPIV, JPIV )
+               END IF
 *
-      DO 40 I = K, 1, -1
+*              Unpack solution vector(s)
 *
-*        Apply H(i)**H to A(i:m,i:n) from the right
+               C( I, J ) = RHS( 1 )
+               F( I, J ) = RHS( 2 )
 *
-         IF( I.LT.N ) THEN
-            CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-            IF( I.LT.M ) THEN
-               A( I, I ) = ONE
-               CALL ZLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
-     $                     DCONJG( TAU( I ) ), A( I+1, I ), LDA, WORK )
-            END IF
-            CALL ZSCAL( N-I, -TAU( I ), A( I, I+1 ), LDA )
-            CALL ZLACGV( N-I, A( I, I+1 ), LDA )
-         END IF
-         A( I, I ) = ONE - DCONJG( TAU( I ) )
+*              Substitute R(I, J) and L(I, J) into remaining equation.
 *
-*        Set A(i,1:i-1) to zero
+               IF( I.GT.1 ) THEN
+                  ALPHA = -RHS( 1 )
+                  CALL ZAXPY( I-1, ALPHA, A( 1, I ), 1, C( 1, J ), 1 )
+                  CALL ZAXPY( I-1, ALPHA, D( 1, I ), 1, F( 1, J ), 1 )
+               END IF
+               IF( J.LT.N ) THEN
+                  CALL ZAXPY( N-J, RHS( 2 ), B( J, J+1 ), LDB,
+     $                        C( I, J+1 ), LDC )
+                  CALL ZAXPY( N-J, RHS( 2 ), E( J, J+1 ), LDE,
+     $                        F( I, J+1 ), LDF )
+               END IF
 *
-         DO 30 L = 1, I - 1
-            A( I, L ) = ZERO
+   20       CONTINUE
    30    CONTINUE
-   40 CONTINUE
+      ELSE
+*
+*        Solve transposed (I, J) - system:
+*           A(I, I)**H * R(I, J) + D(I, I)**H * L(J, J) = C(I, J)
+*           R(I, I) * B(J, J) + L(I, J) * E(J, J)   = -F(I, J)
+*        for I = 1, 2, ..., M, J = N, N - 1, ..., 1
+*
+         SCALE = ONE
+         SCALOC = ONE
+         DO 80 I = 1, M
+            DO 70 J = N, 1, -1
+*
+*              Build 2 by 2 system Z**H
+*
+               Z( 1, 1 ) = DCONJG( A( I, I ) )
+               Z( 2, 1 ) = -DCONJG( B( J, J ) )
+               Z( 1, 2 ) = DCONJG( D( I, I ) )
+               Z( 2, 2 ) = -DCONJG( E( J, J ) )
+*
+*
+*              Set up right hand side(s)
+*
+               RHS( 1 ) = C( I, J )
+               RHS( 2 ) = F( I, J )
+*
+*              Solve Z**H * x = RHS
+*
+               CALL ZGETC2( LDZ, Z, LDZ, IPIV, JPIV, IERR )
+               IF( IERR.GT.0 )
+     $            INFO = IERR
+               CALL ZGESC2( LDZ, Z, LDZ, RHS, IPIV, JPIV, SCALOC )
+               IF( SCALOC.NE.ONE ) THEN
+                  DO 40 K = 1, N
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1, K ),
+     $                           1 )
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1, K ),
+     $                           1 )
+   40             CONTINUE
+                  SCALE = SCALE*SCALOC
+               END IF
+*
+*              Unpack solution vector(s)
+*
+               C( I, J ) = RHS( 1 )
+               F( I, J ) = RHS( 2 )
+*
+*              Substitute R(I, J) and L(I, J) into remaining equation.
+*
+               DO 50 K = 1, J - 1
+                  F( I, K ) = F( I, K ) + RHS( 1 )*DCONJG( B( K, J ) ) +
+     $                        RHS( 2 )*DCONJG( E( K, J ) )
+   50          CONTINUE
+               DO 60 K = I + 1, M
+                  C( K, J ) = C( K, J ) - DCONJG( A( I, K ) )*RHS( 1 ) -
+     $                        DCONJG( D( I, K ) )*RHS( 2 )
+   60          CONTINUE
+*
+   70       CONTINUE
+   80    CONTINUE
+      END IF
       RETURN
 *
-*     End of ZUNGL2
+*     End of ZTGSY2
 *
       END
-*> \brief \b ZUNGLQ
+*> \brief \b ZTGSYL
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -27941,84 +46133,218 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGLQ + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunglq.f"> 
+*> Download ZTGSYL + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztgsyl.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunglq.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztgsyl.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunglq.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztgsyl.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+*                          LDD, E, LDE, F, LDF, SCALE, DIF, WORK, LWORK,
+*                          IWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       CHARACTER          TRANS
+*       INTEGER            IJOB, INFO, LDA, LDB, LDC, LDD, LDE, LDF,
+*      $                   LWORK, M, N
+*       DOUBLE PRECISION   DIF, SCALE
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       INTEGER            IWORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * ),
+*      $                   D( LDD, * ), E( LDE, * ), F( LDF, * ),
+*      $                   WORK( * )
 *       ..
 *  
 *
 *> \par Purpose:
 *  =============
 *>
-*> \verbatim
+*> \verbatim
+*>
+*> ZTGSYL solves the generalized Sylvester equation:
+*>
+*>             A * R - L * B = scale * C            (1)
+*>             D * R - L * E = scale * F
+*>
+*> where R and L are unknown m-by-n matrices, (A, D), (B, E) and
+*> (C, F) are given matrix pairs of size m-by-m, n-by-n and m-by-n,
+*> respectively, with complex entries. A, B, D and E are upper
+*> triangular (i.e., (A,D) and (B,E) in generalized Schur form).
+*>
+*> The solution (R, L) overwrites (C, F). 0 <= SCALE <= 1
+*> is an output scaling factor chosen to avoid overflow.
+*>
+*> In matrix notation (1) is equivalent to solve Zx = scale*b, where Z
+*> is defined as
+*>
+*>        Z = [ kron(In, A)  -kron(B**H, Im) ]        (2)
+*>            [ kron(In, D)  -kron(E**H, Im) ],
+*>
+*> Here Ix is the identity matrix of size x and X**H is the conjugate
+*> transpose of X. Kron(X, Y) is the Kronecker product between the
+*> matrices X and Y.
+*>
+*> If TRANS = 'C', y in the conjugate transposed system Z**H *y = scale*b
+*> is solved for, which is equivalent to solve for R and L in
+*>
+*>             A**H * R + D**H * L = scale * C           (3)
+*>             R * B**H + L * E**H = scale * -F
 *>
-*> ZUNGLQ generates an M-by-N complex matrix Q with orthonormal rows,
-*> which is defined as the first M rows of a product of K elementary
-*> reflectors of order N
+*> This case (TRANS = 'C') is used to compute an one-norm-based estimate
+*> of Dif[(A,D), (B,E)], the separation between the matrix pairs (A,D)
+*> and (B,E), using ZLACON.
 *>
-*>       Q  =  H(k)**H . . . H(2)**H H(1)**H
+*> If IJOB >= 1, ZTGSYL computes a Frobenius norm-based estimate of
+*> Dif[(A,D),(B,E)]. That is, the reciprocal of a lower bound on the
+*> reciprocal of the smallest singular value of Z.
 *>
-*> as returned by ZGELQF.
+*> This is a level-3 BLAS algorithm.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': solve the generalized sylvester equation (1).
+*>          = 'C': solve the "conjugate transposed" system (3).
+*> \endverbatim
+*>
+*> \param[in] IJOB
+*> \verbatim
+*>          IJOB is INTEGER
+*>          Specifies what kind of functionality to be performed.
+*>          =0: solve (1) only.
+*>          =1: The functionality of 0 and 3.
+*>          =2: The functionality of 0 and 4.
+*>          =3: Only an estimate of Dif[(A,D), (B,E)] is computed.
+*>              (look ahead strategy is used).
+*>          =4: Only an estimate of Dif[(A,D), (B,E)] is computed.
+*>              (ZGECON on sub-systems is used).
+*>          Not referenced if TRANS = 'C'.
+*> \endverbatim
+*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          The order of the matrices A and D, and the row dimension of
+*>          the matrices C, F, R and L.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix Q. N >= M.
+*>          The order of the matrices B and E, and the column dimension
+*>          of the matrices C, F, R and L.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] A
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. M >= K >= 0.
+*>          A is COMPLEX*16 array, dimension (LDA, M)
+*>          The upper triangular matrix A.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] LDA
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the i-th row must contain the vector which defines
-*>          the elementary reflector H(i), for i = 1,2,...,k, as returned
-*>          by ZGELQF in the first k rows of its array argument A.
-*>          On exit, the M-by-N matrix Q.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1, M).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in] B
 *> \verbatim
-*>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          B is COMPLEX*16 array, dimension (LDB, N)
+*>          The upper triangular matrix B.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] LDB
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGELQF.
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1, N).
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC, N)
+*>          On entry, C contains the right-hand-side of the first matrix
+*>          equation in (1) or (3).
+*>          On exit, if IJOB = 0, 1 or 2, C has been overwritten by
+*>          the solution R. If IJOB = 3 or 4 and TRANS = 'N', C holds R,
+*>          the solution achieved during the computation of the
+*>          Dif-estimate.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1, M).
+*> \endverbatim
+*>
+*> \param[in] D
+*> \verbatim
+*>          D is COMPLEX*16 array, dimension (LDD, M)
+*>          The upper triangular matrix D.
+*> \endverbatim
+*>
+*> \param[in] LDD
+*> \verbatim
+*>          LDD is INTEGER
+*>          The leading dimension of the array D. LDD >= max(1, M).
+*> \endverbatim
+*>
+*> \param[in] E
+*> \verbatim
+*>          E is COMPLEX*16 array, dimension (LDE, N)
+*>          The upper triangular matrix E.
+*> \endverbatim
+*>
+*> \param[in] LDE
+*> \verbatim
+*>          LDE is INTEGER
+*>          The leading dimension of the array E. LDE >= max(1, N).
+*> \endverbatim
+*>
+*> \param[in,out] F
+*> \verbatim
+*>          F is COMPLEX*16 array, dimension (LDF, N)
+*>          On entry, F contains the right-hand-side of the second matrix
+*>          equation in (1) or (3).
+*>          On exit, if IJOB = 0, 1 or 2, F has been overwritten by
+*>          the solution L. If IJOB = 3 or 4 and TRANS = 'N', F holds L,
+*>          the solution achieved during the computation of the
+*>          Dif-estimate.
+*> \endverbatim
+*>
+*> \param[in] LDF
+*> \verbatim
+*>          LDF is INTEGER
+*>          The leading dimension of the array F. LDF >= max(1, M).
+*> \endverbatim
+*>
+*> \param[out] DIF
+*> \verbatim
+*>          DIF is DOUBLE PRECISION
+*>          On exit DIF is the reciprocal of a lower bound of the
+*>          reciprocal of the Dif-function, i.e. DIF is an upper bound of
+*>          Dif[(A,D), (B,E)] = sigma-min(Z), where Z as in (2).
+*>          IF IJOB = 0 or TRANS = 'C', DIF is not referenced.
+*> \endverbatim
+*>
+*> \param[out] SCALE
+*> \verbatim
+*>          SCALE is DOUBLE PRECISION
+*>          On exit SCALE is the scaling factor in (1) or (3).
+*>          If 0 < SCALE < 1, C and F hold the solutions R and L, resp.,
+*>          to a slightly perturbed system but the input matrices A, B,
+*>          D and E have not been changed. If SCALE = 0, R and L will
+*>          hold the solutions to the homogenious system with C = F = 0.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -28030,9 +46356,8 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,M).
-*>          For optimum performance LWORK >= M*NB, where NB is
-*>          the optimal blocksize.
+*>          The dimension of the array WORK. LWORK > = 1.
+*>          If IJOB = 1 or 2 and TRANS = 'N', LWORK >= max(1,2*M*N).
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -28040,11 +46365,18 @@
 *>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (M+N+2)
+*> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit;
-*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*>            =0: successful exit
+*>            <0: If INFO = -i, the i-th argument had an illegal value.
+*>            >0: (A, D) and (B, E) have common or very close
+*>                eigenvalues.
 *> \endverbatim
 *
 *  Authors:
@@ -28057,10 +46389,38 @@
 *
 *> \date November 2011
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYcomputational
 *
+*> \par Contributors:
+*  ==================
+*>
+*>     Bo Kagstrom and Peter Poromaa, Department of Computing Science,
+*>     Umea University, S-901 87 Umea, Sweden.
+*
+*> \par References:
+*  ================
+*>
+*>  [1] B. Kagstrom and P. Poromaa, LAPACK-Style Algorithms and Software
+*>      for Solving the Generalized Sylvester Equation and Estimating the
+*>      Separation between Regular Matrix Pairs, Report UMINF - 93.23,
+*>      Department of Computing Science, Umea University, S-901 87 Umea,
+*>      Sweden, December 1993, Revised April 1994, Also as LAPACK Working
+*>      Note 75.  To appear in ACM Trans. on Math. Software, Vol 22,
+*>      No 1, 1996.
+*> \n
+*>  [2] B. Kagstrom, A Perturbation Analysis of the Generalized Sylvester
+*>      Equation (AR - LB, DR - LE ) = (C, F), SIAM J. Matrix Anal.
+*>      Appl., 15(4):1045-1060, 1994.
+*> \n
+*>  [3] B. Kagstrom and L. Westin, Generalized Schur Methods with
+*>      Condition Estimators for Solving the Generalized Sylvester
+*>      Equation, IEEE Transactions on Automatic Control, Vol. 34, No. 7,
+*>      July 1989, pp 745-751.
+*>
 *  =====================================================================
-      SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTGSYL( TRANS, IJOB, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD, E, LDE, F, LDF, SCALE, DIF, WORK, LWORK,
+     $                   IWORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -28068,55 +46428,99 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, LWORK, M, N
+      CHARACTER          TRANS
+      INTEGER            IJOB, INFO, LDA, LDB, LDC, LDD, LDE, LDF,
+     $                   LWORK, M, N
+      DOUBLE PRECISION   DIF, SCALE
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      INTEGER            IWORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * ),
+     $                   D( LDD, * ), E( LDE, * ), F( LDF, * ),
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
+*  Replaced various illegal calls to CCOPY by calls to CLASET.
+*  Sven Hammarling, 1/5/02.
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CZERO
+      PARAMETER          ( CZERO = (0.0D+0, 0.0D+0) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, J, KI, KK, L, LDWORK,
-     $                   LWKOPT, NB, NBMIN, NX
+      LOGICAL            LQUERY, NOTRAN
+      INTEGER            I, IE, IFUNC, IROUND, IS, ISOLVE, J, JE, JS, K,
+     $                   LINFO, LWMIN, MB, NB, P, PQ, Q
+      DOUBLE PRECISION   DSCALE, DSUM, SCALE2, SCALOC
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNGL2
+      EXTERNAL           XERBLA, ZGEMM, ZLACPY, ZLASET, ZSCAL, ZTGSY2
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      INTRINSIC          DBLE, DCMPLX, MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and test input parameters
 *
       INFO = 0
-      NB = ILAENV( 1, 'ZUNGLQ', ' ', M, N, K, -1 )
-      LWKOPT = MAX( 1, M )*NB
-      WORK( 1 ) = LWKOPT
+      NOTRAN = LSAME( TRANS, 'N' )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
+*
+      IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -1
-      ELSE IF( N.LT.M ) THEN
-         INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-         INFO = -8
+      ELSE IF( NOTRAN ) THEN
+         IF( ( IJOB.LT.0 ) .OR. ( IJOB.GT.4 ) ) THEN
+            INFO = -2
+         END IF
+      END IF
+      IF( INFO.EQ.0 ) THEN
+         IF( M.LE.0 ) THEN
+            INFO = -3
+         ELSE IF( N.LE.0 ) THEN
+            INFO = -4
+         ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+            INFO = -6
+         ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+            INFO = -8
+         ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+            INFO = -10
+         ELSE IF( LDD.LT.MAX( 1, M ) ) THEN
+            INFO = -12
+         ELSE IF( LDE.LT.MAX( 1, N ) ) THEN
+            INFO = -14
+         ELSE IF( LDF.LT.MAX( 1, M ) ) THEN
+            INFO = -16
+         END IF
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+         IF( NOTRAN ) THEN
+            IF( IJOB.EQ.1 .OR. IJOB.EQ.2 ) THEN
+               LWMIN = MAX( 1, 2*M*N )
+            ELSE
+               LWMIN = 1
+            END IF
+         ELSE
+            LWMIN = 1
+         END IF
+         WORK( 1 ) = LWMIN
+*
+         IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -20
+         END IF
       END IF
+*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGLQ', -INFO )
+         CALL XERBLA( 'ZTGSYL', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
@@ -28124,105 +46528,301 @@
 *
 *     Quick return if possible
 *
-      IF( M.LE.0 ) THEN
-         WORK( 1 ) = 1
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         SCALE = 1
+         IF( NOTRAN ) THEN
+            IF( IJOB.NE.0 ) THEN
+               DIF = 0
+            END IF
+         END IF
          RETURN
       END IF
 *
-      NBMIN = 2
-      NX = 0
-      IWS = M
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
-*
-*        Determine when to cross over from blocked to unblocked code.
-*
-         NX = MAX( 0, ILAENV( 3, 'ZUNGLQ', ' ', M, N, K, -1 ) )
-         IF( NX.LT.K ) THEN
-*
-*           Determine if workspace is large enough for blocked code.
-*
-            LDWORK = M
-            IWS = LDWORK*NB
-            IF( LWORK.LT.IWS ) THEN
+*     Determine  optimal block sizes MB and NB
 *
-*              Not enough workspace to use optimal NB:  reduce NB and
-*              determine the minimum value of NB.
+      MB = ILAENV( 2, 'ZTGSYL', TRANS, M, N, -1, -1 )
+      NB = ILAENV( 5, 'ZTGSYL', TRANS, M, N, -1, -1 )
 *
-               NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGLQ', ' ', M, N, K, -1 ) )
-            END IF
+      ISOLVE = 1
+      IFUNC = 0
+      IF( NOTRAN ) THEN
+         IF( IJOB.GE.3 ) THEN
+            IFUNC = IJOB - 2
+            CALL ZLASET( 'F', M, N, CZERO, CZERO, C, LDC )
+            CALL ZLASET( 'F', M, N, CZERO, CZERO, F, LDF )
+         ELSE IF( IJOB.GE.1 .AND. NOTRAN ) THEN
+            ISOLVE = 2
          END IF
       END IF
 *
-      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
+      IF( ( MB.LE.1 .AND. NB.LE.1 ) .OR. ( MB.GE.M .AND. NB.GE.N ) )
+     $     THEN
 *
-*        Use blocked code after the last block.
-*        The first kk rows are handled by the block method.
+*        Use unblocked Level 2 solver
 *
-         KI = ( ( K-NX-1 ) / NB )*NB
-         KK = MIN( K, KI+NB )
+         DO 30 IROUND = 1, ISOLVE
 *
-*        Set A(kk+1:m,1:kk) to zero.
+            SCALE = ONE
+            DSCALE = ZERO
+            DSUM = ONE
+            PQ = M*N
+            CALL ZTGSY2( TRANS, IFUNC, M, N, A, LDA, B, LDB, C, LDC, D,
+     $                   LDD, E, LDE, F, LDF, SCALE, DSUM, DSCALE,
+     $                   INFO )
+            IF( DSCALE.NE.ZERO ) THEN
+               IF( IJOB.EQ.1 .OR. IJOB.EQ.3 ) THEN
+                  DIF = SQRT( DBLE( 2*M*N ) ) / ( DSCALE*SQRT( DSUM ) )
+               ELSE
+                  DIF = SQRT( DBLE( PQ ) ) / ( DSCALE*SQRT( DSUM ) )
+               END IF
+            END IF
+            IF( ISOLVE.EQ.2 .AND. IROUND.EQ.1 ) THEN
+               IF( NOTRAN ) THEN
+                  IFUNC = IJOB
+               END IF
+               SCALE2 = SCALE
+               CALL ZLACPY( 'F', M, N, C, LDC, WORK, M )
+               CALL ZLACPY( 'F', M, N, F, LDF, WORK( M*N+1 ), M )
+               CALL ZLASET( 'F', M, N, CZERO, CZERO, C, LDC )
+               CALL ZLASET( 'F', M, N, CZERO, CZERO, F, LDF )
+            ELSE IF( ISOLVE.EQ.2 .AND. IROUND.EQ.2 ) THEN
+               CALL ZLACPY( 'F', M, N, WORK, M, C, LDC )
+               CALL ZLACPY( 'F', M, N, WORK( M*N+1 ), M, F, LDF )
+               SCALE = SCALE2
+            END IF
+   30    CONTINUE
+*
+         RETURN
 *
-         DO 20 J = 1, KK
-            DO 10 I = KK + 1, M
-               A( I, J ) = ZERO
-   10       CONTINUE
-   20    CONTINUE
-      ELSE
-         KK = 0
       END IF
 *
-*     Use unblocked code for the last or only block.
+*     Determine block structure of A
 *
-      IF( KK.LT.M )
-     $   CALL ZUNGL2( M-KK, N-KK, K-KK, A( KK+1, KK+1 ), LDA,
-     $                TAU( KK+1 ), WORK, IINFO )
+      P = 0
+      I = 1
+   40 CONTINUE
+      IF( I.GT.M )
+     $   GO TO 50
+      P = P + 1
+      IWORK( P ) = I
+      I = I + MB
+      IF( I.GE.M )
+     $   GO TO 50
+      GO TO 40
+   50 CONTINUE
+      IWORK( P+1 ) = M + 1
+      IF( IWORK( P ).EQ.IWORK( P+1 ) )
+     $   P = P - 1
 *
-      IF( KK.GT.0 ) THEN
+*     Determine block structure of B
 *
-*        Use blocked code
+      Q = P + 1
+      J = 1
+   60 CONTINUE
+      IF( J.GT.N )
+     $   GO TO 70
 *
-         DO 50 I = KI + 1, 1, -NB
-            IB = MIN( NB, K-I+1 )
-            IF( I+IB.LE.M ) THEN
+      Q = Q + 1
+      IWORK( Q ) = J
+      J = J + NB
+      IF( J.GE.N )
+     $   GO TO 70
+      GO TO 60
 *
-*              Form the triangular factor of the block reflector
-*              H = H(i) H(i+1) . . . H(i+ib-1)
+   70 CONTINUE
+      IWORK( Q+1 ) = N + 1
+      IF( IWORK( Q ).EQ.IWORK( Q+1 ) )
+     $   Q = Q - 1
 *
-               CALL ZLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
-     $                      LDA, TAU( I ), WORK, LDWORK )
+      IF( NOTRAN ) THEN
+         DO 150 IROUND = 1, ISOLVE
 *
-*              Apply H**H to A(i+ib:m,i:n) from the right
+*           Solve (I, J) - subsystem
+*               A(I, I) * R(I, J) - L(I, J) * B(J, J) = C(I, J)
+*               D(I, I) * R(I, J) - L(I, J) * E(J, J) = F(I, J)
+*           for I = P, P - 1, ..., 1; J = 1, 2, ..., Q
+*
+            PQ = 0
+            SCALE = ONE
+            DSCALE = ZERO
+            DSUM = ONE
+            DO 130 J = P + 2, Q
+               JS = IWORK( J )
+               JE = IWORK( J+1 ) - 1
+               NB = JE - JS + 1
+               DO 120 I = P, 1, -1
+                  IS = IWORK( I )
+                  IE = IWORK( I+1 ) - 1
+                  MB = IE - IS + 1
+                  CALL ZTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ), LDA,
+     $                         B( JS, JS ), LDB, C( IS, JS ), LDC,
+     $                         D( IS, IS ), LDD, E( JS, JS ), LDE,
+     $                         F( IS, JS ), LDF, SCALOC, DSUM, DSCALE,
+     $                         LINFO )
+                  IF( LINFO.GT.0 )
+     $               INFO = LINFO
+                  PQ = PQ + MB*NB
+                  IF( SCALOC.NE.ONE ) THEN
+                     DO 80 K = 1, JS - 1
+                        CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ),
+     $                              C( 1, K ), 1 )
+                        CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ),
+     $                              F( 1, K ), 1 )
+   80                CONTINUE
+                     DO 90 K = JS, JE
+                        CALL ZSCAL( IS-1, DCMPLX( SCALOC, ZERO ),
+     $                              C( 1, K ), 1 )
+                        CALL ZSCAL( IS-1, DCMPLX( SCALOC, ZERO ),
+     $                              F( 1, K ), 1 )
+   90                CONTINUE
+                     DO 100 K = JS, JE
+                        CALL ZSCAL( M-IE, DCMPLX( SCALOC, ZERO ),
+     $                              C( IE+1, K ), 1 )
+                        CALL ZSCAL( M-IE, DCMPLX( SCALOC, ZERO ),
+     $                              F( IE+1, K ), 1 )
+  100                CONTINUE
+                     DO 110 K = JE + 1, N
+                        CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ),
+     $                              C( 1, K ), 1 )
+                        CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ),
+     $                              F( 1, K ), 1 )
+  110                CONTINUE
+                     SCALE = SCALE*SCALOC
+                  END IF
 *
-               CALL ZLARFB( 'Right', 'Conjugate transpose', 'Forward',
-     $                      'Rowwise', M-I-IB+1, N-I+1, IB, A( I, I ),
-     $                      LDA, WORK, LDWORK, A( I+IB, I ), LDA,
-     $                      WORK( IB+1 ), LDWORK )
-            END IF
+*                 Substitute R(I,J) and L(I,J) into remaining equation.
 *
-*           Apply H**H to columns i:n of current block
+                  IF( I.GT.1 ) THEN
+                     CALL ZGEMM( 'N', 'N', IS-1, NB, MB,
+     $                           DCMPLX( -ONE, ZERO ), A( 1, IS ), LDA,
+     $                           C( IS, JS ), LDC, DCMPLX( ONE, ZERO ),
+     $                           C( 1, JS ), LDC )
+                     CALL ZGEMM( 'N', 'N', IS-1, NB, MB,
+     $                           DCMPLX( -ONE, ZERO ), D( 1, IS ), LDD,
+     $                           C( IS, JS ), LDC, DCMPLX( ONE, ZERO ),
+     $                           F( 1, JS ), LDF )
+                  END IF
+                  IF( J.LT.Q ) THEN
+                     CALL ZGEMM( 'N', 'N', MB, N-JE, NB,
+     $                           DCMPLX( ONE, ZERO ), F( IS, JS ), LDF,
+     $                           B( JS, JE+1 ), LDB,
+     $                           DCMPLX( ONE, ZERO ), C( IS, JE+1 ),
+     $                           LDC )
+                     CALL ZGEMM( 'N', 'N', MB, N-JE, NB,
+     $                           DCMPLX( ONE, ZERO ), F( IS, JS ), LDF,
+     $                           E( JS, JE+1 ), LDE,
+     $                           DCMPLX( ONE, ZERO ), F( IS, JE+1 ),
+     $                           LDF )
+                  END IF
+  120          CONTINUE
+  130       CONTINUE
+            IF( DSCALE.NE.ZERO ) THEN
+               IF( IJOB.EQ.1 .OR. IJOB.EQ.3 ) THEN
+                  DIF = SQRT( DBLE( 2*M*N ) ) / ( DSCALE*SQRT( DSUM ) )
+               ELSE
+                  DIF = SQRT( DBLE( PQ ) ) / ( DSCALE*SQRT( DSUM ) )
+               END IF
+            END IF
+            IF( ISOLVE.EQ.2 .AND. IROUND.EQ.1 ) THEN
+               IF( NOTRAN ) THEN
+                  IFUNC = IJOB
+               END IF
+               SCALE2 = SCALE
+               CALL ZLACPY( 'F', M, N, C, LDC, WORK, M )
+               CALL ZLACPY( 'F', M, N, F, LDF, WORK( M*N+1 ), M )
+               CALL ZLASET( 'F', M, N, CZERO, CZERO, C, LDC )
+               CALL ZLASET( 'F', M, N, CZERO, CZERO, F, LDF )
+            ELSE IF( ISOLVE.EQ.2 .AND. IROUND.EQ.2 ) THEN
+               CALL ZLACPY( 'F', M, N, WORK, M, C, LDC )
+               CALL ZLACPY( 'F', M, N, WORK( M*N+1 ), M, F, LDF )
+               SCALE = SCALE2
+            END IF
+  150    CONTINUE
+      ELSE
 *
-            CALL ZUNGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
-     $                   IINFO )
+*        Solve transposed (I, J)-subsystem
+*            A(I, I)**H * R(I, J) + D(I, I)**H * L(I, J) = C(I, J)
+*            R(I, J) * B(J, J)  + L(I, J) * E(J, J) = -F(I, J)
+*        for I = 1,2,..., P; J = Q, Q-1,..., 1
+*
+         SCALE = ONE
+         DO 210 I = 1, P
+            IS = IWORK( I )
+            IE = IWORK( I+1 ) - 1
+            MB = IE - IS + 1
+            DO 200 J = Q, P + 2, -1
+               JS = IWORK( J )
+               JE = IWORK( J+1 ) - 1
+               NB = JE - JS + 1
+               CALL ZTGSY2( TRANS, IFUNC, MB, NB, A( IS, IS ), LDA,
+     $                      B( JS, JS ), LDB, C( IS, JS ), LDC,
+     $                      D( IS, IS ), LDD, E( JS, JS ), LDE,
+     $                      F( IS, JS ), LDF, SCALOC, DSUM, DSCALE,
+     $                      LINFO )
+               IF( LINFO.GT.0 )
+     $            INFO = LINFO
+               IF( SCALOC.NE.ONE ) THEN
+                  DO 160 K = 1, JS - 1
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1, K ),
+     $                           1 )
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1, K ),
+     $                           1 )
+  160             CONTINUE
+                  DO 170 K = JS, JE
+                     CALL ZSCAL( IS-1, DCMPLX( SCALOC, ZERO ),
+     $                           C( 1, K ), 1 )
+                     CALL ZSCAL( IS-1, DCMPLX( SCALOC, ZERO ),
+     $                           F( 1, K ), 1 )
+  170             CONTINUE
+                  DO 180 K = JS, JE
+                     CALL ZSCAL( M-IE, DCMPLX( SCALOC, ZERO ),
+     $                           C( IE+1, K ), 1 )
+                     CALL ZSCAL( M-IE, DCMPLX( SCALOC, ZERO ),
+     $                           F( IE+1, K ), 1 )
+  180             CONTINUE
+                  DO 190 K = JE + 1, N
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), C( 1, K ),
+     $                           1 )
+                     CALL ZSCAL( M, DCMPLX( SCALOC, ZERO ), F( 1, K ),
+     $                           1 )
+  190             CONTINUE
+                  SCALE = SCALE*SCALOC
+               END IF
 *
-*           Set columns 1:i-1 of current block to zero
+*              Substitute R(I,J) and L(I,J) into remaining equation.
 *
-            DO 40 J = 1, I - 1
-               DO 30 L = I, I + IB - 1
-                  A( L, J ) = ZERO
-   30          CONTINUE
-   40       CONTINUE
-   50    CONTINUE
+               IF( J.GT.P+2 ) THEN
+                  CALL ZGEMM( 'N', 'C', MB, JS-1, NB,
+     $                        DCMPLX( ONE, ZERO ), C( IS, JS ), LDC,
+     $                        B( 1, JS ), LDB, DCMPLX( ONE, ZERO ),
+     $                        F( IS, 1 ), LDF )
+                  CALL ZGEMM( 'N', 'C', MB, JS-1, NB,
+     $                        DCMPLX( ONE, ZERO ), F( IS, JS ), LDF,
+     $                        E( 1, JS ), LDE, DCMPLX( ONE, ZERO ),
+     $                        F( IS, 1 ), LDF )
+               END IF
+               IF( I.LT.P ) THEN
+                  CALL ZGEMM( 'C', 'N', M-IE, NB, MB,
+     $                        DCMPLX( -ONE, ZERO ), A( IS, IE+1 ), LDA,
+     $                        C( IS, JS ), LDC, DCMPLX( ONE, ZERO ),
+     $                        C( IE+1, JS ), LDC )
+                  CALL ZGEMM( 'C', 'N', M-IE, NB, MB,
+     $                        DCMPLX( -ONE, ZERO ), D( IS, IE+1 ), LDD,
+     $                        F( IS, JS ), LDF, DCMPLX( ONE, ZERO ),
+     $                        C( IE+1, JS ), LDC )
+               END IF
+  200       CONTINUE
+  210    CONTINUE
       END IF
 *
-      WORK( 1 ) = IWS
+      WORK( 1 ) = LWMIN
+*
       RETURN
 *
-*     End of ZUNGLQ
+*     End of ZTGSYL
 *
       END
-*> \brief \b ZUNGQL
+*> \brief \b ZTRCON
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -28230,25 +46830,29 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGQL + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungql.f"> 
+*> Download ZTRCON + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrcon.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungql.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrcon.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungql.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrcon.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
+*                          RWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       CHARACTER          DIAG, NORM, UPLO
+*       INTEGER            INFO, LDA, N
+*       DOUBLE PRECISION   RCOND
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         A( LDA, * ), WORK( * )
 *       ..
 *  
 *
@@ -28257,84 +46861,88 @@
 *>
 *> \verbatim
 *>
-*> ZUNGQL generates an M-by-N complex matrix Q with orthonormal columns,
-*> which is defined as the last N columns of a product of K elementary
-*> reflectors of order M
-*>
-*>       Q  =  H(k) . . . H(2) H(1)
+*> ZTRCON estimates the reciprocal of the condition number of a
+*> triangular matrix A, in either the 1-norm or the infinity-norm.
 *>
-*> as returned by ZGEQLF.
+*> The norm of A is computed and an estimate is obtained for
+*> norm(inv(A)), then the reciprocal of the condition number is
+*> computed as
+*>    RCOND = 1 / ( norm(A) * norm(inv(A)) ).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] NORM
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          NORM is CHARACTER*1
+*>          Specifies whether the 1-norm condition number or the
+*>          infinity-norm condition number is required:
+*>          = '1' or 'O':  1-norm;
+*>          = 'I':         Infinity-norm.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] UPLO
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix Q. M >= N >= 0.
+*>          UPLO is CHARACTER*1
+*>          = 'U':  A is upper triangular;
+*>          = 'L':  A is lower triangular.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] DIAG
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. N >= K >= 0.
+*>          DIAG is CHARACTER*1
+*>          = 'N':  A is non-unit triangular;
+*>          = 'U':  A is unit triangular.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the (n-k+i)-th column must contain the vector which
-*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by ZGEQLF in the last k columns of its array
-*>          argument A.
-*>          On exit, the M-by-N matrix Q.
+*>          The triangular matrix A.  If UPLO = 'U', the leading N-by-N
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading N-by-N lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[out] RCOND
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEQLF.
+*>          RCOND is DOUBLE PRECISION
+*>          The reciprocal of the condition number of the matrix A,
+*>          computed as RCOND = 1/(norm(A) * norm(inv(A))).
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*>          WORK is COMPLEX*16 array, dimension (2*N)
 *> \endverbatim
 *>
-*> \param[in] LWORK
+*> \param[out] RWORK
 *> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,N).
-*>          For optimum performance LWORK >= N*NB, where NB is the
-*>          optimal blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          RWORK is DOUBLE PRECISION array, dimension (N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -28350,7 +46958,8 @@
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTRCON( NORM, UPLO, DIAG, N, A, LDA, RCOND, WORK,
+     $                   RWORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -28358,167 +46967,145 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, LWORK, M, N
+      CHARACTER          DIAG, NORM, UPLO
+      INTEGER            INFO, LDA, N
+      DOUBLE PRECISION   RCOND
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         A( LDA, * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, J, KK, L, LDWORK, LWKOPT,
-     $                   NB, NBMIN, NX
+      LOGICAL            NOUNIT, ONENRM, UPPER
+      CHARACTER          NORMIN
+      INTEGER            IX, KASE, KASE1
+      DOUBLE PRECISION   AINVNM, ANORM, SCALE, SMLNUM, XNORM
+      COMPLEX*16         ZDUM
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISAVE( 3 )
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            IZAMAX
+      DOUBLE PRECISION   DLAMCH, ZLANTR
+      EXTERNAL           LSAME, IZAMAX, DLAMCH, ZLANTR
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNG2L
+      EXTERNAL           XERBLA, ZDRSCL, ZLACN2, ZLATRS
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          ABS, DBLE, DIMAG, MAX
 *     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( ZDUM ) = ABS( DBLE( ZDUM ) ) + ABS( DIMAG( ZDUM ) )
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Test the input parameters.
 *
       INFO = 0
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
+      UPPER = LSAME( UPLO, 'U' )
+      ONENRM = NORM.EQ.'1' .OR. LSAME( NORM, 'O' )
+      NOUNIT = LSAME( DIAG, 'N' )
+*
+      IF( .NOT.ONENRM .AND. .NOT.LSAME( NORM, 'I' ) ) THEN
          INFO = -1
-      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
+      ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-         IF( N.EQ.0 ) THEN
-            LWKOPT = 1
-         ELSE
-            NB = ILAENV( 1, 'ZUNGQL', ' ', M, N, K, -1 )
-            LWKOPT = N*NB
-         END IF
-         WORK( 1 ) = LWKOPT
-*
-         IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-            INFO = -8
-         END IF
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -6
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGQL', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZTRCON', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( N.LE.0 ) THEN
+      IF( N.EQ.0 ) THEN
+         RCOND = ONE
          RETURN
       END IF
 *
-      NBMIN = 2
-      NX = 0
-      IWS = N
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
-*
-*        Determine when to cross over from blocked to unblocked code.
-*
-         NX = MAX( 0, ILAENV( 3, 'ZUNGQL', ' ', M, N, K, -1 ) )
-         IF( NX.LT.K ) THEN
-*
-*           Determine if workspace is large enough for blocked code.
-*
-            LDWORK = N
-            IWS = LDWORK*NB
-            IF( LWORK.LT.IWS ) THEN
-*
-*              Not enough workspace to use optimal NB:  reduce NB and
-*              determine the minimum value of NB.
-*
-               NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQL', ' ', M, N, K, -1 ) )
-            END IF
-         END IF
-      END IF
-*
-      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
-*
-*        Use blocked code after the first block.
-*        The last kk columns are handled by the block method.
-*
-         KK = MIN( K, ( ( K-NX+NB-1 ) / NB )*NB )
-*
-*        Set A(m-kk+1:m,1:n-kk) to zero.
+      RCOND = ZERO
+      SMLNUM = DLAMCH( 'Safe minimum' )*DBLE( MAX( 1, N ) )
 *
-         DO 20 J = 1, N - KK
-            DO 10 I = M - KK + 1, M
-               A( I, J ) = ZERO
-   10       CONTINUE
-   20    CONTINUE
-      ELSE
-         KK = 0
-      END IF
+*     Compute the norm of the triangular matrix A.
 *
-*     Use unblocked code for the first or only block.
+      ANORM = ZLANTR( NORM, UPLO, DIAG, N, N, A, LDA, RWORK )
 *
-      CALL ZUNG2L( M-KK, N-KK, K-KK, A, LDA, TAU, WORK, IINFO )
+*     Continue only if ANORM > 0.
 *
-      IF( KK.GT.0 ) THEN
+      IF( ANORM.GT.ZERO ) THEN
 *
-*        Use blocked code
+*        Estimate the norm of the inverse of A.
 *
-         DO 50 I = K - KK + 1, K, NB
-            IB = MIN( NB, K-I+1 )
-            IF( N-K+I.GT.1 ) THEN
+         AINVNM = ZERO
+         NORMIN = 'N'
+         IF( ONENRM ) THEN
+            KASE1 = 1
+         ELSE
+            KASE1 = 2
+         END IF
+         KASE = 0
+   10    CONTINUE
+         CALL ZLACN2( N, WORK( N+1 ), WORK, AINVNM, KASE, ISAVE )
+         IF( KASE.NE.0 ) THEN
+            IF( KASE.EQ.KASE1 ) THEN
 *
-*              Form the triangular factor of the block reflector
-*              H = H(i+ib-1) . . . H(i+1) H(i)
+*              Multiply by inv(A).
 *
-               CALL ZLARFT( 'Backward', 'Columnwise', M-K+I+IB-1, IB,
-     $                      A( 1, N-K+I ), LDA, TAU( I ), WORK, LDWORK )
+               CALL ZLATRS( UPLO, 'No transpose', DIAG, NORMIN, N, A,
+     $                      LDA, WORK, SCALE, RWORK, INFO )
+            ELSE
 *
-*              Apply H to A(1:m-k+i+ib-1,1:n-k+i-1) from the left
+*              Multiply by inv(A**H).
 *
-               CALL ZLARFB( 'Left', 'No transpose', 'Backward',
-     $                      'Columnwise', M-K+I+IB-1, N-K+I-1, IB,
-     $                      A( 1, N-K+I ), LDA, WORK, LDWORK, A, LDA,
-     $                      WORK( IB+1 ), LDWORK )
+               CALL ZLATRS( UPLO, 'Conjugate transpose', DIAG, NORMIN,
+     $                      N, A, LDA, WORK, SCALE, RWORK, INFO )
             END IF
+            NORMIN = 'Y'
 *
-*           Apply H to rows 1:m-k+i+ib-1 of current block
+*           Multiply by 1/SCALE if doing so will not cause overflow.
 *
-            CALL ZUNG2L( M-K+I+IB-1, IB, IB, A( 1, N-K+I ), LDA,
-     $                   TAU( I ), WORK, IINFO )
+            IF( SCALE.NE.ONE ) THEN
+               IX = IZAMAX( N, WORK, 1 )
+               XNORM = CABS1( WORK( IX ) )
+               IF( SCALE.LT.XNORM*SMLNUM .OR. SCALE.EQ.ZERO )
+     $            GO TO 20
+               CALL ZDRSCL( N, SCALE, WORK, 1 )
+            END IF
+            GO TO 10
+         END IF
 *
-*           Set rows m-k+i+ib:m of current block to zero
+*        Compute the estimate of the reciprocal condition number.
 *
-            DO 40 J = N - K + I, N - K + I + IB - 1
-               DO 30 L = M - K + I + IB, M
-                  A( L, J ) = ZERO
-   30          CONTINUE
-   40       CONTINUE
-   50    CONTINUE
+         IF( AINVNM.NE.ZERO )
+     $      RCOND = ( ONE / ANORM ) / AINVNM
       END IF
 *
-      WORK( 1 ) = IWS
+   20 CONTINUE
       RETURN
 *
-*     End of ZUNGQL
+*     End of ZTRCON
 *
       END
-*> \brief \b ZUNGQR
+*> \brief \b ZTREVC
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -28526,25 +47113,30 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGQR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungqr.f"> 
+*> Download ZTREVC + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrevc.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungqr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrevc.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungqr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrevc.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+*                          LDVR, MM, M, WORK, RWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       CHARACTER          HOWMNY, SIDE
+*       INTEGER            INFO, LDT, LDVL, LDVR, M, MM, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       LOGICAL            SELECT( * )
+*       DOUBLE PRECISION   RWORK( * )
+*       COMPLEX*16         T( LDT, * ), VL( LDVL, * ), VR( LDVR, * ),
+*      $                   WORK( * )
 *       ..
 *  
 *
@@ -28553,84 +47145,154 @@
 *>
 *> \verbatim
 *>
-*> ZUNGQR generates an M-by-N complex matrix Q with orthonormal columns,
-*> which is defined as the first N columns of a product of K elementary
-*> reflectors of order M
-*>
-*>       Q  =  H(1) H(2) . . . H(k)
-*>
-*> as returned by ZGEQRF.
+*> ZTREVC computes some or all of the right and/or left eigenvectors of
+*> a complex upper triangular matrix T.
+*> Matrices of this type are produced by the Schur factorization of
+*> a complex general matrix:  A = Q*T*Q**H, as computed by ZHSEQR.
+*> 
+*> The right eigenvector x and the left eigenvector y of T corresponding
+*> to an eigenvalue w are defined by:
+*> 
+*>              T*x = w*x,     (y**H)*T = w*(y**H)
+*> 
+*> where y**H denotes the conjugate transpose of the vector y.
+*> The eigenvalues are not input to this routine, but are read directly
+*> from the diagonal of T.
+*> 
+*> This routine returns the matrices X and/or Y of right and left
+*> eigenvectors of T, or the products Q*X and/or Q*Y, where Q is an
+*> input matrix.  If Q is the unitary factor that reduces a matrix A to
+*> Schur form T, then Q*X and Q*Y are the matrices of right and left
+*> eigenvectors of A.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] SIDE
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          SIDE is CHARACTER*1
+*>          = 'R':  compute right eigenvectors only;
+*>          = 'L':  compute left eigenvectors only;
+*>          = 'B':  compute both right and left eigenvectors.
+*> \endverbatim
+*>
+*> \param[in] HOWMNY
+*> \verbatim
+*>          HOWMNY is CHARACTER*1
+*>          = 'A':  compute all right and/or left eigenvectors;
+*>          = 'B':  compute all right and/or left eigenvectors,
+*>                  backtransformed using the matrices supplied in
+*>                  VR and/or VL;
+*>          = 'S':  compute selected right and/or left eigenvectors,
+*>                  as indicated by the logical array SELECT.
+*> \endverbatim
+*>
+*> \param[in] SELECT
+*> \verbatim
+*>          SELECT is LOGICAL array, dimension (N)
+*>          If HOWMNY = 'S', SELECT specifies the eigenvectors to be
+*>          computed.
+*>          The eigenvector corresponding to the j-th eigenvalue is
+*>          computed if SELECT(j) = .TRUE..
+*>          Not referenced if HOWMNY = 'A' or 'B'.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix Q. M >= N >= 0.
+*>          The order of the matrix T. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in,out] T
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. N >= K >= 0.
+*>          T is COMPLEX*16 array, dimension (LDT,N)
+*>          The upper triangular matrix T.  T is modified, but restored
+*>          on exit.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] LDT
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the i-th column must contain the vector which
-*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by ZGEQRF in the first k columns of its array
-*>          argument A.
-*>          On exit, the M-by-N matrix Q.
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in,out] VL
 *> \verbatim
-*>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          VL is COMPLEX*16 array, dimension (LDVL,MM)
+*>          On entry, if SIDE = 'L' or 'B' and HOWMNY = 'B', VL must
+*>          contain an N-by-N matrix Q (usually the unitary matrix Q of
+*>          Schur vectors returned by ZHSEQR).
+*>          On exit, if SIDE = 'L' or 'B', VL contains:
+*>          if HOWMNY = 'A', the matrix Y of left eigenvectors of T;
+*>          if HOWMNY = 'B', the matrix Q*Y;
+*>          if HOWMNY = 'S', the left eigenvectors of T specified by
+*>                           SELECT, stored consecutively in the columns
+*>                           of VL, in the same order as their
+*>                           eigenvalues.
+*>          Not referenced if SIDE = 'R'.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] LDVL
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEQRF.
+*>          LDVL is INTEGER
+*>          The leading dimension of the array VL.  LDVL >= 1, and if
+*>          SIDE = 'L' or 'B', LDVL >= N.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in,out] VR
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*>          VR is COMPLEX*16 array, dimension (LDVR,MM)
+*>          On entry, if SIDE = 'R' or 'B' and HOWMNY = 'B', VR must
+*>          contain an N-by-N matrix Q (usually the unitary matrix Q of
+*>          Schur vectors returned by ZHSEQR).
+*>          On exit, if SIDE = 'R' or 'B', VR contains:
+*>          if HOWMNY = 'A', the matrix X of right eigenvectors of T;
+*>          if HOWMNY = 'B', the matrix Q*X;
+*>          if HOWMNY = 'S', the right eigenvectors of T specified by
+*>                           SELECT, stored consecutively in the columns
+*>                           of VR, in the same order as their
+*>                           eigenvalues.
+*>          Not referenced if SIDE = 'L'.
 *> \endverbatim
 *>
-*> \param[in] LWORK
+*> \param[in] LDVR
 *> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,N).
-*>          For optimum performance LWORK >= N*NB, where NB is the
-*>          optimal blocksize.
+*>          LDVR is INTEGER
+*>          The leading dimension of the array VR.  LDVR >= 1, and if
+*>          SIDE = 'R' or 'B'; LDVR >= N.
+*> \endverbatim
 *>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*> \param[in] MM
+*> \verbatim
+*>          MM is INTEGER
+*>          The number of columns in the arrays VL and/or VR. MM >= M.
+*> \endverbatim
+*>
+*> \param[out] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of columns in the arrays VL and/or VR actually
+*>          used to store the eigenvectors.  If HOWMNY = 'A' or 'B', M
+*>          is set to N.  Each selected eigenvector occupies one
+*>          column.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (2*N)
+*> \endverbatim
+*>
+*> \param[out] RWORK
+*> \verbatim
+*>          RWORK is DOUBLE PRECISION array, dimension (N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -28645,8 +47307,23 @@
 *
 *> \ingroup complex16OTHERcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The algorithm used in this program is basically backward (forward)
+*>  substitution, with scaling to make the the code robust against
+*>  possible overflow.
+*>
+*>  Each eigenvector is normalized so that the element of largest
+*>  magnitude has magnitude 1; here the magnitude of a complex number
+*>  (x,y) is taken to be |x| + |y|.
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
+     $                   LDVR, MM, M, WORK, RWORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -28654,366 +47331,267 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, LWORK, M, N
+      CHARACTER          HOWMNY, SIDE
+      INTEGER            INFO, LDT, LDVL, LDVR, M, MM, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      LOGICAL            SELECT( * )
+      DOUBLE PRECISION   RWORK( * )
+      COMPLEX*16         T( LDT, * ), VL( LDVL, * ), VR( LDVR, * ),
+     $                   WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+      COMPLEX*16         CMZERO, CMONE
+      PARAMETER          ( CMZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   CMONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, J, KI, KK, L, LDWORK,
-     $                   LWKOPT, NB, NBMIN, NX
+      LOGICAL            ALLV, BOTHV, LEFTV, OVER, RIGHTV, SOMEV
+      INTEGER            I, II, IS, J, K, KI
+      DOUBLE PRECISION   OVFL, REMAX, SCALE, SMIN, SMLNUM, ULP, UNFL
+      COMPLEX*16         CDUM
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            IZAMAX
+      DOUBLE PRECISION   DLAMCH, DZASUM
+      EXTERNAL           LSAME, IZAMAX, DLAMCH, DZASUM
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNG2R
+      EXTERNAL           XERBLA, ZCOPY, ZDSCAL, ZGEMV, ZLATRS
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX
 *     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
+*     .. Statement Functions ..
+      DOUBLE PRECISION   CABS1
+*     ..
+*     .. Statement Function definitions ..
+      CABS1( CDUM ) = ABS( DBLE( CDUM ) ) + ABS( DIMAG( CDUM ) )
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and test the input parameters
+*
+      BOTHV = LSAME( SIDE, 'B' )
+      RIGHTV = LSAME( SIDE, 'R' ) .OR. BOTHV
+      LEFTV = LSAME( SIDE, 'L' ) .OR. BOTHV
+*
+      ALLV = LSAME( HOWMNY, 'A' )
+      OVER = LSAME( HOWMNY, 'B' )
+      SOMEV = LSAME( HOWMNY, 'S' )
+*
+*     Set M to the number of columns required to store the selected
+*     eigenvectors.
+*
+      IF( SOMEV ) THEN
+         M = 0
+         DO 10 J = 1, N
+            IF( SELECT( J ) )
+     $         M = M + 1
+   10    CONTINUE
+      ELSE
+         M = N
+      END IF
 *
       INFO = 0
-      NB = ILAENV( 1, 'ZUNGQR', ' ', M, N, K, -1 )
-      LWKOPT = MAX( 1, N )*NB
-      WORK( 1 ) = LWKOPT
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
+      IF( .NOT.RIGHTV .AND. .NOT.LEFTV ) THEN
          INFO = -1
-      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
+      ELSE IF( .NOT.ALLV .AND. .NOT.OVER .AND. .NOT.SOMEV ) THEN
          INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
+         INFO = -6
+      ELSE IF( LDVL.LT.1 .OR. ( LEFTV .AND. LDVL.LT.N ) ) THEN
          INFO = -8
+      ELSE IF( LDVR.LT.1 .OR. ( RIGHTV .AND. LDVR.LT.N ) ) THEN
+         INFO = -10
+      ELSE IF( MM.LT.M ) THEN
+         INFO = -11
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGQR', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         RETURN
-      END IF
-*
-*     Quick return if possible
-*
-      IF( N.LE.0 ) THEN
-         WORK( 1 ) = 1
+         CALL XERBLA( 'ZTREVC', -INFO )
          RETURN
       END IF
 *
-      NBMIN = 2
-      NX = 0
-      IWS = N
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
-*
-*        Determine when to cross over from blocked to unblocked code.
-*
-         NX = MAX( 0, ILAENV( 3, 'ZUNGQR', ' ', M, N, K, -1 ) )
-         IF( NX.LT.K ) THEN
-*
-*           Determine if workspace is large enough for blocked code.
-*
-            LDWORK = N
-            IWS = LDWORK*NB
-            IF( LWORK.LT.IWS ) THEN
-*
-*              Not enough workspace to use optimal NB:  reduce NB and
-*              determine the minimum value of NB.
-*
-               NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQR', ' ', M, N, K, -1 ) )
-            END IF
-         END IF
-      END IF
-*
-      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
-*
-*        Use blocked code after the last block.
-*        The first kk columns are handled by the block method.
-*
-         KI = ( ( K-NX-1 ) / NB )*NB
-         KK = MIN( K, KI+NB )
+*     Quick return if possible.
 *
-*        Set A(1:kk,kk+1:n) to zero.
+      IF( N.EQ.0 )
+     $   RETURN
 *
-         DO 20 J = KK + 1, N
-            DO 10 I = 1, KK
-               A( I, J ) = ZERO
-   10       CONTINUE
-   20    CONTINUE
-      ELSE
-         KK = 0
-      END IF
+*     Set the constants to control overflow.
 *
-*     Use unblocked code for the last or only block.
+      UNFL = DLAMCH( 'Safe minimum' )
+      OVFL = ONE / UNFL
+      CALL DLABAD( UNFL, OVFL )
+      ULP = DLAMCH( 'Precision' )
+      SMLNUM = UNFL*( N / ULP )
 *
-      IF( KK.LT.N )
-     $   CALL ZUNG2R( M-KK, N-KK, K-KK, A( KK+1, KK+1 ), LDA,
-     $                TAU( KK+1 ), WORK, IINFO )
+*     Store the diagonal elements of T in working array WORK.
 *
-      IF( KK.GT.0 ) THEN
+      DO 20 I = 1, N
+         WORK( I+N ) = T( I, I )
+   20 CONTINUE
 *
-*        Use blocked code
+*     Compute 1-norm of each column of strictly upper triangular
+*     part of T to control overflow in triangular solver.
 *
-         DO 50 I = KI + 1, 1, -NB
-            IB = MIN( NB, K-I+1 )
-            IF( I+IB.LE.N ) THEN
+      RWORK( 1 ) = ZERO
+      DO 30 J = 2, N
+         RWORK( J ) = DZASUM( J-1, T( 1, J ), 1 )
+   30 CONTINUE
 *
-*              Form the triangular factor of the block reflector
-*              H = H(i) H(i+1) . . . H(i+ib-1)
+      IF( RIGHTV ) THEN
 *
-               CALL ZLARFT( 'Forward', 'Columnwise', M-I+1, IB,
-     $                      A( I, I ), LDA, TAU( I ), WORK, LDWORK )
+*        Compute right eigenvectors.
 *
-*              Apply H to A(i:m,i+ib:n) from the left
+         IS = M
+         DO 80 KI = N, 1, -1
 *
-               CALL ZLARFB( 'Left', 'No transpose', 'Forward',
-     $                      'Columnwise', M-I+1, N-I-IB+1, IB,
-     $                      A( I, I ), LDA, WORK, LDWORK, A( I, I+IB ),
-     $                      LDA, WORK( IB+1 ), LDWORK )
+            IF( SOMEV ) THEN
+               IF( .NOT.SELECT( KI ) )
+     $            GO TO 80
             END IF
+            SMIN = MAX( ULP*( CABS1( T( KI, KI ) ) ), SMLNUM )
 *
-*           Apply H to rows i:m of current block
-*
-            CALL ZUNG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ), WORK,
-     $                   IINFO )
+            WORK( 1 ) = CMONE
 *
-*           Set rows 1:i-1 of current block to zero
+*           Form right-hand side.
 *
-            DO 40 J = I, I + IB - 1
-               DO 30 L = 1, I - 1
-                  A( L, J ) = ZERO
-   30          CONTINUE
+            DO 40 K = 1, KI - 1
+               WORK( K ) = -T( K, KI )
    40       CONTINUE
-   50    CONTINUE
-      END IF
-*
-      WORK( 1 ) = IWS
-      RETURN
-*
-*     End of ZUNGQR
-*
-      END
-*> \brief \b ZUNGR2 generates all or part of the unitary matrix Q from an RQ factorization determined by cgerqf (unblocked algorithm).
 *
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
+*           Solve the triangular system:
+*              (T(1:KI-1,1:KI-1) - T(KI,KI))*X = SCALE*WORK.
 *
-*> \htmlonly
-*> Download ZUNGR2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungr2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungr2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungr2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
+            DO 50 K = 1, KI - 1
+               T( K, K ) = T( K, K ) - T( KI, KI )
+               IF( CABS1( T( K, K ) ).LT.SMIN )
+     $            T( K, K ) = SMIN
+   50       CONTINUE
 *
-*  Definition:
-*  ===========
+            IF( KI.GT.1 ) THEN
+               CALL ZLATRS( 'Upper', 'No transpose', 'Non-unit', 'Y',
+     $                      KI-1, T, LDT, WORK( 1 ), SCALE, RWORK,
+     $                      INFO )
+               WORK( KI ) = SCALE
+            END IF
 *
-*       SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, M, N
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
+*           Copy the vector x or Q*x to VR and normalize.
 *
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZUNGR2 generates an m by n complex matrix Q with orthonormal rows,
-*> which is defined as the last m rows of a product of k elementary
-*> reflectors of order n
-*>
-*>       Q  =  H(1)**H H(2)**H . . . H(k)**H
-*>
-*> as returned by ZGERQF.
-*> \endverbatim
+            IF( .NOT.OVER ) THEN
+               CALL ZCOPY( KI, WORK( 1 ), 1, VR( 1, IS ), 1 )
 *
-*  Arguments:
-*  ==========
+               II = IZAMAX( KI, VR( 1, IS ), 1 )
+               REMAX = ONE / CABS1( VR( II, IS ) )
+               CALL ZDSCAL( KI, REMAX, VR( 1, IS ), 1 )
 *
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix Q. N >= M.
-*> \endverbatim
-*>
-*> \param[in] K
-*> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. M >= K >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the (m-k+i)-th row must contain the vector which
-*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by ZGERQF in the last k rows of its array argument
-*>          A.
-*>          On exit, the m-by-n matrix Q.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[in] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGERQF.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (M)
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -i, the i-th argument has an illegal value
-*> \endverbatim
+               DO 60 K = KI + 1, N
+                  VR( K, IS ) = CMZERO
+   60          CONTINUE
+            ELSE
+               IF( KI.GT.1 )
+     $            CALL ZGEMV( 'N', N, KI-1, CMONE, VR, LDVR, WORK( 1 ),
+     $                        1, DCMPLX( SCALE ), VR( 1, KI ), 1 )
 *
-*  Authors:
-*  ========
+               II = IZAMAX( N, VR( 1, KI ), 1 )
+               REMAX = ONE / CABS1( VR( II, KI ) )
+               CALL ZDSCAL( N, REMAX, VR( 1, KI ), 1 )
+            END IF
 *
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
+*           Set back the original diagonal elements of T.
 *
-*> \date September 2012
+            DO 70 K = 1, KI - 1
+               T( K, K ) = WORK( K+N )
+   70       CONTINUE
 *
-*> \ingroup complex16OTHERcomputational
+            IS = IS - 1
+   80    CONTINUE
+      END IF
 *
-*  =====================================================================
-      SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
+      IF( LEFTV ) THEN
 *
-*  -- LAPACK computational routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*        Compute left eigenvectors.
 *
-*     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, M, N
-*     ..
-*     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
-*     ..
+         IS = 1
+         DO 130 KI = 1, N
 *
-*  =====================================================================
+            IF( SOMEV ) THEN
+               IF( .NOT.SELECT( KI ) )
+     $            GO TO 130
+            END IF
+            SMIN = MAX( ULP*( CABS1( T( KI, KI ) ) ), SMLNUM )
 *
-*     .. Parameters ..
-      COMPLEX*16         ONE, ZERO
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
-     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, II, J, L
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZSCAL
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG, MAX
-*     ..
-*     .. Executable Statements ..
+            WORK( N ) = CMONE
 *
-*     Test the input arguments
+*           Form right-hand side.
 *
-      INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.M ) THEN
-         INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGR2', -INFO )
-         RETURN
-      END IF
+            DO 90 K = KI + 1, N
+               WORK( K ) = -DCONJG( T( KI, K ) )
+   90       CONTINUE
 *
-*     Quick return if possible
+*           Solve the triangular system:
+*              (T(KI+1:N,KI+1:N) - T(KI,KI))**H * X = SCALE*WORK.
 *
-      IF( M.LE.0 )
-     $   RETURN
+            DO 100 K = KI + 1, N
+               T( K, K ) = T( K, K ) - T( KI, KI )
+               IF( CABS1( T( K, K ) ).LT.SMIN )
+     $            T( K, K ) = SMIN
+  100       CONTINUE
 *
-      IF( K.LT.M ) THEN
+            IF( KI.LT.N ) THEN
+               CALL ZLATRS( 'Upper', 'Conjugate transpose', 'Non-unit',
+     $                      'Y', N-KI, T( KI+1, KI+1 ), LDT,
+     $                      WORK( KI+1 ), SCALE, RWORK, INFO )
+               WORK( KI ) = SCALE
+            END IF
 *
-*        Initialise rows 1:m-k to rows of the unit matrix
+*           Copy the vector x or Q*x to VL and normalize.
 *
-         DO 20 J = 1, N
-            DO 10 L = 1, M - K
-               A( L, J ) = ZERO
-   10       CONTINUE
-            IF( J.GT.N-M .AND. J.LE.N-K )
-     $         A( M-N+J, J ) = ONE
-   20    CONTINUE
-      END IF
+            IF( .NOT.OVER ) THEN
+               CALL ZCOPY( N-KI+1, WORK( KI ), 1, VL( KI, IS ), 1 )
 *
-      DO 40 I = 1, K
-         II = M - K + I
+               II = IZAMAX( N-KI+1, VL( KI, IS ), 1 ) + KI - 1
+               REMAX = ONE / CABS1( VL( II, IS ) )
+               CALL ZDSCAL( N-KI+1, REMAX, VL( KI, IS ), 1 )
 *
-*        Apply H(i)**H to A(1:m-k+i,1:n-k+i) from the right
+               DO 110 K = 1, KI - 1
+                  VL( K, IS ) = CMZERO
+  110          CONTINUE
+            ELSE
+               IF( KI.LT.N )
+     $            CALL ZGEMV( 'N', N, N-KI, CMONE, VL( 1, KI+1 ), LDVL,
+     $                        WORK( KI+1 ), 1, DCMPLX( SCALE ),
+     $                        VL( 1, KI ), 1 )
 *
-         CALL ZLACGV( N-M+II-1, A( II, 1 ), LDA )
-         A( II, N-M+II ) = ONE
-         CALL ZLARF( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
-     $               DCONJG( TAU( I ) ), A, LDA, WORK )
-         CALL ZSCAL( N-M+II-1, -TAU( I ), A( II, 1 ), LDA )
-         CALL ZLACGV( N-M+II-1, A( II, 1 ), LDA )
-         A( II, N-M+II ) = ONE - DCONJG( TAU( I ) )
+               II = IZAMAX( N, VL( 1, KI ), 1 )
+               REMAX = ONE / CABS1( VL( II, KI ) )
+               CALL ZDSCAL( N, REMAX, VL( 1, KI ), 1 )
+            END IF
 *
-*        Set A(m-k+i,n-k+i+1:n) to zero
+*           Set back the original diagonal elements of T.
+*
+            DO 120 K = KI + 1, N
+               T( K, K ) = WORK( K+N )
+  120       CONTINUE
+*
+            IS = IS + 1
+  130    CONTINUE
+      END IF
 *
-         DO 30 L = N - M + II + 1, N
-            A( II, L ) = ZERO
-   30    CONTINUE
-   40 CONTINUE
       RETURN
 *
-*     End of ZUNGR2
+*     End of ZTREVC
 *
       END
-*> \brief \b ZUNGRQ
+*> \brief \b ZTREXC
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -29021,25 +47599,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGRQ + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungrq.f"> 
+*> Download ZTREXC + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrexc.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungrq.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrexc.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungrq.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrexc.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       CHARACTER          COMPQ
+*       INTEGER            IFST, ILST, INFO, LDQ, LDT, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         Q( LDQ, * ), T( LDT, * )
 *       ..
 *  
 *
@@ -29048,84 +47627,79 @@
 *>
 *> \verbatim
 *>
-*> ZUNGRQ generates an M-by-N complex matrix Q with orthonormal rows,
-*> which is defined as the last M rows of a product of K elementary
-*> reflectors of order N
-*>
-*>       Q  =  H(1)**H H(2)**H . . . H(k)**H
+*> ZTREXC reorders the Schur factorization of a complex matrix
+*> A = Q*T*Q**H, so that the diagonal element of T with row index IFST
+*> is moved to row ILST.
 *>
-*> as returned by ZGERQF.
+*> The Schur form T is reordered by a unitary similarity transformation
+*> Z**H*T*Z, and optionally the matrix Q of Schur vectors is updated by
+*> postmultplying it with Z.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] M
+*> \param[in] COMPQ
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix Q. M >= 0.
+*>          COMPQ is CHARACTER*1
+*>          = 'V':  update the matrix Q of Schur vectors;
+*>          = 'N':  do not update Q.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix Q. N >= M.
+*>          The order of the matrix T. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in,out] T
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines the
-*>          matrix Q. M >= K >= 0.
+*>          T is COMPLEX*16 array, dimension (LDT,N)
+*>          On entry, the upper triangular matrix T.
+*>          On exit, the reordered upper triangular matrix.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[in] LDT
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the (m-k+i)-th row must contain the vector which
-*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by ZGERQF in the last k rows of its array argument
-*>          A.
-*>          On exit, the M-by-N matrix Q.
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in,out] Q
 *> \verbatim
-*>          LDA is INTEGER
-*>          The first dimension of the array A. LDA >= max(1,M).
+*>          Q is COMPLEX*16 array, dimension (LDQ,N)
+*>          On entry, if COMPQ = 'V', the matrix Q of Schur vectors.
+*>          On exit, if COMPQ = 'V', Q has been postmultiplied by the
+*>          unitary transformation matrix Z which reorders T.
+*>          If COMPQ = 'N', Q is not referenced.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] LDQ
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGERQF.
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q.  LDQ >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] IFST
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*>          IFST is INTEGER
 *> \endverbatim
 *>
-*> \param[in] LWORK
+*> \param[in] ILST
 *> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= max(1,M).
-*>          For optimum performance LWORK >= M*NB, where NB is the
-*>          optimal blocksize.
+*>          ILST is INTEGER
 *>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          Specify the reordering of the diagonal elements of T:
+*>          The element with row index IFST is moved to row ILST by a
+*>          sequence of transpositions between adjacent elements.
+*>          1 <= IFST <= N; 1 <= ILST <= N.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
 *>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -29141,7 +47715,7 @@
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTREXC( COMPQ, N, T, LDT, Q, LDQ, IFST, ILST, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -29149,168 +47723,114 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, K, LDA, LWORK, M, N
+      CHARACTER          COMPQ
+      INTEGER            IFST, ILST, INFO, LDQ, LDT, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      COMPLEX*16         Q( LDQ, * ), T( LDT, * )
 *     ..
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      COMPLEX*16         ZERO
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IB, II, IINFO, IWS, J, KK, L, LDWORK,
-     $                   LWKOPT, NB, NBMIN, NX
+      LOGICAL            WANTQ
+      INTEGER            K, M1, M2, M3
+      DOUBLE PRECISION   CS
+      COMPLEX*16         SN, T11, T22, TEMP
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNGR2
+      EXTERNAL           XERBLA, ZLARTG, ZROT
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
+      INTRINSIC          DCONJG, MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and test the input parameters.
 *
       INFO = 0
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
+      WANTQ = LSAME( COMPQ, 'V' )
+      IF( .NOT.LSAME( COMPQ, 'N' ) .AND. .NOT.WANTQ ) THEN
          INFO = -1
-      ELSE IF( N.LT.M ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -2
-      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-         IF( M.LE.0 ) THEN
-            LWKOPT = 1
-         ELSE
-            NB = ILAENV( 1, 'ZUNGRQ', ' ', M, N, K, -1 )
-            LWKOPT = M*NB
-         END IF
-         WORK( 1 ) = LWKOPT
-*
-         IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
-            INFO = -8
-         END IF
+      ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.MAX( 1, N ) ) ) THEN
+         INFO = -6
+      ELSE IF( IFST.LT.1 .OR. IFST.GT.N ) THEN
+         INFO = -7
+      ELSE IF( ILST.LT.1 .OR. ILST.GT.N ) THEN
+         INFO = -8
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGRQ', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZTREXC', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.LE.0 ) THEN
-         RETURN
-      END IF
-*
-      NBMIN = 2
-      NX = 0
-      IWS = M
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
-*
-*        Determine when to cross over from blocked to unblocked code.
-*
-         NX = MAX( 0, ILAENV( 3, 'ZUNGRQ', ' ', M, N, K, -1 ) )
-         IF( NX.LT.K ) THEN
-*
-*           Determine if workspace is large enough for blocked code.
-*
-            LDWORK = M
-            IWS = LDWORK*NB
-            IF( LWORK.LT.IWS ) THEN
-*
-*              Not enough workspace to use optimal NB:  reduce NB and
-*              determine the minimum value of NB.
-*
-               NB = LWORK / LDWORK
-               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGRQ', ' ', M, N, K, -1 ) )
-            END IF
-         END IF
-      END IF
+      IF( N.EQ.1 .OR. IFST.EQ.ILST )
+     $   RETURN
 *
-      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
+      IF( IFST.LT.ILST ) THEN
 *
-*        Use blocked code after the first block.
-*        The last kk rows are handled by the block method.
+*        Move the IFST-th diagonal element forward down the diagonal.
 *
-         KK = MIN( K, ( ( K-NX+NB-1 ) / NB )*NB )
+         M1 = 0
+         M2 = -1
+         M3 = 1
+      ELSE
 *
-*        Set A(1:m-kk,n-kk+1:n) to zero.
+*        Move the IFST-th diagonal element backward up the diagonal.
 *
-         DO 20 J = N - KK + 1, N
-            DO 10 I = 1, M - KK
-               A( I, J ) = ZERO
-   10       CONTINUE
-   20    CONTINUE
-      ELSE
-         KK = 0
+         M1 = -1
+         M2 = 0
+         M3 = -1
       END IF
 *
-*     Use unblocked code for the first or only block.
-*
-      CALL ZUNGR2( M-KK, N-KK, K-KK, A, LDA, TAU, WORK, IINFO )
+      DO 10 K = IFST + M1, ILST + M2, M3
 *
-      IF( KK.GT.0 ) THEN
+*        Interchange the k-th and (k+1)-th diagonal elements.
 *
-*        Use blocked code
+         T11 = T( K, K )
+         T22 = T( K+1, K+1 )
 *
-         DO 50 I = K - KK + 1, K, NB
-            IB = MIN( NB, K-I+1 )
-            II = M - K + I
-            IF( II.GT.1 ) THEN
+*        Determine the transformation to perform the interchange.
 *
-*              Form the triangular factor of the block reflector
-*              H = H(i+ib-1) . . . H(i+1) H(i)
+         CALL ZLARTG( T( K, K+1 ), T22-T11, CS, SN, TEMP )
 *
-               CALL ZLARFT( 'Backward', 'Rowwise', N-K+I+IB-1, IB,
-     $                      A( II, 1 ), LDA, TAU( I ), WORK, LDWORK )
+*        Apply transformation to the matrix T.
 *
-*              Apply H**H to A(1:m-k+i-1,1:n-k+i+ib-1) from the right
+         IF( K+2.LE.N )
+     $      CALL ZROT( N-K-1, T( K, K+2 ), LDT, T( K+1, K+2 ), LDT, CS,
+     $                 SN )
+         CALL ZROT( K-1, T( 1, K ), 1, T( 1, K+1 ), 1, CS,
+     $              DCONJG( SN ) )
 *
-               CALL ZLARFB( 'Right', 'Conjugate transpose', 'Backward',
-     $                      'Rowwise', II-1, N-K+I+IB-1, IB, A( II, 1 ),
-     $                      LDA, WORK, LDWORK, A, LDA, WORK( IB+1 ),
-     $                      LDWORK )
-            END IF
+         T( K, K ) = T22
+         T( K+1, K+1 ) = T11
 *
-*           Apply H**H to columns 1:n-k+i+ib-1 of current block
+         IF( WANTQ ) THEN
 *
-            CALL ZUNGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA, TAU( I ),
-     $                   WORK, IINFO )
+*           Accumulate transformation in the matrix Q.
 *
-*           Set columns n-k+i+ib:n of current block to zero
+            CALL ZROT( N, Q( 1, K ), 1, Q( 1, K+1 ), 1, CS,
+     $                 DCONJG( SN ) )
+         END IF
 *
-            DO 40 L = N - K + I + IB, N
-               DO 30 J = II, II + IB - 1
-                  A( J, L ) = ZERO
-   30          CONTINUE
-   40       CONTINUE
-   50    CONTINUE
-      END IF
+   10 CONTINUE
 *
-      WORK( 1 ) = IWS
       RETURN
 *
-*     End of ZUNGRQ
+*     End of ZTREXC
 *
       END
-*> \brief \b ZUNGTR
+*> \brief \b ZTRSEN
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -29318,26 +47838,29 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNGTR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungtr.f"> 
+*> Download ZTRSEN + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrsen.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungtr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrsen.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungtr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrsen.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+*       SUBROUTINE ZTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
+*                          SEP, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            INFO, LDA, LWORK, N
+*       CHARACTER          COMPQ, JOB
+*       INTEGER            INFO, LDQ, LDT, LWORK, M, N
+*       DOUBLE PRECISION   S, SEP
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       LOGICAL            SELECT( * )
+*       COMPLEX*16         Q( LDQ, * ), T( LDT, * ), W( * ), WORK( * )
 *       ..
 *  
 *
@@ -29346,52 +47869,114 @@
 *>
 *> \verbatim
 *>
-*> ZUNGTR generates a complex unitary matrix Q which is defined as the
-*> product of n-1 elementary reflectors of order N, as returned by
-*> ZHETRD:
-*>
-*> if UPLO = 'U', Q = H(n-1) . . . H(2) H(1),
+*> ZTRSEN reorders the Schur factorization of a complex matrix
+*> A = Q*T*Q**H, so that a selected cluster of eigenvalues appears in
+*> the leading positions on the diagonal of the upper triangular matrix
+*> T, and the leading columns of Q form an orthonormal basis of the
+*> corresponding right invariant subspace.
+*>
+*> Optionally the routine computes the reciprocal condition numbers of
+*> the cluster of eigenvalues and/or the invariant subspace.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] JOB
+*> \verbatim
+*>          JOB is CHARACTER*1
+*>          Specifies whether condition numbers are required for the
+*>          cluster of eigenvalues (S) or the invariant subspace (SEP):
+*>          = 'N': none;
+*>          = 'E': for eigenvalues only (S);
+*>          = 'V': for invariant subspace only (SEP);
+*>          = 'B': for both eigenvalues and invariant subspace (S and
+*>                 SEP).
+*> \endverbatim
+*>
+*> \param[in] COMPQ
+*> \verbatim
+*>          COMPQ is CHARACTER*1
+*>          = 'V': update the matrix Q of Schur vectors;
+*>          = 'N': do not update Q.
+*> \endverbatim
+*>
+*> \param[in] SELECT
+*> \verbatim
+*>          SELECT is LOGICAL array, dimension (N)
+*>          SELECT specifies the eigenvalues in the selected cluster. To
+*>          select the j-th eigenvalue, SELECT(j) must be set to .TRUE..
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix T. N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] T
+*> \verbatim
+*>          T is COMPLEX*16 array, dimension (LDT,N)
+*>          On entry, the upper triangular matrix T.
+*>          On exit, T is overwritten by the reordered matrix T, with the
+*>          selected eigenvalues as the leading diagonal elements.
+*> \endverbatim
 *>
-*> if UPLO = 'L', Q = H(1) H(2) . . . H(n-1).
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T. LDT >= max(1,N).
 *> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] UPLO
+*>
+*> \param[in,out] Q
 *> \verbatim
-*>          UPLO is CHARACTER*1
-*>          = 'U': Upper triangle of A contains elementary reflectors
-*>                 from ZHETRD;
-*>          = 'L': Lower triangle of A contains elementary reflectors
-*>                 from ZHETRD.
+*>          Q is COMPLEX*16 array, dimension (LDQ,N)
+*>          On entry, if COMPQ = 'V', the matrix Q of Schur vectors.
+*>          On exit, if COMPQ = 'V', Q has been postmultiplied by the
+*>          unitary transformation matrix which reorders T; the leading M
+*>          columns of Q form an orthonormal basis for the specified
+*>          invariant subspace.
+*>          If COMPQ = 'N', Q is not referenced.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] LDQ
 *> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix Q. N >= 0.
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q.
+*>          LDQ >= 1; and if COMPQ = 'V', LDQ >= N.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[out] W
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the vectors which define the elementary reflectors,
-*>          as returned by ZHETRD.
-*>          On exit, the N-by-N unitary matrix Q.
+*>          W is COMPLEX*16 array, dimension (N)
+*>          The reordered eigenvalues of T, in the same order as they
+*>          appear on the diagonal of T.
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[out] M
 *> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= N.
+*>          M is INTEGER
+*>          The dimension of the specified invariant subspace.
+*>          0 <= M <= N.
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[out] S
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (N-1)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZHETRD.
+*>          S is DOUBLE PRECISION
+*>          If JOB = 'E' or 'B', S is a lower bound on the reciprocal
+*>          condition number for the selected cluster of eigenvalues.
+*>          S cannot underestimate the true reciprocal condition number
+*>          by more than a factor of sqrt(N). If M = 0 or N, S = 1.
+*>          If JOB = 'N' or 'V', S is not referenced.
+*> \endverbatim
+*>
+*> \param[out] SEP
+*> \verbatim
+*>          SEP is DOUBLE PRECISION
+*>          If JOB = 'V' or 'B', SEP is the estimated reciprocal
+*>          condition number of the specified invariant subspace. If
+*>          M = 0 or N, SEP = norm(T).
+*>          If JOB = 'N' or 'E', SEP is not referenced.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -29403,9 +47988,10 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= N-1.
-*>          For optimum performance LWORK >= (N-1)*NB, where NB is
-*>          the optimal blocksize.
+*>          The dimension of the array WORK.
+*>          If JOB = 'N', LWORK >= 1;
+*>          if JOB = 'E', LWORK = max(1,M*(N-M));
+*>          if JOB = 'V' or 'B', LWORK >= max(1,2*M*(N-M)).
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -29432,8 +48018,83 @@
 *
 *> \ingroup complex16OTHERcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  ZTRSEN first collects the selected eigenvalues by computing a unitary
+*>  transformation Z to move them to the top left corner of T. In other
+*>  words, the selected eigenvalues are the eigenvalues of T11 in:
+*>
+*>          Z**H * T * Z = ( T11 T12 ) n1
+*>                         (  0  T22 ) n2
+*>                            n1  n2
+*>
+*>  where N = n1+n2. The first
+*>  n1 columns of Z span the specified invariant subspace of T.
+*>
+*>  If T has been obtained from the Schur factorization of a matrix
+*>  A = Q*T*Q**H, then the reordered Schur factorization of A is given by
+*>  A = (Q*Z)*(Z**H*T*Z)*(Q*Z)**H, and the first n1 columns of Q*Z span the
+*>  corresponding invariant subspace of A.
+*>
+*>  The reciprocal condition number of the average of the eigenvalues of
+*>  T11 may be returned in S. S lies between 0 (very badly conditioned)
+*>  and 1 (very well conditioned). It is computed as follows. First we
+*>  compute R so that
+*>
+*>                         P = ( I  R ) n1
+*>                             ( 0  0 ) n2
+*>                               n1 n2
+*>
+*>  is the projector on the invariant subspace associated with T11.
+*>  R is the solution of the Sylvester equation:
+*>
+*>                        T11*R - R*T22 = T12.
+*>
+*>  Let F-norm(M) denote the Frobenius-norm of M and 2-norm(M) denote
+*>  the two-norm of M. Then S is computed as the lower bound
+*>
+*>                      (1 + F-norm(R)**2)**(-1/2)
+*>
+*>  on the reciprocal of 2-norm(P), the true reciprocal condition number.
+*>  S cannot underestimate 1 / 2-norm(P) by more than a factor of
+*>  sqrt(N).
+*>
+*>  An approximate error bound for the computed average of the
+*>  eigenvalues of T11 is
+*>
+*>                         EPS * norm(T) / S
+*>
+*>  where EPS is the machine precision.
+*>
+*>  The reciprocal condition number of the right invariant subspace
+*>  spanned by the first n1 columns of Z (or of Q*Z) is returned in SEP.
+*>  SEP is defined as the separation of T11 and T22:
+*>
+*>                     sep( T11, T22 ) = sigma-min( C )
+*>
+*>  where sigma-min(C) is the smallest singular value of the
+*>  n1*n2-by-n1*n2 matrix
+*>
+*>     C  = kprod( I(n2), T11 ) - kprod( transpose(T22), I(n1) )
+*>
+*>  I(m) is an m by m identity matrix, and kprod denotes the Kronecker
+*>  product. We estimate sigma-min(C) by the reciprocal of an estimate of
+*>  the 1-norm of inverse(C). The true reciprocal 1-norm of inverse(C)
+*>  cannot differ from sigma-min(C) by more than a factor of sqrt(n1*n2).
+*>
+*>  When SEP is small, small changes in T can cause large changes in
+*>  the invariant subspace. An approximate bound on the maximum angular
+*>  error in the computed right invariant subspace is
+*>
+*>                      EPS * norm(T) / SEP
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ZUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+      SUBROUTINE ZTRSEN( JOB, COMPQ, SELECT, N, T, LDT, Q, LDQ, W, M, S,
+     $                   SEP, WORK, LWORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -29441,64 +48102,94 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            INFO, LDA, LWORK, N
+      CHARACTER          COMPQ, JOB
+      INTEGER            INFO, LDQ, LDT, LWORK, M, N
+      DOUBLE PRECISION   S, SEP
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+      LOGICAL            SELECT( * )
+      COMPLEX*16         Q( LDQ, * ), T( LDT, * ), W( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ZERO, ONE
-      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY, UPPER
-      INTEGER            I, IINFO, J, LWKOPT, NB
+      LOGICAL            LQUERY, WANTBH, WANTQ, WANTS, WANTSP
+      INTEGER            IERR, K, KASE, KS, LWMIN, N1, N2, NN
+      DOUBLE PRECISION   EST, RNORM, SCALE
+*     ..
+*     .. Local Arrays ..
+      INTEGER            ISAVE( 3 )
+      DOUBLE PRECISION   RWORK( 1 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      DOUBLE PRECISION   ZLANGE
+      EXTERNAL           LSAME, ZLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZUNGQL, ZUNGQR
+      EXTERNAL           XERBLA, ZLACN2, ZLACPY, ZTREXC, ZTRSYL
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          MAX, SQRT
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Decode and test the input parameters.
+*
+      WANTBH = LSAME( JOB, 'B' )
+      WANTS = LSAME( JOB, 'E' ) .OR. WANTBH
+      WANTSP = LSAME( JOB, 'V' ) .OR. WANTBH
+      WANTQ = LSAME( COMPQ, 'V' )
+*
+*     Set M to the number of selected eigenvalues.
+*
+      M = 0
+      DO 10 K = 1, N
+         IF( SELECT( K ) )
+     $      M = M + 1
+   10 CONTINUE
+*
+      N1 = M
+      N2 = N - M
+      NN = N1*N2
 *
       INFO = 0
       LQUERY = ( LWORK.EQ.-1 )
-      UPPER = LSAME( UPLO, 'U' )
-      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+*
+      IF( WANTSP ) THEN
+         LWMIN = MAX( 1, 2*NN )
+      ELSE IF( LSAME( JOB, 'N' ) ) THEN
+         LWMIN = 1
+      ELSE IF( LSAME( JOB, 'E' ) ) THEN
+         LWMIN = MAX( 1, NN )
+      END IF
+*
+      IF( .NOT.LSAME( JOB, 'N' ) .AND. .NOT.WANTS .AND. .NOT.WANTSP )
+     $     THEN
          INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( .NOT.LSAME( COMPQ, 'N' ) .AND. .NOT.WANTQ ) THEN
          INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( LWORK.LT.MAX( 1, N-1 ) .AND. .NOT.LQUERY ) THEN
-         INFO = -7
+      ELSE IF( LDT.LT.MAX( 1, N ) ) THEN
+         INFO = -6
+      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.N ) ) THEN
+         INFO = -8
+      ELSE IF( LWORK.LT.LWMIN .AND. .NOT.LQUERY ) THEN
+         INFO = -14
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         IF( UPPER ) THEN
-            NB = ILAENV( 1, 'ZUNGQL', ' ', N-1, N-1, N-1, -1 )
-         ELSE
-            NB = ILAENV( 1, 'ZUNGQR', ' ', N-1, N-1, N-1, -1 )
-         END IF
-         LWKOPT = MAX( 1, N-1 )*NB
-         WORK( 1 ) = LWKOPT
+         WORK( 1 ) = LWMIN
       END IF
 *
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNGTR', -INFO )
+         CALL XERBLA( 'ZTRSEN', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
@@ -29506,67 +48197,96 @@
 *
 *     Quick return if possible
 *
-      IF( N.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
+      IF( M.EQ.N .OR. M.EQ.0 ) THEN
+         IF( WANTS )
+     $      S = ONE
+         IF( WANTSP )
+     $      SEP = ZLANGE( '1', N, N, T, LDT, RWORK )
+         GO TO 40
       END IF
 *
-      IF( UPPER ) THEN
+*     Collect the selected eigenvalues at the top left corner of T.
 *
-*        Q was determined by a call to ZHETRD with UPLO = 'U'
+      KS = 0
+      DO 20 K = 1, N
+         IF( SELECT( K ) ) THEN
+            KS = KS + 1
 *
-*        Shift the vectors which define the elementary reflectors one
-*        column to the left, and set the last row and column of Q to
-*        those of the unit matrix
+*           Swap the K-th eigenvalue to position KS.
 *
-         DO 20 J = 1, N - 1
-            DO 10 I = 1, J - 1
-               A( I, J ) = A( I, J+1 )
-   10       CONTINUE
-            A( N, J ) = ZERO
-   20    CONTINUE
-         DO 30 I = 1, N - 1
-            A( I, N ) = ZERO
-   30    CONTINUE
-         A( N, N ) = ONE
+            IF( K.NE.KS )
+     $         CALL ZTREXC( COMPQ, N, T, LDT, Q, LDQ, K, KS, IERR )
+         END IF
+   20 CONTINUE
 *
-*        Generate Q(1:n-1,1:n-1)
+      IF( WANTS ) THEN
 *
-         CALL ZUNGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK, IINFO )
+*        Solve the Sylvester equation for R:
 *
-      ELSE
+*           T11*R - R*T22 = scale*T12
 *
-*        Q was determined by a call to ZHETRD with UPLO = 'L'.
+         CALL ZLACPY( 'F', N1, N2, T( 1, N1+1 ), LDT, WORK, N1 )
+         CALL ZTRSYL( 'N', 'N', -1, N1, N2, T, LDT, T( N1+1, N1+1 ),
+     $                LDT, WORK, N1, SCALE, IERR )
 *
-*        Shift the vectors which define the elementary reflectors one
-*        column to the right, and set the first row and column of Q to
-*        those of the unit matrix
+*        Estimate the reciprocal of the condition number of the cluster
+*        of eigenvalues.
 *
-         DO 50 J = N, 2, -1
-            A( 1, J ) = ZERO
-            DO 40 I = J + 1, N
-               A( I, J ) = A( I, J-1 )
-   40       CONTINUE
-   50    CONTINUE
-         A( 1, 1 ) = ONE
-         DO 60 I = 2, N
-            A( I, 1 ) = ZERO
-   60    CONTINUE
-         IF( N.GT.1 ) THEN
+         RNORM = ZLANGE( 'F', N1, N2, WORK, N1, RWORK )
+         IF( RNORM.EQ.ZERO ) THEN
+            S = ONE
+         ELSE
+            S = SCALE / ( SQRT( SCALE*SCALE / RNORM+RNORM )*
+     $          SQRT( RNORM ) )
+         END IF
+      END IF
 *
-*           Generate Q(2:n,2:n)
+      IF( WANTSP ) THEN
 *
-            CALL ZUNGQR( N-1, N-1, N-1, A( 2, 2 ), LDA, TAU, WORK,
-     $                   LWORK, IINFO )
+*        Estimate sep(T11,T22).
+*
+         EST = ZERO
+         KASE = 0
+   30    CONTINUE
+         CALL ZLACN2( NN, WORK( NN+1 ), WORK, EST, KASE, ISAVE )
+         IF( KASE.NE.0 ) THEN
+            IF( KASE.EQ.1 ) THEN
+*
+*              Solve T11*R - R*T22 = scale*X.
+*
+               CALL ZTRSYL( 'N', 'N', -1, N1, N2, T, LDT,
+     $                      T( N1+1, N1+1 ), LDT, WORK, N1, SCALE,
+     $                      IERR )
+            ELSE
+*
+*              Solve T11**H*R - R*T22**H = scale*X.
+*
+               CALL ZTRSYL( 'C', 'C', -1, N1, N2, T, LDT,
+     $                      T( N1+1, N1+1 ), LDT, WORK, N1, SCALE,
+     $                      IERR )
+            END IF
+            GO TO 30
          END IF
+*
+         SEP = SCALE / EST
       END IF
-      WORK( 1 ) = LWKOPT
+*
+   40 CONTINUE
+*
+*     Copy reordered eigenvalues to W.
+*
+      DO 50 K = 1, N
+         W( K ) = T( K, K )
+   50 CONTINUE
+*
+      WORK( 1 ) = LWMIN
+*
       RETURN
 *
-*     End of ZUNGTR
+*     End of ZTRSEN
 *
       END
-*> \brief \b ZUNM2R multiplies a general matrix by the unitary matrix from a QR factorization determined by cgeqrf (unblocked algorithm).
+*> \brief \b ZTRSYL
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -29574,27 +48294,28 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNM2R + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunm2r.f"> 
+*> Download ZTRSYL + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrsyl.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunm2r.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrsyl.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunm2r.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrsyl.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-*                          WORK, INFO )
+*       SUBROUTINE ZTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
+*                          LDC, SCALE, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE, TRANS
-*       INTEGER            INFO, K, LDA, LDC, M, N
+*       CHARACTER          TRANA, TRANB
+*       INTEGER            INFO, ISGN, LDA, LDB, LDC, M, N
+*       DOUBLE PRECISION   SCALE
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * )
 *       ..
 *  
 *
@@ -29603,105 +48324,99 @@
 *>
 *> \verbatim
 *>
-*> ZUNM2R overwrites the general complex m-by-n matrix C with
-*>
-*>       Q * C  if SIDE = 'L' and TRANS = 'N', or
-*>
-*>       Q**H* C  if SIDE = 'L' and TRANS = 'C', or
-*>
-*>       C * Q  if SIDE = 'R' and TRANS = 'N', or
-*>
-*>       C * Q**H if SIDE = 'R' and TRANS = 'C',
-*>
-*> where Q is a complex unitary matrix defined as the product of k
-*> elementary reflectors
+*> ZTRSYL solves the complex Sylvester matrix equation:
 *>
-*>       Q = H(1) H(2) . . . H(k)
+*>    op(A)*X + X*op(B) = scale*C or
+*>    op(A)*X - X*op(B) = scale*C,
 *>
-*> as returned by ZGEQRF. Q is of order m if SIDE = 'L' and of order n
-*> if SIDE = 'R'.
+*> where op(A) = A or A**H, and A and B are both upper triangular. A is
+*> M-by-M and B is N-by-N; the right hand side C and the solution X are
+*> M-by-N; and scale is an output scale factor, set <= 1 to avoid
+*> overflow in X.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
+*> \param[in] TRANA
 *> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply Q or Q**H from the Left
-*>          = 'R': apply Q or Q**H from the Right
+*>          TRANA is CHARACTER*1
+*>          Specifies the option op(A):
+*>          = 'N': op(A) = A    (No transpose)
+*>          = 'C': op(A) = A**H (Conjugate transpose)
 *> \endverbatim
 *>
-*> \param[in] TRANS
+*> \param[in] TRANB
 *> \verbatim
-*>          TRANS is CHARACTER*1
-*>          = 'N': apply Q  (No transpose)
-*>          = 'C': apply Q**H (Conjugate transpose)
+*>          TRANB is CHARACTER*1
+*>          Specifies the option op(B):
+*>          = 'N': op(B) = B    (No transpose)
+*>          = 'C': op(B) = B**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] ISGN
+*> \verbatim
+*>          ISGN is INTEGER
+*>          Specifies the sign in the equation:
+*>          = +1: solve op(A)*X + X*op(B) = scale*C
+*>          = -1: solve op(A)*X - X*op(B) = scale*C
 *> \endverbatim
 *>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix C. M >= 0.
+*>          The order of the matrix A, and the number of rows in the
+*>          matrices X and C. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= 0.
-*> \endverbatim
-*>
-*> \param[in] K
-*> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          If SIDE = 'L', M >= K >= 0;
-*>          if SIDE = 'R', N >= K >= 0.
+*>          The order of the matrix B, and the number of columns in the
+*>          matrices X and C. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,K)
-*>          The i-th column must contain the vector which defines the
-*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          ZGEQRF in the first k columns of its array argument A.
-*>          A is modified by the routine but restored on exit.
+*>          A is COMPLEX*16 array, dimension (LDA,M)
+*>          The upper triangular matrix A.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDA >= max(1,M);
-*>          if SIDE = 'R', LDA >= max(1,N).
+*>          The leading dimension of the array A. LDA >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] B
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEQRF.
+*>          B is COMPLEX*16 array, dimension (LDB,N)
+*>          The upper triangular matrix B.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,N).
 *> \endverbatim
 *>
 *> \param[in,out] C
 *> \verbatim
 *>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the m-by-n matrix C.
-*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
+*>          On entry, the M-by-N right hand side matrix C.
+*>          On exit, C is overwritten by the solution matrix X.
 *> \endverbatim
 *>
 *> \param[in] LDC
 *> \verbatim
 *>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
+*>          The leading dimension of the array C. LDC >= max(1,M)
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[out] SCALE
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension
-*>                                   (N) if SIDE = 'L',
-*>                                   (M) if SIDE = 'R'
+*>          SCALE is DOUBLE PRECISION
+*>          The scale factor, scale, set <= 1 to avoid overflow in X.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -29709,6 +48424,9 @@
 *>          INFO is INTEGER
 *>          = 0: successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          = 1: A and B have common or very close eigenvalues; perturbed
+*>               values were used to solve the equation (but the matrices
+*>               A and B are unchanged).
 *> \endverbatim
 *
 *  Authors:
@@ -29719,140 +48437,310 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16OTHERcomputational
+*> \ingroup complex16SYcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-     $                   WORK, INFO )
+      SUBROUTINE ZTRSYL( TRANA, TRANB, ISGN, M, N, A, LDA, B, LDB, C,
+     $                   LDC, SCALE, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE, TRANS
-      INTEGER            INFO, K, LDA, LDC, M, N
+      CHARACTER          TRANA, TRANB
+      INTEGER            INFO, ISGN, LDA, LDB, LDC, M, N
+      DOUBLE PRECISION   SCALE
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * ), C( LDC, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+      DOUBLE PRECISION   ONE
+      PARAMETER          ( ONE = 1.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LEFT, NOTRAN
-      INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      LOGICAL            NOTRNA, NOTRNB
+      INTEGER            J, K, L
+      DOUBLE PRECISION   BIGNUM, DA11, DB, EPS, SCALOC, SGN, SMIN,
+     $                   SMLNUM
+      COMPLEX*16         A11, SUML, SUMR, VEC, X11
+*     ..
+*     .. Local Arrays ..
+      DOUBLE PRECISION   DUM( 1 )
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      EXTERNAL           LSAME
+      DOUBLE PRECISION   DLAMCH, ZLANGE
+      COMPLEX*16         ZDOTC, ZDOTU, ZLADIV
+      EXTERNAL           LSAME, DLAMCH, ZLANGE, ZDOTC, ZDOTU, ZLADIV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARF
+      EXTERNAL           DLABAD, XERBLA, ZDSCAL
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG, MAX
+      INTRINSIC          ABS, DBLE, DCMPLX, DCONJG, DIMAG, MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
-*
-      INFO = 0
-      LEFT = LSAME( SIDE, 'L' )
-      NOTRAN = LSAME( TRANS, 'N' )
+*     Decode and Test input parameters
 *
-*     NQ is the order of Q
+      NOTRNA = LSAME( TRANA, 'N' )
+      NOTRNB = LSAME( TRANB, 'N' )
 *
-      IF( LEFT ) THEN
-         NQ = M
-      ELSE
-         NQ = N
-      END IF
-      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+      INFO = 0
+      IF( .NOT.NOTRNA .AND. .NOT.LSAME( TRANA, 'C' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+      ELSE IF( .NOT.NOTRNB .AND. .NOT.LSAME( TRANB, 'C' ) ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+      ELSE IF( ISGN.NE.1 .AND. ISGN.NE.-1 ) THEN
          INFO = -3
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( M.LT.0 ) THEN
          INFO = -4
-      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -7
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -10
+         INFO = -11
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNM2R', -INFO )
+         CALL XERBLA( 'ZTRSYL', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 )
+      SCALE = ONE
+      IF( M.EQ.0 .OR. N.EQ.0 )
      $   RETURN
 *
-      IF( ( LEFT .AND. .NOT.NOTRAN .OR. .NOT.LEFT .AND. NOTRAN ) ) THEN
-         I1 = 1
-         I2 = K
-         I3 = 1
-      ELSE
-         I1 = K
-         I2 = 1
-         I3 = -1
-      END IF
+*     Set constants to control overflow
 *
-      IF( LEFT ) THEN
-         NI = N
-         JC = 1
-      ELSE
-         MI = M
-         IC = 1
-      END IF
+      EPS = DLAMCH( 'P' )
+      SMLNUM = DLAMCH( 'S' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+      SMLNUM = SMLNUM*DBLE( M*N ) / EPS
+      BIGNUM = ONE / SMLNUM
+      SMIN = MAX( SMLNUM, EPS*ZLANGE( 'M', M, M, A, LDA, DUM ),
+     $       EPS*ZLANGE( 'M', N, N, B, LDB, DUM ) )
+      SGN = ISGN
+*
+      IF( NOTRNA .AND. NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B = scale*C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-left corner column by column by
+*
+*            A(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                    M                        L-1
+*          R(K,L) = SUM [A(K,I)*X(I,L)] +ISGN*SUM [X(K,J)*B(J,L)].
+*                  I=K+1                      J=1
+*
+         DO 30 L = 1, N
+            DO 20 K = M, 1, -1
+*
+               SUML = ZDOTU( M-K, A( K, MIN( K+1, M ) ), LDA,
+     $                C( MIN( K+1, M ), L ), 1 )
+               SUMR = ZDOTU( L-1, C( K, 1 ), LDC, B( 1, L ), 1 )
+               VEC = C( K, L ) - ( SUML+SGN*SUMR )
+*
+               SCALOC = ONE
+               A11 = A( K, K ) + SGN*B( L, L )
+               DA11 = ABS( DBLE( A11 ) ) + ABS( DIMAG( A11 ) )
+               IF( DA11.LE.SMIN ) THEN
+                  A11 = SMIN
+                  DA11 = SMIN
+                  INFO = 1
+               END IF
+               DB = ABS( DBLE( VEC ) ) + ABS( DIMAG( VEC ) )
+               IF( DA11.LT.ONE .AND. DB.GT.ONE ) THEN
+                  IF( DB.GT.BIGNUM*DA11 )
+     $               SCALOC = ONE / DB
+               END IF
+               X11 = ZLADIV( VEC*DCMPLX( SCALOC ), A11 )
+*
+               IF( SCALOC.NE.ONE ) THEN
+                  DO 10 J = 1, N
+                     CALL ZDSCAL( M, SCALOC, C( 1, J ), 1 )
+   10             CONTINUE
+                  SCALE = SCALE*SCALOC
+               END IF
+               C( K, L ) = X11
 *
-      DO 10 I = I1, I2, I3
-         IF( LEFT ) THEN
+   20       CONTINUE
+   30    CONTINUE
 *
-*           H(i) or H(i)**H is applied to C(i:m,1:n)
+      ELSE IF( .NOT.NOTRNA .AND. NOTRNB ) THEN
 *
-            MI = M - I + 1
-            IC = I
-         ELSE
+*        Solve    A**H *X + ISGN*X*B = scale*C.
 *
-*           H(i) or H(i)**H is applied to C(1:m,i:n)
+*        The (K,L)th block of X is determined starting from
+*        upper-left corner column by column by
 *
-            NI = N - I + 1
-            JC = I
-         END IF
+*            A**H(K,K)*X(K,L) + ISGN*X(K,L)*B(L,L) = C(K,L) - R(K,L)
 *
-*        Apply H(i) or H(i)**H
+*        Where
+*                   K-1                           L-1
+*          R(K,L) = SUM [A**H(I,K)*X(I,L)] + ISGN*SUM [X(K,J)*B(J,L)]
+*                   I=1                           J=1
+*
+         DO 60 L = 1, N
+            DO 50 K = 1, M
+*
+               SUML = ZDOTC( K-1, A( 1, K ), 1, C( 1, L ), 1 )
+               SUMR = ZDOTU( L-1, C( K, 1 ), LDC, B( 1, L ), 1 )
+               VEC = C( K, L ) - ( SUML+SGN*SUMR )
+*
+               SCALOC = ONE
+               A11 = DCONJG( A( K, K ) ) + SGN*B( L, L )
+               DA11 = ABS( DBLE( A11 ) ) + ABS( DIMAG( A11 ) )
+               IF( DA11.LE.SMIN ) THEN
+                  A11 = SMIN
+                  DA11 = SMIN
+                  INFO = 1
+               END IF
+               DB = ABS( DBLE( VEC ) ) + ABS( DIMAG( VEC ) )
+               IF( DA11.LT.ONE .AND. DB.GT.ONE ) THEN
+                  IF( DB.GT.BIGNUM*DA11 )
+     $               SCALOC = ONE / DB
+               END IF
+*
+               X11 = ZLADIV( VEC*DCMPLX( SCALOC ), A11 )
+*
+               IF( SCALOC.NE.ONE ) THEN
+                  DO 40 J = 1, N
+                     CALL ZDSCAL( M, SCALOC, C( 1, J ), 1 )
+   40             CONTINUE
+                  SCALE = SCALE*SCALOC
+               END IF
+               C( K, L ) = X11
+*
+   50       CONTINUE
+   60    CONTINUE
+*
+      ELSE IF( .NOT.NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A**H*X + ISGN*X*B**H = C.
+*
+*        The (K,L)th block of X is determined starting from
+*        upper-right corner column by column by
+*
+*            A**H(K,K)*X(K,L) + ISGN*X(K,L)*B**H(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                    K-1
+*           R(K,L) = SUM [A**H(I,K)*X(I,L)] +
+*                    I=1
+*                           N
+*                     ISGN*SUM [X(K,J)*B**H(L,J)].
+*                          J=L+1
+*
+         DO 90 L = N, 1, -1
+            DO 80 K = 1, M
+*
+               SUML = ZDOTC( K-1, A( 1, K ), 1, C( 1, L ), 1 )
+               SUMR = ZDOTC( N-L, C( K, MIN( L+1, N ) ), LDC,
+     $                B( L, MIN( L+1, N ) ), LDB )
+               VEC = C( K, L ) - ( SUML+SGN*DCONJG( SUMR ) )
+*
+               SCALOC = ONE
+               A11 = DCONJG( A( K, K )+SGN*B( L, L ) )
+               DA11 = ABS( DBLE( A11 ) ) + ABS( DIMAG( A11 ) )
+               IF( DA11.LE.SMIN ) THEN
+                  A11 = SMIN
+                  DA11 = SMIN
+                  INFO = 1
+               END IF
+               DB = ABS( DBLE( VEC ) ) + ABS( DIMAG( VEC ) )
+               IF( DA11.LT.ONE .AND. DB.GT.ONE ) THEN
+                  IF( DB.GT.BIGNUM*DA11 )
+     $               SCALOC = ONE / DB
+               END IF
+*
+               X11 = ZLADIV( VEC*DCMPLX( SCALOC ), A11 )
+*
+               IF( SCALOC.NE.ONE ) THEN
+                  DO 70 J = 1, N
+                     CALL ZDSCAL( M, SCALOC, C( 1, J ), 1 )
+   70             CONTINUE
+                  SCALE = SCALE*SCALOC
+               END IF
+               C( K, L ) = X11
+*
+   80       CONTINUE
+   90    CONTINUE
+*
+      ELSE IF( NOTRNA .AND. .NOT.NOTRNB ) THEN
+*
+*        Solve    A*X + ISGN*X*B**H = C.
+*
+*        The (K,L)th block of X is determined starting from
+*        bottom-left corner column by column by
+*
+*           A(K,K)*X(K,L) + ISGN*X(K,L)*B**H(L,L) = C(K,L) - R(K,L)
+*
+*        Where
+*                    M                          N
+*          R(K,L) = SUM [A(K,I)*X(I,L)] + ISGN*SUM [X(K,J)*B**H(L,J)]
+*                  I=K+1                      J=L+1
+*
+         DO 120 L = N, 1, -1
+            DO 110 K = M, 1, -1
+*
+               SUML = ZDOTU( M-K, A( K, MIN( K+1, M ) ), LDA,
+     $                C( MIN( K+1, M ), L ), 1 )
+               SUMR = ZDOTC( N-L, C( K, MIN( L+1, N ) ), LDC,
+     $                B( L, MIN( L+1, N ) ), LDB )
+               VEC = C( K, L ) - ( SUML+SGN*DCONJG( SUMR ) )
+*
+               SCALOC = ONE
+               A11 = A( K, K ) + SGN*DCONJG( B( L, L ) )
+               DA11 = ABS( DBLE( A11 ) ) + ABS( DIMAG( A11 ) )
+               IF( DA11.LE.SMIN ) THEN
+                  A11 = SMIN
+                  DA11 = SMIN
+                  INFO = 1
+               END IF
+               DB = ABS( DBLE( VEC ) ) + ABS( DIMAG( VEC ) )
+               IF( DA11.LT.ONE .AND. DB.GT.ONE ) THEN
+                  IF( DB.GT.BIGNUM*DA11 )
+     $               SCALOC = ONE / DB
+               END IF
+*
+               X11 = ZLADIV( VEC*DCMPLX( SCALOC ), A11 )
+*
+               IF( SCALOC.NE.ONE ) THEN
+                  DO 100 J = 1, N
+                     CALL ZDSCAL( M, SCALOC, C( 1, J ), 1 )
+  100             CONTINUE
+                  SCALE = SCALE*SCALOC
+               END IF
+               C( K, L ) = X11
+*
+  110       CONTINUE
+  120    CONTINUE
+*
+      END IF
 *
-         IF( NOTRAN ) THEN
-            TAUI = TAU( I )
-         ELSE
-            TAUI = DCONJG( TAU( I ) )
-         END IF
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL ZLARF( SIDE, MI, NI, A( I, I ), 1, TAUI, C( IC, JC ), LDC,
-     $               WORK )
-         A( I, I ) = AII
-   10 CONTINUE
       RETURN
 *
-*     End of ZUNM2R
+*     End of ZTRSYL
 *
       END
-*> \brief \b ZUNMBR
+*> \brief \b ZTRTI2 computes the inverse of a triangular matrix (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -29860,178 +48748,93 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNMBR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmbr.f"> 
+*> Download ZTRTI2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrti2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmbr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrti2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmbr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrti2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
-*                          LDC, WORK, LWORK, INFO )
+*       SUBROUTINE ZTRTI2( UPLO, DIAG, N, A, LDA, INFO )
 * 
-*       .. Scalar Arguments ..
-*       CHARACTER          SIDE, TRANS, VECT
-*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
-*       ..
-*       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> If VECT = 'Q', ZUNMBR overwrites the general complex M-by-N matrix C
-*> with
-*>                 SIDE = 'L'     SIDE = 'R'
-*> TRANS = 'N':      Q * C          C * Q
-*> TRANS = 'C':      Q**H * C       C * Q**H
-*>
-*> If VECT = 'P', ZUNMBR overwrites the general complex M-by-N matrix C
-*> with
-*>                 SIDE = 'L'     SIDE = 'R'
-*> TRANS = 'N':      P * C          C * P
-*> TRANS = 'C':      P**H * C       C * P**H
-*>
-*> Here Q and P**H are the unitary matrices determined by ZGEBRD when
-*> reducing a complex matrix A to bidiagonal form: A = Q * B * P**H. Q
-*> and P**H are defined as products of elementary reflectors H(i) and
-*> G(i) respectively.
-*>
-*> Let nq = m if SIDE = 'L' and nq = n if SIDE = 'R'. Thus nq is the
-*> order of the unitary matrix Q or P**H that is applied.
-*>
-*> If VECT = 'Q', A is assumed to have been an NQ-by-K matrix:
-*> if nq >= k, Q = H(1) H(2) . . . H(k);
-*> if nq < k, Q = H(1) H(2) . . . H(nq-1).
-*>
-*> If VECT = 'P', A is assumed to have been a K-by-NQ matrix:
-*> if k < nq, P = G(1) G(2) . . . G(k);
-*> if k >= nq, P = G(1) G(2) . . . G(nq-1).
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] VECT
-*> \verbatim
-*>          VECT is CHARACTER*1
-*>          = 'Q': apply Q or Q**H;
-*>          = 'P': apply P or P**H.
-*> \endverbatim
-*>
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply Q, Q**H, P or P**H from the Left;
-*>          = 'R': apply Q, Q**H, P or P**H from the Right.
-*> \endverbatim
-*>
-*> \param[in] TRANS
-*> \verbatim
-*>          TRANS is CHARACTER*1
-*>          = 'N':  No transpose, apply Q or P;
-*>          = 'C':  Conjugate transpose, apply Q**H or P**H.
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C. M >= 0.
-*> \endverbatim
+*       .. Scalar Arguments ..
+*       CHARACTER          DIAG, UPLO
+*       INTEGER            INFO, LDA, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
 *>
-*> \param[in] N
 *> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix C. N >= 0.
-*> \endverbatim
 *>
-*> \param[in] K
-*> \verbatim
-*>          K is INTEGER
-*>          If VECT = 'Q', the number of columns in the original
-*>          matrix reduced by ZGEBRD.
-*>          If VECT = 'P', the number of rows in the original
-*>          matrix reduced by ZGEBRD.
-*>          K >= 0.
-*> \endverbatim
+*> ZTRTI2 computes the inverse of a complex upper or lower triangular
+*> matrix.
 *>
-*> \param[in] A
-*> \verbatim
-*>          A is COMPLEX*16 array, dimension
-*>                                (LDA,min(nq,K)) if VECT = 'Q'
-*>                                (LDA,nq)        if VECT = 'P'
-*>          The vectors which define the elementary reflectors H(i) and
-*>          G(i), whose products determine the matrices Q and P, as
-*>          returned by ZGEBRD.
+*> This is the Level 2 BLAS version of the algorithm.
 *> \endverbatim
-*>
-*> \param[in] LDA
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
 *> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If VECT = 'Q', LDA >= max(1,nq);
-*>          if VECT = 'P', LDA >= max(1,min(nq,K)).
+*>          UPLO is CHARACTER*1
+*>          Specifies whether the matrix A is upper or lower triangular.
+*>          = 'U':  Upper triangular
+*>          = 'L':  Lower triangular
 *> \endverbatim
 *>
-*> \param[in] TAU
+*> \param[in] DIAG
 *> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (min(nq,K))
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i) or G(i) which determines Q or P, as returned
-*>          by ZGEBRD in the array argument TAUQ or TAUP.
+*>          DIAG is CHARACTER*1
+*>          Specifies whether or not the matrix A is unit triangular.
+*>          = 'N':  Non-unit triangular
+*>          = 'U':  Unit triangular
 *> \endverbatim
 *>
-*> \param[in,out] C
+*> \param[in] N
 *> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the M-by-N matrix C.
-*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q
-*>          or P*C or P**H*C or C*P or C*P**H.
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] LDC
+*> \param[in,out] A
 *> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
-*> \endverbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the triangular matrix A.  If UPLO = 'U', the
+*>          leading n by n upper triangular part of the array A contains
+*>          the upper triangular matrix, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading n by n lower triangular part of the array A contains
+*>          the lower triangular matrix, and the strictly upper
+*>          triangular part of A is not referenced.  If DIAG = 'U', the
+*>          diagonal elements of A are also not referenced and are
+*>          assumed to be 1.
 *>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*>          On exit, the (triangular) inverse of the original matrix, in
+*>          the same storage format.
 *> \endverbatim
 *>
-*> \param[in] LWORK
+*> \param[in] LDA
 *> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,N);
-*>          if SIDE = 'R', LWORK >= max(1,M);
-*>          if N = 0 or M = 0, LWORK >= 1.
-*>          For optimum performance LWORK >= max(1,N*NB) if SIDE = 'L',
-*>          and LWORK >= max(1,M*NB) if SIDE = 'R', where NB is the
-*>          optimal blocksize. (NB = 0 if M = 0 or N = 0.)
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: if INFO = -k, the k-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -30042,196 +48845,114 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date September 2012
 *
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
-     $                   LDC, WORK, LWORK, INFO )
+      SUBROUTINE ZTRTI2( UPLO, DIAG, N, A, LDA, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE, TRANS, VECT
-      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+      CHARACTER          DIAG, UPLO
+      INTEGER            INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
 *     .. Local Scalars ..
-      LOGICAL            APPLYQ, LEFT, LQUERY, NOTRAN
-      CHARACTER          TRANST
-      INTEGER            I1, I2, IINFO, LWKOPT, MI, NB, NI, NQ, NW
+      LOGICAL            NOUNIT, UPPER
+      INTEGER            J
+      COMPLEX*16         AJJ
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZUNMLQ, ZUNMQR
+      EXTERNAL           XERBLA, ZSCAL, ZTRMV
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Test the input parameters.
 *
       INFO = 0
-      APPLYQ = LSAME( VECT, 'Q' )
-      LEFT = LSAME( SIDE, 'L' )
-      NOTRAN = LSAME( TRANS, 'N' )
-      LQUERY = ( LWORK.EQ.-1 )
-*
-*     NQ is the order of Q or P and NW is the minimum dimension of WORK
-*
-      IF( LEFT ) THEN
-         NQ = M
-         NW = N
-      ELSE
-         NQ = N
-         NW = M
-      END IF
-      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
-         NW = 0
-      END IF
-      IF( .NOT.APPLYQ .AND. .NOT.LSAME( VECT, 'P' ) ) THEN
+      UPPER = LSAME( UPLO, 'U' )
+      NOUNIT = LSAME( DIAG, 'N' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -2
-      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
-         INFO = -3
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -4
       ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( K.LT.0 ) THEN
-         INFO = -6
-      ELSE IF( ( APPLYQ .AND. LDA.LT.MAX( 1, NQ ) ) .OR.
-     $         ( .NOT.APPLYQ .AND. LDA.LT.MAX( 1, MIN( NQ, K ) ) ) )
-     $          THEN
-         INFO = -8
-      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -11
-      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
-         INFO = -13
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-         IF( NW.GT.0 ) THEN
-            IF( APPLYQ ) THEN
-               IF( LEFT ) THEN
-                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M-1, N, M-1,
-     $                 -1 )
-               ELSE
-                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N-1, N-1,
-     $                 -1 )
-               END IF
-            ELSE
-               IF( LEFT ) THEN
-                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M-1, N, M-1,
-     $                 -1 )
-               ELSE
-                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N-1, N-1,
-     $                 -1 )
-               END IF
-            END IF
-            LWKOPT = MAX( 1, NW*NB )
-         ELSE
-            LWKOPT = 1
-         END IF
-         WORK( 1 ) = LWKOPT
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNMBR', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZTRTI2', -INFO )
          RETURN
       END IF
 *
-*     Quick return if possible
-*
-      IF( M.EQ.0 .OR. N.EQ.0 )
-     $   RETURN
-*
-      IF( APPLYQ ) THEN
-*
-*        Apply Q
-*
-         IF( NQ.GE.K ) THEN
-*
-*           Q was determined by a call to ZGEBRD with nq >= k
-*
-            CALL ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-     $                   WORK, LWORK, IINFO )
-         ELSE IF( NQ.GT.1 ) THEN
+      IF( UPPER ) THEN
 *
-*           Q was determined by a call to ZGEBRD with nq < k
+*        Compute inverse of upper triangular matrix.
 *
-            IF( LEFT ) THEN
-               MI = M - 1
-               NI = N
-               I1 = 2
-               I2 = 1
+         DO 10 J = 1, N
+            IF( NOUNIT ) THEN
+               A( J, J ) = ONE / A( J, J )
+               AJJ = -A( J, J )
             ELSE
-               MI = M
-               NI = N - 1
-               I1 = 1
-               I2 = 2
+               AJJ = -ONE
             END IF
-            CALL ZUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
-     $                   C( I1, I2 ), LDC, WORK, LWORK, IINFO )
-         END IF
-      ELSE
 *
-*        Apply P
+*           Compute elements 1:j-1 of j-th column.
 *
-         IF( NOTRAN ) THEN
-            TRANST = 'C'
-         ELSE
-            TRANST = 'N'
-         END IF
-         IF( NQ.GT.K ) THEN
+            CALL ZTRMV( 'Upper', 'No transpose', DIAG, J-1, A, LDA,
+     $                  A( 1, J ), 1 )
+            CALL ZSCAL( J-1, AJJ, A( 1, J ), 1 )
+   10    CONTINUE
+      ELSE
 *
-*           P was determined by a call to ZGEBRD with nq > k
+*        Compute inverse of lower triangular matrix.
 *
-            CALL ZUNMLQ( SIDE, TRANST, M, N, K, A, LDA, TAU, C, LDC,
-     $                   WORK, LWORK, IINFO )
-         ELSE IF( NQ.GT.1 ) THEN
+         DO 20 J = N, 1, -1
+            IF( NOUNIT ) THEN
+               A( J, J ) = ONE / A( J, J )
+               AJJ = -A( J, J )
+            ELSE
+               AJJ = -ONE
+            END IF
+            IF( J.LT.N ) THEN
 *
-*           P was determined by a call to ZGEBRD with nq <= k
+*              Compute elements j+1:n of j-th column.
 *
-            IF( LEFT ) THEN
-               MI = M - 1
-               NI = N
-               I1 = 2
-               I2 = 1
-            ELSE
-               MI = M
-               NI = N - 1
-               I1 = 1
-               I2 = 2
+               CALL ZTRMV( 'Lower', 'No transpose', DIAG, N-J,
+     $                     A( J+1, J+1 ), LDA, A( J+1, J ), 1 )
+               CALL ZSCAL( N-J, AJJ, A( J+1, J ), 1 )
             END IF
-            CALL ZUNMLQ( SIDE, TRANST, MI, NI, NQ-1, A( 1, 2 ), LDA,
-     $                   TAU, C( I1, I2 ), LDC, WORK, LWORK, IINFO )
-         END IF
+   20    CONTINUE
       END IF
-      WORK( 1 ) = LWKOPT
+*
       RETURN
 *
-*     End of ZUNMBR
+*     End of ZTRTI2
 *
       END
-*> \brief \b ZUNMHR
+*> \brief \b ZTRTRI
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -30239,27 +48960,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNMHR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmhr.f"> 
+*> Download ZTRTRI + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrtri.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmhr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrtri.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmhr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrtri.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
-*                          LDC, WORK, LWORK, INFO )
+*       SUBROUTINE ZTRTRI( UPLO, DIAG, N, A, LDA, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE, TRANS
-*       INTEGER            IHI, ILO, INFO, LDA, LDC, LWORK, M, N
+*       CHARACTER          DIAG, UPLO
+*       INTEGER            INFO, LDA, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * )
 *       ..
 *  
 *
@@ -30268,131 +48988,64 @@
 *>
 *> \verbatim
 *>
-*> ZUNMHR overwrites the general complex M-by-N matrix C with
-*>
-*>                 SIDE = 'L'     SIDE = 'R'
-*> TRANS = 'N':      Q * C          C * Q
-*> TRANS = 'C':      Q**H * C       C * Q**H
-*>
-*> where Q is a complex unitary matrix of order nq, with nq = m if
-*> SIDE = 'L' and nq = n if SIDE = 'R'. Q is defined as the product of
-*> IHI-ILO elementary reflectors, as returned by ZGEHRD:
+*> ZTRTRI computes the inverse of a complex upper or lower triangular
+*> matrix A.
 *>
-*> Q = H(ilo) H(ilo+1) . . . H(ihi-1).
+*> This is the Level 3 BLAS version of the algorithm.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply Q or Q**H from the Left;
-*>          = 'R': apply Q or Q**H from the Right.
-*> \endverbatim
-*>
-*> \param[in] TRANS
+*> \param[in] UPLO
 *> \verbatim
-*>          TRANS is CHARACTER*1
-*>          = 'N': apply Q  (No transpose)
-*>          = 'C': apply Q**H (Conjugate transpose)
+*>          UPLO is CHARACTER*1
+*>          = 'U':  A is upper triangular;
+*>          = 'L':  A is lower triangular.
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in] DIAG
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C. M >= 0.
+*>          DIAG is CHARACTER*1
+*>          = 'N':  A is non-unit triangular;
+*>          = 'U':  A is unit triangular.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= 0.
-*> \endverbatim
-*>
-*> \param[in] ILO
-*> \verbatim
-*>          ILO is INTEGER
-*> \endverbatim
-*>
-*> \param[in] IHI
-*> \verbatim
-*>          IHI is INTEGER
-*>
-*>          ILO and IHI must have the same values as in the previous call
-*>          of ZGEHRD. Q is equal to the unit matrix except in the
-*>          submatrix Q(ilo+1:ihi,ilo+1:ihi).
-*>          If SIDE = 'L', then 1 <= ILO <= IHI <= M, if M > 0, and
-*>          ILO = 1 and IHI = 0, if M = 0;
-*>          if SIDE = 'R', then 1 <= ILO <= IHI <= N, if N > 0, and
-*>          ILO = 1 and IHI = 0, if N = 0.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension
-*>                               (LDA,M) if SIDE = 'L'
-*>                               (LDA,N) if SIDE = 'R'
-*>          The vectors which define the elementary reflectors, as
-*>          returned by ZGEHRD.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the triangular matrix A.  If UPLO = 'U', the
+*>          leading N-by-N upper triangular part of the array A contains
+*>          the upper triangular matrix, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading N-by-N lower triangular part of the array A contains
+*>          the lower triangular matrix, and the strictly upper
+*>          triangular part of A is not referenced.  If DIAG = 'U', the
+*>          diagonal elements of A are also not referenced and are
+*>          assumed to be 1.
+*>          On exit, the (triangular) inverse of the original matrix, in
+*>          the same storage format.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          LDA >= max(1,M) if SIDE = 'L'; LDA >= max(1,N) if SIDE = 'R'.
-*> \endverbatim
-*>
-*> \param[in] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension
-*>                               (M-1) if SIDE = 'L'
-*>                               (N-1) if SIDE = 'R'
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGEHRD.
-*> \endverbatim
-*>
-*> \param[in,out] C
-*> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the M-by-N matrix C.
-*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
-*> \endverbatim
-*>
-*> \param[in] LDC
-*> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,N);
-*>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          > 0: if INFO = i, A(i,i) is exactly zero.  The triangular
+*>               matrix is singular and its inverse can not be computed.
 *> \endverbatim
 *
 *  Authors:
@@ -30408,8 +49061,7 @@
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
-     $                   LDC, WORK, LWORK, INFO )
+      SUBROUTINE ZTRTRI( UPLO, DIAG, N, A, LDA, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -30417,18 +49069,23 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE, TRANS
-      INTEGER            IHI, ILO, INFO, LDA, LDC, LWORK, M, N
+      CHARACTER          DIAG, UPLO
+      INTEGER            INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
 *     .. Local Scalars ..
-      LOGICAL            LEFT, LQUERY
-      INTEGER            I1, I2, IINFO, LWKOPT, MI, NB, NH, NI, NQ, NW
+      LOGICAL            NOUNIT, UPPER
+      INTEGER            J, JB, NB, NN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -30436,96 +49093,109 @@
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZUNMQR
+      EXTERNAL           XERBLA, ZTRMM, ZTRSM, ZTRTI2
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Test the input parameters.
 *
       INFO = 0
-      NH = IHI - ILO
-      LEFT = LSAME( SIDE, 'L' )
-      LQUERY = ( LWORK.EQ.-1 )
-*
-*     NQ is the order of Q and NW is the minimum dimension of WORK
-*
-      IF( LEFT ) THEN
-         NQ = M
-         NW = N
-      ELSE
-         NQ = N
-         NW = M
-      END IF
-      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+      UPPER = LSAME( UPLO, 'U' )
+      NOUNIT = LSAME( DIAG, 'N' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
-     $          THEN
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -3
       ELSE IF( N.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, NQ ) ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( IHI.LT.MIN( ILO, NQ ) .OR. IHI.GT.NQ ) THEN
-         INFO = -6
-      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
-         INFO = -8
-      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -11
-      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
-         INFO = -13
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-         IF( LEFT ) THEN
-            NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, NH, N, NH, -1 )
-         ELSE
-            NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, NH, NH, -1 )
-         END IF
-         LWKOPT = MAX( 1, NW )*NB
-         WORK( 1 ) = LWKOPT
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNMHR', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZTRTRI', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 .OR. NH.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     Check for singularity if non-unit.
+*
+      IF( NOUNIT ) THEN
+         DO 10 INFO = 1, N
+            IF( A( INFO, INFO ).EQ.ZERO )
+     $         RETURN
+   10    CONTINUE
+         INFO = 0
       END IF
 *
-      IF( LEFT ) THEN
-         MI = NH
-         NI = N
-         I1 = ILO + 1
-         I2 = 1
+*     Determine the block size for this environment.
+*
+      NB = ILAENV( 1, 'ZTRTRI', UPLO // DIAG, N, -1, -1, -1 )
+      IF( NB.LE.1 .OR. NB.GE.N ) THEN
+*
+*        Use unblocked code
+*
+         CALL ZTRTI2( UPLO, DIAG, N, A, LDA, INFO )
       ELSE
-         MI = M
-         NI = NH
-         I1 = 1
-         I2 = ILO + 1
-      END IF
 *
-      CALL ZUNMQR( SIDE, TRANS, MI, NI, NH, A( ILO+1, ILO ), LDA,
-     $             TAU( ILO ), C( I1, I2 ), LDC, WORK, LWORK, IINFO )
+*        Use blocked code
+*
+         IF( UPPER ) THEN
+*
+*           Compute inverse of upper triangular matrix
+*
+            DO 20 J = 1, N, NB
+               JB = MIN( NB, N-J+1 )
+*
+*              Compute rows 1:j-1 of current block column
+*
+               CALL ZTRMM( 'Left', 'Upper', 'No transpose', DIAG, J-1,
+     $                     JB, ONE, A, LDA, A( 1, J ), LDA )
+               CALL ZTRSM( 'Right', 'Upper', 'No transpose', DIAG, J-1,
+     $                     JB, -ONE, A( J, J ), LDA, A( 1, J ), LDA )
+*
+*              Compute inverse of current diagonal block
+*
+               CALL ZTRTI2( 'Upper', DIAG, JB, A( J, J ), LDA, INFO )
+   20       CONTINUE
+         ELSE
+*
+*           Compute inverse of lower triangular matrix
+*
+            NN = ( ( N-1 ) / NB )*NB + 1
+            DO 30 J = NN, 1, -NB
+               JB = MIN( NB, N-J+1 )
+               IF( J+JB.LE.N ) THEN
+*
+*                 Compute rows j+jb:n of current block column
+*
+                  CALL ZTRMM( 'Left', 'Lower', 'No transpose', DIAG,
+     $                        N-J-JB+1, JB, ONE, A( J+JB, J+JB ), LDA,
+     $                        A( J+JB, J ), LDA )
+                  CALL ZTRSM( 'Right', 'Lower', 'No transpose', DIAG,
+     $                        N-J-JB+1, JB, -ONE, A( J, J ), LDA,
+     $                        A( J+JB, J ), LDA )
+               END IF
+*
+*              Compute inverse of current diagonal block
+*
+               CALL ZTRTI2( 'Lower', DIAG, JB, A( J, J ), LDA, INFO )
+   30       CONTINUE
+         END IF
+      END IF
 *
-      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZUNMHR
+*     End of ZTRTRI
 *
       END
-*> \brief \b ZUNML2 multiplies a general matrix by the unitary matrix from a LQ factorization determined by cgelqf (unblocked algorithm).
+*> \brief \b ZTRTRS
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -30533,27 +49203,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNML2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunml2.f"> 
+*> Download ZTRTRS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/ztrtrs.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunml2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/ztrtrs.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunml2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/ztrtrs.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-*                          WORK, INFO )
+*       SUBROUTINE ZTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
+*                          INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE, TRANS
-*       INTEGER            INFO, K, LDA, LDC, M, N
+*       CHARACTER          DIAG, TRANS, UPLO
+*       INTEGER            INFO, LDA, LDB, N, NRHS
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), B( LDB, * )
 *       ..
 *  
 *
@@ -30562,112 +49232,93 @@
 *>
 *> \verbatim
 *>
-*> ZUNML2 overwrites the general complex m-by-n matrix C with
-*>
-*>       Q * C  if SIDE = 'L' and TRANS = 'N', or
-*>
-*>       Q**H* C  if SIDE = 'L' and TRANS = 'C', or
-*>
-*>       C * Q  if SIDE = 'R' and TRANS = 'N', or
-*>
-*>       C * Q**H if SIDE = 'R' and TRANS = 'C',
-*>
-*> where Q is a complex unitary matrix defined as the product of k
-*> elementary reflectors
+*> ZTRTRS solves a triangular system of the form
 *>
-*>       Q = H(k)**H . . . H(2)**H H(1)**H
+*>    A * X = B,  A**T * X = B,  or  A**H * X = B,
 *>
-*> as returned by ZGELQF. Q is of order m if SIDE = 'L' and of order n
-*> if SIDE = 'R'.
+*> where A is a triangular matrix of order N, and B is an N-by-NRHS
+*> matrix.  A check is made to verify that A is nonsingular.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
+*> \param[in] UPLO
 *> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply Q or Q**H from the Left
-*>          = 'R': apply Q or Q**H from the Right
+*>          UPLO is CHARACTER*1
+*>          = 'U':  A is upper triangular;
+*>          = 'L':  A is lower triangular.
 *> \endverbatim
 *>
 *> \param[in] TRANS
 *> \verbatim
 *>          TRANS is CHARACTER*1
-*>          = 'N': apply Q  (No transpose)
-*>          = 'C': apply Q**H (Conjugate transpose)
+*>          Specifies the form of the system of equations:
+*>          = 'N':  A * X = B     (No transpose)
+*>          = 'T':  A**T * X = B  (Transpose)
+*>          = 'C':  A**H * X = B  (Conjugate transpose)
 *> \endverbatim
 *>
-*> \param[in] M
+*> \param[in] DIAG
 *> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C. M >= 0.
+*>          DIAG is CHARACTER*1
+*>          = 'N':  A is non-unit triangular;
+*>          = 'U':  A is unit triangular.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= 0.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] NRHS
 *> \verbatim
-*>          K is INTEGER
-*>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          If SIDE = 'L', M >= K >= 0;
-*>          if SIDE = 'R', N >= K >= 0.
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of columns
+*>          of the matrix B.  NRHS >= 0.
 *> \endverbatim
 *>
 *> \param[in] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension
-*>                               (LDA,M) if SIDE = 'L',
-*>                               (LDA,N) if SIDE = 'R'
-*>          The i-th row must contain the vector which defines the
-*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          ZGELQF in the first k rows of its array argument A.
-*>          A is modified by the routine but restored on exit.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          The triangular matrix A.  If UPLO = 'U', the leading N-by-N
+*>          upper triangular part of the array A contains the upper
+*>          triangular matrix, and the strictly lower triangular part of
+*>          A is not referenced.  If UPLO = 'L', the leading N-by-N lower
+*>          triangular part of the array A contains the lower triangular
+*>          matrix, and the strictly upper triangular part of A is not
+*>          referenced.  If DIAG = 'U', the diagonal elements of A are
+*>          also not referenced and are assumed to be 1.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,K).
-*> \endverbatim
-*>
-*> \param[in] TAU
-*> \verbatim
-*>          TAU is COMPLEX*16 array, dimension (K)
-*>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGELQF.
-*> \endverbatim
-*>
-*> \param[in,out] C
-*> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the m-by-n matrix C.
-*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDC
+*> \param[in,out] B
 *> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
+*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
+*>          On entry, the right hand side matrix B.
+*>          On exit, if INFO = 0, the solution matrix X.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LDB
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension
-*>                                   (N) if SIDE = 'L',
-*>                                   (M) if SIDE = 'R'
+*>          LDB is INTEGER
+*>          The leading dimension of the array B.  LDB >= max(1,N).
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit
+*>          = 0:  successful exit
 *>          < 0: if INFO = -i, the i-th argument had an illegal value
+*>          > 0: if INFO = i, the i-th diagonal element of A is zero,
+*>               indicating that the matrix is singular and the solutions
+*>               X have not been computed.
 *> \endverbatim
 *
 *  Authors:
@@ -30678,144 +49329,100 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-     $                   WORK, INFO )
+      SUBROUTINE ZTRTRS( UPLO, TRANS, DIAG, N, NRHS, A, LDA, B, LDB,
+     $                   INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE, TRANS
-      INTEGER            INFO, K, LDA, LDC, M, N
+      CHARACTER          DIAG, TRANS, UPLO
+      INTEGER            INFO, LDA, LDB, N, NRHS
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), B( LDB, * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      COMPLEX*16         ONE
-      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LEFT, NOTRAN
-      INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
-      COMPLEX*16         AII, TAUI
+      LOGICAL            NOUNIT
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLACGV, ZLARF
+      EXTERNAL           XERBLA, ZTRSM
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DCONJG, MAX
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments
+*     Test the input parameters.
 *
       INFO = 0
-      LEFT = LSAME( SIDE, 'L' )
-      NOTRAN = LSAME( TRANS, 'N' )
-*
-*     NQ is the order of Q
-*
-      IF( LEFT ) THEN
-         NQ = M
-      ELSE
-         NQ = N
-      END IF
-      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+      NOUNIT = LSAME( DIAG, 'N' )
+      IF( .NOT.LSAME( UPLO, 'U' ) .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -1
-      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.
+     $         LSAME( TRANS, 'T' ) .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+      ELSE IF( .NOT.NOUNIT .AND. .NOT.LSAME( DIAG, 'U' ) ) THEN
          INFO = -3
       ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+      ELSE IF( NRHS.LT.0 ) THEN
          INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -7
-      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -10
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -9
       END IF
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNML2', -INFO )
+         CALL XERBLA( 'ZTRTRS', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 )
+      IF( N.EQ.0 )
      $   RETURN
 *
-      IF( ( LEFT .AND. NOTRAN .OR. .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
-         I1 = 1
-         I2 = K
-         I3 = 1
-      ELSE
-         I1 = K
-         I2 = 1
-         I3 = -1
-      END IF
+*     Check for singularity.
 *
-      IF( LEFT ) THEN
-         NI = N
-         JC = 1
-      ELSE
-         MI = M
-         IC = 1
+      IF( NOUNIT ) THEN
+         DO 10 INFO = 1, N
+            IF( A( INFO, INFO ).EQ.ZERO )
+     $         RETURN
+   10    CONTINUE
       END IF
+      INFO = 0
 *
-      DO 10 I = I1, I2, I3
-         IF( LEFT ) THEN
-*
-*           H(i) or H(i)**H is applied to C(i:m,1:n)
-*
-            MI = M - I + 1
-            IC = I
-         ELSE
-*
-*           H(i) or H(i)**H is applied to C(1:m,i:n)
-*
-            NI = N - I + 1
-            JC = I
-         END IF
+*     Solve A * x = b,  A**T * x = b,  or  A**H * x = b.
 *
-*        Apply H(i) or H(i)**H
+      CALL ZTRSM( 'Left', UPLO, TRANS, DIAG, N, NRHS, ONE, A, LDA, B,
+     $            LDB )
 *
-         IF( NOTRAN ) THEN
-            TAUI = DCONJG( TAU( I ) )
-         ELSE
-            TAUI = TAU( I )
-         END IF
-         IF( I.LT.NQ )
-     $      CALL ZLACGV( NQ-I, A( I, I+1 ), LDA )
-         AII = A( I, I )
-         A( I, I ) = ONE
-         CALL ZLARF( SIDE, MI, NI, A( I, I ), LDA, TAUI, C( IC, JC ),
-     $               LDC, WORK )
-         A( I, I ) = AII
-         IF( I.LT.NQ )
-     $      CALL ZLACGV( NQ-I, A( I, I+1 ), LDA )
-   10 CONTINUE
       RETURN
 *
-*     End of ZUNML2
+*     End of ZTRTRS
 *
       END
-*> \brief \b ZUNMLQ
+*> \brief \b ZUNG2L generates all or part of the unitary matrix Q from a QL factorization determined by cgeqlf (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -30823,27 +49430,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNMLQ + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmlq.f"> 
+*> Download ZUNG2L + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zung2l.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmlq.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zung2l.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmlq.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zung2l.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-*                          WORK, LWORK, INFO )
+*       SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE, TRANS
-*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+*       INTEGER            INFO, K, LDA, M, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -30852,122 +49457,70 @@
 *>
 *> \verbatim
 *>
-*> ZUNMLQ overwrites the general complex M-by-N matrix C with
-*>
-*>                 SIDE = 'L'     SIDE = 'R'
-*> TRANS = 'N':      Q * C          C * Q
-*> TRANS = 'C':      Q**H * C       C * Q**H
-*>
-*> where Q is a complex unitary matrix defined as the product of k
-*> elementary reflectors
+*> ZUNG2L generates an m by n complex matrix Q with orthonormal columns,
+*> which is defined as the last n columns of a product of k elementary
+*> reflectors of order m
 *>
-*>       Q = H(k)**H . . . H(2)**H H(1)**H
+*>       Q  =  H(k) . . . H(2) H(1)
 *>
-*> as returned by ZGELQF. Q is of order M if SIDE = 'L' and of order N
-*> if SIDE = 'R'.
+*> as returned by ZGEQLF.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply Q or Q**H from the Left;
-*>          = 'R': apply Q or Q**H from the Right.
-*> \endverbatim
-*>
-*> \param[in] TRANS
-*> \verbatim
-*>          TRANS is CHARACTER*1
-*>          = 'N':  No transpose, apply Q;
-*>          = 'C':  Conjugate transpose, apply Q**H.
-*> \endverbatim
-*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix C. M >= 0.
+*>          The number of rows of the matrix Q. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= 0.
+*>          The number of columns of the matrix Q. M >= N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
 *> \verbatim
 *>          K is INTEGER
-*>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          If SIDE = 'L', M >= K >= 0;
-*>          if SIDE = 'R', N >= K >= 0.
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. N >= K >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension
-*>                               (LDA,M) if SIDE = 'L',
-*>                               (LDA,N) if SIDE = 'R'
-*>          The i-th row must contain the vector which defines the
-*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          ZGELQF in the first k rows of its array argument A.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the (n-k+i)-th column must contain the vector which
+*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
+*>          returned by ZGEQLF in the last k columns of its array
+*>          argument A.
+*>          On exit, the m-by-n matrix Q.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,K).
+*>          The first dimension of the array A. LDA >= max(1,M).
 *> \endverbatim
 *>
 *> \param[in] TAU
 *> \verbatim
 *>          TAU is COMPLEX*16 array, dimension (K)
 *>          TAU(i) must contain the scalar factor of the elementary
-*>          reflector H(i), as returned by ZGELQF.
-*> \endverbatim
-*>
-*> \param[in,out] C
-*> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the M-by-N matrix C.
-*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
-*> \endverbatim
-*>
-*> \param[in] LDC
-*> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
+*>          reflector H(i), as returned by ZGEQLF.
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,N);
-*>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          WORK is COMPLEX*16 array, dimension (N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument has an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -30978,198 +49531,97 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date September 2012
 *
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-     $                   WORK, LWORK, INFO )
+      SUBROUTINE ZUNG2L( M, N, K, A, LDA, TAU, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE, TRANS
-      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+      INTEGER            INFO, K, LDA, M, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LEFT, LQUERY, NOTRAN
-      CHARACTER          TRANST
-      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWS, JC, LDWORK,
-     $                   LWKOPT, MI, NB, NBMIN, NI, NQ, NW
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         T( LDT, NBMAX )
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      INTEGER            I, II, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNML2
+      EXTERNAL           XERBLA, ZLARF, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
       INFO = 0
-      LEFT = LSAME( SIDE, 'L' )
-      NOTRAN = LSAME( TRANS, 'N' )
-      LQUERY = ( LWORK.EQ.-1 )
-*
-*     NQ is the order of Q and NW is the minimum dimension of WORK
-*
-      IF( LEFT ) THEN
-         NQ = M
-         NW = N
-      ELSE
-         NQ = N
-         NW = M
-      END IF
-      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+      IF( M.LT.0 ) THEN
          INFO = -1
-      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
          INFO = -3
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
-         INFO = -7
-      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -10
-      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
-         INFO = -12
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-*
-*        Determine the block size.  NB may be at most NBMAX, where NBMAX
-*        is used to define the local array T.
-*
-         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N, K,
-     $        -1 ) )
-         LWKOPT = MAX( 1, NW )*NB
-         WORK( 1 ) = LWKOPT
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNMLQ', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZUNG2L', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
-      END IF
-*
-      NBMIN = 2
-      LDWORK = NW
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMLQ', SIDE // TRANS, M, N, K,
-     $              -1 ) )
-         END IF
-      ELSE
-         IWS = NW
-      END IF
-*
-      IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
-*
-*        Use unblocked code
-*
-         CALL ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
-     $                IINFO )
-      ELSE
-*
-*        Use blocked code
-*
-         IF( ( LEFT .AND. NOTRAN ) .OR.
-     $       ( .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
-            I1 = 1
-            I2 = K
-            I3 = NB
-         ELSE
-            I1 = ( ( K-1 ) / NB )*NB + 1
-            I2 = 1
-            I3 = -NB
-         END IF
-*
-         IF( LEFT ) THEN
-            NI = N
-            JC = 1
-         ELSE
-            MI = M
-            IC = 1
-         END IF
-*
-         IF( NOTRAN ) THEN
-            TRANST = 'C'
-         ELSE
-            TRANST = 'N'
-         END IF
-*
-         DO 10 I = I1, I2, I3
-            IB = MIN( NB, K-I+1 )
-*
-*           Form the triangular factor of the block reflector
-*           H = H(i) H(i+1) . . . H(i+ib-1)
-*
-            CALL ZLARFT( 'Forward', 'Rowwise', NQ-I+1, IB, A( I, I ),
-     $                   LDA, TAU( I ), T, LDT )
-            IF( LEFT ) THEN
+      IF( N.LE.0 )
+     $   RETURN
 *
-*              H or H**H is applied to C(i:m,1:n)
+*     Initialise columns 1:n-k to columns of the unit matrix
 *
-               MI = M - I + 1
-               IC = I
-            ELSE
+      DO 20 J = 1, N - K
+         DO 10 L = 1, M
+            A( L, J ) = ZERO
+   10    CONTINUE
+         A( M-N+J, J ) = ONE
+   20 CONTINUE
 *
-*              H or H**H is applied to C(1:m,i:n)
+      DO 40 I = 1, K
+         II = N - K + I
 *
-               NI = N - I + 1
-               JC = I
-            END IF
+*        Apply H(i) to A(1:m-k+i,1:n-k+i) from the left
 *
-*           Apply H or H**H
+         A( M-N+II, II ) = ONE
+         CALL ZLARF( 'Left', M-N+II, II-1, A( 1, II ), 1, TAU( I ), A,
+     $               LDA, WORK )
+         CALL ZSCAL( M-N+II-1, -TAU( I ), A( 1, II ), 1 )
+         A( M-N+II, II ) = ONE - TAU( I )
 *
-            CALL ZLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
-     $                   A( I, I ), LDA, T, LDT, C( IC, JC ), LDC, WORK,
-     $                   LDWORK )
-   10    CONTINUE
-      END IF
-      WORK( 1 ) = LWKOPT
+*        Set A(m-k+i+1:m,n-k+i) to zero
+*
+         DO 30 L = M - N + II + 1, M
+            A( L, II ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
       RETURN
 *
-*     End of ZUNMLQ
+*     End of ZUNG2L
 *
       END
-*> \brief \b ZUNMQR
+*> \brief \b ZUNG2R
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -31177,27 +49629,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZUNMQR + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmqr.f"> 
+*> Download ZUNG2R + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zung2r.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmqr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zung2r.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmqr.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zung2r.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-*                          WORK, LWORK, INFO )
+*       SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          SIDE, TRANS
-*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+*       INTEGER            INFO, K, LDA, M, N
 *       ..
 *       .. Array Arguments ..
-*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -31206,73 +49656,51 @@
 *>
 *> \verbatim
 *>
-*> ZUNMQR overwrites the general complex M-by-N matrix C with
-*>
-*>                 SIDE = 'L'     SIDE = 'R'
-*> TRANS = 'N':      Q * C          C * Q
-*> TRANS = 'C':      Q**H * C       C * Q**H
-*>
-*> where Q is a complex unitary matrix defined as the product of k
-*> elementary reflectors
+*> ZUNG2R generates an m by n complex matrix Q with orthonormal columns,
+*> which is defined as the first n columns of a product of k elementary
+*> reflectors of order m
 *>
-*>       Q = H(1) H(2) . . . H(k)
+*>       Q  =  H(1) H(2) . . . H(k)
 *>
-*> as returned by ZGEQRF. Q is of order M if SIDE = 'L' and of order N
-*> if SIDE = 'R'.
+*> as returned by ZGEQRF.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': apply Q or Q**H from the Left;
-*>          = 'R': apply Q or Q**H from the Right.
-*> \endverbatim
-*>
-*> \param[in] TRANS
-*> \verbatim
-*>          TRANS is CHARACTER*1
-*>          = 'N':  No transpose, apply Q;
-*>          = 'C':  Conjugate transpose, apply Q**H.
-*> \endverbatim
-*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix C. M >= 0.
+*>          The number of rows of the matrix Q. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix C. N >= 0.
+*>          The number of columns of the matrix Q. M >= N >= 0.
 *> \endverbatim
 *>
 *> \param[in] K
 *> \verbatim
 *>          K is INTEGER
-*>          The number of elementary reflectors whose product defines
-*>          the matrix Q.
-*>          If SIDE = 'L', M >= K >= 0;
-*>          if SIDE = 'R', N >= K >= 0.
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. N >= K >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,K)
-*>          The i-th column must contain the vector which defines the
-*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          ZGEQRF in the first k columns of its array argument A.
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the i-th column must contain the vector which
+*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
+*>          returned by ZGEQRF in the first k columns of its array
+*>          argument A.
+*>          On exit, the m by n matrix Q.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.
-*>          If SIDE = 'L', LDA >= max(1,M);
-*>          if SIDE = 'R', LDA >= max(1,N).
+*>          The first dimension of the array A. LDA >= max(1,M).
 *> \endverbatim
 *>
 *> \param[in] TAU
@@ -31282,46 +49710,16 @@
 *>          reflector H(i), as returned by ZGEQRF.
 *> \endverbatim
 *>
-*> \param[in,out] C
-*> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC,N)
-*>          On entry, the M-by-N matrix C.
-*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
-*> \endverbatim
-*>
-*> \param[in] LDC
-*> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >= max(1,M).
-*> \endverbatim
-*>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.
-*>          If SIDE = 'L', LWORK >= max(1,N);
-*>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          WORK is COMPLEX*16 array, dimension (N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument has an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -31337,8 +49735,7 @@
 *> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
-     $                   WORK, LWORK, INFO )
+      SUBROUTINE ZUNG2R( M, N, K, A, LDA, TAU, WORK, INFO )
 *
 *  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -31346,177 +49743,86 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      CHARACTER          SIDE, TRANS
-      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+      INTEGER            INFO, K, LDA, M, N
 *     ..
 *     .. Array Arguments ..
-      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            LEFT, LQUERY, NOTRAN
-      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWS, JC, LDWORK,
-     $                   LWKOPT, MI, NB, NBMIN, NI, NQ, NW
-*     ..
-*     .. Local Arrays ..
-      COMPLEX*16         T( LDT, NBMAX )
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAENV
-      EXTERNAL           LSAME, ILAENV
+      INTEGER            I, J, L
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNM2R
+      EXTERNAL           XERBLA, ZLARF, ZSCAL
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
       INFO = 0
-      LEFT = LSAME( SIDE, 'L' )
-      NOTRAN = LSAME( TRANS, 'N' )
-      LQUERY = ( LWORK.EQ.-1 )
-*
-*     NQ is the order of Q and NW is the minimum dimension of WORK
-*
-      IF( LEFT ) THEN
-         NQ = M
-         NW = N
-      ELSE
-         NQ = N
-         NW = M
-      END IF
-      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+      IF( M.LT.0 ) THEN
          INFO = -1
-      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
          INFO = -3
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
          INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
-         INFO = -7
-      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
-         INFO = -10
-      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
-         INFO = -12
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-*
-*        Determine the block size.  NB may be at most NBMAX, where NBMAX
-*        is used to define the local array T.
-*
-         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N, K,
-     $        -1 ) )
-         LWKOPT = MAX( 1, NW )*NB
-         WORK( 1 ) = LWKOPT
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZUNMQR', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'ZUNG2R', -INFO )
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 ) THEN
-         WORK( 1 ) = 1
-         RETURN
-      END IF
-*
-      NBMIN = 2
-      LDWORK = NW
-      IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
-            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQR', SIDE // TRANS, M, N, K,
-     $              -1 ) )
-         END IF
-      ELSE
-         IWS = NW
-      END IF
-*
-      IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
+      IF( N.LE.0 )
+     $   RETURN
 *
-*        Use unblocked code
+*     Initialise columns k+1:n to columns of the unit matrix
 *
-         CALL ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
-     $                IINFO )
-      ELSE
+      DO 20 J = K + 1, N
+         DO 10 L = 1, M
+            A( L, J ) = ZERO
+   10    CONTINUE
+         A( J, J ) = ONE
+   20 CONTINUE
 *
-*        Use blocked code
+      DO 40 I = K, 1, -1
 *
-         IF( ( LEFT .AND. .NOT.NOTRAN ) .OR.
-     $       ( .NOT.LEFT .AND. NOTRAN ) ) THEN
-            I1 = 1
-            I2 = K
-            I3 = NB
-         ELSE
-            I1 = ( ( K-1 ) / NB )*NB + 1
-            I2 = 1
-            I3 = -NB
-         END IF
+*        Apply H(i) to A(i:m,i:n) from the left
 *
-         IF( LEFT ) THEN
-            NI = N
-            JC = 1
-         ELSE
-            MI = M
-            IC = 1
+         IF( I.LT.N ) THEN
+            A( I, I ) = ONE
+            CALL ZLARF( 'Left', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                  A( I, I+1 ), LDA, WORK )
          END IF
+         IF( I.LT.M )
+     $      CALL ZSCAL( M-I, -TAU( I ), A( I+1, I ), 1 )
+         A( I, I ) = ONE - TAU( I )
 *
-         DO 10 I = I1, I2, I3
-            IB = MIN( NB, K-I+1 )
-*
-*           Form the triangular factor of the block reflector
-*           H = H(i) H(i+1) . . . H(i+ib-1)
-*
-            CALL ZLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
-     $                   LDA, TAU( I ), T, LDT )
-            IF( LEFT ) THEN
-*
-*              H or H**H is applied to C(i:m,1:n)
-*
-               MI = M - I + 1
-               IC = I
-            ELSE
-*
-*              H or H**H is applied to C(1:m,i:n)
-*
-               NI = N - I + 1
-               JC = I
-            END IF
-*
-*           Apply H or H**H
+*        Set A(1:i-1,i) to zero
 *
-            CALL ZLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
-     $                   IB, A( I, I ), LDA, T, LDT, C( IC, JC ), LDC,
-     $                   WORK, LDWORK )
-   10    CONTINUE
-      END IF
-      WORK( 1 ) = LWKOPT
+         DO 30 L = 1, I - 1
+            A( L, I ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
       RETURN
 *
-*     End of ZUNMQR
+*     End of ZUNG2R
 *
       END
-*> \brief \b ZGESDD
+*> \brief \b ZUNGBR
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -31524,30 +49830,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGESDD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgesdd.f"> 
+*> Download ZUNGBR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungbr.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgesdd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungbr.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgesdd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungbr.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT, WORK,
-*                          LWORK, RWORK, IWORK, INFO )
+*       SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          JOBZ
-*       INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+*       CHARACTER          VECT
+*       INTEGER            INFO, K, LDA, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            IWORK( * )
-*       DOUBLE PRECISION   RWORK( * ), S( * )
-*       COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
-*      $                   WORK( * )
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -31556,123 +49858,86 @@
 *>
 *> \verbatim
 *>
-*> ZGESDD computes the singular value decomposition (SVD) of a complex
-*> M-by-N matrix A, optionally computing the left and/or right singular
-*> vectors, by using divide-and-conquer method. The SVD is written
-*>
-*>      A = U * SIGMA * conjugate-transpose(V)
-*>
-*> where SIGMA is an M-by-N matrix which is zero except for its
-*> min(m,n) diagonal elements, U is an M-by-M unitary matrix, and
-*> V is an N-by-N unitary matrix.  The diagonal elements of SIGMA
-*> are the singular values of A; they are real and non-negative, and
-*> are returned in descending order.  The first min(m,n) columns of
-*> U and V are the left and right singular vectors of A.
+*> ZUNGBR generates one of the complex unitary matrices Q or P**H
+*> determined by ZGEBRD when reducing a complex matrix A to bidiagonal
+*> form: A = Q * B * P**H.  Q and P**H are defined as products of
+*> elementary reflectors H(i) or G(i) respectively.
 *>
-*> Note that the routine returns VT = V**H, not V.
+*> If VECT = 'Q', A is assumed to have been an M-by-K matrix, and Q
+*> is of order M:
+*> if m >= k, Q = H(1) H(2) . . . H(k) and ZUNGBR returns the first n
+*> columns of Q, where m >= n >= k;
+*> if m < k, Q = H(1) H(2) . . . H(m-1) and ZUNGBR returns Q as an
+*> M-by-M matrix.
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
+*> If VECT = 'P', A is assumed to have been a K-by-N matrix, and P**H
+*> is of order N:
+*> if k < n, P**H = G(k) . . . G(2) G(1) and ZUNGBR returns the first m
+*> rows of P**H, where n >= m >= k;
+*> if k >= n, P**H = G(n-1) . . . G(2) G(1) and ZUNGBR returns P**H as
+*> an N-by-N matrix.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] JOBZ
+*> \param[in] VECT
 *> \verbatim
-*>          JOBZ is CHARACTER*1
-*>          Specifies options for computing all or part of the matrix U:
-*>          = 'A':  all M columns of U and all N rows of V**H are
-*>                  returned in the arrays U and VT;
-*>          = 'S':  the first min(M,N) columns of U and the first
-*>                  min(M,N) rows of V**H are returned in the arrays U
-*>                  and VT;
-*>          = 'O':  If M >= N, the first N columns of U are overwritten
-*>                  in the array A and all rows of V**H are returned in
-*>                  the array VT;
-*>                  otherwise, all columns of U are returned in the
-*>                  array U and the first M rows of V**H are overwritten
-*>                  in the array A;
-*>          = 'N':  no columns of U or rows of V**H are computed.
+*>          VECT is CHARACTER*1
+*>          Specifies whether the matrix Q or the matrix P**H is
+*>          required, as defined in the transformation applied by ZGEBRD:
+*>          = 'Q':  generate Q;
+*>          = 'P':  generate P**H.
 *> \endverbatim
 *>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the input matrix A.  M >= 0.
+*>          The number of rows of the matrix Q or P**H to be returned.
+*>          M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the input matrix A.  N >= 0.
+*>          The number of columns of the matrix Q or P**H to be returned.
+*>          N >= 0.
+*>          If VECT = 'Q', M >= N >= min(M,K);
+*>          if VECT = 'P', N >= M >= min(N,K).
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          If VECT = 'Q', the number of columns in the original M-by-K
+*>          matrix reduced by ZGEBRD.
+*>          If VECT = 'P', the number of rows in the original K-by-N
+*>          matrix reduced by ZGEBRD.
+*>          K >= 0.
 *> \endverbatim
 *>
 *> \param[in,out] A
 *> \verbatim
 *>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit,
-*>          if JOBZ = 'O',  A is overwritten with the first N columns
-*>                          of U (the left singular vectors, stored
-*>                          columnwise) if M >= N;
-*>                          A is overwritten with the first M rows
-*>                          of V**H (the right singular vectors, stored
-*>                          rowwise) otherwise.
-*>          if JOBZ .ne. 'O', the contents of A are destroyed.
+*>          On entry, the vectors which define the elementary reflectors,
+*>          as returned by ZGEBRD.
+*>          On exit, the M-by-N matrix Q or P**H.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] S
-*> \verbatim
-*>          S is DOUBLE PRECISION array, dimension (min(M,N))
-*>          The singular values of A, sorted so that S(i) >= S(i+1).
-*> \endverbatim
-*>
-*> \param[out] U
-*> \verbatim
-*>          U is COMPLEX*16 array, dimension (LDU,UCOL)
-*>          UCOL = M if JOBZ = 'A' or JOBZ = 'O' and M < N;
-*>          UCOL = min(M,N) if JOBZ = 'S'.
-*>          If JOBZ = 'A' or JOBZ = 'O' and M < N, U contains the M-by-M
-*>          unitary matrix U;
-*>          if JOBZ = 'S', U contains the first min(M,N) columns of U
-*>          (the left singular vectors, stored columnwise);
-*>          if JOBZ = 'O' and M >= N, or JOBZ = 'N', U is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDU
-*> \verbatim
-*>          LDU is INTEGER
-*>          The leading dimension of the array U.  LDU >= 1; if
-*>          JOBZ = 'S' or 'A' or JOBZ = 'O' and M < N, LDU >= M.
-*> \endverbatim
-*>
-*> \param[out] VT
-*> \verbatim
-*>          VT is COMPLEX*16 array, dimension (LDVT,N)
-*>          If JOBZ = 'A' or JOBZ = 'O' and M >= N, VT contains the
-*>          N-by-N unitary matrix V**H;
-*>          if JOBZ = 'S', VT contains the first min(M,N) rows of
-*>          V**H (the right singular vectors, stored rowwise);
-*>          if JOBZ = 'O' and M < N, or JOBZ = 'N', VT is not referenced.
+*>          The leading dimension of the array A. LDA >= M.
 *> \endverbatim
 *>
-*> \param[in] LDVT
+*> \param[in] TAU
 *> \verbatim
-*>          LDVT is INTEGER
-*>          The leading dimension of the array VT.  LDVT >= 1; if
-*>          JOBZ = 'A' or JOBZ = 'O' and M >= N, LDVT >= N;
-*>          if JOBZ = 'S', LDVT >= min(M,N).
+*>          TAU is COMPLEX*16 array, dimension
+*>                                (min(M,K)) if VECT = 'Q'
+*>                                (min(N,K)) if VECT = 'P'
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i) or G(i), which determines Q or P**H, as
+*>          returned by ZGEBRD in its array argument TAUQ or TAUP.
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -31684,38 +49949,21 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK >= 1.
-*>          if JOBZ = 'N', LWORK >= 2*min(M,N)+max(M,N).
-*>          if JOBZ = 'O',
-*>                LWORK >= 2*min(M,N)*min(M,N)+2*min(M,N)+max(M,N).
-*>          if JOBZ = 'S' or 'A',
-*>                LWORK >= min(M,N)*min(M,N)+2*min(M,N)+max(M,N).
-*>          For good performance, LWORK should generally be larger.
-*>
-*>          If LWORK = -1, a workspace query is assumed.  The optimal
-*>          size for the WORK array is calculated and stored in WORK(1),
-*>          and no other work except argument checking is performed.
-*> \endverbatim
-*>
-*> \param[out] RWORK
-*> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,LRWORK))
-*>          If JOBZ = 'N', LRWORK >= 5*min(M,N).
-*>          Otherwise,
-*>          LRWORK >= min(M,N)*max(5*min(M,N)+7,2*max(M,N)+2*min(M,N)+1)
-*> \endverbatim
+*>          The dimension of the array WORK. LWORK >= max(1,min(M,N)).
+*>          For optimum performance LWORK >= min(M,N)*NB, where NB
+*>          is the optimal blocksize.
 *>
-*> \param[out] IWORK
-*> \verbatim
-*>          IWORK is INTEGER array, dimension (8*min(M,N))
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit.
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>          > 0:  The updating process of DBDSDC did not converge.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -31726,1855 +49974,2275 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date April 2012
 *
-*> \ingroup complex16GEsing
+*> \ingroup complex16GBcomputational
 *
-*> \par Contributors:
-*  ==================
-*>
-*>     Ming Gu and Huan Ren, Computer Science Division, University of
-*>     California at Berkeley, USA
-*>
 *  =====================================================================
-      SUBROUTINE ZGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT, WORK,
-     $                   LWORK, RWORK, IWORK, INFO )
+      SUBROUTINE ZUNGBR( VECT, M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.4.1) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     April 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          JOBZ
-      INTEGER            INFO, LDA, LDU, LDVT, LWORK, M, N
+      CHARACTER          VECT
+      INTEGER            INFO, K, LDA, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            IWORK( * )
-      DOUBLE PRECISION   RWORK( * ), S( * )
-      COMPLEX*16         A( LDA, * ), U( LDU, * ), VT( LDVT, * ),
-     $                   WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      INTEGER            LQUERV
-      PARAMETER          ( LQUERV = -1 )
-      COMPLEX*16         CZERO, CONE
-      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ),
-     $                   CONE = ( 1.0D+0, 0.0D+0 ) )
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            WNTQA, WNTQAS, WNTQN, WNTQO, WNTQS
-      INTEGER            BLK, CHUNK, I, IE, IERR, IL, IR, IRU, IRVT,
-     $                   ISCL, ITAU, ITAUP, ITAUQ, IU, IVT, LDWKVT,
-     $                   LDWRKL, LDWRKR, LDWRKU, MAXWRK, MINMN, MINWRK,
-     $                   MNTHR1, MNTHR2, NRWORK, NWORK, WRKBL
-      DOUBLE PRECISION   ANRM, BIGNUM, EPS, SMLNUM
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
 *     ..
-*     .. Local Arrays ..
-      INTEGER            IDUM( 1 )
-      DOUBLE PRECISION   DUM( 1 )
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
-*     .. External Subroutines ..
-      EXTERNAL           DBDSDC, DLASCL, XERBLA, ZGEBRD, ZGELQF, ZGEMM,
-     $                   ZGEQRF, ZLACP2, ZLACPY, ZLACRM, ZLARCM, ZLASCL,
-     $                   ZLASET, ZUNGBR, ZUNGLQ, ZUNGQR, ZUNMBR
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, WANTQ
+      INTEGER            I, IINFO, J, LWKOPT, MN
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, ZLANGE
-      EXTERNAL           LSAME, ILAENV, DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZUNGLQ, ZUNGQR
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          INT, MAX, MIN, SQRT
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
 *     Test the input arguments
 *
       INFO = 0
-      MINMN = MIN( M, N )
-      MNTHR1 = INT( MINMN*17.0D0 / 9.0D0 )
-      MNTHR2 = INT( MINMN*5.0D0 / 3.0D0 )
-      WNTQA = LSAME( JOBZ, 'A' )
-      WNTQS = LSAME( JOBZ, 'S' )
-      WNTQAS = WNTQA .OR. WNTQS
-      WNTQO = LSAME( JOBZ, 'O' )
-      WNTQN = LSAME( JOBZ, 'N' )
-      MINWRK = 1
-      MAXWRK = 1
-*
-      IF( .NOT.( WNTQA .OR. WNTQS .OR. WNTQO .OR. WNTQN ) ) THEN
+      WANTQ = LSAME( VECT, 'Q' )
+      MN = MIN( M, N )
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( .NOT.WANTQ .AND. .NOT.LSAME( VECT, 'P' ) ) THEN
          INFO = -1
       ELSE IF( M.LT.0 ) THEN
          INFO = -2
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( N.LT.0 .OR. ( WANTQ .AND. ( N.GT.M .OR. N.LT.MIN( M,
+     $         K ) ) ) .OR. ( .NOT.WANTQ .AND. ( M.GT.N .OR. M.LT.
+     $         MIN( N, K ) ) ) ) THEN
          INFO = -3
+      ELSE IF( K.LT.0 ) THEN
+         INFO = -4
       ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      ELSE IF( LDU.LT.1 .OR. ( WNTQAS .AND. LDU.LT.M ) .OR.
-     $         ( WNTQO .AND. M.LT.N .AND. LDU.LT.M ) ) THEN
-         INFO = -8
-      ELSE IF( LDVT.LT.1 .OR. ( WNTQA .AND. LDVT.LT.N ) .OR.
-     $         ( WNTQS .AND. LDVT.LT.MINMN ) .OR.
-     $         ( WNTQO .AND. M.GE.N .AND. LDVT.LT.N ) ) THEN
-         INFO = -10
+         INFO = -6
+      ELSE IF( LWORK.LT.MAX( 1, MN ) .AND. .NOT.LQUERY ) THEN
+         INFO = -9
       END IF
 *
-*     Compute workspace
-*      (Note: Comments in the code beginning "Workspace:" describe the
-*       minimal amount of workspace needed at that point in the code,
-*       as well as the preferred amount for good performance.
-*       CWorkspace refers to complex workspace, and RWorkspace to
-*       real workspace. NB refers to the optimal block size for the
-*       immediately following subroutine, as returned by ILAENV.)
-*
-      IF( INFO.EQ.0 .AND. M.GT.0 .AND. N.GT.0 ) THEN
-         IF( M.GE.N ) THEN
-*
-*           There is no complex work space needed for bidiagonal SVD
-*           The real work space needed for bidiagonal SVD is BDSPAC
-*           for computing singular values and singular vectors; BDSPAN
-*           for computing singular values only.
-*           BDSPAC = 5*N*N + 7*N
-*           BDSPAN = MAX(7*N+4, 3*N+2+SMLSIZ*(SMLSIZ+8))
-*
-            IF( M.GE.MNTHR1 ) THEN
-               IF( WNTQN ) THEN
-*
-*                 Path 1 (M much larger than N, JOBZ='N')
-*
-                  MAXWRK = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1,
-     $                     -1 )
-                  MAXWRK = MAX( MAXWRK, 2*N+2*N*
-     $                     ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
-                  MINWRK = 3*N
-               ELSE IF( WNTQO ) THEN
-*
-*                 Path 2 (M much larger than N, JOBZ='O')
-*
-                  WRKBL = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
-                  WRKBL = MAX( WRKBL, N+N*ILAENV( 1, 'ZUNGQR', ' ', M,
-     $                    N, N, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+2*N*
-     $                    ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+N*
-     $                    ILAENV( 1, 'ZUNMBR', 'QLN', N, N, N, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+N*
-     $                    ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
-                  MAXWRK = M*N + N*N + WRKBL
-                  MINWRK = 2*N*N + 3*N
-               ELSE IF( WNTQS ) THEN
-*
-*                 Path 3 (M much larger than N, JOBZ='S')
-*
-                  WRKBL = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
-                  WRKBL = MAX( WRKBL, N+N*ILAENV( 1, 'ZUNGQR', ' ', M,
-     $                    N, N, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+2*N*
-     $                    ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+N*
-     $                    ILAENV( 1, 'ZUNMBR', 'QLN', N, N, N, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+N*
-     $                    ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
-                  MAXWRK = N*N + WRKBL
-                  MINWRK = N*N + 3*N
-               ELSE IF( WNTQA ) THEN
-*
-*                 Path 4 (M much larger than N, JOBZ='A')
-*
-                  WRKBL = N + N*ILAENV( 1, 'ZGEQRF', ' ', M, N, -1, -1 )
-                  WRKBL = MAX( WRKBL, N+M*ILAENV( 1, 'ZUNGQR', ' ', M,
-     $                    M, N, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+2*N*
-     $                    ILAENV( 1, 'ZGEBRD', ' ', N, N, -1, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+N*
-     $                    ILAENV( 1, 'ZUNMBR', 'QLN', N, N, N, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*N+N*
-     $                    ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
-                  MAXWRK = N*N + WRKBL
-                  MINWRK = N*N + 2*N + M
-               END IF
-            ELSE IF( M.GE.MNTHR2 ) THEN
-*
-*              Path 5 (M much larger than N, but not as much as MNTHR1)
-*
-               MAXWRK = 2*N + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
-     $                  -1, -1 )
-               MINWRK = 2*N + M
-               IF( WNTQO ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, N, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, N, N, -1 ) )
-                  MAXWRK = MAXWRK + M*N
-                  MINWRK = MINWRK + N*N
-               ELSE IF( WNTQS ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, N, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, N, N, -1 ) )
-               ELSE IF( WNTQA ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, N, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*N+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
-               END IF
+      IF( INFO.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         IF( WANTQ ) THEN
+            IF( M.GE.K ) THEN
+               CALL ZUNGQR( M, N, K, A, LDA, TAU, WORK, -1, IINFO )
             ELSE
-*
-*              Path 6 (M at least N, but not much larger)
-*
-               MAXWRK = 2*N + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
-     $                  -1, -1 )
-               MINWRK = 2*N + M
-               IF( WNTQO ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNMBR', 'QLN', M, N, N, -1 ) )
-                  MAXWRK = MAXWRK + M*N
-                  MINWRK = MINWRK + N*N
-               ELSE IF( WNTQS ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNMBR', 'PRC', N, N, N, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNMBR', 'QLN', M, N, N, -1 ) )
-               ELSE IF( WNTQA ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*N+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'PRC', N, N, N, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*N+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'QLN', M, M, N, -1 ) )
+               IF( M.GT.1 ) THEN
+                  CALL ZUNGQR( M-1, M-1, M-1, A( 2, 2 ), LDA, TAU, WORK,
+     $                         -1, IINFO )
                END IF
             END IF
          ELSE
+            IF( K.LT.N ) THEN
+               CALL ZUNGLQ( M, N, K, A, LDA, TAU, WORK, -1, IINFO )
+            ELSE
+               IF( N.GT.1 ) THEN
+                  CALL ZUNGLQ( N-1, N-1, N-1, A( 2, 2 ), LDA, TAU, WORK,
+     $                         -1, IINFO )
+               END IF
+            END IF
+         END IF
+         LWKOPT = WORK( 1 )
+         LWKOPT = MAX (LWKOPT, MN)
+      END IF
 *
-*           There is no complex work space needed for bidiagonal SVD
-*           The real work space needed for bidiagonal SVD is BDSPAC
-*           for computing singular values and singular vectors; BDSPAN
-*           for computing singular values only.
-*           BDSPAC = 5*M*M + 7*M
-*           BDSPAN = MAX(7*M+4, 3*M+2+SMLSIZ*(SMLSIZ+8))
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGBR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         WORK( 1 ) = LWKOPT
+         RETURN
+      END IF
 *
-            IF( N.GE.MNTHR1 ) THEN
-               IF( WNTQN ) THEN
+*     Quick return if possible
 *
-*                 Path 1t (N much larger than M, JOBZ='N')
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-                  MAXWRK = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1,
-     $                     -1 )
-                  MAXWRK = MAX( MAXWRK, 2*M+2*M*
-     $                     ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
-                  MINWRK = 3*M
-               ELSE IF( WNTQO ) THEN
+      IF( WANTQ ) THEN
 *
-*                 Path 2t (N much larger than M, JOBZ='O')
+*        Form Q, determined by a call to ZGEBRD to reduce an m-by-k
+*        matrix
 *
-                  WRKBL = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
-                  WRKBL = MAX( WRKBL, M+M*ILAENV( 1, 'ZUNGLQ', ' ', M,
-     $                    N, M, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+2*M*
-     $                    ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+M*
-     $                    ILAENV( 1, 'ZUNMBR', 'PRC', M, M, M, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+M*
-     $                    ILAENV( 1, 'ZUNMBR', 'QLN', M, M, M, -1 ) )
-                  MAXWRK = M*N + M*M + WRKBL
-                  MINWRK = 2*M*M + 3*M
-               ELSE IF( WNTQS ) THEN
+         IF( M.GE.K ) THEN
 *
-*                 Path 3t (N much larger than M, JOBZ='S')
+*           If m >= k, assume m >= n >= k
 *
-                  WRKBL = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
-                  WRKBL = MAX( WRKBL, M+M*ILAENV( 1, 'ZUNGLQ', ' ', M,
-     $                    N, M, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+2*M*
-     $                    ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+M*
-     $                    ILAENV( 1, 'ZUNMBR', 'PRC', M, M, M, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+M*
-     $                    ILAENV( 1, 'ZUNMBR', 'QLN', M, M, M, -1 ) )
-                  MAXWRK = M*M + WRKBL
-                  MINWRK = M*M + 3*M
-               ELSE IF( WNTQA ) THEN
+            CALL ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, IINFO )
 *
-*                 Path 4t (N much larger than M, JOBZ='A')
+         ELSE
 *
-                  WRKBL = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1, -1 )
-                  WRKBL = MAX( WRKBL, M+N*ILAENV( 1, 'ZUNGLQ', ' ', N,
-     $                    N, M, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+2*M*
-     $                    ILAENV( 1, 'ZGEBRD', ' ', M, M, -1, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+M*
-     $                    ILAENV( 1, 'ZUNMBR', 'PRC', M, M, M, -1 ) )
-                  WRKBL = MAX( WRKBL, 2*M+M*
-     $                    ILAENV( 1, 'ZUNMBR', 'QLN', M, M, M, -1 ) )
-                  MAXWRK = M*M + WRKBL
-                  MINWRK = M*M + 2*M + N
-               END IF
-            ELSE IF( N.GE.MNTHR2 ) THEN
+*           If m < k, assume m = n
 *
-*              Path 5t (N much larger than M, but not as much as MNTHR1)
+*           Shift the vectors which define the elementary reflectors one
+*           column to the right, and set the first row and column of Q
+*           to those of the unit matrix
 *
-               MAXWRK = 2*M + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
-     $                  -1, -1 )
-               MINWRK = 2*M + N
-               IF( WNTQO ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'P', M, N, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
-                  MAXWRK = MAXWRK + M*N
-                  MINWRK = MINWRK + M*M
-               ELSE IF( WNTQS ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'P', M, N, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
-               ELSE IF( WNTQA ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'P', N, N, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'Q', M, M, N, -1 ) )
-               END IF
-            ELSE
+            DO 20 J = M, 2, -1
+               A( 1, J ) = ZERO
+               DO 10 I = J + 1, M
+                  A( I, J ) = A( I, J-1 )
+   10          CONTINUE
+   20       CONTINUE
+            A( 1, 1 ) = ONE
+            DO 30 I = 2, M
+               A( I, 1 ) = ZERO
+   30       CONTINUE
+            IF( M.GT.1 ) THEN
 *
-*              Path 6t (N greater than M, but not much larger)
+*              Form Q(2:m,2:m)
 *
-               MAXWRK = 2*M + ( M+N )*ILAENV( 1, 'ZGEBRD', ' ', M, N,
-     $                  -1, -1 )
-               MINWRK = 2*M + N
-               IF( WNTQO ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNMBR', 'PRC', M, N, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNMBR', 'QLN', M, M, N, -1 ) )
-                  MAXWRK = MAXWRK + M*N
-                  MINWRK = MINWRK + M*M
-               ELSE IF( WNTQS ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'PRC', M, N, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'QLN', M, M, N, -1 ) )
-               ELSE IF( WNTQA ) THEN
-                  MAXWRK = MAX( MAXWRK, 2*M+N*
-     $                     ILAENV( 1, 'ZUNGBR', 'PRC', N, N, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M+M*
-     $                     ILAENV( 1, 'ZUNGBR', 'QLN', M, M, N, -1 ) )
-               END IF
+               CALL ZUNGQR( M-1, M-1, M-1, A( 2, 2 ), LDA, TAU, WORK,
+     $                      LWORK, IINFO )
             END IF
          END IF
-         MAXWRK = MAX( MAXWRK, MINWRK )
-      END IF
-      IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = MAXWRK
-         IF( LWORK.LT.MINWRK .AND. LWORK.NE.LQUERV )
-     $      INFO = -13
-      END IF
-*
-*     Quick returns
-*
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGESDD', -INFO )
-         RETURN
-      END IF
-      IF( LWORK.EQ.LQUERV )
-     $   RETURN
-      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
-         RETURN
-      END IF
-*
-*     Get machine constants
+      ELSE
 *
-      EPS = DLAMCH( 'P' )
-      SMLNUM = SQRT( DLAMCH( 'S' ) ) / EPS
-      BIGNUM = ONE / SMLNUM
+*        Form P**H, determined by a call to ZGEBRD to reduce a k-by-n
+*        matrix
 *
-*     Scale A if max element outside range [SMLNUM,BIGNUM]
+         IF( K.LT.N ) THEN
 *
-      ANRM = ZLANGE( 'M', M, N, A, LDA, DUM )
-      ISCL = 0
-      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
-         ISCL = 1
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, IERR )
-      ELSE IF( ANRM.GT.BIGNUM ) THEN
-         ISCL = 1
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, IERR )
-      END IF
+*           If k < n, assume k <= m <= n
 *
-      IF( M.GE.N ) THEN
+            CALL ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, IINFO )
 *
-*        A has at least as many rows as columns. If A has sufficiently
-*        more rows than columns, first reduce using the QR
-*        decomposition (if sufficient workspace available)
+         ELSE
 *
-         IF( M.GE.MNTHR1 ) THEN
+*           If k >= n, assume m = n
 *
-            IF( WNTQN ) THEN
+*           Shift the vectors which define the elementary reflectors one
+*           row downward, and set the first row and column of P**H to
+*           those of the unit matrix
 *
-*              Path 1 (M much larger than N, JOBZ='N')
-*              No singular vectors to be computed
+            A( 1, 1 ) = ONE
+            DO 40 I = 2, N
+               A( I, 1 ) = ZERO
+   40       CONTINUE
+            DO 60 J = 2, N
+               DO 50 I = J - 1, 2, -1
+                  A( I, J ) = A( I-1, J )
+   50          CONTINUE
+               A( 1, J ) = ZERO
+   60       CONTINUE
+            IF( N.GT.1 ) THEN
 *
-               ITAU = 1
-               NWORK = ITAU + N
+*              Form P**H(2:n,2:n)
 *
-*              Compute A=Q*R
-*              (CWorkspace: need 2*N, prefer N+N*NB)
-*              (RWorkspace: need 0)
+               CALL ZUNGLQ( N-1, N-1, N-1, A( 2, 2 ), LDA, TAU, WORK,
+     $                      LWORK, IINFO )
+            END IF
+         END IF
+      END IF
+      WORK( 1 ) = LWKOPT
+      RETURN
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     End of ZUNGBR
 *
-*              Zero out below R
+      END
+*> \brief \b ZUNGHR
 *
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
-     $                      LDA )
-               IE = 1
-               ITAUQ = 1
-               ITAUP = ITAUQ + N
-               NWORK = ITAUP + N
+*  =========== DOCUMENTATION ===========
 *
-*              Bidiagonalize R in A
-*              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*              (RWorkspace: need N)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                      IERR )
-               NRWORK = IE + N
+*> \htmlonly
+*> Download ZUNGHR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunghr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunghr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunghr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*              Perform bidiagonal SVD, compute singular values only
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAN)
+*  Definition:
+*  ===========
 *
-               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1, DUM, 1,
-     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
+*       SUBROUTINE ZUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-            ELSE IF( WNTQO ) THEN
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGHR generates a complex unitary matrix Q which is defined as the
+*> product of IHI-ILO elementary reflectors of order N, as returned by
+*> ZGEHRD:
+*>
+*> Q = H(ilo) H(ilo+1) . . . H(ihi-1).
+*> \endverbatim
 *
-*              Path 2 (M much larger than N, JOBZ='O')
-*              N left singular vectors to be overwritten on A and
-*              N right singular vectors to be computed in VT
+*  Arguments:
+*  ==========
 *
-               IU = 1
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix Q. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] ILO
+*> \verbatim
+*>          ILO is INTEGER
+*> \endverbatim
+*>
+*> \param[in] IHI
+*> \verbatim
+*>          IHI is INTEGER
+*>
+*>          ILO and IHI must have the same values as in the previous call
+*>          of ZGEHRD. Q is equal to the unit matrix except in the
+*>          submatrix Q(ilo+1:ihi,ilo+1:ihi).
+*>          1 <= ILO <= IHI <= N, if N > 0; ILO=1 and IHI=0, if N=0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the vectors which define the elementary reflectors,
+*>          as returned by ZGEHRD.
+*>          On exit, the N-by-N unitary matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (N-1)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEHRD.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= IHI-ILO.
+*>          For optimum performance LWORK >= (IHI-ILO)*NB, where NB is
+*>          the optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
 *
-*              WORK(IU) is N by N
+*  Authors:
+*  ========
 *
-               LDWRKU = N
-               IR = IU + LDWRKU*N
-               IF( LWORK.GE.M*N+N*N+3*N ) THEN
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*                 WORK(IR) is M by N
+*> \date November 2011
 *
-                  LDWRKR = M
-               ELSE
-                  LDWRKR = ( LWORK-N*N-3*N ) / N
-               END IF
-               ITAU = IR + LDWRKR*N
-               NWORK = ITAU + N
+*> \ingroup complex16OTHERcomputational
 *
-*              Compute A=Q*R
-*              (CWorkspace: need N*N+2*N, prefer M*N+N+N*NB)
-*              (RWorkspace: 0)
+*  =====================================================================
+      SUBROUTINE ZUNGHR( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-*              Copy R to WORK( IR ), zeroing out below it
+*     .. Scalar Arguments ..
+      INTEGER            IHI, ILO, INFO, LDA, LWORK, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-               CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
-     $                      LDWRKR )
+*  =====================================================================
 *
-*              Generate Q in A
-*              (CWorkspace: need 2*N, prefer N+N*NB)
-*              (RWorkspace: 0)
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY
+      INTEGER            I, IINFO, J, LWKOPT, NB, NH
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZUNGQR
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
 *
-               CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
-               IE = 1
-               ITAUQ = ITAU
-               ITAUP = ITAUQ + N
-               NWORK = ITAUP + N
+*     Test the input arguments
 *
-*              Bidiagonalize R in WORK(IR)
-*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+2*N*NB)
-*              (RWorkspace: need N)
+      INFO = 0
+      NH = IHI - ILO
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
+         INFO = -2
+      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LWORK.LT.MAX( 1, NH ) .AND. .NOT.LQUERY ) THEN
+         INFO = -8
+      END IF
 *
-               CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
-     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+      IF( INFO.EQ.0 ) THEN
+         NB = ILAENV( 1, 'ZUNGQR', ' ', NH, NH, NH, -1 )
+         LWKOPT = MAX( 1, NH )*NB
+         WORK( 1 ) = LWKOPT
+      END IF
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of R in WORK(IRU) and computing right singular vectors
-*              of R in WORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGHR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-               IRU = IE + N
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*     Quick return if possible
 *
-*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
-*              Overwrite WORK(IU) by the left singular vectors of R
-*              (CWorkspace: need 2*N*N+3*N, prefer M*N+N*N+2*N+N*NB)
-*              (RWorkspace: 0)
+      IF( N.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
-     $                      LDWRKU )
-               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
-     $                      WORK( ITAUQ ), WORK( IU ), LDWRKU,
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*     Shift the vectors which define the elementary reflectors one
+*     column to the right, and set the first ilo and the last n-ihi
+*     rows and columns to those of the unit matrix
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by the right singular vectors of R
-*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+N*NB)
-*              (RWorkspace: 0)
+      DO 40 J = IHI, ILO + 1, -1
+         DO 10 I = 1, J - 1
+            A( I, J ) = ZERO
+   10    CONTINUE
+         DO 20 I = J + 1, IHI
+            A( I, J ) = A( I, J-1 )
+   20    CONTINUE
+         DO 30 I = IHI + 1, N
+            A( I, J ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
+      DO 60 J = 1, ILO
+         DO 50 I = 1, N
+            A( I, J ) = ZERO
+   50    CONTINUE
+         A( J, J ) = ONE
+   60 CONTINUE
+      DO 80 J = IHI + 1, N
+         DO 70 I = 1, N
+            A( I, J ) = ZERO
+   70    CONTINUE
+         A( J, J ) = ONE
+   80 CONTINUE
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+      IF( NH.GT.0 ) THEN
 *
-*              Multiply Q in A by left singular vectors of R in
-*              WORK(IU), storing result in WORK(IR) and copying to A
-*              (CWorkspace: need 2*N*N, prefer N*N+M*N)
-*              (RWorkspace: 0)
+*        Generate Q(ilo+1:ihi,ilo+1:ihi)
 *
-               DO 10 I = 1, M, LDWRKR
-                  CHUNK = MIN( M-I+1, LDWRKR )
-                  CALL ZGEMM( 'N', 'N', CHUNK, N, N, CONE, A( I, 1 ),
-     $                        LDA, WORK( IU ), LDWRKU, CZERO,
-     $                        WORK( IR ), LDWRKR )
-                  CALL ZLACPY( 'F', CHUNK, N, WORK( IR ), LDWRKR,
-     $                         A( I, 1 ), LDA )
-   10          CONTINUE
+         CALL ZUNGQR( NH, NH, NH, A( ILO+1, ILO+1 ), LDA, TAU( ILO ),
+     $                WORK, LWORK, IINFO )
+      END IF
+      WORK( 1 ) = LWKOPT
+      RETURN
 *
-            ELSE IF( WNTQS ) THEN
+*     End of ZUNGHR
 *
-*              Path 3 (M much larger than N, JOBZ='S')
-*              N left singular vectors to be computed in U and
-*              N right singular vectors to be computed in VT
+      END
+*> \brief \b ZUNGL2 generates all or part of the unitary matrix Q from an LQ factorization determined by cgelqf (unblocked algorithm).
 *
-               IR = 1
+*  =========== DOCUMENTATION ===========
 *
-*              WORK(IR) is N by N
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               LDWRKR = N
-               ITAU = IR + LDWRKR*N
-               NWORK = ITAU + N
+*> \htmlonly
+*> Download ZUNGL2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungl2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungl2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungl2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*              Compute A=Q*R
-*              (CWorkspace: need N*N+2*N, prefer N*N+N+N*NB)
-*              (RWorkspace: 0)
+*  Definition:
+*  ===========
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*       SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, K, LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-*              Copy R to WORK(IR), zeroing out below it
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGL2 generates an m-by-n complex matrix Q with orthonormal rows,
+*> which is defined as the first m rows of a product of k elementary
+*> reflectors of order n
+*>
+*>       Q  =  H(k)**H . . . H(2)**H H(1)**H
+*>
+*> as returned by ZGELQF.
+*> \endverbatim
 *
-               CALL ZLACPY( 'U', N, N, A, LDA, WORK( IR ), LDWRKR )
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, WORK( IR+1 ),
-     $                      LDWRKR )
+*  Arguments:
+*  ==========
 *
-*              Generate Q in A
-*              (CWorkspace: need 2*N, prefer N+N*NB)
-*              (RWorkspace: 0)
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix Q. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix Q. N >= M.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. M >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the i-th row must contain the vector which defines
+*>          the elementary reflector H(i), for i = 1,2,...,k, as returned
+*>          by ZGELQF in the first k rows of its array argument A.
+*>          On exit, the m by n matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The first dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGELQF.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (M)
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument has an illegal value
+*> \endverbatim
 *
-               CALL ZUNGQR( M, N, N, A, LDA, WORK( ITAU ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
-               IE = 1
-               ITAUQ = ITAU
-               ITAUP = ITAUQ + N
-               NWORK = ITAUP + N
+*  Authors:
+*  ========
 *
-*              Bidiagonalize R in WORK(IR)
-*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+2*N*NB)
-*              (RWorkspace: need N)
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-               CALL ZGEBRD( N, N, WORK( IR ), LDWRKR, S, RWORK( IE ),
-     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*> \date September 2012
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*> \ingroup complex16OTHERcomputational
 *
-               IRU = IE + N
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*  =====================================================================
+      SUBROUTINE ZUNGL2( M, N, K, A, LDA, TAU, WORK, INFO )
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of R
-*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*              (RWorkspace: 0)
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, WORK( IR ), LDWRKR,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of R
-*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*              (RWorkspace: 0)
+*  =====================================================================
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, WORK( IR ), LDWRKR,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, J, L
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG, MAX
+*     ..
+*     .. Executable Statements ..
 *
-*              Multiply Q in A by left singular vectors of R in
-*              WORK(IR), storing result in U
-*              (CWorkspace: need N*N)
-*              (RWorkspace: 0)
+*     Test the input arguments
 *
-               CALL ZLACPY( 'F', N, N, U, LDU, WORK( IR ), LDWRKR )
-               CALL ZGEMM( 'N', 'N', M, N, N, CONE, A, LDA, WORK( IR ),
-     $                     LDWRKR, CZERO, U, LDU )
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.M ) THEN
+         INFO = -2
+      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGL2', -INFO )
+         RETURN
+      END IF
 *
-            ELSE IF( WNTQA ) THEN
+*     Quick return if possible
 *
-*              Path 4 (M much larger than N, JOBZ='A')
-*              M left singular vectors to be computed in U and
-*              N right singular vectors to be computed in VT
+      IF( M.LE.0 )
+     $   RETURN
 *
-               IU = 1
+      IF( K.LT.M ) THEN
 *
-*              WORK(IU) is N by N
+*        Initialise rows k+1:m to rows of the unit matrix
 *
-               LDWRKU = N
-               ITAU = IU + LDWRKU*N
-               NWORK = ITAU + N
+         DO 20 J = 1, N
+            DO 10 L = K + 1, M
+               A( L, J ) = ZERO
+   10       CONTINUE
+            IF( J.GT.K .AND. J.LE.M )
+     $         A( J, J ) = ONE
+   20    CONTINUE
+      END IF
 *
-*              Compute A=Q*R, copying result to U
-*              (CWorkspace: need 2*N, prefer N+N*NB)
-*              (RWorkspace: 0)
+      DO 40 I = K, 1, -1
 *
-               CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
-               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
+*        Apply H(i)**H to A(i:m,i:n) from the right
 *
-*              Generate Q in U
-*              (CWorkspace: need N+M, prefer N+M*NB)
-*              (RWorkspace: 0)
+         IF( I.LT.N ) THEN
+            CALL ZLACGV( N-I, A( I, I+1 ), LDA )
+            IF( I.LT.M ) THEN
+               A( I, I ) = ONE
+               CALL ZLARF( 'Right', M-I, N-I+1, A( I, I ), LDA,
+     $                     DCONJG( TAU( I ) ), A( I+1, I ), LDA, WORK )
+            END IF
+            CALL ZSCAL( N-I, -TAU( I ), A( I, I+1 ), LDA )
+            CALL ZLACGV( N-I, A( I, I+1 ), LDA )
+         END IF
+         A( I, I ) = ONE - DCONJG( TAU( I ) )
 *
-               CALL ZUNGQR( M, M, N, U, LDU, WORK( ITAU ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*        Set A(i,1:i-1) to zero
 *
-*              Produce R in A, zeroing out below it
+         DO 30 L = 1, I - 1
+            A( I, L ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
+      RETURN
 *
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
-     $                      LDA )
-               IE = 1
-               ITAUQ = ITAU
-               ITAUP = ITAUQ + N
-               NWORK = ITAUP + N
+*     End of ZUNGL2
 *
-*              Bidiagonalize R in A
-*              (CWorkspace: need 3*N, prefer 2*N+2*N*NB)
-*              (RWorkspace: need N)
+      END
+*> \brief \b ZUNGLQ
 *
-               CALL ZGEBRD( N, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                      IERR )
-               IRU = IE + N
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
+*  =========== DOCUMENTATION ===========
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*> \htmlonly
+*> Download ZUNGLQ + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunglq.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunglq.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunglq.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
-*              Overwrite WORK(IU) by left singular vectors of R
-*              (CWorkspace: need N*N+3*N, prefer N*N+2*N+N*NB)
-*              (RWorkspace: 0)
+*  Definition:
+*  ===========
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
-     $                      LDWRKU )
-               CALL ZUNMBR( 'Q', 'L', 'N', N, N, N, A, LDA,
-     $                      WORK( ITAUQ ), WORK( IU ), LDWRKU,
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*       SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of R
-*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
-*              (RWorkspace: 0)
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGLQ generates an M-by-N complex matrix Q with orthonormal rows,
+*> which is defined as the first M rows of a product of K elementary
+*> reflectors of order N
+*>
+*>       Q  =  H(k)**H . . . H(2)**H H(1)**H
+*>
+*> as returned by ZGELQF.
+*> \endverbatim
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*  Arguments:
+*  ==========
 *
-*              Multiply Q in U by left singular vectors of R in
-*              WORK(IU), storing result in A
-*              (CWorkspace: need N*N)
-*              (RWorkspace: 0)
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix Q. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix Q. N >= M.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. M >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the i-th row must contain the vector which defines
+*>          the elementary reflector H(i), for i = 1,2,...,k, as returned
+*>          by ZGELQF in the first k rows of its array argument A.
+*>          On exit, the M-by-N matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The first dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGELQF.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= max(1,M).
+*>          For optimum performance LWORK >= M*NB, where NB is
+*>          the optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit;
+*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*> \endverbatim
 *
-               CALL ZGEMM( 'N', 'N', M, N, N, CONE, U, LDU, WORK( IU ),
-     $                     LDWRKU, CZERO, A, LDA )
+*  Authors:
+*  ========
 *
-*              Copy left singular vectors of A from A to U
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-               CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
+*> \date November 2011
 *
-            END IF
+*> \ingroup complex16OTHERcomputational
 *
-         ELSE IF( M.GE.MNTHR2 ) THEN
+*  =====================================================================
+      SUBROUTINE ZUNGLQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*           MNTHR2 <= M < MNTHR1
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-*           Path 5 (M much larger than N, but not as much as MNTHR1)
-*           Reduce to bidiagonal form without QR decomposition, use
-*           ZUNGBR and matrix multiplication to compute singular vectors
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, LDA, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-            IE = 1
-            NRWORK = IE + N
-            ITAUQ = 1
-            ITAUP = ITAUQ + N
-            NWORK = ITAUP + N
+*  =====================================================================
 *
-*           Bidiagonalize A
-*           (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
-*           (RWorkspace: need N)
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY
+      INTEGER            I, IB, IINFO, IWS, J, KI, KK, L, LDWORK,
+     $                   LWKOPT, NB, NBMIN, NX
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNGL2
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Executable Statements ..
 *
-            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                   IERR )
-            IF( WNTQN ) THEN
+*     Test the input arguments
 *
-*              Compute singular values only
-*              (Cworkspace: 0)
-*              (Rworkspace: need BDSPAN)
+      INFO = 0
+      NB = ILAENV( 1, 'ZUNGLQ', ' ', M, N, K, -1 )
+      LWKOPT = MAX( 1, M )*NB
+      WORK( 1 ) = LWKOPT
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.M ) THEN
+         INFO = -2
+      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      ELSE IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
+         INFO = -8
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGLQ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1, DUM, 1,
-     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
-            ELSE IF( WNTQO ) THEN
-               IU = NWORK
-               IRU = NRWORK
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
+*     Quick return if possible
 *
-*              Copy A to VT, generate P**H
-*              (Cworkspace: need 2*N, prefer N+N*NB)
-*              (Rworkspace: 0)
+      IF( M.LE.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+      NBMIN = 2
+      NX = 0
+      IWS = M
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
-*              Generate Q in A
-*              (CWorkspace: need 2*N, prefer N+N*NB)
-*              (RWorkspace: 0)
+*        Determine when to cross over from blocked to unblocked code.
 *
-               CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+         NX = MAX( 0, ILAENV( 3, 'ZUNGLQ', ' ', M, N, K, -1 ) )
+         IF( NX.LT.K ) THEN
 *
-               IF( LWORK.GE.M*N+3*N ) THEN
+*           Determine if workspace is large enough for blocked code.
 *
-*                 WORK( IU ) is M by N
+            LDWORK = M
+            IWS = LDWORK*NB
+            IF( LWORK.LT.IWS ) THEN
 *
-                  LDWRKU = M
-               ELSE
+*              Not enough workspace to use optimal NB:  reduce NB and
+*              determine the minimum value of NB.
 *
-*                 WORK(IU) is LDWRKU by N
+               NB = LWORK / LDWORK
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGLQ', ' ', M, N, K, -1 ) )
+            END IF
+         END IF
+      END IF
 *
-                  LDWRKU = ( LWORK-3*N ) / N
-               END IF
-               NWORK = IU + LDWRKU*N
+      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*        Use blocked code after the last block.
+*        The first kk rows are handled by the block method.
 *
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+         KI = ( ( K-NX-1 ) / NB )*NB
+         KK = MIN( K, KI+NB )
 *
-*              Multiply real matrix RWORK(IRVT) by P**H in VT,
-*              storing the result in WORK(IU), copying to VT
-*              (Cworkspace: need 0)
-*              (Rworkspace: need 3*N*N)
+*        Set A(kk+1:m,1:kk) to zero.
 *
-               CALL ZLARCM( N, N, RWORK( IRVT ), N, VT, LDVT,
-     $                      WORK( IU ), LDWRKU, RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', N, N, WORK( IU ), LDWRKU, VT, LDVT )
+         DO 20 J = 1, KK
+            DO 10 I = KK + 1, M
+               A( I, J ) = ZERO
+   10       CONTINUE
+   20    CONTINUE
+      ELSE
+         KK = 0
+      END IF
 *
-*              Multiply Q in A by real matrix RWORK(IRU), storing the
-*              result in WORK(IU), copying to A
-*              (CWorkspace: need N*N, prefer M*N)
-*              (Rworkspace: need 3*N*N, prefer N*N+2*M*N)
+*     Use unblocked code for the last or only block.
 *
-               NRWORK = IRVT
-               DO 20 I = 1, M, LDWRKU
-                  CHUNK = MIN( M-I+1, LDWRKU )
-                  CALL ZLACRM( CHUNK, N, A( I, 1 ), LDA, RWORK( IRU ),
-     $                         N, WORK( IU ), LDWRKU, RWORK( NRWORK ) )
-                  CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
-     $                         A( I, 1 ), LDA )
-   20          CONTINUE
+      IF( KK.LT.M )
+     $   CALL ZUNGL2( M-KK, N-KK, K-KK, A( KK+1, KK+1 ), LDA,
+     $                TAU( KK+1 ), WORK, IINFO )
 *
-            ELSE IF( WNTQS ) THEN
+      IF( KK.GT.0 ) THEN
 *
-*              Copy A to VT, generate P**H
-*              (Cworkspace: need 2*N, prefer N+N*NB)
-*              (Rworkspace: 0)
+*        Use blocked code
 *
-               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+         DO 50 I = KI + 1, 1, -NB
+            IB = MIN( NB, K-I+1 )
+            IF( I+IB.LE.M ) THEN
 *
-*              Copy A to U, generate Q
-*              (Cworkspace: need 2*N, prefer N+N*NB)
-*              (Rworkspace: 0)
+*              Form the triangular factor of the block reflector
+*              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
-               CALL ZUNGBR( 'Q', M, N, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+               CALL ZLARFT( 'Forward', 'Rowwise', N-I+1, IB, A( I, I ),
+     $                      LDA, TAU( I ), WORK, LDWORK )
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*              Apply H**H to A(i+ib:m,i:n) from the right
 *
-               IRU = NRWORK
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+               CALL ZLARFB( 'Right', 'Conjugate transpose', 'Forward',
+     $                      'Rowwise', M-I-IB+1, N-I+1, IB, A( I, I ),
+     $                      LDA, WORK, LDWORK, A( I+IB, I ), LDA,
+     $                      WORK( IB+1 ), LDWORK )
+            END IF
 *
-*              Multiply real matrix RWORK(IRVT) by P**H in VT,
-*              storing the result in A, copying to VT
-*              (Cworkspace: need 0)
-*              (Rworkspace: need 3*N*N)
+*           Apply H**H to columns i:n of current block
 *
-               CALL ZLARCM( N, N, RWORK( IRVT ), N, VT, LDVT, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', N, N, A, LDA, VT, LDVT )
+            CALL ZUNGL2( IB, N-I+1, IB, A( I, I ), LDA, TAU( I ), WORK,
+     $                   IINFO )
 *
-*              Multiply Q in U by real matrix RWORK(IRU), storing the
-*              result in A, copying to U
-*              (CWorkspace: need 0)
-*              (Rworkspace: need N*N+2*M*N)
+*           Set columns 1:i-1 of current block to zero
 *
-               NRWORK = IRVT
-               CALL ZLACRM( M, N, U, LDU, RWORK( IRU ), N, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
-            ELSE
+            DO 40 J = 1, I - 1
+               DO 30 L = I, I + IB - 1
+                  A( L, J ) = ZERO
+   30          CONTINUE
+   40       CONTINUE
+   50    CONTINUE
+      END IF
 *
-*              Copy A to VT, generate P**H
-*              (Cworkspace: need 2*N, prefer N+N*NB)
-*              (Rworkspace: 0)
+      WORK( 1 ) = IWS
+      RETURN
 *
-               CALL ZLACPY( 'U', N, N, A, LDA, VT, LDVT )
-               CALL ZUNGBR( 'P', N, N, N, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*     End of ZUNGLQ
 *
-*              Copy A to U, generate Q
-*              (Cworkspace: need 2*N, prefer N+N*NB)
-*              (Rworkspace: 0)
+      END
+*> \brief \b ZUNGQL
 *
-               CALL ZLACPY( 'L', M, N, A, LDA, U, LDU )
-               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*  =========== DOCUMENTATION ===========
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               IRU = NRWORK
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*> \htmlonly
+*> Download ZUNGQL + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungql.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungql.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungql.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*              Multiply real matrix RWORK(IRVT) by P**H in VT,
-*              storing the result in A, copying to VT
-*              (Cworkspace: need 0)
-*              (Rworkspace: need 3*N*N)
+*  Definition:
+*  ===========
 *
-               CALL ZLARCM( N, N, RWORK( IRVT ), N, VT, LDVT, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', N, N, A, LDA, VT, LDVT )
+*       SUBROUTINE ZUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-*              Multiply Q in U by real matrix RWORK(IRU), storing the
-*              result in A, copying to U
-*              (CWorkspace: 0)
-*              (Rworkspace: need 3*N*N)
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGQL generates an M-by-N complex matrix Q with orthonormal columns,
+*> which is defined as the last N columns of a product of K elementary
+*> reflectors of order M
+*>
+*>       Q  =  H(k) . . . H(2) H(1)
+*>
+*> as returned by ZGEQLF.
+*> \endverbatim
 *
-               NRWORK = IRVT
-               CALL ZLACRM( M, N, U, LDU, RWORK( IRU ), N, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, N, A, LDA, U, LDU )
-            END IF
+*  Arguments:
+*  ==========
 *
-         ELSE
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix Q. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix Q. M >= N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. N >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the (n-k+i)-th column must contain the vector which
+*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
+*>          returned by ZGEQLF in the last k columns of its array
+*>          argument A.
+*>          On exit, the M-by-N matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The first dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEQLF.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= max(1,N).
+*>          For optimum performance LWORK >= N*NB, where NB is the
+*>          optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*> \endverbatim
 *
-*           M .LT. MNTHR2
+*  Authors:
+*  ========
 *
-*           Path 6 (M at least N, but not much larger)
-*           Reduce to bidiagonal form without QR decomposition
-*           Use ZUNMBR to compute singular vectors
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-            IE = 1
-            NRWORK = IE + N
-            ITAUQ = 1
-            ITAUP = ITAUQ + N
-            NWORK = ITAUP + N
+*> \date November 2011
 *
-*           Bidiagonalize A
-*           (CWorkspace: need 2*N+M, prefer 2*N+(M+N)*NB)
-*           (RWorkspace: need N)
+*> \ingroup complex16OTHERcomputational
 *
-            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                   IERR )
-            IF( WNTQN ) THEN
+*  =====================================================================
+      SUBROUTINE ZUNGQL( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*              Compute singular values only
-*              (Cworkspace: 0)
-*              (Rworkspace: need BDSPAN)
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-               CALL DBDSDC( 'U', 'N', N, S, RWORK( IE ), DUM, 1, DUM, 1,
-     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
-            ELSE IF( WNTQO ) THEN
-               IU = NWORK
-               IRU = NRWORK
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               IF( LWORK.GE.M*N+3*N ) THEN
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, LDA, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-*                 WORK( IU ) is M by N
+*  =====================================================================
 *
-                  LDWRKU = M
-               ELSE
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY
+      INTEGER            I, IB, IINFO, IWS, J, KK, L, LDWORK, LWKOPT,
+     $                   NB, NBMIN, NX
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNG2L
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Executable Statements ..
 *
-*                 WORK( IU ) is LDWRKU by N
+*     Test the input arguments
 *
-                  LDWRKU = ( LWORK-3*N ) / N
-               END IF
-               NWORK = IU + LDWRKU*N
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
+         INFO = -2
+      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      END IF
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+      IF( INFO.EQ.0 ) THEN
+         IF( N.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = ILAENV( 1, 'ZUNGQL', ' ', M, N, K, -1 )
+            LWKOPT = N*NB
+         END IF
+         WORK( 1 ) = LWKOPT
 *
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+         IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+            INFO = -8
+         END IF
+      END IF
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of A
-*              (Cworkspace: need 2*N, prefer N+N*NB)
-*              (Rworkspace: need 0)
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGQL', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     Quick return if possible
 *
-               IF( LWORK.GE.M*N+3*N ) THEN
+      IF( N.LE.0 ) THEN
+         RETURN
+      END IF
 *
-*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
-*              Overwrite WORK(IU) by left singular vectors of A, copying
-*              to A
-*              (Cworkspace: need M*N+2*N, prefer M*N+N+N*NB)
-*              (Rworkspace: need 0)
+      NBMIN = 2
+      NX = 0
+      IWS = N
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
-                  CALL ZLASET( 'F', M, N, CZERO, CZERO, WORK( IU ),
-     $                         LDWRKU )
-                  CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, WORK( IU ),
-     $                         LDWRKU )
-                  CALL ZUNMBR( 'Q', 'L', 'N', M, N, N, A, LDA,
-     $                         WORK( ITAUQ ), WORK( IU ), LDWRKU,
-     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
-                  CALL ZLACPY( 'F', M, N, WORK( IU ), LDWRKU, A, LDA )
-               ELSE
+*        Determine when to cross over from blocked to unblocked code.
 *
-*                 Generate Q in A
-*                 (Cworkspace: need 2*N, prefer N+N*NB)
-*                 (Rworkspace: need 0)
+         NX = MAX( 0, ILAENV( 3, 'ZUNGQL', ' ', M, N, K, -1 ) )
+         IF( NX.LT.K ) THEN
 *
-                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, WORK( ITAUQ ),
-     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
+*           Determine if workspace is large enough for blocked code.
 *
-*                 Multiply Q in A by real matrix RWORK(IRU), storing the
-*                 result in WORK(IU), copying to A
-*                 (CWorkspace: need N*N, prefer M*N)
-*                 (Rworkspace: need 3*N*N, prefer N*N+2*M*N)
+            LDWORK = N
+            IWS = LDWORK*NB
+            IF( LWORK.LT.IWS ) THEN
 *
-                  NRWORK = IRVT
-                  DO 30 I = 1, M, LDWRKU
-                     CHUNK = MIN( M-I+1, LDWRKU )
-                     CALL ZLACRM( CHUNK, N, A( I, 1 ), LDA,
-     $                            RWORK( IRU ), N, WORK( IU ), LDWRKU,
-     $                            RWORK( NRWORK ) )
-                     CALL ZLACPY( 'F', CHUNK, N, WORK( IU ), LDWRKU,
-     $                            A( I, 1 ), LDA )
-   30             CONTINUE
-               END IF
+*              Not enough workspace to use optimal NB:  reduce NB and
+*              determine the minimum value of NB.
 *
-            ELSE IF( WNTQS ) THEN
+               NB = LWORK / LDWORK
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQL', ' ', M, N, K, -1 ) )
+            END IF
+         END IF
+      END IF
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
 *
-               IRU = NRWORK
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*        Use blocked code after the first block.
+*        The last kk columns are handled by the block method.
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of A
-*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
-*              (RWorkspace: 0)
+         KK = MIN( K, ( ( K-NX+NB-1 ) / NB )*NB )
 *
-               CALL ZLASET( 'F', M, N, CZERO, CZERO, U, LDU )
-               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, N, N, A, LDA,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*        Set A(m-kk+1:m,1:n-kk) to zero.
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of A
-*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
-*              (RWorkspace: 0)
+         DO 20 J = 1, N - KK
+            DO 10 I = M - KK + 1, M
+               A( I, J ) = ZERO
+   10       CONTINUE
+   20    CONTINUE
+      ELSE
+         KK = 0
+      END IF
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
-            ELSE
+*     Use unblocked code for the first or only block.
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+      CALL ZUNG2L( M-KK, N-KK, K-KK, A, LDA, TAU, WORK, IINFO )
 *
-               IRU = NRWORK
-               IRVT = IRU + N*N
-               NRWORK = IRVT + N*N
-               CALL DBDSDC( 'U', 'I', N, S, RWORK( IE ), RWORK( IRU ),
-     $                      N, RWORK( IRVT ), N, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+      IF( KK.GT.0 ) THEN
 *
-*              Set the right corner of U to identity matrix
+*        Use blocked code
 *
-               CALL ZLASET( 'F', M, M, CZERO, CZERO, U, LDU )
-               IF( M.GT.N ) THEN
-                  CALL ZLASET( 'F', M-N, M-N, CZERO, CONE,
-     $                         U( N+1, N+1 ), LDU )
-               END IF
+         DO 50 I = K - KK + 1, K, NB
+            IB = MIN( NB, K-I+1 )
+            IF( N-K+I.GT.1 ) THEN
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of A
-*              (CWorkspace: need 2*N+M, prefer 2*N+M*NB)
-*              (RWorkspace: 0)
+*              Form the triangular factor of the block reflector
+*              H = H(i+ib-1) . . . H(i+1) H(i)
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRU ), N, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+               CALL ZLARFT( 'Backward', 'Columnwise', M-K+I+IB-1, IB,
+     $                      A( 1, N-K+I ), LDA, TAU( I ), WORK, LDWORK )
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of A
-*              (CWorkspace: need 3*N, prefer 2*N+N*NB)
-*              (RWorkspace: 0)
+*              Apply H to A(1:m-k+i+ib-1,1:n-k+i-1) from the left
 *
-               CALL ZLACP2( 'F', N, N, RWORK( IRVT ), N, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, N, A, LDA,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+               CALL ZLARFB( 'Left', 'No transpose', 'Backward',
+     $                      'Columnwise', M-K+I+IB-1, N-K+I-1, IB,
+     $                      A( 1, N-K+I ), LDA, WORK, LDWORK, A, LDA,
+     $                      WORK( IB+1 ), LDWORK )
             END IF
 *
-         END IF
-*
-      ELSE
-*
-*        A has more columns than rows. If A has sufficiently more
-*        columns than rows, first reduce using the LQ decomposition (if
-*        sufficient workspace available)
+*           Apply H to rows 1:m-k+i+ib-1 of current block
 *
-         IF( N.GE.MNTHR1 ) THEN
+            CALL ZUNG2L( M-K+I+IB-1, IB, IB, A( 1, N-K+I ), LDA,
+     $                   TAU( I ), WORK, IINFO )
 *
-            IF( WNTQN ) THEN
+*           Set rows m-k+i+ib:m of current block to zero
 *
-*              Path 1t (N much larger than M, JOBZ='N')
-*              No singular vectors to be computed
+            DO 40 J = N - K + I, N - K + I + IB - 1
+               DO 30 L = M - K + I + IB, M
+                  A( L, J ) = ZERO
+   30          CONTINUE
+   40       CONTINUE
+   50    CONTINUE
+      END IF
 *
-               ITAU = 1
-               NWORK = ITAU + M
+      WORK( 1 ) = IWS
+      RETURN
 *
-*              Compute A=L*Q
-*              (CWorkspace: need 2*M, prefer M+M*NB)
-*              (RWorkspace: 0)
+*     End of ZUNGQL
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+      END
+*> \brief \b ZUNGQR
 *
-*              Zero out above L
+*  =========== DOCUMENTATION ===========
 *
-               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, A( 1, 2 ),
-     $                      LDA )
-               IE = 1
-               ITAUQ = 1
-               ITAUP = ITAUQ + M
-               NWORK = ITAUP + M
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-*              Bidiagonalize L in A
-*              (CWorkspace: need 3*M, prefer 2*M+2*M*NB)
-*              (RWorkspace: need M)
+*> \htmlonly
+*> Download ZUNGQR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungqr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungqr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungqr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                      IERR )
-               NRWORK = IE + M
+*  Definition:
+*  ===========
 *
-*              Perform bidiagonal SVD, compute singular values only
-*              (CWorkspace: 0)
-*              (RWorkspace: need BDSPAN)
+*       SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-               CALL DBDSDC( 'U', 'N', M, S, RWORK( IE ), DUM, 1, DUM, 1,
-     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGQR generates an M-by-N complex matrix Q with orthonormal columns,
+*> which is defined as the first N columns of a product of K elementary
+*> reflectors of order M
+*>
+*>       Q  =  H(1) H(2) . . . H(k)
+*>
+*> as returned by ZGEQRF.
+*> \endverbatim
 *
-            ELSE IF( WNTQO ) THEN
+*  Arguments:
+*  ==========
 *
-*              Path 2t (N much larger than M, JOBZ='O')
-*              M right singular vectors to be overwritten on A and
-*              M left singular vectors to be computed in U
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix Q. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix Q. M >= N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. N >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the i-th column must contain the vector which
+*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
+*>          returned by ZGEQRF in the first k columns of its array
+*>          argument A.
+*>          On exit, the M-by-N matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The first dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEQRF.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= max(1,N).
+*>          For optimum performance LWORK >= N*NB, where NB is the
+*>          optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*> \endverbatim
 *
-               IVT = 1
-               LDWKVT = M
+*  Authors:
+*  ========
 *
-*              WORK(IVT) is M by M
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-               IL = IVT + LDWKVT*M
-               IF( LWORK.GE.M*N+M*M+3*M ) THEN
+*> \date November 2011
 *
-*                 WORK(IL) M by N
+*> \ingroup complex16OTHERcomputational
 *
-                  LDWRKL = M
-                  CHUNK = N
-               ELSE
+*  =====================================================================
+      SUBROUTINE ZUNGQR( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*                 WORK(IL) is M by CHUNK
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-                  LDWRKL = M
-                  CHUNK = ( LWORK-M*M-3*M ) / M
-               END IF
-               ITAU = IL + LDWRKL*CHUNK
-               NWORK = ITAU + M
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, LDA, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-*              Compute A=L*Q
-*              (CWorkspace: need 2*M, prefer M+M*NB)
-*              (RWorkspace: 0)
+*  =====================================================================
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY
+      INTEGER            I, IB, IINFO, IWS, J, KI, KK, L, LDWORK,
+     $                   LWKOPT, NB, NBMIN, NX
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNG2R
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Executable Statements ..
 *
-*              Copy L to WORK(IL), zeroing about above it
+*     Test the input arguments
 *
-               CALL ZLACPY( 'L', M, M, A, LDA, WORK( IL ), LDWRKL )
-               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                      WORK( IL+LDWRKL ), LDWRKL )
+      INFO = 0
+      NB = ILAENV( 1, 'ZUNGQR', ' ', M, N, K, -1 )
+      LWKOPT = MAX( 1, N )*NB
+      WORK( 1 ) = LWKOPT
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 .OR. N.GT.M ) THEN
+         INFO = -2
+      ELSE IF( K.LT.0 .OR. K.GT.N ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+         INFO = -8
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGQR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-*              Generate Q in A
-*              (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*              (RWorkspace: 0)
+*     Quick return if possible
 *
-               CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
-               IE = 1
-               ITAUQ = ITAU
-               ITAUP = ITAUQ + M
-               NWORK = ITAUP + M
+      IF( N.LE.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-*              Bidiagonalize L in WORK(IL)
-*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*              (RWorkspace: need M)
+      NBMIN = 2
+      NX = 0
+      IWS = N
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
-               CALL ZGEBRD( M, M, WORK( IL ), LDWRKL, S, RWORK( IE ),
-     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*        Determine when to cross over from blocked to unblocked code.
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+         NX = MAX( 0, ILAENV( 3, 'ZUNGQR', ' ', M, N, K, -1 ) )
+         IF( NX.LT.K ) THEN
 *
-               IRU = IE + M
-               IRVT = IRU + M*M
-               NRWORK = IRVT + M*M
-               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*           Determine if workspace is large enough for blocked code.
 *
-*              Copy real matrix RWORK(IRU) to complex matrix WORK(IU)
-*              Overwrite WORK(IU) by the left singular vectors of L
-*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+N*NB)
-*              (RWorkspace: 0)
+            LDWORK = N
+            IWS = LDWORK*NB
+            IF( LWORK.LT.IWS ) THEN
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*              Not enough workspace to use optimal NB:  reduce NB and
+*              determine the minimum value of NB.
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix WORK(IVT)
-*              Overwrite WORK(IVT) by the right singular vectors of L
-*              (CWorkspace: need N*N+3*N, prefer M*N+2*N+N*NB)
-*              (RWorkspace: 0)
+               NB = LWORK / LDWORK
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGQR', ' ', M, N, K, -1 ) )
+            END IF
+         END IF
+      END IF
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
-     $                      LDWKVT )
-               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
-     $                      WORK( ITAUP ), WORK( IVT ), LDWKVT,
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
 *
-*              Multiply right singular vectors of L in WORK(IL) by Q
-*              in A, storing result in WORK(IL) and copying to A
-*              (CWorkspace: need 2*M*M, prefer M*M+M*N))
-*              (RWorkspace: 0)
+*        Use blocked code after the last block.
+*        The first kk columns are handled by the block method.
 *
-               DO 40 I = 1, N, CHUNK
-                  BLK = MIN( N-I+1, CHUNK )
-                  CALL ZGEMM( 'N', 'N', M, BLK, M, CONE, WORK( IVT ), M,
-     $                        A( 1, I ), LDA, CZERO, WORK( IL ),
-     $                        LDWRKL )
-                  CALL ZLACPY( 'F', M, BLK, WORK( IL ), LDWRKL,
-     $                         A( 1, I ), LDA )
-   40          CONTINUE
+         KI = ( ( K-NX-1 ) / NB )*NB
+         KK = MIN( K, KI+NB )
 *
-            ELSE IF( WNTQS ) THEN
+*        Set A(1:kk,kk+1:n) to zero.
 *
-*             Path 3t (N much larger than M, JOBZ='S')
-*             M right singular vectors to be computed in VT and
-*             M left singular vectors to be computed in U
+         DO 20 J = KK + 1, N
+            DO 10 I = 1, KK
+               A( I, J ) = ZERO
+   10       CONTINUE
+   20    CONTINUE
+      ELSE
+         KK = 0
+      END IF
 *
-               IL = 1
+*     Use unblocked code for the last or only block.
 *
-*              WORK(IL) is M by M
+      IF( KK.LT.N )
+     $   CALL ZUNG2R( M-KK, N-KK, K-KK, A( KK+1, KK+1 ), LDA,
+     $                TAU( KK+1 ), WORK, IINFO )
 *
-               LDWRKL = M
-               ITAU = IL + LDWRKL*M
-               NWORK = ITAU + M
+      IF( KK.GT.0 ) THEN
 *
-*              Compute A=L*Q
-*              (CWorkspace: need 2*M, prefer M+M*NB)
-*              (RWorkspace: 0)
+*        Use blocked code
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+         DO 50 I = KI + 1, 1, -NB
+            IB = MIN( NB, K-I+1 )
+            IF( I+IB.LE.N ) THEN
 *
-*              Copy L to WORK(IL), zeroing out above it
+*              Form the triangular factor of the block reflector
+*              H = H(i) H(i+1) . . . H(i+ib-1)
 *
-               CALL ZLACPY( 'L', M, M, A, LDA, WORK( IL ), LDWRKL )
-               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO,
-     $                      WORK( IL+LDWRKL ), LDWRKL )
+               CALL ZLARFT( 'Forward', 'Columnwise', M-I+1, IB,
+     $                      A( I, I ), LDA, TAU( I ), WORK, LDWORK )
 *
-*              Generate Q in A
-*              (CWorkspace: need M*M+2*M, prefer M*M+M+M*NB)
-*              (RWorkspace: 0)
+*              Apply H to A(i:m,i+ib:n) from the left
 *
-               CALL ZUNGLQ( M, N, M, A, LDA, WORK( ITAU ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
-               IE = 1
-               ITAUQ = ITAU
-               ITAUP = ITAUQ + M
-               NWORK = ITAUP + M
+               CALL ZLARFB( 'Left', 'No transpose', 'Forward',
+     $                      'Columnwise', M-I+1, N-I-IB+1, IB,
+     $                      A( I, I ), LDA, WORK, LDWORK, A( I, I+IB ),
+     $                      LDA, WORK( IB+1 ), LDWORK )
+            END IF
 *
-*              Bidiagonalize L in WORK(IL)
-*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*              (RWorkspace: need M)
+*           Apply H to rows i:m of current block
 *
-               CALL ZGEBRD( M, M, WORK( IL ), LDWRKL, S, RWORK( IE ),
-     $                      WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+            CALL ZUNG2R( M-I+1, IB, IB, A( I, I ), LDA, TAU( I ), WORK,
+     $                   IINFO )
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*           Set rows 1:i-1 of current block to zero
 *
-               IRU = IE + M
-               IRVT = IRU + M*M
-               NRWORK = IRVT + M*M
-               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+            DO 40 J = I, I + IB - 1
+               DO 30 L = 1, I - 1
+                  A( L, J ) = ZERO
+   30          CONTINUE
+   40       CONTINUE
+   50    CONTINUE
+      END IF
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of L
-*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
-*              (RWorkspace: 0)
+      WORK( 1 ) = IWS
+      RETURN
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, WORK( IL ), LDWRKL,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     End of ZUNGQR
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by left singular vectors of L
-*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
-*              (RWorkspace: 0)
+      END
+*> \brief \b ZUNGR2 generates all or part of the unitary matrix Q from an RQ factorization determined by cgerqf (unblocked algorithm).
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, WORK( IL ), LDWRKL,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*  =========== DOCUMENTATION ===========
 *
-*              Copy VT to WORK(IL), multiply right singular vectors of L
-*              in WORK(IL) by Q in A, storing result in VT
-*              (CWorkspace: need M*M)
-*              (RWorkspace: 0)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               CALL ZLACPY( 'F', M, M, VT, LDVT, WORK( IL ), LDWRKL )
-               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IL ), LDWRKL,
-     $                     A, LDA, CZERO, VT, LDVT )
+*> \htmlonly
+*> Download ZUNGR2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungr2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungr2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungr2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-            ELSE IF( WNTQA ) THEN
+*  Definition:
+*  ===========
 *
-*              Path 9t (N much larger than M, JOBZ='A')
-*              N right singular vectors to be computed in VT and
-*              M left singular vectors to be computed in U
+*       SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, K, LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-               IVT = 1
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGR2 generates an m by n complex matrix Q with orthonormal rows,
+*> which is defined as the last m rows of a product of k elementary
+*> reflectors of order n
+*>
+*>       Q  =  H(1)**H H(2)**H . . . H(k)**H
+*>
+*> as returned by ZGERQF.
+*> \endverbatim
 *
-*              WORK(IVT) is M by M
+*  Arguments:
+*  ==========
 *
-               LDWKVT = M
-               ITAU = IVT + LDWKVT*M
-               NWORK = ITAU + M
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix Q. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix Q. N >= M.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. M >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the (m-k+i)-th row must contain the vector which
+*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
+*>          returned by ZGERQF in the last k rows of its array argument
+*>          A.
+*>          On exit, the m-by-n matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The first dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGERQF.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (M)
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument has an illegal value
+*> \endverbatim
 *
-*              Compute A=L*Q, copying result to VT
-*              (CWorkspace: need 2*M, prefer M+M*NB)
-*              (RWorkspace: 0)
+*  Authors:
+*  ========
 *
-               CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
-               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-*              Generate Q in VT
-*              (CWorkspace: need M+N, prefer M+N*NB)
-*              (RWorkspace: 0)
+*> \date September 2012
 *
-               CALL ZUNGLQ( N, N, M, VT, LDVT, WORK( ITAU ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*> \ingroup complex16OTHERcomputational
 *
-*              Produce L in A, zeroing out above it
+*  =====================================================================
+      SUBROUTINE ZUNGR2( M, N, K, A, LDA, TAU, WORK, INFO )
 *
-               CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, A( 1, 2 ),
-     $                      LDA )
-               IE = 1
-               ITAUQ = ITAU
-               ITAUP = ITAUQ + M
-               NWORK = ITAUP + M
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-*              Bidiagonalize L in A
-*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+2*M*NB)
-*              (RWorkspace: need M)
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-               CALL ZGEBRD( M, M, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                      WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                      IERR )
+*  =====================================================================
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*     .. Parameters ..
+      COMPLEX*16         ONE, ZERO
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ),
+     $                   ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, II, J, L
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLACGV, ZLARF, ZSCAL
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG, MAX
+*     ..
+*     .. Executable Statements ..
 *
-               IRU = IE + M
-               IRVT = IRU + M*M
-               NRWORK = IRVT + M*M
-               CALL DBDSDC( 'U', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*     Test the input arguments
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of L
-*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*              (RWorkspace: 0)
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.M ) THEN
+         INFO = -2
+      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGR2', -INFO )
+         RETURN
+      END IF
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, M, A, LDA,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     Quick return if possible
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix WORK(IVT)
-*              Overwrite WORK(IVT) by right singular vectors of L
-*              (CWorkspace: need M*M+3*M, prefer M*M+2*M+M*NB)
-*              (RWorkspace: 0)
+      IF( M.LE.0 )
+     $   RETURN
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
-     $                      LDWKVT )
-               CALL ZUNMBR( 'P', 'R', 'C', M, M, M, A, LDA,
-     $                      WORK( ITAUP ), WORK( IVT ), LDWKVT,
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+      IF( K.LT.M ) THEN
 *
-*              Multiply right singular vectors of L in WORK(IVT) by
-*              Q in VT, storing result in A
-*              (CWorkspace: need M*M)
-*              (RWorkspace: 0)
+*        Initialise rows 1:m-k to rows of the unit matrix
 *
-               CALL ZGEMM( 'N', 'N', M, N, M, CONE, WORK( IVT ), LDWKVT,
-     $                     VT, LDVT, CZERO, A, LDA )
+         DO 20 J = 1, N
+            DO 10 L = 1, M - K
+               A( L, J ) = ZERO
+   10       CONTINUE
+            IF( J.GT.N-M .AND. J.LE.N-K )
+     $         A( M-N+J, J ) = ONE
+   20    CONTINUE
+      END IF
 *
-*              Copy right singular vectors of A from A to VT
+      DO 40 I = 1, K
+         II = M - K + I
 *
-               CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
+*        Apply H(i)**H to A(1:m-k+i,1:n-k+i) from the right
 *
-            END IF
+         CALL ZLACGV( N-M+II-1, A( II, 1 ), LDA )
+         A( II, N-M+II ) = ONE
+         CALL ZLARF( 'Right', II-1, N-M+II, A( II, 1 ), LDA,
+     $               DCONJG( TAU( I ) ), A, LDA, WORK )
+         CALL ZSCAL( N-M+II-1, -TAU( I ), A( II, 1 ), LDA )
+         CALL ZLACGV( N-M+II-1, A( II, 1 ), LDA )
+         A( II, N-M+II ) = ONE - DCONJG( TAU( I ) )
 *
-         ELSE IF( N.GE.MNTHR2 ) THEN
+*        Set A(m-k+i,n-k+i+1:n) to zero
 *
-*           MNTHR2 <= N < MNTHR1
+         DO 30 L = N - M + II + 1, N
+            A( II, L ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
+      RETURN
 *
-*           Path 5t (N much larger than M, but not as much as MNTHR1)
-*           Reduce to bidiagonal form without QR decomposition, use
-*           ZUNGBR and matrix multiplication to compute singular vectors
+*     End of ZUNGR2
 *
+      END
+*> \brief \b ZUNGRQ
 *
-            IE = 1
-            NRWORK = IE + M
-            ITAUQ = 1
-            ITAUP = ITAUQ + M
-            NWORK = ITAUP + M
+*  =========== DOCUMENTATION ===========
 *
-*           Bidiagonalize A
-*           (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
-*           (RWorkspace: M)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                   IERR )
+*> \htmlonly
+*> Download ZUNGRQ + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungrq.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungrq.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungrq.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-            IF( WNTQN ) THEN
+*  Definition:
+*  ===========
 *
-*              Compute singular values only
-*              (Cworkspace: 0)
-*              (Rworkspace: need BDSPAN)
+*       SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, K, LDA, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-               CALL DBDSDC( 'L', 'N', M, S, RWORK( IE ), DUM, 1, DUM, 1,
-     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
-            ELSE IF( WNTQO ) THEN
-               IRVT = NRWORK
-               IRU = IRVT + M*M
-               NRWORK = IRU + M*M
-               IVT = NWORK
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGRQ generates an M-by-N complex matrix Q with orthonormal rows,
+*> which is defined as the last M rows of a product of K elementary
+*> reflectors of order N
+*>
+*>       Q  =  H(1)**H H(2)**H . . . H(k)**H
+*>
+*> as returned by ZGERQF.
+*> \endverbatim
 *
-*              Copy A to U, generate Q
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: 0)
+*  Arguments:
+*  ==========
 *
-               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix Q. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix Q. N >= M.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines the
+*>          matrix Q. M >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the (m-k+i)-th row must contain the vector which
+*>          defines the elementary reflector H(i), for i = 1,2,...,k, as
+*>          returned by ZGERQF in the last k rows of its array argument
+*>          A.
+*>          On exit, the M-by-N matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The first dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGERQF.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= max(1,M).
+*>          For optimum performance LWORK >= M*NB, where NB is the
+*>          optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument has an illegal value
+*> \endverbatim
 *
-*              Generate P**H in A
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: 0)
+*  Authors:
+*  ========
 *
-               CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-               LDWKVT = M
-               IF( LWORK.GE.M*N+3*M ) THEN
+*> \date November 2011
 *
-*                 WORK( IVT ) is M by N
+*> \ingroup complex16OTHERcomputational
 *
-                  NWORK = IVT + LDWKVT*N
-                  CHUNK = N
-               ELSE
+*  =====================================================================
+      SUBROUTINE ZUNGRQ( M, N, K, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*                 WORK( IVT ) is M by CHUNK
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-                  CHUNK = ( LWORK-3*M ) / M
-                  NWORK = IVT + LDWKVT*CHUNK
-               END IF
+*     .. Scalar Arguments ..
+      INTEGER            INFO, K, LDA, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*  =====================================================================
 *
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*     .. Parameters ..
+      COMPLEX*16         ZERO
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY
+      INTEGER            I, IB, II, IINFO, IWS, J, KK, L, LDWORK,
+     $                   LWKOPT, NB, NBMIN, NX
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNGR2
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. External Functions ..
+      INTEGER            ILAENV
+      EXTERNAL           ILAENV
+*     ..
+*     .. Executable Statements ..
 *
-*              Multiply Q in U by real matrix RWORK(IRVT)
-*              storing the result in WORK(IVT), copying to U
-*              (Cworkspace: need 0)
-*              (Rworkspace: need 2*M*M)
+*     Test the input arguments
 *
-               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, WORK( IVT ),
-     $                      LDWKVT, RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, M, WORK( IVT ), LDWKVT, U, LDU )
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.M ) THEN
+         INFO = -2
+      ELSE IF( K.LT.0 .OR. K.GT.M ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      END IF
 *
-*              Multiply RWORK(IRVT) by P**H in A, storing the
-*              result in WORK(IVT), copying to A
-*              (CWorkspace: need M*M, prefer M*N)
-*              (Rworkspace: need 2*M*M, prefer 2*M*N)
+      IF( INFO.EQ.0 ) THEN
+         IF( M.LE.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = ILAENV( 1, 'ZUNGRQ', ' ', M, N, K, -1 )
+            LWKOPT = M*NB
+         END IF
+         WORK( 1 ) = LWKOPT
 *
-               NRWORK = IRU
-               DO 50 I = 1, N, CHUNK
-                  BLK = MIN( N-I+1, CHUNK )
-                  CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ), LDA,
-     $                         WORK( IVT ), LDWKVT, RWORK( NRWORK ) )
-                  CALL ZLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
-     $                         A( 1, I ), LDA )
-   50          CONTINUE
-            ELSE IF( WNTQS ) THEN
+         IF( LWORK.LT.MAX( 1, M ) .AND. .NOT.LQUERY ) THEN
+            INFO = -8
+         END IF
+      END IF
 *
-*              Copy A to U, generate Q
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: 0)
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGRQ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*     Quick return if possible
 *
-*              Copy A to VT, generate P**H
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: 0)
+      IF( M.LE.0 ) THEN
+         RETURN
+      END IF
 *
-               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
-               CALL ZUNGBR( 'P', M, N, M, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+      NBMIN = 2
+      NX = 0
+      IWS = M
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*        Determine when to cross over from blocked to unblocked code.
 *
-               IRVT = NRWORK
-               IRU = IRVT + M*M
-               NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+         NX = MAX( 0, ILAENV( 3, 'ZUNGRQ', ' ', M, N, K, -1 ) )
+         IF( NX.LT.K ) THEN
 *
-*              Multiply Q in U by real matrix RWORK(IRU), storing the
-*              result in A, copying to U
-*              (CWorkspace: need 0)
-*              (Rworkspace: need 3*M*M)
+*           Determine if workspace is large enough for blocked code.
 *
-               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, M, A, LDA, U, LDU )
+            LDWORK = M
+            IWS = LDWORK*NB
+            IF( LWORK.LT.IWS ) THEN
 *
-*              Multiply real matrix RWORK(IRVT) by P**H in VT,
-*              storing the result in A, copying to VT
-*              (Cworkspace: need 0)
-*              (Rworkspace: need M*M+2*M*N)
+*              Not enough workspace to use optimal NB:  reduce NB and
+*              determine the minimum value of NB.
 *
-               NRWORK = IRU
-               CALL ZLARCM( M, N, RWORK( IRVT ), M, VT, LDVT, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
-            ELSE
+               NB = LWORK / LDWORK
+               NBMIN = MAX( 2, ILAENV( 2, 'ZUNGRQ', ' ', M, N, K, -1 ) )
+            END IF
+         END IF
+      END IF
 *
-*              Copy A to U, generate Q
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: 0)
+      IF( NB.GE.NBMIN .AND. NB.LT.K .AND. NX.LT.K ) THEN
 *
-               CALL ZLACPY( 'L', M, M, A, LDA, U, LDU )
-               CALL ZUNGBR( 'Q', M, M, N, U, LDU, WORK( ITAUQ ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*        Use blocked code after the first block.
+*        The last kk rows are handled by the block method.
 *
-*              Copy A to VT, generate P**H
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: 0)
+         KK = MIN( K, ( ( K-NX+NB-1 ) / NB )*NB )
 *
-               CALL ZLACPY( 'U', M, N, A, LDA, VT, LDVT )
-               CALL ZUNGBR( 'P', N, N, M, VT, LDVT, WORK( ITAUP ),
-     $                      WORK( NWORK ), LWORK-NWORK+1, IERR )
+*        Set A(1:m-kk,n-kk+1:n) to zero.
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+         DO 20 J = N - KK + 1, N
+            DO 10 I = 1, M - KK
+               A( I, J ) = ZERO
+   10       CONTINUE
+   20    CONTINUE
+      ELSE
+         KK = 0
+      END IF
 *
-               IRVT = NRWORK
-               IRU = IRVT + M*M
-               NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*     Use unblocked code for the first or only block.
 *
-*              Multiply Q in U by real matrix RWORK(IRU), storing the
-*              result in A, copying to U
-*              (CWorkspace: need 0)
-*              (Rworkspace: need 3*M*M)
+      CALL ZUNGR2( M-KK, N-KK, K-KK, A, LDA, TAU, WORK, IINFO )
 *
-               CALL ZLACRM( M, M, U, LDU, RWORK( IRU ), M, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, M, A, LDA, U, LDU )
+      IF( KK.GT.0 ) THEN
 *
-*              Multiply real matrix RWORK(IRVT) by P**H in VT,
-*              storing the result in A, copying to VT
-*              (Cworkspace: need 0)
-*              (Rworkspace: need M*M+2*M*N)
+*        Use blocked code
 *
-               CALL ZLARCM( M, N, RWORK( IRVT ), M, VT, LDVT, A, LDA,
-     $                      RWORK( NRWORK ) )
-               CALL ZLACPY( 'F', M, N, A, LDA, VT, LDVT )
-            END IF
+         DO 50 I = K - KK + 1, K, NB
+            IB = MIN( NB, K-I+1 )
+            II = M - K + I
+            IF( II.GT.1 ) THEN
 *
-         ELSE
+*              Form the triangular factor of the block reflector
+*              H = H(i+ib-1) . . . H(i+1) H(i)
 *
-*           N .LT. MNTHR2
+               CALL ZLARFT( 'Backward', 'Rowwise', N-K+I+IB-1, IB,
+     $                      A( II, 1 ), LDA, TAU( I ), WORK, LDWORK )
 *
-*           Path 6t (N greater than M, but not much larger)
-*           Reduce to bidiagonal form without LQ decomposition
-*           Use ZUNMBR to compute singular vectors
+*              Apply H**H to A(1:m-k+i-1,1:n-k+i+ib-1) from the right
 *
-            IE = 1
-            NRWORK = IE + M
-            ITAUQ = 1
-            ITAUP = ITAUQ + M
-            NWORK = ITAUP + M
+               CALL ZLARFB( 'Right', 'Conjugate transpose', 'Backward',
+     $                      'Rowwise', II-1, N-K+I+IB-1, IB, A( II, 1 ),
+     $                      LDA, WORK, LDWORK, A, LDA, WORK( IB+1 ),
+     $                      LDWORK )
+            END IF
 *
-*           Bidiagonalize A
-*           (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
-*           (RWorkspace: M)
+*           Apply H**H to columns 1:n-k+i+ib-1 of current block
 *
-            CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                   WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                   IERR )
-            IF( WNTQN ) THEN
+            CALL ZUNGR2( IB, N-K+I+IB-1, IB, A( II, 1 ), LDA, TAU( I ),
+     $                   WORK, IINFO )
 *
-*              Compute singular values only
-*              (Cworkspace: 0)
-*              (Rworkspace: need BDSPAN)
+*           Set columns n-k+i+ib:n of current block to zero
 *
-               CALL DBDSDC( 'L', 'N', M, S, RWORK( IE ), DUM, 1, DUM, 1,
-     $                      DUM, IDUM, RWORK( NRWORK ), IWORK, INFO )
-            ELSE IF( WNTQO ) THEN
-               LDWKVT = M
-               IVT = NWORK
-               IF( LWORK.GE.M*N+3*M ) THEN
+            DO 40 L = N - K + I + IB, N
+               DO 30 J = II, II + IB - 1
+                  A( J, L ) = ZERO
+   30          CONTINUE
+   40       CONTINUE
+   50    CONTINUE
+      END IF
 *
-*                 WORK( IVT ) is M by N
+      WORK( 1 ) = IWS
+      RETURN
 *
-                  CALL ZLASET( 'F', M, N, CZERO, CZERO, WORK( IVT ),
-     $                         LDWKVT )
-                  NWORK = IVT + LDWKVT*N
-               ELSE
+*     End of ZUNGRQ
 *
-*                 WORK( IVT ) is M by CHUNK
+      END
+*> \brief \b ZUNGTR
 *
-                  CHUNK = ( LWORK-3*M ) / M
-                  NWORK = IVT + LDWKVT*CHUNK
-               END IF
+*  =========== DOCUMENTATION ===========
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-               IRVT = NRWORK
-               IRU = IRVT + M*M
-               NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*> \htmlonly
+*> Download ZUNGTR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zungtr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zungtr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zungtr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of A
-*              (Cworkspace: need 2*M, prefer M+M*NB)
-*              (Rworkspace: need 0)
+*  Definition:
+*  ===========
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*       SUBROUTINE ZUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-               IF( LWORK.GE.M*N+3*M ) THEN
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNGTR generates a complex unitary matrix Q which is defined as the
+*> product of n-1 elementary reflectors of order N, as returned by
+*> ZHETRD:
+*>
+*> if UPLO = 'U', Q = H(n-1) . . . H(2) H(1),
+*>
+*> if UPLO = 'L', Q = H(1) H(2) . . . H(n-1).
+*> \endverbatim
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix WORK(IVT)
-*              Overwrite WORK(IVT) by right singular vectors of A,
-*              copying to A
-*              (Cworkspace: need M*N+2*M, prefer M*N+M+M*NB)
-*              (Rworkspace: need 0)
+*  Arguments:
+*  ==========
 *
-                  CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, WORK( IVT ),
-     $                         LDWKVT )
-                  CALL ZUNMBR( 'P', 'R', 'C', M, N, M, A, LDA,
-     $                         WORK( ITAUP ), WORK( IVT ), LDWKVT,
-     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
-                  CALL ZLACPY( 'F', M, N, WORK( IVT ), LDWKVT, A, LDA )
-               ELSE
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          = 'U': Upper triangle of A contains elementary reflectors
+*>                 from ZHETRD;
+*>          = 'L': Lower triangle of A contains elementary reflectors
+*>                 from ZHETRD.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix Q. N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension (LDA,N)
+*>          On entry, the vectors which define the elementary reflectors,
+*>          as returned by ZHETRD.
+*>          On exit, the N-by-N unitary matrix Q.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= N.
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (N-1)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZHETRD.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK. LWORK >= N-1.
+*>          For optimum performance LWORK >= (N-1)*NB, where NB is
+*>          the optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
 *
-*                 Generate P**H in A
-*                 (Cworkspace: need 2*M, prefer M+M*NB)
-*                 (Rworkspace: need 0)
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-                  CALL ZUNGBR( 'P', M, N, M, A, LDA, WORK( ITAUP ),
-     $                         WORK( NWORK ), LWORK-NWORK+1, IERR )
+*> \date November 2011
 *
-*                 Multiply Q in A by real matrix RWORK(IRU), storing the
-*                 result in WORK(IU), copying to A
-*                 (CWorkspace: need M*M, prefer M*N)
-*                 (Rworkspace: need 3*M*M, prefer M*M+2*M*N)
+*> \ingroup complex16OTHERcomputational
 *
-                  NRWORK = IRU
-                  DO 60 I = 1, N, CHUNK
-                     BLK = MIN( N-I+1, CHUNK )
-                     CALL ZLARCM( M, BLK, RWORK( IRVT ), M, A( 1, I ),
-     $                            LDA, WORK( IVT ), LDWKVT,
-     $                            RWORK( NRWORK ) )
-                     CALL ZLACPY( 'F', M, BLK, WORK( IVT ), LDWKVT,
-     $                            A( 1, I ), LDA )
-   60             CONTINUE
-               END IF
-            ELSE IF( WNTQS ) THEN
+*  =====================================================================
+      SUBROUTINE ZUNGTR( UPLO, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
 *
-               IRVT = NRWORK
-               IRU = IRVT + M*M
-               NRWORK = IRU + M*M
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, LWORK, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), TAU( * ), WORK( * )
+*     ..
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of A
-*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*              (RWorkspace: M*M)
+*  =====================================================================
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+*     .. Parameters ..
+      COMPLEX*16         ZERO, ONE
+      PARAMETER          ( ZERO = ( 0.0D+0, 0.0D+0 ),
+     $                   ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LQUERY, UPPER
+      INTEGER            I, IINFO, J, LWKOPT, NB
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZUNGQL, ZUNGQR
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX
+*     ..
+*     .. Executable Statements ..
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of A
-*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*              (RWorkspace: M*M)
+*     Test the input arguments
 *
-               CALL ZLASET( 'F', M, N, CZERO, CZERO, VT, LDVT )
-               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', M, N, M, A, LDA,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
-            ELSE
+      INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      ELSE IF( LWORK.LT.MAX( 1, N-1 ) .AND. .NOT.LQUERY ) THEN
+         INFO = -7
+      END IF
 *
-*              Perform bidiagonal SVD, computing left singular vectors
-*              of bidiagonal matrix in RWORK(IRU) and computing right
-*              singular vectors of bidiagonal matrix in RWORK(IRVT)
-*              (CWorkspace: need 0)
-*              (RWorkspace: need BDSPAC)
+      IF( INFO.EQ.0 ) THEN
+         IF( UPPER ) THEN
+            NB = ILAENV( 1, 'ZUNGQL', ' ', N-1, N-1, N-1, -1 )
+         ELSE
+            NB = ILAENV( 1, 'ZUNGQR', ' ', N-1, N-1, N-1, -1 )
+         END IF
+         LWKOPT = MAX( 1, N-1 )*NB
+         WORK( 1 ) = LWKOPT
+      END IF
 *
-               IRVT = NRWORK
-               IRU = IRVT + M*M
-               NRWORK = IRU + M*M
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNGTR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-               CALL DBDSDC( 'L', 'I', M, S, RWORK( IE ), RWORK( IRU ),
-     $                      M, RWORK( IRVT ), M, DUM, IDUM,
-     $                      RWORK( NRWORK ), IWORK, INFO )
+*     Quick return if possible
 *
-*              Copy real matrix RWORK(IRU) to complex matrix U
-*              Overwrite U by left singular vectors of A
-*              (CWorkspace: need 3*M, prefer 2*M+M*NB)
-*              (RWorkspace: M*M)
+      IF( N.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRU ), M, U, LDU )
-               CALL ZUNMBR( 'Q', 'L', 'N', M, M, N, A, LDA,
-     $                      WORK( ITAUQ ), U, LDU, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
+      IF( UPPER ) THEN
 *
-*              Set all of VT to identity matrix
+*        Q was determined by a call to ZHETRD with UPLO = 'U'
 *
-               CALL ZLASET( 'F', N, N, CZERO, CONE, VT, LDVT )
+*        Shift the vectors which define the elementary reflectors one
+*        column to the left, and set the last row and column of Q to
+*        those of the unit matrix
 *
-*              Copy real matrix RWORK(IRVT) to complex matrix VT
-*              Overwrite VT by right singular vectors of A
-*              (CWorkspace: need 2*M+N, prefer 2*M+N*NB)
-*              (RWorkspace: M*M)
+         DO 20 J = 1, N - 1
+            DO 10 I = 1, J - 1
+               A( I, J ) = A( I, J+1 )
+   10       CONTINUE
+            A( N, J ) = ZERO
+   20    CONTINUE
+         DO 30 I = 1, N - 1
+            A( I, N ) = ZERO
+   30    CONTINUE
+         A( N, N ) = ONE
 *
-               CALL ZLACP2( 'F', M, M, RWORK( IRVT ), M, VT, LDVT )
-               CALL ZUNMBR( 'P', 'R', 'C', N, N, M, A, LDA,
-     $                      WORK( ITAUP ), VT, LDVT, WORK( NWORK ),
-     $                      LWORK-NWORK+1, IERR )
-            END IF
+*        Generate Q(1:n-1,1:n-1)
 *
-         END IF
+         CALL ZUNGQL( N-1, N-1, N-1, A, LDA, TAU, WORK, LWORK, IINFO )
 *
-      END IF
+      ELSE
 *
-*     Undo scaling if necessary
+*        Q was determined by a call to ZHETRD with UPLO = 'L'.
 *
-      IF( ISCL.EQ.1 ) THEN
-         IF( ANRM.GT.BIGNUM )
-     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
-     $                   IERR )
-         IF( INFO.NE.0 .AND. ANRM.GT.BIGNUM )
-     $      CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN-1, 1,
-     $                   RWORK( IE ), MINMN, IERR )
-         IF( ANRM.LT.SMLNUM )
-     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
-     $                   IERR )
-         IF( INFO.NE.0 .AND. ANRM.LT.SMLNUM )
-     $      CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN-1, 1,
-     $                   RWORK( IE ), MINMN, IERR )
-      END IF
+*        Shift the vectors which define the elementary reflectors one
+*        column to the right, and set the first row and column of Q to
+*        those of the unit matrix
 *
-*     Return optimal workspace in WORK(1)
+         DO 50 J = N, 2, -1
+            A( 1, J ) = ZERO
+            DO 40 I = J + 1, N
+               A( I, J ) = A( I, J-1 )
+   40       CONTINUE
+   50    CONTINUE
+         A( 1, 1 ) = ONE
+         DO 60 I = 2, N
+            A( I, 1 ) = ZERO
+   60    CONTINUE
+         IF( N.GT.1 ) THEN
 *
-      WORK( 1 ) = MAXWRK
+*           Generate Q(2:n,2:n)
 *
+            CALL ZUNGQR( N-1, N-1, N-1, A( 2, 2 ), LDA, TAU, WORK,
+     $                   LWORK, IINFO )
+         END IF
+      END IF
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZGESDD
+*     End of ZUNGTR
 *
       END
-*> \brief \b ZLACP2 copies all or part of a real two-dimensional array to a complex array.
+*> \brief \b ZUNM2L multiplies a general matrix by the unitary matrix from a QL factorization determined by cgeqlf (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -33582,27 +52250,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLACP2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacp2.f"> 
+*> Download ZUNM2L + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunm2l.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacp2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunm2l.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacp2.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunm2l.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLACP2( UPLO, M, N, A, LDA, B, LDB )
+*       SUBROUTINE ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+*                          WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            LDA, LDB, M, N
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            INFO, K, LDA, LDC, M, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * )
-*       COMPLEX*16         B( LDB, * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -33611,58 +52279,112 @@
 *>
 *> \verbatim
 *>
-*> ZLACP2 copies all or part of a real two-dimensional matrix A to a
-*> complex matrix B.
+*> ZUNM2L overwrites the general complex m-by-n matrix C with
+*>
+*>       Q * C  if SIDE = 'L' and TRANS = 'N', or
+*>
+*>       Q**H* C  if SIDE = 'L' and TRANS = 'C', or
+*>
+*>       C * Q  if SIDE = 'R' and TRANS = 'N', or
+*>
+*>       C * Q**H if SIDE = 'R' and TRANS = 'C',
+*>
+*> where Q is a complex unitary matrix defined as the product of k
+*> elementary reflectors
+*>
+*>       Q = H(k) . . . H(2) H(1)
+*>
+*> as returned by ZGEQLF. Q is of order m if SIDE = 'L' and of order n
+*> if SIDE = 'R'.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] UPLO
+*> \param[in] SIDE
 *> \verbatim
-*>          UPLO is CHARACTER*1
-*>          Specifies the part of the matrix A to be copied to B.
-*>          = 'U':      Upper triangular part
-*>          = 'L':      Lower triangular part
-*>          Otherwise:  All of the matrix A
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left
+*>          = 'R': apply Q or Q**H from the Right
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': apply Q  (No transpose)
+*>          = 'C': apply Q**H (Conjugate transpose)
 *> \endverbatim
 *>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines
+*>          the matrix Q.
+*>          If SIDE = 'L', M >= K >= 0;
+*>          if SIDE = 'R', N >= K >= 0.
 *> \endverbatim
 *>
 *> \param[in] A
 *> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          The m by n matrix A.  If UPLO = 'U', only the upper trapezium
-*>          is accessed; if UPLO = 'L', only the lower trapezium is
-*>          accessed.
+*>          A is COMPLEX*16 array, dimension (LDA,K)
+*>          The i-th column must contain the vector which defines the
+*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
+*>          ZGEQLF in the last k columns of its array argument A.
+*>          A is modified by the routine but restored on exit.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
+*>          The leading dimension of the array A.
+*>          If SIDE = 'L', LDA >= max(1,M);
+*>          if SIDE = 'R', LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] B
+*> \param[in] TAU
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,N)
-*>          On exit, B = A in the locations specified by UPLO.
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEQLF.
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in,out] C
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B.  LDB >= max(1,M).
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the m-by-n matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension
+*>                                   (N) if SIDE = 'L',
+*>                                   (M) if SIDE = 'R'
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -33675,67 +52397,133 @@
 *
 *> \date September 2012
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZLACP2( UPLO, M, N, A, LDA, B, LDB )
+      SUBROUTINE ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            LDA, LDB, M, N
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, K, LDA, LDC, M, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * )
-      COMPLEX*16         B( LDB, * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
+*     .. Parameters ..
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
 *     .. Local Scalars ..
-      INTEGER            I, J
+      LOGICAL            LEFT, NOTRAN
+      INTEGER            I, I1, I2, I3, MI, NI, NQ
+      COMPLEX*16         AII, TAUI
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       EXTERNAL           LSAME
 *     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLARF
+*     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MIN
+      INTRINSIC          DCONJG, MAX
 *     ..
 *     .. Executable Statements ..
 *
-      IF( LSAME( UPLO, 'U' ) ) THEN
-         DO 20 J = 1, N
-            DO 10 I = 1, MIN( J, M )
-               B( I, J ) = A( I, J )
-   10       CONTINUE
-   20    CONTINUE
+*     Test the input arguments
 *
-      ELSE IF( LSAME( UPLO, 'L' ) ) THEN
-         DO 40 J = 1, N
-            DO 30 I = J, M
-               B( I, J ) = A( I, J )
-   30       CONTINUE
-   40    CONTINUE
+      INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
+*
+*     NQ is the order of Q
 *
+      IF( LEFT ) THEN
+         NQ = M
       ELSE
-         DO 60 J = 1, N
-            DO 50 I = 1, M
-               B( I, J ) = A( I, J )
-   50       CONTINUE
-   60    CONTINUE
+         NQ = N
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
+         INFO = -7
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNM2L', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 )
+     $   RETURN
+*
+      IF( ( LEFT .AND. NOTRAN .OR. .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
+         I1 = 1
+         I2 = K
+         I3 = 1
+      ELSE
+         I1 = K
+         I2 = 1
+         I3 = -1
+      END IF
+*
+      IF( LEFT ) THEN
+         NI = N
+      ELSE
+         MI = M
       END IF
 *
+      DO 10 I = I1, I2, I3
+         IF( LEFT ) THEN
+*
+*           H(i) or H(i)**H is applied to C(1:m-k+i,1:n)
+*
+            MI = M - K + I
+         ELSE
+*
+*           H(i) or H(i)**H is applied to C(1:m,1:n-k+i)
+*
+            NI = N - K + I
+         END IF
+*
+*        Apply H(i) or H(i)**H
+*
+         IF( NOTRAN ) THEN
+            TAUI = TAU( I )
+         ELSE
+            TAUI = DCONJG( TAU( I ) )
+         END IF
+         AII = A( NQ-K+I, I )
+         A( NQ-K+I, I ) = ONE
+         CALL ZLARF( SIDE, MI, NI, A( 1, I ), 1, TAUI, C, LDC, WORK )
+         A( NQ-K+I, I ) = AII
+   10 CONTINUE
       RETURN
 *
-*     End of ZLACP2
+*     End of ZUNM2L
 *
       END
-*> \brief \b ZLACRM multiplies a complex matrix by a square real matrix.
+*> \brief \b ZUNM2R multiplies a general matrix by the unitary matrix from a QR factorization determined by cgeqrf (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -33743,26 +52531,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLACRM + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlacrm.f"> 
+*> Download ZUNM2R + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunm2r.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlacrm.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunm2r.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlacrm.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunm2r.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLACRM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+*       SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+*                          WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            LDA, LDB, LDC, M, N
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            INFO, K, LDA, LDC, M, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   B( LDB, * ), RWORK( * )
-*       COMPLEX*16         A( LDA, * ), C( LDC, * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -33771,69 +52560,112 @@
 *>
 *> \verbatim
 *>
-*> ZLACRM performs a very simple matrix-matrix multiplication:
-*>          C := A * B,
-*> where A is M by N and complex; B is N by N and real;
-*> C is M by N and complex.
+*> ZUNM2R overwrites the general complex m-by-n matrix C with
+*>
+*>       Q * C  if SIDE = 'L' and TRANS = 'N', or
+*>
+*>       Q**H* C  if SIDE = 'L' and TRANS = 'C', or
+*>
+*>       C * Q  if SIDE = 'R' and TRANS = 'N', or
+*>
+*>       C * Q**H if SIDE = 'R' and TRANS = 'C',
+*>
+*> where Q is a complex unitary matrix defined as the product of k
+*> elementary reflectors
+*>
+*>       Q = H(1) H(2) . . . H(k)
+*>
+*> as returned by ZGEQRF. Q is of order m if SIDE = 'L' and of order n
+*> if SIDE = 'R'.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left
+*>          = 'R': apply Q or Q**H from the Right
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': apply Q  (No transpose)
+*>          = 'C': apply Q**H (Conjugate transpose)
+*> \endverbatim
+*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix A and of the matrix C.
-*>          M >= 0.
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns and rows of the matrix B and
-*>          the number of columns of the matrix C.
-*>          N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in] K
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA, N)
-*>          A contains the M by N matrix A.
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines
+*>          the matrix Q.
+*>          If SIDE = 'L', M >= K >= 0;
+*>          if SIDE = 'R', N >= K >= 0.
 *> \endverbatim
 *>
-*> \param[in] LDA
+*> \param[in] A
 *> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >=max(1,M).
+*>          A is COMPLEX*16 array, dimension (LDA,K)
+*>          The i-th column must contain the vector which defines the
+*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
+*>          ZGEQRF in the first k columns of its array argument A.
+*>          A is modified by the routine but restored on exit.
 *> \endverbatim
 *>
-*> \param[in] B
+*> \param[in] LDA
 *> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB, N)
-*>          B contains the N by N matrix B.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.
+*>          If SIDE = 'L', LDA >= max(1,M);
+*>          if SIDE = 'R', LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in] TAU
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B. LDB >=max(1,N).
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEQRF.
 *> \endverbatim
 *>
-*> \param[in] C
+*> \param[in,out] C
 *> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC, N)
-*>          C contains the M by N matrix C.
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the m-by-n matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
 *> \endverbatim
 *>
 *> \param[in] LDC
 *> \verbatim
 *>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >=max(1,N).
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
-*> \param[out] RWORK
+*> \param[out] WORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (2*M*N)
+*>          WORK is COMPLEX*16 array, dimension
+*>                                   (N) if SIDE = 'L',
+*>                                   (M) if SIDE = 'R'
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -33846,81 +52678,138 @@
 *
 *> \date September 2012
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZLACRM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+      SUBROUTINE ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     September 2012
 *
 *     .. Scalar Arguments ..
-      INTEGER            LDA, LDB, LDC, M, N
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, K, LDA, LDC, M, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   B( LDB, * ), RWORK( * )
-      COMPLEX*16         A( LDA, * ), C( LDC, * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0 )
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, J, L
+      LOGICAL            LEFT, NOTRAN
+      INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
+      COMPLEX*16         AII, TAUI
 *     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, DIMAG
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM
+      EXTERNAL           XERBLA, ZLARF
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG, MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Quick return if possible.
+*     Test the input arguments
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )
+      INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
+*
+*     NQ is the order of Q
+*
+      IF( LEFT ) THEN
+         NQ = M
+      ELSE
+         NQ = N
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
+         INFO = -7
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNM2R', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 )
      $   RETURN
 *
-      DO 20 J = 1, N
-         DO 10 I = 1, M
-            RWORK( ( J-1 )*M+I ) = DBLE( A( I, J ) )
-   10    CONTINUE
-   20 CONTINUE
+      IF( ( LEFT .AND. .NOT.NOTRAN .OR. .NOT.LEFT .AND. NOTRAN ) ) THEN
+         I1 = 1
+         I2 = K
+         I3 = 1
+      ELSE
+         I1 = K
+         I2 = 1
+         I3 = -1
+      END IF
 *
-      L = M*N + 1
-      CALL DGEMM( 'N', 'N', M, N, N, ONE, RWORK, M, B, LDB, ZERO,
-     $            RWORK( L ), M )
-      DO 40 J = 1, N
-         DO 30 I = 1, M
-            C( I, J ) = RWORK( L+( J-1 )*M+I-1 )
-   30    CONTINUE
-   40 CONTINUE
+      IF( LEFT ) THEN
+         NI = N
+         JC = 1
+      ELSE
+         MI = M
+         IC = 1
+      END IF
 *
-      DO 60 J = 1, N
-         DO 50 I = 1, M
-            RWORK( ( J-1 )*M+I ) = DIMAG( A( I, J ) )
-   50    CONTINUE
-   60 CONTINUE
-      CALL DGEMM( 'N', 'N', M, N, N, ONE, RWORK, M, B, LDB, ZERO,
-     $            RWORK( L ), M )
-      DO 80 J = 1, N
-         DO 70 I = 1, M
-            C( I, J ) = DCMPLX( DBLE( C( I, J ) ),
-     $                  RWORK( L+( J-1 )*M+I-1 ) )
-   70    CONTINUE
-   80 CONTINUE
+      DO 10 I = I1, I2, I3
+         IF( LEFT ) THEN
+*
+*           H(i) or H(i)**H is applied to C(i:m,1:n)
+*
+            MI = M - I + 1
+            IC = I
+         ELSE
+*
+*           H(i) or H(i)**H is applied to C(1:m,i:n)
+*
+            NI = N - I + 1
+            JC = I
+         END IF
+*
+*        Apply H(i) or H(i)**H
 *
+         IF( NOTRAN ) THEN
+            TAUI = TAU( I )
+         ELSE
+            TAUI = DCONJG( TAU( I ) )
+         END IF
+         AII = A( I, I )
+         A( I, I ) = ONE
+         CALL ZLARF( SIDE, MI, NI, A( I, I ), 1, TAUI, C( IC, JC ), LDC,
+     $               WORK )
+         A( I, I ) = AII
+   10 CONTINUE
       RETURN
 *
-*     End of ZLACRM
+*     End of ZUNM2R
 *
       END
-*> \brief \b ZLARCM copies all or part of a real two-dimensional array to a complex array.
+*> \brief \b ZUNMBR
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -33928,26 +52817,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLARCM + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlarcm.f"> 
+*> Download ZUNMBR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmbr.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlarcm.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmbr.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlarcm.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmbr.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLARCM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+*       SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
+*                          LDC, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            LDA, LDB, LDC, M, N
+*       CHARACTER          SIDE, TRANS, VECT
+*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), RWORK( * )
-*       COMPLEX*16         B( LDB, * ), C( LDC, * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -33956,69 +52846,149 @@
 *>
 *> \verbatim
 *>
-*> ZLARCM performs a very simple matrix-matrix multiplication:
-*>          C := A * B,
-*> where A is M by M and real; B is M by N and complex;
-*> C is M by N and complex.
+*> If VECT = 'Q', ZUNMBR overwrites the general complex M-by-N matrix C
+*> with
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q * C          C * Q
+*> TRANS = 'C':      Q**H * C       C * Q**H
+*>
+*> If VECT = 'P', ZUNMBR overwrites the general complex M-by-N matrix C
+*> with
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      P * C          C * P
+*> TRANS = 'C':      P**H * C       C * P**H
+*>
+*> Here Q and P**H are the unitary matrices determined by ZGEBRD when
+*> reducing a complex matrix A to bidiagonal form: A = Q * B * P**H. Q
+*> and P**H are defined as products of elementary reflectors H(i) and
+*> G(i) respectively.
+*>
+*> Let nq = m if SIDE = 'L' and nq = n if SIDE = 'R'. Thus nq is the
+*> order of the unitary matrix Q or P**H that is applied.
+*>
+*> If VECT = 'Q', A is assumed to have been an NQ-by-K matrix:
+*> if nq >= k, Q = H(1) H(2) . . . H(k);
+*> if nq < k, Q = H(1) H(2) . . . H(nq-1).
+*>
+*> If VECT = 'P', A is assumed to have been a K-by-NQ matrix:
+*> if k < nq, P = G(1) G(2) . . . G(k);
+*> if k >= nq, P = G(1) G(2) . . . G(nq-1).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
+*> \param[in] VECT
+*> \verbatim
+*>          VECT is CHARACTER*1
+*>          = 'Q': apply Q or Q**H;
+*>          = 'P': apply P or P**H.
+*> \endverbatim
+*>
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q, Q**H, P or P**H from the Left;
+*>          = 'R': apply Q, Q**H, P or P**H from the Right.
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N':  No transpose, apply Q or P;
+*>          = 'C':  Conjugate transpose, apply Q**H or P**H.
+*> \endverbatim
+*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix A and of the matrix C.
-*>          M >= 0.
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns and rows of the matrix B and
-*>          the number of columns of the matrix C.
-*>          N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          If VECT = 'Q', the number of columns in the original
+*>          matrix reduced by ZGEBRD.
+*>          If VECT = 'P', the number of rows in the original
+*>          matrix reduced by ZGEBRD.
+*>          K >= 0.
 *> \endverbatim
 *>
 *> \param[in] A
 *> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA, M)
-*>          A contains the M by M matrix A.
+*>          A is COMPLEX*16 array, dimension
+*>                                (LDA,min(nq,K)) if VECT = 'Q'
+*>                                (LDA,nq)        if VECT = 'P'
+*>          The vectors which define the elementary reflectors H(i) and
+*>          G(i), whose products determine the matrices Q and P, as
+*>          returned by ZGEBRD.
 *> \endverbatim
 *>
 *> \param[in] LDA
 *> \verbatim
 *>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >=max(1,M).
+*>          The leading dimension of the array A.
+*>          If VECT = 'Q', LDA >= max(1,nq);
+*>          if VECT = 'P', LDA >= max(1,min(nq,K)).
 *> \endverbatim
 *>
-*> \param[in] B
+*> \param[in] TAU
 *> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB, N)
-*>          B contains the M by N matrix B.
+*>          TAU is COMPLEX*16 array, dimension (min(nq,K))
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i) or G(i) which determines Q or P, as returned
+*>          by ZGEBRD in the array argument TAUQ or TAUP.
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in,out] C
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B. LDB >=max(1,M).
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q
+*>          or P*C or P**H*C or C*P or C*P**H.
 *> \endverbatim
 *>
-*> \param[in] C
+*> \param[in] LDC
 *> \verbatim
-*>          C is COMPLEX*16 array, dimension (LDC, N)
-*>          C contains the M by N matrix C.
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in] LDC
+*> \param[out] WORK
 *> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the array C. LDC >=max(1,M).
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[out] RWORK
+*> \param[in] LWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (2*M*N)
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          If SIDE = 'L', LWORK >= max(1,N);
+*>          if SIDE = 'R', LWORK >= max(1,M);
+*>          if N = 0 or M = 0, LWORK >= 1.
+*>          For optimum performance LWORK >= max(1,N*NB) if SIDE = 'L',
+*>          and LWORK >= max(1,M*NB) if SIDE = 'R', where NB is the
+*>          optimal blocksize. (NB = 0 if M = 0 or N = 0.)
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -34029,83 +52999,196 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup complex16OTHERauxiliary
+*> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZLARCM( M, N, A, LDA, B, LDB, C, LDC, RWORK )
+      SUBROUTINE ZUNMBR( VECT, SIDE, TRANS, M, N, K, A, LDA, TAU, C,
+     $                   LDC, WORK, LWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            LDA, LDB, LDC, M, N
+      CHARACTER          SIDE, TRANS, VECT
+      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * ), RWORK( * )
-      COMPLEX*16         B( LDB, * ), C( LDC, * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0 )
-*     ..
 *     .. Local Scalars ..
-      INTEGER            I, J, L
+      LOGICAL            APPLYQ, LEFT, LQUERY, NOTRAN
+      CHARACTER          TRANST
+      INTEGER            I1, I2, IINFO, LWKOPT, MI, NB, NI, NQ, NW
 *     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, DIMAG
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM
+      EXTERNAL           XERBLA, ZUNMLQ, ZUNMQR
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Quick return if possible.
+*     Test the input arguments
 *
-      IF( ( M.EQ.0 ) .OR. ( N.EQ.0 ) )
+      INFO = 0
+      APPLYQ = LSAME( VECT, 'Q' )
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+*     NQ is the order of Q or P and NW is the minimum dimension of WORK
+*
+      IF( LEFT ) THEN
+         NQ = M
+         NW = N
+      ELSE
+         NQ = N
+         NW = M
+      END IF
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         NW = 0
+      END IF
+      IF( .NOT.APPLYQ .AND. .NOT.LSAME( VECT, 'P' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( K.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( ( APPLYQ .AND. LDA.LT.MAX( 1, NQ ) ) .OR.
+     $         ( .NOT.APPLYQ .AND. LDA.LT.MAX( 1, MIN( NQ, K ) ) ) )
+     $          THEN
+         INFO = -8
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -11
+      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
+         INFO = -13
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+         IF( NW.GT.0 ) THEN
+            IF( APPLYQ ) THEN
+               IF( LEFT ) THEN
+                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M-1, N, M-1,
+     $                 -1 )
+               ELSE
+                  NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N-1, N-1,
+     $                 -1 )
+               END IF
+            ELSE
+               IF( LEFT ) THEN
+                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M-1, N, M-1,
+     $                 -1 )
+               ELSE
+                  NB = ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N-1, N-1,
+     $                 -1 )
+               END IF
+            END IF
+            LWKOPT = MAX( 1, NW*NB )
+         ELSE
+            LWKOPT = 1
+         END IF
+         WORK( 1 ) = LWKOPT
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNMBR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( M.EQ.0 .OR. N.EQ.0 )
      $   RETURN
 *
-      DO 20 J = 1, N
-         DO 10 I = 1, M
-            RWORK( ( J-1 )*M+I ) = DBLE( B( I, J ) )
-   10    CONTINUE
-   20 CONTINUE
+      IF( APPLYQ ) THEN
 *
-      L = M*N + 1
-      CALL DGEMM( 'N', 'N', M, N, M, ONE, A, LDA, RWORK, M, ZERO,
-     $            RWORK( L ), M )
-      DO 40 J = 1, N
-         DO 30 I = 1, M
-            C( I, J ) = RWORK( L+( J-1 )*M+I-1 )
-   30    CONTINUE
-   40 CONTINUE
+*        Apply Q
 *
-      DO 60 J = 1, N
-         DO 50 I = 1, M
-            RWORK( ( J-1 )*M+I ) = DIMAG( B( I, J ) )
-   50    CONTINUE
-   60 CONTINUE
-      CALL DGEMM( 'N', 'N', M, N, M, ONE, A, LDA, RWORK, M, ZERO,
-     $            RWORK( L ), M )
-      DO 80 J = 1, N
-         DO 70 I = 1, M
-            C( I, J ) = DCMPLX( DBLE( C( I, J ) ),
-     $                  RWORK( L+( J-1 )*M+I-1 ) )
-   70    CONTINUE
-   80 CONTINUE
+         IF( NQ.GE.K ) THEN
+*
+*           Q was determined by a call to ZGEBRD with nq >= k
+*
+            CALL ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, LWORK, IINFO )
+         ELSE IF( NQ.GT.1 ) THEN
+*
+*           Q was determined by a call to ZGEBRD with nq < k
+*
+            IF( LEFT ) THEN
+               MI = M - 1
+               NI = N
+               I1 = 2
+               I2 = 1
+            ELSE
+               MI = M
+               NI = N - 1
+               I1 = 1
+               I2 = 2
+            END IF
+            CALL ZUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
+     $                   C( I1, I2 ), LDC, WORK, LWORK, IINFO )
+         END IF
+      ELSE
+*
+*        Apply P
+*
+         IF( NOTRAN ) THEN
+            TRANST = 'C'
+         ELSE
+            TRANST = 'N'
+         END IF
+         IF( NQ.GT.K ) THEN
+*
+*           P was determined by a call to ZGEBRD with nq > k
+*
+            CALL ZUNMLQ( SIDE, TRANST, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, LWORK, IINFO )
+         ELSE IF( NQ.GT.1 ) THEN
+*
+*           P was determined by a call to ZGEBRD with nq <= k
 *
+            IF( LEFT ) THEN
+               MI = M - 1
+               NI = N
+               I1 = 2
+               I2 = 1
+            ELSE
+               MI = M
+               NI = N - 1
+               I1 = 1
+               I2 = 2
+            END IF
+            CALL ZUNMLQ( SIDE, TRANST, MI, NI, NQ-1, A( 1, 2 ), LDA,
+     $                   TAU, C( I1, I2 ), LDC, WORK, LWORK, IINFO )
+         END IF
+      END IF
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZLARCM
+*     End of ZUNMBR
 *
       END
-*> \brief <b> ZGELSD computes the minimum-norm solution to a linear least squares problem for GE matrices</b>
+*> \brief \b ZUNMHR
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -34113,29 +53196,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZGELSD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zgelsd.f"> 
+*> Download ZUNMHR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmhr.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zgelsd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmhr.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zgelsd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmhr.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
-*                          WORK, LWORK, RWORK, IWORK, INFO )
+*       SUBROUTINE ZUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
+*                          LDC, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
-*       DOUBLE PRECISION   RCOND
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            IHI, ILO, INFO, LDA, LDC, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            IWORK( * )
-*       DOUBLE PRECISION   RWORK( * ), S( * )
-*       COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -34144,108 +53225,102 @@
 *>
 *> \verbatim
 *>
-*> ZGELSD computes the minimum-norm solution to a real linear least
-*> squares problem:
-*>     minimize 2-norm(| b - A*x |)
-*> using the singular value decomposition (SVD) of A. A is an M-by-N
-*> matrix which may be rank-deficient.
-*>
-*> Several right hand side vectors b and solution vectors x can be
-*> handled in a single call; they are stored as the columns of the
-*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
-*> matrix X.
+*> ZUNMHR overwrites the general complex M-by-N matrix C with
 *>
-*> The problem is solved in three steps:
-*> (1) Reduce the coefficient matrix A to bidiagonal form with
-*>     Householder tranformations, reducing the original problem
-*>     into a "bidiagonal least squares problem" (BLS)
-*> (2) Solve the BLS using a divide and conquer approach.
-*> (3) Apply back all the Householder tranformations to solve
-*>     the original least squares problem.
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q * C          C * Q
+*> TRANS = 'C':      Q**H * C       C * Q**H
 *>
-*> The effective rank of A is determined by treating as zero those
-*> singular values which are less than RCOND times the largest singular
-*> value.
+*> where Q is a complex unitary matrix of order nq, with nq = m if
+*> SIDE = 'L' and nq = n if SIDE = 'R'. Q is defined as the product of
+*> IHI-ILO elementary reflectors, as returned by ZGEHRD:
 *>
-*> The divide and conquer algorithm makes very mild assumptions about
-*> floating point arithmetic. It will work on machines with a guard
-*> digit in add/subtract, or on those binary machines without guard
-*> digits which subtract like the Cray X-MP, Cray Y-MP, Cray C-90, or
-*> Cray-2. It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
+*> Q = H(ilo) H(ilo+1) . . . H(ihi-1).
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left;
+*>          = 'R': apply Q or Q**H from the Right.
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': apply Q  (No transpose)
+*>          = 'C': apply Q**H (Conjugate transpose)
+*> \endverbatim
+*>
 *> \param[in] M
 *> \verbatim
 *>          M is INTEGER
-*>          The number of rows of the matrix A. M >= 0.
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The number of columns of the matrix A. N >= 0.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] NRHS
+*> \param[in] ILO
 *> \verbatim
-*>          NRHS is INTEGER
-*>          The number of right hand sides, i.e., the number of columns
-*>          of the matrices B and X. NRHS >= 0.
+*>          ILO is INTEGER
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in] IHI
 *> \verbatim
-*>          A is COMPLEX*16 array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, A has been destroyed.
-*> \endverbatim
+*>          IHI is INTEGER
 *>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
+*>          ILO and IHI must have the same values as in the previous call
+*>          of ZGEHRD. Q is equal to the unit matrix except in the
+*>          submatrix Q(ilo+1:ihi,ilo+1:ihi).
+*>          If SIDE = 'L', then 1 <= ILO <= IHI <= M, if M > 0, and
+*>          ILO = 1 and IHI = 0, if M = 0;
+*>          if SIDE = 'R', then 1 <= ILO <= IHI <= N, if N > 0, and
+*>          ILO = 1 and IHI = 0, if N = 0.
 *> \endverbatim
 *>
-*> \param[in,out] B
+*> \param[in] A
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
-*>          On entry, the M-by-NRHS right hand side matrix B.
-*>          On exit, B is overwritten by the N-by-NRHS solution matrix X.
-*>          If m >= n and RANK = n, the residual sum-of-squares for
-*>          the solution in the i-th column is given by the sum of
-*>          squares of the modulus of elements n+1:m in that column.
+*>          A is COMPLEX*16 array, dimension
+*>                               (LDA,M) if SIDE = 'L'
+*>                               (LDA,N) if SIDE = 'R'
+*>          The vectors which define the elementary reflectors, as
+*>          returned by ZGEHRD.
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in] LDA
 *> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B.  LDB >= max(1,M,N).
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.
+*>          LDA >= max(1,M) if SIDE = 'L'; LDA >= max(1,N) if SIDE = 'R'.
 *> \endverbatim
 *>
-*> \param[out] S
+*> \param[in] TAU
 *> \verbatim
-*>          S is DOUBLE PRECISION array, dimension (min(M,N))
-*>          The singular values of A in decreasing order.
-*>          The condition number of A in the 2-norm = S(1)/S(min(m,n)).
+*>          TAU is COMPLEX*16 array, dimension
+*>                               (M-1) if SIDE = 'L'
+*>                               (N-1) if SIDE = 'R'
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEHRD.
 *> \endverbatim
 *>
-*> \param[in] RCOND
+*> \param[in,out] C
 *> \verbatim
-*>          RCOND is DOUBLE PRECISION
-*>          RCOND is used to determine the effective rank of A.
-*>          Singular values S(i) <= RCOND*S(1) are treated as zero.
-*>          If RCOND < 0, machine precision is used instead.
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
 *> \endverbatim
 *>
-*> \param[out] RANK
+*> \param[in] LDC
 *> \verbatim
-*>          RANK is INTEGER
-*>          The effective rank of A, i.e., the number of singular values
-*>          which are greater than RCOND*S(1).
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
 *> \param[out] WORK
@@ -34257,56 +53332,24 @@
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK. LWORK must be at least 1.
-*>          The exact minimum amount of workspace needed depends on M,
-*>          N and NRHS. As long as LWORK is at least
-*>              2*N + N*NRHS
-*>          if M is greater than or equal to N or
-*>              2*M + M*NRHS
-*>          if M is less than N, the code will execute correctly.
-*>          For good performance, LWORK should generally be larger.
+*>          The dimension of the array WORK.
+*>          If SIDE = 'L', LWORK >= max(1,N);
+*>          if SIDE = 'R', LWORK >= max(1,M).
+*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
+*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
+*>          blocksize.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the array WORK and the
-*>          minimum sizes of the arrays RWORK and IWORK, and returns
-*>          these values as the first entries of the WORK, RWORK and
-*>          IWORK arrays, and no error message related to LWORK is issued
-*>          by XERBLA.
-*> \endverbatim
-*>
-*> \param[out] RWORK
-*> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension (MAX(1,LRWORK))
-*>          LRWORK >=
-*>             10*N + 2*N*SMLSIZ + 8*N*NLVL + 3*SMLSIZ*NRHS +
-*>             MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
-*>          if M is greater than or equal to N or
-*>             10*M + 2*M*SMLSIZ + 8*M*NLVL + 3*SMLSIZ*NRHS +
-*>             MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
-*>          if M is less than N, the code will execute correctly.
-*>          SMLSIZ is returned by ILAENV and is equal to the maximum
-*>          size of the subproblems at the bottom of the computation
-*>          tree (usually about 25), and
-*>             NLVL = MAX( 0, INT( LOG_2( MIN( M,N )/(SMLSIZ+1) ) ) + 1 )
-*>          On exit, if INFO = 0, RWORK(1) returns the minimum LRWORK.
-*> \endverbatim
-*>
-*> \param[out] IWORK
-*> \verbatim
-*>          IWORK is INTEGER array, dimension (MAX(1,LIWORK))
-*>          LIWORK >= max(1, 3*MINMN*NLVL + 11*MINMN),
-*>          where MINMN = MIN( M,N ).
-*>          On exit, if INFO = 0, IWORK(1) returns the minimum LIWORK.
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: if INFO = -i, the i-th argument had an illegal value.
-*>          > 0:  the algorithm for computing the SVD failed to converge;
-*>                if INFO = i, i off-diagonal elements of an intermediate
-*>                bidiagonal form did not converge to zero.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -34319,458 +53362,417 @@
 *
 *> \date November 2011
 *
-*> \ingroup complex16GEsolve
-*
-*> \par Contributors:
-*  ==================
-*>
-*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
-*>       California at Berkeley, USA \n
-*>     Osni Marques, LBNL/NERSC, USA \n
+*> \ingroup complex16OTHERcomputational
 *
 *  =====================================================================
-      SUBROUTINE ZGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
-     $                   WORK, LWORK, RWORK, IWORK, INFO )
+      SUBROUTINE ZUNMHR( SIDE, TRANS, M, N, ILO, IHI, A, LDA, TAU, C,
+     $                   LDC, WORK, LWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
-      DOUBLE PRECISION   RCOND
+      CHARACTER          SIDE, TRANS
+      INTEGER            IHI, ILO, INFO, LDA, LDC, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            IWORK( * )
-      DOUBLE PRECISION   RWORK( * ), S( * )
-      COMPLEX*16         A( LDA, * ), B( LDB, * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE, TWO
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0, TWO = 2.0D+0 )
-      COMPLEX*16         CZERO
-      PARAMETER          ( CZERO = ( 0.0D+0, 0.0D+0 ) )
-*     ..
 *     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            IASCL, IBSCL, IE, IL, ITAU, ITAUP, ITAUQ,
-     $                   LDWORK, LIWORK, LRWORK, MAXMN, MAXWRK, MINMN,
-     $                   MINWRK, MM, MNTHR, NLVL, NRWORK, NWORK, SMLSIZ
-      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, EPS, SFMIN, SMLNUM
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLABAD, DLASCL, DLASET, XERBLA, ZGEBRD, ZGELQF,
-     $                   ZGEQRF, ZLACPY, ZLALSD, ZLASCL, ZLASET, ZUNMBR,
-     $                   ZUNMLQ, ZUNMQR
+      LOGICAL            LEFT, LQUERY
+      INTEGER            I1, I2, IINFO, LWKOPT, MI, NB, NH, NI, NQ, NW
 *     ..
 *     .. External Functions ..
+      LOGICAL            LSAME
       INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, ZLANGE
-      EXTERNAL           ILAENV, DLAMCH, ZLANGE
+      EXTERNAL           LSAME, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZUNMQR
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          INT, LOG, MAX, MIN, DBLE
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input arguments.
+*     Test the input arguments
 *
       INFO = 0
-      MINMN = MIN( M, N )
-      MAXMN = MAX( M, N )
+      NH = IHI - ILO
+      LEFT = LSAME( SIDE, 'L' )
       LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
+*
+*     NQ is the order of Q and NW is the minimum dimension of WORK
+*
+      IF( LEFT ) THEN
+         NQ = M
+         NW = N
+      ELSE
+         NQ = N
+         NW = M
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+     $          THEN
          INFO = -2
-      ELSE IF( NRHS.LT.0 ) THEN
+      ELSE IF( M.LT.0 ) THEN
          INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, NQ ) ) THEN
          INFO = -5
-      ELSE IF( LDB.LT.MAX( 1, MAXMN ) ) THEN
-         INFO = -7
+      ELSE IF( IHI.LT.MIN( ILO, NQ ) .OR. IHI.GT.NQ ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
+         INFO = -8
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -11
+      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
+         INFO = -13
       END IF
 *
-*     Compute workspace.
-*     (Note: Comments in the code beginning "Workspace:" describe the
-*     minimal amount of workspace needed at that point in the code,
-*     as well as the preferred amount for good performance.
-*     NB refers to the optimal block size for the immediately
-*     following subroutine, as returned by ILAENV.)
-*
       IF( INFO.EQ.0 ) THEN
-         MINWRK = 1
-         MAXWRK = 1
-         LIWORK = 1
-         LRWORK = 1
-         IF( MINMN.GT.0 ) THEN
-            SMLSIZ = ILAENV( 9, 'ZGELSD', ' ', 0, 0, 0, 0 )
-            MNTHR = ILAENV( 6, 'ZGELSD', ' ', M, N, NRHS, -1 )
-            NLVL = MAX( INT( LOG( DBLE( MINMN ) / DBLE( SMLSIZ + 1 ) ) /
-     $                  LOG( TWO ) ) + 1, 0 )
-            LIWORK = 3*MINMN*NLVL + 11*MINMN
-            MM = M
-            IF( M.GE.N .AND. M.GE.MNTHR ) THEN
-*
-*              Path 1a - overdetermined, with many more rows than
-*                        columns.
-*
-               MM = N
-               MAXWRK = MAX( MAXWRK, N*ILAENV( 1, 'ZGEQRF', ' ', M, N,
-     $                       -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, NRHS*ILAENV( 1, 'ZUNMQR', 'LC', M,
-     $                       NRHS, N, -1 ) )
-            END IF
-            IF( M.GE.N ) THEN
-*
-*              Path 1 - overdetermined or exactly determined.
-*
-               LRWORK = 10*N + 2*N*SMLSIZ + 8*N*NLVL + 3*SMLSIZ*NRHS +
-     $                  MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
-               MAXWRK = MAX( MAXWRK, 2*N + ( MM + N )*ILAENV( 1,
-     $                       'ZGEBRD', ' ', MM, N, -1, -1 ) )
-               MAXWRK = MAX( MAXWRK, 2*N + NRHS*ILAENV( 1, 'ZUNMBR',
-     $                       'QLC', MM, NRHS, N, -1 ) )
-               MAXWRK = MAX( MAXWRK, 2*N + ( N - 1 )*ILAENV( 1,
-     $                       'ZUNMBR', 'PLN', N, NRHS, N, -1 ) )
-               MAXWRK = MAX( MAXWRK, 2*N + N*NRHS )
-               MINWRK = MAX( 2*N + MM, 2*N + N*NRHS )
-            END IF
-            IF( N.GT.M ) THEN
-               LRWORK = 10*M + 2*M*SMLSIZ + 8*M*NLVL + 3*SMLSIZ*NRHS +
-     $                  MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS )
-               IF( N.GE.MNTHR ) THEN
-*
-*                 Path 2a - underdetermined, with many more columns
-*                           than rows.
-*
-                  MAXWRK = M + M*ILAENV( 1, 'ZGELQF', ' ', M, N, -1,
-     $                     -1 )
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + 2*M*ILAENV( 1,
-     $                          'ZGEBRD', ' ', M, M, -1, -1 ) )
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + NRHS*ILAENV( 1,
-     $                          'ZUNMBR', 'QLC', M, NRHS, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + ( M - 1 )*ILAENV( 1,
-     $                          'ZUNMLQ', 'LC', N, NRHS, M, -1 ) )
-                  IF( NRHS.GT.1 ) THEN
-                     MAXWRK = MAX( MAXWRK, M*M + M + M*NRHS )
-                  ELSE
-                     MAXWRK = MAX( MAXWRK, M*M + 2*M )
-                  END IF
-                  MAXWRK = MAX( MAXWRK, M*M + 4*M + M*NRHS )
-!     XXX: Ensure the Path 2a case below is triggered.  The workspace
-!     calculation should use queries for all routines eventually.
-                  MAXWRK = MAX( MAXWRK,
-     $                 4*M+M*M+MAX( M, 2*M-4, NRHS, N-3*M ) )
-               ELSE
-*
-*                 Path 2 - underdetermined.
-*
-                  MAXWRK = 2*M + ( N + M )*ILAENV( 1, 'ZGEBRD', ' ', M,
-     $                     N, -1, -1 )
-                  MAXWRK = MAX( MAXWRK, 2*M + NRHS*ILAENV( 1, 'ZUNMBR',
-     $                          'QLC', M, NRHS, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M + M*ILAENV( 1, 'ZUNMBR',
-     $                          'PLN', N, NRHS, M, -1 ) )
-                  MAXWRK = MAX( MAXWRK, 2*M + M*NRHS )
-               END IF
-               MINWRK = MAX( 2*M + N, 2*M + M*NRHS )
-            END IF
-         END IF
-         MINWRK = MIN( MINWRK, MAXWRK )
-         WORK( 1 ) = MAXWRK
-         IWORK( 1 ) = LIWORK
-         RWORK( 1 ) = LRWORK
-*
-         IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
-            INFO = -12
+         IF( LEFT ) THEN
+            NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, NH, N, NH, -1 )
+         ELSE
+            NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, NH, NH, -1 )
          END IF
+         LWKOPT = MAX( 1, NW )*NB
+         WORK( 1 ) = LWKOPT
       END IF
 *
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZGELSD', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         RETURN
-      END IF
-*
-*     Quick return if possible.
-*
-      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
-         RANK = 0
+         CALL XERBLA( 'ZUNMHR', -INFO )
          RETURN
-      END IF
-*
-*     Get machine parameters.
-*
-      EPS = DLAMCH( 'P' )
-      SFMIN = DLAMCH( 'S' )
-      SMLNUM = SFMIN / EPS
-      BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
-*
-*     Scale A if max entry outside range [SMLNUM,BIGNUM].
-*
-      ANRM = ZLANGE( 'M', M, N, A, LDA, RWORK )
-      IASCL = 0
-      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
-*
-*        Scale matrix norm up to SMLNUM
-*
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
-         IASCL = 1
-      ELSE IF( ANRM.GT.BIGNUM ) THEN
-*
-*        Scale matrix norm down to BIGNUM.
-*
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
-         IASCL = 2
-      ELSE IF( ANRM.EQ.ZERO ) THEN
-*
-*        Matrix all zero. Return zero solution.
-*
-         CALL ZLASET( 'F', MAX( M, N ), NRHS, CZERO, CZERO, B, LDB )
-         CALL DLASET( 'F', MINMN, 1, ZERO, ZERO, S, 1 )
-         RANK = 0
-         GO TO 10
-      END IF
-*
-*     Scale B if max entry outside range [SMLNUM,BIGNUM].
-*
-      BNRM = ZLANGE( 'M', M, NRHS, B, LDB, RWORK )
-      IBSCL = 0
-      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
-*
-*        Scale matrix norm up to SMLNUM.
-*
-         CALL ZLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
-         IBSCL = 1
-      ELSE IF( BNRM.GT.BIGNUM ) THEN
-*
-*        Scale matrix norm down to BIGNUM.
-*
-         CALL ZLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
-         IBSCL = 2
-      END IF
-*
-*     If M < N make sure B(M+1:N,:) = 0
-*
-      IF( M.LT.N )
-     $   CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
-*
-*     Overdetermined case.
-*
-      IF( M.GE.N ) THEN
-*
-*        Path 1 - overdetermined or exactly determined.
-*
-         MM = M
-         IF( M.GE.MNTHR ) THEN
-*
-*           Path 1a - overdetermined, with many more rows than columns
-*
-            MM = N
-            ITAU = 1
-            NWORK = ITAU + N
-*
-*           Compute A=Q*R.
-*           (RWorkspace: need N)
-*           (CWorkspace: need N, prefer N*NB)
-*
-            CALL ZGEQRF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                   LWORK-NWORK+1, INFO )
-*
-*           Multiply B by transpose(Q).
-*           (RWorkspace: need N)
-*           (CWorkspace: need NRHS, prefer NRHS*NB)
-*
-            CALL ZUNMQR( 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAU ), B,
-     $                   LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
-*
-*           Zero out below R.
-*
-            IF( N.GT.1 ) THEN
-               CALL ZLASET( 'L', N-1, N-1, CZERO, CZERO, A( 2, 1 ),
-     $                      LDA )
-            END IF
-         END IF
-*
-         ITAUQ = 1
-         ITAUP = ITAUQ + N
-         NWORK = ITAUP + N
-         IE = 1
-         NRWORK = IE + N
-*
-*        Bidiagonalize R in A.
-*        (RWorkspace: need N)
-*        (CWorkspace: need 2*N+MM, prefer 2*N+(MM+N)*NB)
-*
-         CALL ZGEBRD( MM, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                INFO )
-*
-*        Multiply B by transpose of left bidiagonalizing vectors of R.
-*        (CWorkspace: need 2*N+NRHS, prefer 2*N+NRHS*NB)
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', MM, NRHS, N, A, LDA, WORK( ITAUQ ),
-     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*     Quick return if possible
 *
-*        Solve the bidiagonal least squares problem.
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. NH.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-         CALL ZLALSD( 'U', SMLSIZ, N, NRHS, S, RWORK( IE ), B, LDB,
-     $                RCOND, RANK, WORK( NWORK ), RWORK( NRWORK ),
-     $                IWORK, INFO )
-         IF( INFO.NE.0 ) THEN
-            GO TO 10
-         END IF
+      IF( LEFT ) THEN
+         MI = NH
+         NI = N
+         I1 = ILO + 1
+         I2 = 1
+      ELSE
+         MI = M
+         NI = NH
+         I1 = 1
+         I2 = ILO + 1
+      END IF
 *
-*        Multiply B by right bidiagonalizing vectors of R.
+      CALL ZUNMQR( SIDE, TRANS, MI, NI, NH, A( ILO+1, ILO ), LDA,
+     $             TAU( ILO ), C( I1, I2 ), LDC, WORK, LWORK, IINFO )
 *
-         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, N, A, LDA, WORK( ITAUP ),
-     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+      WORK( 1 ) = LWKOPT
+      RETURN
 *
-      ELSE IF( N.GE.MNTHR .AND. LWORK.GE.4*M+M*M+
-     $         MAX( M, 2*M-4, NRHS, N-3*M ) ) THEN
+*     End of ZUNMHR
 *
-*        Path 2a - underdetermined, with many more columns than rows
-*        and sufficient workspace for an efficient algorithm.
+      END
+*> \brief \b ZUNML2 multiplies a general matrix by the unitary matrix from a LQ factorization determined by cgelqf (unblocked algorithm).
 *
-         LDWORK = M
-         IF( LWORK.GE.MAX( 4*M+M*LDA+MAX( M, 2*M-4, NRHS, N-3*M ),
-     $       M*LDA+M+M*NRHS ) )LDWORK = LDA
-         ITAU = 1
-         NWORK = M + 1
+*  =========== DOCUMENTATION ===========
 *
-*        Compute A=L*Q.
-*        (CWorkspace: need 2*M, prefer M+M*NB)
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
 *
-         CALL ZGELQF( M, N, A, LDA, WORK( ITAU ), WORK( NWORK ),
-     $                LWORK-NWORK+1, INFO )
-         IL = NWORK
+*> \htmlonly
+*> Download ZUNML2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunml2.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunml2.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunml2.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
 *
-*        Copy L to WORK(IL), zeroing out above its diagonal.
+*  Definition:
+*  ===========
 *
-         CALL ZLACPY( 'L', M, M, A, LDA, WORK( IL ), LDWORK )
-         CALL ZLASET( 'U', M-1, M-1, CZERO, CZERO, WORK( IL+LDWORK ),
-     $                LDWORK )
-         ITAUQ = IL + LDWORK*M
-         ITAUP = ITAUQ + M
-         NWORK = ITAUP + M
-         IE = 1
-         NRWORK = IE + M
+*       SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+*                          WORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            INFO, K, LDA, LDC, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-*        Bidiagonalize L in WORK(IL).
-*        (RWorkspace: need M)
-*        (CWorkspace: need M*M+4*M, prefer M*M+4*M+2*M*NB)
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> ZUNML2 overwrites the general complex m-by-n matrix C with
+*>
+*>       Q * C  if SIDE = 'L' and TRANS = 'N', or
+*>
+*>       Q**H* C  if SIDE = 'L' and TRANS = 'C', or
+*>
+*>       C * Q  if SIDE = 'R' and TRANS = 'N', or
+*>
+*>       C * Q**H if SIDE = 'R' and TRANS = 'C',
+*>
+*> where Q is a complex unitary matrix defined as the product of k
+*> elementary reflectors
+*>
+*>       Q = H(k)**H . . . H(2)**H H(1)**H
+*>
+*> as returned by ZGELQF. Q is of order m if SIDE = 'L' and of order n
+*> if SIDE = 'R'.
+*> \endverbatim
 *
-         CALL ZGEBRD( M, M, WORK( IL ), LDWORK, S, RWORK( IE ),
-     $                WORK( ITAUQ ), WORK( ITAUP ), WORK( NWORK ),
-     $                LWORK-NWORK+1, INFO )
+*  Arguments:
+*  ==========
 *
-*        Multiply B by transpose of left bidiagonalizing vectors of L.
-*        (CWorkspace: need M*M+4*M+NRHS, prefer M*M+4*M+NRHS*NB)
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left
+*>          = 'R': apply Q or Q**H from the Right
+*> \endverbatim
+*>
+*> \param[in] TRANS
+*> \verbatim
+*>          TRANS is CHARACTER*1
+*>          = 'N': apply Q  (No transpose)
+*>          = 'C': apply Q**H (Conjugate transpose)
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C. N >= 0.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines
+*>          the matrix Q.
+*>          If SIDE = 'L', M >= K >= 0;
+*>          if SIDE = 'R', N >= K >= 0.
+*> \endverbatim
+*>
+*> \param[in] A
+*> \verbatim
+*>          A is COMPLEX*16 array, dimension
+*>                               (LDA,M) if SIDE = 'L',
+*>                               (LDA,N) if SIDE = 'R'
+*>          The i-th row must contain the vector which defines the
+*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
+*>          ZGELQF in the first k rows of its array argument A.
+*>          A is modified by the routine but restored on exit.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,K).
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGELQF.
+*> \endverbatim
+*>
+*> \param[in,out] C
+*> \verbatim
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the m-by-n matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is COMPLEX*16 array, dimension
+*>                                   (N) if SIDE = 'L',
+*>                                   (M) if SIDE = 'R'
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0: successful exit
+*>          < 0: if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, M, WORK( IL ), LDWORK,
-     $                WORK( ITAUQ ), B, LDB, WORK( NWORK ),
-     $                LWORK-NWORK+1, INFO )
+*  Authors:
+*  ========
 *
-*        Solve the bidiagonal least squares problem.
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
 *
-         CALL ZLALSD( 'U', SMLSIZ, M, NRHS, S, RWORK( IE ), B, LDB,
-     $                RCOND, RANK, WORK( NWORK ), RWORK( NRWORK ),
-     $                IWORK, INFO )
-         IF( INFO.NE.0 ) THEN
-            GO TO 10
-         END IF
+*> \date September 2012
 *
-*        Multiply B by right bidiagonalizing vectors of L.
+*> \ingroup complex16OTHERcomputational
 *
-         CALL ZUNMBR( 'P', 'L', 'N', M, NRHS, M, WORK( IL ), LDWORK,
-     $                WORK( ITAUP ), B, LDB, WORK( NWORK ),
-     $                LWORK-NWORK+1, INFO )
+*  =====================================================================
+      SUBROUTINE ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, INFO )
 *
-*        Zero out below first M rows of B.
+*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     September 2012
 *
-         CALL ZLASET( 'F', N-M, NRHS, CZERO, CZERO, B( M+1, 1 ), LDB )
-         NWORK = ITAU + M
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, K, LDA, LDC, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*     ..
 *
-*        Multiply transpose(Q) by B.
-*        (CWorkspace: need NRHS, prefer NRHS*NB)
+*  =====================================================================
 *
-         CALL ZUNMLQ( 'L', 'C', N, NRHS, M, A, LDA, WORK( ITAU ), B,
-     $                LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+*     .. Parameters ..
+      COMPLEX*16         ONE
+      PARAMETER          ( ONE = ( 1.0D+0, 0.0D+0 ) )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LEFT, NOTRAN
+      INTEGER            I, I1, I2, I3, IC, JC, MI, NI, NQ
+      COMPLEX*16         AII, TAUI
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLACGV, ZLARF
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          DCONJG, MAX
+*     ..
+*     .. Executable Statements ..
 *
-      ELSE
+*     Test the input arguments
 *
-*        Path 2 - remaining underdetermined cases.
+      INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
 *
-         ITAUQ = 1
-         ITAUP = ITAUQ + M
-         NWORK = ITAUP + M
-         IE = 1
-         NRWORK = IE + M
+*     NQ is the order of Q
 *
-*        Bidiagonalize A.
-*        (RWorkspace: need M)
-*        (CWorkspace: need 2*M+N, prefer 2*M+(M+N)*NB)
+      IF( LEFT ) THEN
+         NQ = M
+      ELSE
+         NQ = N
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+         INFO = -7
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNML2', -INFO )
+         RETURN
+      END IF
 *
-         CALL ZGEBRD( M, N, A, LDA, S, RWORK( IE ), WORK( ITAUQ ),
-     $                WORK( ITAUP ), WORK( NWORK ), LWORK-NWORK+1,
-     $                INFO )
+*     Quick return if possible
 *
-*        Multiply B by transpose of left bidiagonalizing vectors.
-*        (CWorkspace: need 2*M+NRHS, prefer 2*M+NRHS*NB)
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 )
+     $   RETURN
 *
-         CALL ZUNMBR( 'Q', 'L', 'C', M, NRHS, N, A, LDA, WORK( ITAUQ ),
-     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+      IF( ( LEFT .AND. NOTRAN .OR. .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
+         I1 = 1
+         I2 = K
+         I3 = 1
+      ELSE
+         I1 = K
+         I2 = 1
+         I3 = -1
+      END IF
 *
-*        Solve the bidiagonal least squares problem.
+      IF( LEFT ) THEN
+         NI = N
+         JC = 1
+      ELSE
+         MI = M
+         IC = 1
+      END IF
 *
-         CALL ZLALSD( 'L', SMLSIZ, M, NRHS, S, RWORK( IE ), B, LDB,
-     $                RCOND, RANK, WORK( NWORK ), RWORK( NRWORK ),
-     $                IWORK, INFO )
-         IF( INFO.NE.0 ) THEN
-            GO TO 10
-         END IF
+      DO 10 I = I1, I2, I3
+         IF( LEFT ) THEN
 *
-*        Multiply B by right bidiagonalizing vectors of A.
+*           H(i) or H(i)**H is applied to C(i:m,1:n)
 *
-         CALL ZUNMBR( 'P', 'L', 'N', N, NRHS, M, A, LDA, WORK( ITAUP ),
-     $                B, LDB, WORK( NWORK ), LWORK-NWORK+1, INFO )
+            MI = M - I + 1
+            IC = I
+         ELSE
 *
-      END IF
+*           H(i) or H(i)**H is applied to C(1:m,i:n)
 *
-*     Undo scaling.
+            NI = N - I + 1
+            JC = I
+         END IF
 *
-      IF( IASCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
-         CALL DLASCL( 'G', 0, 0, SMLNUM, ANRM, MINMN, 1, S, MINMN,
-     $                INFO )
-      ELSE IF( IASCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
-         CALL DLASCL( 'G', 0, 0, BIGNUM, ANRM, MINMN, 1, S, MINMN,
-     $                INFO )
-      END IF
-      IF( IBSCL.EQ.1 ) THEN
-         CALL ZLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
-      ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL ZLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
-      END IF
+*        Apply H(i) or H(i)**H
 *
+         IF( NOTRAN ) THEN
+            TAUI = DCONJG( TAU( I ) )
+         ELSE
+            TAUI = TAU( I )
+         END IF
+         IF( I.LT.NQ )
+     $      CALL ZLACGV( NQ-I, A( I, I+1 ), LDA )
+         AII = A( I, I )
+         A( I, I ) = ONE
+         CALL ZLARF( SIDE, MI, NI, A( I, I ), LDA, TAUI, C( IC, JC ),
+     $               LDC, WORK )
+         A( I, I ) = AII
+         IF( I.LT.NQ )
+     $      CALL ZLACGV( NQ-I, A( I, I+1 ), LDA )
    10 CONTINUE
-      WORK( 1 ) = MAXWRK
-      IWORK( 1 ) = LIWORK
-      RWORK( 1 ) = LRWORK
       RETURN
 *
-*     End of ZGELSD
+*     End of ZUNML2
 *
       END
-*> \brief \b ZLALSD uses the singular value decomposition of A to solve the least squares problem.
+*> \brief \b ZUNMLQ
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -34778,30 +53780,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLALSD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlalsd.f"> 
+*> Download ZUNMLQ + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmlq.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlalsd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmlq.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlalsd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmlq.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
-*                          RANK, WORK, RWORK, IWORK, INFO )
+*       SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+*                          WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          UPLO
-*       INTEGER            INFO, LDB, N, NRHS, RANK, SMLSIZ
-*       DOUBLE PRECISION   RCOND
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            IWORK( * )
-*       DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
-*       COMPLEX*16         B( LDB, * ), WORK( * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -34810,131 +53809,120 @@
 *>
 *> \verbatim
 *>
-*> ZLALSD uses the singular value decomposition of A to solve the least
-*> squares problem of finding X to minimize the Euclidean norm of each
-*> column of A*X-B, where A is N-by-N upper bidiagonal, and X and B
-*> are N-by-NRHS. The solution X overwrites B.
+*> ZUNMLQ overwrites the general complex M-by-N matrix C with
 *>
-*> The singular values of A smaller than RCOND times the largest
-*> singular value are treated as zero in solving the least squares
-*> problem; in this case a minimum norm solution is returned.
-*> The actual singular values are returned in D in ascending order.
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q * C          C * Q
+*> TRANS = 'C':      Q**H * C       C * Q**H
 *>
-*> This code makes very mild assumptions about floating point
-*> arithmetic. It will work on machines with a guard digit in
-*> add/subtract, or on those binary machines without guard digits
-*> which subtract like the Cray XMP, Cray YMP, Cray C 90, or Cray 2.
-*> It could conceivably fail on hexadecimal or decimal machines
-*> without guard digits, but we know of none.
+*> where Q is a complex unitary matrix defined as the product of k
+*> elementary reflectors
+*>
+*>       Q = H(k)**H . . . H(2)**H H(1)**H
+*>
+*> as returned by ZGELQF. Q is of order M if SIDE = 'L' and of order N
+*> if SIDE = 'R'.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] UPLO
-*> \verbatim
-*>          UPLO is CHARACTER*1
-*>         = 'U': D and E define an upper bidiagonal matrix.
-*>         = 'L': D and E define a  lower bidiagonal matrix.
-*> \endverbatim
-*>
-*> \param[in] SMLSIZ
+*> \param[in] SIDE
 *> \verbatim
-*>          SMLSIZ is INTEGER
-*>         The maximum size of the subproblems at the bottom of the
-*>         computation tree.
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left;
+*>          = 'R': apply Q or Q**H from the Right.
 *> \endverbatim
 *>
-*> \param[in] N
+*> \param[in] TRANS
 *> \verbatim
-*>          N is INTEGER
-*>         The dimension of the  bidiagonal matrix.  N >= 0.
+*>          TRANS is CHARACTER*1
+*>          = 'N':  No transpose, apply Q;
+*>          = 'C':  Conjugate transpose, apply Q**H.
 *> \endverbatim
 *>
-*> \param[in] NRHS
+*> \param[in] M
 *> \verbatim
-*>          NRHS is INTEGER
-*>         The number of columns of B. NRHS must be at least 1.
+*>          M is INTEGER
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
-*> \param[in,out] D
+*> \param[in] N
 *> \verbatim
-*>          D is DOUBLE PRECISION array, dimension (N)
-*>         On entry D contains the main diagonal of the bidiagonal
-*>         matrix. On exit, if INFO = 0, D contains its singular values.
+*>          N is INTEGER
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
-*> \param[in,out] E
+*> \param[in] K
 *> \verbatim
-*>          E is DOUBLE PRECISION array, dimension (N-1)
-*>         Contains the super-diagonal entries of the bidiagonal matrix.
-*>         On exit, E has been destroyed.
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines
+*>          the matrix Q.
+*>          If SIDE = 'L', M >= K >= 0;
+*>          if SIDE = 'R', N >= K >= 0.
 *> \endverbatim
 *>
-*> \param[in,out] B
+*> \param[in] A
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension (LDB,NRHS)
-*>         On input, B contains the right hand sides of the least
-*>         squares problem. On output, B contains the solution X.
+*>          A is COMPLEX*16 array, dimension
+*>                               (LDA,M) if SIDE = 'L',
+*>                               (LDA,N) if SIDE = 'R'
+*>          The i-th row must contain the vector which defines the
+*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
+*>          ZGELQF in the first k rows of its array argument A.
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in] LDA
 *> \verbatim
-*>          LDB is INTEGER
-*>         The leading dimension of B in the calling subprogram.
-*>         LDB must be at least max(1,N).
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,K).
 *> \endverbatim
 *>
-*> \param[in] RCOND
-*> \verbatim
-*>          RCOND is DOUBLE PRECISION
-*>         The singular values of A less than or equal to RCOND times
-*>         the largest singular value are treated as zero in solving
-*>         the least squares problem. If RCOND is negative,
-*>         machine precision is used instead.
-*>         For example, if diag(S)*X=B were the least squares problem,
-*>         where diag(S) is a diagonal matrix of singular values, the
-*>         solution would be X(i) = B(i) / S(i) if S(i) is greater than
-*>         RCOND*max(S), and X(i) = 0 if S(i) is less than or equal to
-*>         RCOND*max(S).
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGELQF.
 *> \endverbatim
 *>
-*> \param[out] RANK
+*> \param[in,out] C
 *> \verbatim
-*>          RANK is INTEGER
-*>         The number of singular values of A greater than RCOND times
-*>         the largest singular value.
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[in] LDC
 *> \verbatim
-*>          WORK is COMPLEX*16 array, dimension at least
-*>         (N * NRHS).
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
-*> \param[out] RWORK
+*> \param[out] WORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension at least
-*>         (9*N + 2*N*SMLSIZ + 8*N*NLVL + 3*SMLSIZ*NRHS +
-*>         MAX( (SMLSIZ+1)**2, N*(1+NRHS) + 2*NRHS ),
-*>         where
-*>         NLVL = MAX( 0, INT( LOG_2( MIN( M,N )/(SMLSIZ+1) ) ) + 1 )
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[out] IWORK
+*> \param[in] LWORK
 *> \verbatim
-*>          IWORK is INTEGER array, dimension at least
-*>         (3*N*NLVL + 11*N).
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          If SIDE = 'L', LWORK >= max(1,N);
+*>          if SIDE = 'R', LWORK >= max(1,M).
+*>          For good performance, LWORK should generally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>         = 0:  successful exit.
-*>         < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>         > 0:  The algorithm failed to compute a singular value while
-*>               working on the submatrix lying in rows and columns
-*>               INFO/(N+1) through MOD(INFO,N+1).
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -34945,526 +53933,193 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup complex16OTHERcomputational
 *
-*> \par Contributors:
-*  ==================
-*>
-*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
-*>       California at Berkeley, USA \n
-*>     Osni Marques, LBNL/NERSC, USA \n
-*
 *  =====================================================================
-      SUBROUTINE ZLALSD( UPLO, SMLSIZ, N, NRHS, D, E, B, LDB, RCOND,
-     $                   RANK, WORK, RWORK, IWORK, INFO )
+      SUBROUTINE ZUNMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      CHARACTER          UPLO
-      INTEGER            INFO, LDB, N, NRHS, RANK, SMLSIZ
-      DOUBLE PRECISION   RCOND
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            IWORK( * )
-      DOUBLE PRECISION   D( * ), E( * ), RWORK( * )
-      COMPLEX*16         B( LDB, * ), WORK( * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE, TWO
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0, TWO = 2.0D0 )
-      COMPLEX*16         CZERO
-      PARAMETER          ( CZERO = ( 0.0D0, 0.0D0 ) )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            BX, BXST, C, DIFL, DIFR, GIVCOL, GIVNUM,
-     $                   GIVPTR, I, ICMPQ1, ICMPQ2, IRWB, IRWIB, IRWRB,
-     $                   IRWU, IRWVT, IRWWRK, IWK, J, JCOL, JIMAG,
-     $                   JREAL, JROW, K, NLVL, NM1, NRWORK, NSIZE, NSUB,
-     $                   PERM, POLES, S, SIZEI, SMLSZP, SQRE, ST, ST1,
-     $                   U, VT, Z
-      DOUBLE PRECISION   CS, EPS, ORGNRM, RCND, R, SN, TOL
+      LOGICAL            LEFT, LQUERY, NOTRAN
+      CHARACTER          TRANST
+      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWT, JC, LDWORK,
+     $                   LWKOPT, MI, NB, NBMIN, NI, NQ, NW
 *     ..
 *     .. External Functions ..
-      INTEGER            IDAMAX
-      DOUBLE PRECISION   DLAMCH, DLANST
-      EXTERNAL           IDAMAX, DLAMCH, DLANST
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLARTG, DLASCL, DLASDA, DLASDQ, DLASET,
-     $                   DLASRT, XERBLA, ZCOPY, ZDROT, ZLACPY, ZLALSA,
-     $                   ZLASCL, ZLASET
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNML2
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          ABS, DBLE, DCMPLX, DIMAG, INT, LOG, SIGN
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input parameters.
+*     Test the input arguments
 *
       INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
 *
-      IF( N.LT.0 ) THEN
+*     NQ is the order of Q and NW is the minimum dimension of WORK
+*
+      IF( LEFT ) THEN
+         NQ = M
+         NW = N
+      ELSE
+         NQ = N
+         NW = M
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( M.LT.0 ) THEN
          INFO = -3
-      ELSE IF( NRHS.LT.1 ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( ( LDB.LT.1 ) .OR. ( LDB.LT.N ) ) THEN
-         INFO = -8
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZLALSD', -INFO )
-         RETURN
+      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+         INFO = -7
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
+         INFO = -12
       END IF
 *
-      EPS = DLAMCH( 'Epsilon' )
+      IF( INFO.EQ.0 ) THEN
 *
-*     Set up the tolerance.
+*        Compute the workspace requirements
 *
-      IF( ( RCOND.LE.ZERO ) .OR. ( RCOND.GE.ONE ) ) THEN
-         RCND = EPS
-      ELSE
-         RCND = RCOND
+         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMLQ', SIDE // TRANS, M, N, K,
+     $        -1 ) )
+         LWKOPT = MAX( 1, NW )*NB + TSIZE
+         WORK( 1 ) = LWKOPT
       END IF
 *
-      RANK = 0
-*
-*     Quick return if possible.
-*
-      IF( N.EQ.0 ) THEN
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNMLQ', -INFO )
          RETURN
-      ELSE IF( N.EQ.1 ) THEN
-         IF( D( 1 ).EQ.ZERO ) THEN
-            CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B, LDB )
-         ELSE
-            RANK = 1
-            CALL ZLASCL( 'G', 0, 0, D( 1 ), ONE, 1, NRHS, B, LDB, INFO )
-            D( 1 ) = ABS( D( 1 ) )
-         END IF
+      ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
-*     Rotate the matrix if it is lower bidiagonal.
-*
-      IF( UPLO.EQ.'L' ) THEN
-         DO 10 I = 1, N - 1
-            CALL DLARTG( D( I ), E( I ), CS, SN, R )
-            D( I ) = R
-            E( I ) = SN*D( I+1 )
-            D( I+1 ) = CS*D( I+1 )
-            IF( NRHS.EQ.1 ) THEN
-               CALL ZDROT( 1, B( I, 1 ), 1, B( I+1, 1 ), 1, CS, SN )
-            ELSE
-               RWORK( I*2-1 ) = CS
-               RWORK( I*2 ) = SN
-            END IF
-   10    CONTINUE
-         IF( NRHS.GT.1 ) THEN
-            DO 30 I = 1, NRHS
-               DO 20 J = 1, N - 1
-                  CS = RWORK( J*2-1 )
-                  SN = RWORK( J*2 )
-                  CALL ZDROT( 1, B( J, I ), 1, B( J+1, I ), 1, CS, SN )
-   20          CONTINUE
-   30       CONTINUE
-         END IF
-      END IF
-*
-*     Scale.
+*     Quick return if possible
 *
-      NM1 = N - 1
-      ORGNRM = DLANST( 'M', N, D, E )
-      IF( ORGNRM.EQ.ZERO ) THEN
-         CALL ZLASET( 'A', N, NRHS, CZERO, CZERO, B, LDB )
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 ) THEN
+         WORK( 1 ) = 1
          RETURN
       END IF
 *
-      CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, N, 1, D, N, INFO )
-      CALL DLASCL( 'G', 0, 0, ORGNRM, ONE, NM1, 1, E, NM1, INFO )
-*
-*     If N is smaller than the minimum divide size SMLSIZ, then solve
-*     the problem with another solver.
-*
-      IF( N.LE.SMLSIZ ) THEN
-         IRWU = 1
-         IRWVT = IRWU + N*N
-         IRWWRK = IRWVT + N*N
-         IRWRB = IRWWRK
-         IRWIB = IRWRB + N*NRHS
-         IRWB = IRWIB + N*NRHS
-         CALL DLASET( 'A', N, N, ZERO, ONE, RWORK( IRWU ), N )
-         CALL DLASET( 'A', N, N, ZERO, ONE, RWORK( IRWVT ), N )
-         CALL DLASDQ( 'U', 0, N, N, N, 0, D, E, RWORK( IRWVT ), N,
-     $                RWORK( IRWU ), N, RWORK( IRWWRK ), 1,
-     $                RWORK( IRWWRK ), INFO )
-         IF( INFO.NE.0 ) THEN
-            RETURN
+      NBMIN = 2
+      LDWORK = NW
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMLQ', SIDE // TRANS, M, N, K,
+     $              -1 ) )
          END IF
-*
-*        In the real version, B is passed to DLASDQ and multiplied
-*        internally by Q**H. Here B is complex and that product is
-*        computed below in two steps (real and imaginary parts).
-*
-         J = IRWB - 1
-         DO 50 JCOL = 1, NRHS
-            DO 40 JROW = 1, N
-               J = J + 1
-               RWORK( J ) = DBLE( B( JROW, JCOL ) )
-   40       CONTINUE
-   50    CONTINUE
-         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWU ), N,
-     $               RWORK( IRWB ), N, ZERO, RWORK( IRWRB ), N )
-         J = IRWB - 1
-         DO 70 JCOL = 1, NRHS
-            DO 60 JROW = 1, N
-               J = J + 1
-               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-   60       CONTINUE
-   70    CONTINUE
-         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWU ), N,
-     $               RWORK( IRWB ), N, ZERO, RWORK( IRWIB ), N )
-         JREAL = IRWRB - 1
-         JIMAG = IRWIB - 1
-         DO 90 JCOL = 1, NRHS
-            DO 80 JROW = 1, N
-               JREAL = JREAL + 1
-               JIMAG = JIMAG + 1
-               B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                           RWORK( JIMAG ) )
-   80       CONTINUE
-   90    CONTINUE
-*
-         TOL = RCND*ABS( D( IDAMAX( N, D, 1 ) ) )
-         DO 100 I = 1, N
-            IF( D( I ).LE.TOL ) THEN
-               CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, B( I, 1 ), LDB )
-            ELSE
-               CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS, B( I, 1 ),
-     $                      LDB, INFO )
-               RANK = RANK + 1
-            END IF
-  100    CONTINUE
-*
-*        Since B is complex, the following call to DGEMM is performed
-*        in two steps (real and imaginary parts). That is for V * B
-*        (in the real version of the code V**H is stored in WORK).
-*
-*        CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, WORK, N, B, LDB, ZERO,
-*    $               WORK( NWORK ), N )
-*
-         J = IRWB - 1
-         DO 120 JCOL = 1, NRHS
-            DO 110 JROW = 1, N
-               J = J + 1
-               RWORK( J ) = DBLE( B( JROW, JCOL ) )
-  110       CONTINUE
-  120    CONTINUE
-         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWVT ), N,
-     $               RWORK( IRWB ), N, ZERO, RWORK( IRWRB ), N )
-         J = IRWB - 1
-         DO 140 JCOL = 1, NRHS
-            DO 130 JROW = 1, N
-               J = J + 1
-               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-  130       CONTINUE
-  140    CONTINUE
-         CALL DGEMM( 'T', 'N', N, NRHS, N, ONE, RWORK( IRWVT ), N,
-     $               RWORK( IRWB ), N, ZERO, RWORK( IRWIB ), N )
-         JREAL = IRWRB - 1
-         JIMAG = IRWIB - 1
-         DO 160 JCOL = 1, NRHS
-            DO 150 JROW = 1, N
-               JREAL = JREAL + 1
-               JIMAG = JIMAG + 1
-               B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                           RWORK( JIMAG ) )
-  150       CONTINUE
-  160    CONTINUE
-*
-*        Unscale.
-*
-         CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, N, 1, D, N, INFO )
-         CALL DLASRT( 'D', N, D, INFO )
-         CALL ZLASCL( 'G', 0, 0, ORGNRM, ONE, N, NRHS, B, LDB, INFO )
-*
-         RETURN
       END IF
 *
-*     Book-keeping and setting up some constants.
-*
-      NLVL = INT( LOG( DBLE( N ) / DBLE( SMLSIZ+1 ) ) / LOG( TWO ) ) + 1
-*
-      SMLSZP = SMLSIZ + 1
-*
-      U = 1
-      VT = 1 + SMLSIZ*N
-      DIFL = VT + SMLSZP*N
-      DIFR = DIFL + NLVL*N
-      Z = DIFR + NLVL*N*2
-      C = Z + NLVL*N
-      S = C + N
-      POLES = S + N
-      GIVNUM = POLES + 2*NLVL*N
-      NRWORK = GIVNUM + 2*NLVL*N
-      BX = 1
+      IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
 *
-      IRWRB = NRWORK
-      IRWIB = IRWRB + SMLSIZ*NRHS
-      IRWB = IRWIB + SMLSIZ*NRHS
+*        Use unblocked code
 *
-      SIZEI = 1 + N
-      K = SIZEI + N
-      GIVPTR = K + N
-      PERM = GIVPTR + N
-      GIVCOL = PERM + NLVL*N
-      IWK = GIVCOL + NLVL*N*2
+         CALL ZUNML2( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+     $                IINFO )
+      ELSE
 *
-      ST = 1
-      SQRE = 0
-      ICMPQ1 = 1
-      ICMPQ2 = 0
-      NSUB = 0
+*        Use blocked code
 *
-      DO 170 I = 1, N
-         IF( ABS( D( I ) ).LT.EPS ) THEN
-            D( I ) = SIGN( EPS, D( I ) )
+         IWT = 1 + NW*NB
+         IF( ( LEFT .AND. NOTRAN ) .OR.
+     $       ( .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
+            I1 = 1
+            I2 = K
+            I3 = NB
+         ELSE
+            I1 = ( ( K-1 ) / NB )*NB + 1
+            I2 = 1
+            I3 = -NB
          END IF
-  170 CONTINUE
-*
-      DO 240 I = 1, NM1
-         IF( ( ABS( E( I ) ).LT.EPS ) .OR. ( I.EQ.NM1 ) ) THEN
-            NSUB = NSUB + 1
-            IWORK( NSUB ) = ST
-*
-*           Subproblem found. First determine its size and then
-*           apply divide and conquer on it.
-*
-            IF( I.LT.NM1 ) THEN
-*
-*              A subproblem with E(I) small for I < NM1.
-*
-               NSIZE = I - ST + 1
-               IWORK( SIZEI+NSUB-1 ) = NSIZE
-            ELSE IF( ABS( E( I ) ).GE.EPS ) THEN
-*
-*              A subproblem with E(NM1) not too small but I = NM1.
-*
-               NSIZE = N - ST + 1
-               IWORK( SIZEI+NSUB-1 ) = NSIZE
-            ELSE
-*
-*              A subproblem with E(NM1) small. This implies an
-*              1-by-1 subproblem at D(N), which is not solved
-*              explicitly.
-*
-               NSIZE = I - ST + 1
-               IWORK( SIZEI+NSUB-1 ) = NSIZE
-               NSUB = NSUB + 1
-               IWORK( NSUB ) = N
-               IWORK( SIZEI+NSUB-1 ) = 1
-               CALL ZCOPY( NRHS, B( N, 1 ), LDB, WORK( BX+NM1 ), N )
-            END IF
-            ST1 = ST - 1
-            IF( NSIZE.EQ.1 ) THEN
-*
-*              This is a 1-by-1 subproblem and is not solved
-*              explicitly.
-*
-               CALL ZCOPY( NRHS, B( ST, 1 ), LDB, WORK( BX+ST1 ), N )
-            ELSE IF( NSIZE.LE.SMLSIZ ) THEN
-*
-*              This is a small subproblem and is solved by DLASDQ.
-*
-               CALL DLASET( 'A', NSIZE, NSIZE, ZERO, ONE,
-     $                      RWORK( VT+ST1 ), N )
-               CALL DLASET( 'A', NSIZE, NSIZE, ZERO, ONE,
-     $                      RWORK( U+ST1 ), N )
-               CALL DLASDQ( 'U', 0, NSIZE, NSIZE, NSIZE, 0, D( ST ),
-     $                      E( ST ), RWORK( VT+ST1 ), N, RWORK( U+ST1 ),
-     $                      N, RWORK( NRWORK ), 1, RWORK( NRWORK ),
-     $                      INFO )
-               IF( INFO.NE.0 ) THEN
-                  RETURN
-               END IF
-*
-*              In the real version, B is passed to DLASDQ and multiplied
-*              internally by Q**H. Here B is complex and that product is
-*              computed below in two steps (real and imaginary parts).
-*
-               J = IRWB - 1
-               DO 190 JCOL = 1, NRHS
-                  DO 180 JROW = ST, ST + NSIZE - 1
-                     J = J + 1
-                     RWORK( J ) = DBLE( B( JROW, JCOL ) )
-  180             CONTINUE
-  190          CONTINUE
-               CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
-     $                     RWORK( U+ST1 ), N, RWORK( IRWB ), NSIZE,
-     $                     ZERO, RWORK( IRWRB ), NSIZE )
-               J = IRWB - 1
-               DO 210 JCOL = 1, NRHS
-                  DO 200 JROW = ST, ST + NSIZE - 1
-                     J = J + 1
-                     RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-  200             CONTINUE
-  210          CONTINUE
-               CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
-     $                     RWORK( U+ST1 ), N, RWORK( IRWB ), NSIZE,
-     $                     ZERO, RWORK( IRWIB ), NSIZE )
-               JREAL = IRWRB - 1
-               JIMAG = IRWIB - 1
-               DO 230 JCOL = 1, NRHS
-                  DO 220 JROW = ST, ST + NSIZE - 1
-                     JREAL = JREAL + 1
-                     JIMAG = JIMAG + 1
-                     B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                                 RWORK( JIMAG ) )
-  220             CONTINUE
-  230          CONTINUE
 *
-               CALL ZLACPY( 'A', NSIZE, NRHS, B( ST, 1 ), LDB,
-     $                      WORK( BX+ST1 ), N )
-            ELSE
-*
-*              A large problem. Solve it using divide and conquer.
-*
-               CALL DLASDA( ICMPQ1, SMLSIZ, NSIZE, SQRE, D( ST ),
-     $                      E( ST ), RWORK( U+ST1 ), N, RWORK( VT+ST1 ),
-     $                      IWORK( K+ST1 ), RWORK( DIFL+ST1 ),
-     $                      RWORK( DIFR+ST1 ), RWORK( Z+ST1 ),
-     $                      RWORK( POLES+ST1 ), IWORK( GIVPTR+ST1 ),
-     $                      IWORK( GIVCOL+ST1 ), N, IWORK( PERM+ST1 ),
-     $                      RWORK( GIVNUM+ST1 ), RWORK( C+ST1 ),
-     $                      RWORK( S+ST1 ), RWORK( NRWORK ),
-     $                      IWORK( IWK ), INFO )
-               IF( INFO.NE.0 ) THEN
-                  RETURN
-               END IF
-               BXST = BX + ST1
-               CALL ZLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, B( ST, 1 ),
-     $                      LDB, WORK( BXST ), N, RWORK( U+ST1 ), N,
-     $                      RWORK( VT+ST1 ), IWORK( K+ST1 ),
-     $                      RWORK( DIFL+ST1 ), RWORK( DIFR+ST1 ),
-     $                      RWORK( Z+ST1 ), RWORK( POLES+ST1 ),
-     $                      IWORK( GIVPTR+ST1 ), IWORK( GIVCOL+ST1 ), N,
-     $                      IWORK( PERM+ST1 ), RWORK( GIVNUM+ST1 ),
-     $                      RWORK( C+ST1 ), RWORK( S+ST1 ),
-     $                      RWORK( NRWORK ), IWORK( IWK ), INFO )
-               IF( INFO.NE.0 ) THEN
-                  RETURN
-               END IF
-            END IF
-            ST = I + 1
+         IF( LEFT ) THEN
+            NI = N
+            JC = 1
+         ELSE
+            MI = M
+            IC = 1
          END IF
-  240 CONTINUE
-*
-*     Apply the singular values and treat the tiny ones as zero.
-*
-      TOL = RCND*ABS( D( IDAMAX( N, D, 1 ) ) )
-*
-      DO 250 I = 1, N
-*
-*        Some of the elements in D can be negative because 1-by-1
-*        subproblems were not solved explicitly.
 *
-         IF( ABS( D( I ) ).LE.TOL ) THEN
-            CALL ZLASET( 'A', 1, NRHS, CZERO, CZERO, WORK( BX+I-1 ), N )
+         IF( NOTRAN ) THEN
+            TRANST = 'C'
          ELSE
-            RANK = RANK + 1
-            CALL ZLASCL( 'G', 0, 0, D( I ), ONE, 1, NRHS,
-     $                   WORK( BX+I-1 ), N, INFO )
+            TRANST = 'N'
          END IF
-         D( I ) = ABS( D( I ) )
-  250 CONTINUE
 *
-*     Now apply back the right singular vectors.
+         DO 10 I = I1, I2, I3
+            IB = MIN( NB, K-I+1 )
+*
+*           Form the triangular factor of the block reflector
+*           H = H(i) H(i+1) . . . H(i+ib-1)
+*
+            CALL ZLARFT( 'Forward', 'Rowwise', NQ-I+1, IB, A( I, I ),
+     $                   LDA, TAU( I ), WORK( IWT ), LDT )
+            IF( LEFT ) THEN
 *
-      ICMPQ2 = 1
-      DO 320 I = 1, NSUB
-         ST = IWORK( I )
-         ST1 = ST - 1
-         NSIZE = IWORK( SIZEI+I-1 )
-         BXST = BX + ST1
-         IF( NSIZE.EQ.1 ) THEN
-            CALL ZCOPY( NRHS, WORK( BXST ), N, B( ST, 1 ), LDB )
-         ELSE IF( NSIZE.LE.SMLSIZ ) THEN
+*              H or H**H is applied to C(i:m,1:n)
 *
-*           Since B and BX are complex, the following call to DGEMM
-*           is performed in two steps (real and imaginary parts).
+               MI = M - I + 1
+               IC = I
+            ELSE
 *
-*           CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
-*    $                  RWORK( VT+ST1 ), N, RWORK( BXST ), N, ZERO,
-*    $                  B( ST, 1 ), LDB )
+*              H or H**H is applied to C(1:m,i:n)
 *
-            J = BXST - N - 1
-            JREAL = IRWB - 1
-            DO 270 JCOL = 1, NRHS
-               J = J + N
-               DO 260 JROW = 1, NSIZE
-                  JREAL = JREAL + 1
-                  RWORK( JREAL ) = DBLE( WORK( J+JROW ) )
-  260          CONTINUE
-  270       CONTINUE
-            CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
-     $                  RWORK( VT+ST1 ), N, RWORK( IRWB ), NSIZE, ZERO,
-     $                  RWORK( IRWRB ), NSIZE )
-            J = BXST - N - 1
-            JIMAG = IRWB - 1
-            DO 290 JCOL = 1, NRHS
-               J = J + N
-               DO 280 JROW = 1, NSIZE
-                  JIMAG = JIMAG + 1
-                  RWORK( JIMAG ) = DIMAG( WORK( J+JROW ) )
-  280          CONTINUE
-  290       CONTINUE
-            CALL DGEMM( 'T', 'N', NSIZE, NRHS, NSIZE, ONE,
-     $                  RWORK( VT+ST1 ), N, RWORK( IRWB ), NSIZE, ZERO,
-     $                  RWORK( IRWIB ), NSIZE )
-            JREAL = IRWRB - 1
-            JIMAG = IRWIB - 1
-            DO 310 JCOL = 1, NRHS
-               DO 300 JROW = ST, ST + NSIZE - 1
-                  JREAL = JREAL + 1
-                  JIMAG = JIMAG + 1
-                  B( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                              RWORK( JIMAG ) )
-  300          CONTINUE
-  310       CONTINUE
-         ELSE
-            CALL ZLALSA( ICMPQ2, SMLSIZ, NSIZE, NRHS, WORK( BXST ), N,
-     $                   B( ST, 1 ), LDB, RWORK( U+ST1 ), N,
-     $                   RWORK( VT+ST1 ), IWORK( K+ST1 ),
-     $                   RWORK( DIFL+ST1 ), RWORK( DIFR+ST1 ),
-     $                   RWORK( Z+ST1 ), RWORK( POLES+ST1 ),
-     $                   IWORK( GIVPTR+ST1 ), IWORK( GIVCOL+ST1 ), N,
-     $                   IWORK( PERM+ST1 ), RWORK( GIVNUM+ST1 ),
-     $                   RWORK( C+ST1 ), RWORK( S+ST1 ),
-     $                   RWORK( NRWORK ), IWORK( IWK ), INFO )
-            IF( INFO.NE.0 ) THEN
-               RETURN
+               NI = N - I + 1
+               JC = I
             END IF
-         END IF
-  320 CONTINUE
-*
-*     Unscale and sort the singular values.
 *
-      CALL DLASCL( 'G', 0, 0, ONE, ORGNRM, N, 1, D, N, INFO )
-      CALL DLASRT( 'D', N, D, INFO )
-      CALL ZLASCL( 'G', 0, 0, ORGNRM, ONE, N, NRHS, B, LDB, INFO )
+*           Apply H or H**H
 *
+            CALL ZLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
+     $                   A( I, I ), LDA, WORK( IWT ), LDT,
+     $                   C( IC, JC ), LDC, WORK, LDWORK )
+   10    CONTINUE
+      END IF
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZLALSD
+*     End of ZUNMLQ
 *
       END
-*> \brief \b ZLALSA computes the SVD of the coefficient matrix in compact form. Used by sgelsd.
+*> \brief \b ZUNMQL
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -35472,34 +54127,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLALSA + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlalsa.f"> 
+*> Download ZUNMQL + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmql.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlalsa.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmql.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlalsa.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmql.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
-*                          LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
-*                          GIVCOL, LDGCOL, PERM, GIVNUM, C, S, RWORK,
-*                          IWORK, INFO )
+*       SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+*                          WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            ICOMPQ, INFO, LDB, LDBX, LDGCOL, LDU, N, NRHS,
-*      $                   SMLSIZ
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            GIVCOL( LDGCOL, * ), GIVPTR( * ), IWORK( * ),
-*      $                   K( * ), PERM( LDGCOL, * )
-*       DOUBLE PRECISION   C( * ), DIFL( LDU, * ), DIFR( LDU, * ),
-*      $                   GIVNUM( LDU, * ), POLES( LDU, * ), RWORK( * ),
-*      $                   S( * ), U( LDU, * ), VT( LDU, * ), Z( LDU, * )
-*       COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -35508,205 +54156,459 @@
 *>
 *> \verbatim
 *>
-*> ZLALSA is an itermediate step in solving the least squares problem
-*> by computing the SVD of the coefficient matrix in compact form (The
-*> singular vectors are computed as products of simple orthorgonal
-*> matrices.).
+*> ZUNMQL overwrites the general complex M-by-N matrix C with
 *>
-*> If ICOMPQ = 0, ZLALSA applies the inverse of the left singular vector
-*> matrix of an upper bidiagonal matrix to the right hand side; and if
-*> ICOMPQ = 1, ZLALSA applies the right singular vector matrix to the
-*> right hand side. The singular vector matrices were generated in
-*> compact form by ZLALSA.
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q * C          C * Q
+*> TRANS = 'C':      Q**H * C       C * Q**H
+*>
+*> where Q is a complex unitary matrix defined as the product of k
+*> elementary reflectors
+*>
+*>       Q = H(k) . . . H(2) H(1)
+*>
+*> as returned by ZGEQLF. Q is of order M if SIDE = 'L' and of order N
+*> if SIDE = 'R'.
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] ICOMPQ
+*> \param[in] SIDE
 *> \verbatim
-*>          ICOMPQ is INTEGER
-*>         Specifies whether the left or the right singular vector
-*>         matrix is involved.
-*>         = 0: Left singular vector matrix
-*>         = 1: Right singular vector matrix
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left;
+*>          = 'R': apply Q or Q**H from the Right.
 *> \endverbatim
 *>
-*> \param[in] SMLSIZ
+*> \param[in] TRANS
 *> \verbatim
-*>          SMLSIZ is INTEGER
-*>         The maximum size of the subproblems at the bottom of the
-*>         computation tree.
+*>          TRANS is CHARACTER*1
+*>          = 'N':  No transpose, apply Q;
+*>          = 'C':  Transpose, apply Q**H.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>         The row and column dimensions of the upper bidiagonal matrix.
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] NRHS
+*> \param[in] K
 *> \verbatim
-*>          NRHS is INTEGER
-*>         The number of columns of B and BX. NRHS must be at least 1.
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines
+*>          the matrix Q.
+*>          If SIDE = 'L', M >= K >= 0;
+*>          if SIDE = 'R', N >= K >= 0.
 *> \endverbatim
 *>
-*> \param[in,out] B
+*> \param[in] A
 *> \verbatim
-*>          B is COMPLEX*16 array, dimension ( LDB, NRHS )
-*>         On input, B contains the right hand sides of the least
-*>         squares problem in rows 1 through M.
-*>         On output, B contains the solution X in rows 1 through N.
+*>          A is COMPLEX*16 array, dimension (LDA,K)
+*>          The i-th column must contain the vector which defines the
+*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
+*>          ZGEQLF in the last k columns of its array argument A.
 *> \endverbatim
 *>
-*> \param[in] LDB
+*> \param[in] LDA
 *> \verbatim
-*>          LDB is INTEGER
-*>         The leading dimension of B in the calling subprogram.
-*>         LDB must be at least max(1,MAX( M, N ) ).
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.
+*>          If SIDE = 'L', LDA >= max(1,M);
+*>          if SIDE = 'R', LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[out] BX
+*> \param[in] TAU
 *> \verbatim
-*>          BX is COMPLEX*16 array, dimension ( LDBX, NRHS )
-*>         On exit, the result of applying the left or right singular
-*>         vector matrix to B.
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEQLF.
 *> \endverbatim
 *>
-*> \param[in] LDBX
+*> \param[in,out] C
 *> \verbatim
-*>          LDBX is INTEGER
-*>         The leading dimension of BX.
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
 *> \endverbatim
 *>
-*> \param[in] U
+*> \param[in] LDC
 *> \verbatim
-*>          U is DOUBLE PRECISION array, dimension ( LDU, SMLSIZ ).
-*>         On entry, U contains the left singular vector matrices of all
-*>         subproblems at the bottom level.
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in] LDU
+*> \param[out] WORK
 *> \verbatim
-*>          LDU is INTEGER, LDU = > N.
-*>         The leading dimension of arrays U, VT, DIFL, DIFR,
-*>         POLES, GIVNUM, and Z.
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] VT
+*> \param[in] LWORK
 *> \verbatim
-*>          VT is DOUBLE PRECISION array, dimension ( LDU, SMLSIZ+1 ).
-*>         On entry, VT**H contains the right singular vector matrices of
-*>         all subproblems at the bottom level.
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          If SIDE = 'L', LWORK >= max(1,N);
+*>          if SIDE = 'R', LWORK >= max(1,M).
+*>          For good performance, LWORK should genreally be larger.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[out] INFO
 *> \verbatim
-*>          K is INTEGER array, dimension ( N ).
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup complex16OTHERcomputational
+*
+*  =====================================================================
+      SUBROUTINE ZUNMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, LWORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+*     ..
+*     .. Array Arguments ..
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            LEFT, LQUERY, NOTRAN
+      INTEGER            I, I1, I2, I3, IB, IINFO, IWT, LDWORK, LWKOPT,
+     $                   MI, NB, NBMIN, NI, NQ, NW
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNM2L
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments
+*
+      INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
+*
+*     NQ is the order of Q and NW is the minimum dimension of WORK
+*
+      IF( LEFT ) THEN
+         NQ = M
+         NW = MAX( 1, N )
+      ELSE
+         NQ = N
+         NW = MAX( 1, M )
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
+         INFO = -2
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
+         INFO = -7
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      ELSE IF( LWORK.LT.NW .AND. .NOT.LQUERY ) THEN
+         INFO = -12
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+*
+*        Compute the workspace requirements
+*
+         IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+            LWKOPT = 1
+         ELSE
+            NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQL', SIDE // TRANS, M, N,
+     $                               K, -1 ) )
+            LWKOPT = NW*NB + TSIZE
+         END IF
+         WORK( 1 ) = LWKOPT
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNMQL', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( M.EQ.0 .OR. N.EQ.0 ) THEN
+         RETURN
+      END IF
+*
+      NBMIN = 2
+      LDWORK = NW
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQL', SIDE // TRANS, M, N, K,
+     $              -1 ) )
+         END IF
+      END IF
+*
+      IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
+*
+*        Use unblocked code
+*
+         CALL ZUNM2L( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+     $                IINFO )
+      ELSE
+*
+*        Use blocked code
+*
+         IWT = 1 + NW*NB
+         IF( ( LEFT .AND. NOTRAN ) .OR.
+     $       ( .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
+            I1 = 1
+            I2 = K
+            I3 = NB
+         ELSE
+            I1 = ( ( K-1 ) / NB )*NB + 1
+            I2 = 1
+            I3 = -NB
+         END IF
+*
+         IF( LEFT ) THEN
+            NI = N
+         ELSE
+            MI = M
+         END IF
+*
+         DO 10 I = I1, I2, I3
+            IB = MIN( NB, K-I+1 )
+*
+*           Form the triangular factor of the block reflector
+*           H = H(i+ib-1) . . . H(i+1) H(i)
+*
+            CALL ZLARFT( 'Backward', 'Columnwise', NQ-K+I+IB-1, IB,
+     $                   A( 1, I ), LDA, TAU( I ), WORK( IWT ), LDT )
+            IF( LEFT ) THEN
+*
+*              H or H**H is applied to C(1:m-k+i+ib-1,1:n)
+*
+               MI = M - K + I + IB - 1
+            ELSE
+*
+*              H or H**H is applied to C(1:m,1:n-k+i+ib-1)
+*
+               NI = N - K + I + IB - 1
+            END IF
+*
+*           Apply H or H**H
+*
+            CALL ZLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI, NI,
+     $                   IB, A( 1, I ), LDA, WORK( IWT ), LDT, C, LDC,
+     $                   WORK, LDWORK )
+   10    CONTINUE
+      END IF
+      WORK( 1 ) = LWKOPT
+      RETURN
+*
+*     End of ZUNMQL
+*
+      END
+*> \brief \b ZUNMQR
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download ZUNMQR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmqr.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmqr.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmqr.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+*                          WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE, TRANS
+*       INTEGER            INFO, K, LDA, LDC, LWORK, M, N
+*       ..
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
 *>
-*> \param[in] DIFL
 *> \verbatim
-*>          DIFL is DOUBLE PRECISION array, dimension ( LDU, NLVL ).
-*>         where NLVL = INT(log_2 (N/(SMLSIZ+1))) + 1.
+*>
+*> ZUNMQR overwrites the general complex M-by-N matrix C with
+*>
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q * C          C * Q
+*> TRANS = 'C':      Q**H * C       C * Q**H
+*>
+*> where Q is a complex unitary matrix defined as the product of k
+*> elementary reflectors
+*>
+*>       Q = H(1) H(2) . . . H(k)
+*>
+*> as returned by ZGEQRF. Q is of order M if SIDE = 'L' and of order N
+*> if SIDE = 'R'.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left;
+*>          = 'R': apply Q or Q**H from the Right.
 *> \endverbatim
 *>
-*> \param[in] DIFR
+*> \param[in] TRANS
 *> \verbatim
-*>          DIFR is DOUBLE PRECISION array, dimension ( LDU, 2 * NLVL ).
-*>         On entry, DIFL(*, I) and DIFR(*, 2 * I -1) record
-*>         distances between singular values on the I-th level and
-*>         singular values on the (I -1)-th level, and DIFR(*, 2 * I)
-*>         record the normalizing factors of the right singular vectors
-*>         matrices of subproblems on I-th level.
+*>          TRANS is CHARACTER*1
+*>          = 'N':  No transpose, apply Q;
+*>          = 'C':  Conjugate transpose, apply Q**H.
 *> \endverbatim
 *>
-*> \param[in] Z
+*> \param[in] M
 *> \verbatim
-*>          Z is DOUBLE PRECISION array, dimension ( LDU, NLVL ).
-*>         On entry, Z(1, I) contains the components of the deflation-
-*>         adjusted updating row vector for subproblems on the I-th
-*>         level.
+*>          M is INTEGER
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
-*> \param[in] POLES
+*> \param[in] N
 *> \verbatim
-*>          POLES is DOUBLE PRECISION array, dimension ( LDU, 2 * NLVL ).
-*>         On entry, POLES(*, 2 * I -1: 2 * I) contains the new and old
-*>         singular values involved in the secular equations on the I-th
-*>         level.
+*>          N is INTEGER
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] GIVPTR
+*> \param[in] K
 *> \verbatim
-*>          GIVPTR is INTEGER array, dimension ( N ).
-*>         On entry, GIVPTR( I ) records the number of Givens
-*>         rotations performed on the I-th problem on the computation
-*>         tree.
+*>          K is INTEGER
+*>          The number of elementary reflectors whose product defines
+*>          the matrix Q.
+*>          If SIDE = 'L', M >= K >= 0;
+*>          if SIDE = 'R', N >= K >= 0.
 *> \endverbatim
 *>
-*> \param[in] GIVCOL
+*> \param[in] A
 *> \verbatim
-*>          GIVCOL is INTEGER array, dimension ( LDGCOL, 2 * NLVL ).
-*>         On entry, for each I, GIVCOL(*, 2 * I - 1: 2 * I) records the
-*>         locations of Givens rotations performed on the I-th level on
-*>         the computation tree.
+*>          A is COMPLEX*16 array, dimension (LDA,K)
+*>          The i-th column must contain the vector which defines the
+*>          elementary reflector H(i), for i = 1,2,...,k, as returned by
+*>          ZGEQRF in the first k columns of its array argument A.
 *> \endverbatim
 *>
-*> \param[in] LDGCOL
+*> \param[in] LDA
 *> \verbatim
-*>          LDGCOL is INTEGER, LDGCOL = > N.
-*>         The leading dimension of arrays GIVCOL and PERM.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.
+*>          If SIDE = 'L', LDA >= max(1,M);
+*>          if SIDE = 'R', LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] PERM
+*> \param[in] TAU
 *> \verbatim
-*>          PERM is INTEGER array, dimension ( LDGCOL, NLVL ).
-*>         On entry, PERM(*, I) records permutations done on the I-th
-*>         level of the computation tree.
+*>          TAU is COMPLEX*16 array, dimension (K)
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZGEQRF.
 *> \endverbatim
 *>
-*> \param[in] GIVNUM
+*> \param[in,out] C
 *> \verbatim
-*>          GIVNUM is DOUBLE PRECISION array, dimension ( LDU, 2 * NLVL ).
-*>         On entry, GIVNUM(*, 2 *I -1 : 2 * I) records the C- and S-
-*>         values of Givens rotations performed on the I-th level on the
-*>         computation tree.
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
 *> \endverbatim
 *>
-*> \param[in] C
+*> \param[in] LDC
 *> \verbatim
-*>          C is DOUBLE PRECISION array, dimension ( N ).
-*>         On entry, if the I-th subproblem is not square,
-*>         C( I ) contains the C-value of a Givens rotation related to
-*>         the right null space of the I-th subproblem.
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in] S
+*> \param[out] WORK
 *> \verbatim
-*>          S is DOUBLE PRECISION array, dimension ( N ).
-*>         On entry, if the I-th subproblem is not square,
-*>         S( I ) contains the S-value of a Givens rotation related to
-*>         the right null space of the I-th subproblem.
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[out] RWORK
+*> \param[in] LWORK
 *> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension at least
-*>         MAX( (SMLSZ+1)*NRHS*3, N*(1+NRHS) + 2*NRHS ).
-*> \endverbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          If SIDE = 'L', LWORK >= max(1,N);
+*>          if SIDE = 'R', LWORK >= max(1,M).
+*>          For good performance, LWORK should generally be larger.
 *>
-*> \param[out] IWORK
-*> \verbatim
-*>          IWORK is INTEGER array.
-*>         The dimension must be at least 3 * N
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit.
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -35717,390 +54619,186 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup complex16OTHERcomputational
 *
-*> \par Contributors:
-*  ==================
-*>
-*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
-*>       California at Berkeley, USA \n
-*>     Osni Marques, LBNL/NERSC, USA \n
-*
 *  =====================================================================
-      SUBROUTINE ZLALSA( ICOMPQ, SMLSIZ, N, NRHS, B, LDB, BX, LDBX, U,
-     $                   LDU, VT, K, DIFL, DIFR, Z, POLES, GIVPTR,
-     $                   GIVCOL, LDGCOL, PERM, GIVNUM, C, S, RWORK,
-     $                   IWORK, INFO )
+      SUBROUTINE ZUNMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
+     $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      INTEGER            ICOMPQ, INFO, LDB, LDBX, LDGCOL, LDU, N, NRHS,
-     $                   SMLSIZ
+      CHARACTER          SIDE, TRANS
+      INTEGER            INFO, K, LDA, LDC, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            GIVCOL( LDGCOL, * ), GIVPTR( * ), IWORK( * ),
-     $                   K( * ), PERM( LDGCOL, * )
-      DOUBLE PRECISION   C( * ), DIFL( LDU, * ), DIFR( LDU, * ),
-     $                   GIVNUM( LDU, * ), POLES( LDU, * ), RWORK( * ),
-     $                   S( * ), U( LDU, * ), VT( LDU, * ), Z( LDU, * )
-      COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, I1, IC, IM1, INODE, J, JCOL, JIMAG, JREAL,
-     $                   JROW, LF, LL, LVL, LVL2, ND, NDB1, NDIML,
-     $                   NDIMR, NL, NLF, NLP1, NLVL, NR, NRF, NRP1, SQRE
+      LOGICAL            LEFT, LQUERY, NOTRAN
+      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWT, JC, LDWORK,
+     $                   LWKOPT, MI, NB, NBMIN, NI, NQ, NW
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DLASDT, XERBLA, ZCOPY, ZLALS0
+      EXTERNAL           XERBLA, ZLARFB, ZLARFT, ZUNM2R
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, DIMAG
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input parameters.
+*     Test the input arguments
 *
       INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      NOTRAN = LSAME( TRANS, 'N' )
+      LQUERY = ( LWORK.EQ.-1 )
 *
-      IF( ( ICOMPQ.LT.0 ) .OR. ( ICOMPQ.GT.1 ) ) THEN
+*     NQ is the order of Q and NW is the minimum dimension of WORK
+*
+      IF( LEFT ) THEN
+         NQ = M
+         NW = N
+      ELSE
+         NQ = N
+         NW = M
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( SMLSIZ.LT.3 ) THEN
+      ELSE IF( .NOT.NOTRAN .AND. .NOT.LSAME( TRANS, 'C' ) ) THEN
          INFO = -2
-      ELSE IF( N.LT.SMLSIZ ) THEN
+      ELSE IF( M.LT.0 ) THEN
          INFO = -3
-      ELSE IF( NRHS.LT.1 ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -4
-      ELSE IF( LDB.LT.N ) THEN
-         INFO = -6
-      ELSE IF( LDBX.LT.N ) THEN
-         INFO = -8
-      ELSE IF( LDU.LT.N ) THEN
+      ELSE IF( K.LT.0 .OR. K.GT.NQ ) THEN
+         INFO = -5
+      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
+         INFO = -7
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
          INFO = -10
-      ELSE IF( LDGCOL.LT.N ) THEN
-         INFO = -19
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZLALSA', -INFO )
-         RETURN
+      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
+         INFO = -12
       END IF
 *
-*     Book-keeping and  setting up the computation tree.
-*
-      INODE = 1
-      NDIML = INODE + N
-      NDIMR = NDIML + N
-*
-      CALL DLASDT( N, NLVL, ND, IWORK( INODE ), IWORK( NDIML ),
-     $             IWORK( NDIMR ), SMLSIZ )
+      IF( INFO.EQ.0 ) THEN
 *
-*     The following code applies back the left singular vector factors.
-*     For applying back the right singular vector factors, go to 170.
+*        Compute the workspace requirements
 *
-      IF( ICOMPQ.EQ.1 ) THEN
-         GO TO 170
+         NB = MIN( NBMAX, ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N, K,
+     $        -1 ) )
+         LWKOPT = MAX( 1, NW )*NB + TSIZE
+         WORK( 1 ) = LWKOPT
       END IF
 *
-*     The nodes on the bottom level of the tree were solved
-*     by DLASDQ. The corresponding left and right singular vector
-*     matrices are in explicit form. First apply back the left
-*     singular vector matrices.
-*
-      NDB1 = ( ND+1 ) / 2
-      DO 130 I = NDB1, ND
-*
-*        IC : center row of each node
-*        NL : number of rows of left  subproblem
-*        NR : number of rows of right subproblem
-*        NLF: starting row of the left   subproblem
-*        NRF: starting row of the right  subproblem
-*
-         I1 = I - 1
-         IC = IWORK( INODE+I1 )
-         NL = IWORK( NDIML+I1 )
-         NR = IWORK( NDIMR+I1 )
-         NLF = IC - NL
-         NRF = IC + 1
-*
-*        Since B and BX are complex, the following call to DGEMM
-*        is performed in two steps (real and imaginary parts).
-*
-*        CALL DGEMM( 'T', 'N', NL, NRHS, NL, ONE, U( NLF, 1 ), LDU,
-*     $               B( NLF, 1 ), LDB, ZERO, BX( NLF, 1 ), LDBX )
-*
-         J = NL*NRHS*2
-         DO 20 JCOL = 1, NRHS
-            DO 10 JROW = NLF, NLF + NL - 1
-               J = J + 1
-               RWORK( J ) = DBLE( B( JROW, JCOL ) )
-   10       CONTINUE
-   20    CONTINUE
-         CALL DGEMM( 'T', 'N', NL, NRHS, NL, ONE, U( NLF, 1 ), LDU,
-     $               RWORK( 1+NL*NRHS*2 ), NL, ZERO, RWORK( 1 ), NL )
-         J = NL*NRHS*2
-         DO 40 JCOL = 1, NRHS
-            DO 30 JROW = NLF, NLF + NL - 1
-               J = J + 1
-               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-   30       CONTINUE
-   40    CONTINUE
-         CALL DGEMM( 'T', 'N', NL, NRHS, NL, ONE, U( NLF, 1 ), LDU,
-     $               RWORK( 1+NL*NRHS*2 ), NL, ZERO, RWORK( 1+NL*NRHS ),
-     $               NL )
-         JREAL = 0
-         JIMAG = NL*NRHS
-         DO 60 JCOL = 1, NRHS
-            DO 50 JROW = NLF, NLF + NL - 1
-               JREAL = JREAL + 1
-               JIMAG = JIMAG + 1
-               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                            RWORK( JIMAG ) )
-   50       CONTINUE
-   60    CONTINUE
-*
-*        Since B and BX are complex, the following call to DGEMM
-*        is performed in two steps (real and imaginary parts).
-*
-*        CALL DGEMM( 'T', 'N', NR, NRHS, NR, ONE, U( NRF, 1 ), LDU,
-*    $               B( NRF, 1 ), LDB, ZERO, BX( NRF, 1 ), LDBX )
-*
-         J = NR*NRHS*2
-         DO 80 JCOL = 1, NRHS
-            DO 70 JROW = NRF, NRF + NR - 1
-               J = J + 1
-               RWORK( J ) = DBLE( B( JROW, JCOL ) )
-   70       CONTINUE
-   80    CONTINUE
-         CALL DGEMM( 'T', 'N', NR, NRHS, NR, ONE, U( NRF, 1 ), LDU,
-     $               RWORK( 1+NR*NRHS*2 ), NR, ZERO, RWORK( 1 ), NR )
-         J = NR*NRHS*2
-         DO 100 JCOL = 1, NRHS
-            DO 90 JROW = NRF, NRF + NR - 1
-               J = J + 1
-               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-   90       CONTINUE
-  100    CONTINUE
-         CALL DGEMM( 'T', 'N', NR, NRHS, NR, ONE, U( NRF, 1 ), LDU,
-     $               RWORK( 1+NR*NRHS*2 ), NR, ZERO, RWORK( 1+NR*NRHS ),
-     $               NR )
-         JREAL = 0
-         JIMAG = NR*NRHS
-         DO 120 JCOL = 1, NRHS
-            DO 110 JROW = NRF, NRF + NR - 1
-               JREAL = JREAL + 1
-               JIMAG = JIMAG + 1
-               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                            RWORK( JIMAG ) )
-  110       CONTINUE
-  120    CONTINUE
-*
-  130 CONTINUE
-*
-*     Next copy the rows of B that correspond to unchanged rows
-*     in the bidiagonal matrix to BX.
-*
-      DO 140 I = 1, ND
-         IC = IWORK( INODE+I-1 )
-         CALL ZCOPY( NRHS, B( IC, 1 ), LDB, BX( IC, 1 ), LDBX )
-  140 CONTINUE
-*
-*     Finally go through the left singular vector matrices of all
-*     the other subproblems bottom-up on the tree.
-*
-      J = 2**NLVL
-      SQRE = 0
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNMQR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-      DO 160 LVL = NLVL, 1, -1
-         LVL2 = 2*LVL - 1
+*     Quick return if possible
 *
-*        find the first node LF and last node LL on
-*        the current level LVL
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. K.EQ.0 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-         IF( LVL.EQ.1 ) THEN
-            LF = 1
-            LL = 1
-         ELSE
-            LF = 2**( LVL-1 )
-            LL = 2*LF - 1
+      NBMIN = 2
+      LDWORK = NW
+      IF( NB.GT.1 .AND. NB.LT.K ) THEN
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
+            NBMIN = MAX( 2, ILAENV( 2, 'ZUNMQR', SIDE // TRANS, M, N, K,
+     $              -1 ) )
          END IF
-         DO 150 I = LF, LL
-            IM1 = I - 1
-            IC = IWORK( INODE+IM1 )
-            NL = IWORK( NDIML+IM1 )
-            NR = IWORK( NDIMR+IM1 )
-            NLF = IC - NL
-            NRF = IC + 1
-            J = J - 1
-            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, BX( NLF, 1 ), LDBX,
-     $                   B( NLF, 1 ), LDB, PERM( NLF, LVL ),
-     $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
-     $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
-     $                   DIFL( NLF, LVL ), DIFR( NLF, LVL2 ),
-     $                   Z( NLF, LVL ), K( J ), C( J ), S( J ), RWORK,
-     $                   INFO )
-  150    CONTINUE
-  160 CONTINUE
-      GO TO 330
-*
-*     ICOMPQ = 1: applying back the right singular vector factors.
+      END IF
 *
-  170 CONTINUE
+      IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
 *
-*     First now go through the right singular vector matrices of all
-*     the tree nodes top-down.
+*        Use unblocked code
 *
-      J = 0
-      DO 190 LVL = 1, NLVL
-         LVL2 = 2*LVL - 1
+         CALL ZUNM2R( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC, WORK,
+     $                IINFO )
+      ELSE
 *
-*        Find the first node LF and last node LL on
-*        the current level LVL.
+*        Use blocked code
 *
-         IF( LVL.EQ.1 ) THEN
-            LF = 1
-            LL = 1
+         IWT = 1 + NW*NB
+         IF( ( LEFT .AND. .NOT.NOTRAN ) .OR.
+     $       ( .NOT.LEFT .AND. NOTRAN ) ) THEN
+            I1 = 1
+            I2 = K
+            I3 = NB
          ELSE
-            LF = 2**( LVL-1 )
-            LL = 2*LF - 1
+            I1 = ( ( K-1 ) / NB )*NB + 1
+            I2 = 1
+            I3 = -NB
          END IF
-         DO 180 I = LL, LF, -1
-            IM1 = I - 1
-            IC = IWORK( INODE+IM1 )
-            NL = IWORK( NDIML+IM1 )
-            NR = IWORK( NDIMR+IM1 )
-            NLF = IC - NL
-            NRF = IC + 1
-            IF( I.EQ.LL ) THEN
-               SQRE = 0
-            ELSE
-               SQRE = 1
-            END IF
-            J = J + 1
-            CALL ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B( NLF, 1 ), LDB,
-     $                   BX( NLF, 1 ), LDBX, PERM( NLF, LVL ),
-     $                   GIVPTR( J ), GIVCOL( NLF, LVL2 ), LDGCOL,
-     $                   GIVNUM( NLF, LVL2 ), LDU, POLES( NLF, LVL2 ),
-     $                   DIFL( NLF, LVL ), DIFR( NLF, LVL2 ),
-     $                   Z( NLF, LVL ), K( J ), C( J ), S( J ), RWORK,
-     $                   INFO )
-  180    CONTINUE
-  190 CONTINUE
-*
-*     The nodes on the bottom level of the tree were solved
-*     by DLASDQ. The corresponding right singular vector
-*     matrices are in explicit form. Apply them back.
 *
-      NDB1 = ( ND+1 ) / 2
-      DO 320 I = NDB1, ND
-         I1 = I - 1
-         IC = IWORK( INODE+I1 )
-         NL = IWORK( NDIML+I1 )
-         NR = IWORK( NDIMR+I1 )
-         NLP1 = NL + 1
-         IF( I.EQ.ND ) THEN
-            NRP1 = NR
+         IF( LEFT ) THEN
+            NI = N
+            JC = 1
          ELSE
-            NRP1 = NR + 1
+            MI = M
+            IC = 1
          END IF
-         NLF = IC - NL
-         NRF = IC + 1
 *
-*        Since B and BX are complex, the following call to DGEMM is
-*        performed in two steps (real and imaginary parts).
+         DO 10 I = I1, I2, I3
+            IB = MIN( NB, K-I+1 )
 *
-*        CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
-*    $               B( NLF, 1 ), LDB, ZERO, BX( NLF, 1 ), LDBX )
+*           Form the triangular factor of the block reflector
+*           H = H(i) H(i+1) . . . H(i+ib-1)
 *
-         J = NLP1*NRHS*2
-         DO 210 JCOL = 1, NRHS
-            DO 200 JROW = NLF, NLF + NLP1 - 1
-               J = J + 1
-               RWORK( J ) = DBLE( B( JROW, JCOL ) )
-  200       CONTINUE
-  210    CONTINUE
-         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
-     $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO, RWORK( 1 ),
-     $               NLP1 )
-         J = NLP1*NRHS*2
-         DO 230 JCOL = 1, NRHS
-            DO 220 JROW = NLF, NLF + NLP1 - 1
-               J = J + 1
-               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-  220       CONTINUE
-  230    CONTINUE
-         CALL DGEMM( 'T', 'N', NLP1, NRHS, NLP1, ONE, VT( NLF, 1 ), LDU,
-     $               RWORK( 1+NLP1*NRHS*2 ), NLP1, ZERO,
-     $               RWORK( 1+NLP1*NRHS ), NLP1 )
-         JREAL = 0
-         JIMAG = NLP1*NRHS
-         DO 250 JCOL = 1, NRHS
-            DO 240 JROW = NLF, NLF + NLP1 - 1
-               JREAL = JREAL + 1
-               JIMAG = JIMAG + 1
-               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                            RWORK( JIMAG ) )
-  240       CONTINUE
-  250    CONTINUE
+            CALL ZLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
+     $                   LDA, TAU( I ), WORK( IWT ), LDT )
+            IF( LEFT ) THEN
 *
-*        Since B and BX are complex, the following call to DGEMM is
-*        performed in two steps (real and imaginary parts).
+*              H or H**H is applied to C(i:m,1:n)
 *
-*        CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
-*    $               B( NRF, 1 ), LDB, ZERO, BX( NRF, 1 ), LDBX )
+               MI = M - I + 1
+               IC = I
+            ELSE
 *
-         J = NRP1*NRHS*2
-         DO 270 JCOL = 1, NRHS
-            DO 260 JROW = NRF, NRF + NRP1 - 1
-               J = J + 1
-               RWORK( J ) = DBLE( B( JROW, JCOL ) )
-  260       CONTINUE
-  270    CONTINUE
-         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
-     $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO, RWORK( 1 ),
-     $               NRP1 )
-         J = NRP1*NRHS*2
-         DO 290 JCOL = 1, NRHS
-            DO 280 JROW = NRF, NRF + NRP1 - 1
-               J = J + 1
-               RWORK( J ) = DIMAG( B( JROW, JCOL ) )
-  280       CONTINUE
-  290    CONTINUE
-         CALL DGEMM( 'T', 'N', NRP1, NRHS, NRP1, ONE, VT( NRF, 1 ), LDU,
-     $               RWORK( 1+NRP1*NRHS*2 ), NRP1, ZERO,
-     $               RWORK( 1+NRP1*NRHS ), NRP1 )
-         JREAL = 0
-         JIMAG = NRP1*NRHS
-         DO 310 JCOL = 1, NRHS
-            DO 300 JROW = NRF, NRF + NRP1 - 1
-               JREAL = JREAL + 1
-               JIMAG = JIMAG + 1
-               BX( JROW, JCOL ) = DCMPLX( RWORK( JREAL ),
-     $                            RWORK( JIMAG ) )
-  300       CONTINUE
-  310    CONTINUE
+*              H or H**H is applied to C(1:m,i:n)
 *
-  320 CONTINUE
+               NI = N - I + 1
+               JC = I
+            END IF
 *
-  330 CONTINUE
+*           Apply H or H**H
 *
+            CALL ZLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
+     $                   IB, A( I, I ), LDA, WORK( IWT ), LDT,
+     $                   C( IC, JC ), LDC, WORK, LDWORK )
+   10    CONTINUE
+      END IF
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZLALSA
+*     End of ZUNMQR
 *
       END
-*> \brief \b ZLALS0 applies back multiplying factors in solving the least squares problem using divide and conquer SVD approach. Used by sgelsd.
+*> \brief \b ZUNMTR
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -36108,244 +54806,153 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download ZLALS0 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zlals0.f"> 
+*> Download ZUNMTR + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/zunmtr.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zlals0.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/zunmtr.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zlals0.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/zunmtr.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
-*                          PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
-*                          POLES, DIFL, DIFR, Z, K, C, S, RWORK, INFO )
+*       SUBROUTINE ZUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
+*                          WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            GIVPTR, ICOMPQ, INFO, K, LDB, LDBX, LDGCOL,
-*      $                   LDGNUM, NL, NR, NRHS, SQRE
-*       DOUBLE PRECISION   C, S
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            GIVCOL( LDGCOL, * ), PERM( * )
-*       DOUBLE PRECISION   DIFL( * ), DIFR( LDGNUM, * ),
-*      $                   GIVNUM( LDGNUM, * ), POLES( LDGNUM, * ),
-*      $                   RWORK( * ), Z( * )
-*       COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+*       CHARACTER          SIDE, TRANS, UPLO
+*       INTEGER            INFO, LDA, LDC, LWORK, M, N
 *       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> ZLALS0 applies back the multiplying factors of either the left or the
-*> right singular vector matrix of a diagonal matrix appended by a row
-*> to the right hand side matrix B in solving the least squares problem
-*> using the divide-and-conquer SVD approach.
-*>
-*> For the left singular vector matrix, three types of orthogonal
-*> matrices are involved:
-*>
-*> (1L) Givens rotations: the number of such rotations is GIVPTR; the
-*>      pairs of columns/rows they were applied to are stored in GIVCOL;
-*>      and the C- and S-values of these rotations are stored in GIVNUM.
-*>
-*> (2L) Permutation. The (NL+1)-st row of B is to be moved to the first
-*>      row, and for J=2:N, PERM(J)-th row of B is to be moved to the
-*>      J-th row.
-*>
-*> (3L) The left singular vector matrix of the remaining matrix.
-*>
-*> For the right singular vector matrix, four types of orthogonal
-*> matrices are involved:
-*>
-*> (1R) The right singular vector matrix of the remaining matrix.
-*>
-*> (2R) If SQRE = 1, one extra Givens rotation to generate the right
-*>      null space.
-*>
-*> (3R) The inverse transformation of (2L).
-*>
-*> (4R) The inverse transformation of (1L).
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
+*       .. Array Arguments ..
+*       COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
+*       ..
+*  
 *
-*> \param[in] ICOMPQ
-*> \verbatim
-*>          ICOMPQ is INTEGER
-*>         Specifies whether singular vectors are to be computed in
-*>         factored form:
-*>         = 0: Left singular vector matrix.
-*>         = 1: Right singular vector matrix.
-*> \endverbatim
-*>
-*> \param[in] NL
-*> \verbatim
-*>          NL is INTEGER
-*>         The row dimension of the upper block. NL >= 1.
-*> \endverbatim
-*>
-*> \param[in] NR
-*> \verbatim
-*>          NR is INTEGER
-*>         The row dimension of the lower block. NR >= 1.
-*> \endverbatim
-*>
-*> \param[in] SQRE
-*> \verbatim
-*>          SQRE is INTEGER
-*>         = 0: the lower block is an NR-by-NR square matrix.
-*>         = 1: the lower block is an NR-by-(NR+1) rectangular matrix.
-*>
-*>         The bidiagonal matrix has row dimension N = NL + NR + 1,
-*>         and column dimension M = N + SQRE.
-*> \endverbatim
+*> \par Purpose:
+*  =============
 *>
-*> \param[in] NRHS
 *> \verbatim
-*>          NRHS is INTEGER
-*>         The number of columns of B and BX. NRHS must be at least 1.
-*> \endverbatim
 *>
-*> \param[in,out] B
-*> \verbatim
-*>          B is COMPLEX*16 array, dimension ( LDB, NRHS )
-*>         On input, B contains the right hand sides of the least
-*>         squares problem in rows 1 through M. On output, B contains
-*>         the solution X in rows 1 through N.
-*> \endverbatim
+*> ZUNMTR overwrites the general complex M-by-N matrix C with
 *>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>         The leading dimension of B. LDB must be at least
-*>         max(1,MAX( M, N ) ).
-*> \endverbatim
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q * C          C * Q
+*> TRANS = 'C':      Q**H * C       C * Q**H
 *>
-*> \param[out] BX
-*> \verbatim
-*>          BX is COMPLEX*16 array, dimension ( LDBX, NRHS )
-*> \endverbatim
+*> where Q is a complex unitary matrix of order nq, with nq = m if
+*> SIDE = 'L' and nq = n if SIDE = 'R'. Q is defined as the product of
+*> nq-1 elementary reflectors, as returned by ZHETRD:
 *>
-*> \param[in] LDBX
-*> \verbatim
-*>          LDBX is INTEGER
-*>         The leading dimension of BX.
-*> \endverbatim
+*> if UPLO = 'U', Q = H(nq-1) . . . H(2) H(1);
 *>
-*> \param[in] PERM
-*> \verbatim
-*>          PERM is INTEGER array, dimension ( N )
-*>         The permutations (from deflation and sorting) applied
-*>         to the two blocks.
+*> if UPLO = 'L', Q = H(1) H(2) . . . H(nq-1).
 *> \endverbatim
-*>
-*> \param[in] GIVPTR
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
 *> \verbatim
-*>          GIVPTR is INTEGER
-*>         The number of Givens rotations which took place in this
-*>         subproblem.
+*>          SIDE is CHARACTER*1
+*>          = 'L': apply Q or Q**H from the Left;
+*>          = 'R': apply Q or Q**H from the Right.
 *> \endverbatim
 *>
-*> \param[in] GIVCOL
+*> \param[in] UPLO
 *> \verbatim
-*>          GIVCOL is INTEGER array, dimension ( LDGCOL, 2 )
-*>         Each pair of numbers indicates a pair of rows/columns
-*>         involved in a Givens rotation.
+*>          UPLO is CHARACTER*1
+*>          = 'U': Upper triangle of A contains elementary reflectors
+*>                 from ZHETRD;
+*>          = 'L': Lower triangle of A contains elementary reflectors
+*>                 from ZHETRD.
 *> \endverbatim
 *>
-*> \param[in] LDGCOL
+*> \param[in] TRANS
 *> \verbatim
-*>          LDGCOL is INTEGER
-*>         The leading dimension of GIVCOL, must be at least N.
+*>          TRANS is CHARACTER*1
+*>          = 'N':  No transpose, apply Q;
+*>          = 'C':  Conjugate transpose, apply Q**H.
 *> \endverbatim
 *>
-*> \param[in] GIVNUM
+*> \param[in] M
 *> \verbatim
-*>          GIVNUM is DOUBLE PRECISION array, dimension ( LDGNUM, 2 )
-*>         Each number indicates the C or S value used in the
-*>         corresponding Givens rotation.
+*>          M is INTEGER
+*>          The number of rows of the matrix C. M >= 0.
 *> \endverbatim
 *>
-*> \param[in] LDGNUM
+*> \param[in] N
 *> \verbatim
-*>          LDGNUM is INTEGER
-*>         The leading dimension of arrays DIFR, POLES and
-*>         GIVNUM, must be at least K.
+*>          N is INTEGER
+*>          The number of columns of the matrix C. N >= 0.
 *> \endverbatim
 *>
-*> \param[in] POLES
+*> \param[in] A
 *> \verbatim
-*>          POLES is DOUBLE PRECISION array, dimension ( LDGNUM, 2 )
-*>         On entry, POLES(1:K, 1) contains the new singular
-*>         values obtained from solving the secular equation, and
-*>         POLES(1:K, 2) is an array containing the poles in the secular
-*>         equation.
+*>          A is COMPLEX*16 array, dimension
+*>                               (LDA,M) if SIDE = 'L'
+*>                               (LDA,N) if SIDE = 'R'
+*>          The vectors which define the elementary reflectors, as
+*>          returned by ZHETRD.
 *> \endverbatim
 *>
-*> \param[in] DIFL
+*> \param[in] LDA
 *> \verbatim
-*>          DIFL is DOUBLE PRECISION array, dimension ( K ).
-*>         On entry, DIFL(I) is the distance between I-th updated
-*>         (undeflated) singular value and the I-th (undeflated) old
-*>         singular value.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.
+*>          LDA >= max(1,M) if SIDE = 'L'; LDA >= max(1,N) if SIDE = 'R'.
 *> \endverbatim
 *>
-*> \param[in] DIFR
+*> \param[in] TAU
 *> \verbatim
-*>          DIFR is DOUBLE PRECISION array, dimension ( LDGNUM, 2 ).
-*>         On entry, DIFR(I, 1) contains the distances between I-th
-*>         updated (undeflated) singular value and the I+1-th
-*>         (undeflated) old singular value. And DIFR(I, 2) is the
-*>         normalizing factor for the I-th right singular vector.
+*>          TAU is COMPLEX*16 array, dimension
+*>                               (M-1) if SIDE = 'L'
+*>                               (N-1) if SIDE = 'R'
+*>          TAU(i) must contain the scalar factor of the elementary
+*>          reflector H(i), as returned by ZHETRD.
 *> \endverbatim
 *>
-*> \param[in] Z
+*> \param[in,out] C
 *> \verbatim
-*>          Z is DOUBLE PRECISION array, dimension ( K )
-*>         Contain the components of the deflation-adjusted updating row
-*>         vector.
+*>          C is COMPLEX*16 array, dimension (LDC,N)
+*>          On entry, the M-by-N matrix C.
+*>          On exit, C is overwritten by Q*C or Q**H*C or C*Q**H or C*Q.
 *> \endverbatim
 *>
-*> \param[in] K
+*> \param[in] LDC
 *> \verbatim
-*>          K is INTEGER
-*>         Contains the dimension of the non-deflated matrix,
-*>         This is the order of the related secular equation. 1 <= K <=N.
+*>          LDC is INTEGER
+*>          The leading dimension of the array C. LDC >= max(1,M).
 *> \endverbatim
 *>
-*> \param[in] C
+*> \param[out] WORK
 *> \verbatim
-*>          C is DOUBLE PRECISION
-*>         C contains garbage if SQRE =0 and the C-value of a Givens
-*>         rotation related to the right null space if SQRE = 1.
+*>          WORK is COMPLEX*16 array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
-*> \param[in] S
+*> \param[in] LWORK
 *> \verbatim
-*>          S is DOUBLE PRECISION
-*>         S contains garbage if SQRE =0 and the S-value of a Givens
-*>         rotation related to the right null space if SQRE = 1.
-*> \endverbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          If SIDE = 'L', LWORK >= max(1,N);
+*>          if SIDE = 'R', LWORK >= max(1,M).
+*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
+*>          LWORK >=M*NB if SIDE = 'R', where NB is the optimal
+*>          blocksize.
 *>
-*> \param[out] RWORK
-*> \verbatim
-*>          RWORK is DOUBLE PRECISION array, dimension
-*>         ( K*(1+NRHS) + 2*NRHS )
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit.
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
 *> \endverbatim
 *
 *  Authors:
@@ -36356,306 +54963,148 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
 *> \ingroup complex16OTHERcomputational
 *
-*> \par Contributors:
-*  ==================
-*>
-*>     Ming Gu and Ren-Cang Li, Computer Science Division, University of
-*>       California at Berkeley, USA \n
-*>     Osni Marques, LBNL/NERSC, USA \n
-*
 *  =====================================================================
-      SUBROUTINE ZLALS0( ICOMPQ, NL, NR, SQRE, NRHS, B, LDB, BX, LDBX,
-     $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
-     $                   POLES, DIFL, DIFR, Z, K, C, S, RWORK, INFO )
+      SUBROUTINE ZUNMTR( SIDE, UPLO, TRANS, M, N, A, LDA, TAU, C, LDC,
+     $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            GIVPTR, ICOMPQ, INFO, K, LDB, LDBX, LDGCOL,
-     $                   LDGNUM, NL, NR, NRHS, SQRE
-      DOUBLE PRECISION   C, S
+      CHARACTER          SIDE, TRANS, UPLO
+      INTEGER            INFO, LDA, LDC, LWORK, M, N
 *     ..
 *     .. Array Arguments ..
-      INTEGER            GIVCOL( LDGCOL, * ), PERM( * )
-      DOUBLE PRECISION   DIFL( * ), DIFR( LDGNUM, * ),
-     $                   GIVNUM( LDGNUM, * ), POLES( LDGNUM, * ),
-     $                   RWORK( * ), Z( * )
-      COMPLEX*16         B( LDB, * ), BX( LDBX, * )
+      COMPLEX*16         A( LDA, * ), C( LDC, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO, NEGONE
-      PARAMETER          ( ONE = 1.0D0, ZERO = 0.0D0, NEGONE = -1.0D0 )
-*     ..
 *     .. Local Scalars ..
-      INTEGER            I, J, JCOL, JROW, M, N, NLP1
-      DOUBLE PRECISION   DIFLJ, DIFRJ, DJ, DSIGJ, DSIGJP, TEMP
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DGEMV, XERBLA, ZCOPY, ZDROT, ZDSCAL, ZLACPY,
-     $                   ZLASCL
+      LOGICAL            LEFT, LQUERY, UPPER
+      INTEGER            I1, I2, IINFO, LWKOPT, MI, NB, NI, NQ, NW
 *     ..
 *     .. External Functions ..
-      DOUBLE PRECISION   DLAMC3, DNRM2
-      EXTERNAL           DLAMC3, DNRM2
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      EXTERNAL           LSAME, ILAENV
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           XERBLA, ZUNMQL, ZUNMQR
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, DIMAG, MAX
+      INTRINSIC          MAX
 *     ..
 *     .. Executable Statements ..
 *
-*     Test the input parameters.
+*     Test the input arguments
 *
       INFO = 0
+      LEFT = LSAME( SIDE, 'L' )
+      UPPER = LSAME( UPLO, 'U' )
+      LQUERY = ( LWORK.EQ.-1 )
 *
-      IF( ( ICOMPQ.LT.0 ) .OR. ( ICOMPQ.GT.1 ) ) THEN
+*     NQ is the order of Q and NW is the minimum dimension of WORK
+*
+      IF( LEFT ) THEN
+         NQ = M
+         NW = N
+      ELSE
+         NQ = N
+         NW = M
+      END IF
+      IF( .NOT.LEFT .AND. .NOT.LSAME( SIDE, 'R' ) ) THEN
          INFO = -1
-      ELSE IF( NL.LT.1 ) THEN
+      ELSE IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
          INFO = -2
-      ELSE IF( NR.LT.1 ) THEN
+      ELSE IF( .NOT.LSAME( TRANS, 'N' ) .AND. .NOT.LSAME( TRANS, 'C' ) )
+     $          THEN
          INFO = -3
-      ELSE IF( ( SQRE.LT.0 ) .OR. ( SQRE.GT.1 ) ) THEN
+      ELSE IF( M.LT.0 ) THEN
          INFO = -4
-      END IF
-*
-      N = NL + NR + 1
-*
-      IF( NRHS.LT.1 ) THEN
+      ELSE IF( N.LT.0 ) THEN
          INFO = -5
-      ELSE IF( LDB.LT.N ) THEN
+      ELSE IF( LDA.LT.MAX( 1, NQ ) ) THEN
          INFO = -7
-      ELSE IF( LDBX.LT.N ) THEN
-         INFO = -9
-      ELSE IF( GIVPTR.LT.0 ) THEN
-         INFO = -11
-      ELSE IF( LDGCOL.LT.N ) THEN
-         INFO = -13
-      ELSE IF( LDGNUM.LT.N ) THEN
-         INFO = -15
-      ELSE IF( K.LT.1 ) THEN
-         INFO = -20
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'ZLALS0', -INFO )
-         RETURN
+      ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
+         INFO = -12
       END IF
 *
-      M = N + SQRE
-      NLP1 = NL + 1
-*
-      IF( ICOMPQ.EQ.0 ) THEN
-*
-*        Apply back orthogonal transformations from the left.
-*
-*        Step (1L): apply back the Givens rotations performed.
-*
-         DO 10 I = 1, GIVPTR
-            CALL ZDROT( NRHS, B( GIVCOL( I, 2 ), 1 ), LDB,
-     $                  B( GIVCOL( I, 1 ), 1 ), LDB, GIVNUM( I, 2 ),
-     $                  GIVNUM( I, 1 ) )
-   10    CONTINUE
-*
-*        Step (2L): permute rows of B.
-*
-         CALL ZCOPY( NRHS, B( NLP1, 1 ), LDB, BX( 1, 1 ), LDBX )
-         DO 20 I = 2, N
-            CALL ZCOPY( NRHS, B( PERM( I ), 1 ), LDB, BX( I, 1 ), LDBX )
-   20    CONTINUE
-*
-*        Step (3L): apply the inverse of the left singular vector
-*        matrix to BX.
-*
-         IF( K.EQ.1 ) THEN
-            CALL ZCOPY( NRHS, BX, LDBX, B, LDB )
-            IF( Z( 1 ).LT.ZERO ) THEN
-               CALL ZDSCAL( NRHS, NEGONE, B, LDB )
+      IF( INFO.EQ.0 ) THEN
+         IF( UPPER ) THEN
+            IF( LEFT ) THEN
+               NB = ILAENV( 1, 'ZUNMQL', SIDE // TRANS, M-1, N, M-1,
+     $              -1 )
+            ELSE
+               NB = ILAENV( 1, 'ZUNMQL', SIDE // TRANS, M, N-1, N-1,
+     $              -1 )
             END IF
          ELSE
-            DO 100 J = 1, K
-               DIFLJ = DIFL( J )
-               DJ = POLES( J, 1 )
-               DSIGJ = -POLES( J, 2 )
-               IF( J.LT.K ) THEN
-                  DIFRJ = -DIFR( J, 1 )
-                  DSIGJP = -POLES( J+1, 2 )
-               END IF
-               IF( ( Z( J ).EQ.ZERO ) .OR. ( POLES( J, 2 ).EQ.ZERO ) )
-     $              THEN
-                  RWORK( J ) = ZERO
-               ELSE
-                  RWORK( J ) = -POLES( J, 2 )*Z( J ) / DIFLJ /
-     $                         ( POLES( J, 2 )+DJ )
-               END IF
-               DO 30 I = 1, J - 1
-                  IF( ( Z( I ).EQ.ZERO ) .OR.
-     $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
-                     RWORK( I ) = ZERO
-                  ELSE
-                     RWORK( I ) = POLES( I, 2 )*Z( I ) /
-     $                            ( DLAMC3( POLES( I, 2 ), DSIGJ )-
-     $                            DIFLJ ) / ( POLES( I, 2 )+DJ )
-                  END IF
-   30          CONTINUE
-               DO 40 I = J + 1, K
-                  IF( ( Z( I ).EQ.ZERO ) .OR.
-     $                ( POLES( I, 2 ).EQ.ZERO ) ) THEN
-                     RWORK( I ) = ZERO
-                  ELSE
-                     RWORK( I ) = POLES( I, 2 )*Z( I ) /
-     $                            ( DLAMC3( POLES( I, 2 ), DSIGJP )+
-     $                            DIFRJ ) / ( POLES( I, 2 )+DJ )
-                  END IF
-   40          CONTINUE
-               RWORK( 1 ) = NEGONE
-               TEMP = DNRM2( K, RWORK, 1 )
-*
-*              Since B and BX are complex, the following call to DGEMV
-*              is performed in two steps (real and imaginary parts).
-*
-*              CALL DGEMV( 'T', K, NRHS, ONE, BX, LDBX, WORK, 1, ZERO,
-*    $                     B( J, 1 ), LDB )
-*
-               I = K + NRHS*2
-               DO 60 JCOL = 1, NRHS
-                  DO 50 JROW = 1, K
-                     I = I + 1
-                     RWORK( I ) = DBLE( BX( JROW, JCOL ) )
-   50             CONTINUE
-   60          CONTINUE
-               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
-     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K ), 1 )
-               I = K + NRHS*2
-               DO 80 JCOL = 1, NRHS
-                  DO 70 JROW = 1, K
-                     I = I + 1
-                     RWORK( I ) = DIMAG( BX( JROW, JCOL ) )
-   70             CONTINUE
-   80          CONTINUE
-               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
-     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K+NRHS ), 1 )
-               DO 90 JCOL = 1, NRHS
-                  B( J, JCOL ) = DCMPLX( RWORK( JCOL+K ),
-     $                           RWORK( JCOL+K+NRHS ) )
-   90          CONTINUE
-               CALL ZLASCL( 'G', 0, 0, TEMP, ONE, 1, NRHS, B( J, 1 ),
-     $                      LDB, INFO )
-  100       CONTINUE
+            IF( LEFT ) THEN
+               NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M-1, N, M-1,
+     $              -1 )
+            ELSE
+               NB = ILAENV( 1, 'ZUNMQR', SIDE // TRANS, M, N-1, N-1,
+     $              -1 )
+            END IF
          END IF
+         LWKOPT = MAX( 1, NW )*NB
+         WORK( 1 ) = LWKOPT
+      END IF
 *
-*        Move the deflated rows of BX to B also.
-*
-         IF( K.LT.MAX( M, N ) )
-     $      CALL ZLACPY( 'A', N-K, NRHS, BX( K+1, 1 ), LDBX,
-     $                   B( K+1, 1 ), LDB )
-      ELSE
-*
-*        Apply back the right orthogonal transformations.
-*
-*        Step (1R): apply back the new right singular vector matrix
-*        to B.
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'ZUNMTR', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
 *
-         IF( K.EQ.1 ) THEN
-            CALL ZCOPY( NRHS, B, LDB, BX, LDBX )
-         ELSE
-            DO 180 J = 1, K
-               DSIGJ = POLES( J, 2 )
-               IF( Z( J ).EQ.ZERO ) THEN
-                  RWORK( J ) = ZERO
-               ELSE
-                  RWORK( J ) = -Z( J ) / DIFL( J ) /
-     $                         ( DSIGJ+POLES( J, 1 ) ) / DIFR( J, 2 )
-               END IF
-               DO 110 I = 1, J - 1
-                  IF( Z( J ).EQ.ZERO ) THEN
-                     RWORK( I ) = ZERO
-                  ELSE
-                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I+1,
-     $                            2 ) )-DIFR( I, 1 ) ) /
-     $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
-                  END IF
-  110          CONTINUE
-               DO 120 I = J + 1, K
-                  IF( Z( J ).EQ.ZERO ) THEN
-                     RWORK( I ) = ZERO
-                  ELSE
-                     RWORK( I ) = Z( J ) / ( DLAMC3( DSIGJ, -POLES( I,
-     $                            2 ) )-DIFL( I ) ) /
-     $                            ( DSIGJ+POLES( I, 1 ) ) / DIFR( I, 2 )
-                  END IF
-  120          CONTINUE
+*     Quick return if possible
 *
-*              Since B and BX are complex, the following call to DGEMV
-*              is performed in two steps (real and imaginary parts).
+      IF( M.EQ.0 .OR. N.EQ.0 .OR. NQ.EQ.1 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-*              CALL DGEMV( 'T', K, NRHS, ONE, B, LDB, WORK, 1, ZERO,
-*    $                     BX( J, 1 ), LDBX )
+      IF( LEFT ) THEN
+         MI = M - 1
+         NI = N
+      ELSE
+         MI = M
+         NI = N - 1
+      END IF
 *
-               I = K + NRHS*2
-               DO 140 JCOL = 1, NRHS
-                  DO 130 JROW = 1, K
-                     I = I + 1
-                     RWORK( I ) = DBLE( B( JROW, JCOL ) )
-  130             CONTINUE
-  140          CONTINUE
-               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
-     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K ), 1 )
-               I = K + NRHS*2
-               DO 160 JCOL = 1, NRHS
-                  DO 150 JROW = 1, K
-                     I = I + 1
-                     RWORK( I ) = DIMAG( B( JROW, JCOL ) )
-  150             CONTINUE
-  160          CONTINUE
-               CALL DGEMV( 'T', K, NRHS, ONE, RWORK( 1+K+NRHS*2 ), K,
-     $                     RWORK( 1 ), 1, ZERO, RWORK( 1+K+NRHS ), 1 )
-               DO 170 JCOL = 1, NRHS
-                  BX( J, JCOL ) = DCMPLX( RWORK( JCOL+K ),
-     $                            RWORK( JCOL+K+NRHS ) )
-  170          CONTINUE
-  180       CONTINUE
-         END IF
+      IF( UPPER ) THEN
 *
-*        Step (2R): if SQRE = 1, apply back the rotation that is
-*        related to the right null space of the subproblem.
+*        Q was determined by a call to ZHETRD with UPLO = 'U'
 *
-         IF( SQRE.EQ.1 ) THEN
-            CALL ZCOPY( NRHS, B( M, 1 ), LDB, BX( M, 1 ), LDBX )
-            CALL ZDROT( NRHS, BX( 1, 1 ), LDBX, BX( M, 1 ), LDBX, C, S )
-         END IF
-         IF( K.LT.MAX( M, N ) )
-     $      CALL ZLACPY( 'A', N-K, NRHS, B( K+1, 1 ), LDB, BX( K+1, 1 ),
-     $                   LDBX )
+         CALL ZUNMQL( SIDE, TRANS, MI, NI, NQ-1, A( 1, 2 ), LDA, TAU, C,
+     $                LDC, WORK, LWORK, IINFO )
+      ELSE
 *
-*        Step (3R): permute rows of B.
+*        Q was determined by a call to ZHETRD with UPLO = 'L'
 *
-         CALL ZCOPY( NRHS, BX( 1, 1 ), LDBX, B( NLP1, 1 ), LDB )
-         IF( SQRE.EQ.1 ) THEN
-            CALL ZCOPY( NRHS, BX( M, 1 ), LDBX, B( M, 1 ), LDB )
+         IF( LEFT ) THEN
+            I1 = 2
+            I2 = 1
+         ELSE
+            I1 = 1
+            I2 = 2
          END IF
-         DO 190 I = 2, N
-            CALL ZCOPY( NRHS, BX( I, 1 ), LDBX, B( PERM( I ), 1 ), LDB )
-  190    CONTINUE
-*
-*        Step (4R): apply back the Givens rotations performed.
-*
-         DO 200 I = GIVPTR, 1, -1
-            CALL ZDROT( NRHS, B( GIVCOL( I, 2 ), 1 ), LDB,
-     $                  B( GIVCOL( I, 1 ), 1 ), LDB, GIVNUM( I, 2 ),
-     $                  -GIVNUM( I, 1 ) )
-  200    CONTINUE
+         CALL ZUNMQR( SIDE, TRANS, MI, NI, NQ-1, A( 2, 1 ), LDA, TAU,
+     $                C( I1, I2 ), LDC, WORK, LWORK, IINFO )
       END IF
-*
+      WORK( 1 ) = LWKOPT
       RETURN
 *
-*     End of ZLALS0
+*     End of ZUNMTR
 *
       END
diff -Nru r-base-3.2.3/src/modules/lapack/dlamch.f r-base-3.3.1/src/modules/lapack/dlamch.f
--- r-base-3.2.3/src/modules/lapack/dlamch.f	2014-03-12 23:03:24.000000000 +0000
+++ r-base-3.3.1/src/modules/lapack/dlamch.f	2016-03-16 23:04:26.000000000 +0000
@@ -56,17 +56,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLAMCH( CMACH )
 *
-*  -- LAPACK auxiliary routine (version 3.4.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER*1        CMACH
@@ -151,7 +151,7 @@
 *> might hold one of these in a register.
 *> \endverbatim
 *> \author LAPACK is a software package provided by Univ. of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..
-*> \date November 2011
+*> \date November 2015
 *> \ingroup auxOTHERauxiliary
 *>
 *> \param[in] A
@@ -167,7 +167,7 @@
 *>
       DOUBLE PRECISION FUNCTION DLAMC3( A, B )
 *
-*  -- LAPACK auxiliary routine (version 3.4.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *     Univ. of Tennessee, Univ. of California Berkeley and NAG Ltd..
 *     November 2010
 *
diff -Nru r-base-3.2.3/src/modules/lapack/dlapack.f r-base-3.3.1/src/modules/lapack/dlapack.f
--- r-base-3.2.3/src/modules/lapack/dlapack.f	2014-03-12 23:03:24.000000000 +0000
+++ r-base-3.3.1/src/modules/lapack/dlapack.f	2016-03-16 23:04:26.000000000 +0000
@@ -240,8 +240,8 @@
 *> \param[out] B21D
 *> \verbatim
 *>          B21D is DOUBLE PRECISION  array, dimension (Q)
-*>          When CBBCSD converges, B21D contains the negative sines of
-*>          THETA(1), ..., THETA(Q). If CBBCSD fails to converge, then
+*>          When DBBCSD converges, B21D contains the negative sines of
+*>          THETA(1), ..., THETA(Q). If DBBCSD fails to converge, then
 *>          B21D contains the diagonal of the partially reduced bottom-left
 *>          block.
 *> \endverbatim
@@ -249,7 +249,7 @@
 *> \param[out] B21E
 *> \verbatim
 *>          B21E is DOUBLE PRECISION  array, dimension (Q-1)
-*>          When CBBCSD converges, B21E contains zeros. If CBBCSD fails
+*>          When DBBCSD converges, B21E contains zeros. If DBBCSD fails
 *>          to converge, then B21E contains the subdiagonal of the
 *>          partially reduced bottom-left block.
 *> \endverbatim
@@ -257,8 +257,8 @@
 *> \param[out] B22D
 *> \verbatim
 *>          B22D is DOUBLE PRECISION  array, dimension (Q)
-*>          When CBBCSD converges, B22D contains the negative sines of
-*>          THETA(1), ..., THETA(Q). If CBBCSD fails to converge, then
+*>          When DBBCSD converges, B22D contains the negative sines of
+*>          THETA(1), ..., THETA(Q). If DBBCSD fails to converge, then
 *>          B22D contains the diagonal of the partially reduced bottom-right
 *>          block.
 *> \endverbatim
@@ -266,7 +266,7 @@
 *> \param[out] B22E
 *> \verbatim
 *>          B22E is DOUBLE PRECISION  array, dimension (Q-1)
-*>          When CBBCSD converges, B22E contains zeros. If CBBCSD fails
+*>          When DBBCSD converges, B22E contains zeros. If DBBCSD fails
 *>          to converge, then B22E contains the subdiagonal of the
 *>          partially reduced bottom-right block.
 *> \endverbatim
@@ -322,7 +322,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2013
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -332,10 +332,10 @@
      $                   V2T, LDV2T, B11D, B11E, B12D, B12E, B21D, B21E,
      $                   B22D, B22E, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS
@@ -6998,7 +6998,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2013
+*> \date November 2015
 *
 *> \ingroup doubleGEcomputational
 *
@@ -7037,10 +7037,10 @@
 *  =====================================================================
       SUBROUTINE DGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
 *
-*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOB
@@ -7078,8 +7078,6 @@
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
 *     ..
-*     .. Executable Statements ..
-*
 *     Test the input parameters
 *
       INFO = 0
@@ -11215,7 +11213,7 @@
 *     End of DGEEVX
 *
       END
-*> \brief <b> DGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief \b DGEHD2 reduces a general square matrix to upper Hessenberg form using an unblocked algorithm.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -11223,30 +11221,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DGEGS + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgegs.f"> 
+*> Download DGEHD2 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgehd2.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgegs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgehd2.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgegs.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgehd2.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
-*                         ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
-*                         LWORK, INFO )
+*       SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          JOBVSL, JOBVSR
-*       INTEGER            INFO, LDA, LDB, LDVSL, LDVSR, LWORK, N
+*       INTEGER            IHI, ILO, INFO, LDA, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
-*      $                   B( LDB, * ), BETA( * ), VSL( LDVSL, * ),
-*      $                   VSR( LDVSR, * ), WORK( * )
+*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -11255,176 +11248,69 @@
 *>
 *> \verbatim
 *>
-*> This routine is deprecated and has been replaced by routine DGGES.
-*>
-*> DGEGS computes the eigenvalues, real Schur form, and, optionally,
-*> left and or/right Schur vectors of a real matrix pair (A,B).
-*> Given two square matrices A and B, the generalized real Schur
-*> factorization has the form
-*>
-*>   A = Q*S*Z**T,  B = Q*T*Z**T
-*>
-*> where Q and Z are orthogonal matrices, T is upper triangular, and S
-*> is an upper quasi-triangular matrix with 1-by-1 and 2-by-2 diagonal
-*> blocks, the 2-by-2 blocks corresponding to complex conjugate pairs
-*> of eigenvalues of (A,B).  The columns of Q are the left Schur vectors
-*> and the columns of Z are the right Schur vectors.
-*>
-*> If only the eigenvalues of (A,B) are needed, the driver routine
-*> DGEGV should be used instead.  See DGEGV for a description of the
-*> eigenvalues of the generalized nonsymmetric eigenvalue problem
-*> (GNEP).
+*> DGEHD2 reduces a real general matrix A to upper Hessenberg form H by
+*> an orthogonal similarity transformation:  Q**T * A * Q = H .
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] JOBVSL
-*> \verbatim
-*>          JOBVSL is CHARACTER*1
-*>          = 'N':  do not compute the left Schur vectors;
-*>          = 'V':  compute the left Schur vectors (returned in VSL).
-*> \endverbatim
-*>
-*> \param[in] JOBVSR
-*> \verbatim
-*>          JOBVSR is CHARACTER*1
-*>          = 'N':  do not compute the right Schur vectors;
-*>          = 'V':  compute the right Schur vectors (returned in VSR).
-*> \endverbatim
-*>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrices A, B, VSL, and VSR.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA, N)
-*>          On entry, the matrix A.
-*>          On exit, the upper quasi-triangular matrix S from the
-*>          generalized real Schur factorization.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[in,out] B
-*> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB, N)
-*>          On entry, the matrix B.
-*>          On exit, the upper triangular matrix T from the generalized
-*>          real Schur factorization.
-*> \endverbatim
-*>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of B.  LDB >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] ALPHAR
-*> \verbatim
-*>          ALPHAR is DOUBLE PRECISION array, dimension (N)
-*>          The real parts of each scalar alpha defining an eigenvalue
-*>          of GNEP.
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[out] ALPHAI
+*> \param[in] ILO
 *> \verbatim
-*>          ALPHAI is DOUBLE PRECISION array, dimension (N)
-*>          The imaginary parts of each scalar alpha defining an
-*>          eigenvalue of GNEP.  If ALPHAI(j) is zero, then the j-th
-*>          eigenvalue is real; if positive, then the j-th and (j+1)-st
-*>          eigenvalues are a complex conjugate pair, with
-*>          ALPHAI(j+1) = -ALPHAI(j).
+*>          ILO is INTEGER
 *> \endverbatim
 *>
-*> \param[out] BETA
+*> \param[in] IHI
 *> \verbatim
-*>          BETA is DOUBLE PRECISION array, dimension (N)
-*>          The scalars beta that define the eigenvalues of GNEP.
-*>          Together, the quantities alpha = (ALPHAR(j),ALPHAI(j)) and
-*>          beta = BETA(j) represent the j-th eigenvalue of the matrix
-*>          pair (A,B), in one of the forms lambda = alpha/beta or
-*>          mu = beta/alpha.  Since either lambda or mu may overflow,
-*>          they should not, in general, be computed.
-*> \endverbatim
+*>          IHI is INTEGER
 *>
-*> \param[out] VSL
-*> \verbatim
-*>          VSL is DOUBLE PRECISION array, dimension (LDVSL,N)
-*>          If JOBVSL = 'V', the matrix of left Schur vectors Q.
-*>          Not referenced if JOBVSL = 'N'.
+*>          It is assumed that A is already upper triangular in rows
+*>          and columns 1:ILO-1 and IHI+1:N. ILO and IHI are normally
+*>          set by a previous call to DGEBAL; otherwise they should be
+*>          set to 1 and N respectively. See Further Details.
+*>          1 <= ILO <= IHI <= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDVSL
+*> \param[in,out] A
 *> \verbatim
-*>          LDVSL is INTEGER
-*>          The leading dimension of the matrix VSL. LDVSL >=1, and
-*>          if JOBVSL = 'V', LDVSL >= N.
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the n by n general matrix to be reduced.
+*>          On exit, the upper triangle and the first subdiagonal of A
+*>          are overwritten with the upper Hessenberg matrix H, and the
+*>          elements below the first subdiagonal, with the array TAU,
+*>          represent the orthogonal matrix Q as a product of elementary
+*>          reflectors. See Further Details.
 *> \endverbatim
 *>
-*> \param[out] VSR
+*> \param[in] LDA
 *> \verbatim
-*>          VSR is DOUBLE PRECISION array, dimension (LDVSR,N)
-*>          If JOBVSR = 'V', the matrix of right Schur vectors Z.
-*>          Not referenced if JOBVSR = 'N'.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDVSR
+*> \param[out] TAU
 *> \verbatim
-*>          LDVSR is INTEGER
-*>          The leading dimension of the matrix VSR. LDVSR >= 1, and
-*>          if JOBVSR = 'V', LDVSR >= N.
+*>          TAU is DOUBLE PRECISION array, dimension (N-1)
+*>          The scalar factors of the elementary reflectors (see Further
+*>          Details).
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,4*N).
-*>          For good performance, LWORK must generally be larger.
-*>          To compute the optimal value of LWORK, call ILAENV to get
-*>          blocksizes (for DGEQRF, DORMQR, and DORGQR.)  Then compute:
-*>          NB  -- MAX of the blocksizes for DGEQRF, DORMQR, and DORGQR
-*>          The optimal LWORK is  2*N + N*(NB+1).
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
+*>          WORK is DOUBLE PRECISION array, dimension (N)
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
+*>          = 0:  successful exit.
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>          = 1,...,N:
-*>                The QZ iteration failed.  (A,B) are not in Schur
-*>                form, but ALPHAR(j), ALPHAI(j), and BETA(j) should
-*>                be correct for j=INFO+1,...,N.
-*>          > N:  errors that usually indicate LAPACK problems:
-*>                =N+1: error return from DGGBAL
-*>                =N+2: error return from DGEQRF
-*>                =N+3: error return from DORMQR
-*>                =N+4: error return from DORGQR
-*>                =N+5: error return from DGGHRD
-*>                =N+6: error return from DHGEQZ (other than failed
-*>                                                iteration)
-*>                =N+7: error return from DGGBAK (computing VSL)
-*>                =N+8: error return from DGGBAK (computing VSR)
-*>                =N+9: error return from DLASCL (various places)
 *> \endverbatim
 *
 *  Authors:
@@ -11435,328 +11321,124 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date September 2012
 *
-*> \ingroup doubleGEeigen
+*> \ingroup doubleGEcomputational
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of (ihi-ilo) elementary
+*>  reflectors
+*>
+*>     Q = H(ilo) H(ilo+1) . . . H(ihi-1).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**T
+*>
+*>  where tau is a real scalar, and v is a real vector with
+*>  v(1:i) = 0, v(i+1) = 1 and v(ihi+1:n) = 0; v(i+2:ihi) is stored on
+*>  exit in A(i+2:ihi,i), and tau in TAU(i).
+*>
+*>  The contents of A are illustrated by the following example, with
+*>  n = 7, ilo = 2 and ihi = 6:
+*>
+*>  on entry,                        on exit,
+*>
+*>  ( a   a   a   a   a   a   a )    (  a   a   h   h   h   h   a )
+*>  (     a   a   a   a   a   a )    (      a   h   h   h   h   a )
+*>  (     a   a   a   a   a   a )    (      h   h   h   h   h   h )
+*>  (     a   a   a   a   a   a )    (      v2  h   h   h   h   h )
+*>  (     a   a   a   a   a   a )    (      v2  v3  h   h   h   h )
+*>  (     a   a   a   a   a   a )    (      v2  v3  v4  h   h   h )
+*>  (                         a )    (                          a )
+*>
+*>  where a denotes an element of the original matrix A, h denotes a
+*>  modified element of the upper Hessenberg matrix H, and vi denotes an
+*>  element of the vector defining H(i).
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
-     $                  ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
-     $                  LWORK, INFO )
+      SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.4.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     September 2012
 *
 *     .. Scalar Arguments ..
-      CHARACTER          JOBVSL, JOBVSR
-      INTEGER            INFO, LDA, LDB, LDVSL, LDVSR, LWORK, N
+      INTEGER            IHI, ILO, INFO, LDA, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
-     $                   B( LDB, * ), BETA( * ), VSL( LDVSL, * ),
-     $                   VSR( LDVSR, * ), WORK( * )
+      DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      DOUBLE PRECISION   ONE
+      PARAMETER          ( ONE = 1.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ILASCL, ILBSCL, ILVSL, ILVSR, LQUERY
-      INTEGER            ICOLS, IHI, IINFO, IJOBVL, IJOBVR, ILEFT, ILO,
-     $                   IRIGHT, IROWS, ITAU, IWORK, LOPT, LWKMIN,
-     $                   LWKOPT, NB, NB1, NB2, NB3
-      DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
-     $                   SAFMIN, SMLNUM
+      INTEGER            I
+      DOUBLE PRECISION   AII
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLACPY,
-     $                   DLASCL, DLASET, DORGQR, DORMQR, XERBLA
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
+      EXTERNAL           DLARF, DLARFG, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          INT, MAX
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
-*     Decode the input arguments
-*
-      IF( LSAME( JOBVSL, 'N' ) ) THEN
-         IJOBVL = 1
-         ILVSL = .FALSE.
-      ELSE IF( LSAME( JOBVSL, 'V' ) ) THEN
-         IJOBVL = 2
-         ILVSL = .TRUE.
-      ELSE
-         IJOBVL = -1
-         ILVSL = .FALSE.
-      END IF
-*
-      IF( LSAME( JOBVSR, 'N' ) ) THEN
-         IJOBVR = 1
-         ILVSR = .FALSE.
-      ELSE IF( LSAME( JOBVSR, 'V' ) ) THEN
-         IJOBVR = 2
-         ILVSR = .TRUE.
-      ELSE
-         IJOBVR = -1
-         ILVSR = .FALSE.
-      END IF
-*
-*     Test the input arguments
+*     Test the input parameters
 *
-      LWKMIN = MAX( 4*N, 1 )
-      LWKOPT = LWKMIN
-      WORK( 1 ) = LWKOPT
-      LQUERY = ( LWORK.EQ.-1 )
       INFO = 0
-      IF( IJOBVL.LE.0 ) THEN
+      IF( N.LT.0 ) THEN
          INFO = -1
-      ELSE IF( IJOBVR.LE.0 ) THEN
+      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
          INFO = -2
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
          INFO = -3
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
-         INFO = -7
-      ELSE IF( LDVSL.LT.1 .OR. ( ILVSL .AND. LDVSL.LT.N ) ) THEN
-         INFO = -12
-      ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
-         INFO = -14
-      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
-         INFO = -16
-      END IF
-*
-      IF( INFO.EQ.0 ) THEN
-         NB1 = ILAENV( 1, 'DGEQRF', ' ', N, N, -1, -1 )
-         NB2 = ILAENV( 1, 'DORMQR', ' ', N, N, N, -1 )
-         NB3 = ILAENV( 1, 'DORGQR', ' ', N, N, N, -1 )
-         NB = MAX( NB1, NB2, NB3 )
-         LOPT = 2*N + N*( NB+1 )
-         WORK( 1 ) = LOPT
       END IF
-*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGEGS ', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
+         CALL XERBLA( 'DGEHD2', -INFO )
          RETURN
       END IF
 *
-*     Quick return if possible
-*
-      IF( N.EQ.0 )
-     $   RETURN
-*
-*     Get machine constants
-*
-      EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
-      SAFMIN = DLAMCH( 'S' )
-      SMLNUM = N*SAFMIN / EPS
-      BIGNUM = ONE / SMLNUM
-*
-*     Scale A if max element outside range [SMLNUM,BIGNUM]
-*
-      ANRM = DLANGE( 'M', N, N, A, LDA, WORK )
-      ILASCL = .FALSE.
-      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
-         ANRMTO = SMLNUM
-         ILASCL = .TRUE.
-      ELSE IF( ANRM.GT.BIGNUM ) THEN
-         ANRMTO = BIGNUM
-         ILASCL = .TRUE.
-      END IF
-*
-      IF( ILASCL ) THEN
-         CALL DLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-      END IF
-*
-*     Scale B if max element outside range [SMLNUM,BIGNUM]
-*
-      BNRM = DLANGE( 'M', N, N, B, LDB, WORK )
-      ILBSCL = .FALSE.
-      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
-         BNRMTO = SMLNUM
-         ILBSCL = .TRUE.
-      ELSE IF( BNRM.GT.BIGNUM ) THEN
-         BNRMTO = BIGNUM
-         ILBSCL = .TRUE.
-      END IF
-*
-      IF( ILBSCL ) THEN
-         CALL DLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-      END IF
-*
-*     Permute the matrix to make it more nearly triangular
-*     Workspace layout:  (2*N words -- "work..." not actually used)
-*        left_permutation, right_permutation, work...
-*
-      ILEFT = 1
-      IRIGHT = N + 1
-      IWORK = IRIGHT + N
-      CALL DGGBAL( 'P', N, A, LDA, B, LDB, ILO, IHI, WORK( ILEFT ),
-     $             WORK( IRIGHT ), WORK( IWORK ), IINFO )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 1
-         GO TO 10
-      END IF
-*
-*     Reduce B to triangular form, and initialize VSL and/or VSR
-*     Workspace layout:  ("work..." must have at least N words)
-*        left_permutation, right_permutation, tau, work...
-*
-      IROWS = IHI + 1 - ILO
-      ICOLS = N + 1 - ILO
-      ITAU = IWORK
-      IWORK = ITAU + IROWS
-      CALL DGEQRF( IROWS, ICOLS, B( ILO, ILO ), LDB, WORK( ITAU ),
-     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
-      IF( IINFO.GE.0 )
-     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 2
-         GO TO 10
-      END IF
-*
-      CALL DORMQR( 'L', 'T', IROWS, ICOLS, IROWS, B( ILO, ILO ), LDB,
-     $             WORK( ITAU ), A( ILO, ILO ), LDA, WORK( IWORK ),
-     $             LWORK+1-IWORK, IINFO )
-      IF( IINFO.GE.0 )
-     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 3
-         GO TO 10
-      END IF
-*
-      IF( ILVSL ) THEN
-         CALL DLASET( 'Full', N, N, ZERO, ONE, VSL, LDVSL )
-         CALL DLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
-     $                VSL( ILO+1, ILO ), LDVSL )
-         CALL DORGQR( IROWS, IROWS, IROWS, VSL( ILO, ILO ), LDVSL,
-     $                WORK( ITAU ), WORK( IWORK ), LWORK+1-IWORK,
-     $                IINFO )
-         IF( IINFO.GE.0 )
-     $      LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 4
-            GO TO 10
-         END IF
-      END IF
-*
-      IF( ILVSR )
-     $   CALL DLASET( 'Full', N, N, ZERO, ONE, VSR, LDVSR )
-*
-*     Reduce to generalized Hessenberg form
-*
-      CALL DGGHRD( JOBVSL, JOBVSR, N, ILO, IHI, A, LDA, B, LDB, VSL,
-     $             LDVSL, VSR, LDVSR, IINFO )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 5
-         GO TO 10
-      END IF
-*
-*     Perform QZ algorithm, computing Schur vectors if desired
-*     Workspace layout:  ("work..." must have at least 1 word)
-*        left_permutation, right_permutation, work...
+      DO 10 I = ILO, IHI - 1
 *
-      IWORK = ITAU
-      CALL DHGEQZ( 'S', JOBVSL, JOBVSR, N, ILO, IHI, A, LDA, B, LDB,
-     $             ALPHAR, ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR,
-     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
-      IF( IINFO.GE.0 )
-     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-      IF( IINFO.NE.0 ) THEN
-         IF( IINFO.GT.0 .AND. IINFO.LE.N ) THEN
-            INFO = IINFO
-         ELSE IF( IINFO.GT.N .AND. IINFO.LE.2*N ) THEN
-            INFO = IINFO - N
-         ELSE
-            INFO = N + 6
-         END IF
-         GO TO 10
-      END IF
+*        Compute elementary reflector H(i) to annihilate A(i+2:ihi,i)
 *
-*     Apply permutation to VSL and VSR
+         CALL DLARFG( IHI-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
+     $                TAU( I ) )
+         AII = A( I+1, I )
+         A( I+1, I ) = ONE
 *
-      IF( ILVSL ) THEN
-         CALL DGGBAK( 'P', 'L', N, ILO, IHI, WORK( ILEFT ),
-     $                WORK( IRIGHT ), N, VSL, LDVSL, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 7
-            GO TO 10
-         END IF
-      END IF
-      IF( ILVSR ) THEN
-         CALL DGGBAK( 'P', 'R', N, ILO, IHI, WORK( ILEFT ),
-     $                WORK( IRIGHT ), N, VSR, LDVSR, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 8
-            GO TO 10
-         END IF
-      END IF
+*        Apply H(i) to A(1:ihi,i+1:ihi) from the right
 *
-*     Undo scaling
+         CALL DLARF( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
+     $               A( 1, I+1 ), LDA, WORK )
 *
-      IF( ILASCL ) THEN
-         CALL DLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-         CALL DLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHAR, N,
-     $                IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-         CALL DLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHAI, N,
-     $                IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-      END IF
+*        Apply H(i) to A(i+1:ihi,i+1:n) from the left
 *
-      IF( ILBSCL ) THEN
-         CALL DLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-         CALL DLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 9
-            RETURN
-         END IF
-      END IF
+         CALL DLARF( 'Left', IHI-I, N-I, A( I+1, I ), 1, TAU( I ),
+     $               A( I+1, I+1 ), LDA, WORK )
 *
+         A( I+1, I ) = AII
    10 CONTINUE
-      WORK( 1 ) = LWKOPT
 *
       RETURN
 *
-*     End of DGEGS
+*     End of DGEHD2
 *
       END
-*> \brief <b> DGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief \b DGEHRD
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -11764,29 +11446,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DGEGV + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgegv.f"> 
+*> Download DGEHRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgehrd.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgegv.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgehrd.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgegv.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgehrd.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
-*                         BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+*       SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       CHARACTER          JOBVL, JOBVR
-*       INTEGER            INFO, LDA, LDB, LDVL, LDVR, LWORK, N
+*       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
-*      $                   B( LDB, * ), BETA( * ), VL( LDVL, * ),
-*      $                   VR( LDVR, * ), WORK( * )
+*       DOUBLE PRECISION  A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -11795,196 +11473,71 @@
 *>
 *> \verbatim
 *>
-*> This routine is deprecated and has been replaced by routine DGGEV.
-*>
-*> DGEGV computes the eigenvalues and, optionally, the left and/or right
-*> eigenvectors of a real matrix pair (A,B).
-*> Given two square matrices A and B,
-*> the generalized nonsymmetric eigenvalue problem (GNEP) is to find the
-*> eigenvalues lambda and corresponding (non-zero) eigenvectors x such
-*> that
-*>
-*>    A*x = lambda*B*x.
-*>
-*> An alternate form is to find the eigenvalues mu and corresponding
-*> eigenvectors y such that
-*>
-*>    mu*A*y = B*y.
-*>
-*> These two forms are equivalent with mu = 1/lambda and x = y if
-*> neither lambda nor mu is zero.  In order to deal with the case that
-*> lambda or mu is zero or small, two values alpha and beta are returned
-*> for each eigenvalue, such that lambda = alpha/beta and
-*> mu = beta/alpha.
-*>
-*> The vectors x and y in the above equations are right eigenvectors of
-*> the matrix pair (A,B).  Vectors u and v satisfying
-*>
-*>    u**H*A = lambda*u**H*B  or  mu*v**H*A = v**H*B
-*>
-*> are left eigenvectors of (A,B).
-*>
-*> Note: this routine performs "full balancing" on A and B
+*> DGEHRD reduces a real general matrix A to upper Hessenberg form H by
+*> an orthogonal similarity transformation:  Q**T * A * Q = H .
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*> \param[in] JOBVL
-*> \verbatim
-*>          JOBVL is CHARACTER*1
-*>          = 'N':  do not compute the left generalized eigenvectors;
-*>          = 'V':  compute the left generalized eigenvectors (returned
-*>                  in VL).
-*> \endverbatim
-*>
-*> \param[in] JOBVR
-*> \verbatim
-*>          JOBVR is CHARACTER*1
-*>          = 'N':  do not compute the right generalized eigenvectors;
-*>          = 'V':  compute the right generalized eigenvectors (returned
-*>                  in VR).
-*> \endverbatim
-*>
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>          The order of the matrices A, B, VL, and VR.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA, N)
-*>          On entry, the matrix A.
-*>          If JOBVL = 'V' or JOBVR = 'V', then on exit A
-*>          contains the real Schur form of A from the generalized Schur
-*>          factorization of the pair (A,B) after balancing.
-*>          If no eigenvectors were computed, then only the diagonal
-*>          blocks from the Schur form will be correct.  See DGGHRD and
-*>          DHGEQZ for details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[in,out] B
-*> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB, N)
-*>          On entry, the matrix B.
-*>          If JOBVL = 'V' or JOBVR = 'V', then on exit B contains the
-*>          upper triangular matrix obtained from B in the generalized
-*>          Schur factorization of the pair (A,B) after balancing.
-*>          If no eigenvectors were computed, then only those elements of
-*>          B corresponding to the diagonal blocks from the Schur form of
-*>          A will be correct.  See DGGHRD and DHGEQZ for details.
-*> \endverbatim
-*>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of B.  LDB >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] ALPHAR
-*> \verbatim
-*>          ALPHAR is DOUBLE PRECISION array, dimension (N)
-*>          The real parts of each scalar alpha defining an eigenvalue of
-*>          GNEP.
-*> \endverbatim
-*>
-*> \param[out] ALPHAI
-*> \verbatim
-*>          ALPHAI is DOUBLE PRECISION array, dimension (N)
-*>          The imaginary parts of each scalar alpha defining an
-*>          eigenvalue of GNEP.  If ALPHAI(j) is zero, then the j-th
-*>          eigenvalue is real; if positive, then the j-th and
-*>          (j+1)-st eigenvalues are a complex conjugate pair, with
-*>          ALPHAI(j+1) = -ALPHAI(j).
+*>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[out] BETA
+*> \param[in] ILO
 *> \verbatim
-*>          BETA is DOUBLE PRECISION array, dimension (N)
-*>          The scalars beta that define the eigenvalues of GNEP.
-*>          
-*>          Together, the quantities alpha = (ALPHAR(j),ALPHAI(j)) and
-*>          beta = BETA(j) represent the j-th eigenvalue of the matrix
-*>          pair (A,B), in one of the forms lambda = alpha/beta or
-*>          mu = beta/alpha.  Since either lambda or mu may overflow,
-*>          they should not, in general, be computed.
+*>          ILO is INTEGER
 *> \endverbatim
 *>
-*> \param[out] VL
+*> \param[in] IHI
 *> \verbatim
-*>          VL is DOUBLE PRECISION array, dimension (LDVL,N)
-*>          If JOBVL = 'V', the left eigenvectors u(j) are stored
-*>          in the columns of VL, in the same order as their eigenvalues.
-*>          If the j-th eigenvalue is real, then u(j) = VL(:,j).
-*>          If the j-th and (j+1)-st eigenvalues form a complex conjugate
-*>          pair, then
-*>             u(j) = VL(:,j) + i*VL(:,j+1)
-*>          and
-*>            u(j+1) = VL(:,j) - i*VL(:,j+1).
+*>          IHI is INTEGER
 *>
-*>          Each eigenvector is scaled so that its largest component has
-*>          abs(real part) + abs(imag. part) = 1, except for eigenvectors
-*>          corresponding to an eigenvalue with alpha = beta = 0, which
-*>          are set to zero.
-*>          Not referenced if JOBVL = 'N'.
+*>          It is assumed that A is already upper triangular in rows
+*>          and columns 1:ILO-1 and IHI+1:N. ILO and IHI are normally
+*>          set by a previous call to DGEBAL; otherwise they should be
+*>          set to 1 and N respectively. See Further Details.
+*>          1 <= ILO <= IHI <= N, if N > 0; ILO=1 and IHI=0, if N=0.
 *> \endverbatim
 *>
-*> \param[in] LDVL
+*> \param[in,out] A
 *> \verbatim
-*>          LDVL is INTEGER
-*>          The leading dimension of the matrix VL. LDVL >= 1, and
-*>          if JOBVL = 'V', LDVL >= N.
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the N-by-N general matrix to be reduced.
+*>          On exit, the upper triangle and the first subdiagonal of A
+*>          are overwritten with the upper Hessenberg matrix H, and the
+*>          elements below the first subdiagonal, with the array TAU,
+*>          represent the orthogonal matrix Q as a product of elementary
+*>          reflectors. See Further Details.
 *> \endverbatim
 *>
-*> \param[out] VR
+*> \param[in] LDA
 *> \verbatim
-*>          VR is DOUBLE PRECISION array, dimension (LDVR,N)
-*>          If JOBVR = 'V', the right eigenvectors x(j) are stored
-*>          in the columns of VR, in the same order as their eigenvalues.
-*>          If the j-th eigenvalue is real, then x(j) = VR(:,j).
-*>          If the j-th and (j+1)-st eigenvalues form a complex conjugate
-*>          pair, then
-*>            x(j) = VR(:,j) + i*VR(:,j+1)
-*>          and
-*>            x(j+1) = VR(:,j) - i*VR(:,j+1).
-*>
-*>          Each eigenvector is scaled so that its largest component has
-*>          abs(real part) + abs(imag. part) = 1, except for eigenvalues
-*>          corresponding to an eigenvalue with alpha = beta = 0, which
-*>          are set to zero.
-*>          Not referenced if JOBVR = 'N'.
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
 *> \endverbatim
 *>
-*> \param[in] LDVR
+*> \param[out] TAU
 *> \verbatim
-*>          LDVR is INTEGER
-*>          The leading dimension of the matrix VR. LDVR >= 1, and
-*>          if JOBVR = 'V', LDVR >= N.
+*>          TAU is DOUBLE PRECISION array, dimension (N-1)
+*>          The scalar factors of the elementary reflectors (see Further
+*>          Details). Elements 1:ILO-1 and IHI:N-1 of TAU are set to
+*>          zero.
 *> \endverbatim
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
 *>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 *> \endverbatim
 *>
 *> \param[in] LWORK
 *> \verbatim
 *>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,8*N).
-*>          For good performance, LWORK must generally be larger.
-*>          To compute the optimal value of LWORK, call ILAENV to get
-*>          blocksizes (for DGEQRF, DORMQR, and DORGQR.)  Then compute:
-*>          NB  -- MAX of the blocksizes for DGEQRF, DORMQR, and DORGQR;
-*>          The optimal LWORK is:
-*>              2*N + MAX( 6*N, N*(NB+1) ).
+*>          The length of the array WORK.  LWORK >= max(1,N).
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -11997,22 +11550,6 @@
 *>          INFO is INTEGER
 *>          = 0:  successful exit
 *>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>          = 1,...,N:
-*>                The QZ iteration failed.  No eigenvectors have been
-*>                calculated, but ALPHAR(j), ALPHAI(j), and BETA(j)
-*>                should be correct for j=INFO+1,...,N.
-*>          > N:  errors that usually indicate LAPACK problems:
-*>                =N+1: error return from DGGBAL
-*>                =N+2: error return from DGEQRF
-*>                =N+3: error return from DORMQR
-*>                =N+4: error return from DORGQR
-*>                =N+5: error return from DGGHRD
-*>                =N+6: error return from DHGEQZ (other than failed
-*>                                                iteration)
-*>                =N+7: error return from DTGEVC
-*>                =N+8: error return from DGGBAK (computing VL)
-*>                =N+9: error return from DGGBAK (computing VR)
-*>                =N+10: error return from DLASCL (various calls)
 *> \endverbatim
 *
 *  Authors:
@@ -12023,1032 +11560,186 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
-*> \ingroup doubleGEeigen
+*> \ingroup doubleGEcomputational
 *
 *> \par Further Details:
 *  =====================
 *>
 *> \verbatim
 *>
-*>  Balancing
-*>  ---------
+*>  The matrix Q is represented as a product of (ihi-ilo) elementary
+*>  reflectors
 *>
-*>  This driver calls DGGBAL to both permute and scale rows and columns
-*>  of A and B.  The permutations PL and PR are chosen so that PL*A*PR
-*>  and PL*B*R will be upper triangular except for the diagonal blocks
-*>  A(i:j,i:j) and B(i:j,i:j), with i and j as close together as
-*>  possible.  The diagonal scaling matrices DL and DR are chosen so
-*>  that the pair  DL*PL*A*PR*DR, DL*PL*B*PR*DR have elements close to
-*>  one (except for the elements that start out zero.)
+*>     Q = H(ilo) H(ilo+1) . . . H(ihi-1).
 *>
-*>  After the eigenvalues and eigenvectors of the balanced matrices
-*>  have been computed, DGGBAK transforms the eigenvectors back to what
-*>  they would have been (in perfect arithmetic) if they had not been
-*>  balanced.
+*>  Each H(i) has the form
 *>
-*>  Contents of A and B on Exit
-*>  -------- -- - --- - -- ----
+*>     H(i) = I - tau * v * v**T
 *>
-*>  If any eigenvectors are computed (either JOBVL='V' or JOBVR='V' or
-*>  both), then on exit the arrays A and B will contain the real Schur
-*>  form[*] of the "balanced" versions of A and B.  If no eigenvectors
-*>  are computed, then only the diagonal blocks will be correct.
+*>  where tau is a real scalar, and v is a real vector with
+*>  v(1:i) = 0, v(i+1) = 1 and v(ihi+1:n) = 0; v(i+2:ihi) is stored on
+*>  exit in A(i+2:ihi,i), and tau in TAU(i).
 *>
-*>  [*] See DHGEQZ, DGEGS, or read the book "Matrix Computations",
-*>      by Golub & van Loan, pub. by Johns Hopkins U. Press.
+*>  The contents of A are illustrated by the following example, with
+*>  n = 7, ilo = 2 and ihi = 6:
+*>
+*>  on entry,                        on exit,
+*>
+*>  ( a   a   a   a   a   a   a )    (  a   a   h   h   h   h   a )
+*>  (     a   a   a   a   a   a )    (      a   h   h   h   h   a )
+*>  (     a   a   a   a   a   a )    (      h   h   h   h   h   h )
+*>  (     a   a   a   a   a   a )    (      v2  h   h   h   h   h )
+*>  (     a   a   a   a   a   a )    (      v2  v3  h   h   h   h )
+*>  (     a   a   a   a   a   a )    (      v2  v3  v4  h   h   h )
+*>  (                         a )    (                          a )
+*>
+*>  where a denotes an element of the original matrix A, h denotes a
+*>  modified element of the upper Hessenberg matrix H, and vi denotes an
+*>  element of the vector defining H(i).
+*>
+*>  This file is a slight modification of LAPACK-3.0's DGEHRD
+*>  subroutine incorporating improvements proposed by Quintana-Orti and
+*>  Van de Geijn (2006). (See DLAHR2.)
 *> \endverbatim
 *>
 *  =====================================================================
-      SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
-     $                  BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+      SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
-      CHARACTER          JOBVL, JOBVR
-      INTEGER            INFO, LDA, LDB, LDVL, LDVR, LWORK, N
+      INTEGER            IHI, ILO, INFO, LDA, LWORK, N
 *     ..
 *     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
-     $                   B( LDB, * ), BETA( * ), VL( LDVL, * ),
-     $                   VR( LDVR, * ), WORK( * )
+      DOUBLE PRECISION  A( LDA, * ), TAU( * ), WORK( * )
 *     ..
 *
 *  =====================================================================
 *
 *     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
+      DOUBLE PRECISION  ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, 
+     $                     ONE = 1.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      LOGICAL            ILIMIT, ILV, ILVL, ILVR, LQUERY
-      CHARACTER          CHTEMP
-      INTEGER            ICOLS, IHI, IINFO, IJOBVL, IJOBVR, ILEFT, ILO,
-     $                   IN, IRIGHT, IROWS, ITAU, IWORK, JC, JR, LOPT,
-     $                   LWKMIN, LWKOPT, NB, NB1, NB2, NB3
-      DOUBLE PRECISION   ABSAI, ABSAR, ABSB, ANRM, ANRM1, ANRM2, BNRM,
-     $                   BNRM1, BNRM2, EPS, ONEPLS, SAFMAX, SAFMIN,
-     $                   SALFAI, SALFAR, SBETA, SCALE, TEMP
-*     ..
-*     .. Local Arrays ..
-      LOGICAL            LDUMMA( 1 )
+      LOGICAL            LQUERY
+      INTEGER            I, IB, IINFO, IWT, J, LDWORK, LWKOPT, NB,
+     $                   NBMIN, NH, NX
+      DOUBLE PRECISION  EI
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLACPY,
-     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGEVC, XERBLA
+      EXTERNAL           DAXPY, DGEHD2, DGEMM, DLAHR2, DLARFB, DTRMM,
+     $                   XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
       INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, INT, MAX
+      EXTERNAL           ILAENV
 *     ..
 *     .. Executable Statements ..
 *
-*     Decode the input arguments
-*
-      IF( LSAME( JOBVL, 'N' ) ) THEN
-         IJOBVL = 1
-         ILVL = .FALSE.
-      ELSE IF( LSAME( JOBVL, 'V' ) ) THEN
-         IJOBVL = 2
-         ILVL = .TRUE.
-      ELSE
-         IJOBVL = -1
-         ILVL = .FALSE.
-      END IF
-*
-      IF( LSAME( JOBVR, 'N' ) ) THEN
-         IJOBVR = 1
-         ILVR = .FALSE.
-      ELSE IF( LSAME( JOBVR, 'V' ) ) THEN
-         IJOBVR = 2
-         ILVR = .TRUE.
-      ELSE
-         IJOBVR = -1
-         ILVR = .FALSE.
-      END IF
-      ILV = ILVL .OR. ILVR
-*
-*     Test the input arguments
+*     Test the input parameters
 *
-      LWKMIN = MAX( 8*N, 1 )
-      LWKOPT = LWKMIN
-      WORK( 1 ) = LWKOPT
-      LQUERY = ( LWORK.EQ.-1 )
       INFO = 0
-      IF( IJOBVL.LE.0 ) THEN
+      LQUERY = ( LWORK.EQ.-1 )
+      IF( N.LT.0 ) THEN
          INFO = -1
-      ELSE IF( IJOBVR.LE.0 ) THEN
+      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
          INFO = -2
-      ELSE IF( N.LT.0 ) THEN
+      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
          INFO = -3
       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
          INFO = -5
-      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
-         INFO = -7
-      ELSE IF( LDVL.LT.1 .OR. ( ILVL .AND. LDVL.LT.N ) ) THEN
-         INFO = -12
-      ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
-         INFO = -14
-      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
-         INFO = -16
+      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
+         INFO = -8
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         NB1 = ILAENV( 1, 'DGEQRF', ' ', N, N, -1, -1 )
-         NB2 = ILAENV( 1, 'DORMQR', ' ', N, N, N, -1 )
-         NB3 = ILAENV( 1, 'DORGQR', ' ', N, N, N, -1 )
-         NB = MAX( NB1, NB2, NB3 )
-         LOPT = 2*N + MAX( 6*N, N*( NB+1 ) )
-         WORK( 1 ) = LOPT
-      END IF
 *
+*        Compute the workspace requirements
+*
+         NB = MIN( NBMAX, ILAENV( 1, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
+         LWKOPT = N*NB + TSIZE
+         WORK( 1 ) = LWKOPT
+      END IF
+*      
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGEGV ', -INFO )
+         CALL XERBLA( 'DGEHRD', -INFO )
          RETURN
       ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
+*     Set elements 1:ILO-1 and IHI:N-1 of TAU to zero
+*
+      DO 10 I = 1, ILO - 1
+         TAU( I ) = ZERO
+   10 CONTINUE
+      DO 20 I = MAX( 1, IHI ), N - 1
+         TAU( I ) = ZERO
+   20 CONTINUE
+*
 *     Quick return if possible
 *
-      IF( N.EQ.0 )
-     $   RETURN
+      NH = IHI - ILO + 1
+      IF( NH.LE.1 ) THEN
+         WORK( 1 ) = 1
+         RETURN
+      END IF
 *
-*     Get machine constants
+*     Determine the block size
 *
-      EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
-      SAFMIN = DLAMCH( 'S' )
-      SAFMIN = SAFMIN + SAFMIN
-      SAFMAX = ONE / SAFMIN
-      ONEPLS = ONE + ( 4*EPS )
+      NB = MIN( NBMAX, ILAENV( 1, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
+      NBMIN = 2
+      IF( NB.GT.1 .AND. NB.LT.NH ) THEN
 *
-*     Scale A
+*        Determine when to cross over from blocked to unblocked code
+*        (last block is always handled by unblocked code)
 *
-      ANRM = DLANGE( 'M', N, N, A, LDA, WORK )
-      ANRM1 = ANRM
-      ANRM2 = ONE
-      IF( ANRM.LT.ONE ) THEN
-         IF( SAFMAX*ANRM.LT.ONE ) THEN
-            ANRM1 = SAFMIN
-            ANRM2 = SAFMAX*ANRM
-         END IF
-      END IF
+         NX = MAX( NB, ILAENV( 3, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
+         IF( NX.LT.NH ) THEN
 *
-      IF( ANRM.GT.ZERO ) THEN
-         CALL DLASCL( 'G', -1, -1, ANRM, ONE, N, N, A, LDA, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 10
-            RETURN
-         END IF
-      END IF
+*           Determine if workspace is large enough for blocked code
 *
-*     Scale B
+            IF( LWORK.LT.N*NB+TSIZE ) THEN
 *
-      BNRM = DLANGE( 'M', N, N, B, LDB, WORK )
-      BNRM1 = BNRM
-      BNRM2 = ONE
-      IF( BNRM.LT.ONE ) THEN
-         IF( SAFMAX*BNRM.LT.ONE ) THEN
-            BNRM1 = SAFMIN
-            BNRM2 = SAFMAX*BNRM
-         END IF
-      END IF
+*              Not enough workspace to use optimal NB:  determine the
+*              minimum value of NB, and reduce NB or force use of
+*              unblocked code
 *
-      IF( BNRM.GT.ZERO ) THEN
-         CALL DLASCL( 'G', -1, -1, BNRM, ONE, N, N, B, LDB, IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 10
-            RETURN
+               NBMIN = MAX( 2, ILAENV( 2, 'DGEHRD', ' ', N, ILO, IHI,
+     $                 -1 ) )
+               IF( LWORK.GE.(N*NBMIN + TSIZE) ) THEN
+                  NB = (LWORK-TSIZE) / N
+               ELSE
+                  NB = 1
+               END IF
+            END IF
          END IF
       END IF
+      LDWORK = N
 *
-*     Permute the matrix to make it more nearly triangular
-*     Workspace layout:  (8*N words -- "work" requires 6*N words)
-*        left_permutation, right_permutation, work...
+      IF( NB.LT.NBMIN .OR. NB.GE.NH ) THEN
 *
-      ILEFT = 1
-      IRIGHT = N + 1
-      IWORK = IRIGHT + N
-      CALL DGGBAL( 'P', N, A, LDA, B, LDB, ILO, IHI, WORK( ILEFT ),
-     $             WORK( IRIGHT ), WORK( IWORK ), IINFO )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 1
-         GO TO 120
-      END IF
+*        Use unblocked code below
 *
-*     Reduce B to triangular form, and initialize VL and/or VR
-*     Workspace layout:  ("work..." must have at least N words)
-*        left_permutation, right_permutation, tau, work...
-*
-      IROWS = IHI + 1 - ILO
-      IF( ILV ) THEN
-         ICOLS = N + 1 - ILO
-      ELSE
-         ICOLS = IROWS
-      END IF
-      ITAU = IWORK
-      IWORK = ITAU + IROWS
-      CALL DGEQRF( IROWS, ICOLS, B( ILO, ILO ), LDB, WORK( ITAU ),
-     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
-      IF( IINFO.GE.0 )
-     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 2
-         GO TO 120
-      END IF
-*
-      CALL DORMQR( 'L', 'T', IROWS, ICOLS, IROWS, B( ILO, ILO ), LDB,
-     $             WORK( ITAU ), A( ILO, ILO ), LDA, WORK( IWORK ),
-     $             LWORK+1-IWORK, IINFO )
-      IF( IINFO.GE.0 )
-     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 3
-         GO TO 120
-      END IF
-*
-      IF( ILVL ) THEN
-         CALL DLASET( 'Full', N, N, ZERO, ONE, VL, LDVL )
-         CALL DLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
-     $                VL( ILO+1, ILO ), LDVL )
-         CALL DORGQR( IROWS, IROWS, IROWS, VL( ILO, ILO ), LDVL,
-     $                WORK( ITAU ), WORK( IWORK ), LWORK+1-IWORK,
-     $                IINFO )
-         IF( IINFO.GE.0 )
-     $      LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 4
-            GO TO 120
-         END IF
-      END IF
-*
-      IF( ILVR )
-     $   CALL DLASET( 'Full', N, N, ZERO, ONE, VR, LDVR )
-*
-*     Reduce to generalized Hessenberg form
-*
-      IF( ILV ) THEN
-*
-*        Eigenvectors requested -- work on whole matrix.
-*
-         CALL DGGHRD( JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB, VL,
-     $                LDVL, VR, LDVR, IINFO )
-      ELSE
-         CALL DGGHRD( 'N', 'N', IROWS, 1, IROWS, A( ILO, ILO ), LDA,
-     $                B( ILO, ILO ), LDB, VL, LDVL, VR, LDVR, IINFO )
-      END IF
-      IF( IINFO.NE.0 ) THEN
-         INFO = N + 5
-         GO TO 120
-      END IF
-*
-*     Perform QZ algorithm
-*     Workspace layout:  ("work..." must have at least 1 word)
-*        left_permutation, right_permutation, work...
-*
-      IWORK = ITAU
-      IF( ILV ) THEN
-         CHTEMP = 'S'
-      ELSE
-         CHTEMP = 'E'
-      END IF
-      CALL DHGEQZ( CHTEMP, JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB,
-     $             ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR,
-     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
-      IF( IINFO.GE.0 )
-     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
-      IF( IINFO.NE.0 ) THEN
-         IF( IINFO.GT.0 .AND. IINFO.LE.N ) THEN
-            INFO = IINFO
-         ELSE IF( IINFO.GT.N .AND. IINFO.LE.2*N ) THEN
-            INFO = IINFO - N
-         ELSE
-            INFO = N + 6
-         END IF
-         GO TO 120
-      END IF
-*
-      IF( ILV ) THEN
-*
-*        Compute Eigenvectors  (DTGEVC requires 6*N words of workspace)
-*
-         IF( ILVL ) THEN
-            IF( ILVR ) THEN
-               CHTEMP = 'B'
-            ELSE
-               CHTEMP = 'L'
-            END IF
-         ELSE
-            CHTEMP = 'R'
-         END IF
-*
-         CALL DTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
-     $                VR, LDVR, N, IN, WORK( IWORK ), IINFO )
-         IF( IINFO.NE.0 ) THEN
-            INFO = N + 7
-            GO TO 120
-         END IF
-*
-*        Undo balancing on VL and VR, rescale
-*
-         IF( ILVL ) THEN
-            CALL DGGBAK( 'P', 'L', N, ILO, IHI, WORK( ILEFT ),
-     $                   WORK( IRIGHT ), N, VL, LDVL, IINFO )
-            IF( IINFO.NE.0 ) THEN
-               INFO = N + 8
-               GO TO 120
-            END IF
-            DO 50 JC = 1, N
-               IF( ALPHAI( JC ).LT.ZERO )
-     $            GO TO 50
-               TEMP = ZERO
-               IF( ALPHAI( JC ).EQ.ZERO ) THEN
-                  DO 10 JR = 1, N
-                     TEMP = MAX( TEMP, ABS( VL( JR, JC ) ) )
-   10             CONTINUE
-               ELSE
-                  DO 20 JR = 1, N
-                     TEMP = MAX( TEMP, ABS( VL( JR, JC ) )+
-     $                      ABS( VL( JR, JC+1 ) ) )
-   20             CONTINUE
-               END IF
-               IF( TEMP.LT.SAFMIN )
-     $            GO TO 50
-               TEMP = ONE / TEMP
-               IF( ALPHAI( JC ).EQ.ZERO ) THEN
-                  DO 30 JR = 1, N
-                     VL( JR, JC ) = VL( JR, JC )*TEMP
-   30             CONTINUE
-               ELSE
-                  DO 40 JR = 1, N
-                     VL( JR, JC ) = VL( JR, JC )*TEMP
-                     VL( JR, JC+1 ) = VL( JR, JC+1 )*TEMP
-   40             CONTINUE
-               END IF
-   50       CONTINUE
-         END IF
-         IF( ILVR ) THEN
-            CALL DGGBAK( 'P', 'R', N, ILO, IHI, WORK( ILEFT ),
-     $                   WORK( IRIGHT ), N, VR, LDVR, IINFO )
-            IF( IINFO.NE.0 ) THEN
-               INFO = N + 9
-               GO TO 120
-            END IF
-            DO 100 JC = 1, N
-               IF( ALPHAI( JC ).LT.ZERO )
-     $            GO TO 100
-               TEMP = ZERO
-               IF( ALPHAI( JC ).EQ.ZERO ) THEN
-                  DO 60 JR = 1, N
-                     TEMP = MAX( TEMP, ABS( VR( JR, JC ) ) )
-   60             CONTINUE
-               ELSE
-                  DO 70 JR = 1, N
-                     TEMP = MAX( TEMP, ABS( VR( JR, JC ) )+
-     $                      ABS( VR( JR, JC+1 ) ) )
-   70             CONTINUE
-               END IF
-               IF( TEMP.LT.SAFMIN )
-     $            GO TO 100
-               TEMP = ONE / TEMP
-               IF( ALPHAI( JC ).EQ.ZERO ) THEN
-                  DO 80 JR = 1, N
-                     VR( JR, JC ) = VR( JR, JC )*TEMP
-   80             CONTINUE
-               ELSE
-                  DO 90 JR = 1, N
-                     VR( JR, JC ) = VR( JR, JC )*TEMP
-                     VR( JR, JC+1 ) = VR( JR, JC+1 )*TEMP
-   90             CONTINUE
-               END IF
-  100       CONTINUE
-         END IF
-*
-*        End of eigenvector calculation
-*
-      END IF
-*
-*     Undo scaling in alpha, beta
-*
-*     Note: this does not give the alpha and beta for the unscaled
-*     problem.
-*
-*     Un-scaling is limited to avoid underflow in alpha and beta
-*     if they are significant.
-*
-      DO 110 JC = 1, N
-         ABSAR = ABS( ALPHAR( JC ) )
-         ABSAI = ABS( ALPHAI( JC ) )
-         ABSB = ABS( BETA( JC ) )
-         SALFAR = ANRM*ALPHAR( JC )
-         SALFAI = ANRM*ALPHAI( JC )
-         SBETA = BNRM*BETA( JC )
-         ILIMIT = .FALSE.
-         SCALE = ONE
-*
-*        Check for significant underflow in ALPHAI
-*
-         IF( ABS( SALFAI ).LT.SAFMIN .AND. ABSAI.GE.
-     $       MAX( SAFMIN, EPS*ABSAR, EPS*ABSB ) ) THEN
-            ILIMIT = .TRUE.
-            SCALE = ( ONEPLS*SAFMIN / ANRM1 ) /
-     $              MAX( ONEPLS*SAFMIN, ANRM2*ABSAI )
-*
-         ELSE IF( SALFAI.EQ.ZERO ) THEN
-*
-*           If insignificant underflow in ALPHAI, then make the
-*           conjugate eigenvalue real.
-*
-            IF( ALPHAI( JC ).LT.ZERO .AND. JC.GT.1 ) THEN
-               ALPHAI( JC-1 ) = ZERO
-            ELSE IF( ALPHAI( JC ).GT.ZERO .AND. JC.LT.N ) THEN
-               ALPHAI( JC+1 ) = ZERO
-            END IF
-         END IF
-*
-*        Check for significant underflow in ALPHAR
-*
-         IF( ABS( SALFAR ).LT.SAFMIN .AND. ABSAR.GE.
-     $       MAX( SAFMIN, EPS*ABSAI, EPS*ABSB ) ) THEN
-            ILIMIT = .TRUE.
-            SCALE = MAX( SCALE, ( ONEPLS*SAFMIN / ANRM1 ) /
-     $              MAX( ONEPLS*SAFMIN, ANRM2*ABSAR ) )
-         END IF
-*
-*        Check for significant underflow in BETA
-*
-         IF( ABS( SBETA ).LT.SAFMIN .AND. ABSB.GE.
-     $       MAX( SAFMIN, EPS*ABSAR, EPS*ABSAI ) ) THEN
-            ILIMIT = .TRUE.
-            SCALE = MAX( SCALE, ( ONEPLS*SAFMIN / BNRM1 ) /
-     $              MAX( ONEPLS*SAFMIN, BNRM2*ABSB ) )
-         END IF
-*
-*        Check for possible overflow when limiting scaling
-*
-         IF( ILIMIT ) THEN
-            TEMP = ( SCALE*SAFMIN )*MAX( ABS( SALFAR ), ABS( SALFAI ),
-     $             ABS( SBETA ) )
-            IF( TEMP.GT.ONE )
-     $         SCALE = SCALE / TEMP
-            IF( SCALE.LT.ONE )
-     $         ILIMIT = .FALSE.
-         END IF
-*
-*        Recompute un-scaled ALPHAR, ALPHAI, BETA if necessary.
-*
-         IF( ILIMIT ) THEN
-            SALFAR = ( SCALE*ALPHAR( JC ) )*ANRM
-            SALFAI = ( SCALE*ALPHAI( JC ) )*ANRM
-            SBETA = ( SCALE*BETA( JC ) )*BNRM
-         END IF
-         ALPHAR( JC ) = SALFAR
-         ALPHAI( JC ) = SALFAI
-         BETA( JC ) = SBETA
-  110 CONTINUE
-*
-  120 CONTINUE
-      WORK( 1 ) = LWKOPT
-*
-      RETURN
-*
-*     End of DGEGV
-*
-      END
-*> \brief \b DGEHD2 reduces a general square matrix to upper Hessenberg form using an unblocked algorithm.
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DGEHD2 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgehd2.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgehd2.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgehd2.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            IHI, ILO, INFO, LDA, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DGEHD2 reduces a real general matrix A to upper Hessenberg form H by
-*> an orthogonal similarity transformation:  Q**T * A * Q = H .
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in] ILO
-*> \verbatim
-*>          ILO is INTEGER
-*> \endverbatim
-*>
-*> \param[in] IHI
-*> \verbatim
-*>          IHI is INTEGER
-*>
-*>          It is assumed that A is already upper triangular in rows
-*>          and columns 1:ILO-1 and IHI+1:N. ILO and IHI are normally
-*>          set by a previous call to DGEBAL; otherwise they should be
-*>          set to 1 and N respectively. See Further Details.
-*>          1 <= ILO <= IHI <= max(1,N).
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the n by n general matrix to be reduced.
-*>          On exit, the upper triangle and the first subdiagonal of A
-*>          are overwritten with the upper Hessenberg matrix H, and the
-*>          elements below the first subdiagonal, with the array TAU,
-*>          represent the orthogonal matrix Q as a product of elementary
-*>          reflectors. See Further Details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION array, dimension (N-1)
-*>          The scalar factors of the elementary reflectors (see Further
-*>          Details).
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (N)
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit.
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup doubleGEcomputational
-*
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of (ihi-ilo) elementary
-*>  reflectors
-*>
-*>     Q = H(ilo) H(ilo+1) . . . H(ihi-1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**T
-*>
-*>  where tau is a real scalar, and v is a real vector with
-*>  v(1:i) = 0, v(i+1) = 1 and v(ihi+1:n) = 0; v(i+2:ihi) is stored on
-*>  exit in A(i+2:ihi,i), and tau in TAU(i).
-*>
-*>  The contents of A are illustrated by the following example, with
-*>  n = 7, ilo = 2 and ihi = 6:
-*>
-*>  on entry,                        on exit,
-*>
-*>  ( a   a   a   a   a   a   a )    (  a   a   h   h   h   h   a )
-*>  (     a   a   a   a   a   a )    (      a   h   h   h   h   a )
-*>  (     a   a   a   a   a   a )    (      h   h   h   h   h   h )
-*>  (     a   a   a   a   a   a )    (      v2  h   h   h   h   h )
-*>  (     a   a   a   a   a   a )    (      v2  v3  h   h   h   h )
-*>  (     a   a   a   a   a   a )    (      v2  v3  v4  h   h   h )
-*>  (                         a )    (                          a )
-*>
-*>  where a denotes an element of the original matrix A, h denotes a
-*>  modified element of the upper Hessenberg matrix H, and vi denotes an
-*>  element of the vector defining H(i).
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE DGEHD2( N, ILO, IHI, A, LDA, TAU, WORK, INFO )
-*
-*  -- LAPACK computational routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
-*
-*     .. Scalar Arguments ..
-      INTEGER            IHI, ILO, INFO, LDA, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE
-      PARAMETER          ( ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I
-      DOUBLE PRECISION   AII
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DLARF, DLARFG, XERBLA
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. Executable Statements ..
-*
-*     Test the input parameters
-*
-      INFO = 0
-      IF( N.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
-         INFO = -2
-      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -5
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGEHD2', -INFO )
-         RETURN
-      END IF
-*
-      DO 10 I = ILO, IHI - 1
-*
-*        Compute elementary reflector H(i) to annihilate A(i+2:ihi,i)
-*
-         CALL DLARFG( IHI-I, A( I+1, I ), A( MIN( I+2, N ), I ), 1,
-     $                TAU( I ) )
-         AII = A( I+1, I )
-         A( I+1, I ) = ONE
-*
-*        Apply H(i) to A(1:ihi,i+1:ihi) from the right
-*
-         CALL DLARF( 'Right', IHI, IHI-I, A( I+1, I ), 1, TAU( I ),
-     $               A( 1, I+1 ), LDA, WORK )
-*
-*        Apply H(i) to A(i+1:ihi,i+1:n) from the left
-*
-         CALL DLARF( 'Left', IHI-I, N-I, A( I+1, I ), 1, TAU( I ),
-     $               A( I+1, I+1 ), LDA, WORK )
-*
-         A( I+1, I ) = AII
-   10 CONTINUE
-*
-      RETURN
-*
-*     End of DGEHD2
-*
-      END
-*> \brief \b DGEHRD
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DGEHRD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgehrd.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgehrd.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgehrd.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            IHI, ILO, INFO, LDA, LWORK, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION  A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DGEHRD reduces a real general matrix A to upper Hessenberg form H by
-*> an orthogonal similarity transformation:  Q**T * A * Q = H .
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in] ILO
-*> \verbatim
-*>          ILO is INTEGER
-*> \endverbatim
-*>
-*> \param[in] IHI
-*> \verbatim
-*>          IHI is INTEGER
-*>
-*>          It is assumed that A is already upper triangular in rows
-*>          and columns 1:ILO-1 and IHI+1:N. ILO and IHI are normally
-*>          set by a previous call to DGEBAL; otherwise they should be
-*>          set to 1 and N respectively. See Further Details.
-*>          1 <= ILO <= IHI <= N, if N > 0; ILO=1 and IHI=0, if N=0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the N-by-N general matrix to be reduced.
-*>          On exit, the upper triangle and the first subdiagonal of A
-*>          are overwritten with the upper Hessenberg matrix H, and the
-*>          elements below the first subdiagonal, with the array TAU,
-*>          represent the orthogonal matrix Q as a product of elementary
-*>          reflectors. See Further Details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION array, dimension (N-1)
-*>          The scalar factors of the elementary reflectors (see Further
-*>          Details). Elements 1:ILO-1 and IHI:N-1 of TAU are set to
-*>          zero.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (LWORK)
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The length of the array WORK.  LWORK >= max(1,N).
-*>          For optimum performance LWORK >= N*NB, where NB is the
-*>          optimal blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2011
-*
-*> \ingroup doubleGEcomputational
-*
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of (ihi-ilo) elementary
-*>  reflectors
-*>
-*>     Q = H(ilo) H(ilo+1) . . . H(ihi-1).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**T
-*>
-*>  where tau is a real scalar, and v is a real vector with
-*>  v(1:i) = 0, v(i+1) = 1 and v(ihi+1:n) = 0; v(i+2:ihi) is stored on
-*>  exit in A(i+2:ihi,i), and tau in TAU(i).
-*>
-*>  The contents of A are illustrated by the following example, with
-*>  n = 7, ilo = 2 and ihi = 6:
-*>
-*>  on entry,                        on exit,
-*>
-*>  ( a   a   a   a   a   a   a )    (  a   a   h   h   h   h   a )
-*>  (     a   a   a   a   a   a )    (      a   h   h   h   h   a )
-*>  (     a   a   a   a   a   a )    (      h   h   h   h   h   h )
-*>  (     a   a   a   a   a   a )    (      v2  h   h   h   h   h )
-*>  (     a   a   a   a   a   a )    (      v2  v3  h   h   h   h )
-*>  (     a   a   a   a   a   a )    (      v2  v3  v4  h   h   h )
-*>  (                         a )    (                          a )
-*>
-*>  where a denotes an element of the original matrix A, h denotes a
-*>  modified element of the upper Hessenberg matrix H, and vi denotes an
-*>  element of the vector defining H(i).
-*>
-*>  This file is a slight modification of LAPACK-3.0's DGEHRD
-*>  subroutine incorporating improvements proposed by Quintana-Orti and
-*>  Van de Geijn (2006). (See DLAHR2.)
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE DGEHRD( N, ILO, IHI, A, LDA, TAU, WORK, LWORK, INFO )
-*
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      INTEGER            IHI, ILO, INFO, LDA, LWORK, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION  A( LDA, * ), TAU( * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
-      DOUBLE PRECISION  ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, 
-     $                     ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IB, IINFO, IWS, J, LDWORK, LWKOPT, NB,
-     $                   NBMIN, NH, NX
-      DOUBLE PRECISION  EI
-*     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION  T( LDT, NBMAX )
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DAXPY, DGEHD2, DGEMM, DLAHR2, DLARFB, DTRMM,
-     $                   XERBLA
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      EXTERNAL           ILAENV
-*     ..
-*     .. Executable Statements ..
-*
-*     Test the input parameters
-*
-      INFO = 0
-      NB = MIN( NBMAX, ILAENV( 1, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
-      LWKOPT = N*NB
-      WORK( 1 ) = LWKOPT
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( N.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( ILO.LT.1 .OR. ILO.GT.MAX( 1, N ) ) THEN
-         INFO = -2
-      ELSE IF( IHI.LT.MIN( ILO, N ) .OR. IHI.GT.N ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
-         INFO = -5
-      ELSE IF( LWORK.LT.MAX( 1, N ) .AND. .NOT.LQUERY ) THEN
-         INFO = -8
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGEHRD', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         RETURN
-      END IF
-*
-*     Set elements 1:ILO-1 and IHI:N-1 of TAU to zero
-*
-      DO 10 I = 1, ILO - 1
-         TAU( I ) = ZERO
-   10 CONTINUE
-      DO 20 I = MAX( 1, IHI ), N - 1
-         TAU( I ) = ZERO
-   20 CONTINUE
-*
-*     Quick return if possible
-*
-      NH = IHI - ILO + 1
-      IF( NH.LE.1 ) THEN
-         WORK( 1 ) = 1
-         RETURN
-      END IF
-*
-*     Determine the block size
-*
-      NB = MIN( NBMAX, ILAENV( 1, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
-      NBMIN = 2
-      IWS = 1
-      IF( NB.GT.1 .AND. NB.LT.NH ) THEN
-*
-*        Determine when to cross over from blocked to unblocked code
-*        (last block is always handled by unblocked code)
-*
-         NX = MAX( NB, ILAENV( 3, 'DGEHRD', ' ', N, ILO, IHI, -1 ) )
-         IF( NX.LT.NH ) THEN
-*
-*           Determine if workspace is large enough for blocked code
-*
-            IWS = N*NB
-            IF( LWORK.LT.IWS ) THEN
-*
-*              Not enough workspace to use optimal NB:  determine the
-*              minimum value of NB, and reduce NB or force use of
-*              unblocked code
-*
-               NBMIN = MAX( 2, ILAENV( 2, 'DGEHRD', ' ', N, ILO, IHI,
-     $                 -1 ) )
-               IF( LWORK.GE.N*NBMIN ) THEN
-                  NB = LWORK / N
-               ELSE
-                  NB = 1
-               END IF
-            END IF
-         END IF
-      END IF
-      LDWORK = N
-*
-      IF( NB.LT.NBMIN .OR. NB.GE.NH ) THEN
-*
-*        Use unblocked code below
-*
-         I = ILO
+         I = ILO
 *
       ELSE
 *
 *        Use blocked code
 *
+         IWT = 1 + N*NB
          DO 40 I = ILO, IHI - 1 - NX, NB
             IB = MIN( NB, IHI-I )
 *
@@ -13056,8 +11747,8 @@
 *           matrices V and T of the block reflector H = I - V*T*V**T
 *           which performs the reduction, and also the matrix Y = A*V*T
 *
-            CALL DLAHR2( IHI, I, IB, A( 1, I ), LDA, TAU( I ), T, LDT,
-     $                   WORK, LDWORK )
+            CALL DLAHR2( IHI, I, IB, A( 1, I ), LDA, TAU( I ),
+     $                   WORK( IWT ), LDT, WORK, LDWORK )
 *
 *           Apply the block reflector H to A(1:ihi,i+ib:ihi) from the
 *           right, computing  A := A - Y * V**T. V(i+ib,ib-1) must be set
@@ -13087,15 +11778,16 @@
 *
             CALL DLARFB( 'Left', 'Transpose', 'Forward',
      $                   'Columnwise',
-     $                   IHI-I, N-I-IB+1, IB, A( I+1, I ), LDA, T, LDT,
-     $                   A( I+1, I+IB ), LDA, WORK, LDWORK )
+     $                   IHI-I, N-I-IB+1, IB, A( I+1, I ), LDA,
+     $                   WORK( IWT ), LDT, A( I+1, I+IB ), LDA,
+     $                   WORK, LDWORK )
    40    CONTINUE
       END IF
 *
 *     Use unblocked code to reduce the rest of the matrix
 *
       CALL DGEHD2( N, I, IHI, A, LDA, TAU, WORK, IINFO )
-      WORK( 1 ) = IWS
+      WORK( 1 ) = LWKOPT
 *
       RETURN
 *
@@ -13155,7 +11847,8 @@
 *> the right singular vectors of [A], respectively. The matrices [U] and [V]
 *> are computed and stored in the arrays U and V, respectively. The diagonal
 *> of [SIGMA] is computed and stored in the array SVA.
-*> \endverbatim
+*> DGEJSV can sometimes compute tiny singular values and their singular vectors much
+*> more accurately than other SVD routines, see below under Further Details.*> \endverbatim
 *
 *  Arguments:
 *  ==========
@@ -13493,7 +12186,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleGEsing
 *
@@ -13578,10 +12271,10 @@
      $                   M, N, A, LDA, SVA, U, LDU, V, LDV,
      $                   WORK, LWORK, IWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       IMPLICIT    NONE
@@ -13610,8 +12303,7 @@
      $        NOSCAL, ROWPIV, RSVEC,  TRANSP
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC DABS,  DLOG, DMAX1, DMIN1, DBLE,
-     $          MAX0, MIN0, IDNINT,  DSIGN,  DSQRT
+      INTRINSIC DABS, DLOG, MAX, MIN, DBLE, IDNINT, DSIGN, DSQRT
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION  DLAMCH, DNRM2
@@ -13667,17 +12359,17 @@
       ELSE IF ( RSVEC .AND. ( LDV .LT. N ) ) THEN
          INFO = - 14
       ELSE IF ( (.NOT.(LSVEC .OR. RSVEC .OR. ERREST).AND.
-     &                           (LWORK .LT. MAX0(7,4*N+1,2*M+N))) .OR.
+     &                           (LWORK .LT. MAX(7,4*N+1,2*M+N))) .OR.
      & (.NOT.(LSVEC .OR. RSVEC) .AND. ERREST .AND.
-     &                         (LWORK .LT. MAX0(7,4*N+N*N,2*M+N))) .OR.
-     & (LSVEC .AND. (.NOT.RSVEC) .AND. (LWORK .LT. MAX0(7,2*M+N,4*N+1)))
+     &                         (LWORK .LT. MAX(7,4*N+N*N,2*M+N))) .OR.
+     & (LSVEC .AND. (.NOT.RSVEC) .AND. (LWORK .LT. MAX(7,2*M+N,4*N+1)))
      & .OR.
-     & (RSVEC .AND. (.NOT.LSVEC) .AND. (LWORK .LT. MAX0(7,2*M+N,4*N+1)))
+     & (RSVEC .AND. (.NOT.LSVEC) .AND. (LWORK .LT. MAX(7,2*M+N,4*N+1)))
      & .OR.
      & (LSVEC .AND. RSVEC .AND. (.NOT.JRACC) .AND. 
-     &                          (LWORK.LT.MAX0(2*M+N,6*N+2*N*N)))
+     &                          (LWORK.LT.MAX(2*M+N,6*N+2*N*N)))
      & .OR. (LSVEC .AND. RSVEC .AND. JRACC .AND.
-     &                          LWORK.LT.MAX0(2*M+N,4*N+N*N,2*N+N*N+6)))
+     &                          LWORK.LT.MAX(2*M+N,4*N+N*N,2*N+N*N+6)))
      &   THEN
          INFO = - 17
       ELSE
@@ -13748,8 +12440,8 @@
       AAPP = ZERO
       AAQQ = BIG
       DO 4781 p = 1, N
-         AAPP = DMAX1( AAPP, SVA(p) )
-         IF ( SVA(p) .NE. ZERO ) AAQQ = DMIN1( AAQQ, SVA(p) )
+         AAPP = MAX( AAPP, SVA(p) )
+         IF ( SVA(p) .NE. ZERO ) AAQQ = MIN( AAQQ, SVA(p) )
  4781 CONTINUE
 *
 *     Quick return for zero M x N matrix
@@ -13853,14 +12545,14 @@
 *              in one pass through the vector
                WORK(M+N+p)  = XSC * SCALEM
                WORK(N+p)    = XSC * (SCALEM*DSQRT(TEMP1))
-               AATMAX = DMAX1( AATMAX, WORK(N+p) )
-               IF (WORK(N+p) .NE. ZERO) AATMIN = DMIN1(AATMIN,WORK(N+p))
+               AATMAX = MAX( AATMAX, WORK(N+p) )
+               IF (WORK(N+p) .NE. ZERO) AATMIN = MIN(AATMIN,WORK(N+p))
  1950       CONTINUE
          ELSE
             DO 1904 p = 1, M
                WORK(M+N+p) = SCALEM*DABS( A(p,IDAMAX(N,A(p,1),LDA)) )
-               AATMAX = DMAX1( AATMAX, WORK(M+N+p) )
-               AATMIN = DMIN1( AATMIN, WORK(M+N+p) )
+               AATMAX = MAX( AATMAX, WORK(M+N+p) )
+               AATMIN = MIN( AATMIN, WORK(M+N+p) )
  1904       CONTINUE
          END IF
 *
@@ -14098,7 +12790,7 @@
          MAXPRJ = ONE
          DO 3051 p = 2, N
             TEMP1  = DABS(A(p,p)) / SVA(IWORK(p))
-            MAXPRJ = DMIN1( MAXPRJ, TEMP1 )
+            MAXPRJ = MIN( MAXPRJ, TEMP1 )
  3051    CONTINUE
          IF ( MAXPRJ**2 .GE. ONE - DBLE(N)*EPSLN ) ALMORT = .TRUE.
       END IF
@@ -14156,7 +12848,7 @@
 *         Singular Values only
 *
 *         .. transpose A(1:NR,1:N)
-         DO 1946 p = 1, MIN0( N-1, NR )
+         DO 1946 p = 1, MIN( N-1, NR )
             CALL DCOPY( N-p, A(p,p+1), LDA, A(p+1,p), 1 )
  1946    CONTINUE
 *
@@ -14412,7 +13104,7 @@
                   XSC = DSQRT(SMALL)/EPSLN
                   DO 3959 p = 2, NR
                      DO 3958 q = 1, p - 1
-                        TEMP1 = XSC * DMIN1(DABS(V(p,p)),DABS(V(q,q)))
+                        TEMP1 = XSC * MIN(DABS(V(p,p)),DABS(V(q,q)))
                         IF ( DABS(V(q,p)) .LE. TEMP1 )
      $                     V(q,p) = DSIGN( TEMP1, V(q,p) )
  3958                CONTINUE
@@ -14451,7 +13143,7 @@
                   XSC = DSQRT(SMALL)
                   DO 3969 p = 2, NR
                      DO 3968 q = 1, p - 1
-                        TEMP1 = XSC * DMIN1(DABS(V(p,p)),DABS(V(q,q)))
+                        TEMP1 = XSC * MIN(DABS(V(p,p)),DABS(V(q,q)))
                         IF ( DABS(V(q,p)) .LE. TEMP1 )
      $                     V(q,p) = DSIGN( TEMP1, V(q,p) )
  3968                CONTINUE
@@ -14464,7 +13156,7 @@
                   XSC = DSQRT(SMALL)
                   DO 8970 p = 2, NR
                      DO 8971 q = 1, p - 1
-                        TEMP1 = XSC * DMIN1(DABS(V(p,p)),DABS(V(q,q)))
+                        TEMP1 = XSC * MIN(DABS(V(p,p)),DABS(V(q,q)))
                         V(p,q) = - DSIGN( TEMP1, V(q,p) )
  8971                CONTINUE
  8970             CONTINUE
@@ -14775,7 +13467,7 @@
             XSC = DSQRT(SMALL/EPSLN)
             DO 9970 q = 2, NR
                DO 9971 p = 1, q - 1
-                  TEMP1 = XSC * DMIN1(DABS(U(p,p)),DABS(U(q,q)))
+                  TEMP1 = XSC * MIN(DABS(U(p,p)),DABS(U(q,q)))
                   U(p,q) = - DSIGN( TEMP1, U(q,p) )
  9971          CONTINUE
  9970       CONTINUE
@@ -17220,7 +15912,7 @@
 *     End of DGELSS
 *
       END
-*> \brief <b> DGELSX solves overdetermined or underdetermined systems for GE matrices</b>
+*> \brief <b> DGELSY solves overdetermined or underdetermined systems for GE matrices</b>
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -17228,23 +15920,23 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DGELSX + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsx.f"> 
+*> Download DGELSY + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsy.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgelsx.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgelsy.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsx.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsy.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-*                          WORK, INFO )
+*       SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+*                          WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, LDB, M, N, NRHS, RANK
+*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
 *       DOUBLE PRECISION   RCOND
 *       ..
 *       .. Array Arguments ..
@@ -17258,9 +15950,7 @@
 *>
 *> \verbatim
 *>
-*> This routine is deprecated and has been replaced by routine DGELSY.
-*>
-*> DGELSX computes the minimum-norm solution to a real linear least
+*> DGELSY computes the minimum-norm solution to a real linear least
 *> squares problem:
 *>     minimize || A * X - B ||
 *> using a complete orthogonal factorization of A.  A is an M-by-N
@@ -17287,6 +15977,15 @@
 *>    X = P * Z**T [ inv(T11)*Q1**T*B ]
 *>                 [        0         ]
 *> where Q1 consists of the first RANK columns of Q.
+*>
+*> This routine is basically identical to the original xGELSX except
+*> three differences:
+*>   o The call to the subroutine xGEQPF has been substituted by the
+*>     the call to the subroutine xGEQP3. This subroutine is a Blas-3
+*>     version of the QR factorization with column pivoting.
+*>   o Matrix B (the right hand side) is updated with Blas-3.
+*>   o The permutation of matrix B (the right hand side) is faster and
+*>     more simple.
 *> \endverbatim
 *
 *  Arguments:
@@ -17330,9 +16029,6 @@
 *>          B is DOUBLE PRECISION array, dimension (LDB,NRHS)
 *>          On entry, the M-by-NRHS right hand side matrix B.
 *>          On exit, the N-by-NRHS solution matrix X.
-*>          If m >= n and RANK = n, the residual sum-of-squares for
-*>          the solution in the i-th column is given by the sum of
-*>          squares of elements N+1:M in that column.
 *> \endverbatim
 *>
 *> \param[in] LDB
@@ -17344,13 +16040,9 @@
 *> \param[in,out] JPVT
 *> \verbatim
 *>          JPVT is INTEGER array, dimension (N)
-*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is an
-*>          initial column, otherwise it is a free column.  Before
-*>          the QR factorization of A, all initial columns are
-*>          permuted to the leading positions; only the remaining
-*>          free columns are moved as a result of column pivoting
-*>          during the factorization.
-*>          On exit, if JPVT(i) = k, then the i-th column of A*P
+*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is permuted
+*>          to the front of AP, otherwise column i is a free column.
+*>          On exit, if JPVT(i) = k, then the i-th column of AP
 *>          was the k-th column of A.
 *> \endverbatim
 *>
@@ -17373,15 +16065,34 @@
 *>
 *> \param[out] WORK
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension
-*>                      (max( min(M,N)+3*N, 2*min(M,N)+NRHS )),
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.
+*>          The unblocked strategy requires that:
+*>             LWORK >= MAX( MN+3*N+1, 2*MN+NRHS ),
+*>          where MN = min( M, N ).
+*>          The block algorithm requires that:
+*>             LWORK >= MAX( MN+2*N+NB*(N+1), 2*MN+NB*NRHS ),
+*>          where NB is an upper bound on the blocksize returned
+*>          by ILAENV for the routines DGEQP3, DTZRZF, STZRQF, DORMQR,
+*>          and DORMRZ.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
 *> \endverbatim
 *>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          = 0: successful exit
+*>          < 0: If INFO = -i, the i-th argument had an illegal value.
 *> \endverbatim
 *
 *  Authors:
@@ -17396,9 +16107,16 @@
 *
 *> \ingroup doubleGEsolve
 *
+*> \par Contributors:
+*  ==================
+*>
+*>    A. Petitet, Computer Science Dept., Univ. of Tenn., Knoxville, USA \n 
+*>    E. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
+*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
+*>
 *  =====================================================================
-      SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-     $                   WORK, INFO )
+      SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+     $                   WORK, LWORK, INFO )
 *
 *  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -17406,7 +16124,7 @@
 *     November 2011
 *
 *     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, LDB, M, N, NRHS, RANK
+      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
       DOUBLE PRECISION   RCOND
 *     ..
 *     .. Array Arguments ..
@@ -17419,22 +16137,24 @@
 *     .. Parameters ..
       INTEGER            IMAX, IMIN
       PARAMETER          ( IMAX = 1, IMIN = 2 )
-      DOUBLE PRECISION   ZERO, ONE, DONE, NTDONE
-      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0, DONE = ZERO,
-     $                   NTDONE = ONE )
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
 *     ..
 *     .. Local Scalars ..
-      INTEGER            I, IASCL, IBSCL, ISMAX, ISMIN, J, K, MN
+      LOGICAL            LQUERY
+      INTEGER            I, IASCL, IBSCL, ISMAX, ISMIN, J, LWKMIN,
+     $                   LWKOPT, MN, NB, NB1, NB2, NB3, NB4
       DOUBLE PRECISION   ANRM, BIGNUM, BNRM, C1, C2, S1, S2, SMAX,
-     $                   SMAXPR, SMIN, SMINPR, SMLNUM, T1, T2
+     $                   SMAXPR, SMIN, SMINPR, SMLNUM, WSIZE
 *     ..
 *     .. External Functions ..
+      INTEGER            ILAENV
       DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           DLAMCH, DLANGE
+      EXTERNAL           ILAENV, DLAMCH, DLANGE
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEQPF, DLAIC1, DLASCL, DLASET, DLATZM, DORM2R,
-     $                   DTRSM, DTZRQF, XERBLA
+      EXTERNAL           DCOPY, DGEQP3, DLABAD, DLAIC1, DLASCL, DLASET,
+     $                   DORMQR, DORMRZ, DTRSM, DTZRZF, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, MIN
@@ -17448,6 +16168,7 @@
 *     Test the input arguments.
 *
       INFO = 0
+      LQUERY = ( LWORK.EQ.-1 )
       IF( M.LT.0 ) THEN
          INFO = -1
       ELSE IF( N.LT.0 ) THEN
@@ -17460,14 +16181,39 @@
          INFO = -7
       END IF
 *
+*     Figure out optimal block size
+*
+      IF( INFO.EQ.0 ) THEN
+         IF( MN.EQ.0 .OR. NRHS.EQ.0 ) THEN
+            LWKMIN = 1
+            LWKOPT = 1
+         ELSE
+            NB1 = ILAENV( 1, 'DGEQRF', ' ', M, N, -1, -1 )
+            NB2 = ILAENV( 1, 'DGERQF', ' ', M, N, -1, -1 )
+            NB3 = ILAENV( 1, 'DORMQR', ' ', M, N, NRHS, -1 )
+            NB4 = ILAENV( 1, 'DORMRQ', ' ', M, N, NRHS, -1 )
+            NB = MAX( NB1, NB2, NB3, NB4 )
+            LWKMIN = MN + MAX( 2*MN, N + 1, MN + NRHS )
+            LWKOPT = MAX( LWKMIN,
+     $                    MN + 2*N + NB*( N + 1 ), 2*MN + NB*NRHS )
+         END IF
+         WORK( 1 ) = LWKOPT
+*
+         IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
+            INFO = -12
+         END IF
+      END IF
+*
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGELSX', -INFO )
+         CALL XERBLA( 'DGELSY', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
          RETURN
       END IF
 *
 *     Quick return if possible
 *
-      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+      IF( MN.EQ.0 .OR. NRHS.EQ.0 ) THEN
          RANK = 0
          RETURN
       END IF
@@ -17478,7 +16224,7 @@
       BIGNUM = ONE / SMLNUM
       CALL DLABAD( SMLNUM, BIGNUM )
 *
-*     Scale A, B if max elements outside range [SMLNUM,BIGNUM]
+*     Scale A, B if max entries outside range [SMLNUM,BIGNUM]
 *
       ANRM = DLANGE( 'M', M, N, A, LDA, WORK )
       IASCL = 0
@@ -17500,7 +16246,7 @@
 *
          CALL DLASET( 'F', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
          RANK = 0
-         GO TO 100
+         GO TO 70
       END IF
 *
       BNRM = DLANGE( 'M', M, NRHS, B, LDB, WORK )
@@ -17522,10 +16268,12 @@
 *     Compute QR factorization with column pivoting of A:
 *        A * P = Q * R
 *
-      CALL DGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ), INFO )
+      CALL DGEQP3( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
+     $             LWORK-MN, INFO )
+      WSIZE = MN + WORK( MN+1 )
 *
-*     workspace 3*N. Details of Householder rotations stored
-*     in WORK(1:MN).
+*     workspace: MN+2*N+NB*(N+1).
+*     Details of Householder rotations stored in WORK(1:MN).
 *
 *     Determine RANK using incremental condition estimation
 *
@@ -17536,7 +16284,7 @@
       IF( ABS( A( 1, 1 ) ).EQ.ZERO ) THEN
          RANK = 0
          CALL DLASET( 'F', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
-         GO TO 100
+         GO TO 70
       ELSE
          RANK = 1
       END IF
@@ -17563,6 +16311,8 @@
          END IF
       END IF
 *
+*     workspace: 3*MN.
+*
 *     Logically partition R = [ R11 R12 ]
 *                             [  0  R22 ]
 *     where R11 = R(1:RANK,1:RANK)
@@ -17570,24 +16320,27 @@
 *     [R11,R12] = [ T11, 0 ] * Y
 *
       IF( RANK.LT.N )
-     $   CALL DTZRQF( RANK, N, A, LDA, WORK( MN+1 ), INFO )
+     $   CALL DTZRZF( RANK, N, A, LDA, WORK( MN+1 ), WORK( 2*MN+1 ),
+     $                LWORK-2*MN, INFO )
 *
+*     workspace: 2*MN.
 *     Details of Householder rotations stored in WORK(MN+1:2*MN)
 *
 *     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
 *
-      CALL DORM2R( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
-     $             B, LDB, WORK( 2*MN+1 ), INFO )
+      CALL DORMQR( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
+     $             B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
+      WSIZE = MAX( WSIZE, 2*MN+WORK( 2*MN+1 ) )
 *
-*     workspace NRHS
+*     workspace: 2*MN+NB*NRHS.
 *
 *     B(1:RANK,1:NRHS) := inv(T11) * B(1:RANK,1:NRHS)
 *
       CALL DTRSM( 'Left', 'Upper', 'No transpose', 'Non-unit', RANK,
      $            NRHS, ONE, A, LDA, B, LDB )
 *
-      DO 40 I = RANK + 1, N
-         DO 30 J = 1, NRHS
+      DO 40 J = 1, NRHS
+         DO 30 I = RANK + 1, N
             B( I, J ) = ZERO
    30    CONTINUE
    40 CONTINUE
@@ -17595,41 +16348,23 @@
 *     B(1:N,1:NRHS) := Y**T * B(1:N,1:NRHS)
 *
       IF( RANK.LT.N ) THEN
-         DO 50 I = 1, RANK
-            CALL DLATZM( 'Left', N-RANK+1, NRHS, A( I, RANK+1 ), LDA,
-     $                   WORK( MN+I ), B( I, 1 ), B( RANK+1, 1 ), LDB,
-     $                   WORK( 2*MN+1 ) )
-   50    CONTINUE
+         CALL DORMRZ( 'Left', 'Transpose', N, NRHS, RANK, N-RANK, A,
+     $                LDA, WORK( MN+1 ), B, LDB, WORK( 2*MN+1 ),
+     $                LWORK-2*MN, INFO )
       END IF
 *
-*     workspace NRHS
+*     workspace: 2*MN+NRHS.
 *
 *     B(1:N,1:NRHS) := P * B(1:N,1:NRHS)
 *
-      DO 90 J = 1, NRHS
-         DO 60 I = 1, N
-            WORK( 2*MN+I ) = NTDONE
-   60    CONTINUE
-         DO 80 I = 1, N
-            IF( WORK( 2*MN+I ).EQ.NTDONE ) THEN
-               IF( JPVT( I ).NE.I ) THEN
-                  K = I
-                  T1 = B( K, J )
-                  T2 = B( JPVT( K ), J )
-   70             CONTINUE
-                  B( JPVT( K ), J ) = T1
-                  WORK( 2*MN+K ) = DONE
-                  T1 = T2
-                  K = JPVT( K )
-                  T2 = B( JPVT( K ), J )
-                  IF( JPVT( K ).NE.I )
-     $               GO TO 70
-                  B( I, J ) = T1
-                  WORK( 2*MN+K ) = DONE
-               END IF
-            END IF
-   80    CONTINUE
-   90 CONTINUE
+      DO 60 J = 1, NRHS
+         DO 50 I = 1, N
+            WORK( JPVT( I ) ) = B( I, J )
+   50    CONTINUE
+         CALL DCOPY( N, WORK( 1 ), 1, B( 1, J ), 1 )
+   60 CONTINUE
+*
+*     workspace: N.
 *
 *     Undo scaling
 *
@@ -17648,14 +16383,15 @@
          CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
       END IF
 *
-  100 CONTINUE
+   70 CONTINUE
+      WORK( 1 ) = LWKOPT
 *
       RETURN
 *
-*     End of DGELSX
+*     End of DGELSY
 *
       END
-*> \brief <b> DGELSY solves overdetermined or underdetermined systems for GE matrices</b>
+*> \brief \b DGEMQRT
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -17663,28 +16399,27 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DGELSY + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsy.f"> 
+*> Download DGEMQRT + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgemqrt.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgelsy.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgemqrt.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsy.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgemqrt.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-*                          WORK, LWORK, INFO )
+*       SUBROUTINE DGEMQRT( SIDE, TRANS, M, N, K, NB, V, LDV, T, LDT, 
+*                          C, LDC, WORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
-*       DOUBLE PRECISION   RCOND
+*       CHARACTER SIDE, TRANS
+*       INTEGER   INFO, K, LDV, LDC, M, N, NB, LDT
 *       ..
 *       .. Array Arguments ..
-*       INTEGER            JPVT( * )
-*       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), WORK( * )
+*       DOUBLE PRECISION V( LDV, * ), C( LDC, * ), T( LDT, * ), WORK( * )
 *       ..
 *  
 *
@@ -17693,489 +16428,11 @@
 *>
 *> \verbatim
 *>
-*> DGELSY computes the minimum-norm solution to a real linear least
-*> squares problem:
-*>     minimize || A * X - B ||
-*> using a complete orthogonal factorization of A.  A is an M-by-N
-*> matrix which may be rank-deficient.
+*> DGEMQRT overwrites the general real M-by-N matrix C with
 *>
-*> Several right hand side vectors b and solution vectors x can be
-*> handled in a single call; they are stored as the columns of the
-*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
-*> matrix X.
-*>
-*> The routine first computes a QR factorization with column pivoting:
-*>     A * P = Q * [ R11 R12 ]
-*>                 [  0  R22 ]
-*> with R11 defined as the largest leading submatrix whose estimated
-*> condition number is less than 1/RCOND.  The order of R11, RANK,
-*> is the effective rank of A.
-*>
-*> Then, R22 is considered to be negligible, and R12 is annihilated
-*> by orthogonal transformations from the right, arriving at the
-*> complete orthogonal factorization:
-*>    A * P = Q * [ T11 0 ] * Z
-*>                [  0  0 ]
-*> The minimum-norm solution is then
-*>    X = P * Z**T [ inv(T11)*Q1**T*B ]
-*>                 [        0         ]
-*> where Q1 consists of the first RANK columns of Q.
-*>
-*> This routine is basically identical to the original xGELSX except
-*> three differences:
-*>   o The call to the subroutine xGEQPF has been substituted by the
-*>     the call to the subroutine xGEQP3. This subroutine is a Blas-3
-*>     version of the QR factorization with column pivoting.
-*>   o Matrix B (the right hand side) is updated with Blas-3.
-*>   o The permutation of matrix B (the right hand side) is faster and
-*>     more simple.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in] NRHS
-*> \verbatim
-*>          NRHS is INTEGER
-*>          The number of right hand sides, i.e., the number of
-*>          columns of matrices B and X. NRHS >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, A has been overwritten by details of its
-*>          complete orthogonal factorization.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[in,out] B
-*> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB,NRHS)
-*>          On entry, the M-by-NRHS right hand side matrix B.
-*>          On exit, the N-by-NRHS solution matrix X.
-*> \endverbatim
-*>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B. LDB >= max(1,M,N).
-*> \endverbatim
-*>
-*> \param[in,out] JPVT
-*> \verbatim
-*>          JPVT is INTEGER array, dimension (N)
-*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is permuted
-*>          to the front of AP, otherwise column i is a free column.
-*>          On exit, if JPVT(i) = k, then the i-th column of AP
-*>          was the k-th column of A.
-*> \endverbatim
-*>
-*> \param[in] RCOND
-*> \verbatim
-*>          RCOND is DOUBLE PRECISION
-*>          RCOND is used to determine the effective rank of A, which
-*>          is defined as the order of the largest leading triangular
-*>          submatrix R11 in the QR factorization with pivoting of A,
-*>          whose estimated condition number < 1/RCOND.
-*> \endverbatim
-*>
-*> \param[out] RANK
-*> \verbatim
-*>          RANK is INTEGER
-*>          The effective rank of A, i.e., the order of the submatrix
-*>          R11.  This is the same as the order of the submatrix T11
-*>          in the complete orthogonal factorization of A.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.
-*>          The unblocked strategy requires that:
-*>             LWORK >= MAX( MN+3*N+1, 2*MN+NRHS ),
-*>          where MN = min( M, N ).
-*>          The block algorithm requires that:
-*>             LWORK >= MAX( MN+2*N+NB*(N+1), 2*MN+NB*NRHS ),
-*>          where NB is an upper bound on the blocksize returned
-*>          by ILAENV for the routines DGEQP3, DTZRZF, STZRQF, DORMQR,
-*>          and DORMRZ.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0: successful exit
-*>          < 0: If INFO = -i, the i-th argument had an illegal value.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2011
-*
-*> \ingroup doubleGEsolve
-*
-*> \par Contributors:
-*  ==================
-*>
-*>    A. Petitet, Computer Science Dept., Univ. of Tenn., Knoxville, USA \n 
-*>    E. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
-*>    G. Quintana-Orti, Depto. de Informatica, Universidad Jaime I, Spain \n
-*>
-*  =====================================================================
-      SUBROUTINE DGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
-     $                   WORK, LWORK, INFO )
-*
-*  -- LAPACK driver routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, LDB, LWORK, M, N, NRHS, RANK
-      DOUBLE PRECISION   RCOND
-*     ..
-*     .. Array Arguments ..
-      INTEGER            JPVT( * )
-      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      INTEGER            IMAX, IMIN
-      PARAMETER          ( IMAX = 1, IMIN = 2 )
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            LQUERY
-      INTEGER            I, IASCL, IBSCL, ISMAX, ISMIN, J, LWKMIN,
-     $                   LWKOPT, MN, NB, NB1, NB2, NB3, NB4
-      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, C1, C2, S1, S2, SMAX,
-     $                   SMAXPR, SMIN, SMINPR, SMLNUM, WSIZE
-*     ..
-*     .. External Functions ..
-      INTEGER            ILAENV
-      DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           ILAENV, DLAMCH, DLANGE
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGEQP3, DLABAD, DLAIC1, DLASCL, DLASET,
-     $                   DORMQR, DORMRZ, DTRSM, DTZRZF, XERBLA
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MAX, MIN
-*     ..
-*     .. Executable Statements ..
-*
-      MN = MIN( M, N )
-      ISMIN = MN + 1
-      ISMAX = 2*MN + 1
-*
-*     Test the input arguments.
-*
-      INFO = 0
-      LQUERY = ( LWORK.EQ.-1 )
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( NRHS.LT.0 ) THEN
-         INFO = -3
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -5
-      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
-         INFO = -7
-      END IF
-*
-*     Figure out optimal block size
-*
-      IF( INFO.EQ.0 ) THEN
-         IF( MN.EQ.0 .OR. NRHS.EQ.0 ) THEN
-            LWKMIN = 1
-            LWKOPT = 1
-         ELSE
-            NB1 = ILAENV( 1, 'DGEQRF', ' ', M, N, -1, -1 )
-            NB2 = ILAENV( 1, 'DGERQF', ' ', M, N, -1, -1 )
-            NB3 = ILAENV( 1, 'DORMQR', ' ', M, N, NRHS, -1 )
-            NB4 = ILAENV( 1, 'DORMRQ', ' ', M, N, NRHS, -1 )
-            NB = MAX( NB1, NB2, NB3, NB4 )
-            LWKMIN = MN + MAX( 2*MN, N + 1, MN + NRHS )
-            LWKOPT = MAX( LWKMIN,
-     $                    MN + 2*N + NB*( N + 1 ), 2*MN + NB*NRHS )
-         END IF
-         WORK( 1 ) = LWKOPT
-*
-         IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
-            INFO = -12
-         END IF
-      END IF
-*
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGELSY', -INFO )
-         RETURN
-      ELSE IF( LQUERY ) THEN
-         RETURN
-      END IF
-*
-*     Quick return if possible
-*
-      IF( MN.EQ.0 .OR. NRHS.EQ.0 ) THEN
-         RANK = 0
-         RETURN
-      END IF
-*
-*     Get machine parameters
-*
-      SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
-      BIGNUM = ONE / SMLNUM
-      CALL DLABAD( SMLNUM, BIGNUM )
-*
-*     Scale A, B if max entries outside range [SMLNUM,BIGNUM]
-*
-      ANRM = DLANGE( 'M', M, N, A, LDA, WORK )
-      IASCL = 0
-      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
-*
-*        Scale matrix norm up to SMLNUM
-*
-         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
-         IASCL = 1
-      ELSE IF( ANRM.GT.BIGNUM ) THEN
-*
-*        Scale matrix norm down to BIGNUM
-*
-         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
-         IASCL = 2
-      ELSE IF( ANRM.EQ.ZERO ) THEN
-*
-*        Matrix all zero. Return zero solution.
-*
-         CALL DLASET( 'F', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
-         RANK = 0
-         GO TO 70
-      END IF
-*
-      BNRM = DLANGE( 'M', M, NRHS, B, LDB, WORK )
-      IBSCL = 0
-      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
-*
-*        Scale matrix norm up to SMLNUM
-*
-         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
-         IBSCL = 1
-      ELSE IF( BNRM.GT.BIGNUM ) THEN
-*
-*        Scale matrix norm down to BIGNUM
-*
-         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
-         IBSCL = 2
-      END IF
-*
-*     Compute QR factorization with column pivoting of A:
-*        A * P = Q * R
-*
-      CALL DGEQP3( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
-     $             LWORK-MN, INFO )
-      WSIZE = MN + WORK( MN+1 )
-*
-*     workspace: MN+2*N+NB*(N+1).
-*     Details of Householder rotations stored in WORK(1:MN).
-*
-*     Determine RANK using incremental condition estimation
-*
-      WORK( ISMIN ) = ONE
-      WORK( ISMAX ) = ONE
-      SMAX = ABS( A( 1, 1 ) )
-      SMIN = SMAX
-      IF( ABS( A( 1, 1 ) ).EQ.ZERO ) THEN
-         RANK = 0
-         CALL DLASET( 'F', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
-         GO TO 70
-      ELSE
-         RANK = 1
-      END IF
-*
-   10 CONTINUE
-      IF( RANK.LT.MN ) THEN
-         I = RANK + 1
-         CALL DLAIC1( IMIN, RANK, WORK( ISMIN ), SMIN, A( 1, I ),
-     $                A( I, I ), SMINPR, S1, C1 )
-         CALL DLAIC1( IMAX, RANK, WORK( ISMAX ), SMAX, A( 1, I ),
-     $                A( I, I ), SMAXPR, S2, C2 )
-*
-         IF( SMAXPR*RCOND.LE.SMINPR ) THEN
-            DO 20 I = 1, RANK
-               WORK( ISMIN+I-1 ) = S1*WORK( ISMIN+I-1 )
-               WORK( ISMAX+I-1 ) = S2*WORK( ISMAX+I-1 )
-   20       CONTINUE
-            WORK( ISMIN+RANK ) = C1
-            WORK( ISMAX+RANK ) = C2
-            SMIN = SMINPR
-            SMAX = SMAXPR
-            RANK = RANK + 1
-            GO TO 10
-         END IF
-      END IF
-*
-*     workspace: 3*MN.
-*
-*     Logically partition R = [ R11 R12 ]
-*                             [  0  R22 ]
-*     where R11 = R(1:RANK,1:RANK)
-*
-*     [R11,R12] = [ T11, 0 ] * Y
-*
-      IF( RANK.LT.N )
-     $   CALL DTZRZF( RANK, N, A, LDA, WORK( MN+1 ), WORK( 2*MN+1 ),
-     $                LWORK-2*MN, INFO )
-*
-*     workspace: 2*MN.
-*     Details of Householder rotations stored in WORK(MN+1:2*MN)
-*
-*     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
-*
-      CALL DORMQR( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
-     $             B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
-      WSIZE = MAX( WSIZE, 2*MN+WORK( 2*MN+1 ) )
-*
-*     workspace: 2*MN+NB*NRHS.
-*
-*     B(1:RANK,1:NRHS) := inv(T11) * B(1:RANK,1:NRHS)
-*
-      CALL DTRSM( 'Left', 'Upper', 'No transpose', 'Non-unit', RANK,
-     $            NRHS, ONE, A, LDA, B, LDB )
-*
-      DO 40 J = 1, NRHS
-         DO 30 I = RANK + 1, N
-            B( I, J ) = ZERO
-   30    CONTINUE
-   40 CONTINUE
-*
-*     B(1:N,1:NRHS) := Y**T * B(1:N,1:NRHS)
-*
-      IF( RANK.LT.N ) THEN
-         CALL DORMRZ( 'Left', 'Transpose', N, NRHS, RANK, N-RANK, A,
-     $                LDA, WORK( MN+1 ), B, LDB, WORK( 2*MN+1 ),
-     $                LWORK-2*MN, INFO )
-      END IF
-*
-*     workspace: 2*MN+NRHS.
-*
-*     B(1:N,1:NRHS) := P * B(1:N,1:NRHS)
-*
-      DO 60 J = 1, NRHS
-         DO 50 I = 1, N
-            WORK( JPVT( I ) ) = B( I, J )
-   50    CONTINUE
-         CALL DCOPY( N, WORK( 1 ), 1, B( 1, J ), 1 )
-   60 CONTINUE
-*
-*     workspace: N.
-*
-*     Undo scaling
-*
-      IF( IASCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
-         CALL DLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
-     $                INFO )
-      ELSE IF( IASCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
-         CALL DLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
-     $                INFO )
-      END IF
-      IF( IBSCL.EQ.1 ) THEN
-         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
-      ELSE IF( IBSCL.EQ.2 ) THEN
-         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
-      END IF
-*
-   70 CONTINUE
-      WORK( 1 ) = LWKOPT
-*
-      RETURN
-*
-*     End of DGELSY
-*
-      END
-*> \brief \b DGEMQRT
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DGEMQRT + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgemqrt.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgemqrt.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgemqrt.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DGEMQRT( SIDE, TRANS, M, N, K, NB, V, LDV, T, LDT, 
-*                          C, LDC, WORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER SIDE, TRANS
-*       INTEGER   INFO, K, LDV, LDC, M, N, NB, LDT
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION V( LDV, * ), C( LDC, * ), T( LDT, * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DGEMQRT overwrites the general real M-by-N matrix C with
-*>
-*>                 SIDE = 'L'     SIDE = 'R'
-*> TRANS = 'N':      Q C            C Q
-*> TRANS = 'T':   Q**T C            C Q**T
+*>                 SIDE = 'L'     SIDE = 'R'
+*> TRANS = 'N':      Q C            C Q
+*> TRANS = 'T':   Q**T C            C Q**T
 *>
 *> where Q is a real orthogonal matrix defined as the product of K
 *> elementary reflectors:
@@ -19027,7 +17284,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleGEcomputational
 *
@@ -19058,10 +17315,10 @@
 *  =====================================================================
       SUBROUTINE DGEQP3( M, N, A, LDA, JPVT, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, LWORK, M, N
@@ -19132,12 +17389,6 @@
          RETURN
       END IF
 *
-*     Quick return if possible.
-*
-      IF( MINMN.EQ.0 ) THEN
-         RETURN
-      END IF
-*
 *     Move initial columns up front.
 *
       NFXD = 1
@@ -19272,312 +17523,6 @@
 *     End of DGEQP3
 *
       END
-*> \brief \b DGEQPF
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DGEQPF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqpf.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgeqpf.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqpf.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, M, N
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            JPVT( * )
-*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> This routine is deprecated and has been replaced by routine DGEQP3.
-*>
-*> DGEQPF computes a QR factorization with column pivoting of a
-*> real M-by-N matrix A: A*P = Q*R.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A. M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A. N >= 0
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, the upper triangle of the array contains the
-*>          min(M,N)-by-N upper triangular matrix R; the elements
-*>          below the diagonal, together with the array TAU,
-*>          represent the orthogonal matrix Q as a product of
-*>          min(m,n) elementary reflectors.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[in,out] JPVT
-*> \verbatim
-*>          JPVT is INTEGER array, dimension (N)
-*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is permuted
-*>          to the front of A*P (a leading column); if JPVT(i) = 0,
-*>          the i-th column of A is a free column.
-*>          On exit, if JPVT(i) = k, then the i-th column of A*P
-*>          was the k-th column of A.
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION array, dimension (min(M,N))
-*>          The scalar factors of the elementary reflectors.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (3*N)
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2011
-*
-*> \ingroup doubleGEcomputational
-*
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of elementary reflectors
-*>
-*>     Q = H(1) H(2) . . . H(n)
-*>
-*>  Each H(i) has the form
-*>
-*>     H = I - tau * v * v**T
-*>
-*>  where tau is a real scalar, and v is a real vector with
-*>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i).
-*>
-*>  The matrix P is represented in jpvt as follows: If
-*>     jpvt(j) = i
-*>  then the jth column of P is the ith canonical unit vector.
-*>
-*>  Partial column norm updating strategy modified by
-*>    Z. Drmac and Z. Bujanovic, Dept. of Mathematics,
-*>    University of Zagreb, Croatia.
-*>  -- April 2011                                                      --
-*>  For more details see LAPACK Working Note 176.
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
-*
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, M, N
-*     ..
-*     .. Array Arguments ..
-      INTEGER            JPVT( * )
-      DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, ITEMP, J, MA, MN, PVT
-      DOUBLE PRECISION   AII, TEMP, TEMP2, TOL3Z
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DGEQR2, DLARF, DLARFG, DORM2R, DSWAP, XERBLA
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MAX, MIN, SQRT
-*     ..
-*     .. External Functions ..
-      INTEGER            IDAMAX
-      DOUBLE PRECISION   DLAMCH, DNRM2
-      EXTERNAL           IDAMAX, DLAMCH, DNRM2
-*     ..
-*     .. Executable Statements ..
-*
-*     Test the input arguments
-*
-      INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -4
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGEQPF', -INFO )
-         RETURN
-      END IF
-*
-      MN = MIN( M, N )
-      TOL3Z = SQRT(DLAMCH('Epsilon'))
-*
-*     Move initial columns up front
-*
-      ITEMP = 1
-      DO 10 I = 1, N
-         IF( JPVT( I ).NE.0 ) THEN
-            IF( I.NE.ITEMP ) THEN
-               CALL DSWAP( M, A( 1, I ), 1, A( 1, ITEMP ), 1 )
-               JPVT( I ) = JPVT( ITEMP )
-               JPVT( ITEMP ) = I
-            ELSE
-               JPVT( I ) = I
-            END IF
-            ITEMP = ITEMP + 1
-         ELSE
-            JPVT( I ) = I
-         END IF
-   10 CONTINUE
-      ITEMP = ITEMP - 1
-*
-*     Compute the QR factorization and update remaining columns
-*
-      IF( ITEMP.GT.0 ) THEN
-         MA = MIN( ITEMP, M )
-         CALL DGEQR2( M, MA, A, LDA, TAU, WORK, INFO )
-         IF( MA.LT.N ) THEN
-            CALL DORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA, TAU,
-     $                   A( 1, MA+1 ), LDA, WORK, INFO )
-         END IF
-      END IF
-*
-      IF( ITEMP.LT.MN ) THEN
-*
-*        Initialize partial column norms. The first n elements of
-*        work store the exact column norms.
-*
-         DO 20 I = ITEMP + 1, N
-            WORK( I ) = DNRM2( M-ITEMP, A( ITEMP+1, I ), 1 )
-            WORK( N+I ) = WORK( I )
-   20    CONTINUE
-*
-*        Compute factorization
-*
-         DO 40 I = ITEMP + 1, MN
-*
-*           Determine ith pivot column and swap if necessary
-*
-            PVT = ( I-1 ) + IDAMAX( N-I+1, WORK( I ), 1 )
-*
-            IF( PVT.NE.I ) THEN
-               CALL DSWAP( M, A( 1, PVT ), 1, A( 1, I ), 1 )
-               ITEMP = JPVT( PVT )
-               JPVT( PVT ) = JPVT( I )
-               JPVT( I ) = ITEMP
-               WORK( PVT ) = WORK( I )
-               WORK( N+PVT ) = WORK( N+I )
-            END IF
-*
-*           Generate elementary reflector H(i)
-*
-            IF( I.LT.M ) THEN
-               CALL DLARFG( M-I+1, A( I, I ), A( I+1, I ), 1, TAU( I ) )
-            ELSE
-               CALL DLARFG( 1, A( M, M ), A( M, M ), 1, TAU( M ) )
-            END IF
-*
-            IF( I.LT.N ) THEN
-*
-*              Apply H(i) to A(i:m,i+1:n) from the left
-*
-               AII = A( I, I )
-               A( I, I ) = ONE
-               CALL DLARF( 'LEFT', M-I+1, N-I, A( I, I ), 1, TAU( I ),
-     $                     A( I, I+1 ), LDA, WORK( 2*N+1 ) )
-               A( I, I ) = AII
-            END IF
-*
-*           Update partial column norms
-*
-            DO 30 J = I + 1, N
-               IF( WORK( J ).NE.ZERO ) THEN
-*
-*                 NOTE: The following 4 lines follow from the analysis in
-*                 Lapack Working Note 176.
-*                 
-                  TEMP = ABS( A( I, J ) ) / WORK( J )
-                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
-                  TEMP2 = TEMP*( WORK( J ) / WORK( N+J ) )**2
-                  IF( TEMP2 .LE. TOL3Z ) THEN 
-                     IF( M-I.GT.0 ) THEN
-                        WORK( J ) = DNRM2( M-I, A( I+1, J ), 1 )
-                        WORK( N+J ) = WORK( J )
-                     ELSE
-                        WORK( J ) = ZERO
-                        WORK( N+J ) = ZERO
-                     END IF
-                  ELSE
-                     WORK( J ) = WORK( J )*SQRT( TEMP )
-                  END IF
-               END IF
-   30       CONTINUE
-*
-   40    CONTINUE
-      END IF
-      RETURN
-*
-*     End of DGEQPF
-*
-      END
 *> \brief \b DGEQR2 computes the QR factorization of a general rectangular matrix using an unblocked algorithm.
 *
 *  =========== DOCUMENTATION ===========
@@ -19806,7 +17751,7 @@
 *> \verbatim
 *>
 *> DGEQR2 computes a QR factorization of a real m by n matrix A:
-*> A = Q * R.
+*> A = Q * R. The diagonal entries of R are nonnegative.
 *> \endverbatim
 *
 *  Arguments:
@@ -19830,7 +17775,8 @@
 *>          On entry, the m by n matrix A.
 *>          On exit, the elements on and above the diagonal of the array
 *>          contain the min(m,n) by n upper trapezoidal matrix R (R is
-*>          upper triangular if m >= n); the elements below the diagonal,
+*>          upper triangular if m >= n). The diagonal entries of R are
+*>          nonnegative; the elements below the diagonal,
 *>          with the array TAU, represent the orthogonal matrix Q as a
 *>          product of elementary reflectors (see Further Details).
 *> \endverbatim
@@ -19868,7 +17814,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleGEcomputational
 *
@@ -19888,15 +17834,17 @@
 *>  where tau is a real scalar, and v is a real vector with
 *>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
 *>  and tau in TAU(i).
+*>
+*> See Lapack Working Note 203 for details
 *> \endverbatim
 *>
 *  =====================================================================
       SUBROUTINE DGEQR2P( M, N, A, LDA, TAU, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, M, N
@@ -20268,7 +18216,7 @@
 *> \verbatim
 *>
 *> DGEQRFP computes a QR factorization of a real M-by-N matrix A:
-*> A = Q * R.
+*> A = Q * R. The diagonal entries of R are nonnegative.
 *> \endverbatim
 *
 *  Arguments:
@@ -20292,7 +18240,8 @@
 *>          On entry, the M-by-N matrix A.
 *>          On exit, the elements on and above the diagonal of the array
 *>          contain the min(M,N)-by-N upper trapezoidal matrix R (R is
-*>          upper triangular if m >= n); the elements below the diagonal,
+*>          upper triangular if m >= n). The diagonal entries of R
+*>          are nonnegative; the elements below the diagonal,
 *>          with the array TAU, represent the orthogonal matrix Q as a
 *>          product of min(m,n) elementary reflectors (see Further
 *>          Details).
@@ -20345,7 +18294,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleGEcomputational
 *
@@ -20365,15 +18314,17 @@
 *>  where tau is a real scalar, and v is a real vector with
 *>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
 *>  and tau in TAU(i).
+*>
+*> See Lapack Working Note 203 for details
 *> \endverbatim
 *>
 *  =====================================================================
       SUBROUTINE DGEQRFP( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, LWORK, M, N
@@ -22501,7 +20452,7 @@
 *>            LWORK >= 3*min(M,N) + 
 *>                     max(max(M,N),5*min(M,N)*min(M,N)+4*min(M,N)).
 *>          If JOBZ = 'S' or 'A'
-*>            LWORK >= min(M,N)*(6+4*min(M,N))+max(M,N)
+*>            LWORK >= min(M,N)*(7+4*min(M,N))
 *>          For good performance, LWORK should generally be larger.
 *>          If LWORK = -1 but other input arguments are legal, WORK(1)
 *>          returns the optimal LWORK.
@@ -22528,7 +20479,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2013
+*> \date November 2015
 *
 *> \ingroup doubleGEsing
 *
@@ -22542,10 +20493,10 @@
       SUBROUTINE DGESDD( JOBZ, M, N, A, LDA, S, U, LDU, VT, LDVT, WORK,
      $                   LWORK, IWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.5.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ
@@ -27473,6 +25424,8 @@
 *> matrix, and V is an N-by-N orthogonal matrix. The diagonal elements
 *> of SIGMA are the singular values of A. The columns of U and V are the
 *> left and the right singular vectors of A, respectively.
+*> DGESVJ can sometimes compute tiny singular values and their singular vectors much
+*> more accurately than other SVD routines, see below under Further Details.
 *> \endverbatim
 *
 *  Arguments:
@@ -27686,7 +25639,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleGEcomputational
 *
@@ -27763,10 +25716,10 @@
       SUBROUTINE DGESVJ( JOBA, JOBU, JOBV, M, N, A, LDA, SVA, MV, V,
      $                   LDV, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, LDV, LWORK, M, MV, N
@@ -27802,7 +25755,7 @@
       DOUBLE PRECISION   FASTR( 5 )
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DABS, DMAX1, DMIN1, DBLE, MIN0, DSIGN, DSQRT
+      INTRINSIC          DABS, MAX, MIN, DBLE, DSIGN, DSQRT
 *     ..
 *     .. External Functions ..
 *     ..
@@ -27856,7 +25809,7 @@
          INFO = -11
       ELSE IF( UCTOL .AND. ( WORK( 1 ).LE.ONE ) ) THEN
          INFO = -12
-      ELSE IF( LWORK.LT.MAX0( M+N, 6 ) ) THEN
+      ELSE IF( LWORK.LT.MAX( M+N, 6 ) ) THEN
          INFO = -13
       ELSE
          INFO = 0
@@ -28022,8 +25975,8 @@
       AAPP = ZERO
       AAQQ = BIG
       DO 4781 p = 1, N
-         IF( SVA( p ).NE.ZERO )AAQQ = DMIN1( AAQQ, SVA( p ) )
-         AAPP = DMAX1( AAPP, SVA( p ) )
+         IF( SVA( p ).NE.ZERO )AAQQ = MIN( AAQQ, SVA( p ) )
+         AAPP = MAX( AAPP, SVA( p ) )
  4781 CONTINUE
 *
 * #:) Quick return for zero matrix
@@ -28064,19 +26017,19 @@
       TEMP1 = DSQRT( BIG / DBLE( N ) )
       IF( ( AAPP.LE.SN ) .OR. ( AAQQ.GE.TEMP1 ) .OR.
      $    ( ( SN.LE.AAQQ ) .AND. ( AAPP.LE.TEMP1 ) ) ) THEN
-         TEMP1 = DMIN1( BIG, TEMP1 / AAPP )
+         TEMP1 = MIN( BIG, TEMP1 / AAPP )
 *         AAQQ  = AAQQ*TEMP1
 *         AAPP  = AAPP*TEMP1
       ELSE IF( ( AAQQ.LE.SN ) .AND. ( AAPP.LE.TEMP1 ) ) THEN
-         TEMP1 = DMIN1( SN / AAQQ, BIG / ( AAPP*DSQRT( DBLE( N ) ) ) )
+         TEMP1 = MIN( SN / AAQQ, BIG / ( AAPP*DSQRT( DBLE( N ) ) ) )
 *         AAQQ  = AAQQ*TEMP1
 *         AAPP  = AAPP*TEMP1
       ELSE IF( ( AAQQ.GE.SN ) .AND. ( AAPP.GE.TEMP1 ) ) THEN
-         TEMP1 = DMAX1( SN / AAQQ, TEMP1 / AAPP )
+         TEMP1 = MAX( SN / AAQQ, TEMP1 / AAPP )
 *         AAQQ  = AAQQ*TEMP1
 *         AAPP  = AAPP*TEMP1
       ELSE IF( ( AAQQ.LE.SN ) .AND. ( AAPP.GE.TEMP1 ) ) THEN
-         TEMP1 = DMIN1( SN / AAQQ, BIG / ( DSQRT( DBLE( N ) )*AAPP ) )
+         TEMP1 = MIN( SN / AAQQ, BIG / ( DSQRT( DBLE( N ) )*AAPP ) )
 *         AAQQ  = AAQQ*TEMP1
 *         AAPP  = AAPP*TEMP1
       ELSE
@@ -28117,7 +26070,7 @@
 *     The boundaries are determined dynamically, based on the number of
 *     pivots above a threshold.
 *
-      KBL = MIN0( 8, N )
+      KBL = MIN( 8, N )
 *[TP] KBL is a tuning parameter that defines the tile size in the
 *     tiling of the p-q loops of pivot pairs. In general, an optimal
 *     value of KBL depends on the matrix dimensions and on the
@@ -28129,7 +26082,7 @@
       BLSKIP = KBL**2
 *[TP] BLKSKIP is a tuning parameter that depends on SWBAND and KBL.
 *
-      ROWSKIP = MIN0( 5, KBL )
+      ROWSKIP = MIN( 5, KBL )
 *[TP] ROWSKIP is a tuning parameter.
 *
       LKAHEAD = 1
@@ -28140,7 +26093,7 @@
 *     invokes cubic convergence. Big part of this cycle is done inside
 *     canonical subspaces of dimensions less than M.
 *
-      IF( ( LOWER .OR. UPPER ) .AND. ( N.GT.MAX0( 64, 4*KBL ) ) ) THEN
+      IF( ( LOWER .OR. UPPER ) .AND. ( N.GT.MAX( 64, 4*KBL ) ) ) THEN
 *[TP] The number of partition levels and the actual partition are
 *     tuning parameters.
          N4 = N / 4
@@ -28238,11 +26191,11 @@
 *
             igl = ( ibr-1 )*KBL + 1
 *
-            DO 1002 ir1 = 0, MIN0( LKAHEAD, NBL-ibr )
+            DO 1002 ir1 = 0, MIN( LKAHEAD, NBL-ibr )
 *
                igl = igl + ir1*KBL
 *
-               DO 2001 p = igl, MIN0( igl+KBL-1, N-1 )
+               DO 2001 p = igl, MIN( igl+KBL-1, N-1 )
 *
 *     .. de Rijk's pivoting
 *
@@ -28291,7 +26244,7 @@
 *
                      PSKIPPED = 0
 *
-                     DO 2002 q = p + 1, MIN0( igl+KBL-1, N )
+                     DO 2002 q = p + 1, MIN( igl+KBL-1, N )
 *
                         AAQQ = SVA( q )
 *
@@ -28330,7 +26283,7 @@
                               END IF
                            END IF
 *
-                           MXAAPQ = DMAX1( MXAAPQ, DABS( AAPQ ) )
+                           MXAAPQ = MAX( MXAAPQ, DABS( AAPQ ) )
 *
 *        TO rotate or NOT to rotate, THAT is the question ...
 *
@@ -28363,11 +26316,11 @@
      $                                              V( 1, p ), 1,
      $                                              V( 1, q ), 1,
      $                                              FASTR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO,
+                                    AAPP = AAPP*DSQRT( MAX( ZERO,
      $                                     ONE-T*AQOAP*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, DABS( T ) )
+                                    MXSINJ = MAX( MXSINJ, DABS( T ) )
 *
                                  ELSE
 *
@@ -28379,10 +26332,10 @@
                                     CS = DSQRT( ONE / ( ONE+T*T ) )
                                     SN = T*CS
 *
-                                    MXSINJ = DMAX1( MXSINJ, DABS( SN ) )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    MXSINJ = MAX( MXSINJ, DABS( SN ) )
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO,
+                                    AAPP = AAPP*DSQRT( MAX( ZERO,
      $                                     ONE-T*AQOAP*AAPQ ) )
 *
                                     APOAQ = WORK( p ) / WORK( q )
@@ -28496,9 +26449,9 @@
      $                                       A( 1, q ), 1 )
                                  CALL DLASCL( 'G', 0, 0, ONE, AAQQ, M,
      $                                        1, A( 1, q ), LDA, IERR )
-                                 SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                 SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                      ONE-AAPQ*AAPQ ) )
-                                 MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                 MXSINJ = MAX( MXSINJ, SFMIN )
                               END IF
 *           END IF ROTOK THEN ... ELSE
 *
@@ -28564,7 +26517,7 @@
                   ELSE
                      SVA( p ) = AAPP
                      IF( ( ir1.EQ.0 ) .AND. ( AAPP.EQ.ZERO ) )
-     $                   NOTROT = NOTROT + MIN0( igl+KBL-1, N ) - p
+     $                   NOTROT = NOTROT + MIN( igl+KBL-1, N ) - p
                   END IF
 *
  2001          CONTINUE
@@ -28584,14 +26537,14 @@
 *        doing the block at ( ibr, jbc )
 *
                IJBLSK = 0
-               DO 2100 p = igl, MIN0( igl+KBL-1, N )
+               DO 2100 p = igl, MIN( igl+KBL-1, N )
 *
                   AAPP = SVA( p )
                   IF( AAPP.GT.ZERO ) THEN
 *
                      PSKIPPED = 0
 *
-                     DO 2200 q = jgl, MIN0( jgl+KBL-1, N )
+                     DO 2200 q = jgl, MIN( jgl+KBL-1, N )
 *
                         AAQQ = SVA( q )
                         IF( AAQQ.GT.ZERO ) THEN
@@ -28641,7 +26594,7 @@
                               END IF
                            END IF
 *
-                           MXAAPQ = DMAX1( MXAAPQ, DABS( AAPQ ) )
+                           MXAAPQ = MAX( MXAAPQ, DABS( AAPQ ) )
 *
 *        TO rotate or NOT to rotate, THAT is the question ...
 *
@@ -28669,11 +26622,11 @@
      $                                              V( 1, p ), 1,
      $                                              V( 1, q ), 1,
      $                                              FASTR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO,
+                                    AAPP = AAPP*DSQRT( MAX( ZERO,
      $                                     ONE-T*AQOAP*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, DABS( T ) )
+                                    MXSINJ = MAX( MXSINJ, DABS( T ) )
                                  ELSE
 *
 *                 .. choose correct signum for THETA and rotate
@@ -28684,10 +26637,10 @@
      $                                  DSQRT( ONE+THETA*THETA ) )
                                     CS = DSQRT( ONE / ( ONE+T*T ) )
                                     SN = T*CS
-                                    MXSINJ = DMAX1( MXSINJ, DABS( SN ) )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    MXSINJ = MAX( MXSINJ, DABS( SN ) )
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO, 
+                                    AAPP = AAPP*DSQRT( MAX( ZERO, 
      $                                     ONE-T*AQOAP*AAPQ ) )
 *
                                     APOAQ = WORK( p ) / WORK( q )
@@ -28804,9 +26757,9 @@
                                     CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                    MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
                                     CALL DCOPY( M, A( 1, q ), 1,
      $                                          WORK( N+1 ), 1 )
@@ -28822,9 +26775,9 @@
                                     CALL DLASCL( 'G', 0, 0, ONE, AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
-                                    SVA( p ) = AAPP*DSQRT( DMAX1( ZERO,
+                                    SVA( p ) = AAPP*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                    MXSINJ = MAX( MXSINJ, SFMIN )
                                  END IF
                               END IF
 *           END IF ROTOK THEN ... ELSE
@@ -28894,7 +26847,7 @@
                   ELSE
 *
                      IF( AAPP.EQ.ZERO )NOTROT = NOTROT +
-     $                   MIN0( jgl+KBL-1, N ) - jgl + 1
+     $                   MIN( jgl+KBL-1, N ) - jgl + 1
                      IF( AAPP.LT.ZERO )NOTROT = 0
 *
                   END IF
@@ -28905,7 +26858,7 @@
 *     end of the jbc-loop
  2011       CONTINUE
 *2011 bailed out of the jbc-loop
-            DO 2012 p = igl, MIN0( igl+KBL-1, N )
+            DO 2012 p = igl, MIN( igl+KBL-1, N )
                SVA( p ) = DABS( SVA( p ) )
  2012       CONTINUE
 ***
@@ -30173,17 +28126,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleGEcomputational
 *
 *  =====================================================================
       SUBROUTINE DGETRF( M, N, A, LDA, IPIV, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, M, N
@@ -30203,7 +28156,7 @@
       INTEGER            I, IINFO, J, JB, NB
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DGETF2, DLASWP, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DGETRF2, DLASWP, DTRSM, XERBLA
 *     ..
 *     .. External Functions ..
       INTEGER            ILAENV
@@ -30241,7 +28194,7 @@
 *
 *        Use unblocked code.
 *
-         CALL DGETF2( M, N, A, LDA, IPIV, INFO )
+         CALL DGETRF2( M, N, A, LDA, IPIV, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -30252,7 +28205,7 @@
 *           Factor diagonal and subdiagonal blocks and test for exact
 *           singularity.
 *
-            CALL DGETF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
+            CALL DGETRF2( M-J+1, JB, A( J, J ), LDA, IPIV( J ), IINFO )
 *
 *           Adjust INFO and the pivot indices.
 *
@@ -30295,6 +28248,278 @@
 *     End of DGETRF
 *
       END
+*> \brief \b DGETRF2
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*  Definition:
+*  ===========
+*
+*       RECURSIVE SUBROUTINE DGETRF2( M, N, A, LDA, IPIV, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IPIV( * )
+*       DOUBLE PRECISION   A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DGETRF2 computes an LU factorization of a general M-by-N matrix A
+*> using partial pivoting with row interchanges.
+*>
+*> The factorization has the form
+*>    A = P * L * U
+*> where P is a permutation matrix, L is lower triangular with unit
+*> diagonal elements (lower trapezoidal if m > n), and U is upper
+*> triangular (upper trapezoidal if m < n).
+*>
+*> This is the recursive version of the algorithm. It divides
+*> the matrix into four submatrices:
+*>            
+*>        [  A11 | A12  ]  where A11 is n1 by n1 and A22 is n2 by n2
+*>    A = [ -----|----- ]  with n1 = min(m,n)
+*>        [  A21 | A22  ]       n2 = n-n1
+*>            
+*>                                       [ A11 ]
+*> The subroutine calls itself to factor [ --- ],
+*>                                       [ A12 ]
+*>                 [ A12 ]
+*> do the swaps on [ --- ], solve A12, update A22,
+*>                 [ A22 ]
+*>
+*> then calls itself to factor A22 and do the swaps on A21.
+*>
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix to be factored.
+*>          On exit, the factors L and U from the factorization
+*>          A = P*L*U; the unit diagonal elements of L are not stored.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] IPIV
+*> \verbatim
+*>          IPIV is INTEGER array, dimension (min(M,N))
+*>          The pivot indices; for 1 <= i <= min(M,N), row i of the
+*>          matrix was interchanged with row IPIV(i).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, U(i,i) is exactly zero. The factorization
+*>                has been completed, but the factor U is exactly
+*>                singular, and division by zero will occur if it is used
+*>                to solve a system of equations.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup doubleGEcomputational
+*
+*  =====================================================================
+      RECURSIVE SUBROUTINE DGETRF2( M, N, A, LDA, IPIV, INFO )
+*
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IPIV( * )
+      DOUBLE PRECISION   A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      DOUBLE PRECISION   SFMIN, TEMP
+      INTEGER            I, IINFO, N1, N2
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH
+      INTEGER            IDAMAX
+      EXTERNAL           DLAMCH, IDAMAX
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEMM, DSCAL, DLASWP, DTRSM, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters
+*
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGETRF2', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( M.EQ.0 .OR. N.EQ.0 )
+     $   RETURN
+
+      IF ( M.EQ.1 ) THEN
+*
+*        Use unblocked code for one row case
+*        Just need to handle IPIV and INFO
+*
+         IPIV( 1 ) = 1
+         IF ( A(1,1).EQ.ZERO )
+     $      INFO = 1
+*
+      ELSE IF( N.EQ.1 ) THEN
+*
+*        Use unblocked code for one column case
+*
+*
+*        Compute machine safe minimum
+*
+         SFMIN = DLAMCH('S')
+*
+*        Find pivot and test for singularity
+*
+         I = IDAMAX( M, A( 1, 1 ), 1 )
+         IPIV( 1 ) = I
+         IF( A( I, 1 ).NE.ZERO ) THEN
+*
+*           Apply the interchange
+*
+            IF( I.NE.1 ) THEN
+               TEMP = A( 1, 1 )
+               A( 1, 1 ) = A( I, 1 )
+               A( I, 1 ) = TEMP
+            END IF
+*
+*           Compute elements 2:M of the column
+*
+            IF( ABS(A( 1, 1 )) .GE. SFMIN ) THEN
+               CALL DSCAL( M-1, ONE / A( 1, 1 ), A( 2, 1 ), 1 )
+            ELSE
+               DO 10 I = 1, M-1
+                  A( 1+I, 1 ) = A( 1+I, 1 ) / A( 1, 1 )
+   10          CONTINUE
+            END IF
+*
+         ELSE
+            INFO = 1
+         END IF
+*
+      ELSE
+*
+*        Use recursive code
+*
+         N1 = MIN( M, N ) / 2
+         N2 = N-N1
+*
+*               [ A11 ]
+*        Factor [ --- ]
+*               [ A21 ]
+*
+         CALL DGETRF2( M, N1, A, LDA, IPIV, IINFO )
+
+         IF ( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $      INFO = IINFO
+*
+*                              [ A12 ]
+*        Apply interchanges to [ --- ]
+*                              [ A22 ]
+*
+         CALL DLASWP( N2, A( 1, N1+1 ), LDA, 1, N1, IPIV, 1 )
+*
+*        Solve A12
+*
+         CALL DTRSM( 'L', 'L', 'N', 'U', N1, N2, ONE, A, LDA, 
+     $               A( 1, N1+1 ), LDA )
+*
+*        Update A22
+*
+         CALL DGEMM( 'N', 'N', M-N1, N2, N1, -ONE, A( N1+1, 1 ), LDA, 
+     $               A( 1, N1+1 ), LDA, ONE, A( N1+1, N1+1 ), LDA )
+*
+*        Factor A22
+*
+         CALL DGETRF2( M-N1, N2, A( N1+1, N1+1 ), LDA, IPIV( N1+1 ),
+     $                 IINFO )
+*
+*        Adjust INFO and the pivot indices
+*
+         IF ( INFO.EQ.0 .AND. IINFO.GT.0 )
+     $      INFO = IINFO + N1
+         DO 20 I = N1+1, MIN( M, N )
+            IPIV( I ) = IPIV( I ) + N1
+   20    CONTINUE
+*
+*        Apply interchanges to A21
+*
+         CALL DLASWP( N1, A( 1, 1 ), LDA, N1+1, MIN( M, N), IPIV, 1 )
+*
+      END IF
+      RETURN
+*
+*     End of DGETRF2
+*
+      END
 *> \brief \b DGETRI
 *
 *  =========== DOCUMENTATION ===========
@@ -30913,7 +29138,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleGBcomputational
 *
@@ -30930,10 +29155,10 @@
       SUBROUTINE DGGBAK( JOB, SIDE, N, ILO, IHI, LSCALE, RSCALE, M, V,
      $                   LDV, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOB, SIDE
@@ -30957,7 +29182,7 @@
       EXTERNAL           DSCAL, DSWAP, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          MAX
+      INTRINSIC          MAX, INT
 *     ..
 *     .. Executable Statements ..
 *
@@ -31038,7 +29263,7 @@
      $         GO TO 50
 *
             DO 40 I = ILO - 1, 1, -1
-               K = RSCALE( I )
+               K = INT(RSCALE( I ))
                IF( K.EQ.I )
      $            GO TO 40
                CALL DSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -31048,7 +29273,7 @@
             IF( IHI.EQ.N )
      $         GO TO 70
             DO 60 I = IHI + 1, N
-               K = RSCALE( I )
+               K = INT(RSCALE( I ))
                IF( K.EQ.I )
      $            GO TO 60
                CALL DSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -31062,7 +29287,7 @@
             IF( ILO.EQ.1 )
      $         GO TO 90
             DO 80 I = ILO - 1, 1, -1
-               K = LSCALE( I )
+               K = INT(LSCALE( I ))
                IF( K.EQ.I )
      $            GO TO 80
                CALL DSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -31072,7 +29297,7 @@
             IF( IHI.EQ.N )
      $         GO TO 110
             DO 100 I = IHI + 1, N
-               K = LSCALE( I )
+               K = INT(LSCALE( I ))
                IF( K.EQ.I )
      $            GO TO 100
                CALL DSWAP( M, V( I, 1 ), LDV, V( K, 1 ), LDV )
@@ -31249,7 +29474,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleGBcomputational
 *
@@ -31266,10 +29491,10 @@
       SUBROUTINE DGGBAL( JOB, N, A, LDA, B, LDB, ILO, IHI, LSCALE,
      $                   RSCALE, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOB
@@ -31614,7 +29839,7 @@
          IRAB = IDAMAX( N-ILO+1, B( I, ILO ), LDB )
          RAB = MAX( RAB, ABS( B( I, IRAB+ILO-1 ) ) )
          LRAB = INT( LOG10( RAB+SFMIN ) / BASL+ONE )
-         IR = LSCALE( I ) + SIGN( HALF, LSCALE( I ) )
+         IR = INT(LSCALE( I ) + SIGN( HALF, LSCALE( I ) ))
          IR = MIN( MAX( IR, LSFMIN ), LSFMAX, LSFMAX-LRAB )
          LSCALE( I ) = SCLFAC**IR
          ICAB = IDAMAX( IHI, A( 1, I ), 1 )
@@ -31622,7 +29847,7 @@
          ICAB = IDAMAX( IHI, B( 1, I ), 1 )
          CAB = MAX( CAB, ABS( B( ICAB, I ) ) )
          LCAB = INT( LOG10( CAB+SFMIN ) / BASL+ONE )
-         JC = RSCALE( I ) + SIGN( HALF, RSCALE( I ) )
+         JC = INT(RSCALE( I ) + SIGN( HALF, RSCALE( I ) ))
          JC = MIN( MAX( JC, LSFMIN ), LSFMAX, LSFMAX-LCAB )
          RSCALE( I ) = SCLFAC**JC
   360 CONTINUE
@@ -34608,7 +32833,7 @@
 *     End of DGGEVX
 *
       END
-*> \brief <b> DGGEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*> \brief \b DGGGLM
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -34787,7 +33012,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -34795,10 +33020,10 @@
       SUBROUTINE DGGGLM( N, M, P, A, LDA, B, LDB, D, X, Y, WORK, LWORK,
      $                   INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, LDB, LWORK, M, N, P
@@ -36269,7 +34494,7 @@
 *     End of DGGRQF
 *
       END
-*> \brief <b> DGGSVD computes the singular value decomposition (SVD) for OTHER matrices</b>
+*> \brief \b DGSVJ0 pre-processor for the routine dgesvj.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -36277,994 +34502,12 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DGGSVD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvd.f"> 
+*> Download DGSVJ0 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgsvj0.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dggsvd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgsvj0.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvd.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DGGSVD( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
-*                          LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ, WORK,
-*                          IWORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          JOBQ, JOBU, JOBV
-*       INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            IWORK( * )
-*       DOUBLE PRECISION   A( LDA, * ), ALPHA( * ), B( LDB, * ),
-*      $                   BETA( * ), Q( LDQ, * ), U( LDU, * ),
-*      $                   V( LDV, * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DGGSVD computes the generalized singular value decomposition (GSVD)
-*> of an M-by-N real matrix A and P-by-N real matrix B:
-*>
-*>       U**T*A*Q = D1*( 0 R ),    V**T*B*Q = D2*( 0 R )
-*>
-*> where U, V and Q are orthogonal matrices.
-*> Let K+L = the effective numerical rank of the matrix (A**T,B**T)**T,
-*> then R is a K+L-by-K+L nonsingular upper triangular matrix, D1 and
-*> D2 are M-by-(K+L) and P-by-(K+L) "diagonal" matrices and of the
-*> following structures, respectively:
-*>
-*> If M-K-L >= 0,
-*>
-*>                     K  L
-*>        D1 =     K ( I  0 )
-*>                 L ( 0  C )
-*>             M-K-L ( 0  0 )
-*>
-*>                   K  L
-*>        D2 =   L ( 0  S )
-*>             P-L ( 0  0 )
-*>
-*>                 N-K-L  K    L
-*>   ( 0 R ) = K (  0   R11  R12 )
-*>             L (  0    0   R22 )
-*>
-*> where
-*>
-*>   C = diag( ALPHA(K+1), ... , ALPHA(K+L) ),
-*>   S = diag( BETA(K+1),  ... , BETA(K+L) ),
-*>   C**2 + S**2 = I.
-*>
-*>   R is stored in A(1:K+L,N-K-L+1:N) on exit.
-*>
-*> If M-K-L < 0,
-*>
-*>                   K M-K K+L-M
-*>        D1 =   K ( I  0    0   )
-*>             M-K ( 0  C    0   )
-*>
-*>                     K M-K K+L-M
-*>        D2 =   M-K ( 0  S    0  )
-*>             K+L-M ( 0  0    I  )
-*>               P-L ( 0  0    0  )
-*>
-*>                    N-K-L  K   M-K  K+L-M
-*>   ( 0 R ) =     K ( 0    R11  R12  R13  )
-*>               M-K ( 0     0   R22  R23  )
-*>             K+L-M ( 0     0    0   R33  )
-*>
-*> where
-*>
-*>   C = diag( ALPHA(K+1), ... , ALPHA(M) ),
-*>   S = diag( BETA(K+1),  ... , BETA(M) ),
-*>   C**2 + S**2 = I.
-*>
-*>   (R11 R12 R13 ) is stored in A(1:M, N-K-L+1:N), and R33 is stored
-*>   ( 0  R22 R23 )
-*>   in B(M-K+1:L,N+M-K-L+1:N) on exit.
-*>
-*> The routine computes C, S, R, and optionally the orthogonal
-*> transformation matrices U, V and Q.
-*>
-*> In particular, if B is an N-by-N nonsingular matrix, then the GSVD of
-*> A and B implicitly gives the SVD of A*inv(B):
-*>                      A*inv(B) = U*(D1*inv(D2))*V**T.
-*> If ( A**T,B**T)**T  has orthonormal columns, then the GSVD of A and B is
-*> also equal to the CS decomposition of A and B. Furthermore, the GSVD
-*> can be used to derive the solution of the eigenvalue problem:
-*>                      A**T*A x = lambda* B**T*B x.
-*> In some literature, the GSVD of A and B is presented in the form
-*>                  U**T*A*X = ( 0 D1 ),   V**T*B*X = ( 0 D2 )
-*> where U and V are orthogonal and X is nonsingular, D1 and D2 are
-*> ``diagonal''.  The former GSVD form can be converted to the latter
-*> form by taking the nonsingular matrix X as
-*>
-*>                      X = Q*( I   0    )
-*>                            ( 0 inv(R) ).
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] JOBU
-*> \verbatim
-*>          JOBU is CHARACTER*1
-*>          = 'U':  Orthogonal matrix U is computed;
-*>          = 'N':  U is not computed.
-*> \endverbatim
-*>
-*> \param[in] JOBV
-*> \verbatim
-*>          JOBV is CHARACTER*1
-*>          = 'V':  Orthogonal matrix V is computed;
-*>          = 'N':  V is not computed.
-*> \endverbatim
-*>
-*> \param[in] JOBQ
-*> \verbatim
-*>          JOBQ is CHARACTER*1
-*>          = 'Q':  Orthogonal matrix Q is computed;
-*>          = 'N':  Q is not computed.
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrices A and B.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in] P
-*> \verbatim
-*>          P is INTEGER
-*>          The number of rows of the matrix B.  P >= 0.
-*> \endverbatim
-*>
-*> \param[out] K
-*> \verbatim
-*>          K is INTEGER
-*> \endverbatim
-*>
-*> \param[out] L
-*> \verbatim
-*>          L is INTEGER
-*>
-*>          On exit, K and L specify the dimension of the subblocks
-*>          described in Purpose.
-*>          K + L = effective numerical rank of (A**T,B**T)**T.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, A contains the triangular matrix R, or part of R.
-*>          See Purpose for details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[in,out] B
-*> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB,N)
-*>          On entry, the P-by-N matrix B.
-*>          On exit, B contains the triangular matrix R if M-K-L < 0.
-*>          See Purpose for details.
-*> \endverbatim
-*>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B. LDB >= max(1,P).
-*> \endverbatim
-*>
-*> \param[out] ALPHA
-*> \verbatim
-*>          ALPHA is DOUBLE PRECISION array, dimension (N)
-*> \endverbatim
-*>
-*> \param[out] BETA
-*> \verbatim
-*>          BETA is DOUBLE PRECISION array, dimension (N)
-*>
-*>          On exit, ALPHA and BETA contain the generalized singular
-*>          value pairs of A and B;
-*>            ALPHA(1:K) = 1,
-*>            BETA(1:K)  = 0,
-*>          and if M-K-L >= 0,
-*>            ALPHA(K+1:K+L) = C,
-*>            BETA(K+1:K+L)  = S,
-*>          or if M-K-L < 0,
-*>            ALPHA(K+1:M)=C, ALPHA(M+1:K+L)=0
-*>            BETA(K+1:M) =S, BETA(M+1:K+L) =1
-*>          and
-*>            ALPHA(K+L+1:N) = 0
-*>            BETA(K+L+1:N)  = 0
-*> \endverbatim
-*>
-*> \param[out] U
-*> \verbatim
-*>          U is DOUBLE PRECISION array, dimension (LDU,M)
-*>          If JOBU = 'U', U contains the M-by-M orthogonal matrix U.
-*>          If JOBU = 'N', U is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDU
-*> \verbatim
-*>          LDU is INTEGER
-*>          The leading dimension of the array U. LDU >= max(1,M) if
-*>          JOBU = 'U'; LDU >= 1 otherwise.
-*> \endverbatim
-*>
-*> \param[out] V
-*> \verbatim
-*>          V is DOUBLE PRECISION array, dimension (LDV,P)
-*>          If JOBV = 'V', V contains the P-by-P orthogonal matrix V.
-*>          If JOBV = 'N', V is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDV
-*> \verbatim
-*>          LDV is INTEGER
-*>          The leading dimension of the array V. LDV >= max(1,P) if
-*>          JOBV = 'V'; LDV >= 1 otherwise.
-*> \endverbatim
-*>
-*> \param[out] Q
-*> \verbatim
-*>          Q is DOUBLE PRECISION array, dimension (LDQ,N)
-*>          If JOBQ = 'Q', Q contains the N-by-N orthogonal matrix Q.
-*>          If JOBQ = 'N', Q is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDQ
-*> \verbatim
-*>          LDQ is INTEGER
-*>          The leading dimension of the array Q. LDQ >= max(1,N) if
-*>          JOBQ = 'Q'; LDQ >= 1 otherwise.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array,
-*>                      dimension (max(3*N,M,P)+N)
-*> \endverbatim
-*>
-*> \param[out] IWORK
-*> \verbatim
-*>          IWORK is INTEGER array, dimension (N)
-*>          On exit, IWORK stores the sorting information. More
-*>          precisely, the following loop will sort ALPHA
-*>             for I = K+1, min(M,K+L)
-*>                 swap ALPHA(I) and ALPHA(IWORK(I))
-*>             endfor
-*>          such that ALPHA(1) >= ALPHA(2) >= ... >= ALPHA(N).
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*>          > 0:  if INFO = 1, the Jacobi-type procedure failed to
-*>                converge.  For further details, see subroutine DTGSJA.
-*> \endverbatim
-*
-*> \par Internal Parameters:
-*  =========================
-*>
-*> \verbatim
-*>  TOLA    DOUBLE PRECISION
-*>  TOLB    DOUBLE PRECISION
-*>          TOLA and TOLB are the thresholds to determine the effective
-*>          rank of (A',B')**T. Generally, they are set to
-*>                   TOLA = MAX(M,N)*norm(A)*MAZHEPS,
-*>                   TOLB = MAX(P,N)*norm(B)*MAZHEPS.
-*>          The size of TOLA and TOLB may affect the size of backward
-*>          errors of the decomposition.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2011
-*
-*> \ingroup doubleOTHERsing
-*
-*> \par Contributors:
-*  ==================
-*>
-*>     Ming Gu and Huan Ren, Computer Science Division, University of
-*>     California at Berkeley, USA
-*>
-*  =====================================================================
-      SUBROUTINE DGGSVD( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
-     $                   LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ, WORK,
-     $                   IWORK, INFO )
-*
-*  -- LAPACK driver routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      CHARACTER          JOBQ, JOBU, JOBV
-      INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
-*     ..
-*     .. Array Arguments ..
-      INTEGER            IWORK( * )
-      DOUBLE PRECISION   A( LDA, * ), ALPHA( * ), B( LDB, * ),
-     $                   BETA( * ), Q( LDQ, * ), U( LDU, * ),
-     $                   V( LDV, * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Local Scalars ..
-      LOGICAL            WANTQ, WANTU, WANTV
-      INTEGER            I, IBND, ISUB, J, NCYCLE
-      DOUBLE PRECISION   ANORM, BNORM, SMAX, TEMP, TOLA, TOLB, ULP, UNFL
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      DOUBLE PRECISION   DLAMCH, DLANGE
-      EXTERNAL           LSAME, DLAMCH, DLANGE
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DCOPY, DGGSVP, DTGSJA, XERBLA
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. Executable Statements ..
-*
-*     Test the input parameters
-*
-      WANTU = LSAME( JOBU, 'U' )
-      WANTV = LSAME( JOBV, 'V' )
-      WANTQ = LSAME( JOBQ, 'Q' )
-*
-      INFO = 0
-      IF( .NOT.( WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
-         INFO = -1
-      ELSE IF( .NOT.( WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
-         INFO = -2
-      ELSE IF( .NOT.( WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
-         INFO = -3
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -5
-      ELSE IF( P.LT.0 ) THEN
-         INFO = -6
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -10
-      ELSE IF( LDB.LT.MAX( 1, P ) ) THEN
-         INFO = -12
-      ELSE IF( LDU.LT.1 .OR. ( WANTU .AND. LDU.LT.M ) ) THEN
-         INFO = -16
-      ELSE IF( LDV.LT.1 .OR. ( WANTV .AND. LDV.LT.P ) ) THEN
-         INFO = -18
-      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.N ) ) THEN
-         INFO = -20
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGGSVD', -INFO )
-         RETURN
-      END IF
-*
-*     Compute the Frobenius norm of matrices A and B
-*
-      ANORM = DLANGE( '1', M, N, A, LDA, WORK )
-      BNORM = DLANGE( '1', P, N, B, LDB, WORK )
-*
-*     Get machine precision and set up threshold for determining
-*     the effective numerical rank of the matrices A and B.
-*
-      ULP = DLAMCH( 'Precision' )
-      UNFL = DLAMCH( 'Safe Minimum' )
-      TOLA = MAX( M, N )*MAX( ANORM, UNFL )*ULP
-      TOLB = MAX( P, N )*MAX( BNORM, UNFL )*ULP
-*
-*     Preprocessing
-*
-      CALL DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
-     $             TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, WORK,
-     $             WORK( N+1 ), INFO )
-*
-*     Compute the GSVD of two upper "triangular" matrices
-*
-      CALL DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B, LDB,
-     $             TOLA, TOLB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ,
-     $             WORK, NCYCLE, INFO )
-*
-*     Sort the singular values and store the pivot indices in IWORK
-*     Copy ALPHA to WORK, then sort ALPHA in WORK
-*
-      CALL DCOPY( N, ALPHA, 1, WORK, 1 )
-      IBND = MIN( L, M-K )
-      DO 20 I = 1, IBND
-*
-*        Scan for largest ALPHA(K+I)
-*
-         ISUB = I
-         SMAX = WORK( K+I )
-         DO 10 J = I + 1, IBND
-            TEMP = WORK( K+J )
-            IF( TEMP.GT.SMAX ) THEN
-               ISUB = J
-               SMAX = TEMP
-            END IF
-   10    CONTINUE
-         IF( ISUB.NE.I ) THEN
-            WORK( K+ISUB ) = WORK( K+I )
-            WORK( K+I ) = SMAX
-            IWORK( K+I ) = K + ISUB
-         ELSE
-            IWORK( K+I ) = K + I
-         END IF
-   20 CONTINUE
-*
-      RETURN
-*
-*     End of DGGSVD
-*
-      END
-*> \brief \b DGGSVP
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DGGSVP + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvp.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dggsvp.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvp.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
-*                          TOLA, TOLB, K, L, U, LDU, V, LDV, Q, LDQ,
-*                          IWORK, TAU, WORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          JOBQ, JOBU, JOBV
-*       INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
-*       DOUBLE PRECISION   TOLA, TOLB
-*       ..
-*       .. Array Arguments ..
-*       INTEGER            IWORK( * )
-*       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
-*      $                   TAU( * ), U( LDU, * ), V( LDV, * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DGGSVP computes orthogonal matrices U, V and Q such that
-*>
-*>                    N-K-L  K    L
-*>  U**T*A*Q =     K ( 0    A12  A13 )  if M-K-L >= 0;
-*>                 L ( 0     0   A23 )
-*>             M-K-L ( 0     0    0  )
-*>
-*>                  N-K-L  K    L
-*>         =     K ( 0    A12  A13 )  if M-K-L < 0;
-*>             M-K ( 0     0   A23 )
-*>
-*>                  N-K-L  K    L
-*>  V**T*B*Q =   L ( 0     0   B13 )
-*>             P-L ( 0     0    0  )
-*>
-*> where the K-by-K matrix A12 and L-by-L matrix B13 are nonsingular
-*> upper triangular; A23 is L-by-L upper triangular if M-K-L >= 0,
-*> otherwise A23 is (M-K)-by-L upper trapezoidal.  K+L = the effective
-*> numerical rank of the (M+P)-by-N matrix (A**T,B**T)**T. 
-*>
-*> This decomposition is the preprocessing step for computing the
-*> Generalized Singular Value Decomposition (GSVD), see subroutine
-*> DGGSVD.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] JOBU
-*> \verbatim
-*>          JOBU is CHARACTER*1
-*>          = 'U':  Orthogonal matrix U is computed;
-*>          = 'N':  U is not computed.
-*> \endverbatim
-*>
-*> \param[in] JOBV
-*> \verbatim
-*>          JOBV is CHARACTER*1
-*>          = 'V':  Orthogonal matrix V is computed;
-*>          = 'N':  V is not computed.
-*> \endverbatim
-*>
-*> \param[in] JOBQ
-*> \verbatim
-*>          JOBQ is CHARACTER*1
-*>          = 'Q':  Orthogonal matrix Q is computed;
-*>          = 'N':  Q is not computed.
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
-*> \endverbatim
-*>
-*> \param[in] P
-*> \verbatim
-*>          P is INTEGER
-*>          The number of rows of the matrix B.  P >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrices A and B.  N >= 0.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the M-by-N matrix A.
-*>          On exit, A contains the triangular (or trapezoidal) matrix
-*>          described in the Purpose section.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A. LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[in,out] B
-*> \verbatim
-*>          B is DOUBLE PRECISION array, dimension (LDB,N)
-*>          On entry, the P-by-N matrix B.
-*>          On exit, B contains the triangular matrix described in
-*>          the Purpose section.
-*> \endverbatim
-*>
-*> \param[in] LDB
-*> \verbatim
-*>          LDB is INTEGER
-*>          The leading dimension of the array B. LDB >= max(1,P).
-*> \endverbatim
-*>
-*> \param[in] TOLA
-*> \verbatim
-*>          TOLA is DOUBLE PRECISION
-*> \endverbatim
-*>
-*> \param[in] TOLB
-*> \verbatim
-*>          TOLB is DOUBLE PRECISION
-*>
-*>          TOLA and TOLB are the thresholds to determine the effective
-*>          numerical rank of matrix B and a subblock of A. Generally,
-*>          they are set to
-*>             TOLA = MAX(M,N)*norm(A)*MACHEPS,
-*>             TOLB = MAX(P,N)*norm(B)*MACHEPS.
-*>          The size of TOLA and TOLB may affect the size of backward
-*>          errors of the decomposition.
-*> \endverbatim
-*>
-*> \param[out] K
-*> \verbatim
-*>          K is INTEGER
-*> \endverbatim
-*>
-*> \param[out] L
-*> \verbatim
-*>          L is INTEGER
-*>
-*>          On exit, K and L specify the dimension of the subblocks
-*>          described in Purpose section.
-*>          K + L = effective numerical rank of (A**T,B**T)**T.
-*> \endverbatim
-*>
-*> \param[out] U
-*> \verbatim
-*>          U is DOUBLE PRECISION array, dimension (LDU,M)
-*>          If JOBU = 'U', U contains the orthogonal matrix U.
-*>          If JOBU = 'N', U is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDU
-*> \verbatim
-*>          LDU is INTEGER
-*>          The leading dimension of the array U. LDU >= max(1,M) if
-*>          JOBU = 'U'; LDU >= 1 otherwise.
-*> \endverbatim
-*>
-*> \param[out] V
-*> \verbatim
-*>          V is DOUBLE PRECISION array, dimension (LDV,P)
-*>          If JOBV = 'V', V contains the orthogonal matrix V.
-*>          If JOBV = 'N', V is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDV
-*> \verbatim
-*>          LDV is INTEGER
-*>          The leading dimension of the array V. LDV >= max(1,P) if
-*>          JOBV = 'V'; LDV >= 1 otherwise.
-*> \endverbatim
-*>
-*> \param[out] Q
-*> \verbatim
-*>          Q is DOUBLE PRECISION array, dimension (LDQ,N)
-*>          If JOBQ = 'Q', Q contains the orthogonal matrix Q.
-*>          If JOBQ = 'N', Q is not referenced.
-*> \endverbatim
-*>
-*> \param[in] LDQ
-*> \verbatim
-*>          LDQ is INTEGER
-*>          The leading dimension of the array Q. LDQ >= max(1,N) if
-*>          JOBQ = 'Q'; LDQ >= 1 otherwise.
-*> \endverbatim
-*>
-*> \param[out] IWORK
-*> \verbatim
-*>          IWORK is INTEGER array, dimension (N)
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION array, dimension (N)
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (max(3*N,M,P))
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2011
-*
-*> \ingroup doubleOTHERcomputational
-*
-*> \par Further Details:
-*  =====================
-*>
-*>  The subroutine uses LAPACK subroutine DGEQPF for the QR factorization
-*>  with column pivoting to detect the effective numerical rank of the
-*>  a matrix. It may be replaced by a better rank determination strategy.
-*>
-*  =====================================================================
-      SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
-     $                   TOLA, TOLB, K, L, U, LDU, V, LDV, Q, LDQ,
-     $                   IWORK, TAU, WORK, INFO )
-*
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      CHARACTER          JOBQ, JOBU, JOBV
-      INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
-      DOUBLE PRECISION   TOLA, TOLB
-*     ..
-*     .. Array Arguments ..
-      INTEGER            IWORK( * )
-      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
-     $                   TAU( * ), U( LDU, * ), V( LDV, * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      LOGICAL            FORWRD, WANTQ, WANTU, WANTV
-      INTEGER            I, J
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DGEQPF, DGEQR2, DGERQ2, DLACPY, DLAPMT, DLASET,
-     $                   DORG2R, DORM2R, DORMR2, XERBLA
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          ABS, MAX, MIN
-*     ..
-*     .. Executable Statements ..
-*
-*     Test the input parameters
-*
-      WANTU = LSAME( JOBU, 'U' )
-      WANTV = LSAME( JOBV, 'V' )
-      WANTQ = LSAME( JOBQ, 'Q' )
-      FORWRD = .TRUE.
-*
-      INFO = 0
-      IF( .NOT.( WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
-         INFO = -1
-      ELSE IF( .NOT.( WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
-         INFO = -2
-      ELSE IF( .NOT.( WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
-         INFO = -3
-      ELSE IF( M.LT.0 ) THEN
-         INFO = -4
-      ELSE IF( P.LT.0 ) THEN
-         INFO = -5
-      ELSE IF( N.LT.0 ) THEN
-         INFO = -6
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -8
-      ELSE IF( LDB.LT.MAX( 1, P ) ) THEN
-         INFO = -10
-      ELSE IF( LDU.LT.1 .OR. ( WANTU .AND. LDU.LT.M ) ) THEN
-         INFO = -16
-      ELSE IF( LDV.LT.1 .OR. ( WANTV .AND. LDV.LT.P ) ) THEN
-         INFO = -18
-      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.N ) ) THEN
-         INFO = -20
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DGGSVP', -INFO )
-         RETURN
-      END IF
-*
-*     QR with column pivoting of B: B*P = V*( S11 S12 )
-*                                           (  0   0  )
-*
-      DO 10 I = 1, N
-         IWORK( I ) = 0
-   10 CONTINUE
-      CALL DGEQPF( P, N, B, LDB, IWORK, TAU, WORK, INFO )
-*
-*     Update A := A*P
-*
-      CALL DLAPMT( FORWRD, M, N, A, LDA, IWORK )
-*
-*     Determine the effective rank of matrix B.
-*
-      L = 0
-      DO 20 I = 1, MIN( P, N )
-         IF( ABS( B( I, I ) ).GT.TOLB )
-     $      L = L + 1
-   20 CONTINUE
-*
-      IF( WANTV ) THEN
-*
-*        Copy the details of V, and form V.
-*
-         CALL DLASET( 'Full', P, P, ZERO, ZERO, V, LDV )
-         IF( P.GT.1 )
-     $      CALL DLACPY( 'Lower', P-1, N, B( 2, 1 ), LDB, V( 2, 1 ),
-     $                   LDV )
-         CALL DORG2R( P, P, MIN( P, N ), V, LDV, TAU, WORK, INFO )
-      END IF
-*
-*     Clean up B
-*
-      DO 40 J = 1, L - 1
-         DO 30 I = J + 1, L
-            B( I, J ) = ZERO
-   30    CONTINUE
-   40 CONTINUE
-      IF( P.GT.L )
-     $   CALL DLASET( 'Full', P-L, N, ZERO, ZERO, B( L+1, 1 ), LDB )
-*
-      IF( WANTQ ) THEN
-*
-*        Set Q = I and Update Q := Q*P
-*
-         CALL DLASET( 'Full', N, N, ZERO, ONE, Q, LDQ )
-         CALL DLAPMT( FORWRD, N, N, Q, LDQ, IWORK )
-      END IF
-*
-      IF( P.GE.L .AND. N.NE.L ) THEN
-*
-*        RQ factorization of (S11 S12): ( S11 S12 ) = ( 0 S12 )*Z
-*
-         CALL DGERQ2( L, N, B, LDB, TAU, WORK, INFO )
-*
-*        Update A := A*Z**T
-*
-         CALL DORMR2( 'Right', 'Transpose', M, N, L, B, LDB, TAU, A,
-     $                LDA, WORK, INFO )
-*
-         IF( WANTQ ) THEN
-*
-*           Update Q := Q*Z**T
-*
-            CALL DORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU, Q,
-     $                   LDQ, WORK, INFO )
-         END IF
-*
-*        Clean up B
-*
-         CALL DLASET( 'Full', L, N-L, ZERO, ZERO, B, LDB )
-         DO 60 J = N - L + 1, N
-            DO 50 I = J - N + L + 1, L
-               B( I, J ) = ZERO
-   50       CONTINUE
-   60    CONTINUE
-*
-      END IF
-*
-*     Let              N-L     L
-*                A = ( A11    A12 ) M,
-*
-*     then the following does the complete QR decomposition of A11:
-*
-*              A11 = U*(  0  T12 )*P1**T
-*                      (  0   0  )
-*
-      DO 70 I = 1, N - L
-         IWORK( I ) = 0
-   70 CONTINUE
-      CALL DGEQPF( M, N-L, A, LDA, IWORK, TAU, WORK, INFO )
-*
-*     Determine the effective rank of A11
-*
-      K = 0
-      DO 80 I = 1, MIN( M, N-L )
-         IF( ABS( A( I, I ) ).GT.TOLA )
-     $      K = K + 1
-   80 CONTINUE
-*
-*     Update A12 := U**T*A12, where A12 = A( 1:M, N-L+1:N )
-*
-      CALL DORM2R( 'Left', 'Transpose', M, L, MIN( M, N-L ), A, LDA,
-     $             TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
-*
-      IF( WANTU ) THEN
-*
-*        Copy the details of U, and form U
-*
-         CALL DLASET( 'Full', M, M, ZERO, ZERO, U, LDU )
-         IF( M.GT.1 )
-     $      CALL DLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
-     $                   LDU )
-         CALL DORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
-      END IF
-*
-      IF( WANTQ ) THEN
-*
-*        Update Q( 1:N, 1:N-L )  = Q( 1:N, 1:N-L )*P1
-*
-         CALL DLAPMT( FORWRD, N, N-L, Q, LDQ, IWORK )
-      END IF
-*
-*     Clean up A: set the strictly lower triangular part of
-*     A(1:K, 1:K) = 0, and A( K+1:M, 1:N-L ) = 0.
-*
-      DO 100 J = 1, K - 1
-         DO 90 I = J + 1, K
-            A( I, J ) = ZERO
-   90    CONTINUE
-  100 CONTINUE
-      IF( M.GT.K )
-     $   CALL DLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ), LDA )
-*
-      IF( N-L.GT.K ) THEN
-*
-*        RQ factorization of ( T11 T12 ) = ( 0 T12 )*Z1
-*
-         CALL DGERQ2( K, N-L, A, LDA, TAU, WORK, INFO )
-*
-         IF( WANTQ ) THEN
-*
-*           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**T
-*
-            CALL DORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA, TAU,
-     $                   Q, LDQ, WORK, INFO )
-         END IF
-*
-*        Clean up A
-*
-         CALL DLASET( 'Full', K, N-L-K, ZERO, ZERO, A, LDA )
-         DO 120 J = N - L - K + 1, N - L
-            DO 110 I = J - N + L + K + 1, K
-               A( I, J ) = ZERO
-  110       CONTINUE
-  120    CONTINUE
-*
-      END IF
-*
-      IF( M.GT.K ) THEN
-*
-*        QR factorization of A( K+1:M,N-L+1:N )
-*
-         CALL DGEQR2( M-K, L, A( K+1, N-L+1 ), LDA, TAU, WORK, INFO )
-*
-         IF( WANTU ) THEN
-*
-*           Update U(:,K+1:M) := U(:,K+1:M)*U1
-*
-            CALL DORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
-     $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
-     $                   WORK, INFO )
-         END IF
-*
-*        Clean up
-*
-         DO 140 J = N - L + 1, N
-            DO 130 I = J - N + K + L + 1, M
-               A( I, J ) = ZERO
-  130       CONTINUE
-  140    CONTINUE
-*
-      END IF
-*
-      RETURN
-*
-*     End of DGGSVP
-*
-      END
-*> \brief \b DGSVJ0 pre-processor for the routine sgesvj.
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DGSVJ0 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgsvj0.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgsvj0.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgsvj0.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgsvj0.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
@@ -37446,7 +34689,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -37471,10 +34714,10 @@
       SUBROUTINE DGSVJ0( JOBV, M, N, A, LDA, D, SVA, MV, V, LDV, EPS,
      $                   SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDA, LDV, LWORK, M, MV, N, NSWEEP
@@ -37506,7 +34749,7 @@
       DOUBLE PRECISION   FASTR( 5 )
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DABS, DMAX1, DBLE, MIN0, DSIGN, DSQRT
+      INTRINSIC          DABS, MAX, DBLE, MIN, DSIGN, DSQRT
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DDOT, DNRM2
@@ -37582,7 +34825,7 @@
 *     Jacobi SVD algorithm SGESVJ. For sweeps i=1:SWBAND the procedure
 *     ......
 
-      KBL = MIN0( 8, N )
+      KBL = MIN( 8, N )
 *[TP] KBL is a tuning parameter that defines the tile size in the
 *     tiling of the p-q loops of pivot pairs. In general, an optimal
 *     value of KBL depends on the matrix dimensions and on the
@@ -37594,7 +34837,7 @@
       BLSKIP = ( KBL**2 ) + 1
 *[TP] BLKSKIP is a tuning parameter that depends on SWBAND and KBL.
 
-      ROWSKIP = MIN0( 5, KBL )
+      ROWSKIP = MIN( 5, KBL )
 *[TP] ROWSKIP is a tuning parameter.
 
       LKAHEAD = 1
@@ -37616,11 +34859,11 @@
 
             igl = ( ibr-1 )*KBL + 1
 *
-            DO 1002 ir1 = 0, MIN0( LKAHEAD, NBL-ibr )
+            DO 1002 ir1 = 0, MIN( LKAHEAD, NBL-ibr )
 *
                igl = igl + ir1*KBL
 *
-               DO 2001 p = igl, MIN0( igl+KBL-1, N-1 )
+               DO 2001 p = igl, MIN( igl+KBL-1, N-1 )
 
 *     .. de Rijk's pivoting
                   q = IDAMAX( N-p+1, SVA( p ), 1 ) + p - 1
@@ -37669,7 +34912,7 @@
 *
                      PSKIPPED = 0
 *
-                     DO 2002 q = p + 1, MIN0( igl+KBL-1, N )
+                     DO 2002 q = p + 1, MIN( igl+KBL-1, N )
 *
                         AAQQ = SVA( q )
 
@@ -37704,7 +34947,7 @@
                               END IF
                            END IF
 *
-                           MXAAPQ = DMAX1( MXAAPQ, DABS( AAPQ ) )
+                           MXAAPQ = MAX( MXAAPQ, DABS( AAPQ ) )
 *
 *        TO rotate or NOT to rotate, THAT is the question ...
 *
@@ -37736,11 +34979,11 @@
      $                                              V( 1, p ), 1,
      $                                              V( 1, q ), 1,
      $                                              FASTR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO, 
+                                    AAPP = AAPP*DSQRT( MAX( ZERO, 
      $                                     ONE-T*AQOAP*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, DABS( T ) )
+                                    MXSINJ = MAX( MXSINJ, DABS( T ) )
 *
                                  ELSE
 *
@@ -37752,10 +34995,10 @@
                                     CS = DSQRT( ONE / ( ONE+T*T ) )
                                     SN = T*CS
 *
-                                    MXSINJ = DMAX1( MXSINJ, DABS( SN ) )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    MXSINJ = MAX( MXSINJ, DABS( SN ) )
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO,
+                                    AAPP = AAPP*DSQRT( MAX( ZERO,
      $                                     ONE-T*AQOAP*AAPQ ) )
 *
                                     APOAQ = D( p ) / D( q )
@@ -37866,9 +35109,9 @@
      $                                       A( 1, q ), 1 )
                                  CALL DLASCL( 'G', 0, 0, ONE, AAQQ, M,
      $                                        1, A( 1, q ), LDA, IERR )
-                                 SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                 SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                      ONE-AAPQ*AAPQ ) )
-                                 MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                 MXSINJ = MAX( MXSINJ, SFMIN )
                               END IF
 *           END IF ROTOK THEN ... ELSE
 *
@@ -37932,7 +35175,7 @@
                   ELSE
                      SVA( p ) = AAPP
                      IF( ( ir1.EQ.0 ) .AND. ( AAPP.EQ.ZERO ) )
-     $                   NOTROT = NOTROT + MIN0( igl+KBL-1, N ) - p
+     $                   NOTROT = NOTROT + MIN( igl+KBL-1, N ) - p
                   END IF
 *
  2001          CONTINUE
@@ -37953,7 +35196,7 @@
 *        doing the block at ( ibr, jbc )
 *
                IJBLSK = 0
-               DO 2100 p = igl, MIN0( igl+KBL-1, N )
+               DO 2100 p = igl, MIN( igl+KBL-1, N )
 *
                   AAPP = SVA( p )
 *
@@ -37961,7 +35204,7 @@
 *
                      PSKIPPED = 0
 *
-                     DO 2200 q = jgl, MIN0( jgl+KBL-1, N )
+                     DO 2200 q = jgl, MIN( jgl+KBL-1, N )
 *
                         AAQQ = SVA( q )
 *
@@ -38008,7 +35251,7 @@
                               END IF
                            END IF
 *
-                           MXAAPQ = DMAX1( MXAAPQ, DABS( AAPQ ) )
+                           MXAAPQ = MAX( MXAAPQ, DABS( AAPQ ) )
 *
 *        TO rotate or NOT to rotate, THAT is the question ...
 *
@@ -38035,11 +35278,11 @@
      $                                              V( 1, p ), 1,
      $                                              V( 1, q ), 1,
      $                                              FASTR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO,
+                                    AAPP = AAPP*DSQRT( MAX( ZERO,
      $                                     ONE-T*AQOAP*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, DABS( T ) )
+                                    MXSINJ = MAX( MXSINJ, DABS( T ) )
                                  ELSE
 *
 *                 .. choose correct signum for THETA and rotate
@@ -38050,10 +35293,10 @@
      $                                  DSQRT( ONE+THETA*THETA ) )
                                     CS = DSQRT( ONE / ( ONE+T*T ) )
                                     SN = T*CS
-                                    MXSINJ = DMAX1( MXSINJ, DABS( SN ) )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    MXSINJ = MAX( MXSINJ, DABS( SN ) )
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO, 
+                                    AAPP = AAPP*DSQRT( MAX( ZERO, 
      $                                     ONE-T*AQOAP*AAPQ ) )
 *
                                     APOAQ = D( p ) / D( q )
@@ -38168,9 +35411,9 @@
                                     CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                    MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
                                     CALL DCOPY( M, A( 1, q ), 1, WORK,
      $                                          1 )
@@ -38185,9 +35428,9 @@
                                     CALL DLASCL( 'G', 0, 0, ONE, AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
-                                    SVA( p ) = AAPP*DSQRT( DMAX1( ZERO,
+                                    SVA( p ) = AAPP*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                    MXSINJ = MAX( MXSINJ, SFMIN )
                                  END IF
                               END IF
 *           END IF ROTOK THEN ... ELSE
@@ -38255,7 +35498,7 @@
 *
                   ELSE
                      IF( AAPP.EQ.ZERO )NOTROT = NOTROT +
-     $                   MIN0( jgl+KBL-1, N ) - jgl + 1
+     $                   MIN( jgl+KBL-1, N ) - jgl + 1
                      IF( AAPP.LT.ZERO )NOTROT = 0
                   END IF
 
@@ -38265,7 +35508,7 @@
 *     end of the jbc-loop
  2011       CONTINUE
 *2011 bailed out of the jbc-loop
-            DO 2012 p = igl, MIN0( igl+KBL-1, N )
+            DO 2012 p = igl, MIN( igl+KBL-1, N )
                SVA( p ) = DABS( SVA( p ) )
  2012       CONTINUE
 *
@@ -38368,8 +35611,8 @@
 *>
 *> \verbatim
 *>
-*> DGSVJ1 is called from SGESVJ as a pre-processor and that is its main
-*> purpose. It applies Jacobi rotations in the same way as SGESVJ does, but
+*> DGSVJ1 is called from DGESVJ as a pre-processor and that is its main
+*> purpose. It applies Jacobi rotations in the same way as DGESVJ does, but
 *> it targets only particular pivots and it does not check convergence
 *> (stopping criterion). Few tunning parameters (marked by [TP]) are
 *> available for the implementer.
@@ -38554,7 +35797,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -38567,10 +35810,10 @@
       SUBROUTINE DGSVJ1( JOBV, M, N, N1, A, LDA, D, SVA, MV, V, LDV,
      $                   EPS, SFMIN, TOL, NSWEEP, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       DOUBLE PRECISION   EPS, SFMIN, TOL
@@ -38602,7 +35845,7 @@
       DOUBLE PRECISION   FASTR( 5 )
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DABS, DMAX1, DBLE, MIN0, DSIGN, DSQRT
+      INTRINSIC          DABS, MAX, DBLE, MIN, DSIGN, DSQRT
 *     ..
 *     .. External Functions ..
       DOUBLE PRECISION   DDOT, DNRM2
@@ -38676,7 +35919,7 @@
 *
 *     .. Row-cyclic pivot strategy with de Rijk's pivoting ..
 *
-      KBL = MIN0( 8, N )
+      KBL = MIN( 8, N )
       NBLR = N1 / KBL
       IF( ( NBLR*KBL ).NE.N1 )NBLR = NBLR + 1
 
@@ -38687,7 +35930,7 @@
       BLSKIP = ( KBL**2 ) + 1
 *[TP] BLKSKIP is a tuning parameter that depends on SWBAND and KBL.
 
-      ROWSKIP = MIN0( 5, KBL )
+      ROWSKIP = MIN( 5, KBL )
 *[TP] ROWSKIP is a tuning parameter.
       SWBAND = 0
 *[TP] SWBAND is a tuning parameter. It is meaningful and effective
@@ -38730,7 +35973,7 @@
 *        doing the block at ( ibr, jbc )
 
                IJBLSK = 0
-               DO 2100 p = igl, MIN0( igl+KBL-1, N1 )
+               DO 2100 p = igl, MIN( igl+KBL-1, N1 )
 
                   AAPP = SVA( p )
 
@@ -38738,7 +35981,7 @@
 
                      PSKIPPED = 0
 
-                     DO 2200 q = jgl, MIN0( jgl+KBL-1, N )
+                     DO 2200 q = jgl, MIN( jgl+KBL-1, N )
 *
                         AAQQ = SVA( q )
 
@@ -38785,7 +36028,7 @@
                               END IF
                            END IF
 
-                           MXAAPQ = DMAX1( MXAAPQ, DABS( AAPQ ) )
+                           MXAAPQ = MAX( MXAAPQ, DABS( AAPQ ) )
 
 *        TO rotate or NOT to rotate, THAT is the question ...
 *
@@ -38812,11 +36055,11 @@
      $                                              V( 1, p ), 1,
      $                                              V( 1, q ), 1,
      $                                              FASTR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO,
+                                    AAPP = AAPP*DSQRT( MAX( ZERO,
      $                                     ONE-T*AQOAP*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, DABS( T ) )
+                                    MXSINJ = MAX( MXSINJ, DABS( T ) )
                                  ELSE
 *
 *                 .. choose correct signum for THETA and rotate
@@ -38827,10 +36070,10 @@
      $                                  DSQRT( ONE+THETA*THETA ) )
                                     CS = DSQRT( ONE / ( ONE+T*T ) )
                                     SN = T*CS
-                                    MXSINJ = DMAX1( MXSINJ, DABS( SN ) )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    MXSINJ = MAX( MXSINJ, DABS( SN ) )
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE+T*APOAQ*AAPQ ) )
-                                    AAPP = AAPP*DSQRT( DMAX1( ZERO, 
+                                    AAPP = AAPP*DSQRT( MAX( ZERO, 
      $                                    ONE-T*AQOAP*AAPQ ) )
 
                                     APOAQ = D( p ) / D( q )
@@ -38945,9 +36188,9 @@
                                     CALL DLASCL( 'G', 0, 0, ONE, AAQQ,
      $                                           M, 1, A( 1, q ), LDA,
      $                                           IERR )
-                                    SVA( q ) = AAQQ*DSQRT( DMAX1( ZERO,
+                                    SVA( q ) = AAQQ*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                    MXSINJ = MAX( MXSINJ, SFMIN )
                                  ELSE
                                     CALL DCOPY( M, A( 1, q ), 1, WORK,
      $                                          1 )
@@ -38962,9 +36205,9 @@
                                     CALL DLASCL( 'G', 0, 0, ONE, AAPP,
      $                                           M, 1, A( 1, p ), LDA,
      $                                           IERR )
-                                    SVA( p ) = AAPP*DSQRT( DMAX1( ZERO,
+                                    SVA( p ) = AAPP*DSQRT( MAX( ZERO,
      $                                         ONE-AAPQ*AAPQ ) )
-                                    MXSINJ = DMAX1( MXSINJ, SFMIN )
+                                    MXSINJ = MAX( MXSINJ, SFMIN )
                                  END IF
                               END IF
 *           END IF ROTOK THEN ... ELSE
@@ -39035,7 +36278,7 @@
 *
                   ELSE
                      IF( AAPP.EQ.ZERO )NOTROT = NOTROT +
-     $                   MIN0( jgl+KBL-1, N ) - jgl + 1
+     $                   MIN( jgl+KBL-1, N ) - jgl + 1
                      IF( AAPP.LT.ZERO )NOTROT = 0
 ***      IF ( NOTROT .GE. EMPTSW )  GO TO 2011
                   END IF
@@ -39046,7 +36289,7 @@
 *     end of the jbc-loop
  2011       CONTINUE
 *2011 bailed out of the jbc-loop
-            DO 2012 p = igl, MIN0( igl+KBL-1, N )
+            DO 2012 p = igl, MIN( igl+KBL-1, N )
                SVA( p ) = DABS( SVA( p ) )
  2012       CONTINUE
 ***   IF ( NOTROT .GE. EMPTSW ) GO TO 1994
@@ -45119,7 +42362,7 @@
 *  =====================================================================
       SUBROUTINE DLADIV( A, B, C, D, P, Q )
 *
-*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     January 2013
@@ -45205,7 +42448,7 @@
 
       SUBROUTINE DLADIV1( A, B, C, D, P, Q )
 *
-*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     January 2013
@@ -45243,7 +42486,7 @@
 
       DOUBLE PRECISION FUNCTION DLADIV2( A, B, C, D, R, T )
 *
-*  -- LAPACK auxiliary routine (version 3.5.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
 *     January 2013
@@ -45265,7 +42508,7 @@
 *
       IF( R.NE.ZERO ) THEN
          BR = B * R
-         if( BR.NE.ZERO ) THEN
+         IF( BR.NE.ZERO ) THEN
             DLADIV2 = (A + BR) * T
          ELSE
             DLADIV2 = A * T + (B * T) * R
@@ -48936,7 +46179,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERcomputational
 *
@@ -48961,10 +46204,10 @@
 *  =====================================================================
       SUBROUTINE DLAED6( KNITER, ORGATI, RHO, D, Z, FINIT, TAU, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       LOGICAL            ORGATI
@@ -49202,13 +46445,14 @@
                DF = DF + TEMP2
                DDF = DDF + TEMP3
             ELSE
-              GO TO 60
+               GO TO 60
             END IF
    40    CONTINUE
          F = FINIT + TAU*FC
          ERRETM = EIGHT*( ABS( FINIT )+ABS( TAU )*ERRETM ) +
      $            ABS( TAU )*DF
-         IF( ABS( F ).LE.EPS*ERRETM )
+         IF( ( ABS( F ).LE.FOUR*EPS*ERRETM ) .OR.
+     $      ( (UBD-LBD).LE.FOUR*EPS*ABS(TAU) )  )
      $      GO TO 60
          IF( F .LE. ZERO )THEN
             LBD = TAU
@@ -49474,7 +46718,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERcomputational
 *
@@ -49490,10 +46734,10 @@
      $                   PERM, GIVPTR, GIVCOL, GIVNUM, WORK, IWORK,
      $                   INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            CURLVL, CURPBM, CUTPNT, ICOMPQ, INFO, LDQ, N,
@@ -49534,7 +46778,7 @@
       ELSE IF( N.LT.0 ) THEN
          INFO = -2
       ELSE IF( ICOMPQ.EQ.1 .AND. QSIZ.LT.N ) THEN
-         INFO = -4
+         INFO = -3
       ELSE IF( LDQ.LT.MAX( 1, N ) ) THEN
          INFO = -9
       ELSE IF( MIN( 1, N ).GT.CUTPNT .OR. N.LT.CUTPNT ) THEN
@@ -54294,7 +51538,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERauxiliary
 *
@@ -54318,10 +51562,10 @@
       SUBROUTINE DLAHQR( WANTT, WANTZ, N, ILO, IHI, H, LDH, WR, WI,
      $                   ILOZ, IHIZ, Z, LDZ, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            IHI, IHIZ, ILO, ILOZ, INFO, LDH, LDZ, N
@@ -54334,8 +51578,6 @@
 *  =========================================================
 *
 *     .. Parameters ..
-      INTEGER            ITMAX
-      PARAMETER          ( ITMAX = 30 )
       DOUBLE PRECISION   ZERO, ONE, TWO
       PARAMETER          ( ZERO = 0.0d0, ONE = 1.0d0, TWO = 2.0d0 )
       DOUBLE PRECISION   DAT1, DAT2
@@ -54346,7 +51588,7 @@
      $                   H22, RT1I, RT1R, RT2I, RT2R, RTDISC, S, SAFMAX,
      $                   SAFMIN, SMLNUM, SN, SUM, T1, T2, T3, TR, TST,
      $                   ULP, V2, V3
-      INTEGER            I, I1, I2, ITS, J, K, L, M, NH, NR, NZ
+      INTEGER            I, I1, I2, ITS, ITMAX, J, K, L, M, NH, NR, NZ
 *     ..
 *     .. Local Arrays ..
       DOUBLE PRECISION   V( 3 )
@@ -54403,6 +51645,10 @@
          I2 = N
       END IF
 *
+*     ITMAX is the total number of QR iterations allowed.
+*
+      ITMAX = 30 * MAX( 10, NH ) 
+*
 *     The main loop begins here. I is the loop index and decreases from
 *     IHI to ILO in steps of 1 or 2. Each iteration of the loop works
 *     with the active submatrix in rows and columns L to I.
@@ -55046,7 +52292,7 @@
 *     End of DLAHR2
 *
       END
-*> \brief \b DLAHRD reduces the first nb columns of a general rectangular matrix A so that elements below the k-th subdiagonal are zero, and returns auxiliary matrices which are needed to apply the transformation to the unreduced part of A.
+*> \brief \b DLAIC1 applies one step of incremental condition estimation.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -55054,314 +52300,26 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DLAHRD + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlahrd.f"> 
+*> Download DLAIC1 + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaic1.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlahrd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlaic1.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlahrd.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaic1.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+*       SUBROUTINE DLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            K, LDA, LDT, LDY, N, NB
+*       INTEGER            J, JOB
+*       DOUBLE PRECISION   C, GAMMA, S, SEST, SESTPR
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), T( LDT, NB ), TAU( NB ),
-*      $                   Y( LDY, NB )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DLAHRD reduces the first NB columns of a real general n-by-(n-k+1)
-*> matrix A so that elements below the k-th subdiagonal are zero. The
-*> reduction is performed by an orthogonal similarity transformation
-*> Q**T * A * Q. The routine returns the matrices V and T which determine
-*> Q as a block reflector I - V*T*V**T, and also the matrix Y = A * V * T.
-*>
-*> This is an OBSOLETE auxiliary routine. 
-*> This routine will be 'deprecated' in a  future release.
-*> Please use the new routine DLAHR2 instead.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The order of the matrix A.
-*> \endverbatim
-*>
-*> \param[in] K
-*> \verbatim
-*>          K is INTEGER
-*>          The offset for the reduction. Elements below the k-th
-*>          subdiagonal in the first NB columns are reduced to zero.
-*> \endverbatim
-*>
-*> \param[in] NB
-*> \verbatim
-*>          NB is INTEGER
-*>          The number of columns to be reduced.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N-K+1)
-*>          On entry, the n-by-(n-k+1) general matrix A.
-*>          On exit, the elements on and above the k-th subdiagonal in
-*>          the first NB columns are overwritten with the corresponding
-*>          elements of the reduced matrix; the elements below the k-th
-*>          subdiagonal, with the array TAU, represent the matrix Q as a
-*>          product of elementary reflectors. The other columns of A are
-*>          unchanged. See Further Details.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,N).
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION array, dimension (NB)
-*>          The scalar factors of the elementary reflectors. See Further
-*>          Details.
-*> \endverbatim
-*>
-*> \param[out] T
-*> \verbatim
-*>          T is DOUBLE PRECISION array, dimension (LDT,NB)
-*>          The upper triangular matrix T.
-*> \endverbatim
-*>
-*> \param[in] LDT
-*> \verbatim
-*>          LDT is INTEGER
-*>          The leading dimension of the array T.  LDT >= NB.
-*> \endverbatim
-*>
-*> \param[out] Y
-*> \verbatim
-*>          Y is DOUBLE PRECISION array, dimension (LDY,NB)
-*>          The n-by-nb matrix Y.
-*> \endverbatim
-*>
-*> \param[in] LDY
-*> \verbatim
-*>          LDY is INTEGER
-*>          The leading dimension of the array Y. LDY >= N.
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date September 2012
-*
-*> \ingroup doubleOTHERauxiliary
-*
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The matrix Q is represented as a product of nb elementary reflectors
-*>
-*>     Q = H(1) H(2) . . . H(nb).
-*>
-*>  Each H(i) has the form
-*>
-*>     H(i) = I - tau * v * v**T
-*>
-*>  where tau is a real scalar, and v is a real vector with
-*>  v(1:i+k-1) = 0, v(i+k) = 1; v(i+k+1:n) is stored on exit in
-*>  A(i+k+1:n,i), and tau in TAU(i).
-*>
-*>  The elements of the vectors v together form the (n-k+1)-by-nb matrix
-*>  V which is needed, with T and Y, to apply the transformation to the
-*>  unreduced part of the matrix, using an update of the form:
-*>  A := (I - V*T*V**T) * (A - Y*V**T).
-*>
-*>  The contents of A on exit are illustrated by the following example
-*>  with n = 7, k = 3 and nb = 2:
-*>
-*>     ( a   h   a   a   a )
-*>     ( a   h   a   a   a )
-*>     ( a   h   a   a   a )
-*>     ( h   h   a   a   a )
-*>     ( v1  h   a   a   a )
-*>     ( v1  v2  a   a   a )
-*>     ( v1  v2  a   a   a )
-*>
-*>  where a denotes an element of the original matrix A, h denotes a
-*>  modified element of the upper Hessenberg matrix H, and vi denotes an
-*>  element of the vector defining H(i).
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
-*
-*  -- LAPACK auxiliary routine (version 3.4.2) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
-*
-*     .. Scalar Arguments ..
-      INTEGER            K, LDA, LDT, LDY, N, NB
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * ), T( LDT, NB ), TAU( NB ),
-     $                   Y( LDY, NB )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      DOUBLE PRECISION   ZERO, ONE
-      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I
-      DOUBLE PRECISION   EI
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMV, DLARFG, DSCAL, DTRMV
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MIN
-*     ..
-*     .. Executable Statements ..
-*
-*     Quick return if possible
-*
-      IF( N.LE.1 )
-     $   RETURN
-*
-      DO 10 I = 1, NB
-         IF( I.GT.1 ) THEN
-*
-*           Update A(1:n,i)
-*
-*           Compute i-th column of A - Y * V**T
-*
-            CALL DGEMV( 'No transpose', N, I-1, -ONE, Y, LDY,
-     $                  A( K+I-1, 1 ), LDA, ONE, A( 1, I ), 1 )
-*
-*           Apply I - V * T**T * V**T to this column (call it b) from the
-*           left, using the last column of T as workspace
-*
-*           Let  V = ( V1 )   and   b = ( b1 )   (first I-1 rows)
-*                    ( V2 )             ( b2 )
-*
-*           where V1 is unit lower triangular
-*
-*           w := V1**T * b1
-*
-            CALL DCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
-            CALL DTRMV( 'Lower', 'Transpose', 'Unit', I-1, A( K+1, 1 ),
-     $                  LDA, T( 1, NB ), 1 )
-*
-*           w := w + V2**T *b2
-*
-            CALL DGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ),
-     $                  LDA, A( K+I, I ), 1, ONE, T( 1, NB ), 1 )
-*
-*           w := T**T *w
-*
-            CALL DTRMV( 'Upper', 'Transpose', 'Non-unit', I-1, T, LDT,
-     $                  T( 1, NB ), 1 )
-*
-*           b2 := b2 - V2*w
-*
-            CALL DGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
-     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
-*
-*           b1 := b1 - V1*w
-*
-            CALL DTRMV( 'Lower', 'No transpose', 'Unit', I-1,
-     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
-            CALL DAXPY( I-1, -ONE, T( 1, NB ), 1, A( K+1, I ), 1 )
-*
-            A( K+I-1, I-1 ) = EI
-         END IF
-*
-*        Generate the elementary reflector H(i) to annihilate
-*        A(k+i+1:n,i)
-*
-         CALL DLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
-     $                TAU( I ) )
-         EI = A( K+I, I )
-         A( K+I, I ) = ONE
-*
-*        Compute  Y(1:n,i)
-*
-         CALL DGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
-         CALL DGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ), LDA,
-     $               A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
-         CALL DGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
-     $               ONE, Y( 1, I ), 1 )
-         CALL DSCAL( N, TAU( I ), Y( 1, I ), 1 )
-*
-*        Compute T(1:i,i)
-*
-         CALL DSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
-         CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
-     $               T( 1, I ), 1 )
-         T( I, I ) = TAU( I )
-*
-   10 CONTINUE
-      A( K+NB, NB ) = EI
-*
-      RETURN
-*
-*     End of DLAHRD
-*
-      END
-*> \brief \b DLAIC1 applies one step of incremental condition estimation.
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DLAIC1 + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlaic1.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlaic1.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlaic1.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DLAIC1( JOB, J, X, SEST, W, GAMMA, SESTPR, S, C )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            J, JOB
-*       DOUBLE PRECISION   C, GAMMA, S, SEST, SESTPR
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   W( J ), X( J )
+*       DOUBLE PRECISION   W( J ), X( J )
 *       ..
 *  
 *
@@ -56657,7 +53615,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -56673,10 +53631,10 @@
      $                   PERM, GIVPTR, GIVCOL, LDGCOL, GIVNUM, LDGNUM,
      $                   POLES, DIFL, DIFR, Z, K, C, S, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            GIVPTR, ICOMPQ, INFO, K, LDB, LDBX, LDGCOL,
@@ -56716,6 +53674,7 @@
 *     Test the input parameters.
 *
       INFO = 0
+      N = NL + NR + 1
 *
       IF( ( ICOMPQ.LT.0 ) .OR. ( ICOMPQ.GT.1 ) ) THEN
          INFO = -1
@@ -56725,11 +53684,7 @@
          INFO = -3
       ELSE IF( ( SQRE.LT.0 ) .OR. ( SQRE.GT.1 ) ) THEN
          INFO = -4
-      END IF
-*
-      N = NL + NR + 1
-*
-      IF( NRHS.LT.1 ) THEN
+      ELSE IF( NRHS.LT.1 ) THEN
          INFO = -5
       ELSE IF( LDB.LT.N ) THEN
          INFO = -7
@@ -60955,17 +57910,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleSYauxiliary
 *
 *  =====================================================================
       DOUBLE PRECISION FUNCTION DLANSY( NORM, UPLO, N, A, LDA, WORK )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          NORM, UPLO
@@ -71472,7 +68427,7 @@
 *     End of DLARFG
 *
       END
-*> \brief \b DLARFGP generates an elementary reflector (Householder matrix) with non-negatibe beta.
+*> \brief \b DLARFGP generates an elementary reflector (Householder matrix) with non-negative beta.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -71571,17 +68526,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERauxiliary
 *
 *  =====================================================================
       SUBROUTINE DLARFGP( N, ALPHA, X, INCX, TAU )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INCX, N
@@ -75852,7 +72807,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -75871,10 +72826,10 @@
      $                   SPDIAM, CLGAPL, CLGAPR, PIVMIN, SIGMA,
      $                   DPLUS, LPLUS, WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            CLSTRT, CLEND, INFO, N
@@ -75935,7 +72890,8 @@
 
 *     Decide whether the code should accept the best among all
 *     representations despite large element growth or signal INFO=1
-      NOFAIL = .TRUE.
+*     Setting NOFAIL to .FALSE. for quick fix for bug 113
+      NOFAIL = .FALSE.
 *
 
 *     Compute the average gap length of the cluster
@@ -77254,7 +74210,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERauxiliary
 *
@@ -77274,10 +74230,10 @@
      $                   IBLOCK, INDEXW, GERS, Z, LDZ, ISUPPZ,
      $                   WORK, IWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            DOL, DOU, INFO, LDZ, M, N
@@ -77331,6 +74287,7 @@
 *     .. Executable Statements ..
 *     ..
 
+      INFO = 0
 *     The first N entries of WORK are reserved for the eigenvalues
       INDLD = N+1
       INDLLD= 2*N+1
@@ -78072,7 +75029,7 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>     The number of columns of D and X. N >= 0.
+*>     The number of columns of X. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] D
@@ -78102,17 +75059,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
 *  =====================================================================
       SUBROUTINE DLARSCL2 ( M, N, D, X, LDX )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            M, N, LDX
@@ -80718,7 +77675,7 @@
 *> \param[in] N
 *> \verbatim
 *>          N is INTEGER
-*>     The number of columns of D and X. N >= 0.
+*>     The number of columns of X. N >= 0.
 *> \endverbatim
 *>
 *> \param[in] D
@@ -80748,17 +77705,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
 *  =====================================================================
       SUBROUTINE DLASCL2 ( M, N, D, X, LDX )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            M, N, LDX
@@ -80922,7 +77879,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -80936,10 +77893,10 @@
       SUBROUTINE DLASD0( N, SQRE, D, E, U, LDU, VT, LDVT, SMLSIZ, IWORK,
      $                   WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDU, LDVT, N, SMLSIZ, SQRE
@@ -81086,6 +78043,9 @@
             CALL DLASD1( NL, NR, SQREI, D( NLF ), ALPHA, BETA,
      $                   U( NLF, NLF ), LDU, VT( NLF, NLF ), LDVT,
      $                   IWORK( IDXQC ), IWORK( IWK ), WORK, INFO )
+*
+*        Report the possible convergence failure.
+*
             IF( INFO.NE.0 ) THEN
                RETURN
             END IF
@@ -81289,7 +78249,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -81303,10 +78263,10 @@
       SUBROUTINE DLASD1( NL, NR, SQRE, D, ALPHA, BETA, U, LDU, VT, LDVT,
      $                   IDXQ, IWORK, WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDU, LDVT, NL, NR, SQRE
@@ -81401,6 +78361,9 @@
      $             U, LDU, WORK( IU2 ), LDU2, VT, LDVT, WORK( IVT2 ),
      $             LDVT2, IWORK( IDXC ), IWORK( COLTYP ), WORK( IZ ),
      $             INFO )
+*
+*     Report the convergence failure.
+*
       IF( INFO.NE.0 ) THEN
          RETURN
       END IF
@@ -82266,7 +79229,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -82281,10 +79244,10 @@
      $                   LDU2, VT, LDVT, VT2, LDVT2, IDXC, CTOT, Z,
      $                   INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, K, LDQ, LDU, LDU2, LDVT, LDVT2, NL, NR,
@@ -82407,7 +79370,7 @@
          CALL DLASD4( K, J, DSIGMA, Z, U( 1, J ), RHO, D( J ),
      $                VT( 1, J ), INFO )
 *
-*        If the zero finder fails, the computation is terminated.
+*        If the zero finder fails, report the convergence failure.
 *
          IF( INFO.NE.0 ) THEN
             RETURN
@@ -83982,7 +80945,7 @@
 *>         row.
 *> \endverbatim
 *>
-*> \param[out] IDXQ
+*> \param[in,out] IDXQ
 *> \verbatim
 *>          IDXQ is INTEGER array, dimension ( N )
 *>         This contains the permutation which will reintegrate the
@@ -84116,7 +81079,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -84132,10 +81095,10 @@
      $                   LDGNUM, POLES, DIFL, DIFR, Z, K, C, S, WORK,
      $                   IWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            GIVPTR, ICOMPQ, INFO, K, LDGCOL, LDGNUM, NL,
@@ -84232,10 +81195,9 @@
       CALL DLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDGNUM,
      $             WORK( ISIGMA ), WORK( IW ), INFO )
 *
-*     Handle error returned
+*     Report the possible convergence failure.
 *
       IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DLASD8', -INFO )
          RETURN
       END IF
 *
@@ -84995,7 +81957,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -85009,10 +81971,10 @@
       SUBROUTINE DLASD8( ICOMPQ, K, D, Z, VF, VL, DIFL, DIFR, LDDIFR,
      $                   DSIGMA, WORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            ICOMPQ, INFO, K, LDDIFR
@@ -85119,10 +82081,9 @@
          CALL DLASD4( K, J, DSIGMA, Z, WORK( IWK1 ), RHO, D( J ),
      $                WORK( IWK2 ), INFO )
 *
-*        If the root finder fails, the computation is terminated.
+*        If the root finder fails, report the convergence failure.
 *
          IF( INFO.NE.0 ) THEN
-            CALL XERBLA( 'DLASD4', -INFO )
             RETURN
          END IF
          WORK( IWK3I+J ) = WORK( IWK3I+J )*WORK( J )*WORK( IWK2I+J )
@@ -86363,7 +83324,7 @@
 *>          The constant to which the diagonal elements are to be set.
 *> \endverbatim
 *>
-*> \param[in,out] A
+*> \param[out] A
 *> \verbatim
 *>          A is DOUBLE PRECISION array, dimension (LDA,N)
 *>          On exit, the leading m-by-n submatrix of A is set as follows:
@@ -86389,17 +83350,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
 *  =====================================================================
       SUBROUTINE DLASET( UPLO, M, N, ALPHA, BETA, A, LDA )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
@@ -86571,17 +83532,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERcomputational
 *
 *  =====================================================================
       SUBROUTINE DLASQ1( N, D, E, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, N
@@ -86614,7 +83575,7 @@
 *
       INFO = 0
       IF( N.LT.0 ) THEN
-         INFO = -2
+         INFO = -1
          CALL XERBLA( 'DLASQ1', -INFO )
          RETURN
       ELSE IF( N.EQ.0 ) THEN
@@ -87334,7 +84295,7 @@
 *>         Last index.
 *> \endverbatim
 *>
-*> \param[in] Z
+*> \param[in,out] Z
 *> \verbatim
 *>          Z is DOUBLE PRECISION array, dimension ( 4*N )
 *>         Z holds the qd array.
@@ -87373,22 +84334,22 @@
 *>         Maximum value of q.
 *> \endverbatim
 *>
-*> \param[out] NFAIL
+*> \param[in,out] NFAIL
 *> \verbatim
 *>          NFAIL is INTEGER
-*>         Number of times shift was too big.
+*>         Increment NFAIL by 1 each time the shift was too big.
 *> \endverbatim
 *>
-*> \param[out] ITER
+*> \param[in,out] ITER
 *> \verbatim
 *>          ITER is INTEGER
-*>         Number of iterations.
+*>         Increment ITER by 1 for each iteration.
 *> \endverbatim
 *>
-*> \param[out] NDIV
+*> \param[in,out] NDIV
 *> \verbatim
 *>          NDIV is INTEGER
-*>         Number of divisions.
+*>         Increment NDIV by 1 for each division.
 *> \endverbatim
 *>
 *> \param[in] IEEE
@@ -87449,7 +84410,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup auxOTHERcomputational
 *
@@ -87458,10 +84419,10 @@
      $                   ITER, NDIV, IEEE, TTYPE, DMIN1, DMIN2, DN, DN1,
      $                   DN2, G, TAU )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       LOGICAL            IEEE
@@ -94749,227 +91710,6 @@
 *     End of DLATRZ
 *
       END
-*> \brief \b DLATZM
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DLATZM + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatzm.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlatzm.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatzm.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
-* 
-*       .. Scalar Arguments ..
-*       CHARACTER          SIDE
-*       INTEGER            INCV, LDC, M, N
-*       DOUBLE PRECISION   TAU
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   C1( LDC, * ), C2( LDC, * ), V( * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> This routine is deprecated and has been replaced by routine DORMRZ.
-*>
-*> DLATZM applies a Householder matrix generated by DTZRQF to a matrix.
-*>
-*> Let P = I - tau*u*u**T,   u = ( 1 ),
-*>                               ( v )
-*> where v is an (m-1) vector if SIDE = 'L', or a (n-1) vector if
-*> SIDE = 'R'.
-*>
-*> If SIDE equals 'L', let
-*>        C = [ C1 ] 1
-*>            [ C2 ] m-1
-*>              n
-*> Then C is overwritten by P*C.
-*>
-*> If SIDE equals 'R', let
-*>        C = [ C1, C2 ] m
-*>               1  n-1
-*> Then C is overwritten by C*P.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] SIDE
-*> \verbatim
-*>          SIDE is CHARACTER*1
-*>          = 'L': form P * C
-*>          = 'R': form C * P
-*> \endverbatim
-*>
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix C.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix C.
-*> \endverbatim
-*>
-*> \param[in] V
-*> \verbatim
-*>          V is DOUBLE PRECISION array, dimension
-*>                  (1 + (M-1)*abs(INCV)) if SIDE = 'L'
-*>                  (1 + (N-1)*abs(INCV)) if SIDE = 'R'
-*>          The vector v in the representation of P. V is not used
-*>          if TAU = 0.
-*> \endverbatim
-*>
-*> \param[in] INCV
-*> \verbatim
-*>          INCV is INTEGER
-*>          The increment between elements of v. INCV <> 0
-*> \endverbatim
-*>
-*> \param[in] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION
-*>          The value tau in the representation of P.
-*> \endverbatim
-*>
-*> \param[in,out] C1
-*> \verbatim
-*>          C1 is DOUBLE PRECISION array, dimension
-*>                         (LDC,N) if SIDE = 'L'
-*>                         (M,1)   if SIDE = 'R'
-*>          On entry, the n-vector C1 if SIDE = 'L', or the m-vector C1
-*>          if SIDE = 'R'.
-*>
-*>          On exit, the first row of P*C if SIDE = 'L', or the first
-*>          column of C*P if SIDE = 'R'.
-*> \endverbatim
-*>
-*> \param[in,out] C2
-*> \verbatim
-*>          C2 is DOUBLE PRECISION array, dimension
-*>                         (LDC, N)   if SIDE = 'L'
-*>                         (LDC, N-1) if SIDE = 'R'
-*>          On entry, the (m - 1) x n matrix C2 if SIDE = 'L', or the
-*>          m x (n - 1) matrix C2 if SIDE = 'R'.
-*>
-*>          On exit, rows 2:m of P*C if SIDE = 'L', or columns 2:m of C*P
-*>          if SIDE = 'R'.
-*> \endverbatim
-*>
-*> \param[in] LDC
-*> \verbatim
-*>          LDC is INTEGER
-*>          The leading dimension of the arrays C1 and C2. LDC >= (1,M).
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension
-*>                      (N) if SIDE = 'L'
-*>                      (M) if SIDE = 'R'
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date November 2011
-*
-*> \ingroup doubleOTHERcomputational
-*
-*  =====================================================================
-      SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
-*
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      CHARACTER          SIDE
-      INTEGER            INCV, LDC, M, N
-      DOUBLE PRECISION   TAU
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   C1( LDC, * ), C2( LDC, * ), V( * ), WORK( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMV, DGER
-*     ..
-*     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MIN
-*     ..
-*     .. Executable Statements ..
-*
-      IF( ( MIN( M, N ).EQ.0 ) .OR. ( TAU.EQ.ZERO ) )
-     $   RETURN
-*
-      IF( LSAME( SIDE, 'L' ) ) THEN
-*
-*        w :=  (C1 + v**T * C2)**T
-*
-         CALL DCOPY( N, C1, LDC, WORK, 1 )
-         CALL DGEMV( 'Transpose', M-1, N, ONE, C2, LDC, V, INCV, ONE,
-     $               WORK, 1 )
-*
-*        [ C1 ] := [ C1 ] - tau* [ 1 ] * w**T
-*        [ C2 ]    [ C2 ]        [ v ]
-*
-         CALL DAXPY( N, -TAU, WORK, 1, C1, LDC )
-         CALL DGER( M-1, N, -TAU, V, INCV, WORK, 1, C2, LDC )
-*
-      ELSE IF( LSAME( SIDE, 'R' ) ) THEN
-*
-*        w := C1 + C2 * v
-*
-         CALL DCOPY( M, C1, 1, WORK, 1 )
-         CALL DGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
-     $               WORK, 1 )
-*
-*        [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**T]
-*
-         CALL DAXPY( M, -TAU, WORK, 1, C1, 1 )
-         CALL DGER( M, N-1, -TAU, WORK, 1, V, INCV, C2, LDC )
-      END IF
-*
-      RETURN
-*
-*     End of DLATZM
-*
-      END
 *> \brief \b DLAUU2 computes the product UUH or LHL, where U and L are upper or lower triangular matrices (unblocked algorithm).
 *
 *  =========== DOCUMENTATION ===========
@@ -96214,7 +92954,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2013
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -96246,10 +92986,10 @@
      $                   X21, LDX21, X22, LDX22, THETA, PHI, TAUP1,
      $                   TAUP2, TAUQ1, TAUQ2, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          SIGNS, TRANS
@@ -96471,7 +93211,7 @@
             END IF
             X12(I,I) = ONE
 *
-            IF ( P. GT. I ) THEN
+            IF ( P .GT. I ) THEN
                CALL DLARF( 'R', P-I, M-Q-I+1, X12(I,I), LDX12, TAUQ2(I),
      $                     X12(I+1,I), LDX12, WORK )
             END IF
@@ -101714,9 +98454,7 @@
 *>          The dimension of the array WORK.
 *>          If SIDE = 'L', LWORK >= max(1,N);
 *>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -101739,7 +98477,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -101747,10 +98485,10 @@
       SUBROUTINE DORMLQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          SIDE, TRANS
@@ -101763,18 +98501,16 @@
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, LQUERY, NOTRAN
       CHARACTER          TRANST
-      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWS, JC, LDWORK,
+      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWT, JC, LDWORK,
      $                   LWKOPT, MI, NB, NBMIN, NI, NQ, NW
 *     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION   T( LDT, NBMAX )
-*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
@@ -101824,12 +98560,11 @@
 *
       IF( INFO.EQ.0 ) THEN
 *
-*        Determine the block size.  NB may be at most NBMAX, where NBMAX
-*        is used to define the local array T.
+*        Compute the workspace requirements
 *
          NB = MIN( NBMAX, ILAENV( 1, 'DORMLQ', SIDE // TRANS, M, N, K,
      $        -1 ) )
-         LWKOPT = MAX( 1, NW )*NB
+         LWKOPT = MAX( 1, NW )*NB + TSIZE
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -101850,14 +98585,11 @@
       NBMIN = 2
       LDWORK = NW
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
             NBMIN = MAX( 2, ILAENV( 2, 'DORMLQ', SIDE // TRANS, M, N, K,
      $              -1 ) )
          END IF
-      ELSE
-         IWS = NW
       END IF
 *
       IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
@@ -101870,6 +98602,7 @@
 *
 *        Use blocked code
 *
+         IWT = 1 + NW*NB
          IF( ( LEFT .AND. NOTRAN ) .OR.
      $       ( .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
             I1 = 1
@@ -101902,7 +98635,7 @@
 *           H = H(i) H(i+1) . . . H(i+ib-1)
 *
             CALL DLARFT( 'Forward', 'Rowwise', NQ-I+1, IB, A( I, I ),
-     $                   LDA, TAU( I ), T, LDT )
+     $                   LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
 *              H or H**T is applied to C(i:m,1:n)
@@ -101920,8 +98653,8 @@
 *           Apply H or H**T
 *
             CALL DLARFB( SIDE, TRANST, 'Forward', 'Rowwise', MI, NI, IB,
-     $                   A( I, I ), LDA, T, LDT, C( IC, JC ), LDC, WORK,
-     $                   LDWORK )
+     $                   A( I, I ), LDA, WORK( IWT ), LDT,
+     $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
       END IF
       WORK( 1 ) = LWKOPT
@@ -102068,9 +98801,7 @@
 *>          The dimension of the array WORK.
 *>          If SIDE = 'L', LWORK >= max(1,N);
 *>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -102093,7 +98824,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -102101,10 +98832,10 @@
       SUBROUTINE DORMQL( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          SIDE, TRANS
@@ -102117,17 +98848,15 @@
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, LQUERY, NOTRAN
-      INTEGER            I, I1, I2, I3, IB, IINFO, IWS, LDWORK, LWKOPT,
+      INTEGER            I, I1, I2, I3, IB, IINFO, IWT, LDWORK, LWKOPT,
      $                   MI, NB, NBMIN, NI, NQ, NW
 *     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION   T( LDT, NBMAX )
-*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
@@ -102171,25 +98900,22 @@
          INFO = -7
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
          INFO = -10
+      ELSE IF( LWORK.LT.NW .AND. .NOT.LQUERY ) THEN
+         INFO = -12
       END IF
 *
       IF( INFO.EQ.0 ) THEN
+*
+*        Compute the workspace requirements
+*
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-*
-*           Determine the block size.  NB may be at most NBMAX, where
-*           NBMAX is used to define the local array T.
-*
             NB = MIN( NBMAX, ILAENV( 1, 'DORMQL', SIDE // TRANS, M, N,
      $                               K, -1 ) )
-            LWKOPT = NW*NB
+            LWKOPT = NW*NB + TSIZE
          END IF
          WORK( 1 ) = LWKOPT
-*
-         IF( LWORK.LT.NW .AND. .NOT.LQUERY ) THEN
-            INFO = -12
-         END IF
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -102208,14 +98934,11 @@
       NBMIN = 2
       LDWORK = NW
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
             NBMIN = MAX( 2, ILAENV( 2, 'DORMQL', SIDE // TRANS, M, N, K,
      $              -1 ) )
          END IF
-      ELSE
-         IWS = NW
       END IF
 *
       IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
@@ -102228,6 +98951,7 @@
 *
 *        Use blocked code
 *
+         IWT = 1 + NW*NB
          IF( ( LEFT .AND. NOTRAN ) .OR.
      $       ( .NOT.LEFT .AND. .NOT.NOTRAN ) ) THEN
             I1 = 1
@@ -102252,7 +98976,7 @@
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
             CALL DLARFT( 'Backward', 'Columnwise', NQ-K+I+IB-1, IB,
-     $                   A( 1, I ), LDA, TAU( I ), T, LDT )
+     $                   A( 1, I ), LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
 *              H or H**T is applied to C(1:m-k+i+ib-1,1:n)
@@ -102268,8 +98992,8 @@
 *           Apply H or H**T
 *
             CALL DLARFB( SIDE, TRANS, 'Backward', 'Columnwise', MI, NI,
-     $                   IB, A( 1, I ), LDA, T, LDT, C, LDC, WORK,
-     $                   LDWORK )
+     $                   IB, A( 1, I ), LDA, WORK( IWT ), LDT, C, LDC,
+     $                   WORK, LDWORK )
    10    CONTINUE
       END IF
       WORK( 1 ) = LWKOPT
@@ -102416,9 +99140,7 @@
 *>          The dimension of the array WORK.
 *>          If SIDE = 'L', LWORK >= max(1,N);
 *>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -102441,7 +99163,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -102449,10 +99171,10 @@
       SUBROUTINE DORMQR( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          SIDE, TRANS
@@ -102465,17 +99187,15 @@
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, LQUERY, NOTRAN
-      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWS, JC, LDWORK,
+      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWT, JC, LDWORK,
      $                   LWKOPT, MI, NB, NBMIN, NI, NQ, NW
 *     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION   T( LDT, NBMAX )
-*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
@@ -102525,12 +99245,11 @@
 *
       IF( INFO.EQ.0 ) THEN
 *
-*        Determine the block size.  NB may be at most NBMAX, where NBMAX
-*        is used to define the local array T.
+*        Compute the workspace requirements
 *
          NB = MIN( NBMAX, ILAENV( 1, 'DORMQR', SIDE // TRANS, M, N, K,
      $        -1 ) )
-         LWKOPT = MAX( 1, NW )*NB
+         LWKOPT = MAX( 1, NW )*NB + TSIZE
          WORK( 1 ) = LWKOPT
       END IF
 *
@@ -102551,14 +99270,11 @@
       NBMIN = 2
       LDWORK = NW
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
             NBMIN = MAX( 2, ILAENV( 2, 'DORMQR', SIDE // TRANS, M, N, K,
      $              -1 ) )
          END IF
-      ELSE
-         IWS = NW
       END IF
 *
       IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
@@ -102571,6 +99287,7 @@
 *
 *        Use blocked code
 *
+         IWT = 1 + NW*NB
          IF( ( LEFT .AND. .NOT.NOTRAN ) .OR.
      $       ( .NOT.LEFT .AND. NOTRAN ) ) THEN
             I1 = 1
@@ -102597,7 +99314,7 @@
 *           H = H(i) H(i+1) . . . H(i+ib-1)
 *
             CALL DLARFT( 'Forward', 'Columnwise', NQ-I+1, IB, A( I, I ),
-     $                   LDA, TAU( I ), T, LDT )
+     $                   LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
 *              H or H**T is applied to C(i:m,1:n)
@@ -102615,8 +99332,8 @@
 *           Apply H or H**T
 *
             CALL DLARFB( SIDE, TRANS, 'Forward', 'Columnwise', MI, NI,
-     $                   IB, A( I, I ), LDA, T, LDT, C( IC, JC ), LDC,
-     $                   WORK, LDWORK )
+     $                   IB, A( I, I ), LDA, WORK( IWT ), LDT,
+     $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
       END IF
       WORK( 1 ) = LWKOPT
@@ -103340,9 +100057,7 @@
 *>          The dimension of the array WORK.
 *>          If SIDE = 'L', LWORK >= max(1,N);
 *>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -103365,7 +100080,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -103373,10 +100088,10 @@
       SUBROUTINE DORMRQ( SIDE, TRANS, M, N, K, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          SIDE, TRANS
@@ -103389,18 +100104,16 @@
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, LQUERY, NOTRAN
       CHARACTER          TRANST
-      INTEGER            I, I1, I2, I3, IB, IINFO, IWS, LDWORK, LWKOPT,
+      INTEGER            I, I1, I2, I3, IB, IINFO, IWT, LDWORK, LWKOPT,
      $                   MI, NB, NBMIN, NI, NQ, NW
 *     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION   T( LDT, NBMAX )
-*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
@@ -103444,25 +100157,22 @@
          INFO = -7
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
          INFO = -10
+      ELSE IF( LWORK.LT.NW .AND. .NOT.LQUERY ) THEN
+         INFO = -12
       END IF
 *
       IF( INFO.EQ.0 ) THEN
+*
+*        Compute the workspace requirements
+*
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-*
-*           Determine the block size.  NB may be at most NBMAX, where
-*           NBMAX is used to define the local array T.
-*
             NB = MIN( NBMAX, ILAENV( 1, 'DORMRQ', SIDE // TRANS, M, N,
      $                               K, -1 ) )
-            LWKOPT = NW*NB
+            LWKOPT = NW*NB + TSIZE
          END IF
          WORK( 1 ) = LWKOPT
-*
-         IF( LWORK.LT.NW .AND. .NOT.LQUERY ) THEN
-            INFO = -12
-         END IF
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -103481,14 +100191,11 @@
       NBMIN = 2
       LDWORK = NW
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
             NBMIN = MAX( 2, ILAENV( 2, 'DORMRQ', SIDE // TRANS, M, N, K,
      $              -1 ) )
          END IF
-      ELSE
-         IWS = NW
       END IF
 *
       IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
@@ -103501,6 +100208,7 @@
 *
 *        Use blocked code
 *
+         IWT = 1 + NW*NB
          IF( ( LEFT .AND. .NOT.NOTRAN ) .OR.
      $       ( .NOT.LEFT .AND. NOTRAN ) ) THEN
             I1 = 1
@@ -103531,7 +100239,7 @@
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
             CALL DLARFT( 'Backward', 'Rowwise', NQ-K+I+IB-1, IB,
-     $                   A( I, 1 ), LDA, TAU( I ), T, LDT )
+     $                   A( I, 1 ), LDA, TAU( I ), WORK( IWT ), LDT )
             IF( LEFT ) THEN
 *
 *              H or H**T is applied to C(1:m-k+i+ib-1,1:n)
@@ -103547,8 +100255,8 @@
 *           Apply H or H**T
 *
             CALL DLARFB( SIDE, TRANST, 'Backward', 'Rowwise', MI, NI,
-     $                   IB, A( I, 1 ), LDA, T, LDT, C, LDC, WORK,
-     $                   LDWORK )
+     $                   IB, A( I, 1 ), LDA, WORK( IWT ), LDT, C, LDC,
+     $                   WORK, LDWORK )
    10    CONTINUE
       END IF
       WORK( 1 ) = LWKOPT
@@ -103704,9 +100412,7 @@
 *>          The dimension of the array WORK.
 *>          If SIDE = 'L', LWORK >= max(1,N);
 *>          if SIDE = 'R', LWORK >= max(1,M).
-*>          For optimum performance LWORK >= N*NB if SIDE = 'L', and
-*>          LWORK >= M*NB if SIDE = 'R', where NB is the optimal
-*>          blocksize.
+*>          For good performance, LWORK should generally be larger.
 *>
 *>          If LWORK = -1, then a workspace query is assumed; the routine
 *>          only calculates the optimal size of the WORK array, returns
@@ -103729,7 +100435,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -103748,10 +100454,10 @@
       SUBROUTINE DORMRZ( SIDE, TRANS, M, N, K, L, A, LDA, TAU, C, LDC,
      $                   WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          SIDE, TRANS
@@ -103764,18 +100470,16 @@
 *  =====================================================================
 *
 *     .. Parameters ..
-      INTEGER            NBMAX, LDT
-      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1 )
+      INTEGER            NBMAX, LDT, TSIZE
+      PARAMETER          ( NBMAX = 64, LDT = NBMAX+1,
+     $                     TSIZE = LDT*NBMAX )
 *     ..
 *     .. Local Scalars ..
       LOGICAL            LEFT, LQUERY, NOTRAN
       CHARACTER          TRANST
-      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWS, JA, JC,
+      INTEGER            I, I1, I2, I3, IB, IC, IINFO, IWT, JA, JC,
      $                   LDWORK, LWKOPT, MI, NB, NBMIN, NI, NQ, NW
 *     ..
-*     .. Local Arrays ..
-      DOUBLE PRECISION   T( LDT, NBMAX )
-*     ..
 *     .. External Functions ..
       LOGICAL            LSAME
       INTEGER            ILAENV
@@ -103822,25 +100526,22 @@
          INFO = -8
       ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
          INFO = -11
+      ELSE IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
+         INFO = -13
       END IF
 *
       IF( INFO.EQ.0 ) THEN
+*
+*        Compute the workspace requirements
+*         
          IF( M.EQ.0 .OR. N.EQ.0 ) THEN
             LWKOPT = 1
          ELSE
-*
-*           Determine the block size.  NB may be at most NBMAX, where
-*           NBMAX is used to define the local array T.
-*
             NB = MIN( NBMAX, ILAENV( 1, 'DORMRQ', SIDE // TRANS, M, N,
      $                               K, -1 ) )
-            LWKOPT = NW*NB
+            LWKOPT = NW*NB + TSIZE
          END IF
          WORK( 1 ) = LWKOPT
-*
-         IF( LWORK.LT.MAX( 1, NW ) .AND. .NOT.LQUERY ) THEN
-            INFO = -13
-         END IF
       END IF
 *
       IF( INFO.NE.0 ) THEN
@@ -103860,14 +100561,11 @@
       NBMIN = 2
       LDWORK = NW
       IF( NB.GT.1 .AND. NB.LT.K ) THEN
-         IWS = NW*NB
-         IF( LWORK.LT.IWS ) THEN
-            NB = LWORK / LDWORK
+         IF( LWORK.LT.NW*NB+TSIZE ) THEN
+            NB = (LWORK-TSIZE) / LDWORK
             NBMIN = MAX( 2, ILAENV( 2, 'DORMRQ', SIDE // TRANS, M, N, K,
      $              -1 ) )
          END IF
-      ELSE
-         IWS = NW
       END IF
 *
       IF( NB.LT.NBMIN .OR. NB.GE.K ) THEN
@@ -103880,6 +100578,7 @@
 *
 *        Use blocked code
 *
+         IWT = 1 + NW*NB
          IF( ( LEFT .AND. .NOT.NOTRAN ) .OR.
      $       ( .NOT.LEFT .AND. NOTRAN ) ) THEN
             I1 = 1
@@ -103914,7 +100613,7 @@
 *           H = H(i+ib-1) . . . H(i+1) H(i)
 *
             CALL DLARZT( 'Backward', 'Rowwise', L, IB, A( I, JA ), LDA,
-     $                   TAU( I ), T, LDT )
+     $                   TAU( I ), WORK( IWT ), LDT )
 *
             IF( LEFT ) THEN
 *
@@ -103933,8 +100632,8 @@
 *           Apply H or H**T
 *
             CALL DLARZB( SIDE, TRANST, 'Backward', 'Rowwise', MI, NI,
-     $                   IB, L, A( I, JA ), LDA, T, LDT, C( IC, JC ),
-     $                   LDC, WORK, LDWORK )
+     $                   IB, L, A( I, JA ), LDA, WORK( IWT ), LDT,
+     $                   C( IC, JC ), LDC, WORK, LDWORK )
    10    CONTINUE
 *
       END IF
@@ -110505,17 +107204,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doublePOcomputational
 *
 *  =====================================================================
       SUBROUTINE DPOTRF( UPLO, N, A, LDA, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
@@ -110541,7 +107240,7 @@
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DGEMM, DPOTF2, DSYRK, DTRSM, XERBLA
+      EXTERNAL           DGEMM, DPOTRF2, DSYRK, DTRSM, XERBLA
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          MAX, MIN
@@ -110576,7 +107275,7 @@
 *
 *        Use unblocked code.
 *
-         CALL DPOTF2( UPLO, N, A, LDA, INFO )
+         CALL DPOTRF2( UPLO, N, A, LDA, INFO )
       ELSE
 *
 *        Use blocked code.
@@ -110593,7 +107292,7 @@
                JB = MIN( NB, N-J+1 )
                CALL DSYRK( 'Upper', 'Transpose', JB, J-1, -ONE,
      $                     A( 1, J ), LDA, ONE, A( J, J ), LDA )
-               CALL DPOTF2( 'Upper', JB, A( J, J ), LDA, INFO )
+               CALL DPOTRF2( 'Upper', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
                IF( J+JB.LE.N ) THEN
@@ -110621,7 +107320,7 @@
                JB = MIN( NB, N-J+1 )
                CALL DSYRK( 'Lower', 'No transpose', JB, J-1, -ONE,
      $                     A( J, 1 ), LDA, ONE, A( J, J ), LDA )
-               CALL DPOTF2( 'Lower', JB, A( J, J ), LDA, INFO )
+               CALL DPOTRF2( 'Lower', JB, A( J, J ), LDA, INFO )
                IF( INFO.NE.0 )
      $            GO TO 30
                IF( J+JB.LE.N ) THEN
@@ -110649,6 +107348,243 @@
 *     End of DPOTRF
 *
       END
+*> \brief \b DPOTRF2
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*  Definition:
+*  ===========
+*
+*       RECURSIVE SUBROUTINE DPOTRF2( UPLO, N, A, LDA, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          UPLO
+*       INTEGER            INFO, LDA, N
+*       ..
+*       .. Array Arguments ..
+*       REAL               A( LDA, * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> DPOTRF2 computes the Cholesky factorization of a real symmetric
+*> positive definite matrix A using the recursive algorithm.
+*>
+*> The factorization has the form
+*>    A = U**T * U,  if UPLO = 'U', or
+*>    A = L  * L**T,  if UPLO = 'L',
+*> where U is an upper triangular matrix and L is lower triangular.
+*>
+*> This is the recursive version of the algorithm. It divides
+*> the matrix into four submatrices:
+*>
+*>        [  A11 | A12  ]  where A11 is n1 by n1 and A22 is n2 by n2
+*>    A = [ -----|----- ]  with n1 = n/2
+*>        [  A21 | A22  ]       n2 = n-n1
+*>
+*> The subroutine calls itself to factor A11. Update and scale A21
+*> or A12, update A22 then calls itself to factor A22.
+*> 
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] UPLO
+*> \verbatim
+*>          UPLO is CHARACTER*1
+*>          = 'U':  Upper triangle of A is stored;
+*>          = 'L':  Lower triangle of A is stored.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+*>          N-by-N upper triangular part of A contains the upper
+*>          triangular part of the matrix A, and the strictly lower
+*>          triangular part of A is not referenced.  If UPLO = 'L', the
+*>          leading N-by-N lower triangular part of A contains the lower
+*>          triangular part of the matrix A, and the strictly upper
+*>          triangular part of A is not referenced.
+*>
+*>          On exit, if INFO = 0, the factor U or L from the Cholesky
+*>          factorization A = U**T*U or A = L*L**T.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          > 0:  if INFO = i, the leading minor of order i is not
+*>                positive definite, and the factorization could not be
+*>                completed.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup doublePOcomputational
+*
+*  =====================================================================
+      RECURSIVE SUBROUTINE DPOTRF2( UPLO, N, A, LDA, INFO )
+*
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      CHARACTER          UPLO
+      INTEGER            INFO, LDA, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            UPPER            
+      INTEGER            N1, N2, IINFO
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME, DISNAN
+      EXTERNAL           LSAME, DISNAN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DSYRK, DTRSM, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, SQRT
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters
+*
+      INFO = 0
+      UPPER = LSAME( UPLO, 'U' )
+      IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DPOTRF2', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     N=1 case
+*
+      IF( N.EQ.1 ) THEN
+*
+*        Test for non-positive-definiteness
+*
+         IF( A( 1, 1 ).LE.ZERO.OR.DISNAN( A( 1, 1 ) ) ) THEN
+            INFO = 1
+            RETURN
+         END IF
+*
+*        Factor
+*
+         A( 1, 1 ) = SQRT( A( 1, 1 ) )
+*
+*     Use recursive code
+*
+      ELSE
+         N1 = N/2
+         N2 = N-N1
+*
+*        Factor A11
+*
+         CALL DPOTRF2( UPLO, N1, A( 1, 1 ), LDA, IINFO )
+         IF ( IINFO.NE.0 ) THEN
+            INFO = IINFO
+            RETURN
+         END IF    
+*
+*        Compute the Cholesky factorization A = U**T*U
+*
+         IF( UPPER ) THEN
+*
+*           Update and scale A12
+*
+            CALL DTRSM( 'L', 'U', 'T', 'N', N1, N2, ONE,
+     $                  A( 1, 1 ), LDA, A( 1, N1+1 ), LDA )            
+*
+*           Update and factor A22
+*          
+            CALL DSYRK( UPLO, 'T', N2, N1, -ONE, A( 1, N1+1 ), LDA,
+     $                  ONE, A( N1+1, N1+1 ), LDA )
+            CALL DPOTRF2( UPLO, N2, A( N1+1, N1+1 ), LDA, IINFO )
+            IF ( IINFO.NE.0 ) THEN
+               INFO = IINFO + N1
+               RETURN
+            END IF
+*
+*        Compute the Cholesky factorization A = L*L**T
+*
+         ELSE
+*
+*           Update and scale A21
+*
+            CALL DTRSM( 'R', 'L', 'T', 'N', N2, N1, ONE, 
+     $                  A( 1, 1 ), LDA, A( N1+1, 1 ), LDA )
+*
+*           Update and factor A22
+*
+            CALL DSYRK( UPLO, 'N', N2, N1, -ONE, A( N1+1, 1 ), LDA,
+     $                  ONE, A( N1+1, N1+1 ), LDA )
+            CALL DPOTRF2( UPLO, N2, A( N1+1, N1+1 ), LDA, IINFO )
+            IF ( IINFO.NE.0 ) THEN
+               INFO = IINFO + N1
+               RETURN
+            END IF
+         END IF
+      END IF
+      RETURN
+*
+*     End of DPOTRF2
+*
+      END
 *> \brief \b DPOTRI
 *
 *  =========== DOCUMENTATION ===========
@@ -113249,7 +110185,7 @@
 *     End of DPPTRS
 *
       END
-*> \brief \b DPSTF2 computes the Cholesky factorization with complete pivoting of a real symmetric or complex Hermitian positive semi-definite matrix.
+*> \brief \b DPSTF2 computes the Cholesky factorization with complete pivoting of a real symmetric positive semidefinite matrix.
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -113372,8 +110308,9 @@
 *>          < 0: If INFO = -K, the K-th argument had an illegal value,
 *>          = 0: algorithm completed successfully, and
 *>          > 0: the matrix A is either rank deficient with computed rank
-*>               as returned in RANK, or is indefinite.  See Section 7 of
-*>               LAPACK Working Note #161 for further information.
+*>               as returned in RANK, or is not positive semidefinite. See
+*>               Section 7 of LAPACK Working Note #161 for further
+*>               information.
 *> \endverbatim
 *
 *  Authors:
@@ -113384,17 +110321,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
 *  =====================================================================
       SUBROUTINE DPSTF2( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       DOUBLE PRECISION   TOL
@@ -113467,7 +110404,7 @@
             AJJ = A( PVT, PVT )
          END IF
       END DO
-      IF( AJJ.EQ.ZERO.OR.DISNAN( AJJ ) ) THEN
+      IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
          RANK = 0
          INFO = 1
          GO TO 170
@@ -113634,7 +110571,8 @@
 *     End of DPSTF2
 *
       END
-*> \brief \b DPSTRF
+*> \brief \b DPSTRF computes the Cholesky factorization with complete pivoting of a real symmetric positive semidefinite matrix.
+*
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -113757,8 +110695,9 @@
 *>          < 0: If INFO = -K, the K-th argument had an illegal value,
 *>          = 0: algorithm completed successfully, and
 *>          > 0: the matrix A is either rank deficient with computed rank
-*>               as returned in RANK, or is indefinite.  See Section 7 of
-*>               LAPACK Working Note #161 for further information.
+*>               as returned in RANK, or is not positive semidefinite. See
+*>               Section 7 of LAPACK Working Note #161 for further
+*>               information.
 *> \endverbatim
 *
 *  Authors:
@@ -113769,17 +110708,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
 *  =====================================================================
       SUBROUTINE DPSTRF( UPLO, N, A, LDA, PIV, RANK, TOL, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       DOUBLE PRECISION   TOL
@@ -113866,7 +110805,7 @@
                AJJ = A( PVT, PVT )
             END IF
          END DO
-         IF( AJJ.EQ.ZERO.OR.DISNAN( AJJ ) ) THEN
+         IF( AJJ.LE.ZERO.OR.DISNAN( AJJ ) ) THEN
             RANK = 0
             INFO = 1
             GO TO 200
@@ -118799,7 +115738,7 @@
 *     End of DSBGST
 *
       END
-*> \brief \b DSBGST
+*> \brief \b DSBGV
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -118970,7 +115909,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -118978,10 +115917,10 @@
       SUBROUTINE DSBGV( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W, Z,
      $                  LDZ, WORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, UPLO
@@ -119079,7 +116018,7 @@
 *     End of DSBGV
 *
       END
-*> \brief \b DSBGST
+*> \brief \b DSBGVD
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -119295,7 +116234,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -119308,10 +116247,10 @@
       SUBROUTINE DSBGVD( JOBZ, UPLO, N, KA, KB, AB, LDAB, BB, LDBB, W,
      $                   Z, LDZ, WORK, LWORK, IWORK, LIWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, UPLO
@@ -119451,7 +116390,7 @@
 *     End of DSBGVD
 *
       END
-*> \brief \b DSBGST
+*> \brief \b DSBGVX
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -119724,7 +116663,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -119738,10 +116677,10 @@
      $                   LDBB, Q, LDQ, VL, VU, IL, IU, ABSTOL, M, W, Z,
      $                   LDZ, WORK, IWORK, IFAIL, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, RANGE, UPLO
@@ -122750,7 +119689,7 @@
 *     End of DSPGST
 *
       END
-*> \brief \b DSPGST
+*> \brief \b DSPGV
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -122905,7 +119844,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -122913,10 +119852,10 @@
       SUBROUTINE DSPGV( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
      $                  INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, UPLO
@@ -123028,7 +119967,7 @@
 *     End of DSPGV
 *
       END
-*> \brief \b DSPGST
+*> \brief \b DSPGVD
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -123227,7 +120166,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -123240,10 +120179,10 @@
       SUBROUTINE DSPGVD( ITYPE, JOBZ, UPLO, N, AP, BP, W, Z, LDZ, WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, UPLO
@@ -123392,7 +120331,7 @@
 *     End of DSPGVD
 *
       END
-*> \brief \b DSPGST
+*> \brief \b DSPGVX
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -123643,7 +120582,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -123657,10 +120596,10 @@
      $                   IL, IU, ABSTOL, M, W, Z, LDZ, WORK, IWORK,
      $                   IFAIL, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, RANGE, UPLO
@@ -127369,7 +124308,7 @@
 *     End of DSTEBZ
 *
       END
-*> \brief \b DSTEBZ
+*> \brief \b DSTEDC
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -127545,7 +124484,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup auxOTHERcomputational
 *
@@ -127560,10 +124499,10 @@
       SUBROUTINE DSTEDC( COMPZ, N, D, E, Z, LDZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          COMPZ
@@ -127814,38 +124753,32 @@
 *
 *        endwhile
 *
-*        If the problem split any number of times, then the eigenvalues
-*        will not be properly ordered.  Here we permute the eigenvalues
-*        (and the associated eigenvectors) into ascending order.
-*
-         IF( M.NE.N ) THEN
-            IF( ICOMPZ.EQ.0 ) THEN
-*
-*              Use Quick Sort
+         IF( ICOMPZ.EQ.0 ) THEN
 *
-               CALL DLASRT( 'I', N, D, INFO )
+*          Use Quick Sort
 *
-            ELSE
+           CALL DLASRT( 'I', N, D, INFO )
 *
-*              Use Selection Sort to minimize swaps of eigenvectors
+         ELSE
 *
-               DO 40 II = 2, N
-                  I = II - 1
-                  K = I
-                  P = D( I )
-                  DO 30 J = II, N
-                     IF( D( J ).LT.P ) THEN
-                        K = J
-                        P = D( J )
-                     END IF
-   30             CONTINUE
-                  IF( K.NE.I ) THEN
-                     D( K ) = D( I )
-                     D( I ) = P
-                     CALL DSWAP( N, Z( 1, I ), 1, Z( 1, K ), 1 )
-                  END IF
-   40          CONTINUE
-            END IF
+*          Use Selection Sort to minimize swaps of eigenvectors
+*
+           DO 40 II = 2, N
+              I = II - 1
+              K = I
+              P = D( I )
+              DO 30 J = II, N
+                 IF( D( J ).LT.P ) THEN
+                    K = J
+                    P = D( J )
+                 END IF
+   30         CONTINUE
+              IF( K.NE.I ) THEN
+                 D( K ) = D( I )
+                 D( I ) = P
+                 CALL DSWAP( N, Z( 1, I ), 1, Z( 1, K ), 1 )
+              END IF
+   40      CONTINUE
          END IF
       END IF
 *
@@ -128319,7 +125252,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -128327,10 +125260,10 @@
       SUBROUTINE DSTEIN( N, D, E, M, W, IBLOCK, ISPLIT, Z, LDZ, WORK,
      $                   IWORK, IFAIL, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            INFO, LDZ, M, N
@@ -128450,7 +125383,7 @@
          BLKSIZ = BN - B1 + 1
          IF( BLKSIZ.EQ.1 )
      $      GO TO 60
-         GPIND = B1
+         GPIND = J1
 *
 *        Compute reorthogonalization criterion and stopping criterion.
 *
@@ -128523,9 +125456,10 @@
 *
 *           Normalize and scale the righthand side vector Pb.
 *
+            JMAX = IDAMAX( BLKSIZ, WORK( INDRV1+1 ), 1 )
             SCL = BLKSIZ*ONENRM*MAX( EPS,
      $            ABS( WORK( INDRV4+BLKSIZ ) ) ) /
-     $            DASUM( BLKSIZ, WORK( INDRV1+1 ), 1 )
+     $            ABS( WORK( INDRV1+JMAX ) )
             CALL DSCAL( BLKSIZ, SCL, WORK( INDRV1+1 ), 1 )
 *
 *           Solve the system LU = Pb.
@@ -131188,7 +128122,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleOTHEReigen
 *
@@ -131205,10 +128139,10 @@
      $                   M, W, Z, LDZ, ISUPPZ, WORK, LWORK, IWORK,
      $                   LIWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, RANGE
@@ -131343,8 +128277,10 @@
 *     Scale matrix to allowable range, if necessary.
 *
       ISCALE = 0
-      VLL = VL
-      VUU = VU
+      IF( VALEIG ) THEN
+         VLL = VL
+         VUU = VU
+      END IF
 *
       TNRM = DLANST( 'M', N, D, E )
       IF( TNRM.GT.ZERO .AND. TNRM.LT.RMIN ) THEN
@@ -132202,7 +129138,7 @@
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DSYCONV( UPLO, WAY, N, A, LDA, IPIV, WORK, INFO )
+*       SUBROUTINE DSYCONV( UPLO, WAY, N, A, LDA, IPIV, E, INFO )
 * 
 *       .. Scalar Arguments ..
 *       CHARACTER          UPLO, WAY
@@ -132210,7 +129146,7 @@
 *       ..
 *       .. Array Arguments ..
 *       INTEGER            IPIV( * )
-*       DOUBLE PRECISION   A( LDA, * ), WORK( * )
+*       DOUBLE PRECISION   A( LDA, * ), E( * )
 *       ..
 *  
 *
@@ -132249,7 +129185,7 @@
 *>          The order of the matrix A.  N >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
 *>          A is DOUBLE PRECISION array, dimension (LDA,N)
 *>          The block diagonal matrix D and the multipliers used to
@@ -132269,9 +129205,11 @@
 *>          as determined by DSYTRF.
 *> \endverbatim
 *>
-*> \param[out] WORK
+*> \param[out] E
 *> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (N)
+*>          E is DOUBLE PRECISION array, dimension (N)
+*>          E stores the supdiagonal/subdiagonal of the symmetric 1-by-1
+*>          or 2-by-2 block diagonal matrix D in LDLT.
 *> \endverbatim
 *>
 *> \param[out] INFO
@@ -132289,17 +129227,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleSYcomputational
 *
 *  =====================================================================
-      SUBROUTINE DSYCONV( UPLO, WAY, N, A, LDA, IPIV, WORK, INFO )
+      SUBROUTINE DSYCONV( UPLO, WAY, N, A, LDA, IPIV, E, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO, WAY
@@ -132307,7 +129245,7 @@
 *     ..
 *     .. Array Arguments ..
       INTEGER            IPIV( * )
-      DOUBLE PRECISION   A( LDA, * ), WORK( * )
+      DOUBLE PRECISION   A( LDA, * ), E( * )
 *     ..
 *
 *  =====================================================================
@@ -132362,14 +129300,15 @@
 *
          IF ( CONVERT ) THEN
             I=N
-            WORK(1)=ZERO
+            E(1)=ZERO
             DO WHILE ( I .GT. 1 )
                IF( IPIV(I) .LT. 0 ) THEN
-                  WORK(I)=A(I-1,I)
+                  E(I)=A(I-1,I)
+                  E(I-1)=ZERO
                   A(I-1,I)=ZERO
                   I=I-1
                ELSE
-                  WORK(I)=ZERO
+                  E(I)=ZERO
                ENDIF
                I=I-1
             END DO
@@ -132438,7 +129377,7 @@
             I=N
             DO WHILE ( I .GT. 1 )
                IF( IPIV(I) .LT. 0 ) THEN
-                  A(I-1,I)=WORK(I)
+                  A(I-1,I)=E(I)
                   I=I-1
                ENDIF
                I=I-1
@@ -132456,14 +129395,15 @@
 *        Convert VALUE
 *
             I=1
-            WORK(N)=ZERO
+            E(N)=ZERO
             DO WHILE ( I .LE. N )
                IF( I.LT.N .AND. IPIV(I) .LT. 0 ) THEN
-                  WORK(I)=A(I+1,I)
+                  E(I)=A(I+1,I)
+                  E(I+1)=ZERO
                   A(I+1,I)=ZERO
                   I=I+1
                ELSE
-                  WORK(I)=ZERO
+                  E(I)=ZERO
                ENDIF
                I=I+1
             END DO
@@ -132530,8 +129470,8 @@
 *
             I=1
             DO WHILE ( I .LE. N-1 )
-               IF( IPIV(I) .LT. ZERO ) THEN
-                  A(I+1,I)=WORK(I)
+               IF( IPIV(I) .LT. 0 ) THEN
+                  A(I+1,I)=E(I)
                   I=I+1
                ENDIF
                I=I+1
@@ -135352,7 +132292,7 @@
 *     End of DSYGST
 *
       END
-*> \brief \b DSYGST
+*> \brief \b DSYGV
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -135521,7 +132461,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleSYeigen
 *
@@ -135529,10 +132469,10 @@
       SUBROUTINE DSYGV( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
      $                  LWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, UPLO
@@ -135666,7 +132606,7 @@
 *     End of DSYGV
 *
       END
-*> \brief \b DSYGST
+*> \brief \b DSYGVD
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -135871,7 +132811,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleSYeigen
 *
@@ -135895,10 +132835,10 @@
       SUBROUTINE DSYGVD( ITYPE, JOBZ, UPLO, N, A, LDA, B, LDB, W, WORK,
      $                   LWORK, IWORK, LIWORK, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, UPLO
@@ -136046,7 +132986,7 @@
 *     End of DSYGVD
 *
       END
-*> \brief \b DSYGST
+*> \brief \b DSYGVX
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -136324,7 +133264,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleSYeigen
 *
@@ -136338,10 +133278,10 @@
      $                   VL, VU, IL, IU, ABSTOL, M, W, Z, LDZ, WORK,
      $                   LWORK, IWORK, IFAIL, INFO )
 *
-*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK driver routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          JOBZ, RANGE, UPLO
@@ -140000,17 +136940,17 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleSYcomputational
 *
 *  =====================================================================
       SUBROUTINE DSYTRI2( UPLO, N, A, LDA, IPIV, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.2) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
@@ -140033,7 +136973,7 @@
       EXTERNAL           LSAME, ILAENV
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DSYTRI2X
+      EXTERNAL           DSYTRI, DSYTRI2X
 *     ..
 *     .. Executable Statements ..
 *
@@ -141187,11 +138127,16 @@
 *>          of the matrix B.  NRHS >= 0.
 *> \endverbatim
 *>
-*> \param[in] A
+*> \param[in,out] A
 *> \verbatim
 *>          A is DOUBLE PRECISION array, dimension (LDA,N)
 *>          The block diagonal matrix D and the multipliers used to
 *>          obtain the factor U or L as computed by DSYTRF.
+*>          Note that A is input / output. This might be counter-intuitive,
+*>          and one may think that A is input only. A is input / output. This
+*>          is because, at the start of the subroutine, we permute A in a
+*>          "better" form and then we permute A back to its original form at
+*>          the end.
 *> \endverbatim
 *>
 *> \param[in] LDA
@@ -141240,7 +138185,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup doubleSYcomputational
 *
@@ -141248,10 +138193,10 @@
       SUBROUTINE DSYTRS2( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, 
      $                    WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          UPLO
@@ -146372,7 +143317,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleGEauxiliary
 *
@@ -146412,10 +143357,10 @@
       SUBROUTINE DTGEX2( WANTQ, WANTZ, N, A, LDA, B, LDB, Q, LDQ, Z,
      $                   LDZ, J1, N1, N2, WORK, LWORK, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       LOGICAL            WANTQ, WANTZ
@@ -146786,9 +143731,7 @@
 *
 *        Standardize existing 2-by-2 blocks.
 *
-         DO 50 I = 1, M*M
-            WORK(I) = ZERO
-   50    CONTINUE
+         CALL DLASET( 'Full', M, M, ZERO, ZERO, WORK, M )
          WORK( 1 ) = ONE
          T( 1, 1 ) = ONE
          IDUM = LWORK - M*M - 2
@@ -146859,7 +143802,7 @@
      $                  A( J1, I ), LDA, ZERO, WORK, M )
             CALL DLACPY( 'Full', M, N-I+1, WORK, M, A( J1, I ), LDA )
             CALL DGEMM( 'T', 'N', M, N-I+1, M, ONE, LI, LDST,
-     $                  B( J1, I ), LDA, ZERO, WORK, M )
+     $                  B( J1, I ), LDB, ZERO, WORK, M )
             CALL DLACPY( 'Full', M, N-I+1, WORK, M, B( J1, I ), LDB )
          END IF
          I = J1 - 1
@@ -149912,7 +146855,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2015
 *
 *> \ingroup doubleSYauxiliary
 *
@@ -149927,10 +146870,10 @@
      $                   LDD, E, LDE, F, LDF, SCALE, RDSUM, RDSCAL,
      $                   IWORK, PQ, INFO )
 *
-*  -- LAPACK auxiliary routine (version 3.4.2) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     September 2012
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER          TRANS
@@ -149995,7 +146938,7 @@
          ELSE IF( N.LE.0 ) THEN
             INFO = -4
          ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-            INFO = -5
+            INFO = -6
          ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
             INFO = -8
          ELSE IF( LDC.LT.MAX( 1, M ) ) THEN
@@ -151732,7 +148675,7 @@
 *> \verbatim
 *>          TRANS is CHARACTER*1
 *>          = 'N':  No transpose, apply Q;
-*>          = 'C':  Transpose, apply Q**T.
+*>          = 'T':  Transpose, apply Q**T.
 *> \endverbatim
 *>
 *> \param[in] M
@@ -151852,7 +148795,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2013
+*> \date November 2015
 *
 *> \ingroup doubleOTHERcomputational
 *
@@ -151893,10 +148836,10 @@
       SUBROUTINE DTPMQRT( SIDE, TRANS, M, N, K, L, NB, V, LDV, T, LDT,
      $                    A, LDA, B, LDB, WORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK computational routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER SIDE, TRANS
@@ -160819,7 +157762,7 @@
 *     End of DTRTTP
 *
       END
-*> \brief \b DTZRQF
+*> \brief \b DTZRZF
 *
 *  =========== DOCUMENTATION ===========
 *
@@ -160827,25 +157770,25 @@
 *            http://www.netlib.org/lapack/explore-html/ 
 *
 *> \htmlonly
-*> Download DTZRQF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtzrqf.f"> 
+*> Download DTZRZF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtzrzf.f"> 
 *> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dtzrqf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dtzrzf.f"> 
 *> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtzrqf.f"> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtzrzf.f"> 
 *> [TXT]</a>
 *> \endhtmlonly 
 *
 *  Definition:
 *  ===========
 *
-*       SUBROUTINE DTZRQF( M, N, A, LDA, TAU, INFO )
+*       SUBROUTINE DTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
 * 
 *       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, M, N
+*       INTEGER            INFO, LDA, LWORK, M, N
 *       ..
 *       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), TAU( * )
+*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
 *       ..
 *  
 *
@@ -160854,9 +157797,7 @@
 *>
 *> \verbatim
 *>
-*> This routine is deprecated and has been replaced by routine DTZRZF.
-*>
-*> DTZRQF reduces the M-by-N ( M<=N ) real upper trapezoidal matrix A
+*> DTZRZF reduces the M-by-N ( M<=N ) real upper trapezoidal matrix A
 *> to upper triangular form by means of orthogonal transformations.
 *>
 *> The upper trapezoidal matrix A is factored as
@@ -160905,6 +157846,25 @@
 *>          The scalar factors of the elementary reflectors.
 *> \endverbatim
 *>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,M).
+*>          For optimum performance LWORK >= M*NB, where NB is
+*>          the optimal blocksize.
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
 *> \param[out] INFO
 *> \verbatim
 *>          INFO is INTEGER
@@ -160920,278 +157880,29 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date April 2012
 *
 *> \ingroup doubleOTHERcomputational
 *
+*> \par Contributors:
+*  ==================
+*>
+*>    A. Petitet, Computer Science Dept., Univ. of Tenn., Knoxville, USA
+*
 *> \par Further Details:
 *  =====================
 *>
 *> \verbatim
 *>
-*>  The factorization is obtained by Householder's method.  The kth
-*>  transformation matrix, Z( k ), which is used to introduce zeros into
-*>  the ( m - k + 1 )th row of A, is given in the form
+*>  The N-by-N matrix Z can be computed by
 *>
-*>     Z( k ) = ( I     0   ),
-*>              ( 0  T( k ) )
+*>     Z =  Z(1)*Z(2)* ... *Z(M)
 *>
-*>  where
+*>  where each N-by-N Z(k) is given by
 *>
-*>     T( k ) = I - tau*u( k )*u( k )**T,   u( k ) = (   1    ),
-*>                                                   (   0    )
-*>                                                   ( z( k ) )
+*>     Z(k) = I - tau(k)*v(k)*v(k)**T
 *>
-*>  tau is a scalar and z( k ) is an ( n - m ) element vector.
-*>  tau and z( k ) are chosen to annihilate the elements of the kth row
-*>  of X.
-*>
-*>  The scalar tau is returned in the kth element of TAU and the vector
-*>  u( k ) in the kth row of A, such that the elements of z( k ) are
-*>  in  a( k, m + 1 ), ..., a( k, n ). The elements of R are returned in
-*>  the upper triangular part of A.
-*>
-*>  Z is given by
-*>
-*>     Z =  Z( 1 ) * Z( 2 ) * ... * Z( m ).
-*> \endverbatim
-*>
-*  =====================================================================
-      SUBROUTINE DTZRQF( M, N, A, LDA, TAU, INFO )
-*
-*  -- LAPACK computational routine (version 3.4.0) --
-*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
-*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
-*
-*     .. Scalar Arguments ..
-      INTEGER            INFO, LDA, M, N
-*     ..
-*     .. Array Arguments ..
-      DOUBLE PRECISION   A( LDA, * ), TAU( * )
-*     ..
-*
-*  =====================================================================
-*
-*     .. Parameters ..
-      DOUBLE PRECISION   ONE, ZERO
-      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
-*     ..
-*     .. Local Scalars ..
-      INTEGER            I, K, M1
-*     ..
-*     .. Intrinsic Functions ..
-      INTRINSIC          MAX, MIN
-*     ..
-*     .. External Subroutines ..
-      EXTERNAL           DAXPY, DCOPY, DGEMV, DGER, DLARFG, XERBLA
-*     ..
-*     .. Executable Statements ..
-*
-*     Test the input parameters.
-*
-      INFO = 0
-      IF( M.LT.0 ) THEN
-         INFO = -1
-      ELSE IF( N.LT.M ) THEN
-         INFO = -2
-      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
-         INFO = -4
-      END IF
-      IF( INFO.NE.0 ) THEN
-         CALL XERBLA( 'DTZRQF', -INFO )
-         RETURN
-      END IF
-*
-*     Perform the factorization.
-*
-      IF( M.EQ.0 )
-     $   RETURN
-      IF( M.EQ.N ) THEN
-         DO 10 I = 1, N
-            TAU( I ) = ZERO
-   10    CONTINUE
-      ELSE
-         M1 = MIN( M+1, N )
-         DO 20 K = M, 1, -1
-*
-*           Use a Householder reflection to zero the kth row of A.
-*           First set up the reflection.
-*
-            CALL DLARFG( N-M+1, A( K, K ), A( K, M1 ), LDA, TAU( K ) )
-*
-            IF( ( TAU( K ).NE.ZERO ) .AND. ( K.GT.1 ) ) THEN
-*
-*              We now perform the operation  A := A*P( k ).
-*
-*              Use the first ( k - 1 ) elements of TAU to store  a( k ),
-*              where  a( k ) consists of the first ( k - 1 ) elements of
-*              the  kth column  of  A.  Also  let  B  denote  the  first
-*              ( k - 1 ) rows of the last ( n - m ) columns of A.
-*
-               CALL DCOPY( K-1, A( 1, K ), 1, TAU, 1 )
-*
-*              Form   w = a( k ) + B*z( k )  in TAU.
-*
-               CALL DGEMV( 'No transpose', K-1, N-M, ONE, A( 1, M1 ),
-     $                     LDA, A( K, M1 ), LDA, ONE, TAU, 1 )
-*
-*              Now form  a( k ) := a( k ) - tau*w
-*              and       B      := B      - tau*w*z( k )**T.
-*
-               CALL DAXPY( K-1, -TAU( K ), TAU, 1, A( 1, K ), 1 )
-               CALL DGER( K-1, N-M, -TAU( K ), TAU, 1, A( K, M1 ), LDA,
-     $                    A( 1, M1 ), LDA )
-            END IF
-   20    CONTINUE
-      END IF
-*
-      RETURN
-*
-*     End of DTZRQF
-*
-      END
-*> \brief \b DTZRZF
-*
-*  =========== DOCUMENTATION ===========
-*
-* Online html documentation available at 
-*            http://www.netlib.org/lapack/explore-html/ 
-*
-*> \htmlonly
-*> Download DTZRZF + dependencies 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtzrzf.f"> 
-*> [TGZ]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dtzrzf.f"> 
-*> [ZIP]</a> 
-*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtzrzf.f"> 
-*> [TXT]</a>
-*> \endhtmlonly 
-*
-*  Definition:
-*  ===========
-*
-*       SUBROUTINE DTZRZF( M, N, A, LDA, TAU, WORK, LWORK, INFO )
-* 
-*       .. Scalar Arguments ..
-*       INTEGER            INFO, LDA, LWORK, M, N
-*       ..
-*       .. Array Arguments ..
-*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
-*       ..
-*  
-*
-*> \par Purpose:
-*  =============
-*>
-*> \verbatim
-*>
-*> DTZRZF reduces the M-by-N ( M<=N ) real upper trapezoidal matrix A
-*> to upper triangular form by means of orthogonal transformations.
-*>
-*> The upper trapezoidal matrix A is factored as
-*>
-*>    A = ( R  0 ) * Z,
-*>
-*> where Z is an N-by-N orthogonal matrix and R is an M-by-M upper
-*> triangular matrix.
-*> \endverbatim
-*
-*  Arguments:
-*  ==========
-*
-*> \param[in] M
-*> \verbatim
-*>          M is INTEGER
-*>          The number of rows of the matrix A.  M >= 0.
-*> \endverbatim
-*>
-*> \param[in] N
-*> \verbatim
-*>          N is INTEGER
-*>          The number of columns of the matrix A.  N >= M.
-*> \endverbatim
-*>
-*> \param[in,out] A
-*> \verbatim
-*>          A is DOUBLE PRECISION array, dimension (LDA,N)
-*>          On entry, the leading M-by-N upper trapezoidal part of the
-*>          array A must contain the matrix to be factorized.
-*>          On exit, the leading M-by-M upper triangular part of A
-*>          contains the upper triangular matrix R, and elements M+1 to
-*>          N of the first M rows of A, with the array TAU, represent the
-*>          orthogonal matrix Z as a product of M elementary reflectors.
-*> \endverbatim
-*>
-*> \param[in] LDA
-*> \verbatim
-*>          LDA is INTEGER
-*>          The leading dimension of the array A.  LDA >= max(1,M).
-*> \endverbatim
-*>
-*> \param[out] TAU
-*> \verbatim
-*>          TAU is DOUBLE PRECISION array, dimension (M)
-*>          The scalar factors of the elementary reflectors.
-*> \endverbatim
-*>
-*> \param[out] WORK
-*> \verbatim
-*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
-*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
-*> \endverbatim
-*>
-*> \param[in] LWORK
-*> \verbatim
-*>          LWORK is INTEGER
-*>          The dimension of the array WORK.  LWORK >= max(1,M).
-*>          For optimum performance LWORK >= M*NB, where NB is
-*>          the optimal blocksize.
-*>
-*>          If LWORK = -1, then a workspace query is assumed; the routine
-*>          only calculates the optimal size of the WORK array, returns
-*>          this value as the first entry of the WORK array, and no error
-*>          message related to LWORK is issued by XERBLA.
-*> \endverbatim
-*>
-*> \param[out] INFO
-*> \verbatim
-*>          INFO is INTEGER
-*>          = 0:  successful exit
-*>          < 0:  if INFO = -i, the i-th argument had an illegal value
-*> \endverbatim
-*
-*  Authors:
-*  ========
-*
-*> \author Univ. of Tennessee 
-*> \author Univ. of California Berkeley 
-*> \author Univ. of Colorado Denver 
-*> \author NAG Ltd. 
-*
-*> \date April 2012
-*
-*> \ingroup doubleOTHERcomputational
-*
-*> \par Contributors:
-*  ==================
-*>
-*>    A. Petitet, Computer Science Dept., Univ. of Tenn., Knoxville, USA
-*
-*> \par Further Details:
-*  =====================
-*>
-*> \verbatim
-*>
-*>  The N-by-N matrix Z can be computed by
-*>
-*>     Z =  Z(1)*Z(2)* ... *Z(M)
-*>
-*>  where each N-by-N Z(k) is given by
-*>
-*>     Z(k) = I - tau(k)*v(k)*v(k)**T
-*>
-*>  with v(k) is the kth row vector of the M-by-N matrix
+*>  with v(k) is the kth row vector of the M-by-N matrix
 *>
 *>     V = ( I   A(:,M+1:N) )
 *>
@@ -161890,7 +158601,7 @@
 *>          =10: ieee NaN arithmetic can be trusted not to trap
 *>          =11: infinity arithmetic can be trusted not to trap
 *>          12 <= ISPEC <= 16:
-*>               xHSEQR or one of its subroutines,
+*>               xHSEQR or related subroutines,
 *>               see IPARMQ for detailed explanation
 *> \endverbatim
 *>
@@ -161940,7 +158651,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -161970,10 +158681,10 @@
 *  =====================================================================
       INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
 *
-*  -- LAPACK auxiliary routine (version 3.4.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       CHARACTER*( * )    NAME, OPTS
@@ -162218,6 +158929,15 @@
          IF( C3.EQ.'EBZ' ) THEN
             NB = 1
          END IF
+      ELSE IF( C2.EQ.'GG' ) THEN
+         NB = 32
+         IF( C3.EQ.'HD3' ) THEN
+            IF( SNAME ) THEN
+               NB = 32
+            ELSE
+               NB = 32
+            END IF
+         END IF
       END IF
       ILAENV = NB
       RETURN
@@ -162296,6 +159016,11 @@
                NBMIN = 2
             END IF
          END IF
+      ELSE IF( C2.EQ.'GG' ) THEN
+         NBMIN = 2
+         IF( C3.EQ.'HD3' ) THEN
+            NBMIN = 2
+         END IF
       END IF
       ILAENV = NBMIN
       RETURN
@@ -162350,6 +159075,11 @@
                NX = 128
             END IF
          END IF
+      ELSE IF( C2.EQ.'GG' ) THEN
+         NX = 128
+         IF( C3.EQ.'HD3' ) THEN
+            NX = 128
+         END IF
       END IF
       ILAENV = NX
       RETURN
@@ -162422,7 +159152,7 @@
 *
   160 CONTINUE
 *
-*     12 <= ISPEC <= 16: xHSEQR or one of its subroutines. 
+*     12 <= ISPEC <= 16: xHSEQR or related subroutines.
 *
       ILAENV = IPARMQ( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
       RETURN
@@ -162623,6 +159353,72 @@
 *     End of ILATRANS
 *
       END
+*> \brief \b ILAVER returns the LAPACK version.
+**
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*  Definition:
+*  ===========
+*
+*     SUBROUTINE ILAVER( VERS_MAJOR, VERS_MINOR, VERS_PATCH )
+*
+*     INTEGER VERS_MAJOR, VERS_MINOR, VERS_PATCH
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*>  This subroutine returns the LAPACK version.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*>  \param[out] VERS_MAJOR
+*>      return the lapack major version
+*>
+*>  \param[out] VERS_MINOR
+*>      return the lapack minor version from the major version
+*>
+*>  \param[out] VERS_PATCH
+*>      return the lapack patch version from the minor version
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup auxOTHERauxiliary
+*
+*  =====================================================================
+      SUBROUTINE ILAVER( VERS_MAJOR, VERS_MINOR, VERS_PATCH )
+*
+*  -- LAPACK computational routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*  =====================================================================
+*
+      INTEGER VERS_MAJOR, VERS_MINOR, VERS_PATCH
+*  =====================================================================
+      VERS_MAJOR = 3
+      VERS_MINOR = 6
+      VERS_PATCH = 0
+*  =====================================================================
+*
+      RETURN
+      END
 *> \brief \b IPARMQ
 *
 *  =========== DOCUMENTATION ===========
@@ -162656,8 +159452,9 @@
 *> \verbatim
 *>
 *>      This program sets problem and machine dependent parameters
-*>      useful for xHSEQR and its subroutines. It is called whenever 
-*>      ILAENV is called with 12 <= ISPEC <= 16
+*>      useful for xHSEQR and related subroutines for eigenvalue
+*>      problems. It is called whenever
+*>      IPARMQ is called with 12 <= ISPEC <= 16
 *> \endverbatim
 *
 *  Arguments:
@@ -162700,19 +159497,26 @@
 *>
 *>              ISPEC=16: (IACC22) IPARMQ is set to 0, 1 or 2 with the
 *>                        following meanings.
-*>                        0:  During the multi-shift QR sweep,
-*>                            xLAQR5 does not accumulate reflections and
-*>                            does not use matrix-matrix multiply to
-*>                            update the far-from-diagonal matrix
-*>                            entries.
-*>                        1:  During the multi-shift QR sweep,
-*>                            xLAQR5 and/or xLAQRaccumulates reflections and uses
-*>                            matrix-matrix multiply to update the
+*>                        0:  During the multi-shift QR/QZ sweep,
+*>                            blocked eigenvalue reordering, blocked
+*>                            Hessenberg-triangular reduction,
+*>                            reflections and/or rotations are not
+*>                            accumulated when updating the
+*>                            far-from-diagonal matrix entries.
+*>                        1:  During the multi-shift QR/QZ sweep,
+*>                            blocked eigenvalue reordering, blocked
+*>                            Hessenberg-triangular reduction,
+*>                            reflections and/or rotations are
+*>                            accumulated, and matrix-matrix
+*>                            multiplication is used to update the
 *>                            far-from-diagonal matrix entries.
-*>                        2:  During the multi-shift QR sweep.
-*>                            xLAQR5 accumulates reflections and takes
-*>                            advantage of 2-by-2 block structure during
-*>                            matrix-matrix multiplies.
+*>                        2:  During the multi-shift QR/QZ sweep,
+*>                            blocked eigenvalue reordering, blocked
+*>                            Hessenberg-triangular reduction,
+*>                            reflections and/or rotations are
+*>                            accumulated, and 2-by-2 block structure
+*>                            is exploited during matrix-matrix
+*>                            multiplies.
 *>                        (If xTRMM is slower than xGEMM, then
 *>                        IPARMQ(ISPEC=16)=1 may be more efficient than
 *>                        IPARMQ(ISPEC=16)=2 despite the greater level of
@@ -162764,7 +159568,7 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date November 2011
+*> \date November 2015
 *
 *> \ingroup auxOTHERauxiliary
 *
@@ -162839,10 +159643,10 @@
 *  =====================================================================
       INTEGER FUNCTION IPARMQ( ISPEC, NAME, OPTS, N, ILO, IHI, LWORK )
 *
-*  -- LAPACK auxiliary routine (version 3.4.0) --
+*  -- LAPACK auxiliary routine (version 3.6.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2011
+*     November 2015
 *
 *     .. Scalar Arguments ..
       INTEGER            IHI, ILO, ISPEC, LWORK, N
@@ -162861,6 +159665,8 @@
 *     ..
 *     .. Local Scalars ..
       INTEGER            NH, NS
+      INTEGER            I, IC, IZ
+      CHARACTER          SUBNAM*6
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          LOG, MAX, MOD, NINT, REAL
@@ -162930,11 +159736,74 @@
 *        .     by making this choice dependent also upon the
 *        .     NH=IHI-ILO+1.
 *
+*
+*        Convert NAME to upper case if the first character is lower case.
+*
          IPARMQ = 0
-         IF( NS.GE.KACMIN )
-     $      IPARMQ = 1
-         IF( NS.GE.K22MIN )
-     $      IPARMQ = 2
+         SUBNAM = NAME
+         IC = ICHAR( SUBNAM( 1: 1 ) )
+         IZ = ICHAR( 'Z' )
+         IF( IZ.EQ.90 .OR. IZ.EQ.122 ) THEN
+*
+*           ASCII character set
+*
+            IF( IC.GE.97 .AND. IC.LE.122 ) THEN
+               SUBNAM( 1: 1 ) = CHAR( IC-32 )
+               DO I = 2, 6
+                  IC = ICHAR( SUBNAM( I: I ) )
+                  IF( IC.GE.97 .AND. IC.LE.122 )
+     $               SUBNAM( I: I ) = CHAR( IC-32 )
+               END DO
+            END IF
+*
+         ELSE IF( IZ.EQ.233 .OR. IZ.EQ.169 ) THEN
+*
+*           EBCDIC character set
+*
+            IF( ( IC.GE.129 .AND. IC.LE.137 ) .OR.
+     $          ( IC.GE.145 .AND. IC.LE.153 ) .OR.
+     $          ( IC.GE.162 .AND. IC.LE.169 ) ) THEN
+               SUBNAM( 1: 1 ) = CHAR( IC+64 )
+               DO I = 2, 6
+                  IC = ICHAR( SUBNAM( I: I ) )
+                  IF( ( IC.GE.129 .AND. IC.LE.137 ) .OR.
+     $                ( IC.GE.145 .AND. IC.LE.153 ) .OR.
+     $                ( IC.GE.162 .AND. IC.LE.169 ) )SUBNAM( I:
+     $                I ) = CHAR( IC+64 )
+               END DO
+            END IF
+*
+         ELSE IF( IZ.EQ.218 .OR. IZ.EQ.250 ) THEN
+*
+*           Prime machines:  ASCII+128
+*
+            IF( IC.GE.225 .AND. IC.LE.250 ) THEN
+               SUBNAM( 1: 1 ) = CHAR( IC-32 )
+               DO I = 2, 6
+                  IC = ICHAR( SUBNAM( I: I ) )
+                  IF( IC.GE.225 .AND. IC.LE.250 )
+     $               SUBNAM( I: I ) = CHAR( IC-32 )
+               END DO
+            END IF
+         END IF
+*
+         IF( SUBNAM( 2:6 ).EQ.'GGHRD' .OR.
+     $       SUBNAM( 2:6 ).EQ.'GGHD3' ) THEN
+            IPARMQ = 1
+            IF( NH.GE.K22MIN )
+     $         IPARMQ = 2
+         ELSE IF ( SUBNAM( 4:6 ).EQ.'EXC' ) THEN
+            IF( NH.GE.KACMIN )
+     $         IPARMQ = 1
+            IF( NH.GE.K22MIN )
+     $         IPARMQ = 2
+         ELSE IF ( SUBNAM( 2:6 ).EQ.'HSEQR' .OR.
+     $             SUBNAM( 2:5 ).EQ.'LAQR' ) THEN
+            IF( NS.GE.KACMIN )
+     $         IPARMQ = 1
+            IF( NS.GE.K22MIN )
+     $         IPARMQ = 2
+         END IF
 *
       ELSE
 *        ===== invalid value of ispec =====
@@ -162945,19 +159814,38 @@
 *     ==== End of IPARMQ ====
 *
       END
-*> \brief \b ILAVER returns the LAPACK version.
-**
+*> \brief <b> DGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*
 *  =========== DOCUMENTATION ===========
 *
 * Online html documentation available at 
 *            http://www.netlib.org/lapack/explore-html/ 
 *
+*> \htmlonly
+*> Download DGEGV + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgegv.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgegv.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgegv.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
 *  Definition:
 *  ===========
 *
-*     SUBROUTINE ILAVER( VERS_MAJOR, VERS_MINOR, VERS_PATCH )
-*
-*     INTEGER VERS_MAJOR, VERS_MINOR, VERS_PATCH
+*       SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
+*                         BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBVL, JOBVR
+*       INTEGER            INFO, LDA, LDB, LDVL, LDVR, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
+*      $                   B( LDB, * ), BETA( * ), VL( LDVL, * ),
+*      $                   VR( LDVR, * ), WORK( * )
+*       ..
 *  
 *
 *> \par Purpose:
@@ -162965,20 +159853,225 @@
 *>
 *> \verbatim
 *>
-*>  This subroutine returns the LAPACK version.
+*> This routine is deprecated and has been replaced by routine DGGEV.
+*>
+*> DGEGV computes the eigenvalues and, optionally, the left and/or right
+*> eigenvectors of a real matrix pair (A,B).
+*> Given two square matrices A and B,
+*> the generalized nonsymmetric eigenvalue problem (GNEP) is to find the
+*> eigenvalues lambda and corresponding (non-zero) eigenvectors x such
+*> that
+*>
+*>    A*x = lambda*B*x.
+*>
+*> An alternate form is to find the eigenvalues mu and corresponding
+*> eigenvectors y such that
+*>
+*>    mu*A*y = B*y.
+*>
+*> These two forms are equivalent with mu = 1/lambda and x = y if
+*> neither lambda nor mu is zero.  In order to deal with the case that
+*> lambda or mu is zero or small, two values alpha and beta are returned
+*> for each eigenvalue, such that lambda = alpha/beta and
+*> mu = beta/alpha.
+*>
+*> The vectors x and y in the above equations are right eigenvectors of
+*> the matrix pair (A,B).  Vectors u and v satisfying
+*>
+*>    u**H*A = lambda*u**H*B  or  mu*v**H*A = v**H*B
+*>
+*> are left eigenvectors of (A,B).
+*>
+*> Note: this routine performs "full balancing" on A and B
 *> \endverbatim
 *
 *  Arguments:
 *  ==========
 *
-*>  \param[out] VERS_MAJOR
-*>      return the lapack major version
+*> \param[in] JOBVL
+*> \verbatim
+*>          JOBVL is CHARACTER*1
+*>          = 'N':  do not compute the left generalized eigenvectors;
+*>          = 'V':  compute the left generalized eigenvectors (returned
+*>                  in VL).
+*> \endverbatim
 *>
-*>  \param[out] VERS_MINOR
-*>      return the lapack minor version from the major version
+*> \param[in] JOBVR
+*> \verbatim
+*>          JOBVR is CHARACTER*1
+*>          = 'N':  do not compute the right generalized eigenvectors;
+*>          = 'V':  compute the right generalized eigenvectors (returned
+*>                  in VR).
+*> \endverbatim
 *>
-*>  \param[out] VERS_PATCH
-*>      return the lapack patch version from the minor version
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrices A, B, VL, and VR.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA, N)
+*>          On entry, the matrix A.
+*>          If JOBVL = 'V' or JOBVR = 'V', then on exit A
+*>          contains the real Schur form of A from the generalized Schur
+*>          factorization of the pair (A,B) after balancing.
+*>          If no eigenvectors were computed, then only the diagonal
+*>          blocks from the Schur form will be correct.  See DGGHRD and
+*>          DHGEQZ for details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB, N)
+*>          On entry, the matrix B.
+*>          If JOBVL = 'V' or JOBVR = 'V', then on exit B contains the
+*>          upper triangular matrix obtained from B in the generalized
+*>          Schur factorization of the pair (A,B) after balancing.
+*>          If no eigenvectors were computed, then only those elements of
+*>          B corresponding to the diagonal blocks from the Schur form of
+*>          A will be correct.  See DGGHRD and DHGEQZ for details.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of B.  LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] ALPHAR
+*> \verbatim
+*>          ALPHAR is DOUBLE PRECISION array, dimension (N)
+*>          The real parts of each scalar alpha defining an eigenvalue of
+*>          GNEP.
+*> \endverbatim
+*>
+*> \param[out] ALPHAI
+*> \verbatim
+*>          ALPHAI is DOUBLE PRECISION array, dimension (N)
+*>          The imaginary parts of each scalar alpha defining an
+*>          eigenvalue of GNEP.  If ALPHAI(j) is zero, then the j-th
+*>          eigenvalue is real; if positive, then the j-th and
+*>          (j+1)-st eigenvalues are a complex conjugate pair, with
+*>          ALPHAI(j+1) = -ALPHAI(j).
+*> \endverbatim
+*>
+*> \param[out] BETA
+*> \verbatim
+*>          BETA is DOUBLE PRECISION array, dimension (N)
+*>          The scalars beta that define the eigenvalues of GNEP.
+*>          
+*>          Together, the quantities alpha = (ALPHAR(j),ALPHAI(j)) and
+*>          beta = BETA(j) represent the j-th eigenvalue of the matrix
+*>          pair (A,B), in one of the forms lambda = alpha/beta or
+*>          mu = beta/alpha.  Since either lambda or mu may overflow,
+*>          they should not, in general, be computed.
+*> \endverbatim
+*>
+*> \param[out] VL
+*> \verbatim
+*>          VL is DOUBLE PRECISION array, dimension (LDVL,N)
+*>          If JOBVL = 'V', the left eigenvectors u(j) are stored
+*>          in the columns of VL, in the same order as their eigenvalues.
+*>          If the j-th eigenvalue is real, then u(j) = VL(:,j).
+*>          If the j-th and (j+1)-st eigenvalues form a complex conjugate
+*>          pair, then
+*>             u(j) = VL(:,j) + i*VL(:,j+1)
+*>          and
+*>            u(j+1) = VL(:,j) - i*VL(:,j+1).
+*>
+*>          Each eigenvector is scaled so that its largest component has
+*>          abs(real part) + abs(imag. part) = 1, except for eigenvectors
+*>          corresponding to an eigenvalue with alpha = beta = 0, which
+*>          are set to zero.
+*>          Not referenced if JOBVL = 'N'.
+*> \endverbatim
+*>
+*> \param[in] LDVL
+*> \verbatim
+*>          LDVL is INTEGER
+*>          The leading dimension of the matrix VL. LDVL >= 1, and
+*>          if JOBVL = 'V', LDVL >= N.
+*> \endverbatim
+*>
+*> \param[out] VR
+*> \verbatim
+*>          VR is DOUBLE PRECISION array, dimension (LDVR,N)
+*>          If JOBVR = 'V', the right eigenvectors x(j) are stored
+*>          in the columns of VR, in the same order as their eigenvalues.
+*>          If the j-th eigenvalue is real, then x(j) = VR(:,j).
+*>          If the j-th and (j+1)-st eigenvalues form a complex conjugate
+*>          pair, then
+*>            x(j) = VR(:,j) + i*VR(:,j+1)
+*>          and
+*>            x(j+1) = VR(:,j) - i*VR(:,j+1).
+*>
+*>          Each eigenvector is scaled so that its largest component has
+*>          abs(real part) + abs(imag. part) = 1, except for eigenvalues
+*>          corresponding to an eigenvalue with alpha = beta = 0, which
+*>          are set to zero.
+*>          Not referenced if JOBVR = 'N'.
+*> \endverbatim
+*>
+*> \param[in] LDVR
+*> \verbatim
+*>          LDVR is INTEGER
+*>          The leading dimension of the matrix VR. LDVR >= 1, and
+*>          if JOBVR = 'V', LDVR >= N.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,8*N).
+*>          For good performance, LWORK must generally be larger.
+*>          To compute the optimal value of LWORK, call ILAENV to get
+*>          blocksizes (for DGEQRF, DORMQR, and DORGQR.)  Then compute:
+*>          NB  -- MAX of the blocksizes for DGEQRF, DORMQR, and DORGQR;
+*>          The optimal LWORK is:
+*>              2*N + MAX( 6*N, N*(NB+1) ).
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          = 1,...,N:
+*>                The QZ iteration failed.  No eigenvectors have been
+*>                calculated, but ALPHAR(j), ALPHAI(j), and BETA(j)
+*>                should be correct for j=INFO+1,...,N.
+*>          > N:  errors that usually indicate LAPACK problems:
+*>                =N+1: error return from DGGBAL
+*>                =N+2: error return from DGEQRF
+*>                =N+3: error return from DORMQR
+*>                =N+4: error return from DORGQR
+*>                =N+5: error return from DGGHRD
+*>                =N+6: error return from DHGEQZ (other than failed
+*>                                                iteration)
+*>                =N+7: error return from DTGEVC
+*>                =N+8: error return from DGGBAK (computing VL)
+*>                =N+9: error return from DGGBAK (computing VR)
+*>                =N+10: error return from DLASCL (various calls)
+*> \endverbatim
 *
 *  Authors:
 *  ========
@@ -162988,26 +160081,3512 @@
 *> \author Univ. of Colorado Denver 
 *> \author NAG Ltd. 
 *
-*> \date September 2012
+*> \date November 2011
 *
-*> \ingroup auxOTHERauxiliary
+*> \ingroup doubleGEeigen
 *
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  Balancing
+*>  ---------
+*>
+*>  This driver calls DGGBAL to both permute and scale rows and columns
+*>  of A and B.  The permutations PL and PR are chosen so that PL*A*PR
+*>  and PL*B*R will be upper triangular except for the diagonal blocks
+*>  A(i:j,i:j) and B(i:j,i:j), with i and j as close together as
+*>  possible.  The diagonal scaling matrices DL and DR are chosen so
+*>  that the pair  DL*PL*A*PR*DR, DL*PL*B*PR*DR have elements close to
+*>  one (except for the elements that start out zero.)
+*>
+*>  After the eigenvalues and eigenvectors of the balanced matrices
+*>  have been computed, DGGBAK transforms the eigenvectors back to what
+*>  they would have been (in perfect arithmetic) if they had not been
+*>  balanced.
+*>
+*>  Contents of A and B on Exit
+*>  -------- -- - --- - -- ----
+*>
+*>  If any eigenvectors are computed (either JOBVL='V' or JOBVR='V' or
+*>  both), then on exit the arrays A and B will contain the real Schur
+*>  form[*] of the "balanced" versions of A and B.  If no eigenvectors
+*>  are computed, then only the diagonal blocks will be correct.
+*>
+*>  [*] See DHGEQZ, DGEGS, or read the book "Matrix Computations",
+*>      by Golub & van Loan, pub. by Johns Hopkins U. Press.
+*> \endverbatim
+*>
 *  =====================================================================
-      SUBROUTINE ILAVER( VERS_MAJOR, VERS_MINOR, VERS_PATCH )
+      SUBROUTINE DGEGV( JOBVL, JOBVR, N, A, LDA, B, LDB, ALPHAR, ALPHAI,
+     $                  BETA, VL, LDVL, VR, LDVR, WORK, LWORK, INFO )
 *
-*  -- LAPACK computational routine (version 3.5.0) --
+*  -- LAPACK driver routine (version 3.4.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     November 2013
+*     November 2011
 *
-*  =====================================================================
+*     .. Scalar Arguments ..
+      CHARACTER          JOBVL, JOBVR
+      INTEGER            INFO, LDA, LDB, LDVL, LDVR, LWORK, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
+     $                   B( LDB, * ), BETA( * ), VL( LDVL, * ),
+     $                   VR( LDVR, * ), WORK( * )
+*     ..
 *
-      INTEGER VERS_MAJOR, VERS_MINOR, VERS_PATCH
-*  =====================================================================
-      VERS_MAJOR = 3
-      VERS_MINOR = 5
-      VERS_PATCH = 0
 *  =====================================================================
 *
-      RETURN
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            ILIMIT, ILV, ILVL, ILVR, LQUERY
+      CHARACTER          CHTEMP
+      INTEGER            ICOLS, IHI, IINFO, IJOBVL, IJOBVR, ILEFT, ILO,
+     $                   IN, IRIGHT, IROWS, ITAU, IWORK, JC, JR, LOPT,
+     $                   LWKMIN, LWKOPT, NB, NB1, NB2, NB3
+      DOUBLE PRECISION   ABSAI, ABSAR, ABSB, ANRM, ANRM1, ANRM2, BNRM,
+     $                   BNRM1, BNRM2, EPS, ONEPLS, SAFMAX, SAFMIN,
+     $                   SALFAI, SALFAR, SBETA, SCALE, TEMP
+*     ..
+*     .. Local Arrays ..
+      LOGICAL            LDUMMA( 1 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, DTGEVC, XERBLA
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, DLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, INT, MAX
+*     ..
+*     .. Executable Statements ..
+*
+*     Decode the input arguments
+*
+      IF( LSAME( JOBVL, 'N' ) ) THEN
+         IJOBVL = 1
+         ILVL = .FALSE.
+      ELSE IF( LSAME( JOBVL, 'V' ) ) THEN
+         IJOBVL = 2
+         ILVL = .TRUE.
+      ELSE
+         IJOBVL = -1
+         ILVL = .FALSE.
+      END IF
+*
+      IF( LSAME( JOBVR, 'N' ) ) THEN
+         IJOBVR = 1
+         ILVR = .FALSE.
+      ELSE IF( LSAME( JOBVR, 'V' ) ) THEN
+         IJOBVR = 2
+         ILVR = .TRUE.
+      ELSE
+         IJOBVR = -1
+         ILVR = .FALSE.
+      END IF
+      ILV = ILVL .OR. ILVR
+*
+*     Test the input arguments
+*
+      LWKMIN = MAX( 8*N, 1 )
+      LWKOPT = LWKMIN
+      WORK( 1 ) = LWKOPT
+      LQUERY = ( LWORK.EQ.-1 )
+      INFO = 0
+      IF( IJOBVL.LE.0 ) THEN
+         INFO = -1
+      ELSE IF( IJOBVR.LE.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDVL.LT.1 .OR. ( ILVL .AND. LDVL.LT.N ) ) THEN
+         INFO = -12
+      ELSE IF( LDVR.LT.1 .OR. ( ILVR .AND. LDVR.LT.N ) ) THEN
+         INFO = -14
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
+         INFO = -16
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+         NB1 = ILAENV( 1, 'DGEQRF', ' ', N, N, -1, -1 )
+         NB2 = ILAENV( 1, 'DORMQR', ' ', N, N, N, -1 )
+         NB3 = ILAENV( 1, 'DORGQR', ' ', N, N, N, -1 )
+         NB = MAX( NB1, NB2, NB3 )
+         LOPT = 2*N + MAX( 6*N, N*( NB+1 ) )
+         WORK( 1 ) = LOPT
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGEGV ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     Get machine constants
+*
+      EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
+      SAFMIN = DLAMCH( 'S' )
+      SAFMIN = SAFMIN + SAFMIN
+      SAFMAX = ONE / SAFMIN
+      ONEPLS = ONE + ( 4*EPS )
+*
+*     Scale A
+*
+      ANRM = DLANGE( 'M', N, N, A, LDA, WORK )
+      ANRM1 = ANRM
+      ANRM2 = ONE
+      IF( ANRM.LT.ONE ) THEN
+         IF( SAFMAX*ANRM.LT.ONE ) THEN
+            ANRM1 = SAFMIN
+            ANRM2 = SAFMAX*ANRM
+         END IF
+      END IF
+*
+      IF( ANRM.GT.ZERO ) THEN
+         CALL DLASCL( 'G', -1, -1, ANRM, ONE, N, N, A, LDA, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 10
+            RETURN
+         END IF
+      END IF
+*
+*     Scale B
+*
+      BNRM = DLANGE( 'M', N, N, B, LDB, WORK )
+      BNRM1 = BNRM
+      BNRM2 = ONE
+      IF( BNRM.LT.ONE ) THEN
+         IF( SAFMAX*BNRM.LT.ONE ) THEN
+            BNRM1 = SAFMIN
+            BNRM2 = SAFMAX*BNRM
+         END IF
+      END IF
+*
+      IF( BNRM.GT.ZERO ) THEN
+         CALL DLASCL( 'G', -1, -1, BNRM, ONE, N, N, B, LDB, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 10
+            RETURN
+         END IF
+      END IF
+*
+*     Permute the matrix to make it more nearly triangular
+*     Workspace layout:  (8*N words -- "work" requires 6*N words)
+*        left_permutation, right_permutation, work...
+*
+      ILEFT = 1
+      IRIGHT = N + 1
+      IWORK = IRIGHT + N
+      CALL DGGBAL( 'P', N, A, LDA, B, LDB, ILO, IHI, WORK( ILEFT ),
+     $             WORK( IRIGHT ), WORK( IWORK ), IINFO )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 1
+         GO TO 120
+      END IF
+*
+*     Reduce B to triangular form, and initialize VL and/or VR
+*     Workspace layout:  ("work..." must have at least N words)
+*        left_permutation, right_permutation, tau, work...
+*
+      IROWS = IHI + 1 - ILO
+      IF( ILV ) THEN
+         ICOLS = N + 1 - ILO
+      ELSE
+         ICOLS = IROWS
+      END IF
+      ITAU = IWORK
+      IWORK = ITAU + IROWS
+      CALL DGEQRF( IROWS, ICOLS, B( ILO, ILO ), LDB, WORK( ITAU ),
+     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
+      IF( IINFO.GE.0 )
+     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 2
+         GO TO 120
+      END IF
+*
+      CALL DORMQR( 'L', 'T', IROWS, ICOLS, IROWS, B( ILO, ILO ), LDB,
+     $             WORK( ITAU ), A( ILO, ILO ), LDA, WORK( IWORK ),
+     $             LWORK+1-IWORK, IINFO )
+      IF( IINFO.GE.0 )
+     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 3
+         GO TO 120
+      END IF
+*
+      IF( ILVL ) THEN
+         CALL DLASET( 'Full', N, N, ZERO, ONE, VL, LDVL )
+         CALL DLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
+     $                VL( ILO+1, ILO ), LDVL )
+         CALL DORGQR( IROWS, IROWS, IROWS, VL( ILO, ILO ), LDVL,
+     $                WORK( ITAU ), WORK( IWORK ), LWORK+1-IWORK,
+     $                IINFO )
+         IF( IINFO.GE.0 )
+     $      LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 4
+            GO TO 120
+         END IF
+      END IF
+*
+      IF( ILVR )
+     $   CALL DLASET( 'Full', N, N, ZERO, ONE, VR, LDVR )
+*
+*     Reduce to generalized Hessenberg form
+*
+      IF( ILV ) THEN
+*
+*        Eigenvectors requested -- work on whole matrix.
+*
+         CALL DGGHRD( JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB, VL,
+     $                LDVL, VR, LDVR, IINFO )
+      ELSE
+         CALL DGGHRD( 'N', 'N', IROWS, 1, IROWS, A( ILO, ILO ), LDA,
+     $                B( ILO, ILO ), LDB, VL, LDVL, VR, LDVR, IINFO )
+      END IF
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 5
+         GO TO 120
+      END IF
+*
+*     Perform QZ algorithm
+*     Workspace layout:  ("work..." must have at least 1 word)
+*        left_permutation, right_permutation, work...
+*
+      IWORK = ITAU
+      IF( ILV ) THEN
+         CHTEMP = 'S'
+      ELSE
+         CHTEMP = 'E'
+      END IF
+      CALL DHGEQZ( CHTEMP, JOBVL, JOBVR, N, ILO, IHI, A, LDA, B, LDB,
+     $             ALPHAR, ALPHAI, BETA, VL, LDVL, VR, LDVR,
+     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
+      IF( IINFO.GE.0 )
+     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+      IF( IINFO.NE.0 ) THEN
+         IF( IINFO.GT.0 .AND. IINFO.LE.N ) THEN
+            INFO = IINFO
+         ELSE IF( IINFO.GT.N .AND. IINFO.LE.2*N ) THEN
+            INFO = IINFO - N
+         ELSE
+            INFO = N + 6
+         END IF
+         GO TO 120
+      END IF
+*
+      IF( ILV ) THEN
+*
+*        Compute Eigenvectors  (DTGEVC requires 6*N words of workspace)
+*
+         IF( ILVL ) THEN
+            IF( ILVR ) THEN
+               CHTEMP = 'B'
+            ELSE
+               CHTEMP = 'L'
+            END IF
+         ELSE
+            CHTEMP = 'R'
+         END IF
+*
+         CALL DTGEVC( CHTEMP, 'B', LDUMMA, N, A, LDA, B, LDB, VL, LDVL,
+     $                VR, LDVR, N, IN, WORK( IWORK ), IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 7
+            GO TO 120
+         END IF
+*
+*        Undo balancing on VL and VR, rescale
+*
+         IF( ILVL ) THEN
+            CALL DGGBAK( 'P', 'L', N, ILO, IHI, WORK( ILEFT ),
+     $                   WORK( IRIGHT ), N, VL, LDVL, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               INFO = N + 8
+               GO TO 120
+            END IF
+            DO 50 JC = 1, N
+               IF( ALPHAI( JC ).LT.ZERO )
+     $            GO TO 50
+               TEMP = ZERO
+               IF( ALPHAI( JC ).EQ.ZERO ) THEN
+                  DO 10 JR = 1, N
+                     TEMP = MAX( TEMP, ABS( VL( JR, JC ) ) )
+   10             CONTINUE
+               ELSE
+                  DO 20 JR = 1, N
+                     TEMP = MAX( TEMP, ABS( VL( JR, JC ) )+
+     $                      ABS( VL( JR, JC+1 ) ) )
+   20             CONTINUE
+               END IF
+               IF( TEMP.LT.SAFMIN )
+     $            GO TO 50
+               TEMP = ONE / TEMP
+               IF( ALPHAI( JC ).EQ.ZERO ) THEN
+                  DO 30 JR = 1, N
+                     VL( JR, JC ) = VL( JR, JC )*TEMP
+   30             CONTINUE
+               ELSE
+                  DO 40 JR = 1, N
+                     VL( JR, JC ) = VL( JR, JC )*TEMP
+                     VL( JR, JC+1 ) = VL( JR, JC+1 )*TEMP
+   40             CONTINUE
+               END IF
+   50       CONTINUE
+         END IF
+         IF( ILVR ) THEN
+            CALL DGGBAK( 'P', 'R', N, ILO, IHI, WORK( ILEFT ),
+     $                   WORK( IRIGHT ), N, VR, LDVR, IINFO )
+            IF( IINFO.NE.0 ) THEN
+               INFO = N + 9
+               GO TO 120
+            END IF
+            DO 100 JC = 1, N
+               IF( ALPHAI( JC ).LT.ZERO )
+     $            GO TO 100
+               TEMP = ZERO
+               IF( ALPHAI( JC ).EQ.ZERO ) THEN
+                  DO 60 JR = 1, N
+                     TEMP = MAX( TEMP, ABS( VR( JR, JC ) ) )
+   60             CONTINUE
+               ELSE
+                  DO 70 JR = 1, N
+                     TEMP = MAX( TEMP, ABS( VR( JR, JC ) )+
+     $                      ABS( VR( JR, JC+1 ) ) )
+   70             CONTINUE
+               END IF
+               IF( TEMP.LT.SAFMIN )
+     $            GO TO 100
+               TEMP = ONE / TEMP
+               IF( ALPHAI( JC ).EQ.ZERO ) THEN
+                  DO 80 JR = 1, N
+                     VR( JR, JC ) = VR( JR, JC )*TEMP
+   80             CONTINUE
+               ELSE
+                  DO 90 JR = 1, N
+                     VR( JR, JC ) = VR( JR, JC )*TEMP
+                     VR( JR, JC+1 ) = VR( JR, JC+1 )*TEMP
+   90             CONTINUE
+               END IF
+  100       CONTINUE
+         END IF
+*
+*        End of eigenvector calculation
+*
+      END IF
+*
+*     Undo scaling in alpha, beta
+*
+*     Note: this does not give the alpha and beta for the unscaled
+*     problem.
+*
+*     Un-scaling is limited to avoid underflow in alpha and beta
+*     if they are significant.
+*
+      DO 110 JC = 1, N
+         ABSAR = ABS( ALPHAR( JC ) )
+         ABSAI = ABS( ALPHAI( JC ) )
+         ABSB = ABS( BETA( JC ) )
+         SALFAR = ANRM*ALPHAR( JC )
+         SALFAI = ANRM*ALPHAI( JC )
+         SBETA = BNRM*BETA( JC )
+         ILIMIT = .FALSE.
+         SCALE = ONE
+*
+*        Check for significant underflow in ALPHAI
+*
+         IF( ABS( SALFAI ).LT.SAFMIN .AND. ABSAI.GE.
+     $       MAX( SAFMIN, EPS*ABSAR, EPS*ABSB ) ) THEN
+            ILIMIT = .TRUE.
+            SCALE = ( ONEPLS*SAFMIN / ANRM1 ) /
+     $              MAX( ONEPLS*SAFMIN, ANRM2*ABSAI )
+*
+         ELSE IF( SALFAI.EQ.ZERO ) THEN
+*
+*           If insignificant underflow in ALPHAI, then make the
+*           conjugate eigenvalue real.
+*
+            IF( ALPHAI( JC ).LT.ZERO .AND. JC.GT.1 ) THEN
+               ALPHAI( JC-1 ) = ZERO
+            ELSE IF( ALPHAI( JC ).GT.ZERO .AND. JC.LT.N ) THEN
+               ALPHAI( JC+1 ) = ZERO
+            END IF
+         END IF
+*
+*        Check for significant underflow in ALPHAR
+*
+         IF( ABS( SALFAR ).LT.SAFMIN .AND. ABSAR.GE.
+     $       MAX( SAFMIN, EPS*ABSAI, EPS*ABSB ) ) THEN
+            ILIMIT = .TRUE.
+            SCALE = MAX( SCALE, ( ONEPLS*SAFMIN / ANRM1 ) /
+     $              MAX( ONEPLS*SAFMIN, ANRM2*ABSAR ) )
+         END IF
+*
+*        Check for significant underflow in BETA
+*
+         IF( ABS( SBETA ).LT.SAFMIN .AND. ABSB.GE.
+     $       MAX( SAFMIN, EPS*ABSAR, EPS*ABSAI ) ) THEN
+            ILIMIT = .TRUE.
+            SCALE = MAX( SCALE, ( ONEPLS*SAFMIN / BNRM1 ) /
+     $              MAX( ONEPLS*SAFMIN, BNRM2*ABSB ) )
+         END IF
+*
+*        Check for possible overflow when limiting scaling
+*
+         IF( ILIMIT ) THEN
+            TEMP = ( SCALE*SAFMIN )*MAX( ABS( SALFAR ), ABS( SALFAI ),
+     $             ABS( SBETA ) )
+            IF( TEMP.GT.ONE )
+     $         SCALE = SCALE / TEMP
+            IF( SCALE.LT.ONE )
+     $         ILIMIT = .FALSE.
+         END IF
+*
+*        Recompute un-scaled ALPHAR, ALPHAI, BETA if necessary.
+*
+         IF( ILIMIT ) THEN
+            SALFAR = ( SCALE*ALPHAR( JC ) )*ANRM
+            SALFAI = ( SCALE*ALPHAI( JC ) )*ANRM
+            SBETA = ( SCALE*BETA( JC ) )*BNRM
+         END IF
+         ALPHAR( JC ) = SALFAR
+         ALPHAI( JC ) = SALFAI
+         BETA( JC ) = SBETA
+  110 CONTINUE
+*
+  120 CONTINUE
+      WORK( 1 ) = LWKOPT
+*
+      RETURN
+*
+*     End of DGEGV
+*
+      END
+*> \brief <b> DGGSVD computes the singular value decomposition (SVD) for OTHER matrices</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DGGSVD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dggsvd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGGSVD( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
+*                          LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ, WORK,
+*                          IWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBQ, JOBU, JOBV
+*       INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   A( LDA, * ), ALPHA( * ), B( LDB, * ),
+*      $                   BETA( * ), Q( LDQ, * ), U( LDU, * ),
+*      $                   V( LDV, * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DGGSVD3.
+*>
+*> DGGSVD computes the generalized singular value decomposition (GSVD)
+*> of an M-by-N real matrix A and P-by-N real matrix B:
+*>
+*>       U**T*A*Q = D1*( 0 R ),    V**T*B*Q = D2*( 0 R )
+*>
+*> where U, V and Q are orthogonal matrices.
+*> Let K+L = the effective numerical rank of the matrix (A**T,B**T)**T,
+*> then R is a K+L-by-K+L nonsingular upper triangular matrix, D1 and
+*> D2 are M-by-(K+L) and P-by-(K+L) "diagonal" matrices and of the
+*> following structures, respectively:
+*>
+*> If M-K-L >= 0,
+*>
+*>                     K  L
+*>        D1 =     K ( I  0 )
+*>                 L ( 0  C )
+*>             M-K-L ( 0  0 )
+*>
+*>                   K  L
+*>        D2 =   L ( 0  S )
+*>             P-L ( 0  0 )
+*>
+*>                 N-K-L  K    L
+*>   ( 0 R ) = K (  0   R11  R12 )
+*>             L (  0    0   R22 )
+*>
+*> where
+*>
+*>   C = diag( ALPHA(K+1), ... , ALPHA(K+L) ),
+*>   S = diag( BETA(K+1),  ... , BETA(K+L) ),
+*>   C**2 + S**2 = I.
+*>
+*>   R is stored in A(1:K+L,N-K-L+1:N) on exit.
+*>
+*> If M-K-L < 0,
+*>
+*>                   K M-K K+L-M
+*>        D1 =   K ( I  0    0   )
+*>             M-K ( 0  C    0   )
+*>
+*>                     K M-K K+L-M
+*>        D2 =   M-K ( 0  S    0  )
+*>             K+L-M ( 0  0    I  )
+*>               P-L ( 0  0    0  )
+*>
+*>                    N-K-L  K   M-K  K+L-M
+*>   ( 0 R ) =     K ( 0    R11  R12  R13  )
+*>               M-K ( 0     0   R22  R23  )
+*>             K+L-M ( 0     0    0   R33  )
+*>
+*> where
+*>
+*>   C = diag( ALPHA(K+1), ... , ALPHA(M) ),
+*>   S = diag( BETA(K+1),  ... , BETA(M) ),
+*>   C**2 + S**2 = I.
+*>
+*>   (R11 R12 R13 ) is stored in A(1:M, N-K-L+1:N), and R33 is stored
+*>   ( 0  R22 R23 )
+*>   in B(M-K+1:L,N+M-K-L+1:N) on exit.
+*>
+*> The routine computes C, S, R, and optionally the orthogonal
+*> transformation matrices U, V and Q.
+*>
+*> In particular, if B is an N-by-N nonsingular matrix, then the GSVD of
+*> A and B implicitly gives the SVD of A*inv(B):
+*>                      A*inv(B) = U*(D1*inv(D2))*V**T.
+*> If ( A**T,B**T)**T  has orthonormal columns, then the GSVD of A and B is
+*> also equal to the CS decomposition of A and B. Furthermore, the GSVD
+*> can be used to derive the solution of the eigenvalue problem:
+*>                      A**T*A x = lambda* B**T*B x.
+*> In some literature, the GSVD of A and B is presented in the form
+*>                  U**T*A*X = ( 0 D1 ),   V**T*B*X = ( 0 D2 )
+*> where U and V are orthogonal and X is nonsingular, D1 and D2 are
+*> ``diagonal''.  The former GSVD form can be converted to the latter
+*> form by taking the nonsingular matrix X as
+*>
+*>                      X = Q*( I   0    )
+*>                            ( 0 inv(R) ).
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] JOBU
+*> \verbatim
+*>          JOBU is CHARACTER*1
+*>          = 'U':  Orthogonal matrix U is computed;
+*>          = 'N':  U is not computed.
+*> \endverbatim
+*>
+*> \param[in] JOBV
+*> \verbatim
+*>          JOBV is CHARACTER*1
+*>          = 'V':  Orthogonal matrix V is computed;
+*>          = 'N':  V is not computed.
+*> \endverbatim
+*>
+*> \param[in] JOBQ
+*> \verbatim
+*>          JOBQ is CHARACTER*1
+*>          = 'Q':  Orthogonal matrix Q is computed;
+*>          = 'N':  Q is not computed.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrices A and B.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] P
+*> \verbatim
+*>          P is INTEGER
+*>          The number of rows of the matrix B.  P >= 0.
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*> \endverbatim
+*>
+*> \param[out] L
+*> \verbatim
+*>          L is INTEGER
+*>
+*>          On exit, K and L specify the dimension of the subblocks
+*>          described in Purpose.
+*>          K + L = effective numerical rank of (A**T,B**T)**T.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit, A contains the triangular matrix R, or part of R.
+*>          See Purpose for details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB,N)
+*>          On entry, the P-by-N matrix B.
+*>          On exit, B contains the triangular matrix R if M-K-L < 0.
+*>          See Purpose for details.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,P).
+*> \endverbatim
+*>
+*> \param[out] ALPHA
+*> \verbatim
+*>          ALPHA is DOUBLE PRECISION array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] BETA
+*> \verbatim
+*>          BETA is DOUBLE PRECISION array, dimension (N)
+*>
+*>          On exit, ALPHA and BETA contain the generalized singular
+*>          value pairs of A and B;
+*>            ALPHA(1:K) = 1,
+*>            BETA(1:K)  = 0,
+*>          and if M-K-L >= 0,
+*>            ALPHA(K+1:K+L) = C,
+*>            BETA(K+1:K+L)  = S,
+*>          or if M-K-L < 0,
+*>            ALPHA(K+1:M)=C, ALPHA(M+1:K+L)=0
+*>            BETA(K+1:M) =S, BETA(M+1:K+L) =1
+*>          and
+*>            ALPHA(K+L+1:N) = 0
+*>            BETA(K+L+1:N)  = 0
+*> \endverbatim
+*>
+*> \param[out] U
+*> \verbatim
+*>          U is DOUBLE PRECISION array, dimension (LDU,M)
+*>          If JOBU = 'U', U contains the M-by-M orthogonal matrix U.
+*>          If JOBU = 'N', U is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDU
+*> \verbatim
+*>          LDU is INTEGER
+*>          The leading dimension of the array U. LDU >= max(1,M) if
+*>          JOBU = 'U'; LDU >= 1 otherwise.
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension (LDV,P)
+*>          If JOBV = 'V', V contains the P-by-P orthogonal matrix V.
+*>          If JOBV = 'N', V is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V. LDV >= max(1,P) if
+*>          JOBV = 'V'; LDV >= 1 otherwise.
+*> \endverbatim
+*>
+*> \param[out] Q
+*> \verbatim
+*>          Q is DOUBLE PRECISION array, dimension (LDQ,N)
+*>          If JOBQ = 'Q', Q contains the N-by-N orthogonal matrix Q.
+*>          If JOBQ = 'N', Q is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q. LDQ >= max(1,N) if
+*>          JOBQ = 'Q'; LDQ >= 1 otherwise.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array,
+*>                      dimension (max(3*N,M,P)+N)
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N)
+*>          On exit, IWORK stores the sorting information. More
+*>          precisely, the following loop will sort ALPHA
+*>             for I = K+1, min(M,K+L)
+*>                 swap ALPHA(I) and ALPHA(IWORK(I))
+*>             endfor
+*>          such that ALPHA(1) >= ALPHA(2) >= ... >= ALPHA(N).
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          > 0:  if INFO = 1, the Jacobi-type procedure failed to
+*>                converge.  For further details, see subroutine DTGSJA.
+*> \endverbatim
+*
+*> \par Internal Parameters:
+*  =========================
+*>
+*> \verbatim
+*>  TOLA    DOUBLE PRECISION
+*>  TOLB    DOUBLE PRECISION
+*>          TOLA and TOLB are the thresholds to determine the effective
+*>          rank of (A',B')**T. Generally, they are set to
+*>                   TOLA = MAX(M,N)*norm(A)*MAZHEPS,
+*>                   TOLB = MAX(P,N)*norm(B)*MAZHEPS.
+*>          The size of TOLA and TOLB may affect the size of backward
+*>          errors of the decomposition.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleOTHERsing
+*
+*> \par Contributors:
+*  ==================
+*>
+*>     Ming Gu and Huan Ren, Computer Science Division, University of
+*>     California at Berkeley, USA
+*>
+*  =====================================================================
+      SUBROUTINE DGGSVD( JOBU, JOBV, JOBQ, M, N, P, K, L, A, LDA, B,
+     $                   LDB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ, WORK,
+     $                   IWORK, INFO )
+*
+*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      CHARACTER          JOBQ, JOBU, JOBV
+      INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   A( LDA, * ), ALPHA( * ), B( LDB, * ),
+     $                   BETA( * ), Q( LDQ, * ), U( LDU, * ),
+     $                   V( LDV, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local Scalars ..
+      LOGICAL            WANTQ, WANTU, WANTV
+      INTEGER            I, IBND, ISUB, J, NCYCLE
+      DOUBLE PRECISION   ANORM, BNORM, SMAX, TEMP, TOLA, TOLB, ULP, UNFL
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      DOUBLE PRECISION   DLAMCH, DLANGE
+      EXTERNAL           LSAME, DLAMCH, DLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DCOPY, DGGSVP, DTGSJA, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters
+*
+      WANTU = LSAME( JOBU, 'U' )
+      WANTV = LSAME( JOBV, 'V' )
+      WANTQ = LSAME( JOBQ, 'Q' )
+*
+      INFO = 0
+      IF( .NOT.( WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.( WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.( WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( P.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -10
+      ELSE IF( LDB.LT.MAX( 1, P ) ) THEN
+         INFO = -12
+      ELSE IF( LDU.LT.1 .OR. ( WANTU .AND. LDU.LT.M ) ) THEN
+         INFO = -16
+      ELSE IF( LDV.LT.1 .OR. ( WANTV .AND. LDV.LT.P ) ) THEN
+         INFO = -18
+      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.N ) ) THEN
+         INFO = -20
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGGSVD', -INFO )
+         RETURN
+      END IF
+*
+*     Compute the Frobenius norm of matrices A and B
+*
+      ANORM = DLANGE( '1', M, N, A, LDA, WORK )
+      BNORM = DLANGE( '1', P, N, B, LDB, WORK )
+*
+*     Get machine precision and set up threshold for determining
+*     the effective numerical rank of the matrices A and B.
+*
+      ULP = DLAMCH( 'Precision' )
+      UNFL = DLAMCH( 'Safe Minimum' )
+      TOLA = MAX( M, N )*MAX( ANORM, UNFL )*ULP
+      TOLB = MAX( P, N )*MAX( BNORM, UNFL )*ULP
+*
+*     Preprocessing
+*
+      CALL DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB, TOLA,
+     $             TOLB, K, L, U, LDU, V, LDV, Q, LDQ, IWORK, WORK,
+     $             WORK( N+1 ), INFO )
+*
+*     Compute the GSVD of two upper "triangular" matrices
+*
+      CALL DTGSJA( JOBU, JOBV, JOBQ, M, P, N, K, L, A, LDA, B, LDB,
+     $             TOLA, TOLB, ALPHA, BETA, U, LDU, V, LDV, Q, LDQ,
+     $             WORK, NCYCLE, INFO )
+*
+*     Sort the singular values and store the pivot indices in IWORK
+*     Copy ALPHA to WORK, then sort ALPHA in WORK
+*
+      CALL DCOPY( N, ALPHA, 1, WORK, 1 )
+      IBND = MIN( L, M-K )
+      DO 20 I = 1, IBND
+*
+*        Scan for largest ALPHA(K+I)
+*
+         ISUB = I
+         SMAX = WORK( K+I )
+         DO 10 J = I + 1, IBND
+            TEMP = WORK( K+J )
+            IF( TEMP.GT.SMAX ) THEN
+               ISUB = J
+               SMAX = TEMP
+            END IF
+   10    CONTINUE
+         IF( ISUB.NE.I ) THEN
+            WORK( K+ISUB ) = WORK( K+I )
+            WORK( K+I ) = SMAX
+            IWORK( K+I ) = K + ISUB
+         ELSE
+            IWORK( K+I ) = K + I
+         END IF
+   20 CONTINUE
+*
+      RETURN
+*
+*     End of DGGSVD
+*
+      END
+*> \brief \b DGGSVP
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DGGSVP + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dggsvp.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dggsvp.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dggsvp.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
+*                          TOLA, TOLB, K, L, U, LDU, V, LDV, Q, LDQ,
+*                          IWORK, TAU, WORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBQ, JOBU, JOBV
+*       INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
+*       DOUBLE PRECISION   TOLA, TOLB
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            IWORK( * )
+*       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+*      $                   TAU( * ), U( LDU, * ), V( LDV, * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DGGSVP3.
+*>
+*> DGGSVP computes orthogonal matrices U, V and Q such that
+*>
+*>                    N-K-L  K    L
+*>  U**T*A*Q =     K ( 0    A12  A13 )  if M-K-L >= 0;
+*>                 L ( 0     0   A23 )
+*>             M-K-L ( 0     0    0  )
+*>
+*>                  N-K-L  K    L
+*>         =     K ( 0    A12  A13 )  if M-K-L < 0;
+*>             M-K ( 0     0   A23 )
+*>
+*>                  N-K-L  K    L
+*>  V**T*B*Q =   L ( 0     0   B13 )
+*>             P-L ( 0     0    0  )
+*>
+*> where the K-by-K matrix A12 and L-by-L matrix B13 are nonsingular
+*> upper triangular; A23 is L-by-L upper triangular if M-K-L >= 0,
+*> otherwise A23 is (M-K)-by-L upper trapezoidal.  K+L = the effective
+*> numerical rank of the (M+P)-by-N matrix (A**T,B**T)**T. 
+*>
+*> This decomposition is the preprocessing step for computing the
+*> Generalized Singular Value Decomposition (GSVD), see subroutine
+*> DGGSVD.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] JOBU
+*> \verbatim
+*>          JOBU is CHARACTER*1
+*>          = 'U':  Orthogonal matrix U is computed;
+*>          = 'N':  U is not computed.
+*> \endverbatim
+*>
+*> \param[in] JOBV
+*> \verbatim
+*>          JOBV is CHARACTER*1
+*>          = 'V':  Orthogonal matrix V is computed;
+*>          = 'N':  V is not computed.
+*> \endverbatim
+*>
+*> \param[in] JOBQ
+*> \verbatim
+*>          JOBQ is CHARACTER*1
+*>          = 'Q':  Orthogonal matrix Q is computed;
+*>          = 'N':  Q is not computed.
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] P
+*> \verbatim
+*>          P is INTEGER
+*>          The number of rows of the matrix B.  P >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrices A and B.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit, A contains the triangular (or trapezoidal) matrix
+*>          described in the Purpose section.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB,N)
+*>          On entry, the P-by-N matrix B.
+*>          On exit, B contains the triangular matrix described in
+*>          the Purpose section.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,P).
+*> \endverbatim
+*>
+*> \param[in] TOLA
+*> \verbatim
+*>          TOLA is DOUBLE PRECISION
+*> \endverbatim
+*>
+*> \param[in] TOLB
+*> \verbatim
+*>          TOLB is DOUBLE PRECISION
+*>
+*>          TOLA and TOLB are the thresholds to determine the effective
+*>          numerical rank of matrix B and a subblock of A. Generally,
+*>          they are set to
+*>             TOLA = MAX(M,N)*norm(A)*MACHEPS,
+*>             TOLB = MAX(P,N)*norm(B)*MACHEPS.
+*>          The size of TOLA and TOLB may affect the size of backward
+*>          errors of the decomposition.
+*> \endverbatim
+*>
+*> \param[out] K
+*> \verbatim
+*>          K is INTEGER
+*> \endverbatim
+*>
+*> \param[out] L
+*> \verbatim
+*>          L is INTEGER
+*>
+*>          On exit, K and L specify the dimension of the subblocks
+*>          described in Purpose section.
+*>          K + L = effective numerical rank of (A**T,B**T)**T.
+*> \endverbatim
+*>
+*> \param[out] U
+*> \verbatim
+*>          U is DOUBLE PRECISION array, dimension (LDU,M)
+*>          If JOBU = 'U', U contains the orthogonal matrix U.
+*>          If JOBU = 'N', U is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDU
+*> \verbatim
+*>          LDU is INTEGER
+*>          The leading dimension of the array U. LDU >= max(1,M) if
+*>          JOBU = 'U'; LDU >= 1 otherwise.
+*> \endverbatim
+*>
+*> \param[out] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension (LDV,P)
+*>          If JOBV = 'V', V contains the orthogonal matrix V.
+*>          If JOBV = 'N', V is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDV
+*> \verbatim
+*>          LDV is INTEGER
+*>          The leading dimension of the array V. LDV >= max(1,P) if
+*>          JOBV = 'V'; LDV >= 1 otherwise.
+*> \endverbatim
+*>
+*> \param[out] Q
+*> \verbatim
+*>          Q is DOUBLE PRECISION array, dimension (LDQ,N)
+*>          If JOBQ = 'Q', Q contains the orthogonal matrix Q.
+*>          If JOBQ = 'N', Q is not referenced.
+*> \endverbatim
+*>
+*> \param[in] LDQ
+*> \verbatim
+*>          LDQ is INTEGER
+*>          The leading dimension of the array Q. LDQ >= max(1,N) if
+*>          JOBQ = 'Q'; LDQ >= 1 otherwise.
+*> \endverbatim
+*>
+*> \param[out] IWORK
+*> \verbatim
+*>          IWORK is INTEGER array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (N)
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (max(3*N,M,P))
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleOTHERcomputational
+*
+*> \par Further Details:
+*  =====================
+*>
+*>  The subroutine uses LAPACK subroutine DGEQPF for the QR factorization
+*>  with column pivoting to detect the effective numerical rank of the
+*>  a matrix. It may be replaced by a better rank determination strategy.
+*>
+*  =====================================================================
+      SUBROUTINE DGGSVP( JOBU, JOBV, JOBQ, M, P, N, A, LDA, B, LDB,
+     $                   TOLA, TOLB, K, L, U, LDU, V, LDV, Q, LDQ,
+     $                   IWORK, TAU, WORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      CHARACTER          JOBQ, JOBU, JOBV
+      INTEGER            INFO, K, L, LDA, LDB, LDQ, LDU, LDV, M, N, P
+      DOUBLE PRECISION   TOLA, TOLB
+*     ..
+*     .. Array Arguments ..
+      INTEGER            IWORK( * )
+      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), Q( LDQ, * ),
+     $                   TAU( * ), U( LDU, * ), V( LDV, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            FORWRD, WANTQ, WANTU, WANTV
+      INTEGER            I, J
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEQPF, DGEQR2, DGERQ2, DLACPY, DLAPMT, DLASET,
+     $                   DORG2R, DORM2R, DORMR2, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters
+*
+      WANTU = LSAME( JOBU, 'U' )
+      WANTV = LSAME( JOBV, 'V' )
+      WANTQ = LSAME( JOBQ, 'Q' )
+      FORWRD = .TRUE.
+*
+      INFO = 0
+      IF( .NOT.( WANTU .OR. LSAME( JOBU, 'N' ) ) ) THEN
+         INFO = -1
+      ELSE IF( .NOT.( WANTV .OR. LSAME( JOBV, 'N' ) ) ) THEN
+         INFO = -2
+      ELSE IF( .NOT.( WANTQ .OR. LSAME( JOBQ, 'N' ) ) ) THEN
+         INFO = -3
+      ELSE IF( M.LT.0 ) THEN
+         INFO = -4
+      ELSE IF( P.LT.0 ) THEN
+         INFO = -5
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -6
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -8
+      ELSE IF( LDB.LT.MAX( 1, P ) ) THEN
+         INFO = -10
+      ELSE IF( LDU.LT.1 .OR. ( WANTU .AND. LDU.LT.M ) ) THEN
+         INFO = -16
+      ELSE IF( LDV.LT.1 .OR. ( WANTV .AND. LDV.LT.P ) ) THEN
+         INFO = -18
+      ELSE IF( LDQ.LT.1 .OR. ( WANTQ .AND. LDQ.LT.N ) ) THEN
+         INFO = -20
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGGSVP', -INFO )
+         RETURN
+      END IF
+*
+*     QR with column pivoting of B: B*P = V*( S11 S12 )
+*                                           (  0   0  )
+*
+      DO 10 I = 1, N
+         IWORK( I ) = 0
+   10 CONTINUE
+      CALL DGEQPF( P, N, B, LDB, IWORK, TAU, WORK, INFO )
+*
+*     Update A := A*P
+*
+      CALL DLAPMT( FORWRD, M, N, A, LDA, IWORK )
+*
+*     Determine the effective rank of matrix B.
+*
+      L = 0
+      DO 20 I = 1, MIN( P, N )
+         IF( ABS( B( I, I ) ).GT.TOLB )
+     $      L = L + 1
+   20 CONTINUE
+*
+      IF( WANTV ) THEN
+*
+*        Copy the details of V, and form V.
+*
+         CALL DLASET( 'Full', P, P, ZERO, ZERO, V, LDV )
+         IF( P.GT.1 )
+     $      CALL DLACPY( 'Lower', P-1, N, B( 2, 1 ), LDB, V( 2, 1 ),
+     $                   LDV )
+         CALL DORG2R( P, P, MIN( P, N ), V, LDV, TAU, WORK, INFO )
+      END IF
+*
+*     Clean up B
+*
+      DO 40 J = 1, L - 1
+         DO 30 I = J + 1, L
+            B( I, J ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
+      IF( P.GT.L )
+     $   CALL DLASET( 'Full', P-L, N, ZERO, ZERO, B( L+1, 1 ), LDB )
+*
+      IF( WANTQ ) THEN
+*
+*        Set Q = I and Update Q := Q*P
+*
+         CALL DLASET( 'Full', N, N, ZERO, ONE, Q, LDQ )
+         CALL DLAPMT( FORWRD, N, N, Q, LDQ, IWORK )
+      END IF
+*
+      IF( P.GE.L .AND. N.NE.L ) THEN
+*
+*        RQ factorization of (S11 S12): ( S11 S12 ) = ( 0 S12 )*Z
+*
+         CALL DGERQ2( L, N, B, LDB, TAU, WORK, INFO )
+*
+*        Update A := A*Z**T
+*
+         CALL DORMR2( 'Right', 'Transpose', M, N, L, B, LDB, TAU, A,
+     $                LDA, WORK, INFO )
+*
+         IF( WANTQ ) THEN
+*
+*           Update Q := Q*Z**T
+*
+            CALL DORMR2( 'Right', 'Transpose', N, N, L, B, LDB, TAU, Q,
+     $                   LDQ, WORK, INFO )
+         END IF
+*
+*        Clean up B
+*
+         CALL DLASET( 'Full', L, N-L, ZERO, ZERO, B, LDB )
+         DO 60 J = N - L + 1, N
+            DO 50 I = J - N + L + 1, L
+               B( I, J ) = ZERO
+   50       CONTINUE
+   60    CONTINUE
+*
+      END IF
+*
+*     Let              N-L     L
+*                A = ( A11    A12 ) M,
+*
+*     then the following does the complete QR decomposition of A11:
+*
+*              A11 = U*(  0  T12 )*P1**T
+*                      (  0   0  )
+*
+      DO 70 I = 1, N - L
+         IWORK( I ) = 0
+   70 CONTINUE
+      CALL DGEQPF( M, N-L, A, LDA, IWORK, TAU, WORK, INFO )
+*
+*     Determine the effective rank of A11
+*
+      K = 0
+      DO 80 I = 1, MIN( M, N-L )
+         IF( ABS( A( I, I ) ).GT.TOLA )
+     $      K = K + 1
+   80 CONTINUE
+*
+*     Update A12 := U**T*A12, where A12 = A( 1:M, N-L+1:N )
+*
+      CALL DORM2R( 'Left', 'Transpose', M, L, MIN( M, N-L ), A, LDA,
+     $             TAU, A( 1, N-L+1 ), LDA, WORK, INFO )
+*
+      IF( WANTU ) THEN
+*
+*        Copy the details of U, and form U
+*
+         CALL DLASET( 'Full', M, M, ZERO, ZERO, U, LDU )
+         IF( M.GT.1 )
+     $      CALL DLACPY( 'Lower', M-1, N-L, A( 2, 1 ), LDA, U( 2, 1 ),
+     $                   LDU )
+         CALL DORG2R( M, M, MIN( M, N-L ), U, LDU, TAU, WORK, INFO )
+      END IF
+*
+      IF( WANTQ ) THEN
+*
+*        Update Q( 1:N, 1:N-L )  = Q( 1:N, 1:N-L )*P1
+*
+         CALL DLAPMT( FORWRD, N, N-L, Q, LDQ, IWORK )
+      END IF
+*
+*     Clean up A: set the strictly lower triangular part of
+*     A(1:K, 1:K) = 0, and A( K+1:M, 1:N-L ) = 0.
+*
+      DO 100 J = 1, K - 1
+         DO 90 I = J + 1, K
+            A( I, J ) = ZERO
+   90    CONTINUE
+  100 CONTINUE
+      IF( M.GT.K )
+     $   CALL DLASET( 'Full', M-K, N-L, ZERO, ZERO, A( K+1, 1 ), LDA )
+*
+      IF( N-L.GT.K ) THEN
+*
+*        RQ factorization of ( T11 T12 ) = ( 0 T12 )*Z1
+*
+         CALL DGERQ2( K, N-L, A, LDA, TAU, WORK, INFO )
+*
+         IF( WANTQ ) THEN
+*
+*           Update Q( 1:N,1:N-L ) = Q( 1:N,1:N-L )*Z1**T
+*
+            CALL DORMR2( 'Right', 'Transpose', N, N-L, K, A, LDA, TAU,
+     $                   Q, LDQ, WORK, INFO )
+         END IF
+*
+*        Clean up A
+*
+         CALL DLASET( 'Full', K, N-L-K, ZERO, ZERO, A, LDA )
+         DO 120 J = N - L - K + 1, N - L
+            DO 110 I = J - N + L + K + 1, K
+               A( I, J ) = ZERO
+  110       CONTINUE
+  120    CONTINUE
+*
+      END IF
+*
+      IF( M.GT.K ) THEN
+*
+*        QR factorization of A( K+1:M,N-L+1:N )
+*
+         CALL DGEQR2( M-K, L, A( K+1, N-L+1 ), LDA, TAU, WORK, INFO )
+*
+         IF( WANTU ) THEN
+*
+*           Update U(:,K+1:M) := U(:,K+1:M)*U1
+*
+            CALL DORM2R( 'Right', 'No transpose', M, M-K, MIN( M-K, L ),
+     $                   A( K+1, N-L+1 ), LDA, TAU, U( 1, K+1 ), LDU,
+     $                   WORK, INFO )
+         END IF
+*
+*        Clean up
+*
+         DO 140 J = N - L + 1, N
+            DO 130 I = J - N + K + L + 1, M
+               A( I, J ) = ZERO
+  130       CONTINUE
+  140    CONTINUE
+*
+      END IF
+*
+      RETURN
+*
+*     End of DGGSVP
+*
+      END
+*> \brief \b DGEQPF
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DGEQPF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgeqpf.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgeqpf.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgeqpf.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            JPVT( * )
+*       DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DGEQP3.
+*>
+*> DGEQPF computes a QR factorization with column pivoting of a
+*> real M-by-N matrix A: A*P = Q*R.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A. M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A. N >= 0
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit, the upper triangle of the array contains the
+*>          min(M,N)-by-N upper triangular matrix R; the elements
+*>          below the diagonal, together with the array TAU,
+*>          represent the orthogonal matrix Q as a product of
+*>          min(m,n) elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A. LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] JPVT
+*> \verbatim
+*>          JPVT is INTEGER array, dimension (N)
+*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is permuted
+*>          to the front of A*P (a leading column); if JPVT(i) = 0,
+*>          the i-th column of A is a free column.
+*>          On exit, if JPVT(i) = k, then the i-th column of A*P
+*>          was the k-th column of A.
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (min(M,N))
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (3*N)
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleGEcomputational
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of elementary reflectors
+*>
+*>     Q = H(1) H(2) . . . H(n)
+*>
+*>  Each H(i) has the form
+*>
+*>     H = I - tau * v * v**T
+*>
+*>  where tau is a real scalar, and v is a real vector with
+*>  v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i).
+*>
+*>  The matrix P is represented in jpvt as follows: If
+*>     jpvt(j) = i
+*>  then the jth column of P is the ith canonical unit vector.
+*>
+*>  Partial column norm updating strategy modified by
+*>    Z. Drmac and Z. Bujanovic, Dept. of Mathematics,
+*>    University of Zagreb, Croatia.
+*>  -- April 2011                                                      --
+*>  For more details see LAPACK Working Note 176.
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPVT( * )
+      DOUBLE PRECISION   A( LDA, * ), TAU( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, ITEMP, J, MA, MN, PVT
+      DOUBLE PRECISION   AII, TEMP, TEMP2, TOL3Z
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEQR2, DLARF, DLARFG, DORM2R, DSWAP, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN, SQRT
+*     ..
+*     .. External Functions ..
+      INTEGER            IDAMAX
+      DOUBLE PRECISION   DLAMCH, DNRM2
+      EXTERNAL           IDAMAX, DLAMCH, DNRM2
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input arguments
+*
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGEQPF', -INFO )
+         RETURN
+      END IF
+*
+      MN = MIN( M, N )
+      TOL3Z = SQRT(DLAMCH('Epsilon'))
+*
+*     Move initial columns up front
+*
+      ITEMP = 1
+      DO 10 I = 1, N
+         IF( JPVT( I ).NE.0 ) THEN
+            IF( I.NE.ITEMP ) THEN
+               CALL DSWAP( M, A( 1, I ), 1, A( 1, ITEMP ), 1 )
+               JPVT( I ) = JPVT( ITEMP )
+               JPVT( ITEMP ) = I
+            ELSE
+               JPVT( I ) = I
+            END IF
+            ITEMP = ITEMP + 1
+         ELSE
+            JPVT( I ) = I
+         END IF
+   10 CONTINUE
+      ITEMP = ITEMP - 1
+*
+*     Compute the QR factorization and update remaining columns
+*
+      IF( ITEMP.GT.0 ) THEN
+         MA = MIN( ITEMP, M )
+         CALL DGEQR2( M, MA, A, LDA, TAU, WORK, INFO )
+         IF( MA.LT.N ) THEN
+            CALL DORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA, TAU,
+     $                   A( 1, MA+1 ), LDA, WORK, INFO )
+         END IF
+      END IF
+*
+      IF( ITEMP.LT.MN ) THEN
+*
+*        Initialize partial column norms. The first n elements of
+*        work store the exact column norms.
+*
+         DO 20 I = ITEMP + 1, N
+            WORK( I ) = DNRM2( M-ITEMP, A( ITEMP+1, I ), 1 )
+            WORK( N+I ) = WORK( I )
+   20    CONTINUE
+*
+*        Compute factorization
+*
+         DO 40 I = ITEMP + 1, MN
+*
+*           Determine ith pivot column and swap if necessary
+*
+            PVT = ( I-1 ) + IDAMAX( N-I+1, WORK( I ), 1 )
+*
+            IF( PVT.NE.I ) THEN
+               CALL DSWAP( M, A( 1, PVT ), 1, A( 1, I ), 1 )
+               ITEMP = JPVT( PVT )
+               JPVT( PVT ) = JPVT( I )
+               JPVT( I ) = ITEMP
+               WORK( PVT ) = WORK( I )
+               WORK( N+PVT ) = WORK( N+I )
+            END IF
+*
+*           Generate elementary reflector H(i)
+*
+            IF( I.LT.M ) THEN
+               CALL DLARFG( M-I+1, A( I, I ), A( I+1, I ), 1, TAU( I ) )
+            ELSE
+               CALL DLARFG( 1, A( M, M ), A( M, M ), 1, TAU( M ) )
+            END IF
+*
+            IF( I.LT.N ) THEN
+*
+*              Apply H(i) to A(i:m,i+1:n) from the left
+*
+               AII = A( I, I )
+               A( I, I ) = ONE
+               CALL DLARF( 'LEFT', M-I+1, N-I, A( I, I ), 1, TAU( I ),
+     $                     A( I, I+1 ), LDA, WORK( 2*N+1 ) )
+               A( I, I ) = AII
+            END IF
+*
+*           Update partial column norms
+*
+            DO 30 J = I + 1, N
+               IF( WORK( J ).NE.ZERO ) THEN
+*
+*                 NOTE: The following 4 lines follow from the analysis in
+*                 Lapack Working Note 176.
+*                 
+                  TEMP = ABS( A( I, J ) ) / WORK( J )
+                  TEMP = MAX( ZERO, ( ONE+TEMP )*( ONE-TEMP ) )
+                  TEMP2 = TEMP*( WORK( J ) / WORK( N+J ) )**2
+                  IF( TEMP2 .LE. TOL3Z ) THEN 
+                     IF( M-I.GT.0 ) THEN
+                        WORK( J ) = DNRM2( M-I, A( I+1, J ), 1 )
+                        WORK( N+J ) = WORK( J )
+                     ELSE
+                        WORK( J ) = ZERO
+                        WORK( N+J ) = ZERO
+                     END IF
+                  ELSE
+                     WORK( J ) = WORK( J )*SQRT( TEMP )
+                  END IF
+               END IF
+   30       CONTINUE
+*
+   40    CONTINUE
+      END IF
+      RETURN
+*
+*     End of DGEQPF
+*
+      END
+*> \brief <b> DGEEVX computes the eigenvalues and, optionally, the left and/or right eigenvectors for GE matrices</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DGEGS + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgegs.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgegs.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgegs.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
+*                         ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
+*                         LWORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          JOBVSL, JOBVSR
+*       INTEGER            INFO, LDA, LDB, LDVSL, LDVSR, LWORK, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
+*      $                   B( LDB, * ), BETA( * ), VSL( LDVSL, * ),
+*      $                   VSR( LDVSR, * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DGGES.
+*>
+*> DGEGS computes the eigenvalues, real Schur form, and, optionally,
+*> left and or/right Schur vectors of a real matrix pair (A,B).
+*> Given two square matrices A and B, the generalized real Schur
+*> factorization has the form
+*>
+*>   A = Q*S*Z**T,  B = Q*T*Z**T
+*>
+*> where Q and Z are orthogonal matrices, T is upper triangular, and S
+*> is an upper quasi-triangular matrix with 1-by-1 and 2-by-2 diagonal
+*> blocks, the 2-by-2 blocks corresponding to complex conjugate pairs
+*> of eigenvalues of (A,B).  The columns of Q are the left Schur vectors
+*> and the columns of Z are the right Schur vectors.
+*>
+*> If only the eigenvalues of (A,B) are needed, the driver routine
+*> DGEGV should be used instead.  See DGEGV for a description of the
+*> eigenvalues of the generalized nonsymmetric eigenvalue problem
+*> (GNEP).
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] JOBVSL
+*> \verbatim
+*>          JOBVSL is CHARACTER*1
+*>          = 'N':  do not compute the left Schur vectors;
+*>          = 'V':  compute the left Schur vectors (returned in VSL).
+*> \endverbatim
+*>
+*> \param[in] JOBVSR
+*> \verbatim
+*>          JOBVSR is CHARACTER*1
+*>          = 'N':  do not compute the right Schur vectors;
+*>          = 'V':  compute the right Schur vectors (returned in VSR).
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrices A, B, VSL, and VSR.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA, N)
+*>          On entry, the matrix A.
+*>          On exit, the upper quasi-triangular matrix S from the
+*>          generalized real Schur factorization.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB, N)
+*>          On entry, the matrix B.
+*>          On exit, the upper triangular matrix T from the generalized
+*>          real Schur factorization.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of B.  LDB >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] ALPHAR
+*> \verbatim
+*>          ALPHAR is DOUBLE PRECISION array, dimension (N)
+*>          The real parts of each scalar alpha defining an eigenvalue
+*>          of GNEP.
+*> \endverbatim
+*>
+*> \param[out] ALPHAI
+*> \verbatim
+*>          ALPHAI is DOUBLE PRECISION array, dimension (N)
+*>          The imaginary parts of each scalar alpha defining an
+*>          eigenvalue of GNEP.  If ALPHAI(j) is zero, then the j-th
+*>          eigenvalue is real; if positive, then the j-th and (j+1)-st
+*>          eigenvalues are a complex conjugate pair, with
+*>          ALPHAI(j+1) = -ALPHAI(j).
+*> \endverbatim
+*>
+*> \param[out] BETA
+*> \verbatim
+*>          BETA is DOUBLE PRECISION array, dimension (N)
+*>          The scalars beta that define the eigenvalues of GNEP.
+*>          Together, the quantities alpha = (ALPHAR(j),ALPHAI(j)) and
+*>          beta = BETA(j) represent the j-th eigenvalue of the matrix
+*>          pair (A,B), in one of the forms lambda = alpha/beta or
+*>          mu = beta/alpha.  Since either lambda or mu may overflow,
+*>          they should not, in general, be computed.
+*> \endverbatim
+*>
+*> \param[out] VSL
+*> \verbatim
+*>          VSL is DOUBLE PRECISION array, dimension (LDVSL,N)
+*>          If JOBVSL = 'V', the matrix of left Schur vectors Q.
+*>          Not referenced if JOBVSL = 'N'.
+*> \endverbatim
+*>
+*> \param[in] LDVSL
+*> \verbatim
+*>          LDVSL is INTEGER
+*>          The leading dimension of the matrix VSL. LDVSL >=1, and
+*>          if JOBVSL = 'V', LDVSL >= N.
+*> \endverbatim
+*>
+*> \param[out] VSR
+*> \verbatim
+*>          VSR is DOUBLE PRECISION array, dimension (LDVSR,N)
+*>          If JOBVSR = 'V', the matrix of right Schur vectors Z.
+*>          Not referenced if JOBVSR = 'N'.
+*> \endverbatim
+*>
+*> \param[in] LDVSR
+*> \verbatim
+*>          LDVSR is INTEGER
+*>          The leading dimension of the matrix VSR. LDVSR >= 1, and
+*>          if JOBVSR = 'V', LDVSR >= N.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension (MAX(1,LWORK))
+*>          On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+*> \endverbatim
+*>
+*> \param[in] LWORK
+*> \verbatim
+*>          LWORK is INTEGER
+*>          The dimension of the array WORK.  LWORK >= max(1,4*N).
+*>          For good performance, LWORK must generally be larger.
+*>          To compute the optimal value of LWORK, call ILAENV to get
+*>          blocksizes (for DGEQRF, DORMQR, and DORGQR.)  Then compute:
+*>          NB  -- MAX of the blocksizes for DGEQRF, DORMQR, and DORGQR
+*>          The optimal LWORK is  2*N + N*(NB+1).
+*>
+*>          If LWORK = -1, then a workspace query is assumed; the routine
+*>          only calculates the optimal size of the WORK array, returns
+*>          this value as the first entry of the WORK array, and no error
+*>          message related to LWORK is issued by XERBLA.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value.
+*>          = 1,...,N:
+*>                The QZ iteration failed.  (A,B) are not in Schur
+*>                form, but ALPHAR(j), ALPHAI(j), and BETA(j) should
+*>                be correct for j=INFO+1,...,N.
+*>          > N:  errors that usually indicate LAPACK problems:
+*>                =N+1: error return from DGGBAL
+*>                =N+2: error return from DGEQRF
+*>                =N+3: error return from DORMQR
+*>                =N+4: error return from DORGQR
+*>                =N+5: error return from DGGHRD
+*>                =N+6: error return from DHGEQZ (other than failed
+*>                                                iteration)
+*>                =N+7: error return from DGGBAK (computing VSL)
+*>                =N+8: error return from DGGBAK (computing VSR)
+*>                =N+9: error return from DLASCL (various places)
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleGEeigen
+*
+*  =====================================================================
+      SUBROUTINE DGEGS( JOBVSL, JOBVSR, N, A, LDA, B, LDB, ALPHAR,
+     $                  ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR, WORK,
+     $                  LWORK, INFO )
+*
+*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      CHARACTER          JOBVSL, JOBVSR
+      INTEGER            INFO, LDA, LDB, LDVSL, LDVSR, LWORK, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), ALPHAI( * ), ALPHAR( * ),
+     $                   B( LDB, * ), BETA( * ), VSL( LDVSL, * ),
+     $                   VSR( LDVSR, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0 )
+*     ..
+*     .. Local Scalars ..
+      LOGICAL            ILASCL, ILBSCL, ILVSL, ILVSR, LQUERY
+      INTEGER            ICOLS, IHI, IINFO, IJOBVL, IJOBVR, ILEFT, ILO,
+     $                   IRIGHT, IROWS, ITAU, IWORK, LOPT, LWKMIN,
+     $                   LWKOPT, NB, NB1, NB2, NB3
+      DOUBLE PRECISION   ANRM, ANRMTO, BIGNUM, BNRM, BNRMTO, EPS,
+     $                   SAFMIN, SMLNUM
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEQRF, DGGBAK, DGGBAL, DGGHRD, DHGEQZ, DLACPY,
+     $                   DLASCL, DLASET, DORGQR, DORMQR, XERBLA
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      INTEGER            ILAENV
+      DOUBLE PRECISION   DLAMCH, DLANGE
+      EXTERNAL           LSAME, ILAENV, DLAMCH, DLANGE
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          INT, MAX
+*     ..
+*     .. Executable Statements ..
+*
+*     Decode the input arguments
+*
+      IF( LSAME( JOBVSL, 'N' ) ) THEN
+         IJOBVL = 1
+         ILVSL = .FALSE.
+      ELSE IF( LSAME( JOBVSL, 'V' ) ) THEN
+         IJOBVL = 2
+         ILVSL = .TRUE.
+      ELSE
+         IJOBVL = -1
+         ILVSL = .FALSE.
+      END IF
+*
+      IF( LSAME( JOBVSR, 'N' ) ) THEN
+         IJOBVR = 1
+         ILVSR = .FALSE.
+      ELSE IF( LSAME( JOBVSR, 'V' ) ) THEN
+         IJOBVR = 2
+         ILVSR = .TRUE.
+      ELSE
+         IJOBVR = -1
+         ILVSR = .FALSE.
+      END IF
+*
+*     Test the input arguments
+*
+      LWKMIN = MAX( 4*N, 1 )
+      LWKOPT = LWKMIN
+      WORK( 1 ) = LWKOPT
+      LQUERY = ( LWORK.EQ.-1 )
+      INFO = 0
+      IF( IJOBVL.LE.0 ) THEN
+         INFO = -1
+      ELSE IF( IJOBVR.LE.0 ) THEN
+         INFO = -2
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, N ) ) THEN
+         INFO = -7
+      ELSE IF( LDVSL.LT.1 .OR. ( ILVSL .AND. LDVSL.LT.N ) ) THEN
+         INFO = -12
+      ELSE IF( LDVSR.LT.1 .OR. ( ILVSR .AND. LDVSR.LT.N ) ) THEN
+         INFO = -14
+      ELSE IF( LWORK.LT.LWKMIN .AND. .NOT.LQUERY ) THEN
+         INFO = -16
+      END IF
+*
+      IF( INFO.EQ.0 ) THEN
+         NB1 = ILAENV( 1, 'DGEQRF', ' ', N, N, -1, -1 )
+         NB2 = ILAENV( 1, 'DORMQR', ' ', N, N, N, -1 )
+         NB3 = ILAENV( 1, 'DORGQR', ' ', N, N, N, -1 )
+         NB = MAX( NB1, NB2, NB3 )
+         LOPT = 2*N + N*( NB+1 )
+         WORK( 1 ) = LOPT
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGEGS ', -INFO )
+         RETURN
+      ELSE IF( LQUERY ) THEN
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( N.EQ.0 )
+     $   RETURN
+*
+*     Get machine constants
+*
+      EPS = DLAMCH( 'E' )*DLAMCH( 'B' )
+      SAFMIN = DLAMCH( 'S' )
+      SMLNUM = N*SAFMIN / EPS
+      BIGNUM = ONE / SMLNUM
+*
+*     Scale A if max element outside range [SMLNUM,BIGNUM]
+*
+      ANRM = DLANGE( 'M', N, N, A, LDA, WORK )
+      ILASCL = .FALSE.
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+         ANRMTO = SMLNUM
+         ILASCL = .TRUE.
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+         ANRMTO = BIGNUM
+         ILASCL = .TRUE.
+      END IF
+*
+      IF( ILASCL ) THEN
+         CALL DLASCL( 'G', -1, -1, ANRM, ANRMTO, N, N, A, LDA, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+      END IF
+*
+*     Scale B if max element outside range [SMLNUM,BIGNUM]
+*
+      BNRM = DLANGE( 'M', N, N, B, LDB, WORK )
+      ILBSCL = .FALSE.
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+         BNRMTO = SMLNUM
+         ILBSCL = .TRUE.
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+         BNRMTO = BIGNUM
+         ILBSCL = .TRUE.
+      END IF
+*
+      IF( ILBSCL ) THEN
+         CALL DLASCL( 'G', -1, -1, BNRM, BNRMTO, N, N, B, LDB, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+      END IF
+*
+*     Permute the matrix to make it more nearly triangular
+*     Workspace layout:  (2*N words -- "work..." not actually used)
+*        left_permutation, right_permutation, work...
+*
+      ILEFT = 1
+      IRIGHT = N + 1
+      IWORK = IRIGHT + N
+      CALL DGGBAL( 'P', N, A, LDA, B, LDB, ILO, IHI, WORK( ILEFT ),
+     $             WORK( IRIGHT ), WORK( IWORK ), IINFO )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 1
+         GO TO 10
+      END IF
+*
+*     Reduce B to triangular form, and initialize VSL and/or VSR
+*     Workspace layout:  ("work..." must have at least N words)
+*        left_permutation, right_permutation, tau, work...
+*
+      IROWS = IHI + 1 - ILO
+      ICOLS = N + 1 - ILO
+      ITAU = IWORK
+      IWORK = ITAU + IROWS
+      CALL DGEQRF( IROWS, ICOLS, B( ILO, ILO ), LDB, WORK( ITAU ),
+     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
+      IF( IINFO.GE.0 )
+     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 2
+         GO TO 10
+      END IF
+*
+      CALL DORMQR( 'L', 'T', IROWS, ICOLS, IROWS, B( ILO, ILO ), LDB,
+     $             WORK( ITAU ), A( ILO, ILO ), LDA, WORK( IWORK ),
+     $             LWORK+1-IWORK, IINFO )
+      IF( IINFO.GE.0 )
+     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 3
+         GO TO 10
+      END IF
+*
+      IF( ILVSL ) THEN
+         CALL DLASET( 'Full', N, N, ZERO, ONE, VSL, LDVSL )
+         CALL DLACPY( 'L', IROWS-1, IROWS-1, B( ILO+1, ILO ), LDB,
+     $                VSL( ILO+1, ILO ), LDVSL )
+         CALL DORGQR( IROWS, IROWS, IROWS, VSL( ILO, ILO ), LDVSL,
+     $                WORK( ITAU ), WORK( IWORK ), LWORK+1-IWORK,
+     $                IINFO )
+         IF( IINFO.GE.0 )
+     $      LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 4
+            GO TO 10
+         END IF
+      END IF
+*
+      IF( ILVSR )
+     $   CALL DLASET( 'Full', N, N, ZERO, ONE, VSR, LDVSR )
+*
+*     Reduce to generalized Hessenberg form
+*
+      CALL DGGHRD( JOBVSL, JOBVSR, N, ILO, IHI, A, LDA, B, LDB, VSL,
+     $             LDVSL, VSR, LDVSR, IINFO )
+      IF( IINFO.NE.0 ) THEN
+         INFO = N + 5
+         GO TO 10
+      END IF
+*
+*     Perform QZ algorithm, computing Schur vectors if desired
+*     Workspace layout:  ("work..." must have at least 1 word)
+*        left_permutation, right_permutation, work...
+*
+      IWORK = ITAU
+      CALL DHGEQZ( 'S', JOBVSL, JOBVSR, N, ILO, IHI, A, LDA, B, LDB,
+     $             ALPHAR, ALPHAI, BETA, VSL, LDVSL, VSR, LDVSR,
+     $             WORK( IWORK ), LWORK+1-IWORK, IINFO )
+      IF( IINFO.GE.0 )
+     $   LWKOPT = MAX( LWKOPT, INT( WORK( IWORK ) )+IWORK-1 )
+      IF( IINFO.NE.0 ) THEN
+         IF( IINFO.GT.0 .AND. IINFO.LE.N ) THEN
+            INFO = IINFO
+         ELSE IF( IINFO.GT.N .AND. IINFO.LE.2*N ) THEN
+            INFO = IINFO - N
+         ELSE
+            INFO = N + 6
+         END IF
+         GO TO 10
+      END IF
+*
+*     Apply permutation to VSL and VSR
+*
+      IF( ILVSL ) THEN
+         CALL DGGBAK( 'P', 'L', N, ILO, IHI, WORK( ILEFT ),
+     $                WORK( IRIGHT ), N, VSL, LDVSL, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 7
+            GO TO 10
+         END IF
+      END IF
+      IF( ILVSR ) THEN
+         CALL DGGBAK( 'P', 'R', N, ILO, IHI, WORK( ILEFT ),
+     $                WORK( IRIGHT ), N, VSR, LDVSR, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 8
+            GO TO 10
+         END IF
+      END IF
+*
+*     Undo scaling
+*
+      IF( ILASCL ) THEN
+         CALL DLASCL( 'H', -1, -1, ANRMTO, ANRM, N, N, A, LDA, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+         CALL DLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHAR, N,
+     $                IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+         CALL DLASCL( 'G', -1, -1, ANRMTO, ANRM, N, 1, ALPHAI, N,
+     $                IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+      END IF
+*
+      IF( ILBSCL ) THEN
+         CALL DLASCL( 'U', -1, -1, BNRMTO, BNRM, N, N, B, LDB, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+         CALL DLASCL( 'G', -1, -1, BNRMTO, BNRM, N, 1, BETA, N, IINFO )
+         IF( IINFO.NE.0 ) THEN
+            INFO = N + 9
+            RETURN
+         END IF
+      END IF
+*
+   10 CONTINUE
+      WORK( 1 ) = LWKOPT
+*
+      RETURN
+*
+*     End of DGEGS
+*
+      END
+*> \brief <b> DGELSX solves overdetermined or underdetermined systems for GE matrices</b>
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DGELSX + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dgelsx.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dgelsx.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dgelsx.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+*                          WORK, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, LDA, LDB, M, N, NRHS, RANK
+*       DOUBLE PRECISION   RCOND
+*       ..
+*       .. Array Arguments ..
+*       INTEGER            JPVT( * )
+*       DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DGELSY.
+*>
+*> DGELSX computes the minimum-norm solution to a real linear least
+*> squares problem:
+*>     minimize || A * X - B ||
+*> using a complete orthogonal factorization of A.  A is an M-by-N
+*> matrix which may be rank-deficient.
+*>
+*> Several right hand side vectors b and solution vectors x can be
+*> handled in a single call; they are stored as the columns of the
+*> M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+*> matrix X.
+*>
+*> The routine first computes a QR factorization with column pivoting:
+*>     A * P = Q * [ R11 R12 ]
+*>                 [  0  R22 ]
+*> with R11 defined as the largest leading submatrix whose estimated
+*> condition number is less than 1/RCOND.  The order of R11, RANK,
+*> is the effective rank of A.
+*>
+*> Then, R22 is considered to be negligible, and R12 is annihilated
+*> by orthogonal transformations from the right, arriving at the
+*> complete orthogonal factorization:
+*>    A * P = Q * [ T11 0 ] * Z
+*>                [  0  0 ]
+*> The minimum-norm solution is then
+*>    X = P * Z**T [ inv(T11)*Q1**T*B ]
+*>                 [        0         ]
+*> where Q1 consists of the first RANK columns of Q.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= 0.
+*> \endverbatim
+*>
+*> \param[in] NRHS
+*> \verbatim
+*>          NRHS is INTEGER
+*>          The number of right hand sides, i.e., the number of
+*>          columns of matrices B and X. NRHS >= 0.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the M-by-N matrix A.
+*>          On exit, A has been overwritten by details of its
+*>          complete orthogonal factorization.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[in,out] B
+*> \verbatim
+*>          B is DOUBLE PRECISION array, dimension (LDB,NRHS)
+*>          On entry, the M-by-NRHS right hand side matrix B.
+*>          On exit, the N-by-NRHS solution matrix X.
+*>          If m >= n and RANK = n, the residual sum-of-squares for
+*>          the solution in the i-th column is given by the sum of
+*>          squares of elements N+1:M in that column.
+*> \endverbatim
+*>
+*> \param[in] LDB
+*> \verbatim
+*>          LDB is INTEGER
+*>          The leading dimension of the array B. LDB >= max(1,M,N).
+*> \endverbatim
+*>
+*> \param[in,out] JPVT
+*> \verbatim
+*>          JPVT is INTEGER array, dimension (N)
+*>          On entry, if JPVT(i) .ne. 0, the i-th column of A is an
+*>          initial column, otherwise it is a free column.  Before
+*>          the QR factorization of A, all initial columns are
+*>          permuted to the leading positions; only the remaining
+*>          free columns are moved as a result of column pivoting
+*>          during the factorization.
+*>          On exit, if JPVT(i) = k, then the i-th column of A*P
+*>          was the k-th column of A.
+*> \endverbatim
+*>
+*> \param[in] RCOND
+*> \verbatim
+*>          RCOND is DOUBLE PRECISION
+*>          RCOND is used to determine the effective rank of A, which
+*>          is defined as the order of the largest leading triangular
+*>          submatrix R11 in the QR factorization with pivoting of A,
+*>          whose estimated condition number < 1/RCOND.
+*> \endverbatim
+*>
+*> \param[out] RANK
+*> \verbatim
+*>          RANK is INTEGER
+*>          The effective rank of A, i.e., the order of the submatrix
+*>          R11.  This is the same as the order of the submatrix T11
+*>          in the complete orthogonal factorization of A.
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension
+*>                      (max( min(M,N)+3*N, 2*min(M,N)+NRHS )),
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleGEsolve
+*
+*  =====================================================================
+      SUBROUTINE DGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, RANK,
+     $                   WORK, INFO )
+*
+*  -- LAPACK driver routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDA, LDB, M, N, NRHS, RANK
+      DOUBLE PRECISION   RCOND
+*     ..
+*     .. Array Arguments ..
+      INTEGER            JPVT( * )
+      DOUBLE PRECISION   A( LDA, * ), B( LDB, * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      INTEGER            IMAX, IMIN
+      PARAMETER          ( IMAX = 1, IMIN = 2 )
+      DOUBLE PRECISION   ZERO, ONE, DONE, NTDONE
+      PARAMETER          ( ZERO = 0.0D0, ONE = 1.0D0, DONE = ZERO,
+     $                   NTDONE = ONE )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, IASCL, IBSCL, ISMAX, ISMIN, J, K, MN
+      DOUBLE PRECISION   ANRM, BIGNUM, BNRM, C1, C2, S1, S2, SMAX,
+     $                   SMAXPR, SMIN, SMINPR, SMLNUM, T1, T2
+*     ..
+*     .. External Functions ..
+      DOUBLE PRECISION   DLAMCH, DLANGE
+      EXTERNAL           DLAMCH, DLANGE
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DGEQPF, DLAIC1, DLASCL, DLASET, DLATZM, DORM2R,
+     $                   DTRSM, DTZRQF, XERBLA
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          ABS, MAX, MIN
+*     ..
+*     .. Executable Statements ..
+*
+      MN = MIN( M, N )
+      ISMIN = MN + 1
+      ISMAX = 2*MN + 1
+*
+*     Test the input arguments.
+*
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.0 ) THEN
+         INFO = -2
+      ELSE IF( NRHS.LT.0 ) THEN
+         INFO = -3
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -5
+      ELSE IF( LDB.LT.MAX( 1, M, N ) ) THEN
+         INFO = -7
+      END IF
+*
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DGELSX', -INFO )
+         RETURN
+      END IF
+*
+*     Quick return if possible
+*
+      IF( MIN( M, N, NRHS ).EQ.0 ) THEN
+         RANK = 0
+         RETURN
+      END IF
+*
+*     Get machine parameters
+*
+      SMLNUM = DLAMCH( 'S' ) / DLAMCH( 'P' )
+      BIGNUM = ONE / SMLNUM
+      CALL DLABAD( SMLNUM, BIGNUM )
+*
+*     Scale A, B if max elements outside range [SMLNUM,BIGNUM]
+*
+      ANRM = DLANGE( 'M', M, N, A, LDA, WORK )
+      IASCL = 0
+      IF( ANRM.GT.ZERO .AND. ANRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, M, N, A, LDA, INFO )
+         IASCL = 1
+      ELSE IF( ANRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, M, N, A, LDA, INFO )
+         IASCL = 2
+      ELSE IF( ANRM.EQ.ZERO ) THEN
+*
+*        Matrix all zero. Return zero solution.
+*
+         CALL DLASET( 'F', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
+         RANK = 0
+         GO TO 100
+      END IF
+*
+      BNRM = DLANGE( 'M', M, NRHS, B, LDB, WORK )
+      IBSCL = 0
+      IF( BNRM.GT.ZERO .AND. BNRM.LT.SMLNUM ) THEN
+*
+*        Scale matrix norm up to SMLNUM
+*
+         CALL DLASCL( 'G', 0, 0, BNRM, SMLNUM, M, NRHS, B, LDB, INFO )
+         IBSCL = 1
+      ELSE IF( BNRM.GT.BIGNUM ) THEN
+*
+*        Scale matrix norm down to BIGNUM
+*
+         CALL DLASCL( 'G', 0, 0, BNRM, BIGNUM, M, NRHS, B, LDB, INFO )
+         IBSCL = 2
+      END IF
+*
+*     Compute QR factorization with column pivoting of A:
+*        A * P = Q * R
+*
+      CALL DGEQPF( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ), INFO )
+*
+*     workspace 3*N. Details of Householder rotations stored
+*     in WORK(1:MN).
+*
+*     Determine RANK using incremental condition estimation
+*
+      WORK( ISMIN ) = ONE
+      WORK( ISMAX ) = ONE
+      SMAX = ABS( A( 1, 1 ) )
+      SMIN = SMAX
+      IF( ABS( A( 1, 1 ) ).EQ.ZERO ) THEN
+         RANK = 0
+         CALL DLASET( 'F', MAX( M, N ), NRHS, ZERO, ZERO, B, LDB )
+         GO TO 100
+      ELSE
+         RANK = 1
+      END IF
+*
+   10 CONTINUE
+      IF( RANK.LT.MN ) THEN
+         I = RANK + 1
+         CALL DLAIC1( IMIN, RANK, WORK( ISMIN ), SMIN, A( 1, I ),
+     $                A( I, I ), SMINPR, S1, C1 )
+         CALL DLAIC1( IMAX, RANK, WORK( ISMAX ), SMAX, A( 1, I ),
+     $                A( I, I ), SMAXPR, S2, C2 )
+*
+         IF( SMAXPR*RCOND.LE.SMINPR ) THEN
+            DO 20 I = 1, RANK
+               WORK( ISMIN+I-1 ) = S1*WORK( ISMIN+I-1 )
+               WORK( ISMAX+I-1 ) = S2*WORK( ISMAX+I-1 )
+   20       CONTINUE
+            WORK( ISMIN+RANK ) = C1
+            WORK( ISMAX+RANK ) = C2
+            SMIN = SMINPR
+            SMAX = SMAXPR
+            RANK = RANK + 1
+            GO TO 10
+         END IF
+      END IF
+*
+*     Logically partition R = [ R11 R12 ]
+*                             [  0  R22 ]
+*     where R11 = R(1:RANK,1:RANK)
+*
+*     [R11,R12] = [ T11, 0 ] * Y
+*
+      IF( RANK.LT.N )
+     $   CALL DTZRQF( RANK, N, A, LDA, WORK( MN+1 ), INFO )
+*
+*     Details of Householder rotations stored in WORK(MN+1:2*MN)
+*
+*     B(1:M,1:NRHS) := Q**T * B(1:M,1:NRHS)
+*
+      CALL DORM2R( 'Left', 'Transpose', M, NRHS, MN, A, LDA, WORK( 1 ),
+     $             B, LDB, WORK( 2*MN+1 ), INFO )
+*
+*     workspace NRHS
+*
+*     B(1:RANK,1:NRHS) := inv(T11) * B(1:RANK,1:NRHS)
+*
+      CALL DTRSM( 'Left', 'Upper', 'No transpose', 'Non-unit', RANK,
+     $            NRHS, ONE, A, LDA, B, LDB )
+*
+      DO 40 I = RANK + 1, N
+         DO 30 J = 1, NRHS
+            B( I, J ) = ZERO
+   30    CONTINUE
+   40 CONTINUE
+*
+*     B(1:N,1:NRHS) := Y**T * B(1:N,1:NRHS)
+*
+      IF( RANK.LT.N ) THEN
+         DO 50 I = 1, RANK
+            CALL DLATZM( 'Left', N-RANK+1, NRHS, A( I, RANK+1 ), LDA,
+     $                   WORK( MN+I ), B( I, 1 ), B( RANK+1, 1 ), LDB,
+     $                   WORK( 2*MN+1 ) )
+   50    CONTINUE
+      END IF
+*
+*     workspace NRHS
+*
+*     B(1:N,1:NRHS) := P * B(1:N,1:NRHS)
+*
+      DO 90 J = 1, NRHS
+         DO 60 I = 1, N
+            WORK( 2*MN+I ) = NTDONE
+   60    CONTINUE
+         DO 80 I = 1, N
+            IF( WORK( 2*MN+I ).EQ.NTDONE ) THEN
+               IF( JPVT( I ).NE.I ) THEN
+                  K = I
+                  T1 = B( K, J )
+                  T2 = B( JPVT( K ), J )
+   70             CONTINUE
+                  B( JPVT( K ), J ) = T1
+                  WORK( 2*MN+K ) = DONE
+                  T1 = T2
+                  K = JPVT( K )
+                  T2 = B( JPVT( K ), J )
+                  IF( JPVT( K ).NE.I )
+     $               GO TO 70
+                  B( I, J ) = T1
+                  WORK( 2*MN+K ) = DONE
+               END IF
+            END IF
+   80    CONTINUE
+   90 CONTINUE
+*
+*     Undo scaling
+*
+      IF( IASCL.EQ.1 ) THEN
+         CALL DLASCL( 'G', 0, 0, ANRM, SMLNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'U', 0, 0, SMLNUM, ANRM, RANK, RANK, A, LDA,
+     $                INFO )
+      ELSE IF( IASCL.EQ.2 ) THEN
+         CALL DLASCL( 'G', 0, 0, ANRM, BIGNUM, N, NRHS, B, LDB, INFO )
+         CALL DLASCL( 'U', 0, 0, BIGNUM, ANRM, RANK, RANK, A, LDA,
+     $                INFO )
+      END IF
+      IF( IBSCL.EQ.1 ) THEN
+         CALL DLASCL( 'G', 0, 0, SMLNUM, BNRM, N, NRHS, B, LDB, INFO )
+      ELSE IF( IBSCL.EQ.2 ) THEN
+         CALL DLASCL( 'G', 0, 0, BIGNUM, BNRM, N, NRHS, B, LDB, INFO )
+      END IF
+*
+  100 CONTINUE
+*
+      RETURN
+*
+*     End of DGELSX
+*
+      END
+*> \brief \b DLAHRD reduces the first nb columns of a general rectangular matrix A so that elements below the k-th subdiagonal are zero, and returns auxiliary matrices which are needed to apply the transformation to the unreduced part of A.
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DLAHRD + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlahrd.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlahrd.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlahrd.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            K, LDA, LDT, LDY, N, NB
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), T( LDT, NB ), TAU( NB ),
+*      $                   Y( LDY, NB )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DLAHR2.
+*>
+*> DLAHRD reduces the first NB columns of a real general n-by-(n-k+1)
+*> matrix A so that elements below the k-th subdiagonal are zero. The
+*> reduction is performed by an orthogonal similarity transformation
+*> Q**T * A * Q. The routine returns the matrices V and T which determine
+*> Q as a block reflector I - V*T*V**T, and also the matrix Y = A * V * T.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The order of the matrix A.
+*> \endverbatim
+*>
+*> \param[in] K
+*> \verbatim
+*>          K is INTEGER
+*>          The offset for the reduction. Elements below the k-th
+*>          subdiagonal in the first NB columns are reduced to zero.
+*> \endverbatim
+*>
+*> \param[in] NB
+*> \verbatim
+*>          NB is INTEGER
+*>          The number of columns to be reduced.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N-K+1)
+*>          On entry, the n-by-(n-k+1) general matrix A.
+*>          On exit, the elements on and above the k-th subdiagonal in
+*>          the first NB columns are overwritten with the corresponding
+*>          elements of the reduced matrix; the elements below the k-th
+*>          subdiagonal, with the array TAU, represent the matrix Q as a
+*>          product of elementary reflectors. The other columns of A are
+*>          unchanged. See Further Details.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,N).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (NB)
+*>          The scalar factors of the elementary reflectors. See Further
+*>          Details.
+*> \endverbatim
+*>
+*> \param[out] T
+*> \verbatim
+*>          T is DOUBLE PRECISION array, dimension (LDT,NB)
+*>          The upper triangular matrix T.
+*> \endverbatim
+*>
+*> \param[in] LDT
+*> \verbatim
+*>          LDT is INTEGER
+*>          The leading dimension of the array T.  LDT >= NB.
+*> \endverbatim
+*>
+*> \param[out] Y
+*> \verbatim
+*>          Y is DOUBLE PRECISION array, dimension (LDY,NB)
+*>          The n-by-nb matrix Y.
+*> \endverbatim
+*>
+*> \param[in] LDY
+*> \verbatim
+*>          LDY is INTEGER
+*>          The leading dimension of the array Y. LDY >= N.
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2015
+*
+*> \ingroup doubleOTHERauxiliary
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The matrix Q is represented as a product of nb elementary reflectors
+*>
+*>     Q = H(1) H(2) . . . H(nb).
+*>
+*>  Each H(i) has the form
+*>
+*>     H(i) = I - tau * v * v**T
+*>
+*>  where tau is a real scalar, and v is a real vector with
+*>  v(1:i+k-1) = 0, v(i+k) = 1; v(i+k+1:n) is stored on exit in
+*>  A(i+k+1:n,i), and tau in TAU(i).
+*>
+*>  The elements of the vectors v together form the (n-k+1)-by-nb matrix
+*>  V which is needed, with T and Y, to apply the transformation to the
+*>  unreduced part of the matrix, using an update of the form:
+*>  A := (I - V*T*V**T) * (A - Y*V**T).
+*>
+*>  The contents of A on exit are illustrated by the following example
+*>  with n = 7, k = 3 and nb = 2:
+*>
+*>     ( a   h   a   a   a )
+*>     ( a   h   a   a   a )
+*>     ( a   h   a   a   a )
+*>     ( h   h   a   a   a )
+*>     ( v1  h   a   a   a )
+*>     ( v1  v2  a   a   a )
+*>     ( v1  v2  a   a   a )
+*>
+*>  where a denotes an element of the original matrix A, h denotes a
+*>  modified element of the upper Hessenberg matrix H, and vi denotes an
+*>  element of the vector defining H(i).
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE DLAHRD( N, K, NB, A, LDA, TAU, T, LDT, Y, LDY )
+*
+*  -- LAPACK auxiliary routine (version 3.6.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2015
+*
+*     .. Scalar Arguments ..
+      INTEGER            K, LDA, LDT, LDY, N, NB
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), T( LDT, NB ), TAU( NB ),
+     $                   Y( LDY, NB )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ZERO, ONE
+      PARAMETER          ( ZERO = 0.0D+0, ONE = 1.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I
+      DOUBLE PRECISION   EI
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DLARFG, DSCAL, DTRMV
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+*     Quick return if possible
+*
+      IF( N.LE.1 )
+     $   RETURN
+*
+      DO 10 I = 1, NB
+         IF( I.GT.1 ) THEN
+*
+*           Update A(1:n,i)
+*
+*           Compute i-th column of A - Y * V**T
+*
+            CALL DGEMV( 'No transpose', N, I-1, -ONE, Y, LDY,
+     $                  A( K+I-1, 1 ), LDA, ONE, A( 1, I ), 1 )
+*
+*           Apply I - V * T**T * V**T to this column (call it b) from the
+*           left, using the last column of T as workspace
+*
+*           Let  V = ( V1 )   and   b = ( b1 )   (first I-1 rows)
+*                    ( V2 )             ( b2 )
+*
+*           where V1 is unit lower triangular
+*
+*           w := V1**T * b1
+*
+            CALL DCOPY( I-1, A( K+1, I ), 1, T( 1, NB ), 1 )
+            CALL DTRMV( 'Lower', 'Transpose', 'Unit', I-1, A( K+1, 1 ),
+     $                  LDA, T( 1, NB ), 1 )
+*
+*           w := w + V2**T *b2
+*
+            CALL DGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ),
+     $                  LDA, A( K+I, I ), 1, ONE, T( 1, NB ), 1 )
+*
+*           w := T**T *w
+*
+            CALL DTRMV( 'Upper', 'Transpose', 'Non-unit', I-1, T, LDT,
+     $                  T( 1, NB ), 1 )
+*
+*           b2 := b2 - V2*w
+*
+            CALL DGEMV( 'No transpose', N-K-I+1, I-1, -ONE, A( K+I, 1 ),
+     $                  LDA, T( 1, NB ), 1, ONE, A( K+I, I ), 1 )
+*
+*           b1 := b1 - V1*w
+*
+            CALL DTRMV( 'Lower', 'No transpose', 'Unit', I-1,
+     $                  A( K+1, 1 ), LDA, T( 1, NB ), 1 )
+            CALL DAXPY( I-1, -ONE, T( 1, NB ), 1, A( K+1, I ), 1 )
+*
+            A( K+I-1, I-1 ) = EI
+         END IF
+*
+*        Generate the elementary reflector H(i) to annihilate
+*        A(k+i+1:n,i)
+*
+         CALL DLARFG( N-K-I+1, A( K+I, I ), A( MIN( K+I+1, N ), I ), 1,
+     $                TAU( I ) )
+         EI = A( K+I, I )
+         A( K+I, I ) = ONE
+*
+*        Compute  Y(1:n,i)
+*
+         CALL DGEMV( 'No transpose', N, N-K-I+1, ONE, A( 1, I+1 ), LDA,
+     $               A( K+I, I ), 1, ZERO, Y( 1, I ), 1 )
+         CALL DGEMV( 'Transpose', N-K-I+1, I-1, ONE, A( K+I, 1 ), LDA,
+     $               A( K+I, I ), 1, ZERO, T( 1, I ), 1 )
+         CALL DGEMV( 'No transpose', N, I-1, -ONE, Y, LDY, T( 1, I ), 1,
+     $               ONE, Y( 1, I ), 1 )
+         CALL DSCAL( N, TAU( I ), Y( 1, I ), 1 )
+*
+*        Compute T(1:i,i)
+*
+         CALL DSCAL( I-1, -TAU( I ), T( 1, I ), 1 )
+         CALL DTRMV( 'Upper', 'No transpose', 'Non-unit', I-1, T, LDT,
+     $               T( 1, I ), 1 )
+         T( I, I ) = TAU( I )
+*
+   10 CONTINUE
+      A( K+NB, NB ) = EI
+*
+      RETURN
+*
+*     End of DLAHRD
+*
+      END
+*> \brief \b DLATZM
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DLATZM + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dlatzm.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dlatzm.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dlatzm.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
+* 
+*       .. Scalar Arguments ..
+*       CHARACTER          SIDE
+*       INTEGER            INCV, LDC, M, N
+*       DOUBLE PRECISION   TAU
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   C1( LDC, * ), C2( LDC, * ), V( * ), WORK( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DORMRZ.
+*>
+*> DLATZM applies a Householder matrix generated by DTZRQF to a matrix.
+*>
+*> Let P = I - tau*u*u**T,   u = ( 1 ),
+*>                               ( v )
+*> where v is an (m-1) vector if SIDE = 'L', or a (n-1) vector if
+*> SIDE = 'R'.
+*>
+*> If SIDE equals 'L', let
+*>        C = [ C1 ] 1
+*>            [ C2 ] m-1
+*>              n
+*> Then C is overwritten by P*C.
+*>
+*> If SIDE equals 'R', let
+*>        C = [ C1, C2 ] m
+*>               1  n-1
+*> Then C is overwritten by C*P.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] SIDE
+*> \verbatim
+*>          SIDE is CHARACTER*1
+*>          = 'L': form P * C
+*>          = 'R': form C * P
+*> \endverbatim
+*>
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix C.
+*> \endverbatim
+*>
+*> \param[in] V
+*> \verbatim
+*>          V is DOUBLE PRECISION array, dimension
+*>                  (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+*>                  (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+*>          The vector v in the representation of P. V is not used
+*>          if TAU = 0.
+*> \endverbatim
+*>
+*> \param[in] INCV
+*> \verbatim
+*>          INCV is INTEGER
+*>          The increment between elements of v. INCV <> 0
+*> \endverbatim
+*>
+*> \param[in] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION
+*>          The value tau in the representation of P.
+*> \endverbatim
+*>
+*> \param[in,out] C1
+*> \verbatim
+*>          C1 is DOUBLE PRECISION array, dimension
+*>                         (LDC,N) if SIDE = 'L'
+*>                         (M,1)   if SIDE = 'R'
+*>          On entry, the n-vector C1 if SIDE = 'L', or the m-vector C1
+*>          if SIDE = 'R'.
+*>
+*>          On exit, the first row of P*C if SIDE = 'L', or the first
+*>          column of C*P if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in,out] C2
+*> \verbatim
+*>          C2 is DOUBLE PRECISION array, dimension
+*>                         (LDC, N)   if SIDE = 'L'
+*>                         (LDC, N-1) if SIDE = 'R'
+*>          On entry, the (m - 1) x n matrix C2 if SIDE = 'L', or the
+*>          m x (n - 1) matrix C2 if SIDE = 'R'.
+*>
+*>          On exit, rows 2:m of P*C if SIDE = 'L', or columns 2:m of C*P
+*>          if SIDE = 'R'.
+*> \endverbatim
+*>
+*> \param[in] LDC
+*> \verbatim
+*>          LDC is INTEGER
+*>          The leading dimension of the arrays C1 and C2. LDC >= (1,M).
+*> \endverbatim
+*>
+*> \param[out] WORK
+*> \verbatim
+*>          WORK is DOUBLE PRECISION array, dimension
+*>                      (N) if SIDE = 'L'
+*>                      (M) if SIDE = 'R'
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleOTHERcomputational
+*
+*  =====================================================================
+      SUBROUTINE DLATZM( SIDE, M, N, V, INCV, TAU, C1, C2, LDC, WORK )
+*
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      CHARACTER          SIDE
+      INTEGER            INCV, LDC, M, N
+      DOUBLE PRECISION   TAU
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   C1( LDC, * ), C2( LDC, * ), V( * ), WORK( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DGER
+*     ..
+*     .. External Functions ..
+      LOGICAL            LSAME
+      EXTERNAL           LSAME
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MIN
+*     ..
+*     .. Executable Statements ..
+*
+      IF( ( MIN( M, N ).EQ.0 ) .OR. ( TAU.EQ.ZERO ) )
+     $   RETURN
+*
+      IF( LSAME( SIDE, 'L' ) ) THEN
+*
+*        w :=  (C1 + v**T * C2)**T
+*
+         CALL DCOPY( N, C1, LDC, WORK, 1 )
+         CALL DGEMV( 'Transpose', M-1, N, ONE, C2, LDC, V, INCV, ONE,
+     $               WORK, 1 )
+*
+*        [ C1 ] := [ C1 ] - tau* [ 1 ] * w**T
+*        [ C2 ]    [ C2 ]        [ v ]
+*
+         CALL DAXPY( N, -TAU, WORK, 1, C1, LDC )
+         CALL DGER( M-1, N, -TAU, V, INCV, WORK, 1, C2, LDC )
+*
+      ELSE IF( LSAME( SIDE, 'R' ) ) THEN
+*
+*        w := C1 + C2 * v
+*
+         CALL DCOPY( M, C1, 1, WORK, 1 )
+         CALL DGEMV( 'No transpose', M, N-1, ONE, C2, LDC, V, INCV, ONE,
+     $               WORK, 1 )
+*
+*        [ C1, C2 ] := [ C1, C2 ] - tau* w * [ 1 , v**T]
+*
+         CALL DAXPY( M, -TAU, WORK, 1, C1, 1 )
+         CALL DGER( M, N-1, -TAU, WORK, 1, V, INCV, C2, LDC )
+      END IF
+*
+      RETURN
+*
+*     End of DLATZM
+*
+      END
+*> \brief \b DTZRQF
+*
+*  =========== DOCUMENTATION ===========
+*
+* Online html documentation available at 
+*            http://www.netlib.org/lapack/explore-html/ 
+*
+*> \htmlonly
+*> Download DTZRQF + dependencies 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.tgz?format=tgz&filename=/lapack/lapack_routine/dtzrqf.f"> 
+*> [TGZ]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.zip?format=zip&filename=/lapack/lapack_routine/dtzrqf.f"> 
+*> [ZIP]</a> 
+*> <a href="http://www.netlib.org/cgi-bin/netlibfiles.txt?format=txt&filename=/lapack/lapack_routine/dtzrqf.f"> 
+*> [TXT]</a>
+*> \endhtmlonly 
+*
+*  Definition:
+*  ===========
+*
+*       SUBROUTINE DTZRQF( M, N, A, LDA, TAU, INFO )
+* 
+*       .. Scalar Arguments ..
+*       INTEGER            INFO, LDA, M, N
+*       ..
+*       .. Array Arguments ..
+*       DOUBLE PRECISION   A( LDA, * ), TAU( * )
+*       ..
+*  
+*
+*> \par Purpose:
+*  =============
+*>
+*> \verbatim
+*>
+*> This routine is deprecated and has been replaced by routine DTZRZF.
+*>
+*> DTZRQF reduces the M-by-N ( M<=N ) real upper trapezoidal matrix A
+*> to upper triangular form by means of orthogonal transformations.
+*>
+*> The upper trapezoidal matrix A is factored as
+*>
+*>    A = ( R  0 ) * Z,
+*>
+*> where Z is an N-by-N orthogonal matrix and R is an M-by-M upper
+*> triangular matrix.
+*> \endverbatim
+*
+*  Arguments:
+*  ==========
+*
+*> \param[in] M
+*> \verbatim
+*>          M is INTEGER
+*>          The number of rows of the matrix A.  M >= 0.
+*> \endverbatim
+*>
+*> \param[in] N
+*> \verbatim
+*>          N is INTEGER
+*>          The number of columns of the matrix A.  N >= M.
+*> \endverbatim
+*>
+*> \param[in,out] A
+*> \verbatim
+*>          A is DOUBLE PRECISION array, dimension (LDA,N)
+*>          On entry, the leading M-by-N upper trapezoidal part of the
+*>          array A must contain the matrix to be factorized.
+*>          On exit, the leading M-by-M upper triangular part of A
+*>          contains the upper triangular matrix R, and elements M+1 to
+*>          N of the first M rows of A, with the array TAU, represent the
+*>          orthogonal matrix Z as a product of M elementary reflectors.
+*> \endverbatim
+*>
+*> \param[in] LDA
+*> \verbatim
+*>          LDA is INTEGER
+*>          The leading dimension of the array A.  LDA >= max(1,M).
+*> \endverbatim
+*>
+*> \param[out] TAU
+*> \verbatim
+*>          TAU is DOUBLE PRECISION array, dimension (M)
+*>          The scalar factors of the elementary reflectors.
+*> \endverbatim
+*>
+*> \param[out] INFO
+*> \verbatim
+*>          INFO is INTEGER
+*>          = 0:  successful exit
+*>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*> \endverbatim
+*
+*  Authors:
+*  ========
+*
+*> \author Univ. of Tennessee 
+*> \author Univ. of California Berkeley 
+*> \author Univ. of Colorado Denver 
+*> \author NAG Ltd. 
+*
+*> \date November 2011
+*
+*> \ingroup doubleOTHERcomputational
+*
+*> \par Further Details:
+*  =====================
+*>
+*> \verbatim
+*>
+*>  The factorization is obtained by Householder's method.  The kth
+*>  transformation matrix, Z( k ), which is used to introduce zeros into
+*>  the ( m - k + 1 )th row of A, is given in the form
+*>
+*>     Z( k ) = ( I     0   ),
+*>              ( 0  T( k ) )
+*>
+*>  where
+*>
+*>     T( k ) = I - tau*u( k )*u( k )**T,   u( k ) = (   1    ),
+*>                                                   (   0    )
+*>                                                   ( z( k ) )
+*>
+*>  tau is a scalar and z( k ) is an ( n - m ) element vector.
+*>  tau and z( k ) are chosen to annihilate the elements of the kth row
+*>  of X.
+*>
+*>  The scalar tau is returned in the kth element of TAU and the vector
+*>  u( k ) in the kth row of A, such that the elements of z( k ) are
+*>  in  a( k, m + 1 ), ..., a( k, n ). The elements of R are returned in
+*>  the upper triangular part of A.
+*>
+*>  Z is given by
+*>
+*>     Z =  Z( 1 ) * Z( 2 ) * ... * Z( m ).
+*> \endverbatim
+*>
+*  =====================================================================
+      SUBROUTINE DTZRQF( M, N, A, LDA, TAU, INFO )
+*
+*  -- LAPACK computational routine (version 3.4.0) --
+*  -- LAPACK is a software package provided by Univ. of Tennessee,    --
+*  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
+*     November 2011
+*
+*     .. Scalar Arguments ..
+      INTEGER            INFO, LDA, M, N
+*     ..
+*     .. Array Arguments ..
+      DOUBLE PRECISION   A( LDA, * ), TAU( * )
+*     ..
+*
+*  =====================================================================
+*
+*     .. Parameters ..
+      DOUBLE PRECISION   ONE, ZERO
+      PARAMETER          ( ONE = 1.0D+0, ZERO = 0.0D+0 )
+*     ..
+*     .. Local Scalars ..
+      INTEGER            I, K, M1
+*     ..
+*     .. Intrinsic Functions ..
+      INTRINSIC          MAX, MIN
+*     ..
+*     .. External Subroutines ..
+      EXTERNAL           DAXPY, DCOPY, DGEMV, DGER, DLARFG, XERBLA
+*     ..
+*     .. Executable Statements ..
+*
+*     Test the input parameters.
+*
+      INFO = 0
+      IF( M.LT.0 ) THEN
+         INFO = -1
+      ELSE IF( N.LT.M ) THEN
+         INFO = -2
+      ELSE IF( LDA.LT.MAX( 1, M ) ) THEN
+         INFO = -4
+      END IF
+      IF( INFO.NE.0 ) THEN
+         CALL XERBLA( 'DTZRQF', -INFO )
+         RETURN
+      END IF
+*
+*     Perform the factorization.
+*
+      IF( M.EQ.0 )
+     $   RETURN
+      IF( M.EQ.N ) THEN
+         DO 10 I = 1, N
+            TAU( I ) = ZERO
+   10    CONTINUE
+      ELSE
+         M1 = MIN( M+1, N )
+         DO 20 K = M, 1, -1
+*
+*           Use a Householder reflection to zero the kth row of A.
+*           First set up the reflection.
+*
+            CALL DLARFG( N-M+1, A( K, K ), A( K, M1 ), LDA, TAU( K ) )
+*
+            IF( ( TAU( K ).NE.ZERO ) .AND. ( K.GT.1 ) ) THEN
+*
+*              We now perform the operation  A := A*P( k ).
+*
+*              Use the first ( k - 1 ) elements of TAU to store  a( k ),
+*              where  a( k ) consists of the first ( k - 1 ) elements of
+*              the  kth column  of  A.  Also  let  B  denote  the  first
+*              ( k - 1 ) rows of the last ( n - m ) columns of A.
+*
+               CALL DCOPY( K-1, A( 1, K ), 1, TAU, 1 )
+*
+*              Form   w = a( k ) + B*z( k )  in TAU.
+*
+               CALL DGEMV( 'No transpose', K-1, N-M, ONE, A( 1, M1 ),
+     $                     LDA, A( K, M1 ), LDA, ONE, TAU, 1 )
+*
+*              Now form  a( k ) := a( k ) - tau*w
+*              and       B      := B      - tau*w*z( k )**T.
+*
+               CALL DAXPY( K-1, -TAU( K ), TAU, 1, A( 1, K ), 1 )
+               CALL DGER( K-1, N-M, -TAU( K ), TAU, 1, A( K, M1 ), LDA,
+     $                    A( 1, M1 ), LDA )
+            END IF
+   20    CONTINUE
+      END IF
+*
+      RETURN
+*
+*     End of DTZRQF
+*
       END
diff -Nru r-base-3.2.3/src/modules/lapack/LICENSE r-base-3.3.1/src/modules/lapack/LICENSE
--- r-base-3.2.3/src/modules/lapack/LICENSE	2014-03-12 23:03:24.000000000 +0000
+++ r-base-3.3.1/src/modules/lapack/LICENSE	2016-03-16 23:04:26.000000000 +0000
@@ -1,9 +1,9 @@
-Copyright (c) 1992-2011 The University of Tennessee and The University
+Copyright (c) 1992-2015 The University of Tennessee and The University
                         of Tennessee Research Foundation.  All rights
                         reserved.
-Copyright (c) 2000-2011 The University of California Berkeley. All
+Copyright (c) 2000-2015 The University of California Berkeley. All
                         rights reserved.
-Copyright (c) 2006-2012 The University of Colorado Denver.  All rights
+Copyright (c) 2006-2015 The University of Colorado Denver.  All rights
                         reserved.
 
 $COPYRIGHT$
diff -Nru r-base-3.2.3/src/modules/lapack/README r-base-3.3.1/src/modules/lapack/README
--- r-base-3.2.3/src/modules/lapack/README	2014-03-12 23:03:24.000000000 +0000
+++ r-base-3.3.1/src/modules/lapack/README	2016-03-16 23:04:26.000000000 +0000
@@ -1,5 +1,5 @@
-The Fortran routines here are extracted from LAPACK 3.1.0, then 3.1.1,
-3.4.1, 3.4.2, 3.5.0.  (http://www.netlib.org/lapack and mirrors).
+The Fortran routines here were extracted from LAPACK 3.1.0, then 3.1.1,
+3.4.1, 3.4.2, 3.5.0, 3.6.0.  (http://www.netlib.org/lapack and mirrors).
 
 dlapack?.f are support routines for `real' LAPACK calls
 cmplx.f are support routines for LAPACK calls from complex arithmetic
@@ -7,6 +7,159 @@
 compiler and compatible with the Rcomplex type.
 Neither will be compiled if an external LAPACK is used.
 
+We have tried to avoid including any single-precision routines.
+
+dlapack.f is the concatenation of
+
+dbbcsd.f	dbdsdc.f	dbdsqr.f	ddisna.f	dgbbrd.f
+dgbcon.f	dgbequ.f	dgbequb.f	dgbrfs.f	dgbsv.f
+dgbsvx.f	dgbtf2.f	dgbtrf.f	dgbtrs.f	dgebak.f
+dgebal.f	dgebd2.f	dgebrd.f	dgecon.f	dgeequ.f
+dgeequb.f	dgees.f		dgeesx.f	dgeev.f		dgeevx.f
+dgehd2.f	dgehrd.f	dgejsv.f	dgelq2.f	dgelqf.f
+dgels.f		dgelsd.f	dgelss.f	dgelsy.f	dgemqrt.f
+dgeql2.f	dgeqlf.f	dgeqp3.f	dgeqr2.f	dgeqr2p.f
+dgeqrf.f	dgeqrfp.f	dgeqrt.f	dgeqrt2.f	dgeqrt3.f
+dgerfs.f	dgerq2.f	dgerqf.f	dgesc2.f	dgesdd.f
+dgesv.f		dgesvd.f	dgesvj.f	dgesvx.f	dgetc2.f
+dgetf2.f	dgetrf.f	dgetrf2.f	dgetri.f	dgetrs.f
+dggbak.f	dggbal.f	dgges.f		dggesx.f	dggev.f
+dggevx.f	dggglm.f	dgghrd.f	dgglse.f	dggqrf.f
+dggrqf.f	dgsvj0.f	dgsvj1.f	dgtcon.f	dgtrfs.f
+dgtsv.f		dgtsvx.f	dgttrf.f	dgttrs.f	dgtts2.f
+dhgeqz.f	dhsein.f	dhseqr.f	disnan.f	dlabad.f
+dlabrd.f	dlacn2.f	dlacon.f	dlacpy.f	dladiv.f
+dlae2.f		dlaebz.f	dlaed0.f	dlaed1.f	dlaed2.f
+dlaed3.f	dlaed4.f	dlaed5.f	dlaed6.f	dlaed7.f
+dlaed8.f	dlaed9.f	dlaeda.f	dlaein.f	dlaev2.f
+dlaexc.f	dlag2.f		dlags2.f	dlagtf.f	dlagtm.f
+dlagts.f	dlagv2.f	dlahqr.f	dlahr2.f	dlaic1.f
+dlaisnan.f	dlaln2.f	dlals0.f	dlalsa.f	dlalsd.f
+dlamrg.f	dlaneg.f	dlangb.f	dlange.f	dlangt.f
+dlanhs.f	dlansb.f	dlansf.f	dlansp.f	dlanst.f
+dlansy.f	dlantb.f	dlantp.f	dlantr.f	dlanv2.f
+dlapll.f	dlapmr.f	dlapmt.f	dlapy2.f	dlapy3.f
+dlaqgb.f	dlaqge.f	dlaqp2.f	dlaqps.f	dlaqr0.f
+dlaqr1.f	dlaqr2.f	dlaqr3.f	dlaqr4.f	dlaqr5.f
+dlaqsb.f	dlaqsp.f	dlaqsy.f	dlaqtr.f	dlar1v.f
+dlar2v.f	dlarf.f		dlarfb.f	dlarfg.f	dlarfgp.f
+dlarft.f	dlarfx.f	dlargv.f	dlarnv.f	dlarra.f
+dlarrb.f	dlarrc.f	dlarrd.f	dlarre.f	dlarrf.f
+dlarrj.f	dlarrk.f	dlarrr.f	dlarrv.f	dlarscl2.f
+dlartg.f	dlartgp.f	dlartgs.f	dlartv.f	dlaruv.f
+dlarz.f		dlarzb.f	dlarzt.f	dlas2.f		dlascl.f
+dlascl2.f	dlasd0.f	dlasd1.f	dlasd2.f	dlasd3.f
+dlasd4.f	dlasd5.f	dlasd6.f	dlasd7.f	dlasd8.f
+dlasda.f	dlasdq.f	dlasdt.f	dlaset.f	dlasq1.f
+dlasq2.f	dlasq3.f	dlasq4.f	dlasq5.f	dlasq6.f
+dlasr.f		dlasrt.f	dlassq.f	dlasv2.f	dlaswp.f
+dlasy2.f	dlasyf.f	dlatbs.f	dlatdf.f	dlatps.f
+dlatrd.f	dlatrs.f	dlatrz.f	dlauu2.f	dlauum.f
+dopgtr.f	dopmtr.f	dorbdb.f	dorcsd.f	dorg2l.f
+dorg2r.f	dorgbr.f	dorghr.f	dorgl2.f	dorglq.f
+dorgql.f	dorgqr.f	dorgr2.f	dorgrq.f	dorgtr.f
+dorm2l.f	dorm2r.f	dormbr.f	dormhr.f	dorml2.f
+dormlq.f	dormql.f	dormqr.f	dormr2.f	dormr3.f
+dormrq.f	dormrz.f	dormtr.f	dpbcon.f	dpbequ.f
+dpbrfs.f	dpbstf.f	dpbsv.f		dpbsvx.f	dpbtf2.f
+dpbtrf.f	dpbtrs.f	dpftrf.f	dpftri.f	dpftrs.f
+dpocon.f	dpoequ.f	dpoequb.f	dporfs.f	dposv.f
+dposvx.f	dpotf2.f	dpotrf.f	dpotrf2.f	dpotri.f
+dpotrs.f	dppcon.f	dppequ.f	dpprfs.f	dppsv.f
+dppsvx.f	dpptrf.f	dpptri.f	dpptrs.f	dpstf2.f
+dpstrf.f	dptcon.f	dpteqr.f	dptrfs.f	dptsv.f
+dptsvx.f	dpttrf.f	dpttrs.f	dptts2.f	drscl.f
+dsbev.f		dsbevd.f	dsbevx.f	dsbgst.f	dsbgv.f
+dsbgvd.f	dsbgvx.f	dsbtrd.f	dsfrk.f		dspcon.f
+dspev.f		dspevd.f	dspevx.f	dspgst.f	dspgv.f
+dspgvd.f	dspgvx.f	dsprfs.f	dspsv.f		dspsvx.f
+dsptrd.f	dsptrf.f	dsptri.f	dsptrs.f	dstebz.f
+dstedc.f	dstegr.f	dstein.f	dstemr.f	dsteqr.f
+dsterf.f	dstev.f		dstevd.f	dstevr.f	dstevx.f
+dsycon.f	dsyconv.f	dsyequb.f	dsyev.f		dsyevd.f
+dsyevr.f	dsyevx.f	dsygs2.f	dsygst.f	dsygv.f
+dsygvd.f	dsygvx.f	dsyrfs.f	dsysv.f		dsysvx.f
+dsyswapr.f	dsytd2.f	dsytf2.f	dsytrd.f	dsytrf.f
+dsytri.f	dsytri2.f	dsytri2x.f	dsytrs.f	dsytrs2.f
+dtbcon.f	dtbrfs.f	dtbtrs.f	dtfsm.f		dtftri.f
+dtfttp.f	dtfttr.f	dtgevc.f	dtgex2.f	dtgexc.f
+dtgsen.f	dtgsja.f	dtgsna.f	dtgsy2.f	dtgsyl.f
+dtpcon.f	dtpmqrt.f	dtpqrt.f	dtpqrt2.f	dtprfb.f
+dtprfs.f	dtptri.f	dtptrs.f	dtpttf.f	dtpttr.f
+dtrcon.f	dtrevc.f	dtrexc.f	dtrrfs.f	dtrsen.f
+dtrsna.f	dtrsyl.f	dtrti2.f	dtrtri.f	dtrtrs.f
+dtrttf.f	dtrttp.f	dtzrzf.f	ieeeck.f	iladlc.f
+iladlr.f	ilaenv.f	ilaprec.f	ilatrans.f	ilaver.f
+iparmq.f
+DEPRECATED/dgeqpf.f DEPRECATED/dgegv.f DEPRECATED/dggsvd.f DEPRECATED/dggsvp.f
+DEPRECATED/dgegs.f DEPRECATED/dgelsx.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f
+DEPRECATED/dtzrqf.f
+
+dbdsvdx dgesvdx dgetrf2 dgges3 dggev3 dgghd3 dggsvd3 dggsvp3 dorm22 dpotrf2
+are new in LAPACK 3.6.0 and were added in R 3.3.0.
+
+
+cmplx.f is the concatenation of
+
+dzsum1.f	ilazlc.f	ilazlr.f	izmax1.f	zbdsqr.f
+zdrscl.f	zgebak.f	zgebal.f	zgebd2.f	zgebrd.f
+zgecon.f	zgeequ.f	zgees.f		zgeev.f		zgehd2.f
+zgehrd.f	zgelq2.f	zgelqf.f	zgels.f		zgelsd.f
+zgeqp3.f	zgeqr2.f	zgeqrf.f	zgerfs.f	zgesc2.f
+zgesdd.f	zgesv.f		zgesvd.f	zgesvx.f	zgetc2.f
+zgetf2.f	zgetrf.f	zgetrf2.f	zgetri.f	zgetrs.f
+zggbak.f	zggbal.f	zgges.f		zggev.f		zgghrd.f
+zheev.f		zheevd.f	zhetd2.f	zhetrd.f	zhgeqz.f
+zhseqr.f	zlabrd.f	zlacgv.f	zlacn2.f	zlacp2.f
+zlacpy.f	zlacrm.f	zladiv.f	zlaed0.f	zlaed7.f
+zlaed8.f	zlahqr.f	zlahr2.f	zlals0.f	zlalsa.f
+zlalsd.f	zlange.f	zlanhe.f	zlanhs.f	zlantr.f
+zlaqge.f	zlaqp2.f	zlaqps.f	zlaqr0.f	zlaqr1.f
+zlaqr2.f	zlaqr3.f	zlaqr4.f	zlaqr5.f	zlarcm.f
+zlarf.f		zlarfb.f	zlarfg.f	zlarft.f	zlarfx.f
+zlartg.f	zlascl.f	zlaset.f	zlasr.f		zlassq.f
+zlaswp.f	zlasyf.f	zlatdf.f	zlatrd.f	zlatrs.f
+zlauu2.f	zlauum.f	zpotf2.f	zpotrf.f	zpotrf2.f
+zpotri.f	zrot.f		zstedc.f	zsteqr.f	zsymv.f
+zsyr.f		zsytf2.f	zsytrf.f	zsytri.f	ztgevc.f
+ztgex2.f	ztgexc.f	ztgsen.f	ztgsy2.f	ztgsyl.f
+ztrcon.f	ztrevc.f	ztrexc.f	ztrsen.f	ztrsyl.f
+ztrti2.f	ztrtri.f	ztrtrs.f	zung2l.f	zung2r.f
+zungbr.f	zunghr.f	zungl2.f	zunglq.f	zungql.f
+zungqr.f	zungr2.f	zungrq.f	zungtr.f	zunm2l.f
+zunm2r.f	zunmbr.f	zunmhr.f	zunml2.f	zunmlq.f
+zunmql.f	zunmqr.f	zunmtr.f        DEPRECATED/zlahrd.f
+
+zlahr2 zlaqr0 zlaqr1 zlaqr2 zlaqr3 zlaqr4 zlaqr5 zlartg zpotf2 zpotrf
+zrot ztrexc
+were added in 2.5.0.
+
+izmax1 zdrscl zgecon zlacn2 zlantr ztrcon
+were added in 2.7.0.
+
+dzsum1 ilazlc ilazlr zunmhr
+were added in 2.15.2.
+
+zgelsd zgesdd zlacp2 zlacrm zlals0 zlalsa zlalsd zlarcm
+were added in R 3.1.0.
+
+zgetrf2 zpotrf2
+are new in LAPACK 3.6.0 and were added in R 3.3.0.
+
+zgeequ zgees zgels zgerfs zgesc2 zgesvx zgetc2 zgetri zggbak zggbal
+zgges zggev zgghrd zheevd zhgeqz zlaed0 zlaed7 zlaed8 zlaqge zlasyf
+zlatdf zlauu2 zlauum zpotri zstedc zsymv zsyr zsytf2 zsytrf zsytri
+ztgevc ztgex2 ztgexc ztgsen ztgsy2 ztgsyl ztrsen ztrsyl ztrti2 ztrtri
+zunm2l zunmql zunmtr
+were added in R 3.3.0 for use by a CRAN package.
+
+-------------------------------------------------
+
+R.patch suppresses compilation warnings, and helps with Fortran
+array-bounds checking.
+
+-------------------------------------------------
+
 For 'base' R addition of a new .Call()able Lapack routine,
 all these files must be updated {path relative to R's topdir}:
 
@@ -19,113 +172,3 @@
   src/modules/lapack/Lapack.c
   src/modules/lapack/Lapack.h
   src/modules/lapack/cmplx.f or dlapack.f
-
-We have tried to avoid including any single-precision routines.
-
-dlapack.f is the concatenation of
-
-dbbcsd.f	dgtsvx.f	dlarf.f		dorm2r.f	dstemr.f
-dbdsdc.f	dgttrf.f	dlarfb.f	dormbr.f	dsteqr.f
-dbdsqr.f	dgttrs.f	dlarfg.f	dormhr.f	dsterf.f
-ddisna.f	dgtts2.f	dlarfgp.f	dorml2.f	dstev.f
-dgbbrd.f	dhgeqz.f	dlarft.f	dormlq.f	dstevd.f
-dgbcon.f	dhsein.f	dlarfx.f	dormql.f	dstevr.f
-dgbequ.f	dhseqr.f	dlargv.f	dormqr.f	dstevx.f
-dgbequb.f	disnan.f	dlarnv.f	dormr2.f	dsycon.f
-dgbrfs.f	dlabad.f	dlarra.f	dormr3.f	dsyconv.f
-dgbsv.f		dlabrd.f	dlarrb.f	dormrq.f	dsyequb.f
-dgbsvx.f	dlacn2.f	dlarrc.f	dormrz.f	dsyev.f
-dgbtf2.f	dlacon.f	dlarrd.f	dormtr.f	dsyevd.f
-dgbtrf.f	dlacpy.f	dlarre.f	dpbcon.f	dsyevr.f
-dgbtrs.f	dladiv.f	dlarrf.f	dpbequ.f	dsyevx.f
-dgebak.f	dlae2.f		dlarrj.f	dpbrfs.f	dsygs2.f
-dgebal.f	dlaebz.f	dlarrk.f	dpbstf.f	dsygst.f
-dgebd2.f	dlaed0.f	dlarrr.f	dpbsv.f		dsygv.f
-dgebrd.f	dlaed1.f	dlarrv.f	dpbsvx.f	dsygvd.f
-dgecon.f	dlaed2.f	dlarscl2.f	dpbtf2.f	dsygvx.f
-dgeequ.f	dlaed3.f	dlartg.f	dpbtrf.f	dsyrfs.f
-dgeequb.f	dlaed4.f	dlartgp.f	dpbtrs.f	dsysv.f
-dgees.f		dlaed5.f	dlartgs.f	dpftrf.f	dsysvx.f
-dgeesx.f	dlaed6.f	dlartv.f	dpftri.f	dsyswapr.f
-dgeev.f		dlaed7.f	dlaruv.f	dpftrs.f	dsytd2.f
-dgeevx.f	dlaed8.f	dlarz.f		dpocon.f	dsytf2.f
-dgegs.f		dlaed9.f	dlarzb.f	dpoequ.f	dsytrd.f
-dgegv.f		dlaeda.f	dlarzt.f	dpoequb.f	dsytrf.f
-dgehd2.f	dlaein.f	dlas2.f		dporfs.f	dsytri.f
-dgehrd.f	dlaev2.f	dlascl.f	dposv.f		dsytri2.f
-dgejsv.f	dlaexc.f	dlascl2.f	dposvx.f	dsytri2x.f
-dgelq2.f	dlag2.f		dlasd0.f	dpotf2.f	dsytrs.f
-dgelqf.f	dlags2.f	dlasd1.f	dpotrf.f	dsytrs2.f
-dgels.f		dlagtf.f	dlasd2.f	dpotri.f	dtbcon.f
-dgelsd.f	dlagtm.f	dlasd3.f	dpotrs.f	dtbrfs.f
-dgelss.f	dlagts.f	dlasd4.f	dppcon.f	dtbtrs.f
-dgelsx.f	dlagv2.f	dlasd5.f	dppequ.f	dtfsm.f
-dgelsy.f	dlahqr.f	dlasd6.f	dpprfs.f	dtftri.f
-dgemqrt.f	dlahr2.f	dlasd7.f	dppsv.f		dtfttp.f
-dgeql2.f	dlahrd.f	dlasd8.f	dppsvx.f	dtfttr.f
-dgeqlf.f	dlaic1.f	dlasda.f	dpptrf.f	dtgevc.f
-dgeqp3.f	dlaisnan.f	dlasdq.f	dpptri.f	dtgex2.f
-dgeqpf.f	dlaln2.f	dlasdt.f	dpptrs.f	dtgexc.f
-dgeqr2.f	dlals0.f	dlaset.f	dpstf2.f	dtgsen.f
-dgeqr2p.f	dlalsa.f	dlasq1.f	dpstrf.f	dtgsja.f
-dgeqrf.f	dlalsd.f	dlasq2.f	dptcon.f	dtgsna.f
-dgeqrfp.f	dlamrg.f	dlasq3.f	dpteqr.f	dtgsy2.f
-dgeqrt.f	dlaneg.f	dlasq4.f	dptrfs.f	dtgsyl.f
-dgeqrt2.f	dlangb.f	dlasq5.f	dptsv.f		dtpcon.f
-dgeqrt3.f	dlange.f	dlasq6.f	dptsvx.f	dtpmqrt.f
-dgerfs.f	dlangt.f	dlasr.f		dpttrf.f	dtpqrt.f
-dgerq2.f	dlanhs.f	dlasrt.f	dpttrs.f	dtpqrt2.f
-dgerqf.f	dlansb.f	dlassq.f	dptts2.f	dtprfb.f
-dgesc2.f	dlansf.f	dlasv2.f	drscl.f		dtprfs.f
-dgesdd.f	dlansp.f	dlaswp.f	dsbev.f		dtptri.f
-dgesv.f		dlanst.f	dlasy2.f	dsbevd.f	dtptrs.f
-dgesvd.f	dlansy.f	dlasyf.f	dsbevx.f	dtpttf.f
-dgesvj.f	dlantb.f	dlatbs.f	dsbgst.f	dtpttr.f
-dgesvx.f	dlantp.f	dlatdf.f	dsbgv.f		dtrcon.f
-dgetc2.f	dlantr.f	dlatps.f	dsbgvd.f	dtrevc.f
-dgetf2.f	dlanv2.f	dlatrd.f	dsbgvx.f	dtrexc.f
-dgetrf.f	dlapll.f	dlatrs.f	dsbtrd.f	dtrrfs.f
-dgetri.f	dlapmr.f	dlatrz.f	dsfrk.f		dtrsen.f
-dgetrs.f	dlapmt.f	dlatzm.f	dspcon.f	dtrsna.f
-dggbak.f	dlapy2.f	dlauu2.f	dspev.f		dtrsyl.f
-dggbal.f	dlapy3.f	dlauum.f	dspevd.f	dtrti2.f
-dgges.f		dlaqgb.f	dopgtr.f	dspevx.f	dtrtri.f
-dggesx.f	dlaqge.f	dopmtr.f	dspgst.f	dtrtrs.f
-dggev.f		dlaqp2.f	dorbdb.f	dspgv.f		dtrttf.f
-dggevx.f	dlaqps.f	dorcsd.f	dspgvd.f	dtrttp.f
-dggglm.f	dlaqr0.f	dorg2l.f	dspgvx.f	dtzrqf.f
-dgghrd.f	dlaqr1.f	dorg2r.f	dsprfs.f	dtzrzf.f
-dgglse.f	dlaqr2.f	dorgbr.f	dspsv.f		ieeeck.f
-dggqrf.f	dlaqr3.f	dorghr.f	dspsvx.f	iladlc.f
-dggrqf.f	dlaqr4.f	dorgl2.f	dsptrd.f	iladlr.f
-dggsvd.f	dlaqr5.f	dorglq.f	dsptrf.f	ilaenv.f
-dggsvp.f	dlaqsb.f	dorgql.f	dsptri.f	ilaprec.f
-dgsvj0.f	dlaqsp.f	dorgqr.f	dsptrs.f	ilatrans.f
-dgsvj1.f	dlaqsy.f	dorgr2.f	dstebz.f	ilaver.f
-dgtcon.f	dlaqtr.f	dorgrq.f	dstedc.f	iparmq.f
-dgtrfs.f	dlar1v.f	dorgtr.f	dstegr.f
-dgtsv.f		dlar2v.f	dorm2l.f	dstein.f
-
-cmplx.f is the concatenation of
-
-dzsum1.f ilazlc.f ilazlr.f izmax1.f zbdsqr.f
-zdrscl.f zgebak.f zgebal.f zgebd2.f zgebrd.f
-zgecon.f zgeev.f  zgehd2.f zgehrd.f zgelq2.f
-zgelqf.f zgelsd.f zgeqp3.f zgeqr2.f zgeqrf.f
-zgesdd.f zgesv.f  zgesvd.f zgetf2.f zgetrf.f
-zgetrs.f zheev.f  zhetd2.f zhetrd.f zhseqr.f
-zlabrd.f zlacgv.f zlacn2.f zlacp2.f zlacpy.f
-zlacrm.f zladiv.f zlahqr.f zlahr2.f zlahrd.f
-zlals0.f zlalsa.f zlalsd.f zlange.f zlanhe.f
-zlanhs.f zlantr.f zlaqp2.f zlaqps.f zlaqr0.f
-zlaqr1.f zlaqr2.f zlaqr3.f zlaqr4.f zlaqr5.f
-zlarcm.f zlarf.f  zlarfb.f zlarfg.f zlarft.f
-zlarfx.f zlartg.f zlascl.f zlaset.f zlasr.f
-zlassq.f zlaswp.f zlatrd.f zlatrs.f zpotf2.f
-zpotrf.f zrot.f   zsteqr.f ztrcon.f ztrevc.f
-ztrexc.f ztrtrs.f zung2l.f zung2r.f zungbr.f
-zunghr.f zungl2.f zunglq.f zungql.f zungqr.f
-zungr2.f zungrq.f zungtr.f zunm2r.f zunmbr.f
-zunmhr.f zunml2.f zunmlq.f zunmqr.f
-
-R.patch suppresses warnings with Fortran array-bounds checking.
diff -Nru r-base-3.2.3/src/modules/lapack/R.patch r-base-3.3.1/src/modules/lapack/R.patch
--- r-base-3.2.3/src/modules/lapack/R.patch	2014-03-12 23:03:24.000000000 +0000
+++ r-base-3.3.1/src/modules/lapack/R.patch	2016-03-16 23:04:26.000000000 +0000
@@ -1,7 +1,6 @@
-diff -u keep/dlapack.f ./dlapack.f
---- keep/dlapack.f	2013-11-25 09:13:35.000000000 +0000
-+++ ./dlapack.f	2013-11-25 09:21:56.000000000 +0000
-@@ -21126,7 +21126,8 @@
+--- dlapack.f.orig	2015-12-30 12:37:21.000000000 +0000
++++ dlapack.f	2015-12-30 12:42:25.000000000 +0000
+@@ -19077,7 +19077,8 @@
  *
  *        Compute Householder transform when N=1
  *
@@ -11,149 +10,14 @@
  *         
        ELSE
  *
-diff -u keep/cmplx.f ./cmplx.f
---- keep/cmplx.f	2013-11-25 09:09:10.000000000 +0000
-+++ ./cmplx.f	2013-11-25 09:11:47.000000000 +0000
-@@ -6048,24 +6048,24 @@
+--- dlamch.f.orig	2015-11-15 20:33:40.000000000 +0000
++++ dlamch.f	2016-01-01 08:33:45.000000000 +0000
+@@ -69,7 +69,7 @@
+ *     November 2015
+ *
+ *     .. Scalar Arguments ..
+-      CHARACTER          CMACH
++      CHARACTER*1        CMACH
+ *     ..
  *
-             MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
- *           Compute space needed for ZGEQRF
--            CALL ZGEQRF( M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
--            LWORK_ZGEQRF=DUM(1)
-+            CALL ZGEQRF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZGEQRF=CDUM(1)
- *           Compute space needed for ZUNGQR
--            CALL ZUNGQR( M, N, N, A, LDA, DUM(1), DUM(1), -1, IERR )
--            LWORK_ZUNGQR_N=DUM(1)
--            CALL ZUNGQR( M, M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
--            LWORK_ZUNGQR_M=DUM(1)
-+            CALL ZUNGQR( M, N, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZUNGQR_N=CDUM(1)
-+            CALL ZUNGQR( M, M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZUNGQR_M=CDUM(1)
- *           Compute space needed for ZGEBRD
--            CALL ZGEBRD( N, N, A, LDA, S, DUM(1), DUM(1),
--     $                   DUM(1), DUM(1), -1, IERR )
--            LWORK_ZGEBRD=DUM(1)
-+            CALL ZGEBRD( N, N, A, LDA, S, DUM(1), CDUM(1),
-+     $                   CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZGEBRD=CDUM(1)
- *           Compute space needed for ZUNGBR
--            CALL ZUNGBR( 'P', N, N, N, A, LDA, DUM(1),
--     $                   DUM(1), -1, IERR )
--            LWORK_ZUNGBR_P=DUM(1)
--            CALL ZUNGBR( 'Q', N, N, N, A, LDA, DUM(1),
--     $                   DUM(1), -1, IERR )
--            LWORK_ZUNGBR_Q=DUM(1)
-+            CALL ZUNGBR( 'P', N, N, N, A, LDA, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+            LWORK_ZUNGBR_P=CDUM(1)
-+            CALL ZUNGBR( 'Q', N, N, N, A, LDA, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+            LWORK_ZUNGBR_Q=CDUM(1)
- *
-             IF( M.GE.MNTHR ) THEN
-                IF( WNTUN ) THEN
-@@ -6170,20 +6170,20 @@
- *
- *              Path 10 (M at least N, but not much larger)
- *
--               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), DUM(1),
--     $                   DUM(1), DUM(1), -1, IERR )
--               LWORK_ZGEBRD=DUM(1)
-+               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
-+     $                   CDUM(1), CDUM(1), -1, IERR )
-+               LWORK_ZGEBRD=CDUM(1)
-                MAXWRK = 2*N + LWORK_ZGEBRD
-                IF( WNTUS .OR. WNTUO ) THEN
--                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, DUM(1),
--     $                   DUM(1), -1, IERR )
--                  LWORK_ZUNGBR_Q=DUM(1)
-+                  CALL ZUNGBR( 'Q', M, N, N, A, LDA, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+                  LWORK_ZUNGBR_Q=CDUM(1)
-                   MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
-                END IF
-                IF( WNTUA ) THEN
--                  CALL ZUNGBR( 'Q', M, M, N, A, LDA, DUM(1),
--     $                   DUM(1), -1, IERR )
--                  LWORK_ZUNGBR_Q=DUM(1)
-+                  CALL ZUNGBR( 'Q', M, M, N, A, LDA, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+                  LWORK_ZUNGBR_Q=CDUM(1)
-                   MAXWRK = MAX( MAXWRK, 2*N+LWORK_ZUNGBR_Q )
-                END IF
-                IF( .NOT.WNTVN ) THEN
-@@ -6197,25 +6197,26 @@
- *
-             MNTHR = ILAENV( 6, 'ZGESVD', JOBU // JOBVT, M, N, 0, 0 )
- *           Compute space needed for ZGELQF
--            CALL ZGELQF( M, N, A, LDA, DUM(1), DUM(1), -1, IERR )
--            LWORK_ZGELQF=DUM(1)
-+            CALL ZGELQF( M, N, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZGELQF=CDUM(1)
- *           Compute space needed for ZUNGLQ
--            CALL ZUNGLQ( N, N, M, DUM(1), N, DUM(1), DUM(1), -1, IERR )
--            LWORK_ZUNGLQ_N=DUM(1)
--            CALL ZUNGLQ( M, N, M, A, LDA, DUM(1), DUM(1), -1, IERR )
--            LWORK_ZUNGLQ_M=DUM(1)
-+            CALL ZUNGLQ( N, N, M, CDUM(1), N, CDUM(1), CDUM(1), -1,
-+     $                  IERR )
-+            LWORK_ZUNGLQ_N=CDUM(1)
-+            CALL ZUNGLQ( M, N, M, A, LDA, CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZUNGLQ_M=CDUM(1)
- *           Compute space needed for ZGEBRD
--            CALL ZGEBRD( M, M, A, LDA, S, DUM(1), DUM(1),
--     $                   DUM(1), DUM(1), -1, IERR )
--            LWORK_ZGEBRD=DUM(1)
-+            CALL ZGEBRD( M, M, A, LDA, S, DUM(1), CDUM(1),
-+     $                   CDUM(1), CDUM(1), -1, IERR )
-+            LWORK_ZGEBRD=CDUM(1)
- *            Compute space needed for ZUNGBR P
--            CALL ZUNGBR( 'P', M, M, M, A, N, DUM(1),
--     $                   DUM(1), -1, IERR )
--            LWORK_ZUNGBR_P=DUM(1)
-+            CALL ZUNGBR( 'P', M, M, M, A, N, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+            LWORK_ZUNGBR_P=CDUM(1)
- *           Compute space needed for ZUNGBR Q
--            CALL ZUNGBR( 'Q', M, M, M, A, N, DUM(1),
--     $                   DUM(1), -1, IERR )
--            LWORK_ZUNGBR_Q=DUM(1)
-+            CALL ZUNGBR( 'Q', M, M, M, A, N, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+            LWORK_ZUNGBR_Q=CDUM(1)
-             IF( N.GE.MNTHR ) THEN
-                IF( WNTVN ) THEN
- *
-@@ -6319,21 +6320,21 @@
- *
- *              Path 10t(N greater than M, but not much larger)
- *
--               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), DUM(1),
--     $                   DUM(1), DUM(1), -1, IERR )
--               LWORK_ZGEBRD=DUM(1)
-+               CALL ZGEBRD( M, N, A, LDA, S, DUM(1), CDUM(1),
-+     $                   CDUM(1), CDUM(1), -1, IERR )
-+               LWORK_ZGEBRD=CDUM(1)
-                MAXWRK = 2*M + LWORK_ZGEBRD
-                IF( WNTVS .OR. WNTVO ) THEN
- *                Compute space needed for ZUNGBR P
--                 CALL ZUNGBR( 'P', M, N, M, A, N, DUM(1),
--     $                   DUM(1), -1, IERR )
--                 LWORK_ZUNGBR_P=DUM(1)
-+                 CALL ZUNGBR( 'P', M, N, M, A, N, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+                 LWORK_ZUNGBR_P=CDUM(1)
-                  MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
-                END IF
-                IF( WNTVA ) THEN
--                 CALL ZUNGBR( 'P', N,  N, M, A, N, DUM(1),
--     $                   DUM(1), -1, IERR )
--                 LWORK_ZUNGBR_P=DUM(1)
-+                 CALL ZUNGBR( 'P', N,  N, M, A, N, CDUM(1),
-+     $                   CDUM(1), -1, IERR )
-+                 LWORK_ZUNGBR_P=CDUM(1)
-                  MAXWRK = MAX( MAXWRK, 2*M+LWORK_ZUNGBR_P )
-                END IF
-                IF( .NOT.WNTUN ) THEN
+ * =====================================================================
diff -Nru r-base-3.2.3/src/modules/X11/devX11.c r-base-3.3.1/src/modules/X11/devX11.c
--- r-base-3.2.3/src/modules/X11/devX11.c	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/src/modules/X11/devX11.c	2016-03-16 23:04:24.000000000 +0000
@@ -1481,7 +1481,7 @@
     attributes.border_pixel = blackpixel;
     attributes.backing_store = Always;
     attributes.event_mask = ButtonPressMask 
-      | ButtonMotionMask 
+      | PointerMotionMask 
       | PointerMotionHintMask
       | ButtonReleaseMask
       | ExposureMask
@@ -1695,15 +1695,15 @@
 	if(alreadyCreated == 0) {
 	    XSelectInput(display, xd->window,
 			 ExposureMask | ButtonPressMask | StructureNotifyMask 
-			 | ButtonReleaseMask | ButtonMotionMask  
+			 | ButtonReleaseMask | PointerMotionMask  
                          | PointerMotionHintMask | KeyPressMask);
 	    XMapWindow(display, xd->window);
 	    XSync(display, 0);
 
-	    /* Gobble expose events */
+	    /* Gobble MapNotify events */
 
 	    while ( XPeekEvent(display, &event),
-		    !XCheckTypedEvent(display, Expose, &event))
+		    !XCheckTypedEvent(display, MapNotify, &event))
 		;
 	    /* XNextEvent(display, &event);
 	       if (event.xany.type == Expose) {
@@ -2611,6 +2611,7 @@
     } else if (code == 2) {
 	XNextEvent(display, &event);
 	if (event.type == ButtonRelease || event.type == ButtonPress || event.type == MotionNotify) {
+	    int RButtons;
 	    XFindContext(display, event.xbutton.window,
 			 devPtrContext, &temp);
 	    ddEvent = (pDevDesc) temp;
@@ -2627,11 +2628,13 @@
 			event.xbutton.x = winX;
 			event.xbutton.y = winY;
 		    }
-		}
+		    RButtons = mask >> 8;  /* See PR#16700 */
+		} else
+		    RButtons = 1 << (event.xbutton.button - 1);
 		if (!done) {
         	    doMouseEvent(dd, event.type == ButtonRelease ? meMouseUp :
         	                 event.type == ButtonPress ? meMouseDown : meMouseMove, 
-        	                 event.xbutton.button, event.xbutton.x, event.xbutton.y);
+        	                 RButtons, event.xbutton.x, event.xbutton.y);
                     XSync(display, 0);
                     done = 1;
 		}
diff -Nru r-base-3.2.3/src/modules/X11/Makefile.in r-base-3.3.1/src/modules/X11/Makefile.in
--- r-base-3.2.3/src/modules/X11/Makefile.in	2014-07-14 22:15:10.000000000 +0000
+++ r-base-3.3.1/src/modules/X11/Makefile.in	2016-03-16 23:04:24.000000000 +0000
@@ -11,7 +11,10 @@
 
 include $(top_builddir)/Makeconf
 
-ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) $(X_CFLAGS) @CAIROX11_CPPFLAGS@ \
+## When compiling rbitmap.c it is essential that we find the
+## png.h matching BITMAP_LIBS.  Since /opt/X11 on OS X contains libpng
+## and we might want our own version, we give priority to BITMAP_*
+ALL_CPPFLAGS = @BITMAP_CPPFLAGS@ $(R_XTRA_CPPFLAGS) $(X_CFLAGS) @CAIROX11_CPPFLAGS@ \
   -I$(top_srcdir)/src/library/grDevices/src/cairo $(CPPFLAGS) $(DEFS)
 ALL_CFLAGS = $(ALL_CFLAGS_LO)
 ALL_X_LIBS = $(X_PRE_LIBS) @CAIROX11_LIBS@ $(X_LIBS) $(X_EXTRA_LIBS)
@@ -28,8 +31,9 @@
 	Makefile.in $(SOURCES) $(HEADERS) $(DE_SOURCES)
 
 R_X11_la = R_X11$(SHLIB_EXT)
+## Note that this is used after LDFLAGS, which usually contains -L flags.
 ## AIX needs LIBM
-R_X11_la_LIBADD = $(ALL_X_LIBS) @BITMAP_LIBS@ $(LIBR1) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
+R_X11_la_LIBADD = @BITMAP_LIBS@ $(ALL_X_LIBS) $(LIBR1) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
 
 R_de_la = R_de$(SHLIB_EXT)
 R_de_la_LIBADD = $(ALL_X_LIBS) $(LIBR1) $(LIBM) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
diff -Nru r-base-3.2.3/src/modules/X11/rlogo_icon.h r-base-3.3.1/src/modules/X11/rlogo_icon.h
--- r-base-3.2.3/src/modules/X11/rlogo_icon.h	2016-06-22 15:50:23.000000000 +0000
+++ r-base-3.3.1/src/modules/X11/rlogo_icon.h	2016-03-16 23:04:24.000000000 +0000
@@ -1,3 +1,22 @@
+/*
+ *  This file was produced from Rlogo.svg.
+ *  Copyright (C) 2016  The R Foundation
+ *
+ *  You can distribute the logo under the terms of the Creative
+ *  Commons Attribution-ShareAlike 4.0 International license (CC-BY-SA
+ *  4.0) or (at your option) the GNU General Public License version 2
+ *  (GPL-2).
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, a copy is available at
+ *  https://www.R-project.org/Licenses/
+ */
+ 
 unsigned long rlogo_icon[] = {
 99, 77,0x00000000,
 0x00000000,
diff -Nru r-base-3.2.3/src/modules/X11/rotated.c r-base-3.3.1/src/modules/X11/rotated.c
--- r-base-3.2.3/src/modules/X11/rotated.c	2015-09-04 22:15:12.000000000 +0000
+++ r-base-3.3.1/src/modules/X11/rotated.c	2016-03-16 23:04:24.000000000 +0000
@@ -20,6 +20,7 @@
  * BEWARE: function arguments have CHANGED since version 2.0!!
  *
  * Protoized (ANSI C, no longer old K&R C):  Martin Maechler, R core team.
+ * float -> double
  */
 
 /* The version for R 2.1.0 is based on patches by
@@ -350,7 +351,7 @@
     Pixmap bitmap_to_paint;
 
     /* return early for NULL/empty strings */
-    if(text==NULL || *text=='\0')
+    if(text==NULL || *text=='\0') // R change in original R version
 	return 0;
 
     if(strlen(text)==0)
@@ -376,6 +377,7 @@
 	return 0;
 
     /* this gc has similar properties to the user's gc */
+    // GCClipMask added in r6259 for clipping
     my_gc=XCreateGC(dpy, drawable, (unsigned long)0, 0);
     XCopyGC(dpy, gc, GCForeground|GCBackground|GCFunction|GCPlaneMask
 	    |GCClipMask,
@@ -386,23 +388,24 @@
 
     /* y position */
     if(align==TLEFT || align==TCENTRE || align==TRIGHT)
-	hot_y=(double)item->rows_in/2*style.magnify;
+	hot_y=item->rows_in/2.*style.magnify;
     else if(align==MLEFT || align==MCENTRE || align==MRIGHT)
 	hot_y=0;
     else if(align==BLEFT || align==BCENTRE || align==BRIGHT)
-	hot_y= -(double)item->rows_in/2*style.magnify;
+	hot_y= -item->rows_in/2.*style.magnify;
     else
-	hot_y= -((double)item->rows_in/2-(double)font->descent)*style.magnify;
+	hot_y= -(item->rows_in/2.-font->descent)*style.magnify;
 
     /* x position */
     if(align==TLEFT || align==MLEFT || align==BLEFT || align==NONE)
-	hot_x= -(double)item->max_width/2*style.magnify;
+	hot_x= -item->max_width/2.*style.magnify;
     else if(align==TCENTRE || align==MCENTRE || align==BCENTRE)
 	hot_x=0;
     else
-	hot_x=(double)item->max_width/2*style.magnify;
+	hot_x=item->max_width/2.*style.magnify;
 
     /* pre-calculate sin and cos */
+    // rounding added in original R version
     sin_angle = myround(sin(angle)*1000.0) / 1000.0;
     cos_angle = myround(cos(angle)*1000.0) / 1000.0;
 
@@ -423,10 +426,10 @@
 
 	/* rotate corner positions */
 	for(i=0; i<4*item->nl; i++) {
-	    xpoints[i].x=(double)x + ( (item->corners_x[i]-hot_x)*cos_angle +
-				      (item->corners_y[i]+hot_y)*sin_angle);
-	    xpoints[i].y=(double)y + (-(item->corners_x[i]-hot_x)*sin_angle +
-				      (item->corners_y[i]+hot_y)*cos_angle);
+	    xpoints[i].x=(short)(x + ( (item->corners_x[i]-hot_x)*cos_angle +
+					(item->corners_y[i]+hot_y)*sin_angle));
+	    xpoints[i].y=(short)(y + (-(item->corners_x[i]-hot_x)*sin_angle +
+				      (item->corners_y[i]+hot_y)*cos_angle));
 	}
 
 	/* we want to swap foreground and background colors here;
@@ -451,8 +454,8 @@
     }
 
     /* where should top left corner of bitmap go ? */
-    xp=(double)x-((double)item->cols_out/2 +hot_xp);
-    yp=(double)y-((double)item->rows_out/2 -hot_yp);
+    xp=(short)(x - item->cols_out/2. + hot_xp);
+    yp=(short)(y - item->rows_out/2. - hot_yp);
 
     /* by default we draw the rotated bitmap, solid */
     bitmap_to_paint=item->bitmap;
@@ -584,13 +587,14 @@
     int dir, asc, desc;
     XCharStruct overall;
 
-    if (text == NULL || *text=='\0') {
+    if (text == NULL || *text=='\0') {  // addition in original R version
       DEBUG_PRINT1("Empty string, ignoring\n");
       return 0;
     }
 
     /* this gc has similar properties to the user's gc (including stipple) */
     my_gc=XCreateGC(dpy, drawable, (unsigned long)0, 0);
+    // GCClipMask added in r6259 for clipping
     XCopyGC(dpy, gc,
 	    GCForeground|GCBackground|GCFunction|GCStipple|GCFillStyle|
 	    GCTileStipXOrigin|GCTileStipYOrigin|GCPlaneMask|GCClipMask, my_gc);
@@ -598,7 +602,7 @@
 
     /* count number of sections in string */
     if(align!=NONE)
-	for(i=strlen(text)-2; i >= 0; i--)
+	for(i=(int)strlen(text)-2; i >= 0; i--)
 	    if(text[i]=='\n')
 		nl++;
 
@@ -629,7 +633,7 @@
 
     /* loop through each section in the string */
     do {
-	XTextExtents(font, str3, strlen(str3), &dir, &asc, &desc,
+	XTextExtents(font, str3, (int)strlen(str3), &dir, &asc, &desc,
 		     &overall);
 
 	/* where to draw section in x ? */
@@ -642,9 +646,9 @@
 
 	/* draw string onto bitmap */
 	if(!bg)
-	    XDrawString(dpy, drawable, my_gc, xp, yp, str3, strlen(str3));
+	    XDrawString(dpy, drawable, my_gc, xp, yp, str3, (int)strlen(str3));
 	else
-	    XDrawImageString(dpy, drawable, my_gc, xp, yp, str3, strlen(str3));
+	    XDrawImageString(dpy, drawable, my_gc, xp, yp, str3, (int)strlen(str3));
 
 	/* move to next line */
 	yp+=height;
@@ -846,7 +850,7 @@
     /* count number of sections in string */
     item->nl=1;
     if(align!=NONE)
-	for(i=strlen(text)-2; i >= 0; i--)
+	for(i=(int)strlen(text)-2; i >= 0; i--)
 	    if(text[i]=='\n')
 		item->nl++;
 
@@ -865,7 +869,7 @@
 
     str3=strtok(str1, str2);
 
-    XTextExtents(font, str3, strlen(str3), &dir, &asc, &desc,
+    XTextExtents(font, str3, (int)strlen(str3), &dir, &asc, &desc,
 		 &overall);
 
     item->max_width=overall.rbearing;
@@ -875,7 +879,7 @@
 	str3=strtok((char *)NULL, str2);
 
 	if(str3!=NULL) {
-	    XTextExtents(font, str3, strlen(str3), &dir, &asc, &desc,
+	    XTextExtents(font, str3, (int)strlen(str3), &dir, &asc, &desc,
 			 &overall);
 
 	    if(overall.rbearing>item->max_width)
@@ -893,7 +897,9 @@
     item->cols_in=item->max_width;
     item->rows_in=item->nl*height;
 
-    /* fudge in case one of the above is zero: */
+    /* fudge in case one of the above is zero: 
+       for " ", r8300
+     */
     if (!item->cols_in) item->cols_in=1;
     if (!item->rows_in) item->rows_in=1;
 
@@ -948,7 +954,7 @@
 
     /* loop through each section in the string */
     do {
-	XTextExtents(font, str3, strlen(str3), &dir, &asc, &desc,
+	XTextExtents(font, str3, (int)strlen(str3), &dir, &asc, &desc,
 		     &overall);
 
 	/* where to draw section in x ? */
@@ -960,16 +966,15 @@
 	    xp=item->max_width-overall.rbearing;
 
 	/* draw string onto bitmap */
-	XDrawString(dpy, canvas, font_gc, xp, yp, str3, strlen(str3));
+	XDrawString(dpy, canvas, font_gc, xp, yp, str3, (int)strlen(str3));
 
 	/* keep a note of corner positions of this string */
-	item->corners_x[ic]=((double)xp-(double)item->cols_in/2)*style.magnify;
-	item->corners_y[ic]=((double)(yp-font->ascent)-(double)item->rows_in/2)
-	    *style.magnify;
+	item->corners_x[ic]=(xp-item->cols_in/2.)*style.magnify;
+	item->corners_y[ic]=(yp-font->ascent-item->rows_in/2.) *style.magnify;
 	item->corners_x[ic+1]=item->corners_x[ic];
-	item->corners_y[ic+1]=item->corners_y[ic]+(double)height*style.magnify;
+	item->corners_y[ic+1]=item->corners_y[ic]+height*style.magnify;
 	item->corners_x[item->nl*4-1-ic]=item->corners_x[ic]+
-	    (double)overall.rbearing*style.magnify;
+	    overall.rbearing*style.magnify;
 	item->corners_y[item->nl*4-1-ic]=item->corners_y[ic];
 	item->corners_x[item->nl*4-2-ic]=
 	    item->corners_x[item->nl*4-1-ic];
@@ -1006,16 +1011,16 @@
 
 	old_cols_in=item->cols_in;
 	old_rows_in=item->rows_in;
-	item->cols_in=(double)item->cols_in*style.magnify;
-	item->rows_in=(double)item->rows_in*style.magnify;
+	item->cols_in=(int)(item->cols_in*style.magnify);
+	item->rows_in=(int)(item->rows_in*style.magnify);
     }
 
     /* how big will rotated text be ? */
-    item->cols_out=fabs((double)item->rows_in*sin_angle) +
-	fabs((double)item->cols_in*cos_angle) +0.99999 +2;
+    item->cols_out=(int)(fabs(item->rows_in*sin_angle) +
+			 fabs(item->cols_in*cos_angle) +0.99999 +2);
 
-    item->rows_out=fabs((double)item->rows_in*cos_angle) +
-	fabs((double)item->cols_in*sin_angle) +0.99999 +2;
+    item->rows_out=(int)(fabs(item->rows_in*cos_angle) +
+			 fabs(item->cols_in*sin_angle) +0.99999 +2);
 
     if(item->cols_out%2==0)
 	item->cols_out++;
@@ -1040,32 +1045,33 @@
        a bit over-the-top */
 
     /* vertical distance from centre */
-    dj=0.5-(double)item->rows_out/2;
+    dj=0.5-item->rows_out/2.;
 
     /* where abouts does text actually lie in rotated image? */
     /* check angle within 0.5 degrees (0.008 radians) */
-    if(fabs((double)angle)<0.008 || fabs((double)angle-M_PI/2)<0.008 ||
-       fabs((double)angle-M_PI)<0.008 || fabs((double)angle-3*M_PI/2)<0.008) {
+    // This tolerance is in first R version, but not original
+    if(fabs(angle)<0.008 || fabs(angle-M_PI/2)<0.008 ||
+       fabs(angle-M_PI)<0.008 || fabs(angle-3*M_PI/2)<0.008) {
 	xl=0;
 	xr=(double)item->cols_out;
 	xinc=0;
     }
     else if(angle<M_PI) {
-	xl=(double)item->cols_out/2+
-	    (dj-(double)item->rows_in/(2*cos_angle))/
-	    tan(angle)-2;
-	xr=(double)item->cols_out/2+
-	    (dj+(double)item->rows_in/(2*cos_angle))/
+	xl=item->cols_out/2.+
+	    (dj-item->rows_in/(2.*cos_angle))/
+	    tan(angle)-2.;
+	xr=item->cols_out/2.+
+	    (dj+item->rows_in/(2.*cos_angle))/
 	    tan(angle)+2;
 	xinc=1./tan(angle);
     }
     else {
-	xl=(double)item->cols_out/2+
-	    (dj+(double)item->rows_in/(2*cos_angle))/
-	    tan(angle)-2;
-	xr=(double)item->cols_out/2+
-	    (dj-(double)item->rows_in/(2*cos_angle))/
-	    tan(angle)+2;
+	xl=item->cols_out/2.+
+	    (dj+item->rows_in/(2.*cos_angle))/
+	    tan(angle)-2.;
+	xr=item->cols_out/2.+
+	    (dj-item->rows_in/(2.*cos_angle))/
+	    tan(angle)+2.;
 
 	xinc=1./tan(angle);
     }
@@ -1074,7 +1080,7 @@
     for(j=0; j<item->rows_out; j++) {
 
 	/* no point re-calculating these every pass */
-	di=(double)((xl<0)?0:(int)xl)+0.5-(double)item->cols_out/2;
+	di=(double)((xl<0)?0:(int)xl)+0.5-item->cols_out/2.;
 	byte_out=(item->rows_out-j-1)*byte_w_out;
 
 	/* loop through meaningful columns */
@@ -1082,10 +1088,11 @@
 	    i<((xr>=item->cols_out)?item->cols_out:(int)xr); i++) {
 
 	    /* rotate coordinates */
-	    itd=(double)item->cols_in/2 + ( di*cos_angle + dj*sin_angle);
-	    jtd=(double)item->rows_in/2 - (-di*sin_angle + dj*cos_angle);
-	    it = itd - (itd < 0); /* (int) -0.5 == 0 */
-	    jt = jtd - (jtd < 0);
+	    // Using [ij]td is r6635
+	    itd=item->cols_in/2. + ( di*cos_angle + dj*sin_angle);
+	    jtd=item->rows_in/2. - (-di*sin_angle + dj*cos_angle);
+	    it = (int)(itd - (itd < 0)); /* (int) -0.5 == 0 */
+	    jt = (int)(jtd - (jtd < 0));
 
 	    /* set pixel if required */
 	    if(it>=0 && it<item->cols_in && jt>=0 && jt<item->rows_in)
@@ -1154,11 +1161,11 @@
     /* this is pretty much the size of a RotatedTextItem */
 
     item->size=((item->cols_out-1)/8+1)*item->rows_out +
-	sizeof(XImage) + strlen(item->text) +
+	sizeof(XImage) + (int)strlen(item->text) +
 	item->nl*8*sizeof(double) + sizeof(RotatedTextItem);
 
     if(item->font_name!=NULL)
-	item->size+=strlen(item->font_name);
+	item->size+=(int)strlen(item->font_name);
     else
 	item->size+=sizeof(Font);
 
@@ -1288,8 +1295,8 @@
     rows_in=ximage->height;
 
     /* size of final image */
-    cols_out=(double)cols_in*style.magnify;
-    rows_out=(double)rows_in*style.magnify;
+    cols_out=(int)(cols_in*style.magnify);
+    rows_out=(int)(rows_in*style.magnify);
 
     /* this will hold final image */
     I_out=MakeXImage(dpy, cols_out, rows_out);
@@ -1308,10 +1315,10 @@
     /* loop over magnified image */
     for(j2=0; j2<rows_out; j2++) {
 	x=0;
-	j=y;
+	j=(int)y;
 
 	for(i2=0; i2<cols_out; i2++) {
-	    i=x;
+	    i=(int)x;
 
 	    /* bilinear interpolation - where are we on bitmap ? */
 	    /* right edge */
@@ -1408,7 +1415,7 @@
     /* count number of sections in string */
     nl=1;
     if(align!=NONE)
-	for(i=strlen(text)-2; i >= 0; i--)
+	for(i=(int)strlen(text)-2; i >= 0; i--)
 	    if(text[i]=='\n')
 		nl++;
 
@@ -1425,7 +1432,7 @@
 
     str3=strtok(str1, str2);
 
-    XTextExtents(font, str3, strlen(str3), &dir, &asc, &desc,
+    XTextExtents(font, str3, (int)strlen(str3), &dir, &asc, &desc,
 		 &overall);
 
     max_width=overall.rbearing;
@@ -1435,7 +1442,7 @@
 	str3=strtok((char *)NULL, str2);
 
 	if(str3!=NULL) {
-	    XTextExtents(font, str3, strlen(str3), &dir, &asc, &desc,
+	    XTextExtents(font, str3, (int)strlen(str3), &dir, &asc, &desc,
 			 &overall);
 
 	    if(overall.rbearing>max_width)
@@ -1459,21 +1466,21 @@
 
     /* y position */
     if(align==TLEFT || align==TCENTRE || align==TRIGHT)
-	hot_y=(double)rows_in/2*style.magnify;
+	hot_y=rows_in/2.*style.magnify;
     else if(align==MLEFT || align==MCENTRE || align==MRIGHT)
 	hot_y=0;
     else if(align==BLEFT || align==BCENTRE || align==BRIGHT)
-	hot_y= -(double)rows_in/2*style.magnify;
+	hot_y= -rows_in/2.*style.magnify;
     else
-	hot_y= -((double)rows_in/2-(double)font->descent)*style.magnify;
+	hot_y= -(rows_in/2.- font->descent)*style.magnify;
 
     /* x position */
     if(align==TLEFT || align==MLEFT || align==BLEFT || align==NONE)
-	hot_x= -(double)max_width/2*style.magnify;
+	hot_x= -max_width/2.*style.magnify;
     else if(align==TCENTRE || align==MCENTRE || align==BCENTRE)
 	hot_x=0;
     else
-	hot_x=(double)max_width/2*style.magnify;
+	hot_x=max_width/2.*style.magnify;
 
     /* reserve space for XPoints */
     xp_in=(XPoint *)malloc((unsigned)(5*sizeof(XPoint)));
@@ -1487,23 +1494,23 @@
     }
 
     /* bounding box when horizontal, relative to bitmap centre */
-    xp_in[0].x= -(double)cols_in*style.magnify/2-style.bbx_pad;
-    xp_in[0].y= (double)rows_in*style.magnify/2+style.bbx_pad;
-    xp_in[1].x= (double)cols_in*style.magnify/2+style.bbx_pad;
-    xp_in[1].y= (double)rows_in*style.magnify/2+style.bbx_pad;
-    xp_in[2].x= (double)cols_in*style.magnify/2+style.bbx_pad;
-    xp_in[2].y= -(double)rows_in*style.magnify/2-style.bbx_pad;
-    xp_in[3].x= -(double)cols_in*style.magnify/2-style.bbx_pad;
-    xp_in[3].y=-(double)rows_in*style.magnify/2-style.bbx_pad;
+    xp_in[0].x= -(short)(cols_in*style.magnify/2. - style.bbx_pad);
+    xp_in[0].y= (short)(rows_in*style.magnify/2. + style.bbx_pad);
+    xp_in[1].x= (short)(cols_in*style.magnify/2. + style.bbx_pad);
+    xp_in[1].y= (short)(rows_in*style.magnify/2. + style.bbx_pad);
+    xp_in[2].x= (short)(cols_in*style.magnify/2. + style.bbx_pad);
+    xp_in[2].y= -(short)(rows_in*style.magnify/2. - style.bbx_pad);
+    xp_in[3].x= -(short)(cols_in*style.magnify/2. - style.bbx_pad);
+    xp_in[3].y=-(short)(rows_in*style.magnify/2. - style.bbx_pad);
     xp_in[4].x=xp_in[0].x;
     xp_in[4].y=xp_in[0].y;
 
     /* rotate and translate bounding box */
     for(i=0; i<5; i++) {
-	xp_out[i].x=(double)x + ( ((double)xp_in[i].x-hot_x)*cos_angle +
-				  ((double)xp_in[i].y+hot_y)*sin_angle);
-	xp_out[i].y=(double)y + (-((double)xp_in[i].x-hot_x)*sin_angle +
-				 ((double)xp_in[i].y+hot_y)*cos_angle);
+	xp_out[i].x=(short)(x + ( ((double)xp_in[i].x-hot_x)*cos_angle +
+				  ((double)xp_in[i].y+hot_y)*sin_angle));
+	xp_out[i].y=(short)(y + (-((double)xp_in[i].x-hot_x)*sin_angle +
+				 ((double)xp_in[i].y+hot_y)*cos_angle));
     }
 
     free((char *)xp_in);
@@ -1663,8 +1670,8 @@
     hot_yp = hot_x*sin_angle + hot_y*cos_angle;
 
     /* where should top left corner of bitmap go ? */
-    xp=(double)x-((double)item->cols_out/2 +hot_xp);
-    yp=(double)y-((double)item->rows_out/2 -hot_yp);
+    xp=(int)(x-((double)item->cols_out/2 +hot_xp));
+    yp=(int)(y-((double)item->rows_out/2 -hot_yp));
 
     /* by default we draw the rotated bitmap, solid */
     bitmap_to_paint=item->bitmap;
@@ -1806,8 +1813,10 @@
 	    GCTileStipXOrigin|GCTileStipYOrigin|GCPlaneMask|GCClipMask, my_gc);
 
     /* count number of sections in string */
+    // for() loop changed in r42804 
+    // (efficiency, PR#9902, avoid recalculating strlen)
     if(align!=NONE)
-	for(i=strlen(text)-2; i >= 0; i--)
+	for(i=(int)strlen(text)-2; i >= 0; i--)
 	    if(text[i]=='\n')
 		nl++;
 
@@ -1841,7 +1850,7 @@
     do {
 
 	XRectangle    r_ink, r_log;
-	XRfTextExtents(font, str3, strlen(str3), &r_ink, &r_log);
+	XRfTextExtents(font, str3, (int)strlen(str3), &r_ink, &r_log);
 
 	/* where to draw section in x ? */
 	if(align==TLEFT || align==MLEFT || align==BLEFT || align==NONE)
@@ -1852,7 +1861,7 @@
 	    xp=x-r_log.width;
 
 	/* draw string onto bitmap */
-	XRfDrawString(dpy, drawable, font, my_gc, xp, yp, str3, strlen(str3));
+	XRfDrawString(dpy, drawable, font, my_gc, xp, yp, str3, (int)strlen(str3));
 
 	/* move to next line */
 	yp+=height;
@@ -1917,6 +1926,7 @@
        angles close enough (<0.0001 here, could be smaller);
        HORIZONTAL alignment matches, OR it's a one line string;
        magnifications the same */
+    // original version had 0.00001, first R version 0.0001
 
     while(i1 && !item) {
 	/* match everything EXCEPT fontname/ID */
@@ -2055,7 +2065,7 @@
     /* count number of sections in string */
     item->nl=1;
     if(align!=NONE)
-	for(i=strlen(text)-2; i >= 0; i--)
+	for(i=(int)strlen(text)-2; i >= 0; i--)
 	    if(text[i]=='\n')
 		item->nl++;
 
@@ -2074,7 +2084,7 @@
 
     str3=strtok(str1, str2);
 
-    XRfTextExtents(font, str3, strlen(str3), &r_ink, &r_log);
+    XRfTextExtents(font, str3, (int)strlen(str3), &r_ink, &r_log);
 
     item->max_width=r_log.width;
 
@@ -2083,7 +2093,7 @@
 	str3=strtok((char *)NULL, str2);
 
 	if(str3!=NULL) {
-	  XRfTextExtents(font, str3, strlen(str3), &r_ink, &r_log);
+	  XRfTextExtents(font, str3, (int)strlen(str3), &r_ink, &r_log);
 
 	    if(r_log.width>item->max_width)
 		item->max_width=r_log.width;
@@ -2163,7 +2173,7 @@
     /* loop through each section in the string */
     do {
 	XRectangle    r_ink, r_log;
-	XRfTextExtents(font, str3, strlen(str3), &r_ink, &r_log);
+	XRfTextExtents(font, str3, (int)strlen(str3), &r_ink, &r_log);
 
 	/* where to draw section in x ? */
 	if(align==TLEFT || align==MLEFT || align==BLEFT || align==NONE)
@@ -2174,7 +2184,7 @@
 	    xp=item->max_width-r_log.width;
 
 	/* draw string onto bitmap */
-	XRfDrawString(dpy, canvas, font, font_gc, xp, yp, str3, strlen(str3));
+	XRfDrawString(dpy, canvas, font, font_gc, xp, yp, str3, (int)strlen(str3));
 
 	/* keep a note of corner positions of this string */
 	item->corners_x[ic]=((double)xp-(double)item->cols_in/2)*style.magnify;
@@ -2222,16 +2232,16 @@
 
 	old_cols_in=item->cols_in;
 	old_rows_in=item->rows_in;
-	item->cols_in=(double)item->cols_in*style.magnify;
-	item->rows_in=(double)item->rows_in*style.magnify;
+	item->cols_in=(int)(item->cols_in*style.magnify);
+	item->rows_in=(int)(item->rows_in*style.magnify);
     }
 
     /* how big will rotated text be ? */
-    item->cols_out=fabs((double)item->rows_in*sin_angle) +
-	fabs((double)item->cols_in*cos_angle) +0.99999 +2;
+    item->cols_out=(int)(fabs(item->rows_in*sin_angle) +
+			 fabs(item->cols_in*cos_angle) +0.99999 +2);
 
-    item->rows_out=fabs((double)item->rows_in*cos_angle) +
-	fabs((double)item->cols_in*sin_angle) +0.99999 +2;
+    item->rows_out=(int)(fabs(item->rows_in*cos_angle) +
+			 fabs(item->cols_in*sin_angle) +0.99999 +2);
 
     if(item->cols_out%2==0)
 	item->cols_out++;
@@ -2262,9 +2272,9 @@
 
     /* where abouts does text actually lie in rotated image? */
     /* check angle within 0.5 degrees (0.008 radians) */
-    if(fabs((double)angle)<0.008 || fabs((double)angle-M_PI/2)<0.008 ||
-       fabs((double)angle-M_PI)<0.008 || fabs((double)angle-3*M_PI/2)<0.008 ||
-       fabs((double)angle-2*M_PI)<0.008) {
+    if(fabs(angle)<0.008 || fabs(angle-M_PI/2)<0.008 ||
+       fabs(angle-M_PI)<0.008 || fabs(angle-3*M_PI/2)<0.008 ||
+       fabs(angle-2*M_PI)<0.008) {
 	xl=0;
 	xr=(double)item->cols_out;
 	xinc=0;
@@ -2303,8 +2313,8 @@
 	    /* rotate coordinates */
 	    itd=(double)item->cols_in/2 + ( di*cos_angle + dj*sin_angle);
 	    jtd=(double)item->rows_in/2 - (-di*sin_angle + dj*cos_angle);
-	    it = itd - (itd < 0); /* (int) -0.5 == 0 */
-	    jt = jtd - (jtd < 0);
+	    it = (int)(itd - (itd < 0)); /* (int) -0.5 == 0 */
+	    jt = (int)(jtd - (jtd < 0));
 
 	    /* set pixel if required */
 	    if(it>=0 && it<item->cols_in && jt>=0 && jt<item->rows_in)
@@ -2379,7 +2389,7 @@
     /* count number of sections in string */
     nl=1;
     if(align!=NONE)
-	for(i=strlen(text)-2; i >= 0; i--)
+	for(i=(int)strlen(text)-2; i >= 0; i--)
 	    if(text[i]=='\n')
 		nl++;
 
@@ -2396,7 +2406,7 @@
 
     str3=strtok(str1, str2);
 
-    XRfTextExtents(font, str3, strlen(str3), &r_ink, &r_log);
+    XRfTextExtents(font, str3, (int)strlen(str3), &r_ink, &r_log);
 
     max_width=r_log.width;
 
@@ -2405,7 +2415,7 @@
 	str3=strtok((char *)NULL, str2);
 
 	if(str3!=NULL) {
-	  XRfTextExtents(font, str3, strlen(str3), &r_ink, &r_log);
+	  XRfTextExtents(font, str3, (int)strlen(str3), &r_ink, &r_log);
 
 	    if(r_log.width>max_width)
 		max_width=r_log.width;
@@ -2458,23 +2468,23 @@
     }
 
     /* bounding box when horizontal, relative to bitmap centre */
-    xp_in[0].x= -(double)cols_in*style.magnify/2-style.bbx_pad;
-    xp_in[0].y= (double)rows_in*style.magnify/2+style.bbx_pad;
-    xp_in[1].x= (double)cols_in*style.magnify/2+style.bbx_pad;
-    xp_in[1].y= (double)rows_in*style.magnify/2+style.bbx_pad;
-    xp_in[2].x= (double)cols_in*style.magnify/2+style.bbx_pad;
-    xp_in[2].y= -(double)rows_in*style.magnify/2-style.bbx_pad;
-    xp_in[3].x= -(double)cols_in*style.magnify/2-style.bbx_pad;
-    xp_in[3].y=-(double)rows_in*style.magnify/2-style.bbx_pad;
+    xp_in[0].x= -(short)(cols_in*style.magnify/2. - style.bbx_pad);
+    xp_in[0].y= (short)(rows_in*style.magnify/2. + style.bbx_pad);
+    xp_in[1].x= (short)(cols_in*style.magnify/2. + style.bbx_pad);
+    xp_in[1].y= (short)(rows_in*style.magnify/2. + style.bbx_pad);
+    xp_in[2].x= (short)(cols_in*style.magnify/2. + style.bbx_pad);
+    xp_in[2].y= -(short)(rows_in*style.magnify/2. - style.bbx_pad);
+    xp_in[3].x= -(short)(cols_in*style.magnify/2. - style.bbx_pad);
+    xp_in[3].y=-(short)(rows_in*style.magnify/2. - style.bbx_pad);
     xp_in[4].x=xp_in[0].x;
     xp_in[4].y=xp_in[0].y;
 
     /* rotate and translate bounding box */
     for(i=0; i<5; i++) {
-	xp_out[i].x=(double)x + ( ((double)xp_in[i].x-hot_x)*cos_angle +
-				  ((double)xp_in[i].y+hot_y)*sin_angle);
-	xp_out[i].y=(double)y + (-((double)xp_in[i].x-hot_x)*sin_angle +
-				 ((double)xp_in[i].y+hot_y)*cos_angle);
+	xp_out[i].x=(short)(x + ( ((double)xp_in[i].x-hot_x)*cos_angle +
+				((double)xp_in[i].y+hot_y)*sin_angle));
+	xp_out[i].y=(short)(y + (-((double)xp_in[i].x-hot_x)*sin_angle +
+				 ((double)xp_in[i].y+hot_y)*cos_angle));
     }
 
     free((char *)xp_in);
diff -Nru r-base-3.2.3/src/nmath/bessel_i.c r-base-3.3.1/src/nmath/bessel_i.c
--- r-base-3.2.3/src/nmath/bessel_i.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/bessel_i.c	2016-03-16 23:04:21.000000000 +0000
@@ -74,7 +74,7 @@
     I_bessel(&x, &alpha, &nb, &ize, bi, &ncalc);
     if(ncalc != nb) {/* error input */
 	if(ncalc < 0)
-	    MATHLIB_WARNING4(_("bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	    MATHLIB_WARNING4(_("bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			     x, ncalc, nb, alpha);
 	else
 	    MATHLIB_WARNING2(_("bessel_i(%g,nu=%g): precision lost in result\n"),
@@ -119,7 +119,7 @@
     I_bessel(&x, &alpha, &nb, &ize, bi, &ncalc);
     if(ncalc != nb) {/* error input */
 	if(ncalc < 0)
-	    MATHLIB_WARNING4(_("bessel_i(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	    MATHLIB_WARNING4(_("bessel_i(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			     x, ncalc, nb, alpha);
 	else
 	    MATHLIB_WARNING2(_("bessel_i(%g,nu=%g): precision lost in result\n"),
diff -Nru r-base-3.2.3/src/nmath/bessel_j.c r-base-3.3.1/src/nmath/bessel_j.c
--- r-base-3.2.3/src/nmath/bessel_j.c	2015-08-25 22:18:55.000000000 +0000
+++ r-base-3.3.1/src/nmath/bessel_j.c	2016-03-16 23:04:22.000000000 +0000
@@ -61,11 +61,12 @@
 	       ((alpha      == na ) ? 0 : bessel_y(x, -alpha) * sinpi(alpha)));
     }
     else if (alpha > 1e7) {
-	MATHLIB_WARNING("besselJ(x, nu): nu=%g too large for bessel_j() algorithm", alpha);
+	MATHLIB_WARNING(_("besselJ(x, nu): nu=%g too large for bessel_j() algorithm"),
+			alpha);
 	return ML_NAN;
     }
     nb = 1 + (int)na; /* nb-1 <= alpha < nb */
-    alpha -= (double)(nb-1);
+    alpha -= (double)(nb-1); // ==> alpha' in [0, 1)
 #ifdef MATHLIB_STANDALONE
     bj = (double *) calloc(nb, sizeof(double));
     if (!bj) MATHLIB_ERROR("%s", _("bessel_j allocation error"));
@@ -76,7 +77,7 @@
     J_bessel(&x, &alpha, &nb, bj, &ncalc);
     if(ncalc != nb) {/* error input */
       if(ncalc < 0)
-	MATHLIB_WARNING4(_("bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	MATHLIB_WARNING4(_("bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			 x, ncalc, nb, alpha);
       else
 	MATHLIB_WARNING2(_("bessel_j(%g,nu=%g): precision lost in result\n"),
@@ -114,7 +115,8 @@
 	       ((alpha      == na ) ? 0 : bessel_y_ex(x, -alpha, bj) * sinpi(alpha)));
     }
     else if (alpha > 1e7) {
-	MATHLIB_WARNING("besselJ(x, nu): nu=%g too large for bessel_j() algorithm", alpha);
+	MATHLIB_WARNING(_("besselJ(x, nu): nu=%g too large for bessel_j() algorithm"),
+			alpha);
 	return ML_NAN;
     }
     nb = 1 + (int)na; /* nb-1 <= alpha < nb */
@@ -122,7 +124,7 @@
     J_bessel(&x, &alpha, &nb, bj, &ncalc);
     if(ncalc != nb) {/* error input */
       if(ncalc < 0)
-	MATHLIB_WARNING4(_("bessel_j(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	MATHLIB_WARNING4(_("bessel_j(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			 x, ncalc, nb, alpha);
       else
 	MATHLIB_WARNING2(_("bessel_j(%g,nu=%g): precision lost in result\n"),
diff -Nru r-base-3.2.3/src/nmath/bessel_k.c r-base-3.3.1/src/nmath/bessel_k.c
--- r-base-3.2.3/src/nmath/bessel_k.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/bessel_k.c	2016-03-16 23:04:21.000000000 +0000
@@ -68,7 +68,7 @@
     K_bessel(&x, &alpha, &nb, &ize, bk, &ncalc);
     if(ncalc != nb) {/* error input */
       if(ncalc < 0)
-	MATHLIB_WARNING4(_("bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	MATHLIB_WARNING4(_("bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			 x, ncalc, nb, alpha);
       else
 	MATHLIB_WARNING2(_("bessel_k(%g,nu=%g): precision lost in result\n"),
@@ -105,7 +105,7 @@
     K_bessel(&x, &alpha, &nb, &ize, bk, &ncalc);
     if(ncalc != nb) {/* error input */
       if(ncalc < 0)
-	MATHLIB_WARNING4(_("bessel_k(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	MATHLIB_WARNING4(_("bessel_k(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			 x, ncalc, nb, alpha);
       else
 	MATHLIB_WARNING2(_("bessel_k(%g,nu=%g): precision lost in result\n"),
diff -Nru r-base-3.2.3/src/nmath/bessel_y.c r-base-3.3.1/src/nmath/bessel_y.c
--- r-base-3.2.3/src/nmath/bessel_y.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/bessel_y.c	2016-03-16 23:04:21.000000000 +0000
@@ -60,7 +60,8 @@
 	       ((alpha      == na ) ? 0 : bessel_j(x, -alpha) * sinpi(alpha)));
     }
     else if (alpha > 1e7) {
-	MATHLIB_WARNING("besselY(x, nu): nu=%g too large for bessel_y() algorithm", alpha);
+	MATHLIB_WARNING(_("besselY(x, nu): nu=%g too large for bessel_y() algorithm"),
+			alpha);
 	return ML_NAN;
     }
     nb = 1+ (int)na;/* nb-1 <= alpha < nb */
@@ -83,7 +84,7 @@
 	    return ML_POSINF;
 	}
 	else if(ncalc < -1)
-	    MATHLIB_WARNING4(_("bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	    MATHLIB_WARNING4(_("bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			     x, ncalc, nb, alpha);
 	else /* ncalc >= 0 */
 	    MATHLIB_WARNING2(_("bessel_y(%g,nu=%g): precision lost in result\n"),
@@ -121,7 +122,8 @@
 	       ((alpha      == na ) ? 0 : bessel_j_ex(x, -alpha, by) * sinpi(alpha)));
     }
     else if (alpha > 1e7) {
-	MATHLIB_WARNING("besselY(x, nu): nu=%g too large for bessel_y() algorithm", alpha);
+	MATHLIB_WARNING(_("besselY(x, nu): nu=%g too large for bessel_y() algorithm"),
+			alpha);
 	return ML_NAN;
     }
     nb = 1+ (int)na;/* nb-1 <= alpha < nb */
@@ -131,7 +133,7 @@
 	if(ncalc == -1)
 	    return ML_POSINF;
 	else if(ncalc < -1)
-	    MATHLIB_WARNING4(_("bessel_y(%g): ncalc (=%ld) != nb (=%ld); alpha=%g. Arg. out of range?\n"),
+	    MATHLIB_WARNING4(_("bessel_y(%g): ncalc (=%d) != nb (=%d); alpha=%g. Arg. out of range?\n"),
 			     x, ncalc, nb, alpha);
 	else /* ncalc >= 0 */
 	    MATHLIB_WARNING2(_("bessel_y(%g,nu=%g): precision lost in result\n"),
diff -Nru r-base-3.2.3/src/nmath/cospi.c r-base-3.3.1/src/nmath/cospi.c
--- r-base-3.2.3/src/nmath/cospi.c	2014-03-12 23:03:20.000000000 +0000
+++ r-base-3.3.1/src/nmath/cospi.c	2016-03-16 23:04:21.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 2013-2014 The R Core Team
+ *  Copyright (C) 2013-2016 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,9 +17,16 @@
 
 /* HAVE_COSPI etc will not be defined in standalone-use: the
    intention is to make the versions here available in that case.
+
+   The __cospi etc variants are from OS X (and perhaps other BSD-based systems).
 */
 
-#ifndef HAVE_COSPI
+#ifdef HAVE_COSPI
+#elif defined HAVE___COSPI
+double cospi(double x) {
+    return __cospi(x);
+}
+#else
 // cos(pi * x)  -- exact when x = k/2  for all integer k
 double cospi(double x) {
 #ifdef IEEE_754
@@ -37,7 +44,12 @@
 }
 #endif
 
-#ifndef HAVE_SINPI
+#ifdef HAVE_SINPI
+#elif defined HAVE___SINPI
+double sinpi(double x) {
+    return __sinpi(x);
+}
+#else
 // sin(pi * x)  -- exact when x = k/2  for all integer k
 double sinpi(double x) {
 #ifdef IEEE_754
@@ -57,11 +69,11 @@
 #endif
 
 // tan(pi * x)  -- exact when x = k/2  for all integer k
-#ifndef HAVE_TANPI
-double tanpi(double x)
-#else
+#if defined(HAVE_TANPI) || defined(HAVE___TANPI)
 // for use in arithmetic.c, half-values documented to give NaN
 double Rtanpi(double x)
+#else
+double tanpi(double x)
 #endif
 {
 #ifdef IEEE_754
@@ -74,3 +86,9 @@
     if(x <= -0.5) x++; else if(x > 0.5) x--;
     return (x == 0.) ? 0. : ((x == 0.5) ? ML_NAN : tan(M_PI * x));
 }
+
+#if !defined(HAVE_TANPI) && defined(HAVE___TANPI)
+double tanpi(double x) {
+    return __tanpi(x);
+}
+#endif
diff -Nru r-base-3.2.3/src/nmath/dbeta.c r-base-3.3.1/src/nmath/dbeta.c
--- r-base-3.2.3/src/nmath/dbeta.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/dbeta.c	2016-01-04 23:15:09.000000000 +0000
@@ -53,16 +53,16 @@
     // limit cases for (a,b), leading to point masses
     if(a == 0 || b == 0 || !R_FINITE(a) || !R_FINITE(b)) {
 	if(a == 0 && b == 0) { // point mass 1/2 at each of {0,1} :
-	    if (x == 0 || x == 1) return(ML_POSINF); /* else */ return(R_D__0);
+	    if (x == 0 || x == 1) return(ML_POSINF); else return(R_D__0);
 	}
 	if (a == 0 || a/b == 0) { // point mass 1 at 0
-	    if (x == 0) return(ML_POSINF); /* else */ return(R_D__0);
+	    if (x == 0) return(ML_POSINF); else return(R_D__0);
 	}
 	if (b == 0 || b/a == 0) { // point mass 1 at 1
-	    if (x == 1) return(ML_POSINF); /* else */ return(R_D__0);
+	    if (x == 1) return(ML_POSINF); else return(R_D__0);
 	}
 	// else, remaining case:  a = b = Inf : point mass 1 at 1/2
-	if (x == 0.5) return(ML_POSINF); /* else */ return(R_D__0);
+	if (x == 0.5) return(ML_POSINF); else return(R_D__0);
     }
 
     if (x == 0) {
diff -Nru r-base-3.2.3/src/nmath/df.c r-base-3.3.1/src/nmath/df.c
--- r-base-3.2.3/src/nmath/df.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/df.c	2016-01-04 23:15:09.000000000 +0000
@@ -47,8 +47,7 @@
     if (x < 0.)  return(R_D__0);
     if (x == 0.) return(m > 2 ? R_D__0 : (m == 2 ? R_D__1 : ML_POSINF));
     if (!R_FINITE(m) && !R_FINITE(n)) { /* both +Inf */
-	if(x == 1.) return ML_POSINF;
-	/* else */  return R_D__0;
+	if(x == 1.) return ML_POSINF; else return R_D__0;
     }
     if (!R_FINITE(n)) /* must be +Inf by now */
 	return(dgamma(x, m/2, 2./m, give_log));
diff -Nru r-base-3.2.3/src/nmath/dnbinom.c r-base-3.3.1/src/nmath/dnbinom.c
--- r-base-3.2.3/src/nmath/dnbinom.c	2015-08-25 22:18:55.000000000 +0000
+++ r-base-3.3.1/src/nmath/dnbinom.c	2016-03-01 23:15:08.000000000 +0000
@@ -6,7 +6,7 @@
  *    dnbinom_mu(): Martin Maechler, June 2008
  *
  *  Merge in to R:
- *	Copyright (C) 2000--2014, The R Core Team
+ *	Copyright (C) 2000--2016, The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -50,6 +50,7 @@
     /* limiting case as size approaches zero is point mass at zero */
     if (x == 0 && size==0) return R_D__1;
     x = R_forceint(x);
+    if(!R_FINITE(size)) size = DBL_MAX;
 
     ans = dbinom_raw(size, x+size, prob, 1-prob, give_log);
     p = ((double)size)/(size+x);
@@ -60,7 +61,6 @@
 {
     /* originally, just set  prob :=  size / (size + mu)  and called dbinom_raw(),
      * but that suffers from cancellation when   mu << size  */
-    double ans, p;
 
 #ifdef IEEE_754
     if (ISNAN(x) || ISNAN(size) || ISNAN(mu))
@@ -75,21 +75,23 @@
      * even if mu is kept constant. limit distribution does not
      * have mean mu, though.
      */
-    if (x == 0 && size==0) return R_D__1;
-
+    if (x == 0 && size == 0) return R_D__1;
     x = R_forceint(x);
+    if(!R_FINITE(size)) // limit case: Poisson
+	return(dpois_raw(x, mu, give_log));
+
     if(x == 0)/* be accurate, both for n << mu, and n >> mu :*/
 	return R_D_exp(size * (size < mu ? log(size/(size+mu)) : log1p(- mu/(size+mu))));
     if(x < 1e-10 * size) { /* don't use dbinom_raw() but MM's formula: */
 	/* FIXME --- 1e-8 shows problem; rather use algdiv() from ./toms708.c */
-	p = (size < mu ? log(size/(1 + size/mu)) : log(mu / (1 + mu/size)));
+	double p = (size < mu ? log(size/(1 + size/mu)) : log(mu / (1 + mu/size)));
 	return R_D_exp(x * p - mu - lgamma(x+1) +
 		       log1p(x*(x-1)/(2*size)));
+    } else {
+	/* no unnecessary cancellation inside dbinom_raw, when
+	 * x_ = size and n_ = x+size are so close that n_ - x_ loses accuracy */
+	double p = ((double)size)/(size+x),
+	    ans = dbinom_raw(size, x+size, size/(size+mu), mu/(size+mu), give_log);
+	return((give_log) ? log(p) + ans : p * ans);
     }
-    /* else: no unnecessary cancellation inside dbinom_raw, when
-     * x_ = size and n_ = x+size are so close that n_ - x_ loses accuracy
-     */
-    ans = dbinom_raw(size, x+size, size/(size+mu), mu/(size+mu), give_log);
-    p = ((double)size)/(size+x);
-    return((give_log) ? log(p) + ans : p * ans);
 }
diff -Nru r-base-3.2.3/src/nmath/dnf.c r-base-3.3.1/src/nmath/dnf.c
--- r-base-3.2.3/src/nmath/dnf.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/dnf.c	2016-01-04 23:15:09.000000000 +0000
@@ -55,8 +55,7 @@
      */
     if (!R_FINITE(df1) && !R_FINITE(df2)) { /* both +Inf */
 	/* PR: not sure about this (taken from  ncp==0)  -- FIXME ? */
-	if(x == 1.) return ML_POSINF;
-	/* else */  return R_D__0;
+	if(x == 1.) return ML_POSINF; else return R_D__0;
     }
     if (!R_FINITE(df2)) /* i.e.  = +Inf */
 	return df1* dnchisq(x*df1, df1, ncp, give_log);
diff -Nru r-base-3.2.3/src/nmath/dnorm.c r-base-3.3.1/src/nmath/dnorm.c
--- r-base-3.2.3/src/nmath/dnorm.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/dnorm.c	2016-03-16 23:04:21.000000000 +0000
@@ -51,7 +51,7 @@
     x = fabs (x);
     if (x >= 2 * sqrt(DBL_MAX)) return R_D__0;
     if (give_log)
-        return -(M_LN_SQRT_2PI + 0.5 * x * x + log(sigma));
+	return -(M_LN_SQRT_2PI + 0.5 * x * x + log(sigma));
     //  M_1_SQRT_2PI = 1 / sqrt(2 * pi)
 #ifdef MATHLIB_FAST_dnorm
     // and for R <= 3.0.x and R-devel upto 2014-01-01:
diff -Nru r-base-3.2.3/src/nmath/dnt.c r-base-3.3.1/src/nmath/dnt.c
--- r-base-3.2.3/src/nmath/dnt.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/dnt.c	2016-03-16 23:04:22.000000000 +0000
@@ -4,7 +4,7 @@
  *    July 15, 2003.
  *
  *  Merge in to R:
- *	Copyright (C) 2003 The R Foundation
+ *	Copyright (C) 2003-2015 The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,13 +32,14 @@
  *
  * DESCRIPTION
  *
- *    The non-central t density is
+ *    From Johnson, Kotz and Balakrishnan (1995) [2nd ed.; formula (31.15), p.516],
+ *    the non-central t density is
+ *
+ *      f(x, df, ncp) =
+ *
+ *        exp(-.5*ncp^2) * gamma((df+1)/2) / (sqrt(pi*df)* gamma(df/2)) * (df/(df+x^2))^((df+1)/2) *
+ *          sum_{j=0}^Inf  gamma((df+j+1)/2)/(factorial(j)* gamma((df+1)/2)) * (x*ncp*sqrt(2)/sqrt(df+x^2))^ j
  *
- *	   f(x, df, ncp) =
- *		df^(df/2) * exp(-.5*ncp^2) /
- *		(sqrt(pi)*gamma(df/2)*(df+x^2)^((df+1)/2)) *
- *		sum_{k=0}^Inf  gamma((df + k + df)/2)*ncp^k /
- *				prod(1:k)*(2*x^2/(df+x^2))^(k/2)
  *
  *    The functional relationship
  *
@@ -54,6 +55,8 @@
  *
  *    All calculations are done on log-scale to increase stability.
  *
+ * FIXME: pnt() is known to be inaccurate in the (very) left tail and for ncp > 38
+ *       ==> use a direct log-space summation formula in that case
  */
 
 #include "nmath.h"
diff -Nru r-base-3.2.3/src/nmath/dpq.h r-base-3.3.1/src/nmath/dpq.h
--- r-base-3.2.3/src/nmath/dpq.h	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/dpq.h	2016-03-16 23:04:22.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000--2014 The  R Core Team
+ *  Copyright (C) 2000--2015 The  R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -99,7 +99,7 @@
 	    return lower_tail ? _RIGHT_ : _LEFT_;	\
     }
 
-#define R_P_bounds_01(x, x_min, x_max) 	\
+#define R_P_bounds_01(x, x_min, x_max)	\
     if(x <= x_min) return R_DT_0;		\
     if(x >= x_max) return R_DT_1
 /* is typically not quite optimal for (-Inf,Inf) where
@@ -119,8 +119,8 @@
 #define R_D_negInonint(x) (x < 0. || R_nonint(x))
 
 // for discrete d<distr>(x, ...) :
-#define R_D_nonint_check(x) 				\
+#define R_D_nonint_check(x)				\
    if(R_nonint(x)) {					\
-	MATHLIB_WARNING("non-integer x = %f", x);	\
+       MATHLIB_WARNING(_("non-integer x = %f"), x);	\
 	return R_D__0;					\
    }
diff -Nru r-base-3.2.3/src/nmath/dt.c r-base-3.3.1/src/nmath/dt.c
--- r-base-3.2.3/src/nmath/dt.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/dt.c	2016-03-16 23:04:20.000000000 +0000
@@ -4,7 +4,7 @@
  *    October 23, 2000.
  *
  *  Merge in to R:
- *	Copyright (C) 2000-2013 The R Core Team
+ *	Copyright (C) 2000-2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,8 +47,9 @@
     if(!R_FINITE(n))
 	return dnorm(x, 0., 1., give_log);
 
-    double u, ax, t = -bd0(n/2.,(n+1)/2.) + stirlerr((n+1)/2.) - stirlerr(n/2.),
+    double u, t = -bd0(n/2.,(n+1)/2.) + stirlerr((n+1)/2.) - stirlerr(n/2.),
 	x2n = x*x/n, // in  [0, Inf]
+	ax = 0., // <- -Wpedantic
 	l_x2n; // := log(sqrt(1 + x2n)) = log(1 + x2n)/2
     Rboolean lrg_x2n =  (x2n > 1./DBL_EPSILON);
     if (lrg_x2n) { // large x^2/n :
diff -Nru r-base-3.2.3/src/nmath/lbeta.c r-base-3.3.1/src/nmath/lbeta.c
--- r-base-3.2.3/src/nmath/lbeta.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/lbeta.c	2016-01-04 23:15:09.000000000 +0000
@@ -69,9 +69,10 @@
 	return lgammafn(p) + corr + p - p * log(p + q)
 		+ (q - 0.5) * log1p(-p / (p + q));
     }
-    else
+    else {
 	/* p and q are small: p <= q < 10. */
 	/* R change for very small args */
 	if (p < 1e-306) return lgamma(p) + (lgamma(q) - lgamma(p+q));
-	return log(gammafn(p) * (gammafn(q) / gammafn(p + q)));
+	else return log(gammafn(p) * (gammafn(q) / gammafn(p + q)));
+    }
 }
diff -Nru r-base-3.2.3/src/nmath/Makefile.in r-base-3.3.1/src/nmath/Makefile.in
--- r-base-3.2.3/src/nmath/Makefile.in	2015-03-18 23:03:59.000000000 +0000
+++ r-base-3.3.1/src/nmath/Makefile.in	2015-12-10 23:15:18.000000000 +0000
@@ -72,8 +72,8 @@
 	@$(MAKE) libnmath.a
 
 libnmath.a: $(OBJECTS)
-	rm -rf $@
-	$(AR) cr $@ $(OBJECTS)
+	@rm -rf $@
+	$(AR) -cr $@ $(OBJECTS)
 	$(RANLIB) $@
 
 mostlyclean: clean
diff -Nru r-base-3.2.3/src/nmath/nmath.h r-base-3.3.1/src/nmath/nmath.h
--- r-base-3.2.3/src/nmath/nmath.h	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/nmath.h	2016-03-16 23:04:20.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 1998-2015  The R Core Team
+ *  Copyright (C) 1998-2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,6 +32,11 @@
 #  define LDOUBLE double
 #endif
 
+/* To ensure atanpi, cospi,  sinpi, tanpi are defined */
+# ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#  define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+# endif
+
 #include <math.h>
 #include <float.h> /* DBL_MIN etc */
 
@@ -104,7 +109,15 @@
 #define MATHLIB_WARNING5(fmt,x,x2,x3,x4,x5) printf(fmt,x,x2,x3,x4,x5)
 
 #define ISNAN(x) (isnan(x)!=0)
-#define R_FINITE(x)    R_finite(x)
+// Arith.h defines it
+#ifndef R_FINITE
+#ifdef HAVE_WORKING_ISFINITE
+/* isfinite is defined in <math.h> according to C99 */
+# define R_FINITE(x)    isfinite(x)
+#else
+# define R_FINITE(x)    R_finite(x)
+#endif
+#endif
 int R_finite(double);
 
 #define ML_POSINF	(1.0 / 0.0)
@@ -179,6 +192,11 @@
 #define lfastchoose	Rf_lfastchoose
 #define lgammacor	Rf_lgammacor
 #define stirlerr       	Rf_stirlerr
+#define pnchisq_raw   	Rf_pnchisq_raw
+#define pgamma_raw   	Rf_pgamma_raw
+#define pnbeta_raw   	Rf_pnbeta_raw
+#define pnbeta2       	Rf_pnbeta2
+#define bratio       	Rf_bratio
 
 	/* Chebyshev Series */
 
diff -Nru r-base-3.2.3/src/nmath/pbeta.c r-base-3.3.1/src/nmath/pbeta.c
--- r-base-3.2.3/src/nmath/pbeta.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/pbeta.c	2016-01-04 23:15:09.000000000 +0000
@@ -50,10 +50,7 @@
 	if (b == 0 || b/a == 0) // point mass 1 at 1 ==> P(X <= x) = 0, all x < 1
 	    return R_DT_0;
 	// else, remaining case:  a = b = Inf : point mass 1 at 1/2
-	if (x < 0.5)
-	    return R_DT_0;
-	// else,  x >= 0.5 :
-	    return R_DT_1;
+	if (x < 0.5) return R_DT_0; else return R_DT_1;
     }
     // Now:  0 < a < Inf;  0 < b < Inf
 
diff -Nru r-base-3.2.3/src/nmath/pbinom.c r-base-3.3.1/src/nmath/pbinom.c
--- r-base-3.2.3/src/nmath/pbinom.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/pbinom.c	2016-03-16 23:04:21.000000000 +0000
@@ -1,8 +1,8 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-2014  The R Core Team
- *  Copyright (C) 2004       The R Foundation
+ *  Copyright (C) 2000-2015  The R Core Team
+ *  Copyright (C) 2004-2015  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 #endif
     if(R_nonint(n)) {
-	MATHLIB_WARNING("non-integer n = %f", n);
+	MATHLIB_WARNING(_("non-integer n = %f"), n);
 	ML_ERR_return_NAN;
     }
     n = R_forceint(n);
diff -Nru r-base-3.2.3/src/nmath/pexp.c r-base-3.3.1/src/nmath/pexp.c
--- r-base-3.2.3/src/nmath/pexp.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/pexp.c	2016-03-16 23:04:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-2002 The R Core Team
+ *  Copyright (C) 2000-2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,11 +38,7 @@
 	return R_DT_0;
     /* same as weibull( shape = 1): */
     x = -(x / scale);
-    if (lower_tail)
-	return (log_p
-		/* log(1 - exp(x))  for x < 0 : */
-		? (x > -M_LN2 ? log(-expm1(x)) : log1p(-exp(x)))
-		: -expm1(x));
-    /* else:  !lower_tail */
-    return R_D_exp(x);
+    return lower_tail
+	? (log_p ? R_Log1_Exp(x) : -expm1(x))
+	: R_D_exp(x);
 }
diff -Nru r-base-3.2.3/src/nmath/pgamma.c r-base-3.3.1/src/nmath/pgamma.c
--- r-base-3.2.3/src/nmath/pgamma.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/pgamma.c	2016-03-16 23:04:21.000000000 +0000
@@ -2,7 +2,7 @@
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 2005-6 Morten Welinder <terra@gnome.org>
  *  Copyright (C) 2005-10 The R Foundation
- *  Copyright (C) 2006-10 The R Core Team
+ *  Copyright (C) 2006-2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -259,7 +259,7 @@
 # define EXP exp
 # define LOG log
 #endif
-double logspace_sum (double* logx, int n)
+double logspace_sum (const double* logx, int n)
 {
     if(n == 0) return ML_NEGINF; // = log( sum(<empty>) )
     if(n == 1) return logx[0];
@@ -276,8 +276,10 @@
 
 
 
-/* dpois_wrap (x_P_1,  lambda, g_log) ==
- *   dpois (x_P_1 - 1, lambda, g_log) :=  exp(-L)  L^k / gamma(k+1) ,  k := x_P_1 - 1
+/* dpois_wrap (x__1, lambda) := dpois(x__1 - 1, lambda);  where
+ * dpois(k, L) := exp(-L) L^k / gamma(k+1)  {the usual Poisson probabilities}
+ *
+ * and  dpois*(.., give_log = TRUE) :=  log( dpois*(..) )
 */
 static double
 dpois_wrap (double x_plus_1, double lambda, int give_log)
@@ -441,7 +443,7 @@
 
 	if (b2 != 0) {
 	    f = a2 / b2;
- 	    /* convergence check: relative; "absolute" for very small f : */
+	    /* convergence check: relative; "absolute" for very small f : */
 	    if (fabs (f - of) <= DBL_EPSILON * fmax2(f0, fabs(f))) {
 #ifdef DEBUG_p
 		REprintf(" %g iter.\n", i);
diff -Nru r-base-3.2.3/src/nmath/plogis.c r-base-3.3.1/src/nmath/plogis.c
--- r-base-3.2.3/src/nmath/plogis.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/plogis.c	2016-03-16 23:04:22.000000000 +0000
@@ -25,7 +25,7 @@
    curve(log1p(exp(x)) - x,       33.1, 33.5, n=2^10)
    curve(x+exp(-x) - log1p(exp(x)), 15, 25,   n=2^11)
 */
-double log1pexp(double x) {
+double Rf_log1pexp(double x) {
     if(x <= 18.) return log1p(exp(x));
     if(x > 33.3) return x;
     // else: 18.0 < x <= 33.3 :
@@ -47,7 +47,7 @@
 
     if(log_p) {
 	// log(1 / (1 + exp( +- x ))) = -log(1 + exp( +- x))
-	return -log1pexp(lower_tail ? -x : x);
+	return -Rf_log1pexp(lower_tail ? -x : x);
     } else {
 	return 1 / (1 + exp(lower_tail ? -x : x));
     }
diff -Nru r-base-3.2.3/src/nmath/pnbinom.c r-base-3.3.1/src/nmath/pnbinom.c
--- r-base-3.2.3/src/nmath/pnbinom.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/pnbinom.c	2016-03-01 23:15:08.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-2013 The R Core Team
+ *  Copyright (C) 2000-2016 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,8 +39,8 @@
     if (size < 0 || prob <= 0 || prob > 1)	ML_ERR_return_NAN;
 
     /* limiting case: point mass at zero */
-    if (size == 0) 
-        return (x >= 0) ? R_DT_1 : R_DT_0; 
+    if (size == 0)
+        return (x >= 0) ? R_DT_1 : R_DT_0;
 
     if (x < 0) return R_DT_0;
     if (!R_FINITE(x)) return R_DT_1;
@@ -53,16 +53,19 @@
 #ifdef IEEE_754
     if (ISNAN(x) || ISNAN(size) || ISNAN(mu))
 	return x + size + mu;
-    if(!R_FINITE(size) || !R_FINITE(mu))	ML_ERR_return_NAN;
+    if(!R_FINITE(mu))	ML_ERR_return_NAN;
 #endif
     if (size < 0 || mu < 0)	ML_ERR_return_NAN;
 
     /* limiting case: point mass at zero */
-    if (size == 0) 
-        return (x >= 0) ? R_DT_1 : R_DT_0; 
+    if (size == 0)
+        return (x >= 0) ? R_DT_1 : R_DT_0;
 
     if (x < 0) return R_DT_0;
     if (!R_FINITE(x)) return R_DT_1;
+    if (!R_FINITE(size)) // limit case: Poisson
+	return(ppois(x, mu, lower_tail, log_p));
+
     x = floor(x + 1e-7);
     /* return
      * pbeta(pr, size, x + 1, lower_tail, log_p);  pr = size/(size + mu), 1-pr = mu/(size+mu)
diff -Nru r-base-3.2.3/src/nmath/pnt.c r-base-3.3.1/src/nmath/pnt.c
--- r-base-3.2.3/src/nmath/pnt.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/pnt.c	2016-03-16 23:04:22.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 1998-2012 The R Core Team
+ *  Copyright (C) 1998-2015 The R Core Team
  *  based on AS243 (C) 1989 Royal Statistical Society
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,8 @@
  *	make CFLAGS='-DDEBUG_pnt -g'
 
  * -- Feb.3, 1999; M.Maechler:
-	- For 't > ncp > 20' (or so)	the result is completely WRONG!
+	- For 't > ncp > 20' (or so)	the result is completely WRONG!  <== no longer true
+	- but for ncp > 100
  */
 
 double pnt(double t, double df, double ncp, int lower_tail, int log_p)
@@ -81,7 +82,7 @@
 	/* Approx. from	 Abramowitz & Stegun 26.7.10 (p.949) */
 	s = 1./(4.*df);
 
-	return pnorm((double)(tt*(1. - s)), del, 
+	return pnorm((double)(tt*(1. - s)), del,
 		     sqrt((double) (1. + tt*tt*2.*s)),
 		     lower_tail != negdel, log_p);
     }
@@ -109,21 +110,21 @@
 	    return R_DT_0;
 	}
 #ifdef DEBUG_pnt
-        REprintf("it  1e5*(godd,   geven)|          p           q           s"
-               /* 1.3 1..4..7.9 1..4..7.9|1..4..7.901 1..4..7.901 1..4..7.901 */
-                 "        pnt(*)     errbd\n");
-               /* 1..4..7..0..34 1..4..7.9*/
+	REprintf("it  1e5*(godd,   geven)|          p           q           s"
+	       /* 1.3 1..4..7.9 1..4..7.9|1..4..7.901 1..4..7.901 1..4..7.901 */
+		 "        pnt(*)     errbd\n");
+	       /* 1..4..7..0..34 1..4..7.9*/
 #endif
 	q = M_SQRT_2dPI * p * del;
 	s = .5 - p;
-        /* s = 0.5 - p = 0.5*(1 - exp(-.5 L)) =  -0.5*expm1(-.5 L)) */
-        if(s < 1e-7)
-            s = -0.5 * expm1(-0.5 * lambda);
+	/* s = 0.5 - p = 0.5*(1 - exp(-.5 L)) =  -0.5*expm1(-.5 L)) */
+	if(s < 1e-7)
+	    s = -0.5 * expm1(-0.5 * lambda);
 	a = .5;
 	b = .5 * df;
 	/* rxb = (1 - x) ^ b   [ ~= 1 - b*x for tiny x --> see 'xeven' below]
 	 *       where '(1 - x)' =: rxb {accurately!} above */
-        rxb = pow(rxb, b);
+	rxb = pow(rxb, b);
 	albeta = M_LN_SQRT_PI + lgammafn(b) - lgammafn(.5 + b);
 	xodd = pbeta(x, a, b, /*lower*/TRUE, /*log_p*/FALSE);
 	godd = 2. * rxb * exp(a * log(x) - albeta);
diff -Nru r-base-3.2.3/src/nmath/polygamma.c r-base-3.3.1/src/nmath/polygamma.c
--- r-base-3.2.3/src/nmath/polygamma.c	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/polygamma.c	2016-03-16 23:04:22.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-2014 The R Core Team
+ *  Copyright (C) 2000-2015 The R Core Team
  *  Copyright (C) 2004-2009 The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -120,8 +120,8 @@
  *
  *  AUTHOR
  *
- *    Amos, D. E.  	(Fortran)
- *    Ross Ihaka   	(C Translation)
+ *    Amos, D. E.	(Fortran)
+ *    Ross Ihaka	(C Translation)
  *    Martin Maechler   (x < 0, and psigamma())
  *
  *  REFERENCES
@@ -145,7 +145,7 @@
 
 #define n_max (100)
 
-/* From R, currently only used for kode = 1, m = 1, n in {0,1,2,3} : */
+/* From R, currently only used for kode = 1, m = 1 : */
 void dpsifn(double x, int n, int kode, int m, double *ans, int *nz, int *ierr)
 {
     const static double bvalues[] = {	/* Bernoulli Numbers */
@@ -481,7 +481,7 @@
     }
 #else
 # define ML_TREAT_psigam(_IERR_)	\
-    if(_IERR_ != 0) 			\
+    if(_IERR_ != 0)			\
 	return ML_NAN
 #endif
 
diff -Nru r-base-3.2.3/src/nmath/pt.c r-base-3.3.1/src/nmath/pt.c
--- r-base-3.2.3/src/nmath/pt.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/pt.c	2016-03-16 23:04:21.000000000 +0000
@@ -60,7 +60,7 @@
 	*/
 	double lval;
 	lval = -0.5*n*(2*log(fabs(x)) - log(n))
-	        - lbeta(0.5*n, 0.5) - log(0.5*n);
+		- lbeta(0.5*n, 0.5) - log(0.5*n);
 	val = log_p ? lval : exp(lval);
     } else {
 	val = (n > x * x)
diff -Nru r-base-3.2.3/src/nmath/pweibull.c r-base-3.3.1/src/nmath/pweibull.c
--- r-base-3.2.3/src/nmath/pweibull.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/pweibull.c	2016-03-16 23:04:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-2002 The R Core Team
+ *  Copyright (C) 2000-2015 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -36,10 +36,7 @@
     if (x <= 0)
 	return R_DT_0;
     x = -pow(x / scale, shape);
-    if (lower_tail)
-	return (log_p
-		/* log(1 - exp(x))  for x < 0 : */
-		? R_Log1_Exp(x) : -expm1(x));
-    /* else:  !lower_tail */
-    return R_D_exp(x);
+    return lower_tail
+	? (log_p ? R_Log1_Exp(x) : -expm1(x))
+	: R_D_exp(x);
 }
diff -Nru r-base-3.2.3/src/nmath/qbeta.c r-base-3.3.1/src/nmath/qbeta.c
--- r-base-3.2.3/src/nmath/qbeta.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/qbeta.c	2016-03-16 23:04:20.000000000 +0000
@@ -28,12 +28,11 @@
  */
 
 
+#include <R_ext/Arith.h>
 #include "nmath.h"
 #include "dpq.h"
-#include <R_ext/Arith.h>
 
 #ifdef DEBUG_qbeta
-# include <R_ext/Print.h>
 # define R_ifDEBUG_printf(...) REprintf(__VA_ARGS__)
 #else
 # define R_ifDEBUG_printf(...)
@@ -48,7 +47,8 @@
 #define MLOGICAL_NA -1
 // an "NA_LOGICAL" substitute for Mathlib {only used here, for now}
 
-attribute_hidden void
+//attribute_hidden 
+static void
 qbeta_raw(double alpha, double p, double q, int lower_tail, int log_p,
 	  int swap_01, double log_q_cut, int n_N, double* qb);
 
@@ -166,7 +166,7 @@
 	    // else:  alpha == "1/2"
 #define return_q_half					\
 	    if(give_log_q) qb[0] = qb[1] = -M_LN2;	\
-	    else 	   qb[0] = qb[1] = 0.5;		\
+	    else	   qb[0] = qb[1] = 0.5;		\
 	    return
 
 	    return_q_half;
@@ -189,12 +189,12 @@
     if(swap_tail) { /* change tail, swap  p <-> q :*/
 	a = R_DT_CIv(alpha); // = 1 - p_ < 1/2
 	/* la := log(a), but without numerical cancellation: */
-	la = lower_tail ? R_D_LExp(alpha) : R_D_log(alpha);
+	la = R_DT_Clog(alpha);
 	pp = q; qq = p;
     }
     else {
 	a = p_;
-	la = lower_tail ? R_D_log(alpha) : R_D_LExp(alpha);
+	la = R_DT_log(alpha);
 	pp = p; qq = q;
     }
 
@@ -226,7 +226,7 @@
 	(log_p && (p_ == 0. || p_ == 1.)) ? (p_==0.?" p_=0":" p_=1") : "",
 	swap_tail, la, u0,
 	(t*log_eps_c - log(fabs(pp*(1.-qq)*(2.-qq)/(2.*(pp+2.)))))/2.,
- 	 t*log_eps_c - log(fabs(r))
+	 t*log_eps_c - log(fabs(r))
 	);
 
     if(M_LN2 * DBL_MIN_EXP < u0 && // cannot allow exp(u0) = 0 ==> exp(u1) = exp(u0) = 0
@@ -286,9 +286,9 @@
 	    double l1ma;/* := log(1-a), directly from alpha (as 'la' above):
 			 * FIXME: not worth it? log1p(-a) always the same ?? */
 	    if(swap_tail)
-		l1ma = lower_tail ? R_D_log(alpha) : R_D_LExp(alpha);
+		l1ma = R_DT_log(alpha);
 	    else
-		l1ma = lower_tail ? R_D_LExp(alpha) : R_D_log(alpha);
+		l1ma = R_DT_Clog(alpha);
 	    R_ifDEBUG_printf(" t <= 0 : log1p(-a)=%.15g, better l1ma=%.15g\n", log1p(-a), l1ma);
 	    double xx = (l1ma + log(qq) + logbeta) / qq;
 	    if(xx <= 0.) {
@@ -314,18 +314,18 @@
     // Problem: If initial u is completely wrong, we make a wrong decision here
     if(swap_choose &&
        (( swap_tail && u >= -exp(  log_q_cut)) || // ==> "swap back"
-        (!swap_tail && u >= -exp(4*log_q_cut) && pp / qq < 1000.))) { // ==> "swap now" (much less easily)
+	(!swap_tail && u >= -exp(4*log_q_cut) && pp / qq < 1000.))) { // ==> "swap now" (much less easily)
 	// "revert swap" -- and use_log_x
 	swap_tail = !swap_tail;
 	R_ifDEBUG_printf(" u = %g (e^u = xinbta = %.16g) ==> ", u, xinbta);
 	if(swap_tail) {
 	    a = R_DT_CIv(alpha); // needed ?
-	    la = lower_tail ? R_D_LExp(alpha) : R_D_log(alpha);
+	    la = R_DT_Clog(alpha);
 	    pp = q; qq = p;
 	}
 	else {
 	    a = p_;
-	    la = lower_tail ? R_D_log(alpha) : R_D_LExp(alpha);
+	    la = R_DT_log(alpha);
 	    pp = p; qq = q;
 	}
 	R_ifDEBUG_printf("\"%s\"; la = %g\n",
@@ -396,7 +396,7 @@
 		: ((xinbta < p_lo) ? exp(u) : p_hi);
 	    if(bad_u)
 		u = log(xinbta);
-            // otherwise: not changing "potentially better" u than the above
+	    // otherwise: not changing "potentially better" u than the above
 	}
 	R_ifDEBUG_printf(" -> (partly)new u=%g, xinbta=%g\n", u,xinbta);
     }
@@ -423,8 +423,8 @@
 	     *   =  (L(.) - la)*F(.) / {F'(e^u) * e^u } =
 	     *   =  (L(.) - la) * e^L(.) * e^{-log F'(e^u) - u}
 	     *   =  ( y   - la) * e^{ y - u -log F'(e^u)}
-	        and  -log F'(x)= -log f(x) =  + logbeta + (1-p) log(x) + (1-q) log(1-x)
-		               = logbeta + (1-p) u + (1-q) log(1-e^u)
+		and  -log F'(x)= -log f(x) =  + logbeta + (1-p) log(x) + (1-q) log(1-x)
+			       = logbeta + (1-p) u + (1-q) log(1-e^u)
 	     */
 	    w = (y == ML_NEGINF) // y = -Inf  well possible: we are on log scale!
 		? 0. : (y - la) * exp(y - u + logbeta + r * u + t * R_Log1_Exp(u));
@@ -436,14 +436,14 @@
 			     i_pb, u, y, w, (w * wprev <= 0.) ? "new" : "old", prev);
 	    g = 1;
 	    for (i_inn=0; i_inn < 1000; i_inn++) {
-	        adj = g * w;
+		adj = g * w;
 		// take full Newton steps at the beginning; only then safe guard:
-	        if (i_pb < n_N || fabs(adj) < prev) {
+		if (i_pb < n_N || fabs(adj) < prev) {
 		    u_n = u - adj; // u_{n+1} = u_n - g*w
 		    if (u_n <= 0.) { // <==> 0 <  xinbta := e^u  <= 1
 			if (prev <= acu || fabs(w) <= acu) {
 			    /* R_ifDEBUG_printf(" -adj=%g, %s <= acu  ==> convergence\n", */
-			    /* 	 -adj, (prev <= acu) ? "prev" : "|w|"); */
+			    /*	 -adj, (prev <= acu) ? "prev" : "|w|"); */
 			    R_ifDEBUG_printf(" it{in}=%d, -adj=%g, %s <= acu  ==> convergence\n",
 					     i_inn, -adj, (prev <= acu) ? "prev" : "|w|");
 			    goto L_converged;
@@ -451,8 +451,8 @@
 			// if (u_n != ML_NEGINF && u_n != 1)
 			break;
 		    }
-	    	}
-	    	g /= 3;
+		}
+		g /= 3;
 	    }
 	    // (cancellation in (u_n -u) => may differ from adj:
 	    double D = fmin2(fabs(adj), fabs(u_n - u));
@@ -584,7 +584,7 @@
 	if(swap_tail) {
 	    qb[0] = 1 - tx;	qb[1] = tx;
 	} else {
-	    qb[0] = tx; 	qb[1] = 1 - tx;
+	    qb[0] = tx;	qb[1] = 1 - tx;
 	}
     }
     return;
diff -Nru r-base-3.2.3/src/nmath/qf.c r-base-3.3.1/src/nmath/qf.c
--- r-base-3.2.3/src/nmath/qf.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/qf.c	2016-03-16 23:04:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-8 The R Core Team
+ *  Copyright (C) 2000-2015 The R Core Team
  *  Copyright (C) 2005 The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -43,13 +43,14 @@
     if (df1 <= df2 && df2 > 4e5) {
 	if(!R_FINITE(df1)) /* df1 == df2 == Inf : */
 	    return 1.;
- 	/* else */
+	/* else */
 	return qchisq(p, df1, lower_tail, log_p) / df1;
     }
     if (df1 > 4e5) { /* and so  df2 < df1 */
 	return df2 / qchisq(p, df2, !lower_tail, log_p);
     }
 
+    // FIXME: (1/qb - 1) = (1 - qb)/qb; if we know qb ~= 1, should use other tail
     p = (1. / qbeta(p, df2/2, df1/2, !lower_tail, log_p) - 1.) * (df2 / df1);
     return ML_VALID(p) ? p : ML_NAN;
 }
diff -Nru r-base-3.2.3/src/nmath/qgamma.c r-base-3.3.1/src/nmath/qgamma.c
--- r-base-3.2.3/src/nmath/qgamma.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/qgamma.c	2016-03-16 23:04:20.000000000 +0000
@@ -1,8 +1,8 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000--2011 The R Core Team
- *  Copyright (C) 2004--2009 The R Foundation
+ *  Copyright (C) 2000--2015 The R Core Team
+ *  Copyright (C) 2004--2015 The R Foundation
  *  based on AS 91 (C) 1979 Royal Statistical Society
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -150,7 +150,8 @@
     if (alpha < 1e-10) {
     /* Warning seems unnecessary now: */
 #ifdef _DO_WARN_qgamma_
-	MATHLIB_WARNING("value of shape (%g) is extremely small: results may be unreliable", alpha);
+	MATHLIB_WARNING(_("value of shape (%g) is extremely small: results may be unreliable"),
+			alpha);
 #endif
 	max_it_Newton = 7;/* may still be increased below */
     }
@@ -242,7 +243,7 @@
    *
    * Improved (MM): - only if rel.Err > EPS_N (= 1e-15);
    *		    - also for lower_tail = FALSE	 or log_p = TRUE
-   * 		    - optionally *iterate* Newton
+   *		    - optionally *iterate* Newton
    */
     x = 0.5*scale*ch;
     if(max_it_Newton) {
diff -Nru r-base-3.2.3/src/nmath/qnbinom.c r-base-3.3.1/src/nmath/qnbinom.c
--- r-base-3.2.3/src/nmath/qnbinom.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/qnbinom.c	2016-03-01 23:15:08.000000000 +0000
@@ -1,8 +1,8 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000-2014 The R Core Team
- *  Copyright (C) 2005 The R Foundation
+ *  Copyright (C) 2000-2016 The R Core Team
+ *  Copyright (C) 2005-2016 The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,8 +47,7 @@
 static double
 do_search(double y, double *z, double p, double n, double pr, double incr)
 {
-    if(*z >= p) {
-			/* search to the left */
+    if(*z >= p) {	/* search to the left */
 	for(;;) {
 	    if(y == 0 ||
 	       (*z = pnbinom(y - incr, n, pr, /*l._t.*/TRUE, /*log_p*/FALSE)) < p)
@@ -57,7 +56,6 @@
 	}
     }
     else {		/* search to the right */
-
 	for(;;) {
 	    y = y + incr;
 	    if((*z = pnbinom(y, n, pr, /*l._t.*/TRUE, /*log_p*/FALSE)) >= p)
@@ -82,7 +80,7 @@
     if (prob == 0 && size == 0) return 0;
 
     if (prob <= 0 || prob > 1 || size < 0) ML_ERR_return_NAN;
- 
+
     if (prob == 1 || size == 0) return 0;
 
     R_Q_P01_boundaries(p, 0, ML_POSINF);
@@ -128,6 +126,8 @@
 
 double qnbinom_mu(double p, double size, double mu, int lower_tail, int log_p)
 {
+    if (size == ML_POSINF) // limit case: Poisson
+	return(qpois(p, mu, lower_tail, log_p));
 /* FIXME!  Implement properly!! (not losing accuracy for very large size (prob ~= 1)*/
     return qnbinom(p, size, /* prob = */ size/(size+mu), lower_tail, log_p);
 }
diff -Nru r-base-3.2.3/src/nmath/rgamma.c r-base-3.3.1/src/nmath/rgamma.c
--- r-base-3.2.3/src/nmath/rgamma.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/rgamma.c	2016-05-23 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000--2008 The R Core Team
+ *  Copyright (C) 2000--2016 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,8 +43,9 @@
  *	  poisson and binomial distributions.
  *	  Computing, 12, 223-246.
  *
- *    Input: a = parameter (mean) of the standard gamma distribution.
- *    Output: a variate from the gamma(a)-distribution
+ *  Input : a     = 'shape' = alpha,
+ *          scale = 'scale' = 1/rate of the gamma distribution w/ mean E[.] = a * scale
+ *  Output: a variate from the gamma(a, scale)-distribution
  */
 
 #include "nmath.h"
@@ -85,14 +86,13 @@
 
     double e, p, q, r, t, u, v, w, x, ret_val;
 
-    if (!R_FINITE(a) || !R_FINITE(scale) || a < 0.0 || scale <= 0.0) {
-	if(scale == 0.) return 0.;
+    if (a <= 0.0 || scale <= 0.0) {
+	if(scale == 0. || a == 0.) return 0.;
 	ML_ERR_return_NAN;
     }
+    if(!R_FINITE(a) || !R_FINITE(scale)) return ML_POSINF;
 
     if (a < 1.) { /* GS algorithm for parameters a < 1 */
-	if(a == 0)
-	    return 0.;
 	e = 1.0 + exp_m1 * a;
 	repeat {
 	    p = e * unif_rand();
diff -Nru r-base-3.2.3/src/nmath/rhyper.c r-base-3.3.1/src/nmath/rhyper.c
--- r-base-3.2.3/src/nmath/rhyper.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/rhyper.c	2016-03-16 23:04:20.000000000 +0000
@@ -43,16 +43,14 @@
 
 #include "nmath.h"
 #include "dpq.h"
+#include <limits.h>
 
-/* afc(i) :=  ln( i! )	[logarithm of the factorial i.
- *	   If (i > 7), use Stirling's approximation, otherwise use table lookup.
-*/
-
+// afc(i) :=  ln( i! )	[logarithm of the factorial i]
 static double afc(int i)
 {
-    const static double al[9] =
+    // If (i > 7), use Stirling's approximation, otherwise use table lookup.
+    const static double al[8] =
     {
-	0.0,
 	0.0,/*ln(0!)=ln(1)*/
 	0.0,/*ln(1!)=ln(1)*/
 	0.69314718055994530941723212145817,/*ln(2) */
@@ -61,41 +59,41 @@
 	4.78749174278204599424770093452324,
 	6.57925121201010099506017829290394,
 	8.52516136106541430016553103634712
-	/*, 10.60460290274525022841722740072165*/
+	/* 10.60460290274525022841722740072165, approx. value below =
+	   10.6046028788027; rel.error = 2.26 10^{-9}
+
+	  FIXME: Use constants and if(n > ..) decisions from ./stirlerr.c
+	  -----  will be even *faster* for n > 500 (or so)
+	*/
     };
-    double di, value;
 
     if (i < 0) {
-      MATHLIB_WARNING(("rhyper.c: afc(i), i=%d < 0 -- SHOULD NOT HAPPEN!\n"),
-		      i);
-      return -1;/* unreached (Wall) */
-    } else if (i <= 7) {
-	value = al[i + 1];
-    } else {
-	di = i;
-	value = (di + 0.5) * log(di) - di + 0.08333333333333 / di
-	    - 0.00277777777777 / di / di / di + 0.9189385332;
+	MATHLIB_WARNING(("rhyper.c: afc(i), i=%d < 0 -- SHOULD NOT HAPPEN!\n"), i);
+	return -1; // unreached
     }
-    return value;
+    if (i <= 7)
+	return al[i];
+    // else i >= 8 :
+    double di = i, i2 = di*di;
+    return (di + 0.5) * log(di) - di + M_LN_SQRT_2PI +
+	(0.0833333333333333 - 0.00277777777777778 / i2) / di;
 }
 
+//     rhyper(NR, NB, n) -- NR 'red', NB 'blue', n drawn, how many are 'red'
 double rhyper(double nn1in, double nn2in, double kkin)
 {
-    const static double deltal = 0.0078;
-    const static double deltau = 0.0034;
-
     /* extern double afc(int); */
 
     int nn1, nn2, kk;
-    int i, ix;
-    Rboolean reject, setup1, setup2;
-
-    double e, f, g, r, t, y;
+    int ix; // return value (coerced to double at the very end)
+    Rboolean setup1, setup2;
 
     /* These should become 'thread_local globals' : */
     static int ks = -1, n1s = -1, n2s = -1;
-    static int k, m, minjx, maxjx, n1, n2;
+    static int m, minjx, maxjx;
+    static int k, n1, n2; // <- not allowing larger integer par
     static double tn;
+
     // II :
     static double w;
     // III:
@@ -106,16 +104,28 @@
     if(!R_FINITE(nn1in) || !R_FINITE(nn2in) || !R_FINITE(kkin))
 	ML_ERR_return_NAN;
 
-    // Disabling large (nn1, nn2, kk) { =^= rhyper (m,n,k) }:
-    nn1 = (int) R_forceint(nn1in);
-    nn2 = (int) R_forceint(nn2in);
-    kk	= (int) R_forceint(kkin);
+    nn1in = R_forceint(nn1in);
+    nn2in = R_forceint(nn2in);
+    kkin  = R_forceint(kkin);
 
-    if (nn1 < 0 || nn2 < 0 || kk < 0 || kk > nn1 + nn2)
+    if (nn1in < 0 || nn2in < 0 || kkin < 0 || kkin > nn1in + nn2in)
 	ML_ERR_return_NAN;
+    if (nn1in >= INT_MAX || nn2in >= INT_MAX || kkin >= INT_MAX) {
+	/* large n -- evade integer overflow (and inappropriate algorithms)
+	   -------- */
+        // FIXME: Much faster to give rbinom() approx when appropriate; -> see Kuensch(1989)
+	// Johnson, Kotz,.. p.258 (top) mention the *four* different binomial approximations
+	if(kkin == 1.) { // Bernoulli
+	    return rbinom(kkin, nn1in / (nn1in + nn2in));
+	}
+	// Slow, but safe: return  F^{-1}(U)  where F(.) = phyper(.) and  U ~ U[0,1]
+	return qhyper(unif_rand(), nn1in, nn2in, kkin, FALSE, FALSE);
+    }
+    nn1 = (int)nn1in;
+    nn2 = (int)nn2in;
+    kk  = (int)kkin;
 
     /* if new parameter values, initialize */
-    reject = TRUE;
     if (nn1 != n1s || nn2 != n2s) {
 	setup1 = TRUE;	setup2 = TRUE;
     } else if (kk != ks) {
@@ -144,34 +154,27 @@
 	}
     }
     if (setup1 || setup2) {
-	m = (int) ((k + 1.0) * (n1 + 1.0) / (tn + 2.0));
+	m = (int) ((k + 1.) * (n1 + 1.) / (tn + 2.));
 	minjx = imax2(0, k - n2);
 	maxjx = imin2(n1, k);
+#ifdef DEBUG_rhyper
+	REprintf("rhyper(nn1=%d, nn2=%d, kk=%d), setup: floor(mean)= m=%d, jx in (%d..%d)\n",
+		 nn1, nn2, kk, m, minjx, maxjx);
+#endif
     }
     /* generate random variate --- Three basic cases */
 
     if (minjx == maxjx) { /* I: degenerate distribution ---------------- */
+#ifdef DEBUG_rhyper
+	REprintf("rhyper(), branch I (degenerate)\n");
+#endif
 	ix = maxjx;
-	/* return ix;
-	   No, need to unmangle <TSL>*/
-	/* return appropriate variate */
-
-	if (kk + kk >= tn) {
-	  if (nn1 > nn2) {
-	    ix = kk - nn2 + ix;
-	  } else {
-	    ix = nn1 - ix;
-	  }
-	} else {
-	  if (nn1 > nn2)
-	    ix = kk - ix;
-	}
-	return ix;
+	goto L_finis; // return appropriate variate
 
     } else if (m - minjx < 10) { // II: (Scaled) algorithm HIN (inverse transformation) ----
 	const static double scale = 1e25; // scaling factor against (early) underflow
 	const static double con = 57.5646273248511421;
-                                          // 25*log(10) = log(scale) { <==> exp(con) == scale }
+					  // 25*log(10) = log(scale) { <==> exp(con) == scale }
 	if (setup1 || setup2) {
 	    double lw; // log(w);  w = exp(lw) * scale = exp(lw + log(scale)) = exp(lw + con)
 	    if (k < n2) {
@@ -182,17 +185,27 @@
 	    w = exp(lw + con);
 	}
 	double p, u;
+#ifdef DEBUG_rhyper
+	REprintf("rhyper(), branch II; w = %g > 0\n", w);
+#endif
       L10:
 	p = w;
 	ix = minjx;
 	u = unif_rand() * scale;
+#ifdef DEBUG_rhyper
+	REprintf("  _new_ u = %g\n", u);
+#endif
 	while (u > p) {
 	    u -= p;
 	    p *= ((double) n1 - ix) * (k - ix);
 	    ix++;
 	    p = p / ix / (n2 - k + ix);
+#ifdef DEBUG_rhyper
+	    REprintf("       ix=%3d, u=%11g, p=%20.14g (u-p=%g)\n", ix, u, p, u-p);
+#endif
 	    if (ix > maxjx)
 		goto L10;
+	    // FIXME  if(p == 0.)  we also "have lost"  => goto L10
 	}
     } else { /* III : H2PE Algorithm --------------------------------------- */
 
@@ -221,9 +234,24 @@
 	    p2 = p1 + kl / lamdl;
 	    p3 = p2 + kr / lamdr;
 	}
+#ifdef DEBUG_rhyper
+	REprintf("rhyper(), branch III {accept/reject}: (xl,xr)= (%g,%g); (lamdl,lamdr)= (%g,%g)\n",
+		 xl, xr, lamdl,lamdr);
+	REprintf("-------- p123= c(%g,%g,%g)\n", p1,p2, p3);
+#endif
+	int n_uv = 0;
       L30:
 	u = unif_rand() * p3;
 	v = unif_rand();
+	n_uv++;
+	if(n_uv >= 10000) {
+	    REprintf("rhyper() branch III: giving up after %d rejections", n_uv);
+	    ML_ERR_return_NAN;
+        }
+#ifdef DEBUG_rhyper
+	REprintf(" ... L30: new (u=%g, v ~ U[0,1])[%d]\n", u, n_uv);
+#endif
+
 	if (u < p1) {		/* rectangular region */
 	    ix = (int) (xl + u);
 	} else if (u <= p2) {	/* left tail */
@@ -239,6 +267,7 @@
 	}
 
 	/* acceptance/rejection test */
+	Rboolean reject = TRUE;
 
 	if (m < 100 || ix <= 50) {
 	    /* explicit evaluation */
@@ -247,7 +276,8 @@
 	       in the (m > ix) case, but the definition of the
 	       recurrence relation on p134 shows that the +1 is
 	       needed. */
-	    f = 1.0;
+	    int i;
+	    double f = 1.0;
 	    if (m < ix) {
 		for (i = m + 1; i <= ix; i++)
 		    f = f * (n1 - i + 1) * (k - i + 1) / (n2 - k + i) / i;
@@ -259,8 +289,17 @@
 		reject = FALSE;
 	    }
 	} else {
+
+	    const static double deltal = 0.0078;
+	    const static double deltau = 0.0034;
+
+	    double e, g, r, t, y;
 	    double de, dg, dr, ds, dt, gl, gu, nk, nm, ub;
 	    double xk, xm, xn, y1, ym, yn, yk, alv;
+
+#ifdef DEBUG_rhyper
+	    REprintf(" ... accept/reject 'large' case v=%g\n", v);
+#endif
 	    /* squeeze using upper and lower bounds */
 	    y = ix;
 	    y1 = y + 1.0;
@@ -325,6 +364,8 @@
 	    goto L30;
     }
 
+
+L_finis:
     /* return appropriate variate */
 
     if (kk + kk >= tn) {
diff -Nru r-base-3.2.3/src/nmath/rnbinom.c r-base-3.3.1/src/nmath/rnbinom.c
--- r-base-3.2.3/src/nmath/rnbinom.c	2015-08-25 22:18:52.000000000 +0000
+++ r-base-3.3.1/src/nmath/rnbinom.c	2016-03-16 23:04:20.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 2000--2006  The R Core Team
+ *  Copyright (C) 2000--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
  *
  *    Devroye, L. (1986).
  *    Non-Uniform Random Variate Generation.
- *    New York:Springer-Verlag. Page 480.
+ *    New York:Springer-Verlag.  Pages 488 and 543.
  *
  *  METHOD
  *
@@ -46,15 +46,17 @@
 
 double rnbinom(double size, double prob)
 {
-    if(!R_FINITE(size) || !R_FINITE(prob) || size <= 0 || prob <= 0 || prob > 1)
+    if(!R_FINITE(prob) || size <= 0 || prob <= 0 || prob > 1)
 	/* prob = 1 is ok, PR#1218 */
 	ML_ERR_return_NAN;
+    if(!R_FINITE(size)) size = DBL_MAX / 2.; // '/2' to prevent rgamma() returning Inf
     return (prob == 1) ? 0 : rpois(rgamma(size, (1 - prob) / prob));
 }
 
 double rnbinom_mu(double size, double mu)
 {
-    if(!R_FINITE(size) || !R_FINITE(mu) || size <= 0 || mu < 0)
+    if(!R_FINITE(mu) || size <= 0 || mu < 0)
 	ML_ERR_return_NAN;
+    if(!R_FINITE(size)) size = DBL_MAX / 2.;
     return (mu == 0) ? 0 : rpois(rgamma(size, mu / size));
 }
diff -Nru r-base-3.2.3/src/nmath/standalone/Makefile.in r-base-3.3.1/src/nmath/standalone/Makefile.in
--- r-base-3.2.3/src/nmath/standalone/Makefile.in	2015-08-25 22:18:53.000000000 +0000
+++ r-base-3.3.1/src/nmath/standalone/Makefile.in	2015-12-10 23:15:18.000000000 +0000
@@ -121,7 +121,8 @@
 	@touch $@
 
 libRmath.a: $(libRmath_a_OBJECTS)
-	$(AR) cr $@ $(libRmath_a_OBJECTS)
+	@rm -rf $@
+	$(AR) -cr $@ $(libRmath_a_OBJECTS)
 	$(RANLIB) $@
 
 ## under peculiar circumstances, $(LIBM) here helps.
diff -Nru r-base-3.2.3/src/nmath/toms708.c r-base-3.3.1/src/nmath/toms708.c
--- r-base-3.2.3/src/nmath/toms708.c	2015-03-18 23:04:00.000000000 +0000
+++ r-base-3.3.1/src/nmath/toms708.c	2016-03-01 23:15:08.000000000 +0000
@@ -26,7 +26,6 @@
  (cd `R-devel-pbeta-dbg RHOME`/src/nmath ; gcc -I. -I../../src/include -I../../../R/src/include  -DHAVE_CONFIG_H -fopenmp -g -pedantic -Wall --std=gnu99 -DDEBUG_q -DDEBUG_bratio -Wcast-align -Wclobbered  -c ../../../R/src/nmath/toms708.c -o toms708.o; cd ../..; make R)
 */
 #ifdef DEBUG_bratio
-# include <R_ext/Print.h>
 # define R_ifDEBUG_printf(...) REprintf(__VA_ARGS__)
 #else
 # define R_ifDEBUG_printf(...)
@@ -241,7 +240,7 @@
 	REprintf(" ==> new w1=%.15g", *w1);
 	if(ierr1) REprintf(" ERROR(code=%d)\n", ierr1) ; else REprintf("\n");
 #endif
-	if(*w1 == 0 || (0 < *w1 && *w1 < 1e-310)) { // w1=0 or very close:
+	if(*w1 == 0 || (0 < *w1 && *w1 < DBL_MIN)) { // w1=0 or very close:
 	    // "almost surely" from underflow, try more: [2013-03-04]
 // FIXME: it is even better to do this in bgrat *directly* at least for the case
 //  !did_bup, i.e., where *w1 = (0 or -Inf) on entry
@@ -267,11 +266,11 @@
     }
     else { /* L30: -------------------- both  a, b > 1  {a0 > 1  &  b0 > 1} ---*/
 
-	if (a > b)
-	    lambda = (a + b) * y - b;
-	else
-	    lambda = a - (a + b) * x;
-
+	/* lambda := a y - b x  =  (a + b)y  =  a - (a+b)x    {using x + y == 1},
+	 * ------ using the numerically best version : */
+	lambda = R_FINITE(a+b)
+	    ? ((a > b) ? (a + b) * y - b : a - (a + b) * x)
+	    : a*y - b*x;
 	do_swap = (lambda < 0.);
 	if (do_swap) {
 	    lambda = -lambda;
@@ -286,7 +285,7 @@
 	if (b0 < 40.) {
 	    R_ifDEBUG_printf("  b0 < 40;");
 	    if (b0 * x0 <= 0.7
-		|| (log_p && lambda > 650.)) /* << added 2010-03-18 */
+		|| (log_p && lambda > 650.)) // << added 2010-03; svn r51327
 		goto L_w_bpser;
 	    else
 		goto L140;
@@ -344,12 +343,13 @@
 
     *w = bup(b0, a0, y0, x0, n, eps, FALSE);
 
-    R_ifDEBUG_printf(" L140: *w := bup(b0=%g,..) = %.15g; ", b0, *w);
     if(*w < DBL_MIN && log_p) { /* do not believe it; try bpser() : */
+	R_ifDEBUG_printf(" L140: bup(b0=%g,..)=%.15g < DBL_MIN - not used; ", b0, *w);
 	/*revert: */ b0 += n;
 	/* which is only valid if b0 <= 1 || b0*x0 <= 0.7 */
 	goto L_w_bpser;
     }
+    R_ifDEBUG_printf(" L140: *w := bup(b0=%g,..) = %.15g; ", b0, *w);
     if (x0 <= 0.7) {
 	/* log_p :  TODO:  w = bup(.) + bpser(.)  -- not so easy to use log-scale */
 	*w += bpser(a0, b0, x0, eps, /* log_p = */ FALSE);
@@ -512,10 +512,11 @@
 /* -----------------------------------------------------------------------
  * Power SERies expansion for evaluating I_x(a,b) when
  *	       b <= 1 or b*x <= 0.7.   eps is the tolerance used.
+ * NB: if log_p is TRUE, also use it if   (b < 40  & lambda > 650)
  * ----------------------------------------------------------------------- */
 
     int i, m;
-    double ans, c, n, t, u, w, z, a0, b0, apb, tol, sum;
+    double ans, c, t, u, z, a0, b0, apb;
 
     if (x == 0.) {
 	return R_D__0;
@@ -605,12 +606,11 @@
 /* ----------------------------------------------------------------------- */
 /*		       COMPUTE THE SERIES */
 /* ----------------------------------------------------------------------- */
-    sum = 0.;
-    n = 0.;
+    double tol = eps / a,
+	n = 0.,
+	sum = 0., w;
     c = 1.;
-    tol = eps / a;
-
-    do {
+    do { // sum is alternating as long as n < b (<==> 1 - b/n < 0)
 	n += 1.;
 	c *= (0.5 - b / n + 0.5) * x;
 	w = c / (a + n);
@@ -619,7 +619,7 @@
     if(fabs(w) > tol) { // the series did not converge (in time)
 	// warn only when the result seems to matter:
 	if(( log_p && !(a*sum > -1. && fabs(log1p(a * sum)) < eps*fabs(ans))) ||
-	   (!log_p && fabs(a*sum + 1) != 1.))
+	   (!log_p && fabs(a*sum + 1.) != 1.))
 	    MATHLIB_WARNING5(
 		" bpser(a=%g, b=%g, x=%g,...) did not converge (n=1e7, |w|/tol=%g > 1; A=%g)",
 		a,b,x, fabs(w)/tol, ans);
@@ -629,9 +629,17 @@
 		     tol, a*sum);
     if(log_p) {
 	if (a*sum > -1.) ans += log1p(a * sum);
-	else ans = ML_NEGINF;
-    } else
-	ans *= a * sum + 1.;
+	else {
+	    if(ans > ML_NEGINF)
+		MATHLIB_WARNING3(
+		    "pbeta(*, log.p=TRUE) -> bpser(a=%g, b=%g, x=%g,...) underflow to -Inf",
+		    a,b,x);
+	    ans = ML_NEGINF;
+	}
+    } else if (a*sum > -1.)
+	ans *= (a * sum + 1.);
+    else // underflow to
+	ans = 0.;
     return ans;
 } /* bpser */
 
@@ -643,12 +651,9 @@
 /*     EPS IS THE TOLERANCE USED. */
 /* ----------------------------------------------------------------------- */
 
-    /* System generated locals */
     double ret_val;
-
-    /* Local variables */
     int i, k, mu;
-    double d, l, r, t;
+    double d, l;
 
 // Obtain the scaling factor exp(-mu) and exp(mu)*(x^a * y^b / beta(a,b))/a
 
@@ -659,8 +664,7 @@
 	k = (int) exparg(0);
 	if (mu > k)
 	    mu = k;
-	t = (double) mu;
-	d = exp(-t);
+ 	d = exp(-(double) mu);
     }
     else {
 	mu = 0;
@@ -681,42 +685,31 @@
 /*          LET K BE THE INDEX OF THE MAXIMUM TERM */
 
     k = 0;
-    if (b <= 1.) {
-	goto L40;
-    }
-    if (y > 1e-4) {
-	r = (b - 1.) * x / y - a;
-	if (r < 1.) {
-	    goto L40;
-	}
-	k = nm1;
-	t = (double) nm1;
-	if (r < t) {
-	    k = (int) r;
+    if (b > 1.) {
+	if (y > 1e-4) {
+	    double r = (b - 1.) * x / y - a;
+	    if (r >= 1.)
+		k = (r < nm1) ? (int) r : nm1;
+	} else
+	    k = nm1;
+
+//          ADD THE INCREASING TERMS OF THE SERIES - if k > 0
+/* L30: */
+	for (i = 0; i < k; ++i) {
+	    l = (double) i;
+	    d *= (apb + l) / (ap1 + l) * x;
+	    w += d;
 	}
-    } else {
-	k = nm1;
     }
 
-/*          ADD THE INCREASING TERMS OF THE SERIES */
+// L40:     ADD THE REMAINING TERMS OF THE SERIES
 
-/* L30: */
-    for (i = 1; i <= k; ++i) {
-	l = (double) (i - 1);
-	d = (apb + l) / (ap1 + l) * x * d;
+    for (i = k; i < nm1; ++i) {
+	l = (double) i;
+	d *= (apb + l) / (ap1 + l) * x;
 	w += d;
-	/* L31: */
-    }
-    if (k != nm1) {
-	/*          ADD THE REMAINING TERMS OF THE SERIES */
-    L40:
-	for (i = k+1; i <= nm1; ++i) {
-	    l = (double) (i - 1);
-	    d = (apb + l) / (ap1 + l) * x * d;
-	    w += d;
-	    if (d <= eps * w) /* relativ convergence (eps) */
-		break;
-	}
+	if (d <= eps * w) /* relativ convergence (eps) */
+	    break;
     }
 
     // L50: TERMINATE THE PROCEDURE
@@ -737,12 +730,24 @@
    -----------------------------------------------------------------------*/
 
     double c, e, n, p, r, s, t, w, c0, c1, r0, an, bn, yp1, anp1, bnp1,
-	beta, alpha;
-
-    double brc = brcomp(a, b, x, y, log_p);
+	beta, alpha, brc;
 
-    if (!log_p && brc == 0.) /* already underflowed to 0 */
+    if(!R_FINITE(lambda)) return ML_NAN;// TODO: can return 0 or 1 (?)
+    R_ifDEBUG_printf(" bfrac(a=%g, b=%g, x=%g, y=%g, lambda=%g, eps=%g, log_p=%d):",
+		     a,b,x,y, lambda, eps, log_p);
+    brc = brcomp(a, b, x, y, log_p);
+    if(ISNAN(brc)) { // e.g. from   L <- 1e308; pnbinom(L, L, mu = 5)
+	R_ifDEBUG_printf(" --> brcomp(a,b,x,y) = NaN\n");
+	ML_ERR_return_NAN; // TODO: could we know better?
+    }
+    if (!log_p && brc == 0.) {
+	R_ifDEBUG_printf(" --> brcomp(a,b,x,y) underflowed to 0.\n");
 	return 0.;
+    }
+#ifdef DEBUG_bratio
+    else
+	REprintf("\n");
+#endif
 
     c = lambda + 1.;
     c0 = b / a;
@@ -773,18 +778,17 @@
 
 	/* update an, bn, anp1, and bnp1 */
 
-	t = alpha * an + beta * anp1;
-	an = anp1;
-	anp1 = t;
-	t = alpha * bn + beta * bnp1;
-	bn = bnp1;
-	bnp1 = t;
+	t = alpha * an + beta * anp1;	an = anp1;	anp1 = t;
+	t = alpha * bn + beta * bnp1;	bn = bnp1;	bnp1 = t;
 
 	r0 = r;
 	r = anp1 / bnp1;
-	if (fabs(r - r0) <= eps * r) {
+#ifdef _not_normally_DEBUG_bfrac
+	R_ifDEBUG_printf(" n=%5.0f, a_{n,n+1}= (%12g,%12g),  b_{n,n+1} = (%12g,%12g) => r0,r = (%14g,%14g)\n",
+			 n, an,anp1, bn,bnp1, r0, r);
+#endif
+	if (fabs(r - r0) <= eps * r)
 	    break;
-	}
 
 	/* rescale an, bn, anp1, and bnp1 */
 
@@ -792,8 +796,13 @@
 	bn /= bnp1;
 	anp1 = r;
 	bnp1 = 1.;
-    } while (1);
-
+    } while (n < 10000);// arbitrary; had '1' --> infinite loop for  lambda = Inf
+    R_ifDEBUG_printf("  in bfrac(): n=%.0f terms cont.frac.; brc=%g, r=%g\n",
+		     n, brc, r);
+    if(n >= 10000)
+	MATHLIB_WARNING5(
+	    " bfrac(a=%g, b=%g, x=%g, y=%g, lambda=%g) did *not* converge (in 10000 steps)\n",
+	    a,b,x,y, lambda);
     return (log_p ? brc + log(r) : brc * r);
 } /* bfrac */
 
diff -Nru r-base-3.2.3/src/scripts/config r-base-3.3.1/src/scripts/config
--- r-base-3.2.3/src/scripts/config	2015-08-25 22:18:55.000000000 +0000
+++ r-base-3.3.1/src/scripts/config	2016-04-24 22:15:05.000000000 +0000
@@ -20,7 +20,7 @@
 ## A copy of the GNU General Public License is available at
 ## https://www.R-project.org/Licenses/
 
-revision='$Revision: 69170 $'
+revision='$Revision: 70539 $'
 version=`set - ${revision}; echo ${2}`
 version="R configuration information retrieval script: ${R_VERSION} (r${version})
 
@@ -109,7 +109,16 @@
   TCLTK_CPPFLAGS
 		flags needed for finding the tcl.h and tk.h headers
   TCLTK_LIBS    flags needed for linking against the Tcl and Tk libraries
+"
 
+if test "${R_OSTYPE}" = "windows"; then
+  usage="${usage}
+Windows only:
+  COMPILED_BY   name and version of compiler used to build R"
+fi
+
+usage="${usage}
+  
 Report bugs at bugs.r-project.org ."
 
 ## <NOTE>
@@ -219,7 +228,7 @@
 fi
 if test "${personal}" = "yes"; then
   if test "${R_OSTYPE}" = "windows"; then
-    if test -n "${R_MAKEVARS_USER}"; then
+    if test -f "${R_MAKEVARS_USER}"; then
       makefiles="${makefiles} -f ${R_MAKEVARS_USER}"
     elif test ${R_ARCH} = "/x64" -a -f "${HOME}/.R/Makevars.win64"; then
       makefiles="${makefiles} -f ${HOME}/.R/Makevars.win64"
@@ -230,7 +239,7 @@
     fi
   else
     . ${R_HOME}/etc${R_ARCH}/Renviron
-    if test -n "${R_MAKEVARS_USER}"; then
+    if test -f "${R_MAKEVARS_USER}"; then
       makefiles="${makefiles} -f ${R_MAKEVARS_USER}"
     elif test -f "${HOME}/.R/Makevars-${R_PLATFORM}"; then
       makefiles="${makefiles} -f ${HOME}/.R/Makevars-${R_PLATFORM}"
@@ -250,7 +259,7 @@
 ok_ld_vars="LDFLAGS"
 ok_shlib_vars="SHLIB_CFLAGS SHLIB_CXXLD SHLIB_CXXLDFLAGS SHLIB_EXT SHLIB_FFLAGS SHLIB_LD SHLIB_LDFLAGS SHLIB_FCLD SHLIB_FCLDFLAGS"
 ok_tcltk_vars="TCLTK_CPPFLAGS TCLTK_LIBS"
-ok_other_vars="BLAS_LIBS LAPACK_LIBS MAKE LIBnn LOCAL_SOFT"
+ok_other_vars="BLAS_LIBS LAPACK_LIBS MAKE LIBnn LOCAL_SOFT COMPILED_BY"
 
 ## Can we do this elegantly using case?
 
diff -Nru r-base-3.2.3/src/scripts/f77_f2c.in r-base-3.3.1/src/scripts/f77_f2c.in
--- r-base-3.2.3/src/scripts/f77_f2c.in	2015-08-25 22:18:55.000000000 +0000
+++ r-base-3.3.1/src/scripts/f77_f2c.in	2016-03-16 23:04:23.000000000 +0000
@@ -21,7 +21,7 @@
 ## A copy of the GNU General Public License is available at
 ## https://www.R-project.org/Licenses/
 
-revision='$Rev: 69170 $'
+revision='$Rev: 68951 $'
 version=`set - ${revision}; echo ${2}`
 version="R front-end script to f2c: ${R_VERSION} (r${version})
 
diff -Nru r-base-3.2.3/src/unix/dynload.c r-base-3.3.1/src/unix/dynload.c
--- r-base-3.2.3/src/unix/dynload.c	2015-08-25 22:15:27.000000000 +0000
+++ r-base-3.3.1/src/unix/dynload.c	2016-03-16 23:02:21.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995-1996 Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997-2001 The R Core Team
+ *  Copyright (C) 1997-2016 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -167,17 +167,13 @@
 
     if(asLocal != 0) {
 #ifndef RTLD_LOCAL
-# ifndef __CYGWIN__
 	DL_WARN(0);
-# endif
 #else
 	openFlag = RTLD_LOCAL;
 #endif
     } else {
 #ifndef RTLD_GLOBAL
-# ifndef __CYGWIN__
 	DL_WARN(1);
-# endif
 #else
 	openFlag = RTLD_GLOBAL;
 #endif
@@ -185,17 +181,13 @@
 
     if(now != 0) {
 #ifndef RTLD_NOW
-# ifndef __CYGWIN__
 	DL_WARN(2);
-# endif
 #else
 	openFlag |= RTLD_NOW;
 #endif
     } else {
 #ifndef RTLD_LAZY
-# ifndef __CYGWIN__
 	DL_WARN(3);
-# endif
 #else
 	openFlag |= RTLD_LAZY;
 #endif
diff -Nru r-base-3.2.3/src/unix/Makefile.in r-base-3.3.1/src/unix/Makefile.in
--- r-base-3.2.3/src/unix/Makefile.in	2015-09-02 22:15:06.000000000 +0000
+++ r-base-3.3.1/src/unix/Makefile.in	2015-12-10 23:15:13.000000000 +0000
@@ -53,8 +53,8 @@
 	(cd ../include; $(MAKE) $(@F))
 
 libunix.a: $(OBJECTS)
-	rm -rf $@
-	$(AR) cr $@ $(OBJECTS)
+	@rm -rf $@
+	$(AR) -cr $@ $(OBJECTS)
 	$(RANLIB) $@
 
 mostlyclean: clean
diff -Nru r-base-3.2.3/src/unix/sys-std.c r-base-3.3.1/src/unix/sys-std.c
--- r-base-3.2.3/src/unix/sys-std.c	2015-08-25 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/unix/sys-std.c	2016-06-09 22:15:06.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2015  The R Core Team
+ *  Copyright (C) 1997--2016  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -422,7 +422,8 @@
 
 # ifdef HAVE_READLINE_READLINE_H
 #  include <readline/readline.h>
-/* For compatibility with pre-readline4.2 systems: */
+/* For compatibility with pre-readline-4.2 systems, 
+   also missing in Apple's emulation via the NetBSD editline library.*/
 #  if !defined (_RL_FUNCTION_TYPEDEF)
 typedef void rl_vcpfunc_t (char *);
 #  endif /* _RL_FUNCTION_TYPEDEF */
@@ -432,6 +433,9 @@
 extern void rl_callback_handler_remove(void);
 extern void rl_callback_read_char(void);
 extern char *tilde_expand (const char *);
+extern const char *rl_readline_name;
+/* Other externals are used, but only if the readline >= 6.3 is detected,
+   and that requires the header. */
 # endif
 
 attribute_hidden
@@ -524,10 +528,36 @@
 
    rl_callback_handler_install(prompt, f);
    /* flush stdout in case readline wrote the prompt, but didn't flush
-      stdout to make it visible. (needed for Apple's rl in OS X 10.4-pre) */
+      stdout to make it visible. (needed for Apple's readline emulation). */
    fflush(stdout);
 }
 
+#if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0600
+/*
+  Fix for PR#16603.
+
+  The readline interface is somewhat messy. readline contains the
+  function rl_free_line_state(), which its internal SIGINT handler
+  calls. However, it only cancels keyboard macros and certain other
+  things: it does not clear the line. Also, as of readline 6.3, its
+  SIGINT handler is no longer triggered during our select() loop since
+  rl_callback_handler_install() no longer installs signal handlers.
+  So we have to catch the signal and do all the work ourselves to get
+  Bash-like behavior on Ctrl-C.
+ */
+static void resetReadline(void)
+{
+    rl_free_line_state();
+    rl_cleanup_after_signal();
+    RL_UNSETSTATE(RL_STATE_ISEARCH | RL_STATE_NSEARCH | RL_STATE_VIMOTION |
+		  RL_STATE_NUMERICARG | RL_STATE_MULTIKEY);
+    /* The following two lines should be equivalent, but doing both
+       won't hurt. */
+    rl_line_buffer[rl_point = rl_end = rl_mark = 0] = 0;
+    rl_done = 1;
+}
+#endif
+
 /*
   Unregister the current readline handler and pop it from R's readline
   stack, followed by re-registering the previous one.
@@ -535,6 +565,9 @@
 static void popReadline(void)
 {
   if(ReadlineStack.current > -1) {
+#if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0600
+     resetReadline();
+#endif
      rl_callback_handler_remove();
      ReadlineStack.fun[ReadlineStack.current--] = NULL;
      if(ReadlineStack.current > -1 && ReadlineStack.fun[ReadlineStack.current])
@@ -1103,7 +1136,7 @@
 	PrintWarnings();	/* from device close and (if run) .Last */
     if(ifp) {
 	fclose(ifp);    /* input file from -f or --file= */
-	ifp = NULL;	/* To avoid trying to close it again */
+	ifp = NULL; 	/* To avoid trying to close it again */
     }
     fpu_setup(FALSE);
 
diff -Nru r-base-3.2.3/src/unix/system.c r-base-3.3.1/src/unix/system.c
--- r-base-3.2.3/src/unix/system.c	2015-08-25 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/unix/system.c	2016-03-16 23:02:21.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2014  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@
 #include <R_ext/Rdynload.h>
 DL_FUNC ptr_do_flushconsole;
 void R_FlushConsole(void) {
-    if (ptr_R_FlushConsole) ptr_R_FlushConsole();
+    if (ptr_R_FlushConsole) ptr_R_FlushConsole(); 
     else if (ptr_do_flushconsole) ptr_do_flushconsole();
 }
 #endif
@@ -143,12 +143,24 @@
 
 int R_running_as_main_program = 0;
 
-/* In src/main/main.c, to avoid inlining */
+/* In ../main/main.c, to avoid inlining */
 extern uintptr_t dummy_ii(void);
 
 /* Protection against embedded misuse, PR#15420 */
 static int num_initialized = 0;
 
+static char* unescape_arg(char *p, char* avp) {
+    /* Undo the escaping done in the front end */
+    char *q;
+    for(q = avp; *q; q++) {
+	if(*q == '~' && *(q+1) == '+' && *(q+2) == '~') {
+	    q += 2;
+	    *p++ = ' ';
+	} else *p++ = *q;
+    }
+    return p;
+}
+
 int Rf_initialize_R(int ac, char **av)
 {
     int i, ioff = 1, j;
@@ -304,57 +316,32 @@
 		UsingReadline = FALSE;
 	    } else if(!strcmp(*av, "-f")) {
 		ac--; av++;
-		Rp->R_Interactive = FALSE;
-		if(strcmp(*av, "-")) {
-		    /* Undo the escaping done in the front end */
-		    char path[PATH_MAX], *p = path, *q;
-		    for(q = *av; *q; q++) {
-			if(*q == '~' && *(q+1) == '+' && *(q+2) == '~') {
-			    q += 2;
-			    *p++ = ' ';
-			} else *p++ = *q;
-		    }
-		    *p = '\0';
-		    ifp = R_fopen(path, "r");
-		    if(!ifp) {
-			snprintf(msg, 1024,
-				 _("cannot open file '%s': %s"),
-				 path, strerror(errno));
-			R_Suicide(msg);
-		    }
+#define R_INIT_TREAT_F(_AV_)						\
+		Rp->R_Interactive = FALSE;				\
+		if(strcmp(_AV_, "-")) {					\
+		    char path[PATH_MAX], *p = path;			\
+		    p = unescape_arg(p, _AV_);				\
+		    *p = '\0';						\
+		    ifp = R_fopen(path, "r");				\
+		    if(!ifp) {						\
+			snprintf(msg, 1024,				\
+				 _("cannot open file '%s': %s"),	\
+				 path, strerror(errno));		\
+			R_Suicide(msg);					\
+		    }							\
 		}
+		R_INIT_TREAT_F(*av);
+
 	    } else if(!strncmp(*av, "--file=", 7)) {
-		Rp->R_Interactive = FALSE;
-		if(strcmp((*av)+7, "-")) {
-		    /* Undo the escaping done in the front end */
-		    char path[PATH_MAX], *p = path, *q;
-		    for(q = (*av)+7; *q; q++) {
-			if(*q == '~' && *(q+1) == '+' && *(q+2) == '~') {
-			    q += 2;
-			    *p++ = ' ';
-			} else *p++ = *q;
-		    }
-		    *p = '\0';
-		    ifp = R_fopen(path, "r");
-		    if(!ifp) {
-			snprintf(msg, 1024,
-				 _("cannot open file '%s': %s"),
-				 path, strerror(errno));
-			R_Suicide(msg);
-		    }
-		}
+
+		R_INIT_TREAT_F((*av)+7);
+
 	    } else if(!strcmp(*av, "-e")) {
 		ac--; av++;
 		Rp->R_Interactive = FALSE;
 		if(strlen(cmdlines) + strlen(*av) + 2 <= 10000) {
-		    char *p = cmdlines+strlen(cmdlines), *q;
-		    /* Undo the escaping done in the front end */
-		    for(q = *av; *q; q++) {
-			if(*q == '~' && *(q+1) == '+' && *(q+2) == '~') {
-			    q += 2;
-			    *p++ = ' ';
-			} else *p++ = *q;
-		    }
+		    char *p = cmdlines+strlen(cmdlines);
+		    p = unescape_arg(p, *av);
 		    *p++ = '\n'; *p = '\0';
 		} else {
 		    snprintf(msg, 1024, _("WARNING: '-e %s' omitted as input is too long\n"), *av);
@@ -411,7 +398,7 @@
 #ifdef HAVE_AQUA
     /* for Aqua and non-dumb terminal use callbacks instead of connections
        and pretty-print warnings/errors (ESS = dumb terminal) */
-    if(useaqua ||
+    if(useaqua || 
        (R_Interactive && getenv("TERM") && strcmp(getenv("TERM"), "dumb"))) {
 	R_Outputfile = NULL;
 	R_Consolefile = NULL;
@@ -419,8 +406,8 @@
 	ptr_R_WriteConsole = NULL;
     } else {
 #endif
-    R_Outputfile = stdout;
-    R_Consolefile = stderr;
+	R_Outputfile = stdout;
+	R_Consolefile = stderr;
 #ifdef HAVE_AQUA
     }
 #endif
diff -Nru r-base-3.2.3/src/unix/sys-unix.c r-base-3.3.1/src/unix/sys-unix.c
--- r-base-3.2.3/src/unix/sys-unix.c	2015-08-25 22:15:25.000000000 +0000
+++ r-base-3.3.1/src/unix/sys-unix.c	2016-03-16 23:02:21.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2014  The R Core Team
+ *  Copyright (C) 1997--2015  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -159,6 +159,7 @@
 
 SEXP attribute_hidden do_machine(SEXP call, SEXP op, SEXP args, SEXP env)
 {
+    checkArity(op, args);
     return mkString("Unix");
 }
 
@@ -250,7 +251,13 @@
 	error(_("'intern' must be logical and not NA"));
     if (intern) { /* intern = TRUE */
 	FILE *fp;
-	char *x = "r", buf[INTERN_BUFSIZE];
+	char *x = "r",
+#ifdef HAVE_GETLINE
+	    *buf = NULL;
+	size_t buf_len = 0;
+#else
+	    buf[INTERN_BUFSIZE];
+#endif
 	const char *cmd;
 	int i, j, res;
 	SEXP tchar, rval;
@@ -261,16 +268,26 @@
 	if(!(fp = R_popen(cmd, x)))
 	    error(_("cannot popen '%s', probable reason '%s'"),
 		  cmd, strerror(errno));
+#ifdef HAVE_GETLINE
+        size_t read;
+        for(i = 0; (read = getline(&buf, &buf_len, fp)) != -1; i++) {
+	    if (buf[read - 1] == '\n')
+#else
 	for (i = 0; fgets(buf, INTERN_BUFSIZE, fp); i++) {
 	    size_t read = strlen(buf);
 	    if(read >= INTERN_BUFSIZE - 1)
 		warning(_("line %d may be truncated in call to system(, intern = TRUE)"), i + 1);
 	    if (read > 0 && buf[read-1] == '\n')
+#endif
 		buf[read - 1] = '\0'; /* chop final CR */
 	    tchar = mkChar(buf);
 	    UNPROTECT(1);
 	    PROTECT(tlist = CONS(tchar, tlist));
 	}
+#ifdef HAVE_GETLINE
+        if (buf != NULL)
+          free(buf);
+#endif
 	res = pclose(fp);
 #ifdef HAVE_SYS_WAIT_H
 	if (WIFEXITED(res)) res = WEXITSTATUS(res);
diff -Nru r-base-3.2.3/SVN-REVISION r-base-3.3.1/SVN-REVISION
--- r-base-3.2.3/SVN-REVISION	2015-12-10 08:01:26.000000000 +0000
+++ r-base-3.3.1/SVN-REVISION	2016-06-21 07:08:01.000000000 +0000
@@ -1,2 +1,2 @@
-Revision: 69752
-Last Changed Date: 2015-12-10
+Revision: 70800
+Last Changed Date: 2016-06-21
diff -Nru r-base-3.2.3/tests/any-all.Rout.save r-base-3.3.1/tests/any-all.Rout.save
--- r-base-3.2.3/tests/any-all.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/any-all.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/arith.Rout.save r-base-3.3.1/tests/arith.Rout.save
--- r-base-3.2.3/tests/arith.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/arith.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/arith-true.Rout.save r-base-3.3.1/tests/arith-true.Rout.save
--- r-base-3.2.3/tests/arith-true.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/arith-true.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -323,5 +323,5 @@
 > 
 > ## Last Line:
 > cat('Time elapsed: ', proc.time() - .proctime00,'\n')
-Time elapsed:  0.217 0.006 0.222 0 0 
+Time elapsed:  0.138 0.002 0.139 0 0 
 > 
diff -Nru r-base-3.2.3/tests/array-subset.Rout.save r-base-3.3.1/tests/array-subset.Rout.save
--- r-base-3.2.3/tests/array-subset.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/array-subset.Rout.save	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
-Platform: x86_64-pc-linux-gnu (64-bit)
-
-R is free software and comes with ABSOLUTELY NO WARRANTY.
-You are welcome to redistribute it under certain conditions.
-Type 'license()' or 'licence()' for distribution details.
-
-R is a collaborative project with many contributors.
-Type 'contributors()' for more information and
-'citation()' on how to cite R or R packages in publications.
-
-Type 'demo()' for some demos, 'help()' for on-line help, or
-'help.start()' for an HTML browser interface to help.
-Type 'q()' to quit R.
-
-> ## array subsetting tests
-> ##
-> ## Tests should be written to raise an error on test failure
-> ##
-> 
-> ## Test for subsetting of an array using a matrix with ncol == length(dim(x))
-> 
-> ## first matrix case
-> m <- matrix(1:25, ncol=5, dimnames = list(letters[1:5], LETTERS[1:5]))
-> 
-> si <- matrix(c(1, 1, 2, 3, 3, 4), ncol = 2, byrow = TRUE)
-> ss <- matrix(c("a", "A", "b", "C", "c", "D"), ncol = 2, byrow = TRUE)
-> 
-> stopifnot(identical(m[si], m[ss]))
-> stopifnot(identical(c(1L, 12L, 18L), m[ss]))
-> 
-> ## test behavior of NA entries in subset matrix.
-> ## NA in character matrix should propagate and should not
-> ## match an NA in a dimname.
-> 
-> ## An NA in either column propagates to result
-> ssna <- ss; ssna[2, 2] <- NA
-> stopifnot(identical(c(1L, NA, 18L), m[ssna]))
-> ssna <- ss; ssna[2, 1] <- NA
-> stopifnot(identical(c(1L, NA, 18L), m[ssna]))
-> 
-> ## An NA in row/column names is not matched
-> mnadim <- m
-> tmp <- rownames(mnadim)
-> tmp[5] <- NA
-> rownames(mnadim) <- tmp
-> stopifnot(identical(c(1L, NA, 18L), m[ssna]))
-> 
-> ## Unmatched subscripts raise an error
-> ssnm <- ss
-> ssnm[2, 2] <- "NOMATCH"
-> stopifnot(inherits(try(m[ssnm], silent=TRUE), "try-error"))
-> 
-> ## "" does not match and so raises an error
-> mnadim <- m
-> tmp <- rownames(mnadim)
-> tmp[5] <- ""
-> rownames(mnadim) <- tmp
-> ssnm <- ss
-> ssnm[2, 2] <- ""
-> stopifnot(inherits(try(mnadim[ssnm], silent=TRUE), "try-error"))
-> 
-> 
-> ## test assignment
-> m3 <- m2 <- m
-> m2[si] <- c(100L, 200L, 300L)
-> m3[ss] <- c(100L, 200L, 300L)
-> stopifnot(identical(m2, m3))
-> 
-> ## now an array case
-> a <- array(1:75, dim = c(5, 5, 3),
-+            dimnames = list(letters[1:5], LETTERS[1:5], letters[24:26]))
-> 
-> si <- matrix(c(1, 1, 1,
-+                2, 3, 1,
-+                3, 4, 1,
-+                5, 1, 3),
-+              ncol = 3, byrow = TRUE)
-> 
-> ss <- matrix(c("a", "A", "x",
-+                "b", "C", "x",
-+                "c", "D", "x",
-+                "e", "A", "z"),
-+              ncol = 3, byrow = TRUE)
-> 
-> stopifnot(identical(a[si], a[ss]))
-> stopifnot(identical(c(1L, 12L, 18L, 55L), a[ss]))
-> 
-> a2 <- a1 <- a
-> a1[si] <- c(100L, 1200L, 1800L, 5500L)
-> a2[ss] <- c(100L, 1200L, 1800L, 5500L)
-> stopifnot(identical(a1, a2))
-> 
-> ## it is an error to subset if some dimnames are missing NOTE: this
-> ## gives a subscript out of bounds error, might want something more
-> ## informative?
-> a3 <- a
-> dn <- dimnames(a3)
-> dn[2] <- list(NULL)
-> dimnames(a3) <- dn
-> stopifnot(inherits(try(a3[ss], silent=TRUE), "try-error"))
-> 
diff -Nru r-base-3.2.3/tests/complex.R r-base-3.3.1/tests/complex.R
--- r-base-3.2.3/tests/complex.R	2014-01-27 23:05:06.000000000 +0000
+++ r-base-3.3.1/tests/complex.R	2016-03-16 23:04:39.000000000 +0000
@@ -127,3 +127,30 @@
 ## but they seem to assume signed zeros.
 ## Windows gave incorrect (NaN) values on the cuts.
 
+## Not a regression test, but rather one of the good cases:
+(cNaN <- as.complex("NaN"))
+stopifnot(identical(cNaN, complex(re = NaN)), is.nan(Re(cNaN)), Im(cNaN) == 0)
+dput(cNaN) ## (real = NaN, imaginary = 0)
+## Partly new behavior:
+(c0NaN  <- complex(real=0, im=NaN))
+(cNaNaN <- complex(re=NaN, im=NaN))
+stopifnot(identical(cNaN, as.complex(NaN)),
+          identical(vapply(c(cNaN, c0NaN, cNaNaN), format, ""),
+                    c("NaN+0i", "0+NaNi", "NaN+NaNi")),
+          identical(cNaN, NaN + 0i),
+          identical(cNaN, Conj(cNaN)),
+          identical(cNaN, cNaN+cNaN),
+
+          identical(cNaNaN, 1i * NaN),
+          identical(cNaNaN, complex(modulus= NaN)),
+          identical(cNaNaN, complex(argument= NaN)),
+          identical(cNaNaN, complex(arg=NaN, mod=NaN)),
+
+          identical(c0NaN, c0NaN+c0NaN), # !
+          ## Platform dependent, not TRUE e.g. on F21 gcc 4.9.2:
+          ## identical(NA_complex_, NaN + NA_complex_ ) ,
+          ## Probably TRUE, but by a standard ??
+          ## identical(cNaNaN, 2 * c0NaN), # C-library arithmetic
+          ## identical(cNaNaN, 2 * cNaN),  # C-library arithmetic
+          ## identical(cNaNaN, NA_complex_ * Inf),
+          TRUE)
diff -Nru r-base-3.2.3/tests/complex.Rout.save r-base-3.3.1/tests/complex.Rout.save
--- r-base-3.2.3/tests/complex.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/complex.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -260,4 +260,35 @@
 > ## but they seem to assume signed zeros.
 > ## Windows gave incorrect (NaN) values on the cuts.
 > 
+> ## Not a regression test, but rather one of the good cases:
+> (cNaN <- as.complex("NaN"))
+[1] NaN+0i
+> stopifnot(identical(cNaN, complex(re = NaN)), is.nan(Re(cNaN)), Im(cNaN) == 0)
+> dput(cNaN) ## (real = NaN, imaginary = 0)
+complex(real=NaN, imaginary=0)
+> ## Partly new behavior:
+> (c0NaN  <- complex(real=0, im=NaN))
+[1] 0+NaNi
+> (cNaNaN <- complex(re=NaN, im=NaN))
+[1] NaN+NaNi
+> stopifnot(identical(cNaN, as.complex(NaN)),
++           identical(vapply(c(cNaN, c0NaN, cNaNaN), format, ""),
++                     c("NaN+0i", "0+NaNi", "NaN+NaNi")),
++           identical(cNaN, NaN + 0i),
++           identical(cNaN, Conj(cNaN)),
++           identical(cNaN, cNaN+cNaN),
++ 
++           identical(cNaNaN, 1i * NaN),
++           identical(cNaNaN, complex(modulus= NaN)),
++           identical(cNaNaN, complex(argument= NaN)),
++           identical(cNaNaN, complex(arg=NaN, mod=NaN)),
++ 
++           identical(c0NaN, c0NaN+c0NaN), # !
++           ## Platform dependent, not TRUE e.g. on F21 gcc 4.9.2:
++           ## identical(NA_complex_, NaN + NA_complex_ ) ,
++           ## Probably TRUE, but by a standard ??
++           ## identical(cNaNaN, 2 * c0NaN), # C-library arithmetic
++           ## identical(cNaNaN, 2 * cNaN),  # C-library arithmetic
++           ## identical(cNaNaN, NA_complex_ * Inf),
++           TRUE)
 > 
diff -Nru r-base-3.2.3/tests/datasets.Rout.save r-base-3.3.1/tests/datasets.Rout.save
--- r-base-3.2.3/tests/datasets.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/datasets.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -47,9 +47,9 @@
  $ Treatment: Factor w/ 2 levels "nonchilled","chilled": 1 1 1 1 1 1 1 1 1 1 ...
  $ conc     : num  95 175 250 350 500 675 1000 95 175 250 ...
  $ uptake   : num  16 30.4 34.8 37.2 35.3 39.2 39.7 13.6 27.3 37.1 ...
- - attr(*, "formula")=Class 'formula' length 3 uptake ~ conc | Plant
+ - attr(*, "formula")=Class 'formula'  language uptake ~ conc | Plant
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
- - attr(*, "outer")=Class 'formula' length 2 ~Treatment * Type
+ - attr(*, "outer")=Class 'formula'  language ~Treatment * Type
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "Ambient carbon dioxide concentration"
@@ -64,9 +64,9 @@
  $ Time  : num  0 2 4 6 8 10 12 14 16 18 ...
  $ Chick : Ord.factor w/ 50 levels "18"<"16"<"15"<..: 15 15 15 15 15 15 15 15 15 15 ...
  $ Diet  : Factor w/ 4 levels "1","2","3","4": 1 1 1 1 1 1 1 1 1 1 ...
- - attr(*, "formula")=Class 'formula' length 3 weight ~ Time | Chick
+ - attr(*, "formula")=Class 'formula'  language weight ~ Time | Chick
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
- - attr(*, "outer")=Class 'formula' length 2 ~Diet
+ - attr(*, "outer")=Class 'formula'  language ~Diet
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "Time"
@@ -80,7 +80,7 @@
  $ Run    : Ord.factor w/ 11 levels "10"<"11"<"9"<..: 4 4 4 4 4 4 4 4 4 4 ...
  $ conc   : num  0.0488 0.0488 0.1953 0.1953 0.3906 ...
  $ density: num  0.017 0.018 0.121 0.124 0.206 0.215 0.377 0.374 0.614 0.609 ...
- - attr(*, "formula")=Class 'formula' length 3 density ~ conc | Run
+ - attr(*, "formula")=Class 'formula'  language density ~ conc | Run
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "DNase concentration"
@@ -89,12 +89,10 @@
   ..$ x: chr "(ng/ml)"
 
 ** structure of dataset EuStockMarkets
- mts [1:1860, 1:4] 1629 1614 1607 1621 1618 ...
+ Time-Series [1:1860, 1:4] from 1991 to 1999: 1629 1614 1607 1621 1618 ...
  - attr(*, "dimnames")=List of 2
   ..$ : NULL
   ..$ : chr [1:4] "DAX" "SMI" "CAC" "FTSE"
- - attr(*, "tsp")= num [1:3] 1991 1999 260
- - attr(*, "class")= chr [1:3] "mts" "ts" "matrix"
 
 ** structure of dataset Formaldehyde
 'data.frame':	6 obs. of  2 variables:
@@ -131,7 +129,7 @@
  $ Subject: Ord.factor w/ 6 levels "1"<"4"<"2"<"5"<..: 1 1 1 1 1 1 1 1 1 1 ...
  $ time   : num  0.25 0.5 0.75 1 1.25 2 3 4 5 6 ...
  $ conc   : num  1.5 0.94 0.78 0.48 0.37 0.19 0.12 0.11 0.08 0.07 ...
- - attr(*, "formula")=Class 'formula' length 3 conc ~ time | Subject
+ - attr(*, "formula")=Class 'formula'  language conc ~ time | Subject
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "Time since drug administration"
@@ -164,7 +162,7 @@
  $ height: num  4.51 10.89 28.72 41.74 52.7 ...
  $ age   : num  3 5 10 15 20 25 3 5 10 15 ...
  $ Seed  : Ord.factor w/ 14 levels "329"<"327"<"325"<..: 10 10 10 10 10 10 13 13 13 13 ...
- - attr(*, "formula")=Class 'formula' length 3 height ~ age | Seed
+ - attr(*, "formula")=Class 'formula'  language height ~ age | Seed
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "Age of tree"
@@ -181,7 +179,7 @@
  $ Tree         : Ord.factor w/ 5 levels "3"<"1"<"5"<"2"<..: 2 2 2 2 2 2 2 4 4 4 ...
  $ age          : num  118 484 664 1004 1231 ...
  $ circumference: num  30 58 87 115 120 142 145 33 69 111 ...
- - attr(*, "formula")=Class 'formula' length 3 circumference ~ age | Tree
+ - attr(*, "formula")=Class 'formula'  language circumference ~ age | Tree
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "Time since December 31, 1968"
@@ -210,12 +208,10 @@
  - attr(*, "reference")= chr "A1.3, p. 269"
 
 ** structure of dataset Seatbelts
- mts [1:192, 1:8] 107 97 102 87 119 106 110 106 107 134 ...
+ Time-Series [1:192, 1:8] from 1969 to 1985: 107 97 102 87 119 106 110 106 107 134 ...
  - attr(*, "dimnames")=List of 2
   ..$ : NULL
   ..$ : chr [1:8] "DriversKilled" "drivers" "front" "rear" ...
- - attr(*, "tsp")= num [1:3] 1969 1985 12
- - attr(*, "class")= chr [1:2] "mts" "ts"
 
 ** structure of dataset Theoph
 Classes 'nfnGroupedData', 'nfGroupedData', 'groupedData' and 'data.frame':	132 obs. of  5 variables:
@@ -224,7 +220,7 @@
  $ Dose   : num  4.02 4.02 4.02 4.02 4.02 4.02 4.02 4.02 4.02 4.02 ...
  $ Time   : num  0 0.25 0.57 1.12 2.02 ...
  $ conc   : num  0.74 2.84 6.57 10.5 9.66 8.58 8.36 7.47 6.89 5.94 ...
- - attr(*, "formula")=Class 'formula' length 3 conc ~ Time | Subject
+ - attr(*, "formula")=Class 'formula'  language conc ~ Time | Subject
   .. ..- attr(*, ".Environment")=<environment: R_EmptyEnv> 
  - attr(*, "labels")=List of 2
   ..$ x: chr "Time since drug administration"
diff -Nru r-base-3.2.3/tests/datetime2.Rout.save r-base-3.3.1/tests/datetime2.Rout.save
--- r-base-3.2.3/tests/datetime2.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/datetime2.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/datetime.Rout.save r-base-3.3.1/tests/datetime.Rout.save
--- r-base-3.2.3/tests/datetime.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/datetime.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/demos.Rout.save r-base-3.3.1/tests/demos.Rout.save
--- r-base-3.2.3/tests/demos.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/demos.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -115,8 +115,8 @@
 +     "\n\t starting with 'is.' :\t  ",
 +     sum(grepl("^is\\.", ls.base[base.is.f])), "\n", sep = "")
 
-Number of base objects:		1306
-Number of functions in base:	1264
+Number of base objects:		1318
+Number of functions in base:	1276
 	 starting with 'is.' :	  50
 
 > ## 0.14  : 31
@@ -1510,5 +1510,5 @@
 > par(op)
 > 
 > cat("Time elapsed: ", proc.time() - .ptime, "\n")
-Time elapsed:  0.986 0.022 1.01 0 0 
+Time elapsed:  0.977 0.026 1.004 0 0 
 > 
diff -Nru r-base-3.2.3/tests/d-p-q-r-tests.R r-base-3.3.1/tests/d-p-q-r-tests.R
--- r-base-3.2.3/tests/d-p-q-r-tests.R	2015-03-18 23:04:12.000000000 +0000
+++ r-base-3.3.1/tests/d-p-q-r-tests.R	2016-03-16 23:04:39.000000000 +0000
@@ -18,9 +18,8 @@
 Meps <- .Machine $ double.eps
 xMax <- .Machine $ double.xmax
 options(rErr.eps = 1e-30)
-rErr <- function(approx, true, eps = .Options$rErr.eps)
+rErr <- function(approx, true, eps = getOption("rErr.eps", 1e-30))
 {
-    if(is.null(eps)) { eps <- 1e-30; options(rErr.eps = eps) }
     ifelse(Mod(true) >= eps,
 	   1 - approx / true, # relative error
 	   true - approx)     # absolute error (e.g. when true=0)
@@ -642,7 +641,12 @@
     pqq <- pt(-qq, df = nu, log=TRUE)
     stopifnot(is.finite(pqq))
 }
-##
+## PR#14230 -- more extreme beta cases {should no longer rely on denormalized}
+x <- (256:512)/1024
+P <- pbeta(x, 3, 2200, lower.tail=FALSE, log.p=TRUE)
+stopifnot(is.finite(P), P < -600,
+	  -.001 < (D3P <- diff(P, diff = 3)), D3P < 0, diff(D3P) < 0)
+## all but the first 43 where -Inf in R <= 2.9.1
 stopifnot(All.eq(pt(2^-30, df=10),
                  0.50000000036238542))
 ## = .5+ integrate(dt, 0,2^-30, df=10, rel.tol=1e-20)
@@ -872,9 +876,10 @@
     -4320.30273911659058550, -5186.73671481652222237, -6919.60466621638549567,
     -8652.47261761624876897, -10385.3405690161120427, -12118.2085204159753165,
     -13851.0764718158385902, -15583.9444232157018631, -17316.8123746155651368)
+stopifnot(all.equal(pb, pbeta(x,a,b, log.p=TRUE), tol=8e-16))# seeing {1.5|1.6|2.0}e-16
 qp <- qbeta(pb, a,b, log.p=TRUE)
 ## x == qbeta(pbeta(x, *), *) :
-stopifnot(qp > 0, all.equal(x, qp, tol= 1e-15))# seeing 2.4e-16
+stopifnot(qp > 0, all.equal(x, qp, tol= 1e-15))# seeing {2.4|3.3}e-16
 
 ## qbeta(), PR#15755
 a1 <- 0.0672788; b1 <- 226390
@@ -888,7 +893,7 @@
 x <- -exp(seq(0, 14, by=2^-9))
 ct <- system.time(qx <- qbeta(x, a,b, log.p=TRUE))[[1]]
 pqx <- pbeta(qx, a,b, log=TRUE)
-stopifnot(all.equal(x, pqx, tol= 2e-15)) # 3.51e-16
+stopifnot(all.equal(x, pqx, tol= 2e-15)) # seeing {3.51|3.54}e-16
 ## note that qx[x > -exp(2)] is too close to 1 to get full accuracy:
 ## i2 <- x > -exp(2); all.equal(x[i2], pqx[i2], tol= 0)#-> 5.849e-12
 if(ct > 0.5) { cat("system.time:\n"); print(ct) }# lynne(2013): 0.048
@@ -921,5 +926,55 @@
 if(ct2 > 0.020) { cat("system.time:\n"); print(ct2) }
 ## had warnings and was much slower for R <= 3.1.0
 
+## qt(p, df= Inf, ncp)  <==> qnorm(p, m=ncp)
+p <- (0:32)/32
+stopifnot(all.equal(qt(p, df=Inf, ncp=5), qnorm(p, m=5)))
+## qt(*, df=Inf, .)  gave NaN in  R <= 3.2.1
+
+## rhyper(*, <large>);  PR#16489
+ct3 <- system.time(N <- rhyper(100, 8000, 1e9-8000, 1e6))[1]
+table(N)
+summary(N)
+stopifnot(abs(mean(N) - 8) < 1.5)
+if(ct3 > 0.02) { cat("system.time:\n"); print(ct3) }
+## N were all 0 and took very long for R <= 3.2.1
+set.seed(17)
+stopifnot(rhyper(1, 3024, 27466, 251) == 25,
+          rhyper(1,  329,  3059, 225) == 22)
+## failed for a day after a "thinko" in the above bug fix.
+
+## *chisq(*, df=0, ncp=0) == Point mass at 0
+stopifnot(rchisq(32,        df=0, ncp=0) == 0,
+          dchisq((0:16)/16, df=0, ncp=0) == c(Inf, rep(0, 16)))
+## gave all NaN's  for R <= 3.2.2
+
+## pchisq(*, df=0, ncp > 0, log.p=TRUE) :
+th <- 10*c(1:9,10^c(1:3,7))
+pp <- pchisq(0, df = 0, ncp=th, log.p=TRUE)
+stopifnot(all.equal(pp, -th/2, tol=1e-15))
+## underflowed at about th ~= 60  in R <= 3.2.2
+
+## pnbinom (-> C's bratio())
+op <- options(warn = 1)# -- NaN's giving warnings
+L <- 1e308; p <- suppressWarnings(pnbinom(L, L, mu = 5)) # NaN or 1 (for 64 / 32 bit)
+is.nan(p) || p == 1
+## gave infinite loop on some 64b platforms in R <= 3.2.3
+
+## [dpqr]nbinom(*, mu, size=Inf) -- PR#16727
+L <- 1e308; mu <- 5; pp <- (0:16)/16
+x <- c(0:3, 1e10, 1e100, L, Inf)
+(d <- dnbinom(x,  mu = mu, size = Inf)) # gave NaN (for 0 and L)
+(p <- pnbinom(x,  mu = mu, size = Inf)) # gave all NaN
+(q <- qnbinom(pp, mu = mu, size = Inf)) # gave all NaN
+set.seed(1); NI <- rnbinom(32, mu = mu, size = Inf)# gave all NaN
+set.seed(1); N2 <- rnbinom(32, mu = mu, size = L  )
+stopifnot(all.equal(d, dpois(x, mu)),
+	  all.equal(p, ppois(x, mu)),
+	  q == qpois(pp, mu),
+	  identical(NI, N2))
+options(op)
+## size = Inf -- mostly gave NaN  in R <= 3.2.3
+
+
 
 cat("Time elapsed: ", proc.time() - .ptime,"\n")
diff -Nru r-base-3.2.3/tests/d-p-q-r-tests.Rout.save r-base-3.3.1/tests/d-p-q-r-tests.Rout.save
--- r-base-3.2.3/tests/d-p-q-r-tests.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/d-p-q-r-tests.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -35,9 +35,8 @@
 > Meps <- .Machine $ double.eps
 > xMax <- .Machine $ double.xmax
 > options(rErr.eps = 1e-30)
-> rErr <- function(approx, true, eps = .Options$rErr.eps)
+> rErr <- function(approx, true, eps = getOption("rErr.eps", 1e-30))
 + {
-+     if(is.null(eps)) { eps <- 1e-30; options(rErr.eps = eps) }
 +     ifelse(Mod(true) >= eps,
 + 	   1 - approx / true, # relative error
 + 	   true - approx)     # absolute error (e.g. when true=0)
@@ -1040,7 +1039,12 @@
 +     pqq <- pt(-qq, df = nu, log=TRUE)
 +     stopifnot(is.finite(pqq))
 + }
-> ##
+> ## PR#14230 -- more extreme beta cases {should no longer rely on denormalized}
+> x <- (256:512)/1024
+> P <- pbeta(x, 3, 2200, lower.tail=FALSE, log.p=TRUE)
+> stopifnot(is.finite(P), P < -600,
++ 	  -.001 < (D3P <- diff(P, diff = 3)), D3P < 0, diff(D3P) < 0)
+> ## all but the first 43 where -Inf in R <= 2.9.1
 > stopifnot(All.eq(pt(2^-30, df=10),
 +                  0.50000000036238542))
 > ## = .5+ integrate(dt, 0,2^-30, df=10, rel.tol=1e-20)
@@ -1271,9 +1275,10 @@
 +     -4320.30273911659058550, -5186.73671481652222237, -6919.60466621638549567,
 +     -8652.47261761624876897, -10385.3405690161120427, -12118.2085204159753165,
 +     -13851.0764718158385902, -15583.9444232157018631, -17316.8123746155651368)
+> stopifnot(all.equal(pb, pbeta(x,a,b, log.p=TRUE), tol=8e-16))# seeing {1.5|1.6|2.0}e-16
 > qp <- qbeta(pb, a,b, log.p=TRUE)
 > ## x == qbeta(pbeta(x, *), *) :
-> stopifnot(qp > 0, all.equal(x, qp, tol= 1e-15))# seeing 2.4e-16
+> stopifnot(qp > 0, all.equal(x, qp, tol= 1e-15))# seeing {2.4|3.3}e-16
 > 
 > ## qbeta(), PR#15755
 > a1 <- 0.0672788; b1 <- 226390
@@ -1287,7 +1292,7 @@
 > x <- -exp(seq(0, 14, by=2^-9))
 > ct <- system.time(qx <- qbeta(x, a,b, log.p=TRUE))[[1]]
 > pqx <- pbeta(qx, a,b, log=TRUE)
-> stopifnot(all.equal(x, pqx, tol= 2e-15)) # 3.51e-16
+> stopifnot(all.equal(x, pqx, tol= 2e-15)) # seeing {3.51|3.54}e-16
 > ## note that qx[x > -exp(2)] is too close to 1 to get full accuracy:
 > ## i2 <- x > -exp(2); all.equal(x[i2], pqx[i2], tol= 0)#-> 5.849e-12
 > if(ct > 0.5) { cat("system.time:\n"); print(ct) }# lynne(2013): 0.048
@@ -1320,7 +1325,68 @@
 > if(ct2 > 0.020) { cat("system.time:\n"); print(ct2) }
 > ## had warnings and was much slower for R <= 3.1.0
 > 
+> ## qt(p, df= Inf, ncp)  <==> qnorm(p, m=ncp)
+> p <- (0:32)/32
+> stopifnot(all.equal(qt(p, df=Inf, ncp=5), qnorm(p, m=5)))
+> ## qt(*, df=Inf, .)  gave NaN in  R <= 3.2.1
+> 
+> ## rhyper(*, <large>);  PR#16489
+> ct3 <- system.time(N <- rhyper(100, 8000, 1e9-8000, 1e6))[1]
+> table(N)
+N
+ 1  2  3  4  5  6  7  8  9 10 11 12 13 14 
+ 1  1  2  5  8 14 16 17  8 13  5  5  3  2 
+> summary(N)
+   Min. 1st Qu.  Median    Mean 3rd Qu.    Max. 
+   1.00    6.00    8.00    7.85   10.00   14.00 
+> stopifnot(abs(mean(N) - 8) < 1.5)
+> if(ct3 > 0.02) { cat("system.time:\n"); print(ct3) }
+> ## N were all 0 and took very long for R <= 3.2.1
+> set.seed(17)
+> stopifnot(rhyper(1, 3024, 27466, 251) == 25,
++           rhyper(1,  329,  3059, 225) == 22)
+> ## failed for a day after a "thinko" in the above bug fix.
+> 
+> ## *chisq(*, df=0, ncp=0) == Point mass at 0
+> stopifnot(rchisq(32,        df=0, ncp=0) == 0,
++           dchisq((0:16)/16, df=0, ncp=0) == c(Inf, rep(0, 16)))
+> ## gave all NaN's  for R <= 3.2.2
+> 
+> ## pchisq(*, df=0, ncp > 0, log.p=TRUE) :
+> th <- 10*c(1:9,10^c(1:3,7))
+> pp <- pchisq(0, df = 0, ncp=th, log.p=TRUE)
+> stopifnot(all.equal(pp, -th/2, tol=1e-15))
+> ## underflowed at about th ~= 60  in R <= 3.2.2
+> 
+> ## pnbinom (-> C's bratio())
+> op <- options(warn = 1)# -- NaN's giving warnings
+> L <- 1e308; p <- suppressWarnings(pnbinom(L, L, mu = 5)) # NaN or 1 (for 64 / 32 bit)
+> is.nan(p) || p == 1
+[1] TRUE
+> ## gave infinite loop on some 64b platforms in R <= 3.2.3
+> 
+> ## [dpqr]nbinom(*, mu, size=Inf) -- PR#16727
+> L <- 1e308; mu <- 5; pp <- (0:16)/16
+> x <- c(0:3, 1e10, 1e100, L, Inf)
+> (d <- dnbinom(x,  mu = mu, size = Inf)) # gave NaN (for 0 and L)
+[1] 0.006737947 0.033689735 0.084224337 0.140373896 0.000000000 0.000000000
+[7] 0.000000000 0.000000000
+> (p <- pnbinom(x,  mu = mu, size = Inf)) # gave all NaN
+[1] 0.006737947 0.040427682 0.124652019 0.265025915 1.000000000 1.000000000
+[7] 1.000000000 1.000000000
+> (q <- qnbinom(pp, mu = mu, size = Inf)) # gave all NaN
+ [1]   0   2   3   3   3   4   4   4   5   5   6   6   6   7   8   9 Inf
+> set.seed(1); NI <- rnbinom(32, mu = mu, size = Inf)# gave all NaN
+> set.seed(1); N2 <- rnbinom(32, mu = mu, size = L  )
+> stopifnot(all.equal(d, dpois(x, mu)),
++ 	  all.equal(p, ppois(x, mu)),
++ 	  q == qpois(pp, mu),
++ 	  identical(NI, N2))
+> options(op)
+> ## size = Inf -- mostly gave NaN  in R <= 3.2.3
+> 
+> 
 > 
 > cat("Time elapsed: ", proc.time() - .ptime,"\n")
-Time elapsed:  0.961 0.012 0.974 0 0 
+Time elapsed:  0.954 0.014 0.967 0 0 
 > 
diff -Nru r-base-3.2.3/tests/Embedding/index.html r-base-3.3.1/tests/Embedding/index.html
--- r-base-3.2.3/tests/Embedding/index.html	2011-01-25 23:05:02.000000000 +0000
+++ r-base-3.3.1/tests/Embedding/index.html	2016-03-02 23:02:06.000000000 +0000
@@ -16,7 +16,7 @@
 <p>
 
 More information can be found at the 
-<a href="http://developer.r-project.org/embedded.html">R Developer's site</a>
+<a href="https://developer.r-project.org/embedded.html">R Developers' site</a>
 
 <h3>Test Applications</h3>
 <dl>
@@ -70,21 +70,25 @@
        including the some of the Omegahat packages:
 <ul>
   <li> As a procedural language within <a href="http://www.postgresql.org">Postsgres</a>.
-       See <a href="http://www.omegahat.org/DBMS/Postgres/R/RPostgres.pdf">R in Postgres</a>
-  <li> <a href="http://www.omegahat.org/RSJava">SJava</a>
-  <li> <a href="http://www.omegahat.org/SNetscape">SNetscape</a>
-  <li> <a href="http://www.omegahat.org/SXalan">SXalan</a>
-  <li> <a href="http://www.omegahat.org/SXalan">SXalan</a>
-  <li> <a href="http://www.omegahat.org/RSPython">RSPython</a>
-  <li> <a href="http://www.omegahat.org/RSPerl">RSPerl</a>      
+       See <a href="http://www.omegahat.net/DBMS/Postgres/R/RPostgres.pdf">R in Postgres</a>
+  <li> <a href="http://www.omegahat.net/RSJava">SJava</a>
+  <li> <a href="http://www.omegahat.net/SNetscape">SNetscape</a>
+  <li> <a href="http://www.omegahat.net/SXalan">SXalan</a>
+  <li> <a href="http://www.omegahat.net/SXalan">SXalan</a>
+  <li> <a href="http://www.omegahat.net/RSPython">RSPython</a>
+  <li> <a href="http://www.omegahat.net/RSPerl">RSPerl</a>      
 </ul>
- These can be used as example code for embedding R within other applications.
+ These can be used as example code for embedding R within other
+ applications.
 </dl>
 
 <hr>
 <address></address>
+<!---
 <a href="http://cm.bell-labs.com/stat/duncan">Duncan Temple Lang</a>
-<a href=mailto:duncan@research.bell-labs.com>&lt;duncan@research.bell-labs.com&gt;</a></address>
+<a href=mailto:duncan@research.bell-labs.com>&lt;duncan@research.bell-labs.com&gt;</a>
+-->
+</address>
 <!-- hhmts start -->
 Last modified: Sat Jan 12 2008
 <!-- hhmts end -->
diff -Nru r-base-3.2.3/tests/eval-etc.R r-base-3.3.1/tests/eval-etc.R
--- r-base-3.2.3/tests/eval-etc.R	2010-03-17 14:43:23.000000000 +0000
+++ r-base-3.3.1/tests/eval-etc.R	2016-03-16 23:04:34.000000000 +0000
@@ -116,3 +116,16 @@
 callme(mm="B")
 mycaller <- function(x = 1, callme = pi) { callme(x) }
 mycaller()## wrongly gave `mm = NULL'  now = "Abc"
+
+
+## Garbage collection  protection problem:
+if(FALSE) ## only here to be run as part of  'make test-Gct'
+    gctorture() # <- for manual testing
+x <- c("a", NA, "b")
+fx <- factor(x, exclude="")
+ST <- if(interactive()) system.time else invisible
+ST(r <- replicate(20, capture.output(print(fx))))
+table(ok. <- r[2,] == "Levels: a b <NA>") # want all TRUE
+stopifnot(ok.) # in case of failure, see
+r[2,] ## the '<NA>' levels part would be wrong occasionally
+
diff -Nru r-base-3.2.3/tests/eval-etc.Rout.save r-base-3.3.1/tests/eval-etc.Rout.save
--- r-base-3.2.3/tests/eval-etc.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/eval-etc.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -171,3 +171,24 @@
 > mycaller()## wrongly gave `mm = NULL'  now = "Abc"
 mm =  chr "Abc"
 > 
+> 
+> ## Garbage collection  protection problem:
+> if(FALSE) ## only here to be run as part of  'make test-Gct'
++     gctorture() # <- for manual testing
+> x <- c("a", NA, "b")
+> fx <- factor(x, exclude="")
+> ST <- if(interactive()) system.time else invisible
+> ST(r <- replicate(20, capture.output(print(fx))))
+> table(ok. <- r[2,] == "Levels: a b <NA>") # want all TRUE
+
+TRUE 
+  20 
+> stopifnot(ok.) # in case of failure, see
+> r[2,] ## the '<NA>' levels part would be wrong occasionally
+ [1] "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>"
+ [5] "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>"
+ [9] "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>"
+[13] "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>"
+[17] "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>" "Levels: a b <NA>"
+> 
+> 
diff -Nru r-base-3.2.3/tests/Examples/datasets-Ex.Rout.save r-base-3.3.1/tests/Examples/datasets-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/datasets-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/datasets-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -3458,7 +3458,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  1.276 0.03 1.308 0 0 
+Time elapsed:  1.27 0.028 1.299 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/graphics-Ex.Rout.save r-base-3.3.1/tests/Examples/graphics-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/graphics-Ex.Rout.save	2015-12-09 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/Examples/graphics-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-08 r69745) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -2066,7 +2066,7 @@
 > points.default # to see how it calls "plot.xy(xy.coords(x, y), ...)"
 function (x, y = NULL, type = "p", ...) 
 plot.xy(xy.coords(x, y), type = type, ...)
-<bytecode: 0x2c65bf8>
+<bytecode: 0x29093c8>
 <environment: namespace:graphics>
 > 
 > 
@@ -2936,7 +2936,7 @@
     u <- par("usr")
     xy * c(u[2L] - u[1L], u[4L] - u[3L])/par("pin")
 }
-<bytecode: 0x27e10b8>
+<bytecode: 0x3ee75b0>
 <environment: namespace:graphics>
 > 
 > ## plot labels offset 0.12 inches to the right
@@ -3016,7 +3016,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  1.793 0.033 1.827 0 0 
+Time elapsed:  1.809 0.027 1.836 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/grDevices-Ex.Rout.save r-base-3.3.1/tests/Examples/grDevices-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/grDevices-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/grDevices-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -236,7 +236,7 @@
 > ### Name: as.raster
 > ### Title: Create a Raster Object
 > ### Aliases: is.raster as.raster as.raster.logical as.raster.numeric
-> ###   as.raster.character as.raster.matrix as.raster.array
+> ###   as.raster.raw as.raster.character as.raster.matrix as.raster.array
 > ### Keywords: dplot
 > 
 > ### ** Examples
@@ -266,7 +266,7 @@
 [3,] "#999999"
 [4,] "#CCCCCC"
 [5,] "#FFFFFF"
-> #   locigal vectors are black and white ...
+> #   logical vectors are black and white ...
 > as.raster(1:10 %% 2 == 0)
       [,1]     
  [1,] "#000000"
@@ -287,7 +287,7 @@
      [,8]      [,9]      [,10]    
 [1,] "#FFFFFF" "#000000" "#FFFFFF"
 > 
-> # Matrix can also be logical or numeric ...
+> # Matrix can also be logical or numeric (or raw) ...
 > as.raster(matrix(c(TRUE, FALSE), nrow = 3, ncol = 2))
      [,1]      [,2]     
 [1,] "#FFFFFF" "#000000"
@@ -3226,66 +3226,68 @@
 > 
 > ### ** Examples
 > 
+> pretty(as.Date("2000-03-01")) # R 1.0.0 came in a leap year
+[1] "2000-02-28" "2000-02-29" "2000-03-01" "2000-03-02" "2000-03-03"
+[6] "2000-03-04"
 > 
-> steps <-
-+     list("10 secs", "1 min", "5 mins", "30 mins", "6 hours", "12 hours",
-+          "1 DSTday", "2 weeks", "1 month", "6 months", "1 year",
-+          "10 years", "50 years", "1000 years")
-> 
-> names(steps) <- paste("span =", unlist(steps))
-> 
+> ## time ranges in diverse scales:% also in ../../../../tests/reg-tests-1c.R
+> require(stats)
+> steps <- setNames(,
++     c("10 secs", "1 min", "5 mins", "30 mins", "6 hours", "12 hours",
++       "1 DSTday", "2 weeks", "1 month", "6 months", "1 year",
++       "10 years", "50 years", "1000 years"))
 > x <- as.POSIXct("2002-02-02 02:02")
 > lapply(steps,
 +        function(s) {
 +            at <- pretty(seq(x, by = s, length = 2), n = 5)
 +            attr(at, "labels")
 +        })
-$`span = 10 secs`
+$`10 secs`
 [1] "00" "02" "04" "06" "08" "10"
 
-$`span = 1 min`
+$`1 min`
 [1] "00" "10" "20" "30" "40" "50" "00"
 
-$`span = 5 mins`
+$`5 mins`
 [1] "02:02" "02:03" "02:04" "02:05" "02:06" "02:07"
 
-$`span = 30 mins`
-[1] "02:05" "02:10" "02:15" "02:20" "02:25" "02:30"
+$`30 mins`
+[1] "02:00" "02:10" "02:20" "02:30" "02:40"
 
-$`span = 6 hours`
-[1] "03:00" "04:00" "05:00" "06:00" "07:00" "08:00"
+$`6 hours`
+[1] "02:00" "03:00" "04:00" "05:00" "06:00" "07:00" "08:00" "09:00"
 
-$`span = 12 hours`
-[1] "03:00" "06:00" "09:00" "12:00"
+$`12 hours`
+[1] "00:00" "03:00" "06:00" "09:00" "12:00" "15:00"
 
-$`span = 1 DSTday`
-[1] "Feb 02 06:00" "Feb 02 12:00" "Feb 02 18:00" "Feb 03 00:00"
+$`1 DSTday`
+[1] "Feb 02 00:00" "Feb 02 06:00" "Feb 02 12:00" "Feb 02 18:00" "Feb 03 00:00"
+[6] "Feb 03 06:00"
 
-$`span = 2 weeks`
-[1] "Feb 04" "Feb 06" "Feb 08" "Feb 10" "Feb 12" "Feb 14" "Feb 16"
+$`2 weeks`
+[1] "Jan 28" "Feb 04" "Feb 11" "Feb 18"
 
-$`span = 1 month`
-[1] "Feb 04" "Feb 11" "Feb 18" "Feb 25"
+$`1 month`
+[1] "Jan 28" "Feb 04" "Feb 11" "Feb 18" "Feb 25" "Mar 04"
 
-$`span = 6 months`
-[1] "Mar" "Apr" "May" "Jun" "Jul" "Aug"
+$`6 months`
+[1] "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep"
 
-$`span = 1 year`
-[1] "Apr" "Jul" "Oct" "Jan"
+$`1 year`
+[1] "Jan" "Apr" "Jul" "Oct" "Jan" "Apr"
 
-$`span = 10 years`
-[1] "2004" "2006" "2008" "2010" "2012"
+$`10 years`
+[1] "2002" "2004" "2006" "2008" "2010" "2012" "2014"
 
-$`span = 50 years`
-[1] "2010" "2020" "2030" "2040" "2050"
+$`50 years`
+[1] "2000" "2010" "2020" "2030" "2040" "2050" "2060"
 
-$`span = 1000 years`
-[1] "2200" "2400" "2600" "2800" "3000"
+$`1000 years`
+[1] "2000" "2200" "2400" "2600" "2800" "3000" "3200"
 
 > 
 > 
 > 
-> 
 > cleanEx()
 > nameEx("ps.options")
 > ### * ps.options
@@ -3764,7 +3766,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  7.687 0.141 7.83 0 0 
+Time elapsed:  7.675 0.138 7.813 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/grid-Ex.Rout.save r-base-3.3.1/tests/Examples/grid-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/grid-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/grid-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -1720,6 +1720,11 @@
 > 
 > showViewport(viewport(width=.5, height=.5, name="vp"))
 > 
+> grid.newpage()
+> pushViewport(viewport(width=.5, height=.5, name="vp"))
+> upViewport()
+> showViewport(vpPath("vp"))
+> 
 > showViewport(vpStack(viewport(width=.5, height=.5, name="vp1"),
 +                      viewport(width=.5, height=.5, name="vp2")),
 +              newpage=TRUE)
@@ -1756,6 +1761,12 @@
 +        unit(1, "strwidth", "hi there"))
 [1] 0.5npc          2inches+0.25npc 2inches+0.5npc  2inches+0.75npc
 [5] 1strwidth      
+> x <- unit(1:5, "npc")
+> x[2:4]
+[1] 2npc 3npc 4npc
+> x[2:4] <- unit(1, "mm")
+> x
+[1] 1npc 1mm  1mm  1mm  5npc
 > 
 > 
 > 
@@ -2058,7 +2069,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  1.003 0.021 1.023 0 0 
+Time elapsed:  1.098 0.007 1.105 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/splines-Ex.Rout.save r-base-3.3.1/tests/Examples/splines-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/splines-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/splines-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -582,7 +582,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  0.106 0.003 0.11 0 0 
+Time elapsed:  0.153 0.005 0.159 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/stats4-Ex.Rout.save r-base-3.3.1/tests/Examples/stats4-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/stats4-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/stats4-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -184,7 +184,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  0.291 0.006 0.297 0 0 
+Time elapsed:  0.289 0.003 0.292 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/stats-Ex.Rout.save r-base-3.3.1/tests/Examples/stats-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/stats-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/stats-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -3792,7 +3792,7 @@
 > 
 > asOneSidedFormula("age")
 ~age
-<environment: 0x3fae4e8>
+<environment: 0x34aa138>
 > asOneSidedFormula(~ age)
 ~age
 > 
@@ -4755,7 +4755,7 @@
     r[cbind(1L:p, 1L:p)] <- 1
     r
 }
-<bytecode: 0x3e0e4d8>
+<bytecode: 0x370b258>
 <environment: namespace:stats>
 > stopifnot(all.equal(Cl, cov2cor(cov(longley))),
 +           all.equal(cor(longley, method = "kendall"),
@@ -6115,6 +6115,12 @@
 [6,]  1 0.3535534 0.2756976
 [7,]  1 0.2973018 0.2704720
 > 
+> ## First derivative
+> 
+> D(expression(x^2), "x")
+2 * x
+> stopifnot(D(as.name("x"), "x") == 1)
+> 
 > ## Higher derivatives
 > deriv3(y ~ b0 + b1 * 2^(-x/th), c("b0", "b1", "th"),
 +      c("b0", "b1", "th", "x") )
@@ -6450,7 +6456,7 @@
  0.0000  0.1667  0.5000  0.4630  0.6667  1.0000 
 > 
 > ## Advanced: What's inside the function closure?
-> print(ls.Fn12 <- ls(environment(Fn12)))
+> ls(environment(Fn12))
 [1] "f"      "method" "nobs"   "x"      "y"      "yleft"  "yright"
 > ##[1] "f"  "method"  "n"  "x"  "y"  "yleft"  "yright"
 > utils::ls.str(environment(Fn12))
@@ -7279,7 +7285,7 @@
 > environment(as.formula("y ~ x"))
 <environment: R_GlobalEnv>
 > environment(as.formula("y ~ x", env = new.env()))
-<environment: 0x15d4a70>
+<environment: 0x34f71e0>
 > 
 > 
 > ## Create a formula for a model with a large number of variables:
@@ -9293,8 +9299,6 @@
 > 
 > 
 > 
-> 
-> 
 > base::options(contrasts = c(unordered = "contr.treatment",ordered = "contr.poly"))
 > cleanEx()
 > nameEx("mantelhaen.test")
@@ -9901,7 +9905,7 @@
  $ log(Volume): num  2.33 2.33 2.32 2.8 2.93 ...
  $ log(Height): num  4.25 4.17 4.14 4.28 4.39 ...
  $ log(Girth) : num  2.12 2.15 2.17 2.35 2.37 ...
- - attr(*, "terms")=Classes 'terms', 'formula' length 3 log(Volume) ~ log(Height) + log(Girth)
+ - attr(*, "terms")=Classes 'terms', 'formula'  language log(Volume) ~ log(Height) + log(Girth)
   .. ..- attr(*, "variables")= language list(log(Volume), log(Height), log(Girth))
   .. ..- attr(*, "factors")= int [1:3, 1:2] 0 1 0 0 0 1
   .. .. ..- attr(*, "dimnames")=List of 2
@@ -11762,14 +11766,14 @@
 $linkfun
 function (mu) 
 mu^lambda
-<bytecode: 0x3bcc468>
-<environment: 0x3bc2fb8>
+<bytecode: 0x6f42160>
+<environment: 0x6f4ab40>
 
 $linkinv
 function (eta) 
 pmax(eta^(1/lambda), .Machine$double.eps)
-<bytecode: 0x3bcc580>
-<environment: 0x3bc2fb8>
+<bytecode: 0x6f42fb0>
+<environment: 0x6f4ab40>
 
 > 
 > 
@@ -12030,8 +12034,38 @@
 > ppoints(10, a = 1/2)
  [1] 0.05 0.15 0.25 0.35 0.45 0.55 0.65 0.75 0.85 0.95
 > 
+> ## Visualize including the fractions :
+> require(graphics)## Don't show: 
+> lNs <- loadedNamespaces()
+> ## End(Don't show)
+> p.ppoints <- function(n, ..., add = FALSE, col = par("col")) {
++   pn <- ppoints(n, ...)
++   if(add)
++       points(pn, pn, col=col)
++   else {
++       tit <- match.call(); tit[[1]] <- quote(ppoints)
++       plot(pn,pn, main = deparse(tit), col=col,
++            xlim=0:1, ylim=0:1, xaxs="i", yaxs="i")
++       abline(0,1, col = adjustcolor(1, 1/4), lty = 3)
++   }
++   if(requireNamespace("MASS", quietly=TRUE))
++     text(pn, pn, as.character(MASS::fractions(pn)),
++          adj = c(0,0)-1/4, cex = 3/4, xpd = NA, col=col)
++   abline(h=pn, v=pn, col = adjustcolor(col, 1/2), lty = 2, lwd = 1/2)
++ }
+> 
+> p.ppoints(4)
+> p.ppoints(10)
+> p.ppoints(10, a = 1/2)
+> p.ppoints(21)
+> p.ppoints(8) ; p.ppoints(8, a = 1/2, add=TRUE, col="tomato")
+> ## Don't show: 
+> if(!any("MASS" == lNs)) unloadNamespace("MASS")
+> ## End(Don't show)
+> 
 > 
 > 
+> graphics::par(get("par.postscript", pos = 'CheckExEnv'))
 > cleanEx()
 > nameEx("ppr")
 > ### * ppr
@@ -12236,10 +12270,26 @@
 	 function (object, newx, ...)  NULL 
 predict.glm :
 	 function (object, newdata = NULL, type = c("link", "response",      "terms"), se.fit = FALSE, dispersion = NULL, terms = NULL,      na.action = na.pass, ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.glmmPQL :
+	 function (object, newdata = NULL, type = c("link", "response"),      level = Q, na.action = na.pass, ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.lda :
+	 function (object, newdata, prior = object$prior, dimen, method = c("plug-in",      "predictive", "debiased"), ...)  NULL 
 predict.lm :
 	 function (object, newdata, se.fit = FALSE, scale = NULL, df = Inf,      interval = c("none", "confidence", "prediction"), level = 0.95,      type = c("response", "terms"), terms = NULL, na.action = na.pass,      pred.var = res.var/weights, weights = 1, ...)  NULL 
 predict.loess :
 	 function (object, newdata = NULL, se = FALSE, na.action = na.pass,      ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.lqs :
+	 function (object, newdata, na.action = na.pass, ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.mca :
+	 function (object, newdata, type = c("row", "factor"), ...)  NULL 
 predict.mlm :
 	 function (object, newdata, se.fit = FALSE, na.action = na.pass,      ...)  NULL 
 predict.nbSpline :
@@ -12252,6 +12302,10 @@
 	 function (object, newx, ...)  NULL 
 predict.pbSpline :
 	 function (object, x, nseg = 50, deriv = 0, ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.polr :
+	 function (object, newdata, type = c("class", "probs"), ...)  NULL 
 predict.poly :
 	 function (object, newdata, ...)  NULL 
 predict.polySpline :
@@ -12264,6 +12318,14 @@
 	 function (object, newdata, ...)  NULL 
 predict.princomp :
 	 function (object, newdata, ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.qda :
+	 function (object, newdata, prior = object$prior, method = c("plug-in",      "predictive", "debiased", "looCV"), ...)  NULL 
+Warning: namespace ‘MASS’ is not available and has been replaced
+by .GlobalEnv when processing object ‘’
+predict.rlm :
+	 function (object, newdata = NULL, scale = NULL, ...)  NULL 
 predict.smooth.spline :
 	 function (object, x, deriv = 0, ...)  NULL 
 predict.smooth.spline.fit :
@@ -14980,6 +15042,73 @@
 > 
 > 
 > cleanEx()
+> nameEx("sigma")
+> ### * sigma
+> 
+> flush(stderr()); flush(stdout())
+> 
+> ### Name: sigma
+> ### Title: Extract Residual Standard Deviation 'Sigma'
+> ### Aliases: sigma sigma.default sigma.mlm
+> ### Keywords: models
+> 
+> ### ** Examples
+> 
+> ## -- lm() ------------------------------
+> lm1 <- lm(Fertility ~ . , data = swiss)
+> sigma(lm1) # ~= 7.165  = "Residual standard error"  printed from summary(lm1)
+[1] 7.165369
+> stopifnot(all.equal(sigma(lm1), summary(lm1)$sigma, tol=1e-15))
+> 
+> ## -- nls() -----------------------------
+> DNase1 <- subset(DNase, Run == 1)
+> fm.DN1 <- nls(density ~ SSlogis(log(conc), Asym, xmid, scal), DNase1)
+> sigma(fm.DN1) # ~= 0.01919  as from summary(..)
+[1] 0.01919449
+> stopifnot(all.equal(sigma(fm.DN1), summary(fm.DN1)$sigma, tol=1e-15))
+> 
+> ## -- glm() -----------------------------
+> ## -- a) Binomial -- Example from MASS
+> ldose <- rep(0:5, 2)
+> numdead <- c(1, 4, 9, 13, 18, 20, 0, 2, 6, 10, 12, 16)
+> sex <- factor(rep(c("M", "F"), c(6, 6)))
+> SF <- cbind(numdead, numalive = 20-numdead)
+> sigma(budworm.lg <- glm(SF ~ sex*ldose, family = binomial))
+[1] 0.7900734
+> 
+> ## -- b) Poisson -- from ?glm :
+> ## Dobson (1990) Page 93: Randomized Controlled Trial :
+> counts <- c(18,17,15,20,10,20,25,13,12)
+> outcome <- gl(3,1,9)
+> treatment <- gl(3,3)
+> sigma(glm.D93 <- glm(counts ~ outcome + treatment, family = poisson()))
+[1] 1.13238
+> ## (currently) *differs* from
+> summary(glm.D93)$dispersion # == 1
+[1] 1
+> ## and the *Quasi*poisson's dispersion
+> sigma(glm.qD93 <- update(glm.D93, family = quasipoisson()))
+[1] 1.13238
+> sigma (glm.qD93)^2 # 1.282285 is close, but not the same
+[1] 1.282285
+> summary(glm.qD93)$dispersion # == 1.2933
+[1] 1.2933
+> 
+> ## -- Multivariate lm() "mlm" -----------
+> utils::example("SSD", echo=FALSE)
+> sigma(mlmfit) # is the same as {but more efficient than}
+   deg0NA    deg4NA    deg8NA    deg0NP    deg4NP    deg8NP 
+ 56.92100  86.02325  78.99367  88.54377 109.54451 116.79041 
+> sqrt(diag(estVar(mlmfit)))
+   deg0NA    deg4NA    deg8NA    deg0NP    deg4NP    deg8NP 
+ 56.92100  86.02325  78.99367  88.54377 109.54451 116.79041 
+> ## Don't show: 
+> stopifnot(all.equal(sigma(mlmfit), sqrt(diag(estVar(mlmfit)))))
+> ## End(Don't show)
+> 
+> 
+> 
+> cleanEx()
 > nameEx("simulate")
 > ### * simulate
 > 
@@ -15255,7 +15384,7 @@
 > lines(predict(s02, xx), col = 3); mtext(deparse(s02$call), col = 3)
 > 
 > ## Don't show: 
-> stopifnot(all.equal(predict(s02, xx),
+> stopifnot(all.equal(predict(s02 , xx),
 + 		    predict(s02., xx), tolerance = 1e-15))
 > ## End(Don't show)
 > 
@@ -15642,8 +15771,8 @@
 > unclass(sfun0)
 function (v) 
 .approxfun(x, y, v, method, yleft, yright, f)
-<bytecode: 0x2a7afb8>
-<environment: 0x399ac60>
+<bytecode: 0x2d6cec8>
+<environment: 0x7356b68>
 attr(,"call")
 stepfun(1:3, y0, f = 0)
 > ls(envir = environment(sfun0))
@@ -17920,7 +18049,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  4.349 0.095 4.446 0 0 
+Time elapsed:  4.26 0.087 4.348 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/Examples/tools-Ex.Rout.save r-base-3.3.1/tests/Examples/tools-Ex.Rout.save
--- r-base-3.2.3/tests/Examples/tools-Ex.Rout.save	2015-12-03 23:15:21.000000000 +0000
+++ r-base-3.3.1/tests/Examples/tools-Ex.Rout.save	2016-06-14 22:15:07.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -44,7 +44,7 @@
 <link rel="stylesheet" type="text/css" href="/doc/html/R.css" />
 </head><body>
 <h1> This is a sample header
-<img class="toplogo" src="/doc/html/logo.jpg" alt="[R logo]" />
+<img class="toplogo" src="/doc/html/Rlogo.svg" alt="[R logo]" />
 </h1>
 <hr/>
 <div style="text-align: center;">
@@ -188,7 +188,7 @@
 > bibstyle("unsorted", sortKeys = function(refs) seq_along(refs),
 +     fmtPrefix = function(paper) paste0("[", paper$.index, "]"),
 +        .init = TRUE)
-<environment: 0x2f81600>
+<environment: 0x3582e28>
 > print(refs, .bibstyle = "unsorted")
 [1] R Core Team (2013). _R: A Language and Environment for Statistical
 Computing_. R Foundation for Statistical Computing, Vienna, Austria.
@@ -604,6 +604,15 @@
 > ### ** Examples
 > 
 > pkgDepends("tools", local = FALSE)
+Warning: 'pkgDepends' is deprecated.
+Use 'package_dependencies()' instead.
+See help("Deprecated")
+Warning: 'package.dependencies' is deprecated.
+Use 'package_dependencies' instead.
+See help("Deprecated")
+Warning: 'getDepList' is deprecated.
+Use 'dependsOnPkgs() or package_dependencies()' instead.
+See help("Deprecated")
 $Depends
 character(0)
 
@@ -620,7 +629,7 @@
 character(0)
 
 attr(,"class")
-[1] "DependsList" "list"       
+[1] "DependsList"
 > 
 > 
 > 
@@ -658,7 +667,18 @@
 > dir.create(tmp)
 > 
 > pDL <- pkgDepends("tools", local = FALSE)
+Warning: 'pkgDepends' is deprecated.
+Use 'package_dependencies()' instead.
+See help("Deprecated")
+Warning: 'package.dependencies' is deprecated.
+Use 'package_dependencies' instead.
+See help("Deprecated")
+Warning: 'getDepList' is deprecated.
+Use 'dependsOnPkgs() or package_dependencies()' instead.
+See help("Deprecated")
 > installFoundDepends(pDL$Found, destdir = tmp)
+Warning: 'installFoundDepends()' is deprecated: It is misleading nowadays
+ since it has never taken 'Imports' into consideration
 NULL
 > 
 > 
@@ -680,6 +700,20 @@
 > 
 > 
 > cleanEx()
+> nameEx("makevars")
+> ### * makevars
+> 
+> flush(stderr()); flush(stdout())
+> 
+> ### Name: makevars
+> ### Title: User and Site Compilation Variables
+> ### Aliases: makevars_user makevars_site
+> ### Keywords: utilities
+> 
+> ### ** Examples
+> 
+> 
+> cleanEx()
 > nameEx("md5sum")
 > ### * md5sum
 > 
@@ -831,7 +865,7 @@
 <link rel="stylesheet" type="text/css" href="/doc/html/R.css" />
 </head><body>
 <h1> R
-<img class="toplogo" src="/doc/html/logo.jpg" alt="[R logo]" />
+<img class="toplogo" src="/doc/html/Rlogo.svg" alt="[R logo]" />
 </h1>
 <hr/>
 <div style="text-align: center;">
@@ -843,7 +877,7 @@
  <td style="text-align: left; vertical-align: top; width: 10%;">
 error.catching
  </td>
- <td style="text-align: left" vertical-align: top; width: 90%;">
+ <td style="text-align: left; vertical-align: top; width: 90%;">
 More examples on catching and handling errors
  </td>
 </tr>
@@ -852,7 +886,7 @@
  <td style="text-align: left; vertical-align: top; width: 10%;">
 is.things
  </td>
- <td style="text-align: left" vertical-align: top; width: 90%;">
+ <td style="text-align: left; vertical-align: top; width: 90%;">
 Explore some properties of R objects and is.FOO() functions. Not for newbies!
  </td>
 </tr>
@@ -861,7 +895,7 @@
  <td style="text-align: left; vertical-align: top; width: 10%;">
 recursion
  </td>
- <td style="text-align: left" vertical-align: top; width: 90%;">
+ <td style="text-align: left; vertical-align: top; width: 90%;">
 Using recursion for adaptive integration
  </td>
 </tr>
@@ -870,7 +904,7 @@
  <td style="text-align: left; vertical-align: top; width: 10%;">
 scoping
  </td>
- <td style="text-align: left" vertical-align: top; width: 90%;">
+ <td style="text-align: left; vertical-align: top; width: 90%;">
 An illustration of lexical scoping.
  </td>
 </tr>
@@ -981,7 +1015,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  0.197 0.002 0.199 0 0 
+Time elapsed:  0.191 0.004 0.197 0 0 
 > grDevices::dev.off()
 null device 
           1 
diff -Nru r-base-3.2.3/tests/iec60559.Rout.save r-base-3.3.1/tests/iec60559.Rout.save
--- r-base-3.2.3/tests/iec60559.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/iec60559.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/internet2.R r-base-3.3.1/tests/internet2.R
--- r-base-3.2.3/tests/internet2.R	2015-03-18 23:04:11.000000000 +0000
+++ r-base-3.3.1/tests/internet2.R	2016-03-16 23:04:39.000000000 +0000
@@ -2,11 +2,6 @@
 ## a working Internet connection.
 ## We attempt to test for those.
 
-if(!capabilities()["http/ftp"]) {
-    warning("no internet capabilities")
-    q()
-}
-
 if(.Platform$OS.type == "unix" &&
    is.null(nsl("cran.r-project.org"))) q()
 
diff -Nru r-base-3.2.3/tests/internet.R r-base-3.3.1/tests/internet.R
--- r-base-3.2.3/tests/internet.R	2015-03-18 23:04:07.000000000 +0000
+++ r-base-3.3.1/tests/internet.R	2016-03-16 23:04:34.000000000 +0000
@@ -1,11 +1,5 @@
-## These are tests that require internet functionality, and
-## a working Internet connection.
-## We attempt to test for those.
-
-if(!capabilities()["http/ftp"]) {
-    warning("no internet capabilities")
-    q()
-}
+## These are tests that require a working Internet connection.
+## We attempt to test for that.
 
 if(.Platform$OS.type == "unix" &&
    is.null(nsl("cran.r-project.org"))) q()
diff -Nru r-base-3.2.3/tests/internet.Rout.save r-base-3.3.1/tests/internet.Rout.save
--- r-base-3.2.3/tests/internet.Rout.save	2015-12-09 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/internet.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-08 r69745) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -15,21 +15,15 @@
 'help.start()' for an HTML browser interface to help.
 Type 'q()' to quit R.
 
-> ## These are tests that require internet functionality, and
-> ## a working Internet connection.
-> ## We attempt to test for those.
-> 
-> if(!capabilities()["http/ftp"]) {
-+     warning("no internet capabilities")
-+     q()
-+ }
+> ## These are tests that require a working Internet connection.
+> ## We attempt to test for that.
 > 
 > if(.Platform$OS.type == "unix" &&
 +    is.null(nsl("cran.r-project.org"))) q()
 > 
 > # test do_download.
 > nrow(available.packages(contrib.url("http://cran.r-project.org")))
-[1] 7588
+[1] 8572
 > 
 > # test url connections on http
 > zz <- url("http://cran.r-project.org/")
@@ -44,7 +38,7 @@
  [8] "<link rel=\"stylesheet\" type=\"text/css\" href=\"R.css\">"                                               
  [9] "</head>"                                                                                                  
 [10] ""                                                                                                         
-[11] "<FRAMESET cols=\"1*, 4*\" border=0>"                                                                      
+[11] "<FRAMESET cols=\"1*, 4*\" style=\"border: none;\">"                                                       
 [12] "<FRAMESET rows=\"120, 1*\">"                                                                              
 [13] "<FRAME src=\"logo.html\" name=\"logo\" frameborder=0>"                                                    
 [14] "<FRAME src=\"navbar.html\" name=\"contents\" frameborder=0>"                                              
diff -Nru r-base-3.2.3/tests/isas-tests.Rout.save r-base-3.3.1/tests/isas-tests.Rout.save
--- r-base-3.2.3/tests/isas-tests.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/isas-tests.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -2568,6 +2568,6 @@
 > f <- try(as.ts( x ), silent = TRUE)
 >   if(!inherits(f, 'try-error')) report(identical(f, as.ts( f )))
 > cat('Time elapsed: ', proc.time() - .proctime00,'\n')
-Time elapsed:  0.12 0.013 0.132 0 0 
+Time elapsed:  0.129 0.009 0.136 0 0 
 > 
 > 
diff -Nru r-base-3.2.3/tests/lapack.Rout.save r-base-3.3.1/tests/lapack.Rout.save
--- r-base-3.2.3/tests/lapack.Rout.save	2015-12-03 23:15:18.000000000 +0000
+++ r-base-3.3.1/tests/lapack.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/libcurl.R r-base-3.3.1/tests/libcurl.R
--- r-base-3.2.3/tests/libcurl.R	2015-03-18 23:04:07.000000000 +0000
+++ r-base-3.3.1/tests/libcurl.R	2016-03-16 23:04:34.000000000 +0000
@@ -43,9 +43,47 @@
 close(zz)
 
 
-## check graceful failure:
-try(zz <- url("http://foo.bar", "r", method = "libcurl"))
+## check graceful failure: warnings leading to error
+## testUnknownUrlError <- tryCatch(suppressWarnings({
+##     zz <- url("http://foo.bar", "r", method = "libcurl")
+## }), error=function(e) {
+##     conditionMessage(e) == "cannot open connection"
+## })
+## close(zz)
+## stopifnot(testUnknownUrlError)
+
+## tf <- tempfile()
+## testDownloadFileError <- tryCatch(suppressWarnings({
+##     download.file("http://foo.bar", tf, method="libcurl")
+## }), error=function(e) {
+##     conditionMessage(e) == "cannot download all files"
+## })
+## stopifnot(testDownloadFileError, !file.exists(tf))
+
+tf <- tempfile()
+testDownloadFile404 <- tryCatch(suppressWarnings({
+    download.file("http://httpbin.org/status/404", tf, method="libcurl")
+}), error=function(e) {
+    conditionMessage(e) == "cannot download all files"
+})
+stopifnot(testDownloadFile404, !file.exists(tf))
+
+## check specific warnings
+## testUnknownUrl <- tryCatch({
+##     zz <- url("http://foo.bar", "r", method = "libcurl")
+## }, warning=function(e) {
+##     grepl("Couldn't resolve host name", conditionMessage(e))
+## })
+## close(zz)
+## stopifnot(testUnknownUrl)
+
+test404.1 <- tryCatch({
+    open(zz <- url("http://httpbin.org/status/404", method="libcurl"))
+}, warning=function(w) {
+    grepl("404 Not Found", conditionMessage(w))
+})
 close(zz)
+stopifnot(test404.1)
 
 ##  via read.table (which closes the connection)
 tail(read.table(url("http://www.stats.ox.ac.uk/pub/datasets/csb/ch11b.dat",
@@ -53,13 +91,19 @@
 tail(read.table(url("ftp://ftp.stats.ox.ac.uk/pub/datasets/csb/ch11b.dat",
                     method = "libcurl")))
 
-showConnections(all = TRUE)
-
 ## check option works
 options(url.method = "libcurl")
-zz <- url("http://www.stats.ox.ac.uk/pub/datasets/csb/ch11b.dat",
-          method = "libcurl")
+zz <- url("http://www.stats.ox.ac.uk/pub/datasets/csb/ch11b.dat")
 stopifnot(identical(summary(zz)$class, "url-libcurl"))
 close(zz)
 head(readLines("https://httpbin.org", warn = FALSE))
 
+test404.2 <- tryCatch({
+    open(zz <- url("http://httpbin.org/status/404"))
+}, warning=function(w) {
+    grepl("404 Not Found", conditionMessage(w))
+})
+close(zz)
+stopifnot(test404.2)
+
+showConnections(all = TRUE)
diff -Nru r-base-3.2.3/tests/lm-tests.Rout.save r-base-3.3.1/tests/lm-tests.Rout.save
--- r-base-3.2.3/tests/lm-tests.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/lm-tests.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/Makefile.common r-base-3.3.1/tests/Makefile.common
--- r-base-3.2.3/tests/Makefile.common	2015-03-18 23:04:11.000000000 +0000
+++ r-base-3.3.1/tests/Makefile.common	2016-03-16 23:04:39.000000000 +0000
@@ -2,7 +2,7 @@
 #
 # ${R_HOME}/tests/Makefile.common
 
-## If you add test scripts here, review src/library/tools/R/testing.R
+## If you add test scripts here, review  ../src/library/tools/R/testing.R
 
 test-src-gct = \
 	eval-etc.R \
@@ -12,7 +12,6 @@
 	lm-tests.R \
 	ok-errors.R \
 	method-dispatch.R \
-	array-subset.R \
 	any-all.R
 test-src-strict-1 = \
 	$(test-src-gct) \
@@ -44,8 +43,10 @@
 test-src-regexp = utf8-regex.R
 test-src-segfault = no-segfault.R
 
-test-src-reg-1 = reg-tests-1a.R reg-tests-1b.R reg-tests-1c.R reg-tests-2.R \
+test-src-reg-1 = array-subset.R \
+  reg-tests-1a.R reg-tests-1b.R reg-tests-1c.R reg-tests-2.R \
   reg-examples1.R reg-examples2.R reg-packages.R p-qbeta-strict-tst.R \
+  r-strict-tst.R \
   reg-IO.R reg-IO2.R reg-plot.R reg-S4.R reg-BLAS.R
 ## added to in Makefile.win
 test-src-reg-1e =
@@ -194,6 +195,7 @@
 	@for p in $(R_PKGS_BASE); do \
 	  $(ECHO) "checking package '$${p}'"; \
 	  _R_CHECK_FF_CALLS_=registration \
+	  _R_CHECK_CODE_USAGE_WITH_ONLY_BASE_ATTACHED_=true \
 	  $(top_builddir)/bin/R CMD check --install=skip \
 	    --no-build-vignettes \
 	    $(top_srcdir)/src/library/$${p} || $(ECHO); \
@@ -213,7 +215,8 @@
 	@$(ECHO) "begin checking package '`basename $@ .log`'"
 	@rm -f $@
 	@_R_CHECK_FF_CALLS_=registration \
-	$(top_builddir)/bin/R CMD check --install=skip --no-build-vignettes \
+	  _R_CHECK_CODE_USAGE_WITH_ONLY_BASE_ATTACHED_=true \
+	  $(top_builddir)/bin/R CMD check --install=skip --no-build-vignettes \
 	  $(top_srcdir)/src/library/`basename $@ .log` > $@ 2>&1
 	@cat $@
 
diff -Nru r-base-3.2.3/tests/Makefile.in r-base-3.3.1/tests/Makefile.in
--- r-base-3.2.3/tests/Makefile.in	2015-03-18 23:04:07.000000000 +0000
+++ r-base-3.3.1/tests/Makefile.in	2016-03-16 23:04:33.000000000 +0000
@@ -84,7 +84,7 @@
 	  reg-examples-*.pdf testCID.* \
 	  reg-plot-latin1.ps reg-plot.ps \
 	  reg-plot-latin1.pdf reg-plot.pdf reg-tests-*.pdf \
-	  R-exts.* R-intro.R R-intro.Rout
+	  R-exts.* R-intro.R no-segfault.R R-intro.Rout
 	-@rm -f FALSE* PACKAGES* .R .tex mirrors.html ./-package.Rd ex.gz
 	-@rm -f testit.txt testit.html testit.tex testit-Ex.R
 	-@rm -f ver20.txt ver20.html ver20.tex ver20-Ex.R
@@ -92,6 +92,7 @@
 	-@rm -f *.tar.gz
 	-@rm -f keepsource.tex test-system2 test-system.Rout
 	-@rm -f *.log *.tsin *.trin
+	-@rm -f df0.Rd l0.Rd m0.Rd 'integer(0)-package.Rd'
 
 distclean: clean
 	-@for d in $(SUBDIRS); do \
diff -Nru r-base-3.2.3/tests/Makefile.win r-base-3.3.1/tests/Makefile.win
--- r-base-3.2.3/tests/Makefile.win	2015-03-18 23:04:09.000000000 +0000
+++ r-base-3.3.1/tests/Makefile.win	2016-03-16 23:04:36.000000000 +0000
@@ -71,7 +71,7 @@
 	  reg-examples-*.pdf  testCID.* \
 	  reg-plot-latin1.ps reg-plot.ps \
 	  reg-plot-latin1.pdf reg-plot.pdf reg-tests-*.pdf \
-	  R-exts.* R-intro.R 
+	  R-exts.* R-intro.R no-segfault.R
 	@rm -f R-exts_res.rc Makedeps
 	@rm -f FALSE* PACKAGES* .R .tex mirrors.html ./-package.Rd ex.gz
 	@rm -f testit.txt testit.html testit.tex testit-Ex.R
@@ -82,6 +82,7 @@
 	@$(MK) -C Examples $@
 	@$(MK) -C Embedding $@
 	-@rm -f *.log *.tsin *.trin
+	-@rm -f df0.Rd l0.Rd m0.Rd 'integer(0)-package.Rd'
 
 distclean: clean
 	@$(MK) -C Examples $@
diff -Nru r-base-3.2.3/tests/method-dispatch.Rout.save r-base-3.3.1/tests/method-dispatch.Rout.save
--- r-base-3.2.3/tests/method-dispatch.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/method-dispatch.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/no-segfault.Rin r-base-3.3.1/tests/no-segfault.Rin
--- r-base-3.2.3/tests/no-segfault.Rin	2013-07-19 22:05:04.000000000 +0000
+++ r-base-3.3.1/tests/no-segfault.Rin	2016-03-16 23:04:37.000000000 +0000
@@ -62,8 +62,13 @@
     } else {
 	c(inet.list, socket.fun, edit.int, misc.int, misc.2)
     }
+
+## S4 group generics should not be called directly
+## and doing so sometimes leads to infinite recursion
+s4.group.generics <- c("Arith", "Compare", "Ops", "Logic", "Math", "Math2", "Summary", "Complex")
+
 ## warning: browseAll will tend to read all the script and/or loop forever
-stop.list[["methods"]] <- c("browseAll", "recover")
+stop.list[["methods"]] <- c("browseAll", "recover", s4.group.generics)
 stop.list[["tools"]] <- c("write_PACKAGES", # problems with Packages/PACKAGES
                           "testInstalledBasic",
                           "testInstalledPackages", # runs whole suite
@@ -84,11 +89,7 @@
 cat('options(error=expression(NULL))',
     "# don't stop on error in batch\n##~~~~~~~~~~~~~~\n")
 
-cat(".proctime00 <- proc.time()\n",
-    "c0 <- character(0)\n",
-    "l0 <- logical(0)\n",
-    "m0 <- matrix(1,0,0)\n",
-    "df0 <- as.data.frame(c0)\n", sep="")
+cat(".proctime00 <- proc.time()\n")
 
 for (pkg in core.pkgs) {
   cat("### Package ", pkg, "\n",
@@ -106,6 +107,12 @@
       if(!(nm %in% stop.list[[pkg]]) &&
 	 is.function(f <- get(nm, pos = pkgname))) {
 	  cat("\n## ", nm, " :\n")
+
+	  cat("c0 <- character(0)\n",
+	      "l0 <- logical(0)\n",
+	      "m0 <- matrix(1,0,0)\n",
+	      "df0 <- as.data.frame(c0)\n", sep="")
+
 	  cat("f <- get(\"",nm,"\", pos = '", pkgname, "')\n", sep="")
 	  cat("f()\nf(NULL)\nf(,NULL)\nf(NULL,NULL)\n",
 	      "f(list())\nf(l0)\nf(c0)\nf(m0)\nf(df0)\nf(FALSE)\n",
diff -Nru r-base-3.2.3/tests/ok-errors.Rout.save r-base-3.3.1/tests/ok-errors.Rout.save
--- r-base-3.2.3/tests/ok-errors.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/ok-errors.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/Pkgs/pkgA/man/f.Rd r-base-3.3.1/tests/Pkgs/pkgA/man/f.Rd
--- r-base-3.2.3/tests/Pkgs/pkgA/man/f.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/pkgA/man/f.Rd	2016-03-16 23:04:34.000000000 +0000
@@ -0,0 +1,25 @@
+\name{f}
+\alias{f}
+\title{Function f -- a Test}
+\description{ An Rd test only. }
+\usage{
+f(a)
+}
+\arguments{
+  \item{a}{a number.}
+}
+\value{a number.}
+
+\examples{
+PKG <- "stats4"
+pd <- packageDescription(PKG)
+cat(sprintf("\%s -- built: \%s\n\%*s -- file: \%s\n",
+            PKG, pd$Built, nchar(PKG), "", attr(pd, "file")))
+## Now, with a typo - forgetting to escape some of the percent signs :
+##  -- 2012-03-12 -- error message is +- ok now:
+##> 2013-02-x : the new parse_Rd() now chokes on this (with a "good"
+##> -------     error message)  already during package *build* --> cannot keep it here!
+##> cat(sprintf("\%s -- built: %s\n%*s -- file: %s\n",
+##>             PKG, pd$Built, nchar(PKG), "", attr(pd, "file")))
+}
+
diff -Nru r-base-3.2.3/tests/Pkgs/pkgA/NAMESPACE r-base-3.3.1/tests/Pkgs/pkgA/NAMESPACE
--- r-base-3.2.3/tests/Pkgs/pkgA/NAMESPACE	2015-03-18 23:04:08.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/pkgA/NAMESPACE	2016-03-16 23:04:34.000000000 +0000
@@ -12,3 +12,5 @@
 exportMethods("plot")
 
 export(nil)
+
+export(search)# --> "conflict message"
diff -Nru r-base-3.2.3/tests/Pkgs/pkgA/R/pkgA.R r-base-3.3.1/tests/Pkgs/pkgA/R/pkgA.R
--- r-base-3.2.3/tests/Pkgs/pkgA/R/pkgA.R	2015-03-18 23:04:08.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/pkgA/R/pkgA.R	2016-03-16 23:04:34.000000000 +0000
@@ -5,3 +5,6 @@
 setMethod("plot", "classA", function(x, y, ...) NULL)
 
 nil <- NULL # see if we can use '::' on it
+
+## Export, so we get a *conflict* message on attaching:
+search <- function(...) base::search(...)
diff -Nru r-base-3.2.3/tests/Pkgs/pkgB/DESCRIPTION r-base-3.3.1/tests/Pkgs/pkgB/DESCRIPTION
--- r-base-3.2.3/tests/Pkgs/pkgB/DESCRIPTION	2011-10-02 22:02:36.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/pkgB/DESCRIPTION	2016-03-16 23:04:34.000000000 +0000
@@ -1,7 +1,6 @@
 Package: pkgB
 Title: Simple Package with NameSpace and S4 Methods and Classes
 Type: Package
-noDepends_we_have_Imports:
 Imports: methods, graphics, pkgA
 Version: 1.0
 Date: 2009-08-17
diff -Nru r-base-3.2.3/tests/Pkgs/xDir/pkg/data/nil.R r-base-3.3.1/tests/Pkgs/xDir/pkg/data/nil.R
--- r-base-3.2.3/tests/Pkgs/xDir/pkg/data/nil.R	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/xDir/pkg/data/nil.R	2016-03-16 23:04:34.000000000 +0000
@@ -0,0 +1 @@
+nilData <- NULL
diff -Nru r-base-3.2.3/tests/Pkgs/xDir/pkg/DESCRIPTION r-base-3.3.1/tests/Pkgs/xDir/pkg/DESCRIPTION
--- r-base-3.2.3/tests/Pkgs/xDir/pkg/DESCRIPTION	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/xDir/pkg/DESCRIPTION	2016-03-16 23:04:34.000000000 +0000
@@ -0,0 +1,14 @@
+Package: pkgA
+Title: Simple Package with NameSpace and S4 Methods and Classes
+Version: 1.2
+Date: 2015-02-05
+Type: Package
+Depends: methods
+Imports: Matrix
+LazyData: true
+Author: Yohan Chalabi and R-core
+Maintainer: R Core <R-core@almost.r-project.org>
+Description: Example package with a namespace, and S4 method for "plot".
+ used for regression testing the correct working of tools::codoc(), undoc()
+ etc, but also S4 in connection with other packages.
+License: GPL (>= 2)
diff -Nru r-base-3.2.3/tests/Pkgs/xDir/pkg/man/f.Rd r-base-3.3.1/tests/Pkgs/xDir/pkg/man/f.Rd
--- r-base-3.2.3/tests/Pkgs/xDir/pkg/man/f.Rd	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/xDir/pkg/man/f.Rd	2016-03-16 23:04:34.000000000 +0000
@@ -0,0 +1,25 @@
+\name{f}
+\alias{f}
+\title{Function f -- a Test}
+\description{ An Rd test only. }
+\usage{
+f(a)
+}
+\arguments{
+  \item{a}{a number.}
+}
+\value{a number.}
+
+\examples{
+PKG <- "stats4"
+pd <- packageDescription(PKG)
+cat(sprintf("\%s -- built: \%s\n\%*s -- file: \%s\n",
+            PKG, pd$Built, nchar(PKG), "", attr(pd, "file")))
+## Now, with a typo - forgetting to escape some of the percent signs :
+##  -- 2012-03-12 -- error message is +- ok now:
+##> 2013-02-x : the new parse_Rd() now chokes on this (with a "good"
+##> -------     error message)  already during package *build* --> cannot keep it here!
+##> cat(sprintf("\%s -- built: %s\n%*s -- file: %s\n",
+##>             PKG, pd$Built, nchar(PKG), "", attr(pd, "file")))
+}
+
diff -Nru r-base-3.2.3/tests/Pkgs/xDir/pkg/NAMESPACE r-base-3.3.1/tests/Pkgs/xDir/pkg/NAMESPACE
--- r-base-3.2.3/tests/Pkgs/xDir/pkg/NAMESPACE	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/xDir/pkg/NAMESPACE	2016-03-16 23:04:34.000000000 +0000
@@ -0,0 +1,16 @@
+import(methods)
+
+import(graphics)
+## instead of just
+## importFrom("graphics", plot) # because we want to define methods on it
+## *Still* do not want warning from this
+
+## as "mgcv": this loads Matrix, but does not attach it  ==> Matrix methods "semi-visible"
+importFrom(Matrix, t,mean,colMeans,colSums)
+
+exportClasses("classA")
+exportMethods("plot")
+
+export(nil)
+
+export(search)# --> "conflict message"
diff -Nru r-base-3.2.3/tests/Pkgs/xDir/pkg/R/pkgA.R r-base-3.3.1/tests/Pkgs/xDir/pkg/R/pkgA.R
--- r-base-3.2.3/tests/Pkgs/xDir/pkg/R/pkgA.R	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/Pkgs/xDir/pkg/R/pkgA.R	2016-03-16 23:04:34.000000000 +0000
@@ -0,0 +1,10 @@
+setClass("classA", contains = "matrix")
+
+## just so we can export it --
+## *and* ensure it is "attached to graphics::plot generic" :
+setMethod("plot", "classA", function(x, y, ...) NULL)
+
+nil <- NULL # see if we can use '::' on it
+
+## Export, so we get a *conflict* message on attaching:
+search <- function(...) base::search(...)
diff -Nru r-base-3.2.3/tests/primitives.R r-base-3.3.1/tests/primitives.R
--- r-base-3.2.3/tests/primitives.R	2015-03-18 23:04:10.000000000 +0000
+++ r-base-3.3.1/tests/primitives.R	2016-03-16 23:04:36.000000000 +0000
@@ -47,24 +47,17 @@
 }
 
 
-## check that all primitives are accounted for in .[Generic]ArgsEnv.
-## and nothing else
-ff <- ls("package:base", all.names=TRUE)
-ff <- ff[sapply(ff, function(x) is.primitive(get(x, "package:base")))]
-## NB: there is a another version of this list in tools::undoc()
-lang_elements <-
-    c('$', '$<-', '&&', '(', ':', '<-', '<<-', '=', '@', '@<-',
-      '[', '[<-', '[[', '[[<-', 'break', 'for', 'function', 'if', 'next',
-      'repeat', 'return', 'while', '{', '||', '~')
-
-known <- c(ls(.GenericArgsEnv, all.names=TRUE),
-           ls(.ArgsEnv, all.names=TRUE),
-           lang_elements)
+## check that all primitives are accounted for in .[Generic]ArgsEnv,
+## apart from the language elements:
+ff <- as.list(baseenv(), all.names=TRUE)
+ff <- names(ff)[vapply(ff, is.primitive, logical(1L))]
+
+known <- c(names(.GenericArgsEnv), names(.ArgsEnv), tools::langElts)
 stopifnot(ff %in% known, known %in% ff)
 
 
 ## check which are not considered as possibles for S4 generic
-ff4 <- names(methods:::.BasicFunsList)
+ff4 <- names(meth.FList <- methods:::.BasicFunsList)
 # as.double is the same as as.numeric
 S4generic <- ff %in% c(ff4, "as.double")
 notS4 <- ff[!S4generic]
@@ -74,8 +67,7 @@
 stopifnot(S4generic)
 
 # functions which are listed but not primitive
-extraS4 <- c('all', 'any', 'max', 'min', 'prod', 'range',
-             'round', 'signif', 'sum')
+extraS4 <- c('unlist', 'as.vector')
 ff4[!ff4 %in% c(ff, extraS4)]
 stopifnot(ff4 %in% c(ff, extraS4))
 
@@ -83,7 +75,7 @@
 ## primitives which are not internally generic cannot have S4 methods
 ## unless specifically arranged (e.g. %*%)
 nongen_prims <- ff[!ff %in% ls(.GenericArgsEnv, all.names=TRUE)]
-ff3 <- names(methods:::.BasicFunsList)[sapply(methods:::.BasicFunsList, function(x) is.logical(x) && !x)]
+ff3 <- ff4[vapply(meth.FList, function(x) is.logical(x) && !x, NA, USE.NAMES=FALSE)]
 ex <- nongen_prims[!nongen_prims %in% c("$", "$<-", "[", "[[" ,"[[<-", "[<-", "%*%", ff3)]
 if(length(ex))
     cat("non-generic primitives not excluded in methods:::.BasicFunsList:",
@@ -94,10 +86,10 @@
 require(methods)
 setClass("foo", representation(x="numeric", y="numeric"))
 xx <- new("foo",  x=1, y=2)
-S4gen <- names(methods:::.BasicFunsList)[sapply(methods:::.BasicFunsList, function(x) is.function(x))]
+S4gen <- ff4[vapply(meth.FList, is.function, NA, USE.NAMES=FALSE)]
 for(f in S4gen) {
     g <- get(f)
-    if(is.primitive(g)) g <- getGeneric(f) # should error on non-Generics.
+    if(!is(g, "genericFunction")) g <- getGeneric(f) # error on non-Generics.
     ff <- args(g)
     body(ff) <- "testit"
     nm <- names(formals(ff))
@@ -126,7 +118,7 @@
     if (f %in% except) next
     g <- get(f, envir = .GenericArgsEnv)
     an <- names(formals(args(g)))
-    if(length(an) >0 && an[1] == "...") next
+    if(length(an) > 0 && an[1] == "...") next
     an <- an[an != "..."]
     a <- rep(list(NULL), length(an))
     names(a) <- c("zZ", an[-1])
@@ -141,7 +133,7 @@
     if (f %in% except) next
     g <- get(f, envir = .ArgsEnv)
     an <- names(formals(args(g)))
-    if(length(an) >0 && an[1] == "...") next
+    if(length(an) > 0 && an[1] == "...") next
     an <- an[an != "..."]
     if(length(an)) {
         a <- rep(list(NULL), length(an))
diff -Nru r-base-3.2.3/tests/print-tests.Rout.save r-base-3.3.1/tests/print-tests.Rout.save
--- r-base-3.2.3/tests/print-tests.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/print-tests.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/p-r-random-tests.Rout.save r-base-3.3.1/tests/p-r-random-tests.Rout.save
--- r-base-3.2.3/tests/p-r-random-tests.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/p-r-random-tests.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -278,6 +278,6 @@
 > 
 > 
 > cat('Time elapsed: ', proc.time() - .proctime00,'\n')
-Time elapsed:  1.215 0.003 1.22 0 0 
+Time elapsed:  1.202 0.003 1.205 0 0 
 > 
 > 
diff -Nru r-base-3.2.3/tests/reg-examples1.R r-base-3.3.1/tests/reg-examples1.R
--- r-base-3.2.3/tests/reg-examples1.R	2015-03-18 23:04:10.000000000 +0000
+++ r-base-3.3.1/tests/reg-examples1.R	2016-04-24 22:15:05.000000000 +0000
@@ -63,6 +63,7 @@
 library(tools)
 example(Rdutils, run.donttest = TRUE)
 example(fileutils, run.donttest = TRUE)
+example(makevars_user, run.donttest = TRUE)
 ## results are location- and OS-specific
 example(parseLatex, run.donttest = TRUE) # charset-specific
 example(loadRdMacros, run.donttest = TRUE) # collation-specific
diff -Nru r-base-3.2.3/tests/reg-examples3.R r-base-3.3.1/tests/reg-examples3.R
--- r-base-3.2.3/tests/reg-examples3.R	2015-08-17 22:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-examples3.R	2016-04-19 22:15:06.000000000 +0000
@@ -10,7 +10,7 @@
 if(require("survival")) {
   model3 <- clogit(case ~ spontaneous+induced+strata(stratum), data = infert)
   print(summary(model3))
-  detach("package:survival")  # survival (conflicts)
+  detach("package:survival", unload = TRUE)  # survival (conflicts)
 }
 
 
diff -Nru r-base-3.2.3/tests/reg-examples3.Rout.save r-base-3.3.1/tests/reg-examples3.Rout.save
--- r-base-3.2.3/tests/reg-examples3.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-examples3.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -28,7 +28,7 @@
 > if(require("survival")) {
 +   model3 <- clogit(case ~ spontaneous+induced+strata(stratum), data = infert)
 +   print(summary(model3))
-+   detach("package:survival")  # survival (conflicts)
++   detach("package:survival", unload = TRUE)  # survival (conflicts)
 + }
 Loading required package: survival
 Call:
@@ -531,7 +531,7 @@
 > ## lattice may not be installed
 > ## Avoid possibly large list from R_HOME/site-library, which --vanilla includes.
 > dependsOnPkgs("lattice", lib.loc = .Library)
-[1] "Matrix" "nlme"   "mgcv"  
+[1] "Matrix"   "nlme"     "mgcv"     "survival"
 > 
 > ## This may not be installed
 > gridEx <- system.file("doc", "grid.Rnw", package = "grid")
@@ -552,5 +552,12 @@
 [1] "R (>= 3.0.0)"
 
 attr(,"class")
-[1] "DependsList" "list"       
+[1] "DependsList"
+Warning messages:
+1: 'getDepList' is deprecated.
+Use 'dependsOnPkgs() or package_dependencies()' instead.
+See help("Deprecated") 
+2: 'package.dependencies' is deprecated.
+Use 'package_dependencies' instead.
+See help("Deprecated") 
 > 
diff -Nru r-base-3.2.3/tests/reg-IO2.Rout.save r-base-3.3.1/tests/reg-IO2.Rout.save
--- r-base-3.2.3/tests/reg-IO2.Rout.save	2015-12-03 23:15:19.000000000 +0000
+++ r-base-3.3.1/tests/reg-IO2.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -64,7 +64,7 @@
 > 
 > # wrong col.names
 > try(read.table("foo3", header=TRUE, col.names=letters[1:4]))
-Error in scan(file, what, nmax, sep, dec, quote, skip, nlines, na.strings,  : 
+Error in scan(file = file, what = what, sep = sep, quote = quote, dec = dec,  : 
   line 1 did not have 4 elements
 In addition: Warning message:
 In read.table("foo3", header = TRUE, col.names = letters[1:4]) :
diff -Nru r-base-3.2.3/tests/reg-IO.Rout.save r-base-3.3.1/tests/reg-IO.Rout.save
--- r-base-3.2.3/tests/reg-IO.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-IO.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/reg-packages.R r-base-3.3.1/tests/reg-packages.R
--- r-base-3.2.3/tests/reg-packages.R	2015-08-28 22:15:13.000000000 +0000
+++ r-base-3.3.1/tests/reg-packages.R	2016-03-16 23:04:34.000000000 +0000
@@ -68,7 +68,9 @@
 ## NB: tests were added here for 2.11.0.
 ## NB^2: do not do this in the R sources!
 ## and this testdir is not installed.
-pkgSrcPath <- file.path(Sys.getenv("SRCDIR"), "Pkgs")
+if(interactive() && Sys.getenv("USER") == "maechler")
+    Sys.setenv(SRCDIR = normalizePath("~/R/D/r-devel/R/tests"))
+(pkgSrcPath <- file.path(Sys.getenv("SRCDIR"), "Pkgs"))
 if(!file_test("-d", pkgSrcPath) && !interactive()) {
     unlink("myTst", recursive=TRUE)
     print(proc.time())
@@ -76,7 +78,7 @@
 }
 
 ## else w/o clause:
-## could use file.copy(recursive = TRUE)
+## file.copy(pkgSrcPath, tempdir(), recursive = TRUE) - not ok: replaces symlink by copy
 system(paste('cp -R', shQuote(pkgSrcPath), shQuote(tempdir())))
 pkgPath <- file.path(tempdir(), "Pkgs")
 ## pkgB tests an empty R directory
@@ -84,6 +86,13 @@
 	   showWarnings = FALSE)
 p.lis <- if("Matrix" %in% row.names(installed.packages(.Library)))
 	     c("pkgA", "pkgB", "exNSS4") else "exNSS4"
+pkgApath <- file.path(pkgPath, "pkgA")
+if("pkgA" %in% p.lis && !dir.exists(d <- pkgApath)) {
+    cat("symlink 'pkgA' does not exist as directory ",d,"; copying it\n", sep='')
+    file.copy(file.path(pkgPath, "xDir", "pkg"), to = d, recursive=TRUE)
+    ## if even the copy failed (NB: pkgB depends on pkgA)
+    if(!dir.exists(d)) p.lis <- p.lis[!(p.lis %in% c("pkgA", "pkgB"))]
+}
 for(p. in p.lis) {
     cat("building package", p., "...\n")
     r <- build.pkg(file.path(pkgPath, p.))
@@ -98,10 +107,23 @@
 	  res[,"LibPath"] == "myLib")
 ### Specific Tests on our "special" packages: ------------------------------
 
-## Find objects which are NULL via "::" -- not to be expected often
-## we have one in our pkgA, but only if Matrix is present
+## These used to fail because of the sym.link in pkgA
+if("pkgA" %in% p.lis && dir.exists(pkgApath)) {
+    cat("undoc(pkgA):\n"); print(uA <- tools::undoc(dir = pkgApath))
+    cat("codoc(pkgA):\n"); print(cA <- tools::codoc(dir = pkgApath))
+    stopifnot(identical(uA$`code objects`, c("nil", "search")),
+              identical(uA$`data sets`,    "nilData"))
+}
+
+## - Check conflict message.
+## - Find objects which are NULL via "::" -- not to be expected often
+##   we have one in our pkgA, but only if Matrix is present.
 if(dir.exists(file.path("myLib", "pkgA"))) {
-  require(pkgA, lib="myLib")
+  msgs <- capture.output(require(pkgA, lib="myLib"), type = "message")
+  writeLines(msgs)
+  stopifnot(length(msgs) > 2,
+            length(grep("The following object is masked.*package:base", msgs)) > 0,
+            length(grep("\\bsearch\\b", msgs)) > 0)
   data(package = "pkgA") # -> nilData
   stopifnot(is.null( pkgA::  nil),
 	    is.null( pkgA::: nil),
@@ -115,7 +137,7 @@
 ## let alone where they are installed
 if(dir.exists(file.path("myLib", "exNSS4")) &&
    dir.exists(file.path(.Library, "Matrix"))) {
-    for(ns in c("pkgB", "pkgA", "Matrix", "exNSS4")) unloadNamespace(ns)
+    for(ns in c(rev(p.lis), "Matrix")) unloadNamespace(ns)
     ## Both exNSS4 and Matrix define "atomicVector" *the same*,
     ## but  'exNSS4'  has it extended - and hence *both* are registered in cache -> "conflicts"
     requireNamespace("exNSS4", lib= "myLib")
diff -Nru r-base-3.2.3/tests/reg-plot.Rout.save r-base-3.3.1/tests/reg-plot.Rout.save
--- r-base-3.2.3/tests/reg-plot.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-plot.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/reg-S4.R r-base-3.3.1/tests/reg-S4.R
--- r-base-3.2.3/tests/reg-S4.R	2015-08-17 22:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-S4.R	2016-03-16 23:04:34.000000000 +0000
@@ -327,10 +327,7 @@
 xx <- new("foo", FALSE)
 !xx
 
-## This failed for about one day -- as.vector(x, mode) :
-setMethod("as.vector", signature(x = "foo", mode = "missing"),
-          function(x) unclass(x))
-## whereas this fails in R versions earlier than 2.6.0:
+## This fails in R versions earlier than 2.6.0:
 setMethod("as.vector", "foo", function(x) unclass(x))
 stopifnot(removeClass("foo"))
 
@@ -514,7 +511,7 @@
 xtfrm(x) # works as the base representation is numeric
 setMethod('xtfrm', 'numWithId', function(x) x@.Data)
 xtfrm(x)
-stopifnot(identical(xtfrm(x), 1:3))
+stopifnot(identical(xtfrm(x), 1:3))# "integer" is "numeric"
 ## new in 2.11.0
 
 ## [-dispatch using callNextMethod()
@@ -607,6 +604,7 @@
 setMethod(length, "A", function(x) length(x@aa))
 setMethod(`[[`,   "A", function(x, i, j, ...) x@aa[[i]])
 setMethod(`[`,    "A", function(x, i, j, ...) new("A", aa = x@aa[i]))
+setMethod("is.na","A", function(x) is.na(x@aa))
 stopifnot(length(a) == 6, identical(a[[5]], aa[[5]]),
           identical(a, rev(rev(a))), # using '['
 	  identical(mapply(`*`, aa, rep(1:3, 2)),
@@ -614,12 +612,7 @@
 ## Up to R 2.15.2, internally 'a' is treated as if it was of length 1
 ## because internal dispatch did not work for length().
 
-## is.unsorted() for formal classes - and R > 3.0.0 :
-## Fails, unfortunately (from C, base::.gtn() is called w/o dispatch)
-## setMethod("anyNA", "A", function(x) anyNA(x@aa))
-## setMethod(".gtn", "A", function(x,strictly) .gtn(x@aa, strictly))
-## but this now works (thanks to DispatchOrEval() ):
-setMethod("is.unsorted", "A", function(x, na.rm=FALSE, strictly=FALSE)
+setMethod("is.unsorted", "A", function(x, na.rm, strictly)
     is.unsorted(x@aa, na.rm=na.rm, strictly=strictly))
 
 stopifnot(!is.unsorted(a), # 11:16 *is* sorted
@@ -767,8 +760,68 @@
           identical(colnames(mm), c("", "", "T")),
           identical(cbind(m1, m2, deparse.level=0),
                     cbind(m1@.Data, m2@.Data)))
-rm(m1,m2)
-removeClass("mondate")
 ##
+## Cleanup all class definitions etc -- seems necessary for the following "re"-definitions:
+invisible(lapply(getClasses(globalenv()), removeClass))
+nn <- names(globalenv())
+rm(list = c("nn", nn))
+
+## Using "data.frame" in a slot -- all have worked for long:
+setClass("A", representation(slot1="numeric", slot2="logical"))
+setClass("D1", contains="A", representation(design="data.frame"))
+setClass("D2", contains="D1")
+validObject(a <- new("A", slot1=77, slot2=TRUE))
+validObject(D. <- new("D2", a, design = data.frame(x = 1)))
+## using "formula" in a slot -- from Hervé Pages :
+setClass("B", contains="A", representation(design="formula"))
+setClass("C", contains="B")
+##
+a <- new("A", slot1=77, slot2=TRUE)
+validObject(C1 <- new("C", a, design = x ~ y))# failed for R <= 3.2.0
+C2 <- new("C", slot1=a@slot1, slot2=a@slot2, design=x ~ y)
+stopifnot(identical(C1, C2),
+	  identical(formula(), formula(NULL)),
+	  length(N <- new("formula")) == 0, inherits(N, "formula"),
+	  length(N <- new("table")  ) == 0, is.table(N),
+	  validObject(N <- new("summary.table")),
+	  length(N <- new("ordered")) == 0, is.ordered(N))
+## formula() and new("formula"), new("..") also failed  in R <= 3.2.0
+
+require("stats4")# -> "mle" class
+validObject(sig <- new("signature", obj = "mle"))
+stopifnot(c("package", "names") %in% slotNames(sig))
+str(sig) # failed, too
+
+cl4 <- getClasses("package:stats4")
+stopifnot(identical(getClasses(which(search() == "package:stats4")), cl4),
+	  c("mle", "profile.mle", "summary.mle") %in% cl4)
+## failed after an optimization patch
+
+detach("package:methods", force=TRUE)
+C1@slot1 <- pi
+stopifnot(identical(C1@slot1, pi))
+stopifnot(require("methods"))
+## Slot assignment failed in R <= 3.2.2, C code calling checkAtAssignment()
+
+## Error in argument evaluation of S4 generic - PR#16111
+f <- function() {
+    signal <- FALSE
+    withCallingHandlers({ g(sqrt(-1)) }, warning = function(w) {
+        signal <<- TRUE
+        invokeRestart("muffleWarning")
+    })
+    signal
+}
+g <- function(x) x
+op <- options(warn = 2)# warnings give errors
+stopifnot(isTRUE( f() ))
+setGeneric("g")
+stopifnot(isTRUE( f() ))
+options(op)
+## the second  f()  gave a warning and FALSE in  R versions  2.12.0 <= . <= 3.2.3
 
 
+stopifnot(
+    identical(formals(getGeneric("as.vector")), formals(base::as.vector)),
+    identical(formals(getGeneric("unlist")),    formals(base::unlist)))
+## failed for a while in R-devel (3.3.0)
diff -Nru r-base-3.2.3/tests/reg-S4.Rout.save r-base-3.3.1/tests/reg-S4.Rout.save
--- r-base-3.2.3/tests/reg-S4.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-S4.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -556,12 +556,7 @@
 An object of class "foo"
 [1] NA
 > 
-> ## This failed for about one day -- as.vector(x, mode) :
-> setMethod("as.vector", signature(x = "foo", mode = "missing"),
-+           function(x) unclass(x))
-Creating a generic function for 'as.vector' from package 'base' in the global environment
-[1] "as.vector"
-> ## whereas this fails in R versions earlier than 2.6.0:
+> ## This fails in R versions earlier than 2.6.0:
 > setMethod("as.vector", "foo", function(x) unclass(x))
 [1] "as.vector"
 > stopifnot(removeClass("foo"))
@@ -776,7 +771,7 @@
 [1] "xtfrm"
 > xtfrm(x)
 [1] 1 2 3
-> stopifnot(identical(xtfrm(x), 1:3))
+> stopifnot(identical(xtfrm(x), 1:3))# "integer" is "numeric"
 > ## new in 2.11.0
 > 
 > ## [-dispatch using callNextMethod()
@@ -891,6 +886,8 @@
 [1] "[["
 > setMethod(`[`,    "A", function(x, i, j, ...) new("A", aa = x@aa[i]))
 [1] "["
+> setMethod("is.na","A", function(x) is.na(x@aa))
+[1] "is.na"
 > stopifnot(length(a) == 6, identical(a[[5]], aa[[5]]),
 +           identical(a, rev(rev(a))), # using '['
 + 	  identical(mapply(`*`, aa, rep(1:3, 2)),
@@ -898,12 +895,7 @@
 > ## Up to R 2.15.2, internally 'a' is treated as if it was of length 1
 > ## because internal dispatch did not work for length().
 > 
-> ## is.unsorted() for formal classes - and R > 3.0.0 :
-> ## Fails, unfortunately (from C, base::.gtn() is called w/o dispatch)
-> ## setMethod("anyNA", "A", function(x) anyNA(x@aa))
-> ## setMethod(".gtn", "A", function(x,strictly) .gtn(x@aa, strictly))
-> ## but this now works (thanks to DispatchOrEval() ):
-> setMethod("is.unsorted", "A", function(x, na.rm=FALSE, strictly=FALSE)
+> setMethod("is.unsorted", "A", function(x, na.rm, strictly)
 +     is.unsorted(x@aa, na.rm=na.rm, strictly=strictly))
 Creating a generic function for 'is.unsorted' from package 'base' in the global environment
 [1] "is.unsorted"
@@ -1109,10 +1101,79 @@
 +           identical(colnames(mm), c("", "", "T")),
 +           identical(cbind(m1, m2, deparse.level=0),
 +                     cbind(m1@.Data, m2@.Data)))
-> rm(m1,m2)
-> removeClass("mondate")
+> ##
+> ## Cleanup all class definitions etc -- seems necessary for the following "re"-definitions:
+> invisible(lapply(getClasses(globalenv()), removeClass))
+> nn <- names(globalenv())
+> rm(list = c("nn", nn))
+> 
+> ## Using "data.frame" in a slot -- all have worked for long:
+> setClass("A", representation(slot1="numeric", slot2="logical"))
+> setClass("D1", contains="A", representation(design="data.frame"))
+> setClass("D2", contains="D1")
+> validObject(a <- new("A", slot1=77, slot2=TRUE))
+[1] TRUE
+> validObject(D. <- new("D2", a, design = data.frame(x = 1)))
 [1] TRUE
+> ## using "formula" in a slot -- from Hervé Pages :
+> setClass("B", contains="A", representation(design="formula"))
+> setClass("C", contains="B")
 > ##
+> a <- new("A", slot1=77, slot2=TRUE)
+> validObject(C1 <- new("C", a, design = x ~ y))# failed for R <= 3.2.0
+[1] TRUE
+> C2 <- new("C", slot1=a@slot1, slot2=a@slot2, design=x ~ y)
+> stopifnot(identical(C1, C2),
++ 	  identical(formula(), formula(NULL)),
++ 	  length(N <- new("formula")) == 0, inherits(N, "formula"),
++ 	  length(N <- new("table")  ) == 0, is.table(N),
++ 	  validObject(N <- new("summary.table")),
++ 	  length(N <- new("ordered")) == 0, is.ordered(N))
+> ## formula() and new("formula"), new("..") also failed  in R <= 3.2.0
+> 
+> require("stats4")# -> "mle" class
+> validObject(sig <- new("signature", obj = "mle"))
+[1] TRUE
+> stopifnot(c("package", "names") %in% slotNames(sig))
+> str(sig) # failed, too
+Formal class 'signature' [package "methods"] with 3 slots
+  ..@ .Data  : chr "mle"
+  ..@ names  : chr "obj"
+  ..@ package: chr ""
+> 
+> cl4 <- getClasses("package:stats4")
+> stopifnot(identical(getClasses(which(search() == "package:stats4")), cl4),
++ 	  c("mle", "profile.mle", "summary.mle") %in% cl4)
+> ## failed after an optimization patch
+> 
+> detach("package:methods", force=TRUE)
+> C1@slot1 <- pi
+> stopifnot(identical(C1@slot1, pi))
+> stopifnot(require("methods"))
+Loading required package: methods
+> ## Slot assignment failed in R <= 3.2.2, C code calling checkAtAssignment()
+> 
+> ## Error in argument evaluation of S4 generic - PR#16111
+> f <- function() {
++     signal <- FALSE
++     withCallingHandlers({ g(sqrt(-1)) }, warning = function(w) {
++         signal <<- TRUE
++         invokeRestart("muffleWarning")
++     })
++     signal
++ }
+> g <- function(x) x
+> op <- options(warn = 2)# warnings give errors
+> stopifnot(isTRUE( f() ))
+> setGeneric("g")
+[1] "g"
+> stopifnot(isTRUE( f() ))
+> options(op)
+> ## the second  f()  gave a warning and FALSE in  R versions  2.12.0 <= . <= 3.2.3
 > 
 > 
+> stopifnot(
++     identical(formals(getGeneric("as.vector")), formals(base::as.vector)),
++     identical(formals(getGeneric("unlist")),    formals(base::unlist)))
+> ## failed for a while in R-devel (3.3.0)
 > 
diff -Nru r-base-3.2.3/tests/reg-tests-1a.R r-base-3.3.1/tests/reg-tests-1a.R
--- r-base-3.2.3/tests/reg-tests-1a.R	2015-03-18 23:04:10.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-1a.R	2016-03-16 23:04:37.000000000 +0000
@@ -2241,8 +2241,9 @@
 stopifnot(identical(a9, list("", na ,c("BA",""))))
 a10 <- strsplit(a, na)
 stopifnot(identical(a10, as.list(a)))
-## but nchar doesn't fit this pattern
-stopifnot(all(!is.na(nchar(a))))
+## nchar() differs a bit
+stopifnot(identical(is.na(a), is.na(nchar(a))),
+          all(!is.na(nchar(a, type = "width"))))
 ## NA and "NA" were not distinguished in 1.7.x
 
 
diff -Nru r-base-3.2.3/tests/reg-tests-1b.R r-base-3.3.1/tests/reg-tests-1b.R
--- r-base-3.2.3/tests/reg-tests-1b.R	2015-03-18 23:04:07.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-1b.R	2016-03-16 23:04:33.000000000 +0000
@@ -2095,23 +2095,7 @@
 stopifnot(identical(NA_character_, enc2utf8(NA_character_)))
 ## gave "NA" instead of NA_character_
 
-
-## checking all.equal() with externalptr
-library(methods) # getClass()'s versionKey is an e.ptr
-cA <- getClass("ANY")
-stopifnot(all.equal(cA, cA),
-          is.character(all.equal(cA, getClass("S4"))))
-# both all.equal() failed in R <= 3.1.1
-
-
-## as.hexmode(x), as.octmode(x)  when x is double
-x <- c(NA, 1)
-stopifnot(identical(x == x,
-		    as.hexmode(x) == as.octmode(x)))
-p <- c(1, pi)
-assertError(as.hexmode(p))
-assertError(as.octmode(p))
-## where all "wrong" in R <= 3.1.1
-
+## End of regression tests for R < 3.0.0
+## -------------------------------------
 
 proc.time()
diff -Nru r-base-3.2.3/tests/reg-tests-1c.R r-base-3.3.1/tests/reg-tests-1c.R
--- r-base-3.2.3/tests/reg-tests-1c.R	2015-04-21 22:15:10.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-1c.R	2016-05-26 22:15:05.000000000 +0000
@@ -339,6 +339,7 @@
 d <- as.dendrogram(hclust(dist(sin(1:7))))
 (dl <- d[[c(2,1,2)]]) # single-leaf dendrogram
 stopifnot(inherits(dl, "dendrogram"), is.leaf(dl),
+	  identical(attributes(reorder(dl, 1:7)), c(attributes(dl), value = 5L)),
 	  identical(order.dendrogram(dl), as.vector(dl)),
 	  identical(d, as.dendrogram(d)))
 ## as.dendrogram() was hidden;  order.*() failed for leaf
@@ -398,7 +399,7 @@
 
 
 ## PR#15753
-0x110p-5L
+0x110p-5L # (+ warning)
 stopifnot(.Last.value == 8.5)
 ## was 272 with a garbled message in R 3.0.0 - 3.1.0.
 
@@ -421,6 +422,24 @@
 ## all 4 prettyNum() would error out
 
 
+## checking all.equal() with externalptr
+library(methods) # getClass()'s versionKey is an e.ptr
+cA <- getClass("ANY")
+stopifnot(all.equal(cA, cA),
+          is.character(all.equal(cA, getClass("S4"))))
+# both all.equal() failed in R <= 3.1.1
+
+
+## as.hexmode(x), as.octmode(x)  when x is double
+x <- c(NA, 1)
+stopifnot(identical(x == x,
+		    as.hexmode(x) == as.octmode(x)))
+p <- c(1, pi)
+tools::assertError(as.hexmode(p))
+tools::assertError(as.octmode(p))
+## where all "wrong" in R <= 3.1.1
+
+
 ## PR#15935
 y <- 1:3
 drop1(lm(y ~ 1))
@@ -441,11 +460,14 @@
 
 
 ## merge.dendrogram(), PR#15648
-mkDend <- function(n, lab, rGen = function(n) 1+round(16*abs(rnorm(n)))) {
+mkDend <- function(n, lab, method = "complete",
+                   ## gives *ties* often:
+		   rGen = function(n) 1+round(16*abs(rnorm(n)))) {
     stopifnot(is.numeric(n), length(n) == 1, n >= 1, is.character(lab))
     a <- matrix(rGen(n*n), n, n)
     colnames(a) <- rownames(a) <- paste0(lab, 1:n)
-    as.dendrogram(hclust(as.dist(a + t(a))))
+    .HC. <<- hclust(as.dist(a + t(a)), method=method)
+    as.dendrogram(.HC.)
 }
 set.seed(7)
 da <- mkDend(4, "A")
@@ -455,6 +477,13 @@
 stopifnot(hcab$order == c(2, 4, 1, 3, 7, 5, 6),
 	  hcab$labels == c(paste0("A", 1:4), paste0("B", 1:3)))
 ## was wrong in R <= 3.1.1
+set.seed(1) ; h1 <- as.hclust(mkDend(5, "S", method="single")); hc1 <- .HC.
+set.seed(5) ; h5 <- as.hclust(mkDend(5, "S", method="single")); hc5 <- .HC.
+set.seed(42); h3 <- as.hclust(mkDend(5, "A", method="single")); hc3 <- .HC.
+## all failed (differently!) because of ties in R <= 3.2.3
+stopifnot(all.equal(h1[1:4], hc1[1:4], tol = 1e-12),
+	  all.equal(h5[1:4], hc5[1:4], tol = 1e-12),
+	  all.equal(h3[1:4], hc3[1:4], tol = 1e-12))
 
 
 ## bw.SJ() and similar with NA,Inf values, PR#16024
@@ -723,4 +752,869 @@
 ## The two cases with positive numbers  failed in R <= 3.2.0
 
 
-proc.time()
+## Ensure that sort() works with a numeric vector "which is an object":
+stopifnot(is.object(y <- freeny$y))
+stopifnot(diff(sort(y)) > 0)
+## order() and hence sort() failed here badly for a while around 2015-04-16
+
+
+## NAs in data frame names:
+dn <- list(c("r1", NA), c("V", NA))
+d11 <- as.data.frame(matrix(c(1, 1, 1, 1), ncol = 2, dimnames = dn))
+stopifnot(identical(names(d11), dn[[2]]),
+          identical(row.names(d11), dn[[1]]))
+## as.data.frame() failed in R-devel for a couple of hours ..
+## note that format(d11) does fail currently, and hence print(), too
+
+
+## Ensure  R -e ..  works on Unix
+if(.Platform$OS.type == "unix" &&
+   file.exists(Rc <- file.path(R.home("bin"), "R")) &&
+   file.access(Rc, mode = 1) == 0) { # 1: executable
+    cmd <- paste(Rc, "-q --vanilla -e 1:3")
+    ans <- system(cmd, intern=TRUE)
+    stopifnot(length(ans) >= 3,
+	      identical(ans[1:2], c("> 1:3",
+				    "[1] 1 2 3")))
+}
+## (failed for < 1 hr, in R-devel only)
+
+
+## Parsing large exponents of floating point numbers, PR#16358
+set.seed(12)
+lrg <- sprintf("%.0f", round(exp(10*(2+abs(rnorm(2^10))))))
+head(huge <- paste0("1e", lrg))
+    micro <- paste0("1e-", lrg)
+stopifnot(as.numeric(huge) == Inf,
+          as.numeric(micro) == 0)
+## Both failed in R <= 3.2.0
+
+
+## vcov() failed on manova() results, PR#16380
+tear <- c(6.5, 6.2, 5.8, 6.5, 6.5, 6.9, 7.2, 6.9, 6.1, 6.3, 6.7, 6.6, 7.2, 7.1, 6.8, 7.1, 7.0, 7.2, 7.5, 7.6)
+gloss <- c(9.5, 9.9, 9.6, 9.6, 9.2, 9.1, 10.0, 9.9, 9.5, 9.4, 9.1, 9.3, 8.3, 8.4, 8.5, 9.2, 8.8, 9.7, 10.1, 9.2)
+opacity <- c(4.4, 6.4, 3.0, 4.1, 0.8, 5.7, 2.0, 3.9, 1.9, 5.7, 2.8, 4.1, 3.8,1.6, 3.4, 8.4, 5.2, 6.9, 2.7, 1.9)
+Y <- cbind(tear, gloss, opacity)
+rate <- factor(gl(2,10), labels = c("Low", "High"))
+fit <- manova(Y ~ rate)
+vcov(fit)
+## Gave error because coef.aov() turned matrix of coefficients into a vector
+
+
+## Unary / Binary uses of logic operations, PR#16385
+tools::assertError(`&`(FALSE))
+tools::assertError(`|`(TRUE))
+## Did not give errors in R <= 3.2.0
+E <- tryCatch(`!`(), error = function(e)e)
+stopifnot(grepl("0 arguments .*\\<1", conditionMessage(E)))
+## Gave wrong error message in R <= 3.2.0
+stopifnot(identical(!matrix(TRUE), matrix(FALSE)),
+	  identical(!matrix(FALSE), matrix(TRUE)))
+## was wrong for while in R 3.2.0 patched
+
+
+## cummax(<integer>)
+iNA <- NA_integer_
+x <- c(iNA, 1L)
+stopifnot(identical(cummin(x), c(iNA, iNA)),
+          identical(cummax(x), c(iNA, iNA)))
+## an initial NA was not propagated in R <= 3.2.0
+
+
+## summaryRprof failed for very short profile, PR#16395
+profile <- tempfile()
+writeLines(c(
+'memory profiling: sample.interval=20000',
+':145341:345360:13726384:0:"stdout"',
+':208272:345360:19600000:0:"stdout"'), profile)
+summaryRprof(filename = profile, memory = "both")
+unlink(profile)
+## failed when a matrix was downgraded to a vector
+
+
+## option(OutDec = *)  -- now gives a warning when  not 1 character
+op <- options(OutDec = ".", digits = 7, # <- default
+              warn = 2)# <- (unexpected) warnings become errors
+stopifnot(identical("3.141593", fpi <- format(pi)))
+options(OutDec = ",")
+stopifnot(identical("3,141593", cpi <- format(pi)))
+## warnings, but it "works" (for now):
+tools::assertWarning(options(OutDec = ".1."))
+stopifnot(identical("3.1.141593", format(pi)))
+tools::assertWarning(options(OutDec = ""))
+tools::assertWarning(stopifnot(identical("3141593", format(pi))))
+options(op)# back to sanity
+## No warnings in R versions <= 3.2.1
+
+
+## format(*, decimal.mark=".")  when   OutDec != "."  (PR#16411)
+op <- options(OutDec = ",")
+stopifnot(identical(fpi, format(pi, decimal.mark=".")))
+options(op)
+## failed in R <= 3.2.1
+
+
+## model.frame() removed ts attributes on original data (PR#16436)
+orig <- class(EuStockMarkets)
+mf <- model.frame(EuStockMarkets ~ 1, na.action=na.fail)
+stopifnot(identical(orig, class(EuStockMarkets)))
+## ts class lost in R <= 3.2.1
+
+
+##
+foo <- as.expression(1:3)
+matrix(foo, 3, 3) # always worked
+matrix(foo, 3, 3, byrow = TRUE)
+## failed in R <= 3.1.2
+
+
+## labels.dendrogram(), dendrapply(), etc -- see comment #15 of PR#15215 :
+(D <- as.dendrogram(hclust(dist(cbind(setNames(c(0,1,4), LETTERS[1:3]))))))
+stopifnot(
+    identical(labels(D), c("C", "A", "B")),
+    ## has been used in "CRAN package space"
+    identical(suppressWarnings(dendrapply(D, labels)),
+              list("C", list("A", "B"), "C")))
+## dendrapply(D, labels) failed in R-devel for a day or two
+
+
+## poly() / polym() predict()ion
+library(datasets)
+alm <- lm(stack.loss ~ poly(Air.Flow, Water.Temp, degree=3), stackloss)
+f20 <- fitted(alm)[1:20] # "correct" prediction values [1:20]
+stopifnot(all.equal(unname(f20[1:4]), c(39.7703378, 39.7703378, 35.8251359, 21.5661761)),
+	  all.equal(f20, predict(alm, stackloss) [1:20] , tolerance = 1e-14),
+	  all.equal(f20, predict(alm, stackloss[1:20, ]), tolerance = 1e-14))
+## the second prediction went off in  R <= 3.2.1
+
+
+## PR#16478
+kkk <- c("a\tb", "3.14\tx")
+z1 <- read.table(textConnection(kkk), sep = "\t", header = TRUE,
+                 colClasses = c("numeric", "character"))
+z2 <- read.table(textConnection(kkk), sep = "\t", header = TRUE,
+                 colClasses = c(b = "character", a = "numeric"))
+stopifnot(identical(z1, z2))
+z3 <- read.table(textConnection(kkk), sep = "\t", header = TRUE,
+                 colClasses = c(b = "character"))
+stopifnot(identical(z1, z3))
+z4 <- read.table(textConnection(kkk), sep = "\t", header = TRUE,
+                 colClasses = c(c = "integer", b = "character", a = "numeric"))
+stopifnot(identical(z1, z4))
+## z2 and z4 used positional matching (and failed) in R < 3.3.0.
+
+
+## PR#16484
+z <- regexpr("(.)", NA_character_, perl = TRUE)
+stopifnot(is.na(attr(z, "capture.start")), is.na(attr(z, "capture.length")))
+## Result was random integers in R <= 3.2.2.
+
+
+## PR#14861
+if(.Platform$OS.type == "unix") { # no 'ls /'  on Windows
+    con <- pipe("ls /", open = "rt")
+    data <- readLines(con)
+    z <- close(con)
+    print(z)
+    stopifnot(identical(z, 0L))
+}
+## was NULL in R <= 3.2.2
+
+
+## Sam Steingold:  compiler::enableJIT(3) not working in ~/.Rprofile anymore
+stopifnot(identical(topenv(baseenv()),
+                    baseenv()))
+## accidentally globalenv in R 3.2.[12] only
+
+
+## widths of unknown Unicode characters
+stopifnot(nchar("\u200b", "w") == 0)
+## was -1 in R 3.2.2
+
+
+## abbreviate dropped names in some cases
+x <- c("AA", "AB", "AA", "CBA") # also test handling of duplicates
+for(m in 2:0) {
+    print(y <- abbreviate(x, m))
+    stopifnot(identical(names(y), x))
+}
+## dropped for 0 in R <= 3.2.2
+
+
+## match(<NA>, <NA>)
+stopifnot(
+    isTRUE(NA          %in% c(NA, TRUE)),
+    isTRUE(NA_integer_ %in% c(TRUE, NA)),
+    isTRUE(NA_real_    %in% c(NA, FALSE)),# !
+    isTRUE(!(NaN       %in% c(NA, FALSE))),
+    isTRUE(NA          %in% c(3L, NA)),
+    isTRUE(NA_integer_ %in% c(NA, 3L)),
+    isTRUE(NA_real_    %in% c(3L, NA)),# !
+    isTRUE(!(NaN       %in% c(3L, NA))),
+    isTRUE(NA          %in% c(2., NA)),# !
+    isTRUE(NA_integer_ %in% c(NA, 2.)),# !
+    isTRUE(NA_real_    %in% c(2., NA)),# !
+    isTRUE(!(NaN       %in% c(2., NA))))
+## the "!" gave FALSE in R-devel (around 20.Sep.2015)
+
+
+## oversight in  within.data.frame()  [R-help, Sep 20 2015 14:23 -04]
+df <- data.frame(.id = 1:3 %% 3 == 2, a = 1:3)
+d2 <- within(df, {d = a + 2})
+stopifnot(identical(names(d2), c(".id", "a", "d")))
+## lost the '.id' column in R <= 3.2.2
+
+## system() truncating and splitting long lines of output, PR#16544
+## only works when platform has getline() in stdio.h, and Solaris does not.
+## op <- options(warn = 2)# no warnings allowed
+## if(.Platform$OS.type == "unix") { # only works when platform has getline() in stdio.h
+##     cn <- paste(1:2222, collapse=" ")
+##     rs <- system(paste("echo", cn), intern=TRUE)
+##     stopifnot(identical(rs, cn))
+## }
+## options(op)
+
+
+## tail.matrix()
+B <- 100001; op <- options(max.print = B + 99)
+mat.l <- list(m0  = matrix(, 0,2),
+              m0n = matrix(, 0,2, dimnames = list(NULL, paste0("c",1:2))),
+              m2  = matrix(1:2,   2,1),
+              m2n = matrix(1:2,   2,3, dimnames = list(NULL, paste0("c",1:3))),
+              m9n = matrix(1:9,   9,1, dimnames = list(paste0("r",1:9),"CC")),
+              m12 = matrix(1:12, 12,1),
+              mBB = matrix(1:B, B, 1))
+## tail() used to fail for 0-rows matrices m0*
+n.s <- -3:3
+hl <- lapply(mat.l, function(M) lapply(n.s, function(n) head(M, n)))
+tl <- lapply(mat.l, function(M) lapply(n.s, function(n) tail(M, n)))
+## Check dimensions of resulting matrices --------------
+## ncol:
+Mnc <- do.call(rbind, rep(list(vapply(mat.l, ncol, 1L)), length(n.s)))
+stopifnot(identical(Mnc, sapply(hl, function(L) vapply(L, ncol, 1L))),
+          identical(Mnc, sapply(tl, function(L) vapply(L, ncol, 1L))))
+## nrow:
+fNR <- function(L) vapply(L, nrow, 1L)
+tR <- sapply(tl, fNR)
+stopifnot(identical(tR, sapply(hl, fNR)), # head() & tail  both
+          tR[match(0, n.s),] == 0, ## tail(*,0) has always 0 rows
+          identical(tR, outer(n.s, fNR(mat.l), function(x,y)
+              ifelse(x < 0, pmax(0L, y+x), pmin(y,x)))))
+for(j in c("m0", "m0n")) { ## 0-row matrices: tail() and head() look like identity
+    co <- capture.output(mat.l[[j]])
+    stopifnot(vapply(hl[[j]], function(.) identical(co, capture.output(.)), NA),
+              vapply(tl[[j]], function(.) identical(co, capture.output(.)), NA))
+}
+
+CO1 <- function(.) capture.output(.)[-1] # drop the printed column names
+## checking tail(.) rownames formatting
+nP <- n.s > 0
+for(nm in c("m9n", "m12", "mBB")) { ## rownames: rather [100000,] than [1e5,]
+    tf <- file(); capture.output(mat.l[[nm]], file=tf)
+    co <- readLines(tf); close(tf)
+    stopifnot(identical(# tail(.) of full output == output of tail(.) :
+        lapply(n.s[nP], function(n) tail(co, n)),
+        lapply(tl[[nm]][nP], CO1)))
+}
+
+identCO <- function(x,y, ...) identical(capture.output(x), capture.output(y), ...)
+headI <- function(M, n) M[head(seq_len(nrow(M)), n), , drop=FALSE]
+tailI <- function(M, n) M[tail(seq_len(nrow(M)), n), , drop=FALSE]
+for(mat in mat.l) {
+    ## do not capture.output for  tail(<large>, <small negative>)
+    n.set <- if(nrow(mat) < 999) -3:3 else 0:3
+    stopifnot(
+        vapply(n.set, function(n) identCO (head(mat, n), headI(mat, n)), NA),
+        vapply(n.set, function(n) identCO (tail (mat, n, addrownums=FALSE),
+                                           tailI(mat, n)), NA),
+        vapply(n.set, function(n) all.equal(tail(mat, n), tailI(mat, n),
+                                            check.attributes=FALSE), NA))
+}
+options(op)
+## end{tail.matrix check} ------------------
+
+## format.data.frame() & as.data.frame.list() - PR#16580
+myL <- list(x=1:20, y=rnorm(20), stringsAsFactors = gl(4,5))
+names(myL)[1:2] <- lapply(1:2, function(i)
+    paste(sample(letters, 300, replace=TRUE), collapse=""))
+nD  <- names(myD  <- as.data.frame(myL))
+nD2 <- names(myD2 <- as.data.frame(myL, cut.names = 280))
+nD3 <- names(myD3 <- as.data.frame(myL, cut.names = TRUE))
+stopifnot(nchar(nD) == c(300,300,16), is.data.frame(myD),  dim(myD)  == c(20,3),
+	  nchar(nD2)== c(278,278,16), is.data.frame(myD2), dim(myD2) == c(20,3),
+	  nchar(nD3)== c(254,254,16), is.data.frame(myD3), dim(myD3) == c(20,3),
+	  identical(nD[3], "stringsAsFactors"),
+	  identical(nD[3], nD2[3]), identical(nD[3], nD3[3]))
+
+names(myD)[1:2] <- c("Variable.1", "")# 2nd col.name is "empty"
+## A data frame with a column that is an empty data frame:
+d20 <- structure(list(type = c("F", "G"), properties = data.frame(i=1:2)[,-1]),
+                 class = "data.frame", row.names = c(NA, -2L))
+stopifnot(is.data.frame(d20), dim(d20) == c(2,2),
+	  identical(colnames(d20), c("type", "properties")),
+	  identical(capture.output(d20), c("  type", "1    F", "2    G")))
+## format(d20) failed in intermediate R versions
+stopifnot(identical(names(myD), names(format(head(myD)))),
+	  identical(names(myD), c("Variable.1", "", "stringsAsFactors")),
+	  identical(rbind.data.frame(2:1, 1:2), ## was wrong for some days
+		    data.frame(c.2L..1L. = c(2L, 1L), X1.2 = 1:2)))
+## format.data.frame() did not show "stringsAsFactors" in R <= 3.2.2
+## Follow up: the new as.data.frame.list() must be careful with 'AsIs' columns:
+desc <- structure( c("a", NA, "z"), .Names = c("A", NA, "Z"))
+tools::assertError( data.frame(desc = desc, stringsAsFactors = FALSE) )
+## however
+dd <- data.frame(desc = structure(desc, class="AsIs"),
+                 row.names = c("A","M","Z"), stringsAsFactors = FALSE)
+## is "legal" (because "AsIs" can be 'almost anything')
+dd ## <- did not format nor print correctly in R-devel early Nov.2015
+fdesc <- structure(c("a", "NA", "z"), .Names=names(desc), class="AsIs")
+stopifnot(identical(format(dd),
+                    data.frame(desc = fdesc, row.names = c("A", "M", "Z"))),
+          identical(capture.output(dd),
+                    c("  desc", "A    a",
+		      "M <NA>", "Z    z")),
+	  identical(dd, data.frame(list(dd))))# lost row.names for a while
+
+
+## var(x) and hence sd(x)  with factor x, PR#16564
+tools::assertError(cov(1:6, f <- gl(2,3)))# was ok already
+tools::assertWarning(var(f))
+tools::assertWarning( sd(f))
+## var() "worked" in R <= 3.2.2  using the underlying integer codes
+
+
+## loess(*, .. weights) - PR#16587
+d.loess <-
+    do.call(expand.grid,
+            c(formals(loess.control)[1:3],
+              list(iterations = c(1, 10),
+                   KEEP.OUT.ATTRS = FALSE, stringsAsFactors = FALSE)))
+d.loess $ iterTrace <- (d.loess$ iterations > 1)
+## apply(d.loes, 1L, ...) would coerce everything to atomic, i.e, "character":
+loess.c.list <- lapply(1:nrow(d.loess), function(i)
+    do.call(loess.control, as.list(d.loess[i,])))
+set.seed(123)
+for(n in 1:6) { if(n %% 10 == 0) cat(n,"\n")
+    wt <- runif(nrow(cars))
+    for(ctrl in loess.c.list) {
+        cars.wt <- loess(dist ~ speed, data = cars, weights = wt,
+                         family = if(ctrl$iterations > 1) "symmetric" else "gaussian",
+                         control = ctrl)
+        cPr  <- predict(cars.wt)
+        cPrN <- predict(cars.wt, newdata=cars)
+        stopifnot(all.equal(cPr, cPrN, check.attributes = FALSE, tol=1e-14))
+    }
+}
+## gave (typically slightly) wrong predictions in R <= 3.2.2
+
+
+## aperm() for named dim()s:
+na <- list(A=LETTERS[1:2], B=letters[1:3], C=LETTERS[21:25], D=letters[11:17])
+da <- lengths(na)
+A <- array(1:210, dim=da, dimnames=na)
+aA <- aperm(A)
+a2 <- aperm(A, (pp <- c(3:1,4)))
+stopifnot(identical(     dim(aA), rev(da)),# including names(.)
+	  identical(dimnames(aA), rev(na)),
+	  identical(     dim(a2), da[pp]), # including names(.)
+	  identical(dimnames(a2), na[pp]))
+## dim(aperm(..)) did lose names() in R <= 3.2.2
+
+
+## poly() / predict(poly()) with NAs -- PR#16597
+fm <- lm(y ~ poly(x, 3), data=data.frame(x=1:7, y=sin(1:7)))
+x <- c(1,NA,3:7)
+stopifnot(all.equal(c(predict(fm, newdata=list(x = 1:3)), `4`=NA),
+		      predict(fm, newdata=list(x=c(1:3,NA))), tol=1e-15),
+	  all.equal(unclass(poly(x, degree=2, raw=TRUE)),
+		    cbind(x, x^2), check.attributes=FALSE))
+## both gave error about NA in R <= 3.2.2
+
+
+## data(package = *) on some platforms
+dd <- data(package="datasets")[["results"]]
+if(anyDuplicated(dd[,"Item"])) stop("data(package=*) has duplications")
+## sometimes returned the data sets *twice* in R <= 3.2.2
+
+
+## prettyNum(*, big.mark, decimal.mark)
+b.m <- c(".", ",", "'", "")
+d.m <- c(".", ",", ".,", "..")
+pa <- expand.grid(big.mark = b.m, decimal.mark = d.m,
+                  x = c(1005.24, 100.22, 1000000.33), scientific=FALSE, digits=9,
+                  stringsAsFactors=FALSE, KEEP.OUT.ATTRS=FALSE)
+r <- vapply(1:nrow(pa), function(i) do.call(prettyNum, pa[i,]), "")# with 6x2 warnings
+r
+b.m[b.m == ""] <- "0"
+## big.mark: only >= 1000; *and* because particular chosen numbers:
+r.2 <- substr(r[pa[,"x"] > 1000], 2, 2)
+## compute location of decimal point (which maybe more than one char)
+nd <- nchar(dm.s <- rep(d.m, each=length(b.m)))
+nr <- nchar(r) - 3 + (nd == 1)
+nr2 <- nr + (nd > 1)
+stopifnot(identical(r.2,               rep_len(b.m, length(r.2))),
+          identical(substr(r, nr,nr2), rep_len(dm.s, length(r))))
+## several cases (1, 5, 9, 10,..) were wrong in R 3.2.2
+
+
+## kmeans with just one center -- PR#16623
+set.seed(23)
+x <- rbind(matrix(rnorm(100,           sd = 0.3), ncol = 2),
+           matrix(rnorm(100, mean = 1, sd = 0.3), ncol = 2))
+k1 <- kmeans(x, 1)
+k2 <- kmeans(x, centers = k1$centers)
+stopifnot(all.equal(k1, k2), k1$cluster == 1)
+## the kmeans(*, centers=.) called failed in R <= 3.2.3
+
+
+## invalid dimnames for array()
+tools::assertError(array(1, 2:3, dimnames="foo"))
+## were silently disregarded in R <= 3.2.3
+
+
+## addmargins() - dimnames with (by default) "Sum"
+m <- rbind(1, 2:3)
+m2 <- addmargins(m, 2)
+am <- addmargins(m)
+stopifnot(
+    identical(dimnames(m2), list(NULL, c("", "", "Sum"))),
+    identical(am[,"Sum"], setNames(c(2, 5, 7), c("", "", "Sum"))))
+## the dimnames array() bug above hid the addmargins() not adding "Sum"
+
+
+## dim( x[,] ) -- should keep names(dim(.)) --
+## ---  ----
+##_ 1 D _
+A1 <- array(1:6, (d <- c(nam=6L)))
+stopifnot(identical(dim(A1), d),
+          identical(dim(A1), dim(A1[])))
+##_ 2 D _
+A2 <- A[1,2,,]
+stopifnot(identical(names(dim(A2)), c("C", "D")),
+          identical(dim(A2), dim(A)[-(1:2)]),
+          identical(dim(A2[ ]), dim(A2)),
+          identical(dim(A2[,]), dim(A2)),
+          identical(dim(A2[1, , drop=FALSE]), c(C = 1L, D = 7L)),
+          identical(dim(A2[, 1, drop=FALSE]), c(C = 5L, D = 1L)))
+##_ higher D_
+A3 <- A[1, ,,]
+stopifnot(
+    identical(dim(A ), dim(A [,,,])),# was already wrong: [,,,] losing names(dim(.))
+    identical(dim(A[,-1,-1,-1]), dim(A) - c(0:1,1L,1L)),
+    identical(dim(A3), dim(A)[-1]),
+    identical(dim(A3), dim(A3[,, ])),
+    identical(dim(A3[,1,]), c(B = 3L, D = 7L)))
+## all subsetting of arrays lost names(dim(.)) in R < 3.3.0
+
+
+## NextMethod() dispatch for  `$`  and  `$<-`
+`$.foo` <- function(x, fun) paste("foo:", NextMethod())
+x <- list(a = 1, b = 2)
+class(x) <- "foo"
+stopifnot(identical(x$b, "foo: 2"))  # 'x$b' failed prior to R 3.3.0
+
+`$<-.foo` <- function(x, value, fun) {
+    attr(x, "modified") <- "yes"
+    NextMethod()
+}
+x$y <- 10 ## failed prior to R 3.3.0
+stopifnot(identical(attr(x, "modified"), "yes"))
+
+
+## illegal 'row.names' for as.data.frame():  -- for now just a warning --
+tools::assertWarning(
+    d3 <- as.data.frame(1:3, row.names = letters[1:2])
+)
+stopifnot(dim(d3) == c(3,1)) ## was (2, 1) in R <= 3.2.3
+## 'row.names' were not checked and produced a "corrupted" data frame in R <= 3.2.3
+
+
+## rbind.data.frame()'s  smart row names construction
+mk1 <- function(x) data.frame(x=x)
+d4 <- rbind(mk1(1:4)[3:4,,drop=FALSE], mk1(1:2))
+stopifnot(identical(dimnames(d4),
+                    list(c("3", "4", "1", "2"), "x")),
+## the rownames were       "3"  "4"  "31" "41"  in R <= 3.3.0
+          identical(attr(rbind(mk1(5:8), 7, mk1(6:3)), "row.names"), 1:9)
+          )
+
+## sort on integer() should drop NAs by default
+stopifnot(identical(1L, sort(c(NA, 1L))))
+## and other data types for method="radix"
+stopifnot(identical("a", sort(c(NA, "a"), method="radix")))
+stopifnot(identical(character(0L), sort(c(NA, NA_character_), method="radix")))
+stopifnot(identical(1, sort(c(NA, 1), method="radix")))
+
+
+## dummy.coef(.) in the case of "non-trivial terms" -- PR#16665
+op <- options(contrasts = c("contr.treatment", "contr.poly"))
+fm1 <- lm(Fertility ~ cut(Agriculture, breaks=4) + Infant.Mortality, data=swiss)
+(dc1 <- dummy.coef(fm1)) ## failed in R <= 3.3.0
+## (R-help, Alexandra Kuznetsova, 24 Oct 2013):
+set.seed(56)
+group <- gl(2, 10, 20, labels = c("Ctl","Trt"))
+weight <- c(rnorm(10, 4), rnorm(10, 5))
+x <- rnorm(20)
+lm9 <- lm(weight ~ group + x + I(x^2))
+dc9 <- dummy.coef(lm9)
+## failed in R <= 3.3.0
+stopifnot( # depends on contrasts:
+    all.equal(unname(coef(fm1)), unlist(dc1, use.names=FALSE)[-2], tol= 1e-14),
+    all.equal(unname(coef(lm9)), unlist(dc9, use.names=FALSE)[-2], tol= 1e-14))
+## a 'use.na=TRUE' example
+dd <- data.frame(x1 = rep(letters[1:2], each=3),
+                 x2 = rep(LETTERS[1:3], 2),
+                 y = rnorm(6))
+dd[6,2] <- "B" # => no (b,C) combination => that coef should be NA
+fm3 <- lm(y ~ x1*x2, dd)
+(d3F <- dummy.coef(fm3, use.na=FALSE))
+(d3T <- dummy.coef(fm3, use.na=TRUE))
+stopifnot(all.equal(d3F[-4], d3T[-4]),
+	  all.equal(d3F[[4]][-6], d3T[[4]][-6]),
+	  all.equal(drop(d3T$`x1:x2`),
+		    c("a:A"= 0, "b:A"= 0, "a:B"= 0,
+		      "b:B"= 0.4204843786, "a:C"=0, "b:C"=NA)))
+## in R <= 3.2.3, d3T$`x1:x2` was *all* NA
+##
+## dummy.coef() for "manova"
+## artificial data inspired by the  summary.manova  example
+rate <- gl(2,10, labels=c("Lo", "Hi"))
+additive <- gl(4, 1, length = 20, labels = paste("d", 1:4, sep="."))
+additive <- C(additive, "contr.sum")# => less trivial dummy.coef
+X <- model.matrix(~ rate*additive)
+E <- matrix(round(rnorm(20*3), 2), 20,3) %*% cbind(1, c(.5,-1,.5), -1:1)
+bet <- outer(1:8, c(tear = 2, gloss = 5, opacity = 20))
+Y <- X %*% bet + E
+
+fit <- manova(Y ~ rate * additive)
+## For consistency checking, one of the univariate models:
+flm <- lm(Y[,"tear"] ~ rate * additive)
+dclm <- lapply(dummy.coef(flm), drop); names(dclm[[1]]) <- "tear"
+
+op <- options(digits = 3, width = 88)
+(cf <- coef(fit))
+(dcf <- dummy.coef(fit))
+options(op)
+stopifnot(all.equal(coef(flm), cf[,"tear"]),
+          all.equal(dclm,
+                    lapply(dcf, function(cc)
+                        if(is.matrix(cc)) cc["tear",] else cc["tear"])),
+          identical(lengths(dcf),
+                    c("(Intercept)" = 3L, "rate" = 6L,
+                      "additive" = 12L, "rate:additive" = 24L)),
+          identical(sapply(dcf[-1], dim),
+                    cbind(rate = 3:2, additive = 3:4,
+                          `rate:additive` = c(3L, 8L))))
+## dummy.coef() were missing coefficients in R <= 3.2.3
+
+
+## format.POSIXlt() with modified 'zone' or length-2 format
+f0 <- "2016-01-28 01:23:45"; tz0 <- "Europe/Stockholm"
+d2 <- d1 <- rep(as.POSIXlt(f0, tz = tz0), 2)
+(f1 <- format(d1, usetz=TRUE))
+identical(f1, rep(paste(f0, "CET"), 2))# often TRUE (but too platform dependent)
+d2$zone <- d1$zone[1] # length 1 instead of 2
+f2 <- format(d2, usetz=TRUE)## -> segfault
+f1.2 <- format(as.POSIXlt("2016-01-28 01:23:45"), format=c("%d", "%y"))# segfault
+stopifnot(identical(f2, rep(paste(f0,  tz0 ), 2)),
+	  identical(f1.2, c("28", "16")))
+tims <- seq.POSIXt(as.POSIXct("2016-01-01"),
+		   as.POSIXct("2017-11-11"), by = as.difftime(pi, units="weeks"))
+form <- c("%m/%d/%y %H:%M:%S", "", "%Y-%m-%d %H:%M:%S")
+op <- options(warn = 2)# no warnings allowed
+head(rf1 <- format(tims, form)) # recycling was wrong
+head(rf2 <- format(tims, form[c(2,1,3)]))
+stopifnot(identical(rf1[1:3], c("01/01/16 00:00:00", "2016-01-22 23:47:15",
+				"2016-02-13 23:34:30")),
+	  identical(rf2[1:3], c("2016-01-01 00:00:00", "01/22/16 23:47:15",
+				rf1[3])),
+	  nchar(rf1) == rep(c(17,19,19), length = length(rf1)),
+	  nchar(rf2) == rep(c(19,17,19), length = length(rf2)))
+options(op)
+## Wrong-length 'zone' or short 'x' segfaulted -- PR#16685
+## Default 'format' setting sometimes failed for length(format) > 1
+
+
+## saveRDS(*, compress= .)
+opts <- setNames(,c("bzip2", "xz", "gzip"))
+fil <- tempfile(paste0("xx", 1:6, "_"), fileext = ".rds")
+names(fil) <- c("default", opts, FALSE,TRUE)
+xx <- 1:11
+saveRDS(xx, fil["default"])
+saveRDS(xx, fil[opts[1]], compress = opts[1])
+saveRDS(xx, fil[opts[2]], compress = opts[2])
+saveRDS(xx, fil[opts[3]], compress = opts[3])
+saveRDS(xx, fil["FALSE"], compress = FALSE)
+saveRDS(xx, fil["TRUE" ], compress = TRUE)
+f.raw <- lapply(fil, readBin, what = "raw", n = 100)
+lengths(f.raw) # 'gzip' is best in this case
+for(i in 1:6) stopifnot(identical(xx, readRDS(fil[i])))
+eMsg <- tryCatch(saveRDS(xx, tempfile(), compress = "Gzip"),
+                 error = function(e) e$message)
+stopifnot(
+    grepl("'compress'.*Gzip", eMsg), # had ".. not interpretable as logical"
+    identical(f.raw[["default"]], f.raw[["TRUE"]]),
+    identical(f.raw[["default"]], f.raw[[opts["gzip"]]]))
+## compress = "gzip" failed (PR#16653), but compress = c(a = "xz") did too
+
+
+## recursive dendrogram methods and deeply nested dendrograms
+op <- options(expressions = 999)# , verbose = 2) # -> max. depth= 961
+set.seed(11); d <- mkDend(1500, "A", method="single")
+rd <- reorder(d, nobs(d):1)
+## Error: evaluation nested too deeply: infinite recursion .. in R <= 3.2.3
+stopifnot(is.leaf(r1 <- rd[[1]]),    is.leaf(r2 <- rd[[2:1]]),
+	  attr(r1, "label") == "A1458", attr(r2, "label") == "A1317")
+options(op)# revert
+
+
+## cor.test() with extremely small p values
+b <- 1:10; set.seed(1)
+for(n in 1:256) {
+    a <- round(jitter(b, f = 1/8), 3)
+    p1 <- cor.test(a, b)$ p.value
+    p2 <- cor.test(a,-b)$ p.value
+    stopifnot(abs(p1 - p2) < 8e-16 * (p1+p2))
+    ## on two different Linuxen, they actually are always equal
+}
+## were slightly off in R <= 3.2.3. PR#16704
+
+
+## smooth(*, do.ends=TRUE)
+y <- c(4,2,2,3,10,5:7,7:6)
+stopifnot(
+    identical(c(smooth(y, "3RSR" , do.ends=TRUE, endrule="copy")),
+              c(4, 2, 2, 3, 5, 6, 6, 7, 7, 6) -> sy.c),
+    identical(c(smooth(y, "3RSS" , do.ends=TRUE, endrule="copy")), sy.c),
+    identical(c(smooth(y, "3RS3R", do.ends=TRUE, endrule="copy")), sy.c),
+    identical(c(smooth(y, "3RSR" , do.ends=FALSE, endrule="copy")),
+              c(4, 4, 4, 4, 5, 6, 6, 6, 6, 6)),
+    identical(c(smooth(y, "3RSS" , do.ends=FALSE, endrule="copy")),
+              c(4, 4, 2, 3, 5, 6, 6, 6, 6, 6)),
+    identical(c(smooth(y, "3RS3R", do.ends=FALSE, endrule="copy")),
+              c(4, 4, 3, 3, 5, 6, 6, 6, 6, 6)))
+## do.ends=TRUE was not obeyed for the "3RS*" kinds, for 3.0.0 <= R <= 3.2.3
+
+
+## prettyDate() for subsecond ranges
+##' checking pretty():
+chkPretty <- function(x, n = 5, min.n = NULL, ..., max.D = 1) {
+    if(is.null(min.n)) {
+	## work with both pretty.default() and greDevices::prettyDate()
+	## *AND* these have a different default for 'min.n' we must be "extra smart":
+	min.n <-
+	    if(inherits(x, "Date") || inherits(x, "POSIXt"))
+		n %/% 2 # grDevices:::prettyDate
+	    else
+		n %/% 3 # pretty.default
+    }
+    pr <- pretty(x, n=n, min.n=min.n, ...)
+    ## if debugging: pr <- grDevices:::prettyDate(x, n=n, min.n=min.n, ...)
+    stopifnot(length(pr) >= (min.n+1),
+	      ## pretty(x, *) must cover range of x:
+	      min(pr) <= min(x), max(x) <= max(pr))
+    if((D <- abs(length(pr) - (n+1))) > max.D)
+	stop("| |pretty(.)| - (n+1) | = ", D, " > max.D = ", max.D)
+    ## is it equidistant [may need fuzz, i.e., signif(.) ?]:
+    eqD <- length(pr) == 1 || length(udp <- unique(dp <- diff(pr))) == 1
+    ## may well FALSE (differing number days in months; leap years, leap seconds)
+    if(!eqD) {
+        if(inherits(dp, "difftime") && units(dp) %in% c("days")# <- more ??
+           )
+            attr(pr, "chkPr") <- "not equidistant"
+        else
+            stop("non equidistant: has ", length(udp)," unique differences")
+    }
+    invisible(pr)
+}
+sTime <- structure(1455056860.75, class = c("POSIXct", "POSIXt"))
+for(n in c(1:16, 30:32, 41, 50, 60)) # (not for much larger n, (TODO ?))
+    chkPretty(sTime, n=n)
+set.seed(7)
+for(n in c(1:7, 12)) replicate(32, chkPretty(sTime + .001*rlnorm(1) * 0:9, n = n))
+## failed in R <= 3.2.3
+seqD  <- function(d1,d2) seq.Date(as.Date(d1), as.Date(d2), by = "1 day")
+seqDp <- function(d1,d2) { s <- seqD(d1,d2); structure(s, labels=format(s,"%b %d")) }
+time2d <- function(i) sprintf("%02d", i %% 60)
+MTbd <- as.Date("1960-02-10")
+(p1   <- chkPretty(MTbd))
+stopifnot(
+    identical(p1, seqDp("1960-02-08", "1960-02-13")) ,
+    identical(attr(p1, "labels"), paste("Feb", time2d(8:13))),
+    identical(chkPretty(MTbd + rep(0,2)), p1) ,
+    identical(chkPretty(MTbd +  0:1), p1) ,
+    identical(chkPretty(MTbd + -1:1), p1) ,
+    identical(chkPretty(MTbd +  0:3), seqDp("1960-02-09", "1960-02-14")) )
+## all pretty() above gave length >= 5 answer (with duplicated values!) in R <= 3.2.3
+## and length 1 or 2 instead of about 6 in R 3.2.4
+(p2 <- chkPretty(as.POSIXct("2002-02-02 02:02", tz = "GMT-1"), n = 5, min.n = 5))
+stopifnot(length(p2) >= 5+1,
+	  identical(p2, structure(1012611717 + (0:5), class = c("POSIXct", "POSIXt"),
+				  tzone = "GMT-1", labels = time2d(57 + (0:5)))))
+## failed in R 3.2.4
+(T3 <- structure(1460019857.25, class = c("POSIXct", "POSIXt")))# typical Sys.date()
+chkPretty(T3, 1) # error in svn 70438
+## "Data" from  example(pretty.Date) :
+steps <- setNames(,
+    c("10 secs", "1 min", "5 mins", "30 mins", "6 hours", "12 hours",
+      "1 DSTday", "2 weeks", "1 month", "6 months", "1 year",
+      "10 years", "50 years", "1000 years"))
+t02 <- as.POSIXct("2002-02-02 02:02")
+(at <- chkPretty(t02 + 0:1, n = 5, min.n = 3, max.D=2))
+xU <- as.POSIXct("2002-02-02 02:02", tz = "UTC")
+x5 <- as.POSIXct("2002-02-02 02:02", tz = "EST5EDT")
+atU <- chkPretty(seq(xU, by = "30 mins", length = 2), n = 5)
+at5 <- chkPretty(seq(x5, by = "30 mins", length = 2), n = 5)
+stopifnot(length(at) >= 4,
+	  identical(sort(names(aat <- attributes(at))), c("class", "labels", "tzone")),
+	  identical(aat$labels, time2d(59+ 0:3)),
+          identical(x5 - xU, structure(5, units = "hours", class = "difftime")),
+          identical(attr(at5, "labels"), attr(atU, "labels") -> lat),
+          identical(lat, paste("02", time2d(10* 0:4), sep=":"))
+)
+nns <- c(1:9, 15:17); names(nns) <- paste0("n=",nns)
+prSeq <- function(x, n, st, ...) pretty(seq(x, by = st, length = 2), n = n, ...)
+pps <- lapply(nns, function(n)
+	      lapply(steps, function(st) prSeq(x=t02, n=n, st=st)))
+Ls.ok <- list(
+    `10 secs`  = c("00", "02", "04", "06", "08", "10"),
+    `1 min`    = sprintf("%02d", 10*((0:6) %% 6)),
+    `5 mins`   = sprintf("02:%02d", 2:7),
+    `30 mins`  = sprintf("02:%02d", (0:4)*10),
+    `6 hours`  = sprintf("%02d:00", 2:9),
+    `12 hours` = sprintf("%02d:00", (0:5)*3),
+    `1 DSTday` = c("Feb 02 00:00", "Feb 02 06:00", "Feb 02 12:00",
+		   "Feb 02 18:00", "Feb 03 00:00", "Feb 03 06:00"),
+    `2 weeks`  = c("Jan 28", "Feb 04", "Feb 11", "Feb 18"),
+    `1 month`  = c("Jan 28", "Feb 04", "Feb 11", "Feb 18", "Feb 25", "Mar 04"),
+    `6 months` = c("Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep"),
+    `1 year`   = c("Jan", "Apr", "Jul", "Oct", "Jan", "Apr"),
+    `10 years` = as.character(2000 +   2*(1:7)),
+    `50 years` = as.character(2000 +  10*(0:6)),
+    `1000 years`= as.character(2000 + 200*(0:6)))
+stopifnot(identical(Ls.ok,
+		    lapply(pps[["n=5"]], attr, "label")))
+##
+chkSeq <- function(st, x, n, max.D = if(n <= 4) 1 else if(n <= 10) 2 else 3, ...)
+    tryCatch(chkPretty(seq(x, by = st, length = 2), n = n, max.D=max.D, ...),
+             error = conditionMessage)
+prSeq.errs <- function(tt, nset, tSteps) {
+    stopifnot(length(tt) == 1)
+    c.ps <- lapply(nset, function(n) lapply(tSteps, chkSeq, x = tt, n = n))
+    ## ensure that all are ok *but* some which did not match 'n' well enough:
+    cc.ps <- unlist(c.ps, recursive=FALSE)
+    ok <- vapply(cc.ps, inherits, NA, what = "POSIXt")
+    errs <- unlist(cc.ps[!ok])
+    stopifnot(startsWith(errs, prefix = "| |pretty(.)| - (n+1) |"))
+    list(ok = ok,
+	 Ds = as.numeric(sub(".*\\| = ([0-9]+) > max.*", "\\1", errs)))
+}
+r.t02 <- prSeq.errs(t02, nset = nns, tSteps = steps)
+table(r.t02 $ ok)
+table(r.t02 $ Ds -> Ds)
+## Currently   [may improve]
+##  3  4  5  6  7  8
+##  4 14  6  3  2  1
+## ... and ensure we only improve:
+stopifnot(length(Ds) <= 30, max(Ds) <= 8, sum(Ds) <= 138)
+## A Daylight saving time -- halfmonth combo:
+(tOz <- structure(c(1456837200, 1460728800), class = c("POSIXct", "POSIXt"),
+		tzone = "Australia/Sydney"))
+(pz <- pretty(tOz)) # failed in R 3.3.0, PR#16923
+stopifnot(length(pz) <= 6, # is 5
+          attr(dpz <- diff(pz), "units") == "days", sd(dpz) < 1.6)
+if(FALSE) { # save 0.4 sec
+    print(system.time(
+        r.tOz <- prSeq.errs(tOz[1], nset = nns, tSteps = steps)
+    ))
+    stopifnot(sum(r.tOz $ ok) >= 132,
+              max(r.tOz $ Ds -> DOz) <= 8, mean(DOz) < 4.5)
+}
+nn <- c(1:33,10*(4:9),100*(1+unique(sort(rpois(20,4)))))
+pzn <- lengths(lapply(nn, pretty, x=tOz))
+stopifnot(0.5 <= min(pzn/(nn+1)), max(pzn/(nn+1)) <= 1.5)
+
+
+
+stopifnot(c("round.Date", "round.POSIXt") %in% as.character(methods(round)))
+## round.POSIXt suppressed in R <= 3.2.x
+
+
+## approxfun(*, method="constant")
+Fn <- ecdf(1:5)
+t <- c(NaN, NA, 1:5)
+stopifnot(all.equal(Fn(t), t/5))
+## In R <= 3.2.3,  NaN values resulted in something like (n-1)/n.
+
+
+## tar() default (i.e. "no files") behaviour:
+dir.create(td <- tempfile("tar-experi"))
+setwd(td)
+dfil <- "base_Desc"
+file.copy(system.file("DESCRIPTION"), dfil)
+## tar w/o specified files
+tar("ex.tar")# all files, i.e. 'dfil'
+unlink(dfil)
+stopifnot(grepl(dfil, untar("ex.tar", list = TRUE)))
+untar("ex.tar")
+myF2 <- c(dfil, "ex.tar")
+stopifnot(identical(list.files(), myF2))
+unlink(myF2)
+## produced an empty tar file in R < 3.3.0, PR#16716
+
+
+## format.POSIXlt() of Jan.1 if  1941 or '42 is involved:
+tJan1 <- function(n1, n2)
+    strptime(paste0(n1:n2,"/01/01"), "%Y/%m/%d", tz="CET")
+wDSTJan1 <- function(n1, n2)
+    which("CEST" == sub(".* ", '', format(tJan1(n1,n2), usetz=TRUE)))
+(w8 <- wDSTJan1(1801, 2300))
+(w9 <- wDSTJan1(1901, 2300))
+stopifnot(identical(w8, 141:142),# exactly 1941:1942 had CEST on Jan.1
+          identical(w9,  41: 42))
+## for R-devel Jan.2016 to Mar.14 -- *AND* for R 3.2.4 -- the above gave
+## integer(0)  and  c(41:42, 99:100, ..., 389:390)  respectively
+
+
+## tsp<- did not remove mts class
+z <- ts(cbind(1:5,1:5))
+tsp(z) <- NULL
+stopifnot(identical(class(z), "matrix"))
+## kept "mts" in 3.2.4, PR#16769
+
+
+## match(x, t): fast algorithm for length-1 'x'
+## a) string 'x'  when only encoding differs
+tmp <- "年付"
+tmp2 <- "\u5e74\u4ed8" ; Encoding(tmp2) <- "UTF-8"
+for(ex in list(c(tmp, tmp2), c("foo","foo"))) {
+    cat(sprintf("\n|%s|%s| :\n----------\n", ex[1], ex[2]))
+    for(enc in c("latin1", "UTF-8", "unknown")) { # , "MAC", "WINDOWS-1251"
+	cat(sprintf("%9s: ", enc))
+	tt <- ex[1]; Encoding(tt) <- enc; t2 <- ex[2]
+	if(identical(i1 <- (  tt       %in% t2),
+		     i2 <- (c(tt, "a") %in% t2)[1]))
+	    cat(i1,"\n")
+	else
+	    stop("differing: ", i1, ", ", i2)
+    }
+}
+outerID <- function(x,y, ...) outer(x,y, Vectorize(identical,c("x","y")), ...)
+## b) complex 'x' with different kinds of NaN
+x0 <- c(0,1, NA_real_, NaN)
+z <- outer(x0,x0, complex, length.out=1L)
+z <- c(z[is.na(z)], # <- of length 4 * 4 - 2*2 = 12
+       as.complex(NaN), as.complex(0/0), # <- typically these two differ in bits
+       complex(real = NaN), complex(imaginary = NaN),
+       NA_complex_, complex(real = NA), complex(imaginary = NA))
+## 1..12 all differ, then only [14] ("0/0") differs in first (low level):
+symnum(outerID(z,z, FALSE,FALSE,FALSE,FALSE))
+symnum(outerID(z,z))
+(mz <- match(z, z)) # currently different {NA,NaN} patterns differ - not in print()/format() _FIXME_
+stopifnot(identical(mz, c(1:4, 1L, 3L, 7:8, 2L, 4L, 8L, 12L, # <- would change after FIXME
+                          rep(2L, 4), 7L, 1L, 1L)))
+zRI <- rbind(Re=Re(z), Im=Im(z)) # and see the pattern :
+print(cbind(format = format(z), t(zRI), mz), quote=FALSE)
+stopifnot(identical(mz, sapply(z, match, table = z)))
+## the latter has length(x) == 1 in match(x,*)  and failed in R 3.3.0
+
diff -Nru r-base-3.2.3/tests/reg-tests-2.R r-base-3.3.1/tests/reg-tests-2.R
--- r-base-3.2.3/tests/reg-tests-2.R	2015-03-18 23:04:11.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-2.R	2016-03-16 23:04:39.000000000 +0000
@@ -2864,7 +2864,7 @@
 aa <- anova( lm(sr ~ ., data = LifeCycleSavings) )
 op <- options(width = 50)
 aa
-op <- options(width = 40)
+options(width = 40)
 aa ; options(op)
 ## did not line wrap "Signif. codes" previously
 
@@ -2938,3 +2938,79 @@
 setNames(TRUE, make_long_name(1002))  # value printed as T
 setNames(TRUE, make_long_name(1003))  # value not printed
 ##
+
+
+## PR#16437
+dd <- data.frame(F = factor(rep(c("A","B","C"), each = 3)), num = 1:9)
+cs <- list(F = contr.sum(3, contrasts = FALSE))
+a1 <- aov(num ~ F, data = dd, contrasts = cs)
+model.tables(a1, "means")
+t1 <- TukeyHSD(a1) ## don't print to avoid precision issues.
+a2 <- aov(num ~ 0+F, data = dd, contrasts = cs)
+model.tables(a2, "means")
+t2 <- TukeyHSD(a2)
+attr(t1, "orig.call") <- attr(t2, "orig.call")
+stopifnot(all.equal(t1, t2))
+## functions both failed on a2 in R <= 3.2.2.
+
+
+## deparse() did not add parens before [
+substitute(a[1], list(a = quote(x * y)))
+## should be (x * y)[1], was x * y[1]
+# Check all levels of precedence
+# (Comment out illegal ones)
+quote(`$`(a :: b, c))
+# quote(`::`(a $ b, c $ d))
+quote(`[`(a $ b, c $ d))
+quote(`$`(a[b], c))
+quote(`^`(a[b], c[d]))
+quote(`[`(a ^ b, c ^ d))
+quote(`-`(a ^ b))
+quote(`^`(-b, -d))
+quote(`:`(-b, -d))
+quote(`-`(a : b))
+quote(`%in%`(a : b, c : d))
+quote(`:`(a %in% b, c %in% d))
+quote(`*`(a %in% b, c %in% d))
+quote(`%in%`(a * b, c * d))
+quote(`+`(a * b, c * d))
+quote(`*`(a + b, c + d))
+quote(`<`(a + b, c + d))
+quote(`+`(a < b, c < d))
+quote(`!`(a < b))
+quote(`<`(!b, !d))
+quote(`&`(!b, !d))
+quote(`!`(a & b))
+quote(`|`(a & b, c & d))
+quote(`&`(a | b, c | d))
+quote(`~`(a | b, c | d))
+quote(`|`(a ~ b, c ~ d))
+quote(`->`(a ~ b, d))
+quote(`~`(a -> b, c -> d))
+quote(`<-`(a, c -> d))
+quote(`->`(a <- b, c))
+quote(`=`(a, c <- d))
+quote(`<-`(a, `=`(c, d)))
+quote(`?`(`=`(a, b), `=`(c, d)))
+quote(`=`(a, c ? d))
+quote(`?`(a = b))
+quote(`=`(b, ?d))
+
+## dput() quoted the empty symbol (PR#16686)
+a <- alist(one = 1, two = )
+dput(a)
+## deparsed two to quote()
+
+
+## summary.data.frame() with NAs in columns of class "Date" -- PR#16709
+x <- c(18000000, 18810924, 19091227, 19027233, 19310526, 19691228, NA)
+x.Date <- as.Date(as.character(x), format = "%Y%m%d")
+summary(x.Date)
+DF.Dates <- data.frame(c1 = x.Date)
+summary(DF.Dates) ## NA's missing from output :
+DF.Dates$x1 <- 1:7
+summary(DF.Dates) ## NA's still missing
+DF.Dates$x2 <- c(1:6, NA)
+## now, NA's show fine:
+summary(DF.Dates)
+## 2 of 4  summary(.) above did not show NA's  in R <= 3.2.3
diff -Nru r-base-3.2.3/tests/reg-tests-2.Rout.save r-base-3.3.1/tests/reg-tests-2.Rout.save
--- r-base-3.2.3/tests/reg-tests-2.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-2.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -4882,7 +4882,7 @@
 > DF <- data.frame(A=1:2, B=3:4)
 > try(DF[2, 1:3] <- NULL)
 Error in `[<-.data.frame`(`*tmp*`, 2, 1:3, value = NULL) : 
-  replacement has 0 items, need 3
+  replacement has length zero
 > ## wrong error message in R < 2.2.0
 > 
 > 
@@ -6405,15 +6405,15 @@
 > print.function
 function (x, ...)  
  - attr(*, "srcref")=Class 'srcref'  atomic [1:8] 1 19 1 63 19 63 1 1
-  .. ..- attr(*, "srcfile")=Classes 'srcfilecopy', 'srcfile' <environment: 0x41b05e8> 
+  .. ..- attr(*, "srcfile")=Classes 'srcfilecopy', 'srcfile' <environment: 0x4133960> 
 > f
 function ()  
  - attr(*, "srcref")=Class 'srcref'  atomic [1:8] 1 17 1 28 17 28 1 1
-  .. ..- attr(*, "srcfile")=Classes 'srcfilecopy', 'srcfile' <environment: 0x41bf660> 
+  .. ..- attr(*, "srcfile")=Classes 'srcfilecopy', 'srcfile' <environment: 0x4125bf8> 
  - attr(*, "note")= chr "just a note"
  - attr(*, "yada")=function ()  
   ..- attr(*, "srcref")=Class 'srcref'  atomic [1:8] 2 24 2 48 24 48 2 2
-  .. .. ..- attr(*, "srcfile")=Classes 'srcfilecopy', 'srcfile' <environment: 0x41bf660> 
+  .. .. ..- attr(*, "srcfile")=Classes 'srcfilecopy', 'srcfile' <environment: 0x4125bf8> 
 > rm(print.function)
 > ## auto-printing and printing differed up to R 2.9.x
 > 
@@ -7401,7 +7401,7 @@
 ---
 Signif. codes:  
 0 '***' 0.001 '**' 0.01 '*' 0.05 '.' 0.1 ' ' 1
-> op <- options(width = 40)
+> options(width = 40)
 > aa ; options(op)
 Analysis of Variance Table
 
@@ -7447,50 +7447,28 @@
 +          ){a+b}"
 > p <- parse(text = raw)
 > getParseData(p)
-   line1 col1 line2 col2 id parent          token
-31     2    1     4   15 31      0           expr
-3      2    1     2    8  3     31       FUNCTION
-4      2    9     2    9  4     31            '('
-5      2   11     2   11  5     31 SYMBOL_FORMALS
-6      2   15     2   27  6     31        COMMENT
-8      3   10     3   10  8     31            ','
-10     3   12     3   12 10     31 SYMBOL_FORMALS
-11     3   13     3   13 11     31     EQ_FORMALS
-12     3   14     3   14 12     13      NUM_CONST
-13     3   14     3   14 13     31           expr
-14     3   16     3   28 14     31        COMMENT
-16     4   10     4   10 16     31            ')'
-28     4   11     4   15 28     31           expr
-18     4   11     4   11 18     28            '{'
-25     4   12     4   14 25     28           expr
-19     4   12     4   12 19     21         SYMBOL
-21     4   12     4   12 21     25           expr
-20     4   13     4   13 20     25            '+'
-22     4   14     4   14 22     24         SYMBOL
-24     4   14     4   14 24     25           expr
-23     4   15     4   15 23     28            '}'
-   terminal          text
-31    FALSE              
-3      TRUE      function
-4      TRUE             (
-5      TRUE             a
-6      TRUE # parameter 1
-8      TRUE             ,
-10     TRUE             b
-11     TRUE             =
-12     TRUE             2
-13    FALSE              
-14     TRUE # parameter 2
-16     TRUE             )
-28    FALSE              
-18     TRUE             {
-25    FALSE              
-19     TRUE             a
-21    FALSE              
-20     TRUE             +
-22     TRUE             b
-24    FALSE              
-23     TRUE             }
+   line1 col1 line2 col2 id parent          token terminal          text
+31     2    1     4   15 31      0           expr    FALSE              
+3      2    1     2    8  3     31       FUNCTION     TRUE      function
+4      2    9     2    9  4     31            '('     TRUE             (
+5      2   11     2   11  5     31 SYMBOL_FORMALS     TRUE             a
+6      2   15     2   27  6     31        COMMENT     TRUE # parameter 1
+8      3   10     3   10  8     31            ','     TRUE             ,
+10     3   12     3   12 10     31 SYMBOL_FORMALS     TRUE             b
+11     3   13     3   13 11     31     EQ_FORMALS     TRUE             =
+12     3   14     3   14 12     13      NUM_CONST     TRUE             2
+13     3   14     3   14 13     31           expr    FALSE              
+14     3   16     3   28 14     31        COMMENT     TRUE # parameter 2
+16     4   10     4   10 16     31            ')'     TRUE             )
+28     4   11     4   15 28     31           expr    FALSE              
+18     4   11     4   11 18     28            '{'     TRUE             {
+25     4   12     4   14 25     28           expr    FALSE              
+19     4   12     4   12 19     21         SYMBOL     TRUE             a
+21     4   12     4   12 21     25           expr    FALSE              
+20     4   13     4   13 20     25            '+'     TRUE             +
+22     4   14     4   14 22     24         SYMBOL     TRUE             b
+24     4   14     4   14 24     25           expr    FALSE              
+23     4   15     4   15 23     28            '}'     TRUE             }
 > ## Got some parents wrong
 > 
 > 
@@ -7675,3 +7653,159 @@
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    TRUE 
 > ##
 > 
+> 
+> ## PR#16437
+> dd <- data.frame(F = factor(rep(c("A","B","C"), each = 3)), num = 1:9)
+> cs <- list(F = contr.sum(3, contrasts = FALSE))
+> a1 <- aov(num ~ F, data = dd, contrasts = cs)
+> model.tables(a1, "means")
+Tables of means
+Grand mean
+  
+5 
+
+ F 
+F
+A B C 
+2 5 8 
+> t1 <- TukeyHSD(a1) ## don't print to avoid precision issues.
+> a2 <- aov(num ~ 0+F, data = dd, contrasts = cs)
+> model.tables(a2, "means")
+Tables of means
+
+ F 
+F
+A B C 
+2 5 8 
+> t2 <- TukeyHSD(a2)
+> attr(t1, "orig.call") <- attr(t2, "orig.call")
+> stopifnot(all.equal(t1, t2))
+> ## functions both failed on a2 in R <= 3.2.2.
+> 
+> 
+> ## deparse() did not add parens before [
+> substitute(a[1], list(a = quote(x * y)))
+(x * y)[1]
+> ## should be (x * y)[1], was x * y[1]
+> # Check all levels of precedence
+> # (Comment out illegal ones)
+> quote(`$`(a :: b, c))
+a::b$c
+> # quote(`::`(a $ b, c $ d))
+> quote(`[`(a $ b, c $ d))
+a$b[c$d]
+> quote(`$`(a[b], c))
+a[b]$c
+> quote(`^`(a[b], c[d]))
+a[b]^c[d]
+> quote(`[`(a ^ b, c ^ d))
+(a^b)[c^d]
+> quote(`-`(a ^ b))
+-a^b
+> quote(`^`(-b, -d))
+(-b)^-d
+> quote(`:`(-b, -d))
+-b:-d
+> quote(`-`(a : b))
+-(a:b)
+> quote(`%in%`(a : b, c : d))
+a:b %in% c:d
+> quote(`:`(a %in% b, c %in% d))
+(a %in% b):(c %in% d)
+> quote(`*`(a %in% b, c %in% d))
+a %in% b * c %in% d
+> quote(`%in%`(a * b, c * d))
+(a * b) %in% (c * d)
+> quote(`+`(a * b, c * d))
+a * b + c * d
+> quote(`*`(a + b, c + d))
+(a + b) * (c + d)
+> quote(`<`(a + b, c + d))
+a + b < c + d
+> quote(`+`(a < b, c < d))
+(a < b) + (c < d)
+> quote(`!`(a < b))
+!a < b
+> quote(`<`(!b, !d))
+(!b) < (!d)
+> quote(`&`(!b, !d))
+!b & !d
+> quote(`!`(a & b))
+!(a & b)
+> quote(`|`(a & b, c & d))
+a & b | c & d
+> quote(`&`(a | b, c | d))
+(a | b) & (c | d)
+> quote(`~`(a | b, c | d))
+a | b ~ c | d
+> quote(`|`(a ~ b, c ~ d))
+(a ~ b) | (c ~ d)
+> quote(`->`(a ~ b, d))
+`->`(a ~ b, d)
+> quote(`~`(a -> b, c -> d))
+(b <- a) ~ (d <- c)
+> quote(`<-`(a, c -> d))
+a <- d <- c
+> quote(`->`(a <- b, c))
+`->`(a <- b, c)
+> quote(`=`(a, c <- d))
+a = c <- d
+> quote(`<-`(a, `=`(c, d)))
+a <- (c = d)
+> quote(`?`(`=`(a, b), `=`(c, d)))
+`?`((a = b), (c = d))
+> quote(`=`(a, c ? d))
+a = `?`(c, d)
+> quote(`?`(a = b))
+`?`(a = b)
+> quote(`=`(b, ?d))
+b = `?`(d)
+> 
+> ## dput() quoted the empty symbol (PR#16686)
+> a <- alist(one = 1, two = )
+> dput(a)
+structure(list(one = 1, two = ), .Names = c("one", "two"))
+> ## deparsed two to quote()
+> 
+> 
+> ## summary.data.frame() with NAs in columns of class "Date" -- PR#16709
+> x <- c(18000000, 18810924, 19091227, 19027233, 19310526, 19691228, NA)
+> x.Date <- as.Date(as.character(x), format = "%Y%m%d")
+> summary(x.Date)
+        Min.      1st Qu.       Median         Mean      3rd Qu.         Max. 
+"1881-09-24" "1902-12-04" "1920-09-10" "1923-04-12" "1941-01-17" "1969-12-28" 
+        NA's 
+         "3" 
+> DF.Dates <- data.frame(c1 = x.Date)
+> summary(DF.Dates) ## NA's missing from output :
+       c1            
+ Min.   :1881-09-24  
+ 1st Qu.:1902-12-04  
+ Median :1920-09-10  
+ Mean   :1923-04-12  
+ 3rd Qu.:1941-01-17  
+ Max.   :1969-12-28  
+ NA's   :3           
+> DF.Dates$x1 <- 1:7
+> summary(DF.Dates) ## NA's still missing
+       c1                   x1     
+ Min.   :1881-09-24   Min.   :1.0  
+ 1st Qu.:1902-12-04   1st Qu.:2.5  
+ Median :1920-09-10   Median :4.0  
+ Mean   :1923-04-12   Mean   :4.0  
+ 3rd Qu.:1941-01-17   3rd Qu.:5.5  
+ Max.   :1969-12-28   Max.   :7.0  
+ NA's   :3                         
+> DF.Dates$x2 <- c(1:6, NA)
+> ## now, NA's show fine:
+> summary(DF.Dates)
+       c1                   x1            x2      
+ Min.   :1881-09-24   Min.   :1.0   Min.   :1.00  
+ 1st Qu.:1902-12-04   1st Qu.:2.5   1st Qu.:2.25  
+ Median :1920-09-10   Median :4.0   Median :3.50  
+ Mean   :1923-04-12   Mean   :4.0   Mean   :3.50  
+ 3rd Qu.:1941-01-17   3rd Qu.:5.5   3rd Qu.:4.75  
+ Max.   :1969-12-28   Max.   :7.0   Max.   :6.00  
+ NA's   :3                          NA's   :1     
+> ## 2 of 4  summary(.) above did not show NA's  in R <= 3.2.3
+> 
diff -Nru r-base-3.2.3/tests/reg-tests-3.R r-base-3.3.1/tests/reg-tests-3.R
--- r-base-3.2.3/tests/reg-tests-3.R	2015-03-18 23:04:10.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-3.R	2016-04-19 22:15:06.000000000 +0000
@@ -11,7 +11,7 @@
 if(require(survival)) {
     (sa <- Surv(aml$time, aml$status))
     str(sa)
-    detach("package:survival")
+    detach("package:survival", unload = TRUE)
 }
 ## were different, the last one failed in 1.6.2 (at least)
 
@@ -92,7 +92,7 @@
     print(as.matrix(df.soa)) # numeric result
     df.soac <- data.frame(soa, letters[1:5])
     print(as.matrix(df.soac)) # character result
-    detach("package:survival")
+    detach("package:survival", unload = TRUE)
 }
 ## failed in 2.8.1
 
@@ -183,3 +183,16 @@
  rm(M,M1,M2)
  detach("package:Matrix", unload=TRUE)
 }##{Matrix}
+
+## Invalid UTF-8 strings
+x <- c("Jetz", "no", "chli", "z\xc3\xbcrit\xc3\xbc\xc3\xbctsch:",
+       "(noch", "ein", "bi\xc3\x9fchen", "Z\xc3\xbc", "deutsch)",
+       "\xfa\xb4\xbf\xbf\x9f")
+lapply(x, utf8ToInt)
+Encoding(x) <- "UTF-8"
+nchar(x, "b")
+try(nchar(x, "c"))
+try(nchar(x, "w"))
+nchar(x, "c", allowNA = TRUE)
+nchar(x, "w", allowNA = TRUE)
+## Results differed by platform, but some gave incorrect results on string 10.
diff -Nru r-base-3.2.3/tests/reg-tests-3.Rout.save r-base-3.3.1/tests/reg-tests-3.Rout.save
--- r-base-3.2.3/tests/reg-tests-3.Rout.save	2015-12-03 23:15:22.000000000 +0000
+++ r-base-3.3.1/tests/reg-tests-3.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -31,7 +31,7 @@
 > if(require(survival)) {
 +     (sa <- Surv(aml$time, aml$status))
 +     str(sa)
-+     detach("package:survival")
++     detach("package:survival", unload = TRUE)
 + }
 Loading required package: survival
  Surv [1:23, 1:2]   9   13   13+  18   23   28+  31   34   45+  48  ...
@@ -614,7 +614,7 @@
 +     print(as.matrix(df.soa)) # numeric result
 +     df.soac <- data.frame(soa, letters[1:5])
 +     print(as.matrix(df.soac)) # character result
-+     detach("package:survival")
++     detach("package:survival", unload = TRUE)
 + }
 Loading required package: survival
      soa.time soa.status
@@ -834,3 +834,51 @@
 [2,] 2 5 8 11 2 5 8 11
 [3,] 3 6 9 12 3 6 9 12
 > 
+> ## Invalid UTF-8 strings
+> x <- c("Jetz", "no", "chli", "z\xc3\xbcrit\xc3\xbc\xc3\xbctsch:",
++        "(noch", "ein", "bi\xc3\x9fchen", "Z\xc3\xbc", "deutsch)",
++        "\xfa\xb4\xbf\xbf\x9f")
+> lapply(x, utf8ToInt)
+[[1]]
+[1]  74 101 116 122
+
+[[2]]
+[1] 110 111
+
+[[3]]
+[1]  99 104 108 105
+
+[[4]]
+ [1] 122 252 114 105 116 252 252 116 115  99 104  58
+
+[[5]]
+[1]  40 110 111  99 104
+
+[[6]]
+[1] 101 105 110
+
+[[7]]
+[1]  98 105 223  99 104 101 110
+
+[[8]]
+[1]  90 252
+
+[[9]]
+[1] 100 101 117 116 115  99 104  41
+
+[[10]]
+[1] NA
+
+> Encoding(x) <- "UTF-8"
+> nchar(x, "b")
+ [1]  4  2  4 15  5  3  8  3  8  5
+> try(nchar(x, "c"))
+Error in nchar(x, "c") : invalid multibyte string, element 10
+> try(nchar(x, "w"))
+Error in nchar(x, "w") : invalid multibyte string, element 10
+> nchar(x, "c", allowNA = TRUE)
+ [1]  4  2  4 12  5  3  7  2  8 NA
+> nchar(x, "w", allowNA = TRUE)
+ [1]  4  2  4 12  5  3  7  2  8 NA
+> ## Results differed by platform, but some gave incorrect results on string 10.
+> 
diff -Nru r-base-3.2.3/tests/R-intro.Rout.save r-base-3.3.1/tests/R-intro.Rout.save
--- r-base-3.2.3/tests/R-intro.Rout.save	2015-12-03 23:15:18.000000000 +0000
+++ r-base-3.3.1/tests/R-intro.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
diff -Nru r-base-3.2.3/tests/r-strict-tst.R r-base-3.3.1/tests/r-strict-tst.R
--- r-base-3.2.3/tests/r-strict-tst.R	1970-01-01 00:00:00.000000000 +0000
+++ r-base-3.3.1/tests/r-strict-tst.R	2016-05-23 22:15:06.000000000 +0000
@@ -0,0 +1,57 @@
+#### Strict "regression" (no output comparison) tests
+#### or  [R]andom number generating functions
+
+options(warn = 2)# warnings are errors here
+
+## For integer valued comparisons
+all.eq0 <- function(x,y, ...) all.equal(x,y, tolerance = 0, ...)
+
+###------- Discrete Distributions ----------------
+
+set.seed(17)
+stopifnot(
+    all.eq0(rhyper(100, 3024, 27466, 251),
+	    c(25, 24, 21, 31, 25, 33, 28, 28, 27, 37, 26, 31, 27, 22, 21,
+	      33, 22, 32, 27, 28, 29, 22, 20, 20, 21, 18, 23, 21, 26, 22, 28,
+	      24, 25, 16, 38, 26, 35, 24, 28, 26, 21, 15, 19, 24, 26, 21, 28,
+	      21, 27, 27, 24, 31, 22, 18, 27, 24, 28, 22, 25, 19, 29, 31, 27,
+	      24, 26, 26, 24, 23, 20, 23, 23, 26, 22, 36, 29, 32, 23, 25, 20,
+	      12, 36, 29, 28, 23, 24, 26, 29, 25, 28, 18, 18, 27, 24, 18, 22,
+	      32, 31, 23, 26, 23))
+   ,
+    all.eq0(rhyper(100,  329, 3059, 225),
+	    c(21, 21, 17, 21, 15, 25, 24, 15, 27, 21, 18, 22, 29, 17, 18,
+	      19, 32, 23, 23, 22, 20, 20, 15, 23, 19, 25, 25, 18, 17, 17, 19,
+	      28, 17, 20, 21, 21, 20, 17, 25, 21, 21, 15, 25, 25, 15, 21, 26,
+	      14, 21, 23, 21, 14, 15, 24, 23, 21, 20, 20, 20, 24, 16, 21, 25,
+	      30, 17, 19, 22, 19, 22, 23, 19, 20, 18, 15, 21, 12, 24, 20, 14,
+	      20, 25, 22, 19, 23, 14, 19, 15, 23, 23, 15, 23, 26, 32, 23, 25,
+	      19, 23, 18, 24, 25))
+    ,
+    ## using  branch II  in ../src/nmath/rhyper.c :
+    print(ct3 <- system.time(N <- rhyper(100, 8000, 1e9-8000, 1e6))[1]) < 0.02
+    ,
+    all.eq0(N, c(11, 9, 7, 4, 8, 6, 10, 5, 9, 8, 10, 5, 8, 8, 4, 10, 9, 8, 7,
+		 9, 11, 5, 7, 9, 8, 8, 5, 5, 10, 7, 8, 5, 4, 11, 9, 7, 8, 6, 7,
+		 9, 14, 9, 8, 8, 8, 4, 12, 9, 8, 11, 10, 12, 9, 13, 13, 8, 8,
+		 10, 9, 4, 7, 9, 11, 2, 5, 8, 7, 8, 11, 8, 6, 8, 6, 3, 4, 12,
+		 8, 10, 9, 6, 3, 6, 7, 10, 7, 4, 5, 8, 10, 8, 7, 11, 8, 12, 4,
+		 9, 5, 9, 7, 11))
+)
+
+
+N <- 1e10; m <- 1e5; n <- N-m; k <- 1e6
+n /.Machine$integer.max ## 4.66
+p <- m/N; q <- 1 - p
+cat(sprintf(
+   "N = n+m = %g, m = Np = %g; k = %g ==> (p,f) = (m,k)/N = (%g, %g)\n k*p*q = %.4g > 1: %s\n",
+    N, m, k, m/N, k/N, k*p*q, k*p*q > 1))
+set.seed(11)
+rH <- rhyper(20, m=m, n=n, k=k) # now via qhyper() - may change!
+stopifnot( is.finite(rH), 3 <= rH, rH <= 24) # allow slack for change
+## gave all NA_integer_ in R < 3.3.0
+
+
+stopifnot(identical(rgamma(1, Inf), Inf),
+	  identical(rgamma(1, 0, 0), 0))
+## gave NaN in R <= 3.3.0
diff -Nru r-base-3.2.3/tests/simple-true.R r-base-3.3.1/tests/simple-true.R
--- r-base-3.2.3/tests/simple-true.R	2010-03-17 14:43:23.000000000 +0000
+++ r-base-3.3.1/tests/simple-true.R	2016-03-16 23:04:33.000000000 +0000
@@ -166,3 +166,25 @@
 ## as.list.function() instead of *.default():
 identical(as.list(as.list),
 	  alist(x = , ... = , UseMethod("as.list")))
+
+## startsWith() / endsWith()  assertions
+t1 <- c("Foobar", "bla bla", "something", "another", "blu", "brown",
+        "blau blüht der Enzian")# non-ASCII
+t2 <- c("some text", "any text")
+t3 <- c("Martin", "Zürich", "Mächler")
+
+all(endsWith(t1, "")); all(startsWith(t1, ""))
+all(endsWith(t2, "")); all(startsWith(t2, ""))
+all(endsWith(t3, "")); all(startsWith(t3, ""))
+all(endsWith(t2, "text"))
+all(endsWith(t2, " text"))
+identical(startsWith(t1, "b" ), c(FALSE, TRUE, FALSE, FALSE, TRUE,  TRUE, TRUE))
+identical(startsWith(t1, "bl"), c(FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE))
+identical(startsWith(t1, "bla"),c(FALSE, TRUE, FALSE, FALSE,FALSE, FALSE, TRUE))
+identical(  endsWith(t1, "n"),  c(FALSE,FALSE, FALSE, FALSE,FALSE,  TRUE, TRUE))
+identical(  endsWith(t1, "an"), c(FALSE,FALSE, FALSE, FALSE,FALSE, FALSE, TRUE))
+##
+identical(startsWith(t3, "M" ), c( TRUE, FALSE, TRUE))
+identical(startsWith(t3, "Ma"), c( TRUE, FALSE, FALSE))
+identical(startsWith(t3, "Mä"), c(FALSE, FALSE, TRUE))
+
diff -Nru r-base-3.2.3/tests/simple-true.Rout.save r-base-3.3.1/tests/simple-true.Rout.save
--- r-base-3.2.3/tests/simple-true.Rout.save	2015-12-03 23:15:20.000000000 +0000
+++ r-base-3.3.1/tests/simple-true.Rout.save	2016-06-14 22:15:10.000000000 +0000
@@ -1,6 +1,6 @@
 
-R version 3.2.3 RC (2015-12-02 r69719) -- "Wooden Christmas-Tree"
-Copyright (C) 2015 The R Foundation for Statistical Computing
+R version 3.3.1 RC (2016-06-14 r70774) -- "Bug in Your Hair"
+Copyright (C) 2016 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -262,3 +262,41 @@
 + 	  alist(x = , ... = , UseMethod("as.list")))
 [1] TRUE
 > 
+> ## startsWith() / endsWith()  assertions
+> t1 <- c("Foobar", "bla bla", "something", "another", "blu", "brown",
++         "blau blüht der Enzian")# non-ASCII
+> t2 <- c("some text", "any text")
+> t3 <- c("Martin", "Zürich", "Mächler")
+> 
+> all(endsWith(t1, "")); all(startsWith(t1, ""))
+[1] TRUE
+[1] TRUE
+> all(endsWith(t2, "")); all(startsWith(t2, ""))
+[1] TRUE
+[1] TRUE
+> all(endsWith(t3, "")); all(startsWith(t3, ""))
+[1] TRUE
+[1] TRUE
+> all(endsWith(t2, "text"))
+[1] TRUE
+> all(endsWith(t2, " text"))
+[1] TRUE
+> identical(startsWith(t1, "b" ), c(FALSE, TRUE, FALSE, FALSE, TRUE,  TRUE, TRUE))
+[1] TRUE
+> identical(startsWith(t1, "bl"), c(FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE))
+[1] TRUE
+> identical(startsWith(t1, "bla"),c(FALSE, TRUE, FALSE, FALSE,FALSE, FALSE, TRUE))
+[1] TRUE
+> identical(  endsWith(t1, "n"),  c(FALSE,FALSE, FALSE, FALSE,FALSE,  TRUE, TRUE))
+[1] TRUE
+> identical(  endsWith(t1, "an"), c(FALSE,FALSE, FALSE, FALSE,FALSE, FALSE, TRUE))
+[1] TRUE
+> ##
+> identical(startsWith(t3, "M" ), c( TRUE, FALSE, TRUE))
+[1] TRUE
+> identical(startsWith(t3, "Ma"), c( TRUE, FALSE, FALSE))
+[1] TRUE
+> identical(startsWith(t3, "Mä"), c(FALSE, FALSE, TRUE))
+[1] TRUE
+> 
+> 
diff -Nru r-base-3.2.3/tools/config.guess r-base-3.3.1/tools/config.guess
--- r-base-3.2.3/tools/config.guess	2015-07-25 22:15:03.000000000 +0000
+++ r-base-3.3.1/tools/config.guess	2016-01-07 23:15:04.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-07-03'
+timestamp='2016-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -249,6 +249,9 @@
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -962,6 +965,9 @@
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -1117,7 +1123,7 @@
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1387,6 +1393,9 @@
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
@@ -1396,9 +1405,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -Nru r-base-3.2.3/tools/config.sub r-base-3.3.1/tools/config.sub
--- r-base-3.2.3/tools/config.sub	2015-07-25 22:15:04.000000000 +0000
+++ r-base-3.3.1/tools/config.sub	2016-01-07 23:15:04.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-07-24'
+timestamp='2016-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -306,7 +305,7 @@
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -430,6 +429,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
@@ -520,7 +520,7 @@
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
+	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
@@ -1378,7 +1378,7 @@
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1398,7 +1398,8 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff -Nru r-base-3.2.3/tools/GETCONFIG r-base-3.3.1/tools/GETCONFIG
--- r-base-3.2.3/tools/GETCONFIG	2015-07-21 22:15:06.000000000 +0000
+++ r-base-3.3.1/tools/GETCONFIG	2016-01-03 23:15:04.000000000 +0000
@@ -24,6 +24,7 @@
 echo "${line}"
 line=`grep "HAVE_AQUA" config.h`
 echo "${line}"
+echo "/* Deprecated: use _OPENMP instead */"
 line=`grep "SUPPORT_OPENMP" config.h`
 echo "${line}"
 line=`grep "SIZEOF_SIZE_T" config.h`
diff -Nru r-base-3.2.3/tools/ltmain.sh r-base-3.3.1/tools/ltmain.sh
--- r-base-3.2.3/tools/ltmain.sh	2015-08-03 13:05:31.000000000 +0000
+++ r-base-3.3.1/tools/ltmain.sh	2016-03-16 23:04:31.000000000 +0000
@@ -1,9 +1,12 @@
-# Generated from ltmain.m4sh.
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
 
-# ltmain.sh (GNU libtool) 2.2.6
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -23,598 +26,2112 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.6
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
-#
-# MODE must be one of the following:
-#
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
 #
-# Report bugs to <bug-libtool@gnu.org>.
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
 
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=2.2.6
-TIMESTAMP=""
-package_revision=1.3012
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
 
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
 
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
 
 
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
 
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
 
-# Global variables:
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
 EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
 
-# Generated shell functions inserted here.
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
 # the _XPG environment variable is not equal to 1 (one), the special
 # positional parameter $0, within a function call, is the name of the
 # function.
-progpath="$0"
+progpath=$0
 
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
 case $progpath in
   [\\/]*|[A-Za-z]:\\*) ;;
   *[\\/]*)
-     progdir=$func_dirname_result
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
   *)
-     save_IFS="$IFS"
-     IFS=:
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
-       IFS="$save_IFS"
+       IFS=$_G_IFS
        test -x "$progdir/$progname" && break
      done
-     IFS="$save_IFS"
+     IFS=$_G_IFS
      test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
 
-# Standard options:
 opt_dry_run=false
-opt_help=false
 opt_quiet=false
 opt_verbose=false
-opt_warning=:
 
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
 }
 
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
 {
-    $opt_verbose && func_echo ${1+"$@"}
+    $debug_cmd
 
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
 }
 
-# func_error arg...
+
+# func_error ARG...
+# -----------------
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
+    $debug_cmd
 
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $require_term_colors
 
-    # bash bug again:
-    :
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
 }
 
-# func_fatal_error arg...
+
+# func_fatal_error ARG...
+# -----------------------
 # Echo program name prefixed message to standard error, and exit.
 func_fatal_error ()
 {
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
+    $debug_cmd
 
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
+    func_error "$*"
+    exit $EXIT_FAILURE
 }
-help="Try \`$progname --help' for more information."  ## default
 
 
-# func_grep expression filename
+# func_grep EXPRESSION FILENAME
+# -----------------------------
 # Check whether EXPRESSION matches any line of FILENAME, without output.
 func_grep ()
 {
+    $debug_cmd
+
     $GREP "$1" "$2" >/dev/null 2>&1
 }
 
 
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
 # Make sure the entire path to DIRECTORY-PATH is available.
 func_mkdir_p ()
 {
-    my_directory_path="$1"
-    my_dir_list=
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
 
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
 
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
       esac
 
       # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
+      while test ! -d "$_G_directory_path"; do
         # ...make a list in topmost first order.  Use a colon delimited
 	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
+        _G_dir_list=$_G_directory_path:$_G_dir_list
 
         # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
+        case $_G_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
       done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
         # try to create one of the directories concurrently.  Don't
         # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
+        $MKDIR "$_G_dir" 2>/dev/null || :
       done
-      IFS="$save_mkdir_p_IFS"
+      IFS=$func_mkdir_p_IFS
 
       # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
     fi
 }
 
 
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
 # Make a temporary directory that won't clash with other running
 # libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
 func_mktempdir ()
 {
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
+    $debug_cmd
 
-    if test "$opt_dry_run" = ":"; then
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
       # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
+      _G_tmpdir=$_G_template-$$
     else
 
       # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 
-      if test ! -d "$my_tmpdir"; then
+      if test ! -d "$_G_tmpdir"; then
         # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
 
-        save_mktempdir_umask=`umask`
+        func_mktempdir_umask=`umask`
         umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $ECHO "$_G_tmpdir"
 }
 
 
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
         ;;
       *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
     esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
 }
 
 
-# func_quote_for_expand arg
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
 # Aesthetically quote ARG to be evaled later; same as above,
 # but do not quote variable references.
 func_quote_for_expand ()
 {
+    $debug_cmd
+
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-        my_arg="$1" ;;
+        _G_arg=$1 ;;
     esac
 
-    case $my_arg in
+    case $_G_arg in
       # Double-quote args containing shell metacharacters to delay
       # word splitting and command substitution for a subsequent eval.
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, so we specify it separately.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
+        _G_arg=\"$_G_arg\"
         ;;
     esac
 
-    func_quote_for_expand_result="$my_arg"
+    func_quote_for_expand_result=$_G_arg
 }
 
 
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.
 func_show_eval ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
+    }
 }
 
 
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.  Use the saved locale for evaluation.
 func_show_eval_locale ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
       eval "func_echo $func_quote_for_expand_result"
     }
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
+    }
 }
 
 
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
 
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
 
 
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
 {
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
 }
 
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
 {
-    $SED -n '/^# Usage:/,/# -h/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    $ECHO
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
 }
 
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
 # func_help
+# ---------
 # Echo long help message to standard output and exit.
 func_help ()
 {
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-     }' < "$progpath"
-    exit $?
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
 }
 
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
 
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
 
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
 
 
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
 else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
 
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
 
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
 
-# func_fatal_configuration arg...
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
@@ -632,279 +2149,371 @@
     exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
-    $ECHO "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
     else
-      $ECHO "disable shared libraries"
+      echo "disable shared libraries"
     fi
-    if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
     else
-      $ECHO "disable static libraries"
+      echo "disable static libraries"
     fi
 
     exit $?
 }
 
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
 # Verify that TAGNAME is valid, and either flag an error and exit, or
 # enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 # variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
 
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
     esac
-  done
 
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
 }
 
+
 # func_check_version_match
+# ------------------------
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
 func_check_version_match ()
 {
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from an older release.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      else
-        cat >&2 <<_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 $progname: but the definition of this LT_INIT comes from revision $macro_revision.
 $progname: You should recreate aclocal.m4 with macros from revision $package_revision
 $progname: of $PACKAGE $VERSION and run autoconf again.
 _LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
     fi
+}
 
-    exit $EXIT_MISMATCH
-  fi
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
 }
+func_add_hook func_options_prep libtool_options_prep
 
 
-## ----------- ##
-##    Main.    ##
-## ----------- ##
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
 
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
 
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
 
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
 }
+func_add_hook func_validate_options libtool_validate_options
 
 
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
 # func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function implements the same check as func_lalib_p without
 # resorting to external programs.  To this end, it redirects stdin and
 # closes it afterwards, without saving the original file descriptor.
 # As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
+# fatal anyway.  Works if 'file' does not exist.
 func_lalib_unsafe_p ()
 {
     lalib_p=no
@@ -912,13 +2521,13 @@
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
-	    case "$lalib_p_line" in
+	    case $lalib_p_line in
 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 	    esac
 	done
 	exec 0<&5 5<&-
     fi
-    test "$lalib_p" = yes
+    test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
@@ -927,7 +2536,8 @@
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -950,12 +2560,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 }
 
 # func_ltwrapper_p file
@@ -974,11 +2581,13 @@
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
-    $opt_debug
+    $debug_cmd
+
     save_ifs=$IFS; IFS='~'
     for cmd in $1; do
-      IFS=$save_ifs
+      IFS=$sp$nl
       eval cmd=\"$cmd\"
+      IFS=$save_ifs
       func_show_eval "$cmd" "${2-:}"
     done
     IFS=$save_ifs
@@ -990,10 +2599,11 @@
 # Note that it is not necessary on cygwin/mingw to append a dot to
 # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
 func_source ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $1 in
     */* | *\\*)	. "$1" ;;
     *)		. "./$1" ;;
@@ -1001,6 +2611,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1009,32 +2650,37 @@
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    $opt_debug
+    $debug_cmd
+
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
 	for z in $available_tags; do
 	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1049,7 +2695,7 @@
 	# line option must be used.
 	if test -z "$tagname"; then
 	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
+	  func_fatal_error "specify a tag with '--tag'"
 #	else
 #	  func_verbose "using $tagname tagged configuration"
 	fi
@@ -1060,50 +2706,569 @@
 
 
 
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
 
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
 
-# Name of the PIC object.
-pic_object=$write_lobj
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
 
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
 
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
 }
 
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
-    $opt_debug
+    $debug_cmd
+
     # Get the compilation command and the source file.
     base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
     suppress_opt=yes
     suppress_output=
     arg_mode=normal
@@ -1116,12 +3281,12 @@
       case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
+	lastarg=$arg
 	arg_mode=normal
 	;;
 
       target )
-	libobj="$arg"
+	libobj=$arg
 	arg_mode=normal
 	continue
 	;;
@@ -1131,18 +3296,18 @@
 	case $arg in
 	-o)
 	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
+	    func_fatal_error "you cannot specify '-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -1160,18 +3325,17 @@
 	  func_stripname '-Wc,' '' "$arg"
 	  args=$func_stripname_result
 	  lastarg=
-	  save_ifs="$IFS"; IFS=','
+	  save_ifs=$IFS; IFS=,
 	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
 	  done
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -1179,16 +3343,15 @@
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
+	  lastarg=$srcfile
+	  srcfile=$arg
 	  ;;
 	esac  #  case $arg
 	;;
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -1196,13 +3359,13 @@
       func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      func_fatal_error "you must specify a target with \`-o'"
+      func_fatal_error "you must specify a target with '-o'"
       ;;
     *)
       # Get the name of the library object.
       test -z "$libobj" && {
 	func_basename "$srcfile"
-	libobj="$func_basename_result"
+	libobj=$func_basename_result
       }
       ;;
     esac
@@ -1213,7 +3376,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1222,7 +3385,7 @@
     case $libobj in
     *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      func_fatal_error "cannot determine name of library object from '$libobj'"
       ;;
     esac
 
@@ -1231,8 +3394,8 @@
     for arg in $later; do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	continue
 	;;
@@ -1258,17 +3421,17 @@
     func_quote_for_eval "$libobj"
     test "X$libobj" != "X$func_quote_for_eval_result" \
       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
 
     test -z "$base_compile" && \
       func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       removelist="$obj $lobj $libobj ${libobj}T"
     else
       removelist="$lobj $libobj ${libobj}T"
@@ -1280,16 +3443,16 @@
       pic_mode=default
       ;;
     esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
 
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
     else
       output_obj=
       need_locks=no
@@ -1298,12 +3461,12 @@
 
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
+    if test yes = "$need_locks"; then
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
-    elif test "$need_locks" = warn; then
+    elif test warn = "$need_locks"; then
       if test -f "$lockfile"; then
 	$ECHO "\
 *** ERROR, $lockfile exists and contains:
@@ -1311,7 +3474,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -1319,26 +3482,25 @@
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      if test "$pic_mode" != no; then
+      if test no != "$pic_mode"; then
 	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
@@ -1349,13 +3511,13 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -1366,7 +3528,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -1382,29 +3544,29 @@
       fi
 
       # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
+      if test yes = "$suppress_opt"; then
 	suppress_output=' >/dev/null 2>&1'
       fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
 	# Don't build PIC code
 	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -1415,7 +3577,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -1435,7 +3597,7 @@
       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
       # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
+      if test no != "$need_locks"; then
 	removelist=$lockfile
         $RM "$lockfile"
       fi
@@ -1445,13 +3607,13 @@
 }
 
 $opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1465,7 +3627,7 @@
 Remove files from the build directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, object or program, all the files associated
@@ -1482,17 +3644,18 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
 
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
         ;;
 
       execute)
@@ -1505,7 +3668,7 @@
 
   -dlopen FILE      add the directory containing FILE to the library path
 
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
 flags.
 
 If any of the ARGS are libtool executable wrappers, then they are translated
@@ -1524,7 +3687,7 @@
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
         ;;
 
       install)
@@ -1534,11 +3697,11 @@
 Install executables or libraries.
 
 INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -1558,7 +3721,9 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
@@ -1572,7 +3737,8 @@
   -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
@@ -1586,21 +3752,26 @@
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
 
-Every other argument is treated as a filename.  Files ending in \`.la' are
+Every other argument is treated as a filename.  Files ending in '.la' are
 treated as uninstalled libtool libraries, other files are standard or library
 object files.
 
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
 required, except when creating a convenience library.
 
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
 
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 is created, otherwise an executable program is created."
         ;;
 
@@ -1611,7 +3782,7 @@
 Remove libraries from an installation directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
@@ -1619,40 +3790,70 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode '$opt_mode'"
         ;;
     esac
 
-    $ECHO
-    $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
 }
 
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
 
 
 # func_mode_execute arg...
 func_mode_execute ()
 {
-    $opt_debug
+    $debug_cmd
+
     # The first argument is the command name.
-    cmd="$nonopt"
+    cmd=$nonopt
     test -z "$cmd" && \
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+	|| func_fatal_help "'$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
 
 	# Read the libtool library.
 	dlname=
@@ -1663,18 +3864,18 @@
 	if test -z "$dlname"; then
 	  # Warn if it was a shared library.
 	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	    func_warning "'$file' was not linked with '-export-dynamic'"
 	  continue
 	fi
 
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -1682,18 +3883,18 @@
       *.lo)
 	# Just add the directory containing the .lo file.
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	;;
 
       *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 	continue
 	;;
       esac
 
       # Get the absolute pathname.
       absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+      test -n "$absdir" && dir=$absdir
 
       # Now add the directory to shlibpath_var.
       if eval "test -z \"\$$shlibpath_var\""; then
@@ -1705,34 +3906,41 @@
 
     # This variable tells wrapper scripts just to set shlibpath_var
     # rather than running their programs.
-    libtool_execute_magic="$magic"
+    libtool_execute_magic=$magic
 
     # Check if any of the arguments is a wrapper script.
     args=
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
 	  func_source "$file"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	elif func_ltwrapper_executable_p "$file"; then
 	  func_ltwrapper_scriptname "$file"
 	  func_source "$func_ltwrapper_scriptname_result"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	fi
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
-    if test "X$opt_dry_run" = Xfalse; then
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
       if test -n "$shlibpath_var"; then
 	# Export the shlibpath_var.
 	eval "export $shlibpath_var"
@@ -1749,34 +3957,64 @@
       done
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
+      exec_cmd=\$cmd$args
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
-    $opt_debug
-    libdirs="$nonopt"
+    $debug_cmd
+
+    libs=
+    libdirs=
     admincmds=
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
 
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1786,73 +4024,77 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
     fi
 
     # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+    $opt_quiet && exit $EXIT_SUCCESS
 
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
 
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
-    $opt_debug
+    $debug_cmd
+
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
        # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -1866,7 +4108,12 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1874,23 +4121,24 @@
     opts=
     prev=
     install_type=
-    isdir=no
+    isdir=false
     stripme=
+    no_mode=:
     for arg
     do
+      arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
 
       case $arg in
-      -d) isdir=yes ;;
+      -d) isdir=: ;;
       -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -1904,6 +4152,10 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -1914,14 +4166,25 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
       func_fatal_help "you must specify an install program"
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
 
     if test -z "$files"; then
       if test -z "$dest"; then
@@ -1936,19 +4199,19 @@
     dest=$func_stripname_result
 
     # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
       destname=
     else
       func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
+      destdir=$func_dirname_result
+      destname=$func_basename_result
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files; shift
       test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
+	func_fatal_help "'$dest' is not a directory"
     fi
     case $destdir in
     [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -1957,7 +4220,7 @@
 	case $file in
 	*.lo) ;;
 	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  func_fatal_help "'$destdir' must be an absolute directory name"
 	  ;;
 	esac
       done
@@ -1966,7 +4229,7 @@
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     staticlibs=
     future_libdirs=
@@ -1977,13 +4240,16 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+	  || func_fatal_help "'$file' is not a valid libtool archive"
 
 	library_names=
 	old_library=
@@ -1994,23 +4260,23 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	dir=$func_dirname_result
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2019,38 +4285,45 @@
 	  # are installed into $libdir/../bin (currently, that works fine)
 	  # but it's something to keep an eye on.
 	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
-	  func_warning "relinking \`$file'"
+	  func_warning "relinking '$file'"
 	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 	fi
 
 	# See the names of the shared library.
 	set dummy $library_names; shift
 	if test -n "$1"; then
-	  realname="$1"
+	  realname=$1
 	  shift
 
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
 
 	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
-	  tstripme="$stripme"
+	  tstripme=$stripme
 	  case $host_os in
 	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
-	      tstripme=""
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
 	      ;;
 	    esac
 	    ;;
@@ -2061,7 +4334,7 @@
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
 	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
@@ -2072,18 +4345,18 @@
 	  fi
 
 	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
+	  lib=$destdir/$realname
 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 	fi
 
 	# Install the pseudo-library for information purposes.
 	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
+	name=$func_basename_result
+	instname=$dir/${name}i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2091,11 +4364,11 @@
 
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# Deduce the name of the destination old-style object file.
@@ -2105,11 +4378,11 @@
 	  staticdest=$func_lo2o_result
 	  ;;
 	*.$objext)
-	  staticdest="$destfile"
+	  staticdest=$destfile
 	  destfile=
 	  ;;
 	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
 	  ;;
 	esac
 
@@ -2118,7 +4391,7 @@
 	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 
 	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
+	if test yes = "$build_old_libs"; then
 	  # Deduce the name of the old-style object file.
 	  func_lo2o "$file"
 	  staticobj=$func_lo2o_result
@@ -2130,23 +4403,23 @@
       *)
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# If the file is missing, and there is a .exe on the end, strip it
 	# because it is most likely a libtool script we actually want to
 	# install
-	stripped_ext=""
+	stripped_ext=
 	case $file in
 	  *.exe)
 	    if test ! -f "$file"; then
 	      func_stripname '' '.exe' "$file"
 	      file=$func_stripname_result
-	      stripped_ext=".exe"
+	      stripped_ext=.exe
 	    fi
 	    ;;
 	esac
@@ -2174,19 +4447,19 @@
 
 	  # Check the variables that should have been set.
 	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
 
-	  finalize=yes
+	  finalize=:
 	  for lib in $notinst_deplibs; do
 	    # Check to see that each library is installed.
 	    libdir=
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
 	    fi
 	  done
 
@@ -2194,34 +4467,34 @@
 	  func_source "$wrapper"
 
 	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
+	  if test no = "$fast_install" && test -n "$relink_command"; then
 	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
+	      if $finalize; then
 	        tmpdir=`func_mktempdir`
 		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
-	        $opt_silent || {
+	        $opt_quiet || {
 	          func_quote_for_expand "$relink_command"
 		  eval "func_echo $func_quote_for_expand_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
+		  func_error "error: relink '$file' with the above command before installing it"
 		  $opt_dry_run || ${RM}r "$tmpdir"
 		  continue
 	        fi
-	        file="$outputname"
+	        file=$outputname
 	      else
-	        func_warning "cannot relink \`$file'"
+	        func_warning "cannot relink '$file'"
 	      fi
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -2253,15 +4526,17 @@
 
     for file in $staticlibs; do
       func_basename "$file"
-      name="$func_basename_result"
+      name=$func_basename_result
 
       # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -2269,18 +4544,18 @@
     done
 
     test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+      func_warning "remember to run '$progname --finish$future_libdirs'"
 
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
     else
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2288,16 +4563,17 @@
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
     my_dlsyms=
 
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
+	my_dlsyms=${my_outputname}S.c
       else
 	func_error "not configured to extract global symbols from dlpreopened files"
       fi
@@ -2308,7 +4584,7 @@
       "") ;;
       *.c)
 	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
+	nlist=$output_objdir/$my_outputname.nm
 
 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 
@@ -2316,26 +4592,45 @@
 	func_verbose "creating $output_objdir/$my_dlsyms"
 
 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
 #endif
 
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* External symbol declarations for the compiler. */\
 "
 
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
 
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
 	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2354,10 +4649,10 @@
 
 	  # Prepare the list of exported symbols
 	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
+	    export_symbols=$output_objdir/$outputname.exp
 	    $opt_dry_run || {
 	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
 	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -2367,11 +4662,11 @@
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
+	        *cygwin* | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2381,13 +4676,55 @@
 	fi
 
 	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_verbose "extracting global C symbols from '$dlprefile'"
 	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2415,39 +4752,46 @@
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
 	  fi
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
 typedef struct {
   const char *name;
   void *address;
 } lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
 "
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
 
 	  case $need_lib_prefix in
 	  no)
@@ -2457,7 +4801,7 @@
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -2489,9 +4833,7 @@
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
 	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 	    ;;
 	  esac
 	  ;;
@@ -2500,7 +4842,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2508,28 +4850,28 @@
 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
 	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
 	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	symfileobj=$output_objdir/${my_outputname}S.$objext
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  fi
 	  ;;
 	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
       *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
 	;;
       esac
     else
@@ -2538,38 +4880,81 @@
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     fi
 }
 
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
 # func_win32_libid arg
 # return the library type of file 'arg'
 #
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
-  $opt_debug
-  win32_libid_type="unknown"
+  $debug_cmd
+
+  win32_libid_type=unknown
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   *ar\ archive\ import\ library*) # definitely import
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
 	    1,100{
 		/ I /{
-		    s,.*,import,
+		    s|.*|import|
 		    p
 		    q
 		}
 	    }'`
+	;;
+      esac
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -2590,15 +4975,131 @@
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -2610,22 +5111,23 @@
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
-    $opt_debug
-    my_gentop="$1"; shift
+    $debug_cmd
+
+    my_gentop=$1; shift
     my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
 
     for my_xlib in $my_oldlibs; do
       # Extract the objects.
       case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
+      my_xlib=$func_basename_result
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
@@ -2637,7 +5139,7 @@
 	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
 
       func_mkdir_p "$my_xdir"
 
@@ -2650,26 +5152,27 @@
 	  cd $my_xdir || exit $?
 	  darwin_archive=$my_xabs
 	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
 	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 	  if test -n "$darwin_arches"; then
 	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 	    darwin_arch=
 	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
 	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -2684,31 +5187,36 @@
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
-    func_extract_archives_result="$my_oldobjs"
+    func_extract_archives_result=$my_oldobjs
 }
 
 
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
 #
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
 {
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
+	func_emit_wrapper_arg1=${1-no}
 
 	$ECHO "\
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -2718,7 +5226,6 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # Be Bourne compatible
@@ -2749,31 +5256,135 @@
 else
   # When we are sourced in execute mode, \$file and \$ECHO are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
       shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$ECHO "\
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +5394,13 @@
       esac
     fi
 
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
   done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +5408,7 @@
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -2824,13 +5418,13 @@
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-	if test "$fast_install" = yes; then
+	if test yes = "$fast_install"; then
 	  $ECHO "\
   program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
 
   if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -2847,7 +5441,7 @@
     if test -n \"\$relink_command\"; then
       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
       fi
@@ -2869,262 +5463,49 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
 
     export $shlibpath_var
 "
 	fi
 
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
+      func_exec_program \${1+\"\$@\"}
     fi
   else
     # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
 fi\
 "
 }
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
 
 
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
-
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
 # Must ONLY be called from within func_mode_link because
@@ -3134,38 +5515,30 @@
 	cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
 */
 EOF
 	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
 # include <io.h>
-# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3177,9 +5550,45 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#if defined(PATH_MAX)
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
 # define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
 # define LT_PATHMAX MAXPATHLEN
 #else
 # define LT_PATHMAX 1024
@@ -3192,21 +5601,14 @@
 # define S_IXGRP 0
 #endif
 
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
 #endif
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
 # define HAVE_DOS_BASED_FILE_SYSTEM
 # define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
@@ -3230,10 +5632,6 @@
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -3243,25 +5641,16 @@
 
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
+  if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
 #else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
 #endif
 
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -3271,41 +5660,32 @@
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
 EOF
 
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
 	    cat <<EOF
-
-static const char *script_text_part2 =
-EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-
-	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
 	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3314,10 +5694,10 @@
 	    fi
 
 	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
+              func_to_host_path "$dllsearchpath:"
 	      cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3326,7 +5706,7 @@
 EOF
 	    fi
 
-	    if test "$fast_install" = yes; then
+	    if test yes = "$fast_install"; then
 	      cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
@@ -3340,24 +5720,10 @@
 	    cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 
 int
 main (int argc, char *argv[])
@@ -3369,21 +5735,24 @@
   char *actual_cwrapper_name;
   char *target_name;
   char *lt_argv_zero;
-  intptr_t rval = 127;
+  int rval = 127;
 
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
 
-  /* very simple arg parsing; don't want to rely on getopt */
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
+      if (STREQ (argv[i], dumpscript_opt))
 	{
 EOF
-	    case "$host" in
+	    case $host in
 	      *mingw* | *cygwin* )
 		# make stdout use "unix" line endings
 		echo "          setmode(1,_O_BINARY);"
@@ -3391,25 +5760,57 @@
 	      esac
 
 	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
+	  lt_dump_script (stdout);
 	  return 0;
 	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
     }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
-  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
 
   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -3427,8 +5828,9 @@
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
 EOF
 
 	    cat <<EOF
@@ -3478,80 +5880,19 @@
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
 
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
   for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
     }
 
 EOF
@@ -3560,11 +5901,14 @@
 	      mingw*)
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
       return 127;
     }
   return rval;
@@ -3586,7 +5930,7 @@
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal ("Memory exhausted");
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
 
   return p;
 }
@@ -3603,7 +5947,7 @@
 {
   const char *base;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   /* Skip over the disk name in MSDOS pathnames. */
   if (isalpha ((unsigned char) name[0]) && name[1] == ':')
     name += 2;
@@ -3620,8 +5964,8 @@
 {
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3638,8 +5982,8 @@
   int rval = 0;
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3662,17 +6006,17 @@
   const char *p_next;
   /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
-  int tmp_len;
+  size_t tmp_len;
   char *concat_name;
 
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
 
   /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
     {
       concat_name = xstrdup (wrapper);
@@ -3690,7 +6034,7 @@
 	    return concat_name;
 	  XFREE (concat_name);
 	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
     }
 #endif
 
@@ -3713,13 +6057,14 @@
 	      for (q = p; *q; q++)
 		if (IS_PATH_SEPARATOR (*q))
 		  break;
-	      p_len = q - p;
+	      p_len = (size_t) (q - p);
 	      p_next = (*q == '\0' ? q : q + 1);
 	      if (p_len == 0)
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +6089,8 @@
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +6116,9 @@
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +6140,9 @@
 	}
       else
 	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
 	}
     }
   XFREE (tmp_pathspec);
@@ -3807,7 +6155,8 @@
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -3827,17 +6176,31 @@
   if (patlen <= len)
     {
       str += len - patlen;
-      if (strcmp (str, pat) == 0)
+      if (STREQ (str, pat))
 	*str = '\0';
     }
   return str;
 }
 
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
 static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s: %s: ", program_name, mode);
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -3846,162 +6209,91 @@
 }
 
 void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
   va_end (ap);
 }
 
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
 void
 lt_setenv (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
     char *str = xstrdup (value);
     setenv (name, str, 1);
 #else
-    int len = strlen (name) + 1 + strlen (value) + 1;
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
     char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
 }
 
-void
-lt_opt_process_env_prepend (const char *arg)
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
 {
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
+  char *new_value;
+  if (orig_value && *orig_value)
     {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
     }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
+  else
     {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+      new_value = xstrdup (add);
     }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
+  return new_value;
 }
 
 void
 lt_update_exe_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
       char *new_value = lt_extend_str (getenv (name), value, 0);
       /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
         {
-          new_value[len-1] = '\0';
+          new_value[--len] = '\0';
         }
       lt_setenv (name, new_value);
       XFREE (new_value);
@@ -4011,9 +6303,9 @@
 void
 lt_update_lib_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4023,25 +6315,192 @@
     }
 }
 
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
 
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $host in
     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
+      # what system we are compiling for in order to pass an extra
       # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
+      # to make a dll that has undefined symbols, in which case not
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
@@ -4072,6 +6531,7 @@
     new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -4084,10 +6544,11 @@
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
-    preload=no
+    preload=false
     prev=
     prevarg=
     release=
@@ -4099,7 +6560,7 @@
     vinfo=
     vinfo_number=no
     weak_libs=
-    single_module="${wl}-single_module"
+    single_module=$wl-single_module
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
@@ -4107,15 +6568,15 @@
     do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	break
 	;;
       -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
@@ -4148,7 +6609,7 @@
 
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
-      arg="$1"
+      arg=$1
       shift
       func_quote_for_eval "$arg"
       qarg=$func_quote_for_eval_unquoted_result
@@ -4164,17 +6625,22 @@
 	esac
 
 	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
 	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
+	  $preload || {
 	    # Add the symbol object into the linking commands.
 	    func_append compile_command " @SYMFILE@"
 	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
+	    preload=:
+	  }
 	  case $arg in
 	  *.la | *.lo) ;;  # We handle these cases below.
 	  force)
-	    if test "$dlself" = no; then
+	    if test no = "$dlself"; then
 	      dlself=needless
 	      export_dynamic=yes
 	    fi
@@ -4182,9 +6648,9 @@
 	    continue
 	    ;;
 	  self)
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 	      dlself=yes
 	    else
 	      dlself=needless
@@ -4194,10 +6660,10 @@
 	    continue
 	    ;;
 	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -4205,14 +6671,14 @@
 	  esac
 	  ;;
 	expsyms)
-	  export_symbols="$arg"
+	  export_symbols=$arg
 	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
+	    || func_fatal_error "symbol file '$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
 	expsyms_regex)
-	  export_symbols_regex="$arg"
+	  export_symbols_regex=$arg
 	  prev=
 	  continue
 	  ;;
@@ -4221,7 +6687,7 @@
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -4230,7 +6696,13 @@
 	  continue
 	  ;;
 	inst_prefix)
-	  inst_prefix_dir="$arg"
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
 	  prev=
 	  continue
 	  ;;
@@ -4240,7 +6712,7 @@
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      moreargs="$moreargs $fil"
+#	      func_append moreargs " $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -4254,22 +6726,22 @@
 
 		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
 		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
+		xdir=$func_dirname_result
 
-		if test "$pic_object" != none; then
+		if test none != "$pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
+		  pic_object=$xdir$pic_object
 
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
 		    else
@@ -4279,31 +6751,31 @@
 		  fi
 
 		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
+		  if test dlprefiles = "$prev"; then
 		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
+		    func_append dlprefiles " $pic_object"
 		    prev=
 		  fi
 
 		  # A PIC object.
 		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
+		  arg=$pic_object
 		fi
 
 		# Non-PIC object.
-		if test "$non_pic_object" != none; then
+		if test none != "$non_pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
+		  non_pic_object=$xdir$non_pic_object
 
 		  # A standard non-PIC object
 		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
 		  fi
 		else
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
+		  non_pic_object=$pic_object
 		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
@@ -4311,7 +6783,7 @@
 		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
 		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
+		  xdir=$func_dirname_result
 
 		  func_lo2o "$arg"
 		  pic_object=$xdir$objdir/$func_lo2o_result
@@ -4319,24 +6791,29 @@
 		  func_append libobjs " $pic_object"
 		  func_append non_pic_objects " $non_pic_object"
 	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
+		  func_fatal_error "'$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
+	    func_fatal_error "link input file '$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
 	precious_regex)
-	  precious_files_regex="$arg"
+	  precious_files_regex=$arg
 	  prev=
 	  continue
 	  ;;
 	release)
-	  release="-$arg"
+	  release=-$arg
 	  prev=
 	  continue
 	  ;;
@@ -4348,48 +6825,48 @@
 	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
-	  if test "$prev" = rpath; then
+	  if test rpath = "$prev"; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
 	  continue
 	  ;;
 	shrext)
-	  shrext_cmds="$arg"
+	  shrext_cmds=$arg
 	  prev=
 	  continue
 	  ;;
 	weak)
-	  weak_libs="$weak_libs $arg"
+	  func_append weak_libs " $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -4403,7 +6880,7 @@
 	esac
       fi # test -n "$prev"
 
-      prevarg="$arg"
+      prevarg=$arg
 
       case $arg in
       -all-static)
@@ -4417,7 +6894,7 @@
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -4425,6 +6902,11 @@
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -4444,7 +6926,7 @@
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
+	if test X-export-symbols = "X$arg"; then
 	  prev=expsyms
 	else
 	  prev=expsyms_regex
@@ -4475,44 +6957,51 @@
 	;;
 
       -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
+	    func_fatal_error "require no space between '-L' and '$1'"
 	  else
-	    func_fatal_error "need path for \`-L' option"
+	    func_fatal_error "need path for '-L' option"
 	  fi
 	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  absdir=`cd "$dir" && pwd`
 	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4520,43 +7009,48 @@
 	;;
 
       -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
 	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
 	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  esac
-	elif test "X$arg" = "X-lc_r"; then
+	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
 	continue
 	;;
 
@@ -4568,27 +7062,28 @@
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	case "$new_inherited_linker_flags " in
 	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
 	esac
 	continue
 	;;
 
       -multi_module)
-	single_module="${wl}-multi_module"
+	single_module=$wl-multi_module
 	continue
 	;;
 
@@ -4602,8 +7097,8 @@
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -4621,6 +7116,11 @@
 	continue
 	;;
 
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
       -o) prev=output ;;
 
       -precious-files-regex)
@@ -4649,13 +7149,17 @@
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
 	*)
 	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
@@ -4704,14 +7208,14 @@
 	func_stripname '-Wc,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -4720,15 +7224,15 @@
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -4751,38 +7255,63 @@
       # -msg_* for osf cc
       -msg_*)
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
+        func_append compiler_flags " $arg"
         continue
         ;;
 
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
       # Some other compiler flag.
       -* | +*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
@@ -4798,22 +7327,22 @@
 
 	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
 	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
+	  xdir=$func_dirname_result
 
-	  if test "$pic_object" != none; then
+	  test none = "$pic_object" || {
 	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
+	    pic_object=$xdir$pic_object
 
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -4823,31 +7352,31 @@
 	    fi
 
 	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
 	    # A PIC object.
 	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
+	    arg=$pic_object
+	  }
 
 	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
+	  if test none != "$non_pic_object"; then
 	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
+	    non_pic_object=$xdir$non_pic_object
 
 	    # A standard non-PIC object
 	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
 	    fi
 	  else
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
+	    non_pic_object=$pic_object
 	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
@@ -4855,7 +7384,7 @@
 	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
 	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
+	    xdir=$func_dirname_result
 
 	    func_lo2o "$arg"
 	    pic_object=$xdir$objdir/$func_lo2o_result
@@ -4863,31 +7392,32 @@
 	    func_append libobjs " $pic_object"
 	    func_append non_pic_objects " $non_pic_object"
 	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
+	    func_fatal_error "'$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
-	if test "$prev" = dlfiles; then
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
-	elif test "$prev" = dlprefiles; then
+	elif test dlprefiles = "$prev"; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -4897,7 +7427,7 @@
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
       esac # arg
 
@@ -4909,9 +7439,9 @@
     done # argument parsing loop
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
+      func_fatal_help "the '$prevarg' option requires an argument"
 
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
       func_append compile_command " $arg"
       func_append finalize_command " $arg"
@@ -4920,20 +7450,25 @@
     oldlibs=
     # calculate the name of the file, without its directory
     func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
     func_mkdir_p "$output_objdir"
 
@@ -4954,15 +7489,15 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
+      if $opt_preserve_dup_deps; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
-    if test "$linkmode" = lib; then
+    if test lib = "$linkmode"; then
       libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
       # Compute libraries that are listed more than once in $predeps
@@ -4972,9 +7507,9 @@
       if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -4994,7 +7529,7 @@
 	  case $file in
 	  *.la) ;;
 	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -5002,7 +7537,7 @@
     prog)
 	compile_deplibs=
 	finalize_deplibs=
-	alldeplibs=no
+	alldeplibs=false
 	newdlfiles=
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
@@ -5014,82 +7549,85 @@
     for pass in $passes; do
       # The preopen pass in lib mode reverses $deplibs; put it back here
       # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
+      if test lib,link = "$linkmode,$pass"; then
 	## FIXME: Find the place where the list is rebuilt in the wrong
 	##        order, and fix it there properly
         tmp_deplibs=
 	for deplib in $deplibs; do
 	  tmp_deplibs="$deplib $tmp_deplibs"
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
       fi
 
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
 	deplibs=
       fi
-      if test "$linkmode" = prog; then
+      if test prog = "$linkmode"; then
 	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+      if test lib,dlpreopen = "$linkmode,$pass"; then
 	# Collect and forward deplibs of preopened libtool libs
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
 	  dependency_libs=
+	  func_resolve_sysroot "$lib"
 	  case $lib in
-	  *.la)	func_source "$lib" ;;
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
 	  esac
 
 	  # Collect preopened libtool deplibs, except any this library
 	  # has declared as weak libs
 	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
+	    *) func_append deplibs " $deplib" ;;
 	    esac
 	  done
 	done
-	libs="$dlprefiles"
+	libs=$dlprefiles
       fi
-      if test "$pass" = dlopen; then
+      if test dlopen = "$pass"; then
 	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
+	save_deplibs=$deplibs
 	deplibs=
       fi
 
       for deplib in $libs; do
 	lib=
-	found=no
+	found=false
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    compiler_flags="$compiler_flags $deplib"
-	    if test "$linkmode" = lib ; then
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
 	  continue
 	  ;;
 	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
 	    continue
 	  fi
 	  func_stripname '-l' '' "$deplib"
 	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	  else
 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -5097,31 +7635,22 @@
 	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
+	      lib=$searchdir/lib$name$search_ext
 	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
+		if test .la = "$search_ext"; then
+		  found=:
 		else
-		  found=no
+		  found=false
 		fi
 		break 2
 	      fi
 	    done
 	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
+	  if $found; then
+	    # deplib is a libtool library
 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
 		if func_lalib_p "$lib"; then
@@ -5129,19 +7658,19 @@
 		  old_library=
 		  func_source "$lib"
 		  for l in $old_library $library_names; do
-		    ll="$l"
+		    ll=$l
 		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
 		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
+		    ladir=$func_dirname_result
 		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
+		    if test prog,link = "$linkmode,$pass"; then
 		      compile_deplibs="$deplib $compile_deplibs"
 		      finalize_deplibs="$deplib $finalize_deplibs"
 		    else
 		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 		    fi
 		    continue
 		  fi
@@ -5150,18 +7679,28 @@
 	      *) ;;
 	      esac
 	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
 	  fi
 	  ;; # -l
 	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5171,47 +7710,53 @@
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
+	    test conv = "$pass" && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
-	    if test "$pass" = conv; then
+	    if test conv = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test "$pass" = scan; then
+	    if test scan = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
+	    func_warning "'-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
-	  if test "$pass" = link; then
+	  if test link = "$pass"; then
 	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -5222,40 +7767,40 @@
 	    case " $dlpreconveniencelibs " in
 	    *" $deplib "*) ;;
 	    *)
-	      valid_a_lib=no
+	      valid_a_lib=false
 	      case $deplibs_check_method in
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
+		    valid_a_lib=:
 		  fi
 		;;
 		pass_all)
-		  valid_a_lib=yes
+		  valid_a_lib=:
 		;;
 	      esac
-	      if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	      else
-		$ECHO
+	      if $valid_a_lib; then
+		echo
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
 	      fi
 	      ;;
 	    esac
 	    continue
 	    ;;
 	  prog)
-	    if test "$pass" != link; then
+	    if test link != "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -5266,38 +7811,36 @@
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
 	  ;;
 	%DEPLIBS%)
-	  alldeplibs=yes
+	  alldeplibs=:
 	  continue
 	  ;;
 	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
 
 	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	ladir=$func_dirname_result
 
 	dlname=
 	dlopen=
@@ -5318,44 +7861,44 @@
 
 	# Convert "-framework foo" to "foo.ltframework"
 	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
-	if test "$pass" = conv; then
+	if test conv = "$pass"; then
 	  # Only check for convenience libraries
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
+	      func_fatal_error "cannot find name of link library for '$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
 	  fi
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done
 	  continue
 	fi # $pass = conv
@@ -5363,101 +7906,133 @@
 
 	# Get the name of the library we link against.
 	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
 	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
+	  func_fatal_error "cannot find name of link library for '$lib'"
 	fi
 
 	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
 
 	# We need an absolute path.
 	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "cannot determine absolute directory name of '$ladir'"
 	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
+	    abs_ladir=$ladir
 	  fi
 	  ;;
 	esac
 	func_basename "$lib"
-	laname="$func_basename_result"
+	laname=$func_basename_result
 
 	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
 	  else
-	    dir="$libdir"
-	    absdir="$libdir"
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
 	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
+	    dir=$ladir
+	    absdir=$abs_ladir
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
 	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
 	  # Link the convenience library
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
+	  elif test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	  else
@@ -5467,52 +8042,53 @@
 	fi
 
 
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
 	  fi
 
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
+	    if $linkalldeplibs; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
 
-	if test "$linkmode,$pass" = "prog,link"; then
+	if test prog,link = "$linkmode,$pass"; then
 	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
 	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
+	      case $temp_rpath: in
 	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -5524,7 +8100,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5533,15 +8109,15 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
 	  fi # $linkmode,$pass = prog,link...
 
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
 		 test -n "$library_names"; }; }; then
 	    # We only need to search for static libraries
 	    continue
@@ -5550,20 +8126,20 @@
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
+	if test built = "$use_static_libs" && test yes = "$installed"; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
 	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -5572,24 +8148,24 @@
 
 	  # Warn about portability, can't link against -module's on some
 	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
+	  dlopenmodule=
 	  for dlpremoduletest in $dlprefiles; do
 	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
+	      dlopenmodule=$dlpremoduletest
 	      break
 	    fi
 	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
-	    if test "$linkmode" = prog; then
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
 	    $ECHO "*** $linklib is not portable!"
 	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -5598,7 +8174,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5607,7 +8183,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5617,43 +8193,43 @@
 	    # figure out the soname
 	    set dummy $library_names
 	    shift
-	    realname="$1"
+	    realname=$1
 	    shift
 	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
-	      soname="$dlname"
+	      soname=$dlname
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
+	      *cygwin* | mingw* | *cegcc* | *os2*)
 	        func_arith $current - $age
 		major=$func_arith_result
-		versuffix="-$major"
+		versuffix=-$major
 		;;
 	      esac
 	      eval soname=\"$soname_spec\"
 	    else
-	      soname="$realname"
+	      soname=$realname
 	    fi
 
 	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
+	    soroot=$soname
 	    func_basename "$soroot"
-	    soname="$func_basename_result"
+	    soname=$func_basename_result
 	    func_stripname 'lib' '.dll' "$soname"
 	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_verbose "extracting exported symbol list from '$soname'"
 	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
+	      func_verbose "generating import library for '$soname'"
 	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
@@ -5661,70 +8237,70 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    lib_linked=yes
 	    case $hardcode_action in
 	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
 		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
+		    *-*-unixware7*) add_dir=-L$dir ;;
 		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
+		    # if the lib is a (non-dlopened) module then we cannot
 		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
+			 $GREP ": [^:]* bundle" >/dev/null; then
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
 			else
-			  add="$dir/$old_library"
+			  add=$dir/$old_library
 			fi
 		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
+			add=$dir/$old_library
 		      fi
 		    fi
 		esac
-	      elif test "$hardcode_minus_L" = no; then
+	      elif test no = "$hardcode_minus_L"; then
 		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
+		*-*-sunos*) add_shlibpath=$dir ;;
 		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
@@ -5732,72 +8308,72 @@
 	    *) lib_linked=no ;;
 	    esac
 
-	    if test "$lib_linked" != yes; then
+	    if test yes != "$lib_linked"; then
 	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
 	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
 	      else
-		add="$libdir/$linklib"
+		add=$libdir/$linklib
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+	      add_dir=-L$libdir
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
-	      add="-l$name"
+	      add=-l$name
 	    fi
 
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -5805,43 +8381,43 @@
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test "$linkmode" = prog; then
+	elif test prog = "$linkmode"; then
 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 	  # is not unsupported.  This is valid on all known static and
 	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
 	    compile_deplibs="$dir/$linklib $compile_deplibs"
 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 	  else
 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 	  fi
-	elif test "$build_libtool_libs" = yes; then
+	elif test yes = "$build_libtool_libs"; then
 	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
+	  if test pass_all != "$deplibs_check_method"; then
 	    # We're trying link a shared library against a static one
 	    # but the system doesn't support it.
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $ECHO
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	      fi
-	      if test "$build_old_libs" = no; then
+	      if test no = "$build_old_libs"; then
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -5854,11 +8430,11 @@
 	  fi
 	fi # link shared/static library?
 
-	if test "$linkmode" = lib; then
+	if test lib = "$linkmode"; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
@@ -5867,45 +8443,54 @@
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
-	    dependency_libs="$temp_deplibs"
+	    dependency_libs=$temp_deplibs
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
-	  if test "$link_all_deplibs" != no; then
+	  if test no != "$link_all_deplibs"; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
-	      -L*) path="$deplib" ;;
+	      -L*) path=$deplib ;;
 	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
 	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
+		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
 		  fi
 		  ;;
 		esac
@@ -5913,35 +8498,35 @@
 		case $host in
 		*-*-darwin*)
 		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
                       if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 		      path=
 		    fi
 		  fi
 		  ;;
 		*)
-		  path="-L$absdir/$objdir"
+		  path=-L$absdir/$objdir
 		  ;;
 		esac
 		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
 		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
+		    func_warning "'$deplib' seems to be moved"
 
-		  path="-L$absdir"
+		  path=-L$absdir
 		fi
 		;;
 	      esac
@@ -5953,38 +8538,38 @@
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
-	fi
+	}
 
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
+	if test prog,link = "$linkmode,$pass"; then
 	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
 	fi
 	for var in $vars dependency_libs; do
 	  # Add libraries to $var in reverse order
@@ -6033,71 +8618,102 @@
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
-      for i in $dependency_libs ; do
+      for i in $dependency_libs; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
 	*" $i "*)
-	  i=""
+	  i=
 	  ;;
 	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
     done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
     fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+	func_warning "'-l' and '-L' are ignored for archives" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
+	func_warning "'-rpath' is ignored for archives"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
+	func_warning "'-R' is ignored for archives"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
+	func_warning "'-version-info/-version-number' is ignored for archives"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
+	func_warning "'-release' is ignored for archives"
 
       test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
+	func_warning "'-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
+      oldlibs=$output
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
+      # Make sure we only generate libraries of the form 'libNAME.la'.
       case $outputname in
       lib*)
 	func_stripname 'lib' '.la' "$outputname"
@@ -6106,10 +8722,10 @@
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
 
-	if test "$need_lib_prefix" != no; then
+	if test no != "$need_lib_prefix"; then
 	  # Add the "lib" prefix for modules if required
 	  func_stripname '' '.la' "$outputname"
 	  name=$func_stripname_result
@@ -6123,31 +8739,31 @@
       esac
 
       if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 	else
-	  $ECHO
+	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  func_append libobjs " $objs"
 	fi
       fi
 
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
       shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 
-      install_libdir="$1"
+      install_libdir=$1
 
       oldlibs=
       if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
+	if test yes = "$build_libtool_libs"; then
 	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
+	  # Some compilers have problems with a '.al' extension so
 	  # convenience libraries should have the same extension an
 	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -6156,20 +8772,20 @@
 	fi
 
 	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 
 	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
+	  func_warning "'-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
+	save_ifs=$IFS; IFS=:
 	set dummy $vinfo 0 0 0
 	shift
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
+	  func_fatal_help "too many parameters to '-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -6177,41 +8793,42 @@
 
 	case $vinfo_number in
 	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
 	  # and those that subtract age and use age as
 	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
+	  # that has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
+	    age=$number_minor
+	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
 	    ;;
 	  irix|nonstopux)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
+	    age=$number_minor
+	    revision=$number_minor
 	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
 	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
+	  current=$1
+	  revision=$2
+	  age=$3
 	  ;;
 	esac
 
@@ -6219,30 +8836,30 @@
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -6257,26 +8874,36 @@
 	  # verstring for coding it into the library header
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
 	  ;;
 
 	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
+	  if test no = "$lt_irix_increment"; then
 	    func_arith $current - $age
 	  else
 	    func_arith $current - $age + 1
@@ -6287,69 +8914,74 @@
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
 	  esac
-	  verstring="$verstring_prefix$major.$revision"
+	  verstring=$verstring_prefix$major.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $revision - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
+	    verstring=$verstring_prefix$major.$iface:$verstring
 	  done
 
-	  # Before this point, $major must not contain `.'.
+	  # Before this point, $major must not contain '.'.
 	  major=.$major
-	  versuffix="$major.$revision"
+	  versuffix=$major.$revision
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	osf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $current - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
+	    verstring=$verstring:$iface.0
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":$current.0"
 	  ;;
 
 	qnx)
-	  major=".$current"
-	  versuffix=".$current"
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
 	  ;;
 
 	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	windows)
 	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
+	  # extension on DOS 8.3 file systems.
 	  func_arith $current - $age
 	  major=$func_arith_result
-	  versuffix="-$major"
+	  versuffix=-$major
 	  ;;
 
 	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  func_fatal_configuration "unknown library version type '$version_type'"
 	  ;;
 	esac
 
@@ -6363,42 +8995,45 @@
 	    verstring=
 	    ;;
 	  *)
-	    verstring="0.0"
+	    verstring=0.0
 	    ;;
 	  esac
-	  if test "$need_version" = no; then
+	  if test no = "$need_version"; then
 	    versuffix=
 	  else
-	    versuffix=".0.0"
+	    versuffix=.0.0
 	  fi
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test yes,no = "$avoid_version,$need_version"; then
 	  major=
 	  versuffix=
-	  verstring=""
+	  verstring=
 	fi
 
 	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
 	  fi
 	else
 	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
+	  allow_undefined_flag=$no_undefined_flag
 	fi
 
       fi
 
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
 
-      if test "$mode" != relink; then
+      if test relink != "$opt_mode"; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -6407,14 +9042,14 @@
 	  case $p in
 	    *.$objext | *.gcno)
 	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 		 then
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -6424,64 +9059,65 @@
       fi
 
       # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
 
       # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
+      old_dlfiles=$dlfiles
       dlfiles=
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
       # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
+      old_dlprefiles=$dlprefiles
       dlprefiles=
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
-      if test "$build_libtool_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -6497,8 +9133,8 @@
 	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -6513,9 +9149,9 @@
 	# I'm not sure if I'm treating the release correctly.  I think
 	# release should show up in the -l (ie -lgmp5) so we don't want to
 	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
+	release=
+	versuffix=
+	major=
 	newdeplibs=
 	droppeddeps=no
 	case $deplibs_check_method in
@@ -6544,35 +9180,35 @@
 	      -l*)
 		func_stripname -l '' "$i"
 		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
+		    func_append newdeplibs " $i"
+		    i=
 		    ;;
 		  esac
 		fi
-		if test -n "$i" ; then
+		if test -n "$i"; then
 		  libname=`eval "\\$ECHO \"$libname_spec\""`
 		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
-		    $ECHO
+		    echo
 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6587,43 +9223,43 @@
 		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
+		      func_append newdeplibs " $i"
+		      i=
 		      ;;
 		    esac
 		  fi
-		  if test -n "$i" ; then
+		  if test -n "$i"; then
 		    libname=`eval "\\$ECHO \"$libname_spec\""`
 		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
-		      $ECHO
+		      echo
 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  $ECHO
+		  echo
 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6637,18 +9273,30 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6660,33 +9308,33 @@
 		      # We might still enter an endless loop, since a link
 		      # loop can be closed while we follow links,
 		      # but so what?
-		      potlib="$potent_lib"
+		      potlib=$potent_lib
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
 			break 2
 		      fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -6696,7 +9344,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6709,38 +9357,38 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
 		      break 2
 		    fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -6750,32 +9398,32 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 	    done
 	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
+	    echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	  fi
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -6787,44 +9435,44 @@
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
 	      build_libtool_libs=module
 	      build_old_libs=yes
 	    else
 	      build_libtool_libs=no
 	    fi
 	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -6839,9 +9487,9 @@
       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
       case $host in
 	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -6854,7 +9502,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -6864,13 +9512,13 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      deplibs="$new_libs"
+      deplibs=$new_libs
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -6878,62 +9526,65 @@
       dlname=
 
       # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
+		  hardcode_libdirs=$libdir
 		else
 		  # Just accumulate the unique libdirs.
 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
 	  # Substitute the hardcoded libdirs into the rpath.
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 	fi
 
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -6943,34 +9594,34 @@
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	shift
-	realname="$1"
+	realname=$1
 	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
 	else
-	  soname="$realname"
+	  soname=$realname
 	fi
 	if test -z "$dlname"; then
 	  dlname=$soname
 	fi
 
-	lib="$output_objdir/$realname"
+	lib=$output_objdir/$realname
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	test "X$libobjs" = "X " && libobjs=
 
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -6978,36 +9629,68 @@
 	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	    func_dll_def_p "$export_symbols" || {
 	      # and it's NOT already a .def file. Must figure out
 	      # which of the given symbols are data symbols and tag
 	      # them as such. So, trigger use of export_symbols_cmds.
 	      # export_symbols gets reassigned inside the "prepare
 	      # the list of exported symbols" if statement, so the
 	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
+	      orig_export_symbols=$export_symbols
 	      export_symbols=
 	      always_export_symbols=yes
-	    fi
+	    }
 	  fi
 	  ;;
 	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7018,8 +9701,8 @@
 		break
 	      fi
 	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
@@ -7027,21 +9710,21 @@
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
 	  # though. Also, the filter scales superlinearly with the number of
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -7051,15 +9734,15 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
+	    test yes = "$compiler_needs_object" &&
 	    test -z "$libobjs"; then
 	    # extract the archives, so we have objects to list.
 	    # TODO: could optimize this to just extract one archive.
@@ -7070,27 +9753,27 @@
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	    test "X$libobjs" = "X " && libobjs=
 	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
+	if test yes = "$module" && test -n "$module_cmds"; then
 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	    eval test_cmds=\"$module_expsym_cmds\"
 	    cmds=$module_expsym_cmds
@@ -7108,7 +9791,7 @@
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" &&
+	if test : != "$skipped_export" &&
 	   func_len " $test_cmds" &&
 	   len=$func_len_result &&
 	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -7130,7 +9813,8 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+	  func_basename "$output"
+	  output_la=$func_basename_result
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -7140,37 +9824,42 @@
 	  last_robj=
 	  k=1
 
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
 	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
+	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
 	    func_verbose "creating linker input file list: $output"
 	    : > $output
 	    set x $save_libobjs
 	    shift
 	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
+	    if test yes = "$compiler_needs_object"; then
 	      firstobj="$1 "
 	      shift
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
+	      output=$output_objdir/$output_la-$k.$objext
 	      eval test_cmds=\"$reload_cmds\"
 	      func_len " $test_cmds"
 	      len0=$func_len_result
@@ -7182,25 +9871,27 @@
 		func_len " $obj"
 		func_arith $len + $func_len_result
 		len=$func_arith_result
-		if test "X$objlist" = X ||
+		if test -z "$objlist" ||
 		   test "$len" -lt "$max_cmd_len"; then
 		  func_append objlist " $obj"
 		else
 		  # The command $test_cmds is almost too long, add a
 		  # command to the queue.
-		  if test "$k" -eq 1 ; then
+		  if test 1 -eq "$k"; then
 		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
 		  else
 		    # All subsequent reloadable object files will link in
 		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  last_robj=$output_objdir/$output_la-$k.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -7210,19 +9901,20 @@
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
 	    fi
 
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
 	      $opt_dry_run || $RM $export_symbols
 	      libobjs=$output
 	      # Append the command to create the export file.
@@ -7231,16 +9923,16 @@
 	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	    fi
+	    }
 
 	    test -n "$save_libobjs" &&
 	      func_verbose "creating a temporary reloadable object file: $output"
 
 	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
+	      IFS=$save_ifs
+	      $opt_quiet || {
 		  func_quote_for_expand "$cmd"
 		  eval "func_echo $func_quote_for_expand_result"
 	      }
@@ -7248,7 +9940,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test relink = "$opt_mode"; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7257,7 +9949,7 @@
 		exit $lt_exit
 	      }
 	    done
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 
 	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -7265,27 +9957,27 @@
 	    fi
 	  fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
 	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
 	      # though. Also, the filter scales superlinearly with the number of
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
-	  fi
+	  }
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -7299,7 +9991,7 @@
 	  # value of $libobjs for piecewise linking.
 
 	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test yes = "$module" && test -n "$module_cmds"; then
 	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	      cmds=$module_expsym_cmds
 	    else
@@ -7321,19 +10013,20 @@
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
-	save_ifs="$IFS"; IFS='~'
+	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
-	  IFS="$save_ifs"
+	  IFS=$sp$nl
 	  eval cmd=\"$cmd\"
-	  $opt_silent || {
+	  IFS=$save_ifs
+	  $opt_quiet || {
 	    func_quote_for_expand "$cmd"
 	    eval "func_echo $func_quote_for_expand_result"
 	  }
@@ -7341,7 +10034,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test relink = "$opt_mode"; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7350,10 +10043,10 @@
 	    exit $lt_exit
 	  }
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7373,39 +10066,39 @@
 	done
 
 	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
+	if test yes = "$module" || test yes = "$export_dynamic"; then
 	  # On all known operating systems, these are identical.
-	  dlname="$soname"
+	  dlname=$soname
 	fi
       fi
       ;;
 
     obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+	func_warning "'-l' and '-L' are ignored for objects" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
+	func_warning "'-rpath' is ignored for objects"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
+	func_warning "'-R' is ignored for objects"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
+	func_warning "'-version-info' is ignored for objects"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
+	func_warning "'-release' is ignored for objects"
 
       case $output in
       *.lo)
 	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
 
 	libobj=$output
 	func_lo2o "$libobj"
@@ -7413,7 +10106,7 @@
 	;;
       *)
 	libobj=
-	obj="$output"
+	obj=$output
 	;;
       esac
 
@@ -7426,28 +10119,33 @@
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 
-      output="$obj"
+      output=$obj
       func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
@@ -7459,7 +10157,7 @@
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$build_libtool_libs" != yes; then
+      test yes = "$build_libtool_libs" || {
 	if test -n "$gentop"; then
 	  func_show_eval '${RM}r "$gentop"'
 	fi
@@ -7469,12 +10167,12 @@
 	# $show "echo timestamp > $libobj"
 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
-      fi
+      }
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
+	output=$libobj
 	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
@@ -7491,22 +10189,20 @@
 	          output=$func_stripname_result.exe;;
       esac
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+	func_warning "'-version-info' is ignored for programs"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
+	func_warning "'-release' is ignored for programs"
 
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -7514,17 +10210,17 @@
       *-*-darwin*)
 	# Don't allow lazy linking, it breaks C++ global constructors
 	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
+	if test CXX = "$tagname"; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
 	    ;;
 	  esac
 	fi
 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -7538,7 +10234,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7548,17 +10244,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      compile_deplibs="$new_libs"
+      compile_deplibs=$new_libs
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7566,7 +10262,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7578,39 +10274,39 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7618,10 +10314,10 @@
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      compile_rpath="$rpath"
+      compile_rpath=$rpath
 
       rpath=
       hardcode_libdirs=
@@ -7629,82 +10325,86 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      finalize_rpath="$rpath"
+      finalize_rpath=$rpath
 
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
       # template prelinking step
       if test -n "$prelink_cmds"; then
 	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      wrappers_required=yes
+      wrappers_required=:
       case $host in
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
         ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
         ;;
       *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
         fi
         ;;
       esac
-      if test "$wrappers_required" = no; then
+      $wrappers_required || {
 	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 	fi
 
 	exit $exit_status
-      fi
+      }
 
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -7720,7 +10420,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7728,54 +10428,68 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
       fi
 
-      if test "$no_install" = yes; then
+      if test yes = "$no_install"; then
 	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
+	link_command=$compile_var$compile_command$compile_rpath
 	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
-      fi
 
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
 	fi
+
+	exit $EXIT_SUCCESS
       fi
 
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
       # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -7793,18 +10507,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -7828,8 +10531,8 @@
 	    func_dirname_and_basename "$output" "" "."
 	    output_name=$func_basename_result
 	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
 	    $RM $cwrappersource $cwrapper
 	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
@@ -7850,7 +10553,7 @@
 	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 	    $opt_dry_run || {
 	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
+	      if test "x$build" = "x$host"; then
 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 	      else
 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -7873,43 +10576,45 @@
     # See if we need to build an old-fashioned archive.
     for oldlib in $oldlibs; do
 
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
 	  build_libtool_libs=no
-	else
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
 	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
 
       if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 	cmds=$old_archive_from_new_cmds
       else
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -7925,9 +10630,9 @@
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -7935,7 +10640,7 @@
 	  for obj in $save_oldobjs
 	  do
 	    func_basename "$obj"
-	    objbase="$func_basename_result"
+	    objbase=$func_basename_result
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -7951,18 +10656,30 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -7992,18 +10709,18 @@
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
+	      if test "$obj" = "$last_oldobj"; then
 		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 	      objlist=
 	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
 	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
+	  if test -z "$oldobjs"; then
 	    eval cmds=\"\$concat_cmds\"
 	  else
 	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -8020,7 +10737,7 @@
     case $output in
     *.la)
       old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      test yes = "$build_old_libs" && old_library=$libname.$libext
       func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
@@ -8035,52 +10752,63 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
 
       # Only create the output if not a dry run.
       $opt_dry_run || {
 	for installed in no yes; do
-	  if test "$installed" = yes; then
+	  if test yes = "$installed"; then
 	    if test -z "$install_libdir"; then
 	      break
 	    fi
-	    output="$output_objdir/$outputname"i
+	    output=$output_objdir/${outputname}i
 	    # Replace all uninstalled libtool libraries with the installed ones
 	    newdependency_libs=
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
 		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
-	    dependency_libs="$newdependency_libs"
+	    dependency_libs=$newdependency_libs
 	    newdlfiles=
 
 	    for lib in $dlfiles; do
 	      case $lib in
 	      *.la)
 	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
@@ -8090,44 +10818,61 @@
 		# didn't already link the preopened objects directly into
 		# the library:
 		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -8141,7 +10886,7 @@
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
@@ -8167,7 +10912,7 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
+	  if test no,yes = "$installed,$need_relink"; then
 	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
@@ -8182,29 +10927,31 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
-    $opt_debug
-    RM="$nonopt"
+    $debug_cmd
+
+    RM=$nonopt
     files=
-    rmforce=
+    rmforce=false
     exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8213,24 +10960,23 @@
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	objdir="$origobjdir"
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
       else
-	objdir="$dir/$origobjdir"
+	odir=$dir/$objdir
       fi
       func_basename "$file"
-      name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8242,11 +10988,11 @@
       elif test -d "$file"; then
 	exit_status=1
 	continue
-      elif test "$rmforce" = yes; then
+      elif $rmforce; then
 	continue
       fi
 
-      rmfiles="$file"
+      rmfiles=$file
 
       case $name in
       *.la)
@@ -8256,28 +11002,27 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case $opt_mode in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -8293,21 +11038,19 @@
 	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test clean = "$opt_mode"; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8317,7 +11060,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8326,7 +11069,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8334,12 +11077,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
 	    fi
 	  fi
 	fi
@@ -8347,9 +11090,8 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
-    # Try to remove the ${objdir}s in the directories where we deleted files
+    # Try to remove the $objdir's in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
 	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -8359,16 +11101,17 @@
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
 
-test -z "$mode" && {
-  help="$generic_help"
+test -z "$opt_mode" && {
+  help=$generic_help
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode '$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
@@ -8379,7 +11122,7 @@
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
+# where we disable both kinds of libraries.  Given conflicting
 # choices, we go for a static library, that is the most portable,
 # since we can't tell whether shared libraries were disabled because
 # the user asked for that or because the platform doesn't support
@@ -8402,5 +11145,3 @@
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-
diff -Nru r-base-3.2.3/VERSION r-base-3.3.1/VERSION
--- r-base-3.2.3/VERSION	2015-12-10 08:00:04.000000000 +0000
+++ r-base-3.3.1/VERSION	2016-06-21 07:00:17.000000000 +0000
@@ -1 +1 @@
-3.2.3
+3.3.1
diff -Nru r-base-3.2.3/VERSION-NICK r-base-3.3.1/VERSION-NICK
--- r-base-3.2.3/VERSION-NICK	2015-11-29 23:02:04.000000000 +0000
+++ r-base-3.3.1/VERSION-NICK	2016-06-10 22:02:06.000000000 +0000
@@ -1 +1 @@
-Wooden Christmas-Tree
+Bug in Your Hair